diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 000000000..54dd3aaf3
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,7 @@
+[production]
+defaults
+not IE 11
+not dead
+
+[development]
+supports es6-module
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e3e4f83d9..a373d685e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@1.2.0
-  node: circleci/node@4.7.0
+  ruby: circleci/ruby@2.0.0
+  node: circleci/node@5.0.3
 
 executors:
   default:
@@ -19,11 +19,11 @@ executors:
           DB_USER: root
           DISABLE_SIMPLECOV: true
           RAILS_ENV: test
-      - image: cimg/postgres:14.0
+      - image: cimg/postgres:14.5
         environment:
           POSTGRES_USER: root
           POSTGRES_HOST_AUTH_METHOD: trust
-      - image: circleci/redis:6-alpine
+      - image: cimg/redis:7.0
 
 commands:
   install-system-dependencies:
@@ -32,7 +32,7 @@ commands:
           name: Install system dependencies
           command: |
             sudo apt-get update
-            sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler
+            sudo apt-get install -y libicu-dev libidn11-dev
   install-ruby-dependencies:
     parameters:
       ruby-version:
@@ -45,7 +45,7 @@ commands:
             bundle config without 'development production'
           name: Set bundler settings
       - ruby/install-deps:
-          bundler-version: '2.2.31'
+          bundler-version: '2.3.26'
           key: ruby<< parameters.ruby-version >>-gems-v1
   wait-db:
     steps:
@@ -68,7 +68,9 @@ jobs:
           cache-version: v1
           pkg-manager: yarn
       - run:
-          command: ./bin/rails assets:precompile
+          command: |
+            export NODE_OPTIONS=--openssl-legacy-provider
+            ./bin/rails assets:precompile
           name: Precompile assets
       - persist_to_workspace:
           paths:
@@ -121,9 +123,77 @@ jobs:
       - run:
           command: ./bin/rails db:create
           name: Create database
+      - run:
+          command: ./bin/rails db:migrate VERSION=20171010025614
+          name: Run migrations up to v2.0.0
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2
+          name: Populate database with test data
+      - run:
+          command: ./bin/rails db:migrate VERSION=20180514140000
+          name: Run migrations up to v2.4.0
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2_4
+          name: Populate database with test data
+      - run:
+          command: ./bin/rails db:migrate VERSION=20180707154237
+          name: Run migrations up to v2.4.3
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2_4_3
+          name: Populate database with test data
       - run:
           command: ./bin/rails db:migrate
-          name: Run migrations
+          name: Run all remaining migrations
+      - run:
+          command: ./bin/rails tests:migrations:check_database
+          name: Check migration result
+
+  test-two-step-migrations:
+    executor:
+      name: default
+      ruby-version: '3.0'
+    steps:
+      - checkout
+      - install-system-dependencies
+      - install-ruby-dependencies:
+          ruby-version: '3.0'
+      - wait-db
+      - run:
+          command: ./bin/rails db:create
+          name: Create database
+      - run:
+          command: ./bin/rails db:migrate VERSION=20171010025614
+          name: Run migrations up to v2.0.0
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2
+          name: Populate database with test data
+      - run:
+          command: ./bin/rails db:migrate VERSION=20180514140000
+          name: Run pre-deployment migrations up to v2.4.0
+          environment:
+            SKIP_POST_DEPLOYMENT_MIGRATIONS: true
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2_4
+          name: Populate database with test data
+      - run:
+          command: ./bin/rails db:migrate VERSION=20180707154237
+          name: Run migrations up to v2.4.3
+          environment:
+            SKIP_POST_DEPLOYMENT_MIGRATIONS: true
+      - run:
+          command: ./bin/rails tests:migrations:populate_v2_4_3
+          name: Populate database with test data
+      - run:
+          command: ./bin/rails db:migrate
+          name: Run all remaining pre-deployment migrations
+          environment:
+            SKIP_POST_DEPLOYMENT_MIGRATIONS: true
+      - run:
+          command: ./bin/rails db:migrate
+          name: Run all post-deployment migrations
+      - run:
+          command: ./bin/rails tests:migrations:check_database
+          name: Check migration result
 
 workflows:
   version: 2
@@ -142,11 +212,14 @@ workflows:
       - test-migrations:
           requires:
             - build
+      - test-two-step-migrations:
+          requires:
+            - build
       - node/run:
           cache-version: v1
           name: test-webui
           pkg-manager: yarn
           requires:
             - build
-          version: lts
+          version: '16.18'
           yarn-run: test:jest
diff --git a/.codeclimate.yml b/.codeclimate.yml
index c253bd95a..59051aae7 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: '2'
 checks:
   argument-count:
     enabled: false
@@ -26,16 +26,14 @@ plugins:
   bundler-audit:
     enabled: true
   eslint:
-    enabled: true
-    channel: eslint-7
+    enabled: false
   rubocop:
-    enabled: true
-    channel: rubocop-1-9-1
+    enabled: false
   sass-lint:
-    enabled: true
+    enabled: false
 exclude_patterns:
-- spec/
-- vendor/asset/
+  - spec/
+  - vendor/asset/
 
-- app/javascript/mastodon/locales/**/*.json
-- config/locales/**/*.yml
+  - app/javascript/mastodon/locales/**/*.json
+  - config/locales/**/*.yml
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000..425b86a6b
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,24 @@
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
+ARG VARIANT=3.1-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
+
+# Install Rails
+# RUN gem install rails webdrivers
+
+# Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
+# The value is a comma-separated list of allowed domains
+ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev"
+
+# [Choice] Node.js version: lts/*, 18, 16, 14
+ARG NODE_VERSION="lts/*"
+RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
+
+# [Optional] Uncomment this section to install additional OS packages.
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev
+
+# [Optional] Uncomment this line to install additional gems.
+RUN gem install foreman
+
+# [Optional] Uncomment this line to install global node packages.
+RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g yarn" 2>&1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..01941a9d3
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+{
+  "name": "Mastodon",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/mastodon",
+
+  // Set *default* container specific settings.json values on container create.
+  "settings": {},
+
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    "EditorConfig.EditorConfig",
+    "dbaeumer.vscode-eslint",
+    "rebornix.Ruby",
+    "webben.browserslist"
+  ],
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // This can be used to network with other containers or the host.
+  "forwardPorts": [3000, 4000],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": ".devcontainer/post-create.sh",
+
+  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode"
+}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 000000000..95f401379
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,90 @@
+version: '3'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        # Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.0, 2, 2.7, 2.6
+        # Append -bullseye or -buster to pin to an OS version.
+        # Use -bullseye variants on local arm64/Apple Silicon.
+        VARIANT: '3.0-bullseye'
+        # Optional Node.js version to install
+        NODE_VERSION: '16'
+    volumes:
+      - ..:/mastodon:cached
+    environment:
+      RAILS_ENV: development
+      NODE_ENV: development
+
+      REDIS_HOST: redis
+      REDIS_PORT: '6379'
+      DB_HOST: db
+      DB_USER: postgres
+      DB_PASS: postgres
+      DB_PORT: '5432'
+      ES_ENABLED: 'true'
+      ES_HOST: es
+      ES_PORT: '9200'
+      LIBRE_TRANSLATE_ENDPOINT: http://libretranslate:5000
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+    networks:
+      - external_network
+      - internal_network
+    user: vscode
+
+  db:
+    image: postgres:14-alpine
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_HOST_AUTH_METHOD: trust
+    networks:
+      - internal_network
+
+  redis:
+    image: redis:6-alpine
+    restart: unless-stopped
+    volumes:
+      - redis-data:/data
+    networks:
+      - internal_network
+
+  es:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    restart: unless-stopped
+    environment:
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+      cluster.name: es-mastodon
+      discovery.type: single-node
+      bootstrap.memory_lock: 'true'
+    volumes:
+      - es-data:/usr/share/elasticsearch/data
+    networks:
+      - internal_network
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+
+  libretranslate:
+    image: libretranslate/libretranslate:v1.2.9
+    restart: unless-stopped
+    networks:
+      - internal_network
+
+volumes:
+  postgres-data:
+  redis-data:
+  es-data:
+
+networks:
+  external_network:
+  internal_network:
+    internal: true
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
new file mode 100755
index 000000000..02f488f12
--- /dev/null
+++ b/.devcontainer/post-create.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e # Fail the whole script on first error
+
+# Fetch Ruby gem dependencies
+bundle install --path vendor/bundle --with='development test'
+
+# Fetch Javascript dependencies
+yarn install
+
+# Make Gemfile.lock pristine again
+git checkout -- Gemfile.lock
+
+# [re]create, migrate, and seed the test database
+RAILS_ENV=test ./bin/rails db:setup
+
+# Precompile assets for development
+RAILS_ENV=development ./bin/rails assets:precompile
+
+# Precompile assets for test
+RAILS_ENV=test NODE_ENV=tests ./bin/rails assets:precompile
diff --git a/.env.nanobox b/.env.nanobox
deleted file mode 100644
index ad941c947..000000000
--- a/.env.nanobox
+++ /dev/null
@@ -1,258 +0,0 @@
-# Service dependencies
-# You may set REDIS_URL instead for more advanced options
-REDIS_HOST=$DATA_REDIS_HOST
-REDIS_PORT=6379
-# REDIS_DB=0
-
-# You may set DATABASE_URL instead for more advanced options
-DB_HOST=$DATA_DB_HOST
-DB_USER=$DATA_DB_USER
-DB_NAME=gonano
-DB_PASS=$DATA_DB_PASS
-DB_PORT=5432
-
-# DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano
-
-# Optional Elasticsearch configuration
-ES_ENABLED=true
-ES_HOST=$DATA_ELASTIC_HOST
-ES_PORT=9200
-
-BIND=0.0.0.0
-
-# Federation
-# Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation.
-# LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com.
-LOCAL_DOMAIN=${APP_NAME}.nanoapp.io
-
-# Changing LOCAL_HTTPS in production is no longer supported. (Mastodon will always serve https:// links)
-
-# Use this only if you need to run mastodon on a different domain than the one used for federation.
-# You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md
-# DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING.
-# WEB_DOMAIN=mastodon.example.com
-
-# Use this if you want to have several aliases handler@example1.com
-# handler@example2.com etc. for the same user. LOCAL_DOMAIN should not
-# be added. Comma separated values
-# ALTERNATE_DOMAINS=example1.com,example2.com
-
-# Application secrets
-# Generate each with the `rake secret` task (`nanobox run bundle exec rake secret`)
-SECRET_KEY_BASE=$SECRET_KEY_BASE
-OTP_SECRET=$OTP_SECRET
-
-# VAPID keys (used for push notifications)
-# You can generate the keys using the following command (first is the private key, second is the public one)
-# You should only generate this once per instance. If you later decide to change it, all push subscription will
-# be invalidated, requiring the users to access the website again to resubscribe.
-#
-# Generate with `rake mastodon:webpush:generate_vapid_key` task (`nanobox run bundle exec rake mastodon:webpush:generate_vapid_key`)
-#
-# For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
-VAPID_PRIVATE_KEY=$VAPID_PRIVATE_KEY
-VAPID_PUBLIC_KEY=$VAPID_PUBLIC_KEY
-
-# Registrations
-# Single user mode will disable registrations and redirect frontpage to the first profile
-# SINGLE_USER_MODE=true
-# Prevent registrations with following e-mail domains
-# EMAIL_DOMAIN_BLACKLIST=example1.com|example2.de|etc
-# Only allow registrations with the following e-mail domains
-# EMAIL_DOMAIN_WHITELIST=example1.com|example2.de|etc
-
-# Optionally change default language
-# DEFAULT_LOCALE=de
-
-# E-mail configuration
-# Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers
-# If you want to use an SMTP server without authentication (e.g local Postfix relay)
-# then set SMTP_AUTH_METHOD and SMTP_OPENSSL_VERIFY_MODE to 'none' and
-# *comment* SMTP_LOGIN and SMTP_PASSWORD (leaving them blank is not enough).
-SMTP_SERVER=$SMTP_SERVER
-SMTP_PORT=587
-SMTP_LOGIN=$SMTP_LOGIN
-SMTP_PASSWORD=$SMTP_PASSWORD
-SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
-#SMTP_REPLY_TO=
-#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
-#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
-#SMTP_AUTH_METHOD=plain
-#SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
-#SMTP_OPENSSL_VERIFY_MODE=peer
-#SMTP_ENABLE_STARTTLS_AUTO=true
-#SMTP_TLS=true
-
-# Optional user upload path and URL (images, avatars). Default is :rails_root/public/system. If you set this variable, you are responsible for making your HTTP server (eg. nginx) serve these files.
-# PAPERCLIP_ROOT_PATH=/var/lib/mastodon/public-system
-# PAPERCLIP_ROOT_URL=/system
-
-# Optional asset host for multi-server setups
-# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN
-# if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://example.com/
-# CDN_HOST=https://assets.example.com
-
-# S3 (optional)
-# The attachment host must allow cross origin request from WEB_DOMAIN or
-# LOCAL_DOMAIN if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://192.168.1.123:9000/
-# S3_ENABLED=true
-# S3_BUCKET=
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=
-# S3_REGION=
-# S3_PROTOCOL=http
-# S3_HOSTNAME=192.168.1.123:9000
-
-# S3 (Minio Config (optional) Please check Minio instance for details)
-# The attachment host must allow cross origin request - see the description
-# above.
-# S3_ENABLED=true
-# S3_BUCKET=
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=
-# S3_REGION=
-# S3_PROTOCOL=https
-# S3_HOSTNAME=
-# S3_ENDPOINT=
-# S3_SIGNATURE_VERSION=
-
-# Google Cloud Storage (optional)
-# Use S3 compatible API. Since GCS does not support Multipart Upload,
-# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload.
-# The attachment host must allow cross origin request - see the description
-# above.
-# S3_ENABLED=true
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=
-# S3_REGION=
-# S3_PROTOCOL=https
-# S3_HOSTNAME=storage.googleapis.com
-# S3_ENDPOINT=https://storage.googleapis.com
-# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes
-
-# Swift (optional)
-# The attachment host must allow cross origin request - see the description
-# above.
-# SWIFT_ENABLED=true
-# SWIFT_USERNAME=
-# For Keystone V3, the value for SWIFT_TENANT should be the project name
-# SWIFT_TENANT=
-# SWIFT_PASSWORD=
-# Some OpenStack V3 providers require PROJECT_ID (optional)
-# SWIFT_PROJECT_ID=
-# Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
-# issues with token rate-limiting during high load.
-# SWIFT_AUTH_URL=
-# SWIFT_CONTAINER=
-# SWIFT_OBJECT_URL=
-# SWIFT_REGION=
-# Defaults to 'default'
-# SWIFT_DOMAIN_NAME=
-# Defaults to 60 seconds. Set to 0 to disable
-# SWIFT_CACHE_TTL=
-
-# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare)
-# S3_ALIAS_HOST=
-
-# Streaming API integration
-# STREAMING_API_BASE_URL=
-
-# Advanced settings
-# If you need to use pgBouncer, you need to disable prepared statements:
-# PREPARED_STATEMENTS=false
-
-# Cluster number setting for streaming API server.
-# If you comment out following line, cluster number will be `numOfCpuCores - 1`.
-# STREAMING_CLUSTER_NUM=1
-
-# Docker mastodon user
-# If you use Docker, you may want to assign UID/GID manually.
-# UID=1000
-# GID=1000
-
-# LDAP authentication (optional)
-# LDAP_ENABLED=true
-# LDAP_HOST=localhost
-# LDAP_PORT=389
-# LDAP_METHOD=simple_tls
-# LDAP_BASE=
-# LDAP_BIND_DN=
-# LDAP_PASSWORD=
-# LDAP_UID=cn
-# LDAP_MAIL=mail
-# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
-# LDAP_UID_CONVERSION_ENABLED=true
-# LDAP_UID_CONVERSION_SEARCH=., -
-# LDAP_UID_CONVERSION_REPLACE=_
-
-# PAM authentication (optional)
-# PAM authentication uses for the email generation the "email" pam variable
-# and optional as fallback PAM_DEFAULT_SUFFIX
-# The pam environment variable "email" is provided by:
-# https://github.com/devkral/pam_email_extractor
-# PAM_ENABLED=true
-# Fallback email domain for email address generation (LOCAL_DOMAIN by default)
-# PAM_EMAIL_DOMAIN=example.com
-# Name of the pam service (pam "auth" section is evaluated)
-# PAM_DEFAULT_SERVICE=rpam
-# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default)
-# PAM_CONTROLLED_SERVICE=rpam
-
-# Global OAuth settings (optional) :
-# If you have only one strategy, you may want to enable this
-# OAUTH_REDIRECT_AT_SIGN_IN=true
-
-# Optional CAS authentication (cf. omniauth-cas) :
-# CAS_ENABLED=true
-# CAS_URL=https://sso.myserver.com/
-# CAS_HOST=sso.myserver.com/
-# CAS_PORT=443
-# CAS_SSL=true
-# CAS_VALIDATE_URL=
-# CAS_CALLBACK_URL=
-# CAS_LOGOUT_URL=
-# CAS_LOGIN_URL=
-# CAS_UID_FIELD='user'
-# CAS_CA_PATH=
-# CAS_DISABLE_SSL_VERIFICATION=false
-# CAS_UID_KEY='user'
-# CAS_NAME_KEY='name'
-# CAS_EMAIL_KEY='email'
-# CAS_NICKNAME_KEY='nickname'
-# CAS_FIRST_NAME_KEY='firstname'
-# CAS_LAST_NAME_KEY='lastname'
-# CAS_LOCATION_KEY='location'
-# CAS_IMAGE_KEY='image'
-# CAS_PHONE_KEY='phone'
-# CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
-
-# Optional SAML authentication (cf. omniauth-saml)
-# SAML_ENABLED=true
-# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback
-# SAML_ISSUER=https://example.com
-# SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO
-# SAML_IDP_CERT=
-# SAML_IDP_CERT_FINGERPRINT=
-# SAML_NAME_IDENTIFIER_FORMAT=
-# SAML_CERT=
-# SAML_PRIVATE_KEY=
-# SAML_SECURITY_WANT_ASSERTION_SIGNED=true
-# SAML_SECURITY_WANT_ASSERTION_ENCRYPTED=true
-# SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
-# SAML_ATTRIBUTES_STATEMENTS_UID="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_EMAIL="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
-# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
-# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
-# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
-
-# Use HTTP proxy for outgoing request (optional)
-# http_proxy=http://gateway.local:8118
-# Access control for hidden service.
-# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
diff --git a/.env.production.sample b/.env.production.sample
index 8eeff3794..0bf01bdc3 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -54,11 +54,11 @@ VAPID_PUBLIC_KEY=
 
 # Sending mail
 # ------------
-SMTP_SERVER=smtp.mailgun.org
+SMTP_SERVER=
 SMTP_PORT=587
 SMTP_LOGIN=
 SMTP_PASSWORD=
-SMTP_FROM_ADDRESS=notificatons@example.com
+SMTP_FROM_ADDRESS=notifications@example.com
 
 # File storage (optional)
 # -----------------------
@@ -67,3 +67,11 @@ S3_BUCKET=files.example.com
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 S3_ALIAS_HOST=files.example.com
+
+# IP and session retention
+# -----------------------
+# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml
+# to be less than daily if you lower IP_RETENTION_PERIOD below two days (172800).
+# -----------------------
+IP_RETENTION_PERIOD=31556952
+SESSION_RETENTION_PERIOD=31556952
diff --git a/.eslintrc.js b/.eslintrc.js
index 7dda01108..03af2975b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,10 @@
 module.exports = {
   root: true,
 
+  extends: [
+    'eslint:recommended',
+  ],
+
   env: {
     browser: true,
     node: true,
@@ -12,7 +16,7 @@ module.exports = {
     ATTACHMENT_HOST: false,
   },
 
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
 
   plugins: [
     'react',
@@ -27,7 +31,7 @@ module.exports = {
       experimentalObjectRestSpread: true,
       jsx: true,
     },
-    ecmaVersion: 2018,
+    ecmaVersion: 2021,
   },
 
   settings: {
@@ -64,8 +68,8 @@ module.exports = {
     eqeqeq: 'error',
     indent: ['warn', 2],
     'jsx-quotes': ['error', 'prefer-single'],
+    'no-case-declarations': 'off',
     'no-catch-shadow': 'error',
-    'no-cond-assign': 'error',
     'no-console': [
       'warn',
       {
@@ -75,13 +79,16 @@ module.exports = {
         ],
       },
     ],
-    'no-fallthrough': 'error',
-    'no-irregular-whitespace': 'error',
-    'no-mixed-spaces-and-tabs': 'warn',
+    'no-empty': 'off',
     'no-nested-ternary': 'warn',
+    'no-prototype-builtins': 'off',
+    'no-restricted-properties': [
+      'error',
+      { property: 'substring', message: 'Use .slice instead of .substring.' },
+      { property: 'substr', message: 'Use .slice instead of .substr.' },
+    ],
+    'no-self-assign': 'off',
     'no-trailing-spaces': 'warn',
-    'no-undef': 'error',
-    'no-unreachable': 'error',
     'no-unused-expressions': 'error',
     'no-unused-vars': [
       'error',
@@ -91,6 +98,7 @@ module.exports = {
         ignoreRestSiblings: true,
       },
     ],
+    'no-useless-escape': 'off',
     'object-curly-spacing': ['error', 'always'],
     'padded-blocks': [
       'error',
@@ -100,7 +108,6 @@ module.exports = {
     ],
     quotes: ['error', 'single'],
     semi: 'error',
-    strict: 'off',
     'valid-typeof': 'error',
 
     'react/jsx-boolean-value': 'error',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index fd6f74689..000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,32 +0,0 @@
-# CODEOWNERS for mastodon/mastodon
-
-# Translators
-# To add translator, copy these lines, replace `fr` with appropriate language code and replace `@żelipapą` with user's GitHub nickname preceded by `@` sign or e-mail address.
-# /app/javascript/mastodon/locales/fr.json @żelipapą
-# /app/views/user_mailer/*.fr.html.erb @żelipapą
-# /app/views/user_mailer/*.fr.text.erb @żelipapą
-# /config/locales/*.fr.yml @żelipapą
-# /config/locales/fr.yml @żelipapą
-
-# Polish
-/app/javascript/mastodon/locales/pl.json @m4sk1n
-/app/views/user_mailer/*.pl.html.erb @m4sk1n
-/app/views/user_mailer/*.pl.text.erb @m4sk1n
-/config/locales/*.pl.yml @m4sk1n
-/config/locales/pl.yml @m4sk1n
-
-# French
-/app/javascript/mastodon/locales/fr.json @aldarone
-/app/javascript/mastodon/locales/whitelist_fr.json @aldarone
-/app/views/user_mailer/*.fr.html.erb @aldarone
-/app/views/user_mailer/*.fr.text.erb @aldarone
-/config/locales/*.fr.yml @aldarone
-/config/locales/fr.yml @aldarone
-
-# Dutch
-/app/javascript/mastodon/locales/nl.json @jeroenpraat
-/app/javascript/mastodon/locales/whitelist_nl.json @jeroenpraat
-/app/views/user_mailer/*.nl.html.erb @jeroenpraat
-/app/views/user_mailer/*.nl.text.erb @jeroenpraat
-/config/locales/*.nl.yml @jeroenpraat
-/config/locales/nl.yml @jeroenpraat
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9526e17db..be750a5e4 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 patreon: mastodon
 open_collective: mastodon
-github: [Gargron]
+custom: https://sponsor.joinmastodon.org
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
index 9cdf813f7..22f51f7bd 100644
--- a/.github/ISSUE_TEMPLATE/1.bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: If something isn't working as expected
-labels: bug
+labels: [bug]
 body:
   - type: markdown
     attributes:
@@ -31,6 +31,11 @@ body:
       description: What happened?
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Detailed description
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: Specifications
@@ -38,5 +43,14 @@ body:
         What version or commit hash of Mastodon did you find this bug in?
 
         If a front-end issue, what browser and operating systems were you using?
+      placeholder: |
+        Mastodon 3.5.3 (or Edge)
+        Ruby 2.7.6 (or v3.1.2)
+        Node.js 16.18.0
+
+        Google Chrome 106.0.5249.119
+        Firefox 105.0.3
+
+        etc...
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
index 00aad1341..2cabcf61e 100644
--- a/.github/ISSUE_TEMPLATE/2.feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -1,5 +1,6 @@
 name: Feature Request
 description: I have a suggestion
+labels: [suggestion]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/3.support.md b/.github/ISSUE_TEMPLATE/3.support.md
deleted file mode 100644
index e2217da8b..000000000
--- a/.github/ISSUE_TEMPLATE/3.support.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Support
-about: Ask for help with your deployment
-title: DO NOT CREATE THIS ISSUE
----
-
-We primarily use GitHub as a bug and feature tracker. For usage questions, troubleshooting of deployments and other individual technical assistance, please use one of the resources below:
-
-- https://discourse.joinmastodon.org
-- #mastodon on irc.freenode.net
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 768868516..f5d319652 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Mastodon Meta Discussion Board
-    url: https://discourse.joinmastodon.org/
+  - name: GitHub Discussions
+    url: https://github.com/mastodon/mastodon/discussions
     about: Please ask and answer questions here.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c4cd48878..c785d4a35 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: npm
-    directory: "/"
+    directory: '/'
     schedule:
       interval: weekly
     open-pull-requests-limit: 99
@@ -14,7 +14,15 @@ updates:
       - dependency-type: direct
 
   - package-ecosystem: bundler
-    directory: "/"
+    directory: '/'
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 99
+    allow:
+      - dependency-type: direct
+
+  - package-ecosystem: github-actions
+    directory: '/'
     schedule:
       interval: weekly
     open-pull-requests-limit: 99
diff --git a/.github/stylelint-matcher.json b/.github/stylelint-matcher.json
new file mode 100644
index 000000000..cdfd4086b
--- /dev/null
+++ b/.github/stylelint-matcher.json
@@ -0,0 +1,21 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "stylelint",
+      "pattern": [
+        {
+          "regexp": "^([^\\s].*)$",
+          "file": 1
+        },
+        {
+          "regexp": "^\\s+((\\d+):(\\d+))?\\s+(✖|×)\\s+(.*)\\s{2,}(.*)$",
+          "line": 2,
+          "column": 3,
+          "message": 5,
+          "code": 6,
+          "loop": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 58f2813d3..c161cbf3d 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -3,20 +3,30 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "main"
+      - 'main'
     tags:
-      - "*"
+      - '*'
+  pull_request:
+    paths:
+      - .github/workflows/build-image.yml
+      - Dockerfile
+permissions:
+  contents: read
+
 jobs:
   build-image:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
+      - uses: actions/checkout@v3
+      - uses: hadolint/hadolint-action@v3.0.0
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: docker/metadata-action@v3
+        if: github.event_name != 'pull_request'
+      - uses: docker/metadata-action@v4
         id: meta
         with:
           images: tootsuite/mastodon
@@ -24,11 +34,15 @@ jobs:
             latest=auto
           tags: |
             type=edge,branch=main
-            type=semver,pattern={{ raw }}
-      - uses: docker/build-push-action@v2
+            type=pep440,pattern={{raw}}
+            type=pep440,pattern=v{{major}}.{{minor}}
+            type=ref,event=pr
+      - uses: docker/build-push-action@v3
         with:
           context: .
-          push: true
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=registry,ref=tootsuite/mastodon:latest
-          cache-to: type=inline
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml
index 2e8f230f3..9a7463060 100644
--- a/.github/workflows/check-i18n.yml
+++ b/.github/workflows/check-i18n.yml
@@ -2,33 +2,36 @@ name: Check i18n
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 env:
   RAILS_ENV: test
 
+permissions:
+  contents: read
+
 jobs:
   check-i18n:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Install system dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
-        bundler-cache: true
-    - name: Check locale file normalization
-      run: bundle exec i18n-tasks check-normalized
-    - name: Check for unused strings
-      run: bundle exec i18n-tasks unused -l en
-    - name: Check for wrong string interpolations
-      run: bundle exec i18n-tasks check-consistent-interpolations
-    - name: Check that all required locale files exist
-      run: bundle exec rake repo:check_locales_files
+      - uses: actions/checkout@v3
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libicu-dev libidn11-dev
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: .ruby-version
+          bundler-cache: true
+      - name: Check locale file normalization
+        run: bundle exec i18n-tasks check-normalized
+      - name: Check for unused strings
+        run: bundle exec i18n-tasks unused -l en
+      - name: Check for wrong string interpolations
+        run: bundle exec i18n-tasks check-consistent-interpolations
+      - name: Check that all required locale files exist
+        run: bundle exec rake repo:check_locales_files
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..8534501d4
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,62 @@
+name: 'CodeQL'
+
+on:
+  push:
+    branches: ['main']
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ['main']
+  schedule:
+    - cron: '22 6 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['javascript', 'ruby']
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
new file mode 100644
index 000000000..319152e93
--- /dev/null
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,85 @@
+---
+#################################
+#################################
+## Super Linter GitHub Actions ##
+#################################
+#################################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+#
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  push:
+    branches-ignore: [main]
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [main]
+
+###############
+# Set the Job #
+###############
+permissions:
+  checks: write
+  contents: read
+  pull-requests: write
+  statuses: write
+
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      - name: Set-up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: yarn
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+      - name: Check prettier formatting
+        run: yarn format-check
+      - name: Set-up RuboCop Problem Mathcher
+        uses: r7kamura/rubocop-problem-matchers-action@v1
+      - name: Set-up Stylelint Problem Matcher
+        uses: xt0rted/stylelint-problem-matcher@v1
+      # https://github.com/xt0rted/stylelint-problem-matcher/issues/360
+      - run: echo "::add-matcher::.github/stylelint-matcher.json"
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          CSS_FILE_NAME: stylelint.config.js
+          DEFAULT_BRANCH: main
+          NO_COLOR: 1 # https://github.com/xt0rted/stylelint-problem-matcher/issues/360
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.js
+          LINTER_RULES_PATH: .
+          RUBY_CONFIG_FILE: .rubocop.yml
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_CSS: true
+          VALIDATE_JAVASCRIPT_ES: true
+          VALIDATE_RUBY: true
diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
new file mode 100644
index 000000000..6f903ee61
--- /dev/null
+++ b/.github/workflows/rebase-needed.yml
@@ -0,0 +1,17 @@
+name: PR Needs Rebase
+
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  label-rebase-needed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: 'rebase needed :construction:'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          commentOnDirty: This pull request has merge conflicts that must be resolved before it can be merged.
diff --git a/.gitignore b/.gitignore
index 25c8388e1..2bc8b18c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,9 +44,6 @@
 /redis
 /elasticsearch
 
-# ignore Helm dependency charts
-/chart/charts/*.tgz
-
 # Ignore Apple files
 .DS_Store
 
diff --git a/.nvmrc b/.nvmrc
index 8351c1939..b6a7d89c6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14
+16
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..f72354a42
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,72 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config and downloaded libraries.
+/.bundle
+/vendor/bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+.eslintcache
+/log/*
+!/log/.keep
+/tmp
+/coverage
+/public/system
+/public/assets
+/public/packs
+/public/packs-test
+.env
+.env.production
+.env.development
+/node_modules/
+/build/
+
+# Ignore Vagrant files
+.vagrant/
+
+# Ignore Capistrano customizations
+/config/deploy/*
+
+# Ignore IDE files
+.vscode/
+.idea/
+
+# Ignore postgres + redis + elasticsearch volume optionally created by docker-compose
+/postgres
+/postgres14
+/redis
+/elasticsearch
+
+# Ignore Apple files
+.DS_Store
+
+# Ignore vim files
+*~
+*.swp
+
+# Ignore npm debug log
+npm-debug.log
+
+# Ignore yarn log files
+yarn-error.log
+yarn-debug.log
+
+# Ignore vagrant log files
+*-cloudimg-console.log
+
+# Ignore Docker option files
+docker-compose.override.yml
+
+# Ignore emoji map file
+/app/javascript/mastodon/features/emoji/emoji_map.json
+
+# Ignore locale files
+/app/javascript/mastodon/locales
+/config/locales
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 000000000..1d70813d5
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  singleQuote: true
+}
diff --git a/.rubocop.yml b/.rubocop.yml
index 2af0f59bb..3c9223470 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,21 +1,27 @@
 require:
   - rubocop-rails
+  - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: disable
+  TargetRubyVersion: 2.7
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  ExtraDetails: true
+  UseCache: true
+  CacheRootDirectory: tmp
+  NewCops: enable
   Exclude:
-  - 'spec/**/*'
-  - 'db/**/*'
-  - 'app/views/**/*'
-  - 'config/**/*'
-  - 'bin/*'
-  - 'Rakefile'
-  - 'node_modules/**/*'
-  - 'Vagrantfile'
-  - 'vendor/**/*'
-  - 'lib/json_ld/*'
-  - 'lib/templates/**/*'
+    - db/schema.rb
+    - 'app/views/**/*'
+    - 'config/**/*'
+    - 'bin/*'
+    - 'Rakefile'
+    - 'node_modules/**/*'
+    - 'Vagrantfile'
+    - 'vendor/**/*'
+    - 'lib/json_ld/*'
+    - 'lib/templates/**/*'
 
 Bundler/OrderedGems:
   Enabled: false
@@ -29,13 +35,17 @@ Layout/EmptyLineAfterMagicComment:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
 Layout/HashAlignment:
   Enabled: false
-  # EnforcedHashRocketStyle: table
-  # EnforcedColonStyle: table
 
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
@@ -63,15 +73,57 @@ Lint/UselessAccessModifier:
     - class_methods
 
 Metrics/AbcSize:
-  Max: 100
+  Max: 34 # RuboCop default 17
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - 'lib/**/*cli*.rb'
+    - db/*migrate/**/*
+    - lib/paperclip/color_extractor.rb
+    - app/workers/scheduler/follow_recommendations_scheduler.rb
+    - app/services/activitypub/fetch*_service.rb
+    - lib/paperclip/**/*
+  CountRepeatedAttributes: false
+  AllowedMethods:
+    - update_media_attachments!
+    - account_link_to
+    - attempt_oembed
+    - build_crutches
+    - calculate_scores
+    - cc
+    - dump_actor!
+    - filter_from_home?
+    - hydrate
+    - import_bookmarks!
+    - import_relationships!
+    - initialize
+    - link_to_mention
+    - log_target
+    - matches_time_window?
+    - parse_metadata
+    - perform_statuses_search!
+    - privatize_media_attachments!
+    - process_update
+    - publish_media_attachments!
+    - remotable_attachment
+    - render_initial_state
+    - render_with_cache
+    - searchable_by
+    - self.cached_filters_for
+    - set_fetchable_attributes!
+    - signed_request_actor
+    - statuses_to_delete
+    - update_poll!
 
 Metrics/BlockLength:
   Max: 55
   Exclude:
-    - 'lib/tasks/**/*'
     - 'lib/mastodon/*_cli.rb'
+  CountComments: false
+  CountAsOne: [array, heredoc]
+  AllowedMethods:
+    - task
+    - namespace
+    - class_methods
+    - included
 
 Metrics/BlockNesting:
   Max: 3
@@ -80,35 +132,145 @@ Metrics/BlockNesting:
 
 Metrics/ClassLength:
   CountComments: false
-  Max: 400
+  Max: 500
+  CountAsOne: [array, heredoc]
   Exclude:
     - 'lib/mastodon/*_cli.rb'
 
 Metrics/CyclomaticComplexity:
-  Max: 25
+  Max: 12
   Exclude:
-    - 'lib/mastodon/*_cli.rb'
+    - lib/mastodon/*cli*.rb
+    - db/*migrate/**/*
+  AllowedMethods:
+    - attempt_oembed
+    - blocked?
+    - build_crutches
+    - calculate_scores
+    - cc
+    - discover_endpoint!
+    - filter_from_home?
+    - hydrate
+    - klass
+    - link_to_mention
+    - log_target
+    - matches_time_window?
+    - patch_for_forwarding!
+    - preprocess_attributes!
+    - process_update
+    - remotable_attachment
+    - scan_text!
+    - self.cached_filters_for
+    - set_fetchable_attributes!
+    - setup_redis_env_url
+    - update_media_attachments!
 
 Layout/LineLength:
+  Max: 140 # RuboCop default 120
+  AllowHeredoc: true
   AllowURI: true
-  Enabled: false
+  IgnoreCopDirectives: true
+  AllowedPatterns:
+    # Allow comments to be long lines
+    - !ruby/regexp / \# .*$/
+    - !ruby/regexp /^\# .*$/
+  Exclude:
+    - lib/**/*cli*.rb
+    - db/*migrate/**/*
+    - db/seeds/**/*
 
 Metrics/MethodLength:
   CountComments: false
-  Max: 65
+  CountAsOne: [array, heredoc]
+  Max: 25 # RuboCop default 10
   Exclude:
     - 'lib/mastodon/*_cli.rb'
+  AllowedMethods:
+    - account_link_to
+    - attempt_oembed
+    - body_with_limit
+    - build_crutches
+    - cached_filters_for
+    - calculate_scores
+    - check_webfinger!
+    - clean_feeds!
+    - collection_items
+    - collection_presenter
+    - copy_account_notes!
+    - deduplicate_accounts!
+    - deduplicate_conversations!
+    - deduplicate_local_accounts!
+    - deduplicate_statuses!
+    - deduplicate_tags!
+    - deduplicate_users!
+    - discover_endpoint!
+    - extract_extra_uris_with_indices
+    - extract_hashtags_with_indices
+    - extract_mentions_or_lists_with_indices
+    - filter_from_home?
+    - from_elasticsearch
+    - handle_explicit_update!
+    - handle_mark_as_sensitive!
+    - hsl_to_rgb
+    - import_bookmarks!
+    - import_domain_blocks!
+    - import_relationships!
+    - ldap_options
+    - matches_time_window?
+    - outbox_presenter
+    - pam_get_user
+    - parallelize_with_progress
+    - parse_and_transform
+    - patch_for_forwarding!
+    - populate_home
+    - post_process_style
+    - preload_cache_collection_target_statuses
+    - privatize_media_attachments!
+    - provides_callback_for
+    - publish_media_attachments!
+    - relevant_account_timestamp
+    - remotable_attachment
+    - rgb_to_hsl
+    - rss_status_content_format
+    - set_fetchable_attributes!
+    - setup_redis_env_url
+    - signed_request_actor
+    - to_preview_card_attributes
+    - upgrade_storage_filesystem
+    - upgrade_storage_s3
+    - user_settings_params
+    - hydrate
+    - cc
+    - self_destruct
 
 Metrics/ModuleLength:
   CountComments: false
   Max: 200
+  CountAsOne: [array, heredoc]
 
 Metrics/ParameterLists:
-  Max: 5
-  CountKeywordArgs: true
+  Max: 5 # RuboCop default 5
+  CountKeywordArgs: true # RuboCop default true
+  MaxOptionalParameters: 3 # RuboCop default 3
+  Exclude:
+    - app/models/concerns/account_interactions.rb
+    - app/services/activitypub/fetch_remote_account_service.rb
+    - app/services/activitypub/fetch_remote_actor_service.rb
 
 Metrics/PerceivedComplexity:
-  Max: 25
+  Max: 16 # RuboCop default 8
+  AllowedMethods:
+    - attempt_oembed
+    - build_crutches
+    - calculate_scores
+    - deduplicate_users!
+    - discover_endpoint!
+    - filter_from_home?
+    - hydrate
+    - patch_for_forwarding!
+    - process_update
+    - remove_orphans
+    - update_media_attachments!
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
@@ -239,6 +401,10 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: false
 
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: ruby19_no_mixed_keys
+
 Style/IfUnlessModifier:
   Enabled: false
 
@@ -259,9 +425,6 @@ Style/PercentLiteralDelimiters:
 Style/PerlBackrefs:
   AutoCorrect: false
 
-Style/RedundantAssignment:
-  Enabled: false
-
 Style/RedundantFetchBlock:
   Enabled: true
 
@@ -277,11 +440,14 @@ Style/RedundantRegexpEscape:
 Style/RedundantReturn:
   Enabled: true
 
+Style/RedundantBegin:
+  Enabled: false
+
 Style/RegexpLiteral:
   Enabled: false
 
 Style/RescueStandardError:
-  Enabled: false
+  Enabled: true
 
 Style/SignalException:
   Enabled: false
@@ -300,3 +466,14 @@ Style/TrailingCommaInHashLiteral:
 
 Style/UnpackFirst:
   Enabled: false
+
+RSpec/ScatteredSetup:
+  Enabled: false
+RSpec/ImplicitExpect:
+  Enabled: false
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
+RSpec/LetSetup:
+  Enabled: false
diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 000000000..2b97bf65d
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+mastodon
diff --git a/.ruby-version b/.ruby-version
index 75a22a26a..b0f2dcb32 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.0.4
diff --git a/.sass-lint.yml b/.sass-lint.yml
deleted file mode 100644
index a84adff3f..000000000
--- a/.sass-lint.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Linter Documentation:
-# https://github.com/sasstools/sass-lint/tree/v1.13.1/docs/options
-
-files:
-  include: app/javascript/styles/**/*.scss
-  ignore:
-    - app/javascript/styles/mastodon/reset.scss
-
-rules:
-  # Disallows
-  no-color-literals: 0
-  no-css-comments: 0
-  no-duplicate-properties: 0
-  no-ids: 0
-  no-important: 0
-  no-mergeable-selectors: 0
-  no-misspelled-properties: 0
-  no-qualifying-elements: 0
-  no-transition-all: 0
-  no-vendor-prefixes: 0
-
-  # Nesting
-  force-element-nesting: 0
-  force-attribute-nesting: 0
-  force-pseudo-nesting: 0
-
-  # Name Formats
-  class-name-format: 0
-  leading-zero: 0
-
-  # Style Guide
-  attribute-quotes: 0
-  hex-length: 0
-  indentation: 0
-  nesting-depth: 0
-  property-sort-order: 0
-  quotes: 0
diff --git a/AUTHORS.md b/AUTHORS.md
index 596451737..18b9f2d70 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -12,44 +12,43 @@ and provided thanks to the work of the following contributors:
 * [akihikodaki](https://github.com/akihikodaki)
 * [mjankowski](https://github.com/mjankowski)
 * [unarist](https://github.com/unarist)
+* [noellabo](https://github.com/noellabo)
 * [abcang](https://github.com/abcang)
 * [yiskah](https://github.com/yiskah)
-* [noellabo](https://github.com/noellabo)
-* [nolanlawson](https://github.com/nolanlawson)
+* [tribela](https://github.com/tribela)
 * [mayaeh](https://github.com/mayaeh)
+* [nolanlawson](https://github.com/nolanlawson)
 * [ysksn](https://github.com/ysksn)
 * [sorin-davidoi](https://github.com/sorin-davidoi)
 * [lynlynlynx](https://github.com/lynlynlynx)
 * [m4sk1n](mailto:me@m4sk.in)
 * [Marcin Mikołajczak](mailto:me@m4sk.in)
-* [tribela](https://github.com/tribela)
+* [shleeable](https://github.com/shleeable)
 * [renatolond](https://github.com/renatolond)
-* [alpaca-tc](https://github.com/alpaca-tc)
 * [zunda](https://github.com/zunda)
+* [alpaca-tc](https://github.com/alpaca-tc)
 * [nclm](https://github.com/nclm)
 * [ineffyble](https://github.com/ineffyble)
-* [shleeable](https://github.com/shleeable)
+* [ariasuni](https://github.com/ariasuni)
 * [Masoud Abkenar](mailto:ampbox@gmail.com)
 * [blackle](https://github.com/blackle)
 * [Quent-in](https://github.com/Quent-in)
+* [Brawaru](https://github.com/Brawaru)
 * [JantsoP](https://github.com/JantsoP)
-* [ariasuni](https://github.com/ariasuni)
+* [trwnh](https://github.com/trwnh)
 * [nullkal](https://github.com/nullkal)
 * [yookoala](https://github.com/yookoala)
-* [Brawaru](https://github.com/Brawaru)
+* [dunn](https://github.com/dunn)
 * [Aditoo17](https://github.com/Aditoo17)
 * [Quenty31](https://github.com/Quenty31)
-* [marek-lach](https://github.com/marek-lach)
 * [shuheiktgw](https://github.com/shuheiktgw)
 * [ashfurrow](https://github.com/ashfurrow)
 * [danhunsaker](https://github.com/danhunsaker)
 * [eramdam](https://github.com/eramdam)
 * [Jeroen](mailto:jeroenpraat@users.noreply.github.com)
 * [takayamaki](https://github.com/takayamaki)
-* [dunn](https://github.com/dunn)
 * [masarakki](https://github.com/masarakki)
 * [ticky](https://github.com/ticky)
-* [trwnh](https://github.com/trwnh)
 * [ThisIsMissEm](https://github.com/ThisIsMissEm)
 * [hinaloe](https://github.com/hinaloe)
 * [hcmiya](https://github.com/hcmiya)
@@ -57,29 +56,31 @@ and provided thanks to the work of the following contributors:
 * [Wonderfall](https://github.com/Wonderfall)
 * [matteoaquila](https://github.com/matteoaquila)
 * [yukimochi](https://github.com/yukimochi)
-* [palindromordnilap](https://github.com/palindromordnilap)
+* [nightpool](https://github.com/nightpool)
+* [alixrossi](https://github.com/alixrossi)
 * [rkarabut](https://github.com/rkarabut)
 * [jeroenpraat](mailto:jeroenpraat@users.noreply.github.com)
-* [nightpool](https://github.com/nightpool)
+* [marek-lach](https://github.com/marek-lach)
 * [Artoria2e5](https://github.com/Artoria2e5)
+* [rinsuki](https://github.com/rinsuki)
 * [marrus-sh](https://github.com/marrus-sh)
 * [krainboltgreene](https://github.com/krainboltgreene)
 * [pfigel](https://github.com/pfigel)
 * [BoFFire](https://github.com/BoFFire)
 * [Aldarone](https://github.com/Aldarone)
+* [deepy](https://github.com/deepy)
 * [clworld](https://github.com/clworld)
 * [MasterGroosha](https://github.com/MasterGroosha)
 * [dracos](https://github.com/dracos)
 * [MaciekBaron](https://github.com/MaciekBaron)
 * [SerCom_KC](mailto:sercom-kc@users.noreply.github.com)
 * [Sylvhem](https://github.com/Sylvhem)
+* [koyuawsmbrtn](https://github.com/koyuawsmbrtn)
 * [MitarashiDango](https://github.com/MitarashiDango)
-* [rinsuki](https://github.com/rinsuki)
 * [angristan](https://github.com/angristan)
 * [JeanGauthier](https://github.com/JeanGauthier)
 * [kschaper](https://github.com/kschaper)
 * [beatrix-bitrot](https://github.com/beatrix-bitrot)
-* [koyuawsmbrtn](https://github.com/koyuawsmbrtn)
 * [BenLubar](https://github.com/BenLubar)
 * [mkljczk](https://github.com/mkljczk)
 * [adbelle](https://github.com/adbelle)
@@ -87,9 +88,11 @@ and provided thanks to the work of the following contributors:
 * [MightyPork](https://github.com/MightyPork)
 * [ashleyhull-versent](https://github.com/ashleyhull-versent)
 * [yhirano55](https://github.com/yhirano55)
+* [mashirozx](https://github.com/mashirozx)
 * [devkral](https://github.com/devkral)
 * [camponez](https://github.com/camponez)
-* [hugogameiro](https://github.com/hugogameiro)
+* [Hugo Gameiro](mailto:hmgameiro@gmail.com)
+* [Marek Ľach](mailto:graweeld@googlemail.com)
 * [SerCom_KC](mailto:szescxz@gmail.com)
 * [aschmitz](https://github.com/aschmitz)
 * [mfmfuyu](https://github.com/mfmfuyu)
@@ -105,8 +108,10 @@ and provided thanks to the work of the following contributors:
 * [hikari-no-yume](https://github.com/hikari-no-yume)
 * [seefood](https://github.com/seefood)
 * [jackjennings](https://github.com/jackjennings)
+* [sunny](https://github.com/sunny)
 * [puckipedia](https://github.com/puckipedia)
-* [spla](mailto:spla@mastodont.cat)
+* [splaGit](https://github.com/splaGit)
+* [tateisu](https://github.com/tateisu)
 * [walf443](https://github.com/walf443)
 * [JoelQ](https://github.com/JoelQ)
 * [mistydemeo](https://github.com/mistydemeo)
@@ -115,51 +120,59 @@ and provided thanks to the work of the following contributors:
 * [pfm-eyesightjp](https://github.com/pfm-eyesightjp)
 * [fakenine](https://github.com/fakenine)
 * [tsuwatch](https://github.com/tsuwatch)
+* [progval](https://github.com/progval)
 * [victorhck](https://github.com/victorhck)
-* [manuelviens](https://github.com/manuelviens)
-* [tateisu](https://github.com/tateisu)
+* [Izorkin](https://github.com/Izorkin)
+* [manuelviens](mailto:manuelviens@users.noreply.github.com)
 * [fvh-P](https://github.com/fvh-P)
+* [lfuelling](https://github.com/lfuelling)
 * [rtucker](https://github.com/rtucker)
 * [Anna e só](mailto:contraexemplos@gmail.com)
+* [danieljakots](https://github.com/danieljakots)
 * [dariusk](https://github.com/dariusk)
+* [Gomasy](https://github.com/Gomasy)
 * [kazu9su](https://github.com/kazu9su)
-* [Komic](https://github.com/Komic)
+* [komic](https://github.com/komic)
 * [lmorchard](https://github.com/lmorchard)
 * [diomed](https://github.com/diomed)
 * [Neetshin](mailto:neetshin@neetsh.in)
 * [rainyday](https://github.com/rainyday)
 * [tcitworld](https://github.com/tcitworld)
-* [ProgVal](https://github.com/ProgVal)
 * [valentin2105](https://github.com/valentin2105)
 * [yuntan](https://github.com/yuntan)
 * [goofy-bz](mailto:goofy@babelzilla.org)
 * [kadiix](https://github.com/kadiix)
 * [kodacs](https://github.com/kodacs)
+* [luzpaz](https://github.com/luzpaz)
 * [marcin mikołajczak](mailto:me@m4sk.in)
+* [berkes](https://github.com/berkes)
 * [KScl](https://github.com/KScl)
 * [sterdev](https://github.com/sterdev)
-* [mashirozx](https://github.com/mashirozx)
 * [TheKinrar](https://github.com/TheKinrar)
-* [007lva](https://github.com/007lva)
 * [AA4ch1](https://github.com/AA4ch1)
 * [alexgleason](https://github.com/alexgleason)
-* [Bèr Kessels](mailto:ber@berk.es)
 * [cpytel](https://github.com/cpytel)
+* [cutls](https://github.com/cutls)
 * [northerner](https://github.com/northerner)
+* [weex](https://github.com/weex)
+* [erbridge](https://github.com/erbridge)
 * [fhemberger](https://github.com/fhemberger)
-* [Gomasy](https://github.com/Gomasy)
 * [greysteil](https://github.com/greysteil)
-* [hendotcat](https://github.com/hendotcat)
+* [henrycatalinismith](https://github.com/henrycatalinismith)
+* [HolgerHuo](https://github.com/HolgerHuo)
 * [d6rkaiz](https://github.com/d6rkaiz)
 * [ladyisatis](https://github.com/ladyisatis)
 * [JMendyk](https://github.com/JMendyk)
+* [kescherCode](https://github.com/kescherCode)
 * [JohnD28](https://github.com/JohnD28)
 * [znz](https://github.com/znz)
 * [saper](https://github.com/saper)
 * [Naouak](https://github.com/Naouak)
 * [pawelngei](https://github.com/pawelngei)
+* [rgroothuijsen](https://github.com/rgroothuijsen)
 * [reneklacan](https://github.com/reneklacan)
 * [ekiru](https://github.com/ekiru)
+* [unasuke](https://github.com/unasuke)
 * [geta6](https://github.com/geta6)
 * [happycoloredbanana](https://github.com/happycoloredbanana)
 * [joenepraat](https://github.com/joenepraat)
@@ -168,11 +181,10 @@ and provided thanks to the work of the following contributors:
 * [spla](mailto:sp@mastodont.cat)
 * [tomfhowe](https://github.com/tomfhowe)
 * [noraworld](https://github.com/noraworld)
-* [lfuelling](https://github.com/lfuelling)
 * [aji-su](https://github.com/aji-su)
+* [ikuradon](https://github.com/ikuradon)
 * [nzws](https://github.com/nzws)
-* [duxovni](https://github.com/duxovni)
-* [smorimoto](https://github.com/smorimoto)
+* [SuperSandro2000](https://github.com/SuperSandro2000)
 * [178inaba](https://github.com/178inaba)
 * [acid-chicken](https://github.com/acid-chicken)
 * [xgess](https://github.com/xgess)
@@ -180,7 +192,6 @@ and provided thanks to the work of the following contributors:
 * [aablinov](https://github.com/aablinov)
 * [stalker314314](https://github.com/stalker314314)
 * [cohosh](https://github.com/cohosh)
-* [cutls](https://github.com/cutls)
 * [huertanix](https://github.com/huertanix)
 * [eleboucher](https://github.com/eleboucher)
 * [halkeye](https://github.com/halkeye)
@@ -188,13 +199,14 @@ and provided thanks to the work of the following contributors:
 * [treby](https://github.com/treby)
 * [jpdevries](https://github.com/jpdevries)
 * [gdpelican](https://github.com/gdpelican)
+* [pbzweihander](https://github.com/pbzweihander)
 * [MonaLisaOverrdrive](https://github.com/MonaLisaOverrdrive)
 * [Kurtis Rainbolt-Greene](mailto:me@kurtisrainboltgreene.name)
 * [panarom](https://github.com/panarom)
 * [Dar13](https://github.com/Dar13)
 * [nevillepark](https://github.com/nevillepark)
 * [ornithocoder](https://github.com/ornithocoder)
-* [pwoolcoc](https://github.com/pwoolcoc)
+* [Paul Woolcock](mailto:paul@woolcock.us)
 * [pierreozoux](https://github.com/pierreozoux)
 * [qguv](https://github.com/qguv)
 * [Ram Lmn](mailto:ramlmn@users.noreply.github.com)
@@ -203,28 +215,30 @@ and provided thanks to the work of the following contributors:
 * [stamak](https://github.com/stamak)
 * [Technowix](https://github.com/Technowix)
 * [Zoeille](https://github.com/Zoeille)
-* [Thor Harald Johansen](mailto:thj@thj.no)
+* [Thorwegian](https://github.com/Thorwegian)
 * [0x70b1a5](https://github.com/0x70b1a5)
 * [gled-rs](https://github.com/gled-rs)
 * [Valentin_NC](mailto:valentin.ouvrard@nautile.sarl)
 * [R0ckweb](https://github.com/R0ckweb)
-* [Izorkin](https://github.com/Izorkin)
-* [unasuke](https://github.com/unasuke)
 * [caasi](https://github.com/caasi)
+* [chandrn7](https://github.com/chandrn7)
 * [chr-1x](https://github.com/chr-1x)
 * [esetomo](https://github.com/esetomo)
 * [foxiehkins](https://github.com/foxiehkins)
+* [gol-cha](https://github.com/gol-cha)
 * [highemerly](https://github.com/highemerly)
 * [hoodie](mailto:hoodiekitten@outlook.com)
 * [kaiyou](https://github.com/kaiyou)
+* [007lva](https://github.com/007lva)
 * [luzi82](https://github.com/luzi82)
+* [prplecake](https://github.com/prplecake)
+* [duxovni](https://github.com/duxovni)
 * [slice](https://github.com/slice)
 * [tmm576](https://github.com/tmm576)
 * [unsmell](mailto:unsmell@users.noreply.github.com)
 * [valerauko](https://github.com/valerauko)
+* [Grawl](https://github.com/Grawl)
 * [chriswmartin](https://github.com/chriswmartin)
-* [SuperSandro2000](https://github.com/SuperSandro2000)
-* [ikuradon](https://github.com/ikuradon)
 * [AndreLewin](https://github.com/AndreLewin)
 * [0xflotus](https://github.com/0xflotus)
 * [redtachyons](https://github.com/redtachyons)
@@ -234,22 +248,26 @@ and provided thanks to the work of the following contributors:
 * [Andrew](mailto:andrewlchronister@gmail.com)
 * [arielrodrigues](https://github.com/arielrodrigues)
 * [aurelien-reeves](https://github.com/aurelien-reeves)
+* [BSKY](mailto:git@bsky.moe)
 * [elegaanz](https://github.com/elegaanz)
 * [estuans](https://github.com/estuans)
 * [dissolve](https://github.com/dissolve)
 * [PurpleBooth](https://github.com/PurpleBooth)
 * [bradurani](https://github.com/bradurani)
 * [wavebeem](https://github.com/wavebeem)
-* [bruwalfas](https://github.com/bruwalfas)
+* [thermosflasche](https://github.com/thermosflasche)
 * [LottieVixen](https://github.com/LottieVixen)
 * [wchristian](https://github.com/wchristian)
 * [muffinista](https://github.com/muffinista)
 * [cdutson](https://github.com/cdutson)
 * [farlistener](https://github.com/farlistener)
+* [baby-gnu](https://github.com/baby-gnu)
 * [divergentdave](https://github.com/divergentdave)
 * [DavidLibeau](https://github.com/DavidLibeau)
 * [dmerejkowsky](https://github.com/dmerejkowsky)
 * [ddevault](https://github.com/ddevault)
+* [emilyst](https://github.com/emilyst)
+* [consideRatio](https://github.com/consideRatio)
 * [Fjoerfoks](https://github.com/Fjoerfoks)
 * [fmauNeko](https://github.com/fmauNeko)
 * [gloaec](https://github.com/gloaec)
@@ -258,10 +276,13 @@ and provided thanks to the work of the following contributors:
 * [h-izumi](https://github.com/h-izumi)
 * [ErikXXon](https://github.com/ErikXXon)
 * [ian-kelling](https://github.com/ian-kelling)
+* [eltociear](https://github.com/eltociear)
 * [immae](https://github.com/immae)
 * [J0WI](https://github.com/J0WI)
-* [vahnj](https://github.com/vahnj)
+* [koboldunderlord](https://github.com/koboldunderlord)
 * [foozmeat](https://github.com/foozmeat)
+* [jgsmith](https://github.com/jgsmith)
+* [raggi](https://github.com/raggi)
 * [jasonrhodes](https://github.com/jasonrhodes)
 * [Jason Snell](mailto:jason@newrelic.com)
 * [jviide](https://github.com/jviide)
@@ -279,19 +300,25 @@ and provided thanks to the work of the following contributors:
 * [Markus Amalthea Magnuson](mailto:markus.magnuson@gmail.com)
 * [madmath03](https://github.com/madmath03)
 * [mig5](https://github.com/mig5)
+* [mohe2015](https://github.com/mohe2015)
 * [moritzheiber](https://github.com/moritzheiber)
 * [Nathaniel Suchy](mailto:me@lunorian.is)
 * [ndarville](https://github.com/ndarville)
 * [NimaBoscarino](https://github.com/NimaBoscarino)
+* [aquarla](https://github.com/aquarla)
 * [Abzol](https://github.com/Abzol)
+* [unextro](https://github.com/unextro)
 * [PatOnTheBack](https://github.com/PatOnTheBack)
 * [xPaw](https://github.com/xPaw)
 * [petzah](https://github.com/petzah)
+* [PeterDaveHello](https://github.com/PeterDaveHello)
 * [ignisf](https://github.com/ignisf)
+* [postmodern](https://github.com/postmodern)
 * [lumenwrites](https://github.com/lumenwrites)
 * [remram44](https://github.com/remram44)
 * [sts10](https://github.com/sts10)
 * [u1-liquid](https://github.com/u1-liquid)
+* [SISheogorath](https://github.com/SISheogorath)
 * [rosylilly](https://github.com/rosylilly)
 * [withshubh](https://github.com/withshubh)
 * [sim6](https://github.com/sim6)
@@ -310,26 +337,31 @@ and provided thanks to the work of the following contributors:
 * [yannicka](https://github.com/yannicka)
 * [ikasoumen](https://github.com/ikasoumen)
 * [zacanger](https://github.com/zacanger)
+* [l2dy](https://github.com/l2dy)
 * [amazedkoumei](https://github.com/amazedkoumei)
 * [anon5r](https://github.com/anon5r)
 * [aus-social](https://github.com/aus-social)
+* [bsky](mailto:git@bsky.moe)
 * [bsky](mailto:me@imbsky.net)
-* [chandrn7](https://github.com/chandrn7)
 * [codl](https://github.com/codl)
 * [cpsdqs](https://github.com/cpsdqs)
+* [dogelover911](https://github.com/dogelover911)
 * [barzamin](https://github.com/barzamin)
-* [gol-cha](https://github.com/gol-cha)
+* [gunchleoc](https://github.com/gunchleoc)
 * [fhalna](https://github.com/fhalna)
 * [haoyayoi](https://github.com/haoyayoi)
+* [helloworldstack](https://github.com/helloworldstack)
 * [ik11235](https://github.com/ik11235)
 * [kawax](https://github.com/kawax)
 * [shrft](https://github.com/shrft)
+* [luigi](mailto:lvargas@rankia.com)
 * [mbajur](https://github.com/mbajur)
 * [matsurai25](https://github.com/matsurai25)
 * [mecab](https://github.com/mecab)
 * [nicobz25](https://github.com/nicobz25)
 * [niwatori24](https://github.com/niwatori24)
-* [oliverkeeble](https://github.com/oliverkeeble)
+* [noiob](https://github.com/noiob)
+* [oliverkeeble](mailto:oliverkeeble@users.noreply.github.com)
 * [partev](https://github.com/partev)
 * [pinfort](https://github.com/pinfort)
 * [rbaumert](https://github.com/rbaumert)
@@ -341,12 +373,11 @@ and provided thanks to the work of the following contributors:
 * [vidarlee](https://github.com/vidarlee)
 * [vjackson725](https://github.com/vjackson725)
 * [wxcafe](https://github.com/wxcafe)
-* [Grawl](https://github.com/Grawl)
 * [新都心(Neet Shin)](mailto:nucx@dio-vox.com)
 * [clarfonthey](https://github.com/clarfonthey)
 * [cygnan](https://github.com/cygnan)
 * [Awea](https://github.com/Awea)
-* [eai04191](https://github.com/eai04191)
+* [single-right-quote](https://github.com/single-right-quote)
 * [8398a7](https://github.com/8398a7)
 * [857b](https://github.com/857b)
 * [insom](https://github.com/insom)
@@ -359,9 +390,10 @@ and provided thanks to the work of the following contributors:
 * [unleashed](https://github.com/unleashed)
 * [alxrcs](https://github.com/alxrcs)
 * [console-cowboy](https://github.com/console-cowboy)
+* [Saiv46](https://github.com/Saiv46)
 * [Alkarex](https://github.com/Alkarex)
 * [a2](https://github.com/a2)
-* [alfiedotwtf](https://github.com/alfiedotwtf)
+* [Alfie John](mailto:33c6c91f3bb4a391082e8a29642cafaf@alfie.wtf)
 * [0xa](https://github.com/0xa)
 * [ashpieboop](https://github.com/ashpieboop)
 * [virtualpain](https://github.com/virtualpain)
@@ -377,25 +409,34 @@ and provided thanks to the work of the following contributors:
 * [orlea](https://github.com/orlea)
 * [armandfardeau](https://github.com/armandfardeau)
 * [raboof](https://github.com/raboof)
+* [v-aisac](https://github.com/v-aisac)
+* [gi-yt](https://github.com/gi-yt)
+* [boahc077](https://github.com/boahc077)
 * [aldatsa](https://github.com/aldatsa)
 * [jumbosushi](https://github.com/jumbosushi)
 * [acuteaura](https://github.com/acuteaura)
 * [ayumin](https://github.com/ayumin)
 * [bzg](https://github.com/bzg)
 * [BastienDurel](https://github.com/BastienDurel)
+* [bearice](https://github.com/bearice)
 * [li-bei](https://github.com/li-bei)
+* [hardillb](https://github.com/hardillb)
 * [Benedikt Geißler](mailto:benedikt@g5r.eu)
 * [BenisonSebastian](https://github.com/BenisonSebastian)
 * [Blake](mailto:blake.barnett@postmates.com)
 * [Brad Janke](mailto:brad.janke@gmail.com)
+* [braydofficial](https://github.com/braydofficial)
 * [bclindner](https://github.com/bclindner)
 * [brycied00d](https://github.com/brycied00d)
-* [berkes](https://github.com/berkes)
 * [carlosjs23](https://github.com/carlosjs23)
+* [WyriHaximus](https://github.com/WyriHaximus)
 * [cgxxx](https://github.com/cgxxx)
 * [kibitan](https://github.com/kibitan)
+* [cdzombak](https://github.com/cdzombak)
 * [chrisheninger](https://github.com/chrisheninger)
 * [chris-martin](https://github.com/chris-martin)
+* [offbyone](https://github.com/offbyone)
+* [cclauss](https://github.com/cclauss)
 * [DoubleMalt](https://github.com/DoubleMalt)
 * [Moosh-be](https://github.com/Moosh-be)
 * [cchoi12](https://github.com/cchoi12)
@@ -404,6 +445,8 @@ and provided thanks to the work of the following contributors:
 * [csu](https://github.com/csu)
 * [kklleemm](https://github.com/kklleemm)
 * [colindean](https://github.com/colindean)
+* [CommanderRoot](https://github.com/CommanderRoot)
+* [connorshea](https://github.com/connorshea)
 * [DeeUnderscore](https://github.com/DeeUnderscore)
 * [dachinat](https://github.com/dachinat)
 * [Daggertooth](mailto:dev@monsterpit.net)
@@ -411,54 +454,60 @@ and provided thanks to the work of the following contributors:
 * [dalehenries](https://github.com/dalehenries)
 * [daprice](https://github.com/daprice)
 * [da2x](https://github.com/da2x)
-* [danieljakots](https://github.com/danieljakots)
 * [codesections](https://github.com/codesections)
 * [dar5hak](https://github.com/dar5hak)
 * [kant](https://github.com/kant)
 * [maxolasersquad](https://github.com/maxolasersquad)
-* [singingwolfboy](https://github.com/singingwolfboy)
-* [caldwell](https://github.com/caldwell)
-* [davidcelis](https://github.com/davidcelis)
-* [davefp](https://github.com/davefp)
-* [yipdw](https://github.com/yipdw)
-* [debanshuk](https://github.com/debanshuk)
-* [mascali33](https://github.com/mascali33)
-* [DerekNonGeneric](https://github.com/DerekNonGeneric)
-* [dblandin](https://github.com/dblandin)
-* [Aranaur](https://github.com/Aranaur)
-* [dtschust](https://github.com/dtschust)
-* [Dryusdan](https://github.com/Dryusdan)
-* [d3vgru](https://github.com/d3vgru)
-* [Elizafox](https://github.com/Elizafox)
-* [enewhuis](https://github.com/enewhuis)
-* [ericblade](https://github.com/ericblade)
-* [mikoim](https://github.com/mikoim)
-* [espenronnevik](https://github.com/espenronnevik)
+* [David Baumgold](mailto:david@davidbaumgold.com)
+* [David Caldwell](mailto:david+github@porkrind.org)
+* [David Celis](mailto:me@davidcel.is)
+* [David Hewitt](mailto:davidmhewitt@users.noreply.github.com)
+* [David Underwood](mailto:davefp@gmail.com)
+* [David Yip](mailto:yipdw@member.fsf.org)
+* [Debanshu Kundu](mailto:debanshu.kundu@joshtechnologygroup.com)
+* [Denis Teyssier](mailto:admin@mascali.ovh)
+* [Derek Lewis](mailto:derekcecillewis@gmail.com)
+* [Devon Blandin](mailto:dblandin@gmail.com)
+* [Drew Gates](mailto:aranaur@users.noreply.github.com)
+* [Drew Schuster](mailto:dtschust@gmail.com)
+* [Dryusdan](mailto:dryusdan@dryusdan.fr)
+* [Eai](mailto:eai@mizle.net)
+* [Ed Knutson](mailto:knutsoned@gmail.com)
+* [Effy Elden](mailto:effy@effy.space)
+* [Elizabeth Myers](mailto:elizabeth@interlinked.me)
+* [Eric](mailto:enewhuis@gmail.com)
+* [Eric Blade](mailto:blade.eric@gmail.com)
+* [Eshin Kunishima](mailto:mikoim@users.noreply.github.com)
+* [Espen Rønnevik](mailto:espen@ronnevik.net)
 * [Expenses](mailto:expenses@airmail.cc)
-* [fabianonline](https://github.com/fabianonline)
-* [shello](https://github.com/shello)
-* [Finariel](https://github.com/Finariel)
-* [siuying](https://github.com/siuying)
-* [zoc](https://github.com/zoc)
-* [fwenzel](https://github.com/fwenzel)
-* [gabrielrumiranda](https://github.com/gabrielrumiranda)
-* [GenbuHase](https://github.com/GenbuHase)
-* [nilsding](https://github.com/nilsding)
-* [hattori6789](https://github.com/hattori6789)
-* [algernon](https://github.com/algernon)
-* [Fastbyte01](https://github.com/Fastbyte01)
-* [unrelentingtech](https://github.com/unrelentingtech)
-* [gfaivre](https://github.com/gfaivre)
-* [Fiaxhs](https://github.com/Fiaxhs)
-* [rasjonell](https://github.com/rasjonell)
-* [reedcourty](https://github.com/reedcourty)
-* [anneau](https://github.com/anneau)
-* [lanodan](https://github.com/lanodan)
-* [Harmon758](https://github.com/Harmon758)
-* [HellPie](https://github.com/HellPie)
-* [Habu-Kagumba](https://github.com/Habu-Kagumba)
-* [suzukaze](https://github.com/suzukaze)
-* [Hiromi-Kai](https://github.com/Hiromi-Kai)
+* [Fabian Schlenz](mailto:mail@fabianonline.de)
+* [Faye Duxovni](mailto:duxovni@duxovni.org)
+* [Filipe Rodrigues](mailto:shello@shello.org)
+* [Finariel](mailto:finariel@gmail.com)
+* [Francis Chong](mailto:francis@ignition.hk)
+* [Franck Zoccolo](mailto:franck@zoccolo.com)
+* [Fred Wenzel](mailto:fwenzel@users.noreply.github.com)
+* [Gabriel Rubens](mailto:gabrielrumiranda@gmail.com)
+* [Gaelan Steele](mailto:gbs@canishe.com)
+* [Genbu Hase](mailto:hasegenbu@gmail.com)
+* [Georg Gadinger](mailto:nilsding@nilsding.org)
+* [George Hattori](mailto:hattori6789@users.noreply.github.com)
+* [Gergely Nagy](mailto:algernon@users.noreply.github.com)
+* [Giuseppe Pignataro](mailto:rogepix@gmail.com)
+* [Greg V](mailto:greg@unrelenting.technology)
+* [Guewen FAIVRE](mailto:guewen.faivre@elao.com)
+* [Guillaume Lo Re](mailto:lowreg@gmail.com)
+* [Gurgen Hayrapetyan](mailto:info.gurgen@gmail.com)
+* [György Nádudvari](mailto:reedcourty@users.noreply.github.com)
+* [HIKARU KOBORI](mailto:hk.uec.univ@gmail.com)
+* [Haelwenn Monnier](mailto:lanodan@users.noreply.github.com)
+* [Hampton Lintorn-Catlin](mailto:hcatlin@gmail.com)
+* [Harmon](mailto:harmon758@gmail.com)
+* [Hayden](mailto:contact@winisreallybored.com)
+* [HellPie](mailto:hellpie@users.noreply.github.com)
+* [Herbert Kagumba](mailto:habukagumba@gmail.com)
+* [Hiroe Jun](mailto:jun.hiroe@gmail.com)
+* [Hiromi Kai](mailto:pie05041008@gmail.com)
 * [Hisham Muhammad](mailto:hisham@gobolinux.org)
 * [Hugo "Slaynash" Flores](mailto:hugoflores@hotmail.fr)
 * [INAGAKI Hiroshi](mailto:musashino205@users.noreply.github.com)
@@ -466,8 +515,8 @@ and provided thanks to the work of the following contributors:
 * [Ian McCowan](mailto:imccowan@gmail.com)
 * [Ian McDowell](mailto:me@ianmcdowell.net)
 * [Iijima Yasushi](mailto:kurage.cc@gmail.com)
-* [Ikko Ashimine](mailto:eltociear@gmail.com)
 * [Ingo Blechschmidt](mailto:iblech@web.de)
+* [Irie Aoi](mailto:eai@mizle.net)
 * [J Yeary](mailto:usbsnowcrash@users.noreply.github.com)
 * [Jack Michaud](mailto:jack-michaud@users.noreply.github.com)
 * [Jakub Mendyk](mailto:jakubmendyk.szkola@gmail.com)
@@ -482,14 +531,17 @@ and provided thanks to the work of the following contributors:
 * [Jo Decker](mailto:trolldecker@users.noreply.github.com)
 * [Joan Montané](mailto:jmontane@users.noreply.github.com)
 * [Joe](mailto:401283+htmlbyjoe@users.noreply.github.com)
+* [Joe Friedl](mailto:stuff@joefriedl.net)
 * [Jonathan Klee](mailto:klee.jonathan@gmail.com)
 * [Jordan Guerder](mailto:jguerder@fr.pulseheberg.net)
 * [Joseph Mingrone](mailto:jehops@users.noreply.github.com)
 * [Josh Leeb-du Toit](mailto:mail@joshleeb.com)
+* [Josh Soref](mailto:2119212+jsoref@users.noreply.github.com)
 * [Joshua Wood](mailto:josh@joshuawood.net)
 * [Julien](mailto:tiwy57@users.noreply.github.com)
 * [Julien Deswaef](mailto:juego@requiem4tv.com)
 * [June Sallou](mailto:jnsll@users.noreply.github.com)
+* [Justin Thomas](mailto:justin@jdt.io)
 * [Jérémy Benoist](mailto:j0k3r@users.noreply.github.com)
 * [KEINOS](mailto:github@keinos.com)
 * [Kairui Song | 宋恺睿](mailto:ryncsn@gmail.com)
@@ -502,6 +554,7 @@ and provided thanks to the work of the following contributors:
 * [Leo Wzukw](mailto:leowzukw@users.noreply.github.com)
 * [Leonie](mailto:62470640+bubblineyuri@users.noreply.github.com)
 * [Lex Alexander](mailto:l.alexander10@gmail.com)
+* [LinAGKar](mailto:linus.kardell@gmail.com)
 * [Lorenz Diener](mailto:lorenzd@gmail.com)
 * [Luc Didry](mailto:ldidry@users.noreply.github.com)
 * [Lukas Burk](mailto:jemus42@users.noreply.github.com)
@@ -509,6 +562,7 @@ and provided thanks to the work of the following contributors:
 * [Mantas](mailto:mistermantas@users.noreply.github.com)
 * [Mareena Kunjachan](mailto:mareenakunjachan@gmail.com)
 * [Marek Lach](mailto:marek.brohatwack.lach@gmail.com)
+* [Markus Petzsch](mailto:markus@petzsch.eu)
 * [Markus R](mailto:wirehack7@users.noreply.github.com)
 * [Marty McGuire](mailto:schmartissimo@gmail.com)
 * [Marvin Kopf](mailto:marvinkopf@posteo.de)
@@ -518,12 +572,15 @@ and provided thanks to the work of the following contributors:
 * [Mathias B](mailto:10813340+mathias-b@users.noreply.github.com)
 * [Mathieu Brunot](mailto:mb.mathieu.brunot@gmail.com)
 * [Matt](mailto:matt-auckland@users.noreply.github.com)
+* [Matt Corallo](mailto:649246+thebluematt@users.noreply.github.com)
 * [Matt Sweetman](mailto:webroo@gmail.com)
+* [Matthias Bethke](mailto:matthias@towiski.de)
 * [Matthias Beyer](mailto:mail@beyermatthias.de)
 * [Matthias Jouan](mailto:matthias.jouan@gmail.com)
 * [Matthieu Paret](mailto:matthieuparet69@gmail.com)
 * [Maxime BORGES](mailto:maxime.borges@gmail.com)
 * [Mayu Laierlence](mailto:minacle@live.com)
+* [Meisam](mailto:39205857+mftabriz@users.noreply.github.com)
 * [Michael Deeb](mailto:michaeldeeb@me.com)
 * [Michael Vieira](mailto:dtox94@gmail.com)
 * [Michel](mailto:michel@cyweo.com)
@@ -534,6 +591,7 @@ and provided thanks to the work of the following contributors:
 * [Milton Mazzarri](mailto:milmazz@gmail.com)
 * [Minku Lee](mailto:premist@me.com)
 * [Minori Hiraoka](mailto:mnkai@users.noreply.github.com)
+* [MitarashiDango](mailto:mitarashi_dango@mail.matcha-soft.com)
 * [Mitchell Hentges](mailto:mitch9654@gmail.com)
 * [Mostafa Ahangarha](mailto:ahangarha@users.noreply.github.com)
 * [Mouse Reeve](mailto:mousereeve@riseup.net)
@@ -544,6 +602,7 @@ and provided thanks to the work of the following contributors:
 * [Nanamachi](mailto:town7.haruki@gmail.com)
 * [Nathaniel Ekoniak](mailto:nekoniak@ennate.tech)
 * [NecroTechno](mailto:necrotechno@riseup.net)
+* [Nicholas La Roux](mailto:larouxn@gmail.com)
 * [Nick Gerakines](mailto:nick@gerakines.net)
 * [Nicolai von Neudeck](mailto:nicolai@vonneudeck.com)
 * [Ninetailed](mailto:ninetailed@gmail.com)
@@ -553,7 +612,6 @@ and provided thanks to the work of the following contributors:
 * [Norayr Chilingarian](mailto:norayr@arnet.am)
 * [Noëlle Anthony](mailto:noelle.d.anthony@gmail.com)
 * [N氏](mailto:uenok.htc@gmail.com)
-* [OSAMU SATO](mailto:satosamu@gmail.com)
 * [Olivier Nicole](mailto:olivierthnicole@gmail.com)
 * [Oskari Noppa](mailto:noppa@users.noreply.github.com)
 * [Otakan](mailto:otakan951@gmail.com)
@@ -562,17 +620,25 @@ and provided thanks to the work of the following contributors:
 * [PatrickRWells](mailto:32802366+patrickrwells@users.noreply.github.com)
 * [Paul](mailto:naydex.mc+github@gmail.com)
 * [Pete Keen](mailto:pete@petekeen.net)
+* [Pierre Bourdon](mailto:delroth@gmail.com)
 * [Pierre-Morgan Gate](mailto:pgate@users.noreply.github.com)
 * [Ratmir Karabut](mailto:rkarabut@sfmodern.ru)
 * [Reto Kromer](mailto:retokromer@users.noreply.github.com)
+* [Rob Petti](mailto:rob.petti@gmail.com)
 * [Rob Watson](mailto:rfwatson@users.noreply.github.com)
+* [Robert Laurenz](mailto:8169746+laurenzcodes@users.noreply.github.com)
+* [Rohan Sharma](mailto:i.am.lone.survivor@protonmail.com)
+* [Roni Laukkarinen](mailto:roni@laukkarinen.info)
 * [Ryan Freebern](mailto:ryan@freebern.org)
 * [Ryan Wade](mailto:ryan.wade@protonmail.com)
 * [Ryo Kajiwara](mailto:kfe-fecn6.prussian@s01.info)
 * [S.H](mailto:gamelinks007@gmail.com)
+* [SJang1](mailto:git@sjang.dev)
 * [Sadiq Saif](mailto:staticsafe@users.noreply.github.com)
 * [Sam Hewitt](mailto:hewittsamuel@gmail.com)
+* [Samuel Kaiser](mailto:sk22@mailbox.org)
 * [Sara Aimée Smiseth](mailto:51710585+sarasmiseth@users.noreply.github.com)
+* [Sara Golemon](mailto:pollita@php.net)
 * [Satoshi KOJIMA](mailto:skoji@mac.com)
 * [ScienJus](mailto:i@scienjus.com)
 * [Scott Larkin](mailto:scott@codeclimate.com)
@@ -593,8 +659,11 @@ and provided thanks to the work of the following contributors:
 * [Spanky](mailto:2788886+spankyworks@users.noreply.github.com)
 * [Stanislas](mailto:stanislas.lange@pm.me)
 * [StefOfficiel](mailto:pichard.stephane@free.fr)
+* [Stefano Pigozzi](mailto:ste.pigozzi@gmail.com)
 * [Steven Tappert](mailto:admin@dark-it.net)
 * [Stéphane Guillou](mailto:stephane.guillou@member.fsf.org)
+* [Su Yang](mailto:soulteary@users.noreply.github.com)
+* [Sumak](mailto:44816995+kawsay@users.noreply.github.com)
 * [Svetlozar Todorov](mailto:svetlik@users.noreply.github.com)
 * [Sébastien Santoro](mailto:dereckson@espace-win.org)
 * [Tad Thorley](mailto:phaedryx@users.noreply.github.com)
@@ -603,24 +672,30 @@ and provided thanks to the work of the following contributors:
 * [TakesxiSximada](mailto:takesxi.sximada@gmail.com)
 * [Tao Bror Bojlén](mailto:brortao@users.noreply.github.com)
 * [Taras Gogol](mailto:taras2358@gmail.com)
+* [The Stranjer](mailto:791672+thestranjer@users.noreply.github.com)
 * [TheInventrix](mailto:theinventrix@users.noreply.github.com)
 * [TheMainOne](mailto:50847364+theevilskeleton@users.noreply.github.com)
 * [Thomas Alberola](mailto:thomas@needacoffee.fr)
+* [Thomas Citharel](mailto:github@tcit.fr)
 * [Toby Deshane](mailto:fortyseven@users.noreply.github.com)
 * [Toby Pinder](mailto:gigitrix@gmail.com)
 * [Tomonori Murakami](mailto:crosslife777@gmail.com)
 * [TomoyaShibata](mailto:wind.of.hometown@gmail.com)
+* [Tony Jiang](mailto:yujiang99@gmail.com)
 * [Treyssat-Vincent Nino](mailto:treyssatvincent@users.noreply.github.com)
+* [Truong Nguyen](mailto:truongnmt.dev@gmail.com)
 * [Udo Kramer](mailto:optik@fluffel.io)
 * [Una](mailto:una@unascribed.com)
 * [Ushitora Anqou](mailto:ushitora@anqou.net)
 * [Ushitora Anqou](mailto:ushitora_anqou@yahoo.co.jp)
 * [Valentin Lorentz](mailto:progval+git@progval.net)
 * [Vladimir Mincev](mailto:vladimir@canicinteractive.com)
+* [Vyr Cossont](mailto:vyrcossont@users.noreply.github.com)
 * [Waldir Pimenta](mailto:waldyrious@gmail.com)
 * [Wenceslao Páez Chávez](mailto:wcpaez@gmail.com)
 * [Wesley Ellis](mailto:tahnok@gmail.com)
 * [Wiktor](mailto:wiktor@metacode.biz)
+* [Wonderfall](mailto:wonderfall@protonmail.com)
 * [Wonderfall](mailto:wonderfall@schrodinger.io)
 * [Y.Yamashiro](mailto:shukukei@mojizuri.jp)
 * [YDrogen](mailto:ydrogen45@gmail.com)
@@ -630,15 +705,19 @@ and provided thanks to the work of the following contributors:
 * [YaQ](mailto:i_k_o_m_a_7@yahoo.co.jp)
 * [Yanaken](mailto:yanakend@gmail.com)
 * [Yann Klis](mailto:yann.klis@gmail.com)
+* [Yarden Shoham](mailto:hrsi88@gmail.com)
 * [Yağızhan](mailto:35808275+yagizhan49@users.noreply.github.com)
 * [Yeechan Lu](mailto:wz.bluesnow@gmail.com)
 * [Your Name](mailto:lorenzd@gmail.com)
 * [Yusuke Abe](mailto:moonset20@gmail.com)
+* [Zach Flanders](mailto:zachflanders@gmail.com)
+* [Zach Neill](mailto:neillz@berea.edu)
 * [Zachary Spector](mailto:logicaldash@gmail.com)
 * [ZiiX](mailto:ziix@users.noreply.github.com)
 * [asria-jp](mailto:is@alicematic.com)
 * [ava](mailto:vladooku@users.noreply.github.com)
 * [benklop](mailto:benklop@gmail.com)
+* [bobbyd0g](mailto:93697464+bobbyd0g@users.noreply.github.com)
 * [bsky](mailto:git@imbsky.net)
 * [caesarologia](mailto:lopesgemelli.1@gmail.com)
 * [cbayerlein](mailto:c.bayerlein@gmail.com)
@@ -647,6 +726,7 @@ and provided thanks to the work of the following contributors:
 * [cormo](mailto:cormorant2+github@gmail.com)
 * [d0p1](mailto:dopi-sama@hush.com)
 * [dxwc](mailto:dxwc@users.noreply.github.com)
+* [eai04191](mailto:eai@mizle.net)
 * [evilny0](mailto:evilny0@moomoocamp.net)
 * [febrezo](mailto:felixbrezo@gmail.com)
 * [fsubal](mailto:fsubal@users.noreply.github.com)
@@ -656,6 +736,7 @@ and provided thanks to the work of the following contributors:
 * [guigeekz](mailto:pattusg@gmail.com)
 * [hakoai](mailto:hk--76@qa2.so-net.ne.jp)
 * [haosbvnker](mailto:github@chaosbunker.com)
+* [heguro](mailto:65112898+heguro@users.noreply.github.com)
 * [ichi_i](mailto:51489410+ichi-i@users.noreply.github.com)
 * [isati](mailto:phil@juchnowi.cz)
 * [jacob](mailto:jacobherringtondeveloper@gmail.com)
@@ -665,15 +746,18 @@ and provided thanks to the work of the following contributors:
 * [jooops](mailto:joops@autistici.org)
 * [jukper](mailto:jukkaperanto@gmail.com)
 * [jumoru](mailto:jumoru@mailbox.org)
+* [k.bigwheel (kazufumi nishida)](mailto:k.bigwheel+eng@gmail.com)
 * [kaias1jp](mailto:kaias1jp@gmail.com)
 * [karlyeurl](mailto:karl.yeurl@gmail.com)
 * [kawaguchi](mailto:jiikko@users.noreply.github.com)
 * [kedama](mailto:32974885+kedamadq@users.noreply.github.com)
+* [keiya](mailto:keiya_21@yahoo.co.jp)
 * [kuro5hin](mailto:rusty@kuro5hin.org)
 * [leo60228](mailto:leo@60228.dev)
-* [luzpaz](mailto:luzpaz@users.noreply.github.com)
+* [matildepark](mailto:matilde.park@pm.me)
 * [maxypy](mailto:maxime@mpigou.fr)
 * [mhe](mailto:mail@marcus-herrmann.com)
+* [mickkael](mailto:19755421+mickkael@users.noreply.github.com)
 * [mike castleman](mailto:m@mlcastle.net)
 * [mimikun](mailto:dzdzble_effort_311@outlook.jp)
 * [mohemohe](mailto:mohemohe@users.noreply.github.com)
@@ -681,14 +765,17 @@ and provided thanks to the work of the following contributors:
 * [muan](mailto:muan@github.com)
 * [namelessGonbai](mailto:43787036+namelessgonbai@users.noreply.github.com)
 * [neetshin](mailto:neetshin@neetsh.in)
-* [noiob](mailto:8197071+noiob@users.noreply.github.com)
 * [notozeki](mailto:notozeki@users.noreply.github.com)
 * [ntl-purism](mailto:57806346+ntl-purism@users.noreply.github.com)
 * [nzws](mailto:git-yuzu@svk.jp)
+* [pea-sys](mailto:49807271+pea-sys@users.noreply.github.com)
+* [potpro](mailto:pptppctt@gmail.com)
 * [proxy](mailto:51172302+3n-k1@users.noreply.github.com)
 * [rch850](mailto:rich850@gmail.com)
+* [rcombs](mailto:rcombs@rcombs.me)
 * [roikale](mailto:roikale@users.noreply.github.com)
 * [rysiekpl](mailto:rysiek@hackerspace.pl)
+* [sasanquaneuf](mailto:sasanquaneuf@gmail.com)
 * [saturday06](mailto:dyob@lunaport.net)
 * [scd31](mailto:57571338+scd31@users.noreply.github.com)
 * [scriptjunkie](mailto:scriptjunkie@scriptjunkie.us)
@@ -698,9 +785,11 @@ and provided thanks to the work of the following contributors:
 * [syui](mailto:syui@users.noreply.github.com)
 * [tackeyy](mailto:mailto.takita.yusuke@gmail.com)
 * [taicv](mailto:chuvantai@gmail.com)
+* [tkr](mailto:account@kgtkr.net)
 * [tmyt](mailto:shigure@refy.net)
 * [trevDev()](mailto:trev@trevdev.ca)
 * [tsia](mailto:github@tsia.de)
+* [txt-file](mailto:44214237+txt-file@users.noreply.github.com)
 * [utam0k](mailto:k0ma@utam0k.jp)
 * [vpzomtrrfrt](mailto:vpzomtrrfrt@gmail.com)
 * [walfie](mailto:walfington@gmail.com)
@@ -726,502 +815,951 @@ This document is provided for informational purposes only. Since it is only upda
 Following people have contributed to translation of Mastodon:
 
 - GunChleoc (*Scottish Gaelic*)
-- ᛤᚤᛠᛥⴲ 👽 (KNTRO) (*Spanish, Argentina*)
-- adrmzz (*Sardinian*)
-- Hồ Nhất Duy (kantcer) (*Vietnamese*)
-- Zoltán Gera (gerazo) (*Hungarian*)
+- ケインツロ ⚧️👾🛸 (KNTRO) (*Spanish, Argentina*)
+- Hồ Nhất Duy (honhatduy) (*Vietnamese*)
 - Sveinn í Felli (sveinki) (*Icelandic*)
-- qezwan (*Persian, Sorani (Kurdish)*)
-- NCAA (*Danish*)
-- Ramdziana F Y (rafeyu) (*Indonesian*)
-- taicv (*Vietnamese*)
-- ButterflyOfFire (BoFFire) (*French, Arabic, Kabyle*)
-- Xosé M. (XoseM) (*Spanish, Galician*)
-- Evert Prants (IcyDiamond) (*Estonian*)
-- Besnik_b (*Albanian*)
+- Kristaps (Kristaps_M) (*Latvian*)
+- NCAA (*Danish, French*)
+- Zoltán Gera (gerazo) (*Hungarian*)
+- ghose (XoseM) (*Galician, Spanish*)
+- Jeong Arm (Kjwon15) (*Korean, Esperanto, Japanese, Spanish*)
 - Emanuel Pina (emanuelpina) (*Portuguese*)
-- Jeong Arm (Kjwon15) (*Japanese, Korean, Esperanto*)
-- Alix Rossi (palindromordnilap) (*French, Esperanto, Corsican*)
+- Reyzadren (*Ido, Malay*)
 - Thai Localization (thl10n) (*Thai*)
-- Daniele Lira Mereb (danilmereb) (*Portuguese, Brazilian*)
+- Besnik_b (*Albanian*)
 - Joene (joenepraat) (*Dutch*)
-- Kristijan Tkalec (lapor) (*Slovenian*)
-- stan ionut (stanionut12) (*Romanian*)
-- spla (*Spanish, Catalan*)
-- мачко (ma4ko) (*Bulgarian*)
-- 奈卜拉 (nebula_moe) (*Chinese Simplified*)
-- kamee (*Armenian*)
-- AJ-عجائب البرمجة (Esmail_Hazem) (*Arabic*)
-- Michal Stanke (mstanke) (*Czech*)
-- Danial Behzadi (danialbehzadi) (*Persian*)
-- borys_sh (*Ukrainian*)
+- Cyax (Cyaxares) (*Kurmanji (Kurdish)*)
+- adrmzz (*Sardinian*)
+- Ramdziana F Y (rafeyu) (*Indonesian*)
+- xatier (*Chinese Traditional, Chinese Traditional, Hong Kong*)
+- qezwan (*Sorani (Kurdish), Persian*)
+- spla (*Catalan, Spanish*)
+- ButterflyOfFire (BoFFire) (*Arabic, French, Kabyle*)
+- Martin (miles) (*Slovenian*)
+- නාමල් ජයසිංහ (nimnaya) (*Sinhala*)
 - Asier Iturralde Sarasola (aldatsa) (*Basque*)
-- Imre Kristoffer Eilertsen (DandelionSprout) (*Norwegian*)
-- koyu (*German*)
-- yeft (*Chinese Traditional, Chinese Traditional, Hong Kong*)
-- Miguel Mayol (mitcoes) (*Spanish, Catalan*)
-- Sasha Sorokin (Brawaru) (*French, Catalan, Danish, German, Greek, Hungarian, Armenian, Korean, Russian, Albanian, Swedish, Ukrainian, Vietnamese, Galician*)
-- Roboron (*Spanish*)
-- Koala Yeung (yookoala) (*Chinese Traditional, Hong Kong*)
 - Ondřej Pokorný (unextro) (*Czech*)
-- Osoitz (*Basque*)
-- Peterandre (*Norwegian, Norwegian Nynorsk*)
-- tzium (*Sardinian*)
-- Mélanie Chauvel (ariasuni) (*French, Arabic, Czech, German, Greek, Hungarian, Slovenian, Ukrainian, Chinese Simplified, Portuguese, Brazilian, Persian, Norwegian Nynorsk, Esperanto, Breton, Corsican, Sardinian, Kabyle*)
-- Iváns (Ivans_translator) (*Galician*)
-- Maya Minatsuki (mayaeh) (*Japanese*)
-- Manuel Viens (manuelviens) (*French*)
+- Roboron (*Spanish*)
+- taicv (*Vietnamese*)
+- koyu (*German*)
+- Daniele Lira Mereb (danilmereb) (*Portuguese, Brazilian*)
+- T. E. Kalaycı (tekrei) (*Turkish*)
+- Evert Prants (IcyDiamond) (*Estonian*)
+- Yair Mahalalel (yairm) (*Hebrew*)
+- Ihor Hordiichuk (ihor_ck) (*Ukrainian*)
 - Alessandro Levati (Oct326) (*Italian*)
+- Kimmo Kujansuu (mrkujansuu) (*Finnish*)
+- Alix Rossi (palindromordnilap) (*Corsican, Esperanto, French*)
+- Danial Behzadi (danialbehzadi) (*Persian*)
+- stan ionut (stanionut12) (*Romanian*)
+- Mastodon 中文译者 (mastodon-linguist) (*Chinese Simplified*)
+- Kristijan Tkalec (lapor) (*Slovenian*)
+Alexander Sorokin (Brawaru) (*Russian, Vietnamese, Swedish, Portuguese, Tamil, Kabyle, Polish, Italian, Catalan, Armenian, Hungarian, Albanian, Greek, Galician, Korean, Ukrainian, German, Danish, French*)
+- ManeraKai (*Arabic*)
+- мачко (ma4ko) (*Bulgarian*)
+- kamee (*Armenian*)
+- Yamagishi Kazutoshi (ykzts) (*Japanese, Icelandic, Sorani (Kurdish), Albanian, Vietnamese, Chinese Simplified*)
+- Takeçi (polygoat) (*French, Italian*)
+- REMOVED_USER (*Czech*)
+- borys_sh (*Ukrainian*)
+- Imre Kristoffer Eilertsen (DandelionSprout) (*Norwegian*)
+- Marek Ľach (mareklach) (*Slovak, Polish*)
+- yeft (*Chinese Traditional, Hong Kong, Chinese Traditional*)
+- D. Cederberg (cederberget) (*Swedish*)
+- Miguel Mayol (mitcoes) (*Spanish, Catalan*)
+- enolp (*Asturian*)
+- Manuel Viens (manuelviens) (*French*)
+- cybergene (*Japanese*)
+- REMOVED_USER (*Turkish*)
+- xpil (*Polish, Scottish Gaelic*)
+- Balázs Meskó (mesko.balazs) (*Hungarian, Czech*)
+- Koala Yeung (yookoala) (*Chinese Traditional, Hong Kong*)
+- Osoitz (*Basque*)
+- Amir Rubinstein - TAU (AmirrTAU) (*Hebrew, Indonesian*)
+- Maya Minatsuki (mayaeh) (*Japanese*)
+- Peterandre (*Norwegian Nynorsk, Norwegian*)
+Mélanie Chauvel (ariasuni) (*French, Esperanto, Norwegian Nynorsk, Persian, Kabyle, Sardinian, Corsican, Breton, Portuguese, Brazilian, Arabic, Chinese Simplified, Ukrainian, Slovenian, Greek, German, Czech, Hungarian*)
+- tzium (*Sardinian*)
+- Diluns (*Occitan*)
+- Galician Translator (Galician_translator) (*Galician*)
+- Marcin Mikołajczak (mkljczkk) (*Polish, Czech, Russian*)
+- Jeff Huang (s8321414) (*Chinese Traditional*)
+- Pixelcode (realpixelcode) (*German*)
+- Allen Zhong (AstroProfundis) (*Chinese Simplified*)
 - lamnatos (*Greek*)
 - Sean Young (assanges) (*Chinese Traditional*)
+- retiolus (*Catalan, French, Spanish*)
 - tolstoevsky (*Russian*)
-- enolp (*Asturian*)
-- Jasmine Cam Andrever (gourmas) (*Cornish*)
+- Ali Demirtaş (alidemirtas) (*Turkish*)
+- J. Cam Andrever-Wright (gourmas) (*Cornish*)
+- coxde (*Chinese Simplified*)
+- Dremski (*Bulgarian*)
 - gagik_ (*Armenian*)
 - Masoud Abkenar (mabkenar) (*Persian*)
 - arshat (*Kazakh*)
-- Marcin Mikołajczak (mkljczkk) (*Czech, Polish, Russian*)
-- Marek Ľach (mareklach) (*Polish, Slovak*)
-- Ali Demirtaş (alidemirtas) (*Turkish*)
+- Ira (seefood) (*Hebrew*)
+- Linerly (*Indonesian*)
 - Blak Ouille (BlakOuille16) (*French*)
+- e (diveedd) (*Kurmanji (Kurdish)*)
 - Em St Cenydd (cancennau) (*Welsh*)
-- Diluns (*Occitan*)
-- Muha Aliss (muhaaliss) (*Turkish*)
-- Jurica (ahjk) (*Croatian*)
+- Tigran (tigransimonyan) (*Armenian*)
+- Draacoun (*Portuguese, Brazilian*)
+- REMOVED_USER (*Turkish*)
+- Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48.moe) (mnh48) (*Malay*)
+- Tagomago (tagomago) (*Spanish, French*)
+- Ashun (ashune) (*Croatian*)
 - Aditoo17 (*Czech*)
 - vishnuvaratharajan (*Tamil*)
 - pulmonarycosignerkindness (*Swedish*)
-- cybergene (cyber-gene) (*Japanese*)
-- Takeçi (polygoat) (*French, Italian*)
-- xatier (*Chinese Traditional*)
-- Ihor Hordiichuk (ihor_ck) (*Ukrainian*)
-- regulartranslator (*Portuguese, Brazilian*)
-- ozzii (*French, Serbian (Cyrillic)*)
-- Irfan (Irfan_Radz) (*Malay*)
-- Saederup92 (*Danish*)
-- Akarshan Biswas (biswasab) (*Bengali, Sanskrit*)
+- calypsoopenmail (*French*)
+- REMOVED_USER (*Kabyle*)
+- snerk (*Norwegian Nynorsk*)
+- Sebastian (SebastianBerlin) (*German*)
+- lisawe (*Norwegian*)
+- serratrad (*Catalan*)
+- Bran_Ruz (*Breton*)
+- ViktorOn (*Russian, Danish*)
+- Gearguy (*Finnish*)
+- Andi Chandler (andibing) (*English, United Kingdom*)
+- Tor Egil Hoftun Kvæstad (Taloran) (*Norwegian Nynorsk*)
+- GiorgioHerbie (*Italian*)
+- හෙළබස සමූහය (HelaBasa) (*Sinhala*)
+- kat (katktv) (*Ukrainian, Russian*)
 - Yi-Jyun Pan (pan93412) (*Chinese Traditional*)
+- Fjoerfoks (fryskefirefox) (*Frisian, Dutch*)
+- Eshagh (eshagh79) (*Persian*)
+- regulartranslator (*Portuguese, Brazilian*)
+- Saederup92 (*Danish*)
+- ozzii (Serbian (Cyrillic), French)
+- Irfan (Irfan_Radz) (*Malay*)
+- ClearlyClaire (*French, Icelandic*)
+- Sokratis Alichanidis (alichani) (*Greek*)
+- Jiří Podhorecký (trendspotter) (*Czech*)
+- Akarshan Biswas (biswasab) (*Bengali, Sanskrit*)
+- Robert Wolniak (Szkodnix) (*Polish*)
+- Jan Lindblom (janlindblom) (*Swedish*)
+- Dewi (Unkorneg) (*Breton, French*)
+- Kristoffer Grundström (Umeaboy) (*Swedish*)
 - Rafael H L Moretti (Moretti) (*Portuguese, Brazilian*)
 - d5Ziif3K (*Ukrainian*)
-- GiorgioHerbie (*Italian*)
+- Nemu (Dormemulo) (*Esperanto, French, Italian, Ido, Afrikaans*)
+- Johan Mynhardt (johanmynhardt) (*Afrikaans*)
+- Rojdayek (Kurmanji (Kurdish))
+- REMOVED_USER (*Portuguese, Brazilian*)
+- GCardo (*Portuguese, Brazilian*)
 - christalleras (*Norwegian Nynorsk*)
-- Taloran (*Norwegian Nynorsk*)
-- ThibG (*French, Icelandic*)
-- otrapersona (*Spanish, Spanish, Mexico*)
-- Store (HelaBasa) (*Sinhala*)
-- Mauzi (*German, Swedish*)
-- atarashiako (*Chinese Simplified*)
-- 101010 (101010pl) (*Polish*)
-- erictapen (*German*)
-- Tagomago (tagomago) (*French, Spanish*)
+- diorama (*Italian*)
 - Jaz-Michael King (jazmichaelking) (*Welsh*)
-- coxde (*Chinese Simplified*)
-- T. E. Kalaycı (tekrei) (*Turkish*)
+- Catalina (catalina.st) (*Romanian*)
+- Ryo (DrRyo) (*Korean*)
+- otrapersona (*Spanish, Mexico, Spanish*)
+- Frontier Translation Ltd. (frontier-translation) (*Chinese Simplified*)
+- Mauzi (*Swedish, German*)
+- Clopsy87 (*Italian*)
+- atarashiako (*Chinese Simplified*)
+- erictapen (*German*)
+- zhen liao (az0189re) (*Chinese Simplified*)
+- 101010 (101010pl) (*Polish*)
+- REMOVED_USER (*Norwegian*)
+- axi (*Finnish*)
 - silkevicious (*Italian*)
 - Floxu (fredrikdim1) (*Norwegian Nynorsk*)
-- Ryo (DrRyo) (*Korean*)
+- Nic Dafis (nicdafis) (*Welsh*)
+- NadieAishi (*Spanish, Mexico, Spanish*)
+- 戸渡生野 (aomyouza2543) (*Thai*)
+- Tjipke van der Heide (vancha) (*Frisian*)
+- Erik Mogensen (mogsie) (*Norwegian*)
+- pomoch (*Chinese Traditional, Hong Kong*)
+- Alexandre Brito (alexbrito) (*Portuguese, Brazilian*)
 - Bertil Hedkvist (Berrahed) (*Swedish*)
 - William(ѕ)ⁿ (wmlgr) (*Spanish*)
+- LNDDYL (*Chinese Traditional*)
+- tanketom (*Norwegian Nynorsk*)
 - norayr (*Armenian*)
+- l3ycle (*German*)
+- strubbl (*German*)
 - Satnam S Virdi (pika10singh) (*Punjabi*)
 - Tiago Epifânio (tfve) (*Portuguese*)
-- Balázs Meskó (mesko.balazs) (*Hungarian*)
-- Sokratis Alichanidis (alichani) (*Greek*)
 - Mentor Gashi (mentorgashi.com) (*Albanian*)
+- Sid (autinerd1) (*Dutch, German*)
 - carolinagiorno (*Portuguese, Brazilian*)
+- Em_i (emiliencoss) (*French*)
+- Liam O (liamoshan) (*Irish*)
 - Hayk Khachatryan (brutusromanus123) (*Armenian*)
 - Roby Thomas (roby.thomas) (*Malayalam*)
+- ThonyVezbe (*Breton*)
+- Percy (kecrily) (*Chinese Simplified*)
 - Bharat Kumar (Marwari) (*Hindi*)
 - Austra Muizniece (aus_m) (*Latvian*)
-- ThonyVezbe (*Breton*)
+- Urubu Lageano (urubulageano) (*Portuguese, Brazilian*)
+- Just Spanish (7_7) (*Spanish, Mexico*)
 - v4vachan (*Malayalam*)
+- bilfri (*Danish*)
+- IamHappy (mrmx2013) (*Ukrainian*)
 - dkdarshan760 (*Sanskrit*)
-- tykayn (*French*)
-- axi (*Finnish*)
-- Selyan Slimane AMIRI (SelyanKab) (*Kabyle*)
 - Timur Seber (seber) (*Tatar*)
+- Slimane Selyan AMIRI (SelyanKab) (*Kabyle*)
+- VaiTon (*Italian*)
+- tykayn (*French*)
+- Abdulaziz Aljaber (kuwaitna) (*Arabic*)
 - taoxvx (*Danish*)
-- Hrach Mkrtchyan (mhrach87) (*Armenian*)
+- Hrach Mkrtchyan (hrachmk) (*Armenian*)
 - sabri (thetomatoisavegetable) (*Spanish, Spanish, Argentina*)
-- Dewi (Unkorneg) (*French, Breton*)
 - CoelacanthusHex (*Chinese Simplified*)
-- syncopams (*Chinese Simplified, Chinese Traditional, Chinese Traditional, Hong Kong*)
 - Rhys Harrison (rhedders) (*Esperanto*)
-- Hakim Oubouali (zenata1) (*Standard Moroccan Tamazight*)
+- syncopams (*Chinese Traditional, Hong Kong, Chinese Traditional, Chinese Simplified*)
 - SteinarK (*Norwegian Nynorsk*)
+- REMOVED_USER (*Standard Moroccan Tamazight*)
+- Maxine B. Vågnes (vagnes) (*Norwegian, Norwegian Nynorsk*)
+- Rikard Linde (rikardlinde) (*Swedish*)
+- ahangarha (*Persian*)
 - Lalo Tafolla (lalotafo) (*Spanish, Spanish, Mexico*)
-- Mathias B. Vagnes (vagnes) (*Norwegian*)
-- dashersyed (*Urdu (Pakistan)*)
-- Acolyte (666noob404) (*Ukrainian*)
+- Larissa Cruz (larissacruz) (*Portuguese, Brazilian*)
+- dashersyed (Urdu (Pakistan))
+- camerongreer21 (*English, United Kingdom*)
+- REMOVED_USER (*Ukrainian*)
 - Conight Wang (xfddwhh) (*Chinese Simplified*)
 - liffon (*Swedish*)
 - Damjan Dimitrioski (gnud) (*Macedonian*)
+- rondnunes (*Portuguese, Brazilian*)
 - PPNplus (*Thai*)
+- Steven Ritchie (Steaph38) (*Scottish Gaelic*)
+- 游荡 (MamaShip) (*Chinese Simplified*)
+- Edward Navarro (EdwardNavarro) (*Spanish*)
 - shioko (*Chinese Simplified*)
+- gnu-ewm (*Polish*)
+- Kahina Mess (K_hina) (*Kabyle*)
+- Hexandcube (hexandcube) (*Polish*)
+- Scott Starkey (yekrats) (*Esperanto*)
 - ZiriSut (*Kabyle*)
-- Evgeny Petrov (kondra007) (*Russian*)
+- FreddyG (*Esperanto*)
+- mynameismonkey (*Welsh*)
+- Groosha (groosha) (*Russian*)
 - Gwenn (Belvar) (*Breton*)
 - StanleyFrew (*French*)
+- cathalgarvey (*Irish*)
 - Nikita Epifanov (Nikets) (*Russian*)
+- REMOVED_USER (*Finnish*)
 - jaranta (*Finnish*)
 - Slobodan Simić (Слободан Симић) (slsimic) (*Serbian (Cyrillic)*)
+- iVampireSP (*Chinese Traditional, Chinese Simplified*)
 - Felicia Jongleur (midsommar) (*Swedish*)
 - Denys (dector) (*Ukrainian*)
-- iVampireSP (*Chinese Simplified, Chinese Traditional*)
-- Pukima (pukimaaa) (*German*)
-- 游荡 (MamaShip) (*Chinese Simplified*)
+- Mo_der Steven (SakuraPuare) (*Chinese Simplified*)
+- REMOVED_USER (*German*)
+- Kishin Sagume (kishinsagi) (*Chinese Simplified*)
+- bennepharaoh (*Chinese Simplified*)
 - Vanege (*Esperanto*)
-- Rikard Linde (rikardlinde) (*Swedish*)
+- hibiya inemuri (hibiya) (*Korean*)
 - Jess Rafn (therealyez) (*Danish*)
-- strubbl (*German*)
 - Stasiek Michalski (hellcp) (*Polish*)
 - dxwc (*Bengali*)
-- jmontane (*Catalan*)
+- Heran Membingung (heranmembingung) (*Indonesian*)
+- Parodper (*Galician*)
+- rbnval (*Catalan*)
 - Liboide (*Spanish*)
-- Hexandcube (hexandcube) (*Polish*)
+- hemnaren (*Norwegian Nynorsk*)
+- jmontane (*Catalan*)
+- Andy Kleinert (AndyKl) (*German*)
 - Chris Kay (chriskarasoulis) (*Greek*)
+- CrowdinBRUH (*Vietnamese*)
+- Rhoslyn Prys (Rhoslyn) (*Welsh*)
+- abidin toumi (Zet24) (*Arabic*)
 - Johan Schiff (schyffel) (*Swedish*)
+- Rex_sa (rex07) (*Arabic*)
+- amedcj (*Kurmanji (Kurdish)*)
 - Arunmozhi (tecoholic) (*Tamil*)
 - zer0-x (ZER0-X) (*Arabic*)
-- kat (katktv) (*Russian, Ukrainian*)
+- staticnoisexyz (*Czech*)
 - Lauren Liberda (selfisekai) (*Polish*)
-- mynameismonkey (*Welsh*)
+- Michael Zeevi (maze88) (*Hebrew*)
 - oti4500 (*Hungarian, Ukrainian*)
+- Delta (Delta-Time) (*Japanese*)
+- Marc Antoine Thevenet (MATsxm) (*French*)
+- AlexKoala (alexkoala) (*Korean*)
+- SarfarazAhmed (*Urdu (Pakistan)*)
+- Ahmad Dakhlallah (MIUIArabia) (*Arabic*)
 - Mats Gunnar Ahlqvist (goqbi) (*Swedish*)
 - diazepan (*Spanish, Spanish, Argentina*)
+- Tiger:blank (tsagaanbar) (*Chinese Simplified*)
+- REMOVED_USER (*Chinese Simplified*)
 - marzuquccen (*Kabyle*)
-- VictorCorreia (victorcorreia1984) (*Afrikaans*)
-- Tigran (tigransimonyan) (*Armenian*)
-- Juan José Salvador Piedra (JuanjoSalvador) (*Spanish*)
-- BurekzFinezt (*Serbian (Cyrillic)*)
-- SHeija (*Finnish*)
-- Gearguy (*Finnish*)
 - atriix (*Swedish*)
-- Jack R (isaac.97_WT) (*Spanish*)
-- antonyho (*Chinese Traditional, Hong Kong*)
-- asnomgtu (*Hungarian*)
-- ahangarha (*Persian*)
-- andruhov (*Russian, Ukrainian*)
-- phena109 (*Chinese Traditional, Hong Kong*)
-- Aryamik Sharma (Aryamik) (*Swedish, Hindi*)
-- Unmual (*Spanish*)
+- Laur (melaur) (*Romanian*)
+- VictorCorreia (victorcorreia1984) (*Afrikaans*)
+- Remito (remitocat) (*Japanese*)
+- Juan José Salvador Piedra (JuanjoSalvador) (*Spanish*)
+- REMOVED_USER (*Norwegian*)
 - 森の子リスのミーコの大冒険 (Phroneris) (*Japanese*)
+- Gim_Garam (*Korean*)
+- BurekzFinezt (*Serbian (Cyrillic)*)
+- Pēteris Caune (cuu508) (*Latvian*)
+- asnomgtu (*Hungarian*)
+- bendigeidfran (*Welsh*)
+- SHeija (*Finnish*)
+- Врабац (Slovorad) (*Serbian (Cyrillic)*)
+- Dženan (Dzenan) (*Swedish*)
+- Gabriel Beecham (lancet) (*Irish*)
+- antonyho (*Chinese Traditional, Hong Kong*)
+- Jack R (isaac.97_WT) (*Spanish*)
+- Henrik Mattsson-Mårn (rchk) (*Swedish*)
+- Oguzhan Aydin (aoguzhan) (*Turkish*)
+- Soran730 (*Chinese Simplified*)
+- andruhov (*Ukrainian, Russian*)
+- 北䑓如法 (Nyoho) (*Japanese*)
+- phena109 (*Chinese Traditional, Hong Kong*)
+- Aryamik Sharma (Aryamik) (*Hindi, Swedish*)
+- Unmual (*Spanish*)
+- Tobias Bannert (toba) (*German*)
+- Adrián Graña (alaris83) (*Spanish*)
+- vpei (*Chinese Simplified*)
+- cruz2020 (*Portuguese*)
+- papapep (h9f2ycHh-ktOd6_Y) (*Catalan*)
+- Roj (roj1512) (*Sorani (Kurdish), Kurmanji (Kurdish)*)
 - るいーね (ruine) (*Japanese*)
+- aujawindar (*Norwegian Nynorsk*)
+- irithys (*Chinese Simplified*)
 - Sam Tux (imahbub) (*Bengali*)
-- Kristoffer Grundström (Umeaboy) (*Swedish*)
 - igordrozniak (*Polish*)
+- Johannes Nilsson (nlssn) (*Swedish*)
+- Michał Sidor (michcioperz) (*Polish*)
 - Isaac Huang (caasih) (*Chinese Traditional*)
 - AW Unad (awcodify) (*Indonesian*)
-- Allen Zhong (AstroProfundis) (*Chinese Simplified*)
+- 1Alino (*Slovak*)
 - Cutls (cutls) (*Japanese*)
+- Goudarz Jafari (GoudarzJafari) (*Persian*)
+- Daniel Strömholm (stromholm) (*Swedish*)
+- 1 (Ipsumry) (*Spanish*)
 - Falling Snowdin (tghgg) (*Vietnamese*)
-- Ray (Ipsumry) (*Spanish*)
-- Gianfranco Fronteddu (gianfro.gianfro) (*Sardinian*)
+- Paulino Michelazzo (pmichelazzo) (*Portuguese, Brazilian*)
+- Y.Yamashiro (uist1idrju3i) (*Japanese*)
 - Rasmus Lindroth (RasmusLindroth) (*Swedish*)
+- Gianfranco Fronteddu (gianfro.gianfro) (*Sardinian*)
 - Andrea Lo Iacono (niels0n) (*Italian*)
-- Parodper (*Galician*)
 - fucsia (*Italian*)
-- NadieAishi (*Spanish, Spanish, Mexico*)
+- Vedran Serbu (SerenoXGen) (*Croatian*)
+- Raphael Das Gupta (das-g) (*Esperanto, German*)
+- yanchan09 (*Estonian*)
+- ainmeolai (*Irish*)
+- REMOVED_USER (*Norwegian*)
+- mian42 (*Bulgarian*)
 - Kinshuk Sunil (kinshuksunil) (*Hindi*)
+- al_._ (*German, Russian*)
 - Ullas Joseph (ullasjoseph) (*Malayalam*)
-- Goudarz Jafari (Goudarz) (*Persian*)
+- sanoth (*Swedish*)
+- Aftab Alam (iaftabalam) (*Hindi*)
+- frumble (*German*)
+- juanda097 (juanda-097) (*Spanish*)
+- Matthías Páll Gissurarson (icetritlo) (*Icelandic*)
+- Russian Retro (retrograde) (*Russian*)
+- KcKcZi (*Chinese Simplified*)
 - Yu-Pai Liu (tedliou) (*Chinese Traditional*)
 - Amarin Cemthong (acitmaster) (*Thai*)
-- Johannes Nilsson (nlssn) (*Swedish*)
-- juanda097 (juanda-097) (*Spanish*)
+- Etinew (*Hebrew*)
+- xsml (*Chinese Simplified*)
+- S.J. L. (samijuhanilii) (*Finnish*)
 - Anunnakey (*Macedonian*)
 - erikkemp (*Dutch*)
+- Tsl (muun) (*Chinese Simplified*)
+- Renato "Lond" Cerqueira (renatolond) (*Portuguese, Brazilian*)
+- Úna-Minh Kavanagh (yunitex) (*Irish*)
+- kongk (*Norwegian Nynorsk*)
 - erikstl (*Esperanto*)
-- bobchao (*Chinese Traditional*)
 - twpenguin (*Chinese Traditional*)
-- MadeInSteak (*Finnish*)
+- JeremyStarTM (*German*)
+- Po-chiang Chao (bobchao) (*Chinese Traditional*)
+- Marcus Myge (mygg-priv) (*Norwegian*)
 - Esther (esthermations) (*Portuguese*)
+- Jiri Grönroos (spammemoreplease) (*Finnish*)
+- MadeInSteak (*Finnish*)
+- witoharmuth (*Swedish*)
+- MESHAL45 (*Arabic*)
+- mcdutchie (*Dutch*)
+- Michal Špondr (michalspondr) (*Czech*)
 - t_aus_m (*German*)
+- kaki7777 (*Japanese, Chinese Traditional*)
 - Heimen Stoffels (Vistaus) (*Dutch*)
+- serapolis (*Chinese Traditional, Hong Kong, Chinese Traditional, Japanese, Chinese Simplified*)
 - Rajarshi Guha (rajarshiguha) (*Bengali*)
-- Mo_der Steven (SakuraPuare) (*Chinese Simplified*)
+- Amir Reza (ElAmir) (*Persian*)
+- REMOVED_USER (*Norwegian*)
+- MohammadSaleh Kamyab (mskf1383) (*Persian*)
+- REMOVED_USER (*Romanian*)
 - Gopal Sharma (gopalvirat) (*Hindi*)
-- arethsu (*Swedish*)
+- Вероніка Някшу (pampushkaveronica) (*Russian, Romanian*)
+- Linnéa (lesbian_subnet) (*Swedish*)
+- Valentin (HDValentin) (*German*)
+- dragnucs2 (*Arabic*)
 - Carlos Solís (csolisr) (*Esperanto*)
 - Tofiq Abdula (Xwla) (*Sorani (Kurdish)*)
+- halcek (*Slovak*)
+- Tobias Kunze (rixxian) (*German*)
 - Parthan S Ramanujam (parthan) (*Tamil*)
 - Kasper Nymand (KasperNymand) (*Danish*)
-- Jeff Huang (s8321414) (*Chinese Traditional*)
 - TS (morte) (*Finnish*)
+- REMOVED_USER (*German*)
+- REMOVED_USER (*Basque*)
 - subram (*Turkish*)
-- SensDeViata (*Ukrainian*)
+- Gudwin (*Spanish, Mexico, Spanish*)
 - Ptrcmd (ptrcmd) (*Chinese Traditional*)
+- shmuelHal (*Hebrew*)
+- SensDeViata (*Ukrainian*)
+- megaleo (*Portuguese, Brazilian*)
+- Acursen (*German*)
+- NurKai Kai (nurkaiyttv) (*German*)
+- Guttorm (ghveem) (*Norwegian Nynorsk*)
 - SergioFMiranda (*Portuguese, Brazilian*)
-- Percy (scvoet) (*Chinese Simplified*)
+- Danni Lundgren (dannilundgren) (*Danish*)
 - Vivek K J (Vivekkj) (*Malayalam*)
 - hiroTS (*Chinese Traditional*)
+- teadesu (*Portuguese, Brazilian*)
+- petartrajkov (*Macedonian*)
+- Ariel Costas (arielcostas3) (*Galician*)
+- Ch. (sftblw) (*Korean*)
+- Rintan (*Japanese*)
+- Jair Henrique (jairhenrique) (*Portuguese, Brazilian*)
+- sorcun (*Turkish*)
+- filippodb (*Italian*)
 - johne32rus23 (*Russian*)
-- AzureNya (*Chinese Simplified*)
 - OctolinGamer (octolingamer) (*Portuguese, Brazilian*)
+- AzureNya (*Chinese Simplified*)
 - Ram varma (ram4varma) (*Tamil*)
-- 北䑓如法 (Nyoho) (*Japanese*)
+- REMOVED_USER (Sorani (Kurdish))
+- REMOVED_USER (*Portuguese, Brazilian*)
+- seanmhade (*Irish*)
+- sanser (*Russian*)
+- Vijay (vijayatmin) (*Tamil*)
+- Anomalion (*German*)
 - Pukima (Pukimaa) (*German*)
-- diorama (*Italian*)
+- Curtis Lee (CansCurtis) (*Chinese Traditional*)
+- โบโลน่าไวรัส (nullxyz_) (*Thai*)
+- ふぁーらんど (farland1717) (*Japanese*)
+- 3wen (*Breton*)
+- rlafuente (*Portuguese*)
+- Ильзира Рахматуллина (rahmatullinailzira53) (*Tatar*)
+- Code Man (codemansrc) (*Russian*)
+- Philip Gillißen (guerda) (*German*)
 - Daniel Dimitrov (daniel.dimitrov) (*Bulgarian*)
-- frumble (*German*)
+- Anton (atjn) (*Danish*)
 - kekkepikkuni (*Tamil*)
+- MODcraft (*Chinese Simplified*)
 - oorsutri (*Tamil*)
+- wortfeld (*German*)
 - Neo_Chen (NeoChen1024) (*Chinese Traditional*)
+- Stereopolex (*Polish*)
+- NxOne14 (*Bulgarian*)
+- Juan Ortiz (Kloido) (*Spanish, Catalan*)
 - Nithin V (Nithin896) (*Tamil*)
-- Marcus Myge (mygg-priv) (*Norwegian*)
+- strikeCunny2245 (*Icelandic*)
 - Miro Rauhala (mirorauhala) (*Finnish*)
-- AlexKoala (alexkoala) (*Korean*)
+- nicoduesing (duconi) (*German, Esperanto*)
+- Gnonthgol (*Norwegian Nynorsk*)
+- WKobes (*Dutch*)
+- Oymate (*Bengali*)
+- mikwee (*Hebrew*)
+- EzigboOmenana (*Igbo, Cornish*)
+- yan Wato (janWato) (*Hindi*)
+- Papuass (*Latvian*)
+- Vincent Orback (vincentorback) (*Swedish*)
+- chettoy (*Chinese Simplified*)
+- 19 (nineteen) (*Chinese Simplified*)
 - ಚಿರಾಗ್ ನಟರಾಜ್ (chiraag-nataraj) (*Kannada*)
-- Aswin C (officialcjunior) (*Malayalam*)
+- Layik Hama (layik) (*Sorani (Kurdish)*)
 - Guillaume Turchini (orion78fr) (*French*)
-- Ganesh D (auntgd) (*Marathi*)
+- Andri Yngvason (andryng) (*Icelandic*)
+- Aswin C (officialcjunior) (*Malayalam*)
+- Yuval Nehemia (yuvalne) (*Hebrew*)
 - mawoka-myblock (mawoka) (*German*)
-- dragnucs2 (*Arabic*)
+- Ganesh D (auntgd) (*Marathi*)
+- Lens0021 (lens0021) (*Korean*)
+- An Gafraíoch (angafraioch) (*Irish*)
+- Michael Smith (michaelshmitty) (*Dutch*)
 - Ryan Ho (koungho) (*Chinese Traditional*)
+- tunisiano187 (*French*)
+- Peter van Mever (SpacemanSpiff) (*Dutch*)
 - Pedro Henrique (exploronauta) (*Portuguese, Brazilian*)
+- REMOVED_USER (*Esperanto, Italian, Japanese*)
 - Tejas Harad (h_tejas) (*Marathi*)
+- Balázs Meskó (meskobalazs) (*Hungarian*)
 - Vasanthan (vasanthan) (*Tamil*)
+- Tatsuto "Laminne" Yamamoto (laminne) (*Japanese*)
+- slbtty (shenlebantongying) (*Chinese Simplified*)
 - 硫酸鶏 (acid_chicken) (*Japanese*)
-- clarmin b8 (clarminb8) (*Sorani (Kurdish)*)
 - programizer (*German*)
+- guessimmaterialgrl (*Chinese Simplified*)
+- clarmin b8 (clarminb8) (*Sorani (Kurdish)*)
+- Maria Riegler (riegler3m) (*German*)
 - manukp (*Malayalam*)
 - earth dweller (sanethoughtyt) (*Marathi*)
 - psymyn (*Hebrew*)
+- Aaraon Thomas (aaraon) (*Portuguese, Brazilian*)
+- Rafael Viana (rafacnec) (*Portuguese, Brazilian*)
+- Marek Ľach (marek-lach) (*Slovak*)
 - meijerivoi (toilet) (*Finnish*)
 - essaar (*Tamil*)
 - serubeena (*Swedish*)
-- Rintan (*Japanese*)
-- Karol Kosek (krkkPL) (*Polish*)
-- Khó͘ Tiat-lêng (khotiatleng) (*Chinese Traditional, Taigi*)
+- RqndomHax (*French*)
+- REMOVED_USER (*Polish*)
+- ギャラ (gyara) (*Chinese Simplified, Japanese*)
+- Khó͘ Tiatlêng (khotiatleng) (*Chinese Traditional, Taigi*)
+- revarioba (*Spanish*)
+- friedbeans (*Croatian*)
+- An (AnTheMaker) (*German*)
+- kuchengrab (*German*)
 - Hernik (hernik27) (*Czech*)
 - valarivan (*Tamil*)
-- kuchengrab (*German*)
-- friedbeans (*Croatian*)
+- אדם לוין (adamlevin) (*Hebrew*)
+- Vít Horčička (legvita123) (*Czech*)
 - Abi Turi (abi123) (*Georgian*)
+- Thomas Munkholt (munkholt) (*Danish*)
+- pparescasellas (*Catalan*)
 - Hinaloe (hinaloe) (*Japanese*)
+- Ifnuth (*German*)
 - Sebastián Andil (Selrond) (*Slovak*)
+- boni777 (*Chinese Simplified*)
 - KEINOS (*Japanese*)
-- filippodb (*Italian*)
 - Asbjørn Olling (a2) (*Danish*)
-- Balázs Meskó (meskobalazs) (*Hungarian*)
-- Bottle (suryasalem2010) (*Tamil*)
+- REMOVED_USER (*Chinese Traditional, Hong Kong*)
+- DarkShy Community (ponyfrost.mc) (*Russian*)
+- Dennis Reimund (reimunddennis7) (*German*)
+- jocafeli (*Spanish, Mexico*)
 - Wrya ali (John12) (*Sorani (Kurdish)*)
+- Bottle (suryasalem2010) (*Tamil*)
+- Algustionesa Yoshi (algustionesa) (*Indonesian*)
 - JzshAC (*Chinese Simplified*)
-- Antillion (antillion99) (*Spanish*)
+- Artem Mikhalitsin (artemmikhalitsin) (*Russian*)
+- siamano (*Thai, Esperanto*)
+- KARARTI44 (kararti44) (*Turkish*)
+- c0c (*Irish*)
+- Stefano S. (Sting1_JP) (*Italian*)
+- tommil (*Finnish*)
+- Ignacio Lis (ilis) (*Galician*)
 - Steven Tappert (sammy8806) (*German*)
-- Reg3xp (*Persian*)
+- Antillion (antillion99) (*Spanish*)
+- K.B.Dharun Krishna (kbdharun) (*Tamil*)
 - Wassim EL BOUHAMIDI (elbouhamidiw) (*Arabic*)
+- Reg3xp (*Persian*)
+- florentVgn (*French*)
+- Matt (Exbu) (*Dutch*)
+- Maciej Błędkowski (mble) (*Polish*)
 - gowthamanb (*Tamil*)
 - hiphipvargas (*Portuguese*)
-- Ch. (sftblw) (*Korean*)
+- GabuVictor (*Portuguese, Brazilian*)
+- Pverte (*French*)
+- REMOVED_USER (*Spanish*)
+- Surindaku (*Chinese Simplified*)
 - Arttu Ylhävuori (arttu.ylhavuori) (*Finnish*)
+- Pabllo Soares (pabllosoarez) (*Portuguese, Brazilian*)
+- Jona (88wcJoWl) (*Spanish*)
+- Ka2n (kaanmetu) (*Turkish*)
 - tctovsli (*Norwegian Nynorsk*)
 - Timo Tijhof (Krinkle) (*Dutch*)
-- Mikkel B. Goldschmidt (mikkelbjoern) (*Danish*)
-- mecqor labi (mecqorlabi) (*Persian*)
-- Odyssey346 (alexader612) (*Norwegian*)
-- Yamagishi Kazutoshi (ykzts) (*Japanese, Icelandic, Sorani (Kurdish)*)
-- Eban (ebanDev) (*French, Esperanto*)
-- vjasiegd (*Polish*)
 - SamitiMed (samiti3d) (*Thai*)
+- Mikkel B. Goldschmidt (mikkelbjoern) (*Danish*)
+- Odyssey346 (alexader612) (*Norwegian*)
+- mecqor labi (mecqorlabi) (*Persian*)
+- Cù Huy Phúc Khang (taamee) (*Vietnamese*)
+- Oskari Lavinto (olavinto) (*Finnish*)
+- Philippe Lemaire (philippe-lemaire) (*Esperanto*)
+- vjasiegd (*Polish*)
+- Eban (ebanDev) (*Esperanto, French*)
 - Nícolas Lavinicki (nclavinicki) (*Portuguese, Brazilian*)
-- snatcher (*Portuguese, Brazilian*)
+- REMOVED_USER (*Portuguese, Brazilian*)
 - Rekan Adl (rekan-adl1) (*Sorani (Kurdish)*)
 - VSx86 (*Russian*)
 - umelard (*Hebrew*)
 - Antara2Cinta (Se7enTime) (*Indonesian*)
-- parnikkapore (*Thai*)
-- Sherwan Othman (sherwanothman11) (*Sorani (Kurdish)*)
+- Lucas_NL (*Dutch*)
 - Yassine Aït-El-Mouden (yaitelmouden) (*Standard Moroccan Tamazight*)
+- Mathieu Marquer (slasherfun) (*French*)
+- Haerul Fuad (Dokuwiki) (*Indonesian*)
+- parnikkapore (*Thai*)
+- Michelle M (MichelleMMM) (*Dutch*)
+- malbona (*Esperanto*)
+- Sherwan Othman (sherwanothman11) (*Sorani (Kurdish)*)
+- Lagash (lagash) (*Esperanto*)
+- Chine Sebastien (chine.sebastien) (*French*)
+- bgme (*Chinese Simplified*)
+- Rafael V. (Rafaeeel) (*Portuguese, Brazilian*)
 - SKELET (*Danish*)
+- A A (sebastien.chine) (*French*)
+- Project Z (projectz.1338) (*German*)
 - Fei Yang (Fei1Yang) (*Chinese Traditional*)
 - Ğani (freegnu) (*Tatar*)
-- Renato "Lond" Cerqueira (renatolond) (*Portuguese, Brazilian*)
-- enipra (*Armenian*)
-- ALEM FARID (faridatcemlulaqbayli) (*Kabyle*)
 - musix (*Persian*)
-- ギャラ (gyara) (*Japanese, Chinese Simplified*)
+- REMOVED_USER (*German*)
+- ALEM FARID (faridatcemlulaqbayli) (*Kabyle*)
+- Jean-Pierre MÉRESSE (Jipem) (*French*)
+- enipra (*Armenian*)
+- Serhiy Dmytryshyn (dies) (*Ukrainian*)
+- Eric Brulatout (ebrulato) (*Esperanto*)
 - Hougo (hougo) (*French*)
-- ybardapurkar (*Marathi*)
-- 亜緯丹穂 (ayiniho) (*Japanese*)
-- Adrián Lattes (haztecaso) (*Spanish*)
-- Mordi Sacks (MordiSacks) (*Hebrew*)
-- Trinsec (*Dutch*)
+- Sonstwer (*German*)
+- Pedro Fernandes (djprmf) (*Portuguese*)
+- REMOVED_USER (*Norwegian*)
 - Tigran's Tips (tigrank08) (*Armenian*)
-- TracyJacks (*Chinese Simplified*)
+- 亜緯丹穂 (ayiniho) (*Japanese*)
+- maisui (*Chinese Simplified*)
+- Trinsec (*Dutch*)
+- Adrián Lattes (haztecaso) (*Spanish*)
+- webkinzfrog (*Polish*)
+- ybardapurkar (*Marathi*)
+- Mordi Sacks (MordiSacks) (*Hebrew*)
+- Manuel Tassi (Mannivu) (*Italian*)
 - Szabolcs Gál (galszabolcs810624) (*Hungarian*)
-- Vladislav Săcrieriu (vladislavs14) (*Romanian*)
-- danreznik (*Hebrew*)
+- rikrise (*Swedish*)
+- when_hurts (*German*)
+- Wojciech Bigosinski (wbigos2) (*Polish*)
+- Vladislav S (vladislavs) (*Romanian*)
+- mikslatvis (*Latvian*)
+- MartinAlstad (*Norwegian*)
+- TracyJacks (*Chinese Simplified*)
 - rasheedgm (*Kannada*)
+- Cirelli (cirelli94) (*Italian*)
+- danreznik (*Hebrew*)
+- iraline (*Portuguese, Brazilian*)
+- Seán Mór (seanmor3) (*Irish*)
+- vianaweb (*Portuguese, Brazilian*)
+- Siddharastro Doraku (sidharastro) (*Spanish, Mexico*)
+- REMOVED_USER (*Spanish*)
 - omquylzu (*Latvian*)
-- c6ristian (*German*)
-- Belkacem Mohammed (belkacem77) (*Kabyle*)
-- lexxai (*Ukrainian*)
+- Arthegor (*French*)
 - Navjot Singh (nspeaks) (*Hindi*)
-- Ozai (*German*)
-- Sahak Petrosyan (petrosyan) (*Armenian*)
-- Oymate (*Bengali*)
-- Viorel-Cătălin Răpițeanu (rapiteanu) (*Romanian*)
-- siamano (*Thai, Esperanto*)
-- Siddhartha Sarathi Basu (quinoa_biryani) (*Bengali*)
-- Pachara Chantawong (pachara2202) (*Thai*)
-- Zijian Zhao (jobs2512821228) (*Chinese Simplified*)
-- Skew (noan.perrot) (*French*)
 - mkljczk (*Polish*)
-- Guru Prasath Anandapadmanaban (guruprasath) (*Tamil*)
+- Belkacem Mohammed (belkacem77) (*Kabyle*)
+- Showfom (*Chinese Simplified*)
+- xemyst (*Catalan*)
+- lexxai (*Ukrainian*)
+- c6ristian (*German*)
+- svetlozaurus (*Bulgarian*)
+- Ozai (*German*)
+- damascene (*Arabic*)
+- Jan Ainali (Ainali) (*Swedish*)
+- Sahak Petrosyan (petrosyan) (*Armenian*)
+- Metehan Özyürek (MetehanOzyurek) (*Turkish*)
+- Сау Рэмсон (sawrams) (*Russian*)
+- metehan-arslan (*Turkish*)
+- Viorel-Cătălin Răpițeanu (rapiteanu) (*Romanian*)
+- Sébastien SERRE (sebastienserre) (*French*)
+- Eugen Caruntu (eugencaruntu) (*Romanian*)
+- Kevin Scannell (kscanne) (*Irish*)
+- Pachara Chantawong (pachara2202) (*Thai*)
+- bensch.dev (*German*)
+- LIZH (*French*)
+- Siddhartha Sarathi Basu (quinoa_biryani) (*Bengali*)
+- Overflow Cat (OverflowCat) (*Chinese Traditional, Chinese Simplified*)
+- Stephan Voeth (svoeth) (*German*)
+- Zijian Zhao (jobs2512821228) (*Chinese Simplified*)
+- bugboy-20 (*Esperanto, Italian*)
+- SouthFox (*Chinese Simplified*)
+- Noan (SkewRam) (*French*)
+- dbeaver (*German*)
 - turtle836 (*German*)
+- Guru Prasath Anandapadmanaban (guruprasath) (*Tamil*)
+- zordsdavini (*Lithuanian*)
+- Susanna Ånäs (susanna.anas) (*Finnish*)
+- Alessandro (alephoto85) (*Italian*)
 - Marcepanek_ (thekingmarcepan) (*Polish*)
-- Lamin (laminne) (*Japanese*)
+- Choi Younsoo (usagicore) (*Korean*)
 - Yann Aguettaz (yann-a) (*French*)
+- zylosophe (*French*)
+- Celso Fernandes (Celsof) (*Portuguese, Brazilian*)
 - Feruz Oripov (FeruzOripov) (*Russian*)
-- serapolis (*Chinese Simplified, Chinese Traditional*)
+- REMOVED_USER (*French*)
+- Bui Huy Quang (bhuyquang1) (*Vietnamese*)
+- bogomilshopov (*Bulgarian*)
+- REMOVED_USER (*Burmese*)
+- Kaede (kaedech) (*Japanese*)
 - Mick Onio (xgc.redes) (*Asturian*)
 - Malik Mann (dermalikmann) (*German*)
-- dadosch (*German*)
-- r3dsp1 (*Chinese Traditional, Hong Kong*)
-- hg6 (*Hindi*)
-- Tianqi Zhang (tina.zhang040609) (*Chinese Simplified*)
 - padulafacundo (*Spanish*)
-- johannes hove-henriksen (J0hsHH) (*Norwegian*)
+- r3dsp1 (*Chinese Traditional, Hong Kong*)
+- dadosch (*German*)
+- Tianqi Zhang (tina.zhang040609) (*Chinese Simplified*)
+- HybridGlucose (*Chinese Traditional*)
+- vmichalak (*French*)
+- hg6 (*Hindi*)
+- marivisales (*Portuguese, Brazilian*)
 - Orlando Murcio (Atos20) (*Spanish, Mexico*)
+- maa123 (*Japanese*)
+- Julian Doser (julian21) (*English, United Kingdom, German*)
+- johannes hove-henriksen (J0hsHH) (*Norwegian*)
+- Alexander Ivanov (Saiv46) (*Russian*)
+- unstable.icu (*Chinese Simplified*)
 - Padraic Calpin (padraic-padraic) (*Slovenian*)
+- Youngeon Lee (YoungeonLee) (*Korean*)
+- LeJun (le-jun) (*French*)
+- shdy (*German*)
+- REMOVED_USER (*French*)
+- Yonjae Lee (yonjlee) (*Korean*)
 - cenegd (*Chinese Simplified*)
 - piupiupiudiu (*Chinese Simplified*)
-- shdy (*German*)
-- Ильзира Рахматуллина (rahmatullinailzira53) (*Tatar*)
-- Hugh Liu (youloveonlymeh) (*Chinese Simplified*)
-- Pixelcode (realpixelcode) (*German*)
+- Umi (mtrumi) (*Chinese Traditional, Hong Kong, Chinese Simplified*)
 - Yogesh K S (yogi) (*Kannada*)
+- Ulong32 (*Japanese*)
 - Adithya K (adithyak04) (*Malayalam*)
-- Dennis Reimund (reimunddennis7) (*German*)
+- DAI JIE (daijie) (*Chinese Simplified*)
+- Mihael Budeč (milli.pretili) (*Croatian*)
+- Hugh Liu (youloveonlymeh) (*Chinese Simplified*)
+- ZQYD (*Chinese Simplified*)
+- X.M (kimonoki) (*Chinese Simplified*)
 - Rakino (rakino) (*Chinese Simplified*)
-- Michał Sidor (michcioperz) (*Polish*)
+- paziy Georgi (paziygeorgi4) (*Dutch*)
+- Komeil Parseh (mmdbalkhi) (*Persian*)
+- Jothipazhani Nagarajan (jothipazhani.n) (*Tamil*)
+- tikky9 (*Portuguese, Brazilian*)
+- horsm (*Finnish*)
+- BenJule (*German*)
+- Stanisław Jelnicki (JelNiSlaw) (*Polish*)
+- Yananas (wangyanyan.hy) (*Chinese Simplified*)
+- Vivamus (elaaksu) (*Turkish*)
+- ihealyou (*Italian*)
 - AmazighNM (*Kabyle*)
 - Miquel Sabaté Solà (mssola) (*Catalan*)
-- Jothipazhani Nagarajan (jothipazhani.n) (*Tamil*)
+- residuum (*German*)
+- nua_kr (*Korean*)
+- Andrea Mazzilli (andreamazzilli) (*Italian*)
+- Paula SIMON (EncoreEutIlFalluQueJeLeSusse) (*French*)
 - hallomaurits (*Dutch*)
+- Erfan Kheyrollahi Qaroğlu (ekm507) (*Persian*)
+- REMOVED_USER (*Galician, Spanish*)
 - alnd hezh (alndhezh) (*Sorani (Kurdish)*)
 - Clash Clans (KURD12345) (*Sorani (Kurdish)*)
+- ruok (*Chinese Simplified*)
+- Frederik-FJ (*German*)
+- CloudSet (*Chinese Simplified*)
 - Solid Rhino (SolidRhino) (*Dutch*)
-- Metehan Özyürek (MetehanOzyurek) (*Turkish*)
-- 林水溶 (shuiRong) (*Chinese Simplified*)
-- Sébastien Feugère (smonff) (*French*)
-- Y.Yamashiro (uist1idrju3i) (*Japanese*)
-- Takeshi Umeda (noellabo) (*Japanese*)
-- k_taka (peaceroad) (*Japanese*)
 - hussama (*Portuguese, Brazilian*)
+- jazzynico (*French*)
+- k_taka (peaceroad) (*Japanese*)
+- 林水溶 (shuiRong) (*Chinese Simplified*)
+- Peter Lutz (theellutzo) (*German*)
+- Sébastien Feugère (smonff) (*French*)
+- AnalGoddess770 (*Hebrew*)
+- Sven Goller (svengoller) (*German*)
+- Ahmet (ahmetlii) (*Turkish*)
+- hosted22 (*German*)
 - Hallo Abdullah (hallo_hamza12) (*Sorani (Kurdish)*)
+- Karam Hamada (TheKaram) (*Arabic*)
+- Takeshi Umeda (noellabo) (*Japanese*)
+- SnDer (*Dutch*)
+- Robert Yano (throwcalmbobaway) (*Spanish, Mexico*)
+- Gustav Lindqvist (Reedyn) (*Swedish*)
+- Dagur Ammendrup (dagurp) (*Icelandic*)
+- shafouz (*Portuguese, Brazilian*)
+- Miguel Branco (mglbranco) (*Galician*)
+- Sergey Panteleev (saundefined) (*Russian*)
+- Tom_ (*Czech*)
+- Zlr- (cZeler) (*French*)
 - Ashok314 (ashok314) (*Hindi*)
 - PifyZ (*French*)
-- OminousCry (*Russian*)
-- Robert Yano (throwcalmbobaway) (*Spanish, Mexico*)
-- Tom_ (*Czech*)
-- Tagada (Tagadda) (*French*)
-- shafouz (*Portuguese, Brazilian*)
-- Yasin İsa YILDIRIM (redsfyre) (*Turkish*)
+- Zeyi Fan (fanzeyi) (*Chinese Simplified*)
+- OminousCry (*Russian, Ukrainian*)
+- Adam Sapiński (Adamos9898) (*Polish*)
 - eichkat3r (*German*)
-- SnDer (*Dutch*)
-- Kahina Mess (K_hina) (*Kabyle*)
-- Swati Sani (swatisani) (*Urdu (Pakistan)*)
-- Kk (kishorkumara3) (*Kannada*)
-- Daniel M. (daniconil) (*Catalan*)
-- Shrinivasan T (tshrinivasan) (*Tamil*)
+- Yasin İsa YILDIRIM (redsfyre) (*Turkish*)
+- Tagada (Tagadda) (*French*)
+- gasrios (*Portuguese, Brazilian*)
 - 夜楓Yoka (Yoka2627) (*Chinese Simplified*)
+- AniCommieDDR (*Russian*)
 - Nathaël Noguès (NatNgs) (*French*)
+- Daniel M. (daniconil) (*Catalan*)
+- César Daniel Cavanzo Quintero (LeinadCQ) (*Esperanto*)
+- Noam Tamim (noamtm) (*Hebrew*)
+- papayaisnotafood (*Chinese Traditional*)
 - さっかりんにーさん (saccharin23) (*Japanese*)
-- Rex_sa (rex07) (*Arabic*)
-- Robin van der Vliet (RobinvanderVliet) (*Esperanto*)
+- Marcin Wolski (martinwolski) (*Polish*)
+- REMOVED_USER (*Chinese Simplified*)
+- Kk (kishorkumara3) (*Kannada*)
+- Shrinivasan T (tshrinivasan) (*Tamil*)
+- REMOVED_USER (Urdu (Pakistan))
+- Kakarico Bra (kakarico20) (*Portuguese, Brazilian*)
+- Swati Sani (swatisani) (*Urdu (Pakistan)*)
+- 快乐的老鼠宝宝 (LaoShuBaby) (*Chinese Simplified, Chinese Traditional*)
+- Mt Front (mtfront) (*Chinese Simplified*)
+- SusVersiva (*Catalan*)
+- REMOVED_USER (*Portuguese, Brazilian*)
+- Avinash Mg (hatman290) (*Malayalam*)
+- kruijs (*Dutch*)
+- Artem (Artem4ik) (*Russian*)
+- Zinkokooo (*Basque*)
+- 劉昌賢 (twcctz500) (*Chinese Traditional*)
 - Vikatakavi (*Kannada*)
 - Tradjincal (tradjincal) (*French*)
-- pullopen (*Chinese Simplified*)
-- SusVersiva (*Catalan*)
+- Robin van der Vliet (RobinvanderVliet) (*Esperanto*)
 - Marvin (magicmarvman) (*German*)
-- Zinkokooo (*Basque*)
-- Livingston Samuel (livingston) (*Tamil*)
-- CyberAmoeba (pseudoobscura) (*Chinese Simplified*)
-- tsundoker (*Malayalam*)
-- eorn (*Breton*)
-- prabhjot (*Hindi*)
-- mmokhi (*Persian*)
-- sergioaraujo1 (*Portuguese, Brazilian*)
+- pullopen (*Chinese Simplified*)
+- Tealk (*German*)
+- tibequadorian (*German*)
+- Henk Bulder (henkbulder) (*Dutch*)
+- Edison Lee (edisonlee55) (*Chinese Traditional*)
+- mpdude (*German*)
+- Rijk van Geijtenbeek (rvangeijtenbeek) (*Dutch*)
 - Entelekheia-ousia (*Chinese Simplified*)
-- Pierre Morvan (Iriep) (*Breton*)
-- oscfd (*Spanish*)
-- skaaarrr (*German*)
-- mkljczk (mykylyjczyk) (*Polish*)
-- fedot (*Russian*)
+- REMOVED_USER (*Spanish*)
+- sergioaraujo1 (*Portuguese, Brazilian*)
+- Livingston Samuel (livingston) (*Tamil*)
+- mmokhi (*Persian*)
+- tsundoker (*Malayalam*)
+- CyberAmoeba (pseudoobscura) (*Chinese Simplified*)
+- prabhjot (*Hindi*)
+- Ikka Putri (ikka240290) (*Indonesian, Danish, English, United Kingdom*)
 - Paz Galindo (paz.almendra.g) (*Spanish*)
 - Ricardo Colin (rysard) (*Spanish*)
+- Pierre Morvan (Iriep) (*Breton*)
+- oscfd (*Spanish*)
+- Thies Mueller (thies00) (*German*)
+- Lyra (teromene) (*French*)
+- Kedr (lava20121991) (*Esperanto*)
+- mkljczk (mykylyjczyk) (*Polish*)
+- fedot (*Russian*)
 - Philipp Fischbeck (PFischbeck) (*German*)
-- Zoé Bőle (zoe1337) (*German*)
-- EzigboOmenana (*Cornish*)
-- GaggiX (*Italian*)
+- Hasan Berkay Çağır (berkaycagir) (*Turkish*)
+- Silvestri Nicola (nick99silver) (*Italian*)
+- skaaarrr (*German*)
+- Mo Rijndael (mo_rijndael) (*Russian*)
+- tsesunnaallun (orezraey) (*Portuguese, Brazilian*)
 - Lukas Fülling (lfuelling) (*German*)
-- JackXu (Merman-Jack) (*Chinese Simplified*)
+- Algo (algovigura) (*Indonesian*)
+- REMOVED_USER (*Spanish*)
+- setthemfree (*Ukrainian*)
+- i fly (ifly3years) (*Chinese Simplified*)
 - ralozkolya (*Georgian*)
+- Zoé Bőle (zoe1337) (*German*)
+- Ville Rantanen (vrntnn) (*Finnish*)
+- GaggiX (*Italian*)
+- JackXu (Merman-Jack) (*Chinese Simplified*)
+- ceonia (*Chinese Traditional, Hong Kong*)
+- Emirhan Yavuz (takomlii) (*Turkish*)
+- teezeh (*German*)
+- MevLyshkin (Leinnan) (*Polish*)
 - Apple (blackteaovo) (*Chinese Simplified*)
-- asala4544 (*Basque*)
-- Xurxo Guerra (xguerrap) (*Galician*)
 - qwerty287 (*German*)
-- Anoop (anoopp) (*Malayalam*)
-- pezcurrel (*Italian*)
-- Samir Tighzert (samir_t7) (*Kabyle*)
-- Dremski (*Bulgarian*)
-- Dennis Reimund (reimund_dennis) (*German*)
-- ru_mactunnag (*Scottish Gaelic*)
+- Tangcuyu (*Chinese Simplified*)
 - Nocta (*French*)
+- ru_mactunnag (*Scottish Gaelic*)
+- Lilian Nabati (Lilounab49) (*French*)
+- lokalisoija (*Finnish*)
+- Dennis Reimund (reimund_dennis) (*German*)
+- ronee (*Kurmanji (Kurdish)*)
+- EricVogt_ (*Spanish*)
+- yu miao (metaxx.dev) (*Chinese Simplified*)
+- Anoop (anoopp) (*Malayalam*)
+- Samir Tighzert (samir_t7) (*Kabyle*)
+- sn02 (*German*)
+- Yui Karasuma (yui87) (*Japanese*)
+- asala4544 (*Basque*)
+- Thibaut Rousseau (thiht44) (*French*)
+- Jason Gibson (barberpike606) (*Slovenian, Chinese Simplified*)
+- Sugar NO (g1024116707) (*Chinese Simplified*)
 - Aymeric (AymBroussier) (*French*)
-- mashirozx (*Chinese Simplified*)
+- pezcurrel (*Italian*)
+- Xurxo Guerra (xguerrap) (*Galician*)
+- nicosomb (*French*)
 - Albatroz Jeremias (albjeremias) (*Portuguese*)
-- Matias Lavik (matiaslavik) (*Norwegian Nynorsk*)
-- Amith Raj Shetty (amithraj1989) (*Kannada*)
-- abidin toumi (Zet24) (*Arabic*)
-- mikel (mikelalas) (*Spanish*)
-- OpenAlgeria (*Arabic*)
-- random_person (*Spanish*)
-- Sais Lakshmanan (Saislakshmanan) (*Tamil*)
-- Trond Boksasp (boksasp) (*Norwegian*)
-- xpac1985 (xpac) (*German*)
-- Zlr- (cZeler) (*French*)
-- Mohammad Adnan Mahmood (adnanmig) (*Arabic*)
-- mimikun (*Japanese*)
-- smedvedev (*Russian*)
-- asretro (*Chinese Traditional, Hong Kong*)
-- tamaina (*Japanese*)
-- Aman Alam (aalam) (*Punjabi*)
-- ÀŘǾŚ PÀŚĦÀÍ (arospashai) (*Sorani (Kurdish)*)
-- Kaede (kaedech) (*Japanese*)
+- María José Vera (mjverap) (*Spanish*)
+- mashirozx (*Chinese Simplified*)
+- codl (*French*)
 - Doug (douglasalvespe) (*Portuguese, Brazilian*)
+- Matias Lavik (matiaslavik) (*Norwegian Nynorsk*)
+- random_person (*Spanish*)
+- whoeta (wh0eta) (*Russian*)
+- xpac1985 (xpac) (*German*)
+- thisdudeisvegan (braydofficial) (*German*)
 - Fleva (*Sardinian*)
-- Abijeet Patro (Abijeet) (*Basque*)
-- SamOak (*Portuguese, Brazilian*)
-- Aries (orlea) (*Japanese*)
+- Anonymous (Anonymous666) (*Russian*)
+- Mohammad Adnan Mahmood (adnanmig) (*Arabic*)
+- ÀŘǾŚ PÀŚĦÀÍ (arospashai) (*Sorani (Kurdish)*)
+- mikel (mikelalas) (*Spanish*)
+- Trond Boksasp (boksasp) (*Norwegian*)
+- asretro (*Chinese Traditional, Hong Kong*)
+- Holger Huo (holgerhuo) (*Chinese Simplified*)
+- Aman Alam (aalam) (*Punjabi*)
+- smedvedev (*Russian*)
+- Jay Lonnquist (crowkeep) (*Japanese*)
+- mimikun (*Japanese*)
+- Mohd Bilal (mdb571) (*Malayalam*)
+- veer66 (*Thai*)
+- OpenAlgeria (*Arabic*)
+- Rave (nayumi-464812844) (*Vietnamese*)
+- ReavedNetwork (*German*)
+- Michael (Discostu36) (*German*)
+- tamaina (*Japanese*)
+- sk22 (*German*)
+- Ragnars Eggerts (rmegg1933) (*Latvian*)
+- Sais Lakshmanan (Saislakshmanan) (*Tamil*)
+- Amith Raj Shetty (amithraj1989) (*Kannada*)
 - Bartek Fijałkowski (brateq) (*Polish*)
-- NeverMine17 (*Russian*)
-- Brodi (brodi1) (*Dutch*)
-- Ács Zoltán (zoli111) (*Hungarian*)
+- Asbeltrion (*Spanish*)
+- Michael Horstmann (mhrstmnn) (*German*)
+- Joffrey Abeilard (Abeilard14) (*French*)
 - capiscuas (*Spanish*)
-- Benjamin Cobb (benjamincobb) (*German*)
 - djoerd (*Dutch*)
-- waweic (*German*)
-- Amir Kurdo (kuraking202) (*Sorani (Kurdish)*)
-- dobrado (*Portuguese, Brazilian*)
-- Baban Abdulrahman (baban.abdulrehman) (*Sorani (Kurdish)*)
-- dcapillae (*Spanish*)
-- Azad ahmad (dashty) (*Sorani (Kurdish)*)
-- Salh_haji6 (*Sorani (Kurdish)*)
-- Ranj A Abdulqadir (RanjAhmed) (*Sorani (Kurdish)*)
-- tateisu (*Japanese*)
-- Savarín Electrográfico Marmota Intergalactica (herrero.maty) (*Spanish*)
+- REMOVED_USER (*Spanish*)
+- NeverMine17 (*Russian*)
+- songxianj (songxian_jiang) (*Chinese Simplified*)
+- Ács Zoltán (zoli111) (*Hungarian*)
+- haaninjo (*Swedish*)
+- REMOVED_USER (*Esperanto*)
+- Philip Molares (DerMolly) (*German*)
+- ChalkPE (amato0617) (*Korean*)
 - ebrezhoneg (*Breton*)
-- 于晚霞 (xissshawww) (*Chinese Simplified*)
-- silverscat_3 (SilversCat) (*Japanese*)
-- centumix (*Japanese*)
-- umonaca (*Chinese Simplified*)
-- Ni Futchi (futchitwo) (*Japanese*)
-- おさ (osapon) (*Japanese*)
-- kavitha129 (*Tamil*)
-- Hannah (Aniqueper1) (*Chinese Simplified*)
-- Jiniux (*Italian*)
-- Jari Ronkainen (ronchaine) (*Finnish*)
+- 디떱 (diddub) (*Korean*)
+- Hans (hansj) (*German*)
 - Nithya Mary (nithyamary25) (*Tamil*)
+- kavitha129 (*Tamil*)
+- waweic (*German*)
+- Aries (orlea) (*Japanese*)
+- おさ (osapon) (*Japanese*)
+- Abijeet Patro (Abijeet) (*Basque*)
+- centumix (*Japanese*)
+- Martin Müller (muellermartin) (*German*)
+- tateisu (*Japanese*)
+- Arĝentakato (argxentakato) (*Japanese*)
+- Benjamin Cobb (benjamincobb) (*German*)
+- deanerschnitzel (*German*)
+- Jill H. (kokakiwi) (*French*)
+- maksutheam (*Finnish*)
+- d0p1 (d0p1s4m4) (*French*)
+- majorblazr (*Danish*)
+- Patrice Boivin (patriceboivin58) (*French*)
+- 江尚寒 (jiangshanghan) (*Chinese Simplified*)
+- HSD Channel (kvdbve34) (*Russian*)
+- alwyn joe (iomedivh200) (*Chinese Simplified*)
+- ZHY (sheepzh) (*Chinese Simplified*)
+- Bei Li (libei) (*Chinese Simplified*)
+- Aluo (Aluo_rbszd) (*Chinese Simplified*)
+- clarkzjw (*Chinese Simplified*)
+- Noah Luppe (noahlup) (*German*)
+- araghunde (*Galician*)
+- BratishkaErik (*Russian*)
+- Bunny9568 (*Chinese Simplified*)
+- SamOak (*Portuguese, Brazilian*)
+- Ranj A Abdulqadir (RanjAhmed) (*Sorani (Kurdish)*)
+- Amir Kurdo (kuraking202) (*Sorani (Kurdish)*)
+- 于晚霞 (xissshawww) (*Chinese Simplified*)
+- Fyuoxyjidyho Moiodyyiodyhi (fyuodchiodmoiidiiduh86) (*Chinese Simplified*)
+- RPD0911 (*Hungarian*)
+- dcapillae (*Spanish*)
+- dobrado (*Portuguese, Brazilian*)
+- Hannah (Aniqueper1) (*Chinese Simplified*)
+- Azad ahmad (dashty) (*Sorani (Kurdish)*)
+- Uri Chachick (urich.404) (*Hebrew*)
+- Bnoru (*Portuguese, Brazilian*)
+- Jiniux (*Italian*)
+- REMOVED_USER (*German*)
+- Salh_haji6 (Sorani (Kurdish))
+- Kurdish Translator (*Kurdish.boy) (Sorani (Kurdish)*)
+- Beagle (beagleworks) (*Japanese*)
+- hud5634j (*Spanish*)
+- Kisaragi Hiu (flyingfeather1501) (*Chinese Traditional*)
+- Dominik Ziegler (dodomedia) (*German*)
+- soheilkhanalipur (*Persian*)
+- Brodi (brodi1) (*Dutch*)
+- Savarín Electrográfico Marmota Intergalactica (herrero.maty) (*Spanish*)
+- Ni Futchi (futchitwo) (*Japanese*)
+- Zois Lee (gcnwm) (*Chinese Simplified*)
+- Arnold Marko (atomicmind) (*Slovenian*)
+- scholzco (*German*)
+- Jari Ronkainen (ronchaine) (*Finnish*)
+- umonaca (*Chinese Simplified*)
diff --git a/Aptfile b/Aptfile
index b2cbad714..8f5bb72a2 100644
--- a/Aptfile
+++ b/Aptfile
@@ -1,28 +1,4 @@
 ffmpeg
-libicu[0-9][0-9]
-libicu-dev
-libidn11
-libidn11-dev
 libpq-dev
-libprotobuf-dev
 libxdamage1
 libxfixes3
-protobuf-compiler
-zlib1g-dev
-libcairo2
-libcroco3
-libdatrie1
-libgdk-pixbuf2.0-0
-libgraphite2-3
-libharfbuzz0b
-libpango-1.0-0
-libpangocairo-1.0-0
-libpangoft2-1.0-0
-libpixman-1-0
-librsvg2-2
-libthai-data
-libthai0
-libvpx[5-9]
-libxcb-render0
-libxcb-shm0
-libxrender1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0c6c5315..b1ad9e5fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,602 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [4.0.2] - 2022-11-15
+### Fixed
+
+- Fix wrong color on mentions hidden behind content warning in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/20724))
+- Fix filters from other users being used in the streaming service ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20719))
+- Fix `unsafe-eval` being used when `wasm-unsafe-eval` is enough in Content Security Policy ([Gargron](https://github.com/mastodon/mastodon/pull/20729), [prplecake](https://github.com/mastodon/mastodon/pull/20606))
+
+## [4.0.1] - 2022-11-14
+### Fixed
+
+- Fix nodes order being sometimes mangled when rewriting emoji ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20677))
+
+## [4.0.0] - 2022-11-14
+
+Some of the features in this release have been funded through the [NGI0 Discovery](https://nlnet.nl/discovery) Fund, a fund established by [NLnet](https://nlnet.nl/) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu/) programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 825322.
+
+### Added
+
+- Add ability to filter followed accounts' posts by language ([Gargron](https://github.com/mastodon/mastodon/pull/19095), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19268))
+- **Add ability to follow hashtags** ([Gargron](https://github.com/mastodon/mastodon/pull/18809), [Gargron](https://github.com/mastodon/mastodon/pull/18862), [Gargron](https://github.com/mastodon/mastodon/pull/19472), [noellabo](https://github.com/mastodon/mastodon/pull/18924))
+- Add ability to filter individual posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18945))
+- **Add ability to translate posts** ([Gargron](https://github.com/mastodon/mastodon/pull/19218), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19433), [Gargron](https://github.com/mastodon/mastodon/pull/19453), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19434), [Gargron](https://github.com/mastodon/mastodon/pull/19388), [ykzts](https://github.com/mastodon/mastodon/pull/19244), [Gargron](https://github.com/mastodon/mastodon/pull/19245))
+- Add featured tags to web UI ([noellabo](https://github.com/mastodon/mastodon/pull/19408), [noellabo](https://github.com/mastodon/mastodon/pull/19380), [noellabo](https://github.com/mastodon/mastodon/pull/19358), [noellabo](https://github.com/mastodon/mastodon/pull/19409), [Gargron](https://github.com/mastodon/mastodon/pull/19382), [ykzts](https://github.com/mastodon/mastodon/pull/19418), [noellabo](https://github.com/mastodon/mastodon/pull/19403), [noellabo](https://github.com/mastodon/mastodon/pull/19404), [Gargron](https://github.com/mastodon/mastodon/pull/19398), [Gargron](https://github.com/mastodon/mastodon/pull/19712), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/20018))
+- **Add support for language preferences for trending statuses and links** ([Gargron](https://github.com/mastodon/mastodon/pull/18288), [Gargron](https://github.com/mastodon/mastodon/pull/19349), [ykzts](https://github.com/mastodon/mastodon/pull/19335))
+  - Previously, you could only see trends in your current language
+  - For less popular languages, that meant empty trends
+  - Now, trends in your preferred languages' are shown on top, with others beneath
+- Add server rules to sign-up flow ([Gargron](https://github.com/mastodon/mastodon/pull/19296))
+- Add privacy icons to report modal in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19190))
+- Add `noopener` to links to remote profiles in web UI ([shleeable](https://github.com/mastodon/mastodon/pull/19014))
+- Add option to open original page in dropdowns of remote content in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/20299))
+- Add warning for sensitive audio posts in web UI ([rgroothuijsen](https://github.com/mastodon/mastodon/pull/17885))
+- Add language attribute to posts in web UI ([tribela](https://github.com/mastodon/mastodon/pull/18544))
+- Add support for uploading WebP files ([Saiv46](https://github.com/mastodon/mastodon/pull/18506))
+- Add support for uploading `audio/vnd.wave` files ([tribela](https://github.com/mastodon/mastodon/pull/18737))
+- Add support for uploading AVIF files ([txt-file](https://github.com/mastodon/mastodon/pull/19647))
+- Add support for uploading HEIC files ([Gargron](https://github.com/mastodon/mastodon/pull/19618))
+- Add more debug information when processing remote accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/15605), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19209))
+- **Add retention policy for cached content and media** ([Gargron](https://github.com/mastodon/mastodon/pull/19232), [zunda](https://github.com/mastodon/mastodon/pull/19478), [Gargron](https://github.com/mastodon/mastodon/pull/19458), [Gargron](https://github.com/mastodon/mastodon/pull/19248))
+  - Set for how long remote posts or media should be cached on your server
+  - Hands-off alternative to `tootctl` commands
+- **Add customizable user roles** ([Gargron](https://github.com/mastodon/mastodon/pull/18641), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18812), [Gargron](https://github.com/mastodon/mastodon/pull/19040), [tribela](https://github.com/mastodon/mastodon/pull/18825), [tribela](https://github.com/mastodon/mastodon/pull/18826), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18776), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18777), [unextro](https://github.com/mastodon/mastodon/pull/18786), [tribela](https://github.com/mastodon/mastodon/pull/18824), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19436))
+  - Previously, there were 3 hard-coded roles, user, moderator, and admin
+  - Create your own roles and decide which permissions they should have
+- Add notifications for new reports ([Gargron](https://github.com/mastodon/mastodon/pull/18697), [Gargron](https://github.com/mastodon/mastodon/pull/19475))
+- Add ability to select all accounts matching search for batch actions in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/19053), [Gargron](https://github.com/mastodon/mastodon/pull/19054))
+- Add ability to view previous edits of a status in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/19462))
+- Add ability to block sign-ups from IP ([Gargron](https://github.com/mastodon/mastodon/pull/19037))
+- **Add webhooks to admin UI** ([Gargron](https://github.com/mastodon/mastodon/pull/18510))
+- Add admin API for managing domain allows ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18668))
+- Add admin API for managing domain blocks ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18247))
+- Add admin API for managing e-mail domain blocks ([Gargron](https://github.com/mastodon/mastodon/pull/19066))
+- Add admin API for managing canonical e-mail blocks ([Gargron](https://github.com/mastodon/mastodon/pull/19067))
+- Add admin API for managing IP blocks ([Gargron](https://github.com/mastodon/mastodon/pull/19065), [trwnh](https://github.com/mastodon/mastodon/pull/20207))
+- Add `sensitized` attribute to accounts in admin REST API ([trwnh](https://github.com/mastodon/mastodon/pull/20094))
+- Add `services` and `metadata` to the NodeInfo endpoint ([MFTabriz](https://github.com/mastodon/mastodon/pull/18563))
+- Add `--remove-role` option to `tootctl accounts modify` ([Gargron](https://github.com/mastodon/mastodon/pull/19477))
+- Add `--days` option to `tootctl media refresh` ([tribela](https://github.com/mastodon/mastodon/pull/18425))
+- Add `EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION` environment variable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18642))
+- Add `IP_RETENTION_PERIOD` and `SESSION_RETENTION_PERIOD` environment variables ([kescherCode](https://github.com/mastodon/mastodon/pull/18757))
+- Add `http_hidden_proxy` environment variable ([tribela](https://github.com/mastodon/mastodon/pull/18427))
+- Add `ENABLE_STARTTLS` environment variable ([erbridge](https://github.com/mastodon/mastodon/pull/20321))
+- Add caching for payload serialization during fan-out ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19637), [Gargron](https://github.com/mastodon/mastodon/pull/19642), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19746), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19747), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19963))
+- Add assets from Twemoji 14.0 ([Gargron](https://github.com/mastodon/mastodon/pull/19733))
+- Add reputation and followers score boost to SQL-only account search ([Gargron](https://github.com/mastodon/mastodon/pull/19251))
+- Add Scots, Balaibalan, Láadan, Lingua Franca Nova, Lojban, Toki Pona to languages list ([VyrCossont](https://github.com/mastodon/mastodon/pull/20168))
+- Set autocomplete hints for e-mail, password and OTP fields ([rcombs](https://github.com/mastodon/mastodon/pull/19833), [offbyone](https://github.com/mastodon/mastodon/pull/19946), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/20071))
+- Add support for DigitalOcean Spaces in setup wizard ([v-aisac](https://github.com/mastodon/mastodon/pull/20573))
+
+### Changed
+
+- **Change brand color and logotypes** ([Gargron](https://github.com/mastodon/mastodon/pull/18592), [Gargron](https://github.com/mastodon/mastodon/pull/18639), [Gargron](https://github.com/mastodon/mastodon/pull/18691), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18634), [Gargron](https://github.com/mastodon/mastodon/pull/19254), [mayaeh](https://github.com/mastodon/mastodon/pull/18710))
+- **Change post editing to be enabled in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/19103))
+- **Change web UI to work for logged-out users** ([Gargron](https://github.com/mastodon/mastodon/pull/18961), [Gargron](https://github.com/mastodon/mastodon/pull/19250), [Gargron](https://github.com/mastodon/mastodon/pull/19294), [Gargron](https://github.com/mastodon/mastodon/pull/19306), [Gargron](https://github.com/mastodon/mastodon/pull/19315), [ykzts](https://github.com/mastodon/mastodon/pull/19322), [Gargron](https://github.com/mastodon/mastodon/pull/19412), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19437), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19415), [Gargron](https://github.com/mastodon/mastodon/pull/19348), [Gargron](https://github.com/mastodon/mastodon/pull/19295), [Gargron](https://github.com/mastodon/mastodon/pull/19422), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19414), [Gargron](https://github.com/mastodon/mastodon/pull/19319), [Gargron](https://github.com/mastodon/mastodon/pull/19345), [Gargron](https://github.com/mastodon/mastodon/pull/19310), [Gargron](https://github.com/mastodon/mastodon/pull/19301), [Gargron](https://github.com/mastodon/mastodon/pull/19423), [ykzts](https://github.com/mastodon/mastodon/pull/19471), [ykzts](https://github.com/mastodon/mastodon/pull/19333), [ykzts](https://github.com/mastodon/mastodon/pull/19337), [ykzts](https://github.com/mastodon/mastodon/pull/19272), [ykzts](https://github.com/mastodon/mastodon/pull/19468), [Gargron](https://github.com/mastodon/mastodon/pull/19466), [Gargron](https://github.com/mastodon/mastodon/pull/19457), [Gargron](https://github.com/mastodon/mastodon/pull/19426), [Gargron](https://github.com/mastodon/mastodon/pull/19427), [Gargron](https://github.com/mastodon/mastodon/pull/19421), [Gargron](https://github.com/mastodon/mastodon/pull/19417), [Gargron](https://github.com/mastodon/mastodon/pull/19413), [Gargron](https://github.com/mastodon/mastodon/pull/19397), [Gargron](https://github.com/mastodon/mastodon/pull/19387), [Gargron](https://github.com/mastodon/mastodon/pull/19396), [Gargron](https://github.com/mastodon/mastodon/pull/19385), [ykzts](https://github.com/mastodon/mastodon/pull/19334), [ykzts](https://github.com/mastodon/mastodon/pull/19329), [Gargron](https://github.com/mastodon/mastodon/pull/19324), [Gargron](https://github.com/mastodon/mastodon/pull/19318), [Gargron](https://github.com/mastodon/mastodon/pull/19316), [Gargron](https://github.com/mastodon/mastodon/pull/19263), [trwnh](https://github.com/mastodon/mastodon/pull/19305), [ykzts](https://github.com/mastodon/mastodon/pull/19273), [Gargron](https://github.com/mastodon/mastodon/pull/19801), [Gargron](https://github.com/mastodon/mastodon/pull/19790), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19773), [Gargron](https://github.com/mastodon/mastodon/pull/19798), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19724), [Gargron](https://github.com/mastodon/mastodon/pull/19709), [Gargron](https://github.com/mastodon/mastodon/pull/19514), [Gargron](https://github.com/mastodon/mastodon/pull/19562), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19981), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19978), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/20148), [Gargron](https://github.com/mastodon/mastodon/pull/20302), [cutls](https://github.com/mastodon/mastodon/pull/20400))
+  - The web app can now be accessed without being logged in
+  - No more `/web` prefix on web app paths
+  - Profiles, posts, and other public pages now use the same interface for logged in and logged out users
+  - The web app displays a server information banner
+  - Pop-up windows for remote interaction have been replaced with a modal window
+  - No need to type in your username for remote interaction, copy-paste-to-search method explained
+  - Various hints throughout the app explain what the different timelines are
+  - New about page design
+  - New privacy policy page design shows when the policy was last updated
+  - All sections of the web app now have appropriate window titles
+  - The layout of the interface has been streamlined between different screen sizes
+  - Posts now use more horizontal space
+- Change label of publish button to be "Publish" again in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18583))
+- Change language to be carried over on reply in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18557))
+- Change "Unfollow" to "Cancel follow request" when request still pending in web UI ([prplecake](https://github.com/mastodon/mastodon/pull/19363))
+- **Change post filtering system** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18058), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19050), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18894), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19051), [noellabo](https://github.com/mastodon/mastodon/pull/18923), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18956), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18744), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/19878), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/20567))
+  - Filtered keywords and phrases can now be grouped into named categories
+  - Filtered posts show which exact filter was hit
+  - Individual posts can be added to a filter
+  - You can peek inside filtered posts anyway
+- Change path of privacy policy page from `/terms` to `/privacy-policy` ([Gargron](https://github.com/mastodon/mastodon/pull/19249))
+- Change how hashtags are normalized ([Gargron](https://github.com/mastodon/mastodon/pull/18795), [Gargron](https://github.com/mastodon/mastodon/pull/18863), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18854))
+- Change settings area to be separated into categories in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/19407), [Gargron](https://github.com/mastodon/mastodon/pull/19533))
+- Change "No accounts selected" errors to use the appropriate noun in admin UI ([prplecake](https://github.com/mastodon/mastodon/pull/19356))
+- Change e-mail domain blocks to match subdomains of blocked domains ([Gargron](https://github.com/mastodon/mastodon/pull/18979))
+- Change custom emoji file size limit from 50 KB to 256 KB ([Gargron](https://github.com/mastodon/mastodon/pull/18788))
+- Change "Allow trends without prior review" setting to also work for trending posts ([Gargron](https://github.com/mastodon/mastodon/pull/17977))
+- Change admin announcements form to use single inputs for date and time in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18321))
+- Change search API to be accessible without being logged in ([Gargron](https://github.com/mastodon/mastodon/pull/18963), [Gargron](https://github.com/mastodon/mastodon/pull/19326))
+- Change following and followers API to be accessible without being logged in ([Gargron](https://github.com/mastodon/mastodon/pull/18964))
+- Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access ([Gargron](https://github.com/mastodon/mastodon/pull/19803))
+- Change Helm configuration ([deepy](https://github.com/mastodon/mastodon/pull/18997), [jgsmith](https://github.com/mastodon/mastodon/pull/18415), [deepy](https://github.com/mastodon/mastodon/pull/18941))
+- Change mentions of blocked users to not be processed ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19725))
+- Change max. thumbnail dimensions to 640x360px (360p) ([Gargron](https://github.com/mastodon/mastodon/pull/19619))
+- Change post-processing to be deferred only for large media types ([Gargron](https://github.com/mastodon/mastodon/pull/19617))
+- Change link verification to only work for https links without unicode ([Gargron](https://github.com/mastodon/mastodon/pull/20304), [Gargron](https://github.com/mastodon/mastodon/pull/20295))
+- Change account deletion requests to spread out over time ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20222))
+- Change larger reblogs/favourites numbers to be shortened in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/20303))
+- Change incoming activity processing to happen in `ingress` queue ([Gargron](https://github.com/mastodon/mastodon/pull/20264))
+- Change notifications to not link show preview cards in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20335))
+- Change amount of replies returned for logged out users in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20355))
+- Change in-app links to keep you in-app in web UI ([trwnh](https://github.com/mastodon/mastodon/pull/20540), [Gargron](https://github.com/mastodon/mastodon/pull/20628))
+- Change table header to be sticky in admin UI ([sk22](https://github.com/mastodon/mastodon/pull/20442))
+
+### Removed
+
+- Remove setting that disables account deletes ([Gargron](https://github.com/mastodon/mastodon/pull/17683))
+- Remove digest e-mails ([Gargron](https://github.com/mastodon/mastodon/pull/17985))
+- Remove unnecessary sections from welcome e-mail ([Gargron](https://github.com/mastodon/mastodon/pull/19299))
+- Remove item titles from RSS feeds ([Gargron](https://github.com/mastodon/mastodon/pull/18640))
+- Remove volume number from hashtags in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19253))
+- Remove Nanobox configuration ([tonyjiang](https://github.com/mastodon/mastodon/pull/17881))
+
+### Fixed
+
+- Fix rules with same priority being sorted non-deterministically ([Gargron](https://github.com/mastodon/mastodon/pull/20623))
+- Fix error when invalid domain name is submitted ([Gargron](https://github.com/mastodon/mastodon/pull/19474))
+- Fix icons having an image role ([Gargron](https://github.com/mastodon/mastodon/pull/20600))
+- Fix connections to IPv6-only servers ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20108))
+- Fix unnecessary service worker registration and preloading when logged out in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20341))
+- Fix unnecessary and slow regex construction ([raggi](https://github.com/mastodon/mastodon/pull/20215))
+- Fix `mailers` queue not being used for mailers ([Gargron](https://github.com/mastodon/mastodon/pull/20274))
+- Fix error in webfinger redirect handling ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20260))
+- Fix report category not being set to `violation` if rule IDs are provided ([trwnh](https://github.com/mastodon/mastodon/pull/20137))
+- Fix nodeinfo metadata attribute being an array instead of an object ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20114))
+- Fix account endorsements not being idempotent ([trwnh](https://github.com/mastodon/mastodon/pull/20118))
+- Fix status and rule IDs not being strings in admin reports REST API ([trwnh](https://github.com/mastodon/mastodon/pull/20122))
+- Fix error on invalid `replies_policy` in REST API ([trwnh](https://github.com/mastodon/mastodon/pull/20126))
+- Fix redrafting a currently-editing post not leaving edit mode in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20023))
+- Fix performance by avoiding method cache busts ([raggi](https://github.com/mastodon/mastodon/pull/19957))
+- Fix opening the language picker scrolling the single-column view to the top in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19983))
+- Fix content warning button missing `aria-expanded` attribute in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19975))
+- Fix redundant `aria-pressed` attributes in web UI ([Brawaru](https://github.com/mastodon/mastodon/pull/19912))
+- Fix crash when external auth provider has no display name set ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19962))
+- Fix followers count not being updated when migrating follows ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19998))
+- Fix double button to clear emoji search input in web UI ([sunny](https://github.com/mastodon/mastodon/pull/19888))
+- Fix missing null check on applications on strike disputes ([kescherCode](https://github.com/mastodon/mastodon/pull/19851))
+- Fix featured tags not saving preferred casing ([Gargron](https://github.com/mastodon/mastodon/pull/19732))
+- Fix language not being saved when editing status ([Gargron](https://github.com/mastodon/mastodon/pull/19543))
+- Fix not being able to input featured tag with hash symbol ([Gargron](https://github.com/mastodon/mastodon/pull/19535))
+- Fix user clean-up scheduler crash when an unconfirmed account has a moderation note ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19629))
+- Fix being unable to withdraw follow request when confirmation modal is disabled in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19687))
+- Fix inaccurate admin log entry for re-sending confirmation e-mails ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19674))
+- Fix edits not being immediately reflected ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19673))
+- Fix bookmark import stopping at the first failure ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19669))
+- Fix account action type validation ([Gargron](https://github.com/mastodon/mastodon/pull/19476))
+- Fix upload progress not communicating processing phase in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19530))
+- Fix wrong host being used for custom.css when asset host configured ([Gargron](https://github.com/mastodon/mastodon/pull/19521))
+- Fix account migration form ever using outdated account data ([Gargron](https://github.com/mastodon/mastodon/pull/18429), [nightpool](https://github.com/mastodon/mastodon/pull/19883))
+- Fix error when uploading malformed CSV import ([Gargron](https://github.com/mastodon/mastodon/pull/19509))
+- Fix avatars not using image tags in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19488))
+- Fix handling of duplicate and out-of-order notifications in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19693))
+- Fix reblogs being discarded after the reblogged status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19731))
+- Fix indexing scheduler trying to index when Elasticsearch is disabled ([Gargron](https://github.com/mastodon/mastodon/pull/19805))
+- Fix n+1 queries when rendering initial state JSON ([Gargron](https://github.com/mastodon/mastodon/pull/19795))
+- Fix n+1 query during status removal ([Gargron](https://github.com/mastodon/mastodon/pull/19753))
+- Fix OCR not working due to Content Security Policy in web UI ([prplecake](https://github.com/mastodon/mastodon/pull/18817))
+- Fix `nofollow` rel being removed in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19455))
+- Fix language dropdown causing zoom on mobile devices in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19428))
+- Fix button to dismiss suggestions not showing up in search results in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19325))
+- Fix language dropdown sometimes not appearing in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/19246))
+- Fix quickly switching notification filters resulting in empty or incorrect list in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19052), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18960))
+- Fix media modal link button in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18877))
+- Fix error upon successful account migration ([Gargron](https://github.com/mastodon/mastodon/pull/19386))
+- Fix negatives values in search index causing queries to fail ([Gargron](https://github.com/mastodon/mastodon/pull/19464), [Gargron](https://github.com/mastodon/mastodon/pull/19481))
+- Fix error when searching for invalid URL ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18580))
+- Fix IP blocks not having a unique index ([Gargron](https://github.com/mastodon/mastodon/pull/19456))
+- Fix remote account in contact account setting not being used ([Gargron](https://github.com/mastodon/mastodon/pull/19351))
+- Fix swallowing mentions of unconfirmed/unapproved users ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19191))
+- Fix incorrect and slow cache invalidation when blocking domain and removing media attachments ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19062))
+- Fix HTTPs redirect behaviour when running as I2P service ([gi-yt](https://github.com/mastodon/mastodon/pull/18929))
+- Fix deleted pinned posts potentially counting towards the pinned posts limit ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19005))
+- Fix compatibility with OpenSSL 3.0 ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18449))
+- Fix error when a remote report includes a private post the server has no access to ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18760))
+- Fix suspicious sign-in mails never being sent ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18599))
+- Fix fallback locale when somehow user's locale is an empty string ([tribela](https://github.com/mastodon/mastodon/pull/18543))
+- Fix avatar/header not being deleted locally when deleted on remote account ([tribela](https://github.com/mastodon/mastodon/pull/18973))
+- Fix missing `,` in Blurhash validation ([noellabo](https://github.com/mastodon/mastodon/pull/18660))
+- Fix order by most recent not working for relationships page in admin UI ([tribela](https://github.com/mastodon/mastodon/pull/18996))
+- Fix uncaught error when invalid date is supplied to API ([Gargron](https://github.com/mastodon/mastodon/pull/19480))
+- Fix REST API sometimes returning HTML on error ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/19135))
+- Fix ambiguous column names in `tootctl media refresh` ([tribela](https://github.com/mastodon/mastodon/pull/19206))
+- Fix ambiguous column names in `tootctl search deploy` ([mashirozx](https://github.com/mastodon/mastodon/pull/18993))
+- Fix `CDN_HOST` not being used in some asset URLs ([tribela](https://github.com/mastodon/mastodon/pull/18662))
+- Fix `CAS_DISPLAY_NAME`, `SAML_DISPLAY_NAME` and `OIDC_DISPLAY_NAME` being ignored ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18568))
+- Fix various typos in comments throughout the codebase ([luzpaz](https://github.com/mastodon/mastodon/pull/18604))
+- Fix CSV import error when rows include unicode characters ([HamptonMakes](https://github.com/mastodon/mastodon/pull/20592))
+
+### Security
+
+- Fix being able to spoof link verification ([Gargron](https://github.com/mastodon/mastodon/pull/20217))
+- Fix emoji substitution not applying only to text nodes in backend code ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20641))
+- Fix emoji substitution not applying only to text nodes in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20640))
+- Fix rate limiting for paths with formats ([Gargron](https://github.com/mastodon/mastodon/pull/20675))
+- Fix out-of-bound reads in blurhash transcoder ([delroth](https://github.com/mastodon/mastodon/pull/20388))
+
+## [3.5.3] - 2022-05-26
+### Added
+
+- **Add language dropdown to compose form in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/18420), [ykzts](https://github.com/mastodon/mastodon/pull/18460))
+- **Add warning for limited accounts in web UI** ([Gargron](https://github.com/mastodon/mastodon/pull/18344))
+- Add `limited` attribute to accounts in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/18344))
+
+### Changed
+
+- **Change RSS feeds** ([Gargron](https://github.com/mastodon/mastodon/pull/18356), [tribela](https://github.com/mastodon/mastodon/pull/18406))
+  - Titles are now date and time of post
+  - Bodies now render all content faithfully, including polls and emojis
+  - All media attachments are included with Media RSS
+- Change "dangerous" to "sensitive" in privacy policy and web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18515))
+- Change unconfirmed accounts to not be visible in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17530))
+- Change `tootctl search deploy` to improve performance ([Gargron](https://github.com/mastodon/mastodon/pull/18463), [Gargron](https://github.com/mastodon/mastodon/pull/18514))
+- Change search indexing to use batches to minimize resource usage ([Gargron](https://github.com/mastodon/mastodon/pull/18451))
+
+### Fixed
+
+- Fix follower and other counters being able to go negative ([Gargron](https://github.com/mastodon/mastodon/pull/18517))
+- Fix unnecessary query on when creating a status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17901))
+- Fix warning an account outside of a report closing all reports for that account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18387))
+- Fix error when resolving a link that redirects to a local post ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18314))
+- Fix preferred posting language returning unusable value in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/18428))
+- Fix race condition error when external status is reblogged ([ykzts](https://github.com/mastodon/mastodon/pull/18424))
+- Fix missing string for appeal validation error ([Gargron](https://github.com/mastodon/mastodon/pull/18410))
+- Fix block/mute lists showing a follow button in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18364))
+- Fix Redis configuration not being changed by `mastodon:setup` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18383))
+- Fix streaming notifications not using quick filter logic in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18316))
+- Fix ambiguous wording on appeal actions in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18328))
+- Fix floating action button obscuring last element in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18332))
+- Fix account warnings not being recorded in audit log ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18338))
+- Fix leftover icons for direct visibility statuses ([Steffo99](https://github.com/mastodon/mastodon/pull/18305))
+- Fix link verification requiring case sensitivity on links ([sgolemon](https://github.com/mastodon/mastodon/pull/18320))
+- Fix embeds not setting their height correctly ([rinsuki](https://github.com/mastodon/mastodon/pull/18301))
+
+### Security
+
+- Fix concurrent unfollowing decrementing follower count more than once ([Gargron](https://github.com/mastodon/mastodon/pull/18527))
+- Fix being able to appeal a strike unlimited times ([Gargron](https://github.com/mastodon/mastodon/pull/18529))
+- Fix being able to report otherwise inaccessible statuses ([Gargron](https://github.com/mastodon/mastodon/pull/18528))
+- Fix empty votes arbitrarily increasing voters count in polls ([Gargron](https://github.com/mastodon/mastodon/pull/18526))
+- Fix moderator identity leak when approving appeal of sensitive marked statuses ([Gargron](https://github.com/mastodon/mastodon/pull/18525))
+- Fix suspended users being able to access APIs that don't require a user ([Gargron](https://github.com/mastodon/mastodon/pull/18524))
+- Fix confirmation redirect to app without `Location` header ([Gargron](https://github.com/mastodon/mastodon/pull/18523))
+
+## [3.5.2] - 2022-05-04
+### Added
+
+- Add warning on direct messages screen in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18289))
+  - We already had a warning when composing a direct message, it has now been reworded to be more clear
+  - Same warning is now displayed when viewing sent and received direct messages
+- Add ability to set approval-based registration through tootctl ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18248))
+- Add pre-filling of domain from search filter in domain allow/block admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18172))
+
+## Changed
+
+- Change name of “Direct” visibility to “Mentioned people only” in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18146), [Gargron](https://github.com/mastodon/mastodon/pull/18289), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18291))
+- Change trending posts to only show one post from each account ([Gargron](https://github.com/mastodon/mastodon/pull/18181))
+- Change half-life of trending posts from 6 hours to 2 hours ([Gargron](https://github.com/mastodon/mastodon/pull/18182))
+- Change full-text search feature to also include polls you have voted in ([tribela](https://github.com/mastodon/mastodon/pull/18070))
+- Change Redis from using one connection per process, to using a connection pool ([Gargron](https://github.com/mastodon/mastodon/pull/18135), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18160), [Gargron](https://github.com/mastodon/mastodon/pull/18171))
+  - Different threads no longer have to wait on a mutex over a single connection
+  - However, this does increase the number of Redis connections by a fair amount
+  - We are planning to optimize Redis use so that the pool can be made smaller in the future
+
+## Removed
+
+- Remove IP matching from e-mail domain blocks ([Gargron](https://github.com/mastodon/mastodon/pull/18190))
+  - The IPs of the blocked e-mail domain or its MX records are no longer checked
+  - Previously it was too easy to block e-mail providers by mistake
+
+## Fixed
+
+- Fix compatibility with Friendica's pinned posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18254), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/18260))
+- Fix error when looking up handle with surrounding spaces in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18225))
+- Fix double render error when authorizing interaction ([Gargron](https://github.com/mastodon/mastodon/pull/18203))
+- Fix error when a post references an invalid media attachment ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18211))
+- Fix error when trying to revoke OAuth token without supplying a token ([Gargron](https://github.com/mastodon/mastodon/pull/18205))
+- Fix error caused by missing subject in Webfinger response ([Gargron](https://github.com/mastodon/mastodon/pull/18204))
+- Fix error on attempting to delete an account moderation note ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18196))
+- Fix light-mode emoji borders in web UI ([Gaelan](https://github.com/mastodon/mastodon/pull/18131))
+- Fix being able to scroll away from the loading bar in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/18170))
+- Fix error when a bookmark or favorite has been reported and deleted ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18174))
+- Fix being offered empty “Server rules violation” report option in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18165))
+- Fix temporary network errors preventing from authorizing interactions with remote accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18161))
+- Fix incorrect link in "new trending tags" email ([cdzombak](https://github.com/mastodon/mastodon/pull/18156))
+- Fix missing indexes on some foreign keys ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18157))
+- Fix n+1 query on feed merge and populate operations ([Gargron](https://github.com/mastodon/mastodon/pull/18111))
+- Fix feed unmerge worker being exceptionally slow in some conditions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18110))
+- Fix PeerTube videos appearing with an erroneous “Edited at” marker ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18100))
+- Fix instance actor being created incorrectly when running through migrations ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18109))
+- Fix web push notifications containing HTML entities ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18071))
+- Fix inconsistent parsing of `TRUSTED_PROXY_IP` ([ykzts](https://github.com/mastodon/mastodon/pull/18051))
+- Fix error when fetching pinned posts ([tribela](https://github.com/mastodon/mastodon/pull/18030))
+- Fix wrong optimization in feed populate operation ([dogelover911](https://github.com/mastodon/mastodon/pull/18009))
+- Fix error in alias settings page ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/18004))
+
+## [3.5.1] - 2022-04-08
+### Added
+
+- Add pagination for trending statuses in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17976))
+
+### Changed
+
+- Change e-mail notifications to only be sent when recipient is offline ([Gargron](https://github.com/mastodon/mastodon/pull/17984))
+  - Send e-mails for mentions and follows by default again
+  - But only when recipient does not have push notifications through an app
+- Change `website` attribute to be nullable on `Application` entity in REST API ([rinsuki](https://github.com/mastodon/mastodon/pull/17962))
+
+### Removed
+
+- Remove sign-in token authentication, instead send e-mail about new sign-in ([Gargron](https://github.com/mastodon/mastodon/pull/17970))
+  - You no longer need to enter a security code sent through e-mail
+  - Instead you get an e-mail about a new sign-in from an unfamiliar IP address
+
+### Fixed
+
+- Fix error responses for `from` search prefix ([single-right-quote](https://github.com/mastodon/mastodon/pull/17963))
+- Fix dangling language-specific trends ([Gargron](https://github.com/mastodon/mastodon/pull/17997))
+- Fix extremely rare race condition when deleting a status or account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17994))
+- Fix trends returning less results per page when filtered in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17996))
+- Fix pagination header on empty trends responses in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17986))
+- Fix cookies secure flag being set when served over Tor ([Gargron](https://github.com/mastodon/mastodon/pull/17992))
+- Fix migration error handling ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17991))
+- Fix error when re-running some migrations if they get interrupted at the wrong moment ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17989))
+- Fix potentially missing statuses when reconnecting to streaming API in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17981), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17987), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17980))
+- Fix error when sending warning emails with custom text ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17983))
+- Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send ([Gargron](https://github.com/mastodon/mastodon/pull/17982))
+- Fix possible duplicate statuses in timelines in some edge cases in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17971))
+- Fix spurious edits and require incoming edits to be explicitly marked as such ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17918))
+- Fix error when encountering invalid pinned statuses ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17964))
+- Fix inconsistency in error handling when removing a status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17974))
+- Fix admin API unconditionally requiring CSRF token ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17975))
+- Fix trending tags endpoint missing `offset` param in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17973))
+- Fix unusual number formatting in some locales ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17929))
+- Fix `S3_FORCE_SINGLE_REQUEST` environment variable not working ([HolgerHuo](https://github.com/mastodon/mastodon/pull/17922))
+- Fix failure to build assets with OpenSSL 3 ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17930))
+- Fix PWA manifest using outdated routes ([HolgerHuo](https://github.com/mastodon/mastodon/pull/17921))
+- Fix error when indexing statuses into Elasticsearch ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17912))
+
+## [3.5.0] - 2022-03-30
+### Added
+
+- **Add support for incoming edited posts** ([Gargron](https://github.com/mastodon/mastodon/pull/16697), [Gargron](https://github.com/mastodon/mastodon/pull/17727), [Gargron](https://github.com/mastodon/mastodon/pull/17728), [Gargron](https://github.com/mastodon/mastodon/pull/17320), [Gargron](https://github.com/mastodon/mastodon/pull/17404), [Gargron](https://github.com/mastodon/mastodon/pull/17390), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17335), [Gargron](https://github.com/mastodon/mastodon/pull/17696), [Gargron](https://github.com/mastodon/mastodon/pull/17745), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17740), [Gargron](https://github.com/mastodon/mastodon/pull/17697), [Gargron](https://github.com/mastodon/mastodon/pull/17648), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17531), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17499), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17498), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17380), [Gargron](https://github.com/mastodon/mastodon/pull/17373), [Gargron](https://github.com/mastodon/mastodon/pull/17334), [Gargron](https://github.com/mastodon/mastodon/pull/17333), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17699), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17748))
+  - Previous versions remain available for perusal and comparison
+  - People who reblogged a post are notified when it's edited
+  - New REST APIs:
+    - `PUT /api/v1/statuses/:id`
+    - `GET /api/v1/statuses/:id/history`
+    - `GET /api/v1/statuses/:id/source`
+  - New streaming API event:
+    - `status.update`
+- **Add appeals for moderator decisions** ([Gargron](https://github.com/mastodon/mastodon/pull/17364), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17725), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17566), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17652), [Gargron](https://github.com/mastodon/mastodon/pull/17616), [Gargron](https://github.com/mastodon/mastodon/pull/17615), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17554), [Gargron](https://github.com/mastodon/mastodon/pull/17523))
+  - All default moderator decisions now notify the affected user by e-mail
+  - They now link to an appeal page instead of suggesting replying to the e-mail
+  - They can now be found in account settings and not just e-mail
+  - Users can submit one appeal within 20 days of the decision
+  - Moderators can approve or reject the appeal
+- **Add notifications for posts deleted by moderators** ([Gargron](https://github.com/mastodon/mastodon/pull/17204), [Gargron](https://github.com/mastodon/mastodon/pull/17668), [Gargron](https://github.com/mastodon/mastodon/pull/17746), [Gargron](https://github.com/mastodon/mastodon/pull/17679), [Gargron](https://github.com/mastodon/mastodon/pull/17487))
+  - New, redesigned report view in admin UI
+  - Common report actions now only take one click to complete
+  - Deleting posts or marking as sensitive from report now notifies user
+  - Reports can be categorized by reason and specific rules violated
+  - The reasons are automatically cited in the notifications, except for spam
+  - Marking posts as sensitive now federates using post editing
+- **Add explore page with trending posts and links** ([Gargron](https://github.com/mastodon/mastodon/pull/17123), [Gargron](https://github.com/mastodon/mastodon/pull/17431), [Gargron](https://github.com/mastodon/mastodon/pull/16917), [Gargron](https://github.com/mastodon/mastodon/pull/17677), [Gargron](https://github.com/mastodon/mastodon/pull/16938), [Gargron](https://github.com/mastodon/mastodon/pull/17044), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16978), [Gargron](https://github.com/mastodon/mastodon/pull/16979), [tribela](https://github.com/mastodon/mastodon/pull/17066), [Gargron](https://github.com/mastodon/mastodon/pull/17072), [Gargron](https://github.com/mastodon/mastodon/pull/17403), [noiob](https://github.com/mastodon/mastodon/pull/17624), [mayaeh](https://github.com/mastodon/mastodon/pull/17755), [mayaeh](https://github.com/mastodon/mastodon/pull/17757), [Gargron](https://github.com/mastodon/mastodon/pull/17760), [mayaeh](https://github.com/mastodon/mastodon/pull/17762))
+  - Hashtag trends algorithm is extended to work for posts and links
+  - Links are only considered if they have an adequate preview card
+  - Preview card generation has been improved to support structured data
+  - Links can only trend if the publisher (domain) has been approved
+  - Posts can only trend if the author has been approved
+  - Individual approval and rejection for posts and links is also available
+  - Moderators are notified about pending trends at most once every 2 hours
+  - Posts and link trends are language-specific
+  - Search page is redesigned into explore page in web UI
+  - Discovery tab is coming soon in official iOS and Android apps
+  - New REST APIs:
+    - `GET /api/v1/trends/links`
+    - `GET /api/v1/trends/statuses`
+    - `GET /api/v1/trends/tags` (alias of `GET /api/v1/trends`)
+    - `GET /api/v1/admin/trends/links`
+    - `GET /api/v1/admin/trends/statuses`
+    - `GET /api/v1/admin/trends/tags`
+- **Add graphs and retention metrics to admin dashboard** ([Gargron](https://github.com/mastodon/mastodon/pull/16829), [Gargron](https://github.com/mastodon/mastodon/pull/17617), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17570), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16910), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16909), [mashirozx](https://github.com/mastodon/mastodon/pull/16884), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16854))
+  - Dashboard shows more numbers with development over time
+  - Other data such as most used interface languages and sign-up sources
+  - User retention graph shows how many new users stick around
+  - New REST APIs:
+    - `POST /api/v1/admin/measures`
+    - `POST /api/v1/admin/dimensions`
+    - `POST /api/v1/admin/retention`
+- Add `GET /api/v1/accounts/familiar_followers` to REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17700))
+- Add `POST /api/v1/accounts/:id/remove_from_followers` to REST API ([noellabo](https://github.com/mastodon/mastodon/pull/16864))
+- Add `category` and `rule_ids` params to `POST /api/v1/reports` IN REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17492), [Gargron](https://github.com/mastodon/mastodon/pull/17682), [Gargron](https://github.com/mastodon/mastodon/pull/17713))
+  - `category` can be one of: `spam`, `violation`, `other` (default)
+  - `rule_ids` must reference `rules` returned in `GET /api/v1/instance`
+- Add global `lang` param to REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17464), [Gargron](https://github.com/mastodon/mastodon/pull/17592))
+- Add `types` param to `GET /api/v1/notifications` in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17767))
+- **Add notifications for moderators about new sign-ups** ([Gargron](https://github.com/mastodon/mastodon/pull/16953), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17629))
+  - When a new user confirms e-mail, moderators receive a notification
+  - New notification type:
+    - `admin.sign_up`
+- Add authentication history ([Gargron](https://github.com/mastodon/mastodon/pull/16408), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16428), [baby-gnu](https://github.com/mastodon/mastodon/pull/16654))
+- Add ability to automatically delete old posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16529), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17691), [tribela](https://github.com/mastodon/mastodon/pull/16653))
+- Add ability to pin private posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16954), [tribela](https://github.com/mastodon/mastodon/pull/17326), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17304), [MitarashiDango](https://github.com/mastodon/mastodon/pull/17647))
+- Add ability to filter search results by author using `from:` syntax ([tribela](https://github.com/mastodon/mastodon/pull/16526))
+- Add ability to delete canonical email blocks in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16644))
+- Add ability to purge undeliverable domains in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16686), [tribela](https://github.com/mastodon/mastodon/pull/17210), [tribela](https://github.com/mastodon/mastodon/pull/17741), [tribela](https://github.com/mastodon/mastodon/pull/17209))
+- Add ability to disable e-mail token authentication for specific users in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/16427))
+- **Add ability to suspend accounts in batches in admin UI** ([Gargron](https://github.com/mastodon/mastodon/pull/17009), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17301), [Gargron](https://github.com/mastodon/mastodon/pull/17444))
+  - New, redesigned accounts list in admin UI
+  - Batch suspensions are meant to help clean up spam and bot accounts
+  - They do not generate notifications
+- Add ability to filter reports by origin of target account in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/16487))
+- Add support for login through OpenID Connect ([chandrn7](https://github.com/mastodon/mastodon/pull/16221))
+- Add lazy loading for emoji picker in web UI ([mashirozx](https://github.com/mastodon/mastodon/pull/16907), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17011))
+- Add single option votes tooltip in polls in web UI ([Brawaru](https://github.com/mastodon/mastodon/pull/16849))
+- Add confirmation modal when closing media edit modal with unsaved changes in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16518))
+- Add hint about missing media attachment description in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17845))
+- Add support for fetching Create and Announce activities by URI in ActivityPub ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16383))
+- Add `S3_FORCE_SINGLE_REQUEST` environment variable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16866))
+- Add `OMNIAUTH_ONLY` environment variable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17288), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17345))
+- Add `ES_USER` and `ES_PASS` environment variables for Elasticsearch authentication ([tribela](https://github.com/mastodon/mastodon/pull/16890))
+- Add `CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED` environment variable ([baby-gnu](https://github.com/mastodon/mastodon/pull/16655))
+- Add ability to pass specific domains to `tootctl accounts cull` ([tribela](https://github.com/mastodon/mastodon/pull/16511))
+- Add `--by-uri` option to `tootctl domains purge` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16434))
+- Add `--batch-size` option to `tootctl search deploy` ([aquarla](https://github.com/mastodon/mastodon/pull/17049))
+- Add `--remove-orphans` option to `tootctl statuses remove` ([noellabo](https://github.com/mastodon/mastodon/pull/17067))
+
+### Changed
+
+- Change design of federation pages in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/17704), [noellabo](https://github.com/mastodon/mastodon/pull/17735), [Gargron](https://github.com/mastodon/mastodon/pull/17765))
+- Change design of account cards in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17689))
+- Change `follow` scope to be covered by `read` and `write` scopes in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17678))
+- Change design of authorized applications page ([Gargron](https://github.com/mastodon/mastodon/pull/17656), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17686))
+- Change e-mail domain blocks to block IPs dynamically ([Gargron](https://github.com/mastodon/mastodon/pull/17635), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17650), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17649))
+- Change report modal to include category selection in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17565), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17734), [Gargron](https://github.com/mastodon/mastodon/pull/17654), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17632))
+- Change reblogs to not count towards hashtag trends anymore ([Gargron](https://github.com/mastodon/mastodon/pull/17501))
+- Change languages to be listed under standard instead of native name in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/17485))
+- Change routing paths to use usernames in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/16171), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16772), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16773), [mashirozx](https://github.com/mastodon/mastodon/pull/16793), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17060))
+- Change list title input design in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17092))
+- Change "Opt-in to profile directory" preference to be general discoverability preference ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16637))
+- Change API rate limits to use /64 masking on IPv6 addresses ([tribela](https://github.com/mastodon/mastodon/pull/17588), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17600), [zunda](https://github.com/mastodon/mastodon/pull/17590))
+- Change allowed formats for locally uploaded custom emojis to include GIF ([rgroothuijsen](https://github.com/mastodon/mastodon/pull/17706), [Gargron](https://github.com/mastodon/mastodon/pull/17759))
+- Change error message when chosen password is too long ([rgroothuijsen](https://github.com/mastodon/mastodon/pull/17082))
+- Change minimum required Elasticsearch version from 6 to 7 ([noellabo](https://github.com/mastodon/mastodon/pull/16915))
+
+### Removed
+
+- Remove profile directory link from main navigation panel in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17688))
+- **Remove language detection through cld3** ([Gargron](https://github.com/mastodon/mastodon/pull/17478), [ykzts](https://github.com/mastodon/mastodon/pull/17539), [Gargron](https://github.com/mastodon/mastodon/pull/17496), [Gargron](https://github.com/mastodon/mastodon/pull/17722))
+  - cld3 is very inaccurate on short-form content even with unique alphabets
+  - Post language can be overridden individually using `language` param
+  - Otherwise, it defaults to the user's interface language
+- Remove support for `OAUTH_REDIRECT_AT_SIGN_IN` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17287))
+  - Use `OMNIAUTH_ONLY` instead
+- Remove Keybase integration ([Gargron](https://github.com/mastodon/mastodon/pull/17045))
+- Remove old columns and indexes ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17245), [Gargron](https://github.com/mastodon/mastodon/pull/16409), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17191))
+- Remove shortcodes from newly-created media attachments ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16730), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/16763))
+
+### Deprecated
+
+- `GET /api/v1/trends` → `GET /api/v1/trends/tags`
+- OAuth `follow` scope → `read` and/or `write`
+- `text` attribute on `DELETE /api/v1/statuses/:id` → `GET /api/v1/statuses/:id/source`
+
+### Fixed
+
+- Fix IDN domains not being rendered correctly in a few left-over places ([Gargron](https://github.com/mastodon/mastodon/pull/17848))
+- Fix Sanskrit translation not being used in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17820))
+- Fix Kurdish languages having the wrong language codes ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17812))
+- Fix pghero making database schema suggestions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17807))
+- Fix encoding glitch in the OpenGraph description of a profile page ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17821))
+- Fix web manifest not permitting PWA usage from alternate domains ([HolgerHuo](https://github.com/mastodon/mastodon/pull/16714))
+- Fix not being able to edit media attachments for scheduled posts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17690))
+- Fix subscribed relay activities being recorded as boosts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17571))
+- Fix streaming API server error messages when JSON parsing fails not specifying the source ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17559))
+- Fix browsers autofilling new password field with old password ([mashirozx](https://github.com/mastodon/mastodon/pull/17702))
+- Fix text being invisible before fonts load in web UI ([tribela](https://github.com/mastodon/mastodon/pull/16330))
+- Fix public profile pages of unconfirmed users being accessible ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17385), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17457))
+- Fix nil error when trying to fetch key for signature verification ([Gargron](https://github.com/mastodon/mastodon/pull/17747))
+- Fix null values being included in some indexes ([Gargron](https://github.com/mastodon/mastodon/pull/17711))
+- Fix `POST /api/v1/emails/confirmations` not being available after sign-up ([Gargron](https://github.com/mastodon/mastodon/pull/17743))
+- Fix rare race condition when reblogged post is deleted ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17693), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17730))
+- Fix being able to add more than 4 hashtags to hashtag column in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17729))
+- Fix data integrity of featured tags ([Gargron](https://github.com/mastodon/mastodon/pull/17712))
+- Fix performance of account timelines ([Gargron](https://github.com/mastodon/mastodon/pull/17709))
+- Fix returning empty `<p>` tag for blank account `note` in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17687))
+- Fix leak of existence of otherwise inaccessible posts in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/17684))
+- Fix not showing loading indicator when searching in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/17655))
+- Fix media modal footer's “external link” not being a link ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17561))
+- Fix reply button on media modal not giving focus to compose form ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17626))
+- Fix some media attachments being converted with too high framerates ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17619))
+- Fix sign in token and warning emails failing to send when contact e-mail address is malformed ([helloworldstack](https://github.com/mastodon/mastodon/pull/17589))
+- Fix opening the emoji picker scrolling the single-column view to the top ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17579))
+- Fix edge case where settings/admin page sidebar would be incorrectly hidden ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17580))
+- Fix performance of server-side filtering ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17575))
+- Fix privacy policy link not being visible on small screens ([Gargron](https://github.com/mastodon/mastodon/pull/17533))
+- Fix duplicate accounts when searching by IP range in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/17524), [tribela](https://github.com/mastodon/mastodon/pull/17150))
+- Fix error when performing a batch action on posts in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17532))
+- Fix deletes not being signed in authorized fetch mode ([Gargron](https://github.com/mastodon/mastodon/pull/17484))
+- Fix Undo Announce sometimes inlining the originally Announced status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17516))
+- Fix localization of cold-start follow recommendations ([Gargron](https://github.com/mastodon/mastodon/pull/17479), [Gargron](https://github.com/mastodon/mastodon/pull/17486))
+- Fix replies collection incorrectly looping ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17462))
+- Fix errors when multiple Delete are received for a given actor ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17460))
+- Fixed prototype pollution bug and only allow trusted origin ([r0hanSH](https://github.com/mastodon/mastodon/pull/17420))
+- Fix text being incorrectly pre-selected in composer textarea on /share ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17339))
+- Fix SMTP_ENABLE_STARTTLS_AUTO/SMTP_TLS/SMTP_SSL environment variables don't work ([kgtkr](https://github.com/mastodon/mastodon/pull/17216))
+- Fix media upload specific rate limits only being applied to v1 endpoint in REST API ([tribela](https://github.com/mastodon/mastodon/pull/17272))
+- Fix media descriptions not being used for client-side filtering ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17206))
+- Fix cold-start follow recommendation favouring older accounts due to wrong sorting ([noellabo](https://github.com/mastodon/mastodon/pull/17126))
+- Fix not redirect to the right page after authenticating with WebAuthn ([heguro](https://github.com/mastodon/mastodon/pull/17098))
+- Fix searching for additional hashtags in hashtag column ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17054))
+- Fix color of hashtag column settings inputs ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17058))
+- Fix performance of `tootctl statuses remove` ([noellabo](https://github.com/mastodon/mastodon/pull/17052))
+- Fix `tootctl accounts cull` not excluding domains on timeouts and certificate issues ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16433))
+- Fix 404 error when filtering admin action logs by non-existent target account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16643))
+- Fix error when accessing streaming API without any OAuth scopes ([Brawaru](https://github.com/mastodon/mastodon/pull/16823))
+- Fix follow request count not updating when new follow requests arrive over streaming API in web UI ([matildepark](https://github.com/mastodon/mastodon/pull/16652))
+- Fix error when unsuspending a local account ([HolgerHuo](https://github.com/mastodon/mastodon/pull/16605))
+- Fix crash when a notification contains a not yet processed media attachment in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16573))
+- Fix wrong color of download button in audio player in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16572))
+- Fix notes for others accounts not being deleted when an account is deleted ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16579))
+- Fix error when logging occurrence of unsupported video file ([noellabo](https://github.com/mastodon/mastodon/pull/16581))
+- Fix wrong elements in trends widget being hidden on smaller screens in web UI ([tribela](https://github.com/mastodon/mastodon/pull/16570))
+- Fix link to about page being displayed in limited federation mode ([weex](https://github.com/mastodon/mastodon/pull/16432))
+- Fix styling of boost button in media modal not reflecting ability to boost ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16387))
+- Fix OCR failure when erroneous lang data is in cache ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16386))
+- Fix downloading media from blocked domains in `tootctl media refresh` ([tribela](https://github.com/mastodon/mastodon/pull/16914))
+- Fix login form being displayed on landing page when already logged in ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17348))
+- Fix polling for media processing status too frequently in web UI ([tribela](https://github.com/mastodon/mastodon/pull/17271))
+- Fix hashtag autocomplete overriding user-typed case ([weex](https://github.com/mastodon/mastodon/pull/16460))
+- Fix WebAuthn authentication setup to not prompt for PIN ([truongnmt](https://github.com/mastodon/mastodon/pull/16545))
+
+### Security
+
+- Fix being able to post URLs longer than 4096 characters ([Gargron](https://github.com/mastodon/mastodon/pull/17908))
+- Fix being able to bypass e-mail restrictions ([Gargron](https://github.com/mastodon/mastodon/pull/17909))
+
+## [3.4.6] - 2022-02-03
+### Fixed
+
+- Fix `mastodon:webpush:generate_vapid_key` task requiring a functional environment ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17338))
+- Fix spurious errors when receiving an Add activity for a private post ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17425))
+
+### Security
+
+- Fix error-prone SQL queries ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/15828))
+- Fix not compacting incoming signed JSON-LD activities ([puckipedia](https://github.com/mastodon/mastodon/pull/17426), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17428)) (CVE-2022-24307)
+- Fix insufficient sanitization of report comments ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17430))
+- Fix stop condition of a Common Table Expression ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17427))
+- Disable legacy XSS filtering ([Wonderfall](https://github.com/mastodon/mastodon/pull/17289))
+
+## [3.4.5] - 2022-01-31
+### Added
+
+- Add more advanced migration tests ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17393))
+- Add github workflow to build Docker images ([unasuke](https://github.com/mastodon/mastodon/pull/16973), [Gargron](https://github.com/mastodon/mastodon/pull/16980), [Gargron](https://github.com/mastodon/mastodon/pull/17000))
+
+### Fixed
+
+- Fix some old migrations failing when skipping releases ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17394))
+- Fix migrations script failing in certain edge cases ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17398))
+- Fix Docker build ([tribela](https://github.com/mastodon/mastodon/pull/17188))
+- Fix Ruby 3.0 dependencies ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16723))
+- Fix followers synchronization mechanism ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16510))
+
+## [3.4.4] - 2021-11-26
+### Fixed
+
+- Fix error when suspending user with an already blocked canonical email ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17036))
+- Fix overflow of long profile fields in admin UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17010))
+- Fix confusing error when WebFinger request returns empty document ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16986))
+- Fix upload of remote media with OpenStack Swift sometimes failing ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16998))
+- Fix logout link not working in Safari ([noellabo](https://github.com/mastodon/mastodon/pull/16574))
+- Fix “open” link of media modal not closing modal in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16524))
+- Fix replying from modal in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16516))
+- Fix `mastodon:setup` command crashing in some circumstances ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16976))
+
+### Security
+
+- Fix filtering DMs from non-followed users ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17042))
+- Fix handling of recursive toots in WebUI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17041))
+
 ## [3.4.3] - 2021-11-06
 ### Fixed
 
@@ -42,7 +638,7 @@ All notable changes to this project will be documented in this file.
 - Fix suspended accounts statuses being merged back into timelines ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16628))
 - Fix crash when encountering invalid account fields ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16598))
 - Fix invalid blurhash handling for remote activities ([noellabo](https://github.com/mastodon/mastodon/pull/16583))
-- Fix newlines being added to accout notes when an account moves ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16415), [noellabo](https://github.com/mastodon/mastodon/pull/16576))
+- Fix newlines being added to account notes when an account moves ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16415), [noellabo](https://github.com/mastodon/mastodon/pull/16576))
 - Fix crash when creating an announcement with links ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16941))
 - Fix logging out from one browser logging out all other sessions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/16943))
 
@@ -375,7 +971,7 @@ All notable changes to this project will be documented in this file.
 - Fix inefficiency when fetching bookmarks ([akihikodaki](https://github.com/mastodon/mastodon/pull/14674))
 - Fix inefficiency when fetching favourites ([akihikodaki](https://github.com/mastodon/mastodon/pull/14673))
 - Fix inefficiency when fetching media-only account timeline ([akihikodaki](https://github.com/mastodon/mastodon/pull/14675))
-- Fix inefficieny when deleting accounts ([Gargron](https://github.com/mastodon/mastodon/pull/15387), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15409), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15407), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15408), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15402), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15416), [Gargron](https://github.com/mastodon/mastodon/pull/15421))
+- Fix inefficiency when deleting accounts ([Gargron](https://github.com/mastodon/mastodon/pull/15387), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15409), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15407), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15408), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15402), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/15416), [Gargron](https://github.com/mastodon/mastodon/pull/15421))
 - Fix redundant query when processing batch actions on custom emojis ([niwatori24](https://github.com/mastodon/mastodon/pull/14534))
 - Fix slow distinct queries where grouped queries are faster ([Gargron](https://github.com/mastodon/mastodon/pull/15287))
 - Fix performance on instances list in admin UI ([Gargron](https://github.com/mastodon/mastodon/pull/15282))
@@ -462,7 +1058,7 @@ All notable changes to this project will be documented in this file.
 - Add blurhash to link previews ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13984), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14143), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/13985), [Sasha-Sorokin](https://github.com/mastodon/mastodon/pull/14267), [Sasha-Sorokin](https://github.com/mastodon/mastodon/pull/14278), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14126), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14261), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14260))
   - In web UI, toots cannot be marked as sensitive unless there is media attached
   - However, it's possible to do via API or ActivityPub
-  - Thumnails of link previews of such posts now use blurhash in web UI
+  - Thumbnails of link previews of such posts now use blurhash in web UI
   - The Card entity in REST API has a new `blurhash` attribute
 - Add support for `summary` field for media description in ActivityPub ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13763))
 - Add hints about incomplete remote content to web UI ([Gargron](https://github.com/mastodon/mastodon/pull/14031), [noellabo](https://github.com/mastodon/mastodon/pull/14195))
@@ -485,7 +1081,7 @@ All notable changes to this project will be documented in this file.
   - The `meta` attribute on the Media Attachment entity in REST API can now have a `colors` attribute which in turn contains three hex colors: `background`, `foreground`, and `accent`
   - The background color is chosen from the most dominant color around the edges of the thumbnail
   - The foreground and accent colors are chosen from the colors that are the most different from the background color using the CIEDE2000 algorithm
-  - The most satured color of the two is designated as the accent color
+  - The most saturated color of the two is designated as the accent color
   - The one with the highest W3C contrast is designated as the foreground color
   - If there are not enough colors in the thumbnail, new ones are generated using a monochrome pattern
 - Add a visibility indicator to toots in web UI ([noellabo](https://github.com/mastodon/mastodon/pull/14123), [highemerly](https://github.com/mastodon/mastodon/pull/14292))
@@ -511,7 +1107,7 @@ All notable changes to this project will be documented in this file.
 - Change boost button to no longer serve as visibility indicator in web UI ([noellabo](https://github.com/mastodon/mastodon/pull/14132), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14373))
 - Change contrast of flash messages ([cchoi12](https://github.com/mastodon/mastodon/pull/13892))
 - Change wording from "Hide media" to "Hide image/images" in web UI ([ariasuni](https://github.com/mastodon/mastodon/pull/13834))
-- Change appearence of settings pages to be more consistent ([ariasuni](https://github.com/mastodon/mastodon/pull/13938))
+- Change appearance of settings pages to be more consistent ([ariasuni](https://github.com/mastodon/mastodon/pull/13938))
 - Change "Add media" tooltip to not include long list of formats in web UI ([ariasuni](https://github.com/mastodon/mastodon/pull/13954))
 - Change how badly contrasting emoji are rendered in web UI ([leo60228](https://github.com/mastodon/mastodon/pull/13773), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/13772), [mfmfuyu](https://github.com/mastodon/mastodon/pull/14020), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14015))
 - Change structure of unavailable content section on about page ([ariasuni](https://github.com/mastodon/mastodon/pull/13930))
@@ -527,14 +1123,14 @@ All notable changes to this project will be documented in this file.
     - `EMAIL_DOMAIN_WHITELIST` → `EMAIL_DOMAIN_ALLOWLIST`
   - CLI option changed:
     - `tootctl domains purge --whitelist-mode` → `tootctl domains purge --limited-federation-mode`
-- Remove some unnecessary database indices ([lfuelling](https://github.com/mastodon/mastodon/pull/13695), [noellabo](https://github.com/mastodon/mastodon/pull/14259))
+- Remove some unnecessary database indexes ([lfuelling](https://github.com/mastodon/mastodon/pull/13695), [noellabo](https://github.com/mastodon/mastodon/pull/14259))
 - Remove unnecessary Node.js version upper bound ([ykzts](https://github.com/mastodon/mastodon/pull/14139))
 
 ### Fixed
 
 - Fix `following` param not working when exact match is found in account search ([noellabo](https://github.com/mastodon/mastodon/pull/14394))
-- Fix sometimes occuring duplicate mention notifications ([noellabo](https://github.com/mastodon/mastodon/pull/14378))
-- Fix RSS feeds not being cachable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/14368))
+- Fix sometimes occurring duplicate mention notifications ([noellabo](https://github.com/mastodon/mastodon/pull/14378))
+- Fix RSS feeds not being cacheable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/14368))
 - Fix lack of locking around processing of Announce activities in ActivityPub ([noellabo](https://github.com/mastodon/mastodon/pull/14365))
 - Fix boosted toots from blocked account not being retroactively removed from TL ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/14339))
 - Fix large shortened numbers (like 1.2K) using incorrect pluralization ([Sasha-Sorokin](https://github.com/mastodon/mastodon/pull/14061))
@@ -546,7 +1142,7 @@ All notable changes to this project will be documented in this file.
 - Fix new posts pushing down origin of opened dropdown in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/14271), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14348))
 - Fix timeline markers not being saved sometimes ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13887), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/13889), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/14155))
 - Fix CSV uploads being rejected ([noellabo](https://github.com/mastodon/mastodon/pull/13835))
-- Fix incompatibility with ElasticSearch 7.x ([noellabo](https://github.com/mastodon/mastodon/pull/13828))
+- Fix incompatibility with Elasticsearch 7.x ([noellabo](https://github.com/mastodon/mastodon/pull/13828))
 - Fix being able to search posts where you're in the target audience but not actively mentioned ([noellabo](https://github.com/mastodon/mastodon/pull/13829))
 - Fix non-local posts appearing on local-only hashtag timelines in web UI ([noellabo](https://github.com/mastodon/mastodon/pull/13827))
 - Fix `tootctl media remove-orphans` choking on unknown files in storage ([Gargron](https://github.com/mastodon/mastodon/pull/13765))
@@ -661,7 +1257,7 @@ All notable changes to this project will be documented in this file.
 - Fix poll refresh button not being debounced in web UI ([rasjonell](https://github.com/mastodon/mastodon/pull/13485), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/13490))
 - Fix confusing error when failing to add an alias to an unknown account ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13480))
 - Fix "Email changed" notification sometimes having wrong e-mail ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13475))
-- Fix varioues issues on the account aliases page ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13452))
+- Fix various issues on the account aliases page ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13452))
 - Fix API footer link in web UI ([bubblineyuri](https://github.com/mastodon/mastodon/pull/13441))
 - Fix pagination of following, followers, follow requests, blocks and mutes lists in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13445))
 - Fix styling of polls in JS-less fallback on public pages ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/13436))
@@ -1150,7 +1746,7 @@ All notable changes to this project will be documented in this file.
 - Fix URLs appearing twice in errors of ActivityPub::DeliveryWorker ([Gargron](https://github.com/mastodon/mastodon/pull/11231))
 - Fix support for HTTP proxies ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/11245))
 - Fix HTTP requests to IPv6 hosts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/11240))
-- Fix error in ElasticSearch index import ([mayaeh](https://github.com/mastodon/mastodon/pull/11192))
+- Fix error in Elasticsearch index import ([mayaeh](https://github.com/mastodon/mastodon/pull/11192))
 - Fix duplicate account error when seeding development database ([ysksn](https://github.com/mastodon/mastodon/pull/11366))
 - Fix performance of session clean-up scheduler ([abcang](https://github.com/mastodon/mastodon/pull/11871))
 - Fix older migrations not running ([zunda](https://github.com/mastodon/mastodon/pull/11377))
@@ -1160,8 +1756,8 @@ All notable changes to this project will be documented in this file.
 - Fix muted text color not applying to all text ([trwnh](https://github.com/mastodon/mastodon/pull/11996))
 - Fix follower/following lists resetting on back-navigation in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/11986))
 - Fix n+1 query when approving multiple follow requests ([abcang](https://github.com/mastodon/mastodon/pull/12004))
-- Fix records not being indexed into ElasticSearch sometimes ([Gargron](https://github.com/mastodon/mastodon/pull/12024))
-- Fix needlessly indexing unsearchable statuses into ElasticSearch ([Gargron](https://github.com/mastodon/mastodon/pull/12041))
+- Fix records not being indexed into Elasticsearch sometimes ([Gargron](https://github.com/mastodon/mastodon/pull/12024))
+- Fix needlessly indexing unsearchable statuses into Elasticsearch ([Gargron](https://github.com/mastodon/mastodon/pull/12041))
 - Fix new user bootstrapping crashing when to-be-followed accounts are invalid ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/12037))
 - Fix featured hashtag URL being interpreted as media or replies tab ([Gargron](https://github.com/mastodon/mastodon/pull/12048))
 - Fix account counters being overwritten by parallel writes ([Gargron](https://github.com/mastodon/mastodon/pull/12045))
@@ -1451,7 +2047,7 @@ All notable changes to this project will be documented in this file.
 - Change Docker image to use Ubuntu with jemalloc ([Sir-Boops](https://github.com/mastodon/mastodon/pull/10100), [BenLubar](https://github.com/mastodon/mastodon/pull/10212))
 - Change public pages to be cacheable by proxies ([BenLubar](https://github.com/mastodon/mastodon/pull/9059))
 - Change the 410 gone response for suspended accounts to be cacheable by proxies ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/10339))
-- Change web UI to not not empty timeline of blocked users on block ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/10359))
+- Change web UI to not empty timeline of blocked users on block ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/10359))
 - Change JSON serializer to remove unused `@context` values ([Gargron](https://github.com/mastodon/mastodon/pull/10378))
 - Change GIFV file size limit to be the same as for other videos ([rinsuki](https://github.com/mastodon/mastodon/pull/9924))
 - Change Webpack to not use @babel/preset-env to compile node_modules ([ykzts](https://github.com/mastodon/mastodon/pull/10289))
@@ -1628,7 +2224,7 @@ All notable changes to this project will be documented in this file.
 - Limit maximum visibility of local silenced users to unlisted ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/9583))
 - Change API error message for unconfirmed accounts ([noellabo](https://github.com/mastodon/mastodon/pull/9625))
 - Change the icon to "reply-all" when it's a reply to other accounts ([mayaeh](https://github.com/mastodon/mastodon/pull/9378))
-- Do not ignore federated reports targetting already-reported accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/9534))
+- Do not ignore federated reports targeting already-reported accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/9534))
 - Upgrade default Ruby version to 2.6.0 ([Gargron](https://github.com/mastodon/mastodon/pull/9688))
 - Change e-mail digest frequency ([Gargron](https://github.com/mastodon/mastodon/pull/9689))
 - Change Docker images for Tor support in docker-compose.yml ([Sir-Boops](https://github.com/mastodon/mastodon/pull/9438))
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 7cec57180..ea5f64b0b 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3f51c4bd0..9963054b3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,6 +42,8 @@ It is not always possible to phrase every change in such a manner, but it is des
 - Code style rules (rubocop, eslint)
 - Normalization of locale files (i18n-tasks)
 
+**Note**: You may need to log in and authorise the GitHub account your fork of this repository belongs to with CircleCI to enable some of the automated checks to run.
+
 ## Documentation
 
 The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/documentation](https://github.com/mastodon/documentation).
diff --git a/Dockerfile b/Dockerfile
index 590b6eddf..ce7f4d718 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,121 +1,99 @@
-FROM ubuntu:20.04 as build-dep
+# syntax=docker/dockerfile:1.4
+# This needs to be bullseye-slim because the Ruby image is built on bullseye-slim
+ARG NODE_VERSION="16.18.1-bullseye-slim"
 
-# Use bash for the shell
-SHELL ["/bin/bash", "-c"]
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+FROM ghcr.io/moritzheiber/ruby-jemalloc:3.0.4-slim as ruby
+FROM node:${NODE_VERSION} as build
 
-# Install Node v16 (LTS)
-ENV NODE_VER="16.13.0"
-RUN ARCH= && \
-    dpkgArch="$(dpkg --print-architecture)" && \
-  case "${dpkgArch##*-}" in \
-    amd64) ARCH='x64';; \
-    ppc64el) ARCH='ppc64le';; \
-    s390x) ARCH='s390x';; \
-    arm64) ARCH='arm64';; \
-    armhf) ARCH='armv7l';; \
-    i386) ARCH='x86';; \
-    *) echo "unsupported architecture"; exit 1 ;; \
-  esac && \
-    echo "Etc/UTC" > /etc/localtime && \
-	apt-get update && \
-	apt-get install -y --no-install-recommends ca-certificates wget python apt-utils && \
-	cd ~ && \
-	wget -q https://nodejs.org/download/release/v$NODE_VER/node-v$NODE_VER-linux-$ARCH.tar.gz && \
-	tar xf node-v$NODE_VER-linux-$ARCH.tar.gz && \
-	rm node-v$NODE_VER-linux-$ARCH.tar.gz && \
-	mv node-v$NODE_VER-linux-$ARCH /opt/node
+COPY --link --from=ruby /opt/ruby /opt/ruby
 
-# Install Ruby 3.0
-ENV RUBY_VER="3.0.3"
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends build-essential \
-    bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \
-		libncurses5-dev libffi-dev zlib1g-dev libssl-dev && \
-	cd ~ && \
-	wget https://cache.ruby-lang.org/pub/ruby/${RUBY_VER%.*}/ruby-$RUBY_VER.tar.gz && \
-	tar xf ruby-$RUBY_VER.tar.gz && \
-	cd ruby-$RUBY_VER && \
-	./configure --prefix=/opt/ruby \
-	  --with-jemalloc \
-	  --with-shared \
-	  --disable-install-doc && \
-	make -j"$(nproc)" > /dev/null && \
-	make install && \
-	rm -rf ../ruby-$RUBY_VER.tar.gz ../ruby-$RUBY_VER
+ENV DEBIAN_FRONTEND="noninteractive" \
+    PATH="${PATH}:/opt/ruby/bin"
 
-ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
-
-RUN npm install -g npm@latest && \
-	npm install -g yarn && \
-	gem install bundler && \
-	apt-get update && \
-	apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
-	libpq-dev libprotobuf-dev protobuf-compiler shared-mime-info
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+WORKDIR /opt/mastodon
 COPY Gemfile* package.json yarn.lock /opt/mastodon/
 
-RUN cd /opt/mastodon && \
-  bundle config set --local deployment 'true' && \
-  bundle config set --local without 'development test' && \
-  bundle config set silence_root_warning true && \
-	bundle install -j"$(nproc)" && \
-	yarn install --pure-lockfile
+# hadolint ignore=DL3008
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential \
+        ca-certificates \
+        git \
+        libicu-dev \
+        libidn11-dev \
+        libpq-dev \
+        libjemalloc-dev \
+        zlib1g-dev \
+        libgdbm-dev \
+        libgmp-dev \
+        libssl-dev \
+        libyaml-0-2 \
+        ca-certificates \
+        libreadline8 \
+        python3 \
+        shared-mime-info && \
+    bundle config set --local deployment 'true' && \
+    bundle config set --local without 'development test' && \
+    bundle config set silence_root_warning true && \
+    bundle install -j"$(nproc)" && \
+    yarn install --pure-lockfile --network-timeout 600000
 
-FROM ubuntu:20.04
+FROM node:${NODE_VERSION}
 
-# Copy over all the langs needed for runtime
-COPY --from=build-dep /opt/node /opt/node
-COPY --from=build-dep /opt/ruby /opt/ruby
+ARG UID="991"
+ARG GID="991"
 
-# Add more PATHs to the PATH
-ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/opt/mastodon/bin"
+COPY --link --from=ruby /opt/ruby /opt/ruby
 
-# Create the mastodon user
-ARG UID=991
-ARG GID=991
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN apt-get update && \
-	echo "Etc/UTC" > /etc/localtime && \
-	apt-get install -y --no-install-recommends whois wget && \
-	addgroup --gid $GID mastodon && \
-	useradd -m -u $UID -g $GID -d /opt/mastodon mastodon && \
-	echo "mastodon:$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256)" | chpasswd && \
-	rm -rf /var/lib/apt/lists/*
 
-# Install mastodon runtime deps
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && \
-  apt-get -y --no-install-recommends install \
-	  libssl1.1 libpq5 imagemagick ffmpeg libjemalloc2 \
-	  libicu66 libprotobuf17 libidn11 libyaml-0-2 \
-	  file ca-certificates tzdata libreadline8 gcc tini apt-utils && \
-	ln -s /opt/mastodon /mastodon && \
-	gem install bundler && \
-	rm -rf /var/cache && \
-	rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND="noninteractive" \
+    PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin"
+
+# Ignoreing these here since we don't want to pin any versions and the Debian image removes apt-get content after use
+# hadolint ignore=DL3008,DL3009
+RUN apt-get update && \
+    echo "Etc/UTC" > /etc/localtime && \
+    groupadd -g "${GID}" mastodon && \
+    useradd -l -u "$UID" -g "${GID}" -m -d /opt/mastodon mastodon && \
+    apt-get -y --no-install-recommends install whois \
+        wget \
+        procps \
+        libssl1.1 \
+        libpq5 \
+        imagemagick \
+        ffmpeg \
+        libjemalloc2 \
+        libicu67 \
+        libidn11 \
+        libyaml-0-2 \
+        file \
+        ca-certificates \
+        tzdata \
+        libreadline8 \
+        tini && \
+    ln -s /opt/mastodon /mastodon
+
+# Note: no, cleaning here since Debian does this automatically
+# See the file /etc/apt/apt.conf.d/docker-clean within the Docker image's filesystem
 
-# Copy over mastodon source, and dependencies from building, and set permissions
 COPY --chown=mastodon:mastodon . /opt/mastodon
-COPY --from=build-dep --chown=mastodon:mastodon /opt/mastodon /opt/mastodon
+COPY --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon
 
-# Run mastodon services in prod mode
-ENV RAILS_ENV="production"
-ENV NODE_ENV="production"
-
-# Tell rails to serve static files
-ENV RAILS_SERVE_STATIC_FILES="true"
-ENV BIND="0.0.0.0"
+ENV RAILS_ENV="production" \
+    NODE_ENV="production" \
+    RAILS_SERVE_STATIC_FILES="true" \
+    BIND="0.0.0.0"
 
 # Set the run user
 USER mastodon
+WORKDIR /opt/mastodon
 
 # Precompile assets
-RUN cd ~ && \
-	OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \
-	yarn cache clean
+RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \
+    yarn cache clean
 
 # Set the work dir and the container entry point
-WORKDIR /opt/mastodon
 ENTRYPOINT ["/usr/bin/tini", "--"]
 EXPOSE 3000 4000
diff --git a/Gemfile b/Gemfile
index 0e5da2976..bfbb14f08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,37 +1,35 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 2.5.0', '< 3.1.0'
+ruby '>= 2.7.0', '< 3.1.0'
 
-gem 'pkg-config', '~> 1.4'
+gem 'pkg-config', '~> 1.5'
 gem 'rexml', '~> 3.2'
 
-gem 'puma', '~> 5.5'
-gem 'rails', '~> 6.1.4'
+gem 'puma', '~> 5.6'
+gem 'rails', '~> 6.1.7'
 gem 'sprockets', '~> 3.7.2'
-gem 'thor', '~> 1.1'
-gem 'rack', '~> 2.2.3'
+gem 'thor', '~> 1.2'
+gem 'rack', '~> 2.2.4'
 
 gem 'hamlit-rails', '~> 0.2'
-gem 'pg', '~> 1.2'
+gem 'pg', '~> 1.4'
 gem 'makara', '~> 0.5'
 gem 'pghero', '~> 2.8'
-gem 'dotenv-rails', '~> 2.7'
+gem 'dotenv-rails', '~> 2.8'
 
-gem 'aws-sdk-s3', '~> 1.109', require: false
-gem 'fog-core', '<= 2.1.0'
+gem 'aws-sdk-s3', '~> 1.117', require: false
+gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 0.3', require: false
-gem 'kt-paperclip', '~> 7.0'
+gem 'kt-paperclip', '~> 7.1'
 gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.9.2', require: false
+gem 'bootsnap', '~> 1.15.0', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
-gem 'iso-639'
 gem 'chewy', '~> 7.2'
-gem 'cld3', '~> 3.4.3'
 gem 'devise', '~> 4.8'
 gem 'devise-two-factor', '~> 4.0'
 
@@ -42,70 +40,77 @@ end
 gem 'net-ldap', '~> 0.17'
 gem 'omniauth-cas', '~> 2.0'
 gem 'omniauth-saml', '~> 1.10'
+gem 'gitlab-omniauth-openid-connect', '~>0.10.0', require: 'omniauth_openid_connect'
 gem 'omniauth', '~> 1.9'
 gem 'omniauth-rails_csrf_protection', '~> 0.1'
 
 gem 'color_diff', '~> 0.1'
 gem 'discard', '~> 1.2'
-gem 'doorkeeper', '~> 5.5'
-gem 'ed25519', '~> 1.2'
+gem 'doorkeeper', '~> 5.6'
+gem 'ed25519', '~> 1.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
-gem 'redis-namespace', '~> 1.8'
+gem 'redis-namespace', '~> 1.9'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 5.0'
+gem 'http', '~> 5.1'
 gem 'http_accept_language', '~> 2.1'
-gem 'httplog', '~> 1.5.0'
+gem 'httplog', '~> 1.6.2'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.4.1', require: 'mime/types/columnar'
-gem 'nokogiri', '~> 1.12'
+gem 'nokogiri', '~> 1.13'
 gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.13'
 gem 'ox', '~> 2.14'
 gem 'parslet'
 gem 'posix-spawn'
-gem 'pundit', '~> 2.1'
+gem 'public_suffix', '~> 5.0'
+gem 'pundit', '~> 2.3'
 gem 'premailer-rails'
-gem 'rack-attack', '~> 6.5'
+gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 1.1', require: 'rack/cors'
 gem 'rails-i18n', '~> 6.0'
 gem 'rails-settings-cached', '~> 0.6'
+gem 'redcarpet', '~> 3.5'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 2.1'
 gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 6.0'
-gem 'scenic', '~> 1.5'
-gem 'sidekiq', '~> 6.3'
-gem 'sidekiq-scheduler', '~> 3.1'
+gem 'scenic', '~> 1.7'
+gem 'sidekiq', '~> 6.5'
+gem 'sidekiq-scheduler', '~> 4.0'
 gem 'sidekiq-unique-jobs', '~> 7.1'
-gem 'sidekiq-bulk', '~>0.2.0'
-gem 'simple-navigation', '~> 4.3'
+gem 'sidekiq-bulk', '~> 0.2.0'
+gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.1'
 gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
-gem 'stoplight', '~> 2.2.1'
+gem 'stoplight', '~> 3.0.1'
 gem 'strong_migrations', '~> 0.7'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
-gem 'tzinfo-data', '~> 1.2021'
+gem 'tzinfo-data', '~> 1.2022'
 gem 'webpacker', '~> 5.4'
-gem 'webpush', '~> 0.3'
-gem 'webauthn', '~> 3.0.0.alpha1'
+gem 'webpush', github: 'ClearlyClaire/webpush', ref: 'f14a4d52e201128b1b00245d11b6de80d6cfdcd9'
+gem 'webauthn', '~> 2.5'
 
 gem 'json-ld'
-gem 'json-ld-preloaded', '~> 3.1'
-gem 'rdf-normalize', '~> 0.4'
+gem 'json-ld-preloaded', '~> 3.2'
+gem 'rdf-normalize', '~> 0.5'
 
 group :development, :test do
-  gem 'fabrication', '~> 2.23'
+  gem 'fabrication', '~> 2.30'
   gem 'fuubar', '~> 2.5'
-  gem 'i18n-tasks', '~> 0.9', require: false
-  gem 'pry-byebug', '~> 3.9'
+  gem 'i18n-tasks', '~> 1.0', require: false
+  gem 'pry-byebug', '~> 3.10'
   gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 5.0'
+  gem 'rspec-rails', '~> 5.1'
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rails', require: false
+  gem 'rubocop-rspec', require: false
+  gem 'rubocop', require: false
 end
 
 group :production, :test do
@@ -113,32 +118,32 @@ group :production, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 3.36'
+  gem 'capybara', '~> 3.38'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.19'
-  gem 'microformats', '~> 4.2'
+  gem 'faker', '~> 3.0'
+  gem 'json-schema', '~> 3.0'
+  gem 'microformats', '~> 4.4'
+  gem 'rack-test', '~> 2.0'  
   gem 'rails-controller-testing', '~> 1.0'
+  gem 'rspec_junit_formatter', '~> 0.6'
   gem 'rspec-sidekiq', '~> 3.1'
   gem 'simplecov', '~> 0.21', require: false
-  gem 'webmock', '~> 3.14'
-  gem 'rspec_junit_formatter', '~> 0.4'
+  gem 'webmock', '~> 3.18'
 end
 
 group :development do
   gem 'active_record_query_trace', '~> 1.8'
-  gem 'annotate', '~> 3.1'
+  gem 'annotate', '~> 3.2'
   gem 'better_errors', '~> 2.9'
   gem 'binding_of_caller', '~> 1.0'
   gem 'bullet', '~> 7.0'
-  gem 'letter_opener', '~> 1.7'
+  gem 'letter_opener', '~> 1.8'
   gem 'letter_opener_web', '~> 2.0'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 1.23', require: false
-  gem 'rubocop-rails', '~> 2.12', require: false
-  gem 'brakeman', '~> 5.2', require: false
+  gem 'brakeman', '~> 5.4', require: false
   gem 'bundler-audit', '~> 0.9', require: false
 
-  gem 'capistrano', '~> 3.16'
+  gem 'capistrano', '~> 3.17'
   gem 'capistrano-rails', '~> 1.6'
   gem 'capistrano-rbenv', '~> 2.2'
   gem 'capistrano-yarn', '~> 2.0'
@@ -147,10 +152,10 @@ group :development do
 end
 
 group :production do
-  gem 'lograge', '~> 0.11'
+  gem 'lograge', '~> 0.12'
 end
 
 gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
-
 gem 'xorcist', '~> 1.1'
+gem 'cocoon', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 275216849..00e8dcfd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,132 +1,150 @@
+GIT
+  remote: https://github.com/ClearlyClaire/webpush.git
+  revision: f14a4d52e201128b1b00245d11b6de80d6cfdcd9
+  ref: f14a4d52e201128b1b00245d11b6de80d6cfdcd9
+  specs:
+    webpush (0.3.8)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.7)
+      actionpack (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activesupport (= 6.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.7)
+      actionpack (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_serializers (0.10.12)
-      actionpack (>= 4.1, < 6.2)
-      activemodel (>= 4.1, < 6.2)
+    active_model_serializers (0.10.13)
+      actionpack (>= 4.1, < 7.1)
+      activemodel (>= 4.1, < 7.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_query_trace (1.8)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.7)
+      activesupport (= 6.1.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
+    activemodel (6.1.7)
+      activesupport (= 6.1.7)
+    activerecord (6.1.7)
+      activemodel (= 6.1.7)
+      activesupport (= 6.1.7)
+    activestorage (6.1.7)
+      actionpack (= 6.1.7)
+      activejob (= 6.1.7)
+      activerecord (= 6.1.7)
+      activesupport (= 6.1.7)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    airbrussh (1.4.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    aes_key_wrap (1.1.0)
+    airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
     android_key_attestation (0.3.0)
-    annotate (3.1.1)
-      activerecord (>= 3.2, < 7.0)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    awrence (1.1.1)
+    attr_required (1.0.1)
+    awrence (1.2.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.539.0)
-    aws-sdk-core (3.124.0)
+    aws-partitions (1.670.0)
+    aws-sdk-core (3.168.2)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.60.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.52.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.109.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.117.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.17)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bindata (2.4.10)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    blurhash (0.1.5)
+    blurhash (0.1.6)
       ffi (~> 1.14)
-    bootsnap (1.9.3)
-      msgpack (~> 1.0)
-    brakeman (5.2.0)
+    bootsnap (1.15.0)
+      msgpack (~> 1.2)
+    brakeman (5.4.0)
     browser (4.2.0)
-    brpoplpush-redis_script (0.1.2)
+    brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
-      redis (>= 1.0, <= 5.0)
+      redis (>= 1.0, < 6)
     builder (3.2.4)
-    bullet (7.0.0)
+    bullet (7.0.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    bundler-audit (0.9.0.1)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capistrano (3.16.0)
+    capistrano (3.17.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
     capistrano-bundler (2.0.1)
       capistrano (~> 3.1)
-    capistrano-rails (1.6.1)
+    capistrano-rails (1.6.2)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-rbenv (2.2.0)
@@ -134,7 +152,7 @@ GEM
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (3.36.0)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -147,25 +165,24 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.2.3)
+    chewy (7.2.4)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl
     chunky_png (1.4.0)
-    cld3 (3.4.3)
-      ffi (>= 1.1.0, < 1.16.0)
     climate_control (0.2.0)
+    cocoon (1.2.15)
     coderay (1.1.3)
     color_diff (0.1)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
-    cose (1.0.0)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
+    cose (1.2.1)
       cbor (~> 0.5.9)
-      openssl-signature_algorithm (~> 0.4.0)
+      openssl-signature_algorithm (~> 1.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.12.0)
       addressable
     debug_inspector (1.0.0)
     devise (4.8.1)
@@ -174,29 +191,28 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (4.0.1)
-      activesupport (< 6.2)
+    devise-two-factor (4.0.2)
+      activesupport (< 7.1)
       attr_encrypted (>= 1.3, < 4, != 2)
       devise (~> 4.0)
-      railties (< 6.2)
+      railties (< 7.1)
       rotp (~> 6.0)
     devise_pam_authenticatable2 (9.2.0)
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     discard (1.2.1)
       activerecord (>= 4.2, < 8)
     docile (1.3.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.5.4)
+    doorkeeper (5.6.2)
       railties (>= 5)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
-    e2mmap (0.1.0)
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     elasticsearch (7.13.3)
       elasticsearch-api (= 7.13.3)
       elasticsearch-transport (= 7.13.3)
@@ -207,35 +223,39 @@ GEM
       faraday (~> 1)
       multi_json
     encryptor (3.0.0)
-    erubi (1.10.0)
-    et-orbi (1.2.4)
+    erubi (1.11.0)
+    et-orbi (1.2.7)
       tzinfo
-    excon (0.76.0)
-    fabrication (2.23.1)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
-    faraday (1.8.0)
+    excon (0.95.0)
+    fabrication (2.30.0)
+    faker (3.0.0)
+      i18n (>= 1.8.11, < 2)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     fast_blank (1.0.1)
     fastimage (2.2.6)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -251,14 +271,18 @@ GEM
       fog-core (>= 1.45, <= 2.1.0)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
-    formatador (0.2.5)
-    fugit (1.4.5)
-      et-orbi (~> 1.1, >= 1.1.8)
+    formatador (0.3.0)
+    fugit (1.7.1)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    globalid (0.5.2)
+    gitlab-omniauth-openid-connect (0.10.0)
+      addressable (~> 2.7)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 1.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     hamlit (2.13.0)
       temple (>= 0.8.2)
@@ -269,31 +293,31 @@ GEM
       activesupport (>= 4.0.1)
       hamlit (>= 1.2.0)
       railties (>= 4.0.1)
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     highline (2.0.3)
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (5.0.4)
+    http (5.1.1)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.4.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
-    httplog (1.5.0)
-      rack (>= 1.0)
+    httpclient (2.8.3)
+    httplog (1.6.2)
+      rack (>= 2.0)
       rainbow (>= 2.0.0)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.35)
+    i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -301,37 +325,42 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    idn-ruby (0.1.4)
+    idn-ruby (0.1.5)
     ipaddress (0.8.3)
-    iso-639 (0.3.5)
-    jmespath (1.4.0)
-    json (2.5.1)
-    json-canonicalization (0.2.1)
-    json-ld (3.1.10)
+    jmespath (1.6.2)
+    json (2.6.2)
+    json-canonicalization (0.3.0)
+    json-jwt (1.13.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+    json-ld (3.2.3)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    json-ld-preloaded (3.1.6)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
+      multi_json (~> 1.15)
+      rack (~> 2.2)
+      rdf (~> 3.2, >= 3.2.9)
+    json-ld-preloaded (3.2.2)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
+    json-schema (3.0.0)
+      addressable (>= 2.8)
     jsonapi-renderer (0.2.2)
-    jwt (2.2.2)
-    kaminari (1.2.1)
+    jwt (2.4.1)
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
-    kt-paperclip (7.0.1)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
+    kt-paperclip (7.1.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)
@@ -339,8 +368,8 @@ GEM
       terrapin (~> 0.6.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
     letter_opener_web (2.0.0)
       actionmailer (>= 5.2)
       letter_opener (~> 1.7)
@@ -350,51 +379,55 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    lograge (0.11.2)
+    lograge (0.12.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.13.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     makara (0.5.1)
       activerecord (>= 5.2.0)
-    marcel (1.0.1)
+    marcel (1.0.2)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
     matrix (0.4.2)
-    memory_profiler (1.0.0)
+    memory_profiler (1.0.1)
     method_source (1.0.0)
-    microformats (4.3.1)
+    microformats (4.4.1)
       json (~> 2.2)
       nokogiri (~> 1.10)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.15.0)
-    msgpack (1.4.2)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    net-ldap (0.17.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
+    net-ldap (0.17.1)
+    net-protocol (0.1.3)
+      timeout
+    net-scp (4.0.0.rc1)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-smtp (0.3.3)
+      net-protocol
+    net-ssh (7.0.1)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nsa (0.2.8)
       activesupport (>= 4.2, < 7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.13.10)
-    omniauth (1.9.1)
+    oj (3.13.23)
+    omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-cas (2.0.0)
@@ -407,67 +440,85 @@ GEM
     omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
-    openssl (2.2.0)
-    openssl-signature_algorithm (0.4.0)
+    openid_connect (1.3.0)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.5.0)
+      rack-oauth2 (>= 1.6.1)
+      swd (>= 1.0.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (>= 1.0.1)
+    openssl (3.0.0)
+    openssl-signature_algorithm (1.2.1)
+      openssl (> 2.0, < 3.1)
     orm_adapter (0.5.0)
-    ox (2.14.6)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    ox (2.14.11)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.2.3)
-    pghero (2.8.2)
+    pg (1.4.5)
+    pghero (2.8.3)
       activerecord (>= 5)
-    pkg-config (1.4.6)
+    pkg-config (1.5.1)
     posix-spawn (0.3.15)
-    premailer (1.14.2)
+    premailer (1.18.0)
       addressable
-      css_parser (>= 1.6.0)
+      css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.11.1)
+    premailer-rails (1.12.0)
       actionmailer (>= 3)
+      net-smtp
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.6)
-    puma (5.5.2)
+    public_suffix (5.0.1)
+    puma (5.6.5)
       nio4r (~> 2.0)
-    pundit (2.1.1)
+    pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-attack (6.5.0)
+    racc (1.6.1)
+    rack (2.2.4)
+    rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
+    rack-oauth2 (1.19.0)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-proxy (0.7.0)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.7)
+      actioncable (= 6.1.7)
+      actionmailbox (= 6.1.7)
+      actionmailer (= 6.1.7)
+      actionpack (= 6.1.7)
+      actiontext (= 6.1.7)
+      actionview (= 6.1.7)
+      activejob (= 6.1.7)
+      activemodel (= 6.1.7)
+      activerecord (= 6.1.7)
+      activestorage (= 6.1.7)
+      activesupport (= 6.1.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -476,31 +527,33 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rdf (3.1.15)
-      hamster (~> 3.0)
+    rdf (3.2.9)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-normalize (0.4.0)
-      rdf (~> 3.1)
+    rdf-normalize (0.5.1)
+      rdf (~> 3.2)
+    redcarpet (3.5.1)
     redis (4.5.1)
-    redis-namespace (1.8.1)
-      redis (>= 3.0.4)
-    regexp_parser (2.1.1)
-    request_store (1.5.0)
+    redis-namespace (1.9.0)
+      redis (>= 4)
+    redlock (1.3.2)
+      redis (>= 3.0.0, < 6.0)
+    regexp_parser (2.6.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -508,19 +561,19 @@ GEM
     rexml (3.2.5)
     rotp (6.2.0)
     rpam2 (4.0.2)
-    rqrcode (2.1.0)
+    rqrcode (2.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -531,60 +584,64 @@ GEM
     rspec-sidekiq (3.1.0)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
+    rspec-support (3.11.1)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.23.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
-    rubocop-rails (2.12.4)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.17.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.15.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby-saml (1.13.0)
       nokogiri (>= 1.10.5)
       rexml
     ruby2_keywords (0.0.5)
-    rufus-scheduler (3.7.0)
+    rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
     sanitize (6.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    scenic (1.5.4)
+    scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    securecompare (1.0.0)
     semantic_range (3.0.0)
-    sidekiq (6.3.1)
-      connection_pool (>= 2.2.2)
+    sidekiq (6.5.8)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
-      redis (>= 4.2.0)
+      redis (>= 4.5.0, < 5)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (3.1.0)
-      e2mmap
-      redis (>= 3, < 5)
+    sidekiq-scheduler (4.0.3)
+      redis (>= 4.2.0)
       rufus-scheduler (~> 3.2)
-      sidekiq (>= 3)
-      thwait
+      sidekiq (>= 4, < 7)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.12)
+    sidekiq-unique-jobs (7.1.29)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
-      sidekiq (>= 5.0, < 8.0)
+      redis (< 5.0)
+      sidekiq (>= 5.0, < 7.0)
       thor (>= 0.20, < 3.0)
-    simple-navigation (4.3.0)
+    simple-navigation (4.4.0)
       activesupport (>= 2.3.2)
     simple_form (5.1.0)
       actionpack (>= 5.2)
@@ -595,6 +652,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
+    smart_properties (1.17.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -605,23 +663,28 @@ GEM
     sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    stackprof (0.2.17)
+    stackprof (0.2.23)
     statsd-ruby (1.5.0)
-    stoplight (2.2.1)
+    stoplight (3.0.1)
+      redlock (~> 1.0)
     strong_migrations (0.7.9)
       activerecord (>= 5)
+    swd (1.3.0)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
     temple (0.8.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.1.0)
-    thwait (0.2.0)
-      e2mmap
-    tilt (2.0.10)
-    tpm-key_attestation (0.9.0)
+    thor (1.2.1)
+    tilt (2.0.11)
+    timeout (0.3.0)
+    tpm-key_attestation (0.11.0)
       bindata (~> 2.4)
-      openssl-signature_algorithm (~> 0.4.0)
+      openssl (> 2.0, < 3.1)
+      openssl-signature_algorithm (~> 1.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -635,28 +698,36 @@ GEM
     twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.7)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (2.1.0)
-    uniform_notifier (1.14.2)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.3.0)
+    uniform_notifier (1.16.0)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.15)
+      activemodel (>= 3.0.0)
+      public_suffix
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.0.0.alpha1)
+    webauthn (2.5.2)
       android_key_attestation (~> 0.3.0)
       awrence (~> 1.1)
       bindata (~> 2.4)
       cbor (~> 0.5.9)
-      cose (~> 1.0)
-      openssl (~> 2.0)
+      cose (~> 1.1)
+      openssl (>= 2.2, < 3.1)
       safety_net_attestation (~> 0.4.0)
-      securecompare (~> 1.0)
-      tpm-key_attestation (~> 0.9.0)
-    webmock (3.14.0)
+      tpm-key_attestation (~> 0.11.0)
+    webfinger (1.2.0)
+      activesupport
+      httpclient (>= 2.4)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -665,17 +736,14 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webpush (0.3.8)
-      hkdf (~> 0.2)
-      jwt (~> 2.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.1)
-    xorcist (1.1.2)
+    xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
@@ -684,25 +752,25 @@ DEPENDENCIES
   active_model_serializers (~> 0.10)
   active_record_query_trace (~> 1.8)
   addressable (~> 2.8)
-  annotate (~> 3.1)
-  aws-sdk-s3 (~> 1.109)
+  annotate (~> 3.2)
+  aws-sdk-s3 (~> 1.117)
   better_errors (~> 2.9)
   binding_of_caller (~> 1.0)
   blurhash (~> 0.1)
-  bootsnap (~> 1.9.2)
-  brakeman (~> 5.2)
+  bootsnap (~> 1.15.0)
+  brakeman (~> 5.4)
   browser
   bullet (~> 7.0)
   bundler-audit (~> 0.9)
-  capistrano (~> 3.16)
+  capistrano (~> 3.17)
   capistrano-rails (~> 1.6)
   capistrano-rbenv (~> 2.2)
   capistrano-yarn (~> 2.0)
-  capybara (~> 3.36)
+  capybara (~> 3.38)
   charlock_holmes (~> 0.7.7)
   chewy (~> 7.2)
-  cld3 (~> 3.4.3)
   climate_control (~> 0.2)
+  cocoon (~> 1.2)
   color_diff (~> 0.1)
   concurrent-ruby
   connection_pool
@@ -710,40 +778,41 @@ DEPENDENCIES
   devise-two-factor (~> 4.0)
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
-  doorkeeper (~> 5.5)
-  dotenv-rails (~> 2.7)
-  ed25519 (~> 1.2)
-  fabrication (~> 2.23)
-  faker (~> 2.19)
+  doorkeeper (~> 5.6)
+  dotenv-rails (~> 2.8)
+  ed25519 (~> 1.3)
+  fabrication (~> 2.30)
+  faker (~> 3.0)
   fast_blank (~> 1.0)
   fastimage
-  fog-core (<= 2.1.0)
+  fog-core (<= 2.4.0)
   fog-openstack (~> 0.3)
   fuubar (~> 2.5)
+  gitlab-omniauth-openid-connect (~> 0.10.0)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 5.0)
+  http (~> 5.1)
   http_accept_language (~> 2.1)
-  httplog (~> 1.5.0)
-  i18n-tasks (~> 0.9)
+  httplog (~> 1.6.2)
+  i18n-tasks (~> 1.0)
   idn-ruby
-  iso-639
   json-ld
-  json-ld-preloaded (~> 3.1)
+  json-ld-preloaded (~> 3.2)
+  json-schema (~> 3.0)
   kaminari (~> 1.2)
-  kt-paperclip (~> 7.0)
-  letter_opener (~> 1.7)
+  kt-paperclip (~> 7.1)
+  letter_opener (~> 1.8)
   letter_opener_web (~> 2.0)
   link_header (~> 0.0)
-  lograge (~> 0.11)
+  lograge (~> 0.12)
   makara (~> 0.5)
   mario-redis-lock (~> 1.2)
   memory_profiler
-  microformats (~> 4.2)
+  microformats (~> 4.4)
   mime-types (~> 3.4.1)
   net-ldap (~> 0.17)
-  nokogiri (~> 1.12)
+  nokogiri (~> 1.13)
   nsa (~> 0.2)
   oj (~> 3.13)
   omniauth (~> 1.9)
@@ -752,54 +821,65 @@ DEPENDENCIES
   omniauth-saml (~> 1.10)
   ox (~> 2.14)
   parslet
-  pg (~> 1.2)
+  pg (~> 1.4)
   pghero (~> 2.8)
-  pkg-config (~> 1.4)
+  pkg-config (~> 1.5)
   posix-spawn
   premailer-rails
   private_address_check (~> 0.5)
-  pry-byebug (~> 3.9)
+  pry-byebug (~> 3.10)
   pry-rails (~> 0.3)
-  puma (~> 5.5)
-  pundit (~> 2.1)
-  rack (~> 2.2.3)
-  rack-attack (~> 6.5)
+  public_suffix (~> 5.0)
+  puma (~> 5.6)
+  pundit (~> 2.3)
+  rack (~> 2.2.4)
+  rack-attack (~> 6.6)
   rack-cors (~> 1.1)
-  rails (~> 6.1.4)
+  rack-test (~> 2.0)
+  rails (~> 6.1.7)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 6.0)
   rails-settings-cached (~> 0.6)
-  rdf-normalize (~> 0.4)
+  rdf-normalize (~> 0.5)
+  redcarpet (~> 3.5)
   redis (~> 4.5)
-  redis-namespace (~> 1.8)
+  redis-namespace (~> 1.9)
   rexml (~> 3.2)
   rqrcode (~> 2.1)
-  rspec-rails (~> 5.0)
+  rspec-rails (~> 5.1)
   rspec-sidekiq (~> 3.1)
-  rspec_junit_formatter (~> 0.4)
-  rubocop (~> 1.23)
-  rubocop-rails (~> 2.12)
+  rspec_junit_formatter (~> 0.6)
+  rubocop
+  rubocop-performance
+  rubocop-rails
+  rubocop-rspec
   ruby-progressbar (~> 1.11)
   sanitize (~> 6.0)
-  scenic (~> 1.5)
-  sidekiq (~> 6.3)
+  scenic (~> 1.7)
+  sidekiq (~> 6.5)
   sidekiq-bulk (~> 0.2.0)
-  sidekiq-scheduler (~> 3.1)
+  sidekiq-scheduler (~> 4.0)
   sidekiq-unique-jobs (~> 7.1)
-  simple-navigation (~> 4.3)
+  simple-navigation (~> 4.4)
   simple_form (~> 5.1)
   simplecov (~> 0.21)
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.4)
   stackprof
-  stoplight (~> 2.2.1)
+  stoplight (~> 3.0.1)
   strong_migrations (~> 0.7)
-  thor (~> 1.1)
+  thor (~> 1.2)
   tty-prompt (~> 0.23)
   twitter-text (~> 3.1.0)
-  tzinfo-data (~> 1.2021)
-  webauthn (~> 3.0.0.alpha1)
-  webmock (~> 3.14)
+  tzinfo-data (~> 1.2022)
+  webauthn (~> 2.5)
+  webmock (~> 3.18)
   webpacker (~> 5.4)
-  webpush (~> 0.3)
+  webpush!
   xorcist (~> 1.1)
+
+RUBY VERSION
+   ruby 3.0.4p208
+
+BUNDLED WITH
+   2.2.33
diff --git a/README.md b/README.md
index 59e9779c6..ddd5e2c64 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
-![Mastodon](https://i.imgur.com/NhZc40l.png)
-========
+<h1><picture>
+  <source media="(prefers-color-scheme: dark)" srcset="./lib/assets/wordmark.dark.png?raw=true">
+  <source media="(prefers-color-scheme: light)" srcset="./lib/assets/wordmark.light.png?raw=true">
+  <img alt="Mastodon" src="./lib/assets/wordmark.light.png?raw=true" height="34">
+</picture></h1>
 
 [![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
 [![Build Status](https://img.shields.io/circleci/project/github/mastodon/mastodon.svg)][circleci]
@@ -28,14 +31,14 @@ Click below to **learn more** in a video:
 - [View sponsors](https://joinmastodon.org/sponsors)
 - [Blog](https://blog.joinmastodon.org)
 - [Documentation](https://docs.joinmastodon.org)
-- [Browse Mastodon servers](https://joinmastodon.org/#getting-started)
+- [Browse Mastodon servers](https://joinmastodon.org/communities)
 - [Browse Mastodon apps](https://joinmastodon.org/apps)
 
 [patreon]: https://www.patreon.com/mastodon
 
 ## Features
 
-<img src="https://docs.joinmastodon.org/elephant.svg" align="right" width="30%" />
+<img src="/app/javascript/images/elephant_ui_working.svg?raw=true" align="right" width="30%" />
 
 ### No vendor lock-in: Fully interoperable with any conforming platform
 
@@ -69,14 +72,15 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 
 - **PostgreSQL** 9.5+
 - **Redis** 4+
-- **Ruby** 2.5+
-- **Node.js** 12+
+- **Ruby** 2.7+
+- **Node.js** 16+
 
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
 
 A **Vagrant** configuration is included for development purposes. To use it, complete following steps:
 
 - Install Vagrant and Virtualbox
+- Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
 - Run `vagrant up`
 - Run `vagrant ssh -c "cd /vagrant && foreman start"`
 - Open `http://mastodon.local` in your browser
@@ -91,7 +95,7 @@ You can open issues for bugs you've found or features you think are missing. You
 
 ## License
 
-Copyright (C) 2016-2021 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
+Copyright (C) 2016-2022 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
diff --git a/SECURITY.md b/SECURITY.md
index 9d351fce6..ccc7c1034 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,17 @@
 # Security Policy
 
+If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can reach us at <security@joinmastodon.org>.
+
+You should *not* report such issues on GitHub or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.
+
+## Scope
+
+A "vulnerability in Mastodon" is a vulnerability in the code distributed through our main source code repository on GitHub. Vulnerabilities that are specific to a given installation (e.g. misconfiguration) should be reported to the owner of that installation and not us.
+
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 3.4.x   | :white_check_mark: |
-| 3.3.x   | :white_check_mark: |
-| < 3.3   | :x:                |
-
-## Reporting a Vulnerability
-
-hello@joinmastodon.org
+| Version | Supported |
+| ------- | ----------|
+| 4.0.x   | Yes       |
+| 3.5.x   | Yes       |
+| < 3.5   | No        |
diff --git a/Vagrantfile b/Vagrantfile
index e086ddd98..880cc1849 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,16 +3,14 @@
 
 ENV["PORT"] ||= "3000"
 
-$provision = <<SCRIPT
-
-cd /vagrant # This is where the host folder/repo is mounted
+$provisionA = <<SCRIPT
 
 # Add the yarn repo + yarn repo keys
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
 
 # Add repo for NodeJS
-curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_16.x | sudo bash -
 
 # Add firewall rule to redirect 80 to PORT and save
 sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]}
@@ -33,34 +31,56 @@ sudo apt-get install \
   redis-tools \
   postgresql \
   postgresql-contrib \
-  protobuf-compiler \
-  yarn \
   libicu-dev \
   libidn11-dev \
+  libreadline6-dev \
+  autoconf \
+  bison \
+  build-essential \
+  ffmpeg \
+  file \
+  gcc \
+  libffi-dev \
+  libgdbm-dev \
+  libjemalloc-dev \
+  libncurses5-dev \
   libprotobuf-dev \
-  libreadline-dev \
-  libpam0g-dev \
+  libssl-dev \
+  libyaml-dev \
+  pkg-config \
+  protobuf-compiler \
+  zlib1g-dev \
   -y
 
 # Install rvm
-read RUBY_VERSION < .ruby-version
+sudo apt-add-repository -y ppa:rael-gc/rvm
+sudo apt-get install rvm -y
 
-curl -sSL https://rvm.io/mpapis.asc | gpg --import
-curl -sSL https://rvm.io/pkuczynski.asc | gpg --import
+sudo usermod -a -G rvm $USER
 
-curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION
-source /home/vagrant/.rvm/scripts/rvm
+SCRIPT
+
+$provisionB = <<SCRIPT
+
+source "/etc/profile.d/rvm.sh"
 
 # Install Ruby
-rvm reinstall ruby-$RUBY_VERSION --disable-binary
+read RUBY_VERSION < /vagrant/.ruby-version
+rvm install ruby-$RUBY_VERSION --disable-binary
 
 # Configure database
 sudo -u postgres createuser -U postgres vagrant -s
 sudo -u postgres createdb -U postgres mastodon_development
 
-# Install gems and node modules
+cd /vagrant # This is where the host folder/repo is mounted
+
+# Install gems
 gem install bundler foreman
 bundle install
+
+# Install node modules
+sudo corepack enable
+yarn set version classic
 yarn install
 
 # Build Mastodon
@@ -74,18 +94,11 @@ echo 'export $(cat "/vagrant/.env.vagrant" | xargs)' >> ~/.bash_profile
 
 SCRIPT
 
-$start = <<SCRIPT
-
-echo 'To start server'
-echo '  $ vagrant ssh -c "cd /vagrant && foreman start"'
-
-SCRIPT
-
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "ubuntu/bionic64"
+  config.vm.box = "ubuntu/focal64"
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
@@ -102,7 +115,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Use "virtio" network interfaces for better performance.
     vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
     vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
-
   end
 
   # This uses the vagrant-hostsupdater plugin, and lets you
@@ -120,7 +132,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   if config.vm.networks.any? { |type, options| type == :private_network }
-    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'actimeo=1']
+    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'actimeo=1']
   else
     config.vm.synced_folder ".", "/vagrant"
   end
@@ -131,9 +143,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 8080, host: 8080
 
   # Full provisioning script, only runs on first 'vagrant up' or with 'vagrant provision'
-  config.vm.provision :shell, inline: $provision, privileged: false
+  config.vm.provision :shell, inline: $provisionA, privileged: false, reset: true
+  config.vm.provision :shell, inline: $provisionB, privileged: false
 
-  # Start up script, runs on every 'vagrant up'
-  config.vm.provision :shell, inline: $start, run: 'always', privileged: false
+  config.vm.post_up_message = <<MESSAGE
+To start server
+  $ vagrant ssh -c "cd /vagrant && foreman start"
+MESSAGE
 
 end
diff --git a/app.json b/app.json
index 6b4365383..4f05a64f5 100644
--- a/app.json
+++ b/app.json
@@ -79,8 +79,13 @@
       "description": "SMTP server certificate verification mode. Defaults is 'peer'.",
       "required": false
     },
+    "SMTP_ENABLE_STARTTLS": {
+      "description": "Enable STARTTLS? Default is 'auto'.",
+      "value": "auto",
+      "required": false
+    },
     "SMTP_ENABLE_STARTTLS_AUTO": {
-      "description": "Enable STARTTLS if SMTP server supports it? Default is true.",
+      "description": "Enable STARTTLS if SMTP server supports it? Deprecated by SMTP_ENABLE_STARTTLS.",
       "required": false
     }
   },
@@ -95,8 +100,5 @@
   "scripts": {
     "postdeploy": "bundle exec rails db:migrate && bundle exec rails db:seed"
   },
-  "addons": [
-    "heroku-postgresql",
-    "heroku-redis"
-  ]
+  "addons": ["heroku-postgresql", "heroku-redis"]
 }
diff --git a/app/chewy/accounts_index.rb b/app/chewy/accounts_index.rb
index 6f9ea76e9..e38e14a10 100644
--- a/app/chewy/accounts_index.rb
+++ b/app/chewy/accounts_index.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountsIndex < Chewy::Index
-  settings index: { refresh_interval: '5m' }, analysis: {
+  settings index: { refresh_interval: '30s' }, analysis: {
     analyzer: {
       content: {
         tokenizer: 'whitespace',
@@ -23,7 +23,7 @@ class AccountsIndex < Chewy::Index
     },
   }
 
-  index_scope ::Account.searchable.includes(:account_stat), delete_if: ->(account) { account.destroyed? || !account.searchable? }
+  index_scope ::Account.searchable.includes(:account_stat)
 
   root date_detection: false do
     field :id, type: 'long'
@@ -36,8 +36,8 @@ class AccountsIndex < Chewy::Index
       field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content'
     end
 
-    field :following_count, type: 'long', value: ->(account) { account.following.local.count }
-    field :followers_count, type: 'long', value: ->(account) { account.followers.local.count }
+    field :following_count, type: 'long', value: ->(account) { account.following_count }
+    field :followers_count, type: 'long', value: ->(account) { account.followers_count }
     field :last_status_at, type: 'date', value: ->(account) { account.last_status_at || account.created_at }
   end
 end
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index 1903c2ea3..6dd4fb18b 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class StatusesIndex < Chewy::Index
-  settings index: { refresh_interval: '15m' }, analysis: {
+  include FormattingHelper
+
+  settings index: { refresh_interval: '30s' }, analysis: {
     filter: {
       english_stop: {
         type: 'stop',
@@ -31,6 +33,8 @@ class StatusesIndex < Chewy::Index
     },
   }
 
+  # We do not use delete_if option here because it would call a method that we
+  # expect to be called with crutches without crutches, causing n+1 queries
   index_scope ::Status.unscoped.kept.without_reblogs.includes(:media_attachments, :preloadable_poll)
 
   crutch :mentions do |collection|
@@ -53,11 +57,16 @@ class StatusesIndex < Chewy::Index
     data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
   end
 
+  crutch :votes do |collection|
+    data = ::PollVote.joins(:poll).where(poll: { status_id: collection.map(&:id) }).where(account: Account.local).pluck(:status_id, :account_id)
+    data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
+  end
+
   root date_detection: false do
     field :id, type: 'long'
     field :account_id, type: 'long'
 
-    field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].concat(status.media_attachments.map(&:description)).concat(status.preloadable_poll ? status.preloadable_poll.options : []).join("\n\n") } do
+    field :text, type: 'text', value: ->(status) { status.searchable_text } do
       field :stemmed, type: 'text', analyzer: 'content'
     end
 
diff --git a/app/chewy/tags_index.rb b/app/chewy/tags_index.rb
index f9db2b03a..df3d9e4cc 100644
--- a/app/chewy/tags_index.rb
+++ b/app/chewy/tags_index.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class TagsIndex < Chewy::Index
-  settings index: { refresh_interval: '15m' }, analysis: {
+  settings index: { refresh_interval: '30s' }, analysis: {
     analyzer: {
       content: {
         tokenizer: 'keyword',
@@ -23,7 +23,11 @@ class TagsIndex < Chewy::Index
     },
   }
 
-  index_scope ::Tag.listable, delete_if: ->(tag) { tag.destroyed? || !tag.listable? }
+  index_scope ::Tag.listable
+
+  crutch :time_period do
+    7.days.ago.to_date..0.days.ago.to_date
+  end
 
   root date_detection: false do
     field :name, type: 'text', analyzer: 'content' do
@@ -31,7 +35,7 @@ class TagsIndex < Chewy::Index
     end
 
     field :reviewed, type: 'boolean', value: ->(tag) { tag.reviewed? }
-    field :usage, type: 'long', value: ->(tag) { tag.history.reduce(0) { |total, day| total + day.accounts } }
+    field :usage, type: 'long', value: ->(tag, crutches) { tag.history.aggregate(crutches.time_period).accounts }
     field :last_status_at, type: 'date', value: ->(tag) { tag.last_status_at || tag.created_at }
   end
 end
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index d7e78d6b9..104348614 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,68 +1,19 @@
 # frozen_string_literal: true
 
 class AboutController < ApplicationController
-  include RegistrationSpamConcern
+  include WebAppControllerConcern
 
-  layout 'public'
+  skip_before_action :require_functional!
 
-  before_action :require_open_federation!, only: [:show, :more]
-  before_action :set_body_classes, only: :show
   before_action :set_instance_presenter
-  before_action :set_expires_in, only: [:more, :terms]
-  before_action :set_registration_form_time, only: :show
 
-  skip_before_action :require_functional!, only: [:more, :terms]
-
-  def show; end
-
-  def more
-    flash.now[:notice] = I18n.t('about.instance_actor_flash') if params[:instance_actor]
-
-    toc_generator = TOCGenerator.new(@instance_presenter.site_extended_description)
-
-    @rules             = Rule.ordered
-    @contents          = toc_generator.html
-    @table_of_contents = toc_generator.toc
-    @blocks            = DomainBlock.with_user_facing_limitations.by_severity if display_blocks?
+  def show
+    expires_in 0, public: true unless user_signed_in?
   end
 
-  def terms; end
-
-  helper_method :display_blocks?
-  helper_method :display_blocks_rationale?
-  helper_method :public_fetch_mode?
-  helper_method :new_user
-
   private
 
-  def require_open_federation!
-    not_found if whitelist_mode?
-  end
-
-  def display_blocks?
-    Setting.show_domain_blocks == 'all' || (Setting.show_domain_blocks == 'users' && user_signed_in?)
-  end
-
-  def display_blocks_rationale?
-    Setting.show_domain_blocks_rationale == 'all' || (Setting.show_domain_blocks_rationale == 'users' && user_signed_in?)
-  end
-
-  def new_user
-    User.new.tap do |user|
-      user.build_account
-      user.build_invite_request
-    end
-  end
-
   def set_instance_presenter
     @instance_presenter = InstancePresenter.new
   end
-
-  def set_body_classes
-    @hide_navbar = true
-  end
-
-  def set_expires_in
-    expires_in 0, public: true
-  end
 end
diff --git a/app/controllers/account_follow_controller.rb b/app/controllers/account_follow_controller.rb
deleted file mode 100644
index 33394074d..000000000
--- a/app/controllers/account_follow_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class AccountFollowController < ApplicationController
-  include AccountControllerConcern
-
-  before_action :authenticate_user!
-
-  def create
-    FollowService.new.call(current_user.account, @account, with_rate_limit: true)
-    redirect_to account_path(@account)
-  end
-end
diff --git a/app/controllers/account_unfollow_controller.rb b/app/controllers/account_unfollow_controller.rb
deleted file mode 100644
index 378ec86dc..000000000
--- a/app/controllers/account_unfollow_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class AccountUnfollowController < ApplicationController
-  include AccountControllerConcern
-
-  before_action :authenticate_user!
-
-  def create
-    UnfollowService.new.call(current_user.account, @account)
-    redirect_to account_path(@account)
-  end
-end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 8210918d8..56229fd05 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -7,9 +7,8 @@ class AccountsController < ApplicationController
   include AccountControllerConcern
   include SignatureAuthentication
 
-  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
+  before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
-  before_action :set_body_classes
 
   skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
   skip_before_action :require_functional!, unless: :whitelist_mode?
@@ -19,23 +18,7 @@ class AccountsController < ApplicationController
       format.html do
         expires_in 0, public: true unless user_signed_in?
 
-        @pinned_statuses   = []
-        @endorsed_accounts = @account.endorsed_accounts.to_a.sample(4)
-        @featured_hashtags = @account.featured_tags.order(statuses_count: :desc)
-
-        if current_account && @account.blocking?(current_account)
-          @statuses = []
-          return
-        end
-
-        @pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
-        @statuses        = cached_filtered_status_page
-        @rss_url         = rss_url
-
-        unless @statuses.empty?
-          @older_url = older_url if @statuses.last.id > filtered_statuses.last.id
-          @newer_url = newer_url if @statuses.first.id < filtered_statuses.first.id
-        end
+        @rss_url = rss_url
       end
 
       format.rss do
@@ -44,7 +27,6 @@ class AccountsController < ApplicationController
         limit     = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
         @statuses = filtered_statuses.without_reblogs.limit(limit)
         @statuses = cache_collection(@statuses, Status)
-        render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag])
       end
 
       format.json do
@@ -56,14 +38,6 @@ class AccountsController < ApplicationController
 
   private
 
-  def set_body_classes
-    @body_classes = 'with-modals'
-  end
-
-  def show_pinned_statuses?
-    [replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
-  end
-
   def filtered_statuses
     default_statuses.tap do |statuses|
       statuses.merge!(hashtag_scope)    if tag_requested?
@@ -110,26 +84,6 @@ class AccountsController < ApplicationController
     end
   end
 
-  def older_url
-    pagination_url(max_id: @statuses.last.id)
-  end
-
-  def newer_url
-    pagination_url(min_id: @statuses.first.id)
-  end
-
-  def pagination_url(max_id: nil, min_id: nil)
-    if tag_requested?
-      short_account_tag_url(@account, params[:tag], max_id: max_id, min_id: min_id)
-    elsif media_requested?
-      short_account_media_url(@account, max_id: max_id, min_id: min_id)
-    elsif replies_requested?
-      short_account_with_replies_url(@account, max_id: max_id, min_id: min_id)
-    else
-      short_account_url(@account, max_id: max_id, min_id: min_id)
-    end
-  end
-
   def media_requested?
     request.path.split('.').first.end_with?('/media') && !tag_requested?
   end
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb
index 4cbc3ab8f..b8a7e0ab9 100644
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@@ -2,6 +2,8 @@
 
 class ActivityPub::BaseController < Api::BaseController
   skip_before_action :require_authenticated_user!
+  skip_before_action :require_not_suspended!
+  skip_around_action :set_locale
 
   private
 
diff --git a/app/controllers/activitypub/claims_controller.rb b/app/controllers/activitypub/claims_controller.rb
index 08ad952df..339333e46 100644
--- a/app/controllers/activitypub/claims_controller.rb
+++ b/app/controllers/activitypub/claims_controller.rb
@@ -6,7 +6,7 @@ class ActivityPub::ClaimsController < ActivityPub::BaseController
 
   skip_before_action :authenticate_user!
 
-  before_action :require_signature!
+  before_action :require_account_signature!
   before_action :set_claim_result
 
   def create
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index c8b6dcc88..d94a285ea 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -4,7 +4,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
   include SignatureVerification
   include AccountOwnedConcern
 
-  before_action :require_signature!, if: :authorized_fetch_mode?
+  before_action :require_account_signature!, if: :authorized_fetch_mode?
   before_action :set_items
   before_action :set_size
   before_action :set_type
@@ -21,6 +21,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
     case params[:id]
     when 'featured'
       @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
+      @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
     when 'tags'
       @items = for_signed_account { @account.featured_tags }
     when 'devices'
diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
index 940b77cf0..4e445bcb1 100644
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -4,7 +4,7 @@ class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseContro
   include SignatureVerification
   include AccountOwnedConcern
 
-  before_action :require_signature!
+  before_action :require_account_signature!
   before_action :set_items
   before_action :set_cache_headers
 
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 92dcb5ac7..5ee85474e 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -6,7 +6,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
   include AccountOwnedConcern
 
   before_action :skip_unknown_actor_activity
-  before_action :require_signature!
+  before_action :require_actor_signature!
   skip_before_action :authenticate_user!
 
   def create
@@ -49,17 +49,17 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
   end
 
   def upgrade_account
-    if signed_request_account.ostatus?
+    if signed_request_account&.ostatus?
       signed_request_account.update(last_webfingered_at: nil)
       ResolveAccountWorker.perform_async(signed_request_account.acct)
     end
 
-    DeliveryFailureTracker.reset!(signed_request_account.inbox_url)
+    DeliveryFailureTracker.reset!(signed_request_actor.inbox_url)
   end
 
   def process_collection_synchronization
     raw_params = request.headers['Collection-Synchronization']
-    return if raw_params.blank? || ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] == 'true'
+    return if raw_params.blank? || ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] == 'true' || signed_request_account.nil?
 
     # Re-using the syntax for signature parameters
     tree   = SignatureParamsParser.new.parse(raw_params)
@@ -71,6 +71,6 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
   end
 
   def process_payload
-    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body, @account&.id)
+    ActivityPub::ProcessingWorker.perform_async(signed_request_actor.id, body, @account&.id, signed_request_actor.class.name)
   end
 end
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index b2aab56a5..60d201f76 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -6,7 +6,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   include SignatureVerification
   include AccountOwnedConcern
 
-  before_action :require_signature!, if: :authorized_fetch_mode?
+  before_action :require_account_signature!, if: :authorized_fetch_mode?
   before_action :set_statuses
   before_action :set_cache_headers
 
@@ -62,7 +62,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
     return unless page_requested?
 
     @statuses = cache_collection_paginated_by_id(
-      @account.statuses.permitted_for(@account, signed_request_account),
+      AccountStatusesFilter.new(@account, signed_request_account).results,
       Status,
       LIMIT,
       params_slice(:max_id, :min_id, :since_id)
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index fde6c861f..8e0f9de2e 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -7,7 +7,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
 
   DESCENDANTS_LIMIT = 60
 
-  before_action :require_signature!, if: :authorized_fetch_mode?
+  before_action :require_account_signature!, if: :authorized_fetch_mode?
   before_action :set_status
   before_action :set_cache_headers
   before_action :set_replies
@@ -63,15 +63,29 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
   end
 
   def next_page
-    only_other_accounts = !(@replies&.last&.account_id == @account.id && @replies.size == DESCENDANTS_LIMIT)
+    if only_other_accounts?
+      # Only consider remote accounts
+      return nil if @replies.size < DESCENDANTS_LIMIT
 
-    account_status_replies_url(
-      @account,
-      @status,
-      page: true,
-      min_id: only_other_accounts && !only_other_accounts? ? nil : @replies&.last&.id,
-      only_other_accounts: only_other_accounts
-    )
+      account_status_replies_url(
+        @account,
+        @status,
+        page: true,
+        min_id: @replies&.last&.id,
+        only_other_accounts: true
+      )
+    else
+      # For now, we're serving only self-replies, but next page might be other accounts
+      next_only_other_accounts = @replies&.last&.account_id != @account.id || @replies.size < DESCENDANTS_LIMIT
+
+      account_status_replies_url(
+        @account,
+        @status,
+        page: true,
+        min_id: next_only_other_accounts ? nil : @replies&.last&.id,
+        only_other_accounts: next_only_other_accounts
+      )
+    end
   end
 
   def page_params
diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb
index ea56fa0ac..3f2e28b6a 100644
--- a/app/controllers/admin/account_actions_controller.rb
+++ b/app/controllers/admin/account_actions_controller.rb
@@ -5,11 +5,15 @@ module Admin
     before_action :set_account
 
     def new
+      authorize @account, :show?
+
       @account_action  = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: true, include_statuses: true)
       @warning_presets = AccountWarningPreset.all
     end
 
     def create
+      authorize @account, :show?
+
       account_action                 = Admin::AccountAction.new(resource_params)
       account_action.target_account  = @account
       account_action.current_account = current_account
diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb
index 44f6e34f8..4f36f33f4 100644
--- a/app/controllers/admin/account_moderation_notes_controller.rb
+++ b/app/controllers/admin/account_moderation_notes_controller.rb
@@ -14,7 +14,7 @@ module Admin
       else
         @account          = @account_moderation_note.target_account
         @moderation_notes = @account.targeted_moderation_notes.latest
-        @warnings         = @account.targeted_account_warnings.latest.custom
+        @warnings         = @account.strikes.custom.latest
 
         render template: 'admin/accounts/show'
       end
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 7eb9fdbce..9beb8fde6 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -14,7 +14,13 @@ module Admin
     end
 
     def batch
-      @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button))
+      authorize :account, :index?
+
+      @form = Form::AccountBatch.new(form_account_batch_params)
+      @form.current_account = current_account
+      @form.action = action_from_button
+      @form.select_all_matching = params[:select_all_matching]
+      @form.query = filtered_accounts
       @form.save
     rescue ActionController::ParameterMissing
       flash[:alert] = I18n.t('admin.accounts.no_account_selected')
@@ -28,7 +34,7 @@ module Admin
       @deletion_request        = @account.deletion_request
       @account_moderation_note = current_account.account_moderation_notes.new(target_account: @account)
       @moderation_notes        = @account.targeted_moderation_notes.latest
-      @warnings                = @account.targeted_account_warnings.latest.custom
+      @warnings                = @account.strikes.includes(:target_account, :account, :appeal).latest
       @domain_block            = DomainBlock.rule_for(@account.domain)
     end
 
@@ -48,15 +54,15 @@ module Admin
 
     def approve
       authorize @account.user, :approve?
-      log_action :approve, @account.user
       @account.user.approve!
+      log_action :approve, @account.user
       redirect_to admin_accounts_path(status: 'pending'), notice: I18n.t('admin.accounts.approved_msg', username: @account.acct)
     end
 
     def reject
       authorize @account.user, :reject?
-      log_action :reject, @account.user, username: @account.username
       DeleteAccountService.new.call(@account, reserve_email: false, reserve_username: false)
+      log_action :reject, @account.user
       redirect_to admin_accounts_path(status: 'pending'), notice: I18n.t('admin.accounts.rejected_msg', username: @account.acct)
     end
 
@@ -148,7 +154,7 @@ module Admin
     end
 
     def filter_params
-      params.slice(*AccountFilter::KEYS).permit(*AccountFilter::KEYS)
+      params.slice(:page, *AccountFilter::KEYS).permit(:page, *AccountFilter::KEYS)
     end
 
     def form_account_batch_params
diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index 2d77620df..42edec15a 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -4,7 +4,10 @@ module Admin
   class ActionLogsController < BaseController
     before_action :set_action_logs
 
-    def index; end
+    def index
+      authorize :audit_log, :index?
+      @auditable_accounts = Account.where(id: Admin::ActionLog.reorder(nil).select('distinct account_id')).select(:id, :username)
+    end
 
     private
 
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 7b81a2b01..5b7a7ec11 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -7,8 +7,8 @@ module Admin
 
     layout 'admin'
 
-    before_action :require_staff!
     before_action :set_body_classes
+    after_action :verify_authorized
 
     private
 
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index efe7dcbd4..6f4e42679 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -17,7 +17,7 @@ module Admin
 
       @user.resend_confirmation_instructions
 
-      log_action :confirm, @user
+      log_action :resend, @user
 
       flash[:notice] = I18n.t('admin.accounts.resend_confirmation.success')
       redirect_to admin_accounts_path
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 71efb543e..00d069cdf 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -29,10 +29,12 @@ module Admin
     end
 
     def batch
+      authorize :custom_emoji, :index?
+
       @form = Form::CustomEmojiBatch.new(form_custom_emoji_batch_params.merge(current_account: current_account, action: action_from_button))
       @form.save
     rescue ActionController::ParameterMissing
-      flash[:alert] = I18n.t('admin.accounts.no_account_selected')
+      flash[:alert] = I18n.t('admin.custom_emojis.no_emoji_selected')
     rescue Mastodon::NotPermittedError
       flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
     ensure
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index f0a935411..924b623ad 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -2,22 +2,27 @@
 
 module Admin
   class DashboardController < BaseController
+    include Redisable
+
     def index
-      @system_checks         = Admin::SystemCheck.perform
+      authorize :dashboard, :index?
+
+      @system_checks         = Admin::SystemCheck.perform(current_user)
       @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
       @pending_users_count   = User.pending.count
       @pending_reports_count = Report.unresolved.count
       @pending_tags_count    = Tag.pending_review.count
+      @pending_appeals_count = Appeal.pending.count
     end
 
     private
 
     def redis_info
       @redis_info ||= begin
-        if Redis.current.is_a?(Redis::Namespace)
-          Redis.current.redis.info
+        if redis.is_a?(Redis::Namespace)
+          redis.redis.info
         else
-          Redis.current.info
+          redis.info
         end
       end
     end
diff --git a/app/controllers/admin/disputes/appeals_controller.rb b/app/controllers/admin/disputes/appeals_controller.rb
new file mode 100644
index 000000000..32e5e2f6f
--- /dev/null
+++ b/app/controllers/admin/disputes/appeals_controller.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class Admin::Disputes::AppealsController < Admin::BaseController
+  before_action :set_appeal, except: :index
+
+  def index
+    authorize :appeal, :index?
+
+    @appeals = filtered_appeals.page(params[:page])
+  end
+
+  def approve
+    authorize @appeal, :approve?
+    log_action :approve, @appeal
+    ApproveAppealService.new.call(@appeal, current_account)
+    redirect_to disputes_strike_path(@appeal.strike)
+  end
+
+  def reject
+    authorize @appeal, :approve?
+    log_action :reject, @appeal
+    @appeal.reject!(current_account)
+    UserMailer.appeal_rejected(@appeal.account.user, @appeal)
+    redirect_to disputes_strike_path(@appeal.strike)
+  end
+
+  private
+
+  def filtered_appeals
+    Admin::AppealFilter.new(filter_params.with_defaults(status: 'pending')).results.includes(strike: :account)
+  end
+
+  def filter_params
+    params.slice(:page, *Admin::AppealFilter::KEYS).permit(:page, *Admin::AppealFilter::KEYS)
+  end
+
+  def set_appeal
+    @appeal = Appeal.find(params[:id])
+  end
+end
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index b140c454c..74764640b 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -4,6 +4,18 @@ module Admin
   class DomainBlocksController < BaseController
     before_action :set_domain_block, only: [:show, :destroy, :edit, :update]
 
+    def batch
+      authorize :domain_block, :create?
+      @form = Form::DomainBlockBatch.new(form_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
+      @form.save
+    rescue ActionController::ParameterMissing
+      flash[:alert] = I18n.t('admin.domain_blocks.no_domain_block_selected')
+    rescue Mastodon::NotPermittedError
+      flash[:alert] = I18n.t('admin.domain_blocks.not_permitted')
+    else
+      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
+    end
+
     def new
       authorize :domain_block, :create?
       @domain_block = DomainBlock.new(domain: params[:_domain])
@@ -43,12 +55,8 @@ module Admin
     def update
       authorize :domain_block, :update?
 
-      @domain_block.update(update_params)
-
-      severity_changed = @domain_block.severity_changed?
-
-      if @domain_block.save
-        DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
+      if @domain_block.update(update_params)
+        DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
         log_action :update, @domain_block
         redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
       else
@@ -56,10 +64,6 @@ module Admin
       end
     end
 
-    def show
-      authorize @domain_block, :show?
-    end
-
     def destroy
       authorize @domain_block, :destroy?
       UnblockDomainService.new.call(@domain_block)
@@ -80,5 +84,15 @@ module Admin
     def resource_params
       params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
     end
+
+    def form_domain_block_batch_params
+      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate])
+    end
+
+    def action_from_button
+      if params[:save]
+        'save'
+      end
+    end
   end
 end
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index f7bdfb0c5..a0a43de19 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -6,7 +6,22 @@ module Admin
 
     def index
       authorize :email_domain_block, :index?
+
       @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page])
+      @form                = Form::EmailDomainBlockBatch.new
+    end
+
+    def batch
+      authorize :email_domain_block, :index?
+
+      @form = Form::EmailDomainBlockBatch.new(form_email_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
+      @form.save
+    rescue ActionController::ParameterMissing
+      flash[:alert] = I18n.t('admin.email_domain_blocks.no_email_domain_block_selected')
+    rescue Mastodon::NotPermittedError
+      flash[:alert] = I18n.t('admin.email_domain_blocks.not_permitted')
+    ensure
+      redirect_to admin_email_domain_blocks_path
     end
 
     def new
@@ -19,41 +34,27 @@ module Admin
 
       @email_domain_block = EmailDomainBlock.new(resource_params)
 
-      if @email_domain_block.save
-        log_action :create, @email_domain_block
+      if action_from_button == 'save'
+        EmailDomainBlock.transaction do
+          @email_domain_block.save!
+          log_action :create, @email_domain_block
 
-        if @email_domain_block.with_dns_records?
-          hostnames = []
-          ips       = []
+          (@email_domain_block.other_domains || []).uniq.each do |domain|
+            next if EmailDomainBlock.where(domain: domain).exists?
 
-          Resolv::DNS.open do |dns|
-            dns.timeouts = 5
-
-            hostnames = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
-
-            ([@email_domain_block.domain] + hostnames).uniq.each do |hostname|
-              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
-              ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
-            end
-          end
-
-          (hostnames + ips).each do |hostname|
-            another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: @email_domain_block)
-            log_action :create, another_email_domain_block if another_email_domain_block.save
+            other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
+            log_action :create, other_email_domain_block
           end
         end
 
         redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg')
       else
+        set_resolved_records
         render :new
       end
-    end
-
-    def destroy
-      authorize @email_domain_block, :destroy?
-      @email_domain_block.destroy!
-      log_action :destroy, @email_domain_block
-      redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.destroyed_msg')
+    rescue ActiveRecord::RecordInvalid
+      set_resolved_records
+      render :new
     end
 
     private
@@ -62,8 +63,27 @@ module Admin
       @email_domain_block = EmailDomainBlock.find(params[:id])
     end
 
+    def set_resolved_records
+      Resolv::DNS.open do |dns|
+        dns.timeouts = 5
+        @resolved_records = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a
+      end
+    end
+
     def resource_params
-      params.require(:email_domain_block).permit(:domain, :with_dns_records)
+      params.require(:email_domain_block).permit(:domain, other_domains: [])
+    end
+
+    def form_email_domain_block_batch_params
+      params.require(:form_email_domain_block_batch).permit(email_domain_block_ids: [])
+    end
+
+    def action_from_button
+      if params[:delete]
+        'delete'
+      elsif params[:save]
+        'save'
+      end
     end
   end
 end
diff --git a/app/controllers/admin/export_domain_allows_controller.rb b/app/controllers/admin/export_domain_allows_controller.rb
new file mode 100644
index 000000000..57fb12c62
--- /dev/null
+++ b/app/controllers/admin/export_domain_allows_controller.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Admin
+  class ExportDomainAllowsController < BaseController
+    include AdminExportControllerConcern
+
+    before_action :set_dummy_import!, only: [:new]
+
+    def new
+      authorize :domain_allow, :create?
+    end
+
+    def export
+      authorize :instance, :index?
+      send_export_file
+    end
+
+    def import
+      authorize :domain_allow, :create?
+      begin
+        @import = Admin::Import.new(import_params)
+        return render :new unless @import.validate
+
+        parse_import_data!(export_headers)
+
+        @data.take(Admin::Import::ROWS_PROCESSING_LIMIT).each do |row|
+          domain = row['#domain'].strip
+          next if DomainAllow.allowed?(domain)
+
+          domain_allow = DomainAllow.new(domain: domain)
+          log_action :create, domain_allow if domain_allow.save
+        end
+        flash[:notice] = I18n.t('admin.domain_allows.created_msg')
+      rescue ActionController::ParameterMissing
+        flash[:error] = I18n.t('admin.export_domain_allows.no_file')
+      end
+      redirect_to admin_instances_path
+    end
+
+    private
+
+    def export_filename
+      'domain_allows.csv'
+    end
+
+    def export_headers
+      %w(#domain)
+    end
+
+    def export_data
+      CSV.generate(headers: export_headers, write_headers: true) do |content|
+        DomainAllow.allowed_domains.each do |instance|
+          content << [instance.domain]
+        end
+      end
+    end
+  end
+end
diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
new file mode 100644
index 000000000..fb0cd05d2
--- /dev/null
+++ b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Admin
+  class ExportDomainBlocksController < BaseController
+    include AdminExportControllerConcern
+
+    before_action :set_dummy_import!, only: [:new]
+
+    def new
+      authorize :domain_block, :create?
+    end
+
+    def export
+      authorize :instance, :index?
+      send_export_file
+    end
+
+    def import
+      authorize :domain_block, :create?
+
+      @import = Admin::Import.new(import_params)
+      return render :new unless @import.validate
+
+      parse_import_data!(export_headers)
+
+      @global_private_comment = I18n.t('admin.export_domain_blocks.import.private_comment_template', source: @import.data_file_name, date: I18n.l(Time.now.utc))
+
+      @form = Form::DomainBlockBatch.new
+      @domain_blocks = @data.take(Admin::Import::ROWS_PROCESSING_LIMIT).filter_map do |row|
+        domain = row['#domain'].strip
+        next if DomainBlock.rule_for(domain).present?
+
+        domain_block = DomainBlock.new(domain: domain,
+                                       severity: row['#severity'].strip,
+                                       reject_media: row['#reject_media'].strip,
+                                       reject_reports: row['#reject_reports'].strip,
+                                       private_comment: @global_private_comment,
+                                       public_comment: row['#public_comment']&.strip,
+                                       obfuscate: row['#obfuscate'].strip)
+
+        domain_block if domain_block.valid?
+      end
+
+      @warning_domains = Instance.where(domain: @domain_blocks.map(&:domain)).where('EXISTS (SELECT 1 FROM follows JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id WHERE accounts.domain = instances.domain)').pluck(:domain)
+    rescue ActionController::ParameterMissing
+      flash.now[:alert] = I18n.t('admin.export_domain_blocks.no_file')
+      set_dummy_import!
+      render :new
+    end
+
+    private
+
+    def export_filename
+      'domain_blocks.csv'
+    end
+
+    def export_headers
+      %w(#domain #severity #reject_media #reject_reports #public_comment #obfuscate)
+    end
+
+    def export_data
+      CSV.generate(headers: export_headers, write_headers: true) do |content|
+        DomainBlock.with_limitations.each do |instance|
+          content << [instance.domain, instance.severity, instance.reject_media, instance.reject_reports, instance.public_comment, instance.obfuscate]
+        end
+      end
+    end
+  end
+end
diff --git a/app/controllers/admin/follow_recommendations_controller.rb b/app/controllers/admin/follow_recommendations_controller.rb
index e3eac62b3..841e3cc7f 100644
--- a/app/controllers/admin/follow_recommendations_controller.rb
+++ b/app/controllers/admin/follow_recommendations_controller.rb
@@ -12,6 +12,8 @@ module Admin
     end
 
     def update
+      authorize :follow_recommendation, :show?
+
       @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button))
       @form.save
     rescue ActionController::ParameterMissing
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 306ec1f53..7c44e88b7 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -4,28 +4,26 @@ module Admin
   class InstancesController < BaseController
     before_action :set_instances, only: :index
     before_action :set_instance, except: :index
-    before_action :set_exhausted_deliveries_days, only: :show
 
     def index
       authorize :instance, :index?
+      preload_delivery_failures!
     end
 
     def show
       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)
-
       log_action :destroy, @instance
       redirect_to admin_instances_path, notice: I18n.t('admin.instances.destroyed_msg', domain: @instance.domain)
     end
 
     def clear_delivery_errors
       authorize :delivery, :clear_delivery_errors?
-
       @instance.delivery_failure_tracker.clear_failures!
       redirect_to admin_instance_path(@instance.domain)
     end
@@ -33,11 +31,9 @@ module Admin
     def restart_delivery
       authorize :delivery, :restart_delivery?
 
-      last_unavailable_domain = unavailable_domain
-
-      if last_unavailable_domain.present?
+      if @instance.unavailable?
         @instance.delivery_failure_tracker.track_success!
-        log_action :destroy, last_unavailable_domain
+        log_action :destroy, @instance.unavailable_domain
       end
 
       redirect_to admin_instance_path(@instance.domain)
@@ -45,8 +41,7 @@ module Admin
 
     def stop_delivery
       authorize :delivery, :stop_delivery?
-
-      UnavailableDomain.create(domain: @instance.domain)
+      unavailable_domain = UnavailableDomain.create!(domain: @instance.domain)
       log_action :create, unavailable_domain
       redirect_to admin_instance_path(@instance.domain)
     end
@@ -57,23 +52,18 @@ module Admin
       @instance = Instance.find(params[:id])
     end
 
-    def set_exhausted_deliveries_days
-      @exhausted_deliveries_days = @instance.delivery_failure_tracker.exhausted_deliveries_days
-    end
-
     def set_instances
       @instances = filtered_instances.page(params[:page])
-      warning_domains_map = DeliveryFailureTracker.warning_domains_map
+    end
+
+    def preload_delivery_failures!
+      warning_domains_map = DeliveryFailureTracker.warning_domains_map(@instances.map(&:domain))
 
       @instances.each do |instance|
         instance.failure_days = warning_domains_map[instance.domain]
       end
     end
 
-    def unavailable_domain
-      UnavailableDomain.find_by(domain: @instance.domain)
-    end
-
     def filtered_instances
       InstanceFilter.new(whitelist_mode? ? { allowed: true } : filter_params).results
     end
diff --git a/app/controllers/admin/ip_blocks_controller.rb b/app/controllers/admin/ip_blocks_controller.rb
index 92b8b0d2b..1bd7ec805 100644
--- a/app/controllers/admin/ip_blocks_controller.rb
+++ b/app/controllers/admin/ip_blocks_controller.rb
@@ -5,7 +5,7 @@ module Admin
     def index
       authorize :ip_block, :index?
 
-      @ip_blocks = IpBlock.page(params[:page])
+      @ip_blocks = IpBlock.order(ip: :asc).page(params[:page])
       @form      = Form::IpBlockBatch.new
     end
 
@@ -29,6 +29,8 @@ module Admin
     end
 
     def batch
+      authorize :ip_block, :index?
+
       @form = Form::IpBlockBatch.new(form_ip_block_batch_params.merge(current_account: current_account, action: action_from_button))
       @form.save
     rescue ActionController::ParameterMissing
diff --git a/app/controllers/admin/relationships_controller.rb b/app/controllers/admin/relationships_controller.rb
index f8a95cfc8..67645f054 100644
--- a/app/controllers/admin/relationships_controller.rb
+++ b/app/controllers/admin/relationships_controller.rb
@@ -7,9 +7,10 @@ module Admin
     PER_PAGE = 40
 
     def index
-      authorize :account, :index?
+      authorize @account, :show?
 
-      @accounts = RelationshipFilter.new(@account, filter_params).results.page(params[:page]).per(PER_PAGE)
+      @accounts = RelationshipFilter.new(@account, filter_params).results.includes(:account_stat, user: [:ips, :invite_request]).page(params[:page]).per(PER_PAGE)
+      @form     = Form::AccountBatch.new
     end
 
     private
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb
index 6fbb6e063..c1297c8b9 100644
--- a/app/controllers/admin/relays_controller.rb
+++ b/app/controllers/admin/relays_controller.rb
@@ -3,7 +3,7 @@
 module Admin
   class RelaysController < BaseController
     before_action :set_relay, except: [:index, :new, :create]
-    before_action :require_signatures_enabled!, only: [:new, :create, :enable]
+    before_action :warn_signatures_not_enabled!, only: [:new, :create, :enable]
 
     def index
       authorize :relay, :update?
@@ -56,8 +56,8 @@ module Admin
       params.require(:relay).permit(:inbox_url)
     end
 
-    def require_signatures_enabled!
-      redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
+    def warn_signatures_not_enabled!
+      flash.now[:error] = I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
     end
   end
 end
diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb
index b816c5b5d..3fd815b60 100644
--- a/app/controllers/admin/report_notes_controller.rb
+++ b/app/controllers/admin/report_notes_controller.rb
@@ -14,20 +14,17 @@ module Admin
         if params[:create_and_resolve]
           @report.resolve!(current_account)
           log_action :resolve, @report
-
-          redirect_to admin_reports_path, notice: I18n.t('admin.reports.resolved_msg')
-          return
-        end
-
-        if params[:create_and_unresolve]
+        elsif params[:create_and_unresolve]
           @report.unresolve!
           log_action :reopen, @report
         end
 
-        redirect_to admin_report_path(@report), notice: I18n.t('admin.report_notes.created_msg')
+        redirect_to after_create_redirect_path, notice: I18n.t('admin.report_notes.created_msg')
       else
-        @report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at)
-        @form         = Form::StatusBatch.new
+        @report_notes = @report.notes.includes(:account).order(id: :desc)
+        @action_logs  = @report.history.includes(:target)
+        @form         = Admin::StatusBatchAction.new
+        @statuses     = @report.statuses.with_includes
 
         render template: 'admin/reports/show'
       end
@@ -41,6 +38,14 @@ module Admin
 
     private
 
+    def after_create_redirect_path
+      if params[:create_and_resolve]
+        admin_reports_path
+      else
+        admin_report_path(@report)
+      end
+    end
+
     def resource_params
       params.require(:report_note).permit(
         :content,
diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb
deleted file mode 100644
index 3ba9f5df2..000000000
--- a/app/controllers/admin/reported_statuses_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class ReportedStatusesController < BaseController
-    before_action :set_report
-
-    def create
-      authorize :status, :update?
-
-      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button))
-      flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save
-
-      redirect_to admin_report_path(@report)
-    rescue ActionController::ParameterMissing
-      flash[:alert] = I18n.t('admin.statuses.no_status_selected')
-
-      redirect_to admin_report_path(@report)
-    end
-
-    private
-
-    def status_params
-      params.require(:status).permit(:sensitive)
-    end
-
-    def form_status_batch_params
-      params.require(:form_status_batch).permit(status_ids: [])
-    end
-
-    def action_from_button
-      if params[:nsfw_on]
-        'nsfw_on'
-      elsif params[:nsfw_off]
-        'nsfw_off'
-      elsif params[:delete]
-        'delete'
-      end
-    end
-
-    def set_report
-      @report = Report.find(params[:report_id])
-    end
-  end
-end
diff --git a/app/controllers/admin/reports/actions_controller.rb b/app/controllers/admin/reports/actions_controller.rb
new file mode 100644
index 000000000..5cb5c744f
--- /dev/null
+++ b/app/controllers/admin/reports/actions_controller.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class Admin::Reports::ActionsController < Admin::BaseController
+  before_action :set_report
+
+  def create
+    authorize @report, :show?
+
+    case action_from_button
+    when 'delete', 'mark_as_sensitive'
+      status_batch_action = Admin::StatusBatchAction.new(
+        type: action_from_button,
+        status_ids: @report.status_ids,
+        current_account: current_account,
+        report_id: @report.id,
+        send_email_notification: !@report.spam?
+      )
+
+      status_batch_action.save!
+    when 'silence', 'suspend'
+      account_action = Admin::AccountAction.new(
+        type: action_from_button,
+        report_id: @report.id,
+        target_account: @report.target_account,
+        current_account: current_account,
+        send_email_notification: !@report.spam?
+      )
+
+      account_action.save!
+    end
+
+    redirect_to admin_reports_path
+  end
+
+  private
+
+  def set_report
+    @report = Report.find(params[:report_id])
+  end
+
+  def action_from_button
+    if params[:delete]
+      'delete'
+    elsif params[:mark_as_sensitive]
+      'mark_as_sensitive'
+    elsif params[:silence]
+      'silence'
+    elsif params[:suspend]
+      'suspend'
+    end
+  end
+end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index d7fa4c31b..00d200d7c 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -13,8 +13,10 @@ module Admin
       authorize @report, :show?
 
       @report_note  = @report.notes.new
-      @report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at)
-      @form         = Form::StatusBatch.new
+      @report_notes = @report.notes.includes(:account).order(id: :desc)
+      @action_logs  = @report.history.includes(:target)
+      @form         = Admin::StatusBatchAction.new
+      @statuses     = @report.statuses.with_includes
     end
 
     def assign_to_self
@@ -48,7 +50,7 @@ module Admin
     private
 
     def filtered_reports
-      ReportFilter.new(filter_params).results.includes(:account, :target_account)
+      ReportFilter.new(filter_params).results.order(id: :desc).includes(:account, :target_account)
     end
 
     def filter_params
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 13f56e9be..d76aa745b 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -2,20 +2,66 @@
 
 module Admin
   class RolesController < BaseController
-    before_action :set_user
+    before_action :set_role, except: [:index, :new, :create]
 
-    def promote
-      authorize @user, :promote?
-      @user.promote!
-      log_action :promote, @user
-      redirect_to admin_account_path(@user.account_id)
+    def index
+      authorize :user_role, :index?
+
+      @roles = UserRole.order(position: :desc).page(params[:page])
     end
 
-    def demote
-      authorize @user, :demote?
-      @user.demote!
-      log_action :demote, @user
-      redirect_to admin_account_path(@user.account_id)
+    def new
+      authorize :user_role, :create?
+
+      @role = UserRole.new
+    end
+
+    def create
+      authorize :user_role, :create?
+
+      @role = UserRole.new(resource_params)
+      @role.current_account = current_account
+
+      if @role.save
+        log_action :create, @role
+        redirect_to admin_roles_path
+      else
+        render :new
+      end
+    end
+
+    def edit
+      authorize @role, :update?
+    end
+
+    def update
+      authorize @role, :update?
+
+      @role.current_account = current_account
+
+      if @role.update(resource_params)
+        log_action :update, @role
+        redirect_to admin_roles_path
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      authorize @role, :destroy?
+      @role.destroy!
+      log_action :destroy, @role
+      redirect_to admin_roles_path
+    end
+
+    private
+
+    def set_role
+      @role = UserRole.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:user_role).permit(:name, :color, :highlighted, :position, permissions_as_keys: [])
     end
   end
 end
diff --git a/app/controllers/admin/settings/about_controller.rb b/app/controllers/admin/settings/about_controller.rb
new file mode 100644
index 000000000..86327fe39
--- /dev/null
+++ b/app/controllers/admin/settings/about_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::AboutController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_about_path
+  end
+end
diff --git a/app/controllers/admin/settings/appearance_controller.rb b/app/controllers/admin/settings/appearance_controller.rb
new file mode 100644
index 000000000..39b2448d8
--- /dev/null
+++ b/app/controllers/admin/settings/appearance_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::AppearanceController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_appearance_path
+  end
+end
diff --git a/app/controllers/admin/settings/branding_controller.rb b/app/controllers/admin/settings/branding_controller.rb
new file mode 100644
index 000000000..4a4d76f49
--- /dev/null
+++ b/app/controllers/admin/settings/branding_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::BrandingController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_branding_path
+  end
+end
diff --git a/app/controllers/admin/settings/content_retention_controller.rb b/app/controllers/admin/settings/content_retention_controller.rb
new file mode 100644
index 000000000..b88336a2c
--- /dev/null
+++ b/app/controllers/admin/settings/content_retention_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::ContentRetentionController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_content_retention_path
+  end
+end
diff --git a/app/controllers/admin/settings/discovery_controller.rb b/app/controllers/admin/settings/discovery_controller.rb
new file mode 100644
index 000000000..be4b57f79
--- /dev/null
+++ b/app/controllers/admin/settings/discovery_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::DiscoveryController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_discovery_path
+  end
+end
diff --git a/app/controllers/admin/settings/registrations_controller.rb b/app/controllers/admin/settings/registrations_controller.rb
new file mode 100644
index 000000000..b4a74349c
--- /dev/null
+++ b/app/controllers/admin/settings/registrations_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Admin::Settings::RegistrationsController < Admin::SettingsController
+  private
+
+  def after_update_redirect_path
+    admin_settings_registrations_path
+  end
+end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index dc1c79b7f..338a3638c 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -2,7 +2,7 @@
 
 module Admin
   class SettingsController < BaseController
-    def edit
+    def show
       authorize :settings, :show?
 
       @admin_settings = Form::AdminSettings.new
@@ -15,14 +15,18 @@ module Admin
 
       if @admin_settings.save
         flash[:notice] = I18n.t('generic.changes_saved_msg')
-        redirect_to edit_admin_settings_path
+        redirect_to after_update_redirect_path
       else
-        render :edit
+        render :show
       end
     end
 
     private
 
+    def after_update_redirect_path
+      raise NotImplementedError
+    end
+
     def settings_params
       params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
     end
diff --git a/app/controllers/admin/sign_in_token_authentications_controller.rb b/app/controllers/admin/sign_in_token_authentications_controller.rb
deleted file mode 100644
index e620ab292..000000000
--- a/app/controllers/admin/sign_in_token_authentications_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class SignInTokenAuthenticationsController < BaseController
-    before_action :set_target_user
-
-    def create
-      authorize @user, :enable_sign_in_token_auth?
-      @user.update(skip_sign_in_token: false)
-      log_action :enable_sign_in_token_auth, @user
-      redirect_to admin_account_path(@user.account_id)
-    end
-
-    def destroy
-      authorize @user, :disable_sign_in_token_auth?
-      @user.update(skip_sign_in_token: true)
-      log_action :disable_sign_in_token_auth, @user
-      redirect_to admin_account_path(@user.account_id)
-    end
-
-    private
-
-    def set_target_user
-      @user = User.find(params[:user_id])
-    end
-  end
-end
diff --git a/app/controllers/admin/site_uploads_controller.rb b/app/controllers/admin/site_uploads_controller.rb
index cacecedb0..a5d2cf41c 100644
--- a/app/controllers/admin/site_uploads_controller.rb
+++ b/app/controllers/admin/site_uploads_controller.rb
@@ -9,7 +9,7 @@ module Admin
 
       @site_upload.destroy!
 
-      redirect_to edit_admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
+      redirect_to admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
     end
 
     private
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index b3fd4c424..b80cd20f5 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -2,71 +2,74 @@
 
 module Admin
   class StatusesController < BaseController
-    helper_method :current_params
-
     before_action :set_account
+    before_action :set_statuses, except: :show
+    before_action :set_status, only: :show
 
     PER_PAGE = 20
 
     def index
-      authorize :status, :index?
+      authorize [:admin, :status], :index?
 
-      @statuses = @account.statuses.where(visibility: [:public, :unlisted])
-
-      if params[:media]
-        @statuses = @statuses.merge(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)).reorder('statuses.id desc')
-      end
-
-      @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PER_PAGE)
-      @form     = Form::StatusBatch.new
+      @status_batch_action = Admin::StatusBatchAction.new
     end
 
     def show
-      authorize :status, :index?
-
-      @statuses = @account.statuses.where(id: params[:id])
-      authorize @statuses.first, :show?
-
-      @form = Form::StatusBatch.new
+      authorize [:admin, @status], :show?
     end
 
-    def create
-      authorize :status, :update?
+    def batch
+      authorize [:admin, :status], :index?
 
-      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button))
-      flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save
-
-      redirect_to admin_account_statuses_path(@account.id, current_params)
+      @status_batch_action = Admin::StatusBatchAction.new(admin_status_batch_action_params.merge(current_account: current_account, report_id: params[:report_id], type: action_from_button))
+      @status_batch_action.save!
     rescue ActionController::ParameterMissing
       flash[:alert] = I18n.t('admin.statuses.no_status_selected')
-
-      redirect_to admin_account_statuses_path(@account.id, current_params)
+    ensure
+      redirect_to after_create_redirect_path
     end
 
     private
 
-    def form_status_batch_params
-      params.require(:form_status_batch).permit(:action, status_ids: [])
+    def admin_status_batch_action_params
+      params.require(:admin_status_batch_action).permit(status_ids: [])
+    end
+
+    def after_create_redirect_path
+      report_id = @status_batch_action&.report_id || params[:report_id]
+
+      if report_id.present?
+        admin_report_path(report_id)
+      else
+        admin_account_statuses_path(params[:account_id], current_params)
+      end
     end
 
     def set_account
       @account = Account.find(params[:account_id])
     end
 
-    def current_params
-      page = (params[:page] || 1).to_i
+    def set_status
+      @status = @account.statuses.find(params[:id])
+    end
 
-      {
-        media: params[:media],
-        page: page > 1 && page,
-      }.select { |_, value| value.present? }
+    def set_statuses
+      @statuses = Admin::StatusFilter.new(@account, filter_params).results.preload(:application, :preloadable_poll, :media_attachments, active_mentions: :account, reblog: [:account, :application, :preloadable_poll, :media_attachments, active_mentions: :account]).page(params[:page]).per(PER_PAGE)
+    end
+
+    def filter_params
+      params.slice(*Admin::StatusFilter::KEYS).permit(*Admin::StatusFilter::KEYS)
+    end
+
+    def current_params
+      params.slice(:media, :page).permit(:media, :page)
     end
 
     def action_from_button
-      if params[:nsfw_on]
-        'nsfw_on'
-      elsif params[:nsfw_off]
-        'nsfw_off'
+      if params[:report]
+        'report'
+      elsif params[:remove_from_report]
+        'remove_from_report'
       elsif params[:delete]
         'delete'
       end
diff --git a/app/controllers/admin/subscriptions_controller.rb b/app/controllers/admin/subscriptions_controller.rb
deleted file mode 100644
index 40500ef43..000000000
--- a/app/controllers/admin/subscriptions_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class SubscriptionsController < BaseController
-    def index
-      authorize :subscription, :index?
-      @subscriptions = ordered_subscriptions.page(requested_page)
-    end
-
-    private
-
-    def ordered_subscriptions
-      Subscription.order(id: :desc).includes(:account)
-    end
-
-    def requested_page
-      params[:page].to_i
-    end
-  end
-end
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 749e2f144..4f727c398 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -16,6 +16,8 @@ module Admin
       if @tag.update(tag_params.merge(reviewed_at: Time.now.utc))
         redirect_to admin_tag_path(@tag.id), notice: I18n.t('admin.tags.updated_msg')
       else
+        @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+
         render :show
       end
     end
@@ -27,7 +29,7 @@ module Admin
     end
 
     def tag_params
-      params.require(:tag).permit(:name, :trendable, :usable, :listable)
+      params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable)
     end
   end
 end
diff --git a/app/controllers/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/admin/trends/links/preview_card_providers_controller.rb
index 2c26e03f3..768b79f8d 100644
--- a/app/controllers/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/admin/trends/links/preview_card_providers_controller.rb
@@ -2,17 +2,19 @@
 
 class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseController
   def index
-    authorize :preview_card_provider, :index?
+    authorize :preview_card_provider, :review?
 
     @preview_card_providers = filtered_preview_card_providers.page(params[:page])
-    @form = Form::PreviewCardProviderBatch.new
+    @form = Trends::PreviewCardProviderBatch.new
   end
 
   def batch
-    @form = Form::PreviewCardProviderBatch.new(form_preview_card_provider_batch_params.merge(current_account: current_account, action: action_from_button))
+    authorize :preview_card_provider, :review?
+
+    @form = Trends::PreviewCardProviderBatch.new(trends_preview_card_provider_batch_params.merge(current_account: current_account, action: action_from_button))
     @form.save
   rescue ActionController::ParameterMissing
-    flash[:alert] = I18n.t('admin.accounts.no_account_selected')
+    flash[:alert] = I18n.t('admin.trends.links.publishers.no_publisher_selected')
   ensure
     redirect_to admin_trends_links_preview_card_providers_path(filter_params)
   end
@@ -20,15 +22,15 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll
   private
 
   def filtered_preview_card_providers
-    PreviewCardProviderFilter.new(filter_params).results
+    Trends::PreviewCardProviderFilter.new(filter_params).results
   end
 
   def filter_params
-    params.slice(:page, *PreviewCardProviderFilter::KEYS).permit(:page, *PreviewCardProviderFilter::KEYS)
+    params.slice(:page, *Trends::PreviewCardProviderFilter::KEYS).permit(:page, *Trends::PreviewCardProviderFilter::KEYS)
   end
 
-  def form_preview_card_provider_batch_params
-    params.require(:form_preview_card_provider_batch).permit(:action, preview_card_provider_ids: [])
+  def trends_preview_card_provider_batch_params
+    params.require(:trends_preview_card_provider_batch).permit(:action, preview_card_provider_ids: [])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/trends/links_controller.rb b/app/controllers/admin/trends/links_controller.rb
index 619b37deb..83d68eba6 100644
--- a/app/controllers/admin/trends/links_controller.rb
+++ b/app/controllers/admin/trends/links_controller.rb
@@ -2,17 +2,20 @@
 
 class Admin::Trends::LinksController < Admin::BaseController
   def index
-    authorize :preview_card, :index?
+    authorize :preview_card, :review?
 
+    @locales       = PreviewCardTrend.pluck('distinct language')
     @preview_cards = filtered_preview_cards.page(params[:page])
-    @form          = Form::PreviewCardBatch.new
+    @form          = Trends::PreviewCardBatch.new
   end
 
   def batch
-    @form = Form::PreviewCardBatch.new(form_preview_card_batch_params.merge(current_account: current_account, action: action_from_button))
+    authorize :preview_card, :review?
+
+    @form = Trends::PreviewCardBatch.new(trends_preview_card_batch_params.merge(current_account: current_account, action: action_from_button))
     @form.save
   rescue ActionController::ParameterMissing
-    flash[:alert] = I18n.t('admin.accounts.no_account_selected')
+    flash[:alert] = I18n.t('admin.trends.links.no_link_selected')
   ensure
     redirect_to admin_trends_links_path(filter_params)
   end
@@ -20,26 +23,26 @@ class Admin::Trends::LinksController < Admin::BaseController
   private
 
   def filtered_preview_cards
-    PreviewCardFilter.new(filter_params.with_defaults(trending: 'all')).results
+    Trends::PreviewCardFilter.new(filter_params.with_defaults(trending: 'all')).results
   end
 
   def filter_params
-    params.slice(:page, *PreviewCardFilter::KEYS).permit(:page, *PreviewCardFilter::KEYS)
+    params.slice(:page, *Trends::PreviewCardFilter::KEYS).permit(:page, *Trends::PreviewCardFilter::KEYS)
   end
 
-  def form_preview_card_batch_params
-    params.require(:form_preview_card_batch).permit(:action, preview_card_ids: [])
+  def trends_preview_card_batch_params
+    params.require(:trends_preview_card_batch).permit(:action, preview_card_ids: [])
   end
 
   def action_from_button
     if params[:approve]
       'approve'
-    elsif params[:approve_all]
-      'approve_all'
+    elsif params[:approve_providers]
+      'approve_providers'
     elsif params[:reject]
       'reject'
-    elsif params[:reject_all]
-      'reject_all'
+    elsif params[:reject_providers]
+      'reject_providers'
     end
   end
 end
diff --git a/app/controllers/admin/trends/statuses_controller.rb b/app/controllers/admin/trends/statuses_controller.rb
new file mode 100644
index 000000000..3d8b53ea8
--- /dev/null
+++ b/app/controllers/admin/trends/statuses_controller.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class Admin::Trends::StatusesController < Admin::BaseController
+  def index
+    authorize [:admin, :status], :review?
+
+    @locales  = StatusTrend.pluck('distinct language')
+    @statuses = filtered_statuses.page(params[:page])
+    @form     = Trends::StatusBatch.new
+  end
+
+  def batch
+    authorize [:admin, :status], :review?
+
+    @form = Trends::StatusBatch.new(trends_status_batch_params.merge(current_account: current_account, action: action_from_button))
+    @form.save
+  rescue ActionController::ParameterMissing
+    flash[:alert] = I18n.t('admin.trends.statuses.no_status_selected')
+  ensure
+    redirect_to admin_trends_statuses_path(filter_params)
+  end
+
+  private
+
+  def filtered_statuses
+    Trends::StatusFilter.new(filter_params.with_defaults(trending: 'all')).results.includes(:account, :media_attachments, :active_mentions)
+  end
+
+  def filter_params
+    params.slice(:page, *Trends::StatusFilter::KEYS).permit(:page, *Trends::StatusFilter::KEYS)
+  end
+
+  def trends_status_batch_params
+    params.require(:trends_status_batch).permit(:action, status_ids: [])
+  end
+
+  def action_from_button
+    if params[:approve]
+      'approve'
+    elsif params[:approve_accounts]
+      'approve_accounts'
+    elsif params[:reject]
+      'reject'
+    elsif params[:reject_accounts]
+      'reject_accounts'
+    end
+  end
+end
diff --git a/app/controllers/admin/trends/tags_controller.rb b/app/controllers/admin/trends/tags_controller.rb
index 91ff33d40..f5946448a 100644
--- a/app/controllers/admin/trends/tags_controller.rb
+++ b/app/controllers/admin/trends/tags_controller.rb
@@ -2,17 +2,19 @@
 
 class Admin::Trends::TagsController < Admin::BaseController
   def index
-    authorize :tag, :index?
+    authorize :tag, :review?
 
     @tags = filtered_tags.page(params[:page])
-    @form = Form::TagBatch.new
+    @form = Trends::TagBatch.new
   end
 
   def batch
-    @form = Form::TagBatch.new(form_tag_batch_params.merge(current_account: current_account, action: action_from_button))
+    authorize :tag, :review?
+
+    @form = Trends::TagBatch.new(trends_tag_batch_params.merge(current_account: current_account, action: action_from_button))
     @form.save
   rescue ActionController::ParameterMissing
-    flash[:alert] = I18n.t('admin.accounts.no_account_selected')
+    flash[:alert] = I18n.t('admin.trends.tags.no_tag_selected')
   ensure
     redirect_to admin_trends_tags_path(filter_params)
   end
@@ -20,15 +22,15 @@ class Admin::Trends::TagsController < Admin::BaseController
   private
 
   def filtered_tags
-    TagFilter.new(filter_params).results
+    Trends::TagFilter.new(filter_params).results
   end
 
   def filter_params
-    params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS)
+    params.slice(:page, *Trends::TagFilter::KEYS).permit(:page, *Trends::TagFilter::KEYS)
   end
 
-  def form_tag_batch_params
-    params.require(:form_tag_batch).permit(:action, tag_ids: [])
+  def trends_tag_batch_params
+    params.require(:trends_tag_batch).permit(:action, tag_ids: [])
   end
 
   def action_from_button
diff --git a/app/controllers/admin/users/roles_controller.rb b/app/controllers/admin/users/roles_controller.rb
new file mode 100644
index 000000000..f5dfc643d
--- /dev/null
+++ b/app/controllers/admin/users/roles_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Admin
+  class Users::RolesController < BaseController
+    before_action :set_user
+
+    def show
+      authorize @user, :change_role?
+    end
+
+    def update
+      authorize @user, :change_role?
+
+      @user.current_account = current_account
+
+      if @user.update(resource_params)
+        log_action :change_role, @user
+        redirect_to admin_account_path(@user.account_id), notice: I18n.t('admin.accounts.change_role.changed_msg')
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def set_user
+      @user = User.find(params[:user_id])
+    end
+
+    def resource_params
+      params.require(:user).permit(:role_id)
+    end
+  end
+end
diff --git a/app/controllers/admin/two_factor_authentications_controller.rb b/app/controllers/admin/users/two_factor_authentications_controller.rb
similarity index 86%
rename from app/controllers/admin/two_factor_authentications_controller.rb
rename to app/controllers/admin/users/two_factor_authentications_controller.rb
index f7fb7eb8f..5e3fb2b3c 100644
--- a/app/controllers/admin/two_factor_authentications_controller.rb
+++ b/app/controllers/admin/users/two_factor_authentications_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Admin
-  class TwoFactorAuthenticationsController < BaseController
+  class Users::TwoFactorAuthenticationsController < BaseController
     before_action :set_target_user
 
     def destroy
diff --git a/app/controllers/admin/webhooks/secrets_controller.rb b/app/controllers/admin/webhooks/secrets_controller.rb
new file mode 100644
index 000000000..16af1cf7b
--- /dev/null
+++ b/app/controllers/admin/webhooks/secrets_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Admin
+  class Webhooks::SecretsController < BaseController
+    before_action :set_webhook
+
+    def rotate
+      authorize @webhook, :rotate_secret?
+      @webhook.rotate_secret!
+      redirect_to admin_webhook_path(@webhook)
+    end
+
+    private
+
+    def set_webhook
+      @webhook = Webhook.find(params[:webhook_id])
+    end
+  end
+end
diff --git a/app/controllers/admin/webhooks_controller.rb b/app/controllers/admin/webhooks_controller.rb
new file mode 100644
index 000000000..d6fb1a4ea
--- /dev/null
+++ b/app/controllers/admin/webhooks_controller.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Admin
+  class WebhooksController < BaseController
+    before_action :set_webhook, except: [:index, :new, :create]
+
+    def index
+      authorize :webhook, :index?
+
+      @webhooks = Webhook.page(params[:page])
+    end
+
+    def new
+      authorize :webhook, :create?
+
+      @webhook = Webhook.new
+    end
+
+    def create
+      authorize :webhook, :create?
+
+      @webhook = Webhook.new(resource_params)
+
+      if @webhook.save
+        redirect_to admin_webhook_path(@webhook)
+      else
+        render :new
+      end
+    end
+
+    def show
+      authorize @webhook, :show?
+    end
+
+    def edit
+      authorize @webhook, :update?
+    end
+
+    def update
+      authorize @webhook, :update?
+
+      if @webhook.update(resource_params)
+        redirect_to admin_webhook_path(@webhook)
+      else
+        render :show
+      end
+    end
+
+    def enable
+      authorize @webhook, :enable?
+      @webhook.enable!
+      redirect_to admin_webhook_path(@webhook)
+    end
+
+    def disable
+      authorize @webhook, :disable?
+      @webhook.disable!
+      redirect_to admin_webhook_path(@webhook)
+    end
+
+    def destroy
+      authorize @webhook, :destroy?
+      @webhook.destroy!
+      redirect_to admin_webhooks_path
+    end
+
+    private
+
+    def set_webhook
+      @webhook = Webhook.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:webhook).permit(:url, events: [])
+    end
+  end
+end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index b863d8643..41f3ce2ee 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -5,16 +5,36 @@ class Api::BaseController < ApplicationController
   DEFAULT_ACCOUNTS_LIMIT = 40
 
   include RateLimitHeaders
+  include AccessTokenTrackingConcern
 
   skip_before_action :store_current_location
   skip_before_action :require_functional!, unless: :whitelist_mode?
 
   before_action :require_authenticated_user!, if: :disallow_unauthenticated_api_access?
+  before_action :require_not_suspended!
   before_action :set_cache_headers
 
   protect_from_forgery with: :null_session
 
-  skip_around_action :set_locale
+  content_security_policy do |p|
+    # Set every directive that does not have a fallback
+    p.default_src :none
+    p.frame_ancestors :none
+    p.form_action :none
+
+    # Disable every directive with a fallback to cut on response size
+    p.base_uri false
+    p.font_src false
+    p.img_src false
+    p.style_src false
+    p.media_src false
+    p.frame_src false
+    p.manifest_src false
+    p.connect_src false
+    p.script_src false
+    p.child_src false
+    p.worker_src false
+  end
 
   rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
     render json: { error: e.to_s }, status: 422
@@ -24,6 +44,10 @@ class Api::BaseController < ApplicationController
     render json: { error: 'Duplicate record' }, status: 422
   end
 
+  rescue_from Date::Error do
+    render json: { error: 'Invalid date supplied' }, status: 422
+  end
+
   rescue_from ActiveRecord::RecordNotFound do
     render json: { error: 'Record not found' }, status: 404
   end
@@ -53,7 +77,7 @@ class Api::BaseController < ApplicationController
     render json: { error: I18n.t('errors.429') }, status: 429
   end
 
-  rescue_from ActionController::ParameterMissing do |e|
+  rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e|
     render json: { error: e.to_s }, status: 400
   end
 
@@ -98,6 +122,10 @@ class Api::BaseController < ApplicationController
     render json: { error: 'This method requires an authenticated user' }, status: 401 unless current_user
   end
 
+  def require_not_suspended!
+    render json: { error: 'Your login is currently disabled' }, status: 403 if current_user&.account&.suspended?
+  end
+
   def require_user!
     if !current_user
       render json: { error: 'This method requires an authenticated user' }, status: 422
@@ -121,10 +149,16 @@ class Api::BaseController < ApplicationController
   end
 
   def set_cache_headers
-    response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+    response.headers['Cache-Control'] = 'private, no-store'
   end
 
   def disallow_unauthenticated_api_access?
-    authorized_fetch_mode?
+    ENV['DISALLOW_UNAUTHENTICATED_API_ACCESS'] == 'true' || Rails.configuration.x.whitelist_mode
+  end
+
+  private
+
+  def respond_with_error(code)
+    render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code
   end
 end
diff --git a/app/controllers/api/v1/accounts/familiar_followers_controller.rb b/app/controllers/api/v1/accounts/familiar_followers_controller.rb
new file mode 100644
index 000000000..b0bd8018a
--- /dev/null
+++ b/app/controllers/api/v1/accounts/familiar_followers_controller.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::FamiliarFollowersController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:follows' }
+  before_action :require_user!
+  before_action :set_accounts
+
+  def index
+    render json: familiar_followers.accounts, each_serializer: REST::FamiliarFollowersSerializer
+  end
+
+  private
+
+  def set_accounts
+    @accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections').index_by(&:id).values_at(*account_ids).compact
+  end
+
+  def familiar_followers
+    FamiliarFollowersPresenter.new(@accounts, current_user.account_id)
+  end
+
+  def account_ids
+    Array(params[:id]).map(&:to_i)
+  end
+end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index a665863eb..b61de13b9 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }
   before_action :set_account
   after_action :insert_pagination_headers
 
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 7d885a212..37d3c2d78 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }
   before_action :set_account
   after_action :insert_pagination_headers
 
diff --git a/app/controllers/api/v1/accounts/lookup_controller.rb b/app/controllers/api/v1/accounts/lookup_controller.rb
index aee6be18a..8597f891d 100644
--- a/app/controllers/api/v1/accounts/lookup_controller.rb
+++ b/app/controllers/api/v1/accounts/lookup_controller.rb
@@ -12,5 +12,7 @@ class Api::V1::Accounts::LookupController < Api::BaseController
 
   def set_account
     @account = ResolveAccountService.new.call(params[:acct], skip_webfinger: true) || raise(ActiveRecord::RecordNotFound)
+  rescue Addressable::URI::InvalidURIError
+    raise(ActiveRecord::RecordNotFound)
   end
 end
diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb
index 3915b5669..73f845c61 100644
--- a/app/controllers/api/v1/accounts/pins_controller.rb
+++ b/app/controllers/api/v1/accounts/pins_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Accounts::PinsController < Api::BaseController
   before_action :set_account
 
   def create
-    AccountPin.create!(account: current_account, target_account: @account)
+    AccountPin.find_or_create_by!(account: current_account, target_account: @account)
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
   end
 
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 92ccb8061..38c9f5a20 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -22,55 +22,16 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def cached_account_statuses
-    statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses
-
-    statuses.merge!(only_media_scope) if truthy_param?(:only_media)
-    statuses.merge!(no_replies_scope) if truthy_param?(:exclude_replies)
-    statuses.merge!(no_reblogs_scope) if truthy_param?(:exclude_reblogs)
-    statuses.merge!(hashtag_scope)    if params[:tagged].present?
-
     cache_collection_paginated_by_id(
-      statuses,
+      AccountStatusesFilter.new(@account, current_account, params).results,
       Status,
       limit_param(DEFAULT_STATUSES_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
   end
 
-  def permitted_account_statuses
-    @account.statuses.permitted_for(@account, current_account)
-  end
-
-  def only_media_scope
-    Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
-  end
-
-  def pinned_scope
-    return Status.none if @account.blocking?(current_account)
-
-    @account.pinned_statuses
-  end
-
-  def no_replies_scope
-    Status.without_replies
-  end
-
-  def no_reblogs_scope
-    Status.without_reblogs
-  end
-
-  def hashtag_scope
-    tag = Tag.find_normalized(params[:tagged])
-
-    if tag
-      Status.tagged_with(tag.id)
-    else
-      Status.none
-    end
-  end
-
   def pagination_params(core_params)
-    params.slice(:limit, :only_media, :exclude_replies).permit(:limit, :only_media, :exclude_replies).merge(core_params)
+    params.slice(:limit, *AccountStatusesFilter::KEYS).permit(:limit, *AccountStatusesFilter::KEYS).merge(core_params)
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index cbccd64f3..be84720aa 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -2,13 +2,15 @@
 
 class Api::V1::AccountsController < Api::BaseController
   before_action -> { authorize_if_got_token! :read, :'read:accounts' }, except: [:create, :follow, :unfollow, :remove_from_followers, :block, :unblock, :mute, :unmute]
-  before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, only: [:follow, :unfollow, :remove_from_followers]
-  before_action -> { doorkeeper_authorize! :follow, :'write:mutes' }, only: [:mute, :unmute]
-  before_action -> { doorkeeper_authorize! :follow, :'write:blocks' }, only: [:block, :unblock]
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, only: [:follow, :unfollow, :remove_from_followers]
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:mutes' }, only: [:mute, :unmute]
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:blocks' }, only: [:block, :unblock]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:create]
 
   before_action :require_user!, except: [:show, :create]
   before_action :set_account, except: [:create]
+  before_action :check_account_approval, except: [:create]
+  before_action :check_account_confirmation, except: [:create]
   before_action :check_enabled_registrations, only: [:create]
 
   skip_before_action :require_authenticated_user!, only: :create
@@ -28,12 +30,12 @@ class Api::V1::AccountsController < Api::BaseController
     self.response_body = Oj.dump(response.body)
     self.status        = response.status
   rescue ActiveRecord::RecordInvalid => e
-    render json: ValidationErrorFormatter.new(e, :'account.username' => :username, :'invite_request.text' => :reason).as_json, status: :unprocessable_entity
+    render json: ValidationErrorFormatter.new(e, 'account.username': :username, 'invite_request.text': :reason).as_json, status: :unprocessable_entity
   end
 
   def follow
-    follow  = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, with_rate_limit: true)
-    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify? } }, requested_map: { @account.id => false } }
+    follow  = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, languages: params.key?(:languages) ? params[:languages] : nil, with_rate_limit: true)
+    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify?, languages: follow.languages } }, requested_map: { @account.id => false } }
 
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(**options)
   end
@@ -74,6 +76,14 @@ class Api::V1::AccountsController < Api::BaseController
     @account = Account.find(params[:id])
   end
 
+  def check_account_approval
+    raise(ActiveRecord::RecordNotFound) if @account.local? && @account.user_pending?
+  end
+
+  def check_account_confirmation
+    raise(ActiveRecord::RecordNotFound) if @account.local? && !@account.user_confirmed?
+  end
+
   def relationships(**options)
     AccountRelationshipsPresenter.new([@account.id], current_user.account_id, **options)
   end
@@ -83,10 +93,14 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def check_enabled_registrations
-    forbidden if single_user_mode? || !allowed_registrations?
+    forbidden if single_user_mode? || omniauth_only? || !allowed_registrations?
   end
 
   def allowed_registrations?
     Setting.registrations_mode != 'none'
   end
+
+  def omniauth_only?
+    ENV['OMNIAUTH_ONLY'] == 'true'
+  end
 end
diff --git a/app/controllers/api/v1/admin/account_actions_controller.rb b/app/controllers/api/v1/admin/account_actions_controller.rb
index 29c9b7107..7249797a4 100644
--- a/app/controllers/api/v1/admin/account_actions_controller.rb
+++ b/app/controllers/api/v1/admin/account_actions_controller.rb
@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::AccountActionsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:accounts' }
-  before_action :require_staff!
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:accounts' }
   before_action :set_account
 
+  after_action :verify_authorized
+
   def create
+    authorize @account, :show?
+
     account_action                 = Admin::AccountAction.new(resource_params)
     account_action.target_account  = @account
     account_action.current_account = current_account
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb
index db5ced860..f48300072 100644
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@@ -6,16 +6,33 @@ class Api::V1::Admin::AccountsController < Api::BaseController
 
   LIMIT = 100
 
-  before_action -> { doorkeeper_authorize! :'admin:read', :'admin:read:accounts' }, only: [:index, :show]
-  before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:accounts' }, except: [:index, :show]
-  before_action :require_staff!
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:accounts' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:accounts' }, except: [:index, :show]
   before_action :set_accounts, only: :index
   before_action :set_account, except: :index
   before_action :require_local_account!, only: [:enable, :approve, :reject]
 
+  after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = (%i(limit) + AccountFilter::KEYS).freeze
+  FILTER_PARAMS = %i(
+    local
+    remote
+    by_domain
+    active
+    pending
+    disabled
+    sensitized
+    silenced
+    suspended
+    username
+    display_name
+    email
+    ip
+    staff
+  ).freeze
+
+  PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze
 
   def index
     authorize :account, :index?
@@ -36,22 +53,22 @@ class Api::V1::Admin::AccountsController < Api::BaseController
 
   def approve
     authorize @account.user, :approve?
-    log_action(:approve, @account.user)
     @account.user.approve!
+    log_action :approve, @account.user
     render json: @account, serializer: REST::Admin::AccountSerializer
   end
 
   def reject
     authorize @account.user, :reject?
-    log_action(:reject, @account.user, username: @account.username)
     DeleteAccountService.new.call(@account, reserve_email: false, reserve_username: false)
-    render json: @account, serializer: REST::Admin::AccountSerializer
+    log_action :reject, @account.user
+    render_empty
   end
 
   def destroy
     authorize @account, :destroy?
     Admin::AccountDeletionWorker.perform_async(@account.id)
-    render json: @account, serializer: REST::Admin::AccountSerializer
+    render_empty
   end
 
   def unsensitive
@@ -79,7 +96,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController
   private
 
   def set_accounts
-    @accounts = filtered_accounts.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+    @accounts = filtered_accounts.order(id: :desc).includes(user: [:invite_request, :invite, :ips]).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def set_account
@@ -87,11 +104,27 @@ class Api::V1::Admin::AccountsController < Api::BaseController
   end
 
   def filtered_accounts
-    AccountFilter.new(filter_params.with_defaults(order: 'recent')).results
+    AccountFilter.new(translated_filter_params).results
   end
 
   def filter_params
-    params.slice(*AccountFilter::KEYS).permit(*AccountFilter::KEYS)
+    params.permit(*FILTER_PARAMS)
+  end
+
+  def translated_filter_params
+    translated_params = { origin: 'local', status: 'active' }.merge(filter_params.slice(*AccountFilter::KEYS))
+
+    translated_params[:origin] = 'remote' if params[:remote].present?
+
+    %i(active pending disabled silenced suspended).each do |status|
+      translated_params[:status] = status.to_s if params[status].present?
+    end
+
+    if params[:staff].present?
+      translated_params[:role_ids] = UserRole.that_can(:manage_reports).map(&:id)
+    end
+
+    translated_params
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
new file mode 100644
index 000000000..9ef1b3be7
--- /dev/null
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
+  include Authorization
+  include AccountableConcern
+
+  LIMIT = 100
+
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:canonical_email_blocks' }, only: [:index, :show, :test]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:canonical_email_blocks' }, except: [:index, :show, :test]
+
+  before_action :set_canonical_email_blocks, only: :index
+  before_action :set_canonical_email_blocks_from_test, only: [:test]
+  before_action :set_canonical_email_block, only: [:show, :destroy]
+
+  after_action :verify_authorized
+  after_action :insert_pagination_headers, only: :index
+
+  PAGINATION_PARAMS = %i(limit).freeze
+
+  def index
+    authorize :canonical_email_block, :index?
+    render json: @canonical_email_blocks, each_serializer: REST::Admin::CanonicalEmailBlockSerializer
+  end
+
+  def show
+    authorize @canonical_email_block, :show?
+    render json: @canonical_email_block, serializer: REST::Admin::CanonicalEmailBlockSerializer
+  end
+
+  def test
+    authorize :canonical_email_block, :test?
+    render json: @canonical_email_blocks, each_serializer: REST::Admin::CanonicalEmailBlockSerializer
+  end
+
+  def create
+    authorize :canonical_email_block, :create?
+    @canonical_email_block = CanonicalEmailBlock.create!(resource_params)
+    log_action :create, @canonical_email_block
+    render json: @canonical_email_block, serializer: REST::Admin::CanonicalEmailBlockSerializer
+  end
+
+  def destroy
+    authorize @canonical_email_block, :destroy?
+    @canonical_email_block.destroy!
+    log_action :destroy, @canonical_email_block
+    render_empty
+  end
+
+  private
+
+  def resource_params
+    params.permit(:canonical_email_hash, :email)
+  end
+
+  def set_canonical_email_blocks
+    @canonical_email_blocks = CanonicalEmailBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_canonical_email_blocks_from_test
+    @canonical_email_blocks = CanonicalEmailBlock.matching_email(params[:email])
+  end
+
+  def set_canonical_email_block
+    @canonical_email_block = CanonicalEmailBlock.find(params[:id])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_admin_canonical_email_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_admin_canonical_email_blocks_url(pagination_params(min_id: pagination_since_id)) unless @canonical_email_blocks.empty?
+  end
+
+  def pagination_max_id
+    @canonical_email_blocks.last.id
+  end
+
+  def pagination_since_id
+    @canonical_email_blocks.first.id
+  end
+
+  def records_continue?
+    @canonical_email_blocks.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/admin/dimensions_controller.rb b/app/controllers/api/v1/admin/dimensions_controller.rb
index 5e8f0f89f..4a72ad08b 100644
--- a/app/controllers/api/v1/admin/dimensions_controller.rb
+++ b/app/controllers/api/v1/admin/dimensions_controller.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::DimensionsController < Api::BaseController
-  protect_from_forgery with: :exception
+  include Authorization
 
-  before_action :require_staff!
+  before_action -> { authorize_if_got_token! :'admin:read' }
   before_action :set_dimensions
 
+  after_action :verify_authorized
+
   def create
+    authorize :dashboard, :index?
     render json: @dimensions, each_serializer: REST::Admin::DimensionSerializer
   end
 
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
new file mode 100644
index 000000000..0658199f0
--- /dev/null
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::DomainAllowsController < Api::BaseController
+  include Authorization
+  include AccountableConcern
+
+  LIMIT = 100
+
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_allows' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_allows' }, except: [:index, :show]
+  before_action :set_domain_allows, only: :index
+  before_action :set_domain_allow, only: [:show, :destroy]
+
+  after_action :verify_authorized
+  after_action :insert_pagination_headers, only: :index
+
+  PAGINATION_PARAMS = %i(limit).freeze
+
+  def create
+    authorize :domain_allow, :create?
+
+    @domain_allow = DomainAllow.find_by(resource_params)
+
+    if @domain_allow.nil?
+      @domain_allow = DomainAllow.create!(resource_params)
+      log_action :create, @domain_allow
+    end
+
+    render json: @domain_allow, serializer: REST::Admin::DomainAllowSerializer
+  end
+
+  def index
+    authorize :domain_allow, :index?
+    render json: @domain_allows, each_serializer: REST::Admin::DomainAllowSerializer
+  end
+
+  def show
+    authorize @domain_allow, :show?
+    render json: @domain_allow, serializer: REST::Admin::DomainAllowSerializer
+  end
+
+  def destroy
+    authorize @domain_allow, :destroy?
+    UnallowDomainService.new.call(@domain_allow)
+    log_action :destroy, @domain_allow
+    render_empty
+  end
+
+  private
+
+  def set_domain_allows
+    @domain_allows = filtered_domain_allows.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_domain_allow
+    @domain_allow = DomainAllow.find(params[:id])
+  end
+
+  def filtered_domain_allows
+    # TODO: no filtering yet
+    DomainAllow.all
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_admin_domain_allows_url(pagination_params(min_id: pagination_since_id)) unless @domain_allows.empty?
+  end
+
+  def pagination_max_id
+    @domain_allows.last.id
+  end
+
+  def pagination_since_id
+    @domain_allows.first.id
+  end
+
+  def records_continue?
+    @domain_allows.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+
+  def resource_params
+    params.permit(:domain)
+  end
+end
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
new file mode 100644
index 000000000..8b77e9717
--- /dev/null
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::DomainBlocksController < Api::BaseController
+  include Authorization
+  include AccountableConcern
+
+  LIMIT = 100
+
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_blocks' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_blocks' }, except: [:index, :show]
+  before_action :set_domain_blocks, only: :index
+  before_action :set_domain_block, only: [:show, :update, :destroy]
+
+  after_action :verify_authorized
+  after_action :insert_pagination_headers, only: :index
+
+  PAGINATION_PARAMS = %i(limit).freeze
+
+  def create
+    authorize :domain_block, :create?
+
+    existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
+    return render json: existing_domain_block, serializer: REST::Admin::ExistingDomainBlockErrorSerializer, status: 422 if existing_domain_block.present?
+
+    @domain_block = DomainBlock.create!(resource_params)
+    DomainBlockWorker.perform_async(@domain_block.id)
+    log_action :create, @domain_block
+    render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
+  end
+
+  def index
+    authorize :domain_block, :index?
+    render json: @domain_blocks, each_serializer: REST::Admin::DomainBlockSerializer
+  end
+
+  def show
+    authorize @domain_block, :show?
+    render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
+  end
+
+  def update
+    authorize @domain_block, :update?
+    @domain_block.update!(domain_block_params)
+    DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
+    log_action :update, @domain_block
+    render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
+  end
+
+  def destroy
+    authorize @domain_block, :destroy?
+    UnblockDomainService.new.call(@domain_block)
+    log_action :destroy, @domain_block
+    render_empty
+  end
+
+  private
+
+  def set_domain_blocks
+    @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_domain_block
+    @domain_block = DomainBlock.find(params[:id])
+  end
+
+  def filtered_domain_blocks
+    # TODO: no filtering yet
+    DomainBlock.all
+  end
+
+  def domain_block_params
+    params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_admin_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_admin_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @domain_blocks.empty?
+  end
+
+  def pagination_max_id
+    @domain_blocks.last.id
+  end
+
+  def pagination_since_id
+    @domain_blocks.first.id
+  end
+
+  def records_continue?
+    @domain_blocks.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+
+  def resource_params
+    params.permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+  end
+end
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
new file mode 100644
index 000000000..e53d0b157
--- /dev/null
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
+  include Authorization
+  include AccountableConcern
+
+  LIMIT = 100
+
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:email_domain_blocks' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:email_domain_blocks' }, except: [:index, :show]
+  before_action :set_email_domain_blocks, only: :index
+  before_action :set_email_domain_block, only: [:show, :destroy]
+
+  after_action :verify_authorized
+  after_action :insert_pagination_headers, only: :index
+
+  PAGINATION_PARAMS = %i(
+    limit
+  ).freeze
+
+  def create
+    authorize :email_domain_block, :create?
+
+    @email_domain_block = EmailDomainBlock.create!(resource_params)
+    log_action :create, @email_domain_block
+
+    render json: @email_domain_block, serializer: REST::Admin::EmailDomainBlockSerializer
+  end
+
+  def index
+    authorize :email_domain_block, :index?
+    render json: @email_domain_blocks, each_serializer: REST::Admin::EmailDomainBlockSerializer
+  end
+
+  def show
+    authorize @email_domain_block, :show?
+    render json: @email_domain_block, serializer: REST::Admin::EmailDomainBlockSerializer
+  end
+
+  def destroy
+    authorize @email_domain_block, :destroy?
+    @email_domain_block.destroy!
+    log_action :destroy, @email_domain_block
+    render_empty
+  end
+
+  private
+
+  def set_email_domain_blocks
+    @email_domain_blocks = EmailDomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_email_domain_block
+    @email_domain_block = EmailDomainBlock.find(params[:id])
+  end
+
+  def resource_params
+    params.permit(:domain)
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_admin_email_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_admin_email_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @email_domain_blocks.empty?
+  end
+
+  def pagination_max_id
+    @email_domain_blocks.last.id
+  end
+
+  def pagination_since_id
+    @email_domain_blocks.first.id
+  end
+
+  def records_continue?
+    @email_domain_blocks.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/admin/ip_blocks_controller.rb b/app/controllers/api/v1/admin/ip_blocks_controller.rb
new file mode 100644
index 000000000..201ab6b1f
--- /dev/null
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::IpBlocksController < Api::BaseController
+  include Authorization
+  include AccountableConcern
+
+  LIMIT = 100
+
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:ip_blocks' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:ip_blocks' }, except: [:index, :show]
+  before_action :set_ip_blocks, only: :index
+  before_action :set_ip_block, only: [:show, :update, :destroy]
+
+  after_action :verify_authorized
+  after_action :insert_pagination_headers, only: :index
+
+  PAGINATION_PARAMS = %i(
+    limit
+  ).freeze
+
+  def create
+    authorize :ip_block, :create?
+    @ip_block = IpBlock.create!(resource_params)
+    log_action :create, @ip_block
+    render json: @ip_block, serializer: REST::Admin::IpBlockSerializer
+  end
+
+  def index
+    authorize :ip_block, :index?
+    render json: @ip_blocks, each_serializer: REST::Admin::IpBlockSerializer
+  end
+
+  def show
+    authorize @ip_block, :show?
+    render json: @ip_block, serializer: REST::Admin::IpBlockSerializer
+  end
+
+  def update
+    authorize @ip_block, :update?
+    @ip_block.update(resource_params)
+    log_action :update, @ip_block
+    render json: @ip_block, serializer: REST::Admin::IpBlockSerializer
+  end
+
+  def destroy
+    authorize @ip_block, :destroy?
+    @ip_block.destroy!
+    log_action :destroy, @ip_block
+    render_empty
+  end
+
+  private
+
+  def set_ip_blocks
+    @ip_blocks = IpBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_ip_block
+    @ip_block = IpBlock.find(params[:id])
+  end
+
+  def resource_params
+    params.permit(:ip, :severity, :comment, :expires_in)
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_admin_ip_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_admin_ip_blocks_url(pagination_params(min_id: pagination_since_id)) unless @ip_blocks.empty?
+  end
+
+  def pagination_max_id
+    @ip_blocks.last.id
+  end
+
+  def pagination_since_id
+    @ip_blocks.first.id
+  end
+
+  def records_continue?
+    @ip_blocks.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/admin/measures_controller.rb b/app/controllers/api/v1/admin/measures_controller.rb
index f28191753..d78d7e10b 100644
--- a/app/controllers/api/v1/admin/measures_controller.rb
+++ b/app/controllers/api/v1/admin/measures_controller.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::MeasuresController < Api::BaseController
-  protect_from_forgery with: :exception
+  include Authorization
 
-  before_action :require_staff!
+  before_action -> { authorize_if_got_token! :'admin:read' }
   before_action :set_measures
 
+  after_action :verify_authorized
+
   def create
+    authorize :dashboard, :index?
     render json: @measures, each_serializer: REST::Admin::MeasureSerializer
   end
 
diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index a2ee1dcfb..9dfb181a2 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -6,15 +6,21 @@ class Api::V1::Admin::ReportsController < Api::BaseController
 
   LIMIT = 100
 
-  before_action -> { doorkeeper_authorize! :'admin:read', :'admin:read:reports' }, only: [:index, :show]
-  before_action -> { doorkeeper_authorize! :'admin:write', :'admin:write:reports' }, except: [:index, :show]
-  before_action :require_staff!
+  before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:reports' }, only: [:index, :show]
+  before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:reports' }, except: [:index, :show]
   before_action :set_reports, only: :index
   before_action :set_report, except: :index
 
+  after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = (%i(limit) + ReportFilter::KEYS).freeze
+  FILTER_PARAMS = %i(
+    resolved
+    account_id
+    target_account_id
+  ).freeze
+
+  PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze
 
   def index
     authorize :report, :index?
@@ -26,6 +32,12 @@ class Api::V1::Admin::ReportsController < Api::BaseController
     render json: @report, serializer: REST::Admin::ReportSerializer
   end
 
+  def update
+    authorize @report, :update?
+    @report.update!(report_params)
+    render json: @report, serializer: REST::Admin::ReportSerializer
+  end
+
   def assign_to_self
     authorize @report, :update?
     @report.update!(assigned_account_id: current_account.id)
@@ -68,8 +80,12 @@ class Api::V1::Admin::ReportsController < Api::BaseController
     ReportFilter.new(filter_params).results
   end
 
+  def report_params
+    params.permit(:category, rule_ids: [])
+  end
+
   def filter_params
-    params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS)
+    params.permit(*FILTER_PARAMS)
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/admin/retention_controller.rb b/app/controllers/api/v1/admin/retention_controller.rb
index a8ff64f21..59d6b8388 100644
--- a/app/controllers/api/v1/admin/retention_controller.rb
+++ b/app/controllers/api/v1/admin/retention_controller.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::RetentionController < Api::BaseController
-  protect_from_forgery with: :exception
+  include Authorization
 
-  before_action :require_staff!
+  before_action -> { authorize_if_got_token! :'admin:read' }
   before_action :set_cohorts
 
+  after_action :verify_authorized
+
   def create
+    authorize :dashboard, :index?
     render json: @cohorts, each_serializer: REST::Admin::CohortSerializer
   end
 
diff --git a/app/controllers/api/v1/admin/trends/links_controller.rb b/app/controllers/api/v1/admin/trends/links_controller.rb
new file mode 100644
index 000000000..cc6388980
--- /dev/null
+++ b/app/controllers/api/v1/admin/trends/links_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::Trends::LinksController < Api::V1::Trends::LinksController
+  before_action -> { authorize_if_got_token! :'admin:read' }
+
+  private
+
+  def enabled?
+    super || current_user&.can?(:manage_taxonomies)
+  end
+
+  def links_from_trends
+    if current_user&.can?(:manage_taxonomies)
+      Trends.links.query
+    else
+      super
+    end
+  end
+end
diff --git a/app/controllers/api/v1/admin/trends/statuses_controller.rb b/app/controllers/api/v1/admin/trends/statuses_controller.rb
new file mode 100644
index 000000000..c39f77363
--- /dev/null
+++ b/app/controllers/api/v1/admin/trends/statuses_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Api::V1::Admin::Trends::StatusesController < Api::V1::Trends::StatusesController
+  before_action -> { authorize_if_got_token! :'admin:read' }
+
+  private
+
+  def enabled?
+    super || current_user&.can?(:manage_taxonomies)
+  end
+
+  def statuses_from_trends
+    if current_user&.can?(:manage_taxonomies)
+      Trends.statuses.query
+    else
+      super
+    end
+  end
+end
diff --git a/app/controllers/api/v1/admin/trends/tags_controller.rb b/app/controllers/api/v1/admin/trends/tags_controller.rb
index 3653d1dd1..f3c0c4b6b 100644
--- a/app/controllers/api/v1/admin/trends/tags_controller.rb
+++ b/app/controllers/api/v1/admin/trends/tags_controller.rb
@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
-class Api::V1::Admin::Trends::TagsController < Api::BaseController
-  before_action :require_staff!
-  before_action :set_tags
-
-  def index
-    render json: @tags, each_serializer: REST::Admin::TagSerializer
-  end
+class Api::V1::Admin::Trends::TagsController < Api::V1::Trends::TagsController
+  before_action -> { authorize_if_got_token! :'admin:read' }
 
   private
 
-  def set_tags
-    @tags = Trends.tags.get(false, limit_param(10))
+  def enabled?
+    super || current_user&.can?(:manage_taxonomies)
+  end
+
+  def tags_from_trends
+    if current_user&.can?(:manage_taxonomies)
+      Trends.tags.query
+    else
+      super
+    end
   end
 end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 586cdfca9..a65e762c9 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::BlocksController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :follow, :'read:blocks' }
+  before_action -> { doorkeeper_authorize! :follow, :read, :'read:blocks' }
   before_action :require_user!
   after_action :insert_pagination_headers
 
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index aa3fb88f0..0cc231840 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::BookmarksController < Api::BaseController
   end
 
   def results
-    @_results ||= account_bookmarks.eager_load(:status).to_a_paginated_by_id(
+    @_results ||= account_bookmarks.joins(:status).eager_load(:status).to_a_paginated_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 5bb02d834..1891261b9 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -3,8 +3,8 @@
 class Api::V1::DomainBlocksController < Api::BaseController
   BLOCK_LIMIT = 100
 
-  before_action -> { doorkeeper_authorize! :follow, :'read:blocks' }, only: :show
-  before_action -> { doorkeeper_authorize! :follow, :'write:blocks' }, except: :show
+  before_action -> { doorkeeper_authorize! :follow, :read, :'read:blocks' }, only: :show
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:blocks' }, except: :show
   before_action :require_user!
   after_action :insert_pagination_headers, only: :show
 
diff --git a/app/controllers/api/v1/emails/confirmations_controller.rb b/app/controllers/api/v1/emails/confirmations_controller.rb
index f1d9954d0..3faaea2fb 100644
--- a/app/controllers/api/v1/emails/confirmations_controller.rb
+++ b/app/controllers/api/v1/emails/confirmations_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Emails::ConfirmationsController < Api::BaseController
-  before_action :doorkeeper_authorize!
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
   before_action :require_user_owned_by_application!
   before_action :require_user_not_confirmed!
 
@@ -19,6 +19,6 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController
   end
 
   def require_user_not_confirmed!
-    render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden if current_user.confirmed? || current_user.unconfirmed_email.blank?
+    render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden unless !current_user.confirmed? || current_user.unconfirmed_email.present?
   end
 end
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 21836bc17..2a873696c 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::FavouritesController < Api::BaseController
   end
 
   def results
-    @_results ||= account_favourites.eager_load(:status).to_a_paginated_by_id(
+    @_results ||= account_favourites.joins(:status).eager_load(:status).to_a_paginated_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index 75545d3c7..76633210a 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -6,7 +6,7 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
   before_action :set_recently_used_tags, only: :index
 
   def index
-    render json: @recently_used_tags, each_serializer: REST::TagSerializer
+    render json: @recently_used_tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@recently_used_tags, current_user&.account_id)
   end
 
   private
diff --git a/app/controllers/api/v1/featured_tags_controller.rb b/app/controllers/api/v1/featured_tags_controller.rb
index e4e836c97..edb42a94e 100644
--- a/app/controllers/api/v1/featured_tags_controller.rb
+++ b/app/controllers/api/v1/featured_tags_controller.rb
@@ -13,14 +13,12 @@ class Api::V1::FeaturedTagsController < Api::BaseController
   end
 
   def create
-    @featured_tag = current_account.featured_tags.new(featured_tag_params)
-    @featured_tag.reset_data
-    @featured_tag.save!
-    render json: @featured_tag, serializer: REST::FeaturedTagSerializer
+    featured_tag = CreateFeaturedTagService.new.call(current_account, featured_tag_params[:name])
+    render json: featured_tag, serializer: REST::FeaturedTagSerializer
   end
 
   def destroy
-    @featured_tag.destroy!
+    RemoveFeaturedTagWorker.perform_async(current_account.id, @featured_tag.id)
     render_empty
   end
 
diff --git a/app/controllers/api/v1/filters_controller.rb b/app/controllers/api/v1/filters_controller.rb
index b0ace3af0..772791b25 100644
--- a/app/controllers/api/v1/filters_controller.rb
+++ b/app/controllers/api/v1/filters_controller.rb
@@ -8,21 +8,32 @@ class Api::V1::FiltersController < Api::BaseController
   before_action :set_filter, only: [:show, :update, :destroy]
 
   def index
-    render json: @filters, each_serializer: REST::FilterSerializer
+    render json: @filters, each_serializer: REST::V1::FilterSerializer
   end
 
   def create
-    @filter = current_account.custom_filters.create!(resource_params)
-    render json: @filter, serializer: REST::FilterSerializer
+    ApplicationRecord.transaction do
+      filter_category = current_account.custom_filters.create!(filter_params)
+      @filter = filter_category.keywords.create!(keyword_params)
+    end
+
+    render json: @filter, serializer: REST::V1::FilterSerializer
   end
 
   def show
-    render json: @filter, serializer: REST::FilterSerializer
+    render json: @filter, serializer: REST::V1::FilterSerializer
   end
 
   def update
-    @filter.update!(resource_params)
-    render json: @filter, serializer: REST::FilterSerializer
+    ApplicationRecord.transaction do
+      @filter.update!(keyword_params)
+      @filter.custom_filter.assign_attributes(filter_params)
+      raise Mastodon::ValidationError, I18n.t('filters.errors.deprecated_api_multiple_keywords') if @filter.custom_filter.changed? && @filter.custom_filter.keywords.count > 1
+
+      @filter.custom_filter.save!
+    end
+
+    render json: @filter, serializer: REST::V1::FilterSerializer
   end
 
   def destroy
@@ -33,14 +44,22 @@ class Api::V1::FiltersController < Api::BaseController
   private
 
   def set_filters
-    @filters = current_account.custom_filters
+    @filters = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account })
   end
 
   def set_filter
-    @filter = current_account.custom_filters.find(params[:id])
+    @filter = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
   end
 
   def resource_params
     params.permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
   end
+
+  def filter_params
+    resource_params.slice(:phrase, :expires_in, :irreversible, :context)
+  end
+
+  def keyword_params
+    resource_params.slice(:phrase, :whole_word)
+  end
 end
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index f4b2a74d0..54ff0e11d 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Api::V1::FollowRequestsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :follow, :'read:follows' }, only: :index
-  before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, except: :index
+  before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' }, only: :index
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, except: :index
   before_action :require_user!
   after_action :insert_pagination_headers, only: :index
 
@@ -13,7 +13,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
 
   def authorize
     AuthorizeFollowService.new.call(account, current_account)
-    NotifyService.new.call(current_account, :follow, Follow.find_by(account: account, target_account: current_account))
+    LocalNotificationWorker.perform_async(current_account.id, Follow.find_by(account: account, target_account: current_account).id, 'Follow', 'follow')
     render json: account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb
new file mode 100644
index 000000000..eae2bdc01
--- /dev/null
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class Api::V1::FollowedTagsController < Api::BaseController
+  TAGS_LIMIT = 100
+
+  before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' }
+  before_action :require_user!
+  before_action :set_results
+
+  after_action :insert_pagination_headers
+
+  def index
+    render json: @results.map(&:tag), each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@results.map(&:tag), current_user&.account_id)
+  end
+
+  private
+
+  def set_results
+    @results = TagFollow.where(account: current_account).joins(:tag).eager_load(:tag).to_a_paginated_by_id(
+      limit_param(TAGS_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_followed_tags_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_followed_tags_url pagination_params(since_id: pagination_since_id) unless @results.empty?
+  end
+
+  def pagination_max_id
+    @results.last.id
+  end
+
+  def pagination_since_id
+    @results.first.id
+  end
+
+  def records_continue?
+    @results.size == limit_param(TAGS_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/instances/domain_blocks_controller.rb b/app/controllers/api/v1/instances/domain_blocks_controller.rb
new file mode 100644
index 000000000..37a6906fb
--- /dev/null
+++ b/app/controllers/api/v1/instances/domain_blocks_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Api::V1::Instances::DomainBlocksController < Api::BaseController
+  skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
+
+  before_action :require_enabled_api!
+  before_action :set_domain_blocks
+
+  def index
+    expires_in 3.minutes, public: true
+    render json: @domain_blocks, each_serializer: REST::DomainBlockSerializer, with_comment: (Setting.show_domain_blocks_rationale == 'all' || (Setting.show_domain_blocks_rationale == 'users' && user_signed_in?))
+  end
+
+  private
+
+  def require_enabled_api!
+    head 404 unless Setting.show_domain_blocks == 'all' || (Setting.show_domain_blocks == 'users' && user_signed_in?)
+  end
+
+  def set_domain_blocks
+    @domain_blocks = DomainBlock.with_user_facing_limitations.by_severity
+  end
+end
diff --git a/app/controllers/api/v1/instances/extended_descriptions_controller.rb b/app/controllers/api/v1/instances/extended_descriptions_controller.rb
new file mode 100644
index 000000000..c72e16cff
--- /dev/null
+++ b/app/controllers/api/v1/instances/extended_descriptions_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Instances::ExtendedDescriptionsController < Api::BaseController
+  skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
+
+  before_action :set_extended_description
+
+  def show
+    expires_in 3.minutes, public: true
+    render json: @extended_description, serializer: REST::ExtendedDescriptionSerializer
+  end
+
+  private
+
+  def set_extended_description
+    @extended_description = ExtendedDescription.current
+  end
+end
diff --git a/app/controllers/api/v1/instances/privacy_policies_controller.rb b/app/controllers/api/v1/instances/privacy_policies_controller.rb
new file mode 100644
index 000000000..dbd69f54d
--- /dev/null
+++ b/app/controllers/api/v1/instances/privacy_policies_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Instances::PrivacyPoliciesController < Api::BaseController
+  skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
+
+  before_action :set_privacy_policy
+
+  def show
+    expires_in 1.day, public: true
+    render json: @privacy_policy, serializer: REST::PrivacyPolicySerializer
+  end
+
+  private
+
+  def set_privacy_policy
+    @privacy_policy = PrivacyPolicy.current
+  end
+end
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index 5b5058a7b..913319a86 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -6,6 +6,6 @@ class Api::V1::InstancesController < Api::BaseController
 
   def show
     expires_in 3.minutes, public: true
-    render_with_cache json: {}, serializer: REST::InstanceSerializer, root: 'instance'
+    render_with_cache json: InstancePresenter.new, serializer: REST::V1::InstanceSerializer, root: 'instance'
   end
 end
diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb
index e5ac45fef..843ca2ec2 100644
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@@ -7,6 +7,10 @@ class Api::V1::ListsController < Api::BaseController
   before_action :require_user!
   before_action :set_list, except: [:index, :create]
 
+  rescue_from ArgumentError do |e|
+    render json: { error: e.to_s }, status: 422
+  end
+
   def index
     @lists = List.where(account: current_account).all
     render json: @lists, each_serializer: REST::ListSerializer
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index a2a919a3e..f9c935bf3 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -20,7 +20,7 @@ class Api::V1::MediaController < Api::BaseController
   end
 
   def update
-    @media_attachment.update!(media_attachment_params)
+    @media_attachment.update!(updateable_media_attachment_params)
     render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
   end
 
@@ -31,7 +31,7 @@ class Api::V1::MediaController < Api::BaseController
   end
 
   def set_media_attachment
-    @media_attachment = current_account.media_attachments.unattached.find(params[:id])
+    @media_attachment = current_account.media_attachments.where(status_id: nil).find(params[:id])
   end
 
   def check_processing
@@ -42,6 +42,10 @@ class Api::V1::MediaController < Api::BaseController
     params.permit(:file, :thumbnail, :description, :focus)
   end
 
+  def updateable_media_attachment_params
+    params.permit(:thumbnail, :description, :focus)
+  end
+
   def file_type_error
     { error: 'File type of uploaded media could not be verified' }
   end
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index fd52511d7..6cde53a2a 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::MutesController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :follow, :'read:mutes' }
+  before_action -> { doorkeeper_authorize! :follow, :read, :'read:mutes' }
   before_action :require_user!
   after_action :insert_pagination_headers
 
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index f9d780839..7b1cfe264 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -31,17 +31,22 @@ class Api::V1::NotificationsController < Api::BaseController
   private
 
   def load_notifications
-    notifications = browserable_account_notifications.includes(from_account: :account_stat).to_a_paginated_by_id(
+    notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_paginated_by_id(
       limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )
+
     Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
       cache_collection(target_statuses, Status)
     end
   end
 
   def browserable_account_notifications
-    current_account.notifications.without_suspended.browserable(exclude_types, from_account)
+    current_account.notifications.without_suspended.browserable(
+      types: Array(browserable_params[:types]),
+      exclude_types: Array(browserable_params[:exclude_types]),
+      from_account_id: browserable_params[:account_id]
+    )
   end
 
   def target_statuses_from_notifications
@@ -72,17 +77,11 @@ class Api::V1::NotificationsController < Api::BaseController
     @notifications.first.id
   end
 
-  def exclude_types
-    val = params.permit(exclude_types: [])[:exclude_types] || []
-    val = [val] unless val.is_a?(Enumerable)
-    val
-  end
-
-  def from_account
-    params[:account_id]
+  def browserable_params
+    params.permit(:account_id, types: [], exclude_types: [])
   end
 
   def pagination_params(core_params)
-    params.slice(:limit, :exclude_types).permit(:limit, exclude_types: []).merge(core_params)
+    params.slice(:limit, :account_id, :types, :exclude_types).permit(:limit, :account_id, types: [], exclude_types: []).merge(core_params)
   end
 end
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index 47f2e6440..7148d63a4 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -52,6 +52,6 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   def data_params
     return {} if params[:data].blank?
 
-    params.require(:data).permit(:policy, alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status])
+    params.require(:data).permit(:policy, alerts: Notification::TYPES)
   end
 end
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index e10083d45..8ff6c8fe5 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -10,9 +10,7 @@ class Api::V1::ReportsController < Api::BaseController
     @report = ReportService.new.call(
       current_account,
       reported_account,
-      status_ids: reported_status_ids,
-      comment: report_params[:comment],
-      forward: report_params[:forward]
+      report_params
     )
 
     render json: @report, serializer: REST::ReportSerializer
@@ -20,19 +18,11 @@ class Api::V1::ReportsController < Api::BaseController
 
   private
 
-  def reported_status_ids
-    reported_account.statuses.with_discarded.find(status_ids).pluck(:id)
-  end
-
-  def status_ids
-    Array(report_params[:status_ids])
-  end
-
   def reported_account
     Account.find(report_params[:account_id])
   end
 
   def report_params
-    params.permit(:account_id, :comment, :forward, status_ids: [])
+    params.permit(:account_id, :comment, :category, :forward, status_ids: [], rule_ids: [])
   end
 end
diff --git a/app/controllers/api/v1/statuses/histories_controller.rb b/app/controllers/api/v1/statuses/histories_controller.rb
new file mode 100644
index 000000000..7fe73a6f5
--- /dev/null
+++ b/app/controllers/api/v1/statuses/histories_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::HistoriesController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
+  before_action :set_status
+
+  def show
+    render json: @status.edits.includes(:account, status: [:account]), each_serializer: REST::StatusEditSerializer
+  end
+
+  private
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+end
diff --git a/app/controllers/api/v1/statuses/sources_controller.rb b/app/controllers/api/v1/statuses/sources_controller.rb
new file mode 100644
index 000000000..434086451
--- /dev/null
+++ b/app/controllers/api/v1/statuses/sources_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::SourcesController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }
+  before_action :set_status
+
+  def show
+    render json: @status, serializer: REST::StatusSourceSerializer
+  end
+
+  private
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+end
diff --git a/app/controllers/api/v1/statuses/translations_controller.rb b/app/controllers/api/v1/statuses/translations_controller.rb
new file mode 100644
index 000000000..540b17d00
--- /dev/null
+++ b/app/controllers/api/v1/statuses/translations_controller.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::TranslationsController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }
+  before_action :set_status
+  before_action :set_translation
+
+  rescue_from TranslationService::NotConfiguredError, with: :not_found
+  rescue_from TranslationService::UnexpectedResponseError, TranslationService::QuotaExceededError, TranslationService::TooManyRequestsError, with: :service_unavailable
+
+  def create
+    render json: @translation, serializer: REST::TranslationSerializer
+  end
+
+  private
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def set_translation
+    @translation = TranslateStatusService.new.call(@status, content_locale)
+  end
+end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 106fc8224..6290a1746 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -3,13 +3,14 @@
 class Api::V1::StatusesController < Api::BaseController
   include Authorization
 
-  before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :destroy]
-  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :destroy]
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :update, :destroy]
+  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :update, :destroy]
   before_action :require_user!, except:  [:show, :context]
   before_action :set_status, only:       [:show, :context]
   before_action :set_thread, only:       [:create]
 
   override_rate_limit_headers :create, family: :statuses
+  override_rate_limit_headers :update, family: :statuses
 
   # This API was originally unlimited, pagination cannot be introduced without
   # breaking backwards-compatibility. Arbitrarily high number to cover most
@@ -17,14 +18,29 @@ class Api::V1::StatusesController < Api::BaseController
   # than this anyway
   CONTEXT_LIMIT = 4_096
 
+  # This remains expensive and we don't want to show everything to logged-out users
+  ANCESTORS_LIMIT         = 40
+  DESCENDANTS_LIMIT       = 60
+  DESCENDANTS_DEPTH_LIMIT = 20
+
   def show
     @status = cache_collection([@status], Status).first
     render json: @status, serializer: REST::StatusSerializer
   end
 
   def context
-    ancestors_results   = @status.in_reply_to_id.nil? ? [] : @status.ancestors(CONTEXT_LIMIT, current_account)
-    descendants_results = @status.descendants(CONTEXT_LIMIT, current_account)
+    ancestors_limit         = CONTEXT_LIMIT
+    descendants_limit       = CONTEXT_LIMIT
+    descendants_depth_limit = nil
+
+    if current_account.nil?
+      ancestors_limit         = ANCESTORS_LIMIT
+      descendants_limit       = DESCENDANTS_LIMIT
+      descendants_depth_limit = DESCENDANTS_DEPTH_LIMIT
+    end
+
+    ancestors_results   = @status.in_reply_to_id.nil? ? [] : @status.ancestors(ancestors_limit, current_account)
+    descendants_results = @status.descendants(descendants_limit, current_account, descendants_depth_limit)
     loaded_ancestors    = cache_collection(ancestors_results, Status)
     loaded_descendants  = cache_collection(descendants_results, Status)
 
@@ -35,31 +51,55 @@ class Api::V1::StatusesController < Api::BaseController
   end
 
   def create
-    @status = PostStatusService.new.call(current_user.account,
-                                         text: status_params[:status],
-                                         thread: @thread,
-                                         media_ids: status_params[:media_ids],
-                                         sensitive: status_params[:sensitive],
-                                         spoiler_text: status_params[:spoiler_text],
-                                         visibility: status_params[:visibility],
-                                         scheduled_at: status_params[:scheduled_at],
-                                         application: doorkeeper_token.application,
-                                         poll: status_params[:poll],
-                                         idempotency: request.headers['Idempotency-Key'],
-                                         with_rate_limit: true)
+    @status = PostStatusService.new.call(
+      current_user.account,
+      text: status_params[:status],
+      thread: @thread,
+      media_ids: status_params[:media_ids],
+      sensitive: status_params[:sensitive],
+      spoiler_text: status_params[:spoiler_text],
+      visibility: status_params[:visibility],
+      language: status_params[:language],
+      scheduled_at: status_params[:scheduled_at],
+      application: doorkeeper_token.application,
+      poll: status_params[:poll],
+      idempotency: request.headers['Idempotency-Key'],
+      with_rate_limit: true
+    )
 
     render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
 
+  def update
+    @status = Status.where(account: current_account).find(params[:id])
+    authorize @status, :update?
+
+    UpdateStatusService.new.call(
+      @status,
+      current_account.id,
+      text: status_params[:status],
+      media_ids: status_params[:media_ids],
+      sensitive: status_params[:sensitive],
+      language: status_params[:language],
+      spoiler_text: status_params[:spoiler_text],
+      poll: status_params[:poll]
+    )
+
+    render json: @status, serializer: REST::StatusSerializer
+  end
+
   def destroy
-    @status = Status.where(account_id: current_user.account).find(params[:id])
+    @status = Status.where(account: current_account).find(params[:id])
     authorize @status, :destroy?
 
-    @status.discard
-    RemovalWorker.perform_async(@status.id, redraft: true)
+    @status.discard_with_reblogs
+    StatusPin.find_by(status: @status)&.destroy
     @status.account.statuses_count = @status.account.statuses_count - 1
+    json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true
 
-    render json: @status, serializer: REST::StatusSerializer, source_requested: true
+    RemovalWorker.perform_async(@status.id, { 'redraft' => true })
+
+    render json: json
   end
 
   private
@@ -72,8 +112,9 @@ class Api::V1::StatusesController < Api::BaseController
   end
 
   def set_thread
-    @thread = status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id])
-  rescue ActiveRecord::RecordNotFound
+    @thread = Status.find(status_params[:in_reply_to_id]) if status_params[:in_reply_to_id].present?
+    authorize(@thread, :show?) if @thread.present?
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
   end
 
@@ -84,6 +125,7 @@ class Api::V1::StatusesController < Api::BaseController
       :sensitive,
       :spoiler_text,
       :visibility,
+      :language,
       :scheduled_at,
       media_ids: [],
       poll: [
diff --git a/app/controllers/api/v1/tags_controller.rb b/app/controllers/api/v1/tags_controller.rb
new file mode 100644
index 000000000..272362c31
--- /dev/null
+++ b/app/controllers/api/v1/tags_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Api::V1::TagsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, except: :show
+  before_action :require_user!, except: :show
+  before_action :set_or_create_tag
+
+  override_rate_limit_headers :follow, family: :follows
+
+  def show
+    render json: @tag, serializer: REST::TagSerializer
+  end
+
+  def follow
+    TagFollow.create_with(rate_limit: true).find_or_create_by!(tag: @tag, account: current_account)
+    render json: @tag, serializer: REST::TagSerializer
+  end
+
+  def unfollow
+    TagFollow.find_by(account: current_account, tag: @tag)&.destroy!
+    render json: @tag, serializer: REST::TagSerializer
+  end
+
+  private
+
+  def set_or_create_tag
+    return not_found unless Tag::HASHTAG_NAME_RE.match?(params[:id])
+    @tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
+  end
+end
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb
index 1c3ab1e1c..8ff3b364e 100644
--- a/app/controllers/api/v1/trends/links_controller.rb
+++ b/app/controllers/api/v1/trends/links_controller.rb
@@ -3,19 +3,57 @@
 class Api::V1::Trends::LinksController < Api::BaseController
   before_action :set_links
 
+  after_action :insert_pagination_headers
+
+  DEFAULT_LINKS_LIMIT = 10
+
   def index
     render json: @links, each_serializer: REST::Trends::LinkSerializer
   end
 
   private
 
+  def enabled?
+    Setting.trends
+  end
+
   def set_links
     @links = begin
-      if Setting.trends
-        Trends.links.get(true, limit_param(10))
+      if enabled?
+        links_from_trends.offset(offset_param).limit(limit_param(DEFAULT_LINKS_LIMIT))
       else
         []
       end
     end
   end
+
+  def links_from_trends
+    scope = Trends.links.query.allowed.in_locale(content_locale)
+    scope = scope.filtered_for(current_account) if user_signed_in?
+    scope
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def next_path
+    api_v1_trends_links_url pagination_params(offset: offset_param + limit_param(DEFAULT_LINKS_LIMIT)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_trends_links_url pagination_params(offset: offset_param - limit_param(DEFAULT_LINKS_LIMIT)) if offset_param > limit_param(DEFAULT_LINKS_LIMIT)
+  end
+
+  def records_continue?
+    @links.size == limit_param(DEFAULT_LINKS_LIMIT)
+  end
+
+  def offset_param
+    params[:offset].to_i
+  end
 end
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb
new file mode 100644
index 000000000..c275d5fc8
--- /dev/null
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class Api::V1::Trends::StatusesController < Api::BaseController
+  before_action :set_statuses
+
+  after_action :insert_pagination_headers
+
+  def index
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
+  private
+
+  def enabled?
+    Setting.trends
+  end
+
+  def set_statuses
+    @statuses = begin
+      if enabled?
+        cache_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status)
+      else
+        []
+      end
+    end
+  end
+
+  def statuses_from_trends
+    scope = Trends.statuses.query.allowed.in_locale(content_locale)
+    scope = scope.filtered_for(current_account) if user_signed_in?
+    scope
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def next_path
+    api_v1_trends_statuses_url pagination_params(offset: offset_param + limit_param(DEFAULT_STATUSES_LIMIT)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_trends_statuses_url pagination_params(offset: offset_param - limit_param(DEFAULT_STATUSES_LIMIT)) if offset_param > limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def offset_param
+    params[:offset].to_i
+  end
+
+  def records_continue?
+    @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+end
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb
index 947b53de2..21adfa2a1 100644
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@@ -3,19 +3,55 @@
 class Api::V1::Trends::TagsController < Api::BaseController
   before_action :set_tags
 
+  after_action :insert_pagination_headers
+
+  DEFAULT_TAGS_LIMIT = 10
+
   def index
-    render json: @tags, each_serializer: REST::TagSerializer
+    render json: @tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@tags, current_user&.account_id)
   end
 
   private
 
+  def enabled?
+    Setting.trends
+  end
+
   def set_tags
     @tags = begin
-      if Setting.trends
-        Trends.tags.get(true, limit_param(10))
+      if enabled?
+        tags_from_trends.offset(offset_param).limit(limit_param(DEFAULT_TAGS_LIMIT))
       else
         []
       end
     end
   end
+
+  def tags_from_trends
+    Trends.tags.query.allowed
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def next_path
+    api_v1_trends_tags_url pagination_params(offset: offset_param + limit_param(DEFAULT_TAGS_LIMIT)) if records_continue?
+  end
+
+  def prev_path
+    api_v1_trends_tags_url pagination_params(offset: offset_param - limit_param(DEFAULT_TAGS_LIMIT)) if offset_param > limit_param(DEFAULT_TAGS_LIMIT)
+  end
+
+  def offset_param
+    params[:offset].to_i
+  end
+
+  def records_continue?
+    @tags.size == limit_param(DEFAULT_TAGS_LIMIT)
+  end
 end
diff --git a/app/controllers/api/v2/admin/accounts_controller.rb b/app/controllers/api/v2/admin/accounts_controller.rb
new file mode 100644
index 000000000..b25831aa0
--- /dev/null
+++ b/app/controllers/api/v2/admin/accounts_controller.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class Api::V2::Admin::AccountsController < Api::V1::Admin::AccountsController
+  FILTER_PARAMS = %i(
+    origin
+    status
+    permissions
+    username
+    by_domain
+    display_name
+    email
+    ip
+    invited_by
+    role_ids
+  ).freeze
+
+  PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze
+
+  private
+
+  def filtered_accounts
+    AccountFilter.new(translated_filter_params).results
+  end
+
+  def translated_filter_params
+    translated_params = filter_params.slice(*AccountFilter::KEYS)
+
+    if params[:permissions] == 'staff'
+      translated_params[:role_ids] = UserRole.that_can(:manage_reports).map(&:id)
+    end
+
+    translated_params
+  end
+
+  def filter_params
+    params.permit(*FILTER_PARAMS, role_ids: [])
+  end
+
+  def pagination_params(core_params)
+    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v2/filters/keywords_controller.rb b/app/controllers/api/v2/filters/keywords_controller.rb
new file mode 100644
index 000000000..c63e1d986
--- /dev/null
+++ b/app/controllers/api/v2/filters/keywords_controller.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class Api::V2::Filters::KeywordsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
+  before_action :require_user!
+
+  before_action :set_keywords, only: :index
+  before_action :set_keyword, only: [:show, :update, :destroy]
+
+  def index
+    render json: @keywords, each_serializer: REST::FilterKeywordSerializer
+  end
+
+  def create
+    @keyword = current_account.custom_filters.find(params[:filter_id]).keywords.create!(resource_params)
+
+    render json: @keyword, serializer: REST::FilterKeywordSerializer
+  end
+
+  def show
+    render json: @keyword, serializer: REST::FilterKeywordSerializer
+  end
+
+  def update
+    @keyword.update!(resource_params)
+
+    render json: @keyword, serializer: REST::FilterKeywordSerializer
+  end
+
+  def destroy
+    @keyword.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_keywords
+    filter = current_account.custom_filters.includes(:keywords).find(params[:filter_id])
+    @keywords = filter.keywords
+  end
+
+  def set_keyword
+    @keyword = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
+  end
+
+  def resource_params
+    params.permit(:keyword, :whole_word)
+  end
+end
diff --git a/app/controllers/api/v2/filters/statuses_controller.rb b/app/controllers/api/v2/filters/statuses_controller.rb
new file mode 100644
index 000000000..755c14cff
--- /dev/null
+++ b/app/controllers/api/v2/filters/statuses_controller.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class Api::V2::Filters::StatusesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
+  before_action :require_user!
+
+  before_action :set_status_filters, only: :index
+  before_action :set_status_filter, only: [:show, :destroy]
+
+  def index
+    render json: @status_filters, each_serializer: REST::FilterStatusSerializer
+  end
+
+  def create
+    @status_filter = current_account.custom_filters.find(params[:filter_id]).statuses.create!(resource_params)
+
+    render json: @status_filter, serializer: REST::FilterStatusSerializer
+  end
+
+  def show
+    render json: @status_filter, serializer: REST::FilterStatusSerializer
+  end
+
+  def destroy
+    @status_filter.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_status_filters
+    filter = current_account.custom_filters.includes(:statuses).find(params[:filter_id])
+    @status_filters = filter.statuses
+  end
+
+  def set_status_filter
+    @status_filter = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
+  end
+
+  def resource_params
+    params.permit(:status_id)
+  end
+end
diff --git a/app/controllers/api/v2/filters_controller.rb b/app/controllers/api/v2/filters_controller.rb
new file mode 100644
index 000000000..8ff3076cf
--- /dev/null
+++ b/app/controllers/api/v2/filters_controller.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class Api::V2::FiltersController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
+  before_action :require_user!
+  before_action :set_filters, only: :index
+  before_action :set_filter, only: [:show, :update, :destroy]
+
+  def index
+    render json: @filters, each_serializer: REST::FilterSerializer, rules_requested: true
+  end
+
+  def create
+    @filter = current_account.custom_filters.create!(resource_params)
+
+    render json: @filter, serializer: REST::FilterSerializer, rules_requested: true
+  end
+
+  def show
+    render json: @filter, serializer: REST::FilterSerializer, rules_requested: true
+  end
+
+  def update
+    @filter.update!(resource_params)
+
+    render json: @filter, serializer: REST::FilterSerializer, rules_requested: true
+  end
+
+  def destroy
+    @filter.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_filters
+    @filters = current_account.custom_filters.includes(:keywords)
+  end
+
+  def set_filter
+    @filter = current_account.custom_filters.find(params[:id])
+  end
+
+  def resource_params
+    params.permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
+  end
+end
diff --git a/app/controllers/api/v2/instances_controller.rb b/app/controllers/api/v2/instances_controller.rb
new file mode 100644
index 000000000..bcd90cff2
--- /dev/null
+++ b/app/controllers/api/v2/instances_controller.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Api::V2::InstancesController < Api::V1::InstancesController
+  def show
+    expires_in 3.minutes, public: true
+    render_with_cache json: InstancePresenter.new, serializer: REST::InstanceSerializer, root: 'instance'
+  end
+end
diff --git a/app/controllers/api/v2/media_controller.rb b/app/controllers/api/v2/media_controller.rb
index 0c1baf01d..288f847f1 100644
--- a/app/controllers/api/v2/media_controller.rb
+++ b/app/controllers/api/v2/media_controller.rb
@@ -3,7 +3,7 @@
 class Api::V2::MediaController < Api::V1::MediaController
   def create
     @media_attachment = current_account.media_attachments.create!({ delay_processing: true }.merge(media_attachment_params))
-    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: 202
+    render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: @media_attachment.not_processed? ? 202 : 200
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     render json: file_type_error, status: 422
   rescue Paperclip::Error
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index f17431dd1..4d20aeb10 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -5,16 +5,30 @@ class Api::V2::SearchController < Api::BaseController
 
   RESULTS_LIMIT = 20
 
-  before_action -> { doorkeeper_authorize! :read, :'read:search' }
-  before_action :require_user!
+  before_action -> { authorize_if_got_token! :read, :'read:search' }
+  before_action :validate_search_params!
 
   def index
     @search = Search.new(search_results)
     render json: @search, serializer: REST::SearchSerializer
+  rescue Mastodon::SyntaxError
+    unprocessable_entity
+  rescue ActiveRecord::RecordNotFound
+    not_found
   end
 
   private
 
+  def validate_search_params!
+    params.require(:q)
+
+    return if user_signed_in?
+
+    return render json: { error: 'Search queries pagination is not supported without authentication' }, status: 401 if params[:offset].present?
+
+    render json: { error: 'Search queries that resolve remote resources are not supported without authentication' }, status: 401 if truthy_param?(:resolve)
+  end
+
   def search_results
     SearchService.new.call(
       params[:q],
diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb
index 741ba910f..58f6345e6 100644
--- a/app/controllers/api/web/embeds_controller.rb
+++ b/app/controllers/api/web/embeds_controller.rb
@@ -15,7 +15,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController
     return not_found if oembed.nil?
 
     begin
-      oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED)
+      oembed[:html] = Sanitize.fragment(oembed[:html], Sanitize::Config::MASTODON_OEMBED)
     rescue ArgumentError
       return not_found
     end
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index bed57fc54..5167928e9 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -17,16 +17,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
 
     data = {
       policy: 'all',
-
-      alerts: {
-        follow: alerts_enabled,
-        follow_request: alerts_enabled,
-        favourite: alerts_enabled,
-        reblog: alerts_enabled,
-        mention: alerts_enabled,
-        poll: alerts_enabled,
-        status: alerts_enabled,
-      },
+      alerts: Notification::TYPES.index_with { alerts_enabled },
     }
 
     data.deep_merge!(data_params) if params[:data]
@@ -61,6 +52,6 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
   end
 
   def data_params
-    @data_params ||= params.require(:data).permit(:policy, alerts: [:follow, :follow_request, :favourite, :reblog, :mention, :poll, :status])
+    @data_params ||= params.require(:data).permit(:policy, alerts: Notification::TYPES)
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3d2f8280b..615536b96 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -56,14 +56,6 @@ class ApplicationController < ActionController::Base
     store_location_for(:user, request.url) unless [:json, :rss].include?(request.format&.to_sym)
   end
 
-  def require_admin!
-    forbidden unless current_user&.admin?
-  end
-
-  def require_staff!
-    forbidden unless current_user&.staff?
-  end
-
   def require_functional!
     redirect_to edit_user_registration_path unless current_user.functional?
   end
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 1475bbcef..010fd3755 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -40,7 +40,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
 
   def after_confirmation_path_for(_resource_name, user)
     if user.created_by_application && truthy_param?(:redirect_to_app)
-      user.created_by_application.redirect_uri
+      user.created_by_application.confirmation_redirect_uri
     else
       super
     end
diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index 991a50b03..3d7962de5 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -4,8 +4,6 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   skip_before_action :verify_authenticity_token
 
   def self.provides_callback_for(provider)
-    provider_id = provider.to_s.chomp '_oauth2'
-
     define_method provider do
       @user = User.find_for_oauth(request.env['omniauth.auth'], current_user)
 
@@ -20,7 +18,8 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
         )
 
         sign_in_and_redirect @user, event: :authentication
-        set_flash_message(:notice, :success, kind: provider_id.capitalize) if is_navigational_format?
+        label = Devise.omniauth_configs[provider]&.strategy&.display_name.presence || I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize)
+        set_flash_message(:notice, :success, kind: label) if is_navigational_format?
       else
         session["devise.#{provider}_data"] = request.env['omniauth.auth']
         redirect_to new_user_registration_url
@@ -33,7 +32,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def after_sign_in_path_for(resource)
-    if resource.email_verified?
+    if resource.email_present?
       root_path
     else
       auth_setup_path(missing_email: '1')
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index 2996c0431..a8ad66929 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -10,6 +10,8 @@ class Auth::PasswordsController < Devise::PasswordsController
     super do |resource|
       if resource.errors.empty?
         resource.session_activations.destroy_all
+
+        resource.revoke_access!
       end
     end
   end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 3c1730f25..71c0cd827 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -9,10 +9,13 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :check_enabled_registrations, only: [:new, :create]
   before_action :configure_sign_up_params, only: [:create]
   before_action :set_sessions, only: [:edit, :update]
+  before_action :set_strikes, only: [:edit, :update]
   before_action :set_instance_presenter, only: [:new, :create, :update]
   before_action :set_body_classes, only: [:new, :create, :edit, :update]
   before_action :require_not_suspended!, only: [:update]
   before_action :set_cache_headers, only: [:edit, :update]
+  before_action :set_rules, only: :new
+  before_action :require_rules_acceptance!, only: :new
   before_action :set_registration_form_time, only: :new
 
   skip_before_action :require_functional!, only: [:edit, :update]
@@ -53,8 +56,8 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def configure_sign_up_params
-    devise_parameter_sanitizer.permit(:sign_up) do |u|
-      u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
+    devise_parameter_sanitizer.permit(:sign_up) do |user_params|
+      user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
     end
   end
 
@@ -81,13 +84,21 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def check_enabled_registrations
-    redirect_to root_path if single_user_mode? || !allowed_registrations?
+    redirect_to root_path if single_user_mode? || omniauth_only? || !allowed_registrations? || ip_blocked?
   end
 
   def allowed_registrations?
     Setting.registrations_mode != 'none' || @invite&.valid_for_use?
   end
 
+  def omniauth_only?
+    ENV['OMNIAUTH_ONLY'] == 'true'
+  end
+
+  def ip_blocked?
+    IpBlock.where(severity: :sign_up_block).where('ip >>= ?', request.remote_ip.to_s).exists?
+  end
+
   def invite_code
     if params[:user]
       params[:user][:invite_code]
@@ -107,8 +118,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def set_invite
-    invite = invite_code.present? ? Invite.find_by(code: invite_code) : nil
-    @invite = invite&.valid_for_use? ? invite : nil
+    @invite = begin
+      invite = Invite.find_by(code: invite_code) if invite_code.present?
+      invite if invite&.valid_for_use?
+    end
   end
 
   def determine_layout
@@ -119,11 +132,28 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     @sessions = current_user.session_activations
   end
 
+  def set_strikes
+    @strikes = current_account.strikes.recent.latest
+  end
+
   def require_not_suspended!
     forbidden if current_account.suspended?
   end
 
+  def set_rules
+    @rules = Rule.ordered
+  end
+
+  def require_rules_acceptance!
+    return if @rules.empty? || (session[:accept_token].present? && params[:accept] == session[:accept_token])
+
+    @accept_token = session[:accept_token] = SecureRandom.hex
+    @invite_code  = invite_code
+
+    set_locale { render :rules }
+  end
+
   def set_cache_headers
-    response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+    response.headers['Cache-Control'] = 'private, no-store'
   end
 end
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 0184bfb52..afcf8b24b 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -7,18 +7,20 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
+  prepend_before_action :check_suspicious!, only: [:create]
+
   include TwoFactorAuthenticationConcern
-  include SignInTokenAuthenticationConcern
 
   before_action :set_instance_presenter, only: [:new]
   before_action :set_body_classes
 
-  def new
-    Devise.omniauth_configs.each do |provider, config|
-      return redirect_to(omniauth_authorize_path(resource_name, provider)) if config.strategy.redirect_at_sign_in
-    end
+  content_security_policy only: :new do |p|
+    p.form_action(false)
+  end
 
-    super
+  def check_suspicious!
+    user = find_user
+    @login_is_suspicious = suspicious_sign_in?(user) unless user.nil?
   end
 
   def create
@@ -74,7 +76,7 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def user_params
-    params.require(:user).permit(:email, :password, :otp_attempt, :sign_in_token_attempt, credential: {})
+    params.require(:user).permit(:email, :password, :otp_attempt, credential: {})
   end
 
   def after_sign_in_path_for(resource)
@@ -87,14 +89,6 @@ class Auth::SessionsController < Devise::SessionsController
     end
   end
 
-  def after_sign_out_path_for(_resource_or_scope)
-    Devise.omniauth_configs.each_value do |config|
-      return root_path if config.strategy.redirect_at_sign_in
-    end
-
-    super
-  end
-
   def require_no_authentication
     super
 
@@ -147,7 +141,7 @@ class Auth::SessionsController < Devise::SessionsController
 
     clear_attempt_from_session
 
-    user.update_sign_in!(request, new_sign_in: true)
+    user.update_sign_in!(new_sign_in: true)
     sign_in(user)
     flash.delete(:notice)
 
@@ -158,6 +152,12 @@ class Auth::SessionsController < Devise::SessionsController
       ip: request.remote_ip,
       user_agent: request.user_agent
     )
+
+    UserMailer.suspicious_sign_in(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later! if @login_is_suspicious
+  end
+
+  def suspicious_sign_in?(user)
+    SuspiciousSignInDetector.new(user).suspicious?(request)
   end
 
   def on_authentication_failure(user, security_measure, failure_reason)
diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb
index 29c0288d0..02a6b6d06 100644
--- a/app/controllers/authorize_interactions_controller.rb
+++ b/app/controllers/authorize_interactions_controller.rb
@@ -13,7 +13,7 @@ class AuthorizeInteractionsController < ApplicationController
     if @resource.is_a?(Account)
       render :show
     elsif @resource.is_a?(Status)
-      redirect_to web_url("statuses/#{@resource.id}")
+      redirect_to web_url("@#{@resource.account.pretty_acct}/#{@resource.id}")
     else
       render :error
     end
@@ -25,15 +25,17 @@ class AuthorizeInteractionsController < ApplicationController
     else
       render :error
     end
-  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound
     render :error
   end
 
   private
 
   def set_resource
-    @resource = located_resource || render(:error)
+    @resource = located_resource
     authorize(@resource, :show?) if @resource.is_a?(Status)
+  rescue Mastodon::NotPermittedError
+    not_found
   end
 
   def located_resource
diff --git a/app/controllers/concerns/access_token_tracking_concern.rb b/app/controllers/concerns/access_token_tracking_concern.rb
new file mode 100644
index 000000000..cf60cfb99
--- /dev/null
+++ b/app/controllers/concerns/access_token_tracking_concern.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module AccessTokenTrackingConcern
+  extend ActiveSupport::Concern
+
+  ACCESS_TOKEN_UPDATE_FREQUENCY = 24.hours.freeze
+
+  included do
+    before_action :update_access_token_last_used
+  end
+
+  private
+
+  def update_access_token_last_used
+    doorkeeper_token.update_last_used(request) if access_token_needs_update?
+  end
+
+  def access_token_needs_update?
+    doorkeeper_token.present? && (doorkeeper_token.last_used_at.nil? || doorkeeper_token.last_used_at < ACCESS_TOKEN_UPDATE_FREQUENCY.ago)
+  end
+end
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb
index 11eac0eb6..2f7d84df0 100644
--- a/app/controllers/concerns/account_controller_concern.rb
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -3,13 +3,12 @@
 module AccountControllerConcern
   extend ActiveSupport::Concern
 
+  include WebAppControllerConcern
   include AccountOwnedConcern
 
   FOLLOW_PER_PAGE = 12
 
   included do
-    layout 'public'
-
     before_action :set_instance_presenter
     before_action :set_link_headers, if: -> { request.format.nil? || request.format == :html }
   end
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb
index 62e379846..25149d03f 100644
--- a/app/controllers/concerns/account_owned_concern.rb
+++ b/app/controllers/concerns/account_owned_concern.rb
@@ -8,6 +8,7 @@ module AccountOwnedConcern
     before_action :set_account, if: :account_required?
     before_action :check_account_approval, if: :account_required?
     before_action :check_account_suspension, if: :account_required?
+    before_action :check_account_confirmation, if: :account_required?
   end
 
   private
@@ -28,6 +29,10 @@ module AccountOwnedConcern
     not_found if @account.local? && @account.user_pending?
   end
 
+  def check_account_confirmation
+    not_found if @account.local? && !@account.user_confirmed?
+  end
+
   def check_account_suspension
     if @account.suspended_permanently?
       permanent_suspension_response
diff --git a/app/controllers/concerns/accountable_concern.rb b/app/controllers/concerns/accountable_concern.rb
index 87d62478d..c1349915f 100644
--- a/app/controllers/concerns/accountable_concern.rb
+++ b/app/controllers/concerns/accountable_concern.rb
@@ -3,7 +3,11 @@
 module AccountableConcern
   extend ActiveSupport::Concern
 
-  def log_action(action, target, options = {})
-    Admin::ActionLog.create(account: current_account, action: action, target: target, recorded_changes: options.stringify_keys)
+  def log_action(action, target)
+    Admin::ActionLog.create(
+      account: current_account,
+      action: action,
+      target: target
+    )
   end
 end
diff --git a/app/controllers/concerns/admin_export_controller_concern.rb b/app/controllers/concerns/admin_export_controller_concern.rb
new file mode 100644
index 000000000..b40c76557
--- /dev/null
+++ b/app/controllers/concerns/admin_export_controller_concern.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module AdminExportControllerConcern
+  extend ActiveSupport::Concern
+
+  private
+
+  def send_export_file
+    respond_to do |format|
+      format.csv { send_data export_data, filename: export_filename }
+    end
+  end
+
+  def export_data
+    raise 'Override in controller'
+  end
+
+  def export_filename
+    raise 'Override in controller'
+  end
+
+  def set_dummy_import!
+    @import = Admin::Import.new
+  end
+
+  def import_params
+    params.require(:admin_import).permit(:data)
+  end
+
+  def import_data_path
+    params[:admin_import][:data].path
+  end
+
+  def parse_import_data!(default_headers)
+    data = CSV.read(import_data_path, headers: true, encoding: 'UTF-8')
+    data = CSV.read(import_data_path, headers: default_headers, encoding: 'UTF-8') unless data.headers&.first&.strip&.include?(default_headers[0])
+    @data = data.reject(&:blank?)
+  end
+end
diff --git a/app/controllers/concerns/authorization.rb b/app/controllers/concerns/authorization.rb
index 95a37e379..05260cc8b 100644
--- a/app/controllers/concerns/authorization.rb
+++ b/app/controllers/concerns/authorization.rb
@@ -3,7 +3,7 @@
 module Authorization
   extend ActiveSupport::Concern
 
-  include Pundit
+  include Pundit::Authorization
 
   def pundit_user
     current_account
diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb
index fe1142f34..ede299d5a 100644
--- a/app/controllers/concerns/localized.rb
+++ b/app/controllers/concerns/localized.rb
@@ -7,27 +7,28 @@ module Localized
     around_action :set_locale
   end
 
-  def set_locale
-    locale   = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in?
-    locale ||= session[:locale] ||= default_locale
-    locale   = default_locale unless I18n.available_locales.include?(locale.to_sym)
-
-    I18n.with_locale(locale) do
-      yield
-    end
+  def set_locale(&block)
+    I18n.with_locale(requested_locale || I18n.default_locale, &block)
   end
 
   private
 
-  def default_locale
-    if ENV['DEFAULT_LOCALE'].present?
-      I18n.default_locale
-    else
-      request_locale || I18n.default_locale
-    end
+  def requested_locale
+    requested_locale_name   = available_locale_or_nil(params[:lang])
+    requested_locale_name ||= available_locale_or_nil(current_user.locale) if respond_to?(:user_signed_in?) && user_signed_in?
+    requested_locale_name ||= http_accept_language if ENV['DEFAULT_LOCALE'].blank?
+    requested_locale_name
   end
 
-  def request_locale
-    http_accept_language.language_region_compatible_from(I18n.available_locales)
+  def http_accept_language
+    HttpAcceptLanguage::Parser.new(request.headers.fetch('Accept-Language')).language_region_compatible_from(I18n.available_locales) if request.headers.key?('Accept-Language')
+  end
+
+  def available_locale_or_nil(locale_name)
+    locale_name.to_sym if locale_name.present? && I18n.available_locales.include?(locale_name.to_sym)
+  end
+
+  def content_locale
+    @content_locale ||= I18n.locale.to_s.split(/[_-]/).first
   end
 end
diff --git a/app/controllers/concerns/rate_limit_headers.rb b/app/controllers/concerns/rate_limit_headers.rb
index 86fe58a71..b8696df73 100644
--- a/app/controllers/concerns/rate_limit_headers.rb
+++ b/app/controllers/concerns/rate_limit_headers.rb
@@ -58,7 +58,7 @@ module RateLimitHeaders
   end
 
   def api_throttle_data
-    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_, v| v[:limit] - v[:count] }
+    most_limited_type, = request.env['rack.attack.throttle_data'].min_by { |_key, value| value[:limit] - value[:count] }
     request.env['rack.attack.throttle_data'][most_limited_type]
   end
 
diff --git a/app/controllers/concerns/session_tracking_concern.rb b/app/controllers/concerns/session_tracking_concern.rb
index 45361b019..eaaa4ac59 100644
--- a/app/controllers/concerns/session_tracking_concern.rb
+++ b/app/controllers/concerns/session_tracking_concern.rb
@@ -3,7 +3,7 @@
 module SessionTrackingConcern
   extend ActiveSupport::Concern
 
-  UPDATE_SIGN_IN_HOURS = 24
+  SESSION_UPDATE_FREQUENCY = 24.hours.freeze
 
   included do
     before_action :set_session_activity
@@ -17,6 +17,6 @@ module SessionTrackingConcern
   end
 
   def session_needs_update?
-    !current_session.nil? && current_session.updated_at < UPDATE_SIGN_IN_HOURS.hours.ago
+    !current_session.nil? && current_session.updated_at < SESSION_UPDATE_FREQUENCY.ago
   end
 end
diff --git a/app/controllers/concerns/sign_in_token_authentication_concern.rb b/app/controllers/concerns/sign_in_token_authentication_concern.rb
deleted file mode 100644
index 384c5c50c..000000000
--- a/app/controllers/concerns/sign_in_token_authentication_concern.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module SignInTokenAuthenticationConcern
-  extend ActiveSupport::Concern
-
-  included do
-    prepend_before_action :authenticate_with_sign_in_token, if: :sign_in_token_required?, only: [:create]
-  end
-
-  def sign_in_token_required?
-    find_user&.suspicious_sign_in?(request.remote_ip)
-  end
-
-  def valid_sign_in_token_attempt?(user)
-    Devise.secure_compare(user.sign_in_token, user_params[:sign_in_token_attempt])
-  end
-
-  def authenticate_with_sign_in_token
-    if user_params[:email].present?
-      user = self.resource = find_user_from_params
-      prompt_for_sign_in_token(user) if user&.external_or_valid_password?(user_params[:password])
-    elsif session[:attempt_user_id]
-      user = self.resource = User.find_by(id: session[:attempt_user_id])
-      return if user.nil?
-
-      if session[:attempt_user_updated_at] != user.updated_at.to_s
-        restart_session
-      elsif user_params.key?(:sign_in_token_attempt)
-        authenticate_with_sign_in_token_attempt(user)
-      end
-    end
-  end
-
-  def authenticate_with_sign_in_token_attempt(user)
-    if valid_sign_in_token_attempt?(user)
-      on_authentication_success(user, :sign_in_token)
-    else
-      on_authentication_failure(user, :sign_in_token, :invalid_sign_in_token)
-      flash.now[:alert] = I18n.t('users.invalid_sign_in_token')
-      prompt_for_sign_in_token(user)
-    end
-  end
-
-  def prompt_for_sign_in_token(user)
-    if user.sign_in_token_expired?
-      user.generate_sign_in_token && user.save
-      UserMailer.sign_in_token(user, request.remote_ip, request.user_agent, Time.now.utc.to_s).deliver_later!
-    end
-
-    set_attempt_session(user)
-
-    @body_classes = 'lighter'
-
-    set_locale { render :sign_in_token }
-  end
-end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 4dd0cac55..4502da698 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -28,8 +28,8 @@ module SignatureVerification
   end
 
   class SignatureParamsTransformer < Parslet::Transform
-    rule(params: subtree(:p)) do
-      (p.is_a?(Array) ? p : [p]).each_with_object({}) { |(key, val), h| h[key] = val }
+    rule(params: subtree(:param)) do
+      (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
     end
 
     rule(param: { key: simple(:key), value: simple(:val) }) do
@@ -45,10 +45,14 @@ module SignatureVerification
     end
   end
 
-  def require_signature!
+  def require_account_signature!
     render plain: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
   end
 
+  def require_actor_signature!
+    render plain: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_actor
+  end
+
   def signed_request?
     request.headers['Signature'].present?
   end
@@ -68,7 +72,11 @@ module SignatureVerification
   end
 
   def signed_request_account
-    return @signed_request_account if defined?(@signed_request_account)
+    signed_request_actor.is_a?(Account) ? signed_request_actor : nil
+  end
+
+  def signed_request_actor
+    return @signed_request_actor if defined?(@signed_request_actor)
 
     raise SignatureVerificationError, 'Request not signed' unless signed_request?
     raise SignatureVerificationError, 'Incompatible request signature. keyId and signature are required' if missing_required_signature_parameters?
@@ -78,26 +86,30 @@ module SignatureVerification
     verify_signature_strength!
     verify_body_digest!
 
-    account = account_from_key_id(signature_params['keyId'])
+    actor = actor_from_key_id(signature_params['keyId'])
 
-    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if actor.nil?
 
     signature             = Base64.decode64(signature_params['signature'])
     compare_signed_string = build_signed_string
 
-    return account unless verify_signature(account, signature, compare_signed_string).nil?
+    return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
-    account = stoplight_wrap_request { account.possibly_stale? ? account.refresh! : account_refresh_key(account) }
+    actor = stoplight_wrap_request { actor_refresh_key!(actor) }
 
-    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if account.nil?
+    raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if actor.nil?
 
-    return account unless verify_signature(account, signature, compare_signed_string).nil?
+    return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
-    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)"
-    @signed_request_account = nil
+    fail_with! "Verification failed for #{actor.to_log_human_identifier} #{actor.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)"
   rescue SignatureVerificationError => e
-    @signature_verification_failure_reason = e.message
-    @signed_request_account = nil
+    fail_with! e.message
+  rescue HTTP::Error, OpenSSL::SSL::SSLError => e
+    fail_with! "Failed to fetch remote data: #{e.message}"
+  rescue Mastodon::UnexpectedResponseError
+    fail_with! 'Failed to fetch remote data (got unexpected reply from server)'
+  rescue Stoplight::Error::RedLight
+    fail_with! 'Fetching attempt skipped because of recent connection failure'
   end
 
   def request_body
@@ -106,6 +118,11 @@ module SignatureVerification
 
   private
 
+  def fail_with!(message)
+    @signature_verification_failure_reason = message
+    @signed_request_actor = nil
+  end
+
   def signature_params
     @signature_params ||= begin
       raw_signature = request.headers['Signature']
@@ -138,13 +155,23 @@ module SignatureVerification
     digests = request.headers['Digest'].split(',').map { |digest| digest.split('=', 2) }.map { |key, value| [key.downcase, value] }
     sha256  = digests.assoc('sha-256')
     raise SignatureVerificationError, "Mastodon only supports SHA-256 in Digest header. Offered algorithms: #{digests.map(&:first).join(', ')}" if sha256.nil?
-    raise SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{sha256[1]}" if body_digest != sha256[1]
+
+    return if body_digest == sha256[1]
+
+    digest_size = begin
+      Base64.strict_decode64(sha256[1].strip).length
+    rescue ArgumentError
+      raise SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a valid base64 string. Given digest: #{sha256[1]}"
+    end
+
+    raise SignatureVerificationError, "Invalid Digest value. The provided Digest value is not a SHA-256 digest. Given digest: #{sha256[1]}" if digest_size != 32
+    raise SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{sha256[1]}"
   end
 
-  def verify_signature(account, signature, compare_signed_string)
-    if account.keypair.public_key.verify(OpenSSL::Digest.new('SHA256'), signature, compare_signed_string)
-      @signed_request_account = account
-      @signed_request_account
+  def verify_signature(actor, signature, compare_signed_string)
+    if actor.keypair.public_key.verify(OpenSSL::Digest.new('SHA256'), signature, compare_signed_string)
+      @signed_request_actor = actor
+      @signed_request_actor
     end
   rescue OpenSSL::PKey::RSAError
     nil
@@ -207,7 +234,7 @@ module SignatureVerification
     signature_params['keyId'].blank? || signature_params['signature'].blank?
   end
 
-  def account_from_key_id(key_id)
+  def actor_from_key_id(key_id)
     domain = key_id.start_with?('acct:') ? key_id.split('@').last : key_id
 
     if domain_not_allowed?(domain)
@@ -216,27 +243,34 @@ module SignatureVerification
     end
 
     if key_id.start_with?('acct:')
-      stoplight_wrap_request { ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, '')) }
+      stoplight_wrap_request { ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, ''), suppress_errors: false) }
     elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
-      account   = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
-      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false) }
+      account   = ActivityPub::TagManager.instance.uri_to_actor(key_id)
+      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false, suppress_errors: false) }
       account
     end
-  rescue Mastodon::HostValidationError
-    nil
+  rescue Mastodon::PrivateNetworkAddressError => e
+    raise SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})"
+  rescue Mastodon::HostValidationError, ActivityPub::FetchRemoteActorService::Error, ActivityPub::FetchRemoteKeyService::Error, Webfinger::Error => e
+    raise SignatureVerificationError, e.message
   end
 
   def stoplight_wrap_request(&block)
     Stoplight("source:#{request.remote_ip}", &block)
-      .with_fallback { nil }
       .with_threshold(1)
       .with_cool_off_time(5.minutes.seconds)
       .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
       .run
   end
 
-  def account_refresh_key(account)
-    return if account.local? || !account.activitypub?
-    ActivityPub::FetchRemoteAccountService.new.call(account.uri, only_key: true)
+  def actor_refresh_key!(actor)
+    return if actor.local? || !actor.activitypub?
+    return actor.refresh! if actor.respond_to?(:refresh!) && actor.possibly_stale?
+
+    ActivityPub::FetchRemoteActorService.new.call(actor.uri, only_key: true, suppress_errors: false)
+  rescue Mastodon::PrivateNetworkAddressError => e
+    raise SignatureVerificationError, "Requests to private network addresses are disallowed (tried to query #{e.host})"
+  rescue Mastodon::HostValidationError, ActivityPub::FetchRemoteActorService::Error, Webfinger::Error => e
+    raise SignatureVerificationError, e.message
   end
 end
diff --git a/app/controllers/concerns/status_controller_concern.rb b/app/controllers/concerns/status_controller_concern.rb
deleted file mode 100644
index 62a7cf508..000000000
--- a/app/controllers/concerns/status_controller_concern.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-module StatusControllerConcern
-  extend ActiveSupport::Concern
-
-  ANCESTORS_LIMIT         = 40
-  DESCENDANTS_LIMIT       = 60
-  DESCENDANTS_DEPTH_LIMIT = 20
-
-  def create_descendant_thread(starting_depth, statuses)
-    depth = starting_depth + statuses.size
-
-    if depth < DESCENDANTS_DEPTH_LIMIT
-      {
-        statuses: statuses,
-        starting_depth: starting_depth,
-      }
-    else
-      next_status = statuses.pop
-
-      {
-        statuses: statuses,
-        starting_depth: starting_depth,
-        next_status: next_status,
-      }
-    end
-  end
-
-  def set_ancestors
-    @ancestors     = @status.reply? ? cache_collection(@status.ancestors(ANCESTORS_LIMIT, current_account), Status) : []
-    @next_ancestor = @ancestors.size < ANCESTORS_LIMIT ? nil : @ancestors.shift
-  end
-
-  def set_descendants
-    @max_descendant_thread_id   = params[:max_descendant_thread_id]&.to_i
-    @since_descendant_thread_id = params[:since_descendant_thread_id]&.to_i
-
-    descendants = cache_collection(
-      @status.descendants(
-        DESCENDANTS_LIMIT,
-        current_account,
-        @max_descendant_thread_id,
-        @since_descendant_thread_id,
-        DESCENDANTS_DEPTH_LIMIT
-      ),
-      Status
-    )
-
-    @descendant_threads = []
-
-    if descendants.present?
-      statuses       = [descendants.first]
-      starting_depth = 0
-
-      descendants.drop(1).each_with_index do |descendant, index|
-        if descendants[index].id == descendant.in_reply_to_id
-          statuses << descendant
-        else
-          @descendant_threads << create_descendant_thread(starting_depth, statuses)
-
-          # The thread is broken, assume it's a reply to the root status
-          starting_depth = 0
-
-          # ... unless we can find its ancestor in one of the already-processed threads
-          @descendant_threads.reverse_each do |descendant_thread|
-            statuses = descendant_thread[:statuses]
-
-            index = statuses.find_index do |thread_status|
-              thread_status.id == descendant.in_reply_to_id
-            end
-
-            if index.present?
-              starting_depth = descendant_thread[:starting_depth] + index + 1
-              break
-            end
-          end
-
-          statuses = [descendant]
-        end
-      end
-
-      @descendant_threads << create_descendant_thread(starting_depth, statuses)
-    end
-
-    @max_descendant_thread_id = @descendant_threads.pop[:statuses].first.id if descendants.size >= DESCENDANTS_LIMIT
-  end
-end
diff --git a/app/controllers/concerns/user_tracking_concern.rb b/app/controllers/concerns/user_tracking_concern.rb
index efda37fae..e960cce53 100644
--- a/app/controllers/concerns/user_tracking_concern.rb
+++ b/app/controllers/concerns/user_tracking_concern.rb
@@ -3,7 +3,7 @@
 module UserTrackingConcern
   extend ActiveSupport::Concern
 
-  UPDATE_SIGN_IN_HOURS = 24
+  SIGN_IN_UPDATE_FREQUENCY = 24.hours.freeze
 
   included do
     before_action :update_user_sign_in
@@ -12,10 +12,10 @@ module UserTrackingConcern
   private
 
   def update_user_sign_in
-    current_user.update_sign_in!(request) if user_needs_sign_in_update?
+    current_user.update_sign_in! if user_needs_sign_in_update?
   end
 
   def user_needs_sign_in_update?
-    user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago)
+    user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < SIGN_IN_UPDATE_FREQUENCY.ago)
   end
 end
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
new file mode 100644
index 000000000..c671ce785
--- /dev/null
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module WebAppControllerConcern
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :redirect_unauthenticated_to_permalinks!
+    before_action :set_app_body_class
+    before_action :set_referrer_policy_header
+  end
+
+  def set_app_body_class
+    @body_classes = 'app-body'
+  end
+
+  def set_referrer_policy_header
+    response.headers['Referrer-Policy'] = 'origin'
+  end
+
+  def redirect_unauthenticated_to_permalinks!
+    return if user_signed_in?
+
+    redirect_path = PermalinkRedirector.new(request.path).redirect_path
+
+    redirect_to(redirect_path) if redirect_path.present?
+  end
+end
diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
index e1dc5eaf6..9270c467d 100644
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@@ -13,6 +13,6 @@ class CustomCssController < ApplicationController
   def show
     expires_in 3.minutes, public: true
     request.session_options[:skip] = true
-    render plain: Setting.custom_css || '', content_type: 'text/css'
+    render content_type: 'text/css'
   end
 end
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb
deleted file mode 100644
index f28c5b2af..000000000
--- a/app/controllers/directories_controller.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class DirectoriesController < ApplicationController
-  layout 'public'
-
-  before_action :authenticate_user!, if: :whitelist_mode?
-  before_action :require_enabled!
-  before_action :set_instance_presenter
-  before_action :set_accounts
-
-  skip_before_action :require_functional!, unless: :whitelist_mode?
-
-  def index
-    render :index
-  end
-
-  private
-
-  def require_enabled!
-    return not_found unless Setting.profile_directory
-  end
-
-  def set_accounts
-    @accounts = Account.local.discoverable.by_recent_status.page(params[:page]).per(20).tap do |query|
-      query.merge!(Account.not_excluded_by_account(current_account)) if current_account
-    end
-  end
-
-  def set_instance_presenter
-    @instance_presenter = InstancePresenter.new
-  end
-end
diff --git a/app/controllers/disputes/appeals_controller.rb b/app/controllers/disputes/appeals_controller.rb
new file mode 100644
index 000000000..eefd92b5a
--- /dev/null
+++ b/app/controllers/disputes/appeals_controller.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Disputes::AppealsController < Disputes::BaseController
+  before_action :set_strike
+
+  def create
+    authorize @strike, :appeal?
+
+    @appeal = AppealService.new.call(@strike, appeal_params[:text])
+
+    redirect_to disputes_strike_path(@strike), notice: I18n.t('disputes.strikes.appealed_msg')
+  rescue ActiveRecord::RecordInvalid => e
+    @appeal = e.record
+    render template: 'disputes/strikes/show'
+  end
+
+  private
+
+  def set_strike
+    @strike = current_account.strikes.find(params[:strike_id])
+  end
+
+  def appeal_params
+    params.require(:appeal).permit(:text)
+  end
+end
diff --git a/app/controllers/disputes/base_controller.rb b/app/controllers/disputes/base_controller.rb
new file mode 100644
index 000000000..865146b5c
--- /dev/null
+++ b/app/controllers/disputes/base_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Disputes::BaseController < ApplicationController
+  include Authorization
+
+  layout 'admin'
+
+  skip_before_action :require_functional!
+
+  before_action :set_body_classes
+  before_action :authenticate_user!
+
+  private
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+end
diff --git a/app/controllers/disputes/strikes_controller.rb b/app/controllers/disputes/strikes_controller.rb
new file mode 100644
index 000000000..d85dcb4d5
--- /dev/null
+++ b/app/controllers/disputes/strikes_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Disputes::StrikesController < Disputes::BaseController
+  before_action :set_strike, only: [:show]
+
+  def index
+    @strikes = current_account.strikes.latest
+  end
+
+  def show
+    authorize @strike, :show?
+
+    @appeal = @strike.appeal || @strike.build_appeal
+  end
+
+  private
+
+  def set_strike
+    @strike = AccountWarning.find(params[:id])
+  end
+end
diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb
new file mode 100644
index 000000000..cc493c22c
--- /dev/null
+++ b/app/controllers/filters/statuses_controller.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class Filters::StatusesController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
+  before_action :set_filter
+  before_action :set_status_filters
+  before_action :set_body_classes
+
+  PER_PAGE = 20
+
+  def index
+    @status_filter_batch_action = Form::StatusFilterBatchAction.new
+  end
+
+  def batch
+    @status_filter_batch_action = Form::StatusFilterBatchAction.new(status_filter_batch_action_params.merge(current_account: current_account, filter_id: params[:filter_id], type: action_from_button))
+    @status_filter_batch_action.save!
+  rescue ActionController::ParameterMissing
+    flash[:alert] = I18n.t('admin.statuses.no_status_selected')
+  ensure
+    redirect_to edit_filter_path(@filter)
+  end
+
+  private
+
+  def set_filter
+    @filter = current_account.custom_filters.find(params[:filter_id])
+  end
+
+  def set_status_filters
+    @status_filters = @filter.statuses.preload(:status).page(params[:page]).per(PER_PAGE)
+  end
+
+  def status_filter_batch_action_params
+    params.require(:form_status_filter_batch_action).permit(status_filter_ids: [])
+  end
+
+  def action_from_button
+    if params[:remove]
+      'remove'
+    end
+  end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 79a1ab02b..cc5cb5d9f 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -4,16 +4,16 @@ class FiltersController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_filters, only: :index
   before_action :set_filter, only: [:edit, :update, :destroy]
   before_action :set_body_classes
 
   def index
-    @filters = current_account.custom_filters.order(:phrase)
+    @filters = current_account.custom_filters.includes(:keywords, :statuses).order(:phrase)
   end
 
   def new
-    @filter = current_account.custom_filters.build
+    @filter = current_account.custom_filters.build(action: :warn)
+    @filter.keywords.build
   end
 
   def create
@@ -43,16 +43,12 @@ class FiltersController < ApplicationController
 
   private
 
-  def set_filters
-    @filters = current_account.custom_filters
-  end
-
   def set_filter
     @filter = current_account.custom_filters.find(params[:id])
   end
 
   def resource_params
-    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
+    params.require(:custom_filter).permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 
   def set_body_classes
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index b3589a39f..9ced18449 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -3,8 +3,9 @@
 class FollowerAccountsController < ApplicationController
   include AccountControllerConcern
   include SignatureVerification
+  include WebAppControllerConcern
 
-  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
+  before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
 
   skip_around_action :set_locale, if: -> { request.format == :json }
@@ -14,14 +15,10 @@ class FollowerAccountsController < ApplicationController
     respond_to do |format|
       format.html do
         expires_in 0, public: true unless user_signed_in?
-
-        next if @account.user_hides_network?
-
-        follows
       end
 
       format.json do
-        raise Mastodon::NotPermittedError if page_requested? && @account.user_hides_network?
+        raise Mastodon::NotPermittedError if page_requested? && @account.hide_collections?
 
         expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?)
 
@@ -66,7 +63,7 @@ class FollowerAccountsController < ApplicationController
         id: account_followers_url(@account, page: params.fetch(:page, 1)),
         type: :ordered,
         size: @account.followers_count,
-        items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) },
+        items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
         part_of: account_followers_url(@account),
         next: next_page_url,
         prev: prev_page_url
@@ -82,7 +79,7 @@ class FollowerAccountsController < ApplicationController
   end
 
   def restrict_fields_to
-    if page_requested? || !@account.user_hides_network?
+    if page_requested? || !@account.hide_collections?
       # Return all fields
     else
       %i(id type total_items)
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 8a72dc475..febd13c97 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -3,8 +3,9 @@
 class FollowingAccountsController < ApplicationController
   include AccountControllerConcern
   include SignatureVerification
+  include WebAppControllerConcern
 
-  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
+  before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_cache_headers
 
   skip_around_action :set_locale, if: -> { request.format == :json }
@@ -14,14 +15,13 @@ class FollowingAccountsController < ApplicationController
     respond_to do |format|
       format.html do
         expires_in 0, public: true unless user_signed_in?
-
-        next if @account.user_hides_network?
-
-        follows
       end
 
       format.json do
-        raise Mastodon::NotPermittedError if page_requested? && @account.user_hides_network?
+        if page_requested? && @account.hide_collections?
+          forbidden
+          next
+        end
 
         expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?)
 
@@ -66,7 +66,7 @@ class FollowingAccountsController < ApplicationController
         id: account_following_index_url(@account, page: params.fetch(:page, 1)),
         type: :ordered,
         size: @account.following_count,
-        items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) },
+        items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
         part_of: account_following_index_url(@account),
         next: next_page_url,
         prev: prev_page_url
@@ -82,7 +82,7 @@ class FollowingAccountsController < ApplicationController
   end
 
   def restrict_fields_to
-    if page_requested? || !@account.user_hides_network?
+    if page_requested? || !@account.hide_collections?
       # Return all fields
     else
       %i(id type total_items)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 7e443eb9e..d8ee82a7a 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,33 +1,17 @@
 # frozen_string_literal: true
 
 class HomeController < ApplicationController
-  before_action :redirect_unauthenticated_to_permalinks!
-  before_action :authenticate_user!
-  before_action :set_referrer_policy_header
+  include WebAppControllerConcern
+
+  before_action :set_instance_presenter
 
   def index
-    @body_classes = 'app-body'
+    expires_in 0, public: true unless user_signed_in?
   end
 
   private
 
-  def redirect_unauthenticated_to_permalinks!
-    return if user_signed_in?
-
-    redirect_to(PermalinkRedirector.new(request.path).redirect_path || default_redirect_path)
-  end
-
-  def default_redirect_path
-    if request.path.start_with?('/web') || whitelist_mode?
-      new_user_session_path
-    elsif single_user_mode?
-      short_account_path(Account.local.without_suspended.where('id > 0').first)
-    else
-      about_path
-    end
-  end
-
-  def set_referrer_policy_header
-    response.headers['Referrer-Policy'] = 'origin'
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
   end
 end
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index b3b5476e2..0853897f2 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -3,6 +3,7 @@
 class InstanceActorsController < ApplicationController
   include AccountControllerConcern
 
+  skip_before_action :check_account_confirmation
   skip_around_action :set_locale
 
   def show
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index ee82625a0..3cdd97f06 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -12,8 +12,8 @@ class MediaController < ApplicationController
   before_action :check_playable, only: :player
   before_action :allow_iframing, only: :player
 
-  content_security_policy only: :player do |p|
-    p.frame_ancestors(false)
+  content_security_policy only: :player do |policy|
+    policy.frame_ancestors(false)
   end
 
   def show
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb
index 5596e92d1..3b228722f 100644
--- a/app/controllers/media_proxy_controller.rb
+++ b/app/controllers/media_proxy_controller.rb
@@ -3,6 +3,8 @@
 class MediaProxyController < ApplicationController
   include RoutingHelper
   include Authorization
+  include Redisable
+  include Lockable
 
   skip_before_action :store_current_location
   skip_before_action :require_functional!
@@ -15,14 +17,10 @@ class MediaProxyController < ApplicationController
   rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error
 
   def show
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        @media_attachment = MediaAttachment.remote.attached.find(params[:id])
-        authorize @media_attachment.status, :show?
-        redownload! if @media_attachment.needs_redownload? && !reject_media?
-      else
-        raise Mastodon::RaceConditionError
-      end
+    with_lock("media_download:#{params[:id]}") do
+      @media_attachment = MediaAttachment.remote.attached.find(params[:id])
+      authorize @media_attachment.status, :show?
+      redownload! if @media_attachment.needs_redownload? && !reject_media?
     end
 
     redirect_to full_asset_url(@media_attachment.file.url(version))
@@ -44,10 +42,6 @@ class MediaProxyController < ApplicationController
     end
   end
 
-  def lock_options
-    { redis: Redis.current, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds }
-  end
-
   def reject_media?
     DomainBlock.reject_media?(@media_attachment.account.domain)
   end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index bb5d639ce..5449cfb1a 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -7,6 +7,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   before_action :authenticate_resource_owner!
   before_action :set_cache_headers
 
+  content_security_policy do |p|
+    p.form_action(false)
+  end
+
   include Localized
 
   private
@@ -30,6 +34,6 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   end
 
   def set_cache_headers
-    response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+    response.headers['Cache-Control'] = 'private, no-store'
   end
 end
diff --git a/app/controllers/oauth/tokens_controller.rb b/app/controllers/oauth/tokens_controller.rb
index fa6d58f25..34087b20b 100644
--- a/app/controllers/oauth/tokens_controller.rb
+++ b/app/controllers/oauth/tokens_controller.rb
@@ -2,7 +2,8 @@
 
 class Oauth::TokensController < Doorkeeper::TokensController
   def revoke
-    unsubscribe_for_token if authorized? && token.accessible?
+    unsubscribe_for_token if token.present? && authorized? && token.accessible?
+
     super
   end
 
diff --git a/app/controllers/privacy_controller.rb b/app/controllers/privacy_controller.rb
new file mode 100644
index 000000000..2c98bf3bf
--- /dev/null
+++ b/app/controllers/privacy_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class PrivacyController < ApplicationController
+  include WebAppControllerConcern
+
+  skip_before_action :require_functional!
+
+  before_action :set_instance_presenter
+
+  def show
+    expires_in 0, public: true if current_account.nil?
+  end
+
+  private
+
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
+  end
+end
diff --git a/app/controllers/public_timelines_controller.rb b/app/controllers/public_timelines_controller.rb
deleted file mode 100644
index 1332ba16c..000000000
--- a/app/controllers/public_timelines_controller.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class PublicTimelinesController < ApplicationController
-  layout 'public'
-
-  before_action :authenticate_user!, if: :whitelist_mode?
-  before_action :require_enabled!
-  before_action :set_body_classes
-  before_action :set_instance_presenter
-
-  def show; end
-
-  private
-
-  def require_enabled!
-    not_found unless Setting.timeline_preview
-  end
-
-  def set_body_classes
-    @body_classes = 'with-modals'
-  end
-
-  def set_instance_presenter
-    @instance_presenter = InstancePresenter.new
-  end
-end
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
deleted file mode 100644
index db1604644..000000000
--- a/app/controllers/remote_follow_controller.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class RemoteFollowController < ApplicationController
-  include AccountOwnedConcern
-
-  layout 'modal'
-
-  before_action :set_body_classes
-
-  skip_before_action :require_functional!
-
-  def new
-    @remote_follow = RemoteFollow.new(session_params)
-  end
-
-  def create
-    @remote_follow = RemoteFollow.new(resource_params)
-
-    if @remote_follow.valid?
-      session[:remote_follow] = @remote_follow.acct
-      redirect_to @remote_follow.subscribe_address_for(@account)
-    else
-      render :new
-    end
-  end
-
-  private
-
-  def resource_params
-    params.require(:remote_follow).permit(:acct)
-  end
-
-  def session_params
-    { acct: session[:remote_follow] || current_account&.username }
-  end
-
-  def set_body_classes
-    @body_classes = 'modal-layout'
-    @hide_header  = true
-  end
-end
diff --git a/app/controllers/remote_interaction_controller.rb b/app/controllers/remote_interaction_controller.rb
deleted file mode 100644
index 6c29a2b9f..000000000
--- a/app/controllers/remote_interaction_controller.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-class RemoteInteractionController < ApplicationController
-  include Authorization
-
-  layout 'modal'
-
-  before_action :authenticate_user!, if: :whitelist_mode?
-  before_action :set_interaction_type
-  before_action :set_status
-  before_action :set_body_classes
-
-  skip_before_action :require_functional!, unless: :whitelist_mode?
-
-  def new
-    @remote_follow = RemoteFollow.new(session_params)
-  end
-
-  def create
-    @remote_follow = RemoteFollow.new(resource_params)
-
-    if @remote_follow.valid?
-      session[:remote_follow] = @remote_follow.acct
-      redirect_to @remote_follow.interact_address_for(@status)
-    else
-      render :new
-    end
-  end
-
-  private
-
-  def resource_params
-    params.require(:remote_follow).permit(:acct)
-  end
-
-  def session_params
-    { acct: session[:remote_follow] || current_account&.username }
-  end
-
-  def set_status
-    @status = Status.find(params[:id])
-    authorize @status, :show?
-  rescue Mastodon::NotPermittedError
-    not_found
-  end
-
-  def set_body_classes
-    @body_classes = 'modal-layout'
-    @hide_header  = true
-  end
-
-  def set_interaction_type
-    @interaction_type = %w(reply reblog favourite).include?(params[:type]) ? params[:type] : 'reply'
-  end
-end
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index 8311538a5..8722fd64a 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -14,7 +14,7 @@ class Settings::BaseController < ApplicationController
   end
 
   def set_cache_headers
-    response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+    response.headers['Cache-Control'] = 'private, no-store'
   end
 
   def require_not_suspended!
diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index e0dd5edcb..bb096567a 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -4,7 +4,6 @@ class Settings::DeletesController < Settings::BaseController
   skip_before_action :require_functional!
 
   before_action :require_not_suspended!
-  before_action :check_enabled_deletion
 
   def show
     @confirmation = Form::DeleteConfirmation.new
@@ -21,10 +20,6 @@ class Settings::DeletesController < Settings::BaseController
 
   private
 
-  def check_enabled_deletion
-    redirect_to root_path unless Setting.open_deletion
-  end
-
   def resource_params
     params.require(:form_delete_confirmation).permit(:password, :username)
   end
diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb
index 30138d29e..deaa7940e 100644
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@@ -2,6 +2,8 @@
 
 class Settings::ExportsController < Settings::BaseController
   include Authorization
+  include Redisable
+  include Lockable
 
   skip_before_action :require_functional!
 
@@ -13,21 +15,13 @@ class Settings::ExportsController < Settings::BaseController
   def create
     backup = nil
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        authorize :backup, :create?
-        backup = current_user.backups.create!
-      else
-        raise Mastodon::RaceConditionError
-      end
+    with_lock("backup:#{current_user.id}") do
+      authorize :backup, :create?
+      backup = current_user.backups.create!
     end
 
     BackupWorker.perform_async(backup.id)
 
     redirect_to settings_export_path
   end
-
-  def lock_options
-    { redis: Redis.current, key: "backup:#{current_user.id}" }
-  end
 end
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index e805527d0..c38440265 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -10,10 +10,9 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def create
-    @featured_tag = current_account.featured_tags.new(featured_tag_params)
-    @featured_tag.reset_data
+    @featured_tag = CreateFeaturedTagService.new.call(current_account, featured_tag_params[:name], force: false)
 
-    if @featured_tag.save
+    if @featured_tag.valid?
       redirect_to settings_featured_tags_path
     else
       set_featured_tags
@@ -24,7 +23,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def destroy
-    @featured_tag.destroy!
+    RemoveFeaturedTagService.new.call(current_account, @featured_tag)
     redirect_to settings_featured_tags_path
   end
 
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 32b5d7948..f5d5c1244 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -47,7 +47,6 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_system_font_ui,
       :setting_noindex,
       :setting_theme,
-      :setting_hide_network,
       :setting_aggregate_reblogs,
       :setting_show_application,
       :setting_advanced_layout,
@@ -55,7 +54,8 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_use_pending_items,
       :setting_trends,
       :setting_crop_images,
-      notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
+      :setting_always_send_emails,
+      notification_emails: %i(follow follow_request reblog favourite mention report pending_account trending_tag appeal),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 0c15447a6..be5b4f302 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, :hide_collections, fields_attributes: [:name, :value])
   end
 
   def set_account
diff --git a/app/controllers/statuses_cleanup_controller.rb b/app/controllers/statuses_cleanup_controller.rb
index be234cdcb..e912967fd 100644
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@@ -19,6 +19,10 @@ class StatusesCleanupController < ApplicationController
     # Do nothing
   end
 
+  def require_functional!
+    redirect_to edit_user_registration_path unless current_user.functional_or_moved?
+  end
+
   private
 
   def set_policy
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index c52170d08..0e0783b4b 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -1,35 +1,30 @@
 # frozen_string_literal: true
 
 class StatusesController < ApplicationController
-  include StatusControllerConcern
+  include WebAppControllerConcern
   include SignatureAuthentication
   include Authorization
   include AccountOwnedConcern
 
-  layout 'public'
-
-  before_action :require_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? }
+  before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_status
   before_action :set_instance_presenter
   before_action :set_link_headers
   before_action :redirect_to_original, only: :show
-  before_action :set_referrer_policy_header, only: :show
   before_action :set_cache_headers
-  before_action :set_body_classes
+  before_action :set_body_classes, only: :embed
 
   skip_around_action :set_locale, if: -> { request.format == :json }
   skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode?
 
-  content_security_policy only: :embed do |p|
-    p.frame_ancestors(false)
+  content_security_policy only: :embed do |policy|
+    policy.frame_ancestors(false)
   end
 
   def show
     respond_to do |format|
       format.html do
         expires_in 10.seconds, public: true if current_account.nil?
-        set_ancestors
-        set_descendants
       end
 
       format.json do
@@ -77,8 +72,4 @@ class StatusesController < ApplicationController
   def redirect_to_original
     redirect_to ActivityPub::TagManager.instance.url_for(@status.reblog) if @status.reblog?
   end
-
-  def set_referrer_policy_header
-    response.headers['Referrer-Policy'] = 'origin' unless @status.distributable?
-  end
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 6616ba107..65017acba 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,18 +2,16 @@
 
 class TagsController < ApplicationController
   include SignatureVerification
+  include WebAppControllerConcern
 
   PAGE_SIZE     = 20
   PAGE_SIZE_MAX = 200
 
-  layout 'public'
-
-  before_action :require_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
+  before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :authenticate_user!, if: :whitelist_mode?
   before_action :set_local
   before_action :set_tag
   before_action :set_statuses
-  before_action :set_body_classes
   before_action :set_instance_presenter
 
   skip_before_action :require_functional!, unless: :whitelist_mode?
@@ -21,12 +19,11 @@ class TagsController < ApplicationController
   def show
     respond_to do |format|
       format.html do
-        expires_in 0, public: true
+        expires_in 0, public: true unless user_signed_in?
       end
 
       format.rss do
         expires_in 0, public: true
-        render xml: RSS::TagSerializer.render(@tag, @statuses)
       end
 
       format.json do
@@ -55,10 +52,6 @@ class TagsController < ApplicationController
     end
   end
 
-  def set_body_classes
-    @body_classes = 'with-modals'
-  end
-
   def set_instance_presenter
     @instance_presenter = InstancePresenter.new
   end
@@ -72,7 +65,7 @@ class TagsController < ApplicationController
       id: tag_url(@tag),
       type: :ordered,
       size: @tag.statuses.count,
-      items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
+      items: @statuses.map { |status| ActivityPub::TagManager.instance.uri_for(status) }
     )
   end
 end
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index db3da2b05..6301919a9 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -2,10 +2,12 @@
 
 module AccountsHelper
   def display_name(account, **options)
+    str = account.display_name.presence || account.username
+
     if options[:custom_emojify]
-      Formatter.instance.format_display_name(account, **options)
+      prerender_custom_emojis(h(str), account.emojis)
     else
-      account.display_name.presence || account.username
+      str
     end
   end
 
@@ -18,62 +20,10 @@ module AccountsHelper
   end
 
   def account_action_button(account)
-    if user_signed_in?
-      if account.id == current_user.account_id
-        link_to settings_profile_url, class: 'button logo-button' do
-          safe_join([svg_logo, t('settings.edit_profile')])
-        end
-      elsif current_account.following?(account) || current_account.requested?(account)
-        link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do
-          safe_join([svg_logo, t('accounts.unfollow')])
-        end
-      elsif !(account.memorial? || account.moved?)
-        link_to account_follow_path(account), class: "button logo-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post } do
-          safe_join([svg_logo, t('accounts.follow')])
-        end
-      end
-    elsif !(account.memorial? || account.moved?)
-      link_to account_remote_follow_path(account), class: 'button logo-button modal-button', target: '_new' do
-        safe_join([svg_logo, t('accounts.follow')])
-      end
-    end
-  end
+    return if account.memorial? || account.moved?
 
-  def minimal_account_action_button(account)
-    if user_signed_in?
-      return if account.id == current_user.account_id
-
-      if current_account.following?(account) || current_account.requested?(account)
-        link_to account_unfollow_path(account), class: 'icon-button active', data: { method: :post }, title: t('accounts.unfollow') do
-          fa_icon('user-times fw')
-        end
-      elsif !(account.memorial? || account.moved?)
-        link_to account_follow_path(account), class: "icon-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post }, title: t('accounts.follow') do
-          fa_icon('user-plus fw')
-        end
-      end
-    elsif !(account.memorial? || account.moved?)
-      link_to account_remote_follow_path(account), class: 'icon-button modal-button', target: '_new', title: t('accounts.follow') do
-        fa_icon('user-plus fw')
-      end
-    end
-  end
-
-  def account_badge(account, all: false)
-    if account.bot?
-      content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles')
-    elsif account.group?
-      content_tag(:div, content_tag(:div, t('accounts.roles.group'), class: 'account-role group'), class: 'roles')
-    elsif (Setting.show_staff_badge && account.user_staff?) || all
-      content_tag(:div, class: 'roles') do
-        if all && !account.user_staff?
-          content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role')
-        elsif account.user_admin?
-          content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin')
-        elsif account.user_moderator?
-          content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator')
-        end
-      end
+    link_to ActivityPub::TagManager.instance.url_for(account), class: 'button logo-button', target: '_new' do
+      safe_join([logo_as_symbol, t('accounts.follow')])
     end
   end
 
@@ -95,14 +45,6 @@ module AccountsHelper
       ].join(' '),
     ].join(', ')
 
-    [prepend_str, account.note].join(' · ')
-  end
-
-  def svg_logo
-    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976')
-  end
-
-  def svg_logo_full
-    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678')
+    [prepend_str, account.note].join(' · ')
   end
 end
diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb
index 40b2a5289..2f08538ca 100644
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Admin::AccountModerationNotesHelper
-  def admin_account_link_to(account)
+  def admin_account_link_to(account, path: nil)
     return if account.nil?
 
-    link_to admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
+    link_to path || admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
       safe_join([
                   image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
                   content_tag(:span, account.acct, class: 'username'),
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index f3aa4be4f..215ecea0d 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -2,62 +2,37 @@
 
 module Admin::ActionLogsHelper
   def log_target(log)
-    if log.target
-      linkable_log_target(log.target)
-    else
-      log_target_from_history(log.target_type, log.recorded_changes)
-    end
-  end
-
-  private
-
-  def linkable_log_target(record)
-    case record.class.name
+    case log.target_type
     when 'Account'
-      link_to record.acct, admin_account_path(record.id)
+      link_to (log.human_identifier.presence || I18n.t('admin.action_logs.deleted_account')), admin_account_path(log.target_id)
     when 'User'
-      link_to record.account.acct, admin_account_path(record.account_id)
-    when 'CustomEmoji'
-      record.shortcode
-    when 'Report'
-      link_to "##{record.id}", admin_report_path(record)
-    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
-      link_to record.domain, "https://#{record.domain}"
-    when 'Status'
-      link_to record.account.acct, ActivityPub::TagManager.instance.url_for(record)
-    when 'AccountWarning'
-      link_to record.target_account.acct, admin_account_path(record.target_account_id)
-    when 'Announcement'
-      link_to truncate(record.text), edit_admin_announcement_path(record.id)
-    when 'IpBlock'
-      "#{record.ip}/#{record.ip.prefix} (#{I18n.t("simple_form.labels.ip_block.severities.#{record.severity}")})"
-    when 'Instance'
-      record.domain
-    end
-  end
-
-  def log_target_from_history(type, attributes)
-    case type
-    when 'User'
-      attributes['username']
-    when 'CustomEmoji'
-      attributes['shortcode']
-    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
-      link_to attributes['domain'], "https://#{attributes['domain']}"
-    when 'Status'
-      tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count'))
-
-      if tmp_status.account
-        link_to tmp_status.account&.acct || "##{tmp_status.account_id}", admin_account_path(tmp_status.account_id)
+      if log.route_param.present?
+        link_to log.human_identifier, admin_account_path(log.route_param)
       else
-        I18n.t('admin.action_logs.deleted_status')
+        I18n.t('admin.action_logs.deleted_account')
       end
+    when 'UserRole'
+      link_to log.human_identifier, admin_roles_path(log.target_id)
+    when 'Report'
+      link_to "##{log.human_identifier.presence || log.target_id}", admin_report_path(log.target_id)
+    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
+      link_to log.human_identifier, "https://#{log.human_identifier.presence}"
+    when 'Status'
+      link_to log.human_identifier, log.permalink
+    when 'AccountWarning'
+      link_to log.human_identifier, admin_account_path(log.target_id)
     when 'Announcement'
-      truncate(attributes['text'].is_a?(Array) ? attributes['text'].last : attributes['text'])
-    when 'IpBlock'
-      "#{attributes['ip']}/#{attributes['ip'].prefix} (#{I18n.t("simple_form.labels.ip_block.severities.#{attributes['severity']}")})"
-    when 'Instance'
-      attributes['domain']
+      link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
+    when 'IpBlock', 'Instance', 'CustomEmoji'
+      log.human_identifier
+    when 'CanonicalEmailBlock'
+      content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier)
+    when 'Appeal'
+      if log.route_param.present?
+        link_to log.human_identifier, disputes_strike_path(log.route_param.presence)
+      else
+        I18n.t('admin.action_logs.deleted_account')
+      end
     end
   end
 end
diff --git a/app/helpers/admin/dashboard_helper.rb b/app/helpers/admin/dashboard_helper.rb
index 32aaf9f5e..c21d41341 100644
--- a/app/helpers/admin/dashboard_helper.rb
+++ b/app/helpers/admin/dashboard_helper.rb
@@ -2,17 +2,17 @@
 
 module Admin::DashboardHelper
   def relevant_account_ip(account, ip_query)
-    default_ip = [account.user_current_sign_in_ip || account.user_sign_up_ip]
+    ips = account.user.present? ? account.user.ips.to_a : []
 
     matched_ip = begin
       ip_query_addr = IPAddr.new(ip_query)
-      account.user.recent_ips.find { |(_, ip)| ip_query_addr.include?(ip) } || default_ip
+      ips.find { |ip| ip_query_addr.include?(ip.ip) } || ips.first
     rescue IPAddr::Error
-      default_ip
-    end.last
+      ips.first
+    end
 
     if matched_ip
-      link_to matched_ip, admin_accounts_path(ip: matched_ip)
+      link_to matched_ip.ip, admin_accounts_path(ip: matched_ip.ip)
     else
       '-'
     end
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 5f69f176a..140fc73ed 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -5,14 +5,16 @@ module Admin::FilterHelper
     AccountFilter::KEYS,
     CustomEmojiFilter::KEYS,
     ReportFilter::KEYS,
-    TagFilter::KEYS,
-    PreviewCardProviderFilter::KEYS,
-    PreviewCardFilter::KEYS,
+    Trends::TagFilter::KEYS,
+    Trends::PreviewCardProviderFilter::KEYS,
+    Trends::PreviewCardFilter::KEYS,
+    Trends::StatusFilter::KEYS,
     InstanceFilter::KEYS,
     InviteFilter::KEYS,
     RelationshipFilter::KEYS,
     AnnouncementFilter::KEYS,
     Admin::ActionLogFilter::KEYS,
+    Admin::StatusFilter::KEYS,
   ].flatten.freeze
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb
index baf14ab25..a133b4e7d 100644
--- a/app/helpers/admin/settings_helper.rb
+++ b/app/helpers/admin/settings_helper.rb
@@ -1,11 +1,4 @@
 # frozen_string_literal: true
 
 module Admin::SettingsHelper
-  def site_upload_delete_hint(hint, var)
-    upload = SiteUpload.find_by(var: var.to_s)
-    return hint unless upload
-
-    link = link_to t('admin.site_uploads.delete'), admin_site_upload_path(upload), data: { method: :delete }
-    safe_join([hint, link], '<br/>'.html_safe)
-  end
 end
diff --git a/app/helpers/admin/trends/statuses_helper.rb b/app/helpers/admin/trends/statuses_helper.rb
new file mode 100644
index 000000000..214c1e2a6
--- /dev/null
+++ b/app/helpers/admin/trends/statuses_helper.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Admin::Trends::StatusesHelper
+  def one_line_preview(status)
+    text = begin
+      if status.local?
+        status.text.split("\n").first
+      else
+        Nokogiri::HTML(status.text).css('html > body > *').first&.text
+      end
+    end
+
+    return '' if text.blank?
+
+    prerender_custom_emojis(h(text), status.emojis)
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 34fc46615..4c20f1e14 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,9 +9,9 @@ module ApplicationHelper
 
   RTL_LOCALES = %i(
     ar
+    ckb
     fa
     he
-    ku
   ).freeze
 
   def friendly_number_to_human(number, **options)
@@ -19,8 +19,11 @@ module ApplicationHelper
     # is looked up from the locales definition, and rails-i18n comes with
     # values that don't seem to make much sense for many languages, so
     # override these values with a default of 3 digits of precision.
-    options[:precision] = 3
-    options[:strip_insignificant_zeros] = true
+    options = options.merge(
+      precision: 3,
+      strip_insignificant_zeros: true,
+      significant: true
+    )
 
     number_to_human(number, **options)
   end
@@ -50,15 +53,38 @@ module ApplicationHelper
   end
 
   def available_sign_up_path
-    if closed_registrations?
+    if closed_registrations? || omniauth_only?
       'https://joinmastodon.org/#getting-started'
     else
       new_user_registration_path
     end
   end
 
-  def open_deletion?
-    Setting.open_deletion
+  def omniauth_only?
+    ENV['OMNIAUTH_ONLY'] == 'true'
+  end
+
+  def link_to_login(name = nil, html_options = nil, &block)
+    target = new_user_session_path
+
+    html_options = name if block_given?
+
+    if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1
+      target = omniauth_authorize_path(:user, User.omniauth_providers[0])
+      html_options ||= {}
+      html_options[:method] = :post
+    end
+
+    if block_given?
+      link_to(target, html_options, &block)
+    else
+      link_to(name, target, html_options)
+    end
+  end
+
+  def provider_sign_in_link(provider)
+    label = Devise.omniauth_configs[provider]&.strategy&.display_name.presence || I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize)
+    link_to label, omniauth_authorize_path(:user, provider), class: "button button-#{provider}", method: :post
   end
 
   def locale_direction
@@ -69,11 +95,6 @@ module ApplicationHelper
     end
   end
 
-  def favicon_path
-    env_suffix = Rails.env.production? ? '' : '-dev'
-    "/favicon#{env_suffix}.ico"
-  end
-
   def title
     Rails.env.production? ? site_title : "#{site_title} (Dev)"
   end
@@ -103,7 +124,7 @@ module ApplicationHelper
     elsif status.private_visibility? || status.limited_visibility?
       fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
     elsif status.direct_visibility?
-      fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
+      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
     end
   end
 
@@ -117,8 +138,8 @@ module ApplicationHelper
     end
   end
 
-  def custom_emoji_tag(custom_emoji, animate = true)
-    if animate
+  def custom_emoji_tag(custom_emoji)
+    if prefers_autoplay?
       image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:")
     else
       image_tag(custom_emoji.image.url(:static), class: 'emojione custom-emoji', alt: ":#{custom_emoji.shortcode}", 'data-original' => full_asset_url(custom_emoji.image.url), 'data-static' => full_asset_url(custom_emoji.image.url(:static)))
@@ -168,15 +189,12 @@ module ApplicationHelper
 
   def quote_wrap(text, line_width: 80, break_sequence: "\n")
     text = word_wrap(text, line_width: line_width - 2, break_sequence: break_sequence)
-    text.split("\n").map { |line| '> ' + line }.join("\n")
+    text.split("\n").map { |line| "> #{line}" }.join("\n")
   end
 
   def render_initial_state
     state_params = {
-      settings: {
-        known_fediverse: Setting.show_known_fediverse_at_about_page,
-      },
-
+      settings: {},
       text: [params[:title], params[:text], params[:url]].compact.join(' '),
     }
 
@@ -185,7 +203,7 @@ module ApplicationHelper
     permit_visibilities.shift(permit_visibilities.index(default_privacy) + 1) if default_privacy.present?
     state_params[:visibility] = params[:visibility] if permit_visibilities.include? params[:visibility]
 
-    if user_signed_in?
+    if user_signed_in? && current_user.functional?
       state_params[:settings]          = state_params[:settings].merge(Web::Setting.find_by(user: current_user)&.data || {})
       state_params[:push_subscription] = current_account.user.web_push_subscription(current_session)
       state_params[:current_account]   = current_account
@@ -193,9 +211,37 @@ module ApplicationHelper
       state_params[:admin]             = Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, ''))
     end
 
+    if user_signed_in? && !current_user.functional?
+      state_params[:disabled_account] = current_account
+      state_params[:moved_to_account] = current_account.moved_to_account
+    end
+
+    if single_user_mode?
+      state_params[:owner] = Account.local.without_suspended.where('id > 0').first
+    end
+
     json = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(state_params), serializer: InitialStateSerializer).to_json
     # rubocop:disable Rails/OutputSafety
     content_tag(:script, json_escape(json).html_safe, id: 'initial-state', type: 'application/json')
     # rubocop:enable Rails/OutputSafety
   end
+
+  def grouped_scopes(scopes)
+    scope_parser      = ScopeParser.new
+    scope_transformer = ScopeTransformer.new
+
+    scopes.each_with_object({}) do |str, h|
+      scope = scope_transformer.apply(scope_parser.parse(str))
+
+      if h[scope.key]
+        h[scope.key].merge!(scope)
+      else
+        h[scope.key] = scope
+      end
+    end.values
+  end
+
+  def prerender_custom_emojis(html, custom_emojis, other_options = {})
+    EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
+  end
 end
diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
new file mode 100644
index 000000000..ad7702aea
--- /dev/null
+++ b/app/helpers/branding_helper.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module BrandingHelper
+  def logo_as_symbol(version = :icon)
+    case version
+    when :icon
+      _logo_as_symbol_icon
+    when :wordmark
+      _logo_as_symbol_wordmark
+    end
+  end
+
+  def _logo_as_symbol_wordmark
+    content_tag(:svg, tag(:use, href: '#logo-symbol-wordmark'), viewBox: '0 0 261 66', class: 'logo logo--wordmark')
+  end
+
+  def _logo_as_symbol_icon
+    content_tag(:svg, tag(:use, href: '#logo-symbol-icon'), viewBox: '0 0 79 79', class: 'logo logo--icon')
+  end
+
+  def render_logo
+    image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
+  end
+
+  def render_symbol(version = :icon)
+    path = begin
+      case version
+      when :icon
+        'logo-symbol-icon.svg'
+      when :wordmark
+        'logo-symbol-wordmark.svg'
+      end
+    end
+
+    render(file: Rails.root.join('app', 'javascript', 'images', path)).html_safe # rubocop:disable Rails/OutputSafety
+  end
+end
diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
new file mode 100644
index 000000000..08cfa9c6d
--- /dev/null
+++ b/app/helpers/context_helper.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module ContextHelper
+  NAMED_CONTEXT_MAP = {
+    activitystreams: 'https://www.w3.org/ns/activitystreams',
+    security: 'https://w3id.org/security/v1',
+  }.freeze
+
+  CONTEXT_EXTENSION_MAP = {
+    manually_approves_followers: { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers' },
+    sensitive: { 'sensitive' => 'as:sensitive' },
+    hashtag: { 'Hashtag' => 'as:Hashtag' },
+    moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } },
+    also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } },
+    emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' },
+    featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } },
+    property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' },
+    atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' },
+    conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' },
+    focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
+    blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' },
+    discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
+    voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
+    olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
+    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+  }.freeze
+
+  def full_context
+    serialized_context(NAMED_CONTEXT_MAP, CONTEXT_EXTENSION_MAP)
+  end
+
+  def serialized_context(named_contexts_map, context_extensions_map)
+    context_array = []
+
+    named_contexts     = named_contexts_map.keys
+    context_extensions = context_extensions_map.keys
+
+    named_contexts.each do |key|
+      context_array << NAMED_CONTEXT_MAP[key]
+    end
+
+    extensions = context_extensions.each_with_object({}) do |key, h|
+      h.merge!(CONTEXT_EXTENSION_MAP[key])
+    end
+
+    context_array << extensions unless extensions.empty?
+
+    if context_array.size == 1
+      context_array.first
+    else
+      context_array
+    end
+  end
+end
diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb
new file mode 100644
index 000000000..c70931489
--- /dev/null
+++ b/app/helpers/formatting_helper.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module FormattingHelper
+  def html_aware_format(text, local, options = {})
+    HtmlAwareFormatter.new(text, local, options).to_s
+  end
+
+  def linkify(text, options = {})
+    TextFormatter.new(text, options).to_s
+  end
+
+  def extract_status_plain_text(status)
+    PlainTextFormatter.new(status.text, status.local?).to_s
+  end
+  module_function :extract_status_plain_text
+
+  def status_content_format(status)
+    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+  end
+
+  def rss_status_content_format(status)
+    html = status_content_format(status)
+
+    before_html = begin
+      if status.spoiler_text?
+        tag.p do
+          tag.strong do
+            I18n.t('rss.content_warning', locale: available_locale_or_nil(status.language) || I18n.default_locale)
+          end
+
+          status.spoiler_text
+        end + tag.hr
+      end
+    end
+
+    after_html = begin
+      if status.preloadable_poll
+        tag.p do
+          safe_join(
+            status.preloadable_poll.options.map do |o|
+              tag.send(status.preloadable_poll.multiple? ? 'checkbox' : 'radio', o, disabled: true)
+            end,
+            tag.br
+          )
+        end
+      end
+    end
+
+    prerender_custom_emojis(
+      safe_join([before_html, html, after_html]),
+      status.emojis,
+      style: 'width: 1.1em; height: 1.1em; object-fit: contain; vertical-align: middle; margin: -.2ex .15em .2ex'
+    ).to_str
+  end
+
+  def account_bio_format(account)
+    html_aware_format(account.note, account.local?)
+  end
+
+  def account_field_value_format(field, with_rel_me: true)
+    html_aware_format(field.value, field.account.local?, with_rel_me: with_rel_me, with_domains: true, multiline: false)
+  end
+end
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index 4da68500a..f41104709 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -23,7 +23,7 @@ module HomeHelper
                   else
                     link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do
                       content_tag(:div, class: 'account__avatar-wrapper') do
-                        image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar')
+                        image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', width: 46, height: 46)
                       end +
                         content_tag(:span, class: 'display-name') do
                           content_tag(:bdi) do
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index 62eb50f78..102e4b132 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module JsonLdHelper
+  include ContextHelper
+
   def equals_or_includes?(haystack, needle)
     haystack.is_a?(Array) ? haystack.include?(needle) : haystack == needle
   end
@@ -13,6 +15,14 @@ module JsonLdHelper
     value.is_a?(Array) ? value.first : value
   end
 
+  def uri_from_bearcap(str)
+    if str&.start_with?('bear:')
+      Addressable::URI.parse(str).query_values['u']
+    else
+      str
+    end
+  end
+
   # The url attribute can be a string, an array of strings, or an array of objects.
   # The objects could include a mimeType. Not-included mimeType means it's text/html.
   def url_to_href(value, preferred_type = nil)
@@ -34,7 +44,13 @@ module JsonLdHelper
   end
 
   def as_array(value)
-    value.is_a?(Array) ? value : [value]
+    if value.nil?
+      []
+    elsif value.is_a?(Array)
+      value
+    else
+      [value]
+    end
   end
 
   def value_or_id(value)
@@ -46,7 +62,7 @@ module JsonLdHelper
   end
 
   def unsupported_uri_scheme?(uri)
-    !uri.start_with?('http://', 'https://')
+    uri.nil? || !uri.start_with?('http://', 'https://')
   end
 
   def invalid_origin?(url)
@@ -63,6 +79,84 @@ module JsonLdHelper
     graph.dump(:normalize)
   end
 
+  def compact(json)
+    compacted = JSON::LD::API.compact(json.without('signature'), full_context, documentLoader: method(:load_jsonld_context))
+    compacted['signature'] = json['signature']
+    compacted
+  end
+
+  # Patches a JSON-LD document to avoid compatibility issues on redistribution
+  #
+  # Since compacting a JSON-LD document against Mastodon's built-in vocabulary
+  # means other extension namespaces will be expanded, malformed JSON-LD
+  # attributes lost, and some values “unexpectedly” compacted this method
+  # patches the following likely sources of incompatibility:
+  # - 'https://www.w3.org/ns/activitystreams#Public' being compacted to
+  #   'as:Public' (for instance, pre-3.4.0 Mastodon does not understand
+  #   'as:Public')
+  # - single-item arrays being compacted to the item itself (`[foo]` being
+  #   compacted to `foo`)
+  #
+  # It is not always possible for `patch_for_forwarding!` to produce a document
+  # deemed safe for forwarding. Use `safe_for_forwarding?` to check the status
+  # of the output document.
+  #
+  # @param original [Hash] The original JSON-LD document used as reference
+  # @param compacted [Hash] The compacted JSON-LD document to be patched
+  # @return [void]
+  def patch_for_forwarding!(original, compacted)
+    original.without('@context', 'signature').each do |key, value|
+      next if value.nil? || !compacted.key?(key)
+
+      compacted_value = compacted[key]
+      if value.is_a?(Hash) && compacted_value.is_a?(Hash)
+        patch_for_forwarding!(value, compacted_value)
+      elsif value.is_a?(Array)
+        compacted_value = [compacted_value] unless compacted_value.is_a?(Array)
+        return if value.size != compacted_value.size
+
+        compacted[key] = value.zip(compacted_value).map do |v, vc|
+          if v.is_a?(Hash) && vc.is_a?(Hash)
+            patch_for_forwarding!(v, vc)
+            vc
+          elsif v == 'https://www.w3.org/ns/activitystreams#Public' && vc == 'as:Public'
+            v
+          else
+            vc
+          end
+        end
+      elsif value == 'https://www.w3.org/ns/activitystreams#Public' && compacted_value == 'as:Public'
+        compacted[key] = value
+      end
+    end
+  end
+
+  # Tests whether a JSON-LD compaction is deemed safe for redistribution,
+  # that is, if it doesn't change its meaning to consumers that do not actually
+  # handle JSON-LD, but rely on values being serialized in a certain way.
+  #
+  # See `patch_for_forwarding!` for details.
+  #
+  # @param original [Hash] The original JSON-LD document used as reference
+  # @param compacted [Hash] The compacted JSON-LD document to be patched
+  # @return [Boolean] Whether the patched document is deemed safe
+  def safe_for_forwarding?(original, compacted)
+    original.without('@context', 'signature').all? do |key, value|
+      compacted_value = compacted[key]
+      return false unless value.class == compacted_value.class
+
+      if value.is_a?(Hash)
+        safe_for_forwarding?(value, compacted_value)
+      elsif value.is_a?(Array)
+        value.zip(compacted_value).all? do |v, vc|
+          v.is_a?(Hash) ? (vc.is_a?(Hash) && safe_for_forwarding?(v, vc)) : v == vc
+        end
+      else
+        value == compacted_value
+      end
+    end
+  end
+
   def fetch_resource(uri, id, on_behalf_of = nil)
     unless id
       json = fetch_resource_without_id_validation(uri, on_behalf_of)
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 730724208..bb87dd596 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -1,94 +1,273 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/ModuleLength, Style/WordArray
 
 module LanguagesHelper
-  HUMAN_LOCALES = {
-    af: 'Afrikaans',
-    ar: 'العربية',
-    ast: 'Asturianu',
-    bg: 'Български',
-    bn: 'বাংলা',
-    br: 'Breton',
-    ca: 'Català',
-    co: 'Corsu',
-    cs: 'Čeština',
-    cy: 'Cymraeg',
-    da: 'Dansk',
-    de: 'Deutsch',
-    el: 'Ελληνικά',
-    en: 'English',
-    eo: 'Esperanto',
+  ISO_639_1 = {
+    aa: ['Afar', 'Afaraf'].freeze,
+    ab: ['Abkhaz', 'аҧсуа бызшәа'].freeze,
+    ae: ['Avestan', 'avesta'].freeze,
+    af: ['Afrikaans', 'Afrikaans'].freeze,
+    ak: ['Akan', 'Akan'].freeze,
+    am: ['Amharic', 'አማርኛ'].freeze,
+    an: ['Aragonese', 'aragonés'].freeze,
+    ar: ['Arabic', 'اللغة العربية'].freeze,
+    as: ['Assamese', 'অসমীয়া'].freeze,
+    av: ['Avaric', 'авар мацӀ'].freeze,
+    ay: ['Aymara', 'aymar aru'].freeze,
+    az: ['Azerbaijani', 'azərbaycan dili'].freeze,
+    ba: ['Bashkir', 'башҡорт теле'].freeze,
+    be: ['Belarusian', 'беларуская мова'].freeze,
+    bg: ['Bulgarian', 'български език'].freeze,
+    bh: ['Bihari', 'भोजपुरी'].freeze,
+    bi: ['Bislama', 'Bislama'].freeze,
+    bm: ['Bambara', 'bamanankan'].freeze,
+    bn: ['Bengali', 'বাংলা'].freeze,
+    bo: ['Tibetan', 'བོད་ཡིག'].freeze,
+    br: ['Breton', 'brezhoneg'].freeze,
+    bs: ['Bosnian', 'bosanski jezik'].freeze,
+    ca: ['Catalan', 'Català'].freeze,
+    ce: ['Chechen', 'нохчийн мотт'].freeze,
+    ch: ['Chamorro', 'Chamoru'].freeze,
+    co: ['Corsican', 'corsu'].freeze,
+    cr: ['Cree', 'ᓀᐦᐃᔭᐍᐏᐣ'].freeze,
+    cs: ['Czech', 'čeština'].freeze,
+    cu: ['Old Church Slavonic', 'ѩзыкъ словѣньскъ'].freeze,
+    cv: ['Chuvash', 'чӑваш чӗлхи'].freeze,
+    cy: ['Welsh', 'Cymraeg'].freeze,
+    da: ['Danish', 'dansk'].freeze,
+    de: ['German', 'Deutsch'].freeze,
+    dv: ['Divehi', 'Dhivehi'].freeze,
+    dz: ['Dzongkha', 'རྫོང་ཁ'].freeze,
+    ee: ['Ewe', 'Eʋegbe'].freeze,
+    el: ['Greek', 'Ελληνικά'].freeze,
+    en: ['English', 'English'].freeze,
+    eo: ['Esperanto', 'Esperanto'].freeze,
+    es: ['Spanish', 'Español'].freeze,
+    et: ['Estonian', 'eesti'].freeze,
+    eu: ['Basque', 'euskara'].freeze,
+    fa: ['Persian', 'فارسی'].freeze,
+    ff: ['Fula', 'Fulfulde'].freeze,
+    fi: ['Finnish', 'suomi'].freeze,
+    fj: ['Fijian', 'Vakaviti'].freeze,
+    fo: ['Faroese', 'føroyskt'].freeze,
+    fr: ['French', 'Français'].freeze,
+    fy: ['Western Frisian', 'Frysk'].freeze,
+    ga: ['Irish', 'Gaeilge'].freeze,
+    gd: ['Scottish Gaelic', 'Gàidhlig'].freeze,
+    gl: ['Galician', 'galego'].freeze,
+    gu: ['Gujarati', 'ગુજરાતી'].freeze,
+    gv: ['Manx', 'Gaelg'].freeze,
+    ha: ['Hausa', 'هَوُسَ'].freeze,
+    he: ['Hebrew', 'עברית'].freeze,
+    hi: ['Hindi', 'हिन्दी'].freeze,
+    ho: ['Hiri Motu', 'Hiri Motu'].freeze,
+    hr: ['Croatian', 'Hrvatski'].freeze,
+    ht: ['Haitian', 'Kreyòl ayisyen'].freeze,
+    hu: ['Hungarian', 'magyar'].freeze,
+    hy: ['Armenian', 'Հայերեն'].freeze,
+    hz: ['Herero', 'Otjiherero'].freeze,
+    ia: ['Interlingua', 'Interlingua'].freeze,
+    id: ['Indonesian', 'Bahasa Indonesia'].freeze,
+    ie: ['Interlingue', 'Interlingue'].freeze,
+    ig: ['Igbo', 'Asụsụ Igbo'].freeze,
+    ii: ['Nuosu', 'ꆈꌠ꒿ Nuosuhxop'].freeze,
+    ik: ['Inupiaq', 'Iñupiaq'].freeze,
+    io: ['Ido', 'Ido'].freeze,
+    is: ['Icelandic', 'Íslenska'].freeze,
+    it: ['Italian', 'Italiano'].freeze,
+    iu: ['Inuktitut', 'ᐃᓄᒃᑎᑐᑦ'].freeze,
+    ja: ['Japanese', '日本語'].freeze,
+    jv: ['Javanese', 'basa Jawa'].freeze,
+    ka: ['Georgian', 'ქართული'].freeze,
+    kg: ['Kongo', 'Kikongo'].freeze,
+    ki: ['Kikuyu', 'Gĩkũyũ'].freeze,
+    kj: ['Kwanyama', 'Kuanyama'].freeze,
+    kk: ['Kazakh', 'қазақ тілі'].freeze,
+    kl: ['Kalaallisut', 'kalaallisut'].freeze,
+    km: ['Khmer', 'ខេមរភាសា'].freeze,
+    kn: ['Kannada', 'ಕನ್ನಡ'].freeze,
+    ko: ['Korean', '한국어'].freeze,
+    kr: ['Kanuri', 'Kanuri'].freeze,
+    ks: ['Kashmiri', 'कश्मीरी'].freeze,
+    ku: ['Kurmanji (Kurdish)', 'Kurmancî'].freeze,
+    kv: ['Komi', 'коми кыв'].freeze,
+    kw: ['Cornish', 'Kernewek'].freeze,
+    ky: ['Kyrgyz', 'Кыргызча'].freeze,
+    la: ['Latin', 'latine'].freeze,
+    lb: ['Luxembourgish', 'Lëtzebuergesch'].freeze,
+    lg: ['Ganda', 'Luganda'].freeze,
+    li: ['Limburgish', 'Limburgs'].freeze,
+    ln: ['Lingala', 'Lingála'].freeze,
+    lo: ['Lao', 'ລາວ'].freeze,
+    lt: ['Lithuanian', 'lietuvių kalba'].freeze,
+    lu: ['Luba-Katanga', 'Tshiluba'].freeze,
+    lv: ['Latvian', 'latviešu valoda'].freeze,
+    mg: ['Malagasy', 'fiteny malagasy'].freeze,
+    mh: ['Marshallese', 'Kajin M̧ajeļ'].freeze,
+    mi: ['Māori', 'te reo Māori'].freeze,
+    mk: ['Macedonian', 'македонски јазик'].freeze,
+    ml: ['Malayalam', 'മലയാളം'].freeze,
+    mn: ['Mongolian', 'Монгол хэл'].freeze,
+    mr: ['Marathi', 'मराठी'].freeze,
+    ms: ['Malay', 'Bahasa Melayu'].freeze,
+    mt: ['Maltese', 'Malti'].freeze,
+    my: ['Burmese', 'ဗမာစာ'].freeze,
+    na: ['Nauru', 'Ekakairũ Naoero'].freeze,
+    nb: ['Norwegian Bokmål', 'Norsk bokmål'].freeze,
+    nd: ['Northern Ndebele', 'isiNdebele'].freeze,
+    ne: ['Nepali', 'नेपाली'].freeze,
+    ng: ['Ndonga', 'Owambo'].freeze,
+    nl: ['Dutch', 'Nederlands'].freeze,
+    nn: ['Norwegian Nynorsk', 'Norsk Nynorsk'].freeze,
+    no: ['Norwegian', 'Norsk'].freeze,
+    nr: ['Southern Ndebele', 'isiNdebele'].freeze,
+    nv: ['Navajo', 'Diné bizaad'].freeze,
+    ny: ['Chichewa', 'chiCheŵa'].freeze,
+    oc: ['Occitan', 'occitan'].freeze,
+    oj: ['Ojibwe', 'ᐊᓂᔑᓈᐯᒧᐎᓐ'].freeze,
+    om: ['Oromo', 'Afaan Oromoo'].freeze,
+    or: ['Oriya', 'ଓଡ଼ିଆ'].freeze,
+    os: ['Ossetian', 'ирон æвзаг'].freeze,
+    pa: ['Panjabi', 'ਪੰਜਾਬੀ'].freeze,
+    pi: ['Pāli', 'पाऴि'].freeze,
+    pl: ['Polish', 'Polski'].freeze,
+    ps: ['Pashto', 'پښتو'].freeze,
+    pt: ['Portuguese', 'Português'].freeze,
+    qu: ['Quechua', 'Runa Simi'].freeze,
+    rm: ['Romansh', 'rumantsch grischun'].freeze,
+    rn: ['Kirundi', 'Ikirundi'].freeze,
+    ro: ['Romanian', 'Română'].freeze,
+    ru: ['Russian', 'Русский'].freeze,
+    rw: ['Kinyarwanda', 'Ikinyarwanda'].freeze,
+    sa: ['Sanskrit', 'संस्कृतम्'].freeze,
+    sc: ['Sardinian', 'sardu'].freeze,
+    sd: ['Sindhi', 'सिन्धी'].freeze,
+    se: ['Northern Sami', 'Davvisámegiella'].freeze,
+    sg: ['Sango', 'yângâ tî sängö'].freeze,
+    si: ['Sinhala', 'සිංහල'].freeze,
+    sk: ['Slovak', 'slovenčina'].freeze,
+    sl: ['Slovenian', 'slovenščina'].freeze,
+    sn: ['Shona', 'chiShona'].freeze,
+    so: ['Somali', 'Soomaaliga'].freeze,
+    sq: ['Albanian', 'Shqip'].freeze,
+    sr: ['Serbian', 'српски језик'].freeze,
+    ss: ['Swati', 'SiSwati'].freeze,
+    st: ['Southern Sotho', 'Sesotho'].freeze,
+    su: ['Sundanese', 'Basa Sunda'].freeze,
+    sv: ['Swedish', 'Svenska'].freeze,
+    sw: ['Swahili', 'Kiswahili'].freeze,
+    ta: ['Tamil', 'தமிழ்'].freeze,
+    te: ['Telugu', 'తెలుగు'].freeze,
+    tg: ['Tajik', 'тоҷикӣ'].freeze,
+    th: ['Thai', 'ไทย'].freeze,
+    ti: ['Tigrinya', 'ትግርኛ'].freeze,
+    tk: ['Turkmen', 'Türkmen'].freeze,
+    tl: ['Tagalog', 'Wikang Tagalog'].freeze,
+    tn: ['Tswana', 'Setswana'].freeze,
+    to: ['Tonga', 'faka Tonga'].freeze,
+    tr: ['Turkish', 'Türkçe'].freeze,
+    ts: ['Tsonga', 'Xitsonga'].freeze,
+    tt: ['Tatar', 'татар теле'].freeze,
+    tw: ['Twi', 'Twi'].freeze,
+    ty: ['Tahitian', 'Reo Tahiti'].freeze,
+    ug: ['Uyghur', 'ئۇيغۇرچە‎'].freeze,
+    uk: ['Ukrainian', 'Українська'].freeze,
+    ur: ['Urdu', 'اردو'].freeze,
+    uz: ['Uzbek', 'Ўзбек'].freeze,
+    ve: ['Venda', 'Tshivenḓa'].freeze,
+    vi: ['Vietnamese', 'Tiếng Việt'].freeze,
+    vo: ['Volapük', 'Volapük'].freeze,
+    wa: ['Walloon', 'walon'].freeze,
+    wo: ['Wolof', 'Wollof'].freeze,
+    xh: ['Xhosa', 'isiXhosa'].freeze,
+    yi: ['Yiddish', 'ייִדיש'].freeze,
+    yo: ['Yoruba', 'Yorùbá'].freeze,
+    za: ['Zhuang', 'Saɯ cueŋƅ'].freeze,
+    zh: ['Chinese', '中文'].freeze,
+    zu: ['Zulu', 'isiZulu'].freeze,
+  }.freeze
+
+  ISO_639_3 = {
+    ast: ['Asturian', 'Asturianu'].freeze,
+    ckb: ['Sorani (Kurdish)', 'سۆرانی'].freeze,
+    cnr: ['Montenegrin', 'crnogorski'].freeze,
+    jbo: ['Lojban', 'la .lojban.'].freeze,
+    kab: ['Kabyle', 'Taqbaylit'].freeze,
+    kmr: ['Kurmanji (Kurdish)', 'Kurmancî'].freeze,
+    ldn: ['Láadan', 'Láadan'].freeze,
+    lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze,
+    sco: ['Scots', 'Scots'].freeze,
+    sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,
+    smj: ['Lule Sami', 'Julevsámegiella'].freeze,
+    tok: ['Toki Pona', 'toki pona'].freeze,
+    zba: ['Balaibalan', 'باليبلن'].freeze,
+    zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze,
+  }.freeze
+
+  SUPPORTED_LOCALES = {}.merge(ISO_639_1).merge(ISO_639_3).freeze
+
+  # For ISO-639-1 and ISO-639-3 language codes, we have their official
+  # names, but for some translations, we need the names of the
+  # regional variants specifically
+  REGIONAL_LOCALE_NAMES = {
     'es-AR': 'Español (Argentina)',
     'es-MX': 'Español (México)',
-    es: 'Español',
-    et: 'Eesti',
-    eu: 'Euskara',
-    fa: 'فارسی',
-    fi: 'Suomi',
-    fr: 'Français',
-    ga: 'Gaeilge',
-    gd: 'Gàidhlig',
-    gl: 'Galego',
-    he: 'עברית',
-    hi: 'हिन्दी',
-    hr: 'Hrvatski',
-    hu: 'Magyar',
-    hy: 'Հայերեն',
-    id: 'Bahasa Indonesia',
-    io: 'Ido',
-    is: 'Íslenska',
-    it: 'Italiano',
-    ja: '日本語',
-    ka: 'ქართული',
-    kab: 'Taqbaylit',
-    kk: 'Қазақша',
-    kmr: 'Kurmancî',
-    kn: 'ಕನ್ನಡ',
-    ko: '한국어',
-    ku: 'سۆرانی',
-    lt: 'Lietuvių',
-    lv: 'Latviešu',
-    mk: 'Македонски',
-    ml: 'മലയാളം',
-    mr: 'मराठी',
-    ms: 'Bahasa Melayu',
-    nl: 'Nederlands',
-    nn: 'Nynorsk',
-    no: 'Norsk',
-    oc: 'Occitan',
-    pl: 'Polski',
     'pt-BR': 'Português (Brasil)',
     'pt-PT': 'Português (Portugal)',
-    pt: 'Português',
-    ro: 'Română',
-    ru: 'Русский',
-    sa: 'संस्कृतम्',
-    sc: 'Sardu',
-    si: 'සිංහල',
-    sk: 'Slovenčina',
-    sl: 'Slovenščina',
-    sq: 'Shqip',
     'sr-Latn': 'Srpski (latinica)',
-    sr: 'Српски',
-    sv: 'Svenska',
-    ta: 'தமிழ்',
-    te: 'తెలుగు',
-    th: 'ไทย',
-    tr: 'Türkçe',
-    uk: 'Українська',
-    ur: 'اُردُو',
-    vi: 'Tiếng Việt',
-    zgh: 'ⵜⴰⵎⴰⵣⵉⵖⵜ',
     'zh-CN': '简体中文',
     'zh-HK': '繁體中文（香港）',
     'zh-TW': '繁體中文（臺灣）',
-    zh: '中文',
   }.freeze
 
-  def human_locale(locale)
-    if locale == 'und'
+  def native_locale_name(locale)
+    if locale.blank? || locale == 'und'
       I18n.t('generic.none')
+    elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
+      supported_locale[1]
+    elsif (regional_locale = REGIONAL_LOCALE_NAMES[locale.to_sym])
+      regional_locale
     else
-      HUMAN_LOCALES[locale.to_sym] || locale
+      locale
     end
   end
+
+  def standard_locale_name(locale)
+    if locale.blank?
+      I18n.t('generic.none')
+    elsif (supported_locale = SUPPORTED_LOCALES[locale.to_sym])
+      supported_locale[0]
+    else
+      locale
+    end
+  end
+
+  def valid_locale_or_nil(str)
+    return if str.blank?
+
+    code, = str.to_s.split(/[_-]/) # Strip out the region from e.g. en_US or ja-JP
+
+    return unless valid_locale?(code)
+
+    code
+  end
+
+  def valid_locale_cascade(*arr)
+    arr.each do |str|
+      locale = valid_locale_or_nil(str)
+      return locale if locale.present?
+    end
+
+    nil
+  end
+
+  def valid_locale?(locale)
+    locale.present? && SUPPORTED_LOCALES.key?(locale.to_sym)
+  end
+
+  def available_locale_or_nil(locale_name)
+    locale_name.to_sym if locale_name.present? && I18n.available_locales.include?(locale_name.to_sym)
+  end
 end
+
+# rubocop:enable Metrics/ModuleLength, Style/WordArray
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index fb24a1b28..0d5a8505a 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -2,6 +2,7 @@
 
 module RoutingHelper
   extend ActiveSupport::Concern
+
   include Rails.application.routes.url_helpers
   include ActionView::Helpers::AssetTagHelper
   include Webpacker::Helper
@@ -15,15 +16,17 @@ module RoutingHelper
   def full_asset_url(source, **options)
     source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
 
-    URI.join(root_url, source).to_s
+    URI.join(asset_host, source).to_s
+  end
+
+  def asset_host
+    Rails.configuration.action_controller.asset_host || root_url
   end
 
   def full_pack_url(source, **options)
     full_asset_url(asset_pack_path(source, **options))
   end
 
-  private
-
   def use_storage?
     Rails.configuration.x.use_s3 || Rails.configuration.x.use_swift
   end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 23739d1cd..3d5592867 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -2,7 +2,7 @@
 
 module SettingsHelper
   def filterable_languages
-    LanguageDetector.instance.language_names.select(&LanguagesHelper::HUMAN_LOCALES.method(:key?))
+    LanguagesHelper::SUPPORTED_LOCALES.keys
   end
 
   def hash_to_object(hash)
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index 25f079e9d..d1e3fddaf 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -21,7 +21,7 @@ module StatusesHelper
   def media_summary(status)
     attachments = { image: 0, video: 0, audio: 0 }
 
-    status.media_attachments.each do |media|
+    status.ordered_media_attachments.each do |media|
       if media.video?
         attachments[:video] += 1
       elsif media.audio?
@@ -101,7 +101,7 @@ module StatusesHelper
     when 'private'
       fa_icon 'lock fw'
     when 'direct'
-      fa_icon 'envelope fw'
+      fa_icon 'at fw'
     end
   end
 
@@ -113,26 +113,12 @@ module StatusesHelper
     end
   end
 
-  private
-
-  def simplified_text(text)
-    text.dup.tap do |new_text|
-      URI.extract(new_text).each do |url|
-        new_text.gsub!(url, '')
-      end
-
-      new_text.gsub!(Account::MENTION_RE, '')
-      new_text.gsub!(Tag::HASHTAG_RE, '')
-      new_text.gsub!(/\s+/, '')
-    end
-  end
-
   def embedded_view?
     params[:controller] == EMBEDDED_CONTROLLER && params[:action] == EMBEDDED_ACTION
   end
 
   def render_video_component(status, **options)
-    video = status.media_attachments.first
+    video = status.ordered_media_attachments.first
 
     meta = video.file.meta || {}
 
@@ -150,12 +136,12 @@ module StatusesHelper
     }.merge(**options)
 
     react_component :video, component_params do
-      render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
     end
   end
 
   def render_audio_component(status, **options)
-    audio = status.media_attachments.first
+    audio = status.ordered_media_attachments.first
 
     meta = audio.file.meta || {}
 
@@ -170,7 +156,7 @@ module StatusesHelper
     }.merge(**options)
 
     react_component :audio, component_params do
-      render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
     end
   end
 
@@ -178,11 +164,11 @@ module StatusesHelper
     component_params = {
       sensitive: sensitized?(status, current_account),
       autoplay: prefers_autoplay?,
-      media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
+      media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
     }.merge(**options)
 
     react_component :media_gallery, component_params do
-      render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
+      render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
     end
   end
 
diff --git a/app/javascript/fonts/montserrat/Montserrat-Medium.ttf b/app/javascript/fonts/montserrat/Montserrat-Medium.ttf
deleted file mode 100644
index 88d70b89c..000000000
Binary files a/app/javascript/fonts/montserrat/Montserrat-Medium.ttf and /dev/null differ
diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.ttf b/app/javascript/fonts/montserrat/Montserrat-Regular.ttf
deleted file mode 100644
index 29ca85d4a..000000000
Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.ttf and /dev/null differ
diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.woff b/app/javascript/fonts/montserrat/Montserrat-Regular.woff
deleted file mode 100644
index af3b5ec44..000000000
Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.woff and /dev/null differ
diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.woff2 b/app/javascript/fonts/montserrat/Montserrat-Regular.woff2
deleted file mode 100644
index 3d75434dd..000000000
Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.woff2 and /dev/null differ
diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png
new file mode 100644
index 000000000..698fb4a26
Binary files /dev/null and b/app/javascript/icons/android-chrome-144x144.png differ
diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png
new file mode 100644
index 000000000..2b6b63264
Binary files /dev/null and b/app/javascript/icons/android-chrome-192x192.png differ
diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png
new file mode 100644
index 000000000..51e3849a2
Binary files /dev/null and b/app/javascript/icons/android-chrome-256x256.png differ
diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png
new file mode 100644
index 000000000..925f69c4f
Binary files /dev/null and b/app/javascript/icons/android-chrome-36x36.png differ
diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png
new file mode 100644
index 000000000..9d256a83c
Binary files /dev/null and b/app/javascript/icons/android-chrome-384x384.png differ
diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png
new file mode 100644
index 000000000..bcfe7475d
Binary files /dev/null and b/app/javascript/icons/android-chrome-48x48.png differ
diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png
new file mode 100644
index 000000000..bffacfb69
Binary files /dev/null and b/app/javascript/icons/android-chrome-512x512.png differ
diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png
new file mode 100644
index 000000000..16679d573
Binary files /dev/null and b/app/javascript/icons/android-chrome-72x72.png differ
diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png
new file mode 100644
index 000000000..9ade87cf3
Binary files /dev/null and b/app/javascript/icons/android-chrome-96x96.png differ
diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png
new file mode 100644
index 000000000..8ec371eb2
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-1024x1024.png differ
diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png
new file mode 100644
index 000000000..e1563f51e
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-114x114.png differ
diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png
new file mode 100644
index 000000000..e9a5f5b0e
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-120x120.png differ
diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png
new file mode 100644
index 000000000..698fb4a26
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-144x144.png differ
diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png
new file mode 100644
index 000000000..0cc93cc28
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-152x152.png differ
diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png
new file mode 100644
index 000000000..9bbbf5312
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-167x167.png differ
diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png
new file mode 100644
index 000000000..329b803b9
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-180x180.png differ
diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png
new file mode 100644
index 000000000..e00e142c6
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-57x57.png differ
diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png
new file mode 100644
index 000000000..011285b56
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-60x60.png differ
diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png
new file mode 100644
index 000000000..16679d573
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-72x72.png differ
diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png
new file mode 100644
index 000000000..83c874887
Binary files /dev/null and b/app/javascript/icons/apple-touch-icon-76x76.png differ
diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png
new file mode 100644
index 000000000..eed8e0035
Binary files /dev/null and b/app/javascript/icons/favicon-16x16.png differ
diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png
new file mode 100644
index 000000000..9165746bc
Binary files /dev/null and b/app/javascript/icons/favicon-32x32.png differ
diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png
new file mode 100644
index 000000000..259676c0a
Binary files /dev/null and b/app/javascript/icons/favicon-48x48.png differ
diff --git a/app/javascript/images/app-icon.svg b/app/javascript/images/app-icon.svg
new file mode 100644
index 000000000..1035bd076
--- /dev/null
+++ b/app/javascript/images/app-icon.svg
@@ -0,0 +1,28 @@
+<svg width="130" height="130" viewBox="0 0 121 130" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="130" height="130" fill="url(#paint0_linear_2_2)" x="-4.5"/>
+<g filter="url(#filter0_di_2_2)">
+<path d="M95.7135 43.6043C94.6199 35.5459 87.5351 29.1953 79.1366 27.9647C77.7196 27.7568 72.351 27 59.9148 27H59.822C47.3824 27 44.7135 27.7568 43.2966 27.9647C35.1319 29.1612 27.6757 34.8675 25.8667 43.0214C24.9966 47.0369 24.9037 51.4888 25.0654 55.5726C25.2958 61.4289 25.3405 67.275 25.877 73.1075C26.2479 76.9817 26.895 80.8251 27.8133 84.6088C29.5329 91.5968 36.4938 97.4122 43.3138 99.7848C50.6155 102.259 58.468 102.67 65.9919 100.971C66.8196 100.78 67.6381 100.559 68.4475 100.306C70.2737 99.7302 72.4164 99.086 73.9915 97.9542C74.0131 97.9384 74.0308 97.9178 74.0433 97.8942C74.0558 97.8706 74.0628 97.8445 74.0637 97.8179V92.1661C74.0634 92.1412 74.0574 92.1167 74.0462 92.0944C74.035 92.0721 74.0189 92.0525 73.9992 92.0371C73.9794 92.0218 73.9564 92.011 73.9318 92.0056C73.9073 92.0002 73.8819 92.0003 73.8574 92.0059C69.0369 93.1472 64.0971 93.7193 59.141 93.7103C50.6118 93.7103 48.3178 89.6981 47.6609 88.0278C47.1329 86.5842 46.7976 85.0784 46.6636 83.5486C46.6622 83.5229 46.667 83.4973 46.6775 83.4738C46.688 83.4502 46.7039 83.4295 46.724 83.4132C46.7441 83.397 46.7678 83.3856 46.7931 83.3801C46.8185 83.3746 46.8448 83.3751 46.8699 83.3816C51.6101 84.5151 56.4693 85.0873 61.3455 85.086C62.5183 85.086 63.6876 85.086 64.8604 85.0553C69.7647 84.919 74.9339 84.6701 79.7591 83.7361C79.8794 83.7123 79.9998 83.6918 80.103 83.6611C87.7139 82.2124 94.9569 77.665 95.6929 66.1501C95.7204 65.6967 95.7892 61.4016 95.7892 60.9312C95.7926 59.3325 96.3085 49.5901 95.7135 43.6043ZM83.9996 72.3371H75.9966V52.9069C75.9966 48.8163 74.277 46.7302 70.7793 46.7302C66.9343 46.7302 65.0083 49.1981 65.0083 54.0727V64.7082H57.0534V54.0727C57.0534 49.1981 55.124 46.7302 51.279 46.7302C47.8019 46.7302 46.0651 48.8163 46.0617 52.9069V72.3371H38.0656V52.3172C38.0656 48.2266 39.1191 44.9769 41.2262 42.568C43.3998 40.1648 46.2509 38.9308 49.7898 38.9308C53.8859 38.9308 56.9812 40.492 59.0447 43.6111L61.036 46.9245L63.0308 43.6111C65.0943 40.492 68.1896 38.9308 72.2788 38.9308C75.8143 38.9308 78.6654 40.1648 80.8459 42.568C82.9529 44.9746 84.0065 48.2243 84.0065 52.3172L83.9996 72.3371Z" fill="#FBFBFB" fill-opacity="0.97"/>
+</g>
+<defs>
+<filter id="filter0_di_2_2" x="21" y="27" width="79" height="83" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.261224 0 0 0 0 0.16597 0 0 0 0 0.662652 0 0 0 0.4 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_2"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_2_2" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.337255 0 0 0 0 0.227451 0 0 0 0 0.8 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="shape" result="effect2_innerShadow_2_2"/>
+</filter>
+<linearGradient id="paint0_linear_2_2" x1="61" y1="130" x2="61" y2="-91.5" gradientUnits="userSpaceOnUse">
+<stop offset="0.0755157" stop-color="#563ACC"/>
+<stop offset="0.520094" stop-color="#6364FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/app/javascript/images/elephant-fren.png b/app/javascript/images/elephant-fren.png
deleted file mode 100644
index 38b1e3cba..000000000
Binary files a/app/javascript/images/elephant-fren.png and /dev/null differ
diff --git a/app/javascript/images/icon_cached.svg b/app/javascript/images/icon_cached.svg
deleted file mode 100644
index 1087c4350..000000000
--- a/app/javascript/images/icon_cached.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="2048" height="1792" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1344 1504q0 13-9.5 22.5t-22.5 9.5h-960q-8 0-13.5-2t-9-7-5.5-8-3-11.5-1-11.5v-600h-192q-26 0-45-19t-19-45q0-24 15-41l320-384q19-22 49-22t49 22l320 384q15 17 15 41 0 26-19 45t-45 19h-192v384h576q16 0 25 11l160 192q7 10 7 21zm640-416q0 24-15 41l-320 384q-20 23-49 23t-49-23l-320-384q-15-17-15-41 0-26 19-45t45-19h192v-384h-576q-16 0-25-12l-160-192q-7-9-7-20 0-13 9.5-22.5t22.5-9.5h960q8 0 13.5 2t9 7 5.5 8 3 11.5 1 11.5v600h192q26 0 45 19t19 45z" fill="#fff"/></svg>
diff --git a/app/javascript/images/icon_done.svg b/app/javascript/images/icon_done.svg
deleted file mode 100644
index 446af14d9..000000000
--- a/app/javascript/images/icon_done.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_email.svg b/app/javascript/images/icon_email.svg
deleted file mode 100644
index 6d0ad9d9b..000000000
--- a/app/javascript/images/icon_email.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_file_download.svg b/app/javascript/images/icon_file_download.svg
deleted file mode 100644
index 53e97e4f8..000000000
--- a/app/javascript/images/icon_file_download.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_flag.svg b/app/javascript/images/icon_flag.svg
deleted file mode 100644
index 3939c9d2b..000000000
--- a/app/javascript/images/icon_flag.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <path d="M0 0h24v24H0z" fill="none"/>
-  <path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/>
-</svg>
diff --git a/app/javascript/images/icon_grade.svg b/app/javascript/images/icon_grade.svg
deleted file mode 100644
index f48b46889..000000000
--- a/app/javascript/images/icon_grade.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_lock_open.svg b/app/javascript/images/icon_lock_open.svg
deleted file mode 100644
index 3288b46d6..000000000
--- a/app/javascript/images/icon_lock_open.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_person_add.svg b/app/javascript/images/icon_person_add.svg
deleted file mode 100644
index 068b8ae7c..000000000
--- a/app/javascript/images/icon_person_add.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icon_reply.svg b/app/javascript/images/icon_reply.svg
deleted file mode 100644
index cf6a09abc..000000000
--- a/app/javascript/images/icon_reply.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10 9V5l-7 7 7 7v-4.1c5 0 8.5 1.6 11 5.1-1-5-4-10-11-11z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
diff --git a/app/javascript/images/icons/icon_cached.svg b/app/javascript/images/icons/icon_cached.svg
new file mode 100644
index 000000000..d938e9bad
--- /dev/null
+++ b/app/javascript/images/icons/icon_cached.svg
@@ -0,0 +1 @@
+<svg width="512" height="512" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg" fill="#fff"><path d="M1344 1504q0 13-9.5 22.5t-22.5 9.5h-960q-8 0-13.5-2t-9-7-5.5-8-3-11.5-1-11.5v-600h-192q-26 0-45-19t-19-45q0-24 15-41l320-384q19-22 49-22t49 22l320 384q15 17 15 41 0 26-19 45t-45 19h-192v384h576q16 0 25 11l160 192q7 10 7 21zm640-416q0 24-15 41l-320 384q-20 23-49 23t-49-23l-320-384q-15-17-15-41 0-26 19-45t45-19h192v-384h-576q-16 0-25-12l-160-192q-7-9-7-20 0-13 9.5-22.5t22.5-9.5h960q8 0 13.5 2t9 7 5.5 8 3 11.5 1 11.5v600h192q26 0 45 19t19 45z"/></svg>
diff --git a/app/javascript/images/icons/icon_done.svg b/app/javascript/images/icons/icon_done.svg
new file mode 100644
index 000000000..a35ab87a1
--- /dev/null
+++ b/app/javascript/images/icons/icon_done.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"/></svg>
diff --git a/app/javascript/images/icons/icon_email.svg b/app/javascript/images/icons/icon_email.svg
new file mode 100644
index 000000000..0215b6f3a
--- /dev/null
+++ b/app/javascript/images/icons/icon_email.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
diff --git a/app/javascript/images/icons/icon_file_download.svg b/app/javascript/images/icons/icon_file_download.svg
new file mode 100644
index 000000000..dc6d6bce3
--- /dev/null
+++ b/app/javascript/images/icons/icon_file_download.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
diff --git a/app/javascript/images/icons/icon_flag.svg b/app/javascript/images/icons/icon_flag.svg
new file mode 100644
index 000000000..fe07808fa
--- /dev/null
+++ b/app/javascript/images/icons/icon_flag.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/></svg>
diff --git a/app/javascript/images/icons/icon_grade.svg b/app/javascript/images/icons/icon_grade.svg
new file mode 100644
index 000000000..f8dd93864
--- /dev/null
+++ b/app/javascript/images/icons/icon_grade.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
diff --git a/app/javascript/images/icons/icon_lock_open.svg b/app/javascript/images/icons/icon_lock_open.svg
new file mode 100644
index 000000000..12f559beb
--- /dev/null
+++ b/app/javascript/images/icons/icon_lock_open.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z"/></svg>
diff --git a/app/javascript/images/icons/icon_person_add.svg b/app/javascript/images/icons/icon_person_add.svg
new file mode 100644
index 000000000..370536333
--- /dev/null
+++ b/app/javascript/images/icons/icon_person_add.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>
diff --git a/app/javascript/images/icons/icon_reply.svg b/app/javascript/images/icons/icon_reply.svg
new file mode 100644
index 000000000..9f99e4cbf
--- /dev/null
+++ b/app/javascript/images/icons/icon_reply.svg
@@ -0,0 +1 @@
+<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10 9V5l-7 7 7 7v-4.1c5 0 8.5 1.6 11 5.1-1-5-4-10-11-11z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
diff --git a/app/javascript/images/logo-symbol-icon.svg b/app/javascript/images/logo-symbol-icon.svg
new file mode 100644
index 000000000..c4c14f098
--- /dev/null
+++ b/app/javascript/images/logo-symbol-icon.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="79" height="79" viewBox="0 0 79 75"><symbol id="logo-symbol-icon"><path d="M74.7135 16.6043C73.6199 8.54587 66.5351 2.19527 58.1366 0.964691C56.7196 0.756754 51.351 0 38.9148 0H38.822C26.3824 0 23.7135 0.756754 22.2966 0.964691C14.1319 2.16118 6.67571 7.86752 4.86669 16.0214C3.99657 20.0369 3.90371 24.4888 4.06535 28.5726C4.29578 34.4289 4.34049 40.275 4.877 46.1075C5.24791 49.9817 5.89495 53.8251 6.81328 57.6088C8.53288 64.5968 15.4938 70.4122 22.3138 72.7848C29.6155 75.259 37.468 75.6697 44.9919 73.971C45.8196 73.7801 46.6381 73.5586 47.4475 73.3063C49.2737 72.7302 51.4164 72.086 52.9915 70.9542C53.0131 70.9384 53.0308 70.9178 53.0433 70.8942C53.0558 70.8706 53.0628 70.8445 53.0637 70.8179V65.1661C53.0634 65.1412 53.0574 65.1167 53.0462 65.0944C53.035 65.0721 53.0189 65.0525 52.9992 65.0371C52.9794 65.0218 52.9564 65.011 52.9318 65.0056C52.9073 65.0002 52.8819 65.0003 52.8574 65.0059C48.0369 66.1472 43.0971 66.7193 38.141 66.7103C29.6118 66.7103 27.3178 62.6981 26.6609 61.0278C26.1329 59.5842 25.7976 58.0784 25.6636 56.5486C25.6622 56.5229 25.667 56.4973 25.6775 56.4738C25.688 56.4502 25.7039 56.4295 25.724 56.4132C25.7441 56.397 25.7678 56.3856 25.7931 56.3801C25.8185 56.3746 25.8448 56.3751 25.8699 56.3816C30.6101 57.5151 35.4693 58.0873 40.3455 58.086C41.5183 58.086 42.6876 58.086 43.8604 58.0553C48.7647 57.919 53.9339 57.6701 58.7591 56.7361C58.8794 56.7123 58.9998 56.6918 59.103 56.6611C66.7139 55.2124 73.9569 50.665 74.6929 39.1501C74.7204 38.6967 74.7892 34.4016 74.7892 33.9312C74.7926 32.3325 75.3085 22.5901 74.7135 16.6043ZM62.9996 45.3371H54.9966V25.9069C54.9966 21.8163 53.277 19.7302 49.7793 19.7302C45.9343 19.7302 44.0083 22.1981 44.0083 27.0727V37.7082H36.0534V27.0727C36.0534 22.1981 34.124 19.7302 30.279 19.7302C26.8019 19.7302 25.0651 21.8163 25.0617 25.9069V45.3371H17.0656V25.3172C17.0656 21.2266 18.1191 17.9769 20.2262 15.568C22.3998 13.1648 25.2509 11.9308 28.7898 11.9308C32.8859 11.9308 35.9812 13.492 38.0447 16.6111L40.036 19.9245L42.0308 16.6111C44.0943 13.492 47.1896 11.9308 51.2788 11.9308C54.8143 11.9308 57.6654 13.1648 59.8459 15.568C61.9529 17.9746 63.0065 21.2243 63.0065 25.3172L62.9996 45.3371Z" fill="currentColor"/></symbol><use xlink:href="#logo-symbol-icon"/></svg>
+
diff --git a/app/javascript/images/logo-symbol-wordmark.svg b/app/javascript/images/logo-symbol-wordmark.svg
new file mode 100644
index 000000000..ee0b636d9
--- /dev/null
+++ b/app/javascript/images/logo-symbol-wordmark.svg
@@ -0,0 +1,11 @@
+<svg width="261" height="66" viewBox="0 0 261 66" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<symbol id="logo-symbol-wordmark"><path d="M60.7539 14.4034C59.8143 7.41942 53.7273 1.91557 46.5117 0.849066C45.2943 0.668854 40.6819 0.0130005 29.9973 0.0130005H29.9175C19.2299 0.0130005 16.937 0.668854 15.7196 0.849066C8.70488 1.88602 2.29885 6.83152 0.744617 13.8982C-0.00294988 17.3784 -0.0827298 21.2367 0.0561464 24.7759C0.254119 29.8514 0.292531 34.918 0.753482 39.9728C1.07215 43.3305 1.62806 46.6614 2.41704 49.9406C3.89445 55.9969 9.87499 61.0369 15.7344 63.0931C22.0077 65.2374 28.7542 65.5934 35.2184 64.1212C35.9295 63.9558 36.6318 63.7638 37.3252 63.5451C38.8971 63.0459 40.738 62.4875 42.0913 61.5067C42.1099 61.4929 42.1251 61.4751 42.1358 61.4547C42.1466 61.4342 42.1526 61.4116 42.1534 61.3885V56.4903C42.153 56.4687 42.1479 56.4475 42.1383 56.4281C42.1287 56.4088 42.1149 56.3918 42.0979 56.3785C42.0809 56.3652 42.0611 56.3559 42.04 56.3512C42.019 56.3465 41.9971 56.3466 41.9761 56.3514C37.8345 57.3406 33.5905 57.8364 29.3324 57.8286C22.0045 57.8286 20.0336 54.3514 19.4693 52.9038C19.0156 51.6527 18.7275 50.3476 18.6124 49.0218C18.6112 48.9996 18.6153 48.9773 18.6243 48.9569C18.6333 48.9366 18.647 48.9186 18.6643 48.9045C18.6816 48.8904 18.7019 48.8805 18.7237 48.8758C18.7455 48.871 18.7681 48.8715 18.7897 48.8771C22.8622 49.8595 27.037 50.3553 31.2265 50.3542C32.234 50.3542 33.2387 50.3542 34.2463 50.3276C38.4598 50.2094 42.9009 49.9938 47.0465 49.1843C47.1499 49.1636 47.2534 49.1459 47.342 49.1193C53.881 47.8637 60.1038 43.9227 60.7362 33.9431C60.7598 33.5502 60.8189 29.8278 60.8189 29.4201C60.8218 28.0345 61.2651 19.5911 60.7539 14.4034Z" fill="url(#paint0_linear_89_11)"/>
+<path d="M12.3442 18.3034C12.3442 16.2668 13.9777 14.6194 15.997 14.6194C18.0163 14.6194 19.6497 16.2668 19.6497 18.3034C19.6497 20.34 18.0163 21.9874 15.997 21.9874C13.9777 21.9874 12.3442 20.34 12.3442 18.3034Z" fill="currentColor"/>
+<path d="M66.1484 21.4685V38.3839H59.4988V21.9744C59.4988 18.5109 58.0583 16.7597 55.1643 16.7597C51.9746 16.7597 50.3668 18.8482 50.3668 22.9603V31.9499H43.7687V22.9603C43.7687 18.8352 42.1738 16.7597 38.9712 16.7597C36.0901 16.7597 34.6367 18.5109 34.6367 21.9744V38.3839H28V21.4685C28 18.018 28.8746 15.268 30.6238 13.2314C32.4374 11.1948 34.8039 10.157 37.7365 10.157C41.132 10.157 43.7172 11.4802 45.415 14.1135L47.0742 16.9154L48.7334 14.1135C50.4311 11.4802 53.0035 10.157 56.4119 10.157C59.3444 10.157 61.711 11.1948 63.5246 13.2314C65.2738 15.268 66.1484 18.005 66.1484 21.4685ZM89.0297 29.8743C90.4059 28.4085 91.0619 26.5795 91.0619 24.3613C91.0619 22.1431 90.4059 20.3011 89.0297 18.9001C87.7049 17.4343 86.0329 16.7338 84.0007 16.7338C81.9685 16.7338 80.2965 17.4343 78.9717 18.9001C77.6469 20.3011 76.991 22.1431 76.991 24.3613C76.991 26.5795 77.6469 28.4215 78.9717 29.8743C80.2965 31.2753 81.9685 31.9888 84.0007 31.9888C86.0329 31.9888 87.7049 31.2883 89.0297 29.8743ZM91.0619 10.8316H97.6086V37.891H91.0619V34.6999C89.0811 37.3462 86.3416 38.6563 82.7788 38.6563C79.2161 38.6563 76.4765 37.3073 74.0456 34.5442C71.6533 31.7812 70.4443 28.3696 70.4443 24.3743C70.4443 20.3789 71.6661 17.0192 74.0456 14.2561C76.4893 11.4931 79.3833 10.0922 82.7788 10.0922C86.1744 10.0922 89.0811 11.3894 91.0619 14.0356V10.8445V10.8316ZM119.654 23.8683C121.583 25.3342 122.548 27.3837 122.496 29.9781C122.496 32.7411 121.532 34.9075 119.551 36.4122C117.57 37.878 115.178 38.6304 112.284 38.6304C107.049 38.6304 103.499 36.4641 101.621 32.1963L107.306 28.7847C108.065 31.1067 109.737 32.3001 112.284 32.3001C114.625 32.3001 115.782 31.5477 115.782 29.9781C115.782 28.8366 114.265 27.8118 111.165 27.0075C109.995 26.6833 109.03 26.359 108.271 26.0865C107.204 25.6585 106.29 25.1655 105.532 24.5688C103.654 23.103 102.689 21.1572 102.689 18.6666C102.689 16.0203 103.602 13.9059 105.429 12.3882C107.306 10.8186 109.596 10.0662 112.335 10.0662C116.709 10.0662 119.898 11.9601 121.982 15.7998L116.4 19.0428C115.59 17.2008 114.213 16.2798 112.335 16.2798C110.355 16.2798 109.39 17.0321 109.39 18.498C109.39 19.6395 110.908 20.6643 114.008 21.4685C116.4 22.0134 118.278 22.8176 119.641 23.8554L119.654 23.8683ZM140.477 17.538H134.741V28.7977C134.741 30.1468 135.255 30.964 136.22 31.3402C136.927 31.6126 138.355 31.6645 140.49 31.5607V37.891C136.079 38.4358 132.876 37.9948 130.998 36.5419C129.12 35.1409 128.207 32.5336 128.207 28.8106V17.538H123.795V10.8316H128.207V5.37038L134.754 3.25595V10.8316H140.49V17.538H140.477ZM161.352 29.7187C162.677 28.3177 163.333 26.5276 163.333 24.3613C163.333 22.195 162.677 20.4178 161.352 19.0039C160.027 17.6029 158.407 16.8894 156.426 16.8894C154.445 16.8894 152.825 17.5899 151.5 19.0039C150.227 20.4697 149.571 22.2469 149.571 24.3613C149.571 26.4757 150.227 28.2529 151.5 29.7187C152.825 31.1196 154.445 31.8331 156.426 31.8331C158.407 31.8331 160.027 31.1326 161.352 29.7187ZM146.883 34.5313C144.297 31.7682 143.024 28.4215 143.024 24.3613C143.024 20.3011 144.297 17.0062 146.883 14.2432C149.468 11.4802 152.67 10.0792 156.426 10.0792C160.182 10.0792 163.384 11.4802 165.97 14.2432C168.555 17.0062 169.88 20.4178 169.88 24.3613C169.88 28.3047 168.555 31.7682 165.97 34.5313C163.384 37.2943 160.233 38.6434 156.426 38.6434C152.619 38.6434 149.468 37.2943 146.883 34.5313ZM191.771 29.8743C193.095 28.4085 193.751 26.5795 193.751 24.3613C193.751 22.1431 193.095 20.3011 191.771 18.9001C190.446 17.4343 188.774 16.7338 186.742 16.7338C184.709 16.7338 183.037 17.4343 181.661 18.9001C180.336 20.3011 179.68 22.1431 179.68 24.3613C179.68 26.5795 180.336 28.4215 181.661 29.8743C183.037 31.2753 184.761 31.9888 186.742 31.9888C188.722 31.9888 190.446 31.2883 191.771 29.8743ZM193.751 0H200.298V37.891H193.751V34.6999C191.822 37.3462 189.082 38.6563 185.52 38.6563C181.957 38.6563 179.179 37.3073 176.735 34.5442C174.343 31.7812 173.134 28.3696 173.134 24.3743C173.134 20.3789 174.356 17.0192 176.735 14.2561C179.166 11.4931 182.111 10.0922 185.52 10.0922C188.928 10.0922 191.822 11.3894 193.751 14.0356V0.0129719V0ZM223.308 29.7057C224.633 28.3047 225.289 26.5146 225.289 24.3483C225.289 22.182 224.633 20.4048 223.308 18.9909C221.983 17.5899 220.363 16.8765 218.382 16.8765C216.401 16.8765 214.78 17.577 213.456 18.9909C212.182 20.4567 211.526 22.2339 211.526 24.3483C211.526 26.4627 212.182 28.2399 213.456 29.7057C214.78 31.1067 216.401 31.8201 218.382 31.8201C220.363 31.8201 221.983 31.1196 223.308 29.7057ZM208.838 34.5183C206.253 31.7553 204.98 28.4085 204.98 24.3483C204.98 20.2881 206.253 16.9932 208.838 14.2302C211.424 11.4672 214.626 10.0662 218.382 10.0662C222.137 10.0662 225.34 11.4672 227.925 14.2302C230.511 16.9932 231.835 20.4048 231.835 24.3483C231.835 28.2918 230.511 31.7553 227.925 34.5183C225.34 37.2813 222.189 38.6304 218.382 38.6304C214.575 38.6304 211.424 37.2813 208.838 34.5183ZM260.17 21.261V37.878H253.623V22.1301C253.623 20.34 253.173 18.9909 252.247 17.9661C251.385 17.0451 250.164 16.5651 248.594 16.5651C244.89 16.5651 243.012 18.7833 243.012 23.2716V37.878H236.466V10.8316H243.012V13.867C244.581 11.3245 247.077 10.0792 250.575 10.0792C253.366 10.0792 255.656 11.0521 257.431 13.0498C259.257 15.0474 260.17 17.7586 260.17 21.274" fill="currentColor"/>
+<defs>
+<linearGradient id="paint0_linear_89_11" x1="30.5" y1="0.0130005" x2="30.5" y2="65.013" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6364FF"/>
+<stop offset="1" stop-color="#563ACC"/>
+</linearGradient>
+</defs></symbol><use xlink:href="#logo-symbol-wordmark"/>
+</svg>
diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
index 034a9c221..11d0c30c5 100644
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>
+<svg width="65" height="65" viewBox="0 0 61 65" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M60.7539 14.3904C59.8143 7.40642 53.7273 1.90257 46.5117 0.836066C45.2943 0.655854 40.6819 0 29.9973 0H29.9175C19.2299 0 16.937 0.655854 15.7196 0.836066C8.70488 1.87302 2.29885 6.81852 0.744617 13.8852C-0.00294988 17.3654 -0.0827298 21.2237 0.0561464 24.7629C0.254119 29.8384 0.292531 34.905 0.753482 39.9598C1.07215 43.3175 1.62806 46.6484 2.41704 49.9276C3.89445 55.9839 9.87499 61.0239 15.7344 63.0801C22.0077 65.2244 28.7542 65.5804 35.2184 64.1082C35.9295 63.9428 36.6318 63.7508 37.3252 63.5321C38.8971 63.0329 40.738 62.4745 42.0913 61.4937C42.1099 61.4799 42.1251 61.4621 42.1358 61.4417C42.1466 61.4212 42.1526 61.3986 42.1534 61.3755V56.4773C42.153 56.4557 42.1479 56.4345 42.1383 56.4151C42.1287 56.3958 42.1149 56.3788 42.0979 56.3655C42.0809 56.3522 42.0611 56.3429 42.04 56.3382C42.019 56.3335 41.9971 56.3336 41.9761 56.3384C37.8345 57.3276 33.5905 57.8234 29.3324 57.8156C22.0045 57.8156 20.0336 54.3384 19.4693 52.8908C19.0156 51.6397 18.7275 50.3346 18.6124 49.0088C18.6112 48.9866 18.6153 48.9643 18.6243 48.9439C18.6333 48.9236 18.647 48.9056 18.6643 48.8915C18.6816 48.8774 18.7019 48.8675 18.7237 48.8628C18.7455 48.858 18.7681 48.8585 18.7897 48.8641C22.8622 49.8465 27.037 50.3423 31.2265 50.3412C32.234 50.3412 33.2387 50.3412 34.2463 50.3146C38.4598 50.1964 42.9009 49.9808 47.0465 49.1713C47.1499 49.1506 47.2534 49.1329 47.342 49.1063C53.881 47.8507 60.1038 43.9097 60.7362 33.9301C60.7598 33.5372 60.8189 29.8148 60.8189 29.4071C60.8218 28.0215 61.2651 19.5781 60.7539 14.3904Z" fill="url(#paint0_linear_89_8)"/>
+<path d="M50.3943 22.237V39.5876H43.5185V22.7481C43.5185 19.2029 42.0411 17.3949 39.036 17.3949C35.7325 17.3949 34.0778 19.5338 34.0778 23.7585V32.9759H27.2434V23.7585C27.2434 19.5338 25.5857 17.3949 22.2822 17.3949C19.2949 17.3949 17.8027 19.2029 17.8027 22.7481V39.5876H10.9298V22.237C10.9298 18.6918 11.835 15.8754 13.6453 13.7877C15.5128 11.7049 17.9623 10.6355 21.0028 10.6355C24.522 10.6355 27.1813 11.9885 28.9542 14.6917L30.665 17.5633L32.3788 14.6917C34.1517 11.9885 36.811 10.6355 40.3243 10.6355C43.3619 10.6355 45.8114 11.7049 47.6847 13.7877C49.4931 15.8734 50.3963 18.6899 50.3943 22.237Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_89_8" x1="30.5" y1="0" x2="30.5" y2="65" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6364FF"/>
+<stop offset="1" stop-color="#563ACC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg
deleted file mode 100644
index 102d4c787..000000000
--- a/app/javascript/images/logo_alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.41507 232.00976"><path d="M211.80683 139.0875c-3.1825 16.36625-28.4925 34.2775-57.5625 37.74875-15.16 1.80875-30.0825 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.3925 27.9425 21.115.7225 39.91625-5.20625 39.91625-5.20625l.86875 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23183 213.82 1.40558 165.31125.20808 116.09125c-.36375-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67058 3.45375 78.20308.2425 107.86433 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.97625 14.7525 32.97625 65.0825 0 0 .4125 37.13375-4.6 62.915" fill="#3088d4"/><path d="M65.68743 96.45938c0 9.01375-7.3075 16.32125-16.3225 16.32125-9.01375 0-16.32-7.3075-16.32-16.32125 0-9.01375 7.30625-16.3225 16.32-16.3225 9.015 0 16.3225 7.30875 16.3225 16.3225M124.52893 96.45938c0 9.01375-7.30875 16.32125-16.3225 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.3225 7.30875 16.3225 16.3225M183.36933 96.45938c0 9.01375-7.3075 16.32125-16.32125 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.32125 7.30875 16.32125 16.3225" fill="#fff"/></svg>
diff --git a/app/javascript/images/logo_transparent_black.svg b/app/javascript/images/logo_transparent_black.svg
deleted file mode 100644
index e44bcf5e1..000000000
--- a/app/javascript/images/logo_transparent_black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#000"/></svg>
diff --git a/app/javascript/images/logo_transparent_white.svg b/app/javascript/images/logo_transparent_white.svg
deleted file mode 100644
index f061ffe4c..000000000
--- a/app/javascript/images/logo_transparent_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#fff"/></svg>
diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png
index 5c993dbee..73bf9d198 100644
Binary files a/app/javascript/images/mailer/icon_cached.png and b/app/javascript/images/mailer/icon_cached.png differ
diff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png
index f7f95a0e8..bc669b7b6 100644
Binary files a/app/javascript/images/mailer/icon_done.png and b/app/javascript/images/mailer/icon_done.png differ
diff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png
index 13967009a..becbca2f9 100644
Binary files a/app/javascript/images/mailer/icon_email.png and b/app/javascript/images/mailer/icon_email.png differ
diff --git a/app/javascript/images/mailer/icon_file_download.png b/app/javascript/images/mailer/icon_file_download.png
index 3f7ac429b..26ffddbdd 100644
Binary files a/app/javascript/images/mailer/icon_file_download.png and b/app/javascript/images/mailer/icon_file_download.png differ
diff --git a/app/javascript/images/mailer/icon_flag.png b/app/javascript/images/mailer/icon_flag.png
new file mode 100644
index 000000000..7e078fede
Binary files /dev/null and b/app/javascript/images/mailer/icon_flag.png differ
diff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png
index 8c212b7ee..94615fc4a 100644
Binary files a/app/javascript/images/mailer/icon_grade.png and b/app/javascript/images/mailer/icon_grade.png differ
diff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png
index c854c3bdb..5c1c36f95 100644
Binary files a/app/javascript/images/mailer/icon_lock_open.png and b/app/javascript/images/mailer/icon_lock_open.png differ
diff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png
index 6290a42ae..9fe966391 100644
Binary files a/app/javascript/images/mailer/icon_person_add.png and b/app/javascript/images/mailer/icon_person_add.png differ
diff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png
index a70093356..83ddc07e8 100644
Binary files a/app/javascript/images/mailer/icon_reply.png and b/app/javascript/images/mailer/icon_reply.png differ
diff --git a/app/javascript/images/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png
deleted file mode 100644
index 7baaac61c..000000000
Binary files a/app/javascript/images/mailer/icon_warning.png and /dev/null differ
diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png
new file mode 100644
index 000000000..784be9539
Binary files /dev/null and b/app/javascript/images/mailer/logo.png differ
diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png
deleted file mode 100644
index 82d981fc6..000000000
Binary files a/app/javascript/images/mailer/logo_full.png and /dev/null differ
diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png
deleted file mode 100644
index 6dbcc2e8d..000000000
Binary files a/app/javascript/images/mailer/logo_transparent.png and /dev/null differ
diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png
new file mode 100644
index 000000000..6772b3318
Binary files /dev/null and b/app/javascript/images/mailer/wordmark.png differ
diff --git a/app/javascript/images/preview.jpg b/app/javascript/images/preview.jpg
deleted file mode 100644
index ec2856748..000000000
Binary files a/app/javascript/images/preview.jpg and /dev/null differ
diff --git a/app/javascript/images/preview.png b/app/javascript/images/preview.png
new file mode 100644
index 000000000..3d3a17b23
Binary files /dev/null and b/app/javascript/images/preview.png differ
diff --git a/app/javascript/images/proof_providers/keybase.png b/app/javascript/images/proof_providers/keybase.png
deleted file mode 100644
index 7e3ac657f..000000000
Binary files a/app/javascript/images/proof_providers/keybase.png and /dev/null differ
diff --git a/app/javascript/images/reticle.png b/app/javascript/images/reticle.png
index 41a5d1c3a..a724ac0bc 100644
Binary files a/app/javascript/images/reticle.png and b/app/javascript/images/reticle.png differ
diff --git a/app/javascript/images/screen_federation.svg b/app/javascript/images/screen_federation.svg
deleted file mode 100644
index 7019a7356..000000000
--- a/app/javascript/images/screen_federation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="806.09998" width="1197.7164" viewBox="0 0 1197.7164 806.09999" id="Layer_1"><path id="path6078" d="M482.4164 557.4c-42.3-31.3-89.9-55.7-141.2-72.5-53.2-17.4-109.1-26.2-166.3-26.2-59.7 0-117.9 9.6-173.1 28.5v315.9h645.6c-21.6-95.7-80.1-182.9-165-245.7z" class="st33" fill="#fff"/><path stroke-miterlimit="10" id="path6082" d="M515.7164 589.8c-1.1 3.3-6.4 5.1-7.4 4.2l-.2-7.1.2-3.6c-86.1-74.6-203.7-120.6-333.4-120.6-61 0-119.4 10.2-173.1 28.8v313.6h641.9c-18.4-83.2-63.7-157.2-128-215.3" class="st80" fill="#587faa" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6084" d="M351.5164 565.1l9.3 4.8" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6086" d="M336.5164 558c2.2 1 4.4 2 6.5 3" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6088" d="M321.5164 551.5c2.6 1 5.1 2.1 7.7 3.2" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6090" d="M304.8164 545.1c3.4 1.2 6.7 2.5 10 3.7" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><g id="g6092" transform="translate(-1343.3836 -75.800003)"><path stroke-miterlimit="10" id="path6094" d="M1890.4 836.8c1.9 3.9 3.8 7.8 5.5 11.7" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6100" d="M1880.9 818.7c1.5 2.7 2.9 5.4 4.4 8.1" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6102" d="M1871.4 802.4c1.8 2.9 3.5 5.8 5.2 8.8" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6104" d="M1860.3 785.1c2 2.9 4 5.9 5.9 8.9" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6106" d="M1848.4 768.6c2.2 2.9 4.3 5.8 6.4 8.8" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6108" d="M1834.4 751c2.6 3.1 5.2 6.3 7.7 9.5" class="st81" fill="none" stroke="#2d3f68" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/></g><path id="path6110" d="M156.6164 523.5c-54.6 0-106.7 10.1-154.8 28.4V805h559.5c-59.5-164.1-218.2-281.5-404.7-281.5z" class="st82" fill="#2d3f68"/><g id="g6112" transform="translate(-1343.3836 -75.800003)"><path id="path6114" d="M2065.2 128.3c1.4 69-36.9 80.4-35.7 141.1 1.2 60.6 39.9 70.5 41.3 139.5 1.4 69-36.9 80.4-35.7 141.1 1.2 60.6 39.9 70.5 41.3 139.5 1.4 69-36.9 80.4-35.7 141.1.4 20.5 5.1 35.2 11.2 48.3H2541v-803h-487.3c6.2 13.6 11 29.7 11.5 52.4z"/></g><g id="g6116" transform="translate(-1343.3836 -75.800003)"><circle stroke-miterlimit="10" id="circle6118" r="33.799999" cy="645.40002" cx="2236.6001" class="st83" fill="#ebb548" stroke="#663f09" stroke-width="3.30660009" stroke-linecap="round" stroke-linejoin="round"/><g id="g6120"><path stroke-miterlimit="10" id="path6122" d="M2243.3 641.5c-2.4-5.6-8-6.2-15.8-3.2-5.7 2.2-18.2 7.3-24.5 9.9.7 8.2 4.3 15.5 9.7 21 6.7-2.6 21.3-8.2 32-12.6 14.3-5.9 12.9-9.1 10.2-14.1-2.7-5-11.6-1-11.6-1z" class="st84" fill="#ad6a3b" stroke="#663f09" stroke-width="1.65330005"/><path stroke-miterlimit="10" id="path6124" d="M2243.4 612.3c-12.6 4.4-13.1 7.3-11.2 11.6 2.1 4.6 9.4 2.6 15.4.1 2.6-1 6.8-2.8 10.7-4.5-4.2-3.5-9.2-6.1-14.9-7.2z" class="st84" fill="#ad6a3b" stroke="#663f09" stroke-width="1.65330005"/></g><g id="g6126"><circle id="circle6128" r="3" cy="627.70001" cx="2218.8" class="st33" fill="#fff"/></g></g><g id="g6130" transform="translate(-1343.3836 -75.800003)"><circle stroke-miterlimit="10" id="circle6132" r="33.799999" cy="485.79999" cx="2402.5" class="st83" fill="#ebb548" stroke="#663f09" stroke-width="3.30660009" stroke-linecap="round" stroke-linejoin="round"/><g id="g6134"><circle id="circle6136" r="3" cy="468.20001" cx="2384.8" class="st33" fill="#fff"/></g></g><path id="path6138" d="M292.3164 506.3c-2.7 0-6.7-.4-9.8-3.5-2.9-3-4.2-7.6-4-14 .1-2.2.2-4.1.2-5.9-2.9-.4-5.8-.9-8.6-1.7-17.4-4.7-31.5-16.3-39.6-32.8-1-2.1-2-4.2-2.8-6.4-.6 0-1.2 0-1.7.1-.9 2.2-1.8 4.3-2.8 6.4-8.1 16.5-22.1 28.1-39.6 32.8-2.8.8-5.7 1.3-8.6 1.7.1 1.7.1 3.7.2 5.9.3 6.4-1 11-4 14-3.1 3.2-7.1 3.5-9.8 3.5H149.6164c-13.1 0-13.1-9.7-13.1-14.9v-14.7c-2-.9-3.9-1.9-5.7-3-1.6 2.7-4.5 5.6-9.3 6.9-4.8 1.2-8.9 1.8-12.5 1.8-4.5 0-8.3-1-11.2-2.9-3.3-2.2-5.4-5.7-6-10.1-1.5-10.5-.6-17.6 2.6-21.8 1.8-2.3 4.2-3.6 7.1-3.9l5.5-.5c-9.9-1.8-15.4-7.7-16.4-17.5-.8-8.1 6.6-16.9 11-18.6 1.1-.5 2.2-.7 3.1-.7 1.8 0 3.2.8 4.2 2.2 1 1.4 1.9 4.3-2.2 8.4-.7.9-3.3 6.5-1.8 9.9.8 1.7 2.7 2.7 5.8 3.1 1.9-7.1 5.8-12.8 11.4-16.6h-.5c-3.8 0-7-1.3-9.2-3.8-2.2-2.5-3.2-6-2.7-9.9.6-4.5.6-11.5 0-21.9-.7-13.3 4.2-23.4 13-26.3 2.2-.7 4.4-1.1 6.6-1.1 3.2 0 6.4.8 9.3 2.2l.1-.1c-1.5-3.1-1.9-6.5-1.1-9.5.7-2.6 3.4-8.9 13.8-10.1 1.4-.2 3.5-.3 6.1-.3 2.1-3.3 5.4-7.6 9.2-9.8.1-.7.1-1.2.2-1.7-1.3-3-1.4-5.7-.3-8 .7-1.6 2.4-3.7 6-4.6.7-.2 1.5-.3 2.2-.3 2.9 0 5.6 1.4 7.7 4 .4-.1.7-.1 1.1-.1h.5c2.6.2 5 1.5 6.6 3.8 2.2 3 1.3 7.1-2 10.5.3 3.1 1.5 5.7 3.5 7.7.5.5 1.2 1 1.9 1.5 4.7.7 8.8 1.6 12.5 2.5 2.8.7 5.3 1.2 7.1 1.4 1.3.2 2.8.2 4.4.2 7.5 0 17.4-1.7 22.8-6.5 2.2-1.9 3.4-4.2 3.8-6.9-2.8-2.9-3.4-6.6-1.6-9.6.6-1 2.4-4 5.8-4.6.4-.1.8-.1 1.2-.1.4 0 .8 0 1.2.1 2-2 4.2-3.1 6.5-3.1.8 0 1.6.1 2.4.4 2.5.8 4.6 2.6 5.7 4.9.9 1.9 1.1 4.1.5 6.3.3 2.4.9 7.8.1 14.5 7.9.2 15.7 2.7 23.7 7.6 1.5.9 2.8 1.8 4.1 2.7.9-.3 1.9-.6 3-.8 1.6-.3 3.2-.5 4.7-.5 7 0 16.4 3.6 21.7 20.7 1.4 4.7 2.9 8.2 4 11.1 2.7 6.6 4.8 11.9-1.1 17.1-3.9 3.4-7.7 5.2-11.5 5.2-1.3 0-2.5-.2-3.7-.6v.1c16.3 3.4 27.2 14.7 31.3 32.1 3.4-.3 5.5-1.4 6.3-3.2 1.5-3.4-1-9-1.9-10-4-4-3-6.9-2.1-8.3.9-1.4 2.4-2.2 4.2-2.2 1 0 2 .2 3.1.7 4.3 1.7 11.8 10.6 11 18.6-1 9.8-6.5 15.7-16.5 17.5l5.5.6c2.8.3 5.3 1.6 7.1 3.9 3.3 4.2 4.1 11.3 2.6 21.8-.6 4.4-2.7 7.9-6 10.1-2.9 1.9-6.6 2.9-11.1 2.9-3.6 0-7.7-.6-12.5-1.8-4.8-1.2-7.7-4.2-9.3-6.9-1.9 1.1-3.8 2.1-5.7 3v14.7c0 5.2 0 14.9-13.1 14.9h-10.8c-.5.1-.8.1-1.2.1z" class="st33" fill="#fff"/><g id="g6140" transform="translate(-1343.3836 -75.800003)"><path stroke-miterlimit="10" id="path6142" d="M1527.8 400.3s4.8-3.7 2.9-6.3c-1.9-2.6-5-2.5-6.5-.9 0 0-2.4-6.1-7.2-4.9-3.7.9-4.6 3.7-2.4 7.9 0 0-8.4 42.4 35.2 53.1l4.6-29.6c-11.7.1-26.6-3.8-26.6-19.3z" class="st85" fill="#fbc16c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><g id="g6144"><path stroke-miterlimit="10" id="path6146" d="M1695.3 523.5c-6-.6-11.9-1.2-11.9-1.2s3.6-40.6-32.8-45.4c.6-34.6-2.4-44.8-19.1-54.9-23.7-14.4-38.7-2.2-48.8-1-1.3.2-2.9.3-4.7.3l-7.6 27.9s-9.3 39.1 7.5 73.1c16.7 34 58.5 42.4 90.7 20.9 0 0 1.2 7.2 8.4 9 7.2 1.8 22.7 4.8 24.5-7.8 1.6-12.5-.2-20.3-6.2-20.9z" class="st86" fill="#876a4d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/></g><path stroke-miterlimit="10" id="path6148" d="M1474.2 489.2c-.6-34.6 0-56.7 25.1-68.6 25.1-11.9 47.2-2.4 57.3-1.2 10.1 1.2 35.8-1.2 35.8-19.1 0 0-4.1-2.8-2.3-5.6 1.7-2.8 3.4-3.6 5.9-1.6 0 0 2.7-5.1 6.3-3.9 2.5.8 4.6 3.3 3.2 6.9 0 0 8.4 42.4-35.2 53.1 0 0 9.3 39.1-7.5 73.1-16.7 34-58.5 42.4-90.7 20.9 0 0-1.2 7.2-8.4 9-7.2 1.8-22.7 4.8-24.5-7.8-1.8-12.5 0-20.3 6-20.9 6-.6 11.9-1.2 11.9-1.2s-4.7-25.6 17.1-33.1z" class="st85" fill="#fbc16c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path id="path6150" d="M1510 553.9c-13 0-25.9-4-37.2-11.6l-1.5-1-.3 1.8c0 .3-1.2 6.4-7.5 8-4.4 1.1-8 1.6-11.1 1.6-7.2 0-11.1-2.7-11.9-8.4-1.6-11 0-15.7 1.6-17.7.9-1.1 2-1.7 3.4-1.8l13.2-1.3-.2-1.3c0-.2-2.4-13.5 4.5-23.2-.7 4.7.2 9.5 2.6 13.6 2.8 4.7 8.9 10.7 22.1 12.4 4.2.5 8.4.9 12.6.8 40.6-1 51.6-8.4 53.3-27l15.7 1.5c-1.7 7.8-4.1 15.1-7.4 21.7-10 19.9-29.3 31.9-51.9 31.9z" class="st4" fill="#e09c5c"/><path id="path6152" d="M1630.6 553.9c13 0 25.9-4 37.2-11.6l1.5-1 .3 1.8c0 .3 1.2 6.4 7.5 8 4.4 1.1 8 1.6 11.1 1.6 7.2 0 11.1-2.7 11.9-8.4 1.6-11 0-15.7-1.6-17.7-.9-1.1-2-1.7-3.4-1.8l-13.2-1.3.2-1.3c0-.2 2.4-13.5-4.5-23.2.7 4.7-.2 9.5-2.6 13.6-2.8 4.7-8.9 10.7-22.1 12.4-4.2.5-8.4.9-12.6.8-40.6-1-51.6-8.4-53.3-27l-15.7 1.5c1.7 7.8 4.1 15.1 7.4 21.7 10 19.9 29.3 31.9 51.9 31.9z" fill="#6e5a3d"/><path stroke-miterlimit="10" id="path6154" d="M1484 544.4v22.7c0 6.6.6 10.7 9 10.7h10.1c3.5 0 11.9 1.2 11.3-13.1-.6-14.3-.6-19.1-.6-19.1" class="st87" fill="#e09c5c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6160" d="M1460.2 515.2c-13.7.6-21-3.6-22.1-14.3-.6-6 5.4-13.1 8.4-14.3 3-1.2 3 .6.6 3s-10.7 21.5 11.9 20.3" class="st87" fill="#e09c5c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6162" d="M1581.8 460.8c-.1-.8-.4-1.7.2-2.3.6-.6 1.1-.5 2-.5 5.8.1 21.1.2 24 .4 3.6.1 3.1 2.9 1.6 6-3.9 7.6-6.4 11.5-14.2 11.4-6.5-.1-12.4-6.2-13.6-15z" fill="#33281d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6164" d="M1609.5 464.4c-3.9 7.6-6.4 11.5-14.2 11.4-1 0-2-.2-3-.5-.1-.9-.2-1.7-.2-2.6 0-5.6 2.2-10.7 5.8-14.5 4.5.1 8.6.1 9.9.2 3.7.1 3.3 2.9 1.7 6z" fill="#693131" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6166" d="M1680.4 515.2c13.7.6 21-3.6 22.1-14.3.6-6-5.4-13.1-8.4-14.3-3-1.2-3 .6-.6 3s10.7 21.5-11.9 20.3" class="st86" fill="#876a4d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6168" d="M1488.2 439.4c-5.4-8.4-13.7-10.7-20.9-8.4-7.2 2.4-10.7 11.3-10.1 22.1.6 10.7.6 17.9 0 22.7-.6 4.8 1.8 9 7.8 9s7.2-4.2 7.2-4.2 1.8 2.4 5.4 2.4c3.6 0 10.1-2.4 10.7-10.1.6-7.7.6-9 .6-9" class="st85" fill="#fbc16c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6170" d="M1595 506.2c-6.8 6.9-23.1 8.1-33.8 7.3-10.7-.8-8.5-7.1-8.5-16.1 0-5.5 4.3-6.5 10.8-7.3 6.5-.8 19-.4 25.2-4.8" class="st86" fill="#876a4d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6172" d="M1548.5 478.8c14.9 0 23.9-1.8 29.2-2.4 5.4-.6 13.1 1.2 13.1 9.6 0 9.6-3.6 12.5-14.3 14.3-10.7 1.8-21.5 1.8-30.4 1.2" class="st85" fill="#fbc16c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6174" d="M1623.7 467.4c-8.1 8.1-15.5 9-23.9 6-8.4-3-10.7-10.1-10.1-15.5.6-5.4 4.2-6 6-1.2 1.8 4.8 3 7.8 10.7 9 4.2.6 7.2-2.4 10.7-5.4 3.6-3 6-3 7.8-.6 2.1 2.8 1.2 5.3-1.2 7.7z" class="st91" fill="#fff" stroke="#7d7d65" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6176" d="M1515.1 456.1s-2.4-6-3.6-10.1c-1.2-4.2-1.8-7.2 1.8-8.4 3.6-1.2 6 1.2 7.8 5.4 1.8 4.2 3.6 10.1 3.6 10.1" class="st92" fill="none" stroke="#402f19" stroke-width="2.98460007" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6178" d="M1557 460.8c.1-.8.4-1.7-.2-2.3-.6-.6-1.1-.5-2-.5-5.8.1-21.1.2-24 .4-3.6.1-3.1 2.9-1.6 6 3.9 7.6 6.4 11.5 14.2 11.4 6.5-.1 12.5-6.2 13.6-15z" fill="#544024" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6180" d="M1632.1 440c-1.8-7.8 1.2-13.7 9.6-15.5 8.4-1.8 16.7 1.8 21.5 17.3 4.8 15.5 9.6 19.1 4.2 23.9-5.4 4.8-10.1 5.4-14.9 1.8 0 0-4.2 4.2-8.4.6s-4.2-7.8-4.2-7.8" class="st86" fill="#876a4d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6182" d="M1605.4 452c0-6.9.7-17.9 6-18.5 5.3-.6 6.9 2.8 6.4 8.8-.5 6-1 11.9-1 11.9" class="st92" fill="none" stroke="#402f19" stroke-width="2.98460007" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6184" d="M1529.3 464.4c3.9 7.6 6.4 11.5 14.2 11.4 1 0 2-.2 3-.5.1-.9.2-1.7.2-2.6 0-5.6-2.2-10.7-5.8-14.5-4.5.1-8.6.1-9.9.2-3.7.1-3.3 2.9-1.7 6z" fill="#693131" stroke="#381916" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6186" d="M1557 460.8c.1-.8.4-1.7-.2-2.3-.6-.6-1.1-.5-2-.5-5.8.1-21.1.2-24 .4-3.6.1-3.1 2.9-1.6 6 3.9 7.6 6.4 11.5 14.2 11.4 6.5-.1 12.5-6.2 13.6-15z" fill="none" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6188" d="M1504.9 467.4c8.1 8.1 15.5 9 23.9 6 8.4-3 10.7-10.1 10.1-15.5-.6-5.4-4.2-6-6-1.2-1.8 4.8-3 7.8-10.7 9-4.2.6-7.2-2.4-10.7-5.4-3.6-3-6-3-7.8-.6-2.1 2.8-1.2 5.3 1.2 7.7z" class="st91" fill="#fff" stroke="#7d7d65" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6190" d="M1490 431.3c-7.1-5.2-8.4-17 5.3-18.6 2.7-.3 8-.2 8-.2s6.4-11.5 11.7-11c5.3.5 5.5 5.2 4.3 7.5 0 0 5.9.2 4.4 6.9-.6 2.8-3.6 4.2-3.6 4.2" class="st85" fill="#fbc16c" stroke="#946f3a" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path id="path6192" d="M1499.9 459.7l-3.7 1.4c-.9.4-2-.1-2.3-1l-.1-.3c-.4-.9.1-2 1-2.3l3.7-1.4c.9-.4 2 .1 2.3 1l.1.3c.4.9-.1 1.9-1 2.3z" class="st31" fill="#e68a4c"/><path id="path6194" d="M1630.2 459.7l3.7 1.4c.9.4 2-.1 2.3-1l.1-.3c.4-.9-.1-2-1-2.3l-3.7-1.4c-.9-.4-2 .1-2.3 1l-.1.3c-.4.9.1 1.9 1 2.3z" fill="#805945"/><path stroke-miterlimit="10" id="path6196" d="M1592.7 412.4c.3-.6.7-1.3.9-2" class="st96" fill="none" stroke="#fbd7a3" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6198" d="M1588.8 417.1c.8-.7 1-.7 1.7-1.6" class="st96" fill="none" stroke="#fbd7a3" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6200" d="M1576.3 423c2.5-.6 4.9-1.4 7-2.4" class="st96" fill="none" stroke="#fbd7a3" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6202" d="M1560.5 424.8c1.7.1 3.5 0 5.4-.2 1.3-.1 2.6-.3 3.9-.5" class="st96" fill="none" stroke="#fbd7a3" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6204" d="M1533 419.3c6.5.6 11.4 2.2 16.3 3.6" class="st96" fill="none" stroke="#fbd7a3" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6206" d="M1627.4 425.2c.7.5 1.4.9 2.1 1.5" class="st97" fill="none" stroke="#b58e67" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6208" d="M1621.5 422.2c.9.4 1.9.8 2.8 1.3" class="st97" fill="none" stroke="#b58e67" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6210" d="M1607.9 419.7c2.4.1 4.8.3 7.3.7" class="st97" fill="none" stroke="#b58e67" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6212" d="M1656.5 544.4v22.7c0 6.6-.6 10.7-9 10.7h-10.1c-3.5 0-11.9 1.2-11.3-13.1.6-14.3.6-19.1.6-19.1" fill="#6e5a3d" stroke="#3b3024" stroke-width="2.38770008" stroke-linecap="round" stroke-linejoin="round"/></g><g id="g6532" transform="translate(-1343.3836 -75.800003)"><circle stroke-miterlimit="10" id="circle6534" r="103.3" cy="500.79999" cx="1949" fill="#4a77ab" stroke="#132137" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6536" r="74.699997" cy="500.79999" cx="1949" class="st16" fill="#51a1b5"/><g id="g6538"><path stroke-miterlimit="10" id="path6540" d="M2005.2 459.7c3.8 9.9 14.9 9.6 29.9 4.9 3.4-1.1 6.5-2.1 9.3-3.1-3.4-8.3-7.9-16-13.2-23-18.9 5.2-29.4 12.3-26 21.2z" fill="#75bd8c" stroke="#132137" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6542" d="M2017 544.7c-5.9 11 .3 18.8 10.9 22.7 7.6-9 13.7-19.4 17.9-30.6-10.8-.8-24.5-.1-28.8 7.9z" class="st140" fill="#e0b779" stroke="#132137" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6544" d="M2003.9 420.2c.4-2.2.5-4.4.5-6.5-17.8-11.3-39.3-17.3-62-15.9-19 1.2-36.5 7.5-51.2 17.5-.4 12.8 2.4 21.8 13.8 25 15.7 4.4 26.4-.3 26.4-.3s2.1 12.3 23 13.1c20.9.8 20.9-14.8 20.9-14.8s25 3.3 28.6-18.1z" class="st140" fill="#e0b779" stroke="#132137" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g><path stroke-miterlimit="10" id="path6546" d="M2001.9 491.9c.4 8.1-3.7 14-13.6 17.7-9.8 3.8-20 4.2-32-6.9-12-11.1-38.3-23.9-61-20.5-28.8 4.3-36.6 23.5-36.6 23.5-1.9-2.2-5.5-6.1-12.9-9.8-.2 3.8-.1 7.6.1 11.4 3.6 56.9 52.7 100.1 109.7 96.5 6.3-.4 12.4-1.4 18.3-2.8-2.6-39.5-19.3-67.9-19.3-67.9 13.7 5.7 27.8 5.7 45.9-2.8 18.1-8.5 23.6-24.6 20.4-38-3.3-13.4-19.3-8.5-19-.4z" fill="#75bd8c" stroke="#1c3b28" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><circle stroke-miterlimit="10" id="circle6548" r="9" cy="510.89999" cx="1898.9" class="st142" fill="#51a1b5" stroke="#1c3b28" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6550" r="9" cy="479.5" cx="1970.5" fill="#4a77ab"/><path stroke-miterlimit="10" id="path6552" d="M1879.4 530.7c-2.2 4.6 0 11.8 10.8 14.3s24.7-.1 30.8-6.5c6.5-6.9 8.8-13.5 3.5-17.3-5.3-3.8-11.3.4-14.3 4.7s-10.1 4.7-17.7 1.8c-7.5-2.9-10.5-2.6-13.1 3z" class="st142" fill="#51a1b5" stroke="#1c3b28" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6554" d="M1956.1 381.4c8.2-3 11.7-4.5 14.4-5.7 2.7-1.2 5-.4 6.4 2.4 1.3 2.8-.8 5.7-6 7.7-5.3 2-13 5-13 5" class="st25" fill="#fbc16c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6556" d="M1950.6 411.4c.1 5.7-1.9 11.2 4.1 11.3 5.9.1 6.2-3.1 6.2-5.9 0-2.8-.1-4.7-.1-4.7" class="st26" fill="#e09c5c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6558" d="M1913.2 410.2c4.9 3.8 12.6 2.5 14.2.1 1.6-2.4-.4-3.4-2.3-2.3s-7.2 1.6-9.7.2c-2.5-1.3-3.8.8-2.2 2z" class="st25" fill="#fbc16c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6560" d="M1921.1 396c0 10.2 2.3 18.5 12 19s17.9-.1 23.8-.9c5.9-.8 11.1-3.5 10.9-13.7-.1-10.2-.1-25.2-.1-25.2s8.4 3 15.6-.8c7.7-4 9.7-6.7 11-8.8 1.1-1.9-1.2-7.9-6.1-4.1-4.9 3.8-10.1 6.1-15.2 3.9-5.1-2.2-7.2-5-9.9-9.3-2.5-3.9-7.7-8.1-20.6-7.7-14 .5-21.9 13-21.6 25.1.3 12.1.2 22.5.2 22.5z" class="st25" fill="#fbc16c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path id="path6562" d="M1939.7 414.1c-2.2 0-4.4-.1-6.6-.1-7.6-.3-11-5.9-11-18v-5.8c6.6-.2 11.3 3.5 11.6 8 .5 7.5 6.8 10 15.7 10h5.2c4 0 8.7 0 11.6-2.2-1.6 5.2-5.7 6.5-9.4 7-3.8.6-9.8 1.1-17.1 1.1z" class="st4" fill="#e09c5c"/><path stroke-miterlimit="10" id="path6564" d="M1929.4 357.9c-2.1-7-10.8-9.6-15.6-3.8-4.8 5.8-9.9 17.9-6.3 21.1 3.6 3.2 5.2 2.3 7.1 1.5 0 0 2.3 4.1 6.9.9 4.5-3.2 6-9.6 6-9.6" class="st25" fill="#fbc16c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6566" d="M1938 378c5.7 4.2 11.2 4.4 14.7 1.8 3.4-2.5 5.6-5.2 4-6.9-1.6-1.7-3.5-.1-5.5 1.3-2 1.4-5.1 1.8-7.9.1-2.8-1.7-5-2.2-6.3-.8-1.4 1.5-.5 3.4 1 4.5z" fill="#fbe6c6" stroke="#668794" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path id="path6568" d="M1940.7 364.8c0 3.8-.2 4.2-1.2 4.2s-1.3-.5-1.3-4.2c0-4.6.3-5.1 1.3-5.1s1.2.6 1.2 5.1z"/><path stroke-miterlimit="10" id="path6570" d="M1926 380.7c-8.2-3-8.1-3-10.7-4.2-2.6-1.2-5-.4-6.4 2.4-1.3 2.8.8 5.7 6 7.7 5.3 2 9.4 3.5 9.4 3.5" class="st25" fill="#fbc16c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6572" d="M1928.4 412.5c.1 5.7-1.9 11.2 4.1 11.3 5.9.1 6.2-3.1 6.2-5.9 0-2.8-.1-4.7-.1-4.7" class="st26" fill="#e09c5c" stroke="#946f3a" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><g id="g6574"><path stroke-miterlimit="10" id="path6576" d="M1930.3 478.8l-54.2 14.5c-6.4 1.7-13-2.1-14.7-8.5l-.3-1c-1.7-6.4 2.1-13 8.5-14.7l54.2-14.5c6.4-1.7 13 2.1 14.7 8.5l.3 1c1.7 6.4-2.2 13-8.5 14.7z" class="st10" fill="#fff" stroke="#7d7d65" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6578" d="M2002.5 559.5l-32.9 8.8c-5.6 1.5-11.4-1.9-12.9-7.4-1.5-5.6 1.9-11.4 7.4-12.9l32.9-8.8c5.6-1.5 11.4 1.9 12.9 7.4 1.6 5.6-1.8 11.4-7.4 12.9z" class="st10" fill="#fff" stroke="#7d7d65" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6580" d="M2037.3 515.3l-10.8 2.9c-5.6 1.5-11.4-1.9-12.9-7.4-1.5-5.6 1.9-11.4 7.4-12.9l10.8-2.9c5.6-1.5 11.4 1.9 12.9 7.4 1.5 5.6-1.8 11.4-7.4 12.9z" class="st10" fill="#fff" stroke="#7d7d65" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g><path id="path6582" d="M1933.9 372.1l-2.9-.1c-1 0-1.8-.9-1.8-1.9v-.4c0-1 .9-1.8 1.9-1.8l2.9.1c1 0 1.8.9 1.8 1.9v.4c0 1.1-.9 1.9-1.9 1.8z" class="st31" fill="#e68a4c"/><path stroke-miterlimit="10" id="path6584" d="M1986.7 443.9c7.1-1.4 15.8-4.7 20.3-12" class="st36" fill="none" stroke="#51a1b5" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6586" d="M1883.3 432.1c3.7 9.5 9.5 14.2 22.5 16" class="st36" fill="none" stroke="#51a1b5" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6588" r="2.0999999" cy="424.70001" cx="2009.9" class="st16" fill="#51a1b5"/><path stroke-miterlimit="10" id="path6590" d="M1949 587.1c-27.7 0-52.4-13.1-68.2-33.4" fill="none" stroke="#66a77c" stroke-width="12" stroke-linecap="round" stroke-linejoin="round"/><g id="g6592"><path d="M1934.9 271.4v30.3h-13.5l22.6 27.6 22.6-27.6h-13.4v-30.3z" stroke-miterlimit="10" id="polygon6594" class="st80" fill="#587faa" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M1939.7 275.79999v10.5" stroke-miterlimit="10" id="line6596" class="st76" fill="none" stroke="#fff" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M1939.7 293.39999V301.5" stroke-miterlimit="10" id="line6598" class="st76" fill="none" stroke="#fff" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g></g><g id="g6600" transform="translate(-1343.3836 -75.800003)"><g id="g6602"><path id="path6604" d="M1784.9 522.9c0-.6-.4-1-1-1h-29.3v-16.3h29.3c.6 0 1-.4 1-1v-11.4l25.1 20.5-25.1 20.5v-11.3z" class="st143" fill="#f1614e"/><path id="path6606" d="M1785.9 495.4l22.5 18.4-22.5 18.4v-9.3c0-1.1-.9-2-2-2h-28.3v-14.3h28.3c1.1 0 2-.9 2-2v-9.2m-2-4.3v13.5h-30.3v18.3h30.3v13.5l27.6-22.6-27.6-22.7z" class="st144" fill="#9c3b2d"/></g><path d="M1757.9 509.10001h10.6" stroke-miterlimit="10" id="line6608" class="st79" fill="#f47c53" stroke="#fdbc61" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M1775.6 509.10001h8" stroke-miterlimit="10" id="line6610" class="st79" fill="#f47c53" stroke="#fdbc61" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g><g id="g6612" transform="translate(-1343.3836 -75.800003)"><g id="g6614"><path id="path6616" d="M2084.4 419.8l23.3-17.7c.2-.2.3-.4.4-.7 0-.3 0-.5-.2-.7l-6.9-9 32.4 1.1-7.5 31.5-6.9-9c-.2-.3-.5-.4-.8-.4-.2 0-.4.1-.6.2l-23.3 17.7-9.9-13z" class="st143" fill="#f1614e"/><path id="path6618" d="M2103.1 392.7l29 1-6.7 28.3-5.6-7.4c-.3-.4-.8-.7-1.3-.8h-.3c-.4 0-.9.1-1.2.4l-22.5 17.1-8.7-11.4 22.5-17.1c.9-.7 1-1.9.4-2.8l-5.6-7.3m-4.2-2.1l8.2 10.7-24.1 18.3 11.1 14.6 24.1-18.3 8.2 10.7 8.3-34.7-35.8-1.3z" class="st144" fill="#9c3b2d"/></g><path d="M2089.1001 420.5l8.3999-6.29999" stroke-miterlimit="10" id="line6620" class="st79" fill="#f47c53" stroke="#fdbc61" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M2103.2 409.89999L2109.6001 405" stroke-miterlimit="10" id="line6622" class="st79" fill="#f47c53" stroke="#fdbc61" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g><path stroke-miterlimit="10" id="path6624" d="M47.9164 462.8c13.3-4.1 19.9.8 23.6 7.7 8.2 15.4-1.9 21.1-28.8 31.2-27 10.1-40.4 15.2-40.4 15.2l-1.3-56.9c14.7-5.1 25.3 2.9 27 8.8-.1.1 9.5-3.9 19.9-6" fill="#587faa" stroke="#000" stroke-width="2"/><path id="path6626" d="M2.4164 474.9c2.1-.4 3.9-.6 5.4-.6 4.6 0 8.1 1.5 10 8.6l.5 2 2-.6c.1 0 10.4-3.4 22.4-7.4 2.5-.8 4.9-1.3 7.1-1.3 7.7 0 12.2 5.3 13.3 15.9-5.1 3.1-12.6 6.1-22 9.6l-37.8 14.2-.9-40.4z" class="st82" fill="#2d3f68"/><path stroke-miterlimit="10" id="path6628" d="M6.0164 564.9l12.2 25.7s7.2 5.9 11.4-3.8l-15.6-27-8 5.1z" class="st146" fill="#191b22" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><g id="g6630" transform="translate(-1343.3836 -75.800003)"><path id="path6632" d="M1346.3 567.9c6.1-2.8 11.8-4.2 16.9-4.2 11.8 0 19.1 7.9 19.3 21.1 0 .3.2.6.4.8.2.1.4.2.6.2h.3s2-.6 4.8-.6c5.8 0 13.5 2.3 17 13.4 5.1 15.9-14.6 25.5-29 32.5l-.8.4c-14.1 6.9-20.2 9.4-28.7 13l-.7.3-.1-76.9z" class="st147" fill="#587faa"/><path id="path6634" d="M1363.2 562.6v2c11.4 0 18.1 7.3 18.3 20.1 0 .6.3 1.2.8 1.6.3.3.8.4 1.2.4.2 0 .4 0 .6-.1 0 0 1.9-.5 4.6-.5 5.5 0 12.7 2.2 16.1 12.7 4.9 15.1-14.4 24.4-28.5 31.3l-.8.4c-13.7 6.7-19.8 9.3-27.9 12.7l-.3-74.7c5.7-2.6 11.1-3.9 15.9-3.9v-2m0 0c-5.3 0-11.3 1.5-17.9 4.6l.3 78.9c9.6-4.1 15.5-6.5 30.7-13.9 14.6-7.1 35.8-17.1 30.3-34.1-3.9-12-12.5-14.1-18-14.1-3 0-5.1.6-5.1.6-.3-14-8.2-22-20.3-22z"/></g><path id="path6636" d="M3.9164 509.1c1.1-.1 2.2-.2 3.2-.2 12.9 0 16.5 10.9 17.2 20l.3 3.3 2.8-1.8c.1 0 6.3-4 12.9-4 7.3 0 12.3 4.8 14.9 14.4-6.1 5.5-15.1 9.9-22.4 13.5l-.7.4c-13.7 6.7-19.8 9.3-27.9 12.7l-.3-58.3z" class="st82" fill="#2d3f68"/><g id="g6638" transform="translate(-1343.3836 -75.800003)"><path id="path6640" d="M1346.2 707.5c7-2.8 13.8-4.3 19.8-4.3 13.2 0 21.1 7 21.6 19.3.4 8-9.2 14.2-9.3 14.2-.5.3-.6.9-.3 1.3.2.3.5.5.9.5.2 0 .3 0 .5-.1s16.6-8.5 28.6-14.3c4-1.9 8.2-2.9 12.1-2.9 7.4 0 13.4 3.4 16.5 9.2 4.6 8.8-2.8 14.9-3.1 15.2-.4.3-.5.8-.2 1.3.2.3.5.5.9.5.1 0 .2 0 .3-.1 0 0 3.3-1.2 7.6-1.2 5.6 0 13.3 2 18.1 11.7 8.5 16.9-4.7 24.5-12.6 29-9 5.2-38.1 23.4-39.8 24.4l-61.1 24.7-.5-128.4z" class="st147" fill="#587faa"/><path id="path6642" d="M1366 702.1v2c6 0 11.1 1.6 14.6 4.5 3.8 3.1 5.8 7.8 6.1 13.9.3 7.4-8.8 13.3-8.9 13.4-.9.6-1.2 1.8-.7 2.7.4.6 1 1 1.7 1 .3 0 .6-.1.9-.2.2-.1 16.5-8.5 28.6-14.3 3.8-1.9 7.9-2.8 11.7-2.8 7 0 12.7 3.2 15.6 8.7 4.2 8.1-2.6 13.7-2.8 13.9-.8.6-1 1.7-.5 2.5.4.6 1 1 1.7 1 .2 0 .5 0 .7-.1 0 0 3.1-1.1 7.3-1.1 7.7 0 13.5 3.7 17.2 11.1 7.4 14.8-2.4 22.1-12.2 27.7-8.9 5.1-37.4 22.9-39.7 24.4l-59.7 24.1-.4-126.3c6.6-2.6 13.1-4 18.8-4v-2.1m0 0c-6.3 0-13.5 1.6-20.9 4.7l.4 130.6 62.6-25.3s30.5-19.1 39.8-24.5c7.7-4.4 21.8-12.6 13-30.3-5-10-13-12.2-19-12.2-4.6 0-7.9 1.3-7.9 1.3s8.4-6.7 3.4-16.4c-3.3-6.3-9.8-9.8-17.3-9.8-4 0-8.3 1-12.6 3-12.2 5.9-28.6 14.3-28.6 14.3s10.2-6.5 9.8-15.1c-.6-13.8-9.9-20.3-22.7-20.3z"/></g><path id="path6644" d="M3.8164 646.2c1.5-.3 2.9-.4 4.2-.4 4.5 0 8.1 1.5 10.4 4.2 2.5 2.9 3.5 7.2 2.8 12.2l-.3 2 2 .3s3 .5 4.7 3.1c1.3 2 1.6 4.9.7 8.4l-1 4 3.7-1.6c.2-.1 16.1-7.1 25.7-11.7 2.3-1.1 5.1-2.7 7.5-3.5 4.9-1.7 10.7 1.2 12.5 3.6 2 2.7 5.8 11.9 1.2 16.6l-12.5 9.8 9.3-3.9c.1-.1 13.1-7.5 22.9-7.5 2.3 0 4.1.4 5.4 1.3 6.6 4.1 11.3 10.7 12.7 17.7-3.2 4.5-8.5 7.6-12.1 9.7-8.9 5.1-37.4 22.9-39.7 24.4l-59.7 24.1-.4-112.8z" class="st82" fill="#2d3f68"/><path d="M30.1164 786l13.1 18.6h-24.5z" stroke-miterlimit="10" id="polygon6646" class="st146" fill="#191b22" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><g id="g6648" transform="translate(-1343.3836 -75.800003)"><path id="path6650" d="M1346.3 879.4l-.5-70.5c11.7-7 21.4-10.6 28.7-10.6 7.6 0 12.3 3.9 14 11.5.1.3.3.6.6.7.1 0 .2.1.4.1s.4-.1.6-.2c.1-.1 12.8-9.1 25.8-9.1 7.3 0 13.3 2.9 17.9 8.5 5.5 6.8 7.7 13.4 6.5 19.4-1.9 9.1-10.8 15.5-18 19.3-4.2 2.2-11.1 5.7-19 9.7-14.6 7.4-32.7 16.7-40.6 21.1h-16.4z" class="st147" fill="#587faa"/><path id="path6652" d="M1374.4 799.3c7.1 0 11.5 3.6 13 10.7.1.7.6 1.2 1.2 1.4.2.1.5.1.7.1.4 0 .8-.1 1.2-.4.1-.1 12.5-8.9 25.2-8.9 7 0 12.8 2.7 17.2 8.1 5.3 6.6 7.4 12.8 6.3 18.6-1.9 9.2-11.8 15.6-17.5 18.6-4.2 2.2-11 5.7-18.9 9.7-14.5 7.4-32.4 16.5-40.5 21h-15l-.5-68.9c11.3-6.6 20.6-10 27.6-10m0-2c-7.1 0-16.8 3.3-29.7 11l.5 72h17.5c11.8-6.7 47.4-24.5 59.8-31 12.4-6.5 28.3-20 11.9-40.2-5.4-6.6-12.1-8.9-18.7-8.9-13.5 0-26.4 9.3-26.4 9.3-1.5-7.3-6.2-12.2-14.9-12.2z"/></g><path id="path6654" d="M3.8164 802.6l-.4-55.6c8.8-4 15.1-5.8 19.6-5.8 4.5 0 9.8 1.5 10.9 13.2l.3 2.7 2.5-1c.8-.3 20.3-8.4 28-12.3 1.7-.9 4.9-1.8 8.5-1.8 6.1 0 16.4 2.6 18.2 20-3.8 4.6-9.2 7.9-13.1 10-4.2 2.2-11.1 5.7-19 9.7-14.5 7.4-32.4 16.5-40.5 21h-15z" class="st82" fill="#2d3f68"/><path stroke-miterlimit="10" id="path6656" d="M262.5164 805c120.1-133.6 245.9-175.3 283.3-185.2-11.4-12.4-24.7-17.1-37.5-28.3l-.2-7.2c-142.4 45.1-254 137.7-326 219 0 0-.2.6-.7 1.7h81.1z" class="st146" fill="#191b22" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><g id="g6658" transform="translate(-1343.3836 -75.800003)"><path id="path6660" d="M1537.3 879.8c40.6-45 85.7-85.2 134.2-119.5 59.5-42.1 122.3-73.7 186.7-94.1 10.1 9.2 19.9 18.9 29.1 28.8-38.1 10.4-163.2 52.8-281.9 184.8h-68.1z" class="st82" fill="#2d3f68"/><path id="path6662" d="M1858 667.3c9.6 8.7 18.8 17.8 27.5 27.2-20.7 5.7-59.7 18.8-107.9 45.5-63.1 35-121.2 81.7-172.6 138.8h-65.4c40.1-44.3 84.7-83.9 132.5-117.7 59.3-41.9 121.8-73.4 185.9-93.8m.1-2.1c-140.4 44.4-250.9 135.2-323 215.6h70.8c120.1-133.6 245.9-175.3 283.3-185.2-9.7-10.6-19.9-20.7-30.6-30.4h-.5z"/></g><circle stroke-miterlimit="10" id="circle6664" r="56.5" cy="215.40001" cx="893.21649" class="st1" fill="none" stroke="#95b893" stroke-width="2"/><g id="g6666" transform="translate(-1343.3836 -75.800003)"><path id="path6668" d="M2236.6 202.6c48.8 0 88.6 39.7 88.6 88.6 0 48.9-39.7 88.6-88.6 88.6-48.9 0-88.6-39.8-88.6-88.6s39.7-88.6 88.6-88.6m0-3.3c-50.7 0-91.8 41.1-91.8 91.8 0 50.7 41.1 91.8 91.8 91.8 50.7 0 91.8-41.1 91.8-91.8 0-50.7-41.1-91.8-91.8-91.8z" class="st148" fill="#95b893"/></g><circle stroke-miterlimit="10" id="circle6670" r="46.299999" cy="410" cx="1059.1165" class="st149" fill="none" stroke="#95b893" stroke-width="3.25040007"/><g id="g6672" transform="translate(-1343.3836 -75.800003)"><path id="path6674" d="M2402.5 414.1c39.5 0 71.7 32.2 71.7 71.7s-32.2 71.7-71.7 71.7-71.7-32.2-71.7-71.7 32.1-71.7 71.7-71.7m0-3.3c-41.4 0-75 33.6-75 75s33.6 75 75 75 75-33.6 75-75-33.6-75-75-75z" class="st148" fill="#95b893"/></g><circle stroke-miterlimit="10" id="circle6676" r="51.099998" cy="569.60004" cx="893.21649" class="st149" fill="none" stroke="#95b893" stroke-width="3.25040007"/><circle stroke-miterlimit="10" id="circle6678" r="94.699997" cy="569.60004" cx="893.21649" class="st149" fill="none" stroke="#95b893" stroke-width="3.25040007"/><circle stroke-miterlimit="10" id="circle6680" r="76.099998" cy="569.60004" cx="893.21649" class="st149" fill="none" stroke="#95b893" stroke-width="3.25040007"/><circle stroke-miterlimit="10" id="circle6688" r="11.7" cy="523.5" cx="810.21649" fill="#51a1b5" stroke="#31446e" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle stroke-miterlimit="10" id="circle6690" r="11.7" cy="405.90002" cx="985.0163" fill="#a7658d" stroke="#4b2254" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle stroke-miterlimit="10" id="circle6692" r="8.1000004" cy="445.29999" cx="1090.6165" fill="#a8c875" stroke="#4b2254" stroke-width="2.75029993" stroke-linecap="round" stroke-linejoin="round"/><circle stroke-miterlimit="10" id="circle6694" r="11.7" cy="617.10004" cx="951.71649" class="st29" fill="#fbe6c6" stroke="#668794" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6696" r="7" cy="617.40002" cx="956.31635" class="st30" fill="#668794"/><circle stroke-miterlimit="10" id="circle6698" r="19.9" cy="280.80002" cx="829.71649" class="st29" fill="#fbe6c6" stroke="#668794" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6700" r="11.9" cy="286.10001" cx="823.91644" class="st30" fill="#668794"/><circle stroke-miterlimit="10" id="circle6702" r="14.2" cy="499.70001" cx="958.61639" fill="#a34c4c" stroke="#381916" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6704" r="2.5999999" cy="500.40002" cx="951.61639" class="st39" fill="#381916"/><circle id="circle6706" r="2.5999999" cy="492.29999" cx="954.61639" class="st39" fill="#381916"/><circle id="circle6708" r="2.5999999" cy="493.60004" cx="962.5163" class="st39" fill="#381916"/><ellipse stroke-miterlimit="10" id="ellipse6710" ry="8.2004271" rx="6.6003442" cy="1128.4603" cx="-116.2824" class="st84" transform="rotate(-73.770504)" fill="#ad6a3b" stroke="#663f09" stroke-width="1.65338624"/><ellipse stroke-miterlimit="10" id="ellipse6712" ry="4.4000001" rx="5.4000001" cy="1138.6377" cx="198.54999" class="st84" transform="rotate(-58.7950001)" fill="#ad6a3b" stroke="#663f09" stroke-width="1.65330005"/><ellipse stroke-miterlimit="10" id="ellipse6714" ry="4.8000002" rx="4.4000001" cy="717.47546" cx="892.77887" class="st84" transform="rotate(-18.4680007)" fill="#ad6a3b" stroke="#663f09" stroke-width="1.65330005"/><circle stroke-miterlimit="10" id="circle6716" r="14.2" cy="234.09999" cx="949.71649" fill="#ce8c59" stroke="#381916" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><circle id="circle6718" r="2.5999999" cy="234.7" cx="942.71649" class="st39" fill="#381916"/><circle id="circle6720" r="2.5999999" cy="226.7" cx="945.71649" class="st39" fill="#381916"/><circle id="circle6722" r="2.5999999" cy="227.99998" cx="953.71649" class="st39" fill="#381916"/><g id="g6724" transform="translate(-1343.3836 -75.800003)"><path stroke-miterlimit="10" id="path6726" d="M1606.2 856.8c19-20 38.1-34.7 38.1-34.7" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6728" d="M1621.3 816.8c21-19.5 42.5-34.2 42.5-34.2" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6730" d="M1675.5 791.4c22.5-19 42-30.8 42-30.8" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6732" d="M1717 743.5c22-15.1 42-23.9 42-23.9" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6734" d="M1768.8 733.2c23.4-14.7 51.3-25.9 51.3-25.9" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6736" d="M1792.7 703.9c23.9-11.7 48.4-20.5 48.4-20.5" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6738" d="M1844 697.6c14.7-6.8 25.4-9.8 25.4-9.8" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" id="path6740" d="M1554.4 879.3c21-23 42-41 42-41" class="st153" fill="#ce8c59" stroke="#587faa" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></g><g id="g6742" transform="translate(-1343.3836 -75.800003)"><g id="g6744"><path d="M2402.5 485.79999l-1.5 1.40002" stroke-miterlimit="10" id="line6746" class="st1" fill="none" stroke="#95b893" stroke-width="2"/><path d="M2398.2 489.89999L2309.7 575" stroke-miterlimit="10" id="line6748" fill="none" stroke="#95b893" stroke-width="2" stroke-dasharray="3.9,3.9"/><path d="M2308.3 576.40002l-1.5 1.39997" stroke-miterlimit="10" id="line6750" class="st1" fill="none" stroke="#95b893" stroke-width="2"/></g></g><g id="g6752" transform="translate(-1343.3836 -75.800003)"><g id="g6754"><path d="M2236.6001 550.70001v-2" stroke-miterlimit="10" id="line6756" class="st1" fill="none" stroke="#95b893" stroke-width="2"/><path d="M2236.6001 544.59998V295.20001" stroke-miterlimit="10" id="line6758" fill="none" stroke="#95b893" stroke-width="2" stroke-dasharray="4.0554,4.0554"/><path d="M2236.6 293.2v-2l1.3 1.5" stroke-miterlimit="10" id="polyline6760" class="st1" fill="none" stroke="#95b893" stroke-width="2"/><path d="M2240.3999 295.70001l111.5 130.79999" stroke-miterlimit="10" id="line6762" fill="none" stroke="#95b893" stroke-width="2" stroke-dasharray="3.9514,3.9514"/><path d="M2353.2 428l1.3 1.5" stroke-miterlimit="10" id="line6764" class="st1" fill="none" stroke="#95b893" stroke-width="2"/></g></g><g id="g6766" transform="translate(-1343.3836 -75.800003)"><circle stroke-miterlimit="10" id="circle6768" r="33.799999" cy="291.20001" cx="2236.6001" class="st83" fill="#ebb548" stroke="#663f09" stroke-width="3.30660009" stroke-linecap="round" stroke-linejoin="round"/><g id="g6770"><circle id="circle6772" r="3" cy="273.60001" cx="2218.8" class="st33" fill="#fff"/></g></g><g id="g6774" transform="translate(-1343.3836 -75.800003)"><circle stroke-miterlimit="10" id="circle6776" r="33.799999" cy="291.20001" cx="2236.6001" class="st83" fill="#ebb548" stroke="#663f09" stroke-width="3.30660009" stroke-linecap="round" stroke-linejoin="round"/><g id="g6778"><circle id="circle6780" r="3" cy="273.60001" cx="2218.8" class="st33" fill="#fff"/></g></g><circle id="circle6906" r="3.9000001" cy="445.29999" cx="1090.6165" fill="#b4dcf5"/></svg>
diff --git a/app/javascript/images/screen_hello.svg b/app/javascript/images/screen_hello.svg
deleted file mode 100644
index 7bcdd0afd..000000000
--- a/app/javascript/images/screen_hello.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="803.09998" width="1197.8285" viewBox="0 0 1197.8284 803.09996" id="Layer_1"><path id="path6218" d="M419.21425 718.72051s1 40 2 51 3 16 20 17 41-2 50-4 16-6 14-29-4-51-4-51" class="st6" fill="#e09c5c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6220" d="M504.21425 771.52051l-.1-.6c-1.5-5.7-4.5-7-8-6.3-4.8 1-6.1 7.7-6.9 16.7 0 .4-.1.8-.1 1.3l.7.3c.4-.1.9-.2 1.3-.3 5.9-1.2 10.9-3.4 13.1-11.1z" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6222" d="M510.81425 399.72051c46-5 79-28 84-32 0 0-14-12-3-20s18 2 18 2 23.5-29.9 43.5-13.9c20 16 27.5 32.9 20.5 48.9s-52 72-147 85" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6224" d="M239.81425 697.72051c-16 15-41 23-54 5s-4-26-7-30-21 8-13 31 54 48 97 14" class="st4" fill="#e09c5c"/><path id="path6226" d="M500.21425 361.82051s34.6 70.9 43.1 175.4c7.2 89 15 139-46 168s-142 24-180 25-78-4-88-47 .5-76.5.5-76.5 1.4-71.2-2.1-82.7-9.2-28.7-9.2-28.7-5.7 40.1-35.5 53.6c-29.8 13.6-56.1.8-53.9-36.5 0 0-25.5-42.6-37.600004-79.9-12.1-37.3 19.800004-73.9 78.300004-58.8 2-71 63.6-130.7 149.1-137.7 85.4-7.1 106.3 38.7 151.9 40.7 44 2 75-12 98-35s70-53 107-29c0 0 18-6 20 10s-7 16-12 19c0 0 7 22-7 25s-12-18-12-18-23-3-42 27-47.2 70.2-122.6 86.1c-16.1 1.4-29.5-3.9-29.5-3.9" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6228" d="M259.81425 704.72051c0 23-4 53-5 64s3 22.4 21 23c28 1 82 5 87-12 6.3-21.6 5-58 0-70" class="st6" fill="#e09c5c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6230" d="M295.01425 792.42051c.8-9.7 1.8-15.7 6.8-16.7s8.8 3.1 8.9 17.1" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6232" d="M311.01425 792.42051c.8-9.7 1.8-15.7 6.8-16.7s8.8 3.1 8.9 17.1" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6234" d="M326.81425 792.72051c.8-9.7 2-17 7-18s8.9 2.1 9 16" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6236" d="M332.61425 746.52051h-15.4c-7.8 0-14.2-6.4-14.2-14.2 0-7.8 6.4-14.2 14.2-14.2h15.4c7.8 0 14.2 6.4 14.2 14.2 0 7.8-6.4 14.2-14.2 14.2z" fill="#fbc16c"/><path id="path6238" d="M127.01425 433.92051c7.3 9.1 20.6 38.2 19.8 61-.9 22.9 23.8 32.8 36.8 13 13-19.8 16.6-58.4 7.6-77.2-9-18.9-13.9-26-13.9-26s-4.9 9-17.5 10.8c-12.6 1.8-13-3.1-17.3-9.8 0 0 .6 7.4-10.6 11.5-11.2 4.2-14.8-5-14.8-5s2.7 12.7 9.9 21.7z" class="st4" fill="#e09c5c"/><path id="path6240" d="M309.31425 728.32051c-21.3 0-36.8-2.7-48.9-8.4-15.4-7.3-25-19.4-29.1-37.2-9.8-42 .4-75.1.5-75.4l.1-.3v-.3s.1-3.7.1-9.7c13.9.5 33.3 2.8 50.3 10.8 16.8 7.9 27.4 19.6 31.6 34.6 9.3 33.4 33.5 49.6 74.1 49.6 12.6 0 27-1.5 43.9-4.6 8.6-1.6 17.1-2.8 25.3-4 38.7-5.6 72.8-10.5 87.9-47.9-3.3 28.9-14.8 51.7-48.6 67.8-51.3 24.4-116.2 24.5-159.1 24.6-7.7 0-14.3 0-20.1.2-2.9.1-5.5.2-8 .2z" class="st4" fill="#e09c5c"/><path id="path6242" d="M417.81425 390.12051c1.3-8.5 2-14.7-7.8-12.6-9.8 2.1-69.8 18-80.5 20.3-10.8 2.3-8.7 12.1 1.8 18s39.7 23.2 51.7 21.6c12-1.6 22.7-3.8 27.6-19.2 4.9-15.3 7.2-28.1 7.2-28.1z" fill="#2e2314" stroke="#2b2011" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><g transform="translate(-77.185754 15.820514)" id="g6244"><path id="path6246" d="M458.6 419.7c-11.4 0-36.3-14.2-46.9-20.2l-2.2-1.3c-5.1-2.9-8.4-7.1-7.9-10.2.3-2 2.3-3.4 5.5-4.1 5.5-1.2 24-5.9 41.8-10.5l3.8-1c15.9 4.2 28.4 14.9 33.4 28.7l-.2.7c-4.5 14-13.6 16.2-25.9 17.8-.5.1-.9.1-1.4.1z" fill="#ad4949"/></g><g transform="translate(-77.185754 15.820514)" id="g6248"><path id="path6250" d="M404 397c-3.6-2.6-5.6-6.3-5-9.5.5-2.8 2.7-4.7 6.3-5.4 5.8-1.2 25.1-6.2 43.7-11 8.9-2.3 17.5-4.5 24.3-6.2l3.4 15L404 397z" class="st33" fill="#fff"/><path id="path6252" d="M471.9 367.4l2.5 11.1-70 16.4c-2.5-2.1-3.9-4.7-3.5-6.9.5-2.6 3.2-3.5 4.8-3.9 5.8-1.2 25.1-6.2 43.8-11 8.2-2.1 16-4.1 22.4-5.7m3-4.9c-20.4 5.1-61.2 15.8-70 17.7-10.3 2.2-10.6 13-1.3 19l75.6-17.8-4.3-18.9z" class="st42" fill="#7d7d65"/></g><path id="path6254" d="M215.61425 319.92051c-20.7 3.4-36.9-.3-43.7-27.4-6.8-27.1 17-58.9 51.2-71.3 34.2-12.4 68-2.3 68-2.3s9.5-22.5 12.8-35.5c3.3-13 13.3-14.1 23.6 5.2 0 0 28.8-4.1 32.3 26.8 3.6 30.9-20.7 46.4-20.7 46.4" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6256" d="M327.61425 188.52051c4.3 10.3 2.9 22.9 2.7 27" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><g transform="translate(-77.185754 15.820514)" id="g6258"><path id="path6260" d="M358.6 376.9c2.2 5.7 6.2 9.9 8.9 8.3 2.7-1.6 2.9-5.7.4-12.4-2.4-6.6-13.6-29.8-16.6-34.3-3-4.5-6.4-5.8-9.1-4.2-2.7 1.6-1.9 5.5-.1 9.2 1.9 3.8 16.5 33.4 16.5 33.4z"/></g><g transform="translate(-77.185754 15.820514)" id="g6262"><path id="path6264" d="M387.3 470.6c-4.3 0-8.8-.5-13.2-1.6-21.2-5.2-32.9-21.5-36.5-34-2.3-8-1.6-14.9 2-18.5 3.2-3.3 6.7-5 10.2-5 7.5 0 14.4 7.2 17.8 11.5 7.6 9.5 14.8 14.3 21.4 14.3 5.3 0 9.9-3 13.7-9 10-15.4 12.7-34.1 8.2-55.4-1.5-7.1.3-11.2 2.1-13.4 1.8-2.3 4.5-3.6 7.3-3.6 1.6 0 3 .4 4.2 1.2 18.2 11.8 20.2 52 13.6 74.4-5.6 18.8-23.9 39.1-50.8 39.1z" class="st33" fill="#fff"/><path id="path6266" d="M420.2 357.9c1.2 0 2.2.3 3.1.9 7.6 4.9 13 16 15.2 31.2 2 13.6 1 29.3-2.5 41-2.9 9.9-9.1 19.2-17.3 26-9.1 7.6-20 11.6-31.5 11.6-4.2 0-8.4-.5-12.7-1.6-20.4-5-31.6-20.7-35-32.6-2.1-7.2-1.5-13.5 1.5-16.5 2.9-2.9 5.8-4.4 8.8-4.4 6.9 0 13.7 7.5 16.3 10.7 8 10 15.7 15 22.9 15 6 0 11.2-3.3 15.4-9.9 10.3-15.9 13.1-35 8.4-56.9-1.1-4.9-.5-9.1 1.7-11.7 1.5-1.8 3.6-2.8 5.7-2.8m0-4c-6.7 0-14.1 6.4-11.3 19.4 3.6 16.6 3.6 36-7.9 53.8-3.8 5.9-8 8.1-12.1 8.1-8.2 0-16.1-8.8-19.8-13.5-3.8-4.8-11.1-12.2-19.4-12.2-3.8 0-7.7 1.5-11.7 5.6-11 11.3 2 47.6 35.5 55.8 4.7 1.2 9.3 1.7 13.7 1.7 26.7 0 46.6-19.8 52.7-40.5 7.1-24 4.6-64.4-14.4-76.7-1.5-1-3.4-1.5-5.3-1.5z" class="st42" fill="#7d7d65"/></g><path id="path6268" d="M290.11425 457.32051c6.5 1.7 19.4 2 29.8-6.6" fill="none" stroke="#7d7d65" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6270" d="M173.31425 408.82051c-3.7 5-10.1 7.9-16.3 7.2-6.2-.6-11.9-4.7-14.5-10.4-1.1 5.4-5.3 10.2-10.6 11.5-5.3 1.3-11.4-.7-14.8-5 1.6 13 12 22.7 16.5 35" fill="none" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6272" d="M263.31425 420.02051l-17.1 6.5c-5 1.9-10.6-.6-12.4-5.6-1.9-5 .6-10.6 5.6-12.4l17.1-6.5c5-1.9 10.6.6 12.4 5.6 1.9 4.9-.6 10.5-5.6 12.4z" fill="#e68a4c"/><path id="path6274" d="M625.31425 218.52051c7.3-2.8 14.1-4.3 19.2-3.8" class="st34" fill="none" stroke="#fbd7a3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6276" d="M561.31425 267.62051c11.7-11.4 21.9-20.7 31.6-29.6 3.9-3.5 8.7-7.1 13.9-10.3" class="st34" fill="none" stroke="#fbd7a3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6278" d="M471.21425 293.12051c15.7 1.4 33.6-.1 52.7-6.6" class="st34" fill="none" stroke="#fbd7a3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6280" d="M361.61425 250.82051c19.9 3.5 36.4 12.2 56.1 23.6" class="st34" fill="none" stroke="#fbd7a3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><g transform="translate(-77.185754 15.820514)" id="g6282"><path id="path6284" d="M311 486.9c-48 22-68 37-57 78s59 41 59 41-8 25 18 28 55-5 56-41-20-61-63-65" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6286" d="M313 605.9c10 2 25 2 25 2" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><path id="path6288" d="M354.2 548.6l6.5 6.8c4.9 5.1 4.7 13.3-.4 18.2l-1.9 1.8c-5.1 4.9-13.3 4.7-18.2-.4l-6.5-6.8c-4.9-5.1-4.7-13.3.4-18.2l1.9-1.8c5.1-4.9 13.3-4.7 18.2.4z" fill="#fdd06e"/></g><path id="path6290" d="M396.81425 426.32051l-6.5 2.6c-4.9 1.9-10.5-.5-12.4-5.4l-.7-1.8c-1.9-4.9.5-10.5 5.4-12.4l6.5-2.6c4.9-1.9 10.5.5 12.4 5.4l.7 1.8c2 4.9-.5 10.5-5.4 12.4z" fill="#b9655a"/><path id="path6292" d="M218.51425 495.22051c1.8-14 .6-22.1.6-22.1" class="st2" fill="#fbc16c" stroke="#946f3a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/></svg>
diff --git a/app/javascript/images/screen_interactions.svg b/app/javascript/images/screen_interactions.svg
deleted file mode 100644
index 66a36f978..000000000
--- a/app/javascript/images/screen_interactions.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1195.8" height="803"><path stroke-miterlimit="10" class="st99" d="M102.1 466.5c-6 5.8-11.8 5-18.2-.6-2.5-2.2-4.6.9-.6 4.9 4 4 13.5 8.3 22 .8" fill="#e09c5c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M265.2 263.5h-59.8c-15 0-27.3 12.3-27.3 27.3v12.9c0 6.3 2.2 12.1 5.8 16.8-6.7 13.7-21.4 16.9-21.4 16.9 18.9 2.3 24.6-3.5 30.7-9.2 3.7 1.8 7.8 2.9 12.2 2.9h59.8c15 0 27.3-12.3 27.3-27.3v-12.9c.1-15.1-12.2-27.4-27.3-27.4z" fill="#fff" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st99" d="M146.3 472.5c-.1 11.9-2.4 21.1 7.9 21.2 10.3.1 13.2-2.5 13.1-10.1-.1-7.6-.6-21-.6-21" fill="#e09c5c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st101" d="M131.8 365.8c-20.2 0-35.1 7.6-35.1 36v54.3c0 8 4.4 21.8 21.8 21.8h24.1c8.5 0 16.3-2.8 22.5-9.4 6.2-6.6 9.2-13.3 9.2-25.5v-46.6s20.4-.5 29.4-13.3c8.9-12.8 6.9-28.2 5.7-32.6 0 0 5.1-.5 4-4.4-1.1-3.9-7.3-3.3-10.1-1.1 0 0-1.6-1.8-7-1.7-5.4.1-3.7 6.2.7 6.7 0 0 2.4 13.8-4.6 18.7-7 4.9-21.4 6.6-29.8 2.7-8.5-3.7-11.3-5.6-30.8-5.6z" fill="#fbc16c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path class="st4" d="M118.5 476.8c-20.1 0-20.6-18.5-20.6-20.6v-23.1c13 .1 18.8 1.5 18.8 12.4 0 13.2 2.2 19.8 13.9 19.8H162c1.7 0 3.4-.1 5-.7-.8 1-1.7 2.1-2.7 3.2-5.6 6-12.9 9-21.6 9z" fill="#e09c5c"/><path stroke-miterlimit="10" class="st101" d="M124.8 372.1c-9.6-2.9-14.7-4.9-11.8-13.3 2.9-8.4 17-6.6 24.7-2.7 0 0 4-2.4 6.3-3.3 2.3-.9 6.6-1.3 6.7 1.7 0 0 5.4.6 4.4 4.9 0 0 6.4 3.7-8.1 10.7M108.5 381.5c0-6.4-3.8-10.3-11.8-10.3s-14.8 7.5-13 18.7c1.8 11.2-4.3 19.9 2.8 24.9s14.4 1.9 16.7-1.9c0 0 7.6 2 7-9.9" fill="#fbc16c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M137.3 395.8c-5.7 0-8.8 4.4-7.5 10.2 1.3 5.7 5 10 11.4 10.2 6.4.1 12.5-2.1 14.4-11.4 1.9-9.3-1.6-9.4-4.4-9.4-2.8 0-13.9.4-13.9.4z" fill="#544024" stroke="#3b3024" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M146.8 408.9c0-6.7-5.4-12.2-12.2-12.2-.6 0-1.1.1-1.7.1-2.8 1.6-4.1 5-3.2 9.1 1.3 5.7 5 10 11.4 10.2 1.1 0 2.2 0 3.3-.2 1.6-2 2.4-4.4 2.4-7z" fill="#693131" stroke="#381916" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st104" d="M151.1 402.5v-7.2c-3 0-13.8.4-13.8.4-4.5 0-7.4 2.8-7.8 6.8z" fill="#fff" stroke="#7d7d65" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st104" d="M116.2 410.7c6 5.8 14.3 5.8 18.1 2.6 3.8-3.2 5.8-11.4 2.7-12.2-3.1-.8-2.4 4.7-5.2 6.3-2.8 1.6-6 1.2-9-.7-2.9-1.9-5.9-3.2-7.4-1.4-1.3 2-.6 4 .8 5.4z" fill="#fff" stroke="#7d7d65" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M319.4 440.7c-5.7 6.2-14 6.6-18 3.6-4-3-6.4-11-3.4-12 3-1 2.7 4.5 5.5 6s6.1.9 8.9-1.1c2.8-2 5.7-3.6 7.3-1.7 1.6 1.9 1.1 3.8-.3 5.2z" fill="none" stroke="#000" stroke-width=".571"/><path stroke-miterlimit="10" class="st101" d="M104.3 415.3l-20.5.1s-.7-3.4-3.8-2.9c-3.1.5-3.8 2.3-3.9 3.4 0 0-6.8.4-6.9 7.2-.1 6.8 4.9 9.5 12.1 9.1 7.2-.4 24.4 0 24.4 0" fill="#fbc16c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st99" d="M105.4 472.5c-.1 11.9-2.4 21.1 7.9 21.2 10.3.1 13.2-2.5 13.1-10.1-.1-7.6-.2-10.4-.2-10.4" fill="#e09c5c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path d="M122.7 399.8c-.9 0-1.6-.7-1.6-1.6v-10.9c0-.9.7-1.6 1.6-1.6.9 0 1.6.7 1.6 1.6v10.9c0 .9-.7 1.6-1.6 1.6z" fill="#402f19"/><path stroke-miterlimit="10" class="st106" d="M518.8 297c-6.9-8.5-22.1-16.7-42.9-6.4-20.8 10.3-26.2 38-14.9 56.5 11.3 18.5 14.4 22.6 14.4 22.6v46.7c0 9.8 2.8 13.3 10 13.3s11.3-2.8 11.3-9.8v-10.5h29.5v11c0 4.3 2.6 9 9.5 9s9.8-2.3 9.8-11.8V355s.8-27.4-26.7-58z" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path class="st4" d="M485.4 427.9c-6.2 0-8.2-2.8-8.2-11.6V369l-.4-.5s-2-2.7-8.5-13.1c.1-1.4.2-2.8.1-4.1l13 17.2v22c0 5.2 1.1 11.2 9.9 11.2h52.3v15.8c0 9-2.6 10-8 10-7.2 0-7.7-5.5-7.7-7.2v-12.7H495v12.3c0 5.5-3 8-9.6 8z" fill="#e09c5c"/><path d="M504.6 170.3h206.2v203.5H504.6z" stroke-miterlimit="10" stroke="#3b3024" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path d="M477.8 330.1c-.8 0-1.6-.4-2-1.1l-5.3-9c-.3-.5-.4-1.2-.2-1.7.2-.6.5-1.1 1.1-1.4 1.1-.6 2.5-.3 3.2.8l5.3 9c.6 1.1.3 2.5-.8 3.2-.5.1-.9.2-1.3.2z" fill="#141a1c"/><path stroke-miterlimit="10" class="st108" d="M264.8 453c-7.2.9-16.7-.7-21.6-1.8-4.9-1.1-7.8 4.3-8.5 9.5-.7 5.2 11.7 14.1 32.7 8.7M333 450.2c13.1 4.1 22.2 11.7 22 20.3-.2 8.6-9.6 14.2-16.5 15.5-6.9 1.3-9.8-6.1-8.9-11.1.9-5 3.4-6.6 3.4-6.6M328 465.6c5 2.6 10.1 5.4 10.1 5.4M334 412c0-6.4 3.8-10.3 11.8-10.3s14.8 7.5 13 18.7c-1.8 11.2 4.3 19.9-2.8 24.9-7.1 4.9-14.4 1.9-16.7-1.9 0 0-7.6 2-7-9.9" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st108" d="M298.1 395.3c-29.7-.3-34.4 7.9-42 14.4-7.6 6.6-17.6 18.8-36.6 19.5 0 0-2.5-3.5-5.2-1s-2.2 5.9-.3 7.2c0 0-3.7 3.7.2 7.6 3.9 3.9 7.2 0 7.2 0s14.4 1.3 25.9-4c11.4-5.4 15.1-3.3 15.1-3.3v50.4c0 15.8 7.2 22 25.9 22s36.8 1.7 44.5-6.2c7.7-7.9 6.4-19.2 5.9-29.2s0-28.1 0-43.5c0-15.4-1.4-33.6-40.6-33.9z" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st109" d="M310.3 505.6c0 4.8-.5 6.6-.2 10.1-1.6 1.1-2.2 3-1.7 4.6.6 2 3.6 4 9.9 3.9 10.4.1 13.2-2.5 13.1-10.1-.1-3.5-.2-8.2-.3-12.2" fill="#dcceb5" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path d="M304.5 507c-2.6 0-5.1 0-7.9-.1-2.8 0-5.6-.1-8.4-.1-18 0-24.7-5.7-24.7-20.9 0-2.5 4.3-4.8 9-4.8 2.3 0 6.6.6 9.2 4.3 3.8 5.2 8.9 7.1 16.3 7.1 4.5 0 14.5.2 17.9-2.4 4.5-3.3 5.8-7.9 13.3-9.6 3-.7 5.6-1.2 8.6-.4.2 9.3-1.3 17.2-5.9 20.8-5.5 4.4-14.5 6.1-27.4 6.1z" fill="#dcceb5"/><path stroke-miterlimit="10" class="st108" d="M311.9 402.8c7-.1 10.7-4.4 10.2-8.6-.6-4.1-3.5-9.9-16.6-9.2-5.8.3-8.7 4.1-11.5 4.1-2.8-.1-8.3-8.1-13.1-7.6-4.8.5-5.1 3.9-4.3 5.5 0 0-4.3 1.3-1.9 6.9 2.4 5.6 7.3 7.5 12.1 8.1" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st109" d="M271.7 503.1c0 4.8-.5 9.2-.2 12.7-1.6 1.1-2.2 3-1.7 4.6.6 2 3.6 4 9.9 3.9 10.4.1 13.2-2.5 13.1-10.1 0-2.9-.1-3.7-.2-7.2" fill="#dcceb5" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M463.1 323.1c-3.8-5.7-8.6-7.6-16.5-3.7-7.9 3.9-8.7 14.8-4.6 21 4.2 6.3 4.8 11.2 3.8 15.8-1 4.6.5 7.1 3.7 8 3.2.9 5.2-1.1 5.2-1.1s11.2 1.1 12.4-8c1.2-9.1-.2-12.9-.2-12.9" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M454.7 363.1c2-2.5 2-7.6 2-7.6" fill="none" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M462.8 306.7c-7.3-3.2-9.2-12.8-2.8-17 6.4-4.2 13.3-4.3 13.3-4.3s7.1-12.2 11.7-12.6c4.6-.4 6 2.7 5.2 5.2 0 0 5.9-1.1 6 3.8.1 5-2.6 7.8-6.4 10.6" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M486.8 340.8c7.3 2.2 15.1 2.2 19.6-4.9 4.5-7.1 6.9-14.3 2.9-15.8s-5.4 2-7.2 6.5c-1.8 4.5-5.1 6-10.8 5.1-5.7-.9-7.7 0-8.1 2.7-.4 2.7.3 5.3 3.6 6.4z" fill="#fff" stroke="#4a493c" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M627.8 211.5c.7-8.6 12.3-17.4 29.3-11.5 17 5.9 30.2 19.1 26.7 44.7 0 0 13.1 53.9 13.6 80l-31.7 1.6 1.1-57.3c0 .1-50.3-41.3-39-57.5z" fill="#fbdeb5" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st113" d="M666.8 269.1c-.4-14.1.7-22.5.7-22.5" fill="#fbc16c" stroke="#946f3a" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M628.7 208.6c6.4-7.9 18.4-6.8 28.2-1.2 9.9 5.5 15.4 12 15.4 12" fill="none" stroke="#946f3a" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st115" d="M622.4 215.4c-2.1-4.9 9.9-8.8 18.2-3.6 8.3 5.2 18.6 15.2 18.5 26.7-.1 11.5-11.2 9.1-11.2 9.1s-25.1-31.4-25.5-32.2z" fill="#fbe6c6" stroke="#668794" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M607 294c4.3 13.7 10.6 20.3 10.6 20.3l31.8-16.4-7.9-12.1z" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path class="st45" d="M657.1 258.2c0 25.5-21.2 42.3-45.8 44-28.8 2-43.4-18.5-43.4-44s20-46.1 44.6-46.1 44.6 20.6 44.6 46.1z" fill="#fbc16c"/><path stroke-miterlimit="10" class="st106" d="M619.4 301.1c-2.6.6-5.3.9-8.1 1.1-28.8 2-43.4-18.5-43.4-44s20-46.1 44.6-46.1 44.6 20.7 44.6 46.1c0 7.1-1.6 13.5-4.5 19.1" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M581.5 247.7c-18.4 13.4-32.3 13.5-41.8 4.6 0 0 1.6-5.8-4.2-4.8-5.8 1-7.8 7.2-5.4 10.4 0 0-2.6 4.2-.4 8.4s8 2.8 8 2.8 8.4 9.4 20.3 9.4 21.1-3.4 25.9-8.4" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M599.2 282.6c-.3-2.5-1.6-4.8-3.6-6.3s-4.6-2.2-7-1.8c-.9.1-1.9.5-2.3 1.3-1.3-.4-2.6-.7-3.9-.5-1.3.2-2.6.8-3.3 2-.7 1.1-.7 2.7.2 3.7-.4 2.4.3 5 2.3 6.4.8.5 1.7.9 2.6 1.1 2.1.6 4.4.7 6.5 0 1.3-.4 2.4-1.1 3.5-1.8 1.7-1.2 3.7-2.3 5-4.1z" fill="#a34c4c" stroke="#47271c" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M592.6 281.5c-2.1 2.2-5.4 3.2-8.4 2.7-1.7-.3-3.5-1.3-4-3 1.8-1.4 4-2.1 6.3-2.1 2.2 0 4.3 1 6.1 2.4z" fill="#fbe6c6" stroke="#47271c" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><circle cx="613.1" cy="271.9" r="7.2" fill="#a34c4c"/><path stroke-miterlimit="10" class="st118" d="M594.6 250.6c2.1 4.5 3.4 5.7 6.3 6.6 2.9.9 7.5-.6 9.4-3.2 0 0-2.2-3.7-7.2-4.9-5-1.1-8.5 1.5-8.5 1.5zM580.5 247.2s.9-4.5-8.9-7.4c-1.2 2.8-2.1 5.8-2.7 8.9 6.5 1.3 9.4.8 11.6-1.5z" fill="#fbe6c6" stroke="#946f3a" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M642.7 250.6c-5 13.3-5.7 28.4-1.9 33.9 3.9 5.6 9.1 4.2 9.9 1.1 0 0 .7 5.1 6.6 5.7 5.8.6 10.3-6.8 10.2-19-.1-12.2-3.7-21-12.9-21.9-9.2-.9-11.9.2-11.9.2z" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M574.6 233.9c12.3-2.5 26.9-2.1 42.9 7.1s30.1 14 39.6 14.9c-1.1-24.5-20.6-44-44.5-44-16.1.1-30.2 8.9-38 22z" fill="#51a1b5" stroke="#31446e" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st113" d="M596.6 240.8c1.7-1 3.7-1.5 5.6-1.6M605.7 238.9c1 0 1.9.2 2.8.5M576.4 235.5c1.8.3 3.5 1.3 4.8 2.6" fill="#fbc16c" stroke="#946f3a" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st120" d="M577.6 242.5c-.3.2-.6.4-.9.7-1.5 1.7-1.4 4.3.2 5.9 1.5-.3 2.6-1 3.6-2 0 .1.5-2.2-2.9-4.6zM610.3 254s-1.6-2.8-5.3-4.3c-.4.2-.9.5-1.2.9-1.6 1.8-1.4 4.5.3 6.1.2.2.5.4.7.5 2.2-.4 4.4-1.6 5.5-3.2z" fill="#4d3b21" stroke="#2b2111" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M683.8 244.7c-2.3-7.7-5.4-11.6-5.4-11.6" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st121" d="M611.3 323.1c-3.1 9.1-5.8 21.9 2 32.1l-2.2 11.4 80.7 2.3s-1-32.5-15.5-42.8c-14.4-10.4-15.9-11.5-18.9-15-3.1-3.5-5.9-9.7-5.9-9.7z" fill="#876a4d" stroke="#3b3024" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st121" d="M649.1 296.5c-18 2.9-31.5 11.9-38.2 22.5-3.8 6-3.2 10.1-3.2 10.1l47.2-28zM605.7 365.5c.5-12.8 3.5-34.8 20.8-36.8s39.3 3.1 55.7 38.2z" fill="#876a4d" stroke="#3b3024" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M497.8 163.6v218.9h218.9V163.6zm201.9 201.9H514.8V180.6h184.9z" fill="#594726" stroke="#45331b" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path d="M504.6 170.3h206.2v206.2H504.6z" stroke-miterlimit="10" fill="none" stroke="#45331b" stroke-width="2.674" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M651.5 312.2c6.5.1 10.6 4.6 10.6 4.6" fill="none" stroke="#3b3024" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st113" d="M679.6 325.8c-2.9-26.5-7.3-51.7-7.3-51.7M683.3 325.3l-.6-27.8" fill="#fbc16c" stroke="#946f3a" stroke-width="1.782" stroke-linecap="round" stroke-linejoin="round"/><circle stroke-miterlimit="10" class="st115" cx="649.4" cy="298" r="7.7" fill="#fbe6c6" stroke="#668794" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M607.4 236.3c3.3 1.2 6.6 2.8 10 4.7 16 9.2 30.1 14 39.6 14.9-.7-15.2-8.5-28.5-20.1-36.4-11.9 1.5-22.4 7.8-29.5 16.8z" fill="#31446e" stroke="#31446e" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st106" d="M495.1 347c5.7 4.6 14.7 8.5 20.1 6.6 7.7-2.7 12.7-4.6 15.8 2.2 3.1 6.8-1.9 10.8-10.1 15.2-9.9 5.2-18.6.3-26.3-3.7M570.7 380.9c0 4.9-3.9 7-8.8 7s-8.8-2.2-8.8-7 3.9-7.7 8.8-7.7 8.8 2.9 8.8 7.7z" fill="#fbc16c" stroke="#946f3a" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M593.5 225.5c8.4.5 16.9 1.8 28.6 7.8" fill="none" stroke="#31446e" stroke-width="2.674" stroke-linecap="round" stroke-linejoin="round"/><path d="M598.6 175.5h3.6M616.3 175.5h64M588.7 175.5h5.6M513.3 175.5H579" stroke-miterlimit="10" class="st127" fill="none" stroke="#fbf0d3" stroke-width="2.674" stroke-linecap="round" stroke-linejoin="round"/><path class="st72" d="M262.8 284.5h-54.6c-1.9 0-3.4-1.5-3.4-3.4s1.5-3.4 3.4-3.4h54.6c1.9 0 3.4 1.5 3.4 3.4s-1.5 3.4-3.4 3.4zM262.8 301.4h-54.6c-1.9 0-3.4-1.5-3.4-3.4s1.5-3.4 3.4-3.4h54.6c1.9 0 3.4 1.5 3.4 3.4 0 1.8-1.5 3.4-3.4 3.4zM262.8 318.2h-54.6c-1.9 0-3.4-1.5-3.4-3.4s1.5-3.4 3.4-3.4h54.6c1.9 0 3.4 1.5 3.4 3.4s-1.5 3.4-3.4 3.4z" fill="#4a4439"/><path stroke-miterlimit="10" class="st108" d="M273.9 412c0-6.4 3.8-10.3 11.8-10.3s14.8 7.5 13 18.7c-1.8 11.2 4.3 19.9-2.8 24.9-7.1 4.9-14.4 1.9-16.7-1.9 0 0-7.6 2-7-9.9" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path d="M534.8 202.3h45.1M534.8 313.4h45.1M550.1 330.7h29.8M534.8 348.4h45.1M534.8 218.4h11.8" stroke-miterlimit="10" class="st128" fill="#fbe6c6" stroke="#28353b" stroke-width="7.13" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st101" d="M172.3 427.6c11.6-.6 21.6-4.6 26.7-9.3 5.8-5.3 8.9-10.5 3.7-15.1-5.1-4.5-10.1-.1-10.1-.1s-2-3.1-5-.8-.8 4.5-.8 4.5-3.6 5-14.9 5.5" fill="#fbc16c" stroke="#946f3a" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path class="st31" d="M117 400.6l-3.5.6c-1 .2-2-.5-2.1-1.5-.2-1 .5-2 1.5-2.1l3.5-.6c1-.2 2 .5 2.1 1.5.2 1-.4 2-1.5 2.1zM476.8 338l-5.4.9c-1.6.3-3.1-.8-3.3-2.4-.3-1.6.8-3.1 2.4-3.3l5.4-.9c1.6-.3 3.1.8 3.3 2.4.3 1.6-.8 3.1-2.4 3.3z" fill="#e68a4c"/><path stroke-miterlimit="10" class="st129" d="M187.7 375.8c.7-.2 1-.4 1.6-.7M182.5 377.2c.9-.2.4 0 1.2-.2M170.2 377.4c2.2.3 4.4.4 6.6.4M156.1 373.4c2.4 1.1 5 2 7.7 2.7" fill="none" stroke="#fbd7a3" stroke-width="2.853" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#946f3a" fill="#e09c5c" class="st130" d="M943 464.9c-8.7 8.4-17 7.2-26.3-.8-3.6-3.1-6.6 1.3-.8 7.1s19.4 12 31.7 1.2M1006.7 473.5c-.2 17.1-3.5 30.4 11.5 30.6 15 .2 19.1-3.7 18.9-14.6-.2-11-.8-30.2-.8-30.2"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#946f3a" fill="#fbc16c" class="st131" d="M985.8 319.6c-29.1 0-50.6 10.9-50.6 51.9v78.4c0 11.6 6.3 31.4 31.4 31.4h34.7c12.2 0 23.5-4 32.4-13.6 8.9-9.6 13.2-19.2 13.2-36.7v-67.1s29.4-.7 42.3-19.2c12.9-18.5 9.9-40.7 8.3-47 0 0 7.4-.7 5.8-6.3-1.6-5.6-10.5-4.7-14.6-1.6 0 0-2.3-2.6-10.1-2.4-7.8.2-5.3 9 1 9.6 0 0 3.5 20-6.6 27s-30.9 9.5-43 3.9c-12.1-5.5-16.1-8.3-44.2-8.3z"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="4.327" stroke="#402f19" fill="none" class="st132" d="M983.3 370.5c8.6 5.9 19.2 7.4 26.8.7"/><path fill="#e09c5c" class="st4" d="M966.6 479.7c-28.9 0-29.8-26.7-29.8-29.8v-33.3c18.8.2 27.1 2.2 27.1 17.9 0 19 3.1 28.6 20.1 28.6h45.2c2.5 0 4.9-.1 7.2-1.1-1.1 1.5-2.4 3-3.9 4.6-8.1 8.7-18.6 13-31.2 13h-34.7z"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#946f3a" fill="#fbc16c" class="st131" d="M975.8 328.7c-13.8-4.1-21.2-7-17.1-19.1 4.1-12.1 24.5-9.5 35.6-3.9 0 0 5.8-3.4 9.1-4.7 3.3-1.3 9.5-1.9 9.7 2.4 0 0 7.8.8 6.4 7 0 0 9.3 5.3-11.7 15.4M952.2 342.3c0-9.3-5.4-14.8-17-14.8s-21.4 10.8-18.7 27c2.7 16.2-6.2 28.7 4 35.9 10.2 7.2 20.8 2.7 24.1-2.7 0 0 11 2.9 10-14.3"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#7d7d65" fill="#fff" d="M963.3 384.4c8.7 8.4 20.6 8.4 26.1 3.8 5.5-4.6 8.4-16.4 4-17.5-4.4-1.2-3.5 6.7-7.5 9.1-4 2.3-8.7 1.7-12.9-1-4.2-2.7-8.5-4.7-10.6-2-2.1 2.7-1.1 5.6.9 7.6z"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#946f3a" fill="#e09c5c" class="st130" d="M947.8 473.5c-.2 17.1-3.5 30.4 11.5 30.6 15 .2 19.1-3.7 18.9-14.6-.2-11-.3-15-.3-15"/><path fill="#e68a4c" class="st31" d="M965.4 369.8l-6.7 1.1c-1 .2-2-.5-2.1-1.5l-.3-1.6c-.2-1 .5-2 1.5-2.1l6.7-1.1c1-.2 2 .5 2.1 1.5l.3 1.6c.2.9-.5 1.9-1.5 2.1z"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="4.115" stroke="#fbd7a3" fill="none" class="st134" d="M1066.5 334c1-.4 1.4-.5 2.4-1M1059 336.1c1.2-.2.5 0 1.7-.3M1041.1 336.4c3.1.4 6.3.6 9.5.5M1020.8 330.6c3.4 1.5 7.2 2.9 11.1 3.9"/><path stroke-miterlimit="10" class="st135" d="M275.1 402.4c.7-.3 1.3-.5 1.9-.8M269.6 405.1c.9-.5.9-.6 1.8-1.1M261.8 410.5c1.6-1.2 2.5-1.9 4.1-2.9M254.1 417.8c1.2-1.3 2.6-2.6 4-3.9" fill="none" stroke="#fff" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st136" d="M519.2 357.7c.9-.3 1.8-.7 2.7-1.1M508.6 358.8c1.5.2 2.9.3 4.5.1M495 353.7c2.7 1.4 5.2 2.7 7.7 3.6" fill="none" stroke="#fbd7a3" stroke-width="4.456" stroke-linecap="round" stroke-linejoin="round"/><path d="M705.7 298.9v3M705.7 290.9v2.6M705.7 243.7v38.4" stroke-miterlimit="10" class="st137" fill="none" stroke="#bf9649" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path d="M700.3 206.8L712 226l19.7 11.1-19.3 11.8-11.1 19.6-11.8-19.2-19.6-11.1 19.3-11.8zM687.9 176l8.4-4.9 5-8.4 4.9 8.4 8.4 5-8.4 4.9-5 8.4-4.9-8.4z" class="st33" fill="#fff"/><path d="M509.2 246.6v-2.9M509.2 254.7V252M509.2 301.9v-38.4" stroke-miterlimit="10" class="st137" fill="none" stroke="#bf9649" stroke-width="3.565" stroke-linecap="round" stroke-linejoin="round"/><path d="M454.6 433.1h255.3v95.6H454.6z" fill="#587faa"/><path d="M708.8 434.1v93.6H455.5v-93.6h253.3m2-2H453.5v97.6h257.3z"/><path d="M708.81 446.053v9.1h-253.2v-9.1z" class="st82" fill="#2d3f68"/><path d="M455.3 446.1h255.5M462.3 463.4v2.2M462.3 446.1v13.1M468.4 463.4v2.2M468.4 446.1v13.1" stroke-miterlimit="10" class="st80" fill="#587faa" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M458.9 435.7h246.8" stroke-miterlimit="10" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st158" d="M714.6 483.2c0-6.8-2.8-11.9-6.9-11.9-4.1 0-6.7 4.1-6.7 11.9v17.4c0 4.8.5 11.1 6.8 11.1s4.8-17.9 4.8-17.9M767.3 483.2c0-6.8 2.8-11.9 6.9-11.9 4 0 6.7 4.1 6.7 11.9v17.4c0 4.8-.5 11.1-6.8 11.1s-4.8-17.9-4.8-17.9" fill="#f4a679" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st158" d="M801.4 500.9c-2.4-2.8-6.8-3.1-9.7-.8-6.2 4.9-9.9 7.4-16.1 11V500c0-.6-.1-1.1-.1-1.7.1-.9.1-1.9.1-2.9 0-18.7-15.2-30.7-33.9-30.7s-33.9 12-33.9 30.7c0 1 0 1.9.1 2.9-.1.5-.1 1.1-.1 1.7v9.7c-5.8-3.4-9.4-5.8-15.3-10.6-2.9-2.3-7.2-2-9.7.8-2.4 2.8-1.9 7.3 1.3 9.9 7.6 6 11.7 8.7 20.1 13.4 1.2.7 2.4 1 3.6 1v25.6c0 .4 0 .9.1 1.3 0 .3-.1.6-.1.9v22.6c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8v-12.8h29.3v12.8c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8V552c0-.3 0-.6-.1-.9 0-.4.1-.9.1-1.3V525c1.5.2 3-.1 4.4-.9 8.4-4.7 12.5-7.4 20.1-13.4 2.9-2.4 3.4-6.9 1-9.8z" fill="#f4a679" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path d="M722.6 561.9h40.7" stroke-miterlimit="10" class="st108" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st158" d="M737.3 557.4c3.9 9.1 16.6 9.5 23.8 3.7 2.8-2.2 2.4-4.5-1.9-3.7-4.3.7-10.6 3.9-15.6-2M724.6 471.3c-1.8-7.5 1.7-14.4 13.4-12.2 2.7.5 4.8 1.5 4.8 1.5s6-1 11.2-2.8c5.2-1.8 9 .5 9.9 5.4.8 4.9-1.5 8.3-8.9 9.7" fill="#f4a679" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st159" d="M625.2 484.8c0-6.8-2.8-11.9-6.9-11.9-4 0-6.7 4.1-6.7 11.9v17.4c0 4.8.5 11.1 6.8 11.1s4.8-17.9 4.8-17.9M677.9 484.8c0-6.8 2.8-11.9 6.9-11.9 4.1 0 6.7 4.1 6.7 11.9v17.4c0 4.8-.5 11.1-6.8 11.1s-4.8-17.9-4.8-17.9" fill="#965e8c" stroke="#5c3556" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st159" d="M687.5 513.4l-1.3 1.6v-13.3c0-.6-.1-1.1-.1-1.7.1-.9.1-1.9.1-2.9 0-18.7-15.2-33.9-33.9-33.9s-33.9 15.2-33.9 33.9c0 1 0 1.9.1 2.9-.1.5-.1 1.1-.1 1.7v11.7c-13.2 3.2-16 17.8 0 24.1v14c0 .4 0 .9.1 1.3 0 .3-.1.6-.1.9v22.6c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8v-12.7h29.3v12.8c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8v-22.6c0-.3 0-.6-.1-.9 0-.4.1-.9.1-1.3v-13.5c.4-.1.9-.3 1.3-.5 15.8-6.3 13-21-.3-24.2z" fill="#965e8c" stroke="#5c3556" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path d="M632.8 563.6h40.7" stroke-miterlimit="10" fill="#fbe6c6" stroke="#5c3556" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st161" d="M677.3 479.1c.8 1.1 1.5 2.2 2.1 3.4M671.8 473.2c.9.8 1.8 1.6 2.7 2.5M633 473c5.3-4.2 12-6.7 19.2-6.7 6.4 0 12.3 2 17.3 5.3" fill="none" stroke="#b895a6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M618.3 537.5v-10.4l3-2.1M686.2 538v-11.6l-3-2.1" stroke-miterlimit="10" class="st162" fill="none" stroke="#5c3556" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path class="st163" d="M536.7 483.2c0-6.8-2.8-11.9-6.9-11.9-4.1 0-6.7 4.1-6.7 11.9v17.4c0 4.8.5 11.1 6.8 11.1s4.8-17.9 4.8-17.9M589.4 483.2c0-6.8 2.8-11.9 6.9-11.9 4 0 6.7 4.1 6.7 11.9v17.4c0 4.8-.5 11.1-6.8 11.1s-4.8-17.9-4.8-17.9" fill="#fbe6c6"/><path stroke-miterlimit="10" class="st108" d="M623.5 500.9c-2.4-2.8-6.8-3.1-9.7-.8-6.2 4.9-9.9 7.4-16.1 11V500c0-.6-.1-1.1-.1-1.7.1-.9.1-1.9.1-2.9 0-18.7-15.2-30.7-33.9-30.7s-33.9 12-33.9 30.7c0 1 0 1.9.1 2.9-.1.5-.1 1.1-.1 1.7v9.7c-5.8-3.4-9.4-5.8-15.3-10.6-2.9-2.3-7.2-2-9.7.8-2.4 2.8-1.9 7.3 1.3 9.9 7.6 6 11.7 8.7 20.1 13.4 1.2.7 2.4 1 3.6 1v25.6c0 .4 0 .9.1 1.3 0 .3-.1.6-.1.9v22.6c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8v-12.8h29.3v12.8c0 3.2 2.6 5.8 5.8 5.8h7.8c3.2 0 5.8-2.6 5.8-5.8V552c0-.3 0-.6-.1-.9 0-.4.1-.9.1-1.3V525c1.5.2 3-.1 4.4-.9 8.4-4.7 12.5-7.4 20.1-13.4 2.9-2.4 3.4-6.9 1-9.8zM544.3 561.9H585" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st108" d="M544.5 472.5c-3.4-7.4 3.2-16.2 17.7-12.8 0 0 16.5-3.7 19.8-2.6 2.7 1 3.2 3.5 0 4.8 0 0 3.2 3.7-.8 5.3 0 0 1.1 4.3-3.6 5.3s-13.4 0-13.4 0M574.1 466.6c3.2-.1 7.1.6 7.1.6M572.6 461.9s4.8-1 9.3 0" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="4.327" stroke="#402f19" fill="none" class="st132" d="M966.2 358.4c3.2-4.1 7.7-4.8 10.8 0"/><g><path d="M1086.8 435.8v-67.5L1048 354l-60.6 14.4v69.2l40.2 17.1z" stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#552814" fill="#e14741" class="st164"/><path d="M1048 354l-60.6 14.4 40.1 13 59.3-13.1zM1086.8 368.3l-59.3 13.1.1 73.3 59.2-15.1z" stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#552814" fill="#e14741" class="st164"/></g><path stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#946f3a" fill="#fbc16c" class="st131" d="M950.1 415.4c13 12.2 29.5 18.9 48.8 15.1 7.6-1.5 9.4-19.1-3.3-19.4 0 0-1.8-6.5-6.1-5.7-4.3.8-2.4 5.7-2.4 5.7s-18.6-4.6-25.9-12.2"/><path stroke-miterlimit="10" class="st109" d="M330.1 497c6 5.8 11.8 5 18.2-.6 2.5-2.2 4.6.9.6 4.9-4 4-13.5 8.3-22 .8" fill="#dcceb5" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" d="M727.9 463.2c2.2-1.9 6.1-3.7 14.1 0 0 0 8.5-1.3 13.5-3.3" fill="none" stroke="#f7ceb2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M1051.4 416.2l-9.2-5.6 12.1-4 4.7-12.3 4.7 10.1 12.1-2.1-9.2 10.2 2.8 11-10.4-3.7-10.4 8.8z" fill="#fbc16c" class="st45"/><path stroke-miterlimit="10" class="st108" d="M559.4 557.4c3.9 9.1 16.6 9.5 23.8 3.7 2.8-2.2 2.4-4.5-1.9-3.7-4.3.7-10.6 3.9-15.6-2" fill="#fbe6c6" stroke="#668794" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><path stroke-miterlimit="10" class="st159" d="M644.8 557.4c3.9 9.1 16.6 9.5 23.8 3.7 2.8-2.2 2.4-4.5-1.9-3.7-4.3.8-10.6 3.9-15.6-2" fill="#965e8c" stroke="#5c3556" stroke-width="2.283" stroke-linecap="round" stroke-linejoin="round"/><g transform="translate(-18.4)"><circle r="38.4" cy="585.9" cx="616.3" class="st82" fill="#2d3f68"/><path class="st33" d="M607.7 585.6v7.9h12.5l4.5 6.1h-22.8v-14h-6.5l9.2-10.9 9.4 10.9zM626.5 587.6v-7.9H614l-4.5-6.1h22.8v13.9l6.5.1-9.3 10.9-9.3-10.9z" fill="#fff"/></g><g transform="translate(-67.403)"><circle r="38.4" cy="582.2" cx="265.5" class="st82" fill="#2d3f68"/><path d="M283.1 580c-4.8-8.9-19.9-8.5-25.1-8.1V564l-13.5 13.5L258 591v-7.6c16.4 0 22.9.4 21.9 16.7 0 .2 9-9.3 3.2-20.1z" class="st33" fill="#fff"/></g><g transform="translate(-.3)"><circle r="38.4" cy="582.2" cx="996.8" class="st82" fill="#2d3f68"/><path class="st33" d="M1005.4 586.9l3.2 13.4-11.8-7.2-11.8 7.2 3.2-13.4-10.4-9 13.7-1.1 5.3-12.8 5.3 12.8 13.8 1.1z" fill="#fff"/></g><path d="M1032 385l51-12" stroke-miterlimit="10" stroke-linejoin="round" stroke-linecap="round" stroke-width="3.292" stroke="#e69985" fill="none"/></svg>
\ No newline at end of file
diff --git a/app/javascript/images/void.png b/app/javascript/images/void.png
index d73066688..c2b803c13 100644
Binary files a/app/javascript/images/void.png and b/app/javascript/images/void.png differ
diff --git a/app/javascript/mastodon/actions/account_notes.js b/app/javascript/mastodon/actions/account_notes.js
index d17441000..72b943300 100644
--- a/app/javascript/mastodon/actions/account_notes.js
+++ b/app/javascript/mastodon/actions/account_notes.js
@@ -14,24 +14,24 @@ export function submitAccountNote(id, value) {
       dispatch(submitAccountNoteSuccess(response.data));
     }).catch(error => dispatch(submitAccountNoteFail(error)));
   };
-};
+}
 
 export function submitAccountNoteRequest() {
   return {
     type: ACCOUNT_NOTE_SUBMIT_REQUEST,
   };
-};
+}
 
 export function submitAccountNoteSuccess(relationship) {
   return {
     type: ACCOUNT_NOTE_SUBMIT_SUCCESS,
     relationship,
   };
-};
+}
 
 export function submitAccountNoteFail(error) {
   return {
     type: ACCOUNT_NOTE_SUBMIT_FAIL,
     error,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index ce7bb6d5f..88407ae6c 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -77,6 +77,8 @@ export const FOLLOW_REQUEST_REJECT_REQUEST = 'FOLLOW_REQUEST_REJECT_REQUEST';
 export const FOLLOW_REQUEST_REJECT_SUCCESS = 'FOLLOW_REQUEST_REJECT_SUCCESS';
 export const FOLLOW_REQUEST_REJECT_FAIL    = 'FOLLOW_REQUEST_REJECT_FAIL';
 
+export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
+
 export function fetchAccount(id) {
   return (dispatch, getState) => {
     dispatch(fetchRelationships([id]));
@@ -89,7 +91,7 @@ export function fetchAccount(id) {
       dispatch(fetchAccountFail(id, error));
     });
   };
-};
+}
 
 export const lookupAccount = acct => (dispatch, getState) => {
   dispatch(lookupAccountRequest(acct));
@@ -124,13 +126,13 @@ export function fetchAccountRequest(id) {
     type: ACCOUNT_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchAccountSuccess() {
   return {
     type: ACCOUNT_FETCH_SUCCESS,
   };
-};
+}
 
 export function fetchAccountFail(id, error) {
   return {
@@ -139,7 +141,7 @@ export function fetchAccountFail(id, error) {
     error,
     skipAlert: true,
   };
-};
+}
 
 export function followAccount(id, options = { reblogs: true }) {
   return (dispatch, getState) => {
@@ -154,7 +156,7 @@ export function followAccount(id, options = { reblogs: true }) {
       dispatch(followAccountFail(error, locked));
     });
   };
-};
+}
 
 export function unfollowAccount(id) {
   return (dispatch, getState) => {
@@ -166,7 +168,7 @@ export function unfollowAccount(id) {
       dispatch(unfollowAccountFail(error));
     });
   };
-};
+}
 
 export function followAccountRequest(id, locked) {
   return {
@@ -175,7 +177,7 @@ export function followAccountRequest(id, locked) {
     locked,
     skipLoading: true,
   };
-};
+}
 
 export function followAccountSuccess(relationship, alreadyFollowing) {
   return {
@@ -184,7 +186,7 @@ export function followAccountSuccess(relationship, alreadyFollowing) {
     alreadyFollowing,
     skipLoading: true,
   };
-};
+}
 
 export function followAccountFail(error, locked) {
   return {
@@ -193,7 +195,7 @@ export function followAccountFail(error, locked) {
     locked,
     skipLoading: true,
   };
-};
+}
 
 export function unfollowAccountRequest(id) {
   return {
@@ -201,7 +203,7 @@ export function unfollowAccountRequest(id) {
     id,
     skipLoading: true,
   };
-};
+}
 
 export function unfollowAccountSuccess(relationship, statuses) {
   return {
@@ -210,7 +212,7 @@ export function unfollowAccountSuccess(relationship, statuses) {
     statuses,
     skipLoading: true,
   };
-};
+}
 
 export function unfollowAccountFail(error) {
   return {
@@ -218,7 +220,7 @@ export function unfollowAccountFail(error) {
     error,
     skipLoading: true,
   };
-};
+}
 
 export function blockAccount(id) {
   return (dispatch, getState) => {
@@ -231,7 +233,7 @@ export function blockAccount(id) {
       dispatch(blockAccountFail(id, error));
     });
   };
-};
+}
 
 export function unblockAccount(id) {
   return (dispatch, getState) => {
@@ -243,14 +245,14 @@ export function unblockAccount(id) {
       dispatch(unblockAccountFail(id, error));
     });
   };
-};
+}
 
 export function blockAccountRequest(id) {
   return {
     type: ACCOUNT_BLOCK_REQUEST,
     id,
   };
-};
+}
 
 export function blockAccountSuccess(relationship, statuses) {
   return {
@@ -258,35 +260,35 @@ export function blockAccountSuccess(relationship, statuses) {
     relationship,
     statuses,
   };
-};
+}
 
 export function blockAccountFail(error) {
   return {
     type: ACCOUNT_BLOCK_FAIL,
     error,
   };
-};
+}
 
 export function unblockAccountRequest(id) {
   return {
     type: ACCOUNT_UNBLOCK_REQUEST,
     id,
   };
-};
+}
 
 export function unblockAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNBLOCK_SUCCESS,
     relationship,
   };
-};
+}
 
 export function unblockAccountFail(error) {
   return {
     type: ACCOUNT_UNBLOCK_FAIL,
     error,
   };
-};
+}
 
 
 export function muteAccount(id, notifications, duration=0) {
@@ -300,7 +302,7 @@ export function muteAccount(id, notifications, duration=0) {
       dispatch(muteAccountFail(id, error));
     });
   };
-};
+}
 
 export function unmuteAccount(id) {
   return (dispatch, getState) => {
@@ -312,14 +314,14 @@ export function unmuteAccount(id) {
       dispatch(unmuteAccountFail(id, error));
     });
   };
-};
+}
 
 export function muteAccountRequest(id) {
   return {
     type: ACCOUNT_MUTE_REQUEST,
     id,
   };
-};
+}
 
 export function muteAccountSuccess(relationship, statuses) {
   return {
@@ -327,35 +329,35 @@ export function muteAccountSuccess(relationship, statuses) {
     relationship,
     statuses,
   };
-};
+}
 
 export function muteAccountFail(error) {
   return {
     type: ACCOUNT_MUTE_FAIL,
     error,
   };
-};
+}
 
 export function unmuteAccountRequest(id) {
   return {
     type: ACCOUNT_UNMUTE_REQUEST,
     id,
   };
-};
+}
 
 export function unmuteAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNMUTE_SUCCESS,
     relationship,
   };
-};
+}
 
 export function unmuteAccountFail(error) {
   return {
     type: ACCOUNT_UNMUTE_FAIL,
     error,
   };
-};
+}
 
 
 export function fetchFollowers(id) {
@@ -372,14 +374,14 @@ export function fetchFollowers(id) {
       dispatch(fetchFollowersFail(id, error));
     });
   };
-};
+}
 
 export function fetchFollowersRequest(id) {
   return {
     type: FOLLOWERS_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchFollowersSuccess(id, accounts, next) {
   return {
@@ -388,7 +390,7 @@ export function fetchFollowersSuccess(id, accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function fetchFollowersFail(id, error) {
   return {
@@ -397,7 +399,7 @@ export function fetchFollowersFail(id, error) {
     error,
     skipNotFound: true,
   };
-};
+}
 
 export function expandFollowers(id) {
   return (dispatch, getState) => {
@@ -419,14 +421,14 @@ export function expandFollowers(id) {
       dispatch(expandFollowersFail(id, error));
     });
   };
-};
+}
 
 export function expandFollowersRequest(id) {
   return {
     type: FOLLOWERS_EXPAND_REQUEST,
     id,
   };
-};
+}
 
 export function expandFollowersSuccess(id, accounts, next) {
   return {
@@ -435,7 +437,7 @@ export function expandFollowersSuccess(id, accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function expandFollowersFail(id, error) {
   return {
@@ -443,7 +445,7 @@ export function expandFollowersFail(id, error) {
     id,
     error,
   };
-};
+}
 
 export function fetchFollowing(id) {
   return (dispatch, getState) => {
@@ -459,14 +461,14 @@ export function fetchFollowing(id) {
       dispatch(fetchFollowingFail(id, error));
     });
   };
-};
+}
 
 export function fetchFollowingRequest(id) {
   return {
     type: FOLLOWING_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchFollowingSuccess(id, accounts, next) {
   return {
@@ -475,7 +477,7 @@ export function fetchFollowingSuccess(id, accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function fetchFollowingFail(id, error) {
   return {
@@ -484,7 +486,7 @@ export function fetchFollowingFail(id, error) {
     error,
     skipNotFound: true,
   };
-};
+}
 
 export function expandFollowing(id) {
   return (dispatch, getState) => {
@@ -506,14 +508,14 @@ export function expandFollowing(id) {
       dispatch(expandFollowingFail(id, error));
     });
   };
-};
+}
 
 export function expandFollowingRequest(id) {
   return {
     type: FOLLOWING_EXPAND_REQUEST,
     id,
   };
-};
+}
 
 export function expandFollowingSuccess(id, accounts, next) {
   return {
@@ -522,7 +524,7 @@ export function expandFollowingSuccess(id, accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function expandFollowingFail(id, error) {
   return {
@@ -530,14 +532,16 @@ export function expandFollowingFail(id, error) {
     id,
     error,
   };
-};
+}
 
 export function fetchRelationships(accountIds) {
   return (dispatch, getState) => {
-    const loadedRelationships = getState().get('relationships');
+    const state = getState();
+    const loadedRelationships = state.get('relationships');
     const newAccountIds = accountIds.filter(id => loadedRelationships.get(id, null) === null);
+    const signedIn = !!state.getIn(['meta', 'me']);
 
-    if (newAccountIds.length === 0) {
+    if (!signedIn || newAccountIds.length === 0) {
       return;
     }
 
@@ -549,7 +553,7 @@ export function fetchRelationships(accountIds) {
       dispatch(fetchRelationshipsFail(error));
     });
   };
-};
+}
 
 export function fetchRelationshipsRequest(ids) {
   return {
@@ -557,7 +561,7 @@ export function fetchRelationshipsRequest(ids) {
     ids,
     skipLoading: true,
   };
-};
+}
 
 export function fetchRelationshipsSuccess(relationships) {
   return {
@@ -565,7 +569,7 @@ export function fetchRelationshipsSuccess(relationships) {
     relationships,
     skipLoading: true,
   };
-};
+}
 
 export function fetchRelationshipsFail(error) {
   return {
@@ -574,7 +578,7 @@ export function fetchRelationshipsFail(error) {
     skipLoading: true,
     skipNotFound: true,
   };
-};
+}
 
 export function fetchFollowRequests() {
   return (dispatch, getState) => {
@@ -586,13 +590,13 @@ export function fetchFollowRequests() {
       dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
     }).catch(error => dispatch(fetchFollowRequestsFail(error)));
   };
-};
+}
 
 export function fetchFollowRequestsRequest() {
   return {
     type: FOLLOW_REQUESTS_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchFollowRequestsSuccess(accounts, next) {
   return {
@@ -600,14 +604,14 @@ export function fetchFollowRequestsSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function fetchFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function expandFollowRequests() {
   return (dispatch, getState) => {
@@ -625,13 +629,13 @@ export function expandFollowRequests() {
       dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
     }).catch(error => dispatch(expandFollowRequestsFail(error)));
   };
-};
+}
 
 export function expandFollowRequestsRequest() {
   return {
     type: FOLLOW_REQUESTS_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandFollowRequestsSuccess(accounts, next) {
   return {
@@ -639,14 +643,14 @@ export function expandFollowRequestsSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function expandFollowRequestsFail(error) {
   return {
     type: FOLLOW_REQUESTS_EXPAND_FAIL,
     error,
   };
-};
+}
 
 export function authorizeFollowRequest(id) {
   return (dispatch, getState) => {
@@ -657,21 +661,21 @@ export function authorizeFollowRequest(id) {
       .then(() => dispatch(authorizeFollowRequestSuccess(id)))
       .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
   };
-};
+}
 
 export function authorizeFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_REQUEST,
     id,
   };
-};
+}
 
 export function authorizeFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
     id,
   };
-};
+}
 
 export function authorizeFollowRequestFail(id, error) {
   return {
@@ -679,7 +683,7 @@ export function authorizeFollowRequestFail(id, error) {
     id,
     error,
   };
-};
+}
 
 
 export function rejectFollowRequest(id) {
@@ -691,21 +695,21 @@ export function rejectFollowRequest(id) {
       .then(() => dispatch(rejectFollowRequestSuccess(id)))
       .catch(error => dispatch(rejectFollowRequestFail(id, error)));
   };
-};
+}
 
 export function rejectFollowRequestRequest(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_REQUEST,
     id,
   };
-};
+}
 
 export function rejectFollowRequestSuccess(id) {
   return {
     type: FOLLOW_REQUEST_REJECT_SUCCESS,
     id,
   };
-};
+}
 
 export function rejectFollowRequestFail(id, error) {
   return {
@@ -713,7 +717,7 @@ export function rejectFollowRequestFail(id, error) {
     id,
     error,
   };
-};
+}
 
 export function pinAccount(id) {
   return (dispatch, getState) => {
@@ -725,7 +729,7 @@ export function pinAccount(id) {
       dispatch(pinAccountFail(error));
     });
   };
-};
+}
 
 export function unpinAccount(id) {
   return (dispatch, getState) => {
@@ -737,46 +741,51 @@ export function unpinAccount(id) {
       dispatch(unpinAccountFail(error));
     });
   };
-};
+}
 
 export function pinAccountRequest(id) {
   return {
     type: ACCOUNT_PIN_REQUEST,
     id,
   };
-};
+}
 
 export function pinAccountSuccess(relationship) {
   return {
     type: ACCOUNT_PIN_SUCCESS,
     relationship,
   };
-};
+}
 
 export function pinAccountFail(error) {
   return {
     type: ACCOUNT_PIN_FAIL,
     error,
   };
-};
+}
 
 export function unpinAccountRequest(id) {
   return {
     type: ACCOUNT_UNPIN_REQUEST,
     id,
   };
-};
+}
 
 export function unpinAccountSuccess(relationship) {
   return {
     type: ACCOUNT_UNPIN_SUCCESS,
     relationship,
   };
-};
+}
 
 export function unpinAccountFail(error) {
   return {
     type: ACCOUNT_UNPIN_FAIL,
     error,
   };
-};
+}
+
+export const revealAccount = id => ({
+  type: ACCOUNT_REVEAL,
+  id,
+});
diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js
index 1670f9c10..0220b0af5 100644
--- a/app/javascript/mastodon/actions/alerts.js
+++ b/app/javascript/mastodon/actions/alerts.js
@@ -17,13 +17,13 @@ export function dismissAlert(alert) {
     type: ALERT_DISMISS,
     alert,
   };
-};
+}
 
 export function clearAlert() {
   return {
     type: ALERT_CLEAR,
   };
-};
+}
 
 export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage, message_values = undefined) {
   return {
@@ -32,7 +32,7 @@ export function showAlert(title = messages.unexpectedTitle, message = messages.u
     message,
     message_values,
   };
-};
+}
 
 export function showAlertForError(error, skipNotFound = false) {
   if (error.response) {
diff --git a/app/javascript/mastodon/actions/announcements.js b/app/javascript/mastodon/actions/announcements.js
index 1bdea909f..586dcfd33 100644
--- a/app/javascript/mastodon/actions/announcements.js
+++ b/app/javascript/mastodon/actions/announcements.js
@@ -102,7 +102,7 @@ export const addReaction = (announcementId, name) => (dispatch, getState) => {
     dispatch(addReactionRequest(announcementId, name, alreadyAdded));
   }
 
-  api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
+  api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
   }).catch(err => {
     if (!alreadyAdded) {
@@ -136,7 +136,7 @@ export const addReactionFail = (announcementId, name, error) => ({
 export const removeReaction = (announcementId, name) => (dispatch, getState) => {
   dispatch(removeReactionRequest(announcementId, name));
 
-  api(getState).delete(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
+  api(getState).delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
     dispatch(removeReactionSuccess(announcementId, name));
   }).catch(err => {
     dispatch(removeReactionFail(announcementId, name, err));
diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index fd9881302..192aa3ce4 100644
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -24,13 +24,13 @@ export function fetchBlocks() {
       dispatch(fetchRelationships(response.data.map(item => item.id)));
     }).catch(error => dispatch(fetchBlocksFail(error)));
   };
-};
+}
 
 export function fetchBlocksRequest() {
   return {
     type: BLOCKS_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchBlocksSuccess(accounts, next) {
   return {
@@ -38,14 +38,14 @@ export function fetchBlocksSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function fetchBlocksFail(error) {
   return {
     type: BLOCKS_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function expandBlocks() {
   return (dispatch, getState) => {
@@ -64,13 +64,13 @@ export function expandBlocks() {
       dispatch(fetchRelationships(response.data.map(item => item.id)));
     }).catch(error => dispatch(expandBlocksFail(error)));
   };
-};
+}
 
 export function expandBlocksRequest() {
   return {
     type: BLOCKS_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandBlocksSuccess(accounts, next) {
   return {
@@ -78,14 +78,14 @@ export function expandBlocksSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function expandBlocksFail(error) {
   return {
     type: BLOCKS_EXPAND_FAIL,
     error,
   };
-};
+}
 
 export function initBlockModal(account) {
   return dispatch => {
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 544ed2ff2..3c8eec546 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -25,13 +25,13 @@ export function fetchBookmarkedStatuses() {
       dispatch(fetchBookmarkedStatusesFail(error));
     });
   };
-};
+}
 
 export function fetchBookmarkedStatusesRequest() {
   return {
     type: BOOKMARKED_STATUSES_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchBookmarkedStatusesSuccess(statuses, next) {
   return {
@@ -39,14 +39,14 @@ export function fetchBookmarkedStatusesSuccess(statuses, next) {
     statuses,
     next,
   };
-};
+}
 
 export function fetchBookmarkedStatusesFail(error) {
   return {
     type: BOOKMARKED_STATUSES_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function expandBookmarkedStatuses() {
   return (dispatch, getState) => {
@@ -66,13 +66,13 @@ export function expandBookmarkedStatuses() {
       dispatch(expandBookmarkedStatusesFail(error));
     });
   };
-};
+}
 
 export function expandBookmarkedStatusesRequest() {
   return {
     type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandBookmarkedStatusesSuccess(statuses, next) {
   return {
@@ -80,11 +80,11 @@ export function expandBookmarkedStatusesSuccess(statuses, next) {
     statuses,
     next,
   };
-};
+}
 
 export function expandBookmarkedStatusesFail(error) {
   return {
     type: BOOKMARKED_STATUSES_EXPAND_FAIL,
     error,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/columns.js b/app/javascript/mastodon/actions/columns.js
index 9b87415fb..302c3f0f9 100644
--- a/app/javascript/mastodon/actions/columns.js
+++ b/app/javascript/mastodon/actions/columns.js
@@ -15,7 +15,7 @@ export function addColumn(id, params) {
 
     dispatch(saveSettings());
   };
-};
+}
 
 export function removeColumn(uuid) {
   return dispatch => {
@@ -26,7 +26,7 @@ export function removeColumn(uuid) {
 
     dispatch(saveSettings());
   };
-};
+}
 
 export function moveColumn(uuid, direction) {
   return dispatch => {
@@ -38,7 +38,7 @@ export function moveColumn(uuid, direction) {
 
     dispatch(saveSettings());
   };
-};
+}
 
 export function changeColumnParams(uuid, path, value) {
   return dispatch => {
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 9b37085cb..531a5eb2b 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -1,18 +1,20 @@
-import api from '../api';
-import { CancelToken, isCancel } from 'axios';
+import axios from 'axios';
 import { throttle } from 'lodash';
-import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';
-import { tagHistory } from '../settings';
-import { useEmoji } from './emojis';
-import resizeImage from '../utils/resize_image';
-import { importFetchedAccounts } from './importer';
-import { updateTimeline } from './timelines';
-import { showAlertForError } from './alerts';
-import { showAlert } from './alerts';
-import { openModal } from './modal';
 import { defineMessages } from 'react-intl';
+import api from 'mastodon/api';
+import { search as emojiSearch } from 'mastodon/features/emoji/emoji_mart_search_light';
+import { tagHistory } from 'mastodon/settings';
+import resizeImage from 'mastodon/utils/resize_image';
+import { showAlert, showAlertForError } from './alerts';
+import { useEmoji } from './emojis';
+import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { openModal } from './modal';
+import { updateTimeline } from './timelines';
 
-let cancelFetchComposeSuggestionsAccounts, cancelFetchComposeSuggestionsTags;
+/** @type {AbortController | undefined} */
+let fetchComposeSuggestionsAccountsController;
+/** @type {AbortController | undefined} */
+let fetchComposeSuggestionsTagsController;
 
 export const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
 export const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
@@ -23,11 +25,13 @@ export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
 export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
-export const COMPOSE_UPLOAD_REQUEST  = 'COMPOSE_UPLOAD_REQUEST';
-export const COMPOSE_UPLOAD_SUCCESS  = 'COMPOSE_UPLOAD_SUCCESS';
-export const COMPOSE_UPLOAD_FAIL     = 'COMPOSE_UPLOAD_FAIL';
-export const COMPOSE_UPLOAD_PROGRESS = 'COMPOSE_UPLOAD_PROGRESS';
-export const COMPOSE_UPLOAD_UNDO     = 'COMPOSE_UPLOAD_UNDO';
+
+export const COMPOSE_UPLOAD_REQUEST    = 'COMPOSE_UPLOAD_REQUEST';
+export const COMPOSE_UPLOAD_SUCCESS    = 'COMPOSE_UPLOAD_SUCCESS';
+export const COMPOSE_UPLOAD_FAIL       = 'COMPOSE_UPLOAD_FAIL';
+export const COMPOSE_UPLOAD_PROGRESS   = 'COMPOSE_UPLOAD_PROGRESS';
+export const COMPOSE_UPLOAD_PROCESSING = 'COMPOSE_UPLOAD_PROCESSING';
+export const COMPOSE_UPLOAD_UNDO       = 'COMPOSE_UPLOAD_UNDO';
 
 export const THUMBNAIL_UPLOAD_REQUEST  = 'THUMBNAIL_UPLOAD_REQUEST';
 export const THUMBNAIL_UPLOAD_SUCCESS  = 'THUMBNAIL_UPLOAD_SUCCESS';
@@ -45,12 +49,12 @@ export const COMPOSE_TAG_HISTORY_UPDATE = 'COMPOSE_TAG_HISTORY_UPDATE';
 export const COMPOSE_MOUNT   = 'COMPOSE_MOUNT';
 export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
 
-export const COMPOSE_SENSITIVITY_CHANGE = 'COMPOSE_SENSITIVITY_CHANGE';
-export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
+export const COMPOSE_SENSITIVITY_CHANGE  = 'COMPOSE_SENSITIVITY_CHANGE';
+export const COMPOSE_SPOILERNESS_CHANGE  = 'COMPOSE_SPOILERNESS_CHANGE';
 export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
-export const COMPOSE_VISIBILITY_CHANGE  = 'COMPOSE_VISIBILITY_CHANGE';
-export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE';
-export const COMPOSE_COMPOSING_CHANGE = 'COMPOSE_COMPOSING_CHANGE';
+export const COMPOSE_VISIBILITY_CHANGE   = 'COMPOSE_VISIBILITY_CHANGE';
+export const COMPOSE_COMPOSING_CHANGE    = 'COMPOSE_COMPOSING_CHANGE';
+export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
 
 export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
 
@@ -70,25 +74,34 @@ export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL';
 export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION';
 export const COMPOSE_CHANGE_MEDIA_FOCUS       = 'COMPOSE_CHANGE_MEDIA_FOCUS';
 
+export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
+
 const messages = defineMessages({
   uploadErrorLimit: { id: 'upload_error.limit', defaultMessage: 'File upload limit exceeded.' },
   uploadErrorPoll:  { id: 'upload_error.poll', defaultMessage: 'File upload not allowed with polls.' },
 });
 
-const COMPOSE_PANEL_BREAKPOINT = 600 + (285 * 1) + (10 * 1);
-
 export const ensureComposeIsVisible = (getState, routerHistory) => {
-  if (!getState().getIn(['compose', 'mounted']) && window.innerWidth < COMPOSE_PANEL_BREAKPOINT) {
+  if (!getState().getIn(['compose', 'mounted'])) {
     routerHistory.push('/publish');
   }
 };
 
+export function setComposeToStatus(status, text, spoiler_text) {
+  return{
+    type: COMPOSE_SET_STATUS,
+    status,
+    text,
+    spoiler_text,
+  };
+}
+
 export function changeCompose(text) {
   return {
     type: COMPOSE_CHANGE,
     text: text,
   };
-};
+}
 
 export function replyCompose(status, routerHistory) {
   return (dispatch, getState) => {
@@ -99,19 +112,19 @@ export function replyCompose(status, routerHistory) {
 
     ensureComposeIsVisible(getState, routerHistory);
   };
-};
+}
 
 export function cancelReplyCompose() {
   return {
     type: COMPOSE_REPLY_CANCEL,
   };
-};
+}
 
 export function resetCompose() {
   return {
     type: COMPOSE_RESET,
   };
-};
+}
 
 export function mentionCompose(account, routerHistory) {
   return (dispatch, getState) => {
@@ -122,7 +135,7 @@ export function mentionCompose(account, routerHistory) {
 
     ensureComposeIsVisible(getState, routerHistory);
   };
-};
+}
 
 export function directCompose(account, routerHistory) {
   return (dispatch, getState) => {
@@ -133,12 +146,13 @@ export function directCompose(account, routerHistory) {
 
     ensureComposeIsVisible(getState, routerHistory);
   };
-};
+}
 
 export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
-    const status = getState().getIn(['compose', 'text'], '');
-    const media  = getState().getIn(['compose', 'media_attachments']);
+    const status   = getState().getIn(['compose', 'text'], '');
+    const media    = getState().getIn(['compose', 'media_attachments']);
+    const statusId = getState().getIn(['compose', 'id'], null);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
@@ -146,15 +160,19 @@ export function submitCompose(routerHistory) {
 
     dispatch(submitComposeRequest());
 
-    api(getState).post('/api/v1/statuses', {
-      status,
-      in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
-      media_ids: media.map(item => item.get('id')),
-      sensitive: getState().getIn(['compose', 'sensitive']),
-      spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
-      visibility: getState().getIn(['compose', 'privacy']),
-      poll: getState().getIn(['compose', 'poll'], null),
-    }, {
+    api(getState).request({
+      url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
+      method: statusId === null ? 'post' : 'put',
+      data: {
+        status,
+        in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
+        media_ids: media.map(item => item.get('id')),
+        sensitive: getState().getIn(['compose', 'sensitive']),
+        spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
+        visibility: getState().getIn(['compose', 'privacy']),
+        poll: getState().getIn(['compose', 'poll'], null),
+        language: getState().getIn(['compose', 'language']),
+      },
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
@@ -176,11 +194,15 @@ export function submitCompose(routerHistory) {
         }
       };
 
-      if (response.data.visibility !== 'direct') {
+      if (statusId) {
+        dispatch(importFetchedStatus({ ...response.data }));
+      }
+
+      if (statusId === null && response.data.visibility !== 'direct') {
         insertIfOnline('home');
       }
 
-      if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
+      if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') {
         insertIfOnline('community');
         insertIfOnline('public');
         insertIfOnline(`account:${response.data.account.id}`);
@@ -189,27 +211,27 @@ export function submitCompose(routerHistory) {
       dispatch(submitComposeFail(error));
     });
   };
-};
+}
 
 export function submitComposeRequest() {
   return {
     type: COMPOSE_SUBMIT_REQUEST,
   };
-};
+}
 
 export function submitComposeSuccess(status) {
   return {
     type: COMPOSE_SUBMIT_SUCCESS,
     status: status,
   };
-};
+}
 
 export function submitComposeFail(error) {
   return {
     type: COMPOSE_SUBMIT_FAIL,
     error: error,
   };
-};
+}
 
 export function uploadCompose(files) {
   return function (dispatch, getState) {
@@ -252,12 +274,18 @@ export function uploadCompose(files) {
           if (status === 200) {
             dispatch(uploadComposeSuccess(data, f));
           } else if (status === 202) {
+            dispatch(uploadComposeProcessing());
+
+            let tryCount = 1;
+
             const poll = () => {
               api(getState).get(`/api/v1/media/${data.id}`).then(response => {
                 if (response.status === 200) {
                   dispatch(uploadComposeSuccess(response.data, f));
                 } else if (response.status === 206) {
-                  setTimeout(() => poll(), 1000);
+                  const retryAfter = (Math.log2(tryCount) || 1) * 1000;
+                  tryCount += 1;
+                  setTimeout(() => poll(), retryAfter);
                 }
               }).catch(error => dispatch(uploadComposeFail(error)));
             };
@@ -266,9 +294,13 @@ export function uploadCompose(files) {
           }
         });
       }).catch(error => dispatch(uploadComposeFail(error)));
-    };
+    }
   };
-};
+}
+
+export const uploadComposeProcessing = () => ({
+  type: COMPOSE_UPLOAD_PROCESSING,
+});
 
 export const uploadThumbnail = (id, file) => (dispatch, getState) => {
   dispatch(uploadThumbnailRequest());
@@ -322,14 +354,14 @@ export function initMediaEditModal(id) {
 
     dispatch(openModal('FOCAL_POINT', { id }));
   };
-};
+}
 
 export function onChangeMediaDescription(description) {
   return {
     type: COMPOSE_CHANGE_MEDIA_DESCRIPTION,
     description,
   };
-};
+}
 
 export function onChangeMediaFocus(focusX, focusY) {
   return {
@@ -337,7 +369,7 @@ export function onChangeMediaFocus(focusX, focusY) {
     focusX,
     focusY,
   };
-};
+}
 
 export function changeUploadCompose(id, params) {
   return (dispatch, getState) => {
@@ -349,14 +381,14 @@ export function changeUploadCompose(id, params) {
       dispatch(changeUploadComposeFail(id, error));
     });
   };
-};
+}
 
 export function changeUploadComposeRequest() {
   return {
     type: COMPOSE_UPLOAD_CHANGE_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function changeUploadComposeSuccess(media) {
   return {
@@ -364,7 +396,7 @@ export function changeUploadComposeSuccess(media) {
     media: media,
     skipLoading: true,
   };
-};
+}
 
 export function changeUploadComposeFail(error) {
   return {
@@ -372,14 +404,14 @@ export function changeUploadComposeFail(error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function uploadComposeRequest() {
   return {
     type: COMPOSE_UPLOAD_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function uploadComposeProgress(loaded, total) {
   return {
@@ -387,7 +419,7 @@ export function uploadComposeProgress(loaded, total) {
     loaded: loaded,
     total: total,
   };
-};
+}
 
 export function uploadComposeSuccess(media, file) {
   return {
@@ -396,7 +428,7 @@ export function uploadComposeSuccess(media, file) {
     file: file,
     skipLoading: true,
   };
-};
+}
 
 export function uploadComposeFail(error) {
   return {
@@ -404,33 +436,33 @@ export function uploadComposeFail(error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function undoUploadCompose(media_id) {
   return {
     type: COMPOSE_UPLOAD_UNDO,
     media_id: media_id,
   };
-};
+}
 
 export function clearComposeSuggestions() {
-  if (cancelFetchComposeSuggestionsAccounts) {
-    cancelFetchComposeSuggestionsAccounts();
+  if (fetchComposeSuggestionsAccountsController) {
+    fetchComposeSuggestionsAccountsController.abort();
   }
   return {
     type: COMPOSE_SUGGESTIONS_CLEAR,
   };
-};
+}
 
 const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) => {
-  if (cancelFetchComposeSuggestionsAccounts) {
-    cancelFetchComposeSuggestionsAccounts();
+  if (fetchComposeSuggestionsAccountsController) {
+    fetchComposeSuggestionsAccountsController.abort();
   }
 
+  fetchComposeSuggestionsAccountsController = new AbortController();
+
   api(getState).get('/api/v1/accounts/search', {
-    cancelToken: new CancelToken(cancel => {
-      cancelFetchComposeSuggestionsAccounts = cancel;
-    }),
+    signal: fetchComposeSuggestionsAccountsController.signal,
 
     params: {
       q: token.slice(1),
@@ -441,9 +473,11 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
     dispatch(importFetchedAccounts(response.data));
     dispatch(readyComposeSuggestionsAccounts(token, response.data));
   }).catch(error => {
-    if (!isCancel(error)) {
+    if (!axios.isCancel(error)) {
       dispatch(showAlertForError(error));
     }
+  }).finally(() => {
+    fetchComposeSuggestionsAccountsController = undefined;
   });
 }, 200, { leading: true, trailing: true });
 
@@ -453,16 +487,16 @@ const fetchComposeSuggestionsEmojis = (dispatch, getState, token) => {
 };
 
 const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
-  if (cancelFetchComposeSuggestionsTags) {
-    cancelFetchComposeSuggestionsTags();
+  if (fetchComposeSuggestionsTagsController) {
+    fetchComposeSuggestionsTagsController.abort();
   }
 
   dispatch(updateSuggestionTags(token));
 
+  fetchComposeSuggestionsTagsController = new AbortController();
+
   api(getState).get('/api/v2/search', {
-    cancelToken: new CancelToken(cancel => {
-      cancelFetchComposeSuggestionsTags = cancel;
-    }),
+    signal: fetchComposeSuggestionsTagsController.signal,
 
     params: {
       type: 'hashtags',
@@ -474,9 +508,11 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
   }).then(({ data }) => {
     dispatch(readyComposeSuggestionsTags(token, data.hashtags));
   }).catch(error => {
-    if (!isCancel(error)) {
+    if (!axios.isCancel(error)) {
       dispatch(showAlertForError(error));
     }
+  }).finally(() => {
+    fetchComposeSuggestionsTagsController = undefined;
   });
 }, 200, { leading: true, trailing: true });
 
@@ -494,7 +530,7 @@ export function fetchComposeSuggestions(token) {
       break;
     }
   };
-};
+}
 
 export function readyComposeSuggestionsEmojis(token, emojis) {
   return {
@@ -502,7 +538,7 @@ export function readyComposeSuggestionsEmojis(token, emojis) {
     token,
     emojis,
   };
-};
+}
 
 export function readyComposeSuggestionsAccounts(token, accounts) {
   return {
@@ -510,7 +546,7 @@ export function readyComposeSuggestionsAccounts(token, accounts) {
     token,
     accounts,
   };
-};
+}
 
 export const readyComposeSuggestionsTags = (token, tags) => ({
   type: COMPOSE_SUGGESTIONS_READY,
@@ -555,7 +591,7 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
       });
     }
   };
-};
+}
 
 export function updateSuggestionTags(token) {
   return {
@@ -587,7 +623,20 @@ function insertIntoTagHistory(recognizedTags, text) {
     const state = getState();
     const oldHistory = state.getIn(['compose', 'tagHistory']);
     const me = state.getIn(['meta', 'me']);
-    const names = recognizedTags.map(tag => text.match(new RegExp(`#${tag.name}`, 'i'))[0].slice(1));
+
+    // FIXME: Matching input hashtags with recognized hashtags has become more
+    // complicated because of new normalization rules, it's no longer just
+    // a case sensitivity issue
+    const names = recognizedTags.map(tag => {
+      const matches = text.match(new RegExp(`#${tag.name}`, 'i'));
+
+      if (matches && matches.length > 0) {
+        return matches[0].slice(1);
+      } else {
+        return tag.name;
+      }
+    });
+
     const intersectedOldHistory = oldHistory.filter(name => names.findIndex(newName => newName.toLowerCase() === name.toLowerCase()) === -1);
 
     names.push(...intersectedOldHistory.toJS());
@@ -603,39 +652,44 @@ export function mountCompose() {
   return {
     type: COMPOSE_MOUNT,
   };
-};
+}
 
 export function unmountCompose() {
   return {
     type: COMPOSE_UNMOUNT,
   };
-};
+}
 
 export function changeComposeSensitivity() {
   return {
     type: COMPOSE_SENSITIVITY_CHANGE,
   };
-};
+}
+
+export const changeComposeLanguage = language => ({
+  type: COMPOSE_LANGUAGE_CHANGE,
+  language,
+});
 
 export function changeComposeSpoilerness() {
   return {
     type: COMPOSE_SPOILERNESS_CHANGE,
   };
-};
+}
 
 export function changeComposeSpoilerText(text) {
   return {
     type: COMPOSE_SPOILER_TEXT_CHANGE,
     text,
   };
-};
+}
 
 export function changeComposeVisibility(value) {
   return {
     type: COMPOSE_VISIBILITY_CHANGE,
     value,
   };
-};
+}
 
 export function insertEmojiCompose(position, emoji, needsSpace) {
   return {
@@ -644,33 +698,33 @@ export function insertEmojiCompose(position, emoji, needsSpace) {
     emoji,
     needsSpace,
   };
-};
+}
 
 export function changeComposing(value) {
   return {
     type: COMPOSE_COMPOSING_CHANGE,
     value,
   };
-};
+}
 
 export function addPoll() {
   return {
     type: COMPOSE_POLL_ADD,
   };
-};
+}
 
 export function removePoll() {
   return {
     type: COMPOSE_POLL_REMOVE,
   };
-};
+}
 
 export function addPollOption(title) {
   return {
     type: COMPOSE_POLL_OPTION_ADD,
     title,
   };
-};
+}
 
 export function changePollOption(index, title) {
   return {
@@ -678,14 +732,14 @@ export function changePollOption(index, title) {
     index,
     title,
   };
-};
+}
 
 export function removePollOption(index) {
   return {
     type: COMPOSE_POLL_OPTION_REMOVE,
     index,
   };
-};
+}
 
 export function changePollSettings(expiresIn, isMultiple) {
   return {
@@ -693,4 +747,4 @@ export function changePollSettings(expiresIn, isMultiple) {
     expiresIn,
     isMultiple,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/custom_emojis.js b/app/javascript/mastodon/actions/custom_emojis.js
index 7b7d0091b..9ec8156b1 100644
--- a/app/javascript/mastodon/actions/custom_emojis.js
+++ b/app/javascript/mastodon/actions/custom_emojis.js
@@ -14,14 +14,14 @@ export function fetchCustomEmojis() {
       dispatch(fetchCustomEmojisFail(error));
     });
   };
-};
+}
 
 export function fetchCustomEmojisRequest() {
   return {
     type: CUSTOM_EMOJIS_FETCH_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function fetchCustomEmojisSuccess(custom_emojis) {
   return {
@@ -29,7 +29,7 @@ export function fetchCustomEmojisSuccess(custom_emojis) {
     custom_emojis,
     skipLoading: true,
   };
-};
+}
 
 export function fetchCustomEmojisFail(error) {
   return {
@@ -37,4 +37,4 @@ export function fetchCustomEmojisFail(error) {
     error,
     skipLoading: true,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 34a33a654..d06de20a2 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -29,14 +29,14 @@ export function blockDomain(domain) {
       dispatch(blockDomainFail(domain, err));
     });
   };
-};
+}
 
 export function blockDomainRequest(domain) {
   return {
     type: DOMAIN_BLOCK_REQUEST,
     domain,
   };
-};
+}
 
 export function blockDomainSuccess(domain, accounts) {
   return {
@@ -44,7 +44,7 @@ export function blockDomainSuccess(domain, accounts) {
     domain,
     accounts,
   };
-};
+}
 
 export function blockDomainFail(domain, error) {
   return {
@@ -52,7 +52,7 @@ export function blockDomainFail(domain, error) {
     domain,
     error,
   };
-};
+}
 
 export function unblockDomain(domain) {
   return (dispatch, getState) => {
@@ -66,14 +66,14 @@ export function unblockDomain(domain) {
       dispatch(unblockDomainFail(domain, err));
     });
   };
-};
+}
 
 export function unblockDomainRequest(domain) {
   return {
     type: DOMAIN_UNBLOCK_REQUEST,
     domain,
   };
-};
+}
 
 export function unblockDomainSuccess(domain, accounts) {
   return {
@@ -81,7 +81,7 @@ export function unblockDomainSuccess(domain, accounts) {
     domain,
     accounts,
   };
-};
+}
 
 export function unblockDomainFail(domain, error) {
   return {
@@ -89,7 +89,7 @@ export function unblockDomainFail(domain, error) {
     domain,
     error,
   };
-};
+}
 
 export function fetchDomainBlocks() {
   return (dispatch, getState) => {
@@ -102,13 +102,13 @@ export function fetchDomainBlocks() {
       dispatch(fetchDomainBlocksFail(err));
     });
   };
-};
+}
 
 export function fetchDomainBlocksRequest() {
   return {
     type: DOMAIN_BLOCKS_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchDomainBlocksSuccess(domains, next) {
   return {
@@ -116,14 +116,14 @@ export function fetchDomainBlocksSuccess(domains, next) {
     domains,
     next,
   };
-};
+}
 
 export function fetchDomainBlocksFail(error) {
   return {
     type: DOMAIN_BLOCKS_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function expandDomainBlocks() {
   return (dispatch, getState) => {
@@ -142,13 +142,13 @@ export function expandDomainBlocks() {
       dispatch(expandDomainBlocksFail(err));
     });
   };
-};
+}
 
 export function expandDomainBlocksRequest() {
   return {
     type: DOMAIN_BLOCKS_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandDomainBlocksSuccess(domains, next) {
   return {
@@ -156,11 +156,11 @@ export function expandDomainBlocksSuccess(domains, next) {
     domains,
     next,
   };
-};
+}
 
 export function expandDomainBlocksFail(error) {
   return {
     type: DOMAIN_BLOCKS_EXPAND_FAIL,
     error,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/emojis.js b/app/javascript/mastodon/actions/emojis.js
index 7cd9d4b7b..3b5d53996 100644
--- a/app/javascript/mastodon/actions/emojis.js
+++ b/app/javascript/mastodon/actions/emojis.js
@@ -11,4 +11,4 @@ export function useEmoji(emoji) {
 
     dispatch(saveSettings());
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 9448b1efe..7388e0c58 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -25,14 +25,14 @@ export function fetchFavouritedStatuses() {
       dispatch(fetchFavouritedStatusesFail(error));
     });
   };
-};
+}
 
 export function fetchFavouritedStatusesRequest() {
   return {
     type: FAVOURITED_STATUSES_FETCH_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function fetchFavouritedStatusesSuccess(statuses, next) {
   return {
@@ -41,7 +41,7 @@ export function fetchFavouritedStatusesSuccess(statuses, next) {
     next,
     skipLoading: true,
   };
-};
+}
 
 export function fetchFavouritedStatusesFail(error) {
   return {
@@ -49,7 +49,7 @@ export function fetchFavouritedStatusesFail(error) {
     error,
     skipLoading: true,
   };
-};
+}
 
 export function expandFavouritedStatuses() {
   return (dispatch, getState) => {
@@ -69,13 +69,13 @@ export function expandFavouritedStatuses() {
       dispatch(expandFavouritedStatusesFail(error));
     });
   };
-};
+}
 
 export function expandFavouritedStatusesRequest() {
   return {
     type: FAVOURITED_STATUSES_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandFavouritedStatusesSuccess(statuses, next) {
   return {
@@ -83,11 +83,11 @@ export function expandFavouritedStatusesSuccess(statuses, next) {
     statuses,
     next,
   };
-};
+}
 
 export function expandFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_EXPAND_FAIL,
     error,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/featured_tags.js b/app/javascript/mastodon/actions/featured_tags.js
new file mode 100644
index 000000000..18bb61539
--- /dev/null
+++ b/app/javascript/mastodon/actions/featured_tags.js
@@ -0,0 +1,34 @@
+import api from '../api';
+
+export const FEATURED_TAGS_FETCH_REQUEST = 'FEATURED_TAGS_FETCH_REQUEST';
+export const FEATURED_TAGS_FETCH_SUCCESS = 'FEATURED_TAGS_FETCH_SUCCESS';
+export const FEATURED_TAGS_FETCH_FAIL    = 'FEATURED_TAGS_FETCH_FAIL';
+
+export const fetchFeaturedTags = (id) => (dispatch, getState) => {
+  if (getState().getIn(['user_lists', 'featured_tags', id, 'items'])) {
+    return;
+  }
+
+  dispatch(fetchFeaturedTagsRequest(id));
+
+  api(getState).get(`/api/v1/accounts/${id}/featured_tags`)
+    .then(({ data }) => dispatch(fetchFeaturedTagsSuccess(id, data)))
+    .catch(err => dispatch(fetchFeaturedTagsFail(id, err)));
+};
+
+export const fetchFeaturedTagsRequest = (id) => ({
+  type: FEATURED_TAGS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchFeaturedTagsSuccess = (id, tags) => ({
+  type: FEATURED_TAGS_FETCH_SUCCESS,
+  id,
+  tags,
+});
+
+export const fetchFeaturedTagsFail = (id, error) => ({
+  type: FEATURED_TAGS_FETCH_FAIL,
+  id,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/filters.js b/app/javascript/mastodon/actions/filters.js
index 7fa1c9a70..e9c609fc8 100644
--- a/app/javascript/mastodon/actions/filters.js
+++ b/app/javascript/mastodon/actions/filters.js
@@ -1,9 +1,24 @@
 import api from '../api';
+import { openModal } from './modal';
 
 export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
 export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
 export const FILTERS_FETCH_FAIL    = 'FILTERS_FETCH_FAIL';
 
+export const FILTERS_STATUS_CREATE_REQUEST = 'FILTERS_STATUS_CREATE_REQUEST';
+export const FILTERS_STATUS_CREATE_SUCCESS = 'FILTERS_STATUS_CREATE_SUCCESS';
+export const FILTERS_STATUS_CREATE_FAIL    = 'FILTERS_STATUS_CREATE_FAIL';
+
+export const FILTERS_CREATE_REQUEST = 'FILTERS_CREATE_REQUEST';
+export const FILTERS_CREATE_SUCCESS = 'FILTERS_CREATE_SUCCESS';
+export const FILTERS_CREATE_FAIL    = 'FILTERS_CREATE_FAIL';
+
+export const initAddFilter = (status, { contextType }) => dispatch =>
+  dispatch(openModal('FILTER', {
+    statusId: status?.get('id'),
+    contextType: contextType,
+  }));
+
 export const fetchFilters = () => (dispatch, getState) => {
   dispatch({
     type: FILTERS_FETCH_REQUEST,
@@ -11,7 +26,7 @@ export const fetchFilters = () => (dispatch, getState) => {
   });
 
   api(getState)
-    .get('/api/v1/filters')
+    .get('/api/v2/filters')
     .then(({ data }) => dispatch({
       type: FILTERS_FETCH_SUCCESS,
       filters: data,
@@ -24,3 +39,55 @@ export const fetchFilters = () => (dispatch, getState) => {
       skipAlert: true,
     }));
 };
+
+export const createFilterStatus = (params, onSuccess, onFail) => (dispatch, getState) => {
+  dispatch(createFilterStatusRequest());
+
+  api(getState).post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
+    dispatch(createFilterStatusSuccess(response.data));
+    if (onSuccess) onSuccess();
+  }).catch(error => {
+    dispatch(createFilterStatusFail(error));
+    if (onFail) onFail();
+  });
+};
+
+export const createFilterStatusRequest = () => ({
+  type: FILTERS_STATUS_CREATE_REQUEST,
+});
+
+export const createFilterStatusSuccess = filter_status => ({
+  type: FILTERS_STATUS_CREATE_SUCCESS,
+  filter_status,
+});
+
+export const createFilterStatusFail = error => ({
+  type: FILTERS_STATUS_CREATE_FAIL,
+  error,
+});
+
+export const createFilter = (params, onSuccess, onFail) => (dispatch, getState) => {
+  dispatch(createFilterRequest());
+
+  api(getState).post('/api/v2/filters', params).then(response => {
+    dispatch(createFilterSuccess(response.data));
+    if (onSuccess) onSuccess(response.data);
+  }).catch(error => {
+    dispatch(createFilterFail(error));
+    if (onFail) onFail();
+  });
+};
+
+export const createFilterRequest = () => ({
+  type: FILTERS_CREATE_REQUEST,
+});
+
+export const createFilterSuccess = filter => ({
+  type: FILTERS_CREATE_SUCCESS,
+  filter,
+});
+
+export const createFilterFail = error => ({
+  type: FILTERS_CREATE_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/height_cache.js b/app/javascript/mastodon/actions/height_cache.js
index 4c752993f..a8645410c 100644
--- a/app/javascript/mastodon/actions/height_cache.js
+++ b/app/javascript/mastodon/actions/height_cache.js
@@ -8,10 +8,10 @@ export function setHeight (key, id, height) {
     id,
     height,
   };
-};
+}
 
 export function clearHeight () {
   return {
     type: HEIGHT_CACHE_CLEAR,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/history.js b/app/javascript/mastodon/actions/history.js
new file mode 100644
index 000000000..c142aaf61
--- /dev/null
+++ b/app/javascript/mastodon/actions/history.js
@@ -0,0 +1,37 @@
+import api from '../api';
+import { importFetchedAccounts } from './importer';
+
+export const HISTORY_FETCH_REQUEST = 'HISTORY_FETCH_REQUEST';
+export const HISTORY_FETCH_SUCCESS = 'HISTORY_FETCH_SUCCESS';
+export const HISTORY_FETCH_FAIL    = 'HISTORY_FETCH_FAIL';
+
+export const fetchHistory = statusId => (dispatch, getState) => {
+  const loading = getState().getIn(['history', statusId, 'loading']);
+
+  if (loading) {
+    return;
+  }
+
+  dispatch(fetchHistoryRequest(statusId));
+
+  api(getState).get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
+    dispatch(importFetchedAccounts(data.map(x => x.account)));
+    dispatch(fetchHistorySuccess(statusId, data));
+  }).catch(error => dispatch(fetchHistoryFail(error)));
+};
+
+export const fetchHistoryRequest = statusId => ({
+  type: HISTORY_FETCH_REQUEST,
+  statusId,
+});
+
+export const fetchHistorySuccess = (statusId, history) => ({
+  type: HISTORY_FETCH_SUCCESS,
+  statusId,
+  history,
+});
+
+export const fetchHistoryFail = error => ({
+  type: HISTORY_FETCH_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index f4372fb31..9c69be601 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -5,6 +5,7 @@ export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
 export const STATUS_IMPORT   = 'STATUS_IMPORT';
 export const STATUSES_IMPORT = 'STATUSES_IMPORT';
 export const POLLS_IMPORT    = 'POLLS_IMPORT';
+export const FILTERS_IMPORT  = 'FILTERS_IMPORT';
 
 function pushUnique(array, object) {
   if (array.every(element => element.id !== object.id)) {
@@ -28,6 +29,10 @@ export function importStatuses(statuses) {
   return { type: STATUSES_IMPORT, statuses };
 }
 
+export function importFilters(filters) {
+  return { type: FILTERS_IMPORT, filters };
+}
+
 export function importPolls(polls) {
   return { type: POLLS_IMPORT, polls };
 }
@@ -61,11 +66,16 @@ export function importFetchedStatuses(statuses) {
     const accounts = [];
     const normalStatuses = [];
     const polls = [];
+    const filters = [];
 
     function processStatus(status) {
       pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
       pushUnique(accounts, status.account);
 
+      if (status.filtered) {
+        status.filtered.forEach(result => pushUnique(filters, result.filter));
+      }
+
       if (status.reblog && status.reblog.id) {
         processStatus(status.reblog);
       }
@@ -80,6 +90,7 @@ export function importFetchedStatuses(statuses) {
     dispatch(importPolls(polls));
     dispatch(importFetchedAccounts(accounts));
     dispatch(importStatuses(normalStatuses));
+    dispatch(importFilters(filters));
   };
 }
 
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 5002292b9..8a22f83fa 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -42,6 +42,14 @@ export function normalizeAccount(account) {
   return account;
 }
 
+export function normalizeFilterResult(result) {
+  const normalResult = { ...result };
+
+  normalResult.filter = normalResult.filter.id;
+
+  return normalResult;
+}
+
 export function normalizeStatus(status, normalOldStatus) {
   const normalStatus   = { ...status };
   normalStatus.account = status.account.id;
@@ -54,9 +62,14 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.poll = status.poll.id;
   }
 
-  // Only calculate these values when status first encountered
-  // Otherwise keep the ones already in the reducer
-  if (normalOldStatus) {
+  if (status.filtered) {
+    normalStatus.filtered = status.filtered.map(normalizeFilterResult);
+  }
+
+  // Only calculate these values when status first encountered and
+  // when the underlying values change. Otherwise keep the ones
+  // already in the reducer
+  if (normalOldStatus && normalOldStatus.get('content') === normalStatus.content && normalOldStatus.get('spoiler_text') === normalStatus.spoiler_text) {
     normalStatus.search_index = normalOldStatus.get('search_index');
     normalStatus.contentHtml = normalOldStatus.get('contentHtml');
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
@@ -71,7 +84,7 @@ export function normalizeStatus(status, normalOldStatus) {
     }
 
     const spoilerText   = normalStatus.spoiler_text || '';
-    const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+    const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
     const emojiMap      = makeEmojiMap(normalStatus);
 
     normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index d60ccc1fb..bc35736ff 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -54,7 +54,7 @@ export function reblog(status, visibility) {
       dispatch(reblogFail(status, error));
     });
   };
-};
+}
 
 export function unreblog(status) {
   return (dispatch, getState) => {
@@ -67,7 +67,7 @@ export function unreblog(status) {
       dispatch(unreblogFail(status, error));
     });
   };
-};
+}
 
 export function reblogRequest(status) {
   return {
@@ -75,7 +75,7 @@ export function reblogRequest(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function reblogSuccess(status) {
   return {
@@ -83,7 +83,7 @@ export function reblogSuccess(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function reblogFail(status, error) {
   return {
@@ -92,7 +92,7 @@ export function reblogFail(status, error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function unreblogRequest(status) {
   return {
@@ -100,7 +100,7 @@ export function unreblogRequest(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function unreblogSuccess(status) {
   return {
@@ -108,7 +108,7 @@ export function unreblogSuccess(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function unreblogFail(status, error) {
   return {
@@ -117,7 +117,7 @@ export function unreblogFail(status, error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function favourite(status) {
   return function (dispatch, getState) {
@@ -130,7 +130,7 @@ export function favourite(status) {
       dispatch(favouriteFail(status, error));
     });
   };
-};
+}
 
 export function unfavourite(status) {
   return (dispatch, getState) => {
@@ -143,7 +143,7 @@ export function unfavourite(status) {
       dispatch(unfavouriteFail(status, error));
     });
   };
-};
+}
 
 export function favouriteRequest(status) {
   return {
@@ -151,7 +151,7 @@ export function favouriteRequest(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function favouriteSuccess(status) {
   return {
@@ -159,7 +159,7 @@ export function favouriteSuccess(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function favouriteFail(status, error) {
   return {
@@ -168,7 +168,7 @@ export function favouriteFail(status, error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function unfavouriteRequest(status) {
   return {
@@ -176,7 +176,7 @@ export function unfavouriteRequest(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function unfavouriteSuccess(status) {
   return {
@@ -184,7 +184,7 @@ export function unfavouriteSuccess(status) {
     status: status,
     skipLoading: true,
   };
-};
+}
 
 export function unfavouriteFail(status, error) {
   return {
@@ -193,7 +193,7 @@ export function unfavouriteFail(status, error) {
     error: error,
     skipLoading: true,
   };
-};
+}
 
 export function bookmark(status) {
   return function (dispatch, getState) {
@@ -206,7 +206,7 @@ export function bookmark(status) {
       dispatch(bookmarkFail(status, error));
     });
   };
-};
+}
 
 export function unbookmark(status) {
   return (dispatch, getState) => {
@@ -219,14 +219,14 @@ export function unbookmark(status) {
       dispatch(unbookmarkFail(status, error));
     });
   };
-};
+}
 
 export function bookmarkRequest(status) {
   return {
     type: BOOKMARK_REQUEST,
     status: status,
   };
-};
+}
 
 export function bookmarkSuccess(status, response) {
   return {
@@ -234,7 +234,7 @@ export function bookmarkSuccess(status, response) {
     status: status,
     response: response,
   };
-};
+}
 
 export function bookmarkFail(status, error) {
   return {
@@ -242,14 +242,14 @@ export function bookmarkFail(status, error) {
     status: status,
     error: error,
   };
-};
+}
 
 export function unbookmarkRequest(status) {
   return {
     type: UNBOOKMARK_REQUEST,
     status: status,
   };
-};
+}
 
 export function unbookmarkSuccess(status, response) {
   return {
@@ -257,7 +257,7 @@ export function unbookmarkSuccess(status, response) {
     status: status,
     response: response,
   };
-};
+}
 
 export function unbookmarkFail(status, error) {
   return {
@@ -265,7 +265,7 @@ export function unbookmarkFail(status, error) {
     status: status,
     error: error,
   };
-};
+}
 
 export function fetchReblogs(id) {
   return (dispatch, getState) => {
@@ -278,14 +278,14 @@ export function fetchReblogs(id) {
       dispatch(fetchReblogsFail(id, error));
     });
   };
-};
+}
 
 export function fetchReblogsRequest(id) {
   return {
     type: REBLOGS_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchReblogsSuccess(id, accounts) {
   return {
@@ -293,14 +293,14 @@ export function fetchReblogsSuccess(id, accounts) {
     id,
     accounts,
   };
-};
+}
 
 export function fetchReblogsFail(id, error) {
   return {
     type: REBLOGS_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function fetchFavourites(id) {
   return (dispatch, getState) => {
@@ -313,14 +313,14 @@ export function fetchFavourites(id) {
       dispatch(fetchFavouritesFail(id, error));
     });
   };
-};
+}
 
 export function fetchFavouritesRequest(id) {
   return {
     type: FAVOURITES_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchFavouritesSuccess(id, accounts) {
   return {
@@ -328,14 +328,14 @@ export function fetchFavouritesSuccess(id, accounts) {
     id,
     accounts,
   };
-};
+}
 
 export function fetchFavouritesFail(id, error) {
   return {
     type: FAVOURITES_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function pin(status) {
   return (dispatch, getState) => {
@@ -348,7 +348,7 @@ export function pin(status) {
       dispatch(pinFail(status, error));
     });
   };
-};
+}
 
 export function pinRequest(status) {
   return {
@@ -356,7 +356,7 @@ export function pinRequest(status) {
     status,
     skipLoading: true,
   };
-};
+}
 
 export function pinSuccess(status) {
   return {
@@ -364,7 +364,7 @@ export function pinSuccess(status) {
     status,
     skipLoading: true,
   };
-};
+}
 
 export function pinFail(status, error) {
   return {
@@ -373,7 +373,7 @@ export function pinFail(status, error) {
     error,
     skipLoading: true,
   };
-};
+}
 
 export function unpin (status) {
   return (dispatch, getState) => {
@@ -386,7 +386,7 @@ export function unpin (status) {
       dispatch(unpinFail(status, error));
     });
   };
-};
+}
 
 export function unpinRequest(status) {
   return {
@@ -394,7 +394,7 @@ export function unpinRequest(status) {
     status,
     skipLoading: true,
   };
-};
+}
 
 export function unpinSuccess(status) {
   return {
@@ -402,7 +402,7 @@ export function unpinSuccess(status) {
     status,
     skipLoading: true,
   };
-};
+}
 
 export function unpinFail(status, error) {
   return {
@@ -411,4 +411,4 @@ export function unpinFail(status, error) {
     error,
     skipLoading: true,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/languages.js b/app/javascript/mastodon/actions/languages.js
new file mode 100644
index 000000000..ad186ba0c
--- /dev/null
+++ b/app/javascript/mastodon/actions/languages.js
@@ -0,0 +1,12 @@
+import { saveSettings } from './settings';
+
+export const LANGUAGE_USE = 'LANGUAGE_USE';
+
+export const useLanguage = language => dispatch => {
+  dispatch({
+    type: LANGUAGE_USE,
+    language,
+  });
+
+  dispatch(saveSettings());
+};
diff --git a/app/javascript/mastodon/actions/markers.js b/app/javascript/mastodon/actions/markers.js
index 16a3df8f6..16ec7fe77 100644
--- a/app/javascript/mastodon/actions/markers.js
+++ b/app/javascript/mastodon/actions/markers.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { debounce } from 'lodash';
 import compareId from '../compare_id';
+import { List as ImmutableList } from 'immutable';
 
 export const MARKERS_FETCH_REQUEST = 'MARKERS_FETCH_REQUEST';
 export const MARKERS_FETCH_SUCCESS = 'MARKERS_FETCH_SUCCESS';
@@ -11,7 +12,7 @@ export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
   const accessToken = getState().getIn(['meta', 'access_token'], '');
   const params      = _buildParams(getState());
 
-  if (Object.keys(params).length === 0) {
+  if (Object.keys(params).length === 0 || accessToken === '') {
     return;
   }
 
@@ -63,7 +64,7 @@ export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
 const _buildParams = (state) => {
   const params = {};
 
-  const lastHomeId         = state.getIn(['timelines', 'home', 'items']).find(item => item !== null);
+  const lastHomeId         = state.getIn(['timelines', 'home', 'items'], ImmutableList()).find(item => item !== null);
   const lastNotificationId = state.getIn(['notifications', 'lastReadId']);
 
   if (lastHomeId && compareId(lastHomeId, state.getIn(['markers', 'home'])) > 0) {
@@ -82,9 +83,10 @@ const _buildParams = (state) => {
 };
 
 const debouncedSubmitMarkers = debounce((dispatch, getState) => {
-  const params = _buildParams(getState());
+  const accessToken = getState().getIn(['meta', 'access_token'], '');
+  const params      = _buildParams(getState());
 
-  if (Object.keys(params).length === 0) {
+  if (Object.keys(params).length === 0 || accessToken === '') {
     return;
   }
 
@@ -99,7 +101,7 @@ export function submitMarkersSuccess({ home, notifications }) {
     home: (home || {}).last_read_id,
     notifications: (notifications || {}).last_read_id,
   };
-};
+}
 
 export function submitMarkers(params = {}) {
   const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
@@ -109,7 +111,7 @@ export function submitMarkers(params = {}) {
   }
 
   return result;
-};
+}
 
 export const fetchMarkers = () => (dispatch, getState) => {
   const params = { timeline: ['notifications'] };
@@ -128,7 +130,7 @@ export function fetchMarkersRequest() {
     type: MARKERS_FETCH_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function fetchMarkersSuccess(markers) {
   return {
@@ -136,7 +138,7 @@ export function fetchMarkersSuccess(markers) {
     markers,
     skipLoading: true,
   };
-};
+}
 
 export function fetchMarkersFail(error) {
   return {
@@ -145,4 +147,4 @@ export function fetchMarkersFail(error) {
     skipLoading: true,
     skipAlert: true,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/modal.js b/app/javascript/mastodon/actions/modal.js
index 3d0299db5..ef2ae0e4c 100644
--- a/app/javascript/mastodon/actions/modal.js
+++ b/app/javascript/mastodon/actions/modal.js
@@ -7,11 +7,12 @@ export function openModal(type, props) {
     modalType: type,
     modalProps: props,
   };
-};
+}
 
-export function closeModal(type) {
+export function closeModal(type, options = { ignoreFocus: false }) {
   return {
     type: MODAL_CLOSE,
     modalType: type,
+    ignoreFocus: options.ignoreFocus,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index d8874f353..cbc42a67e 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -26,13 +26,13 @@ export function fetchMutes() {
       dispatch(fetchRelationships(response.data.map(item => item.id)));
     }).catch(error => dispatch(fetchMutesFail(error)));
   };
-};
+}
 
 export function fetchMutesRequest() {
   return {
     type: MUTES_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchMutesSuccess(accounts, next) {
   return {
@@ -40,14 +40,14 @@ export function fetchMutesSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function fetchMutesFail(error) {
   return {
     type: MUTES_FETCH_FAIL,
     error,
   };
-};
+}
 
 export function expandMutes() {
   return (dispatch, getState) => {
@@ -66,13 +66,13 @@ export function expandMutes() {
       dispatch(fetchRelationships(response.data.map(item => item.id)));
     }).catch(error => dispatch(expandMutesFail(error)));
   };
-};
+}
 
 export function expandMutesRequest() {
   return {
     type: MUTES_EXPAND_REQUEST,
   };
-};
+}
 
 export function expandMutesSuccess(accounts, next) {
   return {
@@ -80,14 +80,14 @@ export function expandMutesSuccess(accounts, next) {
     accounts,
     next,
   };
-};
+}
 
 export function expandMutesFail(error) {
   return {
     type: MUTES_EXPAND_FAIL,
     error,
   };
-};
+}
 
 export function initMuteModal(account) {
   return dispatch => {
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 663cf21e3..93588d3c0 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -12,10 +12,8 @@ import { saveSettings } from './settings';
 import { defineMessages } from 'react-intl';
 import { List as ImmutableList } from 'immutable';
 import { unescapeHTML } from '../utils/html';
-import { getFiltersRegex } from '../selectors';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
 import compareId from 'mastodon/compare_id';
-import { searchTextFromRawStatus } from 'mastodon/actions/importer/normalizer';
 import { requestNotificationPermission } from '../utils/notifications';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
@@ -34,7 +32,6 @@ export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 export const NOTIFICATIONS_MOUNT   = 'NOTIFICATIONS_MOUNT';
 export const NOTIFICATIONS_UNMOUNT = 'NOTIFICATIONS_UNMOUNT';
 
-
 export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
@@ -46,7 +43,7 @@ defineMessages({
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
-  const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id);
+  const accountIds = notifications.filter(item => ['follow', 'follow_request', 'admin.sign_up'].indexOf(item.type) !== -1).map(item => item.account.id);
 
   if (accountIds.length > 0) {
     dispatch(fetchRelationships(accountIds));
@@ -59,23 +56,21 @@ export const loadPending = () => ({
 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {
-    const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
+    const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
+    const showInColumn = activeFilter === 'all' ? getState().getIn(['settings', 'notifications', 'shows', notification.type], true) : activeFilter === notification.type;
     const showAlert    = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
     const playSound    = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
-    const filters      = getFiltersRegex(getState(), { contextType: 'notifications' });
 
     let filtered = false;
 
-    if (['mention', 'status'].includes(notification.type)) {
-      const dropRegex   = filters[0];
-      const regex       = filters[1];
-      const searchIndex = searchTextFromRawStatus(notification.status);
+    if (['mention', 'status'].includes(notification.type) && notification.status.filtered) {
+      const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications'));
 
-      if (dropRegex && dropRegex.test(searchIndex)) {
+      if (filters.some(result => result.filter.filter_action === 'hide')) {
         return;
       }
 
-      filtered = regex && regex.test(searchIndex);
+      filtered = filters.length > 0;
     }
 
     if (['follow_request'].includes(notification.type)) {
@@ -91,6 +86,10 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
         dispatch(importFetchedStatus(notification.status));
       }
 
+      if (notification.report) {
+        dispatch(importFetchedAccount(notification.report.target_account));
+      }
+
       dispatch({
         type: NOTIFICATIONS_UPDATE,
         notification,
@@ -119,26 +118,45 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
       });
     }
   };
-};
+}
 
 const excludeTypesFromSettings = state => state.getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS();
 
 const excludeTypesFromFilter = filter => {
-  const allTypes = ImmutableList(['follow', 'follow_request', 'favourite', 'reblog', 'mention', 'poll']);
+  const allTypes = ImmutableList([
+    'follow',
+    'follow_request',
+    'favourite',
+    'reblog',
+    'mention',
+    'poll',
+    'status',
+    'update',
+    'admin.sign_up',
+    'admin.report',
+  ]);
+
   return allTypes.filterNot(item => item === filter).toJS();
 };
 
 const noOp = () => {};
 
-export function expandNotifications({ maxId } = {}, done = noOp) {
+let expandNotificationsController = new AbortController();
+
+export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
     const isLoadingMore = !!maxId;
 
     if (notifications.get('isLoading')) {
-      done();
-      return;
+      if (forceLoad) {
+        expandNotificationsController.abort();
+        expandNotificationsController = new AbortController();
+      } else {
+        done();
+        return;
+      }
     }
 
     const params = {
@@ -163,11 +181,12 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
 
     dispatch(expandNotificationsRequest(isLoadingMore));
 
-    api(getState).get('/api/v1/notifications', { params }).then(response => {
+    api(getState).get('/api/v1/notifications', { params, signal: expandNotificationsController.signal }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
 
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
       dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+      dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
 
       dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore, isLoadingRecent, isLoadingRecent && preferPendingItems));
       fetchRelatedRelationships(dispatch, response.data);
@@ -178,14 +197,14 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
       done();
     });
   };
-};
+}
 
 export function expandNotificationsRequest(isLoadingMore) {
   return {
     type: NOTIFICATIONS_EXPAND_REQUEST,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
 export function expandNotificationsSuccess(notifications, next, isLoadingMore, isLoadingRecent, usePendingItems) {
   return {
@@ -196,16 +215,16 @@ export function expandNotificationsSuccess(notifications, next, isLoadingMore, i
     usePendingItems,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
 export function expandNotificationsFail(error, isLoadingMore) {
   return {
     type: NOTIFICATIONS_EXPAND_FAIL,
     error,
     skipLoading: !isLoadingMore,
-    skipAlert: !isLoadingMore,
+    skipAlert: !isLoadingMore || error.name === 'AbortError',
   };
-};
+}
 
 export function clearNotifications() {
   return (dispatch, getState) => {
@@ -215,14 +234,14 @@ export function clearNotifications() {
 
     api(getState).post('/api/v1/notifications/clear');
   };
-};
+}
 
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
     top,
   };
-};
+}
 
 export function setFilter (filterType) {
   return dispatch => {
@@ -231,10 +250,10 @@ export function setFilter (filterType) {
       path: ['notifications', 'quickFilter', 'active'],
       value: filterType,
     });
-    dispatch(expandNotifications());
+    dispatch(expandNotifications({ forceLoad: true }));
     dispatch(saveSettings());
   };
-};
+}
 
 export const mountNotifications = () => ({
   type: NOTIFICATIONS_MOUNT,
@@ -272,7 +291,7 @@ export function requestBrowserPermission(callback = noOp) {
       callback(permission);
     });
   };
-};
+}
 
 export function setBrowserSupport (value) {
   return {
diff --git a/app/javascript/mastodon/actions/pin_statuses.js b/app/javascript/mastodon/actions/pin_statuses.js
index 77abba7b5..e2de98ca9 100644
--- a/app/javascript/mastodon/actions/pin_statuses.js
+++ b/app/javascript/mastodon/actions/pin_statuses.js
@@ -18,13 +18,13 @@ export function fetchPinnedStatuses() {
       dispatch(fetchPinnedStatusesFail(error));
     });
   };
-};
+}
 
 export function fetchPinnedStatusesRequest() {
   return {
     type: PINNED_STATUSES_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchPinnedStatusesSuccess(statuses, next) {
   return {
@@ -32,11 +32,11 @@ export function fetchPinnedStatusesSuccess(statuses, next) {
     statuses,
     next,
   };
-};
+}
 
 export function fetchPinnedStatusesFail(error) {
   return {
     type: PINNED_STATUSES_FETCH_FAIL,
     error,
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/push_notifications/index.js b/app/javascript/mastodon/actions/push_notifications/index.js
index 2ffec500a..9dcc4bd4b 100644
--- a/app/javascript/mastodon/actions/push_notifications/index.js
+++ b/app/javascript/mastodon/actions/push_notifications/index.js
@@ -1,19 +1,5 @@
-import {
-  SET_BROWSER_SUPPORT,
-  SET_SUBSCRIPTION,
-  CLEAR_SUBSCRIPTION,
-  SET_ALERTS,
-  setAlerts,
-} from './setter';
-import { register, saveSettings } from './registerer';
-
-export {
-  SET_BROWSER_SUPPORT,
-  SET_SUBSCRIPTION,
-  CLEAR_SUBSCRIPTION,
-  SET_ALERTS,
-  register,
-};
+import { setAlerts } from './setter';
+import { saveSettings } from './registerer';
 
 export function changeAlerts(path, value) {
   return dispatch => {
@@ -21,3 +7,11 @@ export function changeAlerts(path, value) {
     dispatch(saveSettings());
   };
 }
+
+export {
+  CLEAR_SUBSCRIPTION,
+  SET_BROWSER_SUPPORT,
+  SET_SUBSCRIPTION,
+  SET_ALERTS,
+} from './setter';
+export { register } from './registerer';
diff --git a/app/javascript/mastodon/actions/reports.js b/app/javascript/mastodon/actions/reports.js
index afa0c3412..fbe5b3791 100644
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@@ -1,89 +1,38 @@
 import api from '../api';
-import { openModal, closeModal } from './modal';
-
-export const REPORT_INIT   = 'REPORT_INIT';
-export const REPORT_CANCEL = 'REPORT_CANCEL';
+import { openModal } from './modal';
 
 export const REPORT_SUBMIT_REQUEST = 'REPORT_SUBMIT_REQUEST';
 export const REPORT_SUBMIT_SUCCESS = 'REPORT_SUBMIT_SUCCESS';
 export const REPORT_SUBMIT_FAIL    = 'REPORT_SUBMIT_FAIL';
 
-export const REPORT_STATUS_TOGGLE  = 'REPORT_STATUS_TOGGLE';
-export const REPORT_COMMENT_CHANGE = 'REPORT_COMMENT_CHANGE';
-export const REPORT_FORWARD_CHANGE = 'REPORT_FORWARD_CHANGE';
+export const initReport = (account, status) => dispatch =>
+  dispatch(openModal('REPORT', {
+    accountId: account.get('id'),
+    statusId: status?.get('id'),
+  }));
 
-export function initReport(account, status) {
-  return dispatch => {
-    dispatch({
-      type: REPORT_INIT,
-      account,
-      status,
-    });
+export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
+  dispatch(submitReportRequest());
 
-    dispatch(openModal('REPORT'));
-  };
+  api(getState).post('/api/v1/reports', params).then(response => {
+    dispatch(submitReportSuccess(response.data));
+    if (onSuccess) onSuccess();
+  }).catch(error => {
+    dispatch(submitReportFail(error));
+    if (onFail) onFail();
+  });
 };
 
-export function cancelReport() {
-  return {
-    type: REPORT_CANCEL,
-  };
-};
+export const submitReportRequest = () => ({
+  type: REPORT_SUBMIT_REQUEST,
+});
 
-export function toggleStatusReport(statusId, checked) {
-  return {
-    type: REPORT_STATUS_TOGGLE,
-    statusId,
-    checked,
-  };
-};
+export const submitReportSuccess = report => ({
+  type: REPORT_SUBMIT_SUCCESS,
+  report,
+});
 
-export function submitReport() {
-  return (dispatch, getState) => {
-    dispatch(submitReportRequest());
-
-    api(getState).post('/api/v1/reports', {
-      account_id: getState().getIn(['reports', 'new', 'account_id']),
-      status_ids: getState().getIn(['reports', 'new', 'status_ids']),
-      comment: getState().getIn(['reports', 'new', 'comment']),
-      forward: getState().getIn(['reports', 'new', 'forward']),
-    }).then(response => {
-      dispatch(closeModal());
-      dispatch(submitReportSuccess(response.data));
-    }).catch(error => dispatch(submitReportFail(error)));
-  };
-};
-
-export function submitReportRequest() {
-  return {
-    type: REPORT_SUBMIT_REQUEST,
-  };
-};
-
-export function submitReportSuccess(report) {
-  return {
-    type: REPORT_SUBMIT_SUCCESS,
-    report,
-  };
-};
-
-export function submitReportFail(error) {
-  return {
-    type: REPORT_SUBMIT_FAIL,
-    error,
-  };
-};
-
-export function changeReportComment(comment) {
-  return {
-    type: REPORT_COMMENT_CHANGE,
-    comment,
-  };
-};
-
-export function changeReportForward(forward) {
-  return {
-    type: REPORT_FORWARD_CHANGE,
-    forward,
-  };
-};
+export const submitReportFail = error => ({
+  type: REPORT_SUBMIT_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index 37560a74c..666c6c223 100644
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -19,17 +19,18 @@ export function changeSearch(value) {
     type: SEARCH_CHANGE,
     value,
   };
-};
+}
 
 export function clearSearch() {
   return {
     type: SEARCH_CLEAR,
   };
-};
+}
 
 export function submitSearch() {
   return (dispatch, getState) => {
-    const value = getState().getIn(['search', 'value']);
+    const value    = getState().getIn(['search', 'value']);
+    const signedIn = !!getState().getIn(['meta', 'me']);
 
     if (value.length === 0) {
       dispatch(fetchSearchSuccess({ accounts: [], statuses: [], hashtags: [] }, ''));
@@ -41,7 +42,7 @@ export function submitSearch() {
     api(getState).get('/api/v2/search', {
       params: {
         q: value,
-        resolve: true,
+        resolve: signedIn,
         limit: 5,
       },
     }).then(response => {
@@ -59,13 +60,13 @@ export function submitSearch() {
       dispatch(fetchSearchFail(error));
     });
   };
-};
+}
 
 export function fetchSearchRequest() {
   return {
     type: SEARCH_FETCH_REQUEST,
   };
-};
+}
 
 export function fetchSearchSuccess(results, searchTerm) {
   return {
@@ -73,14 +74,14 @@ export function fetchSearchSuccess(results, searchTerm) {
     results,
     searchTerm,
   };
-};
+}
 
 export function fetchSearchFail(error) {
   return {
     type: SEARCH_FETCH_FAIL,
     error,
   };
-};
+}
 
 export const expandSearch = type => (dispatch, getState) => {
   const value  = getState().getIn(['search', 'value']);
diff --git a/app/javascript/mastodon/actions/server.js b/app/javascript/mastodon/actions/server.js
new file mode 100644
index 000000000..31d4aea10
--- /dev/null
+++ b/app/javascript/mastodon/actions/server.js
@@ -0,0 +1,91 @@
+import api from '../api';
+import { importFetchedAccount } from './importer';
+
+export const SERVER_FETCH_REQUEST = 'Server_FETCH_REQUEST';
+export const SERVER_FETCH_SUCCESS = 'Server_FETCH_SUCCESS';
+export const SERVER_FETCH_FAIL    = 'Server_FETCH_FAIL';
+
+export const EXTENDED_DESCRIPTION_REQUEST = 'EXTENDED_DESCRIPTION_REQUEST';
+export const EXTENDED_DESCRIPTION_SUCCESS = 'EXTENDED_DESCRIPTION_SUCCESS';
+export const EXTENDED_DESCRIPTION_FAIL    = 'EXTENDED_DESCRIPTION_FAIL';
+
+export const SERVER_DOMAIN_BLOCKS_FETCH_REQUEST = 'SERVER_DOMAIN_BLOCKS_FETCH_REQUEST';
+export const SERVER_DOMAIN_BLOCKS_FETCH_SUCCESS = 'SERVER_DOMAIN_BLOCKS_FETCH_SUCCESS';
+export const SERVER_DOMAIN_BLOCKS_FETCH_FAIL    = 'SERVER_DOMAIN_BLOCKS_FETCH_FAIL';
+
+export const fetchServer = () => (dispatch, getState) => {
+  dispatch(fetchServerRequest());
+
+  api(getState)
+    .get('/api/v2/instance').then(({ data }) => {
+      if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
+      dispatch(fetchServerSuccess(data));
+    }).catch(err => dispatch(fetchServerFail(err)));
+};
+
+const fetchServerRequest = () => ({
+  type: SERVER_FETCH_REQUEST,
+});
+
+const fetchServerSuccess = server => ({
+  type: SERVER_FETCH_SUCCESS,
+  server,
+});
+
+const fetchServerFail = error => ({
+  type: SERVER_FETCH_FAIL,
+  error,
+});
+
+export const fetchExtendedDescription = () => (dispatch, getState) => {
+  dispatch(fetchExtendedDescriptionRequest());
+
+  api(getState)
+    .get('/api/v1/instance/extended_description')
+    .then(({ data }) => dispatch(fetchExtendedDescriptionSuccess(data)))
+    .catch(err => dispatch(fetchExtendedDescriptionFail(err)));
+};
+
+const fetchExtendedDescriptionRequest = () => ({
+  type: EXTENDED_DESCRIPTION_REQUEST,
+});
+
+const fetchExtendedDescriptionSuccess = description => ({
+  type: EXTENDED_DESCRIPTION_SUCCESS,
+  description,
+});
+
+const fetchExtendedDescriptionFail = error => ({
+  type: EXTENDED_DESCRIPTION_FAIL,
+  error,
+});
+
+export const fetchDomainBlocks = () => (dispatch, getState) => {
+  dispatch(fetchDomainBlocksRequest());
+
+  api(getState)
+    .get('/api/v1/instance/domain_blocks')
+    .then(({ data }) => dispatch(fetchDomainBlocksSuccess(true, data)))
+    .catch(err => {
+      if (err.response.status === 404) {
+        dispatch(fetchDomainBlocksSuccess(false, []));
+      } else {
+        dispatch(fetchDomainBlocksFail(err));
+      }
+    });
+};
+
+const fetchDomainBlocksRequest = () => ({
+  type: SERVER_DOMAIN_BLOCKS_FETCH_REQUEST,
+});
+
+const fetchDomainBlocksSuccess = (isAvailable, blocks) => ({
+  type: SERVER_DOMAIN_BLOCKS_FETCH_SUCCESS,
+  isAvailable,
+  blocks,
+});
+
+const fetchDomainBlocksFail = error => ({
+  type: SERVER_DOMAIN_BLOCKS_FETCH_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/settings.js b/app/javascript/mastodon/actions/settings.js
index 6bf85e464..6ae001b6f 100644
--- a/app/javascript/mastodon/actions/settings.js
+++ b/app/javascript/mastodon/actions/settings.js
@@ -15,7 +15,7 @@ export function changeSetting(path, value) {
 
     dispatch(saveSettings());
   };
-};
+}
 
 const debouncedSave = debounce((dispatch, getState) => {
   if (getState().getIn(['settings', 'saved'])) {
@@ -31,4 +31,4 @@ const debouncedSave = debounce((dispatch, getState) => {
 
 export function saveSettings() {
   return (dispatch, getState) => debouncedSave(dispatch, getState);
-};
+}
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3fc7c0702..275280a53 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -2,7 +2,7 @@ import api from '../api';
 
 import { deleteFromTimelines } from './timelines';
 import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer';
-import { ensureComposeIsVisible } from './compose';
+import { ensureComposeIsVisible, setComposeToStatus } from './compose';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
@@ -30,17 +30,26 @@ export const STATUS_COLLAPSE = 'STATUS_COLLAPSE';
 
 export const REDRAFT = 'REDRAFT';
 
+export const STATUS_FETCH_SOURCE_REQUEST = 'STATUS_FETCH_SOURCE_REQUEST';
+export const STATUS_FETCH_SOURCE_SUCCESS = 'STATUS_FETCH_SOURCE_SUCCESS';
+export const STATUS_FETCH_SOURCE_FAIL    = 'STATUS_FETCH_SOURCE_FAIL';
+
+export const STATUS_TRANSLATE_REQUEST = 'STATUS_TRANSLATE_REQUEST';
+export const STATUS_TRANSLATE_SUCCESS = 'STATUS_TRANSLATE_SUCCESS';
+export const STATUS_TRANSLATE_FAIL    = 'STATUS_TRANSLATE_FAIL';
+export const STATUS_TRANSLATE_UNDO    = 'STATUS_TRANSLATE_UNDO';
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
     id,
     skipLoading,
   };
-};
+}
 
-export function fetchStatus(id) {
+export function fetchStatus(id, forceFetch = false) {
   return (dispatch, getState) => {
-    const skipLoading = getState().getIn(['statuses', id], null) !== null;
+    const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null;
 
     dispatch(fetchContext(id));
 
@@ -57,14 +66,14 @@ export function fetchStatus(id) {
       dispatch(fetchStatusFail(id, error, skipLoading));
     });
   };
-};
+}
 
 export function fetchStatusSuccess(skipLoading) {
   return {
     type: STATUS_FETCH_SUCCESS,
     skipLoading,
   };
-};
+}
 
 export function fetchStatusFail(id, error, skipLoading) {
   return {
@@ -74,7 +83,7 @@ export function fetchStatusFail(id, error, skipLoading) {
     skipLoading,
     skipAlert: true,
   };
-};
+}
 
 export function redraft(status, raw_text) {
   return {
@@ -82,8 +91,39 @@ export function redraft(status, raw_text) {
     status,
     raw_text,
   };
+}
+
+export const editStatus = (id, routerHistory) => (dispatch, getState) => {
+  let status = getState().getIn(['statuses', id]);
+
+  if (status.get('poll')) {
+    status = status.set('poll', getState().getIn(['polls', status.get('poll')]));
+  }
+
+  dispatch(fetchStatusSourceRequest());
+
+  api(getState).get(`/api/v1/statuses/${id}/source`).then(response => {
+    dispatch(fetchStatusSourceSuccess());
+    ensureComposeIsVisible(getState, routerHistory);
+    dispatch(setComposeToStatus(status, response.data.text, response.data.spoiler_text));
+  }).catch(error => {
+    dispatch(fetchStatusSourceFail(error));
+  });
 };
 
+export const fetchStatusSourceRequest = () => ({
+  type: STATUS_FETCH_SOURCE_REQUEST,
+});
+
+export const fetchStatusSourceSuccess = () => ({
+  type: STATUS_FETCH_SOURCE_SUCCESS,
+});
+
+export const fetchStatusSourceFail = error => ({
+  type: STATUS_FETCH_SOURCE_FAIL,
+  error,
+});
+
 export function deleteStatus(id, routerHistory, withRedraft = false) {
   return (dispatch, getState) => {
     let status = getState().getIn(['statuses', id]);
@@ -107,21 +147,21 @@ export function deleteStatus(id, routerHistory, withRedraft = false) {
       dispatch(deleteStatusFail(id, error));
     });
   };
-};
+}
 
 export function deleteStatusRequest(id) {
   return {
     type: STATUS_DELETE_REQUEST,
     id: id,
   };
-};
+}
 
 export function deleteStatusSuccess(id) {
   return {
     type: STATUS_DELETE_SUCCESS,
     id: id,
   };
-};
+}
 
 export function deleteStatusFail(id, error) {
   return {
@@ -129,7 +169,10 @@ export function deleteStatusFail(id, error) {
     id: id,
     error: error,
   };
-};
+}
+
+export const updateStatus = status => dispatch =>
+  dispatch(importFetchedStatus(status));
 
 export function fetchContext(id) {
   return (dispatch, getState) => {
@@ -147,14 +190,14 @@ export function fetchContext(id) {
       dispatch(fetchContextFail(id, error));
     });
   };
-};
+}
 
 export function fetchContextRequest(id) {
   return {
     type: CONTEXT_FETCH_REQUEST,
     id,
   };
-};
+}
 
 export function fetchContextSuccess(id, ancestors, descendants) {
   return {
@@ -164,7 +207,7 @@ export function fetchContextSuccess(id, ancestors, descendants) {
     descendants,
     statuses: ancestors.concat(descendants),
   };
-};
+}
 
 export function fetchContextFail(id, error) {
   return {
@@ -173,7 +216,7 @@ export function fetchContextFail(id, error) {
     error,
     skipAlert: true,
   };
-};
+}
 
 export function muteStatus(id) {
   return (dispatch, getState) => {
@@ -185,21 +228,21 @@ export function muteStatus(id) {
       dispatch(muteStatusFail(id, error));
     });
   };
-};
+}
 
 export function muteStatusRequest(id) {
   return {
     type: STATUS_MUTE_REQUEST,
     id,
   };
-};
+}
 
 export function muteStatusSuccess(id) {
   return {
     type: STATUS_MUTE_SUCCESS,
     id,
   };
-};
+}
 
 export function muteStatusFail(id, error) {
   return {
@@ -207,7 +250,7 @@ export function muteStatusFail(id, error) {
     id,
     error,
   };
-};
+}
 
 export function unmuteStatus(id) {
   return (dispatch, getState) => {
@@ -219,21 +262,21 @@ export function unmuteStatus(id) {
       dispatch(unmuteStatusFail(id, error));
     });
   };
-};
+}
 
 export function unmuteStatusRequest(id) {
   return {
     type: STATUS_UNMUTE_REQUEST,
     id,
   };
-};
+}
 
 export function unmuteStatusSuccess(id) {
   return {
     type: STATUS_UNMUTE_SUCCESS,
     id,
   };
-};
+}
 
 export function unmuteStatusFail(id, error) {
   return {
@@ -241,7 +284,7 @@ export function unmuteStatusFail(id, error) {
     id,
     error,
   };
-};
+}
 
 export function hideStatus(ids) {
   if (!Array.isArray(ids)) {
@@ -252,7 +295,7 @@ export function hideStatus(ids) {
     type: STATUS_HIDE,
     ids,
   };
-};
+}
 
 export function revealStatus(ids) {
   if (!Array.isArray(ids)) {
@@ -263,7 +306,7 @@ export function revealStatus(ids) {
     type: STATUS_REVEAL,
     ids,
   };
-};
+}
 
 export function toggleStatusCollapse(id, isCollapsed) {
   return {
@@ -272,3 +315,35 @@ export function toggleStatusCollapse(id, isCollapsed) {
     isCollapsed,
   };
 }
+
+export const translateStatus = id => (dispatch, getState) => {
+  dispatch(translateStatusRequest(id));
+
+  api(getState).post(`/api/v1/statuses/${id}/translate`).then(response => {
+    dispatch(translateStatusSuccess(id, response.data));
+  }).catch(error => {
+    dispatch(translateStatusFail(id, error));
+  });
+};
+
+export const translateStatusRequest = id => ({
+  type: STATUS_TRANSLATE_REQUEST,
+  id,
+});
+
+export const translateStatusSuccess = (id, translation) => ({
+  type: STATUS_TRANSLATE_SUCCESS,
+  id,
+  translation,
+});
+
+export const translateStatusFail = (id, error) => ({
+  type: STATUS_TRANSLATE_FAIL,
+  id,
+  error,
+});
+
+export const undoStatusTranslation = id => ({
+  type: STATUS_TRANSLATE_UNDO,
+  id,
+});
diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js
index 34dcafc51..b3030467b 100644
--- a/app/javascript/mastodon/actions/store.js
+++ b/app/javascript/mastodon/actions/store.js
@@ -21,4 +21,4 @@ export function hydrateStore(rawState) {
     dispatch(hydrateCompose());
     dispatch(importFetchedAccounts(Object.values(rawState.accounts)));
   };
-};
+}
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index beb5c6a4a..84709083f 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -7,16 +7,20 @@ import {
   expandHomeTimeline,
   connectTimeline,
   disconnectTimeline,
+  fillHomeTimelineGaps,
+  fillPublicTimelineGaps,
+  fillCommunityTimelineGaps,
+  fillListTimelineGaps,
 } from './timelines';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateConversations } from './conversations';
+import { updateStatus } from './statuses';
 import {
   fetchAnnouncements,
   updateAnnouncements,
   updateReaction as updateAnnouncementsReaction,
   deleteAnnouncement,
 } from './announcements';
-import { fetchFilters } from './filters';
 import { getLocale } from '../locales';
 
 const { messages } = getLocale();
@@ -34,6 +38,7 @@ const randomUpTo = max =>
  * @param {Object.<string, string>} params
  * @param {Object} options
  * @param {function(Function, Function): void} [options.fallback]
+ * @param {function(): void} [options.fillGaps]
  * @param {function(object): boolean} [options.accept]
  * @return {function(): void}
  */
@@ -60,6 +65,10 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           clearTimeout(pollingId);
           pollingId = null;
         }
+
+        if (options.fillGaps) {
+          dispatch(options.fillGaps());
+        }
       },
 
       onDisconnect() {
@@ -75,6 +84,9 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'update':
           dispatch(updateTimeline(timelineId, JSON.parse(data.payload), options.accept));
           break;
+        case 'status.update':
+          dispatch(updateStatus(JSON.parse(data.payload)));
+          break;
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
           break;
@@ -84,9 +96,6 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'conversation':
           dispatch(updateConversations(JSON.parse(data.payload)));
           break;
-        case 'filters_changed':
-          dispatch(fetchFilters());
-          break;
         case 'announcement':
           dispatch(updateAnnouncements(JSON.parse(data.payload)));
           break;
@@ -115,7 +124,7 @@ const refreshHomeTimelineAndNotification = (dispatch, done) => {
  * @return {function(): void}
  */
 export const connectUserStream = () =>
-  connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification });
+  connectTimelineStream('home', 'user', {}, { fallback: refreshHomeTimelineAndNotification, fillGaps: fillHomeTimelineGaps });
 
 /**
  * @param {Object} options
@@ -123,7 +132,7 @@ export const connectUserStream = () =>
  * @return {function(): void}
  */
 export const connectCommunityStream = ({ onlyMedia } = {}) =>
-  connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`);
+  connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`, {}, { fillGaps: () => (fillCommunityTimelineGaps({ onlyMedia })) });
 
 /**
  * @param {Object} options
@@ -132,7 +141,7 @@ export const connectCommunityStream = ({ onlyMedia } = {}) =>
  * @return {function(): void}
  */
 export const connectPublicStream = ({ onlyMedia, onlyRemote } = {}) =>
-  connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`);
+  connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, {}, { fillGaps: () => fillPublicTimelineGaps({ onlyMedia, onlyRemote }) });
 
 /**
  * @param {string} columnId
@@ -155,4 +164,4 @@ export const connectDirectStream = () =>
  * @return {function(): void}
  */
 export const connectListStream = listId =>
-  connectTimelineStream(`list:${listId}`, 'list', { list: listId });
+  connectTimelineStream(`list:${listId}`, 'list', { list: listId }, { fillGaps: () => fillListTimelineGaps(listId) });
diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
index 1f1116e75..9e8cd1ea4 100644
--- a/app/javascript/mastodon/actions/suggestions.js
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -21,14 +21,14 @@ export function fetchSuggestions(withRelationships = false) {
       }
     }).catch(error => dispatch(fetchSuggestionsFail(error)));
   };
-};
+}
 
 export function fetchSuggestionsRequest() {
   return {
     type: SUGGESTIONS_FETCH_REQUEST,
     skipLoading: true,
   };
-};
+}
 
 export function fetchSuggestionsSuccess(suggestions) {
   return {
@@ -36,7 +36,7 @@ export function fetchSuggestionsSuccess(suggestions) {
     suggestions,
     skipLoading: true,
   };
-};
+}
 
 export function fetchSuggestionsFail(error) {
   return {
@@ -45,7 +45,7 @@ export function fetchSuggestionsFail(error) {
     skipLoading: true,
     skipAlert: true,
   };
-};
+}
 
 export const dismissSuggestion = accountId => (dispatch, getState) => {
   dispatch({
diff --git a/app/javascript/mastodon/actions/tags.js b/app/javascript/mastodon/actions/tags.js
new file mode 100644
index 000000000..37e79d4cb
--- /dev/null
+++ b/app/javascript/mastodon/actions/tags.js
@@ -0,0 +1,92 @@
+import api from '../api';
+
+export const HASHTAG_FETCH_REQUEST = 'HASHTAG_FETCH_REQUEST';
+export const HASHTAG_FETCH_SUCCESS = 'HASHTAG_FETCH_SUCCESS';
+export const HASHTAG_FETCH_FAIL    = 'HASHTAG_FETCH_FAIL';
+
+export const HASHTAG_FOLLOW_REQUEST = 'HASHTAG_FOLLOW_REQUEST';
+export const HASHTAG_FOLLOW_SUCCESS = 'HASHTAG_FOLLOW_SUCCESS';
+export const HASHTAG_FOLLOW_FAIL    = 'HASHTAG_FOLLOW_FAIL';
+
+export const HASHTAG_UNFOLLOW_REQUEST = 'HASHTAG_UNFOLLOW_REQUEST';
+export const HASHTAG_UNFOLLOW_SUCCESS = 'HASHTAG_UNFOLLOW_SUCCESS';
+export const HASHTAG_UNFOLLOW_FAIL    = 'HASHTAG_UNFOLLOW_FAIL';
+
+export const fetchHashtag = name => (dispatch, getState) => {
+  dispatch(fetchHashtagRequest());
+
+  api(getState).get(`/api/v1/tags/${name}`).then(({ data }) => {
+    dispatch(fetchHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(fetchHashtagFail(err));
+  });
+};
+
+export const fetchHashtagRequest = () => ({
+  type: HASHTAG_FETCH_REQUEST,
+});
+
+export const fetchHashtagSuccess = (name, tag) => ({
+  type: HASHTAG_FETCH_SUCCESS,
+  name,
+  tag,
+});
+
+export const fetchHashtagFail = error => ({
+  type: HASHTAG_FETCH_FAIL,
+  error,
+});
+
+export const followHashtag = name => (dispatch, getState) => {
+  dispatch(followHashtagRequest(name));
+
+  api(getState).post(`/api/v1/tags/${name}/follow`).then(({ data }) => {
+    dispatch(followHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(followHashtagFail(name, err));
+  });
+};
+
+export const followHashtagRequest = name => ({
+  type: HASHTAG_FOLLOW_REQUEST,
+  name,
+});
+
+export const followHashtagSuccess = (name, tag) => ({
+  type: HASHTAG_FOLLOW_SUCCESS,
+  name,
+  tag,
+});
+
+export const followHashtagFail = (name, error) => ({
+  type: HASHTAG_FOLLOW_FAIL,
+  name,
+  error,
+});
+
+export const unfollowHashtag = name => (dispatch, getState) => {
+  dispatch(unfollowHashtagRequest(name));
+
+  api(getState).post(`/api/v1/tags/${name}/unfollow`).then(({ data }) => {
+    dispatch(unfollowHashtagSuccess(name, data));
+  }).catch(err => {
+    dispatch(unfollowHashtagFail(name, err));
+  });
+};
+
+export const unfollowHashtagRequest = name => ({
+  type: HASHTAG_UNFOLLOW_REQUEST,
+  name,
+});
+
+export const unfollowHashtagSuccess = (name, tag) => ({
+  type: HASHTAG_UNFOLLOW_SUCCESS,
+  name,
+  tag,
+});
+
+export const unfollowHashtagFail = (name, error) => ({
+  type: HASHTAG_UNFOLLOW_FAIL,
+  name,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 31ae09e4a..4f772a55f 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -51,7 +51,7 @@ export function updateTimeline(timeline, status, accept) {
       dispatch(submitMarkers());
     }
   };
-};
+}
 
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
@@ -67,13 +67,13 @@ export function deleteFromTimelines(id) {
       reblogOf,
     });
   };
-};
+}
 
 export function clearTimeline(timeline) {
   return (dispatch) => {
     dispatch({ type: TIMELINE_CLEAR, timeline });
   };
-};
+}
 
 const noOp = () => {};
 
@@ -122,13 +122,29 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
       done();
     });
   };
-};
+}
+
+export function fillTimelineGaps(timelineId, path, params = {}, done = noOp) {
+  return (dispatch, getState) => {
+    const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
+    const items = timeline.get('items');
+    const nullIndexes = items.map((statusId, index) => statusId === null ? index : null);
+    const gaps = nullIndexes.map(index => index > 0 ? items.get(index - 1) : null);
+
+    // Only expand at most two gaps to avoid doing too many requests
+    done = gaps.take(2).reduce((done, maxId) => {
+      return (() => dispatch(expandTimeline(timelineId, path, { ...params, maxId }, done)));
+    }, done);
+
+    done();
+  };
+}
 
 export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
 export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }, done);
 export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandAccountTimeline         = (accountId, { maxId, withReplies } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId });
-export const expandAccountFeaturedTimeline = accountId => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true });
+export const expandAccountTimeline         = (accountId, { maxId, withReplies, tagged } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, tagged, max_id: maxId });
+export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
 export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
@@ -141,13 +157,18 @@ export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } =
   }, done);
 };
 
+export const fillHomeTimelineGaps      = (done = noOp) => fillTimelineGaps('home', '/api/v1/timelines/home', {}, done);
+export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote } = {}, done = noOp) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia }, done);
+export const fillCommunityTimelineGaps = ({ onlyMedia } = {}, done = noOp) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }, done);
+export const fillListTimelineGaps      = (id, done = noOp) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}, done);
+
 export function expandTimelineRequest(timeline, isLoadingMore) {
   return {
     type: TIMELINE_EXPAND_REQUEST,
     timeline,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
 export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingRecent, isLoadingMore, usePendingItems) {
   return {
@@ -160,7 +181,7 @@ export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadi
     usePendingItems,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
 export function expandTimelineFail(timeline, error, isLoadingMore) {
   return {
@@ -170,7 +191,7 @@ export function expandTimelineFail(timeline, error, isLoadingMore) {
     skipLoading: !isLoadingMore,
     skipNotFound: timeline.startsWith('account:'),
   };
-};
+}
 
 export function scrollTopTimeline(timeline, top) {
   return {
@@ -178,14 +199,15 @@ export function scrollTopTimeline(timeline, top) {
     timeline,
     top,
   };
-};
+}
 
 export function connectTimeline(timeline) {
   return {
     type: TIMELINE_CONNECT,
     timeline,
+    usePendingItems: preferPendingItems,
   };
-};
+}
 
 export const disconnectTimeline = timeline => ({
   type: TIMELINE_DISCONNECT,
diff --git a/app/javascript/mastodon/actions/trends.js b/app/javascript/mastodon/actions/trends.js
index 853e4f60a..edda0b5b5 100644
--- a/app/javascript/mastodon/actions/trends.js
+++ b/app/javascript/mastodon/actions/trends.js
@@ -1,32 +1,139 @@
-import api from '../api';
+import api, { getLinks } from '../api';
+import { importFetchedStatuses } from './importer';
 
-export const TRENDS_FETCH_REQUEST = 'TRENDS_FETCH_REQUEST';
-export const TRENDS_FETCH_SUCCESS = 'TRENDS_FETCH_SUCCESS';
-export const TRENDS_FETCH_FAIL    = 'TRENDS_FETCH_FAIL';
+export const TRENDS_TAGS_FETCH_REQUEST = 'TRENDS_TAGS_FETCH_REQUEST';
+export const TRENDS_TAGS_FETCH_SUCCESS = 'TRENDS_TAGS_FETCH_SUCCESS';
+export const TRENDS_TAGS_FETCH_FAIL    = 'TRENDS_TAGS_FETCH_FAIL';
 
-export const fetchTrends = () => (dispatch, getState) => {
-  dispatch(fetchTrendsRequest());
+export const TRENDS_LINKS_FETCH_REQUEST = 'TRENDS_LINKS_FETCH_REQUEST';
+export const TRENDS_LINKS_FETCH_SUCCESS = 'TRENDS_LINKS_FETCH_SUCCESS';
+export const TRENDS_LINKS_FETCH_FAIL    = 'TRENDS_LINKS_FETCH_FAIL';
+
+export const TRENDS_STATUSES_FETCH_REQUEST = 'TRENDS_STATUSES_FETCH_REQUEST';
+export const TRENDS_STATUSES_FETCH_SUCCESS = 'TRENDS_STATUSES_FETCH_SUCCESS';
+export const TRENDS_STATUSES_FETCH_FAIL    = 'TRENDS_STATUSES_FETCH_FAIL';
+
+export const TRENDS_STATUSES_EXPAND_REQUEST = 'TRENDS_STATUSES_EXPAND_REQUEST';
+export const TRENDS_STATUSES_EXPAND_SUCCESS = 'TRENDS_STATUSES_EXPAND_SUCCESS';
+export const TRENDS_STATUSES_EXPAND_FAIL    = 'TRENDS_STATUSES_EXPAND_FAIL';
+
+export const fetchTrendingHashtags = () => (dispatch, getState) => {
+  dispatch(fetchTrendingHashtagsRequest());
 
   api(getState)
-    .get('/api/v1/trends')
-    .then(({ data }) => dispatch(fetchTrendsSuccess(data)))
-    .catch(err => dispatch(fetchTrendsFail(err)));
+    .get('/api/v1/trends/tags')
+    .then(({ data }) => dispatch(fetchTrendingHashtagsSuccess(data)))
+    .catch(err => dispatch(fetchTrendingHashtagsFail(err)));
 };
 
-export const fetchTrendsRequest = () => ({
-  type: TRENDS_FETCH_REQUEST,
+export const fetchTrendingHashtagsRequest = () => ({
+  type: TRENDS_TAGS_FETCH_REQUEST,
   skipLoading: true,
 });
 
-export const fetchTrendsSuccess = trends => ({
-  type: TRENDS_FETCH_SUCCESS,
+export const fetchTrendingHashtagsSuccess = trends => ({
+  type: TRENDS_TAGS_FETCH_SUCCESS,
   trends,
   skipLoading: true,
 });
 
-export const fetchTrendsFail = error => ({
-  type: TRENDS_FETCH_FAIL,
+export const fetchTrendingHashtagsFail = error => ({
+  type: TRENDS_TAGS_FETCH_FAIL,
   error,
   skipLoading: true,
   skipAlert: true,
 });
+
+export const fetchTrendingLinks = () => (dispatch, getState) => {
+  dispatch(fetchTrendingLinksRequest());
+
+  api(getState)
+    .get('/api/v1/trends/links')
+    .then(({ data }) => dispatch(fetchTrendingLinksSuccess(data)))
+    .catch(err => dispatch(fetchTrendingLinksFail(err)));
+};
+
+export const fetchTrendingLinksRequest = () => ({
+  type: TRENDS_LINKS_FETCH_REQUEST,
+  skipLoading: true,
+});
+
+export const fetchTrendingLinksSuccess = trends => ({
+  type: TRENDS_LINKS_FETCH_SUCCESS,
+  trends,
+  skipLoading: true,
+});
+
+export const fetchTrendingLinksFail = error => ({
+  type: TRENDS_LINKS_FETCH_FAIL,
+  error,
+  skipLoading: true,
+  skipAlert: true,
+});
+
+export const fetchTrendingStatuses = () => (dispatch, getState) => {
+  if (getState().getIn(['status_lists', 'trending', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(fetchTrendingStatusesRequest());
+
+  api(getState).get('/api/v1/trends/statuses').then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data));
+    dispatch(fetchTrendingStatusesSuccess(response.data, next ? next.uri : null));
+  }).catch(err => dispatch(fetchTrendingStatusesFail(err)));
+};
+
+export const fetchTrendingStatusesRequest = () => ({
+  type: TRENDS_STATUSES_FETCH_REQUEST,
+  skipLoading: true,
+});
+
+export const fetchTrendingStatusesSuccess = (statuses, next) => ({
+  type: TRENDS_STATUSES_FETCH_SUCCESS,
+  statuses,
+  next,
+  skipLoading: true,
+});
+
+export const fetchTrendingStatusesFail = error => ({
+  type: TRENDS_STATUSES_FETCH_FAIL,
+  error,
+  skipLoading: true,
+  skipAlert: true,
+});
+
+
+export const expandTrendingStatuses = () => (dispatch, getState) => {
+  const url = getState().getIn(['status_lists', 'trending', 'next'], null);
+
+  if (url === null || getState().getIn(['status_lists', 'trending', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandTrendingStatusesRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data));
+    dispatch(expandTrendingStatusesSuccess(response.data, next ? next.uri : null));
+  }).catch(error => {
+    dispatch(expandTrendingStatusesFail(error));
+  });
+};
+
+export const expandTrendingStatusesRequest = () => ({
+  type: TRENDS_STATUSES_EXPAND_REQUEST,
+});
+
+export const expandTrendingStatusesSuccess = (statuses, next) => ({
+  type: TRENDS_STATUSES_EXPAND_SUCCESS,
+  statuses,
+  next,
+});
+
+export const expandTrendingStatusesFail = error => ({
+  type: TRENDS_STATUSES_EXPAND_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/api.js b/app/javascript/mastodon/api.js
index 645ef6500..6bbddbef6 100644
--- a/app/javascript/mastodon/api.js
+++ b/app/javascript/mastodon/api.js
@@ -1,20 +1,31 @@
+// @ts-check
+
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
 import ready from './ready';
 
+/**
+ * @param {import('axios').AxiosResponse} response
+ * @returns {LinkHeader}
+ */
 export const getLinks = response => {
   const value = response.headers.link;
 
   if (!value) {
-    return { refs: [] };
+    return new LinkHeader();
   }
 
   return LinkHeader.parse(value);
 };
 
+/** @type {import('axios').RawAxiosRequestHeaders} */
 const csrfHeader = {};
 
+/**
+ * @returns {void}
+ */
 const setCSRFHeader = () => {
+  /** @type {HTMLMetaElement | null} */
   const csrfToken = document.querySelector('meta[name=csrf-token]');
 
   if (csrfToken) {
@@ -24,6 +35,10 @@ const setCSRFHeader = () => {
 
 ready(setCSRFHeader);
 
+/**
+ * @param {() => import('immutable').Map} getState
+ * @returns {import('axios').RawAxiosRequestHeaders}
+ */
 const authorizationHeaderFromState = getState => {
   const accessToken = getState && getState().getIn(['meta', 'access_token'], '');
 
@@ -36,17 +51,25 @@ const authorizationHeaderFromState = getState => {
   };
 };
 
-export default getState => axios.create({
-  headers: {
-    ...csrfHeader,
-    ...authorizationHeaderFromState(getState),
-  },
+/**
+ * @param {() => import('immutable').Map} getState
+ * @returns {import('axios').AxiosInstance}
+ */
+export default function api(getState) {
+  return axios.create({
+    headers: {
+      ...csrfHeader,
+      ...authorizationHeaderFromState(getState),
+    },
 
-  transformResponse: [function (data) {
-    try {
-      return JSON.parse(data);
-    } catch(Exception) {
-      return data;
-    }
-  }],
-});
+    transformResponse: [
+      function (data) {
+        try {
+          return JSON.parse(data);
+        } catch {
+          return data;
+        }
+      },
+    ],
+  });
+}
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 6818aa5d5..8f3505303 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -9,4 +9,4 @@ export function start() {
   } catch (e) {
     // If called twice
   }
-};
+}
diff --git a/app/javascript/mastodon/compare_id.js b/app/javascript/mastodon/compare_id.js
index 66cf51c4b..d2bd74f44 100644
--- a/app/javascript/mastodon/compare_id.js
+++ b/app/javascript/mastodon/compare_id.js
@@ -8,4 +8,4 @@ export default function compareId (id1, id2) {
   } else {
     return id1.length > id2.length ? 1 : -1;
   }
-};
+}
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
index 76ab3374a..7fbdedeb2 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
@@ -6,14 +6,17 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
   style={
-    Object {
-      "backgroundImage": "url(/animated/alice.gif)",
-      "backgroundSize": "100px 100px",
+    {
       "height": "100px",
       "width": "100px",
     }
   }
-/>
+>
+  <img
+    alt="alice"
+    src="/animated/alice.gif"
+  />
+</div>
 `;
 
 exports[`<Avatar /> Still renders a still avatar 1`] = `
@@ -22,12 +25,15 @@ exports[`<Avatar /> Still renders a still avatar 1`] = `
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
   style={
-    Object {
-      "backgroundImage": "url(/static/alice.jpg)",
-      "backgroundSize": "100px 100px",
+    {
       "height": "100px",
       "width": "100px",
     }
   }
-/>
+>
+  <img
+    alt="alice"
+    src="/static/alice.jpg"
+  />
+</div>
 `;
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
index d59fee42f..f8385357a 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
@@ -3,22 +3,52 @@
 exports[`<AvatarOverlay renders a overlay avatar 1`] = `
 <div
   className="account__avatar-overlay"
+  style={
+    {
+      "height": 46,
+      "width": 46,
+    }
+  }
 >
   <div
     className="account__avatar-overlay-base"
-    style={
-      Object {
-        "backgroundImage": "url(/static/alice.jpg)",
+  >
+    <div
+      className="account__avatar"
+      onMouseEnter={[Function]}
+      onMouseLeave={[Function]}
+      style={
+        {
+          "height": "36px",
+          "width": "36px",
+        }
       }
-    }
-  />
+    >
+      <img
+        alt="alice"
+        src="/static/alice.jpg"
+      />
+    </div>
+  </div>
   <div
     className="account__avatar-overlay-overlay"
-    style={
-      Object {
-        "backgroundImage": "url(/static/eve.jpg)",
+  >
+    <div
+      className="account__avatar"
+      onMouseEnter={[Function]}
+      onMouseLeave={[Function]}
+      style={
+        {
+          "height": "24px",
+          "width": "24px",
+        }
       }
-    }
-  />
+    >
+      <img
+        alt="eve@blackhat.lair"
+        src="/static/eve.jpg"
+      />
+    </div>
+  </div>
 </div>
 `;
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
index 86fbba917..bfc091d45 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
@@ -4,6 +4,7 @@ exports[`<Button /> adds class "button-secondary" if props.secondary given 1`] =
 <button
   className="button button-secondary"
   onClick={[Function]}
+  type="button"
 />
 `;
 
@@ -11,6 +12,7 @@ exports[`<Button /> renders a button element 1`] = `
 <button
   className="button"
   onClick={[Function]}
+  type="button"
 />
 `;
 
@@ -19,6 +21,7 @@ exports[`<Button /> renders a disabled attribute if props.disabled given 1`] = `
   className="button"
   disabled={true}
   onClick={[Function]}
+  type="button"
 />
 `;
 
@@ -26,6 +29,7 @@ exports[`<Button /> renders class="button--block" if props.block given 1`] = `
 <button
   className="button button--block"
   onClick={[Function]}
+  type="button"
 />
 `;
 
@@ -33,6 +37,7 @@ exports[`<Button /> renders the children 1`] = `
 <button
   className="button"
   onClick={[Function]}
+  type="button"
 >
   <p>
     children
@@ -44,6 +49,7 @@ exports[`<Button /> renders the given text 1`] = `
 <button
   className="button"
   onClick={[Function]}
+  type="button"
 >
   foo
 </button>
@@ -53,6 +59,7 @@ exports[`<Button /> renders the props.text instead of children 1`] = `
 <button
   className="button"
   onClick={[Function]}
+  type="button"
 >
   foo
 </button>
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.js.snap
index 0f27473af..9c37580d7 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.js.snap
@@ -10,7 +10,7 @@ exports[`<DisplayName /> renders display name + account name 1`] = `
     <strong
       className="display-name__html"
       dangerouslySetInnerHTML={
-        Object {
+        {
           "__html": "<p>Foo</p>",
         }
       }
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 62b5843a9..7aebb124c 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -3,12 +3,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
 import DisplayName from './display_name';
-import Permalink from './permalink';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me } from '../initial_state';
 import RelativeTimestamp from './relative_timestamp';
+import Skeleton from 'mastodon/components/skeleton';
+import { Link } from 'react-router-dom';
 
 const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -18,13 +19,16 @@ const messages = defineMessages({
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'Mute notifications from @{name}' },
   unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'Unmute notifications from @{name}' },
+  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
+  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
 });
 
 export default @injectIntl
 class Account extends ImmutablePureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    size: PropTypes.number,
+    account: ImmutablePropTypes.map,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMute: PropTypes.func.isRequired,
@@ -33,9 +37,14 @@ class Account extends ImmutablePureComponent {
     hidden: PropTypes.bool,
     actionIcon: PropTypes.string,
     actionTitle: PropTypes.string,
+    defaultAction: PropTypes.string,
     onActionClick: PropTypes.func,
   };
 
+  static defaultProps = {
+    size: 46,
+  };
+
   handleFollow = () => {
     this.props.onFollow(this.props.account);
   }
@@ -61,10 +70,19 @@ class Account extends ImmutablePureComponent {
   }
 
   render () {
-    const { account, intl, hidden, onActionClick, actionIcon, actionTitle } = this.props;
+    const { account, intl, hidden, onActionClick, actionIcon, actionTitle, defaultAction, size } = this.props;
 
     if (!account) {
-      return <div />;
+      return (
+        <div className='account'>
+          <div className='account__wrapper'>
+            <div className='account__display-name'>
+              <div className='account__avatar-wrapper'><Skeleton width={36} height={36} /></div>
+              <DisplayName />
+            </div>
+          </div>
+        </div>
+      );
     }
 
     if (hidden) {
@@ -105,6 +123,10 @@ class Account extends ImmutablePureComponent {
             {hidingNotificationsButton}
           </Fragment>
         );
+      } else if (defaultAction === 'mute') {
+        buttons = <IconButton icon='volume-off' title={intl.formatMessage(messages.mute, { name: account.get('username') })} onClick={this.handleMute} />;
+      } else if (defaultAction === 'block') {
+        buttons = <IconButton icon='lock' title={intl.formatMessage(messages.block, { name: account.get('username') })} onClick={this.handleBlock} />;
       } else if (!account.get('moved') || following) {
         buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
       }
@@ -118,11 +140,11 @@ class Account extends ImmutablePureComponent {
     return (
       <div className='account'>
         <div className='account__wrapper'>
-          <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
-            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+          <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={size} /></div>
             {mute_expires_at}
             <DisplayName account={account} />
-          </Permalink>
+          </Link>
 
           <div className='account__relationship'>
             {buttons}
diff --git a/app/javascript/mastodon/components/admin/Counter.js b/app/javascript/mastodon/components/admin/Counter.js
index 047e864b2..5a5b2b869 100644
--- a/app/javascript/mastodon/components/admin/Counter.js
+++ b/app/javascript/mastodon/components/admin/Counter.js
@@ -33,6 +33,7 @@ export default class Counter extends React.PureComponent {
     label: PropTypes.string.isRequired,
     href: PropTypes.string,
     params: PropTypes.object,
+    target: PropTypes.string,
   };
 
   state = {
@@ -54,7 +55,7 @@ export default class Counter extends React.PureComponent {
   }
 
   render () {
-    const { label, href } = this.props;
+    const { label, href, target } = this.props;
     const { loading, data } = this.state;
 
     let content;
@@ -68,12 +69,12 @@ export default class Counter extends React.PureComponent {
       );
     } else {
       const measure = data[0];
-      const percentChange = percIncrease(measure.previous_total * 1, measure.total * 1);
+      const percentChange = measure.previous_total && percIncrease(measure.previous_total * 1, measure.total * 1);
 
       content = (
         <React.Fragment>
-          <span className='sparkline__value__total'><FormattedNumber value={measure.total} /></span>
-          <span className={classNames('sparkline__value__change', { positive: percentChange > 0, negative: percentChange < 0 })}>{percentChange > 0 && '+'}<FormattedNumber value={percentChange} style='percent' /></span>
+          <span className='sparkline__value__total'>{measure.human_value || <FormattedNumber value={measure.total} />}</span>
+          {measure.previous_total && (<span className={classNames('sparkline__value__change', { positive: percentChange > 0, negative: percentChange < 0 })}>{percentChange > 0 && '+'}<FormattedNumber value={percentChange} style='percent' /></span>)}
         </React.Fragment>
       );
     }
@@ -100,7 +101,7 @@ export default class Counter extends React.PureComponent {
 
     if (href) {
       return (
-        <a href={href} className='sparkline'>
+        <a href={href} className='sparkline' target={target}>
           {inner}
         </a>
       );
diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.js b/app/javascript/mastodon/components/admin/ReportReasonSelector.js
new file mode 100644
index 000000000..1f91d2517
--- /dev/null
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.js
@@ -0,0 +1,159 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import api from 'mastodon/api';
+import { injectIntl, defineMessages } from 'react-intl';
+import classNames from 'classnames';
+
+const messages = defineMessages({
+  other: { id: 'report.categories.other', defaultMessage: 'Other' },
+  spam: { id: 'report.categories.spam', defaultMessage: 'Spam' },
+  violation: { id: 'report.categories.violation', defaultMessage: 'Content violates one or more server rules' },
+});
+
+class Category extends React.PureComponent {
+
+  static propTypes = {
+    id: PropTypes.string.isRequired,
+    text: PropTypes.string.isRequired,
+    selected: PropTypes.bool,
+    disabled: PropTypes.bool,
+    onSelect: PropTypes.func,
+    children: PropTypes.node,
+  };
+
+  handleClick = () => {
+    const { id, disabled, onSelect } = this.props;
+
+    if (!disabled) {
+      onSelect(id);
+    }
+  };
+
+  render () {
+    const { id, text, disabled, selected, children } = this.props;
+
+    return (
+      <div tabIndex='0' role='button' className={classNames('report-reason-selector__category', { selected, disabled })} onClick={this.handleClick}>
+        {selected && <input type='hidden' name='report[category]' value={id} />}
+
+        <div className='report-reason-selector__category__label'>
+          <span className={classNames('poll__input', { active: selected, disabled })} />
+          {text}
+        </div>
+
+        {(selected && children) && (
+          <div className='report-reason-selector__category__rules'>
+            {children}
+          </div>
+        )}
+      </div>
+    );
+  }
+
+}
+
+class Rule extends React.PureComponent {
+
+  static propTypes = {
+    id: PropTypes.string.isRequired,
+    text: PropTypes.string.isRequired,
+    selected: PropTypes.bool,
+    disabled: PropTypes.bool,
+    onToggle: PropTypes.func,
+  };
+
+  handleClick = () => {
+    const { id, disabled, onToggle } = this.props;
+
+    if (!disabled) {
+      onToggle(id);
+    }
+  };
+
+  render () {
+    const { id, text, disabled, selected } = this.props;
+
+    return (
+      <div tabIndex='0' role='button' className={classNames('report-reason-selector__rule', { selected, disabled })} onClick={this.handleClick}>
+        <span className={classNames('poll__input', { checkbox: true, active: selected, disabled })} />
+        {selected && <input type='hidden' name='report[rule_ids][]' value={id} />}
+        {text}
+      </div>
+    );
+  }
+
+}
+
+export default @injectIntl
+class ReportReasonSelector extends React.PureComponent {
+
+  static propTypes = {
+    id: PropTypes.string.isRequired,
+    category: PropTypes.string.isRequired,
+    rule_ids: PropTypes.arrayOf(PropTypes.string),
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    category: this.props.category,
+    rule_ids: this.props.rule_ids || [],
+    rules: [],
+  };
+
+  componentDidMount() {
+    api().get('/api/v1/instance').then(res => {
+      this.setState({
+        rules: res.data.rules,
+      });
+    }).catch(err => {
+      console.error(err);
+    });
+  }
+
+  _save = () => {
+    const { id, disabled } = this.props;
+    const { category, rule_ids } = this.state;
+
+    if (disabled) {
+      return;
+    }
+
+    api().put(`/api/v1/admin/reports/${id}`, {
+      category,
+      rule_ids,
+    }).catch(err => {
+      console.error(err);
+    });
+  };
+
+  handleSelect = id => {
+    this.setState({ category: id }, () => this._save());
+  };
+
+  handleToggle = id => {
+    const { rule_ids } = this.state;
+
+    if (rule_ids.includes(id)) {
+      this.setState({ rule_ids: rule_ids.filter(x => x !== id ) }, () => this._save());
+    } else {
+      this.setState({ rule_ids: [...rule_ids, id] }, () => this._save());
+    }
+  };
+
+  render () {
+    const { disabled, intl } = this.props;
+    const { rules, category, rule_ids } = this.state;
+
+    return (
+      <div className='report-reason-selector'>
+        <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
+        <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
+        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
+          {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}
+        </Category>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/admin/Retention.js b/app/javascript/mastodon/components/admin/Retention.js
index 3a7aaed9d..f312a45eb 100644
--- a/app/javascript/mastodon/components/admin/Retention.js
+++ b/app/javascript/mastodon/components/admin/Retention.js
@@ -88,7 +88,7 @@ export default class Retention extends React.PureComponent {
               </td>
 
               {data[0].data.slice(1).map((retention, i) => {
-                const average = data.reduce((sum, cohort, k) => cohort.data[i + 1] ? sum + (cohort.data[i + 1].percent - sum)/(k + 1) : sum, 0);
+                const average = data.reduce((sum, cohort, k) => cohort.data[i + 1] ? sum + (cohort.data[i + 1].rate - sum)/(k + 1) : sum, 0);
 
                 return (
                   <td key={retention.date}>
@@ -118,8 +118,8 @@ export default class Retention extends React.PureComponent {
 
                 {cohort.data.slice(1).map(retention => (
                   <td key={retention.date}>
-                    <div className={classNames('retention__table__box', `retention__table__box--${roundTo10(retention.percent * 100)}`)}>
-                      <FormattedNumber value={retention.percent} style='percent' />
+                    <div className={classNames('retention__table__box', `retention__table__box--${roundTo10(retention.rate * 100)}`)}>
+                      <FormattedNumber value={retention.rate} style='percent' />
                     </div>
                   </td>
                 ))}
@@ -137,7 +137,7 @@ export default class Retention extends React.PureComponent {
       break;
     default:
       title = <FormattedMessage id='admin.dashboard.monthly_retention' defaultMessage='User retention rate by month after sign-up' />;
-    };
+    }
 
     return (
       <div className='retention'>
diff --git a/app/javascript/mastodon/components/admin/Trends.js b/app/javascript/mastodon/components/admin/Trends.js
index 635bdf37d..9530c2a5b 100644
--- a/app/javascript/mastodon/components/admin/Trends.js
+++ b/app/javascript/mastodon/components/admin/Trends.js
@@ -50,7 +50,7 @@ export default class Trends extends React.PureComponent {
             <Hashtag
               key={hashtag.name}
               name={hashtag.name}
-              href={`/admin/tags/${hashtag.id}`}
+              to={`/admin/tags/${hashtag.id}`}
               people={hashtag.history[0].accounts * 1 + hashtag.history[1].accounts * 1}
               uses={hashtag.history[0].uses * 1 + hashtag.history[1].uses * 1}
               history={hashtag.history.reverse().map(day => day.uses)}
diff --git a/app/javascript/mastodon/components/animated_number.js b/app/javascript/mastodon/components/animated_number.js
index fbe948c5b..b1aebc73e 100644
--- a/app/javascript/mastodon/components/animated_number.js
+++ b/app/javascript/mastodon/components/animated_number.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedNumber } from 'react-intl';
+import ShortNumber from 'mastodon/components/short_number';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import { reduceMotion } from 'mastodon/initial_state';
@@ -51,7 +51,7 @@ export default class AnimatedNumber extends React.PureComponent {
     const { direction } = this.state;
 
     if (reduceMotion) {
-      return obfuscate ? obfuscatedCount(value) : <FormattedNumber value={value} />;
+      return obfuscate ? obfuscatedCount(value) : <ShortNumber value={value} />;
     }
 
     const styles = [{
@@ -65,7 +65,7 @@ export default class AnimatedNumber extends React.PureComponent {
         {items => (
           <span className='animated-number'>
             {items.map(({ key, data, style }) => (
-              <span key={key} style={{ position: (direction * style.y) > 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}>{obfuscate ? obfuscatedCount(data) : <FormattedNumber value={data} />}</span>
+              <span key={key} style={{ position: (direction * style.y) > 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}>{obfuscate ? obfuscatedCount(data) : <ShortNumber value={data} />}</span>
             ))}
           </span>
         )}
diff --git a/app/javascript/mastodon/components/avatar.js b/app/javascript/mastodon/components/avatar.js
index 570505833..e617c2889 100644
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@@ -2,11 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { autoPlayGif } from '../initial_state';
+import classNames from 'classnames';
 
 export default class Avatar extends React.PureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.map,
     size: PropTypes.number.isRequired,
     style: PropTypes.object,
     inline: PropTypes.bool,
@@ -37,35 +38,24 @@ export default class Avatar extends React.PureComponent {
     const { account, size, animate, inline } = this.props;
     const { hovering } = this.state;
 
-    const src = account.get('avatar');
-    const staticSrc = account.get('avatar_static');
-
-    let className = 'account__avatar';
-
-    if (inline) {
-      className = className + ' account__avatar-inline';
-    }
-
     const style = {
       ...this.props.style,
       width: `${size}px`,
       height: `${size}px`,
-      backgroundSize: `${size}px ${size}px`,
     };
 
+    let src;
+
     if (hovering || animate) {
-      style.backgroundImage = `url(${src})`;
+      src = account?.get('avatar');
     } else {
-      style.backgroundImage = `url(${staticSrc})`;
+      src = account?.get('avatar_static');
     }
 
     return (
-      <div
-        className={className}
-        onMouseEnter={this.handleMouseEnter}
-        onMouseLeave={this.handleMouseLeave}
-        style={style}
-      />
+      <div className={classNames('account__avatar', { 'account__avatar-inline': inline })} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} style={style}>
+        {src && <img src={src} alt={account?.get('acct')} />}
+      </div>
     );
   }
 
diff --git a/app/javascript/mastodon/components/avatar_composite.js b/app/javascript/mastodon/components/avatar_composite.js
index 5d5b89749..220bf5b4f 100644
--- a/app/javascript/mastodon/components/avatar_composite.js
+++ b/app/javascript/mastodon/components/avatar_composite.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { autoPlayGif } from '../initial_state';
+import Avatar from './avatar';
 
 export default class AvatarComposite extends React.PureComponent {
 
@@ -74,12 +75,12 @@ export default class AvatarComposite extends React.PureComponent {
       bottom: bottom,
       width: `${width}%`,
       height: `${height}%`,
-      backgroundSize: 'cover',
-      backgroundImage: `url(${account.get(animate ? 'avatar' : 'avatar_static')})`,
     };
 
     return (
-      <div key={account.get('id')} style={style} />
+      <div key={account.get('id')} style={style}>
+        <Avatar account={account} animate={animate} />
+      </div>
     );
   }
 
diff --git a/app/javascript/mastodon/components/avatar_overlay.js b/app/javascript/mastodon/components/avatar_overlay.js
index 3ec1d7730..8d5d44ea5 100644
--- a/app/javascript/mastodon/components/avatar_overlay.js
+++ b/app/javascript/mastodon/components/avatar_overlay.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { autoPlayGif } from '../initial_state';
+import Avatar from './avatar';
 
 export default class AvatarOverlay extends React.PureComponent {
 
@@ -9,27 +10,40 @@ export default class AvatarOverlay extends React.PureComponent {
     account: ImmutablePropTypes.map.isRequired,
     friend: ImmutablePropTypes.map.isRequired,
     animate: PropTypes.bool,
+    size: PropTypes.number,
+    baseSize: PropTypes.number,
+    overlaySize: PropTypes.number,
   };
 
   static defaultProps = {
     animate: autoPlayGif,
+    size: 46,
+    baseSize: 36,
+    overlaySize: 24,
   };
 
+  state = {
+    hovering: false,
+  };
+
+  handleMouseEnter = () => {
+    if (this.props.animate) return;
+    this.setState({ hovering: true });
+  }
+
+  handleMouseLeave = () => {
+    if (this.props.animate) return;
+    this.setState({ hovering: false });
+  }
+
   render() {
-    const { account, friend, animate } = this.props;
-
-    const baseStyle = {
-      backgroundImage: `url(${account.get(animate ? 'avatar' : 'avatar_static')})`,
-    };
-
-    const overlayStyle = {
-      backgroundImage: `url(${friend.get(animate ? 'avatar' : 'avatar_static')})`,
-    };
+    const { account, friend, animate, size, baseSize, overlaySize } = this.props;
+    const { hovering } = this.state;
 
     return (
-      <div className='account__avatar-overlay'>
-        <div className='account__avatar-overlay-base' style={baseStyle} />
-        <div className='account__avatar-overlay-overlay' style={overlayStyle} />
+      <div className='account__avatar-overlay' style={{ width: size, height: size }}>
+        <div className='account__avatar-overlay-base'><Avatar animate={hovering || animate} account={account} size={baseSize} /></div>
+        <div className='account__avatar-overlay-overlay'><Avatar animate={hovering || animate} account={friend} size={overlaySize} /></div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js
index 85b2d78ca..42ce01f38 100644
--- a/app/javascript/mastodon/components/button.js
+++ b/app/javascript/mastodon/components/button.js
@@ -6,6 +6,7 @@ export default class Button extends React.PureComponent {
 
   static propTypes = {
     text: PropTypes.node,
+    type: PropTypes.string,
     onClick: PropTypes.func,
     disabled: PropTypes.bool,
     block: PropTypes.bool,
@@ -15,8 +16,12 @@ export default class Button extends React.PureComponent {
     children: PropTypes.node,
   };
 
+  static defaultProps = {
+    type: 'button',
+  };
+
   handleClick = (e) => {
-    if (!this.props.disabled) {
+    if (!this.props.disabled && this.props.onClick) {
       this.props.onClick(e);
     }
   }
@@ -42,6 +47,7 @@ export default class Button extends React.PureComponent {
         onClick={this.handleClick}
         ref={this.setRef}
         title={this.props.title}
+        type={this.props.type}
       >
         {this.props.text || this.props.children}
       </button>
diff --git a/app/javascript/mastodon/components/check.js b/app/javascript/mastodon/components/check.js
new file mode 100644
index 000000000..ee2ef1595
--- /dev/null
+++ b/app/javascript/mastodon/components/check.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const Check = () => (
+  <svg width='14' height='11' viewBox='0 0 14 11'>
+    <path d='M11.264 0L5.26 6.004 2.103 2.847 0 4.95l5.26 5.26 8.108-8.107L11.264 0' fill='currentColor' fillRule='evenodd' />
+  </svg>
+);
+
+export default Check;
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index cbbc490a8..7850a93ec 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -17,6 +17,7 @@ class ColumnHeader extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
@@ -56,7 +57,7 @@ class ColumnHeader extends React.PureComponent {
   }
 
   handleTitleClick = () => {
-    this.props.onClick();
+    this.props.onClick?.();
   }
 
   handleMoveLeft = () => {
@@ -145,13 +146,12 @@ class ColumnHeader extends React.PureComponent {
       collapsedContent.push(moveButtons);
     }
 
-    if (children || (multiColumn && this.props.onPin)) {
+    if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
       collapseButton = (
         <button
           className={collapsibleButtonClassName}
           title={formatMessage(collapsed ? messages.show : messages.hide)}
           aria-label={formatMessage(collapsed ? messages.show : messages.hide)}
-          aria-pressed={collapsed ? 'false' : 'true'}
           onClick={this.handleToggleClick}
         >
           <i className='icon-with-badge'>
diff --git a/app/javascript/mastodon/components/common_counter.js b/app/javascript/mastodon/components/common_counter.js
index e10cd9b76..dd9b62de9 100644
--- a/app/javascript/mastodon/components/common_counter.js
+++ b/app/javascript/mastodon/components/common_counter.js
@@ -25,7 +25,7 @@ export function counterRenderer(counterType, isBold = true) {
     return (displayNumber, pluralReady) => (
       <FormattedMessage
         id='account.statuses_counter'
-        defaultMessage='{count, plural, one {{counter} Toot} other {{counter} Toots}}'
+        defaultMessage='{count, plural, one {{counter} Post} other {{counter} Posts}}'
         values={{
           count: pluralReady,
           counter: renderCounter(displayNumber),
diff --git a/app/javascript/mastodon/components/dismissable_banner.js b/app/javascript/mastodon/components/dismissable_banner.js
new file mode 100644
index 000000000..1ee032056
--- /dev/null
+++ b/app/javascript/mastodon/components/dismissable_banner.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import IconButton from './icon_button';
+import PropTypes from 'prop-types';
+import { injectIntl, defineMessages } from 'react-intl';
+import { bannerSettings } from 'mastodon/settings';
+
+const messages = defineMessages({
+  dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
+});
+
+export default @injectIntl
+class DismissableBanner extends React.PureComponent {
+
+  static propTypes = {
+    id: PropTypes.string.isRequired,
+    children: PropTypes.node,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    visible: !bannerSettings.get(this.props.id),
+  };
+
+  handleDismiss = () => {
+    const { id } = this.props;
+    this.setState({ visible: false }, () => bannerSettings.set(id, true));
+  }
+
+  render () {
+    const { visible } = this.state;
+
+    if (!visible) {
+      return null;
+    }
+
+    const { children, intl } = this.props;
+
+    return (
+      <div className='dismissable-banner'>
+        <div className='dismissable-banner__message'>
+          {children}
+        </div>
+
+        <div className='dismissable-banner__action'>
+          <IconButton icon='times' title={intl.formatMessage(messages.dismiss)} onClick={this.handleDismiss} />
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index 7ccfbd0cd..e9139ab0f 100644
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -2,11 +2,12 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import { autoPlayGif } from 'mastodon/initial_state';
+import Skeleton from 'mastodon/components/skeleton';
 
 export default class DisplayName extends React.PureComponent {
 
   static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    account: ImmutablePropTypes.map,
     others: ImmutablePropTypes.list,
     localDomain: PropTypes.string,
   };
@@ -48,7 +49,7 @@ export default class DisplayName extends React.PureComponent {
       if (others.size - 2 > 0) {
         suffix = `+${others.size - 2}`;
       }
-    } else {
+    } else if ((others && others.size > 0) || this.props.account) {
       if (others && others.size > 0) {
         account = others.first();
       } else {
@@ -63,6 +64,9 @@ export default class DisplayName extends React.PureComponent {
 
       displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
       suffix      = <span className='display-name__account'>@{acct}</span>;
+    } else {
+      displayName = <bdi><strong className='display-name__html'><Skeleton width='10ch' /></strong></bdi>;
+      suffix = <span className='display-name__account'><Skeleton width='7ch' /></span>;
     }
 
     return (
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 7d0588901..4b4ad8355 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -6,6 +6,8 @@ import Overlay from 'react-overlays/lib/Overlay';
 import Motion from '../features/ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import { supportsPassiveEvents } from 'detect-passive-events';
+import classNames from 'classnames';
+import { CircularProgress } from 'mastodon/components/loading_indicator';
 
 const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 let id = 0;
@@ -17,13 +19,18 @@ class DropdownMenu extends React.PureComponent {
   };
 
   static propTypes = {
-    items: PropTypes.array.isRequired,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    loading: PropTypes.bool,
+    scrollable: PropTypes.bool,
     onClose: PropTypes.func.isRequired,
     style: PropTypes.object,
     placement: PropTypes.string,
     arrowOffsetLeft: PropTypes.string,
     arrowOffsetTop: PropTypes.string,
     openedViaKeyboard: PropTypes.bool,
+    renderItem: PropTypes.func,
+    renderHeader: PropTypes.func,
+    onItemClick: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -45,9 +52,11 @@ class DropdownMenu extends React.PureComponent {
     document.addEventListener('click', this.handleDocumentClick, false);
     document.addEventListener('keydown', this.handleKeyDown, false);
     document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+
     if (this.focusedItem && this.props.openedViaKeyboard) {
       this.focusedItem.focus({ preventScroll: true });
     }
+
     this.setState({ mounted: true });
   }
 
@@ -66,7 +75,7 @@ class DropdownMenu extends React.PureComponent {
   }
 
   handleKeyDown = e => {
-    const items = Array.from(this.node.getElementsByTagName('a'));
+    const items = Array.from(this.node.querySelectorAll('a, button'));
     const index = items.indexOf(document.activeElement);
     let element = null;
 
@@ -109,21 +118,11 @@ class DropdownMenu extends React.PureComponent {
   }
 
   handleClick = e => {
-    const i = Number(e.currentTarget.getAttribute('data-index'));
-    const { action, to } = this.props.items[i];
-
-    this.props.onClose();
-
-    if (typeof action === 'function') {
-      e.preventDefault();
-      action(e);
-    } else if (to) {
-      e.preventDefault();
-      this.context.router.history.push(to);
-    }
+    const { onItemClick } = this.props;
+    onItemClick(e);
   }
 
-  renderItem (option, i) {
+  renderItem = (option, i) => {
     if (option === null) {
       return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
     }
@@ -140,9 +139,11 @@ class DropdownMenu extends React.PureComponent {
   }
 
   render () {
-    const { items, style, placement, arrowOffsetLeft, arrowOffsetTop } = this.props;
+    const { items, style, placement, arrowOffsetLeft, arrowOffsetTop, scrollable, renderHeader, loading } = this.props;
     const { mounted } = this.state;
 
+    let renderItem = this.props.renderItem || this.renderItem;
+
     return (
       <Motion defaultStyle={{ opacity: 0, scaleX: 0.85, scaleY: 0.75 }} style={{ opacity: spring(1, { damping: 35, stiffness: 400 }), scaleX: spring(1, { damping: 35, stiffness: 400 }), scaleY: spring(1, { damping: 35, stiffness: 400 }) }}>
         {({ opacity, scaleX, scaleY }) => (
@@ -152,9 +153,23 @@ class DropdownMenu extends React.PureComponent {
           <div className={`dropdown-menu ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}>
             <div className={`dropdown-menu__arrow ${placement}`} style={{ left: arrowOffsetLeft, top: arrowOffsetTop }} />
 
-            <ul>
-              {items.map((option, i) => this.renderItem(option, i))}
-            </ul>
+            <div className={classNames('dropdown-menu__container', { 'dropdown-menu__container--loading': loading })}>
+              {loading && (
+                <CircularProgress size={30} strokeWidth={3.5} />
+              )}
+
+              {!loading && renderHeader && (
+                <div className='dropdown-menu__container__header'>
+                  {renderHeader(items)}
+                </div>
+              )}
+
+              {!loading && (
+                <ul className={classNames('dropdown-menu__container__list', { 'dropdown-menu__container__list--scrollable': scrollable })}>
+                  {items.map((option, i) => renderItem(option, i, { onClick: this.handleClick, onKeyPress: this.handleItemKeyPress }))}
+                </ul>
+              )}
+            </div>
           </div>
         )}
       </Motion>
@@ -170,11 +185,14 @@ export default class Dropdown extends React.PureComponent {
   };
 
   static propTypes = {
-    icon: PropTypes.string.isRequired,
-    items: PropTypes.array.isRequired,
-    size: PropTypes.number.isRequired,
+    children: PropTypes.node,
+    icon: PropTypes.string,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    loading: PropTypes.bool,
+    size: PropTypes.number,
     title: PropTypes.string,
     disabled: PropTypes.bool,
+    scrollable: PropTypes.bool,
     status: ImmutablePropTypes.map,
     isUserTouching: PropTypes.func,
     onOpen: PropTypes.func.isRequired,
@@ -182,6 +200,9 @@ export default class Dropdown extends React.PureComponent {
     dropdownPlacement: PropTypes.string,
     openDropdownId: PropTypes.number,
     openedViaKeyboard: PropTypes.bool,
+    renderItem: PropTypes.func,
+    renderHeader: PropTypes.func,
+    onItemClick: PropTypes.func,
   };
 
   static defaultProps = {
@@ -237,17 +258,21 @@ export default class Dropdown extends React.PureComponent {
   }
 
   handleItemClick = e => {
+    const { onItemClick } = this.props;
     const i = Number(e.currentTarget.getAttribute('data-index'));
-    const { action, to } = this.props.items[i];
+    const item = this.props.items[i];
 
     this.handleClose();
 
-    if (typeof action === 'function') {
+    if (typeof onItemClick === 'function') {
       e.preventDefault();
-      action();
-    } else if (to) {
+      onItemClick(item, i);
+    } else if (item && typeof item.action === 'function') {
       e.preventDefault();
-      this.context.router.history.push(to);
+      item.action();
+    } else if (item && item.to) {
+      e.preventDefault();
+      this.context.router.history.push(item.to);
     }
   }
 
@@ -265,29 +290,67 @@ export default class Dropdown extends React.PureComponent {
     }
   }
 
+  close = () => {
+    this.handleClose();
+  }
+
   render () {
-    const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard } = this.props;
+    const {
+      icon,
+      items,
+      size,
+      title,
+      disabled,
+      loading,
+      scrollable,
+      dropdownPlacement,
+      openDropdownId,
+      openedViaKeyboard,
+      children,
+      renderItem,
+      renderHeader,
+    } = this.props;
+
     const open = this.state.id === openDropdownId;
 
+    const button = children ? React.cloneElement(React.Children.only(children), {
+      ref: this.setTargetRef,
+      onClick: this.handleClick,
+      onMouseDown: this.handleMouseDown,
+      onKeyDown: this.handleButtonKeyDown,
+      onKeyPress: this.handleKeyPress,
+    }) : (
+      <IconButton
+        icon={icon}
+        title={title}
+        active={open}
+        disabled={disabled}
+        size={size}
+        ref={this.setTargetRef}
+        onClick={this.handleClick}
+        onMouseDown={this.handleMouseDown}
+        onKeyDown={this.handleButtonKeyDown}
+        onKeyPress={this.handleKeyPress}
+      />
+    );
+
     return (
-      <div>
-        <IconButton
-          icon={icon}
-          title={title}
-          active={open}
-          disabled={disabled}
-          size={size}
-          ref={this.setTargetRef}
-          onClick={this.handleClick}
-          onMouseDown={this.handleMouseDown}
-          onKeyDown={this.handleButtonKeyDown}
-          onKeyPress={this.handleKeyPress}
-        />
+      <React.Fragment>
+        {button}
 
         <Overlay show={open} placement={dropdownPlacement} target={this.findTarget}>
-          <DropdownMenu items={items} onClose={this.handleClose} openedViaKeyboard={openedViaKeyboard} />
+          <DropdownMenu
+            items={items}
+            loading={loading}
+            scrollable={scrollable}
+            onClose={this.handleClose}
+            openedViaKeyboard={openedViaKeyboard}
+            renderItem={renderItem}
+            renderHeader={renderHeader}
+            onItemClick={this.handleItemClick}
+          />
         </Overlay>
-      </div>
+      </React.Fragment>
     );
   }
 
diff --git a/app/javascript/mastodon/components/edited_timestamp/containers/dropdown_menu_container.js b/app/javascript/mastodon/components/edited_timestamp/containers/dropdown_menu_container.js
new file mode 100644
index 000000000..e30c18372
--- /dev/null
+++ b/app/javascript/mastodon/components/edited_timestamp/containers/dropdown_menu_container.js
@@ -0,0 +1,27 @@
+import { connect } from 'react-redux';
+import { openDropdownMenu, closeDropdownMenu } from 'mastodon/actions/dropdown_menu';
+import { fetchHistory } from 'mastodon/actions/history';
+import DropdownMenu from 'mastodon/components/dropdown_menu';
+
+const mapStateToProps = (state, { statusId }) => ({
+  dropdownPlacement: state.getIn(['dropdown_menu', 'placement']),
+  openDropdownId: state.getIn(['dropdown_menu', 'openId']),
+  openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
+  items: state.getIn(['history', statusId, 'items']),
+  loading: state.getIn(['history', statusId, 'loading']),
+});
+
+const mapDispatchToProps = (dispatch, { statusId }) => ({
+
+  onOpen (id, onItemClick, dropdownPlacement, keyboard) {
+    dispatch(fetchHistory(statusId));
+    dispatch(openDropdownMenu(id, dropdownPlacement, keyboard));
+  },
+
+  onClose (id) {
+    dispatch(closeDropdownMenu(id));
+  },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DropdownMenu);
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.js b/app/javascript/mastodon/components/edited_timestamp/index.js
new file mode 100644
index 000000000..bebf93886
--- /dev/null
+++ b/app/javascript/mastodon/components/edited_timestamp/index.js
@@ -0,0 +1,70 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage, injectIntl } from 'react-intl';
+import Icon from 'mastodon/components/icon';
+import DropdownMenu from './containers/dropdown_menu_container';
+import { connect } from 'react-redux';
+import { openModal } from 'mastodon/actions/modal';
+import RelativeTimestamp from 'mastodon/components/relative_timestamp';
+import InlineAccount from 'mastodon/components/inline_account';
+
+const mapDispatchToProps = (dispatch, { statusId }) => ({
+
+  onItemClick (index) {
+    dispatch(openModal('COMPARE_HISTORY', { index, statusId }));
+  },
+
+});
+
+export default @connect(null, mapDispatchToProps)
+@injectIntl
+class EditedTimestamp extends React.PureComponent {
+
+  static propTypes = {
+    statusId: PropTypes.string.isRequired,
+    timestamp: PropTypes.string.isRequired,
+    intl: PropTypes.object.isRequired,
+    onItemClick: PropTypes.func.isRequired,
+  };
+
+  handleItemClick = (item, i) => {
+    const { onItemClick } = this.props;
+    onItemClick(i);
+  };
+
+  renderHeader = items => {
+    return (
+      <FormattedMessage id='status.edited_x_times' defaultMessage='Edited {count, plural, one {{count} time} other {{count} times}}' values={{ count: items.size - 1 }} />
+    );
+  }
+
+  renderItem = (item, index, { onClick, onKeyPress }) => {
+    const formattedDate = <RelativeTimestamp timestamp={item.get('created_at')} short={false} />;
+    const formattedName = <InlineAccount accountId={item.get('account')} />;
+
+    const label = item.get('original') ? (
+      <FormattedMessage id='status.history.created' defaultMessage='{name} created {date}' values={{ name: formattedName, date: formattedDate }} />
+    ) : (
+      <FormattedMessage id='status.history.edited' defaultMessage='{name} edited {date}' values={{ name: formattedName, date: formattedDate }} />
+    );
+
+    return (
+      <li className='dropdown-menu__item edited-timestamp__history__item' key={item.get('created_at')}>
+        <button data-index={index} onClick={onClick} onKeyPress={onKeyPress}>{label}</button>
+      </li>
+    );
+  }
+
+  render () {
+    const { timestamp, intl, statusId } = this.props;
+
+    return (
+      <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
+        <button className='dropdown-menu__text-button'>
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { hour12: false, month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' />
+        </button>
+      </DropdownMenu>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/error_boundary.js b/app/javascript/mastodon/components/error_boundary.js
index ca4a2cfe1..02d5616d6 100644
--- a/app/javascript/mastodon/components/error_boundary.js
+++ b/app/javascript/mastodon/components/error_boundary.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { version, source_url } from 'mastodon/initial_state';
 import StackTrace from 'stacktrace-js';
+import { Helmet } from 'react-helmet';
 
 export default class ErrorBoundary extends React.PureComponent {
 
@@ -84,6 +85,7 @@ export default class ErrorBoundary extends React.PureComponent {
               <FormattedMessage id='error.unexpected_crash.explanation' defaultMessage='Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.' />
             )}
           </p>
+
           <p>
             { likelyBrowserAddonIssue ? (
               <FormattedMessage id='error.unexpected_crash.next_steps_addons' defaultMessage='Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.' />
@@ -91,8 +93,13 @@ export default class ErrorBoundary extends React.PureComponent {
               <FormattedMessage id='error.unexpected_crash.next_steps' defaultMessage='Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.' />
             )}
           </p>
+
           <p className='error-boundary__footer'>Mastodon v{version} · <a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='errors.unexpected_crash.report_issue' defaultMessage='Report issue' /></a> · <button onClick={this.handleCopyStackTrace} className={copied ? 'copied' : ''}><FormattedMessage id='errors.unexpected_crash.copy_stacktrace' defaultMessage='Copy stacktrace to clipboard' /></button></p>
         </div>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/hashtag.js b/app/javascript/mastodon/components/hashtag.js
index a793a32f5..e516fc086 100644
--- a/app/javascript/mastodon/components/hashtag.js
+++ b/app/javascript/mastodon/components/hashtag.js
@@ -4,7 +4,7 @@ import { Sparklines, SparklinesCurve } from 'react-sparklines';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import Permalink from './permalink';
+import { Link } from 'react-router-dom';
 import ShortNumber from 'mastodon/components/short_number';
 import Skeleton from 'mastodon/components/skeleton';
 import classNames from 'classnames';
@@ -38,13 +38,14 @@ class SilentErrorBoundary extends React.Component {
  *
  * @type {(displayNumber: JSX.Element, pluralReady: number) => JSX.Element}
  */
-const accountsCountRenderer = (displayNumber, pluralReady) => (
+export const accountsCountRenderer = (displayNumber, pluralReady) => (
   <FormattedMessage
     id='trends.counter_by_accounts'
-    defaultMessage='{count, plural, one {{counter} person} other {{counter} people}} talking'
+    defaultMessage='{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}'
     values={{
       count: pluralReady,
       counter: <strong>{displayNumber}</strong>,
+      days: 2,
     }}
   />
 );
@@ -52,10 +53,8 @@ const accountsCountRenderer = (displayNumber, pluralReady) => (
 export const ImmutableHashtag = ({ hashtag }) => (
   <Hashtag
     name={hashtag.get('name')}
-    href={hashtag.get('url')}
     to={`/tags/${hashtag.get('name')}`}
     people={hashtag.getIn(['history', 0, 'accounts']) * 1 + hashtag.getIn(['history', 1, 'accounts']) * 1}
-    uses={hashtag.getIn(['history', 0, 'uses']) * 1 + hashtag.getIn(['history', 1, 'uses']) * 1}
     history={hashtag.get('history').reverse().map((day) => day.get('uses')).toArray()}
   />
 );
@@ -64,38 +63,51 @@ ImmutableHashtag.propTypes = {
   hashtag: ImmutablePropTypes.map.isRequired,
 };
 
-const Hashtag = ({ name, href, to, people, uses, history, className }) => (
+const Hashtag = ({ name, to, people, uses, history, className, description, withGraph }) => (
   <div className={classNames('trends__item', className)}>
     <div className='trends__item__name'>
-      <Permalink href={href} to={to}>
+      <Link to={to}>
         {name ? <React.Fragment>#<span>{name}</span></React.Fragment> : <Skeleton width={50} />}
-      </Permalink>
+      </Link>
 
-      {typeof people !== 'undefined' ? <ShortNumber value={people} renderer={accountsCountRenderer} /> : <Skeleton width={100} />}
+      {description ? (
+        <span>{description}</span>
+      ) : (
+        typeof people !== 'undefined' ? <ShortNumber value={people} renderer={accountsCountRenderer} /> : <Skeleton width={100} />
+      )}
     </div>
 
-    <div className='trends__item__current'>
-      {typeof uses !== 'undefined' ? <ShortNumber value={uses} /> : <Skeleton width={42} height={36} />}
-    </div>
+    {typeof uses !== 'undefined' && (
+      <div className='trends__item__current'>
+        <ShortNumber value={uses} />
+      </div>
+    )}
 
-    <div className='trends__item__sparkline'>
-      <SilentErrorBoundary>
-        <Sparklines width={50} height={28} data={history ? history : Array.from(Array(7)).map(() => 0)}>
-          <SparklinesCurve style={{ fill: 'none' }} />
-        </Sparklines>
-      </SilentErrorBoundary>
-    </div>
+    {withGraph && (
+      <div className='trends__item__sparkline'>
+        <SilentErrorBoundary>
+          <Sparklines width={50} height={28} data={history ? history : Array.from(Array(7)).map(() => 0)}>
+            <SparklinesCurve style={{ fill: 'none' }} />
+          </Sparklines>
+        </SilentErrorBoundary>
+      </div>
+    )}
   </div>
 );
 
 Hashtag.propTypes = {
   name: PropTypes.string,
-  href: PropTypes.string,
   to: PropTypes.string,
   people: PropTypes.number,
+  description: PropTypes.node,
   uses: PropTypes.number,
   history: PropTypes.arrayOf(PropTypes.number),
   className: PropTypes.string,
+  withGraph: PropTypes.bool,
+};
+
+Hashtag.defaultProps = {
+  withGraph: true,
 };
 
 export default Hashtag;
diff --git a/app/javascript/mastodon/components/icon.js b/app/javascript/mastodon/components/icon.js
index d8a17722f..d3d7c591d 100644
--- a/app/javascript/mastodon/components/icon.js
+++ b/app/javascript/mastodon/components/icon.js
@@ -14,7 +14,7 @@ export default class Icon extends React.PureComponent {
     const { id, className, fixedWidth, ...other } = this.props;
 
     return (
-      <i role='img' className={classNames('fa', `fa-${id}`, className, { 'fa-fw': fixedWidth })} {...other} />
+      <i className={classNames('fa', `fa-${id}`, className, { 'fa-fw': fixedWidth })} {...other} />
     );
   }
 
diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 7ec39198a..49858f2e2 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -16,7 +16,6 @@ export default class IconButton extends React.PureComponent {
     onKeyPress: PropTypes.func,
     size: PropTypes.number,
     active: PropTypes.bool,
-    pressed: PropTypes.bool,
     expanded: PropTypes.bool,
     style: PropTypes.object,
     activeStyle: PropTypes.object,
@@ -27,6 +26,7 @@ export default class IconButton extends React.PureComponent {
     tabIndex: PropTypes.string,
     counter: PropTypes.number,
     obfuscateCount: PropTypes.bool,
+    href: PropTypes.string,
   };
 
   static defaultProps = {
@@ -97,11 +97,11 @@ export default class IconButton extends React.PureComponent {
       icon,
       inverted,
       overlay,
-      pressed,
       tabIndex,
       title,
       counter,
       obfuscateCount,
+      href,
     } = this.props;
 
     const {
@@ -123,10 +123,24 @@ export default class IconButton extends React.PureComponent {
       style.width = 'auto';
     }
 
+    let contents = (
+      <React.Fragment>
+        <Icon id={icon} fixedWidth aria-hidden='true' /> {typeof counter !== 'undefined' && <span className='icon-button__counter'><AnimatedNumber value={counter} obfuscate={obfuscateCount} /></span>}
+      </React.Fragment>
+    );
+
+    if (href && !this.prop) {
+      contents = (
+        <a href={href} target='_blank' rel='noopener noreferrer'>
+          {contents}
+        </a>
+      );
+    }
+
     return (
       <button
+        type='button'
         aria-label={title}
-        aria-pressed={pressed}
         aria-expanded={expanded}
         title={title}
         className={classes}
@@ -138,7 +152,7 @@ export default class IconButton extends React.PureComponent {
         tabIndex={tabIndex}
         disabled={disabled}
       >
-        <Icon id={icon} fixedWidth aria-hidden='true' /> {typeof counter !== 'undefined' && <span className='icon-button__counter'><AnimatedNumber value={counter} obfuscate={obfuscateCount} /></span>}
+        {contents}
       </button>
     );
   }
diff --git a/app/javascript/mastodon/components/image.js b/app/javascript/mastodon/components/image.js
new file mode 100644
index 000000000..6e81ddf08
--- /dev/null
+++ b/app/javascript/mastodon/components/image.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Blurhash from './blurhash';
+import classNames from 'classnames';
+
+export default class Image extends React.PureComponent {
+
+  static propTypes = {
+    src: PropTypes.string,
+    srcSet: PropTypes.string,
+    blurhash: PropTypes.string,
+    className: PropTypes.string,
+  };
+
+  state = {
+    loaded: false,
+  };
+
+  handleLoad = () => this.setState({ loaded: true });
+
+  render () {
+    const { src, srcSet, blurhash, className } = this.props;
+    const { loaded } = this.state;
+
+    return (
+      <div className={classNames('image', { loaded }, className)} role='presentation'>
+        {blurhash && <Blurhash hash={blurhash} className='image__preview' />}
+        <img src={src} srcSet={srcSet} alt='' onLoad={this.handleLoad} />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/inline_account.js b/app/javascript/mastodon/components/inline_account.js
new file mode 100644
index 000000000..a1b495590
--- /dev/null
+++ b/app/javascript/mastodon/components/inline_account.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import { makeGetAccount } from 'mastodon/selectors';
+import Avatar from 'mastodon/components/avatar';
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+  });
+
+  return mapStateToProps;
+};
+
+export default @connect(makeMapStateToProps)
+class InlineAccount extends React.PureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+  };
+
+  render () {
+    const { account } = this.props;
+
+    return (
+      <span className='inline-account'>
+        <Avatar size={13} account={account} /> <strong>{account.get('username')}</strong>
+      </span>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/load_more.js b/app/javascript/mastodon/components/load_more.js
index 389c3e1e1..00e023ca2 100644
--- a/app/javascript/mastodon/components/load_more.js
+++ b/app/javascript/mastodon/components/load_more.js
@@ -18,7 +18,7 @@ export default class LoadMore extends React.PureComponent {
     const { disabled, visible } = this.props;
 
     return (
-      <button className='load-more' disabled={disabled || !visible} style={{ visibility: visible ? 'visible' : 'hidden' }} onClick={this.props.onClick}>
+      <button type='button' className='load-more' disabled={disabled || !visible} style={{ visibility: visible ? 'visible' : 'hidden' }} onClick={this.props.onClick}>
         <FormattedMessage id='status.load_more' defaultMessage='Load more' />
       </button>
     );
diff --git a/app/javascript/mastodon/components/loading_indicator.js b/app/javascript/mastodon/components/loading_indicator.js
index d6a5adb6f..33c59d94c 100644
--- a/app/javascript/mastodon/components/loading_indicator.js
+++ b/app/javascript/mastodon/components/loading_indicator.js
@@ -1,10 +1,31 @@
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import PropTypes from 'prop-types';
+
+export const CircularProgress = ({ size, strokeWidth }) => {
+  const viewBox = `0 0 ${size} ${size}`;
+  const radius  = (size - strokeWidth) / 2;
+
+  return (
+    <svg width={size} height={size} viewBox={viewBox} className='circular-progress' role='progressbar'>
+      <circle
+        fill='none'
+        cx={size / 2}
+        cy={size / 2}
+        r={radius}
+        strokeWidth={`${strokeWidth}px`}
+      />
+    </svg>
+  );
+};
+
+CircularProgress.propTypes = {
+  size: PropTypes.number.isRequired,
+  strokeWidth: PropTypes.number.isRequired,
+};
 
 const LoadingIndicator = () => (
   <div className='loading-indicator'>
-    <div className='loading-indicator__figure' />
-    <FormattedMessage id='loading_indicator.label' defaultMessage='Loading...' />
+    <CircularProgress size={50} strokeWidth={6} />
   </div>
 );
 
diff --git a/app/javascript/mastodon/components/logo.js b/app/javascript/mastodon/components/logo.js
index d1c7f08a9..ee5c22496 100644
--- a/app/javascript/mastodon/components/logo.js
+++ b/app/javascript/mastodon/components/logo.js
@@ -1,8 +1,9 @@
 import React from 'react';
 
 const Logo = () => (
-  <svg viewBox='0 0 216.4144 232.00976' className='logo'>
-    <use xlinkHref='#mastodon-svg-logo' />
+  <svg viewBox='0 0 261 66' className='logo' role='img'>
+    <title>Mastodon</title>
+    <use xlinkHref='#logo-symbol-wordmark' />
   </svg>
 );
 
diff --git a/app/javascript/mastodon/components/media_attachments.js b/app/javascript/mastodon/components/media_attachments.js
new file mode 100644
index 000000000..d27720de4
--- /dev/null
+++ b/app/javascript/mastodon/components/media_attachments.js
@@ -0,0 +1,116 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { MediaGallery, Video, Audio } from 'mastodon/features/ui/util/async-components';
+import Bundle from 'mastodon/features/ui/components/bundle';
+import noop from 'lodash/noop';
+
+export default class MediaAttachments extends ImmutablePureComponent {
+
+  static propTypes = {
+    status: ImmutablePropTypes.map.isRequired,
+    height: PropTypes.number,
+    width: PropTypes.number,
+  };
+
+  static defaultProps = {
+    height: 110,
+    width: 239,
+  };
+
+  updateOnProps = [
+    'status',
+  ];
+
+  renderLoadingMediaGallery = () => {
+    const { height, width } = this.props;
+
+    return (
+      <div className='media-gallery' style={{ height, width }} />
+    );
+  }
+
+  renderLoadingVideoPlayer = () => {
+    const { height, width } = this.props;
+
+    return (
+      <div className='video-player' style={{ height, width }} />
+    );
+  }
+
+  renderLoadingAudioPlayer = () => {
+    const { height, width } = this.props;
+
+    return (
+      <div className='audio-player' style={{ height, width }} />
+    );
+  }
+
+  render () {
+    const { status, width, height } = this.props;
+    const mediaAttachments = status.get('media_attachments');
+
+    if (mediaAttachments.size === 0) {
+      return null;
+    }
+
+    if (mediaAttachments.getIn([0, 'type']) === 'audio') {
+      const audio = mediaAttachments.get(0);
+
+      return (
+        <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+          {Component => (
+            <Component
+              src={audio.get('url')}
+              alt={audio.get('description')}
+              width={width}
+              height={height}
+              poster={audio.get('preview_url') || status.getIn(['account', 'avatar_static'])}
+              backgroundColor={audio.getIn(['meta', 'colors', 'background'])}
+              foregroundColor={audio.getIn(['meta', 'colors', 'foreground'])}
+              accentColor={audio.getIn(['meta', 'colors', 'accent'])}
+              duration={audio.getIn(['meta', 'original', 'duration'], 0)}
+            />
+          )}
+        </Bundle>
+      );
+    } else if (mediaAttachments.getIn([0, 'type']) === 'video') {
+      const video = mediaAttachments.get(0);
+
+      return (
+        <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+          {Component => (
+            <Component
+              preview={video.get('preview_url')}
+              frameRate={video.getIn(['meta', 'original', 'frame_rate'])}
+              blurhash={video.get('blurhash')}
+              src={video.get('url')}
+              alt={video.get('description')}
+              width={width}
+              height={height}
+              inline
+              sensitive={status.get('sensitive')}
+              onOpenVideo={noop}
+            />
+          )}
+        </Bundle>
+      );
+    } else {
+      return (
+        <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} >
+          {Component => (
+            <Component
+              media={mediaAttachments}
+              sensitive={status.get('sensitive')}
+              defaultWidth={width}
+              height={height}
+              onOpenMedia={noop}
+            />
+          )}
+        </Bundle>
+      );
+    }
+  }
+
+}
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2e7ce2e60..bf7982cea 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import { is } from 'immutable';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { isIOS } from '../is_mobile';
 import classNames from 'classnames';
 import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_state';
 import { debounce } from 'lodash';
@@ -181,7 +180,7 @@ class Item extends React.PureComponent {
         </a>
       );
     } else if (attachment.get('type') === 'gifv') {
-      const autoPlay = !isIOS() && this.getAutoPlay();
+      const autoPlay = this.getAutoPlay();
 
       thumbnail = (
         <div className={classNames('media-gallery__gifv', { autoplay: autoPlay })}>
@@ -195,6 +194,7 @@ class Item extends React.PureComponent {
             onMouseEnter={this.handleMouseEnter}
             onMouseLeave={this.handleMouseLeave}
             autoPlay={autoPlay}
+            playsInline
             loop
             muted
           />
diff --git a/app/javascript/mastodon/components/missing_indicator.js b/app/javascript/mastodon/components/missing_indicator.js
index 7b0101bab..05e0d653d 100644
--- a/app/javascript/mastodon/components/missing_indicator.js
+++ b/app/javascript/mastodon/components/missing_indicator.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import illustration from 'mastodon/../images/elephant_ui_disappointed.svg';
 import classNames from 'classnames';
+import { Helmet } from 'react-helmet';
 
 const MissingIndicator = ({ fullPage }) => (
   <div className={classNames('regeneration-indicator', { 'regeneration-indicator--without-header': fullPage })}>
@@ -14,6 +15,10 @@ const MissingIndicator = ({ fullPage }) => (
       <FormattedMessage id='missing_indicator.label' tagName='strong' defaultMessage='Not found' />
       <FormattedMessage id='missing_indicator.sublabel' defaultMessage='This resource could not be found' />
     </div>
+
+    <Helmet>
+      <meta name='robots' content='noindex' />
+    </Helmet>
   </div>
 );
 
diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index 755c46fd6..b894aeaf9 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -18,6 +18,7 @@ export default class ModalRoot extends React.PureComponent {
       g: PropTypes.number,
       b: PropTypes.number,
     }),
+    ignoreFocus: PropTypes.bool,
   };
 
   activeElement = this.props.children ? document.activeElement : null;
@@ -72,7 +73,9 @@ export default class ModalRoot extends React.PureComponent {
       // immediately selectable, we have to wait for observers to run, as
       // described in https://github.com/WICG/inert#performance-and-gotchas
       Promise.resolve().then(() => {
-        this.activeElement.focus({ preventScroll: true });
+        if (!this.props.ignoreFocus) {
+          this.activeElement.focus({ preventScroll: true });
+        }
         this.activeElement = null;
       }).catch(console.error);
 
diff --git a/app/javascript/mastodon/components/navigation_portal.js b/app/javascript/mastodon/components/navigation_portal.js
new file mode 100644
index 000000000..45407be43
--- /dev/null
+++ b/app/javascript/mastodon/components/navigation_portal.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Switch, Route, withRouter } from 'react-router-dom';
+import { showTrends } from 'mastodon/initial_state';
+import Trends from 'mastodon/features/getting_started/containers/trends_container';
+import AccountNavigation from 'mastodon/features/account/navigation';
+
+const DefaultNavigation = () => (
+  <>
+    {showTrends && (
+      <>
+        <div className='flex-spacer' />
+        <Trends />
+      </>
+    )}
+  </>
+);
+
+export default @withRouter
+class NavigationPortal extends React.PureComponent {
+
+  render () {
+    return (
+      <Switch>
+        <Route path='/@:acct' exact component={AccountNavigation} />
+        <Route path='/@:acct/tagged/:tagged?' exact component={AccountNavigation} />
+        <Route path='/@:acct/with_replies' exact component={AccountNavigation} />
+        <Route path='/@:acct/followers' exact component={AccountNavigation} />
+        <Route path='/@:acct/following' exact component={AccountNavigation} />
+        <Route path='/@:acct/media' exact component={AccountNavigation} />
+        <Route component={DefaultNavigation} />
+      </Switch>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/not_signed_in_indicator.js b/app/javascript/mastodon/components/not_signed_in_indicator.js
new file mode 100644
index 000000000..b440c6be2
--- /dev/null
+++ b/app/javascript/mastodon/components/not_signed_in_indicator.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+const NotSignedInIndicator = () => (
+  <div className='scrollable scrollable--flex'>
+    <div className='empty-column-indicator'>
+      <FormattedMessage id='not_signed_in_indicator.not_signed_in' defaultMessage='You need to sign in to access this resource.' />
+    </div>
+  </div>
+);
+
+export default NotSignedInIndicator;
diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
deleted file mode 100644
index b369e9812..000000000
--- a/app/javascript/mastodon/components/permalink.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-export default class Permalink extends React.PureComponent {
-
-  static contextTypes = {
-    router: PropTypes.object,
-  };
-
-  static propTypes = {
-    className: PropTypes.string,
-    href: PropTypes.string.isRequired,
-    to: PropTypes.string.isRequired,
-    children: PropTypes.node,
-    onInterceptClick: PropTypes.func,
-  };
-
-  handleClick = e => {
-    if (this.props.onInterceptClick && this.props.onInterceptClick()) {
-      e.preventDefault();
-      return;
-    }
-
-    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.context.router.history.push(this.props.to);
-    }
-  }
-
-  render () {
-    const { href, children, className, onInterceptClick, ...other } = this.props;
-
-    return (
-      <a target='_blank' href={href} onClick={this.handleClick} {...other} className={`permalink${className ? ' ' + className : ''}`}>
-        {children}
-      </a>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 85aa28816..3e643168e 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -34,6 +34,10 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
 export default @injectIntl
 class Poll extends ImmutablePureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     poll: ImmutablePropTypes.map,
     intl: PropTypes.object.isRequired,
@@ -217,7 +221,7 @@ class Poll extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          {!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
+          {!showResults && <button className='button button-secondary' disabled={disabled || !this.context.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
           {showResults && !this.props.disabled && <span><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </span>}
           {votesCount}
           {poll.get('expires_at') && <span> · {timeRemaining}</span>}
diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js
index 711181dcd..512480339 100644
--- a/app/javascript/mastodon/components/relative_timestamp.js
+++ b/app/javascript/mastodon/components/relative_timestamp.js
@@ -5,10 +5,15 @@ import PropTypes from 'prop-types';
 const messages = defineMessages({
   today: { id: 'relative_time.today', defaultMessage: 'today' },
   just_now: { id: 'relative_time.just_now', defaultMessage: 'now' },
+  just_now_full: { id: 'relative_time.full.just_now', defaultMessage: 'just now' },
   seconds: { id: 'relative_time.seconds', defaultMessage: '{number}s' },
+  seconds_full: { id: 'relative_time.full.seconds', defaultMessage: '{number, plural, one {# second} other {# seconds}} ago' },
   minutes: { id: 'relative_time.minutes', defaultMessage: '{number}m' },
+  minutes_full: { id: 'relative_time.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}} ago' },
   hours: { id: 'relative_time.hours', defaultMessage: '{number}h' },
+  hours_full: { id: 'relative_time.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}} ago' },
   days: { id: 'relative_time.days', defaultMessage: '{number}d' },
+  days_full: { id: 'relative_time.full.days', defaultMessage: '{number, plural, one {# day} other {# days}} ago' },
   moments_remaining: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' },
   seconds_remaining: { id: 'time_remaining.seconds', defaultMessage: '{number, plural, one {# second} other {# seconds}} left' },
   minutes_remaining: { id: 'time_remaining.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}} left' },
@@ -66,7 +71,7 @@ const getUnitDelay = units => {
   }
 };
 
-export const timeAgoString = (intl, date, now, year, timeGiven = true) => {
+export const timeAgoString = (intl, date, now, year, timeGiven, short) => {
   const delta = now - date.getTime();
 
   let relativeTime;
@@ -74,16 +79,16 @@ export const timeAgoString = (intl, date, now, year, timeGiven = true) => {
   if (delta < DAY && !timeGiven) {
     relativeTime = intl.formatMessage(messages.today);
   } else if (delta < 10 * SECOND) {
-    relativeTime = intl.formatMessage(messages.just_now);
+    relativeTime = intl.formatMessage(short ? messages.just_now : messages.just_now_full);
   } else if (delta < 7 * DAY) {
     if (delta < MINUTE) {
-      relativeTime = intl.formatMessage(messages.seconds, { number: Math.floor(delta / SECOND) });
+      relativeTime = intl.formatMessage(short ? messages.seconds : messages.seconds_full, { number: Math.floor(delta / SECOND) });
     } else if (delta < HOUR) {
-      relativeTime = intl.formatMessage(messages.minutes, { number: Math.floor(delta / MINUTE) });
+      relativeTime = intl.formatMessage(short ? messages.minutes : messages.minutes_full, { number: Math.floor(delta / MINUTE) });
     } else if (delta < DAY) {
-      relativeTime = intl.formatMessage(messages.hours, { number: Math.floor(delta / HOUR) });
+      relativeTime = intl.formatMessage(short ? messages.hours : messages.hours_full, { number: Math.floor(delta / HOUR) });
     } else {
-      relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) });
+      relativeTime = intl.formatMessage(short ? messages.days : messages.days_full, { number: Math.floor(delta / DAY) });
     }
   } else if (date.getFullYear() === year) {
     relativeTime = intl.formatDate(date, shortDateFormatOptions);
@@ -124,6 +129,7 @@ class RelativeTimestamp extends React.Component {
     timestamp: PropTypes.string.isRequired,
     year: PropTypes.number.isRequired,
     futureDate: PropTypes.bool,
+    short: PropTypes.bool,
   };
 
   state = {
@@ -132,6 +138,7 @@ class RelativeTimestamp extends React.Component {
 
   static defaultProps = {
     year: (new Date()).getFullYear(),
+    short: true,
   };
 
   shouldComponentUpdate (nextProps, nextState) {
@@ -176,11 +183,11 @@ class RelativeTimestamp extends React.Component {
   }
 
   render () {
-    const { timestamp, intl, year, futureDate } = this.props;
+    const { timestamp, intl, year, futureDate, short } = this.props;
 
     const timeGiven    = timestamp.includes('T');
     const date         = new Date(timestamp);
-    const relativeTime = futureDate ? timeRemainingString(intl, date, this.state.now, timeGiven) : timeAgoString(intl, date, this.state.now, year, timeGiven);
+    const relativeTime = futureDate ? timeRemainingString(intl, date, this.state.now, timeGiven) : timeAgoString(intl, date, this.state.now, year, timeGiven, short);
 
     return (
       <time dateTime={timestamp} title={intl.formatDate(date, dateFormatOptions)}>
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 68a178512..91d04bf4d 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -151,7 +151,7 @@ class ScrollableList extends PureComponent {
 
     attachFullscreenListener(this.onFullScreenChange);
 
-    // Handle initial scroll posiiton
+    // Handle initial scroll position
     this.handleScroll();
   }
 
diff --git a/app/javascript/mastodon/components/server_banner.js b/app/javascript/mastodon/components/server_banner.js
new file mode 100644
index 000000000..617fdecdf
--- /dev/null
+++ b/app/javascript/mastodon/components/server_banner.js
@@ -0,0 +1,93 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import { fetchServer } from 'mastodon/actions/server';
+import ShortNumber from 'mastodon/components/short_number';
+import Skeleton from 'mastodon/components/skeleton';
+import Account from 'mastodon/containers/account_container';
+import { domain } from 'mastodon/initial_state';
+import Image from 'mastodon/components/image';
+import { Link } from 'react-router-dom';
+
+const messages = defineMessages({
+  aboutActiveUsers: { id: 'server_banner.about_active_users', defaultMessage: 'People using this server during the last 30 days (Monthly Active Users)' },
+});
+
+const mapStateToProps = state => ({
+  server: state.getIn(['server', 'server']),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class ServerBanner extends React.PureComponent {
+
+  static propTypes = {
+    server: PropTypes.object,
+    dispatch: PropTypes.func,
+    intl: PropTypes.object,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchServer());
+  }
+
+  render () {
+    const { server, intl } = this.props;
+    const isLoading = server.get('isLoading');
+
+    return (
+      <div className='server-banner'>
+        <div className='server-banner__introduction'>
+          <FormattedMessage id='server_banner.introduction' defaultMessage='{domain} is part of the decentralized social network powered by {mastodon}.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
+        </div>
+
+        <Image blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
+
+        <div className='server-banner__description'>
+          {isLoading ? (
+            <>
+              <Skeleton width='100%' />
+              <br />
+              <Skeleton width='100%' />
+              <br />
+              <Skeleton width='70%' />
+            </>
+          ) : server.get('description')}
+        </div>
+
+        <div className='server-banner__meta'>
+          <div className='server-banner__meta__column'>
+            <h4><FormattedMessage id='server_banner.administered_by' defaultMessage='Administered by:' /></h4>
+
+            <Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
+          </div>
+
+          <div className='server-banner__meta__column'>
+            <h4><FormattedMessage id='server_banner.server_stats' defaultMessage='Server stats:' /></h4>
+
+            {isLoading ? (
+              <>
+                <strong className='server-banner__number'><Skeleton width='10ch' /></strong>
+                <br />
+                <span className='server-banner__number-label'><Skeleton width='5ch' /></span>
+              </>
+            ) : (
+              <>
+                <strong className='server-banner__number'><ShortNumber value={server.getIn(['usage', 'users', 'active_month'])} /></strong>
+                <br />
+                <span className='server-banner__number-label' title={intl.formatMessage(messages.aboutActiveUsers)}><FormattedMessage id='server_banner.active_users' defaultMessage='active users' /></span>
+              </>
+            )}
+          </div>
+        </div>
+
+        <hr className='spacer' />
+
+        <Link className='button button--block button-secondary' to='/about'><FormattedMessage id='server_banner.learn_more' defaultMessage='Learn more' /></Link>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/setting_text.js b/app/javascript/mastodon/components/setting_text.js
deleted file mode 100644
index a6dde4c0f..000000000
--- a/app/javascript/mastodon/components/setting_text.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-
-export default class SettingText extends React.PureComponent {
-
-  static propTypes = {
-    settings: ImmutablePropTypes.map.isRequired,
-    settingKey: PropTypes.array.isRequired,
-    label: PropTypes.string.isRequired,
-    onChange: PropTypes.func.isRequired,
-  };
-
-  handleChange = (e) => {
-    this.props.onChange(this.props.settingKey, e.target.value);
-  }
-
-  render () {
-    const { settings, settingKey, label } = this.props;
-
-    return (
-      <label>
-        <span style={{ display: 'none' }}>{label}</span>
-        <input
-          className='setting-text'
-          value={settings.getIn(settingKey)}
-          onChange={this.handleChange}
-          placeholder={label}
-        />
-      </label>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/components/skeleton.js b/app/javascript/mastodon/components/skeleton.js
index 09093e99c..6a17ffb26 100644
--- a/app/javascript/mastodon/components/skeleton.js
+++ b/app/javascript/mastodon/components/skeleton.js
@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 const Skeleton = ({ width, height }) => <span className='skeleton' style={{ width, height }}>&zwnj;</span>;
 
 Skeleton.propTypes = {
-  width: PropTypes.number,
-  height: PropTypes.number,
+  width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };
 
 export default Skeleton;
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 9955046c0..a1384ba58 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -3,7 +3,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
 import AvatarOverlay from './avatar_overlay';
-import AvatarComposite from './avatar_composite';
 import RelativeTimestamp from './relative_timestamp';
 import DisplayName from './display_name';
 import StatusContent from './status_content';
@@ -56,7 +55,8 @@ const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
   private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
 export default @injectIntl
@@ -69,7 +69,6 @@ class Status extends ImmutablePureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.map,
-    otherAccounts: ImmutablePropTypes.list,
     onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
@@ -81,10 +80,13 @@ class Status extends ImmutablePureComponent {
     onOpenMedia: PropTypes.func,
     onOpenVideo: PropTypes.func,
     onBlock: PropTypes.func,
+    onAddFilter: PropTypes.func,
     onEmbed: PropTypes.func,
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
     onToggleCollapsed: PropTypes.func,
+    onTranslate: PropTypes.func,
+    onInteractionModal: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -117,6 +119,7 @@ class Status extends ImmutablePureComponent {
   state = {
     showMedia: defaultMediaVisibility(this.props.status),
     statusId: undefined,
+    forceFilter: undefined,
   };
 
   static getDerivedStateFromProps(nextProps, prevState) {
@@ -170,6 +173,10 @@ class Status extends ImmutablePureComponent {
     this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
   }
 
+  handleTranslate = () => {
+    this.props.onTranslate(this._properStatus());
+  }
+
   renderLoadingMediaGallery () {
     return <div className='media-gallery' style={{ height: '110px' }} />;
   }
@@ -278,6 +285,15 @@ class Status extends ImmutablePureComponent {
     this.handleToggleMediaVisibility();
   }
 
+  handleUnfilterClick = e => {
+    this.setState({ forceFilter: false });
+    e.preventDefault();
+  }
+
+  handleFilterClick = () => {
+    this.setState({ forceFilter: true });
+  }
+
   _properStatus () {
     const { status } = this.props;
 
@@ -296,7 +312,7 @@ class Status extends ImmutablePureComponent {
     let media = null;
     let statusAvatar, prepend, rebloggedByText;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
+    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -329,7 +345,8 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (status.get('filtered') || status.getIn(['reblog', 'filtered'])) {
+    const matchedFilters = status.get('matched_filters');
+    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
       const minHandlers = this.props.muted ? {} : {
         moveUp: this.handleHotkeyMoveUp,
         moveDown: this.handleHotkeyMoveDown,
@@ -338,7 +355,11 @@ class Status extends ImmutablePureComponent {
       return (
         <HotKeys handlers={minHandlers}>
           <div className='status__wrapper status__wrapper--filtered focusable' tabIndex='0' ref={this.handleRef}>
-            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />
+            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
+            {' '}
+            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
+              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
+            </button>
           </div>
         </HotKeys>
       );
@@ -348,7 +369,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' className='status__prepend-icon' fixedWidth /></div>
-          <FormattedMessage id='status.pinned' defaultMessage='Pinned toot' />
+          <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
         </div>
       );
     } else if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
@@ -357,7 +378,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='retweet' className='status__prepend-icon' fixedWidth /></div>
-          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
 
@@ -365,6 +386,15 @@ class Status extends ImmutablePureComponent {
 
       account = status.get('account');
       status  = status.get('reblog');
+    } else if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
+      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+
+      prepend = (
+        <div className='status__prepend'>
+          <div className='status__prepend-icon-wrapper'><Icon id='reply' className='status__prepend-icon' fixedWidth /></div>
+          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+        </div>
+      );
     }
 
     if (pictureInPicture.get('inUse')) {
@@ -395,6 +425,10 @@ class Status extends ImmutablePureComponent {
                 height={110}
                 cacheWidth={this.props.cacheMediaWidth}
                 deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
+                sensitive={status.get('sensitive')}
+                blurhash={attachment.get('blurhash')}
+                visible={this.state.showMedia}
+                onToggleVisibility={this.handleToggleMediaVisibility}
               />
             )}
           </Bundle>
@@ -442,7 +476,7 @@ class Status extends ImmutablePureComponent {
           </Bundle>
         );
       }
-    } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
+    } else if (status.get('spoiler_text').length === 0 && status.get('card') && !this.props.muted) {
       media = (
         <Card
           onOpenMedia={this.handleOpenMedia}
@@ -455,10 +489,8 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (otherAccounts && otherAccounts.size > 0) {
-      statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
-    } else if (account === undefined || account === null) {
-      statusAvatar = <Avatar account={status.get('account')} size={48} />;
+    if (account === undefined || account === null) {
+      statusAvatar = <Avatar account={status.get('account')} size={46} />;
     } else {
       statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
     }
@@ -467,7 +499,7 @@ class Status extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
@@ -478,28 +510,34 @@ class Status extends ImmutablePureComponent {
           {prepend}
 
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
-            <div className='status__expand' onClick={this.handleClick} role='presentation' />
-
             <div className='status__info'>
-              <a onClick={this.handleClick} href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+              <a onClick={this.handleClick} href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
                 <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
+                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
-              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
                 <div className='status__avatar'>
                   {statusAvatar}
                 </div>
 
-                <DisplayName account={status.get('account')} others={otherAccounts} />
+                <DisplayName account={status.get('account')} />
               </a>
             </div>
 
-            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} showThread={showThread} onExpandedToggle={this.handleExpandedToggle} collapsable onCollapsedToggle={this.handleCollapsedToggle} />
+            <StatusContent
+              status={status}
+              onClick={this.handleClick}
+              expanded={!status.get('hidden')}
+              onExpandedToggle={this.handleExpandedToggle}
+              onTranslate={this.handleTranslate}
+              collapsable
+              onCollapsedToggle={this.handleCollapsedToggle}
+            />
 
             {media}
 
-            <StatusActionBar scrollKey={scrollKey} status={status} account={account} {...other} />
+            <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />
           </div>
         </div>
       </HotKeys>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 85c76edee..40c86afdf 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -6,12 +6,14 @@ import IconButton from './icon_button';
 import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { me, isStaff } from '../initial_state';
+import { me } from '../initial_state';
 import classNames from 'classnames';
+import { PERMISSION_MANAGE_USERS } from 'mastodon/permissions';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
+  edit: { id: 'status.edit', defaultMessage: 'Edit' },
   direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
@@ -37,10 +39,13 @@ const messages = defineMessages({
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
+  hide: { id: 'status.hide', defaultMessage: 'Hide toot' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
+  filter: { id: 'status.filter', defaultMessage: 'Filter this post' },
+  openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
 });
 
 const mapStateToProps = (state, { status }) => ({
@@ -53,6 +58,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
@@ -75,7 +81,11 @@ class StatusActionBar extends ImmutablePureComponent {
     onMuteConversation: PropTypes.func,
     onPin: PropTypes.func,
     onBookmark: PropTypes.func,
+    onFilter: PropTypes.func,
+    onAddFilter: PropTypes.func,
+    onInteractionModal: PropTypes.func,
     withDismiss: PropTypes.bool,
+    withCounters: PropTypes.bool,
     scrollKey: PropTypes.string,
     intl: PropTypes.object.isRequired,
   };
@@ -89,10 +99,12 @@ class StatusActionBar extends ImmutablePureComponent {
   ]
 
   handleReplyClick = () => {
-    if (me) {
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
       this.props.onReply(this.props.status, this.context.router.history);
     } else {
-      this._openInteractionDialog('reply');
+      this.props.onInteractionModal('reply', this.props.status);
     }
   }
 
@@ -106,25 +118,25 @@ class StatusActionBar extends ImmutablePureComponent {
   }
 
   handleFavouriteClick = () => {
-    if (me) {
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
       this.props.onFavourite(this.props.status);
     } else {
-      this._openInteractionDialog('favourite');
+      this.props.onInteractionModal('favourite', this.props.status);
     }
   }
 
   handleReblogClick = e => {
-    if (me) {
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
       this.props.onReblog(this.props.status, e);
     } else {
-      this._openInteractionDialog('reblog');
+      this.props.onInteractionModal('reblog', this.props.status);
     }
   }
 
-  _openInteractionDialog = type => {
-    window.open(`/interact/${this.props.status.get('id')}?type=${type}`, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
-  }
-
   handleBookmarkClick = () => {
     this.props.onBookmark(this.props.status);
   }
@@ -137,6 +149,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onDelete(this.props.status, this.context.router.history, true);
   }
 
+  handleEditClick = () => {
+    this.props.onEdit(this.props.status, this.context.router.history);
+  }
+
   handlePinClick = () => {
     this.props.onPin(this.props.status);
   }
@@ -201,40 +217,42 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onMuteConversation(this.props.status);
   }
 
+  handleFilterClick = () => {
+    this.props.onAddFilter(this.props.status);
+  }
+
   handleCopy = () => {
-    const url      = this.props.status.get('url');
-    const textarea = document.createElement('textarea');
+    const url = this.props.status.get('url');
+    navigator.clipboard.writeText(url);
+  }
 
-    textarea.textContent    = url;
-    textarea.style.position = 'fixed';
-
-    document.body.appendChild(textarea);
-
-    try {
-      textarea.select();
-      document.execCommand('copy');
-    } catch (e) {
-
-    } finally {
-      document.body.removeChild(textarea);
-    }
+  handleHideClick = () => {
+    this.props.onFilter();
   }
 
   render () {
-    const { status, relationship, intl, withDismiss, scrollKey } = this.props;
+    const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
+    const { signedIn } = this.context.identity;
 
-    const anonymousAccess    = !me;
+    const anonymousAccess    = !signedIn;
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
+    const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
     const mutingConversation = status.get('muted');
     const account            = status.get('account');
     const writtenByMe        = status.getIn(['account', 'id']) === me;
+    const isRemote           = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
 
     let menu = [];
 
     menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
 
+    if (publicStatus && isRemote) {
+      menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
+    }
+
+    menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
+
     if (publicStatus) {
-      menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
       menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
     }
 
@@ -242,7 +260,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
     menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClick });
 
-    if (writtenByMe && publicStatus) {
+    if (writtenByMe && pinnableStatus) {
       menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
     }
 
@@ -254,6 +272,7 @@ class StatusActionBar extends ImmutablePureComponent {
     }
 
     if (writtenByMe) {
+      menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
       menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
       menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
     } else {
@@ -273,6 +292,12 @@ class StatusActionBar extends ImmutablePureComponent {
         menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick });
       }
 
+      if (!this.props.onFilter) {
+        menu.push(null);
+        menu.push({ text: intl.formatMessage(messages.filter), action: this.handleFilterClick });
+        menu.push(null);
+      }
+
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.handleReport });
 
       if (account.get('acct') !== account.get('username')) {
@@ -287,7 +312,7 @@ class StatusActionBar extends ImmutablePureComponent {
         }
       }
 
-      if (isStaff) {
+      if ((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
         menu.push(null);
         menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${status.getIn(['account', 'id'])}` });
         menu.push({ text: intl.formatMessage(messages.admin_status), href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses/${status.get('id')}` });
@@ -318,18 +343,25 @@ class StatusActionBar extends ImmutablePureComponent {
     }
 
     const shareButton = ('share' in navigator) && publicStatus && (
-      <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShareClick} />
+      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShareClick} />
+    );
+
+    const filterButton = this.props.onFilter && (
+      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.hide)} icon='eye' onClick={this.handleHideClick} />
     );
 
     return (
       <div className='status__action-bar'>
-        <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
-        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar__button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
+        <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
+        <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
+        <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         {shareButton}
 
-        <div className='status__action-bar-dropdown'>
+        {filterButton}
+
+        <div className='status__action-bar__dropdown'>
           <DropdownMenuContainer
             scrollKey={scrollKey}
             disabled={anonymousAccess}
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index d01365afb..6f3093d63 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -1,29 +1,69 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import Permalink from './permalink';
+import { FormattedMessage, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 import classnames from 'classnames';
 import PollContainer from 'mastodon/containers/poll_container';
 import Icon from 'mastodon/components/icon';
-import { autoPlayGif } from 'mastodon/initial_state';
+import { autoPlayGif, languages as preloadedLanguages, translationEnabled } from 'mastodon/initial_state';
 
-const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
+const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
-export default class StatusContent extends React.PureComponent {
+class TranslateButton extends React.PureComponent {
+
+  static propTypes = {
+    translation: ImmutablePropTypes.map,
+    onClick: PropTypes.func,
+  };
+
+  render () {
+    const { translation, onClick } = this.props;
+
+    if (translation) {
+      const language     = preloadedLanguages.find(lang => lang[0] === translation.get('detected_source_language'));
+      const languageName = language ? language[2] : translation.get('detected_source_language');
+      const provider     = translation.get('provider');
+
+      return (
+        <div className='translate-button'>
+          <div className='translate-button__meta'>
+            <FormattedMessage id='status.translated_from_with' defaultMessage='Translated from {lang} using {provider}' values={{ lang: languageName, provider }} />
+          </div>
+
+          <button className='link-button' onClick={onClick}>
+            <FormattedMessage id='status.show_original' defaultMessage='Show original' />
+          </button>
+        </div>
+      );
+    }
+
+    return (
+      <button className='status__content__read-more-button' onClick={onClick}>
+        <FormattedMessage id='status.translate' defaultMessage='Translate' />
+      </button>
+    );
+  }
+
+}
+
+export default @injectIntl
+class StatusContent extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     expanded: PropTypes.bool,
-    showThread: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
+    onTranslate: PropTypes.func,
     onClick: PropTypes.func,
     collapsable: PropTypes.bool,
     onCollapsedToggle: PropTypes.func,
+    intl: PropTypes.object,
   };
 
   state = {
@@ -37,41 +77,45 @@ export default class StatusContent extends React.PureComponent {
       return;
     }
 
+    const { status, onCollapsedToggle } = this.props;
     const links = node.querySelectorAll('a');
 
+    let link, mention;
+
     for (var i = 0; i < links.length; ++i) {
-      let link = links[i];
+      link = links[i];
+
       if (link.classList.contains('status-link')) {
         continue;
       }
+
       link.classList.add('status-link');
 
-      let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
+      mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
         link.setAttribute('title', mention.get('acct'));
+        link.setAttribute('href', `/@${mention.get('acct')}`);
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
+        link.setAttribute('href', `/tags/${link.text.slice(1)}`);
       } else {
         link.setAttribute('title', link.href);
         link.classList.add('unhandled-link');
       }
-
-      link.setAttribute('target', '_blank');
-      link.setAttribute('rel', 'noopener noreferrer');
     }
 
-    if (this.props.status.get('collapsed', null) === null) {
-      let collapsed =
-          this.props.collapsable
-          && this.props.onClick
+    if (status.get('collapsed', null) === null && onCollapsedToggle) {
+      const { collapsable, onClick } = this.props;
+
+      const collapsed =
+          collapsable
+          && onClick
           && node.clientHeight > MAX_HEIGHT
-          && this.props.status.get('spoiler_text').length === 0;
+          && status.get('spoiler_text').length === 0;
 
-      if(this.props.onCollapsedToggle) this.props.onCollapsedToggle(collapsed);
-
-      this.props.status.set('collapsed', collapsed);
+      onCollapsedToggle(collapsed);
     }
   }
 
@@ -163,44 +207,51 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  handleTranslate = () => {
+    this.props.onTranslate();
+  }
+
   setRef = (c) => {
     this.node = c;
   }
 
   render () {
-    const { status } = this.props;
+    const { status, intl } = this.props;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
-    const renderViewThread = this.props.showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+    const renderTranslate = translationEnabled && this.context.identity.signedIn && this.props.onTranslate && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('contentHtml').length > 0 && status.get('language') !== null && intl.locale !== status.get('language');
 
-    const content = { __html: status.get('contentHtml') };
+    const content = { __html: status.get('translation') ? status.getIn(['translation', 'content']) : status.get('contentHtml') };
     const spoilerContent = { __html: status.get('spoilerHtml') };
+    const lang = status.get('translation') ? intl.locale : status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.context.router,
       'status__content--with-spoiler': status.get('spoiler_text').length > 0,
       'status__content--collapsed': renderReadMore,
     });
 
-    const showThreadButton = (
-      <button className='status__content__read-more-button' onClick={this.props.onClick}>
-        <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
-      </button>
-    );
-
-    const readMoreButton = (
+    const readMoreButton = renderReadMore && (
       <button className='status__content__read-more-button' onClick={this.props.onClick} key='read-more'>
         <FormattedMessage id='status.read_more' defaultMessage='Read more' /><Icon id='angle-right' fixedWidth />
       </button>
     );
 
+    const translateButton = renderTranslate && (
+      <TranslateButton onClick={this.handleTranslate} translation={status.get('translation')} />
+    );
+
+    const poll = !!status.get('poll') && (
+      <PollContainer pollId={status.get('poll')} />
+    );
+
     if (status.get('spoiler_text').length > 0) {
       let mentionsPlaceholder = '';
 
       const mentionLinks = status.get('mentions').map(item => (
-        <Permalink to={`/@${item.get('acct')}`} href={item.get('url')} key={item.get('id')} className='mention'>
+        <Link to={`/@${item.get('acct')}`} key={item.get('id')} className='status-link mention'>
           @<span>{item.get('username')}</span>
-        </Permalink>
+        </Link>
       )).reduce((aggregate, item) => [...aggregate, item, ' '], []);
 
       const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
@@ -212,44 +263,39 @@ export default class StatusContent extends React.PureComponent {
       return (
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' />
+            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={lang} />
             {' '}
-            <button tabIndex='0' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick}>{toggleText}</button>
+            <button type='button' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick} aria-expanded={!hidden}>{toggleText}</button>
           </p>
 
           {mentionsPlaceholder}
 
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} dangerouslySetInnerHTML={content} />
+          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} lang={lang} dangerouslySetInnerHTML={content} />
 
-          {!hidden && !!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
-
-          {renderViewThread && showThreadButton}
+          {!hidden && poll}
+          {!hidden && translateButton}
         </div>
       );
     } else if (this.props.onClick) {
-      const output = [
-        <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
+      return (
+        <>
+          <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+            <div className='status__content__text status__content__text--visible translate' lang={lang} dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
+            {poll}
+            {translateButton}
+          </div>
 
-          {renderViewThread && showThreadButton}
-        </div>,
-      ];
-
-      if (renderReadMore) {
-        output.push(readMoreButton);
-      }
-
-      return output;
+          {readMoreButton}
+        </>
+      );
     } else {
       return (
         <div className={classNames} ref={this.setRef} tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
+          <div className='status__content__text status__content__text--visible translate' lang={lang} dangerouslySetInnerHTML={content} />
 
-          {!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
-
-          {renderViewThread && showThreadButton}
+          {poll}
+          {translateButton}
         </div>
       );
     }
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index eaaffcc3a..35e5749a3 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -24,6 +24,7 @@ export default class StatusList extends ImmutablePureComponent {
     prepend: PropTypes.node,
     emptyMessage: PropTypes.node,
     alwaysPrepend: PropTypes.bool,
+    withCounters: PropTypes.bool,
     timelineId: PropTypes.string,
   };
 
@@ -100,6 +101,7 @@ export default class StatusList extends ImmutablePureComponent {
           contextType={timelineId}
           scrollKey={this.props.scrollKey}
           showThread
+          withCounters={this.props.withCounters}
         />
       ))
     ) : null;
@@ -114,6 +116,7 @@ export default class StatusList extends ImmutablePureComponent {
           onMoveDown={this.handleMoveDown}
           contextType={timelineId}
           showThread
+          withCounters={this.props.withCounters}
         />
       )).concat(scrollableContent);
     }
diff --git a/app/javascript/mastodon/components/timeline_hint.js b/app/javascript/mastodon/components/timeline_hint.js
index fb55a62cc..ac9a79dcc 100644
--- a/app/javascript/mastodon/components/timeline_hint.js
+++ b/app/javascript/mastodon/components/timeline_hint.js
@@ -6,7 +6,7 @@ const TimelineHint = ({ resource, url }) => (
   <div className='timeline-hint'>
     <strong><FormattedMessage id='timeline_hint.remote_resource_not_displayed' defaultMessage='{resource} from other servers are not displayed.' values={{ resource }} /></strong>
     <br />
-    <a href={url} target='_blank'><FormattedMessage id='account.browse_more_on_origin_server' defaultMessage='Browse more on the original profile' /></a>
+    <a href={url} target='_blank' rel='noopener'><FormattedMessage id='account.browse_more_on_origin_server' defaultMessage='Browse more on the original profile' /></a>
   </div>
 );
 
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 0c3f6afa8..002b71e93 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -1,31 +1,38 @@
-import React from 'react';
-import { Provider } from 'react-redux';
 import PropTypes from 'prop-types';
-import configureStore from '../store/configureStore';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { IntlProvider, addLocaleData } from 'react-intl';
+import { Provider as ReduxProvider } from 'react-redux';
 import { BrowserRouter, Route } from 'react-router-dom';
 import { ScrollContext } from 'react-router-scroll-4';
-import UI from '../features/ui';
-import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from '../actions/store';
-import { connectUserStream } from '../actions/streaming';
-import { IntlProvider, addLocaleData } from 'react-intl';
-import { getLocale } from '../locales';
-import initialState from '../initial_state';
-import ErrorBoundary from '../components/error_boundary';
+import configureStore from 'mastodon/store/configureStore';
+import UI from 'mastodon/features/ui';
+import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
+import { hydrateStore } from 'mastodon/actions/store';
+import { connectUserStream } from 'mastodon/actions/streaming';
+import ErrorBoundary from 'mastodon/components/error_boundary';
+import initialState, { title as siteTitle } from 'mastodon/initial_state';
+import { getLocale } from 'mastodon/locales';
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
 
+const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
+
 export const store = configureStore();
 const hydrateAction = hydrateStore(initialState);
 
 store.dispatch(hydrateAction);
-store.dispatch(fetchCustomEmojis());
+if (initialState.meta.me) {
+  store.dispatch(fetchCustomEmojis());
+}
 
 const createIdentityContext = state => ({
   signedIn: !!state.meta.me,
   accountId: state.meta.me,
+  disabledAccountId: state.meta.disabled_account_id,
   accessToken: state.meta.access_token,
+  permissions: state.role ? state.role.permissions : 0,
 });
 
 export default class Mastodon extends React.PureComponent {
@@ -38,6 +45,7 @@ export default class Mastodon extends React.PureComponent {
     identity: PropTypes.shape({
       signedIn: PropTypes.bool.isRequired,
       accountId: PropTypes.string,
+      disabledAccountId: PropTypes.string,
       accessToken: PropTypes.string,
     }).isRequired,
   };
@@ -72,15 +80,17 @@ export default class Mastodon extends React.PureComponent {
 
     return (
       <IntlProvider locale={locale} messages={messages}>
-        <Provider store={store}>
+        <ReduxProvider store={store}>
           <ErrorBoundary>
-            <BrowserRouter basename='/web'>
+            <BrowserRouter>
               <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
                 <Route path='/' component={UI} />
               </ScrollContext>
             </BrowserRouter>
+
+            <Helmet defaultTitle={title} titleTemplate={`%s - ${title}`} />
           </ErrorBoundary>
-        </Provider>
+        </ReduxProvider>
       </IntlProvider>
     );
   }
diff --git a/app/javascript/mastodon/containers/media_container.js b/app/javascript/mastodon/containers/media_container.js
index 2f42a084f..6ee1f0bd8 100644
--- a/app/javascript/mastodon/containers/media_container.js
+++ b/app/javascript/mastodon/containers/media_container.js
@@ -43,7 +43,7 @@ export default class MediaContainer extends PureComponent {
 
   handleOpenVideo = (options) => {
     const { components } = this.props;
-    const { media } = JSON.parse(components[options.componetIndex].getAttribute('data-props'));
+    const { media } = JSON.parse(components[options.componentIndex].getAttribute('data-props'));
     const mediaList = fromJS(media);
 
     document.body.classList.add('with-modals--active');
@@ -87,7 +87,7 @@ export default class MediaContainer extends PureComponent {
               ...(hashtag ? { hashtag: fromJS(hashtag) } : {}),
 
               ...(componentName === 'Video' ? {
-                componetIndex: i,
+                componentIndex: i,
                 onOpenVideo: this.handleOpenVideo,
               } : {
                 onOpenMedia: this.handleOpenMedia,
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 9abdec138..294105f25 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -24,6 +24,9 @@ import {
   hideStatus,
   revealStatus,
   toggleStatusCollapse,
+  editStatus,
+  translateStatus,
+  undoStatusTranslation,
 } from '../actions/statuses';
 import {
   unmuteAccount,
@@ -33,6 +36,9 @@ import {
   blockDomain,
   unblockDomain,
 } from '../actions/domain_blocks';
+import {
+  initAddFilter,
+} from '../actions/filters';
 import { initMuteModal } from '../actions/mutes';
 import { initBlockModal } from '../actions/blocks';
 import { initBoostModal } from '../actions/boosts';
@@ -65,7 +71,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onReply (status, router) {
     dispatch((_, getState) => {
@@ -142,6 +148,18 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onEdit (status, history) {
+    dispatch(editStatus(status.get('id'), history));
+  },
+
+  onTranslate (status) {
+    if (status.get('translation')) {
+      dispatch(undoStatusTranslation(status.get('id')));
+    } else {
+      dispatch(translateStatus(status.get('id')));
+    }
+  },
+
   onDirect (account, router) {
     dispatch(directCompose(account, router));
   },
@@ -171,6 +189,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(initReport(status.get('account'), status));
   },
 
+  onAddFilter (status) {
+    dispatch(initAddFilter(status, { contextType }));
+  },
+
   onMute (account) {
     dispatch(initMuteModal(account));
   },
@@ -215,6 +237,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
+  onInteractionModal (type, status) {
+    dispatch(openModal('INTERACTION', {
+      type,
+      accountId: status.getIn(['account', 'id']),
+      url: status.get('url'),
+    }));
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
deleted file mode 100644
index ed8095f90..000000000
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { Fragment } from 'react';
-import ReactDOM from 'react-dom';
-import { Provider } from 'react-redux';
-import PropTypes from 'prop-types';
-import configureStore from '../store/configureStore';
-import { hydrateStore } from '../actions/store';
-import { IntlProvider, addLocaleData } from 'react-intl';
-import { getLocale } from '../locales';
-import PublicTimeline from '../features/standalone/public_timeline';
-import HashtagTimeline from '../features/standalone/hashtag_timeline';
-import ModalContainer from '../features/ui/containers/modal_container';
-import initialState from '../initial_state';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
-
-const store = configureStore();
-
-if (initialState) {
-  store.dispatch(hydrateStore(initialState));
-}
-
-export default class TimelineContainer extends React.PureComponent {
-
-  static propTypes = {
-    locale: PropTypes.string.isRequired,
-    hashtag: PropTypes.string,
-    local: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    local: !initialState.settings.known_fediverse,
-  };
-
-  render () {
-    const { locale, hashtag, local } = this.props;
-
-    let timeline;
-
-    if (hashtag) {
-      timeline = <HashtagTimeline hashtag={hashtag} local={local} />;
-    } else {
-      timeline = <PublicTimeline local={local} />;
-    }
-
-    return (
-      <IntlProvider locale={locale} messages={messages}>
-        <Provider store={store}>
-          <Fragment>
-            {timeline}
-
-            {ReactDOM.createPortal(
-              <ModalContainer />,
-              document.getElementById('modal-container'),
-            )}
-          </Fragment>
-        </Provider>
-      </IntlProvider>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/extra_polyfills.js b/app/javascript/mastodon/extra_polyfills.js
index 13c4f6da9..395f1ed05 100644
--- a/app/javascript/mastodon/extra_polyfills.js
+++ b/app/javascript/mastodon/extra_polyfills.js
@@ -1,3 +1,4 @@
+import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
 import 'intersection-observer';
 import 'requestidlecallback';
 import objectFitImages from 'object-fit-images';
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
new file mode 100644
index 000000000..e59f73738
--- /dev/null
+++ b/app/javascript/mastodon/features/about/index.js
@@ -0,0 +1,219 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Column from 'mastodon/components/column';
+import LinkFooter from 'mastodon/features/ui/components/link_footer';
+import { Helmet } from 'react-helmet';
+import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'mastodon/actions/server';
+import Account from 'mastodon/containers/account_container';
+import Skeleton from 'mastodon/components/skeleton';
+import Icon from 'mastodon/components/icon';
+import classNames from 'classnames';
+import Image from 'mastodon/components/image';
+
+const messages = defineMessages({
+  title: { id: 'column.about', defaultMessage: 'About' },
+  rules: { id: 'about.rules', defaultMessage: 'Server rules' },
+  blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
+  silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
+  silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
+  suspended: { id: 'about.domain_blocks.suspended.title', defaultMessage: 'Suspended' },
+  suspendedExplanation: { id: 'about.domain_blocks.suspended.explanation', defaultMessage: 'No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.' },
+});
+
+const severityMessages = {
+  silence: {
+    title: messages.silenced,
+    explanation: messages.silencedExplanation,
+  },
+
+  suspend: {
+    title: messages.suspended,
+    explanation: messages.suspendedExplanation,
+  },
+};
+
+const mapStateToProps = state => ({
+  server: state.getIn(['server', 'server']),
+  extendedDescription: state.getIn(['server', 'extendedDescription']),
+  domainBlocks: state.getIn(['server', 'domainBlocks']),
+});
+
+class Section extends React.PureComponent {
+
+  static propTypes = {
+    title: PropTypes.string,
+    children: PropTypes.node,
+    open: PropTypes.bool,
+    onOpen: PropTypes.func,
+  };
+
+  state = {
+    collapsed: !this.props.open,
+  };
+
+  handleClick = () => {
+    const { onOpen } = this.props;
+    const { collapsed } = this.state;
+
+    this.setState({ collapsed: !collapsed }, () => onOpen && onOpen());
+  }
+
+  render () {
+    const { title, children } = this.props;
+    const { collapsed } = this.state;
+
+    return (
+      <div className={classNames('about__section', { active: !collapsed })}>
+        <div className='about__section__title' role='button' tabIndex='0' onClick={this.handleClick}>
+          <Icon id={collapsed ? 'chevron-right' : 'chevron-down'} fixedWidth /> {title}
+        </div>
+
+        {!collapsed && (
+          <div className='about__section__body'>{children}</div>
+        )}
+      </div>
+    );
+  }
+
+}
+
+export default @connect(mapStateToProps)
+@injectIntl
+class About extends React.PureComponent {
+
+  static propTypes = {
+    server: ImmutablePropTypes.map,
+    extendedDescription: ImmutablePropTypes.map,
+    domainBlocks: ImmutablePropTypes.contains({
+      isLoading: PropTypes.bool,
+      isAvailable: PropTypes.bool,
+      items: ImmutablePropTypes.list,
+    }),
+    dispatch: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchServer());
+    dispatch(fetchExtendedDescription());
+  }
+
+  handleDomainBlocksOpen = () => {
+    const { dispatch } = this.props;
+    dispatch(fetchDomainBlocks());
+  }
+
+  render () {
+    const { multiColumn, intl, server, extendedDescription, domainBlocks } = this.props;
+    const isLoading = server.get('isLoading');
+
+    return (
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.title)}>
+        <div className='scrollable about'>
+          <div className='about__header'>
+            <Image blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} srcSet={server.getIn(['thumbnail', 'versions'])?.map((value, key) => `${value} ${key.replace('@', '')}`).join(', ')} className='about__header__hero' />
+            <h1>{isLoading ? <Skeleton width='10ch' /> : server.get('domain')}</h1>
+            <p><FormattedMessage id='about.powered_by' defaultMessage='Decentralized social media powered by {mastodon}' values={{ mastodon: <a href='https://joinmastodon.org' className='about__mail' target='_blank'>Mastodon</a> }} /></p>
+          </div>
+
+          <div className='about__meta'>
+            <div className='about__meta__column'>
+              <h4><FormattedMessage id='server_banner.administered_by' defaultMessage='Administered by:' /></h4>
+
+              <Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
+            </div>
+
+            <hr className='about__meta__divider' />
+
+            <div className='about__meta__column'>
+              <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
+
+              {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
+            </div>
+          </div>
+
+          <Section open title={intl.formatMessage(messages.title)}>
+            {extendedDescription.get('isLoading') ? (
+              <>
+                <Skeleton width='100%' />
+                <br />
+                <Skeleton width='100%' />
+                <br />
+                <Skeleton width='100%' />
+                <br />
+                <Skeleton width='70%' />
+              </>
+            ) : (extendedDescription.get('content')?.length > 0 ? (
+              <div
+                className='prose'
+                dangerouslySetInnerHTML={{ __html: extendedDescription.get('content') }}
+              />
+            ) : (
+              <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
+            ))}
+          </Section>
+
+          <Section title={intl.formatMessage(messages.rules)}>
+            {!isLoading && (server.get('rules').isEmpty() ? (
+              <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
+            ) : (
+              <ol className='rules-list'>
+                {server.get('rules').map(rule => (
+                  <li key={rule.get('id')}>
+                    <span className='rules-list__text'>{rule.get('text')}</span>
+                  </li>
+                ))}
+              </ol>
+            ))}
+          </Section>
+
+          <Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
+            {domainBlocks.get('isLoading') ? (
+              <>
+                <Skeleton width='100%' />
+                <br />
+                <Skeleton width='70%' />
+              </>
+            ) : (domainBlocks.get('isAvailable') ? (
+              <>
+                <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p>
+
+                <div className='about__domain-blocks'>
+                  {domainBlocks.get('items').map(block => (
+                    <div className='about__domain-blocks__domain' key={block.get('domain')}>
+                      <div className='about__domain-blocks__domain__header'>
+                        <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
+                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                      </div>
+
+                      <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
+                    </div>
+                  ))}
+                </div>
+              </>
+            ) : (
+              <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
+            ))}
+          </Section>
+
+          <LinkFooter />
+
+          <div className='about__footer'>
+            <p><FormattedMessage id='about.disclaimer' defaultMessage='Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.' /></p>
+          </div>
+        </div>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='all' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/account/components/featured_tags.js b/app/javascript/mastodon/features/account/components/featured_tags.js
new file mode 100644
index 000000000..24a3f2171
--- /dev/null
+++ b/app/javascript/mastodon/features/account/components/featured_tags.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import Hashtag from 'mastodon/components/hashtag';
+
+const messages = defineMessages({
+  lastStatusAt: { id: 'account.featured_tags.last_status_at', defaultMessage: 'Last post on {date}' },
+  empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
+});
+
+export default @injectIntl
+class FeaturedTags extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    account: ImmutablePropTypes.map,
+    featuredTags: ImmutablePropTypes.list,
+    tagged: PropTypes.string,
+    intl: PropTypes.object.isRequired,
+  };
+
+  render () {
+    const { account, featuredTags, intl } = this.props;
+
+    if (!account || account.get('suspended') || featuredTags.isEmpty()) {
+      return null;
+    }
+
+    return (
+      <div className='getting-started__trends'>
+        <h4><FormattedMessage id='account.featured_tags.title' defaultMessage="{name}'s featured hashtags" values={{ name: <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /> }} /></h4>
+
+        {featuredTags.take(3).map(featuredTag => (
+          <Hashtag
+            key={featuredTag.get('name')}
+            name={featuredTag.get('name')}
+            to={`/@${account.get('acct')}/tagged/${featuredTag.get('name')}`}
+            uses={featuredTag.get('statuses_count') * 1}
+            withGraph={false}
+            description={((featuredTag.get('statuses_count') * 1) > 0) ? intl.formatMessage(messages.lastStatusAt, { date: intl.formatDate(featuredTag.get('last_status_at'), { month: 'short', day: '2-digit' }) }) : intl.formatMessage(messages.empty)}
+          />
+        ))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.js b/app/javascript/mastodon/features/account/components/follow_request_note.js
new file mode 100644
index 000000000..300ae4266
--- /dev/null
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import Icon from 'mastodon/components/icon';
+
+export default class FollowRequestNote extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+  };
+
+  render () {
+    const { account, onAuthorize, onReject } = this.props;
+
+    return (
+      <div className='follow-request-banner'>
+        <div className='follow-request-banner__message'>
+          <FormattedMessage id='account.requested_follow' defaultMessage='{name} has requested to follow you' values={{ name: <bdi><strong dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi> }} />
+        </div>
+
+        <div className='follow-request-banner__action'>
+          <button type='button' className='button button-tertiary button--confirmation' onClick={onAuthorize}>
+            <Icon id='check' fixedWidth />
+            <FormattedMessage id='follow_request.authorize' defaultMessage='Authorize' />
+          </button>
+
+          <button type='button' className='button button-tertiary button--destructive' onClick={onReject}>
+            <Icon id='times' fixedWidth />
+            <FormattedMessage id='follow_request.reject' defaultMessage='Reject' />
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 48ec49d81..dddbf4dd4 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Button from 'mastodon/components/button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { autoPlayGif, me, isStaff } from 'mastodon/initial_state';
+import { autoPlayGif, me, domain } from 'mastodon/initial_state';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 import IconButton from 'mastodon/components/icon_button';
@@ -14,11 +14,14 @@ import ShortNumber from 'mastodon/components/short_number';
 import { NavLink } from 'react-router-dom';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import AccountNoteContainer from '../containers/account_note_container';
+import FollowRequestNoteContainer from '../containers/follow_request_note_container';
+import { PERMISSION_MANAGE_USERS } from 'mastodon/permissions';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Cancel follow request' },
+  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
   requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -38,7 +41,7 @@ const messages = defineMessages({
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
   enableNotifications: { id: 'account.enable_notifications', defaultMessage: 'Notify me when @{name} posts' },
   disableNotifications: { id: 'account.disable_notifications', defaultMessage: 'Stop notifying me when @{name} posts' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
@@ -50,8 +53,18 @@ const messages = defineMessages({
   unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
   add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
+  languages: { id: 'account.languages', defaultMessage: 'Change subscribed languages' },
+  openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
 });
 
+const titleFromAccount = account => {
+  const displayName = account.get('display_name');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;
+
+  return `${prefix} (@${acct})`;
+};
+
 const dateFormatOptions = {
   month: 'short',
   day: 'numeric',
@@ -64,6 +77,10 @@ const dateFormatOptions = {
 export default @injectIntl
 class Header extends ImmutablePureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     account: ImmutablePropTypes.map,
     identity_props: ImmutablePropTypes.list,
@@ -80,8 +97,12 @@ class Header extends ImmutablePureComponent {
     onEndorseToggle: PropTypes.func.isRequired,
     onAddToList: PropTypes.func.isRequired,
     onEditAccountNote: PropTypes.func.isRequired,
+    onChangeLanguages: PropTypes.func.isRequired,
+    onInteractionModal: PropTypes.func.isRequired,
+    onOpenAvatar: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     domain: PropTypes.string.isRequired,
+    hidden: PropTypes.bool,
   };
 
   openEditProfile = () => {
@@ -122,14 +143,35 @@ class Header extends ImmutablePureComponent {
     }
   }
 
+  handleAvatarClick = e => {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      this.props.onOpenAvatar();
+    }
+  }
+
+  handleShare = () => {
+    const { account } = this.props;
+
+    navigator.share({
+      text: `${titleFromAccount(account)}\n${account.get('note_plain')}`,
+      url: account.get('url'),
+    }).catch((e) => {
+      if (e.name !== 'AbortError') console.error(e);
+    });
+  }
+
   render () {
-    const { account, intl, domain } = this.props;
+    const { account, hidden, intl, domain } = this.props;
+    const { signedIn } = this.context.identity;
 
     if (!account) {
       return null;
     }
 
-    const suspended = account.get('suspended');
+    const suspended    = account.get('suspended');
+    const isRemote     = account.get('acct') !== account.get('username');
+    const remoteDomain = isRemote ? account.get('acct').split('@')[1] : null;
 
     let info        = [];
     let actionBtn   = '';
@@ -154,12 +196,12 @@ class Header extends ImmutablePureComponent {
     }
 
     if (me !== account.get('id')) {
-      if (!account.get('relationship')) { // Wait until the relationship is loaded
+      if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
         actionBtn = '';
       } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = <Button className={classNames('logo-button', { 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']), 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']), 'button--with-bell': bellBtn !== '' })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
@@ -175,12 +217,17 @@ class Header extends ImmutablePureComponent {
       lockedIcon = <Icon id='lock' title={intl.formatMessage(messages.account_locked)} />;
     }
 
-    if (account.get('id') !== me) {
+    if (signedIn && account.get('id') !== me) {
       menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.props.onMention });
       menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.props.onDirect });
       menu.push(null);
     }
 
+    if (isRemote) {
+      menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: account.get('url') });
+      menu.push(null);
+    }
+
     if ('share' in navigator) {
       menu.push({ text: intl.formatMessage(messages.share, { name: account.get('username') }), action: this.handleShare });
       menu.push(null);
@@ -198,7 +245,7 @@ class Header extends ImmutablePureComponent {
       menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
       menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
       menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
-    } else {
+    } else if (signedIn) {
       if (account.getIn(['relationship', 'following'])) {
         if (!account.getIn(['relationship', 'muting'])) {
           if (account.getIn(['relationship', 'showing_reblogs'])) {
@@ -206,6 +253,9 @@ class Header extends ImmutablePureComponent {
           } else {
             menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
           }
+
+          menu.push({ text: intl.formatMessage(messages.languages), action: this.props.onChangeLanguages });
+          menu.push(null);
         }
 
         menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
@@ -228,19 +278,17 @@ class Header extends ImmutablePureComponent {
       menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
     }
 
-    if (account.get('acct') !== account.get('username')) {
-      const domain = account.get('acct').split('@')[1];
-
+    if (signedIn && isRemote) {
       menu.push(null);
 
       if (account.getIn(['relationship', 'domain_blocking'])) {
-        menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain }), action: this.props.onUnblockDomain });
+        menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain: remoteDomain }), action: this.props.onUnblockDomain });
       } else {
-        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.props.onBlockDomain });
+        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain: remoteDomain }), action: this.props.onBlockDomain });
       }
     }
 
-    if (account.get('id') !== me && isStaff) {
+    if (account.get('id') !== me && (this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
       menu.push(null);
       menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${account.get('id')}` });
     }
@@ -248,7 +296,9 @@ class Header extends ImmutablePureComponent {
     const content         = { __html: account.get('note_emojified') };
     const displayNameHtml = { __html: account.get('display_name_html') };
     const fields          = account.get('fields');
-    const acct            = account.get('acct').indexOf('@') === -1 && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const isLocal         = account.get('acct').indexOf('@') === -1;
+    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const isIndexable     = !account.get('noindex');
 
     let badge;
 
@@ -262,28 +312,32 @@ class Header extends ImmutablePureComponent {
 
     return (
       <div className={classNames('account__header', { inactive: !!account.get('moved') })} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+        {!(suspended || hidden || account.get('moved')) && account.getIn(['relationship', 'requested_by']) && <FollowRequestNoteContainer account={account} />}
+
         <div className='account__header__image'>
           <div className='account__header__info'>
             {!suspended && info}
           </div>
 
-          <img src={autoPlayGif ? account.get('header') : account.get('header_static')} alt='' className='parallax' />
+          {!(suspended || hidden) && <img src={autoPlayGif ? account.get('header') : account.get('header_static')} alt='' className='parallax' />}
         </div>
 
         <div className='account__header__bar'>
           <div className='account__header__tabs'>
-            <a className='avatar' href={account.get('url')} rel='noopener noreferrer' target='_blank'>
-              <Avatar account={account} size={90} />
+            <a className='avatar' href={account.get('avatar')} rel='noopener noreferrer' target='_blank' onClick={this.handleAvatarClick}>
+              <Avatar account={suspended || hidden ? undefined : account} size={90} />
             </a>
 
-            <div className='spacer' />
-
             {!suspended && (
               <div className='account__header__tabs__buttons'>
-                {actionBtn}
-                {bellBtn}
+                {!hidden && (
+                  <React.Fragment>
+                    {actionBtn}
+                    {bellBtn}
+                  </React.Fragment>
+                )}
 
-                <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
+                <DropdownMenuContainer disabled={menu.length === 0} items={menu} icon='ellipsis-v' size={24} direction='right' />
               </div>
             )}
           </div>
@@ -291,34 +345,37 @@ class Header extends ImmutablePureComponent {
           <div className='account__header__tabs__name'>
             <h1>
               <span dangerouslySetInnerHTML={displayNameHtml} /> {badge}
-              <small>@{acct} {lockedIcon}</small>
+              <small>
+                <span>@{acct}</span> {lockedIcon}
+              </small>
             </h1>
           </div>
 
-          <div className='account__header__extra'>
-            <div className='account__header__bio'>
-              {fields.size > 0 && (
+          {!(suspended || hidden) && (
+            <div className='account__header__extra'>
+              <div className='account__header__bio'>
+                {(account.get('id') !== me && signedIn) && <AccountNoteContainer account={account} />}
+
+                {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />}
+
                 <div className='account__header__fields'>
+                  <dl>
+                    <dt><FormattedMessage id='account.joined_short' defaultMessage='Joined' /></dt>
+                    <dd>{intl.formatDate(account.get('created_at'), { year: 'numeric', month: 'short', day: '2-digit' })}</dd>
+                  </dl>
+
                   {fields.map((pair, i) => (
-                    <dl key={i}>
+                    <dl key={i} className={classNames({ verified: pair.get('verified_at') })}>
                       <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} className='translate' />
 
-                      <dd className={`${pair.get('verified_at') ? 'verified' : ''} translate`} title={pair.get('value_plain')}>
+                      <dd className='translate' title={pair.get('value_plain')}>
                         {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><Icon id='check' className='verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} />
                       </dd>
                     </dl>
                   ))}
                 </div>
-              )}
+              </div>
 
-              {account.get('id') !== me && !suspended && <AccountNoteContainer account={account} />}
-
-              {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />}
-
-              <div className='account__header__joined'><FormattedMessage id='account.joined' defaultMessage='Joined {date}' values={{ date: intl.formatDate(account.get('created_at'), { year: 'numeric', month: 'short', day: '2-digit' }) }} /></div>
-            </div>
-
-            {!suspended && (
               <div className='account__header__extra__links'>
                 <NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/@${account.get('acct')}`} title={intl.formatNumber(account.get('statuses_count'))}>
                   <ShortNumber
@@ -341,9 +398,14 @@ class Header extends ImmutablePureComponent {
                   />
                 </NavLink>
               </div>
-            )}
-          </div>
+            </div>
+          )}
         </div>
+
+        <Helmet>
+          <title>{titleFromAccount(account)}</title>
+          <meta name='robots' content={(isLocal && isIndexable) ? 'all' : 'noindex'} />
+        </Helmet>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/account/containers/featured_tags_container.js b/app/javascript/mastodon/features/account/containers/featured_tags_container.js
new file mode 100644
index 000000000..7e206567f
--- /dev/null
+++ b/app/javascript/mastodon/features/account/containers/featured_tags_container.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import FeaturedTags from '../components/featured_tags';
+import { makeGetAccount } from 'mastodon/selectors';
+import { List as ImmutableList } from 'immutable';
+
+const mapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  return (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+    featuredTags: state.getIn(['user_lists', 'featured_tags', accountId, 'items'], ImmutableList()),
+  });
+};
+
+export default connect(mapStateToProps)(FeaturedTags);
diff --git a/app/javascript/mastodon/features/account/containers/follow_request_note_container.js b/app/javascript/mastodon/features/account/containers/follow_request_note_container.js
new file mode 100644
index 000000000..c33c3de59
--- /dev/null
+++ b/app/javascript/mastodon/features/account/containers/follow_request_note_container.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import FollowRequestNote from '../components/follow_request_note';
+import { authorizeFollowRequest, rejectFollowRequest } from 'mastodon/actions/accounts';
+
+const mapDispatchToProps = (dispatch, { account }) => ({
+  onAuthorize () {
+    dispatch(authorizeFollowRequest(account.get('id')));
+  },
+
+  onReject () {
+    dispatch(rejectFollowRequest(account.get('id')));
+  },
+});
+
+export default connect(null, mapDispatchToProps)(FollowRequestNote);
diff --git a/app/javascript/mastodon/features/account/navigation.js b/app/javascript/mastodon/features/account/navigation.js
new file mode 100644
index 000000000..eb9ff9a95
--- /dev/null
+++ b/app/javascript/mastodon/features/account/navigation.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import FeaturedTags from 'mastodon/features/account/containers/featured_tags_container';
+import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
+
+const mapStateToProps = (state, { match: { params: { acct } } }) => {
+  const accountId = state.getIn(['accounts_map', normalizeForLookup(acct)]);
+
+  if (!accountId) {
+    return {
+      isLoading: true,
+    };
+  }
+
+  return {
+    accountId,
+    isLoading: false,
+  };
+};
+
+export default @connect(mapStateToProps)
+class AccountNavigation extends React.PureComponent {
+
+  static propTypes = {
+    match: PropTypes.shape({
+      params: PropTypes.shape({
+        acct: PropTypes.string,
+        tagged: PropTypes.string,
+      }).isRequired,
+    }).isRequired,
+
+    accountId: PropTypes.string,
+    isLoading: PropTypes.bool,
+  };
+
+  render () {
+    const { accountId, isLoading, match: { params: { tagged } } } = this.props;
+
+    if (isLoading) {
+      return null;
+    }
+
+    return (
+      <>
+        <div className='flex-spacer' />
+        <FeaturedTags accountId={accountId} tagged={tagged} />
+      </>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js
index ba7ec46a3..13fd7fe03 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@@ -2,7 +2,6 @@ import Blurhash from 'mastodon/components/blurhash';
 import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';
-import { isIOS } from 'mastodon/is_mobile';
 import PropTypes from 'prop-types';
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -105,11 +104,13 @@ export default class MediaItem extends ImmutablePureComponent {
           <video
             className='media-gallery__item-gifv-thumbnail'
             aria-label={attachment.get('description')}
+            title={attachment.get('description')}
             role='application'
             src={attachment.get('url')}
             onMouseEnter={this.handleMouseEnter}
             onMouseLeave={this.handleMouseLeave}
-            autoPlay={!isIOS() && autoPlayGif}
+            autoPlay={autoPlayGif}
+            playsInline
             loop
             muted
           />
@@ -129,7 +130,7 @@ export default class MediaItem extends ImmutablePureComponent {
 
     return (
       <div className='account-gallery__item' style={{ width, height }}>
-        <a className='media-gallery__item-thumbnail' href={status.get('url')} onClick={this.handleClick} title={title} target='_blank' rel='noopener noreferrer'>
+        <a className='media-gallery__item-thumbnail' href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} onClick={this.handleClick} title={title} target='_blank' rel='noopener noreferrer'>
           <Blurhash
             hash={attachment.get('blurhash')}
             className={classNames('media-gallery__preview', { 'media-gallery__preview--hidden': visible && loaded })}
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index cc0bfa9ba..dc7556a9a 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -16,9 +16,10 @@ import LoadMore from 'mastodon/components/load_more';
 import MissingIndicator from 'mastodon/components/missing_indicator';
 import { openModal } from 'mastodon/actions/modal';
 import { FormattedMessage } from 'react-intl';
+import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.getIn(['accounts_map', acct]);
+  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
 
   if (!accountId) {
     return {
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 33bea4c17..d67e307ff 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -22,8 +22,12 @@ export default class Header extends ImmutablePureComponent {
     onUnblockDomain: PropTypes.func.isRequired,
     onEndorseToggle: PropTypes.func.isRequired,
     onAddToList: PropTypes.func.isRequired,
+    onChangeLanguages: PropTypes.func.isRequired,
+    onInteractionModal: PropTypes.func.isRequired,
+    onOpenAvatar: PropTypes.func.isRequired,
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
+    hidden: PropTypes.bool,
   };
 
   static contextTypes = {
@@ -90,8 +94,20 @@ export default class Header extends ImmutablePureComponent {
     this.props.onEditAccountNote(this.props.account);
   }
 
+  handleChangeLanguages = () => {
+    this.props.onChangeLanguages(this.props.account);
+  }
+
+  handleInteractionModal = () => {
+    this.props.onInteractionModal(this.props.account);
+  }
+
+  handleOpenAvatar = () => {
+    this.props.onOpenAvatar(this.props.account);
+  }
+
   render () {
-    const { account, hideTabs } = this.props;
+    const { account, hidden, hideTabs } = this.props;
 
     if (account === null) {
       return null;
@@ -99,7 +115,7 @@ export default class Header extends ImmutablePureComponent {
 
     return (
       <div className='account-timeline__header'>
-        {account.get('moved') && <MovedNote from={account} to={account.get('moved')} />}
+        {(!hidden && account.get('moved')) && <MovedNote from={account} to={account.get('moved')} />}
 
         <InnerHeader
           account={account}
@@ -116,13 +132,17 @@ export default class Header extends ImmutablePureComponent {
           onEndorseToggle={this.handleEndorseToggle}
           onAddToList={this.handleAddToList}
           onEditAccountNote={this.handleEditAccountNote}
+          onChangeLanguages={this.handleChangeLanguages}
+          onInteractionModal={this.handleInteractionModal}
+          onOpenAvatar={this.handleOpenAvatar}
           domain={this.props.domain}
+          hidden={hidden}
         />
 
-        {!hideTabs && (
+        {!(hideTabs || hidden) && (
           <div className='account__section-headline'>
-            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
-            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots and replies' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
             <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
           </div>
         )}
diff --git a/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
new file mode 100644
index 000000000..80b967642
--- /dev/null
+++ b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { revealAccount } from 'mastodon/actions/accounts';
+import { FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import { domain } from 'mastodon/initial_state';
+
+const mapDispatchToProps = (dispatch, { accountId }) => ({
+
+  reveal () {
+    dispatch(revealAccount(accountId));
+  },
+
+});
+
+export default @connect(() => {}, mapDispatchToProps)
+class LimitedAccountHint extends React.PureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    reveal: PropTypes.func,
+  }
+
+  render () {
+    const { reveal } = this.props;
+
+    return (
+      <div className='limited-account-hint'>
+        <p><FormattedMessage id='limited_account_hint.title' defaultMessage='This profile has been hidden by the moderators of {domain}.' values={{ domain }} /></p>
+        <Button onClick={reveal}><FormattedMessage id='limited_account_hint.action' defaultMessage='Show profile anyway' /></Button>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/account_timeline/components/moved_note.js b/app/javascript/mastodon/features/account_timeline/components/moved_note.js
index 2e32d660f..daff47a9d 100644
--- a/app/javascript/mastodon/features/account_timeline/components/moved_note.js
+++ b/app/javascript/mastodon/features/account_timeline/components/moved_note.js
@@ -1,47 +1,35 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import AvatarOverlay from '../../../components/avatar_overlay';
 import DisplayName from '../../../components/display_name';
-import Icon from 'mastodon/components/icon';
+import { Link } from 'react-router-dom';
 
 export default class MovedNote extends ImmutablePureComponent {
 
-  static contextTypes = {
-    router: PropTypes.object,
-  };
-
   static propTypes = {
     from: ImmutablePropTypes.map.isRequired,
     to: ImmutablePropTypes.map.isRequired,
   };
 
-  handleAccountClick = e => {
-    if (e.button === 0) {
-      e.preventDefault();
-      this.context.router.history.push(`/@${this.props.to.get('acct')}`);
-    }
-
-    e.stopPropagation();
-  }
-
   render () {
     const { from, to } = this.props;
-    const displayNameHtml = { __html: from.get('display_name_html') };
 
     return (
-      <div className='account__moved-note'>
-        <div className='account__moved-note__message'>
-          <div className='account__moved-note__icon-wrapper'><Icon id='suitcase' className='account__moved-note__icon' fixedWidth /></div>
-          <FormattedMessage id='account.moved_to' defaultMessage='{name} has moved to:' values={{ name: <bdi><strong dangerouslySetInnerHTML={displayNameHtml} /></bdi> }} />
+      <div className='moved-account-banner'>
+        <div className='moved-account-banner__message'>
+          <FormattedMessage id='account.moved_to' defaultMessage='{name} has indicated that their new account is now:' values={{ name: <bdi><strong dangerouslySetInnerHTML={{ __html: from.get('display_name_html') }} /></bdi> }} />
         </div>
 
-        <a href={to.get('url')} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-          <div className='detailed-status__display-avatar'><AvatarOverlay account={to} friend={from} /></div>
-          <DisplayName account={to} />
-        </a>
+        <div className='moved-account-banner__action'>
+          <Link to={`/@${to.get('acct')}`} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><AvatarOverlay account={to} friend={from} /></div>
+            <DisplayName account={to} />
+          </Link>
+
+          <Link to={`/@${to.get('acct')}`} className='button'><FormattedMessage id='account.go_to_profile' defaultMessage='Go to profile' /></Link>
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index b3f8521cb..f53cd2480 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { makeGetAccount } from '../../../selectors';
+import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 import {
   followAccount,
@@ -23,6 +23,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { unfollowModal } from '../../../initial_state';
 
 const messages = defineMessages({
+  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
 });
@@ -33,6 +34,7 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, { accountId }) => ({
     account: getAccount(state, accountId),
     domain: state.getIn(['meta', 'domain']),
+    hidden: getAccountHidden(state, accountId),
   });
 
   return mapStateToProps;
@@ -41,7 +43,7 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
-    if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
+    if (account.getIn(['relationship', 'following'])) {
       if (unfollowModal) {
         dispatch(openModal('CONFIRM', {
           message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
@@ -51,11 +53,29 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(unfollowAccount(account.get('id')));
       }
+    } else if (account.getIn(['relationship', 'requested'])) {
+      if (unfollowModal) {
+        dispatch(openModal('CONFIRM', {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        }));
+      } else {
+        dispatch(unfollowAccount(account.get('id')));
+      }
     } else {
       dispatch(followAccount(account.get('id')));
     }
   },
 
+  onInteractionModal (account) {
+    dispatch(openModal('INTERACTION', {
+      type: 'follow',
+      accountId: account.get('id'),
+      url: account.get('url'),
+    }));
+  },
+
   onBlock (account) {
     if (account.getIn(['relationship', 'blocking'])) {
       dispatch(unblockAccount(account.get('id')));
@@ -120,12 +140,25 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(unblockDomain(domain));
   },
 
-  onAddToList(account){
+  onAddToList (account) {
     dispatch(openModal('LIST_ADDER', {
       accountId: account.get('id'),
     }));
   },
 
+  onChangeLanguages (account) {
+    dispatch(openModal('SUBSCRIBED_LANGUAGES', {
+      accountId: account.get('id'),
+    }));
+  },
+
+  onOpenAvatar (account) {
+    dispatch(openModal('IMAGE', {
+      src: account.get('avatar'),
+      alt: account.get('acct'),
+    }));
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 37df2818b..bdb430a33 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -16,19 +16,30 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
 import { me } from 'mastodon/initial_state';
 import { connectTimeline, disconnectTimeline } from 'mastodon/actions/timelines';
+import LimitedAccountHint from './components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
+import { fetchFeaturedTags } from '../../actions/featured_tags';
+import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 
 const emptyList = ImmutableList();
 
-const mapStateToProps = (state, { params: { acct, id }, withReplies = false }) => {
-  const accountId = id || state.getIn(['accounts_map', acct]);
+const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = false }) => {
+  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
 
-  if (!accountId) {
+  if (accountId === null) {
+    return {
+      isLoading: false,
+      isAccount: false,
+      statusIds: emptyList,
+    };
+  } else if (!accountId) {
     return {
       isLoading: true,
+      statusIds: emptyList,
     };
   }
 
-  const path = withReplies ? `${accountId}:with_replies` : accountId;
+  const path = withReplies ? `${accountId}:with_replies` : `${accountId}${tagged ? `:${tagged}` : ''}`;
 
   return {
     accountId,
@@ -36,16 +47,17 @@ const mapStateToProps = (state, { params: { acct, id }, withReplies = false }) =
     remoteUrl: state.getIn(['accounts', accountId, 'url']),
     isAccount: !!state.getIn(['accounts', accountId]),
     statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
-    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList),
+    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, 'items'], emptyList),
     isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
     hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
     suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+    hidden: getAccountHidden(state, accountId),
     blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
   };
 };
 
 const RemoteHint = ({ url }) => (
-  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older toots' />} />
+  <TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.statuses' defaultMessage='Older posts' />} />
 );
 
 RemoteHint.propTypes = {
@@ -59,6 +71,7 @@ class AccountTimeline extends ImmutablePureComponent {
     params: PropTypes.shape({
       acct: PropTypes.string,
       id: PropTypes.string,
+      tagged: PropTypes.string,
     }).isRequired,
     accountId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
@@ -70,21 +83,23 @@ class AccountTimeline extends ImmutablePureComponent {
     blockedBy: PropTypes.bool,
     isAccount: PropTypes.bool,
     suspended: PropTypes.bool,
+    hidden: PropTypes.bool,
     remote: PropTypes.bool,
     remoteUrl: PropTypes.string,
     multiColumn: PropTypes.bool,
   };
 
   _load () {
-    const { accountId, withReplies, dispatch } = this.props;
+    const { accountId, withReplies, params: { tagged }, dispatch } = this.props;
 
     dispatch(fetchAccount(accountId));
 
     if (!withReplies) {
-      dispatch(expandAccountFeaturedTimeline(accountId));
+      dispatch(expandAccountFeaturedTimeline(accountId, { tagged }));
     }
 
-    dispatch(expandAccountTimeline(accountId, { withReplies }));
+    dispatch(fetchFeaturedTags(accountId));
+    dispatch(expandAccountTimeline(accountId, { withReplies, tagged }));
 
     if (accountId === me) {
       dispatch(connectTimeline(`account:${me}`));
@@ -102,12 +117,17 @@ class AccountTimeline extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { params: { acct }, accountId, dispatch } = this.props;
+    const { params: { acct, tagged }, accountId, withReplies, dispatch } = this.props;
 
     if (prevProps.accountId !== accountId && accountId) {
       this._load();
     } else if (prevProps.params.acct !== acct) {
       dispatch(lookupAccount(acct));
+    } else if (prevProps.params.tagged !== tagged) {
+      if (!withReplies) {
+        dispatch(expandAccountFeaturedTimeline(accountId, { tagged }));
+      }
+      dispatch(expandAccountTimeline(accountId, { withReplies, tagged }));
     }
 
     if (prevProps.accountId === me && accountId !== me) {
@@ -124,13 +144,19 @@ class AccountTimeline extends ImmutablePureComponent {
   }
 
   handleLoadMore = maxId => {
-    this.props.dispatch(expandAccountTimeline(this.props.accountId, { maxId, withReplies: this.props.withReplies }));
+    this.props.dispatch(expandAccountTimeline(this.props.accountId, { maxId, withReplies: this.props.withReplies, tagged: this.props.params.tagged }));
   }
 
   render () {
-    const { statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, multiColumn, remote, remoteUrl } = this.props;
+    const { accountId, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props;
 
-    if (!isAccount) {
+    if (isLoading && statusIds.isEmpty()) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    } else if (!isLoading && !isAccount) {
       return (
         <Column>
           <ColumnBackButton multiColumn={multiColumn} />
@@ -139,24 +165,20 @@ class AccountTimeline extends ImmutablePureComponent {
       );
     }
 
-    if (!statusIds && isLoading) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
-
     let emptyMessage;
 
+    const forceEmptyState = suspended || blockedBy || hidden;
+
     if (suspended) {
       emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
+    } else if (hidden) {
+      emptyMessage = <LimitedAccountHint accountId={accountId} />;
     } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
     } else if (remote && statusIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
     } else {
-      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />;
+      emptyMessage = <FormattedMessage id='empty_column.account_timeline' defaultMessage='No posts found' />;
     }
 
     const remoteMessage = remote ? <RemoteHint url={remoteUrl} /> : null;
@@ -166,14 +188,14 @@ class AccountTimeline extends ImmutablePureComponent {
         <ColumnBackButton multiColumn={multiColumn} />
 
         <StatusList
-          prepend={<HeaderContainer accountId={this.props.accountId} />}
+          prepend={<HeaderContainer accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={this.props.params.tagged} />}
           alwaysPrepend
           append={remoteMessage}
           scrollKey='account_timeline'
-          statusIds={(suspended || blockedBy) ? emptyList : statusIds}
+          statusIds={forceEmptyState ? emptyList : statusIds}
           featuredStatusIds={featuredStatusIds}
           isLoading={isLoading}
-          hasMore={hasMore}
+          hasMore={!forceEmptyState && hasMore}
           onLoadMore={this.handleLoadMore}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index c47f55dd1..00854d0e4 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import { formatTime } from 'mastodon/features/video';
 import Icon from 'mastodon/components/icon';
 import classNames from 'classnames';
@@ -8,6 +8,9 @@ import { throttle } from 'lodash';
 import { getPointerPosition, fileNameFromURL } from 'mastodon/features/video';
 import { debounce } from 'lodash';
 import Visualizer from './visualizer';
+import { displayMedia, useBlurhash } from '../../initial_state';
+import Blurhash from '../../components/blurhash';
+import { is } from 'immutable';
 
 const messages = defineMessages({
   play: { id: 'video.play', defaultMessage: 'Play' },
@@ -15,6 +18,7 @@ const messages = defineMessages({
   mute: { id: 'video.mute', defaultMessage: 'Mute sound' },
   unmute: { id: 'video.unmute', defaultMessage: 'Unmute sound' },
   download: { id: 'video.download', defaultMessage: 'Download file' },
+  hide: { id: 'audio.hide', defaultMessage: 'Hide audio' },
 });
 
 const TICK_SIZE = 10;
@@ -30,10 +34,14 @@ class Audio extends React.PureComponent {
     duration: PropTypes.number,
     width: PropTypes.number,
     height: PropTypes.number,
+    sensitive: PropTypes.bool,
     editable: PropTypes.bool,
     fullscreen: PropTypes.bool,
     intl: PropTypes.object.isRequired,
+    blurhash: PropTypes.string,
     cacheWidth: PropTypes.func,
+    visible: PropTypes.bool,
+    onToggleVisibility: PropTypes.func,
     backgroundColor: PropTypes.string,
     foregroundColor: PropTypes.string,
     accentColor: PropTypes.string,
@@ -53,6 +61,7 @@ class Audio extends React.PureComponent {
     muted: false,
     volume: 0.5,
     dragging: false,
+    revealed: this.props.visible !== undefined ? this.props.visible : (displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all'),
   };
 
   constructor (props) {
@@ -78,6 +87,8 @@ class Audio extends React.PureComponent {
       backgroundColor: this.props.backgroundColor,
       foregroundColor: this.props.foregroundColor,
       accentColor: this.props.accentColor,
+      sensitive: this.props.sensitive,
+      visible: this.props.visible,
     };
   }
 
@@ -126,6 +137,12 @@ class Audio extends React.PureComponent {
     }
   }
 
+  componentWillReceiveProps (nextProps) {
+    if (!is(nextProps.visible, this.props.visible) && nextProps.visible !== undefined) {
+      this.setState({ revealed: nextProps.visible });
+    }
+  }
+
   componentWillUnmount () {
     window.removeEventListener('scroll', this.handleScroll);
     window.removeEventListener('resize', this.handleResize);
@@ -189,6 +206,14 @@ class Audio extends React.PureComponent {
     });
   }
 
+  toggleReveal = () => {
+    if (this.props.onToggleVisibility) {
+      this.props.onToggleVisibility();
+    } else {
+      this.setState({ revealed: !this.state.revealed });
+    }
+  }
+
   handleVolumeMouseDown = e => {
     document.addEventListener('mousemove', this.handleMouseVolSlide, true);
     document.addEventListener('mouseup', this.handleVolumeMouseUp, true);
@@ -433,13 +458,29 @@ class Audio extends React.PureComponent {
   }
 
   render () {
-    const { src, intl, alt, editable, autoPlay } = this.props;
-    const { paused, muted, volume, currentTime, duration, buffer, dragging } = this.state;
+    const { src, intl, alt, editable, autoPlay, sensitive, blurhash } = this.props;
+    const { paused, muted, volume, currentTime, duration, buffer, dragging, revealed } = this.state;
     const progress = Math.min((currentTime / duration) * 100, 100);
 
+    let warning;
+    if (sensitive) {
+      warning = <FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' />;
+    } else {
+      warning = <FormattedMessage id='status.media_hidden' defaultMessage='Media hidden' />;
+    }
+
     return (
-      <div className={classNames('audio-player', { editable })} ref={this.setPlayerRef} style={{ backgroundColor: this._getBackgroundColor(), color: this._getForegroundColor(), width: '100%', height: this.props.fullscreen ? '100%' : (this.state.height || this.props.height) }} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} tabIndex='0' onKeyDown={this.handleKeyDown}>
-        <audio
+      <div className={classNames('audio-player', { editable, inactive: !revealed })} ref={this.setPlayerRef} style={{ backgroundColor: this._getBackgroundColor(), color: this._getForegroundColor(), width: '100%', height: this.props.fullscreen ? '100%' : (this.state.height || this.props.height) }} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} tabIndex='0' onKeyDown={this.handleKeyDown}>
+
+        <Blurhash
+          hash={blurhash}
+          className={classNames('media-gallery__preview', {
+            'media-gallery__preview--hidden': revealed,
+          })}
+          dummy={!useBlurhash}
+        />
+
+        {(revealed || editable) && <audio
           src={src}
           ref={this.setAudioRef}
           preload={autoPlay ? 'auto' : 'none'}
@@ -448,7 +489,7 @@ class Audio extends React.PureComponent {
           onProgress={this.handleProgress}
           onLoadedData={this.handleLoadedData}
           crossOrigin='anonymous'
-        />
+        />}
 
         <canvas
           role='button'
@@ -464,13 +505,19 @@ class Audio extends React.PureComponent {
           aria-label={alt}
         />
 
-        <img
+        <div className={classNames('spoiler-button', { 'spoiler-button--hidden': revealed || editable })}>
+          <button type='button' className='spoiler-button__overlay' onClick={this.toggleReveal}>
+            <span className='spoiler-button__overlay__label'>{warning}</span>
+          </button>
+        </div>
+
+        {(revealed || editable) && <img
           src={this.props.poster}
           alt=''
           width={(this._getRadius() - TICK_SIZE) * 2}
           height={(this._getRadius() - TICK_SIZE) * 2}
           style={{ position: 'absolute', left: this._getCX(), top: this._getCY(), transform: 'translate(-50%, -50%)', borderRadius: '50%', pointerEvents: 'none' }}
-        />
+        />}
 
         <div className='video-player__seek' onMouseDown={this.handleMouseDown} ref={this.setSeekRef}>
           <div className='video-player__seek__buffer' style={{ width: `${buffer}%` }} />
@@ -508,6 +555,7 @@ class Audio extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
+              {!editable && <button type='button' title={intl.formatMessage(messages.hide)} aria-label={intl.formatMessage(messages.hide)} className='player-button' onClick={this.toggleReveal}><Icon id='eye-slash' fixedWidth /></button>}
               <a title={intl.formatMessage(messages.download)} aria-label={intl.formatMessage(messages.download)} className='video-player__download__icon player-button' href={this.props.src} download>
                 <Icon id={'download'} fixedWidth />
               </a>
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index 7ec177434..e00f2b60e 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -69,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />,
+            <AccountContainer key={id} id={id} defaultAction='block' />,
           )}
         </ScrollableList>
       </Column>
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.js b/app/javascript/mastodon/features/bookmarked_statuses/index.js
index cf067d954..097be17c9 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.js
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.js
@@ -1,15 +1,16 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from '../../actions/bookmarks';
-import Column from '../ui/components/column';
-import ColumnHeader from '../../components/column_header';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import StatusList from '../../components/status_list';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import { debounce } from 'lodash';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import ColumnHeader from 'mastodon/components/column_header';
+import StatusList from 'mastodon/components/status_list';
+import Column from 'mastodon/features/ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
@@ -70,7 +71,7 @@ class Bookmarks extends ImmutablePureComponent {
     const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
     const pinned = !!columnId;
 
-    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked toots yet. When you bookmark one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked posts yet. When you bookmark one, it will show up here." />;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
@@ -95,6 +96,11 @@ class Bookmarks extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/closed_registrations_modal/index.js b/app/javascript/mastodon/features/closed_registrations_modal/index.js
new file mode 100644
index 000000000..e6540e825
--- /dev/null
+++ b/app/javascript/mastodon/features/closed_registrations_modal/index.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { domain } from 'mastodon/initial_state';
+import { fetchServer } from 'mastodon/actions/server';
+
+const mapStateToProps = state => ({
+  message: state.getIn(['server', 'server', 'registrations', 'message']),
+});
+
+export default @connect(mapStateToProps)
+class ClosedRegistrationsModal extends ImmutablePureComponent {
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchServer());
+  }
+
+  render () {
+    let closedRegistrationsMessage;
+
+    if (this.props.message) {
+      closedRegistrationsMessage = (
+        <p
+          className='prose'
+          dangerouslySetInnerHTML={{ __html: this.props.message }}
+        />
+      );
+    } else {
+      closedRegistrationsMessage = (
+        <p className='prose'>
+          <FormattedMessage
+            id='closed_registrations_modal.description'
+            defaultMessage='Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.'
+            values={{ domain: <strong>{domain}</strong> }}
+          />
+        </p>
+      );
+    }
+
+    return (
+      <div className='modal-root__modal interaction-modal'>
+        <div className='interaction-modal__lead'>
+          <h3><FormattedMessage id='closed_registrations_modal.title' defaultMessage='Signing up on Mastodon' /></h3>
+          <p>
+            <FormattedMessage
+              id='closed_registrations_modal.preamble'
+              defaultMessage='Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!'
+            />
+          </p>
+        </div>
+
+        <div className='interaction-modal__choices'>
+          <div className='interaction-modal__choices__choice'>
+            <h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
+            {closedRegistrationsMessage}
+          </div>
+
+          <div className='interaction-modal__choices__choice'>
+            <h3><FormattedMessage id='interaction_modal.on_another_server' defaultMessage='On a different server' /></h3>
+            <p className='prose'>
+              <FormattedMessage
+                id='closed_registrations.other_server_instructions'
+                defaultMessage='Since Mastodon is decentralized, you can create an account on another server and still interact with this one.'
+              />
+            </p>
+            <a href='https://joinmastodon.org/servers' className='button button--block'><FormattedMessage id='closed_registrations_modal.find_another_server' defaultMessage='Find another server' /></a>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 30f776048..7b3f8845f 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -9,6 +9,9 @@ import { expandCommunityTimeline } from '../../actions/timelines';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import { connectCommunityStream } from '../../actions/streaming';
+import { Helmet } from 'react-helmet';
+import { domain } from 'mastodon/initial_state';
+import DismissableBanner from 'mastodon/components/dismissable_banner';
 
 const messages = defineMessages({
   title: { id: 'column.community', defaultMessage: 'Local timeline' },
@@ -33,6 +36,7 @@ class CommunityTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static defaultProps = {
@@ -69,18 +73,30 @@ class CommunityTimeline extends React.PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia } = this.props;
+    const { signedIn } = this.context.identity;
 
     dispatch(expandCommunityTimeline({ onlyMedia }));
-    this.disconnect = dispatch(connectCommunityStream({ onlyMedia }));
+
+    if (signedIn) {
+      this.disconnect = dispatch(connectCommunityStream({ onlyMedia }));
+    }
   }
 
   componentDidUpdate (prevProps) {
+    const { signedIn } = this.context.identity;
+
     if (prevProps.onlyMedia !== this.props.onlyMedia) {
       const { dispatch, onlyMedia } = this.props;
 
-      this.disconnect();
+      if (this.disconnect) {
+        this.disconnect();
+      }
+
       dispatch(expandCommunityTimeline({ onlyMedia }));
-      this.disconnect = dispatch(connectCommunityStream({ onlyMedia }));
+
+      if (signedIn) {
+        this.disconnect = dispatch(connectCommunityStream({ onlyMedia }));
+      }
     }
   }
 
@@ -120,6 +136,10 @@ class CommunityTimeline extends React.PureComponent {
           <ColumnSettingsContainer columnId={columnId} />
         </ColumnHeader>
 
+        <DismissableBanner id='community_timeline'>
+          <FormattedMessage id='dismissable_banner.community_timeline' defaultMessage='These are the most recent public posts from people whose accounts are hosted by {domain}.' values={{ domain }} />
+        </DismissableBanner>
+
         <StatusListContainer
           trackScroll={!pinned}
           scrollKey={`community_timeline-${columnId}`}
@@ -128,6 +148,11 @@ class CommunityTimeline extends React.PureComponent {
           emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index 07d92bb7e..ceed928bf 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
@@ -56,7 +56,7 @@ class ActionBar extends React.PureComponent {
     return (
       <div className='compose__action-bar'>
         <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='chevron-down' size={16} direction='right' />
+          <DropdownMenuContainer items={menu} icon='ellipsis-v' size={18} direction='right' />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index ba2d20cc7..234a2afed 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -15,7 +15,7 @@ import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollFormContainer from '../containers/poll_form_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
-import { isMobile } from '../../../is_mobile';
+import LanguageDropdown from '../containers/language_dropdown_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { length } from 'stringz';
 import { countableText } from '../util/counter';
@@ -26,8 +26,9 @@ const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u20
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
   spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
 });
 
 export default @injectIntl
@@ -49,6 +50,7 @@ class ComposeForm extends ImmutablePureComponent {
     preselectDate: PropTypes.instanceOf(Date),
     isSubmitting: PropTypes.bool,
     isChangingUpload: PropTypes.bool,
+    isEditing: PropTypes.bool,
     isUploading: PropTypes.bool,
     onChange: PropTypes.func.isRequired,
     onSubmit: PropTypes.func.isRequired,
@@ -58,13 +60,14 @@ class ComposeForm extends ImmutablePureComponent {
     onChangeSpoilerText: PropTypes.func.isRequired,
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
-    showSearch: PropTypes.bool,
+    autoFocus: PropTypes.bool,
     anyMedia: PropTypes.bool,
+    isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
   };
 
   static defaultProps = {
-    showSearch: false,
+    autoFocus: false,
   };
 
   handleChange = (e) => {
@@ -89,7 +92,7 @@ class ComposeForm extends ImmutablePureComponent {
     return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
   }
 
-  handleSubmit = () => {
+  handleSubmit = (e) => {
     if (this.props.text !== this.autosuggestTextarea.textarea.value) {
       // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
       // Update the state to match the current text
@@ -101,6 +104,10 @@ class ComposeForm extends ImmutablePureComponent {
     }
 
     this.props.onSubmit(this.context.router ? this.context.router.history : null);
+
+    if (e) {
+      e.preventDefault();
+    }
   }
 
   onSuggestionsClearRequested = () => {
@@ -146,10 +153,10 @@ class ComposeForm extends ImmutablePureComponent {
     //     - Replying to zero or one users, places the cursor at the end of the textbox.
     //     - Replying to more than one user, selects any usernames past the first;
     //       this provides a convenient shortcut to drop everyone else from the conversation.
-    if (this.props.focusDate !== prevProps.focusDate) {
+    if (this.props.focusDate && this.props.focusDate !== prevProps.focusDate) {
       let selectionEnd, selectionStart;
 
-      if (this.props.preselectDate !== prevProps.preselectDate) {
+      if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply) {
         selectionEnd   = this.props.text.length;
         selectionStart = this.props.text.search(/\s/) + 1;
       } else if (typeof this.props.caretPosition === 'number') {
@@ -160,14 +167,19 @@ class ComposeForm extends ImmutablePureComponent {
         selectionStart = selectionEnd;
       }
 
-      this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
-      this.autosuggestTextarea.textarea.focus();
+      // Because of the wicg-inert polyfill, the activeElement may not be
+      // immediately selectable, we have to wait for observers to run, as
+      // described in https://github.com/WICG/inert#performance-and-gotchas
+      Promise.resolve().then(() => {
+        this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
+        this.autosuggestTextarea.textarea.focus();
+      }).catch(console.error);
     } else if(prevProps.isSubmitting && !this.props.isSubmitting) {
       this.autosuggestTextarea.textarea.focus();
     } else if (this.props.spoiler !== prevProps.spoiler) {
       if (this.props.spoiler) {
         this.spoilerText.input.focus();
-      } else {
+      } else if (prevProps.spoiler) {
         this.autosuggestTextarea.textarea.focus();
       }
     }
@@ -194,18 +206,21 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, onPaste, showSearch } = this.props;
+    const { intl, onPaste, autoFocus } = this.props;
     const disabled = this.props.isSubmitting;
+
     let publishText = '';
 
-    if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
+    if (this.props.isEditing) {
+      publishText = intl.formatMessage(messages.saveChanges);
+    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
       publishText = <span className='compose-form__publish-private'><Icon id='lock' /> {intl.formatMessage(messages.publish)}</span>;
     } else {
       publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
     }
 
     return (
-      <div className='compose-form'>
+      <form className='compose-form' onSubmit={this.handleSubmit}>
         <WarningContainer />
 
         <ReplyIndicatorContainer />
@@ -241,9 +256,10 @@ class ComposeForm extends ImmutablePureComponent {
           onSuggestionsClearRequested={this.onSuggestionsClearRequested}
           onSuggestionSelected={this.onSuggestionSelected}
           onPaste={onPaste}
-          autoFocus={!showSearch && !isMobile(window.innerWidth)}
+          autoFocus={autoFocus}
         >
           <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+
           <div className='compose-form__modifiers'>
             <UploadFormContainer />
             <PollFormContainer />
@@ -254,16 +270,27 @@ class ComposeForm extends ImmutablePureComponent {
           <div className='compose-form__buttons'>
             <UploadButtonContainer />
             <PollButtonContainer />
-            <PrivacyDropdownContainer />
+            <PrivacyDropdownContainer disabled={this.props.isEditing} />
             <SpoilerButtonContainer />
+            <LanguageDropdown />
+          </div>
+
+          <div className='character-counter__wrapper'>
+            <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
           </div>
-          <div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div>
         </div>
 
         <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={!this.canSubmit()} block /></div>
+          <div className='compose-form__publish-button-wrapper'>
+            <Button
+              type='submit'
+              text={publishText}
+              disabled={!this.canSubmit()}
+              block
+            />
+          </div>
         </div>
-      </div>
+      </form>
     );
   }
 
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 4a87714e6..8cca8af2a 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -96,12 +96,12 @@ class ModifierPickerMenu extends React.PureComponent {
 
     return (
       <div className='emoji-picker-dropdown__modifiers__menu' style={{ display: active ? 'block' : 'none' }} ref={this.setRef}>
-        <button onClick={this.handleClick} data-index={1}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={1} backgroundImageFn={backgroundImageFn} /></button>
-        <button onClick={this.handleClick} data-index={2}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={2} backgroundImageFn={backgroundImageFn} /></button>
-        <button onClick={this.handleClick} data-index={3}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={3} backgroundImageFn={backgroundImageFn} /></button>
-        <button onClick={this.handleClick} data-index={4}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={4} backgroundImageFn={backgroundImageFn} /></button>
-        <button onClick={this.handleClick} data-index={5}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={5} backgroundImageFn={backgroundImageFn} /></button>
-        <button onClick={this.handleClick} data-index={6}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={6} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={1}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={1} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={2}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={2} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={3}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={3} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={4}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={4} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={5}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={5} backgroundImageFn={backgroundImageFn} /></button>
+        <button type='button' onClick={this.handleClick} data-index={6}><Emoji emoji='fist' set='twitter' size={22} sheetSize={32} skin={6} backgroundImageFn={backgroundImageFn} /></button>
       </div>
     );
   }
@@ -170,7 +170,7 @@ class EmojiPickerMenu extends React.PureComponent {
 
   state = {
     modifierOpen: false,
-    placement: null,
+    readyToFocus: false,
   };
 
   handleDocumentClick = e => {
@@ -182,6 +182,16 @@ class EmojiPickerMenu extends React.PureComponent {
   componentDidMount () {
     document.addEventListener('click', this.handleDocumentClick, false);
     document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+
+    // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
+    // to wait for a frame before focusing
+    requestAnimationFrame(() => {
+      this.setState({ readyToFocus: true });
+      if (this.node) {
+        const element = this.node.querySelector('input[type="search"]');
+        if (element) element.focus();
+      }
+    });
   }
 
   componentWillUnmount () {
@@ -281,7 +291,7 @@ class EmojiPickerMenu extends React.PureComponent {
           showSkinTones={false}
           backgroundImageFn={backgroundImageFn}
           notFound={notFoundFn}
-          autoFocus
+          autoFocus={this.state.readyToFocus}
           emojiTooltip
         />
 
@@ -314,6 +324,7 @@ class EmojiPickerDropdown extends React.PureComponent {
   state = {
     active: false,
     loading: false,
+    placement: null,
   };
 
   setRef = (c) => {
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.js b/app/javascript/mastodon/features/compose/components/language_dropdown.js
new file mode 100644
index 000000000..bf56fd0fa
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.js
@@ -0,0 +1,326 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, defineMessages } from 'react-intl';
+import TextIconButton from './text_icon_button';
+import Overlay from 'react-overlays/lib/Overlay';
+import Motion from 'mastodon/features/ui/util/optional_motion';
+import spring from 'react-motion/lib/spring';
+import { supportsPassiveEvents } from 'detect-passive-events';
+import classNames from 'classnames';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
+import fuzzysort from 'fuzzysort';
+
+const messages = defineMessages({
+  changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
+  search: { id: 'compose.language.search', defaultMessage: 'Search languages...' },
+  clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
+
+class LanguageDropdownMenu extends React.PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    value: PropTypes.string.isRequired,
+    frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string).isRequired,
+    placement: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+    languages: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
+    intl: PropTypes.object,
+  };
+
+  static defaultProps = {
+    languages: preloadedLanguages,
+  };
+
+  state = {
+    mounted: false,
+    searchValue: '',
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+    }
+  }
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, false);
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    this.setState({ mounted: true });
+
+    // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
+    // to wait for a frame before focusing
+    requestAnimationFrame(() => {
+      if (this.node) {
+        const element = this.node.querySelector('input[type="search"]');
+        if (element) element.focus();
+      }
+    });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, false);
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  }
+
+  setListRef = c => {
+    this.listNode = c;
+  }
+
+  handleSearchChange = ({ target }) => {
+    this.setState({ searchValue: target.value });
+  }
+
+  search () {
+    const { languages, value, frequentlyUsedLanguages } = this.props;
+    const { searchValue } = this.state;
+
+    if (searchValue === '') {
+      return [...languages].sort((a, b) => {
+        // Push current selection to the top of the list
+
+        if (a[0] === value) {
+          return -1;
+        } else if (b[0] === value) {
+          return 1;
+        } else {
+          // Sort according to frequently used languages
+
+          const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
+          const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
+
+          return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity));
+        }
+      });
+    }
+
+    return fuzzysort.go(searchValue, languages, {
+      keys: ['0', '1', '2'],
+      limit: 5,
+      threshold: -10000,
+    }).map(result => result.obj);
+  }
+
+  frequentlyUsed () {
+    const { languages, value } = this.props;
+    const current = languages.find(lang => lang[0] === value);
+    const results = [];
+
+    if (current) {
+      results.push(current);
+    }
+
+    return results;
+  }
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  }
+
+  handleKeyDown = e => {
+    const { onClose } = this.props;
+    const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget);
+
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
+      } else {
+        element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.listNode.firstChild;
+      break;
+    case 'End':
+      element = this.listNode.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }
+
+  handleSearchKeyDown = e => {
+    const { onChange, onClose } = this.props;
+    const { searchValue } = this.state;
+
+    let element = null;
+
+    switch(e.key) {
+    case 'Tab':
+    case 'ArrowDown':
+      element = this.listNode.firstChild;
+
+      if (element) {
+        element.focus();
+        e.preventDefault();
+        e.stopPropagation();
+      }
+
+      break;
+    case 'Enter':
+      element = this.listNode.firstChild;
+
+      if (element) {
+        onChange(element.getAttribute('data-index'));
+        onClose();
+      }
+      break;
+    case 'Escape':
+      if (searchValue !== '') {
+        e.preventDefault();
+        this.handleClear();
+      }
+
+      break;
+    }
+  }
+
+  handleClear = () => {
+    this.setState({ searchValue: '' });
+  }
+
+  renderItem = lang => {
+    const { value } = this.props;
+
+    return (
+      <div key={lang[0]} role='option' tabIndex='0' data-index={lang[0]} className={classNames('language-dropdown__dropdown__results__item', { active: lang[0] === value })} aria-selected={lang[0] === value} onClick={this.handleClick} onKeyDown={this.handleKeyDown}>
+        <span className='language-dropdown__dropdown__results__item__native-name'>{lang[2]}</span> <span className='language-dropdown__dropdown__results__item__common-name'>({lang[1]})</span>
+      </div>
+    );
+  }
+
+  render () {
+    const { style, placement, intl } = this.props;
+    const { mounted, searchValue } = this.state;
+    const isSearching = searchValue !== '';
+    const results = this.search();
+
+    return (
+      <Motion defaultStyle={{ opacity: 0, scaleX: 0.85, scaleY: 0.75 }} style={{ opacity: spring(1, { damping: 35, stiffness: 400 }), scaleX: spring(1, { damping: 35, stiffness: 400 }), scaleY: spring(1, { damping: 35, stiffness: 400 }) }}>
+        {({ opacity, scaleX, scaleY }) => (
+          // It should not be transformed when mounting because the resulting
+          // size will be used to determine the coordinate of the menu by
+          // react-overlays
+          <div className={`language-dropdown__dropdown ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}>
+            <div className='emoji-mart-search'>
+              <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} />
+              <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+            </div>
+
+            <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
+              {results.map(this.renderItem)}
+            </div>
+          </div>
+        )}
+      </Motion>
+    );
+  }
+
+}
+
+export default @injectIntl
+class LanguageDropdown extends React.PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string,
+    frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func,
+    onClose: PropTypes.func,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = ({ target }) => {
+    const { top } = target.getBoundingClientRect();
+
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+
+    this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' });
+    this.setState({ open: !this.state.open });
+  }
+
+  handleClose = () => {
+    const { value, onClose } = this.props;
+
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+
+    this.setState({ open: false });
+    onClose(value);
+  }
+
+  handleChange = value => {
+    const { onChange } = this.props;
+    onChange(value);
+  }
+
+  render () {
+    const { value, intl, frequentlyUsedLanguages } = this.props;
+    const { open, placement } = this.state;
+
+    return (
+      <div className={classNames('privacy-dropdown', { active: open })}>
+        <div className='privacy-dropdown__value'>
+          <TextIconButton
+            className='privacy-dropdown__value-icon'
+            label={value && value.toUpperCase()}
+            title={intl.formatMessage(messages.changeLanguage)}
+            active={open}
+            onClick={this.handleToggle}
+          />
+        </div>
+
+        <Overlay show={open} placement={placement} target={this}>
+          <LanguageDropdownMenu
+            value={value}
+            frequentlyUsedLanguages={frequentlyUsedLanguages}
+            onClose={this.handleClose}
+            onChange={this.handleChange}
+            placement={placement}
+            intl={intl}
+          />
+        </Overlay>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index e6ba7d8b7..be979af50 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ActionBar from './action_bar';
 import Avatar from '../../../components/avatar';
-import Permalink from '../../../components/permalink';
+import { Link } from 'react-router-dom';
 import IconButton from '../../../components/icon_button';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -19,15 +19,15 @@ export default class NavigationBar extends ImmutablePureComponent {
   render () {
     return (
       <div className='navigation-bar'>
-        <Permalink href={this.props.account.get('url')} to={`/@${this.props.account.get('acct')}`}>
+        <Link to={`/@${this.props.account.get('acct')}`}>
           <span style={{ display: 'none' }}>{this.props.account.get('acct')}</span>
-          <Avatar account={this.props.account} size={48} />
-        </Permalink>
+          <Avatar account={this.props.account} size={46} />
+        </Link>
 
         <div className='navigation-bar__profile'>
-          <Permalink href={this.props.account.get('url')} to={`/@${this.props.account.get('acct')}`}>
+          <Link to={`/@${this.props.account.get('acct')}`}>
             <strong className='navigation-bar__profile-account'>@{this.props.account.get('acct')}</strong>
-          </Permalink>
+          </Link>
 
           <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
         </div>
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index db49f90eb..c58db6467 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -157,7 +157,7 @@ class PollForm extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
+          <button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 
           {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={expiresIn} onChange={this.handleSelectDuration}>
@@ -165,6 +165,7 @@ class PollForm extends ImmutablePureComponent {
             <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
             <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
             <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
+            <option value={43200}>{intl.formatMessage(messages.hours, { number: 12 })}</option>
             <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
             <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
             <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index df59f46b3..1f0e998d3 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -11,12 +11,12 @@ import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all, shown in public timelines' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but not in public timelines' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
   private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
   direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
   change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });
@@ -159,6 +159,7 @@ class PrivacyDropdown extends React.PureComponent {
     onChange: PropTypes.func.isRequired,
     noDirect: PropTypes.bool,
     container: PropTypes.func,
+    disabled: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
 
@@ -241,13 +242,13 @@ class PrivacyDropdown extends React.PureComponent {
 
     if (!this.props.noDirect) {
       this.options.push(
-        { icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+        { icon: 'at', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
       );
     }
   }
 
   render () {
-    const { value, container, intl } = this.props;
+    const { value, container, disabled, intl } = this.props;
     const { open, placement } = this.state;
 
     const valueOption = this.options.find(item => item.value === value);
@@ -267,6 +268,7 @@ class PrivacyDropdown extends React.PureComponent {
             onMouseDown={this.handleMouseDown}
             onKeyDown={this.handleButtonKeyDown}
             style={{ height: null, lineHeight: '27px' }}
+            disabled={disabled}
           />
         </div>
 
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 863defb76..fc236882a 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -50,7 +50,7 @@ class ReplyIndicator extends ImmutablePureComponent {
         <div className='reply-indicator__header'>
           <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' onClick={this.handleClick} inverted /></div>
 
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
+          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
             <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
             <DisplayName account={status.get('account')} />
           </a>
diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 3e36a922b..8254fb607 100644
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -9,6 +9,7 @@ import Icon from 'mastodon/components/icon';
 
 const messages = defineMessages({
   placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
+  placeholderSignedIn: { id: 'search.search_or_paste', defaultMessage: 'Search or paste URL' },
 });
 
 class SearchPopout extends React.PureComponent {
@@ -49,6 +50,7 @@ class Search extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
+    identity: PropTypes.object.isRequired,
   };
 
   static propTypes = {
@@ -116,31 +118,29 @@ class Search extends React.PureComponent {
   render () {
     const { intl, value, submitted } = this.props;
     const { expanded } = this.state;
+    const { signedIn } = this.context.identity;
     const hasValue = value.length > 0 || submitted;
 
     return (
       <div className='search'>
-        <label>
-          <span style={{ display: 'none' }}>{intl.formatMessage(messages.placeholder)}</span>
-          <input
-            ref={this.setRef}
-            className='search__input'
-            type='text'
-            placeholder={intl.formatMessage(messages.placeholder)}
-            value={value}
-            onChange={this.handleChange}
-            onKeyUp={this.handleKeyUp}
-            onFocus={this.handleFocus}
-            onBlur={this.handleBlur}
-          />
-        </label>
+        <input
+          ref={this.setRef}
+          className='search__input'
+          type='text'
+          placeholder={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
+          aria-label={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
+          value={value}
+          onChange={this.handleChange}
+          onKeyUp={this.handleKeyUp}
+          onFocus={this.handleFocus}
+          onBlur={this.handleBlur}
+        />
 
         <div role='button' tabIndex='0' className='search__icon' onClick={this.handleClear}>
           <Icon id='search' className={hasValue ? '' : 'active'} />
           <Icon id='times-circle' className={hasValue ? 'active' : ''} aria-label={intl.formatMessage(messages.placeholder)} />
         </div>
-
-        <Overlay show={expanded && !hasValue} placement='bottom' target={this}>
+        <Overlay show={expanded && !hasValue} placement='bottom' target={this} container={this}>
           <SearchPopout />
         </Overlay>
       </div>
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index 9b3d01cfd..44ab43638 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -61,8 +61,8 @@ class SearchResults extends ImmutablePureComponent {
               <AccountContainer
                 key={suggestion.get('account')}
                 id={suggestion.get('account')}
-                actionIcon={suggestion.get('source') === 'past_interaction' ? 'times' : null}
-                actionTitle={suggestion.get('source') === 'past_interaction' ? intl.formatMessage(messages.dismissSuggestion) : null}
+                actionIcon={suggestion.get('source') === 'past_interactions' ? 'times' : null}
+                actionTitle={suggestion.get('source') === 'past_interactions' ? intl.formatMessage(messages.dismissSuggestion) : null}
                 onActionClick={dismissSuggestion}
               />
             ))}
@@ -91,7 +91,7 @@ class SearchResults extends ImmutablePureComponent {
       count   += results.get('statuses').size;
       statuses = (
         <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
 
           {results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}
 
@@ -101,10 +101,10 @@ class SearchResults extends ImmutablePureComponent {
     } else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
       statuses = (
         <div className='search-results__section'>
-          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
+          <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></h5>
 
           <div className='search-results__info'>
-            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
+            <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching posts by their content is not enabled on this Mastodon server.' />
           </div>
         </div>
       );
diff --git a/app/javascript/mastodon/features/compose/components/text_icon_button.js b/app/javascript/mastodon/features/compose/components/text_icon_button.js
index f0b133538..73da32ad5 100644
--- a/app/javascript/mastodon/features/compose/components/text_icon_button.js
+++ b/app/javascript/mastodon/features/compose/components/text_icon_button.js
@@ -17,21 +17,17 @@ export default class TextIconButton extends React.PureComponent {
     ariaControls: PropTypes.string,
   };
 
-  handleClick = (e) => {
-    e.preventDefault();
-    this.props.onClick();
-  }
-
   render () {
     const { label, title, active, ariaControls } = this.props;
 
     return (
       <button
+        type='button'
         title={title}
         aria-label={title}
         className={`text-icon-button ${active ? 'active' : ''}`}
         aria-expanded={active}
-        onClick={this.handleClick}
+        onClick={this.props.onClick}
         aria-controls={ariaControls} style={iconStyle}
       >
         {label}
diff --git a/app/javascript/mastodon/features/compose/components/upload.js b/app/javascript/mastodon/features/compose/components/upload.js
index b9f0fbe3a..b08307ade 100644
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@@ -5,7 +5,6 @@ import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
-import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 
 export default class Upload extends ImmutablePureComponent {
@@ -42,10 +41,16 @@ export default class Upload extends ImmutablePureComponent {
         <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
           {({ scale }) => (
             <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
-              <div className={classNames('compose-form__upload__actions', { active: true })}>
-                <button className='icon-button' onClick={this.handleUndoClick}><Icon id='times' /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
-                <button className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+              <div className='compose-form__upload__actions'>
+                <button type='button' className='icon-button' onClick={this.handleUndoClick}><Icon id='times' /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
+                {!!media.get('unattached') && (<button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>)}
               </div>
+
+              {(media.get('description') || '').length === 0 && !!media.get('unattached') && (
+                <div className='compose-form__upload__warning'>
+                  <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='info-circle' /> <FormattedMessage id='upload_form.description_missing' defaultMessage='No description added' /></button>
+                </div>
+              )}
             </div>
           )}
         </Motion>
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.js b/app/javascript/mastodon/features/compose/components/upload_form.js
index c6eac554e..9ff2aa0fa 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.js
+++ b/app/javascript/mastodon/features/compose/components/upload_form.js
@@ -4,7 +4,6 @@ import UploadProgressContainer from '../containers/upload_progress_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import UploadContainer from '../containers/upload_container';
 import SensitiveButtonContainer from '../containers/sensitive_button_container';
-import { FormattedMessage } from 'react-intl';
 
 export default class UploadForm extends ImmutablePureComponent {
 
@@ -17,7 +16,7 @@ export default class UploadForm extends ImmutablePureComponent {
 
     return (
       <div className='compose-form__upload-wrapper'>
-        <UploadProgressContainer icon='upload' message={<FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />} />
+        <UploadProgressContainer />
 
         <div className='compose-form__uploads-wrapper'>
           {mediaIds.map(id => (
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.js b/app/javascript/mastodon/features/compose/components/upload_progress.js
index b0bfe0c9a..cabf520fd 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.js
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.js
@@ -3,27 +3,35 @@ import PropTypes from 'prop-types';
 import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import Icon from 'mastodon/components/icon';
+import { FormattedMessage } from 'react-intl';
 
 export default class UploadProgress extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
     progress: PropTypes.number,
-    icon: PropTypes.string.isRequired,
-    message: PropTypes.node.isRequired,
+    isProcessing: PropTypes.bool,
   };
 
   render () {
-    const { active, progress, icon, message } = this.props;
+    const { active, progress, isProcessing } = this.props;
 
     if (!active) {
       return null;
     }
 
+    let message;
+
+    if (isProcessing) {
+      message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
+    } else {
+      message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
+    }
+
     return (
       <div className='upload-progress'>
         <div className='upload-progress__icon'>
-          <Icon id={icon} />
+          <Icon id='upload' />
         </div>
 
         <div className='upload-progress__message'>
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 37a0e8845..14cf9230b 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -21,10 +21,11 @@ const mapStateToProps = state => ({
   caretPosition: state.getIn(['compose', 'caretPosition']),
   preselectDate: state.getIn(['compose', 'preselectDate']),
   isSubmitting: state.getIn(['compose', 'is_submitting']),
+  isEditing: state.getIn(['compose', 'id']) !== null,
   isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
   isUploading: state.getIn(['compose', 'is_uploading']),
-  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
+  isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
new file mode 100644
index 000000000..2a040a13f
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
@@ -0,0 +1,34 @@
+import { connect } from 'react-redux';
+import LanguageDropdown from '../components/language_dropdown';
+import { changeComposeLanguage } from 'mastodon/actions/compose';
+import { useLanguage } from 'mastodon/actions/languages';
+import { createSelector } from 'reselect';
+import { Map as ImmutableMap } from 'immutable';
+
+const getFrequentlyUsedLanguages = createSelector([
+  state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()),
+], languageCounters => (
+  languageCounters.keySeq()
+    .sort((a, b) => languageCounters.get(a) - languageCounters.get(b))
+    .reverse()
+    .toArray()
+));
+
+const mapStateToProps = state => ({
+  frequentlyUsedLanguages: getFrequentlyUsedLanguages(state),
+  value: state.getIn(['compose', 'language']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onChange (value) {
+    dispatch(changeComposeLanguage(value));
+  },
+
+  onClose (value) {
+    dispatch(useLanguage(value));
+  },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
index 5eb1eb72a..a1302b2d4 100644
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
@@ -6,9 +6,20 @@ import ReplyIndicator from '../components/reply_indicator';
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
-  const mapStateToProps = state => ({
-    status: getStatus(state, { id: state.getIn(['compose', 'in_reply_to']) }),
-  });
+  const mapStateToProps = state => {
+    let statusId = state.getIn(['compose', 'id'], null);
+    let editing  = true;
+
+    if (statusId === null) {
+      statusId = state.getIn(['compose', 'in_reply_to']);
+      editing  = false;
+    }
+
+    return {
+      status: getStatus(state, { id: statusId }),
+      editing,
+    };
+  };
 
   return mapStateToProps;
 };
diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
index 0cfee96da..b18c76a43 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
@@ -4,6 +4,7 @@ import UploadProgress from '../components/upload_progress';
 const mapStateToProps = state => ({
   active: state.getIn(['compose', 'is_uploading']),
   progress: state.getIn(['compose', 'progress']),
+  isProcessing: state.getIn(['compose', 'is_processing']),
 });
 
 export default connect(mapStateToProps)(UploadProgress);
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.js b/app/javascript/mastodon/features/compose/containers/warning_container.js
index bf0660ea9..571d1d838 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@@ -42,13 +42,13 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
   }
 
   if (hashtagWarning) {
-    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag." />} />;
+    return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag." />} />;
   }
 
   if (directMessageWarning) {
     const message = (
       <span>
-        <FormattedMessage id='compose_form.direct_message_warning' defaultMessage='This toot will only be sent to all the mentioned users.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
+        <FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
       </span>
     );
 
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 663dd324f..aead7776a 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -4,19 +4,21 @@ import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
-import { mountCompose, unmountCompose } from '../../actions/compose';
+import { changeComposing, mountCompose, unmountCompose } from '../../actions/compose';
 import { Link } from 'react-router-dom';
 import { injectIntl, defineMessages } from 'react-intl';
 import SearchContainer from './containers/search_container';
 import Motion from '../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import SearchResultsContainer from './containers/search_results_container';
-import { changeComposing } from '../../actions/compose';
 import { openModal } from 'mastodon/actions/modal';
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
 import { mascot } from '../../initial_state';
 import Icon from 'mastodon/components/icon';
 import { logOut } from 'mastodon/utils/log_out';
+import Column from 'mastodon/components/column';
+import { Helmet } from 'react-helmet';
+import { isMobile } from '../../is_mobile';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -26,14 +28,14 @@ const messages = defineMessages({
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
-  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new toot' },
+  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' },
   logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
   logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
 const mapStateToProps = (state, ownProps) => ({
   columns: state.getIn(['settings', 'columns']),
-  showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
+  showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
 });
 
 export default @connect(mapStateToProps)
@@ -45,24 +47,17 @@ class Compose extends React.PureComponent {
     columns: ImmutablePropTypes.list.isRequired,
     multiColumn: PropTypes.bool,
     showSearch: PropTypes.bool,
-    isSearchPage: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
 
   componentDidMount () {
-    const { isSearchPage } = this.props;
-
-    if (!isSearchPage) {
-      this.props.dispatch(mountCompose());
-    }
+    const { dispatch } = this.props;
+    dispatch(mountCompose());
   }
 
   componentWillUnmount () {
-    const { isSearchPage } = this.props;
-
-    if (!isSearchPage) {
-      this.props.dispatch(unmountCompose());
-    }
+    const { dispatch } = this.props;
+    dispatch(unmountCompose());
   }
 
   handleLogoutClick = e => {
@@ -90,59 +85,65 @@ class Compose extends React.PureComponent {
   }
 
   render () {
-    const { multiColumn, showSearch, isSearchPage, intl } = this.props;
-
-    let header = '';
+    const { multiColumn, showSearch, intl } = this.props;
 
     if (multiColumn) {
       const { columns } = this.props;
-      header = (
-        <nav className='drawer__header'>
-          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' fixedWidth /></Link>
-          {!columns.some(column => column.get('id') === 'HOME') && (
-            <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'COMMUNITY') && (
-            <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' fixedWidth /></Link>
-          )}
-          {!columns.some(column => column.get('id') === 'PUBLIC') && (
-            <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' fixedWidth /></Link>
-          )}
-          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' fixedWidth /></a>
-          <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' fixedWidth /></a>
-        </nav>
+
+      return (
+        <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
+          <nav className='drawer__header'>
+            <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' fixedWidth /></Link>
+            {!columns.some(column => column.get('id') === 'HOME') && (
+              <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' fixedWidth /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
+              <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' fixedWidth /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'COMMUNITY') && (
+              <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' fixedWidth /></Link>
+            )}
+            {!columns.some(column => column.get('id') === 'PUBLIC') && (
+              <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' fixedWidth /></Link>
+            )}
+            <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' fixedWidth /></a>
+            <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' fixedWidth /></a>
+          </nav>
+
+          {multiColumn && <SearchContainer /> }
+
+          <div className='drawer__pager'>
+            <div className='drawer__inner' onFocus={this.onFocus}>
+              <NavigationContainer onClose={this.onBlur} />
+
+              <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
+
+              <div className='drawer__inner__mastodon'>
+                <img alt='' draggable='false' src={mascot || elephantUIPlane} />
+              </div>
+            </div>
+
+            <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
+              {({ x }) => (
+                <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
+                  <SearchResultsContainer />
+                </div>
+              )}
+            </Motion>
+          </div>
+        </div>
       );
     }
 
     return (
-      <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
-        {header}
+      <Column onFocus={this.onFocus}>
+        <NavigationContainer onClose={this.onBlur} />
+        <ComposeFormContainer />
 
-        {(multiColumn || isSearchPage) && <SearchContainer /> }
-
-        <div className='drawer__pager'>
-          {!isSearchPage && <div className='drawer__inner' onFocus={this.onFocus}>
-            <NavigationContainer onClose={this.onBlur} />
-
-            <ComposeFormContainer />
-
-            <div className='drawer__inner__mastodon'>
-              <img alt='' draggable='false' src={mascot || elephantUIPlane} />
-            </div>
-          </div>}
-
-          <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
-            {({ x }) => (
-              <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
-                <SearchResultsContainer />
-              </div>
-            )}
-          </Motion>
-        </div>
-      </div>
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
     );
   }
 
diff --git a/app/javascript/mastodon/features/compose/util/counter.js b/app/javascript/mastodon/features/compose/util/counter.js
index 7aa9e87b1..5a68bad99 100644
--- a/app/javascript/mastodon/features/compose/util/counter.js
+++ b/app/javascript/mastodon/features/compose/util/counter.js
@@ -6,4 +6,4 @@ export function countableText(inputText) {
   return inputText
     .replace(urlRegex, urlPlaceholder)
     .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
-};
+}
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 77ff2ce7b..4a770970d 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -7,7 +7,7 @@ import AttachmentList from 'mastodon/components/attachment_list';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import AvatarComposite from 'mastodon/components/avatar_composite';
-import Permalink from 'mastodon/components/permalink';
+import { Link } from 'react-router-dom';
 import IconButton from 'mastodon/components/icon_button';
 import RelativeTimestamp from 'mastodon/components/relative_timestamp';
 import { HotKeys } from 'react-hotkeys';
@@ -133,7 +133,7 @@ class Conversation extends ImmutablePureComponent {
 
     menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
 
-    const names = accounts.map(a => <Permalink to={`/@${a.get('acct')}`} href={a.get('url')} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Permalink>).reduce((prev, cur) => [prev, ', ', cur]);
+    const names = accounts.map(a => <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Link>).reduce((prev, cur) => [prev, ', ', cur]);
 
     const handlers = {
       reply: this.handleReply,
diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js
index 68523666c..8dcc43e28 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@@ -1,12 +1,13 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import Column from '../../components/column';
-import ColumnHeader from '../../components/column_header';
-import { mountConversations, unmountConversations, expandConversations } from '../../actions/conversations';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import React from 'react';
+import { Helmet } from 'react-helmet';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { connectDirectStream } from '../../actions/streaming';
+import { connect } from 'react-redux';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
+import { connectDirectStream } from 'mastodon/actions/streaming';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
 import ConversationsListContainer from './containers/conversations_list_container';
 
 const messages = defineMessages({
@@ -76,7 +77,7 @@ class DirectTimeline extends React.PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon='envelope'
+          icon='at'
           active={hasUnread}
           title={intl.formatMessage(messages.title)}
           onPin={this.handlePin}
@@ -91,8 +92,14 @@ class DirectTimeline extends React.PureComponent {
           scrollKey={`direct_timeline-${columnId}`}
           timelineId='direct'
           onLoadMore={this.handleLoadMore}
+          prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
           emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />}
         />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/directory/components/account_card.js b/app/javascript/mastodon/features/directory/components/account_card.js
index 03e13f28e..977f0c32c 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.js
+++ b/app/javascript/mastodon/features/directory/components/account_card.js
@@ -6,32 +6,30 @@ import { connect } from 'react-redux';
 import { makeGetAccount } from 'mastodon/selectors';
 import Avatar from 'mastodon/components/avatar';
 import DisplayName from 'mastodon/components/display_name';
-import Permalink from 'mastodon/components/permalink';
-import RelativeTimestamp from 'mastodon/components/relative_timestamp';
-import IconButton from 'mastodon/components/icon_button';
+import { Link } from 'react-router-dom';
+import Button from 'mastodon/components/button';
 import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 import { autoPlayGif, me, unfollowModal } from 'mastodon/initial_state';
 import ShortNumber from 'mastodon/components/short_number';
 import {
   followAccount,
   unfollowAccount,
-  blockAccount,
   unblockAccount,
   unmuteAccount,
 } from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
-import { initMuteModal } from 'mastodon/actions/mutes';
+import classNames from 'classnames';
 
 const messages = defineMessages({
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
-  unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
-  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
-  unfollowConfirm: {
-    id: 'confirmations.unfollow.confirm',
-    defaultMessage: 'Unfollow',
-  },
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
+  cancelFollowRequestConfirm: { id: 'confirmations.cancel_follow_request.confirm', defaultMessage: 'Withdraw request' },
+  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
+  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
+  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
+  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
 const makeMapStateToProps = () => {
@@ -46,10 +44,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
-    if (
-      account.getIn(['relationship', 'following']) ||
-      account.getIn(['relationship', 'requested'])
-    ) {
+    if (account.getIn(['relationship', 'following'])) {
       if (unfollowModal) {
         dispatch(
           openModal('CONFIRM', {
@@ -67,6 +62,16 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(unfollowAccount(account.get('id')));
       }
+    } else if (account.getIn(['relationship', 'requested'])) {
+      if (unfollowModal) {
+        dispatch(openModal('CONFIRM', {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        }));
+      } else {
+        dispatch(unfollowAccount(account.get('id')));
+      }
     } else {
       dispatch(followAccount(account.get('id')));
     }
@@ -75,18 +80,15 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   onBlock(account) {
     if (account.getIn(['relationship', 'blocking'])) {
       dispatch(unblockAccount(account.get('id')));
-    } else {
-      dispatch(blockAccount(account.get('id')));
     }
   },
 
   onMute(account) {
     if (account.getIn(['relationship', 'muting'])) {
       dispatch(unmuteAccount(account.get('id')));
-    } else {
-      dispatch(initMuteModal(account));
     }
   },
+
 });
 
 export default
@@ -138,130 +140,92 @@ class AccountCard extends ImmutablePureComponent {
 
   handleMute = () => {
     this.props.onMute(this.props.account);
-  };
+  }
+
+  handleEditProfile = () => {
+    window.open('/settings/profile', '_blank');
+  }
 
   render() {
     const { account, intl } = this.props;
 
-    let buttons;
+    let actionBtn;
 
-    if (
-      account.get('id') !== me &&
-      account.get('relationship', null) !== null
-    ) {
-      const following = account.getIn(['relationship', 'following']);
-      const requested = account.getIn(['relationship', 'requested']);
-      const blocking = account.getIn(['relationship', 'blocking']);
-      const muting = account.getIn(['relationship', 'muting']);
-
-      if (requested) {
-        buttons = (
-          <IconButton
-            disabled
-            icon='hourglass'
-            title={intl.formatMessage(messages.requested)}
-          />
-        );
-      } else if (blocking) {
-        buttons = (
-          <IconButton
-            active
-            icon='unlock'
-            title={intl.formatMessage(messages.unblock, {
-              name: account.get('username'),
-            })}
-            onClick={this.handleBlock}
-          />
-        );
-      } else if (muting) {
-        buttons = (
-          <IconButton
-            active
-            icon='volume-up'
-            title={intl.formatMessage(messages.unmute, {
-              name: account.get('username'),
-            })}
-            onClick={this.handleMute}
-          />
-        );
-      } else if (!account.get('moved') || following) {
-        buttons = (
-          <IconButton
-            icon={following ? 'user-times' : 'user-plus'}
-            title={intl.formatMessage(
-              following ? messages.unfollow : messages.follow,
-            )}
-            onClick={this.handleFollow}
-            active={following}
-          />
-        );
+    if (me !== account.get('id')) {
+      if (!account.get('relationship')) { // Wait until the relationship is loaded
+        actionBtn = '';
+      } else if (account.getIn(['relationship', 'requested'])) {
+        actionBtn = <Button className={classNames('logo-button')} text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.handleFollow} />;
+      } else if (account.getIn(['relationship', 'muting'])) {
+        actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />;
+      } else if (!account.getIn(['relationship', 'blocking'])) {
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
+      } else if (account.getIn(['relationship', 'blocking'])) {
+        actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
       }
+    } else {
+      actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.edit_profile)} onClick={this.handleEditProfile} />;
     }
 
     return (
-      <div className='directory__card'>
-        <div className='directory__card__img'>
-          <img
-            src={
-              autoPlayGif ? account.get('header') : account.get('header_static')
-            }
-            alt=''
-          />
-        </div>
-
-        <div className='directory__card__bar'>
-          <Permalink
-            className='directory__card__bar__name'
-            href={account.get('url')}
-            to={`/@${account.get('acct')}`}
-          >
-            <Avatar account={account} size={48} />
-            <DisplayName account={account} />
-          </Permalink>
-
-          <div className='directory__card__bar__relationship account__relationship'>
-            {buttons}
+      <div className='account-card'>
+        <Link to={`/@${account.get('acct')}`} className='account-card__permalink'>
+          <div className='account-card__header'>
+            <img
+              src={
+                autoPlayGif ? account.get('header') : account.get('header_static')
+              }
+              alt=''
+            />
           </div>
-        </div>
 
-        <div className='directory__card__extra' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+          <div className='account-card__title'>
+            <div className='account-card__title__avatar'><Avatar account={account} size={56} /></div>
+            <DisplayName account={account} />
+          </div>
+        </Link>
+
+        {account.get('note').length > 0 && (
           <div
-            className='account__header__content translate'
+            className='account-card__bio translate'
+            onMouseEnter={this.handleMouseEnter}
+            onMouseLeave={this.handleMouseLeave}
             dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
           />
-        </div>
+        )}
 
-        <div className='directory__card__extra'>
-          <div className='accounts-table__count'>
-            <ShortNumber value={account.get('statuses_count')} />
-            <small>
-              <FormattedMessage id='account.posts' defaultMessage='Toots' />
-            </small>
+        <div className='account-card__actions'>
+          <div className='account-card__counters'>
+            <div className='account-card__counters__item'>
+              <ShortNumber value={account.get('statuses_count')} />
+              <small>
+                <FormattedMessage id='account.posts' defaultMessage='Posts' />
+              </small>
+            </div>
+
+            <div className='account-card__counters__item'>
+              <ShortNumber value={account.get('followers_count')} />{' '}
+              <small>
+                <FormattedMessage
+                  id='account.followers'
+                  defaultMessage='Followers'
+                />
+              </small>
+            </div>
+
+            <div className='account-card__counters__item'>
+              <ShortNumber value={account.get('following_count')} />{' '}
+              <small>
+                <FormattedMessage
+                  id='account.following'
+                  defaultMessage='Following'
+                />
+              </small>
+            </div>
           </div>
-          <div className='accounts-table__count'>
-            <ShortNumber value={account.get('followers_count')} />{' '}
-            <small>
-              <FormattedMessage
-                id='account.followers'
-                defaultMessage='Followers'
-              />
-            </small>
-          </div>
-          <div className='accounts-table__count'>
-            {account.get('last_status_at') === null ? (
-              <FormattedMessage
-                id='account.never_active'
-                defaultMessage='Never'
-              />
-            ) : (
-              <RelativeTimestamp timestamp={account.get('last_status_at')} />
-            )}{' '}
-            <small>
-              <FormattedMessage
-                id='account.last_status'
-                defaultMessage='Last active'
-              />
-            </small>
+
+          <div className='account-card__actions__button'>
+            {actionBtn}
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/directory/index.js b/app/javascript/mastodon/features/directory/index.js
index 88f20d330..b45faa049 100644
--- a/app/javascript/mastodon/features/directory/index.js
+++ b/app/javascript/mastodon/features/directory/index.js
@@ -10,9 +10,10 @@ import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import { List as ImmutableList } from 'immutable';
 import AccountCard from './components/account_card';
 import RadioButton from 'mastodon/components/radio_button';
-import classNames from 'classnames';
 import LoadMore from 'mastodon/components/load_more';
 import ScrollContainer from 'mastodon/containers/scroll_container';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   title: { id: 'column.directory', defaultMessage: 'Browse profiles' },
@@ -129,7 +130,7 @@ class Directory extends React.PureComponent {
     const pinned = !!columnId;
 
     const scrollableArea = (
-      <div className='scrollable' style={{ background: 'transparent' }}>
+      <div className='scrollable'>
         <div className='filter-form'>
           <div className='filter-form__column' role='group'>
             <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} />
@@ -142,8 +143,10 @@ class Directory extends React.PureComponent {
           </div>
         </div>
 
-        <div className={classNames('directory__list', { loading: isLoading })}>
-          {accountIds.map(accountId => <AccountCard id={accountId} key={accountId} />)}
+        <div className='directory__list'>
+          {isLoading ? <LoadingIndicator /> : accountIds.map(accountId => (
+            <AccountCard id={accountId} key={accountId} />
+          ))}
         </div>
 
         <LoadMore onClick={this.handleLoadMore} visible={!isLoading} />
@@ -163,6 +166,11 @@ class Directory extends React.PureComponent {
         />
 
         {multiColumn && !pinned ? <ScrollContainer scrollKey='directory'>{scrollableArea}</ScrollContainer> : scrollableArea}
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js
index edb80aef4..43b275c2d 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.js
+++ b/app/javascript/mastodon/features/domain_blocks/index.js
@@ -11,6 +11,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import DomainContainer from '../../containers/domain_container';
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import ScrollableList from '../../components/scrollable_list';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
@@ -59,6 +60,7 @@ class Blocks extends ImmutablePureComponent {
     return (
       <Column bindToDocument={!multiColumn} icon='minus-circle' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
+
         <ScrollableList
           scrollKey='domain_blocks'
           onLoadMore={this.handleLoadMore}
@@ -70,6 +72,10 @@ class Blocks extends ImmutablePureComponent {
             <DomainContainer key={domain} domain={domain} />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index 07b3d8c53..72a732e3b 100644
--- a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
+++ b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
@@ -11,8 +11,8 @@ describe('emoji', () => {
     });
 
     it('works with unclosed tags', () => {
-      expect(emojify('hello>')).toEqual('hello>');
-      expect(emojify('<hello')).toEqual('<hello');
+      expect(emojify('hello>')).toEqual('hello&gt;');
+      expect(emojify('<hello')).toEqual('');
     });
 
     it('works with unclosed shortcodes', () => {
@@ -22,23 +22,23 @@ describe('emoji', () => {
 
     it('does unicode', () => {
       expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
-        '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg" />');
+        '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg">');
       expect(emojify('👨‍👩‍👧‍👧')).toEqual(
-        '<img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg" />');
-      expect(emojify('👩‍👩‍👦')).toEqual('<img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg" />');
+        '<img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg">');
+      expect(emojify('👩‍👩‍👦')).toEqual('<img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg">');
       expect(emojify('\u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
     });
 
     it('does multiple unicode', () => {
       expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg" />');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
       expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg" />');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
       expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
       expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
-        'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg" /> bar');
+        'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> bar');
     });
 
     it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
     });
 
     it('does multiple emoji properly (issue 5188)', () => {
-      expect(emojify('👌🌈💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg" /><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg" /><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg" />');
-      expect(emojify('👌 🌈 💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg" /> <img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg" /> <img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg" />');
+      expect(emojify('👌🌈💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
+      expect(emojify('👌 🌈 💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"> <img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"> <img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
     });
 
     it('does an emoji that has no shortcode', () => {
-      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg" />');
+      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg">');
     });
 
     it('does an emoji whose filename is irregular', () => {
-      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg" />');
+      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg">');
     });
 
     it('avoid emojifying on invisible text', () => {
@@ -67,26 +67,31 @@ describe('emoji', () => {
 
     it('avoid emojifying on invisible text with nested tags', () => {
       expect(emojify('<span class="invisible">😄<span class="foo">bar</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg" />');
+        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
       expect(emojify('<span class="invisible">😄<span class="invisible">😕</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg" />');
-      expect(emojify('<span class="invisible">😄<br/>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<br/>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg" />');
+        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+      expect(emojify('<span class="invisible">😄<br>😴</span>😇'))
+        .toEqual('<span class="invisible">😄<br>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
     });
 
     it('skips the textual presentation VS15 character', () => {
       expect(emojify('✴︎')) // This is U+2734 EIGHT POINTED BLACK STAR then U+FE0E VARIATION SELECTOR-15
-        .toEqual('<img draggable="false" class="emojione" alt="✴" title=":eight_pointed_black_star:" src="/emoji/2734_border.svg" />');
+        .toEqual('<img draggable="false" class="emojione" alt="✴" title=":eight_pointed_black_star:" src="/emoji/2734_border.svg">');
     });
 
     it('does an simple emoji properly', () => {
       expect(emojify('♀♂'))
-        .toEqual('<img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg" /><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg" />');
+        .toEqual('<img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg">');
     });
 
     it('does an emoji containing ZWJ properly', () => {
       expect(emojify('💂‍♀️💂‍♂️'))
-        .toEqual('<img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg" /><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg" />');
+        .toEqual('<img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg">');
+    });
+
+    it('keeps ordering as expected (issue fixed by PR 20677)', () => {
+      expect(emojify('<p>💕 <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>'))
+        .toEqual('<p><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
     });
   });
 });
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index fb1a3804c..bc3dd8c60 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -19,71 +19,99 @@ const emojiFilename = (filename) => {
   return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
 };
 
-const emojify = (str, customEmojis = {}) => {
-  const tagCharsWithoutEmojis = '<&';
-  const tagCharsWithEmojis = Object.keys(customEmojis).length ? '<&:' : '<&';
-  let rtn = '', tagChars = tagCharsWithEmojis, invisible = 0;
+const emojifyTextNode = (node, customEmojis) => {
+  let str = node.textContent;
+
+  const fragment = new DocumentFragment();
+
   for (;;) {
-    let match, i = 0, tag;
-    while (i < str.length && (tag = tagChars.indexOf(str[i])) === -1 && (invisible || !(match = trie.search(str.slice(i))))) {
-      i += str.codePointAt(i) < 65536 ? 1 : 2;
+    let match, i = 0;
+
+    if (customEmojis === null) {
+      while (i < str.length && !(match = trie.search(str.slice(i)))) {
+        i += str.codePointAt(i) < 65536 ? 1 : 2;
+      }
+    } else {
+      while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
+        i += str.codePointAt(i) < 65536 ? 1 : 2;
+      }
     }
-    let rend, replacement = '';
+
+    let rend, replacement = null;
     if (i === str.length) {
       break;
     } else if (str[i] === ':') {
       if (!(() => {
         rend = str.indexOf(':', i + 1) + 1;
         if (!rend) return false; // no pair of ':'
-        const lt = str.indexOf('<', i + 1);
-        if (!(lt === -1 || lt >= rend)) return false; // tag appeared before closing ':'
         const shortname = str.slice(i, rend);
         // now got a replacee as ':shortname:'
         // if you want additional emoji handler, add statements below which set replacement and return true.
         if (shortname in customEmojis) {
           const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url;
-          replacement = `<img draggable="false" class="emojione custom-emoji" alt="${shortname}" title="${shortname}" src="${filename}" data-original="${customEmojis[shortname].url}" data-static="${customEmojis[shortname].static_url}" />`;
+          replacement = document.createElement('img');
+          replacement.setAttribute('draggable', false);
+          replacement.setAttribute('class', 'emojione custom-emoji');
+          replacement.setAttribute('alt', shortname);
+          replacement.setAttribute('title', shortname);
+          replacement.setAttribute('src', filename);
+          replacement.setAttribute('data-original', customEmojis[shortname].url);
+          replacement.setAttribute('data-static', customEmojis[shortname].static_url);
           return true;
         }
         return false;
       })()) rend = ++i;
-    } else if (tag >= 0) { // <, &
-      rend = str.indexOf('>;'[tag], i + 1) + 1;
-      if (!rend) {
-        break;
-      }
-      if (tag === 0) {
-        if (invisible) {
-          if (str[i + 1] === '/') { // closing tag
-            if (!--invisible) {
-              tagChars = tagCharsWithEmojis;
-            }
-          } else if (str[rend - 2] !== '/') { // opening tag
-            invisible++;
-          }
-        } else {
-          if (str.startsWith('<span class="invisible">', i)) {
-            // avoid emojifying on invisible text
-            invisible = 1;
-            tagChars = tagCharsWithoutEmojis;
-          }
-        }
-      }
-      i = rend;
     } else { // matched to unicode emoji
       const { filename, shortCode } = unicodeMapping[match];
       const title = shortCode ? `:${shortCode}:` : '';
-      replacement = `<img draggable="false" class="emojione" alt="${match}" title="${title}" src="${assetHost}/emoji/${emojiFilename(filename)}.svg" />`;
+      replacement = document.createElement('img');
+      replacement.setAttribute('draggable', false);
+      replacement.setAttribute('class', 'emojione');
+      replacement.setAttribute('alt', match);
+      replacement.setAttribute('title', title);
+      replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
       rend = i + match.length;
       // If the matched character was followed by VS15 (for selecting text presentation), skip it.
       if (str.codePointAt(rend) === 65038) {
         rend += 1;
       }
     }
-    rtn += str.slice(0, i) + replacement;
+
+    fragment.append(document.createTextNode(str.slice(0, i)));
+    if (replacement) {
+      fragment.append(replacement);
+    }
     str = str.slice(rend);
   }
-  return rtn + str;
+
+  fragment.append(document.createTextNode(str));
+  node.parentElement.replaceChild(fragment, node);
+};
+
+const emojifyNode = (node, customEmojis) => {
+  for (const child of node.childNodes) {
+    switch(child.nodeType) {
+    case Node.TEXT_NODE:
+      emojifyTextNode(child, customEmojis);
+      break;
+    case Node.ELEMENT_NODE:
+      if (!child.classList.contains('invisible'))
+        emojifyNode(child, customEmojis);
+      break;
+    }
+  }
+};
+
+const emojify = (str, customEmojis = {}) => {
+  const wrapper = document.createElement('div');
+  wrapper.innerHTML = str;
+
+  if (!Object.keys(customEmojis).length)
+    customEmojis = null;
+
+  emojifyNode(wrapper, customEmojis);
+
+  return wrapper.innerHTML;
 };
 
 export default emojify;
diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js
index 74b53ce5c..6a402f2d4 100644
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -90,7 +90,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let { short_names, search, unified } = emojiMartData.emojis[key];
 
   if (short_names[0] !== key) {
-    throw new Error('The compresser expects the first short_code to be the ' +
+    throw new Error('The compressor expects the first short_code to be the ' +
       'key. It may need to be rewritten if the emoji change such that this ' +
       'is no longer the case.');
   }
diff --git a/app/javascript/mastodon/features/emoji/emoji_map.json b/app/javascript/mastodon/features/emoji/emoji_map.json
index 121fea2a5..64f6615b7 100644
--- a/app/javascript/mastodon/features/emoji/emoji_map.json
+++ b/app/javascript/mastodon/features/emoji/emoji_map.json
@@ -1 +1 @@
-{"😀":"1f600","😃":"1f603","😄":"1f604","😁":"1f601","😆":"1f606","😅":"1f605","🤣":"1f923","😂":"1f602","🙂":"1f642","🙃":"1f643","😉":"1f609","😊":"1f60a","😇":"1f607","🥰":"1f970","😍":"1f60d","🤩":"1f929","😘":"1f618","😗":"1f617","☺":"263a","😚":"1f61a","😙":"1f619","🥲":"1f972","😋":"1f60b","😛":"1f61b","😜":"1f61c","🤪":"1f92a","😝":"1f61d","🤑":"1f911","🤗":"1f917","🤭":"1f92d","🤫":"1f92b","🤔":"1f914","🤐":"1f910","🤨":"1f928","😐":"1f610","😑":"1f611","😶":"1f636","😏":"1f60f","😒":"1f612","🙄":"1f644","😬":"1f62c","🤥":"1f925","😌":"1f60c","😔":"1f614","😪":"1f62a","🤤":"1f924","😴":"1f634","😷":"1f637","🤒":"1f912","🤕":"1f915","🤢":"1f922","🤮":"1f92e","🤧":"1f927","🥵":"1f975","🥶":"1f976","🥴":"1f974","😵":"1f635","🤯":"1f92f","🤠":"1f920","🥳":"1f973","🥸":"1f978","😎":"1f60e","🤓":"1f913","🧐":"1f9d0","😕":"1f615","😟":"1f61f","🙁":"1f641","☹":"2639","😮":"1f62e","😯":"1f62f","😲":"1f632","😳":"1f633","🥺":"1f97a","😦":"1f626","😧":"1f627","😨":"1f628","😰":"1f630","😥":"1f625","😢":"1f622","😭":"1f62d","😱":"1f631","😖":"1f616","😣":"1f623","😞":"1f61e","😓":"1f613","😩":"1f629","😫":"1f62b","🥱":"1f971","😤":"1f624","😡":"1f621","😠":"1f620","🤬":"1f92c","😈":"1f608","👿":"1f47f","💀":"1f480","☠":"2620","💩":"1f4a9","🤡":"1f921","👹":"1f479","👺":"1f47a","👻":"1f47b","👽":"1f47d","👾":"1f47e","🤖":"1f916","😺":"1f63a","😸":"1f638","😹":"1f639","😻":"1f63b","😼":"1f63c","😽":"1f63d","🙀":"1f640","😿":"1f63f","😾":"1f63e","🙈":"1f648","🙉":"1f649","🙊":"1f64a","💋":"1f48b","💌":"1f48c","💘":"1f498","💝":"1f49d","💖":"1f496","💗":"1f497","💓":"1f493","💞":"1f49e","💕":"1f495","💟":"1f49f","❣":"2763","💔":"1f494","❤":"2764","🧡":"1f9e1","💛":"1f49b","💚":"1f49a","💙":"1f499","💜":"1f49c","🤎":"1f90e","🖤":"1f5a4","🤍":"1f90d","💯":"1f4af","💢":"1f4a2","💥":"1f4a5","💫":"1f4ab","💦":"1f4a6","💨":"1f4a8","🕳":"1f573","💣":"1f4a3","💬":"1f4ac","🗨":"1f5e8","🗯":"1f5ef","💭":"1f4ad","💤":"1f4a4","👋":"1f44b","🤚":"1f91a","🖐":"1f590","✋":"270b","🖖":"1f596","👌":"1f44c","🤌":"1f90c","🤏":"1f90f","✌":"270c","🤞":"1f91e","🤟":"1f91f","🤘":"1f918","🤙":"1f919","👈":"1f448","👉":"1f449","👆":"1f446","🖕":"1f595","👇":"1f447","☝":"261d","👍":"1f44d","👎":"1f44e","✊":"270a","👊":"1f44a","🤛":"1f91b","🤜":"1f91c","👏":"1f44f","🙌":"1f64c","👐":"1f450","🤲":"1f932","🤝":"1f91d","🙏":"1f64f","✍":"270d","💅":"1f485","🤳":"1f933","💪":"1f4aa","🦾":"1f9be","🦿":"1f9bf","🦵":"1f9b5","🦶":"1f9b6","👂":"1f442","🦻":"1f9bb","👃":"1f443","🧠":"1f9e0","🫀":"1fac0","🫁":"1fac1","🦷":"1f9b7","🦴":"1f9b4","👀":"1f440","👁":"1f441","👅":"1f445","👄":"1f444","👶":"1f476","🧒":"1f9d2","👦":"1f466","👧":"1f467","🧑":"1f9d1","👱":"1f471","👨":"1f468","🧔":"1f9d4","👩":"1f469","🧓":"1f9d3","👴":"1f474","👵":"1f475","🙍":"1f64d","🙎":"1f64e","🙅":"1f645","🙆":"1f646","💁":"1f481","🙋":"1f64b","🧏":"1f9cf","🙇":"1f647","🤦":"1f926","🤷":"1f937","👮":"1f46e","🕵":"1f575","💂":"1f482","🥷":"1f977","👷":"1f477","🤴":"1f934","👸":"1f478","👳":"1f473","👲":"1f472","🧕":"1f9d5","🤵":"1f935","👰":"1f470","🤰":"1f930","🤱":"1f931","👼":"1f47c","🎅":"1f385","🤶":"1f936","🦸":"1f9b8","🦹":"1f9b9","🧙":"1f9d9","🧚":"1f9da","🧛":"1f9db","🧜":"1f9dc","🧝":"1f9dd","🧞":"1f9de","🧟":"1f9df","💆":"1f486","💇":"1f487","🚶":"1f6b6","🧍":"1f9cd","🧎":"1f9ce","🏃":"1f3c3","💃":"1f483","🕺":"1f57a","🕴":"1f574","👯":"1f46f","🧖":"1f9d6","🧗":"1f9d7","🤺":"1f93a","🏇":"1f3c7","⛷":"26f7","🏂":"1f3c2","🏌":"1f3cc","🏄":"1f3c4","🚣":"1f6a3","🏊":"1f3ca","⛹":"26f9","🏋":"1f3cb","🚴":"1f6b4","🚵":"1f6b5","🤸":"1f938","🤼":"1f93c","🤽":"1f93d","🤾":"1f93e","🤹":"1f939","🧘":"1f9d8","🛀":"1f6c0","🛌":"1f6cc","👭":"1f46d","👫":"1f46b","👬":"1f46c","💏":"1f48f","💑":"1f491","👪":"1f46a","🗣":"1f5e3","👤":"1f464","👥":"1f465","🫂":"1fac2","👣":"1f463","🏻":"1f463","🏼":"1f463","🏽":"1f463","🏾":"1f463","🏿":"1f463","🦰":"1f463","🦱":"1f463","🦳":"1f463","🦲":"1f463","🐵":"1f435","🐒":"1f412","🦍":"1f98d","🦧":"1f9a7","🐶":"1f436","🐕":"1f415","🦮":"1f9ae","🐩":"1f429","🐺":"1f43a","🦊":"1f98a","🦝":"1f99d","🐱":"1f431","🐈":"1f408","🦁":"1f981","🐯":"1f42f","🐅":"1f405","🐆":"1f406","🐴":"1f434","🐎":"1f40e","🦄":"1f984","🦓":"1f993","🦌":"1f98c","🦬":"1f9ac","🐮":"1f42e","🐂":"1f402","🐃":"1f403","🐄":"1f404","🐷":"1f437","🐖":"1f416","🐗":"1f417","🐽":"1f43d","🐏":"1f40f","🐑":"1f411","🐐":"1f410","🐪":"1f42a","🐫":"1f42b","🦙":"1f999","🦒":"1f992","🐘":"1f418","🦣":"1f9a3","🦏":"1f98f","🦛":"1f99b","🐭":"1f42d","🐁":"1f401","🐀":"1f400","🐹":"1f439","🐰":"1f430","🐇":"1f407","🐿":"1f43f","🦫":"1f9ab","🦔":"1f994","🦇":"1f987","🐻":"1f43b","🐨":"1f428","🐼":"1f43c","🦥":"1f9a5","🦦":"1f9a6","🦨":"1f9a8","🦘":"1f998","🦡":"1f9a1","🐾":"1f43e","🦃":"1f983","🐔":"1f414","🐓":"1f413","🐣":"1f423","🐤":"1f424","🐥":"1f425","🐦":"1f426","🐧":"1f427","🕊":"1f54a","🦅":"1f985","🦆":"1f986","🦢":"1f9a2","🦉":"1f989","🦤":"1f9a4","🪶":"1fab6","🦩":"1f9a9","🦚":"1f99a","🦜":"1f99c","🐸":"1f438","🐊":"1f40a","🐢":"1f422","🦎":"1f98e","🐍":"1f40d","🐲":"1f432","🐉":"1f409","🦕":"1f995","🦖":"1f996","🐳":"1f433","🐋":"1f40b","🐬":"1f42c","🦭":"1f9ad","🐟":"1f41f","🐠":"1f420","🐡":"1f421","🦈":"1f988","🐙":"1f419","🐚":"1f41a","🐌":"1f40c","🦋":"1f98b","🐛":"1f41b","🐜":"1f41c","🐝":"1f41d","🪲":"1fab2","🐞":"1f41e","🦗":"1f997","🪳":"1fab3","🕷":"1f577","🕸":"1f578","🦂":"1f982","🦟":"1f99f","🪰":"1fab0","🪱":"1fab1","🦠":"1f9a0","💐":"1f490","🌸":"1f338","💮":"1f4ae","🏵":"1f3f5","🌹":"1f339","🥀":"1f940","🌺":"1f33a","🌻":"1f33b","🌼":"1f33c","🌷":"1f337","🌱":"1f331","🪴":"1fab4","🌲":"1f332","🌳":"1f333","🌴":"1f334","🌵":"1f335","🌾":"1f33e","🌿":"1f33f","☘":"2618","🍀":"1f340","🍁":"1f341","🍂":"1f342","🍃":"1f343","🍇":"1f347","🍈":"1f348","🍉":"1f349","🍊":"1f34a","🍋":"1f34b","🍌":"1f34c","🍍":"1f34d","🥭":"1f96d","🍎":"1f34e","🍏":"1f34f","🍐":"1f350","🍑":"1f351","🍒":"1f352","🍓":"1f353","🫐":"1fad0","🥝":"1f95d","🍅":"1f345","🫒":"1fad2","🥥":"1f965","🥑":"1f951","🍆":"1f346","🥔":"1f954","🥕":"1f955","🌽":"1f33d","🌶":"1f336","🫑":"1fad1","🥒":"1f952","🥬":"1f96c","🥦":"1f966","🧄":"1f9c4","🧅":"1f9c5","🍄":"1f344","🥜":"1f95c","🌰":"1f330","🍞":"1f35e","🥐":"1f950","🥖":"1f956","🫓":"1fad3","🥨":"1f968","🥯":"1f96f","🥞":"1f95e","🧇":"1f9c7","🧀":"1f9c0","🍖":"1f356","🍗":"1f357","🥩":"1f969","🥓":"1f953","🍔":"1f354","🍟":"1f35f","🍕":"1f355","🌭":"1f32d","🥪":"1f96a","🌮":"1f32e","🌯":"1f32f","🫔":"1fad4","🥙":"1f959","🧆":"1f9c6","🥚":"1f95a","🍳":"1f373","🥘":"1f958","🍲":"1f372","🫕":"1fad5","🥣":"1f963","🥗":"1f957","🍿":"1f37f","🧈":"1f9c8","🧂":"1f9c2","🥫":"1f96b","🍱":"1f371","🍘":"1f358","🍙":"1f359","🍚":"1f35a","🍛":"1f35b","🍜":"1f35c","🍝":"1f35d","🍠":"1f360","🍢":"1f362","🍣":"1f363","🍤":"1f364","🍥":"1f365","🥮":"1f96e","🍡":"1f361","🥟":"1f95f","🥠":"1f960","🥡":"1f961","🦀":"1f980","🦞":"1f99e","🦐":"1f990","🦑":"1f991","🦪":"1f9aa","🍦":"1f366","🍧":"1f367","🍨":"1f368","🍩":"1f369","🍪":"1f36a","🎂":"1f382","🍰":"1f370","🧁":"1f9c1","🥧":"1f967","🍫":"1f36b","🍬":"1f36c","🍭":"1f36d","🍮":"1f36e","🍯":"1f36f","🍼":"1f37c","🥛":"1f95b","☕":"2615","🫖":"1fad6","🍵":"1f375","🍶":"1f376","🍾":"1f37e","🍷":"1f377","🍸":"1f378","🍹":"1f379","🍺":"1f37a","🍻":"1f37b","🥂":"1f942","🥃":"1f943","🥤":"1f964","🧋":"1f9cb","🧃":"1f9c3","🧉":"1f9c9","🧊":"1f9ca","🥢":"1f962","🍽":"1f37d","🍴":"1f374","🥄":"1f944","🔪":"1f52a","🏺":"1f3fa","🌍":"1f30d","🌎":"1f30e","🌏":"1f30f","🌐":"1f310","🗺":"1f5fa","🗾":"1f5fe","🧭":"1f9ed","🏔":"1f3d4","⛰":"26f0","🌋":"1f30b","🗻":"1f5fb","🏕":"1f3d5","🏖":"1f3d6","🏜":"1f3dc","🏝":"1f3dd","🏞":"1f3de","🏟":"1f3df","🏛":"1f3db","🏗":"1f3d7","🧱":"1f9f1","🪨":"1faa8","🪵":"1fab5","🛖":"1f6d6","🏘":"1f3d8","🏚":"1f3da","🏠":"1f3e0","🏡":"1f3e1","🏢":"1f3e2","🏣":"1f3e3","🏤":"1f3e4","🏥":"1f3e5","🏦":"1f3e6","🏨":"1f3e8","🏩":"1f3e9","🏪":"1f3ea","🏫":"1f3eb","🏬":"1f3ec","🏭":"1f3ed","🏯":"1f3ef","🏰":"1f3f0","💒":"1f492","🗼":"1f5fc","🗽":"1f5fd","⛪":"26ea","🕌":"1f54c","🛕":"1f6d5","🕍":"1f54d","⛩":"26e9","🕋":"1f54b","⛲":"26f2","⛺":"26fa","🌁":"1f301","🌃":"1f303","🏙":"1f3d9","🌄":"1f304","🌅":"1f305","🌆":"1f306","🌇":"1f307","🌉":"1f309","♨":"2668","🎠":"1f3a0","🎡":"1f3a1","🎢":"1f3a2","💈":"1f488","🎪":"1f3aa","🚂":"1f682","🚃":"1f683","🚄":"1f684","🚅":"1f685","🚆":"1f686","🚇":"1f687","🚈":"1f688","🚉":"1f689","🚊":"1f68a","🚝":"1f69d","🚞":"1f69e","🚋":"1f68b","🚌":"1f68c","🚍":"1f68d","🚎":"1f68e","🚐":"1f690","🚑":"1f691","🚒":"1f692","🚓":"1f693","🚔":"1f694","🚕":"1f695","🚖":"1f696","🚗":"1f697","🚘":"1f698","🚙":"1f699","🛻":"1f6fb","🚚":"1f69a","🚛":"1f69b","🚜":"1f69c","🏎":"1f3ce","🏍":"1f3cd","🛵":"1f6f5","🦽":"1f9bd","🦼":"1f9bc","🛺":"1f6fa","🚲":"1f6b2","🛴":"1f6f4","🛹":"1f6f9","🛼":"1f6fc","🚏":"1f68f","🛣":"1f6e3","🛤":"1f6e4","🛢":"1f6e2","⛽":"26fd","🚨":"1f6a8","🚥":"1f6a5","🚦":"1f6a6","🛑":"1f6d1","🚧":"1f6a7","⚓":"2693","⛵":"26f5","🛶":"1f6f6","🚤":"1f6a4","🛳":"1f6f3","⛴":"26f4","🛥":"1f6e5","🚢":"1f6a2","✈":"2708","🛩":"1f6e9","🛫":"1f6eb","🛬":"1f6ec","🪂":"1fa82","💺":"1f4ba","🚁":"1f681","🚟":"1f69f","🚠":"1f6a0","🚡":"1f6a1","🛰":"1f6f0","🚀":"1f680","🛸":"1f6f8","🛎":"1f6ce","🧳":"1f9f3","⌛":"231b","⏳":"23f3","⌚":"231a","⏰":"23f0","⏱":"23f1","⏲":"23f2","🕰":"1f570","🕛":"1f55b","🕧":"1f567","🕐":"1f550","🕜":"1f55c","🕑":"1f551","🕝":"1f55d","🕒":"1f552","🕞":"1f55e","🕓":"1f553","🕟":"1f55f","🕔":"1f554","🕠":"1f560","🕕":"1f555","🕡":"1f561","🕖":"1f556","🕢":"1f562","🕗":"1f557","🕣":"1f563","🕘":"1f558","🕤":"1f564","🕙":"1f559","🕥":"1f565","🕚":"1f55a","🕦":"1f566","🌑":"1f311","🌒":"1f312","🌓":"1f313","🌔":"1f314","🌕":"1f315","🌖":"1f316","🌗":"1f317","🌘":"1f318","🌙":"1f319","🌚":"1f31a","🌛":"1f31b","🌜":"1f31c","🌡":"1f321","☀":"2600","🌝":"1f31d","🌞":"1f31e","🪐":"1fa90","⭐":"2b50","🌟":"1f31f","🌠":"1f320","🌌":"1f30c","☁":"2601","⛅":"26c5","⛈":"26c8","🌤":"1f324","🌥":"1f325","🌦":"1f326","🌧":"1f327","🌨":"1f328","🌩":"1f329","🌪":"1f32a","🌫":"1f32b","🌬":"1f32c","🌀":"1f300","🌈":"1f308","🌂":"1f302","☂":"2602","☔":"2614","⛱":"26f1","⚡":"26a1","❄":"2744","☃":"2603","⛄":"26c4","☄":"2604","🔥":"1f525","💧":"1f4a7","🌊":"1f30a","🎃":"1f383","🎄":"1f384","🎆":"1f386","🎇":"1f387","🧨":"1f9e8","✨":"2728","🎈":"1f388","🎉":"1f389","🎊":"1f38a","🎋":"1f38b","🎍":"1f38d","🎎":"1f38e","🎏":"1f38f","🎐":"1f390","🎑":"1f391","🧧":"1f9e7","🎀":"1f380","🎁":"1f381","🎗":"1f397","🎟":"1f39f","🎫":"1f3ab","🎖":"1f396","🏆":"1f3c6","🏅":"1f3c5","🥇":"1f947","🥈":"1f948","🥉":"1f949","⚽":"26bd","⚾":"26be","🥎":"1f94e","🏀":"1f3c0","🏐":"1f3d0","🏈":"1f3c8","🏉":"1f3c9","🎾":"1f3be","🥏":"1f94f","🎳":"1f3b3","🏏":"1f3cf","🏑":"1f3d1","🏒":"1f3d2","🥍":"1f94d","🏓":"1f3d3","🏸":"1f3f8","🥊":"1f94a","🥋":"1f94b","🥅":"1f945","⛳":"26f3","⛸":"26f8","🎣":"1f3a3","🤿":"1f93f","🎽":"1f3bd","🎿":"1f3bf","🛷":"1f6f7","🥌":"1f94c","🎯":"1f3af","🪀":"1fa80","🪁":"1fa81","🎱":"1f3b1","🔮":"1f52e","🪄":"1fa84","🧿":"1f9ff","🎮":"1f3ae","🕹":"1f579","🎰":"1f3b0","🎲":"1f3b2","🧩":"1f9e9","🧸":"1f9f8","🪅":"1fa85","🪆":"1fa86","♠":"2660","♥":"2665","♦":"2666","♣":"2663","♟":"265f","🃏":"1f0cf","🀄":"1f004","🎴":"1f3b4","🎭":"1f3ad","🖼":"1f5bc","🎨":"1f3a8","🧵":"1f9f5","🪡":"1faa1","🧶":"1f9f6","🪢":"1faa2","👓":"1f453","🕶":"1f576","🥽":"1f97d","🥼":"1f97c","🦺":"1f9ba","👔":"1f454","👕":"1f455","👖":"1f456","🧣":"1f9e3","🧤":"1f9e4","🧥":"1f9e5","🧦":"1f9e6","👗":"1f457","👘":"1f458","🥻":"1f97b","🩱":"1fa71","🩲":"1fa72","🩳":"1fa73","👙":"1f459","👚":"1f45a","👛":"1f45b","👜":"1f45c","👝":"1f45d","🛍":"1f6cd","🎒":"1f392","🩴":"1fa74","👞":"1f45e","👟":"1f45f","🥾":"1f97e","🥿":"1f97f","👠":"1f460","👡":"1f461","🩰":"1fa70","👢":"1f462","👑":"1f451","👒":"1f452","🎩":"1f3a9","🎓":"1f393","🧢":"1f9e2","🪖":"1fa96","⛑":"26d1","📿":"1f4ff","💄":"1f484","💍":"1f48d","💎":"1f48e","🔇":"1f507","🔈":"1f508","🔉":"1f509","🔊":"1f50a","📢":"1f4e2","📣":"1f4e3","📯":"1f4ef","🔔":"1f514","🔕":"1f515","🎼":"1f3bc","🎵":"1f3b5","🎶":"1f3b6","🎙":"1f399","🎚":"1f39a","🎛":"1f39b","🎤":"1f3a4","🎧":"1f3a7","📻":"1f4fb","🎷":"1f3b7","🪗":"1fa97","🎸":"1f3b8","🎹":"1f3b9","🎺":"1f3ba","🎻":"1f3bb","🪕":"1fa95","🥁":"1f941","🪘":"1fa98","📱":"1f4f1","📲":"1f4f2","☎":"260e","📞":"1f4de","📟":"1f4df","📠":"1f4e0","🔋":"1f50b","🔌":"1f50c","💻":"1f4bb","🖥":"1f5a5","🖨":"1f5a8","⌨":"2328","🖱":"1f5b1","🖲":"1f5b2","💽":"1f4bd","💾":"1f4be","💿":"1f4bf","📀":"1f4c0","🧮":"1f9ee","🎥":"1f3a5","🎞":"1f39e","📽":"1f4fd","🎬":"1f3ac","📺":"1f4fa","📷":"1f4f7","📸":"1f4f8","📹":"1f4f9","📼":"1f4fc","🔍":"1f50d","🔎":"1f50e","🕯":"1f56f","💡":"1f4a1","🔦":"1f526","🏮":"1f3ee","🪔":"1fa94","📔":"1f4d4","📕":"1f4d5","📖":"1f4d6","📗":"1f4d7","📘":"1f4d8","📙":"1f4d9","📚":"1f4da","📓":"1f4d3","📒":"1f4d2","📃":"1f4c3","📜":"1f4dc","📄":"1f4c4","📰":"1f4f0","🗞":"1f5de","📑":"1f4d1","🔖":"1f516","🏷":"1f3f7","💰":"1f4b0","🪙":"1fa99","💴":"1f4b4","💵":"1f4b5","💶":"1f4b6","💷":"1f4b7","💸":"1f4b8","💳":"1f4b3","🧾":"1f9fe","💹":"1f4b9","✉":"2709","📧":"1f4e7","📨":"1f4e8","📩":"1f4e9","📤":"1f4e4","📥":"1f4e5","📦":"1f4e6","📫":"1f4eb","📪":"1f4ea","📬":"1f4ec","📭":"1f4ed","📮":"1f4ee","🗳":"1f5f3","✏":"270f","✒":"2712","🖋":"1f58b","🖊":"1f58a","🖌":"1f58c","🖍":"1f58d","📝":"1f4dd","💼":"1f4bc","📁":"1f4c1","📂":"1f4c2","🗂":"1f5c2","📅":"1f4c5","📆":"1f4c6","🗒":"1f5d2","🗓":"1f5d3","📇":"1f4c7","📈":"1f4c8","📉":"1f4c9","📊":"1f4ca","📋":"1f4cb","📌":"1f4cc","📍":"1f4cd","📎":"1f4ce","🖇":"1f587","📏":"1f4cf","📐":"1f4d0","✂":"2702","🗃":"1f5c3","🗄":"1f5c4","🗑":"1f5d1","🔒":"1f512","🔓":"1f513","🔏":"1f50f","🔐":"1f510","🔑":"1f511","🗝":"1f5dd","🔨":"1f528","🪓":"1fa93","⛏":"26cf","⚒":"2692","🛠":"1f6e0","🗡":"1f5e1","⚔":"2694","🔫":"1f52b","🪃":"1fa83","🏹":"1f3f9","🛡":"1f6e1","🪚":"1fa9a","🔧":"1f527","🪛":"1fa9b","🔩":"1f529","⚙":"2699","🗜":"1f5dc","⚖":"2696","🦯":"1f9af","🔗":"1f517","⛓":"26d3","🪝":"1fa9d","🧰":"1f9f0","🧲":"1f9f2","🪜":"1fa9c","⚗":"2697","🧪":"1f9ea","🧫":"1f9eb","🧬":"1f9ec","🔬":"1f52c","🔭":"1f52d","📡":"1f4e1","💉":"1f489","🩸":"1fa78","💊":"1f48a","🩹":"1fa79","🩺":"1fa7a","🚪":"1f6aa","🛗":"1f6d7","🪞":"1fa9e","🪟":"1fa9f","🛏":"1f6cf","🛋":"1f6cb","🪑":"1fa91","🚽":"1f6bd","🪠":"1faa0","🚿":"1f6bf","🛁":"1f6c1","🪤":"1faa4","🪒":"1fa92","🧴":"1f9f4","🧷":"1f9f7","🧹":"1f9f9","🧺":"1f9fa","🧻":"1f9fb","🪣":"1faa3","🧼":"1f9fc","🪥":"1faa5","🧽":"1f9fd","🧯":"1f9ef","🛒":"1f6d2","🚬":"1f6ac","⚰":"26b0","🪦":"1faa6","⚱":"26b1","🗿":"1f5ff","🪧":"1faa7","🏧":"1f3e7","🚮":"1f6ae","🚰":"1f6b0","♿":"267f","🚹":"1f6b9","🚺":"1f6ba","🚻":"1f6bb","🚼":"1f6bc","🚾":"1f6be","🛂":"1f6c2","🛃":"1f6c3","🛄":"1f6c4","🛅":"1f6c5","⚠":"26a0","🚸":"1f6b8","⛔":"26d4","🚫":"1f6ab","🚳":"1f6b3","🚭":"1f6ad","🚯":"1f6af","🚱":"1f6b1","🚷":"1f6b7","📵":"1f4f5","🔞":"1f51e","☢":"2622","☣":"2623","⬆":"2b06","↗":"2197","➡":"27a1","↘":"2198","⬇":"2b07","↙":"2199","⬅":"2b05","↖":"2196","↕":"2195","↔":"2194","↩":"21a9","↪":"21aa","⤴":"2934","⤵":"2935","🔃":"1f503","🔄":"1f504","🔙":"1f519","🔚":"1f51a","🔛":"1f51b","🔜":"1f51c","🔝":"1f51d","🛐":"1f6d0","⚛":"269b","🕉":"1f549","✡":"2721","☸":"2638","☯":"262f","✝":"271d","☦":"2626","☪":"262a","☮":"262e","🕎":"1f54e","🔯":"1f52f","♈":"2648","♉":"2649","♊":"264a","♋":"264b","♌":"264c","♍":"264d","♎":"264e","♏":"264f","♐":"2650","♑":"2651","♒":"2652","♓":"2653","⛎":"26ce","🔀":"1f500","🔁":"1f501","🔂":"1f502","▶":"25b6","⏩":"23e9","⏭":"23ed","⏯":"23ef","◀":"25c0","⏪":"23ea","⏮":"23ee","🔼":"1f53c","⏫":"23eb","🔽":"1f53d","⏬":"23ec","⏸":"23f8","⏹":"23f9","⏺":"23fa","⏏":"23cf","🎦":"1f3a6","🔅":"1f505","🔆":"1f506","📶":"1f4f6","📳":"1f4f3","📴":"1f4f4","♀":"2640","♂":"2642","⚧":"26a7","✖":"2716","➕":"2795","➖":"2796","➗":"2797","♾":"267e","‼":"203c","⁉":"2049","❓":"2753","❔":"2754","❕":"2755","❗":"2757","〰":"3030","💱":"1f4b1","💲":"1f4b2","⚕":"2695","♻":"267b","⚜":"269c","🔱":"1f531","📛":"1f4db","🔰":"1f530","⭕":"2b55","✅":"2705","☑":"2611","✔":"2714","❌":"274c","❎":"274e","➰":"27b0","➿":"27bf","〽":"303d","✳":"2733","✴":"2734","❇":"2747","©":"a9","®":"ae","™":"2122","🔟":"1f51f","🔠":"1f520","🔡":"1f521","🔢":"1f522","🔣":"1f523","🔤":"1f524","🅰":"1f170","🆎":"1f18e","🅱":"1f171","🆑":"1f191","🆒":"1f192","🆓":"1f193","ℹ":"2139","🆔":"1f194","Ⓜ":"24c2","🆕":"1f195","🆖":"1f196","🅾":"1f17e","🆗":"1f197","🅿":"1f17f","🆘":"1f198","🆙":"1f199","🆚":"1f19a","🈁":"1f201","🈂":"1f202","🈷":"1f237","🈶":"1f236","🈯":"1f22f","🉐":"1f250","🈹":"1f239","🈚":"1f21a","🈲":"1f232","🉑":"1f251","🈸":"1f238","🈴":"1f234","🈳":"1f233","㊗":"3297","㊙":"3299","🈺":"1f23a","🈵":"1f235","🔴":"1f534","🟠":"1f7e0","🟡":"1f7e1","🟢":"1f7e2","🔵":"1f535","🟣":"1f7e3","🟤":"1f7e4","⚫":"26ab","⚪":"26aa","🟥":"1f7e5","🟧":"1f7e7","🟨":"1f7e8","🟩":"1f7e9","🟦":"1f7e6","🟪":"1f7ea","🟫":"1f7eb","⬛":"2b1b","⬜":"2b1c","◼":"25fc","◻":"25fb","◾":"25fe","◽":"25fd","▪":"25aa","▫":"25ab","🔶":"1f536","🔷":"1f537","🔸":"1f538","🔹":"1f539","🔺":"1f53a","🔻":"1f53b","💠":"1f4a0","🔘":"1f518","🔳":"1f533","🔲":"1f532","🏁":"1f3c1","🚩":"1f6a9","🎌":"1f38c","🏴":"1f3f4","🏳":"1f3f3","☺️":"263a","☹️":"2639","☠️":"2620","❣️":"2763","❤️":"2764","🕳️":"1f573","🗨️":"1f5e8","🗯️":"1f5ef","👋🏻":"1f44b-1f3fb","👋🏼":"1f44b-1f3fc","👋🏽":"1f44b-1f3fd","👋🏾":"1f44b-1f3fe","👋🏿":"1f44b-1f3ff","🤚🏻":"1f91a-1f3fb","🤚🏼":"1f91a-1f3fc","🤚🏽":"1f91a-1f3fd","🤚🏾":"1f91a-1f3fe","🤚🏿":"1f91a-1f3ff","🖐️":"1f590","🖐🏻":"1f590-1f3fb","🖐🏼":"1f590-1f3fc","🖐🏽":"1f590-1f3fd","🖐🏾":"1f590-1f3fe","🖐🏿":"1f590-1f3ff","✋🏻":"270b-1f3fb","✋🏼":"270b-1f3fc","✋🏽":"270b-1f3fd","✋🏾":"270b-1f3fe","✋🏿":"270b-1f3ff","🖖🏻":"1f596-1f3fb","🖖🏼":"1f596-1f3fc","🖖🏽":"1f596-1f3fd","🖖🏾":"1f596-1f3fe","🖖🏿":"1f596-1f3ff","👌🏻":"1f44c-1f3fb","👌🏼":"1f44c-1f3fc","👌🏽":"1f44c-1f3fd","👌🏾":"1f44c-1f3fe","👌🏿":"1f44c-1f3ff","🤌🏻":"1f90c-1f3fb","🤌🏼":"1f90c-1f3fc","🤌🏽":"1f90c-1f3fd","🤌🏾":"1f90c-1f3fe","🤌🏿":"1f90c-1f3ff","🤏🏻":"1f90f-1f3fb","🤏🏼":"1f90f-1f3fc","🤏🏽":"1f90f-1f3fd","🤏🏾":"1f90f-1f3fe","🤏🏿":"1f90f-1f3ff","✌️":"270c","✌🏻":"270c-1f3fb","✌🏼":"270c-1f3fc","✌🏽":"270c-1f3fd","✌🏾":"270c-1f3fe","✌🏿":"270c-1f3ff","🤞🏻":"1f91e-1f3fb","🤞🏼":"1f91e-1f3fc","🤞🏽":"1f91e-1f3fd","🤞🏾":"1f91e-1f3fe","🤞🏿":"1f91e-1f3ff","🤟🏻":"1f91f-1f3fb","🤟🏼":"1f91f-1f3fc","🤟🏽":"1f91f-1f3fd","🤟🏾":"1f91f-1f3fe","🤟🏿":"1f91f-1f3ff","🤘🏻":"1f918-1f3fb","🤘🏼":"1f918-1f3fc","🤘🏽":"1f918-1f3fd","🤘🏾":"1f918-1f3fe","🤘🏿":"1f918-1f3ff","🤙🏻":"1f919-1f3fb","🤙🏼":"1f919-1f3fc","🤙🏽":"1f919-1f3fd","🤙🏾":"1f919-1f3fe","🤙🏿":"1f919-1f3ff","👈🏻":"1f448-1f3fb","👈🏼":"1f448-1f3fc","👈🏽":"1f448-1f3fd","👈🏾":"1f448-1f3fe","👈🏿":"1f448-1f3ff","👉🏻":"1f449-1f3fb","👉🏼":"1f449-1f3fc","👉🏽":"1f449-1f3fd","👉🏾":"1f449-1f3fe","👉🏿":"1f449-1f3ff","👆🏻":"1f446-1f3fb","👆🏼":"1f446-1f3fc","👆🏽":"1f446-1f3fd","👆🏾":"1f446-1f3fe","👆🏿":"1f446-1f3ff","🖕🏻":"1f595-1f3fb","🖕🏼":"1f595-1f3fc","🖕🏽":"1f595-1f3fd","🖕🏾":"1f595-1f3fe","🖕🏿":"1f595-1f3ff","👇🏻":"1f447-1f3fb","👇🏼":"1f447-1f3fc","👇🏽":"1f447-1f3fd","👇🏾":"1f447-1f3fe","👇🏿":"1f447-1f3ff","☝️":"261d","☝🏻":"261d-1f3fb","☝🏼":"261d-1f3fc","☝🏽":"261d-1f3fd","☝🏾":"261d-1f3fe","☝🏿":"261d-1f3ff","👍🏻":"1f44d-1f3fb","👍🏼":"1f44d-1f3fc","👍🏽":"1f44d-1f3fd","👍🏾":"1f44d-1f3fe","👍🏿":"1f44d-1f3ff","👎🏻":"1f44e-1f3fb","👎🏼":"1f44e-1f3fc","👎🏽":"1f44e-1f3fd","👎🏾":"1f44e-1f3fe","👎🏿":"1f44e-1f3ff","✊🏻":"270a-1f3fb","✊🏼":"270a-1f3fc","✊🏽":"270a-1f3fd","✊🏾":"270a-1f3fe","✊🏿":"270a-1f3ff","👊🏻":"1f44a-1f3fb","👊🏼":"1f44a-1f3fc","👊🏽":"1f44a-1f3fd","👊🏾":"1f44a-1f3fe","👊🏿":"1f44a-1f3ff","🤛🏻":"1f91b-1f3fb","🤛🏼":"1f91b-1f3fc","🤛🏽":"1f91b-1f3fd","🤛🏾":"1f91b-1f3fe","🤛🏿":"1f91b-1f3ff","🤜🏻":"1f91c-1f3fb","🤜🏼":"1f91c-1f3fc","🤜🏽":"1f91c-1f3fd","🤜🏾":"1f91c-1f3fe","🤜🏿":"1f91c-1f3ff","👏🏻":"1f44f-1f3fb","👏🏼":"1f44f-1f3fc","👏🏽":"1f44f-1f3fd","👏🏾":"1f44f-1f3fe","👏🏿":"1f44f-1f3ff","🙌🏻":"1f64c-1f3fb","🙌🏼":"1f64c-1f3fc","🙌🏽":"1f64c-1f3fd","🙌🏾":"1f64c-1f3fe","🙌🏿":"1f64c-1f3ff","👐🏻":"1f450-1f3fb","👐🏼":"1f450-1f3fc","👐🏽":"1f450-1f3fd","👐🏾":"1f450-1f3fe","👐🏿":"1f450-1f3ff","🤲🏻":"1f932-1f3fb","🤲🏼":"1f932-1f3fc","🤲🏽":"1f932-1f3fd","🤲🏾":"1f932-1f3fe","🤲🏿":"1f932-1f3ff","🙏🏻":"1f64f-1f3fb","🙏🏼":"1f64f-1f3fc","🙏🏽":"1f64f-1f3fd","🙏🏾":"1f64f-1f3fe","🙏🏿":"1f64f-1f3ff","✍️":"270d","✍🏻":"270d-1f3fb","✍🏼":"270d-1f3fc","✍🏽":"270d-1f3fd","✍🏾":"270d-1f3fe","✍🏿":"270d-1f3ff","💅🏻":"1f485-1f3fb","💅🏼":"1f485-1f3fc","💅🏽":"1f485-1f3fd","💅🏾":"1f485-1f3fe","💅🏿":"1f485-1f3ff","🤳🏻":"1f933-1f3fb","🤳🏼":"1f933-1f3fc","🤳🏽":"1f933-1f3fd","🤳🏾":"1f933-1f3fe","🤳🏿":"1f933-1f3ff","💪🏻":"1f4aa-1f3fb","💪🏼":"1f4aa-1f3fc","💪🏽":"1f4aa-1f3fd","💪🏾":"1f4aa-1f3fe","💪🏿":"1f4aa-1f3ff","🦵🏻":"1f9b5-1f3fb","🦵🏼":"1f9b5-1f3fc","🦵🏽":"1f9b5-1f3fd","🦵🏾":"1f9b5-1f3fe","🦵🏿":"1f9b5-1f3ff","🦶🏻":"1f9b6-1f3fb","🦶🏼":"1f9b6-1f3fc","🦶🏽":"1f9b6-1f3fd","🦶🏾":"1f9b6-1f3fe","🦶🏿":"1f9b6-1f3ff","👂🏻":"1f442-1f3fb","👂🏼":"1f442-1f3fc","👂🏽":"1f442-1f3fd","👂🏾":"1f442-1f3fe","👂🏿":"1f442-1f3ff","🦻🏻":"1f9bb-1f3fb","🦻🏼":"1f9bb-1f3fc","🦻🏽":"1f9bb-1f3fd","🦻🏾":"1f9bb-1f3fe","🦻🏿":"1f9bb-1f3ff","👃🏻":"1f443-1f3fb","👃🏼":"1f443-1f3fc","👃🏽":"1f443-1f3fd","👃🏾":"1f443-1f3fe","👃🏿":"1f443-1f3ff","👁️":"1f441","👶🏻":"1f476-1f3fb","👶🏼":"1f476-1f3fc","👶🏽":"1f476-1f3fd","👶🏾":"1f476-1f3fe","👶🏿":"1f476-1f3ff","🧒🏻":"1f9d2-1f3fb","🧒🏼":"1f9d2-1f3fc","🧒🏽":"1f9d2-1f3fd","🧒🏾":"1f9d2-1f3fe","🧒🏿":"1f9d2-1f3ff","👦🏻":"1f466-1f3fb","👦🏼":"1f466-1f3fc","👦🏽":"1f466-1f3fd","👦🏾":"1f466-1f3fe","👦🏿":"1f466-1f3ff","👧🏻":"1f467-1f3fb","👧🏼":"1f467-1f3fc","👧🏽":"1f467-1f3fd","👧🏾":"1f467-1f3fe","👧🏿":"1f467-1f3ff","🧑🏻":"1f9d1-1f3fb","🧑🏼":"1f9d1-1f3fc","🧑🏽":"1f9d1-1f3fd","🧑🏾":"1f9d1-1f3fe","🧑🏿":"1f9d1-1f3ff","👱🏻":"1f471-1f3fb","👱🏼":"1f471-1f3fc","👱🏽":"1f471-1f3fd","👱🏾":"1f471-1f3fe","👱🏿":"1f471-1f3ff","👨🏻":"1f468-1f3fb","👨🏼":"1f468-1f3fc","👨🏽":"1f468-1f3fd","👨🏾":"1f468-1f3fe","👨🏿":"1f468-1f3ff","🧔🏻":"1f9d4-1f3fb","🧔🏼":"1f9d4-1f3fc","🧔🏽":"1f9d4-1f3fd","🧔🏾":"1f9d4-1f3fe","🧔🏿":"1f9d4-1f3ff","👩🏻":"1f469-1f3fb","👩🏼":"1f469-1f3fc","👩🏽":"1f469-1f3fd","👩🏾":"1f469-1f3fe","👩🏿":"1f469-1f3ff","🧓🏻":"1f9d3-1f3fb","🧓🏼":"1f9d3-1f3fc","🧓🏽":"1f9d3-1f3fd","🧓🏾":"1f9d3-1f3fe","🧓🏿":"1f9d3-1f3ff","👴🏻":"1f474-1f3fb","👴🏼":"1f474-1f3fc","👴🏽":"1f474-1f3fd","👴🏾":"1f474-1f3fe","👴🏿":"1f474-1f3ff","👵🏻":"1f475-1f3fb","👵🏼":"1f475-1f3fc","👵🏽":"1f475-1f3fd","👵🏾":"1f475-1f3fe","👵🏿":"1f475-1f3ff","🙍🏻":"1f64d-1f3fb","🙍🏼":"1f64d-1f3fc","🙍🏽":"1f64d-1f3fd","🙍🏾":"1f64d-1f3fe","🙍🏿":"1f64d-1f3ff","🙎🏻":"1f64e-1f3fb","🙎🏼":"1f64e-1f3fc","🙎🏽":"1f64e-1f3fd","🙎🏾":"1f64e-1f3fe","🙎🏿":"1f64e-1f3ff","🙅🏻":"1f645-1f3fb","🙅🏼":"1f645-1f3fc","🙅🏽":"1f645-1f3fd","🙅🏾":"1f645-1f3fe","🙅🏿":"1f645-1f3ff","🙆🏻":"1f646-1f3fb","🙆🏼":"1f646-1f3fc","🙆🏽":"1f646-1f3fd","🙆🏾":"1f646-1f3fe","🙆🏿":"1f646-1f3ff","💁🏻":"1f481-1f3fb","💁🏼":"1f481-1f3fc","💁🏽":"1f481-1f3fd","💁🏾":"1f481-1f3fe","💁🏿":"1f481-1f3ff","🙋🏻":"1f64b-1f3fb","🙋🏼":"1f64b-1f3fc","🙋🏽":"1f64b-1f3fd","🙋🏾":"1f64b-1f3fe","🙋🏿":"1f64b-1f3ff","🧏🏻":"1f9cf-1f3fb","🧏🏼":"1f9cf-1f3fc","🧏🏽":"1f9cf-1f3fd","🧏🏾":"1f9cf-1f3fe","🧏🏿":"1f9cf-1f3ff","🙇🏻":"1f647-1f3fb","🙇🏼":"1f647-1f3fc","🙇🏽":"1f647-1f3fd","🙇🏾":"1f647-1f3fe","🙇🏿":"1f647-1f3ff","🤦🏻":"1f926-1f3fb","🤦🏼":"1f926-1f3fc","🤦🏽":"1f926-1f3fd","🤦🏾":"1f926-1f3fe","🤦🏿":"1f926-1f3ff","🤷🏻":"1f937-1f3fb","🤷🏼":"1f937-1f3fc","🤷🏽":"1f937-1f3fd","🤷🏾":"1f937-1f3fe","🤷🏿":"1f937-1f3ff","👮🏻":"1f46e-1f3fb","👮🏼":"1f46e-1f3fc","👮🏽":"1f46e-1f3fd","👮🏾":"1f46e-1f3fe","👮🏿":"1f46e-1f3ff","🕵️":"1f575","🕵🏻":"1f575-1f3fb","🕵🏼":"1f575-1f3fc","🕵🏽":"1f575-1f3fd","🕵🏾":"1f575-1f3fe","🕵🏿":"1f575-1f3ff","💂🏻":"1f482-1f3fb","💂🏼":"1f482-1f3fc","💂🏽":"1f482-1f3fd","💂🏾":"1f482-1f3fe","💂🏿":"1f482-1f3ff","🥷🏻":"1f977-1f3fb","🥷🏼":"1f977-1f3fc","🥷🏽":"1f977-1f3fd","🥷🏾":"1f977-1f3fe","🥷🏿":"1f977-1f3ff","👷🏻":"1f477-1f3fb","👷🏼":"1f477-1f3fc","👷🏽":"1f477-1f3fd","👷🏾":"1f477-1f3fe","👷🏿":"1f477-1f3ff","🤴🏻":"1f934-1f3fb","🤴🏼":"1f934-1f3fc","🤴🏽":"1f934-1f3fd","🤴🏾":"1f934-1f3fe","🤴🏿":"1f934-1f3ff","👸🏻":"1f478-1f3fb","👸🏼":"1f478-1f3fc","👸🏽":"1f478-1f3fd","👸🏾":"1f478-1f3fe","👸🏿":"1f478-1f3ff","👳🏻":"1f473-1f3fb","👳🏼":"1f473-1f3fc","👳🏽":"1f473-1f3fd","👳🏾":"1f473-1f3fe","👳🏿":"1f473-1f3ff","👲🏻":"1f472-1f3fb","👲🏼":"1f472-1f3fc","👲🏽":"1f472-1f3fd","👲🏾":"1f472-1f3fe","👲🏿":"1f472-1f3ff","🧕🏻":"1f9d5-1f3fb","🧕🏼":"1f9d5-1f3fc","🧕🏽":"1f9d5-1f3fd","🧕🏾":"1f9d5-1f3fe","🧕🏿":"1f9d5-1f3ff","🤵🏻":"1f935-1f3fb","🤵🏼":"1f935-1f3fc","🤵🏽":"1f935-1f3fd","🤵🏾":"1f935-1f3fe","🤵🏿":"1f935-1f3ff","👰🏻":"1f470-1f3fb","👰🏼":"1f470-1f3fc","👰🏽":"1f470-1f3fd","👰🏾":"1f470-1f3fe","👰🏿":"1f470-1f3ff","🤰🏻":"1f930-1f3fb","🤰🏼":"1f930-1f3fc","🤰🏽":"1f930-1f3fd","🤰🏾":"1f930-1f3fe","🤰🏿":"1f930-1f3ff","🤱🏻":"1f931-1f3fb","🤱🏼":"1f931-1f3fc","🤱🏽":"1f931-1f3fd","🤱🏾":"1f931-1f3fe","🤱🏿":"1f931-1f3ff","👼🏻":"1f47c-1f3fb","👼🏼":"1f47c-1f3fc","👼🏽":"1f47c-1f3fd","👼🏾":"1f47c-1f3fe","👼🏿":"1f47c-1f3ff","🎅🏻":"1f385-1f3fb","🎅🏼":"1f385-1f3fc","🎅🏽":"1f385-1f3fd","🎅🏾":"1f385-1f3fe","🎅🏿":"1f385-1f3ff","🤶🏻":"1f936-1f3fb","🤶🏼":"1f936-1f3fc","🤶🏽":"1f936-1f3fd","🤶🏾":"1f936-1f3fe","🤶🏿":"1f936-1f3ff","🦸🏻":"1f9b8-1f3fb","🦸🏼":"1f9b8-1f3fc","🦸🏽":"1f9b8-1f3fd","🦸🏾":"1f9b8-1f3fe","🦸🏿":"1f9b8-1f3ff","🦹🏻":"1f9b9-1f3fb","🦹🏼":"1f9b9-1f3fc","🦹🏽":"1f9b9-1f3fd","🦹🏾":"1f9b9-1f3fe","🦹🏿":"1f9b9-1f3ff","🧙🏻":"1f9d9-1f3fb","🧙🏼":"1f9d9-1f3fc","🧙🏽":"1f9d9-1f3fd","🧙🏾":"1f9d9-1f3fe","🧙🏿":"1f9d9-1f3ff","🧚🏻":"1f9da-1f3fb","🧚🏼":"1f9da-1f3fc","🧚🏽":"1f9da-1f3fd","🧚🏾":"1f9da-1f3fe","🧚🏿":"1f9da-1f3ff","🧛🏻":"1f9db-1f3fb","🧛🏼":"1f9db-1f3fc","🧛🏽":"1f9db-1f3fd","🧛🏾":"1f9db-1f3fe","🧛🏿":"1f9db-1f3ff","🧜🏻":"1f9dc-1f3fb","🧜🏼":"1f9dc-1f3fc","🧜🏽":"1f9dc-1f3fd","🧜🏾":"1f9dc-1f3fe","🧜🏿":"1f9dc-1f3ff","🧝🏻":"1f9dd-1f3fb","🧝🏼":"1f9dd-1f3fc","🧝🏽":"1f9dd-1f3fd","🧝🏾":"1f9dd-1f3fe","🧝🏿":"1f9dd-1f3ff","💆🏻":"1f486-1f3fb","💆🏼":"1f486-1f3fc","💆🏽":"1f486-1f3fd","💆🏾":"1f486-1f3fe","💆🏿":"1f486-1f3ff","💇🏻":"1f487-1f3fb","💇🏼":"1f487-1f3fc","💇🏽":"1f487-1f3fd","💇🏾":"1f487-1f3fe","💇🏿":"1f487-1f3ff","🚶🏻":"1f6b6-1f3fb","🚶🏼":"1f6b6-1f3fc","🚶🏽":"1f6b6-1f3fd","🚶🏾":"1f6b6-1f3fe","🚶🏿":"1f6b6-1f3ff","🧍🏻":"1f9cd-1f3fb","🧍🏼":"1f9cd-1f3fc","🧍🏽":"1f9cd-1f3fd","🧍🏾":"1f9cd-1f3fe","🧍🏿":"1f9cd-1f3ff","🧎🏻":"1f9ce-1f3fb","🧎🏼":"1f9ce-1f3fc","🧎🏽":"1f9ce-1f3fd","🧎🏾":"1f9ce-1f3fe","🧎🏿":"1f9ce-1f3ff","🏃🏻":"1f3c3-1f3fb","🏃🏼":"1f3c3-1f3fc","🏃🏽":"1f3c3-1f3fd","🏃🏾":"1f3c3-1f3fe","🏃🏿":"1f3c3-1f3ff","💃🏻":"1f483-1f3fb","💃🏼":"1f483-1f3fc","💃🏽":"1f483-1f3fd","💃🏾":"1f483-1f3fe","💃🏿":"1f483-1f3ff","🕺🏻":"1f57a-1f3fb","🕺🏼":"1f57a-1f3fc","🕺🏽":"1f57a-1f3fd","🕺🏾":"1f57a-1f3fe","🕺🏿":"1f57a-1f3ff","🕴️":"1f574","🕴🏻":"1f574-1f3fb","🕴🏼":"1f574-1f3fc","🕴🏽":"1f574-1f3fd","🕴🏾":"1f574-1f3fe","🕴🏿":"1f574-1f3ff","🧖🏻":"1f9d6-1f3fb","🧖🏼":"1f9d6-1f3fc","🧖🏽":"1f9d6-1f3fd","🧖🏾":"1f9d6-1f3fe","🧖🏿":"1f9d6-1f3ff","🧗🏻":"1f9d7-1f3fb","🧗🏼":"1f9d7-1f3fc","🧗🏽":"1f9d7-1f3fd","🧗🏾":"1f9d7-1f3fe","🧗🏿":"1f9d7-1f3ff","🏇🏻":"1f3c7-1f3fb","🏇🏼":"1f3c7-1f3fc","🏇🏽":"1f3c7-1f3fd","🏇🏾":"1f3c7-1f3fe","🏇🏿":"1f3c7-1f3ff","⛷️":"26f7","🏂🏻":"1f3c2-1f3fb","🏂🏼":"1f3c2-1f3fc","🏂🏽":"1f3c2-1f3fd","🏂🏾":"1f3c2-1f3fe","🏂🏿":"1f3c2-1f3ff","🏌️":"1f3cc","🏌🏻":"1f3cc-1f3fb","🏌🏼":"1f3cc-1f3fc","🏌🏽":"1f3cc-1f3fd","🏌🏾":"1f3cc-1f3fe","🏌🏿":"1f3cc-1f3ff","🏄🏻":"1f3c4-1f3fb","🏄🏼":"1f3c4-1f3fc","🏄🏽":"1f3c4-1f3fd","🏄🏾":"1f3c4-1f3fe","🏄🏿":"1f3c4-1f3ff","🚣🏻":"1f6a3-1f3fb","🚣🏼":"1f6a3-1f3fc","🚣🏽":"1f6a3-1f3fd","🚣🏾":"1f6a3-1f3fe","🚣🏿":"1f6a3-1f3ff","🏊🏻":"1f3ca-1f3fb","🏊🏼":"1f3ca-1f3fc","🏊🏽":"1f3ca-1f3fd","🏊🏾":"1f3ca-1f3fe","🏊🏿":"1f3ca-1f3ff","⛹️":"26f9","⛹🏻":"26f9-1f3fb","⛹🏼":"26f9-1f3fc","⛹🏽":"26f9-1f3fd","⛹🏾":"26f9-1f3fe","⛹🏿":"26f9-1f3ff","🏋️":"1f3cb","🏋🏻":"1f3cb-1f3fb","🏋🏼":"1f3cb-1f3fc","🏋🏽":"1f3cb-1f3fd","🏋🏾":"1f3cb-1f3fe","🏋🏿":"1f3cb-1f3ff","🚴🏻":"1f6b4-1f3fb","🚴🏼":"1f6b4-1f3fc","🚴🏽":"1f6b4-1f3fd","🚴🏾":"1f6b4-1f3fe","🚴🏿":"1f6b4-1f3ff","🚵🏻":"1f6b5-1f3fb","🚵🏼":"1f6b5-1f3fc","🚵🏽":"1f6b5-1f3fd","🚵🏾":"1f6b5-1f3fe","🚵🏿":"1f6b5-1f3ff","🤸🏻":"1f938-1f3fb","🤸🏼":"1f938-1f3fc","🤸🏽":"1f938-1f3fd","🤸🏾":"1f938-1f3fe","🤸🏿":"1f938-1f3ff","🤽🏻":"1f93d-1f3fb","🤽🏼":"1f93d-1f3fc","🤽🏽":"1f93d-1f3fd","🤽🏾":"1f93d-1f3fe","🤽🏿":"1f93d-1f3ff","🤾🏻":"1f93e-1f3fb","🤾🏼":"1f93e-1f3fc","🤾🏽":"1f93e-1f3fd","🤾🏾":"1f93e-1f3fe","🤾🏿":"1f93e-1f3ff","🤹🏻":"1f939-1f3fb","🤹🏼":"1f939-1f3fc","🤹🏽":"1f939-1f3fd","🤹🏾":"1f939-1f3fe","🤹🏿":"1f939-1f3ff","🧘🏻":"1f9d8-1f3fb","🧘🏼":"1f9d8-1f3fc","🧘🏽":"1f9d8-1f3fd","🧘🏾":"1f9d8-1f3fe","🧘🏿":"1f9d8-1f3ff","🛀🏻":"1f6c0-1f3fb","🛀🏼":"1f6c0-1f3fc","🛀🏽":"1f6c0-1f3fd","🛀🏾":"1f6c0-1f3fe","🛀🏿":"1f6c0-1f3ff","🛌🏻":"1f6cc-1f3fb","🛌🏼":"1f6cc-1f3fc","🛌🏽":"1f6cc-1f3fd","🛌🏾":"1f6cc-1f3fe","🛌🏿":"1f6cc-1f3ff","👭🏻":"1f46d-1f3fb","👭🏼":"1f46d-1f3fc","👭🏽":"1f46d-1f3fd","👭🏾":"1f46d-1f3fe","👭🏿":"1f46d-1f3ff","👫🏻":"1f46b-1f3fb","👫🏼":"1f46b-1f3fc","👫🏽":"1f46b-1f3fd","👫🏾":"1f46b-1f3fe","👫🏿":"1f46b-1f3ff","👬🏻":"1f46c-1f3fb","👬🏼":"1f46c-1f3fc","👬🏽":"1f46c-1f3fd","👬🏾":"1f46c-1f3fe","👬🏿":"1f46c-1f3ff","💏🏻":"1f48f-1f3fb","💏🏼":"1f48f-1f3fc","💏🏽":"1f48f-1f3fd","💏🏾":"1f48f-1f3fe","💏🏿":"1f48f-1f3ff","💑🏻":"1f491-1f3fb","💑🏼":"1f491-1f3fc","💑🏽":"1f491-1f3fd","💑🏾":"1f491-1f3fe","💑🏿":"1f491-1f3ff","🗣️":"1f5e3","🐿️":"1f43f","🕊️":"1f54a","🕷️":"1f577","🕸️":"1f578","🏵️":"1f3f5","☘️":"2618","🌶️":"1f336","🍽️":"1f37d","🗺️":"1f5fa","🏔️":"1f3d4","⛰️":"26f0","🏕️":"1f3d5","🏖️":"1f3d6","🏜️":"1f3dc","🏝️":"1f3dd","🏞️":"1f3de","🏟️":"1f3df","🏛️":"1f3db","🏗️":"1f3d7","🏘️":"1f3d8","🏚️":"1f3da","⛩️":"26e9","🏙️":"1f3d9","♨️":"2668","🏎️":"1f3ce","🏍️":"1f3cd","🛣️":"1f6e3","🛤️":"1f6e4","🛢️":"1f6e2","🛳️":"1f6f3","⛴️":"26f4","🛥️":"1f6e5","✈️":"2708","🛩️":"1f6e9","🛰️":"1f6f0","🛎️":"1f6ce","⏱️":"23f1","⏲️":"23f2","🕰️":"1f570","🌡️":"1f321","☀️":"2600","☁️":"2601","⛈️":"26c8","🌤️":"1f324","🌥️":"1f325","🌦️":"1f326","🌧️":"1f327","🌨️":"1f328","🌩️":"1f329","🌪️":"1f32a","🌫️":"1f32b","🌬️":"1f32c","☂️":"2602","⛱️":"26f1","❄️":"2744","☃️":"2603","☄️":"2604","🎗️":"1f397","🎟️":"1f39f","🎖️":"1f396","⛸️":"26f8","🕹️":"1f579","♠️":"2660","♥️":"2665","♦️":"2666","♣️":"2663","♟️":"265f","🖼️":"1f5bc","🕶️":"1f576","🛍️":"1f6cd","⛑️":"26d1","🎙️":"1f399","🎚️":"1f39a","🎛️":"1f39b","☎️":"260e","🖥️":"1f5a5","🖨️":"1f5a8","⌨️":"2328","🖱️":"1f5b1","🖲️":"1f5b2","🎞️":"1f39e","📽️":"1f4fd","🕯️":"1f56f","🗞️":"1f5de","🏷️":"1f3f7","✉️":"2709","🗳️":"1f5f3","✏️":"270f","✒️":"2712","🖋️":"1f58b","🖊️":"1f58a","🖌️":"1f58c","🖍️":"1f58d","🗂️":"1f5c2","🗒️":"1f5d2","🗓️":"1f5d3","🖇️":"1f587","✂️":"2702","🗃️":"1f5c3","🗄️":"1f5c4","🗑️":"1f5d1","🗝️":"1f5dd","⛏️":"26cf","⚒️":"2692","🛠️":"1f6e0","🗡️":"1f5e1","⚔️":"2694","🛡️":"1f6e1","⚙️":"2699","🗜️":"1f5dc","⚖️":"2696","⛓️":"26d3","⚗️":"2697","🛏️":"1f6cf","🛋️":"1f6cb","⚰️":"26b0","⚱️":"26b1","⚠️":"26a0","☢️":"2622","☣️":"2623","⬆️":"2b06","↗️":"2197","➡️":"27a1","↘️":"2198","⬇️":"2b07","↙️":"2199","⬅️":"2b05","↖️":"2196","↕️":"2195","↔️":"2194","↩️":"21a9","↪️":"21aa","⤴️":"2934","⤵️":"2935","⚛️":"269b","🕉️":"1f549","✡️":"2721","☸️":"2638","☯️":"262f","✝️":"271d","☦️":"2626","☪️":"262a","☮️":"262e","▶️":"25b6","⏭️":"23ed","⏯️":"23ef","◀️":"25c0","⏮️":"23ee","⏸️":"23f8","⏹️":"23f9","⏺️":"23fa","⏏️":"23cf","♀️":"2640","♂️":"2642","⚧️":"26a7","✖️":"2716","♾️":"267e","‼️":"203c","⁉️":"2049","〰️":"3030","⚕️":"2695","♻️":"267b","⚜️":"269c","☑️":"2611","✔️":"2714","〽️":"303d","✳️":"2733","✴️":"2734","❇️":"2747","©️":"a9","®️":"ae","™️":"2122","#⃣":"23-20e3","*⃣":"2a-20e3","0⃣":"30-20e3","1⃣":"31-20e3","2⃣":"32-20e3","3⃣":"33-20e3","4⃣":"34-20e3","5⃣":"35-20e3","6⃣":"36-20e3","7⃣":"37-20e3","8⃣":"38-20e3","9⃣":"39-20e3","🅰️":"1f170","🅱️":"1f171","ℹ️":"2139","Ⓜ️":"24c2","🅾️":"1f17e","🅿️":"1f17f","🈂️":"1f202","🈷️":"1f237","㊗️":"3297","㊙️":"3299","◼️":"25fc","◻️":"25fb","▪️":"25aa","▫️":"25ab","🏳️":"1f3f3","🇦🇨":"1f1e6-1f1e8","🇦🇩":"1f1e6-1f1e9","🇦🇪":"1f1e6-1f1ea","🇦🇫":"1f1e6-1f1eb","🇦🇬":"1f1e6-1f1ec","🇦🇮":"1f1e6-1f1ee","🇦🇱":"1f1e6-1f1f1","🇦🇲":"1f1e6-1f1f2","🇦🇴":"1f1e6-1f1f4","🇦🇶":"1f1e6-1f1f6","🇦🇷":"1f1e6-1f1f7","🇦🇸":"1f1e6-1f1f8","🇦🇹":"1f1e6-1f1f9","🇦🇺":"1f1e6-1f1fa","🇦🇼":"1f1e6-1f1fc","🇦🇽":"1f1e6-1f1fd","🇦🇿":"1f1e6-1f1ff","🇧🇦":"1f1e7-1f1e6","🇧🇧":"1f1e7-1f1e7","🇧🇩":"1f1e7-1f1e9","🇧🇪":"1f1e7-1f1ea","🇧🇫":"1f1e7-1f1eb","🇧🇬":"1f1e7-1f1ec","🇧🇭":"1f1e7-1f1ed","🇧🇮":"1f1e7-1f1ee","🇧🇯":"1f1e7-1f1ef","🇧🇱":"1f1e7-1f1f1","🇧🇲":"1f1e7-1f1f2","🇧🇳":"1f1e7-1f1f3","🇧🇴":"1f1e7-1f1f4","🇧🇶":"1f1e7-1f1f6","🇧🇷":"1f1e7-1f1f7","🇧🇸":"1f1e7-1f1f8","🇧🇹":"1f1e7-1f1f9","🇧🇻":"1f1e7-1f1fb","🇧🇼":"1f1e7-1f1fc","🇧🇾":"1f1e7-1f1fe","🇧🇿":"1f1e7-1f1ff","🇨🇦":"1f1e8-1f1e6","🇨🇨":"1f1e8-1f1e8","🇨🇩":"1f1e8-1f1e9","🇨🇫":"1f1e8-1f1eb","🇨🇬":"1f1e8-1f1ec","🇨🇭":"1f1e8-1f1ed","🇨🇮":"1f1e8-1f1ee","🇨🇰":"1f1e8-1f1f0","🇨🇱":"1f1e8-1f1f1","🇨🇲":"1f1e8-1f1f2","🇨🇳":"1f1e8-1f1f3","🇨🇴":"1f1e8-1f1f4","🇨🇵":"1f1e8-1f1f5","🇨🇷":"1f1e8-1f1f7","🇨🇺":"1f1e8-1f1fa","🇨🇻":"1f1e8-1f1fb","🇨🇼":"1f1e8-1f1fc","🇨🇽":"1f1e8-1f1fd","🇨🇾":"1f1e8-1f1fe","🇨🇿":"1f1e8-1f1ff","🇩🇪":"1f1e9-1f1ea","🇩🇬":"1f1e9-1f1ec","🇩🇯":"1f1e9-1f1ef","🇩🇰":"1f1e9-1f1f0","🇩🇲":"1f1e9-1f1f2","🇩🇴":"1f1e9-1f1f4","🇩🇿":"1f1e9-1f1ff","🇪🇦":"1f1ea-1f1e6","🇪🇨":"1f1ea-1f1e8","🇪🇪":"1f1ea-1f1ea","🇪🇬":"1f1ea-1f1ec","🇪🇭":"1f1ea-1f1ed","🇪🇷":"1f1ea-1f1f7","🇪🇸":"1f1ea-1f1f8","🇪🇹":"1f1ea-1f1f9","🇪🇺":"1f1ea-1f1fa","🇫🇮":"1f1eb-1f1ee","🇫🇯":"1f1eb-1f1ef","🇫🇰":"1f1eb-1f1f0","🇫🇲":"1f1eb-1f1f2","🇫🇴":"1f1eb-1f1f4","🇫🇷":"1f1eb-1f1f7","🇬🇦":"1f1ec-1f1e6","🇬🇧":"1f1ec-1f1e7","🇬🇩":"1f1ec-1f1e9","🇬🇪":"1f1ec-1f1ea","🇬🇫":"1f1ec-1f1eb","🇬🇬":"1f1ec-1f1ec","🇬🇭":"1f1ec-1f1ed","🇬🇮":"1f1ec-1f1ee","🇬🇱":"1f1ec-1f1f1","🇬🇲":"1f1ec-1f1f2","🇬🇳":"1f1ec-1f1f3","🇬🇵":"1f1ec-1f1f5","🇬🇶":"1f1ec-1f1f6","🇬🇷":"1f1ec-1f1f7","🇬🇸":"1f1ec-1f1f8","🇬🇹":"1f1ec-1f1f9","🇬🇺":"1f1ec-1f1fa","🇬🇼":"1f1ec-1f1fc","🇬🇾":"1f1ec-1f1fe","🇭🇰":"1f1ed-1f1f0","🇭🇲":"1f1ed-1f1f2","🇭🇳":"1f1ed-1f1f3","🇭🇷":"1f1ed-1f1f7","🇭🇹":"1f1ed-1f1f9","🇭🇺":"1f1ed-1f1fa","🇮🇨":"1f1ee-1f1e8","🇮🇩":"1f1ee-1f1e9","🇮🇪":"1f1ee-1f1ea","🇮🇱":"1f1ee-1f1f1","🇮🇲":"1f1ee-1f1f2","🇮🇳":"1f1ee-1f1f3","🇮🇴":"1f1ee-1f1f4","🇮🇶":"1f1ee-1f1f6","🇮🇷":"1f1ee-1f1f7","🇮🇸":"1f1ee-1f1f8","🇮🇹":"1f1ee-1f1f9","🇯🇪":"1f1ef-1f1ea","🇯🇲":"1f1ef-1f1f2","🇯🇴":"1f1ef-1f1f4","🇯🇵":"1f1ef-1f1f5","🇰🇪":"1f1f0-1f1ea","🇰🇬":"1f1f0-1f1ec","🇰🇭":"1f1f0-1f1ed","🇰🇮":"1f1f0-1f1ee","🇰🇲":"1f1f0-1f1f2","🇰🇳":"1f1f0-1f1f3","🇰🇵":"1f1f0-1f1f5","🇰🇷":"1f1f0-1f1f7","🇰🇼":"1f1f0-1f1fc","🇰🇾":"1f1f0-1f1fe","🇰🇿":"1f1f0-1f1ff","🇱🇦":"1f1f1-1f1e6","🇱🇧":"1f1f1-1f1e7","🇱🇨":"1f1f1-1f1e8","🇱🇮":"1f1f1-1f1ee","🇱🇰":"1f1f1-1f1f0","🇱🇷":"1f1f1-1f1f7","🇱🇸":"1f1f1-1f1f8","🇱🇹":"1f1f1-1f1f9","🇱🇺":"1f1f1-1f1fa","🇱🇻":"1f1f1-1f1fb","🇱🇾":"1f1f1-1f1fe","🇲🇦":"1f1f2-1f1e6","🇲🇨":"1f1f2-1f1e8","🇲🇩":"1f1f2-1f1e9","🇲🇪":"1f1f2-1f1ea","🇲🇫":"1f1f2-1f1eb","🇲🇬":"1f1f2-1f1ec","🇲🇭":"1f1f2-1f1ed","🇲🇰":"1f1f2-1f1f0","🇲🇱":"1f1f2-1f1f1","🇲🇲":"1f1f2-1f1f2","🇲🇳":"1f1f2-1f1f3","🇲🇴":"1f1f2-1f1f4","🇲🇵":"1f1f2-1f1f5","🇲🇶":"1f1f2-1f1f6","🇲🇷":"1f1f2-1f1f7","🇲🇸":"1f1f2-1f1f8","🇲🇹":"1f1f2-1f1f9","🇲🇺":"1f1f2-1f1fa","🇲🇻":"1f1f2-1f1fb","🇲🇼":"1f1f2-1f1fc","🇲🇽":"1f1f2-1f1fd","🇲🇾":"1f1f2-1f1fe","🇲🇿":"1f1f2-1f1ff","🇳🇦":"1f1f3-1f1e6","🇳🇨":"1f1f3-1f1e8","🇳🇪":"1f1f3-1f1ea","🇳🇫":"1f1f3-1f1eb","🇳🇬":"1f1f3-1f1ec","🇳🇮":"1f1f3-1f1ee","🇳🇱":"1f1f3-1f1f1","🇳🇴":"1f1f3-1f1f4","🇳🇵":"1f1f3-1f1f5","🇳🇷":"1f1f3-1f1f7","🇳🇺":"1f1f3-1f1fa","🇳🇿":"1f1f3-1f1ff","🇴🇲":"1f1f4-1f1f2","🇵🇦":"1f1f5-1f1e6","🇵🇪":"1f1f5-1f1ea","🇵🇫":"1f1f5-1f1eb","🇵🇬":"1f1f5-1f1ec","🇵🇭":"1f1f5-1f1ed","🇵🇰":"1f1f5-1f1f0","🇵🇱":"1f1f5-1f1f1","🇵🇲":"1f1f5-1f1f2","🇵🇳":"1f1f5-1f1f3","🇵🇷":"1f1f5-1f1f7","🇵🇸":"1f1f5-1f1f8","🇵🇹":"1f1f5-1f1f9","🇵🇼":"1f1f5-1f1fc","🇵🇾":"1f1f5-1f1fe","🇶🇦":"1f1f6-1f1e6","🇷🇪":"1f1f7-1f1ea","🇷🇴":"1f1f7-1f1f4","🇷🇸":"1f1f7-1f1f8","🇷🇺":"1f1f7-1f1fa","🇷🇼":"1f1f7-1f1fc","🇸🇦":"1f1f8-1f1e6","🇸🇧":"1f1f8-1f1e7","🇸🇨":"1f1f8-1f1e8","🇸🇩":"1f1f8-1f1e9","🇸🇪":"1f1f8-1f1ea","🇸🇬":"1f1f8-1f1ec","🇸🇭":"1f1f8-1f1ed","🇸🇮":"1f1f8-1f1ee","🇸🇯":"1f1f8-1f1ef","🇸🇰":"1f1f8-1f1f0","🇸🇱":"1f1f8-1f1f1","🇸🇲":"1f1f8-1f1f2","🇸🇳":"1f1f8-1f1f3","🇸🇴":"1f1f8-1f1f4","🇸🇷":"1f1f8-1f1f7","🇸🇸":"1f1f8-1f1f8","🇸🇹":"1f1f8-1f1f9","🇸🇻":"1f1f8-1f1fb","🇸🇽":"1f1f8-1f1fd","🇸🇾":"1f1f8-1f1fe","🇸🇿":"1f1f8-1f1ff","🇹🇦":"1f1f9-1f1e6","🇹🇨":"1f1f9-1f1e8","🇹🇩":"1f1f9-1f1e9","🇹🇫":"1f1f9-1f1eb","🇹🇬":"1f1f9-1f1ec","🇹🇭":"1f1f9-1f1ed","🇹🇯":"1f1f9-1f1ef","🇹🇰":"1f1f9-1f1f0","🇹🇱":"1f1f9-1f1f1","🇹🇲":"1f1f9-1f1f2","🇹🇳":"1f1f9-1f1f3","🇹🇴":"1f1f9-1f1f4","🇹🇷":"1f1f9-1f1f7","🇹🇹":"1f1f9-1f1f9","🇹🇻":"1f1f9-1f1fb","🇹🇼":"1f1f9-1f1fc","🇹🇿":"1f1f9-1f1ff","🇺🇦":"1f1fa-1f1e6","🇺🇬":"1f1fa-1f1ec","🇺🇲":"1f1fa-1f1f2","🇺🇳":"1f1fa-1f1f3","🇺🇸":"1f1fa-1f1f8","🇺🇾":"1f1fa-1f1fe","🇺🇿":"1f1fa-1f1ff","🇻🇦":"1f1fb-1f1e6","🇻🇨":"1f1fb-1f1e8","🇻🇪":"1f1fb-1f1ea","🇻🇬":"1f1fb-1f1ec","🇻🇮":"1f1fb-1f1ee","🇻🇳":"1f1fb-1f1f3","🇻🇺":"1f1fb-1f1fa","🇼🇫":"1f1fc-1f1eb","🇼🇸":"1f1fc-1f1f8","🇽🇰":"1f1fd-1f1f0","🇾🇪":"1f1fe-1f1ea","🇾🇹":"1f1fe-1f1f9","🇿🇦":"1f1ff-1f1e6","🇿🇲":"1f1ff-1f1f2","🇿🇼":"1f1ff-1f1fc","😶‍🌫":"1f636-200d-1f32b-fe0f","😮‍💨":"1f62e-200d-1f4a8","😵‍💫":"1f635-200d-1f4ab","❤‍🔥":"2764-fe0f-200d-1f525","❤‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨":"1f441-200d-1f5e8","🧔‍♂":"1f9d4-200d-2642-fe0f","🧔‍♀":"1f9d4-200d-2640-fe0f","👨‍🦰":"1f468-200d-1f9b0","👨‍🦱":"1f468-200d-1f9b1","👨‍🦳":"1f468-200d-1f9b3","👨‍🦲":"1f468-200d-1f9b2","👩‍🦰":"1f469-200d-1f9b0","🧑‍🦰":"1f9d1-200d-1f9b0","👩‍🦱":"1f469-200d-1f9b1","🧑‍🦱":"1f9d1-200d-1f9b1","👩‍🦳":"1f469-200d-1f9b3","🧑‍🦳":"1f9d1-200d-1f9b3","👩‍🦲":"1f469-200d-1f9b2","🧑‍🦲":"1f9d1-200d-1f9b2","👱‍♀":"1f471-200d-2640-fe0f","👱‍♂":"1f471-200d-2642-fe0f","🙍‍♂":"1f64d-200d-2642-fe0f","🙍‍♀":"1f64d-200d-2640-fe0f","🙎‍♂":"1f64e-200d-2642-fe0f","🙎‍♀":"1f64e-200d-2640-fe0f","🙅‍♂":"1f645-200d-2642-fe0f","🙅‍♀":"1f645-200d-2640-fe0f","🙆‍♂":"1f646-200d-2642-fe0f","🙆‍♀":"1f646-200d-2640-fe0f","💁‍♂":"1f481-200d-2642-fe0f","💁‍♀":"1f481-200d-2640-fe0f","🙋‍♂":"1f64b-200d-2642-fe0f","🙋‍♀":"1f64b-200d-2640-fe0f","🧏‍♂":"1f9cf-200d-2642-fe0f","🧏‍♀":"1f9cf-200d-2640-fe0f","🙇‍♂":"1f647-200d-2642-fe0f","🙇‍♀":"1f647-200d-2640-fe0f","🤦‍♂":"1f926-200d-2642-fe0f","🤦‍♀":"1f926-200d-2640-fe0f","🤷‍♂":"1f937-200d-2642-fe0f","🤷‍♀":"1f937-200d-2640-fe0f","🧑‍⚕":"1f9d1-200d-2695-fe0f","👨‍⚕":"1f468-200d-2695-fe0f","👩‍⚕":"1f469-200d-2695-fe0f","🧑‍🎓":"1f9d1-200d-1f393","👨‍🎓":"1f468-200d-1f393","👩‍🎓":"1f469-200d-1f393","🧑‍🏫":"1f9d1-200d-1f3eb","👨‍🏫":"1f468-200d-1f3eb","👩‍🏫":"1f469-200d-1f3eb","🧑‍⚖":"1f9d1-200d-2696-fe0f","👨‍⚖":"1f468-200d-2696-fe0f","👩‍⚖":"1f469-200d-2696-fe0f","🧑‍🌾":"1f9d1-200d-1f33e","👨‍🌾":"1f468-200d-1f33e","👩‍🌾":"1f469-200d-1f33e","🧑‍🍳":"1f9d1-200d-1f373","👨‍🍳":"1f468-200d-1f373","👩‍🍳":"1f469-200d-1f373","🧑‍🔧":"1f9d1-200d-1f527","👨‍🔧":"1f468-200d-1f527","👩‍🔧":"1f469-200d-1f527","🧑‍🏭":"1f9d1-200d-1f3ed","👨‍🏭":"1f468-200d-1f3ed","👩‍🏭":"1f469-200d-1f3ed","🧑‍💼":"1f9d1-200d-1f4bc","👨‍💼":"1f468-200d-1f4bc","👩‍💼":"1f469-200d-1f4bc","🧑‍🔬":"1f9d1-200d-1f52c","👨‍🔬":"1f468-200d-1f52c","👩‍🔬":"1f469-200d-1f52c","🧑‍💻":"1f9d1-200d-1f4bb","👨‍💻":"1f468-200d-1f4bb","👩‍💻":"1f469-200d-1f4bb","🧑‍🎤":"1f9d1-200d-1f3a4","👨‍🎤":"1f468-200d-1f3a4","👩‍🎤":"1f469-200d-1f3a4","🧑‍🎨":"1f9d1-200d-1f3a8","👨‍🎨":"1f468-200d-1f3a8","👩‍🎨":"1f469-200d-1f3a8","🧑‍✈":"1f9d1-200d-2708-fe0f","👨‍✈":"1f468-200d-2708-fe0f","👩‍✈":"1f469-200d-2708-fe0f","🧑‍🚀":"1f9d1-200d-1f680","👨‍🚀":"1f468-200d-1f680","👩‍🚀":"1f469-200d-1f680","🧑‍🚒":"1f9d1-200d-1f692","👨‍🚒":"1f468-200d-1f692","👩‍🚒":"1f469-200d-1f692","👮‍♂":"1f46e-200d-2642-fe0f","👮‍♀":"1f46e-200d-2640-fe0f","🕵‍♂":"1f575-fe0f-200d-2642-fe0f","🕵‍♀":"1f575-fe0f-200d-2640-fe0f","💂‍♂":"1f482-200d-2642-fe0f","💂‍♀":"1f482-200d-2640-fe0f","👷‍♂":"1f477-200d-2642-fe0f","👷‍♀":"1f477-200d-2640-fe0f","👳‍♂":"1f473-200d-2642-fe0f","👳‍♀":"1f473-200d-2640-fe0f","🤵‍♂":"1f935-200d-2642-fe0f","🤵‍♀":"1f935-200d-2640-fe0f","👰‍♂":"1f470-200d-2642-fe0f","👰‍♀":"1f470-200d-2640-fe0f","👩‍🍼":"1f469-200d-1f37c","👨‍🍼":"1f468-200d-1f37c","🧑‍🍼":"1f9d1-200d-1f37c","🧑‍🎄":"1f9d1-200d-1f384","🦸‍♂":"1f9b8-200d-2642-fe0f","🦸‍♀":"1f9b8-200d-2640-fe0f","🦹‍♂":"1f9b9-200d-2642-fe0f","🦹‍♀":"1f9b9-200d-2640-fe0f","🧙‍♂":"1f9d9-200d-2642-fe0f","🧙‍♀":"1f9d9-200d-2640-fe0f","🧚‍♂":"1f9da-200d-2642-fe0f","🧚‍♀":"1f9da-200d-2640-fe0f","🧛‍♂":"1f9db-200d-2642-fe0f","🧛‍♀":"1f9db-200d-2640-fe0f","🧜‍♂":"1f9dc-200d-2642-fe0f","🧜‍♀":"1f9dc-200d-2640-fe0f","🧝‍♂":"1f9dd-200d-2642-fe0f","🧝‍♀":"1f9dd-200d-2640-fe0f","🧞‍♂":"1f9de-200d-2642-fe0f","🧞‍♀":"1f9de-200d-2640-fe0f","🧟‍♂":"1f9df-200d-2642-fe0f","🧟‍♀":"1f9df-200d-2640-fe0f","💆‍♂":"1f486-200d-2642-fe0f","💆‍♀":"1f486-200d-2640-fe0f","💇‍♂":"1f487-200d-2642-fe0f","💇‍♀":"1f487-200d-2640-fe0f","🚶‍♂":"1f6b6-200d-2642-fe0f","🚶‍♀":"1f6b6-200d-2640-fe0f","🧍‍♂":"1f9cd-200d-2642-fe0f","🧍‍♀":"1f9cd-200d-2640-fe0f","🧎‍♂":"1f9ce-200d-2642-fe0f","🧎‍♀":"1f9ce-200d-2640-fe0f","🧑‍🦯":"1f9d1-200d-1f9af","👨‍🦯":"1f468-200d-1f9af","👩‍🦯":"1f469-200d-1f9af","🧑‍🦼":"1f9d1-200d-1f9bc","👨‍🦼":"1f468-200d-1f9bc","👩‍🦼":"1f469-200d-1f9bc","🧑‍🦽":"1f9d1-200d-1f9bd","👨‍🦽":"1f468-200d-1f9bd","👩‍🦽":"1f469-200d-1f9bd","🏃‍♂":"1f3c3-200d-2642-fe0f","🏃‍♀":"1f3c3-200d-2640-fe0f","👯‍♂":"1f46f-200d-2642-fe0f","👯‍♀":"1f46f-200d-2640-fe0f","🧖‍♂":"1f9d6-200d-2642-fe0f","🧖‍♀":"1f9d6-200d-2640-fe0f","🧗‍♂":"1f9d7-200d-2642-fe0f","🧗‍♀":"1f9d7-200d-2640-fe0f","🏌‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏄‍♂":"1f3c4-200d-2642-fe0f","🏄‍♀":"1f3c4-200d-2640-fe0f","🚣‍♂":"1f6a3-200d-2642-fe0f","🚣‍♀":"1f6a3-200d-2640-fe0f","🏊‍♂":"1f3ca-200d-2642-fe0f","🏊‍♀":"1f3ca-200d-2640-fe0f","⛹‍♂":"26f9-fe0f-200d-2642-fe0f","⛹‍♀":"26f9-fe0f-200d-2640-fe0f","🏋‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋‍♀":"1f3cb-fe0f-200d-2640-fe0f","🚴‍♂":"1f6b4-200d-2642-fe0f","🚴‍♀":"1f6b4-200d-2640-fe0f","🚵‍♂":"1f6b5-200d-2642-fe0f","🚵‍♀":"1f6b5-200d-2640-fe0f","🤸‍♂":"1f938-200d-2642-fe0f","🤸‍♀":"1f938-200d-2640-fe0f","🤼‍♂":"1f93c-200d-2642-fe0f","🤼‍♀":"1f93c-200d-2640-fe0f","🤽‍♂":"1f93d-200d-2642-fe0f","🤽‍♀":"1f93d-200d-2640-fe0f","🤾‍♂":"1f93e-200d-2642-fe0f","🤾‍♀":"1f93e-200d-2640-fe0f","🤹‍♂":"1f939-200d-2642-fe0f","🤹‍♀":"1f939-200d-2640-fe0f","🧘‍♂":"1f9d8-200d-2642-fe0f","🧘‍♀":"1f9d8-200d-2640-fe0f","👨‍👦":"1f468-200d-1f466","👨‍👧":"1f468-200d-1f467","👩‍👦":"1f469-200d-1f466","👩‍👧":"1f469-200d-1f467","🐕‍🦺":"1f415-200d-1f9ba","🐈‍⬛":"1f408-200d-2b1b","🐻‍❄":"1f43b-200d-2744-fe0f","#️⃣":"23-20e3","*️⃣":"2a-20e3","0️⃣":"30-20e3","1️⃣":"31-20e3","2️⃣":"32-20e3","3️⃣":"33-20e3","4️⃣":"34-20e3","5️⃣":"35-20e3","6️⃣":"36-20e3","7️⃣":"37-20e3","8️⃣":"38-20e3","9️⃣":"39-20e3","🏳‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠":"1f3f4-200d-2620-fe0f","😶‍🌫️":"1f636-200d-1f32b-fe0f","❤️‍🔥":"2764-fe0f-200d-1f525","❤️‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨️":"1f441-200d-1f5e8","👁️‍🗨":"1f441-200d-1f5e8","🧔‍♂️":"1f9d4-200d-2642-fe0f","🧔🏻‍♂":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂":"1f9d4-1f3ff-200d-2642-fe0f","🧔‍♀️":"1f9d4-200d-2640-fe0f","🧔🏻‍♀":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀":"1f9d4-1f3ff-200d-2640-fe0f","👨🏻‍🦰":"1f468-1f3fb-200d-1f9b0","👨🏼‍🦰":"1f468-1f3fc-200d-1f9b0","👨🏽‍🦰":"1f468-1f3fd-200d-1f9b0","👨🏾‍🦰":"1f468-1f3fe-200d-1f9b0","👨🏿‍🦰":"1f468-1f3ff-200d-1f9b0","👨🏻‍🦱":"1f468-1f3fb-200d-1f9b1","👨🏼‍🦱":"1f468-1f3fc-200d-1f9b1","👨🏽‍🦱":"1f468-1f3fd-200d-1f9b1","👨🏾‍🦱":"1f468-1f3fe-200d-1f9b1","👨🏿‍🦱":"1f468-1f3ff-200d-1f9b1","👨🏻‍🦳":"1f468-1f3fb-200d-1f9b3","👨🏼‍🦳":"1f468-1f3fc-200d-1f9b3","👨🏽‍🦳":"1f468-1f3fd-200d-1f9b3","👨🏾‍🦳":"1f468-1f3fe-200d-1f9b3","👨🏿‍🦳":"1f468-1f3ff-200d-1f9b3","👨🏻‍🦲":"1f468-1f3fb-200d-1f9b2","👨🏼‍🦲":"1f468-1f3fc-200d-1f9b2","👨🏽‍🦲":"1f468-1f3fd-200d-1f9b2","👨🏾‍🦲":"1f468-1f3fe-200d-1f9b2","👨🏿‍🦲":"1f468-1f3ff-200d-1f9b2","👩🏻‍🦰":"1f469-1f3fb-200d-1f9b0","👩🏼‍🦰":"1f469-1f3fc-200d-1f9b0","👩🏽‍🦰":"1f469-1f3fd-200d-1f9b0","👩🏾‍🦰":"1f469-1f3fe-200d-1f9b0","👩🏿‍🦰":"1f469-1f3ff-200d-1f9b0","🧑🏻‍🦰":"1f9d1-1f3fb-200d-1f9b0","🧑🏼‍🦰":"1f9d1-1f3fc-200d-1f9b0","🧑🏽‍🦰":"1f9d1-1f3fd-200d-1f9b0","🧑🏾‍🦰":"1f9d1-1f3fe-200d-1f9b0","🧑🏿‍🦰":"1f9d1-1f3ff-200d-1f9b0","👩🏻‍🦱":"1f469-1f3fb-200d-1f9b1","👩🏼‍🦱":"1f469-1f3fc-200d-1f9b1","👩🏽‍🦱":"1f469-1f3fd-200d-1f9b1","👩🏾‍🦱":"1f469-1f3fe-200d-1f9b1","👩🏿‍🦱":"1f469-1f3ff-200d-1f9b1","🧑🏻‍🦱":"1f9d1-1f3fb-200d-1f9b1","🧑🏼‍🦱":"1f9d1-1f3fc-200d-1f9b1","🧑🏽‍🦱":"1f9d1-1f3fd-200d-1f9b1","🧑🏾‍🦱":"1f9d1-1f3fe-200d-1f9b1","🧑🏿‍🦱":"1f9d1-1f3ff-200d-1f9b1","👩🏻‍🦳":"1f469-1f3fb-200d-1f9b3","👩🏼‍🦳":"1f469-1f3fc-200d-1f9b3","👩🏽‍🦳":"1f469-1f3fd-200d-1f9b3","👩🏾‍🦳":"1f469-1f3fe-200d-1f9b3","👩🏿‍🦳":"1f469-1f3ff-200d-1f9b3","🧑🏻‍🦳":"1f9d1-1f3fb-200d-1f9b3","🧑🏼‍🦳":"1f9d1-1f3fc-200d-1f9b3","🧑🏽‍🦳":"1f9d1-1f3fd-200d-1f9b3","🧑🏾‍🦳":"1f9d1-1f3fe-200d-1f9b3","🧑🏿‍🦳":"1f9d1-1f3ff-200d-1f9b3","👩🏻‍🦲":"1f469-1f3fb-200d-1f9b2","👩🏼‍🦲":"1f469-1f3fc-200d-1f9b2","👩🏽‍🦲":"1f469-1f3fd-200d-1f9b2","👩🏾‍🦲":"1f469-1f3fe-200d-1f9b2","👩🏿‍🦲":"1f469-1f3ff-200d-1f9b2","🧑🏻‍🦲":"1f9d1-1f3fb-200d-1f9b2","🧑🏼‍🦲":"1f9d1-1f3fc-200d-1f9b2","🧑🏽‍🦲":"1f9d1-1f3fd-200d-1f9b2","🧑🏾‍🦲":"1f9d1-1f3fe-200d-1f9b2","🧑🏿‍🦲":"1f9d1-1f3ff-200d-1f9b2","👱‍♀️":"1f471-200d-2640-fe0f","👱🏻‍♀":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀":"1f471-1f3ff-200d-2640-fe0f","👱‍♂️":"1f471-200d-2642-fe0f","👱🏻‍♂":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂":"1f471-1f3ff-200d-2642-fe0f","🙍‍♂️":"1f64d-200d-2642-fe0f","🙍🏻‍♂":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂":"1f64d-1f3ff-200d-2642-fe0f","🙍‍♀️":"1f64d-200d-2640-fe0f","🙍🏻‍♀":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀":"1f64d-1f3ff-200d-2640-fe0f","🙎‍♂️":"1f64e-200d-2642-fe0f","🙎🏻‍♂":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂":"1f64e-1f3ff-200d-2642-fe0f","🙎‍♀️":"1f64e-200d-2640-fe0f","🙎🏻‍♀":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀":"1f64e-1f3ff-200d-2640-fe0f","🙅‍♂️":"1f645-200d-2642-fe0f","🙅🏻‍♂":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂":"1f645-1f3ff-200d-2642-fe0f","🙅‍♀️":"1f645-200d-2640-fe0f","🙅🏻‍♀":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀":"1f645-1f3ff-200d-2640-fe0f","🙆‍♂️":"1f646-200d-2642-fe0f","🙆🏻‍♂":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂":"1f646-1f3ff-200d-2642-fe0f","🙆‍♀️":"1f646-200d-2640-fe0f","🙆🏻‍♀":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀":"1f646-1f3ff-200d-2640-fe0f","💁‍♂️":"1f481-200d-2642-fe0f","💁🏻‍♂":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂":"1f481-1f3ff-200d-2642-fe0f","💁‍♀️":"1f481-200d-2640-fe0f","💁🏻‍♀":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀":"1f481-1f3ff-200d-2640-fe0f","🙋‍♂️":"1f64b-200d-2642-fe0f","🙋🏻‍♂":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂":"1f64b-1f3ff-200d-2642-fe0f","🙋‍♀️":"1f64b-200d-2640-fe0f","🙋🏻‍♀":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀":"1f64b-1f3ff-200d-2640-fe0f","🧏‍♂️":"1f9cf-200d-2642-fe0f","🧏🏻‍♂":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂":"1f9cf-1f3ff-200d-2642-fe0f","🧏‍♀️":"1f9cf-200d-2640-fe0f","🧏🏻‍♀":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀":"1f9cf-1f3ff-200d-2640-fe0f","🙇‍♂️":"1f647-200d-2642-fe0f","🙇🏻‍♂":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂":"1f647-1f3ff-200d-2642-fe0f","🙇‍♀️":"1f647-200d-2640-fe0f","🙇🏻‍♀":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀":"1f647-1f3ff-200d-2640-fe0f","🤦‍♂️":"1f926-200d-2642-fe0f","🤦🏻‍♂":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂":"1f926-1f3ff-200d-2642-fe0f","🤦‍♀️":"1f926-200d-2640-fe0f","🤦🏻‍♀":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀":"1f926-1f3ff-200d-2640-fe0f","🤷‍♂️":"1f937-200d-2642-fe0f","🤷🏻‍♂":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂":"1f937-1f3ff-200d-2642-fe0f","🤷‍♀️":"1f937-200d-2640-fe0f","🤷🏻‍♀":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀":"1f937-1f3ff-200d-2640-fe0f","🧑‍⚕️":"1f9d1-200d-2695-fe0f","🧑🏻‍⚕":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕":"1f9d1-1f3ff-200d-2695-fe0f","👨‍⚕️":"1f468-200d-2695-fe0f","👨🏻‍⚕":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕":"1f468-1f3ff-200d-2695-fe0f","👩‍⚕️":"1f469-200d-2695-fe0f","👩🏻‍⚕":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍🎓":"1f9d1-1f3fb-200d-1f393","🧑🏼‍🎓":"1f9d1-1f3fc-200d-1f393","🧑🏽‍🎓":"1f9d1-1f3fd-200d-1f393","🧑🏾‍🎓":"1f9d1-1f3fe-200d-1f393","🧑🏿‍🎓":"1f9d1-1f3ff-200d-1f393","👨🏻‍🎓":"1f468-1f3fb-200d-1f393","👨🏼‍🎓":"1f468-1f3fc-200d-1f393","👨🏽‍🎓":"1f468-1f3fd-200d-1f393","👨🏾‍🎓":"1f468-1f3fe-200d-1f393","👨🏿‍🎓":"1f468-1f3ff-200d-1f393","👩🏻‍🎓":"1f469-1f3fb-200d-1f393","👩🏼‍🎓":"1f469-1f3fc-200d-1f393","👩🏽‍🎓":"1f469-1f3fd-200d-1f393","👩🏾‍🎓":"1f469-1f3fe-200d-1f393","👩🏿‍🎓":"1f469-1f3ff-200d-1f393","🧑🏻‍🏫":"1f9d1-1f3fb-200d-1f3eb","🧑🏼‍🏫":"1f9d1-1f3fc-200d-1f3eb","🧑🏽‍🏫":"1f9d1-1f3fd-200d-1f3eb","🧑🏾‍🏫":"1f9d1-1f3fe-200d-1f3eb","🧑🏿‍🏫":"1f9d1-1f3ff-200d-1f3eb","👨🏻‍🏫":"1f468-1f3fb-200d-1f3eb","👨🏼‍🏫":"1f468-1f3fc-200d-1f3eb","👨🏽‍🏫":"1f468-1f3fd-200d-1f3eb","👨🏾‍🏫":"1f468-1f3fe-200d-1f3eb","👨🏿‍🏫":"1f468-1f3ff-200d-1f3eb","👩🏻‍🏫":"1f469-1f3fb-200d-1f3eb","👩🏼‍🏫":"1f469-1f3fc-200d-1f3eb","👩🏽‍🏫":"1f469-1f3fd-200d-1f3eb","👩🏾‍🏫":"1f469-1f3fe-200d-1f3eb","👩🏿‍🏫":"1f469-1f3ff-200d-1f3eb","🧑‍⚖️":"1f9d1-200d-2696-fe0f","🧑🏻‍⚖":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖":"1f9d1-1f3ff-200d-2696-fe0f","👨‍⚖️":"1f468-200d-2696-fe0f","👨🏻‍⚖":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖":"1f468-1f3ff-200d-2696-fe0f","👩‍⚖️":"1f469-200d-2696-fe0f","👩🏻‍⚖":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍🌾":"1f9d1-1f3fb-200d-1f33e","🧑🏼‍🌾":"1f9d1-1f3fc-200d-1f33e","🧑🏽‍🌾":"1f9d1-1f3fd-200d-1f33e","🧑🏾‍🌾":"1f9d1-1f3fe-200d-1f33e","🧑🏿‍🌾":"1f9d1-1f3ff-200d-1f33e","👨🏻‍🌾":"1f468-1f3fb-200d-1f33e","👨🏼‍🌾":"1f468-1f3fc-200d-1f33e","👨🏽‍🌾":"1f468-1f3fd-200d-1f33e","👨🏾‍🌾":"1f468-1f3fe-200d-1f33e","👨🏿‍🌾":"1f468-1f3ff-200d-1f33e","👩🏻‍🌾":"1f469-1f3fb-200d-1f33e","👩🏼‍🌾":"1f469-1f3fc-200d-1f33e","👩🏽‍🌾":"1f469-1f3fd-200d-1f33e","👩🏾‍🌾":"1f469-1f3fe-200d-1f33e","👩🏿‍🌾":"1f469-1f3ff-200d-1f33e","🧑🏻‍🍳":"1f9d1-1f3fb-200d-1f373","🧑🏼‍🍳":"1f9d1-1f3fc-200d-1f373","🧑🏽‍🍳":"1f9d1-1f3fd-200d-1f373","🧑🏾‍🍳":"1f9d1-1f3fe-200d-1f373","🧑🏿‍🍳":"1f9d1-1f3ff-200d-1f373","👨🏻‍🍳":"1f468-1f3fb-200d-1f373","👨🏼‍🍳":"1f468-1f3fc-200d-1f373","👨🏽‍🍳":"1f468-1f3fd-200d-1f373","👨🏾‍🍳":"1f468-1f3fe-200d-1f373","👨🏿‍🍳":"1f468-1f3ff-200d-1f373","👩🏻‍🍳":"1f469-1f3fb-200d-1f373","👩🏼‍🍳":"1f469-1f3fc-200d-1f373","👩🏽‍🍳":"1f469-1f3fd-200d-1f373","👩🏾‍🍳":"1f469-1f3fe-200d-1f373","👩🏿‍🍳":"1f469-1f3ff-200d-1f373","🧑🏻‍🔧":"1f9d1-1f3fb-200d-1f527","🧑🏼‍🔧":"1f9d1-1f3fc-200d-1f527","🧑🏽‍🔧":"1f9d1-1f3fd-200d-1f527","🧑🏾‍🔧":"1f9d1-1f3fe-200d-1f527","🧑🏿‍🔧":"1f9d1-1f3ff-200d-1f527","👨🏻‍🔧":"1f468-1f3fb-200d-1f527","👨🏼‍🔧":"1f468-1f3fc-200d-1f527","👨🏽‍🔧":"1f468-1f3fd-200d-1f527","👨🏾‍🔧":"1f468-1f3fe-200d-1f527","👨🏿‍🔧":"1f468-1f3ff-200d-1f527","👩🏻‍🔧":"1f469-1f3fb-200d-1f527","👩🏼‍🔧":"1f469-1f3fc-200d-1f527","👩🏽‍🔧":"1f469-1f3fd-200d-1f527","👩🏾‍🔧":"1f469-1f3fe-200d-1f527","👩🏿‍🔧":"1f469-1f3ff-200d-1f527","🧑🏻‍🏭":"1f9d1-1f3fb-200d-1f3ed","🧑🏼‍🏭":"1f9d1-1f3fc-200d-1f3ed","🧑🏽‍🏭":"1f9d1-1f3fd-200d-1f3ed","🧑🏾‍🏭":"1f9d1-1f3fe-200d-1f3ed","🧑🏿‍🏭":"1f9d1-1f3ff-200d-1f3ed","👨🏻‍🏭":"1f468-1f3fb-200d-1f3ed","👨🏼‍🏭":"1f468-1f3fc-200d-1f3ed","👨🏽‍🏭":"1f468-1f3fd-200d-1f3ed","👨🏾‍🏭":"1f468-1f3fe-200d-1f3ed","👨🏿‍🏭":"1f468-1f3ff-200d-1f3ed","👩🏻‍🏭":"1f469-1f3fb-200d-1f3ed","👩🏼‍🏭":"1f469-1f3fc-200d-1f3ed","👩🏽‍🏭":"1f469-1f3fd-200d-1f3ed","👩🏾‍🏭":"1f469-1f3fe-200d-1f3ed","👩🏿‍🏭":"1f469-1f3ff-200d-1f3ed","🧑🏻‍💼":"1f9d1-1f3fb-200d-1f4bc","🧑🏼‍💼":"1f9d1-1f3fc-200d-1f4bc","🧑🏽‍💼":"1f9d1-1f3fd-200d-1f4bc","🧑🏾‍💼":"1f9d1-1f3fe-200d-1f4bc","🧑🏿‍💼":"1f9d1-1f3ff-200d-1f4bc","👨🏻‍💼":"1f468-1f3fb-200d-1f4bc","👨🏼‍💼":"1f468-1f3fc-200d-1f4bc","👨🏽‍💼":"1f468-1f3fd-200d-1f4bc","👨🏾‍💼":"1f468-1f3fe-200d-1f4bc","👨🏿‍💼":"1f468-1f3ff-200d-1f4bc","👩🏻‍💼":"1f469-1f3fb-200d-1f4bc","👩🏼‍💼":"1f469-1f3fc-200d-1f4bc","👩🏽‍💼":"1f469-1f3fd-200d-1f4bc","👩🏾‍💼":"1f469-1f3fe-200d-1f4bc","👩🏿‍💼":"1f469-1f3ff-200d-1f4bc","🧑🏻‍🔬":"1f9d1-1f3fb-200d-1f52c","🧑🏼‍🔬":"1f9d1-1f3fc-200d-1f52c","🧑🏽‍🔬":"1f9d1-1f3fd-200d-1f52c","🧑🏾‍🔬":"1f9d1-1f3fe-200d-1f52c","🧑🏿‍🔬":"1f9d1-1f3ff-200d-1f52c","👨🏻‍🔬":"1f468-1f3fb-200d-1f52c","👨🏼‍🔬":"1f468-1f3fc-200d-1f52c","👨🏽‍🔬":"1f468-1f3fd-200d-1f52c","👨🏾‍🔬":"1f468-1f3fe-200d-1f52c","👨🏿‍🔬":"1f468-1f3ff-200d-1f52c","👩🏻‍🔬":"1f469-1f3fb-200d-1f52c","👩🏼‍🔬":"1f469-1f3fc-200d-1f52c","👩🏽‍🔬":"1f469-1f3fd-200d-1f52c","👩🏾‍🔬":"1f469-1f3fe-200d-1f52c","👩🏿‍🔬":"1f469-1f3ff-200d-1f52c","🧑🏻‍💻":"1f9d1-1f3fb-200d-1f4bb","🧑🏼‍💻":"1f9d1-1f3fc-200d-1f4bb","🧑🏽‍💻":"1f9d1-1f3fd-200d-1f4bb","🧑🏾‍💻":"1f9d1-1f3fe-200d-1f4bb","🧑🏿‍💻":"1f9d1-1f3ff-200d-1f4bb","👨🏻‍💻":"1f468-1f3fb-200d-1f4bb","👨🏼‍💻":"1f468-1f3fc-200d-1f4bb","👨🏽‍💻":"1f468-1f3fd-200d-1f4bb","👨🏾‍💻":"1f468-1f3fe-200d-1f4bb","👨🏿‍💻":"1f468-1f3ff-200d-1f4bb","👩🏻‍💻":"1f469-1f3fb-200d-1f4bb","👩🏼‍💻":"1f469-1f3fc-200d-1f4bb","👩🏽‍💻":"1f469-1f3fd-200d-1f4bb","👩🏾‍💻":"1f469-1f3fe-200d-1f4bb","👩🏿‍💻":"1f469-1f3ff-200d-1f4bb","🧑🏻‍🎤":"1f9d1-1f3fb-200d-1f3a4","🧑🏼‍🎤":"1f9d1-1f3fc-200d-1f3a4","🧑🏽‍🎤":"1f9d1-1f3fd-200d-1f3a4","🧑🏾‍🎤":"1f9d1-1f3fe-200d-1f3a4","🧑🏿‍🎤":"1f9d1-1f3ff-200d-1f3a4","👨🏻‍🎤":"1f468-1f3fb-200d-1f3a4","👨🏼‍🎤":"1f468-1f3fc-200d-1f3a4","👨🏽‍🎤":"1f468-1f3fd-200d-1f3a4","👨🏾‍🎤":"1f468-1f3fe-200d-1f3a4","👨🏿‍🎤":"1f468-1f3ff-200d-1f3a4","👩🏻‍🎤":"1f469-1f3fb-200d-1f3a4","👩🏼‍🎤":"1f469-1f3fc-200d-1f3a4","👩🏽‍🎤":"1f469-1f3fd-200d-1f3a4","👩🏾‍🎤":"1f469-1f3fe-200d-1f3a4","👩🏿‍🎤":"1f469-1f3ff-200d-1f3a4","🧑🏻‍🎨":"1f9d1-1f3fb-200d-1f3a8","🧑🏼‍🎨":"1f9d1-1f3fc-200d-1f3a8","🧑🏽‍🎨":"1f9d1-1f3fd-200d-1f3a8","🧑🏾‍🎨":"1f9d1-1f3fe-200d-1f3a8","🧑🏿‍🎨":"1f9d1-1f3ff-200d-1f3a8","👨🏻‍🎨":"1f468-1f3fb-200d-1f3a8","👨🏼‍🎨":"1f468-1f3fc-200d-1f3a8","👨🏽‍🎨":"1f468-1f3fd-200d-1f3a8","👨🏾‍🎨":"1f468-1f3fe-200d-1f3a8","👨🏿‍🎨":"1f468-1f3ff-200d-1f3a8","👩🏻‍🎨":"1f469-1f3fb-200d-1f3a8","👩🏼‍🎨":"1f469-1f3fc-200d-1f3a8","👩🏽‍🎨":"1f469-1f3fd-200d-1f3a8","👩🏾‍🎨":"1f469-1f3fe-200d-1f3a8","👩🏿‍🎨":"1f469-1f3ff-200d-1f3a8","🧑‍✈️":"1f9d1-200d-2708-fe0f","🧑🏻‍✈":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈":"1f9d1-1f3ff-200d-2708-fe0f","👨‍✈️":"1f468-200d-2708-fe0f","👨🏻‍✈":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈":"1f468-1f3ff-200d-2708-fe0f","👩‍✈️":"1f469-200d-2708-fe0f","👩🏻‍✈":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈":"1f469-1f3ff-200d-2708-fe0f","🧑🏻‍🚀":"1f9d1-1f3fb-200d-1f680","🧑🏼‍🚀":"1f9d1-1f3fc-200d-1f680","🧑🏽‍🚀":"1f9d1-1f3fd-200d-1f680","🧑🏾‍🚀":"1f9d1-1f3fe-200d-1f680","🧑🏿‍🚀":"1f9d1-1f3ff-200d-1f680","👨🏻‍🚀":"1f468-1f3fb-200d-1f680","👨🏼‍🚀":"1f468-1f3fc-200d-1f680","👨🏽‍🚀":"1f468-1f3fd-200d-1f680","👨🏾‍🚀":"1f468-1f3fe-200d-1f680","👨🏿‍🚀":"1f468-1f3ff-200d-1f680","👩🏻‍🚀":"1f469-1f3fb-200d-1f680","👩🏼‍🚀":"1f469-1f3fc-200d-1f680","👩🏽‍🚀":"1f469-1f3fd-200d-1f680","👩🏾‍🚀":"1f469-1f3fe-200d-1f680","👩🏿‍🚀":"1f469-1f3ff-200d-1f680","🧑🏻‍🚒":"1f9d1-1f3fb-200d-1f692","🧑🏼‍🚒":"1f9d1-1f3fc-200d-1f692","🧑🏽‍🚒":"1f9d1-1f3fd-200d-1f692","🧑🏾‍🚒":"1f9d1-1f3fe-200d-1f692","🧑🏿‍🚒":"1f9d1-1f3ff-200d-1f692","👨🏻‍🚒":"1f468-1f3fb-200d-1f692","👨🏼‍🚒":"1f468-1f3fc-200d-1f692","👨🏽‍🚒":"1f468-1f3fd-200d-1f692","👨🏾‍🚒":"1f468-1f3fe-200d-1f692","👨🏿‍🚒":"1f468-1f3ff-200d-1f692","👩🏻‍🚒":"1f469-1f3fb-200d-1f692","👩🏼‍🚒":"1f469-1f3fc-200d-1f692","👩🏽‍🚒":"1f469-1f3fd-200d-1f692","👩🏾‍🚒":"1f469-1f3fe-200d-1f692","👩🏿‍🚒":"1f469-1f3ff-200d-1f692","👮‍♂️":"1f46e-200d-2642-fe0f","👮🏻‍♂":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂":"1f46e-1f3ff-200d-2642-fe0f","👮‍♀️":"1f46e-200d-2640-fe0f","👮🏻‍♀":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀":"1f46e-1f3ff-200d-2640-fe0f","🕵‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵️‍♂":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂":"1f575-1f3ff-200d-2642-fe0f","🕵‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵️‍♀":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀":"1f575-1f3ff-200d-2640-fe0f","💂‍♂️":"1f482-200d-2642-fe0f","💂🏻‍♂":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂":"1f482-1f3ff-200d-2642-fe0f","💂‍♀️":"1f482-200d-2640-fe0f","💂🏻‍♀":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀":"1f482-1f3ff-200d-2640-fe0f","👷‍♂️":"1f477-200d-2642-fe0f","👷🏻‍♂":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂":"1f477-1f3ff-200d-2642-fe0f","👷‍♀️":"1f477-200d-2640-fe0f","👷🏻‍♀":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀":"1f477-1f3ff-200d-2640-fe0f","👳‍♂️":"1f473-200d-2642-fe0f","👳🏻‍♂":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂":"1f473-1f3ff-200d-2642-fe0f","👳‍♀️":"1f473-200d-2640-fe0f","👳🏻‍♀":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀":"1f473-1f3ff-200d-2640-fe0f","🤵‍♂️":"1f935-200d-2642-fe0f","🤵🏻‍♂":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂":"1f935-1f3ff-200d-2642-fe0f","🤵‍♀️":"1f935-200d-2640-fe0f","🤵🏻‍♀":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀":"1f935-1f3ff-200d-2640-fe0f","👰‍♂️":"1f470-200d-2642-fe0f","👰🏻‍♂":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂":"1f470-1f3ff-200d-2642-fe0f","👰‍♀️":"1f470-200d-2640-fe0f","👰🏻‍♀":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀":"1f470-1f3ff-200d-2640-fe0f","👩🏻‍🍼":"1f469-1f3fb-200d-1f37c","👩🏼‍🍼":"1f469-1f3fc-200d-1f37c","👩🏽‍🍼":"1f469-1f3fd-200d-1f37c","👩🏾‍🍼":"1f469-1f3fe-200d-1f37c","👩🏿‍🍼":"1f469-1f3ff-200d-1f37c","👨🏻‍🍼":"1f468-1f3fb-200d-1f37c","👨🏼‍🍼":"1f468-1f3fc-200d-1f37c","👨🏽‍🍼":"1f468-1f3fd-200d-1f37c","👨🏾‍🍼":"1f468-1f3fe-200d-1f37c","👨🏿‍🍼":"1f468-1f3ff-200d-1f37c","🧑🏻‍🍼":"1f9d1-1f3fb-200d-1f37c","🧑🏼‍🍼":"1f9d1-1f3fc-200d-1f37c","🧑🏽‍🍼":"1f9d1-1f3fd-200d-1f37c","🧑🏾‍🍼":"1f9d1-1f3fe-200d-1f37c","🧑🏿‍🍼":"1f9d1-1f3ff-200d-1f37c","🧑🏻‍🎄":"1f9d1-1f3fb-200d-1f384","🧑🏼‍🎄":"1f9d1-1f3fc-200d-1f384","🧑🏽‍🎄":"1f9d1-1f3fd-200d-1f384","🧑🏾‍🎄":"1f9d1-1f3fe-200d-1f384","🧑🏿‍🎄":"1f9d1-1f3ff-200d-1f384","🦸‍♂️":"1f9b8-200d-2642-fe0f","🦸🏻‍♂":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂":"1f9b8-1f3ff-200d-2642-fe0f","🦸‍♀️":"1f9b8-200d-2640-fe0f","🦸🏻‍♀":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀":"1f9b8-1f3ff-200d-2640-fe0f","🦹‍♂️":"1f9b9-200d-2642-fe0f","🦹🏻‍♂":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂":"1f9b9-1f3ff-200d-2642-fe0f","🦹‍♀️":"1f9b9-200d-2640-fe0f","🦹🏻‍♀":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀":"1f9b9-1f3ff-200d-2640-fe0f","🧙‍♂️":"1f9d9-200d-2642-fe0f","🧙🏻‍♂":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂":"1f9d9-1f3ff-200d-2642-fe0f","🧙‍♀️":"1f9d9-200d-2640-fe0f","🧙🏻‍♀":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀":"1f9d9-1f3ff-200d-2640-fe0f","🧚‍♂️":"1f9da-200d-2642-fe0f","🧚🏻‍♂":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂":"1f9da-1f3ff-200d-2642-fe0f","🧚‍♀️":"1f9da-200d-2640-fe0f","🧚🏻‍♀":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀":"1f9da-1f3ff-200d-2640-fe0f","🧛‍♂️":"1f9db-200d-2642-fe0f","🧛🏻‍♂":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂":"1f9db-1f3ff-200d-2642-fe0f","🧛‍♀️":"1f9db-200d-2640-fe0f","🧛🏻‍♀":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀":"1f9db-1f3ff-200d-2640-fe0f","🧜‍♂️":"1f9dc-200d-2642-fe0f","🧜🏻‍♂":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂":"1f9dc-1f3ff-200d-2642-fe0f","🧜‍♀️":"1f9dc-200d-2640-fe0f","🧜🏻‍♀":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀":"1f9dc-1f3ff-200d-2640-fe0f","🧝‍♂️":"1f9dd-200d-2642-fe0f","🧝🏻‍♂":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂":"1f9dd-1f3ff-200d-2642-fe0f","🧝‍♀️":"1f9dd-200d-2640-fe0f","🧝🏻‍♀":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀":"1f9dd-1f3ff-200d-2640-fe0f","🧞‍♂️":"1f9de-200d-2642-fe0f","🧞‍♀️":"1f9de-200d-2640-fe0f","🧟‍♂️":"1f9df-200d-2642-fe0f","🧟‍♀️":"1f9df-200d-2640-fe0f","💆‍♂️":"1f486-200d-2642-fe0f","💆🏻‍♂":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂":"1f486-1f3ff-200d-2642-fe0f","💆‍♀️":"1f486-200d-2640-fe0f","💆🏻‍♀":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀":"1f486-1f3ff-200d-2640-fe0f","💇‍♂️":"1f487-200d-2642-fe0f","💇🏻‍♂":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂":"1f487-1f3ff-200d-2642-fe0f","💇‍♀️":"1f487-200d-2640-fe0f","💇🏻‍♀":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀":"1f487-1f3ff-200d-2640-fe0f","🚶‍♂️":"1f6b6-200d-2642-fe0f","🚶🏻‍♂":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂":"1f6b6-1f3ff-200d-2642-fe0f","🚶‍♀️":"1f6b6-200d-2640-fe0f","🚶🏻‍♀":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀":"1f6b6-1f3ff-200d-2640-fe0f","🧍‍♂️":"1f9cd-200d-2642-fe0f","🧍🏻‍♂":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂":"1f9cd-1f3ff-200d-2642-fe0f","🧍‍♀️":"1f9cd-200d-2640-fe0f","🧍🏻‍♀":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀":"1f9cd-1f3ff-200d-2640-fe0f","🧎‍♂️":"1f9ce-200d-2642-fe0f","🧎🏻‍♂":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂":"1f9ce-1f3ff-200d-2642-fe0f","🧎‍♀️":"1f9ce-200d-2640-fe0f","🧎🏻‍♀":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀":"1f9ce-1f3ff-200d-2640-fe0f","🧑🏻‍🦯":"1f9d1-1f3fb-200d-1f9af","🧑🏼‍🦯":"1f9d1-1f3fc-200d-1f9af","🧑🏽‍🦯":"1f9d1-1f3fd-200d-1f9af","🧑🏾‍🦯":"1f9d1-1f3fe-200d-1f9af","🧑🏿‍🦯":"1f9d1-1f3ff-200d-1f9af","👨🏻‍🦯":"1f468-1f3fb-200d-1f9af","👨🏼‍🦯":"1f468-1f3fc-200d-1f9af","👨🏽‍🦯":"1f468-1f3fd-200d-1f9af","👨🏾‍🦯":"1f468-1f3fe-200d-1f9af","👨🏿‍🦯":"1f468-1f3ff-200d-1f9af","👩🏻‍🦯":"1f469-1f3fb-200d-1f9af","👩🏼‍🦯":"1f469-1f3fc-200d-1f9af","👩🏽‍🦯":"1f469-1f3fd-200d-1f9af","👩🏾‍🦯":"1f469-1f3fe-200d-1f9af","👩🏿‍🦯":"1f469-1f3ff-200d-1f9af","🧑🏻‍🦼":"1f9d1-1f3fb-200d-1f9bc","🧑🏼‍🦼":"1f9d1-1f3fc-200d-1f9bc","🧑🏽‍🦼":"1f9d1-1f3fd-200d-1f9bc","🧑🏾‍🦼":"1f9d1-1f3fe-200d-1f9bc","🧑🏿‍🦼":"1f9d1-1f3ff-200d-1f9bc","👨🏻‍🦼":"1f468-1f3fb-200d-1f9bc","👨🏼‍🦼":"1f468-1f3fc-200d-1f9bc","👨🏽‍🦼":"1f468-1f3fd-200d-1f9bc","👨🏾‍🦼":"1f468-1f3fe-200d-1f9bc","👨🏿‍🦼":"1f468-1f3ff-200d-1f9bc","👩🏻‍🦼":"1f469-1f3fb-200d-1f9bc","👩🏼‍🦼":"1f469-1f3fc-200d-1f9bc","👩🏽‍🦼":"1f469-1f3fd-200d-1f9bc","👩🏾‍🦼":"1f469-1f3fe-200d-1f9bc","👩🏿‍🦼":"1f469-1f3ff-200d-1f9bc","🧑🏻‍🦽":"1f9d1-1f3fb-200d-1f9bd","🧑🏼‍🦽":"1f9d1-1f3fc-200d-1f9bd","🧑🏽‍🦽":"1f9d1-1f3fd-200d-1f9bd","🧑🏾‍🦽":"1f9d1-1f3fe-200d-1f9bd","🧑🏿‍🦽":"1f9d1-1f3ff-200d-1f9bd","👨🏻‍🦽":"1f468-1f3fb-200d-1f9bd","👨🏼‍🦽":"1f468-1f3fc-200d-1f9bd","👨🏽‍🦽":"1f468-1f3fd-200d-1f9bd","👨🏾‍🦽":"1f468-1f3fe-200d-1f9bd","👨🏿‍🦽":"1f468-1f3ff-200d-1f9bd","👩🏻‍🦽":"1f469-1f3fb-200d-1f9bd","👩🏼‍🦽":"1f469-1f3fc-200d-1f9bd","👩🏽‍🦽":"1f469-1f3fd-200d-1f9bd","👩🏾‍🦽":"1f469-1f3fe-200d-1f9bd","👩🏿‍🦽":"1f469-1f3ff-200d-1f9bd","🏃‍♂️":"1f3c3-200d-2642-fe0f","🏃🏻‍♂":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂":"1f3c3-1f3ff-200d-2642-fe0f","🏃‍♀️":"1f3c3-200d-2640-fe0f","🏃🏻‍♀":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀":"1f3c3-1f3ff-200d-2640-fe0f","👯‍♂️":"1f46f-200d-2642-fe0f","👯‍♀️":"1f46f-200d-2640-fe0f","🧖‍♂️":"1f9d6-200d-2642-fe0f","🧖🏻‍♂":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂":"1f9d6-1f3ff-200d-2642-fe0f","🧖‍♀️":"1f9d6-200d-2640-fe0f","🧖🏻‍♀":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀":"1f9d6-1f3ff-200d-2640-fe0f","🧗‍♂️":"1f9d7-200d-2642-fe0f","🧗🏻‍♂":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂":"1f9d7-1f3ff-200d-2642-fe0f","🧗‍♀️":"1f9d7-200d-2640-fe0f","🧗🏻‍♀":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀":"1f9d7-1f3ff-200d-2640-fe0f","🏌‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌️‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂":"1f3cc-1f3ff-200d-2642-fe0f","🏌‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌️‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀":"1f3cc-1f3ff-200d-2640-fe0f","🏄‍♂️":"1f3c4-200d-2642-fe0f","🏄🏻‍♂":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂":"1f3c4-1f3ff-200d-2642-fe0f","🏄‍♀️":"1f3c4-200d-2640-fe0f","🏄🏻‍♀":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀":"1f3c4-1f3ff-200d-2640-fe0f","🚣‍♂️":"1f6a3-200d-2642-fe0f","🚣🏻‍♂":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂":"1f6a3-1f3ff-200d-2642-fe0f","🚣‍♀️":"1f6a3-200d-2640-fe0f","🚣🏻‍♀":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀":"1f6a3-1f3ff-200d-2640-fe0f","🏊‍♂️":"1f3ca-200d-2642-fe0f","🏊🏻‍♂":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂":"1f3ca-1f3ff-200d-2642-fe0f","🏊‍♀️":"1f3ca-200d-2640-fe0f","🏊🏻‍♀":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀":"1f3ca-1f3ff-200d-2640-fe0f","⛹‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹️‍♂":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂":"26f9-1f3ff-200d-2642-fe0f","⛹‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹️‍♀":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀":"26f9-1f3ff-200d-2640-fe0f","🏋‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋️‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂":"1f3cb-1f3ff-200d-2642-fe0f","🏋‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋️‍♀":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀":"1f3cb-1f3ff-200d-2640-fe0f","🚴‍♂️":"1f6b4-200d-2642-fe0f","🚴🏻‍♂":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂":"1f6b4-1f3ff-200d-2642-fe0f","🚴‍♀️":"1f6b4-200d-2640-fe0f","🚴🏻‍♀":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀":"1f6b4-1f3ff-200d-2640-fe0f","🚵‍♂️":"1f6b5-200d-2642-fe0f","🚵🏻‍♂":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂":"1f6b5-1f3ff-200d-2642-fe0f","🚵‍♀️":"1f6b5-200d-2640-fe0f","🚵🏻‍♀":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀":"1f6b5-1f3ff-200d-2640-fe0f","🤸‍♂️":"1f938-200d-2642-fe0f","🤸🏻‍♂":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂":"1f938-1f3ff-200d-2642-fe0f","🤸‍♀️":"1f938-200d-2640-fe0f","🤸🏻‍♀":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀":"1f938-1f3ff-200d-2640-fe0f","🤼‍♂️":"1f93c-200d-2642-fe0f","🤼‍♀️":"1f93c-200d-2640-fe0f","🤽‍♂️":"1f93d-200d-2642-fe0f","🤽🏻‍♂":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂":"1f93d-1f3ff-200d-2642-fe0f","🤽‍♀️":"1f93d-200d-2640-fe0f","🤽🏻‍♀":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀":"1f93d-1f3ff-200d-2640-fe0f","🤾‍♂️":"1f93e-200d-2642-fe0f","🤾🏻‍♂":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂":"1f93e-1f3ff-200d-2642-fe0f","🤾‍♀️":"1f93e-200d-2640-fe0f","🤾🏻‍♀":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀":"1f93e-1f3ff-200d-2640-fe0f","🤹‍♂️":"1f939-200d-2642-fe0f","🤹🏻‍♂":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂":"1f939-1f3ff-200d-2642-fe0f","🤹‍♀️":"1f939-200d-2640-fe0f","🤹🏻‍♀":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀":"1f939-1f3ff-200d-2640-fe0f","🧘‍♂️":"1f9d8-200d-2642-fe0f","🧘🏻‍♂":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂":"1f9d8-1f3ff-200d-2642-fe0f","🧘‍♀️":"1f9d8-200d-2640-fe0f","🧘🏻‍♀":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀":"1f9d8-1f3ff-200d-2640-fe0f","🐻‍❄️":"1f43b-200d-2744-fe0f","🏳️‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","🏳️‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠️":"1f3f4-200d-2620-fe0f","👁️‍🗨️":"1f441-200d-1f5e8","🧔🏻‍♂️":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂️":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂️":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂️":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂️":"1f9d4-1f3ff-200d-2642-fe0f","🧔🏻‍♀️":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀️":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀️":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀️":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀️":"1f9d4-1f3ff-200d-2640-fe0f","👱🏻‍♀️":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀️":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀️":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀️":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀️":"1f471-1f3ff-200d-2640-fe0f","👱🏻‍♂️":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂️":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂️":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂️":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂️":"1f471-1f3ff-200d-2642-fe0f","🙍🏻‍♂️":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂️":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂️":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂️":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂️":"1f64d-1f3ff-200d-2642-fe0f","🙍🏻‍♀️":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀️":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀️":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀️":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀️":"1f64d-1f3ff-200d-2640-fe0f","🙎🏻‍♂️":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂️":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂️":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂️":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂️":"1f64e-1f3ff-200d-2642-fe0f","🙎🏻‍♀️":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀️":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀️":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀️":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀️":"1f64e-1f3ff-200d-2640-fe0f","🙅🏻‍♂️":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂️":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂️":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂️":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂️":"1f645-1f3ff-200d-2642-fe0f","🙅🏻‍♀️":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀️":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀️":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀️":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀️":"1f645-1f3ff-200d-2640-fe0f","🙆🏻‍♂️":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂️":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂️":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂️":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂️":"1f646-1f3ff-200d-2642-fe0f","🙆🏻‍♀️":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀️":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀️":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀️":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀️":"1f646-1f3ff-200d-2640-fe0f","💁🏻‍♂️":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂️":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂️":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂️":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂️":"1f481-1f3ff-200d-2642-fe0f","💁🏻‍♀️":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀️":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀️":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀️":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀️":"1f481-1f3ff-200d-2640-fe0f","🙋🏻‍♂️":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂️":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂️":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂️":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂️":"1f64b-1f3ff-200d-2642-fe0f","🙋🏻‍♀️":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀️":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀️":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀️":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀️":"1f64b-1f3ff-200d-2640-fe0f","🧏🏻‍♂️":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂️":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂️":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂️":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂️":"1f9cf-1f3ff-200d-2642-fe0f","🧏🏻‍♀️":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀️":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀️":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀️":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀️":"1f9cf-1f3ff-200d-2640-fe0f","🙇🏻‍♂️":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂️":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂️":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂️":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂️":"1f647-1f3ff-200d-2642-fe0f","🙇🏻‍♀️":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀️":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀️":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀️":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀️":"1f647-1f3ff-200d-2640-fe0f","🤦🏻‍♂️":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂️":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂️":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂️":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂️":"1f926-1f3ff-200d-2642-fe0f","🤦🏻‍♀️":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀️":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀️":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀️":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀️":"1f926-1f3ff-200d-2640-fe0f","🤷🏻‍♂️":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂️":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂️":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂️":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂️":"1f937-1f3ff-200d-2642-fe0f","🤷🏻‍♀️":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀️":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀️":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀️":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀️":"1f937-1f3ff-200d-2640-fe0f","🧑🏻‍⚕️":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕️":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕️":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕️":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕️":"1f9d1-1f3ff-200d-2695-fe0f","👨🏻‍⚕️":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕️":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕️":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕️":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕️":"1f468-1f3ff-200d-2695-fe0f","👩🏻‍⚕️":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕️":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕️":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕️":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕️":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍⚖️":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖️":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖️":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖️":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖️":"1f9d1-1f3ff-200d-2696-fe0f","👨🏻‍⚖️":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖️":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖️":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖️":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖️":"1f468-1f3ff-200d-2696-fe0f","👩🏻‍⚖️":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖️":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖️":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖️":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖️":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍✈️":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈️":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈️":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈️":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈️":"1f9d1-1f3ff-200d-2708-fe0f","👨🏻‍✈️":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈️":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈️":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈️":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈️":"1f468-1f3ff-200d-2708-fe0f","👩🏻‍✈️":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈️":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈️":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈️":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈️":"1f469-1f3ff-200d-2708-fe0f","👮🏻‍♂️":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂️":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂️":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂️":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂️":"1f46e-1f3ff-200d-2642-fe0f","👮🏻‍♀️":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀️":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀️":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀️":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀️":"1f46e-1f3ff-200d-2640-fe0f","🕵️‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂️":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂️":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂️":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂️":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂️":"1f575-1f3ff-200d-2642-fe0f","🕵️‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀️":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀️":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀️":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀️":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀️":"1f575-1f3ff-200d-2640-fe0f","💂🏻‍♂️":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂️":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂️":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂️":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂️":"1f482-1f3ff-200d-2642-fe0f","💂🏻‍♀️":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀️":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀️":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀️":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀️":"1f482-1f3ff-200d-2640-fe0f","👷🏻‍♂️":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂️":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂️":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂️":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂️":"1f477-1f3ff-200d-2642-fe0f","👷🏻‍♀️":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀️":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀️":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀️":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀️":"1f477-1f3ff-200d-2640-fe0f","👳🏻‍♂️":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂️":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂️":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂️":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂️":"1f473-1f3ff-200d-2642-fe0f","👳🏻‍♀️":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀️":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀️":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀️":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀️":"1f473-1f3ff-200d-2640-fe0f","🤵🏻‍♂️":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂️":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂️":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂️":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂️":"1f935-1f3ff-200d-2642-fe0f","🤵🏻‍♀️":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀️":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀️":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀️":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀️":"1f935-1f3ff-200d-2640-fe0f","👰🏻‍♂️":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂️":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂️":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂️":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂️":"1f470-1f3ff-200d-2642-fe0f","👰🏻‍♀️":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀️":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀️":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀️":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀️":"1f470-1f3ff-200d-2640-fe0f","🦸🏻‍♂️":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂️":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂️":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂️":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂️":"1f9b8-1f3ff-200d-2642-fe0f","🦸🏻‍♀️":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀️":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀️":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀️":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀️":"1f9b8-1f3ff-200d-2640-fe0f","🦹🏻‍♂️":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂️":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂️":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂️":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂️":"1f9b9-1f3ff-200d-2642-fe0f","🦹🏻‍♀️":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀️":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀️":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀️":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀️":"1f9b9-1f3ff-200d-2640-fe0f","🧙🏻‍♂️":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂️":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂️":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂️":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂️":"1f9d9-1f3ff-200d-2642-fe0f","🧙🏻‍♀️":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀️":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀️":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀️":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀️":"1f9d9-1f3ff-200d-2640-fe0f","🧚🏻‍♂️":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂️":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂️":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂️":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂️":"1f9da-1f3ff-200d-2642-fe0f","🧚🏻‍♀️":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀️":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀️":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀️":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀️":"1f9da-1f3ff-200d-2640-fe0f","🧛🏻‍♂️":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂️":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂️":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂️":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂️":"1f9db-1f3ff-200d-2642-fe0f","🧛🏻‍♀️":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀️":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀️":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀️":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀️":"1f9db-1f3ff-200d-2640-fe0f","🧜🏻‍♂️":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂️":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂️":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂️":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂️":"1f9dc-1f3ff-200d-2642-fe0f","🧜🏻‍♀️":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀️":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀️":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀️":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀️":"1f9dc-1f3ff-200d-2640-fe0f","🧝🏻‍♂️":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂️":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂️":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂️":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂️":"1f9dd-1f3ff-200d-2642-fe0f","🧝🏻‍♀️":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀️":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀️":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀️":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀️":"1f9dd-1f3ff-200d-2640-fe0f","💆🏻‍♂️":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂️":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂️":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂️":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂️":"1f486-1f3ff-200d-2642-fe0f","💆🏻‍♀️":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀️":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀️":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀️":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀️":"1f486-1f3ff-200d-2640-fe0f","💇🏻‍♂️":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂️":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂️":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂️":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂️":"1f487-1f3ff-200d-2642-fe0f","💇🏻‍♀️":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀️":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀️":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀️":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀️":"1f487-1f3ff-200d-2640-fe0f","🚶🏻‍♂️":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂️":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂️":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂️":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂️":"1f6b6-1f3ff-200d-2642-fe0f","🚶🏻‍♀️":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀️":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀️":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀️":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀️":"1f6b6-1f3ff-200d-2640-fe0f","🧍🏻‍♂️":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂️":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂️":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂️":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂️":"1f9cd-1f3ff-200d-2642-fe0f","🧍🏻‍♀️":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀️":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀️":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀️":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀️":"1f9cd-1f3ff-200d-2640-fe0f","🧎🏻‍♂️":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂️":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂️":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂️":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂️":"1f9ce-1f3ff-200d-2642-fe0f","🧎🏻‍♀️":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀️":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀️":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀️":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀️":"1f9ce-1f3ff-200d-2640-fe0f","🏃🏻‍♂️":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂️":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂️":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂️":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂️":"1f3c3-1f3ff-200d-2642-fe0f","🏃🏻‍♀️":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀️":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀️":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀️":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀️":"1f3c3-1f3ff-200d-2640-fe0f","🧖🏻‍♂️":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂️":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂️":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂️":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂️":"1f9d6-1f3ff-200d-2642-fe0f","🧖🏻‍♀️":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀️":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀️":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀️":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀️":"1f9d6-1f3ff-200d-2640-fe0f","🧗🏻‍♂️":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂️":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂️":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂️":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂️":"1f9d7-1f3ff-200d-2642-fe0f","🧗🏻‍♀️":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀️":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀️":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀️":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀️":"1f9d7-1f3ff-200d-2640-fe0f","🏌️‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂️":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂️":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂️":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂️":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂️":"1f3cc-1f3ff-200d-2642-fe0f","🏌️‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀️":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀️":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀️":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀️":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀️":"1f3cc-1f3ff-200d-2640-fe0f","🏄🏻‍♂️":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂️":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂️":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂️":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂️":"1f3c4-1f3ff-200d-2642-fe0f","🏄🏻‍♀️":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀️":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀️":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀️":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀️":"1f3c4-1f3ff-200d-2640-fe0f","🚣🏻‍♂️":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂️":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂️":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂️":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂️":"1f6a3-1f3ff-200d-2642-fe0f","🚣🏻‍♀️":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀️":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀️":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀️":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀️":"1f6a3-1f3ff-200d-2640-fe0f","🏊🏻‍♂️":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂️":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂️":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂️":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂️":"1f3ca-1f3ff-200d-2642-fe0f","🏊🏻‍♀️":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀️":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀️":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀️":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀️":"1f3ca-1f3ff-200d-2640-fe0f","⛹️‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂️":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂️":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂️":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂️":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂️":"26f9-1f3ff-200d-2642-fe0f","⛹️‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀️":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀️":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀️":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀️":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀️":"26f9-1f3ff-200d-2640-fe0f","🏋️‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂️":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂️":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂️":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂️":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂️":"1f3cb-1f3ff-200d-2642-fe0f","🏋️‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀️":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀️":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀️":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀️":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀️":"1f3cb-1f3ff-200d-2640-fe0f","🚴🏻‍♂️":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂️":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂️":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂️":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂️":"1f6b4-1f3ff-200d-2642-fe0f","🚴🏻‍♀️":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀️":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀️":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀️":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀️":"1f6b4-1f3ff-200d-2640-fe0f","🚵🏻‍♂️":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂️":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂️":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂️":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂️":"1f6b5-1f3ff-200d-2642-fe0f","🚵🏻‍♀️":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀️":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀️":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀️":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀️":"1f6b5-1f3ff-200d-2640-fe0f","🤸🏻‍♂️":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂️":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂️":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂️":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂️":"1f938-1f3ff-200d-2642-fe0f","🤸🏻‍♀️":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀️":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀️":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀️":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀️":"1f938-1f3ff-200d-2640-fe0f","🤽🏻‍♂️":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂️":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂️":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂️":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂️":"1f93d-1f3ff-200d-2642-fe0f","🤽🏻‍♀️":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀️":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀️":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀️":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀️":"1f93d-1f3ff-200d-2640-fe0f","🤾🏻‍♂️":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂️":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂️":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂️":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂️":"1f93e-1f3ff-200d-2642-fe0f","🤾🏻‍♀️":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀️":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀️":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀️":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀️":"1f93e-1f3ff-200d-2640-fe0f","🤹🏻‍♂️":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂️":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂️":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂️":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂️":"1f939-1f3ff-200d-2642-fe0f","🤹🏻‍♀️":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀️":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀️":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀️":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀️":"1f939-1f3ff-200d-2640-fe0f","🧘🏻‍♂️":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂️":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂️":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂️":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂️":"1f9d8-1f3ff-200d-2642-fe0f","🧘🏻‍♀️":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀️":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀️":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀️":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀️":"1f9d8-1f3ff-200d-2640-fe0f","🧑‍🤝‍🧑":"1f9d1-200d-1f91d-200d-1f9d1","👩‍❤‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤‍👩":"1f469-200d-2764-fe0f-200d-1f469","👨‍👩‍👦":"1f468-200d-1f469-200d-1f466","👨‍👩‍👧":"1f468-200d-1f469-200d-1f467","👨‍👨‍👦":"1f468-200d-1f468-200d-1f466","👨‍👨‍👧":"1f468-200d-1f468-200d-1f467","👩‍👩‍👦":"1f469-200d-1f469-200d-1f466","👩‍👩‍👧":"1f469-200d-1f469-200d-1f467","👨‍👦‍👦":"1f468-200d-1f466-200d-1f466","👨‍👧‍👦":"1f468-200d-1f467-200d-1f466","👨‍👧‍👧":"1f468-200d-1f467-200d-1f467","👩‍👦‍👦":"1f469-200d-1f466-200d-1f466","👩‍👧‍👦":"1f469-200d-1f467-200d-1f466","👩‍👧‍👧":"1f469-200d-1f467-200d-1f467","🏳️‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","👩‍❤️‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤️‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤️‍👩":"1f469-200d-2764-fe0f-200d-1f469","🧑🏻‍🤝‍🧑🏻":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb","🧑🏻‍🤝‍🧑🏼":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc","🧑🏻‍🤝‍🧑🏽":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd","🧑🏻‍🤝‍🧑🏾":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe","🧑🏻‍🤝‍🧑🏿":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff","🧑🏼‍🤝‍🧑🏻":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb","🧑🏼‍🤝‍🧑🏼":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc","🧑🏼‍🤝‍🧑🏽":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd","🧑🏼‍🤝‍🧑🏾":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe","🧑🏼‍🤝‍🧑🏿":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff","🧑🏽‍🤝‍🧑🏻":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb","🧑🏽‍🤝‍🧑🏼":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc","🧑🏽‍🤝‍🧑🏽":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd","🧑🏽‍🤝‍🧑🏾":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe","🧑🏽‍🤝‍🧑🏿":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff","🧑🏾‍🤝‍🧑🏻":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb","🧑🏾‍🤝‍🧑🏼":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc","🧑🏾‍🤝‍🧑🏽":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd","🧑🏾‍🤝‍🧑🏾":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe","🧑🏾‍🤝‍🧑🏿":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff","🧑🏿‍🤝‍🧑🏻":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb","🧑🏿‍🤝‍🧑🏼":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc","🧑🏿‍🤝‍🧑🏽":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd","🧑🏿‍🤝‍🧑🏾":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe","🧑🏿‍🤝‍🧑🏿":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff","👩🏻‍🤝‍👩🏼":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc","👩🏻‍🤝‍👩🏽":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd","👩🏻‍🤝‍👩🏾":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👩🏿":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff","👩🏼‍🤝‍👩🏻":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb","👩🏼‍🤝‍👩🏽":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd","👩🏼‍🤝‍👩🏾":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe","👩🏼‍🤝‍👩🏿":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff","👩🏽‍🤝‍👩🏻":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb","👩🏽‍🤝‍👩🏼":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc","👩🏽‍🤝‍👩🏾":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe","👩🏽‍🤝‍👩🏿":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff","👩🏾‍🤝‍👩🏻":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb","👩🏾‍🤝‍👩🏼":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc","👩🏾‍🤝‍👩🏽":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd","👩🏾‍🤝‍👩🏿":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff","👩🏿‍🤝‍👩🏻":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb","👩🏿‍🤝‍👩🏼":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc","👩🏿‍🤝‍👩🏽":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd","👩🏿‍🤝‍👩🏾":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👨🏼":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc","👩🏻‍🤝‍👨🏽":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd","👩🏻‍🤝‍👨🏾":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe","👩🏻‍🤝‍👨🏿":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff","👩🏼‍🤝‍👨🏻":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb","👩🏼‍🤝‍👨🏽":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd","👩🏼‍🤝‍👨🏾":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe","👩🏼‍🤝‍👨🏿":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff","👩🏽‍🤝‍👨🏻":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb","👩🏽‍🤝‍👨🏼":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc","👩🏽‍🤝‍👨🏾":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe","👩🏽‍🤝‍👨🏿":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff","👩🏾‍🤝‍👨🏻":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb","👩🏾‍🤝‍👨🏼":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc","👩🏾‍🤝‍👨🏽":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd","👩🏾‍🤝‍👨🏿":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff","👩🏿‍🤝‍👨🏻":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb","👩🏿‍🤝‍👨🏼":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc","👩🏿‍🤝‍👨🏽":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd","👩🏿‍🤝‍👨🏾":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏼":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc","👨🏻‍🤝‍👨🏽":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd","👨🏻‍🤝‍👨🏾":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏿":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff","👨🏼‍🤝‍👨🏻":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb","👨🏼‍🤝‍👨🏽":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd","👨🏼‍🤝‍👨🏾":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe","👨🏼‍🤝‍👨🏿":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff","👨🏽‍🤝‍👨🏻":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb","👨🏽‍🤝‍👨🏼":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc","👨🏽‍🤝‍👨🏾":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe","👨🏽‍🤝‍👨🏿":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff","👨🏾‍🤝‍👨🏻":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb","👨🏾‍🤝‍👨🏼":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc","👨🏾‍🤝‍👨🏽":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd","👨🏾‍🤝‍👨🏿":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff","👨🏿‍🤝‍👨🏻":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb","👨🏿‍🤝‍👨🏼":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc","👨🏿‍🤝‍👨🏽":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd","👨🏿‍🤝‍👨🏾":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe","👩‍❤‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","👨‍👩‍👧‍👦":"1f468-200d-1f469-200d-1f467-200d-1f466","👨‍👩‍👦‍👦":"1f468-200d-1f469-200d-1f466-200d-1f466","👨‍👩‍👧‍👧":"1f468-200d-1f469-200d-1f467-200d-1f467","👨‍👨‍👧‍👦":"1f468-200d-1f468-200d-1f467-200d-1f466","👨‍👨‍👦‍👦":"1f468-200d-1f468-200d-1f466-200d-1f466","👨‍👨‍👧‍👧":"1f468-200d-1f468-200d-1f467-200d-1f467","👩‍👩‍👧‍👦":"1f469-200d-1f469-200d-1f467-200d-1f466","👩‍👩‍👦‍👦":"1f469-200d-1f469-200d-1f466-200d-1f466","👩‍👩‍👧‍👧":"1f469-200d-1f469-200d-1f467-200d-1f467","🏴󠁧󠁢󠁥󠁮󠁧󠁿":"1f3f4-e0067-e0062-e0065-e006e-e0067-e007f","🏴󠁧󠁢󠁳󠁣󠁴󠁿":"1f3f4-e0067-e0062-e0073-e0063-e0074-e007f","🏴󠁧󠁢󠁷󠁬󠁳󠁿":"1f3f4-e0067-e0062-e0077-e006c-e0073-e007f","👩‍❤️‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤️‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤️‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤️‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤️‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤️‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤️‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤️‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤️‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤️‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤️‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤️‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤️‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤️‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤️‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤️‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤️‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤️‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤️‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤️‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤️‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤️‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤️‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤️‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤️‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤️‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤️‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤️‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤️‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤️‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤️‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤️‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤️‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤️‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤️‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤️‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤️‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤️‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤️‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤️‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤️‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤️‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤️‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤️‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤️‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤️‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤️‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤️‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤️‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤️‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤️‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤️‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤️‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤️‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤️‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤️‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤️‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤️‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤️‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤️‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤️‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤️‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤️‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤️‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤️‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤️‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤️‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤️‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤️‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤️‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤️‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤️‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤️‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤️‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤️‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤️‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤️‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤️‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤️‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤️‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤️‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤️‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤️‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤️‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤️‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤️‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤️‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤️‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤️‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤️‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤️‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤️‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤️‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤️‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤️‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤️‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤️‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤️‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","🧑🏻‍❤‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","🧑🏻‍❤️‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤️‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤️‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤️‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤️‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤️‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤️‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤️‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤️‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤️‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤️‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤️‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤️‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤️‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤️‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤️‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤️‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤️‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤️‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤️‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤️‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤️‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤️‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤️‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤️‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤️‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤️‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤️‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤️‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤️‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤️‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤️‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤️‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤️‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤️‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤️‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤️‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤️‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤️‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤️‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤️‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤️‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤️‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤️‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤️‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤️‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤️‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤️‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤️‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤️‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤️‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤️‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤️‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤️‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤️‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤️‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤️‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤️‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤️‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤️‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤️‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤️‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤️‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤️‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤️‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤️‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤️‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤️‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤️‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤️‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤️‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤️‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤️‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤️‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤️‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤️‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤️‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤️‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤️‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤️‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤️‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤️‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤️‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤️‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤️‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤️‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤️‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤️‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤️‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤️‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤️‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤️‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤️‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤️‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤️‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff"}
\ No newline at end of file
+{"😀":"1f600","😃":"1f603","😄":"1f604","😁":"1f601","😆":"1f606","😅":"1f605","🤣":"1f923","😂":"1f602","🙂":"1f642","🙃":"1f643","🫠":"1fae0","😉":"1f609","😊":"1f60a","😇":"1f607","🥰":"1f970","😍":"1f60d","🤩":"1f929","😘":"1f618","😗":"1f617","☺":"263a","😚":"1f61a","😙":"1f619","🥲":"1f972","😋":"1f60b","😛":"1f61b","😜":"1f61c","🤪":"1f92a","😝":"1f61d","🤑":"1f911","🤗":"1f917","🤭":"1f92d","🫢":"1fae2","🫣":"1fae3","🤫":"1f92b","🤔":"1f914","🫡":"1fae1","🤐":"1f910","🤨":"1f928","😐":"1f610","😑":"1f611","😶":"1f636","🫥":"1fae5","😏":"1f60f","😒":"1f612","🙄":"1f644","😬":"1f62c","🤥":"1f925","😌":"1f60c","😔":"1f614","😪":"1f62a","🤤":"1f924","😴":"1f634","😷":"1f637","🤒":"1f912","🤕":"1f915","🤢":"1f922","🤮":"1f92e","🤧":"1f927","🥵":"1f975","🥶":"1f976","🥴":"1f974","😵":"1f635","🤯":"1f92f","🤠":"1f920","🥳":"1f973","🥸":"1f978","😎":"1f60e","🤓":"1f913","🧐":"1f9d0","😕":"1f615","🫤":"1fae4","😟":"1f61f","🙁":"1f641","☹":"2639","😮":"1f62e","😯":"1f62f","😲":"1f632","😳":"1f633","🥺":"1f97a","🥹":"1f979","😦":"1f626","😧":"1f627","😨":"1f628","😰":"1f630","😥":"1f625","😢":"1f622","😭":"1f62d","😱":"1f631","😖":"1f616","😣":"1f623","😞":"1f61e","😓":"1f613","😩":"1f629","😫":"1f62b","🥱":"1f971","😤":"1f624","😡":"1f621","😠":"1f620","🤬":"1f92c","😈":"1f608","👿":"1f47f","💀":"1f480","☠":"2620","💩":"1f4a9","🤡":"1f921","👹":"1f479","👺":"1f47a","👻":"1f47b","👽":"1f47d","👾":"1f47e","🤖":"1f916","😺":"1f63a","😸":"1f638","😹":"1f639","😻":"1f63b","😼":"1f63c","😽":"1f63d","🙀":"1f640","😿":"1f63f","😾":"1f63e","🙈":"1f648","🙉":"1f649","🙊":"1f64a","💋":"1f48b","💌":"1f48c","💘":"1f498","💝":"1f49d","💖":"1f496","💗":"1f497","💓":"1f493","💞":"1f49e","💕":"1f495","💟":"1f49f","❣":"2763","💔":"1f494","❤":"2764","🧡":"1f9e1","💛":"1f49b","💚":"1f49a","💙":"1f499","💜":"1f49c","🤎":"1f90e","🖤":"1f5a4","🤍":"1f90d","💯":"1f4af","💢":"1f4a2","💥":"1f4a5","💫":"1f4ab","💦":"1f4a6","💨":"1f4a8","🕳":"1f573","💣":"1f4a3","💬":"1f4ac","🗨":"1f5e8","🗯":"1f5ef","💭":"1f4ad","💤":"1f4a4","👋":"1f44b","🤚":"1f91a","🖐":"1f590","✋":"270b","🖖":"1f596","🫱":"1faf1","🫲":"1faf2","🫳":"1faf3","🫴":"1faf4","👌":"1f44c","🤌":"1f90c","🤏":"1f90f","✌":"270c","🤞":"1f91e","🫰":"1faf0","🤟":"1f91f","🤘":"1f918","🤙":"1f919","👈":"1f448","👉":"1f449","👆":"1f446","🖕":"1f595","👇":"1f447","☝":"261d","🫵":"1faf5","👍":"1f44d","👎":"1f44e","✊":"270a","👊":"1f44a","🤛":"1f91b","🤜":"1f91c","👏":"1f44f","🙌":"1f64c","🫶":"1faf6","👐":"1f450","🤲":"1f932","🤝":"1f91d","🙏":"1f64f","✍":"270d","💅":"1f485","🤳":"1f933","💪":"1f4aa","🦾":"1f9be","🦿":"1f9bf","🦵":"1f9b5","🦶":"1f9b6","👂":"1f442","🦻":"1f9bb","👃":"1f443","🧠":"1f9e0","🫀":"1fac0","🫁":"1fac1","🦷":"1f9b7","🦴":"1f9b4","👀":"1f440","👁":"1f441","👅":"1f445","👄":"1f444","🫦":"1fae6","👶":"1f476","🧒":"1f9d2","👦":"1f466","👧":"1f467","🧑":"1f9d1","👱":"1f471","👨":"1f468","🧔":"1f9d4","👩":"1f469","🧓":"1f9d3","👴":"1f474","👵":"1f475","🙍":"1f64d","🙎":"1f64e","🙅":"1f645","🙆":"1f646","💁":"1f481","🙋":"1f64b","🧏":"1f9cf","🙇":"1f647","🤦":"1f926","🤷":"1f937","👮":"1f46e","🕵":"1f575","💂":"1f482","🥷":"1f977","👷":"1f477","🫅":"1fac5","🤴":"1f934","👸":"1f478","👳":"1f473","👲":"1f472","🧕":"1f9d5","🤵":"1f935","👰":"1f470","🤰":"1f930","🫃":"1fac3","🫄":"1fac4","🤱":"1f931","👼":"1f47c","🎅":"1f385","🤶":"1f936","🦸":"1f9b8","🦹":"1f9b9","🧙":"1f9d9","🧚":"1f9da","🧛":"1f9db","🧜":"1f9dc","🧝":"1f9dd","🧞":"1f9de","🧟":"1f9df","🧌":"1f9cc","💆":"1f486","💇":"1f487","🚶":"1f6b6","🧍":"1f9cd","🧎":"1f9ce","🏃":"1f3c3","💃":"1f483","🕺":"1f57a","🕴":"1f574","👯":"1f46f","🧖":"1f9d6","🧗":"1f9d7","🤺":"1f93a","🏇":"1f3c7","⛷":"26f7","🏂":"1f3c2","🏌":"1f3cc","🏄":"1f3c4","🚣":"1f6a3","🏊":"1f3ca","⛹":"26f9","🏋":"1f3cb","🚴":"1f6b4","🚵":"1f6b5","🤸":"1f938","🤼":"1f93c","🤽":"1f93d","🤾":"1f93e","🤹":"1f939","🧘":"1f9d8","🛀":"1f6c0","🛌":"1f6cc","👭":"1f46d","👫":"1f46b","👬":"1f46c","💏":"1f48f","💑":"1f491","👪":"1f46a","🗣":"1f5e3","👤":"1f464","👥":"1f465","🫂":"1fac2","👣":"1f463","🏻":"1f463","🏼":"1f463","🏽":"1f463","🏾":"1f463","🏿":"1f463","🦰":"1f463","🦱":"1f463","🦳":"1f463","🦲":"1f463","🐵":"1f435","🐒":"1f412","🦍":"1f98d","🦧":"1f9a7","🐶":"1f436","🐕":"1f415","🦮":"1f9ae","🐩":"1f429","🐺":"1f43a","🦊":"1f98a","🦝":"1f99d","🐱":"1f431","🐈":"1f408","🦁":"1f981","🐯":"1f42f","🐅":"1f405","🐆":"1f406","🐴":"1f434","🐎":"1f40e","🦄":"1f984","🦓":"1f993","🦌":"1f98c","🦬":"1f9ac","🐮":"1f42e","🐂":"1f402","🐃":"1f403","🐄":"1f404","🐷":"1f437","🐖":"1f416","🐗":"1f417","🐽":"1f43d","🐏":"1f40f","🐑":"1f411","🐐":"1f410","🐪":"1f42a","🐫":"1f42b","🦙":"1f999","🦒":"1f992","🐘":"1f418","🦣":"1f9a3","🦏":"1f98f","🦛":"1f99b","🐭":"1f42d","🐁":"1f401","🐀":"1f400","🐹":"1f439","🐰":"1f430","🐇":"1f407","🐿":"1f43f","🦫":"1f9ab","🦔":"1f994","🦇":"1f987","🐻":"1f43b","🐨":"1f428","🐼":"1f43c","🦥":"1f9a5","🦦":"1f9a6","🦨":"1f9a8","🦘":"1f998","🦡":"1f9a1","🐾":"1f43e","🦃":"1f983","🐔":"1f414","🐓":"1f413","🐣":"1f423","🐤":"1f424","🐥":"1f425","🐦":"1f426","🐧":"1f427","🕊":"1f54a","🦅":"1f985","🦆":"1f986","🦢":"1f9a2","🦉":"1f989","🦤":"1f9a4","🪶":"1fab6","🦩":"1f9a9","🦚":"1f99a","🦜":"1f99c","🐸":"1f438","🐊":"1f40a","🐢":"1f422","🦎":"1f98e","🐍":"1f40d","🐲":"1f432","🐉":"1f409","🦕":"1f995","🦖":"1f996","🐳":"1f433","🐋":"1f40b","🐬":"1f42c","🦭":"1f9ad","🐟":"1f41f","🐠":"1f420","🐡":"1f421","🦈":"1f988","🐙":"1f419","🐚":"1f41a","🪸":"1fab8","🐌":"1f40c","🦋":"1f98b","🐛":"1f41b","🐜":"1f41c","🐝":"1f41d","🪲":"1fab2","🐞":"1f41e","🦗":"1f997","🪳":"1fab3","🕷":"1f577","🕸":"1f578","🦂":"1f982","🦟":"1f99f","🪰":"1fab0","🪱":"1fab1","🦠":"1f9a0","💐":"1f490","🌸":"1f338","💮":"1f4ae","🪷":"1fab7","🏵":"1f3f5","🌹":"1f339","🥀":"1f940","🌺":"1f33a","🌻":"1f33b","🌼":"1f33c","🌷":"1f337","🌱":"1f331","🪴":"1fab4","🌲":"1f332","🌳":"1f333","🌴":"1f334","🌵":"1f335","🌾":"1f33e","🌿":"1f33f","☘":"2618","🍀":"1f340","🍁":"1f341","🍂":"1f342","🍃":"1f343","🪹":"1fab9","🪺":"1faba","🍇":"1f347","🍈":"1f348","🍉":"1f349","🍊":"1f34a","🍋":"1f34b","🍌":"1f34c","🍍":"1f34d","🥭":"1f96d","🍎":"1f34e","🍏":"1f34f","🍐":"1f350","🍑":"1f351","🍒":"1f352","🍓":"1f353","🫐":"1fad0","🥝":"1f95d","🍅":"1f345","🫒":"1fad2","🥥":"1f965","🥑":"1f951","🍆":"1f346","🥔":"1f954","🥕":"1f955","🌽":"1f33d","🌶":"1f336","🫑":"1fad1","🥒":"1f952","🥬":"1f96c","🥦":"1f966","🧄":"1f9c4","🧅":"1f9c5","🍄":"1f344","🥜":"1f95c","🫘":"1fad8","🌰":"1f330","🍞":"1f35e","🥐":"1f950","🥖":"1f956","🫓":"1fad3","🥨":"1f968","🥯":"1f96f","🥞":"1f95e","🧇":"1f9c7","🧀":"1f9c0","🍖":"1f356","🍗":"1f357","🥩":"1f969","🥓":"1f953","🍔":"1f354","🍟":"1f35f","🍕":"1f355","🌭":"1f32d","🥪":"1f96a","🌮":"1f32e","🌯":"1f32f","🫔":"1fad4","🥙":"1f959","🧆":"1f9c6","🥚":"1f95a","🍳":"1f373","🥘":"1f958","🍲":"1f372","🫕":"1fad5","🥣":"1f963","🥗":"1f957","🍿":"1f37f","🧈":"1f9c8","🧂":"1f9c2","🥫":"1f96b","🍱":"1f371","🍘":"1f358","🍙":"1f359","🍚":"1f35a","🍛":"1f35b","🍜":"1f35c","🍝":"1f35d","🍠":"1f360","🍢":"1f362","🍣":"1f363","🍤":"1f364","🍥":"1f365","🥮":"1f96e","🍡":"1f361","🥟":"1f95f","🥠":"1f960","🥡":"1f961","🦀":"1f980","🦞":"1f99e","🦐":"1f990","🦑":"1f991","🦪":"1f9aa","🍦":"1f366","🍧":"1f367","🍨":"1f368","🍩":"1f369","🍪":"1f36a","🎂":"1f382","🍰":"1f370","🧁":"1f9c1","🥧":"1f967","🍫":"1f36b","🍬":"1f36c","🍭":"1f36d","🍮":"1f36e","🍯":"1f36f","🍼":"1f37c","🥛":"1f95b","☕":"2615","🫖":"1fad6","🍵":"1f375","🍶":"1f376","🍾":"1f37e","🍷":"1f377","🍸":"1f378","🍹":"1f379","🍺":"1f37a","🍻":"1f37b","🥂":"1f942","🥃":"1f943","🫗":"1fad7","🥤":"1f964","🧋":"1f9cb","🧃":"1f9c3","🧉":"1f9c9","🧊":"1f9ca","🥢":"1f962","🍽":"1f37d","🍴":"1f374","🥄":"1f944","🔪":"1f52a","🫙":"1fad9","🏺":"1f3fa","🌍":"1f30d","🌎":"1f30e","🌏":"1f30f","🌐":"1f310","🗺":"1f5fa","🗾":"1f5fe","🧭":"1f9ed","🏔":"1f3d4","⛰":"26f0","🌋":"1f30b","🗻":"1f5fb","🏕":"1f3d5","🏖":"1f3d6","🏜":"1f3dc","🏝":"1f3dd","🏞":"1f3de","🏟":"1f3df","🏛":"1f3db","🏗":"1f3d7","🧱":"1f9f1","🪨":"1faa8","🪵":"1fab5","🛖":"1f6d6","🏘":"1f3d8","🏚":"1f3da","🏠":"1f3e0","🏡":"1f3e1","🏢":"1f3e2","🏣":"1f3e3","🏤":"1f3e4","🏥":"1f3e5","🏦":"1f3e6","🏨":"1f3e8","🏩":"1f3e9","🏪":"1f3ea","🏫":"1f3eb","🏬":"1f3ec","🏭":"1f3ed","🏯":"1f3ef","🏰":"1f3f0","💒":"1f492","🗼":"1f5fc","🗽":"1f5fd","⛪":"26ea","🕌":"1f54c","🛕":"1f6d5","🕍":"1f54d","⛩":"26e9","🕋":"1f54b","⛲":"26f2","⛺":"26fa","🌁":"1f301","🌃":"1f303","🏙":"1f3d9","🌄":"1f304","🌅":"1f305","🌆":"1f306","🌇":"1f307","🌉":"1f309","♨":"2668","🎠":"1f3a0","🛝":"1f6dd","🎡":"1f3a1","🎢":"1f3a2","💈":"1f488","🎪":"1f3aa","🚂":"1f682","🚃":"1f683","🚄":"1f684","🚅":"1f685","🚆":"1f686","🚇":"1f687","🚈":"1f688","🚉":"1f689","🚊":"1f68a","🚝":"1f69d","🚞":"1f69e","🚋":"1f68b","🚌":"1f68c","🚍":"1f68d","🚎":"1f68e","🚐":"1f690","🚑":"1f691","🚒":"1f692","🚓":"1f693","🚔":"1f694","🚕":"1f695","🚖":"1f696","🚗":"1f697","🚘":"1f698","🚙":"1f699","🛻":"1f6fb","🚚":"1f69a","🚛":"1f69b","🚜":"1f69c","🏎":"1f3ce","🏍":"1f3cd","🛵":"1f6f5","🦽":"1f9bd","🦼":"1f9bc","🛺":"1f6fa","🚲":"1f6b2","🛴":"1f6f4","🛹":"1f6f9","🛼":"1f6fc","🚏":"1f68f","🛣":"1f6e3","🛤":"1f6e4","🛢":"1f6e2","⛽":"26fd","🛞":"1f6de","🚨":"1f6a8","🚥":"1f6a5","🚦":"1f6a6","🛑":"1f6d1","🚧":"1f6a7","⚓":"2693","🛟":"1f6df","⛵":"26f5","🛶":"1f6f6","🚤":"1f6a4","🛳":"1f6f3","⛴":"26f4","🛥":"1f6e5","🚢":"1f6a2","✈":"2708","🛩":"1f6e9","🛫":"1f6eb","🛬":"1f6ec","🪂":"1fa82","💺":"1f4ba","🚁":"1f681","🚟":"1f69f","🚠":"1f6a0","🚡":"1f6a1","🛰":"1f6f0","🚀":"1f680","🛸":"1f6f8","🛎":"1f6ce","🧳":"1f9f3","⌛":"231b","⏳":"23f3","⌚":"231a","⏰":"23f0","⏱":"23f1","⏲":"23f2","🕰":"1f570","🕛":"1f55b","🕧":"1f567","🕐":"1f550","🕜":"1f55c","🕑":"1f551","🕝":"1f55d","🕒":"1f552","🕞":"1f55e","🕓":"1f553","🕟":"1f55f","🕔":"1f554","🕠":"1f560","🕕":"1f555","🕡":"1f561","🕖":"1f556","🕢":"1f562","🕗":"1f557","🕣":"1f563","🕘":"1f558","🕤":"1f564","🕙":"1f559","🕥":"1f565","🕚":"1f55a","🕦":"1f566","🌑":"1f311","🌒":"1f312","🌓":"1f313","🌔":"1f314","🌕":"1f315","🌖":"1f316","🌗":"1f317","🌘":"1f318","🌙":"1f319","🌚":"1f31a","🌛":"1f31b","🌜":"1f31c","🌡":"1f321","☀":"2600","🌝":"1f31d","🌞":"1f31e","🪐":"1fa90","⭐":"2b50","🌟":"1f31f","🌠":"1f320","🌌":"1f30c","☁":"2601","⛅":"26c5","⛈":"26c8","🌤":"1f324","🌥":"1f325","🌦":"1f326","🌧":"1f327","🌨":"1f328","🌩":"1f329","🌪":"1f32a","🌫":"1f32b","🌬":"1f32c","🌀":"1f300","🌈":"1f308","🌂":"1f302","☂":"2602","☔":"2614","⛱":"26f1","⚡":"26a1","❄":"2744","☃":"2603","⛄":"26c4","☄":"2604","🔥":"1f525","💧":"1f4a7","🌊":"1f30a","🎃":"1f383","🎄":"1f384","🎆":"1f386","🎇":"1f387","🧨":"1f9e8","✨":"2728","🎈":"1f388","🎉":"1f389","🎊":"1f38a","🎋":"1f38b","🎍":"1f38d","🎎":"1f38e","🎏":"1f38f","🎐":"1f390","🎑":"1f391","🧧":"1f9e7","🎀":"1f380","🎁":"1f381","🎗":"1f397","🎟":"1f39f","🎫":"1f3ab","🎖":"1f396","🏆":"1f3c6","🏅":"1f3c5","🥇":"1f947","🥈":"1f948","🥉":"1f949","⚽":"26bd","⚾":"26be","🥎":"1f94e","🏀":"1f3c0","🏐":"1f3d0","🏈":"1f3c8","🏉":"1f3c9","🎾":"1f3be","🥏":"1f94f","🎳":"1f3b3","🏏":"1f3cf","🏑":"1f3d1","🏒":"1f3d2","🥍":"1f94d","🏓":"1f3d3","🏸":"1f3f8","🥊":"1f94a","🥋":"1f94b","🥅":"1f945","⛳":"26f3","⛸":"26f8","🎣":"1f3a3","🤿":"1f93f","🎽":"1f3bd","🎿":"1f3bf","🛷":"1f6f7","🥌":"1f94c","🎯":"1f3af","🪀":"1fa80","🪁":"1fa81","🎱":"1f3b1","🔮":"1f52e","🪄":"1fa84","🧿":"1f9ff","🪬":"1faac","🎮":"1f3ae","🕹":"1f579","🎰":"1f3b0","🎲":"1f3b2","🧩":"1f9e9","🧸":"1f9f8","🪅":"1fa85","🪩":"1faa9","🪆":"1fa86","♠":"2660","♥":"2665","♦":"2666","♣":"2663","♟":"265f","🃏":"1f0cf","🀄":"1f004","🎴":"1f3b4","🎭":"1f3ad","🖼":"1f5bc","🎨":"1f3a8","🧵":"1f9f5","🪡":"1faa1","🧶":"1f9f6","🪢":"1faa2","👓":"1f453","🕶":"1f576","🥽":"1f97d","🥼":"1f97c","🦺":"1f9ba","👔":"1f454","👕":"1f455","👖":"1f456","🧣":"1f9e3","🧤":"1f9e4","🧥":"1f9e5","🧦":"1f9e6","👗":"1f457","👘":"1f458","🥻":"1f97b","🩱":"1fa71","🩲":"1fa72","🩳":"1fa73","👙":"1f459","👚":"1f45a","👛":"1f45b","👜":"1f45c","👝":"1f45d","🛍":"1f6cd","🎒":"1f392","🩴":"1fa74","👞":"1f45e","👟":"1f45f","🥾":"1f97e","🥿":"1f97f","👠":"1f460","👡":"1f461","🩰":"1fa70","👢":"1f462","👑":"1f451","👒":"1f452","🎩":"1f3a9","🎓":"1f393","🧢":"1f9e2","🪖":"1fa96","⛑":"26d1","📿":"1f4ff","💄":"1f484","💍":"1f48d","💎":"1f48e","🔇":"1f507","🔈":"1f508","🔉":"1f509","🔊":"1f50a","📢":"1f4e2","📣":"1f4e3","📯":"1f4ef","🔔":"1f514","🔕":"1f515","🎼":"1f3bc","🎵":"1f3b5","🎶":"1f3b6","🎙":"1f399","🎚":"1f39a","🎛":"1f39b","🎤":"1f3a4","🎧":"1f3a7","📻":"1f4fb","🎷":"1f3b7","🪗":"1fa97","🎸":"1f3b8","🎹":"1f3b9","🎺":"1f3ba","🎻":"1f3bb","🪕":"1fa95","🥁":"1f941","🪘":"1fa98","📱":"1f4f1","📲":"1f4f2","☎":"260e","📞":"1f4de","📟":"1f4df","📠":"1f4e0","🔋":"1f50b","🪫":"1faab","🔌":"1f50c","💻":"1f4bb","🖥":"1f5a5","🖨":"1f5a8","⌨":"2328","🖱":"1f5b1","🖲":"1f5b2","💽":"1f4bd","💾":"1f4be","💿":"1f4bf","📀":"1f4c0","🧮":"1f9ee","🎥":"1f3a5","🎞":"1f39e","📽":"1f4fd","🎬":"1f3ac","📺":"1f4fa","📷":"1f4f7","📸":"1f4f8","📹":"1f4f9","📼":"1f4fc","🔍":"1f50d","🔎":"1f50e","🕯":"1f56f","💡":"1f4a1","🔦":"1f526","🏮":"1f3ee","🪔":"1fa94","📔":"1f4d4","📕":"1f4d5","📖":"1f4d6","📗":"1f4d7","📘":"1f4d8","📙":"1f4d9","📚":"1f4da","📓":"1f4d3","📒":"1f4d2","📃":"1f4c3","📜":"1f4dc","📄":"1f4c4","📰":"1f4f0","🗞":"1f5de","📑":"1f4d1","🔖":"1f516","🏷":"1f3f7","💰":"1f4b0","🪙":"1fa99","💴":"1f4b4","💵":"1f4b5","💶":"1f4b6","💷":"1f4b7","💸":"1f4b8","💳":"1f4b3","🧾":"1f9fe","💹":"1f4b9","✉":"2709","📧":"1f4e7","📨":"1f4e8","📩":"1f4e9","📤":"1f4e4","📥":"1f4e5","📦":"1f4e6","📫":"1f4eb","📪":"1f4ea","📬":"1f4ec","📭":"1f4ed","📮":"1f4ee","🗳":"1f5f3","✏":"270f","✒":"2712","🖋":"1f58b","🖊":"1f58a","🖌":"1f58c","🖍":"1f58d","📝":"1f4dd","💼":"1f4bc","📁":"1f4c1","📂":"1f4c2","🗂":"1f5c2","📅":"1f4c5","📆":"1f4c6","🗒":"1f5d2","🗓":"1f5d3","📇":"1f4c7","📈":"1f4c8","📉":"1f4c9","📊":"1f4ca","📋":"1f4cb","📌":"1f4cc","📍":"1f4cd","📎":"1f4ce","🖇":"1f587","📏":"1f4cf","📐":"1f4d0","✂":"2702","🗃":"1f5c3","🗄":"1f5c4","🗑":"1f5d1","🔒":"1f512","🔓":"1f513","🔏":"1f50f","🔐":"1f510","🔑":"1f511","🗝":"1f5dd","🔨":"1f528","🪓":"1fa93","⛏":"26cf","⚒":"2692","🛠":"1f6e0","🗡":"1f5e1","⚔":"2694","🔫":"1f52b","🪃":"1fa83","🏹":"1f3f9","🛡":"1f6e1","🪚":"1fa9a","🔧":"1f527","🪛":"1fa9b","🔩":"1f529","⚙":"2699","🗜":"1f5dc","⚖":"2696","🦯":"1f9af","🔗":"1f517","⛓":"26d3","🪝":"1fa9d","🧰":"1f9f0","🧲":"1f9f2","🪜":"1fa9c","⚗":"2697","🧪":"1f9ea","🧫":"1f9eb","🧬":"1f9ec","🔬":"1f52c","🔭":"1f52d","📡":"1f4e1","💉":"1f489","🩸":"1fa78","💊":"1f48a","🩹":"1fa79","🩼":"1fa7c","🩺":"1fa7a","🩻":"1fa7b","🚪":"1f6aa","🛗":"1f6d7","🪞":"1fa9e","🪟":"1fa9f","🛏":"1f6cf","🛋":"1f6cb","🪑":"1fa91","🚽":"1f6bd","🪠":"1faa0","🚿":"1f6bf","🛁":"1f6c1","🪤":"1faa4","🪒":"1fa92","🧴":"1f9f4","🧷":"1f9f7","🧹":"1f9f9","🧺":"1f9fa","🧻":"1f9fb","🪣":"1faa3","🧼":"1f9fc","🫧":"1fae7","🪥":"1faa5","🧽":"1f9fd","🧯":"1f9ef","🛒":"1f6d2","🚬":"1f6ac","⚰":"26b0","🪦":"1faa6","⚱":"26b1","🗿":"1f5ff","🪧":"1faa7","🪪":"1faaa","🏧":"1f3e7","🚮":"1f6ae","🚰":"1f6b0","♿":"267f","🚹":"1f6b9","🚺":"1f6ba","🚻":"1f6bb","🚼":"1f6bc","🚾":"1f6be","🛂":"1f6c2","🛃":"1f6c3","🛄":"1f6c4","🛅":"1f6c5","⚠":"26a0","🚸":"1f6b8","⛔":"26d4","🚫":"1f6ab","🚳":"1f6b3","🚭":"1f6ad","🚯":"1f6af","🚱":"1f6b1","🚷":"1f6b7","📵":"1f4f5","🔞":"1f51e","☢":"2622","☣":"2623","⬆":"2b06","↗":"2197","➡":"27a1","↘":"2198","⬇":"2b07","↙":"2199","⬅":"2b05","↖":"2196","↕":"2195","↔":"2194","↩":"21a9","↪":"21aa","⤴":"2934","⤵":"2935","🔃":"1f503","🔄":"1f504","🔙":"1f519","🔚":"1f51a","🔛":"1f51b","🔜":"1f51c","🔝":"1f51d","🛐":"1f6d0","⚛":"269b","🕉":"1f549","✡":"2721","☸":"2638","☯":"262f","✝":"271d","☦":"2626","☪":"262a","☮":"262e","🕎":"1f54e","🔯":"1f52f","♈":"2648","♉":"2649","♊":"264a","♋":"264b","♌":"264c","♍":"264d","♎":"264e","♏":"264f","♐":"2650","♑":"2651","♒":"2652","♓":"2653","⛎":"26ce","🔀":"1f500","🔁":"1f501","🔂":"1f502","▶":"25b6","⏩":"23e9","⏭":"23ed","⏯":"23ef","◀":"25c0","⏪":"23ea","⏮":"23ee","🔼":"1f53c","⏫":"23eb","🔽":"1f53d","⏬":"23ec","⏸":"23f8","⏹":"23f9","⏺":"23fa","⏏":"23cf","🎦":"1f3a6","🔅":"1f505","🔆":"1f506","📶":"1f4f6","📳":"1f4f3","📴":"1f4f4","♀":"2640","♂":"2642","⚧":"26a7","✖":"2716","➕":"2795","➖":"2796","➗":"2797","🟰":"1f7f0","♾":"267e","‼":"203c","⁉":"2049","❓":"2753","❔":"2754","❕":"2755","❗":"2757","〰":"3030","💱":"1f4b1","💲":"1f4b2","⚕":"2695","♻":"267b","⚜":"269c","🔱":"1f531","📛":"1f4db","🔰":"1f530","⭕":"2b55","✅":"2705","☑":"2611","✔":"2714","❌":"274c","❎":"274e","➰":"27b0","➿":"27bf","〽":"303d","✳":"2733","✴":"2734","❇":"2747","©":"a9","®":"ae","™":"2122","🔟":"1f51f","🔠":"1f520","🔡":"1f521","🔢":"1f522","🔣":"1f523","🔤":"1f524","🅰":"1f170","🆎":"1f18e","🅱":"1f171","🆑":"1f191","🆒":"1f192","🆓":"1f193","ℹ":"2139","🆔":"1f194","Ⓜ":"24c2","🆕":"1f195","🆖":"1f196","🅾":"1f17e","🆗":"1f197","🅿":"1f17f","🆘":"1f198","🆙":"1f199","🆚":"1f19a","🈁":"1f201","🈂":"1f202","🈷":"1f237","🈶":"1f236","🈯":"1f22f","🉐":"1f250","🈹":"1f239","🈚":"1f21a","🈲":"1f232","🉑":"1f251","🈸":"1f238","🈴":"1f234","🈳":"1f233","㊗":"3297","㊙":"3299","🈺":"1f23a","🈵":"1f235","🔴":"1f534","🟠":"1f7e0","🟡":"1f7e1","🟢":"1f7e2","🔵":"1f535","🟣":"1f7e3","🟤":"1f7e4","⚫":"26ab","⚪":"26aa","🟥":"1f7e5","🟧":"1f7e7","🟨":"1f7e8","🟩":"1f7e9","🟦":"1f7e6","🟪":"1f7ea","🟫":"1f7eb","⬛":"2b1b","⬜":"2b1c","◼":"25fc","◻":"25fb","◾":"25fe","◽":"25fd","▪":"25aa","▫":"25ab","🔶":"1f536","🔷":"1f537","🔸":"1f538","🔹":"1f539","🔺":"1f53a","🔻":"1f53b","💠":"1f4a0","🔘":"1f518","🔳":"1f533","🔲":"1f532","🏁":"1f3c1","🚩":"1f6a9","🎌":"1f38c","🏴":"1f3f4","🏳":"1f3f3","☺️":"263a","☹️":"2639","☠️":"2620","❣️":"2763","❤️":"2764","🕳️":"1f573","🗨️":"1f5e8","🗯️":"1f5ef","👋🏻":"1f44b-1f3fb","👋🏼":"1f44b-1f3fc","👋🏽":"1f44b-1f3fd","👋🏾":"1f44b-1f3fe","👋🏿":"1f44b-1f3ff","🤚🏻":"1f91a-1f3fb","🤚🏼":"1f91a-1f3fc","🤚🏽":"1f91a-1f3fd","🤚🏾":"1f91a-1f3fe","🤚🏿":"1f91a-1f3ff","🖐️":"1f590","🖐🏻":"1f590-1f3fb","🖐🏼":"1f590-1f3fc","🖐🏽":"1f590-1f3fd","🖐🏾":"1f590-1f3fe","🖐🏿":"1f590-1f3ff","✋🏻":"270b-1f3fb","✋🏼":"270b-1f3fc","✋🏽":"270b-1f3fd","✋🏾":"270b-1f3fe","✋🏿":"270b-1f3ff","🖖🏻":"1f596-1f3fb","🖖🏼":"1f596-1f3fc","🖖🏽":"1f596-1f3fd","🖖🏾":"1f596-1f3fe","🖖🏿":"1f596-1f3ff","🫱🏻":"1faf1-1f3fb","🫱🏼":"1faf1-1f3fc","🫱🏽":"1faf1-1f3fd","🫱🏾":"1faf1-1f3fe","🫱🏿":"1faf1-1f3ff","🫲🏻":"1faf2-1f3fb","🫲🏼":"1faf2-1f3fc","🫲🏽":"1faf2-1f3fd","🫲🏾":"1faf2-1f3fe","🫲🏿":"1faf2-1f3ff","🫳🏻":"1faf3-1f3fb","🫳🏼":"1faf3-1f3fc","🫳🏽":"1faf3-1f3fd","🫳🏾":"1faf3-1f3fe","🫳🏿":"1faf3-1f3ff","🫴🏻":"1faf4-1f3fb","🫴🏼":"1faf4-1f3fc","🫴🏽":"1faf4-1f3fd","🫴🏾":"1faf4-1f3fe","🫴🏿":"1faf4-1f3ff","👌🏻":"1f44c-1f3fb","👌🏼":"1f44c-1f3fc","👌🏽":"1f44c-1f3fd","👌🏾":"1f44c-1f3fe","👌🏿":"1f44c-1f3ff","🤌🏻":"1f90c-1f3fb","🤌🏼":"1f90c-1f3fc","🤌🏽":"1f90c-1f3fd","🤌🏾":"1f90c-1f3fe","🤌🏿":"1f90c-1f3ff","🤏🏻":"1f90f-1f3fb","🤏🏼":"1f90f-1f3fc","🤏🏽":"1f90f-1f3fd","🤏🏾":"1f90f-1f3fe","🤏🏿":"1f90f-1f3ff","✌️":"270c","✌🏻":"270c-1f3fb","✌🏼":"270c-1f3fc","✌🏽":"270c-1f3fd","✌🏾":"270c-1f3fe","✌🏿":"270c-1f3ff","🤞🏻":"1f91e-1f3fb","🤞🏼":"1f91e-1f3fc","🤞🏽":"1f91e-1f3fd","🤞🏾":"1f91e-1f3fe","🤞🏿":"1f91e-1f3ff","🫰🏻":"1faf0-1f3fb","🫰🏼":"1faf0-1f3fc","🫰🏽":"1faf0-1f3fd","🫰🏾":"1faf0-1f3fe","🫰🏿":"1faf0-1f3ff","🤟🏻":"1f91f-1f3fb","🤟🏼":"1f91f-1f3fc","🤟🏽":"1f91f-1f3fd","🤟🏾":"1f91f-1f3fe","🤟🏿":"1f91f-1f3ff","🤘🏻":"1f918-1f3fb","🤘🏼":"1f918-1f3fc","🤘🏽":"1f918-1f3fd","🤘🏾":"1f918-1f3fe","🤘🏿":"1f918-1f3ff","🤙🏻":"1f919-1f3fb","🤙🏼":"1f919-1f3fc","🤙🏽":"1f919-1f3fd","🤙🏾":"1f919-1f3fe","🤙🏿":"1f919-1f3ff","👈🏻":"1f448-1f3fb","👈🏼":"1f448-1f3fc","👈🏽":"1f448-1f3fd","👈🏾":"1f448-1f3fe","👈🏿":"1f448-1f3ff","👉🏻":"1f449-1f3fb","👉🏼":"1f449-1f3fc","👉🏽":"1f449-1f3fd","👉🏾":"1f449-1f3fe","👉🏿":"1f449-1f3ff","👆🏻":"1f446-1f3fb","👆🏼":"1f446-1f3fc","👆🏽":"1f446-1f3fd","👆🏾":"1f446-1f3fe","👆🏿":"1f446-1f3ff","🖕🏻":"1f595-1f3fb","🖕🏼":"1f595-1f3fc","🖕🏽":"1f595-1f3fd","🖕🏾":"1f595-1f3fe","🖕🏿":"1f595-1f3ff","👇🏻":"1f447-1f3fb","👇🏼":"1f447-1f3fc","👇🏽":"1f447-1f3fd","👇🏾":"1f447-1f3fe","👇🏿":"1f447-1f3ff","☝️":"261d","☝🏻":"261d-1f3fb","☝🏼":"261d-1f3fc","☝🏽":"261d-1f3fd","☝🏾":"261d-1f3fe","☝🏿":"261d-1f3ff","🫵🏻":"1faf5-1f3fb","🫵🏼":"1faf5-1f3fc","🫵🏽":"1faf5-1f3fd","🫵🏾":"1faf5-1f3fe","🫵🏿":"1faf5-1f3ff","👍🏻":"1f44d-1f3fb","👍🏼":"1f44d-1f3fc","👍🏽":"1f44d-1f3fd","👍🏾":"1f44d-1f3fe","👍🏿":"1f44d-1f3ff","👎🏻":"1f44e-1f3fb","👎🏼":"1f44e-1f3fc","👎🏽":"1f44e-1f3fd","👎🏾":"1f44e-1f3fe","👎🏿":"1f44e-1f3ff","✊🏻":"270a-1f3fb","✊🏼":"270a-1f3fc","✊🏽":"270a-1f3fd","✊🏾":"270a-1f3fe","✊🏿":"270a-1f3ff","👊🏻":"1f44a-1f3fb","👊🏼":"1f44a-1f3fc","👊🏽":"1f44a-1f3fd","👊🏾":"1f44a-1f3fe","👊🏿":"1f44a-1f3ff","🤛🏻":"1f91b-1f3fb","🤛🏼":"1f91b-1f3fc","🤛🏽":"1f91b-1f3fd","🤛🏾":"1f91b-1f3fe","🤛🏿":"1f91b-1f3ff","🤜🏻":"1f91c-1f3fb","🤜🏼":"1f91c-1f3fc","🤜🏽":"1f91c-1f3fd","🤜🏾":"1f91c-1f3fe","🤜🏿":"1f91c-1f3ff","👏🏻":"1f44f-1f3fb","👏🏼":"1f44f-1f3fc","👏🏽":"1f44f-1f3fd","👏🏾":"1f44f-1f3fe","👏🏿":"1f44f-1f3ff","🙌🏻":"1f64c-1f3fb","🙌🏼":"1f64c-1f3fc","🙌🏽":"1f64c-1f3fd","🙌🏾":"1f64c-1f3fe","🙌🏿":"1f64c-1f3ff","🫶🏻":"1faf6-1f3fb","🫶🏼":"1faf6-1f3fc","🫶🏽":"1faf6-1f3fd","🫶🏾":"1faf6-1f3fe","🫶🏿":"1faf6-1f3ff","👐🏻":"1f450-1f3fb","👐🏼":"1f450-1f3fc","👐🏽":"1f450-1f3fd","👐🏾":"1f450-1f3fe","👐🏿":"1f450-1f3ff","🤲🏻":"1f932-1f3fb","🤲🏼":"1f932-1f3fc","🤲🏽":"1f932-1f3fd","🤲🏾":"1f932-1f3fe","🤲🏿":"1f932-1f3ff","🤝🏻":"1f91d-1f3fb","🤝🏼":"1f91d-1f3fc","🤝🏽":"1f91d-1f3fd","🤝🏾":"1f91d-1f3fe","🤝🏿":"1f91d-1f3ff","🙏🏻":"1f64f-1f3fb","🙏🏼":"1f64f-1f3fc","🙏🏽":"1f64f-1f3fd","🙏🏾":"1f64f-1f3fe","🙏🏿":"1f64f-1f3ff","✍️":"270d","✍🏻":"270d-1f3fb","✍🏼":"270d-1f3fc","✍🏽":"270d-1f3fd","✍🏾":"270d-1f3fe","✍🏿":"270d-1f3ff","💅🏻":"1f485-1f3fb","💅🏼":"1f485-1f3fc","💅🏽":"1f485-1f3fd","💅🏾":"1f485-1f3fe","💅🏿":"1f485-1f3ff","🤳🏻":"1f933-1f3fb","🤳🏼":"1f933-1f3fc","🤳🏽":"1f933-1f3fd","🤳🏾":"1f933-1f3fe","🤳🏿":"1f933-1f3ff","💪🏻":"1f4aa-1f3fb","💪🏼":"1f4aa-1f3fc","💪🏽":"1f4aa-1f3fd","💪🏾":"1f4aa-1f3fe","💪🏿":"1f4aa-1f3ff","🦵🏻":"1f9b5-1f3fb","🦵🏼":"1f9b5-1f3fc","🦵🏽":"1f9b5-1f3fd","🦵🏾":"1f9b5-1f3fe","🦵🏿":"1f9b5-1f3ff","🦶🏻":"1f9b6-1f3fb","🦶🏼":"1f9b6-1f3fc","🦶🏽":"1f9b6-1f3fd","🦶🏾":"1f9b6-1f3fe","🦶🏿":"1f9b6-1f3ff","👂🏻":"1f442-1f3fb","👂🏼":"1f442-1f3fc","👂🏽":"1f442-1f3fd","👂🏾":"1f442-1f3fe","👂🏿":"1f442-1f3ff","🦻🏻":"1f9bb-1f3fb","🦻🏼":"1f9bb-1f3fc","🦻🏽":"1f9bb-1f3fd","🦻🏾":"1f9bb-1f3fe","🦻🏿":"1f9bb-1f3ff","👃🏻":"1f443-1f3fb","👃🏼":"1f443-1f3fc","👃🏽":"1f443-1f3fd","👃🏾":"1f443-1f3fe","👃🏿":"1f443-1f3ff","👁️":"1f441","👶🏻":"1f476-1f3fb","👶🏼":"1f476-1f3fc","👶🏽":"1f476-1f3fd","👶🏾":"1f476-1f3fe","👶🏿":"1f476-1f3ff","🧒🏻":"1f9d2-1f3fb","🧒🏼":"1f9d2-1f3fc","🧒🏽":"1f9d2-1f3fd","🧒🏾":"1f9d2-1f3fe","🧒🏿":"1f9d2-1f3ff","👦🏻":"1f466-1f3fb","👦🏼":"1f466-1f3fc","👦🏽":"1f466-1f3fd","👦🏾":"1f466-1f3fe","👦🏿":"1f466-1f3ff","👧🏻":"1f467-1f3fb","👧🏼":"1f467-1f3fc","👧🏽":"1f467-1f3fd","👧🏾":"1f467-1f3fe","👧🏿":"1f467-1f3ff","🧑🏻":"1f9d1-1f3fb","🧑🏼":"1f9d1-1f3fc","🧑🏽":"1f9d1-1f3fd","🧑🏾":"1f9d1-1f3fe","🧑🏿":"1f9d1-1f3ff","👱🏻":"1f471-1f3fb","👱🏼":"1f471-1f3fc","👱🏽":"1f471-1f3fd","👱🏾":"1f471-1f3fe","👱🏿":"1f471-1f3ff","👨🏻":"1f468-1f3fb","👨🏼":"1f468-1f3fc","👨🏽":"1f468-1f3fd","👨🏾":"1f468-1f3fe","👨🏿":"1f468-1f3ff","🧔🏻":"1f9d4-1f3fb","🧔🏼":"1f9d4-1f3fc","🧔🏽":"1f9d4-1f3fd","🧔🏾":"1f9d4-1f3fe","🧔🏿":"1f9d4-1f3ff","👩🏻":"1f469-1f3fb","👩🏼":"1f469-1f3fc","👩🏽":"1f469-1f3fd","👩🏾":"1f469-1f3fe","👩🏿":"1f469-1f3ff","🧓🏻":"1f9d3-1f3fb","🧓🏼":"1f9d3-1f3fc","🧓🏽":"1f9d3-1f3fd","🧓🏾":"1f9d3-1f3fe","🧓🏿":"1f9d3-1f3ff","👴🏻":"1f474-1f3fb","👴🏼":"1f474-1f3fc","👴🏽":"1f474-1f3fd","👴🏾":"1f474-1f3fe","👴🏿":"1f474-1f3ff","👵🏻":"1f475-1f3fb","👵🏼":"1f475-1f3fc","👵🏽":"1f475-1f3fd","👵🏾":"1f475-1f3fe","👵🏿":"1f475-1f3ff","🙍🏻":"1f64d-1f3fb","🙍🏼":"1f64d-1f3fc","🙍🏽":"1f64d-1f3fd","🙍🏾":"1f64d-1f3fe","🙍🏿":"1f64d-1f3ff","🙎🏻":"1f64e-1f3fb","🙎🏼":"1f64e-1f3fc","🙎🏽":"1f64e-1f3fd","🙎🏾":"1f64e-1f3fe","🙎🏿":"1f64e-1f3ff","🙅🏻":"1f645-1f3fb","🙅🏼":"1f645-1f3fc","🙅🏽":"1f645-1f3fd","🙅🏾":"1f645-1f3fe","🙅🏿":"1f645-1f3ff","🙆🏻":"1f646-1f3fb","🙆🏼":"1f646-1f3fc","🙆🏽":"1f646-1f3fd","🙆🏾":"1f646-1f3fe","🙆🏿":"1f646-1f3ff","💁🏻":"1f481-1f3fb","💁🏼":"1f481-1f3fc","💁🏽":"1f481-1f3fd","💁🏾":"1f481-1f3fe","💁🏿":"1f481-1f3ff","🙋🏻":"1f64b-1f3fb","🙋🏼":"1f64b-1f3fc","🙋🏽":"1f64b-1f3fd","🙋🏾":"1f64b-1f3fe","🙋🏿":"1f64b-1f3ff","🧏🏻":"1f9cf-1f3fb","🧏🏼":"1f9cf-1f3fc","🧏🏽":"1f9cf-1f3fd","🧏🏾":"1f9cf-1f3fe","🧏🏿":"1f9cf-1f3ff","🙇🏻":"1f647-1f3fb","🙇🏼":"1f647-1f3fc","🙇🏽":"1f647-1f3fd","🙇🏾":"1f647-1f3fe","🙇🏿":"1f647-1f3ff","🤦🏻":"1f926-1f3fb","🤦🏼":"1f926-1f3fc","🤦🏽":"1f926-1f3fd","🤦🏾":"1f926-1f3fe","🤦🏿":"1f926-1f3ff","🤷🏻":"1f937-1f3fb","🤷🏼":"1f937-1f3fc","🤷🏽":"1f937-1f3fd","🤷🏾":"1f937-1f3fe","🤷🏿":"1f937-1f3ff","👮🏻":"1f46e-1f3fb","👮🏼":"1f46e-1f3fc","👮🏽":"1f46e-1f3fd","👮🏾":"1f46e-1f3fe","👮🏿":"1f46e-1f3ff","🕵️":"1f575","🕵🏻":"1f575-1f3fb","🕵🏼":"1f575-1f3fc","🕵🏽":"1f575-1f3fd","🕵🏾":"1f575-1f3fe","🕵🏿":"1f575-1f3ff","💂🏻":"1f482-1f3fb","💂🏼":"1f482-1f3fc","💂🏽":"1f482-1f3fd","💂🏾":"1f482-1f3fe","💂🏿":"1f482-1f3ff","🥷🏻":"1f977-1f3fb","🥷🏼":"1f977-1f3fc","🥷🏽":"1f977-1f3fd","🥷🏾":"1f977-1f3fe","🥷🏿":"1f977-1f3ff","👷🏻":"1f477-1f3fb","👷🏼":"1f477-1f3fc","👷🏽":"1f477-1f3fd","👷🏾":"1f477-1f3fe","👷🏿":"1f477-1f3ff","🫅🏻":"1fac5-1f3fb","🫅🏼":"1fac5-1f3fc","🫅🏽":"1fac5-1f3fd","🫅🏾":"1fac5-1f3fe","🫅🏿":"1fac5-1f3ff","🤴🏻":"1f934-1f3fb","🤴🏼":"1f934-1f3fc","🤴🏽":"1f934-1f3fd","🤴🏾":"1f934-1f3fe","🤴🏿":"1f934-1f3ff","👸🏻":"1f478-1f3fb","👸🏼":"1f478-1f3fc","👸🏽":"1f478-1f3fd","👸🏾":"1f478-1f3fe","👸🏿":"1f478-1f3ff","👳🏻":"1f473-1f3fb","👳🏼":"1f473-1f3fc","👳🏽":"1f473-1f3fd","👳🏾":"1f473-1f3fe","👳🏿":"1f473-1f3ff","👲🏻":"1f472-1f3fb","👲🏼":"1f472-1f3fc","👲🏽":"1f472-1f3fd","👲🏾":"1f472-1f3fe","👲🏿":"1f472-1f3ff","🧕🏻":"1f9d5-1f3fb","🧕🏼":"1f9d5-1f3fc","🧕🏽":"1f9d5-1f3fd","🧕🏾":"1f9d5-1f3fe","🧕🏿":"1f9d5-1f3ff","🤵🏻":"1f935-1f3fb","🤵🏼":"1f935-1f3fc","🤵🏽":"1f935-1f3fd","🤵🏾":"1f935-1f3fe","🤵🏿":"1f935-1f3ff","👰🏻":"1f470-1f3fb","👰🏼":"1f470-1f3fc","👰🏽":"1f470-1f3fd","👰🏾":"1f470-1f3fe","👰🏿":"1f470-1f3ff","🤰🏻":"1f930-1f3fb","🤰🏼":"1f930-1f3fc","🤰🏽":"1f930-1f3fd","🤰🏾":"1f930-1f3fe","🤰🏿":"1f930-1f3ff","🫃🏻":"1fac3-1f3fb","🫃🏼":"1fac3-1f3fc","🫃🏽":"1fac3-1f3fd","🫃🏾":"1fac3-1f3fe","🫃🏿":"1fac3-1f3ff","🫄🏻":"1fac4-1f3fb","🫄🏼":"1fac4-1f3fc","🫄🏽":"1fac4-1f3fd","🫄🏾":"1fac4-1f3fe","🫄🏿":"1fac4-1f3ff","🤱🏻":"1f931-1f3fb","🤱🏼":"1f931-1f3fc","🤱🏽":"1f931-1f3fd","🤱🏾":"1f931-1f3fe","🤱🏿":"1f931-1f3ff","👼🏻":"1f47c-1f3fb","👼🏼":"1f47c-1f3fc","👼🏽":"1f47c-1f3fd","👼🏾":"1f47c-1f3fe","👼🏿":"1f47c-1f3ff","🎅🏻":"1f385-1f3fb","🎅🏼":"1f385-1f3fc","🎅🏽":"1f385-1f3fd","🎅🏾":"1f385-1f3fe","🎅🏿":"1f385-1f3ff","🤶🏻":"1f936-1f3fb","🤶🏼":"1f936-1f3fc","🤶🏽":"1f936-1f3fd","🤶🏾":"1f936-1f3fe","🤶🏿":"1f936-1f3ff","🦸🏻":"1f9b8-1f3fb","🦸🏼":"1f9b8-1f3fc","🦸🏽":"1f9b8-1f3fd","🦸🏾":"1f9b8-1f3fe","🦸🏿":"1f9b8-1f3ff","🦹🏻":"1f9b9-1f3fb","🦹🏼":"1f9b9-1f3fc","🦹🏽":"1f9b9-1f3fd","🦹🏾":"1f9b9-1f3fe","🦹🏿":"1f9b9-1f3ff","🧙🏻":"1f9d9-1f3fb","🧙🏼":"1f9d9-1f3fc","🧙🏽":"1f9d9-1f3fd","🧙🏾":"1f9d9-1f3fe","🧙🏿":"1f9d9-1f3ff","🧚🏻":"1f9da-1f3fb","🧚🏼":"1f9da-1f3fc","🧚🏽":"1f9da-1f3fd","🧚🏾":"1f9da-1f3fe","🧚🏿":"1f9da-1f3ff","🧛🏻":"1f9db-1f3fb","🧛🏼":"1f9db-1f3fc","🧛🏽":"1f9db-1f3fd","🧛🏾":"1f9db-1f3fe","🧛🏿":"1f9db-1f3ff","🧜🏻":"1f9dc-1f3fb","🧜🏼":"1f9dc-1f3fc","🧜🏽":"1f9dc-1f3fd","🧜🏾":"1f9dc-1f3fe","🧜🏿":"1f9dc-1f3ff","🧝🏻":"1f9dd-1f3fb","🧝🏼":"1f9dd-1f3fc","🧝🏽":"1f9dd-1f3fd","🧝🏾":"1f9dd-1f3fe","🧝🏿":"1f9dd-1f3ff","💆🏻":"1f486-1f3fb","💆🏼":"1f486-1f3fc","💆🏽":"1f486-1f3fd","💆🏾":"1f486-1f3fe","💆🏿":"1f486-1f3ff","💇🏻":"1f487-1f3fb","💇🏼":"1f487-1f3fc","💇🏽":"1f487-1f3fd","💇🏾":"1f487-1f3fe","💇🏿":"1f487-1f3ff","🚶🏻":"1f6b6-1f3fb","🚶🏼":"1f6b6-1f3fc","🚶🏽":"1f6b6-1f3fd","🚶🏾":"1f6b6-1f3fe","🚶🏿":"1f6b6-1f3ff","🧍🏻":"1f9cd-1f3fb","🧍🏼":"1f9cd-1f3fc","🧍🏽":"1f9cd-1f3fd","🧍🏾":"1f9cd-1f3fe","🧍🏿":"1f9cd-1f3ff","🧎🏻":"1f9ce-1f3fb","🧎🏼":"1f9ce-1f3fc","🧎🏽":"1f9ce-1f3fd","🧎🏾":"1f9ce-1f3fe","🧎🏿":"1f9ce-1f3ff","🏃🏻":"1f3c3-1f3fb","🏃🏼":"1f3c3-1f3fc","🏃🏽":"1f3c3-1f3fd","🏃🏾":"1f3c3-1f3fe","🏃🏿":"1f3c3-1f3ff","💃🏻":"1f483-1f3fb","💃🏼":"1f483-1f3fc","💃🏽":"1f483-1f3fd","💃🏾":"1f483-1f3fe","💃🏿":"1f483-1f3ff","🕺🏻":"1f57a-1f3fb","🕺🏼":"1f57a-1f3fc","🕺🏽":"1f57a-1f3fd","🕺🏾":"1f57a-1f3fe","🕺🏿":"1f57a-1f3ff","🕴️":"1f574","🕴🏻":"1f574-1f3fb","🕴🏼":"1f574-1f3fc","🕴🏽":"1f574-1f3fd","🕴🏾":"1f574-1f3fe","🕴🏿":"1f574-1f3ff","🧖🏻":"1f9d6-1f3fb","🧖🏼":"1f9d6-1f3fc","🧖🏽":"1f9d6-1f3fd","🧖🏾":"1f9d6-1f3fe","🧖🏿":"1f9d6-1f3ff","🧗🏻":"1f9d7-1f3fb","🧗🏼":"1f9d7-1f3fc","🧗🏽":"1f9d7-1f3fd","🧗🏾":"1f9d7-1f3fe","🧗🏿":"1f9d7-1f3ff","🏇🏻":"1f3c7-1f3fb","🏇🏼":"1f3c7-1f3fc","🏇🏽":"1f3c7-1f3fd","🏇🏾":"1f3c7-1f3fe","🏇🏿":"1f3c7-1f3ff","⛷️":"26f7","🏂🏻":"1f3c2-1f3fb","🏂🏼":"1f3c2-1f3fc","🏂🏽":"1f3c2-1f3fd","🏂🏾":"1f3c2-1f3fe","🏂🏿":"1f3c2-1f3ff","🏌️":"1f3cc","🏌🏻":"1f3cc-1f3fb","🏌🏼":"1f3cc-1f3fc","🏌🏽":"1f3cc-1f3fd","🏌🏾":"1f3cc-1f3fe","🏌🏿":"1f3cc-1f3ff","🏄🏻":"1f3c4-1f3fb","🏄🏼":"1f3c4-1f3fc","🏄🏽":"1f3c4-1f3fd","🏄🏾":"1f3c4-1f3fe","🏄🏿":"1f3c4-1f3ff","🚣🏻":"1f6a3-1f3fb","🚣🏼":"1f6a3-1f3fc","🚣🏽":"1f6a3-1f3fd","🚣🏾":"1f6a3-1f3fe","🚣🏿":"1f6a3-1f3ff","🏊🏻":"1f3ca-1f3fb","🏊🏼":"1f3ca-1f3fc","🏊🏽":"1f3ca-1f3fd","🏊🏾":"1f3ca-1f3fe","🏊🏿":"1f3ca-1f3ff","⛹️":"26f9","⛹🏻":"26f9-1f3fb","⛹🏼":"26f9-1f3fc","⛹🏽":"26f9-1f3fd","⛹🏾":"26f9-1f3fe","⛹🏿":"26f9-1f3ff","🏋️":"1f3cb","🏋🏻":"1f3cb-1f3fb","🏋🏼":"1f3cb-1f3fc","🏋🏽":"1f3cb-1f3fd","🏋🏾":"1f3cb-1f3fe","🏋🏿":"1f3cb-1f3ff","🚴🏻":"1f6b4-1f3fb","🚴🏼":"1f6b4-1f3fc","🚴🏽":"1f6b4-1f3fd","🚴🏾":"1f6b4-1f3fe","🚴🏿":"1f6b4-1f3ff","🚵🏻":"1f6b5-1f3fb","🚵🏼":"1f6b5-1f3fc","🚵🏽":"1f6b5-1f3fd","🚵🏾":"1f6b5-1f3fe","🚵🏿":"1f6b5-1f3ff","🤸🏻":"1f938-1f3fb","🤸🏼":"1f938-1f3fc","🤸🏽":"1f938-1f3fd","🤸🏾":"1f938-1f3fe","🤸🏿":"1f938-1f3ff","🤽🏻":"1f93d-1f3fb","🤽🏼":"1f93d-1f3fc","🤽🏽":"1f93d-1f3fd","🤽🏾":"1f93d-1f3fe","🤽🏿":"1f93d-1f3ff","🤾🏻":"1f93e-1f3fb","🤾🏼":"1f93e-1f3fc","🤾🏽":"1f93e-1f3fd","🤾🏾":"1f93e-1f3fe","🤾🏿":"1f93e-1f3ff","🤹🏻":"1f939-1f3fb","🤹🏼":"1f939-1f3fc","🤹🏽":"1f939-1f3fd","🤹🏾":"1f939-1f3fe","🤹🏿":"1f939-1f3ff","🧘🏻":"1f9d8-1f3fb","🧘🏼":"1f9d8-1f3fc","🧘🏽":"1f9d8-1f3fd","🧘🏾":"1f9d8-1f3fe","🧘🏿":"1f9d8-1f3ff","🛀🏻":"1f6c0-1f3fb","🛀🏼":"1f6c0-1f3fc","🛀🏽":"1f6c0-1f3fd","🛀🏾":"1f6c0-1f3fe","🛀🏿":"1f6c0-1f3ff","🛌🏻":"1f6cc-1f3fb","🛌🏼":"1f6cc-1f3fc","🛌🏽":"1f6cc-1f3fd","🛌🏾":"1f6cc-1f3fe","🛌🏿":"1f6cc-1f3ff","👭🏻":"1f46d-1f3fb","👭🏼":"1f46d-1f3fc","👭🏽":"1f46d-1f3fd","👭🏾":"1f46d-1f3fe","👭🏿":"1f46d-1f3ff","👫🏻":"1f46b-1f3fb","👫🏼":"1f46b-1f3fc","👫🏽":"1f46b-1f3fd","👫🏾":"1f46b-1f3fe","👫🏿":"1f46b-1f3ff","👬🏻":"1f46c-1f3fb","👬🏼":"1f46c-1f3fc","👬🏽":"1f46c-1f3fd","👬🏾":"1f46c-1f3fe","👬🏿":"1f46c-1f3ff","💏🏻":"1f48f-1f3fb","💏🏼":"1f48f-1f3fc","💏🏽":"1f48f-1f3fd","💏🏾":"1f48f-1f3fe","💏🏿":"1f48f-1f3ff","💑🏻":"1f491-1f3fb","💑🏼":"1f491-1f3fc","💑🏽":"1f491-1f3fd","💑🏾":"1f491-1f3fe","💑🏿":"1f491-1f3ff","🗣️":"1f5e3","🐿️":"1f43f","🕊️":"1f54a","🕷️":"1f577","🕸️":"1f578","🏵️":"1f3f5","☘️":"2618","🌶️":"1f336","🍽️":"1f37d","🗺️":"1f5fa","🏔️":"1f3d4","⛰️":"26f0","🏕️":"1f3d5","🏖️":"1f3d6","🏜️":"1f3dc","🏝️":"1f3dd","🏞️":"1f3de","🏟️":"1f3df","🏛️":"1f3db","🏗️":"1f3d7","🏘️":"1f3d8","🏚️":"1f3da","⛩️":"26e9","🏙️":"1f3d9","♨️":"2668","🏎️":"1f3ce","🏍️":"1f3cd","🛣️":"1f6e3","🛤️":"1f6e4","🛢️":"1f6e2","🛳️":"1f6f3","⛴️":"26f4","🛥️":"1f6e5","✈️":"2708","🛩️":"1f6e9","🛰️":"1f6f0","🛎️":"1f6ce","⏱️":"23f1","⏲️":"23f2","🕰️":"1f570","🌡️":"1f321","☀️":"2600","☁️":"2601","⛈️":"26c8","🌤️":"1f324","🌥️":"1f325","🌦️":"1f326","🌧️":"1f327","🌨️":"1f328","🌩️":"1f329","🌪️":"1f32a","🌫️":"1f32b","🌬️":"1f32c","☂️":"2602","⛱️":"26f1","❄️":"2744","☃️":"2603","☄️":"2604","🎗️":"1f397","🎟️":"1f39f","🎖️":"1f396","⛸️":"26f8","🕹️":"1f579","♠️":"2660","♥️":"2665","♦️":"2666","♣️":"2663","♟️":"265f","🖼️":"1f5bc","🕶️":"1f576","🛍️":"1f6cd","⛑️":"26d1","🎙️":"1f399","🎚️":"1f39a","🎛️":"1f39b","☎️":"260e","🖥️":"1f5a5","🖨️":"1f5a8","⌨️":"2328","🖱️":"1f5b1","🖲️":"1f5b2","🎞️":"1f39e","📽️":"1f4fd","🕯️":"1f56f","🗞️":"1f5de","🏷️":"1f3f7","✉️":"2709","🗳️":"1f5f3","✏️":"270f","✒️":"2712","🖋️":"1f58b","🖊️":"1f58a","🖌️":"1f58c","🖍️":"1f58d","🗂️":"1f5c2","🗒️":"1f5d2","🗓️":"1f5d3","🖇️":"1f587","✂️":"2702","🗃️":"1f5c3","🗄️":"1f5c4","🗑️":"1f5d1","🗝️":"1f5dd","⛏️":"26cf","⚒️":"2692","🛠️":"1f6e0","🗡️":"1f5e1","⚔️":"2694","🛡️":"1f6e1","⚙️":"2699","🗜️":"1f5dc","⚖️":"2696","⛓️":"26d3","⚗️":"2697","🛏️":"1f6cf","🛋️":"1f6cb","⚰️":"26b0","⚱️":"26b1","⚠️":"26a0","☢️":"2622","☣️":"2623","⬆️":"2b06","↗️":"2197","➡️":"27a1","↘️":"2198","⬇️":"2b07","↙️":"2199","⬅️":"2b05","↖️":"2196","↕️":"2195","↔️":"2194","↩️":"21a9","↪️":"21aa","⤴️":"2934","⤵️":"2935","⚛️":"269b","🕉️":"1f549","✡️":"2721","☸️":"2638","☯️":"262f","✝️":"271d","☦️":"2626","☪️":"262a","☮️":"262e","▶️":"25b6","⏭️":"23ed","⏯️":"23ef","◀️":"25c0","⏮️":"23ee","⏸️":"23f8","⏹️":"23f9","⏺️":"23fa","⏏️":"23cf","♀️":"2640","♂️":"2642","⚧️":"26a7","✖️":"2716","♾️":"267e","‼️":"203c","⁉️":"2049","〰️":"3030","⚕️":"2695","♻️":"267b","⚜️":"269c","☑️":"2611","✔️":"2714","〽️":"303d","✳️":"2733","✴️":"2734","❇️":"2747","©️":"a9","®️":"ae","™️":"2122","#⃣":"23-20e3","*⃣":"2a-20e3","0⃣":"30-20e3","1⃣":"31-20e3","2⃣":"32-20e3","3⃣":"33-20e3","4⃣":"34-20e3","5⃣":"35-20e3","6⃣":"36-20e3","7⃣":"37-20e3","8⃣":"38-20e3","9⃣":"39-20e3","🅰️":"1f170","🅱️":"1f171","ℹ️":"2139","Ⓜ️":"24c2","🅾️":"1f17e","🅿️":"1f17f","🈂️":"1f202","🈷️":"1f237","㊗️":"3297","㊙️":"3299","◼️":"25fc","◻️":"25fb","▪️":"25aa","▫️":"25ab","🏳️":"1f3f3","🇦🇨":"1f1e6-1f1e8","🇦🇩":"1f1e6-1f1e9","🇦🇪":"1f1e6-1f1ea","🇦🇫":"1f1e6-1f1eb","🇦🇬":"1f1e6-1f1ec","🇦🇮":"1f1e6-1f1ee","🇦🇱":"1f1e6-1f1f1","🇦🇲":"1f1e6-1f1f2","🇦🇴":"1f1e6-1f1f4","🇦🇶":"1f1e6-1f1f6","🇦🇷":"1f1e6-1f1f7","🇦🇸":"1f1e6-1f1f8","🇦🇹":"1f1e6-1f1f9","🇦🇺":"1f1e6-1f1fa","🇦🇼":"1f1e6-1f1fc","🇦🇽":"1f1e6-1f1fd","🇦🇿":"1f1e6-1f1ff","🇧🇦":"1f1e7-1f1e6","🇧🇧":"1f1e7-1f1e7","🇧🇩":"1f1e7-1f1e9","🇧🇪":"1f1e7-1f1ea","🇧🇫":"1f1e7-1f1eb","🇧🇬":"1f1e7-1f1ec","🇧🇭":"1f1e7-1f1ed","🇧🇮":"1f1e7-1f1ee","🇧🇯":"1f1e7-1f1ef","🇧🇱":"1f1e7-1f1f1","🇧🇲":"1f1e7-1f1f2","🇧🇳":"1f1e7-1f1f3","🇧🇴":"1f1e7-1f1f4","🇧🇶":"1f1e7-1f1f6","🇧🇷":"1f1e7-1f1f7","🇧🇸":"1f1e7-1f1f8","🇧🇹":"1f1e7-1f1f9","🇧🇻":"1f1e7-1f1fb","🇧🇼":"1f1e7-1f1fc","🇧🇾":"1f1e7-1f1fe","🇧🇿":"1f1e7-1f1ff","🇨🇦":"1f1e8-1f1e6","🇨🇨":"1f1e8-1f1e8","🇨🇩":"1f1e8-1f1e9","🇨🇫":"1f1e8-1f1eb","🇨🇬":"1f1e8-1f1ec","🇨🇭":"1f1e8-1f1ed","🇨🇮":"1f1e8-1f1ee","🇨🇰":"1f1e8-1f1f0","🇨🇱":"1f1e8-1f1f1","🇨🇲":"1f1e8-1f1f2","🇨🇳":"1f1e8-1f1f3","🇨🇴":"1f1e8-1f1f4","🇨🇵":"1f1e8-1f1f5","🇨🇷":"1f1e8-1f1f7","🇨🇺":"1f1e8-1f1fa","🇨🇻":"1f1e8-1f1fb","🇨🇼":"1f1e8-1f1fc","🇨🇽":"1f1e8-1f1fd","🇨🇾":"1f1e8-1f1fe","🇨🇿":"1f1e8-1f1ff","🇩🇪":"1f1e9-1f1ea","🇩🇬":"1f1e9-1f1ec","🇩🇯":"1f1e9-1f1ef","🇩🇰":"1f1e9-1f1f0","🇩🇲":"1f1e9-1f1f2","🇩🇴":"1f1e9-1f1f4","🇩🇿":"1f1e9-1f1ff","🇪🇦":"1f1ea-1f1e6","🇪🇨":"1f1ea-1f1e8","🇪🇪":"1f1ea-1f1ea","🇪🇬":"1f1ea-1f1ec","🇪🇭":"1f1ea-1f1ed","🇪🇷":"1f1ea-1f1f7","🇪🇸":"1f1ea-1f1f8","🇪🇹":"1f1ea-1f1f9","🇪🇺":"1f1ea-1f1fa","🇫🇮":"1f1eb-1f1ee","🇫🇯":"1f1eb-1f1ef","🇫🇰":"1f1eb-1f1f0","🇫🇲":"1f1eb-1f1f2","🇫🇴":"1f1eb-1f1f4","🇫🇷":"1f1eb-1f1f7","🇬🇦":"1f1ec-1f1e6","🇬🇧":"1f1ec-1f1e7","🇬🇩":"1f1ec-1f1e9","🇬🇪":"1f1ec-1f1ea","🇬🇫":"1f1ec-1f1eb","🇬🇬":"1f1ec-1f1ec","🇬🇭":"1f1ec-1f1ed","🇬🇮":"1f1ec-1f1ee","🇬🇱":"1f1ec-1f1f1","🇬🇲":"1f1ec-1f1f2","🇬🇳":"1f1ec-1f1f3","🇬🇵":"1f1ec-1f1f5","🇬🇶":"1f1ec-1f1f6","🇬🇷":"1f1ec-1f1f7","🇬🇸":"1f1ec-1f1f8","🇬🇹":"1f1ec-1f1f9","🇬🇺":"1f1ec-1f1fa","🇬🇼":"1f1ec-1f1fc","🇬🇾":"1f1ec-1f1fe","🇭🇰":"1f1ed-1f1f0","🇭🇲":"1f1ed-1f1f2","🇭🇳":"1f1ed-1f1f3","🇭🇷":"1f1ed-1f1f7","🇭🇹":"1f1ed-1f1f9","🇭🇺":"1f1ed-1f1fa","🇮🇨":"1f1ee-1f1e8","🇮🇩":"1f1ee-1f1e9","🇮🇪":"1f1ee-1f1ea","🇮🇱":"1f1ee-1f1f1","🇮🇲":"1f1ee-1f1f2","🇮🇳":"1f1ee-1f1f3","🇮🇴":"1f1ee-1f1f4","🇮🇶":"1f1ee-1f1f6","🇮🇷":"1f1ee-1f1f7","🇮🇸":"1f1ee-1f1f8","🇮🇹":"1f1ee-1f1f9","🇯🇪":"1f1ef-1f1ea","🇯🇲":"1f1ef-1f1f2","🇯🇴":"1f1ef-1f1f4","🇯🇵":"1f1ef-1f1f5","🇰🇪":"1f1f0-1f1ea","🇰🇬":"1f1f0-1f1ec","🇰🇭":"1f1f0-1f1ed","🇰🇮":"1f1f0-1f1ee","🇰🇲":"1f1f0-1f1f2","🇰🇳":"1f1f0-1f1f3","🇰🇵":"1f1f0-1f1f5","🇰🇷":"1f1f0-1f1f7","🇰🇼":"1f1f0-1f1fc","🇰🇾":"1f1f0-1f1fe","🇰🇿":"1f1f0-1f1ff","🇱🇦":"1f1f1-1f1e6","🇱🇧":"1f1f1-1f1e7","🇱🇨":"1f1f1-1f1e8","🇱🇮":"1f1f1-1f1ee","🇱🇰":"1f1f1-1f1f0","🇱🇷":"1f1f1-1f1f7","🇱🇸":"1f1f1-1f1f8","🇱🇹":"1f1f1-1f1f9","🇱🇺":"1f1f1-1f1fa","🇱🇻":"1f1f1-1f1fb","🇱🇾":"1f1f1-1f1fe","🇲🇦":"1f1f2-1f1e6","🇲🇨":"1f1f2-1f1e8","🇲🇩":"1f1f2-1f1e9","🇲🇪":"1f1f2-1f1ea","🇲🇫":"1f1f2-1f1eb","🇲🇬":"1f1f2-1f1ec","🇲🇭":"1f1f2-1f1ed","🇲🇰":"1f1f2-1f1f0","🇲🇱":"1f1f2-1f1f1","🇲🇲":"1f1f2-1f1f2","🇲🇳":"1f1f2-1f1f3","🇲🇴":"1f1f2-1f1f4","🇲🇵":"1f1f2-1f1f5","🇲🇶":"1f1f2-1f1f6","🇲🇷":"1f1f2-1f1f7","🇲🇸":"1f1f2-1f1f8","🇲🇹":"1f1f2-1f1f9","🇲🇺":"1f1f2-1f1fa","🇲🇻":"1f1f2-1f1fb","🇲🇼":"1f1f2-1f1fc","🇲🇽":"1f1f2-1f1fd","🇲🇾":"1f1f2-1f1fe","🇲🇿":"1f1f2-1f1ff","🇳🇦":"1f1f3-1f1e6","🇳🇨":"1f1f3-1f1e8","🇳🇪":"1f1f3-1f1ea","🇳🇫":"1f1f3-1f1eb","🇳🇬":"1f1f3-1f1ec","🇳🇮":"1f1f3-1f1ee","🇳🇱":"1f1f3-1f1f1","🇳🇴":"1f1f3-1f1f4","🇳🇵":"1f1f3-1f1f5","🇳🇷":"1f1f3-1f1f7","🇳🇺":"1f1f3-1f1fa","🇳🇿":"1f1f3-1f1ff","🇴🇲":"1f1f4-1f1f2","🇵🇦":"1f1f5-1f1e6","🇵🇪":"1f1f5-1f1ea","🇵🇫":"1f1f5-1f1eb","🇵🇬":"1f1f5-1f1ec","🇵🇭":"1f1f5-1f1ed","🇵🇰":"1f1f5-1f1f0","🇵🇱":"1f1f5-1f1f1","🇵🇲":"1f1f5-1f1f2","🇵🇳":"1f1f5-1f1f3","🇵🇷":"1f1f5-1f1f7","🇵🇸":"1f1f5-1f1f8","🇵🇹":"1f1f5-1f1f9","🇵🇼":"1f1f5-1f1fc","🇵🇾":"1f1f5-1f1fe","🇶🇦":"1f1f6-1f1e6","🇷🇪":"1f1f7-1f1ea","🇷🇴":"1f1f7-1f1f4","🇷🇸":"1f1f7-1f1f8","🇷🇺":"1f1f7-1f1fa","🇷🇼":"1f1f7-1f1fc","🇸🇦":"1f1f8-1f1e6","🇸🇧":"1f1f8-1f1e7","🇸🇨":"1f1f8-1f1e8","🇸🇩":"1f1f8-1f1e9","🇸🇪":"1f1f8-1f1ea","🇸🇬":"1f1f8-1f1ec","🇸🇭":"1f1f8-1f1ed","🇸🇮":"1f1f8-1f1ee","🇸🇯":"1f1f8-1f1ef","🇸🇰":"1f1f8-1f1f0","🇸🇱":"1f1f8-1f1f1","🇸🇲":"1f1f8-1f1f2","🇸🇳":"1f1f8-1f1f3","🇸🇴":"1f1f8-1f1f4","🇸🇷":"1f1f8-1f1f7","🇸🇸":"1f1f8-1f1f8","🇸🇹":"1f1f8-1f1f9","🇸🇻":"1f1f8-1f1fb","🇸🇽":"1f1f8-1f1fd","🇸🇾":"1f1f8-1f1fe","🇸🇿":"1f1f8-1f1ff","🇹🇦":"1f1f9-1f1e6","🇹🇨":"1f1f9-1f1e8","🇹🇩":"1f1f9-1f1e9","🇹🇫":"1f1f9-1f1eb","🇹🇬":"1f1f9-1f1ec","🇹🇭":"1f1f9-1f1ed","🇹🇯":"1f1f9-1f1ef","🇹🇰":"1f1f9-1f1f0","🇹🇱":"1f1f9-1f1f1","🇹🇲":"1f1f9-1f1f2","🇹🇳":"1f1f9-1f1f3","🇹🇴":"1f1f9-1f1f4","🇹🇷":"1f1f9-1f1f7","🇹🇹":"1f1f9-1f1f9","🇹🇻":"1f1f9-1f1fb","🇹🇼":"1f1f9-1f1fc","🇹🇿":"1f1f9-1f1ff","🇺🇦":"1f1fa-1f1e6","🇺🇬":"1f1fa-1f1ec","🇺🇲":"1f1fa-1f1f2","🇺🇳":"1f1fa-1f1f3","🇺🇸":"1f1fa-1f1f8","🇺🇾":"1f1fa-1f1fe","🇺🇿":"1f1fa-1f1ff","🇻🇦":"1f1fb-1f1e6","🇻🇨":"1f1fb-1f1e8","🇻🇪":"1f1fb-1f1ea","🇻🇬":"1f1fb-1f1ec","🇻🇮":"1f1fb-1f1ee","🇻🇳":"1f1fb-1f1f3","🇻🇺":"1f1fb-1f1fa","🇼🇫":"1f1fc-1f1eb","🇼🇸":"1f1fc-1f1f8","🇽🇰":"1f1fd-1f1f0","🇾🇪":"1f1fe-1f1ea","🇾🇹":"1f1fe-1f1f9","🇿🇦":"1f1ff-1f1e6","🇿🇲":"1f1ff-1f1f2","🇿🇼":"1f1ff-1f1fc","😶‍🌫":"1f636-200d-1f32b-fe0f","😮‍💨":"1f62e-200d-1f4a8","😵‍💫":"1f635-200d-1f4ab","❤‍🔥":"2764-fe0f-200d-1f525","❤‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨":"1f441-200d-1f5e8","🧔‍♂":"1f9d4-200d-2642-fe0f","🧔‍♀":"1f9d4-200d-2640-fe0f","👨‍🦰":"1f468-200d-1f9b0","👨‍🦱":"1f468-200d-1f9b1","👨‍🦳":"1f468-200d-1f9b3","👨‍🦲":"1f468-200d-1f9b2","👩‍🦰":"1f469-200d-1f9b0","🧑‍🦰":"1f9d1-200d-1f9b0","👩‍🦱":"1f469-200d-1f9b1","🧑‍🦱":"1f9d1-200d-1f9b1","👩‍🦳":"1f469-200d-1f9b3","🧑‍🦳":"1f9d1-200d-1f9b3","👩‍🦲":"1f469-200d-1f9b2","🧑‍🦲":"1f9d1-200d-1f9b2","👱‍♀":"1f471-200d-2640-fe0f","👱‍♂":"1f471-200d-2642-fe0f","🙍‍♂":"1f64d-200d-2642-fe0f","🙍‍♀":"1f64d-200d-2640-fe0f","🙎‍♂":"1f64e-200d-2642-fe0f","🙎‍♀":"1f64e-200d-2640-fe0f","🙅‍♂":"1f645-200d-2642-fe0f","🙅‍♀":"1f645-200d-2640-fe0f","🙆‍♂":"1f646-200d-2642-fe0f","🙆‍♀":"1f646-200d-2640-fe0f","💁‍♂":"1f481-200d-2642-fe0f","💁‍♀":"1f481-200d-2640-fe0f","🙋‍♂":"1f64b-200d-2642-fe0f","🙋‍♀":"1f64b-200d-2640-fe0f","🧏‍♂":"1f9cf-200d-2642-fe0f","🧏‍♀":"1f9cf-200d-2640-fe0f","🙇‍♂":"1f647-200d-2642-fe0f","🙇‍♀":"1f647-200d-2640-fe0f","🤦‍♂":"1f926-200d-2642-fe0f","🤦‍♀":"1f926-200d-2640-fe0f","🤷‍♂":"1f937-200d-2642-fe0f","🤷‍♀":"1f937-200d-2640-fe0f","🧑‍⚕":"1f9d1-200d-2695-fe0f","👨‍⚕":"1f468-200d-2695-fe0f","👩‍⚕":"1f469-200d-2695-fe0f","🧑‍🎓":"1f9d1-200d-1f393","👨‍🎓":"1f468-200d-1f393","👩‍🎓":"1f469-200d-1f393","🧑‍🏫":"1f9d1-200d-1f3eb","👨‍🏫":"1f468-200d-1f3eb","👩‍🏫":"1f469-200d-1f3eb","🧑‍⚖":"1f9d1-200d-2696-fe0f","👨‍⚖":"1f468-200d-2696-fe0f","👩‍⚖":"1f469-200d-2696-fe0f","🧑‍🌾":"1f9d1-200d-1f33e","👨‍🌾":"1f468-200d-1f33e","👩‍🌾":"1f469-200d-1f33e","🧑‍🍳":"1f9d1-200d-1f373","👨‍🍳":"1f468-200d-1f373","👩‍🍳":"1f469-200d-1f373","🧑‍🔧":"1f9d1-200d-1f527","👨‍🔧":"1f468-200d-1f527","👩‍🔧":"1f469-200d-1f527","🧑‍🏭":"1f9d1-200d-1f3ed","👨‍🏭":"1f468-200d-1f3ed","👩‍🏭":"1f469-200d-1f3ed","🧑‍💼":"1f9d1-200d-1f4bc","👨‍💼":"1f468-200d-1f4bc","👩‍💼":"1f469-200d-1f4bc","🧑‍🔬":"1f9d1-200d-1f52c","👨‍🔬":"1f468-200d-1f52c","👩‍🔬":"1f469-200d-1f52c","🧑‍💻":"1f9d1-200d-1f4bb","👨‍💻":"1f468-200d-1f4bb","👩‍💻":"1f469-200d-1f4bb","🧑‍🎤":"1f9d1-200d-1f3a4","👨‍🎤":"1f468-200d-1f3a4","👩‍🎤":"1f469-200d-1f3a4","🧑‍🎨":"1f9d1-200d-1f3a8","👨‍🎨":"1f468-200d-1f3a8","👩‍🎨":"1f469-200d-1f3a8","🧑‍✈":"1f9d1-200d-2708-fe0f","👨‍✈":"1f468-200d-2708-fe0f","👩‍✈":"1f469-200d-2708-fe0f","🧑‍🚀":"1f9d1-200d-1f680","👨‍🚀":"1f468-200d-1f680","👩‍🚀":"1f469-200d-1f680","🧑‍🚒":"1f9d1-200d-1f692","👨‍🚒":"1f468-200d-1f692","👩‍🚒":"1f469-200d-1f692","👮‍♂":"1f46e-200d-2642-fe0f","👮‍♀":"1f46e-200d-2640-fe0f","🕵‍♂":"1f575-fe0f-200d-2642-fe0f","🕵‍♀":"1f575-fe0f-200d-2640-fe0f","💂‍♂":"1f482-200d-2642-fe0f","💂‍♀":"1f482-200d-2640-fe0f","👷‍♂":"1f477-200d-2642-fe0f","👷‍♀":"1f477-200d-2640-fe0f","👳‍♂":"1f473-200d-2642-fe0f","👳‍♀":"1f473-200d-2640-fe0f","🤵‍♂":"1f935-200d-2642-fe0f","🤵‍♀":"1f935-200d-2640-fe0f","👰‍♂":"1f470-200d-2642-fe0f","👰‍♀":"1f470-200d-2640-fe0f","👩‍🍼":"1f469-200d-1f37c","👨‍🍼":"1f468-200d-1f37c","🧑‍🍼":"1f9d1-200d-1f37c","🧑‍🎄":"1f9d1-200d-1f384","🦸‍♂":"1f9b8-200d-2642-fe0f","🦸‍♀":"1f9b8-200d-2640-fe0f","🦹‍♂":"1f9b9-200d-2642-fe0f","🦹‍♀":"1f9b9-200d-2640-fe0f","🧙‍♂":"1f9d9-200d-2642-fe0f","🧙‍♀":"1f9d9-200d-2640-fe0f","🧚‍♂":"1f9da-200d-2642-fe0f","🧚‍♀":"1f9da-200d-2640-fe0f","🧛‍♂":"1f9db-200d-2642-fe0f","🧛‍♀":"1f9db-200d-2640-fe0f","🧜‍♂":"1f9dc-200d-2642-fe0f","🧜‍♀":"1f9dc-200d-2640-fe0f","🧝‍♂":"1f9dd-200d-2642-fe0f","🧝‍♀":"1f9dd-200d-2640-fe0f","🧞‍♂":"1f9de-200d-2642-fe0f","🧞‍♀":"1f9de-200d-2640-fe0f","🧟‍♂":"1f9df-200d-2642-fe0f","🧟‍♀":"1f9df-200d-2640-fe0f","💆‍♂":"1f486-200d-2642-fe0f","💆‍♀":"1f486-200d-2640-fe0f","💇‍♂":"1f487-200d-2642-fe0f","💇‍♀":"1f487-200d-2640-fe0f","🚶‍♂":"1f6b6-200d-2642-fe0f","🚶‍♀":"1f6b6-200d-2640-fe0f","🧍‍♂":"1f9cd-200d-2642-fe0f","🧍‍♀":"1f9cd-200d-2640-fe0f","🧎‍♂":"1f9ce-200d-2642-fe0f","🧎‍♀":"1f9ce-200d-2640-fe0f","🧑‍🦯":"1f9d1-200d-1f9af","👨‍🦯":"1f468-200d-1f9af","👩‍🦯":"1f469-200d-1f9af","🧑‍🦼":"1f9d1-200d-1f9bc","👨‍🦼":"1f468-200d-1f9bc","👩‍🦼":"1f469-200d-1f9bc","🧑‍🦽":"1f9d1-200d-1f9bd","👨‍🦽":"1f468-200d-1f9bd","👩‍🦽":"1f469-200d-1f9bd","🏃‍♂":"1f3c3-200d-2642-fe0f","🏃‍♀":"1f3c3-200d-2640-fe0f","👯‍♂":"1f46f-200d-2642-fe0f","👯‍♀":"1f46f-200d-2640-fe0f","🧖‍♂":"1f9d6-200d-2642-fe0f","🧖‍♀":"1f9d6-200d-2640-fe0f","🧗‍♂":"1f9d7-200d-2642-fe0f","🧗‍♀":"1f9d7-200d-2640-fe0f","🏌‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏄‍♂":"1f3c4-200d-2642-fe0f","🏄‍♀":"1f3c4-200d-2640-fe0f","🚣‍♂":"1f6a3-200d-2642-fe0f","🚣‍♀":"1f6a3-200d-2640-fe0f","🏊‍♂":"1f3ca-200d-2642-fe0f","🏊‍♀":"1f3ca-200d-2640-fe0f","⛹‍♂":"26f9-fe0f-200d-2642-fe0f","⛹‍♀":"26f9-fe0f-200d-2640-fe0f","🏋‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋‍♀":"1f3cb-fe0f-200d-2640-fe0f","🚴‍♂":"1f6b4-200d-2642-fe0f","🚴‍♀":"1f6b4-200d-2640-fe0f","🚵‍♂":"1f6b5-200d-2642-fe0f","🚵‍♀":"1f6b5-200d-2640-fe0f","🤸‍♂":"1f938-200d-2642-fe0f","🤸‍♀":"1f938-200d-2640-fe0f","🤼‍♂":"1f93c-200d-2642-fe0f","🤼‍♀":"1f93c-200d-2640-fe0f","🤽‍♂":"1f93d-200d-2642-fe0f","🤽‍♀":"1f93d-200d-2640-fe0f","🤾‍♂":"1f93e-200d-2642-fe0f","🤾‍♀":"1f93e-200d-2640-fe0f","🤹‍♂":"1f939-200d-2642-fe0f","🤹‍♀":"1f939-200d-2640-fe0f","🧘‍♂":"1f9d8-200d-2642-fe0f","🧘‍♀":"1f9d8-200d-2640-fe0f","👨‍👦":"1f468-200d-1f466","👨‍👧":"1f468-200d-1f467","👩‍👦":"1f469-200d-1f466","👩‍👧":"1f469-200d-1f467","🐕‍🦺":"1f415-200d-1f9ba","🐈‍⬛":"1f408-200d-2b1b","🐻‍❄":"1f43b-200d-2744-fe0f","#️⃣":"23-20e3","*️⃣":"2a-20e3","0️⃣":"30-20e3","1️⃣":"31-20e3","2️⃣":"32-20e3","3️⃣":"33-20e3","4️⃣":"34-20e3","5️⃣":"35-20e3","6️⃣":"36-20e3","7️⃣":"37-20e3","8️⃣":"38-20e3","9️⃣":"39-20e3","🏳‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠":"1f3f4-200d-2620-fe0f","😶‍🌫️":"1f636-200d-1f32b-fe0f","❤️‍🔥":"2764-fe0f-200d-1f525","❤️‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨️":"1f441-200d-1f5e8","👁️‍🗨":"1f441-200d-1f5e8","🧔‍♂️":"1f9d4-200d-2642-fe0f","🧔🏻‍♂":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂":"1f9d4-1f3ff-200d-2642-fe0f","🧔‍♀️":"1f9d4-200d-2640-fe0f","🧔🏻‍♀":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀":"1f9d4-1f3ff-200d-2640-fe0f","👨🏻‍🦰":"1f468-1f3fb-200d-1f9b0","👨🏼‍🦰":"1f468-1f3fc-200d-1f9b0","👨🏽‍🦰":"1f468-1f3fd-200d-1f9b0","👨🏾‍🦰":"1f468-1f3fe-200d-1f9b0","👨🏿‍🦰":"1f468-1f3ff-200d-1f9b0","👨🏻‍🦱":"1f468-1f3fb-200d-1f9b1","👨🏼‍🦱":"1f468-1f3fc-200d-1f9b1","👨🏽‍🦱":"1f468-1f3fd-200d-1f9b1","👨🏾‍🦱":"1f468-1f3fe-200d-1f9b1","👨🏿‍🦱":"1f468-1f3ff-200d-1f9b1","👨🏻‍🦳":"1f468-1f3fb-200d-1f9b3","👨🏼‍🦳":"1f468-1f3fc-200d-1f9b3","👨🏽‍🦳":"1f468-1f3fd-200d-1f9b3","👨🏾‍🦳":"1f468-1f3fe-200d-1f9b3","👨🏿‍🦳":"1f468-1f3ff-200d-1f9b3","👨🏻‍🦲":"1f468-1f3fb-200d-1f9b2","👨🏼‍🦲":"1f468-1f3fc-200d-1f9b2","👨🏽‍🦲":"1f468-1f3fd-200d-1f9b2","👨🏾‍🦲":"1f468-1f3fe-200d-1f9b2","👨🏿‍🦲":"1f468-1f3ff-200d-1f9b2","👩🏻‍🦰":"1f469-1f3fb-200d-1f9b0","👩🏼‍🦰":"1f469-1f3fc-200d-1f9b0","👩🏽‍🦰":"1f469-1f3fd-200d-1f9b0","👩🏾‍🦰":"1f469-1f3fe-200d-1f9b0","👩🏿‍🦰":"1f469-1f3ff-200d-1f9b0","🧑🏻‍🦰":"1f9d1-1f3fb-200d-1f9b0","🧑🏼‍🦰":"1f9d1-1f3fc-200d-1f9b0","🧑🏽‍🦰":"1f9d1-1f3fd-200d-1f9b0","🧑🏾‍🦰":"1f9d1-1f3fe-200d-1f9b0","🧑🏿‍🦰":"1f9d1-1f3ff-200d-1f9b0","👩🏻‍🦱":"1f469-1f3fb-200d-1f9b1","👩🏼‍🦱":"1f469-1f3fc-200d-1f9b1","👩🏽‍🦱":"1f469-1f3fd-200d-1f9b1","👩🏾‍🦱":"1f469-1f3fe-200d-1f9b1","👩🏿‍🦱":"1f469-1f3ff-200d-1f9b1","🧑🏻‍🦱":"1f9d1-1f3fb-200d-1f9b1","🧑🏼‍🦱":"1f9d1-1f3fc-200d-1f9b1","🧑🏽‍🦱":"1f9d1-1f3fd-200d-1f9b1","🧑🏾‍🦱":"1f9d1-1f3fe-200d-1f9b1","🧑🏿‍🦱":"1f9d1-1f3ff-200d-1f9b1","👩🏻‍🦳":"1f469-1f3fb-200d-1f9b3","👩🏼‍🦳":"1f469-1f3fc-200d-1f9b3","👩🏽‍🦳":"1f469-1f3fd-200d-1f9b3","👩🏾‍🦳":"1f469-1f3fe-200d-1f9b3","👩🏿‍🦳":"1f469-1f3ff-200d-1f9b3","🧑🏻‍🦳":"1f9d1-1f3fb-200d-1f9b3","🧑🏼‍🦳":"1f9d1-1f3fc-200d-1f9b3","🧑🏽‍🦳":"1f9d1-1f3fd-200d-1f9b3","🧑🏾‍🦳":"1f9d1-1f3fe-200d-1f9b3","🧑🏿‍🦳":"1f9d1-1f3ff-200d-1f9b3","👩🏻‍🦲":"1f469-1f3fb-200d-1f9b2","👩🏼‍🦲":"1f469-1f3fc-200d-1f9b2","👩🏽‍🦲":"1f469-1f3fd-200d-1f9b2","👩🏾‍🦲":"1f469-1f3fe-200d-1f9b2","👩🏿‍🦲":"1f469-1f3ff-200d-1f9b2","🧑🏻‍🦲":"1f9d1-1f3fb-200d-1f9b2","🧑🏼‍🦲":"1f9d1-1f3fc-200d-1f9b2","🧑🏽‍🦲":"1f9d1-1f3fd-200d-1f9b2","🧑🏾‍🦲":"1f9d1-1f3fe-200d-1f9b2","🧑🏿‍🦲":"1f9d1-1f3ff-200d-1f9b2","👱‍♀️":"1f471-200d-2640-fe0f","👱🏻‍♀":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀":"1f471-1f3ff-200d-2640-fe0f","👱‍♂️":"1f471-200d-2642-fe0f","👱🏻‍♂":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂":"1f471-1f3ff-200d-2642-fe0f","🙍‍♂️":"1f64d-200d-2642-fe0f","🙍🏻‍♂":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂":"1f64d-1f3ff-200d-2642-fe0f","🙍‍♀️":"1f64d-200d-2640-fe0f","🙍🏻‍♀":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀":"1f64d-1f3ff-200d-2640-fe0f","🙎‍♂️":"1f64e-200d-2642-fe0f","🙎🏻‍♂":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂":"1f64e-1f3ff-200d-2642-fe0f","🙎‍♀️":"1f64e-200d-2640-fe0f","🙎🏻‍♀":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀":"1f64e-1f3ff-200d-2640-fe0f","🙅‍♂️":"1f645-200d-2642-fe0f","🙅🏻‍♂":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂":"1f645-1f3ff-200d-2642-fe0f","🙅‍♀️":"1f645-200d-2640-fe0f","🙅🏻‍♀":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀":"1f645-1f3ff-200d-2640-fe0f","🙆‍♂️":"1f646-200d-2642-fe0f","🙆🏻‍♂":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂":"1f646-1f3ff-200d-2642-fe0f","🙆‍♀️":"1f646-200d-2640-fe0f","🙆🏻‍♀":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀":"1f646-1f3ff-200d-2640-fe0f","💁‍♂️":"1f481-200d-2642-fe0f","💁🏻‍♂":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂":"1f481-1f3ff-200d-2642-fe0f","💁‍♀️":"1f481-200d-2640-fe0f","💁🏻‍♀":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀":"1f481-1f3ff-200d-2640-fe0f","🙋‍♂️":"1f64b-200d-2642-fe0f","🙋🏻‍♂":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂":"1f64b-1f3ff-200d-2642-fe0f","🙋‍♀️":"1f64b-200d-2640-fe0f","🙋🏻‍♀":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀":"1f64b-1f3ff-200d-2640-fe0f","🧏‍♂️":"1f9cf-200d-2642-fe0f","🧏🏻‍♂":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂":"1f9cf-1f3ff-200d-2642-fe0f","🧏‍♀️":"1f9cf-200d-2640-fe0f","🧏🏻‍♀":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀":"1f9cf-1f3ff-200d-2640-fe0f","🙇‍♂️":"1f647-200d-2642-fe0f","🙇🏻‍♂":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂":"1f647-1f3ff-200d-2642-fe0f","🙇‍♀️":"1f647-200d-2640-fe0f","🙇🏻‍♀":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀":"1f647-1f3ff-200d-2640-fe0f","🤦‍♂️":"1f926-200d-2642-fe0f","🤦🏻‍♂":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂":"1f926-1f3ff-200d-2642-fe0f","🤦‍♀️":"1f926-200d-2640-fe0f","🤦🏻‍♀":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀":"1f926-1f3ff-200d-2640-fe0f","🤷‍♂️":"1f937-200d-2642-fe0f","🤷🏻‍♂":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂":"1f937-1f3ff-200d-2642-fe0f","🤷‍♀️":"1f937-200d-2640-fe0f","🤷🏻‍♀":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀":"1f937-1f3ff-200d-2640-fe0f","🧑‍⚕️":"1f9d1-200d-2695-fe0f","🧑🏻‍⚕":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕":"1f9d1-1f3ff-200d-2695-fe0f","👨‍⚕️":"1f468-200d-2695-fe0f","👨🏻‍⚕":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕":"1f468-1f3ff-200d-2695-fe0f","👩‍⚕️":"1f469-200d-2695-fe0f","👩🏻‍⚕":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍🎓":"1f9d1-1f3fb-200d-1f393","🧑🏼‍🎓":"1f9d1-1f3fc-200d-1f393","🧑🏽‍🎓":"1f9d1-1f3fd-200d-1f393","🧑🏾‍🎓":"1f9d1-1f3fe-200d-1f393","🧑🏿‍🎓":"1f9d1-1f3ff-200d-1f393","👨🏻‍🎓":"1f468-1f3fb-200d-1f393","👨🏼‍🎓":"1f468-1f3fc-200d-1f393","👨🏽‍🎓":"1f468-1f3fd-200d-1f393","👨🏾‍🎓":"1f468-1f3fe-200d-1f393","👨🏿‍🎓":"1f468-1f3ff-200d-1f393","👩🏻‍🎓":"1f469-1f3fb-200d-1f393","👩🏼‍🎓":"1f469-1f3fc-200d-1f393","👩🏽‍🎓":"1f469-1f3fd-200d-1f393","👩🏾‍🎓":"1f469-1f3fe-200d-1f393","👩🏿‍🎓":"1f469-1f3ff-200d-1f393","🧑🏻‍🏫":"1f9d1-1f3fb-200d-1f3eb","🧑🏼‍🏫":"1f9d1-1f3fc-200d-1f3eb","🧑🏽‍🏫":"1f9d1-1f3fd-200d-1f3eb","🧑🏾‍🏫":"1f9d1-1f3fe-200d-1f3eb","🧑🏿‍🏫":"1f9d1-1f3ff-200d-1f3eb","👨🏻‍🏫":"1f468-1f3fb-200d-1f3eb","👨🏼‍🏫":"1f468-1f3fc-200d-1f3eb","👨🏽‍🏫":"1f468-1f3fd-200d-1f3eb","👨🏾‍🏫":"1f468-1f3fe-200d-1f3eb","👨🏿‍🏫":"1f468-1f3ff-200d-1f3eb","👩🏻‍🏫":"1f469-1f3fb-200d-1f3eb","👩🏼‍🏫":"1f469-1f3fc-200d-1f3eb","👩🏽‍🏫":"1f469-1f3fd-200d-1f3eb","👩🏾‍🏫":"1f469-1f3fe-200d-1f3eb","👩🏿‍🏫":"1f469-1f3ff-200d-1f3eb","🧑‍⚖️":"1f9d1-200d-2696-fe0f","🧑🏻‍⚖":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖":"1f9d1-1f3ff-200d-2696-fe0f","👨‍⚖️":"1f468-200d-2696-fe0f","👨🏻‍⚖":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖":"1f468-1f3ff-200d-2696-fe0f","👩‍⚖️":"1f469-200d-2696-fe0f","👩🏻‍⚖":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍🌾":"1f9d1-1f3fb-200d-1f33e","🧑🏼‍🌾":"1f9d1-1f3fc-200d-1f33e","🧑🏽‍🌾":"1f9d1-1f3fd-200d-1f33e","🧑🏾‍🌾":"1f9d1-1f3fe-200d-1f33e","🧑🏿‍🌾":"1f9d1-1f3ff-200d-1f33e","👨🏻‍🌾":"1f468-1f3fb-200d-1f33e","👨🏼‍🌾":"1f468-1f3fc-200d-1f33e","👨🏽‍🌾":"1f468-1f3fd-200d-1f33e","👨🏾‍🌾":"1f468-1f3fe-200d-1f33e","👨🏿‍🌾":"1f468-1f3ff-200d-1f33e","👩🏻‍🌾":"1f469-1f3fb-200d-1f33e","👩🏼‍🌾":"1f469-1f3fc-200d-1f33e","👩🏽‍🌾":"1f469-1f3fd-200d-1f33e","👩🏾‍🌾":"1f469-1f3fe-200d-1f33e","👩🏿‍🌾":"1f469-1f3ff-200d-1f33e","🧑🏻‍🍳":"1f9d1-1f3fb-200d-1f373","🧑🏼‍🍳":"1f9d1-1f3fc-200d-1f373","🧑🏽‍🍳":"1f9d1-1f3fd-200d-1f373","🧑🏾‍🍳":"1f9d1-1f3fe-200d-1f373","🧑🏿‍🍳":"1f9d1-1f3ff-200d-1f373","👨🏻‍🍳":"1f468-1f3fb-200d-1f373","👨🏼‍🍳":"1f468-1f3fc-200d-1f373","👨🏽‍🍳":"1f468-1f3fd-200d-1f373","👨🏾‍🍳":"1f468-1f3fe-200d-1f373","👨🏿‍🍳":"1f468-1f3ff-200d-1f373","👩🏻‍🍳":"1f469-1f3fb-200d-1f373","👩🏼‍🍳":"1f469-1f3fc-200d-1f373","👩🏽‍🍳":"1f469-1f3fd-200d-1f373","👩🏾‍🍳":"1f469-1f3fe-200d-1f373","👩🏿‍🍳":"1f469-1f3ff-200d-1f373","🧑🏻‍🔧":"1f9d1-1f3fb-200d-1f527","🧑🏼‍🔧":"1f9d1-1f3fc-200d-1f527","🧑🏽‍🔧":"1f9d1-1f3fd-200d-1f527","🧑🏾‍🔧":"1f9d1-1f3fe-200d-1f527","🧑🏿‍🔧":"1f9d1-1f3ff-200d-1f527","👨🏻‍🔧":"1f468-1f3fb-200d-1f527","👨🏼‍🔧":"1f468-1f3fc-200d-1f527","👨🏽‍🔧":"1f468-1f3fd-200d-1f527","👨🏾‍🔧":"1f468-1f3fe-200d-1f527","👨🏿‍🔧":"1f468-1f3ff-200d-1f527","👩🏻‍🔧":"1f469-1f3fb-200d-1f527","👩🏼‍🔧":"1f469-1f3fc-200d-1f527","👩🏽‍🔧":"1f469-1f3fd-200d-1f527","👩🏾‍🔧":"1f469-1f3fe-200d-1f527","👩🏿‍🔧":"1f469-1f3ff-200d-1f527","🧑🏻‍🏭":"1f9d1-1f3fb-200d-1f3ed","🧑🏼‍🏭":"1f9d1-1f3fc-200d-1f3ed","🧑🏽‍🏭":"1f9d1-1f3fd-200d-1f3ed","🧑🏾‍🏭":"1f9d1-1f3fe-200d-1f3ed","🧑🏿‍🏭":"1f9d1-1f3ff-200d-1f3ed","👨🏻‍🏭":"1f468-1f3fb-200d-1f3ed","👨🏼‍🏭":"1f468-1f3fc-200d-1f3ed","👨🏽‍🏭":"1f468-1f3fd-200d-1f3ed","👨🏾‍🏭":"1f468-1f3fe-200d-1f3ed","👨🏿‍🏭":"1f468-1f3ff-200d-1f3ed","👩🏻‍🏭":"1f469-1f3fb-200d-1f3ed","👩🏼‍🏭":"1f469-1f3fc-200d-1f3ed","👩🏽‍🏭":"1f469-1f3fd-200d-1f3ed","👩🏾‍🏭":"1f469-1f3fe-200d-1f3ed","👩🏿‍🏭":"1f469-1f3ff-200d-1f3ed","🧑🏻‍💼":"1f9d1-1f3fb-200d-1f4bc","🧑🏼‍💼":"1f9d1-1f3fc-200d-1f4bc","🧑🏽‍💼":"1f9d1-1f3fd-200d-1f4bc","🧑🏾‍💼":"1f9d1-1f3fe-200d-1f4bc","🧑🏿‍💼":"1f9d1-1f3ff-200d-1f4bc","👨🏻‍💼":"1f468-1f3fb-200d-1f4bc","👨🏼‍💼":"1f468-1f3fc-200d-1f4bc","👨🏽‍💼":"1f468-1f3fd-200d-1f4bc","👨🏾‍💼":"1f468-1f3fe-200d-1f4bc","👨🏿‍💼":"1f468-1f3ff-200d-1f4bc","👩🏻‍💼":"1f469-1f3fb-200d-1f4bc","👩🏼‍💼":"1f469-1f3fc-200d-1f4bc","👩🏽‍💼":"1f469-1f3fd-200d-1f4bc","👩🏾‍💼":"1f469-1f3fe-200d-1f4bc","👩🏿‍💼":"1f469-1f3ff-200d-1f4bc","🧑🏻‍🔬":"1f9d1-1f3fb-200d-1f52c","🧑🏼‍🔬":"1f9d1-1f3fc-200d-1f52c","🧑🏽‍🔬":"1f9d1-1f3fd-200d-1f52c","🧑🏾‍🔬":"1f9d1-1f3fe-200d-1f52c","🧑🏿‍🔬":"1f9d1-1f3ff-200d-1f52c","👨🏻‍🔬":"1f468-1f3fb-200d-1f52c","👨🏼‍🔬":"1f468-1f3fc-200d-1f52c","👨🏽‍🔬":"1f468-1f3fd-200d-1f52c","👨🏾‍🔬":"1f468-1f3fe-200d-1f52c","👨🏿‍🔬":"1f468-1f3ff-200d-1f52c","👩🏻‍🔬":"1f469-1f3fb-200d-1f52c","👩🏼‍🔬":"1f469-1f3fc-200d-1f52c","👩🏽‍🔬":"1f469-1f3fd-200d-1f52c","👩🏾‍🔬":"1f469-1f3fe-200d-1f52c","👩🏿‍🔬":"1f469-1f3ff-200d-1f52c","🧑🏻‍💻":"1f9d1-1f3fb-200d-1f4bb","🧑🏼‍💻":"1f9d1-1f3fc-200d-1f4bb","🧑🏽‍💻":"1f9d1-1f3fd-200d-1f4bb","🧑🏾‍💻":"1f9d1-1f3fe-200d-1f4bb","🧑🏿‍💻":"1f9d1-1f3ff-200d-1f4bb","👨🏻‍💻":"1f468-1f3fb-200d-1f4bb","👨🏼‍💻":"1f468-1f3fc-200d-1f4bb","👨🏽‍💻":"1f468-1f3fd-200d-1f4bb","👨🏾‍💻":"1f468-1f3fe-200d-1f4bb","👨🏿‍💻":"1f468-1f3ff-200d-1f4bb","👩🏻‍💻":"1f469-1f3fb-200d-1f4bb","👩🏼‍💻":"1f469-1f3fc-200d-1f4bb","👩🏽‍💻":"1f469-1f3fd-200d-1f4bb","👩🏾‍💻":"1f469-1f3fe-200d-1f4bb","👩🏿‍💻":"1f469-1f3ff-200d-1f4bb","🧑🏻‍🎤":"1f9d1-1f3fb-200d-1f3a4","🧑🏼‍🎤":"1f9d1-1f3fc-200d-1f3a4","🧑🏽‍🎤":"1f9d1-1f3fd-200d-1f3a4","🧑🏾‍🎤":"1f9d1-1f3fe-200d-1f3a4","🧑🏿‍🎤":"1f9d1-1f3ff-200d-1f3a4","👨🏻‍🎤":"1f468-1f3fb-200d-1f3a4","👨🏼‍🎤":"1f468-1f3fc-200d-1f3a4","👨🏽‍🎤":"1f468-1f3fd-200d-1f3a4","👨🏾‍🎤":"1f468-1f3fe-200d-1f3a4","👨🏿‍🎤":"1f468-1f3ff-200d-1f3a4","👩🏻‍🎤":"1f469-1f3fb-200d-1f3a4","👩🏼‍🎤":"1f469-1f3fc-200d-1f3a4","👩🏽‍🎤":"1f469-1f3fd-200d-1f3a4","👩🏾‍🎤":"1f469-1f3fe-200d-1f3a4","👩🏿‍🎤":"1f469-1f3ff-200d-1f3a4","🧑🏻‍🎨":"1f9d1-1f3fb-200d-1f3a8","🧑🏼‍🎨":"1f9d1-1f3fc-200d-1f3a8","🧑🏽‍🎨":"1f9d1-1f3fd-200d-1f3a8","🧑🏾‍🎨":"1f9d1-1f3fe-200d-1f3a8","🧑🏿‍🎨":"1f9d1-1f3ff-200d-1f3a8","👨🏻‍🎨":"1f468-1f3fb-200d-1f3a8","👨🏼‍🎨":"1f468-1f3fc-200d-1f3a8","👨🏽‍🎨":"1f468-1f3fd-200d-1f3a8","👨🏾‍🎨":"1f468-1f3fe-200d-1f3a8","👨🏿‍🎨":"1f468-1f3ff-200d-1f3a8","👩🏻‍🎨":"1f469-1f3fb-200d-1f3a8","👩🏼‍🎨":"1f469-1f3fc-200d-1f3a8","👩🏽‍🎨":"1f469-1f3fd-200d-1f3a8","👩🏾‍🎨":"1f469-1f3fe-200d-1f3a8","👩🏿‍🎨":"1f469-1f3ff-200d-1f3a8","🧑‍✈️":"1f9d1-200d-2708-fe0f","🧑🏻‍✈":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈":"1f9d1-1f3ff-200d-2708-fe0f","👨‍✈️":"1f468-200d-2708-fe0f","👨🏻‍✈":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈":"1f468-1f3ff-200d-2708-fe0f","👩‍✈️":"1f469-200d-2708-fe0f","👩🏻‍✈":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈":"1f469-1f3ff-200d-2708-fe0f","🧑🏻‍🚀":"1f9d1-1f3fb-200d-1f680","🧑🏼‍🚀":"1f9d1-1f3fc-200d-1f680","🧑🏽‍🚀":"1f9d1-1f3fd-200d-1f680","🧑🏾‍🚀":"1f9d1-1f3fe-200d-1f680","🧑🏿‍🚀":"1f9d1-1f3ff-200d-1f680","👨🏻‍🚀":"1f468-1f3fb-200d-1f680","👨🏼‍🚀":"1f468-1f3fc-200d-1f680","👨🏽‍🚀":"1f468-1f3fd-200d-1f680","👨🏾‍🚀":"1f468-1f3fe-200d-1f680","👨🏿‍🚀":"1f468-1f3ff-200d-1f680","👩🏻‍🚀":"1f469-1f3fb-200d-1f680","👩🏼‍🚀":"1f469-1f3fc-200d-1f680","👩🏽‍🚀":"1f469-1f3fd-200d-1f680","👩🏾‍🚀":"1f469-1f3fe-200d-1f680","👩🏿‍🚀":"1f469-1f3ff-200d-1f680","🧑🏻‍🚒":"1f9d1-1f3fb-200d-1f692","🧑🏼‍🚒":"1f9d1-1f3fc-200d-1f692","🧑🏽‍🚒":"1f9d1-1f3fd-200d-1f692","🧑🏾‍🚒":"1f9d1-1f3fe-200d-1f692","🧑🏿‍🚒":"1f9d1-1f3ff-200d-1f692","👨🏻‍🚒":"1f468-1f3fb-200d-1f692","👨🏼‍🚒":"1f468-1f3fc-200d-1f692","👨🏽‍🚒":"1f468-1f3fd-200d-1f692","👨🏾‍🚒":"1f468-1f3fe-200d-1f692","👨🏿‍🚒":"1f468-1f3ff-200d-1f692","👩🏻‍🚒":"1f469-1f3fb-200d-1f692","👩🏼‍🚒":"1f469-1f3fc-200d-1f692","👩🏽‍🚒":"1f469-1f3fd-200d-1f692","👩🏾‍🚒":"1f469-1f3fe-200d-1f692","👩🏿‍🚒":"1f469-1f3ff-200d-1f692","👮‍♂️":"1f46e-200d-2642-fe0f","👮🏻‍♂":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂":"1f46e-1f3ff-200d-2642-fe0f","👮‍♀️":"1f46e-200d-2640-fe0f","👮🏻‍♀":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀":"1f46e-1f3ff-200d-2640-fe0f","🕵‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵️‍♂":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂":"1f575-1f3ff-200d-2642-fe0f","🕵‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵️‍♀":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀":"1f575-1f3ff-200d-2640-fe0f","💂‍♂️":"1f482-200d-2642-fe0f","💂🏻‍♂":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂":"1f482-1f3ff-200d-2642-fe0f","💂‍♀️":"1f482-200d-2640-fe0f","💂🏻‍♀":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀":"1f482-1f3ff-200d-2640-fe0f","👷‍♂️":"1f477-200d-2642-fe0f","👷🏻‍♂":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂":"1f477-1f3ff-200d-2642-fe0f","👷‍♀️":"1f477-200d-2640-fe0f","👷🏻‍♀":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀":"1f477-1f3ff-200d-2640-fe0f","👳‍♂️":"1f473-200d-2642-fe0f","👳🏻‍♂":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂":"1f473-1f3ff-200d-2642-fe0f","👳‍♀️":"1f473-200d-2640-fe0f","👳🏻‍♀":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀":"1f473-1f3ff-200d-2640-fe0f","🤵‍♂️":"1f935-200d-2642-fe0f","🤵🏻‍♂":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂":"1f935-1f3ff-200d-2642-fe0f","🤵‍♀️":"1f935-200d-2640-fe0f","🤵🏻‍♀":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀":"1f935-1f3ff-200d-2640-fe0f","👰‍♂️":"1f470-200d-2642-fe0f","👰🏻‍♂":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂":"1f470-1f3ff-200d-2642-fe0f","👰‍♀️":"1f470-200d-2640-fe0f","👰🏻‍♀":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀":"1f470-1f3ff-200d-2640-fe0f","👩🏻‍🍼":"1f469-1f3fb-200d-1f37c","👩🏼‍🍼":"1f469-1f3fc-200d-1f37c","👩🏽‍🍼":"1f469-1f3fd-200d-1f37c","👩🏾‍🍼":"1f469-1f3fe-200d-1f37c","👩🏿‍🍼":"1f469-1f3ff-200d-1f37c","👨🏻‍🍼":"1f468-1f3fb-200d-1f37c","👨🏼‍🍼":"1f468-1f3fc-200d-1f37c","👨🏽‍🍼":"1f468-1f3fd-200d-1f37c","👨🏾‍🍼":"1f468-1f3fe-200d-1f37c","👨🏿‍🍼":"1f468-1f3ff-200d-1f37c","🧑🏻‍🍼":"1f9d1-1f3fb-200d-1f37c","🧑🏼‍🍼":"1f9d1-1f3fc-200d-1f37c","🧑🏽‍🍼":"1f9d1-1f3fd-200d-1f37c","🧑🏾‍🍼":"1f9d1-1f3fe-200d-1f37c","🧑🏿‍🍼":"1f9d1-1f3ff-200d-1f37c","🧑🏻‍🎄":"1f9d1-1f3fb-200d-1f384","🧑🏼‍🎄":"1f9d1-1f3fc-200d-1f384","🧑🏽‍🎄":"1f9d1-1f3fd-200d-1f384","🧑🏾‍🎄":"1f9d1-1f3fe-200d-1f384","🧑🏿‍🎄":"1f9d1-1f3ff-200d-1f384","🦸‍♂️":"1f9b8-200d-2642-fe0f","🦸🏻‍♂":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂":"1f9b8-1f3ff-200d-2642-fe0f","🦸‍♀️":"1f9b8-200d-2640-fe0f","🦸🏻‍♀":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀":"1f9b8-1f3ff-200d-2640-fe0f","🦹‍♂️":"1f9b9-200d-2642-fe0f","🦹🏻‍♂":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂":"1f9b9-1f3ff-200d-2642-fe0f","🦹‍♀️":"1f9b9-200d-2640-fe0f","🦹🏻‍♀":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀":"1f9b9-1f3ff-200d-2640-fe0f","🧙‍♂️":"1f9d9-200d-2642-fe0f","🧙🏻‍♂":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂":"1f9d9-1f3ff-200d-2642-fe0f","🧙‍♀️":"1f9d9-200d-2640-fe0f","🧙🏻‍♀":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀":"1f9d9-1f3ff-200d-2640-fe0f","🧚‍♂️":"1f9da-200d-2642-fe0f","🧚🏻‍♂":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂":"1f9da-1f3ff-200d-2642-fe0f","🧚‍♀️":"1f9da-200d-2640-fe0f","🧚🏻‍♀":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀":"1f9da-1f3ff-200d-2640-fe0f","🧛‍♂️":"1f9db-200d-2642-fe0f","🧛🏻‍♂":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂":"1f9db-1f3ff-200d-2642-fe0f","🧛‍♀️":"1f9db-200d-2640-fe0f","🧛🏻‍♀":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀":"1f9db-1f3ff-200d-2640-fe0f","🧜‍♂️":"1f9dc-200d-2642-fe0f","🧜🏻‍♂":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂":"1f9dc-1f3ff-200d-2642-fe0f","🧜‍♀️":"1f9dc-200d-2640-fe0f","🧜🏻‍♀":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀":"1f9dc-1f3ff-200d-2640-fe0f","🧝‍♂️":"1f9dd-200d-2642-fe0f","🧝🏻‍♂":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂":"1f9dd-1f3ff-200d-2642-fe0f","🧝‍♀️":"1f9dd-200d-2640-fe0f","🧝🏻‍♀":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀":"1f9dd-1f3ff-200d-2640-fe0f","🧞‍♂️":"1f9de-200d-2642-fe0f","🧞‍♀️":"1f9de-200d-2640-fe0f","🧟‍♂️":"1f9df-200d-2642-fe0f","🧟‍♀️":"1f9df-200d-2640-fe0f","💆‍♂️":"1f486-200d-2642-fe0f","💆🏻‍♂":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂":"1f486-1f3ff-200d-2642-fe0f","💆‍♀️":"1f486-200d-2640-fe0f","💆🏻‍♀":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀":"1f486-1f3ff-200d-2640-fe0f","💇‍♂️":"1f487-200d-2642-fe0f","💇🏻‍♂":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂":"1f487-1f3ff-200d-2642-fe0f","💇‍♀️":"1f487-200d-2640-fe0f","💇🏻‍♀":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀":"1f487-1f3ff-200d-2640-fe0f","🚶‍♂️":"1f6b6-200d-2642-fe0f","🚶🏻‍♂":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂":"1f6b6-1f3ff-200d-2642-fe0f","🚶‍♀️":"1f6b6-200d-2640-fe0f","🚶🏻‍♀":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀":"1f6b6-1f3ff-200d-2640-fe0f","🧍‍♂️":"1f9cd-200d-2642-fe0f","🧍🏻‍♂":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂":"1f9cd-1f3ff-200d-2642-fe0f","🧍‍♀️":"1f9cd-200d-2640-fe0f","🧍🏻‍♀":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀":"1f9cd-1f3ff-200d-2640-fe0f","🧎‍♂️":"1f9ce-200d-2642-fe0f","🧎🏻‍♂":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂":"1f9ce-1f3ff-200d-2642-fe0f","🧎‍♀️":"1f9ce-200d-2640-fe0f","🧎🏻‍♀":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀":"1f9ce-1f3ff-200d-2640-fe0f","🧑🏻‍🦯":"1f9d1-1f3fb-200d-1f9af","🧑🏼‍🦯":"1f9d1-1f3fc-200d-1f9af","🧑🏽‍🦯":"1f9d1-1f3fd-200d-1f9af","🧑🏾‍🦯":"1f9d1-1f3fe-200d-1f9af","🧑🏿‍🦯":"1f9d1-1f3ff-200d-1f9af","👨🏻‍🦯":"1f468-1f3fb-200d-1f9af","👨🏼‍🦯":"1f468-1f3fc-200d-1f9af","👨🏽‍🦯":"1f468-1f3fd-200d-1f9af","👨🏾‍🦯":"1f468-1f3fe-200d-1f9af","👨🏿‍🦯":"1f468-1f3ff-200d-1f9af","👩🏻‍🦯":"1f469-1f3fb-200d-1f9af","👩🏼‍🦯":"1f469-1f3fc-200d-1f9af","👩🏽‍🦯":"1f469-1f3fd-200d-1f9af","👩🏾‍🦯":"1f469-1f3fe-200d-1f9af","👩🏿‍🦯":"1f469-1f3ff-200d-1f9af","🧑🏻‍🦼":"1f9d1-1f3fb-200d-1f9bc","🧑🏼‍🦼":"1f9d1-1f3fc-200d-1f9bc","🧑🏽‍🦼":"1f9d1-1f3fd-200d-1f9bc","🧑🏾‍🦼":"1f9d1-1f3fe-200d-1f9bc","🧑🏿‍🦼":"1f9d1-1f3ff-200d-1f9bc","👨🏻‍🦼":"1f468-1f3fb-200d-1f9bc","👨🏼‍🦼":"1f468-1f3fc-200d-1f9bc","👨🏽‍🦼":"1f468-1f3fd-200d-1f9bc","👨🏾‍🦼":"1f468-1f3fe-200d-1f9bc","👨🏿‍🦼":"1f468-1f3ff-200d-1f9bc","👩🏻‍🦼":"1f469-1f3fb-200d-1f9bc","👩🏼‍🦼":"1f469-1f3fc-200d-1f9bc","👩🏽‍🦼":"1f469-1f3fd-200d-1f9bc","👩🏾‍🦼":"1f469-1f3fe-200d-1f9bc","👩🏿‍🦼":"1f469-1f3ff-200d-1f9bc","🧑🏻‍🦽":"1f9d1-1f3fb-200d-1f9bd","🧑🏼‍🦽":"1f9d1-1f3fc-200d-1f9bd","🧑🏽‍🦽":"1f9d1-1f3fd-200d-1f9bd","🧑🏾‍🦽":"1f9d1-1f3fe-200d-1f9bd","🧑🏿‍🦽":"1f9d1-1f3ff-200d-1f9bd","👨🏻‍🦽":"1f468-1f3fb-200d-1f9bd","👨🏼‍🦽":"1f468-1f3fc-200d-1f9bd","👨🏽‍🦽":"1f468-1f3fd-200d-1f9bd","👨🏾‍🦽":"1f468-1f3fe-200d-1f9bd","👨🏿‍🦽":"1f468-1f3ff-200d-1f9bd","👩🏻‍🦽":"1f469-1f3fb-200d-1f9bd","👩🏼‍🦽":"1f469-1f3fc-200d-1f9bd","👩🏽‍🦽":"1f469-1f3fd-200d-1f9bd","👩🏾‍🦽":"1f469-1f3fe-200d-1f9bd","👩🏿‍🦽":"1f469-1f3ff-200d-1f9bd","🏃‍♂️":"1f3c3-200d-2642-fe0f","🏃🏻‍♂":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂":"1f3c3-1f3ff-200d-2642-fe0f","🏃‍♀️":"1f3c3-200d-2640-fe0f","🏃🏻‍♀":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀":"1f3c3-1f3ff-200d-2640-fe0f","👯‍♂️":"1f46f-200d-2642-fe0f","👯‍♀️":"1f46f-200d-2640-fe0f","🧖‍♂️":"1f9d6-200d-2642-fe0f","🧖🏻‍♂":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂":"1f9d6-1f3ff-200d-2642-fe0f","🧖‍♀️":"1f9d6-200d-2640-fe0f","🧖🏻‍♀":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀":"1f9d6-1f3ff-200d-2640-fe0f","🧗‍♂️":"1f9d7-200d-2642-fe0f","🧗🏻‍♂":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂":"1f9d7-1f3ff-200d-2642-fe0f","🧗‍♀️":"1f9d7-200d-2640-fe0f","🧗🏻‍♀":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀":"1f9d7-1f3ff-200d-2640-fe0f","🏌‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌️‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂":"1f3cc-1f3ff-200d-2642-fe0f","🏌‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌️‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀":"1f3cc-1f3ff-200d-2640-fe0f","🏄‍♂️":"1f3c4-200d-2642-fe0f","🏄🏻‍♂":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂":"1f3c4-1f3ff-200d-2642-fe0f","🏄‍♀️":"1f3c4-200d-2640-fe0f","🏄🏻‍♀":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀":"1f3c4-1f3ff-200d-2640-fe0f","🚣‍♂️":"1f6a3-200d-2642-fe0f","🚣🏻‍♂":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂":"1f6a3-1f3ff-200d-2642-fe0f","🚣‍♀️":"1f6a3-200d-2640-fe0f","🚣🏻‍♀":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀":"1f6a3-1f3ff-200d-2640-fe0f","🏊‍♂️":"1f3ca-200d-2642-fe0f","🏊🏻‍♂":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂":"1f3ca-1f3ff-200d-2642-fe0f","🏊‍♀️":"1f3ca-200d-2640-fe0f","🏊🏻‍♀":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀":"1f3ca-1f3ff-200d-2640-fe0f","⛹‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹️‍♂":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂":"26f9-1f3ff-200d-2642-fe0f","⛹‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹️‍♀":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀":"26f9-1f3ff-200d-2640-fe0f","🏋‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋️‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂":"1f3cb-1f3ff-200d-2642-fe0f","🏋‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋️‍♀":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀":"1f3cb-1f3ff-200d-2640-fe0f","🚴‍♂️":"1f6b4-200d-2642-fe0f","🚴🏻‍♂":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂":"1f6b4-1f3ff-200d-2642-fe0f","🚴‍♀️":"1f6b4-200d-2640-fe0f","🚴🏻‍♀":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀":"1f6b4-1f3ff-200d-2640-fe0f","🚵‍♂️":"1f6b5-200d-2642-fe0f","🚵🏻‍♂":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂":"1f6b5-1f3ff-200d-2642-fe0f","🚵‍♀️":"1f6b5-200d-2640-fe0f","🚵🏻‍♀":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀":"1f6b5-1f3ff-200d-2640-fe0f","🤸‍♂️":"1f938-200d-2642-fe0f","🤸🏻‍♂":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂":"1f938-1f3ff-200d-2642-fe0f","🤸‍♀️":"1f938-200d-2640-fe0f","🤸🏻‍♀":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀":"1f938-1f3ff-200d-2640-fe0f","🤼‍♂️":"1f93c-200d-2642-fe0f","🤼‍♀️":"1f93c-200d-2640-fe0f","🤽‍♂️":"1f93d-200d-2642-fe0f","🤽🏻‍♂":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂":"1f93d-1f3ff-200d-2642-fe0f","🤽‍♀️":"1f93d-200d-2640-fe0f","🤽🏻‍♀":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀":"1f93d-1f3ff-200d-2640-fe0f","🤾‍♂️":"1f93e-200d-2642-fe0f","🤾🏻‍♂":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂":"1f93e-1f3ff-200d-2642-fe0f","🤾‍♀️":"1f93e-200d-2640-fe0f","🤾🏻‍♀":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀":"1f93e-1f3ff-200d-2640-fe0f","🤹‍♂️":"1f939-200d-2642-fe0f","🤹🏻‍♂":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂":"1f939-1f3ff-200d-2642-fe0f","🤹‍♀️":"1f939-200d-2640-fe0f","🤹🏻‍♀":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀":"1f939-1f3ff-200d-2640-fe0f","🧘‍♂️":"1f9d8-200d-2642-fe0f","🧘🏻‍♂":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂":"1f9d8-1f3ff-200d-2642-fe0f","🧘‍♀️":"1f9d8-200d-2640-fe0f","🧘🏻‍♀":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀":"1f9d8-1f3ff-200d-2640-fe0f","🐻‍❄️":"1f43b-200d-2744-fe0f","🏳️‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","🏳️‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠️":"1f3f4-200d-2620-fe0f","👁️‍🗨️":"1f441-200d-1f5e8","🫱🏻‍🫲🏼":"1faf1-1f3fb-200d-1faf2-1f3fc","🫱🏻‍🫲🏽":"1faf1-1f3fb-200d-1faf2-1f3fd","🫱🏻‍🫲🏾":"1faf1-1f3fb-200d-1faf2-1f3fe","🫱🏻‍🫲🏿":"1faf1-1f3fb-200d-1faf2-1f3ff","🫱🏼‍🫲🏻":"1faf1-1f3fc-200d-1faf2-1f3fb","🫱🏼‍🫲🏽":"1faf1-1f3fc-200d-1faf2-1f3fd","🫱🏼‍🫲🏾":"1faf1-1f3fc-200d-1faf2-1f3fe","🫱🏼‍🫲🏿":"1faf1-1f3fc-200d-1faf2-1f3ff","🫱🏽‍🫲🏻":"1faf1-1f3fd-200d-1faf2-1f3fb","🫱🏽‍🫲🏼":"1faf1-1f3fd-200d-1faf2-1f3fc","🫱🏽‍🫲🏾":"1faf1-1f3fd-200d-1faf2-1f3fe","🫱🏽‍🫲🏿":"1faf1-1f3fd-200d-1faf2-1f3ff","🫱🏾‍🫲🏻":"1faf1-1f3fe-200d-1faf2-1f3fb","🫱🏾‍🫲🏼":"1faf1-1f3fe-200d-1faf2-1f3fc","🫱🏾‍🫲🏽":"1faf1-1f3fe-200d-1faf2-1f3fd","🫱🏾‍🫲🏿":"1faf1-1f3fe-200d-1faf2-1f3ff","🫱🏿‍🫲🏻":"1faf1-1f3ff-200d-1faf2-1f3fb","🫱🏿‍🫲🏼":"1faf1-1f3ff-200d-1faf2-1f3fc","🫱🏿‍🫲🏽":"1faf1-1f3ff-200d-1faf2-1f3fd","🫱🏿‍🫲🏾":"1faf1-1f3ff-200d-1faf2-1f3fe","🧔🏻‍♂️":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂️":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂️":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂️":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂️":"1f9d4-1f3ff-200d-2642-fe0f","🧔🏻‍♀️":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀️":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀️":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀️":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀️":"1f9d4-1f3ff-200d-2640-fe0f","👱🏻‍♀️":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀️":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀️":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀️":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀️":"1f471-1f3ff-200d-2640-fe0f","👱🏻‍♂️":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂️":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂️":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂️":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂️":"1f471-1f3ff-200d-2642-fe0f","🙍🏻‍♂️":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂️":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂️":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂️":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂️":"1f64d-1f3ff-200d-2642-fe0f","🙍🏻‍♀️":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀️":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀️":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀️":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀️":"1f64d-1f3ff-200d-2640-fe0f","🙎🏻‍♂️":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂️":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂️":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂️":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂️":"1f64e-1f3ff-200d-2642-fe0f","🙎🏻‍♀️":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀️":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀️":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀️":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀️":"1f64e-1f3ff-200d-2640-fe0f","🙅🏻‍♂️":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂️":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂️":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂️":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂️":"1f645-1f3ff-200d-2642-fe0f","🙅🏻‍♀️":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀️":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀️":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀️":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀️":"1f645-1f3ff-200d-2640-fe0f","🙆🏻‍♂️":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂️":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂️":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂️":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂️":"1f646-1f3ff-200d-2642-fe0f","🙆🏻‍♀️":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀️":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀️":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀️":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀️":"1f646-1f3ff-200d-2640-fe0f","💁🏻‍♂️":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂️":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂️":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂️":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂️":"1f481-1f3ff-200d-2642-fe0f","💁🏻‍♀️":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀️":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀️":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀️":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀️":"1f481-1f3ff-200d-2640-fe0f","🙋🏻‍♂️":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂️":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂️":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂️":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂️":"1f64b-1f3ff-200d-2642-fe0f","🙋🏻‍♀️":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀️":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀️":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀️":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀️":"1f64b-1f3ff-200d-2640-fe0f","🧏🏻‍♂️":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂️":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂️":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂️":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂️":"1f9cf-1f3ff-200d-2642-fe0f","🧏🏻‍♀️":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀️":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀️":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀️":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀️":"1f9cf-1f3ff-200d-2640-fe0f","🙇🏻‍♂️":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂️":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂️":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂️":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂️":"1f647-1f3ff-200d-2642-fe0f","🙇🏻‍♀️":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀️":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀️":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀️":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀️":"1f647-1f3ff-200d-2640-fe0f","🤦🏻‍♂️":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂️":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂️":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂️":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂️":"1f926-1f3ff-200d-2642-fe0f","🤦🏻‍♀️":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀️":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀️":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀️":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀️":"1f926-1f3ff-200d-2640-fe0f","🤷🏻‍♂️":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂️":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂️":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂️":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂️":"1f937-1f3ff-200d-2642-fe0f","🤷🏻‍♀️":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀️":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀️":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀️":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀️":"1f937-1f3ff-200d-2640-fe0f","🧑🏻‍⚕️":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕️":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕️":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕️":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕️":"1f9d1-1f3ff-200d-2695-fe0f","👨🏻‍⚕️":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕️":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕️":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕️":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕️":"1f468-1f3ff-200d-2695-fe0f","👩🏻‍⚕️":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕️":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕️":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕️":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕️":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍⚖️":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖️":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖️":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖️":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖️":"1f9d1-1f3ff-200d-2696-fe0f","👨🏻‍⚖️":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖️":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖️":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖️":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖️":"1f468-1f3ff-200d-2696-fe0f","👩🏻‍⚖️":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖️":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖️":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖️":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖️":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍✈️":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈️":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈️":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈️":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈️":"1f9d1-1f3ff-200d-2708-fe0f","👨🏻‍✈️":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈️":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈️":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈️":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈️":"1f468-1f3ff-200d-2708-fe0f","👩🏻‍✈️":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈️":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈️":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈️":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈️":"1f469-1f3ff-200d-2708-fe0f","👮🏻‍♂️":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂️":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂️":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂️":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂️":"1f46e-1f3ff-200d-2642-fe0f","👮🏻‍♀️":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀️":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀️":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀️":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀️":"1f46e-1f3ff-200d-2640-fe0f","🕵️‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂️":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂️":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂️":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂️":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂️":"1f575-1f3ff-200d-2642-fe0f","🕵️‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀️":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀️":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀️":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀️":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀️":"1f575-1f3ff-200d-2640-fe0f","💂🏻‍♂️":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂️":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂️":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂️":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂️":"1f482-1f3ff-200d-2642-fe0f","💂🏻‍♀️":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀️":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀️":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀️":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀️":"1f482-1f3ff-200d-2640-fe0f","👷🏻‍♂️":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂️":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂️":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂️":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂️":"1f477-1f3ff-200d-2642-fe0f","👷🏻‍♀️":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀️":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀️":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀️":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀️":"1f477-1f3ff-200d-2640-fe0f","👳🏻‍♂️":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂️":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂️":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂️":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂️":"1f473-1f3ff-200d-2642-fe0f","👳🏻‍♀️":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀️":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀️":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀️":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀️":"1f473-1f3ff-200d-2640-fe0f","🤵🏻‍♂️":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂️":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂️":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂️":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂️":"1f935-1f3ff-200d-2642-fe0f","🤵🏻‍♀️":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀️":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀️":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀️":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀️":"1f935-1f3ff-200d-2640-fe0f","👰🏻‍♂️":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂️":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂️":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂️":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂️":"1f470-1f3ff-200d-2642-fe0f","👰🏻‍♀️":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀️":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀️":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀️":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀️":"1f470-1f3ff-200d-2640-fe0f","🦸🏻‍♂️":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂️":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂️":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂️":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂️":"1f9b8-1f3ff-200d-2642-fe0f","🦸🏻‍♀️":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀️":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀️":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀️":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀️":"1f9b8-1f3ff-200d-2640-fe0f","🦹🏻‍♂️":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂️":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂️":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂️":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂️":"1f9b9-1f3ff-200d-2642-fe0f","🦹🏻‍♀️":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀️":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀️":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀️":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀️":"1f9b9-1f3ff-200d-2640-fe0f","🧙🏻‍♂️":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂️":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂️":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂️":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂️":"1f9d9-1f3ff-200d-2642-fe0f","🧙🏻‍♀️":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀️":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀️":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀️":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀️":"1f9d9-1f3ff-200d-2640-fe0f","🧚🏻‍♂️":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂️":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂️":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂️":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂️":"1f9da-1f3ff-200d-2642-fe0f","🧚🏻‍♀️":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀️":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀️":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀️":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀️":"1f9da-1f3ff-200d-2640-fe0f","🧛🏻‍♂️":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂️":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂️":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂️":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂️":"1f9db-1f3ff-200d-2642-fe0f","🧛🏻‍♀️":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀️":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀️":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀️":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀️":"1f9db-1f3ff-200d-2640-fe0f","🧜🏻‍♂️":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂️":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂️":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂️":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂️":"1f9dc-1f3ff-200d-2642-fe0f","🧜🏻‍♀️":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀️":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀️":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀️":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀️":"1f9dc-1f3ff-200d-2640-fe0f","🧝🏻‍♂️":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂️":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂️":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂️":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂️":"1f9dd-1f3ff-200d-2642-fe0f","🧝🏻‍♀️":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀️":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀️":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀️":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀️":"1f9dd-1f3ff-200d-2640-fe0f","💆🏻‍♂️":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂️":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂️":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂️":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂️":"1f486-1f3ff-200d-2642-fe0f","💆🏻‍♀️":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀️":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀️":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀️":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀️":"1f486-1f3ff-200d-2640-fe0f","💇🏻‍♂️":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂️":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂️":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂️":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂️":"1f487-1f3ff-200d-2642-fe0f","💇🏻‍♀️":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀️":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀️":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀️":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀️":"1f487-1f3ff-200d-2640-fe0f","🚶🏻‍♂️":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂️":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂️":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂️":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂️":"1f6b6-1f3ff-200d-2642-fe0f","🚶🏻‍♀️":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀️":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀️":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀️":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀️":"1f6b6-1f3ff-200d-2640-fe0f","🧍🏻‍♂️":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂️":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂️":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂️":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂️":"1f9cd-1f3ff-200d-2642-fe0f","🧍🏻‍♀️":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀️":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀️":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀️":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀️":"1f9cd-1f3ff-200d-2640-fe0f","🧎🏻‍♂️":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂️":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂️":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂️":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂️":"1f9ce-1f3ff-200d-2642-fe0f","🧎🏻‍♀️":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀️":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀️":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀️":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀️":"1f9ce-1f3ff-200d-2640-fe0f","🏃🏻‍♂️":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂️":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂️":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂️":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂️":"1f3c3-1f3ff-200d-2642-fe0f","🏃🏻‍♀️":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀️":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀️":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀️":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀️":"1f3c3-1f3ff-200d-2640-fe0f","🧖🏻‍♂️":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂️":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂️":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂️":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂️":"1f9d6-1f3ff-200d-2642-fe0f","🧖🏻‍♀️":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀️":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀️":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀️":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀️":"1f9d6-1f3ff-200d-2640-fe0f","🧗🏻‍♂️":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂️":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂️":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂️":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂️":"1f9d7-1f3ff-200d-2642-fe0f","🧗🏻‍♀️":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀️":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀️":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀️":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀️":"1f9d7-1f3ff-200d-2640-fe0f","🏌️‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂️":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂️":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂️":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂️":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂️":"1f3cc-1f3ff-200d-2642-fe0f","🏌️‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀️":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀️":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀️":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀️":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀️":"1f3cc-1f3ff-200d-2640-fe0f","🏄🏻‍♂️":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂️":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂️":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂️":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂️":"1f3c4-1f3ff-200d-2642-fe0f","🏄🏻‍♀️":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀️":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀️":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀️":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀️":"1f3c4-1f3ff-200d-2640-fe0f","🚣🏻‍♂️":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂️":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂️":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂️":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂️":"1f6a3-1f3ff-200d-2642-fe0f","🚣🏻‍♀️":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀️":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀️":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀️":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀️":"1f6a3-1f3ff-200d-2640-fe0f","🏊🏻‍♂️":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂️":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂️":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂️":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂️":"1f3ca-1f3ff-200d-2642-fe0f","🏊🏻‍♀️":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀️":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀️":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀️":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀️":"1f3ca-1f3ff-200d-2640-fe0f","⛹️‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂️":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂️":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂️":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂️":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂️":"26f9-1f3ff-200d-2642-fe0f","⛹️‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀️":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀️":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀️":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀️":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀️":"26f9-1f3ff-200d-2640-fe0f","🏋️‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂️":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂️":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂️":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂️":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂️":"1f3cb-1f3ff-200d-2642-fe0f","🏋️‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀️":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀️":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀️":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀️":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀️":"1f3cb-1f3ff-200d-2640-fe0f","🚴🏻‍♂️":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂️":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂️":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂️":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂️":"1f6b4-1f3ff-200d-2642-fe0f","🚴🏻‍♀️":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀️":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀️":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀️":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀️":"1f6b4-1f3ff-200d-2640-fe0f","🚵🏻‍♂️":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂️":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂️":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂️":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂️":"1f6b5-1f3ff-200d-2642-fe0f","🚵🏻‍♀️":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀️":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀️":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀️":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀️":"1f6b5-1f3ff-200d-2640-fe0f","🤸🏻‍♂️":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂️":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂️":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂️":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂️":"1f938-1f3ff-200d-2642-fe0f","🤸🏻‍♀️":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀️":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀️":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀️":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀️":"1f938-1f3ff-200d-2640-fe0f","🤽🏻‍♂️":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂️":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂️":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂️":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂️":"1f93d-1f3ff-200d-2642-fe0f","🤽🏻‍♀️":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀️":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀️":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀️":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀️":"1f93d-1f3ff-200d-2640-fe0f","🤾🏻‍♂️":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂️":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂️":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂️":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂️":"1f93e-1f3ff-200d-2642-fe0f","🤾🏻‍♀️":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀️":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀️":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀️":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀️":"1f93e-1f3ff-200d-2640-fe0f","🤹🏻‍♂️":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂️":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂️":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂️":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂️":"1f939-1f3ff-200d-2642-fe0f","🤹🏻‍♀️":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀️":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀️":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀️":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀️":"1f939-1f3ff-200d-2640-fe0f","🧘🏻‍♂️":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂️":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂️":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂️":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂️":"1f9d8-1f3ff-200d-2642-fe0f","🧘🏻‍♀️":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀️":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀️":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀️":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀️":"1f9d8-1f3ff-200d-2640-fe0f","🧑‍🤝‍🧑":"1f9d1-200d-1f91d-200d-1f9d1","👩‍❤‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤‍👩":"1f469-200d-2764-fe0f-200d-1f469","👨‍👩‍👦":"1f468-200d-1f469-200d-1f466","👨‍👩‍👧":"1f468-200d-1f469-200d-1f467","👨‍👨‍👦":"1f468-200d-1f468-200d-1f466","👨‍👨‍👧":"1f468-200d-1f468-200d-1f467","👩‍👩‍👦":"1f469-200d-1f469-200d-1f466","👩‍👩‍👧":"1f469-200d-1f469-200d-1f467","👨‍👦‍👦":"1f468-200d-1f466-200d-1f466","👨‍👧‍👦":"1f468-200d-1f467-200d-1f466","👨‍👧‍👧":"1f468-200d-1f467-200d-1f467","👩‍👦‍👦":"1f469-200d-1f466-200d-1f466","👩‍👧‍👦":"1f469-200d-1f467-200d-1f466","👩‍👧‍👧":"1f469-200d-1f467-200d-1f467","🏳️‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","👩‍❤️‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤️‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤️‍👩":"1f469-200d-2764-fe0f-200d-1f469","🧑🏻‍🤝‍🧑🏻":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb","🧑🏻‍🤝‍🧑🏼":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc","🧑🏻‍🤝‍🧑🏽":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd","🧑🏻‍🤝‍🧑🏾":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe","🧑🏻‍🤝‍🧑🏿":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff","🧑🏼‍🤝‍🧑🏻":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb","🧑🏼‍🤝‍🧑🏼":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc","🧑🏼‍🤝‍🧑🏽":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd","🧑🏼‍🤝‍🧑🏾":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe","🧑🏼‍🤝‍🧑🏿":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff","🧑🏽‍🤝‍🧑🏻":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb","🧑🏽‍🤝‍🧑🏼":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc","🧑🏽‍🤝‍🧑🏽":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd","🧑🏽‍🤝‍🧑🏾":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe","🧑🏽‍🤝‍🧑🏿":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff","🧑🏾‍🤝‍🧑🏻":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb","🧑🏾‍🤝‍🧑🏼":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc","🧑🏾‍🤝‍🧑🏽":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd","🧑🏾‍🤝‍🧑🏾":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe","🧑🏾‍🤝‍🧑🏿":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff","🧑🏿‍🤝‍🧑🏻":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb","🧑🏿‍🤝‍🧑🏼":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc","🧑🏿‍🤝‍🧑🏽":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd","🧑🏿‍🤝‍🧑🏾":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe","🧑🏿‍🤝‍🧑🏿":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff","👩🏻‍🤝‍👩🏼":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc","👩🏻‍🤝‍👩🏽":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd","👩🏻‍🤝‍👩🏾":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👩🏿":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff","👩🏼‍🤝‍👩🏻":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb","👩🏼‍🤝‍👩🏽":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd","👩🏼‍🤝‍👩🏾":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe","👩🏼‍🤝‍👩🏿":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff","👩🏽‍🤝‍👩🏻":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb","👩🏽‍🤝‍👩🏼":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc","👩🏽‍🤝‍👩🏾":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe","👩🏽‍🤝‍👩🏿":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff","👩🏾‍🤝‍👩🏻":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb","👩🏾‍🤝‍👩🏼":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc","👩🏾‍🤝‍👩🏽":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd","👩🏾‍🤝‍👩🏿":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff","👩🏿‍🤝‍👩🏻":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb","👩🏿‍🤝‍👩🏼":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc","👩🏿‍🤝‍👩🏽":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd","👩🏿‍🤝‍👩🏾":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👨🏼":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc","👩🏻‍🤝‍👨🏽":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd","👩🏻‍🤝‍👨🏾":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe","👩🏻‍🤝‍👨🏿":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff","👩🏼‍🤝‍👨🏻":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb","👩🏼‍🤝‍👨🏽":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd","👩🏼‍🤝‍👨🏾":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe","👩🏼‍🤝‍👨🏿":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff","👩🏽‍🤝‍👨🏻":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb","👩🏽‍🤝‍👨🏼":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc","👩🏽‍🤝‍👨🏾":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe","👩🏽‍🤝‍👨🏿":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff","👩🏾‍🤝‍👨🏻":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb","👩🏾‍🤝‍👨🏼":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc","👩🏾‍🤝‍👨🏽":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd","👩🏾‍🤝‍👨🏿":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff","👩🏿‍🤝‍👨🏻":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb","👩🏿‍🤝‍👨🏼":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc","👩🏿‍🤝‍👨🏽":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd","👩🏿‍🤝‍👨🏾":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏼":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc","👨🏻‍🤝‍👨🏽":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd","👨🏻‍🤝‍👨🏾":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏿":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff","👨🏼‍🤝‍👨🏻":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb","👨🏼‍🤝‍👨🏽":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd","👨🏼‍🤝‍👨🏾":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe","👨🏼‍🤝‍👨🏿":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff","👨🏽‍🤝‍👨🏻":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb","👨🏽‍🤝‍👨🏼":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc","👨🏽‍🤝‍👨🏾":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe","👨🏽‍🤝‍👨🏿":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff","👨🏾‍🤝‍👨🏻":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb","👨🏾‍🤝‍👨🏼":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc","👨🏾‍🤝‍👨🏽":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd","👨🏾‍🤝‍👨🏿":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff","👨🏿‍🤝‍👨🏻":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb","👨🏿‍🤝‍👨🏼":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc","👨🏿‍🤝‍👨🏽":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd","👨🏿‍🤝‍👨🏾":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe","👩‍❤‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","👨‍👩‍👧‍👦":"1f468-200d-1f469-200d-1f467-200d-1f466","👨‍👩‍👦‍👦":"1f468-200d-1f469-200d-1f466-200d-1f466","👨‍👩‍👧‍👧":"1f468-200d-1f469-200d-1f467-200d-1f467","👨‍👨‍👧‍👦":"1f468-200d-1f468-200d-1f467-200d-1f466","👨‍👨‍👦‍👦":"1f468-200d-1f468-200d-1f466-200d-1f466","👨‍👨‍👧‍👧":"1f468-200d-1f468-200d-1f467-200d-1f467","👩‍👩‍👧‍👦":"1f469-200d-1f469-200d-1f467-200d-1f466","👩‍👩‍👦‍👦":"1f469-200d-1f469-200d-1f466-200d-1f466","👩‍👩‍👧‍👧":"1f469-200d-1f469-200d-1f467-200d-1f467","🏴󠁧󠁢󠁥󠁮󠁧󠁿":"1f3f4-e0067-e0062-e0065-e006e-e0067-e007f","🏴󠁧󠁢󠁳󠁣󠁴󠁿":"1f3f4-e0067-e0062-e0073-e0063-e0074-e007f","🏴󠁧󠁢󠁷󠁬󠁳󠁿":"1f3f4-e0067-e0062-e0077-e006c-e0073-e007f","👩‍❤️‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤️‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤️‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤️‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤️‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤️‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤️‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤️‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤️‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤️‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤️‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤️‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤️‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤️‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤️‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤️‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤️‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤️‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤️‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤️‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤️‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤️‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤️‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤️‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤️‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤️‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤️‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤️‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤️‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤️‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤️‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤️‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤️‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤️‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤️‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤️‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤️‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤️‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤️‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤️‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤️‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤️‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤️‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤️‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤️‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤️‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤️‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤️‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤️‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤️‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤️‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤️‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤️‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤️‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤️‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤️‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤️‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤️‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤️‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤️‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤️‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤️‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤️‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤️‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤️‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤️‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤️‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤️‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤️‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤️‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤️‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤️‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤️‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤️‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤️‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤️‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤️‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤️‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤️‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤️‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤️‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤️‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤️‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤️‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤️‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤️‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤️‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤️‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤️‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤️‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤️‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤️‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤️‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤️‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤️‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤️‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤️‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤️‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","🧑🏻‍❤‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","🧑🏻‍❤️‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤️‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤️‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤️‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤️‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤️‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤️‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤️‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤️‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤️‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤️‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤️‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤️‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤️‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤️‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤️‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤️‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤️‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤️‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤️‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤️‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤️‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤️‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤️‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤️‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤️‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤️‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤️‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤️‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤️‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤️‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤️‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤️‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤️‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤️‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤️‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤️‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤️‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤️‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤️‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤️‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤️‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤️‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤️‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤️‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤️‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤️‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤️‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤️‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤️‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤️‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤️‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤️‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤️‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤️‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤️‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤️‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤️‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤️‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤️‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤️‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤️‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤️‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤️‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤️‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤️‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤️‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤️‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤️‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤️‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤️‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤️‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤️‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤️‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤️‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤️‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤️‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤️‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤️‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤️‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤️‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤️‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤️‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤️‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤️‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤️‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤️‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤️‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤️‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤️‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤️‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤️‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤️‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤️‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤️‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff"}
\ No newline at end of file
diff --git a/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js b/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
index e4519a13e..70694ab6d 100644
--- a/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
+++ b/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
@@ -124,7 +124,7 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
           for (let id in aPool) {
             let emoji = aPool[id],
               { search } = emoji,
-              sub = value.substr(0, length),
+              sub = value.slice(0, length),
               subIndex = search.indexOf(sub);
 
             if (subIndex !== -1) {
diff --git a/app/javascript/mastodon/features/explore/components/story.js b/app/javascript/mastodon/features/explore/components/story.js
new file mode 100644
index 000000000..563128029
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/components/story.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Blurhash from 'mastodon/components/blurhash';
+import { accountsCountRenderer } from 'mastodon/components/hashtag';
+import ShortNumber from 'mastodon/components/short_number';
+import Skeleton from 'mastodon/components/skeleton';
+import classNames from 'classnames';
+
+export default class Story extends React.PureComponent {
+
+  static propTypes = {
+    url: PropTypes.string,
+    title: PropTypes.string,
+    publisher: PropTypes.string,
+    sharedTimes: PropTypes.number,
+    thumbnail: PropTypes.string,
+    blurhash: PropTypes.string,
+  };
+
+  state = {
+    thumbnailLoaded: false,
+  };
+
+  handleImageLoad = () => this.setState({ thumbnailLoaded: true });
+
+  render () {
+    const { url, title, publisher, sharedTimes, thumbnail, blurhash } = this.props;
+
+    const { thumbnailLoaded } = this.state;
+
+    return (
+      <a className='story' href={url} target='blank' rel='noopener'>
+        <div className='story__details'>
+          <div className='story__details__publisher'>{publisher ? publisher : <Skeleton width={50} />}</div>
+          <div className='story__details__title'>{title ? title : <Skeleton />}</div>
+          <div className='story__details__shared'>{typeof sharedTimes === 'number' ? <ShortNumber value={sharedTimes} renderer={accountsCountRenderer} /> : <Skeleton width={100} />}</div>
+        </div>
+
+        <div className='story__thumbnail'>
+          {thumbnail ? (
+            <React.Fragment>
+              <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
+              <img src={thumbnail} onLoad={this.handleImageLoad} alt='' role='presentation' />
+            </React.Fragment>
+          ) : <Skeleton />}
+        </div>
+      </a>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/index.js b/app/javascript/mastodon/features/explore/index.js
new file mode 100644
index 000000000..1ae249f45
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/index.js
@@ -0,0 +1,107 @@
+import React from 'react';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { NavLink, Switch, Route } from 'react-router-dom';
+import Links from './links';
+import Tags from './tags';
+import Statuses from './statuses';
+import Suggestions from './suggestions';
+import Search from 'mastodon/features/compose/containers/search_container';
+import SearchResults from './results';
+import { Helmet } from 'react-helmet';
+import { showTrends } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  title: { id: 'explore.title', defaultMessage: 'Explore' },
+  searchResults: { id: 'explore.search_results', defaultMessage: 'Search results' },
+});
+
+const mapStateToProps = state => ({
+  layout: state.getIn(['meta', 'layout']),
+  isSearching: state.getIn(['search', 'submitted']) || !showTrends,
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Explore extends React.PureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+    identity: PropTypes.object,
+  };
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+    isSearching: PropTypes.bool,
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  }
+
+  setRef = c => {
+    this.column = c;
+  }
+
+  render() {
+    const { intl, multiColumn, isSearching } = this.props;
+    const { signedIn } = this.context.identity;
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
+        <ColumnHeader
+          icon={isSearching ? 'search' : 'hashtag'}
+          title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
+          onClick={this.handleHeaderClick}
+          multiColumn={multiColumn}
+        />
+
+        <div className='explore__search-header'>
+          <Search />
+        </div>
+
+        <div className='scrollable scrollable--flex'>
+          {isSearching ? (
+            <SearchResults />
+          ) : (
+            <>
+              <div className='account__section-headline'>
+                <NavLink exact to='/explore'>
+                  <FormattedMessage tagName='div' id='explore.trending_statuses' defaultMessage='Posts' />
+                </NavLink>
+                <NavLink exact to='/explore/tags'>
+                  <FormattedMessage tagName='div' id='explore.trending_tags' defaultMessage='Hashtags' />
+                </NavLink>
+                <NavLink exact to='/explore/links'>
+                  <FormattedMessage tagName='div' id='explore.trending_links' defaultMessage='News' />
+                </NavLink>
+                {signedIn && (
+                  <NavLink exact to='/explore/suggestions'>
+                    <FormattedMessage tagName='div' id='explore.suggested_follows' defaultMessage='For you' />
+                  </NavLink>
+                )}
+              </div>
+
+              <Switch>
+                <Route path='/explore/tags' component={Tags} />
+                <Route path='/explore/links' component={Links} />
+                <Route path='/explore/suggestions' component={Suggestions} />
+                <Route exact path={['/explore', '/explore/posts', '/search']} component={Statuses} componentParams={{ multiColumn }} />
+              </Switch>
+
+              <Helmet>
+                <title>{intl.formatMessage(messages.title)}</title>
+                <meta name='robots' content={isSearching ? 'noindex' : 'all'} />
+              </Helmet>
+            </>
+          )}
+        </div>
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/links.js b/app/javascript/mastodon/features/explore/links.js
new file mode 100644
index 000000000..b47fc8fcf
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/links.js
@@ -0,0 +1,70 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import Story from './components/story';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import { connect } from 'react-redux';
+import { fetchTrendingLinks } from 'mastodon/actions/trends';
+import { FormattedMessage } from 'react-intl';
+import DismissableBanner from 'mastodon/components/dismissable_banner';
+
+const mapStateToProps = state => ({
+  links: state.getIn(['trends', 'links', 'items']),
+  isLoading: state.getIn(['trends', 'links', 'isLoading']),
+});
+
+export default @connect(mapStateToProps)
+class Links extends React.PureComponent {
+
+  static propTypes = {
+    links: ImmutablePropTypes.list,
+    isLoading: PropTypes.bool,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchTrendingLinks());
+  }
+
+  render () {
+    const { isLoading, links } = this.props;
+
+    const banner = (
+      <DismissableBanner id='explore/links'>
+        <FormattedMessage id='dismissable_banner.explore_links' defaultMessage='These news stories are being talked about by people on this and other servers of the decentralized network right now.' />
+      </DismissableBanner>
+    );
+
+    if (!isLoading && links.isEmpty()) {
+      return (
+        <div className='explore__links scrollable scrollable--flex'>
+          {banner}
+
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='empty_column.explore_statuses' defaultMessage='Nothing is trending right now. Check back later!' />
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div className='explore__links'>
+        {banner}
+
+        {isLoading ? (<LoadingIndicator />) : links.map(link => (
+          <Story
+            key={link.get('id')}
+            url={link.get('url')}
+            title={link.get('title')}
+            publisher={link.get('provider_name')}
+            sharedTimes={link.getIn(['history', 0, 'accounts']) * 1 + link.getIn(['history', 1, 'accounts']) * 1}
+            thumbnail={link.get('image')}
+            blurhash={link.get('blurhash')}
+          />
+        ))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/results.js b/app/javascript/mastodon/features/explore/results.js
new file mode 100644
index 000000000..b2f6c72b7
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/results.js
@@ -0,0 +1,126 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import { expandSearch } from 'mastodon/actions/search';
+import Account from 'mastodon/containers/account_container';
+import Status from 'mastodon/containers/status_container';
+import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
+import { List as ImmutableList } from 'immutable';
+import LoadMore from 'mastodon/components/load_more';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import { Helmet } from 'react-helmet';
+
+const messages = defineMessages({
+  title: { id: 'search_results.title', defaultMessage: 'Search for {q}' },
+});
+
+const mapStateToProps = state => ({
+  isLoading: state.getIn(['search', 'isLoading']),
+  results: state.getIn(['search', 'results']),
+  q: state.getIn(['search', 'searchTerm']),
+});
+
+const appendLoadMore = (id, list, onLoadMore) => {
+  if (list.size >= 5) {
+    return list.push(<LoadMore key={`${id}-load-more`} visible onClick={onLoadMore} />);
+  } else {
+    return list;
+  }
+};
+
+const renderAccounts = (results, onLoadMore) => appendLoadMore('accounts', results.get('accounts', ImmutableList()).map(item => (
+  <Account key={`account-${item}`} id={item} />
+)), onLoadMore);
+
+const renderHashtags = (results, onLoadMore) => appendLoadMore('hashtags', results.get('hashtags', ImmutableList()).map(item => (
+  <Hashtag key={`tag-${item.get('name')}`} hashtag={item} />
+)), onLoadMore);
+
+const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', results.get('statuses', ImmutableList()).map(item => (
+  <Status key={`status-${item}`} id={item} />
+)), onLoadMore);
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Results extends React.PureComponent {
+
+  static propTypes = {
+    results: ImmutablePropTypes.map,
+    isLoading: PropTypes.bool,
+    multiColumn: PropTypes.bool,
+    dispatch: PropTypes.func.isRequired,
+    q: PropTypes.string,
+    intl: PropTypes.object,
+  };
+
+  state = {
+    type: 'all',
+  };
+
+  handleSelectAll = () => this.setState({ type: 'all' });
+  handleSelectAccounts = () => this.setState({ type: 'accounts' });
+  handleSelectHashtags = () => this.setState({ type: 'hashtags' });
+  handleSelectStatuses = () => this.setState({ type: 'statuses' });
+  handleLoadMoreAccounts = () => this.loadMore('accounts');
+  handleLoadMoreStatuses = () => this.loadMore('statuses');
+  handleLoadMoreHashtags = () => this.loadMore('hashtags');
+
+  loadMore (type) {
+    const { dispatch } = this.props;
+    dispatch(expandSearch(type));
+  }
+
+  render () {
+    const { intl, isLoading, q, results } = this.props;
+    const { type } = this.state;
+
+    let filteredResults = ImmutableList();
+
+    if (!isLoading) {
+      switch(type) {
+      case 'all':
+        filteredResults = filteredResults.concat(renderAccounts(results, this.handleLoadMoreAccounts), renderHashtags(results, this.handleLoadMoreHashtags), renderStatuses(results, this.handleLoadMoreStatuses));
+        break;
+      case 'accounts':
+        filteredResults = filteredResults.concat(renderAccounts(results, this.handleLoadMoreAccounts));
+        break;
+      case 'hashtags':
+        filteredResults = filteredResults.concat(renderHashtags(results, this.handleLoadMoreHashtags));
+        break;
+      case 'statuses':
+        filteredResults = filteredResults.concat(renderStatuses(results, this.handleLoadMoreStatuses));
+        break;
+      }
+
+      if (filteredResults.size === 0) {
+        filteredResults = (
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='search_results.nothing_found' defaultMessage='Could not find anything for these search terms' />
+          </div>
+        );
+      }
+    }
+
+    return (
+      <React.Fragment>
+        <div className='account__section-headline'>
+          <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
+          <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='People' /></button>
+          <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
+        </div>
+
+        <div className='explore__search-results'>
+          {isLoading ? <LoadingIndicator /> : filteredResults}
+        </div>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title, { q })}</title>
+        </Helmet>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/statuses.js b/app/javascript/mastodon/features/explore/statuses.js
new file mode 100644
index 000000000..791f11b9f
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/statuses.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import StatusList from 'mastodon/components/status_list';
+import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import { fetchTrendingStatuses, expandTrendingStatuses } from 'mastodon/actions/trends';
+import { debounce } from 'lodash';
+import DismissableBanner from 'mastodon/components/dismissable_banner';
+
+const mapStateToProps = state => ({
+  statusIds: state.getIn(['status_lists', 'trending', 'items']),
+  isLoading: state.getIn(['status_lists', 'trending', 'isLoading'], true),
+  hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
+});
+
+export default @connect(mapStateToProps)
+class Statuses extends React.PureComponent {
+
+  static propTypes = {
+    statusIds: ImmutablePropTypes.list,
+    isLoading: PropTypes.bool,
+    hasMore: PropTypes.bool,
+    multiColumn: PropTypes.bool,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchTrendingStatuses());
+  }
+
+  handleLoadMore = debounce(() => {
+    const { dispatch } = this.props;
+    dispatch(expandTrendingStatuses());
+  }, 300, { leading: true })
+
+  render () {
+    const { isLoading, hasMore, statusIds, multiColumn } = this.props;
+
+    const emptyMessage = <FormattedMessage id='empty_column.explore_statuses' defaultMessage='Nothing is trending right now. Check back later!' />;
+
+    return (
+      <>
+        <DismissableBanner id='explore/statuses'>
+          <FormattedMessage id='dismissable_banner.explore_statuses' defaultMessage='These posts from this and other servers in the decentralized network are gaining traction on this server right now.' />
+        </DismissableBanner>
+
+        <StatusList
+          trackScroll
+          statusIds={statusIds}
+          scrollKey='explore-statuses'
+          hasMore={hasMore}
+          isLoading={isLoading}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+          withCounters
+        />
+      </>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/suggestions.js b/app/javascript/mastodon/features/explore/suggestions.js
new file mode 100644
index 000000000..e6ad09974
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/suggestions.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import AccountCard from 'mastodon/features/directory/components/account_card';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import { connect } from 'react-redux';
+import { fetchSuggestions } from 'mastodon/actions/suggestions';
+import { FormattedMessage } from 'react-intl';
+
+const mapStateToProps = state => ({
+  suggestions: state.getIn(['suggestions', 'items']),
+  isLoading: state.getIn(['suggestions', 'isLoading']),
+});
+
+export default @connect(mapStateToProps)
+class Suggestions extends React.PureComponent {
+
+  static propTypes = {
+    isLoading: PropTypes.bool,
+    suggestions: ImmutablePropTypes.list,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchSuggestions(true));
+  }
+
+  render () {
+    const { isLoading, suggestions } = this.props;
+
+    if (!isLoading && suggestions.isEmpty()) {
+      return (
+        <div className='explore__suggestions scrollable scrollable--flex'>
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='empty_column.explore_statuses' defaultMessage='Nothing is trending right now. Check back later!' />
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div className='explore__suggestions'>
+        {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
+          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} />
+        ))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/explore/tags.js b/app/javascript/mastodon/features/explore/tags.js
new file mode 100644
index 000000000..258dc392f
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/tags.js
@@ -0,0 +1,62 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import { connect } from 'react-redux';
+import { fetchTrendingHashtags } from 'mastodon/actions/trends';
+import { FormattedMessage } from 'react-intl';
+import DismissableBanner from 'mastodon/components/dismissable_banner';
+
+const mapStateToProps = state => ({
+  hashtags: state.getIn(['trends', 'tags', 'items']),
+  isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
+});
+
+export default @connect(mapStateToProps)
+class Tags extends React.PureComponent {
+
+  static propTypes = {
+    hashtags: ImmutablePropTypes.list,
+    isLoading: PropTypes.bool,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(fetchTrendingHashtags());
+  }
+
+  render () {
+    const { isLoading, hashtags } = this.props;
+
+    const banner = (
+      <DismissableBanner id='explore/tags'>
+        <FormattedMessage id='dismissable_banner.explore_tags' defaultMessage='These hashtags are gaining traction among people on this and other servers of the decentralized network right now.' />
+      </DismissableBanner>
+    );
+
+    if (!isLoading && hashtags.isEmpty()) {
+      return (
+        <div className='explore__links scrollable scrollable--flex'>
+          {banner}
+
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='empty_column.explore_statuses' defaultMessage='Nothing is trending right now. Check back later!' />
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div className='explore__links'>
+        {banner}
+
+        {isLoading ? (<LoadingIndicator />) : hashtags.map(hashtag => (
+          <Hashtag key={hashtag.get('name')} hashtag={hashtag} />
+        ))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 9606a144c..3741f68f6 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -1,15 +1,16 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
-import Column from '../ui/components/column';
-import ColumnHeader from '../../components/column_header';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import StatusList from '../../components/status_list';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import { debounce } from 'lodash';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
+import ColumnHeader from 'mastodon/components/column_header';
+import StatusList from 'mastodon/components/status_list';
+import Column from 'mastodon/features/ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.favourites', defaultMessage: 'Favourites' },
@@ -70,7 +71,7 @@ class Favourites extends ImmutablePureComponent {
     const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
     const pinned = !!columnId;
 
-    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite toots yet. When you favourite one, it will show up here." />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourited_statuses' defaultMessage="You don't have any favourite posts yet. When you favourite one, it will show up here." />;
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
@@ -95,6 +96,11 @@ class Favourites extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index ac94ae18a..66ec6a31b 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -1,16 +1,17 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import LoadingIndicator from '../../components/loading_indicator';
-import { fetchFavourites } from '../../actions/interactions';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import AccountContainer from '../../containers/account_container';
-import Column from '../ui/components/column';
-import ScrollableList from '../../components/scrollable_list';
+import { connect } from 'react-redux';
+import ColumnHeader from 'mastodon/components/column_header';
 import Icon from 'mastodon/components/icon';
-import ColumnHeader from '../../components/column_header';
+import { fetchFavourites } from 'mastodon/actions/interactions';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import AccountContainer from 'mastodon/containers/account_container';
+import Column from 'mastodon/features/ui/components/column';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   refresh: { id: 'refresh', defaultMessage: 'Refresh' },
@@ -59,7 +60,7 @@ class Favourites extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this toot yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has favourited this post yet. When someone does, they will show up here.' />;
 
     return (
       <Column bindToDocument={!multiColumn}>
@@ -67,7 +68,7 @@ class Favourites extends ImmutablePureComponent {
           showBackButton
           multiColumn={multiColumn}
           extraButton={(
-            <button className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
           )}
         />
 
@@ -80,6 +81,10 @@ class Favourites extends ImmutablePureComponent {
             <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/filters/added_to_filter.js b/app/javascript/mastodon/features/filters/added_to_filter.js
new file mode 100644
index 000000000..3785eb3c5
--- /dev/null
+++ b/app/javascript/mastodon/features/filters/added_to_filter.js
@@ -0,0 +1,102 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { FormattedMessage } from 'react-intl';
+import { toServerSideType } from 'mastodon/utils/filters';
+import Button from 'mastodon/components/button';
+import { connect } from 'react-redux';
+
+const mapStateToProps = (state, { filterId }) => ({
+  filter: state.getIn(['filters', filterId]),
+});
+
+export default @connect(mapStateToProps)
+class AddedToFilter extends React.PureComponent {
+
+  static propTypes = {
+    onClose: PropTypes.func.isRequired,
+    contextType: PropTypes.string,
+    filter: ImmutablePropTypes.map.isRequired,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  handleCloseClick = () => {
+    const { onClose } = this.props;
+    onClose();
+  };
+
+  render () {
+    const { filter, contextType } = this.props;
+
+    let expiredMessage = null;
+    if (filter.get('expires_at') && filter.get('expires_at') < new Date()) {
+      expiredMessage = (
+        <React.Fragment>
+          <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='filter_modal.added.expired_title' defaultMessage='Expired filter!' /></h4>
+          <p className='report-dialog-modal__lead'>
+            <FormattedMessage
+              id='filter_modal.added.expired_explanation'
+              defaultMessage='This filter category has expired, you will need to change the expiration date for it to apply.'
+            />
+          </p>
+        </React.Fragment>
+      );
+    }
+
+    let contextMismatchMessage = null;
+    if (contextType && !filter.get('context').includes(toServerSideType(contextType))) {
+      contextMismatchMessage = (
+        <React.Fragment>
+          <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='filter_modal.added.context_mismatch_title' defaultMessage='Context mismatch!' /></h4>
+          <p className='report-dialog-modal__lead'>
+            <FormattedMessage
+              id='filter_modal.added.context_mismatch_explanation'
+              defaultMessage='This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.'
+            />
+          </p>
+        </React.Fragment>
+      );
+    }
+
+    const settings_link = (
+      <a href={`/filters/${filter.get('id')}/edit`}>
+        <FormattedMessage
+          id='filter_modal.added.settings_link'
+          defaultMessage='settings page'
+        />
+      </a>
+    );
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='filter_modal.added.title' defaultMessage='Filter added!' /></h3>
+        <p className='report-dialog-modal__lead'>
+          <FormattedMessage
+            id='filter_modal.added.short_explanation'
+            defaultMessage='This post has been added to the following filter category: {title}.'
+            values={{ title: filter.get('title') }}
+          />
+        </p>
+
+        {expiredMessage}
+        {contextMismatchMessage}
+
+        <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='filter_modal.added.review_and_configure_title' defaultMessage='Filter settings' /></h4>
+        <p className='report-dialog-modal__lead'>
+          <FormattedMessage
+            id='filter_modal.added.review_and_configure'
+            defaultMessage='To review and further configure this filter category, go to the {settings_link}.'
+            values={{ settings_link }}
+          />
+        </p>
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleCloseClick}><FormattedMessage id='report.close' defaultMessage='Done' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/filters/select_filter.js b/app/javascript/mastodon/features/filters/select_filter.js
new file mode 100644
index 000000000..b68a5de6c
--- /dev/null
+++ b/app/javascript/mastodon/features/filters/select_filter.js
@@ -0,0 +1,192 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { toServerSideType } from 'mastodon/utils/filters';
+import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
+import Icon from 'mastodon/components/icon';
+import fuzzysort from 'fuzzysort';
+
+const messages = defineMessages({
+  search: { id: 'filter_modal.select_filter.search', defaultMessage: 'Search or create' },
+  clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
+});
+
+const mapStateToProps = (state, { contextType }) => ({
+  filters: Array.from(state.get('filters').values()).map((filter) => [
+    filter.get('id'),
+    filter.get('title'),
+    filter.get('keywords')?.map((keyword) => keyword.get('keyword')).join('\n'),
+    filter.get('expires_at') && filter.get('expires_at') < new Date(),
+    contextType && !filter.get('context').includes(toServerSideType(contextType)),
+  ]),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class SelectFilter extends React.PureComponent {
+
+  static propTypes = {
+    onSelectFilter: PropTypes.func.isRequired,
+    onNewFilter: PropTypes.func.isRequired,
+    filters: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.object)),
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    searchValue: '',
+  };
+
+  search () {
+    const { filters } = this.props;
+    const { searchValue } = this.state;
+
+    if (searchValue === '') {
+      return filters;
+    }
+
+    return fuzzysort.go(searchValue, filters, {
+      keys: ['1', '2'],
+      limit: 5,
+      threshold: -10000,
+    }).map(result => result.obj);
+  }
+
+  renderItem = filter => {
+    let warning = null;
+    if (filter[3] || filter[4]) {
+      warning = (
+        <span className='language-dropdown__dropdown__results__item__common-name'>
+          (
+          {filter[3] && <FormattedMessage id='filter_modal.select_filter.expired' defaultMessage='expired' />}
+          {filter[3] && filter[4] && ', '}
+          {filter[4] && <FormattedMessage id='filter_modal.select_filter.context_mismatch' defaultMessage='does not apply to this context' />}
+          )
+        </span>
+      );
+    }
+
+    return (
+      <div key={filter[0]} role='button' tabIndex='0' data-index={filter[0]} className='language-dropdown__dropdown__results__item' onClick={this.handleItemClick} onKeyDown={this.handleKeyDown}>
+        <span className='language-dropdown__dropdown__results__item__native-name'>{filter[1]}</span> {warning}
+      </div>
+    );
+  }
+
+  renderCreateNew (name) {
+    return (
+      <div key='add-new-filter' role='button' tabIndex='0' className='language-dropdown__dropdown__results__item' onClick={this.handleNewFilterClick} onKeyDown={this.handleKeyDown}>
+        <Icon id='plus' fixedWidth /> <FormattedMessage id='filter_modal.select_filter.prompt_new' defaultMessage='New category: {name}' values={{ name }} />
+      </div>
+    );
+  }
+
+  handleSearchChange = ({ target }) => {
+    this.setState({ searchValue: target.value });
+  }
+
+  setListRef = c => {
+    this.listNode = c;
+  }
+
+  handleKeyDown = e => {
+    const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget);
+
+    let element = null;
+
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      e.currentTarget.click();
+      break;
+    case 'ArrowDown':
+      element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
+      } else {
+        element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.listNode.firstChild;
+      break;
+    case 'End':
+      element = this.listNode.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }
+
+  handleSearchKeyDown = e => {
+    let element = null;
+
+    switch(e.key) {
+    case 'Tab':
+    case 'ArrowDown':
+      element = this.listNode.firstChild;
+
+      if (element) {
+        element.focus();
+        e.preventDefault();
+        e.stopPropagation();
+      }
+
+      break;
+    }
+  }
+
+  handleClear = () => {
+    this.setState({ searchValue: '' });
+  }
+
+  handleItemClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onSelectFilter(value);
+  }
+
+  handleNewFilterClick = e => {
+    e.preventDefault();
+
+    this.props.onNewFilter(this.state.searchValue);
+  };
+
+  render () {
+    const { intl } = this.props;
+
+    const { searchValue } = this.state;
+    const isSearching = searchValue !== '';
+    const results = this.search();
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='filter_modal.select_filter.title' defaultMessage='Filter this post' /></h3>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='filter_modal.select_filter.subtitle' defaultMessage='Use an existing category or create a new one' /></p>
+
+        <div className='emoji-mart-search'>
+          <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} autoFocus />
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+        </div>
+
+        <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
+          {results.map(this.renderItem)}
+          {isSearching && this.renderCreateNew(searchValue) }
+        </div>
+
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/follow_recommendations/components/account.js b/app/javascript/mastodon/features/follow_recommendations/components/account.js
index ffc0ab00c..14f4e7e1b 100644
--- a/app/javascript/mastodon/features/follow_recommendations/components/account.js
+++ b/app/javascript/mastodon/features/follow_recommendations/components/account.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { makeGetAccount } from 'mastodon/selectors';
 import Avatar from 'mastodon/components/avatar';
 import DisplayName from 'mastodon/components/display_name';
-import Permalink from 'mastodon/components/permalink';
+import { Link } from 'react-router-dom';
 import IconButton from 'mastodon/components/icon_button';
 import { injectIntl, defineMessages } from 'react-intl';
 import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
@@ -66,13 +66,13 @@ class Account extends ImmutablePureComponent {
     return (
       <div className='account follow-recommendations-account'>
         <div className='account__wrapper'>
-          <Permalink className='account__display-name account__display-name--with-note' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+          <Link className='account__display-name account__display-name--with-note' title={account.get('acct')} to={`/@${account.get('acct')}`}>
             <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
 
             <DisplayName account={account} />
 
             <div className='account__note'>{getFirstSentence(account.get('note_plain'))}</div>
-          </Permalink>
+          </Link>
 
           <div className='account__relationship'>
             {button}
diff --git a/app/javascript/mastodon/features/follow_recommendations/index.js b/app/javascript/mastodon/features/follow_recommendations/index.js
index b5a71aef5..5f7baa64c 100644
--- a/app/javascript/mastodon/features/follow_recommendations/index.js
+++ b/app/javascript/mastodon/features/follow_recommendations/index.js
@@ -10,9 +10,9 @@ import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { markAsPartial } from 'mastodon/actions/timelines';
 import Column from 'mastodon/features/ui/components/column';
 import Account from './components/account';
-import Logo from 'mastodon/components/logo';
 import imageGreeting from 'mastodon/../images/elephant_ui_greeting.svg';
 import Button from 'mastodon/components/button';
+import { Helmet } from 'react-helmet';
 
 const mapStateToProps = state => ({
   suggestions: state.getIn(['suggestions', 'items']),
@@ -78,7 +78,10 @@ class FollowRecommendations extends ImmutablePureComponent {
       <Column>
         <div className='scrollable follow-recommendations-container'>
           <div className='column-title'>
-            <Logo />
+            <svg viewBox='0 0 79 79' className='logo'>
+              <use xlinkHref='#logo-symbol-icon' />
+            </svg>
+
             <h3><FormattedMessage id='follow_recommendations.heading' defaultMessage="Follow people you'd like to see posts from! Here are some suggestions." /></h3>
             <p><FormattedMessage id='follow_recommendations.lead' defaultMessage="Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!" /></p>
           </div>
@@ -102,6 +105,10 @@ class FollowRecommendations extends ImmutablePureComponent {
             </React.Fragment>
           )}
         </div>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index 263a7ae16..d41f331e5 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import Permalink from '../../../components/permalink';
+import { Link } from 'react-router-dom';
 import Avatar from '../../../components/avatar';
 import DisplayName from '../../../components/display_name';
 import IconButton from '../../../components/icon_button';
@@ -30,10 +30,10 @@ class AccountAuthorize extends ImmutablePureComponent {
     return (
       <div className='account-authorize__wrapper'>
         <div className='account-authorize'>
-          <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+          <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
             <div className='account-authorize__avatar'><Avatar account={account} size={48} /></div>
             <DisplayName account={account} />
-          </Permalink>
+          </Link>
 
           <div className='account__header__content translate' dangerouslySetInnerHTML={content} />
         </div>
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 1f9b635bb..d16aa7737 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -12,6 +12,7 @@ import AccountAuthorizeContainer from './containers/account_authorize_container'
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
 import { me } from '../../initial_state';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
@@ -87,6 +88,10 @@ class FollowRequests extends ImmutablePureComponent {
             <AccountAuthorizeContainer key={id} id={id} />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 224e74b3d..277eb702f 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -19,9 +19,12 @@ import ColumnBackButton from '../../components/column_back_button';
 import ScrollableList from '../../components/scrollable_list';
 import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
+import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
+import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.getIn(['accounts_map', acct]);
+  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
 
   if (!accountId) {
     return {
@@ -37,6 +40,8 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
     accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
     hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
     isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
+    suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+    hidden: getAccountHidden(state, accountId),
     blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
   };
 };
@@ -64,6 +69,8 @@ class Followers extends ImmutablePureComponent {
     isLoading: PropTypes.bool,
     blockedBy: PropTypes.bool,
     isAccount: PropTypes.bool,
+    suspended: PropTypes.bool,
+    hidden: PropTypes.bool,
     remote: PropTypes.bool,
     remoteUrl: PropTypes.string,
     multiColumn: PropTypes.bool,
@@ -101,7 +108,7 @@ class Followers extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
+    const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
 
     if (!isAccount) {
       return (
@@ -121,7 +128,13 @@ class Followers extends ImmutablePureComponent {
 
     let emptyMessage;
 
-    if (blockedBy) {
+    const forceEmptyState = blockedBy || suspended || hidden;
+
+    if (suspended) {
+      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
+    } else if (hidden) {
+      emptyMessage = <LimitedAccountHint accountId={accountId} />;
+    } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
     } else if (remote && accountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
@@ -137,7 +150,7 @@ class Followers extends ImmutablePureComponent {
 
         <ScrollableList
           scrollKey='followers'
-          hasMore={hasMore}
+          hasMore={!forceEmptyState && hasMore}
           isLoading={isLoading}
           onLoadMore={this.handleLoadMore}
           prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
@@ -146,7 +159,7 @@ class Followers extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         >
-          {blockedBy ? [] : accountIds.map(id =>
+          {forceEmptyState ? [] : accountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index aadce1644..e23d9b35c 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -19,9 +19,12 @@ import ColumnBackButton from '../../components/column_back_button';
 import ScrollableList from '../../components/scrollable_list';
 import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
+import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
+import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.getIn(['accounts_map', acct]);
+  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
 
   if (!accountId) {
     return {
@@ -37,6 +40,8 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
     accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
     hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
     isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
+    suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+    hidden: getAccountHidden(state, accountId),
     blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
   };
 };
@@ -64,6 +69,8 @@ class Following extends ImmutablePureComponent {
     isLoading: PropTypes.bool,
     blockedBy: PropTypes.bool,
     isAccount: PropTypes.bool,
+    suspended: PropTypes.bool,
+    hidden: PropTypes.bool,
     remote: PropTypes.bool,
     remoteUrl: PropTypes.string,
     multiColumn: PropTypes.bool,
@@ -101,7 +108,7 @@ class Following extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
+    const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
 
     if (!isAccount) {
       return (
@@ -121,7 +128,13 @@ class Following extends ImmutablePureComponent {
 
     let emptyMessage;
 
-    if (blockedBy) {
+    const forceEmptyState = blockedBy || suspended || hidden;
+
+    if (suspended) {
+      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
+    } else if (hidden) {
+      emptyMessage = <LimitedAccountHint accountId={accountId} />;
+    } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
     } else if (remote && accountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
@@ -137,7 +150,7 @@ class Following extends ImmutablePureComponent {
 
         <ScrollableList
           scrollKey='following'
-          hasMore={hasMore}
+          hasMore={!forceEmptyState && hasMore}
           isLoading={isLoading}
           onLoadMore={this.handleLoadMore}
           prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
@@ -146,7 +159,7 @@ class Following extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         >
-          {blockedBy ? [] : accountIds.map(id =>
+          {forceEmptyState ? [] : accountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
diff --git a/app/javascript/mastodon/features/getting_started/components/trends.js b/app/javascript/mastodon/features/getting_started/components/trends.js
index 71c7c458d..8dcdb4f61 100644
--- a/app/javascript/mastodon/features/getting_started/components/trends.js
+++ b/app/javascript/mastodon/features/getting_started/components/trends.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
 import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
 
 export default class Trends extends ImmutablePureComponent {
 
@@ -36,7 +37,11 @@ export default class Trends extends ImmutablePureComponent {
 
     return (
       <div className='getting-started__trends'>
-        <h4><FormattedMessage id='trends.trending_now' defaultMessage='Trending now' /></h4>
+        <h4>
+          <Link to={'/explore/tags'}>
+            <FormattedMessage id='trends.trending_now' defaultMessage='Trending now' />
+          </Link>
+        </h4>
 
         {trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
       </div>
diff --git a/app/javascript/mastodon/features/getting_started/containers/trends_container.js b/app/javascript/mastodon/features/getting_started/containers/trends_container.js
index 7a5268780..a73832db7 100644
--- a/app/javascript/mastodon/features/getting_started/containers/trends_container.js
+++ b/app/javascript/mastodon/features/getting_started/containers/trends_container.js
@@ -1,13 +1,13 @@
 import { connect } from 'react-redux';
-import { fetchTrends } from 'mastodon/actions/trends';
+import { fetchTrendingHashtags } from 'mastodon/actions/trends';
 import Trends from '../components/trends';
 
 const mapStateToProps = state => ({
-  trends: state.getIn(['trends', 'items']),
+  trends: state.getIn(['trends', 'tags', 'items']),
 });
 
 const mapDispatchToProps = dispatch => ({
-  fetchTrends: () => dispatch(fetchTrends()),
+  fetchTrends: () => dispatch(fetchTrendingHashtags()),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(Trends);
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 5508adb80..fc91070d1 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -1,19 +1,20 @@
 import React from 'react';
-import Column from '../ui/components/column';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { me, profile_directory, showTrends } from '../../initial_state';
+import { me, showTrends } from '../../initial_state';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { List as ImmutableList } from 'immutable';
 import NavigationContainer from '../compose/containers/navigation_container';
-import Icon from 'mastodon/components/icon';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 import TrendsContainer from './containers/trends_container';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
@@ -21,6 +22,7 @@ const messages = defineMessages({
   public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
   community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
@@ -29,18 +31,16 @@ const messages = defineMessages({
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
   personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
   security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
   menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
-  profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' },
 });
 
 const mapStateToProps = state => ({
   myAccount: state.getIn(['accounts', me]),
-  columns: state.getIn(['settings', 'columns']),
   unreadFollowRequests: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
 });
 
@@ -58,20 +58,18 @@ const badgeDisplay = (number, limit) => {
   }
 };
 
-const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
-
 export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
 class GettingStarted extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
-    myAccount: ImmutablePropTypes.map.isRequired,
-    columns: ImmutablePropTypes.list,
+    myAccount: ImmutablePropTypes.map,
     multiColumn: PropTypes.bool,
     fetchFollowRequests: PropTypes.func.isRequired,
     unreadFollowRequests: PropTypes.number,
@@ -79,10 +77,10 @@ class GettingStarted extends ImmutablePureComponent {
   };
 
   componentDidMount () {
-    const { fetchFollowRequests, multiColumn } = this.props;
+    const { fetchFollowRequests } = this.props;
+    const { signedIn } = this.context.identity;
 
-    if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
-      this.context.router.history.replace('/home');
+    if (!signedIn) {
       return;
     }
 
@@ -90,94 +88,66 @@ class GettingStarted extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, myAccount, columns, multiColumn, unreadFollowRequests } = this.props;
+    const { intl, myAccount, multiColumn, unreadFollowRequests } = this.props;
+    const { signedIn } = this.context.identity;
 
     const navItems = [];
-    let height = (multiColumn) ? 0 : 60;
 
-    if (multiColumn) {
+    navItems.push(
+      <ColumnSubheading key='header-discover' text={intl.formatMessage(messages.discover)} />,
+    );
+
+    if (showTrends) {
       navItems.push(
-        <ColumnSubheading key='header-discover' text={intl.formatMessage(messages.discover)} />,
-        <ColumnLink key='community_timeline' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/public/local' />,
-        <ColumnLink key='public_timeline' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/public' />,
+        <ColumnLink key='explore' icon='hashtag' text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
-
-      height += 34 + 48*2;
-
-      if (profile_directory) {
-        navItems.push(
-          <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
-        );
-
-        height += 48;
-      }
-
-      navItems.push(
-        <ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
-      );
-
-      height += 34;
-    } else if (profile_directory) {
-      navItems.push(
-        <ColumnLink key='directory' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />,
-      );
-
-      height += 48;
-    }
-
-    if (multiColumn && !columns.find(item => item.get('id') === 'HOME')) {
-      navItems.push(
-        <ColumnLink key='home' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/home' />,
-      );
-      height += 48;
     }
 
     navItems.push(
-      <ColumnLink key='direct' icon='envelope' text={intl.formatMessage(messages.direct)} to='/conversations' />,
-      <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
-      <ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
+      <ColumnLink key='community_timeline' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/public/local' />,
+      <ColumnLink key='public_timeline' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/public' />,
     );
 
-    height += 48*4;
+    if (signedIn) {
+      navItems.push(
+        <ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
+        <ColumnLink key='home' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/home' />,
+        <ColumnLink key='direct' icon='at' text={intl.formatMessage(messages.direct)} to='/conversations' />,
+        <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
+        <ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
+        <ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
+      );
 
-    if (myAccount.get('locked') || unreadFollowRequests > 0) {
-      navItems.push(<ColumnLink key='follow_requests' icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
-      height += 48;
-    }
+      if (myAccount.get('locked') || unreadFollowRequests > 0) {
+        navItems.push(<ColumnLink key='follow_requests' icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
+      }
 
-    if (!multiColumn) {
       navItems.push(
         <ColumnSubheading key='header-settings' text={intl.formatMessage(messages.settings_subheading)} />,
         <ColumnLink key='preferences' icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
       );
-
-      height += 34 + 48;
     }
 
     return (
-      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.menu)}>
-        {multiColumn && <div className='column-header__wrapper'>
-          <h1 className='column-header'>
-            <button>
-              <Icon id='bars' className='column-header__icon' fixedWidth />
-              <FormattedMessage id='getting_started.heading' defaultMessage='Getting started' />
-            </button>
-          </h1>
-        </div>}
+      <Column>
+        {(signedIn && !multiColumn) ? <NavigationContainer /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' multiColumn={multiColumn} />}
 
-        <div className='getting-started'>
-          <div className='getting-started__wrapper' style={{ height }}>
-            {!multiColumn && <NavigationContainer />}
+        <div className='getting-started scrollable scrollable--flex'>
+          <div className='getting-started__wrapper'>
             {navItems}
           </div>
 
           {!multiColumn && <div className='flex-spacer' />}
 
-          <LinkFooter withHotkeys={multiColumn} />
+          <LinkFooter />
         </div>
 
-        {multiColumn && showTrends && <TrendsContainer />}
+        {(multiColumn && showTrends) && <TrendsContainer />}
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.menu)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
index de1127b0d..ac7863ed3 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
@@ -33,14 +33,24 @@ class ColumnSettings extends React.PureComponent {
   tags (mode) {
     let tags = this.props.settings.getIn(['tags', mode]) || [];
 
-    if (tags.toJSON) {
-      return tags.toJSON();
+    if (tags.toJS) {
+      return tags.toJS();
     } else {
       return tags;
     }
-  };
+  }
 
-  onSelect = mode => value => this.props.onChange(['tags', mode], value);
+  onSelect = mode => value => {
+    const oldValue = this.tags(mode);
+
+    // Prevent changes that add more than 4 tags, but allow removing
+    // tags that were already added before
+    if ((value.length > 4) && !(value < oldValue)) {
+      return;
+    }
+
+    this.props.onChange(['tags', mode], value);
+  };
 
   onToggle = () => {
     if (this.state.open && this.hasTags()) {
@@ -88,7 +98,7 @@ class ColumnSettings extends React.PureComponent {
     default:
       return '';
     }
-  };
+  }
 
   render () {
     const { settings, onChange } = this.props;
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 6a808eb30..733f54ff3 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -1,31 +1,49 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import StatusListContainer from '../ui/containers/status_list_container';
-import Column from '../../components/column';
-import ColumnHeader from '../../components/column_header';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
 import ColumnSettingsContainer from './containers/column_settings_container';
-import { expandHashtagTimeline, clearTimeline } from '../../actions/timelines';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import { FormattedMessage } from 'react-intl';
-import { connectHashtagStream } from '../../actions/streaming';
+import { expandHashtagTimeline, clearTimeline } from 'mastodon/actions/timelines';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+import { connectHashtagStream } from 'mastodon/actions/streaming';
 import { isEqual } from 'lodash';
+import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';
+import Icon from 'mastodon/components/icon';
+import classNames from 'classnames';
+import { Helmet } from 'react-helmet';
+
+const messages = defineMessages({
+  followHashtag: { id: 'hashtag.follow', defaultMessage: 'Follow hashtag' },
+  unfollowHashtag: { id: 'hashtag.unfollow', defaultMessage: 'Unfollow hashtag' },
+});
 
 const mapStateToProps = (state, props) => ({
   hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
+  tag: state.getIn(['tags', props.params.id]),
 });
 
 export default @connect(mapStateToProps)
+@injectIntl
 class HashtagTimeline extends React.PureComponent {
 
   disconnects = [];
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     params: PropTypes.object.isRequired,
     columnId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
     hasUnread: PropTypes.bool,
+    tag: ImmutablePropTypes.map,
     multiColumn: PropTypes.bool,
+    intl: PropTypes.object,
   };
 
   handlePin = () => {
@@ -39,7 +57,8 @@ class HashtagTimeline extends React.PureComponent {
   }
 
   title = () => {
-    let title = [this.props.params.id];
+    const { id } = this.props.params;
+    const title  = [id];
 
     if (this.additionalFor('any')) {
       title.push(' ', <FormattedMessage key='any' id='hashtag.column_header.tag_mode.any'  values={{ additional: this.additionalFor('any') }} defaultMessage='or {additional}' />);
@@ -76,6 +95,12 @@ class HashtagTimeline extends React.PureComponent {
   }
 
   _subscribe (dispatch, id, tags = {}, local) {
+    const { signedIn } = this.context.identity;
+
+    if (!signedIn) {
+      return;
+    }
+
     let any  = (tags.any || []).map(tag => tag.value);
     let all  = (tags.all || []).map(tag => tag.value);
     let none = (tags.none || []).map(tag => tag.value);
@@ -95,23 +120,34 @@ class HashtagTimeline extends React.PureComponent {
     this.disconnects = [];
   }
 
-  componentDidMount () {
+  _unload () {
+    const { dispatch } = this.props;
+    const { id, local } = this.props.params;
+
+    this._unsubscribe();
+    dispatch(clearTimeline(`hashtag:${id}${local ? ':local' : ''}`));
+  }
+
+  _load() {
     const { dispatch } = this.props;
     const { id, tags, local } = this.props.params;
 
     this._subscribe(dispatch, id, tags, local);
     dispatch(expandHashtagTimeline(id, { tags, local }));
+    dispatch(fetchHashtag(id));
   }
 
-  componentWillReceiveProps (nextProps) {
-    const { dispatch, params } = this.props;
-    const { id, tags, local } = nextProps.params;
+  componentDidMount () {
+    this._load();
+  }
+
+  componentDidUpdate (prevProps) {
+    const { params } = this.props;
+    const { id, tags, local } = prevProps.params;
 
     if (id !== params.id || !isEqual(tags, params.tags) || !isEqual(local, params.local)) {
-      this._unsubscribe();
-      this._subscribe(dispatch, id, tags, local);
-      dispatch(clearTimeline(`hashtag:${id}${local ? ':local' : ''}`));
-      dispatch(expandHashtagTimeline(id, { tags, local }));
+      this._unload();
+      this._load();
     }
   }
 
@@ -124,14 +160,45 @@ class HashtagTimeline extends React.PureComponent {
   }
 
   handleLoadMore = maxId => {
-    const { id, tags, local } = this.props.params;
-    this.props.dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
+    const { dispatch, params } = this.props;
+    const { id, tags, local }  = params;
+
+    dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
+  }
+
+  handleFollow = () => {
+    const { dispatch, params, tag } = this.props;
+    const { id } = params;
+    const { signedIn } = this.context.identity;
+
+    if (!signedIn) {
+      return;
+    }
+
+    if (tag.get('following')) {
+      dispatch(unfollowHashtag(id));
+    } else {
+      dispatch(followHashtag(id));
+    }
   }
 
   render () {
-    const { hasUnread, columnId, multiColumn } = this.props;
+    const { hasUnread, columnId, multiColumn, tag, intl } = this.props;
     const { id, local } = this.props.params;
     const pinned = !!columnId;
+    const { signedIn } = this.context.identity;
+
+    let followButton;
+
+    if (tag) {
+      const following = tag.get('following');
+
+      followButton = (
+        <button className={classNames('column-header__button')} onClick={this.handleFollow} disabled={!signedIn} active={following} title={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)} aria-label={intl.formatMessage(following ? messages.unfollowHashtag : messages.followHashtag)}>
+          <Icon id={following ? 'user-times' : 'user-plus'} fixedWidth className='column-header__icon' />
+        </button>
+      );
+    }
 
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={`#${id}`}>
@@ -144,6 +211,7 @@ class HashtagTimeline extends React.PureComponent {
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
+          extraButton={followButton}
           showBackButton
         >
           {columnId && <ColumnSettingsContainer columnId={columnId} />}
@@ -157,6 +225,11 @@ class HashtagTimeline extends React.PureComponent {
           emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>#{id}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index dc440f2fe..ae11ccbe4 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -13,6 +13,8 @@ import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/an
 import AnnouncementsContainer from 'mastodon/features/getting_started/containers/announcements_container';
 import classNames from 'classnames';
 import IconWithBadge from 'mastodon/components/icon_with_badge';
+import NotSignedInIndicator from 'mastodon/components/not_signed_in_indicator';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -32,6 +34,10 @@ export default @connect(mapStateToProps)
 @injectIntl
 class HomeTimeline extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -113,16 +119,17 @@ class HomeTimeline extends React.PureComponent {
   render () {
     const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
+    const { signedIn } = this.context.identity;
 
     let announcementsButton = null;
 
     if (hasAnnouncements) {
       announcementsButton = (
         <button
+          type='button'
           className={classNames('column-header__button', { 'active': showAnnouncements })}
           title={intl.formatMessage(showAnnouncements ? messages.hide_announcements : messages.show_announcements)}
           aria-label={intl.formatMessage(showAnnouncements ? messages.hide_announcements : messages.show_announcements)}
-          aria-pressed={showAnnouncements ? 'true' : 'false'}
           onClick={this.handleToggleAnnouncementsClick}
         >
           <IconWithBadge id='bullhorn' count={unreadAnnouncements} />
@@ -147,14 +154,21 @@ class HomeTimeline extends React.PureComponent {
           <ColumnSettingsContainer />
         </ColumnHeader>
 
-        <StatusListContainer
-          trackScroll={!pinned}
-          scrollKey={`home_timeline-${columnId}`}
-          onLoadMore={this.handleLoadMore}
-          timelineId='home'
-          emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty! Follow more people to fill it up. {suggestions}' values={{ suggestions: <Link to='/start'><FormattedMessage id='empty_column.home.suggestions' defaultMessage='See some suggestions' /></Link> }} />}
-          bindToDocument={!multiColumn}
-        />
+        {signedIn ? (
+          <StatusListContainer
+            trackScroll={!pinned}
+            scrollKey={`home_timeline-${columnId}`}
+            onLoadMore={this.handleLoadMore}
+            timelineId='home'
+            emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty! Follow more people to fill it up. {suggestions}' values={{ suggestions: <Link to='/start'><FormattedMessage id='empty_column.home.suggestions' defaultMessage='See some suggestions' /></Link> }} />}
+            bindToDocument={!multiColumn}
+          />
+        ) : <NotSignedInIndicator />}
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/interaction_modal/index.js b/app/javascript/mastodon/features/interaction_modal/index.js
new file mode 100644
index 000000000..d4535378f
--- /dev/null
+++ b/app/javascript/mastodon/features/interaction_modal/index.js
@@ -0,0 +1,161 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { registrationsOpen } from 'mastodon/initial_state';
+import { connect } from 'react-redux';
+import Icon from 'mastodon/components/icon';
+import classNames from 'classnames';
+import { openModal, closeModal } from 'mastodon/actions/modal';
+
+const mapStateToProps = (state, { accountId }) => ({
+  displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  onSignupClick() {
+    dispatch(closeModal());
+    dispatch(openModal('CLOSED_REGISTRATIONS'));
+  },
+});
+
+class Copypaste extends React.PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string,
+  };
+
+  state = {
+    copied: false,
+  };
+
+  setRef = c => {
+    this.input = c;
+  }
+
+  handleInputClick = () => {
+    this.setState({ copied: false });
+    this.input.focus();
+    this.input.select();
+    this.input.setSelectionRange(0, this.input.value.length);
+  }
+
+  handleButtonClick = () => {
+    const { value } = this.props;
+    navigator.clipboard.writeText(value);
+    this.input.blur();
+    this.setState({ copied: true });
+    this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
+  }
+
+  componentWillUnmount () {
+    if (this.timeout) clearTimeout(this.timeout);
+  }
+
+  render () {
+    const { value } = this.props;
+    const { copied } = this.state;
+
+    return (
+      <div className={classNames('copypaste', { copied })}>
+        <input
+          type='text'
+          ref={this.setRef}
+          value={value}
+          readOnly
+          onClick={this.handleInputClick}
+        />
+
+        <button className='button' onClick={this.handleButtonClick}>
+          {copied ? <FormattedMessage id='copypaste.copied' defaultMessage='Copied' /> : <FormattedMessage id='copypaste.copy' defaultMessage='Copy' />}
+        </button>
+      </div>
+    );
+  }
+
+}
+
+export default @connect(mapStateToProps, mapDispatchToProps)
+class InteractionModal extends React.PureComponent {
+
+  static propTypes = {
+    displayNameHtml: PropTypes.string,
+    url: PropTypes.string,
+    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
+    onSignupClick: PropTypes.func.isRequired,
+  };
+
+  handleSignupClick = () => {
+    this.props.onSignupClick();
+  }
+
+  render () {
+    const { url, type, displayNameHtml } = this.props;
+
+    const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
+
+    let title, actionDescription, icon;
+
+    switch(type) {
+    case 'reply':
+      icon = <Icon id='reply' />;
+      title = <FormattedMessage id='interaction_modal.title.reply' defaultMessage="Reply to {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.reply' defaultMessage='With an account on Mastodon, you can respond to this post.' />;
+      break;
+    case 'reblog':
+      icon = <Icon id='retweet' />;
+      title = <FormattedMessage id='interaction_modal.title.reblog' defaultMessage="Boost {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
+      break;
+    case 'favourite':
+      icon = <Icon id='star' />;
+      title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favourite {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.' />;
+      break;
+    case 'follow':
+      icon = <Icon id='user-plus' />;
+      title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.follow' defaultMessage='With an account on Mastodon, you can follow {name} to receive their posts in your home feed.' values={{ name }} />;
+      break;
+    }
+
+    let signupButton;
+
+    if (registrationsOpen) {
+      signupButton = (
+        <a href='/auth/sign_up' className='button button--block button-tertiary'>
+          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+        </a>
+      );
+    } else {
+      signupButton = (
+        <button className='button button--block button-tertiary' onClick={this.handleSignupClick}>
+          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+        </button>
+      );
+    }
+
+    return (
+      <div className='modal-root__modal interaction-modal'>
+        <div className='interaction-modal__lead'>
+          <h3><span className='interaction-modal__icon'>{icon}</span> {title}</h3>
+          <p>{actionDescription} <FormattedMessage id='interaction_modal.preamble' defaultMessage="Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one." /></p>
+        </div>
+
+        <div className='interaction-modal__choices'>
+          <div className='interaction-modal__choices__choice'>
+            <h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
+            <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+            {signupButton}
+          </div>
+
+          <div className='interaction-modal__choices__choice'>
+            <h3><FormattedMessage id='interaction_modal.on_another_server' defaultMessage='On a different server' /></h3>
+            <p><FormattedMessage id='interaction_modal.other_server_instructions' defaultMessage='Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.' /></p>
+            <Copypaste value={url} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/introduction/index.js b/app/javascript/mastodon/features/introduction/index.js
deleted file mode 100644
index 5820750a4..000000000
--- a/app/javascript/mastodon/features/introduction/index.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ReactSwipeableViews from 'react-swipeable-views';
-import classNames from 'classnames';
-import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import { closeOnboarding } from '../../actions/onboarding';
-import screenHello from '../../../images/screen_hello.svg';
-import screenFederation from '../../../images/screen_federation.svg';
-import screenInteractions from '../../../images/screen_interactions.svg';
-import logoTransparent from '../../../images/logo_transparent.svg';
-import { disableSwiping } from 'mastodon/initial_state';
-
-const FrameWelcome = ({ domain, onNext }) => (
-  <div className='introduction__frame'>
-    <div className='introduction__illustration' style={{ background: `url(${logoTransparent}) no-repeat center center / auto 80%` }}>
-      <img src={screenHello} alt='' />
-    </div>
-
-    <div className='introduction__text introduction__text--centered'>
-      <h3><FormattedMessage id='introduction.welcome.headline' defaultMessage='First steps' /></h3>
-      <p><FormattedMessage id='introduction.welcome.text' defaultMessage="Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name." values={{ domain: <code>{domain}</code> }} /></p>
-    </div>
-
-    <div className='introduction__action'>
-      <button className='button' onClick={onNext}><FormattedMessage id='introduction.welcome.action' defaultMessage="Let's go!" /></button>
-    </div>
-  </div>
-);
-
-FrameWelcome.propTypes = {
-  domain: PropTypes.string.isRequired,
-  onNext: PropTypes.func.isRequired,
-};
-
-const FrameFederation = ({ onNext }) => (
-  <div className='introduction__frame'>
-    <div className='introduction__illustration'>
-      <img src={screenFederation} alt='' />
-    </div>
-
-    <div className='introduction__text introduction__text--columnized'>
-      <div>
-        <h3><FormattedMessage id='introduction.federation.home.headline' defaultMessage='Home' /></h3>
-        <p><FormattedMessage id='introduction.federation.home.text' defaultMessage='Posts from people you follow will appear in your home feed. You can follow anyone on any server!' /></p>
-      </div>
-
-      <div>
-        <h3><FormattedMessage id='introduction.federation.local.headline' defaultMessage='Local' /></h3>
-        <p><FormattedMessage id='introduction.federation.local.text' defaultMessage='Public posts from people on the same server as you will appear in the local timeline.' /></p>
-      </div>
-
-      <div>
-        <h3><FormattedMessage id='introduction.federation.federated.headline' defaultMessage='Federated' /></h3>
-        <p><FormattedMessage id='introduction.federation.federated.text' defaultMessage='Public posts from other servers of the fediverse will appear in the federated timeline.' /></p>
-      </div>
-    </div>
-
-    <div className='introduction__action'>
-      <button className='button' onClick={onNext}><FormattedMessage id='introduction.federation.action' defaultMessage='Next' /></button>
-    </div>
-  </div>
-);
-
-FrameFederation.propTypes = {
-  onNext: PropTypes.func.isRequired,
-};
-
-const FrameInteractions = ({ onNext }) => (
-  <div className='introduction__frame'>
-    <div className='introduction__illustration'>
-      <img src={screenInteractions} alt='' />
-    </div>
-
-    <div className='introduction__text introduction__text--columnized'>
-      <div>
-        <h3><FormattedMessage id='introduction.interactions.reply.headline' defaultMessage='Reply' /></h3>
-        <p><FormattedMessage id='introduction.interactions.reply.text' defaultMessage="You can reply to other people's and your own toots, which will chain them together in a conversation." /></p>
-      </div>
-
-      <div>
-        <h3><FormattedMessage id='introduction.interactions.reblog.headline' defaultMessage='Boost' /></h3>
-        <p><FormattedMessage id='introduction.interactions.reblog.text' defaultMessage="You can share other people's toots with your followers by boosting them." /></p>
-      </div>
-
-      <div>
-        <h3><FormattedMessage id='introduction.interactions.favourite.headline' defaultMessage='Favourite' /></h3>
-        <p><FormattedMessage id='introduction.interactions.favourite.text' defaultMessage='You can save a toot for later, and let the author know that you liked it, by favouriting it.' /></p>
-      </div>
-    </div>
-
-    <div className='introduction__action'>
-      <button className='button' onClick={onNext}><FormattedMessage id='introduction.interactions.action' defaultMessage='Finish toot-orial!' /></button>
-    </div>
-  </div>
-);
-
-FrameInteractions.propTypes = {
-  onNext: PropTypes.func.isRequired,
-};
-
-export default @connect(state => ({ domain: state.getIn(['meta', 'domain']) }))
-class Introduction extends React.PureComponent {
-
-  static propTypes = {
-    domain: PropTypes.string.isRequired,
-    dispatch: PropTypes.func.isRequired,
-  };
-
-  state = {
-    currentIndex: 0,
-  };
-
-  componentWillMount () {
-    this.pages = [
-      <FrameWelcome domain={this.props.domain} onNext={this.handleNext} />,
-      <FrameFederation onNext={this.handleNext} />,
-      <FrameInteractions onNext={this.handleFinish} />,
-    ];
-  }
-
-  componentDidMount() {
-    window.addEventListener('keyup', this.handleKeyUp);
-  }
-
-  componentWillUnmount() {
-    window.addEventListener('keyup', this.handleKeyUp);
-  }
-
-  handleDot = (e) => {
-    const i = Number(e.currentTarget.getAttribute('data-index'));
-    e.preventDefault();
-    this.setState({ currentIndex: i });
-  }
-
-  handlePrev = () => {
-    this.setState(({ currentIndex }) => ({
-      currentIndex: Math.max(0, currentIndex - 1),
-    }));
-  }
-
-  handleNext = () => {
-    const { pages } = this;
-
-    this.setState(({ currentIndex }) => ({
-      currentIndex: Math.min(currentIndex + 1, pages.length - 1),
-    }));
-  }
-
-  handleSwipe = (index) => {
-    this.setState({ currentIndex: index });
-  }
-
-  handleFinish = () => {
-    this.props.dispatch(closeOnboarding());
-  }
-
-  handleKeyUp = ({ key }) => {
-    switch (key) {
-    case 'ArrowLeft':
-      this.handlePrev();
-      break;
-    case 'ArrowRight':
-      this.handleNext();
-      break;
-    }
-  }
-
-  render () {
-    const { currentIndex } = this.state;
-    const { pages } = this;
-
-    return (
-      <div className='introduction'>
-        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} disabled={disableSwiping} className='introduction__pager'>
-          {pages.map((page, i) => (
-            <div key={i} className={classNames('introduction__frame-wrapper', { 'active': i === currentIndex })}>{page}</div>
-          ))}
-        </ReactSwipeableViews>
-
-        <div className='introduction__dots'>
-          {pages.map((_, i) => (
-            <div
-              key={`dot-${i}`}
-              role='button'
-              tabIndex='0'
-              data-index={i}
-              onClick={this.handleDot}
-              className={classNames('introduction__dot', { active: i === currentIndex })}
-            />
-          ))}
-        </div>
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
index d278d2b26..9a870478d 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@@ -1,9 +1,10 @@
 import React from 'react';
-import Column from '../ui/components/column';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
+import Column from 'mastodon/components/column';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
@@ -21,8 +22,13 @@ class KeyboardShortcuts extends ImmutablePureComponent {
     const { intl, multiColumn } = this.props;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='question' heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
+      <Column>
+        <ColumnHeader
+          title={intl.formatMessage(messages.heading)}
+          icon='question'
+          multiColumn={multiColumn}
+        />
+
         <div className='keyboard-shortcuts scrollable optionally-scrollable'>
           <table>
             <thead>
@@ -86,7 +92,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
               </tr>
               <tr>
                 <td><kbd>alt</kbd>+<kbd>n</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new toot' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new post' /></td>
               </tr>
               <tr>
                 <td><kbd>alt</kbd>+<kbd>x</kbd></td>
@@ -134,7 +140,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>p</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned toots list' /></td>
+                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></td>
               </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>u</kbd></td>
@@ -159,6 +165,10 @@ class KeyboardShortcuts extends ImmutablePureComponent {
             </tbody>
           </table>
         </div>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js
index 8010274f8..c2e72e2e9 100644
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -1,21 +1,22 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import StatusListContainer from '../ui/containers/status_list_container';
-import Column from '../../components/column';
-import ColumnBackButton from '../../components/column_back_button';
-import ColumnHeader from '../../components/column_header';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { connectListStream } from '../../actions/streaming';
-import { expandListTimeline } from '../../actions/timelines';
-import { fetchList, deleteList, updateList } from '../../actions/lists';
-import { openModal } from '../../actions/modal';
-import MissingIndicator from '../../components/missing_indicator';
-import LoadingIndicator from '../../components/loading_indicator';
+import { connect } from 'react-redux';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
+import { openModal } from 'mastodon/actions/modal';
+import { connectListStream } from 'mastodon/actions/streaming';
+import { expandListTimeline } from 'mastodon/actions/timelines';
+import Column from 'mastodon/components/column';
+import ColumnBackButton from 'mastodon/components/column_back_button';
+import ColumnHeader from 'mastodon/components/column_header';
 import Icon from 'mastodon/components/icon';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import MissingIndicator from 'mastodon/components/missing_indicator';
 import RadioButton from 'mastodon/components/radio_button';
+import StatusListContainer from 'mastodon/features/ui/containers/status_list_container';
 
 const messages = defineMessages({
   deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },
@@ -125,7 +126,7 @@ class ListTimeline extends React.PureComponent {
       onConfirm: () => {
         dispatch(deleteList(id));
 
-        if (!!columnId) {
+        if (columnId) {
           dispatch(removeColumn(columnId));
         } else {
           this.context.router.history.push('/lists');
@@ -177,11 +178,11 @@ class ListTimeline extends React.PureComponent {
           multiColumn={multiColumn}
         >
           <div className='column-settings__row column-header__links'>
-            <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}>
+            <button type='button' className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}>
               <Icon id='pencil' /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
             </button>
 
-            <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}>
+            <button type='button' className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}>
               <Icon id='trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
             </button>
           </div>
@@ -208,6 +209,11 @@ class ListTimeline extends React.PureComponent {
           emptyMessage={<FormattedMessage id='empty_column.list' defaultMessage='There is nothing in this list yet. When members of this list post new statuses, they will appear here.' />}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>{title}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/lists/components/new_list_form.js b/app/javascript/mastodon/features/lists/components/new_list_form.js
index 7faf50be8..f790ccbe6 100644
--- a/app/javascript/mastodon/features/lists/components/new_list_form.js
+++ b/app/javascript/mastodon/features/lists/components/new_list_form.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
-import IconButton from '../../../components/icon_button';
+import { changeListEditorTitle, submitListEditor } from 'mastodon/actions/lists';
+import Button from 'mastodon/components/button';
 import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
@@ -65,10 +65,9 @@ class NewListForm extends React.PureComponent {
           />
         </label>
 
-        <IconButton
+        <Button
           disabled={disabled || !value}
-          icon='plus'
-          title={title}
+          text={title}
           onClick={this.handleClick}
         />
       </form>
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js
index 809d79d99..3a0b1373a 100644
--- a/app/javascript/mastodon/features/lists/index.js
+++ b/app/javascript/mastodon/features/lists/index.js
@@ -1,18 +1,19 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import LoadingIndicator from '../../components/loading_indicator';
-import Column from '../ui/components/column';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
-import { fetchLists } from '../../actions/lists';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import ColumnLink from '../ui/components/column_link';
-import ColumnSubheading from '../ui/components/column_subheading';
-import NewListForm from './components/new_list_form';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import ScrollableList from '../../components/scrollable_list';
+import { fetchLists } from 'mastodon/actions/lists';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import ColumnLink from 'mastodon/features/ui/components/column_link';
+import ColumnSubheading from 'mastodon/features/ui/components/column_subheading';
+import NewListForm from './components/new_list_form';
 
 const messages = defineMessages({
   heading: { id: 'column.lists', defaultMessage: 'Lists' },
@@ -61,8 +62,8 @@ class Lists extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.lists' defaultMessage="You don't have any lists yet. When you create one, it will show up here." />;
 
     return (
-      <Column bindToDocument={!multiColumn} icon='list-ul' heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader title={intl.formatMessage(messages.heading)} icon='list-ul' multiColumn={multiColumn} showBackButton />
 
         <NewListForm />
 
@@ -76,6 +77,11 @@ class Lists extends ImmutablePureComponent {
             <ColumnLink key={list.get('id')} to={`/lists/${list.get('id')}`} icon='list-ul' text={list.get('title')} />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index c1d50d194..65df6149f 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -11,6 +11,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountContainer from '../../containers/account_container';
 import { fetchMutes, expandMutes } from '../../actions/mutes';
 import ScrollableList from '../../components/scrollable_list';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   heading: { id: 'column.mutes', defaultMessage: 'Muted users' },
@@ -69,9 +70,13 @@ class Mutes extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <AccountContainer key={id} id={id} />,
+            <AccountContainer key={id} id={id} defaultAction='mute' />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 005f5afda..a38f8d3c2 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -5,9 +5,14 @@ import { FormattedMessage } from 'react-intl';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import SettingToggle from './setting_toggle';
+import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
 export default class ColumnSettings extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
     pushSettings: ImmutablePropTypes.map.isRequired,
@@ -16,7 +21,7 @@ export default class ColumnSettings extends React.PureComponent {
     onRequestNotificationPermission: PropTypes.func,
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
-    browserPermission: PropTypes.bool,
+    browserPermission: PropTypes.string,
   };
 
   onPushChange = (path, checked) => {
@@ -144,7 +149,7 @@ export default class ColumnSettings extends React.PureComponent {
         </div>
 
         <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New toots:' /></span>
+          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
@@ -153,6 +158,43 @@ export default class ColumnSettings extends React.PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'status']} onChange={onChange} label={soundStr} />
           </div>
         </div>
+
+        <div role='group' aria-labelledby='notifications-update'>
+          <span id='notifications-update' className='column-settings__section'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></span>
+
+          <div className='column-settings__row'>
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'update']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'update']} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'update']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'update']} onChange={onChange} label={soundStr} />
+          </div>
+        </div>
+
+        {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
+          <div role='group' aria-labelledby='notifications-admin-sign-up'>
+            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></span>
+
+            <div className='column-settings__row'>
+              <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.sign_up']} onChange={onChange} label={alertStr} />
+              {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'admin.sign_up']} onChange={this.onPushChange} label={pushStr} />}
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.sign_up']} onChange={onChange} label={showStr} />
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.sign_up']} onChange={onChange} label={soundStr} />
+            </div>
+          </div>
+        )}
+
+        {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
+          <div role='group' aria-labelledby='notifications-admin-report'>
+            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></span>
+
+            <div className='column-settings__row'>
+              <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.report']} onChange={onChange} label={alertStr} />
+              {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'admin.report']} onChange={this.onPushChange} label={pushStr} />}
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.report']} onChange={onChange} label={showStr} />
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.report']} onChange={onChange} label={soundStr} />
+            </div>
+          </div>
+        )}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.js b/app/javascript/mastodon/features/notifications/components/follow_request.js
index 9ef3fde7e..08de875e3 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.js
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from 'mastodon/components/avatar';
 import DisplayName from 'mastodon/components/display_name';
-import Permalink from 'mastodon/components/permalink';
+import { Link } from 'react-router-dom';
 import IconButton from 'mastodon/components/icon_button';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -42,10 +42,10 @@ class FollowRequest extends ImmutablePureComponent {
     return (
       <div className='account'>
         <div className='account__wrapper'>
-          <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+          <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
             <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
             <DisplayName account={account} />
-          </Permalink>
+          </Link>
 
           <div className='account__relationship'>
             <IconButton title={intl.formatMessage(messages.authorize)} icon='check' onClick={onAuthorize} />
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index f9f8a87f2..ea2c9c0a4 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -7,9 +7,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { me } from 'mastodon/initial_state';
 import StatusContainer from 'mastodon/containers/status_container';
 import AccountContainer from 'mastodon/containers/account_container';
+import Report from './report';
 import FollowRequestContainer from '../containers/follow_request_container';
 import Icon from 'mastodon/components/icon';
-import Permalink from 'mastodon/components/permalink';
+import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 
 const messages = defineMessages({
@@ -19,6 +20,9 @@ const messages = defineMessages({
   poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
+  update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
+  adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
+  adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -273,6 +277,38 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderUpdate (notification, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-update focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.update, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__favourite-icon-wrapper'>
+              <Icon id='pencil' fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.update' defaultMessage='{name} edited a post' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusContainer
+            id={notification.get('status')}
+            account={notification.get('account')}
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
   renderPoll (notification, account) {
     const { intl, unread } = this.props;
     const ownPoll  = me === account.get('id');
@@ -311,11 +347,63 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderAdminSignUp (notification, account, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-admin-sign-up focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminSignUp, { name: account.get('acct') }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__favourite-icon-wrapper'>
+              <Icon id='user-plus' fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.admin.sign_up' defaultMessage='{name} signed up' values={{ name: link }} />
+            </span>
+          </div>
+
+          <AccountContainer id={account.get('id')} hidden={this.props.hidden} />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderAdminReport (notification, account, link) {
+    const { intl, unread, report } = this.props;
+
+    if (!report) {
+      return null;
+    }
+
+    const targetAccount = report.get('target_account');
+    const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
+    const targetLink = <bdi><Link className='notification__display-name' title={targetAccount.get('acct')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-admin-report focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: account.get('acct'), target: notification.getIn(['report', 'target_account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__favourite-icon-wrapper'>
+              <Icon id='flag' fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.admin.report' defaultMessage='{name} reported {target}' values={{ name: link, target: targetLink }} />
+            </span>
+          </div>
+
+          <Report account={account} report={notification.get('report')} hidden={this.props.hidden} />
+        </div>
+      </HotKeys>
+    );
+  }
+
   render () {
     const { notification } = this.props;
     const account          = notification.get('account');
     const displayNameHtml  = { __html: account.get('display_name_html') };
-    const link             = <bdi><Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
+    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} title={account.get('acct')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
 
     switch(notification.get('type')) {
     case 'follow':
@@ -330,8 +418,14 @@ class Notification extends ImmutablePureComponent {
       return this.renderReblog(notification, link);
     case 'status':
       return this.renderStatus(notification, link);
+    case 'update':
+      return this.renderUpdate(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
+    case 'admin.sign_up':
+      return this.renderAdminSignUp(notification, account, link);
+    case 'admin.report':
+      return this.renderAdminReport(notification, account, link);
     }
 
     return null;
diff --git a/app/javascript/mastodon/features/notifications/components/report.js b/app/javascript/mastodon/features/notifications/components/report.js
new file mode 100644
index 000000000..3ce3eb9d3
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/report.js
@@ -0,0 +1,62 @@
+import React, { Fragment } from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import AvatarOverlay from 'mastodon/components/avatar_overlay';
+import RelativeTimestamp from 'mastodon/components/relative_timestamp';
+
+const messages = defineMessages({
+  openReport: { id: 'report_notification.open', defaultMessage: 'Open report' },
+  other: { id: 'report_notification.categories.other', defaultMessage: 'Other' },
+  spam: { id: 'report_notification.categories.spam', defaultMessage: 'Spam' },
+  violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' },
+});
+
+export default @injectIntl
+class Report extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+    report: ImmutablePropTypes.map.isRequired,
+    hidden: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  render () {
+    const { intl, hidden, report, account } = this.props;
+
+    if (!report) {
+      return null;
+    }
+
+    if (hidden) {
+      return (
+        <Fragment>
+          {report.get('id')}
+        </Fragment>
+      );
+    }
+
+    return (
+      <div className='notification__report'>
+        <div className='notification__report__avatar'>
+          <AvatarOverlay account={report.get('target_account')} friend={account} />
+        </div>
+
+        <div className='notification__report__details'>
+          <div>
+            <RelativeTimestamp timestamp={report.get('created_at')} short={false} /> · <FormattedMessage id='report_notification.attached_statuses' defaultMessage='{count, plural, one {{count} post} other {{count} posts}} attached' values={{ count: report.get('status_ids').size }} />
+            <br />
+            <strong>{intl.formatMessage(messages[report.get('category')])}</strong>
+          </div>
+
+          <div className='notification__report__actions'>
+            <a href={`/admin/reports/${report.get('id')}`} className='button' target='_blank' rel='noopener noreferrer'>{intl.formatMessage(messages.openReport)}</a>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 5c984197f..8bd5b3d78 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeGetNotification, makeGetStatus } from '../../../selectors';
+import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
 import Notification from '../components/notification';
 import { initBoostModal } from '../../../actions/boosts';
 import { mentionCompose } from '../../../actions/compose';
@@ -18,12 +18,14 @@ import { boostModal } from '../../../initial_state';
 const makeMapStateToProps = () => {
   const getNotification = makeGetNotification();
   const getStatus = makeGetStatus();
+  const getReport = makeGetReport();
 
   const mapStateToProps = (state, props) => {
     const notification = getNotification(state, props.notification, props.accountId);
     return {
       notification: notification,
       status: notification.get('status') ? getStatus(state, { id: notification.get('status') }) : null,
+      report: notification.get('report') ? getReport(state, notification.get('report'), notification.getIn(['report', 'target_account', 'id'])) : null,
     };
   };
 
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index a6a277d7e..826a7e9ad 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -26,6 +26,8 @@ import LoadGap from '../../components/load_gap';
 import Icon from 'mastodon/components/icon';
 import compareId from 'mastodon/compare_id';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
+import NotSignedInIndicator from 'mastodon/components/not_signed_in_indicator';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
@@ -56,7 +58,7 @@ const getNotifications = createSelector([
 const mapStateToProps = state => ({
   showFilterBar: state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
   notifications: getNotifications(state),
-  isLoading: state.getIn(['notifications', 'isLoading'], true),
+  isLoading: state.getIn(['notifications', 'isLoading'], 0) > 0,
   isUnread: state.getIn(['notifications', 'unread']) > 0 || state.getIn(['notifications', 'pendingItems']).size > 0,
   hasMore: state.getIn(['notifications', 'hasMore']),
   numPending: state.getIn(['notifications', 'pendingItems'], ImmutableList()).size,
@@ -69,6 +71,10 @@ export default @connect(mapStateToProps)
 @injectIntl
 class Notifications extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
@@ -178,10 +184,11 @@ class Notifications extends React.PureComponent {
     const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;
+    const { signedIn } = this.context.identity;
 
     let scrollableContent = null;
 
-    const filterBarContainer = showFilterBar
+    const filterBarContainer = (signedIn && showFilterBar)
       ? (<FilterBarContainer />)
       : null;
 
@@ -211,26 +218,32 @@ class Notifications extends React.PureComponent {
 
     this.scrollableContent = scrollableContent;
 
-    const scrollContainer = (
-      <ScrollableList
-        scrollKey={`notifications-${columnId}`}
-        trackScroll={!pinned}
-        isLoading={isLoading}
-        showLoading={isLoading && notifications.size === 0}
-        hasMore={hasMore}
-        numPending={numPending}
-        prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
-        alwaysPrepend
-        emptyMessage={emptyMessage}
-        onLoadMore={this.handleLoadOlder}
-        onLoadPending={this.handleLoadPending}
-        onScrollToTop={this.handleScrollToTop}
-        onScroll={this.handleScroll}
-        bindToDocument={!multiColumn}
-      >
-        {scrollableContent}
-      </ScrollableList>
-    );
+    let scrollContainer;
+
+    if (signedIn) {
+      scrollContainer = (
+        <ScrollableList
+          scrollKey={`notifications-${columnId}`}
+          trackScroll={!pinned}
+          isLoading={isLoading}
+          showLoading={isLoading && notifications.size === 0}
+          hasMore={hasMore}
+          numPending={numPending}
+          prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+          alwaysPrepend
+          emptyMessage={emptyMessage}
+          onLoadMore={this.handleLoadOlder}
+          onLoadPending={this.handleLoadPending}
+          onScrollToTop={this.handleScrollToTop}
+          onScroll={this.handleScroll}
+          bindToDocument={!multiColumn}
+        >
+          {scrollableContent}
+        </ScrollableList>
+      );
+    } else {
+      scrollContainer = <NotSignedInIndicator />;
+    }
 
     let extraButton = null;
 
@@ -262,8 +275,14 @@ class Notifications extends React.PureComponent {
         >
           <ColumnSettingsContainer />
         </ColumnHeader>
+
         {filterBarContainer}
         {scrollContainer}
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 0de562ee1..0dff834c3 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -43,6 +43,7 @@ class Footer extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
@@ -60,33 +61,51 @@ class Footer extends ImmutablePureComponent {
     const { router } = this.context;
 
     if (onClose) {
-      onClose();
+      onClose(true);
     }
 
     dispatch(replyCompose(status, router.history));
   };
 
   handleReplyClick = () => {
-    const { dispatch, askReplyConfirmation, intl } = this.props;
+    const { dispatch, askReplyConfirmation, status, intl } = this.props;
+    const { signedIn } = this.context.identity;
 
-    if (askReplyConfirmation) {
-      dispatch(openModal('CONFIRM', {
-        message: intl.formatMessage(messages.replyMessage),
-        confirm: intl.formatMessage(messages.replyConfirm),
-        onConfirm: this._performReply,
-      }));
+    if (signedIn) {
+      if (askReplyConfirmation) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.replyMessage),
+          confirm: intl.formatMessage(messages.replyConfirm),
+          onConfirm: this._performReply,
+        }));
+      } else {
+        this._performReply();
+      }
     } else {
-      this._performReply();
+      dispatch(openModal('INTERACTION', {
+        type: 'reply',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   };
 
   handleFavouriteClick = () => {
     const { dispatch, status } = this.props;
+    const { signedIn } = this.context.identity;
 
-    if (status.get('favourited')) {
-      dispatch(unfavourite(status));
+    if (signedIn) {
+      if (status.get('favourited')) {
+        dispatch(unfavourite(status));
+      } else {
+        dispatch(favourite(status));
+      }
     } else {
-      dispatch(favourite(status));
+      dispatch(openModal('INTERACTION', {
+        type: 'favourite',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   };
 
@@ -97,13 +116,22 @@ class Footer extends ImmutablePureComponent {
 
   handleReblogClick = e => {
     const { dispatch, status } = this.props;
+    const { signedIn } = this.context.identity;
 
-    if (status.get('reblogged')) {
-      dispatch(unreblog(status));
-    } else if ((e && e.shiftKey) || !boostModal) {
-      this._performReblog(status);
+    if (signedIn) {
+      if (status.get('reblogged')) {
+        dispatch(unreblog(status));
+      } else if ((e && e.shiftKey) || !boostModal) {
+        this._performReblog(status);
+      } else {
+        dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+      }
     } else {
-      dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+      dispatch(openModal('INTERACTION', {
+        type: 'reblog',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   };
 
@@ -154,9 +182,9 @@ class Footer extends ImmutablePureComponent {
     return (
       <div className='picture-in-picture__footer'>
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
-        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
-        {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} />}
+        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
+        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
+        {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} />}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.js b/app/javascript/mastodon/features/pinned_statuses/index.js
index f32bd6d23..c6790ea06 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.js
+++ b/app/javascript/mastodon/features/pinned_statuses/index.js
@@ -8,9 +8,10 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import StatusList from '../../components/status_list';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
-  heading: { id: 'column.pins', defaultMessage: 'Pinned toot' },
+  heading: { id: 'column.pins', defaultMessage: 'Pinned post' },
 });
 
 const mapStateToProps = state => ({
@@ -54,6 +55,9 @@ class PinnedStatuses extends ImmutablePureComponent {
           hasMore={hasMore}
           bindToDocument={!multiColumn}
         />
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/privacy_policy/index.js b/app/javascript/mastodon/features/privacy_policy/index.js
new file mode 100644
index 000000000..3df487e8f
--- /dev/null
+++ b/app/javascript/mastodon/features/privacy_policy/index.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Helmet } from 'react-helmet';
+import { FormattedMessage, FormattedDate, injectIntl, defineMessages } from 'react-intl';
+import Column from 'mastodon/components/column';
+import api from 'mastodon/api';
+import Skeleton from 'mastodon/components/skeleton';
+
+const messages = defineMessages({
+  title: { id: 'privacy_policy.title', defaultMessage: 'Privacy Policy' },
+});
+
+export default @injectIntl
+class PrivacyPolicy extends React.PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object,
+    multiColumn: PropTypes.bool,
+  };
+
+  state = {
+    content: null,
+    lastUpdated: null,
+    isLoading: true,
+  };
+
+  componentDidMount () {
+    api().get('/api/v1/instance/privacy_policy').then(({ data }) => {
+      this.setState({ content: data.content, lastUpdated: data.updated_at, isLoading: false });
+    }).catch(() => {
+      this.setState({ isLoading: false });
+    });
+  }
+
+  render () {
+    const { intl, multiColumn } = this.props;
+    const { isLoading, content, lastUpdated } = this.state;
+
+    return (
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.title)}>
+        <div className='scrollable privacy-policy'>
+          <div className='column-title'>
+            <h3><FormattedMessage id='privacy_policy.title' defaultMessage='Privacy Policy' /></h3>
+            <p><FormattedMessage id='privacy_policy.last_updated' defaultMessage='Last updated {date}' values={{ date: isLoading ? <Skeleton width='10ch' /> : <FormattedDate value={lastUpdated} year='numeric' month='short' day='2-digit' /> }} /></p>
+          </div>
+
+          <div
+            className='privacy-policy__body prose'
+            dangerouslySetInnerHTML={{ __html: content }}
+          />
+        </div>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='all' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index b1d5518af..a41be07e1 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -9,6 +9,8 @@ import { expandPublicTimeline } from '../../actions/timelines';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import { connectPublicStream } from '../../actions/streaming';
+import { Helmet } from 'react-helmet';
+import DismissableBanner from 'mastodon/components/dismissable_banner';
 
 const messages = defineMessages({
   title: { id: 'column.public', defaultMessage: 'Federated timeline' },
@@ -35,6 +37,7 @@ class PublicTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static defaultProps = {
@@ -72,18 +75,30 @@ class PublicTimeline extends React.PureComponent {
 
   componentDidMount () {
     const { dispatch, onlyMedia, onlyRemote } = this.props;
+    const { signedIn } = this.context.identity;
 
     dispatch(expandPublicTimeline({ onlyMedia, onlyRemote }));
-    this.disconnect = dispatch(connectPublicStream({ onlyMedia, onlyRemote }));
+
+    if (signedIn) {
+      this.disconnect = dispatch(connectPublicStream({ onlyMedia, onlyRemote }));
+    }
   }
 
   componentDidUpdate (prevProps) {
+    const { signedIn } = this.context.identity;
+
     if (prevProps.onlyMedia !== this.props.onlyMedia || prevProps.onlyRemote !== this.props.onlyRemote) {
       const { dispatch, onlyMedia, onlyRemote } = this.props;
 
-      this.disconnect();
+      if (this.disconnect) {
+        this.disconnect();
+      }
+
       dispatch(expandPublicTimeline({ onlyMedia, onlyRemote }));
-      this.disconnect = dispatch(connectPublicStream({ onlyMedia, onlyRemote }));
+
+      if (signedIn) {
+        this.disconnect = dispatch(connectPublicStream({ onlyMedia, onlyRemote }));
+      }
     }
   }
 
@@ -123,6 +138,10 @@ class PublicTimeline extends React.PureComponent {
           <ColumnSettingsContainer columnId={columnId} />
         </ColumnHeader>
 
+        <DismissableBanner id='public_timeline'>
+          <FormattedMessage id='dismissable_banner.public_timeline' defaultMessage='These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.' />
+        </DismissableBanner>
+
         <StatusListContainer
           timelineId={`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`}
           onLoadMore={this.handleLoadMore}
@@ -131,6 +150,11 @@ class PublicTimeline extends React.PureComponent {
           emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other servers to fill it up' />}
           bindToDocument={!multiColumn}
         />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.title)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 0fbd09415..36ca11d1a 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -11,6 +11,7 @@ import Column from '../ui/components/column';
 import ScrollableList from '../../components/scrollable_list';
 import Icon from 'mastodon/components/icon';
 import ColumnHeader from '../../components/column_header';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   refresh: { id: 'refresh', defaultMessage: 'Refresh' },
@@ -59,7 +60,7 @@ class Reblogs extends ImmutablePureComponent {
       );
     }
 
-    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this toot yet. When someone does, they will show up here.' />;
+    const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has boosted this post yet. When someone does, they will show up here.' />;
 
     return (
       <Column bindToDocument={!multiColumn}>
@@ -67,7 +68,7 @@ class Reblogs extends ImmutablePureComponent {
           showBackButton
           multiColumn={multiColumn}
           extraButton={(
-            <button className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
           )}
         />
 
@@ -80,6 +81,10 @@ class Reblogs extends ImmutablePureComponent {
             <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/report/category.js b/app/javascript/mastodon/features/report/category.js
new file mode 100644
index 000000000..c6c0a506f
--- /dev/null
+++ b/app/javascript/mastodon/features/report/category.js
@@ -0,0 +1,106 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import Option from './components/option';
+import { List as ImmutableList } from 'immutable';
+
+const messages = defineMessages({
+  dislike: { id: 'report.reasons.dislike', defaultMessage: 'I don\'t like it' },
+  dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' },
+  spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' },
+  spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetitive replies' },
+  violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' },
+  violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
+  other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },
+  other_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' },
+  status: { id: 'report.category.title_status', defaultMessage: 'post' },
+  account: { id: 'report.category.title_account', defaultMessage: 'profile' },
+});
+
+const mapStateToProps = state => ({
+  rules: state.getIn(['server', 'server', 'rules'], ImmutableList()),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Category extends React.PureComponent {
+
+  static propTypes = {
+    onNextStep: PropTypes.func.isRequired,
+    rules: ImmutablePropTypes.list,
+    category: PropTypes.string,
+    onChangeCategory: PropTypes.func.isRequired,
+    startedFrom: PropTypes.oneOf(['status', 'account']),
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleNextClick = () => {
+    const { onNextStep, category } = this.props;
+
+    switch(category) {
+    case 'dislike':
+      onNextStep('thanks');
+      break;
+    case 'violation':
+      onNextStep('rules');
+      break;
+    default:
+      onNextStep('statuses');
+      break;
+    }
+  };
+
+  handleCategoryToggle = (value, checked) => {
+    const { onChangeCategory } = this.props;
+
+    if (checked) {
+      onChangeCategory(value);
+    }
+  };
+
+  render () {
+    const { category, startedFrom, rules, intl } = this.props;
+
+    const options = rules.size > 0 ? [
+      'dislike',
+      'spam',
+      'violation',
+      'other',
+    ] : [
+      'dislike',
+      'spam',
+      'other',
+    ];
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='report.category.title' defaultMessage="Tell us what's going on with this {type}" values={{ type: intl.formatMessage(messages[startedFrom]) }} /></h3>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='report.category.subtitle' defaultMessage='Choose the best match' /></p>
+
+        <div>
+          {options.map(item => (
+            <Option
+              key={item}
+              name='category'
+              value={item}
+              checked={category === item}
+              onToggle={this.handleCategoryToggle}
+              label={intl.formatMessage(messages[item])}
+              description={intl.formatMessage(messages[`${item}_description`])}
+            />
+          ))}
+        </div>
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleNextClick} disabled={category === null}><FormattedMessage id='report.next' defaultMessage='Next' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/report/comment.js b/app/javascript/mastodon/features/report/comment.js
new file mode 100644
index 000000000..cde156415
--- /dev/null
+++ b/app/javascript/mastodon/features/report/comment.js
@@ -0,0 +1,83 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import Toggle from 'react-toggle';
+
+const messages = defineMessages({
+  placeholder: { id: 'report.placeholder', defaultMessage: 'Type or paste additional comments' },
+});
+
+export default @injectIntl
+class Comment extends React.PureComponent {
+
+  static propTypes = {
+    onSubmit: PropTypes.func.isRequired,
+    comment: PropTypes.string.isRequired,
+    onChangeComment: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    isSubmitting: PropTypes.bool,
+    forward: PropTypes.bool,
+    isRemote: PropTypes.bool,
+    domain: PropTypes.string,
+    onChangeForward: PropTypes.func.isRequired,
+  };
+
+  handleClick = () => {
+    const { onSubmit } = this.props;
+    onSubmit();
+  };
+
+  handleChange = e => {
+    const { onChangeComment } = this.props;
+    onChangeComment(e.target.value);
+  };
+
+  handleKeyDown = e => {
+    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
+      this.handleClick();
+    }
+  };
+
+  handleForwardChange = e => {
+    const { onChangeForward } = this.props;
+    onChangeForward(e.target.checked);
+  };
+
+  render () {
+    const { comment, isRemote, forward, domain, isSubmitting, intl } = this.props;
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='report.comment.title' defaultMessage='Is there anything else you think we should know?' /></h3>
+
+        <textarea
+          className='report-dialog-modal__textarea'
+          placeholder={intl.formatMessage(messages.placeholder)}
+          value={comment}
+          onChange={this.handleChange}
+          onKeyDown={this.handleKeyDown}
+          disabled={isSubmitting}
+        />
+
+        {isRemote && (
+          <React.Fragment>
+            <p className='report-dialog-modal__lead'><FormattedMessage id='report.forward_hint' defaultMessage='The account is from another server. Send an anonymized copy of the report there as well?' /></p>
+
+            <label className='report-dialog-modal__toggle'>
+              <Toggle checked={forward} disabled={isSubmitting} onChange={this.handleForwardChange} />
+              <FormattedMessage id='report.forward' defaultMessage='Forward to {target}' values={{ target: domain }} />
+            </label>
+          </React.Fragment>
+        )}
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleClick} disabled={isSubmitting}><FormattedMessage id='report.submit' defaultMessage='Submit report' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/report/components/option.js b/app/javascript/mastodon/features/report/components/option.js
new file mode 100644
index 000000000..744d85268
--- /dev/null
+++ b/app/javascript/mastodon/features/report/components/option.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import Check from 'mastodon/components/check';
+
+export default class Option extends React.PureComponent {
+
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired,
+    checked: PropTypes.bool,
+    label: PropTypes.node,
+    description: PropTypes.node,
+    onToggle: PropTypes.func,
+    multiple: PropTypes.bool,
+    labelComponent: PropTypes.node,
+  };
+
+  handleKeyPress = e => {
+    const { value, checked, onToggle } = this.props;
+
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.stopPropagation();
+      e.preventDefault();
+      onToggle(value, !checked);
+    }
+  }
+
+  handleChange = e => {
+    const { value, onToggle } = this.props;
+    onToggle(value, e.target.checked);
+  }
+
+  render () {
+    const { name, value, checked, label, labelComponent, description, multiple } = this.props;
+
+    return (
+      <label className='dialog-option poll__option selectable'>
+        <input type={multiple ? 'checkbox' : 'radio'} name={name} value={value} checked={checked} onChange={this.handleChange} />
+
+        <span
+          className={classNames('poll__input', { active: checked, checkbox: multiple })}
+          tabIndex='0'
+          role='radio'
+          onKeyPress={this.handleKeyPress}
+          aria-checked={checked}
+          aria-label={label}
+        >{checked && <Check />}</span>
+
+        {labelComponent ? labelComponent : (
+          <span className='poll__option__text'>
+            <strong>{label}</strong>
+            {description}
+          </span>
+        )}
+      </label>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/report/components/status_check_box.js b/app/javascript/mastodon/features/report/components/status_check_box.js
index c29e517da..5366da90b 100644
--- a/app/javascript/mastodon/features/report/components/status_check_box.js
+++ b/app/javascript/mastodon/features/report/components/status_check_box.js
@@ -1,72 +1,81 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import Toggle from 'react-toggle';
-import noop from 'lodash/noop';
-import StatusContent from '../../../components/status_content';
-import { MediaGallery, Video } from '../../ui/util/async-components';
-import Bundle from '../../ui/components/bundle';
+import StatusContent from 'mastodon/components/status_content';
+import Avatar from 'mastodon/components/avatar';
+import DisplayName from 'mastodon/components/display_name';
+import RelativeTimestamp from 'mastodon/components/relative_timestamp';
+import Option from './option';
+import MediaAttachments from 'mastodon/components/media_attachments';
+import { injectIntl, defineMessages } from 'react-intl';
+import Icon from 'mastodon/components/icon';
 
-export default class StatusCheckBox extends React.PureComponent {
+const messages = defineMessages({
+  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+});
+
+export default @injectIntl
+class StatusCheckBox extends React.PureComponent {
 
   static propTypes = {
+    id: PropTypes.string.isRequired,
     status: ImmutablePropTypes.map.isRequired,
     checked: PropTypes.bool,
     onToggle: PropTypes.func.isRequired,
-    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleStatusesToggle = (value, checked) => {
+    const { onToggle } = this.props;
+    onToggle(value, checked);
   };
 
   render () {
-    const { status, checked, onToggle, disabled } = this.props;
-    let media = null;
+    const { status, checked, intl } = this.props;
 
     if (status.get('reblog')) {
       return null;
     }
 
-    if (status.get('media_attachments').size > 0) {
-      if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
+    const visibilityIconInfo = {
+      'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
+      'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
+      'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
+    };
 
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        const video = status.getIn(['media_attachments', 0]);
+    const visibilityIcon = visibilityIconInfo[status.get('visibility')];
 
-        media = (
-          <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
-            {Component => (
-              <Component
-                preview={video.get('preview_url')}
-                blurhash={video.get('blurhash')}
-                src={video.get('url')}
-                alt={video.get('description')}
-                width={239}
-                height={110}
-                inline
-                sensitive={status.get('sensitive')}
-                onOpenVideo={noop}
-              />
-            )}
-          </Bundle>
-        );
-      } else {
-        media = (
-          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} >
-            {Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={noop} />}
-          </Bundle>
-        );
-      }
-    }
+    const labelComponent = (
+      <div className='status-check-box__status poll__option__text'>
+        <div className='detailed-status__display-name'>
+          <div className='detailed-status__display-avatar'>
+            <Avatar account={status.get('account')} size={46} />
+          </div>
+
+          <div>
+            <DisplayName account={status.get('account')} /> · <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span> <RelativeTimestamp timestamp={status.get('created_at')} />
+          </div>
+        </div>
+
+        <StatusContent status={status} />
+        <MediaAttachments status={status} />
+      </div>
+    );
 
     return (
-      <div className='status-check-box'>
-        <div className='status-check-box__status'>
-          <StatusContent status={status} />
-          {media}
-        </div>
-
-        <div className='status-check-box-toggle'>
-          <Toggle checked={checked} onChange={onToggle} disabled={disabled} />
-        </div>
-      </div>
+      <Option
+        name='status_ids'
+        value={status.get('id')}
+        checked={checked}
+        onToggle={this.handleStatusesToggle}
+        label={status.get('search_index')}
+        labelComponent={labelComponent}
+        multiple
+      />
     );
   }
 
diff --git a/app/javascript/mastodon/features/report/containers/status_check_box_container.js b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
index 48cd0319b..65a7c11fd 100644
--- a/app/javascript/mastodon/features/report/containers/status_check_box_container.js
+++ b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
@@ -1,19 +1,15 @@
 import { connect } from 'react-redux';
 import StatusCheckBox from '../components/status_check_box';
-import { toggleStatusReport } from '../../../actions/reports';
-import { Set as ImmutableSet } from 'immutable';
+import { makeGetStatus } from 'mastodon/selectors';
 
-const mapStateToProps = (state, { id }) => ({
-  status: state.getIn(['statuses', id]),
-  checked: state.getIn(['reports', 'new', 'status_ids'], ImmutableSet()).includes(id),
-});
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
 
-const mapDispatchToProps = (dispatch, { id }) => ({
+  const mapStateToProps = (state, { id }) => ({
+    status: getStatus(state, { id }),
+  });
 
-  onToggle (e) {
-    dispatch(toggleStatusReport(id, e.target.checked));
-  },
+  return mapStateToProps;
+};
 
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(StatusCheckBox);
+export default connect(makeMapStateToProps)(StatusCheckBox);
diff --git a/app/javascript/mastodon/features/report/rules.js b/app/javascript/mastodon/features/report/rules.js
new file mode 100644
index 000000000..920da68d6
--- /dev/null
+++ b/app/javascript/mastodon/features/report/rules.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import Option from './components/option';
+
+const mapStateToProps = state => ({
+  rules: state.getIn(['server', 'server', 'rules']),
+});
+
+export default @connect(mapStateToProps)
+class Rules extends React.PureComponent {
+
+  static propTypes = {
+    onNextStep: PropTypes.func.isRequired,
+    rules: ImmutablePropTypes.list,
+    selectedRuleIds: ImmutablePropTypes.set.isRequired,
+    onToggle: PropTypes.func.isRequired,
+  };
+
+  handleNextClick = () => {
+    const { onNextStep } = this.props;
+    onNextStep('statuses');
+  };
+
+  handleRulesToggle = (value, checked) => {
+    const { onToggle } = this.props;
+    onToggle(value, checked);
+  };
+
+  render () {
+    const { rules, selectedRuleIds } = this.props;
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='report.rules.title' defaultMessage='Which rules are being violated?' /></h3>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='report.rules.subtitle' defaultMessage='Select all that apply' /></p>
+
+        <div>
+          {rules.map(item => (
+            <Option
+              key={item.get('id')}
+              name='rule_ids'
+              value={item.get('id')}
+              checked={selectedRuleIds.includes(item.get('id'))}
+              onToggle={this.handleRulesToggle}
+              label={item.get('text')}
+              multiple
+            />
+          ))}
+        </div>
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleNextClick} disabled={selectedRuleIds.size < 1}><FormattedMessage id='report.next' defaultMessage='Next' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/report/statuses.js b/app/javascript/mastodon/features/report/statuses.js
new file mode 100644
index 000000000..d5d86034f
--- /dev/null
+++ b/app/javascript/mastodon/features/report/statuses.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import StatusCheckBox from 'mastodon/features/report/containers/status_check_box_container';
+import { OrderedSet } from 'immutable';
+import { FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
+
+const mapStateToProps = (state, { accountId }) => ({
+  availableStatusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])),
+  isLoading: state.getIn(['timelines', `account:${accountId}:with_replies`, 'isLoading']),
+});
+
+export default @connect(mapStateToProps)
+class Statuses extends React.PureComponent {
+
+  static propTypes = {
+    onNextStep: PropTypes.func.isRequired,
+    accountId: PropTypes.string.isRequired,
+    availableStatusIds: ImmutablePropTypes.set.isRequired,
+    selectedStatusIds: ImmutablePropTypes.set.isRequired,
+    isLoading: PropTypes.bool,
+    onToggle: PropTypes.func.isRequired,
+  };
+
+  handleNextClick = () => {
+    const { onNextStep } = this.props;
+    onNextStep('comment');
+  };
+
+  render () {
+    const { availableStatusIds, selectedStatusIds, onToggle, isLoading } = this.props;
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'><FormattedMessage id='report.statuses.title' defaultMessage='Are there any posts that back up this report?' /></h3>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='report.statuses.subtitle' defaultMessage='Select all that apply' /></p>
+
+        <div className='report-dialog-modal__statuses'>
+          {isLoading ? <LoadingIndicator /> : availableStatusIds.union(selectedStatusIds).map(statusId => (
+            <StatusCheckBox
+              id={statusId}
+              key={statusId}
+              checked={selectedStatusIds.includes(statusId)}
+              onToggle={onToggle}
+            />
+          ))}
+        </div>
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleNextClick}><FormattedMessage id='report.next' defaultMessage='Next' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/report/thanks.js b/app/javascript/mastodon/features/report/thanks.js
new file mode 100644
index 000000000..d169b1e32
--- /dev/null
+++ b/app/javascript/mastodon/features/report/thanks.js
@@ -0,0 +1,84 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+import { connect } from 'react-redux';
+import {
+  unfollowAccount,
+  muteAccount,
+  blockAccount,
+} from 'mastodon/actions/accounts';
+
+const mapStateToProps = () => ({});
+
+export default @connect(mapStateToProps)
+class Thanks extends React.PureComponent {
+
+  static propTypes = {
+    submitted: PropTypes.bool,
+    onClose: PropTypes.func.isRequired,
+    account: ImmutablePropTypes.map.isRequired,
+    dispatch: PropTypes.func.isRequired,
+  };
+
+  handleCloseClick = () => {
+    const { onClose } = this.props;
+    onClose();
+  };
+
+  handleUnfollowClick = () => {
+    const { dispatch, account, onClose } = this.props;
+    dispatch(unfollowAccount(account.get('id')));
+    onClose();
+  };
+
+  handleMuteClick = () => {
+    const { dispatch, account, onClose } = this.props;
+    dispatch(muteAccount(account.get('id')));
+    onClose();
+  };
+
+  handleBlockClick = () => {
+    const { dispatch, account, onClose } = this.props;
+    dispatch(blockAccount(account.get('id')));
+    onClose();
+  };
+
+  render () {
+    const { account, submitted } = this.props;
+
+    return (
+      <React.Fragment>
+        <h3 className='report-dialog-modal__title'>{submitted ? <FormattedMessage id='report.thanks.title_actionable' defaultMessage="Thanks for reporting, we'll look into this." /> : <FormattedMessage id='report.thanks.title' defaultMessage="Don't want to see this?" />}</h3>
+        <p className='report-dialog-modal__lead'>{submitted ? <FormattedMessage id='report.thanks.take_action_actionable' defaultMessage='While we review this, you can take action against @{name}:' values={{ name: account.get('username') }} /> : <FormattedMessage id='report.thanks.take_action' defaultMessage='Here are your options for controlling what you see on Mastodon:' />}</p>
+
+        {account.getIn(['relationship', 'following']) && (
+          <React.Fragment>
+            <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='report.unfollow' defaultMessage='Unfollow @{name}' values={{ name: account.get('username') }} /></h4>
+            <p className='report-dialog-modal__lead'><FormattedMessage id='report.unfollow_explanation' defaultMessage='You are following this account. To not see their posts in your home feed anymore, unfollow them.' /></p>
+            <Button secondary onClick={this.handleUnfollowClick}><FormattedMessage id='account.unfollow' defaultMessage='Unfollow' /></Button>
+            <hr />
+          </React.Fragment>
+        )}
+
+        <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='account.mute' defaultMessage='Mute @{name}' values={{ name: account.get('username') }} /></h4>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='report.mute_explanation' defaultMessage='You will not see their posts. They can still follow you and see your posts and will not know that they are muted.' /></p>
+        <Button secondary onClick={this.handleMuteClick}>{!account.getIn(['relationship', 'muting']) ? <FormattedMessage id='report.mute' defaultMessage='Mute' /> : <FormattedMessage id='account.muted' defaultMessage='Muted' />}</Button>
+
+        <hr />
+
+        <h4 className='report-dialog-modal__subtitle'><FormattedMessage id='account.block' defaultMessage='Block @{name}' values={{ name: account.get('username') }} /></h4>
+        <p className='report-dialog-modal__lead'><FormattedMessage id='report.block_explanation' defaultMessage='You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.' /></p>
+        <Button secondary onClick={this.handleBlockClick}>{!account.getIn(['relationship', 'blocking']) ? <FormattedMessage id='report.block' defaultMessage='Block' /> : <FormattedMessage id='account.blocked' defaultMessage='Blocked' />}</Button>
+
+        <div className='flex-spacer' />
+
+        <div className='report-dialog-modal__actions'>
+          <Button onClick={this.handleCloseClick}><FormattedMessage id='report.close' defaultMessage='Done' /></Button>
+        </div>
+      </React.Fragment>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/search/index.js b/app/javascript/mastodon/features/search/index.js
deleted file mode 100644
index 76bf70d4b..000000000
--- a/app/javascript/mastodon/features/search/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import SearchContainer from 'mastodon/features/compose/containers/search_container';
-import SearchResultsContainer from 'mastodon/features/compose/containers/search_results_container';
-
-const Search = () => (
-  <div className='column search-page'>
-    <SearchContainer />
-
-    <div className='drawer__pager'>
-      <div className='drawer__inner darker'>
-        <SearchResultsContainer />
-      </div>
-    </div>
-  </div>
-);
-
-export default Search;
diff --git a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
deleted file mode 100644
index d3d8a6507..000000000
--- a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { expandHashtagTimeline } from 'mastodon/actions/timelines';
-import Masonry from 'react-masonry-infinite';
-import { List as ImmutableList } from 'immutable';
-import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container';
-import { debounce } from 'lodash';
-import LoadingIndicator from 'mastodon/components/loading_indicator';
-
-const mapStateToProps = (state, { hashtag }) => ({
-  statusIds: state.getIn(['timelines', `hashtag:${hashtag}`, 'items'], ImmutableList()),
-  isLoading: state.getIn(['timelines', `hashtag:${hashtag}`, 'isLoading'], false),
-  hasMore: state.getIn(['timelines', `hashtag:${hashtag}`, 'hasMore'], false),
-});
-
-export default @connect(mapStateToProps)
-class HashtagTimeline extends React.PureComponent {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    statusIds: ImmutablePropTypes.list.isRequired,
-    isLoading: PropTypes.bool.isRequired,
-    hasMore: PropTypes.bool.isRequired,
-    hashtag: PropTypes.string.isRequired,
-    local: PropTypes.bool.isRequired,
-  };
-
-  static defaultProps = {
-    local: false,
-  };
-
-  componentDidMount () {
-    const { dispatch, hashtag, local } = this.props;
-
-    dispatch(expandHashtagTimeline(hashtag, { local }));
-  }
-
-  handleLoadMore = () => {
-    const { dispatch, hashtag, local, statusIds } = this.props;
-    const maxId = statusIds.last();
-
-    if (maxId) {
-      dispatch(expandHashtagTimeline(hashtag, { maxId, local }));
-    }
-  }
-
-  setRef = c => {
-    this.masonry = c;
-  }
-
-  handleHeightChange = debounce(() => {
-    if (!this.masonry) {
-      return;
-    }
-
-    this.masonry.forcePack();
-  }, 50)
-
-  render () {
-    const { statusIds, hasMore, isLoading } = this.props;
-
-    const sizes = [
-      { columns: 1, gutter: 0 },
-      { mq: '415px', columns: 1, gutter: 10 },
-      { mq: '640px', columns: 2, gutter: 10 },
-      { mq: '960px', columns: 3, gutter: 10 },
-      { mq: '1255px', columns: 3, gutter: 10 },
-    ];
-
-    const loader = (isLoading && statusIds.isEmpty()) ? <LoadingIndicator key={0} /> : undefined;
-
-    return (
-      <Masonry ref={this.setRef} className='statuses-grid' hasMore={hasMore} loadMore={this.handleLoadMore} sizes={sizes} loader={loader}>
-        {statusIds.map(statusId => (
-          <div className='statuses-grid__item' key={statusId}>
-            <DetailedStatusContainer
-              id={statusId}
-              compact
-              measureHeight
-              onHeightChange={this.handleHeightChange}
-            />
-          </div>
-        )).toArray()}
-      </Masonry>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/standalone/public_timeline/index.js b/app/javascript/mastodon/features/standalone/public_timeline/index.js
deleted file mode 100644
index 19b0b14be..000000000
--- a/app/javascript/mastodon/features/standalone/public_timeline/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines';
-import Masonry from 'react-masonry-infinite';
-import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
-import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container';
-import { debounce } from 'lodash';
-import LoadingIndicator from 'mastodon/components/loading_indicator';
-
-const mapStateToProps = (state, { local }) => {
-  const timeline = state.getIn(['timelines', local ? 'community' : 'public'], ImmutableMap());
-
-  return {
-    statusIds: timeline.get('items', ImmutableList()),
-    isLoading: timeline.get('isLoading', false),
-    hasMore: timeline.get('hasMore', false),
-  };
-};
-
-export default @connect(mapStateToProps)
-class PublicTimeline extends React.PureComponent {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    statusIds: ImmutablePropTypes.list.isRequired,
-    isLoading: PropTypes.bool.isRequired,
-    hasMore: PropTypes.bool.isRequired,
-    local: PropTypes.bool,
-  };
-
-  componentDidMount () {
-    this._connect();
-  }
-
-  componentDidUpdate (prevProps) {
-    if (prevProps.local !== this.props.local) {
-      this._connect();
-    }
-  }
-
-  _connect () {
-    const { dispatch, local } = this.props;
-
-    dispatch(local ? expandCommunityTimeline() : expandPublicTimeline());
-  }
-
-  handleLoadMore = () => {
-    const { dispatch, statusIds, local } = this.props;
-    const maxId = statusIds.last();
-
-    if (maxId) {
-      dispatch(local ? expandCommunityTimeline({ maxId }) : expandPublicTimeline({ maxId }));
-    }
-  }
-
-  setRef = c => {
-    this.masonry = c;
-  }
-
-  handleHeightChange = debounce(() => {
-    if (!this.masonry) {
-      return;
-    }
-
-    this.masonry.forcePack();
-  }, 50)
-
-  render () {
-    const { statusIds, hasMore, isLoading } = this.props;
-
-    const sizes = [
-      { columns: 1, gutter: 0 },
-      { mq: '415px', columns: 1, gutter: 10 },
-      { mq: '640px', columns: 2, gutter: 10 },
-      { mq: '960px', columns: 3, gutter: 10 },
-      { mq: '1255px', columns: 3, gutter: 10 },
-    ];
-
-    const loader = (isLoading && statusIds.isEmpty()) ? <LoadingIndicator key={0} /> : undefined;
-
-    return (
-      <Masonry ref={this.setRef} className='statuses-grid' hasMore={hasMore} loadMore={this.handleLoadMore} sizes={sizes} loader={loader}>
-        {statusIds.map(statusId => (
-          <div className='statuses-grid__item' key={statusId}>
-            <DetailedStatusContainer
-              id={statusId}
-              compact
-              measureHeight
-              onHeightChange={this.handleHeightChange}
-            />
-          </div>
-        )).toArray()}
-      </Masonry>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index ffa2510c0..c1242754c 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -5,12 +5,14 @@ import IconButton from '../../../components/icon_button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
-import { me, isStaff } from '../../../initial_state';
+import { me } from '../../../initial_state';
 import classNames from 'classnames';
+import { PERMISSION_MANAGE_USERS } from 'mastodon/permissions';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
+  edit: { id: 'status.edit', defaultMessage: 'Edit' },
   direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
@@ -37,6 +39,7 @@ const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
+  openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
 });
 
 const mapStateToProps = (state, { status }) => ({
@@ -49,6 +52,7 @@ class ActionBar extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
@@ -59,6 +63,7 @@ class ActionBar extends React.PureComponent {
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
+    onEdit: PropTypes.func.isRequired,
     onDirect: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
     onMute: PropTypes.func,
@@ -98,6 +103,10 @@ class ActionBar extends React.PureComponent {
     this.props.onDelete(this.props.status, this.context.router.history, true);
   }
 
+  handleEditClick = () => {
+    this.props.onEdit(this.props.status, this.context.router.history);
+  }
+
   handleDirectClick = () => {
     this.props.onDirect(this.props.status.get('account'), this.context.router.history);
   }
@@ -166,53 +175,46 @@ class ActionBar extends React.PureComponent {
   }
 
   handleCopy = () => {
-    const url      = this.props.status.get('url');
-    const textarea = document.createElement('textarea');
-
-    textarea.textContent    = url;
-    textarea.style.position = 'fixed';
-
-    document.body.appendChild(textarea);
-
-    try {
-      textarea.select();
-      document.execCommand('copy');
-    } catch (e) {
-
-    } finally {
-      document.body.removeChild(textarea);
-    }
+    const url = this.props.status.get('url');
+    navigator.clipboard.writeText(url);
   }
 
   render () {
     const { status, relationship, intl } = this.props;
+    const { signedIn, permissions } = this.context.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
+    const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
     const mutingConversation = status.get('muted');
     const account            = status.get('account');
     const writtenByMe        = status.getIn(['account', 'id']) === me;
+    const isRemote           = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
 
     let menu = [];
 
     if (publicStatus) {
+      if (isRemote) {
+        menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
+      }
+
       menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
       menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
       menu.push(null);
     }
 
     if (writtenByMe) {
-      if (publicStatus) {
+      if (pinnableStatus) {
         menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
         menu.push(null);
       }
 
       menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
       menu.push(null);
+      menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
       menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
       menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
-      menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick });
       menu.push(null);
 
       if (relationship && relationship.get('muting')) {
@@ -241,7 +243,7 @@ class ActionBar extends React.PureComponent {
         }
       }
 
-      if (isStaff) {
+      if ((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
         menu.push(null);
         menu.push({ text: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }), href: `/admin/accounts/${status.getIn(['account', 'id'])}` });
         menu.push({ text: intl.formatMessage(messages.admin_status), href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses/${status.get('id')}` });
@@ -277,11 +279,12 @@ class ActionBar extends React.PureComponent {
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
+
         {shareButton}
-        <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>
-          <DropdownMenuContainer size={18} icon='ellipsis-h' status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
+          <DropdownMenuContainer size={18} icon='ellipsis-h' disabled={!signedIn} status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 90f9ae7ae..82537dd5d 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -32,7 +32,7 @@ const trim = (text, len) => {
     return text;
   }
 
-  return text.substring(0, cut) + (text.length > len ? '…' : '');
+  return text.slice(0, cut) + (text.length > len ? '…' : '');
 };
 
 const domParser = new DOMParser();
@@ -247,7 +247,7 @@ export default class Card extends React.PureComponent {
             {revealed && (
               <div className='status-card__actions'>
                 <div>
-                  <button onClick={this.handleEmbedClick}><Icon id={iconVariant} /></button>
+                  <button type='button' onClick={this.handleEmbedClick}><Icon id={iconVariant} /></button>
                   {horizontal && <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' /></a>}
                 </div>
               </div>
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 72ddeb2b2..c62910e0e 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -16,6 +16,7 @@ import classNames from 'classnames';
 import Icon from 'mastodon/components/icon';
 import AnimatedNumber from 'mastodon/components/animated_number';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
+import EditedTimestamp from 'mastodon/components/edited_timestamp';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
@@ -36,6 +37,7 @@ class DetailedStatus extends ImmutablePureComponent {
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
+    onTranslate: PropTypes.func.isRequired,
     measureHeight: PropTypes.bool,
     onHeightChange: PropTypes.func,
     domain: PropTypes.string.isRequired,
@@ -102,6 +104,11 @@ class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
+  handleTranslate = () => {
+    const { onTranslate, status } = this.props;
+    onTranslate(status);
+  }
+
   render () {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
@@ -116,6 +123,7 @@ class DetailedStatus extends ImmutablePureComponent {
     let reblogLink = '';
     let reblogIcon = 'retweet';
     let favouriteLink = '';
+    let edited = '';
 
     if (this.props.measureHeight) {
       outerStyle.height = `${this.state.height}px`;
@@ -136,7 +144,11 @@ class DetailedStatus extends ImmutablePureComponent {
             backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
             foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
             accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+            sensitive={status.get('sensitive')}
+            visible={this.props.showMedia}
+            blurhash={attachment.get('blurhash')}
             height={150}
+            onToggleVisibility={this.props.onToggleMediaVisibility}
           />
         );
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
@@ -183,7 +195,7 @@ class DetailedStatus extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
@@ -237,22 +249,36 @@ class DetailedStatus extends ImmutablePureComponent {
       );
     }
 
+    if (status.get('edited_at')) {
+      edited = (
+        <React.Fragment>
+          <React.Fragment> · </React.Fragment>
+          <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
+        </React.Fragment>
+      );
+    }
+
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })}>
-          <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
+          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='detailed-status__display-name'>
+            <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={46} /></div>
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>
 
-          <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
+          <StatusContent
+            status={status}
+            expanded={!status.get('hidden')}
+            onExpandedToggle={this.handleExpandedToggle}
+            onTranslate={this.handleTranslate}
+          />
 
           {media}
 
           <div className='detailed-status__meta'>
-            <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
+            <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
               <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-            </a>{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
+            </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index f342a3641..8a63cced2 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -7,6 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { createSelector } from 'reselect';
 import { fetchStatus } from '../../actions/statuses';
 import MissingIndicator from '../../components/missing_indicator';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
 import DetailedStatus from './components/detailed_status';
 import ActionBar from './components/action_bar';
 import Column from '../ui/components/column';
@@ -29,8 +30,11 @@ import {
   muteStatus,
   unmuteStatus,
   deleteStatus,
+  editStatus,
   hideStatus,
   revealStatus,
+  translateStatus,
+  undoStatusTranslation,
 } from '../../actions/statuses';
 import {
   unblockAccount,
@@ -57,6 +61,7 @@ import { boostModal, deleteModal } from '../../initial_state';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import Icon from 'mastodon/components/icon';
+import { Helmet } from 'react-helmet';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -141,6 +146,7 @@ const makeMapStateToProps = () => {
     }
 
     return {
+      isLoading: state.getIn(['statuses', props.params.statusId, 'isLoading']),
       status,
       ancestorsIds,
       descendantsIds,
@@ -153,18 +159,37 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
+const truncate = (str, num) => {
+  if (str.length > num) {
+    return str.slice(0, num) + '…';
+  } else {
+    return str;
+  }
+};
+
+const titleFromStatus = status => {
+  const displayName = status.getIn(['account', 'display_name']);
+  const username = status.getIn(['account', 'username']);
+  const prefix = displayName.trim().length === 0 ? username : displayName;
+  const text = status.get('search_index');
+
+  return `${prefix}: "${truncate(text, 30)}"`;
+};
+
 export default @injectIntl
 @connect(makeMapStateToProps)
 class Status extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
+    identity: PropTypes.object,
   };
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map,
+    isLoading: PropTypes.bool,
     ancestorsIds: ImmutablePropTypes.list,
     descendantsIds: ImmutablePropTypes.list,
     intl: PropTypes.object.isRequired,
@@ -197,6 +222,10 @@ class Status extends ImmutablePureComponent {
       this.props.dispatch(fetchStatus(nextProps.params.statusId));
     }
 
+    if (nextProps.params.statusId && nextProps.ancestorsIds.size > this.props.ancestorsIds.size) {
+      this._scrolledIntoView = false;
+    }
+
     if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
       this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
     }
@@ -207,10 +236,21 @@ class Status extends ImmutablePureComponent {
   }
 
   handleFavouriteClick = (status) => {
-    if (status.get('favourited')) {
-      this.props.dispatch(unfavourite(status));
+    const { dispatch } = this.props;
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
+      if (status.get('favourited')) {
+        dispatch(unfavourite(status));
+      } else {
+        dispatch(favourite(status));
+      }
     } else {
-      this.props.dispatch(favourite(status));
+      dispatch(openModal('INTERACTION', {
+        type: 'favourite',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   }
 
@@ -223,15 +263,25 @@ class Status extends ImmutablePureComponent {
   }
 
   handleReplyClick = (status) => {
-    let { askReplyConfirmation, dispatch, intl } = this.props;
-    if (askReplyConfirmation) {
-      dispatch(openModal('CONFIRM', {
-        message: intl.formatMessage(messages.replyMessage),
-        confirm: intl.formatMessage(messages.replyConfirm),
-        onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
-      }));
+    const { askReplyConfirmation, dispatch, intl } = this.props;
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
+      if (askReplyConfirmation) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.replyMessage),
+          confirm: intl.formatMessage(messages.replyConfirm),
+          onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
+        }));
+      } else {
+        dispatch(replyCompose(status, this.context.router.history));
+      }
     } else {
-      dispatch(replyCompose(status, this.context.router.history));
+      dispatch(openModal('INTERACTION', {
+        type: 'reply',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   }
 
@@ -240,14 +290,25 @@ class Status extends ImmutablePureComponent {
   }
 
   handleReblogClick = (status, e) => {
-    if (status.get('reblogged')) {
-      this.props.dispatch(unreblog(status));
-    } else {
-      if ((e && e.shiftKey) || !boostModal) {
-        this.handleModalReblog(status);
+    const { dispatch } = this.props;
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
+      if (status.get('reblogged')) {
+        dispatch(unreblog(status));
       } else {
-        this.props.dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+        if ((e && e.shiftKey) || !boostModal) {
+          this.handleModalReblog(status);
+        } else {
+          dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+        }
       }
+    } else {
+      dispatch(openModal('INTERACTION', {
+        type: 'reblog',
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('url'),
+      }));
     }
   }
 
@@ -273,6 +334,10 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleEditClick = (status, history) => {
+    this.props.dispatch(editStatus(status.get('id'), history));
+  }
+
   handleDirectClick = (account, router) => {
     this.props.dispatch(directCompose(account, router));
   }
@@ -334,6 +399,16 @@ class Status extends ImmutablePureComponent {
     }
   }
 
+  handleTranslate = status => {
+    const { dispatch } = this.props;
+
+    if (status.get('translation')) {
+      dispatch(undoStatusTranslation(status.get('id')));
+    } else {
+      dispatch(translateStatus(status.get('id')));
+    }
+  }
+
   handleBlockClick = (status) => {
     const { dispatch } = this.props;
     const account = status.get('account');
@@ -498,9 +573,17 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let ancestors, descendants;
-    const { status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
+    const { isLoading, status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
+    if (isLoading) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
     if (status === null) {
       return (
         <Column>
@@ -518,6 +601,9 @@ class Status extends ImmutablePureComponent {
       descendants = <div>{this.renderChildren(descendantsIds)}</div>;
     }
 
+    const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1;
+    const isIndexable = !status.getIn(['account', 'noindex']);
+
     const handlers = {
       moveUp: this.handleHotkeyMoveUp,
       moveDown: this.handleHotkeyMoveDown,
@@ -537,7 +623,7 @@ class Status extends ImmutablePureComponent {
           showBackButton
           multiColumn={multiColumn}
           extraButton={(
-            <button className='column-header__button' title={intl.formatMessage(status.get('hidden') ? messages.revealAll : messages.hideAll)} aria-label={intl.formatMessage(status.get('hidden') ? messages.revealAll : messages.hideAll)} onClick={this.handleToggleAll} aria-pressed={status.get('hidden') ? 'false' : 'true'}><Icon id={status.get('hidden') ? 'eye-slash' : 'eye'} /></button>
+            <button type='button' className='column-header__button' title={intl.formatMessage(status.get('hidden') ? messages.revealAll : messages.hideAll)} aria-label={intl.formatMessage(status.get('hidden') ? messages.revealAll : messages.hideAll)} onClick={this.handleToggleAll}><Icon id={status.get('hidden') ? 'eye-slash' : 'eye'} /></button>
           )}
         />
 
@@ -553,6 +639,7 @@ class Status extends ImmutablePureComponent {
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
                   onToggleHidden={this.handleToggleHidden}
+                  onTranslate={this.handleTranslate}
                   domain={domain}
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
@@ -567,6 +654,7 @@ class Status extends ImmutablePureComponent {
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
                   onDelete={this.handleDeleteClick}
+                  onEdit={this.handleEditClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
                   onMute={this.handleMuteClick}
@@ -586,6 +674,11 @@ class Status extends ImmutablePureComponent {
             {descendants}
           </div>
         </ScrollContainer>
+
+        <Helmet>
+          <title>{titleFromStatus(status)}</title>
+          <meta name='robots' content={(isLocal && isIndexable) ? 'all' : 'noindex'} />
+        </Helmet>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.js b/app/javascript/mastodon/features/subscribed_languages_modal/index.js
new file mode 100644
index 000000000..a519ceabc
--- /dev/null
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.js
@@ -0,0 +1,125 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { is, List as ImmutableList, Set as ImmutableSet } from 'immutable';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+import Option from 'mastodon/features/report/components/option';
+import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
+import IconButton from 'mastodon/components/icon_button';
+import Button from 'mastodon/components/button';
+import { followAccount } from 'mastodon/actions/accounts';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+const getAccountLanguages = createSelector([
+  (state, accountId) => state.getIn(['timelines', `account:${accountId}`, 'items'], ImmutableList()),
+  state => state.get('statuses'),
+], (statusIds, statuses) =>
+  new ImmutableSet(statusIds.map(statusId => statuses.get(statusId)).filter(status => !status.get('reblog')).map(status => status.get('language'))));
+
+const mapStateToProps = (state, { accountId }) => ({
+  acct: state.getIn(['accounts', accountId, 'acct']),
+  availableLanguages: getAccountLanguages(state, accountId),
+  selectedLanguages: ImmutableSet(state.getIn(['relationships', accountId, 'languages']) || ImmutableList()),
+});
+
+const mapDispatchToProps = (dispatch, { accountId }) => ({
+
+  onSubmit (languages) {
+    dispatch(followAccount(accountId, { languages }));
+  },
+
+});
+
+export default @connect(mapStateToProps, mapDispatchToProps)
+@injectIntl
+class SubscribedLanguagesModal extends ImmutablePureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    acct: PropTypes.string.isRequired,
+    availableLanguages: ImmutablePropTypes.setOf(PropTypes.string),
+    selectedLanguages: ImmutablePropTypes.setOf(PropTypes.string),
+    onClose: PropTypes.func.isRequired,
+    languages: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
+    intl: PropTypes.object.isRequired,
+    submit: PropTypes.func.isRequired,
+  };
+
+  static defaultProps = {
+    languages: preloadedLanguages,
+  };
+
+  state = {
+    selectedLanguages: this.props.selectedLanguages,
+  };
+
+  handleLanguageToggle = (value, checked) => {
+    const { selectedLanguages } = this.state;
+
+    if (checked) {
+      this.setState({ selectedLanguages: selectedLanguages.add(value) });
+    } else {
+      this.setState({ selectedLanguages: selectedLanguages.delete(value) });
+    }
+  };
+
+  handleSubmit = () => {
+    this.props.onSubmit(this.state.selectedLanguages.toArray());
+    this.props.onClose();
+  }
+
+  renderItem (value) {
+    const language = this.props.languages.find(language => language[0] === value);
+    const checked = this.state.selectedLanguages.includes(value);
+
+    if (!language) {
+      return null;
+    }
+
+    return (
+      <Option
+        key={value}
+        name='languages'
+        value={value}
+        label={language[1]}
+        checked={checked}
+        onToggle={this.handleLanguageToggle}
+        multiple
+      />
+    );
+  }
+
+  render () {
+    const { acct, availableLanguages, selectedLanguages, intl, onClose } = this.props;
+
+    return (
+      <div className='modal-root__modal report-dialog-modal'>
+        <div className='report-modal__target'>
+          <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={20} />
+          <FormattedMessage id='subscribed_languages.target' defaultMessage='Change subscribed languages for {target}' values={{ target: <strong>{acct}</strong> }} />
+        </div>
+
+        <div className='report-dialog-modal__container'>
+          <p className='report-dialog-modal__lead'><FormattedMessage id='subscribed_languages.lead' defaultMessage='Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.' /></p>
+
+          <div>
+            {availableLanguages.union(selectedLanguages).delete(null).map(value => this.renderItem(value))}
+          </div>
+
+          <div className='flex-spacer' />
+
+          <div className='report-dialog-modal__actions'>
+            <Button disabled={is(this.state.selectedLanguages, this.props.selectedLanguages)} onClick={this.handleSubmit}><FormattedMessage id='subscribed_languages.save' defaultMessage='Save changes' /></Button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.js b/app/javascript/mastodon/features/ui/components/actions_modal.js
index 875b2b75d..67be69d43 100644
--- a/app/javascript/mastodon/features/ui/components/actions_modal.js
+++ b/app/javascript/mastodon/features/ui/components/actions_modal.js
@@ -2,10 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import StatusContent from '../../../components/status_content';
-import Avatar from '../../../components/avatar';
-import RelativeTimestamp from '../../../components/relative_timestamp';
-import DisplayName from '../../../components/display_name';
 import IconButton from '../../../components/icon_button';
 import classNames from 'classnames';
 
@@ -38,32 +34,8 @@ export default class ActionsModal extends ImmutablePureComponent {
   }
 
   render () {
-    const status = this.props.status && (
-      <div className='status light'>
-        <div className='boost-modal__status-header'>
-          <div className='boost-modal__status-time'>
-            <a href={this.props.status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-              <RelativeTimestamp timestamp={this.props.status.get('created_at')} />
-            </a>
-          </div>
-
-          <a href={this.props.status.getIn(['account', 'url'])} className='status__display-name'>
-            <div className='status__avatar'>
-              <Avatar account={this.props.status.get('account')} size={48} />
-            </div>
-
-            <DisplayName account={this.props.status.get('account')} />
-          </a>
-        </div>
-
-        <StatusContent status={this.props.status} />
-      </div>
-    );
-
     return (
       <div className='modal-root__modal actions-modal'>
-        {status}
-
         <ul className={classNames({ 'with-status': !!status })}>
           {this.props.actions.map(this.renderAction)}
         </ul>
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index f8a344690..077ce7b35 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -88,7 +88,7 @@ class BoostModal extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
@@ -97,14 +97,13 @@ class BoostModal extends ImmutablePureComponent {
       <div className='modal-root__modal boost-modal'>
         <div className='boost-modal__container'>
           <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='boost-modal__status-header'>
-              <div className='boost-modal__status-time'>
-                <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                  <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
-                  <RelativeTimestamp timestamp={status.get('created_at')} /></a>
-              </div>
+            <div className='status__info'>
+              <a href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />
+              </a>
 
-              <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name'>
                 <div className='status__avatar'>
                   <Avatar account={status.get('account')} size={48} />
                 </div>
diff --git a/app/javascript/mastodon/features/ui/components/bundle_column_error.js b/app/javascript/mastodon/features/ui/components/bundle_column_error.js
index f39ebd900..dfe970ad0 100644
--- a/app/javascript/mastodon/features/ui/components/bundle_column_error.js
+++ b/app/javascript/mastodon/features/ui/components/bundle_column_error.js
@@ -1,44 +1,162 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import Column from 'mastodon/components/column';
+import Button from 'mastodon/components/button';
+import { Helmet } from 'react-helmet';
+import { Link } from 'react-router-dom';
+import classNames from 'classnames';
+import { autoPlayGif } from 'mastodon/initial_state';
 
-import Column from './column';
-import ColumnHeader from './column_header';
-import ColumnBackButtonSlim from '../../../components/column_back_button_slim';
-import IconButton from '../../../components/icon_button';
-
-const messages = defineMessages({
-  title: { id: 'bundle_column_error.title', defaultMessage: 'Network error' },
-  body: { id: 'bundle_column_error.body', defaultMessage: 'Something went wrong while loading this component.' },
-  retry: { id: 'bundle_column_error.retry', defaultMessage: 'Try again' },
-});
-
-class BundleColumnError extends React.PureComponent {
+class GIF extends React.PureComponent {
 
   static propTypes = {
-    onRetry: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
+    src: PropTypes.string.isRequired,
+    staticSrc: PropTypes.string.isRequired,
+    className: PropTypes.string,
+    animate: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    animate: autoPlayGif,
+  };
+
+  state = {
+    hovering: false,
+  };
+
+  handleMouseEnter = () => {
+    const { animate } = this.props;
+
+    if (!animate) {
+      this.setState({ hovering: true });
+    }
   }
 
-  handleRetry = () => {
-    this.props.onRetry();
+  handleMouseLeave = () => {
+    const { animate } = this.props;
+
+    if (!animate) {
+      this.setState({ hovering: false });
+    }
   }
 
   render () {
-    const { intl: { formatMessage } } = this.props;
+    const { src, staticSrc, className, animate } = this.props;
+    const { hovering } = this.state;
 
     return (
-      <Column>
-        <ColumnHeader icon='exclamation-circle' type={formatMessage(messages.title)} />
-        <ColumnBackButtonSlim />
-        <div className='error-column'>
-          <IconButton title={formatMessage(messages.retry)} icon='refresh' onClick={this.handleRetry} size={64} />
-          {formatMessage(messages.body)}
-        </div>
-      </Column>
+      <img
+        className={className}
+        src={(hovering || animate) ? src : staticSrc}
+        alt=''
+        role='presentation'
+        onMouseEnter={this.handleMouseEnter}
+        onMouseLeave={this.handleMouseLeave}
+      />
     );
   }
 
 }
 
-export default injectIntl(BundleColumnError);
+class CopyButton extends React.PureComponent {
+
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+    value: PropTypes.string.isRequired,
+  };
+
+  state = {
+    copied: false,
+  };
+
+  handleClick = () => {
+    const { value } = this.props;
+    navigator.clipboard.writeText(value);
+    this.setState({ copied: true });
+    this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
+  }
+
+  componentWillUnmount () {
+    if (this.timeout) clearTimeout(this.timeout);
+  }
+
+  render () {
+    const { children } = this.props;
+    const { copied } = this.state;
+
+    return (
+      <Button onClick={this.handleClick} className={copied ? 'copied' : 'copyable'}>{copied ? <FormattedMessage id='copypaste.copied' defaultMessage='Copied' /> : children}</Button>
+    );
+  }
+
+}
+
+export default @injectIntl
+class BundleColumnError extends React.PureComponent {
+
+  static propTypes = {
+    errorType: PropTypes.oneOf(['routing', 'network', 'error']),
+    onRetry: PropTypes.func,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+    stacktrace: PropTypes.string,
+  };
+
+  static defaultProps = {
+    errorType: 'routing',
+  };
+
+  handleRetry = () => {
+    const { onRetry } = this.props;
+
+    if (onRetry) {
+      onRetry();
+    }
+  }
+
+  render () {
+    const { errorType, multiColumn, stacktrace } = this.props;
+
+    let title, body;
+
+    switch(errorType) {
+    case 'routing':
+      title = <FormattedMessage id='bundle_column_error.routing.title' defaultMessage='404' />;
+      body = <FormattedMessage id='bundle_column_error.routing.body' defaultMessage='The requested page could not be found. Are you sure the URL in the address bar is correct?' />;
+      break;
+    case 'network':
+      title = <FormattedMessage id='bundle_column_error.network.title' defaultMessage='Network error' />;
+      body = <FormattedMessage id='bundle_column_error.network.body' defaultMessage='There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.' />;
+      break;
+    case 'error':
+      title = <FormattedMessage id='bundle_column_error.error.title' defaultMessage='Oh, no!' />;
+      body = <FormattedMessage id='bundle_column_error.error.body' defaultMessage='The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.' />;
+      break;
+    }
+
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <div className='error-column'>
+          <GIF src='/oops.gif' staticSrc='/oops.png' className='error-column__image' />
+
+          <div className='error-column__message'>
+            <h1>{title}</h1>
+            <p>{body}</p>
+
+            <div className='error-column__message__actions'>
+              {errorType === 'network' && <Button onClick={this.handleRetry}><FormattedMessage id='bundle_column_error.retry' defaultMessage='Try again' /></Button>}
+              {errorType === 'error' && <CopyButton value={stacktrace}><FormattedMessage id='bundle_column_error.copy_stacktrace' defaultMessage='Copy error report' /></CopyButton>}
+              <Link to='/' className={classNames('button', { 'button-tertiary': errorType !== 'routing' })}><FormattedMessage id='bundle_column_error.return' defaultMessage='Go back home' /></Link>
+            </div>
+          </div>
+        </div>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/column_link.js b/app/javascript/mastodon/features/ui/components/column_link.js
index 0a25f1ea2..8eebbf526 100644
--- a/app/javascript/mastodon/features/ui/components/column_link.js
+++ b/app/javascript/mastodon/features/ui/components/column_link.js
@@ -1,37 +1,41 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 import Icon from 'mastodon/components/icon';
+import classNames from 'classnames';
 
-const ColumnLink = ({ icon, text, to, href, method, badge }) => {
+const ColumnLink = ({ icon, text, to, href, method, badge, transparent, ...other }) => {
+  const className = classNames('column-link', { 'column-link--transparent': transparent });
   const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
+  const iconElement = typeof icon === 'string' ? <Icon id={icon} fixedWidth className='column-link__icon' /> : icon;
 
   if (href) {
     return (
-      <a href={href} className='column-link' data-method={method}>
-        <Icon id={icon} fixedWidth className='column-link__icon' />
-        {text}
+      <a href={href} className={className} data-method={method} title={text} {...other}>
+        {iconElement}
+        <span>{text}</span>
         {badgeElement}
       </a>
     );
   } else {
     return (
-      <Link to={to} className='column-link'>
-        <Icon id={icon} fixedWidth className='column-link__icon' />
-        {text}
+      <NavLink to={to} className={className} title={text} {...other}>
+        {iconElement}
+        <span>{text}</span>
         {badgeElement}
-      </Link>
+      </NavLink>
     );
   }
 };
 
 ColumnLink.propTypes = {
-  icon: PropTypes.string.isRequired,
+  icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   text: PropTypes.string.isRequired,
   to: PropTypes.string,
   href: PropTypes.string,
   method: PropTypes.string,
   badge: PropTypes.node,
+  transparent: PropTypes.bool,
 };
 
 export default ColumnLink;
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.js b/app/javascript/mastodon/features/ui/components/column_loading.js
index 0cdfd05d8..e5ed22584 100644
--- a/app/javascript/mastodon/features/ui/components/column_loading.js
+++ b/app/javascript/mastodon/features/ui/components/column_loading.js
@@ -10,6 +10,7 @@ export default class ColumnLoading extends ImmutablePureComponent {
   static propTypes = {
     title: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
     icon: PropTypes.string,
+    multiColumn: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -18,10 +19,11 @@ export default class ColumnLoading extends ImmutablePureComponent {
   };
 
   render() {
-    let { title, icon } = this.props;
+    let { title, icon, multiColumn } = this.props;
+
     return (
       <Column>
-        <ColumnHeader icon={icon} title={title} multiColumn={false} focusable={false} placeholder />
+        <ColumnHeader icon={icon} title={title} multiColumn={multiColumn} focusable={false} placeholder />
         <div className='scrollable' />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 193637113..e7def800e 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -1,15 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import ReactSwipeableViews from 'react-swipeable-views';
-import TabsBar, { links, getIndex, getLink } from './tabs_bar';
-import { Link } from 'react-router-dom';
-
-import { disableSwiping } from 'mastodon/initial_state';
-
 import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
 import DrawerLoading from './drawer_loading';
@@ -27,10 +19,8 @@ import {
   ListTimeline,
   Directory,
 } from '../../ui/util/async-components';
-import Icon from 'mastodon/components/icon';
 import ComposePanel from './compose_panel';
 import NavigationPanel from './navigation_panel';
-
 import { supportsPassiveEvents } from 'detect-passive-events';
 import { scrollRight } from '../../../scroll';
 
@@ -49,41 +39,26 @@ const componentMap = {
   'DIRECTORY': Directory,
 };
 
-const messages = defineMessages({
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
-});
-
-const shouldHideFAB = path => path.match(/^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/search|^\/getting-started|^\/start/);
-
-export default @(component => injectIntl(component, { withRef: true }))
-class ColumnsArea extends ImmutablePureComponent {
+export default class ColumnsArea extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
   };
 
   static propTypes = {
-    intl: PropTypes.object.isRequired,
     columns: ImmutablePropTypes.list.isRequired,
     isModalOpen: PropTypes.bool.isRequired,
     singleColumn: PropTypes.bool,
     children: PropTypes.node,
   };
 
-   // Corresponds to (max-width: 600px + (285px * 1) + (10px * 1)) in SCSS
-   mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 895px)');
+  // Corresponds to (max-width: $no-gap-breakpoint + 285px - 1px) in SCSS
+  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)');
 
   state = {
-    shouldAnimate: false,
     renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),
   }
 
-  componentWillReceiveProps() {
-    if (typeof this.pendingIndex !== 'number' && this.lastIndex !== getIndex(this.context.router.history.location.pathname)) {
-      this.setState({ shouldAnimate: false });
-    }
-  }
-
   componentDidMount() {
     if (!this.props.singleColumn) {
       this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
@@ -98,10 +73,7 @@ class ColumnsArea extends ImmutablePureComponent {
       this.setState({ renderComposePanel: !this.mediaQuery.matches });
     }
 
-    this.lastIndex   = getIndex(this.context.router.history.location.pathname);
     this.isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');
-
-    this.setState({ shouldAnimate: true });
   }
 
   componentWillUpdate(nextProps) {
@@ -114,13 +86,6 @@ class ColumnsArea extends ImmutablePureComponent {
     if (this.props.singleColumn !== prevProps.singleColumn && !this.props.singleColumn) {
       this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
     }
-
-    const newIndex = getIndex(this.context.router.history.location.pathname);
-
-    if (this.lastIndex !== newIndex) {
-      this.lastIndex = newIndex;
-      this.setState({ shouldAnimate: true });
-    }
   }
 
   componentWillUnmount () {
@@ -132,7 +97,7 @@ class ColumnsArea extends ImmutablePureComponent {
       if (this.mediaQuery.removeEventListener) {
         this.mediaQuery.removeEventListener('change', this.handleLayoutChange);
       } else {
-        this.mediaQuery.removeListener(this.handleLayouteChange);
+        this.mediaQuery.removeListener(this.handleLayoutChange);
       }
     }
   }
@@ -148,31 +113,6 @@ class ColumnsArea extends ImmutablePureComponent {
     this.setState({ renderComposePanel: !e.matches });
   }
 
-  handleSwipe = (index) => {
-    this.pendingIndex = index;
-
-    const nextLinkTranslationId = links[index].props['data-preview-title-id'];
-    const currentLinkSelector = '.tabs-bar__link.active';
-    const nextLinkSelector = `.tabs-bar__link[data-preview-title-id="${nextLinkTranslationId}"]`;
-
-    // HACK: Remove the active class from the current link and set it to the next one
-    // React-router does this for us, but too late, feeling laggy.
-    document.querySelector(currentLinkSelector).classList.remove('active');
-    document.querySelector(nextLinkSelector).classList.add('active');
-
-    if (!this.state.shouldAnimate && typeof this.pendingIndex === 'number') {
-      this.context.router.history.push(getLink(this.pendingIndex));
-      this.pendingIndex = null;
-    }
-  }
-
-  handleAnimationEnd = () => {
-    if (typeof this.pendingIndex === 'number') {
-      this.context.router.history.push(getLink(this.pendingIndex));
-      this.pendingIndex = null;
-    }
-  }
-
   handleWheel = () => {
     if (typeof this._interruptScrollAnimation !== 'function') {
       return;
@@ -185,47 +125,19 @@ class ColumnsArea extends ImmutablePureComponent {
     this.node = node;
   }
 
-  renderView = (link, index) => {
-    const columnIndex = getIndex(this.context.router.history.location.pathname);
-    const title = this.props.intl.formatMessage({ id: link.props['data-preview-title-id'] });
-    const icon = link.props['data-preview-icon'];
-
-    const view = (index === columnIndex) ?
-      React.cloneElement(this.props.children) :
-      <ColumnLoading title={title} icon={icon} />;
-
-    return (
-      <div className='columns-area columns-area--mobile' key={index}>
-        {view}
-      </div>
-    );
-  }
-
   renderLoading = columnId => () => {
-    return columnId === 'COMPOSE' ? <DrawerLoading /> : <ColumnLoading />;
+    return columnId === 'COMPOSE' ? <DrawerLoading /> : <ColumnLoading multiColumn />;
   }
 
   renderError = (props) => {
-    return <BundleColumnError {...props} />;
+    return <BundleColumnError multiColumn errorType='network' {...props} />;
   }
 
   render () {
-    const { columns, children, singleColumn, isModalOpen, intl } = this.props;
-    const { shouldAnimate, renderComposePanel } = this.state;
-
-    const columnIndex = getIndex(this.context.router.history.location.pathname);
+    const { columns, children, singleColumn, isModalOpen } = this.props;
+    const { renderComposePanel } = this.state;
 
     if (singleColumn) {
-      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/publish' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
-
-      const content = columnIndex !== -1 ? (
-        <ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
-          {links.map(this.renderView)}
-        </ReactSwipeableViews>
-      ) : (
-        <div key='content' className='columns-area columns-area--mobile'>{children}</div>
-      );
-
       return (
         <div className='columns-area__panels'>
           <div className='columns-area__panels__pane columns-area__panels__pane--compositional'>
@@ -235,8 +147,8 @@ class ColumnsArea extends ImmutablePureComponent {
           </div>
 
           <div className='columns-area__panels__main'>
-            <TabsBar key='tabs' />
-            {content}
+            <div className='tabs-bar__wrapper'><div id='tabs-bar__portal' /></div>
+            <div className='columns-area columns-area--mobile'>{children}</div>
           </div>
 
           <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>
@@ -244,8 +156,6 @@ class ColumnsArea extends ImmutablePureComponent {
               <NavigationPanel />
             </div>
           </div>
-
-          {floatingActionButton}
         </div>
       );
     }
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.js b/app/javascript/mastodon/features/ui/components/compare_history_modal.js
new file mode 100644
index 000000000..ecccc8f7d
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.js
@@ -0,0 +1,99 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import { closeModal } from 'mastodon/actions/modal';
+import emojify from 'mastodon/features/emoji/emoji';
+import escapeTextContentForBrowser from 'escape-html';
+import InlineAccount from 'mastodon/components/inline_account';
+import IconButton from 'mastodon/components/icon_button';
+import RelativeTimestamp from 'mastodon/components/relative_timestamp';
+import MediaAttachments from 'mastodon/components/media_attachments';
+
+const mapStateToProps = (state, { statusId }) => ({
+  versions: state.getIn(['history', statusId, 'items']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onClose() {
+    dispatch(closeModal());
+  },
+
+});
+
+export default @connect(mapStateToProps, mapDispatchToProps)
+class CompareHistoryModal extends React.PureComponent {
+
+  static propTypes = {
+    onClose: PropTypes.func.isRequired,
+    index: PropTypes.number.isRequired,
+    statusId: PropTypes.string.isRequired,
+    versions: ImmutablePropTypes.list.isRequired,
+  };
+
+  render () {
+    const { index, versions, onClose } = this.props;
+    const currentVersion = versions.get(index);
+
+    const emojiMap = currentVersion.get('emojis').reduce((obj, emoji) => {
+      obj[`:${emoji.get('shortcode')}:`] = emoji.toJS();
+      return obj;
+    }, {});
+
+    const content = { __html: emojify(currentVersion.get('content'), emojiMap) };
+    const spoilerContent = { __html: emojify(escapeTextContentForBrowser(currentVersion.get('spoiler_text')), emojiMap) };
+
+    const formattedDate = <RelativeTimestamp timestamp={currentVersion.get('created_at')} short={false} />;
+    const formattedName = <InlineAccount accountId={currentVersion.get('account')} />;
+
+    const label = currentVersion.get('original') ? (
+      <FormattedMessage id='status.history.created' defaultMessage='{name} created {date}' values={{ name: formattedName, date: formattedDate }} />
+    ) : (
+      <FormattedMessage id='status.history.edited' defaultMessage='{name} edited {date}' values={{ name: formattedName, date: formattedDate }} />
+    );
+
+    return (
+      <div className='modal-root__modal compare-history-modal'>
+        <div className='report-modal__target'>
+          <IconButton className='report-modal__close' icon='times' onClick={onClose} size={20} />
+          {label}
+        </div>
+
+        <div className='compare-history-modal__container'>
+          <div className='status__content'>
+            {currentVersion.get('spoiler_text').length > 0 && (
+              <React.Fragment>
+                <div className='translate' dangerouslySetInnerHTML={spoilerContent} />
+                <hr />
+              </React.Fragment>
+            )}
+
+            <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} />
+
+            {!!currentVersion.get('poll') && (
+              <div className='poll'>
+                <ul>
+                  {currentVersion.getIn(['poll', 'options']).map(option => (
+                    <li key={option.get('title')}>
+                      <span className='poll__input disabled' />
+
+                      <span
+                        className='poll__option__text translate'
+                        dangerouslySetInnerHTML={{ __html: emojify(escapeTextContentForBrowser(option.get('title')), emojiMap) }}
+                      />
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            )}
+
+            <MediaAttachments status={currentVersion} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js
index 3d0c48c7a..92d16b5b3 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.js
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.js
@@ -5,30 +5,62 @@ import SearchContainer from 'mastodon/features/compose/containers/search_contain
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
 import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import LinkFooter from './link_footer';
-import { changeComposing } from 'mastodon/actions/compose';
+import ServerBanner from 'mastodon/components/server_banner';
+import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
 
 export default @connect()
 class ComposePanel extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object.isRequired,
+  };
+
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
   };
 
   onFocus = () => {
-    this.props.dispatch(changeComposing(true));
+    const { dispatch } = this.props;
+    dispatch(changeComposing(true));
   }
 
   onBlur = () => {
-    this.props.dispatch(changeComposing(false));
+    const { dispatch } = this.props;
+    dispatch(changeComposing(false));
+  }
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    dispatch(mountCompose());
+  }
+
+  componentWillUnmount () {
+    const { dispatch } = this.props;
+    dispatch(unmountCompose());
   }
 
   render() {
+    const { signedIn } = this.context.identity;
+
     return (
       <div className='compose-panel' onFocus={this.onFocus}>
         <SearchContainer openInRoute />
-        <NavigationContainer onClose={this.onBlur} />
-        <ComposeFormContainer singleColumn />
-        <LinkFooter withHotkeys />
+
+        {!signedIn && (
+          <React.Fragment>
+            <ServerBanner />
+            <div className='flex-spacer' />
+          </React.Fragment>
+        )}
+
+        {signedIn && (
+          <React.Fragment>
+            <NavigationContainer onClose={this.onBlur} />
+            <ComposeFormContainer singleColumn />
+          </React.Fragment>
+        )}
+
+        <LinkFooter />
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/disabled_account_banner.js b/app/javascript/mastodon/features/ui/components/disabled_account_banner.js
new file mode 100644
index 000000000..038cc3553
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/disabled_account_banner.js
@@ -0,0 +1,92 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { Link } from 'react-router-dom';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { disabledAccountId, movedToAccountId, domain } from 'mastodon/initial_state';
+import { openModal } from 'mastodon/actions/modal';
+import { logOut } from 'mastodon/utils/log_out';
+
+const messages = defineMessages({
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
+});
+
+const mapStateToProps = (state) => ({
+  disabledAcct: state.getIn(['accounts', disabledAccountId, 'acct']),
+  movedToAcct: movedToAccountId ? state.getIn(['accounts', movedToAccountId, 'acct']) : undefined,
+});
+
+const mapDispatchToProps = (dispatch, { intl }) => ({
+  onLogout () {
+    dispatch(openModal('CONFIRM', {
+      message: intl.formatMessage(messages.logoutMessage),
+      confirm: intl.formatMessage(messages.logoutConfirm),
+      closeWhenConfirm: false,
+      onConfirm: () => logOut(),
+    }));
+  },
+});
+
+export default @injectIntl
+@connect(mapStateToProps, mapDispatchToProps)
+class DisabledAccountBanner extends React.PureComponent {
+
+  static propTypes = {
+    disabledAcct: PropTypes.string.isRequired,
+    movedToAcct: PropTypes.string,
+    onLogout: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleLogOutClick = e => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    this.props.onLogout();
+
+    return false;
+  }
+
+  render () {
+    const { disabledAcct, movedToAcct } = this.props;
+
+    const disabledAccountLink = (
+      <Link to={`/@${disabledAcct}`}>
+        {disabledAcct}@{domain}
+      </Link>
+    );
+
+    return (
+      <div className='sign-in-banner'>
+        <p>
+          {movedToAcct ? (
+            <FormattedMessage
+              id='moved_to_account_banner.text'
+              defaultMessage='Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.'
+              values={{
+                disabledAccount: disabledAccountLink,
+                movedToAccount: <Link to={`/@${movedToAcct}`}>{movedToAcct.includes('@') ? movedToAcct : `${movedToAcct}@${domain}`}</Link>,
+              }}
+            />
+          ) : (
+            <FormattedMessage
+              id='disabled_account_banner.text'
+              defaultMessage='Your account {disabledAccount} is currently disabled.'
+              values={{
+                disabledAccount: disabledAccountLink,
+              }}
+            />
+          )}
+        </p>
+        <a href='/auth/edit' className='button button--block'>
+          <FormattedMessage id='disabled_account_banner.account_settings' defaultMessage='Account settings' />
+        </a>
+        <button type='button' className='button button--block button-tertiary' onClick={this.handleLogOutClick}>
+          <FormattedMessage id='confirmations.logout.confirm' defaultMessage='Log out' />
+        </button>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/document_title.js b/app/javascript/mastodon/features/ui/components/document_title.js
deleted file mode 100644
index cd081b20c..000000000
--- a/app/javascript/mastodon/features/ui/components/document_title.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PureComponent } from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import { title } from 'mastodon/initial_state';
-
-const mapStateToProps = state => ({
-  unread: state.getIn(['missed_updates', 'unread']),
-});
-
-export default @connect(mapStateToProps)
-class DocumentTitle extends PureComponent {
-
-  static propTypes = {
-    unread: PropTypes.number.isRequired,
-  };
-
-  componentDidMount () {
-    this._sideEffects();
-  }
-
-  componentDidUpdate() {
-    this._sideEffects();
-  }
-
-  _sideEffects () {
-    const { unread } = this.props;
-
-    if (unread > 99) {
-      document.title = `(*) ${title}`;
-    } else if (unread > 0) {
-      document.title = `(${unread}) ${title}`;
-    } else {
-      document.title = title;
-    }
-  }
-
-  render () {
-    return null;
-  }
-
-}
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.js b/app/javascript/mastodon/features/ui/components/filter_modal.js
new file mode 100644
index 000000000..376db961d
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.js
@@ -0,0 +1,134 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { fetchStatus } from 'mastodon/actions/statuses';
+import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
+import PropTypes from 'prop-types';
+import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import IconButton from 'mastodon/components/icon_button';
+import SelectFilter from 'mastodon/features/filters/select_filter';
+import AddedToFilter from 'mastodon/features/filters/added_to_filter';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+export default @connect(undefined)
+@injectIntl
+class FilterModal extends ImmutablePureComponent {
+
+  static propTypes = {
+    statusId: PropTypes.string.isRequired,
+    contextType: PropTypes.string,
+    dispatch: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    step: 'select',
+    filterId: null,
+    isSubmitting: false,
+    isSubmitted: false,
+  };
+
+  handleNewFilterSuccess = (result) => {
+    this.handleSelectFilter(result.id);
+  };
+
+  handleSuccess = () => {
+    const { dispatch, statusId } = this.props;
+    dispatch(fetchStatus(statusId, true));
+    this.setState({ isSubmitting: false, isSubmitted: true, step: 'submitted' });
+  };
+
+  handleFail = () => {
+    this.setState({ isSubmitting: false });
+  };
+
+  handleNextStep = step => {
+    this.setState({ step });
+  };
+
+  handleSelectFilter = (filterId) => {
+    const { dispatch, statusId } = this.props;
+
+    this.setState({ isSubmitting: true, filterId });
+
+    dispatch(createFilterStatus({
+      filter_id: filterId,
+      status_id: statusId,
+    }, this.handleSuccess, this.handleFail));
+  };
+
+  handleNewFilter = (title) => {
+    const { dispatch } = this.props;
+
+    this.setState({ isSubmitting: true });
+
+    dispatch(createFilter({
+      title,
+      context: ['home', 'notifications', 'public', 'thread', 'account'],
+      action: 'warn',
+    }, this.handleNewFilterSuccess, this.handleFail));
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+
+    dispatch(fetchFilters());
+  }
+
+  render () {
+    const {
+      intl,
+      statusId,
+      contextType,
+      onClose,
+    } = this.props;
+
+    const {
+      step,
+      filterId,
+    } = this.state;
+
+    let stepComponent;
+
+    switch(step) {
+    case 'select':
+      stepComponent = (
+        <SelectFilter
+          contextType={contextType}
+          onSelectFilter={this.handleSelectFilter}
+          onNewFilter={this.handleNewFilter}
+        />
+      );
+      break;
+    case 'create':
+      stepComponent = null;
+      break;
+    case 'submitted':
+      stepComponent = (
+        <AddedToFilter
+          contextType={contextType}
+          filterId={filterId}
+          statusId={statusId}
+          onClose={onClose}
+        />
+      );
+    }
+
+    return (
+      <div className='modal-root__modal report-dialog-modal'>
+        <div className='report-modal__target'>
+          <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={20} />
+          <FormattedMessage id='filter_modal.title.status' defaultMessage='Filter a post' />
+        </div>
+
+        <div className='report-dialog-modal__container'>
+          {stepComponent}
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
index a2e6b3d16..479f4abd2 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
@@ -176,14 +176,14 @@ class FocalPointModal extends ImmutablePureComponent {
 
   handleKeyDown = (e) => {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      e.stopPropagation();
       this.props.onChangeDescription(e.target.value);
-      this.handleSubmit();
+      this.handleSubmit(e);
     }
   }
 
-  handleSubmit = () => {
+  handleSubmit = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
     this.props.onSave(this.props.description, this.props.focusX, this.props.focusY);
   }
 
@@ -291,11 +291,11 @@ class FocalPointModal extends ImmutablePureComponent {
     let descriptionLabel = null;
 
     if (media.get('type') === 'audio') {
-      descriptionLabel = <FormattedMessage id='upload_form.audio_description' defaultMessage='Describe for people with hearing loss' />;
+      descriptionLabel = <FormattedMessage id='upload_form.audio_description' defaultMessage='Describe for people who are hard of hearing' />;
     } else if (media.get('type') === 'video') {
-      descriptionLabel = <FormattedMessage id='upload_form.video_description' defaultMessage='Describe for people with hearing loss or visual impairment' />;
+      descriptionLabel = <FormattedMessage id='upload_form.video_description' defaultMessage='Describe for people who are deaf, hard of hearing, blind or have low vision' />;
     } else {
-      descriptionLabel = <FormattedMessage id='upload_form.description' defaultMessage='Describe for the visually impaired' />;
+      descriptionLabel = <FormattedMessage id='upload_form.description' defaultMessage='Describe for people who are blind or have low vision' />;
     }
 
     let ocrMessage = '';
@@ -313,7 +313,7 @@ class FocalPointModal extends ImmutablePureComponent {
         </div>
 
         <div className='report-modal__container'>
-          <div className='report-modal__comment'>
+          <form className='report-modal__comment' onSubmit={this.handleSubmit} >
             {focals && <p><FormattedMessage id='upload_modal.hint' defaultMessage='Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.' /></p>}
 
             {thumbnailable && (
@@ -361,12 +361,23 @@ class FocalPointModal extends ImmutablePureComponent {
             </div>
 
             <div className='setting-text__toolbar'>
-              <button disabled={detecting || media.get('type') !== 'image' || is_changing_upload} className='link-button' onClick={this.handleTextDetection}><FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' /></button>
+              <button
+                type='button'
+                disabled={detecting || media.get('type') !== 'image' || is_changing_upload}
+                className='link-button'
+                onClick={this.handleTextDetection}
+              >
+                <FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' />
+              </button>
               <CharacterCounter max={1500} text={detecting ? '' : description} />
             </div>
 
-            <Button disabled={!dirty || detecting || isUploadingThumbnail || length(description) > 1500 || is_changing_upload} text={intl.formatMessage(is_changing_upload ? messages.applying : messages.apply)} onClick={this.handleSubmit} />
-          </div>
+            <Button
+              type='submit'
+              disabled={!dirty || detecting || isUploadingThumbnail || length(description) > 1500 || is_changing_upload}
+              text={intl.formatMessage(is_changing_upload ? messages.applying : messages.apply)}
+            />
+          </form>
 
           <div className='focal-point-modal__content'>
             {focals && (
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.js
similarity index 52%
rename from app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js
rename to app/javascript/mastodon/features/ui/components/follow_requests_column_link.js
index 950ed7b27..8d4057782 100644
--- a/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js
+++ b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.js
@@ -2,22 +2,27 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { connect } from 'react-redux';
-import { NavLink, withRouter } from 'react-router-dom';
+import ColumnLink from 'mastodon/features/ui/components/column_link';
 import IconWithBadge from 'mastodon/components/icon_with_badge';
 import { List as ImmutableList } from 'immutable';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+});
 
 const mapStateToProps = state => ({
   count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
 });
 
-export default @withRouter
+export default @injectIntl
 @connect(mapStateToProps)
-class FollowRequestsNavLink extends React.Component {
+class FollowRequestsColumnLink extends React.Component {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     count: PropTypes.number.isRequired,
+    intl: PropTypes.object.isRequired,
   };
 
   componentDidMount () {
@@ -27,13 +32,20 @@ class FollowRequestsNavLink extends React.Component {
   }
 
   render () {
-    const { count } = this.props;
+    const { count, intl } = this.props;
 
     if (count === 0) {
       return null;
     }
 
-    return <NavLink className='column-link column-link--transparent' to='/follow_requests'><IconWithBadge className='column-link__icon' id='user-plus' count={count} /><FormattedMessage id='navigation_bar.follow_requests' defaultMessage='Follow requests' /></NavLink>;
+    return (
+      <ColumnLink
+        transparent
+        to='/follow_requests'
+        icon={<IconWithBadge className='column-link__icon' id='user-plus' count={count} />}
+        text={intl.formatMessage(messages.text)}
+      />
+    );
   }
 
 }
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
new file mode 100644
index 000000000..1384bebda
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/header.js
@@ -0,0 +1,87 @@
+import React from 'react';
+import Logo from 'mastodon/components/logo';
+import { Link, withRouter } from 'react-router-dom';
+import { FormattedMessage } from 'react-intl';
+import { registrationsOpen, me } from 'mastodon/initial_state';
+import Avatar from 'mastodon/components/avatar';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { openModal } from 'mastodon/actions/modal';
+
+const Account = connect(state => ({
+  account: state.getIn(['accounts', me]),
+}))(({ account }) => (
+  <Link to={`/@${account.get('acct')}`} title={account.get('acct')}>
+    <Avatar account={account} size={35} />
+  </Link>
+));
+
+const mapDispatchToProps = (dispatch) => ({
+  openClosedRegistrationsModal() {
+    dispatch(openModal('CLOSED_REGISTRATIONS'));
+  },
+});
+
+export default @connect(null, mapDispatchToProps)
+@withRouter
+class Header extends React.PureComponent {
+
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
+  static propTypes = {
+    openClosedRegistrationsModal: PropTypes.func,
+    location: PropTypes.object,
+  };
+
+  render () {
+    const { signedIn } = this.context.identity;
+    const { location, openClosedRegistrationsModal } = this.props;
+
+    let content;
+
+    if (signedIn) {
+      content = (
+        <>
+          {location.pathname !== '/publish' && <Link to='/publish' className='button'><FormattedMessage id='compose_form.publish_form' defaultMessage='Publish' /></Link>}
+          <Account />
+        </>
+      );
+    } else {
+      let signupButton;
+
+      if (registrationsOpen) {
+        signupButton = (
+          <a href='/auth/sign_up' className='button button-tertiary'>
+            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+          </a>
+        );
+      } else {
+        signupButton = (
+          <button className='button button-tertiary' onClick={openClosedRegistrationsModal}>
+            <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+          </button>
+        );
+      }
+
+      content = (
+        <>
+          <a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+          {signupButton}
+        </>
+      );
+    }
+
+    return (
+      <div className='ui__header'>
+        <Link to='/' className='ui__header__logo'><Logo /></Link>
+
+        <div className='ui__header__links'>
+          {content}
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index c6f16a792..dfa0efe49 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -1,10 +1,10 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
 import { LoadingBar } from 'react-redux-loading-bar';
 import ZoomableImage from './zoomable_image';
 
-export default class ImageLoader extends React.PureComponent {
+export default class ImageLoader extends PureComponent {
 
   static propTypes = {
     alt: PropTypes.string,
@@ -43,7 +43,7 @@ export default class ImageLoader extends React.PureComponent {
     this.loadImage(this.props);
   }
 
-  componentWillReceiveProps (nextProps) {
+  UNSAFE_componentWillReceiveProps (nextProps) {
     if (this.props.src !== nextProps.src) {
       this.loadImage(nextProps);
     }
@@ -139,14 +139,18 @@ export default class ImageLoader extends React.PureComponent {
 
     return (
       <div className={className}>
-        <LoadingBar loading={loading ? 1 : 0} className='loading-bar' style={{ width: this.state.width || width }} />
         {loading ? (
-          <canvas
-            className='image-loader__preview-canvas'
-            ref={this.setCanvasRef}
-            width={width}
-            height={height}
-          />
+          <>
+            <div className='loading-bar__container' style={{ width: this.state.width || width }}>
+              <LoadingBar className='loading-bar' loading={1} />
+            </div>
+            <canvas
+              className='image-loader__preview-canvas'
+              ref={this.setCanvasRef}
+              width={width}
+              height={height}
+            />
+          </>
         ) : (
           <ZoomableImage
             alt={alt}
diff --git a/app/javascript/mastodon/features/ui/components/image_modal.js b/app/javascript/mastodon/features/ui/components/image_modal.js
new file mode 100644
index 000000000..7522c3da5
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/image_modal.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { defineMessages, injectIntl } from 'react-intl';
+import IconButton from 'mastodon/components/icon_button';
+import ImageLoader from './image_loader';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+export default @injectIntl
+class ImageModal extends React.PureComponent {
+
+  static propTypes = {
+    src: PropTypes.string.isRequired,
+    alt: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    navigationHidden: false,
+  };
+
+  toggleNavigation = () => {
+    this.setState(prevState => ({
+      navigationHidden: !prevState.navigationHidden,
+    }));
+  };
+
+  render () {
+    const { intl, src, alt, onClose } = this.props;
+    const { navigationHidden } = this.state;
+
+    const navigationClassName = classNames('media-modal__navigation', {
+      'media-modal__navigation--hidden': navigationHidden,
+    });
+
+    return (
+      <div className='modal-root__modal media-modal'>
+        <div className='media-modal__closer' role='presentation' onClick={onClose} >
+          <ImageLoader
+            src={src}
+            width={400}
+            height={400}
+            alt={alt}
+            onClick={this.toggleNavigation}
+          />
+        </div>
+
+        <div className={navigationClassName}>
+          <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={40} />
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index 4a9243c9e..2b83d6378 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -3,9 +3,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
-import { invitesEnabled, limitedFederationMode, version, repository, source_url } from 'mastodon/initial_state';
+import { domain, version, source_url, profile_directory as profileDirectory } from 'mastodon/initial_state';
 import { logOut } from 'mastodon/utils/log_out';
 import { openModal } from 'mastodon/actions/modal';
+import { PERMISSION_INVITE_USERS } from 'mastodon/permissions';
 
 const messages = defineMessages({
   logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
@@ -27,8 +28,11 @@ export default @injectIntl
 @connect(null, mapDispatchToProps)
 class LinkFooter extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
-    withHotkeys: PropTypes.bool,
     onLogout: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
@@ -43,31 +47,48 @@ class LinkFooter extends React.PureComponent {
   }
 
   render () {
-    const { withHotkeys } = this.props;
+    const { signedIn, permissions } = this.context.identity;
+
+    const canInvite = signedIn && ((permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS);
+    const canProfileDirectory = profileDirectory;
 
     return (
-      <div className='getting-started__footer'>
-        <ul>
-          {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
-          {withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
-          <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
-          {!limitedFederationMode && <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>}
-          <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
-          <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
-          <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
-          <li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
-          <li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
-        </ul>
+      <div className='link-footer'>
+        <p>
+          <strong>{domain}</strong>:
+          {' '}
+          <Link key='about' to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
+          {canInvite && (
+            <>
+              {' · '}
+              <a key='invites' href='/invites' target='_blank'><FormattedMessage id='footer.invite' defaultMessage='Invite people' /></a>
+            </>
+          )}
+          {canProfileDirectory && (
+            <>
+              {' · '}
+              <Link key='directory' to='/directory'><FormattedMessage id='footer.directory' defaultMessage='Profiles directory' /></Link>
+            </>
+          )}
+          {' · '}
+          <Link key='privacy-policy' to='/privacy-policy'><FormattedMessage id='footer.privacy_policy' defaultMessage='Privacy policy' /></Link>
+        </p>
 
         <p>
-          <FormattedMessage
-            id='getting_started.open_source_notice'
-            defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
-            values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
-          />
+          <strong>Mastodon</strong>:
+          {' '}
+          <a href='https://joinmastodon.org' target='_blank'><FormattedMessage id='footer.about' defaultMessage='About' /></a>
+          {' · '}
+          <a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='footer.get_app' defaultMessage='Get the app' /></a>
+          {' · '}
+          <Link to='/keyboard-shortcuts'><FormattedMessage id='footer.keyboard_shortcuts' defaultMessage='Keyboard shortcuts' /></Link>
+          {' · '}
+          <a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.source_code' defaultMessage='View source code' /></a>
+          {' · '}
+          v{version}
         </p>
       </div>
     );
   }
 
-};
+}
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.js b/app/javascript/mastodon/features/ui/components/list_panel.js
index 411f62508..2f92a9254 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.js
+++ b/app/javascript/mastodon/features/ui/components/list_panel.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { createSelector } from 'reselect';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { fetchLists } from 'mastodon/actions/lists';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { NavLink, withRouter } from 'react-router-dom';
-import Icon from 'mastodon/components/icon';
+import { withRouter } from 'react-router-dom';
+import { fetchLists } from 'mastodon/actions/lists';
+import ColumnLink from './column_link';
 
 const getOrderedLists = createSelector([state => state.get('lists')], lists => {
   if (!lists) {
@@ -42,11 +42,11 @@ class ListPanel extends ImmutablePureComponent {
     }
 
     return (
-      <div>
+      <div className='list-panel'>
         <hr />
 
         {lists.map(list => (
-          <NavLink key={list.get('id')} className='column-link column-link--transparent' strict to={`/lists/${list.get('id')}`}><Icon className='column-link__icon' id='list-ul' fixedWidth />{list.get('title')}</NavLink>
+          <ColumnLink icon='list-ul' key={list.get('id')} strict text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
         ))}
       </div>
     );
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 377cccda5..6c4aabae5 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -12,6 +12,7 @@ import BoostModal from './boost_modal';
 import AudioModal from './audio_modal';
 import ConfirmationModal from './confirmation_modal';
 import FocalPointModal from './focal_point_modal';
+import ImageModal from './image_modal';
 import {
   MuteModal,
   BlockModal,
@@ -19,12 +20,19 @@ import {
   EmbedModal,
   ListEditor,
   ListAdder,
-} from '../../../features/ui/util/async-components';
+  CompareHistoryModal,
+  FilterModal,
+  InteractionModal,
+  SubscribedLanguagesModal,
+  ClosedRegistrationsModal,
+} from 'mastodon/features/ui/util/async-components';
+import { Helmet } from 'react-helmet';
 
 const MODAL_COMPONENTS = {
   'MEDIA': () => Promise.resolve({ default: MediaModal }),
   'VIDEO': () => Promise.resolve({ default: VideoModal }),
   'AUDIO': () => Promise.resolve({ default: AudioModal }),
+  'IMAGE': () => Promise.resolve({ default: ImageModal }),
   'BOOST': () => Promise.resolve({ default: BoostModal }),
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
   'MUTE': MuteModal,
@@ -34,7 +42,12 @@ const MODAL_COMPONENTS = {
   'EMBED': EmbedModal,
   'LIST_EDITOR': ListEditor,
   'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
-  'LIST_ADDER':ListAdder,
+  'LIST_ADDER': ListAdder,
+  'COMPARE_HISTORY': CompareHistoryModal,
+  'FILTER': FilterModal,
+  'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,
+  'INTERACTION': InteractionModal,
+  'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
 };
 
 export default class ModalRoot extends React.PureComponent {
@@ -43,6 +56,7 @@ export default class ModalRoot extends React.PureComponent {
     type: PropTypes.string,
     props: PropTypes.object,
     onClose: PropTypes.func.isRequired,
+    ignoreFocus: PropTypes.bool,
   };
 
   state = {
@@ -77,7 +91,7 @@ export default class ModalRoot extends React.PureComponent {
     return <BundleModalError {...props} onClose={onClose} />;
   }
 
-  handleClose = () => {
+  handleClose = (ignoreFocus = false) => {
     const { onClose } = this.props;
     let message = null;
     try {
@@ -87,7 +101,7 @@ export default class ModalRoot extends React.PureComponent {
       // isn't set.
       // This would be much smoother with react-intl 3+ and `forwardRef`.
     }
-    onClose(message);
+    onClose(message, ignoreFocus);
   }
 
   setModalRef = (c) => {
@@ -95,16 +109,22 @@ export default class ModalRoot extends React.PureComponent {
   }
 
   render () {
-    const { type, props } = this.props;
+    const { type, props, ignoreFocus } = this.props;
     const { backgroundColor } = this.state;
     const visible = !!type;
 
     return (
-      <Base backgroundColor={backgroundColor} onClose={this.handleClose}>
+      <Base backgroundColor={backgroundColor} onClose={this.handleClose} ignoreFocus={ignoreFocus}>
         {visible && (
-          <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
-            {(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />}
-          </BundleContainer>
+          <>
+            <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
+              {(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />}
+            </BundleContainer>
+
+            <Helmet>
+              <meta name='robots' content='noindex' />
+            </Helmet>
+          </>
         )}
       </Base>
     );
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 901dbdfcb..9a9309be0 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -1,36 +1,107 @@
 import React from 'react';
-import { NavLink, withRouter } from 'react-router-dom';
-import { FormattedMessage } from 'react-intl';
-import Icon from 'mastodon/components/icon';
-import { profile_directory, showTrends } from 'mastodon/initial_state';
-import NotificationsCounterIcon from './notifications_counter_icon';
-import FollowRequestsNavLink from './follow_requests_nav_link';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
+import Logo from 'mastodon/components/logo';
+import { timelinePreview, showTrends } from 'mastodon/initial_state';
+import ColumnLink from './column_link';
+import DisabledAccountBanner from './disabled_account_banner';
+import FollowRequestsColumnLink from './follow_requests_column_link';
 import ListPanel from './list_panel';
-import TrendsContainer from 'mastodon/features/getting_started/containers/trends_container';
+import NotificationsCounterIcon from './notifications_counter_icon';
+import SignInBanner from './sign_in_banner';
+import NavigationPortal from 'mastodon/components/navigation_portal';
 
-const NavigationPanel = () => (
-  <div className='navigation-panel'>
-    <NavLink className='column-link column-link--transparent' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon className='column-link__icon' id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
-    <FollowRequestsNavLink />
-    <NavLink className='column-link column-link--transparent' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
-    <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
-    {profile_directory && <NavLink className='column-link column-link--transparent' to='/directory'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></NavLink>}
+const messages = defineMessages({
+  home: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+  explore: { id: 'explore.title', defaultMessage: 'Explore' },
+  local: { id: 'tabs_bar.local_timeline', defaultMessage: 'Local' },
+  federated: { id: 'tabs_bar.federated_timeline', defaultMessage: 'Federated' },
+  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
+  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
+  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
+  about: { id: 'navigation_bar.about', defaultMessage: 'About' },
+  search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
+});
 
-    <ListPanel />
+export default @injectIntl
+class NavigationPanel extends React.Component {
 
-    <hr />
+  static contextTypes = {
+    router: PropTypes.object.isRequired,
+    identity: PropTypes.object.isRequired,
+  };
 
-    <a className='column-link column-link--transparent' href='/settings/preferences'><Icon className='column-link__icon' id='cog' fixedWidth /><FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' /></a>
-    <a className='column-link column-link--transparent' href='/relationships'><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='navigation_bar.follows_and_followers' defaultMessage='Follows and followers' /></a>
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+  };
 
-    {showTrends && <div className='flex-spacer' />}
-    {showTrends && <TrendsContainer />}
-  </div>
-);
+  render () {
+    const { intl } = this.props;
+    const { signedIn, disabledAccountId } = this.context.identity;
 
-export default withRouter(NavigationPanel);
+    return (
+      <div className='navigation-panel'>
+        <div className='navigation-panel__logo'>
+          <Link to='/' className='column-link column-link--logo'><Logo /></Link>
+          <hr />
+        </div>
+
+        {signedIn && (
+          <React.Fragment>
+            <ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} />
+            <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
+            <FollowRequestsColumnLink />
+          </React.Fragment>
+        )}
+
+        {showTrends ? (
+          <ColumnLink transparent to='/explore' icon='hashtag' text={intl.formatMessage(messages.explore)} />
+        ) : (
+          <ColumnLink transparent to='/search' icon='search' text={intl.formatMessage(messages.search)} />
+        )}
+
+        {(signedIn || timelinePreview) && (
+          <>
+            <ColumnLink transparent to='/public/local' icon='users' text={intl.formatMessage(messages.local)} />
+            <ColumnLink transparent exact to='/public' icon='globe' text={intl.formatMessage(messages.federated)} />
+          </>
+        )}
+
+        {!signedIn && (
+          <div className='navigation-panel__sign-in-banner'>
+            <hr />
+            { disabledAccountId ? <DisabledAccountBanner /> : <SignInBanner /> }
+          </div>
+        )}
+
+        {signedIn && (
+          <React.Fragment>
+            <ColumnLink transparent to='/conversations' icon='at' text={intl.formatMessage(messages.direct)} />
+            <ColumnLink transparent to='/favourites' icon='star' text={intl.formatMessage(messages.favourites)} />
+            <ColumnLink transparent to='/bookmarks' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} />
+            <ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} />
+
+            <ListPanel />
+
+            <hr />
+
+            <ColumnLink transparent href='/settings/preferences' icon='cog' text={intl.formatMessage(messages.preferences)} />
+          </React.Fragment>
+        )}
+
+        <div className='navigation-panel__legal'>
+          <hr />
+          <ColumnLink transparent to='/about' icon='ellipsis-h' text={intl.formatMessage(messages.about)} />
+        </div>
+
+        <NavigationPortal />
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.js b/app/javascript/mastodon/features/ui/components/report_modal.js
index f4f0a3884..264da07ce 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@@ -1,38 +1,31 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { changeReportComment, changeReportForward, submitReport } from '../../../actions/reports';
-import { expandAccountTimeline } from '../../../actions/timelines';
+import { submitReport } from 'mastodon/actions/reports';
+import { expandAccountTimeline } from 'mastodon/actions/timelines';
+import { fetchServer } from 'mastodon/actions/server';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { makeGetAccount } from '../../../selectors';
+import { makeGetAccount } from 'mastodon/selectors';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-import StatusCheckBox from '../../report/containers/status_check_box_container';
 import { OrderedSet } from 'immutable';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import Button from '../../../components/button';
-import Toggle from 'react-toggle';
-import IconButton from '../../../components/icon_button';
+import IconButton from 'mastodon/components/icon_button';
+import Category from 'mastodon/features/report/category';
+import Statuses from 'mastodon/features/report/statuses';
+import Rules from 'mastodon/features/report/rules';
+import Comment from 'mastodon/features/report/comment';
+import Thanks from 'mastodon/features/report/thanks';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
-  placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
-  submit: { id: 'report.submit', defaultMessage: 'Submit' },
 });
 
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
-  const mapStateToProps = state => {
-    const accountId = state.getIn(['reports', 'new', 'account_id']);
-
-    return {
-      isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
-      account: getAccount(state, accountId),
-      comment: state.getIn(['reports', 'new', 'comment']),
-      forward: state.getIn(['reports', 'new', 'forward']),
-      statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
-    };
-  };
+  const mapStateToProps = (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+  });
 
   return mapStateToProps;
 };
@@ -42,92 +35,182 @@ export default @connect(makeMapStateToProps)
 class ReportModal extends ImmutablePureComponent {
 
   static propTypes = {
-    isSubmitting: PropTypes.bool,
-    account: ImmutablePropTypes.map,
-    statusIds: ImmutablePropTypes.orderedSet.isRequired,
-    comment: PropTypes.string.isRequired,
-    forward: PropTypes.bool,
+    accountId: PropTypes.string.isRequired,
+    statusId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
+    account: ImmutablePropTypes.map.isRequired,
   };
 
-  handleCommentChange = e => {
-    this.props.dispatch(changeReportComment(e.target.value));
-  }
-
-  handleForwardChange = e => {
-    this.props.dispatch(changeReportForward(e.target.checked));
-  }
+  state = {
+    step: 'category',
+    selectedStatusIds: OrderedSet(this.props.statusId ? [this.props.statusId] : []),
+    comment: '',
+    category: null,
+    selectedRuleIds: OrderedSet(),
+    forward: true,
+    isSubmitting: false,
+    isSubmitted: false,
+  };
 
   handleSubmit = () => {
-    this.props.dispatch(submitReport());
-  }
+    const { dispatch, accountId } = this.props;
+    const { selectedStatusIds, comment, category, selectedRuleIds, forward } = this.state;
 
-  handleKeyDown = e => {
-    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.handleSubmit();
+    this.setState({ isSubmitting: true });
+
+    dispatch(submitReport({
+      account_id: accountId,
+      status_ids: selectedStatusIds.toArray(),
+      comment,
+      forward,
+      category,
+      rule_ids: selectedRuleIds.toArray(),
+    }, this.handleSuccess, this.handleFail));
+  };
+
+  handleSuccess = () => {
+    this.setState({ isSubmitting: false, isSubmitted: true, step: 'thanks' });
+  };
+
+  handleFail = () => {
+    this.setState({ isSubmitting: false });
+  };
+
+  handleStatusToggle = (statusId, checked) => {
+    const { selectedStatusIds } = this.state;
+
+    if (checked) {
+      this.setState({ selectedStatusIds: selectedStatusIds.add(statusId) });
+    } else {
+      this.setState({ selectedStatusIds: selectedStatusIds.remove(statusId) });
+    }
+  };
+
+  handleRuleToggle = (ruleId, checked) => {
+    const { selectedRuleIds } = this.state;
+
+    if (checked) {
+      this.setState({ selectedRuleIds: selectedRuleIds.add(ruleId) });
+    } else {
+      this.setState({ selectedRuleIds: selectedRuleIds.remove(ruleId) });
     }
   }
 
+  handleChangeCategory = category => {
+    this.setState({ category });
+  };
+
+  handleChangeComment = comment => {
+    this.setState({ comment });
+  };
+
+  handleChangeForward = forward => {
+    this.setState({ forward });
+  };
+
+  handleNextStep = step => {
+    this.setState({ step });
+  };
+
   componentDidMount () {
-    this.props.dispatch(expandAccountTimeline(this.props.account.get('id'), { withReplies: true }));
-  }
+    const { dispatch, accountId } = this.props;
 
-  componentWillReceiveProps (nextProps) {
-    if (this.props.account !== nextProps.account && nextProps.account) {
-      this.props.dispatch(expandAccountTimeline(nextProps.account.get('id'), { withReplies: true }));
-    }
+    dispatch(expandAccountTimeline(accountId, { withReplies: true }));
+    dispatch(fetchServer());
   }
 
   render () {
-    const { account, comment, intl, statusIds, isSubmitting, forward, onClose } = this.props;
+    const {
+      accountId,
+      account,
+      intl,
+      onClose,
+    } = this.props;
 
     if (!account) {
       return null;
     }
 
-    const domain = account.get('acct').split('@')[1];
+    const {
+      step,
+      selectedStatusIds,
+      selectedRuleIds,
+      comment,
+      forward,
+      category,
+      isSubmitting,
+      isSubmitted,
+    } = this.state;
+
+    const domain   = account.get('acct').split('@')[1];
+    const isRemote = !!domain;
+
+    let stepComponent;
+
+    switch(step) {
+    case 'category':
+      stepComponent = (
+        <Category
+          onNextStep={this.handleNextStep}
+          startedFrom={this.props.statusId ? 'status' : 'account'}
+          category={category}
+          onChangeCategory={this.handleChangeCategory}
+        />
+      );
+      break;
+    case 'rules':
+      stepComponent = (
+        <Rules
+          onNextStep={this.handleNextStep}
+          selectedRuleIds={selectedRuleIds}
+          onToggle={this.handleRuleToggle}
+        />
+      );
+      break;
+    case 'statuses':
+      stepComponent = (
+        <Statuses
+          onNextStep={this.handleNextStep}
+          accountId={accountId}
+          selectedStatusIds={selectedStatusIds}
+          onToggle={this.handleStatusToggle}
+        />
+      );
+      break;
+    case 'comment':
+      stepComponent = (
+        <Comment
+          onSubmit={this.handleSubmit}
+          isSubmitting={isSubmitting}
+          isRemote={isRemote}
+          comment={comment}
+          forward={forward}
+          domain={domain}
+          onChangeComment={this.handleChangeComment}
+          onChangeForward={this.handleChangeForward}
+        />
+      );
+      break;
+    case 'thanks':
+      stepComponent = (
+        <Thanks
+          submitted={isSubmitted}
+          account={account}
+          onClose={onClose}
+        />
+      );
+    }
 
     return (
-      <div className='modal-root__modal report-modal'>
+      <div className='modal-root__modal report-dialog-modal'>
         <div className='report-modal__target'>
           <IconButton className='report-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={20} />
           <FormattedMessage id='report.target' defaultMessage='Report {target}' values={{ target: <strong>{account.get('acct')}</strong> }} />
         </div>
 
-        <div className='report-modal__container'>
-          <div className='report-modal__comment'>
-            <p><FormattedMessage id='report.hint' defaultMessage='The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:' /></p>
-
-            <textarea
-              className='setting-text light'
-              placeholder={intl.formatMessage(messages.placeholder)}
-              value={comment}
-              onChange={this.handleCommentChange}
-              onKeyDown={this.handleKeyDown}
-              disabled={isSubmitting}
-              autoFocus
-            />
-
-            {domain && (
-              <div>
-                <p><FormattedMessage id='report.forward_hint' defaultMessage='The account is from another server. Send an anonymized copy of the report there as well?' /></p>
-
-                <div className='setting-toggle'>
-                  <Toggle id='report-forward' checked={forward} disabled={isSubmitting} onChange={this.handleForwardChange} />
-                  <label htmlFor='report-forward' className='setting-toggle__label'><FormattedMessage id='report.forward' defaultMessage='Forward to {target}' values={{ target: domain }} /></label>
-                </div>
-              </div>
-            )}
-
-            <Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} />
-          </div>
-
-          <div className='report-modal__statuses'>
-            <div>
-              {statusIds.map(statusId => <StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />)}
-            </div>
-          </div>
+        <div className='report-dialog-modal__container'>
+          {stepComponent}
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.js b/app/javascript/mastodon/features/ui/components/sign_in_banner.js
new file mode 100644
index 000000000..8bd32edf9
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.js
@@ -0,0 +1,40 @@
+import React, { useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { useDispatch } from 'react-redux';
+import { registrationsOpen } from 'mastodon/initial_state';
+import { openModal } from 'mastodon/actions/modal';
+
+const SignInBanner = () => {
+  const dispatch = useDispatch();
+
+  const openClosedRegistrationsModal = useCallback(
+    () => dispatch(openModal('CLOSED_REGISTRATIONS')),
+    [dispatch],
+  );
+
+  let signupButton;
+
+  if (registrationsOpen) {
+    signupButton = (
+      <a href='/auth/sign_up' className='button button--block button-tertiary'>
+        <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+      </a>
+    );
+  } else {
+    signupButton = (
+      <button className='button button--block button-tertiary' onClick={openClosedRegistrationsModal}>
+        <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+      </button>
+    );
+  }
+
+  return (
+    <div className='sign-in-banner'>
+      <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.' /></p>
+      <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+      {signupButton}
+    </div>
+  );
+};
+
+export default SignInBanner;
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
deleted file mode 100644
index a023bcf34..000000000
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { NavLink, withRouter } from 'react-router-dom';
-import { FormattedMessage, injectIntl } from 'react-intl';
-import { debounce } from 'lodash';
-import { isUserTouching } from '../../../is_mobile';
-import Icon from 'mastodon/components/icon';
-import NotificationsCounterIcon from './notifications_counter_icon';
-
-export const links = [
-  <NavLink className='tabs-bar__link' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
-  <NavLink className='tabs-bar__link' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
-  <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
-  <NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
-];
-
-export function getIndex (path) {
-  return links.findIndex(link => link.props.to === path);
-}
-
-export function getLink (index) {
-  return links[index].props.to;
-}
-
-export default @injectIntl
-@withRouter
-class TabsBar extends React.PureComponent {
-
-  static propTypes = {
-    intl: PropTypes.object.isRequired,
-    history: PropTypes.object.isRequired,
-  }
-
-  setRef = ref => {
-    this.node = ref;
-  }
-
-  handleClick = (e) => {
-    // Only apply optimization for touch devices, which we assume are slower
-    // We thus avoid the 250ms delay for non-touch devices and the lag for touch devices
-    if (isUserTouching()) {
-      e.preventDefault();
-      e.persist();
-
-      requestAnimationFrame(() => {
-        const tabs = Array(...this.node.querySelectorAll('.tabs-bar__link'));
-        const currentTab = tabs.find(tab => tab.classList.contains('active'));
-        const nextTab = tabs.find(tab => tab.contains(e.target));
-        const { props: { to } } = links[Array(...this.node.childNodes).indexOf(nextTab)];
-
-
-        if (currentTab !== nextTab) {
-          if (currentTab) {
-            currentTab.classList.remove('active');
-          }
-
-          const listener = debounce(() => {
-            nextTab.removeEventListener('transitionend', listener);
-            this.props.history.push(to);
-          }, 50);
-
-          nextTab.addEventListener('transitionend', listener);
-          nextTab.classList.add('active');
-        }
-      });
-    }
-
-  }
-
-  render () {
-    const { intl: { formatMessage } } = this.props;
-
-    return (
-      <div className='tabs-bar__wrapper'>
-        <nav className='tabs-bar' ref={this.setRef}>
-          {links.map(link => React.cloneElement(link, { key: link.props.to, onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
-        </nav>
-
-        <div id='tabs-bar__portal' />
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/ui/containers/modal_container.js b/app/javascript/mastodon/features/ui/containers/modal_container.js
index 34fec8206..35be26222 100644
--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -3,22 +3,23 @@ import { openModal, closeModal } from '../../../actions/modal';
 import ModalRoot from '../components/modal_root';
 
 const mapStateToProps = state => ({
-  type: state.getIn(['modal', 0, 'modalType'], null),
-  props: state.getIn(['modal', 0, 'modalProps'], {}),
+  ignoreFocus: state.getIn(['modal', 'ignoreFocus']),
+  type: state.getIn(['modal', 'stack', 0, 'modalType'], null),
+  props: state.getIn(['modal', 'stack', 0, 'modalProps'], {}),
 });
 
 const mapDispatchToProps = dispatch => ({
-  onClose (confirmationMessage) {
+  onClose (confirmationMessage, ignoreFocus = false) {
     if (confirmationMessage) {
       dispatch(
         openModal('CONFIRM', {
           message: confirmationMessage.message,
           confirm: confirmationMessage.confirm,
-          onConfirm: () => dispatch(closeModal()),
+          onConfirm: () => dispatch(closeModal(undefined, { ignoreFocus })),
         }),
       );
     } else {
-      dispatch(closeModal());
+      dispatch(closeModal(undefined, { ignoreFocus }));
     }
   },
 });
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 3feffa656..b05956606 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { HotKeys } from 'react-hotkeys';
 import { defineMessages, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { Redirect, withRouter } from 'react-router-dom';
+import { Redirect, Route, withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import NotificationsContainer from './containers/notifications_container';
 import LoadingBarContainer from './containers/loading_bar_container';
@@ -13,14 +13,14 @@ import { debounce } from 'lodash';
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { expandHomeTimeline } from '../../actions/timelines';
 import { expandNotifications } from '../../actions/notifications';
-import { fetchFilters } from '../../actions/filters';
+import { fetchServer } from '../../actions/server';
 import { clearHeight } from '../../actions/height_cache';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
+import BundleColumnError from './components/bundle_column_error';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
-import DocumentTitle from './components/document_title';
 import PictureInPicture from 'mastodon/features/picture_in_picture';
 import {
   Compose,
@@ -40,7 +40,6 @@ import {
   HashtagTimeline,
   Notifications,
   FollowRequests,
-  GenericNotFound,
   FavouritedStatuses,
   BookmarkedStatuses,
   ListTimeline,
@@ -49,12 +48,15 @@ import {
   Mutes,
   PinnedStatuses,
   Lists,
-  Search,
   Directory,
+  Explore,
   FollowRecommendations,
+  About,
+  PrivacyPolicy,
 } from './util/async-components';
-import { me } from '../../initial_state';
+import initialState, { me, owner, singleUserMode, showTrends } from '../../initial_state';
 import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
+import Header from './components/header';
 
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
@@ -110,6 +112,10 @@ const keyMap = {
 
 class SwitchingColumnsArea extends React.PureComponent {
 
+  static contextTypes = {
+    identity: PropTypes.object,
+  };
+
   static propTypes = {
     children: PropTypes.node,
     location: PropTypes.object,
@@ -139,20 +145,39 @@ class SwitchingColumnsArea extends React.PureComponent {
 
   setRef = c => {
     if (c) {
-      this.node = c.getWrappedInstance();
+      this.node = c;
     }
   }
 
   render () {
     const { children, mobile } = this.props;
-    const redirect = mobile ? <Redirect from='/' to='/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
+    const { signedIn } = this.context.identity;
+
+    let redirect;
+
+    if (signedIn) {
+      if (mobile) {
+        redirect = <Redirect from='/' to='/home' exact />;
+      } else {
+        redirect = <Redirect from='/' to='/getting-started' exact />;
+      }
+    } else if (singleUserMode && owner && initialState?.accounts[owner]) {
+      redirect = <Redirect from='/' to={`/@${initialState.accounts[owner].username}`} exact />;
+    } else if (showTrends) {
+      redirect = <Redirect from='/' to='/explore' exact />;
+    } else {
+      redirect = <Redirect from='/' to='/about' exact />;
+    }
 
     return (
       <ColumnsAreaContainer ref={this.setRef} singleColumn={mobile}>
         <WrappedSwitch>
           {redirect}
+
           <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
           <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
+          <WrappedRoute path='/about' component={About} content={children} />
+          <WrappedRoute path='/privacy-policy' component={PrivacyPolicy} content={children} />
 
           <WrappedRoute path={['/home', '/timelines/home']} component={HomeTimeline} content={children} />
           <WrappedRoute path={['/public', '/timelines/public']} exact component={PublicTimeline} content={children} />
@@ -167,14 +192,15 @@ class SwitchingColumnsArea extends React.PureComponent {
           <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
           <WrappedRoute path='/start' component={FollowRecommendations} content={children} />
-          <WrappedRoute path='/search' component={Search} content={children} />
           <WrappedRoute path='/directory' component={Directory} content={children} />
+          <WrappedRoute path={['/explore', '/search']} component={Explore} content={children} />
           <WrappedRoute path={['/publish', '/statuses/new']} component={Compose} content={children} />
 
           <WrappedRoute path={['/@:acct', '/accounts/:id']} exact component={AccountTimeline} content={children} />
+          <WrappedRoute path='/@:acct/tagged/:tagged?' exact component={AccountTimeline} content={children} />
           <WrappedRoute path={['/@:acct/with_replies', '/accounts/:id/with_replies']} component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
-          <WrappedRoute path={['/@:acct/followers', '/accounts/:id/followers']} component={Followers} content={children} />
-          <WrappedRoute path={['/@:acct/following', '/accounts/:id/following']} component={Following} content={children} />
+          <WrappedRoute path={['/accounts/:id/followers', '/users/:acct/followers', '/@:acct/followers']} component={Followers} content={children} />
+          <WrappedRoute path={['/accounts/:id/following', '/users/:acct/following', '/@:acct/following']} component={Following} content={children} />
           <WrappedRoute path={['/@:acct/media', '/accounts/:id/media']} component={AccountGallery} content={children} />
           <WrappedRoute path='/@:acct/:statusId' exact component={Status} content={children} />
           <WrappedRoute path='/@:acct/:statusId/reblogs' component={Reblogs} content={children} />
@@ -193,7 +219,7 @@ class SwitchingColumnsArea extends React.PureComponent {
           <WrappedRoute path='/mutes' component={Mutes} content={children} />
           <WrappedRoute path='/lists' component={Lists} content={children} />
 
-          <WrappedRoute component={GenericNotFound} content={children} />
+          <Route component={BundleColumnError} />
         </WrappedSwitch>
       </ColumnsAreaContainer>
     );
@@ -208,6 +234,7 @@ class UI extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
+    identity: PropTypes.object.isRequired,
   };
 
   static propTypes = {
@@ -263,7 +290,7 @@ class UI extends React.PureComponent {
       this.dragTargets.push(e.target);
     }
 
-    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore) {
+    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore && this.context.identity.signedIn) {
       this.setState({ draggingOver: true });
     }
   }
@@ -291,7 +318,7 @@ class UI extends React.PureComponent {
     this.setState({ draggingOver: false });
     this.dragTargets = [];
 
-    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore) {
+    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore && this.context.identity.signedIn) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
     }
   }
@@ -343,6 +370,8 @@ class UI extends React.PureComponent {
   }
 
   componentDidMount () {
+    const { signedIn } = this.context.identity;
+
     window.addEventListener('focus', this.handleWindowFocus, false);
     window.addEventListener('blur', this.handleWindowBlur, false);
     window.addEventListener('beforeunload', this.handleBeforeUnload, false);
@@ -359,15 +388,18 @@ class UI extends React.PureComponent {
     }
 
     // On first launch, redirect to the follow recommendations page
-    if (this.props.firstLaunch) {
+    if (signedIn && this.props.firstLaunch) {
       this.context.router.history.replace('/start');
       this.props.dispatch(closeOnboarding());
     }
 
-    this.props.dispatch(fetchMarkers());
-    this.props.dispatch(expandHomeTimeline());
-    this.props.dispatch(expandNotifications());
-    setTimeout(() => this.props.dispatch(fetchFilters()), 500);
+    if (signedIn) {
+      this.props.dispatch(fetchMarkers());
+      this.props.dispatch(expandHomeTimeline());
+      this.props.dispatch(expandNotifications());
+
+      setTimeout(() => this.props.dispatch(fetchServer()), 3000);
+    }
 
     this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
       return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
@@ -536,6 +568,8 @@ class UI extends React.PureComponent {
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
+          <Header />
+
           <SwitchingColumnsArea location={location} mobile={layout === 'mobile' || layout === 'single-column'}>
             {children}
           </SwitchingColumnsArea>
@@ -545,7 +579,6 @@ class UI extends React.PureComponent {
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
-          <DocumentTitle />
         </div>
       </HotKeys>
     );
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index aa90b226a..6046578de 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -138,10 +138,6 @@ export function ListAdder () {
   return import(/*webpackChunkName: "features/list_adder" */'../../list_adder');
 }
 
-export function Search () {
-  return import(/*webpackChunkName: "features/search" */'../../search');
-}
-
 export function Tesseract () {
   return import(/*webpackChunkName: "tesseract" */'tesseract.js');
 }
@@ -157,3 +153,35 @@ export function Directory () {
 export function FollowRecommendations () {
   return import(/* webpackChunkName: "features/follow_recommendations" */'../../follow_recommendations');
 }
+
+export function CompareHistoryModal () {
+  return import(/*webpackChunkName: "modals/compare_history_modal" */'../components/compare_history_modal');
+}
+
+export function Explore () {
+  return import(/* webpackChunkName: "features/explore" */'../../explore');
+}
+
+export function FilterModal () {
+  return import(/*webpackChunkName: "modals/filter_modal" */'../components/filter_modal');
+}
+
+export function InteractionModal () {
+  return import(/*webpackChunkName: "modals/interaction_modal" */'../../interaction_modal');
+}
+
+export function SubscribedLanguagesModal () {
+  return import(/*webpackChunkName: "modals/subscribed_languages_modal" */'../../subscribed_languages_modal');
+}
+
+export function ClosedRegistrationsModal () {
+  return import(/*webpackChunkName: "modals/closed_registrations_modal" */'../../closed_registrations_modal');
+}
+
+export function About () {
+  return import(/*webpackChunkName: "features/about" */'../../about');
+}
+
+export function PrivacyPolicy () {
+  return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy');
+}
diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.js b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
index d452b871f..205dd6f10 100644
--- a/app/javascript/mastodon/features/ui/util/react_router_helpers.js
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Switch, Route } from 'react-router-dom';
-
+import StackTrace from 'stacktrace-js';
 import ColumnLoading from '../components/column_loading';
 import BundleColumnError from '../components/bundle_column_error';
 import BundleContainer from '../containers/bundle_container';
@@ -42,8 +42,38 @@ export class WrappedRoute extends React.Component {
     componentParams: {},
   };
 
+  static getDerivedStateFromError () {
+    return {
+      hasError: true,
+    };
+  }
+
+  state = {
+    hasError: false,
+    stacktrace: '',
+  };
+
+  componentDidCatch (error) {
+    StackTrace.fromError(error).then(stackframes => {
+      this.setState({ stacktrace: error.toString() + '\n' + stackframes.map(frame => frame.toString()).join('\n') });
+    }).catch(err => {
+      console.error(err);
+    });
+  }
+
   renderComponent = ({ match }) => {
     const { component, content, multiColumn, componentParams } = this.props;
+    const { hasError, stacktrace } = this.state;
+
+    if (hasError) {
+      return (
+        <BundleColumnError
+          stacktrace={stacktrace}
+          multiColumn={multiColumn}
+          errorType='error'
+        />
+      );
+    }
 
     return (
       <BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
@@ -53,11 +83,13 @@ export class WrappedRoute extends React.Component {
   }
 
   renderLoading = () => {
-    return <ColumnLoading />;
+    const { multiColumn } = this.props;
+
+    return <ColumnLoading multiColumn={multiColumn} />;
   }
 
   renderError = (props) => {
-    return <BundleColumnError {...props} />;
+    return <BundleColumnError {...props} errorType='network' />;
   }
 
   render () {
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 70e3cd6e8..4f90e955f 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -91,7 +91,7 @@ export const fileNameFromURL = str => {
   const pathname = url.pathname;
   const index    = pathname.lastIndexOf('/');
 
-  return pathname.substring(index + 1);
+  return pathname.slice(index + 1);
 };
 
 export default @injectIntl
@@ -121,7 +121,7 @@ class Video extends React.PureComponent {
     autoPlay: PropTypes.bool,
     volume: PropTypes.number,
     muted: PropTypes.bool,
-    componetIndex: PropTypes.number,
+    componentIndex: PropTypes.number,
   };
 
   static defaultProps = {
@@ -502,7 +502,7 @@ class Video extends React.PureComponent {
       startTime: this.video.currentTime,
       autoPlay: !this.state.paused,
       defaultVolume: this.state.volume,
-      componetIndex: this.props.componetIndex,
+      componentIndex: this.props.componentIndex,
     });
   }
 
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 1389a3c3d..62fd4ac72 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -1,31 +1,136 @@
+// @ts-check
+
+/**
+ * @typedef Emoji
+ * @property {string} shortcode
+ * @property {string} static_url
+ * @property {string} url
+ */
+
+/**
+ * @typedef AccountField
+ * @property {string} name
+ * @property {string} value
+ * @property {string} verified_at
+ */
+
+/**
+ * @typedef Account
+ * @property {string} acct
+ * @property {string} avatar
+ * @property {string} avatar_static
+ * @property {boolean} bot
+ * @property {string} created_at
+ * @property {boolean=} discoverable
+ * @property {string} display_name
+ * @property {Emoji[]} emojis
+ * @property {AccountField[]} fields
+ * @property {number} followers_count
+ * @property {number} following_count
+ * @property {boolean} group
+ * @property {string} header
+ * @property {string} header_static
+ * @property {string} id
+ * @property {string=} last_status_at
+ * @property {boolean} locked
+ * @property {string} note
+ * @property {number} statuses_count
+ * @property {string} url
+ * @property {string} username
+ */
+
+/**
+ * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
+ */
+
+/**
+ * @typedef InitialStateMeta
+ * @property {string} access_token
+ * @property {boolean=} advanced_layout
+ * @property {boolean} auto_play_gif
+ * @property {boolean} activity_api_enabled
+ * @property {string} admin
+ * @property {boolean=} boost_modal
+ * @property {boolean} crop_images
+ * @property {boolean=} delete_modal
+ * @property {boolean=} disable_swiping
+ * @property {string=} disabled_account_id
+ * @property {boolean} display_media
+ * @property {string} domain
+ * @property {boolean=} expand_spoilers
+ * @property {boolean} limited_federation_mode
+ * @property {string} locale
+ * @property {string | null} mascot
+ * @property {string=} me
+ * @property {string=} moved_to_account_id
+ * @property {string=} owner
+ * @property {boolean} profile_directory
+ * @property {boolean} registrations_open
+ * @property {boolean} reduce_motion
+ * @property {string} repository
+ * @property {boolean} search_enabled
+ * @property {boolean} single_user_mode
+ * @property {string} source_url
+ * @property {string} streaming_api_base_url
+ * @property {boolean} timeline_preview
+ * @property {string} title
+ * @property {boolean} trends
+ * @property {boolean} unfollow_modal
+ * @property {boolean} use_blurhash
+ * @property {boolean=} use_pending_items
+ * @property {string} version
+ * @property {boolean} translation_enabled
+ */
+
+/**
+ * @typedef InitialState
+ * @property {Record<string, Account>} accounts
+ * @property {InitialStateLanguage[]} languages
+ * @property {InitialStateMeta} meta
+ */
+
 const element = document.getElementById('initial-state');
-const initialState = element && JSON.parse(element.textContent);
+/** @type {InitialState | undefined} */
+const initialState = element?.textContent && JSON.parse(element.textContent);
 
-const getMeta = (prop) => initialState && initialState.meta && initialState.meta[prop];
+/**
+ * @template {keyof InitialStateMeta} K
+ * @param {K} prop
+ * @returns {InitialStateMeta[K] | undefined}
+ */
+const getMeta = (prop) => initialState?.meta && initialState.meta[prop];
 
-export const reduceMotion = getMeta('reduce_motion');
+export const activityApiEnabled = getMeta('activity_api_enabled');
 export const autoPlayGif = getMeta('auto_play_gif');
-export const displayMedia = getMeta('display_media');
-export const expandSpoilers = getMeta('expand_spoilers');
-export const unfollowModal = getMeta('unfollow_modal');
 export const boostModal = getMeta('boost_modal');
+export const cropImages = getMeta('crop_images');
 export const deleteModal = getMeta('delete_modal');
-export const me = getMeta('me');
-export const searchEnabled = getMeta('search_enabled');
-export const invitesEnabled = getMeta('invites_enabled');
-export const limitedFederationMode = getMeta('limited_federation_mode');
-export const repository = getMeta('repository');
-export const source_url = getMeta('source_url');
-export const version = getMeta('version');
-export const mascot = getMeta('mascot');
-export const profile_directory = getMeta('profile_directory');
-export const isStaff = getMeta('is_staff');
+export const disableSwiping = getMeta('disable_swiping');
+export const disabledAccountId = getMeta('disabled_account_id');
+export const displayMedia = getMeta('display_media');
+export const domain = getMeta('domain');
+export const expandSpoilers = getMeta('expand_spoilers');
 export const forceSingleColumn = !getMeta('advanced_layout');
+export const limitedFederationMode = getMeta('limited_federation_mode');
+export const mascot = getMeta('mascot');
+export const me = getMeta('me');
+export const movedToAccountId = getMeta('moved_to_account_id');
+export const owner = getMeta('owner');
+export const profile_directory = getMeta('profile_directory');
+export const reduceMotion = getMeta('reduce_motion');
+export const registrationsOpen = getMeta('registrations_open');
+export const repository = getMeta('repository');
+export const searchEnabled = getMeta('search_enabled');
+export const showTrends = getMeta('trends');
+export const singleUserMode = getMeta('single_user_mode');
+export const source_url = getMeta('source_url');
+export const timelinePreview = getMeta('timeline_preview');
+export const title = getMeta('title');
+export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
-export const showTrends = getMeta('trends');
-export const title = getMeta('title');
-export const cropImages = getMeta('crop_images');
-export const disableSwiping = getMeta('disable_swiping');
+export const version = getMeta('version');
+export const translationEnabled = getMeta('translation_enabled');
+export const languages = initialState?.languages;
 
 export default initialState;
diff --git a/app/javascript/mastodon/is_mobile.js b/app/javascript/mastodon/is_mobile.js
index 2926eb4b1..3c8ec1545 100644
--- a/app/javascript/mastodon/is_mobile.js
+++ b/app/javascript/mastodon/is_mobile.js
@@ -1,10 +1,19 @@
+// @ts-check
+
 import { supportsPassiveEvents } from 'detect-passive-events';
 import { forceSingleColumn } from 'mastodon/initial_state';
 
 const LAYOUT_BREAKPOINT = 630;
 
+/**
+ * @param {number} width
+ * @returns {boolean}
+ */
 export const isMobile = width => width <= LAYOUT_BREAKPOINT;
 
+/**
+ * @returns {string}
+ */
 export const layoutFromWindow = () => {
   if (isMobile(window.innerWidth)) {
     return 'mobile';
@@ -17,11 +26,13 @@ export const layoutFromWindow = () => {
 
 const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
 
+const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
+
 let userTouching = false;
-let listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 
 const touchListener = () => {
   userTouching = true;
+
   window.removeEventListener('touchstart', touchListener, listenerOptions);
 };
 
diff --git a/app/javascript/mastodon/load_polyfills.js b/app/javascript/mastodon/load_polyfills.js
index 73eedc9dc..cc5bcd18f 100644
--- a/app/javascript/mastodon/load_polyfills.js
+++ b/app/javascript/mastodon/load_polyfills.js
@@ -26,6 +26,7 @@ function loadPolyfills() {
   // Edge does not have requestIdleCallback and object-fit CSS property.
   // This avoids shipping them all the polyfills.
   const needsExtraPolyfills = !(
+    window.AbortController &&
     window.IntersectionObserver &&
     window.IntersectionObserverEntry &&
     'isIntersecting' in IntersectionObserverEntry.prototype &&
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index eca4765c4..d4a992766 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -1,181 +1,233 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "about.blocks": "Gemodereerde bedieners",
+  "about.contact": "Kontak:",
+  "about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Beperk",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Opgeskort",
+  "about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
+  "about.powered_by": "Gedesentraliseerde sosiale media aangedryf deur {mastodon}",
+  "about.rules": "Bedienerreëls",
+  "account.account_note_header": "Nota",
+  "account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
-  "account.block": "Block @{name}",
-  "account.block_domain": "Block domain {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain blocked",
-  "account.edit_profile": "Edit profile",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
+  "account.badges.group": "Groep",
+  "account.block": "Blokkeer @{name}",
+  "account.block_domain": "Blokkeer domein {domain}",
+  "account.blocked": "Geblokkeer",
+  "account.browse_more_on_origin_server": "Verken die oorspronklike profiel",
+  "account.cancel_follow_request": "Herroep volgversoek",
+  "account.direct": "Stuur direkte boodskap aan @{name}",
+  "account.disable_notifications": "Hou op om my van @{name} se plasings te laat weet",
+  "account.domain_blocked": "Domein geblokkeer",
+  "account.edit_profile": "Redigeer profiel",
+  "account.enable_notifications": "Laat weet my wanneer @{name} iets plaas",
+  "account.endorse": "Toon op profiel",
+  "account.featured_tags.last_status_at": "Laaste plasing op {date}",
+  "account.featured_tags.last_status_never": "Geen plasings nie",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "Volg",
+  "account.followers": "Volgers",
+  "account.followers.empty": "Hierdie gebruiker het nog nie volgers nie.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Volg",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.follows.empty": "Die gebruiker volg nog niemand.",
+  "account.follows_you": "Volg jou",
+  "account.go_to_profile": "Gaan na profiel",
+  "account.hide_reblogs": "Versteek plasings wat deur @{name} aangestuur is",
+  "account.joined_short": "Aangesluit",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Eienaarskap van hierdie skakel is nagegaan op {date}",
+  "account.locked_info": "Die rekening se privaatheidstatus is gesluit. Die eienaar hersien handmatig wie hom/haar kan volg.",
   "account.media": "Media",
-  "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unblock domain {domain}",
-  "account.unendorse": "Don't feature on profile",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
+  "account.mention": "Noem @{name}",
+  "account.moved_to": "{name} het aangedui hulle nuwe rekening is nou:",
+  "account.mute": "Doof @{name} uit",
+  "account.mute_notifications": "Doof kennisgewings van @{name} uit",
+  "account.muted": "Uitgedoof",
+  "account.open_original_page": "Maak oorspronklike blad oop",
+  "account.posts": "Plasings",
+  "account.posts_with_replies": "Plasings en antwoorde",
+  "account.report": "Rapporteer @{name}",
+  "account.requested": "Wag op goedkeuring. Klik om volgversoek te kanselleer",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Deel @{name} se profiel",
+  "account.show_reblogs": "Wys aangestuurde plasings van @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Plaas} other {{counter} Plasings}}",
+  "account.unblock": "Deblokkeer @{name}",
+  "account.unblock_domain": "Deblokkeer domein {domain}",
+  "account.unblock_short": "Deblokkeer",
+  "account.unendorse": "Moenie op profiel toon nie",
+  "account.unfollow": "Ontvolg",
+  "account.unmute": "Hef uitdowing van @{name} op",
+  "account.unmute_notifications": "Toon weer kennisgewings van @{name}",
+  "account.unmute_short": "Hef uitdowing op",
+  "account_note.placeholder": "Klik om nota by te voeg",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Gemiddeld",
+  "admin.dashboard.retention.cohort": "Registrasiemaand",
+  "admin.dashboard.retention.cohort_size": "Nuwe gebruikers",
+  "alert.rate_limited.message": "Probeer asseblief weer na {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Deurvloei beperk",
+  "alert.unexpected.message": "Iets het skeefgeloop.",
+  "alert.unexpected.title": "Oeps!",
+  "announcement.announcement": "Aankondiging",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
-  "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
-  "column.blocks": "Blocked users",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Local timeline",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Blocked domains",
-  "column.favourites": "Favourites",
-  "column.follow_requests": "Follow requests",
-  "column.home": "Home",
-  "column.lists": "Lists",
-  "column.mutes": "Muted users",
-  "column.notifications": "Notifications",
-  "column.pins": "Pinned toot",
-  "column.public": "Federated timeline",
-  "column_back_button.label": "Back",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Ag nee!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Netwerkfout",
+  "bundle_column_error.retry": "Probeer weer",
+  "bundle_column_error.return": "Keer terug na die tuisblad",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Sluit",
+  "bundle_modal_error.message": "Die laai van die komponent het iewers skeefgeloop.",
+  "bundle_modal_error.retry": "Probeer weer",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Vind 'n ander bediener",
+  "closed_registrations_modal.preamble": "Omdat Mastodon gedesentraliseer is, kan jy op hierdie bediener enigiemand volg en met enigiemand gesels, al is jou rekening op ‘n ander bediener. Jy kan selfs jou eie bediener by die netwerk voeg!",
+  "closed_registrations_modal.title": "Registreer op Mastodon",
+  "column.about": "Oor",
+  "column.blocks": "Geblokkeerde gebruikers",
+  "column.bookmarks": "Boekmerke",
+  "column.community": "Plaaslike tydlyn",
+  "column.direct": "Direkte boodskappe",
+  "column.directory": "Blaai deur profiele",
+  "column.domain_blocks": "Geblokkeerde domeine",
+  "column.favourites": "Gunstelinge",
+  "column.follow_requests": "Volgversoeke",
+  "column.home": "Tuis",
+  "column.lists": "Lyste",
+  "column.mutes": "Uitgedoofte gebruikers",
+  "column.notifications": "Kennisgewings",
+  "column.pins": "Vasgemaakte plasings",
+  "column.public": "Gefedereerde tydlyn",
+  "column_back_button.label": "Terug",
+  "column_header.hide_settings": "Versteek instellings",
+  "column_header.moveLeft_settings": "Skuif kolom na links",
+  "column_header.moveRight_settings": "Skuif kolom na regs",
+  "column_header.pin": "Maak vas",
+  "column_header.show_settings": "Wys instellings",
+  "column_header.unpin": "Maak los",
+  "column_subheading.settings": "Instellings",
+  "community.column_settings.local_only": "Slegs plaaslik",
+  "community.column_settings.media_only": "Slegs media",
+  "community.column_settings.remote_only": "Slegs elders",
+  "compose.language.change": "Verander taal",
+  "compose.language.search": "Soek tale...",
+  "compose_form.direct_message_warning_learn_more": "Leer meer",
+  "compose_form.encryption_warning": "Plasings op Mastodon is nie van punt tot punt versleutel nie. Moet geen sensitiewe inligting op Mastodon deel nie.",
+  "compose_form.hashtag_warning": "Hierdie plasing is ongelys en sal dus onder geen hutsetiket verskyn nie. Slegs openbare plasings is vindbaar wanneer daar na hutsetikette gesoek word.",
+  "compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
+  "compose_form.lock_disclaimer.lock": "gesluit",
+  "compose_form.placeholder": "Wat wil jy deel?",
+  "compose_form.poll.add_option": "Voeg ’n keuse by",
+  "compose_form.poll.duration": "Duur van peiling",
+  "compose_form.poll.option_placeholder": "Keuse {number}",
+  "compose_form.poll.remove_option": "Verwyder hierdie keuse",
+  "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
+  "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
+  "compose_form.publish": "Publiseer",
+  "compose_form.publish_form": "Publiseer",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Stoor veranderinge",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Write your warning here",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
+  "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
+  "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
+  "confirmation_modal.cancel": "Kanselleer",
+  "confirmations.block.block_and_report": "Blokkeer en rapporteer",
+  "confirmations.block.confirm": "Blokkeer",
+  "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
+  "confirmations.cancel_follow_request.confirm": "Herroep versoek",
+  "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
+  "confirmations.delete.confirm": "Wis uit",
+  "confirmations.delete.message": "Is jy seker jy wil hierdie plasing uitvee?",
+  "confirmations.delete_list.confirm": "Wis uit",
+  "confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
+  "confirmations.discard_edit_media.confirm": "Gooi weg",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "Blokkeer die hele domein",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.confirm": "Teken Uit",
+  "confirmations.logout.message": "Is jy seker jy wil uitteken?",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-  "confirmations.reply.confirm": "Reply",
+  "confirmations.redraft.message": "Is jy seker jy wil hierdie plasing uitvee en oorbegin? Goedkeurings en aangestuurde plasings gaan verdwyn en antwoorde op jou oorspronklike plasing gaan wees gelaat word.",
+  "confirmations.reply.confirm": "Antwoord",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
+  "conversation.mark_as_read": "Merk as gelees",
+  "conversation.open": "Sien gesprek",
+  "conversation.with": "Met {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "Van bekende fediversum",
+  "directory.local": "Slegs van {domain}",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
+  "disabled_account_banner.account_settings": "Rekeninginstellings",
+  "disabled_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Bed hierdie plasing op jou webblad in met die kode wat jy hier onder kan kopieer.",
+  "embed.preview": "Dit sal so lyk:",
+  "emoji_button.activity": "Aktiwiteit",
+  "emoji_button.clear": "Maak skoon",
+  "emoji_button.custom": "Eie",
+  "emoji_button.flags": "Vlae",
+  "emoji_button.food": "Eet- en drinkgoed",
   "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.nature": "Natuur",
+  "emoji_button.not_found": "Geen passende emoji gevind nie",
   "emoji_button.objects": "Objects",
   "emoji_button.people": "People",
   "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
+  "emoji_button.search": "Soek...",
+  "emoji_button.search_results": "Soekresultate",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
   "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline": "Geen plasings hier nie!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.bookmarked_statuses": "Jy het nog geen boekmerke gelaat nie. Boekmerke wat jy by plasings laat, sal jy hier sien.",
+  "empty_column.community": "Die plaaslike tydlyn is leeg. Kry die bal aan die rol deur iets te skryf wat mense kan lees!",
+  "empty_column.direct": "Jy het nog nie direkte boodskappe nie. Wanneer jy een stuur of ontvang, sal dit hier verskyn.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "Jy het nog geen gunstelingplasings nie. As jy een as gunsteling merk, sal jy dit hier sien.",
+  "empty_column.favourites": "Hierdie plasing het nog nie goedkeurings ontvang nie. As iemand dit as gunsteling merk, sien jy dit hier.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.follow_requests": "Jy het nog geen volgversoeke nie. Wanneer jy een ontvang, sal dit hier vertoon.",
+  "empty_column.hashtag": "Daar is nog niks vir hierdie hutsetiket nie.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.list": "Hierdie lys is nog leeg. Nuwe plasings deur lyslede sal voortaan hier verskyn.",
+  "empty_column.lists": "Jy het nog geen lyste nie. Wanneer jy een skep, sal dit hier vertoon.",
   "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.notifications": "Jy het nog geen kennisgewings nie. Interaksie van ander mense met jou, sal hier vertoon.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
   "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
@@ -183,155 +235,202 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Soekresultate",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Soek of skep",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.lead": "Plasings van mense wat jy volg, kom chronologies in jou tuisvoer verby. Moenie huiwer nie. Volg na hartelus. As daar mense is wie se plasings jy nie meer wil sien nie, ontvolg hulle net!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "Oor",
+  "footer.directory": "Profielgids",
+  "footer.get_app": "Kry die app",
+  "footer.invite": "Nooi ander",
+  "footer.keyboard_shortcuts": "Kortpadsleutels",
+  "footer.privacy_policy": "Privaatheidsbeleid",
+  "footer.source_code": "Wys bronkode",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.heading": "Kom aan die gang",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.select.placeholder": "Voer hutsetikette in…",
   "hashtag.column_settings.tag_mode.all": "All of these",
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
+  "hashtag.follow": "Volg hutsetiket",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
+  "interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Omdat Mastodon gedesentraliseer is, hoef jy nie ’n rekening op hierdie bediener te hê nie. Jy kan jy jou bestaande Mastodonrekening gebruik, al word dit op 'n ander Mastodonbediener of versoenbare platform waar ook al gehuisves.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
+  "interaction_modal.title.reply": "Reageer op {name} se plasing",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.back": "Navigeer terug",
+  "keyboard_shortcuts.blocked": "Vertoon lys van geblokkeerde gebruikers",
+  "keyboard_shortcuts.boost": "Stuur aan",
+  "keyboard_shortcuts.column": "Fokuskolom",
+  "keyboard_shortcuts.compose": "Teksveld vir skryf",
+  "keyboard_shortcuts.description": "Beskrywing",
+  "keyboard_shortcuts.direct": "om kolom vir direkte boodskappe oop te maak",
+  "keyboard_shortcuts.down": "Gaan afwaarts in die lys",
+  "keyboard_shortcuts.enter": "Sien plasing",
+  "keyboard_shortcuts.favourite": "Gunsteling",
+  "keyboard_shortcuts.favourites": "Sien gunstelinge",
+  "keyboard_shortcuts.federated": "Sien gefedereerde stroom",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "Sien tuisvoer",
   "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "Vertoon hierdie legende",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.notifications": "Vertoon kennisgewingkolom",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.pinned": "Vertoon vasgemaakte plasings",
+  "keyboard_shortcuts.profile": "Vertoon skrywersprofiel",
+  "keyboard_shortcuts.reply": "Reageer op plasing",
+  "keyboard_shortcuts.requests": "Sien volgversoeke",
+  "keyboard_shortcuts.search": "Fokus op soekvenster",
+  "keyboard_shortcuts.spoilers": "Wys/versteek veld vir inhoudswaarskuwing",
+  "keyboard_shortcuts.start": "Open wegspringkolom",
+  "keyboard_shortcuts.toggle_hidden": "Wys/versteek teks agter IW",
+  "keyboard_shortcuts.toggle_sensitivity": "Wys/versteek media",
+  "keyboard_shortcuts.toot": "Begin ’n nuwe plasing",
+  "keyboard_shortcuts.unfocus": "Fokus uit van teksveld/soekveld",
+  "keyboard_shortcuts.up": "Beweeg opwaarts in die lys",
   "lightbox.close": "Close",
   "lightbox.compress": "Compress image view box",
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
+  "limited_account_hint.action": "Vertoon profiel in elk geval",
+  "limited_account_hint.title": "Hierdie profiel is deur moderators van {domain} versteek.",
+  "lists.account.add": "Voeg by lys",
+  "lists.account.remove": "Verwyder vanaf lys",
+  "lists.delete": "Verwyder lys",
+  "lists.edit": "Redigeer lys",
+  "lists.edit.submit": "Verander titel",
+  "lists.new.create": "Voeg lys by",
+  "lists.new.title_placeholder": "Nuwe lys titel",
   "lists.replies_policy.followed": "Any followed user",
   "lists.replies_policy.list": "Members of the list",
   "lists.replies_policy.none": "No one",
   "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.search": "Soek tussen mense wat jy volg",
+  "lists.subheading": "Jou lyste",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer omdat jy na {movedToAccount} verhuis het.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "Oor",
   "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.bookmarks": "Boekmerke",
+  "navigation_bar.community_timeline": "Plaaslike tydlyn",
+  "navigation_bar.compose": "Skep nuwe plasing",
+  "navigation_bar.direct": "Direkte boodskappe",
   "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.domain_blocks": "Geblokkeerde domeine",
+  "navigation_bar.edit_profile": "Redigeer profiel",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Gunstelinge",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
+  "navigation_bar.lists": "Lyste",
+  "navigation_bar.logout": "Teken uit",
   "navigation_bar.mutes": "Muted users",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.personal": "Persoonlik",
+  "navigation_bar.pins": "Vasgemaakte plasings",
+  "navigation_bar.preferences": "Voorkeure",
+  "navigation_bar.public_timeline": "Gefedereerde tydlyn",
+  "navigation_bar.search": "Soek",
   "navigation_bar.security": "Security",
-  "notification.favourite": "{name} favourited your status",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} hou van jou plasing",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} boosted your status",
+  "notification.reblog": "{name} het jou plasing aangestuur",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.favourite": "Gunstelinge:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.push": "Stootkennisgewings",
+  "notifications.column_settings.reblog": "Aangestuurde plasings:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.status": "Nuwe plasings:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.boosts": "Aangestuurde plasings",
+  "notifications.filter.favourites": "Gunstelinge",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
   "notifications.filter.statuses": "Updates from people you follow",
   "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
+  "notifications.group": "{count} kennisgewings",
   "notifications.mark_as_read": "Mark every notification as read",
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
@@ -349,92 +448,161 @@
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.change": "Verander privaatheid van plasing",
+  "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
+  "privacy.direct.short": "Slegs genoemde persone",
+  "privacy.private.long": "Slegs sigbaar vir volgelinge",
+  "privacy.private.short": "Slegs volgelinge",
+  "privacy.public.long": "Sigbaar vir almal",
+  "privacy.public.short": "Publiek",
+  "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
+  "privacy.unlisted.short": "Ongelys",
+  "privacy_policy.last_updated": "Laaste bywerking op {date}",
+  "privacy_policy.title": "Privaatheidsbeleid",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
+  "reply_indicator.cancel": "Kanselleer",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
-  "report.target": "Report {target}",
-  "search.placeholder": "Search",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Verslag {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Soek",
+  "search.search_or_paste": "Soek of plak URL",
+  "search_popout.search_format": "Formaat vir gevorderd soek",
+  "search_popout.tips.full_text": "Gewone teks laat sien plasings wat jy geskryf het, van gehou het, aangestuur het of in genoem is, asook ooreenstemmende gebruikersname, vertoonde name en hutsetikette.",
+  "search_popout.tips.hashtag": "hutsetiket",
+  "search_popout.tips.status": "plasing",
+  "search_popout.tips.text": "Gewone teks laat sien ooreenstemmende name, gebruikersname en hutsetikette",
+  "search_popout.tips.user": "gebruiker",
+  "search_results.accounts": "Mense",
+  "search_results.all": "Alles",
+  "search_results.hashtags": "Hutsetiket",
+  "search_results.nothing_found": "Hierdie soekwoorde lewer niks op nie",
+  "search_results.statuses": "Plasings",
+  "search_results.statuses_fts_disabled": "Hierdie Mastodonbediener is nie opgestel om soekwoorde in plasings te kan vind nie.",
+  "search_results.title": "Soek {q}",
+  "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultate}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administrasie deur:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_status": "Open hierdie plasing as moderator",
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Copy link to status",
+  "status.cancel_reblog_private": "Maak aanstuur ongedaan",
+  "status.cannot_reblog": "Hierdie plasing kan nie aangestuur word nie",
+  "status.copy": "Kopieer skakel na hierdie plasing",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this status",
+  "status.open": "Brei hierdie plasing uit",
   "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "Vasgemaakte plasing",
   "status.read_more": "Read more",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.reblog": "Stuur aan",
+  "status.reblog_private": "Stuur aan met oorspronklike sigbaarheid",
+  "status.reblogged_by": "Aangestuur deur {name}",
+  "status.reblogs.empty": "Hierdie plasing is nog deur niemand aangestuur nie. As iemand dit aanstuur, sal jy dit hier sien.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
-  "status.replyAll": "Reply to thread",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reageer",
+  "status.replyAll": "Reageer op vorige kommentaar",
   "status.report": "Report @{name}",
-  "status.sensitive_warning": "Sensitive content",
+  "status.sensitive_warning": "Sensitiewe inhoud",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Vertaal",
+  "status.translated_from_with": "Uit {lang} vertaal deur {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
+  "tabs_bar.federated_timeline": "Federasie",
+  "tabs_bar.home": "Tuis",
+  "tabs_bar.local_timeline": "Plaaslik",
+  "tabs_bar.notifications": "Kennisgewings",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -443,8 +611,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "timeline_hint.resources.statuses": "Ouer plasings",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
new file mode 100644
index 000000000..8b0669aab
--- /dev/null
+++ b/app/javascript/mastodon/locales/an.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Servidors moderaus",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon ye software de codigo ubierto, y una marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razón no disponible",
+  "about.domain_blocks.preamble": "Mastodon normalment te permite veyer lo conteniu y interactuar con os usuarios de qualsequier atro servidor en o fediverso. Estas son las excepcions que s'han feito en este servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Normalment no veyerás perfils y conteniu d'este servidor, de no estar que lo busques explicitament u sigas bella cuenta.",
+  "about.domain_blocks.silenced.title": "Limitau",
+  "about.domain_blocks.suspended.explanation": "Garra dato d'este servidor será procesau, almagazenau u intercambiau, fendo imposible qualsequier interacción u comunicación con os usuarios d'este servidor.",
+  "about.domain_blocks.suspended.title": "Suspendiu",
+  "about.not_available": "Esta información no ye disponible en este servidor.",
+  "about.powered_by": "Retz socials descentralizaus con tecnolochía de {mastodon}",
+  "about.rules": "Reglas d'o servidor",
+  "account.account_note_header": "Nota",
+  "account.add_or_remove_from_list": "Adhibir u eliminar de listas",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Grupo",
+  "account.block": "Blocar a @{name}",
+  "account.block_domain": "Blocar dominio {domain}",
+  "account.blocked": "Blocau",
+  "account.browse_more_on_origin_server": "Veyer mas en o perfil orichinal",
+  "account.cancel_follow_request": "Retirar solicitut de seguimiento",
+  "account.direct": "Mensache directo a @{name}",
+  "account.disable_notifications": "Deixar de notificar-me quan @{name} publique bella cosa",
+  "account.domain_blocked": "Dominio blocau",
+  "account.edit_profile": "Editar perfil",
+  "account.enable_notifications": "Notificar-me quan @{name} publique bella cosa",
+  "account.endorse": "Amostrar en perfil",
+  "account.featured_tags.last_status_at": "Zaguera publicación lo {date}",
+  "account.featured_tags.last_status_never": "Sin publicacions",
+  "account.featured_tags.title": "Etiquetas destacadas de {name}",
+  "account.follow": "Seguir",
+  "account.followers": "Seguidores",
+  "account.followers.empty": "Encara no sigue dengún a este usuario.",
+  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.following": "Seguindo",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Seguindo}}",
+  "account.follows.empty": "Este usuario encara no sigue a dengún.",
+  "account.follows_you": "Te sigue",
+  "account.go_to_profile": "Ir ta lo perfil",
+  "account.hide_reblogs": "Amagar retutz de @{name}",
+  "account.joined_short": "S'unió",
+  "account.languages": "Cambiar idiomas suscritos",
+  "account.link_verified_on": "Lo proprietario d'este link estió comprebau lo {date}",
+  "account.locked_info": "Lo estau de privacidat d'esta cuenta ye configurau como blocau. Lo proprietario ha de revisar manualment qui puede seguir-le.",
+  "account.media": "Multimedia",
+  "account.mention": "Mencionar a @{name}",
+  "account.moved_to": "{name} ha indicau que la suya nueva cuenta ye agora:",
+  "account.mute": "Silenciar a @{name}",
+  "account.mute_notifications": "Silenciar notificacions de @{name}",
+  "account.muted": "Silenciau",
+  "account.open_original_page": "Ubrir pachina orichinal",
+  "account.posts": "Publicacions",
+  "account.posts_with_replies": "Publicacions y respuestas",
+  "account.report": "Denunciar a @{name}",
+  "account.requested": "Esperando l'aprebación",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Compartir lo perfil de @{name}",
+  "account.show_reblogs": "Amostrar retutz de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicaciones}}",
+  "account.unblock": "Desblocar a @{name}",
+  "account.unblock_domain": "Amostrar a {domain}",
+  "account.unblock_short": "Desblocar",
+  "account.unendorse": "No amostrar en o perfil",
+  "account.unfollow": "Deixar de seguir",
+  "account.unmute": "Deixar de silenciar a @{name}",
+  "account.unmute_notifications": "Deixar de silenciar las notificacions de @{name}",
+  "account.unmute_short": "Deixar de silenciar",
+  "account_note.placeholder": "Clic pa anyadir nota",
+  "admin.dashboard.daily_retention": "Taxa de retención d'usuarios per día dimpués d'o rechistro",
+  "admin.dashboard.monthly_retention": "Taxa de retención d'usuarios per mes dimpués d'o rechistro",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mes de rechistro",
+  "admin.dashboard.retention.cohort_size": "Nuevos usuarios",
+  "alert.rate_limited.message": "Per favor reintente dimpués de {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Tarifa limitada",
+  "alert.unexpected.message": "I habió una error inasperada.",
+  "alert.unexpected.title": "Ups!",
+  "announcement.announcement": "Anuncio",
+  "attachments_list.unprocessed": "(sin procesar)",
+  "audio.hide": "Amagar audio",
+  "autosuggest_hashtag.per_week": "{count} per semana",
+  "boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
+  "bundle_column_error.copy_stacktrace": "Copiar informe d'error",
+  "bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "S'ha produciu una error en intentar cargar esta pachina. Esto puede deber-se a un problema temporal con a tuya connexión a internet u a este servidor.",
+  "bundle_column_error.network.title": "Error de ret",
+  "bundle_column_error.retry": "Intenta-lo de nuevo",
+  "bundle_column_error.return": "Tornar ta l'inicio",
+  "bundle_column_error.routing.body": "No se podió trobar la pachina solicitada. Yes seguro que la URL en a barra d'adrezas ye correcta?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Zarrar",
+  "bundle_modal_error.message": "Bella cosa salió malament en cargar este component.",
+  "bundle_modal_error.retry": "Intenta-lo de nuevo",
+  "closed_registrations.other_server_instructions": "Como Mastodon ye descentralizau, puetz creyar una cuenta en unatro servidor y seguir interactuando con este.",
+  "closed_registrations_modal.description": "La creyación d'una cuenta en {domain} no ye posible actualment, pero tiene en cuenta que no amenestes una cuenta especificament en {domain} pa usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Buscar unatro servidor",
+  "closed_registrations_modal.preamble": "Mastodon ye descentralizau, per lo que no importa án creyes la tuya cuenta, podrás seguir y interactuar con qualsequier persona en este servidor. Mesmo puetz alochar-lo tu mesmo!",
+  "closed_registrations_modal.title": "Rechistrar-se en Mastodon",
+  "column.about": "Sobre",
+  "column.blocks": "Usuarios blocaus",
+  "column.bookmarks": "Marcadors",
+  "column.community": "Linia de tiempo local",
+  "column.direct": "Mensaches directos",
+  "column.directory": "Buscar perfils",
+  "column.domain_blocks": "Dominios amagaus",
+  "column.favourites": "Favoritos",
+  "column.follow_requests": "Solicitutz de seguimiento",
+  "column.home": "Inicio",
+  "column.lists": "Listas",
+  "column.mutes": "Usuarios silenciaus",
+  "column.notifications": "Notificacions",
+  "column.pins": "Publicacions fixadas",
+  "column.public": "Linia de tiempo federada",
+  "column_back_button.label": "Dezaga",
+  "column_header.hide_settings": "Amagar configuración",
+  "column_header.moveLeft_settings": "Mover columna a la zurda",
+  "column_header.moveRight_settings": "Mover columna a la dreita",
+  "column_header.pin": "Fixar",
+  "column_header.show_settings": "Amostrar achustes",
+  "column_header.unpin": "Deixar de fixar",
+  "column_subheading.settings": "Achustes",
+  "community.column_settings.local_only": "Solo local",
+  "community.column_settings.media_only": "Solo media",
+  "community.column_settings.remote_only": "Solo remoto",
+  "compose.language.change": "Cambiar idioma",
+  "compose.language.search": "Buscar idiomas...",
+  "compose_form.direct_message_warning_learn_more": "Aprender mas",
+  "compose_form.encryption_warning": "Las publicacions en Mastodon no son zifradas de cabo a cabo. No comparta garra información sensible en Mastodon.",
+  "compose_form.hashtag_warning": "Esta publicación no s'amostrará baixo garra hashtag perque no ye listada. Nomás las publicacions publicas se pueden buscar per hashtag.",
+  "compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
+  "compose_form.lock_disclaimer.lock": "blocau",
+  "compose_form.placeholder": "En qué yes pensando?",
+  "compose_form.poll.add_option": "Anyadir una opción",
+  "compose_form.poll.duration": "Duración d'a enqüesta",
+  "compose_form.poll.option_placeholder": "Elección {number}",
+  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
+  "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Alzar cambios",
+  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
+  "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
+  "compose_form.spoiler.unmarked": "Texto no amagau",
+  "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
+  "confirmation_modal.cancel": "Cancelar",
+  "confirmations.block.block_and_report": "Blocar y Denunciar",
+  "confirmations.block.confirm": "Blocar",
+  "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
+  "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
+  "confirmations.delete.confirm": "Eliminar",
+  "confirmations.delete.message": "Yes seguro que quiers borrar esta publicación?",
+  "confirmations.delete_list.confirm": "Eliminar",
+  "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
+  "confirmations.domain_block.confirm": "Amagar dominio entero",
+  "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
+  "confirmations.logout.confirm": "Zarrar sesión",
+  "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
+  "confirmations.mute.confirm": "Silenciar",
+  "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
+  "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
+  "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
+  "confirmations.redraft.message": "Yes seguro que quiers eliminar esta publicación y convertir-la en borrador? Perderás totas las respuestas, retutz y favoritos asociaus a ell, y las respuestas a la publicación orichinal quedarán uerfanas.",
+  "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
+  "confirmations.unfollow.confirm": "Deixar de seguir",
+  "confirmations.unfollow.message": "Yes seguro que quiers deixar de seguir a {name}?",
+  "conversation.delete": "Borrar conversación",
+  "conversation.mark_as_read": "Marcar como leyiu",
+  "conversation.open": "Veyer conversación",
+  "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiau",
+  "copypaste.copy": "Copiar",
+  "directory.federated": "Dende lo fediverso conoixiu",
+  "directory.local": "Nomás de {domain}",
+  "directory.new_arrivals": "Recientment plegaus",
+  "directory.recently_active": "Recientment activo",
+  "disabled_account_banner.account_settings": "Achustes d'a cuenta",
+  "disabled_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada.",
+  "dismissable_banner.community_timeline": "Estas son las publicacions publicas mas recients de personas que las suyas cuentas son alochadas en {domain}.",
+  "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Estas noticias son estando discutidas per personas en este y atros servidors d'o ret descentralizau en este momento.",
+  "dismissable_banner.explore_statuses": "Estas publicacions d'este y atros servidors en o ret descentralizau son ganando popularidat en este servidor en este momento.",
+  "dismissable_banner.explore_tags": "Estas tendencias son ganando popularidat entre la chent en este y atros servidors d'o ret descentralizau en este momento.",
+  "dismissable_banner.public_timeline": "Estas son las publicacions publicas mas recients de personas en este y atros servidors d'o ret descentralizau que este servidor conoixe.",
+  "embed.instructions": "Anyade esta publicación a lo tuyo puesto web con o siguient codigo.",
+  "embed.preview": "Asinas ye como se veyerá:",
+  "emoji_button.activity": "Actividat",
+  "emoji_button.clear": "Limpiar",
+  "emoji_button.custom": "Personalizau",
+  "emoji_button.flags": "Marcas",
+  "emoji_button.food": "Minchada y bebida",
+  "emoji_button.label": "Ficar emoji",
+  "emoji_button.nature": "Naturaleza",
+  "emoji_button.not_found": "No i hai garra emoji coincident",
+  "emoji_button.objects": "Obchectos",
+  "emoji_button.people": "Chent",
+  "emoji_button.recent": "Usaus freqüentment",
+  "emoji_button.search": "Buscar...",
+  "emoji_button.search_results": "Resultaus de busqueda",
+  "emoji_button.symbols": "Simbolos",
+  "emoji_button.travel": "Viaches y puestos",
+  "empty_column.account_suspended": "Cuenta suspendida",
+  "empty_column.account_timeline": "No i hai publicacions aquí!",
+  "empty_column.account_unavailable": "Perfil no disponible",
+  "empty_column.blocks": "Encara no has blocau a garra usuario.",
+  "empty_column.bookmarked_statuses": "Encara no tiens garra publicación alzada como marcador. Quan alces una, s'amostrará aquí.",
+  "empty_column.community": "La linia de tiempo local ye vueda. Escribe bella cosa pa empecipiar la fiesta!",
+  "empty_column.direct": "Encara no tiens garra mensache directo. Quan ninvies u recibas un, s'amostrará aquí.",
+  "empty_column.domain_blocks": "Encara no i hai dominios amagaus.",
+  "empty_column.explore_statuses": "Cosa ye en tendencia en este momento. Revisa mas tarde!",
+  "empty_column.favourited_statuses": "Encara no tiens publicacions favoritas. Quan marques una como favorita, amaneixerá aquí.",
+  "empty_column.favourites": "Dengún ha marcau esta publicación como favorita. Quan belún lo faiga, amaneixerá aquí.",
+  "empty_column.follow_recommendations": "Pareixe que no s'ha puesto chenerar garra sucherencia pa tu. Puetz prebar a buscar a chent que talment conoixcas u explorar los hashtags que son en tendencia.",
+  "empty_column.follow_requests": "No tiens garra petición de seguidor. Quan recibas una, s'amostrará aquí.",
+  "empty_column.hashtag": "No i hai cosa en este hashtag encara.",
+  "empty_column.home": "La tuya linia temporal ye vueda! Sigue a mas personas pa replenar-la. {suggestions}",
+  "empty_column.home.suggestions": "Veyer qualques sucherencias",
+  "empty_column.list": "No i hai cosa en esta lista encara. Quan miembros d'esta lista publiquen nuevos estatus, estes amaneixerán qui.",
+  "empty_column.lists": "No tiens garra lista. Quan en crees una, s'amostrará aquí.",
+  "empty_column.mutes": "Encara no has silenciau a garra usuario.",
+  "empty_column.notifications": "No tiens garra notificación encara. Interactúa con atros pa empecipiar una conversación.",
+  "empty_column.public": "No i hai cosa aquí! Escribe bella cosa publicament, u sigue usuarios d'atras instancias manualment pa emplir-lo",
+  "error.unexpected_crash.explanation": "A causa d'una error en o nuestro codigo u a un problema de compatibilidat con o navegador, esta pachina no s'ha puesto amostrar correctament.",
+  "error.unexpected_crash.explanation_addons": "No se podió amostrar correctament esta pachina. Esta error probablement estió causau per un complemento d'o navegador web u per ferramientas de traducción automatica.",
+  "error.unexpected_crash.next_steps": "Intenta actualizar la pachina. Si ixo no aduya, ye posible que puedas usar Mastodon a traviés d'unatro navegador u aplicación nativa.",
+  "error.unexpected_crash.next_steps_addons": "Intenta deshabilitar-los y recarga la pachina. Si ixo no aduya, podrías usar Mastodon a traviés d'un navegador web diferent u aplicación nativa.",
+  "errors.unexpected_crash.copy_stacktrace": "Copiar lo seguimiento de pila en o portafuellas",
+  "errors.unexpected_crash.report_issue": "Informar d'un problema/error",
+  "explore.search_results": "Resultaus de busqueda",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explorar",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no s'aplica a lo contexto en o qual ha accediu a esta publlicación. Si quiers que la publicación sía filtrada tamién en este contexto, habrás d'editar lo filtro.",
+  "filter_modal.added.context_mismatch_title": "Lo contexto no coincide!",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducau, amenesterá cambiar la calendata de caducidat pa que s'aplique.",
+  "filter_modal.added.expired_title": "Filtro caducau!",
+  "filter_modal.added.review_and_configure": "Pa revisar y configurar esta categoría de filtros, vaiga a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Achustes de filtro",
+  "filter_modal.added.settings_link": "pachina d'achustes",
+  "filter_modal.added.short_explanation": "Esta publicación ha estau anyadida a la siguient categoría de filtros: {title}.",
+  "filter_modal.added.title": "Filtro anyadiu!",
+  "filter_modal.select_filter.context_mismatch": "no s'aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirau",
+  "filter_modal.select_filter.prompt_new": "Nueva categoría: {name}",
+  "filter_modal.select_filter.search": "Buscar u creyar",
+  "filter_modal.select_filter.subtitle": "Usar una categoría existent u creyar una nueva",
+  "filter_modal.select_filter.title": "Filtrar esta publicación",
+  "filter_modal.title.status": "Filtrar una publicación",
+  "follow_recommendations.done": "Feito",
+  "follow_recommendations.heading": "Sigue a chent que publique cosetas que te faigan goyo! Aquí tiens qualques sucherencias.",
+  "follow_recommendations.lead": "Las publicacions d'a chent a la quala sigas amaneixerán ordenadas cronolochicament en Inicio. No tiengas miedo de cometer errors, puetz deixar-les de seguir en qualsequier momento con a mesma facilidat!",
+  "follow_request.authorize": "Autorizar",
+  "follow_request.reject": "Refusar",
+  "follow_requests.unlocked_explanation": "Tot y que la tuya cuenta no ye privada, lo personal de {domain} ha pensau que talment habrías de revisar manualment las solicitutz de seguimiento d'estas cuentas.",
+  "footer.about": "Sobre",
+  "footer.directory": "Directorio de perfils",
+  "footer.get_app": "Obtener l'aplicación",
+  "footer.invite": "Convidar chent",
+  "footer.keyboard_shortcuts": "Alcorces de teclau",
+  "footer.privacy_policy": "Politica de privacidat",
+  "footer.source_code": "Veyer codigo fuent",
+  "generic.saved": "Alzau",
+  "getting_started.heading": "Primers pasos",
+  "hashtag.column_header.tag_mode.all": "y {additional}",
+  "hashtag.column_header.tag_mode.any": "u {additional}",
+  "hashtag.column_header.tag_mode.none": "sin {additional}",
+  "hashtag.column_settings.select.no_options_message": "No se troboron sucherencias",
+  "hashtag.column_settings.select.placeholder": "Escriba hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Qualsequiera d'estes",
+  "hashtag.column_settings.tag_mode.any": "Qualsequiera d'estes",
+  "hashtag.column_settings.tag_mode.none": "Garra d'estes",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Seguir etiqueta",
+  "hashtag.unfollow": "Deixar de seguir etiqueta",
+  "home.column_settings.basic": "Basico",
+  "home.column_settings.show_reblogs": "Amostrar retutz",
+  "home.column_settings.show_replies": "Amostrar respuestas",
+  "home.hide_announcements": "Amagar anuncios",
+  "home.show_announcements": "Amostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puetz marcar como favorita esta publicación pa que l'autor saba que te fa goyo y alzar-la asinas pa mas abance.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puetz seguir {name} pa recibir las suyas publicacions en a tuya linia temporal d'inicio.",
+  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puetz empentar esta publicación pa compartir-la con os tuyos propios seguidores.",
+  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puetz responder a esta publicación.",
+  "interaction_modal.on_another_server": "En un servidor diferent",
+  "interaction_modal.on_this_server": "En este servidor",
+  "interaction_modal.other_server_instructions": "Copia y apega esta URL en a barra de busqueda d'a tuya aplicación Mastodon favorita u la interficie web d'o tuyo servidor Mastodon.",
+  "interaction_modal.preamble": "Ya que Mastodon ye descentralizau, puetz usar la tuya cuenta existent alochada en unatro servidor Mastodon u plataforma compatible si no tiens una cuenta en este servidor.",
+  "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
+  "interaction_modal.title.follow": "Seguir a {name}",
+  "interaction_modal.title.reblog": "Empentar la publicación de {name}",
+  "interaction_modal.title.reply": "Responder a la publicación de {name}",
+  "intervals.full.days": "{number, plural, one {# día} other {# días}}",
+  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
+  "intervals.full.minutes": "{number, plural, one {# menuto} other {# menutos}}",
+  "keyboard_shortcuts.back": "Tornar enta zaga",
+  "keyboard_shortcuts.blocked": "Ubrir una lista d'usuarios blocaus",
+  "keyboard_shortcuts.boost": "Retutar",
+  "keyboard_shortcuts.column": "Enfocar en una d'as columnas",
+  "keyboard_shortcuts.compose": "Enfocar l'aria de redacción de texto",
+  "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "pa ubrir la columna de mensaches directos",
+  "keyboard_shortcuts.down": "Mover enta baixo en a lista",
+  "keyboard_shortcuts.enter": "Ubrir estau",
+  "keyboard_shortcuts.favourite": "Anyadir en favoritos",
+  "keyboard_shortcuts.favourites": "Ubrir la lista de favoritos",
+  "keyboard_shortcuts.federated": "Ubrir la linia de tiempo federada",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "Ubrir linia de tiempo",
+  "keyboard_shortcuts.hotkey": "Tecla calient",
+  "keyboard_shortcuts.legend": "Amostrar esta leyenda",
+  "keyboard_shortcuts.local": "Ubrir linia de tiempo local",
+  "keyboard_shortcuts.mention": "Mencionar a l'autor",
+  "keyboard_shortcuts.muted": "Ubrir la lista d'usuarios silenciaus",
+  "keyboard_shortcuts.my_profile": "Ubrir lo tuyo perfil",
+  "keyboard_shortcuts.notifications": "Ubrir la columna de notificacions",
+  "keyboard_shortcuts.open_media": "Ubrir fichers multimedia",
+  "keyboard_shortcuts.pinned": "Ubrir la lista de publicacions destacadas",
+  "keyboard_shortcuts.profile": "Ubrir lo perfil de l'autor",
+  "keyboard_shortcuts.reply": "Responder publicación",
+  "keyboard_shortcuts.requests": "Ubrir la lista de peticions de seguidores",
+  "keyboard_shortcuts.search": "Meter lo foco en a busqueda",
+  "keyboard_shortcuts.spoilers": "Amostrar/amagar lo campo CW",
+  "keyboard_shortcuts.start": "Ubrir la columna \"prencipiar\"",
+  "keyboard_shortcuts.toggle_hidden": "Amostrar/amagar lo texto marcau como sensible",
+  "keyboard_shortcuts.toggle_sensitivity": "Amostrar/amagar fichers multimedia",
+  "keyboard_shortcuts.toot": "Prencipia una nueva publicación",
+  "keyboard_shortcuts.unfocus": "Retirar lo foco d'a caixa de redacción/busqueda",
+  "keyboard_shortcuts.up": "Ir enta alto en a lista",
+  "lightbox.close": "Zarrar",
+  "lightbox.compress": "Comprimir quadro de visualización d'imachen",
+  "lightbox.expand": "Expandir quadro de visualización d'imachen",
+  "lightbox.next": "Siguient",
+  "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Amostrar perfil de totz modos",
+  "limited_account_hint.title": "Este perfil ha estau amagau per los moderadors de {domain}.",
+  "lists.account.add": "Anyadir a lista",
+  "lists.account.remove": "Sacar de lista",
+  "lists.delete": "Borrar lista",
+  "lists.edit": "Editar lista",
+  "lists.edit.submit": "Cambiar titol",
+  "lists.new.create": "Anyadir lista",
+  "lists.new.title_placeholder": "Titol d'a nueva lista",
+  "lists.replies_policy.followed": "Qualsequier usuario seguiu",
+  "lists.replies_policy.list": "Miembros d'a lista",
+  "lists.replies_policy.none": "Dengún",
+  "lists.replies_policy.title": "Amostrar respuestas a:",
+  "lists.search": "Buscar entre la chent a la quala sigues",
+  "lists.subheading": "Las tuyas listas",
+  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
+  "loading_indicator.label": "Cargando...",
+  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
+  "missing_indicator.label": "No trobau",
+  "missing_indicator.sublabel": "No se trobó este recurso",
+  "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
+  "mute_modal.duration": "Duración",
+  "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
+  "mute_modal.indefinite": "Indefinida",
+  "navigation_bar.about": "Sobre",
+  "navigation_bar.blocks": "Usuarios blocaus",
+  "navigation_bar.bookmarks": "Marcadors",
+  "navigation_bar.community_timeline": "Linia de tiempo local",
+  "navigation_bar.compose": "Escribir nueva publicación",
+  "navigation_bar.direct": "Mensaches directos",
+  "navigation_bar.discover": "Descubrir",
+  "navigation_bar.domain_blocks": "Dominios amagaus",
+  "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorar",
+  "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Parolas silenciadas",
+  "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
+  "navigation_bar.follows_and_followers": "Seguindo y seguidores",
+  "navigation_bar.lists": "Listas",
+  "navigation_bar.logout": "Zarrar sesión",
+  "navigation_bar.mutes": "Usuarios silenciaus",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Publicacions fixadas",
+  "navigation_bar.preferences": "Preferencias",
+  "navigation_bar.public_timeline": "Linia de tiempo federada",
+  "navigation_bar.search": "Buscar",
+  "navigation_bar.security": "Seguranza",
+  "not_signed_in_indicator.not_signed_in": "Amenestes iniciar sesión pa acceder ta este recurso.",
+  "notification.admin.report": "{name} informó {target}",
+  "notification.admin.sign_up": "{name} se rechistró",
+  "notification.favourite": "{name} marcó lo tuyo estau como favorito",
+  "notification.follow": "{name} t'empecipió a seguir",
+  "notification.follow_request": "{name} ha solicitau seguir-te",
+  "notification.mention": "{name} t'ha mencionau",
+  "notification.own_poll": "La tuya enqüesta ha rematau",
+  "notification.poll": "Una enqüesta en a quala has votau ha rematau",
+  "notification.reblog": "{name} ha retutau la tuya publicación",
+  "notification.status": "{name} acaba de publicar",
+  "notification.update": "{name} editó una publicación",
+  "notifications.clear": "Limpiar notificacions",
+  "notifications.clear_confirmation": "Seguro que quiers limpiar permanentment totas las tuyas notificacions?",
+  "notifications.column_settings.admin.report": "Nuevos informes:",
+  "notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
+  "notifications.column_settings.alert": "Notificacions d'escritorio",
+  "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
+  "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
+  "notifications.column_settings.follow": "Nuevos seguidores:",
+  "notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
+  "notifications.column_settings.mention": "Mencions:",
+  "notifications.column_settings.poll": "Resultaus d'a votación:",
+  "notifications.column_settings.push": "Notificacions push",
+  "notifications.column_settings.reblog": "Retutz:",
+  "notifications.column_settings.show": "Amostrar en columna",
+  "notifications.column_settings.sound": "Reproducir son",
+  "notifications.column_settings.status": "Nuevas publicacions:",
+  "notifications.column_settings.unread_notifications.category": "Notificacions sin leyer",
+  "notifications.column_settings.unread_notifications.highlight": "Destacar notificacions no leyidas",
+  "notifications.column_settings.update": "Edicions:",
+  "notifications.filter.all": "Totz",
+  "notifications.filter.boosts": "Retutz",
+  "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.follows": "Seguidores",
+  "notifications.filter.mentions": "Mencions",
+  "notifications.filter.polls": "Resultaus d'a votación",
+  "notifications.filter.statuses": "Actualizacions de chent a la quala sigues",
+  "notifications.grant_permission": "Conceder permiso.",
+  "notifications.group": "{count} notificacions",
+  "notifications.mark_as_read": "Marcar totas las notificacions como leyidas",
+  "notifications.permission_denied": "No se pueden habilitar las notificacions d'escritorio ya que se denegó lo permiso",
+  "notifications.permission_denied_alert": "No se pueden habilitar las notificacions d'escritorio, ya que lo permiso d'o navegador estió denegau anteriorment",
+  "notifications.permission_required": "Las notificacions d'escritorio no son disponibles perque no s'ha concediu lo permiso requeriu.",
+  "notifications_permission_banner.enable": "Habilitar notificacions d'escritorio",
+  "notifications_permission_banner.how_to_control": "Pa recibir notificacions quan Mastodon no sía ubierto, habilite las notificacions d'escritorio. Puetz controlar con precisión qué tipos d'interaccions cheneran notificacions d'escritorio a traviés d'o botón {icon} d'alto una vegada que sían habilitadas.",
+  "notifications_permission_banner.title": "Nunca te pierdas cosa",
+  "picture_in_picture.restore": "Restaurar",
+  "poll.closed": "Zarrada",
+  "poll.refresh": "Actualizar",
+  "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
+  "poll.vote": "Votar",
+  "poll.voted": "Has votau a favor d'esta respuesta",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+  "poll_button.add_poll": "Anyadir una enqüesta",
+  "poll_button.remove_poll": "Eliminar enqüesta",
+  "privacy.change": "Achustar privacidat",
+  "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
+  "privacy.direct.short": "Nomás contas mencionadas",
+  "privacy.private.long": "Nomás amostrar a seguidores",
+  "privacy.private.short": "Solo seguidores",
+  "privacy.public.long": "Visible pa totz",
+  "privacy.public.short": "Publico",
+  "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
+  "privacy.unlisted.short": "No listau",
+  "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
+  "privacy_policy.title": "Politica de Privacidat",
+  "refresh": "Actualizar",
+  "regeneration_indicator.label": "Cargando…",
+  "regeneration_indicator.sublabel": "La tuya historia d'inicio se ye preparando!",
+  "relative_time.days": "{number} d",
+  "relative_time.full.days": "fa {number, plural, one {# día} other {# días}}",
+  "relative_time.full.hours": "fa {number, plural, one {# hora} other {# horas}}",
+  "relative_time.full.just_now": "chusto agora",
+  "relative_time.full.minutes": "fa {number, plural, one {# menuto} other {# menutos}}",
+  "relative_time.full.seconds": "fa {number, plural, one {# segundo} other {# segundos}}",
+  "relative_time.hours": "{number} h",
+  "relative_time.just_now": "agora",
+  "relative_time.minutes": "{number} m",
+  "relative_time.seconds": "{number} s",
+  "relative_time.today": "hue",
+  "reply_indicator.cancel": "Cancelar",
+  "report.block": "Blocar",
+  "report.block_explanation": "No veyerás las suyas publicacions. No podrán veyer las tuyas publicacions ni seguir-te. Podrán saber que son blocaus.",
+  "report.categories.other": "Atros",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Lo conteniu viola una u mas reglas d'o servidor",
+  "report.category.subtitle": "Tría la millor coincidencia",
+  "report.category.title": "Conta-nos lo que ye pasando con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicacion",
+  "report.close": "Feito",
+  "report.comment.title": "I hai bella cosa mas que creigas que habríanos de saber?",
+  "report.forward": "Reninviar a {target}",
+  "report.forward_hint": "Esta cuenta ye d'unatro servidor. Ninviar una copia anonimizada de l'informe allí tamién?",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No veyerás las suyas publicacions. Encara pueden seguir-te y veyer los tuyos mensaches y no sabrán que son silenciaus.",
+  "report.next": "Siguient",
+  "report.placeholder": "Comentarios adicionals",
+  "report.reasons.dislike": "No me fa goyo",
+  "report.reasons.dislike_description": "No ye bella cosa que quieras veyer",
+  "report.reasons.other": "Ye unatra coseta",
+  "report.reasons.other_description": "Lo problema no encaixa en atras categorías",
+  "report.reasons.spam": "Ye spam",
+  "report.reasons.spam_description": "Vinclos maliciosos, interaccions falsas u respuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas d'o servidor",
+  "report.reasons.violation_description": "Yes conscient que infrinche las normas especificas",
+  "report.rules.subtitle": "Tría totz los que correspondan",
+  "report.rules.title": "Qué normas se son violando?",
+  "report.statuses.subtitle": "Tría totz los que correspondan",
+  "report.statuses.title": "I hai bella publicación que refirme este informe?",
+  "report.submit": "Ninviar",
+  "report.target": "Denunciando a {target}",
+  "report.thanks.take_action": "Aquí son las tuyas opcions pa controlar lo que veyes en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientres revisamos esto, puetz prener medidas contra @{name}:",
+  "report.thanks.title": "No quiers esto?",
+  "report.thanks.title_actionable": "Gracias per informar, estudiaremos esto.",
+  "report.unfollow": "Deixar de seguir a @{name}",
+  "report.unfollow_explanation": "Yes seguindo esta cuenta. Pa no veyer las suyas publicacions en a tuya muro d'inicio, deixa de seguir-la.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} tut adchunto} other {{count} tutz adchuntos}}",
+  "report_notification.categories.other": "Atros",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.open": "Ubrir informe",
+  "search.placeholder": "Buscar",
+  "search.search_or_paste": "Buscar u apegar URL",
+  "search_popout.search_format": "Formato de busqueda abanzada",
+  "search_popout.tips.full_text": "Las busquedas de texto recuperan publicacions que has escrito, marcau como favoritas, retutau u en os quals has estau mencionau, asinas como usuarios, nombres y hashtags.",
+  "search_popout.tips.hashtag": "etiqueta",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Lo texto simple torna correspondencias de nombre, usuario y hashtag",
+  "search_popout.tips.user": "usuario",
+  "search_results.accounts": "Chent",
+  "search_results.all": "Totz",
+  "search_results.hashtags": "Etiquetas",
+  "search_results.nothing_found": "No se podió trobar cosa pa estes termins de busqueda",
+  "search_results.statuses": "Publicacions",
+  "search_results.statuses_fts_disabled": "Buscar publicacions per lo suyo conteniu no ye disponible en este servidor de Mastodon.",
+  "search_results.title": "Buscar {q}",
+  "search_results.total": "{count, number} {count, plural, one {resultau} other {resultaus}}",
+  "server_banner.about_active_users": "Usuarios activos en o servidor entre los zaguers 30 días (Usuarios Activos Mensuals)",
+  "server_banner.active_users": "usuarios activos",
+  "server_banner.administered_by": "Administrau per:",
+  "server_banner.introduction": "{domain} ye parte d'o ret social descentralizau liderada per {mastodon}.",
+  "server_banner.learn_more": "Saber mas",
+  "server_banner.server_stats": "Estatisticas d'o servidor:",
+  "sign_in_banner.create_account": "Creyar cuenta",
+  "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.text": "Inicia sesión en este servidor pa seguir perfils u etiquetas, alzar, compartir y responder a mensaches. Tamién puetz interactuar dende unatra cuenta en un servidor diferent.",
+  "status.admin_account": "Ubrir interficie de moderación pa @{name}",
+  "status.admin_status": "Ubrir este estau en a interficie de moderación",
+  "status.block": "Blocar a @{name}",
+  "status.bookmark": "Anyadir marcador",
+  "status.cancel_reblog_private": "Desfer retut",
+  "status.cannot_reblog": "Esta publicación no se puede retutar",
+  "status.copy": "Copiar vinclo a lo estau",
+  "status.delete": "Borrar",
+  "status.detailed_status": "Vista de conversación detallada",
+  "status.direct": "Mensache directo a @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editau {date}",
+  "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
+  "status.embed": "Incrustado",
+  "status.favourite": "Favorito",
+  "status.filter": "Filtrar esta publicación",
+  "status.filtered": "Filtrau",
+  "status.hide": "Amagar publicación",
+  "status.history.created": "{name} creyó {date}",
+  "status.history.edited": "{name} editó {date}",
+  "status.load_more": "Cargar mas",
+  "status.media_hidden": "Conteniu multimedia amagau",
+  "status.mention": "Mencionar @{name}",
+  "status.more": "Más",
+  "status.mute": "Silenciar @{name}",
+  "status.mute_conversation": "Silenciar conversación",
+  "status.open": "Expandir estau",
+  "status.pin": "Fixar",
+  "status.pinned": "Publicación fixada",
+  "status.read_more": "Leyer mas",
+  "status.reblog": "Retutar",
+  "status.reblog_private": "Empentar con l'audiencia orichinal",
+  "status.reblogged_by": "Retutau per {name}",
+  "status.reblogs.empty": "Dengún no ha retutau encara este tut. Quan belún lo faiga, amaneixerá aquí.",
+  "status.redraft": "Borrar y tornar ta borrador",
+  "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_to": "Respondió a {name}",
+  "status.reply": "Responder",
+  "status.replyAll": "Responder a lo filo",
+  "status.report": "Denunciar €{name}",
+  "status.sensitive_warning": "Conteniu sensible",
+  "status.share": "Compartir",
+  "status.show_filter_reason": "Amostrar de totz modos",
+  "status.show_less": "Amostrar menos",
+  "status.show_less_all": "Amostrar menos pa tot",
+  "status.show_more": "Amostrar mas",
+  "status.show_more_all": "Amostrar mas pa tot",
+  "status.show_original": "Amostrar orichinal",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Traduciu de {lang} usando {provider}",
+  "status.uncached_media_warning": "No disponible",
+  "status.unmute_conversation": "Deixar de silenciar conversación",
+  "status.unpin": "Deixar de fixar",
+  "subscribed_languages.lead": "Nomás los mensaches en os idiomas triaus amaneixerán en o suyo inicio y atras linias de tiempo dimpués d'o cambio. Tríe garra pa recibir mensaches en totz los idiomas.",
+  "subscribed_languages.save": "Alzar cambios",
+  "subscribed_languages.target": "Cambiar idiomas suscritos pa {target}",
+  "suggestions.dismiss": "Descartar sucherencia",
+  "suggestions.header": "Ye posible que t'intrese…",
+  "tabs_bar.federated_timeline": "Federada",
+  "tabs_bar.home": "Inicio",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notificacions",
+  "time_remaining.days": "{number, plural, one {# día restante} other {# días restantes}}",
+  "time_remaining.hours": "{number, plural, one {# hora restante} other {# horas restantes}}",
+  "time_remaining.minutes": "{number, plural, one {# menuto restante} other {# menutos restantes}}",
+  "time_remaining.moments": "Momentos restantes",
+  "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} d'atros servidors no s'amuestran.",
+  "timeline_hint.resources.followers": "Seguidores",
+  "timeline_hint.resources.follows": "Seguius",
+  "timeline_hint.resources.statuses": "Publicacions mas antigas",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en os zaguers {days, plural, one {días} other {{days} días}}",
+  "trends.trending_now": "Tendencia agora",
+  "ui.beforeunload": "Lo tuyo borrador se perderá si sales de Mastodon.",
+  "units.short.billion": "{count} MM",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} K",
+  "upload_area.title": "Arrociega y suelta pa puyar",
+  "upload_button.label": "Puyar imachens, un vido u un fichero d'audio",
+  "upload_error.limit": "Limite de puyada de fichers excedido.",
+  "upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
+  "upload_form.audio_description": "Describir pa personas con problemas auditivos",
+  "upload_form.description": "Describir pa los usuarios con dificultat visual",
+  "upload_form.description_missing": "Garra descripción anyadida",
+  "upload_form.edit": "Editar",
+  "upload_form.thumbnail": "Cambiar miniatura",
+  "upload_form.undo": "Borrar",
+  "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
+  "upload_modal.analyzing_picture": "Analisando imachen…",
+  "upload_modal.apply": "Aplicar",
+  "upload_modal.applying": "Aplicando…",
+  "upload_modal.choose_image": "Triar imachen",
+  "upload_modal.description_placeholder": "Una rapida rabosa marrón blinca sobre lo can perezoso",
+  "upload_modal.detect_text": "Detectar texto d'a imachen",
+  "upload_modal.edit_media": "Editar multimedia",
+  "upload_modal.hint": "Faiga clic u arrociegue lo cerclo en a vista previa pa triar lo punto focal que siempre será a la vista en totas las miniaturas.",
+  "upload_modal.preparing_ocr": "Preparando OCR…",
+  "upload_modal.preview_label": "Vista previa ({ratio})",
+  "upload_progress.label": "Puyando...",
+  "upload_progress.processing": "Procesando…",
+  "video.close": "Zarrar video",
+  "video.download": "Descargar fichero",
+  "video.exit_fullscreen": "Salir de pantalla completa",
+  "video.expand": "Expandir video",
+  "video.fullscreen": "Pantalla completa",
+  "video.hide": "Amagar video",
+  "video.mute": "Silenciar son",
+  "video.pause": "Pausar",
+  "video.play": "Reproducir",
+  "video.unmute": "Deixar de silenciar son"
+}
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 0992394a2..941af112f 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,84 +1,118 @@
 {
+  "about.blocks": "خوادم تحت الإشراف",
+  "about.contact": "للاتصال:",
+  "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.",
+  "about.domain_blocks.no_reason_available": "السبب غير متوفر",
+  "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
+  "about.domain_blocks.silenced.explanation": "عموماً، لن ترى ملفات التعريف والمحتوى من هذا الخادم، إلا إذا كنت تبحث عنه بشكل صريح أو تختار أن تتابعه.",
+  "about.domain_blocks.silenced.title": "تم كتمه",
+  "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
+  "about.domain_blocks.suspended.title": "مُعلّق",
+  "about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
+  "about.powered_by": "شبكة اجتماعية لامركزية مدعومة من {mastodon}",
+  "about.rules": "قواعد الخادم",
   "account.account_note_header": "مُلاحظة",
   "account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
-  "account.badges.bot": "روبوت",
-  "account.badges.group": "مجموعة",
-  "account.block": "حظر @{name}",
+  "account.badges.bot": "بوت",
+  "account.badges.group": "فريق",
+  "account.block": "احجب @{name}",
   "account.block_domain": "حظر اسم النِّطاق {domain}",
   "account.blocked": "محظور",
   "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
-  "account.cancel_follow_request": "إلغاء طلب المتابَعة",
+  "account.cancel_follow_request": "إلغاء طلب المتابعة",
   "account.direct": "مراسلة @{name} بشكل مباشر",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocked": "اسم النِّطاق محظور",
-  "account.edit_profile": "تحرير الملف الشخصي",
+  "account.edit_profile": "تعديل الملف الشخصي",
   "account.enable_notifications": "أشعرني عندما ينشر @{name}",
   "account.endorse": "أوصِ به على صفحتك الشخصية",
-  "account.follow": "المُتابعة",
-  "account.followers": "المُتابِعون",
-  "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم حتى الآن.",
-  "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two{مُتابعانِ اِثنان} few{{counter} مُتابِعين} many{{counter}  مُتابِعًا} other {{counter}  مُتابع}}",
+  "account.featured_tags.last_status_at": "آخر مشاركة في {date}",
+  "account.featured_tags.last_status_never": "لا توجد رسائل",
+  "account.featured_tags.title": "وسوم {name} المميَّزة",
+  "account.follow": "متابعة",
+  "account.followers": "مُتابِعون",
+  "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
+  "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
+  "account.following": "الإشتراكات",
   "account.following_counter": "{count, plural, zero{لا يُتابِع} one {يُتابِعُ واحد} two{يُتابِعُ اِثنان} few{يُتابِعُ {counter}} many{يُتابِعُ {counter}} other {يُتابِعُ {counter}}}",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.follows_you": "يُتابِعُك",
-  "account.hide_reblogs": "إخفاء تعزيزات @{name}",
-  "account.joined": "انضم في {date}",
-  "account.last_status": "آخر نشاط",
+  "account.go_to_profile": "اذهب إلى الملف الشخصي",
+  "account.hide_reblogs": "إخفاء مشاركات @{name}",
+  "account.joined_short": "انضم في",
+  "account.languages": "تغيير اللغات المشترَك فيها",
   "account.link_verified_on": "تمَّ التَّحقق مِن مِلْكيّة هذا الرابط بتاريخ {date}",
   "account.locked_info": "تمَّ تعيين حالة خصوصية هذا الحساب إلى مُقفَل. يُراجع المالك يدويًا من يمكنه متابعته.",
   "account.media": "وسائط",
-  "account.mention": "ذِكر @{name}",
-  "account.moved_to": "لقد انتقل {name} إلى:",
-  "account.mute": "كَتم @{name}",
+  "account.mention": "أذكُر @{name}",
+  "account.moved_to": "أشار {name} إلى أن حسابه الجديد الآن:",
+  "account.mute": "أكتم @{name}",
   "account.mute_notifications": "كَتم الإشعارات من @{name}",
   "account.muted": "مَكتوم",
-  "account.never_active": "أبدًا",
-  "account.posts": "تبويقات",
-  "account.posts_with_replies": "التَّبويقات والرُدود",
+  "account.open_original_page": "افتح الصفحة الأصلية",
+  "account.posts": "منشورات",
+  "account.posts_with_replies": "المنشورات والرُدود",
   "account.report": "الإبلاغ عن @{name}",
-  "account.requested": "في اِنتظر القُبول. اِنقُر لإلغاء طلب المُتابعة",
-  "account.share": "مُشاركة الملف الشخصي لـ @{name}",
-  "account.show_reblogs": "عرض تعزيزات @{name}",
-  "account.statuses_counter": "{count, plural, zero {لَا تَبويقات} one {تَبويقةٌ واحدة} two {تَبويقَتانِ اِثنتان} few {{counter} تَبويقات} many {{counter} تَبويقتًا} other {{counter} تَبويقة}}",
+  "account.requested": "في انتظار القبول. اضغط لإلغاء طلب المُتابعة",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "شارِك الملف التعريفي لـ @{name}",
+  "account.show_reblogs": "عرض مشاركات @{name}",
+  "account.statuses_counter": "{count, plural, zero {لَا منشورات} one {منشور واحد} two {منشوران إثنان} few {{counter} منشورات} many {{counter} منشورًا} other {{counter} منشور}}",
   "account.unblock": "إلغاء الحَظر عن @{name}",
   "account.unblock_domain": "إلغاء الحَظر عن النِّطاق {domain}",
+  "account.unblock_short": "ألغ الحجب",
   "account.unendorse": "لا تُرَوِّج لهُ في الملف الشخصي",
   "account.unfollow": "إلغاء المُتابعة",
   "account.unmute": "إلغاء الكَتم عن @{name}",
   "account.unmute_notifications": "إلغاء كَتم الإشعارات عن @{name}",
-  "account_note.placeholder": "اِنقُر لإضافة مُلاحظة",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "إلغاء الكتم",
+  "account_note.placeholder": "اضغط لإضافة مُلاحظة",
+  "admin.dashboard.daily_retention": "معدل الاحتفاظ بالمستخدم بعد التسجيل بيوم",
+  "admin.dashboard.monthly_retention": "معدل الاحتفاظ بالمستخدم بعد التسجيل بالشهور",
+  "admin.dashboard.retention.average": "المعدل",
+  "admin.dashboard.retention.cohort": "شهر التسجيل",
+  "admin.dashboard.retention.cohort_size": "المستخدمون الجدد",
   "alert.rate_limited.message": "يُرجى إعادة المحاولة بعد {retry_time, time, medium}.",
   "alert.rate_limited.title": "المُعَدَّل مَحدود",
   "alert.unexpected.message": "لقد طرأ خطأ غير متوقّع.",
   "alert.unexpected.title": "المعذرة!",
   "announcement.announcement": "إعلان",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(غير معالَج)",
+  "audio.hide": "إخفاء المقطع الصوتي",
   "autosuggest_hashtag.per_week": "{count} في الأسبوع",
-  "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبِلَة",
-  "bundle_column_error.body": "لقد حدث خطأ ما أثناء تحميل هذا العنصر.",
+  "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
+  "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
+  "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
+  "bundle_column_error.error.title": "أوه لا!",
+  "bundle_column_error.network.body": "حدث خطأ أثناء محاولة تحميل هذه الصفحة. قد يكون هذا بسبب مشكلة مؤقتة في اتصالك بالإنترنت أو هذا الخادم.",
+  "bundle_column_error.network.title": "خطأ في الشبكة",
   "bundle_column_error.retry": "إعادة المُحاولة",
-  "bundle_column_error.title": "خطأ في الشبكة",
+  "bundle_column_error.return": "العودة إلى الرئيسية",
+  "bundle_column_error.routing.body": "تعذر العثور على الصفحة المطلوبة. هل أنت متأكد من أنّ عنوان URL في شريط العناوين صحيح؟",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "إغلاق",
   "bundle_modal_error.message": "لقد حدث خطأ ما أثناء تحميل هذا العنصر.",
   "bundle_modal_error.retry": "إعادة المُحاولة",
+  "closed_registrations.other_server_instructions": "بما أن ماستدون لامركزي، يمكنك إنشاء حساب على خادم آخر للاستمرار في التفاعل مع هذا الخادم.",
+  "closed_registrations_modal.description": "لا يمكن إنشاء حساب على {domain} حاليا، ولكن على فكرة لست بحاجة إلى حساب على {domain} بذاته لاستخدام ماستدون.",
+  "closed_registrations_modal.find_another_server": "ابحث على خادم آخر",
+  "closed_registrations_modal.preamble": "ماستدون لامركزي، لذلك بغض النظر عن مكان إنشاء حسابك، سيكون بإمكانك المتابعة والتفاعل مع أي شخص على هذا الخادم. يمكنك حتى أن تستضيفه ذاتياً!",
+  "closed_registrations_modal.title": "تسجيل حساب في ماستدون",
+  "column.about": "عن",
   "column.blocks": "المُستَخدِمون المَحظورون",
-  "column.bookmarks": "العَلاماتُ المَرجعيَّة",
-  "column.community": "الخَطُّ الزَّمَنِيُّ المَحَلِّيّ",
-  "column.direct": "الرَّسَائِلُ المُبَاشِرَة",
-  "column.directory": "تَصَفُّحُ المَلَفَّاتِ الشَّخصِيَّة",
-  "column.domain_blocks": "النِّطاقَاتُ المَحظُورَة",
+  "column.bookmarks": "الفواصل المرجعية",
+  "column.community": "الخيط الزمني المحلي",
+  "column.direct": "الرسائل المباشِرة",
+  "column.directory": "تَصَفُّحُ المَلفات الشخصية",
+  "column.domain_blocks": "النطاقات المحظورة",
   "column.favourites": "المُفَضَّلَة",
-  "column.follow_requests": "طَلَبَاتُ المُتَابَعَة",
-  "column.home": "الرَّئِيسَة",
-  "column.lists": "القَوائِم",
+  "column.follow_requests": "طلبات المتابعة",
+  "column.home": "الرئيسية",
+  "column.lists": "القوائم",
   "column.mutes": "المُستَخدِمون المَكتومون",
-  "column.notifications": "الإشعارَات",
-  "column.pins": "التَّبويقاتُ المُثَبَّتَة",
-  "column.public": "الخَطُّ الزَّمَنِيُّ المُوَحَّد",
+  "column.notifications": "الإشعارات",
+  "column.pins": "المنشورات المُثَبَّتَة",
+  "column.public": "الخيط الفيدرالي",
   "column_back_button.label": "العودة",
   "column_header.hide_settings": "إخفاء الإعدادات",
   "column_header.moveLeft_settings": "نقل العامود إلى اليسار",
@@ -86,13 +120,15 @@
   "column_header.pin": "تثبيت",
   "column_header.show_settings": "إظهار الإعدادات",
   "column_header.unpin": "إلغاء التَّثبيت",
-  "column_subheading.settings": "الإعدَادَات",
+  "column_subheading.settings": "الإعدادات",
   "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
   "community.column_settings.remote_only": "عن بُعد فقط",
-  "compose_form.direct_message_warning": "سوف تُرسَل هذه التَّبويقة فقط للمُستَخدِمين المَذكورين.",
+  "compose.language.change": "تغيير اللغة",
+  "compose.language.search": "البحث عن لغة…",
   "compose_form.direct_message_warning_learn_more": "تَعَلَّم المَزيد",
-  "compose_form.hashtag_warning": "لن تُدرَج هذه التبويقة تحت أي وسم بما أنَّها غير مُدرَجة. فقط التبويقات العامة يُمكن البحث عنها بواسطة الوسم.",
+  "compose_form.encryption_warning": "إنّ المنشورات على ماستدون ليست مشفرة من النهاية إلى النهاية. لا تشارك أي معلومات حساسة عبر ماستدون.",
+  "compose_form.hashtag_warning": "لن يُدرَج هذا المنشور تحت أي وسم بما أنَّه غير مُدرَج. فقط المنشورات العامة يُمكن البحث عنها بواسطة الوسم.",
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
@@ -102,24 +138,28 @@
   "compose_form.poll.remove_option": "إزالة هذا الخيار",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
-  "compose_form.publish": "تبويق",
+  "compose_form.publish": "انشر",
+  "compose_form.publish_form": "انشر",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "احفظ التعديلات",
   "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
   "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.spoiler.marked": "إنّ النص مخفي وراء تحذير",
+  "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إنَّ النص غير مخفي",
   "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
   "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
+  "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
+  "confirmations.cancel_follow_request.message": "متأكد من إلغاء طلب متابعة {name}؟",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "هل أنتَ مُتأكدٌ أنك تُريدُ حَذفَ هذا المنشور؟",
   "confirmations.delete_list.confirm": "حذف",
-  "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمةَ بشكلٍ دائم؟",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
+  "confirmations.discard_edit_media.confirm": "تجاهل",
+  "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، تجاهلها على أي حال؟",
   "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
   "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.logout.confirm": "خروج",
@@ -127,7 +167,7 @@
   "confirmations.mute.confirm": "أكتم",
   "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
   "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
-  "confirmations.redraft.confirm": "إزالة و إعادة الصياغة",
+  "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.reply.confirm": "رد",
   "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟",
@@ -137,42 +177,54 @@
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
   "conversation.with": "بـ {names}",
+  "copypaste.copied": "تم نسخه",
+  "copypaste.copy": "انسخ",
   "directory.federated": "مِن الفديفرس المعروف",
   "directory.local": "مِن {domain} فقط",
   "directory.new_arrivals": "الوافدون الجُدد",
   "directory.recently_active": "نشط مؤخرا",
+  "disabled_account_banner.account_settings": "إعدادات الحساب",
+  "disabled_account_banner.text": "حسابك {disabledAccount} معطل حاليا.",
+  "dismissable_banner.community_timeline": "هذه هي أحدث المشاركات العامة من الأشخاص الذين تُستضاف حساباتهم على {domain}.",
+  "dismissable_banner.dismiss": "رفض",
+  "dismissable_banner.explore_links": "هذه القصص الإخبارية يتحدث عنها حاليًا أشخاص على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.",
+  "dismissable_banner.explore_statuses": "هذه المنشورات مِن هذا الخادم ومِن الخوادم الأخرى في الشبكة اللامركزية تجذب انتباه المستخدمين على هذا الخادم الآن.",
+  "dismissable_banner.explore_tags": "هذه الوسوم تكتسب جذب اهتمام الناس حاليًا على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.",
+  "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على هذا الخادم والخوادم الأخرى للشبكة اللامركزية التي يعرفها هذا الخادم.",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
-  "embed.preview": "هكذا ما سوف يبدو عليه:",
+  "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
+  "emoji_button.clear": "امسح",
   "emoji_button.custom": "مخصص",
   "emoji_button.flags": "الأعلام",
   "emoji_button.food": "الطعام والشراب",
   "emoji_button.label": "أدرج إيموجي",
   "emoji_button.nature": "الطبيعة",
-  "emoji_button.not_found": "لا إيموجو!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "لا توجد هناك وجوه تعبيرية مطابقة",
   "emoji_button.objects": "أشياء",
   "emoji_button.people": "الناس",
-  "emoji_button.recent": "الشائعة الاستخدام",
+  "emoji_button.recent": "المُستخدَمة غالباً",
   "emoji_button.search": "ابحث...",
   "emoji_button.search_results": "نتائج البحث",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
   "empty_column.account_suspended": "حساب معلق",
-  "empty_column.account_timeline": "ليس هناك تبويقات!",
+  "empty_column.account_timeline": "لا توجد منشورات هنا!",
   "empty_column.account_unavailable": "الملف التعريفي غير متوفر",
   "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
-  "empty_column.bookmarked_statuses": "ليس لديك أية تبويقات في الفواصل المرجعية بعد. عندما ستقوم بإضافة البعض منها، ستظهر هنا.",
+  "empty_column.bookmarked_statuses": "ليس لديك أية منشورات في الفواصل المرجعية بعد. عندما ستقوم بإضافة البعض منها، ستظهر هنا.",
   "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
   "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
   "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
-  "empty_column.favourited_statuses": "ليس لديك أية تبويقات مفضلة بعد. عندما ستقوم بالإعجاب بواحد، سيظهر هنا.",
-  "empty_column.favourites": "لم يقم أي أحد بالإعجاب بهذا التبويق بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
+  "empty_column.explore_statuses": "ليس هناك ما هو متداوَل الآن. عد في وقت لاحق!",
+  "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.",
+  "empty_column.favourites": "لم يقم أي أحد بالإعجاب بهذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "empty_column.follow_recommendations": "يبدو أنه لا يمكن إنشاء أي اقتراحات لك. يمكنك البحث عن أشخاص قد تعرفهم أو استكشاف الوسوم الرائجة.",
   "empty_column.follow_requests": "ليس عندك أي طلب للمتابعة بعد. سوف تظهر طلباتك هنا إن قمت بتلقي البعض منها.",
   "empty_column.hashtag": "ليس هناك بعدُ أي محتوى ذو علاقة بهذا الوسم.",
   "empty_column.home": "إنّ الخيط الزمني لصفحتك الرئيسية فارغ. قم بزيارة {public} أو استخدم حقل البحث لكي تكتشف مستخدمين آخرين.",
   "empty_column.home.suggestions": "شاهد بعض الاقتراحات",
-  "empty_column.list": "هذه القائمة فارغة مؤقتا و لكن سوف تمتلئ تدريجيا عندما يبدأ الأعضاء المُنتَمين إليها بنشر تبويقات.",
+  "empty_column.list": "هذه القائمة فارغة مؤقتا و لكن سوف تمتلئ تدريجيا عندما يبدأ الأعضاء المُنتَمين إليها بنشر منشورات.",
   "empty_column.lists": "ليس عندك أية قائمة بعد. سوف تظهر قائمتك هنا إن قمت بإنشاء واحدة.",
   "empty_column.mutes": "لم تقم بكتم أي مستخدم بعد.",
   "empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "حاول تعطيلهم وإنعاش الصفحة. إن لم ينجح ذلك، يمكنك دائمًا استخدام ماستدون عبر متصفح آخر أو تطبيق أصلي.",
   "errors.unexpected_crash.copy_stacktrace": "انسخ تتبع الارتباطات إلى الحافظة",
   "errors.unexpected_crash.report_issue": "الإبلاغ عن خلل",
+  "explore.search_results": "نتائج البحث",
+  "explore.suggested_follows": "For you",
+  "explore.title": "استكشف",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "فئة عامل التصفية هذه لا تنطبق على السياق الذي وصلت فيه إلى هذه المشاركة. إذا كنت ترغب في تصفية المنشور في هذا السياق أيضا، فسيتعين عليك تعديل عامل التصفية.",
+  "filter_modal.added.context_mismatch_title": "عدم تطابق السياق!",
+  "filter_modal.added.expired_explanation": "انتهت صلاحية فئة عامل التصفية هذه، سوف تحتاج إلى تغيير تاريخ انتهاء الصلاحية لتطبيقها.",
+  "filter_modal.added.expired_title": "تصفية منتهية الصلاحية!",
+  "filter_modal.added.review_and_configure": "لمراجعة وزيادة تكوين فئة عوامل التصفية هذه، انتقل إلى {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "إعدادات التصفية",
+  "filter_modal.added.settings_link": "صفحة الإعدادات",
+  "filter_modal.added.short_explanation": "تمت إضافة هذه المشاركة إلى فئة الفلاتر التالية: {title}.",
+  "filter_modal.added.title": "تمت إضافة عامل التصفية!",
+  "filter_modal.select_filter.context_mismatch": "لا ينطبق على هذا السياق",
+  "filter_modal.select_filter.expired": "منتهية الصلاحيّة",
+  "filter_modal.select_filter.prompt_new": "فئة جديدة: {name}",
+  "filter_modal.select_filter.search": "البحث أو الإنشاء",
+  "filter_modal.select_filter.subtitle": "استخدام فئة موجودة أو إنشاء فئة جديدة",
+  "filter_modal.select_filter.title": "تصفية هذا المنشور",
+  "filter_modal.title.status": "تصفية منشور",
   "follow_recommendations.done": "تم",
   "follow_recommendations.heading": "تابع الأشخاص الذين ترغب في رؤية منشوراتهم! إليك بعض الاقتراحات.",
-  "follow_recommendations.lead": "ستظهر المنشورات من الأشخاص الذين تُتابعتهم بترتيب تسلسلي زمني على صفحتك الرئيسية. لا تخف إذا ارتكبت أي أخطاء، تستطيع إلغاء متابعة أي شخص في أي وقت تريد!",
+  "follow_recommendations.lead": "ستظهر منشورات الأشخاص الذين تُتابعتهم بترتيب تسلسلي زمني على صفحتك الرئيسية. لا تخف إذا ارتكبت أي أخطاء، تستطيع إلغاء متابعة أي شخص في أي وقت تريد!",
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
   "follow_requests.unlocked_explanation": "على الرغم من أن حسابك غير مقفل، فإن موظفين الـ{domain} ظنوا أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
+  "footer.about": "حَول",
+  "footer.directory": "دليل الصفحات التعريفية",
+  "footer.get_app": "احصل على التطبيق",
+  "footer.invite": "دعوة أشخاص",
+  "footer.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
+  "footer.privacy_policy": "سياسة الخصوصية",
+  "footer.source_code": "الاطلاع على الشفرة المصدرية",
   "generic.saved": "تم الحفظ",
-  "getting_started.developers": "المُطوِّرون",
-  "getting_started.directory": "دليل الصفحات التعريفية",
-  "getting_started.documentation": "الدليل",
   "getting_started.heading": "استعدّ للبدء",
-  "getting_started.invite": "دعوة أشخاص",
-  "getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.",
-  "getting_started.security": "الأمان",
-  "getting_started.terms": "شروط الخدمة",
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "أو {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "أي كان مِن هذه",
   "hashtag.column_settings.tag_mode.none": "لا شيء مِن هذه",
   "hashtag.column_settings.tag_toggle": "إدراج الوسوم الإضافية لهذا العمود",
+  "hashtag.follow": "اتبع وسم الهاشج",
+  "hashtag.unfollow": "ألغِ متابعة الوسم",
   "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض الترقيات",
   "home.column_settings.show_replies": "اعرض الردود",
   "home.hide_announcements": "إخفاء الإعلانات",
   "home.show_announcements": "إظهار الإعلانات",
+  "interaction_modal.description.favourite": "مع حساب في ماستدون، يمكنك تفضيل هذا المقال لإبلاغ الناشر بتقديرك وحفظه لاحقا.",
+  "interaction_modal.description.follow": "مع حساب في ماستدون، يمكنك متابعة {name} لتلقي مشاركاتهم في الصفحه الرئيسيه.",
+  "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور لمشاركته مع متابعينك.",
+  "interaction_modal.description.reply": "مع حساب في ماستدون، يمكنك الرد على هذه المشاركة.",
+  "interaction_modal.on_another_server": "على خادم مختلف",
+  "interaction_modal.on_this_server": "على هذا الخادم",
+  "interaction_modal.other_server_instructions": "انسخ و الصق هذا الرابط في حقل البحث الخاص بك لتطبيق ماستدون المفضل لديك أو واجهة الويب لخادم ماستدون الخاص بك.",
+  "interaction_modal.preamble": "بما إن ماستدون لامركزي، يمكنك استخدام حسابك الحالي المستضاف بواسطة خادم ماستدون آخر أو منصة متوافقة إذا لم يكن لديك حساب هنا.",
+  "interaction_modal.title.favourite": "الإعجاب بمنشور {name}",
+  "interaction_modal.title.follow": "اتبع {name}",
+  "interaction_modal.title.reblog": "مشاركة منشور {name}",
+  "interaction_modal.title.reply": "الرد على منشور {name}",
   "intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
   "intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
   "intervals.full.minutes": "{number, plural, one {# دقيقة} other {# دقائق}}",
@@ -237,7 +325,7 @@
   "keyboard_shortcuts.my_profile": "لفتح ملفك التعريفي",
   "keyboard_shortcuts.notifications": "لفتح عمود الإشعارات",
   "keyboard_shortcuts.open_media": "لفتح الوسائط",
-  "keyboard_shortcuts.pinned": "لفتح قائمة التبويقات المدبسة",
+  "keyboard_shortcuts.pinned": "لفتح قائمة المنشورات المثبتة",
   "keyboard_shortcuts.profile": "لفتح الملف التعريفي للناشر",
   "keyboard_shortcuts.reply": "للردّ",
   "keyboard_shortcuts.requests": "لفتح قائمة طلبات المتابعة",
@@ -246,7 +334,7 @@
   "keyboard_shortcuts.start": "لفتح عمود \"هيا نبدأ\"",
   "keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير",
   "keyboard_shortcuts.toggle_sensitivity": "لعرض/إخفاء الوسائط",
-  "keyboard_shortcuts.toot": "لتحرير تبويق جديد",
+  "keyboard_shortcuts.toot": "للشروع في تحرير منشور جديد",
   "keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث",
   "keyboard_shortcuts.up": "للانتقال إلى أعلى القائمة",
   "lightbox.close": "إغلاق",
@@ -254,6 +342,8 @@
   "lightbox.expand": "توسيع مربع عرض الصور",
   "lightbox.next": "التالي",
   "lightbox.previous": "العودة",
+  "limited_account_hint.action": "إظهار الملف التعريفي على أي حال",
+  "limited_account_hint.title": "تم إخفاء هذا الملف الشخصي من قبل مشرفي {domain}.",
   "lists.account.add": "أضف إلى القائمة",
   "lists.account.remove": "احذف من القائمة",
   "lists.delete": "احذف القائمة",
@@ -268,61 +358,70 @@
   "lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
-  "loading_indicator.label": "تحميل...",
-  "media_gallery.toggle_visible": "عرض / إخفاء",
+  "loading_indicator.label": "جارٍ التحميل…",
+  "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "missing_indicator.label": "غير موجود",
   "missing_indicator.sublabel": "تعذر العثور على هذا المورد",
+  "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.duration": "المدة",
   "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
   "mute_modal.indefinite": "إلى أجل غير مسمى",
-  "navigation_bar.apps": "تطبيقات الأجهزة المحمولة",
+  "navigation_bar.about": "عن",
   "navigation_bar.blocks": "الحسابات المحجوبة",
   "navigation_bar.bookmarks": "الفواصل المرجعية",
-  "navigation_bar.community_timeline": "الخيط العام المحلي",
-  "navigation_bar.compose": "تحرير تبويق جديد",
+  "navigation_bar.community_timeline": "الخيط المحلي",
+  "navigation_bar.compose": "تحرير منشور جديد",
   "navigation_bar.direct": "الرسائل المباشِرة",
   "navigation_bar.discover": "اكتشف",
-  "navigation_bar.domain_blocks": "النطاقات المخفية",
+  "navigation_bar.domain_blocks": "النطاقات المحظورة",
   "navigation_bar.edit_profile": "عدّل الملف التعريفي",
+  "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
   "navigation_bar.follow_requests": "طلبات المتابعة",
   "navigation_bar.follows_and_followers": "المتابِعين والمتابَعون",
-  "navigation_bar.info": "عن هذا الخادم",
-  "navigation_bar.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
   "navigation_bar.lists": "القوائم",
   "navigation_bar.logout": "خروج",
   "navigation_bar.mutes": "الحسابات المكتومة",
   "navigation_bar.personal": "شخصي",
-  "navigation_bar.pins": "التبويقات المثبتة",
+  "navigation_bar.pins": "المنشورات المُثَبَّتَة",
   "navigation_bar.preferences": "التفضيلات",
-  "navigation_bar.public_timeline": "الخيط العام الموحد",
+  "navigation_bar.public_timeline": "الخيط الفيدرالي",
+  "navigation_bar.search": "البحث",
   "navigation_bar.security": "الأمان",
+  "not_signed_in_indicator.not_signed_in": "تحتاج إلى تسجيل الدخول للوصول إلى هذا المصدر.",
+  "notification.admin.report": "{name} أبلغ عن {target}",
+  "notification.admin.sign_up": "أنشأ {name} حسابًا",
   "notification.favourite": "أُعجِب {name} بمنشورك",
   "notification.follow": "{name} يتابعك",
   "notification.follow_request": "لقد طلب {name} متابعتك",
   "notification.mention": "{name} ذكرك",
   "notification.own_poll": "انتهى استطلاعك للرأي",
-  "notification.poll": "لقد إنتها تصويت شاركت فيه",
-  "notification.reblog": "{name} قام بترقية تبويقك",
+  "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
+  "notification.reblog": "قام {name} بمشاركة منشورك",
   "notification.status": "{name} نشر للتو",
-  "notifications.clear": "امسح الإخطارات",
-  "notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
+  "notification.update": "عدّلَ {name} منشورًا",
+  "notifications.clear": "مسح الإشعارات",
+  "notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
+  "notifications.column_settings.admin.report": "التقارير الجديدة:",
+  "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المُفَضَّلة:",
   "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
   "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
-  "notifications.column_settings.filter_bar.show": "اظهِره",
+  "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
   "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
   "notifications.column_settings.poll": "نتائج استطلاع الرأي:",
-  "notifications.column_settings.push": "الإخطارات المدفوعة",
+  "notifications.column_settings.push": "الإشعارات",
   "notifications.column_settings.reblog": "الترقيّات:",
   "notifications.column_settings.show": "اعرِضها في عمود",
   "notifications.column_settings.sound": "أصدر صوتا",
-  "notifications.column_settings.status": "تبويقات جديدة:",
-  "notifications.column_settings.unread_markers.category": "علامات إشعار غير مقروءة",
+  "notifications.column_settings.status": "منشورات جديدة:",
+  "notifications.column_settings.unread_notifications.category": "إشعارات غير مقروءة",
+  "notifications.column_settings.unread_notifications.highlight": "علّم الإشعارات غير المقرؤة",
+  "notifications.column_settings.update": "التعديلات:",
   "notifications.filter.all": "الكل",
   "notifications.filter.boosts": "الترقيات",
   "notifications.filter.favourites": "المفضلة",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# صوت} other {# أصوات}}",
   "poll.vote": "صَوّت",
   "poll.voted": "لقد صوّتت على هذه الإجابة",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# صوت} other {# أصوات}}",
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
-  "privacy.direct.long": "أنشر إلى المستخدمين المشار إليهم فقط",
-  "privacy.direct.short": "مباشر",
+  "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
+  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
   "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "لمتابعيك فقط",
-  "privacy.public.long": "أنشر على الخيوط العامة",
+  "privacy.private.short": "للمتابِعين فقط",
+  "privacy.public.long": "مرئي للكل",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
+  "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
   "privacy.unlisted.short": "غير مدرج",
+  "privacy_policy.last_updated": "آخر تحديث {date}",
+  "privacy_policy.title": "سياسة الخصوصية",
   "refresh": "أنعِش",
   "regeneration_indicator.label": "جارٍ التحميل…",
   "regeneration_indicator.sublabel": "جارٍ تجهيز تغذية صفحتك الرئيسية!",
   "relative_time.days": "{number}ي",
+  "relative_time.full.days": "منذ {number, plural, zero {} one {# يوم} two {# يومين} few {# أيام} many {# أيام} other {# يوم}}",
+  "relative_time.full.hours": "منذ {number, plural, zero {} one {ساعة واحدة} two {ساعتَيْن} few {# ساعات} many {# ساعة} other {# ساعة}}",
+  "relative_time.full.just_now": "الآن",
+  "relative_time.full.minutes": "منذ {number, plural, zero {} one {دقيقة} two {دقيقتَيْن} few {# دقائق} many {# دقيقة} other {# دقائق}}",
+  "relative_time.full.seconds": "منذ {number, plural, zero {} one {ثانية} two {ثانيتَيْن} few {# ثوانٍ} many {# ثانية} other {# ثانية}}",
   "relative_time.hours": "{number}سا",
   "relative_time.just_now": "الآن",
   "relative_time.minutes": "{number}د",
   "relative_time.seconds": "{number}ثا",
   "relative_time.today": "اليوم",
   "reply_indicator.cancel": "إلغاء",
+  "report.block": "حظر",
+  "report.block_explanation": "لن ترى مشاركاتهم ولن يمكنهم متابعتك أو رؤية مشاركاتك، سيكون بديهيا لهم أنهم مكتمون.",
+  "report.categories.other": "أخرى",
+  "report.categories.spam": "مزعج",
+  "report.categories.violation": "المحتوى ينتهك شرطا أو عدة شروط استخدام للخادم",
+  "report.category.subtitle": "اختر أفضل تطابق",
+  "report.category.title": "وضح لنا ما أمر {type}",
+  "report.category.title_account": "ملف تعريفي",
+  "report.category.title_status": "منشور",
+  "report.close": "تم",
+  "report.comment.title": "هل لديك شيء آخر لتخبرنا به؟",
   "report.forward": "التحويل إلى {target}",
-  "report.forward_hint": "هذا الحساب ينتمي إلى خادوم آخَر. هل تودّ إرسال نسخة مجهولة مِن التقرير إلى هنالك أيضًا؟",
-  "report.hint": "سوف يتم إرسال التقرير إلى المُشرِفين على خادومكم. بإمكانكم الإدلاء بشرح عن سبب الإبلاغ عن الحساب أسفله:",
+  "report.forward_hint": "هذا الحساب ينتمي إلى خادم آخَر. هل تودّ إرسال نسخة مجهولة مِن التقرير إلى هنالك أيضًا؟",
+  "report.mute": "كتم",
+  "report.mute_explanation": "لن ترى مشاركاتهم. لكن سيبقى بإمكانهم متابعتك ورؤية مشاركاتك دون أن يعرفوا أنهم مكتمون.",
+  "report.next": "التالي",
   "report.placeholder": "تعليقات إضافية",
+  "report.reasons.dislike": "لايعجبني",
+  "report.reasons.dislike_description": "ألا ترغب برؤيته",
+  "report.reasons.other": "شيء آخر",
+  "report.reasons.other_description": "لا تندرج هذه المشكلة ضمن فئات أخرى",
+  "report.reasons.spam": "إنها رسالة مزعجة",
+  "report.reasons.spam_description": "روابط خبيثة أو تفاعل كاذب أو ردود متكررة",
+  "report.reasons.violation": "ينتهك قواعد الخادم",
+  "report.reasons.violation_description": "تعلم أنه ينتهك قواعد محددة",
+  "report.rules.subtitle": "اختر كل ما ينطبق",
+  "report.rules.title": "ما هي القواعد المنتهكة؟",
+  "report.statuses.subtitle": "اختر كل ما ينطبق",
+  "report.statuses.title": "هل توجد مشاركات تدعم صحة هذا البلاغ؟",
   "report.submit": "إرسال",
   "report.target": "ابلغ عن {target}",
+  "report.thanks.take_action": "يمكنك هنا التحكم في ما يعرض لك على ماستدون:",
+  "report.thanks.take_action_actionable": "في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد @{name}:",
+  "report.thanks.title": "هل ترغب في مشاهدة هذا؟",
+  "report.thanks.title_actionable": "شُكرًا لَكَ على الإبلاغ، سَوفَ نَنظُرُ فِي هَذَا الأمر.",
+  "report.unfollow": "إلغاء متابعة @{name}",
+  "report.unfollow_explanation": "أنت تتابع هذا الحساب، لإزالة مَنشوراته من تغذيَتِكَ الرئيسة ألغ متابعته.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} منشور} other {{count} منشورات}} مرفقة",
+  "report_notification.categories.other": "آخر",
+  "report_notification.categories.spam": "مزعج",
+  "report_notification.categories.violation": "القاعدة المنتهَكة",
+  "report_notification.open": "فتح التقرير",
   "search.placeholder": "ابحث",
+  "search.search_or_paste": "ابحث أو أدخل رابطا تشعبيا URL",
   "search_popout.search_format": "نمط البحث المتقدم",
   "search_popout.tips.full_text": "النص البسيط يقوم بعرض المنشورات التي كتبتها أو قمت بإرسالها أو ترقيتها أو تمت الإشارة إليك فيها من طرف آخرين ، بالإضافة إلى مطابقة أسماء المستخدمين وأسماء العرض وعلامات التصنيف.",
   "search_popout.tips.hashtag": "وسم",
@@ -382,23 +525,42 @@
   "search_popout.tips.text": "جملة قصيرة تُمكّنُك من عرض أسماء و حسابات و كلمات رمزية",
   "search_popout.tips.user": "مستخدِم",
   "search_results.accounts": "أشخاص",
+  "search_results.all": "الكل",
   "search_results.hashtags": "الوُسوم",
-  "search_results.statuses": "التبويقات",
-  "search_results.statuses_fts_disabled": "البحث في التبويقات عن طريق المحتوى ليس مفعل في خادم ماستدون هذا.",
+  "search_results.nothing_found": "تعذر العثور على نتائج تتضمن هذه المصطلحات",
+  "search_results.statuses": "المنشورات",
+  "search_results.statuses_fts_disabled": "البحث عن المنشورات عن طريق المحتوى ليس مفعل في خادم ماستدون هذا.",
+  "search_results.title": "البحث عن {q}",
   "search_results.total": "{count, number} {count, plural, zero {} one {نتيجة} two {نتيجتين} few {نتائج} many {نتائج} other {نتائج}}",
+  "server_banner.about_active_users": "الأشخاص الذين يستخدمون هذا الخادم خلال الأيام الثلاثين الأخيرة (المستخدمون النشطون شهريًا)",
+  "server_banner.active_users": "مستخدم نشط",
+  "server_banner.administered_by": "يُديره:",
+  "server_banner.introduction": "{domain} هو جزء من الشبكة الاجتماعية اللامركزية التي تعمل بواسطة {mastodon}.",
+  "server_banner.learn_more": "تعلم المزيد",
+  "server_banner.server_stats": "إحصائيات الخادم:",
+  "sign_in_banner.create_account": "أنشئ حسابًا",
+  "sign_in_banner.sign_in": "تسجيل الدخول",
+  "sign_in_banner.text": "قم بالولوج بحسابك لمتابعة الصفحات الشخصية أو الوسوم، أو لإضافة الرسائل إلى المفضلة ومشاركتها والرد عليها أو التفاعل بواسطة حسابك المتواجد على خادم مختلف.",
   "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
   "status.block": "احجب @{name}",
   "status.bookmark": "أضفه إلى الفواصل المرجعية",
   "status.cancel_reblog_private": "إلغاء الترقية",
   "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
-  "status.copy": "نسخ رابط المنشور",
+  "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",
   "status.detailed_status": "تفاصيل المحادثة",
   "status.direct": "رسالة خاصة إلى @{name}",
+  "status.edit": "تعديل",
+  "status.edited": "عُدّل في {date}",
+  "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "أضف إلى المفضلة",
+  "status.filter": "تصفية هذه الرسالة",
   "status.filtered": "مُصفّى",
+  "status.hide": "اخف التبويق",
+  "status.history.created": "أنشأه {name} {date}",
+  "status.history.edited": "عدله {name} {date}",
   "status.load_more": "حمّل المزيد",
   "status.media_hidden": "الصورة مستترة",
   "status.mention": "أذكُر @{name}",
@@ -407,34 +569,40 @@
   "status.mute_conversation": "كتم المحادثة",
   "status.open": "وسع هذه المشاركة",
   "status.pin": "دبّسه على الصفحة التعريفية",
-  "status.pinned": "تبويق مثبَّت",
+  "status.pinned": "منشور مثبَّت",
   "status.read_more": "اقرأ المزيد",
   "status.reblog": "رَقِّي",
   "status.reblog_private": "القيام بالترقية إلى الجمهور الأصلي",
-  "status.reblogged_by": "رقّاه {name}",
-  "status.reblogs.empty": "لم يقم أي أحد بترقية هذا التبويق بعد. عندما يقوم أحدهم بذلك سوف تظهر هنا.",
+  "status.reblogged_by": "شارَكَه {name}",
+  "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة و إعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
+  "status.replied_to": "رَدًا على {name}",
   "status.reply": "ردّ",
   "status.replyAll": "رُد على الخيط",
   "status.report": "ابلِغ عن @{name}",
   "status.sensitive_warning": "محتوى حساس",
   "status.share": "مشاركة",
+  "status.show_filter_reason": "إظهار على أي حال",
   "status.show_less": "اعرض أقلّ",
   "status.show_less_all": "طي الكل",
   "status.show_more": "أظهر المزيد",
   "status.show_more_all": "توسيع الكل",
-  "status.show_thread": "الكشف عن المحادثة",
+  "status.show_original": "إظهار الأصل",
+  "status.translate": "ترجم",
+  "status.translated_from_with": "مترجم من {lang} باستخدام {provider}",
   "status.uncached_media_warning": "غير متوفر",
   "status.unmute_conversation": "فك الكتم عن المحادثة",
   "status.unpin": "فك التدبيس من الصفحة التعريفية",
+  "subscribed_languages.lead": "فقط المشاركات في اللغات المحددة ستظهر في الرئيسيه وتسرد الجداول الزمنية بعد التغيير. حدد لا شيء لتلقي المشاركات بجميع اللغات.",
+  "subscribed_languages.save": "حفظ التغييرات",
+  "subscribed_languages.target": "تغيير اللغات المشتركة لـ {target}",
   "suggestions.dismiss": "إلغاء الاقتراح",
   "suggestions.header": "يمكن أن يهمك…",
   "tabs_bar.federated_timeline": "الموحَّد",
   "tabs_bar.home": "الرئيسية",
   "tabs_bar.local_timeline": "الخيط العام المحلي",
-  "tabs_bar.notifications": "الإخطارات",
-  "tabs_bar.search": "البحث",
+  "tabs_bar.notifications": "الإشعارات",
   "time_remaining.days": "{number, plural, one {# يوم} other {# أيام}} متبقية",
   "time_remaining.hours": "{number, plural, one {# ساعة} other {# ساعات}} متبقية",
   "time_remaining.minutes": "{number, plural, one {# دقيقة} other {# دقائق}} متبقية",
@@ -443,26 +611,27 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} من الخوادم الأخرى لا يتم عرضها.",
   "timeline_hint.resources.followers": "المتابِعون",
   "timeline_hint.resources.follows": "المتابَعون",
-  "timeline_hint.resources.statuses": "التبويقات القديمة",
-  "trends.counter_by_accounts": "{count,plural,zero{} one{{counter} شخص} two{{counter} شخصين} few{{counter} أشخاص } many{{counter} شخص} other{{counter} شخص}}",
+  "timeline_hint.resources.statuses": "المنشورات القديمة",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} شخص واحد} other {{counter} أشخاص}} في {days, plural, one {اليوم الماضي} other {{days} الأسام الماضية}}",
   "trends.trending_now": "المتداولة الآن",
   "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",
   "units.short.billion": "{count} مليار",
-  "units.short.million": "{count}  مليون",
-  "units.short.thousand": "{count}  ألف",
+  "units.short.million": "{count} مليون",
+  "units.short.thousand": "{count} ألف",
   "upload_area.title": "اسحب ثم أفلت للرفع",
   "upload_button.label": "إضافة وسائط",
   "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
   "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
   "upload_form.description": "وصف للمعاقين بصريا",
+  "upload_form.description_missing": "لم يُضف وصف",
   "upload_form.edit": "تعديل",
   "upload_form.thumbnail": "غيّر الصورة المصغرة",
   "upload_form.undo": "حذف",
   "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
   "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
   "upload_modal.apply": "طبّق",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "جارٍ التطبيق…",
   "upload_modal.choose_image": "اختر صورة",
   "upload_modal.description_placeholder": "نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق",
   "upload_modal.detect_text": "اكتشف النص مِن الصورة",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "جار إعداد OCR (تعرف ضوئي على الرموز)…",
   "upload_modal.preview_label": "معاينة ({ratio})",
   "upload_progress.label": "يرفع...",
+  "upload_progress.processing": "تتم المعالجة…",
   "video.close": "إغلاق الفيديو",
   "video.download": "تنزيل الملف",
   "video.exit_fullscreen": "الخروج من وضع الشاشة المليئة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 89a13246c..ed135545c 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -1,329 +1,428 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Amestar o desaniciar de les llistes",
+  "about.blocks": "Sirvidores llendaos",
+  "about.contact": "Contautu:",
+  "about.disclaimer": "Mastodon ye software gratuito ya de códigu llibre, ya una marca rexistrada de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "El motivu nun ta disponible",
+  "about.domain_blocks.preamble": "Polo xeneral, Mastodon permítete ver el conteníu ya interactuar colos perfiles d'otros sirvidores nel fediversu. Estes son les esceiciones que se ficieron nesti sirvidor.",
+  "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles ya el conteníu d'esti sirvidor sacante que los busques o decidas siguilos.",
+  "about.domain_blocks.silenced.title": "Llendóse",
+  "about.domain_blocks.suspended.explanation": "Nun se procesa, atroxa nin intercambia nengún datu d'esti sirvidor, lo que fai que cualesquier interaición o comunicación colos sos perfiles seya imposible.",
+  "about.domain_blocks.suspended.title": "Suspendióse",
+  "about.not_available": "Esta información nun ta disponible nesti sirvidor.",
+  "about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
+  "about.rules": "Regles del sirvidor",
+  "account.account_note_header": "Nota",
+  "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
   "account.badges.bot": "Robó",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
-  "account.block_domain": "Anubrir tolo de {domain}",
-  "account.blocked": "Bloquiada",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Encaboxar la solicitú de siguimientu",
+  "account.block_domain": "Bloquiar el dominiu {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Unviar un mensaxe direutu a @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Dominiu anubríu",
+  "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
+  "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Editar el perfil",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
-  "account.follow": "Siguir",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "Etiquetes destacaes de: {name}",
+  "account.follow": "Follow",
   "account.followers": "Siguidores",
-  "account.followers.empty": "Naide sigue a esti usuariu entá.",
+  "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "Esti usuariu entá nun sigue a naide.",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural,one {Siguiendo a {counter}} other {Siguiendo a {counter}}}",
+  "account.follows.empty": "Esti perfil entá nun sigue a naide.",
   "account.follows_you": "Síguete",
-  "account.hide_reblogs": "Anubrir les comparticiones de @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Cabera actividá",
-  "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Data de xunión",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-  "account.media": "Media",
+  "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
-  "account.moved_to": "{name} mudóse a:",
-  "account.mute": "Silenciar a @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Desactivar los avisos de @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Enxamás",
-  "account.posts": "Barritos",
-  "account.posts_with_replies": "Barritos y rempuestes",
+  "account.open_original_page": "Abrir la páxina orixinal",
+  "account.posts": "Artículos",
+  "account.posts_with_replies": "Artículos ya rempuestes",
   "account.report": "Report @{name}",
-  "account.requested": "Esperando pola aprobación. Calca pa encaboxar la solicitú de siguimientu",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Amosar les comparticiones de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Desbloquiar a @{name}",
-  "account.unblock_domain": "Amosar {domain}",
-  "account.unendorse": "Nun destacar nel perfil",
+  "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} artículu} other {{counter} artículos}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Dexar de destacar nel perfil",
   "account.unfollow": "Dexar de siguir",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "account.unmute": "Activar los avisos de @{name}",
+  "account.unmute_notifications": "Activar los avisos de @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Calca equí p'amestar una nota",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mes de rexistru",
+  "admin.dashboard.retention.cohort_size": "Perfiles nuevos",
+  "alert.rate_limited.message": "Volvi tentalo dempués de la hora: {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "Asocedió un fallu inesperáu.",
+  "alert.unexpected.message": "Prodúxose un error inesperáu.",
   "alert.unexpected.title": "¡Meca!",
   "announcement.announcement": "Anunciu",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ensin procesar)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per selmana",
-  "boost_modal.combo": "Pues primir {combo} pa saltar esto la próxima vegada",
-  "bundle_column_error.body": "Asocedió daqué malo mentanto se cargaba esti componente.",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
+  "bundle_column_error.error.title": "¡Oh, non!",
+  "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Asocedió daqué malo mentanto se cargaba esti componente.",
   "bundle_modal_error.retry": "Try again",
-  "column.blocks": "Usuarios bloquiaos",
-  "column.bookmarks": "Marcadores",
-  "column.community": "Llinia temporal llocal",
+  "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor ya siguir interactuando con esti.",
+  "closed_registrations_modal.description": "Anguaño nun ye posible crear cuentes en {domain}, mas ten en cuenta que nun precises una cuenta nesti sirvidor pa usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Atopar otru sirvidor",
+  "closed_registrations_modal.preamble": "Mastodon ye una rede social descentralizada polo que nun importa ónde crees la cuenta, vas ser a siguir ya interactuar con persones d'esti sirvidor. ¡Ya tamién pues tener el to propiu sirvidor!",
+  "closed_registrations_modal.title": "Rexistru en Mastodon",
+  "column.about": "Tocante a",
+  "column.blocks": "Perfiles bloquiaos",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Llinia de tiempu llocal",
   "column.direct": "Mensaxes direutos",
   "column.directory": "Browse profiles",
-  "column.domain_blocks": "Dominios anubríos",
-  "column.favourites": "Favoritos",
+  "column.domain_blocks": "Dominios bloquiaos",
+  "column.favourites": "Favourites",
   "column.follow_requests": "Solicitúes de siguimientu",
-  "column.home": "Aniciu",
-  "column.lists": "Llistes",
-  "column.mutes": "Usuarios silenciaos",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
   "column.notifications": "Avisos",
-  "column.pins": "Barritos fixaos",
-  "column.public": "Llinia temporal federada",
+  "column.pins": "Artículos fixaos",
+  "column.public": "Llinia de tiempu federada",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Hide settings",
   "column_header.moveLeft_settings": "Mover la columna a la esquierda",
-  "column_header.moveRight_settings": "Mover la columna a la drecha",
+  "column_header.moveRight_settings": "Mover la columna a la derecha",
   "column_header.pin": "Fixar",
-  "column_header.show_settings": "Amosar axustes",
-  "column_header.unpin": "Desfixar",
-  "column_subheading.settings": "Axustes",
+  "column_header.show_settings": "Amosar la configuración",
+  "column_header.unpin": "Lliberar",
+  "column_subheading.settings": "Configuración",
   "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Namái multimedia",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "Esti barritu namái va unviase a los usuarios mentaos.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
+  "community.column_settings.media_only": "Namás el conteníu multimedia",
+  "community.column_settings.remote_only": "Namás lo remoto",
+  "compose.language.change": "Camudar la llingua",
+  "compose.language.search": "Buscar llingües…",
+  "compose_form.direct_message_warning_learn_more": "Saber más",
+  "compose_form.encryption_warning": "Los artículos de Mastodon nun tán cifraos de puntu a puntu. Nun compartas nengún tipu d'información sensible per Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
+  "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
-  "compose_form.poll.add_option": "Amestar una escoyeta",
+  "compose_form.poll.add_option": "Amestar una opción",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Escoyeta {number}",
-  "compose_form.poll.remove_option": "Desaniciar esta escoyeta",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.remove_option": "Quitar esta opción",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Barritar",
-  "compose_form.publish_loud": "{publish}!",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "¡{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-  "compose_form.spoiler.marked": "El testu nun va anubrise darrera d'una alvertencia",
-  "compose_form.spoiler.unmarked": "El testu nun va anubrise",
-  "compose_form.spoiler_placeholder": "Escribi equí l'alvertencia",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
   "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Desaniciar",
-  "confirmations.delete.message": "¿De xuru que quies desaniciar esti estáu?",
+  "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
   "confirmations.delete_list.confirm": "Desaniciar",
-  "confirmations.delete_list.message": "¿De xuru que quies desaniciar dafechu esta llista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Escartar",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Anubrir tol dominiu",
-  "confirmations.domain_block.message": "¿De xuru xurísimu que quies bloquiar el dominiu {domain} enteru? Na mayoría de casos bloquiar o silenciar dalguna cuenta ye abondo y preferible. Nun vas ver el conteníu d'esi dominiu en nenguna llinia temporal pública o nos avisos, y van desanciase los tos siguidores d'esi dominiu.",
-  "confirmations.logout.confirm": "Zarrar sesión",
+  "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
-  "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto va anubrir los espublizamientos y les sos menciones pero entá va permiti-yos ver los tos espublizamientos y siguite.",
-  "confirmations.mute.message": "¿De xuru que quies silenciar a {name}?",
-  "confirmations.redraft.confirm": "Desaniciar y reeditar",
-  "confirmations.redraft.message": "¿De xuru que quies desaniciar esti estáu y reeditalu? Van perdese los favoritos y comparticiones, y les rempuestes al toot orixinal van quedar güérfanes.",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Desaniciar ya reeditar",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder agora va sobrescribir el mensaxe que tas componiendo anguaño. ¿De xuru que quies siguir?",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.unfollow.confirm": "Dexar de siguir",
   "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "Con {names}",
-  "directory.federated": "Dende'l fediversu",
-  "directory.local": "Dende {domain} namái",
-  "directory.new_arrivals": "Cuentes nueves",
-  "directory.recently_active": "Actividá recién",
-  "embed.instructions": "Empotra esti estáu nun sitiu web copiando'l códigu d'embaxo.",
-  "embed.preview": "Asina ye cómo va vese:",
-  "emoji_button.activity": "Actividaes",
+  "copypaste.copied": "Copióse",
+  "copypaste.copy": "Copiar",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Escartar",
+  "dismissable_banner.explore_links": "Esta seición contién les noticies que se tán comentando puramente agora, nesti ya otros sirvidores de la rede descentralizada.",
+  "dismissable_banner.explore_statuses": "Esta seición contién los artículos d'esti ya otros sirvidores de la rede descentralizada que tán ganando popularidá nesti sirvidor.",
+  "dismissable_banner.explore_tags": "Esta seición contién les etiquetes que tán ganando popularidá ente les persones d'esti ya otros sirvidores de la rede descentralizada.",
+  "dismissable_banner.public_timeline": "Esta seición contién los artículos públicos más recientes de persones nesti ya otros sirvidores de la rede descentralizada qu'esti sirvidor conoz.",
+  "embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.",
+  "embed.preview": "Va apaecer asina:",
+  "emoji_button.activity": "Actividá",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Banderes",
-  "emoji_button.food": "Comida y bébora",
-  "emoji_button.label": "Inxertar un fustaxe",
+  "emoji_button.food": "Comida ya bébora",
+  "emoji_button.label": "Insert emoji",
   "emoji_button.nature": "Natura",
-  "emoji_button.not_found": "¡Nun hai fustaxes! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
   "emoji_button.objects": "Oxetos",
-  "emoji_button.people": "Xente",
-  "emoji_button.recent": "Úsase davezu",
-  "emoji_button.search": "Guetar…",
-  "emoji_button.search_results": "Search results",
+  "emoji_button.people": "Persones",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Buscar…",
+  "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
-  "emoji_button.travel": "Viaxes y llugares",
+  "emoji_button.travel": "Viaxes ya llugares",
   "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "¡Equí nun hai barritos!",
+  "empty_column.account_timeline": "¡Equí nun hai nengún artículu!",
   "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "Entá nun bloquiesti a nunengún usuariu.",
-  "empty_column.bookmarked_statuses": "Entá nun tienes nengún barritu en Marcadores. Cuando amiestes unu, va amosase equí.",
+  "empty_column.blocks": "Entá nun bloquiesti a nengún perfil.",
+  "empty_column.bookmarked_statuses": "Entá nun tienes nengún artículu en Marcadores. Cuando amiestes unu, apaez equí.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "Entá nun tienes nunengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí.",
-  "empty_column.domain_blocks": "Entá nun hai dominios anubríos.",
-  "empty_column.favourited_statuses": "Entá nun tienes nengún barritu en Favoritos. Cuando amiestes unu, va amosase equí.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "Entá nun tienes nenguna solicitú de siguimientu. Cuando recibas una, va amosase equí.",
-  "empty_column.hashtag": "Entá nun hai nada nesta etiqueta.",
-  "empty_column.home": "¡Tienes la llinia temporal balera! Visita {public} o usa la gueta pa entamar y conocer a otros usuarios.",
+  "empty_column.direct": "Entá nun tienes nengún mensaxe direutu. Cuando unvies o recibas dalgún, apaecen equí.",
+  "empty_column.domain_blocks": "Entá nun hai nengún dominiu bloquiáu.",
+  "empty_column.explore_statuses": "Agora nun hai nada en tendencia. ¡Volvi equí dempués!",
+  "empty_column.favourited_statuses": "Entá nun marquesti nengún artículu como favoritu. Cuando marques unu, apaez equí.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Paez que nun se puen xenerar suxerencies pa ti. Pues tentar d'usar la busca p'atopar perfiles que pues conocer o esplorar les etiquetes en tendencia.",
+  "empty_column.follow_requests": "Entá nun tienes nenguna solicitú de siguimientu. Cuando recibas una, apaez equí.",
+  "empty_column.hashtag": "Entá nun hai nada con esta etiqueta.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "Entá nun hai nada nesta llista. Cuando los miembros d'esta llista espublicen estaos nuevos, van apaecer equí.",
-  "empty_column.lists": "Entá nun tienes nenguna llista. Cuando crees una, va amosase equí.",
-  "empty_column.mutes": "Entá nun silenciesti a nunengún usuariu.",
-  "empty_column.notifications": "Entá nun tienes nunengún avisu. Interactúa con otros p'aniciar la conversación.",
-  "empty_column.public": "¡Equí nun hai nada! Escribi daqué público o sigui a usuarios d'otros sirvidores pa rellenar esto",
-  "error.unexpected_crash.explanation": "Pola mor d'un fallu nel códigu o un problema de compatibilidá del restolador, esta páxina nun pudo amosase correutamente.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "empty_column.list": "Entá nun hai nada nesta llista. Cuando los miembros d'esta llista espublicen artículos nuevos, apaecen equí.",
+  "empty_column.lists": "Entá nun tienes nenguna llista. Cuando crees una, apaez equí.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Pola mor d'un fallu nel códigu o un problema de compatibilidá del restolador, esta páxina nun se pudo amosar correutamente.",
+  "error.unexpected_crash.explanation_addons": "Esta páxina nun se pudo amosar correutamente. Ye probable que dalgún complementu del restolador o dalguna ferramienta de traducción automática produxere esti error.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
+  "explore.search_results": "Resultaos de la busca",
+  "explore.suggested_follows": "Pa ti",
+  "explore.title": "Esploración",
+  "explore.trending_links": "Noticies",
+  "explore.trending_statuses": "Artículos",
+  "explore.trending_tags": "Etiquetes",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de peñera nun s'aplica al contestu nel qu'accediesti a esti artículu. Si tamién quies que se peñere l'artículu nesti contestu, tienes d'editar la peñera.",
+  "filter_modal.added.context_mismatch_title": "¡El contestu nun coincide!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "¡La peñera caducó!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "Categoría nueva: {name}",
+  "filter_modal.select_filter.search": "Buscar o crear",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Fecho",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.lead": "Los artículos de los perfiles que sigas van apaecer n'orde cronolóxicu nel to feed d'aniciu. ¡Nun tengas mieu d'enquivocate, pues dexar de siguilos con facilidá en cualesquier momentu!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Refugar",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Desendolcadores",
-  "getting_started.directory": "Direutoriu de perfiles",
-  "getting_started.documentation": "Documentación",
-  "getting_started.heading": "Entamu",
-  "getting_started.invite": "Convidar a persones",
-  "getting_started.open_source_notice": "Mastodon ye software de códigu abiertu. Pues collaborar o informar de fallos en GitHub: {github}.",
-  "getting_started.security": "Axustes de la cuenta",
-  "getting_started.terms": "Términos del serviciu",
+  "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
+  "footer.about": "Tocante a",
+  "footer.directory": "Direutoriu de perfiles",
+  "footer.get_app": "Consiguir l'aplicación",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Atayos del tecláu",
+  "footer.privacy_policy": "Política de privacidá",
+  "footer.source_code": "Ver el códigu fonte",
+  "generic.saved": "Guardóse",
+  "getting_started.heading": "Getting started",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "ensin {additional}",
-  "hashtag.column_settings.select.no_options_message": "Nun s'alcontraron suxerencies",
+  "hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
   "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Toes estes",
-  "hashtag.column_settings.tag_mode.any": "Cualesquiera d'estes",
-  "hashtag.column_settings.tag_mode.none": "Nenguna d'estes",
-  "hashtag.column_settings.tag_toggle": "Incluyir les etiquetes adicionales d'esta columna",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Amosar toots compartíos",
-  "home.column_settings.show_replies": "Amosar rempuestes",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Siguir a la etiqueta",
+  "hashtag.unfollow": "Dexar de siguir a la etiqueta",
+  "home.column_settings.basic": "Configuración básica",
+  "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
+  "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "Con una cuenta de Mastodon pues marcar esti artículu como favoritu ya avisar al autor/a de que te presta ya que lu guardes pa dempués.",
+  "interaction_modal.description.follow": "Con una cuenta de Mastodon, pues siguir a {name} pa recibir los artículos de so nel to feed d'aniciu.",
+  "interaction_modal.description.reblog": "Con una cuenta de Mastodon, pues compartir esti artículu colos perfiles que te sigan.",
+  "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esti artículu.",
+  "interaction_modal.on_another_server": "N'otru sirvidor",
+  "interaction_modal.on_this_server": "Nesti sirvidor",
+  "interaction_modal.other_server_instructions": "Copia ya apiega esta URL nel campu de busca de la to aplicación favorita de Mastodon o na interfaz web de dalgún sirvidor de Mastodon.",
+  "interaction_modal.preamble": "Darréu que Mastodon ye una rede social descentralizada, pues usar una cuenta agospiada n'otru sirvidor de Mastodon o n'otra plataforma compatible si nun tienes cuenta nesti sirvidor.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Rempuesta al artículu de: {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# díes}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
-  "keyboard_shortcuts.back": "pa dir p'atrás",
-  "keyboard_shortcuts.blocked": "p'abrir la llista d'usuarios bloquiaos",
-  "keyboard_shortcuts.boost": "pa compartir un toot",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "pa enfocar l'área de composición",
+  "keyboard_shortcuts.back": "Dir p'atrás",
+  "keyboard_shortcuts.blocked": "Abrir la llista de perfiles bloquiaos",
+  "keyboard_shortcuts.boost": "Compartir un artículu",
+  "keyboard_shortcuts.column": "Enfocar una columna",
+  "keyboard_shortcuts.compose": "Enfocar l'área de composición",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "p'abrir la columna de los mensaxes direutos",
-  "keyboard_shortcuts.down": "pa baxar na llista",
-  "keyboard_shortcuts.enter": "p'abrir estaos",
-  "keyboard_shortcuts.favourite": "p'amestar a Favoritos",
-  "keyboard_shortcuts.favourites": "p'abrir la llista de favoritos",
-  "keyboard_shortcuts.federated": "p'abrir la llinia temporal federada",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "Baxar na llista",
+  "keyboard_shortcuts.enter": "Abrir un artículu",
+  "keyboard_shortcuts.favourite": "Marcar un artículu como favoritu",
+  "keyboard_shortcuts.favourites": "Abrir la llista de Favoritos",
+  "keyboard_shortcuts.federated": "Abrir la llinia de tiempu federada",
   "keyboard_shortcuts.heading": "Atayos del tecláu",
-  "keyboard_shortcuts.home": "p'abrir la llinia temporal d'aniciu",
+  "keyboard_shortcuts.home": "Abrir la llinia de tiempu del aniciu",
   "keyboard_shortcuts.hotkey": "Atayu",
-  "keyboard_shortcuts.legend": "p'amosar esta lleenda",
-  "keyboard_shortcuts.local": "p'abrir la llinia temporal llocal",
-  "keyboard_shortcuts.mention": "pa mentar al autor",
-  "keyboard_shortcuts.muted": "p'abrir la llista d'usuarios silenciaos",
-  "keyboard_shortcuts.my_profile": "p'abrir el to perfil",
-  "keyboard_shortcuts.notifications": "p'abrir la columna d'avisos",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "p'abrir la llista de barritos fixaos",
-  "keyboard_shortcuts.profile": "p'abrir el perfil del autor",
-  "keyboard_shortcuts.reply": "pa responder",
-  "keyboard_shortcuts.requests": "p'abrir la llista de solicitúes de siguimientu",
-  "keyboard_shortcuts.search": "pa enfocar la gueta",
+  "keyboard_shortcuts.legend": "Amosar esta lleenda",
+  "keyboard_shortcuts.local": "Abrir la llinia de tiempu llocal",
+  "keyboard_shortcuts.mention": "Mentar al autor/a",
+  "keyboard_shortcuts.muted": "Abrir la llista de perfiles colos avisos desactivaos",
+  "keyboard_shortcuts.my_profile": "Abrir el to perfil",
+  "keyboard_shortcuts.notifications": "Abrir la columna d'avisos",
+  "keyboard_shortcuts.open_media": "Abrir el conteníu mutimedia",
+  "keyboard_shortcuts.pinned": "Abrir la llista d'artículos fixaos",
+  "keyboard_shortcuts.profile": "Abrir el perfil del autor/a",
+  "keyboard_shortcuts.reply": "Responder a un artículu",
+  "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
+  "keyboard_shortcuts.search": "Enfocar la barra de busca",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "p'abrir la columna «entamar»",
+  "keyboard_shortcuts.start": "Abrir la columna «Entamar»",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "p'apenzar un barritu nuevu",
-  "keyboard_shortcuts.unfocus": "pa desenfocar l'área de composición/gueta",
-  "keyboard_shortcuts.up": "pa xubir na llista",
+  "keyboard_shortcuts.toggle_sensitivity": "Amosar/anubrir el conteníu multimedia",
+  "keyboard_shortcuts.toot": "Comenzar un artículu nuevu",
+  "keyboard_shortcuts.unfocus": "Desenfocar l'área de composición/busca",
+  "keyboard_shortcuts.up": "Xubir na llista",
   "lightbox.close": "Close",
   "lightbox.compress": "Compress image view box",
   "lightbox.expand": "Expand image view box",
-  "lightbox.next": "Siguiente",
+  "lightbox.next": "Next",
   "lightbox.previous": "Previous",
-  "lists.account.add": "Amestar a la llista",
-  "lists.account.remove": "Desaniciar de la llista",
+  "limited_account_hint.action": "Amosar el perfil de toes toes",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
   "lists.delete": "Desaniciar la llista",
   "lists.edit": "Editar la llista",
   "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "Títulu nuevu de la llista",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
+  "lists.new.create": "Amestar la llista",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Cualesquier perfil siguíu",
+  "lists.replies_policy.list": "Miembros de la llista",
+  "lists.replies_policy.none": "Naide",
   "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Guetar ente la xente que sigues",
-  "lists.subheading": "Les tos llistes",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "loading_indicator.label": "Cargando…",
-  "media_gallery.toggle_visible": "Alternar la visibilidá",
-  "missing_indicator.label": "Nun s'alcontró",
-  "missing_indicator.sublabel": "Esti recursu nun pudo alcontrase",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "¿Anubrir los avisos d'esti usuariu?",
+  "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
+  "missing_indicator.label": "Nun s'atopó",
+  "missing_indicator.sublabel": "Nun se pudo atopar esti recursu",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duración",
+  "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Aplicaciones pa móviles",
-  "navigation_bar.blocks": "Usuarios bloquiaos",
+  "navigation_bar.about": "Tocante a",
+  "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Llinia temporal llocal",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.community_timeline": "Llinia de tiempu llocal",
+  "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Mensaxes direutos",
   "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Dominios anubríos",
+  "navigation_bar.domain_blocks": "Dominios bloquiaos",
   "navigation_bar.edit_profile": "Editar el perfil",
+  "navigation_bar.explore": "Esploración",
   "navigation_bar.favourites": "Favoritos",
-  "navigation_bar.filters": "Pallabres silenciaes",
+  "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "Tocante a esta instancia",
-  "navigation_bar.keyboard_shortcuts": "Atayos",
   "navigation_bar.lists": "Llistes",
-  "navigation_bar.logout": "Zarrar sesión",
-  "navigation_bar.mutes": "Usuarios silenciaos",
+  "navigation_bar.logout": "Zarrar la sesión",
+  "navigation_bar.mutes": "Muted users",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Barritos fixaos",
+  "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
-  "navigation_bar.public_timeline": "Llinia temporal federada",
+  "navigation_bar.public_timeline": "Llinia de tiempu federada",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Seguranza",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} informó de: {target}",
+  "notification.admin.sign_up": "{name} rexistróse",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} solicitó siguite",
   "notification.mention": "{name} mentóte",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "Finó una encuesta na que votesti",
-  "notification.reblog": "{name} compartió'l to estáu",
-  "notification.status": "{name} just posted",
-  "notifications.clear": "Llimpiar avisos",
-  "notifications.clear_confirmation": "¿De xuru que quies llimpiar dafechu tolos avisos?",
-  "notifications.column_settings.alert": "Avisos d'escritoriu",
-  "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar toles estayes",
+  "notification.reblog": "{name} compartió'l to artículu",
+  "notification.status": "{name} ta acabante d'espublizar",
+  "notification.update": "{name} editó un artículu",
+  "notifications.clear": "Borrar los avisos",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "Informes nuevos:",
+  "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Artículos favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
   "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
-  "notifications.column_settings.filter_bar.show": "Amosar",
+  "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
-  "notifications.column_settings.poll": "Resultaos d'encuestes:",
+  "notifications.column_settings.poll": "Resultaos de les encuestes:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Barritos compartíos:",
-  "notifications.column_settings.show": "Amosar en columna",
+  "notifications.column_settings.reblog": "Artículos compartíos:",
+  "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Reproducir un soníu",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "Too",
+  "notifications.column_settings.status": "Artículos nuevos:",
+  "notifications.column_settings.unread_notifications.category": "Avisos ensin lleer",
+  "notifications.column_settings.unread_notifications.highlight": "Rescamplar los avisos ensin lleer",
+  "notifications.column_settings.update": "Ediciones:",
+  "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
   "notifications.filter.follows": "Follows",
@@ -332,153 +431,224 @@
   "notifications.filter.statuses": "Updates from people you follow",
   "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} avisos",
-  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
   "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Acabó",
-  "poll.refresh": "Refresh",
+  "poll.closed": "Finó",
+  "poll.refresh": "Anovar",
   "poll.total_people": "{count, plural, one {# persona} other {# persones}}",
   "poll.total_votes": "{count, plural, one {# votu} other {# votos}}",
   "poll.vote": "Vote",
   "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# votu} other {# votos}}",
   "poll_button.add_poll": "Amestar una encuesta",
-  "poll_button.remove_poll": "Desaniciar la encuesta",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
+  "poll_button.remove_poll": "Quitar la encuesta",
+  "privacy.change": "Configurar la privacidá del artículu",
+  "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Namái siguidores",
-  "privacy.public.long": "Post to public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Nun apaez nes llinies temporales públiques",
-  "privacy.unlisted.short": "Nun llistar",
+  "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
+  "privacy.private.short": "Namás pa siguidores",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Artículu públicu",
+  "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
+  "privacy_policy.title": "Política de privacidá",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Cargando…",
-  "regeneration_indicator.sublabel": "¡Tamos tresnando'l feed d'Aniciu!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number} d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "puramente agora",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number} h",
   "relative_time.just_now": "agora",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
+  "relative_time.minutes": "{number} m",
+  "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "L'informe va unviase a los llendadores del to sirvidor. Embaxo, pues desplicar por qué informes d'esta cuenta:",
+  "report.block": "Bloquiar",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "El conteníu incumple una o más regles del sirvidor",
+  "report.category.subtitle": "Escueyi la meyor opción",
+  "report.category.title": "Dinos qué pasa con esti {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "artículu",
+  "report.close": "Fecho",
+  "report.comment.title": "¿Hai daqué más qu'habríemos saber?",
+  "report.forward": "Reunviar a {target}",
+  "report.forward_hint": "La cuenta ye d'otru sirvidor. ¿Quies unviar a esi sirvidor una copia anónima del informe?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "Nun ye daqué que quiera ver",
+  "report.reasons.other": "Ye daqué más",
+  "report.reasons.other_description": "La incidencia nun s'axusta a les demás categoríes",
+  "report.reasons.spam": "Ye spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "Incumple les regles del sirvidor",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "¿Qué regles s'incumplen?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Unviar",
   "report.target": "Report {target}",
-  "search.placeholder": "Guetar",
-  "search_popout.search_format": "Formatu de gueta avanzada",
+  "report.thanks.take_action": "Equí tienes les opciones pa controlar qué ves en Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Dexar de siguir a @{name}",
+  "report.unfollow_explanation": "Sigues a esta cuenta. Pa dexar de ver los sos artículos nel to feed d'aniciu, dexa de siguila.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Abrir l'informe",
+  "search.placeholder": "Buscar",
+  "search.search_or_paste": "Busca o apiega una URL",
+  "search_popout.search_format": "Formatu de busca avanzada",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
-  "search_popout.tips.status": "estáu",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "usuariu",
-  "search_results.accounts": "Xente",
+  "search_popout.tips.status": "artículu",
+  "search_popout.tips.text": "El testu simple devuelve nomes visibles, cuentes ya etiquetes que concasen",
+  "search_popout.tips.user": "perfil",
+  "search_results.accounts": "Perfiles",
+  "search_results.all": "All",
   "search_results.hashtags": "Etiquetes",
-  "search_results.statuses": "Barritos",
-  "search_results.statuses_fts_disabled": "Esti sirvidor de Mastodon tien activada la gueta de barritos pol so conteníu.",
+  "search_results.nothing_found": "Nun se pudo atopar nada con esos términos de busca",
+  "search_results.statuses": "Artículos",
+  "search_results.statuses_fts_disabled": "Esti sirvidor de Mastodon nun tien activada la busca d'artículos pol so conteníu.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {resultáu} other {resultaos}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} ye parte de la rede social descentralizada que tien la teunoloxía de {mastodon}.",
+  "server_banner.learn_more": "Saber más",
+  "server_banner.server_stats": "Estadístiques del sirvidor:",
+  "sign_in_banner.create_account": "Crear una cuenta",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Anicia la sesión pa siguir a perfiles o etiquetes, marcar como favoritu, compartir o responder a artículos, o interactuar cola to cuenta nun sirvidor diferente.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Bloquiar a @{name}",
-  "status.bookmark": "Amestar a Marcadores",
-  "status.cancel_reblog_private": "Dexar de compartir",
-  "status.cannot_reblog": "Esti artículu nun pue compartise",
-  "status.copy": "Copiar l'enllaz al estáu",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Meter en Marcadores",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "Esti artículu nun se pue compartir",
+  "status.copy": "Copiar l'enllaz al artículu",
   "status.delete": "Desaniciar",
   "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Unviar un mensaxe direutu a @{name}",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} creó {date}",
+  "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
-  "status.media_hidden": "Multimedia anubrida",
+  "status.media_hidden": "Media hidden",
   "status.mention": "Mentar a @{name}",
   "status.more": "Más",
-  "status.mute": "Silenciar a @{name}",
-  "status.mute_conversation": "Silenciar la conversación",
-  "status.open": "Espander esti estáu",
+  "status.mute": "Desactivar los avisos de @{name}",
+  "status.mute_conversation": "Desactivar los avisos de la conversación",
+  "status.open": "Espander esti artículu",
   "status.pin": "Fixar nel perfil",
-  "status.pinned": "Barritu fixáu",
-  "status.read_more": "Read more",
+  "status.pinned": "Artículu fixáu",
+  "status.read_more": "Lleer más",
   "status.reblog": "Compartir",
-  "status.reblog_private": "Compartir cola audiencia orixinal",
+  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} compartió",
-  "status.reblogs.empty": "Naide nun compartió esti barritu entá. Cuando daquién lo faiga, va amosase equí.",
-  "status.redraft": "Desaniciar y reeditar",
-  "status.remove_bookmark": "Desaniciar de Marcadores",
+  "status.reblogs.empty": "Naide nun compartió esti artículu entá. Cuando daquién lo faiga, apaez equí.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
-  "status.replyAll": "Reply to thread",
+  "status.replyAll": "Responder al filu",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Amosar menos",
-  "status.show_less_all": "Amosar menos en too",
+  "status.show_less_all": "Show less for all",
   "status.show_more": "Amosar más",
-  "status.show_more_all": "Amosar más en too",
-  "status.show_thread": "Amosar el filu",
-  "status.uncached_media_warning": "Non disponible",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Desfixar del perfil",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Amosar l'orixinal",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Tradúxose del {lang} con {provider}",
+  "status.uncached_media_warning": "El conteníu nun ta disponible",
+  "status.unmute_conversation": "Activar los avisos de la conversación",
+  "status.unpin": "Lliberar del perfil",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "Quiciabes t'interese…",
   "tabs_bar.federated_timeline": "Fediversu",
   "tabs_bar.home": "Aniciu",
   "tabs_bar.local_timeline": "Llocal",
   "tabs_bar.notifications": "Avisos",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {Queda # día} other {Queden # díes}}",
-  "time_remaining.hours": "{number, plural, one {# hora restante} other {# hores restantes}}",
-  "time_remaining.minutes": "{number, plural, one {# minutu restante} other {# minutos restantes}}",
+  "time_remaining.hours": "{number, plural, one {Queda # hora} other {Queden # hores}}",
+  "time_remaining.minutes": "{number, plural, one {Queda # minutu} other {Queden # minutos}}",
   "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# segundu restante} other {# segundos restantes}}",
+  "time_remaining.seconds": "{number, plural, one {Queda # segundu} other {Queden # segundos}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.followers": "Siguidores",
   "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "El borrador va perdese si coles de Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Arrastra y suelta pa xubir",
+  "timeline_hint.resources.statuses": "Artículos antiguos",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "En tendencia",
+  "ui.beforeunload": "El borrador piérdese si coles de Mastodon.",
+  "units.short.billion": "{count} MM",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} mil",
+  "upload_area.title": "Drag & drop to upload",
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "La xuba de ficheros nun ta permitida con encuestes.",
-  "upload_form.audio_description": "Descripción pa persones con perda auditiva",
-  "upload_form.description": "Descripción pa discapacitaos visuales",
+  "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
+  "upload_form.audio_description": "Describe for people who are hard of hearing",
+  "upload_form.description": "Describe for people who are blind or have low vision",
+  "upload_form.description_missing": "Nun s'amestó la descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Desaniciar",
-  "upload_form.video_description": "Descripción pa persones con perda auditiva o discapacidá visual",
+  "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Choose image",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Deteutar el testu de la semeya",
+  "upload_modal.detect_text": "Detectar el testu de la semeya",
   "upload_modal.edit_media": "Edición",
-  "upload_modal.hint": "Calca o arrastra'l círculu de la previsualización pa escoyer el puntu d'enfoque que va amosase siempres en toles miniatures.",
+  "upload_modal.hint": "Calca o arrastra'l círculu de la previsualización pa escoyer el puntu d'enfoque que siempres va tar a la vista en toles miniatures.",
   "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Previsualización ({ratio})",
+  "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Xubiendo…",
+  "upload_progress.processing": "Procesando…",
   "video.close": "Zarrar el videu",
   "video.download": "Download file",
-  "video.exit_fullscreen": "Colar de la pantalla completa",
+  "video.exit_fullscreen": "Exit full screen",
   "video.expand": "Espander el videu",
   "video.fullscreen": "Pantalla completa",
   "video.hide": "Anubrir el videu",
-  "video.mute": "Silenciar el soníu",
+  "video.mute": "Desactivar el soníu",
   "video.pause": "Posar",
   "video.play": "Reproducir",
-  "video.unmute": "Unmute sound"
+  "video.unmute": "Activar el soníu"
 }
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
new file mode 100644
index 000000000..9ef66ec72
--- /dev/null
+++ b/app/javascript/mastodon/locales/be.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Мадэраваныя серверы",
+  "about.contact": "Кантакт:",
+  "about.disclaimer": "Mastodon - свабоднае праграмнае забеспячэнне, з адкрытым зыходным кодам, і гандлёвай маркай Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Прычына недаступная",
+  "about.domain_blocks.preamble": "Mastodon звычайна дазваляе вам бачыць змесціва і камунікаваць з карыстальнікамі з іншых сервераў федэсвету. Гэта выключэнні, якія былі зробленыя на гэтым канкрэтным серверы.",
+  "about.domain_blocks.silenced.explanation": "Вы не будзеце бачыць профілі і змесціва гэтага серверу, калі не шукаеце іх мэтанакіравана ці не падпісаны на карыстальнікаў адтуль.",
+  "about.domain_blocks.silenced.title": "Абмежаваны",
+  "about.domain_blocks.suspended.explanation": "Ніякая інфармацыя з гэтага сервера не будзе апрацавана, захавана або абменена, узаемадзеянне або камунікацыя з карыстальнікамі гэтага сервера немагчымы.",
+  "about.domain_blocks.suspended.title": "Прыпынены",
+  "about.not_available": "Дадзеная інфармацыя не дасяжная на гэтым серверы.",
+  "about.powered_by": "Дэцэнтралізаваная сацыяльная сетка, створаная {mastodon}",
+  "about.rules": "Правілы сервера",
+  "account.account_note_header": "Нататка",
+  "account.add_or_remove_from_list": "Дадаць або выдаліць са спісаў",
+  "account.badges.bot": "Бот",
+  "account.badges.group": "Група",
+  "account.block": "Заблакіраваць @{name}",
+  "account.block_domain": "Заблакіраваць дамен {domain}",
+  "account.blocked": "Заблакіраваны",
+  "account.browse_more_on_origin_server": "Глядзіце больш у арыгінальным профілі",
+  "account.cancel_follow_request": "Скасаваць запыт на падпіску",
+  "account.direct": "Асабістае паведамленне @{name}",
+  "account.disable_notifications": "Не апавяшчаць мяне пра допісы @{name}",
+  "account.domain_blocked": "Дамен заблакаваны",
+  "account.edit_profile": "Рэдагаваць профіль",
+  "account.enable_notifications": "Апавяшчаць мяне пра допісы @{name}",
+  "account.endorse": "Паказваць у профілі",
+  "account.featured_tags.last_status_at": "Апошні допіс ад {date}",
+  "account.featured_tags.last_status_never": "Няма допісаў",
+  "account.featured_tags.title": "Тэгі, выбраныя {name}",
+  "account.follow": "Падпісацца",
+  "account.followers": "Падпісчыкі",
+  "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
+  "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
+  "account.following": "Падпіскі",
+  "account.following_counter": "{count, plural, one {{counter} падпіска} few {{counter} падпіскі} many {{counter} падпісак} other {{counter} падпіскі}}",
+  "account.follows.empty": "Карыстальнік ні на каго не падпісаны.",
+  "account.follows_you": "Падпісаны на вас",
+  "account.go_to_profile": "Перайсці да профілю",
+  "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
+  "account.joined_short": "Далучыўся",
+  "account.languages": "Змяніць выбраныя мовы",
+  "account.link_verified_on": "Права ўласнасці на гэтую спасылку праверана {date}",
+  "account.locked_info": "Гэты ўліковы запіс пазначаны як схаваны. Уладальнік сам вырашае, хто можа падпісвацца на яго.",
+  "account.media": "Медыя",
+  "account.mention": "Згадаць @{name}",
+  "account.moved_to": "{name} указаў, што яго/яе новы ўліковы запіс цяпер:",
+  "account.mute": "Ігнараваць @{name}",
+  "account.mute_notifications": "Ігнараваць апавяшчэнні ад @{name}",
+  "account.muted": "Ігнаруецца",
+  "account.open_original_page": "Адкрыць арыгінальную старонку",
+  "account.posts": "Допісы",
+  "account.posts_with_replies": "Допісы і адказы",
+  "account.report": "Паскардзіцца на @{name}",
+  "account.requested": "Чакаецца ўхваленне. Націсніце, каб скасаваць запыт на падпіску",
+  "account.requested_follow": "{name} адправіў запыт на падпіску",
+  "account.share": "Абагуліць профіль @{name}",
+  "account.show_reblogs": "Паказаць падштурхоўванні ад @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
+  "account.unblock": "Разблакіраваць @{name}",
+  "account.unblock_domain": "Разблакіраваць дамен {domain}",
+  "account.unblock_short": "Разблакіраваць",
+  "account.unendorse": "Не паказваць у профілі",
+  "account.unfollow": "Адпісацца",
+  "account.unmute": "Не ігнараваць @{name}",
+  "account.unmute_notifications": "Не ігнараваць апавяшчэнні ад @{name}",
+  "account.unmute_short": "Не ігнараваць",
+  "account_note.placeholder": "Націсніце, каб дадаць нататку",
+  "admin.dashboard.daily_retention": "Штодзённы паказчык утрымання карыстальнікаў пасля рэгістрацыі",
+  "admin.dashboard.monthly_retention": "Штомесячны паказчык утрымання карыстальнікаў пасля рэгістрацыі",
+  "admin.dashboard.retention.average": "Сярэдняе",
+  "admin.dashboard.retention.cohort": "Месяц рэгістрацыі",
+  "admin.dashboard.retention.cohort_size": "Новыя карыстальнікі",
+  "alert.rate_limited.message": "Калі ласка, паспрабуйце праз {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ліміт перавышаны",
+  "alert.unexpected.message": "Узнікла нечаканая памылка.",
+  "alert.unexpected.title": "Вой!",
+  "announcement.announcement": "Аб'ява",
+  "attachments_list.unprocessed": "(неапрацаваны)",
+  "audio.hide": "Схаваць аўдыя",
+  "autosuggest_hashtag.per_week": "{count} за тыдзень",
+  "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
+  "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
+  "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
+  "bundle_column_error.error.title": "Халера!",
+  "bundle_column_error.network.body": "Падчас загрузкі старонкі адбылася памылка. Гэта магло адбыцца праз часовую праблему з вашым інтэрнэтам, або з серверам.",
+  "bundle_column_error.network.title": "Памылка сеткі",
+  "bundle_column_error.retry": "Паспрабуйце зноў",
+  "bundle_column_error.return": "Да стужкі",
+  "bundle_column_error.routing.body": "Запытаная старонка не знойдзена. Вы ўпэўнены, што URL у адрасным радку правільны?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Закрыць",
+  "bundle_modal_error.message": "Нешта пайшло не так падчас загрузкі гэтага кампанента.",
+  "bundle_modal_error.retry": "Паспрабуйце зноў",
+  "closed_registrations.other_server_instructions": "Паколькі Mastodon дэцэнтралізаваны, вы можаце стварыць уліковы запіс на іншым серверы і працягваць узаемадзейнічаць з ім.",
+  "closed_registrations_modal.description": "Стварэнне ўліковага запісу на {domain} цяпер немагчыма. Заўважце, што няма неабходнасці мець уліковы запіс менавіта на {domain}, каб выкарыстоўваць Mastodon.",
+  "closed_registrations_modal.find_another_server": "Знайсці іншы сервер",
+  "closed_registrations_modal.preamble": "Mastodon дэцэнтралізаваны, так што дзе б вы ні стварылі ўліковы запіс, вы зможаце падпісвацца і камунікаваць з кім хочаце на гэтым серверы. Вы нават можаце стварыць свой!",
+  "closed_registrations_modal.title": "Рэгістрацыя ў Mastodon",
+  "column.about": "Пра нас",
+  "column.blocks": "Заблакіраваныя карыстальнікі",
+  "column.bookmarks": "Закладкі",
+  "column.community": "Лакальная стужка",
+  "column.direct": "Асабістыя паведамленні",
+  "column.directory": "Праглядзець профілі",
+  "column.domain_blocks": "Заблакіраваныя дамены",
+  "column.favourites": "Упадабаныя",
+  "column.follow_requests": "Запыты на падпіску",
+  "column.home": "Галоўная",
+  "column.lists": "Спісы",
+  "column.mutes": "Ігнараваныя карыстальнікі",
+  "column.notifications": "Апавяшчэнні",
+  "column.pins": "Замацаваныя допісы",
+  "column.public": "Інтэграваная стужка",
+  "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Схаваць налады",
+  "column_header.moveLeft_settings": "Пасунуць слупок улева",
+  "column_header.moveRight_settings": "Пасунуць слупок управа",
+  "column_header.pin": "Замацаваць",
+  "column_header.show_settings": "Паказаць налады",
+  "column_header.unpin": "Адмацаваць",
+  "column_subheading.settings": "Налады",
+  "community.column_settings.local_only": "Толькі лакальныя",
+  "community.column_settings.media_only": "Толькі медыя",
+  "community.column_settings.remote_only": "Толькі дыстанцыйна",
+  "compose.language.change": "Змяніць мову",
+  "compose.language.search": "Шукаць мовы...",
+  "compose_form.direct_message_warning_learn_more": "Даведацца больш",
+  "compose_form.encryption_warning": "Допісы ў Mastodon не абаронены скразным шыфраваннем. Не дзяліцеся ніякай канфідэнцыяльнай інфармацыяй в Mastodon.",
+  "compose_form.hashtag_warning": "Гэты допіс не будзе паказаны пад аніякім хэштэгам, так як ён мае тып \"Не паказваць у стужках\". Толькі публічныя допісы могуць быць знойдзены па хэштэгу.",
+  "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
+  "compose_form.lock_disclaimer.lock": "закрыты",
+  "compose_form.placeholder": "Што здарылася?",
+  "compose_form.poll.add_option": "Дадаць варыянт",
+  "compose_form.poll.duration": "Працягласць апытання",
+  "compose_form.poll.option_placeholder": "Варыянт {number}",
+  "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
+  "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
+  "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
+  "compose_form.publish": "Апублікаваць",
+  "compose_form.publish_form": "Апублікаваць",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Захаваць змены",
+  "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
+  "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
+  "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
+  "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
+  "confirmation_modal.cancel": "Скасаваць",
+  "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
+  "confirmations.block.confirm": "Заблакіраваць",
+  "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
+  "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
+  "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
+  "confirmations.delete.confirm": "Выдаліць",
+  "confirmations.delete.message": "Вы ўпэўненыя, што хочаце выдаліць гэты допіс?",
+  "confirmations.delete_list.confirm": "Выдаліць",
+  "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
+  "confirmations.discard_edit_media.confirm": "Адмяніць",
+  "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
+  "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+  "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
+  "confirmations.logout.confirm": "Выйсці",
+  "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
+  "confirmations.mute.confirm": "Ігнараваць",
+  "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
+  "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
+  "confirmations.redraft.confirm": "Выдаліць і перапісаць",
+  "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
+  "confirmations.reply.confirm": "Адказаць",
+  "confirmations.reply.message": "Калі вы адкажаце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
+  "confirmations.unfollow.confirm": "Адпісацца",
+  "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
+  "conversation.delete": "Выдаліць размову",
+  "conversation.mark_as_read": "Адзначыць прачытаным",
+  "conversation.open": "Прагледзець размову",
+  "conversation.with": "З {names}",
+  "copypaste.copied": "Скапіравана",
+  "copypaste.copy": "Скапіраваць",
+  "directory.federated": "З вядомага федэсвету",
+  "directory.local": "Толькі з {domain}",
+  "directory.new_arrivals": "Новыя карыстальнікі",
+  "directory.recently_active": "Нядаўна актыўныя",
+  "disabled_account_banner.account_settings": "Налады ўліковага запісу",
+  "disabled_account_banner.text": "Ваш уліковы запіс {disabledAccount} часова адключаны.",
+  "dismissable_banner.community_timeline": "Гэта самыя апошнія допісы ад людзей, уліковыя запісы якіх размяшчаюцца на {domain}.",
+  "dismissable_banner.dismiss": "Адхіліць",
+  "dismissable_banner.explore_links": "Гэтыя навіны абмяркоўваюцца прама зараз на гэтым і іншых серверах дэцэнтралізаванай сеткі.",
+  "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
+  "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
+  "dismissable_banner.public_timeline": "Гэта самыя апошнія публічныя паведамленні ад людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі, якія вядомыя гэтаму серверу",
+  "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
+  "embed.preview": "Вось як гэта будзе выглядаць:",
+  "emoji_button.activity": "Актыўнасць",
+  "emoji_button.clear": "Ачысціць",
+  "emoji_button.custom": "Адвольныя",
+  "emoji_button.flags": "Сцягі",
+  "emoji_button.food": "Ежа і напоі",
+  "emoji_button.label": "Уставіць эмодзі",
+  "emoji_button.nature": "Прырода",
+  "emoji_button.not_found": "Адпаведныя эмодзі не знойдзены",
+  "emoji_button.objects": "Прадметы",
+  "emoji_button.people": "Людзі",
+  "emoji_button.recent": "Карыстаныя найчасцей",
+  "emoji_button.search": "Пошук...",
+  "emoji_button.search_results": "Вынікі пошуку",
+  "emoji_button.symbols": "Сімвалы",
+  "emoji_button.travel": "Падарожжы і месцы",
+  "empty_column.account_suspended": "Уліковы запіс прыпынены",
+  "empty_column.account_timeline": "Тут няма допісаў!",
+  "empty_column.account_unavailable": "Профіль недаступны",
+  "empty_column.blocks": "Вы яшчэ нікога не заблакіравалі.",
+  "empty_column.bookmarked_statuses": "У вас яшчэ няма паведамленняў з закладкамі. Калі вы дадасце закладку, яна з'явіцца тут.",
+  "empty_column.community": "Мясцовая шкала часу пустая. Напішыце што-небудзь публічна, каб зрушыць з месца",
+  "empty_column.direct": "Пакуль у вас няма асабістых паведамленняў. Калі вы дашляце або атрымаеце штось, яно з'явіцца тут.",
+  "empty_column.domain_blocks": "Заблакіраваных даменаў пакуль няма.",
+  "empty_column.explore_statuses": "Зараз не ў трэндзе. Праверце пазней",
+  "empty_column.favourited_statuses": "Вы яшчэ не ўпадабалі ніводны допіс. Калі гэта адбудзецца, вы ўбачыце яго тут.",
+  "empty_column.favourites": "Ніхто яшчэ не ўпадабаў гэты допіс. Калі гэта адбудзецца, вы ўбачыце гэтых людзей тут.",
+  "empty_column.follow_recommendations": "Здаецца, прапаноў для вас няма. Вы можаце паспрабаваць выкарыстаць пошук, каб знайсці людзей, якіх вы можаце ведаць, ці даследаваць папулярныя хэштэгі.",
+  "empty_column.follow_requests": "У вас яшчэ няма запытаў на падпіскуі. Калі вы атрымаеце запыт, ён з'явяцца тут.",
+  "empty_column.hashtag": "Па гэтаму хэштэгу пакуль што нічога няма.",
+  "empty_column.home": "Галоўная стужка пустая! Падпішыцеся на іншых людзей, каб запоўніць яе. {suggestions}",
+  "empty_column.home.suggestions": "Глядзіце прапановы",
+  "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
+  "empty_column.lists": "Як толькі вы створыце новы спіс ён будзе захоўвацца тут, але пакуль што тут пуста.",
+  "empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
+  "empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
+  "empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
+  "error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
+  "error.unexpected_crash.explanation_addons": "Гэтая старонка не можа быць адлюстравана карэктна. Верагодна, гэтая памылка выклікана дадатковым кампанентам браўзера або інструментамі аўтаматычнага перакладу",
+  "error.unexpected_crash.next_steps": "Паспрабуйце абнавіць старонку. Калі гэта не дапаможа, вы можаце паспрабаваць іншы браўзер, альбо выкарыстаць усталяваную праграму.",
+  "error.unexpected_crash.next_steps_addons": "Паспрабуйце выключыць іх і аднавіць старонку. Калі гэта не дапаможа, вы можаце карыстацца Мастадонт праз другі браўзер ці аплікацыю.",
+  "errors.unexpected_crash.copy_stacktrace": "Дадаць дыягнастычны стэк у буфер абмену",
+  "errors.unexpected_crash.report_issue": "Паведаміць аб праблеме",
+  "explore.search_results": "Вынікі пошуку",
+  "explore.suggested_follows": "Для вас",
+  "explore.title": "Агляд",
+  "explore.trending_links": "Навіны",
+  "explore.trending_statuses": "Допісы",
+  "explore.trending_tags": "Хэштэгі",
+  "filter_modal.added.context_mismatch_explanation": "Гэтая катэгорыя фільтра не прымяняецца да кантэксту, у якім вы адкрылі гэты пост. Калі вы хочаце, каб паведамленне таксама было адфільтравана ў гэтым кантэксце, вам трэба будзе адрэдагаваць фільтр",
+  "filter_modal.added.context_mismatch_title": "Неадпаведны кантэкст!",
+  "filter_modal.added.expired_explanation": "Тэрмін дзеяння гэтай катэгорыі фільтраў скончыўся, вам трэба будзе змяніць дату заканчэння тэрміну дзеяння, каб яна прымянялася",
+  "filter_modal.added.expired_title": "Пратэрмінаваны фільтр!",
+  "filter_modal.added.review_and_configure": "Для прагляду і наступнай канфігурацыі фільтра катэгорый, перайдзіце на {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Налады фільтра",
+  "filter_modal.added.settings_link": "старонка наладаў",
+  "filter_modal.added.short_explanation": "Гэты пост быў дабаўлены ў катэгорыю з наступным фільтрам: {title}.",
+  "filter_modal.added.title": "Фільтр дабаўлены!",
+  "filter_modal.select_filter.context_mismatch": "Не мае дачынення да кантэксту ",
+  "filter_modal.select_filter.expired": "пратэрмінавана",
+  "filter_modal.select_filter.prompt_new": "Новая катэгорыя: {name}",
+  "filter_modal.select_filter.search": "Шукаць альбо стварыць",
+  "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
+  "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
+  "filter_modal.title.status": "Фільтраваць допіс",
+  "follow_recommendations.done": "Гатова",
+  "follow_recommendations.heading": "Падпісвайцеся на людзей, допісы якіх вам будуць цікавы! Вось некаторыя рэкамендацыі.",
+  "follow_recommendations.lead": "Допісы людзей, на якіх вы падпісаны, будуць паказаны ў храналагічным парадку на вашай хатняй старонцы. Не бойцеся памыляцца, вы лёгка зможаце адпісацца ў любы момант!",
+  "follow_request.authorize": "Аўтарызацыя",
+  "follow_request.reject": "Адхіліць",
+  "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
+  "footer.about": "Пра нас",
+  "footer.directory": "Дырэкторыя профіляў",
+  "footer.get_app": "Спампаваць праграму",
+  "footer.invite": "Запрасіць людзей",
+  "footer.keyboard_shortcuts": "Спалучэнні клавіш",
+  "footer.privacy_policy": "Палітыка прыватнасці",
+  "footer.source_code": "Прагледзець зыходны код",
+  "generic.saved": "Захавана",
+  "getting_started.heading": "Пачатак працы",
+  "hashtag.column_header.tag_mode.all": "і {additional}",
+  "hashtag.column_header.tag_mode.any": "або {additional}",
+  "hashtag.column_header.tag_mode.none": "без {additional}",
+  "hashtag.column_settings.select.no_options_message": "Няма рэкамендацый",
+  "hashtag.column_settings.select.placeholder": "Увядзіце хэштэгі…",
+  "hashtag.column_settings.tag_mode.all": "Усе",
+  "hashtag.column_settings.tag_mode.any": "Любы",
+  "hashtag.column_settings.tag_mode.none": "Нічога з пералічанага",
+  "hashtag.column_settings.tag_toggle": "Уключыць дадатковыя тэгі для гэтай калонкі",
+  "hashtag.follow": "Падпісацца на хэштэг",
+  "hashtag.unfollow": "Адпісацца ад хэштэга",
+  "home.column_settings.basic": "Асноўныя",
+  "home.column_settings.show_reblogs": "Паказаць пашырэнні",
+  "home.column_settings.show_replies": "Паказваць адказы",
+  "home.hide_announcements": "Схаваць аб'явы",
+  "home.show_announcements": "Паказаць аб'явы",
+  "interaction_modal.description.favourite": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.",
+  "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.",
+  "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.",
+  "interaction_modal.description.reply": "Маючы акаўнт у Mastodon, вы можаце адказаць на гэты пост.",
+  "interaction_modal.on_another_server": "На іншым серверы",
+  "interaction_modal.on_this_server": "На гэтым серверы",
+  "interaction_modal.other_server_instructions": "Скапіюйце і ўстаўце гэты URL у поле пошуку вашай любімай праграмы для Mastodon ці інтэрфейса вашага Mastodon сервера.",
+  "interaction_modal.preamble": "Паколькі Mastodon дэцэнтралізаваны, вы можаце выкарыстоўваць існуючы акаўнт, які быў створаны на іншым серверы Mastodon або на сумяшчальнай платформе, калі ў вас пакуль няма акаўнта тут.",
+  "interaction_modal.title.favourite": "Упадабаць допіс {name}",
+  "interaction_modal.title.follow": "Падпісацца на {name}",
+  "interaction_modal.title.reblog": "Пашырыць допіс ад {name}",
+  "interaction_modal.title.reply": "Адказаць на допіс {name}",
+  "intervals.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
+  "intervals.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}}",
+  "intervals.full.minutes": "{number, plural, one {# хвіліна} few {# хвіліны} many {# хвілін} other {# хвіліны}}",
+  "keyboard_shortcuts.back": "Вярнуцца назад",
+  "keyboard_shortcuts.blocked": "Адкрыць спіс заблакаваных карыстальнікаў",
+  "keyboard_shortcuts.boost": "Пашырыць допіс",
+  "keyboard_shortcuts.column": "Сфакусіравацца на калонцы",
+  "keyboard_shortcuts.compose": "Сфакусіравацца на тэкставай вобласці",
+  "keyboard_shortcuts.description": "Апісанне",
+  "keyboard_shortcuts.direct": "для адкрыцця калонкі прыватных паведамленняў",
+  "keyboard_shortcuts.down": "Перамясціцца ўніз па спісе",
+  "keyboard_shortcuts.enter": "Адкрыць допіс",
+  "keyboard_shortcuts.favourite": "Упадабаць допіс",
+  "keyboard_shortcuts.favourites": "Адкрыць спіс упадабаных",
+  "keyboard_shortcuts.federated": "Адкрыць інтэграваную стужку",
+  "keyboard_shortcuts.heading": "Спалучэнні клавіш",
+  "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку",
+  "keyboard_shortcuts.hotkey": "Спалучэнне клавіш",
+  "keyboard_shortcuts.legend": "Паказаць легенду",
+  "keyboard_shortcuts.local": "Адкрыць хатнюю храналагічную стужку",
+  "keyboard_shortcuts.mention": "Згадаць аўтара",
+  "keyboard_shortcuts.muted": "Адкрыць спіс ігнараваных карыстальнікаў",
+  "keyboard_shortcuts.my_profile": "Адкрыць ваш профіль",
+  "keyboard_shortcuts.notifications": "Адкрыць слупок апавяшчэнняў",
+  "keyboard_shortcuts.open_media": "Адкрыць медыя",
+  "keyboard_shortcuts.pinned": "Адкрыць спіс замацаваных допісаў",
+  "keyboard_shortcuts.profile": "Адкрыць профіль аўтара",
+  "keyboard_shortcuts.reply": "Адказаць на допіс",
+  "keyboard_shortcuts.requests": "Адкрыць спіс запытаў на падпіску",
+  "keyboard_shortcuts.search": "Сфакусіраваць пошукавы радок",
+  "keyboard_shortcuts.spoilers": "Паказаць/схаваць поле \"папярэджанне пра змест\"",
+  "keyboard_shortcuts.start": "Адкрыць стартавую калонку",
+  "keyboard_shortcuts.toggle_hidden": "Паказаць/схаваць тэкст за папярэджаннем пра кантэнт",
+  "keyboard_shortcuts.toggle_sensitivity": "Паказаць/схаваць медыя",
+  "keyboard_shortcuts.toot": "Стварыць новы допіс",
+  "keyboard_shortcuts.unfocus": "Расфакусаваць тэкставую вобласць/пошукавы радок",
+  "keyboard_shortcuts.up": "Перамясціцца ўверх па спісе",
+  "lightbox.close": "Закрыць",
+  "lightbox.compress": "Сціснуць бачную вобласць выявы",
+  "lightbox.expand": "Павялічыць бачную вобласць выявы",
+  "lightbox.next": "Далей",
+  "lightbox.previous": "Назад",
+  "limited_account_hint.action": "Усе роўна паказваць профіль",
+  "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі",
+  "lists.account.add": "Дадаць да спісу",
+  "lists.account.remove": "Выдаліць са спісу",
+  "lists.delete": "Выдаліць спіс",
+  "lists.edit": "Рэдагаваць спіс",
+  "lists.edit.submit": "Змяніць назву",
+  "lists.new.create": "Дадаць спіс",
+  "lists.new.title_placeholder": "Назва новага спіса",
+  "lists.replies_policy.followed": "Любы карыстальнік, за якім вы падпісаліся",
+  "lists.replies_policy.list": "Удзельнікі гэтага спісу",
+  "lists.replies_policy.none": "Нікога",
+  "lists.replies_policy.title": "Паказаць адказы да:",
+  "lists.search": "Шукайце сярод людзей, на якіх Вы падпісаны",
+  "lists.subheading": "Вашыя спісы",
+  "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
+  "loading_indicator.label": "Загрузка...",
+  "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
+  "missing_indicator.label": "Не знойдзена",
+  "missing_indicator.sublabel": "Гэты рэсурс не магчыма знайсці",
+  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
+  "mute_modal.duration": "Працягласць",
+  "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
+  "mute_modal.indefinite": "Бестэрмінова",
+  "navigation_bar.about": "Пра нас",
+  "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
+  "navigation_bar.bookmarks": "Закладкі",
+  "navigation_bar.community_timeline": "Лакальная стужка",
+  "navigation_bar.compose": "Стварыць новы допіс",
+  "navigation_bar.direct": "Асабістыя паведамленні",
+  "navigation_bar.discover": "Даведайцесь",
+  "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
+  "navigation_bar.edit_profile": "Рэдагаваць профіль",
+  "navigation_bar.explore": "Агляд",
+  "navigation_bar.favourites": "Упадабаныя",
+  "navigation_bar.filters": "Ігнараваныя словы",
+  "navigation_bar.follow_requests": "Запыты на падпіску",
+  "navigation_bar.follows_and_followers": "Падпіскі і падпісчыкі",
+  "navigation_bar.lists": "Спісы",
+  "navigation_bar.logout": "Выйсці",
+  "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
+  "navigation_bar.personal": "Асабістае",
+  "navigation_bar.pins": "Замацаваныя допісы",
+  "navigation_bar.preferences": "Параметры",
+  "navigation_bar.public_timeline": "Глабальная стужка",
+  "navigation_bar.search": "Пошук",
+  "navigation_bar.security": "Бяспека",
+  "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
+  "notification.admin.report": "{name} паскардзіўся на {target}",
+  "notification.admin.sign_up": "{name} зарэгістраваўся",
+  "notification.favourite": "Ваш допіс упадабаны {name}",
+  "notification.follow": "{name} падпісаўся на вас",
+  "notification.follow_request": "{name} адправіў запыт на падпіску",
+  "notification.mention": "{name} згадаў вас",
+  "notification.own_poll": "Ваша апытанне скончылася",
+  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
+  "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.status": "Новы допіс ад {name}",
+  "notification.update": "Допіс {name} адрэдагаваны",
+  "notifications.clear": "Ачысціць апавяшчэнні",
+  "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
+  "notifications.column_settings.admin.report": "Новыя скаргі:",
+  "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
+  "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
+  "notifications.column_settings.favourite": "Упадабаныя:",
+  "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
+  "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
+  "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
+  "notifications.column_settings.follow": "Новыя падпісчыкі:",
+  "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
+  "notifications.column_settings.mention": "Згадванні:",
+  "notifications.column_settings.poll": "Вынікі апытання:",
+  "notifications.column_settings.push": "Push-апавяшчэнні",
+  "notifications.column_settings.reblog": "Пашырэнні:",
+  "notifications.column_settings.show": "Паказваць у слупку",
+  "notifications.column_settings.sound": "Прайграваць гук",
+  "notifications.column_settings.status": "Новыя допісы:",
+  "notifications.column_settings.unread_notifications.category": "Непрачытаныя апавяшчэнні",
+  "notifications.column_settings.unread_notifications.highlight": "Вылучыць непрачытаныя апавяшчэнні",
+  "notifications.column_settings.update": "Праўкі:",
+  "notifications.filter.all": "Усе",
+  "notifications.filter.boosts": "Пашырэнні",
+  "notifications.filter.favourites": "Упадабаныя",
+  "notifications.filter.follows": "Падпісаны на",
+  "notifications.filter.mentions": "Згадванні",
+  "notifications.filter.polls": "Вынікі апытання",
+  "notifications.filter.statuses": "Навіны ад людзей, на якіх вы падпісаны",
+  "notifications.grant_permission": "Дазволіць.",
+  "notifications.group": "{count} Апавяшчэнняў",
+  "notifications.mark_as_read": "Пазначыць усе апавяшчэнні як прачытаныя",
+  "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
+  "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
+  "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+  "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
+  "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
+  "notifications_permission_banner.title": "Не прапусціце нічога",
+  "picture_in_picture.restore": "Вярніце назад",
+  "poll.closed": "Закрыта",
+  "poll.refresh": "Абнавіць",
+  "poll.total_people": "{count, plural, one {# чалавек} few {# чалавекі} many {# чалавек} other {# чалавека}}",
+  "poll.total_votes": "{count, plural, one {# голас} few {# галасы} many {# галасоў} other {# голасу}}",
+  "poll.vote": "Прагаласаваць",
+  "poll.voted": "Вы прагаласавалі за гэты адказ",
+  "poll.votes": "{votes, plural, one {# голас} few {# галасы} many {# галасоў} other {# голасу}}",
+  "poll_button.add_poll": "Дадаць апытанне",
+  "poll_button.remove_poll": "Выдаліць апытанне",
+  "privacy.change": "Змяніць прыватнасць допісу",
+  "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
+  "privacy.direct.short": "Толькі згаданыя людзі",
+  "privacy.private.long": "Паказаць толькі падпісчыкам",
+  "privacy.private.short": "Толькі для падпісчыкаў",
+  "privacy.public.long": "Бачны для ўсіх",
+  "privacy.public.short": "Публічны",
+  "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
+  "privacy.unlisted.short": "Не ў стужках",
+  "privacy_policy.last_updated": "Адноўлена {date}",
+  "privacy_policy.title": "Палітыка канфідэнцыйнасці",
+  "refresh": "Абнавiць",
+  "regeneration_indicator.label": "Загрузка…",
+  "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!",
+  "relative_time.days": "{number} д",
+  "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму",
+  "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму",
+  "relative_time.full.just_now": "толькі што",
+  "relative_time.full.minutes": "{number, plural, one {# хвіліна} few {# хвіліны} many {# хвілін} other {# хвіліны}} таму",
+  "relative_time.full.seconds": "{number, plural, one {# секунда} few {# секунды} many {# секунд} other {# секунды}} таму",
+  "relative_time.hours": "{number} гадз",
+  "relative_time.just_now": "толькі што",
+  "relative_time.minutes": "{number} хв",
+  "relative_time.seconds": "{number} с",
+  "relative_time.today": "сёння",
+  "reply_indicator.cancel": "Скасаваць",
+  "report.block": "Заблакіраваць",
+  "report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за вамі і бачыць вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
+  "report.categories.other": "Іншае",
+  "report.categories.spam": "Спам",
+  "report.categories.violation": "Змест парушае адно ці некалькі правілаў сервера",
+  "report.category.subtitle": "Выберыце найлепшае падабенства",
+  "report.category.title": "Паведаміце нам, што адбываецца з гэтым {type}",
+  "report.category.title_account": "профіль",
+  "report.category.title_status": "допіс",
+  "report.close": "Гатова",
+  "report.comment.title": "Што-небудзь яшчэ, што нам неабходна ведаць?",
+  "report.forward": "Пераслаць на {target}",
+  "report.forward_hint": "Гэты ўліковы запіс з іншага сервера. Даслаць ананімную копію скаргі і туды?",
+  "report.mute": "Ігнараваць",
+  "report.mute_explanation": "Вы не будзеце бачыць допісы гэтага карыстальніка. Ён усё яшчэ зможа сачыць за вамі і бачыць вашы допісы, не ведаючы, што яго ігнаруюць.",
+  "report.next": "Далей",
+  "report.placeholder": "Дадатковы каментар",
+  "report.reasons.dislike": "Мне ён не падабаецца",
+  "report.reasons.dislike_description": "Гэта тое, што Вы не хочаце бачыць",
+  "report.reasons.other": "Гэта нешта іншае",
+  "report.reasons.other_description": "Гэта праблема не падпадае пад іншыя катэгорыі",
+  "report.reasons.spam": "Гэта спам",
+  "report.reasons.spam_description": "Шкодныя спасылкі, несапраўдныя ўзаемадзеянні, або адказы, што паўтараюцца",
+  "report.reasons.violation": "Гэта парушае правілы сервера",
+  "report.reasons.violation_description": "Вам вядома, што гэта парушае пэўныя правілы",
+  "report.rules.subtitle": "Абярыце ўсе варыянты, што падыходзяць",
+  "report.rules.title": "Якія правілы былі парушаны?",
+  "report.statuses.subtitle": "Абярыце ўсе пункты, што падыходзяць",
+  "report.statuses.title": "Ці ёсць допісы, каб падмацаваць гэтую скаргу?",
+  "report.submit": "Адправіць",
+  "report.target": "Скарга на {target}",
+  "report.thanks.take_action": "Вось вашыя варыянты кантролю над тым, што вы бачыце в Mastodon:",
+  "report.thanks.take_action_actionable": "Пакуль мы разглядаем яе, вы можаце распачаць дзеянні супраць @{name}:",
+  "report.thanks.title": "Ці хочаце вы бачыць гэта?",
+  "report.thanks.title_actionable": "Дзякуем за зварот, мы разбяромся з гэтым.",
+  "report.unfollow": "Адпісацца ад @{name}",
+  "report.unfollow_explanation": "Вы падпісаныя на гэты ўліковы запіс. Каб не бачыць допісы з яго ў вашай стужцы, адпішыцеся.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} допіс прымацаваны} few {{count} допісы прымацаваны} many {{count} допісаў прымацавана} other {{count} допісу прымацавана}}",
+  "report_notification.categories.other": "Іншае",
+  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.violation": "Парушэнне правілаў",
+  "report_notification.open": "Адкрыць скаргу",
+  "search.placeholder": "Пошук",
+  "search.search_or_paste": "Увядзіце спасылку або пошукавы запыт",
+  "search_popout.search_format": "Рэжым прасунутага пошуку",
+  "search_popout.tips.full_text": "Тэкставы пошук пакажа допісы, якія вы напісалі, упадабалі, пашырылі, альбо тыя, у якіх вас згадалі, а таксама адпаведныя імёны карыстальнікаў і тэгі.",
+  "search_popout.tips.hashtag": "хэштэг",
+  "search_popout.tips.status": "допіс",
+  "search_popout.tips.text": "Тэкставы пошук знаходзіць адпаведныя імёны карыстальнікаў, юзернеймы і хэштэгі",
+  "search_popout.tips.user": "карыстальнік",
+  "search_results.accounts": "Людзі",
+  "search_results.all": "Усё",
+  "search_results.hashtags": "Хэштэгі",
+  "search_results.nothing_found": "Па дадзенаму запыту нічога не знойдзена",
+  "search_results.statuses": "Допісы",
+  "search_results.statuses_fts_disabled": "Пошук публікацый па зместу не ўключаны на гэтым серверы Mastodon.",
+  "search_results.title": "Пошук {q}",
+  "search_results.total": "{count, number} {count, plural, one {вынік} few {вынікі} many {вынікаў} other {выніку}}",
+  "server_banner.about_active_users": "Людзі, якія карыстаюцца гэтым сервера на працягу апошніх 30 дзён (Штомесячна Актыўныя Карыстальнікі)",
+  "server_banner.active_users": "актыўныя карыстальнікі",
+  "server_banner.administered_by": "Адміністратар:",
+  "server_banner.introduction": "{domain} ёсць часткай дэцэнтралізаванай сацыяльнай сеткі ад {mastodon}.",
+  "server_banner.learn_more": "Даведацца больш",
+  "server_banner.server_stats": "Статыстыка сервера:",
+  "sign_in_banner.create_account": "Стварыць уліковы запіс",
+  "sign_in_banner.sign_in": "Увайсці",
+  "sign_in_banner.text": "Увайдзіце, каб падпісацца на людзей і тэгі, каб адказваць на допісы, дзяліцца імі і падабаць іх, альбо кантактаваць з вашага ўліковага запісу на іншым серверы.",
+  "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
+  "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі",
+  "status.block": "Заблакаваць @{name}",
+  "status.bookmark": "Дадаць закладку",
+  "status.cancel_reblog_private": "Прыбраць",
+  "status.cannot_reblog": "Гэты пост нельга пашырыць",
+  "status.copy": "Скапіраваць спасылку на допіс",
+  "status.delete": "Выдаліць",
+  "status.detailed_status": "Дэтальны агляд размовы",
+  "status.direct": "Асабістае паведамленне @{name}",
+  "status.edit": "Рэдагаваць",
+  "status.edited": "Адрэдагавана {date}",
+  "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
+  "status.embed": "Убудаваць",
+  "status.favourite": "Упадабаць",
+  "status.filter": "Фільтраваць гэты допіс",
+  "status.filtered": "Адфільтравана",
+  "status.hide": "Схаваць допіс",
+  "status.history.created": "Створана {name} {date}",
+  "status.history.edited": "Адрэдагавана {name} {date}",
+  "status.load_more": "Загрузіць яшчэ",
+  "status.media_hidden": "Медыя схавана",
+  "status.mention": "Згадаць @{name}",
+  "status.more": "Больш",
+  "status.mute": "Ігнараваць @{name}",
+  "status.mute_conversation": "Ігнараваць размову",
+  "status.open": "Разгарнуць гэты допіс",
+  "status.pin": "Замацаваць у профілі",
+  "status.pinned": "Замацаваны допіс",
+  "status.read_more": "Чытаць болей",
+  "status.reblog": "Пашырыць",
+  "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
+  "status.reblogged_by": "{name} пашырыў(-ла)",
+  "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
+  "status.redraft": "Выдаліць і паправіць",
+  "status.remove_bookmark": "Выдаліць закладку",
+  "status.replied_to": "Адказаў {name}",
+  "status.reply": "Адказаць",
+  "status.replyAll": "Адказаць у ланцугу",
+  "status.report": "Паскардзіцца на @{name}",
+  "status.sensitive_warning": "Уражвальны змест",
+  "status.share": "Абагуліць",
+  "status.show_filter_reason": "Усё адно паказаць",
+  "status.show_less": "Паказаць меньш",
+  "status.show_less_all": "Згарнуць усё",
+  "status.show_more": "Паказаць болей",
+  "status.show_more_all": "Разгарнуць усё",
+  "status.show_original": "Паказаць арыгінал",
+  "status.translate": "Перакласці",
+  "status.translated_from_with": "Перакладзена з {lang} з дапамогай {provider}",
+  "status.uncached_media_warning": "Недаступна",
+  "status.unmute_conversation": "Не ігнараваць размову",
+  "status.unpin": "Адмацаваць ад профілю",
+  "subscribed_languages.lead": "Толькі допісы ў абраных мовах будуць паказвацца ў вашых стужках пасля змены. Не абірайце нічога, каб бачыць допісы на ўсіх мовах.",
+  "subscribed_languages.save": "Захаваць змены",
+  "subscribed_languages.target": "Змяніць мовы падпіскі для {target}",
+  "suggestions.dismiss": "Адхіліць прапанову",
+  "suggestions.header": "Гэта можа Вас зацікавіць…",
+  "tabs_bar.federated_timeline": "Глабальнае",
+  "tabs_bar.home": "Галоўная",
+  "tabs_bar.local_timeline": "Мясцовае",
+  "tabs_bar.notifications": "Апавяшчэнні",
+  "time_remaining.days": "{number, plural, one {застаўся # дзень} few {засталося # дні} many {засталося # дзён} other {засталося # дня}}",
+  "time_remaining.hours": "{number, plural, one {засталася # гадзіна} few {засталося # гадзіны} many {засталося # гадзін} other {засталося # гадзіны}}",
+  "time_remaining.minutes": "{number, plural, one {засталася # хвіліна} few {засталося # хвіліны} many {засталося # хвілін} other {засталося # хвіліны}}",
+  "time_remaining.moments": "Засталося некалькі секунд",
+  "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
+  "timeline_hint.resources.followers": "Падпісчыкі",
+  "timeline_hint.resources.follows": "Падпісаны на",
+  "timeline_hint.resources.statuses": "Старэйшыя допісы",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
+  "trends.trending_now": "Актуальнае",
+  "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",
+  "units.short.billion": "{count} млрд.",
+  "units.short.million": "{count} міл.",
+  "units.short.thousand": "{count} тыс.",
+  "upload_area.title": "Перацягніце сюды для загрузкі",
+  "upload_button.label": "Дадаць выяву, відэа- ці аўдыяфайл",
+  "upload_error.limit": "Перавышана колькасць файлаў.",
+  "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
+  "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
+  "upload_form.description": "Апісаць для людзей са слабым зрокам",
+  "upload_form.description_missing": "Апісанне адсутнічае",
+  "upload_form.edit": "Рэдагаваць",
+  "upload_form.thumbnail": "Змяніць мініяцюру",
+  "upload_form.undo": "Выдаліць",
+  "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
+  "upload_modal.analyzing_picture": "Аналіз выявы…",
+  "upload_modal.apply": "Ужыць",
+  "upload_modal.applying": "Ужываецца…",
+  "upload_modal.choose_image": "Выбраць выяву",
+  "upload_modal.description_placeholder": "У рудога вераб’я ў сховішчы пад фатэлем ляжаць нейкія гаючыя зёлкі",
+  "upload_modal.detect_text": "Распазнаць тэкст з выявы",
+  "upload_modal.edit_media": "Рэдагаваць медыя",
+  "upload_modal.hint": "Націсніце ці перацягніце кружок на перадпрагляд каб выбраць фокусную кропку, што заўсёды будзе бачна на мініяцюрах.",
+  "upload_modal.preparing_ocr": "Падрыхтоўка OCR…",
+  "upload_modal.preview_label": "Перадпрагляд ({ratio})",
+  "upload_progress.label": "Запампоўванне...",
+  "upload_progress.processing": "Апрацоўка…",
+  "video.close": "Закрыць відэа",
+  "video.download": "Спампаваць файл",
+  "video.exit_fullscreen": "Выйсці з поўнаэкраннага рэжыму",
+  "video.expand": "Разгарнуць відэа",
+  "video.fullscreen": "Увесь экран",
+  "video.hide": "Схаваць відэа",
+  "video.mute": "Адключыць гук",
+  "video.pause": "Паўза",
+  "video.play": "Прайграць",
+  "video.unmute": "Уключыць гук"
+}
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 8e3848f54..da61d6200 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -1,149 +1,200 @@
 {
+  "about.blocks": "Модерирани сървъри",
+  "about.contact": "За контакти:",
+  "about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Няма налична причина",
+  "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивърс. Има изключения, направени конкретно за този сървър.",
+  "about.domain_blocks.silenced.explanation": "Обикновено няма да виждате профили и съдържание, освен ако изрично не го потърсите или се включете в него, следвайки го.",
+  "about.domain_blocks.silenced.title": "Ограничено",
+  "about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
+  "about.domain_blocks.suspended.title": "Спряно",
+  "about.not_available": "Тази информация не е била направена налична на този сървър.",
+  "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
+  "about.rules": "Правила на сървъра",
   "account.account_note_header": "Бележка",
-  "account.add_or_remove_from_list": "Добави или премахни от списъците",
+  "account.add_or_remove_from_list": "Добавяне или премахване от списъци",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
-  "account.block": "Блокирай",
-  "account.block_domain": "скрий всичко от (домейн)",
+  "account.block": "Блокиране на @{name}",
+  "account.block_domain": "Блокиране на домейн {domain}",
   "account.blocked": "Блокирани",
-  "account.browse_more_on_origin_server": "Разгледайте повече в оригиналния профил",
-  "account.cancel_follow_request": "Откажи искането за следване",
-  "account.direct": "Direct Message @{name}",
-  "account.disable_notifications": "Спрете да ме уведомявате, когато @{name} публикува",
-  "account.domain_blocked": "Скрит домейн",
-  "account.edit_profile": "Редактирай профила",
-  "account.enable_notifications": "Уведомявайте ме, когато @{name} публикува",
+  "account.browse_more_on_origin_server": "Разглеждане на още в първообразния профил",
+  "account.cancel_follow_request": "Оттегляне на заявката за последване",
+  "account.direct": "Директно съобщение до @{name}",
+  "account.disable_notifications": "Сприране на известия при публикуване от @{name}",
+  "account.domain_blocked": "Блокиран домейн",
+  "account.edit_profile": "Редактиране на профила",
+  "account.enable_notifications": "Известявайте ме при публикация от {name}",
   "account.endorse": "Характеристика на профила",
-  "account.follow": "Последвай",
+  "account.featured_tags.last_status_at": "Последна публикация на {date}",
+  "account.featured_tags.last_status_never": "Няма публикации",
+  "account.featured_tags.title": "Главни хаштагове на {name}",
+  "account.follow": "Последване",
   "account.followers": "Последователи",
-  "account.followers.empty": "Все още никой не следва този потребител.",
-  "account.followers_counter": "{count, plural, one {{counter} Последовател} other {{counter} Последователи}}",
-  "account.following_counter": "{count, plural, one {{counter} Последван} other {{counter} Последвани}}",
-  "account.follows.empty": "Този потребител все още не следва никого.",
-  "account.follows_you": "Твой последовател",
+  "account.followers.empty": "Още никой не следва потребителя.",
+  "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
+  "account.following": "Последвани",
+  "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
+  "account.follows.empty": "Потребителят още никого не следва.",
+  "account.follows_you": "Ваш последовател",
+  "account.go_to_profile": "Към профила",
   "account.hide_reblogs": "Скриване на споделяния от @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Последно активен/а",
+  "account.joined_short": "Дата на присъединяване",
+  "account.languages": "Смяна на езиците на абонамент",
   "account.link_verified_on": "Собствеността върху тази връзка е проверена на {date}",
-  "account.locked_info": "Този акаунт е поверително заключен. Собственикът преглежда ръчно кой може да го следва.",
+  "account.locked_info": "Състоянието за поверителността на акаунта е зададено заключено. Собственикът преглежда ръчно от кого може да се следва.",
   "account.media": "Мултимедия",
-  "account.mention": "Споменаване",
-  "account.moved_to": "{name} се премести в:",
+  "account.mention": "Споменаване на @{name}",
+  "account.moved_to": "Лицето {name} посочи, че новият му акаунт е вече:",
   "account.mute": "Заглушаване на @{name}",
   "account.mute_notifications": "Заглушаване на известия от @{name}",
   "account.muted": "Заглушено",
-  "account.never_active": "Никога",
+  "account.open_original_page": "Отваряне на оригиналната страница",
   "account.posts": "Публикации",
-  "account.posts_with_replies": "Toots with replies",
+  "account.posts_with_replies": "Публикации и отговори",
   "account.report": "Докладване на @{name}",
-  "account.requested": "В очакване на одобрение",
-  "account.share": "Споделяне на @{name} профила",
+  "account.requested": "Чака се одобрение. Щракнете за отмяна на заявката за последване",
+  "account.requested_follow": "{name} поиска да ви последва",
+  "account.share": "Споделяне на профила на @{name}",
   "account.show_reblogs": "Показване на споделяния от @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Публикация} other {{counter} Публикации}}",
-  "account.unblock": "Не блокирай",
-  "account.unblock_domain": "Unhide {domain}",
+  "account.statuses_counter": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
+  "account.unblock": "Отблокиране на @{name}",
+  "account.unblock_domain": "Отблокиране на домейн {domain}",
+  "account.unblock_short": "Отблокирване",
   "account.unendorse": "Не включвайте в профила",
-  "account.unfollow": "Не следвай",
-  "account.unmute": "Раззаглушаване на @{name}",
-  "account.unmute_notifications": "Раззаглушаване на известия от @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Моля, опитайте отново след {retry_time, time, medium}.",
+  "account.unfollow": "Без следване",
+  "account.unmute": "Без заглушаване на @{name}",
+  "account.unmute_notifications": "Без заглушаване на известия от @{name}",
+  "account.unmute_short": "Без заглушаване",
+  "account_note.placeholder": "Щракнете, за да добавите бележка",
+  "admin.dashboard.daily_retention": "Ниво на задържани на потребители след регистрация, в дни",
+  "admin.dashboard.monthly_retention": "Ниво на задържани на потребители след регистрация, в месеци",
+  "admin.dashboard.retention.average": "Средно",
+  "admin.dashboard.retention.cohort": "Регистрации за месец",
+  "admin.dashboard.retention.cohort_size": "Нови потребители",
+  "alert.rate_limited.message": "Опитайте пак след {retry_time, time, medium}.",
   "alert.rate_limited.title": "Скоростта е ограничена",
   "alert.unexpected.message": "Възникна неочаквана грешка.",
   "alert.unexpected.title": "Опаа!",
   "announcement.announcement": "Оповестяване",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(необработено)",
+  "audio.hide": "Скриване на звука",
   "autosuggest_hashtag.per_week": "{count} на седмица",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
-  "bundle_column_error.body": "Нещо се обърка при зареждането на този компонент.",
-  "bundle_column_error.retry": "Опитай отново",
-  "bundle_column_error.title": "Мрежова грешка",
+  "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
+  "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
+  "bundle_column_error.error.title": "О, не!",
+  "bundle_column_error.network.body": "Възникна грешка, опитвайки зареждане на страницата. Това може да е заради временен проблем с интернет връзката ви или този сървър.",
+  "bundle_column_error.network.title": "Мрежова грешка",
+  "bundle_column_error.retry": "Нов опит",
+  "bundle_column_error.return": "Обратно към началото",
+  "bundle_column_error.routing.body": "Заявената страница не може да се намери. Сигурни ли сте, че URL адресът в адресната лента е правилен?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Затваряне",
-  "bundle_modal_error.message": "Нещо се обърка при зареждането на този компонент.",
-  "bundle_modal_error.retry": "Опитайте отново",
+  "bundle_modal_error.message": "Нещо се обърка, зареждайки компонента.",
+  "bundle_modal_error.retry": "Нов опит",
+  "closed_registrations.other_server_instructions": "Поради това че Mastodon е децентрализиран, можеш да създадеш акаунт на друг сървър, от който можеш да комуникираш с този.",
+  "closed_registrations_modal.description": "Създаването на акаунт в {domain} сега не е възможно, но обърнете внимание, че нямате нужда от акаунт конкретно на {domain}, за да ползвате Mastodon.",
+  "closed_registrations_modal.find_another_server": "Намиране на друг сървър",
+  "closed_registrations_modal.preamble": "Mastodon е децентрализиран, така че няма значение къде създавате акаунта си, ще може да последвате и взаимодействате с всеки на този сървър. Може дори да стартирате свой собствен сървър!",
+  "closed_registrations_modal.title": "Регистриране в Mastodon",
+  "column.about": "Относно",
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
-  "column.community": "Локална емисия",
+  "column.community": "Локален инфопоток",
   "column.direct": "Директни съобщения",
-  "column.directory": "Преглед на профили",
-  "column.domain_blocks": "Hidden domains",
+  "column.directory": "Разглеждане на профили",
+  "column.domain_blocks": "Блокирани домейни",
   "column.favourites": "Любими",
   "column.follow_requests": "Заявки за последване",
   "column.home": "Начало",
   "column.lists": "Списъци",
   "column.mutes": "Заглушени потребители",
   "column.notifications": "Известия",
-  "column.pins": "Pinned toot",
-  "column.public": "Публичен канал",
+  "column.pins": "Закачени публикации",
+  "column.public": "Федериран инфопоток",
   "column_back_button.label": "Назад",
-  "column_header.hide_settings": "Скриване на настройки",
+  "column_header.hide_settings": "Скриване на настройките",
   "column_header.moveLeft_settings": "Преместване на колона вляво",
   "column_header.moveRight_settings": "Преместване на колона вдясно",
   "column_header.pin": "Закачане",
-  "column_header.show_settings": "Показване на настройки",
+  "column_header.show_settings": "Показване на настройките",
   "column_header.unpin": "Разкачане",
   "column_subheading.settings": "Настройки",
   "community.column_settings.local_only": "Само локално",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Само дистанционно",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "community.column_settings.media_only": "Само мултимедия",
+  "community.column_settings.remote_only": "Само отдалечено",
+  "compose.language.change": "Смяна на езика",
+  "compose.language.search": "Търсене на езици...",
   "compose_form.direct_message_warning_learn_more": "Още информация",
+  "compose_form.encryption_warning": "Публикациите в Mastodon не са криптирани от край до край. Не споделяйте никаква чувствителна информация там.",
   "compose_form.hashtag_warning": "Тази публикация няма да бъде изброена под нито един хаштаг, тъй като е скрита. Само публични публикации могат да се търсят по хаштаг.",
   "compose_form.lock_disclaimer": "Вашият акаунт не е {locked}. Всеки може да ви последва, за да прегледа вашите публикации само за последователи.",
   "compose_form.lock_disclaimer.lock": "заключено",
-  "compose_form.placeholder": "Какво си мислиш?",
+  "compose_form.placeholder": "Какво мислите?",
   "compose_form.poll.add_option": "Добавяне на избор",
-  "compose_form.poll.duration": "Продължителност на анкета",
+  "compose_form.poll.duration": "Времетраене на анкетата",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на този избор",
+  "compose_form.poll.remove_option": "Премахване на избора",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
-  "compose_form.publish": "Раздумай",
+  "compose_form.publish": "Публикуване",
+  "compose_form.publish_form": "Публикуване",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Запазване на промените",
   "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Мултимедията е маркирана като деликатна} other {Мултимедиите са маркирани като деликатни}}",
+  "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
-  "compose_form.spoiler.marked": "Текстът е скрит зад предупреждение",
-  "compose_form.spoiler.unmarked": "Текстът не е скрит",
-  "compose_form.spoiler_placeholder": "Content warning",
+  "compose_form.spoiler.marked": "Премахване на предупреждението за съдържание",
+  "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
+  "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
   "confirmation_modal.cancel": "Отказ",
   "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
-  "confirmations.block.message": "Сигурни ли сте, че искате да блокирате {name}?",
+  "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
+  "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
+  "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си да последвате {name}?",
   "confirmations.delete.confirm": "Изтриване",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "Наистина ли искате да изтриете публикацията?",
   "confirmations.delete_list.confirm": "Изтриване",
-  "confirmations.delete_list.message": "Сигурни ли сте, че искате да изтриете окончателно този списък?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
+  "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги този списък?",
+  "confirmations.discard_edit_media.confirm": "Отхвърляне",
+  "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
+  "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+  "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
   "confirmations.logout.confirm": "Излизане",
-  "confirmations.logout.message": "Сигурни ли сте, че искате да излезете?",
+  "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.mute.confirm": "Заглушаване",
-  "confirmations.mute.explanation": "Това ще скрие публикации от тях и публикации, които ги споменават, но все пак ще им позволи да виждат вашите публикации и да ви следват.",
-  "confirmations.mute.message": "Сигурни ли сте, че искате да заглушите {name}?",
+  "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
+  "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
   "confirmations.reply.confirm": "Отговор",
   "confirmations.reply.message": "Отговарянето сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
-  "confirmations.unfollow.confirm": "Отследване",
-  "confirmations.unfollow.message": "Сигурни ли сте, че искате да отследвате {name}?",
-  "conversation.delete": "Изтриване на разговор",
+  "confirmations.unfollow.confirm": "Без следване",
+  "confirmations.unfollow.message": "Наистина ли искате да не следвате {name}?",
+  "conversation.delete": "Изтриване на разговора",
   "conversation.mark_as_read": "Маркиране като прочетено",
-  "conversation.open": "Преглед на разговор",
+  "conversation.open": "Преглед на разговора",
   "conversation.with": "С {names}",
-  "directory.federated": "From known fediverse",
+  "copypaste.copied": "Копирано",
+  "copypaste.copy": "Копиране",
+  "directory.federated": "От позната федивселена",
   "directory.local": "Само от {domain}",
   "directory.new_arrivals": "Новодошли",
-  "directory.recently_active": "Наскоро активни",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "directory.recently_active": "Наскоро дейни",
+  "disabled_account_banner.account_settings": "Настройки на акаунта",
+  "disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
+  "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
+  "dismissable_banner.dismiss": "Отхвърляне",
+  "dismissable_banner.explore_links": "Тези новини се разказват от хората в този и други сървъри на децентрализираната мрежа точно сега.",
+  "dismissable_banner.explore_statuses": "Тези публикации от този и други сървъри в децентрализираната мрежа набират популярност сега на този сървър.",
+  "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
+  "dismissable_banner.public_timeline": "Това са най-скорошните публични публикации, създадени на този сървър, както и на други сървъри на децентрализираната мрежа, за които този сървър знае.",
+  "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
   "emoji_button.activity": "Дейност",
+  "emoji_button.clear": "Изчистване",
   "emoji_button.custom": "Персонализирано",
   "emoji_button.flags": "Знамена",
   "emoji_button.food": "Храна и напитки",
@@ -156,48 +207,71 @@
   "emoji_button.search": "Търсене...",
   "emoji_button.search_results": "Резултати от търсене",
   "emoji_button.symbols": "Символи",
-  "emoji_button.travel": "Пътуване и забележителности",
-  "empty_column.account_suspended": "Профилът е спрян",
+  "emoji_button.travel": "Пътуване и места",
+  "empty_column.account_suspended": "Спрян акаунт",
   "empty_column.account_timeline": "Тук няма публикации!",
-  "empty_column.account_unavailable": "Няма достъп до профила",
-  "empty_column.blocks": "Не сте блокирали потребители все още.",
-  "empty_column.bookmarked_statuses": "Все още нямате отметнати публикации. Когато отметнете някоя, тя ще се покаже тук.",
-  "empty_column.community": "Локалната емисия е празна. Напишете нещо публично, за да започнете!",
-  "empty_column.direct": "Все още нямате директни съобщения. Когато изпратите или получите някое, то ще се покаже тук.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "Все още нямате любими публикации. Когато поставите някоя в любими, тя ще се покаже тук.",
-  "empty_column.favourites": "Все още никой не е поставил тази публикация в любими. Когато някой го направи, ще се покаже тук.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.account_unavailable": "Недостъпен профил",
+  "empty_column.blocks": "Още не сте блокирали никакви потребители.",
+  "empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
+  "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
+  "empty_column.direct": "Все още нямате лични съобщения. Когато изпратите или получите някое, то ще се покаже тук.",
+  "empty_column.domain_blocks": "Още няма блокирани домейни.",
+  "empty_column.explore_statuses": "Няма нищо популярно в момента. Проверете пак по-късно!",
+  "empty_column.favourited_statuses": "Още нямате любими публикации. Поставяйки някоя в любими, то тя ще се покаже тук.",
+  "empty_column.favourites": "Още никой не е поставил публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
+  "empty_column.follow_recommendations": "Изглежда, че няма генерирани предложения за вас. Можете да опитате да търсите за хора, които знаете или да разгледате популярните тагове.",
   "empty_column.follow_requests": "Все още нямате заявки за последване. Когато получите такава, тя ще се покаже тук.",
-  "empty_column.hashtag": "В този хаштаг няма нищо все още.",
-  "empty_column.home": "Вашата начална емисия е празна! Посетете {public} или използвайте търсене, за да започнете и да се запознаете с други потребители.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "There is nothing in this list yet.",
+  "empty_column.hashtag": "Още няма нищо в този хаштаг.",
+  "empty_column.home": "Вашата начална часова ос е празна! Последвайте повече хора, за да я запълните. {suggestions}",
+  "empty_column.home.suggestions": "Преглед на някои предложения",
+  "empty_column.list": "Още няма нищо в този списък. Когато членовете на списъка публикуват нови публикации, то те ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
-  "empty_column.mutes": "Не сте заглушавали потребители все още.",
+  "empty_column.mutes": "Още не сте заглушавали потребители.",
   "empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+  "empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
   "error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
   "error.unexpected_crash.explanation_addons": "Тази страница не може да се покаже правилно. Тази грешка вероятно е причинена от добавка на браузъра или инструменти за автоматичен превод.",
   "error.unexpected_crash.next_steps": "Опитайте да опресните страницата. Ако това не помогне, все още можете да използвате Mastodon чрез различен браузър или приложение.",
-  "error.unexpected_crash.next_steps_addons": "Опитайте да ги деактивирате и да опресните страницата. Ако това не помогне, може все още да използвате Mastodon чрез различен браузър или приложение.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.next_steps_addons": "Опитайте се да ги изключите и да опресните страницата. Ако това не помогне, то още може да използвате Mastodon чрез различен браузър или приложение.",
+  "errors.unexpected_crash.copy_stacktrace": "Копиране на stacktrace-а в клипборда",
   "errors.unexpected_crash.report_issue": "Сигнал за проблем",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Следвайте хора, които харесвате, за да виждате техните съобщения! Ето някои предложения.",
-  "follow_recommendations.lead": "Съобщения от хора, които следвате, ще се показват в хронологичен ред на вашата главна страница. Не се страхувайте, че ще сгрешите, по всяко време много лесно можете да спрете да ги следвате!",
+  "explore.search_results": "Резултати от търсенето",
+  "explore.suggested_follows": "За вас",
+  "explore.title": "Разглеждане",
+  "explore.trending_links": "Новини",
+  "explore.trending_statuses": "Публикации",
+  "explore.trending_tags": "Хаштагове",
+  "filter_modal.added.context_mismatch_explanation": "Тази категория филтър не е приложима към контекста, в който достъпвате тази публикация. Ако желаете да филтрирате публикациите в този контекст, трябва да изберете друг филтър.",
+  "filter_modal.added.context_mismatch_title": "Несъвпадащ контекст!",
+  "filter_modal.added.expired_explanation": "Валидността на тази категория филтър е изтекла. Сменете срока на валидност, за да я приложите.",
+  "filter_modal.added.expired_title": "Изтекъл филтър!",
+  "filter_modal.added.review_and_configure": "За да прегледате и нагласите тази категория на филтъра, то отидете на {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Настройки на филтъра",
+  "filter_modal.added.settings_link": "страница с настройки",
+  "filter_modal.added.short_explanation": "Тази публикация е добавена към следната категория на филтъра: {title}.",
+  "filter_modal.added.title": "Филтърът е добавен!",
+  "filter_modal.select_filter.context_mismatch": "не е приложимо за този контекст",
+  "filter_modal.select_filter.expired": "изтекло",
+  "filter_modal.select_filter.prompt_new": "Нова категория: {name}",
+  "filter_modal.select_filter.search": "Търсене или създаване",
+  "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
+  "filter_modal.select_filter.title": "Филтриране на публ.",
+  "filter_modal.title.status": "Филтриране на публ.",
+  "follow_recommendations.done": "Готово",
+  "follow_recommendations.heading": "Следвайте хора, от които харесвате да виждате публикации! Ето някои предложения.",
+  "follow_recommendations.lead": "Съобщения от хора, които следвате, ще се показват в хронологичен ред във вашия основен инфопоток. Не се страхувайте, че ще сгрешите, по всяко време много лесно можете да спрете да ги следвате!",
   "follow_request.authorize": "Упълномощаване",
   "follow_request.reject": "Отхвърляне",
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
+  "footer.about": "Относно",
+  "footer.directory": "Директория на профилите",
+  "footer.get_app": "Вземане на приложението",
+  "footer.invite": "Поканване на хора",
+  "footer.keyboard_shortcuts": "Клавишни комбинации",
+  "footer.privacy_policy": "Политика за поверителност",
+  "footer.source_code": "Преглед на изходния код",
   "generic.saved": "Запазено",
-  "getting_started.developers": "Разработчици",
-  "getting_started.directory": "Профилна директория",
-  "getting_started.documentation": "Документация",
   "getting_started.heading": "Първи стъпки",
-  "getting_started.invite": "Поканване на хора",
-  "getting_started.open_source_notice": "Mastodon е софтуер с отворен код. Можеш да помогнеш или да докладваш за проблеми в Github: {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Условия за ползване",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -206,277 +280,373 @@
   "hashtag.column_settings.tag_mode.all": "Всичко това",
   "hashtag.column_settings.tag_mode.any": "Някое от тези",
   "hashtag.column_settings.tag_mode.none": "Никое от тези",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Включва допълнителни хаштагове за тази колона",
+  "hashtag.follow": "Следване на хаштаг",
+  "hashtag.unfollow": "Спиране на следване на хаштаг",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на споделяния",
   "home.column_settings.show_replies": "Показване на отговори",
   "home.hide_announcements": "Скриване на оповестявания",
   "home.show_announcements": "Показване на оповестявания",
+  "interaction_modal.description.favourite": "Ако имате профил в Mastodon, можете да маркирате публикация като любима, за да уведомите автора, че я оценявате, и да я запазите за по-късно.",
+  "interaction_modal.description.follow": "Ако имате регистрация в Mastodon, то може да последвате {name}, за да виждате публикациите от този профил в началния си инфоканал.",
+  "interaction_modal.description.reblog": "Ако имате профил в Mastodon, можете да споделите тази публикация със своите последователи.",
+  "interaction_modal.description.reply": "Ако имате профил в Mastodon, можете да добавите отговор към тази публикация.",
+  "interaction_modal.on_another_server": "На различен сървър",
+  "interaction_modal.on_this_server": "На този сървър",
+  "interaction_modal.other_server_instructions": "Копипейстнете този URL адрес в полето за търсене на любимото си приложение Mastodon или мрежови интерфейс на своя Mastodon сървър.",
+  "interaction_modal.preamble": "Откак Mastodon е децентрализиран, може да употребявате съществуващ акаунт, разположен на друг сървър на Mastodon или съвместима платформа, ако нямате акаунт на този сървър.",
+  "interaction_modal.title.favourite": "Любими публикации на {name}",
+  "interaction_modal.title.follow": "Последване на {name}",
+  "interaction_modal.title.reblog": "Споделете публикацията от {name}",
+  "interaction_modal.title.reply": "Отговаряне на публикацията на {name}",
   "intervals.full.days": "{number, plural, one {# ден} other {# дни}}",
   "intervals.full.hours": "{number, plural, one {# час} other {# часа}}",
   "intervals.full.minutes": "{number, plural, one {# минута} other {# минути}}",
-  "keyboard_shortcuts.back": "за придвижване назад",
-  "keyboard_shortcuts.blocked": "за отваряне на списъка с блокирани потребители",
+  "keyboard_shortcuts.back": "Навигиране назад",
+  "keyboard_shortcuts.blocked": "Отваряне на списъка с блокирани потребители",
   "keyboard_shortcuts.boost": "за споделяне",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "за фокусиране на текстовото пространство за композиране",
-  "keyboard_shortcuts.description": "Описание",
-  "keyboard_shortcuts.direct": "за отваряне на колона за директни съобщения",
-  "keyboard_shortcuts.down": "за придвижване надолу в списъка",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "за поставяне в любими",
-  "keyboard_shortcuts.favourites": "за отваряне на списъка с любими",
-  "keyboard_shortcuts.federated": "да отвори обединена хронология",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "за отваряне на началната емисия",
+  "keyboard_shortcuts.column": "Съсредоточение на колона",
+  "keyboard_shortcuts.compose": "Фокус на текстовото пространство за композиране",
+  "keyboard_shortcuts.description": "Опис",
+  "keyboard_shortcuts.direct": "за отваряне на колоната с лични съобщения",
+  "keyboard_shortcuts.down": "Преместване надолу в списъка",
+  "keyboard_shortcuts.enter": "Отваряне на публикация",
+  "keyboard_shortcuts.favourite": "Любима публикация",
+  "keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
+  "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
+  "keyboard_shortcuts.heading": "Клавишни съчетания",
+  "keyboard_shortcuts.home": "Отваряне на началната часова ос",
   "keyboard_shortcuts.hotkey": "Бърз клавиш",
-  "keyboard_shortcuts.legend": "за показване на тази легенда",
-  "keyboard_shortcuts.local": "за отваряне на локалната емисия",
-  "keyboard_shortcuts.mention": "за споменаване на автор",
-  "keyboard_shortcuts.muted": "за отваряне на списъка със заглушени потребители",
-  "keyboard_shortcuts.my_profile": "за отваряне на вашия профил",
-  "keyboard_shortcuts.notifications": "за отваряне на колоната с известия",
-  "keyboard_shortcuts.open_media": "за отваряне на мултимедия",
-  "keyboard_shortcuts.pinned": "за отваряне на списъка със закачени публикации",
-  "keyboard_shortcuts.profile": "за отваряне на авторския профил",
-  "keyboard_shortcuts.reply": "за отговаряне",
-  "keyboard_shortcuts.requests": "за отваряне на списъка със заявки за последване",
-  "keyboard_shortcuts.search": "за фокусиране на търсенето",
+  "keyboard_shortcuts.legend": "Показване на тази легенда",
+  "keyboard_shortcuts.local": "Отваряне на местна часова ос",
+  "keyboard_shortcuts.mention": "Споменаване на автор",
+  "keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
+  "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
+  "keyboard_shortcuts.notifications": "Отваряне на колоната с известия",
+  "keyboard_shortcuts.open_media": "Отваряне на мултимедия",
+  "keyboard_shortcuts.pinned": "Отваряне на списъка със закачени публикации",
+  "keyboard_shortcuts.profile": "Отваряне на профила на автора",
+  "keyboard_shortcuts.reply": "Отговаряне на публикация",
+  "keyboard_shortcuts.requests": "Отваряне на списъка със заявки за последване",
+  "keyboard_shortcuts.search": "Фокус на лентата за търсене",
   "keyboard_shortcuts.spoilers": "за показване/скриване на ПС полето",
-  "keyboard_shortcuts.start": "за отваряне на колоната \"първи стъпки\"",
+  "keyboard_shortcuts.start": "Отваряне на колоната \"първи стъпки\"",
   "keyboard_shortcuts.toggle_hidden": "за показване/скриване на текст зад ПС",
-  "keyboard_shortcuts.toggle_sensitivity": "за показване/скриване на мултимедия",
-  "keyboard_shortcuts.toot": "за започване на чисто нова публикация",
-  "keyboard_shortcuts.unfocus": "за дефокусиране на текстовото поле за композиране/търсене",
-  "keyboard_shortcuts.up": "за придвижване нагоре в списъка",
-  "lightbox.close": "Затвори",
-  "lightbox.compress": "Компресиране на полето за преглед на изображение",
-  "lightbox.expand": "Разгъване на полето за преглед на изображение",
+  "keyboard_shortcuts.toggle_sensitivity": "Показване/скриване на мултимедията",
+  "keyboard_shortcuts.toot": "Начало на нова публикация",
+  "keyboard_shortcuts.unfocus": "Разфокусиране на текстовото поле за композиране/търсене",
+  "keyboard_shortcuts.up": "Преместване нагоре в списъка",
+  "lightbox.close": "Затваряне",
+  "lightbox.compress": "Свиване на полето за преглед на образи",
+  "lightbox.expand": "Разгъване на полето за преглед на образи",
   "lightbox.next": "Напред",
   "lightbox.previous": "Назад",
-  "lists.account.add": "Добавяне към списък",
+  "limited_account_hint.action": "Покажи профила въпреки това",
+  "limited_account_hint.title": "Този профил е бил скрит от модераторита на {domain}.",
+  "lists.account.add": "Добавяне в списък",
   "lists.account.remove": "Премахване от списък",
   "lists.delete": "Изтриване на списък",
-  "lists.edit": "Редакция на списък",
+  "lists.edit": "Промяна на списъка",
   "lists.edit.submit": "Промяна на заглавие",
   "lists.new.create": "Добавяне на списък",
   "lists.new.title_placeholder": "Име на нов списък",
   "lists.replies_policy.followed": "Някой последван потребител",
   "lists.replies_policy.list": "Членове на списъка",
-  "lists.replies_policy.none": "Никой",
+  "lists.replies_policy.none": "Никого",
   "lists.replies_policy.title": "Показване на отговори на:",
-  "lists.search": "Търсене сред хора, които следвате",
+  "lists.search": "Търсене измежду последваните",
   "lists.subheading": "Вашите списъци",
-  "load_pending": "{count, plural, one {# нов обект} other {# нови обекти}}",
+  "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
   "loading_indicator.label": "Зареждане...",
   "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "missing_indicator.label": "Не е намерено",
-  "missing_indicator.sublabel": "Този ресурс не може да бъде намерен",
-  "mute_modal.duration": "Продължителност",
-  "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
+  "missing_indicator.sublabel": "Ресурсът не може да се намери",
+  "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
+  "mute_modal.duration": "Времетраене",
+  "mute_modal.hide_notifications": "Скривате ли известията от този потребител?",
   "mute_modal.indefinite": "Неопределено",
-  "navigation_bar.apps": "Мобилни приложения",
+  "navigation_bar.about": "За тази инстанция",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална емисия",
-  "navigation_bar.compose": "Композиране на нова публикация",
+  "navigation_bar.community_timeline": "Локален инфопоток",
+  "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Директни съобщения",
   "navigation_bar.discover": "Откриване",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Редактирай профил",
+  "navigation_bar.domain_blocks": "Блокирани домейни",
+  "navigation_bar.edit_profile": "Редактиране на профила",
+  "navigation_bar.explore": "Изследване",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
   "navigation_bar.follow_requests": "Заявки за последване",
   "navigation_bar.follows_and_followers": "Последвания и последователи",
-  "navigation_bar.info": "Extended information",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
   "navigation_bar.lists": "Списъци",
   "navigation_bar.logout": "Излизане",
   "navigation_bar.mutes": "Заглушени потребители",
   "navigation_bar.personal": "Лично",
   "navigation_bar.pins": "Закачени публикации",
   "navigation_bar.preferences": "Предпочитания",
-  "navigation_bar.public_timeline": "Публичен канал",
+  "navigation_bar.public_timeline": "Федеративна хронология",
+  "navigation_bar.search": "Търсене",
   "navigation_bar.security": "Сигурност",
-  "notification.favourite": "{name} хареса твоята публикация",
-  "notification.follow": "{name} те последва",
+  "not_signed_in_indicator.not_signed_in": "Трябва да влезете за достъп до този ресурс.",
+  "notification.admin.report": "{name} докладва {target}",
+  "notification.admin.sign_up": "{name} се регистрира",
+  "notification.favourite": "{name} сложи в любими ваша публикация",
+  "notification.follow": "{name} ви последва",
   "notification.follow_request": "{name} поиска да ви последва",
-  "notification.mention": "{name} те спомена",
+  "notification.mention": "{name} ви спомена",
   "notification.own_poll": "Анкетата ви приключи",
-  "notification.poll": "Анкета, в която сте гласували, приключи",
-  "notification.reblog": "{name} сподели твоята публикация",
+  "notification.poll": "Анкета, в която гласувахте, приключи",
+  "notification.reblog": "{name} сподели вашата публикация",
   "notification.status": "{name} току-що публикува",
-  "notifications.clear": "Изчистване на известия",
-  "notifications.clear_confirmation": "Сигурни ли сте, че искате да изчистите окончателно всичките си известия?",
-  "notifications.column_settings.alert": "Десктоп известия",
-  "notifications.column_settings.favourite": "Предпочитани:",
+  "notification.update": "{name} промени публикация",
+  "notifications.clear": "Изчистване на известията",
+  "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
+  "notifications.column_settings.admin.report": "Нови доклади:",
+  "notifications.column_settings.admin.sign_up": "Нови регистрации:",
+  "notifications.column_settings.alert": "Известия на работния плот",
+  "notifications.column_settings.favourite": "Любими:",
   "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
   "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
-  "notifications.column_settings.filter_bar.show": "Показване",
+  "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.follow_request": "Нови заявки за последване:",
   "notifications.column_settings.mention": "Споменавания:",
   "notifications.column_settings.poll": "Резултати от анкета:",
   "notifications.column_settings.push": "Изскачащи известия",
   "notifications.column_settings.reblog": "Споделяния:",
-  "notifications.column_settings.show": "Покажи в колона",
+  "notifications.column_settings.show": "Показване в колоната",
   "notifications.column_settings.sound": "Пускане на звук",
   "notifications.column_settings.status": "Нови публикации:",
-  "notifications.column_settings.unread_markers.category": "отметки за непрочетени известия",
+  "notifications.column_settings.unread_notifications.category": "Непрочетени известия",
+  "notifications.column_settings.unread_notifications.highlight": "Изтъкване на непрочетените известия",
+  "notifications.column_settings.update": "Промени:",
   "notifications.filter.all": "Всичко",
   "notifications.filter.boosts": "Споделяния",
   "notifications.filter.favourites": "Любими",
   "notifications.filter.follows": "Последвания",
   "notifications.filter.mentions": "Споменавания",
-  "notifications.filter.polls": "Резултати от анкета",
-  "notifications.filter.statuses": "Актуализации от хора, които следите",
+  "notifications.filter.polls": "Резултати от анкетата",
+  "notifications.filter.statuses": "Новости от последваните",
   "notifications.grant_permission": "Даване на разрешение.",
   "notifications.group": "{count} известия",
-  "notifications.mark_as_read": "Маркиране на всички известия като прочетени",
+  "notifications.mark_as_read": "Отбелязване на всички известия като прочетени",
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да бъдат активирани, тъй като разрешението на браузъра е отказвано преди",
-  "notifications.permission_required": "Известията на работния плот не са налични, тъй като необходимото разрешение не е предоставено.",
-  "notifications_permission_banner.enable": "Активиране на известията на работния плот",
-  "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, активирайте известията на работния плот. Можете да контролирате точно кои типове взаимодействия генерират известия на работния плот чрез бутона {icon} по-горе, след като бъдат активирани.",
-  "notifications_permission_banner.title": "Никога не пропускайте нищо",
+  "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications_permission_banner.enable": "Включване на известията на работния плот",
+  "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
+  "notifications_permission_banner.title": "Никога не пропускате нещо",
   "picture_in_picture.restore": "Връщане обратно",
   "poll.closed": "Затворено",
   "poll.refresh": "Опресняване",
-  "poll.total_people": "{count, plural, one {# човек} other {# човека}}",
+  "poll.total_people": "{count, plural, one {# човек} other {# души}}",
   "poll.total_votes": "{count, plural, one {# глас} other {# гласа}}",
   "poll.vote": "Гласуване",
-  "poll.voted": "Вие гласувахте за този отговор",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Добавяне на анкета",
+  "poll.voted": "Гласувахте за този отговор",
+  "poll.votes": "{votes, plural, one {# глас} other {# гласа}}",
+  "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Директно",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Само за последователи",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.change": "Промяна на поверителността на публикация",
+  "privacy.direct.long": "Видимо само за споменатите потребители",
+  "privacy.direct.short": "Само споменатите хора",
+  "privacy.private.long": "Видимо само за последователите",
+  "privacy.private.short": "Само последователи",
+  "privacy.public.long": "Видимо за всички",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Do not show in public timelines",
-  "privacy.unlisted.short": "Скрито",
+  "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
+  "privacy.unlisted.short": "Несписъчно",
+  "privacy_policy.last_updated": "Последно осъвременяване на {date}",
+  "privacy_policy.title": "Политика за поверителност",
   "refresh": "Опресняване",
   "regeneration_indicator.label": "Зареждане…",
-  "regeneration_indicator.sublabel": "Вашата начална емисия се подготвя!",
-  "relative_time.days": "{number}д",
-  "relative_time.hours": "{number}ч",
+  "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!",
+  "relative_time.days": "{number} д.",
+  "relative_time.full.days": "преди {number, plural, one {# ден} other {# дни}}",
+  "relative_time.full.hours": "преди {number, plural, one {# час} other {# часа}}",
+  "relative_time.full.just_now": "току-що",
+  "relative_time.full.minutes": "преди {number, plural, one {# минута} other {# минути}}",
+  "relative_time.full.seconds": "преди {number, plural, one {# секунда} other {# секунди}}",
+  "relative_time.hours": "{number}ч.",
   "relative_time.just_now": "сега",
-  "relative_time.minutes": "{number}м",
-  "relative_time.seconds": "{number}с",
+  "relative_time.minutes": "{number}м.",
+  "relative_time.seconds": "{number}с.",
   "relative_time.today": "днес",
   "reply_indicator.cancel": "Отказ",
-  "report.forward": "Препращане към {target}",
-  "report.forward_hint": "Акаунтът е от друг сървър. Изпращане на анонимно копие на доклада и там?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.block": "Блокиране",
+  "report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
+  "report.categories.other": "Друго",
+  "report.categories.spam": "Спам",
+  "report.categories.violation": "Съдържание, нарушаващо едно или повече правила на сървъра",
+  "report.category.subtitle": "Изберете най-доброто съвпадение",
+  "report.category.title": "Разкажете ни какво се случва с това: {type}",
+  "report.category.title_account": "профил",
+  "report.category.title_status": "публикация",
+  "report.close": "Готово",
+  "report.comment.title": "Има ли нещо друго, което смятате, че трябва да знаем?",
+  "report.forward": "Препращане до {target}",
+  "report.forward_hint": "Акаунтът е от друг сървър. Ще изпратите ли анонимно копие на доклада и там?",
+  "report.mute": "Заглушаване",
+  "report.mute_explanation": "Няма да виждате публикациите на това лице. То още може да ви следва и да вижда публикациите ви и няма да знае, че е заглушено.",
+  "report.next": "Напред",
   "report.placeholder": "Допълнителни коментари",
+  "report.reasons.dislike": "Не ми харесва",
+  "report.reasons.dislike_description": "Не е нещо, които искам да виждам",
+  "report.reasons.other": "Нещо друго е",
+  "report.reasons.other_description": "Проблемът не попада в нито една от другите категории",
+  "report.reasons.spam": "Спам е",
+  "report.reasons.spam_description": "Зловредни връзки, фалшиви взаимодействия, или повтарящи се отговори",
+  "report.reasons.violation": "Нарушава правилата на сървъра",
+  "report.reasons.violation_description": "Знаете, че нарушава особени правила",
+  "report.rules.subtitle": "Изберете всичко, което да се прилага",
+  "report.rules.title": "Кои правила са нарушени?",
+  "report.statuses.subtitle": "Изберете всичко, което да се прилага",
+  "report.statuses.title": "Има ли някакви публикации, подкрепящи този доклад?",
   "report.submit": "Подаване",
-  "report.target": "Reporting",
+  "report.target": "Докладване на {target}",
+  "report.thanks.take_action": "Ето възможностите ви за управление какво виждате в Mastodon:",
+  "report.thanks.take_action_actionable": "Докато преглеждаме това, може да предприемете действие срещу @{name}:",
+  "report.thanks.title": "Не искате ли да виждате това?",
+  "report.thanks.title_actionable": "Благодарности за докладването, ще го прегледаме.",
+  "report.unfollow": "Стоп на следването на @{name}",
+  "report.unfollow_explanation": "Последвали сте този акаунт. За да не виждате повече публикациите му в началния си инфопоток, то спрете да го следвате.",
+  "report_notification.attached_statuses": "прикачено {count, plural, one {{count} публикация} other {{count} публикации}}",
+  "report_notification.categories.other": "Друго",
+  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.violation": "Нарушение на правилото",
+  "report_notification.open": "Отваряне на доклада",
   "search.placeholder": "Търсене",
+  "search.search_or_paste": "Търсене или поставяне на URL адрес",
   "search_popout.search_format": "Формат за разширено търсене",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.full_text": "Търсене с обикновен текст връща публикации, които сте написали, харесали, споделили, или в които сте били споменати, както и съвпадащи потребителски имена, показвани имена и хаштагове.",
   "search_popout.tips.hashtag": "хаштаг",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "публикация",
   "search_popout.tips.text": "Обикновеният текст връща съответстващи показвани имена, потребителски имена и хаштагове",
   "search_popout.tips.user": "потребител",
   "search_results.accounts": "Хора",
+  "search_results.all": "Всичко",
   "search_results.hashtags": "Хаштагове",
+  "search_results.nothing_found": "Не може да се намери каквото и да било за тези термини при търсене",
   "search_results.statuses": "Публикации",
-  "search_results.statuses_fts_disabled": "Търсенето на публикации по тяхното съдържание не е активирано за този Mastodon сървър.",
+  "search_results.statuses_fts_disabled": "Търсенето на публикации по съдържанието им не е включено в този сървър на Mastodon.",
+  "search_results.title": "Търсене за {q}",
   "search_results.total": "{count, number} {count, plural, one {резултат} other {резултата}}",
+  "server_banner.about_active_users": "Ползващите сървъра през последните 30 дни (дейните месечно потребители)",
+  "server_banner.active_users": "дейни потребители",
+  "server_banner.administered_by": "Администрира се от:",
+  "server_banner.introduction": "{domain} е част от децентрализираната социална мрежа, поддържана от {mastodon}.",
+  "server_banner.learn_more": "Научете повече",
+  "server_banner.server_stats": "Статистика на сървъра:",
+  "sign_in_banner.create_account": "Създаване на акаунт",
+  "sign_in_banner.sign_in": "Вход",
+  "sign_in_banner.text": "Влезте, за да последвате профили или хаштагове, любимо, споделяне и отговаряне на публикации или взаимодействие от акаунта ви на друг сървър.",
   "status.admin_account": "Отваряне на интерфейс за модериране за @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_status": "Отваряне на тази публикация в интерфейс на модериране",
   "status.block": "Блокиране на @{name}",
   "status.bookmark": "Отмятане",
   "status.cancel_reblog_private": "Отсподеляне",
   "status.cannot_reblog": "Тази публикация не може да бъде споделена",
-  "status.copy": "Copy link to status",
+  "status.copy": "Копиране на връзката към публикация",
   "status.delete": "Изтриване",
-  "status.detailed_status": "Подробен изглед на разговор",
-  "status.direct": "Директно съобщение към @{name}",
+  "status.detailed_status": "Подробен изглед на разговора",
+  "status.direct": "Директно съобщение до @{name}",
+  "status.edit": "Редактиране",
+  "status.edited": "Редактирано на {date}",
+  "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
   "status.embed": "Вграждане",
-  "status.favourite": "Предпочитани",
+  "status.favourite": "Любимо",
+  "status.filter": "Филтриране на публ.",
   "status.filtered": "Филтрирано",
+  "status.hide": "Скриване на публ.",
+  "status.history.created": "{name} създаде {date}",
+  "status.history.edited": "{name} редактира {date}",
   "status.load_more": "Зареждане на още",
   "status.media_hidden": "Мултимедията е скрита",
-  "status.mention": "Споменаване",
+  "status.mention": "Споменаване на @{name}",
   "status.more": "Още",
   "status.mute": "Заглушаване на @{name}",
-  "status.mute_conversation": "Заглушаване на разговор",
-  "status.open": "Expand this status",
-  "status.pin": "Закачане на профил",
+  "status.mute_conversation": "Заглушаване на разговора",
+  "status.open": "Разширяване на публикацията",
+  "status.pin": "Закачане в профила",
   "status.pinned": "Закачена публикация",
-  "status.read_more": "Още информация",
+  "status.read_more": "Още за четене",
   "status.reblog": "Споделяне",
   "status.reblog_private": "Споделяне с оригинална видимост",
   "status.reblogged_by": "{name} сподели",
   "status.reblogs.empty": "Все още никой не е споделил тази публикация. Когато някой го направи, ще се покаже тук.",
   "status.redraft": "Изтриване и преработване",
-  "status.remove_bookmark": "Премахване на отметка",
+  "status.remove_bookmark": "Премахване на отметката",
+  "status.replied_to": "В отговор до {name}",
   "status.reply": "Отговор",
   "status.replyAll": "Отговор на тема",
   "status.report": "Докладване на @{name}",
-  "status.sensitive_warning": "Деликатно съдържание",
+  "status.sensitive_warning": "Чувствително съдържание",
   "status.share": "Споделяне",
-  "status.show_less": "Покажи по-малко",
-  "status.show_less_all": "Покажи по-малко за всички",
-  "status.show_more": "Покажи повече",
-  "status.show_more_all": "Покажи повече за всички",
-  "status.show_thread": "Показване на тема",
+  "status.show_filter_reason": "Покажи въпреки това",
+  "status.show_less": "Показване на по-малко",
+  "status.show_less_all": "Показване на по-малко за всички",
+  "status.show_more": "Показване на повече",
+  "status.show_more_all": "Показване на повече за всички",
+  "status.show_original": "Показване на първообраза",
+  "status.translate": "Превод",
+  "status.translated_from_with": "Преведено от {lang}, използвайки {provider}",
   "status.uncached_media_warning": "Не е налично",
-  "status.unmute_conversation": "Раззаглушаване на разговор",
-  "status.unpin": "Разкачане от профил",
+  "status.unmute_conversation": "Без заглушаването на разговора",
+  "status.unpin": "Разкачане от профила",
+  "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в списъка с часови оси след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
+  "subscribed_languages.save": "Запазване на промените",
+  "subscribed_languages.target": "Смяна на езика за {target}",
   "suggestions.dismiss": "Отхвърляне на предложение",
-  "suggestions.header": "Може да се интересувате от…",
-  "tabs_bar.federated_timeline": "Обединен",
+  "suggestions.header": "Може да имате интерес от…",
+  "tabs_bar.federated_timeline": "Федерална",
   "tabs_bar.home": "Начало",
-  "tabs_bar.local_timeline": "Локално",
+  "tabs_bar.local_timeline": "Местни",
   "tabs_bar.notifications": "Известия",
-  "tabs_bar.search": "Търсене",
-  "time_remaining.days": "{number, plural, one {# ден} other {# дни}} остава",
-  "time_remaining.hours": "{number, plural, one {# час} other {# часа}} остава",
-  "time_remaining.minutes": "{number, plural, one {# минута} other {# минути}} остава",
+  "time_remaining.days": "{number, plural, one {остава # ден} other {остават # дни}}",
+  "time_remaining.hours": "{number, plural, one {остава # час} other {остават # часа}}",
+  "time_remaining.minutes": "{number, plural, one {остава # минута} other {остават # минути}}",
   "time_remaining.moments": "Оставащи моменти",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} остава",
   "timeline_hint.remote_resource_not_displayed": "{resource} от други сървъри не се показват.",
   "timeline_hint.resources.followers": "Последователи",
   "timeline_hint.resources.follows": "Последвани",
   "timeline_hint.resources.statuses": "По-стари публикации",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} човек} other {{counter} човека}} говорят",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} човек} other {{counter} души}} {days, plural, one {за последния {days} ден} other {за последните {days} дни}}",
   "trends.trending_now": "Налагащи се сега",
-  "ui.beforeunload": "Черновата ви ще бъде загубена, ако излезете от Mastodon.",
+  "ui.beforeunload": "Черновата ви ще се загуби, ако излезете от Mastodon.",
   "units.short.billion": "{count}млрд",
   "units.short.million": "{count}млн",
   "units.short.thousand": "{count}хил",
   "upload_area.title": "Влачене и пускане за качване",
-  "upload_button.label": "Добави медия",
-  "upload_error.limit": "Превишен лимит за качване на файлове.",
+  "upload_button.label": "Добавете файл с образ, видео или звук",
+  "upload_error.limit": "Превишено ограничение за качване на файлове.",
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
-  "upload_form.audio_description": "Опишете за хора със загуба на слуха",
-  "upload_form.description": "Опишете за хора със зрителни увреждания",
-  "upload_form.edit": "Редакция",
-  "upload_form.thumbnail": "Промяна на миниизображението",
-  "upload_form.undo": "Отмяна",
-  "upload_form.video_description": "Опишете за хора със загуба на слуха или зрително увреждане",
-  "upload_modal.analyzing_picture": "Анализ на снимка…",
+  "upload_form.audio_description": "Опишете за хора със загубен слух",
+  "upload_form.description": "Опишете за хора със зрително увреждане",
+  "upload_form.description_missing": "Няма добавен опис",
+  "upload_form.edit": "Редактиране",
+  "upload_form.thumbnail": "Промяна на миниобраза",
+  "upload_form.undo": "Изтриване",
+  "upload_form.video_description": "Опишете за хора със загубен слух или зрително увреждане",
+  "upload_modal.analyzing_picture": "Снимков анализ…",
   "upload_modal.apply": "Прилагане",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Избор на изображение",
+  "upload_modal.applying": "Прилагане…",
+  "upload_modal.choose_image": "Избор на образ",
   "upload_modal.description_placeholder": "Ах, чудна българска земьо, полюшвай цъфтящи жита",
   "upload_modal.detect_text": "Откриване на текст от картина",
   "upload_modal.edit_media": "Редакция на мултимедия",
   "upload_modal.hint": "Щракнете или плъзнете кръга на визуализацията, за да изберете фокусна точка, която винаги ще бъде видима на всички миниатюри.",
-  "upload_modal.preparing_ocr": "Подготване на ОРС…",
-  "upload_modal.preview_label": "Визуализация ({ratio})",
-  "upload_progress.label": "Uploading…",
-  "video.close": "Затваряне на видео",
-  "video.download": "Изтегляне на файл",
+  "upload_modal.preparing_ocr": "Подготовка за оптично разпознаване на знаци…",
+  "upload_modal.preview_label": "Нагледно ({ratio})",
+  "upload_progress.label": "Качване...",
+  "upload_progress.processing": "Обработка…",
+  "video.close": "Затваряне на видеото",
+  "video.download": "Изтегляне на файла",
   "video.exit_fullscreen": "Изход от цял екран",
-  "video.expand": "Разгъване на видео",
+  "video.expand": "Разгъване на видеото",
   "video.fullscreen": "Цял екран",
-  "video.hide": "Скриване на видео",
+  "video.hide": "Скриване на видеото",
   "video.mute": "Обеззвучаване",
   "video.pause": "Пауза",
   "video.play": "Пускане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index f28e8b110..e936b4128 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "যোগাযোগ:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "সার্ভারের নিয়মাবলী",
   "account.account_note_header": "বিজ্ঞপ্তি",
   "account.add_or_remove_from_list": "তালিকাতে যোগ বা অপসারণ করো",
   "account.badges.bot": "বট",
@@ -7,68 +19,90 @@
   "account.block_domain": "{domain} থেকে সব লুকাও",
   "account.blocked": "অবরুদ্ধ",
   "account.browse_more_on_origin_server": "মূল প্রোফাইলটিতে আরও ব্রাউজ করুন",
-  "account.cancel_follow_request": "অনুসরণ অনুরোধ বাতিল করো",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "@{name} কে সরাসরি বার্তা",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "ডোমেন গোপন করুন",
   "account.edit_profile": "প্রোফাইল পরিবর্তন করুন",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "নিজের পাতায় দেখান",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "অনুসরণ",
   "account.followers": "অনুসরণকারী",
   "account.followers.empty": "এই ব্যক্তিকে এখনো কেউ অনুসরণ করে না।",
   "account.followers_counter": "{count, plural,one {{counter} জন অনুসরণকারী } other {{counter} জন অনুসরণকারী}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural,one {{counter} জনকে অনুসরণ} other {{counter} জনকে অনুসরণ}}",
   "account.follows.empty": "এই সদস্য কাওকে এখনো অনুসরণ করেন না.",
   "account.follows_you": "তোমাকে অনুসরণ করে",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "@{name}'র সমর্থনগুলি লুকিয়ে ফেলুন",
-  "account.joined": "Joined {date}",
-  "account.last_status": "শেষ সক্রিয় ছিল",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "এই লিংকের মালিকানা চেক করা হয়েছে {date} তারিখে",
   "account.locked_info": "এই নিবন্ধনের গোপনীয়তার ক্ষেত্র তালা দেওয়া আছে। নিবন্ধনকারী অনুসরণ করার অনুমতি যাদেরকে দেবেন, শুধু তারাই অনুসরণ করতে পারবেন।",
   "account.media": "মিডিয়া",
   "account.mention": "@{name} কে উল্লেখ করুন",
-  "account.moved_to": "{name} কে এখানে সরানো হয়েছে:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "@{name} কে নিঃশব্দ করুন",
   "account.mute_notifications": "@{name} র প্রজ্ঞাপন আপনার কাছে নিঃশব্দ করুন",
   "account.muted": "নিঃশব্দ",
-  "account.never_active": "কখনও নয়",
+  "account.open_original_page": "Open original page",
   "account.posts": "টুট",
   "account.posts_with_replies": "টুট এবং মতামত",
   "account.report": "@{name} কে রিপোর্ট করুন",
   "account.requested": "অনুমতির অপেক্ষা। অনুসরণ করার অনুরোধ বাতিল করতে এখানে ক্লিক করুন",
+  "account.requested_follow": "{name} আপনাকে অনুসরণ করার জন্য অনুরোধ করেছে",
   "account.share": "@{name} র প্রোফাইল অন্যদের দেখান",
   "account.show_reblogs": "@{name} র সমর্থনগুলো দেখান",
   "account.statuses_counter": "{count, plural,one {{counter} টুট} other {{counter} টুট}}",
   "account.unblock": "@{name} র কার্যকলাপ দেখুন",
   "account.unblock_domain": "{domain} কে আবার দেখুন",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "আপনার নিজের পাতায় এটা দেখবেন না",
   "account.unfollow": "অনুসরণ করো না",
   "account.unmute": "@{name} র কার্যকলাপ আবার দেখুন",
   "account.unmute_notifications": "@{name} র প্রজ্ঞাপন দেখুন",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "নোট যোগ করতে ক্লিক করুন",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.retention.cohort_size": "নতুন ব্যবহারকারী",
   "alert.rate_limited.message": "{retry_time, time, medium} -এর পরে আবার প্রচেষ্টা করুন।",
   "alert.rate_limited.title": "হার সীমিত",
   "alert.unexpected.message": "সমস্যা অপ্রত্যাশিত.",
   "alert.unexpected.title": "ওহো!",
   "announcement.announcement": "ঘোষণা",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
   "boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
-  "bundle_column_error.body": "এই অংশটি দেখতে যেয়ে কোনো সমস্যা হয়েছে।.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "আবার চেষ্টা করুন",
-  "bundle_column_error.title": "নেটওয়ার্কের সমস্যা",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "বন্ধ করুন",
   "bundle_modal_error.message": "এই অংশটি দেখাতে যেয়ে কোনো সমস্যা হয়েছে।.",
   "bundle_modal_error.retry": "আবার চেষ্টা করুন",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "যাদের ব্লক করা হয়েছে",
   "column.bookmarks": "বুকমার্ক",
   "column.community": "স্থানীয় সময়সারি",
-  "column.direct": "সরাসরি লেখা",
+  "column.direct": "Direct messages",
   "column.directory": "প্রোফাইল ব্রাউজ করুন",
   "column.domain_blocks": "লুকোনো ডোমেনগুলি",
   "column.favourites": "পছন্দের গুলো",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "শুধুমাত্র স্থানীয়",
   "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
   "community.column_settings.remote_only": "শুধুমাত্র দূরবর্তী",
-  "compose_form.direct_message_warning": "শুধুমাত্র যাদেরকে উল্লেখ করা হয়েছে তাদেরকেই এই টুটটি পাঠানো হবে ।",
+  "compose.language.change": "ভাষা পরিবর্তন করুন",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "আরো জানুন",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "কোনো হ্যাশট্যাগের ভেতরে এই টুটটি থাকবেনা কারণ এটি তালিকাবহির্ভূত। শুধুমাত্র প্রকাশ্য ঠোটগুলো হ্যাশট্যাগের ভেতরে খুঁজে পাওয়া যাবে।",
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
   "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
   "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
-  "compose_form.publish": "টুট",
+  "compose_form.publish": "প্রকাশ করুন",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
   "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
   "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
   "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "মুছে ফেলুন",
   "confirmations.delete.message": "আপনি কি নিশ্চিত যে এই লেখাটি মুছে ফেলতে চান ?",
   "confirmations.delete_list.confirm": "মুছে ফেলুন",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "পঠিত হিসেবে চিহ্নিত করুন",
   "conversation.open": "কথপোকথন দেখান",
   "conversation.with": "{names} এর সঙ্গে",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "পরিচিত ফেডিভারসের থেকে",
   "directory.local": "শুধু {domain} থেকে",
   "directory.new_arrivals": "নতুন আগত",
   "directory.recently_active": "সম্প্রতি সক্রিয়",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "এই লেখাটি আপনার ওয়েবসাইটে যুক্ত করতে নিচের কোডটি বেবহার করুন।",
   "embed.preview": "সেটা দেখতে এরকম হবে:",
   "emoji_button.activity": "কার্যকলাপ",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "প্রথা",
   "emoji_button.flags": "পতাকা",
   "emoji_button.food": "খাদ্য ও পানীয়",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের ব্লক করেন নি।",
   "empty_column.bookmarked_statuses": "আপনার কাছে এখনও কোনও বুকমার্কড টুট নেই। আপনি যখন একটি বুকমার্ক করেন, এটি এখানে প্রদর্শিত হবে।",
   "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
-  "empty_column.direct": "আপনার কাছে সরাসরি পাঠানো কোনো লেখা নেই। যদি কেও পাঠায়, সেটা এখানে দেখা যাবে।",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "এখনও কোনও লুকানো ডোমেন নেই।",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।",
   "empty_column.favourites": "কেও এখনো এটাকে পছন্দের টুট হিসেবে চিহ্নিত করেনি। যদি করে, তখন তাদের এখানে পাওয়া যাবে।",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,35 +235,71 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "স্টেকট্রেস ক্লিপবোর্ডে কপি করুন",
   "errors.unexpected_crash.report_issue": "সমস্যার প্রতিবেদন করুন",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "সংবাদ",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "সম্পন্ন",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "অনুমতি দিন",
   "follow_request.reject": "প্রত্যাখ্যান করুন",
   "follow_requests.unlocked_explanation": "আপনার অ্যাকাউন্টটি লক না থাকলেও, {domain} কর্মীরা ভেবেছিলেন যে আপনি এই অ্যাকাউন্টগুলি থেকে ম্যানুয়ালি অনুসরণের অনুরোধগুলি পর্যালোচনা করতে চাইতে পারেন।",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "সংরক্ষণ হয়েছে",
-  "getting_started.developers": "তৈরিকারকদের জন্য",
-  "getting_started.directory": "নিজস্ব-পাতাগুলির তালিকা",
-  "getting_started.documentation": "নথিপত্র",
   "getting_started.heading": "শুরু করা",
-  "getting_started.invite": "অন্যদের আমন্ত্রণ করুন",
-  "getting_started.open_source_notice": "মাস্টাডন একটি মুক্ত সফটওয়্যার। তৈরিতে সাহায্য করতে বা কোনো সমস্যা সম্পর্কে জানাতে আমাদের গিটহাবে যেতে পারেন {github}।",
-  "getting_started.security": "নিরাপত্তা",
-  "getting_started.terms": "ব্যবহারের নিয়মাবলী",
   "hashtag.column_header.tag_mode.all": "এবং {additional}",
   "hashtag.column_header.tag_mode.any": "অথবা {additional}",
-  "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
+  "hashtag.column_header.tag_mode.none": "{additional} বাদ দিয়ে",
   "hashtag.column_settings.select.no_options_message": "কোনটা পাওয়া যায় নি",
   "hashtag.column_settings.select.placeholder": "হ্যাশট্যাগের ভেতরে ঢুকুন…",
   "hashtag.column_settings.tag_mode.all": "এগুলো সব",
   "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
   "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
   "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
   "home.hide_announcements": "ঘোষণা লুকান",
   "home.show_announcements": "ঘোষণা দেখান",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# ঘটা} other {# ঘটা}}",
   "intervals.full.minutes": "{number, plural, one {# মিনিট} other {# মিনিট}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "কোনো কলামএ কোনো লেখা ফোকাস করতে",
   "keyboard_shortcuts.compose": "লেখা সম্পদনার জায়গায় ফোকাস করতে",
   "keyboard_shortcuts.description": "বিবরণ",
-  "keyboard_shortcuts.direct": "সরাসরি পাঠানো লেখা দেখতে",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে",
   "keyboard_shortcuts.enter": "অবস্থা দেখতে",
   "keyboard_shortcuts.favourite": "পছন্দের দেখতে",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "পরবর্তী",
   "lightbox.previous": "পূর্ববর্তী",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "তালিকাতে যুক্ত করতে",
   "lists.account.remove": "তালিকা থেকে বাদ দিতে",
   "lists.delete": "তালিকা মুছে ফেলতে",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
   "missing_indicator.label": "খুঁজে পাওয়া যায়নি",
   "missing_indicator.sublabel": "জিনিসটা খুঁজে পাওয়া যায়নি",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "সময়কাল",
   "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "মোবাইলের আপ্প",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
   "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
   "navigation_bar.compose": "নতুন টুট লিখুন",
-  "navigation_bar.direct": "সরাসরি লেখাগুলি",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
   "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "পছন্দের",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
   "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি",
   "navigation_bar.follows_and_followers": "অনুসরণ এবং অনুসরণকারী",
-  "navigation_bar.info": "এই সার্ভার সম্পর্কে",
-  "navigation_bar.keyboard_shortcuts": "হটকীগুলি",
   "navigation_bar.lists": "তালিকাগুলো",
   "navigation_bar.logout": "বাইরে যান",
   "navigation_bar.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "পিন দেওয়া টুট",
   "navigation_bar.preferences": "পছন্দসমূহ",
   "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "নিরাপত্তা",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
   "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
@@ -306,13 +400,16 @@
   "notification.poll": "আপনি ভোট দিয়েছিলেন এমন এক  নির্বাচনের ভোটের সময় শেষ হয়েছে",
   "notification.reblog": "{name} আপনার কার্যক্রমে সমর্থন দেখিয়েছেন",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে",
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি",
   "notifications.column_settings.favourite": "পছন্দের:",
   "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো",
   "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ",
-  "notifications.column_settings.filter_bar.show": "দেখানো",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
   "notifications.column_settings.follow_request": "অনুসরণের অনুরোধগুলি:",
   "notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "কলামে দেখানো",
   "notifications.column_settings.sound": "শব্দ বাজানো",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "সব",
   "notifications.filter.boosts": "সমর্থনগুলো",
   "notifications.filter.favourites": "পছন্দের গুলো",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
   "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "সরাসরি",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "শুধুমাত্র অনুসরণকারীদের জন্য",
-  "privacy.public.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে লিখতে",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে না দেখাতে",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "প্রকাশ্য নয়",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",
   "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
   "relative_time.days": "{number} দিন",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number} ঘন্টা",
   "relative_time.just_now": "এখন",
   "relative_time.minutes": "{number}মিঃ",
   "relative_time.seconds": "{number} সেকেন্ড",
   "relative_time.today": "আজ",
   "reply_indicator.cancel": "বাতিল করতে",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "এটা আরো পাঠান {target} তে",
   "report.forward_hint": "এই নিবন্ধনটি অন্য একটি সার্ভারে। অপ্রকাশিতনামাভাবে রিপোর্টের কপি সেখানেও কি পাঠাতে চান ?",
-  "report.hint": "রিপোর্টটি আপনার সার্ভারের পরিচালকের কাছে পাঠানো হবে। রিপোর্ট পাঠানোর কারণ নিচে বিস্তারিত লিখতে পারেন:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "অন্য কোনো মন্তব্য",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "জমা দিন",
   "report.target": "{target} রিপোর্ট করুন",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "অনুসন্ধান",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "বিস্তারিতভাবে খোঁজার পদ্ধতি",
   "search_popout.tips.full_text": "সাধারণ লেখা দিয়ে খুঁজলে বের হবে সেরকম আপনার লেখা, পছন্দের লেখা, সমর্থন করা লেখা, আপনাকে উল্লেখকরা কোনো লেখা,  যা খুঁজছেন সেরকম কোনো ব্যবহারকারীর নাম বা কোনো হ্যাশট্যাগগুলো।",
   "search_popout.tips.hashtag": "হ্যাশট্যাগ",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "সাধারণ লেখা দিয়ে খুঁজলে বের হবে সেরকম ব্যবহারকারীর নাম বা কোনো হ্যাশট্যাগগুলো",
   "search_popout.tips.user": "ব্যবহারকারী",
   "search_results.accounts": "মানুষ",
+  "search_results.all": "All",
   "search_results.hashtags": "হ্যাশট্যাগগুলি",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "টুট",
   "search_results.statuses_fts_disabled": "তাদের সামগ্রী দ্বারা টুটগুলি অনুসন্ধান এই মস্তোডন সার্ভারে সক্ষম নয়।",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {ফলাফল} other {ফলাফল}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন",
   "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন",
   "status.block": "@{name} কে ব্লক করুন",
@@ -396,9 +551,16 @@
   "status.delete": "মুছে ফেলতে",
   "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
   "status.direct": "@{name} কে সরাসরি লেখা পাঠাতে",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দের করতে",
+  "status.filter": "Filter this post",
   "status.filtered": "ছাঁকনিদিত",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",
   "status.mention": "@{name}কে উল্লেখ করতে",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "এখনো কেও এটাতে সমর্থন দেয়নি। যখন কেও দেয়, সেটা তখন এখানে দেখা যাবে।",
   "status.redraft": "মুছে আবার নতুন করে লিখতে",
   "status.remove_bookmark": "বুকমার্ক সরান",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "মতামত জানাতে",
   "status.replyAll": "লেখাযুক্ত সবার কাছে মতামত জানাতে",
   "status.report": "@{name} কে রিপোর্ট করতে",
   "status.sensitive_warning": "সংবেদনশীল কিছু",
   "status.share": "অন্যদের জানান",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "কম দেখতে",
   "status.show_less_all": "সবগুলোতে কম দেখতে",
   "status.show_more": "আরো দেখাতে",
   "status.show_more_all": "সবগুলোতে আরো দেখতে",
-  "status.show_thread": "আলোচনা দেখতে",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "পাওয়া যাচ্ছে না",
   "status.unmute_conversation": "আলোচনার প্রজ্ঞাপন চালু করতে",
   "status.unpin": "নিজের পাতা থেকে পিন করে রাখাটির পিন খুলতে",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "সাহায্যের পরামর্শগুলো সরাতে",
   "suggestions.header": "আপনি হয়তোবা এগুলোতে আগ্রহী হতে পারেন…",
   "tabs_bar.federated_timeline": "যুক্তবিশ্ব",
   "tabs_bar.home": "বাড়ি",
   "tabs_bar.local_timeline": "স্থানীয়",
   "tabs_bar.notifications": "প্রজ্ঞাপনগুলো",
-  "tabs_bar.search": "অনুসন্ধান",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} বাকি আছে",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} বাকি আছে",
   "time_remaining.minutes": "{number, plural, one {# মিনিট} other {# মিনিট}} বাকি আছে",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "অনুসরকারীরা",
   "timeline_hint.resources.follows": "অনুসরণ করে",
   "timeline_hint.resources.statuses": "পুরনো টুটগুলি",
-  "trends.counter_by_accounts": "{count, plural,one {{counter} জন ব্যক্তি} other {{counter} জন লোক}} কথা বলছে",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "বর্তমানে জনপ্রিয়",
   "ui.beforeunload": "যে পর্যন্ত এটা লেখা হয়েছে, মাস্টাডন থেকে চলে গেলে এটা মুছে যাবে।",
   "units.short.billion": "{count}বিলিয়ন",
@@ -456,6 +624,7 @@
   "upload_error.poll": "নির্বাচনক্ষেত্রে কোনো ফাইল যুক্ত করা যাবেনা।",
   "upload_form.audio_description": "শ্রবণশক্তি লোকদের জন্য বর্ণনা করুন",
   "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "সম্পাদন",
   "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
   "upload_form.undo": "মুছে ফেলতে",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "পূর্বরূপ({ratio})",
   "upload_progress.label": "যুক্ত করতে পাঠানো হচ্ছে...",
+  "upload_progress.processing": "Processing…",
   "video.close": "ভিডিওটি বন্ধ করতে",
   "video.download": "ফাইলটি ডাউনলোড করুন",
   "video.exit_fullscreen": "পূর্ণ পর্দা থেকে বাইরে বের হতে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 06fc32095..d0f47dd01 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -1,84 +1,118 @@
 {
+  "about.blocks": "Servijerioù habaskaet",
+  "about.contact": "Darempred :",
+  "about.disclaimer": "Mastodon zo ur meziant frank, open-source hag ur merk marilhet eus Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Abeg dihegerz",
+  "about.domain_blocks.preamble": "Gant Mastodon e c'hellit gwelet danvez hag eskemm gant implijerien·ezed eus forzh peseurt servijer er fedibed peurliesañ. Setu an nemedennoù a zo bet graet evit ar servijer-mañ e-unan.",
+  "about.domain_blocks.silenced.explanation": "Ne vo ket gwelet profiloù eus ar servijer-mañ ganeoc'h peurliesañ, nemet ma vefec'h o klask war o lec'h pe choazfec'h o heuliañ.",
+  "about.domain_blocks.silenced.title": "Bevennet",
+  "about.domain_blocks.suspended.explanation": "Roadenn ebet eus ar servijer-mañ ne vo keweriet, kadavet pe eskemmet, ar pezh a lako an etreweriañ pe ar c'hehentiñ gant implijerien adalek ar servijer-mañ dibosupl.",
+  "about.domain_blocks.suspended.title": "Astalet",
+  "about.not_available": "An titour-mañ ne c'heller ket gwelet war ar servijer-mañ.",
+  "about.powered_by": "Rouedad sokial digreizenned kaset gant {mastodon}",
+  "about.rules": "Reolennoù ar servijer",
   "account.account_note_header": "Notenn",
   "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
-  "account.block": "Berzañ @{name}",
-  "account.block_domain": "Berzañ pep tra eus {domain}",
+  "account.block": "Stankañ @{name}",
+  "account.block_domain": "Stankañ an domani {domain}",
   "account.blocked": "Stanket",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Nullañ ar bedadenn heuliañ",
-  "account.direct": "Kas ur gemennadenn da @{name}",
-  "account.disable_notifications": "Paouez d'am c'hemenn pa vez toudet gant @{name}",
-  "account.domain_blocked": "Domani berzet",
-  "account.edit_profile": "Aozañ ar profil",
-  "account.enable_notifications": "Ma c'hemenn pa vez toudet gant @{name}",
+  "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
+  "account.cancel_follow_request": "Nullañ ar reked heuliañ",
+  "account.direct": "Kas ur c'hannad eeun da @{name}",
+  "account.disable_notifications": "Paouez d'am c'hemenn pa vez embannet traoù gant @{name}",
+  "account.domain_blocked": "Domani stanket",
+  "account.edit_profile": "Kemmañ ar profil",
+  "account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
   "account.endorse": "Lakaat war-wel war ar profil",
+  "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
+  "account.featured_tags.last_status_never": "Toud ebet",
+  "account.featured_tags.title": "Penngerioù-klik {name}",
   "account.follow": "Heuliañ",
-  "account.followers": "Heulier·ezed·ien",
-  "account.followers.empty": "Den na heul an implijer-mañ c'hoazh.",
-  "account.followers_counter": "{count, plural, other{{counter} Heulier}}",
-  "account.following_counter": "{count, plural, other {{counter} Heuliañ}}",
+  "account.followers": "Tud koumanantet",
+  "account.followers.empty": "Den na heul an implijer·ez-mañ c'hoazh.",
+  "account.followers_counter": "{count, plural, other{{counter} Heulier·ez}}",
+  "account.following": "Koumanantoù",
+  "account.following_counter": "{count, plural, one{{counter} C'houmanant} two{{counter} Goumanant} other {{counter} a Goumanant}}",
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
-  "account.follows_you": "Ho heul",
-  "account.hide_reblogs": "Kuzh toudoù rannet gant @{name}",
-  "account.joined": "Amañ abaoe {date}",
-  "account.last_status": "Oberiantiz zivezhañ",
+  "account.follows_you": "Ho heuilh",
+  "account.go_to_profile": "Gwelet ar profil",
+  "account.hide_reblogs": "Kuzh skignadennoù gant @{name}",
+  "account.joined_short": "Amañ abaoe",
+  "account.languages": "Cheñch ar yezhoù koumanantet",
   "account.link_verified_on": "Gwiriet eo bet perc'hennidigezh al liamm d'an deiziad-mañ : {date}",
-  "account.locked_info": "Prennet eo ar gon-mañ. Dibab a ra ar perc'henn ar re a c'hall heuliañ anezhi pe anezhañ.",
+  "account.locked_info": "Prennet eo ar gont-mañ. Gant ar perc'henn e vez dibabet piv a c'hall heuliañ anezhi pe anezhañ.",
   "account.media": "Media",
   "account.mention": "Menegiñ @{name}",
-  "account.moved_to": "Dilojet en·he deus {name} da :",
+  "account.moved_to": "Gant {name} eo bet merket e oa bremañ h·e gont nevez :",
   "account.mute": "Kuzhat @{name}",
-  "account.mute_notifications": "Kuzh kemennoù eus @{name}",
+  "account.mute_notifications": "Kuzhat kemennoù a-berzh @{name}",
   "account.muted": "Kuzhet",
-  "account.never_active": "Birviken",
-  "account.posts": "a doudoù",
+  "account.open_original_page": "Digeriñ ar bajenn orin",
+  "account.posts": "Toudoù",
   "account.posts_with_replies": "Toudoù ha respontoù",
   "account.report": "Disklêriañ @{name}",
   "account.requested": "O c'hortoz an asant. Klikit evit nullañ ar goulenn heuliañ",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Toud} two {{counter} Doud} other {{counter} a Doudoù}}",
   "account.unblock": "Diverzañ @{name}",
   "account.unblock_domain": "Diverzañ an domani {domain}",
+  "account.unblock_short": "Distankañ",
   "account.unendorse": "Paouez da lakaat war-wel war ar profil",
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
-  "account.unmute_notifications": "Diguzhat kemennoù a @{name}",
-  "account_note.placeholder": "Klikit evit ouzhpenniñ un notenn",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_notifications": "Diguzhat kemennoù a-berzh @{name}",
+  "account.unmute_short": "Diguzhat",
+  "account_note.placeholder": "Klikit evit ouzhpennañ un notenn",
+  "admin.dashboard.daily_retention": "Feur azdalc'h an implijerien·ezed dre zeiz goude bezañ lakaet o anv",
+  "admin.dashboard.monthly_retention": "Feur azdalc'h an implijerien·ezed dre viz goude bezañ lakaet o anv",
+  "admin.dashboard.retention.average": "Keidenn",
+  "admin.dashboard.retention.cohort": "Miz an enrolladur",
+  "admin.dashboard.retention.cohort_size": "Implijerien.erezed nevez",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
   "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
-  "alert.unexpected.title": "Hopala!",
-  "announcement.announcement": "Kemenn",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "alert.unexpected.title": "Hopala !",
+  "announcement.announcement": "Kemennad",
+  "attachments_list.unprocessed": "(ket meret)",
+  "audio.hide": "Kuzhat ar c'hleved",
   "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
-  "bundle_column_error.body": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
+  "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
+  "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
+  "bundle_column_error.error.title": "Chaous !",
+  "bundle_column_error.network.body": "Degouezhet ez eus bet ur fazi en ur glask kargañ ar bajenn-mañ. Gallout a rafe bezañ abalamour d'ur gudenn padennek pe abalamour d'ar servijer-mañ.",
+  "bundle_column_error.network.title": "Fazi rouedad",
   "bundle_column_error.retry": "Klask en-dro",
-  "bundle_column_error.title": "Fazi rouedad",
+  "bundle_column_error.return": "Distreiñ d'an degemer",
+  "bundle_column_error.routing.body": "N'haller ket kavout ar bajenn goulennet. Sur oc'h eo reizh an URL er varrenn chomlec'hioù?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Serriñ",
   "bundle_modal_error.message": "Degouezhet ez eus bet ur fazi en ur gargañ an elfenn-mañ.",
   "bundle_modal_error.retry": "Klask en-dro",
+  "closed_registrations.other_server_instructions": "Peogwir ez eo Mastodon digreizennet e c'heller krouiñ ur gont war ur servijer all ha kenderc'hel da zaremprediñ gant hemañ.",
+  "closed_registrations_modal.description": "N'eo ket posupl krouiñ ur gont war {domain} evit ar mare, met n'ho peus ket ezhomm ur gont war {domain} dre ret evit ober gant Mastodon.",
+  "closed_registrations_modal.find_another_server": "Kavout ur servijer all",
+  "closed_registrations_modal.preamble": "Digreizennet eo Mastodon, forzh pelec'h e vefe krouet ho kont e viot gouest da heuliañ hag etreweriañ gant an holl war ar servijer-mañ. Gallout a rit herbec'hiañ anezhañ hoc'h-unan zoken!",
+  "closed_registrations_modal.title": "Enskrivadurioù war Mastodon",
+  "column.about": "Diwar-benn",
   "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
-  "column.direct": "Kemennadoù prevez",
+  "column.direct": "Kannadoù eeun",
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
-  "column.follow_requests": "Pedadoù heuliañ",
+  "column.follow_requests": "Rekedoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
   "column.mutes": "Implijer·ion·ezed kuzhet",
   "column.notifications": "Kemennoù",
   "column.pins": "Toudoù spilhennet",
-  "column.public": "Red-amzer kevreet",
+  "column.public": "Red-amzer kevredet",
   "column_back_button.label": "Distro",
   "column_header.hide_settings": "Kuzhat an arventennoù",
   "column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
@@ -90,60 +124,77 @@
   "community.column_settings.local_only": "Nemet lec'hel",
   "community.column_settings.media_only": "Nemet Mediaoù",
   "community.column_settings.remote_only": "Nemet a-bell",
-  "compose_form.direct_message_warning": "An toud-mañ a vo kaset nemet d'an implijer·ezed·ien meneget.",
+  "compose.language.change": "Cheñch yezh",
+  "compose.language.search": "Klask yezhoù...",
   "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
-  "compose_form.hashtag_warning": "Ne vo ket lakaet an toud-mañ er rolloù gerioù-klik dre mard eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
-  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal heuliañ ac'hanoc'h evit gwelout ho toudoù prevez.",
+  "compose_form.encryption_warning": "Toudoù war Mastodon na vezont ket sifret penn-da-benn. Na rannit ket titouroù kizidik dre Mastodon.",
+  "compose_form.hashtag_warning": "Ne vo ket listennet an toud-mañ dindan gerioù-klik ebet dre m'eo anlistennet. N'eus nemet an toudoù foran a c'hall bezañ klasket dre c'her-klik.",
+  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
-  "compose_form.placeholder": "Petra eh oc'h é soñjal a-barzh ?",
+  "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
   "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
   "compose_form.poll.duration": "Pad ar sontadeg",
   "compose_form.poll.option_placeholder": "Dibab {number}",
   "compose_form.poll.remove_option": "Lemel an dibab-mañ",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
-  "compose_form.publish": "Toudañ",
+  "compose_form.publish": "Embann",
+  "compose_form.publish_form": "Embann",
   "compose_form.publish_loud": "{publish} !",
+  "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
   "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
   "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
   "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Skrivit ho kemenn amañ",
+  "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
   "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
+  "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
+  "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
   "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Nac'hañ",
+  "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
   "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
   "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "Kuzhat a raio an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met aotren a raio anezhañ·i da welet ho todoù ha a heuliañ ac'hanoc'h.",
+  "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
   "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
-  "confirmations.redraft.message": "Ha sur oc'h e fell deoc'h dilemel ar statud-mañ hag adlakaat anezhañ er bouilhoñs? Kollet e vo ar merkoù muiañ-karet hag ar skignadennoù hag emzivat e vo ar respontoù d'an toud orin.",
+  "confirmations.redraft.message": "Ha sur oc'h e fell deoc'h dilemel an toudoù-mañ hag e adskrivañ ? Kollet e vo ar merkoù « muiañ-karet » hag ar skignadennoù, hag emzivat e vo ar respontoù d'an toud orin.",
   "confirmations.reply.confirm": "Respont",
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
-  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name}?",
+  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
   "conversation.delete": "Dilemel ar gaozeadenn",
   "conversation.mark_as_read": "Merkañ evel lennet",
   "conversation.open": "Gwelout ar gaozeadenn",
   "conversation.with": "Gant {names}",
-  "directory.federated": "Eus ar c'hevrebed anavezet",
+  "copypaste.copied": "Eilet",
+  "copypaste.copy": "Eilañ",
+  "directory.federated": "Eus ar fedibed anavezet",
   "directory.local": "Eus {domain} hepken",
   "directory.new_arrivals": "Degouezhet a-nevez",
   "directory.recently_active": "Oberiant nevez zo",
-  "embed.instructions": "Enkorfit ar statud war ho lec'hienn en ur eilañ ar c'hod dindan.",
-  "embed.preview": "Setu penaos e vo diskouezet:",
+  "disabled_account_banner.account_settings": "Arventennoù ar gont",
+  "disabled_account_banner.text": "Ho kont {disabledAccount} zo divev evit bremañ.",
+  "dismissable_banner.community_timeline": "Setu toudoù foran nevesañ an dud a zo herberc’hiet o c'hontoù gant {domain}.",
+  "dismissable_banner.dismiss": "Diverkañ",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
+  "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
+  "emoji_button.clear": "Diverkañ",
   "emoji_button.custom": "Kempennet",
   "emoji_button.flags": "Bannieloù",
   "emoji_button.food": "Boued hag Evaj",
@@ -157,47 +208,70 @@
   "emoji_button.search_results": "Disoc'hoù an enklask",
   "emoji_button.symbols": "Arouezioù",
   "emoji_button.travel": "Lec'hioù ha Beajoù",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "Toud ebet amañ!",
+  "empty_column.account_suspended": "Kont ehanet",
+  "empty_column.account_timeline": "Toud ebet amañ !",
   "empty_column.account_unavailable": "Profil dihegerz",
   "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
-  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
-  "empty_column.direct": "N'ho peus kemennad prevez ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
+  "empty_column.direct": "N'ho peus kannad eeun ebet c'hoazh. Pa vo resevet pe kaset unan ganeoc'h e teuio war wel amañ.",
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
-  "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
-  "empty_column.favourites": "Den ebet n'eus lakaet an toud-mañ en e reoù muiañ-karet. Pa vo graet gant unan bennak e vo diskouezet amañ.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "N'ho peus goulenn heuliañ ebet c'hoazh. Pa resevot reoù e vo diskouezet amañ.",
+  "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
+  "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
+  "empty_column.favourites": "Den ebet n'eus ouzhpennet an toud-mañ en e reoù muiañ-karet c'hoazh. Pa vo graet gant unan bennak e teuio war wel amañ.",
+  "empty_column.follow_recommendations": "War a seblant ne c'hall ket bezañ savet erbedadenn ebet evidoc'h. Gallout a rit implijout un enklask evit kavout tud a anavezfec'h pe furchal ar gerioù-klik diouzh ar c'hiz.",
+  "empty_column.follow_requests": "N'ho peus reked heuliañ ebet c'hoazh. Pa vo resevet unan e teuio war wel amañ.",
   "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.",
   "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "Goullo eo ar roll-mañ evit ar poent. Pa vo toudet gant e izili e vo diskouezet amañ.",
+  "empty_column.home.suggestions": "Gwellout damvenegoù",
+  "empty_column.list": "Goullo eo al listenn-mañ evit c'hoazh. Pa vo embannet toudoù nevez gant e izili e teuint war wel amañ.",
   "empty_column.lists": "N'ho peus roll ebet c'hoazh. Pa vo krouet unan ganeoc'h e vo diskouezet amañ.",
   "empty_column.mutes": "N'ho peus kuzhet implijer ebet c'hoazh.",
   "empty_column.notifications": "N'ho peus kemenn ebet c'hoazh. Grit gant implijer·ezed·ien all evit loc'hañ ar gomz.",
   "empty_column.public": "N'eus netra amañ! Skrivit un dra bennak foran pe heuilhit implijer·ien·ezed eus dafariadoù all evit leuniañ",
   "error.unexpected_crash.explanation": "Abalamour d'ur beug en hor c'hod pe d'ur gudenn geverlec'hded n'hallomp ket skrammañ ar bajenn-mañ en un doare dereat.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.explanation_addons": "Ar bajenn-mañ ne c'hell ket bezañ skrammet mat. Ar fazi-se a zo kaoz d'un astenn pe d'un ostilh troidigezh emgefreek war ho merdeer.",
   "error.unexpected_crash.next_steps": "Klaskit azbevaat ar bajenn. Ma n'a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheñvel pe dre an arload genidik.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Klaskit azbevaat ar bajenn. Ma n'ez a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheñvel pe dre an arload genidik.",
   "errors.unexpected_crash.copy_stacktrace": "Eilañ ar roudoù diveugañ er golver",
   "errors.unexpected_crash.report_issue": "Danevellañ ur fazi",
+  "explore.search_results": "Disoc'hoù an enklask",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Furchal",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Kenarroud digenglotus !",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Sil deuet d'e dermen !",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Arventennoù ar sil",
+  "filter_modal.added.settings_link": "pajenn an arventennoù",
+  "filter_modal.added.short_explanation": "An toud-mañ zo bet ouzhpennet d'ar rummad sil-mañ : {title}.",
+  "filter_modal.added.title": "Sil ouzhpennet !",
+  "filter_modal.select_filter.context_mismatch": "na glot ket gant ar c'henarroud-mañ",
+  "filter_modal.select_filter.expired": "zo deuet d'e dermen",
+  "filter_modal.select_filter.prompt_new": "Rummad nevez : {name}",
+  "filter_modal.select_filter.search": "Klask pe krouiñ",
+  "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
+  "filter_modal.select_filter.title": "Silañ an toud-mañ",
+  "filter_modal.title.status": "Silañ un toud",
   "follow_recommendations.done": "Graet",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.heading": "Heuilhit tud a blijfe deoc'h lenn o zoudoù ! Setu un nebeud erbedadennoù.",
+  "follow_recommendations.lead": "Toudoù gant tud a vez heuliet ganeoc'h a zeuio war wel en urzh kronologel war ho red degemer. Arabat kaout aon ober fazioù, diheuliañ tud a c'hellit ober aes ha forzh pegoulz !",
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "footer.about": "Diwar-benn",
+  "footer.directory": "Kavlec'h ar profiloù",
+  "footer.get_app": "Pellgargañ an arload",
+  "footer.invite": "Pediñ tud",
+  "footer.keyboard_shortcuts": "Berradennoù klavier",
+  "footer.privacy_policy": "Reolennoù prevezded",
+  "footer.source_code": "Gwelet kod mammenn",
   "generic.saved": "Enrollet",
-  "getting_started.developers": "Diorroerien",
-  "getting_started.directory": "Roll ar profiloù",
-  "getting_started.documentation": "Teuliadur",
   "getting_started.heading": "Loc'hañ",
-  "getting_started.invite": "Pediñ tud",
-  "getting_started.open_source_notice": "Mastodoñ zo ur meziant digor e darzh. Gallout a rit kenoberzhiañ dezhañ pe danevellañ kudennoù war GitHub e {github}.",
-  "getting_started.security": "Arventennoù ar gont",
-  "getting_started.terms": "Divizoù gwerzhañ hollek",
   "hashtag.column_header.tag_mode.all": "ha {additional}",
   "hashtag.column_header.tag_mode.any": "pe {additional}",
   "hashtag.column_header.tag_mode.none": "hep {additional}",
@@ -207,278 +281,374 @@
   "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
   "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
   "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
+  "hashtag.follow": "Heuliañ ar ger-klik",
+  "hashtag.unfollow": "Diheuliañ ar ger-klik",
   "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
   "home.show_announcements": "Diskouez ar c'hemennoù",
+  "interaction_modal.description.favourite": "Gant ur gont Mastodon e c'hellit ouzhpennañ an toud-mañ d'ho re vuiañ-karet evit lakaat an den en deus eñ skrivet da c'houzout e plij deoc'h hag en enrollañ evit diwezhatoc'h.",
+  "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
+  "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
+  "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
+  "interaction_modal.on_another_server": "War ur servijer all",
+  "interaction_modal.on_this_server": "War ar servijer-mañ",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Ouzhpennañ toud {name} d'ar re vuiañ-karet",
+  "interaction_modal.title.follow": "Heuliañ {name}",
+  "interaction_modal.title.reblog": "Skignañ toud {name}",
+  "interaction_modal.title.reply": "Respont da doud {name}",
   "intervals.full.days": "{number, plural, one {# devezh} other{# a zevezhioù}}",
   "intervals.full.hours": "{number, plural, one {# eurvezh} other{# eurvezh}}",
   "intervals.full.minutes": "{number, plural, one {# munut} other{# a vunutoù}}",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "da skignañ",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.back": "Distreiñ",
+  "keyboard_shortcuts.blocked": "Digeriñ roll an implijer.ezed.rien stanket",
+  "keyboard_shortcuts.boost": "Skignañ an toud",
+  "keyboard_shortcuts.column": "Fokus ar bann",
+  "keyboard_shortcuts.compose": "Fokus an takad testenn",
   "keyboard_shortcuts.description": "Deskrivadur",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "evit digeriñ un toud",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.direct": "evit digeriñ bann ar c'hannadoù eeun",
+  "keyboard_shortcuts.down": "Diskennañ er roll",
+  "keyboard_shortcuts.enter": "Digeriñ an toud",
+  "keyboard_shortcuts.favourite": "Ouzhpennañ an toud d'ar re vuiañ-karet",
+  "keyboard_shortcuts.favourites": "Digeriñ roll an toudoù muiañ-karet",
+  "keyboard_shortcuts.federated": "Digeriñ ar red-amzer kevredet",
+  "keyboard_shortcuts.heading": "Berradennoù klavier",
+  "keyboard_shortcuts.home": "Digeriñ ho red-amzer degemer",
   "keyboard_shortcuts.hotkey": "Berradur",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "da respont",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.legend": "Skrammañ ar skrid-se",
+  "keyboard_shortcuts.local": "Digeriñ red-amzer lec'hel",
+  "keyboard_shortcuts.mention": "Menegiñ an aozer.ez",
+  "keyboard_shortcuts.muted": "Digeriñ roll an implijer.ezed.ien kuzhet",
+  "keyboard_shortcuts.my_profile": "Digeriñ ho profil",
+  "keyboard_shortcuts.notifications": "Digeriñ bann ar c'hemennoù",
+  "keyboard_shortcuts.open_media": "Digeriñ ar media",
+  "keyboard_shortcuts.pinned": "Digeriñ listenn an toudoù spilhennet",
+  "keyboard_shortcuts.profile": "Digeriñ profil an aozer.ez",
+  "keyboard_shortcuts.reply": "Respont d'an toud",
+  "keyboard_shortcuts.requests": "Digeriñ roll goulennoù heuliañ",
+  "keyboard_shortcuts.search": "Fokus barenn klask",
+  "keyboard_shortcuts.spoilers": "da guzhat/ziguzhat tachenn CW",
+  "keyboard_shortcuts.start": "Digeriñ bann \"Kregiñ\"",
+  "keyboard_shortcuts.toggle_hidden": "da guzhat/ziguzhat an desten a-dreñv CW",
   "keyboard_shortcuts.toggle_sensitivity": "da guzhat/ziguzhat ur media",
-  "keyboard_shortcuts.toot": "da gregiñ gant un toud nevez-flamm",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.toot": "Kregiñ gant un toud nevez",
+  "keyboard_shortcuts.unfocus": "Difokus an dachenn testenn/klask",
+  "keyboard_shortcuts.up": "Pignat er roll",
   "lightbox.close": "Serriñ",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "Bihanaat boest hewel ar skeudenn",
+  "lightbox.expand": "Ledanaat boest hewel ar skeudenn",
   "lightbox.next": "Da-heul",
   "lightbox.previous": "A-raok",
+  "limited_account_hint.action": "Diskouez an aelad memes tra",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Ouzhpennañ d'al listenn",
   "lists.account.remove": "Lemel kuit eus al listenn",
   "lists.delete": "Dilemel al listenn",
-  "lists.edit": "Aozañ al listenn",
+  "lists.edit": "Kemmañ al listenn",
   "lists.edit.submit": "Cheñch an titl",
   "lists.new.create": "Ouzhpennañ ul listenn",
   "lists.new.title_placeholder": "Titl nevez al listenn",
-  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.followed": "Pep implijer.ez heuliet",
   "lists.replies_policy.list": "Izili ar roll",
   "lists.replies_policy.none": "Den ebet",
   "lists.replies_policy.title": "Diskouez ar respontoù:",
   "lists.search": "Klask e-touez tud heuliet ganeoc'h",
   "lists.subheading": "Ho listennoù",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ...",
-  "media_gallery.toggle_visible": "Toggle visibility",
+  "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
   "missing_indicator.label": "Digavet",
-  "missing_indicator.sublabel": "This resource could not be found",
+  "missing_indicator.sublabel": "An danvez-se ne vez ket kavet",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Padelezh",
   "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Arloadoù pellgomz",
+  "mute_modal.indefinite": "Amstrizh",
+  "navigation_bar.about": "Diwar-benn",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
   "navigation_bar.community_timeline": "Red-amzer lec'hel",
   "navigation_bar.compose": "Skrivañ un toud nevez",
-  "navigation_bar.direct": "Kemennadoù prevez",
+  "navigation_bar.direct": "Kannadoù eeun",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.edit_profile": "Aozañ ar profil",
+  "navigation_bar.edit_profile": "Kemmañ ar profil",
+  "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Ar re vuiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
   "navigation_bar.follow_requests": "Pedadoù heuliañ",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "Diwar-benn an dafariad-mañ",
-  "navigation_bar.keyboard_shortcuts": "Berradurioù",
+  "navigation_bar.follows_and_followers": "Heuliadennoù ha heulier·ezed·ien",
   "navigation_bar.lists": "Listennoù",
   "navigation_bar.logout": "Digennaskañ",
   "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
   "navigation_bar.personal": "Personel",
   "navigation_bar.pins": "Toudoù spilhennet",
   "navigation_bar.preferences": "Gwellvezioù",
-  "navigation_bar.public_timeline": "Red-amzer kevreet",
+  "navigation_bar.public_timeline": "Red-amzer kevredet",
+  "navigation_bar.search": "Klask",
   "navigation_bar.security": "Diogelroez",
-  "notification.favourite": "{name} favourited your status",
+  "not_signed_in_indicator.not_signed_in": "Ret eo deoc'h kevreañ evit tizhout an danvez-se.",
+  "notification.admin.report": "Disklêriet eo bet {target} gant {name}",
+  "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
+  "notification.favourite": "Gant {name} eo bet ouzhpennet ho toud d'h·e re vuiañ-karet",
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} en/he deus meneget ac'hanoc'h",
+  "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
+  "notification.mention": "Gant {name} oc'h bet meneget",
   "notification.own_poll": "Echu eo ho sontadeg",
   "notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
-  "notification.reblog": "{name} boosted your status",
-  "notification.status": "{name} just posted",
+  "notification.reblog": "Gant {name} eo bet skignet ho toud",
+  "notification.status": "Emañ {name} o paouez toudañ",
+  "notification.update": "Gant {name} ez eus bet kemmet un toud",
   "notifications.clear": "Skarzhañ ar c'hemennoù",
-  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.clear_confirmation": "Ha sur oc'h e fell deoc'h skarzhañ ho holl kemennoù ?",
+  "notifications.column_settings.admin.report": "Disklêriadurioù nevez :",
+  "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
   "notifications.column_settings.favourite": "Ar re vuiañ-karet:",
   "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
   "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
-  "notifications.column_settings.filter_bar.show": "Diskouez",
+  "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
   "notifications.column_settings.follow": "Heulierien nevez:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
   "notifications.column_settings.mention": "Menegoù:",
   "notifications.column_settings.poll": "Disoc'hoù ar sontadeg:",
-  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push": "Kemennoù push",
   "notifications.column_settings.reblog": "Skignadennoù:",
   "notifications.column_settings.show": "Diskouez er bann",
   "notifications.column_settings.sound": "Seniñ",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.status": "Toudoù nevez :",
+  "notifications.column_settings.unread_notifications.category": "Kemennoù anlennet",
+  "notifications.column_settings.unread_notifications.highlight": "Uslinennañ ar c'hemennoù anlennet",
+  "notifications.column_settings.update": "Kemmoù :",
   "notifications.filter.all": "Pep tra",
   "notifications.filter.boosts": "Skignadennoù",
   "notifications.filter.favourites": "Muiañ-karet",
   "notifications.filter.follows": "Heuliañ",
   "notifications.filter.mentions": "Menegoù",
   "notifications.filter.polls": "Disoc'hoù ar sontadegoù",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
+  "notifications.filter.statuses": "Hizivadurioù eus tud heuliet ganeoc'h",
+  "notifications.grant_permission": "Reiñ aotre.",
   "notifications.group": "{count} a gemennoù",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
+  "notifications.mark_as_read": "Merkañ an holl kemennoù evel bezañ lennet",
+  "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
+  "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
+  "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+  "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
+  "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
+  "notifications_permission_banner.title": "Na vankit netra morse",
+  "picture_in_picture.restore": "Adlakaat",
   "poll.closed": "Serret",
   "poll.refresh": "Azbevaat",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.total_people": "{count, plural, one {# den} other {# a zen}}",
+  "poll.total_votes": "{count, plural, one {# votadenn} other {# votadenn}}",
   "poll.vote": "Mouezhiañ",
   "poll.voted": "Mouezhiet ho peus evit ar respont-mañ",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural,one {#votadenn} other {# votadenn}}",
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
-  "privacy.change": "Kemmañ gwelidigezh ar statud",
+  "privacy.change": "Cheñch prevezded an toud",
   "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "War-eeun",
+  "privacy.direct.short": "Tud meneget hepken",
   "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Ar re a heuilh ac'hanon hepken",
-  "privacy.public.long": "Embann war ar redoù-amzer foran",
+  "privacy.private.short": "Tud koumanantet hepken",
+  "privacy.public.long": "Gwelus d'an holl",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Na embann war ar redoù-amzer foran",
+  "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
   "privacy.unlisted.short": "Anlistennet",
+  "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
+  "privacy_policy.title": "Reolennoù Prevezded",
   "refresh": "Freskaat",
   "regeneration_indicator.label": "O kargañ…",
   "regeneration_indicator.sublabel": "War brientiñ emañ ho red degemer!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# devezh} two {# zevezh} few {# devezh} many {# a devezh} other {# devezh}} zo",
+  "relative_time.full.hours": "{number, plural, one {# eurvezh} two {# eurvezh} few {# eurvezh} many {# eur} other {# eurvezh}} zo",
+  "relative_time.full.just_now": "bremañ",
+  "relative_time.full.minutes": "{number, plural, one {# munut} two {# vunut} few {# munut} many {# munut} other {# munut}} zo",
+  "relative_time.full.seconds": "{number, plural, one {# eilenn} two {# eilenn} few {# eilenn} many {# eilenn} other {# eilenn}} zo",
   "relative_time.hours": "{number}e",
   "relative_time.just_now": "bremañ",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}eil",
   "relative_time.today": "hiziv",
   "reply_indicator.cancel": "Nullañ",
+  "report.block": "Stankañ",
+  "report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
+  "report.categories.other": "All",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Torret e vez gant an endalc'had unan pe meur a reolenn",
+  "report.category.subtitle": "Choazit ar pezh a glot ar gwellañ",
+  "report.category.title": "Lârit deomp petra c'hoarvez gant {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "an toud-mañ",
+  "report.close": "Graet",
+  "report.comment.title": "Ha traoù all a rankfemp gouzout ?",
   "report.forward": "Treuzkas da: {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.forward_hint": "War ur servijer all emañ ar c'hont-se. Kas dezhañ un adskrid disanv eus an danevell ivez?",
+  "report.mute": "Kuzhat",
+  "report.mute_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Gwelet ho toudoù ha ho heuliañ a c'hello ha ne ouezo ket eo bet kuzhet ganeoc'h.",
+  "report.next": "War-raok",
   "report.placeholder": "Askelennoù ouzhpenn",
+  "report.reasons.dislike": "Ne blij ket din",
+  "report.reasons.dislike_description": "An dra-se na fell ket deoc'h gwelet",
+  "report.reasons.other": "Un abeg all eo",
+  "report.reasons.other_description": "Ar gudenn na glot ket gant ar rummadoù all",
+  "report.reasons.spam": "Spam eo",
+  "report.reasons.spam_description": "Liammoù gwallyoulet, engouestl faos, respontoù liezek",
+  "report.reasons.violation": "Terriñ a ra reolennoù ar servijer",
+  "report.reasons.violation_description": "Gouzout a rit e ya a-enep da reolennoù ar servijer",
+  "report.rules.subtitle": "Diuzit an holl draoù a glot",
+  "report.rules.title": "Pesort reolennoù zo bet torret ?",
+  "report.statuses.subtitle": "Diuzit an holl draoù a glot",
+  "report.statuses.title": "Ha toudoù all zo a c'hallfe nerzhañ an disklêriadenn-se ?",
   "report.submit": "Kinnig",
-  "report.target": "Report {target}",
+  "report.target": "O tisklêriañ {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Ne fell ket deoc'h gwelet an dra-se ?",
+  "report.thanks.title_actionable": "Trugarez evit bezañ disklêriet, emaomp o vont da glask pelloc'h.",
+  "report.unfollow": "Diheuliañ @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "All",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Torradur da reolennoù ar servijer",
+  "report_notification.open": "Digeriñ an disklêriadur",
   "search.placeholder": "Klask",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search.search_or_paste": "Klask pe pegañ un URL",
+  "search_popout.search_format": "Framm klask araokaet",
+  "search_popout.tips.full_text": "Testenn simpl a adkas toudoù skrivet ganeoc'h, merket ganeoc'h evel miuañ-karet, toudoù skignet, pe e-lec'h oc'h bet meneget, met ivez anvioù skrammañ, anvioù implijer ha gêrioù-klik hag a glot.",
   "search_popout.tips.hashtag": "ger-klik",
-  "search_popout.tips.status": "statud",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.status": "toud",
+  "search_popout.tips.text": "Testenn simpl a adkas anvioù skrammañ, anvioù implijer ha gêrioù-klik hag a glot",
   "search_popout.tips.user": "implijer·ez",
   "search_results.accounts": "Tud",
+  "search_results.all": "Pep tra",
   "search_results.hashtags": "Gerioù-klik",
-  "search_results.statuses": "a doudoù",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "search_results.nothing_found": "Disoc'h ebet gant ar gerioù-se",
+  "search_results.statuses": "Toudoù",
+  "search_results.statuses_fts_disabled": "Klask toudoù dre oc'h endalc'h n'eo ket aotreet war ar servijer-mañ.",
+  "search_results.title": "Klask {q}",
+  "search_results.total": "{count, number} {count, plural, one {disoc'h} other {a zisoc'h}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "implijerien·ezed oberiant",
+  "server_banner.administered_by": "Meret gant :",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Gouzout hiroc'h",
+  "server_banner.server_stats": "Stadegoù ar servijer :",
+  "sign_in_banner.create_account": "Krouiñ ur gont",
+  "sign_in_banner.sign_in": "Kevreañ",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Digeriñ etrefas evezherezh evit @{name}",
+  "status.admin_status": "Digeriñ an toud e-barzh an etrefas evezherezh",
   "status.block": "Berzañ @{name}",
   "status.bookmark": "Ouzhpennañ d'ar sinedoù",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Eilañ liamm an toud",
+  "status.cancel_reblog_private": "Nac'hañ ar skignadenn",
+  "status.cannot_reblog": "Ar c'hannad-se na c'hall ket bezañ skignet",
+  "status.copy": "Eilañ liamm ar c'hannad",
   "status.delete": "Dilemel",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Kas ur c'hemennad da @{name}",
+  "status.detailed_status": "Gwel kaozeadenn munudek",
+  "status.direct": "Kas ur c'hannad eeun da @{name}",
+  "status.edit": "Kemmañ",
+  "status.edited": "Aozet {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
+  "status.filter": "Silañ ar c'hannad-mañ",
   "status.filtered": "Silet",
+  "status.hide": "Kuzhat ar c'hannad",
+  "status.history.created": "Krouet gant {name} {date}",
+  "status.history.edited": "Kemmet gant {name} {date}",
   "status.load_more": "Kargañ muioc'h",
   "status.media_hidden": "Media kuzhet",
   "status.mention": "Menegiñ @{name}",
   "status.more": "Muioc'h",
   "status.mute": "Kuzhat @{name}",
   "status.mute_conversation": "Kuzhat ar gaozeadenn",
-  "status.open": "Kreskaat an toud-mañ",
+  "status.open": "Digeriñ ar c'hannad-mañ",
   "status.pin": "Spilhennañ d'ar profil",
   "status.pinned": "Toud spilhennet",
   "status.read_more": "Lenn muioc'h",
   "status.reblog": "Skignañ",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
+  "status.reblog_private": "Skignañ gant ar weledenn gentañ",
+  "status.reblogged_by": "Skignet gant {name}",
+  "status.reblogs.empty": "Den ebet n'eus skignet ar c'hannad-mañ c'hoazh. Pa vo graet gant unan bennak e teuio war wel amañ.",
+  "status.redraft": "Diverkañ ha skrivañ en-dro",
   "status.remove_bookmark": "Dilemel ar sined",
+  "status.replied_to": "Respont da {name}",
   "status.reply": "Respont",
   "status.replyAll": "Respont d'ar gaozeadenn",
   "status.report": "Disklêriañ @{name}",
-  "status.sensitive_warning": "Sensitive content",
+  "status.sensitive_warning": "Dalc'had kizidik",
   "status.share": "Rannañ",
+  "status.show_filter_reason": "Diskwel memes tra",
   "status.show_less": "Diskouez nebeutoc'h",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Diskouez nebeutoc'h evit an holl",
   "status.show_more": "Diskouez muioc'h",
   "status.show_more_all": "Diskouez miuoc'h evit an holl",
-  "status.show_thread": "Diskouez ar gaozeadenn",
+  "status.show_original": "Diskouez hini orin",
+  "status.translate": "Treiñ",
+  "status.translated_from_with": "Troet diwar {lang} gant {provider}",
   "status.uncached_media_warning": "Dihegerz",
   "status.unmute_conversation": "Diguzhat ar gaozeadenn",
   "status.unpin": "Dispilhennañ eus ar profil",
-  "suggestions.dismiss": "Dismiss suggestion",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Enrollañ ar cheñchamantoù",
+  "subscribed_languages.target": "Cheñch ar yezhoù koumanantet evit {target}",
+  "suggestions.dismiss": "Dilezel damvenegoù",
   "suggestions.header": "Marteze e vefec'h dedenet gant…",
   "tabs_bar.federated_timeline": "Kevredet",
   "tabs_bar.home": "Degemer",
   "tabs_bar.local_timeline": "Lec'hel",
   "tabs_bar.notifications": "Kemennoù",
-  "tabs_bar.search": "Klask",
-  "time_remaining.days": "{number, plural,one {# devezh} other {# a zevezhioù}} a chom",
+  "time_remaining.days": "{number, plural,one {# devezh} other {# a zevezh}} a chom",
   "time_remaining.hours": "{number, plural, one {# eurvezh} other{# eurvezh}} a chom",
-  "time_remaining.minutes": "{number, plural, one {# munut} other{# a vunutoù}} a chom",
-  "time_remaining.moments": "Moments remaining",
+  "time_remaining.minutes": "{number, plural, one {# munut} other{# a vunut}} a chom",
+  "time_remaining.moments": "Pennadoù a-zilerc'h",
   "time_remaining.seconds": "{number, plural, one {# eilenn} other{# eilenn}} a chom",
-  "timeline_hint.remote_resource_not_displayed": "{resource} eus servijerien all n'int ket diskouezet.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} eus servijerien all n'int ket skrammet.",
   "timeline_hint.resources.followers": "Heulier·ezed·ien",
   "timeline_hint.resources.follows": "Heuliañ",
   "timeline_hint.resources.statuses": "Toudoù koshoc'h",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} den} other {{counter} a zud}} a zo o komz",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Kollet e vo ho prell ma kuitit Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Drag & drop to upload",
+  "units.short.billion": "{count}miliard",
+  "units.short.million": "{count}milion",
+  "units.short.thousand": "{count}mil",
+  "upload_area.title": "Tennañ ha leuskel evit pellgargañ",
   "upload_button.label": "Ouzhpennañ ur media",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_error.limit": "Bevenn evit pellgargañ restroù a zo distremenet.",
+  "upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
   "upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
   "upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
-  "upload_form.edit": "Aozañ",
+  "upload_form.description_missing": "Deskrivadur diank",
+  "upload_form.edit": "Kemmañ",
   "upload_form.thumbnail": "Kemmañ ar velvenn",
   "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
   "upload_modal.apply": "Arloañ",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Oc'h arloañ…",
   "upload_modal.choose_image": "Dibab ur skeudenn",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.description_placeholder": "Ul louarn gell mibin a zo o lammat a-zioc'h ar c'hi lezirek",
   "upload_modal.detect_text": "Dinoiñ testenn diouzh ar skeudenn",
   "upload_modal.edit_media": "Embann ar media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.hint": "Klikit pe tennit ar c'helc'h war ar rakwel evit dibab al lerc'h kengreizel a vo gwelet atav war an holl melvennoù.",
+  "upload_modal.preparing_ocr": "Oc'h aozañ OCR…",
   "upload_modal.preview_label": "Rakwel ({ratio})",
   "upload_progress.label": "O pellgargañ...",
+  "upload_progress.processing": "War ober…",
   "video.close": "Serriñ ar video",
   "video.download": "Pellgargañ ar restr",
   "video.exit_fullscreen": "Kuitaat ar mod skramm leun",
-  "video.expand": "Expand video",
+  "video.expand": "Ledanaat ar video",
   "video.fullscreen": "Skramm a-bezh",
   "video.hide": "Kuzhat ar video",
   "video.mute": "Paouez gant ar son",
-  "video.pause": "Pause",
+  "video.pause": "Paouez",
   "video.play": "Lenn",
   "video.unmute": "Lakaat ar son en-dro"
 }
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
new file mode 100644
index 000000000..e3aab78ca
--- /dev/null
+++ b/app/javascript/mastodon/locales/bs.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.open_original_page": "Open original page",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned post",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Reply",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No posts found",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Done",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Getting started",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "About",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 9434dbcc3..46ae984c6 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,78 +1,112 @@
 {
+  "about.blocks": "Servidors moderats",
+  "about.contact": "Contacte:",
+  "about.disclaimer": "Mastodon és programari lliure de codi obert i una marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "No es disposa del motiu",
+  "about.domain_blocks.preamble": "En general, Mastodon permet de veure el contingut i interaccionar amb els usuaris de qualsevol altre servidor del fedivers. Aquestes són les excepcions d'aquest servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Generalment no veuràs perfils ni contingut d'aquest servidor, a menys que el cerquis explícitament o optis per seguir-lo.",
+  "about.domain_blocks.silenced.title": "Limitat",
+  "about.domain_blocks.suspended.explanation": "No es processaran, emmagatzemaran ni intercanviaran dades d'aquest servidor, fent impossible qualsevol interacció o comunicació amb els seus usuaris.",
+  "about.domain_blocks.suspended.title": "Suspès",
+  "about.not_available": "Aquesta informació no és disponible en aquest servidor.",
+  "about.powered_by": "Xarxa social descentralitzada impulsada per {mastodon}",
+  "about.rules": "Normes del servidor",
   "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
+  "account.add_or_remove_from_list": "Afegeix o elimina de les llistes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
-  "account.block": "Bloqueja @{name}",
-  "account.block_domain": "Amaga-ho tot de {domain}",
-  "account.blocked": "Bloquejat",
+  "account.block": "Bloca @{name}",
+  "account.block_domain": "Bloca el domini {domain}",
+  "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Navega més en el perfil original",
-  "account.cancel_follow_request": "Anul·la la sol·licitud de seguiment",
-  "account.direct": "Missatge directe @{name}",
-  "account.disable_notifications": "Deixa de notificar-me els tuts de @{name}",
-  "account.domain_blocked": "Domini ocult",
+  "account.cancel_follow_request": "Retira la sol·licitud de seguiment",
+  "account.direct": "Missatge directe a @{name}",
+  "account.disable_notifications": "No em notifiquis les publicacions de @{name}",
+  "account.domain_blocked": "Domini blocat",
   "account.edit_profile": "Edita el perfil",
-  "account.enable_notifications": "Notifica’m els tuts de @{name}",
-  "account.endorse": "Recomana en el teu perfil",
+  "account.enable_notifications": "Notifica'm les publicacions de @{name}",
+  "account.endorse": "Recomana en el perfil",
+  "account.featured_tags.last_status_at": "Darrera publicació el {date}",
+  "account.featured_tags.last_status_never": "No hi ha publicacions",
+  "account.featured_tags.title": "etiquetes destacades de {name}",
   "account.follow": "Segueix",
   "account.followers": "Seguidors",
-  "account.followers.empty": "Encara ningú no segueix aquest usuari.",
+  "account.followers.empty": "A aquest usuari encara no el segueix ningú.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
-  "account.following_counter": "{count, plural, other {{counter} Seguint}}",
-  "account.follows.empty": "Aquest usuari encara no segueix a ningú.",
+  "account.following": "Seguint",
+  "account.following_counter": "{count, plural, other {Seguint-ne {counter}}}",
+  "account.follows.empty": "Aquest usuari encara no segueix ningú.",
   "account.follows_you": "Et segueix",
+  "account.go_to_profile": "Vés al perfil",
   "account.hide_reblogs": "Amaga els impulsos de @{name}",
-  "account.joined": "Unit des de {date}",
-  "account.last_status": "Darrer actiu",
+  "account.joined_short": "S'hi va unir",
+  "account.languages": "Canvia les llengües subscrites",
   "account.link_verified_on": "La propietat d'aquest enllaç es va verificar el dia {date}",
-  "account.locked_info": "Aquest estat de privadesa del compte està definit com a bloquejat. El propietari revisa manualment qui pot seguir-lo.",
-  "account.media": "Mèdia",
-  "account.mention": "Esmentar @{name}",
-  "account.moved_to": "{name} s'ha mogut a:",
+  "account.locked_info": "L'estat de privadesa del compte està definit com a blocat. El propietari revisa manualment qui pot seguir-lo.",
+  "account.media": "Contingut",
+  "account.mention": "Menciona @{name}",
+  "account.moved_to": "{name} ha indicat que el seu nou compte és:",
   "account.mute": "Silencia @{name}",
-  "account.mute_notifications": "Notificacions desactivades de @{name}",
+  "account.mute_notifications": "Silencia les notificacions de @{name}",
   "account.muted": "Silenciat",
-  "account.never_active": "Mai",
+  "account.open_original_page": "Obre la pàgina original",
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts i respostes",
-  "account.report": "Informar sobre @{name}",
-  "account.requested": "Esperant aprovació. Clic per a cancel·lar la petició de seguiment",
+  "account.report": "Informa sobre @{name}",
+  "account.requested": "S'espera l'aprovació. Clica per a cancel·lar la petició de seguiment",
+  "account.requested_follow": "{name} ha demanat de seguir-te",
   "account.share": "Comparteix el perfil de @{name}",
   "account.show_reblogs": "Mostra els impulsos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
-  "account.unblock": "Desbloqueja @{name}",
-  "account.unblock_domain": "Mostra {domain}",
-  "account.unendorse": "No recomanar en el perfil",
+  "account.statuses_counter": "{count, plural, one {{counter} Publicació} other {{counter} Publicacions}}",
+  "account.unblock": "Desbloca @{name}",
+  "account.unblock_domain": "Desbloca el domini {domain}",
+  "account.unblock_short": "Desbloca",
+  "account.unendorse": "No recomanis en el perfil",
   "account.unfollow": "Deixa de seguir",
-  "account.unmute": "Treure silenci de @{name}",
-  "account.unmute_notifications": "Activar notificacions de @{name}",
-  "account_note.placeholder": "Fes clic per afegir una nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Si us plau torna-ho a provar després de {retry_time, time, medium}.",
+  "account.unmute": "Deixa de silenciar @{name}",
+  "account.unmute_notifications": "Activa les notificacions de @{name}",
+  "account.unmute_short": "Deixa de silenciar",
+  "account_note.placeholder": "Clica per a afegir-hi una nota",
+  "admin.dashboard.daily_retention": "Ràtio de retenció d'usuaris nous per dia, després del registre",
+  "admin.dashboard.monthly_retention": "Ràtio de retenció d'usuaris nous per mes, després del registre",
+  "admin.dashboard.retention.average": "Mitjana",
+  "admin.dashboard.retention.cohort": "Mes de registre",
+  "admin.dashboard.retention.cohort_size": "Usuaris nous",
+  "alert.rate_limited.message": "Si us plau prova-ho després de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Límit de freqüència",
   "alert.unexpected.message": "S'ha produït un error inesperat.",
   "alert.unexpected.title": "Vaja!",
   "announcement.announcement": "Anunci",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(sense processar)",
+  "audio.hide": "Amaga l'àudio",
   "autosuggest_hashtag.per_week": "{count} per setmana",
-  "boost_modal.combo": "Pots prémer {combo} per saltar-te això el proper cop",
-  "bundle_column_error.body": "S'ha produït un error en carregar aquest component.",
+  "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
+  "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
+  "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "Hi ha hagut un error en intentar carregar aquesta pàgina. Podria ser per un problema temporal amb la teva connexió a internet o amb aquest servidor.",
+  "bundle_column_error.network.title": "Error de xarxa",
   "bundle_column_error.retry": "Torna-ho a provar",
-  "bundle_column_error.title": "Error de connexió",
+  "bundle_column_error.return": "Torna a Inici",
+  "bundle_column_error.routing.body": "No es pot trobar la pàgina sol·licitada. Segur que l'URL que has posat és correcta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Tanca",
   "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
   "bundle_modal_error.retry": "Torna-ho a provar",
-  "column.blocks": "Usuaris bloquejats",
+  "closed_registrations.other_server_instructions": "Com que Mastodon és descentralitzat, pots crear un compte en un altre servidor i continuar interactuant amb aquest.",
+  "closed_registrations_modal.description": "No es pot crear un compte a {domain} ara mateix, però tingues en compte que no necessites específicament un compte a {domain} per a usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Troba un altre servidor",
+  "closed_registrations_modal.preamble": "Mastodon és descentralitzat. Per tant, tinguis on tinguis el compte, seràs capaç de seguir i interactuar amb tothom des d'aquest servidor. Fins i tot pots tenir el compte en el teu propi servidor!",
+  "closed_registrations_modal.title": "Registrant-se a Mastodon",
+  "column.about": "Quant a",
+  "column.blocks": "Usuaris blocats",
   "column.bookmarks": "Marcadors",
   "column.community": "Línia de temps local",
   "column.direct": "Missatges directes",
-  "column.directory": "Navega els perfils",
-  "column.domain_blocks": "Dominis ocults",
+  "column.directory": "Navega pels perfils",
+  "column.domain_blocks": "Dominis blocats",
   "column.favourites": "Favorits",
-  "column.follow_requests": "Peticions per seguir-te",
+  "column.follow_requests": "Peticions de seguir-te",
   "column.home": "Inici",
   "column.lists": "Llistes",
   "column.mutes": "Usuaris silenciats",
@@ -85,17 +119,19 @@
   "column_header.moveRight_settings": "Mou la columna cap a la dreta",
   "column_header.pin": "Fixa",
   "column_header.show_settings": "Mostra la configuració",
-  "column_header.unpin": "No fixis",
+  "column_header.unpin": "Desfixa",
   "column_subheading.settings": "Configuració",
   "community.column_settings.local_only": "Només local",
-  "community.column_settings.media_only": "Només multimèdia",
+  "community.column_settings.media_only": "Només contingut",
   "community.column_settings.remote_only": "Només remot",
-  "compose_form.direct_message_warning": "Aquest tut només serà enviat als usuaris esmentats.",
-  "compose_form.direct_message_warning_learn_more": "Aprèn més",
-  "compose_form.hashtag_warning": "Aquesta tut no es mostrarà en cap etiqueta ja que no està llistat. Només els tuts públics poden ser cercats per etiqueta.",
-  "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.",
-  "compose_form.lock_disclaimer.lock": "bloquejat",
-  "compose_form.placeholder": "En què penses?",
+  "compose.language.change": "Canvia d'idioma",
+  "compose.language.search": "Cerca idiomes...",
+  "compose_form.direct_message_warning_learn_more": "Més informació",
+  "compose_form.encryption_warning": "Els tuts a Mastodon no estant xifrats punt a punt. No comparteixis informació sensible mitjançant Mastodon.",
+  "compose_form.hashtag_warning": "Aquest tut no es mostrarà en cap etiqueta, ja que no està llistat. Només els tuts públics es poden cercar per etiqueta.",
+  "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure les publicacions de només per a seguidors.",
+  "compose_form.lock_disclaimer.lock": "blocat",
+  "compose_form.placeholder": "Què et passa pel cap?",
   "compose_form.poll.add_option": "Afegeix una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.option_placeholder": "Opció {number}",
@@ -103,101 +139,139 @@
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
   "compose_form.publish": "Tut",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marcar mèdia com a sensible",
-  "compose_form.sensitive.marked": "Mèdia marcat com a sensible",
-  "compose_form.sensitive.unmarked": "Mèdia no està marcat com a sensible",
-  "compose_form.spoiler.marked": "Text es ocult sota l'avís",
-  "compose_form.spoiler.unmarked": "Text no ocult",
+  "compose_form.publish_form": "Publica",
+  "compose_form.publish_loud": "Tut!",
+  "compose_form.save_changes": "Desa els canvis",
+  "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
+  "compose_form.spoiler.marked": "Elimina l'avís de contingut",
+  "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
   "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
   "confirmation_modal.cancel": "Cancel·la",
-  "confirmations.block.block_and_report": "Bloquejar i informar",
-  "confirmations.block.confirm": "Bloqueja",
-  "confirmations.block.message": "Estàs segur que vols bloquejar a {name}?",
-  "confirmations.delete.confirm": "Suprimeix",
-  "confirmations.delete.message": "Estàs segur que vols suprimir aquest tut?",
-  "confirmations.delete_list.confirm": "Suprimeix",
-  "confirmations.delete_list.message": "Estàs segur que vols suprimir permanentment aquesta llista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Amaga tot el domini",
-  "confirmations.domain_block.message": "Estàs segur, realment segur que vols bloquejar totalment {domain}? En la majoria dels casos bloquejar o silenciar uns pocs objectius és suficient i preferible. No veuràs contingut d’aquest domini en cap de les línies de temps ni en les notificacions. Els teus seguidors d’aquest domini seran eliminats.",
-  "confirmations.logout.confirm": "Tancar sessió",
+  "confirmations.block.block_and_report": "Bloca i informa",
+  "confirmations.block.confirm": "Bloca",
+  "confirmations.block.message": "Segur que vols blocar a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
+  "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
+  "confirmations.delete.confirm": "Elimina",
+  "confirmations.delete.message": "Segur que vols eliminar la publicació?",
+  "confirmations.delete_list.confirm": "Elimina",
+  "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
+  "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.domain_block.confirm": "Bloca el domini sencer",
+  "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
+  "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen però encara els permetrà veure les teves i seguir-te.",
-  "confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
-  "confirmations.redraft.confirm": "Esborrar i refer",
-  "confirmations.redraft.message": "Estàs segur que vols esborrar aquest tut i tornar a redactar-lo? Perdràs tots els impulsos i favorits, i les respostes al tut original es quedaran orfes.",
+  "confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen, però encara els permetrà veure les teves i seguir-te.",
+  "confirmations.mute.message": "Segur que vols silenciar {name}?",
+  "confirmations.redraft.confirm": "Elimina i reescriu-la",
+  "confirmations.redraft.message": "Segur que vols eliminar aquesta publicació i tornar-la a escriure? Es perdran tots els impulsos i els favorits, i les respostes a la publicació original quedaran aïllades.",
   "confirmations.reply.confirm": "Respon",
-  "confirmations.reply.message": "Responen ara es sobreescriurà el missatge que estàs editant. Estàs segur que vols continuar?",
+  "confirmations.reply.message": "Si respons ara, sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
-  "confirmations.unfollow.message": "Estàs segur que vols deixar de seguir {name}?",
+  "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
-  "conversation.open": "Veure conversa",
+  "conversation.open": "Mostra la conversa",
   "conversation.with": "Amb {names}",
+  "copypaste.copied": "Copiat",
+  "copypaste.copy": "Copia",
   "directory.federated": "Del fedivers conegut",
   "directory.local": "Només de {domain}",
   "directory.new_arrivals": "Arribades noves",
   "directory.recently_active": "Recentment actius",
-  "embed.instructions": "Incrusta aquest tut al lloc web copiant el codi a continuació.",
-  "embed.preview": "Aquí tenim quin aspecte tindrà:",
+  "disabled_account_banner.account_settings": "Paràmetres del compte",
+  "disabled_account_banner.text": "El teu compte {disabledAccount} està actualment desactivat.",
+  "dismissable_banner.community_timeline": "Aquestes són les publicacions més recents d'usuaris amb el compte a {domain}.",
+  "dismissable_banner.dismiss": "Ometre",
+  "dismissable_banner.explore_links": "Gent d'aquest i d'altres servidors de la xarxa descentralitzada estan comentant ara mateix aquestes notícies.",
+  "dismissable_banner.explore_statuses": "Aquests tuts d'aquest i altres servidors de la xarxa descentralitzada estan guanyant l'atenció ara mateix en aquest servidor.",
+  "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
+  "dismissable_banner.public_timeline": "Aquestes són els tuts públics més recents de persones en aquest i altres servidors de la xarxa descentralitzada que aquest servidor coneix.",
+  "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
+  "embed.preview": "Aquest aspecte tindrà:",
   "emoji_button.activity": "Activitat",
+  "emoji_button.clear": "Neteja",
   "emoji_button.custom": "Personalitzat",
   "emoji_button.flags": "Banderes",
   "emoji_button.food": "Menjar i beure",
   "emoji_button.label": "Insereix un emoji",
   "emoji_button.nature": "Natura",
-  "emoji_button.not_found": "Emojis no!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "No s'han trobat emojis coincidents",
   "emoji_button.objects": "Objectes",
   "emoji_button.people": "Gent",
-  "emoji_button.recent": "Usats freqüentment",
+  "emoji_button.recent": "Usats sovint",
   "emoji_button.search": "Cerca...",
   "emoji_button.search_results": "Resultats de la cerca",
   "emoji_button.symbols": "Símbols",
-  "emoji_button.travel": "Viatges i Llocs",
+  "emoji_button.travel": "Viatges i llocs",
   "empty_column.account_suspended": "Compte suspès",
   "empty_column.account_timeline": "No hi ha tuts aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
-  "empty_column.blocks": "Encara no has bloquejat cap usuari.",
-  "empty_column.bookmarked_statuses": "Encara no tens marcat cap tut. Quan marquis un apareixerà aquí.",
-  "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per a fer rodar la pilota!",
-  "empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
-  "empty_column.domain_blocks": "Encara no hi ha dominis ocults.",
-  "empty_column.favourited_statuses": "Encara no has marcat com a favorit cap tut. Quan en facis, apareixerà aquí.",
-  "empty_column.favourites": "Ningú no ha marcat aquest tut com a preferit encara. Quan algú ho faci, apareixerà aquí.",
-  "empty_column.follow_recommendations": "Sembla que no es poden generar sugerencies per a tu. Pots provar d'emprar la cerca per a trobar gent que voldries conèixer o explorar les etiquetes en tendència.",
-  "empty_column.follow_requests": "Encara no tens cap petició de seguiment. Quan rebis una, apareixerà aquí.",
+  "empty_column.blocks": "Encara no has blocat cap usuari.",
+  "empty_column.bookmarked_statuses": "Encara no has marcat cap publicació com a preferida. Quan en marquis una, apareixerà aquí.",
+  "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per posar-ho tot en marxa!",
+  "empty_column.direct": "Encara no tens missatges directes. Quan n'enviïs o en rebis un, sortirà aquí.",
+  "empty_column.domain_blocks": "Encara no hi ha dominis blocats.",
+  "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Revisa-ho més tard!",
+  "empty_column.favourited_statuses": "Encara no has afavorit cap tut. Quan ho facis, apareixerà aquí.",
+  "empty_column.favourites": "Encara no ha marcat ningú aquesta publicació com a preferida. Quan ho faci algú apareixerà aquí.",
+  "empty_column.follow_recommendations": "Sembla que no s'han pogut generar suggeriments per a tu. Pots provar d'usar la cerca per trobar persones que vulguis conèixer o explorar les etiquetes en tendència.",
+  "empty_column.follow_requests": "Encara no tens cap petició de seguiment. Quan en rebis una, apareixerà aquí.",
   "empty_column.hashtag": "Encara no hi ha res en aquesta etiqueta.",
-  "empty_column.home": "Encara no segueixes ningú. Visita {public} o fes cerca per començar i conèixer altres usuaris.",
-  "empty_column.home.suggestions": "Mira algunes sugerencies",
-  "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin nous tuts, apareixeran aquí.",
+  "empty_column.home": "La teva línia de temps és buida! Segueix més gent per a emplenar-la. {suggestions}",
+  "empty_column.home.suggestions": "Mostra alguns suggeriments",
+  "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
   "empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
   "empty_column.mutes": "Encara no has silenciat cap usuari.",
-  "empty_column.notifications": "Encara no tens notificacions. Interactua amb altres per iniciar la conversa.",
-  "empty_column.public": "No hi ha res aquí! Escriu públicament alguna cosa o manualment segueix usuaris d'altres servidors per omplir-ho",
-  "error.unexpected_crash.explanation": "A causa d'un bug en el nostre codi o un problema de compatibilitat del navegador, aquesta pàgina podria no ser mostrada correctament.",
-  "error.unexpected_crash.explanation_addons": "Aquesta pàgina podria no mostrar-se correctament. Aquest error és possiblement causat per una extensió del navegador o per eienes automàtiques de traducció.",
-  "error.unexpected_crash.next_steps": "Prova recarregant la pàgina. Si això no ajuda, encara podries ser capaç d'utilitzar Mastodon a través d'un navegador diferent o amb una aplicació nativa.",
-  "error.unexpected_crash.next_steps_addons": "Prova de desactivar-les i refrescant la pàgina. Si això no ajuda, encara pots ser capaç d’utilitzar Mastodon amb un altre navegador o aplicació nativa.",
-  "errors.unexpected_crash.copy_stacktrace": "Còpia stacktrace al porta-retalls",
+  "empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
+  "empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
+  "error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
+  "error.unexpected_crash.explanation_addons": "Aquesta pàgina no s'ha pogut mostrar correctament. És probable que aquest error sigui causat per un complement del navegador o per eines de traducció automàtica.",
+  "error.unexpected_crash.next_steps": "Prova d'actualitzar la pàgina. Si això no serveix, és possible que encara puguis fer servir Mastodon a través d'un navegador diferent o amb una aplicació nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prova de desactivar-los i actualitza la pàgina. Si això no serveix, és possible que encara puguis fer servir Mastodon amb un altre navegador o una aplicació nativa.",
+  "errors.unexpected_crash.copy_stacktrace": "Copia stacktrace al porta-retalls",
   "errors.unexpected_crash.report_issue": "Informa d'un problema",
+  "explore.search_results": "Resultats de la cerca",
+  "explore.suggested_follows": "Per a tu",
+  "explore.title": "Explora",
+  "explore.trending_links": "Notícies",
+  "explore.trending_statuses": "Tuts",
+  "explore.trending_tags": "Etiquetes",
+  "filter_modal.added.context_mismatch_explanation": "Aquesta categoria de filtre no s'aplica al context en què has accedit a aquesta publicació. Si també vols que la publicació es filtri en aquest context, hauràs d'editar el filtre.",
+  "filter_modal.added.context_mismatch_title": "El context no coincideix!",
+  "filter_modal.added.expired_explanation": "La categoria d'aquest filtre ha caducat, necessitaràs canviar la seva data de caducitat per a aplicar-la.",
+  "filter_modal.added.expired_title": "Filtre caducat!",
+  "filter_modal.added.review_and_configure": "Per a revisar i configurar aquesta categoria de filtre, ves a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Configuració del filtre",
+  "filter_modal.added.settings_link": "pàgina de configuració",
+  "filter_modal.added.short_explanation": "Aquesta publicació s'ha afegit a la següent categoria de filtre: {title}.",
+  "filter_modal.added.title": "Filtre afegit!",
+  "filter_modal.select_filter.context_mismatch": "no aplica en aquest context",
+  "filter_modal.select_filter.expired": "caducat",
+  "filter_modal.select_filter.prompt_new": "Nova categoria: {name}",
+  "filter_modal.select_filter.search": "Cerca o crea",
+  "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
+  "filter_modal.select_filter.title": "Filtra aquesta publicació",
+  "filter_modal.title.status": "Filtra un tut",
   "follow_recommendations.done": "Fet",
   "follow_recommendations.heading": "Segueix a la gent de la que t'agradaria veure els seus tuts! Aquí hi ha algunes recomanacions.",
-  "follow_recommendations.lead": "Els tuts del usuaris que segueixes es mostraran en ordre cronològic en la teva línia de temps Inici. No tinguis por en cometre errors, pots fàcilment deixar de seguir-los en qualsevol moment!",
-  "follow_request.authorize": "Autoritzar",
-  "follow_request.reject": "Rebutjar",
-  "follow_requests.unlocked_explanation": "Tot i que el teu compte no està bloquejat, el personal de {domain} ha pensat que és possible que vulguis revisar les sol·licituds de seguiment d’aquests comptes de forma manual.",
-  "generic.saved": "Guardat",
-  "getting_started.developers": "Desenvolupadors",
-  "getting_started.directory": "Directori de perfils",
-  "getting_started.documentation": "Documentació",
-  "getting_started.heading": "Començant",
-  "getting_started.invite": "Convida gent",
-  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir-hi o informar de problemes a GitHub a {github}.",
-  "getting_started.security": "Seguretat",
-  "getting_started.terms": "Termes del servei",
+  "follow_recommendations.lead": "Les publicacions dels usuaris que segueixes es mostraran en ordre cronològic en la teva línia de temps d'Inici. No tinguis por de cometre errors, pots deixar de seguir-los en qualsevol moment!",
+  "follow_request.authorize": "Autoritza",
+  "follow_request.reject": "Rebutja",
+  "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
+  "footer.about": "Quant a",
+  "footer.directory": "Directori de perfils",
+  "footer.get_app": "Aconsegueix l'app",
+  "footer.invite": "Convida persones",
+  "footer.keyboard_shortcuts": "Dreceres de teclat",
+  "footer.privacy_policy": "Política de privadesa",
+  "footer.source_code": "Mostra el codi font",
+  "generic.saved": "Desat",
+  "getting_started.heading": "Primeres passes",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sense {additional}",
@@ -207,125 +281,150 @@
   "hashtag.column_settings.tag_mode.any": "Qualsevol d’aquests",
   "hashtag.column_settings.tag_mode.none": "Cap d’aquests",
   "hashtag.column_settings.tag_toggle": "Inclou etiquetes addicionals per a aquesta columna",
+  "hashtag.follow": "Segueix l'etiqueta",
+  "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",
   "home.show_announcements": "Mostra els anuncis",
+  "interaction_modal.description.favourite": "Amb un compte a Mastodon pots afavorir aquesta publicació, que l'autor sàpiga que t'ha agradat i desar-la per a més endavant.",
+  "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre les seves publicacions en la teva línia de temps d'Inici.",
+  "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquesta publicació per a compartir-la amb els teus seguidors.",
+  "interaction_modal.description.reply": "Amb un compte a Mastodon, pots respondre aquest tut.",
+  "interaction_modal.on_another_server": "En un servidor diferent",
+  "interaction_modal.on_this_server": "En aquest servidor",
+  "interaction_modal.other_server_instructions": "Copia i enganxa aquesta URL en el camp de cerca de la teva aplicació Mastodon preferida o en l'interfície web del teu servidor Mastodon.",
+  "interaction_modal.preamble": "Com que Mastodon és descentralitzat, pots fer servir el teu compte existent en un altre servidor Mastodon o plataforma compatible si no tens compte en aquest.",
+  "interaction_modal.title.favourite": "Marca el tut de {name}",
+  "interaction_modal.title.follow": "Segueix {name}",
+  "interaction_modal.title.reblog": "Impulsa la publicació de {name}",
+  "interaction_modal.title.reply": "Respon a la publicació de {name}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
-  "keyboard_shortcuts.back": "navegar enrere",
-  "keyboard_shortcuts.blocked": "per obrir la llista d'usuaris bloquejats",
-  "keyboard_shortcuts.boost": "impulsar",
-  "keyboard_shortcuts.column": "per a centrar un tut en una de les columnes",
-  "keyboard_shortcuts.compose": "per centrar l'àrea de composició de text",
+  "keyboard_shortcuts.back": "Vés enrere",
+  "keyboard_shortcuts.blocked": "Obre la llista d'usuaris blocats",
+  "keyboard_shortcuts.boost": "Impulsa el tut",
+  "keyboard_shortcuts.column": "Centra la columna",
+  "keyboard_shortcuts.compose": "Centra l'àrea de composició de text",
   "keyboard_shortcuts.description": "Descripció",
-  "keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
-  "keyboard_shortcuts.down": "per baixar en la llista",
-  "keyboard_shortcuts.enter": "per a obrir el tut",
-  "keyboard_shortcuts.favourite": "afavorir",
-  "keyboard_shortcuts.favourites": "per obrir la llista de favorits",
-  "keyboard_shortcuts.federated": "per obrir la línia de temps federada",
+  "keyboard_shortcuts.direct": "per a obrir la columna de missatges directes",
+  "keyboard_shortcuts.down": "Abaixa a la llista",
+  "keyboard_shortcuts.enter": "Obre la publicació",
+  "keyboard_shortcuts.favourite": "Afavoreix la publicació",
+  "keyboard_shortcuts.favourites": "Obre la llista de favorits",
+  "keyboard_shortcuts.federated": "Obre la línia de temps federada",
   "keyboard_shortcuts.heading": "Dreceres de teclat",
-  "keyboard_shortcuts.home": "per a obrir la línia de temps Inici",
+  "keyboard_shortcuts.home": "Obre la línia de temps de l'Inici",
   "keyboard_shortcuts.hotkey": "Tecla d'accés directe",
-  "keyboard_shortcuts.legend": "per a mostrar aquesta llegenda",
-  "keyboard_shortcuts.local": "per a obrir la línia de temps local",
-  "keyboard_shortcuts.mention": "per a esmentar l'autor",
-  "keyboard_shortcuts.muted": "per a obrir la llista d'usuaris silenciats",
-  "keyboard_shortcuts.my_profile": "per a obrir el teu perfil",
-  "keyboard_shortcuts.notifications": "per a obrir la columna de notificacions",
-  "keyboard_shortcuts.open_media": "obrir mèdia",
-  "keyboard_shortcuts.pinned": "per a obrir la llista de tuts fixats",
-  "keyboard_shortcuts.profile": "per a obrir el perfil de l'autor",
-  "keyboard_shortcuts.reply": "respondre",
-  "keyboard_shortcuts.requests": "per a obrir la llista de sol·licituds de seguiment",
-  "keyboard_shortcuts.search": "per a centrar la cerca",
-  "keyboard_shortcuts.spoilers": "mostrar/amagar el camp CW",
-  "keyboard_shortcuts.start": "per a obrir la columna \"Començar\"",
-  "keyboard_shortcuts.toggle_hidden": "per a mostrar o amagar text sota CW",
-  "keyboard_shortcuts.toggle_sensitivity": "per a mostrar o amagar contingut multimèdia",
-  "keyboard_shortcuts.toot": "per a començar un tut nou de trinca",
-  "keyboard_shortcuts.unfocus": "descentrar l'àrea de composició de text/cerca",
-  "keyboard_shortcuts.up": "moure amunt en la llista",
-  "lightbox.close": "Tancar",
-  "lightbox.compress": "Quadre de visualització d’imatge comprimida",
-  "lightbox.expand": "Amplia el quadre de visualització de l’imatge",
+  "keyboard_shortcuts.legend": "Mostra aquesta llegenda",
+  "keyboard_shortcuts.local": "Obre la línia de temps local",
+  "keyboard_shortcuts.mention": "Esmenta l'autor",
+  "keyboard_shortcuts.muted": "Obre la llista d'usuaris silenciats",
+  "keyboard_shortcuts.my_profile": "Obre el teu perfil",
+  "keyboard_shortcuts.notifications": "Obre la columna de notificacions",
+  "keyboard_shortcuts.open_media": "Obre mèdia",
+  "keyboard_shortcuts.pinned": "Obre la llista de tuts fixats",
+  "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
+  "keyboard_shortcuts.reply": "Respon al tut",
+  "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
+  "keyboard_shortcuts.search": "Centra la barra de cerca",
+  "keyboard_shortcuts.spoilers": "Mostra/amaga el camp CW",
+  "keyboard_shortcuts.start": "Obre la columna \"Primeres passes\"",
+  "keyboard_shortcuts.toggle_hidden": "Mostra/amaga el text marcat com a sensible",
+  "keyboard_shortcuts.toggle_sensitivity": "Mostra/amaga contingut",
+  "keyboard_shortcuts.toot": "Inicia una nova publicació",
+  "keyboard_shortcuts.unfocus": "Descentra l'àrea de composició de text/cerca",
+  "keyboard_shortcuts.up": "Apuja a la llista",
+  "lightbox.close": "Tanca",
+  "lightbox.compress": "Comprimeix el quadre de visualització d’imatge",
+  "lightbox.expand": "Amplia el quadre de visualització d’imatge",
   "lightbox.next": "Següent",
   "lightbox.previous": "Anterior",
-  "lists.account.add": "Afegir a la llista",
-  "lists.account.remove": "Treure de la llista",
-  "lists.delete": "Esborrar llista",
-  "lists.edit": "Editar llista",
-  "lists.edit.submit": "Canvi de títol",
-  "lists.new.create": "Afegir llista",
-  "lists.new.title_placeholder": "Nova llista",
-  "lists.replies_policy.followed": "Qualsevol usuari seguit",
+  "limited_account_hint.action": "Mostra el perfil de totes maneres",
+  "limited_account_hint.title": "Aquest perfil ha estat amagat pels moderadors de {domain}.",
+  "lists.account.add": "Afegeix a la llista",
+  "lists.account.remove": "Elimina de la llista",
+  "lists.delete": "Elimina la llista",
+  "lists.edit": "Edita la llista",
+  "lists.edit.submit": "Canvia el títol",
+  "lists.new.create": "Afegeix una llista",
+  "lists.new.title_placeholder": "Nou títol de la llista",
+  "lists.replies_policy.followed": "Qualsevol usuari que segueixis",
   "lists.replies_policy.list": "Membres de la llista",
   "lists.replies_policy.none": "Ningú",
   "lists.replies_policy.title": "Mostra respostes a:",
-  "lists.search": "Cercar entre les persones que segueixes",
+  "lists.search": "Cerca entre les persones que segueixes",
   "lists.subheading": "Les teves llistes",
   "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
-  "loading_indicator.label": "Carregant...",
-  "media_gallery.toggle_visible": "Alternar visibilitat",
-  "missing_indicator.label": "No trobat",
-  "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
+  "loading_indicator.label": "Es carrega...",
+  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
+  "missing_indicator.label": "No s'ha trobat",
+  "missing_indicator.sublabel": "Aquest recurs no s'ha trobat",
+  "moved_to_account_banner.text": "El teu compte {disabledAccount} està actualment desactivat perquè l'has traslladat a {movedToAccount}.",
   "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
+  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
   "mute_modal.indefinite": "Indefinit",
-  "navigation_bar.apps": "Apps mòbils",
-  "navigation_bar.blocks": "Usuaris bloquejats",
+  "navigation_bar.about": "Quant a",
+  "navigation_bar.blocks": "Usuaris blocats",
   "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Línia de temps Local",
-  "navigation_bar.compose": "Redacta un nou tut",
+  "navigation_bar.community_timeline": "Línia de temps local",
+  "navigation_bar.compose": "Redacta una nova publicació",
   "navigation_bar.direct": "Missatges directes",
   "navigation_bar.discover": "Descobreix",
-  "navigation_bar.domain_blocks": "Dominis ocults",
-  "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.domain_blocks": "Dominis blocats",
+  "navigation_bar.edit_profile": "Edita el perfil",
+  "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Preferits",
   "navigation_bar.filters": "Paraules silenciades",
   "navigation_bar.follow_requests": "Sol·licituds de seguiment",
-  "navigation_bar.follows_and_followers": "Seguits i seguidors",
-  "navigation_bar.info": "Sobre aquest servidor",
-  "navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
+  "navigation_bar.follows_and_followers": "Seguint i seguidors",
   "navigation_bar.lists": "Llistes",
-  "navigation_bar.logout": "Tancar sessió",
+  "navigation_bar.logout": "Tanca la sessió",
   "navigation_bar.mutes": "Usuaris silenciats",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Tuts fixats",
   "navigation_bar.preferences": "Preferències",
   "navigation_bar.public_timeline": "Línia de temps federada",
+  "navigation_bar.search": "Cerca",
   "navigation_bar.security": "Seguretat",
-  "notification.favourite": "{name} ha afavorit el teu estat",
+  "not_signed_in_indicator.not_signed_in": "Necessites iniciar la sessió per a accedir aquest recurs.",
+  "notification.admin.report": "{name} ha reportat {target}",
+  "notification.admin.sign_up": "{name} s'ha registrat",
+  "notification.favourite": "a {name} li ha agradat el teu tut",
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat seguir-te",
-  "notification.mention": "{name} t'ha esmentat",
+  "notification.mention": "{name} t'ha mencionat",
   "notification.own_poll": "La teva enquesta ha finalitzat",
-  "notification.poll": "Ha finalitzat una enquesta en la que has votat",
-  "notification.reblog": "{name} ha impulsat el teu estat",
-  "notification.status": "ha publicat {name}",
-  "notifications.clear": "Netejar notificacions",
-  "notifications.clear_confirmation": "Estàs segur que vols esborrar permanentment totes les teves notificacions?",
+  "notification.poll": "Ha finalitzat una enquesta en què has votat",
+  "notification.reblog": "{name} t'ha impulsat",
+  "notification.status": "{name} acaba de publicar",
+  "notification.update": "{name} ha editat una publicació",
+  "notifications.clear": "Esborra les notificacions",
+  "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
+  "notifications.column_settings.admin.report": "Nous informes:",
+  "notifications.column_settings.admin.sign_up": "Nous registres:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
-  "notifications.column_settings.favourite": "Preferits:",
+  "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
-  "notifications.column_settings.filter_bar.show": "Mostra",
+  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
-  "notifications.column_settings.follow_request": "Nova sol·licitud de seguiment:",
+  "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",
   "notifications.column_settings.reblog": "Impulsos:",
-  "notifications.column_settings.show": "Mostra en la columna",
-  "notifications.column_settings.sound": "Reproduir so",
-  "notifications.column_settings.status": "Nous tuts:",
-  "notifications.column_settings.unread_markers.category": "Marcadors de notificacions no llegides",
-  "notifications.filter.all": "Tots",
+  "notifications.column_settings.show": "Mostra a la columna",
+  "notifications.column_settings.sound": "Reprodueix so",
+  "notifications.column_settings.status": "Noves publicacions:",
+  "notifications.column_settings.unread_notifications.category": "Notificacions no llegides",
+  "notifications.column_settings.unread_notifications.highlight": "Destaca les notificacions no llegides",
+  "notifications.column_settings.update": "Edicions:",
+  "notifications.filter.all": "Totes",
   "notifications.filter.boosts": "Impulsos",
-  "notifications.filter.favourites": "Favorits",
+  "notifications.filter.favourites": "Preferides",
   "notifications.filter.follows": "Seguiments",
   "notifications.filter.mentions": "Mencions",
   "notifications.filter.polls": "Resultats de l'enquesta",
@@ -333,12 +432,12 @@
   "notifications.grant_permission": "Concedir permís.",
   "notifications.group": "{count} notificacions",
   "notifications.mark_as_read": "Marca cada notificació com a llegida",
-  "notifications.permission_denied": "No s’ha pogut activar les notificacions d’escriptori perquè s’ha denegat el permís.",
-  "notifications.permission_denied_alert": "No es poden activar les notificacions del escriptori perquè el permís del navegador ha estat denegat abans",
+  "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
+  "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè el permís del navegador ha estat denegat abans",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
-  "notifications_permission_banner.enable": "Activar les notificacions d’escriptori",
-  "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no està obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
-  "notifications_permission_banner.title": "Mai et perdis res",
+  "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
+  "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
+  "notifications_permission_banner.title": "No et perdis mai res",
   "picture_in_picture.restore": "Retorna’l",
   "poll.closed": "Finalitzada",
   "poll.refresh": "Actualitza",
@@ -346,139 +445,210 @@
   "poll.total_votes": "{count, plural, one {# vot} other {# vots}}",
   "poll.vote": "Vota",
   "poll.voted": "Vas votar per aquesta resposta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# vot} other {# vots}}",
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
-  "privacy.change": "Ajusta l'estat de privacitat",
-  "privacy.direct.long": "Publicar només per als usuaris esmentats",
-  "privacy.direct.short": "Directe",
-  "privacy.private.long": "Publicar només a seguidors",
+  "privacy.change": "Canvia la privacitat de la publicació",
+  "privacy.direct.long": "Visible només per als usuaris esmentats",
+  "privacy.direct.short": "Només gent mencionada",
+  "privacy.private.long": "Visible només per als seguidors",
   "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Publicar en línies de temps públiques",
-  "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "No publicar en línies de temps públiques",
-  "privacy.unlisted.short": "No llistat",
+  "privacy.public.long": "Visible per a tothom",
+  "privacy.public.short": "Pública",
+  "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
+  "privacy.unlisted.short": "No llistada",
+  "privacy_policy.last_updated": "Darrera actualització {date}",
+  "privacy_policy.title": "Política de Privacitat",
   "refresh": "Actualitza",
-  "regeneration_indicator.label": "Carregant…",
-  "regeneration_indicator.sublabel": "S'està preparant la línia de temps Inici!",
-  "relative_time.days": "fa {number} dies",
-  "relative_time.hours": "fa {number} hores",
+  "regeneration_indicator.label": "Es carrega…",
+  "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
+  "relative_time.days": "{number} d",
+  "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
+  "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",
+  "relative_time.full.just_now": "ara mateix",
+  "relative_time.full.minutes": "fa {number, plural, one {# minut} other {# minuts}}",
+  "relative_time.full.seconds": "fa {number, plural, one {# segon} other {# segons}}",
+  "relative_time.hours": "{number} h",
   "relative_time.just_now": "ara",
-  "relative_time.minutes": "fa {number} minuts",
-  "relative_time.seconds": "fa {number} segons",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} s",
   "relative_time.today": "avui",
-  "reply_indicator.cancel": "Cancel·lar",
+  "reply_indicator.cancel": "Cancel·la",
+  "report.block": "Bloca",
+  "report.block_explanation": "No veuràs les seves publicacions. Ell no podran veure les teves ni seguir-te. Podran saber que estan blocats.",
+  "report.categories.other": "Altres",
+  "report.categories.spam": "Brossa",
+  "report.categories.violation": "El contingut viola una o més regles del servidor",
+  "report.category.subtitle": "Tria la millor coincidència",
+  "report.category.title": "Explica'ns què passa amb això ({type})",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "tut",
+  "report.close": "Fet",
+  "report.comment.title": "Hi ha res més que creguis que hauríem de saber?",
   "report.forward": "Reenvia a {target}",
-  "report.forward_hint": "Aquest compte és d'un altre servidor. Enviar-hi també una copia anònima del informe?",
-  "report.hint": "El informe s'enviarà als moderadors del teu servidor. Pots explicar perquè vols informar d'aquest compte aquí:",
+  "report.forward_hint": "El compte és d'un altre servidor. Vols enviar-hi també una còpia anònima de l'informe?",
+  "report.mute": "Silencia",
+  "report.mute_explanation": "No veuràs les seves publicacions. Encara pot seguir-te i veure les teves publicacions, però no sabrà que ha estat silenciat.",
+  "report.next": "Següent",
   "report.placeholder": "Comentaris addicionals",
-  "report.submit": "Enviar",
-  "report.target": "Informes {target}",
-  "search.placeholder": "Cercar",
+  "report.reasons.dislike": "No m'agrada",
+  "report.reasons.dislike_description": "No és res que vulguis veure",
+  "report.reasons.other": "És una altra cosa",
+  "report.reasons.other_description": "El problema no encaixa a les altres categories",
+  "report.reasons.spam": "És contingut brossa",
+  "report.reasons.spam_description": "Enllaços maliciosos, implicació falsa o respostes repetitives",
+  "report.reasons.violation": "Viola les regles del servidor",
+  "report.reasons.violation_description": "Ets conscient que trenca regles especifiques",
+  "report.rules.subtitle": "Selecciona totes les aplicables",
+  "report.rules.title": "Quines regles s'han violat?",
+  "report.statuses.subtitle": "Selecciona totes les aplicables",
+  "report.statuses.title": "Hi ha cap tut que doni suport a aquest informe?",
+  "report.submit": "Envia",
+  "report.target": "Es reporta {target}",
+  "report.thanks.take_action": "Aquestes són les teves opcions per a controlar el que veus a Mastodon:",
+  "report.thanks.take_action_actionable": "Mentre ho revisem, pots prendre mesures contra @{name}:",
+  "report.thanks.title": "No ho vols veure?",
+  "report.thanks.title_actionable": "Gràcies per informar, ho investigarem.",
+  "report.unfollow": "Deixa de seguir @{name}",
+  "report.unfollow_explanation": "Segueixes aquest compte. Per no veure les seves publicacions a la teva línia de temps d'Inici deixa de seguir-lo.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} tut} other {{count} tuts}} adjunts",
+  "report_notification.categories.other": "Altres",
+  "report_notification.categories.spam": "Brossa",
+  "report_notification.categories.violation": "Violació de norma",
+  "report_notification.open": "Obre un informe",
+  "search.placeholder": "Cerca",
+  "search.search_or_paste": "Cerca o escriu l'URL",
   "search_popout.search_format": "Format de cerca avançada",
-  "search_popout.tips.full_text": "Text simple recupera publicacions que has escrit, les marcades com a preferides, les impulsades o en les que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
+  "search_popout.tips.full_text": "Text simple recupera tuts que has escrit, els marcats com a favorits, els impulsats o en els que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
   "search_popout.tips.hashtag": "etiqueta",
   "search_popout.tips.status": "tut",
-  "search_popout.tips.text": "El text simple retorna coincidències amb els noms de visualització, els noms d'usuari i les etiquetes",
+  "search_popout.tips.text": "El text simple recupera coincidències amb els usuaris, els noms d'usuari i les etiquetes",
   "search_popout.tips.user": "usuari",
   "search_results.accounts": "Gent",
+  "search_results.all": "Tots",
   "search_results.hashtags": "Etiquetes",
+  "search_results.nothing_found": "No s'ha pogut trobar res per a aquests termes de cerca",
   "search_results.statuses": "Tuts",
   "search_results.statuses_fts_disabled": "La cerca de tuts pel seu contingut no està habilitada en aquest servidor Mastodon.",
+  "search_results.title": "Cerca de {q}",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
-  "status.admin_account": "Obre l'interfície de moderació per a @{name}",
-  "status.admin_status": "Obre aquest tut a la interfície de moderació",
-  "status.block": "Bloqueja @{name}",
-  "status.bookmark": "Marcador",
-  "status.cancel_reblog_private": "Desfer l'impuls",
-  "status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
-  "status.copy": "Copia l'enllaç a l'estat",
-  "status.delete": "Esborrar",
-  "status.detailed_status": "Visualització detallada de la conversa",
-  "status.direct": "Missatge directe @{name}",
-  "status.embed": "Incrustar",
+  "server_banner.about_active_users": "Gent que ha fet servir aquest servidor en els darrers 30 dies (Usuaris Actius Mensuals)",
+  "server_banner.active_users": "usuaris actius",
+  "server_banner.administered_by": "Administrat per:",
+  "server_banner.introduction": "{domain} és part de la xarxa social descentralitzada, potenciat per {mastodon}.",
+  "server_banner.learn_more": "Més informació",
+  "server_banner.server_stats": "Estadístiques del servidor:",
+  "sign_in_banner.create_account": "Crea un compte",
+  "sign_in_banner.sign_in": "Inicia sessió",
+  "sign_in_banner.text": "Inicia la sessió per seguir perfils o etiquetes, afavorir, compartir i respondre a publicacions o interactuar des del teu compte en un servidor diferent.",
+  "status.admin_account": "Obre la interfície de moderació per a @{name}",
+  "status.admin_status": "Obrir aquest tut a la interfície de moderació",
+  "status.block": "Bloca @{name}",
+  "status.bookmark": "Marca",
+  "status.cancel_reblog_private": "Desfés l'impuls",
+  "status.cannot_reblog": "No es pot impulsar aquest tut",
+  "status.copy": "Copia l'enllaç al tut",
+  "status.delete": "Elimina",
+  "status.detailed_status": "Vista detallada de la conversa",
+  "status.direct": "Missatge directe a @{name}",
+  "status.edit": "Edita",
+  "status.edited": "Editat {date}",
+  "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
+  "status.embed": "Incrusta",
   "status.favourite": "Favorit",
-  "status.filtered": "Filtrat",
-  "status.load_more": "Carrega més",
-  "status.media_hidden": "Multimèdia amagat",
-  "status.mention": "Esmentar @{name}",
+  "status.filter": "Filtra aquest tut",
+  "status.filtered": "Filtrada",
+  "status.hide": "Amaga el tut",
+  "status.history.created": "creat per {name} {date}",
+  "status.history.edited": "editat per {name} {date}",
+  "status.load_more": "Carrega'n més",
+  "status.media_hidden": "Contingut amagat",
+  "status.mention": "Esmenta @{name}",
   "status.more": "Més",
-  "status.mute": "Silenciar @{name}",
-  "status.mute_conversation": "Silenciar conversació",
-  "status.open": "Ampliar aquest estat",
-  "status.pin": "Fixat en el perfil",
+  "status.mute": "Silencia @{name}",
+  "status.mute_conversation": "Silencia la conversa",
+  "status.open": "Amplia el tut",
+  "status.pin": "Fixa en el perfil",
   "status.pinned": "Tut fixat",
-  "status.read_more": "Llegir més",
-  "status.reblog": "Impuls",
-  "status.reblog_private": "Impulsar a l'audiència original",
-  "status.reblogged_by": "{name} ha impulsat",
-  "status.reblogs.empty": "Encara ningú no ha impulsat aquest tut. Quan algú ho faci, apareixeran aquí.",
-  "status.redraft": "Esborrar i reescriure",
-  "status.remove_bookmark": "Suprimeix el marcador",
-  "status.reply": "Respondre",
-  "status.replyAll": "Respondre al tema",
-  "status.report": "Informar sobre @{name}",
+  "status.read_more": "Més informació",
+  "status.reblog": "Impulsa",
+  "status.reblog_private": "Impulsa amb la visibilitat original",
+  "status.reblogged_by": "impulsat per {name}",
+  "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
+  "status.redraft": "Elimina i reescriu-la",
+  "status.remove_bookmark": "Elimina el marcador",
+  "status.replied_to": "En resposta a {name}",
+  "status.reply": "Respon",
+  "status.replyAll": "Respon al fil",
+  "status.report": "Denuncia @{name}",
   "status.sensitive_warning": "Contingut sensible",
-  "status.share": "Compartir",
-  "status.show_less": "Mostra menys",
-  "status.show_less_all": "Mostra menys per a tot",
-  "status.show_more": "Mostra més",
-  "status.show_more_all": "Mostra més per a tot",
-  "status.show_thread": "Mostra el fil",
+  "status.share": "Comparteix",
+  "status.show_filter_reason": "Mostra igualment",
+  "status.show_less": "Mostra'n menys",
+  "status.show_less_all": "Mostra'n menys per a tot",
+  "status.show_more": "Mostra'n més",
+  "status.show_more_all": "Mostra'n més per a tot",
+  "status.show_original": "Mostra l'original",
+  "status.translate": "Tradueix",
+  "status.translated_from_with": "Traduït del {lang} fent servir {provider}",
   "status.uncached_media_warning": "No està disponible",
-  "status.unmute_conversation": "Activar conversació",
-  "status.unpin": "Deslliga del perfil",
-  "suggestions.dismiss": "Descartar suggeriment",
-  "suggestions.header": "És possible que estiguis interessat en…",
-  "tabs_bar.federated_timeline": "Federada",
+  "status.unmute_conversation": "Deixa de silenciar la conversa",
+  "status.unpin": "Desfixa del perfil",
+  "subscribed_languages.lead": "Només els tuts en les llengües seleccionades apareixeran en les teves línies de temps \"Inici\" i \"Llistes\" després del canvi. No en seleccionis cap per a rebre tuts en totes les llengües.",
+  "subscribed_languages.save": "Desa els canvis",
+  "subscribed_languages.target": "Canvia les llengües subscrites per a {target}",
+  "suggestions.dismiss": "Ignora el suggeriment",
+  "suggestions.header": "És possible que t'interessi…",
+  "tabs_bar.federated_timeline": "Federat",
   "tabs_bar.home": "Inici",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificacions",
-  "tabs_bar.search": "Cerca",
-  "time_remaining.days": "{number, plural, one {# dia} other {# dies}} restants",
-  "time_remaining.hours": "{number, plural, one {# hora} other {# hores}} restants",
-  "time_remaining.minutes": "{number, plural, one {# minut} other {# minuts}} restants",
+  "time_remaining.days": "{number, plural, one {# dia restant} other {# dies restants}}",
+  "time_remaining.hours": "{number, plural, one {# hora restant} other {# hores restants}}",
+  "time_remaining.minutes": "{number, plural, one {# minut restant} other {# minuts restants}}",
   "time_remaining.moments": "Moments restants",
-  "time_remaining.seconds": "{number, plural, one {# segon} other {# segons}} restants",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dels altres servidors no son mostrats.",
+  "time_remaining.seconds": "{number, plural, one {# segon restant} other {# segons restants}}",
+  "timeline_hint.remote_resource_not_displayed": "No es mostren {resource} d'altres servidors.",
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Seguiments",
   "timeline_hint.resources.statuses": "Tuts més antics",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} parlant-hi",
-  "trends.trending_now": "Ara en tendència",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} en {days, plural, one {el passat dia} other {els passats {days} dies}}",
+  "trends.trending_now": "És tendència",
   "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Arrossega i deixa anar per a carregar",
-  "upload_button.label": "Afegir multimèdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Afegeix imatges, un vídeo o un fitxer d'àudio",
   "upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
-  "upload_error.poll": "No es permet l'enviament de fitxers en les enquestes.",
-  "upload_form.audio_description": "Descriviu per a les persones amb pèrdua auditiva",
-  "upload_form.description": "Descriure els problemes visuals",
+  "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
+  "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
+  "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
+  "upload_form.description_missing": "No s'hi ha afegit cap descripció",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Canvia la miniatura",
-  "upload_form.undo": "Esborra",
-  "upload_form.video_description": "Descriu per a les persones amb pèrdua auditiva o deficiència visual",
-  "upload_modal.analyzing_picture": "Analitzant imatge…",
+  "upload_form.undo": "Elimina",
+  "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
+  "upload_modal.analyzing_picture": "S'analitza la imatge…",
   "upload_modal.apply": "Aplica",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Tria imatge",
-  "upload_modal.description_placeholder": "Jove xef, porti whisky amb quinze glaçons d’hidrogen, coi!",
-  "upload_modal.detect_text": "Detecta el text de l'imatge",
-  "upload_modal.edit_media": "Editar multimèdia",
-  "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualització per escollir el punt focal que sempre serà visible de totes les miniatures.",
-  "upload_modal.preparing_ocr": "Preparant OCR…",
+  "upload_modal.applying": "S'aplica…",
+  "upload_modal.choose_image": "Tria la imatge",
+  "upload_modal.description_placeholder": "Setze jutges d'un jutjat mengen fetge d'un penjat",
+  "upload_modal.detect_text": "Detecta el text de la imatge",
+  "upload_modal.edit_media": "Edita el Mèdia",
+  "upload_modal.hint": "Fes clic o arrossega el cercle en la previsualització per a triar el punt focal que sempre serà visible en totes les miniatures.",
+  "upload_modal.preparing_ocr": "Es prepara l'OCR…",
   "upload_modal.preview_label": "Previsualitza ({ratio})",
-  "upload_progress.label": "Pujant...",
-  "video.close": "Tancar el vídeo",
+  "upload_progress.label": "Es puja...",
+  "upload_progress.processing": "En procés…",
+  "video.close": "Tanca el vídeo",
   "video.download": "Descarrega l’arxiu",
-  "video.exit_fullscreen": "Sortir de pantalla completa",
-  "video.expand": "Ampliar el vídeo",
+  "video.exit_fullscreen": "Surt de la pantalla completa",
+  "video.expand": "Amplia el vídeo",
   "video.fullscreen": "Pantalla completa",
-  "video.hide": "Amaga vídeo",
-  "video.mute": "Silenciar el so",
+  "video.hide": "Amaga el vídeo",
+  "video.mute": "Silencia",
   "video.pause": "Pausa",
-  "video.play": "Reproduir",
-  "video.unmute": "Activar so"
+  "video.play": "Reprodueix",
+  "video.unmute": "Activa el so"
 }
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
new file mode 100644
index 000000000..0a84153ae
--- /dev/null
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "ڕاژە سەرپەرشتیکراو",
+  "about.contact": "پەیوەندی کردن:",
+  "about.disclaimer": "ماستودۆن بە خۆڕایە، پرۆگرامێکی سەرچاوە کراوەیە، وە نیشانە بازرگانیەکەی ماستودۆن (gGmbH)ە",
+  "about.domain_blocks.no_reason_available": "هۆکار بەردەست نیە",
+  "about.domain_blocks.preamble": "ماستۆدۆن بە گشتی ڕێگەت پێدەدات بە پیشاندانی ناوەڕۆکەکان و کارلێک کردن لەگەڵ بەکارهێنەران لە هەر ڕاژەیەکی تر بە گشتی. ئەمانە ئەو بەدەرکردنانەن کە کراون لەسەر ئەم ڕاژە تایبەتە.",
+  "about.domain_blocks.silenced.explanation": "بە گشتی ناتوانی زانیاریە تایبەتەکان و ناوەڕۆکی ئەم ڕاژەیە ببینی، مەگەر بە ڕوونی بەدوایدا بگەڕێیت یان هەڵیبژێریت بۆ شوێنکەوتنی.",
+  "about.domain_blocks.silenced.title": "سنووردار",
+  "about.domain_blocks.suspended.explanation": "هیچ داتایەک لەم سێرڤەرەوە پرۆسێس ناکرێت، هەڵناگیرێت یان ئاڵوگۆڕ ناکرێت، ئەمەش وا دەکات هیچ کارلێکێک یان پەیوەندییەک لەگەڵ بەکارهێنەران لەم سێرڤەرەوە مەحاڵ بێت.",
+  "about.domain_blocks.suspended.title": "هەڵپەسێردراوە",
+  "about.not_available": "ئەم زانیاریانە لەسەر ئەم سێرڤەرە بەردەست نەکراون.",
+  "about.powered_by": "سۆشیال میدیای لامەرکەزی کە لەلایەن {mastodon} ەوە بەهێز دەکرێت",
+  "about.rules": "یاساکانی سێرڤەر",
+  "account.account_note_header": "تێبینی    ",
+  "account.add_or_remove_from_list": "زیادکردن یان سڕینەوە لە پێرستەکان",
+  "account.badges.bot": "بوت",
+  "account.badges.group": "گرووپ",
+  "account.block": "بلۆکی @{name}",
+  "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
+  "account.blocked": "بلۆککرا",
+  "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
+  "account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
+  "account.direct": "پەیامی تایبەت بە @{name}",
+  "account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
+  "account.domain_blocked": "دۆمەین قەپاتکرا",
+  "account.edit_profile": "دەستکاری پرۆفایل",
+  "account.enable_notifications": "ئاگادارم بکەوە کاتێک @{name} بابەتەکان",
+  "account.endorse": "ناساندن لە پرۆفایل",
+  "account.featured_tags.last_status_at": "دوایین پۆست لە {date}",
+  "account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
+  "account.featured_tags.title": "هاشتاگە تایبەتەکانی {name}",
+  "account.follow": "شوێنکەوتن",
+  "account.followers": "شوێنکەوتووان",
+  "account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
+  "account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
+  "account.following": "دواکەوتن",
+  "account.following_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
+  "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
+  "account.follows_you": "شوێنکەوتووەکانت",
+  "account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
+  "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
+  "account.joined_short": "بەشداری کردووە",
+  "account.languages": "گۆڕینی زمانە بەشداربووەکان",
+  "account.link_verified_on": "خاوەنداریەتی ئەم لینکە لە {date} چێک کراوە",
+  "account.locked_info": "تایبەتمەندی ئەم هەژمارەیە ڕیکخراوە بۆ قوفڵدراوە. خاوەنەکە بە دەستی پێداچوونەوە دەکات کە کێ دەتوانێت شوێنیان بکەوێت.",
+  "account.media": "میدیا",
+  "account.mention": "ئاماژە @{name}",
+  "account.moved_to": "{name} ئاماژەی بەوە کردووە کە ئەکاونتە نوێیەکەیان ئێستا:",
+  "account.mute": "بێدەنگکردن @{name}",
+  "account.mute_notifications": "هۆشیارکەرەوەکان لاببە لە @{name}",
+  "account.muted": "بێ دەنگ",
+  "account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە",
+  "account.posts": "توتس",
+  "account.posts_with_replies": "توتس و وەڵامەکان",
+  "account.report": "گوزارشت @{name}",
+  "account.requested": "چاوەڕێی ڕەزامەندین. کرتە بکە بۆ هەڵوەشاندنەوەی داواکاری شوێنکەوتن",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "پرۆفایلی @{name} هاوبەش بکە",
+  "account.show_reblogs": "پیشاندانی بەرزکردنەوەکان لە @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.unblock": "@{name} لاببە",
+  "account.unblock_domain": "کردنەوەی دۆمەینی {domain}",
+  "account.unblock_short": "لابردنی بەربەست",
+  "account.unendorse": "تایبەتمەندی لەسەر پرۆفایلەکە نیە",
+  "account.unfollow": "بەدوادانەچو",
+  "account.unmute": "بێدەنگکردنی @{name}",
+  "account.unmute_notifications": "بێدەنگکردنی هۆشیارییەکان لە @{name}",
+  "account.unmute_short": "بێدەنگی مەکە",
+  "account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
+  "admin.dashboard.daily_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی ڕۆژ دوای ناو تۆمارکردن",
+  "admin.dashboard.monthly_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی مانگ دوای ناو تۆمارکردن",
+  "admin.dashboard.retention.average": "ڕێژە",
+  "admin.dashboard.retention.cohort": "چوونەژوورەوەی مانگانە",
+  "admin.dashboard.retention.cohort_size": "ئەندامی نوێ",
+  "alert.rate_limited.message": "تکایە هەوڵبدەرەوە دوای {retry_time, time, medium}.",
+  "alert.rate_limited.title": "ڕێژەی سنووردار",
+  "alert.unexpected.message": "هەڵەیەکی چاوەڕوان نەکراو ڕوویدا.",
+  "alert.unexpected.title": "تەححح!",
+  "announcement.announcement": "بانگەواز",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "شاردنەوەی دەنگ",
+  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
+  "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
+  "bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
+  "bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
+  "bundle_column_error.error.title": "ئای نا!",
+  "bundle_column_error.network.body": "لە کاتی هەوڵدان بۆ بارکردنی ئەم لاپەڕەیە هەڵەیەک ڕوویدا. ئەمەش دەتوانێت بەهۆی کێشەیەکی کاتی هێڵی ئینتەرنێتەکەت یان ئەم سێرڤەرە بێت.",
+  "bundle_column_error.network.title": "هەڵەی تۆڕ",
+  "bundle_column_error.retry": "دووبارە هەوڵبدە",
+  "bundle_column_error.return": "بگەڕێرەوە ماڵەوە",
+  "bundle_column_error.routing.body": "پەیجی داواکراو ناتوانرێت بدۆزرێتەوە. ئایا دڵنیای کە URL ی ناو ناونیشانەکان ڕاستە?",
+  "bundle_column_error.routing.title": "٤٠٤",
+  "bundle_modal_error.close": "داخستن",
+  "bundle_modal_error.message": "هەڵەیەک ڕوویدا لەکاتی بارکردنی ئەم پێکهاتەیە.",
+  "bundle_modal_error.retry": "دووبارە تاقی بکەوە",
+  "closed_registrations.other_server_instructions": "بەو پێیەی ماستۆدۆن لامەرکەزییە، دەتوانیت ئەکاونتێک لەسەر سێرڤەرێکی تر دروست بکەیت و هێشتا کارلێک لەگەڵ ئەم سێرڤەرەدا بکەیت.",
+  "closed_registrations_modal.description": "دروستکردنی ئەکاونت لەسەر {domain} لە ئێستادا ناتوانرێت، بەڵام تکایە ئەوەت لەبەرچاو بێت کە پێویستت بە ئەکاونتێک نییە بە تایبەتی لەسەر {domain} بۆ بەکارهێنانی ماستۆدۆن.",
+  "closed_registrations_modal.find_another_server": "سێرڤەرێکی تر بدۆزەرەوە",
+  "closed_registrations_modal.preamble": "ماستۆدۆن لامەرکەزییە، بۆیە گرنگ نییە لە کوێ ئەکاونتەکەت دروست بکەیت، دەتوانیت فۆڵۆوی هەر کەسێک بکەیت و کارلێک لەگەڵیدا بکەیت لەسەر ئەم سێرڤەرە. تەنانەت دەتوانیت خۆت میوانداری بکەیت!",
+  "closed_registrations_modal.title": "ناو تۆمارکردن لە ماستۆدۆن",
+  "column.about": "دەربارە",
+  "column.blocks": "بەکارهێنەرە بلۆککراوەکان",
+  "column.bookmarks": "نیشانەکان",
+  "column.community": "هێڵی کاتی ناوخۆیی",
+  "column.direct": "نامە ڕاستەوخۆ",
+  "column.directory": "گەڕان لە پرۆفایلەکان",
+  "column.domain_blocks": "دۆمەینە داخراوەکان",
+  "column.favourites": "دڵخوازترینەکان",
+  "column.follow_requests": "بەدواداچوی داواکاریەکان بکە",
+  "column.home": "سەرەتا",
+  "column.lists": "پێرست",
+  "column.mutes": "بێدەنگکردنی بەکارهێنەران",
+  "column.notifications": "ئاگادارییەکان",
+  "column.pins": "تووتسی چەسپاو",
+  "column.public": "نووسراوەکانی هەمووشوێنێک",
+  "column_back_button.label": "دواوە",
+  "column_header.hide_settings": "شاردنەوەی ڕێکخستنەکان",
+  "column_header.moveLeft_settings": "ستوون بگوێزەرەوە بۆ لای چەپ",
+  "column_header.moveRight_settings": "جوولاندنی ئەستوون بۆ لای ڕاست",
+  "column_header.pin": "سنجاق",
+  "column_header.show_settings": "نیشاندانی رێکخستنەکان",
+  "column_header.unpin": "سنجاق نەکردن",
+  "column_subheading.settings": "رێکخستنەکان",
+  "community.column_settings.local_only": "تەنها خۆماڵی",
+  "community.column_settings.media_only": "تەنها میدیا",
+  "community.column_settings.remote_only": "تەنها بۆ دوور",
+  "compose.language.change": "گۆڕینی زمان",
+  "compose.language.search": "گەڕان بە زمانەکان...",
+  "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "ئەم توتە لە ژێر هیچ هاشتاگییەک دا ناکرێت وەک ئەوەی لە لیستەکەدا نەریزراوە. تەنها توتی گشتی دەتوانرێت بە هاشتاگی بگەڕێت.",
+  "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
+  "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
+  "compose_form.placeholder": "چی لە مێشکتدایە?",
+  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
+  "compose_form.poll.duration": "ماوەی ڕاپرسی",
+  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
+  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
+  "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
+  "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
+  "compose_form.publish": "بڵاوی بکەوە",
+  "compose_form.publish_form": "بڵاوی بکەوە",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
+  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
+  "compose_form.sensitive.marked": "وادەی کۆتایی",
+  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
+  "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
+  "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
+  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
+  "confirmation_modal.cancel": "هەڵوەشاندنەوه",
+  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
+  "confirmations.block.confirm": "بلۆک",
+  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
+  "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
+  "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
+  "confirmations.delete.confirm": "سڕینەوە",
+  "confirmations.delete.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە?",
+  "confirmations.delete_list.confirm": "سڕینەوە",
+  "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
+  "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
+  "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
+  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
+  "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
+  "confirmations.logout.confirm": "چوونە دەرەوە",
+  "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
+  "confirmations.mute.confirm": "بێدەنگ",
+  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
+  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
+  "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
+  "confirmations.redraft.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە و دووبارە دایبنووسیتەوە؟ دڵخوازەکان و بەرزکردنەوەکان وون دەبن، و وەڵامەکان بۆ پۆستە ڕەسەنەکە هەتیو دەبن.",
+  "confirmations.reply.confirm": "وەڵام",
+  "confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?",
+  "confirmations.unfollow.confirm": "بەدوادانەچو",
+  "confirmations.unfollow.message": "ئایا دڵنیایت لەوەی دەتەوێت پەیڕەوی {name}?",
+  "conversation.delete": "سڕینەوەی گفتوگۆ",
+  "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
+  "conversation.open": "نیشاندان گفتوگۆ",
+  "conversation.with": "لەگەڵ{names}",
+  "copypaste.copied": "کۆپی کراوە",
+  "copypaste.copy": "ڕوونووس",
+  "directory.federated": "لە ڕاژەکانی ناسراو",
+  "directory.local": "تەنها لە {domain}",
+  "directory.new_arrivals": "تازە گەیشتنەکان",
+  "directory.recently_active": "بەم دواییانە چالاکە",
+  "disabled_account_banner.account_settings": "ڕێکخستنەکانی هەژمارە",
+  "disabled_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە.",
+  "dismissable_banner.community_timeline": "ئەمانە دوایین پۆستی گشتی ئەو کەسانەن کە ئەکاونتەکانیان لەلایەن {domain}ەوە هۆست کراوە.",
+  "dismissable_banner.dismiss": "بەلاوە نان",
+  "dismissable_banner.explore_links": "ئەم هەواڵانە لە ئێستادا لەلایەن کەسانێکەوە لەسەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی باس دەکرێن.",
+  "dismissable_banner.explore_statuses": "ئەم پۆستانەی ئەم سێرڤەرە و سێرڤەرەکانی تری ناو تۆڕی لامەرکەزی لە ئێستادا خەریکە کێشکردن لەسەر ئەم سێرڤەرە بەدەست دەهێنن.",
+  "dismissable_banner.explore_tags": "ئەم هاشتاگانە لە ئێستادا لە نێو خەڵکی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزیدا جێگەی خۆیان دەگرن.",
+  "dismissable_banner.public_timeline": "ئەمانە دوایین پۆستە گشتیەکانن لە کەسانی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی کە ئەم سێرڤەرە دەزانێت.",
+  "embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.",
+  "embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:",
+  "emoji_button.activity": "چالاکی",
+  "emoji_button.clear": "ڕوون",
+  "emoji_button.custom": "ئاسایی",
+  "emoji_button.flags": "ئاڵاکان",
+  "emoji_button.food": "خواردن& خواردنەوە",
+  "emoji_button.label": "ئیمۆجی بکەنێو",
+  "emoji_button.nature": "سروشت",
+  "emoji_button.not_found": "بێ ئیمۆجی! (╯°□°)╯( ┻━┻",
+  "emoji_button.objects": "ئامانجەکان",
+  "emoji_button.people": "خەڵک",
+  "emoji_button.recent": "زۆرجار بەکارهێنراوە",
+  "emoji_button.search": "گەڕان...",
+  "emoji_button.search_results": "ئەنجامەکانی گەڕان",
+  "emoji_button.symbols": "هێماکان",
+  "emoji_button.travel": "گەشت & شوێنەکان",
+  "empty_column.account_suspended": "هەژمار ڕاگیرا",
+  "empty_column.account_timeline": "لێرە هیچ نووسراوە نییە!",
+  "empty_column.account_unavailable": "پرۆفایل بەردەست نیە",
+  "empty_column.blocks": "تۆ هێشتا هیچ بەکارهێنەرێکت بلۆک نەکردووە.",
+  "empty_column.bookmarked_statuses": "تۆ هێشتا هیچ توتێکی دیاریکراوت نیە کاتێک نیشانەیەک نیشان دەکەیت، لێرە دەرئەکەویت.",
+  "empty_column.community": "هێڵی کاتی ناوخۆیی بەتاڵە. شتێک بە ئاشکرا بنووسە بۆ ئەوەی تۆپەکە بسووڕێت!",
+  "empty_column.direct": "تا ئێستا هیچ نامەیەکی ڕاستەوخۆت نییە. کاتێک یەکێکیان دەنێری یان وەریدەگریت، لێرە دەردەکەوێت.",
+  "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.",
+  "empty_column.explore_statuses": "لە ئێستادا هیچ شتێک ترێند نییە. دواتر سەیری بکە!",
+  "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.",
+  "empty_column.favourites": "کەس ئەم توتەی دڵخواز نەکردووە،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.",
+  "empty_column.follow_recommendations": "پێدەچێت هیچ پێشنیارێک بۆ تۆ دروست نەکرێت. دەتوانیت هەوڵبدەیت گەڕان بەکاربهێنیت بۆ گەڕان بەدوای ئەو کەسانەی کە ڕەنگە بیانناسیت یان بەدوای هاشتاگە ڕەوتەکاندا بگەڕێیت.",
+  "empty_column.follow_requests": "تۆ هێشتا هیچ داواکارییەکی بەدواداچووت نیە. کاتێک یەکێکت بۆ هات، لێرە دەرئەکەویت.",
+  "empty_column.hashtag": "هێشتا هیچ شتێک لەم هاشتاگەدا نییە.",
+  "empty_column.home": "تایم لاینی ماڵەوەت بەتاڵە! سەردانی {public} بکە یان گەڕان بەکاربێنە بۆ دەستپێکردن و بینینی بەکارهێنەرانی تر.",
+  "empty_column.home.suggestions": "چەند پێشنیارێک ببینە",
+  "empty_column.list": "هێشتا هیچ شتێک لەم لیستەدا نییە. کاتێک ئەندامانی ئەم لیستە دەنگی نوێ بڵاودەکەن، لێرە دەردەکەون.",
+  "empty_column.lists": "تۆ هێشتا هیچ لیستت دروست نەکردووە، کاتێک دانەیەک دروست دەکەیت، لێرە پیشان دەدرێت.",
+  "empty_column.mutes": "تۆ هێشتا هیچ بەکارهێنەرێکت بێدەنگ نەکردووە.",
+  "empty_column.notifications": "تۆ هێشتا هیچ ئاگانامێکت نیە. چالاکی لەگەڵ کەسانی دیکە بکە بۆ دەستپێکردنی گفتوگۆکە.",
+  "empty_column.public": "لێرە هیچ نییە! شتێک بە ئاشکرا بنووسە(بەگشتی)، یان بە دەستی شوێن بەکارهێنەران بکەوە لە ڕاژەکانی ترەوە بۆ پڕکردنەوەی",
+  "error.unexpected_crash.explanation": "بەهۆی بوونی کێشە لە کۆدەکەمان یان کێشەی گونجانی وێبگەڕەکە، ئەم لاپەڕەیە بە دروستی پیشان نادرێت.",
+  "error.unexpected_crash.explanation_addons": "ئەم لاپەڕەیە ناتوانرێت بە دروستی پیشان بدرێت. ئەم هەڵەیە لەوانەیە بەهۆی ئامێری وەرگێڕانی خۆکار یان زیادکراوی وێبگەڕەوە بێت.",
+  "error.unexpected_crash.next_steps": "هەوڵدە لاپەڕەکە تازە بکەوە. ئەگەر ئەمە یارمەتیدەر نەبوو، لەوانەیە هێشتا بتوانیت ماستۆدۆن بەکاربێنیت لە ڕێگەی وێبگەڕەکەیان کاربەرنامەی ڕەسەن.",
+  "error.unexpected_crash.next_steps_addons": "هەوڵدە لەکاریان بخەیت و لاپەڕەکە تازە بکەوە. ئەگەر ئەمە یارمەتیدەر نەبوو، لەوانەیە هێشتا بتوانیت ماستۆدۆن بەکاربێنیت لە ڕێگەی وێبگەڕەکانی دیکە یان نەرمەکالاکانی ئەسڵی.",
+  "errors.unexpected_crash.copy_stacktrace": "کۆپیکردنی ستێکتراسی بۆ کلیپ بۆرد",
+  "errors.unexpected_crash.report_issue": "کێشەی گوزارشت",
+  "explore.search_results": "ئەنجامەکانی گەڕان",
+  "explore.suggested_follows": "For you",
+  "explore.title": "گەڕان",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "ئەم پۆلە فلتەرە ئەو چوارچێوەیە ناگرێتەوە کە تۆ تێیدا دەستت بەم پۆستە کردووە. ئەگەر بتەوێت پۆستەکە لەم چوارچێوەیەشدا فلتەر بکرێت، دەبێت دەستکاری فلتەرەکە بکەیت.",
+  "filter_modal.added.context_mismatch_title": "ناتەبایی دەقی نووسراو!",
+  "filter_modal.added.expired_explanation": "ئەم پۆلە فلتەرە بەسەرچووە، پێویستە بەرواری بەسەرچوونی بگۆڕیت بۆ ئەوەی جێبەجێی بکات.",
+  "filter_modal.added.expired_title": "فلتەری بەسەرچووە!",
+  "filter_modal.added.review_and_configure": "بۆ پێداچوونەوە و ڕێکخستنی زیاتری ئەم پۆلە فلتەرە، بچۆ بۆ {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "تەواو",
+  "follow_recommendations.heading": "شوێن ئەو کەسانە بکەون کە دەتەوێت پۆستەکان ببینیت لە! لێرەدا چەند پێشنیارێک هەیە.",
+  "follow_recommendations.lead": "بابەتەکانی ئەو کەسانەی کە بەدوایدا دەگەڕێیت بە فەرمانی کرۆنۆلۆجی لە خواردنەکانی ماڵەکەت دەردەکەون. مەترسە لە هەڵەکردن، دەتوانیت بە ئاسانی خەڵک هەڵبکەیت هەر کاتێک!",
+  "follow_request.authorize": "ده‌سه‌ڵاتپێدراو",
+  "follow_request.reject": "ڕەتکردنەوە",
+  "follow_requests.unlocked_explanation": "هەرچەندە هەژمارەکەت داخراو نییە، ستافی {domain} وا بیریان کردەوە کە لەوانەیە بتانەوێت پێداچوونەوە بە داواکاریەکانی ئەم هەژمارەدا بکەن بە دەستی.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "پاشکەوتکرا",
+  "getting_started.heading": "دەست پێکردن",
+  "hashtag.column_header.tag_mode.all": "و {additional}",
+  "hashtag.column_header.tag_mode.any": "یا {additional}",
+  "hashtag.column_header.tag_mode.none": "بەبێ {additional}",
+  "hashtag.column_settings.select.no_options_message": "هیچ پێشنیارێک نەدۆزرایەوە",
+  "hashtag.column_settings.select.placeholder": "هاشتاگی تێبنووسە…",
+  "hashtag.column_settings.tag_mode.all": "هەموو ئەمانە",
+  "hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
+  "hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
+  "hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "بنەڕەتی",
+  "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
+  "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
+  "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
+  "home.show_announcements": "پیشاندانی راگەیەنراوەکان",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژەک}}",
+  "intervals.full.hours": "{number, plural, one {# کات} other {# کات}}",
+  "intervals.full.minutes": "{number, plural, one {# خولەک} other {# خولەک}}",
+  "keyboard_shortcuts.back": "بۆ گەڕانەوە",
+  "keyboard_shortcuts.blocked": "بۆ کردنەوەی لیستی بەکارهێنەرە بلۆککراوەکان",
+  "keyboard_shortcuts.boost": "بۆ بەهێزکردن",
+  "keyboard_shortcuts.column": "بۆ ئەوەی تیشک بخاتە سەر توتێک لە یەکێک لە ستوونەکان",
+  "keyboard_shortcuts.compose": "بۆ سەرنجدان بە نووسینی ناوچەی دەق",
+  "keyboard_shortcuts.description": "وه‌سف",
+  "keyboard_shortcuts.direct": "بۆ کردنەوەی ستوونی نامە ڕاستەوخۆکان",
+  "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا",
+  "keyboard_shortcuts.enter": "بۆ کردنەوەی توت",
+  "keyboard_shortcuts.favourite": "بۆ دڵخواز",
+  "keyboard_shortcuts.favourites": "بۆ کردنەوەی لیستی دڵخوازەکان",
+  "keyboard_shortcuts.federated": "بۆ کردنەوەی نووسراوەکانی هەمووشوێن",
+  "keyboard_shortcuts.heading": "قه‌دبڕەکانی تەختەکلیل",
+  "keyboard_shortcuts.home": "بۆ کردنەوەی هێڵی کاتی ماڵەوە",
+  "keyboard_shortcuts.hotkey": "هۆتکەی",
+  "keyboard_shortcuts.legend": "بۆ نیشاندانی ئەم نیشانە",
+  "keyboard_shortcuts.local": "بۆ کردنەوەی نووسراوەکانی خۆماڵی",
+  "keyboard_shortcuts.mention": "نۆ ناوبردن لە نووسەر",
+  "keyboard_shortcuts.muted": "بۆ کردنەوەی پێرستی بەکارهێنەرانی بێدەنگ",
+  "keyboard_shortcuts.my_profile": "بۆ کردنەوەی پرۆفایڵ",
+  "keyboard_shortcuts.notifications": "بۆ کردنەوەی ستوونی ئاگانامەکان",
+  "keyboard_shortcuts.open_media": "بۆ کردنەوەی میدیا",
+  "keyboard_shortcuts.pinned": "بۆ کردنەوەی لیستی توتەکانی چەسپێنراو",
+  "keyboard_shortcuts.profile": "بۆ کردنەوەی پرۆفایڵی نووسەر",
+  "keyboard_shortcuts.reply": "بۆ وەڵامدانەوە",
+  "keyboard_shortcuts.requests": "بۆ کردنەوەی لیستی داواکاریەکانی بەدوادا",
+  "keyboard_shortcuts.search": "بۆ جەختکردن لەسەر گەڕان",
+  "keyboard_shortcuts.spoilers": "بۆ پیشاندان/شاردنەوەی خانەی CW",
+  "keyboard_shortcuts.start": "بۆ کردنەوەی ستوونی \"دەست پێبکە\"",
+  "keyboard_shortcuts.toggle_hidden": "بۆ پیشاندان/شاردنەوەی دەق لە پشت CW",
+  "keyboard_shortcuts.toggle_sensitivity": "بۆ پیشاندان/شاردنەوەی میدیا",
+  "keyboard_shortcuts.toot": "بۆ دەست کردن بە براندێکی تازە",
+  "keyboard_shortcuts.unfocus": "بۆ دروستکردنی ناوچەی دەق/گەڕان",
+  "keyboard_shortcuts.up": "بۆ ئەوەی لە لیستەکەدا بڕۆیت",
+  "lightbox.close": "دابخە",
+  "lightbox.compress": "سندوقی نیشاندانی وێنە بپەستێنە",
+  "lightbox.expand": "فراوانکردنی سندوقی بینینی وێنە",
+  "lightbox.next": "داهاتوو",
+  "lightbox.previous": "پێشوو",
+  "limited_account_hint.action": "بەهەر حاڵ پڕۆفایلی پیشان بدە",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "زیادکردن بۆ لیست",
+  "lists.account.remove": "لابردن لە لیست",
+  "lists.delete": "سڕینەوەی لیست",
+  "lists.edit": "دەستکاری لیست",
+  "lists.edit.submit": "گۆڕینی ناونیشان",
+  "lists.new.create": "زیادکردنی لیست",
+  "lists.new.title_placeholder": "ناونیشانی لیستی نوێ",
+  "lists.replies_policy.followed": "هەر بەکارهێنەرێکی بەدواکەوتوو",
+  "lists.replies_policy.list": "ئەندامانی لیستەکە",
+  "lists.replies_policy.none": "هیچکەس",
+  "lists.replies_policy.title": "پیشاندانی وەڵامەکان بۆ:",
+  "lists.search": "بگەڕێ لەناو ئەو کەسانەی کە شوێنیان کەوتویت",
+  "lists.subheading": "لیستەکانت",
+  "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
+  "loading_indicator.label": "بارکردن...",
+  "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "نەدۆزرایەوە",
+  "missing_indicator.sublabel": "ئەو سەرچاوەیە نادۆزرێتەوە",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "ماوە",
+  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
+  "mute_modal.indefinite": "نادیار",
+  "navigation_bar.about": "About",
+  "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
+  "navigation_bar.bookmarks": "نیشانکراوەکان",
+  "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
+  "navigation_bar.compose": "نووسینی توتی نوێ",
+  "navigation_bar.direct": "نامە ڕاستەوخۆ",
+  "navigation_bar.discover": "دۆزینەوە",
+  "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
+  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
+  "navigation_bar.explore": "گەڕان",
+  "navigation_bar.favourites": "دڵخوازەکان",
+  "navigation_bar.filters": "وشە کپەکان",
+  "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
+  "navigation_bar.follows_and_followers": "شوێنکەوتوو و شوێنکەوتوان",
+  "navigation_bar.lists": "لیستەکان",
+  "navigation_bar.logout": "دەرچوون",
+  "navigation_bar.mutes": "کپکردنی بەکارهێنەران",
+  "navigation_bar.personal": "کەسی",
+  "navigation_bar.pins": "توتی چەسپاو",
+  "navigation_bar.preferences": "پەسەندەکان",
+  "navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "ئاسایش",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} تۆمارکرا",
+  "notification.favourite": "{name} نووسراوەکەتی پەسەند کرد",
+  "notification.follow": "{name} دوای تۆ کەوت",
+  "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت",
+  "notification.mention": "{name} باسی ئێوەی کرد",
+  "notification.own_poll": "ڕاپرسیەکەت کۆتایی هات",
+  "notification.poll": "ڕاپرسییەک کە دەنگی پێداویت کۆتایی هات",
+  "notification.reblog": "{name} نووسراوەکەتی دووبارە توتاند",
+  "notification.status": "{name} تازە بڵاوکرایەوە",
+  "notification.update": "{name} پۆستێکی دەستکاریکرد",
+  "notifications.clear": "ئاگانامەکان بسڕیەوە",
+  "notifications.clear_confirmation": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی هەموو ئاگانامەکانت بسڕیتەوە?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
+  "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
+  "notifications.column_settings.favourite": "دڵخوازترین:",
+  "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
+  "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
+  "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
+  "notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
+  "notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
+  "notifications.column_settings.mention": "ئاماژەکان:",
+  "notifications.column_settings.poll": "ئەنجامەکانی ڕاپرسی:",
+  "notifications.column_settings.push": "ئاگانامەکان پاڵ بنێ",
+  "notifications.column_settings.reblog": "دووبارەتوتەکان:",
+  "notifications.column_settings.show": "لە ستووندا پیشان بدە",
+  "notifications.column_settings.sound": "لێدانی دەنگ",
+  "notifications.column_settings.status": "توتەکانی نوێ:",
+  "notifications.column_settings.unread_notifications.category": "ئاگاداریی نەبینراو",
+  "notifications.column_settings.unread_notifications.highlight": "تیشک بخە سەر ئاگاداری نەخوێنراو",
+  "notifications.column_settings.update": "دەستکاری:",
+  "notifications.filter.all": "هەموو",
+  "notifications.filter.boosts": "دووبارەتوتەکان",
+  "notifications.filter.favourites": "دڵخوازەکان",
+  "notifications.filter.follows": "بەدواداچوون",
+  "notifications.filter.mentions": "ئاماژەکان",
+  "notifications.filter.polls": "ئەنجامەکانی ڕاپرسی",
+  "notifications.filter.statuses": "نوێکردنەوەکان ئەو کەسانەی کە پەیڕەوی دەکەیت",
+  "notifications.grant_permission": "مۆڵەت بدە.",
+  "notifications.group": "{count} ئاگانامە",
+  "notifications.mark_as_read": "هەموو ئاگانامەکان وەک خوێندراوەتەوە نیشان بکە",
+  "notifications.permission_denied": "ناتوانرێت ئاگانامەکانی دێسکتۆپ چالاک بکرێت وەک ڕێپێدان ڕەتکرایەوە.",
+  "notifications.permission_denied_alert": "ناتوانرێت ئاگانامەکانی دێسکتۆپ چالاک بکرێت، چونکە پێشتر مۆڵەتی وێبگەڕ ڕەتکرایەوە",
+  "notifications.permission_required": "ئاگادارکردنەوەکانی سەر مێز بەردەست نین چونکە مۆڵەتی پێویست نەدراوە.",
+  "notifications_permission_banner.enable": "چالاککردنی ئاگانامەکانی دێسکتۆپ",
+  "notifications_permission_banner.how_to_control": "بۆ وەرگرتنی ئاگانامەکان کاتێک ماستۆدۆن نەکراوەیە، ئاگانامەکانی دێسکتۆپ چالاک بکە. دەتوانیت بە وردی کۆنترۆڵی جۆری کارلێکەکان بکەیت کە ئاگانامەکانی دێسکتۆپ دروست دەکەن لە ڕێگەی دوگمەی {icon} لەسەرەوە کاتێک چالاک دەکرێن.",
+  "notifications_permission_banner.title": "هەرگیز شتێک لە دەست مەدە",
+  "picture_in_picture.restore": "بیگەڕێنەوە",
+  "poll.closed": "دابخە",
+  "poll.refresh": "نوێکردنەوە",
+  "poll.total_people": "{count, plural, one {# خەڵک} other {# خەڵک}}",
+  "poll.total_votes": "{count, plural, one {# دەنگ} other {# دەنگ}}\n",
+  "poll.vote": "دەنگ",
+  "poll.voted": "تۆ دەنگت بەو وەڵامە دا",
+  "poll.votes": "{votes, plural, one {# دەنگ} other {# دەنگ}}",
+  "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
+  "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
+  "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
+  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
+  "privacy.direct.short": "تەنها کەسانی باس کراو",
+  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
+  "privacy.private.short": "تەنیا شوێنکەوتووان",
+  "privacy.public.long": "بۆ هەمووان دیارە",
+  "privacy.public.short": "گشتی",
+  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
+  "privacy.unlisted.short": "لە لیست نەکراو",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "نوێکردنەوە",
+  "regeneration_indicator.label": "بارکردن…",
+  "regeneration_indicator.sublabel": "ڕاگەیەنەری ماڵەوەت ئامادە دەکرێت!",
+  "relative_time.days": "{number}ڕۆژ",
+  "relative_time.full.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژ}} ماوە",
+  "relative_time.full.hours": "{number, plural, one {# کاتژمێر} other {# کاتژمێر}} ماوە",
+  "relative_time.full.just_now": "ئێستا",
+  "relative_time.full.minutes": "{number, plural, one {# خولەک} other {# خولەک}} ماوە",
+  "relative_time.full.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
+  "relative_time.hours": "{number}کات",
+  "relative_time.just_now": "ئێستا",
+  "relative_time.minutes": "{number}کات",
+  "relative_time.seconds": "{number}کات",
+  "relative_time.today": "ئیمڕۆ",
+  "reply_indicator.cancel": "هەڵوەشاندنەوه",
+  "report.block": "بلۆک",
+  "report.block_explanation": "تۆ پۆستەکانیان نابینیت. ئەوان ناتوانن بابەتەکانتان ببینن یان شوێنتان بکەون. ئەوان دەتوانن بڵێن کە بەربەستکراون.",
+  "report.categories.other": "هی تر",
+  "report.categories.spam": "سپام",
+  "report.categories.violation": "ناوەڕۆک یەک یان زیاتر لە یاساکانی سێرڤەر پێشێل دەکات",
+  "report.category.subtitle": "باشترین هاوتا هەڵبژێرە",
+  "report.category.title": "پێمان بڵێ بە {type} چی ڕوودەدات",
+  "report.category.title_account": "پرۆفایل",
+  "report.category.title_status": "پۆست",
+  "report.close": "تەواو",
+  "report.comment.title": "ئایا هیچ شتێکی تر هەیە کە پێت وایە ئێمە دەبێت بزانین?",
+  "report.forward": "ناردن بۆ {target}",
+  "report.forward_hint": "هەژمارەکە لە ڕاژەیەکی ترە. ڕونووسێکی نەناسراو بنێرە بۆ گوزارشت لەوێ?",
+  "report.mute": "بێدەنگ",
+  "report.mute_explanation": "تۆ پۆستەکانیان نابینیت. ئەوان هێشتا دەتوانن شوێنتان بکەون و پۆستەکانتان ببینن و نازانن کە ئەوان بێ دەنگن.",
+  "report.next": "دواتر",
+  "report.placeholder": "سەرنجەکانی زیاتر",
+  "report.reasons.dislike": "حەزم لێی نییە",
+  "report.reasons.dislike_description": "ئەوە شتێک نیە کە دەتەوێت بیبینیت",
+  "report.reasons.other": "شتێکی ترە",
+  "report.reasons.other_description": "کێشەکە ناگونجێت بۆ هاوپۆلەکانی تر",
+  "report.reasons.spam": "ئەوە سپامە",
+  "report.reasons.spam_description": "لینکە خراپەکان، بەشداری ساختە، یان وەڵامدانەوەی دووبارە",
+  "report.reasons.violation": "یاساکانی سێرڤەر پێشێل دەکات",
+  "report.reasons.violation_description": "ئاگاداری ئەوەن کە یاسا تایبەتەکان دەشکێنێت",
+  "report.rules.subtitle": "هەموو ئەوانەی کە کاریان پێدەکرێت هەڵبژێرە",
+  "report.rules.title": "کام یاسا پێشێل دەکرێت؟",
+  "report.statuses.subtitle": "هەموو ئەوانەی کە کاریان پێدەکرێت هەڵبژێرە",
+  "report.statuses.title": "ئایا هیچ پۆستێک هەیە کە پشتگیری ئەم ڕاپۆرتە بکات؟",
+  "report.submit": "ناردن",
+  "report.target": "گوزارشتکردنی{target}",
+  "report.thanks.take_action": "لێرەدا بژاردەکانت بۆ کۆنترۆڵکردنی ئەو شتانە دەخەینەڕوو کە لە ماستۆدۆن دەیبینیت:",
+  "report.thanks.take_action_actionable": "لە کاتێکدا ئێمە پێداچوونەوە بەم بابەتە دەکەین، دەتوانیت ڕێوشوێن بگریتەبەر دژی @{name}:",
+  "report.thanks.title": "ناتەوێت ئەمە ببینیت؟",
+  "report.thanks.title_actionable": "سوپاس بۆ ڕاپۆرتکردن، ئێمە سەیری ئەم بابەتە دەکەین.",
+  "report.unfollow": "بەدوادانەچوو@{name}",
+  "report.unfollow_explanation": "تۆ شوێنکەوتووی ئەم هەژماررەی دەکەیت. بۆ ئەوەی چیتر نووسراوەکانیان لە هۆم فیدی خۆت نەبینی، بەدوایان مەچۆ.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "گەڕان",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "شێوەی گەڕانی پێشکەوتوو",
+  "search_popout.tips.full_text": "گەڕانێکی دەقی سادە دەتوانێت توتەکانی ئێوە کە، نووسیوتانە،پەسەنتان کردووە، دووبارەتانکردووە، یان ئەو توتانە کە باسی ئێوەی تێدا کراوە پەیدا دەکا. هەروەها ناوی بەکارهێنەران، ناوی پیشاندراو و هەشتەگەکانیش لە خۆ دەگرێت.",
+  "search_popout.tips.hashtag": "هەشتاگ",
+  "search_popout.tips.status": "توت",
+  "search_popout.tips.text": "دەقی سادە هەڵدەسێ بە گەڕاندنەوەی هاوتایی ناوی پیشاندان، ناوی بەکارهێنەر و هاشتاگەکان",
+  "search_popout.tips.user": "بەکارهێنەر",
+  "search_results.accounts": "خەڵک",
+  "search_results.all": "هەموو",
+  "search_results.hashtags": "هەشتاگ",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "توتەکان",
+  "search_results.statuses_fts_disabled": "گەڕانی توتەکان بە ناوەڕۆکیان لەسەر ئەم ڕاژەی ماستۆدۆن چالاک نەکراوە.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {دەرئەنجام} other {دەرئەنجام}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "بەکارهێنەرانی چالاک",
+  "server_banner.administered_by": "بەڕێوەبردن لەلایەن:",
+  "server_banner.introduction": "{domain} بەشێکە لەو تۆڕە کۆمەڵایەتییە لامەرکەزییەی کە لەلایەن {mastodon}ەوە بەهێز دەکرێت.",
+  "server_banner.learn_more": "زیاتر فێربه",
+  "server_banner.server_stats": "دۆخی ڕاژەکار:",
+  "sign_in_banner.create_account": "هەژمار دروستبکە",
+  "sign_in_banner.sign_in": "بچۆ ژوورەوە",
+  "sign_in_banner.text": "چوونەژوورەوە بۆ فۆڵۆوکردنی پڕۆفایلی یان هاشتاگەکان، دڵخوازکردن، هاوبەشکردن و وەڵامدانەوەی پۆستەکان، یان کارلێککردن لە ئەکاونتەکەتەوە لەسەر سێرڤەرێکی جیاواز.",
+  "status.admin_account": "کردنەوەی میانڕەوی بەڕێوەبەر بۆ @{name}",
+  "status.admin_status": "ئەم توتە بکەوە لە ناو ڕووکاری بەڕیوەبەر",
+  "status.block": "@{name} ئاستەنگ بکە",
+  "status.bookmark": "نیشانه",
+  "status.cancel_reblog_private": "بێبەهێزکردن",
+  "status.cannot_reblog": "ئەم بابەتە ناتوانرێت بەرزبکرێتەوە",
+  "status.copy": "ڕوونووسی بەستەر بۆ توت",
+  "status.delete": "سڕینەوە",
+  "status.detailed_status": "ڕوانگەی گفتوگۆ بە وردەکاری",
+  "status.direct": "پەیامی ڕاستەوخۆ @{name}",
+  "status.edit": "دەستکاری",
+  "status.edited": "بەشداری {date}",
+  "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
+  "status.embed": "نیشتەجێ بکە",
+  "status.favourite": "دڵخواز",
+  "status.filter": "ئەم پۆستە فلتەر بکە",
+  "status.filtered": "پاڵاوتن",
+  "status.hide": "شاردنەوەی توت",
+  "status.history.created": "{name} دروستکراوە لە{date}",
+  "status.history.edited": "{name} دروستکاریکراوە لە{date}",
+  "status.load_more": "زیاتر بار بکە",
+  "status.media_hidden": "میدیای شاراوە",
+  "status.mention": "ناوبنێ @{name}",
+  "status.more": "زیاتر",
+  "status.mute": "@{name} بێدەنگ بکە",
+  "status.mute_conversation": "بێدەنگی بکە",
+  "status.open": "ئەم توتە فراوان بکە",
+  "status.pin": "لکاندن لەسەر پرۆفایل",
+  "status.pinned": "توتی چەسپکراو",
+  "status.read_more": "زیاتر بخوێنەوە",
+  "status.reblog": "بەهێزکردن",
+  "status.reblog_private": "بەهێزکردن بۆ بینەرانی سەرەتایی",
+  "status.reblogged_by": "{name} توتی کردەوە",
+  "status.reblogs.empty": "کەس ئەم توتەی دووبارە نەتوتاندوە ،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.",
+  "status.redraft": "سڕینەوەی و دووبارە ڕەشنووس",
+  "status.remove_bookmark": "لابردنی نیشانه",
+  "status.replied_to": "لە وەڵامدا بۆ {name}",
+  "status.reply": "وەڵام",
+  "status.replyAll": "بە نووسراوە وەڵام بدەوە",
+  "status.report": "گوزارشت @{name}",
+  "status.sensitive_warning": "ناوەڕۆکی هەستیار",
+  "status.share": "هاوبەشی بکە",
+  "status.show_filter_reason": "بە هەر حاڵ نیشان بدە",
+  "status.show_less": "کەمتر نیشان بدە",
+  "status.show_less_all": "هەمووی بچووک بکەوە",
+  "status.show_more": "زیاتر نیشان بدە",
+  "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
+  "status.show_original": "پیشاندانی شێوه‌ی ڕاسته‌قینه‌",
+  "status.translate": "وەریبگێرە",
+  "status.translated_from_with": "لە {lang} وەرگێڕدراوە بە بەکارهێنانی {provider}",
+  "status.uncached_media_warning": "بەردەست نیە",
+  "status.unmute_conversation": "گفتوگۆی بێدەنگ",
+  "status.unpin": "لە سەرەوە لایبە",
+  "subscribed_languages.lead": "تەنها پۆستەکان بە زمانە هەڵبژێردراوەکان لە ماڵەکەتدا دەردەکەون و هێڵەکانی کاتی لیستەکەت دوای گۆڕانکارییەکە. هیچیان هەڵبژێرە بۆ وەرگرتنی پۆست بە هەموو زمانەکان.",
+  "subscribed_languages.save": "پاشکەوتی گۆڕانکاریەکان",
+  "subscribed_languages.target": "گۆڕینی زمانە بەشداربووەکان بۆ {target}",
+  "suggestions.dismiss": "ڕەتکردنەوەی پێشنیار",
+  "suggestions.header": "لەوانەیە حەزت لەمەش بێت…",
+  "tabs_bar.federated_timeline": "گشتی",
+  "tabs_bar.home": "سەرەتا",
+  "tabs_bar.local_timeline": "ناوخۆیی",
+  "tabs_bar.notifications": "ئاگادارییەکان",
+  "time_remaining.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژ}} ماوە",
+  "time_remaining.hours": "{number, plural, one {# کاتژمێر} other {# کاتژمێر}} ماوە",
+  "time_remaining.minutes": "{number, plural, one {# خولەک} other {# خولەک}} ماوە",
+  "time_remaining.moments": "کاتی ماوە",
+  "time_remaining.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
+  "timeline_hint.remote_resource_not_displayed": "{resource} لە ڕاژەکانی ترەوە پیشان نادرێت.",
+  "timeline_hint.resources.followers": "شوێنکەوتوو",
+  "timeline_hint.resources.follows": "شوێنکەوتن",
+  "timeline_hint.resources.statuses": "نێردراوی کۆن",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "ڕۆژەڤ",
+  "ui.beforeunload": "ڕەشنووسەکەت لەدەست دەچێت ئەگەر ماستۆدۆن جێ بهێڵیت.",
+  "units.short.billion": "{count} ملیار",
+  "units.short.million": "{count} ملیۆن",
+  "units.short.thousand": "{count} هەزار",
+  "upload_area.title": "فایلەکانت ڕابکێشە ئێرە بۆ بەرزکردنەوەیان",
+  "upload_button.label": "وێنە، ڤیدیۆ یان پەیامی دەنگی زیاد بکە",
+  "upload_error.limit": "سنووری بەرزکردنەوەت بەزاندووە.",
+  "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
+  "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
+  "upload_form.description": "پەیامەکەت بۆ نابیناکان",
+  "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
+  "upload_form.edit": "دەستکاری",
+  "upload_form.thumbnail": "گۆڕانی وینۆچکە",
+  "upload_form.undo": "بیسڕەوە",
+  "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
+  "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
+  "upload_modal.apply": "بیسەپێنە",
+  "upload_modal.applying": "داواکاری…",
+  "upload_modal.choose_image": "وێنە هەڵبژێرە",
+  "upload_modal.description_placeholder": "بە دڵ کەین با بە نەشئەی مەی غوباری میحنەتی دونیا",
+  "upload_modal.detect_text": "نووسینی ناو وێنەکە دەستنیشان بکە",
+  "upload_modal.edit_media": "دەستکاریکردنی میدیا",
+  "upload_modal.hint": "گەر وێنە چکۆلە یان بڕاوەبێت، خاڵی ناوەندی دیار دەکەوێت. خاڵی ناوەندی وێنە بە کرتە یان جێبەجیکردنی رێکبخەن.",
+  "upload_modal.preparing_ocr": "نووسینەکە دەستنیشان دەکرێت…",
+  "upload_modal.preview_label": "پێشبینین ({ratio})",
+  "upload_progress.label": "بار دەکرێت...",
+  "upload_progress.processing": "جێبەجێکردن...",
+  "video.close": "داخستنی ڤیدیۆ",
+  "video.download": "داگرتنی فایل",
+  "video.exit_fullscreen": "دەرچوون لە پڕ شاشە",
+  "video.expand": "ڤیدیۆفراوان بکە",
+  "video.fullscreen": "پڕپیشانگەر",
+  "video.hide": "شاردنەوەی ڤیدیۆ",
+  "video.mute": "دەنگی کپ",
+  "video.pause": "وەستان",
+  "video.play": "لێی بدە",
+  "video.unmute": "بێدەنگی مەکە"
+}
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index b8ac9281d..96b17f287 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Piattà u duminiu {domain}",
   "account.blocked": "Bluccatu",
   "account.browse_more_on_origin_server": "Vede di più nant'à u prufile uriginale",
-  "account.cancel_follow_request": "Annullà a dumanda d'abbunamentu",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Missaghju direttu @{name}",
   "account.disable_notifications": "Ùn mi nutificate più quandu @{name} pubblica qualcosa",
   "account.domain_blocked": "Duminiu piattatu",
   "account.edit_profile": "Mudificà u prufile",
   "account.enable_notifications": "Nutificate mi quandu @{name} pubblica qualcosa",
   "account.endorse": "Fà figurà nant'à u prufilu",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Siguità",
   "account.followers": "Abbunati",
   "account.followers.empty": "Nisunu hè abbunatu à st'utilizatore.",
   "account.followers_counter": "{count, plural, one {{counter} Abbunatu} other {{counter} Abbunati}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Abbunamentu} other {{counter} Abbunamenti}}",
   "account.follows.empty": "St'utilizatore ùn seguita nisunu.",
   "account.follows_you": "Vi seguita",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Piattà spartere da @{name}",
-  "account.joined": "Quì dapoi {date}",
-  "account.last_status": "Ultima attività",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "A prupietà di stu ligame hè stata verificata u {date}",
   "account.locked_info": "U statutu di vita privata di u contu hè chjosu. U pruprietariu esamina manualmente e dumande d'abbunamentu.",
   "account.media": "Media",
   "account.mention": "Mintuvà @{name}",
-  "account.moved_to": "{name} hè partutu nant'à:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Piattà @{name}",
   "account.mute_notifications": "Piattà nutificazione da @{name}",
   "account.muted": "Piattatu",
-  "account.never_active": "Mai",
+  "account.open_original_page": "Open original page",
   "account.posts": "Statuti",
   "account.posts_with_replies": "Statuti è risposte",
   "account.report": "Palisà @{name}",
   "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Sparte u prufile di @{name}",
   "account.show_reblogs": "Vede spartere da @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Statutu} other {{counter} Statuti}}",
   "account.unblock": "Sbluccà @{name}",
   "account.unblock_domain": "Ùn piattà più {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Ùn fà figurà nant'à u prufilu",
   "account.unfollow": "Ùn siguità più",
   "account.unmute": "Ùn piattà più @{name}",
   "account.unmute_notifications": "Ùn piattà più nutificazione da @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Senza cummentariu",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -56,19 +77,32 @@
   "alert.unexpected.message": "Un prublemu inaspettatu hè accadutu.",
   "alert.unexpected.title": "Uups!",
   "announcement.announcement": "Annunziu",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(micca trattata)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per settimana",
   "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
-  "bundle_column_error.body": "C'hè statu un prublemu caricandu st'elementu.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Pruvà torna",
-  "bundle_column_error.title": "Errore di cunnessione",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Chjudà",
   "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.",
   "bundle_modal_error.retry": "Pruvà torna",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Utilizatori bluccati",
   "column.bookmarks": "Segnalibri",
   "column.community": "Linea pubblica lucale",
-  "column.direct": "Missaghji diretti",
+  "column.direct": "Direct messages",
   "column.directory": "Percorre i prufili",
   "column.domain_blocks": "Duminii piattati",
   "column.favourites": "Favuriti",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Solu lucale",
   "community.column_settings.media_only": "Solu media",
   "community.column_settings.remote_only": "Solu distante",
-  "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Amparà di più",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".",
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Toglie sta scelta",
   "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
   "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
@@ -114,11 +152,13 @@
   "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
   "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Toglie",
   "confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.confirm": "Scartà",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
   "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marcà cum'è lettu",
   "conversation.open": "Vede a cunversazione",
   "conversation.with": "Cù {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Da u fediversu cunisciutu",
   "directory.local": "Solu da {domain}",
   "directory.new_arrivals": "Ultimi arrivi",
   "directory.recently_active": "Attività ricente",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Integrà stu statutu à u vostru situ cù u codice quì sottu.",
   "embed.preview": "Hà da parè à quessa:",
   "emoji_button.activity": "Attività",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Persunalizati",
   "emoji_button.flags": "Bandere",
   "emoji_button.food": "Manghjusca è Bienda",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
   "empty_column.bookmarked_statuses": "Ùn avete manc'un segnalibru. Quandu aghjunghjerate unu, sarà mustratu quì.",
   "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
-  "empty_column.direct": "Ùn avete ancu nisun missaghju direttu. S'è voi mandate o ricevete unu, u vidarete quì.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ùn avete manc'unu statutu favuritu. Quandu aghjunghjerate unu à i vostri favuriti, sarà mustratu quì.",
   "empty_column.favourites": "Nisunu hà aghjuntu stu statutu à i so favuriti. Quandu qualch'unu farà quessa, u so contu sarà mustratu quì.",
   "empty_column.follow_recommendations": "Si pare ch'ùn s'hè micca pussutu generà e ricumandazione per voi. Pudete sempre pruvà d'utilizà a ricerca per truvà ghjente chì cunnuscete, o splurà l'hashtag in tindenza.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Pruvate di disattivà quelli è poi attualizà sta pagina. S'ellu persiste u prublemu, pudete forse sempre accede à Mastodon dapoi un'alltru navigatore o applicazione.",
   "errors.unexpected_crash.copy_stacktrace": "Cupià stacktrace nant'à u fermacarta",
   "errors.unexpected_crash.report_issue": "Palisà prublemu",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Fatta",
   "follow_recommendations.heading": "Siguitate a ghjente da quelli vulete vede i missaghji! Eccu qualchì ricumandazione.",
   "follow_recommendations.lead": "I missaghji da a ghjente che voi siguitate figureranu in ordine crunulogicu nant'a vostra pagina d'accolta. Ùn timite micca di fà un sbagliu, pudete sempre disabbunavvi d'un contu à ogni mumentu!",
   "follow_request.authorize": "Auturizà",
   "follow_request.reject": "Righjittà",
   "follow_requests.unlocked_explanation": "U vostru contu ùn hè micca privatu, ma a squadra d'amministrazione di {domain} pensa chì e dumande d'abbunamentu di questi conti anu bisognu d'esse verificate manualmente.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Salvatu",
-  "getting_started.developers": "Sviluppatori",
-  "getting_started.directory": "Annuariu di i prufili",
-  "getting_started.documentation": "Ducumentazione",
   "getting_started.heading": "Per principià",
-  "getting_started.invite": "Invità ghjente",
-  "getting_started.open_source_notice": "Mastodon ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un bug, nant'à GitHub: {github}.",
-  "getting_started.security": "Sicurità",
-  "getting_started.terms": "Cundizione di u serviziu",
   "hashtag.column_header.tag_mode.all": "è {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Unu di quessi",
   "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
   "hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
   "home.hide_announcements": "Piattà annunzii",
   "home.show_announcements": "Vede annunzii",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# ghjornu} other {# ghjorni}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} other {# minute}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
   "keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
   "keyboard_shortcuts.description": "Descrizzione",
-  "keyboard_shortcuts.direct": "per apre una culonna di missaghji diretti",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "falà indè a lista",
   "keyboard_shortcuts.enter": "apre u statutu",
   "keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Ingrandà a finestra d'affissera di i ritratti",
   "lightbox.next": "Siguente",
   "lightbox.previous": "Pricidente",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Aghjunghje à a lista",
   "lists.account.remove": "Toglie di a lista",
   "lists.delete": "Toglie a lista",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
   "missing_indicator.label": "Micca trovu",
   "missing_indicator.sublabel": "Ùn era micca pussivule di truvà sta risorsa",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Durata",
   "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
   "mute_modal.indefinite": "Indifinita",
-  "navigation_bar.apps": "Applicazione per u telefuninu",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
   "navigation_bar.compose": "Scrive un novu statutu",
-  "navigation_bar.direct": "Missaghji diretti",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.edit_profile": "Mudificà u prufile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favuriti",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
-  "navigation_bar.info": "À prupositu di u servore",
-  "navigation_bar.keyboard_shortcuts": "Accorte cù a tastera",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Scunnettassi",
   "navigation_bar.mutes": "Utilizatori piattati",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Statuti puntarulati",
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.public_timeline": "Linea pubblica glubale",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Sicurità",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
   "notification.follow": "{name} v'hà seguitatu",
   "notification.follow_request": "{name} vole abbunassi à u vostru contu",
@@ -306,13 +400,16 @@
   "notification.poll": "Un scandagliu induve avete vutatu hè finitu",
   "notification.reblog": "{name} hà spartutu u vostru statutu",
   "notification.status": "{name} hà appena pubblicatu",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Purgà e nutificazione",
   "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
   "notifications.column_settings.favourite": "Favuriti:",
   "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
   "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
-  "notifications.column_settings.filter_bar.show": "Mustrà",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Abbunati novi:",
   "notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
   "notifications.column_settings.mention": "Minzione:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Mustrà indè a colonna",
   "notifications.column_settings.sound": "Sunà",
   "notifications.column_settings.status": "Statuti novi:",
-  "notifications.column_settings.unread_markers.category": "Marcatori di nutificazione micca lette",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Tuttu",
   "notifications.filter.boosts": "Spartere",
   "notifications.filter.favourites": "Favuriti",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# votu} other {# voti}}",
   "poll.vote": "Vutà",
   "poll.voted": "Avete vutatu per sta risposta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# votu} other {# voti}}",
   "poll_button.add_poll": "Aghjunghje",
   "poll_button.remove_poll": "Toglie u scandagliu",
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
   "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direttu",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Privatu",
-  "privacy.public.long": "Mustrà à tuttu u mondu nant'à e linee pubbliche",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.long": "Ùn mette micca nant'à e linee pubbliche",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Micca listatu",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",
   "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
   "relative_time.days": "{number}ghj",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "avà",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oghji",
   "reply_indicator.cancel": "Annullà",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Trasferisce à {target}",
   "report.forward_hint": "U contu hè nant'à un'altru servore. Vulete ancu mandà una copia anonima di u signalamentu quallà?",
-  "report.hint": "U signalamentu sarà mandatu à i muderatori di u servore. Pudete spiegà perchè avete palisatu stu contu quì sottu:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Altri cummenti",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Mandà",
   "report.target": "Signalamentu di {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Circà",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Ricerca avanzata",
   "search_popout.tips.full_text": "I testi simplici rimandanu i statuti ch'avete scritti, aghjunti à i vostri favuriti, spartuti o induve quelli site mintuvatu·a, è ancu i cugnomi, nomi pubblichi è hashtag chì currispondenu.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Un testu simplice rimanda i nomi pubblichi, cugnomi è hashtag",
   "search_popout.tips.user": "utilizatore",
   "search_results.accounts": "Ghjente",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtag",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Statuti",
   "search_results.statuses_fts_disabled": "A ricerca di i cuntinuti di i statuti ùn hè micca attivata nant'à stu servore Mastodon.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Apre l'interfaccia di muderazione per @{name}",
   "status.admin_status": "Apre stu statutu in l'interfaccia di muderazione",
   "status.block": "Bluccà @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Toglie",
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.direct": "Mandà un missaghju @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Integrà",
   "status.favourite": "Aghjunghje à i favuriti",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtratu",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Per avà nisunu hà spartutu u statutu. Quandu qualch'unu u sparterà, u so contu sarà mustratu quì.",
   "status.redraft": "Sguassà è riscrive",
   "status.remove_bookmark": "Toglie segnalibru",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Risponde",
   "status.replyAll": "Risponde à tutti",
   "status.report": "Palisà @{name}",
   "status.sensitive_warning": "Cuntinutu sensibile",
   "status.share": "Sparte",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Ripiegà",
   "status.show_less_all": "Ripiegà tuttu",
   "status.show_more": "Slibrà",
   "status.show_more_all": "Slibrà tuttu",
-  "status.show_thread": "Vede u filu",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Micca dispunibule",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",
   "status.unpin": "Spuntarulà da u prufile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Righjittà a pruposta",
   "suggestions.header": "Site forse interessatu·a da…",
   "tabs_bar.federated_timeline": "Glubale",
   "tabs_bar.home": "Accolta",
   "tabs_bar.local_timeline": "Lucale",
   "tabs_bar.notifications": "Nutificazione",
-  "tabs_bar.search": "Cercà",
   "time_remaining.days": "{number, plural, one {# ghjornu ferma} other {# ghjorni fermanu}}",
   "time_remaining.hours": "{number, plural, one {# ora ferma} other {# ore fermanu}}",
   "time_remaining.minutes": "{number, plural, one {# minuta ferma} other {# minute fermanu}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Abbunati",
   "timeline_hint.resources.follows": "Abbunamenti",
   "timeline_hint.resources.statuses": "Statuti più anziani",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona chì parla} other {{counter} persone chì parlanu}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tindenze d'avà",
   "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
   "units.short.billion": "{count}G",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Ùn si pò micca caricà fugliali cù i scandagli.",
   "upload_form.audio_description": "Discrizzione per i ciochi",
   "upload_form.description": "Discrizzione per i malvistosi",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Mudificà",
   "upload_form.thumbnail": "Cambià vignetta",
   "upload_form.undo": "Sguassà",
   "upload_form.video_description": "Discrizzione per i ciochi o cechi",
   "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
   "upload_modal.apply": "Affettà",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Appiegazione…",
   "upload_modal.choose_image": "Cambià ritrattu",
   "upload_modal.description_placeholder": "Chì tempi brevi ziu, quandu solfeghji",
   "upload_modal.detect_text": "Ditettà testu da u ritrattu",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Priparazione di l'OCR…",
   "upload_modal.preview_label": "Vista ({ratio})",
   "upload_progress.label": "Caricamentu...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Chjudà a video",
   "video.download": "Scaricà fugliale",
   "video.exit_fullscreen": "Caccià u pienu screnu",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 636fbd4ea..39ebaac23 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -1,70 +1,104 @@
 {
+  "about.blocks": "Moderované servery",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon je svobodný software s otevřeným zdrojovým kódem a ochranná známka společnosti Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Důvod není k dispozici",
+  "about.domain_blocks.preamble": "Mastodon umožňuje prohlížet obsah a komunikovat s uživateli jakéhokoliv serveru ve fediversu. Pro tento konkrétní server se vztahují následující výjimky.",
+  "about.domain_blocks.silenced.explanation": "Uživatele a obsah tohoto serveru neuvidíte, pokud je nebudete výslovně hledat nebo je nezačnete sledovat.",
+  "about.domain_blocks.silenced.title": "Omezeno",
+  "about.domain_blocks.suspended.explanation": "Žádná data z tohoto serveru nebudou zpracovávána, uložena ani vyměňována, což znemožňuje jakoukoli interakci nebo komunikaci s uživateli z tohoto serveru.",
+  "about.domain_blocks.suspended.title": "Pozastaveno",
+  "about.not_available": "Tato informace nebyla zpřístupněna na tomto serveru.",
+  "about.powered_by": "Decentralizovaná sociální média poháněná {mastodon}",
+  "about.rules": "Pravidla serveru",
   "account.account_note_header": "Poznámka",
   "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
-  "account.block": "Zablokovat @{name}",
+  "account.block": "Blokovat @{name}",
   "account.block_domain": "Blokovat doménu {domain}",
-  "account.blocked": "Blokováno",
+  "account.blocked": "Blokovaný",
   "account.browse_more_on_origin_server": "Více na původním profilu",
   "account.cancel_follow_request": "Zrušit žádost o sledování",
   "account.direct": "Poslat @{name} přímou zprávu",
-  "account.disable_notifications": "Zrušit upozorňování na příspěvky @{name}",
+  "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
   "account.domain_blocked": "Doména blokována",
   "account.edit_profile": "Upravit profil",
-  "account.enable_notifications": "Oznámit mě na příspěvky @{name}",
+  "account.enable_notifications": "Oznamovat mi příspěvky @{name}",
   "account.endorse": "Zvýraznit na profilu",
+  "account.featured_tags.last_status_at": "Poslední příspěvek {date}",
+  "account.featured_tags.last_status_never": "Žádné příspěvky",
+  "account.featured_tags.title": "Hlavní hashtagy uživatele {name}",
   "account.follow": "Sledovat",
   "account.followers": "Sledující",
-  "account.followers.empty": "Tohoto uživatele ještě nikdo nesleduje.",
+  "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledující} few {{counter} Sledující} many {{counter} Sledujících} other {{counter} Sledujících}}",
+  "account.following": "Sledujete",
   "account.following_counter": "{count, plural, one {{counter} Sledovaný} few {{counter} Sledovaní} many {{counter} Sledovaných} other {{counter} Sledovaných}}",
-  "account.follows.empty": "Tento uživatel ještě nikoho nesleduje.",
+  "account.follows.empty": "Tento uživatel zatím nikoho nesleduje.",
   "account.follows_you": "Sleduje vás",
+  "account.go_to_profile": "Přejít na profil",
   "account.hide_reblogs": "Skrýt boosty od @{name}",
-  "account.joined": "Založen {date}",
-  "account.last_status": "Naposledy aktivní",
+  "account.joined_short": "Připojen/a",
+  "account.languages": "Změnit odebírané jazyky",
   "account.link_verified_on": "Vlastnictví tohoto odkazu bylo zkontrolováno {date}",
   "account.locked_info": "Stav soukromí tohoto účtu je nastaven na zamčeno. Jeho vlastník ručně posuzuje, kdo ho může sledovat.",
   "account.media": "Média",
   "account.mention": "Zmínit @{name}",
-  "account.moved_to": "Uživatel {name} se přesunul na:",
+  "account.moved_to": "Uživatel {name} uvedl, že jeho nový účet je nyní:",
   "account.mute": "Skrýt @{name}",
   "account.mute_notifications": "Skrýt oznámení od @{name}",
-  "account.muted": "Skryt",
-  "account.never_active": "Nikdy",
+  "account.muted": "Skrytý",
+  "account.open_original_page": "Otevřít původní stránku",
   "account.posts": "Příspěvky",
   "account.posts_with_replies": "Příspěvky a odpovědi",
   "account.report": "Nahlásit @{name}",
   "account.requested": "Čeká na schválení. Kliknutím žádost o sledování zrušíte",
-  "account.share": "Sdílet profil uživatele @{name}",
+  "account.requested_follow": "{name} tě požádal o sledování",
+  "account.share": "Sdílet profil @{name}",
   "account.show_reblogs": "Zobrazit boosty od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Příspěvek} few {{counter} Příspěvky} many {{counter} Příspěvků} other {{counter} Příspěvků}}",
   "account.unblock": "Odblokovat @{name}",
   "account.unblock_domain": "Odblokovat doménu {domain}",
+  "account.unblock_short": "Odblokovat",
   "account.unendorse": "Nezvýrazňovat na profilu",
   "account.unfollow": "Přestat sledovat",
   "account.unmute": "Zrušit skrytí @{name}",
   "account.unmute_notifications": "Zrušit skrytí oznámení od @{name}",
+  "account.unmute_short": "Zrušit skrytí",
   "account_note.placeholder": "Klikněte pro přidání poznámky",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Zkuste to prosím znovu za {retry_time, time, medium}.",
+  "admin.dashboard.daily_retention": "Míra udržení uživatelů podle dne po registraci",
+  "admin.dashboard.monthly_retention": "Míra udržení uživatelů podle měsíce po registraci",
+  "admin.dashboard.retention.average": "Průměr",
+  "admin.dashboard.retention.cohort": "Měsíc registrace",
+  "admin.dashboard.retention.cohort_size": "Noví uživatelé",
+  "alert.rate_limited.message": "Zkuste to prosím znovu po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Spojení omezena",
   "alert.unexpected.message": "Objevila se neočekávaná chyba.",
   "alert.unexpected.title": "Jejda!",
   "announcement.announcement": "Oznámení",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(nezpracováno)",
+  "audio.hide": "Skrýt zvuk",
   "autosuggest_hashtag.per_week": "{count} za týden",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
-  "bundle_column_error.body": "Při načítání této komponenty se něco pokazilo.",
-  "bundle_column_error.retry": "Zkuste to znovu",
-  "bundle_column_error.title": "Chyba sítě",
+  "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
+  "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
+  "bundle_column_error.error.title": "Ale ne!",
+  "bundle_column_error.network.body": "Při pokusu o načtení této stránky došlo k chybě. To může být způsobeno dočasným problémem s připojením k internetu nebo k tomuto serveru.",
+  "bundle_column_error.network.title": "Chyba sítě",
+  "bundle_column_error.retry": "Zkusit znovu",
+  "bundle_column_error.return": "Zpět na domovskou stránku",
+  "bundle_column_error.routing.body": "Požadovaná stránka nebyla nalezena. Opravdu je URL v adresním řádku správně?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zavřít",
-  "bundle_modal_error.message": "Při načítání této komponenty se něco pokazilo.",
+  "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.",
   "bundle_modal_error.retry": "Zkusit znovu",
+  "closed_registrations.other_server_instructions": "Protože Mastodon je decentralizovaný, můžete si vytvořit účet na jiném serveru a přesto komunikovat s tímto serverem.",
+  "closed_registrations_modal.description": "V současné době není možné vytvořit účet na {domain}, ale mějte prosím na paměti, že k používání Mastodonu nepotřebujete účet konkrétně na {domain}.",
+  "closed_registrations_modal.find_another_server": "Najít jiný server",
+  "closed_registrations_modal.preamble": "Mastodon je decentralizovaný, takže bez ohledu na to, kde vytvoříte svůj účet, budete moci sledovat a komunikovat s kýmkoli na tomto serveru. Můžete ho dokonce hostovat!",
+  "closed_registrations_modal.title": "Registrace na Mastodon",
+  "column.about": "O aplikaci",
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Záložky",
   "column.community": "Místní časová osa",
@@ -90,128 +124,182 @@
   "community.column_settings.local_only": "Pouze místní",
   "community.column_settings.media_only": "Pouze média",
   "community.column_settings.remote_only": "Pouze vzdálené",
-  "compose_form.direct_message_warning": "Tento příspěvek bude odeslán pouze zmíněným uživatelům.",
+  "compose.language.change": "Změnit jazyk",
+  "compose.language.search": "Prohledat jazyky...",
   "compose_form.direct_message_warning_learn_more": "Zjistit více",
-  "compose_form.hashtag_warning": "Tento příspěvek nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné příspěvky mohou být vyhledány podle hashtagu.",
+  "compose_form.encryption_warning": "Příspěvky na Mastodonu nejsou end-to-end šifrovány. Nesdílejte přes Mastodon žádné citlivé informace.",
+  "compose_form.hashtag_warning": "Tento příspěvek nebude zobrazen pod žádným hashtagem, neboť je neveřejný. Pouze veřejné příspěvky mohou být vyhledány podle hashtagu.",
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
-  "compose_form.lock_disclaimer.lock": "uzamčen",
+  "compose_form.lock_disclaimer.lock": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
   "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Doba trvání ankety",
   "compose_form.poll.option_placeholder": "Volba {number}",
-  "compose_form.poll.remove_option": "Odstranit tuto volbu",
-  "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více možností",
-  "compose_form.poll.switch_to_single": "Povolit u ankety výběr jediné možnosti",
-  "compose_form.publish": "Odeslat",
+  "compose_form.poll.remove_option": "Odebrat tuto volbu",
+  "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
+  "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
+  "compose_form.publish": "Zveřejnit",
+  "compose_form.publish_form": "Zveřejnit",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Uložit změny",
   "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
   "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
-  "compose_form.spoiler.marked": "Odstranit varování o obsahu",
+  "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
   "compose_form.spoiler_placeholder": "Sem napište vaše varování",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
-  "confirmations.block.message": "Opravdu chcete zablokovat {name}?",
+  "confirmations.block.message": "Opravdu chcete blokovat {name}?",
+  "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
+  "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
   "confirmations.delete.confirm": "Smazat",
   "confirmations.delete.message": "Opravdu chcete smazat tento příspěvek?",
   "confirmations.delete_list.confirm": "Smazat",
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Zahodit",
+  "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
   "confirmations.domain_block.confirm": "Blokovat celou doménu",
-  "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí zablokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
-  "confirmations.logout.confirm": "Odhlásit",
+  "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
+  "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
   "confirmations.mute.confirm": "Skrýt",
-  "confirmations.mute.explanation": "Tohle skryje uživatelovi příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
-  "confirmations.mute.message": "Opravdu chcete {name} skrýt?",
+  "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
+  "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
   "confirmations.redraft.confirm": "Smazat a přepsat",
-  "confirmations.redraft.message": "Jste si jistí, že chcete smazat a přepsat tento příspěvek? Oblíbení a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
+  "confirmations.redraft.message": "Opravdu chcete smazat a přepsat tento příspěvek? Oblíbení a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
   "confirmations.reply.confirm": "Odpovědět",
   "confirmations.reply.message": "Odpověď přepíše vaši rozepsanou zprávu. Opravdu chcete pokračovat?",
   "confirmations.unfollow.confirm": "Přestat sledovat",
   "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
   "conversation.delete": "Smazat konverzaci",
-  "conversation.mark_as_read": "Označit jako přečtenou",
+  "conversation.mark_as_read": "Označit jako přečtené",
   "conversation.open": "Zobrazit konverzaci",
   "conversation.with": "S {names}",
+  "copypaste.copied": "Zkopírováno",
+  "copypaste.copy": "Zkopírovat",
   "directory.federated": "Ze známého fedivesmíru",
-  "directory.local": "Pouze z domény {domain}",
+  "directory.local": "Pouze z {domain}",
   "directory.new_arrivals": "Nově příchozí",
   "directory.recently_active": "Nedávno aktivní",
+  "disabled_account_banner.account_settings": "Nastavení účtu",
+  "disabled_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován.",
+  "dismissable_banner.community_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí, jejichž účty hostuje {domain}.",
+  "dismissable_banner.dismiss": "Zavřít",
+  "dismissable_banner.explore_links": "O těchto zprávách hovoří lidé na tomto a dalších serverech decentralizované sítě právě teď.",
+  "dismissable_banner.explore_statuses": "Tyto příspěvky z tohoto a dalších serverů v decentralizované síti nyní na tomto serveru získávají na popularitě.",
+  "dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.",
+  "dismissable_banner.public_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí na tomto a jiných serverech decentralizované sítě, o kterých tento server ví.",
   "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
   "embed.preview": "Takhle to bude vypadat:",
   "emoji_button.activity": "Aktivita",
+  "emoji_button.clear": "Vyčistit",
   "emoji_button.custom": "Vlastní",
   "emoji_button.flags": "Vlajky",
   "emoji_button.food": "Jídla a nápoje",
   "emoji_button.label": "Vložit emoji",
   "emoji_button.nature": "Příroda",
-  "emoji_button.not_found": "Nenalezeny žádné odpovídající emoji",
+  "emoji_button.not_found": "Nebyly nalezeny žádné odpovídající emoji",
   "emoji_button.objects": "Předměty",
   "emoji_button.people": "Lidé",
   "emoji_button.recent": "Často používané",
-  "emoji_button.search": "Hledat…",
+  "emoji_button.search": "Hledat...",
   "emoji_button.search_results": "Výsledky hledání",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestování a místa",
-  "empty_column.account_suspended": "Účet pozastaven",
+  "empty_column.account_suspended": "Účet je pozastaven",
   "empty_column.account_timeline": "Nejsou tu žádné příspěvky!",
-  "empty_column.account_unavailable": "Profil nedostupný",
+  "empty_column.account_unavailable": "Profil není dostupný",
   "empty_column.blocks": "Ještě jste nezablokovali žádného uživatele.",
-  "empty_column.bookmarked_statuses": "Ještě nemáte v záložkách žádné příspěvky. Pokud si do nich nějaký přidáte, zobrazí se zde.",
+  "empty_column.bookmarked_statuses": "Zatím v záložkách nemáte žádné příspěvky. Až si do nich nějaký přidáte, zobrazí se zde.",
   "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!",
-  "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
-  "empty_column.domain_blocks": "Ještě nemáte žádné blokované domény.",
-  "empty_column.favourited_statuses": "Ještě nemáte žádné oblíbené příspěvky. Pokud si nějaký oblíbíte, zobrazí se zde.",
-  "empty_column.favourites": "Tento příspěvek si ještě nikdo neoblíbil. Pokud to někdo udělá, zobrazí se zde.",
-  "empty_column.follow_recommendations": "Zdá se, že pro vás nelze vygenerovat žádné návrhy. Můžete zkusit přes vyhledávání naleznout lidi, které znáte, nebo prozkoumat populární hashtagy.",
-  "empty_column.follow_requests": "Ještě nemáte žádné žádosti o sledování. Pokud nějakou obdržíte, zobrazí se zde.",
-  "empty_column.hashtag": "Pod tímto hashtagem ještě nic není.",
+  "empty_column.direct": "Zatím nemáte žádné přímé zprávy. Až nějakou pošlete nebo dostanete, zobrazí se zde.",
+  "empty_column.domain_blocks": "Ještě nemáte žádné zablokované domény.",
+  "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!",
+  "empty_column.favourited_statuses": "Zatím nemáte žádné oblíbené příspěvky. Až si nějaký oblíbíte, zobrazí se zde.",
+  "empty_column.favourites": "Tento příspěvek si zatím nikdo neoblíbil. Až to někdo udělá, zobrazí se zde.",
+  "empty_column.follow_recommendations": "Zdá se, že pro vás nelze vygenerovat žádné návrhy. Můžete zkusit přes vyhledávání nalézt lidi, které znáte, nebo prozkoumat populární hashtagy.",
+  "empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.",
+  "empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.",
   "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí. {suggestions}",
-  "empty_column.home.suggestions": "Prohlédnout návrhy",
-  "empty_column.list": "V tomto seznamu ještě nic není. Pokud nějaký člen z tohoto seznamu napíše nový příspěvek, objeví se zde.",
-  "empty_column.lists": "Ještě nemáte žádný seznam. Pokud nějaký vytvoříte, zobrazí se zde.",
-  "empty_column.mutes": "Ještě jste neskryli žádného uživatele.",
-  "empty_column.notifications": "Momentálně nemáte žádná oznámení. Jakmile s vámi někdo bude interagovat, uvidíte to zde.",
+  "empty_column.home.suggestions": "Prohlédněte si návrhy",
+  "empty_column.list": "V tomto seznamu zatím nic není. Až nějaký člen z tohoto seznamu zveřejní nový příspěvek, objeví se zde.",
+  "empty_column.lists": "Zatím nemáte žádné seznamy. Až nějaký vytvoříte, zobrazí se zde.",
+  "empty_column.mutes": "Zatím jste neskryli žádného uživatele.",
+  "empty_column.notifications": "Zatím nemáte žádná oznámení. Až s vámi někdo bude interagovat, uvidíte to zde.",
   "empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte ručně sledovat uživatele z jiných serverů, aby tu něco přibylo",
-  "error.unexpected_crash.explanation": "Kvůli chybě v našem kódu nebo problému s kompatibilitou prohlížeče nemohla být tato stránka načtena správně.",
+  "error.unexpected_crash.explanation": "Kvůli chybě v našem kódu nebo problému s kompatibilitou prohlížeče nemohla být tato stránka správně zobrazena.",
   "error.unexpected_crash.explanation_addons": "Tuto stránku nelze správně zobrazit. Takovou chybu obvykle způsobuje doplněk prohlížeče nebo nástroje pro automatický překlad.",
   "error.unexpected_crash.next_steps": "Zkuste stránku načíst znovu. Pokud to nepomůže, zkuste Mastodon používat pomocí jiného prohlížeče nebo nativní aplikace.",
   "error.unexpected_crash.next_steps_addons": "Zkuste je vypnout a stránku obnovit. Pokud to nepomůže, zkuste otevřít Mastodon v jiném prohlížeči nebo nativní aplikaci.",
   "errors.unexpected_crash.copy_stacktrace": "Zkopírovat stacktrace do schránky",
   "errors.unexpected_crash.report_issue": "Nahlásit problém",
+  "explore.search_results": "Výsledky hledání",
+  "explore.suggested_follows": "Pro vás",
+  "explore.title": "Objevit",
+  "explore.trending_links": "Zprávy",
+  "explore.trending_statuses": "Příspěvky",
+  "explore.trending_tags": "Hashtagy",
+  "filter_modal.added.context_mismatch_explanation": "Tato kategorie filtrů se nevztahuje na kontext, ve kterém jste tento příspěvek otevřeli. Pokud chcete, aby byl příspěvek filtrován i v tomto kontextu, budete muset filtr upravit.",
+  "filter_modal.added.context_mismatch_title": "Kontext se neshoduje!",
+  "filter_modal.added.expired_explanation": "Tato kategorie filtrů vypršela, budete muset změnit datum vypršení platnosti, aby mohla být použita.",
+  "filter_modal.added.expired_title": "Platnost filtru vypršela!",
+  "filter_modal.added.review_and_configure": "Chcete-li zkontrolovat a dále konfigurovat tuto kategorii filtrů, přejděte do {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Nastavení filtru",
+  "filter_modal.added.settings_link": "stránka nastavení",
+  "filter_modal.added.short_explanation": "Tento příspěvek byl přidán do následující kategorie filtrů: {title}.",
+  "filter_modal.added.title": "Filtr byl přidán!",
+  "filter_modal.select_filter.context_mismatch": "nevztahuje se na tento kontext",
+  "filter_modal.select_filter.expired": "platnost vypršela",
+  "filter_modal.select_filter.prompt_new": "Nová kategorie: {name}",
+  "filter_modal.select_filter.search": "Vyhledat nebo vytvořit",
+  "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
+  "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
+  "filter_modal.title.status": "Filtrovat příspěvek",
   "follow_recommendations.done": "Hotovo",
   "follow_recommendations.heading": "Sledujte lidi, jejichž příspěvky chcete vidět! Tady jsou nějaké návrhy.",
-  "follow_recommendations.lead": "Příspěvky od lidí, které sledujete, se budou objevovat v chronologickém pořadí ve vaší domovské ose. Nebojte se, že uděláte chybu, můžete lidi stejně snadno kdykoliv přestat sledovat!",
+  "follow_recommendations.lead": "Příspěvky od lidí, které sledujete, se budou objevovat v chronologickém pořadí ve vašem domovském kanálu. Nebojte se, že uděláte chybu, stejně snadno můžete lidi kdykoliv přestat sledovat!",
   "follow_request.authorize": "Autorizovat",
-  "follow_request.reject": "Odmítnout",
-  "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, {domain} si myslí, že budete chtít následující požadavky na sledování zkontrolovat ručně.",
+  "follow_request.reject": "Zamítnout",
+  "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
+  "footer.about": "O aplikaci",
+  "footer.directory": "Adresář profilů",
+  "footer.get_app": "Získat aplikaci",
+  "footer.invite": "Pozvat lidi",
+  "footer.keyboard_shortcuts": "Klávesové zkratky",
+  "footer.privacy_policy": "Zásady ochrany osobních údajů",
+  "footer.source_code": "Zobrazit zdrojový kód",
   "generic.saved": "Uloženo",
-  "getting_started.developers": "Vývojáři",
-  "getting_started.directory": "Adresář profilů",
-  "getting_started.documentation": "Dokumentace",
   "getting_started.heading": "Začínáme",
-  "getting_started.invite": "Pozvat lidi",
-  "getting_started.open_source_notice": "Mastodon je otevřený software. Přispět do jeho vývoje nebo hlásit chyby můžete na GitHubu {github}.",
-  "getting_started.security": "Nastavení účtu",
-  "getting_started.terms": "Podmínky používání",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "nebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "hashtag.column_settings.select.no_options_message": "Nenalezeny žádné návrhy",
+  "hashtag.column_settings.select.no_options_message": "Nebyly nalezeny žádné návrhy",
   "hashtag.column_settings.select.placeholder": "Zadejte hashtagy…",
   "hashtag.column_settings.tag_mode.all": "Všechny z těchto",
-  "hashtag.column_settings.tag_mode.any": "Jakékoliv z těchto",
-  "hashtag.column_settings.tag_mode.none": "Žádné z těchto",
-  "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci dodatečné tagy",
+  "hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
+  "hashtag.column_settings.tag_mode.none": "Žádný z těchto",
+  "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
+  "hashtag.follow": "Sledovat hashtag",
+  "hashtag.unfollow": "Přestat sledovat hashtag",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
   "home.hide_announcements": "Skrýt oznámení",
   "home.show_announcements": "Zobrazit oznámení",
+  "interaction_modal.description.favourite": "Pokud máte účet na Mastodonu, můžete tento příspěvek označit jako oblíbený a dát tak autorovi najevo, že si ho vážíte, a uložit si ho na později.",
+  "interaction_modal.description.follow": "S účtem na Mastodonu můžete sledovat uživatele {name} a přijímat příspěvky ve vašem domovském kanálu.",
+  "interaction_modal.description.reblog": "S účtem na Mastodonu můžete boostnout tento příspěvek a sdílet jej s vlastními sledujícími.",
+  "interaction_modal.description.reply": "S účtem na Mastodonu můžete odpovědět na tento příspěvek.",
+  "interaction_modal.on_another_server": "Na jiném serveru",
+  "interaction_modal.on_this_server": "Na tomto serveru",
+  "interaction_modal.other_server_instructions": "Zkopírujte a vložte tuto URL adresu do vyhledávacího pole vaší oblíbené Mastodon aplikace nebo webového rozhraní vašeho Mastodon serveru.",
+  "interaction_modal.preamble": "Protože Mastodon je decentralizovaný, pokud nemáte účet na tomto serveru, můžete použít svůj existující účet hostovaný jiným Mastodon serverem nebo kompatibilní platformou.",
+  "interaction_modal.title.favourite": "Oblíbit si příspěvek od uživatele {name}",
+  "interaction_modal.title.follow": "Sledovat {name}",
+  "interaction_modal.title.reblog": "Boostnout příspěvek uživatele {name}",
+  "interaction_modal.title.reply": "Odpovědět na příspěvek uživatele {name}",
   "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodin} other {# hodin}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",
@@ -219,12 +307,12 @@
   "keyboard_shortcuts.blocked": "Otevřít seznam blokovaných uživatelů",
   "keyboard_shortcuts.boost": "Boostnout příspěvek",
   "keyboard_shortcuts.column": "Focus na sloupec",
-  "keyboard_shortcuts.compose": "Focus na textové pole nového příspěvku",
+  "keyboard_shortcuts.compose": "Zaměřit se na textové pole nového příspěvku",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "Otevřít sloupec přímých zpráv",
-  "keyboard_shortcuts.down": "Posunout dolů v seznamu",
+  "keyboard_shortcuts.direct": "k otevření sloupce přímých zpráv",
+  "keyboard_shortcuts.down": "Posunout v seznamu dolů",
   "keyboard_shortcuts.enter": "Otevřít příspěvek",
-  "keyboard_shortcuts.favourite": "Oblíbit příspěvek",
+  "keyboard_shortcuts.favourite": "Oblíbit si příspěvek",
   "keyboard_shortcuts.favourites": "Otevřít seznam oblíbených",
   "keyboard_shortcuts.federated": "Otevřít federovanou časovou osu",
   "keyboard_shortcuts.heading": "Klávesové zkratky",
@@ -236,24 +324,26 @@
   "keyboard_shortcuts.muted": "Otevřít seznam skrytých uživatelů",
   "keyboard_shortcuts.my_profile": "Otevřít váš profil",
   "keyboard_shortcuts.notifications": "Otevřít sloupec oznámení",
-  "keyboard_shortcuts.open_media": "Otevřít media",
+  "keyboard_shortcuts.open_media": "Otevřít média",
   "keyboard_shortcuts.pinned": "Otevřít seznam připnutých příspěvků",
   "keyboard_shortcuts.profile": "Otevřít autorův profil",
   "keyboard_shortcuts.reply": "Odpovědět na příspěvek",
   "keyboard_shortcuts.requests": "Otevřít seznam žádostí o sledování",
-  "keyboard_shortcuts.search": "Focus na vyhledávací lištu",
+  "keyboard_shortcuts.search": "Zaměřit se na vyhledávací lištu",
   "keyboard_shortcuts.spoilers": "Zobrazit/skrýt pole varování o obsahu",
   "keyboard_shortcuts.start": "Otevřít sloupec „začínáme“",
   "keyboard_shortcuts.toggle_hidden": "Zobrazit/skrýt text za varováním o obsahu",
   "keyboard_shortcuts.toggle_sensitivity": "Zobrazit/skrýt média",
   "keyboard_shortcuts.toot": "Začít nový příspěvek",
-  "keyboard_shortcuts.unfocus": "Zrušit focus nového příspěvku/hledání",
-  "keyboard_shortcuts.up": "Posunout nahoru v seznamu",
+  "keyboard_shortcuts.unfocus": "Zrušit zaměření na nový příspěvek/hledání",
+  "keyboard_shortcuts.up": "Posunout v seznamu nahoru",
   "lightbox.close": "Zavřít",
-  "lightbox.compress": "Zobrazit celý obrázek najednou",
-  "lightbox.expand": "Ukázat obrázek v plné velikosti",
+  "lightbox.compress": "Sbalit pole zobrazení obrázku",
+  "lightbox.expand": "Rozbalit pole zobrazení obrázku",
   "lightbox.next": "Další",
   "lightbox.previous": "Předchozí",
+  "limited_account_hint.action": "Přesto profil zobrazit",
+  "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.",
   "lists.account.add": "Přidat do seznamu",
   "lists.account.remove": "Odebrat ze seznamu",
   "lists.delete": "Smazat seznam",
@@ -261,43 +351,47 @@
   "lists.edit.submit": "Změnit název",
   "lists.new.create": "Přidat seznam",
   "lists.new.title_placeholder": "Název nového seznamu",
-  "lists.replies_policy.followed": "Sledované uživatele",
-  "lists.replies_policy.list": "Členy seznamu",
-  "lists.replies_policy.none": "Nikoho",
-  "lists.replies_policy.title": "Zobrazovat odpovědi na:",
+  "lists.replies_policy.followed": "Sledovaným uživatelům",
+  "lists.replies_policy.list": "Členům seznamu",
+  "lists.replies_policy.none": "Nikomu",
+  "lists.replies_policy.title": "Odpovědi zobrazovat:",
   "lists.search": "Hledejte mezi lidmi, které sledujete",
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
-  "loading_indicator.label": "Načítání…",
+  "loading_indicator.label": "Načítání...",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "missing_indicator.label": "Nenalezeno",
   "missing_indicator.sublabel": "Tento zdroj se nepodařilo najít",
+  "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
   "mute_modal.duration": "Trvání",
   "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
   "mute_modal.indefinite": "Neomezeně",
-  "navigation_bar.apps": "Mobilní aplikace",
+  "navigation_bar.about": "O aplikaci",
   "navigation_bar.blocks": "Blokovaní uživatelé",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Místní časová osa",
   "navigation_bar.compose": "Vytvořit nový příspěvek",
   "navigation_bar.direct": "Přímé zprávy",
-  "navigation_bar.discover": "Objevujte",
+  "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
   "navigation_bar.edit_profile": "Upravit profil",
+  "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
   "navigation_bar.follow_requests": "Žádosti o sledování",
   "navigation_bar.follows_and_followers": "Sledovaní a sledující",
-  "navigation_bar.info": "O tomto serveru",
-  "navigation_bar.keyboard_shortcuts": "Klávesové zkratky",
   "navigation_bar.lists": "Seznamy",
-  "navigation_bar.logout": "Odhlásit",
+  "navigation_bar.logout": "Odhlásit se",
   "navigation_bar.mutes": "Skrytí uživatelé",
   "navigation_bar.personal": "Osobní",
   "navigation_bar.pins": "Připnuté příspěvky",
   "navigation_bar.preferences": "Předvolby",
   "navigation_bar.public_timeline": "Federovaná časová osa",
+  "navigation_bar.search": "Hledat",
   "navigation_bar.security": "Zabezpečení",
+  "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
+  "notification.admin.report": "Uživatel {name} nahlásil {target}",
+  "notification.admin.sign_up": "Uživatel {name} se zaregistroval",
   "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
   "notification.follow": "Uživatel {name} vás začal sledovat",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
@@ -305,14 +399,17 @@
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
-  "notification.status": "Nový příspěvek od {name}",
-  "notifications.clear": "Smazat oznámení",
+  "notification.status": "Uživatel {name} právě přidal příspěvek",
+  "notification.update": "Uživatel {name} upravil příspěvek",
+  "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
+  "notifications.column_settings.admin.report": "Nová hlášení:",
+  "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
   "notifications.column_settings.favourite": "Oblíbení:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
-  "notifications.column_settings.filter_bar.show": "Zobrazit",
+  "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
   "notifications.column_settings.mention": "Zmínky:",
@@ -322,14 +419,16 @@
   "notifications.column_settings.show": "Zobrazit ve sloupci",
   "notifications.column_settings.sound": "Přehrát zvuk",
   "notifications.column_settings.status": "Nové příspěvky:",
-  "notifications.column_settings.unread_markers.category": "Značky nepřečtených oznámení",
+  "notifications.column_settings.unread_notifications.category": "Nepřečtená oznámení",
+  "notifications.column_settings.unread_notifications.highlight": "Zvýraznit nepřečtená oznámení",
+  "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Vše",
   "notifications.filter.boosts": "Boosty",
   "notifications.filter.favourites": "Oblíbení",
   "notifications.filter.follows": "Sledování",
   "notifications.filter.mentions": "Zmínky",
   "notifications.filter.polls": "Výsledky anket",
-  "notifications.filter.statuses": "Aktuality od lidí, které sledujete",
+  "notifications.filter.statuses": "Aktualizace od lidí, které sledujete",
   "notifications.grant_permission": "Udělit oprávnění.",
   "notifications.group": "{count} oznámení",
   "notifications.mark_as_read": "Označit všechna oznámení jako přečtená",
@@ -337,44 +436,88 @@
   "notifications.permission_denied_alert": "Oznámení na ploše není možné zapnout, protože oprávnění bylo v minulosti zamítnuto",
   "notifications.permission_required": "Oznámení na ploše nejsou k dispozici, protože nebylo uděleno potřebné oprávnění.",
   "notifications_permission_banner.enable": "Povolit oznámení na ploše",
-  "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
+  "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
-  "picture_in_picture.restore": "Vložit zpět",
+  "picture_in_picture.restore": "Vrátit zpět",
   "poll.closed": "Uzavřeno",
   "poll.refresh": "Obnovit",
   "poll.total_people": "{count, plural, one {# člověk} few {# lidé} many {# lidí} other {# lidí}}",
   "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasů} other {# hlasů}}",
   "poll.vote": "Hlasovat",
-  "poll.voted": "Pro tuto odpověď jste hlasovali",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Hlasovali jste pro tuto odpověď",
+  "poll.votes": "{votes, plural, one {# hlas} few {# hlasy} many {# hlasů} other {# hlasů}}",
   "poll_button.add_poll": "Přidat anketu",
-  "poll_button.remove_poll": "Odstranit anketu",
+  "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelné pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Přímý",
-  "privacy.private.long": "Viditelné pouze pro sledující",
-  "privacy.private.short": "Pouze pro sledující",
-  "privacy.public.long": "Viditelné pro všechny, i ve veřejných časových osách",
-  "privacy.public.short": "Veřejný",
-  "privacy.unlisted.long": "Viditelné pro všechny, ale ne ve veřejných časových osách",
-  "privacy.unlisted.short": "Neuvedený",
+  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
+  "privacy.direct.short": "Pouze zmínění lidé",
+  "privacy.private.long": "Viditelný pouze pro sledující",
+  "privacy.private.short": "Pouze sledující",
+  "privacy.public.long": "Viditelný pro všechny",
+  "privacy.public.short": "Veřejné",
+  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
+  "privacy.unlisted.short": "Neveřejný",
+  "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
+  "privacy_policy.title": "Zásady ochrany osobních údajů",
   "refresh": "Obnovit",
   "regeneration_indicator.label": "Načítání…",
   "regeneration_indicator.sublabel": "Váš domovský kanál se připravuje!",
   "relative_time.days": "{number} d",
+  "relative_time.full.days": "před {number, plural, one {# dnem} few {# dny} many {# dny} other {# dny}}",
+  "relative_time.full.hours": "před {number, plural, one {# hodinou} few {# hodinami} many {# hodinami} other {# hodinami}}",
+  "relative_time.full.just_now": "právě teď",
+  "relative_time.full.minutes": "před {number, plural, one {# minutou} few {# minutami} many {# minutami} other {# minutami}}",
+  "relative_time.full.seconds": "před {number, plural, one {# sekundou} few {# sekundami} many {# sekundami} other {# sekundami}}",
   "relative_time.hours": "{number} h",
   "relative_time.just_now": "teď",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušit",
-  "report.forward": "Přeposlat na {target}",
+  "report.block": "Blokovat",
+  "report.block_explanation": "Neuvidíte příspěvky tohoto uživatele. On neuvidí vaše příspěvky, ani vás nebude moci sledovat. Pozná, že je blokován.",
+  "report.categories.other": "Ostatní",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Obsah porušuje jedno nebo více pravidel serveru",
+  "report.category.subtitle": "Vyberte nejbližší možnost",
+  "report.category.title": "Povězte nám, proč chcete tento {type} nahlásit",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "příspěvek",
+  "report.close": "Hotovo",
+  "report.comment.title": "Je ještě něco jiného, co myslíte, že bychom měli vědět?",
+  "report.forward": "Přeposlat do {target}",
   "report.forward_hint": "Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii hlášení?",
-  "report.hint": "Hlášení bude zasláno moderátorům vašeho serveru. Níže můžete uvést, proč tento účet nahlašujete:",
-  "report.placeholder": "Dodatečné komentáře",
+  "report.mute": "Skrýt",
+  "report.mute_explanation": "Neuvidíte příspěvky tohoto uživatele. On vás může nadále sledovat i vidět vaše příspěvky a nebude vědět, že je skryt.",
+  "report.next": "Další",
+  "report.placeholder": "Další komentáře",
+  "report.reasons.dislike": "Nelíbí se mi to",
+  "report.reasons.dislike_description": "Není to něco, co chcete vidět",
+  "report.reasons.other": "Je to něco jiného",
+  "report.reasons.other_description": "Problém neodpovídá ostatním kategoriím",
+  "report.reasons.spam": "Je to spam",
+  "report.reasons.spam_description": "Škodlivé odkazy, falešné interakce nebo opakované odpovědi",
+  "report.reasons.violation": "Porušuje to pravidla serveru",
+  "report.reasons.violation_description": "Máte za to, že to porušuje konkrétní pravidla",
+  "report.rules.subtitle": "Vyberte všechna relevantní",
+  "report.rules.title": "Která pravidla to porušuje?",
+  "report.statuses.subtitle": "Vyberte všechny relevantní",
+  "report.statuses.title": "Existují příspěvky dokládající toto hlášení?",
   "report.submit": "Odeslat",
-  "report.target": "Nahlášení uživatele {target}",
+  "report.target": "Nahlašování uživatele {target}",
+  "report.thanks.take_action": "Tady jsou vaše možnosti pro řízení toho, co na Mastodonu vidíte:",
+  "report.thanks.take_action_actionable": "Zatímco to posuzujeme, můžete podniknout akce proti @{name}:",
+  "report.thanks.title": "Nechcete tohle vidět?",
+  "report.thanks.title_actionable": "Děkujeme za nahlášení, podíváme se na to.",
+  "report.unfollow": "Přestat sledovat @{name}",
+  "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
+  "report_notification.categories.other": "Ostatní",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Porušení pravidla",
+  "report_notification.open": "Otevřít hlášení",
   "search.placeholder": "Hledat",
+  "search.search_or_paste": "Hledat nebo vložit URL",
   "search_popout.search_format": "Pokročilé hledání",
   "search_popout.tips.full_text": "Jednoduchý text vrací příspěvky, které jste napsali, oblíbili si, boostnuli, nebo vás v nich někdo zmínil, a také odpovídající přezdívky, zobrazovaná jména a hashtagy.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,30 +525,49 @@
   "search_popout.tips.text": "Jednoduchý text vrací odpovídající zobrazovaná jména, přezdívky a hashtagy",
   "search_popout.tips.user": "uživatel",
   "search_results.accounts": "Lidé",
+  "search_results.all": "Vše",
   "search_results.hashtags": "Hashtagy",
+  "search_results.nothing_found": "Pro tyto hledané výrazy nebylo nic nenalezeno",
   "search_results.statuses": "Příspěvky",
   "search_results.statuses_fts_disabled": "Vyhledávání příspěvků podle jejich obsahu není na tomto Mastodon serveru povoleno.",
+  "search_results.title": "Hledat {q}",
   "search_results.total": "{count, number} {count, plural, one {výsledek} few {výsledky} many {výsledků} other {výsledků}}",
+  "server_banner.about_active_users": "Lidé používající tento server během posledních 30 dní (měsíční aktivní uživatelé)",
+  "server_banner.active_users": "aktivní uživatelé",
+  "server_banner.administered_by": "Spravováno:",
+  "server_banner.introduction": "{domain} je součástí decentralizované sociální sítě běžící na {mastodon}.",
+  "server_banner.learn_more": "Zjistit více",
+  "server_banner.server_stats": "Statistiky serveru:",
+  "sign_in_banner.create_account": "Vytvořit účet",
+  "sign_in_banner.sign_in": "Přihlásit se",
+  "sign_in_banner.text": "Přihlaste se pro sledování profilů nebo hashtagů, oblíbení, sdílení a odpovědí na příspěvky nebo interakci z vašeho účtu na jiném serveru.",
   "status.admin_account": "Otevřít moderátorské rozhraní pro @{name}",
   "status.admin_status": "Otevřít tento příspěvek v moderátorském rozhraní",
-  "status.block": "Zablokovat @{name}",
+  "status.block": "Blokovat @{name}",
   "status.bookmark": "Přidat do záložek",
-  "status.cancel_reblog_private": "Zrušit boost",
+  "status.cancel_reblog_private": "Zrušit boostnutí",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
   "status.copy": "Zkopírovat odkaz na příspěvek",
   "status.delete": "Smazat",
   "status.detailed_status": "Podrobné zobrazení konverzace",
   "status.direct": "Poslat @{name} přímou zprávu",
+  "status.edit": "Upravit",
+  "status.edited": "Upraveno {date}",
+  "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
+  "status.filter": "Filtrovat tento příspěvek",
   "status.filtered": "Filtrováno",
-  "status.load_more": "Zobrazit více",
-  "status.media_hidden": "Média skryta",
+  "status.hide": "Skrýt příspěvek",
+  "status.history.created": "Uživatel {name} vytvořil {date}",
+  "status.history.edited": "Uživatel {name} upravil {date}",
+  "status.load_more": "Načíst více",
+  "status.media_hidden": "Média jsou skryta",
   "status.mention": "Zmínit @{name}",
   "status.more": "Více",
   "status.mute": "Skrýt @{name}",
   "status.mute_conversation": "Skrýt konverzaci",
-  "status.open": "Otevřít tento příspěvek",
+  "status.open": "Rozbalit tento příspěvek",
   "status.pin": "Připnout na profil",
   "status.pinned": "Připnutý příspěvek",
   "status.read_more": "Číst více",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
   "status.redraft": "Smazat a přepsat",
   "status.remove_bookmark": "Odstranit ze záložek",
+  "status.replied_to": "Odpověděl/a uživateli {name}",
   "status.reply": "Odpovědět",
   "status.replyAll": "Odpovědět na vlákno",
   "status.report": "Nahlásit @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Sdílet",
+  "status.show_filter_reason": "Přesto zobrazit",
   "status.show_less": "Zobrazit méně",
   "status.show_less_all": "Zobrazit méně pro všechny",
   "status.show_more": "Zobrazit více",
   "status.show_more_all": "Zobrazit více pro všechny",
-  "status.show_thread": "Zobrazit vlákno",
+  "status.show_original": "Zobrazit originál",
+  "status.translate": "Přeložit",
+  "status.translated_from_with": "Přeloženo z {lang} pomocí {provider}",
   "status.uncached_media_warning": "Nedostupné",
-  "status.unmute_conversation": "Odkrýt konverzaci",
+  "status.unmute_conversation": "Zrušit skrytí konverzace",
   "status.unpin": "Odepnout z profilu",
+  "subscribed_languages.lead": "Ve vašem domovském kanálu a časových osách se po změně budou objevovat pouze příspěvky ve vybraných jazycích. Pro příjem příspěvků ve všech jazycích nevyberte žádný jazyk.",
+  "subscribed_languages.save": "Uložit změny",
+  "subscribed_languages.target": "Změnit odebírané jazyky na {target}",
   "suggestions.dismiss": "Odmítnout návrh",
   "suggestions.header": "Mohlo by vás zajímat…",
-  "tabs_bar.federated_timeline": "Federovaná",
+  "tabs_bar.federated_timeline": "Federované",
   "tabs_bar.home": "Domů",
   "tabs_bar.local_timeline": "Místní",
   "tabs_bar.notifications": "Oznámení",
-  "tabs_bar.search": "Hledat",
   "time_remaining.days": "{number, plural, one {Zbývá # den} few {Zbývají # dny} many {Zbývá # dní} other {Zbývá # dní}}",
   "time_remaining.hours": "{number, plural, one {Zbývá # hodina} few {Zbývají # hodiny} many {Zbývá # hodin} other {Zbývá # hodin}}",
   "time_remaining.minutes": "{number, plural, one {Zbývá # minuta} few {Zbývají # minuty} many {Zbývá # minut} other {Zbývá # minut}}",
   "time_remaining.moments": "Zbývá několik sekund",
   "time_remaining.seconds": "{number, plural, one {Zbývá # sekunda} few {Zbývají # sekundy} many {Zbývá # sekund} other {Zbývá # sekund}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z jiných serveru se nezobrazuje.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z jiných serverů se nezobrazují.",
   "timeline_hint.resources.followers": "Sledující",
-  "timeline_hint.resources.follows": "Sleduje",
+  "timeline_hint.resources.follows": "Sledovaní",
   "timeline_hint.resources.statuses": "Starší příspěvky",
-  "trends.counter_by_accounts": "zmiňuje {count, plural, one {{counter} člověk} few {{counter} lidé} many {{counter} lidí} other {{counter} lidí}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} člověk} few {{counter} lidé} many {{counter} lidí} other {{counter} lidí}} za poslední {days, plural, one {den} few {{days} dny} many {{days} dnů} other {{days} dnů}}",
   "trends.trending_now": "Právě populární",
   "ui.beforeunload": "Pokud Mastodon opustíte, váš koncept se ztratí.",
   "units.short.billion": "{count} mld.",
@@ -453,16 +621,17 @@
   "upload_area.title": "Nahrajte přetažením",
   "upload_button.label": "Přidat obrázky, video nebo audio soubor",
   "upload_error.limit": "Byl překročen limit nahraných souborů.",
-  "upload_error.poll": "U anket není nahrávání souborů povoleno.",
+  "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "upload_form.audio_description": "Popis pro sluchově postižené",
   "upload_form.description": "Popis pro zrakově postižené",
+  "upload_form.description_missing": "Nebyl přidán popis",
   "upload_form.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
   "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
   "upload_modal.analyzing_picture": "Analyzuji obrázek…",
   "upload_modal.apply": "Použít",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplikuji…",
   "upload_modal.choose_image": "Vybrat obrázek",
   "upload_modal.description_placeholder": "Příliš žluťoučký kůň úpěl ďábelské ódy",
   "upload_modal.detect_text": "Detekovat text z obrázku",
@@ -470,12 +639,13 @@
   "upload_modal.hint": "Kliknutím na nebo přetáhnutím kruhu na náhledu vyberte oblast, která bude na všech náhledech vždy zobrazen.",
   "upload_modal.preparing_ocr": "Příprava OCR…",
   "upload_modal.preview_label": "Náhled ({ratio})",
-  "upload_progress.label": "Nahrávání…",
+  "upload_progress.label": "Nahrávání...",
+  "upload_progress.processing": "Zpracovávání…",
   "video.close": "Zavřít video",
   "video.download": "Stáhnout soubor",
   "video.exit_fullscreen": "Ukončit režim celé obrazovky",
-  "video.expand": "Otevřít video",
-  "video.fullscreen": "Celá obrazovka",
+  "video.expand": "Rozbalit video",
+  "video.fullscreen": "Režim celé obrazovky",
   "video.hide": "Skrýt video",
   "video.mute": "Vypnout zvuk",
   "video.pause": "Pauza",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 2f8c09014..f38bfb0dd 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -1,83 +1,117 @@
 {
+  "about.blocks": "Gweinyddion sy'n cael eu cymedroli",
+  "about.contact": "Cysylltwch â:",
+  "about.disclaimer": "Mae Mastodon yn feddalwedd rhydd, cod agored ac o dan hawlfraint Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
+  "about.domain_blocks.preamble": "Yn gyffredinol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffederasiwn a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
+  "about.domain_blocks.silenced.explanation": "Yn gyffredinol, fyddwch chi ddim yn gweld proffiliau a chynnwys o'r gweinydd hwn, oni bai eich bod yn chwilio'n benodol amdano neu yn ymuno drwy ei ddilyn.",
+  "about.domain_blocks.silenced.title": "Cyfyngedig",
+  "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei storio na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
+  "about.domain_blocks.suspended.title": "Ataliwyd",
+  "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
+  "about.powered_by": "Cyfrwng cymdeithasol datganoledig yn cael ei yrru gan {mastodon}",
+  "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn",
   "account.add_or_remove_from_list": "Ychwanegu neu Dileu o'r rhestrau",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grŵp",
   "account.block": "Blocio @{name}",
-  "account.block_domain": "Cuddio popeth rhag {domain}",
+  "account.block_domain": "Blocio parth {domain}",
   "account.blocked": "Blociwyd",
   "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
-  "account.cancel_follow_request": "Canslo cais dilyn",
+  "account.cancel_follow_request": "Tynnu nôl cais i ddilyn",
   "account.direct": "Neges breifat @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Parth wedi ei guddio",
+  "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
+  "account.domain_blocked": "Parth wedi ei flocio",
   "account.edit_profile": "Golygu proffil",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Arddangos ar fy mhroffil",
+  "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
+  "account.endorse": "Dangos ar fy mhroffil",
+  "account.featured_tags.last_status_at": "Y postiad diwethaf ar {date}",
+  "account.featured_tags.last_status_never": "Dim postiadau",
+  "account.featured_tags.title": "hashnodau dan sylw {name}",
   "account.follow": "Dilyn",
   "account.followers": "Dilynwyr",
-  "account.followers.empty": "Nid oes neb yn dilyn y defnyddiwr hwn eto.",
-  "account.followers_counter": "{count, plural, one {{counter} Ddilynwr} other {{counter} o Ddilynwyr}}",
-  "account.following_counter": "{count, plural, one {{counter} yn Dilyn} other {{counter} yn Dilyn}}",
+  "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
+  "account.followers_counter": "{count, plural, one {Dilynwr: {counter}} other {Dilynwyr: {counter}}}",
+  "account.following": "Yn dilyn",
+  "account.following_counter": "{count, plural, one {Yn dilyn: {counter}} other {Yn dilyn: {counter}}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.follows_you": "Yn eich dilyn chi",
-  "account.hide_reblogs": "Cuddio bwstiau o @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Gweithredol olaf",
+  "account.go_to_profile": "Mynd i'r proffil",
+  "account.hide_reblogs": "Cuddio hybiau gan @{name}",
+  "account.joined_short": "Wedi Ymuno",
+  "account.languages": "Newid ieithoedd wedi tanysgrifio iddyn nhw",
   "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
-  "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i gloi. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
+  "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i fod ar glo. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
   "account.media": "Cyfryngau",
   "account.mention": "Crybwyll @{name}",
-  "account.moved_to": "Mae @{name} wedi symud i:",
-  "account.mute": "Tawelu @{name}",
-  "account.mute_notifications": "Cuddio hysbysiadau o @{name}",
-  "account.muted": "Distewyd",
-  "account.never_active": "Byth",
-  "account.posts": "Tŵtiau",
-  "account.posts_with_replies": "Tŵtiau ac atebion",
+  "account.moved_to": "Mae {name} wedi nodi fod eu cyfrif newydd yn:",
+  "account.mute": "Tewi @{name}",
+  "account.mute_notifications": "Tewi hysbysiadau o @{name}",
+  "account.muted": "Wedi tewi",
+  "account.open_original_page": "Agor y dudalen wreiddiol",
+  "account.posts": "Postiadau",
+  "account.posts_with_replies": "Postiadau ac atebion",
   "account.report": "Adrodd @{name}",
   "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
+  "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.share": "Rhannwch broffil @{name}",
-  "account.show_reblogs": "Dangos bwstiau o @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Dŵt} other {{counter} o Dŵtiau}}",
+  "account.show_reblogs": "Dangos hybiau gan @{name}",
+  "account.statuses_counter": "{count, plural, one {Postiad: {counter}} other {Postiad: {counter}}}",
   "account.unblock": "Dadflocio @{name}",
-  "account.unblock_domain": "Dadguddio {domain}",
-  "account.unendorse": "Peidio a'i arddangos ar fy mhroffil",
+  "account.unblock_domain": "Dadflocio parth {domain}",
+  "account.unblock_short": "Dadflocio",
+  "account.unendorse": "Peidio a'i ddangos ar fy mhroffil",
   "account.unfollow": "Dad-ddilyn",
-  "account.unmute": "Dad-dawelu @{name}",
-  "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
+  "account.unmute": "Dad-dewi {name}",
+  "account.unmute_notifications": "Dad-dewi hysbysiadau o @{name}",
+  "account.unmute_short": "Dad-anwybyddu",
   "account_note.placeholder": "Clicio i ychwanegu nodyn",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
+  "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru",
+  "admin.dashboard.retention.average": "Cyfartaledd",
+  "admin.dashboard.retention.cohort": "Mis cofrestru",
+  "admin.dashboard.retention.cohort_size": "Defnyddwyr newydd",
   "alert.rate_limited.message": "Ceisiwch eto ar ôl {retry_time, time, medium}.",
   "alert.rate_limited.title": "Cyfradd gyfyngedig",
   "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
   "alert.unexpected.title": "Wps!",
   "announcement.announcement": "Cyhoeddiad",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(heb eu prosesu)",
+  "audio.hide": "Cuddio sain",
   "autosuggest_hashtag.per_week": "{count} yr wythnos",
-  "boost_modal.combo": "Mae modd gwasgu {combo} er mwyn sgipio hyn tro nesa",
-  "bundle_column_error.body": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
+  "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
+  "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
+  "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
+  "bundle_column_error.error.title": "O na!",
+  "bundle_column_error.network.body": "Bu gwall wrth geisio llwytho'r dudalen hon. Gall hyn fod oherwydd anhawster dros-dro gyda'ch cysylltiad gwe neu'r gweinydd hwn.",
+  "bundle_column_error.network.title": "Gwall rhwydwaith",
   "bundle_column_error.retry": "Ceisiwch eto",
-  "bundle_column_error.title": "Gwall rhwydwaith",
+  "bundle_column_error.return": "Mynd nôl adref",
+  "bundle_column_error.routing.body": "Nid oedd modd canfod y dudalen honno. Ydych chi'n siŵr fod yr URL yn y bar cyfeiriad yn gywir?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cau",
   "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
-  "bundle_modal_error.retry": "Ceiswich eto",
+  "bundle_modal_error.retry": "Ceisiwch eto",
+  "closed_registrations.other_server_instructions": "Gan fod Mastodon yn ddatganoledig, gallwch greu cyfrif ar weinydd arall a dal i ryngweithio gyda hwn.",
+  "closed_registrations_modal.description": "Ar hyn o bryd nid yw'n bosib creu cyfrif ar {domain}, ond cadwch mewn cof nad oes raid i chi gael cyfrif yn benodol ar {domain} i ddefnyddio Mastodon.",
+  "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall",
+  "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!",
+  "closed_registrations_modal.title": "Ymgofrestru ar Mastodon",
+  "column.about": "Ynghylch",
   "column.blocks": "Defnyddwyr a flociwyd",
-  "column.bookmarks": "Tudalnodau",
+  "column.bookmarks": "Nodau tudalen",
   "column.community": "Ffrwd lleol",
   "column.direct": "Negeseuon preifat",
   "column.directory": "Pori proffiliau",
-  "column.domain_blocks": "Parthau cuddiedig",
+  "column.domain_blocks": "Parthau wedi'u blocio",
   "column.favourites": "Ffefrynnau",
   "column.follow_requests": "Ceisiadau dilyn",
-  "column.home": "Hafan",
+  "column.home": "Cartref",
   "column.lists": "Rhestrau",
-  "column.mutes": "Defnyddwyr a ddistewyd",
+  "column.mutes": "Defnyddwyr wedi'u tewi",
   "column.notifications": "Hysbysiadau",
-  "column.pins": "Tŵtiau wedi eu pinio",
+  "column.pins": "Postiadau wedi eu pinio",
   "column.public": "Ffrwd y ffederasiwn",
   "column_back_button.label": "Nôl",
   "column_header.hide_settings": "Cuddio dewisiadau",
@@ -89,115 +123,155 @@
   "column_subheading.settings": "Gosodiadau",
   "community.column_settings.local_only": "Lleol yn unig",
   "community.column_settings.media_only": "Cyfryngau yn unig",
-  "community.column_settings.remote_only": "Anghysbell yn unig",
-  "compose_form.direct_message_warning": "Mi fydd y tŵt hwn ond yn cael ei anfon at y defnyddwyr sy'n cael eu crybwyll.",
+  "community.column_settings.remote_only": "Pell yn unig",
+  "compose.language.change": "Newid iaith",
+  "compose.language.search": "Chwilio ieithoedd...",
   "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
-  "compose_form.hashtag_warning": "Ni fydd y tŵt hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond tŵtiau cyhoeddus gellid chwilota amdanynt drwy hashnod.",
-  "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich tŵtiau dilynwyr-yn-unig.",
+  "compose_form.encryption_warning": "Dyw postiadau ar Mastodon ddim wedi'u hamgryptio o ben i ben. Peidiwch â rhannu unrhyw wybodaeth sensitif dros Mastodon.",
+  "compose_form.hashtag_warning": "Ni fydd y post hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond postiadau cyhoeddus gellid chwilio amdanynt drwy hashnod.",
+  "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
-  "compose_form.poll.add_option": "Ychwanegu Dewisiad",
+  "compose_form.poll.add_option": "Ychwanegu dewis",
   "compose_form.poll.duration": "Cyfnod pleidlais",
-  "compose_form.poll.option_placeholder": "Dewisiad {number}",
-  "compose_form.poll.remove_option": "Tynnu'r dewisiad",
+  "compose_form.poll.option_placeholder": "Dewis {number}",
+  "compose_form.poll.remove_option": "Tynnu'r dewis",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
-  "compose_form.publish": "Tŵt",
+  "compose_form.publish": "Cyhoeddi",
+  "compose_form.publish_form": "Cyhoeddi",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Cadw newidiadau",
   "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
   "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
   "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
   "compose_form.spoiler.marked": "Testun wedi ei guddio gan rybudd",
   "compose_form.spoiler.unmarked": "Nid yw'r testun wedi ei guddio",
   "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
-  "confirmation_modal.cancel": "Canslo",
+  "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n sicr eich bod eisiau blocio {name}?",
+  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
+  "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
-  "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y tŵt hwn?",
+  "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
   "confirmations.delete_list.confirm": "Dileu",
-  "confirmations.delete_list.message": "Ydych chi'n sicr eich bod eisiau dileu y rhestr hwn am byth?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Cuddio parth cyfan",
-  "confirmations.domain_block.message": "A ydych yn hollol, hollol sicr eich bod am flocio y {domain} cyfan? Yn y nifer helaeth o achosion mae blocio neu tawelu ambell gyfrif yn ddigonol ac yn well. Ni fyddwch yn gweld cynnwys o'r parth hwnnw mewn unrhyw ffrydiau cyhoeddus na chwaith yn eich hysbysiadau. Bydd hyn yn cael gwared o'ch dilynwyr o'r parth hwnnw.",
+  "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu y rhestr hwn am byth?",
+  "confirmations.discard_edit_media.confirm": "Dileu",
+  "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg, eu taflu beth bynnag?",
+  "confirmations.domain_block.confirm": "Blocio parth cyfan",
+  "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
-  "confirmations.mute.confirm": "Tawelu",
-  "confirmations.mute.explanation": "Bydd hyn yn cuddio pyst oddi wrthynt a physt sydd yn sôn amdanynt, ond bydd hyn dal yn gadael iddyn nhw gweld eich pyst a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi'n sicr eich bod am ddistewi {name}?",
-  "confirmations.redraft.confirm": "Dileu & ailddrafftio",
-  "confirmations.redraft.message": "Ydych chi'n siwr eich bod eisiau dileu y tŵt hwn a'i ailddrafftio? Bydd ffefrynnau a bwstiau'n cael ei colli, a bydd ymatebion i'r tŵt gwreiddiol yn cael eu hamddifadu.",
+  "confirmations.mute.confirm": "Tewi",
+  "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
+  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
+  "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
+  "confirmations.redraft.message": "Ydych chi wir eisiau dileu y postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd ymatebion i'r postiad gwreiddiol yn cael eu hamddifadu.",
   "confirmations.reply.confirm": "Ateb",
-  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n sicr yr ydych am barhau?",
-  "confirmations.unfollow.confirm": "Dad-ddilynwch",
-  "confirmations.unfollow.message": "Ydych chi'n sicr eich bod am ddad-ddilyn {name}?",
+  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
+  "confirmations.unfollow.confirm": "Dad-ddilyn",
+  "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
   "conversation.with": "Gyda {names}",
-  "directory.federated": "O ffedysawd hysbys",
+  "copypaste.copied": "Wedi ei gopïo",
+  "copypaste.copy": "Copïo",
+  "directory.federated": "O'r fydysawd cyfan",
   "directory.local": "O {domain} yn unig",
-  "directory.new_arrivals": "Newydd-ddyfodiaid",
-  "directory.recently_active": "Yn weithredol yn ddiweddar",
-  "embed.instructions": "Mewnblannwch y tŵt hwn ar eich gwefan drwy gopïo'r côd isod.",
+  "directory.new_arrivals": "Defnyddwyr newydd",
+  "directory.recently_active": "Ar-lein yn ddiweddar",
+  "disabled_account_banner.account_settings": "Gosodiadau'r cyfrif",
+  "disabled_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd.",
+  "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl gyda chyfrifon ar {domain}.",
+  "dismissable_banner.dismiss": "Diddymu",
+  "dismissable_banner.explore_links": "Mae'r straeon newyddion hyn yn cael eu trafod gan bobl ar y gweinydd hwn a rhai eraill ar y rhwydwaith datganoledig hwn, ar hyn o bryd.",
+  "dismissable_banner.explore_statuses": "Mae'r postiadau hyn o'r gweinydd hwn a gweinyddion eraill yn y rhwydwaith datganoledig yn denu sylw ar y gweinydd hwn ar hyn o bryd.",
+  "dismissable_banner.explore_tags": "Mae'r hashnodau hyn yn denu sylw ymhlith pobl ar y gweinydd hwn a gweinyddwyr eraill y rhwydwaith datganoledig ar hyn o bryd.",
+  "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y gweinydd hwn a gweinyddwyr eraill y rhwydwaith datganoledig y mae'r gweinydd hwn yn gwybod amdano.",
+  "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
   "embed.preview": "Dyma sut olwg fydd arno:",
   "emoji_button.activity": "Gweithgarwch",
+  "emoji_button.clear": "Clirio",
   "emoji_button.custom": "Unigryw",
   "emoji_button.flags": "Baneri",
-  "emoji_button.food": "Bwyd a Diod",
+  "emoji_button.food": "Bwyd & Diod",
   "emoji_button.label": "Mewnosodwch emoji",
   "emoji_button.nature": "Natur",
-  "emoji_button.not_found": "Dim emojau!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Dim emojau'n cydweddu",
   "emoji_button.objects": "Gwrthrychau",
   "emoji_button.people": "Pobl",
-  "emoji_button.recent": "Defnyddir yn aml",
+  "emoji_button.recent": "Defnydd cyffredin",
   "emoji_button.search": "Chwilio...",
   "emoji_button.search_results": "Canlyniadau chwilio",
   "emoji_button.symbols": "Symbolau",
-  "emoji_button.travel": "Teithio & Llefydd",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "Dim tŵtiau fama!",
+  "emoji_button.travel": "Teithio a Llefydd",
+  "empty_column.account_suspended": "Cyfrif wedi'i atal",
+  "empty_column.account_timeline": "Dim postiadau yma!",
   "empty_column.account_unavailable": "Proffil ddim ar gael",
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
-  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw dwtiau tudalnodiedig eto. Pan y byddwch yn tudalnodi un, mi fydd yn ymddangos yma.",
-  "empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
-  "empty_column.direct": "Nid oes gennych unrhyw negeseuon preifat eto. Pan y byddwch yn anfon neu derbyn un, mi fydd yn ymddangos yma.",
+  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel nodau tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
+  "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth yn gyhoeddus?",
+  "empty_column.direct": "Does gennych unrhyw negeseuon preifat eto. Pan byddwch yn anfon neu derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
-  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff dwtiau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
-  "empty_column.favourites": "Nid oes neb wedi hoffi'r tŵt yma eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan dderbyniwch chi un, byddent yn ymddangos yma.",
+  "empty_column.explore_statuses": "Does dim trendio ar hyn o bryd. Dewch nôl nes ymlaen!",
+  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
+  "empty_column.favourites": "Does neb wedi hoffi'r post hwn eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
+  "empty_column.follow_recommendations": "Does dim awgrymiadau yma i chi. Gallwch geisio chwilio am bobl yr ydych yn eu hadnabod neu archwilio hashnodau sy'n trendio.",
+  "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan fyddwch yn derbyn un, byddan nhw'n ymddangos yma.",
   "empty_column.hashtag": "Nid oes dim ar yr hashnod hwn eto.",
-  "empty_column.home": "Mae eich ffrwd gartref yn wag! Ymwelwch a {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd a defnyddwyr eraill.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "Nid oes dim yn y rhestr yma eto. Pan y bydd aelodau'r rhestr yn cyhoeddi statws newydd, mi fydd yn ymddangos yma.",
-  "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan grëwch chi un, mi fydd yn ymddangos yma.",
-  "empty_column.mutes": "Nid ydych wedi tawelu unrhyw ddefnyddwyr eto.",
-  "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ac eraill i ddechrau'r sgwrs.",
-  "empty_column.public": "Does dim byd yma! Ysgrifennwch rhywbeth yn gyhoeddus, neu dilynwch ddefnyddwyr o achosion eraill i'w lenwi",
+  "empty_column.home": "Mae eich ffrwd gartref yn wag! Ymwelwch â {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd â defnyddwyr eraill.",
+  "empty_column.home.suggestions": "Dyma rai awgrymiadau",
+  "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
+  "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
+  "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
+  "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
+  "empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
   "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Ceisiwch ail-lwytho y dudalen. Os nad yw hyn yn eich helpu, efallai gallech defnyddio Mastodon trwy borwr neu ap brodorol gwahanol.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.explanation_addons": "Nid oes modd dangos y dudalen hon yn gywir. Mae'r gwall hwn yn debygol o gael ei achosi gan ategyn porwr neu offer cyfieithu awtomatig.",
+  "error.unexpected_crash.next_steps": "Ceisiwch ail-lwytho'r dudalen. Os nad yw hyn yn eich helpu, efallai gallwch ddefnyddio Mastodon trwy borwr neu ap brodorol gwahanol.",
+  "error.unexpected_crash.next_steps_addons": "Ceisiwch eu hanalluogi ac adnewyddu'r dudalen. Os nad yw hynny'n helpu, efallai y byddwch yn dal i allu defnyddio Mastodon trwy borwr neu ap cynhenid arall.",
   "errors.unexpected_crash.copy_stacktrace": "Copïo'r olrhain stac i'r clipfwrdd",
   "errors.unexpected_crash.report_issue": "Rhoi gwybod am broblem",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "Caniatau",
+  "explore.search_results": "Canlyniadau chwilio",
+  "explore.suggested_follows": "I chi",
+  "explore.title": "Archwilio",
+  "explore.trending_links": "Newyddion",
+  "explore.trending_statuses": "Postiadau",
+  "explore.trending_tags": "Hashnodau",
+  "filter_modal.added.context_mismatch_explanation": "Nid yw'r categori hidlo hwn yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
+  "filter_modal.added.context_mismatch_title": "Diffyg cyfatebiaeth cyd-destun!",
+  "filter_modal.added.expired_explanation": "Mae'r categori hidlydd hwn wedi dod i ben, bydd angen i chi newid y dyddiad dod i ben er mwyn iddo fod yn berthnasol.",
+  "filter_modal.added.expired_title": "Hidlydd wedi dod i ben!",
+  "filter_modal.added.review_and_configure": "I adolygu a ffurfweddu'r categori hidlydd hwn ymhellach, ewch i'r {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Gosodiadau hidlo",
+  "filter_modal.added.settings_link": "tudalen gosodiadau",
+  "filter_modal.added.short_explanation": "Mae'r postiad hwn wedi'i ychwanegu at y categori hidlo canlynol: {title}.",
+  "filter_modal.added.title": "Hidlydd wedi'i ychwanegu!",
+  "filter_modal.select_filter.context_mismatch": "nid yw'n berthnasol i'r cyd-destun hwn",
+  "filter_modal.select_filter.expired": "daeth i ben",
+  "filter_modal.select_filter.prompt_new": "Categori newydd: {name}",
+  "filter_modal.select_filter.search": "Chwilio neu greu",
+  "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
+  "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
+  "filter_modal.title.status": "Hidlo postiad",
+  "follow_recommendations.done": "Wedi gorffen",
+  "follow_recommendations.heading": "Dilynwch y bobl yr hoffech chi weld eu postiadau! Dyma ambell i awgrymiad.",
+  "follow_recommendations.lead": "Bydd postiadau gan bobl rydych chi'n eu dilyn yn ymddangos mewn trefn amser ar eich ffrwd cartref. Peidiwch â bod ofn gwneud camgymeriadau, gallwch chi ddad-ddilyn pobl yr un mor hawdd unrhyw bryd!",
+  "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
-  "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, oedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "footer.about": "Ynghylch",
+  "footer.directory": "Cyfeiriadur proffiliau",
+  "footer.get_app": "Lawrlwytho'r ap",
+  "footer.invite": "Gwahodd pobl",
+  "footer.keyboard_shortcuts": "Bysellau brys",
+  "footer.privacy_policy": "Polisi preifatrwydd",
+  "footer.source_code": "Gweld y cod ffynhonnell",
   "generic.saved": "Wedi'i Gadw",
-  "getting_started.developers": "Datblygwyr",
-  "getting_started.directory": "Cyfeiriadur proffil",
-  "getting_started.documentation": "Dogfennaeth",
   "getting_started.heading": "Dechrau",
-  "getting_started.invite": "Gwahodd pobl",
-  "getting_started.open_source_notice": "Mae Mastodon yn feddalwedd côd agored. Mae modd cyfrannu neu adrodd materion ar GitHUb ar {github}.",
-  "getting_started.security": "Diogelwch",
-  "getting_started.terms": "Telerau Gwasanaeth",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "neu {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
@@ -207,278 +281,374 @@
   "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
   "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Dilynwch yr hashnod",
+  "hashtag.unfollow": "Dad-ddilyn hashnod",
   "home.column_settings.basic": "Syml",
-  "home.column_settings.show_reblogs": "Dangos bŵstiau",
-  "home.column_settings.show_replies": "Dangos ymatebion",
+  "home.column_settings.show_reblogs": "Dangos hybiau",
+  "home.column_settings.show_replies": "Dangos atebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.show_announcements": "Dangos cyhoeddiadau",
-  "intervals.full.days": "{number, plural, one {# ddydd} other {# o ddyddiau}}",
+  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn i roi gwybod i'r awdur eich bod chi'n ei werthfawrogi a'i gadw ar gyfer nes ymlaen.",
+  "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
+  "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
+  "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
+  "interaction_modal.on_another_server": "Ar weinydd gwahanol",
+  "interaction_modal.on_this_server": "Ar y gweinydd hwn",
+  "interaction_modal.other_server_instructions": "Copïwch a gludo'r URL hwn i faes chwilio eich hoff ap Mastodon neu ryngwyneb gwe eich gweinydd Mastodon.",
+  "interaction_modal.preamble": "Gan fod Mastodon wedi'i ddatganoli, gallwch ddefnyddio'ch cyfrif presennol a gynhelir gan weinydd Mastodon arall neu blatfform cydnaws os nad oes gennych gyfrif ar yr un hwn.",
+  "interaction_modal.title.favourite": "Hoffi postiad {name}",
+  "interaction_modal.title.follow": "Dilyn {name}",
+  "interaction_modal.title.reblog": "Hybu postiad {name}",
+  "interaction_modal.title.reply": "Ymateb i bostiad {name}",
+  "intervals.full.days": "{number, plural, one {# dydd} two {# ddydd} other {# o ddyddiau}}",
   "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
   "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
-  "keyboard_shortcuts.back": "i lywio nôl",
+  "keyboard_shortcuts.back": "Llywio nôl",
   "keyboard_shortcuts.blocked": "i agor rhestr defnyddwyr a flociwyd",
-  "keyboard_shortcuts.boost": "i fŵstio",
-  "keyboard_shortcuts.column": "i ffocysu tŵt yn un o'r colofnau",
-  "keyboard_shortcuts.compose": "i ffocysu yr ardal cyfansoddi testun",
+  "keyboard_shortcuts.boost": "Hybu postiad",
+  "keyboard_shortcuts.column": "Ffocysu colofn",
+  "keyboard_shortcuts.compose": "Ffocysu ar ardal cyfansoddi testun",
   "keyboard_shortcuts.description": "Disgrifiad",
   "keyboard_shortcuts.direct": "i agor colofn negeseuon preifat",
-  "keyboard_shortcuts.down": "i symud lawr yn y rhestr",
-  "keyboard_shortcuts.enter": "i agor tŵt",
-  "keyboard_shortcuts.favourite": "i hoffi",
-  "keyboard_shortcuts.favourites": "i agor rhestr hoffi",
-  "keyboard_shortcuts.federated": "i agor ffrwd y ffederasiwn",
-  "keyboard_shortcuts.heading": "Llwybrau byr allweddell",
-  "keyboard_shortcuts.home": "i agor ffrwd cartref",
-  "keyboard_shortcuts.hotkey": "Bysell brys",
-  "keyboard_shortcuts.legend": "i ddangos yr arwr yma",
-  "keyboard_shortcuts.local": "i agor ffrwd lleol",
-  "keyboard_shortcuts.mention": "i grybwyll yr awdur",
-  "keyboard_shortcuts.muted": "i agor rhestr defnyddwyr a dawelwyd",
-  "keyboard_shortcuts.my_profile": "i agor eich proffil",
-  "keyboard_shortcuts.notifications": "i agor colofn hysbysiadau",
-  "keyboard_shortcuts.open_media": "i agor cyfryngau",
-  "keyboard_shortcuts.pinned": "i agor rhestr tŵtiau wedi'i pinio",
-  "keyboard_shortcuts.profile": "i agor proffil yr awdur",
-  "keyboard_shortcuts.reply": "i ateb",
-  "keyboard_shortcuts.requests": "i agor rhestr ceisiadau dilyn",
-  "keyboard_shortcuts.search": "i ffocysu chwilio",
-  "keyboard_shortcuts.spoilers": "i ddangos/cuddio'r maes CW",
-  "keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"",
-  "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu ôl i CW",
-  "keyboard_shortcuts.toggle_sensitivity": "i ddangos/gyddio cyfryngau",
-  "keyboard_shortcuts.toot": "i ddechrau tŵt newydd sbon",
-  "keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio",
-  "keyboard_shortcuts.up": "i symud yn uwch yn y rhestr",
+  "keyboard_shortcuts.down": "Symud lawr yn y rhestr",
+  "keyboard_shortcuts.enter": "Agor post",
+  "keyboard_shortcuts.favourite": "Hoffi postiad",
+  "keyboard_shortcuts.favourites": "Agor rhestr ffefrynnau",
+  "keyboard_shortcuts.federated": "Agor ffrwd y ffederasiwn",
+  "keyboard_shortcuts.heading": "Bysellau brys",
+  "keyboard_shortcuts.home": "Agor ffrwd cartref",
+  "keyboard_shortcuts.hotkey": "Bysell boeth",
+  "keyboard_shortcuts.legend": "Dangos y rhestr hon",
+  "keyboard_shortcuts.local": "Agor ffrwd lleol",
+  "keyboard_shortcuts.mention": "Crybwyll yr awdur",
+  "keyboard_shortcuts.muted": "Agor rhestr defnyddwyr rydych wedi'u tewi",
+  "keyboard_shortcuts.my_profile": "Agor eich proffil",
+  "keyboard_shortcuts.notifications": "Agor colofn hysbysiadau",
+  "keyboard_shortcuts.open_media": "Agor cyfryngau",
+  "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
+  "keyboard_shortcuts.profile": "Agor proffil yr awdur",
+  "keyboard_shortcuts.reply": "Ateb i bostiad",
+  "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
+  "keyboard_shortcuts.search": "Ffocysu ar y bar chwilio",
+  "keyboard_shortcuts.spoilers": "Dangos/cuddio'r maes CW",
+  "keyboard_shortcuts.start": "Agor colofn \"dechrau arni\"",
+  "keyboard_shortcuts.toggle_hidden": "Dangos/cuddio testun tu ôl i CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Dangos/cuddio cyfryngau",
+  "keyboard_shortcuts.toot": "Dechrau post newydd",
+  "keyboard_shortcuts.unfocus": "Dad-ffocysu ardal cyfansoddi testun/chwilio",
+  "keyboard_shortcuts.up": "Symud yn uwch yn y rhestr",
   "lightbox.close": "Cau",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "Cywasgu blwch gweld delwedd",
+  "lightbox.expand": "Ehangu blwch gweld delwedd",
   "lightbox.next": "Nesaf",
   "lightbox.previous": "Blaenorol",
-  "lists.account.add": "Ychwanegwch at restr",
-  "lists.account.remove": "Dileu o'r rhestr",
+  "limited_account_hint.action": "Dangos y proffil beth bynnag",
+  "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
+  "lists.account.add": "Ychwanegu at restr",
+  "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
-  "lists.edit": "Golygwch rhestr",
+  "lists.edit": "Golygu rhestr",
   "lists.edit.submit": "Newid teitl",
   "lists.new.create": "Ychwanegu rhestr",
   "lists.new.title_placeholder": "Teitl rhestr newydd",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.followed": "Unrhyw ddefnyddiwr sy'n cael ei ddilyn",
+  "lists.replies_policy.list": "Aelodau'r rhestr",
   "lists.replies_policy.none": "Neb",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
+  "lists.replies_policy.title": "Dangos atebion i:",
+  "lists.search": "Chwilio ymysg pobl rydych yn eu dilyn",
   "lists.subheading": "Eich rhestrau",
-  "load_pending": "{count, plural, one {# eitem newydd} other {# eitemau newydd}}",
+  "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Llwytho...",
-  "media_gallery.toggle_visible": "Toglo gwelededd",
+  "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "missing_indicator.label": "Heb ei ganfod",
-  "missing_indicator.sublabel": "Ni ellid canfod yr adnodd hwn",
+  "missing_indicator.sublabel": "Nid oes modd canfod yr adnodd hwn",
+  "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
   "mute_modal.duration": "Hyd",
-  "mute_modal.hide_notifications": "Cuddio hysbysiadau rhag y defnyddiwr hwn?",
-  "mute_modal.indefinite": "Amhenodol",
-  "navigation_bar.apps": "Apiau symudol",
+  "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
+  "mute_modal.indefinite": "Parhaus",
+  "navigation_bar.about": "Ynghylch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
-  "navigation_bar.bookmarks": "Tudalnodau",
+  "navigation_bar.bookmarks": "Nodau tudalen",
   "navigation_bar.community_timeline": "Ffrwd leol",
-  "navigation_bar.compose": "Cyfansoddi tŵt newydd",
+  "navigation_bar.compose": "Cyfansoddi post newydd",
   "navigation_bar.direct": "Negeseuon preifat",
   "navigation_bar.discover": "Darganfod",
-  "navigation_bar.domain_blocks": "Parthau cuddiedig",
+  "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
   "navigation_bar.edit_profile": "Golygu proffil",
+  "navigation_bar.explore": "Archwilio",
   "navigation_bar.favourites": "Ffefrynnau",
-  "navigation_bar.filters": "Geiriau a dawelwyd",
+  "navigation_bar.filters": "Geiriau wedi'u tewi",
   "navigation_bar.follow_requests": "Ceisiadau dilyn",
-  "navigation_bar.follows_and_followers": "Dilynion a ddilynwyr",
-  "navigation_bar.info": "Ynghylch yr achos hwn",
-  "navigation_bar.keyboard_shortcuts": "Bysellau brys",
+  "navigation_bar.follows_and_followers": "Yn dilyn a dilynwyr",
   "navigation_bar.lists": "Rhestrau",
   "navigation_bar.logout": "Allgofnodi",
-  "navigation_bar.mutes": "Defnyddwyr a dawelwyd",
+  "navigation_bar.mutes": "Defnyddwyr wedi'u tewi",
   "navigation_bar.personal": "Personol",
-  "navigation_bar.pins": "Tŵtiau wedi eu pinio",
+  "navigation_bar.pins": "Postiadau wedi eu pinio",
   "navigation_bar.preferences": "Dewisiadau",
   "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
+  "navigation_bar.search": "Chwilio",
   "navigation_bar.security": "Diogelwch",
-  "notification.favourite": "hoffodd {name} eich tŵt",
-  "notification.follow": "dilynodd {name} chi",
+  "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
+  "notification.admin.report": "Adroddwyd ar {name} {target}",
+  "notification.admin.sign_up": "Cofrestrodd {name}",
+  "notification.favourite": "Hoffodd {name} eich post",
+  "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.mention": "Soniodd {name} amdanoch chi",
-  "notification.own_poll": "Mae eich pôl wedi diweddu",
+  "notification.mention": "Crybwyllodd {name} amdanoch chi",
+  "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
-  "notification.reblog": "Hysbysebodd {name} eich tŵt",
-  "notification.status": "{name} just posted",
+  "notification.reblog": "Hybodd {name} eich post",
+  "notification.status": "{name} newydd ei bostio",
+  "notification.update": "Golygodd {name} bostiad",
   "notifications.clear": "Clirio hysbysiadau",
-  "notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
+  "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
+  "notifications.column_settings.admin.report": "Adroddiadau newydd:",
+  "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
-  "notifications.column_settings.filter_bar.category": "Bar hidlo",
-  "notifications.column_settings.filter_bar.show": "Dangos",
+  "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
+  "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
   "notifications.column_settings.mention": "Crybwylliadau:",
   "notifications.column_settings.poll": "Canlyniadau pleidlais:",
   "notifications.column_settings.push": "Hysbysiadau gwthiadwy",
-  "notifications.column_settings.reblog": "Hybiadau:",
+  "notifications.column_settings.reblog": "Hybiau:",
   "notifications.column_settings.show": "Dangos yn y golofn",
   "notifications.column_settings.sound": "Chwarae sain",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "Pob",
-  "notifications.filter.boosts": "Hybiadau",
+  "notifications.column_settings.status": "Postiadau newydd:",
+  "notifications.column_settings.unread_notifications.category": "Hysbysiadau heb eu darllen",
+  "notifications.column_settings.unread_notifications.highlight": "Amlygu hysbysiadau heb eu darllen",
+  "notifications.column_settings.update": "Golygiadau:",
+  "notifications.filter.all": "Popeth",
+  "notifications.filter.boosts": "Hybiau",
   "notifications.filter.favourites": "Ffefrynnau",
   "notifications.filter.follows": "Yn dilyn",
   "notifications.filter.mentions": "Crybwylliadau",
-  "notifications.filter.polls": "Canlyniadau pleidlais",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} o hysbysiadau",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.filter.polls": "Canlyniadau polau",
+  "notifications.filter.statuses": "Diweddariadau gan bobl rydych chi'n eu dilyn",
+  "notifications.grant_permission": "Caniatáu.",
+  "notifications.group": "{count} hysbysiad",
+  "notifications.mark_as_read": "Marciwch bob hysbysiad wedi'i ddarllen",
+  "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
+  "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
+  "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
+  "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddant wedi'u galluogi.",
+  "notifications_permission_banner.title": "Peidiwch colli dim",
+  "picture_in_picture.restore": "Rhowch ef yn ôl",
   "poll.closed": "Ar gau",
   "poll.refresh": "Adnewyddu",
-  "poll.total_people": "{count, plural, one {# berson} other {# o bobl}}",
-  "poll.total_votes": "{count, plural, one {# bleidlais} other {# o bleidleisiau}}",
+  "poll.total_people": "{count, plural, one {# person} other {# person}}",
+  "poll.total_votes": "{count, plural, one {# bleidlais} other {# pleidlais}}",
   "poll.vote": "Pleidleisio",
-  "poll.voted": "Pleidleisioch chi am yr ateb hon",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Fe wnaethoch chi bleidleisio dros yr ateb hwn",
+  "poll.votes": "{votes, plural, one {# pleidlais} other {# pleidlais}}",
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
-  "privacy.change": "Addasu preifatrwdd y tŵt",
-  "privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
-  "privacy.direct.short": "Uniongyrchol",
-  "privacy.private.long": "Cyhoeddi i ddilynwyr yn unig",
-  "privacy.private.short": "Dilynwyr-yn-unig",
-  "privacy.public.long": "Cyhoeddi i ffrydiau cyhoeddus",
+  "privacy.change": "Addasu preifatrwdd y post",
+  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
+  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
+  "privacy.private.long": "Dim ond pobl sy'n ddilynwyrl",
+  "privacy.private.short": "Dilynwyr yn unig",
+  "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Peidio a chyhoeddi i ffrydiau cyhoeddus",
+  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
   "privacy.unlisted.short": "Heb ei restru",
+  "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
+  "privacy_policy.title": "Polisi Preifatrwydd",
   "refresh": "Adnewyddu",
   "regeneration_indicator.label": "Llwytho…",
   "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
-  "relative_time.days": "{number}dydd",
-  "relative_time.hours": "{number}awr",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# diwrnod} other {# diwrnod}} yn ôl",
+  "relative_time.full.hours": "{number, plural, one {# awr} other {# awr}} yn ôl",
+  "relative_time.full.just_now": "newydd ddigwydd",
+  "relative_time.full.minutes": "{number, plural, one {# munud} other {# munud}} yn ôl",
+  "relative_time.full.seconds": "{number, plural, one {# eiliad} other {# eiliad}} yn ôl",
+  "relative_time.hours": "{number} awr",
   "relative_time.just_now": "nawr",
-  "relative_time.minutes": "{number}munud",
-  "relative_time.seconds": "{number}eiliad",
+  "relative_time.minutes": "{number} munud",
+  "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
   "reply_indicator.cancel": "Canslo",
+  "report.block": "Blocio",
+  "report.block_explanation": "Ni welwch chi eu postiadau. Ni allan nhw weld eich postiadau na'ch dilyn. Byddan nhw'n gallu gweld eu bod nhw wedi'u rhwystro.",
+  "report.categories.other": "Arall",
+  "report.categories.spam": "Sbam",
+  "report.categories.violation": "Mae cynnwys yn torri un neu fwy o reolau'r gweinydd",
+  "report.category.subtitle": "Dewiswch y gyfatebiaeth gorau",
+  "report.category.title": "Beth sy'n digwydd gyda'r {type} yma?",
+  "report.category.title_account": "proffil",
+  "report.category.title_status": "post",
+  "report.close": "Iawn",
+  "report.comment.title": "Oes unrhyw beth arall y dylem ei wybod yn eich barn chi?",
   "report.forward": "Ymlaen i {target}",
   "report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
-  "report.hint": "Bydd yr adroddiad yn cael ei anfon i arolygydd eich achos. Mae modd darparu esboniad o pam yr ydych yn cwyno am y cyfrif hwn isod:",
+  "report.mute": "Tewi",
+  "report.mute_explanation": "Ni fyddwch yn gweld eu postiadau. Gallant eich dilyn o hyd a gweld eich postiadau ac ni fyddant yn gwybod eu bod nhw wedi'u mudo.",
+  "report.next": "Nesaf",
   "report.placeholder": "Sylwadau ychwanegol",
+  "report.reasons.dislike": "Dydw i ddim yn ei hoffi",
+  "report.reasons.dislike_description": "Nid yw'n rhywbeth yr ydych am ei weld",
+  "report.reasons.other": "Mae'n rhywbeth arall",
+  "report.reasons.other_description": "Nid yw'r mater yn ffitio i gategorïau eraill",
+  "report.reasons.spam": "Sbam yw e",
+  "report.reasons.spam_description": "Dolenni maleisus, ymgysylltu ffug, neu ymatebion ailadroddus",
+  "report.reasons.violation": "Mae'n torri rheolau'r gweinydd",
+  "report.reasons.violation_description": "Rydych yn ymwybodol ei fod yn torri rheolau penodol",
+  "report.rules.subtitle": "Dewiswch bob un sy'n berthnasol",
+  "report.rules.title": "Pa reolau sy'n cael eu torri?",
+  "report.statuses.subtitle": "Dewiswch bob un sy'n berthnasol",
+  "report.statuses.title": "Oes postiadau eraill sy'n cefnogi'r adroddiad hwn?",
   "report.submit": "Cyflwyno",
-  "report.target": "Cwyno am {target}",
+  "report.target": "Adrodd am {target}",
+  "report.thanks.take_action": "Dyma'ch dewisiadau i reoli'r hyn a welwch ar Mastodon:",
+  "report.thanks.take_action_actionable": "Tra byddwn yn adolygu hyn, gallwch gymryd camau yn erbyn @{name}:",
+  "report.thanks.title": "Ddim eisiau gweld hwn?",
+  "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
+  "report.unfollow": "Dad-ddilyn @{name}",
+  "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
+  "report_notification.categories.other": "Arall",
+  "report_notification.categories.spam": "Sbam",
+  "report_notification.categories.violation": "Torri rheol",
+  "report_notification.open": "Agor adroddiad",
   "search.placeholder": "Chwilio",
+  "search.search_or_paste": "Chwilio neu gludo URL",
   "search_popout.search_format": "Fformat chwilio uwch",
-  "search_popout.tips.full_text": "Mae testun syml yn dychwelyd tŵtiau yr ydych wedi ysgrifennu, hoffi, wedi'u bŵstio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
+  "search_popout.tips.full_text": "Mae testun syml yn dychwelyd postiadau yr ydych wedi ysgrifennu, hoffi, wedi'u hybio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
   "search_popout.tips.hashtag": "hashnod",
-  "search_popout.tips.status": "tŵt",
-  "search_popout.tips.text": "Mae testun syml yn dychwelyd enwau arddangos, enwau defnyddwyr a hashnodau sy'n cyfateb",
+  "search_popout.tips.status": "post",
+  "search_popout.tips.text": "Mae testun syml yn dychwelyd enwau dangos, enwau defnyddwyr a hashnodau sy'n cyfateb",
   "search_popout.tips.user": "defnyddiwr",
   "search_results.accounts": "Pobl",
-  "search_results.hashtags": "Hanshnodau",
-  "search_results.statuses": "Tŵtiau",
-  "search_results.statuses_fts_disabled": "Nid yw chwilio Tŵtiau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
-  "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio",
+  "search_results.all": "Popeth",
+  "search_results.hashtags": "Hashnodau",
+  "search_results.nothing_found": "Methu dod o hyd i unrhyw beth ar gyfer y termau chwilio hyn",
+  "search_results.statuses": "Postiadau",
+  "search_results.statuses_fts_disabled": "Nid yw chwilio postiadau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
+  "search_results.title": "Chwilio am {q}",
+  "search_results.total": "{count, number} {count, plural, zero {canlyniad} one {canlyniad} two {ganlyniad} other {canlyniad}}",
+  "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
+  "server_banner.active_users": "defnyddwyr gweithredol",
+  "server_banner.administered_by": "Yn cael ei weinyddu gan:",
+  "server_banner.introduction": "Mae {domain} yn rhan o'r rhwydwaith cymdeithasol datganoledig a bwerir gan {mastodon}.",
+  "server_banner.learn_more": "Dysgu mwy",
+  "server_banner.server_stats": "Ystagedau'r gweinydd:",
+  "sign_in_banner.create_account": "Creu cyfrif",
+  "sign_in_banner.sign_in": "Mewngofnodi",
+  "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ymateb i bostiadau, neu ryngweithio o'ch cyfrif ar weinydd gwahanol.",
+  "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
+  "status.admin_status": "Agor y post hwn yn y rhyngwyneb goruwchwylio",
   "status.block": "Blocio @{name}",
-  "status.bookmark": "Tudalnodi",
-  "status.cancel_reblog_private": "Dadfŵstio",
-  "status.cannot_reblog": "Ni ellir sbarduno'r tŵt hwn",
-  "status.copy": "Copïo cysylltiad i'r tŵt",
+  "status.bookmark": "Nod Tudalen",
+  "status.cancel_reblog_private": "Dadhybu",
+  "status.cannot_reblog": "Nid oes modd hybu'r postiad hwn",
+  "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
   "status.direct": "Neges breifat @{name}",
-  "status.embed": "Plannu",
-  "status.favourite": "Hoffi",
+  "status.edit": "Golygu",
+  "status.edited": "Golygwyd {date}",
+  "status.edited_x_times": "Golygwyd {count, plural, one {waith} two {waith} other {{count} gwaith}}",
+  "status.embed": "Mewnblannu",
+  "status.favourite": "Ffefryn",
+  "status.filter": "Hidlo'r postiad hwn",
   "status.filtered": "Wedi'i hidlo",
-  "status.load_more": "Llwythwch mwy",
+  "status.hide": "Cuddio postiad",
+  "status.history.created": "Crëwyd gan {name} {date}",
+  "status.history.edited": "Golygwyd gan {name} {date}",
+  "status.load_more": "Llwythwch ragor",
   "status.media_hidden": "Cyfryngau wedi'u cuddio",
   "status.mention": "Crybwyll @{name}",
-  "status.more": "Mwy",
-  "status.mute": "Tawelu @{name}",
-  "status.mute_conversation": "Tawelu sgwrs",
-  "status.open": "Ehangu'r tŵt hwn",
+  "status.more": "Rhagor",
+  "status.mute": "Tewi @{name}",
+  "status.mute_conversation": "Tewi sgwrs",
+  "status.open": "Ehangu'r post hwn",
   "status.pin": "Pinio ar y proffil",
-  "status.pinned": "Pinio tŵt",
-  "status.read_more": "Darllen mwy",
+  "status.pinned": "Post wedi'i binio",
+  "status.read_more": "Darllen rhagor",
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
-  "status.reblogged_by": "Bŵstio {name}",
-  "status.reblogs.empty": "Does neb wedi bŵstio'r tŵt yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
-  "status.redraft": "Dileu & ailddrafftio",
-  "status.remove_bookmark": "Tynnu'r tudalnod",
+  "status.reblogged_by": "Hybodd {name}",
+  "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
+  "status.redraft": "Dileu ac ailddrafftio",
+  "status.remove_bookmark": "Tynnu Nod Tudalen",
+  "status.replied_to": "Wedi ateb {name}",
   "status.reply": "Ateb",
   "status.replyAll": "Ateb i edefyn",
-  "status.report": "Adrodd @{name}",
+  "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
+  "status.show_filter_reason": "Dangos beth bynnag",
   "status.show_less": "Dangos llai",
   "status.show_less_all": "Dangos llai i bawb",
   "status.show_more": "Dangos mwy",
   "status.show_more_all": "Dangos mwy i bawb",
-  "status.show_thread": "Dangos edefyn",
+  "status.show_original": "Dangos y gwreiddiol",
+  "status.translate": "Cyfieithu",
+  "status.translated_from_with": "Cyfieithwyd o {lang} gan ddefnyddio {provider}",
   "status.uncached_media_warning": "Dim ar gael",
-  "status.unmute_conversation": "Dad-dawelu sgwrs",
+  "status.unmute_conversation": "Dad-dewi sgwrs",
   "status.unpin": "Dadbinio o'r proffil",
-  "suggestions.dismiss": "Diswyddo",
+  "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd penodol fydd yn ymddangos yn eich ffrydiau ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
+  "subscribed_languages.save": "Cadw'r newidiadau",
+  "subscribed_languages.target": "Newid ieithoedd tanysgrifio {target}",
+  "suggestions.dismiss": "Diystyru'r awgrym",
   "suggestions.header": "Efallai y bydd gennych ddiddordeb mewn…",
-  "tabs_bar.federated_timeline": "Ffederasiwn",
-  "tabs_bar.home": "Hafan",
+  "tabs_bar.federated_timeline": "Ffedereiddiwyd",
+  "tabs_bar.home": "Cartref",
   "tabs_bar.local_timeline": "Lleol",
   "tabs_bar.notifications": "Hysbysiadau",
-  "tabs_bar.search": "Chwilio",
-  "time_remaining.days": "{number, plural, one {# ddydd} other {# o ddyddiau}} ar ôl",
-  "time_remaining.hours": "{number, plural, one {# awr} other {# o oriau}} ar ôl",
-  "time_remaining.minutes": "{number, plural, one {# funud} other {# o funudau}} ar ôl",
-  "time_remaining.moments": "Munudau ar ôl",
-  "time_remaining.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} ar ôl",
-  "timeline_hint.remote_resource_not_displayed": "ni chaiff {resource} o gweinyddion eraill ei ddangos.",
+  "time_remaining.days": "{number, plural, one {# diwrnod} other {# diwrnod}} ar ôl",
+  "time_remaining.hours": "{number, plural, one {# awr} other {# awr}} ar ôl",
+  "time_remaining.minutes": "{number, plural, one {# munud} other {# munud}} ar ôl",
+  "time_remaining.moments": "Munudau yn weddill",
+  "time_remaining.seconds": "{number, plural, one {# eiliad} other {# eiliad}} ar ôl",
+  "timeline_hint.remote_resource_not_displayed": "Nid yw {resource} o weinyddion eraill yn cael ei ddangos.",
   "timeline_hint.resources.followers": "Dilynwyr",
   "timeline_hint.resources.follows": "Yn dilyn",
-  "timeline_hint.resources.statuses": "Tŵtiau henach",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} berson} other {{counter} o bobl}}",
-  "trends.trending_now": "Yn tueddu nawr",
-  "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
+  "timeline_hint.resources.statuses": "Postiadau hŷn",
+  "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
+  "trends.trending_now": "Yn trendio nawr",
+  "ui.beforeunload": "Byddwch yn colli eich drafft os byddwch yn gadael Mastodon.",
   "units.short.billion": "{count}biliwn",
   "units.short.million": "{count}miliwn",
   "units.short.thousand": "{count}mil",
-  "upload_area.title": "Llusgwch & gollwing i uwchlwytho",
+  "upload_area.title": "Llusgwch a gollwng i lwytho",
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
-  "upload_error.poll": "Nid oes modd uwchlwytho ffeiliau â phleidleisiau.",
+  "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
+  "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
   "upload_form.edit": "Golygu",
-  "upload_form.thumbnail": "Newid mân-lun",
+  "upload_form.thumbnail": "Newid llun bach",
   "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
-  "upload_modal.analyzing_picture": "Dadansoddi llun…",
-  "upload_modal.apply": "Gweithredu",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
+  "upload_modal.apply": "Gosod",
+  "upload_modal.applying": "Yn gosod…",
   "upload_modal.choose_image": "Dewis delwedd",
   "upload_modal.description_placeholder": "Mae ei phen bach llawn jocs, 'run peth a fy nghot golff, rhai dyddiau",
   "upload_modal.detect_text": "Canfod testun o'r llun",
   "upload_modal.edit_media": "Golygu cyfryngau",
-  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob mân-lunau.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob llun bach.",
+  "upload_modal.preparing_ocr": "Yn paratoi OCR…",
   "upload_modal.preview_label": "Rhagolwg ({ratio})",
-  "upload_progress.label": "Uwchlwytho...",
+  "upload_progress.label": "Yn llwytho...",
+  "upload_progress.processing": "Wrthi'n prosesu…",
   "video.close": "Cau fideo",
-  "video.download": "Lawrlwytho ffeil",
-  "video.exit_fullscreen": "Gadael sgrîn llawn",
+  "video.download": "Llwytho ffeil i lawr",
+  "video.exit_fullscreen": "Gadael sgrin llawn",
   "video.expand": "Ymestyn fideo",
-  "video.fullscreen": "Sgrîn llawn",
+  "video.fullscreen": "Sgrin llawn",
   "video.hide": "Cuddio fideo",
-  "video.mute": "Tawelu sain",
+  "video.mute": "Tewi sain",
   "video.pause": "Oedi",
   "video.play": "Chwarae",
-  "video.unmute": "Dad-dawelu sain"
+  "video.unmute": "Dad-dewi sain"
 }
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9db5da3eb..d27e77dc2 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -1,84 +1,118 @@
 {
-  "account.account_note_header": "Notat",
+  "about.blocks": "Modererede servere",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon er gratis, open-source software og et varemærke tilhørende Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Begrundelse ikke tilgængelig",
+  "about.domain_blocks.preamble": "Mastodon tillader generelt, at man ser indhold og interagere med brugere fra enhver anden server i fediverset. Disse er undtagelserne, som er implementeret på netop denne server.",
+  "about.domain_blocks.silenced.explanation": "Du vil generelt ikke se profiler og indhold fra denne server, medmindre du udtrykkeligt slår den op eller vælger den ved at følge.",
+  "about.domain_blocks.silenced.title": "Begrænset",
+  "about.domain_blocks.suspended.explanation": "Data fra denne server hverken behandles, gemmes eller udveksles, hvilket umuliggør interaktion eller kommunikation med brugere fra denne server.",
+  "about.domain_blocks.suspended.title": "Udelukket",
+  "about.not_available": "Denne information er ikke blevet gjort tilgængelig på denne server.",
+  "about.powered_by": "Decentraliserede sociale medier drevet af {mastodon}",
+  "about.rules": "Serverregler",
+  "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "Blokér @{name}",
   "account.block_domain": "Blokér domænet {domain}",
   "account.blocked": "Blokeret",
-  "account.browse_more_on_origin_server": "Gennemse mere på den oprindelige profil",
-  "account.cancel_follow_request": "Annullér følgeranmodning",
+  "account.browse_more_on_origin_server": "Se mere på den oprindelige profil",
+  "account.cancel_follow_request": "Annullér anmodning om at følge",
   "account.direct": "Direkte besked til @{name}",
   "account.disable_notifications": "Advisér mig ikke længere, når @{name} poster",
   "account.domain_blocked": "Domæne blokeret",
-  "account.edit_profile": "Redigere profil",
+  "account.edit_profile": "Redigér profil",
   "account.enable_notifications": "Advisér mig, når @{name} poster",
   "account.endorse": "Fremhæv på profil",
+  "account.featured_tags.last_status_at": "Seneste indlæg {date}",
+  "account.featured_tags.last_status_never": "Ingen indlæg",
+  "account.featured_tags.title": "{name}s fremhævede hashtags",
   "account.follow": "Følg",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} Følger} other {{counter} Følgere}}",
-  "account.following_counter": "{count, plural, one {{counter} Følger} other {{counter} Følgere}}",
-  "account.follows.empty": "Denne bruger følger endnu ikke nogen.",
+  "account.following": "Følger",
+  "account.following_counter": "{count, plural, one {{counter} Følges} other {{counter} Følges}}",
+  "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.follows_you": "Følger dig",
-  "account.hide_reblogs": "Skjul fremhævelserne fra @{name}",
-  "account.joined": "Tilmeldt {date}",
-  "account.last_status": "Senest aktiv",
+  "account.go_to_profile": "Gå til profil",
+  "account.hide_reblogs": "Skjul boosts fra @{name}",
+  "account.joined_short": "Oprettet",
+  "account.languages": "Skift abonnementssprog",
   "account.link_verified_on": "Ejerskab af dette link blev tjekket {date}",
   "account.locked_info": "Denne kontos fortrolighedsstatus er sat til låst. Ejeren bedømmer manuelt, hvem der kan følge vedkommende.",
-  "account.media": "Medie",
+  "account.media": "Medier",
   "account.mention": "Nævn @{name}",
-  "account.moved_to": "{name} er flyttet til:",
-  "account.mute": "Tavsgør @{name}",
-  "account.mute_notifications": "Tavsgør notifikationer fra @{name}",
-  "account.muted": "Tavsgjort",
-  "account.never_active": "Aldrig",
-  "account.posts": "Trut",
-  "account.posts_with_replies": "Trut og svar",
+  "account.moved_to": "{name} har angivet, at vedkommendes nye konto nu er:",
+  "account.mute": "Skjul @{name}",
+  "account.mute_notifications": "Skjul notifikationer fra @{name}",
+  "account.muted": "Skjult (muted)",
+  "account.open_original_page": "Åbn oprindelig side",
+  "account.posts": "Indlæg",
+  "account.posts_with_replies": "Indlæg og svar",
   "account.report": "Anmeld @{name}",
   "account.requested": "Afventer godkendelse. Tryk for at annullere følgeanmodning",
+  "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.share": "Del @{name}s profil",
-  "account.show_reblogs": "Vis fremhævelserne fra @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Trut} other {{counter} Trut}}",
-  "account.unblock": "Fjern blokeringen af @{name}",
+  "account.show_reblogs": "Vis fremhævelser fra @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Indlæg} other {{counter} Indlæg}}",
+  "account.unblock": "Afblokér @{name}",
   "account.unblock_domain": "Afblokér domænet {domain}",
-  "account.unendorse": "Fremhæv ikke på profil",
+  "account.unblock_short": "Afblokér",
+  "account.unendorse": "Fjern visning på din profil",
   "account.unfollow": "Følg ikke længere",
-  "account.unmute": "Fjern tavsgjort for @{name}",
-  "account.unmute_notifications": "Fjern tavsgjort for notifikationer fra @{name}",
+  "account.unmute": "Vis @{name} igen (unmute)",
+  "account.unmute_notifications": "Slå notifikationer om @{name} til igen",
+  "account.unmute_short": "Vis igen (unmute)",
   "account_note.placeholder": "Klik for at tilføje notat",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Brugerfastholdelsesrate per dag efter tilmelding",
+  "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate per måned efter tilmelding",
+  "admin.dashboard.retention.average": "Gennemsnitlig",
+  "admin.dashboard.retention.cohort": "Tilmeldingsmåned",
+  "admin.dashboard.retention.cohort_size": "Nye brugere",
   "alert.rate_limited.message": "Forsøg igen efter {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Gradsbegrænset",
+  "alert.rate_limited.title": "Hastighedsbegrænset",
   "alert.unexpected.message": "En uventet fejl opstod.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Bekendtgørelse",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ubehandlet)",
+  "audio.hide": "Skjul lyd",
   "autosuggest_hashtag.per_week": "{count} pr. uge",
-  "boost_modal.combo": "Du kan trykke på {combo} for at overspringe dette næste gang",
-  "bundle_column_error.body": "Noget gik galt under indlæsningen af denne komponent.",
+  "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
+  "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
+  "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
+  "bundle_column_error.error.title": "Åh nej!",
+  "bundle_column_error.network.body": "En fejl opstod under forsøget på at indlæse denne side. Dette kan skyldes flere typer af fejl.",
+  "bundle_column_error.network.title": "Netværksfejl",
   "bundle_column_error.retry": "Forsøg igen",
-  "bundle_column_error.title": "Netværksfejl",
+  "bundle_column_error.return": "Retur til hjem",
+  "bundle_column_error.routing.body": "Den anmodede side kunne ikke findes. Er du sikker på, at URL'en er korrekt?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Luk",
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af denne komponent.",
   "bundle_modal_error.retry": "Forsøg igen",
+  "closed_registrations.other_server_instructions": "Da Mastodon er decentraliseret, kan du oprette en konto på en anden server og stadig interagere med denne.",
+  "closed_registrations_modal.description": "Oprettelse af en konto på {domain} er i øjeblikket ikke muligt, men husk på, at du ikke behøver en konto specifikt på {domain} for at bruge Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find en anden server",
+  "closed_registrations_modal.preamble": "Mastodon er decentraliseret, så uanset hvor du opretter din konto, vil du være i stand til at følge og interagere med hvem som helst på denne server. Du kan endda selv være vært for den!",
+  "closed_registrations_modal.title": "Oprettelse på Mastodon",
+  "column.about": "Om",
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bogmærker",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direkte beskeder",
-  "column.directory": "Gennemse profiler",
+  "column.directory": "Tjek profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.favourites": "Favoritter",
-  "column.follow_requests": "Følg-anmodninger",
+  "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.lists": "Lister",
-  "column.mutes": "Tavsgjorte brugere",
+  "column.mutes": "Skjulte brugere (mutede)",
   "column.notifications": "Notifikationer",
-  "column.pins": "Fastgjorte trut",
-  "column.public": "Forenede tidslinje",
+  "column.pins": "Fastgjorte indlæg",
+  "column.public": "Fælles tidslinje",
   "column_back_button.label": "Tilbage",
   "column_header.hide_settings": "Skjul indstillinger",
   "column_header.moveLeft_settings": "Flyt kolonne til venstre",
@@ -88,68 +122,85 @@
   "column_header.unpin": "Løsgør",
   "column_subheading.settings": "Indstillinger",
   "community.column_settings.local_only": "Kun lokalt",
-  "community.column_settings.media_only": "Kun medie",
-  "community.column_settings.remote_only": "Kun fjernt",
-  "compose_form.direct_message_warning": "Dette trut sendes kun til de nævnte brugere.",
+  "community.column_settings.media_only": "Kun medier",
+  "community.column_settings.remote_only": "Kun udefra",
+  "compose.language.change": "Skift sprog",
+  "compose.language.search": "Søg efter sprog...",
   "compose_form.direct_message_warning_learn_more": "Få mere at vide",
-  "compose_form.hashtag_warning": "Dette trut vises ikke under noget hashtag, da det ikke er listet. Kun offentlige trut kan søges via hashtags.",
-  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Alle kan følge dig for at se dine kun-følger poster.",
+  "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende krypteret. Del derfor ikke sensitiv information via Mastodon.",
+  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, idet kun offentlige indlæg kan søges via hashtags.",
+  "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
   "compose_form.poll.add_option": "Tilføj valgmulighed",
-  "compose_form.poll.duration": "Afstemningsvarighed",
+  "compose_form.poll.duration": "Afstemningens varighed",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
   "compose_form.poll.remove_option": "Fjern denne valgmulighed",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publicér",
+  "compose_form.publish_form": "Publicér",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Gem ændringer",
   "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
   "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
-  "compose_form.sensitive.unmarked": "Intet medie market som sensitivt",
-  "compose_form.spoiler.marked": "Tekst skjult bag advarsel",
-  "compose_form.spoiler.unmarked": "Teksten er ikke skjult",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+  "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
+  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
   "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Sikker på, at du vil blokere {name}?",
+  "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
+  "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
+  "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
   "confirmations.delete.confirm": "Slet",
-  "confirmations.delete.message": "Sikker på, at du vil slette dette trut?",
+  "confirmations.delete.message": "Er du sikker på, at du vil slette dette indlæg?",
   "confirmations.delete_list.confirm": "Slet",
-  "confirmations.delete_list.message": "Sikker på, at du vil slette denne liste permanent?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Skjul hele domænet",
-  "confirmations.domain_block.message": "Helt sikker på, at du vil blokere hele {domain}-domænet? Oftest vil få, specifikke blokeringer eller tavsgørelser være nok og at fortrække. Du vil ikke se indhold fra domænet på offentlige tidslinjer eller i dine notifikationer. Dine følgere fra domænet fjernes.",
+  "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
+  "confirmations.discard_edit_media.confirm": "Kassér",
+  "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
+  "confirmations.domain_block.confirm": "Blokér hele domænet",
+  "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.logout.confirm": "Log ud",
-  "confirmations.logout.message": "Log ud, sikker?",
-  "confirmations.mute.confirm": "Tavsgøre",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra dem (og om) dem, men det vil lade dem at se dine indlæg og følge dig.",
-  "confirmations.mute.message": "Sikker på, du vil tavsgøre {name}?",
-  "confirmations.redraft.confirm": "Slet og omskriv",
-  "confirmations.redraft.message": "Sikker på, at du vil slette dette trut og omskrive det? Favoritter og fremhævelser går tabt og svar til det oprindelige indlæg afassocieres.",
-  "confirmations.reply.confirm": "Besvar",
-  "confirmations.reply.message": "Besvarelse nu vil overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
+  "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
+  "confirmations.mute.confirm": "Skjul (mute)",
+  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
+  "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
+  "confirmations.redraft.confirm": "Slet og omformulér",
+  "confirmations.redraft.message": "Er du sikker på, at du vil slette dette indlæg for at omskrive det? Favoritter og boosts går tabt, og svar til det oprindelige indlæg afassocieres.",
+  "confirmations.reply.confirm": "Svar",
+  "confirmations.reply.message": "Hvis du svarer nu, vil det overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
   "confirmations.unfollow.confirm": "Følg ikke længere",
-  "confirmations.unfollow.message": "Sikker på, at du ikke længere vil følge {name}?",
-  "conversation.delete": "Slet konversation",
+  "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
+  "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
-  "conversation.open": "Vis konversation",
+  "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
+  "copypaste.copied": "Kopieret",
+  "copypaste.copy": "Kopiér",
   "directory.federated": "Fra kendt fedivers",
   "directory.local": "Kun fra {domain}",
   "directory.new_arrivals": "Nye ankomster",
-  "directory.recently_active": "Senest aktiv",
-  "embed.instructions": "Indlejr dette trut på din side ved at kopiere koden nedenfor.",
+  "directory.recently_active": "Aktive for nyligt",
+  "disabled_account_banner.account_settings": "Kontoindstillinger",
+  "disabled_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret.",
+  "dismissable_banner.community_timeline": "Disse er de seneste offentlige indlæg fra personer med konti hostes af {domain}.",
+  "dismissable_banner.dismiss": "Afvis",
+  "dismissable_banner.explore_links": "Der tales lige nu om disse nyhedshistorier af folk på denne og andre servere i det decentraliserede netværk.",
+  "dismissable_banner.explore_statuses": "Disse indlæg vinder lige nu fodfæste på denne og andre servere i det decentraliserede netværk.",
+  "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
+  "dismissable_banner.public_timeline": "Disse er de seneste offentlige indlæg fra folk på denne og andre servere i det decentraliserede netværk, som denne server kender.",
+  "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
+  "emoji_button.clear": "Ryd",
   "emoji_button.custom": "Tilpasset",
   "emoji_button.flags": "Flag",
   "emoji_button.food": "Mad og drikke",
-  "emoji_button.label": "Indsæt humørikon",
+  "emoji_button.label": "Indsæt emoji",
   "emoji_button.nature": "Natur",
-  "emoji_button.not_found": "Ingen emojos!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Ingen matchende emojis fundet",
   "emoji_button.objects": "Objekter",
   "emoji_button.people": "Personer",
   "emoji_button.recent": "Oftest brugt",
@@ -158,46 +209,69 @@
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser og steder",
   "empty_column.account_suspended": "Konto suspenderet",
-  "empty_column.account_timeline": "Ingen trut her!",
+  "empty_column.account_timeline": "Ingen indlæg hér!",
   "empty_column.account_unavailable": "Profil utilgængelig",
-  "empty_column.blocks": "Du har ikke blokeret nogle brugere endnu.",
-  "empty_column.bookmarked_statuses": "Du har ingen bogmærkede trut endnu. Når du bogmærker ét, vil det dukke op hér.",
+  "empty_column.blocks": "Ingen brugere blokeret endnu.",
+  "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.direct": "Du har endnu ingen direkte beskeder. Når du sender eller modtager en, vil den vises hér.",
-  "empty_column.domain_blocks": "Der er endnu ingen skjulte domæner.",
-  "empty_column.favourited_statuses": "Du har endnu ingen favorit-trut. Når du favoriserer ét, vil det blive vist hér.",
-  "empty_column.favourites": "Ingen har endnu favoriseret dette trut. Når nogen anden gør vil det blive vist hér.",
-  "empty_column.follow_recommendations": "Ser ud til, at der ikke kunne genereres forslag til dig. Du kan prøve med Søg for at lede efter personer, du måske kender, eller udforske hashtags.",
-  "empty_column.follow_requests": "Du har endnu ingen følgeranmodninger. Når du modtager én, vil den fremgå hér.",
-  "empty_column.hashtag": "Intet indhold i dette hashtag endnu.",
-  "empty_column.home": "Din hjemmetidslinje er tom! Besøg {public} eller brug søgningen for at komme igang og møde andre brugere.",
-  "empty_column.home.suggestions": "Se nogle foreslag",
-  "empty_column.list": "Der er endnu intet i denne liste. Når medlemmer af denne liste poster nye trut, vil de fremgå hér.",
+  "empty_column.direct": "Der er endnu ingen direkte beskeder. Når en sendes eller modtages, dukker den op hér.",
+  "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
+  "empty_column.explore_statuses": "Ingen nye tendenser lige nu. Tjek igen senere!",
+  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
+  "empty_column.favourites": "Ingen har endnu gjort dette indlæg til favorit. Når nogen gør dét, vil det dukke op hér.",
+  "empty_column.follow_recommendations": "Det ser ud til, at der ikke kunne genereres forslag til dig. Du kan prøve med Søg for at lede efter personer, du måske kender, eller udforske hashtags.",
+  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op hér.",
+  "empty_column.hashtag": "Der er intet med dette hashtag endnu.",
+  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at udfylde den. {suggestions}",
+  "empty_column.home.suggestions": "Se nogle forslag",
+  "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
-  "empty_column.mutes": "Du har endnu ikke tavsgjort nogle brugere.",
-  "empty_column.notifications": "Du har endnu ingen notifikationer. Interagér med andre for at starte konversationen.",
+  "empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+  "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
   "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
   "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
   "error.unexpected_crash.explanation_addons": "Denne side kunne ikke vises korrekt. Fejlen skyldes sandsynligvis en browsertilføjelse eller automatiske oversættelsesværktøjer.",
   "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
-  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
+  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiér stacktrace til udklipsholderen",
   "errors.unexpected_crash.report_issue": "Anmeld problem",
+  "explore.search_results": "Søgeresultater",
+  "explore.suggested_follows": "Til dig",
+  "explore.title": "Udforsk",
+  "explore.trending_links": "Nyheder",
+  "explore.trending_statuses": "Indlæg",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Denne filterkategori omfatter ikke konteksten, hvorunder dette indlæg er tilgået. Redigér filteret, hvis indlægget også ønskes filtreret i denne kontekst.",
+  "filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
+  "filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",
+  "filter_modal.added.expired_title": "Udløbet filter!",
+  "filter_modal.added.review_and_configure": "Gå til {settings_link} for at gennemse og yderligere opsætte denne filterkategori.",
+  "filter_modal.added.review_and_configure_title": "Filterindstillinger",
+  "filter_modal.added.settings_link": "indstillingsside",
+  "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til flg. filterkategori: {title}.",
+  "filter_modal.added.title": "Filter tilføjet!",
+  "filter_modal.select_filter.context_mismatch": "gælder ikke for denne kontekst",
+  "filter_modal.select_filter.expired": "udløbet",
+  "filter_modal.select_filter.prompt_new": "Ny kategori: {name}",
+  "filter_modal.select_filter.search": "Søg eller opret",
+  "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
+  "filter_modal.select_filter.title": "Filtrér dette indlæg",
+  "filter_modal.title.status": "Filtrér et indlæg",
   "follow_recommendations.done": "Udført",
   "follow_recommendations.heading": "Følg personer du gerne vil se indlæg fra! Her er nogle forslag.",
-  "follow_recommendations.lead": "Indlæg, fra personer du følger, vises i kronologisk rækkefølge i dit hjemmefeed. Vær ikke bange for at begå fejl, du kan vælge \"følg ikke\" personer lige så nemt til enhver tid!",
+  "follow_recommendations.lead": "Indlæg, fra personer du følger, vil fremgå kronologisk ordnet i dit hjemmefeed. Vær ikke bange for at begå fejl, da du altid og meget nemt kan ændre dit valg!",
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, antog {domain}-personalet, at du måske vil gennemgå dine anmodninger manuelt.",
+  "footer.about": "Om",
+  "footer.directory": "Profiloversigt",
+  "footer.get_app": "Hent appen",
+  "footer.invite": "Invitér personer",
+  "footer.keyboard_shortcuts": "Tastaturgenveje",
+  "footer.privacy_policy": "Fortrolighedspolitik",
+  "footer.source_code": "Vis kildekode",
   "generic.saved": "Gemt",
-  "getting_started.developers": "Udviklere",
-  "getting_started.directory": "Profilliste",
-  "getting_started.documentation": "Dokumentation",
-  "getting_started.heading": "Komme i gang",
-  "getting_started.invite": "Invitér folk",
-  "getting_started.open_source_notice": "Mastodon er en open-source software. Du kan bidrage eller anmelde fejl via GitHub {github}.",
-  "getting_started.security": "Kontoindstillinger",
-  "getting_started.terms": "Tjenestevilkår",
+  "getting_started.heading": "Startmenu",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
@@ -207,53 +281,69 @@
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
   "hashtag.column_settings.tag_toggle": "Inkludér ekstra tags for denne kolonne",
+  "hashtag.follow": "Følg hashtag",
+  "hashtag.unfollow": "Stop med at følge hashtag",
   "home.column_settings.basic": "Grundlæggende",
-  "home.column_settings.show_reblogs": "Vis fremhævelser",
+  "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
   "home.show_announcements": "Vis bekendtgørelser",
+  "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes, samt gemme det til senere.",
+  "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
+  "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
+  "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
+  "interaction_modal.on_another_server": "På en anden server",
+  "interaction_modal.on_this_server": "På denne server",
+  "interaction_modal.other_server_instructions": "Kopiér og indsæt denne URL i søgefeltet på en Mastodon-app eller webgrænseflade til en Mastodon-server.",
+  "interaction_modal.preamble": "Da Mastodon er decentraliseret, kan man bruge sin eksisterende konto hostet af en anden Mastodon-server eller kompatibel platform, såfremt man ikke har en konto på denne.",
+  "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit",
+  "interaction_modal.title.follow": "Følg {name}",
+  "interaction_modal.title.reblog": "Boost {name}s indlæg",
+  "interaction_modal.title.reply": "Besvar {name}s indlæg",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
-  "keyboard_shortcuts.back": "for at navigere tilbage",
-  "keyboard_shortcuts.blocked": "for at åbne listen over blokerede brugere",
-  "keyboard_shortcuts.boost": "for at fremhæve",
-  "keyboard_shortcuts.column": "for at fokusere et trut i en af kolonnerne",
-  "keyboard_shortcuts.compose": "for at fokusere på skriveområdet",
+  "keyboard_shortcuts.back": "Gå tilbage",
+  "keyboard_shortcuts.blocked": "Åbn listen over blokerede brugere",
+  "keyboard_shortcuts.boost": "Boost indlæg",
+  "keyboard_shortcuts.column": "Fokusér kolonne",
+  "keyboard_shortcuts.compose": "Fokusér skriveområdet",
   "keyboard_shortcuts.description": "Beskrivelse",
-  "keyboard_shortcuts.direct": "for at åbne direkte besked-kolonnen",
-  "keyboard_shortcuts.down": "for at rykke nedad på listen",
-  "keyboard_shortcuts.enter": "for at åbne trut",
-  "keyboard_shortcuts.favourite": "for at favorisere",
-  "keyboard_shortcuts.favourites": "for at åbne favoritlisten",
-  "keyboard_shortcuts.federated": "for at åbne den forenede tidslinje",
+  "keyboard_shortcuts.direct": "for at åbne direkte beskeder-kolonnen",
+  "keyboard_shortcuts.down": "Flyt nedad på listen",
+  "keyboard_shortcuts.enter": "Åbn indlæg",
+  "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
+  "keyboard_shortcuts.favourites": "Åbn favoritlisten",
+  "keyboard_shortcuts.federated": "Åbn fælles tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
-  "keyboard_shortcuts.home": "for at åbne hjemmetidslinjen",
+  "keyboard_shortcuts.home": "Åbn hjemmetidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
-  "keyboard_shortcuts.legend": "for at vise dette symbol",
-  "keyboard_shortcuts.local": "for at åbne den lokale tidslinje",
-  "keyboard_shortcuts.mention": "for at nævne forfatteren",
-  "keyboard_shortcuts.muted": "for at åbne listen over tavsgjorte brugere",
-  "keyboard_shortcuts.my_profile": "for at åbne din profil",
+  "keyboard_shortcuts.legend": "Vis dette symbol",
+  "keyboard_shortcuts.local": "Åbn lokal tidslinje",
+  "keyboard_shortcuts.mention": "Nævn forfatter",
+  "keyboard_shortcuts.muted": "Åbn listen over skjulte (mutede) brugere",
+  "keyboard_shortcuts.my_profile": "Åbn din profil",
   "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen",
-  "keyboard_shortcuts.open_media": "for at åbne medier",
-  "keyboard_shortcuts.pinned": "for at åbne listen over fastgjorte trut",
-  "keyboard_shortcuts.profile": "for at åbne forfatterens profil",
-  "keyboard_shortcuts.reply": "for at besvare",
-  "keyboard_shortcuts.requests": "for at åbne følganmodningslisten",
-  "keyboard_shortcuts.search": "for at fokusere søgningen",
-  "keyboard_shortcuts.spoilers": "for at vise/skjule CW-felt",
-  "keyboard_shortcuts.start": "for at åbne \"komme i gang\"-kolonnen",
-  "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
-  "keyboard_shortcuts.toggle_sensitivity": "for at vise/skjule medier",
-  "keyboard_shortcuts.toot": "for at påbegynde et helt nyt indlæg",
-  "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning",
-  "keyboard_shortcuts.up": "for at bevæge sig opad på listen",
+  "keyboard_shortcuts.open_media": "Åbn medier",
+  "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
+  "keyboard_shortcuts.profile": "Åbn forfatters profil",
+  "keyboard_shortcuts.reply": "Besvar indlægget",
+  "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
+  "keyboard_shortcuts.search": "Fokusér søgebjælke",
+  "keyboard_shortcuts.spoilers": "Vis/skjul CW-felt",
+  "keyboard_shortcuts.start": "Åbn \"komme i gang\"-kolonne",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul medier",
+  "keyboard_shortcuts.toot": "Påbegynd nyt indlæg",
+  "keyboard_shortcuts.unfocus": "Fjern fokus fra tekstskrivningsområde/søgning",
+  "keyboard_shortcuts.up": "Flyt opad på listen",
   "lightbox.close": "Luk",
   "lightbox.compress": "Komprimér billedvisningsfelt",
-  "lightbox.expand": "Udvid billedevisningsfelt",
+  "lightbox.expand": "Udvid billedvisningsfelt",
   "lightbox.next": "Næste",
   "lightbox.previous": "Forrige",
+  "limited_account_hint.action": "Vis profil alligevel",
+  "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.",
   "lists.account.add": "Føj til liste",
   "lists.account.remove": "Fjern fra liste",
   "lists.delete": "Slet liste",
@@ -261,70 +351,79 @@
   "lists.edit.submit": "Skift titel",
   "lists.new.create": "Tilføj liste",
   "lists.new.title_placeholder": "Ny listetitel",
-  "lists.replies_policy.followed": "Enhver fulgt bruger",
-  "lists.replies_policy.list": "Medlemmer af listen",
+  "lists.replies_policy.followed": "Enhver bruger, der følges",
+  "lists.replies_policy.list": "Listemedlemmer",
   "lists.replies_policy.none": "Ingen",
   "lists.replies_policy.title": "Vis svar til:",
-  "lists.search": "Søg blandt personer, du følger",
+  "lists.search": "Søg blandt personer, som følges",
   "lists.subheading": "Dine lister",
-  "load_pending": "{count, plural, one {# nyt punkt} other {# nye punkter}}",
+  "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
   "loading_indicator.label": "Indlæser...",
-  "media_gallery.toggle_visible": "Skjul {number, plural, one {billede} other {billeder}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "missing_indicator.label": "Ikke fundet",
   "missing_indicator.sublabel": "Denne ressource kunne ikke findes",
+  "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
   "mute_modal.duration": "Varighed",
   "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
-  "mute_modal.indefinite": "Uendeligt",
-  "navigation_bar.apps": "Mobil-apps",
+  "mute_modal.indefinite": "Tidsubegrænset",
+  "navigation_bar.about": "Om",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Skriv nyt trut",
+  "navigation_bar.compose": "Skriv nyt indlæg",
   "navigation_bar.direct": "Direkte beskeder",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.edit_profile": "Redigér profil",
+  "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Tavsgjorte ord",
-  "navigation_bar.follow_requests": "Følganmodninger",
-  "navigation_bar.follows_and_followers": "Følger og følgere",
-  "navigation_bar.info": "Om denne server",
-  "navigation_bar.keyboard_shortcuts": "Hurtigtaster",
+  "navigation_bar.filters": "Skjulte ord (mutede)",
+  "navigation_bar.follow_requests": "Følgeanmodninger",
+  "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.lists": "Lister",
-  "navigation_bar.logout": "Log ud",
-  "navigation_bar.mutes": "Tavsgjorte brugere",
+  "navigation_bar.logout": "Log af",
+  "navigation_bar.mutes": "Skjulte brugere (mutede)",
   "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Fastgjorte trut",
+  "navigation_bar.pins": "Fastgjorte indlæg",
   "navigation_bar.preferences": "Præferencer",
-  "navigation_bar.public_timeline": "Forenet tidslinje",
+  "navigation_bar.public_timeline": "Fælles tidslinje",
+  "navigation_bar.search": "Søg",
   "navigation_bar.security": "Sikkerhed",
-  "notification.favourite": "{name} favoriserede dit trut",
-  "notification.follow": "{name} fulgte dig",
+  "not_signed_in_indicator.not_signed_in": "Man skal logge ind for at tilgå denne ressource.",
+  "notification.admin.report": "{name} anmeldte {target}",
+  "notification.admin.sign_up": "{name} tilmeldte sig",
+  "notification.favourite": "{name} favoritmarkerede dit indlæg",
+  "notification.follow": "{name} begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
   "notification.mention": "{name} nævnte dig",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
-  "notification.reblog": "{name} fremhævede din trut",
+  "notification.reblog": "{name} boostede dit indlæg",
   "notification.status": "{name} har netop postet",
+  "notification.update": "{name} redigerede et indlæg",
   "notifications.clear": "Ryd notifikationer",
-  "notifications.clear_confirmation": "Sikker på, at du vil rydde alle dine notifikationer permanent?",
-  "notifications.column_settings.alert": "Skrivebordsnotifikationer",
+  "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
+  "notifications.column_settings.admin.report": "Nye anmeldelser:",
+  "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
+  "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
-  "notifications.column_settings.filter_bar.show": "Vis",
+  "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
-  "notifications.column_settings.follow_request": "Nye følganmodninger:",
+  "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
-  "notifications.column_settings.push": "Pushnotifikationer",
-  "notifications.column_settings.reblog": "Fremhævelser:",
+  "notifications.column_settings.push": "Push-notifikationer",
+  "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
   "notifications.column_settings.status": "Nye indlæg:",
-  "notifications.column_settings.unread_markers.category": "Ulæste notifkationer-markører",
+  "notifications.column_settings.unread_notifications.category": "Ulæste notifikationer",
+  "notifications.column_settings.unread_notifications.highlight": "Fremhæv ulæste notifikationer",
+  "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
-  "notifications.filter.boosts": "Fremhævelser",
+  "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "Følger",
   "notifications.filter.mentions": "Omtaler",
@@ -333,108 +432,177 @@
   "notifications.grant_permission": "Tildel tilladelse.",
   "notifications.group": "{count} notifikationer",
   "notifications.mark_as_read": "Markér alle notifikationer som læst",
-  "notifications.permission_denied": "Skrivebordsnotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
-  "notifications.permission_denied_alert": "Skrivebordsnotifikationer kan ikke aktiveres, da browsertilladelse er blevet nægtet før",
-  "notifications.permission_required": "Skrivebordsnotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
-  "notifications_permission_banner.enable": "Aktivér skrivebordsnotifikationer",
-  "notifications_permission_banner.how_to_control": "Aktivér skrivebordsnotifikationer for at modtage notifikationer, når Mastodon ikke er åben. Du kan styre, præcist hvilke typer af interaktioner, som genererer skrivebordsnotifikationer via knappen {icon} ovenfor, når de er aktiveret.",
+  "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
+  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
+  "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications_permission_banner.enable": "Aktivér computernotifikationer",
+  "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
-  "picture_in_picture.restore": "Sæt det tilbage",
+  "picture_in_picture.restore": "Indsæt det igen",
   "poll.closed": "Lukket",
-  "poll.refresh": "Opfrisk",
+  "poll.refresh": "Genindlæs",
   "poll.total_people": "{count, plural, one {# person} other {# personer}}",
   "poll.total_votes": "{count, plural, one {# stemme} other {# stemmer}}",
   "poll.vote": "Stem",
-  "poll.voted": "Du stemte for dette svar",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Du stemte på dette svar",
+  "poll.votes": "{votes, plural, one {# stemme} other {# stemmer}}",
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
-  "privacy.change": "Justér trutfortrolighed",
+  "privacy.change": "Justér indlægsfortrolighed",
   "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Direkte",
+  "privacy.direct.short": "Kun nævnte personer",
   "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun for følgere",
-  "privacy.public.long": "Synlig for alle på offentlige tidslinjer",
+  "privacy.private.short": "Kun følgere",
+  "privacy.public.long": "Synlig for alle",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men på offentlige tidslinjer",
-  "privacy.unlisted.short": "Ulistet",
-  "refresh": "Opfrisk",
+  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
+  "privacy.unlisted.short": "Diskret",
+  "privacy_policy.last_updated": "Senest opdateret {date}",
+  "privacy_policy.title": "Fortrolighedspolitik",
+  "refresh": "Genindlæs",
   "regeneration_indicator.label": "Indlæser…",
-  "regeneration_indicator.sublabel": "Din hjemmefeed klargøres!",
+  "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden",
+  "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",
+  "relative_time.full.just_now": "netop nu",
+  "relative_time.full.minutes": "{number, plural, one {# minut} other {# minutter}} siden",
+  "relative_time.full.seconds": "{number, plural, one {# sekund} other {# sekunder}} siden",
   "relative_time.hours": "{number}t",
   "relative_time.just_now": "nu",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
   "reply_indicator.cancel": "Afbryd",
+  "report.block": "Blokér",
+  "report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
+  "report.categories.other": "Andre",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Indhold overtræder en eller flere serverregler",
+  "report.category.subtitle": "Vælg den bedste match",
+  "report.category.title": "Fortæl os, hvad der foregår med denne {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "indlæg",
+  "report.close": "Udført",
+  "report.comment.title": "Er der andet, som vi bør vide?",
   "report.forward": "Videresend til {target}",
-  "report.forward_hint": "Kontoen er fra en anden server. Sende en anonymiseret anmeldelseskopi dertil også?",
-  "report.hint": "Anmeldelsen sendes til din serverordstyrerer. Du kan oplyse nærmere om kontoanmeldelsen nedennfor:",
+  "report.forward_hint": "Kontoen er fra en anden server. Send også en anonymiseret kopi af anmeldelsen dertil?",
+  "report.mute": "Skjul (mute)",
+  "report.mute_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende kan stadig se dine indlæg og følge dig. Vedkommende vil ikke kunne se, at de er blevet skjult.",
+  "report.next": "Næste",
   "report.placeholder": "Yderligere kommentarer",
+  "report.reasons.dislike": "Jeg bryder mig ikke om det",
+  "report.reasons.dislike_description": "Det er ikke noget, man ønsker at se",
+  "report.reasons.other": "Det er noget andet",
+  "report.reasons.other_description": "Problemet passer ikke ind i andre kategorier",
+  "report.reasons.spam": "Det er spam",
+  "report.reasons.spam_description": "Ondsindede links, falsk engagement eller repetitive svar",
+  "report.reasons.violation": "Overtræder serverregler",
+  "report.reasons.violation_description": "Det står klart, at det bryder bestemte regler",
+  "report.rules.subtitle": "Vælg alle relevante",
+  "report.rules.title": "Hvilke regler overtrædes?",
+  "report.statuses.subtitle": "Vælg alle relevante",
+  "report.statuses.title": "Er der indlæg, som kan bekræfte denne anmeldelse?",
   "report.submit": "Indsend",
   "report.target": "Anmelder {target}",
+  "report.thanks.take_action": "Her er mulighederne for at styre, hvad du ser på Mastodon:",
+  "report.thanks.take_action_actionable": "Mens dette gennemgås, kan der skrides til handling mod @{name}:",
+  "report.thanks.title": "Ønsker ikke at se dette?",
+  "report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
+  "report.unfollow": "Følg ikke længere @{name}",
+  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i dit hjemmefeed, kan du stoppe med at følge dem.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
+  "report_notification.categories.other": "Andre",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Regelovertrædelse",
+  "report_notification.open": "Åbn anmeldelse",
   "search.placeholder": "Søg",
+  "search.search_or_paste": "Søg efter eller angiv URL",
   "search_popout.search_format": "Avanceret søgeformat",
-  "search_popout.tips.full_text": "Simpel tekst returnerer trut, du har skrevet, favoriseret, fremhævede eller som er nævnt i/matcher bruger- og profilnavne samt hashtags.",
+  "search_popout.tips.full_text": "Simpel tekst returnerer indlæg, du har skrevet, gjort til favorit, boostet eller er nævnt i, såvel som matchende bruger- og profilnavne samt hashtags.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "trut",
+  "search_popout.tips.status": "indlæg",
   "search_popout.tips.text": "Simpel tekst returnerer matchende visnings- og brugernavne samt hashtags",
   "search_popout.tips.user": "bruger",
   "search_results.accounts": "Personer",
+  "search_results.all": "Alle",
   "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Trut",
-  "search_results.statuses_fts_disabled": "På denne Mastodon-server er trutsøgning efter deres indhold ikke aktiveret.",
+  "search_results.nothing_found": "Ingen resultater for disse søgeord",
+  "search_results.statuses": "Indlæg",
+  "search_results.statuses_fts_disabled": "Søgning på indlæg efter deres indhold ikke aktiveret på denne Mastodon-server.",
+  "search_results.title": "Søg efter {q}",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
+  "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
+  "server_banner.active_users": "aktive brugere",
+  "server_banner.administered_by": "Håndteres af:",
+  "server_banner.introduction": "{domain} er en del af det decentraliserede, sociale netværk drevet af {mastodon}.",
+  "server_banner.learn_more": "Læs mere",
+  "server_banner.server_stats": "Serverstatstik:",
+  "sign_in_banner.create_account": "Opret konto",
+  "sign_in_banner.sign_in": "Log ind",
+  "sign_in_banner.text": "Log ind for at følge profiler eller hashtags, markere som favorit, dele og svare på indlæg eller interagere fra din konto på en anden server.",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
-  "status.admin_status": "Åbn dette trut i modereringsbrugerflade",
+  "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
   "status.block": "Blokér @{name}",
-  "status.bookmark": "Bogmærke",
-  "status.cancel_reblog_private": "Fjern fremhævning",
+  "status.bookmark": "Bogmærk",
+  "status.cancel_reblog_private": "Fjern boost",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
-  "status.copy": "Kopiér link til trut",
+  "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
-  "status.detailed_status": "Detaljeret konversationsvisning",
+  "status.detailed_status": "Detaljeret samtalevisning",
   "status.direct": "Direkte besked til @{name}",
+  "status.edit": "Redigér",
+  "status.edited": "Redigeret {date}",
+  "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
   "status.embed": "Indlejr",
   "status.favourite": "Favorit",
+  "status.filter": "Filtrér dette indlæg",
   "status.filtered": "Filtreret",
+  "status.hide": "Skjul indlæg",
+  "status.history.created": "{name} oprettet {date}",
+  "status.history.edited": "{name} redigeret {date}",
   "status.load_more": "Indlæs mere",
   "status.media_hidden": "Medie skjult",
   "status.mention": "Nævn @{name}",
   "status.more": "Mere",
-  "status.mute": "Tavsgør @{name}",
-  "status.mute_conversation": "Tavsgør konversation",
-  "status.open": "Udvid dette trut",
+  "status.mute": "Skjul @{name} (mute)",
+  "status.mute_conversation": "Skjul samtale (mute)",
+  "status.open": "Udvid dette indlæg",
   "status.pin": "Fastgør til profil",
-  "status.pinned": "Fastgjort trut",
+  "status.pinned": "Fastgjort indlæg",
   "status.read_more": "Læs mere",
-  "status.reblog": "Fremhæv",
-  "status.reblog_private": "Fremhæv med oprindelig synlighed",
-  "status.reblogged_by": "{name} fremhævet",
-  "status.reblogs.empty": "Ingen har endnu fremhævet dette trut. Når nogen gør, vil det fremgå hér.",
-  "status.redraft": "Slet og omskriv",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost med oprindelig synlighed",
+  "status.reblogged_by": "{name} fremhævede",
+  "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
+  "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
+  "status.replied_to": "Besvarede {name}",
   "status.reply": "Besvar",
-  "status.replyAll": "Besvar til tråd",
+  "status.replyAll": "Besvar alle",
   "status.report": "Anmeld @{name}",
-  "status.sensitive_warning": "Sensitivt indhold",
+  "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
+  "status.show_filter_reason": "Vis alligevel",
   "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
   "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
-  "status.show_thread": "Vis tråd",
+  "status.show_original": "Vis original",
+  "status.translate": "Oversæt",
+  "status.translated_from_with": "Oversat fra {lang} ved brug af {provider}",
   "status.uncached_media_warning": "Utilgængelig",
-  "status.unmute_conversation": "Genaktivér konversation",
+  "status.unmute_conversation": "Genaktivér samtale",
   "status.unpin": "Frigør fra profil",
-  "suggestions.dismiss": "Afvis foreslag",
+  "subscribed_languages.lead": "Kun indlæg på udvalgte sprog vil fremgå på dine hjemme- og listetidslinjer efter ændringen. Vælg ingen for at modtage indlæg på alle sprog.",
+  "subscribed_languages.save": "Gem ændringer",
+  "subscribed_languages.target": "Skift abonnementssprog for {target}",
+  "suggestions.dismiss": "Afvis forslag",
   "suggestions.header": "Du er måske interesseret i…",
-  "tabs_bar.federated_timeline": "Forenede",
+  "tabs_bar.federated_timeline": "Fælles",
   "tabs_bar.home": "Hjem",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Notifikationer",
-  "tabs_bar.search": "Søg",
   "time_remaining.days": "{number, plural, one {# dag} other {# dage}} tilbage",
   "time_remaining.hours": "{number, plural, one {# time} other {# timer}} tilbage",
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
@@ -444,25 +612,26 @@
   "timeline_hint.resources.followers": "Følgere",
   "timeline_hint.resources.follows": "Følger",
   "timeline_hint.resources.statuses": "Ældre indlæg",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} taler",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Hot lige nu",
-  "ui.beforeunload": "Dit udkast går tabt, hvis du forlader Mastodon.",
-  "units.short.billion": "{count}MI",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "ui.beforeunload": "Dit udkast går tabt, hvis du lukker Mastodon.",
+  "units.short.billion": "{count} mia.",
+  "units.short.million": "{count} mio.",
+  "units.short.thousand": "{count} tusind",
   "upload_area.title": "Træk og slip for at uploade",
-  "upload_button.label": "Tilføj billeder, en video- eller lydfil",
-  "upload_error.limit": "Filuploadgrænse nået.",
+  "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
+  "upload_error.limit": "Grænse for filupload nået.",
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_form.audio_description": "Beskrivelse til hørehæmmede",
   "upload_form.description": "Beskrivelse til svagtseende",
+  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
   "upload_form.edit": "Redigér",
-  "upload_form.thumbnail": "Skift miniaturer",
+  "upload_form.thumbnail": "Skift miniature",
   "upload_form.undo": "Slet",
   "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
   "upload_modal.analyzing_picture": "Analyserer billede…",
   "upload_modal.apply": "Anvend",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Effektuerer…",
   "upload_modal.choose_image": "Vælg billede",
   "upload_modal.description_placeholder": "En hurtig brun ræv hopper over den dovne hund",
   "upload_modal.detect_text": "Detektér tekst i billede",
@@ -471,14 +640,15 @@
   "upload_modal.preparing_ocr": "Klargør OCR…",
   "upload_modal.preview_label": "Forhåndsvisning ({ratio})",
   "upload_progress.label": "Uploader...",
+  "upload_progress.processing": "Behandler…",
   "video.close": "Luk video",
   "video.download": "Download fil",
   "video.exit_fullscreen": "Forlad fuldskærm",
   "video.expand": "Udvid video",
   "video.fullscreen": "Fuldskærm",
   "video.hide": "Skjul video",
-  "video.mute": "Tavsgør lyd",
-  "video.pause": "Sæt på pause",
+  "video.mute": "Sluk lyden",
+  "video.pause": "Pausér",
   "video.play": "Afspil",
-  "video.unmute": "Fjern lydtavsgørelse"
+  "video.unmute": "Tænd for lyden"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index edc456992..73fff4f25 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderierte Server",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Grund unbekannt",
+  "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediversum zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.",
+  "about.domain_blocks.silenced.explanation": "Alle Inhalte und Profile dieses Servers werden zunächst nicht angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
+  "about.domain_blocks.silenced.title": "Stummgeschaltet",
+  "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.",
+  "about.domain_blocks.suspended.title": "Gesperrt",
+  "about.not_available": "Diese Informationen sind auf diesem Server nicht verfügbar.",
+  "about.powered_by": "Ein dezentralisiertes soziales Netzwerk, angetrieben von {mastodon}",
+  "about.rules": "Serverregeln",
   "account.account_note_header": "Notiz",
   "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
   "account.badges.bot": "Bot",
@@ -7,332 +19,419 @@
   "account.block_domain": "Alles von {domain} verstecken",
   "account.blocked": "Blockiert",
   "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
-  "account.cancel_follow_request": "Folgeanfrage abbrechen",
+  "account.cancel_follow_request": "Folgeanfrage zurückziehen",
   "account.direct": "Direktnachricht an @{name}",
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
   "account.domain_blocked": "Domain versteckt",
   "account.edit_profile": "Profil bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
-  "account.endorse": "Auf Profil hervorheben",
+  "account.endorse": "Im Profil empfehlen",
+  "account.featured_tags.last_status_at": "Letzter Beitrag am {date}",
+  "account.featured_tags.last_status_never": "Keine Beiträge",
+  "account.featured_tags.title": "Von {name} vorgestellte Hashtags",
   "account.follow": "Folgen",
   "account.followers": "Follower",
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
-  "account.following_counter": "{count, plural, one {{counter} Folgender} other {{counter} Folgende}}",
+  "account.following": "Folge ich",
+  "account.following_counter": "{count, plural, one {{counter} Folgt} other {{counter} Folgt}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
   "account.follows_you": "Folgt dir",
+  "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} verbergen",
-  "account.joined": "Beigetreten am {date}",
-  "account.last_status": "Zuletzt aktiv",
-  "account.link_verified_on": "Besitz dieses Links wurde geprüft am {date}",
-  "account.locked_info": "Der Privatsphärenstatus dieses Accounts wurde auf gesperrt gesetzt. Die Person bestimmt manuell wer ihm/ihr folgen darf.",
+  "account.joined_short": "Beigetreten",
+  "account.languages": "Genutzte Sprachen überarbeiten",
+  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
+  "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
   "account.media": "Medien",
-  "account.mention": "@{name} erwähnen",
-  "account.moved_to": "{name} ist umgezogen auf:",
+  "account.mention": "@{name} im Beitrag erwähnen",
+  "account.moved_to": "{name} hat angegeben, dass dieses das neue Konto ist:",
   "account.mute": "@{name} stummschalten",
   "account.mute_notifications": "Benachrichtigungen von @{name} stummschalten",
   "account.muted": "Stummgeschaltet",
-  "account.never_active": "Nie",
+  "account.open_original_page": "Ursprüngliche Seite öffnen",
   "account.posts": "Beiträge",
   "account.posts_with_replies": "Beiträge und Antworten",
   "account.report": "@{name} melden",
-  "account.requested": "Warte auf Erlaubnis. Klicke zum Abbrechen",
+  "account.requested": "Warte auf Genehmigung. Klicke hier, um die Anfrage zum Folgen abzubrechen",
+  "account.requested_follow": "{name} hat angefragt, dir folgen zu dürfen",
   "account.share": "Profil von @{name} teilen",
-  "account.show_reblogs": "Von @{name} geteilte Beiträge anzeigen",
+  "account.show_reblogs": "Geteilte Beiträge von @{name} wieder anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "@{name} entblocken",
-  "account.unblock_domain": "{domain} wieder anzeigen",
-  "account.unendorse": "Nicht auf Profil hervorheben",
+  "account.unblock": "@{name} Sperre aufheben",
+  "account.unblock_domain": "Sperre von {domain} aufheben",
+  "account.unblock_short": "Sperre aufheben",
+  "account.unendorse": "Im Profil nicht mehr empfehlen",
   "account.unfollow": "Entfolgen",
-  "account.unmute": "@{name} nicht mehr stummschalten",
-  "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
+  "account.unmute": "Stummschaltung von @{name} aufheben",
+  "account.unmute_notifications": "Stummschaltung der Benachrichtigungen von @{name} aufheben",
+  "account.unmute_short": "Stummschaltung aufheben",
   "account_note.placeholder": "Notiz durch Klicken hinzufügen",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium}.",
+  "admin.dashboard.daily_retention": "Benutzerverbleibrate nach Tag nach Anmeldung",
+  "admin.dashboard.monthly_retention": "Benutzerverbleibrate nach Monat nach Anmeldung",
+  "admin.dashboard.retention.average": "Durchschnitt",
+  "admin.dashboard.retention.cohort": "Monat der Registrierung",
+  "admin.dashboard.retention.cohort_size": "Neue Benutzer*innen",
+  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
   "alert.rate_limited.title": "Anfragelimit überschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
-  "alert.unexpected.title": "Hoppla!",
+  "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Ankündigung",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ausstehend)",
+  "audio.hide": "Audio verbergen",
   "autosuggest_hashtag.per_week": "{count} pro Woche",
-  "boost_modal.combo": "Drücke {combo}, um dieses Fenster zu überspringen",
-  "bundle_column_error.body": "Etwas ist beim Laden schiefgelaufen.",
+  "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
+  "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
+  "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
+  "bundle_column_error.error.title": "Oh nein!",
+  "bundle_column_error.network.body": "Beim Versuch, diese Seite zu laden, ist ein Fehler aufgetreten. Dies könnte auf ein vorübergehendes Problem mit Ihrer Internetverbindung oder diesem Server zurückzuführen sein.",
+  "bundle_column_error.network.title": "Netzwerkfehler",
   "bundle_column_error.retry": "Erneut versuchen",
-  "bundle_column_error.title": "Netzwerkfehler",
+  "bundle_column_error.return": "Zurück zur Startseite",
+  "bundle_column_error.routing.body": "Die angeforderte Seite konnte nicht gefunden werden. Bist du dir sicher, dass die URL in der Adressleiste korrekt ist?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Schließen",
-  "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.",
+  "bundle_modal_error.message": "Beim Laden dieser Komponente ist etwas schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
-  "column.blocks": "Blockierte Profile",
+  "closed_registrations.other_server_instructions": "Da Mastodon dezentralisiert ist, kannst du ein Konto auf einem anderen Server erstellen und trotzdem mit diesem Server interagieren.",
+  "closed_registrations_modal.description": "Das Anlegen eines Kontos auf {domain} ist derzeit nicht möglich, aber bedenke, dass du kein extra Konto auf {domain} benötigst, um Mastodon nutzen zu können.",
+  "closed_registrations_modal.find_another_server": "Einen anderen Server auswählen",
+  "closed_registrations_modal.preamble": "Mastodon ist dezentralisiert, das heißt, unabhängig davon, wo du dein Konto erstellt hast, kannst du jedem Profil auf diesem Server folgen und mit ihm interagieren. Du kannst sogar deinen eigenen Server hosten!",
+  "closed_registrations_modal.title": "Bei Mastodon registrieren",
+  "column.about": "Über",
+  "column.blocks": "Gesperrte Profile",
   "column.bookmarks": "Lesezeichen",
-  "column.community": "Lokale Zeitleiste",
+  "column.community": "Lokale Timeline",
   "column.direct": "Direktnachrichten",
   "column.directory": "Profile durchsuchen",
-  "column.domain_blocks": "Blockierte Domains",
+  "column.domain_blocks": "Gesperrte Domains",
   "column.favourites": "Favoriten",
-  "column.follow_requests": "Folgeanfragen",
+  "column.follow_requests": "Follower-Anfragen",
   "column.home": "Startseite",
   "column.lists": "Listen",
   "column.mutes": "Stummgeschaltete Profile",
   "column.notifications": "Mitteilungen",
   "column.pins": "Angeheftete Beiträge",
-  "column.public": "Föderierte Zeitleiste",
+  "column.public": "Föderierte Timeline",
   "column_back_button.label": "Zurück",
   "column_header.hide_settings": "Einstellungen verbergen",
-  "column_header.moveLeft_settings": "Spalte nach links verschieben",
-  "column_header.moveRight_settings": "Spalte nach rechts verschieben",
+  "column_header.moveLeft_settings": "Diese Spalte nach links verschieben",
+  "column_header.moveRight_settings": "Diese Spalte nach rechts verschieben",
   "column_header.pin": "Anheften",
   "column_header.show_settings": "Einstellungen anzeigen",
   "column_header.unpin": "Lösen",
   "column_subheading.settings": "Einstellungen",
   "community.column_settings.local_only": "Nur lokal",
-  "community.column_settings.media_only": "Nur Medien",
-  "community.column_settings.remote_only": "Nur entfernt",
-  "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
+  "community.column_settings.media_only": "Nur Beiträge mit angehängten Medien",
+  "community.column_settings.remote_only": "Nur andere Mastodon-Server anzeigen",
+  "compose.language.change": "Sprache festlegen",
+  "compose.language.search": "Sprachen suchen …",
   "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
-  "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
-  "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
-  "compose_form.lock_disclaimer.lock": "gesperrt",
+  "compose_form.encryption_warning": "Beiträge auf Mastodon sind nicht Ende-zu-Ende-verschlüsselt. Teile keine sensiblen Informationen über Mastodon.",
+  "compose_form.hashtag_warning": "Dieser Beitrag ist über Hashtags nicht zu finden, weil er nicht gelistet ist. Nur öffentliche Beiträge tauchen in den Hashtag-Timelines auf.",
+  "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
+  "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt's Neues?",
-  "compose_form.poll.add_option": "Eine Wahl hinzufügen",
+  "compose_form.poll.add_option": "Auswahlfeld hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.option_placeholder": "Wahl {number}",
-  "compose_form.poll.remove_option": "Wahl entfernen",
-  "compose_form.poll.switch_to_multiple": "Umfrage ändern, um mehrere Optionen zu erlauben",
-  "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu erlauben",
-  "compose_form.publish": "Tröt",
+  "compose_form.poll.option_placeholder": "{number}. Auswahl",
+  "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+  "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
+  "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+  "compose_form.publish": "Veröffentlichen",
+  "compose_form.publish_form": "Veröffentlichen",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Medien als NSFW markieren",
-  "compose_form.sensitive.marked": "Medien sind als NSFW markiert",
-  "compose_form.sensitive.unmarked": "Medien sind nicht als NSFW markiert",
-  "compose_form.spoiler.marked": "Text ist hinter einer Warnung versteckt",
-  "compose_form.spoiler.unmarked": "Text ist nicht versteckt",
+  "compose_form.save_changes": "Änderungen speichern",
+  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+  "compose_form.spoiler.marked": "Inhaltswarnung entfernen",
+  "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
   "compose_form.spoiler_placeholder": "Inhaltswarnung",
   "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
-  "confirmations.block.confirm": "Blockieren",
-  "confirmations.block.message": "Bist du dir sicher, dass du {name} blockieren möchtest?",
+  "confirmations.block.block_and_report": "Sperren und melden",
+  "confirmations.block.confirm": "Sperren",
+  "confirmations.block.message": "Bist du dir sicher, dass du {name} sperren möchtest?",
+  "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
+  "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
   "confirmations.delete.message": "Bist du dir sicher, dass du diesen Beitrag löschen möchtest?",
   "confirmations.delete_list.confirm": "Löschen",
-  "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent löschen möchtest?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Die ganze Domain blockieren",
-  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} blockieren willst? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Deine Folgenden von dieser Domain werden entfernt.",
+  "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste endgültig löschen möchtest?",
+  "confirmations.discard_edit_media.confirm": "Verwerfen",
+  "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
+  "confirmations.domain_block.confirm": "Domain sperren",
+  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} sperren willst? In den meisten Fällen reichen ein paar gezielte Sperren oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Bist du sicher, dass du dich abmelden möchtest?",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
-  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu machen möchtest? Favoriten und Boosts werden verloren gehen und Antworten zu diesem Beitrag werden verwaist sein.",
+  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und auf Basis deines vorherigen neu erstellen möchtest? Favoriten und geteilte Beiträge gehen verloren. Vorhandene Antworten von dir und anderen Nutzer*innen auf diesen Beitrag werden zwar nicht gelöscht, aber die Verknüpfungen gehen verloren.",
   "confirmations.reply.confirm": "Antworten",
-  "confirmations.reply.message": "Wenn du jetzt antwortest wird es die gesamte Nachricht verwerfen, die du gerade schreibst. Möchtest du wirklich fortfahren?",
+  "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Bist du dir sicher, dass du {name} entfolgen möchtest?",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
   "conversation.with": "Mit {names}",
-  "directory.federated": "Aus dem Fediverse",
-  "directory.local": "Nur von {domain}",
-  "directory.new_arrivals": "Neue Benutzer",
+  "copypaste.copied": "Kopiert",
+  "copypaste.copy": "Kopieren",
+  "directory.federated": "Aus bekanntem Fediverse",
+  "directory.local": "Nur von der Domain {domain}",
+  "directory.new_arrivals": "Neue Profile",
   "directory.recently_active": "Kürzlich aktiv",
-  "embed.instructions": "Du kannst diesen Beitrag auf deiner Webseite einbetten, indem du den folgenden Code einfügst.",
-  "embed.preview": "So wird es aussehen:",
+  "disabled_account_banner.account_settings": "Kontoeinstellungen",
+  "disabled_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert.",
+  "dismissable_banner.community_timeline": "Das sind die neuesten öffentlichen Beiträge von Personen, deren Konten von {domain} verwaltet werden.",
+  "dismissable_banner.dismiss": "Ablehnen",
+  "dismissable_banner.explore_links": "Diese Nachrichten werden gerade von Leuten auf diesem und anderen Servern des dezentralen Netzwerks besprochen.",
+  "dismissable_banner.explore_statuses": "Diese Beiträge von diesem und anderen Servern im dezentralen Netzwerk gewinnen gerade an Reichweite auf diesem Server.",
+  "dismissable_banner.explore_tags": "Diese Hashtags gewinnen gerade unter den Leuten auf diesem und anderen Servern des dezentralen Netzwerkes an Reichweite.",
+  "dismissable_banner.public_timeline": "Dies sind die neuesten öffentlichen Beiträge von Profilen auf diesem und anderen Servern des dezentralen Netzwerks, von denen dieser Server Kenntnis hat.",
+  "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
+  "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
-  "emoji_button.custom": "Eigene",
+  "emoji_button.clear": "Leeren",
+  "emoji_button.custom": "Spezielle Emojis dieses Servers",
   "emoji_button.flags": "Flaggen",
-  "emoji_button.food": "Essen und Trinken",
+  "emoji_button.food": "Essen & Trinken",
   "emoji_button.label": "Emoji einfügen",
   "emoji_button.nature": "Natur",
-  "emoji_button.not_found": "Keine Emojis!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Keine passenden Emojis gefunden",
   "emoji_button.objects": "Gegenstände",
   "emoji_button.people": "Personen",
-  "emoji_button.recent": "Häufig benutzt",
-  "emoji_button.search": "Suchen…",
+  "emoji_button.recent": "Häufig benutzte Emojis",
+  "emoji_button.search": "Suchen …",
   "emoji_button.search_results": "Suchergebnisse",
   "emoji_button.symbols": "Symbole",
-  "emoji_button.travel": "Reisen und Orte",
+  "emoji_button.travel": "Reisen & Orte",
   "empty_column.account_suspended": "Konto gesperrt",
-  "empty_column.account_timeline": "Keine Beiträge!",
-  "empty_column.account_unavailable": "Konto nicht verfügbar",
-  "empty_column.blocks": "Du hast keine Profile blockiert.",
-  "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
-  "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
-  "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
-  "empty_column.domain_blocks": "Es sind noch keine Domains versteckt.",
-  "empty_column.favourited_statuses": "Du hast noch keine favorisierten Tröts. Wenn du einen favorisierst, wird er hier erscheinen.",
+  "empty_column.account_timeline": "Keine Beiträge vorhanden!",
+  "empty_column.account_unavailable": "Profil nicht verfügbar",
+  "empty_column.blocks": "Du hast bisher keine Profile gesperrt.",
+  "empty_column.bookmarked_statuses": "Du hast bisher keine Beiträge als Lesezeichen abgelegt. Sobald du einen Beitrag als Lesezeichen speicherst, wird er hier erscheinen.",
+  "empty_column.community": "Die lokale Timeline ist leer. Schreibe einen öffentlichen Beitrag, um den Stein ins Rollen zu bringen!",
+  "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Sobald du eine private Nachricht sendest oder empfängst, wird sie hier zu sehen sein.",
+  "empty_column.domain_blocks": "Du hast noch keine Domains gesperrt.",
+  "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder vorbei!",
+  "empty_column.favourited_statuses": "Du hast noch keine Beiträge favorisiert. Sobald du einen favorisierst, wird er hier erscheinen.",
   "empty_column.favourites": "Noch niemand hat diesen Beitrag favorisiert. Sobald es jemand tut, wird das hier angezeigt.",
-  "empty_column.follow_recommendations": "Es sieht so aus, als könnten keine Vorschläge für dich generiert werden. Du kannst versuchen nach Leuten zu suchen, die du vielleicht kennst oder du kannst angesagte Hashtags erkunden.",
-  "empty_column.follow_requests": "Du hast noch keine Folge-Anfragen. Sobald du eine erhältst, wird sie hier angezeigt.",
+  "empty_column.follow_recommendations": "Es sieht so aus, als könnten keine Vorschläge für dich generiert werden. Du kannst versuchen, nach Leuten zu suchen, die du vielleicht kennst, oder du kannst angesagte Hashtags erkunden.",
+  "empty_column.follow_requests": "Es liegen derzeit keine Follower-Anfragen vor. Sobald du eine erhältst, wird sie hier angezeigt.",
   "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.",
-  "empty_column.home": "Deine Startseite ist leer! Besuche {public} oder nutze die Suche, um loszulegen und andere Leute zu finden.",
+  "empty_column.home": "Die Timeline deiner Startseite ist leer! Folge mehr Leuten, um sie zu füllen. {suggestions}",
   "empty_column.home.suggestions": "Ein paar Vorschläge ansehen",
-  "empty_column.list": "Diese Liste ist derzeit leer. Wenn Wesen auf dieser Liste neue Beiträge veröffentlichen werden sie hier erscheinen.",
-  "empty_column.lists": "Du hast noch keine Listen. Wenn du eine anlegst, wird sie hier angezeigt.",
+  "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
+  "empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
-  "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
-  "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufüllen",
-  "error.unexpected_crash.explanation": "Aufgrund eines Fehlers in unserem Code oder einer Browsereinkompatibilität konnte diese Seite nicht korrekt angezeigt werden.",
+  "empty_column.notifications": "Du hast noch keine Mitteilungen. Sobald du mit anderen Personen interagierst, wirst du hier darüber benachrichtigt.",
+  "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
+  "error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
   "error.unexpected_crash.explanation_addons": "Diese Seite konnte nicht korrekt angezeigt werden. Dieser Fehler wird wahrscheinlich durch ein Browser-Add-on oder automatische Übersetzungswerkzeuge verursacht.",
-  "error.unexpected_crash.next_steps": "Versuche die Seite zu aktualisieren. Wenn das nicht hilft, kannst du Mastodon über einen anderen Browser oder eine native App verwenden.",
-  "error.unexpected_crash.next_steps_addons": "Versuche sie zu deaktivieren und lade dann die Seite neu. Wenn das Problem weiterhin besteht, solltest du Mastodon über einen anderen Browser oder eine native App nutzen.",
-  "errors.unexpected_crash.copy_stacktrace": "Fehlerlog in die Zwischenablage kopieren",
-  "errors.unexpected_crash.report_issue": "Problem melden",
+  "error.unexpected_crash.next_steps": "Versuche, diese Seite zu aktualisieren. Wenn das nicht helfen sollte, kannst du das Webinterface von Mastodon vermutlich über einen anderen Browser erreichen – oder du nutzt eine mobile (native) App.",
+  "error.unexpected_crash.next_steps_addons": "Versuche, die Seite zu deaktivieren und lade sie dann neu. Sollte das Problem weiter bestehen, kannst du das Webinterface von Mastodon vermutlich über einen anderen Browser erreichen – oder du nutzt eine mobile (native) App.",
+  "errors.unexpected_crash.copy_stacktrace": "Fehlerdiagnose in die Zwischenablage kopieren",
+  "errors.unexpected_crash.report_issue": "Fehler melden",
+  "explore.search_results": "Suchergebnisse",
+  "explore.suggested_follows": "Für dich",
+  "explore.title": "Entdecken",
+  "explore.trending_links": "Neuigkeiten",
+  "explore.trending_statuses": "Beiträge",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Diese Filterkategorie gilt nicht für den Kontext, in welchem du auf diesen Beitrag zugegriffen hast. Wenn der Beitrag auch in diesem Kontext gefiltert werden soll, musst du den Filter bearbeiten.",
+  "filter_modal.added.context_mismatch_title": "Kontext stimmt nicht überein!",
+  "filter_modal.added.expired_explanation": "Diese Filterkategorie ist abgelaufen. Du musst das Ablaufdatum für diese Kategorie ändern.",
+  "filter_modal.added.expired_title": "Abgelaufener Filter!",
+  "filter_modal.added.review_and_configure": "Um diesen Filter zu überprüfen oder noch weiter zu konfigurieren, rufe die {settings_link} auf.",
+  "filter_modal.added.review_and_configure_title": "Filtereinstellungen",
+  "filter_modal.added.settings_link": "Einstellungen",
+  "filter_modal.added.short_explanation": "Dieser Post wurde folgender Filterkategorie hinzugefügt: {title}.",
+  "filter_modal.added.title": "Filter hinzugefügt!",
+  "filter_modal.select_filter.context_mismatch": "gilt nicht für diesen Kontext",
+  "filter_modal.select_filter.expired": "abgelaufen",
+  "filter_modal.select_filter.prompt_new": "Neue Kategorie: {name}",
+  "filter_modal.select_filter.search": "Suchen oder Erstellen",
+  "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
+  "filter_modal.select_filter.title": "Diesen Beitrag filtern",
+  "filter_modal.title.status": "Beitrag filtern",
   "follow_recommendations.done": "Fertig",
-  "follow_recommendations.heading": "Folge Leuten, von denen du Beiträge sehen möchtest! Hier sind einige Vorschläge.",
+  "follow_recommendations.heading": "Folge Leuten, deren Beiträge du sehen möchtest! Hier sind einige Vorschläge.",
   "follow_recommendations.lead": "Beiträge von Personen, denen du folgst, werden in chronologischer Reihenfolge auf deiner Startseite angezeigt. Hab keine Angst, Fehler zu machen, du kannst den Leuten jederzeit wieder entfolgen!",
-  "follow_request.authorize": "Erlauben",
+  "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
-  "follow_requests.unlocked_explanation": "Auch wenn dein Konto nicht gesperrt ist, haben die Mitarbeiter von {domain} gedacht, dass es besser wäre den Follow manuell zu bestätigen.",
+  "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
+  "footer.about": "Über",
+  "footer.directory": "Profilverzeichnis",
+  "footer.get_app": "App herunterladen",
+  "footer.invite": "Leute einladen",
+  "footer.keyboard_shortcuts": "Tastenkombinationen",
+  "footer.privacy_policy": "Datenschutzerklärung",
+  "footer.source_code": "Quellcode anzeigen",
   "generic.saved": "Gespeichert",
-  "getting_started.developers": "Entwickler",
-  "getting_started.directory": "Profilverzeichnis",
-  "getting_started.documentation": "Dokumentation",
-  "getting_started.heading": "Erste Schritte",
-  "getting_started.invite": "Leute einladen",
-  "getting_started.open_source_notice": "Mastodon ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.",
-  "getting_started.security": "Konto & Sicherheit",
-  "getting_started.terms": "Nutzungsbedingungen",
+  "getting_started.heading": "Auf geht's!",
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
   "hashtag.column_settings.select.no_options_message": "Keine Vorschläge gefunden",
-  "hashtag.column_settings.select.placeholder": "Hashtags eintragen…",
+  "hashtag.column_settings.select.placeholder": "Hashtags eingeben …",
   "hashtag.column_settings.tag_mode.all": "All diese",
-  "hashtag.column_settings.tag_mode.any": "Eins von diesen",
-  "hashtag.column_settings.tag_mode.none": "Keins von diesen",
+  "hashtag.column_settings.tag_mode.any": "Eines von diesen",
+  "hashtag.column_settings.tag_mode.none": "Keines von diesen",
   "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags für diese Spalte einfügen",
+  "hashtag.follow": "Hashtag folgen",
+  "hashtag.unfollow": "Hashtag entfolgen",
   "home.column_settings.basic": "Einfach",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
-  "home.hide_announcements": "Verstecke Ankündigungen",
-  "home.show_announcements": "Zeige Ankündigungen",
+  "home.hide_announcements": "Ankündigungen verbergen",
+  "home.show_announcements": "Ankündigungen anzeigen",
+  "interaction_modal.description.favourite": "Mit einem Mastodon-Konto kannst du diesen Beitrag favorisieren, um deine Wertschätzung auszudrücken, und ihn für einen späteren Zeitpunkt speichern.",
+  "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
+  "interaction_modal.description.reblog": "Mit einem Mastodon-Konto kannst du die Reichweite dieses Beitrags erhöhen, indem du ihn mit deinen Followern teilst.",
+  "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.",
+  "interaction_modal.on_another_server": "Auf einem anderen Server",
+  "interaction_modal.on_this_server": "Auf diesem Server",
+  "interaction_modal.other_server_instructions": "Kopiere diese URL und füge sie in das Suchfeld deiner bevorzugten Mastodon-App oder im Webinterface deiner Mastodon-Instanz ein.",
+  "interaction_modal.preamble": "Da Mastodon dezentralisiert ist, kannst du dein bestehendes Konto auf einem anderen Mastodon-Server oder einer kompatiblen Plattform nutzen, wenn du kein Konto auf dieser Plattform hast.",
+  "interaction_modal.title.favourite": "Beitrag von {name} favorisieren",
+  "interaction_modal.title.follow": "Folge {name}",
+  "interaction_modal.title.reblog": "Beitrag von {name} teilen",
+  "interaction_modal.title.reply": "Auf Beitrag von {name} antworten",
   "intervals.full.days": "{number, plural, one {# Tag} other {# Tage}}",
   "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
   "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
-  "keyboard_shortcuts.back": "zurück navigieren",
-  "keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen",
-  "keyboard_shortcuts.boost": "teilen",
-  "keyboard_shortcuts.column": "einen Beitrag in einer der Spalten fokussieren",
-  "keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
+  "keyboard_shortcuts.back": "zurücknavigieren",
+  "keyboard_shortcuts.blocked": "Liste gesperrter Profile öffnen",
+  "keyboard_shortcuts.boost": "Beitrag teilen",
+  "keyboard_shortcuts.column": "Spalte fokussieren",
+  "keyboard_shortcuts.compose": "Eingabefeld fokussieren",
   "keyboard_shortcuts.description": "Beschreibung",
-  "keyboard_shortcuts.direct": "Direct-Message-Spalte öffnen",
-  "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
+  "keyboard_shortcuts.direct": "Direktnachrichten öffnen",
+  "keyboard_shortcuts.down": "sich in der Liste nach unten bewegen",
   "keyboard_shortcuts.enter": "Beitrag öffnen",
-  "keyboard_shortcuts.favourite": "um zu favorisieren",
-  "keyboard_shortcuts.favourites": "Favoriten-Liste öffnen",
-  "keyboard_shortcuts.federated": "Föderierte Zeitleiste öffnen",
+  "keyboard_shortcuts.favourite": "favorisieren",
+  "keyboard_shortcuts.favourites": "Favoritenliste öffnen",
+  "keyboard_shortcuts.federated": "Föderierte Timeline öffnen",
   "keyboard_shortcuts.heading": "Tastenkombinationen",
   "keyboard_shortcuts.home": "Startseite öffnen",
   "keyboard_shortcuts.hotkey": "Tastenkürzel",
-  "keyboard_shortcuts.legend": "diese Übersicht anzeigen",
-  "keyboard_shortcuts.local": "Lokale Zeitleiste öffnen",
-  "keyboard_shortcuts.mention": "um Autor_in zu erwähnen",
+  "keyboard_shortcuts.legend": "diese Tastenkombinationen anzeigen",
+  "keyboard_shortcuts.local": "lokale Timeline öffnen",
+  "keyboard_shortcuts.mention": "Profil erwähnen",
   "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen",
-  "keyboard_shortcuts.my_profile": "Dein Profil öffnen",
-  "keyboard_shortcuts.notifications": "Benachrichtigungsspalte öffnen",
-  "keyboard_shortcuts.open_media": "um Medien zu öffnen",
+  "keyboard_shortcuts.my_profile": "dein eigenes Profil öffnen",
+  "keyboard_shortcuts.notifications": "Mitteilungen aufrufen",
+  "keyboard_shortcuts.open_media": "Medien-Datei öffnen",
   "keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen",
-  "keyboard_shortcuts.profile": "Profil des Autors öffnen",
-  "keyboard_shortcuts.reply": "antworten",
-  "keyboard_shortcuts.requests": "Liste der Folge-Anfragen öffnen",
-  "keyboard_shortcuts.search": "Suche fokussieren",
-  "keyboard_shortcuts.spoilers": "um CW-Feld anzuzeigen/auszublenden",
-  "keyboard_shortcuts.start": "\"Erste Schritte\"-Spalte öffnen",
-  "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen",
-  "keyboard_shortcuts.toggle_sensitivity": "Medien hinter einer Inhaltswarnung verstecken/anzeigen",
-  "keyboard_shortcuts.toot": "einen neuen Beitrag beginnen",
-  "keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren",
-  "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
+  "keyboard_shortcuts.profile": "Profil öffnen",
+  "keyboard_shortcuts.reply": "auf Beitrag antworten",
+  "keyboard_shortcuts.requests": "Liste der Follower-Anfragen öffnen",
+  "keyboard_shortcuts.search": "Suchleiste fokussieren",
+  "keyboard_shortcuts.spoilers": "Inhaltswarnung anzeigen/verbergen",
+  "keyboard_shortcuts.start": "„Erste Schritte“-Spalte öffnen",
+  "keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/verbergen",
+  "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/verbergen",
+  "keyboard_shortcuts.toot": "neuen Beitrag erstellen",
+  "keyboard_shortcuts.unfocus": "Eingabefeld/Suche nicht mehr fokussieren",
+  "keyboard_shortcuts.up": "sich in der Liste hinaufbewegen",
   "lightbox.close": "Schließen",
   "lightbox.compress": "Bildansicht komprimieren",
   "lightbox.expand": "Bildansicht erweitern",
-  "lightbox.next": "Weiter",
+  "lightbox.next": "Vor",
   "lightbox.previous": "Zurück",
+  "limited_account_hint.action": "Profil trotzdem anzeigen",
+  "limited_account_hint.title": "Dieses Profil wurde von den Moderatoren*innen von {domain} ausgeblendet.",
   "lists.account.add": "Zur Liste hinzufügen",
   "lists.account.remove": "Von der Liste entfernen",
   "lists.delete": "Liste löschen",
   "lists.edit": "Liste bearbeiten",
   "lists.edit.submit": "Titel ändern",
-  "lists.new.create": "Liste hinzufügen",
-  "lists.new.title_placeholder": "Neuer Titel der Liste",
-  "lists.replies_policy.followed": "Jeder gefolgte Benutzer",
+  "lists.new.create": "Neue Liste erstellen",
+  "lists.new.title_placeholder": "Titel der neuen Liste",
+  "lists.replies_policy.followed": "Alle folgenden Profile",
   "lists.replies_policy.list": "Mitglieder der Liste",
-  "lists.replies_policy.none": "Niemand",
+  "lists.replies_policy.none": "Niemandem",
   "lists.replies_policy.title": "Antworten anzeigen für:",
-  "lists.search": "Suche nach Leuten denen du folgst",
+  "lists.search": "Suche nach Leuten, denen du folgst",
   "lists.subheading": "Deine Listen",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
   "loading_indicator.label": "Wird geladen …",
-  "media_gallery.toggle_visible": "Sichtbarkeit umschalten",
+  "media_gallery.toggle_visible": "{number, plural, one {Bild verbergen} other {Bilder verbergen}}",
   "missing_indicator.label": "Nicht gefunden",
-  "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
+  "missing_indicator.sublabel": "Der Inhalt konnte nicht gefunden werden",
+  "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
   "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
-  "mute_modal.indefinite": "Unbestimmt",
-  "navigation_bar.apps": "Mobile Apps",
-  "navigation_bar.blocks": "Blockierte Profile",
+  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils verbergen?",
+  "mute_modal.indefinite": "Unbegrenzt",
+  "navigation_bar.about": "Über",
+  "navigation_bar.blocks": "Gesperrte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
-  "navigation_bar.community_timeline": "Lokale Zeitleiste",
+  "navigation_bar.community_timeline": "Lokale Timeline",
   "navigation_bar.compose": "Neuen Beitrag verfassen",
   "navigation_bar.direct": "Direktnachrichten",
   "navigation_bar.discover": "Entdecken",
-  "navigation_bar.domain_blocks": "Versteckte Domains",
+  "navigation_bar.domain_blocks": "Gesperrte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
+  "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
-  "navigation_bar.filters": "Stummgeschaltene Wörter",
-  "navigation_bar.follow_requests": "Folgeanfragen",
-  "navigation_bar.follows_and_followers": "Folgende und Gefolgte",
-  "navigation_bar.info": "Über diesen Server",
-  "navigation_bar.keyboard_shortcuts": "Tastenkombinationen",
+  "navigation_bar.filters": "Stummgeschaltete Wörter",
+  "navigation_bar.follow_requests": "Follower-Anfragen",
+  "navigation_bar.follows_and_followers": "Folge ich und Follower",
   "navigation_bar.lists": "Listen",
   "navigation_bar.logout": "Abmelden",
   "navigation_bar.mutes": "Stummgeschaltete Profile",
   "navigation_bar.personal": "Persönlich",
   "navigation_bar.pins": "Angeheftete Beiträge",
   "navigation_bar.preferences": "Einstellungen",
-  "navigation_bar.public_timeline": "Föderierte Zeitleiste",
+  "navigation_bar.public_timeline": "Föderierte Timeline",
+  "navigation_bar.search": "Suche",
   "navigation_bar.security": "Sicherheit",
+  "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
+  "notification.admin.report": "{target} wurde von {name} gemeldet",
+  "notification.admin.sign_up": "{name} registrierte sich",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
-  "notification.follow": "{name} folgt dir",
+  "notification.follow": "{name} folgt dir jetzt",
   "notification.follow_request": "{name} möchte dir folgen",
-  "notification.mention": "{name} hat dich erwähnt",
+  "notification.mention": "{name} erwähnte dich",
   "notification.own_poll": "Deine Umfrage ist beendet",
-  "notification.poll": "Eine Umfrage in der du abgestimmt hast ist vorbei",
-  "notification.reblog": "{name} hat deinen Beitrag geteilt",
-  "notification.status": "{name} hat gerade etwas gepostet",
+  "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
+  "notification.reblog": "{name} teilte deinen Beitrag",
+  "notification.status": "{name} hat etwas mitgeteilt",
+  "notification.update": "{name} bearbeitete einen Beitrag",
   "notifications.clear": "Mitteilungen löschen",
-  "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen löschen möchtest?",
+  "notifications.clear_confirmation": "Bist du dir sicher, dass du diese Mitteilungen für immer löschen möchtest?",
+  "notifications.column_settings.admin.report": "Neue Meldungen:",
+  "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favorisierungen:",
-  "notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
-  "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
-  "notifications.column_settings.filter_bar.show": "Anzeigen",
-  "notifications.column_settings.follow": "Neue Folgende:",
-  "notifications.column_settings.follow_request": "Neue Folgeanfragen:",
+  "notifications.column_settings.filter_bar.advanced": "Erweiterte Filterleiste aktivieren",
+  "notifications.column_settings.filter_bar.category": "Filterleiste:",
+  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
+  "notifications.column_settings.follow": "Neue Follower:",
+  "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
-  "notifications.column_settings.poll": "Ergebnisse von Umfragen:",
+  "notifications.column_settings.poll": "Umfrageergebnisse:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
-  "notifications.column_settings.show": "In der Spalte anzeigen",
+  "notifications.column_settings.show": "In diesem Feed anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
   "notifications.column_settings.status": "Neue Beiträge:",
-  "notifications.column_settings.unread_markers.category": "Ungelesene Benachrichtigungsmarkierungen",
-  "notifications.filter.all": "Alle",
+  "notifications.column_settings.unread_notifications.category": "Ungelesene Mitteilungen:",
+  "notifications.column_settings.unread_notifications.highlight": "Ungelesene Mitteilungen markieren",
+  "notifications.column_settings.update": "Bearbeitete Beiträge:",
+  "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Geteilte Beiträge",
   "notifications.filter.favourites": "Favorisierungen",
-  "notifications.filter.follows": "Folgt",
+  "notifications.filter.follows": "Neue Follower",
   "notifications.filter.mentions": "Erwähnungen",
-  "notifications.filter.polls": "Ergebnisse der Umfrage",
-  "notifications.filter.statuses": "Updates von Personen, denen du folgst",
-  "notifications.grant_permission": "Zugriff gewährt.",
+  "notifications.filter.polls": "Umfrageergebnisse",
+  "notifications.filter.statuses": "Neue Beiträge von Personen, denen du folgst",
+  "notifications.grant_permission": "Berechtigung erteilen.",
   "notifications.group": "{count} Benachrichtigungen",
-  "notifications.mark_as_read": "Alle Benachrichtigungen als gelesen markieren",
+  "notifications.mark_as_read": "Alles als gelesen markieren",
   "notifications.permission_denied": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Berechtigung verweigert wurde.",
   "notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
   "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
@@ -340,137 +439,208 @@
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
   "notifications_permission_banner.title": "Verpasse nie etwas",
   "picture_in_picture.restore": "Zurücksetzen",
-  "poll.closed": "Geschlossen",
+  "poll.closed": "Beendet",
   "poll.refresh": "Aktualisieren",
-  "poll.total_people": "{count, plural, one {# Person} other {# Personen}}",
+  "poll.total_people": "{count, plural, one {# Profil} other {# Profile}}",
   "poll.total_votes": "{count, plural, one {# Stimme} other {# Stimmen}}",
   "poll.vote": "Abstimmen",
-  "poll.voted": "Du hast dafür gestimmt",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Eine Umfrage erstellen",
+  "poll.voted": "Du hast für diese Auswahl gestimmt",
+  "poll.votes": "{votes, plural, one {# Stimme} other {# Stimmen}}",
+  "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
-  "privacy.direct.long": "Wird an erwähnte Profile gesendet",
-  "privacy.direct.short": "Direktnachricht",
-  "privacy.private.long": "Nur für Folgende sichtbar",
-  "privacy.private.short": "Nur für Folgende",
-  "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
+  "privacy.direct.long": "Nur für die genannten Profile sichtbar",
+  "privacy.direct.short": "Nur erwähnte Profile",
+  "privacy.private.long": "Nur für deine Follower sichtbar",
+  "privacy.private.short": "Nur Follower",
+  "privacy.public.long": "Für alle sichtbar",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Wird in öffentlichen Zeitleisten nicht gezeigt",
+  "privacy.unlisted.long": "Sichtbar für alle, aber nicht über Suchfunktion",
   "privacy.unlisted.short": "Nicht gelistet",
+  "privacy_policy.last_updated": "Zuletzt aktualisiert am {date}",
+  "privacy_policy.title": "Datenschutzerklärung",
   "refresh": "Aktualisieren",
-  "regeneration_indicator.label": "Laden…",
+  "regeneration_indicator.label": "Wird geladen …",
   "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.days": "{number}T",
+  "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
+  "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
+  "relative_time.full.just_now": "soeben",
+  "relative_time.full.minutes": "vor {number, plural, one {# Minute} other {# Minuten}}",
+  "relative_time.full.seconds": "vor {number, plural, one {1 Sekunde} other {# Sekunden}}",
+  "relative_time.hours": "{number} Std",
   "relative_time.just_now": "jetzt",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} sek",
   "relative_time.today": "heute",
   "reply_indicator.cancel": "Abbrechen",
+  "report.block": "Sperren",
+  "report.block_explanation": "Dir wird es nicht länger möglich sein, die Beiträge dieses Konto zu sehen. Das gesperrte Profil wird nicht mehr in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird mitbekommen, dass du ihr Konto gesperrt hast.",
+  "report.categories.other": "Andere",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Serverregeln",
+  "report.category.subtitle": "Wähle die passendste Kategorie",
+  "report.category.title": "Sag uns, was das Problem mit diesem {type} ist",
+  "report.category.title_account": "Profil",
+  "report.category.title_status": "Beitrag",
+  "report.close": "Fertig",
+  "report.comment.title": "Gibt es etwas anderes, was wir wissen sollten?",
   "report.forward": "An {target} weiterleiten",
-  "report.forward_hint": "Dieses Konto ist von einem anderen Server. Soll eine anonymisierte Kopie des Berichts auch dorthin geschickt werden?",
-  "report.hint": "Der Bericht wird an die Moderatoren des Servers geschickt. Du kannst hier eine Erklärung angeben, warum du dieses Konto meldest:",
-  "report.placeholder": "Zusätzliche Kommentare",
-  "report.submit": "Absenden",
+  "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin geschickt werden?",
+  "report.mute": "Stummschalten",
+  "report.mute_explanation": "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immer noch folgen, und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stummgeschaltet hast.",
+  "report.next": "Weiter",
+  "report.placeholder": "Ergänzende Hinweise",
+  "report.reasons.dislike": "Das gefällt mir nicht",
+  "report.reasons.dislike_description": "Es ist etwas, das du nicht sehen willst",
+  "report.reasons.other": "Es ist etwas anderes",
+  "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien",
+  "report.reasons.spam": "Das ist Spam",
+  "report.reasons.spam_description": "Bösartige Links, gefälschtes Engagement oder wiederholte Antworten",
+  "report.reasons.violation": "Es verstößt gegen Serverregeln",
+  "report.reasons.violation_description": "Du bist dir bewusst, dass es gegen bestimmte Regeln verstößt",
+  "report.rules.subtitle": "Wähle alle zutreffenden Inhalte aus",
+  "report.rules.title": "Welche Regeln werden verletzt?",
+  "report.statuses.subtitle": "Wähle alle zutreffenden Inhalte aus",
+  "report.statuses.title": "Gibt es Beiträge, die diesen Bericht unterstützen?",
+  "report.submit": "Abschicken",
   "report.target": "{target} melden",
+  "report.thanks.take_action": "Das sind deine Möglichkeiten zu bestimmen, was du auf Mastodon sehen möchtest:",
+  "report.thanks.take_action_actionable": "Während wir den Vorfall überprüfen, kannst du gegen @{name} weitere Maßnahmen ergreifen:",
+  "report.thanks.title": "Möchtest du das nicht mehr sehen?",
+  "report.thanks.title_actionable": "Vielen Dank für die Meldung, wir werden uns das ansehen.",
+  "report.unfollow": "@{name} entfolgen",
+  "report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} angehangener Beitrag} other {{count} angehängte Beiträge}}",
+  "report_notification.categories.other": "Nicht aufgeführt",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Regelverstoß",
+  "report_notification.open": "Meldung öffnen",
   "search.placeholder": "Suche",
-  "search_popout.search_format": "Fortgeschrittenes Suchformat",
-  "search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
+  "search.search_or_paste": "Suchen oder URL einfügen",
+  "search_popout.search_format": "Erweiterte Suche",
+  "search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast, zurück; außerdem auch Beiträge, in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
   "search_popout.tips.hashtag": "Hashtag",
-  "search_popout.tips.status": "Tröt",
+  "search_popout.tips.status": "Beitrag",
   "search_popout.tips.text": "Einfache Texteingabe gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
-  "search_popout.tips.user": "Nutzer",
-  "search_results.accounts": "Personen",
+  "search_popout.tips.user": "Profil",
+  "search_results.accounts": "Profile",
+  "search_results.all": "Alles",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Nichts für diese Suchbegriffe gefunden",
   "search_results.statuses": "Beiträge",
-  "search_results.statuses_fts_disabled": "Die Suche für Beiträge nach ihrem Inhalt ist auf diesem Mastodon-Server deaktiviert.",
+  "search_results.statuses_fts_disabled": "Die Suche nach Beitragsinhalten ist auf diesem Mastodon-Server deaktiviert.",
+  "search_results.title": "Suchergebnisse für {q}",
   "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
-  "status.admin_account": "Öffne Moderationsoberfläche für @{name}",
-  "status.admin_status": "Öffne Beitrag in der Moderationsoberfläche",
-  "status.block": "Blockiere @{name}",
-  "status.bookmark": "Lesezeichen",
-  "status.cancel_reblog_private": "Nicht mehr teilen",
+  "server_banner.about_active_users": "Personen, die diesen Server in den vergangenen 30 Tagen genutzt haben (monatlich aktive Benutzer*innen)",
+  "server_banner.active_users": "aktive Profile",
+  "server_banner.administered_by": "Verwaltet von:",
+  "server_banner.introduction": "{domain} ist Teil des dezentralen sozialen Netzwerks, das von {mastodon} betrieben wird.",
+  "server_banner.learn_more": "Mehr erfahren",
+  "server_banner.server_stats": "Serverstatistiken:",
+  "sign_in_banner.create_account": "Konto erstellen",
+  "sign_in_banner.sign_in": "Anmelden",
+  "sign_in_banner.text": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und auf sie zu antworten oder um von deinem Konto aus auf einem anderen Server zu interagieren.",
+  "status.admin_account": "Moderationsoberfläche für @{name} öffnen",
+  "status.admin_status": "Diesen Beitrag in der Moderationsoberfläche öffnen",
+  "status.block": "@{name} blockieren",
+  "status.bookmark": "Beitrag als Lesezeichen setzen",
+  "status.cancel_reblog_private": "Teilen des Beitrags rückgängig machen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
-  "status.copy": "Kopiere Link zum Beitrag",
-  "status.delete": "Löschen",
-  "status.detailed_status": "Detaillierte Ansicht der Konversation",
-  "status.direct": "Direktnachricht @{name}",
-  "status.embed": "Einbetten",
+  "status.copy": "Link zum Beitrag kopieren",
+  "status.delete": "Beitrag löschen",
+  "status.detailed_status": "Detaillierte Ansicht der Unterhaltung",
+  "status.direct": "Direktnachricht an @{name}",
+  "status.edit": "Beitrag bearbeiten",
+  "status.edited": "Bearbeitet {date}",
+  "status.edited_x_times": "{count, plural, one {{count} mal} other {{count} mal}} bearbeitet",
+  "status.embed": "Beitrag per iFrame einbetten",
   "status.favourite": "Favorisieren",
+  "status.filter": "Beitrag filtern",
   "status.filtered": "Gefiltert",
+  "status.hide": "Beitrag verbergen",
+  "status.history.created": "{name} erstellte {date}",
+  "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Weitere laden",
   "status.media_hidden": "Medien versteckt",
-  "status.mention": "@{name} erwähnen",
+  "status.mention": "@{name} im Beitrag erwähnen",
   "status.more": "Mehr",
   "status.mute": "@{name} stummschalten",
-  "status.mute_conversation": "Konversation stummschalten",
-  "status.open": "Diesen Beitrag öffnen",
+  "status.mute_conversation": "Unterhaltung stummschalten",
+  "status.open": "Beitrag öffnen",
   "status.pin": "Im Profil anheften",
   "status.pinned": "Angehefteter Beitrag",
-  "status.read_more": "Mehr lesen",
+  "status.read_more": "Gesamten Beitrag anschauen",
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
   "status.reblogged_by": "{name} teilte",
-  "status.reblogs.empty": "Diesen Beitrag hat noch niemand geteilt. Sobald es jemand tut, wird diese Person hier angezeigt.",
+  "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird dieser Account hier angezeigt.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
+  "status.replied_to": "Antwortete {name}",
   "status.reply": "Antworten",
   "status.replyAll": "Allen antworten",
   "status.report": "@{name} melden",
-  "status.sensitive_warning": "NSFW",
+  "status.sensitive_warning": "Inhaltswarnung",
   "status.share": "Teilen",
+  "status.show_filter_reason": "Trotzdem anzeigen",
   "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alle Inhaltswarnungen zuklappen",
   "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alle Inhaltswarnungen aufklappen",
-  "status.show_thread": "Zeige Konversation",
+  "status.show_original": "Ursprünglichen Beitrag anzeigen",
+  "status.translate": "Übersetzen",
+  "status.translated_from_with": "Aus {lang} mittels {provider} übersetzt",
   "status.uncached_media_warning": "Nicht verfügbar",
-  "status.unmute_conversation": "Stummschaltung von Konversation aufheben",
+  "status.unmute_conversation": "Stummschaltung der Unterhaltung aufheben",
   "status.unpin": "Vom Profil lösen",
-  "suggestions.dismiss": "Empfehlung ausblenden",
-  "suggestions.header": "Du bist vielleicht interessiert an…",
-  "tabs_bar.federated_timeline": "Föderation",
+  "subscribed_languages.lead": "Nach der Änderung werden nur noch Beiträge in den ausgewählten Sprachen in den Timelines deiner Startseite und deiner Listen angezeigt. Wähle keine Sprache aus, um alle Beiträge zu sehen.",
+  "subscribed_languages.save": "Änderungen speichern",
+  "subscribed_languages.target": "Abonnierte Sprachen für {target} ändern",
+  "suggestions.dismiss": "Vorschlag ablehnen",
+  "suggestions.header": "Du bist möglicherweise interessiert an …",
+  "tabs_bar.federated_timeline": "Föderiert",
   "tabs_bar.home": "Startseite",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Mitteilungen",
-  "tabs_bar.search": "Suche",
-  "time_remaining.days": "{number, plural, one {# Tag} other {# Tage}} verbleibend",
-  "time_remaining.hours": "{number, plural, one {# Stunde} other {# Stunden}} verbleibend",
-  "time_remaining.minutes": "{number, plural, one {# Minute} other {# Minuten}} verbleibend",
-  "time_remaining.moments": "Schließt in Kürze",
-  "time_remaining.seconds": "{number, plural, one {# Sekunde} other {# Sekunden}} verbleibend",
+  "time_remaining.days": "noch {number, plural, one {# Tag} other {# Tage}}",
+  "time_remaining.hours": "noch {number, plural, one {# Stunde} other {# Stunden}}",
+  "time_remaining.minutes": "noch {number, plural, one {# Minute} other {# Minuten}}",
+  "time_remaining.moments": "Wird gleich beendet",
+  "time_remaining.seconds": "noch {number, plural, one {# Sekunde} other {# Sekunden}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
   "timeline_hint.resources.followers": "Follower",
-  "timeline_hint.resources.follows": "Folgt",
+  "timeline_hint.resources.follows": "Folge ich",
   "timeline_hint.resources.statuses": "Ältere Beiträge",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} Person redet darüber} other {{counter} Personen reden darüber}}",
-  "trends.trending_now": "In den Trends",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Profil} other {{counter} Profile}} {days, plural, one {seit gestern} other {in {days} Tagen}}",
+  "trends.trending_now": "Aktuelle Trends",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} Mrd",
+  "units.short.million": "{count} Mio",
+  "units.short.thousand": "{count} Tsd",
   "upload_area.title": "Zum Hochladen hereinziehen",
-  "upload_button.label": "Mediendatei hinzufügen",
-  "upload_error.limit": "Dateiupload-Limit erreicht.",
-  "upload_error.poll": "Dateiuploads sind in Kombination mit Umfragen nicht erlaubt.",
-  "upload_form.audio_description": "Beschreibe die Audiodatei für Menschen mit Hörschädigungen",
-  "upload_form.description": "Für Menschen mit Sehbehinderung beschreiben",
+  "upload_button.label": "Bilder, Videos oder Audios hinzufügen",
+  "upload_error.limit": "Dateiupload-Limit überschritten.",
+  "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
+  "upload_form.audio_description": "Für Gehörlose und hörbehinderte Menschen beschreiben",
+  "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
+  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",
-  "upload_form.thumbnail": "Miniaturansicht ändern",
+  "upload_form.thumbnail": "Vorschaubild ändern",
   "upload_form.undo": "Löschen",
-  "upload_form.video_description": "Beschreibe das Video für Menschen mit einer Hör- oder Sehbehinderung",
-  "upload_modal.analyzing_picture": "Analysiere Bild…",
+  "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
+  "upload_modal.analyzing_picture": "Bild wird analysiert …",
   "upload_modal.apply": "Übernehmen",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Wird angewendet …",
   "upload_modal.choose_image": "Bild auswählen",
-  "upload_modal.description_placeholder": "Die heiße Zypernsonne quälte Max und Victoria ja böse auf dem Weg bis zur Küste",
+  "upload_modal.description_placeholder": "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich",
   "upload_modal.detect_text": "Text aus Bild erkennen",
   "upload_modal.edit_media": "Medien bearbeiten",
-  "upload_modal.hint": "Klicke oder ziehe den Kreis auf die Vorschau, um den Brennpunkt auszuwählen, der immer auf allen Vorschaubilder angezeigt wird.",
-  "upload_modal.preparing_ocr": "Vorbereitung von OCR…",
+  "upload_modal.hint": "Ziehe den Kreis auf die Stelle Deines Bildes, die bei Vorschaugrafiken in der Mitte stehen soll.",
+  "upload_modal.preparing_ocr": "Texterkennung wird vorbereitet …",
   "upload_modal.preview_label": "Vorschau ({ratio})",
   "upload_progress.label": "Wird hochgeladen …",
+  "upload_progress.processing": "Wird verarbeitet…",
   "video.close": "Video schließen",
   "video.download": "Datei herunterladen",
   "video.exit_fullscreen": "Vollbild verlassen",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 6ccca7406..786a5c4bb 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -75,10 +75,35 @@
       {
         "defaultMessage": "Unmute notifications from @{name}",
         "id": "account.unmute_notifications"
+      },
+      {
+        "defaultMessage": "Mute @{name}",
+        "id": "account.mute"
+      },
+      {
+        "defaultMessage": "Block @{name}",
+        "id": "account.block"
       }
     ],
     "path": "app/javascript/mastodon/components/account.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Other",
+        "id": "report.categories.other"
+      },
+      {
+        "defaultMessage": "Spam",
+        "id": "report.categories.spam"
+      },
+      {
+        "defaultMessage": "Content violates one or more server rules",
+        "id": "report.categories.violation"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/admin/ReportReasonSelector.json"
+  },
   {
     "descriptors": [
       {
@@ -98,8 +123,12 @@
         "id": "admin.dashboard.retention.average"
       },
       {
-        "defaultMessage": "Retention",
-        "id": "admin.dashboard.retention"
+        "defaultMessage": "User retention rate by day after sign-up",
+        "id": "admin.dashboard.daily_retention"
+      },
+      {
+        "defaultMessage": "User retention rate by month after sign-up",
+        "id": "admin.dashboard.monthly_retention"
       }
     ],
     "path": "app/javascript/mastodon/components/admin/Retention.json"
@@ -185,7 +214,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+        "defaultMessage": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
         "id": "account.statuses_counter"
       },
       {
@@ -199,6 +228,15 @@
     ],
     "path": "app/javascript/mastodon/components/common_counter.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Dismiss",
+        "id": "dismissable_banner.dismiss"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/dismissable_banner.json"
+  },
   {
     "descriptors": [
       {
@@ -208,6 +246,27 @@
     ],
     "path": "app/javascript/mastodon/components/domain.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Edited {count, plural, one {{count} time} other {{count} times}}",
+        "id": "status.edited_x_times"
+      },
+      {
+        "defaultMessage": "{name} created {date}",
+        "id": "status.history.created"
+      },
+      {
+        "defaultMessage": "{name} edited {date}",
+        "id": "status.history.edited"
+      },
+      {
+        "defaultMessage": "Edited {date}",
+        "id": "status.edited"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/edited_timestamp/index.json"
+  },
   {
     "descriptors": [
       {
@@ -240,7 +299,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
         "id": "trends.counter_by_accounts"
       }
     ],
@@ -273,15 +332,6 @@
     ],
     "path": "app/javascript/mastodon/components/load_pending.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Loading...",
-        "id": "loading_indicator.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/loading_indicator.json"
-  },
   {
     "descriptors": [
       {
@@ -316,6 +366,15 @@
     ],
     "path": "app/javascript/mastodon/components/missing_indicator.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "You need to sign in to access this resource.",
+        "id": "not_signed_in_indicator.not_signed_in"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/not_signed_in_indicator.json"
+  },
   {
     "descriptors": [
       {
@@ -381,22 +440,42 @@
         "defaultMessage": "now",
         "id": "relative_time.just_now"
       },
+      {
+        "defaultMessage": "just now",
+        "id": "relative_time.full.just_now"
+      },
       {
         "defaultMessage": "{number}s",
         "id": "relative_time.seconds"
       },
+      {
+        "defaultMessage": "{number, plural, one {# second} other {# seconds}} ago",
+        "id": "relative_time.full.seconds"
+      },
       {
         "defaultMessage": "{number}m",
         "id": "relative_time.minutes"
       },
+      {
+        "defaultMessage": "{number, plural, one {# minute} other {# minutes}} ago",
+        "id": "relative_time.full.minutes"
+      },
       {
         "defaultMessage": "{number}h",
         "id": "relative_time.hours"
       },
+      {
+        "defaultMessage": "{number, plural, one {# hour} other {# hours}} ago",
+        "id": "relative_time.full.hours"
+      },
       {
         "defaultMessage": "{number}d",
         "id": "relative_time.days"
       },
+      {
+        "defaultMessage": "{number, plural, one {# day} other {# days}} ago",
+        "id": "relative_time.full.days"
+      },
       {
         "defaultMessage": "Moments remaining",
         "id": "time_remaining.moments"
@@ -420,6 +499,35 @@
     ],
     "path": "app/javascript/mastodon/components/relative_timestamp.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "People using this server during the last 30 days (Monthly Active Users)",
+        "id": "server_banner.about_active_users"
+      },
+      {
+        "defaultMessage": "{domain} is part of the decentralized social network powered by {mastodon}.",
+        "id": "server_banner.introduction"
+      },
+      {
+        "defaultMessage": "Administered by:",
+        "id": "server_banner.administered_by"
+      },
+      {
+        "defaultMessage": "Server stats:",
+        "id": "server_banner.server_stats"
+      },
+      {
+        "defaultMessage": "active users",
+        "id": "server_banner.active_users"
+      },
+      {
+        "defaultMessage": "Learn more",
+        "id": "server_banner.learn_more"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/server_banner.json"
+  },
   {
     "descriptors": [
       {
@@ -447,6 +555,10 @@
         "defaultMessage": "Delete & re-draft",
         "id": "status.redraft"
       },
+      {
+        "defaultMessage": "Edit",
+        "id": "status.edit"
+      },
       {
         "defaultMessage": "Direct message @{name}",
         "id": "status.direct"
@@ -547,6 +659,10 @@
         "defaultMessage": "Copy link to status",
         "id": "status.copy"
       },
+      {
+        "defaultMessage": "Hide toot",
+        "id": "status.hide"
+      },
       {
         "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
@@ -562,6 +678,14 @@
       {
         "defaultMessage": "Unblock @{name}",
         "id": "account.unblock"
+      },
+      {
+        "defaultMessage": "Filter this post",
+        "id": "status.filter"
+      },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
       }
     ],
     "path": "app/javascript/mastodon/components/status_action_bar.json"
@@ -569,8 +693,16 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Show thread",
-        "id": "status.show_thread"
+        "defaultMessage": "Translated from {lang} using {provider}",
+        "id": "status.translated_from_with"
+      },
+      {
+        "defaultMessage": "Show original",
+        "id": "status.show_original"
+      },
+      {
+        "defaultMessage": "Translate",
+        "id": "status.translate"
       },
       {
         "defaultMessage": "Read more",
@@ -602,20 +734,32 @@
         "id": "privacy.private.short"
       },
       {
-        "defaultMessage": "Direct",
+        "defaultMessage": "Mentioned people only",
         "id": "privacy.direct.short"
       },
+      {
+        "defaultMessage": "Edited {date}",
+        "id": "status.edited"
+      },
       {
         "defaultMessage": "Filtered",
         "id": "status.filtered"
       },
       {
-        "defaultMessage": "Pinned toot",
+        "defaultMessage": "Show anyway",
+        "id": "status.show_filter_reason"
+      },
+      {
+        "defaultMessage": "Pinned post",
         "id": "status.pinned"
       },
       {
         "defaultMessage": "{name} boosted",
         "id": "status.reblogged_by"
+      },
+      {
+        "defaultMessage": "Replied to {name}",
+        "id": "status.replied_to"
       }
     ],
     "path": "app/javascript/mastodon/components/status.json"
@@ -696,6 +840,67 @@
     ],
     "path": "app/javascript/mastodon/containers/status_container.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "About",
+        "id": "column.about"
+      },
+      {
+        "defaultMessage": "Server rules",
+        "id": "about.rules"
+      },
+      {
+        "defaultMessage": "Moderated servers",
+        "id": "about.blocks"
+      },
+      {
+        "defaultMessage": "Limited",
+        "id": "about.domain_blocks.silenced.title"
+      },
+      {
+        "defaultMessage": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+        "id": "about.domain_blocks.silenced.explanation"
+      },
+      {
+        "defaultMessage": "Suspended",
+        "id": "about.domain_blocks.suspended.title"
+      },
+      {
+        "defaultMessage": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+        "id": "about.domain_blocks.suspended.explanation"
+      },
+      {
+        "defaultMessage": "Decentralized social media powered by {mastodon}",
+        "id": "about.powered_by"
+      },
+      {
+        "defaultMessage": "Administered by:",
+        "id": "server_banner.administered_by"
+      },
+      {
+        "defaultMessage": "Contact:",
+        "id": "about.contact"
+      },
+      {
+        "defaultMessage": "This information has not been made available on this server.",
+        "id": "about.not_available"
+      },
+      {
+        "defaultMessage": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+        "id": "about.domain_blocks.preamble"
+      },
+      {
+        "defaultMessage": "Reason not available",
+        "id": "about.domain_blocks.no_reason_available"
+      },
+      {
+        "defaultMessage": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+        "id": "about.disclaimer"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/about/index.json"
+  },
   {
     "descriptors": [
       {
@@ -712,11 +917,11 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "account.posts"
       },
       {
-        "defaultMessage": "Toots and replies",
+        "defaultMessage": "Posts and replies",
         "id": "account.posts_with_replies"
       },
       {
@@ -729,14 +934,35 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "{name} has moved to:",
+        "defaultMessage": "This profile has been hidden by the moderators of {domain}.",
+        "id": "limited_account_hint.title"
+      },
+      {
+        "defaultMessage": "Show profile anyway",
+        "id": "limited_account_hint.action"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account_timeline/components/limited_account_hint.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "{name} has indicated that their new account is now:",
         "id": "account.moved_to"
+      },
+      {
+        "defaultMessage": "Go to profile",
+        "id": "account.go_to_profile"
       }
     ],
     "path": "app/javascript/mastodon/features/account_timeline/components/moved_note.json"
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Withdraw request",
+        "id": "confirmations.cancel_follow_request.confirm"
+      },
       {
         "defaultMessage": "Unfollow",
         "id": "confirmations.unfollow.confirm"
@@ -749,6 +975,10 @@
         "defaultMessage": "Are you sure you want to unfollow {name}?",
         "id": "confirmations.unfollow.message"
       },
+      {
+        "defaultMessage": "Are you sure you want to withdraw your request to follow {name}?",
+        "id": "confirmations.cancel_follow_request.message"
+      },
       {
         "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
         "id": "confirmations.domain_block.message"
@@ -759,7 +989,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Older toots",
+        "defaultMessage": "Older posts",
         "id": "timeline_hint.resources.statuses"
       },
       {
@@ -771,7 +1001,7 @@
         "id": "empty_column.account_unavailable"
       },
       {
-        "defaultMessage": "No toots here!",
+        "defaultMessage": "No posts found",
         "id": "empty_column.account_timeline"
       }
     ],
@@ -794,6 +1024,40 @@
     ],
     "path": "app/javascript/mastodon/features/account/components/account_note.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Last post on {date}",
+        "id": "account.featured_tags.last_status_at"
+      },
+      {
+        "defaultMessage": "No posts",
+        "id": "account.featured_tags.last_status_never"
+      },
+      {
+        "defaultMessage": "{name}'s featured hashtags",
+        "id": "account.featured_tags.title"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account/components/featured_tags.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "{name} has requested to follow you",
+        "id": "account.requested_follow"
+      },
+      {
+        "defaultMessage": "Authorize",
+        "id": "follow_request.authorize"
+      },
+      {
+        "defaultMessage": "Reject",
+        "id": "follow_request.reject"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account/components/follow_request_note.json"
+  },
   {
     "descriptors": [
       {
@@ -805,7 +1069,7 @@
         "id": "account.follow"
       },
       {
-        "defaultMessage": "Cancel follow request",
+        "defaultMessage": "Withdraw follow request",
         "id": "account.cancel_follow_request"
       },
       {
@@ -885,7 +1149,7 @@
         "id": "account.disable_notifications"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -932,6 +1196,14 @@
         "defaultMessage": "Open moderation interface for @{name}",
         "id": "status.admin_account"
       },
+      {
+        "defaultMessage": "Change subscribed languages",
+        "id": "account.languages"
+      },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
+      },
       {
         "defaultMessage": "Follows you",
         "id": "account.follows_you"
@@ -957,8 +1229,8 @@
         "id": "account.badges.group"
       },
       {
-        "defaultMessage": "Joined {date}",
-        "id": "account.joined"
+        "defaultMessage": "Joined",
+        "id": "account.joined_short"
       }
     ],
     "path": "app/javascript/mastodon/features/account/components/header.json"
@@ -984,6 +1256,18 @@
       {
         "defaultMessage": "Download file",
         "id": "video.download"
+      },
+      {
+        "defaultMessage": "Hide audio",
+        "id": "audio.hide"
+      },
+      {
+        "defaultMessage": "Sensitive content",
+        "id": "status.sensitive_warning"
+      },
+      {
+        "defaultMessage": "Media hidden",
+        "id": "status.media_hidden"
       }
     ],
     "path": "app/javascript/mastodon/features/audio/index.json"
@@ -1008,12 +1292,45 @@
         "id": "column.bookmarks"
       },
       {
-        "defaultMessage": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+        "defaultMessage": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
         "id": "empty_column.bookmarked_statuses"
       }
     ],
     "path": "app/javascript/mastodon/features/bookmarked_statuses/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+        "id": "closed_registrations_modal.description"
+      },
+      {
+        "defaultMessage": "Signing up on Mastodon",
+        "id": "closed_registrations_modal.title"
+      },
+      {
+        "defaultMessage": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+        "id": "closed_registrations_modal.preamble"
+      },
+      {
+        "defaultMessage": "On this server",
+        "id": "interaction_modal.on_this_server"
+      },
+      {
+        "defaultMessage": "On a different server",
+        "id": "interaction_modal.on_another_server"
+      },
+      {
+        "defaultMessage": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+        "id": "closed_registrations.other_server_instructions"
+      },
+      {
+        "defaultMessage": "Find another server",
+        "id": "closed_registrations_modal.find_another_server"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/closed_registrations_modal/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1029,6 +1346,10 @@
         "defaultMessage": "Local timeline",
         "id": "column.community"
       },
+      {
+        "defaultMessage": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+        "id": "dismissable_banner.community_timeline"
+      },
       {
         "defaultMessage": "The local timeline is empty. Write something publicly to get the ball rolling!",
         "id": "empty_column.community"
@@ -1043,7 +1364,7 @@
         "id": "account.edit_profile"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -1100,12 +1421,16 @@
         "id": "compose_form.spoiler_placeholder"
       },
       {
-        "defaultMessage": "Toot",
+        "defaultMessage": "Publish",
         "id": "compose_form.publish"
       },
       {
         "defaultMessage": "{publish}!",
         "id": "compose_form.publish_loud"
+      },
+      {
+        "defaultMessage": "Save changes",
+        "id": "compose_form.save_changes"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/compose_form.json"
@@ -1171,6 +1496,23 @@
     ],
     "path": "app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Change language",
+        "id": "compose.language.change"
+      },
+      {
+        "defaultMessage": "Search languages...",
+        "id": "compose.language.search"
+      },
+      {
+        "defaultMessage": "Clear",
+        "id": "emoji_button.clear"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/compose/components/language_dropdown.json"
+  },
   {
     "descriptors": [
       {
@@ -1241,7 +1583,7 @@
         "id": "privacy.public.short"
       },
       {
-        "defaultMessage": "Visible for all, shown in public timelines",
+        "defaultMessage": "Visible for all",
         "id": "privacy.public.long"
       },
       {
@@ -1249,11 +1591,11 @@
         "id": "privacy.unlisted.short"
       },
       {
-        "defaultMessage": "Visible for all, but not in public timelines",
+        "defaultMessage": "Visible for all, but opted-out of discovery features",
         "id": "privacy.unlisted.long"
       },
       {
-        "defaultMessage": "Followers-only",
+        "defaultMessage": "Followers only",
         "id": "privacy.private.short"
       },
       {
@@ -1261,7 +1603,7 @@
         "id": "privacy.private.long"
       },
       {
-        "defaultMessage": "Direct",
+        "defaultMessage": "Mentioned people only",
         "id": "privacy.direct.short"
       },
       {
@@ -1299,11 +1641,11 @@
         "id": "search_results.accounts"
       },
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Posts",
         "id": "search_results.statuses"
       },
       {
-        "defaultMessage": "Searching toots by their content is not enabled on this Mastodon server.",
+        "defaultMessage": "Searching posts by their content is not enabled on this Mastodon server.",
         "id": "search_results.statuses_fts_disabled"
       },
       {
@@ -1323,6 +1665,10 @@
         "defaultMessage": "Search",
         "id": "search.placeholder"
       },
+      {
+        "defaultMessage": "Search or paste URL",
+        "id": "search.search_or_paste"
+      },
       {
         "defaultMessage": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
         "id": "search_popout.tips.full_text"
@@ -1361,12 +1707,16 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Processing…",
+        "id": "upload_progress.processing"
+      },
       {
         "defaultMessage": "Uploading…",
         "id": "upload_progress.label"
       }
     ],
-    "path": "app/javascript/mastodon/features/compose/components/upload_form.json"
+    "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
   },
   {
     "descriptors": [
@@ -1377,6 +1727,10 @@
       {
         "defaultMessage": "Edit",
         "id": "upload_form.edit"
+      },
+      {
+        "defaultMessage": "No description added",
+        "id": "upload_form.description_missing"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/upload.json"
@@ -1435,12 +1789,12 @@
         "id": "compose_form.lock_disclaimer.lock"
       },
       {
-        "defaultMessage": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+        "defaultMessage": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
         "id": "compose_form.hashtag_warning"
       },
       {
-        "defaultMessage": "This toot will only be sent to all the mentioned users.",
-        "id": "compose_form.direct_message_warning"
+        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+        "id": "compose_form.encryption_warning"
       },
       {
         "defaultMessage": "Learn more",
@@ -1480,7 +1834,7 @@
         "id": "navigation_bar.logout"
       },
       {
-        "defaultMessage": "Compose new toot",
+        "defaultMessage": "Compose new post",
         "id": "navigation_bar.compose"
       },
       {
@@ -1550,6 +1904,14 @@
         "defaultMessage": "Direct messages",
         "id": "column.direct"
       },
+      {
+        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+        "id": "compose_form.encryption_warning"
+      },
+      {
+        "defaultMessage": "Learn more",
+        "id": "compose_form.direct_message_warning_learn_more"
+      },
       {
         "defaultMessage": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
         "id": "empty_column.direct"
@@ -1559,36 +1921,52 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Follow",
-        "id": "account.follow"
-      },
       {
         "defaultMessage": "Unfollow",
         "id": "account.unfollow"
       },
       {
-        "defaultMessage": "Awaiting approval",
+        "defaultMessage": "Follow",
+        "id": "account.follow"
+      },
+      {
+        "defaultMessage": "Withdraw follow request",
+        "id": "account.cancel_follow_request"
+      },
+      {
+        "defaultMessage": "Withdraw request",
+        "id": "confirmations.cancel_follow_request.confirm"
+      },
+      {
+        "defaultMessage": "Awaiting approval. Click to cancel follow request",
         "id": "account.requested"
       },
       {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
+        "defaultMessage": "Unblock",
+        "id": "account.unblock_short"
       },
       {
-        "defaultMessage": "Unmute @{name}",
-        "id": "account.unmute"
+        "defaultMessage": "Unmute",
+        "id": "account.unmute_short"
       },
       {
         "defaultMessage": "Unfollow",
         "id": "confirmations.unfollow.confirm"
       },
+      {
+        "defaultMessage": "Edit profile",
+        "id": "account.edit_profile"
+      },
       {
         "defaultMessage": "Are you sure you want to unfollow {name}?",
         "id": "confirmations.unfollow.message"
       },
       {
-        "defaultMessage": "Toots",
+        "defaultMessage": "Are you sure you want to withdraw your request to follow {name}?",
+        "id": "confirmations.cancel_follow_request.message"
+      },
+      {
+        "defaultMessage": "Posts",
         "id": "account.posts"
       },
       {
@@ -1596,12 +1974,8 @@
         "id": "account.followers"
       },
       {
-        "defaultMessage": "Never",
-        "id": "account.never_active"
-      },
-      {
-        "defaultMessage": "Last active",
-        "id": "account.last_status"
+        "defaultMessage": "Following",
+        "id": "account.following"
       }
     ],
     "path": "app/javascript/mastodon/features/directory/components/account_card.json"
@@ -1648,6 +2022,112 @@
     ],
     "path": "app/javascript/mastodon/features/domain_blocks/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Explore",
+        "id": "explore.title"
+      },
+      {
+        "defaultMessage": "Search results",
+        "id": "explore.search_results"
+      },
+      {
+        "defaultMessage": "Posts",
+        "id": "explore.trending_statuses"
+      },
+      {
+        "defaultMessage": "Hashtags",
+        "id": "explore.trending_tags"
+      },
+      {
+        "defaultMessage": "News",
+        "id": "explore.trending_links"
+      },
+      {
+        "defaultMessage": "For you",
+        "id": "explore.suggested_follows"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+        "id": "dismissable_banner.explore_links"
+      },
+      {
+        "defaultMessage": "Nothing is trending right now. Check back later!",
+        "id": "empty_column.explore_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/links.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Search for {q}",
+        "id": "search_results.title"
+      },
+      {
+        "defaultMessage": "Could not find anything for these search terms",
+        "id": "search_results.nothing_found"
+      },
+      {
+        "defaultMessage": "All",
+        "id": "search_results.all"
+      },
+      {
+        "defaultMessage": "People",
+        "id": "search_results.accounts"
+      },
+      {
+        "defaultMessage": "Hashtags",
+        "id": "search_results.hashtags"
+      },
+      {
+        "defaultMessage": "Posts",
+        "id": "search_results.statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/results.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Nothing is trending right now. Check back later!",
+        "id": "empty_column.explore_statuses"
+      },
+      {
+        "defaultMessage": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+        "id": "dismissable_banner.explore_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/statuses.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Nothing is trending right now. Check back later!",
+        "id": "empty_column.explore_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/suggestions.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+        "id": "dismissable_banner.explore_tags"
+      },
+      {
+        "defaultMessage": "Nothing is trending right now. Check back later!",
+        "id": "empty_column.explore_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/explore/tags.json"
+  },
   {
     "descriptors": [
       {
@@ -1655,7 +2135,7 @@
         "id": "column.favourites"
       },
       {
-        "defaultMessage": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+        "defaultMessage": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
         "id": "empty_column.favourited_statuses"
       }
     ],
@@ -1668,12 +2148,90 @@
         "id": "refresh"
       },
       {
-        "defaultMessage": "No one has favourited this toot yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has favourited this post yet. When someone does, they will show up here.",
         "id": "empty_column.favourites"
       }
     ],
     "path": "app/javascript/mastodon/features/favourites/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Expired filter!",
+        "id": "filter_modal.added.expired_title"
+      },
+      {
+        "defaultMessage": "This filter category has expired, you will need to change the expiration date for it to apply.",
+        "id": "filter_modal.added.expired_explanation"
+      },
+      {
+        "defaultMessage": "Context mismatch!",
+        "id": "filter_modal.added.context_mismatch_title"
+      },
+      {
+        "defaultMessage": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+        "id": "filter_modal.added.context_mismatch_explanation"
+      },
+      {
+        "defaultMessage": "settings page",
+        "id": "filter_modal.added.settings_link"
+      },
+      {
+        "defaultMessage": "Filter added!",
+        "id": "filter_modal.added.title"
+      },
+      {
+        "defaultMessage": "This post has been added to the following filter category: {title}.",
+        "id": "filter_modal.added.short_explanation"
+      },
+      {
+        "defaultMessage": "Filter settings",
+        "id": "filter_modal.added.review_and_configure_title"
+      },
+      {
+        "defaultMessage": "To review and further configure this filter category, go to the {settings_link}.",
+        "id": "filter_modal.added.review_and_configure"
+      },
+      {
+        "defaultMessage": "Done",
+        "id": "report.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/filters/added_to_filter.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Search or create",
+        "id": "filter_modal.select_filter.search"
+      },
+      {
+        "defaultMessage": "Clear",
+        "id": "emoji_button.clear"
+      },
+      {
+        "defaultMessage": "expired",
+        "id": "filter_modal.select_filter.expired"
+      },
+      {
+        "defaultMessage": "does not apply to this context",
+        "id": "filter_modal.select_filter.context_mismatch"
+      },
+      {
+        "defaultMessage": "New category: {name}",
+        "id": "filter_modal.select_filter.prompt_new"
+      },
+      {
+        "defaultMessage": "Filter this post",
+        "id": "filter_modal.select_filter.title"
+      },
+      {
+        "defaultMessage": "Use an existing category or create a new one",
+        "id": "filter_modal.select_filter.subtitle"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/filters/select_filter.json"
+  },
   {
     "descriptors": [
       {
@@ -1744,6 +2302,10 @@
         "defaultMessage": "Followers",
         "id": "timeline_hint.resources.followers"
       },
+      {
+        "defaultMessage": "Account suspended",
+        "id": "empty_column.account_suspended"
+      },
       {
         "defaultMessage": "Profile unavailable",
         "id": "empty_column.account_unavailable"
@@ -1761,6 +2323,10 @@
         "defaultMessage": "Follows",
         "id": "timeline_hint.resources.follows"
       },
+      {
+        "defaultMessage": "Account suspended",
+        "id": "empty_column.account_suspended"
+      },
       {
         "defaultMessage": "Profile unavailable",
         "id": "empty_column.account_unavailable"
@@ -1824,6 +2390,10 @@
         "defaultMessage": "Local timeline",
         "id": "navigation_bar.community_timeline"
       },
+      {
+        "defaultMessage": "Explore",
+        "id": "navigation_bar.explore"
+      },
       {
         "defaultMessage": "Direct messages",
         "id": "navigation_bar.direct"
@@ -1857,7 +2427,7 @@
         "id": "navigation_bar.mutes"
       },
       {
-        "defaultMessage": "Pinned toots",
+        "defaultMessage": "Pinned posts",
         "id": "navigation_bar.pins"
       },
       {
@@ -1879,10 +2449,6 @@
       {
         "defaultMessage": "Getting started",
         "id": "getting_started.heading"
-      },
-      {
-        "defaultMessage": "Profile directory",
-        "id": "getting_started.directory"
       }
     ],
     "path": "app/javascript/mastodon/features/getting_started/index.json"
@@ -1922,6 +2488,14 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Follow hashtag",
+        "id": "hashtag.follow"
+      },
+      {
+        "defaultMessage": "Unfollow hashtag",
+        "id": "hashtag.unfollow"
+      },
       {
         "defaultMessage": "or {additional}",
         "id": "hashtag.column_header.tag_mode.any"
@@ -1983,6 +2557,75 @@
     ],
     "path": "app/javascript/mastodon/features/home_timeline/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Copied",
+        "id": "copypaste.copied"
+      },
+      {
+        "defaultMessage": "Copy",
+        "id": "copypaste.copy"
+      },
+      {
+        "defaultMessage": "Reply to {name}'s post",
+        "id": "interaction_modal.title.reply"
+      },
+      {
+        "defaultMessage": "With an account on Mastodon, you can respond to this post.",
+        "id": "interaction_modal.description.reply"
+      },
+      {
+        "defaultMessage": "Boost {name}'s post",
+        "id": "interaction_modal.title.reblog"
+      },
+      {
+        "defaultMessage": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+        "id": "interaction_modal.description.reblog"
+      },
+      {
+        "defaultMessage": "Favourite {name}'s post",
+        "id": "interaction_modal.title.favourite"
+      },
+      {
+        "defaultMessage": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+        "id": "interaction_modal.description.favourite"
+      },
+      {
+        "defaultMessage": "Follow {name}",
+        "id": "interaction_modal.title.follow"
+      },
+      {
+        "defaultMessage": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+        "id": "interaction_modal.description.follow"
+      },
+      {
+        "defaultMessage": "Create account",
+        "id": "sign_in_banner.create_account"
+      },
+      {
+        "defaultMessage": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+        "id": "interaction_modal.preamble"
+      },
+      {
+        "defaultMessage": "On this server",
+        "id": "interaction_modal.on_this_server"
+      },
+      {
+        "defaultMessage": "Sign in",
+        "id": "sign_in_banner.sign_in"
+      },
+      {
+        "defaultMessage": "On a different server",
+        "id": "interaction_modal.on_another_server"
+      },
+      {
+        "defaultMessage": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+        "id": "interaction_modal.other_server_instructions"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/interaction_modal/index.json"
+  },
   {
     "descriptors": [
       {
@@ -2050,7 +2693,7 @@
         "id": "keyboard_shortcuts.compose"
       },
       {
-        "defaultMessage": "to start a brand new toot",
+        "defaultMessage": "to start a brand new post",
         "id": "keyboard_shortcuts.toot"
       },
       {
@@ -2098,7 +2741,7 @@
         "id": "keyboard_shortcuts.favourites"
       },
       {
-        "defaultMessage": "to open pinned toots list",
+        "defaultMessage": "to open pinned posts list",
         "id": "keyboard_shortcuts.pinned"
       },
       {
@@ -2332,8 +2975,20 @@
         "id": "notifications.column_settings.poll"
       },
       {
-        "defaultMessage": "New toots:",
+        "defaultMessage": "New posts:",
         "id": "notifications.column_settings.status"
+      },
+      {
+        "defaultMessage": "Edits:",
+        "id": "notifications.column_settings.update"
+      },
+      {
+        "defaultMessage": "New sign-ups:",
+        "id": "notifications.column_settings.admin.sign_up"
+      },
+      {
+        "defaultMessage": "New reports:",
+        "id": "notifications.column_settings.admin.report"
       }
     ],
     "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
@@ -2419,6 +3074,18 @@
         "defaultMessage": "{name} just posted",
         "id": "notification.status"
       },
+      {
+        "defaultMessage": "{name} edited a post",
+        "id": "notification.update"
+      },
+      {
+        "defaultMessage": "{name} signed up",
+        "id": "notification.admin.sign_up"
+      },
+      {
+        "defaultMessage": "{name} reported {target}",
+        "id": "notification.admin.report"
+      },
       {
         "defaultMessage": "{name} has requested to follow you",
         "id": "notification.follow_request"
@@ -2447,6 +3114,31 @@
     ],
     "path": "app/javascript/mastodon/features/notifications/components/notifications_permission_banner.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Open report",
+        "id": "report_notification.open"
+      },
+      {
+        "defaultMessage": "Other",
+        "id": "report_notification.categories.other"
+      },
+      {
+        "defaultMessage": "Spam",
+        "id": "report_notification.categories.spam"
+      },
+      {
+        "defaultMessage": "Rule violation",
+        "id": "report_notification.categories.violation"
+      },
+      {
+        "defaultMessage": "{count, plural, one {{count} post} other {{count} posts}} attached",
+        "id": "report_notification.attached_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/notifications/components/report.json"
+  },
   {
     "descriptors": [
       {
@@ -2538,12 +3230,25 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Pinned toot",
+        "defaultMessage": "Pinned post",
         "id": "column.pins"
       }
     ],
     "path": "app/javascript/mastodon/features/pinned_statuses/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Privacy Policy",
+        "id": "privacy_policy.title"
+      },
+      {
+        "defaultMessage": "Last updated {date}",
+        "id": "privacy_policy.last_updated"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/privacy_policy/index.json"
+  },
   {
     "descriptors": [
       {
@@ -2563,6 +3268,10 @@
         "defaultMessage": "Federated timeline",
         "id": "column.public"
       },
+      {
+        "defaultMessage": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+        "id": "dismissable_banner.public_timeline"
+      },
       {
         "defaultMessage": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
         "id": "empty_column.public"
@@ -2577,12 +3286,218 @@
         "id": "refresh"
       },
       {
-        "defaultMessage": "No one has boosted this toot yet. When someone does, they will show up here.",
+        "defaultMessage": "No one has boosted this post yet. When someone does, they will show up here.",
         "id": "status.reblogs.empty"
       }
     ],
     "path": "app/javascript/mastodon/features/reblogs/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "I don't like it",
+        "id": "report.reasons.dislike"
+      },
+      {
+        "defaultMessage": "It is not something you want to see",
+        "id": "report.reasons.dislike_description"
+      },
+      {
+        "defaultMessage": "It's spam",
+        "id": "report.reasons.spam"
+      },
+      {
+        "defaultMessage": "Malicious links, fake engagement, or repetitive replies",
+        "id": "report.reasons.spam_description"
+      },
+      {
+        "defaultMessage": "It violates server rules",
+        "id": "report.reasons.violation"
+      },
+      {
+        "defaultMessage": "You are aware that it breaks specific rules",
+        "id": "report.reasons.violation_description"
+      },
+      {
+        "defaultMessage": "It's something else",
+        "id": "report.reasons.other"
+      },
+      {
+        "defaultMessage": "The issue does not fit into other categories",
+        "id": "report.reasons.other_description"
+      },
+      {
+        "defaultMessage": "post",
+        "id": "report.category.title_status"
+      },
+      {
+        "defaultMessage": "profile",
+        "id": "report.category.title_account"
+      },
+      {
+        "defaultMessage": "Tell us what's going on with this {type}",
+        "id": "report.category.title"
+      },
+      {
+        "defaultMessage": "Choose the best match",
+        "id": "report.category.subtitle"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "report.next"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/category.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Type or paste additional comments",
+        "id": "report.placeholder"
+      },
+      {
+        "defaultMessage": "Is there anything else you think we should know?",
+        "id": "report.comment.title"
+      },
+      {
+        "defaultMessage": "The account is from another server. Send an anonymized copy of the report there as well?",
+        "id": "report.forward_hint"
+      },
+      {
+        "defaultMessage": "Forward to {target}",
+        "id": "report.forward"
+      },
+      {
+        "defaultMessage": "Submit report",
+        "id": "report.submit"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/comment.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Public",
+        "id": "privacy.public.short"
+      },
+      {
+        "defaultMessage": "Unlisted",
+        "id": "privacy.unlisted.short"
+      },
+      {
+        "defaultMessage": "Followers-only",
+        "id": "privacy.private.short"
+      },
+      {
+        "defaultMessage": "Mentioned people only",
+        "id": "privacy.direct.short"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/components/status_check_box.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Which rules are being violated?",
+        "id": "report.rules.title"
+      },
+      {
+        "defaultMessage": "Select all that apply",
+        "id": "report.rules.subtitle"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "report.next"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/rules.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Are there any posts that back up this report?",
+        "id": "report.statuses.title"
+      },
+      {
+        "defaultMessage": "Select all that apply",
+        "id": "report.statuses.subtitle"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "report.next"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/statuses.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Thanks for reporting, we'll look into this.",
+        "id": "report.thanks.title_actionable"
+      },
+      {
+        "defaultMessage": "Don't want to see this?",
+        "id": "report.thanks.title"
+      },
+      {
+        "defaultMessage": "While we review this, you can take action against @{name}:",
+        "id": "report.thanks.take_action_actionable"
+      },
+      {
+        "defaultMessage": "Here are your options for controlling what you see on Mastodon:",
+        "id": "report.thanks.take_action"
+      },
+      {
+        "defaultMessage": "Unfollow @{name}",
+        "id": "report.unfollow"
+      },
+      {
+        "defaultMessage": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+        "id": "report.unfollow_explanation"
+      },
+      {
+        "defaultMessage": "Unfollow",
+        "id": "account.unfollow"
+      },
+      {
+        "defaultMessage": "Mute @{name}",
+        "id": "account.mute"
+      },
+      {
+        "defaultMessage": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+        "id": "report.mute_explanation"
+      },
+      {
+        "defaultMessage": "Mute",
+        "id": "report.mute"
+      },
+      {
+        "defaultMessage": "Muted",
+        "id": "account.muted"
+      },
+      {
+        "defaultMessage": "Block @{name}",
+        "id": "account.block"
+      },
+      {
+        "defaultMessage": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+        "id": "report.block_explanation"
+      },
+      {
+        "defaultMessage": "Block",
+        "id": "report.block"
+      },
+      {
+        "defaultMessage": "Blocked",
+        "id": "account.blocked"
+      },
+      {
+        "defaultMessage": "Done",
+        "id": "report.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/thanks.json"
+  },
   {
     "descriptors": [
       {
@@ -2593,6 +3508,10 @@
         "defaultMessage": "Delete & re-draft",
         "id": "status.redraft"
       },
+      {
+        "defaultMessage": "Edit",
+        "id": "status.edit"
+      },
       {
         "defaultMessage": "Direct message @{name}",
         "id": "status.direct"
@@ -2696,6 +3615,10 @@
       {
         "defaultMessage": "Unblock @{name}",
         "id": "account.unblock"
+      },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
       }
     ],
     "path": "app/javascript/mastodon/features/status/components/action_bar.json"
@@ -2730,35 +3653,6 @@
     ],
     "path": "app/javascript/mastodon/features/status/components/detailed_status.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "confirmations.delete.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status?",
-        "id": "confirmations.delete.message"
-      },
-      {
-        "defaultMessage": "Delete & redraft",
-        "id": "confirmations.redraft.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-        "id": "confirmations.redraft.message"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "confirmations.reply.confirm"
-      },
-      {
-        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.reply.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/containers/detailed_status_container.json"
-  },
   {
     "descriptors": [
       {
@@ -2808,6 +3702,27 @@
     ],
     "path": "app/javascript/mastodon/features/status/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      },
+      {
+        "defaultMessage": "Change subscribed languages for {target}",
+        "id": "subscribed_languages.target"
+      },
+      {
+        "defaultMessage": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+        "id": "subscribed_languages.lead"
+      },
+      {
+        "defaultMessage": "Save changes",
+        "id": "subscribed_languages.save"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/subscribed_languages_modal/index.json"
+  },
   {
     "descriptors": [
       {
@@ -2865,16 +3780,44 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Network error",
-        "id": "bundle_column_error.title"
+        "defaultMessage": "Copied",
+        "id": "copypaste.copied"
       },
       {
-        "defaultMessage": "Something went wrong while loading this component.",
-        "id": "bundle_column_error.body"
+        "defaultMessage": "404",
+        "id": "bundle_column_error.routing.title"
+      },
+      {
+        "defaultMessage": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+        "id": "bundle_column_error.routing.body"
+      },
+      {
+        "defaultMessage": "Network error",
+        "id": "bundle_column_error.network.title"
+      },
+      {
+        "defaultMessage": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+        "id": "bundle_column_error.network.body"
+      },
+      {
+        "defaultMessage": "Oh, no!",
+        "id": "bundle_column_error.error.title"
+      },
+      {
+        "defaultMessage": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+        "id": "bundle_column_error.error.body"
       },
       {
         "defaultMessage": "Try again",
         "id": "bundle_column_error.retry"
+      },
+      {
+        "defaultMessage": "Copy error report",
+        "id": "bundle_column_error.copy_stacktrace"
+      },
+      {
+        "defaultMessage": "Go back home",
+        "id": "bundle_column_error.return"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/bundle_column_error.json"
@@ -2899,11 +3842,15 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Toot",
-        "id": "compose_form.publish"
+        "defaultMessage": "{name} created {date}",
+        "id": "status.history.created"
+      },
+      {
+        "defaultMessage": "{name} edited {date}",
+        "id": "status.history.edited"
       }
     ],
-    "path": "app/javascript/mastodon/features/ui/components/columns_area.json"
+    "path": "app/javascript/mastodon/features/ui/components/compare_history_modal.json"
   },
   {
     "descriptors": [
@@ -2914,6 +3861,31 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/confirmation_modal.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Are you sure you want to log out?",
+        "id": "confirmations.logout.message"
+      },
+      {
+        "defaultMessage": "Log out",
+        "id": "confirmations.logout.confirm"
+      },
+      {
+        "defaultMessage": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+        "id": "moved_to_account_banner.text"
+      },
+      {
+        "defaultMessage": "Your account {disabledAccount} is currently disabled.",
+        "id": "disabled_account_banner.text"
+      },
+      {
+        "defaultMessage": "Account settings",
+        "id": "disabled_account_banner.account_settings"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/disabled_account_banner.json"
+  },
   {
     "descriptors": [
       {
@@ -2935,6 +3907,19 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/embed_modal.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      },
+      {
+        "defaultMessage": "Filter a post",
+        "id": "filter_modal.title.status"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/filter_modal.json"
+  },
   {
     "descriptors": [
       {
@@ -2966,15 +3951,15 @@
         "id": "confirmations.discard_edit_media.confirm"
       },
       {
-        "defaultMessage": "Describe for people with hearing loss",
+        "defaultMessage": "Describe for people who are hard of hearing",
         "id": "upload_form.audio_description"
       },
       {
-        "defaultMessage": "Describe for people with hearing loss or visual impairment",
+        "defaultMessage": "Describe for people who are deaf, hard of hearing, blind or have low vision",
         "id": "upload_form.video_description"
       },
       {
-        "defaultMessage": "Describe for the visually impaired",
+        "defaultMessage": "Describe for people who are blind or have low vision",
         "id": "upload_form.description"
       },
       {
@@ -3015,7 +4000,33 @@
         "id": "navigation_bar.follow_requests"
       }
     ],
-    "path": "app/javascript/mastodon/features/ui/components/follow_requests_nav_link.json"
+    "path": "app/javascript/mastodon/features/ui/components/follow_requests_column_link.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Publish",
+        "id": "compose_form.publish_form"
+      },
+      {
+        "defaultMessage": "Create account",
+        "id": "sign_in_banner.create_account"
+      },
+      {
+        "defaultMessage": "Sign in",
+        "id": "sign_in_banner.sign_in"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/header.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/image_modal.json"
   },
   {
     "descriptors": [
@@ -3027,45 +4038,33 @@
         "defaultMessage": "Log out",
         "id": "confirmations.logout.confirm"
       },
+      {
+        "defaultMessage": "About",
+        "id": "footer.about"
+      },
       {
         "defaultMessage": "Invite people",
-        "id": "getting_started.invite"
+        "id": "footer.invite"
       },
       {
-        "defaultMessage": "Hotkeys",
-        "id": "navigation_bar.keyboard_shortcuts"
+        "defaultMessage": "Profiles directory",
+        "id": "footer.directory"
       },
       {
-        "defaultMessage": "Security",
-        "id": "getting_started.security"
+        "defaultMessage": "Privacy policy",
+        "id": "footer.privacy_policy"
       },
       {
-        "defaultMessage": "About this server",
-        "id": "navigation_bar.info"
+        "defaultMessage": "Get the app",
+        "id": "footer.get_app"
       },
       {
-        "defaultMessage": "Mobile apps",
-        "id": "navigation_bar.apps"
+        "defaultMessage": "Keyboard shortcuts",
+        "id": "footer.keyboard_shortcuts"
       },
       {
-        "defaultMessage": "Terms of service",
-        "id": "getting_started.terms"
-      },
-      {
-        "defaultMessage": "Developers",
-        "id": "getting_started.developers"
-      },
-      {
-        "defaultMessage": "Documentation",
-        "id": "getting_started.documentation"
-      },
-      {
-        "defaultMessage": "Logout",
-        "id": "navigation_bar.logout"
-      },
-      {
-        "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-        "id": "getting_started.open_source_notice"
+        "defaultMessage": "View source code",
+        "id": "footer.source_code"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/link_footer.json"
@@ -3142,6 +4141,10 @@
         "defaultMessage": "Notifications",
         "id": "tabs_bar.notifications"
       },
+      {
+        "defaultMessage": "Explore",
+        "id": "explore.title"
+      },
       {
         "defaultMessage": "Local",
         "id": "tabs_bar.local_timeline"
@@ -3166,10 +4169,6 @@
         "defaultMessage": "Lists",
         "id": "navigation_bar.lists"
       },
-      {
-        "defaultMessage": "Profile directory",
-        "id": "getting_started.directory"
-      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -3177,6 +4176,14 @@
       {
         "defaultMessage": "Follows and followers",
         "id": "navigation_bar.follows_and_followers"
+      },
+      {
+        "defaultMessage": "About",
+        "id": "navigation_bar.about"
+      },
+      {
+        "defaultMessage": "Search",
+        "id": "navigation_bar.search"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/navigation_panel.json"
@@ -3187,29 +4194,9 @@
         "defaultMessage": "Close",
         "id": "lightbox.close"
       },
-      {
-        "defaultMessage": "Additional comments",
-        "id": "report.placeholder"
-      },
-      {
-        "defaultMessage": "Submit",
-        "id": "report.submit"
-      },
       {
         "defaultMessage": "Report {target}",
         "id": "report.target"
-      },
-      {
-        "defaultMessage": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-        "id": "report.hint"
-      },
-      {
-        "defaultMessage": "The account is from another server. Send an anonymized copy of the report there as well?",
-        "id": "report.forward_hint"
-      },
-      {
-        "defaultMessage": "Forward to {target}",
-        "id": "report.forward"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/report_modal.json"
@@ -3217,27 +4204,19 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Home",
-        "id": "tabs_bar.home"
+        "defaultMessage": "Create account",
+        "id": "sign_in_banner.create_account"
       },
       {
-        "defaultMessage": "Notifications",
-        "id": "tabs_bar.notifications"
+        "defaultMessage": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+        "id": "sign_in_banner.text"
       },
       {
-        "defaultMessage": "Local",
-        "id": "tabs_bar.local_timeline"
-      },
-      {
-        "defaultMessage": "Federated",
-        "id": "tabs_bar.federated_timeline"
-      },
-      {
-        "defaultMessage": "Search",
-        "id": "tabs_bar.search"
+        "defaultMessage": "Sign in",
+        "id": "sign_in_banner.sign_in"
       }
     ],
-    "path": "app/javascript/mastodon/features/ui/components/tabs_bar.json"
+    "path": "app/javascript/mastodon/features/ui/components/sign_in_banner.json"
   },
   {
     "descriptors": [
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 10e08cf97..ec78dab5b 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Κανένας πρόσφατος διακομιστής",
+  "about.contact": "Επικοινωνία:",
+  "about.disclaimer": "Το Mastodon είναι ελεύθερο λογισμικό ανοιχτού κώδικα και εμπορικό σήμα της Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Αιτιολογία μη διαθέσιμη",
+  "about.domain_blocks.preamble": "Σε γενικές γραμμές το Mastodon σού επιτρέπει να βλέπεις περιεχόμενο και να αλληλεπιδράς με χρήστες από οποιονδήποτε άλλο server σε ένα διασυνδεδεμένο σύμπαν διακομιστών (fediverse). Ακολουθούν οι εξαιρέσεις που ισχύουν για τον συγκεκριμένο server.",
+  "about.domain_blocks.silenced.explanation": "Γενικά δεν μπορείς να δεις τα προφίλ και το περιεχόμενο αυτού του server, εκτός αν κάνεις μια στοχευμένη αναζήτηση ή επιλέξεις να τον ακολουθήσεις.",
+  "about.domain_blocks.silenced.title": "Η μετάφραση είναι ανοιχτή μόνο σε περιορισμένη ομάδα μεταφραστών, αν θέλετε να συνεισφέρετε, επικοινωνήστε με τους συντηρητές των έργων.",
+  "about.domain_blocks.suspended.explanation": "Κανένα δεδομένο αυτού του server δεν θα τυγχάνει επεξεργασίας, ούτε θα αποθηκεύεται, ούτε θα ανταλλάσεται, οπότε η οποιαδήποτε αλληλεπίδραση ή επικοινωνία με χρήστες αυτού του server είναι αδύνατη.",
+  "about.domain_blocks.suspended.title": "Σε αναστολή",
+  "about.not_available": "Αυτές οι πληροφορίες δεν έχουν καταστεί διαθέσιμες σε αυτόν τον server.",
+  "about.powered_by": "Αποκεντρωμένα μέσα κοινωνικής δικτύωσης που βασίζονται στο {mastodon}",
+  "about.rules": "Κανόνες διακομιστή",
   "account.account_note_header": "Σημείωση",
   "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
   "account.badges.bot": "Μποτ",
@@ -7,64 +19,86 @@
   "account.block_domain": "Αποκλεισμός {domain}",
   "account.blocked": "Αποκλεισμένος/η",
   "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ",
-  "account.cancel_follow_request": "Ακύρωση αιτήματος ακολούθησης",
+  "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης",
   "account.direct": "Άμεσο μήνυμα προς @{name}",
   "account.disable_notifications": "Διακοπή ειδοποιήσεων για τις δημοσιεύσεις του/της @{name}",
   "account.domain_blocked": "Ο τομέας αποκλείστηκε",
   "account.edit_profile": "Επεξεργασία προφίλ",
   "account.enable_notifications": "Έναρξη ειδοποιήσεων για τις δημοσιεύσεις του/της @{name}",
   "account.endorse": "Προβολή στο προφίλ",
+  "account.featured_tags.last_status_at": "Τελευταία δημοσίευση στις {date}",
+  "account.featured_tags.last_status_never": "Καμία Ανάρτηση",
+  "account.featured_tags.title": "προβεβλημένα hashtags του/της {name}",
   "account.follow": "Ακολούθησε",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτό τον χρήστη ακόμα.",
   "account.followers_counter": "{count, plural, one {{counter} Ακόλουθος} other {{counter} Ακόλουθοι}}",
+  "account.following": "Αυτό το πρόγραμμα χρέωσης καλύπτει τα ακόλουθα έργα:",
   "account.following_counter": "{count, plural, other {{counter} Ακολουθεί}}",
   "account.follows.empty": "Αυτός ο χρήστης δεν ακολουθεί κανέναν ακόμα.",
   "account.follows_you": "Σε ακολουθεί",
+  "account.go_to_profile": "Μετάβαση στο προφίλ",
   "account.hide_reblogs": "Απόκρυψη προωθήσεων από @{name}",
-  "account.joined": "Μέλος από τις {date}",
-  "account.last_status": "Τελευταία δραστηριότητα",
+  "account.joined_short": "Εγγραφή στο <x id=\"INTERPOLATION\" equiv-text=\"{{ account.createdAt | date }}\"/> ",
+  "account.languages": "Είστε συνδρομητής",
   "account.link_verified_on": "Η ιδιοκτησία αυτού του συνδέσμου ελέχθηκε την {date}",
   "account.locked_info": "Η κατάσταση απορρήτου αυτού του λογαριασμού είναι κλειδωμένη. Ο ιδιοκτήτης επιβεβαιώνει χειροκίνητα ποιος μπορεί να τον ακολουθήσει.",
   "account.media": "Πολυμέσα",
   "account.mention": "Ανάφερε @{name}",
-  "account.moved_to": "{name} μεταφέρθηκε στο:",
+  "account.moved_to": "Ο/Η {name} έχει υποδείξει ότι ο νέος λογαριασμός του/της είναι τώρα:",
   "account.mute": "Σώπασε @{name}",
   "account.mute_notifications": "Σώπασε τις ειδοποιήσεις από @{name}",
   "account.muted": "Αποσιωπημένος/η",
-  "account.never_active": "Ποτέ",
+  "account.open_original_page": "Ανοικτό",
   "account.posts": "Τουτ",
   "account.posts_with_replies": "Τουτ και απαντήσεις",
   "account.report": "Κατάγγειλε @{name}",
   "account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα παρακολούθησης",
+  "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει",
   "account.share": "Μοίρασμα του προφίλ @{name}",
   "account.show_reblogs": "Εμφάνιση προωθήσεων από @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Τουτ} other {{counter} Τουτ}}",
   "account.unblock": "Ξεμπλόκαρε @{name}",
   "account.unblock_domain": "Αποκάλυψε το {domain}",
+  "account.unblock_short": "Ξεμπλοκάρισμα",
   "account.unendorse": "Άνευ προβολής στο προφίλ",
   "account.unfollow": "Διακοπή παρακολούθησης",
   "account.unmute": "Διακοπή αποσιώπησης @{name}",
   "account.unmute_notifications": "Διακοπή αποσιώπησης ειδοποιήσεων του/της @{name}",
+  "account.unmute_short": "Κατάργηση σίγασης",
   "account_note.placeholder": "Κλικ για να βάλεις σημείωση",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά ημέρα",
+  "admin.dashboard.monthly_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά μήνα",
+  "admin.dashboard.retention.average": "%(display_name)s άφησε %(ratings_total)s βαθμολογία, <br />η μέση βαθμολογία είναι %(rating_average)s",
+  "admin.dashboard.retention.cohort": "Μήνας εγγραφής",
+  "admin.dashboard.retention.cohort_size": "Νέοι χρήστες",
   "alert.rate_limited.message": "Παρακαλούμε δοκίμασε ξανά αφού περάσει η {retry_time, time, medium}.",
   "alert.rate_limited.title": "Περιορισμός συχνότητας",
   "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
   "alert.unexpected.title": "Εεπ!",
   "announcement.announcement": "Ανακοίνωση",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(μη επεξεργασμένο)",
+  "audio.hide": "Απόκρυψη αρχείου ήχου",
   "autosuggest_hashtag.per_week": "{count} ανα εβδομάδα",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις αυτό την επόμενη φορά",
-  "bundle_column_error.body": "Κάτι πήγε στραβά ενώ φορτωνόταν αυτό το στοιχείο.",
+  "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
+  "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζητήσατε. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
+  "bundle_column_error.error.title": "Ωχ όχι!",
+  "bundle_column_error.network.body": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια φόρτωσης αυτής της σελίδας. Αυτό θα μπορούσε να οφείλεται σε ένα προσωρινό πρόβλημα με τη σύνδεσή σας στο διαδίκτυο ή σε αυτόν τον διακομιστή.",
+  "bundle_column_error.network.title": "Σφάλμα δικτύου",
   "bundle_column_error.retry": "Δοκίμασε ξανά",
-  "bundle_column_error.title": "Σφάλμα δικτύου",
+  "bundle_column_error.return": "Μετάβαση πίσω στην αρχική σελίδα",
+  "bundle_column_error.routing.body": "Η επιθυμητή σελίδα δεν βρέθηκε. Είναι σωστό το URL στο πεδίο διευθύνσεων;",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Κλείσιμο",
   "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.",
   "bundle_modal_error.retry": "Δοκίμασε ξανά",
+  "closed_registrations.other_server_instructions": "Καθώς το Mastodon είναι αποκεντρωμένο, μπορείς να δημιουργήσεις λογαριασμό σε άλλο server αλλά να συνεχίσεις να αλληλεπιδράς με τον παρόντα.",
+  "closed_registrations_modal.description": "Η δημιουργία λογαριασμού στο {domain} δεν είναι δυνατή επί του παρόντος, αλλά λάβε υπόψη ότι δεν χρειάζεσαι λογαριασμό ειδικά στο {domain} για να χρησιμοποιήσεις το Mastodon.",
+  "closed_registrations_modal.find_another_server": "&Εύρεση…",
+  "closed_registrations_modal.preamble": "Το Mastodon είναι αποκεντρωμένο, οπότε ανεξάρτητα από το πού θα δημιουργήσεις τον λογαριασμό σου, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με οποιονδήποτε σε αυτόν τον server. Μπορείς ακόμη και να κάνεις self-hosting!",
+  "closed_registrations_modal.title": "Εγγραφή στο Mastodon",
+  "column.about": "Σχετικά με",
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Σελιδοδείκτες",
   "column.community": "Τοπική ροή",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Τοπικά μόνο",
   "community.column_settings.media_only": "Μόνο πολυμέσα",
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
-  "compose_form.direct_message_warning": "Αυτό το τουτ θα σταλεί μόνο στους αναφερόμενους χρήστες.",
+  "compose.language.change": "Αλλαγή γλώσσας",
+  "compose.language.search": "Αναζήτηση γλωσσών...",
   "compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα",
+  "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μην μοιράζεστε ευαίσθητες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
   "compose_form.lock_disclaimer.lock": "κλειδωμένο",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
-  "compose_form.publish": "Τουτ",
+  "compose_form.publish": "Δημοσίευση",
+  "compose_form.publish_form": "Δημοσίευση",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Αποθήκευση αλλαγών",
   "compose_form.sensitive.hide": "Σημείωσε τα πολυμέσα ως ευαίσθητα",
   "compose_form.sensitive.marked": "Το πολυμέσο έχει σημειωθεί ως ευαίσθητο",
   "compose_form.sensitive.unmarked": "Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Αποκλεισμός & Καταγγελία",
   "confirmations.block.confirm": "Απόκλεισε",
   "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
+  "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
+  "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
   "confirmations.delete.confirm": "Διέγραψε",
   "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
   "confirmations.delete_list.confirm": "Διέγραψε",
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Απόρριψη",
+  "confirmations.discard_edit_media.message": "Έχετε μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απορρίψτε τις ούτως ή άλλως;",
   "confirmations.domain_block.confirm": "Απόκρυψη ολόκληρου του τομέα",
   "confirmations.domain_block.message": "Σίγουρα θες να μπλοκάρεις ολόκληρο το {domain}; Συνήθως μερικά εστιασμένα μπλοκ ή αποσιωπήσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον κόμβο σε καμία δημόσια ροή, ούτε στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον κόμβο θα αφαιρεθούν.",
   "confirmations.logout.confirm": "Αποσύνδεση",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
+  "copypaste.copied": "Αντιγράφηκε",
+  "copypaste.copy": "Αντιγραφή",
   "directory.federated": "Από το γνωστό fediverse",
   "directory.local": "Μόνο από {domain}",
   "directory.new_arrivals": "Νέες αφίξεις",
   "directory.recently_active": "Πρόσφατα ενεργοί",
+  "disabled_account_banner.account_settings": "Ρυθμίσεις λογαριασμού",
+  "disabled_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι επί του παρόντος απενεργοποιημένος.",
+  "dismissable_banner.community_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις ατόμων των οποίων οι λογαριασμοί φιλοξενούνται στο {domain}.",
+  "dismissable_banner.dismiss": "Παράβλεψη",
+  "dismissable_banner.explore_links": "Αυτές οι ειδήσεις συζητούνται σε αυτόν και άλλους servers του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
+  "dismissable_banner.explore_statuses": "Αυτές οι αναρτήσεις από αυτόν τον server και άλλους στο αποκεντρωμένο δίκτυο αποκτούν απήχηση σε αυτόν τον server αυτή τη στιγμή.",
+  "dismissable_banner.explore_tags": "Αυτά τα hashtags αποκτούν απήχηση σε αυτόν και άλλους servers του αποκεντρωμένου δικτύου αυτή τη στιγμή.",
+  "dismissable_banner.public_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις ανθρώπων σε αυτόν και άλλους servers του αποκεντρωμένου δικτύου τις οποίες γνωρίζει αυτός ο server.",
   "embed.instructions": "Ενσωματώστε αυτή την κατάσταση στην ιστοσελίδα σας αντιγράφοντας τον παρακάτω κώδικα.",
   "embed.preview": "Ορίστε πως θα φαίνεται:",
   "emoji_button.activity": "Δραστηριότητα",
+  "emoji_button.clear": "Καθαρισμός",
   "emoji_button.custom": "Προσαρμοσμένα",
   "emoji_button.flags": "Σημαίες",
   "emoji_button.food": "Φαγητά & Ποτά",
@@ -165,9 +216,10 @@
   "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
   "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
   "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
+  "empty_column.explore_statuses": "Τίποτα δεν τρεντάρει αυτή τη στιγμή. Ελέγξτε αργότερα!",
   "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.favourites": "Κανείς δεν έχει αγαπήσει αυτό το τουτ ακόμα. Μόλις το κάνει κάποια, θα εμφανιστούν εδώ.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_recommendations": "Φαίνεται ότι δεν υπάρχει καμία πρόταση για σένα. Μπορείς να κάνεις μια αναζήτηση για άτομα που μπορεί να γνωρίζεις ή για hashtags που τρεντάρουν.",
   "empty_column.follow_requests": "Δεν έχεις κανένα αίτημα παρακολούθησης ακόμα. Μόλις λάβεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.",
   "empty_column.home": "Η τοπική σου ροή είναι κενή! Πήγαινε στο {public} ή κάνε αναζήτηση για να ξεκινήσεις και να γνωρίσεις άλλους χρήστες.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Δοκίμασε να τα απενεργοποιήσεις και ανανέωσε τη σελίδα. Αν αυτό δεν βοηθήσει, ίσως να μπορέσεις να χρησιμοποιήσεις το Mastodon μέσω διαφορετικού φυλλομετρητή ή κάποιας εφαρμογής.",
   "errors.unexpected_crash.copy_stacktrace": "Αντιγραφή μηνυμάτων κώδικα στο πρόχειρο",
   "errors.unexpected_crash.report_issue": "Αναφορά προβλήματος",
+  "explore.search_results": "Κανένα αποτέλεσμα.",
+  "explore.suggested_follows": "Για σένα",
+  "explore.title": "Εξερεύνηση",
+  "explore.trending_links": "Νέα",
+  "explore.trending_statuses": "Αναρτήσεις",
+  "explore.trending_tags": "Ετικέτες",
+  "filter_modal.added.context_mismatch_explanation": "Αυτή η κατηγορία φίλτρων δεν ισχύει για το πλαίσιο εντός του οποίου προσπελάσατε αυτή την ανάρτηση. Αν θέλετε να φιλτραριστεί η δημοσίευση και εντός αυτού του πλαισίου, θα πρέπει να τροποποιήσετε το φίλτρο.",
+  "filter_modal.added.context_mismatch_title": "Συνοδευτικά",
+  "filter_modal.added.expired_explanation": "Αυτή η κατηγορία φίλτρων έχει λήξει, πρέπει να αλλάξετε την ημερομηνία λήξης για να ισχύσει.",
+  "filter_modal.added.expired_title": "Φίλτρο...",
+  "filter_modal.added.review_and_configure": "Για να επιθεωρήσετε και να εξειδικεύσετε περαιτέρω αυτή την κατηγορία φίλτρων, πηγαίνετε στο {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Φίλτρο...",
+  "filter_modal.added.settings_link": "Στη σελίδα:",
+  "filter_modal.added.short_explanation": "Αυτή η ανάρτηση έχει προστεθεί στην ακόλουθη κατηγορία φίλτρου: {title}.",
+  "filter_modal.added.title": "Φίλτρο...",
+  "filter_modal.select_filter.context_mismatch": "Εφαρμογή",
+  "filter_modal.select_filter.expired": "Έληξε",
+  "filter_modal.select_filter.prompt_new": "Κατηγορία",
+  "filter_modal.select_filter.search": "Δημιουργία",
+  "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
+  "filter_modal.select_filter.title": "Φίλτρο...",
+  "filter_modal.title.status": "Φίλτρο...",
   "follow_recommendations.done": "Ολοκληρώθηκε",
   "follow_recommendations.heading": "Ακολουθήστε άτομα από τα οποία θα θέλατε να βλέπετε δημοσιεύσεις! Ορίστε μερικές προτάσεις.",
   "follow_recommendations.lead": "Οι αναρτήσεις των ατόμων που ακολουθείτε θα εμφανίζονται με χρονολογική σειρά στη ροή σας. Μη φοβάστε να κάνετε λάθη, καθώς μπορείτε πολύ εύκολα να σταματήσετε να ακολουθείτε άλλα άτομα οποιαδήποτε στιγμή!",
   "follow_request.authorize": "Ενέκρινε",
   "follow_request.reject": "Απέρριψε",
   "follow_requests.unlocked_explanation": "Παρόλο που ο λογαριασμός σου δεν είναι κλειδωμένος, οι διαχειριστές του {domain} θεώρησαν πως ίσως να θέλεις να ελέγξεις χειροκίνητα αυτά τα αιτήματα ακολούθησης.",
+  "footer.about": "Σχετικά με",
+  "footer.directory": "Κατάλογος προφίλ",
+  "footer.get_app": "Αποκτήστε την Εφαρμογή",
+  "footer.invite": "Πρόσκληση ατόμων",
+  "footer.keyboard_shortcuts": "Συντομεύσεις πληκτρολογίου",
+  "footer.privacy_policy": "Πολιτική απορρήτου",
+  "footer.source_code": "Προβολή πηγαίου κώδικα",
   "generic.saved": "Αποθηκεύτηκε",
-  "getting_started.developers": "Ανάπτυξη",
-  "getting_started.directory": "Κατάλογος λογαριασμών",
-  "getting_started.documentation": "Τεκμηρίωση",
   "getting_started.heading": "Αφετηρία",
-  "getting_started.invite": "Προσκάλεσε κόσμο",
-  "getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
-  "getting_started.security": "Ασφάλεια",
-  "getting_started.terms": "Όροι χρήσης",
   "hashtag.column_header.tag_mode.all": "και {additional}",
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
   "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
+  "hashtag.follow": "Παρακολούθηση ετικέτας",
+  "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
   "home.show_announcements": "Εμφάνιση ανακοινώσεων",
+  "interaction_modal.description.favourite": "Με ένα λογαριασμό Mastodon μπορείτε να προτιμήσετε αυτή την ανάρτηση, για να ενημερώσετε τον συγγραφέα ότι την εκτιμάτε και να την αποθηκεύσετε για αργότερα.",
+  "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείτε να ακολουθήσετε τον/την {name} ώστε να λαμβάνετε τις δημοσιεύσεις τους στη δική σας ροή.",
+  "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείτε να ενισχύσετε αυτή την ανάρτηση για να τη μοιραστείτε με τους δικούς σας followers.",
+  "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείτε να απαντήσετε σε αυτή την ανάρτηση.",
+  "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
+  "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
+  "interaction_modal.other_server_instructions": "Αντιγράψτε και επικολλήστε αυτήν τη διεύθυνση URL στο πεδίο αναζήτησης της αγαπημένης σας εφαρμογής Mastodon ή στο web interface του διακομιστή σας Mastodon.",
+  "interaction_modal.preamble": "Δεδομένου ότι το Mastodon είναι αποκεντρωμένο, μπορείτε να χρησιμοποιήσετε τον υπάρχοντα λογαριασμό σας που φιλοξενείται σε άλλο server του Mastodon ή σε συμβατή πλατφόρμα, αν δεν έχετε λογαριασμό σε αυτόν τον server.",
+  "interaction_modal.title.favourite": "Σελίδα συγγραφέα %(name)s",
+  "interaction_modal.title.follow": "Ακολουθήστε!",
+  "interaction_modal.title.reblog": "Σχετικά με %(site_name)s",
+  "interaction_modal.title.reply": "Απάντηση στην ανάρτηση του {name}",
   "intervals.full.days": "{number, plural, one {# μέρα} other {# μέρες}}",
   "intervals.full.hours": "{number, plural, one {# ώρα} other {# ώρες}}",
   "intervals.full.minutes": "{number, plural, one {# λεπτό} other {# λεπτά}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "εμφάνιση της κατάστασης σε μια από τις στήλες",
   "keyboard_shortcuts.compose": "εστίαση στην περιοχή συγγραφής",
   "keyboard_shortcuts.description": "Περιγραφή",
-  "keyboard_shortcuts.direct": "άνοιγμα στήλης απευθείας μηνυμάτων",
+  "keyboard_shortcuts.direct": "άνοιγμα στήλης προσωπικών μηνυμάτων",
   "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "εμφάνιση κατάστασης",
   "keyboard_shortcuts.favourite": "σημείωση ως αγαπημένο",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Ανάπτυξη πλαισίου εμφάνισης εικόνας",
   "lightbox.next": "Επόμενο",
   "lightbox.previous": "Προηγούμενο",
+  "limited_account_hint.action": "Εμφάνιση προφίλ ούτως ή άλλως",
+  "limited_account_hint.title": "Αυτό το προφίλ έχει αποκρυφτεί από τους διαχειριστές του διακομιστή {domain}.",
   "lists.account.add": "Πρόσθεσε στη λίστα",
   "lists.account.remove": "Βγάλε από τη λίστα",
   "lists.delete": "Διαγραφή λίστας",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Εναλλαγή ορατότητας",
   "missing_indicator.label": "Δε βρέθηκε",
   "missing_indicator.sublabel": "Αδύνατη η εύρεση αυτού του πόρου",
+  "moved_to_account_banner.text": "Ο λογαριασμός σας {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφερθήκατε στο {movedToAccount}.",
   "mute_modal.duration": "Διάρκεια",
   "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
   "mute_modal.indefinite": "Αόριστη",
-  "navigation_bar.apps": "Εφαρμογές φορητών συσκευών",
+  "navigation_bar.about": "Σχετικά με",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
   "navigation_bar.community_timeline": "Τοπική ροή",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Κρυμμένοι τομείς",
   "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
+  "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.favourites": "Αγαπημένα",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
   "navigation_bar.follows_and_followers": "Ακολουθείς και σε ακολουθούν",
-  "navigation_bar.info": "Πληροφορίες κόμβου",
-  "navigation_bar.keyboard_shortcuts": "Συντομεύσεις",
   "navigation_bar.lists": "Λίστες",
   "navigation_bar.logout": "Αποσύνδεση",
   "navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Καρφιτσωμένα τουτ",
   "navigation_bar.preferences": "Προτιμήσεις",
   "navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
+  "navigation_bar.search": "Αναζήτηση",
   "navigation_bar.security": "Ασφάλεια",
+  "not_signed_in_indicator.not_signed_in": "Πρέπει να συνδεθείτε για να αποκτήσετε πρόσβαση σε αυτόν τον πόρο.",
+  "notification.admin.report": "{name} ανέφερε {target}",
+  "notification.admin.sign_up": "{name} έχει εγγραφεί",
   "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε παρακολουθεί",
@@ -306,13 +400,16 @@
   "notification.poll": "Τελείωσε μια από τις ψηφοφορίες που συμμετείχες",
   "notification.reblog": "Ο/Η {name} προώθησε την κατάστασή σου",
   "notification.status": "Ο/Η {name} μόλις έγραψε κάτι",
+  "notification.update": "{name} επεξεργάστηκε μια δημοσίευση",
   "notifications.clear": "Καθαρισμός ειδοποιήσεων",
   "notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις όλες τις ειδοποιήσεις σου;",
+  "notifications.column_settings.admin.report": "Νέες αναφορές:",
+  "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
   "notifications.column_settings.favourite": "Αγαπημένα:",
   "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
   "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
-  "notifications.column_settings.filter_bar.show": "Εμφάνιση",
+  "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα παρακολούθησης:",
   "notifications.column_settings.mention": "Αναφορές:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Εμφάνισε σε στήλη",
   "notifications.column_settings.sound": "Ηχητική ειδοποίηση",
   "notifications.column_settings.status": "Νέα τουτ:",
-  "notifications.column_settings.unread_markers.category": "Δείκτες μη αναγνωσμένων ειδοποιήσεων",
+  "notifications.column_settings.unread_notifications.category": "Μη αναγνωσμένες ειδοποιήσεις",
+  "notifications.column_settings.unread_notifications.highlight": "Επισήμανση μη αναγνωσμένων ειδοποιήσεων",
+  "notifications.column_settings.update": "Επεξεργασίες:",
   "notifications.filter.all": "Όλες",
   "notifications.filter.boosts": "Προωθήσεις",
   "notifications.filter.favourites": "Αγαπημένα",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll.vote": "Ψήφισε",
   "poll.voted": "Ψηφίσατε αυτήν την απάντηση",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης",
   "privacy.direct.long": "Δημοσίευση μόνο σε όσους και όσες αναφέρονται",
-  "privacy.direct.short": "Προσωπικά",
+  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
   "privacy.private.long": "Δημοσίευση μόνο στους ακόλουθους",
   "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Δημοσίευσε στις δημόσιες ροές",
+  "privacy.public.long": "Ορατό σε όλους",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Μην δημοσιεύσεις στις δημόσιες ροές",
+  "privacy.unlisted.long": "Ορατό για όλους, αλλά opted-out των χαρακτηριστικών της ανακάλυψης",
   "privacy.unlisted.short": "Μη καταχωρημένα",
+  "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
+  "privacy_policy.title": "Πολιτική Απορρήτου",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",
   "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
   "relative_time.days": "{number}η",
+  "relative_time.full.days": "πριν από {number, plural, one {# μέρα} other {# μέρες}}",
+  "relative_time.full.hours": "πριν από {number, plural, one {# ώρα} other {# ώρες}}",
+  "relative_time.full.just_now": "μόλις τώρα",
+  "relative_time.full.minutes": "πριν από {number, plural, one {# λεπτό} other {# λεπτά}}",
+  "relative_time.full.seconds": "πριν από {number, plural, one {# δευτερόλεπτο} other {# δευτερόλεπτα}}",
   "relative_time.hours": "{number}ω",
   "relative_time.just_now": "τώρα",
   "relative_time.minutes": "{number}λ",
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
   "reply_indicator.cancel": "Άκυρο",
+  "report.block": "Αποκλεισμός",
+  "report.block_explanation": "Δεν θα βλέπετε τις αναρτήσεις τους. Δεν θα μπορούν να δουν τις αναρτήσεις σας ή να σας ακολουθήσουν. Θα μπορούν να δουν ότι έχουν μπλοκαριστεί.",
+  "report.categories.other": "Άλλες",
+  "report.categories.spam": "Ανεπιθύμητα",
+  "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
+  "report.category.subtitle": "Καλύτερο αποτέλεσμα",
+  "report.category.title": "Πείτε μας τι συμβαίνει με αυτό το {type}",
+  "report.category.title_account": "προφίλ",
+  "report.category.title_status": "ανάρτηση",
+  "report.close": "Τέλος",
+  "report.comment.title": "Υπάρχει κάτι άλλο που νομίζετε ότι θα πρέπει να γνωρίζουμε;",
   "report.forward": "Προώθηση προς {target}",
   "report.forward_hint": "Ο λογαριασμός είναι από διαφορετικό διακομιστή. Να σταλεί ανώνυμο αντίγραφο της καταγγελίας κι εκεί;",
-  "report.hint": "Η καταγγελία θα σταλεί στους διαχειριστές του κόμβου σου. Μπορείς να περιγράψεις γιατί καταγγέλεις αυτόν το λογαριασμό παρακάτω:",
+  "report.mute": "Σίγαση",
+  "report.mute_explanation": "Δεν θα βλέπετε τις αναρτήσεις τους. Εκείνοι μπορούν ακόμα να σας ακολουθούν και να βλέπουν τις αναρτήσεις σας χωρίς να γνωρίζουν ότι είναι σε σίγαση.",
+  "report.next": "Επόμενη",
   "report.placeholder": "Επιπλέον σχόλια",
+  "report.reasons.dislike": "Δεν μου αρέσει",
+  "report.reasons.dislike_description": "Η σελίδα είναι ιδιωτική, μόνο εσείς μπορείτε να τη δείτε.",
+  "report.reasons.other": "Είσαι ένας δημιουργός κοινών; Παράγεις ελεύθερη τέχνη, διαδίδεις ελεύθερη γνώση, γράφεις ελεύθερο λογισμικό; Ή κάτι άλλο το οποίο μπορεί να χρηματοδοτηθεί μέσω επαναλαμβανόμενων δωρεών;",
+  "report.reasons.other_description": "Το θέμα δεν ταιριάζει σε άλλες κατηγορίες",
+  "report.reasons.spam": "Αναφορά ως ανεπιθύμητη αλληλογραφία",
+  "report.reasons.spam_description": "Κακόβουλοι σύνδεσμοι, πλαστή αλληλεπίδραση ή επαναλαμβανόμενες απαντήσεις",
+  "report.reasons.violation": "Χωρίς φίλτρα",
+  "report.reasons.violation_description": "Γνωρίζετε ότι παραβιάζει συγκεκριμένους κανόνες",
+  "report.rules.subtitle": "Εφαρμογή σε όλα τα αρχεία",
+  "report.rules.title": "Ποιοι κανόνες παραβιάζονται;",
+  "report.statuses.subtitle": "Εφαρμογή σε όλα τα αρχεία",
+  "report.statuses.title": "Υπάρχουν αναρτήσεις που τεκμηριώνουν αυτή την αναφορά;",
   "report.submit": "Υποβολή",
   "report.target": "Καταγγελία {target}",
+  "report.thanks.take_action": "Αυτές είναι οι επιλογές σας για να ελέγχετε τι βλέπετε στο Mastodon:",
+  "report.thanks.take_action_actionable": "Ενώ το ελέγχουμε, εσείς μπορείτε να αναλάβετε δράση εναντίον του/της @{name}:",
+  "report.thanks.title": "Να μην εμφανίζονται προτεινόμενοι χρήστες",
+  "report.thanks.title_actionable": "Σας ευχαριστούμε για την αναφορά, θα το διερευνήσουμε.",
+  "report.unfollow": "Αφαίρεση ακολούθησης",
+  "report.unfollow_explanation": "Ακολουθείτε αυτό τον λογαριασμό. Για να μη βλέπετε τις αναρτήσεις τους στη δική σας ροή, κάντε unfollow.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} ανάρτηση} other {{count} αναρτήσεις}} επισυνάπτονται",
+  "report_notification.categories.other": "Άλλες",
+  "report_notification.categories.spam": "Ανεπιθύμητα",
+  "report_notification.categories.violation": "Παραβίαση κανόνα",
+  "report_notification.open": "Ανοικτό",
   "search.placeholder": "Αναζήτηση",
+  "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
   "search_popout.search_format": "Προχωρημένη αναζήτηση",
   "search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, έχεις σημειώσει ως αγαπημένες, έχεις προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ετικέτες ταιριάζουν.",
   "search_popout.tips.hashtag": "ετικέτα",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ετικέτες που ταιριάζουν",
   "search_popout.tips.user": "χρήστης",
   "search_results.accounts": "Άνθρωποι",
+  "search_results.all": "Όλα",
   "search_results.hashtags": "Ετικέτες",
+  "search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
   "search_results.statuses": "Τουτ",
   "search_results.statuses_fts_disabled": "Η αναζήτηση τουτ βάσει του περιεχόμενού τους δεν είναι ενεργοποιημένη σε αυτό τον κόμβο.",
+  "search_results.title": "Αναζήτηση για…",
   "search_results.total": "{count, number} {count, plural, zero {αποτελέσματα} one {αποτέλεσμα} other {αποτελέσματα}}",
+  "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
+  "server_banner.active_users": "ενεργοί χρήστες",
+  "server_banner.administered_by": "Διαχειριστής:",
+  "server_banner.introduction": "Το {domain} είναι μέρος του αποκεντρωμένου κοινωνικού δικτύου που τρέχει σε {mastodon}.",
+  "server_banner.learn_more": "Μάθετε περισσότερα",
+  "server_banner.server_stats": "Στατιστικά διακομιστή:",
+  "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
+  "sign_in_banner.sign_in": "Σύνδεση",
+  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ταμπέλες, αγαπημένα, να μοιραστείτε και να απαντήσετε σε δημοσιεύσεις ή να αλληλεπιδράσετε από το λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα λειτουργίας διαμεσολάβησης για τον/την @{name}",
   "status.admin_status": "Άνοιγμα αυτής της δημοσίευσης στη λειτουργία διαμεσολάβησης",
   "status.block": "Αποκλεισμός @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Διαγραφή",
   "status.detailed_status": "Προβολή λεπτομερειών συζήτησης",
   "status.direct": "Προσωπικό μήνυμα προς @{name}",
+  "status.edit": "Επεξεργασία",
+  "status.edited": "Επεξεργάστηκε στις {date}",
+  "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Σημείωσε ως αγαπημένο",
+  "status.filter": "Φίλτρο...",
   "status.filtered": "Φιλτραρισμένα",
+  "status.hide": "Απόκρυψη toot",
+  "status.history.created": "Δημιουργήθηκε από",
+  "status.history.edited": "Τελευταία επεξεργασία από:",
   "status.load_more": "Φόρτωσε περισσότερα",
   "status.media_hidden": "Κρυμμένο πολυμέσο",
   "status.mention": "Ανέφερε τον/την @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Κανείς δεν προώθησε αυτό το τουτ ακόμα. Μόλις το κάνει κάποια, θα εμφανιστούν εδώ.",
   "status.redraft": "Σβήσε & ξαναγράψε",
   "status.remove_bookmark": "Αφαίρεση σελιδοδείκτη",
+  "status.replied_to": "Όνομα:",
   "status.reply": "Απάντησε",
   "status.replyAll": "Απάντησε στην συζήτηση",
   "status.report": "Κατάγγειλε @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
   "status.share": "Μοιράσου",
+  "status.show_filter_reason": "Εμφάνιση παρ'όλα αυτά",
   "status.show_less": "Δείξε λιγότερα",
   "status.show_less_all": "Δείξε λιγότερα για όλα",
   "status.show_more": "Δείξε περισσότερα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",
-  "status.show_thread": "Εμφάνιση νήματος",
+  "status.show_original": "Εμφάνιση αρχικού",
+  "status.translate": "Μετάφραση",
+  "status.translated_from_with": "Μεταφράστηκε από {lang} χρησιμοποιώντας {provider}",
   "status.uncached_media_warning": "Μη διαθέσιμα",
   "status.unmute_conversation": "Διέκοψε την αποσιώπηση της συζήτησης",
   "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Αποθήκευση αλλαγών",
+  "subscribed_languages.target": "Αλλαγή εγγεγραμμένων γλωσσών για {target}",
   "suggestions.dismiss": "Απόρριψη πρότασης",
   "suggestions.header": "Ίσως να ενδιαφέρεσαι για…",
   "tabs_bar.federated_timeline": "Ομοσπονδιακή",
   "tabs_bar.home": "Αρχική",
   "tabs_bar.local_timeline": "Τοπική",
   "tabs_bar.notifications": "Ειδοποιήσεις",
-  "tabs_bar.search": "Αναζήτηση",
   "time_remaining.days": "απομένουν {number, plural, one {# ημέρα} other {# ημέρες}}",
   "time_remaining.hours": "απομένουν {number, plural, one {# ώρα} other {# ώρες}}",
   "time_remaining.minutes": "απομένουν {number, plural, one {# λεπτό} other {# λεπτά}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Ακόλουθοι",
   "timeline_hint.resources.follows": "Ακολουθεί",
   "timeline_hint.resources.statuses": "Παλαιότερα τουτ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο μιλάει} other {{counter} άτομα μιλάνε}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άνθρωποι}} στο παρελθόν {days, plural, one {ημέρα} other {{days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
   "units.short.billion": "{count}Δ",
@@ -455,14 +623,15 @@
   "upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
-  "upload_form.description": "Περιέγραψε για όσους & όσες έχουν προβλήματα όρασης",
+  "upload_form.description": "Περιγραφή για όσους & όσες έχουν προβλήματα όρασης",
+  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
   "upload_form.edit": "Ενημέρωση",
   "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
   "upload_form.undo": "Διαγραφή",
   "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
   "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
   "upload_modal.apply": "Εφαρμογή",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Εφαρμογή…",
   "upload_modal.choose_image": "Επιλογή εικόνας",
   "upload_modal.description_placeholder": "Λύκος μαύρος και ισχνός του πατέρα του καημός",
   "upload_modal.detect_text": "Αναγνώριση κειμένου από την εικόνα",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Προετοιμασία αναγνώρισης κειμένου…",
   "upload_modal.preview_label": "Προεπισκόπηση ({ratio})",
   "upload_progress.label": "Ανεβαίνει...",
+  "upload_progress.processing": "Επεξεργασία…",
   "video.close": "Κλείσε το βίντεο",
   "video.download": "Λήψη αρχείου",
   "video.exit_fullscreen": "Έξοδος από πλήρη οθόνη",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
new file mode 100644
index 000000000..18416d664
--- /dev/null
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the Fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralised social media powered by {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.open_original_page": "Open original page",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralised, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralised, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned posts",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What's on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Remove content warning",
+  "compose_form.spoiler.unmarked": "Add content warning",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this post?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Reply",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralised network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralised network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralised network that this server knows about.",
+  "embed.instructions": "Embed this post on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No posts here!",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Done",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Getting started",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "About",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index a069c1e2f..04b07010c 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media Only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This post will only be sent to the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Account settings",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags for this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "Focus column",
   "keyboard_shortcuts.compose": "Focus compose textarea",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "Open direct messages column",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Move down in the list",
   "keyboard_shortcuts.enter": "Open post",
   "keyboard_shortcuts.favourite": "Favourite post",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned posts",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,8 +400,11 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
@@ -324,6 +421,7 @@
   "notifications.column_settings.status": "New posts:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -352,30 +450,74 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Mentioned people only",
   "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.private.short": "Followers only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Submit",
   "report.target": "Reporting {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns posts you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -383,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Posts",
   "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
@@ -397,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -416,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -445,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older posts",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -455,12 +622,13 @@
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
+  "upload_form.description": "Describe for people who are blind or have low vision",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
   "upload_modal.applying": "Applying…",
@@ -472,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index ac1f195b4..defe52988 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,75 +1,109 @@
 {
+  "about.blocks": "Administritaj serviloj",
+  "about.contact": "Kontakto:",
+  "about.disclaimer": "Mastodon estas libera, malfermitkoda programaro kaj varmarko de la firmao Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
+  "about.domain_blocks.preamble": "Mastodono ebligas vidi la enhavojn de uzantoj el aliaj serviloj en la Fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
+  "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
+  "about.domain_blocks.silenced.title": "Limigita",
+  "about.domain_blocks.suspended.explanation": "Neniuj datumoj el tiu servilo estos prilaboritaj, konservitaj, aŭ interŝanĝitaj, do neeblas interagi aŭ komuniki kun uzantoj de tiu servilo.",
+  "about.domain_blocks.suspended.title": "Suspendita",
+  "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
+  "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
+  "about.rules": "Regularo de la servilo",
   "account.account_note_header": "Noto",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
   "account.badges.group": "Grupo",
   "account.block": "Bloki @{name}",
-  "account.block_domain": "Bloki domajnon {domain}",
+  "account.block_domain": "Bloki la domajnon {domain}",
   "account.blocked": "Blokita",
-  "account.browse_more_on_origin_server": "Rigardi pli al la originala profilo",
-  "account.cancel_follow_request": "Nuligi peton de sekvado",
+  "account.browse_more_on_origin_server": "Foliumi pli ĉe la originala profilo",
+  "account.cancel_follow_request": "Nuligi peton por sekvado",
   "account.direct": "Rekte mesaĝi @{name}",
-  "account.disable_notifications": "Ĉesu sciigi min kiam @{name} mesaĝi",
+  "account.disable_notifications": "Ne plu sciigi min, kiam @{name} mesaĝas",
   "account.domain_blocked": "Domajno blokita",
-  "account.edit_profile": "Redakti profilon",
-  "account.enable_notifications": "Sciigi min kiam @{name} mesaĝi",
-  "account.endorse": "Montri en profilo",
+  "account.edit_profile": "Redakti la profilon",
+  "account.enable_notifications": "Sciigi min, kiam @{name} mesaĝas",
+  "account.endorse": "Rekomendi ĉe via profilo",
+  "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
+  "account.featured_tags.last_status_never": "Neniuj afiŝoj",
+  "account.featured_tags.title": "Rekomendataj kradvortoj de {name}",
   "account.follow": "Sekvi",
   "account.followers": "Sekvantoj",
-  "account.followers.empty": "Ankoraŭ neniu sekvas tiun uzanton.",
+  "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.",
   "account.followers_counter": "{count, plural, one{{counter} Sekvanto} other {{counter} Sekvantoj}}",
+  "account.following": "Sekvatoj",
   "account.following_counter": "{count, plural, one {{counter} Sekvato} other {{counter} Sekvatoj}}",
-  "account.follows.empty": "Tiu uzanto ankoraŭ ne sekvas iun.",
+  "account.follows.empty": "La uzanto ankoraŭ ne sekvas iun ajn.",
   "account.follows_you": "Sekvas vin",
+  "account.go_to_profile": "Iri al profilo",
   "account.hide_reblogs": "Kaŝi diskonigojn de @{name}",
-  "account.joined": "Kuniĝis {date}",
-  "account.last_status": "Laste aktiva",
-  "account.link_verified_on": "La posedanto de tiu ligilo estis kontrolita je {date}",
-  "account.locked_info": "La privateco de tiu konto estas elektita kiel fermita. La posedanto povas mane akcepti tiun, kiu povas sekvi rin.",
-  "account.media": "Amaskomunikiloj",
+  "account.joined_short": "Aliĝis",
+  "account.languages": "Ŝanĝi la abonitajn lingvojn",
+  "account.link_verified_on": "Propreco de tiu ligilo estis konfirmita je {date}",
+  "account.locked_info": "Tiu konto estas privatigita. La posedanto mane akceptas tiun, kiu povas sekvi rin.",
+  "account.media": "Aŭdovidaĵoj",
   "account.mention": "Mencii @{name}",
-  "account.moved_to": "{name} moviĝis al:",
+  "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
-  "account.mute_notifications": "Silentigi sciigojn de @{name}",
+  "account.mute_notifications": "Silentigi la sciigojn de @{name}",
   "account.muted": "Silentigita",
-  "account.never_active": "Neniam",
-  "account.posts": "Mesaĝoj",
-  "account.posts_with_replies": "Kun respondoj",
-  "account.report": "Signali @{name}",
-  "account.requested": "Atendo de aprobo. Alklaku por nuligi peton de sekvado",
+  "account.open_original_page": "Malfermi la originalan paĝon",
+  "account.posts": "Afiŝoj",
+  "account.posts_with_replies": "Mesaĝoj kaj respondoj",
+  "account.report": "Raporti @{name}",
+  "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Mesaĝo} other {{counter} Mesaĝoj}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Afiŝo} other {{counter} Afiŝoj}}",
   "account.unblock": "Malbloki @{name}",
-  "account.unblock_domain": "Malbloki {domain}",
-  "account.unendorse": "Ne montri en profilo",
-  "account.unfollow": "Ne plu sekvi",
-  "account.unmute": "Malsilentigi @{name}",
-  "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
+  "account.unblock_domain": "Malbloki la domajnon {domain}",
+  "account.unblock_short": "Malbloki",
+  "account.unendorse": "Ne plu rekomendi ĉe la profilo",
+  "account.unfollow": "Malaboni",
+  "account.unmute": "Ne plu silentigi @{name}",
+  "account.unmute_notifications": "Ne plu silentigi la sciigojn de @{name}",
+  "account.unmute_short": "Ne plu silentigi",
   "account_note.placeholder": "Alklaku por aldoni noton",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Uzantoretenprocento lau tag post registro",
+  "admin.dashboard.monthly_retention": "Uzantoretenprocento lau monato post registro",
+  "admin.dashboard.retention.average": "Averaĝe",
+  "admin.dashboard.retention.cohort": "Monato de registriĝo",
+  "admin.dashboard.retention.cohort_size": "Novaj uzantoj",
   "alert.rate_limited.message": "Bonvolu reprovi post {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mesaĝkvante limigita",
   "alert.unexpected.message": "Neatendita eraro okazis.",
-  "alert.unexpected.title": "Ups!",
+  "alert.unexpected.title": "Aj!",
   "announcement.announcement": "Anonco",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} semajne",
+  "attachments_list.unprocessed": "(neprilaborita)",
+  "audio.hide": "Kaŝi aŭdion",
+  "autosuggest_hashtag.per_week": "po {count} por semajno",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
-  "bundle_column_error.body": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
-  "bundle_column_error.retry": "Bonvolu reprovi",
-  "bundle_column_error.title": "Reta eraro",
+  "bundle_column_error.copy_stacktrace": "Kopii la raporto de error",
+  "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
+  "bundle_column_error.error.title": "Ho, ve!",
+  "bundle_column_error.network.body": "Okazis eraro dum ŝarĝado de ĉi tiu paĝo. Tion povas kaŭzi portempa problemo pri via retkonektado aŭ pri ĉi tiu servilo.",
+  "bundle_column_error.network.title": "Eraro de reto",
+  "bundle_column_error.retry": "Provu refoje",
+  "bundle_column_error.return": "Reiri hejmen",
+  "bundle_column_error.routing.body": "La celita paĝo ne troveblas. Ĉu vi certas, ke la retadreso (URL) en via retfoliumilo estas ĝusta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fermi",
   "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
-  "bundle_modal_error.retry": "Bonvolu reprovi",
+  "bundle_modal_error.retry": "Provu refoje",
+  "closed_registrations.other_server_instructions": "Ĉar Mastodon estas malcentraliza, vi povas krei konton ĉe alia servilo kaj ankoraŭ komuniki kun ĉi tiu.",
+  "closed_registrations_modal.description": "Krei konton ĉe {domain} aktuale ne eblas, tamen bonvole rimarku, ke vi ne bezonas konton specife ĉe {domain} por uzi Mastodon.",
+  "closed_registrations_modal.find_another_server": "Trovi alian servilon",
+  "closed_registrations_modal.preamble": "Mastodon estas malcentraliza, do sendepende de tio, kie vi kreas vian konton, vi povos sekvi kaj komuniki kun ĉiuj ajn el ĉi tiu servilo. Vi eĉ povas mem starigi propran servilon!",
+  "closed_registrations_modal.title": "Krei konton en Mastodon",
+  "column.about": "Pri",
   "column.blocks": "Blokitaj uzantoj",
   "column.bookmarks": "Legosignoj",
   "column.community": "Loka templinio",
   "column.direct": "Rektaj mesaĝoj",
-  "column.directory": "Trarigardi profilojn",
+  "column.directory": "Foliumi la profilojn",
   "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
   "column.follow_requests": "Petoj de sekvado",
@@ -80,52 +114,58 @@
   "column.pins": "Alpinglitaj mesaĝoj",
   "column.public": "Fratara templinio",
   "column_back_button.label": "Reveni",
-  "column_header.hide_settings": "Kaŝi agordojn",
+  "column_header.hide_settings": "Kaŝi la agordojn",
   "column_header.moveLeft_settings": "Movi kolumnon maldekstren",
   "column_header.moveRight_settings": "Movi kolumnon dekstren",
-  "column_header.pin": "Alpingli",
-  "column_header.show_settings": "Montri agordojn",
-  "column_header.unpin": "Depingli",
-  "column_subheading.settings": "Agordado",
+  "column_header.pin": "Fiksi",
+  "column_header.show_settings": "Montri la agordojn",
+  "column_header.unpin": "Malfiksi",
+  "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
   "community.column_settings.media_only": "Nur aŭdovidaĵoj",
-  "community.column_settings.remote_only": "Nur malproksima",
-  "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.",
+  "community.column_settings.remote_only": "Nur fora",
+  "compose.language.change": "Ŝanĝi lingvon",
+  "compose.language.search": "Serĉi lingvojn...",
   "compose_form.direct_message_warning_learn_more": "Lerni pli",
+  "compose_form.encryption_warning": "La mesaĵoj en Mastodon ne estas tutvoje ĉifritaj. Ne kundividu tiklajn informojn ĉe Mastodon.",
   "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
-  "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.",
+  "compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn nur al la sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
-  "compose_form.placeholder": "Pri kio vi pensas?",
+  "compose_form.placeholder": "Kion vi pensas?",
   "compose_form.poll.add_option": "Aldoni elekteblon",
-  "compose_form.poll.duration": "Balotenketa daŭro",
+  "compose_form.poll.duration": "Daŭro de la balotenketo",
   "compose_form.poll.option_placeholder": "Elekteblo {number}",
   "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
   "compose_form.publish": "Hup",
+  "compose_form.publish_form": "Hup",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Marki la aŭdovidaĵojn kiel tiklaj",
-  "compose_form.sensitive.marked": "Aŭdovidaĵo markita tikla",
-  "compose_form.sensitive.unmarked": "Aŭdovidaĵo ne markita tikla",
-  "compose_form.spoiler.marked": "Teksto kaŝita malantaŭ averto",
-  "compose_form.spoiler.unmarked": "Teksto ne kaŝita",
+  "compose_form.save_changes": "Konservi ŝanĝojn",
+  "compose_form.sensitive.hide": "{count, plural, one {Marki la aŭdovidaĵon kiel tikla} other {Marki la aŭdovidaĵojn kiel tikla}}",
+  "compose_form.sensitive.marked": "{count, plural, one {La aŭdovidaĵo estas markita kiel tikla} other {La aŭdovidaĵoj estas markitaj kiel tikla}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {La aŭdovidaĵo ne estas markita kiel tikla} other {La aŭdovidaĵoj ne estas markitaj kiel tikla}}",
+  "compose_form.spoiler.marked": "Forigi la averton de enhavo",
+  "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
   "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
   "confirmation_modal.cancel": "Nuligi",
-  "confirmations.block.block_and_report": "Bloki kaj signali",
+  "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
   "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
+  "confirmations.cancel_follow_request.confirm": "Eksigi peton",
+  "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
   "confirmations.delete.confirm": "Forigi",
   "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun mesaĝon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Forĵeti",
+  "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la aŭdovidaĵo, ĉu forĵetu ilin malgraŭe?",
   "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
-  "confirmations.logout.confirm": "Elsaluti",
-  "confirmations.logout.message": "Ĉu vi certas ke vi volas elsaluti?",
+  "confirmations.logout.confirm": "Adiaŭi",
+  "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
   "confirmations.mute.confirm": "Silentigi",
-  "confirmations.mute.explanation": "Ĉi-tio kaŝos mesaĝojn el ili kaj mesaĝojn kiuj mencias ilin, sed ili ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
+  "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
   "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun mesaĝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marki legita",
   "conversation.open": "Vidi konversacion",
   "conversation.with": "Kun {names}",
+  "copypaste.copied": "Kopiita",
+  "copypaste.copy": "Kopii",
   "directory.federated": "El konata fediverso",
   "directory.local": "Nur de {domain}",
   "directory.new_arrivals": "Novaj alvenoj",
   "directory.recently_active": "Lastatempe aktiva",
+  "disabled_account_banner.account_settings": "Konto-agordoj",
+  "disabled_account_banner.text": "Via konto {disabledAccount} estas nune malvalidigita.",
+  "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
+  "dismissable_banner.dismiss": "Eksigi",
+  "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj el ĉi tiu servilo, kaj el aliaj, sur la malcentralizita reto.",
+  "dismissable_banner.explore_statuses": "Ĉi tiuj mesaĝoj de ĉi tiu kaj aliaj serviloj en la malcentra reto pli populariĝas en ĉi tiu servilo nun.",
+  "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
+  "dismissable_banner.public_timeline": "Ĉi tiuj estas plej lastaj publika mesaĝoj de personoj ĉe ĉi tiu kaj aliaj serviloj de la malcentra reto kiun ĉi tiu servilo scias.",
   "embed.instructions": "Enkorpigu ĉi tiun mesaĝon en vian retejon per kopio de la suba kodo.",
   "embed.preview": "Ĝi aperos tiel:",
   "emoji_button.activity": "Agadoj",
+  "emoji_button.clear": "Forviŝi",
   "emoji_button.custom": "Propraj",
   "emoji_button.flags": "Flagoj",
   "emoji_button.food": "Manĝi kaj trinki",
@@ -157,7 +208,7 @@
   "emoji_button.search_results": "Serĉaj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "Vojaĝoj kaj lokoj",
-  "empty_column.account_suspended": "Konto haltigita",
+  "empty_column.account_suspended": "Konto suspendita",
   "empty_column.account_timeline": "Neniu mesaĝo ĉi tie!",
   "empty_column.account_unavailable": "Profilo ne disponebla",
   "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
@@ -165,9 +216,10 @@
   "empty_column.community": "La loka templinio estas malplena. Skribu ion por plenigi ĝin!",
   "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
-  "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis mesaĝon. Kiam vi stelumos iun, tiu aperos ĉi tie.",
+  "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
+  "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis mesaĝon. Kiam vi stelumos iun, ĝi aperos ĉi tie.",
   "empty_column.favourites": "Ankoraŭ neniu stelumis tiun mesaĝon. Kiam iu faros tion, tiu aperos ĉi tie.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_recommendations": "Ŝajnas, ke neniuj sugestoj povis esti generitaj por vi. Vi povas provi uzi serĉon por serĉi homojn, kiujn vi eble konas, aŭ esplori tendencajn kradvortojn.",
   "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝi aperos ĉi tie.",
   "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.",
   "empty_column.home": "Via hejma tempolinio estas malplena! Vizitu {public} aŭ uzu la serĉilon por renkonti aliajn uzantojn.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Provu malaktivigi ilin kaj tiam refreŝigi la paĝon. Se tio ne helpas, vi ankoraŭ povus uzi Mastodon per malsama retumilo aŭ operaciuma aplikajo.",
   "errors.unexpected_crash.copy_stacktrace": "Kopii stakspuron en tondujo",
   "errors.unexpected_crash.report_issue": "Raporti problemon",
+  "explore.search_results": "Serĉaj rezultoj",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Esplori",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Ĉi tiu filtrilkategorio ne kongruas la kuntekston de ĉi tiu mesaĝo. Vi devas redakti la filtrilon.",
+  "filter_modal.added.context_mismatch_title": "Ne kongruas la kunteksto!",
+  "filter_modal.added.expired_explanation": "Ĉi tiu filtrilkategorio eksvalidiĝis, vu bezonos ŝanĝi la eksvaliddaton por ĝi.",
+  "filter_modal.added.expired_title": "Eksvalida filtrilo!",
+  "filter_modal.added.review_and_configure": "Por kontroli kaj pli modifi ĉi tiu filtrilkategorio, iru al la {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtrilopcioj",
+  "filter_modal.added.settings_link": "opciopaĝo",
+  "filter_modal.added.short_explanation": "Ĉi tiu mesaĝo aldonitas al la filtrilkategorio: {title}.",
+  "filter_modal.added.title": "Filtrilo aldonita!",
+  "filter_modal.select_filter.context_mismatch": "ne kongruas la kuntekston",
+  "filter_modal.select_filter.expired": "eksvalidiĝinta",
+  "filter_modal.select_filter.prompt_new": "Nova klaso: {name}",
+  "filter_modal.select_filter.search": "Serĉi aŭ krei",
+  "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
+  "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
+  "filter_modal.title.status": "Filtri mesaĝon",
   "follow_recommendations.done": "Farita",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.heading": "Sekvi la personojn kies mesaĝojn vi volas vidi! Jen iom da sugestoj.",
+  "follow_recommendations.lead": "La mesaĝoj de personoj kiujn vi sekvas, aperos laŭ kronologia ordo en via hejma templinio. Ne timu erari, vi povas ĉesi sekvi facile iam ajn!",
   "follow_request.authorize": "Rajtigi",
   "follow_request.reject": "Rifuzi",
   "follow_requests.unlocked_explanation": "Kvankam via konto ne estas ŝlosita, la dungitaro de {domain} opiniis, ke vi eble volus revizii petojn de sekvadon el ĉi tiuj kontoj permane.",
+  "footer.about": "Pri",
+  "footer.directory": "Profilujo",
+  "footer.get_app": "Akiru la Programon",
+  "footer.invite": "Inviti homojn",
+  "footer.keyboard_shortcuts": "Fulmoklavoj",
+  "footer.privacy_policy": "Politiko de privateco",
+  "footer.source_code": "Montri fontkodon",
   "generic.saved": "Konservita",
-  "getting_started.developers": "Programistoj",
-  "getting_started.directory": "Profilujo",
-  "getting_started.documentation": "Dokumentado",
   "getting_started.heading": "Por komenci",
-  "getting_started.invite": "Inviti homojn",
-  "getting_started.open_source_notice": "Mastodon estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitHub je {github}.",
-  "getting_started.security": "Sekureco",
-  "getting_started.terms": "Uzkondiĉoj",
   "hashtag.column_header.tag_mode.all": "kaj {additional}",
   "hashtag.column_header.tag_mode.any": "aŭ {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
@@ -207,25 +281,39 @@
   "hashtag.column_settings.tag_mode.any": "Iu ajn",
   "hashtag.column_settings.tag_mode.none": "Neniu",
   "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno",
+  "hashtag.follow": "Sekvi la kradvorton",
+  "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
-  "home.hide_announcements": "Kaŝi anoncojn",
+  "home.hide_announcements": "Kaŝi la anoncojn",
   "home.show_announcements": "Montri anoncojn",
+  "interaction_modal.description.favourite": "Kun konto de Mastodon, vi povos stelumi ĉi tiun mesaĝon por konservi ĝin kaj por sciigi al la afiŝinto, ke vi estimas ĝin.",
+  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.",
+  "interaction_modal.description.reblog": "Kun konto de Mastodon, vi povas diskonigi ĉi tiun mesaĝon, por ke viaj propraj sekvantoj vidu ĝin.",
+  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
+  "interaction_modal.on_another_server": "En alia servilo",
+  "interaction_modal.on_this_server": "En ĉi tiu servilo",
+  "interaction_modal.other_server_instructions": "Preni ĉi tiun retadreson (URL) kaj meti ĝin en la serĉbreton de via preferata apo aŭ retfoliumilo por Mastodon.",
+  "interaction_modal.preamble": "Ĉar Mastodon estas malcentraliza, vi povas uzi jam ekzistantan konton, gastigatan de alia servilo Mastodon aŭ konforma platformo, se vi ne havas konton ĉe tiu ĉi.",
+  "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
+  "interaction_modal.title.follow": "Sekvi {name}",
+  "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
+  "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
   "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutoj}}",
   "keyboard_shortcuts.back": "reveni",
-  "keyboard_shortcuts.blocked": "malfermi la liston de blokitaj uzantoj",
-  "keyboard_shortcuts.boost": "diskonigi",
+  "keyboard_shortcuts.blocked": "Malfermi la liston de blokitaj uzantoj",
+  "keyboard_shortcuts.boost": "Diskonigi la mesaĝon",
   "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj",
   "keyboard_shortcuts.compose": "enfokusigi la tekstujon",
   "keyboard_shortcuts.description": "Priskribo",
   "keyboard_shortcuts.direct": "malfermi la kolumnon de rektaj mesaĝoj",
   "keyboard_shortcuts.down": "iri suben en la listo",
   "keyboard_shortcuts.enter": "malfermi mesaĝon",
-  "keyboard_shortcuts.favourite": "stelumi",
-  "keyboard_shortcuts.favourites": "malfermi la liston de stelumoj",
+  "keyboard_shortcuts.favourite": "Stelumi",
+  "keyboard_shortcuts.favourites": "Malfermi la liston de la stelumoj",
   "keyboard_shortcuts.federated": "Malfermi la frataran templinion",
   "keyboard_shortcuts.heading": "Klavaraj mallongigoj",
   "keyboard_shortcuts.home": "Malfermi la hejman templinion",
@@ -236,24 +324,26 @@
   "keyboard_shortcuts.muted": "malfermi la liston de silentigitaj uzantoj",
   "keyboard_shortcuts.my_profile": "malfermi vian profilon",
   "keyboard_shortcuts.notifications": "malfermi la kolumnon de sciigoj",
-  "keyboard_shortcuts.open_media": "malfermi aŭdovidaĵon",
+  "keyboard_shortcuts.open_media": "Malfermi la aŭdovidaĵon",
   "keyboard_shortcuts.pinned": "malfermi la liston de alpinglitaj mesaĝoj",
   "keyboard_shortcuts.profile": "malfermi la profilon de la aŭtoro",
   "keyboard_shortcuts.reply": "respondi",
-  "keyboard_shortcuts.requests": "malfermi la liston de petoj de sekvado",
+  "keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
   "keyboard_shortcuts.search": "enfokusigi la serĉilon",
-  "keyboard_shortcuts.spoilers": "montri/kaŝi la kampon de enhava averto",
+  "keyboard_shortcuts.spoilers": "Montri/kaŝi la kampon de averto de enhavo (\"CW\")",
   "keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»",
-  "keyboard_shortcuts.toggle_hidden": "montri/kaŝi tekston malantaŭ enhava averto",
-  "keyboard_shortcuts.toggle_sensitivity": "montri/kaŝi aŭdovidaĵojn",
-  "keyboard_shortcuts.toot": "komenci tute novan mesaĝon",
+  "keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ la averto de enhavo (\"CW\")",
+  "keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi la aŭdovidaĵojn",
+  "keyboard_shortcuts.toot": "Krei novan mesaĝon",
   "keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aŭ la serĉilon",
   "keyboard_shortcuts.up": "iri supren en la listo",
   "lightbox.close": "Fermi",
   "lightbox.compress": "Kunpremi bildan vidkeston",
   "lightbox.expand": "Pligrandigi bildan vidkeston",
-  "lightbox.next": "Sekva",
-  "lightbox.previous": "Antaŭa",
+  "lightbox.next": "Antaŭen",
+  "lightbox.previous": "Malantaŭen",
+  "limited_account_hint.action": "Montru profilon ĉiukaze",
+  "limited_account_hint.title": "La profilo estas kaŝita de la moderigantoj de {domain}.",
   "lists.account.add": "Aldoni al la listo",
   "lists.account.remove": "Forigi de la listo",
   "lists.delete": "Forigi la liston",
@@ -264,18 +354,19 @@
   "lists.replies_policy.followed": "Iu sekvanta uzanto",
   "lists.replies_policy.list": "Membroj de la listo",
   "lists.replies_policy.none": "Neniu",
-  "lists.replies_policy.title": "Montri respondon al:",
+  "lists.replies_policy.title": "Montri respondojn al:",
   "lists.search": "Serĉi inter la homoj, kiujn vi sekvas",
   "lists.subheading": "Viaj listoj",
   "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
   "loading_indicator.label": "Ŝargado…",
-  "media_gallery.toggle_visible": "Baskuligi videblecon",
+  "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "Ĉi tiu elemento ne estis trovita",
+  "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
   "mute_modal.duration": "Daŭro",
   "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
   "mute_modal.indefinite": "Nedifinita",
-  "navigation_bar.apps": "Telefonaj aplikaĵoj",
+  "navigation_bar.about": "Pri",
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.bookmarks": "Legosignoj",
   "navigation_bar.community_timeline": "Loka templinio",
@@ -284,35 +375,41 @@
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
+  "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
   "navigation_bar.follow_requests": "Petoj de sekvado",
   "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
-  "navigation_bar.info": "Pri ĉi tiu servilo",
-  "navigation_bar.keyboard_shortcuts": "Rapidklavoj",
   "navigation_bar.lists": "Listoj",
-  "navigation_bar.logout": "Elsaluti",
+  "navigation_bar.logout": "Adiaŭi",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.personal": "Persone",
   "navigation_bar.pins": "Alpinglitaj mesaĝoj",
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.public_timeline": "Fratara templinio",
+  "navigation_bar.search": "Serĉi",
   "navigation_bar.security": "Sekureco",
+  "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
+  "notification.admin.report": "{name} raportis {target}",
+  "notification.admin.sign_up": "{name} kreis konton",
   "notification.favourite": "{name} stelumis vian mesaĝon",
   "notification.follow": "{name} eksekvis vin",
   "notification.follow_request": "{name} petis sekvi vin",
   "notification.mention": "{name} menciis vin",
-  "notification.own_poll": "Via balotenketo finiĝitis",
+  "notification.own_poll": "Via enketo finiĝis",
   "notification.poll": "Partoprenita balotenketo finiĝis",
   "notification.reblog": "{name} diskonigis vian mesaĝon",
   "notification.status": "{name} ĵus afiŝita",
+  "notification.update": "{name} redaktis afiŝon",
   "notifications.clear": "Forviŝi sciigojn",
   "notifications.clear_confirmation": "Ĉu vi certas, ke vi volas porĉiame forviŝi ĉiujn viajn sciigojn?",
-  "notifications.column_settings.alert": "Retumilaj sciigoj",
+  "notifications.column_settings.admin.report": "Novaj raportoj:",
+  "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
+  "notifications.column_settings.alert": "Sciigoj de la retumilo",
   "notifications.column_settings.favourite": "Stelumoj:",
   "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
   "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
-  "notifications.column_settings.filter_bar.show": "Montri",
+  "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
   "notifications.column_settings.mention": "Mencioj:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
   "notifications.column_settings.status": "Novaj mesaĝoj:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Nelegitaj sciigoj",
+  "notifications.column_settings.unread_notifications.highlight": "Marki nelegitajn sciigojn",
+  "notifications.column_settings.update": "Redaktoj:",
   "notifications.filter.all": "Ĉiuj",
   "notifications.filter.boosts": "Diskonigoj",
   "notifications.filter.favourites": "Stelumoj",
@@ -336,7 +435,7 @@
   "notifications.permission_denied": "Labortablaj sciigoj ne disponeblas pro peto antaŭe rifuzita de retumiloj",
   "notifications.permission_denied_alert": "Labortablaj sciigoj ne povas esti ebligitaj, ĉar retumilpermeso antaŭe estis rifuzita",
   "notifications.permission_required": "Labortablaj sciigoj ne disponeblas ĉar la bezonata permeso ne estis donita.",
-  "notifications_permission_banner.enable": "Ebligi retumilajn sciigojn",
+  "notifications_permission_banner.enable": "Ŝalti retumilajn sciigojn",
   "notifications_permission_banner.how_to_control": "Por ricevi sciigojn kiam Mastodon ne estas malfermita, ebligu labortablajn sciigojn. Vi povas regi precize kiuj specoj de interagoj generas labortablajn sciigojn per la supra butono {icon} post kiam ili estas ebligitaj.",
   "notifications_permission_banner.title": "Neniam preterlasas iun ajn",
   "picture_in_picture.restore": "Remetu ĝin",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll.vote": "Voĉdoni",
   "poll.voted": "Vi elektis por ĉi tiu respondo",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
   "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Rekta",
+  "privacy.direct.short": "Nur menciitaj personoj",
   "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur al sekvantoj",
-  "privacy.public.long": "Videbla al ĉiuj, afiŝita en publikaj templinioj",
+  "privacy.private.short": "Nur abonantoj",
+  "privacy.public.long": "Videbla por ĉiuj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla al ĉiuj, sed ne en publikaj templinioj",
+  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
   "privacy.unlisted.short": "Nelistigita",
+  "privacy_policy.last_updated": "Laste ĝisdatigita sur {date}",
+  "privacy_policy.title": "Politiko de privateco",
   "refresh": "Refreŝigu",
   "regeneration_indicator.label": "Ŝargado…",
-  "regeneration_indicator.sublabel": "Via hejma fluo pretiĝas!",
+  "regeneration_indicator.sublabel": "Via abonfluo estas preparata!",
   "relative_time.days": "{number}t",
+  "relative_time.full.days": "antaŭ {number, plural, one {# tago} other {# tagoj}}",
+  "relative_time.full.hours": "antaŭ {number, plural, one {# horo} other {# horoj}}",
+  "relative_time.full.just_now": "ĵus nun",
+  "relative_time.full.minutes": "antaŭ {number, plural, one {# minuto} other {# minutoj}}",
+  "relative_time.full.seconds": "antaŭ {number, plural, one {# sekundo} other {# sekundoj}}",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "nun",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodiaŭ",
   "reply_indicator.cancel": "Nuligi",
+  "report.block": "Bloki",
+  "report.block_explanation": "Vi ne vidos iliajn afiŝojn. Ili ne povos vidi viajn afiŝojn, nek sekvi vin. Ili ne scios, ke vi blokas ilin.",
+  "report.categories.other": "Aliaj",
+  "report.categories.spam": "Trudmesaĝo",
+  "report.categories.violation": "Enhavo malobservas unu aŭ plurajn servilajn regulojn",
+  "report.category.subtitle": "Elektu la plej bonan kongruon",
+  "report.category.title": "Diru al ni kio okazas pri ĉi tiu {type}",
+  "report.category.title_account": "profilo",
+  "report.category.title_status": "afiŝo",
+  "report.close": "Farita",
+  "report.comment.title": "Ĉu estas io alia kion vi pensas ke ni devas scii?",
   "report.forward": "Plusendi al {target}",
-  "report.forward_hint": "La konto estas en alia servilo. Ĉu sendi sennomigitan kopion de la signalo ankaŭ tien?",
-  "report.hint": "La signalo estos sendita al la kontrolantoj de via servilo. Vi povas doni klarigon pri kial vi signalas ĉi tiun konton sube:",
+  "report.forward_hint": "La konto estas de alia servilo. Ĉu vi volas sendi anoniman kopion de la raporto ankaŭ al tie?",
+  "report.mute": "Silentigi",
+  "report.mute_explanation": "Vi ne vidos iliajn afiŝojn. Ili ankoraŭ povas sekvi vin kaj vidi viajn afiŝojn, kaj ne scios ke ili estas silentigitaj.",
+  "report.next": "Antaŭen",
   "report.placeholder": "Pliaj komentoj",
+  "report.reasons.dislike": "Mi ne ŝatas ĝin",
+  "report.reasons.dislike_description": "Ĝi ne estas io, kiun vi volas vidi",
+  "report.reasons.other": "Io alia",
+  "report.reasons.other_description": "La problemo ne taŭgas en aliaj kategorioj",
+  "report.reasons.spam": "Ĝi estas trudaĵo",
+  "report.reasons.spam_description": "Trompaj ligiloj, falsa/artefarita aktiveco, aŭ ripetaj respondoj",
+  "report.reasons.violation": "Ĝi malobservas la regularon de la servilo",
+  "report.reasons.violation_description": "Vi scias ke ĝi malobeas specifan regulon",
+  "report.rules.subtitle": "Elektu ĉiujn, kiuj validas",
+  "report.rules.title": "Kiuj reguloj estas malobservataj?",
+  "report.statuses.subtitle": "Elektu ĉiujn, kiuj validas",
+  "report.statuses.title": "Ĉu estas afiŝoj, kiuj subtenas tiun raporton?",
   "report.submit": "Sendi",
-  "report.target": "Signali {target}",
+  "report.target": "Raporti pri {target}",
+  "report.thanks.take_action": "Jen viaj ebloj por regi kion vi vidas ĉe Mastodon:",
+  "report.thanks.take_action_actionable": "Dum ni kontrolas la raporton, vi povas agi kontraŭ @{name}:",
+  "report.thanks.title": "Ĉu vi ne volas vidi ĉi tion?",
+  "report.thanks.title_actionable": "Dankon pro raporti, ni esploros ĉi tion.",
+  "report.unfollow": "Malsekvi @{name}",
+  "report.unfollow_explanation": "Vi sekvas ĉi tiun konton. Por ne plu vidi ĝiajn abonfluojn en via hejma templinio, ĉesu sekvi ĝin.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} afiŝo almetita} other {{count} afiŝoj almetitaj}}",
+  "report_notification.categories.other": "Alia",
+  "report_notification.categories.spam": "Trudmesaĝo",
+  "report_notification.categories.violation": "Malobservo de la regulo",
+  "report_notification.open": "Malfermi la raporton",
   "search.placeholder": "Serĉi",
+  "search.search_or_paste": "Serĉu aŭ algluu URL-on",
   "search_popout.search_format": "Detala serĉo",
   "search_popout.tips.full_text": "Simplaj tekstoj montras la mesaĝojn, kiujn vi skribis, stelumis, diskonigis, aŭ en kiuj vi estis menciita, sed ankaŭ kongruajn uzantnomojn, montratajn nomojn, kaj kradvortojn.",
   "search_popout.tips.hashtag": "kradvorto",
@@ -382,11 +525,23 @@
   "search_popout.tips.text": "Simpla teksto montras la kongruajn afiŝitajn nomojn, uzantnomojn kaj kradvortojn",
   "search_popout.tips.user": "uzanto",
   "search_results.accounts": "Homoj",
+  "search_results.all": "Ĉiuj",
   "search_results.hashtags": "Kradvortoj",
+  "search_results.nothing_found": "Povis trovi nenion por ĉi tiuj serĉaj terminoj",
   "search_results.statuses": "Mesaĝoj",
   "search_results.statuses_fts_disabled": "Serĉi mesaĝojn laŭ enhavo ne estas ebligita en ĉi tiu Mastodon-servilo.",
+  "search_results.title": "Serĉ-rezultoj por {q}",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezultoj}}",
-  "status.admin_account": "Malfermi la kontrolan interfacon por @{name}",
+  "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
+  "server_banner.active_users": "aktivaj uzantoj",
+  "server_banner.administered_by": "Administrata de:",
+  "server_banner.introduction": "{domain} apartenas al la malcentra socia retejo povigita de {mastodon}.",
+  "server_banner.learn_more": "Lernu pli",
+  "server_banner.server_stats": "Statistikoj de la servilo:",
+  "sign_in_banner.create_account": "Krei konton",
+  "sign_in_banner.sign_in": "Saluti",
+  "sign_in_banner.text": "Ensalutu por sekvi profilojn aŭ kradvortojn, stelumi, kunhavigi kaj respondi afiŝojn aŭ interagi per via konto de alia servilo.",
+  "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
   "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",
@@ -396,45 +551,58 @@
   "status.delete": "Forigi",
   "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Rekte mesaĝi @{name}",
+  "status.edit": "Redakti",
+  "status.edited": "Redaktita {date}",
+  "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Stelumi",
+  "status.filter": "Filtri ĉi tiun afiŝon",
   "status.filtered": "Filtrita",
+  "status.hide": "Kaŝi mesaĝon",
+  "status.history.created": "{name} kreis {date}",
+  "status.history.edited": "{name} redaktis {date}",
   "status.load_more": "Ŝargi pli",
   "status.media_hidden": "Aŭdovidaĵo kaŝita",
   "status.mention": "Mencii @{name}",
   "status.more": "Pli",
   "status.mute": "Silentigi @{name}",
   "status.mute_conversation": "Silentigi konversacion",
-  "status.open": "Grandigi ĉi tiun mesaĝon",
-  "status.pin": "Alpingli profile",
+  "status.open": "Disvolvi la mesaĝon",
+  "status.pin": "Alpingli al la profilo",
   "status.pinned": "Alpinglita mesaĝo",
   "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
-  "status.reblog_private": "Diskonigi al la originala atentaro",
+  "status.reblog_private": "Diskonigi kun la sama videbleco",
   "status.reblogged_by": "{name} diskonigis",
-  "status.reblogs.empty": "Ankoraŭ neniu diskonigis tiun mesaĝon. Kiam iu faros tion, tiu aperos ĉi tie.",
+  "status.reblogs.empty": "Ankoraŭ neniu diskonigis tiun mesaĝon. Kiam iu faras tion, ri aperos ĉi tie.",
   "status.redraft": "Forigi kaj reskribi",
   "status.remove_bookmark": "Forigi legosignon",
+  "status.replied_to": "Respondis al {name}",
   "status.reply": "Respondi",
   "status.replyAll": "Respondi al la fadeno",
-  "status.report": "Signali @{name}",
+  "status.report": "Raporti @{name}",
   "status.sensitive_warning": "Tikla enhavo",
-  "status.share": "Diskonigi",
-  "status.show_less": "Malgrandigi",
-  "status.show_less_all": "Malgrandigi ĉiujn",
-  "status.show_more": "Grandigi",
-  "status.show_more_all": "Malfoldi ĉiun",
-  "status.show_thread": "Montri la fadenon",
+  "status.share": "Kundividi",
+  "status.show_filter_reason": "Ĉial montri",
+  "status.show_less": "Montri malpli",
+  "status.show_less_all": "Montri malpli ĉiun",
+  "status.show_more": "Montri pli",
+  "status.show_more_all": "Montri pli ĉiun",
+  "status.show_original": "Montru originalon",
+  "status.translate": "Traduki",
+  "status.translated_from_with": "Tradukita el {lang} per {provider}",
   "status.uncached_media_warning": "Nedisponebla",
   "status.unmute_conversation": "Malsilentigi la konversacion",
   "status.unpin": "Depingli de profilo",
+  "subscribed_languages.lead": "Nur afiŝoj en elektitaj lingvoj aperos en viaj hejma kaj lista templinioj post la ŝanĝo. Elektu nenion por ricevi afiŝojn en ĉiuj lingvoj.",
+  "subscribed_languages.save": "Konservi ŝanĝojn",
+  "subscribed_languages.target": "Ŝanĝu abonitajn lingvojn por {target}",
   "suggestions.dismiss": "Forigi la proponon",
   "suggestions.header": "Vi povus interesiĝi pri…",
-  "tabs_bar.federated_timeline": "Fratara templinio",
+  "tabs_bar.federated_timeline": "Fratara",
   "tabs_bar.home": "Hejmo",
   "tabs_bar.local_timeline": "Loka templinio",
   "tabs_bar.notifications": "Sciigoj",
-  "tabs_bar.search": "Serĉi",
   "time_remaining.days": "{number, plural, one {# tago} other {# tagoj}} restas",
   "time_remaining.hours": "{number, plural, one {# horo} other {# horoj}} restas",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutoj}} restas",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Sekvantoj",
   "timeline_hint.resources.follows": "Sekvatoj",
   "timeline_hint.resources.statuses": "Pli malnovaj mesaĝoj",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} parolante",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} dum la pasinta{days, plural, one { tago} other {j {days} tagoj}}",
   "trends.trending_now": "Nunaj furoraĵoj",
   "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",
   "units.short.billion": "{count}Md",
@@ -456,25 +624,27 @@
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
   "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
   "upload_form.description": "Priskribi por misvidantaj homoj",
+  "upload_form.description_missing": "Neniu priskribo aldonita",
   "upload_form.edit": "Redakti",
   "upload_form.thumbnail": "Ŝanĝi etigita bildo",
   "upload_form.undo": "Forigi",
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
   "upload_modal.analyzing_picture": "Bilda analizado…",
   "upload_modal.apply": "Apliki",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Apliki…",
   "upload_modal.choose_image": "Elekti bildon",
   "upload_modal.description_placeholder": "Laŭ Ludoviko Zamenhof bongustas freŝa ĉeĥa manĝaĵo kun spicoj",
   "upload_modal.detect_text": "Detekti tekston de la bildo",
-  "upload_modal.edit_media": "Redakti aŭdovidaĵon",
+  "upload_modal.edit_media": "Redakti la aŭdovidaĵon",
   "upload_modal.hint": "Klaku aŭ trenu la cirklon en la antaŭvidilo por elekti la fokuspunkton kiu ĉiam videblos en ĉiuj etigitaj bildoj.",
   "upload_modal.preparing_ocr": "Preparante OSR…",
   "upload_modal.preview_label": "Antaŭvido ({ratio})",
   "upload_progress.label": "Alŝutado…",
+  "upload_progress.processing": "Traktante…",
   "video.close": "Fermi la videon",
   "video.download": "Elŝuti dosieron",
   "video.exit_fullscreen": "Eksigi plenekrana",
-  "video.expand": "Grandigi la videon",
+  "video.expand": "Pligrandigi la videon",
   "video.fullscreen": "Igi plenekrana",
   "video.hide": "Kaŝi la videon",
   "video.mute": "Silentigi",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 08e9564da..75db62925 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servidores moderados",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon es software libre y de código abierto y una marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Motivo no disponible",
+  "about.domain_blocks.preamble": "Mastodon normalmente te permite ver el contenido e interactuar con los usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busqués explícitamente o sigás alguna cuenta.",
+  "about.domain_blocks.silenced.title": "Limitados",
+  "about.domain_blocks.suspended.explanation": "Ningún dato de este servidor será procesado, almacenado o intercambiado, haciendo imposible cualquier interacción o comunicación con los usuarios de este servidor.",
+  "about.domain_blocks.suspended.title": "Suspendidos",
+  "about.not_available": "Esta información no está disponible en este servidor.",
+  "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
+  "about.rules": "Reglas del servidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Explorar más en el perfil original",
-  "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
+  "account.cancel_follow_request": "Retirar la solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
   "account.domain_blocked": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} envíe mensajes",
   "account.endorse": "Destacar en el perfil",
+  "account.featured_tags.last_status_at": "Último mensaje: {date}",
+  "account.featured_tags.last_status_never": "Sin mensajes",
+  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Todavía este usuario no sigue a nadie.",
   "account.follows_you": "Te sigue",
+  "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar adhesiones de @{name}",
-  "account.joined": "En este servidor desde {date}",
-  "account.last_status": "Última actividad",
+  "account.joined_short": "En este servidor desde",
+  "account.languages": "Cambiar idiomas suscritos",
   "account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
   "account.locked_info": "Esta cuenta es privada. El propietario manualmente revisa quién puede seguirle.",
   "account.media": "Medios",
   "account.mention": "Mencionar a @{name}",
-  "account.moved_to": "{name} se ha mudó a:",
+  "account.moved_to": "{name} indicó que su nueva cuenta ahora es:",
   "account.mute": "Silenciar a @{name}",
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
-  "account.never_active": "Nunca",
+  "account.open_original_page": "Abrir página original",
   "account.posts": "Mensajes",
-  "account.posts_with_replies": "Mensajes y respuestas",
+  "account.posts_with_replies": "Mnsjs y resp. públicas",
   "account.report": "Denunciar a @{name}",
   "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento",
+  "account.requested_follow": "{name} solicitó seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar adhesiones de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Mensaje} other {{counter} Mensajes}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Desbloquear dominio {domain}",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "No destacar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
+  "account.unmute_short": "Dejar de silenciar",
   "account_note.placeholder": "Hacé clic par agregar una nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día, después del registro",
+  "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes, después del registro",
+  "admin.dashboard.retention.average": "Promedio",
+  "admin.dashboard.retention.cohort": "Mes de registro",
+  "admin.dashboard.retention.cohort_size": "Nuevos usuarios",
   "alert.rate_limited.message": "Por favor, reintentá después de las {retry_time, time, medium}.",
   "alert.rate_limited.title": "Acción limitada",
   "alert.unexpected.message": "Ocurrió un error.",
   "alert.unexpected.title": "¡Epa!",
   "announcement.announcement": "Anuncio",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "[sin procesar]",
+  "audio.hide": "Ocultar audio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
-  "bundle_column_error.body": "Algo salió mal al cargar este componente.",
+  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
+  "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
+  "bundle_column_error.error.title": "¡Epa!",
+  "bundle_column_error.network.body": "Se produjo un error al intentar cargar esta página. Esto puede deberse a un problema temporal con tu conexión a internet o a este servidor.",
+  "bundle_column_error.network.title": "Error de red",
   "bundle_column_error.retry": "Intentá de nuevo",
-  "bundle_column_error.title": "Error de red",
+  "bundle_column_error.return": "Volver al inicio",
+  "bundle_column_error.routing.body": "No se pudo encontrar la página solicitada. ¿Estás seguro que la dirección web es correcta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Intentá de nuevo",
+  "closed_registrations.other_server_instructions": "Ya que Mastodon es descentralizado, podés crearte una cuenta en otro servidor y todavía interactuar con éste.",
+  "closed_registrations_modal.description": "Actualmente no es posible la creación de una cuenta en {domain}. pero tené en cuenta que no necesitás una cuenta específica en {domain} para usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Buscar otro servidor",
+  "closed_registrations_modal.preamble": "Mastodon es descentralizado, por lo que no importa dónde creés tu cuenta, podrás seguir e interactuar con cualquier persona en este servidor. ¡Incluso podés montar tu propio servidor!",
+  "closed_registrations_modal.title": "Registrarse en Mastodon",
+  "column.about": "Información",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea temporal local",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Sólo local",
   "community.column_settings.media_only": "Sólo medios",
   "community.column_settings.remote_only": "Sólo remoto",
-  "compose_form.direct_message_warning": "Este mensaje sólo será enviado a los usuarios mencionados.",
+  "compose.language.change": "Cambiar idioma",
+  "compose.language.search": "Buscar idiomas…",
   "compose_form.direct_message_warning_learn_more": "Aprendé más",
+  "compose_form.encryption_warning": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No compartas ninguna información sensible al usar Mastodon.",
   "compose_form.hashtag_warning": "Este mensaje no se mostrará bajo ninguna etiqueta porque no es público. Sólo los mensajes públicos se pueden buscar por etiquetas.",
   "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "privada",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Quitar esta opción",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
-  "compose_form.publish": "Enviar",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Enviar",
   "compose_form.publish_loud": "¡{publish}!",
+  "compose_form.save_changes": "Guardar cambios",
   "compose_form.sensitive.hide": "Marcar medio como sensible",
   "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
   "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
+  "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro que querés eliminar este mensaje?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
   "confirmations.domain_block.confirm": "Bloquear dominio entero",
   "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
   "confirmations.logout.confirm": "Cerrar sesión",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Desde fediverso conocido",
   "directory.local": "Sólo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activos",
+  "disabled_account_banner.account_settings": "Config. de la cuenta",
+  "disabled_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada.",
+  "dismissable_banner.community_timeline": "Estos son los mensajes públicos más recientes de cuentas alojadas en {domain}.",
+  "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Estas noticias están siendo discutidas por personas en este y otros servidores de la red descentralizada ahora mismo.",
+  "dismissable_banner.explore_statuses": "Estos mensajes de este y otros servidores en la red descentralizada están ganando tracción en este servidor ahora mismo.",
+  "dismissable_banner.explore_tags": "Estas etiquetas están ganando tracción entre la gente en este y otros servidores de la red descentralizada ahora mismo.",
+  "dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de personas en este y otros servidores de la red descentralizada que este servidor conoce.",
   "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
   "embed.preview": "Así es cómo se verá:",
   "emoji_button.activity": "Actividad",
+  "emoji_button.clear": "Limpiar",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Banderas",
   "emoji_button.food": "Comida y bebida",
@@ -165,13 +216,14 @@
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
   "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
   "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
+  "empty_column.explore_statuses": "No hay nada en tendencia ahora mismo. ¡Volvé a revisar más tarde!",
   "empty_column.favourited_statuses": "Todavía no tenés mensajes favoritos. Cuando marqués uno como favorito, se mostrará acá.",
   "empty_column.favourites": "Todavía nadie marcó este mensaje como favorito. Cuando alguien lo haga, se mostrará acá.",
   "empty_column.follow_recommendations": "Parece que no se pudieron generar sugerencias para vos. Podés intentar buscar gente que conozcas o explorar las tendencias de las etiquetas.",
   "empty_column.follow_requests": "Todavía no tenés ninguna solicitud de seguimiento. Cuando recibás una, se mostrará acá.",
   "empty_column.hashtag": "Todavía no hay nada con esta etiqueta.",
   "empty_column.home": "¡Tu línea temporal principal está vacía! Seguí a más cuentas para llenarla. {suggestions}",
-  "empty_column.home.suggestions": "Mirá algunas sugerencias",
+  "empty_column.home.suggestions": "Mirá algunas sugerencias.",
   "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
   "empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Intentá deshabilitarlos y recargá la página. Si eso no ayuda, podés usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar stacktrace al portapapeles",
   "errors.unexpected_crash.report_issue": "Informar problema",
+  "explore.search_results": "Resultados de búsqueda",
+  "explore.suggested_follows": "Para vos",
+  "explore.title": "Explorá",
+  "explore.trending_links": "Novedades",
+  "explore.trending_statuses": "Mensajes",
+  "explore.trending_tags": "Etiquetas",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que accediste a este mensaje. Si querés que el mensaje sea filtrado también en este contexto, vas a tener que editar el filtro.",
+  "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro caducó; vas a necesitar cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_title": "¡Filtro caducado!",
+  "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, visitá a la {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Configuración de filtro",
+  "filter_modal.added.settings_link": "página de configuración",
+  "filter_modal.added.short_explanation": "Este mensaje fue agregado a la siguiente categoría de filtros: {title}.",
+  "filter_modal.added.title": "¡Filtro agregado!",
+  "filter_modal.select_filter.context_mismatch": "no aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirado",
+  "filter_modal.select_filter.prompt_new": "Nueva categoría: {name}",
+  "filter_modal.select_filter.search": "Buscar o crear",
+  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
+  "filter_modal.select_filter.title": "Filtrar este mensaje",
+  "filter_modal.title.status": "Filtrar un mensaje",
   "follow_recommendations.done": "Listo",
   "follow_recommendations.heading": "¡Seguí cuentas cuyos mensajes te gustaría ver! Acá tenés algunas sugerencias.",
   "follow_recommendations.lead": "Los mensajes de las cuentas que seguís aparecerán en orden cronológico en la columna \"Inicio\". No tengás miedo de meter la pata, ¡podés dejar de seguir cuentas fácilmente en cualquier momento!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "footer.about": "Información",
+  "footer.directory": "Directorio de perfiles",
+  "footer.get_app": "Conseguí la aplicación",
+  "footer.invite": "Invitá a gente",
+  "footer.keyboard_shortcuts": "Atajos de teclado",
+  "footer.privacy_policy": "Política de privacidad",
+  "footer.source_code": "Ver código fuente",
   "generic.saved": "Guardado",
-  "getting_started.developers": "Desarrolladores",
-  "getting_started.directory": "Directorio de perfiles",
-  "getting_started.documentation": "Documentación",
-  "getting_started.heading": "Introducción",
-  "getting_started.invite": "Invitar gente",
-  "getting_started.open_source_notice": "Mastodon es software libre. Podés contribuir o informar errores en {github}.",
-  "getting_started.security": "Configuración de la cuenta",
-  "getting_started.terms": "Términos del servicio",
+  "getting_started.heading": "Inicio de Mastodon",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estas",
   "hashtag.column_settings.tag_mode.none": "Ninguna de estas",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales para esta columna",
+  "hashtag.follow": "Seguir etiqueta",
+  "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, podés marcar este mensaje como favorito para que el autor sepa que lo apreciás y lo guardás para más adelante.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, podés seguir a {name} para recibir sus mensajes en tu línea temporal principal.",
+  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
+  "interaction_modal.description.reply": "Con una cuenta en Mastodon, podés responder a este mensaje.",
+  "interaction_modal.on_another_server": "En un servidor diferente",
+  "interaction_modal.on_this_server": "En este servidor",
+  "interaction_modal.other_server_instructions": "Copiá y pegá esta dirección web en la barra de búsqueda de tu aplicación favorita de Mastodon, o en la interface web de tu servidor de Mastodon.",
+  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, podés usar tu cuenta existente alojada por otro servidor Mastodon (u otra plataforma compatible, si no tenés una cuenta en ésta).",
+  "interaction_modal.title.favourite": "Marcar como favorito el mensaje de {name}",
+  "interaction_modal.title.follow": "Seguir a {name}",
+  "interaction_modal.title.reblog": "Adherir al mensaje de {name}",
+  "interaction_modal.title.reply": "Responder al mensaje de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "Enfocar columna",
   "keyboard_shortcuts.compose": "Enfocar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "Abrir columna de mensajes directos",
+  "keyboard_shortcuts.direct": "para abrir columna de mensajes directos",
   "keyboard_shortcuts.down": "Bajar en la lista",
   "keyboard_shortcuts.enter": "Abrir mensaje",
   "keyboard_shortcuts.favourite": "Marcar mensaje como favorito",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expandir cuadro de vista de imagen",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Mostrar perfil de todos modos",
+  "limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.",
   "lists.account.add": "Agregar a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Eliminar lista",
@@ -267,15 +357,16 @@
   "lists.replies_policy.title": "Mostrar respuestas a:",
   "lists.search": "Buscar entre la gente que seguís",
   "lists.subheading": "Tus listas",
-  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
+  "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
   "loading_indicator.label": "Cargando...",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "missing_indicator.label": "No se encontró",
   "missing_indicator.sublabel": "No se encontró este recurso",
+  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
   "mute_modal.duration": "Duración",
   "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
   "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.apps": "Aplicaciones móviles",
+  "navigation_bar.about": "Información",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Línea temporal local",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes de seguimiento",
   "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
-  "navigation_bar.info": "Este servidor",
-  "navigation_bar.keyboard_shortcuts": "Atajos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.mutes": "Usuarios silenciados",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Mensajes fijados",
   "navigation_bar.preferences": "Configuración",
   "navigation_bar.public_timeline": "Línea temporal federada",
+  "navigation_bar.search": "Buscar",
   "navigation_bar.security": "Seguridad",
+  "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
+  "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.sign_up": "Se registró {name}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} solicitó seguirte",
@@ -306,13 +400,16 @@
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.status": "{name} acaba de enviar un mensaje",
+  "notification.update": "{name} editó un mensaje",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
+  "notifications.column_settings.admin.report": "Nuevas denuncias:",
+  "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
   "notifications.column_settings.status": "Nuevos mensajes:",
-  "notifications.column_settings.unread_markers.category": "Indicadores de notificaciones no leídas",
+  "notifications.column_settings.unread_notifications.category": "Notificaciones sin leer",
+  "notifications.column_settings.unread_notifications.highlight": "Resaltar notificaciones no leídas",
+  "notifications.column_settings.update": "Ediciones:",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Adhesiones",
   "notifications.filter.favourites": "Favoritos",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaste esta opción",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
   "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Sólo cuentas mencionadas",
   "privacy.private.long": "Visible sólo para los seguidores",
   "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos, mostrado en las líneas temporales públicas",
+  "privacy.public.long": "Visible para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero no en las líneas temporales públicas",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
   "privacy.unlisted.short": "No listado",
+  "privacy_policy.last_updated": "Última actualización: {date}",
+  "privacy_policy.title": "Política de privacidad",
   "refresh": "Refrescar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural,one {hace # día} other {hace # días}}",
+  "relative_time.full.hours": "{number, plural,one {hace # hora} other {hace # horas}}",
+  "relative_time.full.just_now": "recién",
+  "relative_time.full.minutes": "{number, plural,one {hace # minuto} other {hace # minutos}}",
+  "relative_time.full.seconds": "{number, plural,one {hace # segundo} other {hace # segundos}}",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "ahora",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "No verás sus mensajes. No podrán ver tus mensajes ni seguirte. Se van a dar cuentra de que están bloqueados.",
+  "report.categories.other": "Otra",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "El contenido viola una o más reglas del servidor",
+  "report.category.subtitle": "Elegí la mejor coincidencia",
+  "report.category.title": "Contanos lo que pasa con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "mensaje",
+  "report.close": "Listo",
+  "report.comment.title": "¿Hay algo más que creés que deberíamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "La cuenta es de otro servidor. ¿Querés enviar una copia anonimizada del informe también ahí?",
-  "report.hint": "La denuncia se enviará a los moderadores de tu servidor. A continuación, podés proporcionar una explicación de por qué estás denunciando esta cuenta:",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No verás sus mensajes. Todavía pueden seguirte y ver tus mensajes y no sabrán que están silenciados.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
+  "report.reasons.dislike": "No me gusta",
+  "report.reasons.dislike_description": "No es algo que querés ver",
+  "report.reasons.other": "Es otra cosa",
+  "report.reasons.other_description": "El problema no aplica en otras categorías",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Enlaces maliciosos, interacciones falsas o respuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas del servidor",
+  "report.reasons.violation_description": "Sos consciente de que infringe normas específicas",
+  "report.rules.subtitle": "Seleccioná todo lo que corresponda",
+  "report.rules.title": "¿Qué reglas se están violando?",
+  "report.statuses.subtitle": "Seleccioná todo lo que corresponda",
+  "report.statuses.title": "¿Hay algún mensaje que respalde esta denuncia?",
   "report.submit": "Enviar",
   "report.target": "Denunciando a {target}",
+  "report.thanks.take_action": "Acá están tus opciones para controlar lo que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientras revisamos esto, podés tomar medidas contra @{name}:",
+  "report.thanks.title": "¿No querés ver esto?",
+  "report.thanks.title_actionable": "Gracias por tu denuncia, vamos a revisarla.",
+  "report.unfollow": "Dejar de seguir a @{name}",
+  "report.unfollow_explanation": "Estás siguiendo a esta cuenta. Para no ver sus mensajes en tu línea temporal principal, dejá de seguirla.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} mensaje adjunto} other {{count} mensajes adjuntos}}",
+  "report_notification.categories.other": "Otros",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violación de regla",
+  "report_notification.open": "Abrir denuncia",
   "search.placeholder": "Buscar",
+  "search.search_or_paste": "Buscar o pegar dirección web",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Las búsquedas de texto simple devuelven los mensajes que escribiste, los marcados como favoritos, los adheridos o en los que te mencionaron, así como nombres de usuarios, nombres mostrados y etiquetas.",
   "search_popout.tips.hashtag": "etiqueta",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Las búsquedas de texto simple devuelven nombres de usuarios, nombres mostrados y etiquetas que coincidan",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
+  "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
+  "search_results.nothing_found": "No se pudo encontrar nada para estos términos de búsqueda",
   "search_results.statuses": "Mensajes",
   "search_results.statuses_fts_disabled": "No se pueden buscar mensajes por contenido en este servidor de Mastodon.",
+  "search_results.title": "Buscar {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Personas usando este servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
+  "server_banner.active_users": "usuarios activos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} es parte de la red social descentralizada con la tecnología de {mastodon}.",
+  "server_banner.learn_more": "Aprendé más",
+  "server_banner.server_stats": "Estadísticas del servidor:",
+  "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.text": "Iniciá sesión para seguir cuentas o etiquetas, marcar mensajes como favoritos, compartirlos y responderlos o interactuar desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_status": "Abrir este mensaje en la interface de moderación",
   "status.block": "Bloquear a @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mensaje directo para @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
+  "status.filter": "Filtrar este mensaje",
   "status.filtered": "Filtrado",
+  "status.hide": "Ocultar mensaje",
+  "status.history.created": "Creado por {name} el {date}",
+  "status.history.edited": "Editado por {name} el {date}",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Medios ocultos",
   "status.mention": "Mencionar a @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",
+  "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Denunciar a @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Mostrar de todos modos",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
-  "status.show_thread": "Mostrar hilo",
+  "status.show_original": "Mostrar original",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Traducido desde el {lang} vía {provider}",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Dejar de fijar",
+  "subscribed_languages.lead": "Después del cambio, sólo los mensajes en los idiomas seleccionados aparecerán en tu línea temporal Principal y en las líneas de tiempo de lista. No seleccionés ningún idioma para poder recibir mensajes en todos los idiomas.",
+  "subscribed_languages.save": "Guardar cambios",
+  "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te interese…",
   "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Principal",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificaciones",
-  "tabs_bar.search": "Buscar",
   "time_remaining.days": "{number, plural,one {queda # día} other {quedan # días}}",
   "time_remaining.hours": "{number, plural,one {queda # hora} other {quedan # horas}}",
   "time_remaining.minutes": "{number, plural,one {queda # minuto} other {quedan # minutos}}",
@@ -444,25 +612,26 @@
   "timeline_hint.resources.followers": "Tus seguidores",
   "timeline_hint.resources.follows": "Las cuentas que seguís",
   "timeline_hint.resources.statuses": "Mensajes más antiguos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en el/los pasado/s {days, plural, one {día} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",
   "units.short.billion": "{count}MM",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}mil",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} mil",
   "upload_area.title": "Para subir, arrastrá y soltá",
   "upload_button.label": "Agregá imágenes, o un archivo de audio o video",
   "upload_error.limit": "Se excedió el límite de subida de archivos.",
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
   "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
+  "upload_form.description_missing": "No se agregó descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
   "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Elegir imagen",
   "upload_modal.description_placeholder": "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el saxofón detrás del palenque de paja.",
   "upload_modal.detect_text": "Detectar texto de la imagen",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Previsualización ({ratio})",
   "upload_progress.label": "Subiendo...",
+  "upload_progress.processing": "Procesando…",
   "video.close": "Cerrar video",
   "video.download": "Descargar archivo",
   "video.exit_fullscreen": "Salir de la pantalla completa",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index ffd159c02..c26abf3e3 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -1,74 +1,108 @@
 {
+  "about.blocks": "Servidores moderados",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon es software libre de código abierto, y una marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razón no disponible",
+  "about.domain_blocks.preamble": "Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor del fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explicitamente o vayas a el siguiendo alguna cuenta.",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Ningún dato de este servidor será procesado, almacenado o intercambiado, haciendo cualquier interacción o comunicación con los usuarios de este servidor imposible.",
+  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.not_available": "Esta información no está disponible en este servidor.",
+  "about.powered_by": "Red social descentralizada con tecnología de {mastodon}",
+  "about.rules": "Reglas del servidor",
   "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Agregar o eliminar de listas",
+  "account.add_or_remove_from_list": "Agregar o eliminar de las listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
-  "account.block_domain": "Ocultar todo de {domain}",
+  "account.block_domain": "Bloquear dominio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Ver más en el perfil original",
-  "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
-  "account.direct": "Mensaje directo a @{name}",
+  "account.cancel_follow_request": "Retirar solicitud de seguimiento",
+  "account.direct": "Mensaje a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocked": "Dominio oculto",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
-  "account.endorse": "Mostrar en perfil",
+  "account.endorse": "Destacar en mi perfil",
+  "account.featured_tags.last_status_at": "Última publicación el {date}",
+  "account.featured_tags.last_status_never": "Sin publicaciones",
+  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.follows_you": "Te sigue",
+  "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar retoots de @{name}",
-  "account.joined": "Se unió el {date}",
-  "account.last_status": "Última actividad",
+  "account.joined_short": "Se unió",
+  "account.languages": "Cambiar idiomas suscritos",
   "account.link_verified_on": "El proprietario de este link fue comprobado el {date}",
   "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
   "account.media": "Multimedia",
   "account.mention": "Mencionar a @{name}",
-  "account.moved_to": "{name} se ha mudado a:",
+  "account.moved_to": "{name} ha indicado que su nueva cuenta es ahora:",
   "account.mute": "Silenciar a @{name}",
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
-  "account.never_active": "Nunca",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots con respuestas",
-  "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación",
+  "account.open_original_page": "Abrir página original",
+  "account.posts": "Publicaciones",
+  "account.posts_with_replies": "Publicaciones y respuestas",
+  "account.report": "Denunciar a @{name}",
+  "account.requested": "Esperando aprobación. Haga clic para cancelar la solicitud de seguimiento",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "No mostrar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
+  "account.unmute_short": "Desmutear",
   "account_note.placeholder": "Clic para añadir nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después de unirse",
+  "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después de unirse",
+  "admin.dashboard.retention.average": "Promedio",
+  "admin.dashboard.retention.cohort": "Mes de registro",
+  "admin.dashboard.retention.cohort_size": "Nuevos usuarios",
   "alert.rate_limited.message": "Por favor reintente después de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tarifa limitada",
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
   "announcement.announcement": "Anuncio",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(sin procesar)",
+  "audio.hide": "Ocultar audio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
-  "bundle_column_error.body": "Algo salió mal al cargar este componente.",
+  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
+  "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
+  "bundle_column_error.error.title": "¡Oh, no!",
+  "bundle_column_error.network.body": "Se ha producido un error al intentar cargar esta página. Esto puede deberse a un problema temporal con tu conexión a internet o con este servidor.",
+  "bundle_column_error.network.title": "Error de red",
   "bundle_column_error.retry": "Inténtalo de nuevo",
-  "bundle_column_error.title": "Error de red",
+  "bundle_column_error.return": "Volver al inicio",
+  "bundle_column_error.routing.body": "No se pudo encontrar la página solicitada. ¿Estás seguro de que la URL en la barra de direcciones es correcta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Inténtalo de nuevo",
+  "closed_registrations.other_server_instructions": "Como Mastodon es descentralizado, puedes crear una cuenta en otro servidor y seguir interactuando con este.",
+  "closed_registrations_modal.description": "La creación de una cuenta en {domain} no es posible actualmente, pero ten en cuenta que no necesitas una cuenta específicamente en {domain} para usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Buscar otro servidor",
+  "closed_registrations_modal.preamble": "Mastodon es descentralizado, por lo que no importa dónde crees tu cuenta, podrás seguir e interactuar con cualquier persona en este servidor. ¡Incluso puedes alojarlo tú mismo!",
+  "closed_registrations_modal.title": "Registrarse en Mastodon",
+  "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea de tiempo local",
-  "column.direct": "Mensajes directos",
+  "column.direct": "Mensajes",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
   "column.favourites": "Favoritos",
@@ -85,14 +119,16 @@
   "column_header.moveRight_settings": "Mover columna a la derecha",
   "column_header.pin": "Fijar",
   "column_header.show_settings": "Mostrar ajustes",
-  "column_header.unpin": "Dejar de fijar",
+  "column_header.unpin": "Desfijar",
   "column_subheading.settings": "Ajustes",
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
-  "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.",
+  "compose.language.change": "Cambiar idioma",
+  "compose.language.search": "Buscar idiomas...",
   "compose_form.direct_message_warning_learn_more": "Aprender mas",
-  "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
+  "compose_form.encryption_warning": "Las publicaciones en Mastodon no están cifradas de extremo a extremo. No comparta ninguna información sensible en Mastodon.",
+  "compose_form.hashtag_warning": "Esta publicación no se mostrará bajo ningún hashtag porque no está listada. Sólo las publicaciones públicas se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Tootear",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "¡{publish}!",
+  "compose_form.save_changes": "Guardar cambios",
   "compose_form.sensitive.hide": "Marcar multimedia como sensible",
   "compose_form.sensitive.marked": "Material marcado como sensible",
   "compose_form.sensitive.unmarked": "Material no marcado como sensible",
@@ -111,15 +149,17 @@
   "compose_form.spoiler.unmarked": "Texto no oculto",
   "compose_form.spoiler_placeholder": "Advertencia de contenido",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Reportar",
+  "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
+  "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
+  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
   "confirmations.domain_block.confirm": "Ocultar dominio entero",
   "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.logout.confirm": "Cerrar sesión",
@@ -137,19 +177,30 @@
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Desde el fediverso conocido",
   "directory.local": "Sólo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
+  "disabled_account_banner.account_settings": "Ajustes de la cuenta",
+  "disabled_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada.",
+  "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de las personas cuyas cuentas están alojadas en {domain}.",
+  "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Estas noticias están siendo discutidas por personas en este y otros servidores de la red descentralizada en este momento.",
+  "dismissable_banner.explore_statuses": "Estas publicaciones de este y otros servidores en la red descentralizada están ganando popularidad en este servidor en este momento.",
+  "dismissable_banner.explore_tags": "Estas tendencias están ganando popularidad entre la gente en este y otros servidores de la red descentralizada en este momento.",
+  "dismissable_banner.public_timeline": "Estas son las publicaciones públicas más recientes de personas en este y otros servidores de la red descentralizada que este servidor conoce.",
   "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
+  "emoji_button.clear": "Borrar",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida y bebida",
   "emoji_button.label": "Insertar emoji",
   "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "No hay emojis!! ¯\\_(ツ)_/¯",
+  "emoji_button.not_found": "Sin emojis coincidentes",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Gente",
   "emoji_button.recent": "Usados frecuentemente",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ningún toot guardado como marcador. Cuando guardes uno, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
+  "empty_column.direct": "Aún no tienes ningún mensaje. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
+  "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
   "empty_column.favourites": "Nadie ha marcado este toot como preferido. Cuando alguien lo haga, aparecerá aquí.",
   "empty_column.follow_recommendations": "Parece que no se ha podido generar ninguna sugerencia para ti. Puedes probar a buscar a gente que quizá conozcas o explorar los hashtags que están en tendencia.",
@@ -182,36 +234,72 @@
   "error.unexpected_crash.next_steps": "Intenta actualizar la página. Si eso no ayuda, es posible que puedas usar Mastodon a través de otro navegador o aplicación nativa.",
   "error.unexpected_crash.next_steps_addons": "Intenta deshabilitarlos y recarga la página. Si eso no ayuda, podrías usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar el seguimiento de pila en el portapapeles",
-  "errors.unexpected_crash.report_issue": "Informar de un problema/error",
+  "errors.unexpected_crash.report_issue": "Informar problema",
+  "explore.search_results": "Resultados de búsqueda",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Descubrir",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que has accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
+  "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitaras cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_title": "¡Filtro expirado!",
+  "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
+  "filter_modal.added.settings_link": "página de ajustes",
+  "filter_modal.added.short_explanation": "Esta publicación ha sido añadida a la siguiente categoría de filtros: {title}.",
+  "filter_modal.added.title": "¡Filtro añadido!",
+  "filter_modal.select_filter.context_mismatch": "no se aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirado",
+  "filter_modal.select_filter.prompt_new": "Nueva categoría: {name}",
+  "filter_modal.select_filter.search": "Buscar o crear",
+  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
+  "filter_modal.select_filter.title": "Filtrar esta publicación",
+  "filter_modal.title.status": "Filtrar una publicación",
   "follow_recommendations.done": "Hecho",
   "follow_recommendations.heading": "¡Sigue a gente que publique cosas que te gusten! Aquí tienes algunas sugerencias.",
   "follow_recommendations.lead": "Las publicaciones de la gente a la que sigas aparecerán ordenadas cronológicamente en Inicio. No tengas miedo de cometer errores, ¡puedes dejarles de seguir en cualquier momento con la misma facilidad!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "footer.about": "Acerca de",
+  "footer.directory": "Directorio de perfiles",
+  "footer.get_app": "Obtener la aplicación",
+  "footer.invite": "Invitar personas",
+  "footer.keyboard_shortcuts": "Atajos de teclado",
+  "footer.privacy_policy": "Política de privacidad",
+  "footer.source_code": "Ver código fuente",
   "generic.saved": "Guardado",
-  "getting_started.developers": "Desarrolladores",
-  "getting_started.directory": "Directorio de perfil",
-  "getting_started.documentation": "Documentación",
   "getting_started.heading": "Primeros pasos",
-  "getting_started.invite": "Invitar usuarios",
-  "getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.",
-  "getting_started.security": "Seguridad",
-  "getting_started.terms": "Términos de servicio",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "No se encontraron sugerencias",
-  "hashtag.column_settings.select.placeholder": "Introduzca hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Cualquiera de estos",
+  "hashtag.column_settings.select.placeholder": "Introducir etiquetas…",
+  "hashtag.column_settings.tag_mode.all": "Todos estos",
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Incluye etiquetas adicionales para esta columna",
+  "hashtag.follow": "Seguir etiqueta",
+  "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta y guardarla para más adelante.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
+  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
+  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.on_another_server": "En un servidor diferente",
+  "interaction_modal.on_this_server": "En este servidor",
+  "interaction_modal.other_server_instructions": "Copia y pega esta URL en la barra de búsqueda de tu aplicación Mastodon favorita o en la interfaz web de tu servidor Mastodon.",
+  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.",
+  "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
+  "interaction_modal.title.follow": "Seguir a {name}",
+  "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
+  "interaction_modal.title.reply": "Responder la publicación de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
+  "keyboard_shortcuts.direct": "abrir la columna de mensajes",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expandir cuadro de visualización de imagen",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Mostrar perfil de todos modos",
+  "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "missing_indicator.label": "No encontrado",
   "missing_indicator.sublabel": "No se encontró este recurso",
+  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.duration": "Duración",
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
   "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.apps": "Aplicaciones móviles",
+  "navigation_bar.about": "Acerca de",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Historia local",
   "navigation_bar.compose": "Escribir un nuevo toot",
-  "navigation_bar.direct": "Mensajes directos",
+  "navigation_bar.direct": "Mensajes",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
-  "navigation_bar.info": "Información adicional",
-  "navigation_bar.keyboard_shortcuts": "Atajos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.mutes": "Usuarios silenciados",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Toots fijados",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Historia federada",
+  "navigation_bar.search": "Buscar",
   "navigation_bar.security": "Seguridad",
+  "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
+  "notification.admin.report": "{name} denunció a {target}",
+  "notification.admin.sign_up": "{name} se unio",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
@@ -306,13 +400,16 @@
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
   "notification.status": "{name} acaba de publicar",
+  "notification.update": "{name} editó una publicación",
   "notifications.clear": "Limpiar notificaciones",
-  "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
+  "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
+  "notifications.column_settings.admin.report": "Nuevas denuncias:",
+  "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -321,8 +418,10 @@
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
-  "notifications.column_settings.status": "Nuevos toots:",
-  "notifications.column_settings.unread_markers.category": "Indicadores de notificaciones no leídas",
+  "notifications.column_settings.status": "Nuevas publicaciones:",
+  "notifications.column_settings.unread_notifications.category": "Notificaciones sin leer",
+  "notifications.column_settings.unread_notifications.highlight": "Destacar notificaciones no leídas",
+  "notifications.column_settings.update": "Ediciones:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
@@ -346,46 +445,102 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Has votado a favor de esta respuesta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votes}}",
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Solo personas mencionadas",
   "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Privado",
-  "privacy.public.long": "Mostrar en la historia federada",
+  "privacy.private.short": "Solo seguidores",
+  "privacy.public.long": "Visible para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "No mostrar en la historia federada",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
   "privacy.unlisted.short": "No listado",
+  "privacy_policy.last_updated": "Actualizado por última vez {date}",
+  "privacy_policy.title": "Política de Privacidad",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
   "relative_time.days": "{number} d",
+  "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
+  "relative_time.full.just_now": "justo ahora",
+  "relative_time.full.minutes": "Hace {number, plural, one {# minute} other {# minutos}}",
+  "relative_time.full.seconds": "Hace {number, plural, one {# second} other {# segundos}}",
   "relative_time.hours": "{number} h",
   "relative_time.just_now": "ahora",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
+  "report.categories.other": "Otro",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "El contenido viola una o más reglas del servidor",
+  "report.category.subtitle": "Selecciona la mejor coincidencia",
+  "report.category.title": "Cuéntanos lo que sucede con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicación",
+  "report.close": "Realizado",
+  "report.comment.title": "¿Hay algo más que usted cree que debamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
-  "report.hint": "El informe se enviará a los moderadores de tu instancia. Puedes proporcionar una explicación de por qué informas sobre esta cuenta a continuación:",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No veras sus publiaciones. Todavía pueden seguirte y ver tus publicaciones y no sabrán que están silenciados.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
-  "report.submit": "Publicar",
-  "report.target": "Reportando",
+  "report.reasons.dislike": "No me gusta",
+  "report.reasons.dislike_description": "No es algo que quieres ver",
+  "report.reasons.other": "Es algo más",
+  "report.reasons.other_description": "El problema no encaja en otras categorías",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Enlaces maliciosos, interacciones falsas, o respuestas repetitivas",
+  "report.reasons.violation": "Infringe las reglas del servidor",
+  "report.reasons.violation_description": "Eres consciente de que infringe normas específicas",
+  "report.rules.subtitle": "Selecciona todas las que apliquen",
+  "report.rules.title": "¿Cuáles reglas se están infringiendo?",
+  "report.statuses.subtitle": "Seleccione todas las que apliquen",
+  "report.statuses.title": "¿Hay alguna publicación que respalde esta denuncia?",
+  "report.submit": "Enviar",
+  "report.target": "Denunciando a {target}",
+  "report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
+  "report.thanks.title": "¿No quieres ver esto?",
+  "report.thanks.title_actionable": "Gracias por denunciar, revisaremos esto.",
+  "report.unfollow": "Dejar de seguir @{name}",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu inicio, deja de seguirla.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
+  "report_notification.categories.other": "Otro",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.open": "Abrir denuncia",
   "search.placeholder": "Buscar",
+  "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Búsquedas de texto recuperan posts que has escrito, marcado como favoritos, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag",
+  "search_popout.tips.status": "publicación",
+  "search_popout.tips.text": "El texto simple devuelve nombres, usuarios y etiquetas coincidentes",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
+  "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Buscar toots por su contenido no está disponible en este servidor de Mastodon.",
+  "search_results.nothing_found": "No se pudo encontrar nada para estos términos de búsqueda",
+  "search_results.statuses": "Publicaciones",
+  "search_results.statuses_fts_disabled": "La búsqueda de publicaciones por su contenido no está disponible en este servidor de Mastodon.",
+  "search_results.title": "Buscar {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Personas utilizando este servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
+  "server_banner.active_users": "usuarios activos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} es parte de la red social descentralizada gestionada por {mastodon}.",
+  "server_banner.learn_more": "Saber más",
+  "server_banner.server_stats": "Estadísticas del servidor:",
+  "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, marcar favorito, compartir y responder a publicaciones, o interactua desde tu cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",
   "status.block": "Bloquear a @{name}",
@@ -395,10 +550,17 @@
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
-  "status.direct": "Mensaje directo a @{name}",
+  "status.direct": "Enviar mensaje a @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
+  "status.hide": "Ocultar toot",
+  "status.history.created": "{name} creó {date}",
+  "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Mostrar de todos modos",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
-  "status.show_thread": "Mostrar hilo",
+  "status.show_original": "Mostrar original",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Traducido del {lang} usando {provider}",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Dejar de fijar",
+  "subscribed_languages.lead": "Solo las publicaciones en los idiomas seleccionados aparecerán en tu inicio y enlistará las líneas de tiempo después del cambio. Selecciona ninguno para recibir publicaciones en todos los idiomas.",
+  "subscribed_languages.save": "Guardar cambios",
+  "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te interese…",
   "tabs_bar.federated_timeline": "Federado",
   "tabs_bar.home": "Inicio",
   "tabs_bar.local_timeline": "Reciente",
   "tabs_bar.notifications": "Notificaciones",
-  "tabs_bar.search": "Buscar",
   "time_remaining.days": "{number, plural, one {# día restante} other {# días restantes}}",
   "time_remaining.hours": "{number, plural, one {# hora restante} other {# horas restantes}}",
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
   "timeline_hint.resources.statuses": "Toots más antiguos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
   "units.short.billion": "{count} MM",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Subida de archivos no permitida con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para los usuarios con dificultad visual",
+  "upload_form.description_missing": "Sin descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
   "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Elegir imagen",
   "upload_modal.description_placeholder": "Un rápido zorro marrón salta sobre el perro perezoso",
   "upload_modal.detect_text": "Detectar texto de la imagen",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Subiendo…",
+  "upload_progress.processing": "Procesando…",
   "video.close": "Cerrar video",
   "video.download": "Descargar archivo",
   "video.exit_fullscreen": "Salir de pantalla completa",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 058d6f977..8e0f5295c 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,76 +1,110 @@
 {
+  "about.blocks": "Servidores moderados",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon es software libre, de código abierto, y una marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razón no disponible",
+  "about.domain_blocks.preamble": "Mastodon normalmente te permite ver el contenido e interactuar con los usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explícitamente o sigas alguna cuenta.",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Ningún dato de este servidor será procesado, almacenado o intercambiado, haciendo imposible cualquier interacción o comunicación con los usuarios de este servidor.",
+  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.not_available": "Esta información no está disponible en este servidor.",
+  "about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
+  "about.rules": "Reglas del servidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agregar o eliminar de listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
-  "account.block_domain": "Ocultar todo de {domain}",
+  "account.block_domain": "Bloquear dominio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Ver más en el perfil original",
-  "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
+  "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
-  "account.domain_blocked": "Dominio oculto",
+  "account.domain_blocked": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
-  "account.endorse": "Mostrar en perfil",
+  "account.endorse": "Destacar en el perfil",
+  "account.featured_tags.last_status_at": "Última publicación el {date}",
+  "account.featured_tags.last_status_never": "Sin publicaciones",
+  "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
-  "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
-  "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
+  "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
+  "account.following": "Siguiendo",
+  "account.following_counter": "{count, plural, other {Siguiendo a {counter}}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
   "account.follows_you": "Te sigue",
-  "account.hide_reblogs": "Ocultar retoots de @{name}",
-  "account.joined": "Se unió el {date}",
-  "account.last_status": "Última actividad",
-  "account.link_verified_on": "El proprietario de este link fue comprobado el {date}",
-  "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
+  "account.go_to_profile": "Ir al perfil",
+  "account.hide_reblogs": "Ocultar impulsos de @{name}",
+  "account.joined_short": "Se unió",
+  "account.languages": "Cambiar idiomas suscritos",
+  "account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
+  "account.locked_info": "El estado de privacidad de esta cuenta está configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
   "account.media": "Multimedia",
   "account.mention": "Mencionar a @{name}",
-  "account.moved_to": "{name} se ha mudado a:",
+  "account.moved_to": "{name} ha indicado que su nueva cuenta es ahora:",
   "account.mute": "Silenciar a @{name}",
   "account.mute_notifications": "Silenciar notificaciones de @{name}",
   "account.muted": "Silenciado",
-  "account.never_active": "Nunca",
+  "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación",
+  "account.requested": "Esperando aprobación. Clica para cancelar la solicitud de seguimiento",
+  "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
-  "account.show_reblogs": "Mostrar retoots de @{name}",
+  "account.show_reblogs": "Mostrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicaciones}}",
   "account.unblock": "Desbloquear a @{name}",
-  "account.unblock_domain": "Mostrar a {domain}",
-  "account.unendorse": "No mostrar en el perfil",
+  "account.unblock_domain": "Mostrar {domain}",
+  "account.unblock_short": "Desbloquear",
+  "account.unendorse": "No destacar en el perfil",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
+  "account.unmute_short": "Desilenciar",
   "account_note.placeholder": "Clic para añadir nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Por favor reintente después de {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tarifa limitada",
+  "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después del registro",
+  "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después del registro",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mes de registro",
+  "admin.dashboard.retention.cohort_size": "Nuevos usuarios",
+  "alert.rate_limited.message": "Por favor, vuelve a intentarlo después de la(s) {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Tráfico limitado",
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
-  "announcement.announcement": "Anuncio",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "announcement.announcement": "Comunicación",
+  "attachments_list.unprocessed": "(sin procesar)",
+  "audio.hide": "Ocultar audio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
-  "bundle_column_error.body": "Algo salió mal al cargar este componente.",
+  "bundle_column_error.copy_stacktrace": "Copiar informe de error",
+  "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
+  "bundle_column_error.error.title": "¡Oh, no!",
+  "bundle_column_error.network.body": "Se ha producido un error al intentar cargar esta página. Esto puede deberse a un problema temporal con tu conexión a internet o a este servidor.",
+  "bundle_column_error.network.title": "Error de red",
   "bundle_column_error.retry": "Inténtalo de nuevo",
-  "bundle_column_error.title": "Error de red",
+  "bundle_column_error.return": "Volver al inicio",
+  "bundle_column_error.routing.body": "No se pudo encontrar la página solicitada. ¿Estás seguro de que la URL en la barra de direcciones es correcta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Inténtalo de nuevo",
+  "closed_registrations.other_server_instructions": "Como Mastodon es descentralizado, puedes crear una cuenta en otro servidor y seguir interactuando con este.",
+  "closed_registrations_modal.description": "La creación de una cuenta en {domain} no es posible actualmente, pero ten en cuenta que no necesitas una cuenta específicamente en {domain} para usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Buscar otro servidor",
+  "closed_registrations_modal.preamble": "Mastodon es descentralizado, por lo que no importa dónde crees tu cuenta, podrás seguir e interactuar con cualquier persona en este servidor. ¡Incluso puedes alojarlo tú mismo!",
+  "closed_registrations_modal.title": "Registrarse en Mastodon",
+  "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.community": "Línea de tiempo local",
+  "column.community": "Cronología local",
   "column.direct": "Mensajes directos",
   "column.directory": "Buscar perfiles",
-  "column.domain_blocks": "Dominios ocultados",
+  "column.domain_blocks": "Dominios bloqueados",
   "column.favourites": "Favoritos",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
@@ -78,7 +112,7 @@
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
   "column.pins": "Publicaciones fijadas",
-  "column.public": "Línea de tiempo federada",
+  "column.public": "Cronología federada",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Ocultar configuración",
   "column_header.moveLeft_settings": "Mover columna a la izquierda",
@@ -88,10 +122,12 @@
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.settings": "Ajustes",
   "community.column_settings.local_only": "Solo local",
-  "community.column_settings.media_only": "Solo media",
+  "community.column_settings.media_only": "Solo multimedia",
   "community.column_settings.remote_only": "Solo remoto",
-  "compose_form.direct_message_warning": "Esta nueva publicación solo será enviada a los usuarios mencionados.",
+  "compose.language.change": "Cambiar idioma",
+  "compose.language.search": "Buscar idiomas...",
   "compose_form.direct_message_warning_learn_more": "Aprender más",
+  "compose_form.encryption_warning": "Las publicaciones en Mastodon no están cifradas de extremo a extremo. No comparta ninguna información sensible en Mastodon.",
   "compose_form.hashtag_warning": "Esta publicación no se mostrará bajo ningún hashtag porque no está listada. Sólo las publicaciones públicas se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -102,24 +138,28 @@
   "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Tootear",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Guardar cambios",
   "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
   "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
   "compose_form.spoiler.marked": "Texto oculto tras la advertencia",
-  "compose_form.spoiler.unmarked": "Texto no oculto",
-  "compose_form.spoiler_placeholder": "Advertencia de contenido",
+  "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
+  "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
+  "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "¿Estás seguro de que quieres borrar esta publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
   "confirmations.domain_block.confirm": "Ocultar dominio entero",
   "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.logout.confirm": "Cerrar sesión",
@@ -130,20 +170,31 @@
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de que quieres eliminar esta publicación y convertirla en borrador? Perderás todas las respuestas, retoots y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanas.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
+  "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
   "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Desde el fediverso conocido",
   "directory.local": "Sólo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
+  "disabled_account_banner.account_settings": "Ajustes de la cuenta",
+  "disabled_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada.",
+  "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de personas cuyas cuentas están alojadas en {domain}.",
+  "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Estas noticias están siendo discutidas por personas en este y otros servidores de la red descentralizada en este momento.",
+  "dismissable_banner.explore_statuses": "Estas publicaciones de este y otros servidores en la red descentralizada están ganando popularidad en este servidor en este momento.",
+  "dismissable_banner.explore_tags": "Estas tendencias están ganando popularidad entre la gente en este y otros servidores de la red descentralizada en este momento.",
+  "dismissable_banner.public_timeline": "Estas son las publicaciones públicas más recientes de personas en este y otros servidores de la red descentralizada que este servidor conoce.",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
+  "emoji_button.clear": "Limpiar",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida y bebida",
@@ -165,6 +216,7 @@
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
+  "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes publicaciones favoritas. Cuando marques una como favorita, aparecerá aquí.",
   "empty_column.favourites": "Nadie ha marcado esta publicación como favorita. Cuando alguien lo haga, aparecerá aquí.",
   "empty_column.follow_recommendations": "Parece que no se ha podido generar ninguna sugerencia para ti. Puedes probar a buscar a gente que quizá conozcas o explorar los hashtags que están en tendencia.",
@@ -183,35 +235,71 @@
   "error.unexpected_crash.next_steps_addons": "Intenta deshabilitarlos y recarga la página. Si eso no ayuda, podrías usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar el seguimiento de pila en el portapapeles",
   "errors.unexpected_crash.report_issue": "Informar de un problema/error",
+  "explore.search_results": "Resultados de búsqueda",
+  "explore.suggested_follows": "Para ti",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Noticias",
+  "explore.trending_statuses": "Publicaciones",
+  "explore.trending_tags": "Etiquetas",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
+  "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_title": "¡Filtro caducado!",
+  "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
+  "filter_modal.added.settings_link": "página de ajustes",
+  "filter_modal.added.short_explanation": "Esta publicación ha sido añadida a la siguiente categoría de filtros: {title}.",
+  "filter_modal.added.title": "¡Filtro añadido!",
+  "filter_modal.select_filter.context_mismatch": "no se aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirado",
+  "filter_modal.select_filter.prompt_new": "Nueva categoría: {name}",
+  "filter_modal.select_filter.search": "Buscar o crear",
+  "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
+  "filter_modal.select_filter.title": "Filtrar esta publicación",
+  "filter_modal.title.status": "Filtrar una publicación",
   "follow_recommendations.done": "Hecho",
   "follow_recommendations.heading": "¡Sigue a gente que publique cosas que te gusten! Aquí tienes algunas sugerencias.",
   "follow_recommendations.lead": "Las publicaciones de la gente a la que sigas aparecerán ordenadas cronológicamente en Inicio. No tengas miedo de cometer errores, ¡puedes dejarles de seguir en cualquier momento con la misma facilidad!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "footer.about": "Acerca de",
+  "footer.directory": "Directorio de perfiles",
+  "footer.get_app": "Obtener la aplicación",
+  "footer.invite": "Invitar gente",
+  "footer.keyboard_shortcuts": "Atajos de teclado",
+  "footer.privacy_policy": "Política de privacidad",
+  "footer.source_code": "Ver código fuente",
   "generic.saved": "Guardado",
-  "getting_started.developers": "Desarrolladores",
-  "getting_started.directory": "Directorio de perfil",
-  "getting_started.documentation": "Documentación",
   "getting_started.heading": "Primeros pasos",
-  "getting_started.invite": "Invitar usuarios",
-  "getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.",
-  "getting_started.security": "Seguridad",
-  "getting_started.terms": "Términos de servicio",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "No se encontraron sugerencias",
   "hashtag.column_settings.select.placeholder": "Introduzca hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Cualquiera de estos",
+  "hashtag.column_settings.tag_mode.all": "Todos estos",
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales en esta columna",
+  "hashtag.follow": "Seguir etiqueta",
+  "hashtag.unfollow": "Dejar de seguir etiqueta",
   "home.column_settings.basic": "Básico",
-  "home.column_settings.show_reblogs": "Mostrar retoots",
+  "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
   "home.show_announcements": "Mostrar anuncios",
+  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta y guardarla así para más adelante.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
+  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
+  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.on_another_server": "En un servidor diferente",
+  "interaction_modal.on_this_server": "En este servidor",
+  "interaction_modal.other_server_instructions": "Copia y pega esta URL en la barra de búsqueda de tu aplicación Mastodon favorita o la interfaz web de tu servidor Mastodon.",
+  "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.",
+  "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
+  "interaction_modal.title.follow": "Seguir a {name}",
+  "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
+  "interaction_modal.title.reply": "Responder a la publicación de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -221,18 +309,18 @@
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
-  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
+  "keyboard_shortcuts.direct": "para abrir la columna de mensajes directos",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
   "keyboard_shortcuts.favourites": "abrir la lista de favoritos",
-  "keyboard_shortcuts.federated": "abrir el timeline federado",
+  "keyboard_shortcuts.federated": "Abrir la cronología federada",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "abrir el timeline propio",
-  "keyboard_shortcuts.hotkey": "Tecla caliente",
-  "keyboard_shortcuts.legend": "para mostrar esta leyenda",
-  "keyboard_shortcuts.local": "abrir el timeline local",
-  "keyboard_shortcuts.mention": "para mencionar al autor",
+  "keyboard_shortcuts.home": "Abrir cronología principal",
+  "keyboard_shortcuts.hotkey": "Tecla rápida",
+  "keyboard_shortcuts.legend": "Mostrar esta leyenda",
+  "keyboard_shortcuts.local": "Abrir cronología local",
+  "keyboard_shortcuts.mention": "mencionar al autor",
   "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados",
   "keyboard_shortcuts.my_profile": "abrir tu perfil",
   "keyboard_shortcuts.notifications": "abrir la columna de notificaciones",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expandir cuadro de visualización de imagen",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Mostrar perfil de todos modos",
+  "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",
@@ -272,47 +362,54 @@
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "missing_indicator.label": "No encontrado",
   "missing_indicator.sublabel": "No se encontró este recurso",
+  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.duration": "Duración",
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
   "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.apps": "Aplicaciones móviles",
+  "navigation_bar.about": "Acerca de",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Historia local",
+  "navigation_bar.community_timeline": "Cronología local",
   "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
-  "navigation_bar.info": "Información adicional",
-  "navigation_bar.keyboard_shortcuts": "Atajos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Publicaciones fijadas",
   "navigation_bar.preferences": "Preferencias",
-  "navigation_bar.public_timeline": "Historia federada",
+  "navigation_bar.public_timeline": "Cronología federada",
+  "navigation_bar.search": "Buscar",
   "navigation_bar.security": "Seguridad",
+  "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
+  "notification.admin.report": "{name} informó {target}",
+  "notification.admin.sign_up": "{name} se registró",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{name} te ha mencionado",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
-  "notification.reblog": "{name} ha retooteado tu publicación",
+  "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.status": "{name} acaba de publicar",
+  "notification.update": "{name} editó una publicación",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
+  "notifications.column_settings.admin.report": "Nuevos informes:",
+  "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -322,9 +419,11 @@
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
   "notifications.column_settings.status": "Nuevas publicaciones:",
-  "notifications.column_settings.unread_markers.category": "Indicadores de notificaciones no leídas",
+  "notifications.column_settings.unread_notifications.category": "Notificaciones sin leer",
+  "notifications.column_settings.unread_notifications.highlight": "Destacar notificaciones no leídas",
+  "notifications.column_settings.update": "Ediciones:",
   "notifications.filter.all": "Todos",
-  "notifications.filter.boosts": "Retoots",
+  "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menciones",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Has votado a favor de esta respuesta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.long": "Visible solo para usuarios mencionados",
+  "privacy.direct.short": "Sólo cuentas mencionadas",
   "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Privado",
-  "privacy.public.long": "Mostrar en la historia federada",
+  "privacy.private.short": "Solo seguidores",
+  "privacy.public.long": "Visible para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "No mostrar en la historia federada",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
   "privacy.unlisted.short": "No listado",
+  "privacy_policy.last_updated": "Actualizado por última vez {date}",
+  "privacy_policy.title": "Política de Privacidad",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
   "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
   "relative_time.days": "{number} d",
+  "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
+  "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
+  "relative_time.full.just_now": "justo ahora",
+  "relative_time.full.minutes": "hace {number, plural, one {# minuto} other {# minutos}}",
+  "relative_time.full.seconds": "hace {number, plural, one {# segundo} other {# segundos}}",
   "relative_time.hours": "{number} h",
   "relative_time.just_now": "ahora",
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
   "reply_indicator.cancel": "Cancelar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
+  "report.categories.other": "Otros",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "El contenido viola una o más reglas del servidor",
+  "report.category.subtitle": "Elige la mejor coincidencia",
+  "report.category.title": "Cuéntanos lo que está pasando con este {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicación",
+  "report.close": "Hecho",
+  "report.comment.title": "¿Hay algo más que creas que deberíamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
-  "report.hint": "El informe se enviará a los moderadores de tu instancia. Puedes proporcionar una explicación de por qué informas sobre esta cuenta a continuación:",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "No verás sus publicaciones. Todavía puede seguirte y ver tus mensajes, y no sabrá que está silenciade.",
+  "report.next": "Siguiente",
   "report.placeholder": "Comentarios adicionales",
-  "report.submit": "Publicar",
+  "report.reasons.dislike": "No me gusta",
+  "report.reasons.dislike_description": "No es algo que quieras ver",
+  "report.reasons.other": "Es otra cosa",
+  "report.reasons.other_description": "El problema no encaja en otras categorías",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Enlaces maliciosos, interacciones falsas o respuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas del servidor",
+  "report.reasons.violation_description": "Eres consciente de que infringe las normas específicas",
+  "report.rules.subtitle": "Selecciona todos los que correspondan",
+  "report.rules.title": "¿Qué normas se están violando?",
+  "report.statuses.subtitle": "Selecciona todos los que correspondan",
+  "report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
+  "report.submit": "Enviar",
   "report.target": "Reportando",
+  "report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
+  "report.thanks.title": "¿No quieres esto?",
+  "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
+  "report.unfollow": "Dejar de seguir a @{name}",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
+  "report_notification.categories.other": "Otros",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Infracción de regla",
+  "report_notification.open": "Abrir informe",
   "search.placeholder": "Buscar",
+  "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.search_format": "Formato de búsqueda avanzada",
   "search_popout.tips.full_text": "Las búsquedas de texto recuperan publicaciones que has escrito, marcado como favoritas, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
   "search_popout.tips.hashtag": "etiqueta",
@@ -382,23 +525,42 @@
   "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag",
   "search_popout.tips.user": "usuario",
   "search_results.accounts": "Gente",
+  "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
+  "search_results.nothing_found": "No se pudo encontrar nada para estos términos de búsqueda",
   "search_results.statuses": "Publicaciones",
   "search_results.statuses_fts_disabled": "Buscar publicaciones por su contenido no está disponible en este servidor de Mastodon.",
+  "search_results.title": "Buscar {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Usuarios activos en el servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
+  "server_banner.active_users": "usuarios activos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} es parte de la red social descentralizada liderada por {mastodon}.",
+  "server_banner.learn_more": "Saber más",
+  "server_banner.server_stats": "Estadísticas del servidor:",
+  "sign_in_banner.create_account": "Crear cuenta",
+  "sign_in_banner.sign_in": "Iniciar sesión",
+  "sign_in_banner.text": "Inicia sesión en este servidor para seguir perfiles o etiquetas, guardar, compartir y responder a mensajes. También puedes interactuar desde otra cuenta en un servidor diferente.",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Añadir marcador",
-  "status.cancel_reblog_private": "Deshacer retoot",
-  "status.cannot_reblog": "Esta publicación no puede retootearse",
+  "status.cancel_reblog_private": "Deshacer impulso",
+  "status.cannot_reblog": "Esta publicación no se puede impulsar",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mensaje directo a @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
+  "status.hide": "Ocultar publicación",
+  "status.history.created": "{name} creó {date}",
+  "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
@@ -410,31 +572,37 @@
   "status.pinned": "Publicación fijada",
   "status.read_more": "Leer más",
   "status.reblog": "Retootear",
-  "status.reblog_private": "Implusar a la audiencia original",
+  "status.reblog_private": "Impulsar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Mostrar de todos modos",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
-  "status.show_thread": "Mostrar hilo",
+  "status.show_original": "Mostrar original",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Traducido de {lang} usando {provider}",
   "status.uncached_media_warning": "No disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Dejar de fijar",
+  "subscribed_languages.lead": "Sólo los mensajes en los idiomas seleccionados aparecerán en su inicio y otras líneas de tiempo después del cambio. Seleccione ninguno para recibir mensajes en todos los idiomas.",
+  "subscribed_languages.save": "Guardar cambios",
+  "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",
   "suggestions.dismiss": "Descartar sugerencia",
   "suggestions.header": "Es posible que te interese…",
-  "tabs_bar.federated_timeline": "Federado",
+  "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Inicio",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificaciones",
-  "tabs_bar.search": "Buscar",
   "time_remaining.days": "{number, plural, one {# día restante} other {# días restantes}}",
   "time_remaining.hours": "{number, plural, one {# hora restante} other {# horas restantes}}",
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
   "timeline_hint.resources.statuses": "Publicaciones más antiguas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
   "units.short.billion": "{count} MM",
@@ -453,16 +621,17 @@
   "upload_area.title": "Arrastra y suelta para subir",
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Límite de subida de archivos excedido.",
-  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
+  "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
-  "upload_form.description": "Describir para los usuarios con dificultad visual",
+  "upload_form.description": "Describir para personas con discapacidad visual",
+  "upload_form.description_missing": "No se ha añadido ninguna descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
+  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Elegir imagen",
   "upload_modal.description_placeholder": "Un rápido zorro marrón salta sobre el perro perezoso",
   "upload_modal.detect_text": "Detectar texto de la imagen",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Subiendo…",
+  "upload_progress.processing": "Procesando…",
   "video.close": "Cerrar video",
   "video.download": "Descargar archivo",
   "video.exit_fullscreen": "Salir de pantalla completa",
@@ -480,5 +650,5 @@
   "video.mute": "Silenciar sonido",
   "video.pause": "Pausar",
   "video.play": "Reproducir",
-  "video.unmute": "Dejar de silenciar sonido"
+  "video.unmute": "Desilenciar sonido"
 }
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index e71e56dee..f3adeacf6 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -1,70 +1,104 @@
 {
-  "account.account_note_header": "Note",
+  "about.blocks": "Modereeritavad serverid",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon on tasuta ja vaba tarkvara ning Mastodon gGmbH kaubamärk.",
+  "about.domain_blocks.no_reason_available": "Mittesaadavuse põhjus",
+  "about.domain_blocks.preamble": "Mastodon lubab tavaliselt vaadata sisu ning suhelda kasutajatega ükskõik millisest teisest fediversumi serverist. Need on erandid, mis on paika pandud sellel kindlal serveril.",
+  "about.domain_blocks.silenced.explanation": "Sa ei näe üldiselt profiile ja sisu sellelt serverilt, kui sa just tahtlikult seda ei otsi või jälgimise moel nõusolekut ei anna.",
+  "about.domain_blocks.silenced.title": "Piiratud",
+  "about.domain_blocks.suspended.explanation": "Mitte mingeid andmeid sellelt serveritl ei töödelda, salvestata ega vahetata, tehes igasuguse interaktsiooni või kirjavahetuse kasutajatega sellelt serverilt võimatuks.",
+  "about.domain_blocks.suspended.title": "Kustutatud",
+  "about.not_available": "See info ei ole sellel serveril saadavaks tehtud.",
+  "about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
+  "about.rules": "Serveri reeglid",
+  "account.account_note_header": "Märge",
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
   "account.block": "Blokeeri @{name}",
   "account.block_domain": "Peida kõik domeenist {domain}",
   "account.blocked": "Blokeeritud",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Tühista jälgimistaotlus",
-  "account.direct": "Otsesõnum @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
+  "account.cancel_follow_request": "Võta tagasi jälgimistaotlus",
+  "account.direct": "Saada otsesõnum @{name}'ile",
+  "account.disable_notifications": "Ära teavita, kui @{name} postitab",
   "account.domain_blocked": "Domeen peidetud",
   "account.edit_profile": "Muuda profiili",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "Teavita mind, kui @{name} postitab",
   "account.endorse": "Too profiilil esile",
+  "account.featured_tags.last_status_at": "Viimane postitus {date}",
+  "account.featured_tags.last_status_never": "Postitusi pole",
+  "account.featured_tags.title": "{name} esiletõstetud sildid",
   "account.follow": "Jälgi",
   "account.followers": "Jälgijad",
-  "account.followers.empty": "Keegi ei jälgi seda kasutajat veel.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.",
+  "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}",
+  "account.following": "Jälgib",
+  "account.following_counter": "{count, plural, one {{counter} jälgitav} other {{counter} jälgitavat}}",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
-  "account.follows_you": "Jälgib Teid",
-  "account.hide_reblogs": "Peida upitused kasutajalt @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Viimati aktiivne",
+  "account.follows_you": "Jälgib",
+  "account.go_to_profile": "Mine profiilile",
+  "account.hide_reblogs": "Peida @{name} jagamised",
+  "account.joined_short": "Liitus",
+  "account.languages": "Muuda tellitud keeli",
   "account.link_verified_on": "Selle lingi autorsust kontrolliti {date}",
   "account.locked_info": "Selle konto privaatsussätteks on lukustatud. Omanik vaatab manuaalselt üle, kes teda jägida saab.",
   "account.media": "Meedia",
   "account.mention": "Maini @{name}",
-  "account.moved_to": "{name} on kolinud:",
+  "account.moved_to": "{name} on teada andnud, et ta uus konto on nüüd:",
   "account.mute": "Vaigista @{name}",
   "account.mute_notifications": "Vaigista teated kasutajalt @{name}",
   "account.muted": "Vaigistatud",
-  "account.never_active": "Mitte kunagi",
-  "account.posts": "Tuututused",
-  "account.posts_with_replies": "Tuututused ja vastused",
+  "account.open_original_page": "Ava algne leht",
+  "account.posts": "Postitused",
+  "account.posts_with_replies": "Postitused ja vastused",
   "account.report": "Raporteeri @{name}",
   "account.requested": "Ootab kinnitust. Klõpsa jälgimise soovi tühistamiseks",
+  "account.requested_follow": "{name} on taodelnud sinu jälgimist",
   "account.share": "Jaga @{name} profiili",
-  "account.show_reblogs": "Näita kasutaja @{name} upitusi",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.show_reblogs": "Näita @{name} jagamisi",
+  "account.statuses_counter": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
   "account.unblock": "Eemalda blokeering @{name}",
   "account.unblock_domain": "Tee {domain} nähtavaks",
+  "account.unblock_short": "Eemalda blokeering",
   "account.unendorse": "Ära kuva profiilil",
-  "account.unfollow": "Ära jälgi",
+  "account.unfollow": "Jälgid",
   "account.unmute": "Ära vaigista @{name}",
   "account.unmute_notifications": "Ära vaigista teateid kasutajalt @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "Lõpeta vaigistus",
+  "account_note.placeholder": "Klõpsa märkme lisamiseks",
+  "admin.dashboard.daily_retention": "Kasutajate päevane allesjäämine peale registreerumist",
+  "admin.dashboard.monthly_retention": "Kasutajate kuine allesjäämine peale registreerumist",
+  "admin.dashboard.retention.average": "Keskmine",
+  "admin.dashboard.retention.cohort": "Registreerumiskuu",
+  "admin.dashboard.retention.cohort_size": "Uued kasutajad",
   "alert.rate_limited.message": "Palun proovi uuesti pärast {retry_time, time, medium}.",
   "alert.rate_limited.title": "Piiratud",
   "alert.unexpected.message": "Tekkis ootamatu viga.",
   "alert.unexpected.title": "Oih!",
   "announcement.announcement": "Teadaanne",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(töötlemata)",
+  "audio.hide": "Peida audio",
   "autosuggest_hashtag.per_week": "{count} nädalas",
-  "boost_modal.combo": "Võite vajutada {combo}, et see järgmine kord vahele jätta",
-  "bundle_column_error.body": "Midagi läks valesti selle komponendi laadimisel.",
+  "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
+  "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
+  "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
+  "bundle_column_error.error.title": "Oh, ei!",
+  "bundle_column_error.network.body": "Lehe laadimisel tekkis tõrge. See võib olla ajutine probleem internetiühendusega või selle serveriga.",
+  "bundle_column_error.network.title": "Võrguühenduse viga",
   "bundle_column_error.retry": "Proovi uuesti",
-  "bundle_column_error.title": "Võrgu viga",
+  "bundle_column_error.return": "Tagasi koju",
+  "bundle_column_error.routing.body": "Päritud lehte ei leitud. Kas URL on aadressiribal õige?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sulge",
   "bundle_modal_error.message": "Selle komponendi laadimisel läks midagi viltu.",
   "bundle_modal_error.retry": "Proovi uuesti",
+  "closed_registrations.other_server_instructions": "Kuna Mastodon on detsentraliseeritud, võib konto teha teise serverisse ja sellegipoolest siinse kontoga suhelda.",
+  "closed_registrations_modal.description": "Praegu ei ole võimalik teha {domain} peale kontot, aga pea meeles, et sul ei pea olema just {domain} konto, et Mastodoni kasutada.",
+  "closed_registrations_modal.find_another_server": "Leia teine server",
+  "closed_registrations_modal.preamble": "Mastodon on detsentraliseeritud, mis tähendab, et konto võib luua ükskõik kuhu, kuid ikkagi saab jälgida ja suhelda igaühega sellel serveril. Võib isegi oma serveri püsti panna!",
+  "closed_registrations_modal.title": "Mastodoni registreerumine",
+  "column.about": "Teave",
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Järjehoidjad",
   "column.community": "Kohalik ajajoon",
@@ -74,10 +108,10 @@
   "column.favourites": "Lemmikud",
   "column.follow_requests": "Jälgimistaotlused",
   "column.home": "Kodu",
-  "column.lists": "Nimekirjad",
+  "column.lists": "Nimistud",
   "column.mutes": "Vaigistatud kasutajad",
   "column.notifications": "Teated",
-  "column.pins": "Kinnitatud tuututused",
+  "column.pins": "Kinnitatud postitused",
   "column.public": "Föderatiivne ajajoon",
   "column_back_button.label": "Tagasi",
   "column_header.hide_settings": "Peida sätted",
@@ -90,64 +124,81 @@
   "community.column_settings.local_only": "Ainult kohalik",
   "community.column_settings.media_only": "Ainult meedia",
   "community.column_settings.remote_only": "Ainult kaug",
-  "compose_form.direct_message_warning": "See tuut saadetakse ainult mainitud kasutajatele.",
-  "compose_form.direct_message_warning_learn_more": "Vaata veel",
-  "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
-  "compose_form.lock_disclaimer": "Teie konto ei ole {locked}. Igaüks saab Teid jälgida ja näha Teie ainult-jälgijatele postitusi.",
+  "compose.language.change": "Muuda keelt",
+  "compose.language.search": "Otsi keeli...",
+  "compose_form.direct_message_warning_learn_more": "Vaata täpsemalt",
+  "compose_form.encryption_warning": "Postitused Mastodonis ei ole otsast-otsani krüpteeritud. Ärge jagage mingeid delikaatseid andmeid Mastodoni kaudu.",
+  "compose_form.hashtag_warning": "Seda postitust ei kuvata ühegi sildi all, sest see ei ole leitav avastustoimingute kaudu. Ainult avalikud postitused on sildi järgi otsitavad.",
+  "compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
-  "compose_form.placeholder": "Millest mõtlete?",
+  "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.remove_option": "Eemalda see valik",
-  "compose_form.poll.switch_to_multiple": "Muuda küsitlust lubamaks mitut valikut",
-  "compose_form.poll.switch_to_single": "Muuda küsitlust lubamaks ainult ühte valikut",
-  "compose_form.publish": "Tuut",
+  "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
+  "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+  "compose_form.publish": "Postita",
+  "compose_form.publish_form": "Postita",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Märgista meedia tundlikuks",
-  "compose_form.sensitive.marked": "Meedia on sensitiivseks märgitud",
-  "compose_form.sensitive.unmarked": "Meedia ei ole sensitiivseks märgitud",
-  "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
-  "compose_form.spoiler.unmarked": "Tekst ei ole peidetud",
-  "compose_form.spoiler_placeholder": "Kirjutage oma hoiatus siia",
+  "compose_form.save_changes": "Salvesta muudatused",
+  "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+  "compose_form.spoiler.marked": "Tekst on peidetud hoiatuse taha",
+  "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
+  "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
   "confirmation_modal.cancel": "Katkesta",
-  "confirmations.block.block_and_report": "Blokeeri & Teata",
+  "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Olete kindel, et soovite blokeerida {name}?",
+  "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
+  "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
   "confirmations.delete.confirm": "Kustuta",
-  "confirmations.delete.message": "Olete kindel, et soovite selle staatuse kustutada?",
+  "confirmations.delete.message": "Oled kindel, et soovid postituse kustutada?",
   "confirmations.delete_list.confirm": "Kustuta",
-  "confirmations.delete_list.message": "Olete kindel, et soovite selle nimekirja püsivalt kustutada?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
+  "confirmations.discard_edit_media.confirm": "Hülga",
+  "confirmations.discard_edit_media.message": "Teil on salvestamata muudatused meediakirjelduses või eelvaates, kas hülgame need?",
   "confirmations.domain_block.confirm": "Peida terve domeen",
-  "confirmations.domain_block.message": "Olete ikka päris kindel, et soovite blokeerida terve {domain}? Enamikul juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatav. Te ei näe selle domeeni sisu üheski avalikus ajajoones või teadetes. Teie jälgijad sellest domeenist eemaldatakse.",
+  "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
   "confirmations.logout.confirm": "Välju",
-  "confirmations.logout.message": "Kas olete kindel, et soovite välja logida?",
+  "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.mute.confirm": "Vaigista",
-  "confirmations.mute.explanation": "See peidab postitusi temalt ning postitusi, kus mainitakse neid, kuid see lubab neil ikka näha Teie postitusi ning Teid jälgida.",
-  "confirmations.mute.message": "Olete kindel, et soovite {name} vaigistada?",
+  "confirmations.mute.explanation": "See peidab tema postitused ning postitused, kus teda mainitakse, kuid lubab tal ikka su postitusi näha ning sind jälgida.",
+  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
-  "confirmations.redraft.message": "Olete kindel, et soovite selle staatuse kustutada ja alustada uuesti? Lemmikud ja upitused lähevad kaotsi ja vastused originaaalpostitusele jäävad orvuks.",
+  "confirmations.redraft.message": "Kas kustutada postitus ja võtta uue aluseks? Meeldimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.reply.confirm": "Vasta",
-  "confirmations.reply.message": "Praegu vastamine kirjutab üle sõnumi, mida hetkel koostate. Olete kindel, et soovite jätkata?",
+  "confirmations.reply.message": "Praegu vastamine kirjutab hetkel koostatava sõnumi üle. Oled kindel, et soovid jätkata?",
   "confirmations.unfollow.confirm": "Ära jälgi",
-  "confirmations.unfollow.message": "Olete kindel, et ei soovi rohkem jälgida kasutajat {name}?",
+  "confirmations.unfollow.message": "Oled kindel, et ei soovi rohkem jälgida kasutajat {name}?",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
   "conversation.with": "Koos {names}",
-  "directory.federated": "Teatud fediversumist",
+  "copypaste.copied": "Kopeeritud",
+  "copypaste.copy": "Kopeeri",
+  "directory.federated": "Tuntud födiversumist",
   "directory.local": "Ainult domeenilt {domain}",
   "directory.new_arrivals": "Uustulijad",
   "directory.recently_active": "Hiljuti aktiivne",
-  "embed.instructions": "Manusta see staatus oma veebilehele, kopeerides alloleva koodi.",
+  "disabled_account_banner.account_settings": "Kontosätted",
+  "disabled_account_banner.text": "Su konto {disabledAccount} on hetkel keelatud.",
+  "dismissable_banner.community_timeline": "Need on kõige viimased avalikud postitused inimestelt, kelle kontosid majutab {domain}.",
+  "dismissable_banner.dismiss": "Sulge",
+  "dismissable_banner.explore_links": "Need on uudised, millest inimesed siin ja teistes serverites üle detsentraliseeritud võrgu praegu räägivad.",
+  "dismissable_banner.explore_statuses": "Need postitused siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
+  "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
+  "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt selles ja teistes serverites üle detsentraliseeritud võrgu, millest see server on teadlik.",
+  "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
+  "emoji_button.clear": "Tühjenda",
   "emoji_button.custom": "Mugandatud",
   "emoji_button.flags": "Lipud",
-  "emoji_button.food": "Toit & Jook",
-  "emoji_button.label": "Sisesta emoji",
+  "emoji_button.food": "Toit & jook",
+  "emoji_button.label": "Lisa emoji",
   "emoji_button.nature": "Loodus",
   "emoji_button.not_found": "Ei ole emojosi!! (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "Objektid",
@@ -156,48 +207,71 @@
   "emoji_button.search": "Otsi...",
   "emoji_button.search_results": "Otsitulemused",
   "emoji_button.symbols": "Sümbolid",
-  "emoji_button.travel": "Reisimine & Kohad",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "Siin tuute ei ole!",
+  "emoji_button.travel": "Reisimine & kohad",
+  "empty_column.account_suspended": "Konto kustutatud",
+  "empty_column.account_timeline": "Siin postitusi ei ole!",
   "empty_column.account_unavailable": "Profiil pole saadaval",
-  "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
-  "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud tuututusi. Kui lisate mõne, näete neid siin.",
+  "empty_column.blocks": "Blokeeritud kasutajaid pole.",
+  "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud postitusi. Kui lisate mõne, näete neid siin.",
   "empty_column.community": "Kohalik ajajoon on tühi. Kirjutage midagi avalikult, et pall veerema ajada!",
   "empty_column.direct": "Teil ei ole veel otsesõnumeid. Kui saadate või võtate mõne vastu, ilmuvad nad siia.",
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
-  "empty_column.favourited_statuses": "Teil pole veel lemmikuid tuute. Kui märgite mõne, näete neid siin.",
-  "empty_column.favourites": "Keegi pole veel seda tuuti lemmikuks märkinud. Kui seegi seda teeb, näed seda siin.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "Teil pole veel ühtegi jälgimise taotlust. Kui saate mõne, näete neid siin.",
-  "empty_column.hashtag": "Selle sildiga pole veel midagi.",
-  "empty_column.home": "Teie kodu ajajoon on tühi! Külastage {public} või kasutage otsingut alustamaks ja kohtamaks teisi kasutajaid.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "Siin nimstus pole veel midagi. Kui selle nimistu liikmed postitavad uusi staatusi, näed neid siin.",
-  "empty_column.lists": "Teil ei ole veel ühtegi nimekirja. Kui loote mõne, näete neid siin.",
+  "empty_column.explore_statuses": "Praegu pole ühtegi trendi. Tule hiljem tagasi!",
+  "empty_column.favourited_statuses": "Teil pole veel lemmikpostitusi. Kui märgite mõne, näete neid siin.",
+  "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui seegi seda teeb, näed seda siin.",
+  "empty_column.follow_recommendations": "Tundub, et sinu jaoks ei ole võimalik soovitusi luua. Proovi kasutada otsingut, et leida tuttavaid inimesi, või sirvi populaarseid silte.",
+  "empty_column.follow_requests": "Teil pole hetkel ühtegi jälgimistaotlust. Kui saate mõne, näete neid siin.",
+  "empty_column.hashtag": "Seda sildi all ei ole ühtegi postitust.",
+  "empty_column.home": "Su koduajajoon on tühi. Jälgi rohkemaid inimesi, et seda täita {suggestions}",
+  "empty_column.home.suggestions": "Vaata mõndasid soovitusi",
+  "empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
+  "empty_column.lists": "Teil pole veel ühtegi nimekirja. Kui loote mõne, näete neid siin.",
   "empty_column.mutes": "Te pole veel ühtegi kasutajat vaigistanud.",
   "empty_column.notifications": "Teil ei ole veel teateid. Suhelge teistega alustamaks vestlust.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikut või jälgi ise kasutajaid täitmaks seda ruumi",
-  "error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvus probleemi tõttu ei suutnud me Teile seda lehekülge korrektselt näidata.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvus probleemi tõttu ei suutnud me teile seda lehekülge korrektselt näidata.",
+  "error.unexpected_crash.explanation_addons": "Seda lehte ei suudetud õigesti kuvada. See viga arvatavasti põhjustas mingi brauseri lisand või automaattõlke tööriist.",
   "error.unexpected_crash.next_steps": "Proovige lehekülge uuesti avada. Kui see ei aita, võite proovida kasutada Mastodoni mõne muu veebilehitseja või äppi kaudu.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Proovige need välja lülitada ja leht uuesti laadida. Kui sellest pole abi, võib olla võimalik Mastodoni kasutada mingi teise brauseri või rakendusega.",
   "errors.unexpected_crash.copy_stacktrace": "Kopeeri stacktrace lõikelauale",
   "errors.unexpected_crash.report_issue": "Teavita veast",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "explore.search_results": "Otsitulemused",
+  "explore.suggested_follows": "Kasutajad",
+  "explore.title": "Avasta",
+  "explore.trending_links": "Uudised",
+  "explore.trending_statuses": "Postitused",
+  "explore.trending_tags": "Sildid",
+  "filter_modal.added.context_mismatch_explanation": "See filtrikategooria ei rakendu selles kontekstis, kuidas te postitusele jõudsite. Kui tahate postitust ka selles kontekstis filtreerida, võite muuta filtrit.",
+  "filter_modal.added.context_mismatch_title": "Konteksti mittesobivus!",
+  "filter_modal.added.expired_explanation": "Selle filtri kategooria on aegunud, peate muutma aegumiskuupäeva, kui tahate, et filter kehtiks.",
+  "filter_modal.added.expired_title": "Aegunud filter!",
+  "filter_modal.added.review_and_configure": "Et vaadata üle ja täpsemalt seadistada seda filtrikategooriat, minge lehele {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtrite sätted",
+  "filter_modal.added.settings_link": "sättete leht",
+  "filter_modal.added.short_explanation": "See postitus on lisatud järgmisesse filtrikategooriasse: {title}.",
+  "filter_modal.added.title": "Filter lisatud!",
+  "filter_modal.select_filter.context_mismatch": "ei avaldu selles kontekstis",
+  "filter_modal.select_filter.expired": "aegunud",
+  "filter_modal.select_filter.prompt_new": "Uus kategooria: {name}",
+  "filter_modal.select_filter.search": "Otsi või loo",
+  "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
+  "filter_modal.select_filter.title": "Filtreeri seda postitust",
+  "filter_modal.title.status": "Postituse filtreerimine",
+  "follow_recommendations.done": "Valmis",
+  "follow_recommendations.heading": "Jälgi inimesi, kelle postitusi tahaksid näha! Mõned soovitused on siin.",
+  "follow_recommendations.lead": "Postitused inimestelt, keda jälgid, ilmuvad ajalises järjestuses kodu ajajoonel. Ära karda eksida, alati saab inimeste jälgimist ka lõpetada!",
   "follow_request.authorize": "Autoriseeri",
   "follow_request.reject": "Hülga",
-  "follow_requests.unlocked_explanation": "Kuigi Teie konto pole lukustatud, soovitab {domain} personal siiski manuaalselt üle vaadata jälgimistaotlused nendelt kontodelt.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Arendajad",
-  "getting_started.directory": "Profiili kataloog",
-  "getting_started.documentation": "Dokumentatsioon",
+  "follow_requests.unlocked_explanation": "Kuigi su konto pole lukustatud, soovitab {domain} personal siiski nende kontode jälgimistaotlused käsitsi üle vaadata.",
+  "footer.about": "Teave",
+  "footer.directory": "Profiilikataloog",
+  "footer.get_app": "Tõmba äpp",
+  "footer.invite": "Kutsu liituma",
+  "footer.keyboard_shortcuts": "Klaviatuuri otseteed",
+  "footer.privacy_policy": "Isikuandmete kaitse",
+  "footer.source_code": "Lähtekood",
+  "generic.saved": "Salvestatud",
   "getting_started.heading": "Alustamine",
-  "getting_started.invite": "Kutsu inimesi",
-  "getting_started.open_source_notice": "Mastodon on avatud lähtekoodiga tarkvara. Saate panustada või teatada probleemidest GitHubis {github}.",
-  "getting_started.security": "Turvalisus",
-  "getting_started.terms": "Kasutustingimused",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "või {additional}",
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
@@ -207,270 +281,366 @@
   "hashtag.column_settings.tag_mode.any": "Mõni neist",
   "hashtag.column_settings.tag_mode.none": "Mitte ükski neist",
   "hashtag.column_settings.tag_toggle": "Kaasa lisamärked selle tulba jaoks",
+  "hashtag.follow": "Jälgi silti",
+  "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "home.column_settings.basic": "Peamine",
-  "home.column_settings.show_reblogs": "Näita upitusi",
+  "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
   "home.hide_announcements": "Peida teadaanded",
   "home.show_announcements": "Kuva teadaandeid",
-  "intervals.full.days": "{number, plural, one {# päev} other {# päevad}}",
+  "interaction_modal.description.favourite": "Mastodoni kontoga saate seda postitust lemmikuks märkida, et autor teaks, et te seda hindate ja hiljemaks alles jätta.",
+  "interaction_modal.description.follow": "Mastodoni kontoga saate jälgida kasutajat {name}, et tema postitusi oma kodu ajajoonel näha.",
+  "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.",
+  "interaction_modal.description.reply": "Mastodoni kontoga saate sellele postitusele vastata.",
+  "interaction_modal.on_another_server": "Teises serveris",
+  "interaction_modal.on_this_server": "Selles serveris",
+  "interaction_modal.other_server_instructions": "Kopeeri ja aseta see URL oma lemmikusse Mastodoni äppi või oma Mastodoni serveri veebiliidesesse.",
+  "interaction_modal.preamble": "Kuna Mastodon on detsentraliseeritud, võite kasutada olemasolevat kontot, mis on teises Mastodoni servers või ühilduval platvormil, kui teil siin kontot ei ole.",
+  "interaction_modal.title.favourite": "Lisa konto {name} postitus lemmikuks",
+  "interaction_modal.title.follow": "Jälgi kontot {name}",
+  "interaction_modal.title.reblog": "Jaga {name} postitust",
+  "interaction_modal.title.reply": "Vasta kasutaja {name} postitusele",
+  "intervals.full.days": "{number, plural, one {# päev} other {# päeva}}",
   "intervals.full.hours": "{number, plural, one {# tund} other {# tundi}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutit}}",
-  "keyboard_shortcuts.back": "tagasiminekuks",
+  "keyboard_shortcuts.back": "Liigu tagasi",
   "keyboard_shortcuts.blocked": "avamaks blokeeritud kasutajate nimistut",
-  "keyboard_shortcuts.boost": "upitamiseks",
-  "keyboard_shortcuts.column": "fokuseerimaks staatust ühele tulpadest",
-  "keyboard_shortcuts.compose": "fokuseerimaks tekstikoostamise alale",
+  "keyboard_shortcuts.boost": "Jaga",
+  "keyboard_shortcuts.column": "Fookus veerule",
+  "keyboard_shortcuts.compose": "Fookus teksti koostamise alale",
   "keyboard_shortcuts.description": "Kirjeldus",
-  "keyboard_shortcuts.direct": "avamaks otsesõnumite tulpa",
-  "keyboard_shortcuts.down": "liikumaks nimstus alla",
-  "keyboard_shortcuts.enter": "staatuse avamiseks",
-  "keyboard_shortcuts.favourite": "lemmikuks märkimiseks",
-  "keyboard_shortcuts.favourites": "avamaks lemmikute nimistut",
-  "keyboard_shortcuts.federated": "avamaks föderatsiooni ajajoont",
-  "keyboard_shortcuts.heading": "Klaviatuuri kiirkäsud",
-  "keyboard_shortcuts.home": "avamaks kodu ajajoont",
+  "keyboard_shortcuts.direct": "ava otsesõnumite veerg",
+  "keyboard_shortcuts.down": "Liigu loetelus alla",
+  "keyboard_shortcuts.enter": "Ava postitus",
+  "keyboard_shortcuts.favourite": "Märgi lemmikuks",
+  "keyboard_shortcuts.favourites": "Ava lemmikute loetelu",
+  "keyboard_shortcuts.federated": "Ava föderatsiooni ajajoon",
+  "keyboard_shortcuts.heading": "Klaviatuuri otseteed",
+  "keyboard_shortcuts.home": "Ava kodu ajajoon",
   "keyboard_shortcuts.hotkey": "Kiirklahv",
-  "keyboard_shortcuts.legend": "selle legendi kuvamiseks",
-  "keyboard_shortcuts.local": "avamaks kohalikku ajajoont",
-  "keyboard_shortcuts.mention": "autori mainimiseks",
-  "keyboard_shortcuts.muted": "avamaks vaigistatud kasutajate nimistut",
-  "keyboard_shortcuts.my_profile": "avamaks profiili",
-  "keyboard_shortcuts.notifications": "avamaks teadete tulpa",
-  "keyboard_shortcuts.open_media": "et avada meedia",
-  "keyboard_shortcuts.pinned": "avamaks kinnitatud tuutide nimistut",
-  "keyboard_shortcuts.profile": "avamaks autori profiili",
+  "keyboard_shortcuts.legend": "Kuva see legend",
+  "keyboard_shortcuts.local": "Ava kohalik ajajoon",
+  "keyboard_shortcuts.mention": "Maini autorit",
+  "keyboard_shortcuts.muted": "Ava vaigistatud kasutajate loetelu",
+  "keyboard_shortcuts.my_profile": "Ava oma profiil",
+  "keyboard_shortcuts.notifications": "Ava teadete veerg",
+  "keyboard_shortcuts.open_media": "Ava meedia",
+  "keyboard_shortcuts.pinned": "Ava kinnitatud postituste loetelu",
+  "keyboard_shortcuts.profile": "Ava autori profiil",
   "keyboard_shortcuts.reply": "vastamiseks",
-  "keyboard_shortcuts.requests": "avamaks jälgimistaotluste nimistut",
-  "keyboard_shortcuts.search": "otsingu fokuseerimiseks",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "avamaks \"Alusta\" tulpa",
-  "keyboard_shortcuts.toggle_hidden": "näitamaks/peitmaks teksti CW taga",
-  "keyboard_shortcuts.toggle_sensitivity": "et peita/näidata meediat",
-  "keyboard_shortcuts.toot": "alustamaks täiesti uut tuuti",
-  "keyboard_shortcuts.unfocus": "tekstiala/otsingu koostamise mittefokuseerimiseks",
-  "keyboard_shortcuts.up": "liikumaks nimistus üles",
+  "keyboard_shortcuts.requests": "Ava jälgimistaotluste loetelu",
+  "keyboard_shortcuts.search": "Fookus otsingule",
+  "keyboard_shortcuts.spoilers": "Näita/peida CW väli",
+  "keyboard_shortcuts.start": "Ava veerg \"Alusta\"",
+  "keyboard_shortcuts.toggle_hidden": "Näida/peida teksti CW taga",
+  "keyboard_shortcuts.toggle_sensitivity": "Näita/peida meediat",
+  "keyboard_shortcuts.toot": "Alusta uut postitust",
+  "keyboard_shortcuts.unfocus": "Fookus tekstialalt/otsingult ära",
+  "keyboard_shortcuts.up": "Liigu loetelus üles",
   "lightbox.close": "Sulge",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "Suru kokku pildi vaatamise kast",
+  "lightbox.expand": "Laienda pildi vaatamise kast",
   "lightbox.next": "Järgmine",
   "lightbox.previous": "Eelmine",
+  "limited_account_hint.action": "Näita profilli sellegipoolest",
+  "limited_account_hint.title": "See profiil on peidetud {domain} moderaatorite poolt.",
   "lists.account.add": "Lisa nimistusse",
   "lists.account.remove": "Eemalda nimistust",
   "lists.delete": "Kustuta nimistu",
   "lists.edit": "Muuda nimistut",
-  "lists.edit.submit": "Muuda pealkiri",
+  "lists.edit.submit": "Pealkirja muutmine",
   "lists.new.create": "Lisa nimistu",
-  "lists.new.title_placeholder": "Uus nimistu pealkiri",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Otsi Teie poolt jälgitavate inimese hulgast",
-  "lists.subheading": "Teie nimistud",
+  "lists.new.title_placeholder": "Uue nimistu pealkiri",
+  "lists.replies_policy.followed": "Igalt jälgitud kasutajalt",
+  "lists.replies_policy.list": "Listi liikmetelt",
+  "lists.replies_policy.none": "Mitte kellegilt",
+  "lists.replies_policy.title": "Näita vastuseid nendele:",
+  "lists.search": "Otsi enda jälgitavate inimeste hulgast",
+  "lists.subheading": "Su loetelud",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laeb..",
-  "media_gallery.toggle_visible": "Lülita nähtavus",
+  "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "missing_indicator.label": "Ei leitud",
   "missing_indicator.sublabel": "Seda ressurssi ei leitud",
-  "mute_modal.duration": "Duration",
+  "moved_to_account_banner.text": "Su kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
+  "mute_modal.duration": "Kestus",
   "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobiilrakendused",
+  "mute_modal.indefinite": "Lõpmatu",
+  "navigation_bar.about": "Teave",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
   "navigation_bar.bookmarks": "Järjehoidjad",
   "navigation_bar.community_timeline": "Kohalik ajajoon",
-  "navigation_bar.compose": "Koosta uus tuut",
+  "navigation_bar.compose": "Koosta uus postitus",
   "navigation_bar.direct": "Otsesõnumid",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
   "navigation_bar.edit_profile": "Muuda profiili",
+  "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
   "navigation_bar.follow_requests": "Jälgimistaotlused",
-  "navigation_bar.follows_and_followers": "Jälgitud ja jälgijad",
-  "navigation_bar.info": "Selle serveri kohta",
-  "navigation_bar.keyboard_shortcuts": "Kiirklahvid",
+  "navigation_bar.follows_and_followers": "Jälgitavad ja jälgijad",
   "navigation_bar.lists": "Nimistud",
   "navigation_bar.logout": "Logi välja",
   "navigation_bar.mutes": "Vaigistatud kasutajad",
   "navigation_bar.personal": "Isiklik",
-  "navigation_bar.pins": "Kinnitatud tuutid",
+  "navigation_bar.pins": "Kinnitatud postitused",
   "navigation_bar.preferences": "Eelistused",
   "navigation_bar.public_timeline": "Föderatiivne ajajoon",
+  "navigation_bar.search": "Otsing",
   "navigation_bar.security": "Turvalisus",
-  "notification.favourite": "{name} märkis Teie staatuse lemmikuks",
-  "notification.follow": "{name} jälgib nüüd Teid",
-  "notification.follow_request": "{name} soovib Teid jälgida",
-  "notification.mention": "{name} mainis Teid",
-  "notification.own_poll": "Teie küsitlus on lõppenud",
+  "not_signed_in_indicator.not_signed_in": "Peate logima sisse, et saada ligipääsu sellele ressursile.",
+  "notification.admin.report": "{name} saatis teavituse {target} kohta",
+  "notification.admin.sign_up": "{name} registreerus",
+  "notification.favourite": "{name} märkis su postituse lemmikuks",
+  "notification.follow": "{name} alustas su jälgimist",
+  "notification.follow_request": "{name} soovib teid jälgida",
+  "notification.mention": "{name} mainis teid",
+  "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Küsitlus, milles osalesite, on lõppenud",
-  "notification.reblog": "{name} upitas Teie staatust",
-  "notification.status": "{name} just posted",
+  "notification.reblog": "{name} jagas edasi postitust",
+  "notification.status": "{name} just postitas",
+  "notification.update": "{name} muutis postitust",
   "notifications.clear": "Puhasta teated",
-  "notifications.clear_confirmation": "Olete kindel, et soovite püsivalt kõik oma teated eemaldada?",
+  "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
+  "notifications.column_settings.admin.report": "Uued teavitused:",
+  "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
   "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
-  "notifications.column_settings.filter_bar.show": "Kuva",
+  "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
   "notifications.column_settings.mention": "Mainimised:",
   "notifications.column_settings.poll": "Küsitluse tulemused:",
   "notifications.column_settings.push": "Push teated",
-  "notifications.column_settings.reblog": "Upitused:",
+  "notifications.column_settings.reblog": "Jagamised:",
   "notifications.column_settings.show": "Kuva tulbas",
   "notifications.column_settings.sound": "Mängi heli",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.status": "Uued postitused:",
+  "notifications.column_settings.unread_notifications.category": "Lugemata teated",
+  "notifications.column_settings.unread_notifications.highlight": "Tõsta esile lugemata teated",
+  "notifications.column_settings.update": "Muudatused:",
   "notifications.filter.all": "Kõik",
-  "notifications.filter.boosts": "Upitused",
+  "notifications.filter.boosts": "Jagamised",
   "notifications.filter.favourites": "Lemmikud",
   "notifications.filter.follows": "Jälgib",
   "notifications.filter.mentions": "Mainimised",
   "notifications.filter.polls": "Küsitluse tulemused",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
+  "notifications.filter.statuses": "Uuendused inimestelt, keda te jälgite",
+  "notifications.grant_permission": "Anna luba.",
   "notifications.group": "{count} teated",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
+  "notifications.mark_as_read": "Märgi kõik teated loetuks",
+  "notifications.permission_denied": "Töölaua märguanded pole seadaval, kuna eelnevalt keelduti brauserile teavituste luba anda",
+  "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
+  "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications_permission_banner.enable": "Luba töölaua märguanded",
+  "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tegevused tekitavad töölauamärguandeid kasutates selleks peale teavituste sisse lülitamist {icon} nuppu üleval.",
+  "notifications_permission_banner.title": "Ärge jääge millestki ilma",
+  "picture_in_picture.restore": "Pane tagasi",
   "poll.closed": "Suletud",
   "poll.refresh": "Värskenda",
   "poll.total_people": "{count, plural,one {# inimene} other {# inimest}}",
-  "poll.total_votes": "{count, plural, one {# hääl} other {# hääli}}",
+  "poll.total_votes": "{count, plural, one {# hääl} other {# häält}}",
   "poll.vote": "Hääleta",
-  "poll.voted": "Teie hääletasite selle poolt",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Hääletasid selle poolt",
+  "poll.votes": "{votes, plural, one {# hääl} other {# häält}}",
   "poll_button.add_poll": "Lisa küsitlus",
   "poll_button.remove_poll": "Eemalda küsitlus",
-  "privacy.change": "Muuda staatuse privaatsust",
+  "privacy.change": "Muuda postituse nähtavust",
   "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Otsene",
+  "privacy.direct.short": "Mainitud inimesed ainult",
   "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Ainult jälgijatele",
-  "privacy.public.long": "Postita avalikele ajajoontele",
+  "privacy.private.short": "Jälgijad ainult",
+  "privacy.public.long": "Kõigile nähtav",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Ära postita avalikele ajajoontele",
+  "privacy.unlisted.long": "Kõgile nähtav, aga ei ilmu avastamise vaadetes",
   "privacy.unlisted.short": "Määramata",
+  "privacy_policy.last_updated": "Viimati uuendatud {date}",
+  "privacy_policy.title": "Isikuandmete kaitse",
   "refresh": "Värskenda",
   "regeneration_indicator.label": "Laeb…",
-  "regeneration_indicator.sublabel": "Teie kodu voog on ettevalmistamisel!",
+  "regeneration_indicator.sublabel": "Su kodu voog on ettevalmistamisel!",
   "relative_time.days": "{number}p",
+  "relative_time.full.days": "{number, plural, one {# päev} other {# päeva}} tagasi",
+  "relative_time.full.hours": "{number, plural, one {# tund} other {# tundi}} tagasi",
+  "relative_time.full.just_now": "just nüüd",
+  "relative_time.full.minutes": "{number, plural, one {# minut} other {# minutit}} tagasi",
+  "relative_time.full.seconds": "{number, plural, one {# sekund} other {# sekundit}} tagasi",
   "relative_time.hours": "{number}t",
   "relative_time.just_now": "nüüd",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
   "reply_indicator.cancel": "Tühista",
+  "report.block": "Blokeeri",
+  "report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
+  "report.categories.other": "Muud",
+  "report.categories.spam": "Rämpspost",
+  "report.categories.violation": "Sisu, mis rikub ühte või enamat serveri reeglit",
+  "report.category.subtitle": "Valige parim vaste",
+  "report.category.title": "Öelge, mis on sellel {type} valesti",
+  "report.category.title_account": "profiilil",
+  "report.category.title_status": "postitusel",
+  "report.close": "Valmis",
+  "report.comment.title": "Kas on midagi veel, mis te arvate, et me peaks teadma?",
   "report.forward": "Edasta kasutajale {target}",
   "report.forward_hint": "See kasutaja on teisest serverist. Kas saadan anonümiseeritud koopia sellest teatest sinna ka?",
-  "report.hint": "See teade saadetakse Teie serveri moderaatoritele. Te saate lisada selgituse selle kohta, miks selle kasutaja kohta teate esitasite, siin:",
+  "report.mute": "Vaigista",
+  "report.mute_explanation": "Sa ei näe tema postitusi. Ta võib ikka sind jälgida ja su postitusi näha. Ta ei saa teada, et ta on vaigistatud.",
+  "report.next": "Järgmine",
   "report.placeholder": "Lisaks kommentaarid",
-  "report.submit": "Saada",
+  "report.reasons.dislike": "Mulle ei meeldi see",
+  "report.reasons.dislike_description": "Midagi sellist, mida te ei taha näha",
+  "report.reasons.other": "Midagi muud",
+  "report.reasons.other_description": "Probleem ei sobi teistesse kategooriatesse",
+  "report.reasons.spam": "See on rämpspost",
+  "report.reasons.spam_description": "Pahatahtlikud lingid, võltssuhtlus või korduvad vastused",
+  "report.reasons.violation": "Rikub serveri reegleid",
+  "report.reasons.violation_description": "Teate, et see rikub teatud reegleid",
+  "report.rules.subtitle": "Valige kõik, mis sobivad",
+  "report.rules.title": "Milliseid reegleid rikutakse?",
+  "report.statuses.subtitle": "Valige kõik, mis sobivad",
+  "report.statuses.title": "Kas on olemas postitusi, mis on sellele teavitusele tõenduseks?",
+  "report.submit": "Esita",
   "report.target": "Teatamine {target} kohta",
+  "report.thanks.take_action": "Need on võimalused, mis teil on, et juhtida, mida Mastodonis näete:",
+  "report.thanks.take_action_actionable": "Kuniks me seda üle vaatame, võite teha need tegevused @{name} vastu:",
+  "report.thanks.title": "Ei taha seda näha?",
+  "report.thanks.title_actionable": "Täname teavitamise eest, uurime seda.",
+  "report.unfollow": "Lõpeta @{name} jälgimine",
+  "report.unfollow_explanation": "Te jälgite seda kontot. Et mitte näha tema postitusi oma kodu ajajoonel, lõpetage tema jälgimine.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postitus} other {{count} postitust}} listatud",
+  "report_notification.categories.other": "Muu",
+  "report_notification.categories.spam": "Rämpspost",
+  "report_notification.categories.violation": "Reeglite rikkumine",
+  "report_notification.open": "Ava teavitus",
   "search.placeholder": "Otsi",
+  "search.search_or_paste": "Otsi või kleebi URL",
   "search_popout.search_format": "Täiustatud otsiformaat",
-  "search_popout.tips.full_text": "Lihtne tekst toob esile staatused mida olete kirjutanud, lisanud lemmikuks, upitanud või olete seal mainitud, ning lisaks veel kattuvad kasutajanimed, kuvanimed ja sildid.",
+  "search_popout.tips.full_text": "Lihttekst annab vastuseks postitused, mille oled kirjutanud, lisanud lemmikuks, jaganud või kus on sind mainitud, ning lisaks kokkusobivad kasutajanimed, profiili kuvanimed ja sildid.",
   "search_popout.tips.hashtag": "silt",
-  "search_popout.tips.status": "staatus",
+  "search_popout.tips.status": "postitus",
   "search_popout.tips.text": "Lihtne tekst toob esile kattuvad kuvanimed, kasutajanimed ning sildid",
   "search_popout.tips.user": "kasutaja",
   "search_results.accounts": "Inimesed",
+  "search_results.all": "Kõik",
   "search_results.hashtags": "Sildid",
-  "search_results.statuses": "Tuudid",
-  "search_results.statuses_fts_disabled": "Tuutsude otsimine nende sisu järgi ei ole sellel Mastodoni serveril sisse lülitatud.",
+  "search_results.nothing_found": "Otsisõnadele vastavat sisu ei leitud",
+  "search_results.statuses": "Postitused",
+  "search_results.statuses_fts_disabled": "Postituste otsimine nende sisu järgi ei ole sellel Mastodoni serveril sisse lülitatud.",
+  "search_results.title": "{q} otsing",
   "search_results.total": "{count, number} {count, plural, one {tulemus} other {tulemust}}",
-  "status.admin_account": "Ava moderaatoriliides kasutajale @{name}",
-  "status.admin_status": "Ava see staatus moderaatoriliites",
+  "server_banner.about_active_users": "Inimesed, kes kasutavad seda serverit viimase 30 päeva jooksul (kuu aktiivsed kasutajad)",
+  "server_banner.active_users": "aktiivsed kasutajad",
+  "server_banner.administered_by": "Administraator:",
+  "server_banner.introduction": "{domain} on osa detsentraliseeritud sotsiaalvõrgustikust, mida võimaldab {mastodon}.",
+  "server_banner.learn_more": "Vaata täpsemalt",
+  "server_banner.server_stats": "Serveri statistika:",
+  "sign_in_banner.create_account": "Loo konto",
+  "sign_in_banner.sign_in": "Logi sisse",
+  "sign_in_banner.text": "Logi sisse, et jälgida profiile või silte, märkida lemmikuks, jagada ja vastata postitustele või kasutada suhtlemiseks kontot teises serveris.",
+  "status.admin_account": "Ava @{name} moderaatorivaates",
+  "status.admin_status": "Ava postitus moderaatorivaates",
   "status.block": "Blokeeri @{name}",
   "status.bookmark": "Järjehoidja",
-  "status.cancel_reblog_private": "Äraupita",
-  "status.cannot_reblog": "Seda postitust ei saa upitada",
-  "status.copy": "Kopeeri link staatusesse",
+  "status.cancel_reblog_private": "Lõpeta jagamine",
+  "status.cannot_reblog": "Seda postitust ei saa jagada",
+  "status.copy": "Kopeeri postituse link",
   "status.delete": "Kustuta",
   "status.detailed_status": "Detailne vestluskuva",
-  "status.direct": "Otsesõnum @{name}",
-  "status.embed": "Sängita",
+  "status.direct": "Saada otsesõnum @{name}'ile",
+  "status.edit": "Muuda",
+  "status.edited": "{date} muudetud",
+  "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
+  "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
+  "status.filter": "Filtreeri seda postitust",
   "status.filtered": "Filtreeritud",
-  "status.load_more": "Lae veel",
+  "status.hide": "Peida postitus",
+  "status.history.created": "{name} lõi {date}",
+  "status.history.edited": "{name} muutis {date}",
+  "status.load_more": "Lae rohkem",
   "status.media_hidden": "Meedia peidetud",
-  "status.mention": "Mainimine @{name}",
+  "status.mention": "Maini @{name}'i",
   "status.more": "Veel",
   "status.mute": "Vaigista @{name}",
   "status.mute_conversation": "Vaigista vestlus",
-  "status.open": "Laienda see staatus",
+  "status.open": "Laienda postitus",
   "status.pin": "Kinnita profiilile",
-  "status.pinned": "Kinnitatud tuut",
+  "status.pinned": "Kinnitatud postitus",
   "status.read_more": "Loe veel",
-  "status.reblog": "Upita",
-  "status.reblog_private": "Upita algsele publikule",
-  "status.reblogged_by": "{name} upitatud",
-  "status.reblogs.empty": "Keegi pole seda tuuti veel upitanud. Kui keegi upitab, näed seda siin.",
+  "status.reblog": "Jaga",
+  "status.reblog_private": "Jaga algse nähtavusega",
+  "status.reblogged_by": "{name} jagas",
+  "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
+  "status.replied_to": "Vastas kasutajale {name}",
   "status.reply": "Vasta",
   "status.replyAll": "Vasta lõimele",
-  "status.report": "Raport @{name}",
+  "status.report": "Raporteeri @{name}",
   "status.sensitive_warning": "Tundlik sisu",
   "status.share": "Jaga",
+  "status.show_filter_reason": "Näita ikka",
   "status.show_less": "Näita vähem",
   "status.show_less_all": "Näita vähem kõigile",
   "status.show_more": "Näita veel",
   "status.show_more_all": "Näita enam kõigile",
-  "status.show_thread": "Kuva lõim",
+  "status.show_original": "Näita algset",
+  "status.translate": "Tõlgi",
+  "status.translated_from_with": "Tõlgitud {lang} keelest kasutades teenust {provider}",
   "status.uncached_media_warning": "Pole saadaval",
   "status.unmute_conversation": "Ära vaigista vestlust",
-  "status.unpin": "Kinnita profiililt lahti",
+  "status.unpin": "Eemalda profiilile kinnitus",
+  "subscribed_languages.lead": "Pärast muudatust näed koduvaates ja loetelude ajajoontel postitusi valitud keeltes. Ära vali midagi, kui tahad näha postitusi kõikides keeltes.",
+  "subscribed_languages.save": "Salvesta muudatused",
+  "subscribed_languages.target": "Muutke tellitud keeli {target} jaoks",
   "suggestions.dismiss": "Eira soovitust",
   "suggestions.header": "Teid võib huvitada…",
   "tabs_bar.federated_timeline": "Föderatiivne",
   "tabs_bar.home": "Kodu",
   "tabs_bar.local_timeline": "Kohalik",
   "tabs_bar.notifications": "Teated",
-  "tabs_bar.search": "Otsi",
-  "time_remaining.days": "{number, plural, one {# päev} other {# päeva}} left",
-  "time_remaining.hours": "{number, plural, one {# tund} other {# tundi}} left",
-  "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} left",
+  "time_remaining.days": "{number, plural, one {# päev} other {# päeva}} jäänud",
+  "time_remaining.hours": "{number, plural, one {# tund} other {# tundi}} jäänud",
+  "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} jäänud",
   "time_remaining.moments": "Hetked jäänud",
-  "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekundit}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Praegu populaarne",
-  "ui.beforeunload": "Teie mustand läheb kaotsi, kui lahkute Mastodonist.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekundit}} jäänud",
+  "timeline_hint.remote_resource_not_displayed": "{resource} teistest serveritest ei kuvata.",
+  "timeline_hint.resources.followers": "Jälgijaid",
+  "timeline_hint.resources.follows": "Jälgimisi",
+  "timeline_hint.resources.statuses": "Eelnevaid postitusi",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} inimene} other {{counter} inimest}} viimase {days, plural, one {päeva} other {{days} päeva}} jooksul",
+  "trends.trending_now": "Hetkel populaarne",
+  "ui.beforeunload": "Mustand läheb kaotsi, kui lahkud Mastodonist.",
+  "units.short.billion": "{count} mld",
+  "units.short.million": "{count} mln",
+  "units.short.thousand": "{count} tuh",
   "upload_area.title": "Lohista & aseta üleslaadimiseks",
   "upload_button.label": "Lisa meedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Faili üleslaadimise limiit ületatud.",
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
-  "upload_form.edit": "Redigeeri",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.description_missing": "Kirjeldus puudub",
+  "upload_form.edit": "Muuda",
+  "upload_form.thumbnail": "Muuda pisipilti",
   "upload_form.undo": "Kustuta",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
   "upload_modal.analyzing_picture": "Analüüsime pilti…",
   "upload_modal.apply": "Rakenda",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
+  "upload_modal.applying": "Rakendan…",
+  "upload_modal.choose_image": "Vali pilt",
   "upload_modal.description_placeholder": "Kiire pruun rebane hüppab üle laisa koera",
   "upload_modal.detect_text": "Tuvasta teksti pildilt",
   "upload_modal.edit_media": "Muuda meediat",
   "upload_modal.hint": "Vajuta või tõmba ringi eelvaatel, et valida fookuspunkti, mis on alati nähtaval kõikidel eelvaadetel.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preparing_ocr": "Valmistan masinlugemist…",
   "upload_modal.preview_label": "Eelvaade ({ratio})",
   "upload_progress.label": "Laeb üles....",
+  "upload_progress.processing": "Töötlen…",
   "video.close": "Sulge video",
   "video.download": "Faili allalaadimine",
   "video.exit_fullscreen": "Välju täisekraanist",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index b457b7d45..0bbd9f9c7 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderatutako zerbitzariak",
+  "about.contact": "Kontaktua:",
+  "about.disclaimer": "Mastodon software libre eta kode irekikoa da, eta Mastodon gGmbH-ren marka erregistratua.",
+  "about.domain_blocks.no_reason_available": "Arrazoia ez dago eskuragarri",
+  "about.domain_blocks.preamble": "Mastodonek orokorrean aukera ematen dizu fedibertsoko beste zerbitzarietako erabiltzaileen edukia ikusi eta haiekin komunikatzeko. Zerbitzari zehatz honi ezarritako salbuespenak hauek dira.",
+  "about.domain_blocks.silenced.explanation": "Orokorrean ez duzu zerbitzari honetako profil eta edukirik ikusiko. Profilak jarraitzen badituzu edo edukia esplizituki bilatzen baduzu bai.",
+  "about.domain_blocks.silenced.title": "Mugatua",
+  "about.domain_blocks.suspended.explanation": "Ez da zerbitzari honetako daturik prozesatuko, gordeko, edo partekatuko, zerbitzari honetako erabiltzaileekin komunikatzea ezinezkoa eginez.",
+  "about.domain_blocks.suspended.title": "Kanporatua",
+  "about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
+  "about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
+  "about.rules": "Zerbitzariaren arauak",
   "account.account_note_header": "Oharra",
   "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
   "account.badges.bot": "Bot-a",
@@ -7,64 +19,86 @@
   "account.block_domain": "Ezkutatu {domain} domeinuko guztia",
   "account.blocked": "Blokeatuta",
   "account.browse_more_on_origin_server": "Arakatu gehiago jatorrizko profilean",
-  "account.cancel_follow_request": "Ezeztatu jarraitzeko eskaria",
+  "account.cancel_follow_request": "Baztertu jarraitzeko eskaera",
   "account.direct": "Mezu zuzena @{name}(r)i",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzailearen bidalketetan",
   "account.domain_blocked": "Ezkutatutako domeinua",
   "account.edit_profile": "Aldatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak bidalketak egitean",
   "account.endorse": "Nabarmendu profilean",
+  "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
+  "account.featured_tags.last_status_never": "Bidalketarik ez",
+  "account.featured_tags.title": "{name} erabiltzailearen nabarmendutako traolak",
   "account.follow": "Jarraitu",
   "account.followers": "Jarraitzaileak",
   "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
   "account.followers_counter": "{count, plural, one {Jarraitzaile {counter}} other {{counter} jarraitzaile}}",
+  "account.following": "Jarraitzen",
   "account.following_counter": "{count, plural, one {{counter} jarraitzen} other {{counter} jarraitzen}}",
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
   "account.follows_you": "Jarraitzen dizu",
+  "account.go_to_profile": "Joan profilera",
   "account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak",
-  "account.joined": "{date}(e)an elkartua",
-  "account.last_status": "Azkenekoz aktiboa",
+  "account.joined_short": "Elkartuta",
+  "account.languages": "Aldatu harpidetutako hizkuntzak",
   "account.link_verified_on": "Esteka honen jabetzaren egiaztaketa data: {date}",
   "account.locked_info": "Kontu honen pribatutasun egoera blokeatuta gisa ezarri da. Jabeak eskuz erabakitzen du nork jarraitu diezaioken.",
   "account.media": "Multimedia",
   "account.mention": "Aipatu @{name}",
-  "account.moved_to": "{name} hona migratu da:",
+  "account.moved_to": "{name} erabiltzaileak adierazi du bere kontu berria hau dela:",
   "account.mute": "Mututu @{name}",
   "account.mute_notifications": "Mututu @{name}(r)en jakinarazpenak",
   "account.muted": "Mutututa",
-  "account.never_active": "Inoiz ez",
+  "account.open_original_page": "Ireki jatorrizko orria",
   "account.posts": "Bidalketa",
   "account.posts_with_replies": "Bidalketak eta erantzunak",
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name}(e)ren profila elkarbanatu",
   "account.show_reblogs": "Erakutsi @{name}(r)en bultzadak",
   "account.statuses_counter": "{count, plural, one {Bidalketa {counter}} other {{counter} bidalketa}}",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
+  "account.unblock_short": "Desblokeatu",
   "account.unendorse": "Ez nabarmendu profilean",
   "account.unfollow": "Utzi jarraitzeari",
   "account.unmute": "Desmututu @{name}",
   "account.unmute_notifications": "Desmututu @{name}(r)en jakinarazpenak",
+  "account.unmute_short": "Desmututu",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Erabiltzaile atxikitze-tasa izena eman ondorengo eguneko",
+  "admin.dashboard.monthly_retention": "Erabiltzaile atxikitze-tasa izena eman ondorengo hilabeteko",
+  "admin.dashboard.retention.average": "Batezbestekoa",
+  "admin.dashboard.retention.cohort": "Izen emate hilean",
+  "admin.dashboard.retention.cohort_size": "Erabiltzaile berriak",
   "alert.rate_limited.message": "Saiatu {retry_time, time, medium} barru.",
   "alert.rate_limited.title": "Abiadura mugatua",
   "alert.unexpected.message": "Ustekabeko errore bat gertatu da.",
   "alert.unexpected.title": "Ene!",
   "announcement.announcement": "Iragarpena",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(prozesatu gabe)",
+  "audio.hide": "Ezkutatu audioa",
   "autosuggest_hashtag.per_week": "{count} asteko",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
-  "bundle_column_error.body": "Zerbait okerra gertatu da osagai hau kargatzean.",
+  "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
+  "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
+  "bundle_column_error.error.title": "O ez!",
+  "bundle_column_error.network.body": "Errore bat gertatu da orri hau kargatzen saiatzean. Arrazoia Interneteko konexioaren edo zerbitzari honen aldi baterako arazoa izan daiteke.",
+  "bundle_column_error.network.title": "Sareko errorea",
   "bundle_column_error.retry": "Saiatu berriro",
-  "bundle_column_error.title": "Sareko errorea",
+  "bundle_column_error.return": "Itzuli hasierako orrira",
+  "bundle_column_error.routing.body": "Eskatutako orria ezin izan da aurkitu. Ziur zaude helbide-barrako URLa zuzena dela?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Itxi",
   "bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.",
   "bundle_modal_error.retry": "Saiatu berriro",
+  "closed_registrations.other_server_instructions": "Mastodon deszentralizatua denez, beste kontu bat sortu dezakezu beste zerbitzari batean eta honekin komunikatu.",
+  "closed_registrations_modal.description": "Une honetan ezin da konturik sortu {domain} zerbitzarian, baina kontuan izan Mastodon erabiltzeko ez duzula zertan konturik izan zehazki {domain} zerbitzarian.",
+  "closed_registrations_modal.find_another_server": "Aurkitu beste zerbitzari bat",
+  "closed_registrations_modal.preamble": "Mastodon deszentralizatua da, ondorioz kontua edonon sortuta ere zerbitzari honetako jendea jarraitu eta haiekin komunikatzeko aukera izango duzu. Zure zerbitzaria ere sortu dezakezu!",
+  "closed_registrations_modal.title": "Mastodonen kontua sortzea",
+  "column.about": "Honi buruz",
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Laster-markak",
   "column.community": "Denbora-lerro lokala",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Lokala soilik",
   "community.column_settings.media_only": "Multimedia besterik ez",
   "community.column_settings.remote_only": "Urrunekoa soilik",
-  "compose_form.direct_message_warning": "Bidalketa hau aipatutako erabiltzaileei besterik ez zaie bidaliko.",
+  "compose.language.change": "Aldatu hizkuntza",
+  "compose.language.search": "Bilatu hizkuntzak...",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
+  "compose_form.encryption_warning": "Mastodoneko bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
   "compose_form.hashtag_warning": "Bidalketa hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan bidalketa publikoak besterik ez dira agertzen.",
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Kendu aukera hau",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Argitaratu",
+  "compose_form.publish_form": "Argitaratu",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Gorde aldaketak",
   "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
   "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
   "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
   "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
+  "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
+  "confirmations.cancel_follow_request.message": "Ziur zaude {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
   "confirmations.delete.confirm": "Ezabatu",
   "confirmations.delete.message": "Ziur bidalketa hau ezabatu nahi duzula?",
   "confirmations.delete_list.confirm": "Ezabatu",
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Baztertu",
+  "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
   "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
   "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
   "confirmations.logout.confirm": "Amaitu saioa",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
   "conversation.with": "Hauekin: {names}",
+  "copypaste.copied": "Kopiatuta",
+  "copypaste.copy": "Kopiatu",
   "directory.federated": "Fedibertso ezagunekoak",
   "directory.local": "{domain} domeinukoak soilik",
   "directory.new_arrivals": "Iritsi berriak",
   "directory.recently_active": "Duela gutxi aktibo",
+  "disabled_account_banner.account_settings": "Kontuaren ezarpenak",
+  "disabled_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan.",
+  "dismissable_banner.community_timeline": "Hauek dira {domain} zerbitzarian ostatatutako kontuen bidalketa publiko berrienak.",
+  "dismissable_banner.dismiss": "Baztertu",
+  "dismissable_banner.explore_links": "Albiste hauei buruz hitz egiten ari da jendea orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
+  "dismissable_banner.explore_statuses": "Zerbitzari honetako eta sare deszentralizatuko besteetako bidalketa hauek daude bogan zerbitzari honetan orain.",
+  "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
+  "dismissable_banner.public_timeline": "Hauek dira zerbitzari honetako eta zerbitzari honek ezagutzen dituen sare deszentralizatuko beste zerbitzarietako jendearen bidalketa publiko berrienak.",
   "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
   "embed.preview": "Hau da izango duen itxura:",
   "emoji_button.activity": "Jarduera",
+  "emoji_button.clear": "Garbitu",
   "emoji_button.custom": "Pertsonalizatua",
   "emoji_button.flags": "Banderak",
   "emoji_button.food": "Janari eta edaria",
@@ -165,6 +216,7 @@
   "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
   "empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
   "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.",
+  "empty_column.explore_statuses": "Ez dago joerarik une honetan. Begiratu beranduago!",
   "empty_column.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.",
   "empty_column.favourites": "Ez du inork gogokoetara gehitu bidalketa hau oraindik. Inork egiten duenean, hemen agertuko dira.",
   "empty_column.follow_recommendations": "Dirudienez ezin izan da zuretzako proposamenik sortu. Bilaketa erabili dezakezu ezagutzen duzun jendea aurkitzeko edo traolen joerak arakatu.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Saiatu desgaitu eta orria berritzen. Horrek ez badu laguntzen, agian Mastodon erabiltzeko aukera duzu oraindik ere beste nabigatzaile bat edo aplikazio natibo bat erabilita.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiatu irteera arbelera",
   "errors.unexpected_crash.report_issue": "Eman arazoaren berri",
+  "explore.search_results": "Bilaketaren emaitzak",
+  "explore.suggested_follows": "Zuretzako",
+  "explore.title": "Arakatu",
+  "explore.trending_links": "Berriak",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Iragazki-kategoria hau ez zaio aplikatzen bidalketa honetara sartzeko erabili duzun testuinguruari. Bidalketa testuinguru horretan ere iragaztea nahi baduzu, iragazkia editatu beharko duzu.",
+  "filter_modal.added.context_mismatch_title": "Testuingurua ez dator bat!",
+  "filter_modal.added.expired_explanation": "Iragazki kategoria hau iraungi da, eragina izan dezan bere iraungitze-data aldatu beharko duzu.",
+  "filter_modal.added.expired_title": "Iraungitako iragazkia!",
+  "filter_modal.added.review_and_configure": "Iragazki kategoria hau berrikusi eta gehiago konfiguratzeko: {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Iragazkiaren ezarpenak",
+  "filter_modal.added.settings_link": "ezarpenen orria",
+  "filter_modal.added.short_explanation": "Bidalketa hau ondorengo iragazki kategoriara gehitu da: {title}.",
+  "filter_modal.added.title": "Iragazkia gehituta!",
+  "filter_modal.select_filter.context_mismatch": "ez du eraginik testuinguru honetan",
+  "filter_modal.select_filter.expired": "iraungitua",
+  "filter_modal.select_filter.prompt_new": "Kategoria berria: {name}",
+  "filter_modal.select_filter.search": "Bilatu edo sortu",
+  "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
+  "filter_modal.select_filter.title": "Iragazi bidalketa hau",
+  "filter_modal.title.status": "Iragazi bidalketa bat",
   "follow_recommendations.done": "Egina",
   "follow_recommendations.heading": "Jarraitu jendea beren bidalketak ikusteko! Hemen dituzu iradokizun batzuk.",
   "follow_recommendations.lead": "Jarraitzen duzun jendearen bidalketak ordena kronologikoan agertuko dira zure hasierako jarioan. Ez izan akatsak egiteko beldurrik, jendea jarraitzeari uztea erraza da!",
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
   "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskariak agian eskuz begiratu nahiko dituzula.",
+  "footer.about": "Honi buruz",
+  "footer.directory": "Profil-direktorioa",
+  "footer.get_app": "Eskuratu aplikazioa",
+  "footer.invite": "Gonbidatu jendea",
+  "footer.keyboard_shortcuts": "Lasterbideak",
+  "footer.privacy_policy": "Pribatutasun politika",
+  "footer.source_code": "Ikusi iturburu kodea",
   "generic.saved": "Gordea",
-  "getting_started.developers": "Garatzaileak",
-  "getting_started.directory": "Profil-direktorioa",
-  "getting_started.documentation": "Dokumentazioa",
   "getting_started.heading": "Menua",
-  "getting_started.invite": "Gonbidatu jendea",
-  "getting_started.open_source_notice": "Mastodon software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.",
-  "getting_started.security": "Segurtasuna",
-  "getting_started.terms": "Erabilera baldintzak",
   "hashtag.column_header.tag_mode.all": "eta {osagarria}",
   "hashtag.column_header.tag_mode.any": "edo {osagarria}",
   "hashtag.column_header.tag_mode.none": "gabe {osagarria}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Hautako edozein",
   "hashtag.column_settings.tag_mode.none": "Hauetako bat ere ez",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Jarraitu traola",
+  "hashtag.unfollow": "Utzi traola jarraitzeari",
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
   "home.show_announcements": "Erakutsi iragarpenak",
+  "interaction_modal.description.favourite": "Mastodon kontu batekin bidalketa hau gogoko egin dezakezu, egileari eskertzeko eta gerorako gordetzeko.",
+  "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.",
+  "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.",
+  "interaction_modal.description.reply": "Mastodon kontu batekin bidalketa honi erantzun diezaiokezu.",
+  "interaction_modal.on_another_server": "Beste zerbitzari batean",
+  "interaction_modal.on_this_server": "Zerbitzari honetan",
+  "interaction_modal.other_server_instructions": "Kopiatu eta itsatsi URL hau zure Mastodon aplikazio gogokoenaren edo zure Mastodon zerbitzariaren web interfazeko bilaketa eremuan.",
+  "interaction_modal.preamble": "Mastodon deszentralizatua denez, zerbitzari honetan konturik ez badaukazu, beste Mastodon zerbitzari batean edo bateragarria den plataforma batean ostatatutako kontua erabil dezakezu.",
+  "interaction_modal.title.favourite": "Egin gogoko {name}(r)en bidalketa",
+  "interaction_modal.title.follow": "Jarraitu {name}",
+  "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa",
+  "interaction_modal.title.reply": "Erantzun {name}(r)en bidalketari",
   "intervals.full.days": "{number, plural, one {egun #} other {# egun}}",
   "intervals.full.hours": "{number, plural, one {ordu #} other {# ordu}}",
   "intervals.full.minutes": "{number, plural, one {minutu #} other {# minutu}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Zabaldu irudia ikusteko kaxa",
   "lightbox.next": "Hurrengoa",
   "lightbox.previous": "Aurrekoa",
+  "limited_account_hint.action": "Erakutsi profila hala ere",
+  "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
   "lists.account.add": "Gehitu zerrendara",
   "lists.account.remove": "Kendu zerrendatik",
   "lists.delete": "Ezabatu zerrenda",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "missing_indicator.label": "Ez aurkitua",
   "missing_indicator.sublabel": "Baliabide hau ezin izan da aurkitu",
+  "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
   "mute_modal.duration": "Iraupena",
   "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
   "mute_modal.indefinite": "Zehaztu gabe",
-  "navigation_bar.apps": "Mugikorrerako aplikazioak",
+  "navigation_bar.about": "Honi buruz",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.bookmarks": "Laster-markak",
   "navigation_bar.community_timeline": "Denbora-lerro lokala",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
   "navigation_bar.edit_profile": "Aldatu profila",
+  "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
   "navigation_bar.follow_requests": "Jarraitzeko eskariak",
   "navigation_bar.follows_and_followers": "Jarraitutakoak eta jarraitzaileak",
-  "navigation_bar.info": "Zerbitzari honi buruz",
-  "navigation_bar.keyboard_shortcuts": "Laster-teklak",
   "navigation_bar.lists": "Zerrendak",
   "navigation_bar.logout": "Amaitu saioa",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Finkatutako bidalketak",
   "navigation_bar.preferences": "Hobespenak",
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
+  "navigation_bar.search": "Bilatu",
   "navigation_bar.security": "Segurtasuna",
+  "not_signed_in_indicator.not_signed_in": "Baliabide honetara sarbidea izateko saioa hasi behar duzu.",
+  "notification.admin.report": "{name} erabiltzaileak {target} salatu du",
+  "notification.admin.sign_up": "{name} erabiltzailea erregistratu da",
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
   "notification.follow": "{name}(e)k jarraitzen zaitu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
@@ -306,13 +400,16 @@
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
+  "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
+  "notifications.column_settings.admin.report": "Txosten berriak:",
+  "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
   "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak",
   "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
-  "notifications.column_settings.filter_bar.show": "Erakutsi",
+  "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Erakutsi zutabean",
   "notifications.column_settings.sound": "Jo soinua",
   "notifications.column_settings.status": "Bidalketa berriak:",
-  "notifications.column_settings.unread_markers.category": "Irakurri gabeko jakinarazpenen markatzaileak",
+  "notifications.column_settings.unread_notifications.category": "Irakurri gabeko jakinarazpenak",
+  "notifications.column_settings.unread_notifications.highlight": "Nabarmendu irakurri gabeko jakinarazpenak",
+  "notifications.column_settings.update": "Edizioak:",
   "notifications.filter.all": "Denak",
   "notifications.filter.boosts": "Bultzadak",
   "notifications.filter.favourites": "Gogokoak",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {boto #} other {# boto}}",
   "poll.vote": "Bozkatu",
   "poll.voted": "Erantzun honi eman diozu botoa",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {boto #} other {# boto}}",
   "poll_button.add_poll": "Gehitu inkesta bat",
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
   "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Zuzena",
+  "privacy.direct.short": "Aipatutako jendea soilik",
   "privacy.private.long": "Bidali jarraitzaileei besterik ez",
   "privacy.private.short": "Jarraitzaileak soilik",
-  "privacy.public.long": "Bistaratu denbora-lerro publikoetan",
+  "privacy.public.long": "Guztientzat ikusgai",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
   "privacy.unlisted.short": "Zerrendatu gabea",
+  "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
+  "privacy_policy.title": "Pribatutasun politika",
   "refresh": "Berritu",
   "regeneration_indicator.label": "Kargatzen…",
   "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
   "relative_time.days": "{number}e",
+  "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}",
+  "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}",
+  "relative_time.full.just_now": "oraintxe",
+  "relative_time.full.minutes": "Duela {number, plural, one {minutu #} other {# minutu}}",
+  "relative_time.full.seconds": "Duela {number, plural, one {segundo #} other {# segundo}}",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "orain",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "gaur",
   "reply_indicator.cancel": "Utzi",
+  "report.block": "Blokeatu",
+  "report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
+  "report.categories.other": "Bestelakoak",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Edukiak zerbitzariko arau bat edo gehiago urratzen ditu",
+  "report.category.subtitle": "Aukeratu egokiena",
+  "report.category.title": "Kontaiguzu zer gertatzen den {type} honekin",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "bidalketa",
+  "report.close": "Egina",
+  "report.comment.title": "Beste zerbait jakin beharko genuke?",
   "report.forward": "Birbidali hona: {target}",
   "report.forward_hint": "Kontu hau beste zerbitzari batekoa da. Bidali txostenaren kopia anonimo hara ere?",
-  "report.hint": "Txostena zure zerbitzariaren moderatzaileei bidaliko zaie. Kontu hau zergatik salatzen duzun behean azaldu dezakezu:",
+  "report.mute": "Mututu",
+  "report.mute_explanation": "Ez dituzu bere bidalketak ikusiko. Zu jarraitu eta zure bidalketak ikusteko aukera izango dute eta ezingo dute jakin mututu dituzula.",
+  "report.next": "Hurrengoa",
   "report.placeholder": "Iruzkin gehigarriak",
+  "report.reasons.dislike": "Ez dut gustukoa",
+  "report.reasons.dislike_description": "Ikusi nahi ez dudan zerbait da",
+  "report.reasons.other": "Beste zerbait da",
+  "report.reasons.other_description": "Arazoa ezin da beste kategorietan sailkatu",
+  "report.reasons.spam": "Spama da",
+  "report.reasons.spam_description": "Esteka maltzurrak, gezurrezko elkarrekintzak edo erantzun errepikakorrak",
+  "report.reasons.violation": "Zerbitzariaren arauak hausten ditu",
+  "report.reasons.violation_description": "Arau zehatzak urratzen dituela badakizu",
+  "report.rules.subtitle": "Hautatu dagozkion guztiak",
+  "report.rules.title": "Ze arau hautsi ditu?",
+  "report.statuses.subtitle": "Hautatu dagozkion guztiak",
+  "report.statuses.title": "Salaketa hau babesten duen bidalketarik badago?",
   "report.submit": "Bidali",
   "report.target": "{target} salatzen",
+  "report.thanks.take_action": "Hemen dituzu Mastodonen ikusiko duzuna kontrolatzeko aukerak:",
+  "report.thanks.take_action_actionable": "Hau berrikusten dugun bitartean, @{name} erabiltzailearen aurkako neurriak hartu ditzakezu:",
+  "report.thanks.title": "Ez duzu hau ikusi nahi?",
+  "report.thanks.title_actionable": "Mila esker salaketagatik, berrikusiko dugu.",
+  "report.unfollow": "@{name} jarraitzeari utzi",
+  "report.unfollow_explanation": "Kontu hau jarraitzen ari zara. Zure denbora-lerro nagusian bere bidalketak ez ikusteko, jarraitzeari utzi.",
+  "report_notification.attached_statuses": "{count, plural, one {Bidalketa {count}} other {{count} bidalketa}} erantsita",
+  "report_notification.categories.other": "Bestelakoak",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Arau haustea",
+  "report_notification.open": "Ireki salaketa",
   "search.placeholder": "Bilatu",
+  "search.search_or_paste": "Bilatu edo itsatsi URLa",
   "search_popout.search_format": "Bilaketa aurreratuaren formatua",
   "search_popout.tips.full_text": "Testu hutsarekin zuk idatzitako bidalketak, gogokoak, bultzadak edo aipamenak aurkitu ditzakezu, bat datozen erabiltzaile-izenak, pantaila-izenak, eta traolak.",
   "search_popout.tips.hashtag": "traola",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Testu hutsak pantaila-izenak, erabiltzaile-izenak eta traolak bilatzen ditu",
   "search_popout.tips.user": "erabiltzailea",
   "search_results.accounts": "Jendea",
+  "search_results.all": "Guztiak",
   "search_results.hashtags": "Traolak",
+  "search_results.nothing_found": "Ez da emaitzarik aurkitu bilaketa-termino horientzat",
   "search_results.statuses": "Bidalketak",
   "search_results.statuses_fts_disabled": "Mastodon zerbitzari honek ez du bidalketen edukiaren bilaketa gaitu.",
+  "search_results.title": "Bilatu {q}",
   "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitza}}",
+  "server_banner.about_active_users": "Azken 30 egunetan zerbitzari hau erabili duen jendea (hilabeteko erabiltzaile aktiboak)",
+  "server_banner.active_users": "erabiltzaile aktibo",
+  "server_banner.administered_by": "Administratzailea(k):",
+  "server_banner.introduction": "{domain} zerbitzaria {mastodon} erabiltzen duen sare sozial deszentralizatuko parte da.",
+  "server_banner.learn_more": "Ikasi gehiago",
+  "server_banner.server_stats": "Zerbitzariaren estatistikak:",
+  "sign_in_banner.create_account": "Sortu kontua",
+  "sign_in_banner.sign_in": "Hasi saioa",
+  "sign_in_banner.text": "Hasi saioa beste zerbitzari bateko zure kontuarekin profilak edo traolak jarraitu, bidalketei erantzun, gogoko egin edo partekatzeko.",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_status": "Ireki bidalketa hau moderazio interfazean",
   "status.block": "Blokeatu @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Ezabatu",
   "status.detailed_status": "Elkarrizketaren ikuspegi xehetsua",
   "status.direct": "Mezu zuzena @{name}(r)i",
+  "status.edit": "Editatu",
+  "status.edited": "Editatua {date}",
+  "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
+  "status.filter": "Iragazi bidalketa hau",
   "status.filtered": "Iragazita",
+  "status.hide": "Ezkutatu bidalketa hau",
+  "status.history.created": "{name} erabiltzaileak sortua {date}",
+  "status.history.edited": "{name} erabiltzaileak editatua {date}",
   "status.load_more": "Kargatu gehiago",
   "status.media_hidden": "Multimedia ezkutatua",
   "status.mention": "Aipatu @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.remove_bookmark": "Kendu laster-marka",
+  "status.replied_to": "{name} erabiltzaileari erantzuna",
   "status.reply": "Erantzun",
   "status.replyAll": "Erantzun harian",
   "status.report": "Salatu @{name}",
   "status.sensitive_warning": "Kontuz: Eduki hunkigarria",
   "status.share": "Partekatu",
+  "status.show_filter_reason": "Erakutsi hala ere",
   "status.show_less": "Erakutsi gutxiago",
   "status.show_less_all": "Erakutsi denetarik gutxiago",
   "status.show_more": "Erakutsi gehiago",
   "status.show_more_all": "Erakutsi denetarik gehiago",
-  "status.show_thread": "Erakutsi haria",
+  "status.show_original": "Erakutsi jatorrizkoa",
+  "status.translate": "Itzuli",
+  "status.translated_from_with": "Itzuli {lang}(e)tik {provider} erabiliz",
   "status.uncached_media_warning": "Ez eskuragarri",
   "status.unmute_conversation": "Desmututu elkarrizketa",
   "status.unpin": "Desfinkatu profiletik",
+  "subscribed_languages.lead": "Hautatutako hizkuntzetako bidalketak soilik agertuko dira zure denbora-lerroetan aldaketaren ondoren. Ez baduzu bat ere aukeratzen hizkuntza guztietako bidalketak jasoko dituzu.",
+  "subscribed_languages.save": "Gorde aldaketak",
+  "subscribed_languages.target": "Aldatu {target}(e)n harpidetutako hizkuntzak",
   "suggestions.dismiss": "Errefusatu proposamena",
   "suggestions.header": "Hau interesatu dakizuke…",
   "tabs_bar.federated_timeline": "Federatua",
   "tabs_bar.home": "Hasiera",
   "tabs_bar.local_timeline": "Lokala",
   "tabs_bar.notifications": "Jakinarazpenak",
-  "tabs_bar.search": "Bilatu",
   "time_remaining.days": "{number, plural, one {egun #} other {# egun}} amaitzeko",
   "time_remaining.hours": "{number, plural, one {ordu #} other {# ordu}} amaitzeko",
   "time_remaining.minutes": "{number, plural, one {minutu #} other {# minutu}} amaitzeko",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Jarraitzaileak",
   "timeline_hint.resources.follows": "Jarraitzen",
   "timeline_hint.resources.statuses": "Bidalketa zaharragoak",
-  "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} hizketan",
+  "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} azken {days, plural, one {egunean} other {{days} egunetan}}",
   "trends.trending_now": "Joera orain",
   "ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
   "upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
+  "upload_form.description_missing": "Ez da deskribapenik gehitu",
   "upload_form.edit": "Editatu",
   "upload_form.thumbnail": "Aldatu koadro txikia",
   "upload_form.undo": "Ezabatu",
   "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
   "upload_modal.analyzing_picture": "Irudia aztertzen…",
   "upload_modal.apply": "Aplikatu",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplikatzen…",
   "upload_modal.choose_image": "Aukeratu irudia",
   "upload_modal.description_placeholder": "Vaudeville itxurako filmean yogi ñaño bat jipoitzen dute Quebec-en whiski truk",
   "upload_modal.detect_text": "Antzeman testua iruditik",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "OCR prestatzen…",
   "upload_modal.preview_label": "Aurreikusi ({ratio})",
   "upload_progress.label": "Igotzen...",
+  "upload_progress.processing": "Prozesatzen…",
   "video.close": "Itxi bideoa",
   "video.download": "Deskargatu fitxategia",
   "video.exit_fullscreen": "Irten pantaila osotik",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index c0582da74..589972de2 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,70 +1,104 @@
 {
+  "about.blocks": "کارسازهای نظارت شده",
+  "about.contact": "تماس:",
+  "about.disclaimer": "ماستودون نرم‌افزار آزاد، متن باز و یک شرکت غیر انتفاعی با مسئولیت محدود طبق قوانین آلمان است.",
+  "about.domain_blocks.no_reason_available": "دلیلی موجود نیست",
+  "about.domain_blocks.preamble": "ماستودون عموماً می‌گذارد محتوا را از از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.",
+  "about.domain_blocks.silenced.explanation": "عموماً نمایه‌ها و محتوا از این کارساز را نمی‌بینید، مگر این که به طور خاص دنبالشان گشته یا با پی گیری، داوطلب دیدنشان شوید.",
+  "about.domain_blocks.silenced.title": "محدود",
+  "about.domain_blocks.suspended.explanation": "هیچ داده‌ای از این کارساز پردازش، ذخیره یا مبادله نخواهد شد، که هرگونه برهم‌کنش یا ارتباط با کاربران این کارساز را غیرممکن خواهد کرد.",
+  "about.domain_blocks.suspended.title": "معلق",
+  "about.not_available": "این اطّلاعات روی این کارساز موجود نشده.",
+  "about.powered_by": "رسانهٔ اجتماعی نامتمرکز قدرت گرفته از {mastodon}",
+  "about.rules": "قوانین کارساز",
   "account.account_note_header": "یادداشت",
-  "account.add_or_remove_from_list": "افزودن یا برداشتن از فهرست‌ها",
-  "account.badges.bot": "ربات",
+  "account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها",
+  "account.badges.bot": "روبات",
   "account.badges.group": "گروه",
-  "account.block": "مسدود کردن @{name}",
+  "account.block": "مسدود کردن ‎@{name}",
   "account.block_domain": "مسدود کردن دامنهٔ {domain}",
-  "account.blocked": "مسدود شده",
+  "account.blocked": "مسدود",
   "account.browse_more_on_origin_server": "مرور بیش‌تر روی نمایهٔ اصلی",
-  "account.cancel_follow_request": "لغو درخواست پی‌گیری",
-  "account.direct": "پیام مستقیم به @{name}",
-  "account.disable_notifications": "آگاهی به من هنگام فرستادن‌های @{name} پایان یابد",
+  "account.cancel_follow_request": "رد کردن درخواست پی‌گیری",
+  "account.direct": "پیام مستقیم به ‎@{name}",
+  "account.disable_notifications": "آگاه کردن من هنگام فرسته‌های ‎@{name} را متوقّف کن",
   "account.domain_blocked": "دامنه مسدود شد",
   "account.edit_profile": "ویرایش نمایه",
-  "account.enable_notifications": "هنگام فرسته‌های @{name} مرا آگاه کن",
+  "account.enable_notifications": "هنگام فرسته‌های ‎@{name} مرا آگاه کن",
   "account.endorse": "معرّفی در نمایه",
+  "account.featured_tags.last_status_at": "آخرین فرسته در {date}",
+  "account.featured_tags.last_status_never": "بدون فرسته",
+  "account.featured_tags.title": "برچسب‌های برگزیدهٔ {name}",
   "account.follow": "پی‌گیری",
   "account.followers": "پی‌گیرندگان",
   "account.followers.empty": "هنوز کسی این کاربر را پی‌گیری نمی‌کند.",
   "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}",
+  "account.following": "پی می‌گیرید",
   "account.following_counter": "{count, plural, one {{counter} پی‌گرفته} other {{counter} پی‌گرفته}}",
   "account.follows.empty": "این کاربر هنوز پی‌گیر کسی نیست.",
-  "account.follows_you": "پی‌گیر شماست",
-  "account.hide_reblogs": "نهفتن تقویت‌های @{name}",
-  "account.joined": "پیوسته از {date}",
-  "account.last_status": "آخرین فعّالیت",
+  "account.follows_you": "پی می‌گیردتان",
+  "account.go_to_profile": "رفتن به نمایه",
+  "account.hide_reblogs": "نهفتن تقویت‌های ‎@{name}",
+  "account.joined_short": "پیوسته",
+  "account.languages": "تغییر زبان‌های مشترک شده",
   "account.link_verified_on": "مالکیت این پیوند در {date} بررسی شد",
   "account.locked_info": "این حساب خصوصی است. صاحبش تصمیم می‌گیرد که چه کسی پی‌گیرش باشد.",
   "account.media": "رسانه",
-  "account.mention": "نام‌بردن از @{name}",
-  "account.moved_to": "{name} منتقل شده به:",
-  "account.mute": "خموشاندن @{name}",
-  "account.mute_notifications": "خموشاندن آگاهی‌ها از @{name}",
+  "account.mention": "نام‌بردن از ‎@{name}",
+  "account.moved_to": "{name} نشان داده که حساب جدیدش این است:",
+  "account.mute": "خموشاندن ‎@{name}",
+  "account.mute_notifications": "خموشاندن آگاهی‌های ‎@{name}",
   "account.muted": "خموش",
-  "account.never_active": "هرگز",
+  "account.open_original_page": "گشودن صفحهٔ اصلی",
   "account.posts": "فرسته",
   "account.posts_with_replies": "فرسته‌ها و پاسخ‌ها",
-  "account.report": "گزارش @{name}",
+  "account.report": "گزارش ‎@{name}",
   "account.requested": "منتظر پذیرش است. برای لغو درخواست پی‌گیری کلیک کنید",
-  "account.share": "هم‌رسانی نمایهٔ @{name}",
-  "account.show_reblogs": "نمایش تقویت‌های @{name}",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "هم‌رسانی نمایهٔ ‎@{name}",
+  "account.show_reblogs": "نمایش تقویت‌های ‎@{name}",
   "account.statuses_counter": "{count, plural, one {{counter} فرسته} other {{counter} فرسته}}",
-  "account.unblock": "رفع مسدودیت @{name}",
+  "account.unblock": "رفع مسدودیت ‎@{name}",
   "account.unblock_domain": "رفع مسدودیت دامنهٔ {domain}",
+  "account.unblock_short": "رفع مسدودیت",
   "account.unendorse": "معرّفی نکردن در نمایه",
   "account.unfollow": "ناپی‌گیری",
-  "account.unmute": "ناخموشی @{name}",
-  "account.unmute_notifications": "ناخموشی آگاهی‌ها از @{name}",
+  "account.unmute": "ناخموشی ‎@{name}",
+  "account.unmute_notifications": "ناخموشی آگاهی‌های ‎@{name}",
+  "account.unmute_short": "ناخموشی",
   "account_note.placeholder": "برای افزودن یادداشت کلیک کنید",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "نرخ حفظ کاربر در روز پس از ثبت نام",
+  "admin.dashboard.monthly_retention": "نرخ حفظ کاربر در ماه پس از ثبت نام",
+  "admin.dashboard.retention.average": "میانگین",
+  "admin.dashboard.retention.cohort": "ماه ثبت‌نام",
+  "admin.dashboard.retention.cohort_size": "کاربران جدید",
   "alert.rate_limited.message": "لطفاً پس از {retry_time, time, medium} دوباره بیازمایید.",
   "alert.rate_limited.title": "محدودیت تعداد",
   "alert.unexpected.message": "خطایی غیرمنتظره رخ داد.",
   "alert.unexpected.title": "ای وای!",
   "announcement.announcement": "اعلامیه",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(پردازش نشده)",
+  "audio.hide": "نهفتن صدا",
   "autosuggest_hashtag.per_week": "{count} در هفته",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
-  "bundle_column_error.body": "هنگام بارگزاری این بخش خطایی رخ داد.",
+  "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
+  "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
+  "bundle_column_error.error.title": "وای، نه!",
+  "bundle_column_error.network.body": "هنگام تلاش برای بار کردن این صفحه خطایی رخ داد. ممکن است مشکلی موقّتی در این کارساز یا اینترنتتان باشد.",
+  "bundle_column_error.network.title": "خطای شبکه",
   "bundle_column_error.retry": "تلاش دوباره",
-  "bundle_column_error.title": "خطای شبکه",
+  "bundle_column_error.return": "بازگشت به خانه",
+  "bundle_column_error.routing.body": "صفحهٔ درخواستی پیدا نشد. مطمئنید که نشانی را درست وارد کرده‌اید؟",
+  "bundle_column_error.routing.title": "۴۰۴",
   "bundle_modal_error.close": "بستن",
-  "bundle_modal_error.message": "هنگام بارگزاری این بخش خطایی رخ داد.",
+  "bundle_modal_error.message": "هنگام بار کردن این مولفه، اشتباهی رخ داد.",
   "bundle_modal_error.retry": "تلاش دوباره",
+  "closed_registrations.other_server_instructions": "از آن‌جا که ماستودون نامتمرکز است، می‌توانید حسابی روی کارسازی دیگر ساخته و همچنان با این‌یکی در تعامل باشید.",
+  "closed_registrations_modal.description": "هم‌اکنون امکان ساخت حساب روی {domain} وجود ندارد؛ ولی لطفاً به خاطر داشته باشید که برای استفاده از ماستودون، نیازی به داشتن حساب روی {domain} نیست.",
+  "closed_registrations_modal.find_another_server": "یافتن کارسازی دیگر",
+  "closed_registrations_modal.preamble": "ماستودون نامتمرکز است، پس بدون توجّه یه جایی که حسابتان را ساخته‌اید، خواهید توانست هرکسی روی این کارساز را پی‌گرفته و با او تعامل کنید. حتا می‌توانید خودمیزبانیش کنید!",
+  "closed_registrations_modal.title": "ثبت‌نام روی ماستودون",
+  "column.about": "درباره",
   "column.blocks": "کاربران مسدود شده",
   "column.bookmarks": "نشانک‌ها",
   "column.community": "خط زمانی محلّی",
@@ -74,25 +108,27 @@
   "column.favourites": "پسندیده‌ها",
   "column.follow_requests": "درخواست‌های پی‌گیری",
   "column.home": "خانه",
-  "column.lists": "فهرست‌ها",
+  "column.lists": "سیاهه‌ها",
   "column.mutes": "کاربران خموش",
   "column.notifications": "آگاهی‌ها",
-  "column.pins": "فرسته‌های سنجاق‌شده",
+  "column.pins": "فرسته‌های سنجاق شده",
   "column.public": "خط زمانی همگانی",
   "column_back_button.label": "بازگشت",
   "column_header.hide_settings": "نهفتن تنظیمات",
   "column_header.moveLeft_settings": "جابه‌جایی ستون به چپ",
   "column_header.moveRight_settings": "جابه‌جایی ستون به راست",
-  "column_header.pin": "سنجاق‌کردن",
+  "column_header.pin": "سنجاق کردن",
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "برداشتن سنجاق",
   "column_subheading.settings": "تنظیمات",
   "community.column_settings.local_only": "فقط محلّی",
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
-  "compose_form.direct_message_warning": "این فرسته تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
+  "compose.language.change": "تغییر زبان",
+  "compose.language.search": "جست‌وجوی زبان‌ها…",
   "compose_form.direct_message_warning_learn_more": "بیشتر بدانید",
-  "compose_form.hashtag_warning": "از آن‌جا که این فرسته فهرست‌نشده است، در نتایج جست‌وجوی برچسب‌ها پیدا نخواهد شد. تنها فرسته‌های عمومی را می‌توان با جست‌وجوی برچسب یافت.",
+  "compose_form.encryption_warning": "فرسته‌های ماستودون رمزگذاری سرتاسری نشده‌اند. هیچ اطّلاعات حساسی را روی ماستودون هم‌رسانی نکنید.",
+  "compose_form.hashtag_warning": "از آن‌جا که این فرسته فهرست نشده است، در نتایج جست‌وجوی هشتگ‌ها پیدا نخواهد شد. تنها فرسته‌های عمومی را می‌توان با جست‌وجوی هشتگ یافت.",
   "compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی می‌تواند پی‌گیرتان شده و فرسته‌های ویژهٔ پی‌گیرانتان را ببیند.",
   "compose_form.lock_disclaimer.lock": "قفل‌شده",
   "compose_form.placeholder": "تازه چه خبر؟",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "برداشتن این گزینه",
   "compose_form.poll.switch_to_multiple": "تبدیل به نظرسنجی چندگزینه‌ای",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
-  "compose_form.publish": "بوق",
+  "compose_form.publish": "انتشار",
+  "compose_form.publish_form": "انتشار",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "ذخیرهٔ تغییرات",
   "compose_form.sensitive.hide": "{count, plural, one {علامت‌گذاری رسانه به عنوان حساس} other {علامت‌گذاری رسانه‌ها به عنوان حساس}}",
   "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری شد} other {رسانه‌ها به عنوان حساس علامت‌گذاری شدند}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری نشد} other {رسانه‌ها به عنوان حساس علامت‌گذاری نشدند}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "مسدود کردن و گزارش",
   "confirmations.block.confirm": "مسدود کردن",
   "confirmations.block.message": "مطمئنید که می‌خواهید {name} را مسدود کنید؟",
+  "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
+  "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "آیا مطمئنید که می‌خواهید این فرسته را حذف کنید؟",
   "confirmations.delete_list.confirm": "حذف",
-  "confirmations.delete_list.message": "مطمئنید می‌خواهید این فهرست را برای همیشه حذف کنید؟",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
+  "confirmations.discard_edit_media.confirm": "دور انداختن",
+  "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
   "confirmations.domain_block.confirm": "مسدود کردن تمام دامنه",
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
   "confirmations.logout.confirm": "خروج از حساب",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
   "conversation.with": "با {names}",
+  "copypaste.copied": "رونوشت شد",
+  "copypaste.copy": "رونوشت",
   "directory.federated": "از کارسازهای شناخته‌شده",
   "directory.local": "تنها از {domain}",
   "directory.new_arrivals": "تازه‌واردان",
   "directory.recently_active": "کاربران فعال اخیر",
-  "embed.instructions": "برای جاگذاری این فرسته در سایت خودتان، کد زیر را کپی کنید.",
+  "disabled_account_banner.account_settings": "تنظیمات حساب",
+  "disabled_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده.",
+  "dismissable_banner.community_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افرادیند که حساب‌هایشان به دست {domain} میزبانی می‌شود.",
+  "dismissable_banner.dismiss": "دور انداختن",
+  "dismissable_banner.explore_links": "هم‌اکنون افراد روی این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز در مورد این داستان‌های خبری صحبت می‌کنند.",
+  "dismissable_banner.explore_statuses": "هم‌اکنون این فرسته‌ها از این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
+  "dismissable_banner.explore_tags": "هم‌اکنون این برچسب‌ها بین افراد این کارساز و دیگر کارسازهای شبکهٔ نامتمرکز داغ شده‌اند.",
+  "dismissable_banner.public_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افراد روی این کارساز و دیگر کارسازهای شبکهٔ نامتمرکزیست که این کارساز در موردشان می‌داند.",
+  "embed.instructions": "جاسازی این فرسته روی پایگاهتان با رونوشت کردن کد زیر.",
   "embed.preview": "این گونه دیده خواهد شد:",
   "emoji_button.activity": "فعالیت",
+  "emoji_button.clear": "پاک سازی",
   "emoji_button.custom": "سفارشی",
   "emoji_button.flags": "پرچم‌ها",
   "emoji_button.food": "غذا و نوشیدنی",
@@ -161,21 +212,22 @@
   "empty_column.account_timeline": "هیچ فرسته‌ای این‌جا نیست!",
   "empty_column.account_unavailable": "نمایهٔ موجود نیست",
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
-  "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشان‌شده‌ای ندارید. هنگامی که فرسته‌ای را نشان‌کنید، این‌جا نشان داده خواهد شد.",
+  "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
   "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
   "empty_column.direct": "هنوز هیچ پیام مستقیمی ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید این‌جا نشان داده خواهد شد.",
   "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
+  "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
   "empty_column.favourited_statuses": "شما هنوز هیچ فرسته‌ای را نپسندیده‌اید. هنگامی که فرسته‌ای را بپسندید، این‌جا نشان داده خواهد شد.",
   "empty_column.favourites": "هنوز هیچ کسی این فرسته را نپسندیده است. هنگامی که کسی آن را بپسندد، این‌جا نشان داده خواهد شد.",
   "empty_column.follow_recommendations": "ظاهرا هیچ پیشنهادی برای شما نمی‌توانیم تولید کنیم. می‌توانید از امکان جست‌وجو برای یافتن افرادی که ممکن است بشناسید و یا کاوش میان برچسب‌های داغ استفاده کنید.",
   "empty_column.follow_requests": "شما هنوز هیچ درخواست پی‌گیری‌ای ندارید. هنگامی که چنین درخواستی بگیرید، این‌جا نشان داده خواهد شد.",
   "empty_column.hashtag": "هنوز هیچ چیزی در این برچسب نیست.",
-  "empty_column.home": "خط زمانی خانگی شما خالی است! افراد بیشتری را پی‌گیری کنید تا پُر شود. {suggestions}",
+  "empty_column.home": "خط زمانی خانگیتان خالی است! برای پر کردنش، افراد بیشتری را پی بگیرید. {suggestions}",
   "empty_column.home.suggestions": "چند پیشنهاد را ببینید",
-  "empty_column.list": "در این فهرست هنوز چیزی نیست. هنگامی که اعضای این فهرست چیزی بفرستند، این‌جا ظاهر خواهد شد.",
-  "empty_column.lists": "هنوز هیچ فهرستی ندارید. هنگامی که فهرستی بسازید، این‌جا نشان داده خواهد شد.",
+  "empty_column.list": "هنوز چیزی در این سیاهه نیست. هنگامی که اعضایش فرسته‌های جدیدی بفرستند، این‌جا ظاهر خواهند شد.",
+  "empty_column.lists": "هنوز هیچ سیاهه‌ای ندارید. هنگامی که یکی بسازید، این‌جا نشان داده خواهد شد.",
   "empty_column.mutes": "هنوز هیچ کاربری را خموش نکرده‌اید.",
-  "empty_column.notifications": "هنوز هیچ اعلانی ندارید. به دیگران واکنش نشان دهید تا گفتگو آغاز شود.",
+  "empty_column.notifications": "هنوز هیچ آگاهی‌آی ندارید. هنگامی که دیگران با شما برهم‌کنش داشته باشند،‌این‌حا خواهید دیدش.",
   "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران کارسازهای دیگر را پی‌گیری کنید تا این‌جا پُر شود",
   "error.unexpected_crash.explanation": "به خاطر اشکالی در کدهای ما یا ناسازگاری با مرورگر شما، این صفحه به درستی نمایش نیافت.",
   "error.unexpected_crash.explanation_addons": "این صفحه نمی‌تواند درست نشان داده شود. احتمالاً این خطا ناشی از یک افزونهٔ مرورگر یا ابزار ترجمهٔ خودکار است.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "لطفاً از کارشان انداخته و صفحه را نوسازی کنید. اگر کمکی نکرد، شاید همچنان بتوانید با مرورگری دیگر یا با کاره‌ای بومی از ماستودون استفاده کنید.",
   "errors.unexpected_crash.copy_stacktrace": "رونوشت از جزئیات اشکال",
   "errors.unexpected_crash.report_issue": "گزارش مشکل",
+  "explore.search_results": "نتایج جست‌وجو",
+  "explore.suggested_follows": "برای شما",
+  "explore.title": "کاوش",
+  "explore.trending_links": "اخبار",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "هشتگ‌ها",
+  "filter_modal.added.context_mismatch_explanation": "این دستهٔ پالایه به بافتاری که در آن به این فرسته دسترسی دارید اعمال نمی‌شود. اگر می‌خواهید فرسته در این بافتار هم پالوده شود، باید پالایه را ویرایش کنید.",
+  "filter_modal.added.context_mismatch_title": "بافتار نامطابق!",
+  "filter_modal.added.expired_explanation": "این دستهٔ پالایه منقضی شده است. برای اعمالش باید تاریخ انقضا را عوض کنید.",
+  "filter_modal.added.expired_title": "پالایهٔ منقضی!",
+  "filter_modal.added.review_and_configure": "برای بازبینی و پیکربندی بیش‌تر این دستهٔ پالایه، به {settings_link} بروید.",
+  "filter_modal.added.review_and_configure_title": "تنظیمات پالایه",
+  "filter_modal.added.settings_link": "صفحهٔ تنظیمات",
+  "filter_modal.added.short_explanation": "این فرسته به دستهٔ پالایهٔ زیر افزوده شد: {title}.",
+  "filter_modal.added.title": "پالایه افزوده شد!",
+  "filter_modal.select_filter.context_mismatch": "به این بافتار اعمال نمی‌شود",
+  "filter_modal.select_filter.expired": "منقضی‌شده",
+  "filter_modal.select_filter.prompt_new": "دستهٔ جدید: {name}",
+  "filter_modal.select_filter.search": "جست‌وجو یا ایجاد",
+  "filter_modal.select_filter.subtitle": "استفاده از یک دستهً موجود یا ایجاد دسته‌ای جدید",
+  "filter_modal.select_filter.title": "پالایش این فرسته",
+  "filter_modal.title.status": "پالایش یک فرسته",
   "follow_recommendations.done": "انجام شد",
   "follow_recommendations.heading": "افرادی را که می‌خواهید فرسته‌هایشان را ببینید پی‌گیری کنید! این‌ها تعدادی پیشنهاد هستند.",
   "follow_recommendations.lead": "فرسته‌های افرادی که دنبال می‌کنید به ترتیب زمانی در خوراک خانه‌تان نشان داده خواهد شد. از اشتباه کردن نترسید. می‌توانید به همین سادگی در هر زمانی از دنبال کردن افراد دست بکشید!",
   "follow_request.authorize": "اجازه دهید",
   "follow_request.reject": "رد کنید",
   "follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
+  "footer.about": "درباره",
+  "footer.directory": "فهرست نمایه‌ها",
+  "footer.get_app": "گرفتن کاره",
+  "footer.invite": "دعوت دیگران",
+  "footer.keyboard_shortcuts": "میان‌برهای صفحه‌کلید",
+  "footer.privacy_policy": "سیاست محرمانگی",
+  "footer.source_code": "نمایش کد مبدأ",
   "generic.saved": "ذخیره شده",
-  "getting_started.developers": "توسعه‌دهندگان",
-  "getting_started.directory": "شاخهٔ نمایه",
-  "getting_started.documentation": "مستندات",
   "getting_started.heading": "آغاز کنید",
-  "getting_started.invite": "دعوت از دیگران",
-  "getting_started.open_source_notice": "ماستودون نرم‌افزاری آزاد است. می‌توانید روی {github} در آن مشارکت کرده یا مشکلاتش را گزارش دهید.",
-  "getting_started.security": "تنظیمات حساب",
-  "getting_started.terms": "شرایط خدمات",
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
@@ -207,25 +281,39 @@
   "hashtag.column_settings.tag_mode.any": "هرکدام از این‌ها",
   "hashtag.column_settings.tag_mode.none": "هیچ‌کدام از این‌ها",
   "hashtag.column_settings.tag_toggle": "افزودن برچسب‌هایی بیشتر به این ستون",
+  "hashtag.follow": "پی‌گیری برچسب",
+  "hashtag.unfollow": "ناپی‌گیری برچسب",
   "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
   "home.show_announcements": "نمایش اعلامیه‌ها",
+  "interaction_modal.description.favourite": "با حسابی روی ماستودون می‌توانید این فرسته را برگزیده تا نگارنده بداند قدردانش هستید و برای آینده ذخیره‌اش می‌کنید.",
+  "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
+  "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
+  "interaction_modal.description.reply": "با حسابی روی ماستودون می‌توانید به این فرسته پاسخ دهید.",
+  "interaction_modal.on_another_server": "روی کارسازی دیگر",
+  "interaction_modal.on_this_server": "روی این کارساز",
+  "interaction_modal.other_server_instructions": "این نشانی را رونویسی و در زمینهٔ جست‌وجوی کارهٔ دلخواه یا رابط وب کارساز ماستودونتان جایگذاری کنید.",
+  "interaction_modal.preamble": "از آن‌جا که ماستودون نامتمرکز است، می‌توانید در صورت نداشتن حساب روی این کارساز، از حساب موجود خودتان که روی کارساز ماستودون یا بن‌سازهٔ سازگار دیگری میزبانی می‌شود استفاده کنید.",
+  "interaction_modal.title.favourite": "فرسته‌های برگزیدهٔ {name}",
+  "interaction_modal.title.follow": "پیگیری {name}",
+  "interaction_modal.title.reblog": "تقویت فرستهٔ {name}",
+  "interaction_modal.title.reply": "پاسخ به فرستهٔ {name}",
   "intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
   "intervals.full.hours": "{number, plural, one {# ساعت} other {# ساعت}}",
   "intervals.full.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}}",
   "keyboard_shortcuts.back": "بازگشت",
-  "keyboard_shortcuts.blocked": "گشودن فهرست کاربران مسدود شده",
+  "keyboard_shortcuts.blocked": "گشودن سیاههٔ کاربران مسدود",
   "keyboard_shortcuts.boost": "تقویت فرسته",
   "keyboard_shortcuts.column": "برای تمرکز روی یک فرسته در یکی از ستون‌ها",
   "keyboard_shortcuts.compose": "تمرکز روی محیط نوشتن",
   "keyboard_shortcuts.description": "توضیح",
-  "keyboard_shortcuts.direct": "گشودن ستون پیام‌های مستقیم",
-  "keyboard_shortcuts.down": "پایین رفتن در فهرست",
+  "keyboard_shortcuts.direct": "برای گشودن ستون پیغام‌های مستقیم",
+  "keyboard_shortcuts.down": "پایین بردن در سیاهه",
   "keyboard_shortcuts.enter": "گشودن فرسته",
   "keyboard_shortcuts.favourite": "پسندیدن فرسته",
-  "keyboard_shortcuts.favourites": "گشودن فهرست پسندیده‌ها",
+  "keyboard_shortcuts.favourites": "گشودن سیاههٔ برگزیده‌ها",
   "keyboard_shortcuts.federated": "گشودن خط زمانی همگانی",
   "keyboard_shortcuts.heading": "میان‌برهای صفحه‌کلید",
   "keyboard_shortcuts.home": "گشودن خط زمانی خانگی",
@@ -237,10 +325,10 @@
   "keyboard_shortcuts.my_profile": "گشودن نمایه‌تان",
   "keyboard_shortcuts.notifications": "گشودن ستون آگاهی‌ها",
   "keyboard_shortcuts.open_media": "گشودن رسانه",
-  "keyboard_shortcuts.pinned": "گشودن فهرست فرسته‌های سنجاق‌شده",
+  "keyboard_shortcuts.pinned": "گشودن سیاههٔ فرسته‌های سنجاق شده",
   "keyboard_shortcuts.profile": "گشودن نمایهٔ نویسنده",
   "keyboard_shortcuts.reply": "پاسخ به فرسته",
-  "keyboard_shortcuts.requests": "گشودن فهرست درخواست‌های پی‌گیری",
+  "keyboard_shortcuts.requests": "گشودن سیاههٔ درخواست‌های پی‌گیری",
   "keyboard_shortcuts.search": "تمرکز روی جست‌وجو",
   "keyboard_shortcuts.spoilers": "نمایش/نهفتن زمینهٔ هشدار محتوا",
   "keyboard_shortcuts.start": "گشودن ستون «آغاز کنید»",
@@ -248,34 +336,37 @@
   "keyboard_shortcuts.toggle_sensitivity": "نمایش/نهفتن رسانه",
   "keyboard_shortcuts.toot": "شروع یک فرستهٔ جدید",
   "keyboard_shortcuts.unfocus": "برداشتن تمرکز از نوشتن/جست‌وجو",
-  "keyboard_shortcuts.up": "بالا رفتن در فهرست",
+  "keyboard_shortcuts.up": "بالا بردن در سیاهه",
   "lightbox.close": "بستن",
   "lightbox.compress": "فشرده‌سازی جعبهٔ نمایش تصویر",
   "lightbox.expand": "گسترش جعبهٔ نمایش تصویر",
   "lightbox.next": "بعدی",
   "lightbox.previous": "قبلی",
-  "lists.account.add": "افزودن به فهرست",
-  "lists.account.remove": "برداشتن از فهرست",
-  "lists.delete": "حذف فهرست",
-  "lists.edit": "ویرایش فهرست",
+  "limited_account_hint.action": "به هر روی نمایه نشان داده شود",
+  "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.",
+  "lists.account.add": "افزودن به سیاهه",
+  "lists.account.remove": "برداشتن از سیاهه",
+  "lists.delete": "حذف سیاهه",
+  "lists.edit": "ویرایش سیاهه",
   "lists.edit.submit": "تغییر عنوان",
-  "lists.new.create": "افزودن فهرست",
-  "lists.new.title_placeholder": "عنوان فهرست جدید",
+  "lists.new.create": "افزودن سیاهه",
+  "lists.new.title_placeholder": "عنوان سیاههٔ جدید",
   "lists.replies_policy.followed": "هر کاربر پی‌گرفته",
-  "lists.replies_policy.list": "اعضای فهرست",
+  "lists.replies_policy.list": "اعضای سیاهه",
   "lists.replies_policy.none": "هیچ کدام",
   "lists.replies_policy.title": "نمایش پاسخ‌ها به:",
   "lists.search": "جست‌وجو بین کسانی که پی‌گرفته‌اید",
-  "lists.subheading": "فهرست‌های شما",
+  "lists.subheading": "سیاهه‌هایتان",
   "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}",
-  "loading_indicator.label": "بارگزاری...",
+  "loading_indicator.label": "بار کردن…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "missing_indicator.label": "پیدا نشد",
   "missing_indicator.sublabel": "این منبع پیدا نشد",
+  "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
   "mute_modal.duration": "مدت زمان",
-  "mute_modal.hide_notifications": "اعلان‌های این کاربر پنهان شود؟",
+  "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کاربر؟",
   "mute_modal.indefinite": "نامعلوم",
-  "navigation_bar.apps": "برنامه‌های تلفن همراه",
+  "navigation_bar.about": "درباره",
   "navigation_bar.blocks": "کاربران مسدود شده",
   "navigation_bar.bookmarks": "نشانک‌ها",
   "navigation_bar.community_timeline": "خط زمانی محلّی",
@@ -284,20 +375,23 @@
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
   "navigation_bar.edit_profile": "ویرایش نمایه",
+  "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "پسندیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
   "navigation_bar.follow_requests": "درخواست‌های پی‌گیری",
   "navigation_bar.follows_and_followers": "پی‌گرفتگان و پی‌گیرندگان",
-  "navigation_bar.info": "دربارهٔ این کارساز",
-  "navigation_bar.keyboard_shortcuts": "میان‌برها",
-  "navigation_bar.lists": "فهرست‌ها",
+  "navigation_bar.lists": "سیاهه‌ها",
   "navigation_bar.logout": "خروج",
   "navigation_bar.mutes": "کاربران خموشانده",
   "navigation_bar.personal": "شخصی",
-  "navigation_bar.pins": "فرسته‌های سنجاق‌شده",
+  "navigation_bar.pins": "فرسته‌های سنجاق شده",
   "navigation_bar.preferences": "ترجیحات",
   "navigation_bar.public_timeline": "خط زمانی همگانی",
+  "navigation_bar.search": "جست‌وجو",
   "navigation_bar.security": "امنیت",
+  "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
+  "notification.admin.report": "{name}، {target} را گزارش داد",
+  "notification.admin.sign_up": "{name} ثبت نام کرد",
   "notification.favourite": "‫{name}‬ فرسته‌تان را پسندید",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
   "notification.follow_request": "{name} می‌خواهد پی‌گیر شما باشد",
@@ -306,23 +400,28 @@
   "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسیده است",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
   "notification.status": "{name} چیزی فرستاد",
-  "notifications.clear": "پاک‌کردن آگاهی‌ها",
+  "notification.update": "{name} فرسته‌ای را ویرایش کرد",
+  "notifications.clear": "پاک‌سازی آگاهی‌ها",
   "notifications.clear_confirmation": "مطمئنید می‌خواهید همهٔ آگاهی‌هایتان را برای همیشه پاک کنید؟",
+  "notifications.column_settings.admin.report": "گزارش‌های جدید:",
+  "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
   "notifications.column_settings.favourite": "پسندیده‌ها:",
   "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
   "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
-  "notifications.column_settings.filter_bar.show": "نمایش",
+  "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
   "notifications.column_settings.mention": "نام‌بردن‌ها:",
   "notifications.column_settings.poll": "نتایج نظرسنجی:",
-  "notifications.column_settings.push": "اعلان‌ها از سمت سرور",
+  "notifications.column_settings.push": "آگاهی‌های ارسالی",
   "notifications.column_settings.reblog": "تقویت‌ها:",
   "notifications.column_settings.show": "نمایش در ستون",
   "notifications.column_settings.sound": "پخش صدا",
   "notifications.column_settings.status": "فرسته‌های جدید:",
-  "notifications.column_settings.unread_markers.category": "نشانه‌گذارهای آگاهی‌های خوانده‌نشده",
+  "notifications.column_settings.unread_notifications.category": "آگاهی‌های خوانده نشده",
+  "notifications.column_settings.unread_notifications.highlight": "پررنگ کردن آگاهی‌های خوانده نشده",
+  "notifications.column_settings.update": "ویرایش‌ها:",
   "notifications.filter.all": "همه",
   "notifications.filter.boosts": "تقویت‌ها",
   "notifications.filter.favourites": "پسندها",
@@ -335,9 +434,9 @@
   "notifications.mark_as_read": "نشانه‌گذاری تمام آگاهی‌ها به خوانده‌شده",
   "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند",
   "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند",
-  "notifications.permission_required": "اعلان‌های میزکار در دسترس نیستند زیرا نیازمند مجوزی هستند که اعطا نشده است.",
+  "notifications.permission_required": "آگاهی‌های میزکار در دسترس نیستند زیرا اجازه‌های لازم، اعطا نشده.",
   "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
-  "notifications_permission_banner.how_to_control": "اگر می‌خواهید حتی زمانی که ماستودون باز نیست اعلان‌ها نمایش یابند، اعلان‌های میزکار را فعال کنید. به محض فعال شدن از طریق دکمه {icon} بالا می‌توانید به دقت کنترل کنید که چه نوع از تعامل‌ها باعث صادر شدن اعلان‌ها شوند.",
+  "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",
   "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",
   "picture_in_picture.restore": "برگرداندن",
   "poll.closed": "پایان‌یافته",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# رأی} other {# رأی}}",
   "poll.vote": "رأی",
   "poll.voted": "شما به این جواب رأی دادید",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "# رأی",
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
-  "privacy.direct.long": "فقط برای کاربران نام‌برده نمایان است",
-  "privacy.direct.short": "مستقیم",
+  "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
+  "privacy.direct.short": "فقط افراد اشاره شده",
   "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
   "privacy.private.short": "فقط پی‌گیرندگان",
-  "privacy.public.long": "نمایان برای همه، در خط‌های زمانی همگانی نمایش داده خواهد شد",
+  "privacy.public.long": "نمایان برای همه",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی در خط‌های زمانی همگانی نمایش داده نخواهد شد",
-  "privacy.unlisted.short": "فهرست‌نشده",
+  "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیت‌های کشف",
+  "privacy.unlisted.short": "فهرست نشده",
+  "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
+  "privacy_policy.title": "سیاست محرمانگی",
   "refresh": "نوسازی",
   "regeneration_indicator.label": "در حال بار شدن…",
-  "regeneration_indicator.sublabel": "این فهرست دارد آماده می‌شود!",
+  "regeneration_indicator.sublabel": "خوراک خانگیتان دارد آماده می‌شود!",
   "relative_time.days": "{number} روز",
+  "relative_time.full.days": "{number, plural, one {# روز} other {# روز}} پیش",
+  "relative_time.full.hours": "{number, plural, one {# ساعت} other {# ساعت}} پیش",
+  "relative_time.full.just_now": "همين آلان",
+  "relative_time.full.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}} پیش",
+  "relative_time.full.seconds": "{number, plural, one {# ثانیه} other {# ثانیه}} پیش",
   "relative_time.hours": "{number} ساعت",
   "relative_time.just_now": "حالا",
   "relative_time.minutes": "{number} دقیقه",
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
   "reply_indicator.cancel": "لغو",
+  "report.block": "مسدود کردن",
+  "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
+  "report.categories.other": "غیره",
+  "report.categories.spam": "هرزنامه",
+  "report.categories.violation": "محتوا یک یا چند قانون کارساز را نقض می‌کند",
+  "report.category.subtitle": "منطبق‌ترین را انتخاب کنید",
+  "report.category.title": "به ما بگویید با این {type} چه مشکلی دارید",
+  "report.category.title_account": "نمایه",
+  "report.category.title_status": "فرسته",
+  "report.close": "انجام شد",
+  "report.comment.title": "آیا چیز دیگری هست که فکر می‌کنید باید بدانیم؟",
   "report.forward": "فرستادن به {target}",
   "report.forward_hint": "این حساب در کارساز دیگری ثبت شده. آیا می‌خواهید رونوشتی ناشناس از این گزارش به آن‌جا هم فرستاده شود؟",
-  "report.hint": "این گزارش به مدیران کارسازتان فرستاده خواهد شد. می‌توانید دلیل گزارش این حساب را در ادامه بنویسید:",
+  "report.mute": "خموش",
+  "report.mute_explanation": "شما فرسته‌های آن‌ها را نخواهید دید. آن‌ها همچنان می‌توانند شما را پی‌بگیرند و فرسته‌هایتان را ببینند و نمی‌دانند که خموش شده‌اند.",
+  "report.next": "بعدی",
   "report.placeholder": "توضیحات اضافه",
+  "report.reasons.dislike": "من آن را دوست ندارم",
+  "report.reasons.dislike_description": "این چیزی نیست که بخواهید ببینید",
+  "report.reasons.other": "بخواطر چیز دیگری است",
+  "report.reasons.other_description": "این موضوع در دسته‌بندی‌های دیگر نمی‌گنجد",
+  "report.reasons.spam": "این هرزنامه است",
+  "report.reasons.spam_description": "پیوندهای مخرب، تعامل جعلی یا پاسخ‌های تکراری",
+  "report.reasons.violation": "قوانین کارساز را نقض می‌کند",
+  "report.reasons.violation_description": "شما آگاه هستید که قوانین خاصی را زیر پا می‌گذارد",
+  "report.rules.subtitle": "همهٔ موارد انجام شده را برگزینید",
+  "report.rules.title": "کدام قوانین نقض شده‌اند؟",
+  "report.statuses.subtitle": "همهٔ موارد انجام شده را برگزینید",
+  "report.statuses.title": "آیا فرسته‌ای وجود دارد که از این گزارش پشتیبانی کند؟",
   "report.submit": "فرستادن",
   "report.target": "در حال گزارش {target}",
+  "report.thanks.take_action": "در اینجا گزینه‌هایی برای کنترل آنچه در ماستودون میبینید، وجود دارد:",
+  "report.thanks.take_action_actionable": "در حالی که ما این مورد را بررسی می‌کنیم، می‌توانید علیه ‎@{name} اقدام کنید:",
+  "report.thanks.title": "نمی‌خواهید این را ببینید؟",
+  "report.thanks.title_actionable": "ممنون بابت گزارش، ما آن را بررسی خواهیم کرد.",
+  "report.unfollow": "ناپی‌گیری ‎@{name}",
+  "report.unfollow_explanation": "شما این حساب را پی‌گرفته‌اید، برای اینکه دیگر فرسته‌هایش را در خوراک خانه‌تان نبینید؛ آن را پی‌نگیرید.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} فرسته} other {{count} فرسته}} پیوست شده",
+  "report_notification.categories.other": "دیگر",
+  "report_notification.categories.spam": "هرزنامه",
+  "report_notification.categories.violation": "تخطّی از قانون",
+  "report_notification.open": "گشودن گزارش",
   "search.placeholder": "جست‌وجو",
+  "search.search_or_paste": "جست‌وجو یا جایگذاری نشانی",
   "search_popout.search_format": "راهنمای جست‌وجوی پیشرفته",
   "search_popout.tips.full_text": "جست‌وجوی متنی ساده فرسته‌هایی که نوشته، پسندیده، تقویت‌کرده یا در آن‌ها نام‌برده شده‌اید را به علاوهٔ نام‌های کاربری، نام‌های نمایشی و برچسب‌ها برمی‌گرداند.",
   "search_popout.tips.hashtag": "برچسب",
@@ -382,32 +525,51 @@
   "search_popout.tips.text": "جست‌وجوی متنی ساده برای نام‌ها، نام‌های کاربری، و برچسب‌ها",
   "search_popout.tips.user": "کاربر",
   "search_results.accounts": "افراد",
+  "search_results.all": "همه",
   "search_results.hashtags": "برچسب‌ها",
+  "search_results.nothing_found": "چیزی برای این عبارت جست‌وجو یافت نشد",
   "search_results.statuses": "فرسته‌ها",
-  "search_results.statuses_fts_disabled": "جست‌وجوی محتوای فرسته‌ها در این کارساز ماستودون فعال نشده است.",
+  "search_results.statuses_fts_disabled": "جست‌وجوی محتوای فرسته‌ها در این کارساز ماستودون به کار انداخته نشده است.",
+  "search_results.title": "جست‌وجو برای {q}",
   "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
-  "status.admin_account": "گشودن واسط مدیریت برای @{name}",
+  "server_banner.about_active_users": "افرادی که در ۳۰ روز گذشته از این کارساز استفاده کرده‌اند (کاربران فعّال ماهانه)",
+  "server_banner.active_users": "کاربران فعّال",
+  "server_banner.administered_by": "به مدیریت:",
+  "server_banner.introduction": "{domain} بخشی از شبکهٔ اجتماعی نامتمرکزیست که از {mastodon} نیرو گرفته.",
+  "server_banner.learn_more": "بیش‌تر بیاموزید",
+  "server_banner.server_stats": "آمار کارساز:",
+  "sign_in_banner.create_account": "ایجاد حساب",
+  "sign_in_banner.sign_in": "ورود",
+  "sign_in_banner.text": "برای پی‌گیری نمایه‌ها یا برچسب‌ها، هم‌رسانی و پاسخ به فرسته‌ها یا تعامل از حسابتان روی کارسازی دیگر، وارد شوید.",
+  "status.admin_account": "گشودن واسط مدیریت برای ‎@{name}",
   "status.admin_status": "گشودن این فرسته در واسط مدیریت",
-  "status.block": "مسدود کردن @{name}",
+  "status.block": "مسدود کردن ‎@{name}",
   "status.bookmark": "نشانک",
-  "status.cancel_reblog_private": "لغو تقویت",
+  "status.cancel_reblog_private": "ناتقویت",
   "status.cannot_reblog": "این فرسته قابل تقویت نیست",
-  "status.copy": "رونویسی از نشانی فرسته",
+  "status.copy": "رونوشت از پیوند فرسته",
   "status.delete": "حذف",
   "status.detailed_status": "نمایش کامل گفتگو",
-  "status.direct": "پیام مستقیم به @{name}",
-  "status.embed": "جاگذاری",
+  "status.direct": "پیام مستقیم به ‎@{name}",
+  "status.edit": "ویرایش",
+  "status.edited": "ویرایش شده در {date}",
+  "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
+  "status.embed": "جاسازی",
   "status.favourite": "پسندیدن",
-  "status.filtered": "پالایش‌شده",
-  "status.load_more": "بارگزاری بیشتر",
+  "status.filter": "پالایش این فرسته",
+  "status.filtered": "پالوده",
+  "status.hide": "نهفتن بوق",
+  "status.history.created": "توسط {name} در {date} ایجاد شد",
+  "status.history.edited": "توسط {name} در {date} ویرایش شد",
+  "status.load_more": "بار کردن بیش‌تر",
   "status.media_hidden": "رسانهٔ نهفته",
-  "status.mention": "نام‌بردن از @{name}",
+  "status.mention": "نام‌بردن از ‎@{name}",
   "status.more": "بیشتر",
-  "status.mute": "خموشاندن @{name}",
+  "status.mute": "خموشاندن ‎@{name}",
   "status.mute_conversation": "خموشاندن گفت‌وگو",
   "status.open": "گسترش این فرسته",
-  "status.pin": "سنجاق‌کردن در نمایه",
-  "status.pinned": "فرستهٔ سنجاق‌شده",
+  "status.pin": "سنجاق به نمایه",
+  "status.pinned": "فرستهٔ سنجاق شده",
   "status.read_more": "بیشتر بخوانید",
   "status.reblog": "تقویت",
   "status.reblog_private": "تقویت برای مخاطبان نخستین",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
   "status.redraft": "حذف و بازنویسی",
   "status.remove_bookmark": "برداشتن نشانک",
+  "status.replied_to": "به {name} پاسخ داد",
   "status.reply": "پاسخ",
   "status.replyAll": "پاسخ به رشته",
-  "status.report": "گزارش @{name}",
+  "status.report": "گزارش ‎@{name}",
   "status.sensitive_warning": "محتوای حساس",
   "status.share": "هم‌رسانی",
+  "status.show_filter_reason": "به هر روی نشان داده شود",
   "status.show_less": "نمایش کمتر",
   "status.show_less_all": "نمایش کمتر همه",
   "status.show_more": "نمایش بیشتر",
   "status.show_more_all": "نمایش بیشتر همه",
-  "status.show_thread": "نمایش رشته",
+  "status.show_original": "نمایش اصلی",
+  "status.translate": "ترجمه",
+  "status.translated_from_with": "ترجمه از {lang} با {provider}",
   "status.uncached_media_warning": "ناموجود",
   "status.unmute_conversation": "رفع خموشی گفت‌وگو",
   "status.unpin": "برداشتن سنجاق از نمایه",
+  "subscribed_languages.lead": "پس از تغییر، تنها فرسته‌های به زبان‌های گزیده روی خانه و خط‌زمانی‌های سیاهه ظاهر خواهند شد. برای دریافت فرسته‌ها به تمامی زبان‌ها، هیچ‌کدام را برنگزینید.",
+  "subscribed_languages.save": "ذخیرهٔ تغییرات",
+  "subscribed_languages.target": "تغییر زبان‌های مشترک شده برای {target}",
   "suggestions.dismiss": "نادیده گرفتن پیشنهاد",
   "suggestions.header": "شاید این هم برایتان جالب باشد…",
   "tabs_bar.federated_timeline": "همگانی",
   "tabs_bar.home": "خانه",
   "tabs_bar.local_timeline": "محلّی",
   "tabs_bar.notifications": "آگاهی‌ها",
-  "tabs_bar.search": "جست‌وجو",
   "time_remaining.days": "{number, plural, one {# روز} other {# روز}} باقی مانده",
   "time_remaining.hours": "{number, plural, one {# ساعت} other {# ساعت}} باقی مانده",
   "time_remaining.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}} باقی مانده",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "پیگیرندگان",
   "timeline_hint.resources.follows": "پی‌گرفتگان",
   "timeline_hint.resources.statuses": "فرسته‌های قدیمی‌تر",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} نفر} other {{counter} نفر}} صحبت می‌کنند",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} نفر} other {{counter} نفر}} در {days, plural, one {روز} other {{days} روز}} گذشته",
   "trends.trending_now": "پرطرفدار",
   "ui.beforeunload": "اگر از ماستودون خارج شوید پیش‌نویس شما از دست خواهد رفت.",
   "units.short.billion": "{count}میلیارد",
@@ -456,13 +624,14 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
+  "upload_form.description_missing": "شرحی افزوده نشده",
   "upload_form.edit": "ویرایش",
   "upload_form.thumbnail": "تغییر بندانگشتی",
   "upload_form.undo": "حذف",
   "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
   "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
   "upload_modal.apply": "اعمال",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "اعمال کردن…",
   "upload_modal.choose_image": "گزینش تصویر",
   "upload_modal.description_placeholder": "الا یا ایّها الساقی، ادر کأساً و ناولها",
   "upload_modal.detect_text": "تشخیص متن درون عکس",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "در حال آماده سازی OCR…",
   "upload_modal.preview_label": "پیش‌نمایش ({ratio})",
   "upload_progress.label": "در حال بارگذاری…",
+  "upload_progress.processing": "در حال پردازش…",
   "video.close": "بستن ویدیو",
   "video.download": "بارگیری پرونده",
   "video.exit_fullscreen": "خروج از حالت تمام‌صفحه",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index a5c2d2da3..fab0e7c47 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,83 +1,117 @@
 {
+  "about.blocks": "Moderoidut palvelimet",
+  "about.contact": "Yhteystiedot:",
+  "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
+  "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
+  "about.domain_blocks.preamble": "Yleisesti Mastodonin avulla voidaan tarkastella minkä tahansa muun fediverse-palvelinten sisältöä ja vuorovaikuttaa eri palvelinten käyttäjien kanssa. Nämä ovat tälle palvelimelle määritetyt poikkeukset.",
+  "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
+  "about.domain_blocks.silenced.title": "Rajoitettu",
+  "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta tai vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
+  "about.domain_blocks.suspended.title": "Jäädytetty",
+  "about.not_available": "Näitä tietoja ei ole julkaistu tällä palvelimella.",
+  "about.powered_by": "Hajautettu sosiaalinen media, tarjoaa {mastodon}",
+  "about.rules": "Palvelimen säännöt",
   "account.account_note_header": "Muistiinpano",
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
   "account.badges.group": "Ryhmä",
   "account.block": "Estä @{name}",
-  "account.block_domain": "Piilota kaikki sisältö verkkotunnuksesta {domain}",
+  "account.block_domain": "Estä palvelu {domain}",
   "account.blocked": "Estetty",
   "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
-  "account.cancel_follow_request": "Peruuta seurauspyyntö",
-  "account.direct": "Pikaviesti käyttäjälle @{name}",
-  "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} viestii",
-  "account.domain_blocked": "Verkko-osoite piilotettu",
+  "account.cancel_follow_request": "Peruuta seurantapyyntö",
+  "account.direct": "Yksityisviesti käyttäjälle @{name}",
+  "account.disable_notifications": "Lopeta @{name}:n julkaisuista ilmoittaminen",
+  "account.domain_blocked": "Verkko-osoite estetty",
   "account.edit_profile": "Muokkaa profiilia",
-  "account.enable_notifications": "Ilmoita minulle, kun @{name} viestii",
+  "account.enable_notifications": "Ilmoita @{name}:n julkaisuista",
   "account.endorse": "Suosittele profiilissasi",
+  "account.featured_tags.last_status_at": "Viimeisin viesti {date}",
+  "account.featured_tags.last_status_never": "Ei viestejä",
+  "account.featured_tags.title": "{name} esillä olevat hashtagit",
   "account.follow": "Seuraa",
   "account.followers": "Seuraajat",
   "account.followers.empty": "Kukaan ei seuraa tätä käyttäjää vielä.",
-  "account.followers_counter": "{count, plural, one {{counter} seuraaja} other {{counter} seuraajat}}",
-  "account.following_counter": "{count, plural, one {{counter} seuraa} other {{counter} seuraa}}",
+  "account.followers_counter": "{count, plural, one {{counter} seuraaja} other {{counter} seuraajaa}}",
+  "account.following": "Seurataan",
+  "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
   "account.follows_you": "Seuraa sinua",
-  "account.hide_reblogs": "Piilota buustaukset käyttäjältä @{name}",
-  "account.joined": "Liittynyt {date}",
-  "account.last_status": "Aktiivinen viimeksi",
-  "account.link_verified_on": "Tämän linkin omistaja tarkistettiin {date}",
-  "account.locked_info": "Tämän tilin yksityisyyden tila on asetettu lukituksi. Omistaja arvioi manuaalisesti, kuka voi seurata niitä.",
+  "account.go_to_profile": "Avaa profiili",
+  "account.hide_reblogs": "Piilota käyttäjän @{name} buustaukset",
+  "account.joined_short": "Liittynyt",
+  "account.languages": "Vaihda tilattuja kieliä",
+  "account.link_verified_on": "Linkin omistus tarkistettiin {date}",
+  "account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu ja tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
   "account.media": "Media",
   "account.mention": "Mainitse @{name}",
-  "account.moved_to": "{name} on muuttanut:",
+  "account.moved_to": "{name} on ilmoittanut uudeksi tilikseen",
   "account.mute": "Mykistä @{name}",
-  "account.mute_notifications": "Mykistä ilmoitukset käyttäjältä @{name}",
+  "account.mute_notifications": "Mykistä käyttäjän @{name} ilmoitukset",
   "account.muted": "Mykistetty",
-  "account.never_active": "Ei koskaan",
+  "account.open_original_page": "Avaa alkuperäinen sivu",
   "account.posts": "Viestit",
   "account.posts_with_replies": "Viestit ja vastaukset",
-  "account.report": "Raportoi @{name}",
+  "account.report": "Ilmoita käyttäjästä @{name}",
   "account.requested": "Odottaa hyväksyntää. Peruuta seuraamispyyntö klikkaamalla",
+  "account.requested_follow": "{name} haluaa seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä buustaukset käyttäjältä @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "account.unblock": "Salli @{name}",
-  "account.unblock_domain": "Salli {domain}",
+  "account.unblock_domain": "Salli palvelu {domain}",
+  "account.unblock_short": "Poista esto",
   "account.unendorse": "Poista suosittelu profiilistasi",
-  "account.unfollow": "Lakkaa seuraamasta",
+  "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications": "Poista mykistys käyttäjän @{name} ilmoituksilta",
+  "account.unmute_short": "Poista mykistys",
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Käyttäjän säilyminen rekisteröitymisen jälkeiseen päivään mennessä",
+  "admin.dashboard.monthly_retention": "Käyttäjän säilyminen rekisteröitymisen jälkeiseen kuukauteen mennessä",
+  "admin.dashboard.retention.average": "Keskimäärin",
+  "admin.dashboard.retention.cohort": "Kirjautumiset",
+  "admin.dashboard.retention.cohort_size": "Uudet käyttäjät",
   "alert.rate_limited.message": "Yritä uudestaan {retry_time, time, medium} jälkeen.",
   "alert.rate_limited.title": "Määrää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
   "announcement.announcement": "Ilmoitus",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(käsittelemätön)",
+  "audio.hide": "Piilota ääni",
   "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
-  "bundle_column_error.body": "Jokin meni vikaan komponenttia ladattaessa.",
+  "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
+  "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
+  "bundle_column_error.error.title": "Voi ei!",
+  "bundle_column_error.network.body": "Sivun lataamisessa tapahtui virhe. Tämä voi johtua tilapäisestä Internet-yhteyden tai tämän palvelimen ongelmasta.",
+  "bundle_column_error.network.title": "Verkkovirhe",
   "bundle_column_error.retry": "Yritä uudestaan",
-  "bundle_column_error.title": "Verkkovirhe",
+  "bundle_column_error.return": "Palaa takaisin kotiin",
+  "bundle_column_error.routing.body": "Pyydettyä sivua ei löytynyt. Oletko varma, että osoitepalkin URL-osoite on oikein?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sulje",
-  "bundle_modal_error.message": "Jokin meni vikaan komponenttia ladattaessa.",
+  "bundle_modal_error.message": "Jotain meni pieleen komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudelleen",
+  "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja silti olla vuorovaikutuksessa tämän kanssa.",
+  "closed_registrations_modal.description": "Tilin luonti palveluun {domain} ei tällä hetkellä ole mahdollista, mutta huomioi, ettei Mastodonin käyttö edellytä juuri kyseisen palvelun tiliä.",
+  "closed_registrations_modal.find_another_server": "Etsi toinen palvelin",
+  "closed_registrations_modal.preamble": "Mastodon on hajautettu, joten riippumatta siitä, missä luot tilisi, voit seurata ja olla vuorovaikutuksessa kenen tahansa kanssa tällä palvelimella. Voit jopa isännöidä palvelinta!",
+  "closed_registrations_modal.title": "Rekisteröityminen Mastodoniin",
+  "column.about": "Tietoja",
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Kirjanmerkit",
   "column.community": "Paikallinen aikajana",
-  "column.direct": "Pikaviestit",
+  "column.direct": "Yksityisviestit",
   "column.directory": "Selaa profiileja",
-  "column.domain_blocks": "Piilotetut verkkotunnukset",
+  "column.domain_blocks": "Estetytr verkkotunnukset",
   "column.favourites": "Suosikit",
   "column.follow_requests": "Seuraamispyynnöt",
   "column.home": "Koti",
   "column.lists": "Listat",
   "column.mutes": "Mykistetyt käyttäjät",
   "column.notifications": "Ilmoitukset",
-  "column.pins": "Kiinnitetyt tuuttaukset",
+  "column.pins": "Kiinnitetyt viestit",
   "column.public": "Yleinen aikajana",
   "column_back_button.label": "Takaisin",
   "column_header.hide_settings": "Piilota asetukset",
@@ -89,10 +123,12 @@
   "column_subheading.settings": "Asetukset",
   "community.column_settings.local_only": "Vain paikalliset",
   "community.column_settings.media_only": "Vain media",
-  "community.column_settings.remote_only": "Vain etäkäyttö",
-  "compose_form.direct_message_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
+  "community.column_settings.remote_only": "Vain etätilit",
+  "compose.language.change": "Vaihda kieli",
+  "compose.language.search": "Hae kieliä...",
   "compose_form.direct_message_warning_learn_more": "Lisätietoja",
-  "compose_form.hashtag_warning": "Tämä tuuttaus ei näy hashtag-hauissa, koska se on listaamaton. Hashtagien avulla voi hakea vain julkisia tuuttauksia.",
+  "compose_form.encryption_warning": "Mastodonin viestit eivät ole päästä päähän salattuja. Älä jaa arkaluonteisia tietoja Mastodonissa.",
+  "compose_form.hashtag_warning": "Tätä julkaisua listata minkään hastagin alle, koska se on listaamaton. Ainoastaan julkisia julkaisuja etsiä hastageilla.",
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
   "compose_form.placeholder": "Mitä sinulla on mielessäsi?",
@@ -102,11 +138,13 @@
   "compose_form.poll.remove_option": "Poista tämä valinta",
   "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
   "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
-  "compose_form.publish": "Lähetä viesti",
+  "compose_form.publish": "Julkaise",
+  "compose_form.publish_form": "Julkaise",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluontoiseksi} other {Merkitse media arkaluontoiseksi}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluontoiseksi} other {Media on merkitty arkaluontoiseksi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluontoiseksi} other {Mediaa ei ole merkitty arkaluontoiseksi}}",
+  "compose_form.save_changes": "Tallenna muutokset",
+  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluontoiseksi} other {Merkitse mediat arkaluontoiseksi}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluontoiseksi} other {Mediat on merkitty arkaluontoiseksi}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluontoiseksi} other {Medioja ei ole merkitty arkaluontoiseksi}}",
   "compose_form.spoiler.marked": "Poista sisältövaroitus",
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
   "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
@@ -114,36 +152,49 @@
   "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
   "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
+  "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
+  "confirmations.cancel_follow_request.message": "Haluatko varmasti peruuttaa pyyntösi seurata käyttäjää {name}?",
   "confirmations.delete.confirm": "Poista",
-  "confirmations.delete.message": "Haluatko varmasti poistaa tämän tilapäivityksen?",
+  "confirmations.delete.message": "Haluatko varmasti poistaa tämän julkaisun?",
   "confirmations.delete_list.confirm": "Poista",
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan kokonaan?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Piilota koko verkko-osoite",
-  "confirmations.domain_block.message": "Oletko todella varma, että haluat estää koko {domain}? Useimmissa tapauksissa muutama kohdennettu lohko tai mykistys on riittävä ja parempi. Et näe kyseisen verkkotunnuksen sisältöä missään julkisessa aikajanassa tai ilmoituksissa. Seuraajasi tältä verkkotunnukselta poistetaan.",
+  "confirmations.discard_edit_media.confirm": "Hylkää",
+  "confirmations.discard_edit_media.message": "Onko sinulla tallentamattomia muutoksia kuvaukseen tai esikatseluun, hylätäänkö ne silti?",
+  "confirmations.domain_block.confirm": "Estä koko palvelu",
+  "confirmations.domain_block.message": "Haluatko aivan varmasti estää palvelun {domain} täysin? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimenpide. Et näe kyseisen sisältöä kyseiseltä verkkoalueelta missään julkisissa aikajanoissa tai ilmoituksissa. Tälle verkkoalueelle kuuluvat seuraajasi poistetaan.",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Oletko varma, että haluat kirjautua ulos?",
   "confirmations.mute.confirm": "Mykistä",
-  "confirmations.mute.explanation": "Tämä piilottaa päivitykset heiltä ja päivitykset, joissa hänet mainitaan, mutta sallii silti heidän nähdä sinun päivityksesi ja seurata sinua.",
+  "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
   "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
   "confirmations.redraft.confirm": "Poista & palauta muokattavaksi",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.redraft.message": "Oletko varma että haluat poistaa tämän julkaisun ja tehdä siitä uuden luonnoksen? Suosikit ja buustaukset menetään, alkuperäisen julkaisusi vastaukset jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
   "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa tällä hetkellä työstämäsi viestin. Oletko varma, että haluat jatkaa?",
-  "confirmations.unfollow.confirm": "Lakkaa seuraamasta",
+  "confirmations.unfollow.confirm": "Lopeta seuraaminen",
   "confirmations.unfollow.message": "Haluatko varmasti lakata seuraamasta käyttäjää {name}?",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
   "conversation.with": "{names} kanssa",
+  "copypaste.copied": "Kopioitu",
+  "copypaste.copy": "Kopioi",
   "directory.federated": "Koko tunnettu fediverse",
-  "directory.local": "Vain palvelimelta {domain}",
+  "directory.local": "Vain palvelusta {domain}",
   "directory.new_arrivals": "Äskettäin saapuneet",
   "directory.recently_active": "Hiljattain aktiiviset",
-  "embed.instructions": "Upota statuspäivitys sivullesi kopioimalla alla oleva koodi.",
+  "disabled_account_banner.account_settings": "Tilin asetukset",
+  "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
+  "dismissable_banner.community_timeline": "Nämä ovat uusimmat julkiset julkaisut käyttäjiltä, joiden tilejä isännöi {domain}.",
+  "dismissable_banner.dismiss": "Hylkää",
+  "dismissable_banner.explore_links": "Näistä uutisista puhuvat ihmiset juuri nyt tällä ja muilla hajautetun verkon palvelimilla.",
+  "dismissable_banner.explore_statuses": "Nämä viestit juuri nyt tältä ja muilta hajautetun verkon palvelimilta ovat saamassa vetoa tältä palvelimelta.",
+  "dismissable_banner.explore_tags": "Nämä hashtagit juuri nyt ovat saamassa vetovoimaa tällä ja muilla hajautetun verkon palvelimilla olevien ihmisten keskuudessa.",
+  "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkisia viestejä ihmisiltä, jotka ovat tällä ja muilla hajautetun verkon palvelimilla, joista tämä palvelin tietää.",
+  "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Se tulee näyttämään tältä:",
   "emoji_button.activity": "Aktiviteetit",
+  "emoji_button.clear": "Tyhjennä",
   "emoji_button.custom": "Mukautetut",
   "emoji_button.flags": "Liput",
   "emoji_button.food": "Ruoka ja juoma",
@@ -158,17 +209,18 @@
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
   "empty_column.account_suspended": "Tilin käyttäminen keskeytetty",
-  "empty_column.account_timeline": "Täällä ei viestejä!",
+  "empty_column.account_timeline": "Ei viestejä täällä.",
   "empty_column.account_unavailable": "Profiilia ei löydy",
-  "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
+  "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
-  "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä estetty.",
+  "empty_column.direct": "Sinulla ei ole vielä yksityisviestejä. Kun lähetät tai vastaanotat sellaisen, se näkyy tässä.",
+  "empty_column.domain_blocks": "Palveluita ei ole vielä estetty.",
+  "empty_column.explore_statuses": "Mikään ei ole nyt trendi. Tarkista myöhemmin!",
   "empty_column.favourited_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä viestiä suosikkeihinsa. Kun joku tekee niin, näkyy kyseinen henkilö tässä.",
   "empty_column.follow_recommendations": "Näyttää siltä, että sinulle ei voi luoda ehdotuksia. Voit yrittää etsiä ihmisiä, jotka saatat tuntea tai tutkia trendaavia aihesanoja.",
-  "empty_column.follow_requests": "Sinulla ei ole vielä seurauspyyntöjä. Kun saat sellaisen, näkyy se tässä.",
+  "empty_column.follow_requests": "Et ole vielä vastaanottanut seurauspyyntöjä. Saamasi pyynnöt näytetään täällä.",
   "empty_column.hashtag": "Tällä hashtagilla ei ole vielä mitään.",
   "empty_column.home": "Kotisi aikajana on tyhjä! Seuraa lisää ihmisiä täyttääksesi sen. {suggestions}",
   "empty_column.home.suggestions": "Katso joitakin ehdotuksia",
@@ -179,25 +231,47 @@
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti tai manuaalisesti seuraa muiden palvelimien käyttäjiä niin saat sisältöä",
   "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
-  "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos tämä ei auta, saatat yhä pystyä käyttämään Mastodonia toisen selaimen tai sovelluksen kautta.",
+  "error.unexpected_crash.next_steps": "Kokeile sivun päivitystä. Jos se ei auta, voi Mastodonin käyttö silti olla mahdollista eri selaimella tai natiivilla sovelluksella.",
   "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä ja päivittää sivu. Jos se ei auta, voit silti käyttää Mastodonia eri selaimen tai sovelluksen kautta.",
   "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
+  "explore.search_results": "Hakutulokset",
+  "explore.suggested_follows": "Sinulle",
+  "explore.title": "Selaa",
+  "explore.trending_links": "Uutiset",
+  "explore.trending_statuses": "Julkaisut",
+  "explore.trending_tags": "Aihetunnisteet",
+  "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet käyttänyt tätä viestiä. Jos haluat, että viesti suodatetaan myös tässä yhteydessä, sinun on muokattava suodatinta.",
+  "filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
+  "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut ja sinun on muutettava viimeistä voimassaolon päivää, jotta sitä voidaan käyttää.",
+  "filter_modal.added.expired_title": "Vanhentunut suodatin!",
+  "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin siirtymällä {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Suodattimen asetukset",
+  "filter_modal.added.settings_link": "asetukset sivu",
+  "filter_modal.added.short_explanation": "Tämä viesti on lisätty seuraavaan suodatinluokkaan: {title}.",
+  "filter_modal.added.title": "Suodatin lisätty!",
+  "filter_modal.select_filter.context_mismatch": "ei sovellu tähän asiayhteyteen",
+  "filter_modal.select_filter.expired": "vanhentunut",
+  "filter_modal.select_filter.prompt_new": "Uusi luokka: {name}",
+  "filter_modal.select_filter.search": "Etsi tai luo",
+  "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi luokka",
+  "filter_modal.select_filter.title": "Suodata tämä viesti",
+  "filter_modal.title.status": "Suodata viesti",
   "follow_recommendations.done": "Valmis",
-  "follow_recommendations.heading": "Seuraa ihmisiä, joilta haluaisit nähdä viestejä! Tässä on muutamia ehdotuksia.",
-  "follow_recommendations.lead": "Viestit seuraamiltasi henkilöiltä näkyvät aikajärjestyksessä kotinäytön syötteessä. Älä pelkää seurata vahingossa, voit lopettaa seuraaminen yhtä helposti milloin tahansa!",
+  "follow_recommendations.heading": "Seuraa ihmisiä, joilta haluaisit nähdä julkaisuja! Tässä on muutamia ehdotuksia.",
+  "follow_recommendations.lead": "Seuraamiesi julkaisut näkyvät aikajärjestyksessä kotisyötteessä. Älä pelkää seurata vahingossa, voit lopettaa seuraamisen yhtä helposti!",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
-  "follow_requests.unlocked_explanation": "Vaikka tiliäsi ei ole lukittu, {domain}:n ylläpitäjien mielestä saatat haluta tarkistaa nämä seurauspyynnöt manuaalisesti.",
+  "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelun {domain} ylläpito on arvioinut, että voi olla halukas tarkistamaan nämä seurauspyynnöt erikseen.",
+  "footer.about": "Tietoja",
+  "footer.directory": "Profiilihakemisto",
+  "footer.get_app": "Hanki sovellus",
+  "footer.invite": "Kutsu ihmisiä",
+  "footer.keyboard_shortcuts": "Pikanäppäimet",
+  "footer.privacy_policy": "Tietosuojakäytäntö",
+  "footer.source_code": "Näytä lähdekoodi",
   "generic.saved": "Tallennettu",
-  "getting_started.developers": "Kehittäjät",
-  "getting_started.directory": "Profiilihakemisto",
-  "getting_started.documentation": "Käyttöohjeet",
   "getting_started.heading": "Näin pääset alkuun",
-  "getting_started.invite": "Kutsu ihmisiä",
-  "getting_started.open_source_notice": "Mastodon on avoimen lähdekoodin ohjelma. Voit avustaa tai raportoida ongelmia GitHubissa: {github}.",
-  "getting_started.security": "Tiliasetukset",
-  "getting_started.terms": "Käyttöehdot",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "tai {additional}",
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Mikä tahansa näistä",
   "hashtag.column_settings.tag_mode.none": "Ei mitään näistä",
   "hashtag.column_settings.tag_toggle": "Sisällytä lisätunnisteet tähän sarakkeeseen",
+  "hashtag.follow": "Seuraa hashtagia",
+  "hashtag.unfollow": "Lopeta seuraaminen hashtagilla",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
   "home.hide_announcements": "Piilota ilmoitukset",
   "home.show_announcements": "Näytä ilmoitukset",
+  "interaction_modal.description.favourite": "Kun sinulla on tili Mastodonissa, voit lisätä tämän viestin suosikkeihin ja tallentaa sen myöhempää käyttöä varten.",
+  "interaction_modal.description.follow": "Kun sinulla on tili Mastodonissa, voit seurata {name} saadaksesi hänen viestejä sinun kotisyötteeseen.",
+  "interaction_modal.description.reblog": "Kun sinulla on tili Mastodonissa, voit tehostaa viestiä ja jakaa sen omien seuraajiesi kanssa.",
+  "interaction_modal.description.reply": "Kun sinulla on tili Mastodonissa, voit vastata tähän viestiin.",
+  "interaction_modal.on_another_server": "Toisella palvelimella",
+  "interaction_modal.on_this_server": "Tällä palvelimella",
+  "interaction_modal.other_server_instructions": "Kopioi ja liitä tämä URL-osoite käyttämäsi Mastodon-sovelluksen hakukenttään tai Mastodon-palvelimen web-käyttöliittymään.",
+  "interaction_modal.preamble": "Koska Mastodon on hajautettu, voit käyttää toisen Mastodon-palvelimen tai yhteensopivan alustan ylläpitämää tiliäsi, jos sinulla ei ole tiliä tällä palvelimella.",
+  "interaction_modal.title.favourite": "Suosikin {name} viesti",
+  "interaction_modal.title.follow": "Seuraa {name}",
+  "interaction_modal.title.reblog": "Tehosta {name} viestiä",
+  "interaction_modal.title.reply": "Vastaa käyttäjän {name} viestiin",
   "intervals.full.days": "{number, plural, one {# päivä} other {# päivää}}",
   "intervals.full.hours": "{number, plural, one {# tunti} other {# tuntia}}",
   "intervals.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}}",
@@ -221,13 +309,13 @@
   "keyboard_shortcuts.column": "Kohdista sarakkeeseen",
   "keyboard_shortcuts.compose": "siirry tekstinsyöttöön",
   "keyboard_shortcuts.description": "Kuvaus",
-  "keyboard_shortcuts.direct": "Avaa pikaviestisarake",
+  "keyboard_shortcuts.direct": "avaa yksityisviesti sarake",
   "keyboard_shortcuts.down": "Siirry listassa alaspäin",
-  "keyboard_shortcuts.enter": "Avaa viesti",
+  "keyboard_shortcuts.enter": "Avaa julkaisu",
   "keyboard_shortcuts.favourite": "Lisää suosikkeihin",
   "keyboard_shortcuts.favourites": "Avaa lista suosikeista",
   "keyboard_shortcuts.federated": "Avaa yleinen aikajana",
-  "keyboard_shortcuts.heading": "Näppäinkomennot",
+  "keyboard_shortcuts.heading": "Pikanäppäimet",
   "keyboard_shortcuts.home": "Avaa kotiaikajana",
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä selite",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Laajenna kuvan näkymälaatikko",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
+  "limited_account_hint.action": "Näytä profiili joka tapauksessa",
+  "limited_account_hint.title": "Palvelun {domain} ylläpito on piilottanut tämän profiilin.",
   "lists.account.add": "Lisää listaan",
   "lists.account.remove": "Poista listasta",
   "lists.delete": "Poista lista",
@@ -267,29 +357,29 @@
   "lists.replies_policy.title": "Näytä vastaukset:",
   "lists.search": "Etsi seuraamistasi henkilöistä",
   "lists.subheading": "Omat listasi",
-  "load_pending": "{count, plural, one {# uusi kappale} other {# uutta kappaletta}}",
+  "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan...",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "missing_indicator.label": "Ei löytynyt",
   "missing_indicator.sublabel": "Tätä resurssia ei löytynyt",
+  "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.duration": "Kesto",
   "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
   "mute_modal.indefinite": "Ikuisesti",
-  "navigation_bar.apps": "Mobiilisovellukset",
+  "navigation_bar.about": "Tietoja",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Luo uusi viesti",
-  "navigation_bar.direct": "Pikaviestit",
+  "navigation_bar.direct": "Yksityisviestit",
   "navigation_bar.discover": "Löydä uutta",
-  "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
+  "navigation_bar.domain_blocks": "Estetyt palvelut",
   "navigation_bar.edit_profile": "Muokkaa profiilia",
+  "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
   "navigation_bar.follow_requests": "Seuraamispyynnöt",
   "navigation_bar.follows_and_followers": "Seurattavat ja seuraajat",
-  "navigation_bar.info": "Tietoa tästä palvelimesta",
-  "navigation_bar.keyboard_shortcuts": "Näppäinkomennot",
   "navigation_bar.lists": "Listat",
   "navigation_bar.logout": "Kirjaudu ulos",
   "navigation_bar.mutes": "Mykistetyt käyttäjät",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "Kiinnitetyt viestit",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.public_timeline": "Yleinen aikajana",
+  "navigation_bar.search": "Haku",
   "navigation_bar.security": "Turvallisuus",
+  "not_signed_in_indicator.not_signed_in": "Sinun täytyy kirjautua sisään päästäksesi käsiksi tähän resurssiin.",
+  "notification.admin.report": "{name} ilmoitti {target}",
+  "notification.admin.sign_up": "{name} rekisteröitynyt",
   "notification.favourite": "{name} tykkäsi viestistäsi",
   "notification.follow": "{name} seurasi sinua",
   "notification.follow_request": "{name} haluaa seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
   "notification.own_poll": "Kyselysi on päättynyt",
   "notification.poll": "Kysely, johon osallistuit, on päättynyt",
-  "notification.reblog": "{name} buustasi tilaasi",
-  "notification.status": "{name} juuri lähetetty",
+  "notification.reblog": "{name} buustasi julkaisusi",
+  "notification.status": "{name} julkaisi juuri",
+  "notification.update": "{name} muokkasi viestiä",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
+  "notifications.column_settings.admin.report": "Uudet raportit:",
+  "notifications.column_settings.admin.sign_up": "Uudet kirjautumiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
   "notifications.column_settings.favourite": "Tykkäykset:",
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki kategoriat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
-  "notifications.column_settings.filter_bar.show": "Näytä",
+  "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
@@ -321,8 +418,10 @@
   "notifications.column_settings.reblog": "Buustit:",
   "notifications.column_settings.show": "Näytä sarakkeessa",
   "notifications.column_settings.sound": "Äänimerkki",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Lukemattomat ilmoitusmerkit",
+  "notifications.column_settings.status": "Uudet julkaisut:",
+  "notifications.column_settings.unread_notifications.category": "Lukemattomat ilmoitukset",
+  "notifications.column_settings.unread_notifications.highlight": "Korosta lukemattomat ilmoitukset",
+  "notifications.column_settings.update": "Muokkaukset:",
   "notifications.filter.all": "Kaikki",
   "notifications.filter.boosts": "Buustit",
   "notifications.filter.favourites": "Suosikit",
@@ -346,66 +445,129 @@
   "poll.total_votes": "{count, plural, one {# ääni} other {# ääntä}}",
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
   "poll_button.add_poll": "Lisää kysely",
   "poll_button.remove_poll": "Poista kysely",
-  "privacy.change": "Säädä tuuttauksen näkyvyyttä",
+  "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Julkaise vain mainituille käyttäjille",
-  "privacy.direct.short": "Suora viesti",
+  "privacy.direct.short": "Vain mainitut henkilöt",
   "privacy.private.long": "Julkaise vain seuraajille",
   "privacy.private.short": "Vain seuraajat",
-  "privacy.public.long": "Julkaise julkisille aikajanoille",
+  "privacy.public.long": "Näkyvissä kaikille",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Älä julkaise julkisilla aikajanoilla",
+  "privacy.unlisted.long": "Näkyvissä kaikille, mutta jättäen pois hakemisen mahdollisuus",
   "privacy.unlisted.short": "Listaamaton julkinen",
+  "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
+  "privacy_policy.title": "Tietosuojakäytäntö",
   "refresh": "Päivitä",
   "regeneration_indicator.label": "Ladataan…",
   "regeneration_indicator.sublabel": "Kotinäkymääsi valmistellaan!",
   "relative_time.days": "{number} pv",
+  "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten",
+  "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten",
+  "relative_time.full.just_now": "juuri nyt",
+  "relative_time.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} sitten",
+  "relative_time.full.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} sitten",
   "relative_time.hours": "{number} tuntia",
   "relative_time.just_now": "nyt",
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} sek",
   "relative_time.today": "tänään",
   "reply_indicator.cancel": "Peruuta",
+  "report.block": "Estä",
+  "report.block_explanation": "Et näe heidän viestejään, eivätkä he voi nähdä viestejäsi tai seurata sinua. He näkevät, että heidät on estetty.",
+  "report.categories.other": "Muu",
+  "report.categories.spam": "Roskaposti",
+  "report.categories.violation": "Sisältö rikkoo yhden tai useamman palvelimen sääntöjä",
+  "report.category.subtitle": "Valitse paras osuma",
+  "report.category.title": "Kerro meille mitä tämän {type} kanssa tapahtuu",
+  "report.category.title_account": "profiili",
+  "report.category.title_status": "viesti",
+  "report.close": "Valmis",
+  "report.comment.title": "Pitäisikö meidän tietää jotain muuta?",
   "report.forward": "Välitä kohteeseen {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
-  "report.hint": "Raportti lähetetään oman palvelimesi moderaattoreille. Voit kertoa alla, miksi raportoit tästä tilistä:",
+  "report.mute": "Mykistä",
+  "report.mute_explanation": "Et näe heidän viestejään. He voivat silti seurata sinua ja nähdä viestisi eivätkä tiedä, että heidät on mykistetty.",
+  "report.next": "Seuraava",
   "report.placeholder": "Lisäkommentit",
+  "report.reasons.dislike": "En pidä siitä",
+  "report.reasons.dislike_description": "Et halua nähdä sitä",
+  "report.reasons.other": "Se on jotain muuta",
+  "report.reasons.other_description": "Ongelma ei sovi muihin kategorioihin",
+  "report.reasons.spam": "Se on roskapostia",
+  "report.reasons.spam_description": "Haitalliset linkit, väärennetyt sitoutumiset tai toistuvat vastaukset",
+  "report.reasons.violation": "Se rikkoo palvelimen sääntöjä",
+  "report.reasons.violation_description": "Tiedät, että se rikkoo tiettyjä sääntöjä",
+  "report.rules.subtitle": "Valitse kaikki jotka sopivat",
+  "report.rules.title": "Mitä sääntöjä rikotaan?",
+  "report.statuses.subtitle": "Valitse kaikki jotka sopivat",
+  "report.statuses.title": "Onko olemassa yhtään viestiä, jotka tukevat tätä raporttia?",
   "report.submit": "Lähetä",
   "report.target": "Raportoidaan {target}",
+  "report.thanks.take_action": "Tässä on vaihtoehtosi hallita näkemääsi Mastodonissa:",
+  "report.thanks.take_action_actionable": "Sillä välin kun tarkistamme tätä, voit ryhtyä toimenpiteisiin käyttäjää @{name} vastaan:",
+  "report.thanks.title": "Etkö halua nähdä tätä?",
+  "report.thanks.title_actionable": "Kiitos raportista, tutkimme asiaa.",
+  "report.unfollow": "Lopeta seuraaminen @{name}",
+  "report.unfollow_explanation": "Seuraat tätä tiliä. Jotta et enää näkisi heidän kirjoituksiaan, lopeta niiden seuraaminen.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} viesti} other {{count} viestiä}} liitteenä",
+  "report_notification.categories.other": "Muu",
+  "report_notification.categories.spam": "Roskaposti",
+  "report_notification.categories.violation": "Sääntöjen rikkominen",
+  "report_notification.open": "Avaa raportti",
   "search.placeholder": "Hae",
+  "search.search_or_paste": "Etsi tai kirjoita URL-osoite",
   "search_popout.search_format": "Tarkennettu haku",
   "search_popout.tips.full_text": "Tekstihaku listaa tilapäivitykset, jotka olet kirjoittanut, lisännyt suosikkeihisi, boostannut tai joissa sinut mainitaan, sekä tekstin sisältävät käyttäjänimet, nimimerkit ja hastagit.",
   "search_popout.tips.hashtag": "aihetunnisteet",
-  "search_popout.tips.status": "tila",
+  "search_popout.tips.status": "julkaisu",
   "search_popout.tips.text": "Tekstihaku listaa hakua vastaavat nimimerkit, käyttäjänimet ja hastagit",
   "search_popout.tips.user": "käyttäjä",
   "search_results.accounts": "Ihmiset",
+  "search_results.all": "Kaikki",
   "search_results.hashtags": "Aihetunnisteet",
-  "search_results.statuses": "Viestit",
+  "search_results.nothing_found": "Näille hakusanoille ei löytynyt mitään",
+  "search_results.statuses": "Julkaisut",
   "search_results.statuses_fts_disabled": "Viestien haku sisällön perusteella ei ole käytössä tällä Mastodon-palvelimella.",
-  "search_results.total": "{count, number} {count, plural, one {tulos} other {tulokset}}",
+  "search_results.title": "Etsi {q}",
+  "search_results.total": "{count, number} {count, plural, one {tulos} other {tulosta}}",
+  "server_banner.about_active_users": "Palvelinta käyttäneet ihmiset viimeisen 30 päivän aikana (kuukauden aktiiviset käyttäjät)",
+  "server_banner.active_users": "aktiiviset käyttäjät",
+  "server_banner.administered_by": "Ylläpitäjä:",
+  "server_banner.introduction": "{domain} kuuluu hajautettuun sosiaaliseen verkostoon, jonka voimanlähde on {mastodon}.",
+  "server_banner.learn_more": "Lue lisää",
+  "server_banner.server_stats": "Palvelimen tilastot:",
+  "sign_in_banner.create_account": "Luo tili",
+  "sign_in_banner.sign_in": "Kirjaudu sisään",
+  "sign_in_banner.text": "Kirjaudu sisään seurataksesi profiileja tai hashtageja, lisätäksesi suosikkeihin, jakaaksesi viestejä ja vastataksesi niihin tai ollaksesi vuorovaikutuksessa tililläsi toisella palvelimella.",
   "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}",
-  "status.admin_status": "Avaa tämä viesti moderointinäkymässä",
+  "status.admin_status": "Avaa julkaisu moderointinäkymässä",
   "status.block": "Estä @{name}",
   "status.bookmark": "Tallenna kirjanmerkki",
   "status.cancel_reblog_private": "Peru buustaus",
   "status.cannot_reblog": "Tätä viestiä ei voi buustata",
-  "status.copy": "Kopioi linkki tilapäivitykseen",
+  "status.copy": "Kopioi linkki julkaisuun",
   "status.delete": "Poista",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
-  "status.direct": "Pikaviesti käyttäjälle @{name}",
+  "status.direct": "Yksityisviesti käyttäjälle @{name}",
+  "status.edit": "Muokkaa",
+  "status.edited": "Muokattu {date}",
+  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Upota",
-  "status.favourite": "Tykkää",
+  "status.favourite": "Lisää suosikkeihin",
+  "status.filter": "Suodata tämä viesti",
   "status.filtered": "Suodatettu",
+  "status.hide": "Piilota toot",
+  "status.history.created": "{name} luotu {date}",
+  "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",
   "status.more": "Lisää",
   "status.mute": "Mykistä @{name}",
   "status.mute_conversation": "Mykistä keskustelu",
-  "status.open": "Laajenna viestit",
+  "status.open": "Laajenna julkaisu",
   "status.pin": "Kiinnitä profiiliin",
   "status.pinned": "Kiinnitetty viesti",
   "status.read_more": "Näytä enemmän",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Kukaan ei ole vielä buustannut tätä viestiä. Kun joku tekee niin, näkyy kyseinen henkilö tässä.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",
+  "status.replied_to": "Vastasit käyttäjälle {name}",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
   "status.report": "Raportoi @{name}",
   "status.sensitive_warning": "Arkaluontoista sisältöä",
   "status.share": "Jaa",
+  "status.show_filter_reason": "Näytä joka tapauksessa",
   "status.show_less": "Näytä vähemmän",
   "status.show_less_all": "Näytä vähemmän kaikista",
   "status.show_more": "Näytä lisää",
   "status.show_more_all": "Näytä lisää kaikista",
-  "status.show_thread": "Näytä ketju",
+  "status.show_original": "Näytä alkuperäinen",
+  "status.translate": "Käännä",
+  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
   "status.uncached_media_warning": "Ei saatavilla",
   "status.unmute_conversation": "Poista keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
+  "subscribed_languages.lead": "Vain valituilla kielillä julkaistut viestit näkyvät etusivullasi ja aikajanalla muutoksen jälkeen. Valitse ei mitään, jos haluat vastaanottaa viestejä kaikilla kielillä.",
+  "subscribed_languages.save": "Tallenna muutokset",
+  "subscribed_languages.target": "Vaihda tilatut kielet {target}",
   "suggestions.dismiss": "Hylkää ehdotus",
   "suggestions.header": "Saatat olla kiinnostunut myös…",
   "tabs_bar.federated_timeline": "Yleinen",
   "tabs_bar.home": "Koti",
   "tabs_bar.local_timeline": "Paikallinen",
   "tabs_bar.notifications": "Ilmoitukset",
-  "tabs_bar.search": "Hae",
   "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
   "time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
@@ -442,27 +610,28 @@
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
   "timeline_hint.remote_resource_not_displayed": "{resource} muilta palvelimilta ei näytetä.",
   "timeline_hint.resources.followers": "Seuraajat",
-  "timeline_hint.resources.follows": "Seuraa",
-  "timeline_hint.resources.statuses": "Vanhemmat tuuttaukset",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} puhuu",
+  "timeline_hint.resources.follows": "seurattua",
+  "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} viimeisten {days, plural, one {päivän} other {{days} päivän}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
-  "units.short.billion": "{count} miljardia",
-  "units.short.million": "{count} miljoonaa",
-  "units.short.thousand": "{count} tuhatta",
+  "units.short.billion": "{count} mrd.",
+  "units.short.million": "{count} milj.",
+  "units.short.thousand": "{count} t.",
   "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää mediaa",
   "upload_error.limit": "Tiedostolatauksien raja ylitetty.",
   "upload_error.poll": "Tiedon lataaminen ei ole sallittua kyselyissä.",
-  "upload_form.audio_description": "Kuvaile kuulovammaisille",
-  "upload_form.description": "Anna kuvaus näkörajoitteisia varten",
+  "upload_form.audio_description": "Kuvaile kuuroille tai kuulorajoitteisille",
+  "upload_form.description": "Kuvaile sokeille tai näkörajoitteisille",
+  "upload_form.description_missing": "Kuvausta ei ole lisätty",
   "upload_form.edit": "Muokkaa",
   "upload_form.thumbnail": "Vaihda pikkukuva",
   "upload_form.undo": "Peru",
-  "upload_form.video_description": "Kuvaile kuulo- tai näkövammaisille",
+  "upload_form.video_description": "Kuvaile kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Asetetaan…",
   "upload_modal.choose_image": "Valitse kuva",
   "upload_modal.description_placeholder": "Nopea ruskea kettu hyppää laiskan koiran yli",
   "upload_modal.detect_text": "Tunnista teksti kuvasta",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Valmistellaan OCR…",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
   "upload_progress.label": "Ladataan...",
+  "upload_progress.processing": "Käsitellään…",
   "video.close": "Sulje video",
   "video.download": "Lataa tiedosto",
   "video.exit_fullscreen": "Poistu koko näytön tilasta",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
new file mode 100644
index 000000000..15b5d6ce0
--- /dev/null
+++ b/app/javascript/mastodon/locales/fo.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Tálmaðir ambætarar",
+  "about.contact": "Samband:",
+  "about.disclaimer": "Mastodon er fríur ritbúnaður við opnari keldu og eitt vørumerki hjá Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Ókent orsøk",
+  "about.domain_blocks.preamble": "Yvirhøvur, so loyvir Mastodon tær at síggja innihald frá og at samvirka við brúkarar frá ein og hvørjum ambætara í fediverse. Undantøkini, sum eru gjørd á júst hesum ambætaranum, eru hesi.",
+  "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.",
+  "about.domain_blocks.silenced.title": "Avmarkað",
+  "about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.",
+  "about.domain_blocks.suspended.title": "Koyrdur frá",
+  "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
+  "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
+  "about.rules": "Ambætarareglur",
+  "account.account_note_header": "Viðmerking",
+  "account.add_or_remove_from_list": "Legg afturat ella tak av listum",
+  "account.badges.bot": "Bottur",
+  "account.badges.group": "Bólkur",
+  "account.block": "Banna @{name}",
+  "account.block_domain": "Banna økisnavnið {domain}",
+  "account.blocked": "Bannað/ur",
+  "account.browse_more_on_origin_server": "Kaga meira á upprunaligu vangamyndina",
+  "account.cancel_follow_request": "Strika fylgjaraumbøn",
+  "account.direct": "Beinleiðis boð @{name}",
+  "account.disable_notifications": "Ikki boða mær frá, tá @{name} skrivar",
+  "account.domain_blocked": "Økisnavn bannað",
+  "account.edit_profile": "Broyt vanga",
+  "account.enable_notifications": "Boða mær frá, tá @{name} skrivar",
+  "account.endorse": "Víst á vangamyndini",
+  "account.featured_tags.last_status_at": "Seinasta strongur skrivaður {date}",
+  "account.featured_tags.last_status_never": "Einki uppslag",
+  "account.featured_tags.title": "Tvíkrossar hjá {name}",
+  "account.follow": "Fylg",
+  "account.followers": "Fylgjarar",
+  "account.followers.empty": "Ongar fylgjarar enn.",
+  "account.followers_counter": "{count, plural, one {{counter} Fylgjari} other {{counter} Fylgjarar}}",
+  "account.following": "Fylgir",
+  "account.following_counter": "{count, plural, one {{counter} fylgir} other {{counter} fylgja}}",
+  "account.follows.empty": "Hesin brúkari fylgir ongum enn.",
+  "account.follows_you": "Fylgir tær",
+  "account.go_to_profile": "Far til vanga",
+  "account.hide_reblogs": "Fjal lyft frá @{name}",
+  "account.joined_short": "Gjørdist limur",
+  "account.languages": "Broyt fylgd mál",
+  "account.link_verified_on": "Ognarskapur av hesum leinki var eftirkannaður {date}",
+  "account.locked_info": "Privatverjustøðan hjá hesi kontuni er sett til at vera læst. Eigarin avger í hvørjum einstøkum føri, hvør kann fylgja teimum.",
+  "account.media": "Miðlar",
+  "account.mention": "Nevn @{name}",
+  "account.moved_to": "{name} hevur gjørt kunnugt, at teirra nýggja konta er nú:",
+  "account.mute": "Sløkk @{name}",
+  "account.mute_notifications": "Sløkk fráboðanir frá @{name}",
+  "account.muted": "Sløkt/ur",
+  "account.open_original_page": "Opna upprunasíðuna",
+  "account.posts": "Uppsløg",
+  "account.posts_with_replies": "Uppsløg og svar",
+  "account.report": "Melda @{name}",
+  "account.requested": "Bíðar eftir góðkenning. Trýst fyri at angra umbønina",
+  "account.requested_follow": "{name} hevur biðið um at fylgja tær",
+  "account.share": "Deil vanga @{name}'s",
+  "account.show_reblogs": "Vís lyft frá @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} postur} other {{counter} postar}}",
+  "account.unblock": "Banna ikki @{name}",
+  "account.unblock_domain": "Banna ikki økisnavnið {domain}",
+  "account.unblock_short": "Banna ikki",
+  "account.unendorse": "Vís ikki á vanga",
+  "account.unfollow": "Fylg ikki",
+  "account.unmute": "Doyv ikki @{name}",
+  "account.unmute_notifications": "Doyv ikki fráboðanum frá @{name}",
+  "account.unmute_short": "Doyv ikki",
+  "account_note.placeholder": "Klikka fyri at leggja notu afturat",
+  "admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
+  "admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
+  "admin.dashboard.retention.average": "Miðal",
+  "admin.dashboard.retention.cohort": "Skrásetingarmánaði",
+  "admin.dashboard.retention.cohort_size": "Nýggir brúkarar",
+  "alert.rate_limited.message": "Vinarliga royn aftur aftaná {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Avmarkaður títtleiki",
+  "alert.unexpected.message": "Ein óvæntaður feilur kom fyri.",
+  "alert.unexpected.title": "Ups!",
+  "announcement.announcement": "Kunngerð",
+  "attachments_list.unprocessed": "(óviðgjørt)",
+  "audio.hide": "Fjal ljóð",
+  "autosuggest_hashtag.per_week": "{count} um vikuna",
+  "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
+  "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
+  "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
+  "bundle_column_error.error.title": "Áh, nei!",
+  "bundle_column_error.network.body": "Har hendir ein feilur, tá hendan síðan var tikin fram. Tað kann vera orsakað av einum bráðfeingis trupulleika við netsambandinum hjá tær ella við hesum ambætaranum.",
+  "bundle_column_error.network.title": "Netverksfeilur",
+  "bundle_column_error.retry": "Royn umaftur",
+  "bundle_column_error.return": "Aftur til forsíðuna",
+  "bundle_column_error.routing.body": "Tað bar ikki til at finna umbidnu síðuna. Er URL'urin rættur?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Lat aftur",
+  "bundle_modal_error.message": "Okkurt gekk galið, tá hesin komponenturin bleiv innlisin.",
+  "bundle_modal_error.retry": "Royn umaftur",
+  "closed_registrations.other_server_instructions": "Av tí at Mastodon er desentraliserað, kanst tú stovna eina kontu á einum øðrum ambætara og framvegis virka saman við hesum ambætaranum.",
+  "closed_registrations_modal.description": "Tað er ikki møguligt at stovna sær eina kontu á {domain} í løtuni, men vinarliga hav í huga at tær nýtist ikki eina kontu á júst {domain} fyri at brúka Mastodon.",
+  "closed_registrations_modal.find_another_server": "Finn ein annan ambætara",
+  "closed_registrations_modal.preamble": "Mastodon er desentraliserað, so óansæð hvar tú stovnar tína kontu, so ber til hjá tær at fylgja og virka saman við einum og hvørjum á hesum ambætaranum. Tað ber enntá til at hýsa tí sjálvi!",
+  "closed_registrations_modal.title": "At stovna kontu á Mastodon",
+  "column.about": "Um",
+  "column.blocks": "Bannaðir brúkarar",
+  "column.bookmarks": "Bókamerki",
+  "column.community": "Lokal tíðarlinja",
+  "column.direct": "Beinleiðis boð",
+  "column.directory": "Blaða gjøgnum vangar",
+  "column.domain_blocks": "Bannað økisnøvn",
+  "column.favourites": "Dámd",
+  "column.follow_requests": "Umbønir at fylgja",
+  "column.home": "Heim",
+  "column.lists": "Listar",
+  "column.mutes": "Sløktir brúkarar",
+  "column.notifications": "Fráboðanir",
+  "column.pins": "Festir postar",
+  "column.public": "Felags tíðarlinja",
+  "column_back_button.label": "Aftur",
+  "column_header.hide_settings": "Fjal stillingar",
+  "column_header.moveLeft_settings": "Flyt teigin til vinstru",
+  "column_header.moveRight_settings": "Flyt teigin til høgru",
+  "column_header.pin": "Fest",
+  "column_header.show_settings": "Vís stillingar",
+  "column_header.unpin": "Loys",
+  "column_subheading.settings": "Stillingar",
+  "community.column_settings.local_only": "Einans lokalt",
+  "community.column_settings.media_only": "Einans miðlar",
+  "community.column_settings.remote_only": "Einans útifrá",
+  "compose.language.change": "Skift mál",
+  "compose.language.search": "Leita eftir málum...",
+  "compose_form.direct_message_warning_learn_more": "Fleiri upplýsingar",
+  "compose_form.encryption_warning": "Postar á Mastodon eru ikki bronglaðir úr enda í annan. Lat vera við at deila viðkvæmar upplýsingar á Mastodon.",
+  "compose_form.hashtag_warning": "Hesin posturin verður ikki listaður undir nøkrum frámerki, tí hann er ólistaður. Tað ber einans til at leita eftir almennum postum eftir frámerki.",
+  "compose_form.lock_disclaimer": "Kontoin hjá tær er ikki {locked}. Øll kunnu fylgja tær og lesa tað, tú bert letur fyljgarar lesa.",
+  "compose_form.lock_disclaimer.lock": "læst",
+  "compose_form.placeholder": "Hvat hevur tú í huga?",
+  "compose_form.poll.add_option": "Legg valmøguleika afturat",
+  "compose_form.poll.duration": "Atkvøðugreiðslutíð",
+  "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
+  "compose_form.poll.remove_option": "Strika valmøguleikan",
+  "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
+  "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
+  "compose_form.publish": "Legg út",
+  "compose_form.publish_form": "Legg út",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Goym broytingar",
+  "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+  "compose_form.spoiler.marked": "Ávaring um at strika innihald",
+  "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
+  "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+  "confirmation_modal.cancel": "Strika",
+  "confirmations.block.block_and_report": "Banna og melda",
+  "confirmations.block.confirm": "Banna",
+  "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
+  "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
+  "confirmations.delete.confirm": "Strika",
+  "confirmations.delete.message": "Er tað tilætlað, at tú strikar hetta uppslagið?",
+  "confirmations.delete_list.confirm": "Strika",
+  "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
+  "confirmations.discard_edit_media.confirm": "Vraka",
+  "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
+  "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+  "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
+  "confirmations.logout.confirm": "Rita út",
+  "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
+  "confirmations.mute.confirm": "Doyv",
+  "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
+  "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
+  "confirmations.redraft.confirm": "Sletta og skriva umaftur",
+  "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
+  "confirmations.reply.confirm": "Svara",
+  "confirmations.reply.message": "Svarar tú nú, verða boðini, sum tú ert í holt við at skriva yvirskrivað. Ert tú vís/ur í, at tú vilt halda fram?",
+  "confirmations.unfollow.confirm": "Fylg ikki",
+  "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
+  "conversation.delete": "Strika samrøðu",
+  "conversation.mark_as_read": "Merk sum lisið",
+  "conversation.open": "Vís samrøðu",
+  "conversation.with": "Við {names}",
+  "copypaste.copied": "Avritað",
+  "copypaste.copy": "Avrita",
+  "directory.federated": "Frá tí kenda fediversinum",
+  "directory.local": "Einans frá {domain}",
+  "directory.new_arrivals": "Nýkomið",
+  "directory.recently_active": "Nýliga virkin",
+  "disabled_account_banner.account_settings": "Kontustillingar",
+  "disabled_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin.",
+  "dismissable_banner.community_timeline": "Hesir er nýggjastu almennu postarnir frá fólki, hvørs kontur eru hýstar av {domain}.",
+  "dismissable_banner.dismiss": "Avvís",
+  "dismissable_banner.explore_links": "Fólk tosa um hesi tíðindi, á hesum og øðrum ambætarum á miðspjadda netverkinum, júst nú.",
+  "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú.",
+  "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
+  "dismissable_banner.public_timeline": "Hetta eru nýggjastu almennu postarnir á hesum og øðrum ambætarum í desentrala netverkinum, sum hesin ambætarin kennir til.",
+  "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
+  "embed.preview": "Soleiðis fer tað at síggja út:",
+  "emoji_button.activity": "Virksemi",
+  "emoji_button.clear": "Rudda",
+  "emoji_button.custom": "Tillaga",
+  "emoji_button.flags": "Fløgg",
+  "emoji_button.food": "Matur & Drekka",
+  "emoji_button.label": "Innset emoji",
+  "emoji_button.nature": "Náttúra",
+  "emoji_button.not_found": "Eingin kenslutekn funnin",
+  "emoji_button.objects": "Lutir",
+  "emoji_button.people": "Fólk",
+  "emoji_button.recent": "Javnan nýtt",
+  "emoji_button.search": "Leita...",
+  "emoji_button.search_results": "Leitiúrslit",
+  "emoji_button.symbols": "Ímyndir",
+  "emoji_button.travel": "Ferðing og støð",
+  "empty_column.account_suspended": "Kontan gjørd óvirkin",
+  "empty_column.account_timeline": "Einki uppslag her!",
+  "empty_column.account_unavailable": "Vangin er ikki tøkur",
+  "empty_column.blocks": "Tú hevur enn ikki bannað nakran brúkara.",
+  "empty_column.bookmarked_statuses": "Tú hevur enn einki goymt uppslag. Tú tú goymir eitt uppslag, kemur tað her.",
+  "empty_column.community": "Lokala tíðarlinjan er tóm. Skriva okkurt alment fyri at fáa boltin á rull!",
+  "empty_column.direct": "Tú hevur eingi beinleiðis boð enn. Tá tú sendir ella móttekur eini beinleiðis boð, so síggjast tey her.",
+  "empty_column.domain_blocks": "Enn eru eingi blokeraði domenir.",
+  "empty_column.explore_statuses": "Einki rák er beint nú. Royn aftur seinni!",
+  "empty_column.favourited_statuses": "Tú hevur ongar yndispostar enn. Tá tú gevur einum posti yndismerki, so sært tú hann her.",
+  "empty_column.favourites": "Eingin hevur givið hesum postinum yndismerki enn. Tá onkur ger, so sæst tað her.",
+  "empty_column.follow_recommendations": "Tað sær út sum, at eingi uppskot kundu fáast fram til tín. Tú kanst royna at brúka leiting fyri at finna fólk, sum tú kanska kennir, ella at kanna frámerki, sum eru vælumtókt í løtuni.",
+  "empty_column.follow_requests": "Tú hevur ongar umbønir um at verða fylgd/ur enn. Tá tú fær eina, so sæst hon her.",
+  "empty_column.hashtag": "Einki er í hesum frámerkinum enn.",
+  "empty_column.home": "Heima-tíðarlinjan hjá tær er tóm! Fylg fleiri fyri at fylla hana. {suggestions}",
+  "empty_column.home.suggestions": "Síggj nøkur uppskot",
+  "empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
+  "empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
+  "empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+  "empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
+  "empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
+  "error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
+  "error.unexpected_crash.explanation_addons": "Hendan síðan kundi ikki vísast rætt. Orsøkin til feilin er sannlíkt vegna eina uppíbygging í kaganum hjá tær ella vegna amboð til sjálvvirkandi umseting.",
+  "error.unexpected_crash.next_steps": "Royn at lesa síðuna inn av nýggjum. Hjálpir tað ikki, so kann vera, at tað ber til at brúka Mastodon við einum øðrum kaga ella við eini app.",
+  "error.unexpected_crash.next_steps_addons": "Royn at gera tey óvirkin og lesa síðuna inn av nýggjum. Hjálpir tað ikki, so kann vera, at tað ber til at brúka Mastodon við einum øðrum kaga ella við eini app.",
+  "errors.unexpected_crash.copy_stacktrace": "Avrita stakkaslóðina til setiborðið",
+  "errors.unexpected_crash.report_issue": "Fráboða trupulleika",
+  "explore.search_results": "Leitiúrslit",
+  "explore.suggested_follows": "Til tín",
+  "explore.title": "Rannsaka",
+  "explore.trending_links": "Tíðindi",
+  "explore.trending_statuses": "Postar",
+  "explore.trending_tags": "Frámerki",
+  "filter_modal.added.context_mismatch_explanation": "Hesin filturbólkurin viðvíkur ikki kontekstinum, sum tú hevur fingið atgongd til hendan postin. Ynskir tú at posturin verður filtreraður í hesum kontekstinum eisini, so er neyðugt at tú rættar filtrið.",
+  "filter_modal.added.context_mismatch_title": "Ósamsvar við kontekst!",
+  "filter_modal.added.expired_explanation": "Hesin filturbólkurin er útgingin, og tú mást broyta dagfestingina fyri at hann skal virka.",
+  "filter_modal.added.expired_title": "Útgingið filtur!",
+  "filter_modal.added.review_and_configure": "Far til {settings_link} fyri at kanna og stilla hendan filturbólkin.",
+  "filter_modal.added.review_and_configure_title": "Filturstillingar",
+  "filter_modal.added.settings_link": "síða við stillingum",
+  "filter_modal.added.short_explanation": "Hesin posturin er lagdur afturat hesum filturbólkinum: {title}.",
+  "filter_modal.added.title": "Filtur lagt afturat!",
+  "filter_modal.select_filter.context_mismatch": "viðvíkur ikki hesum kontekstinum",
+  "filter_modal.select_filter.expired": "útgingið",
+  "filter_modal.select_filter.prompt_new": "Nýggjur bólkur: {name}",
+  "filter_modal.select_filter.search": "Leita ella skapa",
+  "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
+  "filter_modal.select_filter.title": "Filtrera hendan postin",
+  "filter_modal.title.status": "Filtrera ein post",
+  "follow_recommendations.done": "Liðugt",
+  "follow_recommendations.heading": "Fylg fólki, sum tú hevur hug at síggja postar frá! Her eru nøkur boð.",
+  "follow_recommendations.lead": "Postar frá fólki, sum tú fylgir, verða vístir í tíðarrøð á heimarásini hjá tær. Ver ikki bangin fyri at gera feilir; tú kanst gevast at fylgja fólki eins lættliga nær sum helst!",
+  "follow_request.authorize": "Veit myndugleika",
+  "follow_request.reject": "Nokta",
+  "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
+  "footer.about": "Um",
+  "footer.directory": "Vangaskrá",
+  "footer.get_app": "Heinta appina",
+  "footer.invite": "Bjóða fólki",
+  "footer.keyboard_shortcuts": "Knappasnarvegir",
+  "footer.privacy_policy": "Privatlívspolitikkur",
+  "footer.source_code": "Vís keldukotuna",
+  "generic.saved": "Goymt",
+  "getting_started.heading": "At byrja",
+  "hashtag.column_header.tag_mode.all": "og {additional}",
+  "hashtag.column_header.tag_mode.any": "ella {additional}",
+  "hashtag.column_header.tag_mode.none": "uttan {additional}",
+  "hashtag.column_settings.select.no_options_message": "Einki uppskot funnið",
+  "hashtag.column_settings.select.placeholder": "Áset fráboðanarmerki…",
+  "hashtag.column_settings.tag_mode.all": "Øll hesi",
+  "hashtag.column_settings.tag_mode.any": "Okkurt av hesum",
+  "hashtag.column_settings.tag_mode.none": "Einki av hesum",
+  "hashtag.column_settings.tag_toggle": "Legg frámerki afturat hesum teigi",
+  "hashtag.follow": "Fylg frámerki",
+  "hashtag.unfollow": "Gevst at fylgja frámerki",
+  "home.column_settings.basic": "Grundleggjandi",
+  "home.column_settings.show_reblogs": "Vís lyft",
+  "home.column_settings.show_replies": "Vís svar",
+  "home.hide_announcements": "Fjal kunngerðir",
+  "home.show_announcements": "Vís kunngerðir",
+  "interaction_modal.description.favourite": "Við einari kontu á Mastodon kanst tú dáma hetta uppslagið fyri at vísa rithøvundanum at tú virðismetur tað og goymir tað til seinni.",
+  "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
+  "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
+  "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.",
+  "interaction_modal.on_another_server": "Á øðrum ambætara",
+  "interaction_modal.on_this_server": "Á hesum ambætaranum",
+  "interaction_modal.other_server_instructions": "Kopiera og set hendan URLin inn í leititeigin í tíni yndis-Mastodon-app ella í vev-markamótið á tínum Mastodon-ambætara.",
+  "interaction_modal.preamble": "Av tí at Mastodon er desentraliserað, kanst tú brúka tína kontu frá einum øðrum Mastodon ambætara ella sambærligum palli, um tú ikki hevur eina kontu á hesum ambætaranum.",
+  "interaction_modal.title.favourite": "Dáma {name}sa uppslag",
+  "interaction_modal.title.follow": "Fylg {name}",
+  "interaction_modal.title.reblog": "Stimbra postin hjá {name}",
+  "interaction_modal.title.reply": "Svara postinum hjá {name}",
+  "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
+  "intervals.full.hours": "{number, plural, one {# tími} other {# tímar}}",
+  "intervals.full.minutes": "{number, plural, one {# minuttur} other {# minuttir}}",
+  "keyboard_shortcuts.back": "Bakka",
+  "keyboard_shortcuts.blocked": "Siggj listan við bannaðum brúkarum",
+  "keyboard_shortcuts.boost": "Lyft post",
+  "keyboard_shortcuts.column": "Fá teig í miðdepilin",
+  "keyboard_shortcuts.compose": "Fá skriviøkið í miðdeplin",
+  "keyboard_shortcuts.description": "Frágreiðing",
+  "keyboard_shortcuts.direct": "fyri at lata teig við beinleiðis boðum upp",
+  "keyboard_shortcuts.down": "Flyt niðureftir listanum",
+  "keyboard_shortcuts.enter": "Opna uppslag",
+  "keyboard_shortcuts.favourite": "Dáma uppslag",
+  "keyboard_shortcuts.favourites": "Opna listan av dámdum",
+  "keyboard_shortcuts.federated": "Lat felags tíðslinju upp",
+  "keyboard_shortcuts.heading": "Snarknappar",
+  "keyboard_shortcuts.home": "Lat heimatíðarlinju upp",
+  "keyboard_shortcuts.hotkey": "Snarknappur",
+  "keyboard_shortcuts.legend": "Vís henda tekstin",
+  "keyboard_shortcuts.local": "Lat lokala tíðarlinju upp",
+  "keyboard_shortcuts.mention": "Nevn rithøvund",
+  "keyboard_shortcuts.muted": "Lat upp lista við doyvdum brúkarum",
+  "keyboard_shortcuts.my_profile": "Lat vanga tín upp",
+  "keyboard_shortcuts.notifications": "Lat fráboðanarteig upp",
+  "keyboard_shortcuts.open_media": "Lat miðlar upp",
+  "keyboard_shortcuts.pinned": "Lat lista yvir festar postar upp",
+  "keyboard_shortcuts.profile": "Lat vangan hjá høvundinum upp",
+  "keyboard_shortcuts.reply": "Svara posti",
+  "keyboard_shortcuts.requests": "Lat lista við fylgjaraumbønum upp",
+  "keyboard_shortcuts.search": "Fá leitibjálka í miðdepilin",
+  "keyboard_shortcuts.spoilers": "Vís/fjal CW teig",
+  "keyboard_shortcuts.start": "Lat \"kom í gongd\" teig upp",
+  "keyboard_shortcuts.toggle_hidden": "Vís/fjal tekst handan CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Vís ella fjal innihald",
+  "keyboard_shortcuts.toot": "Byrja nýggjan post",
+  "keyboard_shortcuts.unfocus": "Tak skrivi-/leiti-økið úr miðdeplinum",
+  "keyboard_shortcuts.up": "Flyt upp á listanum",
+  "lightbox.close": "Lat aftur",
+  "lightbox.compress": "Kroyst myndavísikassa saman",
+  "lightbox.expand": "Víðka myndavísikassa",
+  "lightbox.next": "Fram",
+  "lightbox.previous": "Aftur",
+  "limited_account_hint.action": "Vís vangamynd kortini",
+  "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.",
+  "lists.account.add": "Legg afturat lista",
+  "lists.account.remove": "Tak av lista",
+  "lists.delete": "Strika lista",
+  "lists.edit": "Broyt lista",
+  "lists.edit.submit": "Broyt heiti",
+  "lists.new.create": "Ger nýggjan lista",
+  "lists.new.title_placeholder": "Nýtt navn á lista",
+  "lists.replies_policy.followed": "Øllum fylgdum brúkarum",
+  "lists.replies_policy.list": "Listalimunum",
+  "lists.replies_policy.none": "Eingin",
+  "lists.replies_policy.title": "Vís svarini fyri:",
+  "lists.search": "Leita millum fólk, sum tú fylgir",
+  "lists.subheading": "Tínir listar",
+  "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
+  "loading_indicator.label": "Innlesi...",
+  "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
+  "missing_indicator.label": "Ikki funnið",
+  "missing_indicator.sublabel": "Ikki bar til at finna hetta tilfarið",
+  "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
+  "mute_modal.duration": "Tíðarbil",
+  "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
+  "mute_modal.indefinite": "Óásett tíðarskeið",
+  "navigation_bar.about": "Um",
+  "navigation_bar.blocks": "Bannaðir brúkarar",
+  "navigation_bar.bookmarks": "Goymd",
+  "navigation_bar.community_timeline": "Lokal tíðarlinja",
+  "navigation_bar.compose": "Skriva nýggjan post",
+  "navigation_bar.direct": "Beinleiðis boð",
+  "navigation_bar.discover": "Uppdaga",
+  "navigation_bar.domain_blocks": "Bannað økisnøvn",
+  "navigation_bar.edit_profile": "Broyt vanga",
+  "navigation_bar.explore": "Kanna",
+  "navigation_bar.favourites": "Dámd",
+  "navigation_bar.filters": "Doyvd orð",
+  "navigation_bar.follow_requests": "Umbønir um at fylgja",
+  "navigation_bar.follows_and_followers": "Fylgd og fylgjarar",
+  "navigation_bar.lists": "Listar",
+  "navigation_bar.logout": "Rita út",
+  "navigation_bar.mutes": "Doyvdir brúkarar",
+  "navigation_bar.personal": "Persónligt",
+  "navigation_bar.pins": "Festir postar",
+  "navigation_bar.preferences": "Sertokki",
+  "navigation_bar.public_timeline": "Felags tíðarlinja",
+  "navigation_bar.search": "Leita",
+  "navigation_bar.security": "Trygd",
+  "not_signed_in_indicator.not_signed_in": "Tú mást rita inn fyri at fáa atgongd til hetta tilfarið.",
+  "notification.admin.report": "{name} hevur meldað {target}",
+  "notification.admin.sign_up": "{name} meldaði seg til",
+  "notification.favourite": "{name} dámdi títt uppslag",
+  "notification.follow": "{name} fylgdi tær",
+  "notification.follow_request": "{name} biður um at fylgja tær",
+  "notification.mention": "{name} nevndi teg",
+  "notification.own_poll": "Tín atkvøðugreiðsla er endað",
+  "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
+  "notification.reblog": "{name} lyfti tín post",
+  "notification.status": "{name} hevur júst postað",
+  "notification.update": "{name} rættaði ein post",
+  "notifications.clear": "Rudda fráboðanir",
+  "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
+  "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
+  "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
+  "notifications.column_settings.alert": "Skriviborðsfráboðanir",
+  "notifications.column_settings.favourite": "Dámd:",
+  "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
+  "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
+  "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka",
+  "notifications.column_settings.follow": "Nýggir fylgjarar:",
+  "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
+  "notifications.column_settings.mention": "Umrøður:",
+  "notifications.column_settings.poll": "Úrslit frá atkvøðugreiðslu:",
+  "notifications.column_settings.push": "Trýstifráboðanir",
+  "notifications.column_settings.reblog": "Stimbranir:",
+  "notifications.column_settings.show": "Vís í teigi",
+  "notifications.column_settings.sound": "Spæl ljóð",
+  "notifications.column_settings.status": "Nýggir postar:",
+  "notifications.column_settings.unread_notifications.category": "Ólisnar fráboðanir",
+  "notifications.column_settings.unread_notifications.highlight": "Hálýs ólisnar fráboðanir",
+  "notifications.column_settings.update": "Rættingar:",
+  "notifications.filter.all": "Øll",
+  "notifications.filter.boosts": "Stimbranir",
+  "notifications.filter.favourites": "Dámd",
+  "notifications.filter.follows": "Fylgir",
+  "notifications.filter.mentions": "Umrøður",
+  "notifications.filter.polls": "Úrslit av atkvøðugreiðslu",
+  "notifications.filter.statuses": "Dagføringar frá fólki, tú kennur",
+  "notifications.grant_permission": "Gev lovi.",
+  "notifications.group": "{count} fráboðanir",
+  "notifications.mark_as_read": "Merk allar fráboðanir sum lisnar",
+  "notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
+  "notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
+  "notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+  "notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
+  "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
+  "notifications_permission_banner.title": "Miss einki",
+  "picture_in_picture.restore": "Legg hana aftur",
+  "poll.closed": "Endað",
+  "poll.refresh": "Endurles",
+  "poll.total_people": "{count, plural, one {# persónur} other {# persónar}}",
+  "poll.total_votes": "{count, plural, one {# atkvøða} other {# atkvøður}}",
+  "poll.vote": "Atkvøð",
+  "poll.voted": "Hetta atkvøddi tú",
+  "poll.votes": "{votes, plural, one {# atkvøða} other {# atkvøður}}",
+  "poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
+  "poll_button.remove_poll": "Strika atkvøðugreiðslu",
+  "privacy.change": "Broyt privatverju av posti",
+  "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
+  "privacy.direct.short": "Bert nevnd fólk",
+  "privacy.private.long": "Bert sjónligt hjá fylgjarum",
+  "privacy.private.short": "Einans fylgjarar",
+  "privacy.public.long": "Sjónligt hjá øllum",
+  "privacy.public.short": "Alment",
+  "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
+  "privacy.unlisted.short": "Ikki listað",
+  "privacy_policy.last_updated": "Seinast dagført {date}",
+  "privacy_policy.title": "Privatlívspolitikkur",
+  "refresh": "Endurles",
+  "regeneration_indicator.label": "Innlesur…",
+  "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dagur} other {# dagar}} síðani",
+  "relative_time.full.hours": "{number, plural, one {# tími} other {# tímar}} síðani",
+  "relative_time.full.just_now": "júst nú",
+  "relative_time.full.minutes": "{number, plural, one {# minuttur} other {# minuttir}} síðani",
+  "relative_time.full.seconds": "{number, plural, one {# sekund} other {# sekund}} síðani",
+  "relative_time.hours": "{number}t",
+  "relative_time.just_now": "nú",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "í dag",
+  "reply_indicator.cancel": "Ógilda",
+  "report.block": "Blokera",
+  "report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
+  "report.categories.other": "Onnur",
+  "report.categories.spam": "Ruskpostur",
+  "report.categories.violation": "Innihaldið brýtur eina ella fleiri ambætarareglur",
+  "report.category.subtitle": "Vel besta boðið",
+  "report.category.title": "Fortel okkum, hvat hendir við hesum {type}",
+  "report.category.title_account": "vangi",
+  "report.category.title_status": "postinum",
+  "report.close": "Liðugt",
+  "report.comment.title": "Er nakað annað, sum tú heldur, at vit áttu at vitað?",
+  "report.forward": "Víðarisend til {target}",
+  "report.forward_hint": "Kontan er frá einum øðrum ambætara. Send eitt dulnevnt avrit av meldingini hagar eisini?",
+  "report.mute": "Doyv",
+  "report.mute_explanation": "Tú fert ikki at síggja teirra uppsløg. Tey kunnu framvegis fylgja tær og síggja tíni uppsløg og fara ikki at vita av, at tey eru doyvd.",
+  "report.next": "Næsta",
+  "report.placeholder": "Aðrar viðmerkingar",
+  "report.reasons.dislike": "Mær dámar tað ikki",
+  "report.reasons.dislike_description": "Tú ynskir ikki at síggja hetta",
+  "report.reasons.other": "Tað er nakað annað",
+  "report.reasons.other_description": "Evnið hóskar ikki inn í aðrar bólkar",
+  "report.reasons.spam": "Tað er ruskpostur",
+  "report.reasons.spam_description": "Meinfýsin leinki, følsk hugbinding ella endurtakandi svar",
+  "report.reasons.violation": "Tað brýtur ambætarareglur",
+  "report.reasons.violation_description": "Tú er varug/ur við, at tað brýtur ávísar reglur",
+  "report.rules.subtitle": "Vel alt viðkomandi",
+  "report.rules.title": "Hvørjar reglur verða brotnar?",
+  "report.statuses.subtitle": "Vel alt viðkomandi",
+  "report.statuses.title": "Eru nakrir postar, sum stuðla uppundir hesa meldingina?",
+  "report.submit": "Send inn",
+  "report.target": "Meldi {target}",
+  "report.thanks.take_action": "Her eru tínir møguleikar fyri at stýra, hvat tú sær á Mastodon:",
+  "report.thanks.take_action_actionable": "Meðan vit kanna hetta, kanst tú taka hóskandi fyrivarni móti @{name}:",
+  "report.thanks.title": "Vil tú ikki síggja hetta?",
+  "report.thanks.title_actionable": "Takk fyri meldingina; vit kanna tað nærri.",
+  "report.unfollow": "Gevst at fylgja @{name}",
+  "report.unfollow_explanation": "Tú fylgir hesi kontuni. Gevst at fylgja henni, um tú ikki longur ynskir at síggja postarnar á heimarásini hjá tær.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postur atknýttur} other {{count} postar atknýttir}}",
+  "report_notification.categories.other": "Aðrir",
+  "report_notification.categories.spam": "Ruskpostur",
+  "report_notification.categories.violation": "Brotin regla",
+  "report_notification.open": "Opna melding",
+  "search.placeholder": "Leita",
+  "search.search_or_paste": "Leita ella set URL inn",
+  "search_popout.search_format": "Framkomið leiti-forsnið",
+  "search_popout.tips.full_text": "Einfaldur tekstur gevur aftur postar, sum tú hevur skrivað, yndismerkt, stimbrað ella er nevnd/ur í, umframt samsvarandi brúkaranøvn, víst nøvn og frámerki.",
+  "search_popout.tips.hashtag": "frámerki",
+  "search_popout.tips.status": "postur",
+  "search_popout.tips.text": "Einfaldur tekstur gevur aftur víst nøvn, brúkaranøvn og frámerki",
+  "search_popout.tips.user": "brúkari",
+  "search_results.accounts": "Fólk",
+  "search_results.all": "Alt",
+  "search_results.hashtags": "Frámerki",
+  "search_results.nothing_found": "Hesi leitiorð góvu ongi úrslit",
+  "search_results.statuses": "Postar",
+  "search_results.statuses_fts_disabled": "Á hesum Mastodon-ambætaranum ber ikki til at leita eftir postum eftir innihaldi.",
+  "search_results.title": "Leita eftir {q}",
+  "search_results.total": "{count, number} {count, plural, one {úrslit} other {úrslit}}",
+  "server_banner.about_active_users": "Fólk, sum hava brúkt hendan ambætaran seinastu 30 dagarnar (mánaðarligir virknir brúkarar)",
+  "server_banner.active_users": "virknir brúkarar",
+  "server_banner.administered_by": "Umsitari:",
+  "server_banner.introduction": "{domain} er partur av desentrala sosiala netverkinum, sum er drivið av {mastodon}.",
+  "server_banner.learn_more": "Lær meira",
+  "server_banner.server_stats": "Ambætarahagtøl:",
+  "sign_in_banner.create_account": "Stovna kontu",
+  "sign_in_banner.sign_in": "Rita inn",
+  "sign_in_banner.text": "Innrita fyri at fylgja vangum og frámerkjum, seta yndismerki á, deila og svara postum, ella at brúka kontuna til at samvirka á einum øðrum ambætara.",
+  "status.admin_account": "Lat kjakleiðaramarkamót upp fyri @{name}",
+  "status.admin_status": "Lat hendan postin upp í kjakleiðaramarkamótinum",
+  "status.block": "Blokera @{name}",
+  "status.bookmark": "Goym",
+  "status.cancel_reblog_private": "Strika stimbran",
+  "status.cannot_reblog": "Tað ber ikki til at stimbra hendan postin",
+  "status.copy": "Kopiera leinki til postin",
+  "status.delete": "Strika",
+  "status.detailed_status": "Útgreinað samrøðusýni",
+  "status.direct": "Beinleiðis boð @{name}",
+  "status.edit": "Rætta",
+  "status.edited": "Rættað {date}",
+  "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
+  "status.embed": "Legg inní",
+  "status.favourite": "Dámað",
+  "status.filter": "Filtrera hendan postin",
+  "status.filtered": "Filtrerað",
+  "status.hide": "Fjal post",
+  "status.history.created": "{name} stovnað {date}",
+  "status.history.edited": "{name} rættað {date}",
+  "status.load_more": "Tak meira niður",
+  "status.media_hidden": "Miðil fjaldur",
+  "status.mention": "Nevn @{name}",
+  "status.more": "Meira",
+  "status.mute": "Doyv @{name}",
+  "status.mute_conversation": "Doyv samrøðu",
+  "status.open": "Víðka henda postin",
+  "status.pin": "Ger fastan í vangan",
+  "status.pinned": "Festur postur",
+  "status.read_more": "Les meira",
+  "status.reblog": "Stimbra",
+  "status.reblog_private": "Stimbra við upprunasýni",
+  "status.reblogged_by": "{name} stimbrað",
+  "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
+  "status.redraft": "Strika & ger nýggja kladdu",
+  "status.remove_bookmark": "Gloym",
+  "status.replied_to": "Svaraði {name}",
+  "status.reply": "Svara",
+  "status.replyAll": "Svara tráðnum",
+  "status.report": "Melda @{name}",
+  "status.sensitive_warning": "Viðkvæmt tilfar",
+  "status.share": "Deil",
+  "status.show_filter_reason": "Vís kortini",
+  "status.show_less": "Vís minni",
+  "status.show_less_all": "Vís øllum minni",
+  "status.show_more": "Vís meira",
+  "status.show_more_all": "Vís øllum meira",
+  "status.show_original": "Vís upprunaliga",
+  "status.translate": "Umset",
+  "status.translated_from_with": "Umsett frá {lang} við {provider}",
+  "status.uncached_media_warning": "Ikki tøkt",
+  "status.unmute_conversation": "Strika doyving av samrøðu",
+  "status.unpin": "Loys frá vanga",
+  "subscribed_languages.lead": "Eftir broytingina fara einans postar á valdum málum at síggjast á tíni heimarás og á tínum listatíðarlinjum. Vel ongi fyri at fáa postar á øllum málum.",
+  "subscribed_languages.save": "Goym broytingar",
+  "subscribed_languages.target": "Broyt haldaramál fyri {target}",
+  "suggestions.dismiss": "Avvís uppskot",
+  "suggestions.header": "Tú er møguliga áhugað/ur í…",
+  "tabs_bar.federated_timeline": "Felags",
+  "tabs_bar.home": "Heim",
+  "tabs_bar.local_timeline": "Lokalt",
+  "tabs_bar.notifications": "Fráboðanir",
+  "time_remaining.days": "{number, plural, one {# dagur} other {# dagar}} eftir",
+  "time_remaining.hours": "{number, plural, one {# tími} other {# tímar}} eftir",
+  "time_remaining.minutes": "{number, plural, one {# minuttur} other {# minuttir}} eftir",
+  "time_remaining.moments": "Lítið bil eftir",
+  "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} eftir",
+  "timeline_hint.remote_resource_not_displayed": "{resource} frá øðrum ambætarum verður ikki víst.",
+  "timeline_hint.resources.followers": "Fylgjarar",
+  "timeline_hint.resources.follows": "Fylgir",
+  "timeline_hint.resources.statuses": "Gamlir postar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persónur} other {{counter} persónar}} {days, plural, one {seinasta dagin} other {{days} seinastu dagarnar}}",
+  "trends.trending_now": "Rák beint nú",
+  "ui.beforeunload": "Kladdan verður mist, um tú fer úr Mastodon.",
+  "units.short.billion": "{count} mia.",
+  "units.short.million": "{count} mn.",
+  "units.short.thousand": "{count} túsund",
+  "upload_area.title": "Hála og slepp fyri at leggja upp",
+  "upload_button.label": "Legg myndir, sjónfílu ella ljóðfílu afturat",
+  "upload_error.limit": "Farið er um markið fyri fíluuppsending.",
+  "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
+  "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
+  "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
+  "upload_form.description_missing": "Lýsing vantar",
+  "upload_form.edit": "Rætta",
+  "upload_form.thumbnail": "Broyt smámynd",
+  "upload_form.undo": "Strika",
+  "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
+  "upload_modal.analyzing_picture": "Greini mynd…",
+  "upload_modal.apply": "Ger virkið",
+  "upload_modal.applying": "Geri virkið…",
+  "upload_modal.choose_image": "Vel mynd",
+  "upload_modal.description_placeholder": "Ein skjótur brúnur revur loypur uppum dovna hundin",
+  "upload_modal.detect_text": "Finn text á mynd",
+  "upload_modal.edit_media": "Broyt miðil",
+  "upload_modal.hint": "Klikk ella drag sirkulin á undanvísingini fyri at velja brennidepilspunktið, sum altíð fer at vera sjónligt á øllum smámyndum.",
+  "upload_modal.preparing_ocr": "Fyrireiki OCR…",
+  "upload_modal.preview_label": "Undanvísing ({ratio})",
+  "upload_progress.label": "Leggi upp...",
+  "upload_progress.processing": "Viðgeri…",
+  "video.close": "Lat sjónfílu aftur",
+  "video.download": "Tak fílu niður",
+  "video.exit_fullscreen": "Far úr fullum skermi",
+  "video.expand": "Víðka sjónfílu",
+  "video.fullscreen": "Fullur skermur",
+  "video.hide": "Fjal sjónfílu",
+  "video.mute": "Sløkk ljóðið",
+  "video.pause": "Steðga á",
+  "video.play": "Spæl",
+  "video.unmute": "Tendra ljóðið"
+}
diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json
new file mode 100644
index 000000000..965aa4963
--- /dev/null
+++ b/app/javascript/mastodon/locales/fr-QC.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Serveurs modérés",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon est un logiciel open-source gratuit et une marque déposée de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Raison non disponible",
+  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec des comptes de n'importe quel serveur dans le fediverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
+  "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas de profils ou de contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
+  "about.domain_blocks.silenced.title": "Limité",
+  "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, stockée ou échangée, rendant toute interaction ou communication avec des utilisateurs de ce serveur impossible.",
+  "about.domain_blocks.suspended.title": "Suspendu",
+  "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
+  "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
+  "about.rules": "Règles du serveur",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Ajouter ou enlever de listes",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Groupe",
+  "account.block": "Bloquer @{name}",
+  "account.block_domain": "Bloquer le domaine {domain}",
+  "account.blocked": "Bloqué·e",
+  "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
+  "account.cancel_follow_request": "Retirer cette demande d'abonnement",
+  "account.direct": "Message direct @{name}",
+  "account.disable_notifications": "Ne plus me notifier quand @{name} publie",
+  "account.domain_blocked": "Domaine bloqué",
+  "account.edit_profile": "Modifier le profil",
+  "account.enable_notifications": "Me notifier quand @{name} publie",
+  "account.endorse": "Inclure sur profil",
+  "account.featured_tags.last_status_at": "Dernière publication {date}",
+  "account.featured_tags.last_status_never": "Aucune publication",
+  "account.featured_tags.title": "Hashtags inclus de {name}",
+  "account.follow": "Suivre",
+  "account.followers": "abonné·e·s",
+  "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
+  "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
+  "account.following": "Abonné·e",
+  "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
+  "account.follows.empty": "Ce compte ne suit personne présentement.",
+  "account.follows_you": "Vous suit",
+  "account.go_to_profile": "Voir ce profil",
+  "account.hide_reblogs": "Masquer les boosts de @{name}",
+  "account.joined_short": "Inscript en",
+  "account.languages": "Changer les langues abonnées",
+  "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
+  "account.locked_info": "Le statut de confidentialité de ce compte est privé. Son propriétaire vérifie manuellement qui peut le/la suivre.",
+  "account.media": "Média",
+  "account.mention": "Mentionner @{name}",
+  "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant:",
+  "account.mute": "Masquer @{name}",
+  "account.mute_notifications": "Masquer les notifications de @{name}",
+  "account.muted": "Masqué·e",
+  "account.open_original_page": "Ouvrir la page d'origine",
+  "account.posts": "Publications",
+  "account.posts_with_replies": "Publications et réponses",
+  "account.report": "Signaler @{name}",
+  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Partager le profil de @{name}",
+  "account.show_reblogs": "Afficher les boosts de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Publication} other {{counter} Publications}}",
+  "account.unblock": "Débloquer @{name}",
+  "account.unblock_domain": "Débloquer le domaine {domain}",
+  "account.unblock_short": "Débloquer",
+  "account.unendorse": "Ne pas inclure sur profil",
+  "account.unfollow": "Ne plus suivre",
+  "account.unmute": "Ne plus masquer @{name}",
+  "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
+  "account.unmute_short": "Ne plus masquer",
+  "account_note.placeholder": "Cliquez pour ajouter une note",
+  "admin.dashboard.daily_retention": "Taux de rétention des comptes par jour après inscription",
+  "admin.dashboard.monthly_retention": "Taux de rétention des comptes par mois après inscription",
+  "admin.dashboard.retention.average": "Moyenne",
+  "admin.dashboard.retention.cohort": "Mois d'inscription",
+  "admin.dashboard.retention.cohort_size": "Nouveaux comptes",
+  "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Débit limité",
+  "alert.unexpected.message": "Une erreur inattendue s’est produite.",
+  "alert.unexpected.title": "Oups!",
+  "announcement.announcement": "Annonce",
+  "attachments_list.unprocessed": "(non traité)",
+  "audio.hide": "Masquer l'audio",
+  "autosuggest_hashtag.per_week": "{count} par semaine",
+  "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
+  "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
+  "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
+  "bundle_column_error.error.title": "Oh non!",
+  "bundle_column_error.network.body": "Une erreur s'est produite lors du chargement de cette page. Cela peut être dû à un problème temporaire avec votre connexion internet ou avec ce serveur.",
+  "bundle_column_error.network.title": "Erreur réseau",
+  "bundle_column_error.retry": "Réessayer",
+  "bundle_column_error.return": "Retour à l'accueil",
+  "bundle_column_error.routing.body": "La page demandée est introuvable. Êtes-vous sûr que l’URL dans la barre d’adresse est correcte?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Fermer",
+  "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.",
+  "bundle_modal_error.retry": "Réessayer",
+  "closed_registrations.other_server_instructions": "Puisque Mastodon est décentralisé, vous pouvez créer un compte sur un autre serveur et interagir quand même avec celui-ci.",
+  "closed_registrations_modal.description": "Créer un compte sur {domain} est présentement impossible, néanmoins souvenez-vous que vous n'avez pas besoin d'un compte spécifiquement sur {domain} pour utiliser Mastodon.",
+  "closed_registrations_modal.find_another_server": "Trouver un autre serveur",
+  "closed_registrations_modal.preamble": "Mastodon est décentralisé, donc peu importe où vous créez votre compte, vous serez en mesure de suivre et d'interagir avec quiconque sur ce serveur. Vous pouvez même l'héberger vous-même!",
+  "closed_registrations_modal.title": "S'inscrire sur Mastodon",
+  "column.about": "À propos",
+  "column.blocks": "Comptes bloqués",
+  "column.bookmarks": "Signets",
+  "column.community": "Fil local",
+  "column.direct": "Messages directs",
+  "column.directory": "Parcourir les profils",
+  "column.domain_blocks": "Domaines bloqués",
+  "column.favourites": "Favoris",
+  "column.follow_requests": "Demande d'abonnement",
+  "column.home": "Accueil",
+  "column.lists": "Listes",
+  "column.mutes": "Comptes masqués",
+  "column.notifications": "Notifications",
+  "column.pins": "Publications épinglés",
+  "column.public": "Fil global",
+  "column_back_button.label": "Retour",
+  "column_header.hide_settings": "Cacher les paramètres",
+  "column_header.moveLeft_settings": "Déplacer cette colonne vers la gauche",
+  "column_header.moveRight_settings": "Déplacer cette colonne vers la droite",
+  "column_header.pin": "Épingler",
+  "column_header.show_settings": "Afficher les paramètres",
+  "column_header.unpin": "Désépingler",
+  "column_subheading.settings": "Paramètres",
+  "community.column_settings.local_only": "Local seulement",
+  "community.column_settings.media_only": "Média seulement",
+  "community.column_settings.remote_only": "À distance seulement",
+  "compose.language.change": "Changer de langue",
+  "compose.language.search": "Rechercher des langues…",
+  "compose_form.direct_message_warning_learn_more": "En savoir plus",
+  "compose_form.encryption_warning": "Les publications sur Mastodon ne sont pas chiffrées de bout en bout. Veuillez ne partager aucune information sensible sur Mastodon.",
+  "compose_form.hashtag_warning": "Cette publication ne sera pas listée dans les recherches par hashtag car sa visibilité est réglée sur « non listée ». Seuls les publications avec visibilité « publique » peuvent être recherchées par hashtag.",
+  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
+  "compose_form.lock_disclaimer.lock": "verrouillé",
+  "compose_form.placeholder": "À quoi pensez-vous?",
+  "compose_form.poll.add_option": "Ajouter un choix",
+  "compose_form.poll.duration": "Durée du sondage",
+  "compose_form.poll.option_placeholder": "Choix {number}",
+  "compose_form.poll.remove_option": "Supprimer ce choix",
+  "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
+  "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
+  "compose_form.publish": "Publier",
+  "compose_form.publish_form": "Publier",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Enregistrer les modifications",
+  "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
+  "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
+  "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
+  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
+  "confirmation_modal.cancel": "Annuler",
+  "confirmations.block.block_and_report": "Bloquer et signaler",
+  "confirmations.block.confirm": "Bloquer",
+  "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
+  "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
+  "confirmations.delete.confirm": "Supprimer",
+  "confirmations.delete.message": "Voulez-vous vraiment supprimer cette publication?",
+  "confirmations.delete_list.confirm": "Supprimer",
+  "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
+  "confirmations.discard_edit_media.confirm": "Rejeter",
+  "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
+  "confirmations.domain_block.confirm": "Bloquer ce domaine entier",
+  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
+  "confirmations.logout.confirm": "Se déconnecter",
+  "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
+  "confirmations.mute.confirm": "Masquer",
+  "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
+  "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
+  "confirmations.redraft.confirm": "Supprimer et réécrire",
+  "confirmations.redraft.message": "Voulez-vous vraiment effacer cette publication pour la réécrire? Ses mentions favori et boosts seront perdus et ses réponses deviendront orphelines.",
+  "confirmations.reply.confirm": "Répondre",
+  "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez présentement. Voulez-vous vraiment continuer?",
+  "confirmations.unfollow.confirm": "Ne plus suivre",
+  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
+  "conversation.delete": "Supprimer cette conversation",
+  "conversation.mark_as_read": "Marquer comme lu",
+  "conversation.open": "Afficher cette conversation",
+  "conversation.with": "Avec {names}",
+  "copypaste.copied": "Copié",
+  "copypaste.copy": "Copier",
+  "directory.federated": "D'un fediverse connu",
+  "directory.local": "De {domain} seulement",
+  "directory.new_arrivals": "Inscrit·e·s récemment",
+  "directory.recently_active": "Actif·ve·s récemment",
+  "disabled_account_banner.account_settings": "Paramètres du compte",
+  "disabled_account_banner.text": "Votre compte {disabledAccount} est présentement désactivé.",
+  "dismissable_banner.community_timeline": "Voici les publications publiques les plus récentes de personnes dont les comptes sont hébergés par {domain}.",
+  "dismissable_banner.dismiss": "Rejeter",
+  "dismissable_banner.explore_links": "Ces nouvelles sont présentement en cours de discussion par des personnes sur d'autres serveurs du réseau décentralisé ainsi que sur celui-ci.",
+  "dismissable_banner.explore_statuses": "Ces publications de ce serveur et d'autres du réseau décentralisé sont présentement en train de gagner de l'ampleur sur ce serveur.",
+  "dismissable_banner.explore_tags": "Ces hashtags sont présentement en train de gagner de l'ampleur parmi des personnes sur les serveurs du réseau décentralisé dont celui-ci.",
+  "dismissable_banner.public_timeline": "Voici les publications publiques les plus récentes de personnes de ce serveur et d'autres du réseau décentralisé que ce serveur connait.",
+  "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
+  "embed.preview": "Voici comment il apparaîtra:",
+  "emoji_button.activity": "Activité",
+  "emoji_button.clear": "Effacer",
+  "emoji_button.custom": "Personnalisé",
+  "emoji_button.flags": "Drapeaux",
+  "emoji_button.food": "Nourriture et boisson",
+  "emoji_button.label": "Insérer un émoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "Aucun émoji correspondant n'a été trouvé",
+  "emoji_button.objects": "Objets",
+  "emoji_button.people": "Personnes",
+  "emoji_button.recent": "Fréquemment utilisés",
+  "emoji_button.search": "Recherche…",
+  "emoji_button.search_results": "Résultats",
+  "emoji_button.symbols": "Symboles",
+  "emoji_button.travel": "Voyage et lieux",
+  "empty_column.account_suspended": "Compte suspendu",
+  "empty_column.account_timeline": "Aucune publication ici!",
+  "empty_column.account_unavailable": "Profil non disponible",
+  "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
+  "empty_column.bookmarked_statuses": "Vous n'avez pas de publications parmi vos signets. Lorsque vous en ajouterez une, elle apparaîtra ici.",
+  "empty_column.community": "Le fil local est vide. Écrivez donc quelque chose pour le remplir!",
+  "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
+  "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
+  "empty_column.explore_statuses": "Rien n'est en tendance présentement. Revenez plus tard!",
+  "empty_column.favourited_statuses": "Vous n’avez pas encore de publications favorites. Lorsque vous en ajouterez une, elle apparaîtra ici.",
+  "empty_column.favourites": "Personne n’a encore ajouté cette publication à ses favoris. Lorsque quelqu’un le fera, elle apparaîtra ici.",
+  "empty_column.follow_recommendations": "Il semble qu’aucune suggestion n’ait pu être générée pour vous. Vous pouvez essayer d’utiliser la recherche pour découvrir des personnes que vous pourriez connaître ou explorer les hashtags populaires.",
+  "empty_column.follow_requests": "Vous n’avez pas encore de demande d'abonnement. Lorsque vous en recevrez une, elle apparaîtra ici.",
+  "empty_column.hashtag": "Il n’y a pas encore de contenu associé à ce hashtag.",
+  "empty_column.home": "Votre fil d'accueil est vide! Suivez plus de personnes pour la remplir. {suggestions}",
+  "empty_column.home.suggestions": "Voir quelques suggestions",
+  "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouvelles publications, elles apparaîtront ici.",
+  "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
+  "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
+  "empty_column.notifications": "Vous n'avez pas encore de notifications. Quand d'autres personnes interagissent avec vous, vous en verrez ici.",
+  "empty_column.public": "Il n’y a rien ici! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
+  "error.unexpected_crash.explanation": "En raison d’un bogue dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
+  "error.unexpected_crash.explanation_addons": "Cette page n’a pas pu être affichée correctement. Cette erreur est probablement causée par une extension de navigateur ou des outils de traduction automatique.",
+  "error.unexpected_crash.next_steps": "Essayez de rafraîchir la page. Si cela n’aide pas, vous pouvez toujours utiliser Mastodon via un autre navigateur ou une application native.",
+  "error.unexpected_crash.next_steps_addons": "Essayez de les désactiver et de rafraîchir la page. Si cela ne vous aide pas, vous pouvez toujours utiliser Mastodon via un autre navigateur ou une application native.",
+  "errors.unexpected_crash.copy_stacktrace": "Copier la trace d'appels dans le presse-papier",
+  "errors.unexpected_crash.report_issue": "Signaler un problème",
+  "explore.search_results": "Résultats",
+  "explore.suggested_follows": "Pour vous",
+  "explore.title": "Explorer",
+  "explore.trending_links": "Nouvelles",
+  "explore.trending_statuses": "Messages",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Cette catégorie de filtre ne s'applique pas au contexte dans lequel vous avez accédé à cette publication. Si vous voulez que la publication soit filtrée dans ce contexte également, vous devrez modifier le filtre.",
+  "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte!",
+  "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",
+  "filter_modal.added.expired_title": "Filtre expiré!",
+  "filter_modal.added.review_and_configure": "Pour passer en revue et approfondir la configuration de cette catégorie de filtre, aller sur le {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Paramètres du filtre",
+  "filter_modal.added.settings_link": "page des paramètres",
+  "filter_modal.added.short_explanation": "Cette publication a été ajouté à la catégorie de filtres suivante: {title}.",
+  "filter_modal.added.title": "Filtre ajouté!",
+  "filter_modal.select_filter.context_mismatch": "ne s’applique pas à ce contexte",
+  "filter_modal.select_filter.expired": "a expiré",
+  "filter_modal.select_filter.prompt_new": "Nouvelle catégorie: {name}",
+  "filter_modal.select_filter.search": "Rechercher ou créer",
+  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
+  "filter_modal.select_filter.title": "Filtrer cette publication",
+  "filter_modal.title.status": "Filtrer une publication",
+  "follow_recommendations.done": "Terminé",
+  "follow_recommendations.heading": "Suivez les personnes dont vous aimeriez voir les publications! Voici quelques suggestions.",
+  "follow_recommendations.lead": "Les publication de personnes que vous suivez apparaîtront par ordre chronologique sur votre fil d'accueil. N'ayez pas peur de faire des erreurs, vous pouvez arrêter de suivre les gens aussi facilement n'importe quand!",
+  "follow_request.authorize": "Autoriser",
+  "follow_request.reject": "Rejeter",
+  "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
+  "footer.about": "À propos",
+  "footer.directory": "Annuaire des profils",
+  "footer.get_app": "Télécharger l’application",
+  "footer.invite": "Inviter des gens",
+  "footer.keyboard_shortcuts": "Raccourcis clavier",
+  "footer.privacy_policy": "Politique de confidentialité",
+  "footer.source_code": "Voir le code source",
+  "generic.saved": "Sauvegardé",
+  "getting_started.heading": "Pour commencer",
+  "hashtag.column_header.tag_mode.all": "et {additional}",
+  "hashtag.column_header.tag_mode.any": "ou {additional}",
+  "hashtag.column_header.tag_mode.none": "sans {additional}",
+  "hashtag.column_settings.select.no_options_message": "Aucune suggestion trouvée",
+  "hashtag.column_settings.select.placeholder": "Entrer des hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Tous ceux-ci",
+  "hashtag.column_settings.tag_mode.any": "Au moins un de ceux-ci",
+  "hashtag.column_settings.tag_mode.none": "Aucun de ceux-ci",
+  "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "hashtag.follow": "Suivre ce hashtag",
+  "hashtag.unfollow": "Ne plus suivre ce hashtag",
+  "home.column_settings.basic": "Basique",
+  "home.column_settings.show_reblogs": "Afficher boosts",
+  "home.column_settings.show_replies": "Afficher réponses",
+  "home.hide_announcements": "Masquer les annonces",
+  "home.show_announcements": "Afficher annonces",
+  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter cette publication aux favoris pour informer son auteur·rice que vous l'appréciez et la sauvegarder pour plus tard.",
+  "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs publications dans votre fil d'accueil.",
+  "interaction_modal.description.reblog": "Avec un compte Mastodon, vous pouvez booster cette publication pour la partager avec vos propres abonné·e·s.",
+  "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à cette publication.",
+  "interaction_modal.on_another_server": "Sur un autre serveur",
+  "interaction_modal.on_this_server": "Sur ce serveur",
+  "interaction_modal.other_server_instructions": "Copiez et collez cet URL dans le champ de recherche de votre application Mastodon préférée ou l'interface web de votre serveur Mastodon.",
+  "interaction_modal.preamble": "Puisque Mastodon est décentralisé, vous pouvez utiliser votre compte existant hébergé par un autre serveur Mastodon ou une plateforme compatible si vous n'avez pas de compte sur celui-ci.",
+  "interaction_modal.title.favourite": "Ajouter la publication de {name} à vos favoris",
+  "interaction_modal.title.follow": "Suivre {name}",
+  "interaction_modal.title.reblog": "Booster la publication de {name}",
+  "interaction_modal.title.reply": "Répondre à la publication de {name}",
+  "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
+  "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "Revenir en arrière",
+  "keyboard_shortcuts.blocked": "Ouvrir la liste de comptes bloqués",
+  "keyboard_shortcuts.boost": "Booster cette publication",
+  "keyboard_shortcuts.column": "Se concentrer sur une colonne",
+  "keyboard_shortcuts.compose": "Se concentrer sur la zone de rédaction",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "pour ouvrir la colonne de messages directs",
+  "keyboard_shortcuts.down": "Descendre dans la liste",
+  "keyboard_shortcuts.enter": "Ouvrir cette publication",
+  "keyboard_shortcuts.favourite": "Ajouter publication aux favoris",
+  "keyboard_shortcuts.favourites": "Ouvrir la liste des favoris",
+  "keyboard_shortcuts.federated": "Ouvrir le fil global",
+  "keyboard_shortcuts.heading": "Raccourcis clavier",
+  "keyboard_shortcuts.home": "Ouvrir le fil d’accueil",
+  "keyboard_shortcuts.hotkey": "Raccourci clavier",
+  "keyboard_shortcuts.legend": "Afficher cette légende",
+  "keyboard_shortcuts.local": "Ouvrir le fil local",
+  "keyboard_shortcuts.mention": "Mentionner l'auteur·rice",
+  "keyboard_shortcuts.muted": "Ouvrir la liste de comptes masqués",
+  "keyboard_shortcuts.my_profile": "Ouvrir votre profil",
+  "keyboard_shortcuts.notifications": "Ouvrir la colonne de notifications",
+  "keyboard_shortcuts.open_media": "Ouvrir média",
+  "keyboard_shortcuts.pinned": "Ouvrir la liste de publications épinglés",
+  "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
+  "keyboard_shortcuts.reply": "Répondre au message",
+  "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
+  "keyboard_shortcuts.search": "Focuser sur le champ de recherche",
+  "keyboard_shortcuts.spoilers": "Afficher/cacher le champ d'avertissement",
+  "keyboard_shortcuts.start": "Ouvrir la colonne « Pour commencer »",
+  "keyboard_shortcuts.toggle_hidden": "Déplier/replier texte derrière avertissement",
+  "keyboard_shortcuts.toggle_sensitivity": "Afficher/cacher médias",
+  "keyboard_shortcuts.toot": "Commencer un nouveau message",
+  "keyboard_shortcuts.unfocus": "Ne plus se concentrer sur la zone de rédaction/barre de recherche",
+  "keyboard_shortcuts.up": "Monter dans la liste",
+  "lightbox.close": "Fermer",
+  "lightbox.compress": "Compresser la fenêtre de visualisation d'images",
+  "lightbox.expand": "Agrandir la fenêtre de visualisation d'images",
+  "lightbox.next": "Suivant",
+  "lightbox.previous": "Précédent",
+  "limited_account_hint.action": "Afficher le profil quand même",
+  "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
+  "lists.account.add": "Ajouter à une liste",
+  "lists.account.remove": "Retirer d'une liste",
+  "lists.delete": "Supprimer la liste",
+  "lists.edit": "Modifier la liste",
+  "lists.edit.submit": "Modifier le titre",
+  "lists.new.create": "Ajouter une liste",
+  "lists.new.title_placeholder": "Titre de la nouvelle liste",
+  "lists.replies_policy.followed": "N'importe quel compte suivi",
+  "lists.replies_policy.list": "Membres de la liste",
+  "lists.replies_policy.none": "Personne",
+  "lists.replies_policy.title": "Afficher les réponses à:",
+  "lists.search": "Rechercher parmi les gens que vous suivez",
+  "lists.subheading": "Vos listes",
+  "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
+  "loading_indicator.label": "Chargement…",
+  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
+  "missing_indicator.label": "Non trouvé",
+  "missing_indicator.sublabel": "Cette ressource n'a pas pu être trouvée",
+  "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
+  "mute_modal.duration": "Durée",
+  "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
+  "mute_modal.indefinite": "Indéfinie",
+  "navigation_bar.about": "À propos",
+  "navigation_bar.blocks": "Comptes bloqués",
+  "navigation_bar.bookmarks": "Signets",
+  "navigation_bar.community_timeline": "Fil local",
+  "navigation_bar.compose": "Rédiger un nouveau message",
+  "navigation_bar.direct": "Messages directs",
+  "navigation_bar.discover": "Découvrir",
+  "navigation_bar.domain_blocks": "Domaines bloqués",
+  "navigation_bar.edit_profile": "Modifier le profil",
+  "navigation_bar.explore": "Explorer",
+  "navigation_bar.favourites": "Favoris",
+  "navigation_bar.filters": "Mots masqués",
+  "navigation_bar.follow_requests": "Demandes d'abonnements",
+  "navigation_bar.follows_and_followers": "Abonnements et abonnés",
+  "navigation_bar.lists": "Listes",
+  "navigation_bar.logout": "Se déconnecter",
+  "navigation_bar.mutes": "Utilisateurs masqués",
+  "navigation_bar.personal": "Personnel",
+  "navigation_bar.pins": "Publications épinglés",
+  "navigation_bar.preferences": "Préférences",
+  "navigation_bar.public_timeline": "Fil global",
+  "navigation_bar.search": "Rechercher",
+  "navigation_bar.security": "Sécurité",
+  "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
+  "notification.admin.report": "{name} a signalé {target}",
+  "notification.admin.sign_up": "{name} s'est inscrit·e",
+  "notification.favourite": "{name} a aimé votre publication",
+  "notification.follow": "{name} vous suit",
+  "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.mention": "{name} vous a mentionné·e",
+  "notification.own_poll": "Votre sondage est terminé",
+  "notification.poll": "Un sondage auquel vous avez participé est terminé",
+  "notification.reblog": "{name} a boosté votre message",
+  "notification.status": "{name} vient de publier",
+  "notification.update": "{name} a modifié une publication",
+  "notifications.clear": "Effacer notifications",
+  "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?",
+  "notifications.column_settings.admin.report": "Nouveaux signalements:",
+  "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
+  "notifications.column_settings.alert": "Notifications navigateur",
+  "notifications.column_settings.favourite": "Favoris:",
+  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
+  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
+  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+  "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
+  "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Résultats des sondages:",
+  "notifications.column_settings.push": "Notifications push",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Afficher dans la colonne",
+  "notifications.column_settings.sound": "Jouer un son",
+  "notifications.column_settings.status": "Nouvelles publications:",
+  "notifications.column_settings.unread_notifications.category": "Notifications non lues",
+  "notifications.column_settings.unread_notifications.highlight": "Surligner les notifications non lues",
+  "notifications.column_settings.update": "Modifications:",
+  "notifications.filter.all": "Toutes",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favoris",
+  "notifications.filter.follows": "Abonnements",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Résultats de sondages",
+  "notifications.filter.statuses": "Mises à jour de personnes que vous suivez",
+  "notifications.grant_permission": "Accorder l’autorisation.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Marquer toutes les notifications comme lues",
+  "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
+  "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
+  "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications_permission_banner.enable": "Activer les notifications de bureau",
+  "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
+  "notifications_permission_banner.title": "Ne rien rater",
+  "picture_in_picture.restore": "Remettre en place",
+  "poll.closed": "Fermé",
+  "poll.refresh": "Actualiser",
+  "poll.total_people": "{count, plural, one {# personne} other {# personnes}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Voter",
+  "poll.voted": "Vous avez voté pour cette réponse",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Ajouter un sondage",
+  "poll_button.remove_poll": "Supprimer le sondage",
+  "privacy.change": "Changer la confidentialité des messages",
+  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
+  "privacy.direct.short": "Personnes mentionnées uniquement",
+  "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
+  "privacy.private.short": "Abonné·e·s seulement",
+  "privacy.public.long": "Visible pour tous",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
+  "privacy.unlisted.short": "Non listé",
+  "privacy_policy.last_updated": "Dernière mise à jour {date}",
+  "privacy_policy.title": "Politique de confidentialité",
+  "refresh": "Actualiser",
+  "regeneration_indicator.label": "Chargement…",
+  "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!",
+  "relative_time.days": "{number} j",
+  "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
+  "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
+  "relative_time.full.just_now": "à l’instant",
+  "relative_time.full.minutes": "il y a {number, plural, one {# minute} other {# minutes}}",
+  "relative_time.full.seconds": "il y a {number, plural, one {# seconde} other {# secondes}}",
+  "relative_time.hours": "{number} h",
+  "relative_time.just_now": "à l’instant",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} s",
+  "relative_time.today": "aujourd’hui",
+  "reply_indicator.cancel": "Annuler",
+  "report.block": "Bloquer",
+  "report.block_explanation": "Vous ne verrez plus les publications de ce compte. Il ne pourra ni vous suivre ni voir vos publications. Il pourra savoir qu'il a été bloqué.",
+  "report.categories.other": "Autre",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur",
+  "report.category.subtitle": "Sélctionnez ce qui correspond le mieux",
+  "report.category.title": "Dites-nous ce qui se passe avec ce {type}",
+  "report.category.title_account": "ce profil",
+  "report.category.title_status": "ce message",
+  "report.close": "Terminé",
+  "report.comment.title": "Y a-t-il autre chose que nous devrions savoir?",
+  "report.forward": "Transférer à {target}",
+  "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer une copie anonyme du rapport là-bas également?",
+  "report.mute": "Masquer",
+  "report.mute_explanation": "Vous ne verrez plus les publications de ce compte. Il pourra toujours vous suivre et voir vos publications. Il ne pourra pas savoir qu'il a été masqué.",
+  "report.next": "Suivant",
+  "report.placeholder": "Commentaires additionnels",
+  "report.reasons.dislike": "Je n’aime pas",
+  "report.reasons.dislike_description": "Ce n'est pas quelque chose qu'on voudrait voir",
+  "report.reasons.other": "C'est pour une autre raison",
+  "report.reasons.other_description": "Le problème ne correspond pas aux autres catégories",
+  "report.reasons.spam": "C'est du spam",
+  "report.reasons.spam_description": "Liens malveillants, faux engagement ou réponses répétitives",
+  "report.reasons.violation": "Ça enfreint les règles du serveur",
+  "report.reasons.violation_description": "Vous savez que des règles précises sont enfreintes",
+  "report.rules.subtitle": "Sélectionnez toutes les réponses appropriées",
+  "report.rules.title": "Quelles règles sont enfreintes?",
+  "report.statuses.subtitle": "Sélectionnez toutes les réponses appropriées",
+  "report.statuses.title": "Existe-t-il des messages pour étayer ce rapport?",
+  "report.submit": "Envoyer",
+  "report.target": "Signalement de {target}",
+  "report.thanks.take_action": "Voici les possibilités que vous avez pour contrôler ce que vous voyez sur Mastodon:",
+  "report.thanks.take_action_actionable": "Pendant que nous étudions votre requête, vous pouvez prendre des mesures contre @{name}:",
+  "report.thanks.title": "Vous ne voulez pas voir cela?",
+  "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
+  "report.unfollow": "Ne plus suivre @{name}",
+  "report.unfollow_explanation": "Vous suivez ce compte. Pour ne plus en voir les messages sur votre fil d'accueil, arrêtez de le suivre.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publication liée} other {{count} publications liées}}",
+  "report_notification.categories.other": "Autre",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.open": "Ouvrir le signalement",
+  "search.placeholder": "Rechercher",
+  "search.search_or_paste": "Rechercher ou saisir un URL",
+  "search_popout.search_format": "Recherche avancée",
+  "search_popout.tips.full_text": "Un texte normal retourne les publications que vous avez écrites, ajoutées à vos favoris, partagées, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et publications correspondantes.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "publication",
+  "search_popout.tips.text": "Une simple entrée de texte renvoie les noms affichés, les identifiants et les hashtags correspondants",
+  "search_popout.tips.user": "compte",
+  "search_results.accounts": "Personnes",
+  "search_results.all": "Tout",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Aucun résultat avec ces mots-clés",
+  "search_results.statuses": "Publications",
+  "search_results.statuses_fts_disabled": "La recherche de publications par leur contenu n'est pas activée sur ce serveur Mastodon.",
+  "search_results.title": "Rechercher {q}",
+  "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
+  "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
+  "server_banner.active_users": "comptes actifs",
+  "server_banner.administered_by": "Administré par:",
+  "server_banner.introduction": "{domain} fait partie du réseau social décentralisé propulsé par {mastodon}.",
+  "server_banner.learn_more": "En savoir plus",
+  "server_banner.server_stats": "Statistiques du serveur:",
+  "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.sign_in": "Se connecter",
+  "sign_in_banner.text": "Connectez-vous pour suivre les profils ou les hashtags, ajouter aux favoris, partager et répondre aux publications, ou interagir depuis votre compte sur un autre serveur.",
+  "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
+  "status.admin_status": "Ouvrir ce message dans l’interface de modération",
+  "status.block": "Bloquer @{name}",
+  "status.bookmark": "Ajouter aux signets",
+  "status.cancel_reblog_private": "Débooster",
+  "status.cannot_reblog": "Cette publication ne peut pas être boostée",
+  "status.copy": "Copier un lien vers cette publication",
+  "status.delete": "Supprimer",
+  "status.detailed_status": "Vue détaillée de la conversation",
+  "status.direct": "Envoyer un message direct à @{name}",
+  "status.edit": "Modifier",
+  "status.edited": "Modifiée le {date}",
+  "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
+  "status.embed": "Intégrer",
+  "status.favourite": "Ajouter aux favoris",
+  "status.filter": "Filtrer cette publication",
+  "status.filtered": "Filtrée",
+  "status.hide": "Cacher la publication",
+  "status.history.created": "créé par {name} {date}",
+  "status.history.edited": "modifié par {name} {date}",
+  "status.load_more": "Charger plus",
+  "status.media_hidden": "Média masqué",
+  "status.mention": "Mentionner @{name}",
+  "status.more": "Plus",
+  "status.mute": "Masquer @{name}",
+  "status.mute_conversation": "Masquer la conversation",
+  "status.open": "Afficher la publication entière",
+  "status.pin": "Épingler sur profil",
+  "status.pinned": "Message épinglé",
+  "status.read_more": "En savoir plus",
+  "status.reblog": "Booster",
+  "status.reblog_private": "Booster avec visibilité originale",
+  "status.reblogged_by": "{name} a boosté",
+  "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.",
+  "status.redraft": "Supprimer et réécrire",
+  "status.remove_bookmark": "Retirer des signets",
+  "status.replied_to": "A répondu à {name}",
+  "status.reply": "Répondre",
+  "status.replyAll": "Répondre à cette discussion",
+  "status.report": "Signaler @{name}",
+  "status.sensitive_warning": "Contenu sensible",
+  "status.share": "Partager",
+  "status.show_filter_reason": "Afficher quand même",
+  "status.show_less": "Replier",
+  "status.show_less_all": "Tout replier",
+  "status.show_more": "Déplier",
+  "status.show_more_all": "Tout déplier",
+  "status.show_original": "Afficher l’original",
+  "status.translate": "Traduire",
+  "status.translated_from_with": "Traduit de {lang} avec {provider}",
+  "status.uncached_media_warning": "Indisponible",
+  "status.unmute_conversation": "Ne plus masquer cette conversation",
+  "status.unpin": "Désépingler du profil",
+  "subscribed_languages.lead": "Seules des publications dans les langues sélectionnées apparaîtront sur vos fil d'accueil et de liste(s) après le changement. N'en sélectionnez aucune pour recevoir des publications dans toutes les langues.",
+  "subscribed_languages.save": "Enregistrer les modifications",
+  "subscribed_languages.target": "Changer les langues abonnées pour {target}",
+  "suggestions.dismiss": "Rejeter cette suggestion",
+  "suggestions.header": "Vous pourriez être intéressé par…",
+  "tabs_bar.federated_timeline": "Global",
+  "tabs_bar.home": "Accueil",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "time_remaining.days": "{number, plural, one {# jour restant} other {# jours restants}}",
+  "time_remaining.hours": "{number, plural, one {# heure restante} other {# heures restantes}}",
+  "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
+  "time_remaining.moments": "Encore quelques instants",
+  "time_remaining.seconds": "{number, plural, one {# seconde restante} other {# secondes restantes}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
+  "timeline_hint.resources.followers": "Abonné·e·s",
+  "timeline_hint.resources.follows": "Abonnements",
+  "timeline_hint.resources.statuses": "Publications plus anciennes",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
+  "trends.trending_now": "Présentement populaire",
+  "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
+  "units.short.billion": "{count} G",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} K",
+  "upload_area.title": "Glissez et déposez pour envoyer",
+  "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
+  "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
+  "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
+  "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
+  "upload_form.description": "Décrire pour les malvoyants",
+  "upload_form.description_missing": "Description manquante",
+  "upload_form.edit": "Modifier",
+  "upload_form.thumbnail": "Changer la vignette",
+  "upload_form.undo": "Supprimer",
+  "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
+  "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
+  "upload_modal.apply": "Appliquer",
+  "upload_modal.applying": "Application en cours…",
+  "upload_modal.choose_image": "Choisir une image",
+  "upload_modal.description_placeholder": "Buvez de ce whisky que le patron juge fameux",
+  "upload_modal.detect_text": "Détecter le texte de l’image",
+  "upload_modal.edit_media": "Modifier le média",
+  "upload_modal.hint": "Cliquez ou faites glisser le cercle sur l’aperçu pour choisir le point focal qui sera toujours visible sur toutes les miniatures.",
+  "upload_modal.preparing_ocr": "Préparation de la ROC…",
+  "upload_modal.preview_label": "Aperçu ({ratio})",
+  "upload_progress.label": "Envoi en cours...",
+  "upload_progress.processing": "Traitement en cours…",
+  "video.close": "Fermer la vidéo",
+  "video.download": "Télécharger ce fichier",
+  "video.exit_fullscreen": "Quitter le plein écran",
+  "video.expand": "Agrandir la vidéo",
+  "video.fullscreen": "Plein écran",
+  "video.hide": "Masquer la vidéo",
+  "video.mute": "Couper le son",
+  "video.pause": "Pause",
+  "video.play": "Lecture",
+  "video.unmute": "Rétablir le son"
+}
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5b6d337a1..ca4d20b30 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,72 +1,106 @@
 {
+  "about.blocks": "Serveurs modérés",
+  "about.contact": "Contact :",
+  "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Raison non disponible",
+  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rice⋅s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
+  "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
+  "about.domain_blocks.silenced.title": "Limité",
+  "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les utilisateurs de ce serveur.",
+  "about.domain_blocks.suspended.title": "Suspendu",
+  "about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
+  "about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
+  "about.rules": "Règles du serveur",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Bloquer le domaine {domain}",
-  "account.blocked": "Bloqué",
+  "account.blocked": "Bloqué·e",
   "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
-  "account.cancel_follow_request": "Annuler la demande de suivi",
+  "account.cancel_follow_request": "Retirer la demande d’abonnement",
   "account.direct": "Envoyer un message direct à @{name}",
-  "account.disable_notifications": "Arrêter de me notifier quand @{name} publie",
+  "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
   "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
-  "account.enable_notifications": "Me notifier quand @{name} publie",
-  "account.endorse": "Recommander sur le profil",
+  "account.enable_notifications": "Me notifier quand @{name} publie quelque chose",
+  "account.endorse": "Recommander sur votre profil",
+  "account.featured_tags.last_status_at": "Dernier message le {date}",
+  "account.featured_tags.last_status_never": "Aucun message",
+  "account.featured_tags.title": "Les hashtags en vedette de {name}",
   "account.follow": "Suivre",
-  "account.followers": "Abonnés",
-  "account.followers.empty": "Personne ne suit cet utilisateur pour l’instant.",
-  "account.followers_counter": "{count, plural, one {{counter} Abonné} other {{counter} Abonnés}}",
-  "account.following_counter": "{count, plural, other {{counter} Abonnements}}",
-  "account.follows.empty": "Cet utilisateur ne suit personne pour l’instant.",
+  "account.followers": "Abonné·e·s",
+  "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
+  "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
+  "account.following": "Abonnements",
+  "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
+  "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
+  "account.go_to_profile": "Voir le profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
-  "account.joined": "Ici depuis {date}",
-  "account.last_status": "Dernière activité",
+  "account.joined_short": "Ici depuis",
+  "account.languages": "Changer les langues abonnées",
   "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
-  "account.locked_info": "Ce compte est privé. Son propriétaire approuve manuellement qui peut le suivre.",
+  "account.locked_info": "Ce compte est privé. Son ou sa propriétaire approuve manuellement qui peut le suivre.",
   "account.media": "Médias",
   "account.mention": "Mentionner @{name}",
-  "account.moved_to": "{name} a déménagé vers :",
+  "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant  :",
   "account.mute": "Masquer @{name}",
-  "account.mute_notifications": "Ignorer les notifications de @{name}",
+  "account.mute_notifications": "Masquer les notifications de @{name}",
   "account.muted": "Masqué·e",
-  "account.never_active": "Jamais",
+  "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Messages",
-  "account.posts_with_replies": "Partages et réponses",
+  "account.posts_with_replies": "Messages et réponses",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la requête",
+  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
+  "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Message} other {{counter} Messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
+  "account.unblock_short": "Débloquer",
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer @{name}",
   "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
+  "account.unmute_short": "Ne plus masquer",
   "account_note.placeholder": "Cliquez pour ajouter une note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Taux de rétention des utilisateur·rice·s par jour après inscription",
+  "admin.dashboard.monthly_retention": "Taux de rétention des utilisateur·rice·s par mois après inscription",
+  "admin.dashboard.retention.average": "Moyenne",
+  "admin.dashboard.retention.cohort": "Mois d'inscription",
+  "admin.dashboard.retention.cohort_size": "Nouveaux utilisateurs",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Débit limité",
+  "alert.rate_limited.title": "Nombre de requêtes limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
   "announcement.announcement": "Annonce",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(non traité)",
+  "audio.hide": "Masquer l'audio",
   "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
-  "bundle_column_error.body": "Une erreur s’est produite lors du chargement de ce composant.",
+  "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
+  "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
+  "bundle_column_error.error.title": "Oh non !",
+  "bundle_column_error.network.body": "Une erreur s'est produite lors du chargement de cette page. Cela peut être dû à un problème temporaire avec votre connexion internet ou avec ce serveur.",
+  "bundle_column_error.network.title": "Erreur réseau",
   "bundle_column_error.retry": "Réessayer",
-  "bundle_column_error.title": "Erreur réseau",
+  "bundle_column_error.return": "Retour à l'accueil",
+  "bundle_column_error.routing.body": "La page demandée est introuvable. Êtes-vous sûr que l’URL dans la barre d’adresse est correcte ?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fermer",
   "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_modal_error.retry": "Réessayer",
+  "closed_registrations.other_server_instructions": "Puisque Mastodon est décentralisé, vous pouvez créer un compte sur un autre serveur et interagir quand même avec celui-ci.",
+  "closed_registrations_modal.description": "Créer un compte sur {domain} est actuellement impossible, néanmoins souvenez-vous que vous n'avez pas besoin d'un compte spécifiquement sur {domain} pour utiliser Mastodon.",
+  "closed_registrations_modal.find_another_server": "Trouver un autre serveur",
+  "closed_registrations_modal.preamble": "Mastodon est décentralisé : peu importe où vous créez votre votre, vous serez en mesure de suivre et d'interagir avec quiconque sur ce serveur. Vous pouvez même l'héberger !",
+  "closed_registrations_modal.title": "Inscription sur Mastodon",
+  "column.about": "À propos",
   "column.blocks": "Comptes bloqués",
-  "column.bookmarks": "Marque-pages",
+  "column.bookmarks": "Signets",
   "column.community": "Fil public local",
   "column.direct": "Messages directs",
   "column.directory": "Parcourir les profils",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local seulement",
   "community.column_settings.media_only": "Média uniquement",
   "community.column_settings.remote_only": "Distant seulement",
-  "compose_form.direct_message_warning": "Ce message sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
+  "compose.language.change": "Changer de langue",
+  "compose.language.search": "Rechercher des langues …",
   "compose_form.direct_message_warning_learn_more": "En savoir plus",
+  "compose_form.encryption_warning": "Les messages sur Mastodon ne sont pas chiffrés de bout en bout. Ne partagez aucune information sensible sur Mastodon.",
   "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur « non listé ». Seuls les pouets avec une visibilité « publique » peuvent être recherchés par hashtag.",
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos messages privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour autoriser qu'un seul choix",
-  "compose_form.publish": "Pouet",
+  "compose_form.publish": "Publier",
+  "compose_form.publish_form": "Publier",
   "compose_form.publish_loud": "{publish} !",
+  "compose_form.save_changes": "Enregistrer les modifications",
   "compose_form.sensitive.hide": "Marquer le média comme sensible",
   "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
   "compose_form.sensitive.unmarked": "Le média n’est pas marqué comme sensible",
@@ -114,57 +152,71 @@
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
   "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
+  "confirmations.cancel_follow_request.confirm": "Retirer la demande",
+  "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Voulez-vous vraiment supprimer ce message ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Rejeter",
+  "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
   "confirmations.domain_block.confirm": "Bloquer tout le domaine",
-  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans fils publics, ni dans vos notifications. Vos abonnés utilisant ce domaine seront retirés.",
+  "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
   "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
-  "confirmations.redraft.message": "Êtes-vous sûr de vouloir effacer ce statut pour le récrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
+  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
   "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez actuellement. Voulez-vous vraiment continuer ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name} ?",
+  "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
   "conversation.with": "Avec {names}",
+  "copypaste.copied": "Copié",
+  "copypaste.copy": "Copier",
   "directory.federated": "Du fédiverse connu",
   "directory.local": "De {domain} seulement",
   "directory.new_arrivals": "Inscrit·e·s récemment",
   "directory.recently_active": "Actif·ve·s récemment",
+  "disabled_account_banner.account_settings": "Paramètres du compte",
+  "disabled_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé.",
+  "dismissable_banner.community_timeline": "Voici les messages publics les plus récents des personnes dont les comptes sont hébergés par {domain}.",
+  "dismissable_banner.dismiss": "Rejeter",
+  "dismissable_banner.explore_links": "On parle actuellement de ces nouvelles sur ce serveur, ainsi que sur d'autres serveurs du réseau décentralisé.",
+  "dismissable_banner.explore_statuses": "Ces publications depuis les serveurs du réseau décentralisé, dont celui-ci, sont actuellement en train de gagner de l'ampleur sur ce serveur.",
+  "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.",
+  "dismissable_banner.public_timeline": "Voici les publications publiques les plus récentes des personnes de ce serveur et des autres du réseau décentralisé que ce serveur connait.",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
-  "emoji_button.activity": "Activité",
+  "emoji_button.activity": "Activités",
+  "emoji_button.clear": "Effacer",
   "emoji_button.custom": "Personnalisés",
   "emoji_button.flags": "Drapeaux",
-  "emoji_button.food": "Nourriture & Boisson",
+  "emoji_button.food": "Nourriture et boisson",
   "emoji_button.label": "Insérer un émoji",
   "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "Aucune correspondance d'émoji trouvée",
+  "emoji_button.not_found": "Aucun émoji correspondant n'a été trouvé",
   "emoji_button.objects": "Objets",
   "emoji_button.people": "Personnes",
   "emoji_button.recent": "Fréquemment utilisés",
   "emoji_button.search": "Recherche...",
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
-  "emoji_button.travel": "Lieux & Voyages",
+  "emoji_button.travel": "Voyage et lieux",
   "empty_column.account_suspended": "Compte suspendu",
   "empty_column.account_timeline": "Aucun message ici !",
   "empty_column.account_unavailable": "Profil non disponible",
-  "empty_column.blocks": "Vous n’avez bloqué aucun utilisateur pour le moment.",
+  "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
   "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
   "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
+  "empty_column.explore_statuses": "Rien n'est en tendance pour le moment. Revenez plus tard !",
   "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.favourites": "Personne n’a encore ajouté ce message à ses favoris. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "empty_column.follow_recommendations": "Il semble qu’aucune suggestion n’ait pu être générée pour vous. Vous pouvez essayer d’utiliser la recherche pour découvrir des personnes que vous pourriez connaître ou explorer les hashtags tendance.",
@@ -174,7 +226,7 @@
   "empty_column.home.suggestions": "Voir quelques suggestions",
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouveaux messages, ils apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
-  "empty_column.mutes": "Vous n’avez masqué aucun utilisateur pour le moment.",
+  "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Essayez de les désactiver et de rafraîchir la page. Si cela ne vous aide pas, vous pouvez toujours utiliser Mastodon via un autre navigateur ou une application native.",
   "errors.unexpected_crash.copy_stacktrace": "Copier la trace d'appels dans le presse-papier",
   "errors.unexpected_crash.report_issue": "Signaler le problème",
+  "explore.search_results": "Résultats de la recherche",
+  "explore.suggested_follows": "Pour vous",
+  "explore.title": "Explorer",
+  "explore.trending_links": "Nouvelles",
+  "explore.trending_statuses": "Messages",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Cette catégorie de filtre ne s'applique pas au contexte dans lequel vous avez accédé à ce message. Si vous voulez que le message soit filtré dans ce contexte également, vous devrez modifier le filtre.",
+  "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte !",
+  "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",
+  "filter_modal.added.expired_title": "Filtre expiré !",
+  "filter_modal.added.review_and_configure": "Pour passer en revue et approfondir la configuration de cette catégorie de filtre, aller sur le {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Paramètres du filtre",
+  "filter_modal.added.settings_link": "page des paramètres",
+  "filter_modal.added.short_explanation": "Ce message a été ajouté à la catégorie de filtre suivante : {title}.",
+  "filter_modal.added.title": "Filtre ajouté !",
+  "filter_modal.select_filter.context_mismatch": "ne s’applique pas à ce contexte",
+  "filter_modal.select_filter.expired": "a expiré",
+  "filter_modal.select_filter.prompt_new": "Nouvelle catégorie : {name}",
+  "filter_modal.select_filter.search": "Rechercher ou créer",
+  "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
+  "filter_modal.select_filter.title": "Filtrer ce message",
+  "filter_modal.title.status": "Filtrer un message",
   "follow_recommendations.done": "Terminé",
   "follow_recommendations.heading": "Suivez les personnes dont vous aimeriez voir les messages ! Voici quelques suggestions.",
   "follow_recommendations.lead": "Les messages des personnes que vous suivez apparaîtront par ordre chronologique sur votre fil d'accueil. Ne craignez pas de faire des erreurs, vous pouvez arrêter de suivre les gens aussi facilement à tout moment !",
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
+  "footer.about": "À propos",
+  "footer.directory": "Annuaire des profils",
+  "footer.get_app": "Télécharger l’application",
+  "footer.invite": "Inviter des personnes",
+  "footer.keyboard_shortcuts": "Raccourcis clavier",
+  "footer.privacy_policy": "Politique de confidentialité",
+  "footer.source_code": "Voir le code source",
   "generic.saved": "Sauvegardé",
-  "getting_started.developers": "Développeur·euse·s",
-  "getting_started.directory": "Annuaire des profils",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Pour commencer",
-  "getting_started.invite": "Inviter des gens",
-  "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via {github} sur GitHub.",
-  "getting_started.security": "Sécurité",
-  "getting_started.terms": "Conditions d’utilisation",
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
   "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
   "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "hashtag.follow": "Suivre le hashtag",
+  "hashtag.unfollow": "Ne plus suivre le hashtag",
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
   "home.show_announcements": "Afficher les annonces",
+  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter ce post aux favoris pour informer l'auteur que vous l'appréciez et le sauvegarder pour plus tard.",
+  "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs posts dans votre fil d'actualité.",
+  "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez booster ce message pour le partager avec vos propres abonnés.",
+  "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à ce message.",
+  "interaction_modal.on_another_server": "Sur un autre serveur",
+  "interaction_modal.on_this_server": "Sur ce serveur",
+  "interaction_modal.other_server_instructions": "Copiez et collez cette URL dans le champ de recherche de votre application Mastodon préférée ou l'interface web de votre serveur Mastodon.",
+  "interaction_modal.preamble": "Puisque Mastodon est décentralisé, vous pouvez utiliser votre compte existant hébergé par un autre serveur Mastodon ou une plateforme compatible si vous n'avez pas de compte sur celui-ci.",
+  "interaction_modal.title.favourite": "Ajouter de post de {name} aux favoris",
+  "interaction_modal.title.follow": "Suivre {name}",
+  "interaction_modal.title.reblog": "Partager la publication de {name}",
+  "interaction_modal.title.reply": "Répondre au message de {name}",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
   "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -219,9 +307,9 @@
   "keyboard_shortcuts.blocked": "Ouvrir la liste des comptes bloqués",
   "keyboard_shortcuts.boost": "Partager le message",
   "keyboard_shortcuts.column": "Se placer dans une colonne",
-  "keyboard_shortcuts.compose": "se placer dans la zone de rédaction",
+  "keyboard_shortcuts.compose": "Se placer dans la zone de rédaction",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "Ouvrir la colonne des messages directs",
+  "keyboard_shortcuts.direct": "pour ouvrir la colonne des messages directs",
   "keyboard_shortcuts.down": "Descendre dans la liste",
   "keyboard_shortcuts.enter": "Ouvrir le message",
   "keyboard_shortcuts.favourite": "Ajouter le message aux favoris",
@@ -232,13 +320,13 @@
   "keyboard_shortcuts.hotkey": "Raccourci clavier",
   "keyboard_shortcuts.legend": "Afficher cet aide-mémoire",
   "keyboard_shortcuts.local": "Ouvrir le fil public local",
-  "keyboard_shortcuts.mention": "Mentionner l’auteur",
+  "keyboard_shortcuts.mention": "Mentionner l’auteur·rice",
   "keyboard_shortcuts.muted": "Ouvrir la liste des comptes masqués",
   "keyboard_shortcuts.my_profile": "Ouvrir votre profil",
   "keyboard_shortcuts.notifications": "Ouvrir la colonne de notifications",
-  "keyboard_shortcuts.open_media": "ouvrir le média",
+  "keyboard_shortcuts.open_media": "Ouvrir le média",
   "keyboard_shortcuts.pinned": "Ouvrir la liste des messages épinglés",
-  "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur",
+  "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
   "keyboard_shortcuts.reply": "Répondre au message",
   "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
   "keyboard_shortcuts.search": "Se placer dans le champ de recherche",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Agrandir la fenêtre de visualisation des images",
   "lightbox.next": "Suivant",
   "lightbox.previous": "Précédent",
+  "limited_account_hint.action": "Afficher le profil quand même",
+  "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "lists.account.add": "Ajouter à la liste",
   "lists.account.remove": "Supprimer de la liste",
   "lists.delete": "Supprimer la liste",
@@ -261,7 +351,7 @@
   "lists.edit.submit": "Modifier le titre",
   "lists.new.create": "Ajouter une liste",
   "lists.new.title_placeholder": "Titre de la nouvelle liste",
-  "lists.replies_policy.followed": "N'importe quel utilisateur suivi",
+  "lists.replies_policy.followed": "N'importe quel compte suivi",
   "lists.replies_policy.list": "Membres de la liste",
   "lists.replies_policy.none": "Personne",
   "lists.replies_policy.title": "Afficher les réponses à :",
@@ -269,13 +359,14 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "Intervertir la visibilité",
+  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "missing_indicator.label": "Non trouvé",
   "missing_indicator.sublabel": "Ressource introuvable",
+  "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déplacé vers {movedToAccount}.",
   "mute_modal.duration": "Durée",
   "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
   "mute_modal.indefinite": "Indéfinie",
-  "navigation_bar.apps": "Applications mobiles",
+  "navigation_bar.about": "À propos",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
   "navigation_bar.community_timeline": "Fil public local",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.edit_profile": "Modifier le profil",
+  "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
-  "navigation_bar.follow_requests": "Demandes de suivi",
-  "navigation_bar.follows_and_followers": "Abonnements et abonné⋅e·s",
-  "navigation_bar.info": "À propos de ce serveur",
-  "navigation_bar.keyboard_shortcuts": "Raccourcis clavier",
+  "navigation_bar.follow_requests": "Demandes d’abonnement",
+  "navigation_bar.follows_and_followers": "Abonnements et abonnés",
   "navigation_bar.lists": "Listes",
   "navigation_bar.logout": "Déconnexion",
   "navigation_bar.mutes": "Comptes masqués",
@@ -297,32 +387,41 @@
   "navigation_bar.pins": "Messages épinglés",
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.public_timeline": "Fil public global",
+  "navigation_bar.search": "Rechercher",
   "navigation_bar.security": "Sécurité",
-  "notification.favourite": "{name} a ajouté le message à ses favoris",
+  "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
+  "notification.admin.report": "{name} a signalé {target}",
+  "notification.admin.sign_up": "{name} s'est inscrit",
+  "notification.favourite": "{name} a aimé votre publication",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
-  "notification.mention": "{name} vous a mentionné·",
+  "notification.mention": "{name} vous a mentionné·e :",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
   "notification.status": "{name} vient de publier",
+  "notification.update": "{name} a modifié un message",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
+  "notifications.column_settings.admin.report": "Nouveaux signalements :",
+  "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show": "Afficher",
-  "notifications.column_settings.follow": "Nouveaux abonnés :",
+  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+  "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
-  "notifications.column_settings.poll": "Résultats des sondage :",
+  "notifications.column_settings.poll": "Résultats des sondages :",
   "notifications.column_settings.push": "Notifications push",
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Jouer un son",
   "notifications.column_settings.status": "Nouveaux messages :",
-  "notifications.column_settings.unread_markers.category": "Marqueurs de notifications non lues",
+  "notifications.column_settings.unread_notifications.category": "Notifications non lues",
+  "notifications.column_settings.unread_notifications.highlight": "Surligner les notifications non lues",
+  "notifications.column_settings.update": "Modifications :",
   "notifications.filter.all": "Tout",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favoris",
@@ -351,41 +450,97 @@
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visible uniquement par vos abonné·e·s",
+  "privacy.direct.short": "Personnes mentionnées uniquement",
+  "privacy.private.long": "Visible uniquement par vos abonnés",
   "privacy.private.short": "Abonnés uniquement",
-  "privacy.public.long": "Visible par tous, affiché dans les fils publics",
+  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible par tous, mais pas dans les fils publics",
+  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
   "privacy.unlisted.short": "Non listé",
+  "privacy_policy.last_updated": "Dernière mise à jour {date}",
+  "privacy_policy.title": "Politique de confidentialité",
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
   "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !",
   "relative_time.days": "{number} j",
+  "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
+  "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",
+  "relative_time.full.just_now": "à l’instant",
+  "relative_time.full.minutes": "il y a {number, plural, one {# minute} other {# minutes}}",
+  "relative_time.full.seconds": "il y a {number, plural, one {# second} other {# seconds}}",
   "relative_time.hours": "{number} h",
   "relative_time.just_now": "à l’instant",
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
   "reply_indicator.cancel": "Annuler",
+  "report.block": "Bloquer",
+  "report.block_explanation": "Vous ne verrez plus les messages de ce profil, et il ne pourra ni vous suivre ni voir vos messages. Il pourra savoir qu'il a été bloqué.",
+  "report.categories.other": "Autre",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur",
+  "report.category.subtitle": "Sélctionnez ce qui correspond le mieux",
+  "report.category.title": "Dites-nous ce qu'il se passe avec {type}",
+  "report.category.title_account": "ce profil",
+  "report.category.title_status": "ce message",
+  "report.close": "Terminé",
+  "report.comment.title": "Y a-t-il autre chose que nous devrions savoir ?",
   "report.forward": "Transférer à {target}",
   "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer également une copie anonyme du rapport ?",
-  "report.hint": "Le rapport sera envoyé aux modérateurs de votre instance. Vous pouvez expliquer pourquoi vous signalez le compte ci-dessous :",
+  "report.mute": "Masquer",
+  "report.mute_explanation": "Vous ne verrez plus les messages de ce compte, mais il pourra toujours vous suivre et voir vos messages. Il ne pourra pas savoir qu'il a été masqué.",
+  "report.next": "Suivant",
   "report.placeholder": "Commentaires additionnels",
+  "report.reasons.dislike": "Cela ne me plaît pas",
+  "report.reasons.dislike_description": "Ce n'est pas quelque chose que vous voulez voir",
+  "report.reasons.other": "Pour une autre raison",
+  "report.reasons.other_description": "Le problème ne correspond pas aux autres catégories",
+  "report.reasons.spam": "C'est du spam",
+  "report.reasons.spam_description": "Liens malveillants, faux engagement ou réponses répétitives",
+  "report.reasons.violation": "Infraction des règles du serveur",
+  "report.reasons.violation_description": "Vous savez que des règles précises sont enfreintes",
+  "report.rules.subtitle": "Sélectionnez toutes les réponses appropriées",
+  "report.rules.title": "Quelles règles sont enfreintes ?",
+  "report.statuses.subtitle": "Sélectionnez toutes les réponses appropriées",
+  "report.statuses.title": "Existe-t-il des messages pour étayer ce rapport ?",
   "report.submit": "Envoyer",
   "report.target": "Signalement de {target}",
+  "report.thanks.take_action": "Voici les possibilités que vous avez pour contrôler ce que vous voyez sur Mastodon :",
+  "report.thanks.take_action_actionable": "Pendant que nous étudions votre requête, vous pouvez prendre des mesures contre @{name} :",
+  "report.thanks.title": "Vous ne voulez pas voir cela ?",
+  "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
+  "report.unfollow": "Ne plus suivre @{name}",
+  "report.unfollow_explanation": "Vous suivez ce compte. Désabonnez-vous pour ne plus en voir les messages sur votre fil principal.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
+  "report_notification.categories.other": "Autre",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.open": "Ouvrir le signalement",
   "search.placeholder": "Rechercher",
+  "search.search_or_paste": "Rechercher ou saisir une URL",
   "search_popout.search_format": "Recherche avancée",
   "search_popout.tips.full_text": "Un texte normal retourne les messages que vous avez écrits, ajoutés à vos favoris, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondants.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "statuts",
+  "search_popout.tips.status": "message",
   "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les identifiants et les hashtags correspondants",
-  "search_popout.tips.user": "utilisateur·ice",
+  "search_popout.tips.user": "utilisateur",
   "search_results.accounts": "Comptes",
+  "search_results.all": "Tous les résultats",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Aucun résultat avec ces mots-clefs",
   "search_results.statuses": "Messages",
   "search_results.statuses_fts_disabled": "La recherche de messages par leur contenu n'est pas activée sur ce serveur Mastodon.",
+  "search_results.title": "Rechercher {q}",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
+  "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
+  "server_banner.active_users": "comptes actifs",
+  "server_banner.administered_by": "Administré par :",
+  "server_banner.introduction": "{domain} fait partie du réseau social décentralisé propulsé par {mastodon}.",
+  "server_banner.learn_more": "En savoir plus",
+  "server_banner.server_stats": "Statistiques du serveur :",
+  "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.sign_in": "Se connecter",
+  "sign_in_banner.text": "Connectez-vous pour suivre les profils ou les hashtags, ajouter aux favoris, partager et répondre aux messages, ou interagir depuis votre compte sur un autre serveur.",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",
   "status.block": "Bloquer @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Envoyer un message direct à @{name}",
+  "status.edit": "Éditer",
+  "status.edited": "Édité le {date}",
+  "status.edited_x_times": "Edité {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
+  "status.filter": "Filtrer ce message",
   "status.filtered": "Filtré",
+  "status.hide": "Cacher le pouet",
+  "status.history.created": "créé par {name} {date}",
+  "status.history.edited": "édité par {name} {date}",
   "status.load_more": "Charger plus",
   "status.media_hidden": "Média caché",
   "status.mention": "Mentionner @{name}",
@@ -413,28 +575,34 @@
   "status.reblog_private": "Partager à l’audience originale",
   "status.reblogged_by": "{name} a partagé",
   "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.",
-  "status.redraft": "Supprimer et récrire",
+  "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des marque-pages",
+  "status.replied_to": "En réponse à {name}",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
+  "status.show_filter_reason": "Afficher quand même",
   "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
   "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
-  "status.show_thread": "Montrer le fil",
+  "status.show_original": "Afficher l’original",
+  "status.translate": "Traduire",
+  "status.translated_from_with": "Traduit de {lang} en utilisant {provider}",
   "status.uncached_media_warning": "Indisponible",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Retirer du profil",
+  "subscribed_languages.lead": "Seuls les messages dans les langues sélectionnées apparaîtront sur votre fil principal et vos listes de fils après le changement. Sélectionnez aucune pour recevoir les messages dans toutes les langues.",
+  "subscribed_languages.save": "Enregistrer les modifications",
+  "subscribed_languages.target": "Changer les langues abonnées pour {target}",
   "suggestions.dismiss": "Rejeter la suggestion",
-  "suggestions.header": "Vous pourriez être intéressé par…",
+  "suggestions.header": "Vous pourriez être intéressé·e par…",
   "tabs_bar.federated_timeline": "Fil public global",
   "tabs_bar.home": "Accueil",
   "tabs_bar.local_timeline": "Fil public local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Chercher",
   "time_remaining.days": "{number, plural, one {# jour restant} other {# jours restants}}",
   "time_remaining.hours": "{number, plural, one {# heure restante} other {# heures restantes}}",
   "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
@@ -443,8 +611,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
   "timeline_hint.resources.followers": "Les abonnés",
   "timeline_hint.resources.follows": "Les abonnements",
-  "timeline_hint.resources.statuses": "Messages plus anciens",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} personne en parle} other {{counter} personnes en parlent}}",
+  "timeline_hint.resources.statuses": "Les messages plus anciens",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "units.short.billion": "{count}Md",
@@ -456,13 +624,14 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyants",
+  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.undo": "Supprimer",
-  "upload_form.video_description": "Décrire pour les personnes ayant des problèmes d’audition ou de vision",
+  "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Application en cours…",
   "upload_modal.choose_image": "Choisir une image",
   "upload_modal.description_placeholder": "Buvez de ce whisky que le patron juge fameux",
   "upload_modal.detect_text": "Détecter le texte de l’image",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Préparation de l’OCR…",
   "upload_modal.preview_label": "Aperçu ({ratio})",
   "upload_progress.label": "Envoi en cours…",
+  "upload_progress.processing": "En cours…",
   "video.close": "Fermer la vidéo",
   "video.download": "Télécharger le fichier",
   "video.exit_fullscreen": "Quitter le plein écran",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
new file mode 100644
index 000000000..394357409
--- /dev/null
+++ b/app/javascript/mastodon/locales/fy.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderearre servers",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon is frije, iepenboarnesoftware en in hannelsmerk fan Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reden net beskikber",
+  "about.domain_blocks.preamble": "Yn it algemien kinsto mei Mastodon berjochten ûntfange fan, en ynteraksje hawwe mei brûkers fan elke server yn de fediverse. Dit binne de útsûnderingen dy’t op dizze spesifike server jilde.",
+  "about.domain_blocks.silenced.explanation": "Yn it algemien sjochsto gjin berjochten en accounts fan dizze server, útsein do berjochten eksplisyt opsikest of derfoar kiest om in account fan dizze server te folgjen.",
+  "about.domain_blocks.silenced.title": "Beheind",
+  "about.domain_blocks.suspended.explanation": "Der wurde gjin gegevens fan dizze server ferwurke, bewarre of útwiksele, wat ynteraksje of kommunikaasje mei brûkers fan dizze server ûnmooglik makket.",
+  "about.domain_blocks.suspended.title": "Utsteld",
+  "about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.",
+  "about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}",
+  "about.rules": "Serverrigels",
+  "account.account_note_header": "Opmerking",
+  "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Groep",
+  "account.block": "@{name} blokkearje",
+  "account.block_domain": "Domein {domain} blokkearje",
+  "account.blocked": "Blokkearre",
+  "account.browse_more_on_origin_server": "Mear op it orizjinele profyl besjen",
+  "account.cancel_follow_request": "Folchfersyk annulearje",
+  "account.direct": "@{name} in direkt berjocht stjoere",
+  "account.disable_notifications": "Jou gjin melding mear wannear @{name} in berjocht pleatst",
+  "account.domain_blocked": "Domein blokkearre",
+  "account.edit_profile": "Profyl bewurkje",
+  "account.enable_notifications": "Jou in melding mear wannear @{name} in berjocht pleatst",
+  "account.endorse": "Op profyl werjaan",
+  "account.featured_tags.last_status_at": "Lêste berjocht op {date}",
+  "account.featured_tags.last_status_never": "Gjin berjochten",
+  "account.featured_tags.title": "Utljochte hashtags fan {name}",
+  "account.follow": "Folgje",
+  "account.followers": "Folgers",
+  "account.followers.empty": "Noch net ien folget dizze brûker.",
+  "account.followers_counter": "{count, plural, one {{counter} folger} other {{counter} folgers}}",
+  "account.following": "Folgjend",
+  "account.following_counter": "{count, plural, one {{counter} folgjend} other {{counter} folgjend}}",
+  "account.follows.empty": "Dizze brûker folget noch net ien.",
+  "account.follows_you": "Folget jo",
+  "account.go_to_profile": "Gean nei profyl",
+  "account.hide_reblogs": "Boosts fan @{name} ferstopje",
+  "account.joined_short": "Registrearre op",
+  "account.languages": "Toande talen wizigje",
+  "account.link_verified_on": "Eigendom fan dizze keppeling is kontrolearre op {date}",
+  "account.locked_info": "De privacysteat fan dizze account is op beskoattele set. De eigener bepaalt hânmjittich wa’t dyjinge folgje kin.",
+  "account.media": "Media",
+  "account.mention": "@{name} fermelde",
+  "account.moved_to": "{name} is ferhuze nei:",
+  "account.mute": "@{name} negearje",
+  "account.mute_notifications": "Meldingen fan @{name} negearje",
+  "account.muted": "Negearre",
+  "account.open_original_page": "Orizjinele side iepenje",
+  "account.posts": "Berjochten",
+  "account.posts_with_replies": "Berjochten en reaksjes",
+  "account.report": "@{name} rapportearje",
+  "account.requested": "Wacht op goedkarring. Klik om it folchfersyk te annulearjen",
+  "account.requested_follow": "{name} hat dy in folchfersyk stjoerd",
+  "account.share": "Profyl fan @{name} diele",
+  "account.show_reblogs": "Boosts fan @{name} toane",
+  "account.statuses_counter": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}",
+  "account.unblock": "@{name} deblokkearje",
+  "account.unblock_domain": "Domein {domain} deblokkearje",
+  "account.unblock_short": "Deblokkearje",
+  "account.unendorse": "Net op profyl werjaan",
+  "account.unfollow": "Net mear folgje",
+  "account.unmute": "@{name} net langer negearje",
+  "account.unmute_notifications": "Meldingen fan @{name} ynskeakelje",
+  "account.unmute_short": "Net mear negearje",
+  "account_note.placeholder": "Klik om notysje ta te foegjen",
+  "admin.dashboard.daily_retention": "Brûkerretinsjegraad per dei nei oanmelding",
+  "admin.dashboard.monthly_retention": "Brûkerretinsjegraad per moanne nei oanmelding",
+  "admin.dashboard.retention.average": "Gemiddelde",
+  "admin.dashboard.retention.cohort": "Registraasjemoanne",
+  "admin.dashboard.retention.cohort_size": "Nije brûkers",
+  "alert.rate_limited.message": "Opnij probearje nei {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Dataferkear beheind",
+  "alert.unexpected.message": "Der is in ûnferwachte flater bard.",
+  "alert.unexpected.title": "Oepsy!",
+  "announcement.announcement": "Oankundiging",
+  "attachments_list.unprocessed": "(net ferwurke)",
+  "audio.hide": "Audio ferstopje",
+  "autosuggest_hashtag.per_week": "{count} yn ’e wike",
+  "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
+  "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
+  "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
+  "bundle_column_error.error.title": "Oh nee!",
+  "bundle_column_error.network.body": "Der is in flater bard by it laden fan dizze side. Dit kin komme troch in tydlik probleem mei jo ynternetferbining of dizze server.",
+  "bundle_column_error.network.title": "Netwurkflater",
+  "bundle_column_error.retry": "Opnij probearje",
+  "bundle_column_error.return": "Tebek nei startside",
+  "bundle_column_error.routing.body": "De opfrege side kin net fûn wurde. Binne jo wis dat de URL yn de adresbalke goed is?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Slute",
+  "bundle_modal_error.message": "Der gie wat mis by it laden fan dizze komponint.",
+  "bundle_modal_error.retry": "Opnij probearje",
+  "closed_registrations.other_server_instructions": "Omdat Mastodon desintralisearre is, kinne jo in account meitsje op in oare server en noch hieltyd ynteraksje hawwe mei dizze.",
+  "closed_registrations_modal.description": "It oanmeitsjen fan in account op {domain} is op dit stuit net mooglik, mar hâld asjebleaft yn gedachten dat jo gjin account spesifyk op {domain} nedich hawwe om Mastodon te brûken.",
+  "closed_registrations_modal.find_another_server": "Sykje in oare server",
+  "closed_registrations_modal.preamble": "Mastodon is desintralisearre, dus nettsjinsteande wêr't jo jo account oanmeitsje, jo kinne elkenien op dizze server folgje en der ynteraksje mei hawwe. Jo kinne it sels sels hoste!",
+  "closed_registrations_modal.title": "Oanmelde op Mastodon",
+  "column.about": "Oer",
+  "column.blocks": "Blokkearre brûkers",
+  "column.bookmarks": "Blêdwizers",
+  "column.community": "Lokale tiidline",
+  "column.direct": "Direkte berjochten",
+  "column.directory": "Profilen trochsykje",
+  "column.domain_blocks": "Blokkearre domeinen",
+  "column.favourites": "Favoriten",
+  "column.follow_requests": "Folchfersiken",
+  "column.home": "Startside",
+  "column.lists": "Listen",
+  "column.mutes": "Negearre brûkers",
+  "column.notifications": "Meldingen",
+  "column.pins": "Fêstsette berjochten",
+  "column.public": "Globale tiidline",
+  "column_back_button.label": "Tebek",
+  "column_header.hide_settings": "Ynstellingen ferstopje",
+  "column_header.moveLeft_settings": "Kolom nei links ferpleatse",
+  "column_header.moveRight_settings": "Kolom nei rjochts ferpleatse",
+  "column_header.pin": "Fêstsette",
+  "column_header.show_settings": "Ynstellingen toane",
+  "column_header.unpin": "Losmeitsje",
+  "column_subheading.settings": "Ynstellingen",
+  "community.column_settings.local_only": "Allinnich lokaal",
+  "community.column_settings.media_only": "Allinnich media",
+  "community.column_settings.remote_only": "Allinnich oare servers",
+  "compose.language.change": "Taal wizigje",
+  "compose.language.search": "Talen sykje…",
+  "compose_form.direct_message_warning_learn_more": "Mear ynfo",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "Dit berjocht falt net ûnder in hashtag te besjen, omdat dizze net op iepenbiere tiidlinen toand wurdt. Allinnich iepenbiere berjochten kinne fia hashtags fûn wurde.",
+  "compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
+  "compose_form.lock_disclaimer.lock": "beskoattele",
+  "compose_form.placeholder": "Wat wolsto kwyt?",
+  "compose_form.poll.add_option": "Kar tafoegje",
+  "compose_form.poll.duration": "Doer fan de enkête",
+  "compose_form.poll.option_placeholder": "Kar {number}",
+  "compose_form.poll.remove_option": "Dizze kar fuortsmite",
+  "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
+  "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
+  "compose_form.publish": "Publisearje",
+  "compose_form.publish_form": "Publisearje",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Wizigingen bewarje",
+  "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
+  "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
+  "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
+  "compose_form.spoiler_placeholder": "Warskôgingstekst",
+  "confirmation_modal.cancel": "Annulearje",
+  "confirmations.block.block_and_report": "Blokkearje en rapportearje",
+  "confirmations.block.confirm": "Blokkearje",
+  "confirmations.block.message": "Bisto wis datsto {name} blokkearje wolst?",
+  "confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
+  "confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
+  "confirmations.delete.confirm": "Fuortsmite",
+  "confirmations.delete.message": "Bisto wis datsto dit berjocht fuortsmite wolst?",
+  "confirmations.delete_list.confirm": "Fuortsmite",
+  "confirmations.delete_list.message": "Bisto wis datsto dizze list foar permanint fuortsmite wolst?",
+  "confirmations.discard_edit_media.confirm": "Fuortsmite",
+  "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
+  "confirmations.logout.confirm": "Ofmelde",
+  "confirmations.logout.message": "Bisto wis datsto ôfmelde wolst?",
+  "confirmations.mute.confirm": "Negearje",
+  "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten wêr’t se yn fermeld wurden ûnsichtber meitsje, mar se sille dyn berjochten noch hieltyd sjen kinne en dy folgje kinne.",
+  "confirmations.mute.message": "Bisto wis datsto {name} negearje wolst?",
+  "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
+  "confirmations.redraft.message": "Wolsto dit berjocht wurklik fuortsmite en opnij opstelle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht rekkesto kwyt.",
+  "confirmations.reply.confirm": "Reagearje",
+  "confirmations.reply.message": "Troch no te reagearjen sil it berjocht watsto no oan it skriuwen binne oerskreaun wurde. Wolsto trochgean?",
+  "confirmations.unfollow.confirm": "Net mear folgje",
+  "confirmations.unfollow.message": "Bisto wis datsto {name} net mear folgje wolst?",
+  "conversation.delete": "Petear fuortsmite",
+  "conversation.mark_as_read": "As lêzen markearje",
+  "conversation.open": "Petear toane",
+  "conversation.with": "Mei {names}",
+  "copypaste.copied": "Kopiearre",
+  "copypaste.copy": "Kopiearje",
+  "directory.federated": "Fediverse (wat bekend is)",
+  "directory.local": "Allinnich fan {domain}",
+  "directory.new_arrivals": "Nije accounts",
+  "directory.recently_active": "Resint aktyf",
+  "disabled_account_banner.account_settings": "Accountynstellingen",
+  "disabled_account_banner.text": "Jo account {disabledAccount} is op dit stuit útskeakele.",
+  "dismissable_banner.community_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op {domain}.",
+  "dismissable_banner.dismiss": "Slute",
+  "dismissable_banner.explore_links": "Dizze nijsberjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
+  "dismissable_banner.explore_statuses": "Dizze berjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
+  "dismissable_banner.explore_tags": "Dizze hashtags winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
+  "dismissable_banner.public_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op dizze en oare servers binnen it desintrale netwurk. Jo kinne ûnder ‘Ynstellingen > Foarkarren > Oars’ kieze hokker talen jo sjen wolle.",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Sa komt it der út te sjen:",
+  "emoji_button.activity": "Aktiviteiten",
+  "emoji_button.clear": "Wiskje",
+  "emoji_button.custom": "Oanpast",
+  "emoji_button.flags": "Flaggen",
+  "emoji_button.food": "Iten en drinken",
+  "emoji_button.label": "Emoji tafoegje",
+  "emoji_button.nature": "Natuer",
+  "emoji_button.not_found": "Gjin oerienkommende emoji fûn",
+  "emoji_button.objects": "Objekten",
+  "emoji_button.people": "Minsken",
+  "emoji_button.recent": "Faaks brûkt",
+  "emoji_button.search": "Sykje…",
+  "emoji_button.search_results": "Sykresultaten",
+  "emoji_button.symbols": "Symboalen",
+  "emoji_button.travel": "Reizgje en lokaasjes",
+  "empty_column.account_suspended": "Account beskoattele",
+  "empty_column.account_timeline": "Hjir binne gjin berjochten!",
+  "empty_column.account_unavailable": "Profyl net beskikber",
+  "empty_column.blocks": "Do hast noch gjin brûkers blokkearre.",
+  "empty_column.bookmarked_statuses": "Jo hawwe noch gjin berjochten oan jo blêdwizers tafoege. Wannear’t jo der ien oan jo blêdwizers tafoegje, falt dizze hjir te sjen.",
+  "empty_column.community": "De lokale tiidline is noch leech. Pleats in iepenbier berjocht om de spits ôf te biten!",
+  "empty_column.direct": "Jo hawwe noch gjin direkte berjochten. Wannear’t jo der ien ferstjoere of ûntfang, komt dizze hjir te stean.",
+  "empty_column.domain_blocks": "Der binne noch gjin blokkearre domeinen.",
+  "empty_column.explore_statuses": "Op dit stuit binne der gjin trends. Kom letter werom!",
+  "empty_column.favourited_statuses": "Jo hawwe noch gjin favorite berjochten. Wannear’t jo ien as favoryt markearje, falt dizze hjir te sjen.",
+  "empty_column.favourites": "Net ien hat dit berjocht noch as favoryt markearre. Wannear’t ien dit docht, falt dat hjir te sjen.",
+  "empty_column.follow_recommendations": "It liket der op dat der gjin oanrekommandaasjes foar jo oanmakke wurde kinne. Jo kinne probearje te sykjen nei minsken dy’t jo miskien kinne, sykje op hashtags, de lokale en globale tiidlinen besjen of de brûkersgids trochblêdzje.",
+  "empty_column.follow_requests": "Jo hawwe noch gjin folchfersiken ûntfongen. Wannear’t jo der ien ûntfange, falt dat hjir te sjen.",
+  "empty_column.hashtag": "Der is noch neat te finen ûnder dizze hashtag.",
+  "empty_column.home": "Dizze tiidline is leech! Folgje mear minsken om it te foljen. {suggestions}",
+  "empty_column.home.suggestions": "Suggestjes besjen",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "Jo hawwe noch gjin inkelde list. Wannear’t jo der ien oanmakke hawwe, falt dat hjir te sjen.",
+  "empty_column.mutes": "Do hast noch gjin brûkers negearre.",
+  "empty_column.notifications": "Do hast noch gjin meldingen. Ynteraksjes mei oare minsken sjochsto hjir.",
+  "empty_column.public": "Der is hjir neat! Skriuw eat publyklik, of folgje sels brûkers fan oare servers om it hjir te foljen",
+  "error.unexpected_crash.explanation": "Troch in bug in ús koade of in probleem mei de komptabiliteit fan jo browser, koe dizze side net toand wurde.",
+  "error.unexpected_crash.explanation_addons": "Dizze side kin net goed toand wurde. Dit probleem komt faaks troch in browserútwreiding of ark foar automatysk oersetten.",
+  "error.unexpected_crash.next_steps": "Probearje dizze side te fernijen. Wannear’t dit net helpt is it noch hieltyd mooglik om Mastodon yn in oare browser of mobile app te brûken.",
+  "error.unexpected_crash.next_steps_addons": "Probearje dizze út te skeakeljen en de side te fernijen. Wannear’t dit net helpt is it noch hieltyd mooglik om Mastodon yn in oare browser of mobile app te brûken.",
+  "errors.unexpected_crash.copy_stacktrace": "Stacktrace nei klamboerd kopiearje",
+  "errors.unexpected_crash.report_issue": "Technysk probleem melde",
+  "explore.search_results": "Sykresultaten",
+  "explore.suggested_follows": "Foar jo",
+  "explore.title": "Ferkenne",
+  "explore.trending_links": "Nijs",
+  "explore.trending_statuses": "Berjochten",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Dizze filterkategory is net fan tapassing op de kontekst wêryn jo dit berjocht benadere hawwe. As jo wolle dat it berjocht ek yn dizze kontekst filtere wurdt, moatte jo it filter bewurkje.",
+  "filter_modal.added.context_mismatch_title": "Kontekst komt net oerien!",
+  "filter_modal.added.expired_explanation": "Dizze filterkategory is ferrûn. Jo moatte de ferrindatum wizigje om de kategory tapasse te kinnen.",
+  "filter_modal.added.expired_title": "Filter ferrûn!",
+  "filter_modal.added.review_and_configure": "Gean nei {settings_link} om dizze filterkategory opnij te besjen en fierder te konfigurearjen.",
+  "filter_modal.added.review_and_configure_title": "Filterynstellingen",
+  "filter_modal.added.settings_link": "ynstellingenside",
+  "filter_modal.added.short_explanation": "Dit berjocht is tafoege oan de folgjende filterkategory: {title}.",
+  "filter_modal.added.title": "Filter tafoege!",
+  "filter_modal.select_filter.context_mismatch": "is net fan tapassing op dizze kontekst",
+  "filter_modal.select_filter.expired": "ferrûn",
+  "filter_modal.select_filter.prompt_new": "Nije kategory: {name}",
+  "filter_modal.select_filter.search": "Sykje of tafoegje",
+  "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
+  "filter_modal.select_filter.title": "Dit berjocht filterje",
+  "filter_modal.title.status": "In berjocht filterje",
+  "follow_recommendations.done": "Klear",
+  "follow_recommendations.heading": "Folgje minsken dêr’tsto graach berjochten fan sjen wolst! Hjir binne wat suggestjes.",
+  "follow_recommendations.lead": "Berjochten fan minsken dy’t jo folgje sille yn gronologyske folchoarder op jo starttiidline ferskine. Wês net bang om hjiryn flaters te meitsjen, want jo kinne minsken op elk momint krekt sa ienfâldich ûntfolgje!",
+  "follow_request.authorize": "Goedkarre",
+  "follow_request.reject": "Wegerje",
+  "follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
+  "footer.about": "Oer",
+  "footer.directory": "Profylmap",
+  "footer.get_app": "App downloade",
+  "footer.invite": "Minsken útnûgje",
+  "footer.keyboard_shortcuts": "Fluchtoetsen",
+  "footer.privacy_policy": "Privacybelied",
+  "footer.source_code": "Boarnekoade besjen",
+  "generic.saved": "Bewarre",
+  "getting_started.heading": "Uteinsette",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "of {additional}",
+  "hashtag.column_header.tag_mode.none": "sûnder {additional}",
+  "hashtag.column_settings.select.no_options_message": "Gjin suggestjes fûn",
+  "hashtag.column_settings.select.placeholder": "Folje hashtags yn…",
+  "hashtag.column_settings.tag_mode.all": "Allegearre",
+  "hashtag.column_settings.tag_mode.any": "Ien fan dizze",
+  "hashtag.column_settings.tag_mode.none": "Gjin fan dizze",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Hashtag folgje",
+  "hashtag.unfollow": "Hashtag ûntfolgje",
+  "home.column_settings.basic": "Algemien",
+  "home.column_settings.show_reblogs": "Boosts toane",
+  "home.column_settings.show_replies": "Reaksjes toane",
+  "home.hide_announcements": "Meidielingen ferstopje",
+  "home.show_announcements": "Meidielingen toane",
+  "interaction_modal.description.favourite": "Jo kinne mei in Mastodon-account dit berjocht as favoryt markearje, om dy brûker witte te litten dat jo it berjocht wurdearje en om it te bewarjen.",
+  "interaction_modal.description.follow": "Jo kinne mei in Mastodon-account {name} folgje, om sa harren berjochten op jo starttiidline te ûntfangen.",
+  "interaction_modal.description.reblog": "Jo kinne mei in Mastodon-account dit berjocht booste, om it sa mei jo folgers te dielen.",
+  "interaction_modal.description.reply": "Jo kinne mei in Mastodon-account op dit berjocht reagearje.",
+  "interaction_modal.on_another_server": "Op een oare server",
+  "interaction_modal.on_this_server": "Op dizze server",
+  "interaction_modal.other_server_instructions": "Kopiearje en plak ienfâldich dizze URL yn it sykfjild fan de troch jo brûkte Mastodon-app of op de website fan de Mastodon-server wêrop jo oanmeld binne.",
+  "interaction_modal.preamble": "Mastodon is desintralisearre. Dêrom hawwe jo gjin account op dizze Mastodon-server nedich, wannear’t jo al in account op in oare Mastodon-server of kompatibel platfoarm hawwe.",
+  "interaction_modal.title.favourite": "Berjocht fan {name} as favoryt markearje",
+  "interaction_modal.title.follow": "{name} folgje",
+  "interaction_modal.title.reblog": "Berjocht fan {name} booste",
+  "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje",
+  "intervals.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
+  "intervals.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
+  "intervals.full.minutes": "{number, plural, one {# minút} other {# minuten}} lyn",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "Berjocht booste",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Omskriuwing",
+  "keyboard_shortcuts.direct": "Direkte berjochten toane",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "Berjocht iepenje",
+  "keyboard_shortcuts.favourite": "As favoryt markearje",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Fluchtoetsen",
+  "keyboard_shortcuts.home": "Starttiidline toane",
+  "keyboard_shortcuts.hotkey": "Fluchtoets",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "Skriuwer fermelde",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "Dyn profyl iepenje",
+  "keyboard_shortcuts.notifications": "Meldingen toane",
+  "keyboard_shortcuts.open_media": "Media iepenje",
+  "keyboard_shortcuts.pinned": "Fêstsette berjochten toane",
+  "keyboard_shortcuts.profile": "Skriuwersprofyl iepenje",
+  "keyboard_shortcuts.reply": "Berjocht beäntwurdzje",
+  "keyboard_shortcuts.requests": "Folchfersiken toane",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "CW-fjild ferstopje/toane",
+  "keyboard_shortcuts.start": "‘Uteinsette’ iepenje",
+  "keyboard_shortcuts.toggle_hidden": "Tekst efter CW-fjild ferstopje/toane",
+  "keyboard_shortcuts.toggle_sensitivity": "Media ferstopje/toane",
+  "keyboard_shortcuts.toot": "Nij berjocht skriuwe",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "Nei boppe yn list ferpleatse",
+  "lightbox.close": "Slute",
+  "lightbox.compress": "Ofbylding passend werjaan",
+  "lightbox.expand": "Ofbylding grut werjaan",
+  "lightbox.next": "Folgjende",
+  "lightbox.previous": "Foarige",
+  "limited_account_hint.action": "Profyl dochs besjen",
+  "limited_account_hint.title": "Dit profyl is troch de behearders fan {domain} ferstoppe.",
+  "lists.account.add": "Oan list tafoegje",
+  "lists.account.remove": "Ut list fuortsmite",
+  "lists.delete": "List fuortsmite",
+  "lists.edit": "List bewurkje",
+  "lists.edit.submit": "Titel wizigje",
+  "lists.new.create": "List tafoegje",
+  "lists.new.title_placeholder": "Nije listtitel",
+  "lists.replies_policy.followed": "Elke folge brûker",
+  "lists.replies_policy.list": "Leden fan de list",
+  "lists.replies_policy.none": "Net ien",
+  "lists.replies_policy.title": "Reaksjes toane oan:",
+  "lists.search": "Sykje nei minsken dy’t jo folgje",
+  "lists.subheading": "Dyn listen",
+  "load_pending": "{count, plural, one {# nij item} other {# nije items}}",
+  "loading_indicator.label": "Lade…",
+  "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
+  "missing_indicator.label": "Net fûn",
+  "missing_indicator.sublabel": "Dizze boarne kin net fûn wurde",
+  "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
+  "mute_modal.duration": "Doer",
+  "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?",
+  "mute_modal.indefinite": "Foar ûnbepaalde tiid",
+  "navigation_bar.about": "Oer",
+  "navigation_bar.blocks": "Blokkearre brûkers",
+  "navigation_bar.bookmarks": "Blêdwizers",
+  "navigation_bar.community_timeline": "Lokale tiidline",
+  "navigation_bar.compose": "Nij berjocht skriuwe",
+  "navigation_bar.direct": "Direkte berjochten",
+  "navigation_bar.discover": "Untdekke",
+  "navigation_bar.domain_blocks": "Blokkearre domeinen",
+  "navigation_bar.edit_profile": "Profyl bewurkje",
+  "navigation_bar.explore": "Ferkenne",
+  "navigation_bar.favourites": "Favoriten",
+  "navigation_bar.filters": "Negearre wurden",
+  "navigation_bar.follow_requests": "Folchfersiken",
+  "navigation_bar.follows_and_followers": "Folgers en folgjenden",
+  "navigation_bar.lists": "Listen",
+  "navigation_bar.logout": "Ofmelde",
+  "navigation_bar.mutes": "Negearre brûkers",
+  "navigation_bar.personal": "Persoanlik",
+  "navigation_bar.pins": "Fêstsette berjochten",
+  "navigation_bar.preferences": "Foarkarren",
+  "navigation_bar.public_timeline": "Globale tiidline",
+  "navigation_bar.search": "Sykje",
+  "navigation_bar.security": "Befeiliging",
+  "not_signed_in_indicator.not_signed_in": "Do moatst oanmelde om tagong ta dizze ynformaasje te krijen.",
+  "notification.admin.report": "{name} hat {target} rapportearre",
+  "notification.admin.sign_up": "{name} hat harren registrearre",
+  "notification.favourite": "{name} hat dyn berjocht as favoryt markearre",
+  "notification.follow": "{name} folget dy",
+  "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
+  "notification.mention": "{name} hat dy fermeld",
+  "notification.own_poll": "Dyn poll is beëinige",
+  "notification.poll": "In poll wêr’tsto yn stimd hast is beëinige",
+  "notification.reblog": "{name} hat dyn berjocht boost",
+  "notification.status": "{name} hat in berjocht pleatst",
+  "notification.update": "{name} hat in berjocht bewurke",
+  "notifications.clear": "Meldingen wiskje",
+  "notifications.clear_confirmation": "Bisto wis datsto al dyn meldingen permanint fuortsmite wolst?",
+  "notifications.column_settings.admin.report": "Nije rapportaazjes:",
+  "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
+  "notifications.column_settings.alert": "Desktopmeldingen",
+  "notifications.column_settings.favourite": "Favoriten:",
+  "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
+  "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
+  "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
+  "notifications.column_settings.follow": "Nije folgers:",
+  "notifications.column_settings.follow_request": "Nij folchfersyk:",
+  "notifications.column_settings.mention": "Fermeldingen:",
+  "notifications.column_settings.poll": "Enkêteresultaten:",
+  "notifications.column_settings.push": "Pushmeldingen",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Yn kolom toane",
+  "notifications.column_settings.sound": "Lûd ôfspylje",
+  "notifications.column_settings.status": "Nije berjochten:",
+  "notifications.column_settings.unread_notifications.category": "Net lêzen meldingen",
+  "notifications.column_settings.unread_notifications.highlight": "Net lêzen meldingen markearje",
+  "notifications.column_settings.update": "Bewurkingen:",
+  "notifications.filter.all": "Alle",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favoriten",
+  "notifications.filter.follows": "Folget",
+  "notifications.filter.mentions": "Fermeldingen",
+  "notifications.filter.polls": "Pollresultaten",
+  "notifications.filter.statuses": "Fernijingen fan minsken dy’t jo folgje",
+  "notifications.grant_permission": "Tastimming jaan.",
+  "notifications.group": "{count} meldingen",
+  "notifications.mark_as_read": "Alle meldingen as lêzen markearje",
+  "notifications.permission_denied": "Desktopmeldingen binne net beskikber, omdat in eardere browsertastimming wegere waard",
+  "notifications.permission_denied_alert": "Desktopmeldingen kinne net ynskeakele wurde, omdat in eardere browsertastimming wegere waard",
+  "notifications.permission_required": "Desktopmeldingen binne net beskikber, omdat de nedige tastimming net ferliend is.",
+  "notifications_permission_banner.enable": "Desktopmeldingen ynskeakelje",
+  "notifications_permission_banner.how_to_control": "Om meldingen te ûntfangen wannear’t Mastodon net iepen stiet. Jo kinne krekt bepale hokker soarte fan ynteraksjes wol of gjin desktopmeldingen jouwe fia de boppesteande {icon} knop.",
+  "notifications_permission_banner.title": "Mis neat",
+  "picture_in_picture.restore": "Tebeksette",
+  "poll.closed": "Sluten",
+  "poll.refresh": "Ferfarskje",
+  "poll.total_people": "{count, plural, one {# persoan} other {# persoanen}}",
+  "poll.total_votes": "{count, plural, one {# stim} other {# stimmen}}",
+  "poll.vote": "Stimme",
+  "poll.voted": "Do hast hjir op stimd",
+  "poll.votes": "{votes, plural, one {# stim} other {# stimmen}}",
+  "poll_button.add_poll": "Poll tafoegje",
+  "poll_button.remove_poll": "Enkête fuortsmite",
+  "privacy.change": "Sichtberheid fan berjocht oanpasse",
+  "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
+  "privacy.direct.short": "Allinnich fermelde minsken",
+  "privacy.private.long": "Allinnich sichtber foar folgers",
+  "privacy.private.short": "Allinnich folgers",
+  "privacy.public.long": "Sichtber foar elkenien",
+  "privacy.public.short": "Iepenbier",
+  "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
+  "privacy.unlisted.short": "Minder iepenbier",
+  "privacy_policy.last_updated": "Lêst bywurke op {date}",
+  "privacy_policy.title": "Privacybelied",
+  "refresh": "Ferfarskje",
+  "regeneration_indicator.label": "Lade…",
+  "regeneration_indicator.sublabel": "Jo starttiidline wurdt oanmakke!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
+  "relative_time.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
+  "relative_time.full.just_now": "sakrekt",
+  "relative_time.full.minutes": "{number, plural, one {# minút} other {# minuten}} lyn",
+  "relative_time.full.seconds": "{number, plural, one {# sekonde} other {# sekonden}} lyn",
+  "relative_time.hours": "{number}o",
+  "relative_time.just_now": "no",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "hjoed",
+  "reply_indicator.cancel": "Annulearje",
+  "report.block": "Blokkearje",
+  "report.block_explanation": "Do silst harren berjochten net sjen kinne. Se sille dyn berjochten net sjen kinne en do net folgje kinne. Se sille wol sjen kinne dat se blokkearre binne.",
+  "report.categories.other": "Oars",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "De ynhâld oertrêdet ien of mear serverrigels",
+  "report.category.subtitle": "Selektearje wat it bêste past",
+  "report.category.title": "Fertel ús wat der mei dit {type} oan de hân is",
+  "report.category.title_account": "profyl",
+  "report.category.title_status": "berjocht",
+  "report.close": "Klear",
+  "report.comment.title": "Tinksto dat wy noch mear witte moatte?",
+  "report.forward": "Nei {target} trochstjoere",
+  "report.forward_hint": "De account stiet op in oare server. Wolle jo dêr ek in anonimisearre kopy fan dizze rapportaazje nei ta stjoere?",
+  "report.mute": "Negearje",
+  "report.mute_explanation": "Jo kinne harren berjochten net sjen. Jo kinne noch wol folge wurde en jo berjochten binne noch sichtber, mar dyjinge kin net sjen dat dy negearre wurdt.",
+  "report.next": "Folgjende",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "Ik fyn der neat oan",
+  "report.reasons.dislike_description": "It is net eat watsto sjen wolst",
+  "report.reasons.other": "It is wat oars",
+  "report.reasons.other_description": "It probleem stiet der net tusken",
+  "report.reasons.spam": "It is spam",
+  "report.reasons.spam_description": "Skeadlike keppelingen, reklame, mislieding of werheljende antwurden",
+  "report.reasons.violation": "It skeint de serverregels",
+  "report.reasons.violation_description": "Jo witte dat it spesifike regels skeint",
+  "report.rules.subtitle": "Selektearje wat fan tapassing is",
+  "report.rules.title": "Hokker regels wurde skeind?",
+  "report.statuses.subtitle": "Selektearje wat fan tapassing is",
+  "report.statuses.title": "Binne der berjochten dy’t dizze rapportaazje stypje?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Hjir binne jo opsjes wêrmei’t jo bepale kinne wat jo yn Mastodon sjen wolle:",
+  "report.thanks.take_action_actionable": "Wylst wy jo rapportaazje beoardiele, kinne jo dizze maatregels tsjin @{name} nimme:",
+  "report.thanks.title": "Wolle jo dit net sjen?",
+  "report.thanks.title_actionable": "Tank foar it rapportearjen. Wy sille der nei sjen.",
+  "report.unfollow": "{name} ûntfolgje",
+  "report.unfollow_explanation": "Jo folgje dizze account. Om harren berjochten net mear op jo starttiidline te sjen, kinne jo dyjinge ûntfolgje.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} berjocht} other {{count} berjochten}} tafoege",
+  "report_notification.categories.other": "Oars",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Skeinde regels",
+  "report_notification.open": "Rapport iepenje",
+  "search.placeholder": "Sykje",
+  "search.search_or_paste": "Sykje of fier URL yn",
+  "search_popout.search_format": "Avansearre sykje",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Brûk gewoane tekst om te sykjen op werjeftenammen, brûkersnammen en hashtags",
+  "search_popout.tips.user": "brûker",
+  "search_results.accounts": "Minsken",
+  "search_results.all": "Alles",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Dizze syktermen leverje gjin resultaat op",
+  "search_results.statuses": "Berjochten",
+  "search_results.statuses_fts_disabled": "It sykjen yn berjochten is op dizze Mastodon-server net ynskeakele.",
+  "search_results.title": "Nei {q} sykje",
+  "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
+  "server_banner.about_active_users": "Oantal brûkers yn de ôfrûne 30 dagen (MAU)",
+  "server_banner.active_users": "warbere brûkers",
+  "server_banner.administered_by": "Beheard troch:",
+  "server_banner.introduction": "{domain} is ûnderdiel fan it desintralisearre sosjale netwurk {mastodon}.",
+  "server_banner.learn_more": "Mear ynfo",
+  "server_banner.server_stats": "Serverstatistiken:",
+  "sign_in_banner.create_account": "Account registrearje",
+  "sign_in_banner.sign_in": "Oanmelde",
+  "sign_in_banner.text": "Wannear’t jo in account op dizze server hawwe, kinne jo oanmelde om minsken of hashtags te folgjen, op berjochten te reagearjen of om dizze te dielen. Wannear’t jo in account op in oare server hawwe, kinne jo dêr oanmelde en dêr ynteraksje mei minsken op dizze server hawwe.",
+  "status.admin_account": "Moderaasje-omjouwing fan @{name} iepenje",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "@{name} blokkearje",
+  "status.bookmark": "Blêdwizer tafoegje",
+  "status.cancel_reblog_private": "Net langer booste",
+  "status.cannot_reblog": "Dit berjocht kin net boost wurde",
+  "status.copy": "Copy link to status",
+  "status.delete": "Fuortsmite",
+  "status.detailed_status": "Detaillearre petearoersjoch",
+  "status.direct": "@{name} in direkt berjocht stjoere",
+  "status.edit": "Bewurkje",
+  "status.edited": "Bewurke op {date}",
+  "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
+  "status.embed": "Ynslute",
+  "status.favourite": "Favoryt",
+  "status.filter": "Dit berjocht filterje",
+  "status.filtered": "Filtere",
+  "status.hide": "Berjocht ferstopje",
+  "status.history.created": "{name} makke dit {date}",
+  "status.history.edited": "{name} bewurke dit {date}",
+  "status.load_more": "Mear lade",
+  "status.media_hidden": "Media ferstoppe",
+  "status.mention": "@{name} fermelde",
+  "status.more": "Mear",
+  "status.mute": "@{name} negearje",
+  "status.mute_conversation": "Petear negearje",
+  "status.open": "Dit berjocht útklappe",
+  "status.pin": "Op profylside fêstsette",
+  "status.pinned": "Fêstset berjocht",
+  "status.read_more": "Mear ynfo",
+  "status.reblog": "Booste",
+  "status.reblog_private": "Boost nei oarspronklike ûntfangers",
+  "status.reblogged_by": "{name} hat boost",
+  "status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
+  "status.redraft": "Fuortsmite en opnij opstelle",
+  "status.remove_bookmark": "Blêdwizer fuortsmite",
+  "status.replied_to": "Antwurde op {name}",
+  "status.reply": "Beäntwurdzje",
+  "status.replyAll": "Alle beäntwurdzje",
+  "status.report": "@{name} rapportearje",
+  "status.sensitive_warning": "Gefoelige ynhâld",
+  "status.share": "Diele",
+  "status.show_filter_reason": "Dochs toane",
+  "status.show_less": "Minder toane",
+  "status.show_less_all": "Alles minder toane",
+  "status.show_more": "Mear toane",
+  "status.show_more_all": "Alles mear toane",
+  "status.show_original": "Orizjineel besjen",
+  "status.translate": "Oersette",
+  "status.translated_from_with": "Fan {lang} út oersetten mei {provider}",
+  "status.uncached_media_warning": "Net beskikber",
+  "status.unmute_conversation": "Petear net mear negearje",
+  "status.unpin": "Fan profylside losmeitsje",
+  "subscribed_languages.lead": "Nei de wiziging wurde allinnich berjochten fan selektearre talen op jo starttiidline en yn listen werjaan.",
+  "subscribed_languages.save": "Wizigingen bewarje",
+  "subscribed_languages.target": "Toande talen foar {target} wizigje",
+  "suggestions.dismiss": "Oanrekommandaasje ferwerpe",
+  "suggestions.header": "Jo binne wierskynlik ek ynteressearre yn…",
+  "tabs_bar.federated_timeline": "Globaal",
+  "tabs_bar.home": "Startside",
+  "tabs_bar.local_timeline": "Lokaal",
+  "tabs_bar.notifications": "Meldingen",
+  "time_remaining.days": "{number, plural, one {# dei} other {# dagen}} te gean",
+  "time_remaining.hours": "{number, plural, one {# oere} other {# oeren}} te gean",
+  "time_remaining.minutes": "{number, plural, one {# minút} other {# minuten}} te gean",
+  "time_remaining.moments": "Noch krekt efkes te gean",
+  "time_remaining.seconds": "{number, plural, one {# sekonde} other {# sekonden}} te gean",
+  "timeline_hint.remote_resource_not_displayed": "{resource} fan oare servers wurde net toand.",
+  "timeline_hint.resources.followers": "Folgers",
+  "timeline_hint.resources.follows": "Folgjend",
+  "timeline_hint.resources.statuses": "Aldere berjochten",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persoan} other {{counter} persoanen}} {days, plural, one {de ôfrûne dei} other {de ôfrûne {days} dagen}}",
+  "trends.trending_now": "Aktuele trends",
+  "ui.beforeunload": "Jo konsept giet ferlern wannear’t jo Mastodon ferlitte.",
+  "units.short.billion": "{count} mrd.",
+  "units.short.million": "{count} mln.",
+  "units.short.thousand": "{count}k",
+  "upload_area.title": "Hjir nei ta slepe om op te laden",
+  "upload_button.label": "Ofbyldingen, in fideo- of in lûdsbestân tafoegje",
+  "upload_error.limit": "Oer de oplaadlimyt fan bestân.",
+  "upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "Gjin omskriuwing tafoege",
+  "upload_form.edit": "Bewurkje",
+  "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
+  "upload_form.undo": "Fuortsmite",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Ofbylding analysearje…",
+  "upload_modal.apply": "Tapasse",
+  "upload_modal.applying": "Oan it tapassen…",
+  "upload_modal.choose_image": "Kies in ôfbylding",
+  "upload_modal.description_placeholder": "Heit syn wize foks ljept tûk oar de loaie hûn",
+  "upload_modal.detect_text": "Tekst yn in ôfbylding detektearje",
+  "upload_modal.edit_media": "Media bewurkje",
+  "upload_modal.hint": "Klik of sleep de sirkel yn de foarfertoaning nei in sintraal fokuspunt dat op elke thumbnail sichtber bliuwe moat.",
+  "upload_modal.preparing_ocr": "OCR tariede…",
+  "upload_modal.preview_label": "Foarfertoaning ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Dwaande…",
+  "video.close": "Fideo slute",
+  "video.download": "Bestân downloade",
+  "video.exit_fullscreen": "Folslein skerm slute",
+  "video.expand": "Fideo grutter meitsje",
+  "video.fullscreen": "Folslein skerm",
+  "video.hide": "Fideo ferstopje",
+  "video.mute": "Lûd dôvje",
+  "video.pause": "Skoft",
+  "video.play": "Ofspylje",
+  "video.unmute": "Lûd oan"
+}
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 9c94c61aa..ae8813dcd 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -1,484 +1,654 @@
 {
-  "account.account_note_header": "Your note for @{name}",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
-  "account.block": "Block @{name}",
-  "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain hidden",
-  "account.edit_profile": "Edit profile",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-  "account.media": "Media",
-  "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unhide {domain}",
-  "account.unendorse": "Don't feature on profile",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "No comment provided",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per week",
-  "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
-  "column.blocks": "Blocked users",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Local timeline",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
-  "column.favourites": "Favourites",
-  "column.follow_requests": "Follow requests",
-  "column.home": "Home",
-  "column.lists": "Lists",
-  "column.mutes": "Muted users",
-  "column.notifications": "Notifications",
-  "column.pins": "Pinned toot",
-  "column.public": "Federated timeline",
-  "column_back_button.label": "Back",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "about.blocks": "Freastalaithe faoi stiúir",
+  "about.contact": "Teagmháil:",
+  "about.disclaimer": "Bogearra foinse oscailte saor in aisce is ea Mastodon, agus is le Mastodon gGmbH an trádmharc.",
+  "about.domain_blocks.no_reason_available": "Níl an fáth ar fáil",
+  "about.domain_blocks.preamble": "Go hiondúil, tugann Mastadán cead duit a bheith ag plé le húsáideoirí as freastalaí ar bith eile sa chomhchruinne agus a gcuid inneachair a fheiceáil. Seo iad na heisceachtaí a rinneadh ar an bhfreastalaí áirithe seo.",
+  "about.domain_blocks.silenced.explanation": "Go hiondúil ní fheicfidh tú próifílí ná inneachar ón bhfreastalaí seo, ach amháin má bhíonn tú á lorg nó má ghlacann tú lena leanúint d'aon ghnó.",
+  "about.domain_blocks.silenced.title": "Teoranta",
+  "about.domain_blocks.suspended.explanation": "Ní dhéanfar aon sonra ón fhreastalaí seo a phróiseáil, a stóráil ná a mhalartú, rud a fhágann nach féidir aon teagmháil ná aon chumarsáid a dhéanamh le húsáideoirí ón fhreastalaí seo.",
+  "about.domain_blocks.suspended.title": "Ar fionraí",
+  "about.not_available": "Níor cuireadh an t-eolas seo ar fáil ar an bhfreastalaí seo.",
+  "about.powered_by": "Meáin shóisialta díláraithe faoi chumhacht {mastodon}",
+  "about.rules": "Rialacha an fhreastalaí",
+  "account.account_note_header": "Nóta",
+  "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
+  "account.badges.bot": "Bota",
+  "account.badges.group": "Grúpa",
+  "account.block": "Déan cosc ar @{name}",
+  "account.block_domain": "Bac ainm fearainn {domain}",
+  "account.blocked": "Bactha",
+  "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
+  "account.cancel_follow_request": "Éirigh as iarratas leanta",
+  "account.direct": "Seol teachtaireacht dhíreach chuig @{name}",
+  "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
+  "account.domain_blocked": "Ainm fearainn bactha",
+  "account.edit_profile": "Cuir an phróifíl in eagar",
+  "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
+  "account.endorse": "Cuir ar an phróifíl mar ghné",
+  "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
+  "account.featured_tags.last_status_never": "Níl postáil ar bith ann",
+  "account.featured_tags.title": "Haischlib {name}",
+  "account.follow": "Lean",
+  "account.followers": "Leantóirí",
+  "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
+  "account.followers_counter": "{count, plural, one {Leantóir amháin} other {{counter} Leantóir}}",
+  "account.following": "Ag leanúint",
+  "account.following_counter": "{count, plural, one {Ag leanúint cúntas amháin} other {Ag leanúint {counter} cúntas}}",
+  "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
+  "account.follows_you": "Do do leanúint",
+  "account.go_to_profile": "Téigh go dtí próifíl",
+  "account.hide_reblogs": "Folaigh moltaí ó @{name}",
+  "account.joined_short": "Cláraithe",
+  "account.languages": "Athraigh teangacha foscríofa",
+  "account.link_verified_on": "Seiceáladh úinéireacht an naisc seo ar {date}",
+  "account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
+  "account.media": "Ábhair",
+  "account.mention": "Luaigh @{name}",
+  "account.moved_to": "Tá tugtha le fios ag {name} gurb é an cuntas nua atá acu ná:",
+  "account.mute": "Balbhaigh @{name}",
+  "account.mute_notifications": "Balbhaigh fógraí ó @{name}",
+  "account.muted": "Balbhaithe",
+  "account.open_original_page": "Oscail an leathanach bunaidh",
+  "account.posts": "Postálacha",
+  "account.posts_with_replies": "Postálacha agus freagraí",
+  "account.report": "Tuairiscigh @{name}",
+  "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Roinn próifíl @{name}",
+  "account.show_reblogs": "Taispeáin moltaí ó @{name}",
+  "account.statuses_counter": "{count, plural, one {Postáil amháin} other {{counter} Postáil}}",
+  "account.unblock": "Bain bac de @{name}",
+  "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
+  "account.unblock_short": "Bain bac de",
+  "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
+  "account.unfollow": "Ná lean a thuilleadh",
+  "account.unmute": "Díbhalbhaigh @{name}",
+  "account.unmute_notifications": "Díbhalbhaigh fógraí ó @{name}",
+  "account.unmute_short": "Díbhalbhaigh",
+  "account_note.placeholder": "Cliceáil chun nóta a chuir leis",
+  "admin.dashboard.daily_retention": "Ráta coinneála an úsáideora de réir an lae tar éis clárú",
+  "admin.dashboard.monthly_retention": "Ráta coinneála na n-úsáideoirí de réir na míosa tar éis dóibh clárú",
+  "admin.dashboard.retention.average": "Meán",
+  "admin.dashboard.retention.cohort": "Mí cláraraithe",
+  "admin.dashboard.retention.cohort_size": "Úsáideoirí nua",
+  "alert.rate_limited.message": "Atriail aris tar éis {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rátatheoranta",
+  "alert.unexpected.message": "Tharla earráid gan choinne.",
+  "alert.unexpected.title": "Hiúps!",
+  "announcement.announcement": "Fógra",
+  "attachments_list.unprocessed": "(neamhphróiseáilte)",
+  "audio.hide": "Cuir fuaim i bhfolach",
+  "autosuggest_hashtag.per_week": "{count} sa seachtain",
+  "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
+  "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
+  "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
+  "bundle_column_error.error.title": "Ná habair!",
+  "bundle_column_error.network.body": "Tharla earráid agus an leathanach á lódáil. Seans gur mar gheall ar fhadhb shealadach le do nasc idirlín nó i ndáil leis an bhfreastalaí seo atá sé.",
+  "bundle_column_error.network.title": "Earráid líonra",
+  "bundle_column_error.retry": "Bain triail as arís",
+  "bundle_column_error.return": "Téigh abhaile",
+  "bundle_column_error.routing.body": "Ní féidir teacht ar an leathanach a iarradh. An bhfuil tú cinnte go bhfuil an URL sa seoladh i gceart?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Dún",
+  "bundle_modal_error.message": "Chuaigh rud éigin mícheart nuair a bhí an chomhpháirt seo ag lódáil.",
+  "bundle_modal_error.retry": "Bain triail as arís",
+  "closed_registrations.other_server_instructions": "Mar rud díláraithe Mastodon, is féidir leat cuntas a chruthú ar seirbheálaí eile ach fós idirghníomhaigh leis an ceann seo.",
+  "closed_registrations_modal.description": "Ní féidir cuntas a chruthú ar {domain} faoi láthair, ach cuimhnigh nach gá go mbeadh cuntas agat go sonrach ar {domain} chun Mastodon a úsáid.",
+  "closed_registrations_modal.find_another_server": "Faigh freastalaí eile",
+  "closed_registrations_modal.preamble": "Ós rud é go bhfuil Mastodon díláraithe, is cuma cá háit a chruthaíonn tú do chuntas, beidh tú in ann idirghníomhú le haon duine ar an bhfreastalaí seo agus iad a leanúint. Is féidir fiú é a féin-óstáil!",
+  "closed_registrations_modal.title": "Cláraigh le Mastodon",
+  "column.about": "Maidir le",
+  "column.blocks": "Cuntais choiscthe",
+  "column.bookmarks": "Leabharmharcanna",
+  "column.community": "Amlíne áitiúil",
+  "column.direct": "Teachtaireachtaí dhíreacha",
+  "column.directory": "Brabhsáil próifílí",
+  "column.domain_blocks": "Fearainn bhactha",
+  "column.favourites": "Toghanna",
+  "column.follow_requests": "Iarratais leanúnaí",
+  "column.home": "Baile",
+  "column.lists": "Liostaí",
+  "column.mutes": "Úsáideoirí balbhaithe",
+  "column.notifications": "Fógraí",
+  "column.pins": "Postálacha pionnáilte",
+  "column.public": "Amlíne cónaidhmithe",
+  "column_back_button.label": "Ar ais",
+  "column_header.hide_settings": "Folaigh socruithe",
+  "column_header.moveLeft_settings": "Bog an colún ar chlé",
+  "column_header.moveRight_settings": "Bog an colún ar dheis",
+  "column_header.pin": "Greamaigh",
+  "column_header.show_settings": "Taispeáin socruithe",
+  "column_header.unpin": "Díghreamaigh",
+  "column_subheading.settings": "Socruithe",
+  "community.column_settings.local_only": "Áitiúil amháin",
+  "community.column_settings.media_only": "Meáin Amháin",
+  "community.column_settings.remote_only": "Cian amháin",
+  "compose.language.change": "Athraigh teanga",
+  "compose.language.search": "Cuardaigh teangacha...",
+  "compose_form.direct_message_warning_learn_more": "Tuilleadh eolais",
+  "compose_form.encryption_warning": "Ní criptiú taobh-go-taobh déanta ar theachtaireachtaí ar Mhastodon. Ná roinn eolas íogair ar Mhastodon.",
+  "compose_form.hashtag_warning": "Ní áireofar an teachtaireacht seo faoi haischlib ar bith mar go bhfuil sí neamhliostaithe. Ní féidir ach teachtaireachtaí poiblí a chuardach de réir haischlib.",
+  "compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
+  "compose_form.lock_disclaimer.lock": "faoi ghlas",
+  "compose_form.placeholder": "Cad atá ag tarlú?",
+  "compose_form.poll.add_option": "Cuir rogha isteach",
+  "compose_form.poll.duration": "Achar suirbhéanna",
+  "compose_form.poll.option_placeholder": "Rogha {number}",
+  "compose_form.poll.remove_option": "Bain an rogha seo",
+  "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
+  "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
+  "compose_form.publish": "Foilsigh",
+  "compose_form.publish_form": "Foilsigh\n",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Sábháil",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Write your warning here",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "compose_form.spoiler.marked": "Bain rabhadh ábhair",
+  "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
+  "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
+  "confirmation_modal.cancel": "Cealaigh",
+  "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
+  "confirmations.block.confirm": "Bac",
+  "confirmations.block.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhac?",
+  "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
+  "confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
+  "confirmations.delete.confirm": "Scrios",
+  "confirmations.delete.message": "An bhfuil tú cinnte gur mhaith leat an phostáil seo a scriosadh?",
+  "confirmations.delete_list.confirm": "Scrios",
+  "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
+  "confirmations.discard_edit_media.confirm": "Faigh réidh de",
+  "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
+  "confirmations.domain_block.confirm": "Bac fearann go hiomlán",
+  "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
+  "confirmations.logout.confirm": "Logáil amach",
+  "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
+  "confirmations.mute.confirm": "Balbhaigh",
+  "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.",
+  "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
+  "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
+  "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an phostáil sin a scriosadh agus a athdhréachtú? Caillfear toghanna agus moltaí, agus fágfar freagracha don phostáil bhunúsach ina ndílleachtaí.",
+  "confirmations.reply.confirm": "Freagair",
+  "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
+  "confirmations.unfollow.confirm": "Ná lean",
+  "confirmations.unfollow.message": "An bhfuil tú cinnte gur mhaith leat {name} a dhíleanúint?",
+  "conversation.delete": "Scrios comhrá",
+  "conversation.mark_as_read": "Marcáil mar léite",
+  "conversation.open": "Féach ar comhrá",
+  "conversation.with": "Le {names}",
+  "copypaste.copied": "Cóipeáilte",
+  "copypaste.copy": "Cóipeáil",
+  "directory.federated": "Ó chomhchruinne aitheanta",
+  "directory.local": "Ó {domain} amháin",
+  "directory.new_arrivals": "Daoine atá tar éis teacht",
+  "directory.recently_active": "Daoine gníomhacha le déanaí",
+  "disabled_account_banner.account_settings": "Socruithe cuntais",
+  "disabled_account_banner.text": "Tá do chuntas {disabledAccount} díchumasaithe faoi láthair.",
+  "dismissable_banner.community_timeline": "Seo iad na postála is déanaí ó dhaoine le cuntais ar {domain}.",
+  "dismissable_banner.dismiss": "Diúltaigh",
+  "dismissable_banner.explore_links": "Tá na scéalta nuachta seo á phlé anseo agus ar fhreastalaithe eile ar an líonra díláraithe faoi láthair.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "embed.preview": "Seo an chuma a bheidh air:",
+  "emoji_button.activity": "Gníomhaíocht",
+  "emoji_button.clear": "Glan",
+  "emoji_button.custom": "Saincheaptha",
+  "emoji_button.flags": "Bratacha",
+  "emoji_button.food": "Bia ⁊ Ól",
+  "emoji_button.label": "Cuir emoji isteach",
+  "emoji_button.nature": "Nádur",
+  "emoji_button.not_found": "Ní bhfuarthas an cineál emoji sin",
+  "emoji_button.objects": "Rudaí",
+  "emoji_button.people": "Daoine",
+  "emoji_button.recent": "Úsáidte go minic",
+  "emoji_button.search": "Cuardaigh...",
+  "emoji_button.search_results": "Torthaí cuardaigh",
+  "emoji_button.symbols": "Comharthaí",
+  "emoji_button.travel": "Taisteal ⁊ Áiteanna",
+  "empty_column.account_suspended": "Cuntas ar fionraí",
+  "empty_column.account_timeline": "Níl postálacha ar bith anseo!",
+  "empty_column.account_unavailable": "Níl an phróifíl ar fáil",
+  "empty_column.blocks": "Níl aon úsáideoir bactha agat fós.",
+  "empty_column.bookmarked_statuses": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, beidh sé le feiceáil anseo.",
+  "empty_column.community": "Tá an amlíne áitiúil folamh. Foilsigh rud éigin go poiblí le tús a chur le cúrsaí!",
+  "empty_column.direct": "Níl aon teachtaireacht dírithe agat fós. Nuair a sheolann tú nó nuair a fhaigheann tú ceann, feicfear anseo í.",
+  "empty_column.domain_blocks": "Níl aon fearainn bhactha ann go fóill.",
+  "empty_column.explore_statuses": "Níl rud ar bith ag treochtáil faoi láthair. Tar ar ais ar ball!",
+  "empty_column.favourited_statuses": "Níor roghnaigh tú postáil ar bith fós. Nuair a roghnaigh tú ceann, beidh sí le feiceáil anseo.",
+  "empty_column.favourites": "Níor thogh éinne an phostáil seo fós. Nuair a thoghfaidh duine éigin í, taispeánfar anseo é sin.",
+  "empty_column.follow_recommendations": "Is cosúil nár fhéadfaí moltaí a ghineadh. D'fhéadfá cuardach a úsáid le teacht ar dhaoine a bhfuil aithne agat orthu, nó iniúchadh ar haischlibeanna atá ag treochtáil a dhéanamh.",
+  "empty_column.follow_requests": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, feicfear anseo é.",
+  "empty_column.hashtag": "Níl rud ar bith faoin haischlib seo go fóill.",
+  "empty_column.home": "Tá d'amlíne baile folamh! B'fhiú duit cúpla duine eile a leanúint lena líonadh! {suggestions}",
+  "empty_column.home.suggestions": "Féach ar roinnt moltaí",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "empty_column.lists": "Níl aon liostaí fós agat. Nuair a chruthaíonn tú ceann, feicfear anseo é.",
+  "empty_column.mutes": "Níl aon úsáideoir balbhaithe agat fós.",
+  "empty_column.notifications": "Níl aon fógraí agat fós. Nuair a dhéanann daoine eile idirghníomhú leat, feicfear anseo é.",
+  "empty_column.public": "Faic anseo! Scríobh rud éigin go poiblí, nó lean úsáideoirí ar fhreastalaithe eile chun é a líonadh",
+  "error.unexpected_crash.explanation": "De bharr fabht inár gcód, nó fadhb le chomhoiriúnacht brabhsálaí, níorbh fhéadfadh an leathanach seo a léiriú i gceart.",
   "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
+  "errors.unexpected_crash.report_issue": "Tuairiscigh deacracht",
+  "explore.search_results": "Torthaí cuardaigh",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Féach thart",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Scagaire as feidhm!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Socruithe scagtha",
+  "filter_modal.added.settings_link": "leathan socruithe",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Scagaire curtha leis!",
+  "filter_modal.select_filter.context_mismatch": "ní bhaineann sé leis an gcomhthéacs seo",
+  "filter_modal.select_filter.expired": "as feidhm",
+  "filter_modal.select_filter.prompt_new": "Catagóir nua: {name}",
+  "filter_modal.select_filter.search": "Cuardaigh nó cruthaigh",
+  "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
+  "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
+  "filter_modal.title.status": "Déan scagadh ar phostáil",
+  "follow_recommendations.done": "Déanta",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
+  "follow_request.authorize": "Ceadaigh",
+  "follow_request.reject": "Diúltaigh",
+  "follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
+  "footer.about": "Maidir le",
+  "footer.directory": "Eolaire próifílí",
+  "footer.get_app": "Faigh an aip",
+  "footer.invite": "Tabhair cuireadh do dhaoine",
+  "footer.keyboard_shortcuts": "Aicearraí méarchláir",
+  "footer.privacy_policy": "Polasaí príobháideachais",
+  "footer.source_code": "Féach ar an gcód foinseach",
+  "generic.saved": "Sábháilte",
+  "getting_started.heading": "Ag tosú amach",
+  "hashtag.column_header.tag_mode.all": "agus {additional}",
+  "hashtag.column_header.tag_mode.any": "nó {additional}",
+  "hashtag.column_header.tag_mode.none": "gan {additional}",
+  "hashtag.column_settings.select.no_options_message": "Moltaí ar bith faighte",
+  "hashtag.column_settings.select.placeholder": "Iontráil haischlibeanna…",
+  "hashtag.column_settings.tag_mode.all": "Iad seo go léir",
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "hashtag.follow": "Lean haischlib",
+  "hashtag.unfollow": "Ná lean haischlib",
+  "home.column_settings.basic": "Bunúsach",
+  "home.column_settings.show_reblogs": "Taispeáin moltaí",
+  "home.column_settings.show_replies": "Taispeán freagraí",
+  "home.hide_announcements": "Cuir fógraí i bhfolach",
+  "home.show_announcements": "Taispeáin fógraí",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "Ar freastalaí eile",
+  "interaction_modal.on_this_server": "Ar an freastalaí seo",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Togh postáil de chuid {name}",
+  "interaction_modal.title.follow": "Lean {name}",
+  "interaction_modal.title.reblog": "Mol postáil de chuid {name}",
+  "interaction_modal.title.reply": "Freagair postáil {name}",
+  "intervals.full.days": "{number, plural, one {# lá} other {# lá}}",
+  "intervals.full.hours": "{number, plural, one {# uair} other {# uair}}",
+  "intervals.full.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}}",
+  "keyboard_shortcuts.back": "Nasclean siar",
+  "keyboard_shortcuts.blocked": "Oscail liosta na n-úsáideoirí bactha",
+  "keyboard_shortcuts.boost": "Treisigh postáil",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.description": "Cuntas",
   "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.down": "Bog síos ar an liosta",
+  "keyboard_shortcuts.enter": "Oscail postáil",
+  "keyboard_shortcuts.favourite": "Roghnaigh postáil",
+  "keyboard_shortcuts.favourites": "Oscail liosta toghanna",
+  "keyboard_shortcuts.federated": "Oscail amlíne cónaidhmithe",
+  "keyboard_shortcuts.heading": "Aicearraí méarchláir",
+  "keyboard_shortcuts.home": "Oscail amlíne bhaile",
+  "keyboard_shortcuts.hotkey": "Eochair aicearra",
   "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.local": "Oscail an amlíne áitiúil",
+  "keyboard_shortcuts.mention": "Luaigh údar",
+  "keyboard_shortcuts.muted": "Oscail liosta na n-úsáideoirí balbhaithe",
+  "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
   "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.open_media": "Oscail meáin",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
+  "keyboard_shortcuts.reply": "Freagair ar phostáil",
+  "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toggle_sensitivity": "Taispeáin / cuir i bhfolach meáin",
+  "keyboard_shortcuts.toot": "Cuir tús le postáil nua",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
+  "keyboard_shortcuts.up": "Bog suas ar an liosta",
+  "lightbox.close": "Dún",
   "lightbox.compress": "Compress image view box",
   "lightbox.expand": "Expand image view box",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
+  "lightbox.next": "An céad eile",
+  "lightbox.previous": "Roimhe seo",
+  "limited_account_hint.action": "Taispeáin an phróifíl ar aon nós",
+  "limited_account_hint.title": "Tá an phróifíl seo curtha i bhfolach ag na modhnóra {domain}.",
+  "lists.account.add": "Cuir leis an liosta",
+  "lists.account.remove": "Scrios as an liosta",
+  "lists.delete": "Scrios liosta",
+  "lists.edit": "Cuir an liosta in eagar",
+  "lists.edit.submit": "Athraigh teideal",
+  "lists.new.create": "Cruthaigh liosta",
   "lists.new.title_placeholder": "New list title",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lists.replies_policy.followed": "Úsáideoir ar bith atá á leanúint",
+  "lists.replies_policy.list": "Baill an liosta",
+  "lists.replies_policy.none": "Duine ar bith",
+  "lists.replies_policy.title": "Taispeáin freagraí:",
+  "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
+  "lists.subheading": "Do liostaí",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Hide media",
-  "missing_indicator.label": "Not found",
+  "loading_indicator.label": "Ag lódáil...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Níor aimsíodh é",
   "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Muted words",
-  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} mentioned you",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} boosted your status",
-  "notification.status": "{name} just posted",
-  "notifications.clear": "Clear notifications",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Tréimhse",
+  "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
+  "mute_modal.indefinite": "Gan téarma",
+  "navigation_bar.about": "Maidir le",
+  "navigation_bar.blocks": "Cuntais bhactha",
+  "navigation_bar.bookmarks": "Leabharmharcanna",
+  "navigation_bar.community_timeline": "Amlíne áitiúil",
+  "navigation_bar.compose": "Cum postáil nua",
+  "navigation_bar.direct": "Teachtaireachtaí dhíreacha",
+  "navigation_bar.discover": "Faigh amach",
+  "navigation_bar.domain_blocks": "Fearainn bhactha",
+  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
+  "navigation_bar.explore": "Féach thart",
+  "navigation_bar.favourites": "Toghanna",
+  "navigation_bar.filters": "Focail bhalbhaithe",
+  "navigation_bar.follow_requests": "Iarratais leanúnaí",
+  "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint",
+  "navigation_bar.lists": "Liostaí",
+  "navigation_bar.logout": "Logáil Amach",
+  "navigation_bar.mutes": "Úsáideoirí balbhaithe",
+  "navigation_bar.personal": "Pearsanta",
+  "navigation_bar.pins": "Postálacha pionnáilte",
+  "navigation_bar.preferences": "Sainroghanna pearsanta",
+  "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
+  "navigation_bar.search": "Cuardaigh",
+  "navigation_bar.security": "Slándáil",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "Tuairiscigh {name} {target}",
+  "notification.admin.sign_up": "Chláraigh {name}",
+  "notification.favourite": "Is maith le {name} do phostáil",
+  "notification.follow": "Lean {name} thú",
+  "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
+  "notification.mention": "Luaigh {name} tú",
+  "notification.own_poll": "Tá do suirbhé críochnaithe",
+  "notification.poll": "Tá suirbhé inar vótáil tú tar éis críochnú",
+  "notification.reblog": "Mhol {name} do phostáil",
+  "notification.status": "Phostáil {name} díreach",
+  "notification.update": "Chuir {name} postáil in eagar",
+  "notifications.clear": "Glan fógraí",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
-  "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.favourite": "Favourites:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.admin.report": "Tuairiscí nua:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Fógraí deisce",
+  "notifications.column_settings.favourite": "Toghanna:",
+  "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
-  "notifications.column_settings.follow": "New followers:",
-  "notifications.column_settings.follow_request": "New follow requests:",
-  "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
+  "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
+  "notifications.column_settings.follow": "Leantóirí nua:",
+  "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
+  "notifications.column_settings.mention": "Tráchtanna:",
+  "notifications.column_settings.poll": "Torthaí suirbhéanna:",
+  "notifications.column_settings.push": "Brúfhógraí",
+  "notifications.column_settings.reblog": "Moltaí:",
+  "notifications.column_settings.show": "Taispeáin i gcolún",
+  "notifications.column_settings.sound": "Seinn an fhuaim",
+  "notifications.column_settings.status": "Postálacha nua:",
+  "notifications.column_settings.unread_notifications.category": "Brúfhógraí neamhléite",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Eagair:",
+  "notifications.filter.all": "Uile",
+  "notifications.filter.boosts": "Treisithe",
+  "notifications.filter.favourites": "Toghanna",
+  "notifications.filter.follows": "Ag leanúint",
+  "notifications.filter.mentions": "Tráchtanna",
+  "notifications.filter.polls": "Torthaí suirbhéanna",
+  "notifications.filter.statuses": "Nuashonruithe ó dhaoine a leanann tú",
+  "notifications.grant_permission": "Tabhair cead.",
+  "notifications.group": "{count} fógraí",
   "notifications.mark_as_read": "Mark every notification as read",
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.enable": "Ceadaigh fógraí ar an deasc",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
+  "picture_in_picture.restore": "Cuir é ar ais",
+  "poll.closed": "Dúnta",
+  "poll.refresh": "Athnuaigh",
   "poll.total_people": "{count, plural, one {# person} other {# people}}",
   "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
+  "poll.vote": "Vótáil",
   "poll.voted": "You voted for this answer",
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
+  "poll_button.add_poll": "Cruthaigh suirbhé",
+  "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.long": "Visible for mentioned users only",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
-  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
-  "privacy.unlisted.short": "Unlisted",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
+  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
+  "privacy.private.short": "Leantóirí amháin",
+  "privacy.public.long": "Infheicthe do chách",
+  "privacy.public.short": "Poiblí",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Neamhliostaithe",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Polasaí príobháideachais",
+  "refresh": "Athnuaigh",
+  "regeneration_indicator.label": "Ag lódáil…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
-  "relative_time.minutes": "{number}m",
+  "relative_time.days": "{number}l",
+  "relative_time.full.days": "{number, plural, one {# lá} other {# lá}} ó shin",
+  "relative_time.full.hours": "{number, plural, one {# uair} other {# uair}} ó shin",
+  "relative_time.full.just_now": "díreach anois",
+  "relative_time.full.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}} ó shin",
+  "relative_time.full.seconds": "{number, plural, one {# soicind} other {# soicind}} ó shin",
+  "relative_time.hours": "{number}u",
+  "relative_time.just_now": "anois",
+  "relative_time.minutes": "{number}n",
   "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Cancel",
+  "relative_time.today": "inniu",
+  "reply_indicator.cancel": "Cealaigh",
+  "report.block": "Bac",
+  "report.block_explanation": "Ní fheicfidh tú a c(h)úid postálacha. Ní bheidh sé/sí in ann do chuid postálacha a fheiceáil ná tú féin a leanúint. Beidh sé/sí in ann a dhéanamh amach go bhfuil sé/sí bactha.",
+  "report.categories.other": "Eile",
+  "report.categories.spam": "Turscar",
+  "report.categories.violation": "Sáraíonn ábhar riail freastalaí amháin nó níos mó",
+  "report.category.subtitle": "Roghnaigh an toradh is fearr",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "próifíl",
+  "report.category.title_status": "postáil",
+  "report.close": "Déanta",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
-  "report.target": "Report {target}",
-  "search.placeholder": "Search",
+  "report.mute": "Balbhaigh",
+  "report.mute_explanation": "Ní fheicfidh tú a postálacha. Is féidir an té seo tú a leanúint agus do phostálacha a fheiceáil, agus ní fhios go bhfuil iad balbhaithe.",
+  "report.next": "An céad eile",
+  "report.placeholder": "Ráitis bhreise",
+  "report.reasons.dislike": "Ní maith liom é",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "Is rud eile é",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "Is turscar é",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "Sáraíonn sé rialacha an fhreastalaí",
+  "report.reasons.violation_description": "Tá a fhios agat go sáraíonn sé rialacha ar leith",
+  "report.rules.subtitle": "Roghnaigh gach atá i bhfeidhm",
+  "report.rules.title": "Cén rialacha atá á sárú?",
+  "report.statuses.subtitle": "Roghnaigh gach atá i bhfeidhm",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Cuir isteach",
+  "report.target": "Ag tuairisciú {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Ná lean @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Eile",
+  "report_notification.categories.spam": "Turscar",
+  "report_notification.categories.violation": "Sárú rialach",
+  "report_notification.open": "Oscail tuairisc",
+  "search.placeholder": "Cuardaigh",
+  "search.search_or_paste": "Cuardaigh nó cuir URL isteach",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.hashtag": "haischlib",
+  "search_popout.tips.status": "postáil",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_popout.tips.user": "úsáideoir",
+  "search_results.accounts": "Daoine",
+  "search_results.all": "Uile",
+  "search_results.hashtags": "Haischlibeanna",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Postálacha",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Tuilleadh eolais",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sinigh isteach",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
+  "status.block": "Bac @{name}",
+  "status.bookmark": "Leabharmharcanna",
+  "status.cancel_reblog_private": "Dímhol",
+  "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
   "status.copy": "Copy link to status",
-  "status.delete": "Delete",
+  "status.delete": "Scrios",
   "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
+  "status.direct": "Seol teachtaireacht dhíreach chuig @{name}",
+  "status.edit": "Cuir in eagar",
+  "status.edited": "Curtha in eagar in {date}",
+  "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
+  "status.embed": "Leabaigh",
+  "status.favourite": "Rogha",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
-  "status.load_more": "Load more",
+  "status.hide": "Cuir postáil i bhfolach",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "Curtha in eagar ag {name} in {date}",
+  "status.load_more": "Lódáil a thuilleadh",
   "status.media_hidden": "Media hidden",
-  "status.mention": "Mention @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
+  "status.mention": "Luaigh @{name}",
+  "status.more": "Tuilleadh",
+  "status.mute": "Balbhaigh @{name}",
+  "status.mute_conversation": "Balbhaigh comhrá",
   "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
+  "status.pin": "Pionnáil ar do phróifíl",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Léan a thuilleadh",
+  "status.reblog": "Mol",
+  "status.reblog_private": "Mol le léargas bunúsach",
+  "status.reblogged_by": "Mhol {name}",
+  "status.reblogs.empty": "Níor mhol éinne an phostáil seo fós. Nuair a mholfaidh duine éigin í, taispeánfar anseo é sin.",
+  "status.redraft": "Scrios ⁊ athdhréachtaigh",
   "status.remove_bookmark": "Remove bookmark",
-  "status.reply": "Reply",
-  "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
-  "status.sensitive_warning": "Sensitive content",
-  "status.share": "Share",
-  "status.show_less": "Show less",
-  "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Freagair",
+  "status.replyAll": "Freagair le snáithe",
+  "status.report": "Tuairiscigh @{name}",
+  "status.sensitive_warning": "Ábhar íogair",
+  "status.share": "Comhroinn",
+  "status.show_filter_reason": "Taispeáin ar aon nós",
+  "status.show_less": "Taispeáin níos lú",
+  "status.show_less_all": "Taispeáin níos lú d'uile",
+  "status.show_more": "Taispeáin níos mó",
+  "status.show_more_all": "Taispeáin níos mó d'uile",
+  "status.show_original": "Taispeáin bunchóip",
+  "status.translate": "Aistrigh",
+  "status.translated_from_with": "D'Aistrigh ón {lang} ag úsáid {provider}",
+  "status.uncached_media_warning": "Ní ar fáil",
+  "status.unmute_conversation": "Díbhalbhaigh comhrá",
+  "status.unpin": "Díphionnáil de do phróifíl",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
+  "tabs_bar.federated_timeline": "Cónasctha",
+  "tabs_bar.home": "Baile",
+  "tabs_bar.local_timeline": "Áitiúil",
+  "tabs_bar.notifications": "Fógraí",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
+  "timeline_hint.resources.followers": "Leantóirí",
+  "timeline_hint.resources.follows": "Cuntais leanta",
+  "timeline_hint.resources.statuses": "Postáilí níos sine",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Ag treochtáil anois",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media ({formats})",
+  "units.short.thousand": "{count}k",
+  "upload_area.title": "Tarraing ⁊ scaoil chun uaslódáil",
+  "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Cuir in eagar",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
+  "upload_form.undo": "Scrios",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
+  "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
+  "upload_modal.apply": "Cuir i bhFeidhm",
   "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.choose_image": "Roghnaigh íomhá",
+  "upload_modal.description_placeholder": "Chuaigh bé mhórsách le dlúthspád fíorfhinn trí hata mo dhea-phorcáin bhig",
   "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
+  "upload_modal.edit_media": "Cuir gné in eagar",
   "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading...",
-  "video.close": "Close video",
-  "video.download": "Download file",
+  "upload_progress.label": "Ag uaslódáil...",
+  "upload_progress.processing": "Ag próiseáil…",
+  "video.close": "Dún físeán",
+  "video.download": "Íoslódáil comhad",
   "video.exit_fullscreen": "Exit full screen",
-  "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
+  "video.expand": "Leath físeán",
+  "video.fullscreen": "Lánscáileán",
+  "video.hide": "Cuir físeán i bhfolach",
+  "video.mute": "Ciúnaigh fuaim",
+  "video.pause": "Cuir ar sos",
+  "video.play": "Cuir ar siúl",
+  "video.unmute": "Díchiúnaigh fuaim"
 }
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 023ee3ecb..560b4f308 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Frithealaichean fo mhaorsainneachd",
+  "about.contact": "Fios thugainn:",
+  "about.disclaimer": "’S e bathar-bog saor le bun-tùs fosgailte a th’ ann am Mastodon agus ’na chomharra-mhalairt aig Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Chan eil an t-adhbhar ga thoirt seachad",
+  "about.domain_blocks.preamble": "San fharsaingeachd, leigidh Mastodon leat susbaint o fhrithealaiche sam bith sa cho-shaoghal a shealltainn agus eadar-ghìomh a ghabhail leis na cleachdaichean uapa-san. Seo na h-easgaidhean a tha an sàs air an fhrithealaiche shònraichte seo.",
+  "about.domain_blocks.silenced.explanation": "San fharsaingeachd, chan fhaic thu pròifilean agus susbaint an fhrithealaiche seo ach ma nì thu lorg no ma tha thu ga leantainn.",
+  "about.domain_blocks.silenced.title": "Cuingichte",
+  "about.domain_blocks.suspended.explanation": "Cha dèid dàta sam bith on fhrithealaiche seo a phròiseasadh, a stòradh no iomlaid agus chan urrainn do na cleachdaichean on fhrithealaiche sin conaltradh no eadar-ghnìomh a ghabhail an-seo.",
+  "about.domain_blocks.suspended.title": "’Na dhàil",
+  "about.not_available": "Cha deach am fiosrachadh seo a sholar air an fhrithealaiche seo.",
+  "about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
+  "about.rules": "Riaghailtean an fhrithealaiche",
   "account.account_note_header": "Nòta",
   "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o na liostaichean",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Bac an àrainn {domain}",
   "account.blocked": "’Ga bhacadh",
   "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
-  "account.cancel_follow_request": "Sguir dhen iarrtas leantainn",
+  "account.cancel_follow_request": "Cuir d’ iarrtas leantainn dhan dàrna taobh",
   "account.direct": "Cuir teachdaireachd dhìreach gu @{name}",
   "account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
   "account.domain_blocked": "Chaidh an àrainn a bhacadh",
   "account.edit_profile": "Deasaich a’ phròifil",
   "account.enable_notifications": "Cuir brath thugam nuair a chuireas @{name} post ris",
   "account.endorse": "Brosnaich air a’ phròifil",
-  "account.follow": "Lean air",
+  "account.featured_tags.last_status_at": "Am post mu dheireadh {date}",
+  "account.featured_tags.last_status_never": "Gun phost",
+  "account.featured_tags.title": "Na tagaichean hais brosnaichte aig {name}",
+  "account.follow": "Lean",
   "account.followers": "Luchd-leantainn",
   "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
   "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} two {{counter} neach-leantainn} few {{counter} luchd-leantainn} other {{counter} luchd-leantainn}}",
-  "account.following_counter": "{count, plural, one {A’ leantainn air {counter}} two {A’ leantainn air {counter}} few {A’ leantainn air {counter}} other {A’ leantainn air {counter}}}",
-  "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn air neach sam bith fhathast.",
-  "account.follows_you": "’Gad leantainn",
+  "account.following": "A’ leantainn",
+  "account.following_counter": "{count, plural, one {A’ leantainn {counter}} two {A’ leantainn {counter}} few {A’ leantainn {counter}} other {A’ leantainn {counter}}}",
+  "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn neach sam bith fhathast.",
+  "account.follows_you": "Gad leantainn",
+  "account.go_to_profile": "Tadhail air a’ phròifil",
   "account.hide_reblogs": "Falaich na brosnachaidhean o @{name}",
-  "account.joined": "Air ballrachd fhaighinn {date}",
-  "account.last_status": "An gnìomh mu dheireadh",
+  "account.joined_short": "Air ballrachd fhaighinn",
+  "account.languages": "Atharraich fo-sgrìobhadh nan cànan",
   "account.link_verified_on": "Chaidh dearbhadh cò leis a tha an ceangal seo {date}",
-  "account.locked_info": "Tha prìobhaideachd ghlaiste aig a’ chunntais seo. Nì an sealbhadair lèirmheas a làimh air cò dh’fhaodas leantainn orra.",
+  "account.locked_info": "Tha prìobhaideachd ghlaiste aig a’ chunntais seo. Nì an sealbhadair lèirmheas a làimh air cò dh’fhaodas a leantainn.",
   "account.media": "Meadhanan",
   "account.mention": "Thoir iomradh air @{name}",
-  "account.moved_to": "Chaidh {name} imrich gu:",
+  "account.moved_to": "Dh’innis {name} gu bheil an cunntas ùr aca a-nis air:",
   "account.mute": "Mùch @{name}",
   "account.mute_notifications": "Mùch na brathan o @{name}",
   "account.muted": "’Ga mhùchadh",
-  "account.never_active": "Chan ann idir",
+  "account.open_original_page": "Fosgail an duilleag thùsail",
   "account.posts": "Postaichean",
   "account.posts_with_replies": "Postaichean ’s freagairtean",
   "account.report": "Dèan gearan mu @{name}",
   "account.requested": "A’ feitheamh air aontachadh. Briog airson sgur dhen iarrtas leantainn",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Co-roinn a’ phròifil aig @{name}",
   "account.show_reblogs": "Seall na brosnachaidhean o @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
   "account.unblock": "Dì-bhac @{name}",
   "account.unblock_domain": "Dì-bhac an àrainn {domain}",
+  "account.unblock_short": "Dì-bhac",
   "account.unendorse": "Na brosnaich air a’ phròifil",
   "account.unfollow": "Na lean tuilleadh",
   "account.unmute": "Dì-mhùch @{name}",
   "account.unmute_notifications": "Dì-mhùch na brathan o @{name}",
+  "account.unmute_short": "Dì-mhùch",
   "account_note.placeholder": "Briog airson nòta a chur ris",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir latha",
+  "admin.dashboard.monthly_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir mìos",
+  "admin.dashboard.retention.average": "Cuibheasach",
+  "admin.dashboard.retention.cohort": "Mìos a’ chlàraidh",
+  "admin.dashboard.retention.cohort_size": "Cleachdaichean ùra",
   "alert.rate_limited.message": "Feuch ris a-rithist às dèidh {retry_time, time, medium}.",
   "alert.rate_limited.title": "Cuingeachadh ùine",
   "alert.unexpected.message": "Thachair mearachd ris nach robh dùil.",
   "alert.unexpected.title": "Oich!",
   "announcement.announcement": "Brath-fios",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} gach seachdain",
+  "attachments_list.unprocessed": "(gun phròiseasadh)",
+  "audio.hide": "Falaich an fhuaim",
+  "autosuggest_hashtag.per_week": "{count} san t-seachdain",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
-  "bundle_column_error.body": "Chaidh rudeigin cearr nuair a dh’fheuch sinn ris a’ cho-phàirt seo a luchdadh.",
+  "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
+  "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
+  "bundle_column_error.error.title": "Ìoc!",
+  "bundle_column_error.network.body": "Thachair mearachd nuair a dh’fheuch sinn ris an duilleag seo a luchdadh. Dh’fhaoidte gu bheil duilgheadas sealach leis a’ cheangal agad ris an eadar-lìon no leis an fhrithealaiche seo.",
+  "bundle_column_error.network.title": "Mearachd lìonraidh",
   "bundle_column_error.retry": "Feuch ris a-rithist",
-  "bundle_column_error.title": "Mearachd lìonraidh",
+  "bundle_column_error.return": "Dhachaigh",
+  "bundle_column_error.routing.body": "Cha do lorg sinn an duilleag a dh’iarr thu. A bheil thu cinnteach gu bheil an t-URL ann am bàr an t-seòlaidh mar bu chòir?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Dùin",
   "bundle_modal_error.message": "Chaidh rudeigin cearr nuair a dh’fheuch sinn ris a’ cho-phàirt seo a luchdadh.",
   "bundle_modal_error.retry": "Feuch ris a-rithist",
+  "closed_registrations.other_server_instructions": "Air sgàth ’s gu bheil Mastodon sgaoilte, ’s urrainn dhut cunntas a chruthachadh air frithealaiche eile agus conaltradh ris an fhrithealaiche seo co-dhiù.",
+  "closed_registrations_modal.description": "Cha ghabh cunntas a chruthachadh air {domain} aig an àm seo ach thoir an aire nach fheum thu cunntas air {domain} gu sònraichte airson Mastodon a chleachdadh.",
+  "closed_registrations_modal.find_another_server": "Lorg frithealaiche eile",
+  "closed_registrations_modal.preamble": "Tha Mastodon sgaoilte is mar sin dheth ge b’ e càit an cruthaich thu an cunntas agad, ’s urrainn dhut duine sam bith a leantainn air an fhrithealaiche seo is conaltradh leotha. ’S urrainn dhut fiù ’s frithealaiche agad fhèin òstadh!",
+  "closed_registrations_modal.title": "Clàradh le Mastodon",
+  "column.about": "Mu dhèidhinn",
   "column.blocks": "Cleachdaichean bacte",
   "column.bookmarks": "Comharran-lìn",
   "column.community": "Loidhne-ama ionadail",
@@ -90,10 +124,12 @@
   "community.column_settings.local_only": "Feadhainn ionadail a-mhàin",
   "community.column_settings.media_only": "Meadhanan a-mhàin",
   "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
-  "compose_form.direct_message_warning": "Cha dèid am post seo a chur ach dha na cleachdaichean air an dug thu iomradh.",
+  "compose.language.change": "Atharraich an cànan",
+  "compose.language.search": "Lorg cànan…",
   "compose_form.direct_message_warning_learn_more": "Barrachd fiosrachaidh",
+  "compose_form.encryption_warning": "Chan eil crioptachadh ceann gu ceann air postaichean Mhastodon. Na co-roinn fiosrachadh dìomhair idir le Mastodon.",
   "compose_form.hashtag_warning": "Cha nochd am post seo fon taga hais on a tha e falaichte o liostaichean. Cha ghabh ach postaichean poblach a lorg a-rèir an tagaichean hais.",
-  "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith leantainn ort is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
+  "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
   "compose_form.poll.add_option": "Cuir roghainn ris",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
-  "compose_form.publish": "Postaich",
+  "compose_form.publish": "Foillsich",
+  "compose_form.publish_form": "Foillsich",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Sàbhail na h-atharraichean",
   "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
   "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
@@ -114,36 +152,49 @@
   "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
   "confirmations.block.message": "A bheil thu cinnteach gu bheil thu airson {name} a bhacadh?",
+  "confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
+  "confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
   "confirmations.delete.confirm": "Sguab às",
   "confirmations.delete.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?",
   "confirmations.delete_list.confirm": "Sguab às",
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Tilg air falbh",
+  "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
   "confirmations.domain_block.confirm": "Bac an àrainn uile gu lèir",
-  "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiod sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
+  "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
   "confirmations.logout.confirm": "Clàraich a-mach",
   "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
   "confirmations.mute.confirm": "Mùch",
-  "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad leantainn ort.",
+  "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
   "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Ma bheir thu freagairt an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
-  "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson leantainn air {name} tuilleadh?",
+  "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
   "conversation.delete": "Sguab às an còmhradh",
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
-  "conversation.with": "Le {names}",
+  "conversation.with": "Còmhla ri {names}",
+  "copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
+  "copypaste.copy": "Dèan lethbhreac",
   "directory.federated": "On cho-shaoghal aithnichte",
   "directory.local": "O {domain} a-mhàin",
   "directory.new_arrivals": "Feadhainn ùra",
   "directory.recently_active": "Gnìomhach o chionn goirid",
+  "disabled_account_banner.account_settings": "Roghainnean a’ chunntais",
+  "disabled_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas aig an àm seo.",
+  "dismissable_banner.community_timeline": "Seo na postaichean poblach as ùire o dhaoine aig a bheil cunntas air {domain}.",
+  "dismissable_banner.dismiss": "Leig seachad",
+  "dismissable_banner.explore_links": "Seo na naidheachdan air a bhithear a’ bruidhinn an-dràsta fhèin air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte.",
+  "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo on fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte a’ fàs air an fhrithealaich seo an-dràsta fhèin.",
+  "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs an-dràsta fhèin air an fhrithealaich seo is frithealaichean eile dhen lìonra sgaoilte.",
+  "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an fhrithealaich seo is frithealaichean eile dhen lìonra sgaoilte air a bheil am frithealaiche seo eòlach.",
   "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
   "embed.preview": "Seo an coltas a bhios air:",
   "emoji_button.activity": "Gnìomhachd",
+  "emoji_button.clear": "Falamhaich",
   "emoji_button.custom": "Gnàthaichte",
   "emoji_button.flags": "Brataichean",
   "emoji_button.food": "Biadh ⁊ deoch",
@@ -165,39 +216,62 @@
   "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!",
   "empty_column.direct": "Chan eil teachdaireachd dhìreach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
   "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.",
+  "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!",
   "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.",
   "empty_column.favourites": "Chan eil am post seo ’na annsachd aig duine sam bith fhathast. Nuair a nì daoine annsachd dheth, nochdaidh iad an-seo.",
   "empty_column.follow_recommendations": "Chan urrainn dhuinn dad a mholadh dhut. Cleachd gleus an luirg feuch an lorg thu daoine air a bheil thu eòlach no rùraich na tagaichean-hais a tha a’ treandadh.",
-  "empty_column.follow_requests": "Chan eil iarrtas air leantainn agad fhathast. Nuair gheibh thu fear, nochdaidh e an-seo.",
+  "empty_column.follow_requests": "Chan eil iarrtas leantainn agad fhathast. Nuair a gheibh thu fear, nochdaidh e an-seo.",
   "empty_column.hashtag": "Chan eil dad san taga hais seo fhathast.",
-  "empty_column.home": "Tha an loidhne-ama dachaigh agad falamh! Lean air barrachd dhaoine gus a lìonadh. {suggestions}",
+  "empty_column.home": "Tha loidhne-ama na dachaigh agad falamh! Lean barrachd dhaoine gus a lìonadh. {suggestions}",
   "empty_column.home.suggestions": "Faic moladh no dhà",
   "empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
   "empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
   "empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
   "empty_column.notifications": "Cha d’ fhuair thu brath sam bith fhathast. Nuair a nì càch conaltradh leat, chì thu an-seo e.",
-  "empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean air càch o fhrithealaichean eile a làimh airson seo a lìonadh",
+  "empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean càch o fhrithealaichean eile a làimh airson seo a lìonadh",
   "error.unexpected_crash.explanation": "Air sàilleibh buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair, chan urrainn dhuinn an duilleag seo a shealltainn mar bu chòir.",
   "error.unexpected_crash.explanation_addons": "Cha b’ urrainn dhuinn an duilleag seo a shealltainn mar bu chòir. Tha sinn an dùil gu do dh’adhbharaich tuilleadan a’ bhrabhsair no inneal eadar-theangachaidh fèin-obrachail a’ mhearachd.",
   "error.unexpected_crash.next_steps": "Feuch an ath-nuadhaich thu an duilleag seo. Mura cuidich sin, dh’fhaoidte gur urrainn dhut Mastodon a chleachdadh fhathast le brabhsair eile no le aplacaid thùsail.",
   "error.unexpected_crash.next_steps_addons": "Feuch an cuir thu à comas iad ’s gun ath-nuadhaich thu an duilleag seo. Mura cuidich sin, dh’fhaoidte gur urrainn dhut Mastodon a chleachdadh fhathast le brabhsair eile no le aplacaid thùsail.",
   "errors.unexpected_crash.copy_stacktrace": "Cuir lethbhreac dhen stacktrace air an stòr-bhòrd",
   "errors.unexpected_crash.report_issue": "Dèan aithris air an duilgheadas",
+  "explore.search_results": "Toraidhean an luirg",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Rùraich",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Chan eil an roinn-seòrsa criathraidh iom seo chaidh dhan cho-theacs san do dh’inntrig thu am post seo. Ma tha thu airson am post a chriathradh sa cho-theacs seo cuideachd, feumaidh tu a’ chriathrag a dheasachadh.",
+  "filter_modal.added.context_mismatch_title": "Co-theacsa neo-iomchaidh!",
+  "filter_modal.added.expired_explanation": "Dh’fhalbh an ùine air an roinn-seòrsa criathraidh seo agus feumaidh tu an ceann-là crìochnachaidh atharrachadh mus cuir thu an sàs i.",
+  "filter_modal.added.expired_title": "Dh’fhalbh an ùine air a’ chriathrag!",
+  "filter_modal.added.review_and_configure": "Airson an roinn-seòrsa criathraidh seo a sgrùdadh ’s a rèiteachadh, tadhail air {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Roghainnean na criathraige",
+  "filter_modal.added.settings_link": "duilleag nan roghainnean",
+  "filter_modal.added.short_explanation": "Chaidh am post seo a chur ris an roinn-seòrsa criathraidh seo: {title}.",
+  "filter_modal.added.title": "Chaidh a’ chriathrag a chur ris!",
+  "filter_modal.select_filter.context_mismatch": "chan eil e iomchaidh dhan cho-theacs seo",
+  "filter_modal.select_filter.expired": "dh’fhalbh an ùine air",
+  "filter_modal.select_filter.prompt_new": "Roinn-seòrsa ùr: {name}",
+  "filter_modal.select_filter.search": "Lorg no cruthaich",
+  "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
+  "filter_modal.select_filter.title": "Criathraich am post seo",
+  "filter_modal.title.status": "Criathraich post",
   "follow_recommendations.done": "Deiseil",
-  "follow_recommendations.heading": "Lean air daoine ma tha thu airson nam postaichean aca fhaicinn! Seo moladh no dà dhut.",
-  "follow_recommendations.lead": "Nochdaidh na postaichean aig na daoine air a leanas tu a-rèir an ama air inbhir na dachaighe agad. Bi dàna on as urrainn dhut sgur de leantainn air daoine cuideachd uair sam bith!",
+  "follow_recommendations.heading": "Lean daoine ma tha thu airson na postaichean aca fhaicinn! Seo moladh no dà dhut.",
+  "follow_recommendations.lead": "Nochdaidh na postaichean aig na daoine a leanas tu a-rèir an ama nad dhachaigh. Bi dàna on as urrainn dhut sgur de dhaoine a leantainn cuideachd uair sam bith!",
   "follow_request.authorize": "Ùghdarraich",
   "follow_request.reject": "Diùlt",
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
+  "footer.about": "Mu dhèidhinn",
+  "footer.directory": "Eòlaire nam pròifil",
+  "footer.get_app": "Faigh an aplacaid",
+  "footer.invite": "Thoir cuireadh do dhaoine",
+  "footer.keyboard_shortcuts": "Ath-ghoiridean a’ mheur-chlàir",
+  "footer.privacy_policy": "Poileasaidh prìobhaideachd",
+  "footer.source_code": "Seall am bun-tùs",
   "generic.saved": "Chaidh a shàbhaladh",
-  "getting_started.developers": "Luchd-leasachaidh",
-  "getting_started.directory": "Eòlaire nam pròifil",
-  "getting_started.documentation": "Docamaideadh",
-  "getting_started.heading": "Dèan toiseach-tòiseachaidh",
-  "getting_started.invite": "Thoir cuireadh do dhaoine",
-  "getting_started.open_source_notice": "’S e bathar-bog le bun-tùs fosgailte a th’ ann am Mastodon. ’S urrainn dhut cuideachadh leis no aithris a dhèanamh air duilgheadasan air GitHub fo {github}.",
-  "getting_started.security": "Roghainnean a’ chunntais",
-  "getting_started.terms": "Teirmichean na seirbheise",
+  "getting_started.heading": "Toiseach",
   "hashtag.column_header.tag_mode.all": "agus {additional}",
   "hashtag.column_header.tag_mode.any": "no {additional}",
   "hashtag.column_header.tag_mode.none": "às aonais {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Gin sam bith dhiubh",
   "hashtag.column_settings.tag_mode.none": "Às aonais gin sam bith dhiubh",
   "hashtag.column_settings.tag_toggle": "Gabh a-steach barrachd tagaichean sa cholbh seo",
+  "hashtag.follow": "Lean an taga hais",
+  "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
   "home.hide_announcements": "Falaich na brathan-fios",
   "home.show_announcements": "Seall na brathan-fios",
+  "interaction_modal.description.favourite": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a chur ris na h-annsachdan airson innse dhan ùghdar gu bheil e a’ còrdadh dhut ’s a shàbhaladh do uaireigin eile.",
+  "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
+  "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
+  "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.",
+  "interaction_modal.on_another_server": "Air frithealaiche eile",
+  "interaction_modal.on_this_server": "Air an frithealaiche seo",
+  "interaction_modal.other_server_instructions": "Dèan lethbhreac agus cuir an URL seo san raon luirg aig an aplacaid Mastodon as fheàrr leat no ann an eadar-aghaidh an fhrithealaiche Mastodon agad.",
+  "interaction_modal.preamble": "Air sgàth ’s gu bheil Mastodon sgaoilte, ’s urrainn dhut cunntas a chleachdadh a tha ’ga òstadh le frithealaiche Mastodon no le ùrlar co-chòrdail eile mur eil cunntas agad air an fhear seo.",
+  "interaction_modal.title.favourite": "Cuir am post aig {name} ris na h-annsachdan",
+  "interaction_modal.title.follow": "Lean {name}",
+  "interaction_modal.title.reblog": "Brosnaich am post aig {name}",
+  "interaction_modal.title.reply": "Freagair dhan phost aig {name}",
   "intervals.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "intervals.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}}",
   "intervals.full.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}}",
@@ -243,7 +331,7 @@
   "keyboard_shortcuts.requests": "Fosgail liosta nan iarrtasan leantainn",
   "keyboard_shortcuts.search": "Cuir am fòcas air a’ bhàr-luirg",
   "keyboard_shortcuts.spoilers": "Seall/Falaich raon an rabhaidh susbainte",
-  "keyboard_shortcuts.start": "Fosgail an colbh “dèan toiseach-tòiseachaidh”",
+  "keyboard_shortcuts.start": "Fosgail an colbh “Toiseach”",
   "keyboard_shortcuts.toggle_hidden": "Seall/Falaich an teacsa fo rabhadh susbainte",
   "keyboard_shortcuts.toggle_sensitivity": "Seall/Falaich na meadhanan",
   "keyboard_shortcuts.toot": "Tòisich air post ùr",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Leudaich bogsa sealladh an deilbh",
   "lightbox.next": "Air adhart",
   "lightbox.previous": "Air ais",
+  "limited_account_hint.action": "Seall a’ phròifil co-dhiù",
+  "limited_account_hint.title": "Chaidh a’ phròifil seo fhalach le maoir {domain}.",
   "lists.account.add": "Cuir ris an liosta",
   "lists.account.remove": "Thoir air falbh on liosta",
   "lists.delete": "Sguab às an liosta",
@@ -261,35 +351,35 @@
   "lists.edit.submit": "Atharraich an tiotal",
   "lists.new.create": "Cuir liosta ris",
   "lists.new.title_placeholder": "Tiotal na liosta ùir",
-  "lists.replies_policy.followed": "Cleachdaiche sam bith air a leanas mi",
+  "lists.replies_policy.followed": "Cleachdaiche sam bith a leanas mi",
   "lists.replies_policy.list": "Buill na liosta",
   "lists.replies_policy.none": "Na seall idir",
   "lists.replies_policy.title": "Seall na freagairtean gu:",
-  "lists.search": "Lorg am measg nan daoine air a leanas tu",
+  "lists.search": "Lorg am measg nan daoine a leanas tu",
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
   "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "missing_indicator.label": "Cha deach càil a lorg",
   "missing_indicator.sublabel": "Cha deach an goireas a lorg",
+  "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.duration": "Faide",
   "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
   "mute_modal.indefinite": "Gun chrìoch",
-  "navigation_bar.apps": "Aplacaidean mobile",
+  "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.blocks": "Cleachdaichean bacte",
   "navigation_bar.bookmarks": "Comharran-lìn",
   "navigation_bar.community_timeline": "Loidhne-ama ionadail",
   "navigation_bar.compose": "Sgrìobh post ùr",
   "navigation_bar.direct": "Teachdaireachdan dìreach",
-  "navigation_bar.discover": "Fidir",
+  "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
   "navigation_bar.edit_profile": "Deasaich a’ phròifil",
+  "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Na h-annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
   "navigation_bar.follow_requests": "Iarrtasan leantainn",
   "navigation_bar.follows_and_followers": "Dàimhean leantainn",
-  "navigation_bar.info": "Mun fhrithealaiche seo",
-  "navigation_bar.keyboard_shortcuts": "Grad-iuchraichean",
   "navigation_bar.lists": "Liostaichean",
   "navigation_bar.logout": "Clàraich a-mach",
   "navigation_bar.mutes": "Cleachdaichean mùchte",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "Postaichean prìnichte",
   "navigation_bar.preferences": "Roghainnean",
   "navigation_bar.public_timeline": "Loidhne-ama cho-naisgte",
+  "navigation_bar.search": "Lorg",
   "navigation_bar.security": "Tèarainteachd",
+  "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
+  "notification.admin.report": "Rinn {name} gearan mu {target}",
+  "notification.admin.sign_up": "Chlàraich {name}",
   "notification.favourite": "Is annsa le {name} am post agad",
-  "notification.follow": "Tha {name} a’ leantainn ort a-nis",
-  "notification.follow_request": "Dh’iarr {name} leantainn ort",
+  "notification.follow": "Tha {name} ’gad leantainn a-nis",
+  "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.mention": "Thug {name} iomradh ort",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
-  "notification.status": "Tha {name} air rud a phostadh",
+  "notification.status": "Phostaich {name} rud",
+  "notification.update": "Dheasaich {name} post",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
+  "notifications.column_settings.admin.report": "Gearanan ùra:",
+  "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
   "notifications.column_settings.favourite": "Na h-annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
-  "notifications.column_settings.filter_bar.show": "Seall",
+  "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
   "notifications.column_settings.mention": "Iomraidhean:",
@@ -322,16 +419,18 @@
   "notifications.column_settings.show": "Seall sa cholbh",
   "notifications.column_settings.sound": "Cluich fuaim",
   "notifications.column_settings.status": "Postaichean ùra:",
-  "notifications.column_settings.unread_markers.category": "Comharran nach deach brath a leughadh",
+  "notifications.column_settings.unread_notifications.category": "Brathan nach deach a leughadh",
+  "notifications.column_settings.unread_notifications.highlight": "Soillsich na brathan nach deach a leughadh",
+  "notifications.column_settings.update": "Deasachaidhean:",
   "notifications.filter.all": "Na h-uile",
   "notifications.filter.boosts": "Brosnachaidhean",
   "notifications.filter.favourites": "Na h-annsachdan",
-  "notifications.filter.follows": "A’ leantainn air",
+  "notifications.filter.follows": "A’ leantainn",
   "notifications.filter.mentions": "Iomraidhean",
   "notifications.filter.polls": "Toraidhean cunntais-bheachd",
-  "notifications.filter.statuses": "Naidheachdan nan daoine air a leanas tu",
+  "notifications.filter.statuses": "Naidheachdan nan daoine a leanas tu",
   "notifications.grant_permission": "Thoir cead.",
-  "notifications.group": "{count} brath(an)",
+  "notifications.group": "Brathan ({count})",
   "notifications.mark_as_read": "Cuir comharra gun deach gach brath a leughadh",
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# bhòt} two {# bhòt} few {# bhòtaichean} other {# bhòt}}",
   "poll.vote": "Bhòt",
   "poll.voted": "Bhòt thu dhan fhreagairt seo",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# bhòt} two {# bhòt} few {# bhòtaichean} other {# bhòt}}",
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
   "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "Dìreach",
-  "privacy.private.long": "Chan fhaic ach na daoine a tha a’ leantainn ort seo",
+  "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
+  "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
   "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine seo ’s e ’ga shealltainn air loidhnichean-ama poblach",
+  "privacy.public.long": "Chì a h-uile duine e",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine seo ach cha dèid a shealltainn air loidhnichean-ama poblach",
+  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
   "privacy.unlisted.short": "Falaichte o liostaichean",
+  "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
+  "privacy_policy.title": "Poileasaidh prìobhaideachd",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",
-  "regeneration_indicator.sublabel": "Tha inbhir na dachaigh agad ’ga ullachadh!",
+  "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
   "relative_time.days": "{number}l",
+  "relative_time.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air ais",
+  "relative_time.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air ais",
+  "relative_time.full.just_now": "an-dràsta fhèin",
+  "relative_time.full.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}} air ais",
+  "relative_time.full.seconds": "{number, plural, one {# diog} two {# dhiog} few {# diogan} other {# diog}} air ais",
   "relative_time.hours": "{number}u",
   "relative_time.just_now": "an-dràsta",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "an-diugh",
   "reply_indicator.cancel": "Sguir dheth",
+  "report.block": "Bac",
+  "report.block_explanation": "Chan fhaic thu na postaichean aca. Chan fhaic iad na postaichean agad is cha dèid aca air do leantainn. Bheir iad an aire gun deach am bacadh.",
+  "report.categories.other": "Eile",
+  "report.categories.spam": "Spama",
+  "report.categories.violation": "Tha an t-susbaint a’ briseadh riaghailt no dhà an fhrithealaiche",
+  "report.category.subtitle": "Tagh an roghainn as iomchaidhe",
+  "report.category.title": "Innis dhuinn dè tha a’ dol leis a’ {type}",
+  "report.category.title_account": "phròifil",
+  "report.category.title_status": "phost",
+  "report.close": "Deiseil",
+  "report.comment.title": "A bheil rud sam bith eile a bu toigh leat innse dhuinn?",
   "report.forward": "Sìn air adhart gu {target}",
   "report.forward_hint": "Chaidh an cunntas a chlàradh air frithealaiche eile. A bheil thu airson lethbhreac dhen ghearan a chur dha-san gun ainm cuideachd?",
-  "report.hint": "Thèid do ghearan a chur gu maoir an fhrithealaiche agad. ’S urrainn dhut mìneachadh a sholar air carson a tha thu a’ gearan mun chunntas gu h-ìosal:",
+  "report.mute": "Mùch",
+  "report.mute_explanation": "Chan fhaic thu na postaichean aca. Chì iad na postaichean agad agus ’s urrainn dhaibh ’gad leantainn fhathast. Cha bhi fios aca gun deach am mùchadh.",
+  "report.next": "Air adhart",
   "report.placeholder": "Beachdan a bharrachd",
+  "report.reasons.dislike": "Cha toigh leam e",
+  "report.reasons.dislike_description": "Chan eil thu airson seo fhaicinn",
+  "report.reasons.other": "Adhbhar eile",
+  "report.reasons.other_description": "Chan eil na roinnean-seòrsa eile iomchaidh dhan chùis",
+  "report.reasons.spam": "’S e spama a th’ ann",
+  "report.reasons.spam_description": "Ceanglaichean droch-rùnach, conaltradh fuadain no an dearbh fhreagairt a-rithist ’s a-rithist",
+  "report.reasons.violation": "Tha e a’ briseadh riaghailtean an fhrithealaiche",
+  "report.reasons.violation_description": "Mhothaich thu gu bheil e a’ briseadh riaghailtean sònraichte",
+  "report.rules.subtitle": "Tagh a h-uile gin a tha iomchaidh",
+  "report.rules.title": "Dè na riaghailtean a tha ’gam briseadh?",
+  "report.statuses.subtitle": "Tagh a h-uile gin a tha iomchaidh",
+  "report.statuses.title": "A bheil postaichean sam bith ann a tha ’nam fianais dhan ghearan seo?",
   "report.submit": "Cuir a-null",
   "report.target": "A’ gearan mu {target}",
+  "report.thanks.take_action": "Seo na roghainnean a th’ agad airson stiùireadh na chì thu air Mastodon:",
+  "report.thanks.take_action_actionable": "Fhad ’s a bhios sinn a’ toirt sùil air, seo nas urrainn dhut dèanamh an aghaidh @{name}:",
+  "report.thanks.title": "Nach eil thu airson seo fhaicinn?",
+  "report.thanks.title_actionable": "Mòran taing airson a’ ghearain, bheir sinn sùil air.",
+  "report.unfollow": "Na lean @{name} tuilleadh",
+  "report.unfollow_explanation": "Tha thu a’ leantainn a’ chunntais seo. Sgur dhen leantainn ach nach fhaic thu na puist aca nad dhachaigh.",
+  "report_notification.attached_statuses": "Tha {count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}} ceangailte ris",
+  "report_notification.categories.other": "Eile",
+  "report_notification.categories.spam": "Spama",
+  "report_notification.categories.violation": "Briseadh riaghailte",
+  "report_notification.open": "Fosgail an gearan",
   "search.placeholder": "Lorg",
+  "search.search_or_paste": "Dèan lorg no cuir a-steach URL",
   "search_popout.search_format": "Fòrmat adhartach an luirg",
   "search_popout.tips.full_text": "Bheir teacsa sìmplidh dhut na postaichean a sgrìobh thu, a tha nan annsachdan dhut, a bhrosnaich thu no san deach iomradh a thoirt ort cho math ri ainmean-cleachdaiche, ainmean taisbeanaidh agus tagaichean hais a mhaidsicheas.",
   "search_popout.tips.hashtag": "taga hais",
@@ -382,25 +525,44 @@
   "search_popout.tips.text": "Bheir teacsa sìmplidh dhut na h-ainmean-cleachdaiche, ainmean taisbeanaidh agus tagaichean hais a mhaidsicheas",
   "search_popout.tips.user": "cleachdaiche",
   "search_results.accounts": "Daoine",
+  "search_results.all": "Na h-uile",
   "search_results.hashtags": "Tagaichean hais",
+  "search_results.nothing_found": "Cha do lorg sinn dad dha na h-abairtean-luirg seo",
   "search_results.statuses": "Postaichean",
   "search_results.statuses_fts_disabled": "Chan eil lorg phostaichean a-rèir an susbaint an comas air an fhrithealaiche Mastodon seo.",
+  "search_results.title": "Lorg {q}",
   "search_results.total": "{count, number} {count, plural, one {toradh} two {thoradh} few {toraidhean} other {toradh}}",
+  "server_banner.about_active_users": "Daoine a chleachd am frithealaiche seo rè an 30 latha mu dheireadh (Cleachdaichean gnìomhach gach mìos)",
+  "server_banner.active_users": "cleachdaichean gnìomhach",
+  "server_banner.administered_by": "Rianachd le:",
+  "server_banner.introduction": "Tha {domain} am measg an lìonraidh shòisealta sgaoilte le cumhachd {mastodon}.",
+  "server_banner.learn_more": "Barrachd fiosrachaidh",
+  "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:",
+  "sign_in_banner.create_account": "Cruthaich cunntas",
+  "sign_in_banner.sign_in": "Clàraich a-steach",
+  "sign_in_banner.text": "Clàraich a-steach a leantainn phròifilean no thagaichean hais, a’ cur postaichean ris na h-annsachdan ’s ’gan co-roinneadh is freagairt dhaibh no gabh gnìomh le cunntas o fhrithealaiche eile.",
   "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
   "status.admin_status": "Fosgail am post seo ann an eadar-aghaidh na maorsainneachd",
   "status.block": "Bac @{name}",
   "status.bookmark": "Cuir ris na comharran-lìn",
   "status.cancel_reblog_private": "Na brosnaich tuilleadh",
   "status.cannot_reblog": "Cha ghabh am post seo brosnachadh",
-  "status.copy": "Dèan lethbhreac dhen cheangal air a’ phost",
+  "status.copy": "Dèan lethbhreac dhen cheangal dhan phost",
   "status.delete": "Sguab às",
   "status.detailed_status": "Mion-shealladh a’ chòmhraidh",
   "status.direct": "Cuir teachdaireachd dhìreach gu @{name}",
+  "status.edit": "Deasaich",
+  "status.edited": "Air a dheasachadh {date}",
+  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
+  "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
+  "status.hide": "Falaich am post",
+  "status.history.created": "Chruthaich {name} {date} e",
+  "status.history.edited": "Dheasaich {name} {date} e",
   "status.load_more": "Luchdaich barrachd dheth",
-  "status.media_hidden": "Meadhanan falaichte",
+  "status.media_hidden": "Meadhan falaichte",
   "status.mention": "Thoir iomradh air @{name}",
   "status.more": "Barrachd",
   "status.mute": "Mùch @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
+  "status.replied_to": "Air {name} fhreagairt",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair dhan t-snàithlean",
   "status.report": "Dèan gearan mu @{name}",
   "status.sensitive_warning": "Susbaint fhrionasach",
   "status.share": "Co-roinn",
+  "status.show_filter_reason": "Seall e co-dhiù",
   "status.show_less": "Seall nas lugha dheth",
   "status.show_less_all": "Seall nas lugha dhen a h-uile",
   "status.show_more": "Seall barrachd dheth",
   "status.show_more_all": "Seall barrachd dhen a h-uile",
-  "status.show_thread": "Seall an snàithlean",
+  "status.show_original": "Seall an tionndadh tùsail",
+  "status.translate": "Eadar-theangaich",
+  "status.translated_from_with": "Air eaar-theangachadh o {lang} le {provider}",
   "status.uncached_media_warning": "Chan eil seo ri fhaighinn",
   "status.unmute_conversation": "Dì-mhùch an còmhradh",
   "status.unpin": "Dì-phrìnich on phròifil",
+  "subscribed_languages.lead": "Cha nochd ach na postaichean sna cànanan a thagh thu air loidhnichean-ama na dachaigh ’s nan liostaichean às dèidh an atharrachaidh seo. Na tagh gin ma tha thu airson na postaichean uile fhaighinn ge b’ e dè an cànan.",
+  "subscribed_languages.save": "Sàbhail na h-atharraichean",
+  "subscribed_languages.target": "Atharraich fo-sgrìobhadh nan cànan airson {target}",
   "suggestions.dismiss": "Leig seachad am moladh",
   "suggestions.header": "Dh’fhaoidte gu bheil ùidh agad ann an…",
   "tabs_bar.federated_timeline": "Co-naisgte",
   "tabs_bar.home": "Dachaigh",
   "tabs_bar.local_timeline": "Ionadail",
   "tabs_bar.notifications": "Brathan",
-  "tabs_bar.search": "Lorg",
   "time_remaining.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air fhàgail",
   "time_remaining.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air fhàgail",
   "time_remaining.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}} air fhàgail",
@@ -442,9 +610,9 @@
   "time_remaining.seconds": "{number, plural, one {# diog} two {# dhiog} few {# diogan} other {# diog}} air fhàgail",
   "timeline_hint.remote_resource_not_displayed": "Cha dèid {resource} o fhrithealaichean eile a shealltainn.",
   "timeline_hint.resources.followers": "Luchd-leantainn",
-  "timeline_hint.resources.follows": "A’ leantainn air",
+  "timeline_hint.resources.follows": "A’ leantainn",
   "timeline_hint.resources.statuses": "Postaichean nas sine",
-  "trends.counter_by_accounts": "{count, plural, one {Tha {counter} neach} two {Tha {counter} neach} few {Tha {counter} daoine} other {Tha {counter} duine}} a’ bruidhinn",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} neach} two {{counter} neach} few {{counter} daoine} other {{counter} duine}} {days, plural, one {san {days} latha} two {san {days} latha} few {sna {days} làithean} other {sna {days} latha}} seo chaidh",
   "trends.trending_now": "A’ treandadh an-dràsta",
   "ui.beforeunload": "Caillidh tu an dreachd agad ma dh’fhàgas tu Mastodon an-dràsta.",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
   "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
   "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
+  "upload_form.description_missing": "Cha deach tuairisgeul a chur ris",
   "upload_form.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
   "upload_form.undo": "Sguab às",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
   "upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
   "upload_modal.apply": "Cuir an sàs",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "’Ga chur an sàs…",
   "upload_modal.choose_image": "Tagh dealbh",
   "upload_modal.description_placeholder": "Lorg Sìm fiù bò, cè ⁊ neup ’ad àth",
   "upload_modal.detect_text": "Mothaich dhan teacsa on dealbh",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Ag ullachadh OCR…",
   "upload_modal.preview_label": "Ro-shealladh ({ratio})",
   "upload_progress.label": "’Ga luchdadh suas…",
+  "upload_progress.processing": "’Ga phròiseasadh…",
   "video.close": "Dùin a’ video",
   "video.download": "Luchdaich am faidhle a-nuas",
   "video.exit_fullscreen": "Fàg modh na làn-sgrìn",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index d85fd97bf..2764b7e59 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servidores suxeitos a moderación",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Motivo non indicado. ",
+  "about.domain_blocks.preamble": "Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.",
+  "about.domain_blocks.silenced.explanation": "Por defecto non verás perfís e contido desde este servidor, a menos que mires de xeito explícito ou optes por seguir ese contido ou usuaria.",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Non se procesarán, almacenarán nin intercambiarán datos con este servidor, o que fai imposible calquera interacción ou comunicación coas usuarias deste servidor.",
+  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.not_available": "Esta información non está dispoñible neste servidor.",
+  "about.powered_by": "Comunicación social descentralizada grazas a {mastodon}",
+  "about.rules": "Regras do servidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
   "account.badges.bot": "Bot",
@@ -7,71 +19,93 @@
   "account.block_domain": "Agochar todo de {domain}",
   "account.blocked": "Bloqueada",
   "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
-  "account.cancel_follow_request": "Desbotar solicitude de seguimento",
-  "account.direct": "Mensaxe directa @{name}",
+  "account.cancel_follow_request": "Retirar solicitude de seguimento",
+  "account.direct": "Mensaxe directa a @{name}",
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
   "account.domain_blocked": "Dominio agochado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
+  "account.featured_tags.last_status_at": "Última publicación o {date}",
+  "account.featured_tags.last_status_never": "Sen publicacións",
+  "account.featured_tags.title": "Cancelos destacados de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidora} other {{counter} Seguidoras}}",
+  "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {{counter} Seguindo} other {{counter} Seguindo}}",
   "account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
   "account.follows_you": "Séguete",
+  "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Agochar repeticións de @{name}",
-  "account.joined": "Uníuse {date}",
-  "account.last_status": "Última actividade",
+  "account.joined_short": "Uniuse",
+  "account.languages": "Modificar os idiomas subscritos",
   "account.link_verified_on": "A propiedade desta ligazón foi verificada o {date}",
   "account.locked_info": "Esta é unha conta privada. A propietaria revisa de xeito manual quen pode seguila.",
   "account.media": "Multimedia",
   "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} mudouse a:",
+  "account.moved_to": "{name} informa de que a súa nova conta é:",
   "account.mute": "Acalar @{name}",
   "account.mute_notifications": "Acalar as notificacións de @{name}",
   "account.muted": "Acalada",
-  "account.never_active": "Nunca",
+  "account.open_original_page": "Abrir páxina orixinal",
   "account.posts": "Publicacións",
   "account.posts_with_replies": "Publicacións e respostas",
   "account.report": "Informar sobre @{name}",
-  "account.requested": "Agardando aprovación. Preme para desbotar a solicitude de seguimento",
+  "account.requested": "Agardando aprobación. Preme para desbotar a solicitude",
+  "account.requested_follow": "{name} solicitou seguirte",
   "account.share": "Compartir o perfil de @{name}",
   "account.show_reblogs": "Amosar compartidos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Publicación} other {{counter} Publicacións}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Amosar {domain}",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "Non amosar no perfil",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Deixar de silenciar a @{name}",
   "account.unmute_notifications": "Deixar de silenciar as notificacións de @{name}",
+  "account.unmute_short": "Non silenciar",
   "account_note.placeholder": "Preme para engadir nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Ratio de retención de usuarias diaria após rexistrarse",
+  "admin.dashboard.monthly_retention": "Ratio de retención de usuarias mensual após o rexistro",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mes de rexistro",
+  "admin.dashboard.retention.cohort_size": "Novas usuarias",
   "alert.rate_limited.message": "Téntao novamente após {retry_time, time, medium}.",
   "alert.rate_limited.title": "Límite de intentos",
   "alert.unexpected.message": "Aconteceu un fallo non agardado.",
   "alert.unexpected.title": "Vaites!",
   "announcement.announcement": "Anuncio",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(sen procesar)",
+  "audio.hide": "Agochar audio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
-  "bundle_column_error.body": "Ocorreu un erro ó cargar este compoñente.",
+  "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
+  "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
+  "bundle_column_error.error.title": "Vaites!",
+  "bundle_column_error.network.body": "Algo fallou ao intentar cargar esta páxina. Podería ser un problema temporal da conexión a internet ao intentar comunicarte este servidor.",
+  "bundle_column_error.network.title": "Fallo na rede",
   "bundle_column_error.retry": "Téntao de novo",
-  "bundle_column_error.title": "Fallo na rede",
+  "bundle_column_error.return": "Volver ao Inicio",
+  "bundle_column_error.routing.body": "Non atopamos a páxina solicitada. Tes a certeza de que o URL na barra de enderezos é correcto?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Pechar",
   "bundle_modal_error.message": "Ocorreu un erro ó cargar este compoñente.",
   "bundle_modal_error.retry": "Téntao de novo",
+  "closed_registrations.other_server_instructions": "Cómo Mastodon é descentralizado, podes crear unha conta noutro servidor e interactuar igualmente con este.",
+  "closed_registrations_modal.description": "Actualmente non é posible crear unha conta en {domain}, pero ten en conta que non precisas unha conta específicamente en {domain} para usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Atopa outro servidor",
+  "closed_registrations_modal.preamble": "Mastodon é descentralizado, así que non importa onde crees a conta, poderás seguir e interactuar con calquera conta deste servidor. Incluso podes ter o teu servidor!",
+  "closed_registrations_modal.title": "Crear conta en Mastodon",
+  "column.about": "Acerca de",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronoloxía local",
   "column.direct": "Mensaxes directas",
   "column.directory": "Procurar perfís",
   "column.domain_blocks": "Dominios agochados",
-  "column.favourites": "Favoritos",
+  "column.favourites": "Favoritas",
   "column.follow_requests": "Peticións de seguimento",
   "column.home": "Inicio",
   "column.lists": "Listaxes",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Só local",
   "community.column_settings.media_only": "Só multimedia",
   "community.column_settings.remote_only": "Só remoto",
-  "compose_form.direct_message_warning": "Esta publicación só será enviada ás usuarias mencionadas.",
-  "compose_form.direct_message_warning_learn_more": "Coñecer máis",
+  "compose.language.change": "Elixe o idioma",
+  "compose.language.search": "Buscar idiomas...",
+  "compose_form.direct_message_warning_learn_more": "Saber máis",
+  "compose_form.encryption_warning": "As publicacións en Mastodon non están cifradas de extremo-a-extremo. Non compartas información sensible en Mastodon.",
   "compose_form.hashtag_warning": "Esta publicación non aparecerá baixo ningún cancelo (hashtag) porque non está listada. Só se poden procurar publicacións públicas por cancelos.",
   "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueada",
@@ -101,49 +137,64 @@
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
-  "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa escolla",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Gardar cambios",
   "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
   "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
   "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
-  "confirmation_modal.cancel": "Desbotar",
+  "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar solicitude",
+  "confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "Tes a certeza de querer eliminar esta publicación?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
   "confirmations.domain_block.confirm": "Agochar dominio enteiro",
   "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.mute.confirm": "Acalar",
-  "confirmations.mute.explanation": "Isto agochará as publicacións delas ou nas que as mencionen, mais permitirá que vexan as túas publicacións e sexan seguidoras túas.",
+  "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
   "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
-  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás os compartidos e favoritos, e as respostas á publicación orixinal ficarán orfas.",
+  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as comparticións e favoritas, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder agora sobrescribirá a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
+  "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Desexas deixar de seguir a {name}?",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
   "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Do fediverso coñecido",
   "directory.local": "Só de {domain}",
   "directory.new_arrivals": "Recén chegadas",
   "directory.recently_active": "Activas recentemente",
+  "disabled_account_banner.account_settings": "Axustes da conta",
+  "disabled_account_banner.text": "Actualmente a túa conta {disabledAccount} está desactivada.",
+  "dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.",
+  "dismissable_banner.dismiss": "Desbotar",
+  "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.",
+  "dismissable_banner.explore_statuses": "Está aumentando a popularidade destas publicacións no servidor e na rede descentralizada.",
+  "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
+  "dismissable_banner.public_timeline": "Estas son as publicacións máis recentes das persoas deste servidor e noutros servidores da rede descentralizada cos que está conectado.",
   "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
   "embed.preview": "Así será mostrado:",
   "emoji_button.activity": "Actividade",
+  "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida e Bebida",
@@ -165,6 +216,7 @@
   "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
   "empty_column.direct": "Aínda non tes mensaxes directas. Cando envíes ou recibas unha, amosarase aquí.",
   "empty_column.domain_blocks": "Aínda non hai dominios agochados.",
+  "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!",
   "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.",
   "empty_column.favourites": "A ninguén lle gustou esta publicación polo momento. Cando a alguén lle guste, aparecerá aquí.",
   "empty_column.follow_recommendations": "Semella que non temos suxestións para ti. Podes utilizar a busca para atopar persoas que coñezas ou explorar os cancelos en voga.",
@@ -179,25 +231,47 @@
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
   "error.unexpected_crash.explanation_addons": "Non se puido mostrar correctamente a páxina. Habitualmente este erro está causado por algún engadido do navegador ou ferramentas de tradución automática.",
-  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se esto non axuda podes tamén empregar Mastodon noutro navegador ou aplicación nativa.",
+  "error.unexpected_crash.next_steps": "Tenta actualizar a páxina. Se isto non axuda podes tamén empregar Mastodon noutro navegador ou aplicación nativa.",
   "error.unexpected_crash.next_steps_addons": "Intenta desactivalas e actualiza a páxina. Se isto non funciona, podes seguir usando Mastodon nun navegador diferente ou aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar trazas (stacktrace) ó portapapeis",
   "errors.unexpected_crash.report_issue": "Informar sobre un problema",
+  "explore.search_results": "Resultados da busca",
+  "explore.suggested_follows": "Para ti",
+  "explore.title": "Descubrir",
+  "explore.trending_links": "Novas",
+  "explore.trending_statuses": "Publicacións",
+  "explore.trending_tags": "Cancelos",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro non se aplica ao contexto no que accedeches a esta publicación. Se queres que a publicación se filtre nese contexto tamén, terás que editar o filtro.",
+  "filter_modal.added.context_mismatch_title": "Non concorda o contexto!",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro caducou, terás que cambiar a data de caducidade para que se aplique.",
+  "filter_modal.added.expired_title": "Filtro caducado!",
+  "filter_modal.added.review_and_configure": "Para revisar e despois configurar esta categoría de filtro, vaite a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Axustes do filtro",
+  "filter_modal.added.settings_link": "páxina de axustes",
+  "filter_modal.added.short_explanation": "Engadiuse esta publicación á seguinte categoría de filtro: {title}.",
+  "filter_modal.added.title": "Filtro engadido!",
+  "filter_modal.select_filter.context_mismatch": "non se aplica neste contexto",
+  "filter_modal.select_filter.expired": "caducado",
+  "filter_modal.select_filter.prompt_new": "Nova categoría: {name}",
+  "filter_modal.select_filter.search": "Buscar ou crear",
+  "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
+  "filter_modal.select_filter.title": "Filtrar esta publicación",
+  "filter_modal.title.status": "Filtrar unha publicación",
   "follow_recommendations.done": "Feito",
   "follow_recommendations.heading": "Segue a persoas das que queiras ler publicacións! Aqui tes unhas suxestións.",
   "follow_recommendations.lead": "As publicacións das persoas que segues aparecerán na túa cronoloxía de inicio ordenadas temporalmente. Non teñas medo a equivocarte, podes deixar de seguirlas igual de fácil en calquera momento!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
+  "footer.about": "Acerca de",
+  "footer.directory": "Directorio de perfís",
+  "footer.get_app": "Descarga a app",
+  "footer.invite": "Convidar persoas",
+  "footer.keyboard_shortcuts": "Atallos do teclado",
+  "footer.privacy_policy": "Política de privacidade",
+  "footer.source_code": "Ver código fonte",
   "generic.saved": "Gardado",
-  "getting_started.developers": "Desenvolvedoras",
-  "getting_started.directory": "Directorio local",
-  "getting_started.documentation": "Documentación",
   "getting_started.heading": "Primeiros pasos",
-  "getting_started.invite": "Convidar persoas",
-  "getting_started.open_source_notice": "Mastodon é software de código aberto. Podes contribuír ou informar de fallos en GitHub en {github}.",
-  "getting_started.security": "Seguranza",
-  "getting_started.terms": "Termos do servizo",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Calquera destes",
   "hashtag.column_settings.tag_mode.none": "Ningún destes",
   "hashtag.column_settings.tag_toggle": "Incluír cancelos adicionais para esta columna",
+  "hashtag.follow": "Seguir cancelo",
+  "hashtag.unfollow": "Deixar de seguir cancelo",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
   "home.hide_announcements": "Agochar anuncios",
   "home.show_announcements": "Amosar anuncios",
+  "interaction_modal.description.favourite": "Cunha conta en Mastodon, poderás marcar esta publicación como favorita, para gardalo e para que o autor saiba o moito que lle gustou.",
+  "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.",
+  "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
+  "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.",
+  "interaction_modal.on_another_server": "Nun servidor diferente",
+  "interaction_modal.on_this_server": "Neste servidor",
+  "interaction_modal.other_server_instructions": "Copia e pega este URL no campo de busca da túa app Mastodon favorita ou na interface web do teu servidor Mastodon.",
+  "interaction_modal.preamble": "Como Mastodon é descentralizado, é posible usar unha conta existente noutro servidor Mastodon, ou nunha plataforma compatible, se non dispós dunha conta neste servidor.",
+  "interaction_modal.title.favourite": "Marcar coma favorita a publicación de {name}",
+  "interaction_modal.title.follow": "Seguir a {name}",
+  "interaction_modal.title.reblog": "Promover a publicación de {name}",
+  "interaction_modal.title.reply": "Responder á publicación de {name}",
   "intervals.full.days": "{number, plural,one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -221,11 +309,11 @@
   "keyboard_shortcuts.column": "Destacar unha columna",
   "keyboard_shortcuts.compose": "Por o cursor na área de escritura",
   "keyboard_shortcuts.description": "Descrición",
-  "keyboard_shortcuts.direct": "Para abrir a columna de mensaxes directas",
+  "keyboard_shortcuts.direct": "para abrir a columna de mensaxes directas",
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
-  "keyboard_shortcuts.favourite": "Para engadir a favoritos",
-  "keyboard_shortcuts.favourites": "Para abrir a listaxe dos favoritos",
+  "keyboard_shortcuts.favourite": "Marcar como favorita",
+  "keyboard_shortcuts.favourites": "Para abrir a listaxe das favoritas",
   "keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
   "keyboard_shortcuts.heading": "Atallos do teclado",
   "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expandir a caixa de vista da imaxe",
   "lightbox.next": "Seguinte",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Mostrar perfil igualmente",
+  "limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.",
   "lists.account.add": "Engadir á listaxe",
   "lists.account.remove": "Eliminar da listaxe",
   "lists.delete": "Eliminar listaxe",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "missing_indicator.label": "Non atopado",
   "missing_indicator.sublabel": "Este recurso non foi atopado",
+  "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
   "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Agochar notificacións desta usuaria?",
+  "mute_modal.hide_notifications": "Agochar notificacións desta persoa?",
   "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.apps": "Aplicacións móbiles",
+  "navigation_bar.about": "Acerca de",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronoloxía local",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.edit_profile": "Editar perfil",
-  "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.explore": "Descubrir",
+  "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Peticións de seguimento",
   "navigation_bar.follows_and_followers": "Seguindo e seguidoras",
-  "navigation_bar.info": "Sobre este servidor",
-  "navigation_bar.keyboard_shortcuts": "Atallos do teclado",
   "navigation_bar.lists": "Listaxes",
   "navigation_bar.logout": "Pechar sesión",
   "navigation_bar.mutes": "Usuarias silenciadas",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "Publicacións fixadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Cronoloxía federada",
+  "navigation_bar.search": "Buscar",
   "navigation_bar.security": "Seguranza",
+  "not_signed_in_indicator.not_signed_in": "Debes acceder para ver este recurso.",
+  "notification.admin.report": "{name} denunciou a {target}",
+  "notification.admin.sign_up": "{name} rexistrouse",
   "notification.favourite": "{name} marcou a túa publicación como favorita",
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{name} mencionoute",
   "notification.own_poll": "A túa enquisa rematou",
-  "notification.poll": "Unha enquisa na que votaches rematou",
+  "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.status": "{name} publicou",
+  "notification.update": "{name} editou unha publicación",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
+  "notifications.column_settings.admin.report": "Novas denuncias:",
+  "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
-  "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.favourite": "Favoritas:",
   "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show": "Amosar",
+  "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
@@ -322,10 +419,12 @@
   "notifications.column_settings.show": "Amosar en columna",
   "notifications.column_settings.sound": "Reproducir son",
   "notifications.column_settings.status": "Novas publicacións:",
-  "notifications.column_settings.unread_markers.category": "Indicadores de notificacións non lidas",
+  "notifications.column_settings.unread_notifications.category": "Notificacións non lidas",
+  "notifications.column_settings.unread_notifications.highlight": "Resaltar notificacións non lidas",
+  "notifications.column_settings.update": "Edicións:",
   "notifications.filter.all": "Todo",
   "notifications.filter.boosts": "Compartidos",
-  "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.favourites": "Favoritas",
   "notifications.filter.follows": "Seguimentos",
   "notifications.filter.mentions": "Mencións",
   "notifications.filter.polls": "Resultados da enquisa",
@@ -346,46 +445,102 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaches por esta opción",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Directo",
-  "privacy.private.long": "Só para os seguidoras",
+  "privacy.direct.short": "Só persoas mencionadas",
+  "privacy.private.long": "Só para persoas que te seguen",
   "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Publicar nas cronoloxías públicas",
+  "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Non publicar nas cronoloxías públicas",
+  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
   "privacy.unlisted.short": "Non listado",
+  "privacy_policy.last_updated": "Actualizado por última vez no {date}",
+  "privacy_policy.title": "Política de Privacidade",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Estase a cargar…",
   "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "hai {number, plural, one {# día} other {# días}}",
+  "relative_time.full.hours": "hai {number, plural, one {# hora} other {# horas}}",
+  "relative_time.full.just_now": "xusto agora",
+  "relative_time.full.minutes": "hai {number, plural, one {# minuto} other {# minutos}}",
+  "relative_time.full.seconds": "fai {number, plural, one {# segundo} other {# segundos}}",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "agora",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoxe",
   "reply_indicator.cancel": "Desbotar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "Non vas ver as súas publicacións. Nin verá as túas publicacións nin poderá seguirte. Poderá comprobar que as bloqueaches.",
+  "report.categories.other": "Outro",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "O contido viola unha ou máis regras do servidor",
+  "report.category.subtitle": "Elixe a mellor coincidencia",
+  "report.category.title": "Cóntanos o problema con {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicación",
+  "report.close": "Feito",
+  "report.comment.title": "Hai algo máis que creas debamos saber?",
   "report.forward": "Reenviar a {target}",
   "report.forward_hint": "A conta é doutro servidor. Enviar unha copia anónima da denuncia aló tamén?",
-  "report.hint": "A denuncia enviarase á moderación do teu servidor. Abaixo podes explicar a razón pola que estás a denunciar:",
+  "report.mute": "Acalar",
+  "report.mute_explanation": "Non verás as súas publicacións. Poderá seguirte e ver as túas publicacións e non saberá que a silenciaches.",
+  "report.next": "Seguinte",
   "report.placeholder": "Comentarios adicionais",
+  "report.reasons.dislike": "Non me gusta",
+  "report.reasons.dislike_description": "Non é algo que queiras ver",
+  "report.reasons.other": "É outra cousa",
+  "report.reasons.other_description": "O problema non cae dentro de outras categorías",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Ligazóns perigosas, relacións falsas, ou respostas repetitivas",
+  "report.reasons.violation": "Viola as regras do servidor",
+  "report.reasons.violation_description": "Décheste conta de que quebra unhas normas en concreto",
+  "report.rules.subtitle": "Elixe todo o que sexa de aplicación",
+  "report.rules.title": "Que regras foron incumpridas?",
+  "report.statuses.subtitle": "Elixe todo o que corresponda",
+  "report.statuses.title": "Hai algunha publicación que apoie esta denuncia?",
   "report.submit": "Enviar",
   "report.target": "Denunciar a {target}",
+  "report.thanks.take_action": "Aquí tes unhas opcións para controlar o que ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mentras revisamos isto, podes tomar accións contra @{name}:",
+  "report.thanks.title": "Non queres ver isto?",
+  "report.thanks.title_actionable": "Grazas pola denuncia, investigarémola.",
+  "report.unfollow": "Non seguir a @{name}",
+  "report.unfollow_explanation": "Estás a seguir esta conta. Deixar de ver as súas publicacións na túa cronoloxía, non seguila.",
+  "report_notification.attached_statuses": "Achegou {count, plural, one {{count} publicación} other {{count} publicacións}}",
+  "report_notification.categories.other": "Outro",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Faltou ás regras",
+  "report_notification.open": "Abrir a denuncia",
   "search.placeholder": "Procurar",
+  "search.search_or_paste": "Busca ou insire URL",
   "search_popout.search_format": "Formato de procura avanzada",
-  "search_popout.tips.full_text": "Texto simple devolve toots que ti escribiches, promoviches, marcaches favoritos, ou foches mencionada, así como nomes de usuaria coincidentes, nomes públicos e cancelos.",
+  "search_popout.tips.full_text": "Texto simple devolve publicacións que ti escribiches, promoveches, marcaches como favoritas, ou foches mencionada, así como nomes de usuaria coincidentes, nomes públicos e cancelos.",
   "search_popout.tips.hashtag": "cancelo",
   "search_popout.tips.status": "publicación",
   "search_popout.tips.text": "Texto simple devolve coincidencias con nomes públicos, nomes de usuaria e cancelos",
   "search_popout.tips.user": "usuaria",
   "search_results.accounts": "Persoas",
+  "search_results.all": "Todo",
   "search_results.hashtags": "Cancelos",
+  "search_results.nothing_found": "Non atopamos nada con estes termos de busca",
   "search_results.statuses": "Publicacións",
   "search_results.statuses_fts_disabled": "Procurar publicacións polo seu contido non está activado neste servidor do Mastodon.",
+  "search_results.title": "Resultados para {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Persoas que usaron este servidor nos últimos 30 días (Usuarias Activas Mensuais)",
+  "server_banner.active_users": "usuarias activas",
+  "server_banner.administered_by": "Administrada por:",
+  "server_banner.introduction": "{domain} é parte da rede social descentralizada que funciona grazas a {mastodon}.",
+  "server_banner.learn_more": "Saber máis",
+  "server_banner.server_stats": "Estatísticas do servidor:",
+  "sign_in_banner.create_account": "Crear conta",
+  "sign_in_banner.sign_in": "Acceder",
+  "sign_in_banner.text": "Inicia sesión para seguir perfís ou etiquetas, marcar como favorita, responder a publicacións ou interactuar con outro servidor desde a túa conta.",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_status": "Abrir esta publicación na interface de moderación",
   "status.block": "Bloquear a @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa a @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustar",
-  "status.favourite": "Favorito",
+  "status.favourite": "Favorita",
+  "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
+  "status.hide": "Agochar publicación",
+  "status.history.created": "{name} creouno o {date}",
+  "status.history.edited": "{name} editouno o {date}",
   "status.load_more": "Cargar máis",
   "status.media_hidden": "Contido multimedia agochado",
   "status.mention": "Mencionar @{name}",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
-  "status.replyAll": "Responder ó fío",
+  "status.replyAll": "Responder ao tema",
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Contido sensíbel",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Mostrar igualmente",
   "status.show_less": "Amosar menos",
   "status.show_less_all": "Amosar menos para todos",
   "status.show_more": "Amosar máis",
   "status.show_more_all": "Amosar máis para todos",
-  "status.show_thread": "Amosar fío",
+  "status.show_original": "Mostrar o orixinal",
+  "status.translate": "Traducir",
+  "status.translated_from_with": "Traducido do {lang} usando {provider}",
   "status.uncached_media_warning": "Non dispoñíbel",
   "status.unmute_conversation": "Deixar de silenciar conversa",
   "status.unpin": "Desafixar do perfil",
+  "subscribed_languages.lead": "Ao facer cambios só as publicacións nos idiomas seleccionados aparecerán nas túas cronoloxías. Non elixas ningún para poder ver publicacións en tódolos idiomas.",
+  "subscribed_languages.save": "Gardar cambios",
+  "subscribed_languages.target": "Cambiar a subscrición a idiomas para {target}",
   "suggestions.dismiss": "Rexeitar suxestión",
   "suggestions.header": "Poderíache interesar…",
   "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Inicio",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificacións",
-  "tabs_bar.search": "Procurar",
-  "time_remaining.days": "{number, plural, one {# día} other {# días}} restantes",
-  "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restantes",
-  "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutos}} restantes",
-  "time_remaining.moments": "Momentos restantes",
-  "time_remaining.seconds": "{number, plural, one {# segundo} other {# segundos}} restantes",
+  "time_remaining.days": "Remata en {number, plural, one {# día} other {# días}}",
+  "time_remaining.hours": "Remata en {number, plural, one {# hora} other {# horas}}",
+  "time_remaining.minutes": "Remata en {number, plural, one {# minuto} other {# minutos}}",
+  "time_remaining.moments": "A piques de rematar",
+  "time_remaining.seconds": "Remata en {number, plural, one {# segundo} other {# segundos}}",
   "timeline_hint.remote_resource_not_displayed": "Non se mostran {resource} desde outros servidores.",
   "timeline_hint.resources.followers": "Seguidoras",
   "timeline_hint.resources.follows": "Seguindo",
   "timeline_hint.resources.statuses": "Publicacións antigas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} comentando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} {days, plural, one {no último día} other {nos {days} últimos días}}",
   "trends.trending_now": "Tendencias actuais",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
   "upload_form.audio_description": "Describir para persoas con problemas auditivos",
   "upload_form.description": "Describir para persoas con problemas visuais",
+  "upload_form.description_missing": "Sen descrición",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar a miniatura",
   "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para persoas con problemas visuais ou auditivos",
   "upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Elixir imaxe",
   "upload_modal.description_placeholder": "Un raposo veloz brinca sobre o can preguiceiro",
   "upload_modal.detect_text": "Detectar texto na imaxe",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Estase a subir...",
+  "upload_progress.processing": "Procesando…",
   "video.close": "Pechar vídeo",
   "video.download": "Baixar ficheiro",
   "video.exit_fullscreen": "Saír da pantalla completa",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 311323d21..422549f4d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -1,484 +1,654 @@
 {
-  "account.account_note_header": "ההודעה שלך ל@{name}",
+  "about.blocks": "שרתים מוגבלים",
+  "about.contact": "יצירת קשר:",
+  "about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "הסיבה אינה זמינה",
+  "about.domain_blocks.preamble": "ככלל מסטודון מאפשרת לך לצפות בתוכן ולתקשר עם משתמשים מכל שרת בפדיברס. אלו הם היוצאים מן הכלל שהוגדרו עבור השרת המסוים הזה.",
+  "about.domain_blocks.silenced.explanation": "ככלל פרופילים ותוכן משרת זה לא יוצגו, אלא אם חיפשת אותם באופן מפורש או בחרת להשתתף בו על ידי מעקב.",
+  "about.domain_blocks.silenced.title": "מוגבלים",
+  "about.domain_blocks.suspended.explanation": "שום מידע משרת זה לא יעובד, יישמר או יוחלף, מה שהופך כל תקשורת עם משתמשים משרת זה לבלתי אפשרית.",
+  "about.domain_blocks.suspended.title": "מושעים",
+  "about.not_available": "המידע אינו זמין על שרת זה.",
+  "about.powered_by": "רשת חברתית מבוזרת המופעלת על ידי {mastodon}",
+  "about.rules": "כללי השרת",
+  "account.account_note_header": "הערה",
   "account.add_or_remove_from_list": "הוסף או הסר מהרשימות",
   "account.badges.bot": "בוט",
   "account.badges.group": "קבוצה",
-  "account.block": "חסימת @{name}",
-  "account.block_domain": "להסתיר הכל מהקהילה {domain}",
-  "account.blocked": "חסום",
-  "account.browse_more_on_origin_server": "המשך לגלוש בפרופיל המקורי",
-  "account.cancel_follow_request": "בטל בקשת מעקב",
-  "account.direct": "Direct Message @{name}",
+  "account.block": "חסמי את @{name}",
+  "account.block_domain": "חסמו את קהילת {domain}",
+  "account.blocked": "לחסום",
+  "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
+  "account.cancel_follow_request": "משיכת בקשת מעקב",
+  "account.direct": "הודעה ישירה ל@{name}",
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
-  "account.domain_blocked": "הדומיין חסוי",
+  "account.domain_blocked": "הדומיין חסום",
   "account.edit_profile": "עריכת פרופיל",
-  "account.enable_notifications": "שלח לי התראות כש@{name} מפרסמים",
-  "account.endorse": "הצג בפרופיל",
-  "account.follow": "מעקב",
+  "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
+  "account.endorse": "קדם את החשבון בפרופיל",
+  "account.featured_tags.last_status_at": "חצרוץ אחרון בתאריך {date}",
+  "account.featured_tags.last_status_never": "אין חצרוצים",
+  "account.featured_tags.title": "התגיות המועדפות של {name}",
+  "account.follow": "עקוב",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
+  "account.following": "נעקבים",
   "account.following_counter": "{count, plural,one {עוקב אחרי {counter}}other {עוקב אחרי {counter}}}",
-  "account.follows.empty": "משתמש זה לא עוקב אחר אף אחד עדיין.",
+  "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
   "account.follows_you": "במעקב אחריך",
+  "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
-  "account.joined": "הצטרפו ב{date}",
-  "account.last_status": "פעילות אחרונה",
+  "account.joined_short": "תאריך הצטרפות",
+  "account.languages": "שנה שפת הרשמה",
   "account.link_verified_on": "בעלות על הקישור הזה נבדקה לאחרונה ב{date}",
-  "account.locked_info": "מצב הפרטיות של החשבון הנוכחי הוגדר כנעול. בעל החשבון קובע באופן פרטני מי יכול לעקוב אחריו.",
+  "account.locked_info": "החשבון הזה הוגדר כנעול. צריך לקבל אישור כדי לעקוב אחריו.",
   "account.media": "מדיה",
   "account.mention": "אזכור של @{name}",
-  "account.moved_to": "החשבון {name} הועבר אל:",
+  "account.moved_to": "{name} ציינו שהחשבון החדש שלהם הוא:",
   "account.mute": "להשתיק את @{name}",
-  "account.mute_notifications": "להסתיר התראות מאת @{name}",
+  "account.mute_notifications": "להסתיר התראות מ @{name}",
   "account.muted": "מושתק",
-  "account.never_active": "אף פעם",
-  "account.posts": "הודעות",
-  "account.posts_with_replies": "Toots with replies",
-  "account.report": "לדווח על @{name}",
-  "account.requested": "בהמתנה לאישור",
-  "account.share": "לשתף את הפרופיל של @{name}",
-  "account.show_reblogs": "להראות הדהודים מאת @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "הסרת חסימה מעל @{name}",
-  "account.unblock_domain": "הסר חסימה מקהילת {domain}",
-  "account.unendorse": "לא להציג בפרופיל",
+  "account.open_original_page": "לפתיחת העמוד המקורי",
+  "account.posts": "פוסטים",
+  "account.posts_with_replies": "הודעות ותגובות",
+  "account.report": "דווח על @{name}",
+  "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
+  "account.requested_follow": "{name} ביקשו לעקוב אחריך",
+  "account.share": "שתף את הפרופיל של @{name}",
+  "account.show_reblogs": "הצג הדהודים מאת @{name}",
+  "account.statuses_counter": "{count, plural, one {הודעה} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "account.unblock": "הסר את החסימה של @{name}",
+  "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
+  "account.unblock_short": "הסר חסימה",
+  "account.unendorse": "אל תקדם בפרופיל",
   "account.unfollow": "הפסקת מעקב",
   "account.unmute": "הפסקת השתקת @{name}",
-  "account.unmute_notifications": "להפסיק הסתרת הודעות מעם @{name}",
-  "account_note.placeholder": "ללא הערה",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_notifications": "להפסיק השתקת התראות מ @{name}",
+  "account.unmute_short": "ביטול השתקה",
+  "account_note.placeholder": "יש ללחוץ כדי להוסיף הערות",
+  "admin.dashboard.daily_retention": "קצב שימור משתמשים יומי אחרי ההרשמה",
+  "admin.dashboard.monthly_retention": "קצב שימור משתמשים (פר חודש) אחרי ההרשמה",
+  "admin.dashboard.retention.average": "ממוצע",
+  "admin.dashboard.retention.cohort": "חודש רישום",
+  "admin.dashboard.retention.cohort_size": "משתמשים חדשים",
   "alert.rate_limited.message": "נא לנסות אחרי {retry_time, time, medium}.",
-  "alert.rate_limited.title": "מגבלות מיכסה",
+  "alert.rate_limited.title": "חלה הגבלת קצב",
   "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.",
   "alert.unexpected.title": "אופס!",
-  "announcement.announcement": "הודעה",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "announcement.announcement": "הכרזה",
+  "attachments_list.unprocessed": "(לא מעובד)",
+  "audio.hide": "השתק",
   "autosuggest_hashtag.per_week": "{count} לשבוע",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
-  "bundle_column_error.body": "משהו השתבש בעת הצגת הרכיב הזה.",
+  "bundle_column_error.copy_stacktrace": "העתקת הודעת התקלה",
+  "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
+  "bundle_column_error.error.title": "הו, לא!",
+  "bundle_column_error.network.body": "קרתה תקלה בעת טעינת העמוד. זו עשויה להיות תקלה זמנית בשרת או בחיבור האינטרנט שלך.",
+  "bundle_column_error.network.title": "שגיאת רשת",
   "bundle_column_error.retry": "לנסות שוב",
-  "bundle_column_error.title": "שגיאת רשת",
+  "bundle_column_error.return": "חזרה לדף הבית",
+  "bundle_column_error.routing.body": "העמוד המבוקש לא נמצא. האם ה־URL נכון?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "לסגור",
   "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.",
   "bundle_modal_error.retry": "לנסות שוב",
-  "column.blocks": "חסימות",
+  "closed_registrations.other_server_instructions": "מכיוון שמסטודון הוא רשת מבוזרת, ניתן ליצור חשבון על שרת נוסף ועדיין לקיים קשר עם משתמשים בשרת זה.",
+  "closed_registrations_modal.description": "יצירת חשבון על שרת {domain} איננה אפשרית כרגע, אבל זכרו שאינכן זקוקות לחשבון על {domain} כדי להשתמש במסטודון.",
+  "closed_registrations_modal.find_another_server": "חיפוש שרת אחר",
+  "closed_registrations_modal.preamble": "מסטודון הוא רשת מבוזרת, כך שלא משנה היכן החשבון שלך, קיימת האפשרות לעקוב ולתקשר עם משתמשים בשרת הזה. אפשר אפילו להריץ שרת בעצמך!",
+  "closed_registrations_modal.title": "להרשם למסטודון",
+  "column.about": "אודות",
+  "column.blocks": "משתמשים חסומים",
   "column.bookmarks": "סימניות",
-  "column.community": "ציר זמן מקומי",
+  "column.community": "פיד שרת מקומי",
   "column.direct": "הודעות ישירות",
-  "column.directory": "גלוש פרופילים",
-  "column.domain_blocks": "Hidden domains",
+  "column.directory": "עיין בפרופילים",
+  "column.domain_blocks": "קהילות (שמות מתחם) מוסתרות",
   "column.favourites": "חיבובים",
   "column.follow_requests": "בקשות מעקב",
-  "column.home": "בבית",
+  "column.home": "פיד הבית",
   "column.lists": "רשימות",
-  "column.mutes": "השתקות",
+  "column.mutes": "משתמשים בהשתקה",
   "column.notifications": "התראות",
-  "column.pins": "Pinned toot",
-  "column.public": "בפרהסיה",
-  "column_back_button.label": "חזרה",
-  "column_header.hide_settings": "הסתרת העדפות",
-  "column_header.moveLeft_settings": "הזחת טור לשמאל",
-  "column_header.moveRight_settings": "הזחת טור לימין",
-  "column_header.pin": "קיבוע",
+  "column.pins": "חיצרוצים נעוצים",
+  "column.public": "פיד כללי (כל השרתים)",
+  "column_back_button.label": "בחזרה",
+  "column_header.hide_settings": "הסתרת הגדרות",
+  "column_header.moveLeft_settings": "הזזת טור לשמאל",
+  "column_header.moveRight_settings": "הזזת טור לימין",
+  "column_header.pin": "הצמדה",
   "column_header.show_settings": "הצגת העדפות",
-  "column_header.unpin": "שחרור קיבוע",
-  "column_subheading.settings": "אפשרויות",
+  "column_header.unpin": "שחרור הצמדה",
+  "column_subheading.settings": "הגדרות",
   "community.column_settings.local_only": "מקומי בלבד",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "מרחוק בלבד",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "community.column_settings.media_only": "מדיה בלבד",
+  "community.column_settings.remote_only": "מרוחק בלבד",
+  "compose.language.change": "שינוי שפת ההודעה",
+  "compose.language.search": "חיפוש שפות...",
   "compose_form.direct_message_warning_learn_more": "מידע נוסף",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.encryption_warning": "הודעות במסטודון לא מוצפנות מקצה לקצה. אל תשתפו מידע רגיש במסטודון.",
+  "compose_form.hashtag_warning": "הודעה זו לא תרשם תחת תגיות הקבצה (האשטאגים) היות והנראות שלה היא 'לא רשום'. רק הודעות ציבוריות יכולות להימצא באמצעות תגיות הקבצה.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
-  "compose_form.placeholder": "מה עובר לך בראש?",
+  "compose_form.placeholder": "על מה את/ה חושב/ת ?",
   "compose_form.poll.add_option": "הוסיפו בחירה",
   "compose_form.poll.duration": "משך הסקר",
   "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
   "compose_form.poll.remove_option": "הסר בחירה זו",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
-  "compose_form.publish": "ללחוש",
-  "compose_form.publish_loud": "לחצרץ!",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "אזהרת תוכן",
+  "compose_form.publish": "פרסום",
+  "compose_form.publish_form": "לפרסם",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "שמירת שינויים",
+  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
+  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+  "compose_form.spoiler.marked": "הסר אזהרת תוכן",
+  "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
+  "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
   "confirmation_modal.cancel": "ביטול",
   "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
-  "confirmations.block.message": "לחסום את {name}?",
+  "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?",
+  "confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
+  "confirmations.cancel_follow_request.message": "האם באמת לוותר על בקשת המעקב אחרי {name}?",
   "confirmations.delete.confirm": "למחוק",
-  "confirmations.delete.message": "למחוק את ההודעה?",
+  "confirmations.delete.message": "בטוח/ה שאת/ה רוצה למחוק את ההודעה?",
   "confirmations.delete_list.confirm": "למחוק",
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "הסתר קהילה שלמה",
-  "confirmations.domain_block.message": "באמת באמת לחסום את כל קהילת {domain}? ברב המקרים השתקות נבחרות של מספר משתמשים מסויימים צריכה להספיק.",
-  "confirmations.logout.confirm": "להתנתק",
+  "confirmations.discard_edit_media.confirm": "השלך",
+  "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
+  "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)",
+  "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
+  "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "להשתיק את {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "להפסיק מעקב",
+  "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.",
+  "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
+  "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
+  "confirmations.redraft.message": "בטוחה שאת רוצה למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
+  "confirmations.reply.confirm": "תגובה",
+  "confirmations.reply.message": "תגובה עכשיו תדרוס את ההודעה שכבר התחלתים לכתוב. האם אתם בטוחים שברצונכם להמשיך?",
+  "confirmations.unfollow.confirm": "הפסקת מעקב",
   "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "ניתן להטמיע את ההודעה באתרך ע\"י העתקת הקוד שלהלן.",
+  "conversation.delete": "מחיקת שיחה",
+  "conversation.mark_as_read": "סמן כנקרא",
+  "conversation.open": "צפו בשיחה",
+  "conversation.with": "עם {names}",
+  "copypaste.copied": "הועתק",
+  "copypaste.copy": "העתקה",
+  "directory.federated": "מהפדרציה הידועה",
+  "directory.local": "מ- {domain} בלבד",
+  "directory.new_arrivals": "חדשים כאן",
+  "directory.recently_active": "פעילים לאחרונה",
+  "disabled_account_banner.account_settings": "הגדרות חשבון",
+  "disabled_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע.",
+  "dismissable_banner.community_timeline": "אלו הם החצרוצים הציבוריים האחרונים מהמשתמשים על שרת {domain}.",
+  "dismissable_banner.dismiss": "בטל",
+  "dismissable_banner.explore_links": "אלו סיפורי החדשות האחרונים שמדוברים על ידי משתמשים בשרת זה ואחרים ברשת המבוזרת כרגע.",
+  "dismissable_banner.explore_statuses": "החצרוצים האלו, משרת זה ואחרים ברשת המבוזרת, כרגע צוברים חשיפה.",
+  "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, כרגע צוברות חשיפה.",
+  "dismissable_banner.public_timeline": "אלו הם החצרוצים הציבוריים האחרונים מהמשתמשים משרת זה ואחרים ברשת המבוזרת ששרת זה יודע עליהן.",
+  "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
-  "emoji_button.custom": "מיוחדים",
+  "emoji_button.clear": "ניקוי",
+  "emoji_button.custom": "בהתאמה אישית",
   "emoji_button.flags": "דגלים",
   "emoji_button.food": "אוכל ושתיה",
   "emoji_button.label": "הוספת אמוג'י",
   "emoji_button.nature": "טבע",
-  "emoji_button.not_found": "רגישון לא נמצא!! (╯°□°）╯︵ ┻━┻",
-  "emoji_button.objects": "חפצים",
+  "emoji_button.not_found": "לא נמצאו סמלונים מתאימים",
+  "emoji_button.objects": "אובייקטים",
   "emoji_button.people": "אנשים",
   "emoji_button.recent": "בשימוש תדיר",
   "emoji_button.search": "חיפוש...",
   "emoji_button.search_results": "תוצאות חיפוש",
   "emoji_button.symbols": "סמלים",
   "emoji_button.travel": "טיולים ואתרים",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.account_suspended": "חשבון מושהה",
+  "empty_column.account_timeline": "אין עדיין אף הודעה!",
+  "empty_column.account_unavailable": "פרופיל לא זמין",
+  "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
+  "empty_column.bookmarked_statuses": "אין עדיין הודעות שחיבבת. כשתחבב את הראשונה, היא תופיע כאן.",
+  "empty_column.community": "פיד השרת המקומי ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
+  "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.",
+  "empty_column.domain_blocks": "אין עדיין קהילות מוסתרות.",
+  "empty_column.explore_statuses": "אין נושאים חמים כרגע. אולי אחר כך!",
+  "empty_column.favourited_statuses": "אין עדיין הודעות שחיבבת. כשתחבב את הראשונה, היא תופיע כאן.",
+  "empty_column.favourites": "עוד לא חיבבו את ההודעה הזו. כאשר זה יקרה, החיבובים יופיעו כאן.",
+  "empty_column.follow_recommendations": "נראה שלא ניתן לייצר המלצות עבורך. נסה/י להשתמש בחיפוש כדי למצוא אנשים מוכרים או לבדוק את הנושאים החמים.",
+  "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.",
   "empty_column.hashtag": "אין כלום בהאשתג הזה עדיין.",
-  "empty_column.home": "אף אחד לא במעקב עדיין. אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר חצוצרנים אחרים.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "אין עדיין מאום ברשימה.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.home": "פיד הבית ריק ! אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר משתמשים/ות אחרים/ות. {suggestions}",
+  "empty_column.home.suggestions": "ראה/י כמה הצעות",
+  "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
+  "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
+  "empty_column.mutes": "עוד לא השתקת שום משתמש.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "קבלה",
+  "error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
+  "error.unexpected_crash.explanation_addons": "לא ניתן להציג דף זה כראוי. הבעיה נגרמת כנראה עקב תוסף דפדפן או כלי תרגום אוטומטי.",
+  "error.unexpected_crash.next_steps": "נסה/י לרענן את הדף. אם זה לא עוזר, אולי אפשר עדיין להשתמש במסטודון דרך דפדפן אחר או באמצעות אפליקציה ילידית.",
+  "error.unexpected_crash.next_steps_addons": "נסה/י להסיר אותם ולרענן את הדף. אם זה לא עוזר, אולי אפשר עדיין להשתמש במסטודון דרך דפדפן אחר או באמצעות אפליקציה ילידית.",
+  "errors.unexpected_crash.copy_stacktrace": "להעתיק את הקוד ללוח הכתיבה",
+  "errors.unexpected_crash.report_issue": "דווח על בעיה",
+  "explore.search_results": "תוצאות חיפוש",
+  "explore.suggested_follows": "עבורך",
+  "explore.title": "סיור",
+  "explore.trending_links": "חדשות",
+  "explore.trending_statuses": "הודעות",
+  "explore.trending_tags": "תגיות",
+  "filter_modal.added.context_mismatch_explanation": "קטגוריית הסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
+  "filter_modal.added.context_mismatch_title": "אין התאמה להקשר!",
+  "filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.",
+  "filter_modal.added.expired_title": "פג תוקף הפילטר!",
+  "filter_modal.added.review_and_configure": "לסקירה והתאמה מתקדמת של קטגוריית הסינון הזו, לכו ל{settings_link}.",
+  "filter_modal.added.review_and_configure_title": "אפשרויות סינון",
+  "filter_modal.added.settings_link": "דף הגדרות",
+  "filter_modal.added.short_explanation": "ההודעה הזו הוספה לקטגוריית הסינון הזו: {title}.",
+  "filter_modal.added.title": "הפילטר הוסף!",
+  "filter_modal.select_filter.context_mismatch": "לא חל בהקשר זה",
+  "filter_modal.select_filter.expired": "פג התוקף",
+  "filter_modal.select_filter.prompt_new": "קטגוריה חדשה {name}",
+  "filter_modal.select_filter.search": "חיפוש או יצירה",
+  "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
+  "filter_modal.select_filter.title": "סינון ההודעה הזו",
+  "filter_modal.title.status": "סנן הודעה",
+  "follow_recommendations.done": "בוצע",
+  "follow_recommendations.heading": "עקב/י אחרי אנשים שתרצה/י לראות את הודעותיהם! הנה כמה הצעות.",
+  "follow_recommendations.lead": "הודעות מאנשים במעקב יופיעו בסדר כרונולוגי בפיד הבית. אל תחששו מטעויות, אפשר להסיר מעקב באותה הקלות ובכל זמן!",
+  "follow_request.authorize": "הרשאה",
   "follow_request.reject": "דחיה",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
+  "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
+  "footer.about": "אודות",
+  "footer.directory": "מדריך פרופילים",
+  "footer.get_app": "להתקנת היישומון",
+  "footer.invite": "להזמין אנשים",
+  "footer.keyboard_shortcuts": "קיצורי מקלדת",
+  "footer.privacy_policy": "מדיניות פרטיות",
+  "footer.source_code": "צפיה בקוד המקור",
+  "generic.saved": "נשמר",
   "getting_started.heading": "בואו נתחיל",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_header.tag_mode.all": "ו- {additional}",
+  "hashtag.column_header.tag_mode.any": "או {additional}",
+  "hashtag.column_header.tag_mode.none": "ללא {additional}",
+  "hashtag.column_settings.select.no_options_message": "לא נמצאו הצעות",
+  "hashtag.column_settings.select.placeholder": "הזן תגי הקבצה…",
+  "hashtag.column_settings.tag_mode.all": "כל אלה",
+  "hashtag.column_settings.tag_mode.any": "כל אלה",
+  "hashtag.column_settings.tag_mode.none": "אף אחד מאלה",
+  "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה",
+  "hashtag.follow": "מעקב אחר תגית",
+  "hashtag.unfollow": "ביטול מעקב אחר תגית",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "home.hide_announcements": "הסתר הכרזות",
+  "home.show_announcements": "הצג הכרזות",
+  "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את החצרוץ כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.",
+  "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הםוסטים שלו/ה בפיד הבית.",
+  "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
+  "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
+  "interaction_modal.on_another_server": "על שרת אחר",
+  "interaction_modal.on_this_server": "על שרת זה",
+  "interaction_modal.other_server_instructions": "ניתן להעתיק ולהדביק קישור זה לתוך שדה החיפוש באפליקציית מסטודון שבשימוש אצלך או בממשק הדפדפן של שרת המסטודון.",
+  "interaction_modal.preamble": "כיוון שמסטודון מבוזרת, תוכל/י להשתמש בחשבון שלך משרתי מסטודון או רשתות תואמות אחרות אם אין לך חשבון על שרת זה.",
+  "interaction_modal.title.favourite": "חיבוב החצרוץ של {name}",
+  "interaction_modal.title.follow": "לעקוב אחרי {name}",
+  "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
+  "interaction_modal.title.reply": "תשובה לחצרוץ של {name}",
+  "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
+  "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
+  "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",
   "keyboard_shortcuts.back": "ניווט חזרה",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.blocked": "פתיחת רשימת חסומים",
   "keyboard_shortcuts.boost": "להדהד",
-  "keyboard_shortcuts.column": "להתמקד בהודעה באחד מהטורים",
-  "keyboard_shortcuts.compose": "להתמקד בתיבת חיבור ההודעות",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.column": "להתמקד בחצרוץ באחד מהטורים",
+  "keyboard_shortcuts.compose": "להתמקד בתיבת חיבור החצרוצים",
+  "keyboard_shortcuts.description": "תיאור",
+  "keyboard_shortcuts.direct": "לפתיחת טור הודעות ישירות",
   "keyboard_shortcuts.down": "לנוע במורד הרשימה",
-  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.enter": "פתח הודעה",
   "keyboard_shortcuts.favourite": "לחבב",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.favourites": "פתיחת רשימת מועדפים",
+  "keyboard_shortcuts.federated": "פתיחת ציר זמן בין-קהילתי",
+  "keyboard_shortcuts.heading": "מקשי קיצור במקלדת",
+  "keyboard_shortcuts.home": "פתיחת ציר זמן אישי",
   "keyboard_shortcuts.hotkey": "מקש קיצור",
-  "keyboard_shortcuts.legend": "להציג את הפירוש",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.legend": "הצגת מקרא",
+  "keyboard_shortcuts.local": "פתיחת ציר זמן קהילתי",
   "keyboard_shortcuts.mention": "לאזכר את המחבר(ת)",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "לענות",
-  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.muted": "פתיחת רשימת משתמשים מושתקים",
+  "keyboard_shortcuts.my_profile": "פתיחת הפרופיל שלך",
+  "keyboard_shortcuts.notifications": "פתיחת טור התראות",
+  "keyboard_shortcuts.open_media": "פתיחת מדיה",
+  "keyboard_shortcuts.pinned": "פתיחת הודעה נעוצות",
+  "keyboard_shortcuts.profile": "פתח את פרופיל המשתמש",
+  "keyboard_shortcuts.reply": "תגובה להודעה",
+  "keyboard_shortcuts.requests": "פתיחת רשימת בקשות מעקב",
   "keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.spoilers": "הצגת/הסתרת שדה אזהרת תוכן (CW)",
+  "keyboard_shortcuts.start": "לפתוח את הטור \"בואו נתחיל\"",
+  "keyboard_shortcuts.toggle_hidden": "הצגת/הסתרת טקסט מוסתר מאחורי אזהרת תוכן",
+  "keyboard_shortcuts.toggle_sensitivity": "הצגת/הסתרת מדיה",
   "keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש",
   "keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש",
   "keyboard_shortcuts.up": "לנוע במעלה הרשימה",
   "lightbox.close": "סגירה",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
-  "lightbox.next": "הלאה",
+  "lightbox.compress": "דחיסת קופסת צפייה בתמונה",
+  "lightbox.expand": "הרחבת קופסת צפייה בתמונה",
+  "lightbox.next": "הבא",
   "lightbox.previous": "הקודם",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "limited_account_hint.action": "הצג חשבון בכל זאת",
+  "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
+  "lists.account.add": "הוסף לרשימה",
+  "lists.account.remove": "הסר מרשימה",
+  "lists.delete": "מחיקת רשימה",
+  "lists.edit": "עריכת רשימה",
+  "lists.edit.submit": "שנה/י כותרת",
+  "lists.new.create": "הוספת רשימה",
+  "lists.new.title_placeholder": "כותרת הרשימה החדשה",
+  "lists.replies_policy.followed": "משתמשים שאני עוקב אחריהם",
+  "lists.replies_policy.list": "משתמשים שברשימה",
+  "lists.replies_policy.none": "אף אחד",
+  "lists.replies_policy.title": "הצג תגובות ל:",
+  "lists.search": "חיפוש בין אנשים שאני עוקב\\ת אחריהם",
+  "lists.subheading": "הרשימות שלך",
+  "load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
   "loading_indicator.label": "טוען...",
-  "media_gallery.toggle_visible": "נראה\\בלתי נראה",
+  "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
   "missing_indicator.label": "לא נמצא",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "להסתיר הודעות מחשבון זה?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
-  "navigation_bar.blocks": "חסימות",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "ציר זמן מקומי",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "missing_indicator.sublabel": "לא ניתן היה למצוא את המשאב",
+  "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
+  "mute_modal.duration": "משך הזמן",
+  "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?",
+  "mute_modal.indefinite": "ללא תאריך סיום",
+  "navigation_bar.about": "אודות",
+  "navigation_bar.blocks": "משתמשים חסומים",
+  "navigation_bar.bookmarks": "סימניות",
+  "navigation_bar.community_timeline": "פיד שרת מקומי",
+  "navigation_bar.compose": "צור הודעה חדשה",
+  "navigation_bar.direct": "הודעות ישירות",
+  "navigation_bar.discover": "גלה",
+  "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
   "navigation_bar.edit_profile": "עריכת פרופיל",
+  "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "מילים מושתקות",
   "navigation_bar.follow_requests": "בקשות מעקב",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "מידע נוסף",
-  "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת",
-  "navigation_bar.lists": "Lists",
-  "navigation_bar.logout": "יציאה",
-  "navigation_bar.mutes": "השתקות",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "חיצרוצים מקובעים",
+  "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
+  "navigation_bar.lists": "רשימות",
+  "navigation_bar.logout": "התנתקות",
+  "navigation_bar.mutes": "משתמשים בהשתקה",
+  "navigation_bar.personal": "אישי",
+  "navigation_bar.pins": "הודעות נעוצות",
   "navigation_bar.preferences": "העדפות",
-  "navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "חצרוצך חובב על ידי {name}",
+  "navigation_bar.public_timeline": "פיד כללי (כל השרתים)",
+  "navigation_bar.search": "חיפוש",
+  "navigation_bar.security": "אבטחה",
+  "not_signed_in_indicator.not_signed_in": "יש להיות מאומת כדי לגשת למשאב זה.",
+  "notification.admin.report": "{name} דיווח.ה על {target}",
+  "notification.admin.sign_up": "{name} נרשמו",
+  "notification.favourite": "הודעתך חובבה על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.mention": "אוזכרת על ידי {name}",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "חצרוצך הודהד על ידי {name}",
-  "notification.status": "{name} just posted",
+  "notification.own_poll": "הסקר שלך הסתיים",
+  "notification.poll": "סקר שהצבעת בו הסתיים",
+  "notification.reblog": "הודעתך הודהדה על ידי {name}",
+  "notification.status": "{name} הרגע פרסמו",
+  "notification.update": "{name} ערכו הודעה",
   "notifications.clear": "הסרת התראות",
-  "notifications.clear_confirmation": "להסיר את כל ההתראות? בטוח?",
+  "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
+  "notifications.column_settings.admin.report": "דו\"חות חדשים",
+  "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "מחובבים:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
+  "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
+  "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
   "notifications.column_settings.follow": "עוקבים חדשים:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "הודעות בדחיפה",
+  "notifications.column_settings.poll": "תוצאות סקר:",
+  "notifications.column_settings.push": "התראות בדחיפה",
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
+  "notifications.column_settings.status": "הודעות חדשות:",
+  "notifications.column_settings.unread_notifications.category": "התראות שלא נקראו",
+  "notifications.column_settings.unread_notifications.highlight": "הבלט התראות שלא נקראו",
+  "notifications.column_settings.update": "שינויים:",
+  "notifications.filter.all": "הכל",
+  "notifications.filter.boosts": "הדהודים",
+  "notifications.filter.favourites": "חיבובים",
+  "notifications.filter.follows": "נעקבים",
+  "notifications.filter.mentions": "אזכורים",
+  "notifications.filter.polls": "תוצאות סקר",
+  "notifications.filter.statuses": "עדכונים מאנשים במעקב",
+  "notifications.grant_permission": "מתן הרשאה.",
+  "notifications.group": "{count} התראות",
+  "notifications.mark_as_read": "סימון כל החצרוצים כנקראו",
+  "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
+  "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
+  "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
+  "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
+  "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
+  "picture_in_picture.restore": "החזירי למקומו",
+  "poll.closed": "סגור",
+  "poll.refresh": "רענון",
+  "poll.total_people": "{count, plural, one {# איש/אישה} other {# אנשים}}",
+  "poll.total_votes": "{count, plural, one {# קול} other {# קולות}}",
+  "poll.vote": "הצבעה",
+  "poll.voted": "הצבעת לתשובה זו",
+  "poll.votes": "{votes, plural, one {# קול} other {# קולות}}",
+  "poll_button.add_poll": "הוספת סקר",
+  "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
-  "privacy.direct.long": "הצג רק למי שהודעה זו פונה אליו",
-  "privacy.direct.short": "הודעה ישירה",
+  "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
+  "privacy.direct.short": "למאוזכרים בלבד",
   "privacy.private.long": "הצג לעוקבים בלבד",
   "privacy.private.short": "לעוקבים בלבד",
-  "privacy.public.long": "פרסם בפומבי",
+  "privacy.public.long": "גלוי לכל",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
-  "privacy.unlisted.short": "לא לפיד הכללי",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי גילוי",
+  "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
+  "privacy_policy.last_updated": "עודכן לאחרונה {date}",
+  "privacy_policy.title": "מדיניות פרטיות",
+  "refresh": "רענון",
+  "regeneration_indicator.label": "טוען…",
+  "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
+  "relative_time.days": "{number} ימים",
+  "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}",
+  "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}",
+  "relative_time.full.just_now": "ממש עכשיו",
+  "relative_time.full.minutes": "לפני {number, plural, one {# דקה} other {# דקות}}",
+  "relative_time.full.seconds": "לפני {number, plural, one {# שניה} other {# שניות}}",
+  "relative_time.hours": "{number} שעות",
   "relative_time.just_now": "כרגע",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
+  "relative_time.minutes": "{number} דקות",
+  "relative_time.seconds": "{number} שניות",
+  "relative_time.today": "היום",
   "reply_indicator.cancel": "ביטול",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.block": "לחסום",
+  "report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
+  "report.categories.other": "אחר",
+  "report.categories.spam": "ספאם",
+  "report.categories.violation": "התוכן מפר אחד או יותר מחוקי השרת",
+  "report.category.subtitle": "בחר/י את המתאים ביותר",
+  "report.category.title": "ספר/י לנו מה קורה עם ה-{type} הזה",
+  "report.category.title_account": "פרופיל",
+  "report.category.title_status": "הודעה",
+  "report.close": "בוצע",
+  "report.comment.title": "האם יש דבר נוסף שלדעתך חשוב שנדע?",
+  "report.forward": "קדם ל-{target}",
+  "report.forward_hint": "חשבון זה הוא משרת אחר. האם לשלוח בנוסף עותק אנונימי לשם?",
+  "report.mute": "להשתיק",
+  "report.mute_explanation": "לא ניתן יהיה לראות את ההודעות. הם עדיין יוכלו לעקוב אחריך ולראות את ההודעות שלך ולא ידעו שהם מושתקים.",
+  "report.next": "הבא",
   "report.placeholder": "הערות נוספות",
+  "report.reasons.dislike": "אני לא אוהב את זה",
+  "report.reasons.dislike_description": "זה לא משהו שתרצה/י לראות",
+  "report.reasons.other": "זה משהו אחר",
+  "report.reasons.other_description": "הבעיה לא מתאימה לקטגוריות אחרות",
+  "report.reasons.spam": "זה ספאם",
+  "report.reasons.spam_description": "קישורים מרושעים, התייחסות מזוייפת או תגובות חוזרות",
+  "report.reasons.violation": "מפר את חוקי השרת",
+  "report.reasons.violation_description": "את/ה מודע/ת לכך שזה מפר חוקים ספציפיים",
+  "report.rules.subtitle": "בחר/י את כל המתאימים",
+  "report.rules.title": "אילו חוקים מופרים?",
+  "report.statuses.subtitle": "בחר/י את כל המתאימים",
+  "report.statuses.title": "האם ישנן הודעות התומכות בדיווח זה?",
   "report.submit": "שליחה",
-  "report.target": "דיווח",
+  "report.target": "דיווח על {target}",
+  "report.thanks.take_action": "הנה כמה אפשרויות לשליטה בתצוגת מסטודון:",
+  "report.thanks.take_action_actionable": "בזמן שאנו בוחנות את הדיווח, ניתן לפעול כנגד @{name}:",
+  "report.thanks.title": "לא מעוניין/ת לראות את זה?",
+  "report.thanks.title_actionable": "תודה על הדיווח, נבדוק את העניין.",
+  "report.unfollow": "הפסיקו לעקוב אחרי @{name}",
+  "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריהם.",
+  "report_notification.attached_statuses": "{count, plural, one {הודעה מצורפת} two {הודעותיים מצורפות} many {{count} הודעות מצורפות} other {{count} הודעות מצורפות}}",
+  "report_notification.categories.other": "שונות",
+  "report_notification.categories.spam": "ספאם (דואר זבל)",
+  "report_notification.categories.violation": "הפרת כלל",
+  "report_notification.open": "פתח דו\"ח",
   "search.placeholder": "חיפוש",
+  "search.search_or_paste": "חפש או הזן קישור",
   "search_popout.search_format": "מבנה חיפוש מתקדם",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "האשתג",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.full_text": "טקסט פשוט מחזיר פוסטים שכתבת, חיבבת, הידהדת או שאוזכרת בהם, כמו גם שמות משתמשים, שמות להצגה ותגיות מתאימים.",
+  "search_popout.tips.hashtag": "תגית",
+  "search_popout.tips.status": "הודעה",
   "search_popout.tips.text": "טקסט פשוט מחזיר כינויים, שמות משתמש והאשתגים",
   "search_popout.tips.user": "משתמש(ת)",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.accounts": "אנשים",
+  "search_results.all": "כל התוצאות",
+  "search_results.hashtags": "תגיות",
+  "search_results.nothing_found": "לא נמצא דבר עבור תנאי חיפוש אלה",
+  "search_results.statuses": "הודעות",
+  "search_results.statuses_fts_disabled": "חיפוש הודעות לפי תוכן לא מאופשר בשרת מסטודון זה.",
+  "search_results.title": "חפש את: {q}",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
-  "status.admin_account": "Open moderation interface for @{name}",
+  "server_banner.about_active_users": "משתמשים פעילים בשרת ב־30 הימים האחרונים (משתמשים פעילים חודשיים)",
+  "server_banner.active_users": "משתמשים פעילים",
+  "server_banner.administered_by": "מנוהל ע\"י:",
+  "server_banner.introduction": "{domain} הוא שרת ברשת המבוזרת {mastodon}.",
+  "server_banner.learn_more": "מידע נוסף",
+  "server_banner.server_stats": "סטטיסטיקות שרת:",
+  "sign_in_banner.create_account": "יצירת חשבון",
+  "sign_in_banner.sign_in": "התחברות",
+  "sign_in_banner.text": "יש להתחבר כדי לעקוב אחרי משתמשים או תגיות, לחבב, לשתף ולענות לחצרוצים, או לנהל תקשורת מהחשבון שלך על שרת אחר.",
+  "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
-  "status.copy": "Copy link to status",
+  "status.block": "חסימת @{name}",
+  "status.bookmark": "סימניה",
+  "status.cancel_reblog_private": "הסרת הדהוד",
+  "status.cannot_reblog": "לא ניתן להדהד חצרוץ זה",
+  "status.copy": "העתק/י קישור להודעה זו",
   "status.delete": "מחיקה",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
+  "status.detailed_status": "תצוגת שיחה מפורטת",
+  "status.direct": "הודעה ישירה ל@{name}",
+  "status.edit": "עריכה",
+  "status.edited": "נערך ב{date}",
+  "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
-  "status.filtered": "Filtered",
+  "status.filter": "סנן הודעה זו",
+  "status.filtered": "סונן",
+  "status.hide": "הסתר חצרוץ",
+  "status.history.created": "{name} יצר/ה {date}",
+  "status.history.edited": "{name} ערך/ה {date}",
   "status.load_more": "עוד",
   "status.media_hidden": "מדיה מוסתרת",
   "status.mention": "פניה אל @{name}",
   "status.more": "עוד",
-  "status.mute": "Mute @{name}",
+  "status.mute": "להשתיק את @{name}",
   "status.mute_conversation": "השתקת שיחה",
-  "status.open": "הרחבת הודעה",
-  "status.pin": "לקבע באודות",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
+  "status.open": "הרחבת הודעה זו",
+  "status.pin": "הצמדה לפרופיל שלי",
+  "status.pinned": "חצרוץ נעוץ",
+  "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "הודהד על ידי {name}",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.reblog_private": "להדהד ברמת הנראות המקורית",
+  "status.reblogged_by": "{name} הידהד/ה:",
+  "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
+  "status.redraft": "מחיקה ועריכה מחדש",
+  "status.remove_bookmark": "הסרת סימניה",
+  "status.replied_to": "הגב לחשבון {name}",
   "status.reply": "תגובה",
-  "status.replyAll": "תגובה לכולם",
+  "status.replyAll": "תגובה לשרשור",
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
+  "status.show_filter_reason": "הראה בכל זאת",
   "status.show_less": "הראה פחות",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "להציג פחות מהכל",
   "status.show_more": "הראה יותר",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
+  "status.show_more_all": "להציג יותר מהכל",
+  "status.show_original": "הצגת מקור",
+  "status.translate": "לתרגם",
+  "status.translated_from_with": "לתרגם משפה {lang} באמצעות {provider}",
+  "status.uncached_media_warning": "לא זמין",
   "status.unmute_conversation": "הסרת השתקת שיחה",
   "status.unpin": "לשחרר מקיבוע באודות",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "ציר זמן בין-קהילתי",
-  "tabs_bar.home": "בבית",
-  "tabs_bar.local_timeline": "ציר זמן מקומי",
+  "subscribed_languages.lead": "רק חצרוצים בשפות הנבחרות יופיעו בפיד הבית וברשימות שלך אחרי השינוי. נקו את כל הבחירות כדי לראות את כל השפות.",
+  "subscribed_languages.save": "שמירת שינויים",
+  "subscribed_languages.target": "שינוי רישום שפה עבור {target}",
+  "suggestions.dismiss": "להתעלם מהצעה",
+  "suggestions.header": "ייתכן שזה יעניין אותך…",
+  "tabs_bar.federated_timeline": "פיד כללי (בין-קהילתי)",
+  "tabs_bar.home": "פיד הבית",
+  "tabs_bar.local_timeline": "פיד שרת מקומי",
   "tabs_bar.notifications": "התראות",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
+  "time_remaining.days": "נותרו {number, plural, one {# יום} other {# ימים}}",
+  "time_remaining.hours": "נותרו {number, plural, one {# שעה} other {# שעות}}",
+  "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
+  "time_remaining.moments": "רגעים נותרו",
+  "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
+  "timeline_hint.resources.followers": "עוקבים",
+  "timeline_hint.resources.follows": "נעקבים",
+  "timeline_hint.resources.statuses": "הודעות ישנות יותר",
+  "trends.counter_by_accounts": "{count, plural, one {אדם {count}} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
+  "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} מליארד",
+  "units.short.million": "{count} מליון",
+  "units.short.thousand": "{count} אלפים",
   "upload_area.title": "ניתן להעלות על ידי Drag & drop",
   "upload_button.label": "הוספת מדיה",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
+  "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
+  "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.description_missing": "לא הוסף תיאור",
+  "upload_form.edit": "עריכה",
+  "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
   "upload_form.undo": "ביטול",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
+  "upload_modal.analyzing_picture": "מנתח תמונה…",
+  "upload_modal.apply": "החל",
+  "upload_modal.applying": "מחיל…",
+  "upload_modal.choose_image": "בחר/י תמונה",
+  "upload_modal.description_placeholder": "דג סקרן שט בים מאוכזב ולפתע מצא חברה",
+  "upload_modal.detect_text": "זהה טקסט מתמונה",
+  "upload_modal.edit_media": "עריכת מדיה",
+  "upload_modal.hint": "הקליקי או גררי את המעגל על גבי התצוגה המקדימה על מנת לבחור בנקודת המוקד שתראה תמיד בכל התמונות הממוזערות.",
+  "upload_modal.preparing_ocr": "מכין OCR…",
+  "upload_modal.preview_label": "תצוגה ({ratio})",
   "upload_progress.label": "עולה...",
+  "upload_progress.processing": "מעבד…",
   "video.close": "סגירת וידאו",
-  "video.download": "Download file",
+  "video.download": "הורדת קובץ",
   "video.exit_fullscreen": "יציאה ממסך מלא",
   "video.expand": "להרחיב וידאו",
-  "video.fullscreen": "Full screen",
+  "video.fullscreen": "מסך מלא",
   "video.hide": "להסתיר וידאו",
   "video.mute": "השתקת צליל",
-  "video.pause": "Pause",
+  "video.pause": "השהיה",
   "video.play": "ניגון",
   "video.unmute": "החזרת צליל"
 }
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 0bcf2a68b..3887fa00a 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "मॉडरेट सर्वर",
+  "about.contact": "कांटेक्ट:",
+  "about.disclaimer": "मास्टोडन एक ओपन सोर्स सॉफ्टवेयर है, और मास्टोडन gGmbH का ट्रेडमार्क है।",
+  "about.domain_blocks.no_reason_available": "कारण उपलब्ध नहीं है!",
+  "about.domain_blocks.preamble": "मास्टोडन आम तौर पर आपको कंटेंट को देखने और फेडिवेर्से में किसी अन्य सर्वर से उपयोगकर्ताओं के साथ बातचीत करने की अनुमति देता है। ये अपवाद हैं जो इस विशेष सर्वर पर बनाए गए हैं।",
+  "about.domain_blocks.silenced.explanation": "आप आमतौर पर इस सर्वर से प्रोफ़ाइल और कंटेंट नहीं देख पाएंगे, जब तक कि आप इसे स्पष्ट रूप से नहीं देखते या इसका अनुसरण करके इसका चयन नहीं करते।",
+  "about.domain_blocks.silenced.title": "सीमित",
+  "about.domain_blocks.suspended.explanation": "इस सर्वर से कोई डेटा संसाधित, संग्रहीत या आदान-प्रदान नहीं किया जाएगा, जिससे इस सर्वर से उपयोगकर्ताओं के साथ कोई भी बातचीत या संचार असंभव हो जाएगा",
+  "about.domain_blocks.suspended.title": "सस्पेंड किआ गया है!",
+  "about.not_available": "यह जानकारी इस सर्वर पर उपलब्ध नहीं कराई गई है।",
+  "about.powered_by": "{mastodon} द्वारा संचालित डेसेंट्रलीसेड सोशल मीडिया प्लैटफ़ॉर्म!",
+  "about.rules": "सर्वर के नियम",
   "account.account_note_header": "टिप्पणियाँ",
   "account.add_or_remove_from_list": "सूची में जोड़ें या हटाए",
   "account.badges.bot": "बॉट",
@@ -7,64 +19,86 @@
   "account.block_domain": "{domain} के सारी चीज़े छुपाएं",
   "account.blocked": "ब्लॉक",
   "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
-  "account.cancel_follow_request": "फ़ॉलो रिक्वेस्ट रद्द करें",
+  "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
   "account.direct": "प्रत्यक्ष संदेश @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
   "account.domain_blocked": "छिपा हुआ डोमेन",
   "account.edit_profile": "प्रोफ़ाइल संपादित करें",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "जब @{name} पोस्ट मौजूद हो सूचित करें",
   "account.endorse": "प्रोफ़ाइल पर दिखाए",
+  "account.featured_tags.last_status_at": "{date} का अंतिम पोस्ट",
+  "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
+  "account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
   "account.follow": "फॉलो करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
   "account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
+  "account.following": "फॉलोइंग",
   "account.following_counter": "{count, plural, one {{counter} निम्नलिखित} other {{counter} निम्नलिखित}}",
   "account.follows.empty": "यह यूज़र् अभी तक किसी को फॉलो नहीं करता है।",
   "account.follows_you": "आपको फॉलो करता है",
+  "account.go_to_profile": "प्रोफाइल में जाएँ",
   "account.hide_reblogs": "@{name} के बूस्ट छुपाएं",
-  "account.joined": "Joined {date}",
-  "account.last_status": "अंतिम सक्रिय",
+  "account.joined_short": "पुरा हुआ",
+  "account.languages": "सब्स्क्राइब्ड भाषाओं को बदलें",
   "account.link_verified_on": "इस लिंक का स्वामित्व {date} को चेक किया गया था",
   "account.locked_info": "यह खाता गोपनीयता स्थिति लॉक करने के लिए सेट है। मालिक मैन्युअल रूप से समीक्षा करता है कि कौन उनको फॉलो कर सकता है।",
   "account.media": "मीडिया",
   "account.mention": "उल्लेख @{name}",
-  "account.moved_to": "{name} स्थानांतरित हो गया:",
+  "account.moved_to": "{name} ने संकेत दिया है कि उनका नया अकाउंट अब है:",
   "account.mute": "म्यूट @{name}",
   "account.mute_notifications": "@{name} के नोटिफिकेशन म्यूट करे",
   "account.muted": "म्यूट है",
-  "account.never_active": "कभी नहीं दिखे",
+  "account.open_original_page": "ओरिजिनल पोस्ट खोलें",
   "account.posts": "टूट्स",
   "account.posts_with_replies": "टूट्स एवं जवाब",
   "account.report": "रिपोर्ट @{name}",
   "account.requested": "मंजूरी का इंतजार। फॉलो रिक्वेस्ट को रद्द करने के लिए क्लिक करें",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} की प्रोफाइल शेयर करे",
   "account.show_reblogs": "@{name} के बूस्ट दिखाए",
   "account.statuses_counter": "{count, plural, one {{counter} भोंपू} other {{counter} भोंपू}}",
   "account.unblock": "@{name} को अनब्लॉक करें",
   "account.unblock_domain": "{domain} दिखाए",
+  "account.unblock_short": "अनब्लॉक",
   "account.unendorse": "प्रोफ़ाइल पर न दिखाए",
   "account.unfollow": "अनफॉलो करें",
   "account.unmute": "अनम्यूट @{name}",
   "account.unmute_notifications": "@{name} के नोटिफिकेशन अनम्यूट करे",
+  "account.unmute_short": "अनम्यूट",
   "account_note.placeholder": "नोट्स जोड़ने के लिए क्लिक करें",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "साईन-अप के बाद उपयोगकर्ता के रिटेंशन दर",
+  "admin.dashboard.monthly_retention": "साईन-अप के बाद उपयोगकर्ता के महीने तक रिटेंशन दर",
+  "admin.dashboard.retention.average": "औसत",
+  "admin.dashboard.retention.cohort": "साईन-अप महिना",
+  "admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
   "alert.unexpected.message": "एक अप्रत्याशित त्रुटि हुई है!",
   "alert.unexpected.title": "उफ़!",
   "announcement.announcement": "घोषणा",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(असंसाधित)",
+  "audio.hide": "हाईड ऑडियो",
   "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
-  "bundle_column_error.body": "इस कॉम्पोनेन्ट को लोड करते वक्त कुछ गलत हो गया",
+  "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
+  "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
+  "bundle_column_error.error.title": "अरे, नहीं!",
+  "bundle_column_error.network.body": "इस पृष्ठ को लोड करने का प्रयास करते समय एक एरर हुआ है । यह आपके इंटरनेट कनेक्शन या इस सर्वर के साथ एक अस्थायी समस्या के कारण हो सकता है।",
+  "bundle_column_error.network.title": "नेटवर्क एरर",
   "bundle_column_error.retry": "दुबारा कोशिश करें",
-  "bundle_column_error.title": "नेटवर्क त्रुटि",
+  "bundle_column_error.return": "वापिस होम पर जाएँ",
+  "bundle_column_error.routing.body": "अनुरोधित पेज पाया नहीं जा सका। क्या आप सुनिश्चित हैं कि एड्रेस बार में URL सही है?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "बंद",
   "bundle_modal_error.message": "इस कॉम्पोनेन्ट को लोड करते वक्त कुछ गलत हो गया",
   "bundle_modal_error.retry": "दुबारा कोशिश करें",
+  "closed_registrations.other_server_instructions": "जब से मास्टोडन विकेंद्रीकरण हुआ है, आप दुसरे सर्वर पर एक अकाउंट बना सकते हैं और अब भी इसके साथ उपयोग कर सकते हैं",
+  "closed_registrations_modal.description": "{domain} पर अकाउंट बनाना अभी संभव नहीं है, किन्तु कृपया ध्यान दें कि आपको मास्टोडन का प्रयोग करने के लिए {domain} पर एक अकाउंट का पूर्ण रूप से नहीं आवश्यकता हैं",
+  "closed_registrations_modal.find_another_server": "दूसरा सर्वर ढूंढें",
+  "closed_registrations_modal.preamble": "मास्टोडन विकेन्द्रित है, इसलिए कोई मतलब नहीं आप कहाँ अपना अकाउंट बना रहे हैं, आपको फॉलो करने के लिए सक्षम होना पड़ेगा और इस सर्वर पर किसी के साथ पूछना पड़ेगा I आप इसे खुद भी-चला सकते हैंI ",
+  "closed_registrations_modal.title": "मास्टोडन पर जुड़ा जा रहा",
+  "column.about": "अबाउट",
   "column.blocks": "ब्लॉक्ड यूज़र्स",
   "column.bookmarks": "पुस्तकचिह्न:",
   "column.community": "लोकल टाइम्लाइन",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "स्थानीय ही",
   "community.column_settings.media_only": "सिर्फ़ मीडिया",
   "community.column_settings.remote_only": "केवल सुदूर",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "भाषा बदलें",
+  "compose.language.search": "भाषाएँ खोजें...",
   "compose_form.direct_message_warning_learn_more": "और जानें",
+  "compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
   "compose_form.hashtag_warning": "यह टूट् किसी भी हैशटैग के तहत सूचीबद्ध नहीं होगा क्योंकि यह अनलिस्टेड है। हैशटैग द्वारा केवल सार्वजनिक टूट्स खोजे जा सकते हैं।",
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
-  "compose_form.publish": "टूट्",
+  "compose_form.publish": "पब्लिश",
+  "compose_form.publish_form": "पब्लिश",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "परिवर्तनों को सहेजें",
   "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
   "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
   "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
   "confirmations.block.message": "क्या आप वाकई {name} को ब्लॉक करना चाहते हैं?",
+  "confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
+  "confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
   "confirmations.delete.confirm": "मिटाए",
   "confirmations.delete.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं?",
   "confirmations.delete_list.confirm": "मिटाए",
   "confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "डिस्कार्ड",
+  "confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
   "confirmations.domain_block.confirm": "संपूर्ण डोमेन छिपाएं",
   "confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
   "confirmations.logout.confirm": "लॉग आउट करें",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
   "conversation.with": "{names} के साथ",
+  "copypaste.copied": "कॉपी किआ जा चूका है",
+  "copypaste.copy": "कॉपी",
   "directory.federated": "ज्ञात फेडीवर्स से",
   "directory.local": "केवल {domain} से",
   "directory.new_arrivals": "नए आगंतुक",
   "directory.recently_active": "हाल में ही सक्रिय",
+  "disabled_account_banner.account_settings": "अकाउंट सेटिंग्स",
+  "disabled_account_banner.text": "आपका अकाउंट {disabledAccount} अभी डिसेबल्ड है",
+  "dismissable_banner.community_timeline": "ये उन लोगों की सबसे रीसेंट पब्लिक पोस्ट हैं जिनके अकाउंट इनके {domain} द्वारा होस्ट किए गए हैं",
+  "dismissable_banner.dismiss": "डिसमिस",
+  "dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।",
+  "dismissable_banner.explore_statuses": "डेसेंट्रलीसेड नेटवर्क में इस और अन्य सर्वरों से ये पोस्ट अभी इस सर्वर पर कर्षण प्राप्त कर रहे हैं।",
+  "dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।",
+  "dismissable_banner.public_timeline": "ये इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों की सबसे हालिया सार्वजनिक पोस्ट हैं जिनके बारे में यह सर्वर जानता है।",
   "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
   "embed.preview": "यह ऐसा दिखेगा :",
   "emoji_button.activity": "गतिविधि",
+  "emoji_button.clear": "मिटा दें",
   "emoji_button.custom": "निजीकृत",
   "emoji_button.flags": "झंडे",
   "emoji_button.food": "भोजन एवं पेय",
@@ -157,47 +208,70 @@
   "emoji_button.search_results": "खोज परिणाम",
   "emoji_button.symbols": "प्रतीक",
   "emoji_button.travel": "यात्रा एवं स्थान",
-  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_suspended": "खाता निलंबित",
   "empty_column.account_timeline": "सन्नाटा! यहां कोई टूट्स नहीं!",
   "empty_column.account_unavailable": "प्रोफाइल उपलब्ध नहीं",
   "empty_column.blocks": "आप अभी तक किसी भी यूजर के द्वारा ब्लॉक्ड नहीं हो।",
   "empty_column.bookmarked_statuses": "आपके पास अभी तक कोई बुकमार्क नहीं है। जब आप एक बुकमार्क करते हैं, तो यह यहां दिखाई देगा।",
   "empty_column.community": "लोकल टाइम्लाइन खाली है, कुछ देखने के लिये सार्वजनिक रूप से कुछ लिखें!",
-  "empty_column.direct": "आपके पास कोई सीधा सन्देश नहीं है, जब आप कोई भेजेंगे प्राप्त करेंगे तो यहाँ दिखेगा।",
+  "empty_column.direct": "आपके पास अभी तक कोई सीधा संदेश नहीं है, जब आप भेजेंगे या प्राप्त करेंगे तो ये यहाँ दिखेगा |",
   "empty_column.domain_blocks": "अभी तक कोई छुपा हुआ डोमेन नहीं है।",
+  "empty_column.explore_statuses": "कुछ भी अभी ट्रैंडिंग नहीं है, कुछ देर बाद जांचे!",
   "empty_column.favourited_statuses": "आपके पास अभी कोई भी चहिता टूट नहीं है. जब आप किसी टूट को पसंद (स्टार) करेंगे, तब वो यहाँ दिखेगा।",
   "empty_column.favourites": "अभी तक किसी ने भी इस टूट को पसंद (स्टार) नहीं किया है. जब भी कोई इसे पसंद करेगा, उनका नाम यहाँ दिखेगा।",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_recommendations": "ऐसा लगता है कि आपके लिए कोई सुझाव जेनरेट नहीं किया जा सका. आप उन लोगों को खोजने के लिए सर्च का उपयोग करने का प्रयास कर सकते हैं जिन्हें आप जानते हैं या ट्रेंडिंग हैशटैग का पता लगा सकते हैं।",
   "empty_column.follow_requests": "अभी तक किसी ने भी आपका अनुसरण करने की विनती नहीं की है. जब भी कोई आपको विनती भेजेगा, वो यहाँ दिखेगी.",
   "empty_column.hashtag": "यह हैशटैग अभी तक खाली है।",
   "empty_column.home": "आपकी मुख्य कालक्रम अभी खली है. अन्य उपयोगकर्ताओं से मिलने के लिए और अपनी गतिविधियां शुरू करने के लिए या तो {public} पर जाएं या खोज का उपयोग करें।",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home.suggestions": "कुछ सुझाव देखिए",
   "empty_column.list": "यह सूची अभी खाली है. जब इसके सदस्य कोई अभिव्यक्ति देंगे, तो वो यहां दिखाई देंगी.",
   "empty_column.lists": "आपके पास अभी तक कोई सूची नहीं है। जब आप एक बनाते हैं, तो यह यहां दिखाई देगा।",
   "empty_column.mutes": "आपने अभी तक किसी भी उपयोगकर्ता को म्यूट नहीं किया है।",
   "empty_column.notifications": "आपके पास अभी तक कोई सूचना नहीं है। बातचीत शुरू करने के लिए दूसरों के साथ बातचीत करें।",
   "empty_column.public": "यहां कुछ नहीं है! सार्वजनिक रूप से कुछ लिखें, या इसे भरने के लिए अन्य सर्वर से उपयोगकर्ताओं का मैन्युअल रूप से अनुसरण करें",
   "error.unexpected_crash.explanation": "हमारे कोड या ब्राउज़र संगतता समस्या में बग के कारण, यह पृष्ठ सही ढंग से प्रदर्शित नहीं हो सका।",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.explanation_addons": "यह पेज सही ढंग से प्रदर्शित नहीं किया जा सका। यह त्रुटि संभवतः ब्राउज़र ऐड-ऑन या स्वचालित अनुवाद टूल के कारण हुई है।",
+  "error.unexpected_crash.next_steps": "पेज को रीफ्रेश करने का प्रयास करें। यदि वह मदद नहीं करता है, तो आप अभी भी मास्टोडन का उपयोग किसी भिन्न ब्राउज़र या नेटिव ऐप के माध्यम से कर सकते हैं।",
+  "error.unexpected_crash.next_steps_addons": "उन्हें अक्षम करने और पृष्ठ को ताज़ा करने का प्रयास करें। यदि वह मदद नहीं करता है, तो आप अभी भी मास्टोडन का उपयोग किसी भिन्न ब्राउज़र या नेटिव ऐप के माध्यम से कर सकते हैं।",
   "errors.unexpected_crash.copy_stacktrace": "स्टैकट्रेस को क्लिपबोर्ड पर कॉपी करें",
   "errors.unexpected_crash.report_issue": "समस्या सूचित करें",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "explore.search_results": "सर्च रिजल्ट्स",
+  "explore.suggested_follows": "For you",
+  "explore.title": "एक्स्प्लोर",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "यह फ़िल्टर श्रेणी उस संदर्भ पर लागू नहीं होती जिसमें आपने इस पोस्ट को एक्सेस किया है। यदि आप चाहते हैं कि इस संदर्भ में भी पोस्ट को फ़िल्टर किया जाए, तो आपको फ़िल्टर को एडिट करना होगा।",
+  "filter_modal.added.context_mismatch_title": "कंटेंट मिसमैच!",
+  "filter_modal.added.expired_explanation": "यह फ़िल्टर श्रेणी समाप्त हो गई है, इसे लागू करने के लिए आपको समाप्ति तिथि बदलनी होगी।",
+  "filter_modal.added.expired_title": "एक्सपीरेड फ़िल्टर!",
+  "filter_modal.added.review_and_configure": "इस फ़िल्टर श्रेणी की समीक्षा करने और आगे कॉन्फ़िगर करने के लिए,{settings_link} पर जाएँ",
+  "filter_modal.added.review_and_configure_title": "फ़िल्टर सेटिंग्स",
+  "filter_modal.added.settings_link": "सेटिंग्स पेज",
+  "filter_modal.added.short_explanation": "इस पोस्ट को निम्न फ़िल्टर श्रेणी में जोड़ा गया है:{title}",
+  "filter_modal.added.title": "फ़िल्टर एडेड",
+  "filter_modal.select_filter.context_mismatch": "इस संदर्भ में लागू नहीं होता",
+  "filter_modal.select_filter.expired": "एक्सपीरेड",
+  "filter_modal.select_filter.prompt_new": "नई श्रेणी:{name}",
+  "filter_modal.select_filter.search": "खोजें या बनाएं",
+  "filter_modal.select_filter.subtitle": "किसी मौजूदा श्रेणी का उपयोग करें या एक नया बनाएं",
+  "filter_modal.select_filter.title": "इस पोस्ट को फ़िल्टर करें",
+  "filter_modal.title.status": "किसी पोस्ट को फ़िल्टर करें",
+  "follow_recommendations.done": "पूर्ण",
+  "follow_recommendations.heading": "उन लोगों का अनुसरण करें जिनकी पोस्ट आप देखना चाहते हैं! यहाँ कुछ सुझाव हैं।",
+  "follow_recommendations.lead": "आपके द्वारा फ़ॉलो किए जाने वाले लोगों के पोस्ट आपके होम फ़ीड पर कालानुक्रमिक क्रम में दिखाई देंगे। गलतियाँ करने से न डरें, आप किसी भी समय लोगों को उतनी ही आसानी से अनफ़ॉलो कर सकते हैं!",
   "follow_request.authorize": "अधिकार दें",
   "follow_request.reject": "अस्वीकार करें",
   "follow_requests.unlocked_explanation": "हालाँकि आपका खाता लॉक नहीं है, फिर भी {domain} डोमेन स्टाफ ने सोचा कि आप इन खातों के मैन्युअल अनुरोधों की समीक्षा करना चाहते हैं।",
-  "generic.saved": "Saved",
-  "getting_started.developers": "डेवॅलपर्स",
-  "getting_started.directory": "प्रोफ़ाइल निर्देशिका",
-  "getting_started.documentation": "प्रलेखन",
+  "footer.about": "अबाउट",
+  "footer.directory": "प्रोफाइल्स डायरेक्टरी",
+  "footer.get_app": "अप्प प्राप्त करें",
+  "footer.invite": "लोगों को आमंत्रित करें",
+  "footer.keyboard_shortcuts": "कीबोर्ड शॉर्टकट",
+  "footer.privacy_policy": "प्राइवेसी पालिसी",
+  "footer.source_code": "सोर्स कोड देखें",
+  "generic.saved": "सेव्ड",
   "getting_started.heading": "पहले कदम रखें",
-  "getting_started.invite": "दोस्तों को आमंत्रित करें",
-  "getting_started.open_source_notice": "मास्टोडॉन एक मुक्त स्रोत सॉफ्टवेयर है. आप गिटहब {github} पर इस सॉफ्टवेयर में योगदान या किसी भी समस्या को सूचित कर सकते है.",
-  "getting_started.security": "अकाउंट सेटिंग्स",
-  "getting_started.terms": "सेवा की शर्तें",
   "hashtag.column_header.tag_mode.all": "और {additional}",
   "hashtag.column_header.tag_mode.any": "या {additional}",
   "hashtag.column_header.tag_mode.none": "बिना {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "इनमें से कोई भी",
   "hashtag.column_settings.tag_mode.none": "इनमें से कोई भी नहीं",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "हैशटैग को फॉलो करें",
+  "hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
   "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
   "home.hide_announcements": "घोषणाएँ छिपाएँ",
   "home.show_announcements": "घोषणाएं दिखाएं",
+  "interaction_modal.description.favourite": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट को पसंदीदा बना सकते हैं ताकि लेखक को यह पता चल सके कि आप इसकी सराहना करते हैं और इसे बाद के लिए सहेज सकते हैं।",
+  "interaction_modal.description.follow": "मास्टोडन पर एक अकाउंट के साथ, आप अपने होम फीड में उनकी पोस्ट प्राप्त करने के लिए {name} का अनुसरण कर सकते हैं",
+  "interaction_modal.description.reblog": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट को अपने फोल्लोवेर्स के साथ साझा करने के लिए बढ़ा सकते हैं।",
+  "interaction_modal.description.reply": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट का जवाब दे सकते हैं।",
+  "interaction_modal.on_another_server": "एक अलग सर्वर पर",
+  "interaction_modal.on_this_server": "इस सर्वर पे",
+  "interaction_modal.other_server_instructions": "इस URL को अपने पसंदीदा Mastodon ऐप या अपने Mastodon सर्वर के वेब इंटरफ़ेस के खोज फ़ील्ड में कॉपी और पेस्ट करें।",
+  "interaction_modal.preamble": "चूंकि मास्टोडन डेसेंट्रलीसेड है, यदि आपके पास इस पर कोई अकाउंट नहीं है, तो आप किसी अन्य मास्टोडन सर्वर या संगत प्लेटफ़ॉर्म द्वारा होस्ट किए गए अपने मौजूदा अकाउंट का उपयोग कर सकते हैं।",
+  "interaction_modal.title.favourite": "पसंदीदा {name} की पोस्ट",
+  "interaction_modal.title.follow": "फॉलो {name}",
+  "interaction_modal.title.reblog": "बूस्ट {name} की पोस्ट",
+  "interaction_modal.title.reply": "{name} की पोस्ट पे रिप्लाई करें",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "कंपोज़ टेक्स्ट-एरिया पर ध्यान केंद्रित करने के लिए",
   "keyboard_shortcuts.description": "विवरण",
-  "keyboard_shortcuts.direct": "सीधा सन्देश कॉलम को खोलने के लिए",
+  "keyboard_shortcuts.direct": "डायरेक्ट मैसेज कॉलम खोलने के लिए",
   "keyboard_shortcuts.down": "सूची में शामिल करने के लिए",
   "keyboard_shortcuts.enter": "स्टेटस खोलने के लिए",
   "keyboard_shortcuts.favourite": "पसंदीदा के लिए",
@@ -250,21 +338,23 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "बंद करें",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "कंप्रेस इमेज व्यू बॉक्स",
+  "lightbox.expand": "एक्सपैंड इमेज व्यू बॉक्स",
   "lightbox.next": "अगला",
   "lightbox.previous": "पिछला",
-  "lists.account.add": "Add to list",
+  "limited_account_hint.action": "फिर भी प्रोफाइल दिखाओ",
+  "limited_account_hint.title": "यह प्रोफ़ाइल {domain} के मॉडरेटर द्वारा छिपाई गई है.",
+  "lists.account.add": "ऐड तो लिस्ट",
   "lists.account.remove": "सूची से निकालें",
   "lists.delete": "सूची हटाएँ",
   "lists.edit": "सूची संपादित करें",
-  "lists.edit.submit": "Change title",
+  "lists.edit.submit": "शीर्षक बदलें",
   "lists.new.create": "सूची जोड़ें",
   "lists.new.title_placeholder": "नये सूची का शीर्षक",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
+  "lists.replies_policy.followed": "अन्य फोल्लोवेद यूजर",
+  "lists.replies_policy.list": "सूची के सदस्य",
+  "lists.replies_policy.none": "कोई नहीं",
+  "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "आपकी सूचियाँ",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "नहीं मिला",
   "missing_indicator.sublabel": "यह संसाधन नहीं मिल सका।",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "मोबाइल एप्लिकेशंस",
+  "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
   "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
   "navigation_bar.compose": "नया टूट् लिखें",
-  "navigation_bar.direct": "सीधा संदेश",
+  "navigation_bar.direct": "प्रत्यक्ष संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.explore": "अन्वेषण करें",
+  "navigation_bar.favourites": "पसंदीदा",
+  "navigation_bar.filters": "वारित शब्द",
   "navigation_bar.follow_requests": "अनुसरण करने के अनुरोध",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "इस सर्वर के बारे में",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "सूचियाँ",
   "navigation_bar.logout": "बाहर जाए",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
-  "navigation_bar.security": "Security",
+  "navigation_bar.search": "ढूंढें",
+  "navigation_bar.security": "सुरक्षा",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "नई रिपोर्ट:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
   "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
-  "notifications.column_settings.filter_bar.show": "दिखाएँ",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "नए फ़ॉलोअर्स",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "उल्लेख:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "कॉलम में दिखाएँ",
   "notifications.column_settings.sound": "ध्वनि चलाएँ",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "संपादन:",
   "notifications.filter.all": "सभी",
   "notifications.filter.boosts": "बूस्ट",
   "notifications.filter.favourites": "पसंदीदा",
@@ -330,7 +429,7 @@
   "notifications.filter.mentions": "उल्लेख",
   "notifications.filter.polls": "चुनाव परिणाम",
   "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
+  "notifications.grant_permission": "अनुमति दें",
   "notifications.group": "{count} सूचनाएँ",
   "notifications.mark_as_read": "Mark every notification as read",
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
@@ -351,41 +450,97 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "सीधा",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सार्वजनिक टाइम्लाइन पर भेजें",
+  "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "अनलिस्टेड",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "अभी-अभी",
+  "relative_time.full.minutes": "{number, plural, one {# मिनट} other {# मिनट}} पहले",
+  "relative_time.full.seconds": "{number, plural, one {# सेकंड} other {# सेकंड}} पहले",
+  "relative_time.hours": "{number} घंटे",
   "relative_time.just_now": "अभी",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
+  "relative_time.minutes": "{number} मिनट",
+  "relative_time.seconds": "{number} सेकंड",
+  "relative_time.today": "आज",
   "reply_indicator.cancel": "रद्द करें",
+  "report.block": "Block",
+  "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।",
+  "report.categories.other": "अन्य",
+  "report.categories.spam": "अवांछित",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "रूपरेखा",
+  "report.category.title_status": "post",
+  "report.close": "स्वीकार करें",
+  "report.comment.title": "क्या और कुछ है जिसके बारे में आपको लगता है कि हमें सूचित होना चाहिए?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "मुझे यह पसंद नहीं है",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "कुछ और है।",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "सबमिट करें",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "खोजें",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.hashtag": "हैशटैग",
   "search_popout.tips.status": "status",
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "{name} का उत्तर दें",
   "status.reply": "जवाब",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "संवेदनशील विषय वस्तु",
   "status.share": "शेयर करें",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "कम दिखाएँ",
   "status.show_less_all": "Show less for all",
   "status.show_more": "और दिखाएँ",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "{provider} का उपयोग करते हुये {lang} से अनुवादित किया गया",
   "status.uncached_media_warning": "अनुपलब्ध",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "फ़ेडरेटेड",
   "tabs_bar.home": "होम",
   "tabs_bar.local_timeline": "लोकल",
   "tabs_bar.notifications": "सूचनाएँ",
-  "tabs_bar.search": "खोजें",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "संशोधन करें",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "मिटाए",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "अपलोडिंग...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "फाइल डाउनलोड करें",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index d11c73860..0cd77dfa8 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Bilješka",
   "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
   "account.badges.bot": "Bot",
@@ -7,68 +19,90 @@
   "account.block_domain": "Blokiraj domenu {domain}",
   "account.blocked": "Blokirano",
   "account.browse_more_on_origin_server": "Pogledajte više na izvornom profilu",
-  "account.cancel_follow_request": "Otkaži zahtjev za praćenje",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Pošalji poruku @{name}",
   "account.disable_notifications": "Nemoj me obavjestiti kada @{name} napravi objavu",
   "account.domain_blocked": "Domena je blokirana",
   "account.edit_profile": "Uredi profil",
   "account.enable_notifications": "Obavjesti me kada @{name} napravi objavu",
   "account.endorse": "Istakni na profilu",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Prati",
   "account.followers": "Pratitelji",
   "account.followers.empty": "Nitko još ne prati korisnika/cu.",
   "account.followers_counter": "{count, plural, one {{counter} pratitelj} other {{counter} pratitelja}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} praćeni} few{{counter} praćena} other {{counter} praćenih}}",
   "account.follows.empty": "Korisnik/ca još ne prati nikoga.",
   "account.follows_you": "Prati te",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Sakrij boostove od @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Posljednja aktivnost",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Vlasništvo ove poveznice provjereno je {date}",
   "account.locked_info": "Status privatnosti ovog računa postavljen je na zaključano. Vlasnik ručno pregledava tko ih može pratiti.",
   "account.media": "Medijski sadržaj",
   "account.mention": "Spomeni @{name}",
-  "account.moved_to": "Račun {name} je premješten na:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Utišaj @{name}",
   "account.mute_notifications": "Utišaj obavijesti od @{name}",
   "account.muted": "Utišano",
-  "account.never_active": "Nikad",
+  "account.open_original_page": "Open original page",
   "account.posts": "Tootovi",
   "account.posts_with_replies": "Tootovi i odgovori",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čekanje na potvrdu. Kliknite za otkazivanje zahtjeva za praćenje",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Podijeli profil @{name}",
   "account.show_reblogs": "Prikaži boostove od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toota}}",
   "account.unblock": "Deblokiraj @{name}",
   "account.unblock_domain": "Deblokiraj domenu {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Ne ističi na profilu",
   "account.unfollow": "Prestani pratiti",
   "account.unmute": "Poništi utišavanje @{name}",
   "account.unmute_notifications": "Ne utišavaj obavijesti od @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Kliknite za dodavanje bilješke",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Prosječno",
+  "admin.dashboard.retention.cohort": "Mjesec prijave",
+  "admin.dashboard.retention.cohort_size": "Novi korisnici",
   "alert.rate_limited.message": "Molimo pokušajte nakon {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ograničenje učestalosti",
   "alert.unexpected.message": "Dogodila se neočekivana greška.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Najava",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(neobrađeno)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
-  "bundle_column_error.body": "Nešto je pošlo po zlu tijekom učitavanja ove komponente.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Pokušajte ponovno",
-  "bundle_column_error.title": "Greška mreže",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto je pošlo po zlu tijekom učitavanja ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovno",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Knjižne oznake",
   "column.community": "Lokalna vremenska crta",
-  "column.direct": "Izravne poruke",
+  "column.direct": "Direct messages",
   "column.directory": "Pregledavanje profila",
   "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Favoriti",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Samo lokalno",
   "community.column_settings.media_only": "Samo medijski sadržaj",
   "community.column_settings.remote_only": "Samo udaljeno",
-  "compose_form.direct_message_warning": "Ovaj toot bit će poslan samo spomenutim korisnicima.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Saznajte više",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ovaj toot neće biti prikazan ni pod jednim hashtagom jer je postavljen kao neprikazan. Samo javni tootovi mogu biti pretraživani pomoći hashtagova.",
   "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Ukloni ovu opciju",
   "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
   "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
-  "compose_form.publish": "Tootni",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
   "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
   "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.block.message": "Sigurno želite blokirati {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Obriši",
   "confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
   "confirmations.delete_list.confirm": "Obriši",
   "confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Odbaciti",
+  "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
   "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
   "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
   "confirmations.logout.confirm": "Odjavi se",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
   "conversation.with": "S {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Iz znanog fediversa",
   "directory.local": "Samo iz {domain}",
   "directory.new_arrivals": "Novi korisnici",
   "directory.recently_active": "Nedavno aktivni",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Evo kako će izgledati:",
   "emoji_button.activity": "Aktivnost",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Prilagođeno",
   "emoji_button.flags": "Zastave",
   "emoji_button.food": "Hrana i piće",
@@ -165,39 +216,62 @@
   "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Još nema blokiranih domena.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_recommendations": "Čini se da se ne postoje sugestije generirane za tebe. Možeš pokušati koristiti pretragu kako bi pronašao osobe koje poznaš ili istraži popularne hashtagove.",
+  "empty_column.follow_requests": "Nemaš niti jedan zahtjev za praćenjem. Ako ga dobiješ, prikazat će se ovdje.",
   "empty_column.hashtag": "Još ne postoji ništa s ovim hashtagom.",
   "empty_column.home": "Vaša početna vremenska crta je prazna! Posjetite {public} ili koristite tražilicu kako biste započeli i upoznali druge korisnike.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home.suggestions": "Pogledajte neke prijedloge",
   "empty_column.list": "Na ovoj listi još nema ničega. Kada članovi ove liste objave nove tootove, oni će se pojaviti ovdje.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.lists": "Nemaš niti jednu listu. Kada je kreiraš, prikazat će se ovdje.",
   "empty_column.mutes": "Niste utišali nijednog korisnika.",
   "empty_column.notifications": "Još nemate obavijesti. Komunicirajte s drugima kako biste započeli razgovor.",
   "empty_column.public": "Ovdje nema ništa! Napišite nešto javno ili ručno pratite korisnike s drugi poslužitelja da biste ovo popunili",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "error.unexpected_crash.explanation": "Zbog bug-a u našem kodu ili zbog nekompatibilnosti pretraživača, ova stranica se ne može prikazati ispravno.",
+  "error.unexpected_crash.explanation_addons": "Ova stranica ne može biti ispravno prikazana. Ova greška je uzrokovana dodatkom za browser ili alatom za automatsko prevođenje.",
+  "error.unexpected_crash.next_steps": "Pokušaj osvježiti stranicu. Ako to ne pomogne, i dalje ćeš biti u mogućnosti koristiti Mastodon preko nekod drugog preglednika ili izvornog app-a.",
+  "error.unexpected_crash.next_steps_addons": "Pokušaj ih onemogućiti i osvježiti stranicu. Ako to ne pomogne, i dalje ćeš biti u mogućnosti koristiti Mastodon preko nekog drugog preglednika ili izvornog app-a.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiraj stacktrace u međuspremnik",
   "errors.unexpected_crash.report_issue": "Prijavi problem",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Učinjeno",
+  "follow_recommendations.heading": "Zaprati osobe čije objave želiš vidjeti! Evo nekoliko prijedloga.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Autoriziraj",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Spremljeno",
-  "getting_started.developers": "Razvijatelji",
-  "getting_started.directory": "Direktorij profila",
-  "getting_started.documentation": "Dokumentacija",
   "getting_started.heading": "Počnimo",
-  "getting_started.invite": "Pozovi ljude",
-  "getting_started.open_source_notice": "Mastodon je softver otvorenog kôda. Možete pridonijeti ili prijaviti probleme na GitHubu na {github}.",
-  "getting_started.security": "Postavke računa",
-  "getting_started.terms": "Uvjeti pružanja usluga",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "ili {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Bilo koji navedeni",
   "hashtag.column_settings.tag_mode.none": "Nijedan navedeni",
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Sakrij najave",
   "home.show_announcements": "Prikaži najave",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
   "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minute} other {# minuta}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "za fokusiranje na toot u jednom od stupaca",
   "keyboard_shortcuts.compose": "za fokusiranje na tekstualni okvir za stvaranje",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "za otvaranje stupca s izravnim porukama",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "za pomak dolje na listi",
   "keyboard_shortcuts.enter": "za otvaranje toota",
   "keyboard_shortcuts.favourite": "za označavanje favoritom",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Sljedeće",
   "lightbox.previous": "Prethodno",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni s liste",
   "lists.delete": "Izbriši listu",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
   "missing_indicator.label": "Nije pronađeno",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Trajanje",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobilne aplikacije",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Izravne poruke",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
   "navigation_bar.follow_requests": "Zahtjevi za praćenje",
   "navigation_bar.follows_and_followers": "Praćeni i pratitelji",
-  "navigation_bar.info": "O ovom poslužitelju",
-  "navigation_bar.keyboard_shortcuts": "Tipkovnički prečaci",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Odjavi se",
   "navigation_bar.mutes": "Utišani korisnici",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Prikvačeni tootovi",
   "navigation_bar.preferences": "Postavke",
   "navigation_bar.public_timeline": "Federalna vremenska crta",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Sigurnost",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} je favorizirao/la Vaš toot",
   "notification.follow": "{name} Vas je počeo/la pratiti",
   "notification.follow_request": "{name} zatražio/la je da Vas prati",
@@ -306,13 +400,16 @@
   "notification.poll": "Anketa u kojoj ste glasali je završila",
   "notification.reblog": "{name} je boostao/la Vaš status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Obavijesti radne površine",
   "notifications.column_settings.favourite": "Favoriti:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
   "notifications.column_settings.filter_bar.category": "Brza traka filtera",
-  "notifications.column_settings.filter_bar.show": "Prikaži",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Novi pratitelji:",
   "notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
   "notifications.column_settings.mention": "Spominjanja:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Prikaži u stupcu",
   "notifications.column_settings.sound": "Sviraj zvuk",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Sve",
   "notifications.filter.boosts": "Boostovi",
   "notifications.filter.favourites": "Favoriti",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
   "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Izravno",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Samo pratitelji",
-  "privacy.public.long": "Vidljivo svima, prikazano u javim vremenskim crtama",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali se ne prikazuje u javnim vremenskim crtama",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Neprikazano",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Osvježi",
   "regeneration_indicator.label": "Učitavanje…",
   "regeneration_indicator.sublabel": "Priprema se Vaša početna stranica!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "sada",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "danas",
   "reply_indicator.cancel": "Otkaži",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Proslijedi {target}",
   "report.forward_hint": "Račun je s drugog poslužitelja. Poslati anonimiziranu kopiju prijave i tamo?",
-  "report.hint": "Prijava bit će poslana moderatorima poslužitelja. Ispod možete dati objašnjenje zašto prijavljujete ovaj račun:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Dodatni komentari",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje korisnika {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Traži",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Format naprednog pretraživanja",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "korisnik",
   "search_results.accounts": "Ljudi",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Obriši",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Označi favoritom",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Učitaj više",
   "status.media_hidden": "Sakriven medijski sadržaj",
   "status.mention": "Spomeni @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Nitko još nije boostao ovaj toot. Kada netko to učini, ovdje će biti prikazani.",
   "status.redraft": "Izbriši i ponovno uredi",
   "status.remove_bookmark": "Ukloni knjižnu oznaku",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na niz",
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osjetljiv sadržaj",
   "status.share": "Podijeli",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Pokaži manje",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Pokaži više",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Prikaži nit",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Nije dostupno",
   "status.unmute_conversation": "Poništi utišavanje razgovora",
   "status.unpin": "Otkvači s profila",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Odbaci prijedlog",
   "suggestions.header": "Možda Vas zanima…",
   "tabs_bar.federated_timeline": "Federalno",
   "tabs_bar.home": "Početna",
   "tabs_bar.local_timeline": "Lokalno",
   "tabs_bar.notifications": "Obavijesti",
-  "tabs_bar.search": "Traži",
   "time_remaining.days": "{number, plural, one {preostao # dan} other {preostalo # dana}}",
   "time_remaining.hours": "{number, plural, one {preostao # sat} few {preostalo # sata} other {preostalo # sati}}",
   "time_remaining.minutes": "{number, plural, one {preostala # minuta} few {preostale # minute} other {preostalo # minuta}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Pratitelji",
   "timeline_hint.resources.follows": "Praćenja",
   "timeline_hint.resources.statuses": "Stariji tootovi",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Popularno",
   "ui.beforeunload": "Vaša skica bit će izgubljena ako napustite Mastodon.",
   "units.short.billion": "{count} mlrd.",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
   "upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
   "upload_form.description": "Opišite za ljude sa slabim vidom",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promijeni pretpregled",
   "upload_form.undo": "Obriši",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Prenošenje...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Zatvori video",
   "video.download": "Preuzmi datoteku",
   "video.exit_fullscreen": "Izađi iz cijelog zaslona",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index db08bfc75..15c1a7ad7 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderált kiszolgálók",
+  "about.contact": "Kapcsolat:",
+  "about.disclaimer": "A Mastodon ingyenes, nyílt forráskódú szoftver, a Mastodon gGmbH védejegye.",
+  "about.domain_blocks.no_reason_available": "Nem áll rendelkezésre indoklás",
+  "about.domain_blocks.preamble": "A Mastodon általában mindenféle tartalomcserét és interakciót lehetővé tesz bármelyik másik kiszolgálóval a födiverzumban. Ezek azok a kivételek, amelyek a mi kiszolgálónkon érvényben vannak.",
+  "about.domain_blocks.silenced.explanation": "Általában nem fogsz profilokat és tartalmat látni erről a kiszolgálóról, hacsak közvetlenül fel nem keresed vagy követed.",
+  "about.domain_blocks.silenced.title": "Korlátozott",
+  "about.domain_blocks.suspended.explanation": "A kiszolgáló adatai nem lesznek feldolgozva, tárolva vagy megosztva, lehetetlenné téve mindennemű interakciót és kommunikációt a kiszolgáló felhasználóival.",
+  "about.domain_blocks.suspended.title": "Felfüggesztett",
+  "about.not_available": "Ez az információ nem lett közzétéve ezen a kiszolgálón.",
+  "about.powered_by": "Decentralizált közösségi média a {mastodon} segítségével",
+  "about.rules": "Kiszolgáló szabályai",
   "account.account_note_header": "Jegyzet",
   "account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listákról",
   "account.badges.bot": "Bot",
@@ -7,70 +19,92 @@
   "account.block_domain": "Domain blokkolása: {domain}",
   "account.blocked": "Letiltva",
   "account.browse_more_on_origin_server": "Böngéssz tovább az eredeti profilon",
-  "account.cancel_follow_request": "Követési kérelem visszavonása",
+  "account.cancel_follow_request": "Követési kérés visszavonása",
   "account.direct": "Közvetlen üzenet @{name} számára",
   "account.disable_notifications": "Ne figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.domain_blocked": "Letiltott domain",
   "account.edit_profile": "Profil szerkesztése",
   "account.enable_notifications": "Figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.endorse": "Kiemelés a profilodon",
+  "account.featured_tags.last_status_at": "Legutolsó bejegyzés ideje: {date}",
+  "account.featured_tags.last_status_never": "Nincs bejegyzés",
+  "account.featured_tags.title": "{name} kiemelt hashtagjei",
   "account.follow": "Követés",
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
-  "account.followers_counter": "{count, plural, one {{counter} követő} other {{counter} követő}}",
-  "account.following_counter": "{count, plural, other {{counter} Követett}}",
+  "account.followers_counter": "{count, plural, one {{counter} Követő} other {{counter} Követő}}",
+  "account.following": "Követve",
+  "account.following_counter": "{count, plural, one {{counter} Követett} other {{counter} Követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
   "account.follows_you": "Követ téged",
+  "account.go_to_profile": "Ugrás a profilhoz",
   "account.hide_reblogs": "@{name} megtolásainak elrejtése",
-  "account.joined": "Csatlakozott {date}",
-  "account.last_status": "Utoljára aktív",
+  "account.joined_short": "Csatlakozott",
+  "account.languages": "Feliratkozott nyelvek módosítása",
   "account.link_verified_on": "A linket eredetiségét ebben az időpontban ellenőriztük: {date}",
   "account.locked_info": "Ennek a fióknak zárolt a láthatósága. A tulajdonos kézzel engedélyezi, hogy ki követheti őt.",
   "account.media": "Média",
   "account.mention": "@{name} említése",
-  "account.moved_to": "{name} átköltözött:",
+  "account.moved_to": "{name} jelezte, hogy az új fiókja a következő:",
   "account.mute": "@{name} némítása",
   "account.mute_notifications": "@{name} értesítéseinek némítása",
   "account.muted": "Némítva",
-  "account.never_active": "Soha",
+  "account.open_original_page": "Eredeti oldal megnyitása",
   "account.posts": "Bejegyzések",
   "account.posts_with_replies": "Bejegyzések és válaszok",
   "account.report": "@{name} jelentése",
-  "account.requested": "Engedélyre vár. Kattints a követési kérés visszavonásához",
+  "account.requested": "Jóváhagysára vár. Kattints a követési kérés visszavonásához",
+  "account.requested_follow": "{name} kérte, hogy követhessen téged",
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
   "account.statuses_counter": "{count, plural, one {{counter} Bejegyzés} other {{counter} Bejegyzés}}",
-  "account.unblock": "@{name} letiltásának feloldása",
-  "account.unblock_domain": "{domain} elrejtésének feloldása",
+  "account.unblock": "@{name} tiltásának feloldása",
+  "account.unblock_domain": "{domain} domain tiltás feloldása",
+  "account.unblock_short": "Tiltás feloldása",
   "account.unendorse": "Ne jelenjen meg a profilodon",
   "account.unfollow": "Követés megszüntetése",
-  "account.unmute": "@{name} némítás feloldása",
+  "account.unmute": "@{name} némításának feloldása",
   "account.unmute_notifications": "@{name} némított értesítéseinek feloldása",
-  "account_note.placeholder": "Klikk a feljegyzéshez",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "Némitás feloldása",
+  "account_note.placeholder": "Kattints jegyzet hozzáadásához",
+  "admin.dashboard.daily_retention": "Napi regisztráció utáni felhasználómegtartási arány",
+  "admin.dashboard.monthly_retention": "Havi regisztráció utáni felhasználómegtartási arány",
+  "admin.dashboard.retention.average": "Átlag",
+  "admin.dashboard.retention.cohort": "Regisztráció hónapja",
+  "admin.dashboard.retention.cohort_size": "Új felhasználók",
   "alert.rate_limited.message": "Próbáld újra {retry_time, time, medium} után.",
-  "alert.rate_limited.title": "Forgalomkorlátozás",
+  "alert.rate_limited.title": "Adatforgalom korlátozva",
   "alert.unexpected.message": "Váratlan hiba történt.",
   "alert.unexpected.title": "Hoppá!",
   "announcement.announcement": "Közlemény",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(feldolgozatlan)",
+  "audio.hide": "Hang elrejtése",
   "autosuggest_hashtag.per_week": "{count} hetente",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
-  "bundle_column_error.body": "Valami hiba történt a komponens betöltése közben.",
+  "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
+  "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
+  "bundle_column_error.error.title": "Jaj ne!",
+  "bundle_column_error.network.body": "Hiba történt az oldal betöltése során. Ezt az internetkapcsolat ideiglenes problémája vagy kiszolgálóhiba is okozhatja.",
+  "bundle_column_error.network.title": "Hálózati hiba",
   "bundle_column_error.retry": "Próbáld újra",
-  "bundle_column_error.title": "Hálózati hiba",
+  "bundle_column_error.return": "Vissza a kezdőlapra",
+  "bundle_column_error.routing.body": "A kért oldal nem található. Biztos, hogy a címsávban lévő webcím helyes?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Bezárás",
   "bundle_modal_error.message": "Hiba történt a komponens betöltésekor.",
   "bundle_modal_error.retry": "Próbáld újra",
+  "closed_registrations.other_server_instructions": "Mivel a Mastdon decentralizált, létrehozhatsz egy fiókot egy másik kiszolgálón és mégis kapcsolódhatsz ehhez.",
+  "closed_registrations_modal.description": "Fiók létrehozása a {domain} kiszolgálón jelenleg nem lehetséges, de jó, ha tudod, hogy nem szükséges fiókkal rendelkezni pont a {domain} kiszolgálón, hogy használhasd a Mastodont.",
+  "closed_registrations_modal.find_another_server": "Másik kiszolgáló keresése",
+  "closed_registrations_modal.preamble": "A Mastodon decentralizált, így teljesen mindegy, hol hozod létre a fiókodat, követhetsz és kapcsolódhatsz bárkivel ezen a kiszolgálón is. Saját magad is üzemeltethetsz kiszolgálót!",
+  "closed_registrations_modal.title": "Regisztráció a Mastodonra",
+  "column.about": "Névjegy",
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Könyvjelzők",
   "column.community": "Helyi idővonal",
   "column.direct": "Közvetlen üzenetek",
   "column.directory": "Profilok böngészése",
-  "column.domain_blocks": "Rejtett domainek",
+  "column.domain_blocks": "Letiltott tartománynevek",
   "column.favourites": "Kedvencek",
   "column.follow_requests": "Követési kérelmek",
   "column.home": "Kezdőlap",
@@ -84,14 +118,16 @@
   "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
   "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
   "column_header.pin": "Kitűzés",
-  "column_header.show_settings": "Beállítások mutatása",
+  "column_header.show_settings": "Beállítások megjelenítése",
   "column_header.unpin": "Kitűzés eltávolítása",
   "column_subheading.settings": "Beállítások",
   "community.column_settings.local_only": "Csak helyi",
   "community.column_settings.media_only": "Csak média",
   "community.column_settings.remote_only": "Csak távoli",
-  "compose_form.direct_message_warning": "Ezt a bejegyzést csak a benne megemlített felhasználók láthatják majd.",
+  "compose.language.change": "Nyelv megváltoztatása",
+  "compose.language.search": "Nyelv keresése...",
   "compose_form.direct_message_warning_learn_more": "Tudj meg többet",
+  "compose_form.encryption_warning": "A bejegyzések Mastodonon nem használnak végpontok közötti titkosítást. Ne ossz meg semmilyen érzékeny információt Mastodonon.",
   "compose_form.hashtag_warning": "Ez a bejegyzésed nem fog megjelenni semmilyen hashtag alatt, mivel listázatlan. Csak a nyilvános bejegyzések kereshetők hashtaggel.",
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "lezárva",
@@ -102,24 +138,28 @@
   "compose_form.poll.remove_option": "Lehetőség törlése",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
-  "compose_form.publish": "Tülk",
+  "compose_form.publish": "Közzététel",
+  "compose_form.publish_form": "Közzététel",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Módosítások mentése",
   "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
   "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
-  "compose_form.spoiler.marked": "A szöveg figyelmeztetés mögé van rejtve",
-  "compose_form.spoiler.unmarked": "A szöveg nem rejtett",
+  "compose_form.spoiler.marked": "Tartalmi figyelmeztetés törlése",
+  "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
   "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
   "confirmation_modal.cancel": "Mégse",
   "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
   "confirmations.block.message": "Biztos, hogy letiltod: {name}?",
+  "confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
+  "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
   "confirmations.delete.confirm": "Törlés",
   "confirmations.delete.message": "Biztos, hogy törölni szeretnéd ezt a bejegyzést?",
   "confirmations.delete_list.confirm": "Törlés",
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Elvetés",
+  "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
   "confirmations.domain_block.confirm": "Teljes domain elrejtése",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.logout.confirm": "Kijelentkezés",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
   "conversation.with": "{names}-el/al",
+  "copypaste.copied": "Másolva",
+  "copypaste.copy": "Másolás",
   "directory.federated": "Az ismert fediverzumból",
   "directory.local": "Csak innen: {domain}",
   "directory.new_arrivals": "Új csatlakozók",
   "directory.recently_active": "Nemrég aktív",
+  "disabled_account_banner.account_settings": "Fiókbeállítások",
+  "disabled_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva.",
+  "dismissable_banner.community_timeline": "Ezek a legfrissebb nyilvános bejegyzések, amelyeket a(z) {domain} kiszolgáló fiókjait használó emberek tették közzé.",
+  "dismissable_banner.dismiss": "Eltüntetés",
+  "dismissable_banner.explore_links": "Jelenleg ezekről a hírekről beszélgetnek az ezen és a decentralizált hálózat többi kiszolgálóján lévő emberek.",
+  "dismissable_banner.explore_statuses": "Jelenleg ezek a bejegyzések hódítanak teret ezen és a decentralizált hálózat egyéb kiszolgálóin.",
+  "dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret ezen és a decentralizált hálózat többi kiszolgálóján lévő emberek körében.",
+  "dismissable_banner.public_timeline": "Ezek a legfrissebb bejegyzések azoktól, akik a decentralizált hálózat más kiszolgálóin vannak, és ez a kiszolgáló tud róluk.",
   "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
   "embed.preview": "Így fog kinézni:",
   "emoji_button.activity": "Tevékenység",
+  "emoji_button.clear": "Törlés",
   "emoji_button.custom": "Egyéni",
   "emoji_button.flags": "Zászlók",
   "emoji_button.food": "Étel és Ital",
@@ -165,9 +216,10 @@
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
   "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
+  "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
   "empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.",
-  "empty_column.follow_recommendations": "Úgy tűnik, neked nem tudunk javaslatokat adni. Próbáld a keresést használni olyanok megtalálására, akiket ismerhetsz, vagy fedezd fel a trendi hastageket.",
+  "empty_column.follow_recommendations": "Úgy tűnik, neked nem tudunk javaslatokat adni. Próbáld a keresést használni olyanok megtalálására, akiket ismerhetsz, vagy fedezd fel a felkapott hastageket.",
   "empty_column.follow_requests": "Még nincs egy követési kérésed sem. Ha kapsz egyet, itt fogjuk feltüntetni.",
   "empty_column.hashtag": "Jelenleg nem található semmi ezzel a hashtaggel.",
   "empty_column.home": "A saját idővonalad üres! Látogasd meg a {public} oldalt vagy használd a keresőt, hogy megismerj másokat.",
@@ -176,28 +228,50 @@
   "empty_column.lists": "Még nem hoztál létre listát. Ha csinálsz egyet, itt látszik majd.",
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
   "empty_column.notifications": "Jelenleg nincsenek értesítéseid. Lépj kapcsolatba másokkal, hogy elindítsd a beszélgetést.",
-  "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más szervereken levő felhasználókat, hogy megtöltsd",
+  "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
   "error.unexpected_crash.explanation": "Egy hiba vagy böngésző inkompatibilitás miatt ez az oldal nem jeleníthető meg rendesen.",
   "error.unexpected_crash.explanation_addons": "Ezt az oldalt nem lehet helyesen megjeleníteni. Ezt a hibát valószínűleg egy böngésző beépülő vagy egy automatikus fordító okozza.",
   "error.unexpected_crash.next_steps": "Próbáld frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.",
   "error.unexpected_crash.next_steps_addons": "Próbáld letiltani őket és frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.",
   "errors.unexpected_crash.copy_stacktrace": "Veremkiíratás vágólapra másolása",
   "errors.unexpected_crash.report_issue": "Probléma jelentése",
+  "explore.search_results": "Keresési találatok",
+  "explore.suggested_follows": "Neked",
+  "explore.title": "Felfedezés",
+  "explore.trending_links": "Hírek",
+  "explore.trending_statuses": "Bejegyzések",
+  "explore.trending_tags": "Hashtagek",
+  "filter_modal.added.context_mismatch_explanation": "Ez a szűrőkategória nem érvényes abban a környezetben, amelyből elérted ezt a bejegyzést. Ha ebben a környezetben is szűrni szeretnéd a bejegyzést, akkor szerkesztened kell a szűrőt.",
+  "filter_modal.added.context_mismatch_title": "Környezeti eltérés.",
+  "filter_modal.added.expired_explanation": "Ez a szűrőkategória elévült, a használatához módosítanod kell az elévülési dátumot.",
+  "filter_modal.added.expired_title": "Elévült szűrő.",
+  "filter_modal.added.review_and_configure": "A szűrőkategória felülvizsgálatához és további beállításához ugorjon a {settings_link} oldalra.",
+  "filter_modal.added.review_and_configure_title": "Szűrőbeállítások",
+  "filter_modal.added.settings_link": "beállítások oldal",
+  "filter_modal.added.short_explanation": "A következő bejegyzés hozzá lett adva a következő szűrőkategóriához: {title}.",
+  "filter_modal.added.title": "Szűrő hozzáadva.",
+  "filter_modal.select_filter.context_mismatch": "nem érvényes erre a környezetre",
+  "filter_modal.select_filter.expired": "elévült",
+  "filter_modal.select_filter.prompt_new": "Új kategória: {name}",
+  "filter_modal.select_filter.search": "Keresés vagy létrehozás",
+  "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
+  "filter_modal.select_filter.title": "E bejegyzés szűrése",
+  "filter_modal.title.status": "Egy bejegyzés szűrése",
   "follow_recommendations.done": "Kész",
   "follow_recommendations.heading": "Kövesd azokat, akiknek a bejegyzéseit látni szeretnéd! Itt van néhány javaslat.",
   "follow_recommendations.lead": "Az általad követettek bejegyzései a saját idővonaladon fognak megjelenni időrendi sorrendben. Ne félj attól, hogy hibázol! A követést bármikor, ugyanilyen könnyen visszavonhatod!",
   "follow_request.authorize": "Engedélyezés",
   "follow_request.reject": "Elutasítás",
   "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni a fiók követési kéréseit.",
+  "footer.about": "Névjegy",
+  "footer.directory": "Profilok",
+  "footer.get_app": "Töltsd le az appot",
+  "footer.invite": "Mások meghívása",
+  "footer.keyboard_shortcuts": "Billentyűparancsok",
+  "footer.privacy_policy": "Adatvédelmi szabályzat",
+  "footer.source_code": "Forráskód megtekintése",
   "generic.saved": "Elmentve",
-  "getting_started.developers": "Fejlesztőknek",
-  "getting_started.directory": "Profilok",
-  "getting_started.documentation": "Dokumentáció",
   "getting_started.heading": "Első lépések",
-  "getting_started.invite": "Mások meghívása",
-  "getting_started.open_source_notice": "A Mastodon nyílt forráskódú szoftver. Közreműködhetsz vagy problémákat jelenthetsz a GitHubon: {github}.",
-  "getting_started.security": "Fiókbeállítások",
-  "getting_started.terms": "Felhasználási feltételek",
   "hashtag.column_header.tag_mode.all": "és {additional}",
   "hashtag.column_header.tag_mode.any": "vagy {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} nélkül",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Bármelyik",
   "hashtag.column_settings.tag_mode.none": "Egyik sem",
   "hashtag.column_settings.tag_toggle": "Új címkék felvétele ehhez az oszlophoz",
+  "hashtag.follow": "Hashtag követése",
+  "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "home.column_settings.basic": "Alapvető",
   "home.column_settings.show_reblogs": "Megtolások mutatása",
-  "home.column_settings.show_replies": "Válaszok mutatása",
+  "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
-  "home.show_announcements": "Közlemények mutatása",
+  "home.show_announcements": "Közlemények megjelenítése",
+  "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
+  "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
+  "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
+  "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
+  "interaction_modal.on_another_server": "Másik kiszolgálón",
+  "interaction_modal.on_this_server": "Ezen a kiszolgálón",
+  "interaction_modal.other_server_instructions": "Másold és illeszd be ezt a webcímet a kedvenc Mastodon alkalmazásod vagy a Mastodon-kiszolgálód webes felületének keresőmezőjébe.",
+  "interaction_modal.preamble": "Mivel a Mastodon decentralizált, használhatod egy másik Mastodon kiszolgálón, vagy kompatibilis szolgáltatáson lévő fiókodat, ha ezen a kiszolgálón nincs fiókod.",
+  "interaction_modal.title.favourite": "{name} bejegyzésének megjelölése kedvencként",
+  "interaction_modal.title.follow": "{name} követése",
+  "interaction_modal.title.reblog": "{name} bejegyzésének megtolása",
+  "interaction_modal.title.reply": "Válasz {name} bejegyzésére",
   "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
   "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
   "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "Fókuszálás egy oszlopra",
   "keyboard_shortcuts.compose": "fókuszálás a szerkesztési szövegdobozra",
   "keyboard_shortcuts.description": "Leírás",
-  "keyboard_shortcuts.direct": "Közvetlen üzenetek oszlopának megnyitása",
+  "keyboard_shortcuts.direct": "közvetlen üzenetek megnyitása",
   "keyboard_shortcuts.down": "lefele navigálás a listában",
   "keyboard_shortcuts.enter": "Bejegyzés megnyitása",
   "keyboard_shortcuts.favourite": "Bejegyzés kedvencnek jelölése",
@@ -242,10 +330,10 @@
   "keyboard_shortcuts.reply": "Válasz bejegyzésre",
   "keyboard_shortcuts.requests": "követési kérések listájának megnyitása",
   "keyboard_shortcuts.search": "fókuszálás a keresőre",
-  "keyboard_shortcuts.spoilers": "CW mező mutatása/elrejtése",
+  "keyboard_shortcuts.spoilers": "Tartalmi figyelmeztetés mező megjelenítése/elrejtése",
   "keyboard_shortcuts.start": "\"Első lépések\" megnyitása",
-  "keyboard_shortcuts.toggle_hidden": "tartalmi figyelmeztetéssel ellátott szöveg mutatása/elrejtése",
-  "keyboard_shortcuts.toggle_sensitivity": "média mutatása/elrejtése",
+  "keyboard_shortcuts.toggle_hidden": "Tartalmi figyelmeztetéssel ellátott szöveg megjelenítése/elrejtése",
+  "keyboard_shortcuts.toggle_sensitivity": "Média megjelenítése/elrejtése",
   "keyboard_shortcuts.toot": "Új bejegyzés írása",
   "keyboard_shortcuts.unfocus": "Szerkesztés/keresés fókuszból való kivétele",
   "keyboard_shortcuts.up": "felfelé mozdítás a listában",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Képnézet kinagyítása",
   "lightbox.next": "Következő",
   "lightbox.previous": "Előző",
+  "limited_account_hint.action": "Mindenképpen mutassa a profilt",
+  "limited_account_hint.title": "Ezt a profilt a(z) {domain} moderátorai elrejtették.",
   "lists.account.add": "Hozzáadás a listához",
   "lists.account.remove": "Eltávolítás a listából",
   "lists.delete": "Lista törlése",
@@ -269,13 +359,14 @@
   "lists.subheading": "Listáid",
   "load_pending": "{count, plural, one {# új elem} other {# új elem}}",
   "loading_indicator.label": "Betöltés...",
-  "media_gallery.toggle_visible": "Láthatóság állítása",
+  "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
   "missing_indicator.label": "Nincs találat",
   "missing_indicator.sublabel": "Ez az erőforrás nem található",
+  "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
   "mute_modal.duration": "Időtartam",
   "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
   "mute_modal.indefinite": "Határozatlan",
-  "navigation_bar.apps": "Mobil appok",
+  "navigation_bar.about": "Névjegy",
   "navigation_bar.blocks": "Letiltott felhasználók",
   "navigation_bar.bookmarks": "Könyvjelzők",
   "navigation_bar.community_timeline": "Helyi idővonal",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Rejtett domainek",
   "navigation_bar.edit_profile": "Profil szerkesztése",
+  "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
   "navigation_bar.follow_requests": "Követési kérelmek",
   "navigation_bar.follows_and_followers": "Követettek és követők",
-  "navigation_bar.info": "Erről a kiszolgálóról",
-  "navigation_bar.keyboard_shortcuts": "Gyorsbillentyűk",
   "navigation_bar.lists": "Listák",
   "navigation_bar.logout": "Kijelentkezés",
   "navigation_bar.mutes": "Némított felhasználók",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Kitűzött bejegyzések",
   "navigation_bar.preferences": "Beállítások",
   "navigation_bar.public_timeline": "Föderációs idővonal",
+  "navigation_bar.search": "Keresés",
   "navigation_bar.security": "Biztonság",
+  "not_signed_in_indicator.not_signed_in": "Az erőforrás eléréséhez be kell jelentkezned.",
+  "notification.admin.report": "{name} jelentette: {target}",
+  "notification.admin.sign_up": "{name} regisztrált",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} követni szeretne téged",
@@ -306,13 +400,16 @@
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.status": "{name} bejegyzést tett közzé",
+  "notification.update": "{name} szerkesztett egy bejegyzést",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
+  "notifications.column_settings.admin.report": "Új jelentések:",
+  "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
-  "notifications.column_settings.filter_bar.advanced": "Minden kategória mutatása",
+  "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorskereső mező",
-  "notifications.column_settings.filter_bar.show": "Mutat",
+  "notifications.column_settings.filter_bar.show_bar": "Szűrősáv mutatása",
   "notifications.column_settings.follow": "Új követők:",
   "notifications.column_settings.follow_request": "Új követési kérelmek:",
   "notifications.column_settings.mention": "Megemlítések:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Oszlopban mutatás",
   "notifications.column_settings.sound": "Hang lejátszása",
   "notifications.column_settings.status": "Új bejegyzések:",
-  "notifications.column_settings.unread_markers.category": "Olvasatlan értesítés jelzők",
+  "notifications.column_settings.unread_notifications.category": "Olvasatlan értesítések",
+  "notifications.column_settings.unread_notifications.highlight": "Olvasatlan értesítések kiemelése",
+  "notifications.column_settings.update": "Szerkesztések:",
   "notifications.filter.all": "Mind",
   "notifications.filter.boosts": "Megtolások",
   "notifications.filter.favourites": "Kedvencnek jelölések",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# szavazat} other {# szavazat}}",
   "poll.vote": "Szavazás",
   "poll.voted": "Erre a válaszra szavaztál",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# szavazat} other {# szavazat}}",
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás törlése",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
   "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Közvetlen",
+  "privacy.direct.short": "Csak megemlítetteknek",
   "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követőknek",
-  "privacy.public.long": "Mindenki számára látható, nyilvános idővonalakon is szerepel",
+  "privacy.private.short": "Csak követők",
+  "privacy.public.long": "Mindenki számára látható",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Ne mutassuk nyilvános idővonalon",
+  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
   "privacy.unlisted.short": "Listázatlan",
+  "privacy_policy.last_updated": "Utoljára frissítve: {date}",
+  "privacy_policy.title": "Adatvédelmi szabályzat",
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Töltődik…",
   "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
   "relative_time.days": "{number}n",
+  "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}",
+  "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}",
+  "relative_time.full.just_now": "épp most",
+  "relative_time.full.minutes": "{number, plural, one {# perce} other {# perce}}",
+  "relative_time.full.seconds": "{number, plural, one {# másodperce} other {# másodperce}}",
   "relative_time.hours": "{number}ó",
   "relative_time.just_now": "most",
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
   "reply_indicator.cancel": "Mégsem",
+  "report.block": "Letiltás",
+  "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
+  "report.categories.other": "Egyéb",
+  "report.categories.spam": "Kéretlen üzenet",
+  "report.categories.violation": "A tartalom a kiszolgáló egy vagy több szabályát sérti",
+  "report.category.subtitle": "Válaszd ki a legjobb találatot",
+  "report.category.title": "Mondd el, hogy mi van ezzel a {type}",
+  "report.category.title_account": "profillal",
+  "report.category.title_status": "bejegyzéssel",
+  "report.close": "Kész",
+  "report.comment.title": "Van valami, amiről tudnunk kellene?",
   "report.forward": "Továbbítás: {target}",
   "report.forward_hint": "Ez a fiók egy másik kiszolgálóról van. Oda is elküldöd a jelentés egy anonimizált másolatát?",
-  "report.hint": "A bejelentést a szervered moderátorainak küldjük el. Megmagyarázhatod, miért jelented az alábbi problémát:",
+  "report.mute": "Némítás",
+  "report.mute_explanation": "Nem fogod látni a bejegyzéseit. Továbbra is fog tudni követni, és látni fogja a bejegyzéseidet, és nem fogja tudni, hogy némítottad.",
+  "report.next": "Következő",
   "report.placeholder": "További megjegyzések",
+  "report.reasons.dislike": "Nem tetszik",
+  "report.reasons.dislike_description": "Ezt nem szeretném látni",
+  "report.reasons.other": "Valami más",
+  "report.reasons.other_description": "Az eset nem illik egyik kategóriába sem",
+  "report.reasons.spam": "Ez kéretlen tartalom",
+  "report.reasons.spam_description": "Rosszindulatú hivatkozások, hamis interakció vagy ismétlődő válaszok",
+  "report.reasons.violation": "Sérti a kiszolgáló szabályait",
+  "report.reasons.violation_description": "Tudod, hogy mely konkrét szabályokat sért meg",
+  "report.rules.subtitle": "Válaszd ki az összes megfelelőt",
+  "report.rules.title": "Mely szabályok lettek megsértve?",
+  "report.statuses.subtitle": "Válaszd ki az összes megfelelőt",
+  "report.statuses.title": "Vannak olyan bejegyzések, amelyek alátámasztják ezt a jelentést?",
   "report.submit": "Küldés",
   "report.target": "{target} jelentése",
+  "report.thanks.take_action": "Itt vannak a beállítások, melyek szabályozzák, hogy mit látsz a Mastodonon:",
+  "report.thanks.take_action_actionable": "Míg átnézzük, a következőket teheted @{name} ellen:",
+  "report.thanks.title": "Nem akarod ezt látni?",
+  "report.thanks.title_actionable": "Köszönjük, hogy jelentetted, megnézzük.",
+  "report.unfollow": "@{name} követésének leállítása",
+  "report.unfollow_explanation": "Követed ezt a fiókot. Hogy ne lásd a bejegyzéseit a saját idővonaladon, szüntesd meg a követését.",
+  "report_notification.attached_statuses": "{count} bejegyzés mellékelve",
+  "report_notification.categories.other": "Egyéb",
+  "report_notification.categories.spam": "Kéretlen üzenet",
+  "report_notification.categories.violation": "Szabálysértés",
+  "report_notification.open": "Bejelentés megnyitása",
   "search.placeholder": "Keresés",
+  "search.search_or_paste": "Keresés vagy URL beillesztése",
   "search_popout.search_format": "Speciális keresés",
   "search_popout.tips.full_text": "Egyszerű szöveg, mely általad írt, kedvencnek jelölt vagy megtolt bejegyzéseket, rólad szóló megemlítéseket, felhasználói neveket, megjelenített neveket, hashtageket ad majd vissza.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Egyszerű szöveg. Illeszkedő megjelenített nevet, felhasználói nevet, hashtageket ad majd vissza",
   "search_popout.tips.user": "felhasználó",
   "search_results.accounts": "Emberek",
+  "search_results.all": "Összes",
   "search_results.hashtags": "Hashtagek",
+  "search_results.nothing_found": "Nincs találat ezekre a keresési kifejezésekre",
   "search_results.statuses": "Bejegyzések",
   "search_results.statuses_fts_disabled": "Ezen a Mastodon szerveren nem engedélyezett a bejegyzések tartalom szerinti keresése.",
+  "search_results.title": "Keresés erre: {q}",
   "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}",
+  "server_banner.about_active_users": "Az elmúlt 30 napban ezt a kiszolgálót használók száma (Havi aktív felhasználók)",
+  "server_banner.active_users": "aktív felhasználó",
+  "server_banner.administered_by": "Adminisztrátor:",
+  "server_banner.introduction": "{domain} része egy decentralizált közösségi hálónak, melyet a {mastodon} hajt meg.",
+  "server_banner.learn_more": "Tudj meg többet",
+  "server_banner.server_stats": "Kiszolgálóstatisztika:",
+  "sign_in_banner.create_account": "Fiók létrehozása",
+  "sign_in_banner.sign_in": "Bejelentkezés",
+  "sign_in_banner.text": "Jelentkezz be profilok vagy hashtagek követéséhez, bejegyzések megosztásához, megválaszolásához, vagy kommunikálj a fiókodból más kiszolgálókkal.",
   "status.admin_account": "Moderációs felület megnyitása @{name} fiókhoz",
   "status.admin_status": "Bejegyzés megnyitása a moderációs felületen",
   "status.block": "@{name} letiltása",
@@ -396,9 +551,16 @@
   "status.delete": "Törlés",
   "status.detailed_status": "Részletes beszélgetési nézet",
   "status.direct": "Közvetlen üzenet @{name} számára",
+  "status.edit": "Szerkesztés",
+  "status.edited": "Szerkesztve: {date}",
+  "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
   "status.embed": "Beágyazás",
   "status.favourite": "Kedvenc",
+  "status.filter": "E bejegyzés szűrése",
   "status.filtered": "Megszűrt",
+  "status.hide": "Bejegyzés elrejtése",
+  "status.history.created": "{name} létrehozta: {date}",
+  "status.history.edited": "{name} szerkesztette: {date}",
   "status.load_more": "Többet",
   "status.media_hidden": "Média elrejtve",
   "status.mention": "@{name} megemlítése",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",
+  "status.replied_to": "Megválaszolva {name} számára",
   "status.reply": "Válasz",
   "status.replyAll": "Válasz a beszélgetésre",
   "status.report": "@{name} bejelentése",
   "status.sensitive_warning": "Kényes tartalom",
   "status.share": "Megosztás",
+  "status.show_filter_reason": "Megjelenítés mindenképp",
   "status.show_less": "Kevesebb megjelenítése",
   "status.show_less_all": "Kevesebbet mindenhol",
   "status.show_more": "Többet",
   "status.show_more_all": "Többet mindenhol",
-  "status.show_thread": "Szál mutatása",
+  "status.show_original": "Eredeti mutatása",
+  "status.translate": "Fordítás",
+  "status.translated_from_with": "{lang} nyelvről fordítva {provider} szolgáltatással",
   "status.uncached_media_warning": "Nem érhető el",
   "status.unmute_conversation": "Beszélgetés némításának feloldása",
   "status.unpin": "Kitűzés eltávolítása a profilodról",
+  "subscribed_languages.lead": "A változtatás után csak a kiválasztott nyelvű bejegyzések fognak megjelenni a kezdőlapon és az idővonalakon. Ha egy sincs kiválasztva, akkor minden nyelven megjelennek a bejegyzések.",
+  "subscribed_languages.save": "Változások mentése",
+  "subscribed_languages.target": "Feliratkozott nyelvek módosítása a következőnél: {target}",
   "suggestions.dismiss": "Javaslat elvetése",
   "suggestions.header": "Esetleg érdekelhet…",
   "tabs_bar.federated_timeline": "Föderációs",
   "tabs_bar.home": "Kezdőlap",
   "tabs_bar.local_timeline": "Helyi",
   "tabs_bar.notifications": "Értesítések",
-  "tabs_bar.search": "Keresés",
   "time_remaining.days": "{number, plural, one {# nap} other {# nap}} van hátra",
   "time_remaining.hours": "{number, plural, one {# óra} other {# óra}} van hátra",
   "time_remaining.minutes": "{number, plural, one {# perc} other {# perc}} van hátra",
   "time_remaining.moments": "Pillanatok vannak hátra",
   "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
-  "timeline_hint.remote_resource_not_displayed": "más szerverekről származó {resource} tartalmakat nem mutatjuk.",
+  "timeline_hint.remote_resource_not_displayed": "a más kiszolgálókról származó {resource} tartalmak nem jelennek meg.",
   "timeline_hint.resources.followers": "Követő",
   "timeline_hint.resources.follows": "Követett",
   "timeline_hint.resources.statuses": "Régi bejegyzések",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} személy} other {{counter} személy}} beszélget",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}",
   "trends.trending_now": "Most felkapott",
   "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.",
   "units.short.billion": "{count}Mrd",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
   "upload_form.audio_description": "Írja le a hallássérültek számára",
   "upload_form.description": "Leírás látáskorlátozottak számára",
+  "upload_form.description_missing": "Nincs leírás megadva",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Előnézet megváltoztatása",
   "upload_form.undo": "Törlés",
   "upload_form.video_description": "Írja le a hallás- vagy látássérültek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
   "upload_modal.apply": "Alkalmaz",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Alkalmazás…",
   "upload_modal.choose_image": "Kép kiválasztása",
   "upload_modal.description_placeholder": "A gyors, barna róka átugrik a lusta kutya fölött",
   "upload_modal.detect_text": "Szöveg felismerése a képről",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "OCR előkészítése…",
   "upload_modal.preview_label": "Előnézet ({ratio})",
   "upload_progress.label": "Feltöltés...",
+  "upload_progress.processing": "Feldolgozás…",
   "video.close": "Videó bezárása",
   "video.download": "Fájl letöltése",
   "video.exit_fullscreen": "Kilépés teljes képernyőből",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index e412917f0..e1f854361 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Նշում",
   "account.add_or_remove_from_list": "Աւելացնել կամ հեռացնել ցանկերից",
   "account.badges.bot": "Բոտ",
@@ -7,68 +19,90 @@
   "account.block_domain": "Թաքցնել ամէնը հետեւեալ տիրոյթից՝ {domain}",
   "account.blocked": "Արգելափակուած է",
   "account.browse_more_on_origin_server": "Դիտել աւելին իրական պրոֆիլում",
-  "account.cancel_follow_request": "չեղարկել հետեւելու հայցը",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Նամակ գրել @{name} -ին",
   "account.disable_notifications": "Ծանուցումները անջատել @{name} գրառումների համար",
   "account.domain_blocked": "Տիրոյթը արգելափակուած է",
   "account.edit_profile": "Խմբագրել անձնական էջը",
   "account.enable_notifications": "Ծանուցել ինձ @{name} գրառումների մասին",
   "account.endorse": "Ցուցադրել անձնական էջում",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Հետեւել",
   "account.followers": "Հետեւողներ",
   "account.followers.empty": "Այս օգտատիրոջը դեռ ոչ մէկ չի հետեւում։",
   "account.followers_counter": "{count, plural, one {{counter} Հետեւորդ} other {{counter} Հետեւորդ}}",
-  "account.following_counter": "{count, plural, one {{counter} հետեւած} other {{counter} հետեւած}}",
+  "account.following": "Հետեւած",
+  "account.following_counter": "{count, plural, one {{counter} Հետեւած} other {{counter} Հետեւած}}",
   "account.follows.empty": "Այս օգտատէրը դեռ ոչ մէկի չի հետեւում։",
   "account.follows_you": "Հետեւում է քեզ",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
-  "account.joined": "Միացել է {date}-ից",
-  "account.last_status": "Վերջին այցը",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Սոյն յղման տիրապետումը ստուգուած է՝ {date}֊ին",
   "account.locked_info": "Սոյն հաշուի գաղտնիութեան մակարդակը նշուած է որպէս՝ փակ։ Հաշուի տէրն ընտրում է, թէ ով կարող է հետեւել իրեն։",
   "account.media": "Մեդիա",
   "account.mention": "Նշել @{name}֊ին",
-  "account.moved_to": "{name}֊ը տեղափոխուել է՝",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Լռեցնել @{name}֊ին",
   "account.mute_notifications": "Անջատել ծանուցումները @{name}֊ից",
   "account.muted": "Լռեցուած",
-  "account.never_active": "Երբեք",
+  "account.open_original_page": "Open original page",
   "account.posts": "Գրառումներ",
   "account.posts_with_replies": "Գրառումներ եւ պատասխաններ",
   "account.report": "Բողոքել @{name}֊ի մասին",
   "account.requested": "Հաստատման կարիք ունի։ Սեղմիր՝ հետեւելու հայցը չեղարկելու համար։",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Կիսուել @{name}֊ի էջով",
   "account.show_reblogs": "Ցուցադրել @{name}֊ի տարածածները",
   "account.statuses_counter": "{count, plural, one {{counter} Գրառում} other {{counter} Գրառումներ}}",
   "account.unblock": "Ապաարգելափակել @{name}֊ին",
   "account.unblock_domain": "Ցուցադրել {domain} թաքցուած տիրոյթի գրառումները",
+  "account.unblock_short": "Արգելաբացել",
   "account.unendorse": "Չցուցադրել անձնական էջում",
   "account.unfollow": "Ապահետեւել",
   "account.unmute": "Ապալռեցնել @{name}֊ին",
   "account.unmute_notifications": "Միացնել ծանուցումները @{name}֊ից",
+  "account.unmute_short": "Ապախլացնել",
   "account_note.placeholder": "Սեղմէ՛ք գրառելու համար\n",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Միջին",
+  "admin.dashboard.retention.cohort": "Ամսուայ գրանցումներ",
+  "admin.dashboard.retention.cohort_size": "Նոր օգտուող",
   "alert.rate_limited.message": "Փորձէք  որոշ ժամանակ անց՝ {retry_time, time, medium}։",
   "alert.rate_limited.title": "Գործողութիւնների յաճախութիւնը գերազանցում է թոյլատրելին",
   "alert.unexpected.message": "Անսպասելի սխալ տեղի ունեցաւ։",
   "alert.unexpected.title": "Վա՜յ",
   "announcement.announcement": "Յայտարարութիւններ",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
-  "bundle_column_error.body": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանուեց։",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Կրկին փորձել",
-  "bundle_column_error.title": "Ցանցային սխալ",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Փակել",
   "bundle_modal_error.message": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանուեց։",
   "bundle_modal_error.retry": "Կրկին փորձել",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Արգելափակուած օգտատէրեր",
   "column.bookmarks": "Էջանիշեր",
   "column.community": "Տեղական հոսք",
-  "column.direct": "Հասցէագրուած հաղորդագրութիւններ",
+  "column.direct": "Հասցէագրուած",
   "column.directory": "Զննել անձնական էջերը",
   "column.domain_blocks": "Թաքցուած տիրոյթները",
   "column.favourites": "Հաւանածներ",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Միայն տեղական",
   "community.column_settings.media_only": "Միայն մեդիա",
   "community.column_settings.remote_only": "Միայն հեռակայ",
-  "compose_form.direct_message_warning": "Այս գրառումը տեսանելի կը լինի միայն նշուած օգտատէրերին։",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Իմանալ աւելին",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Այս գրառումը չի հաշուառուի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարաւոր է որոնել պիտակներով։",
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
   "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
   "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
-  "compose_form.publish": "Հրապարակել",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "Հրապարակե՜լ",
+  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
   "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
   "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
   "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
@@ -114,18 +152,20 @@
   "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
   "confirmations.block.message": "Վստա՞հ ես, որ ուզում ես արգելափակել {name}֊ին։",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Ջնջել",
   "confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
   "confirmations.delete_list.confirm": "Ջնջել",
   "confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.confirm": "Չեղարկել",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը",
   "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
   "confirmations.logout.confirm": "Ելք",
   "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
   "confirmations.mute.confirm": "Լռեցնել",
-  "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
+  "confirmations.mute.explanation": "Սա թաքցնելու է իրենց գրառումները, ինչպէս նաեւ իրենց նշող գրառումները, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
   "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.redraft.message": "Վստահ ե՞ս, որ ցանկանում ես ջնջել եւ վերախմբագրել այս գրառումը։ Դու կը կորցնես այս գրառման բոլոր պատասխանները, տարածումները եւ հաւանումները։",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Նշել որպէս ընթերցուած",
   "conversation.open": "Դիտել խօսակցութիւնը",
   "conversation.with": "{names}-ի հետ",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Յայտնի դաշնեզերքից",
   "directory.local": "{domain} տիրոյթից միայն",
   "directory.new_arrivals": "Նորեկներ",
   "directory.recently_active": "Վերջերս ակտիւ",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Այս գրառումը քո կայքում ներդնելու համար կարող ես պատճէնել ներքեւի կոդը։",
-  "embed.preview": "Ահա, թէ ինչ տեսք կը ունենայ այն՝",
+  "embed.preview": "Ահա, թէ ինչ տեսք կունենայ այն՝",
   "emoji_button.activity": "Զբաղմունքներ",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Յատուկ",
   "emoji_button.flags": "Դրօշներ",
   "emoji_button.food": "Կերուխում",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
   "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշուած գրառում։ Երբ էջանշես, դրանք կը երեւան այստեղ։",
   "empty_column.community": "Տեղական հոսքը դատարկ է։ Հրապարակային մի բան գրի՛ր շարժիչը գործարկելու համար։",
-  "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն այստեղ կերեւայ։",
+  "empty_column.direct": "Դու դեռ չունես ոչ մի հասցէագրուած հաղորդագրութիւն։ Երբ ուղարկես կամ ստանաս որեւէ անձնական նամակ, այն կերեւայ այստեղ։",
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած գրառում։ Երբ հաւանես, դրանք կերեւան այստեղ։",
   "empty_column.favourites": "Այս գրառումը ոչ մէկ դեռ չի հաւանել։ Հաւանողները կերեւան այստեղ, երբ հաւանեն։",
   "empty_column.follow_recommendations": "Կարծես քեզ համար ոչ մի առաջարկ չի գեներացուել։ Օգտագործիր որոնման դաշտը մարդկանց փնտրելու համար կամ բացայայտիր յայտնի պիտակներով։",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Փորձիր անջատել յաւելուածները եւ թարմացնել էջը։ Եթե դա չօգնի, կարող ես օգտուել Մաստադոնից այլ դիտարկիչով կամ յաւելուածով։",
   "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին",
   "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին",
+  "explore.search_results": "Որոնման արդիւնքներ",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Բացայայտել",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Աւարտուած է",
   "follow_recommendations.heading": "Հետեւիր այն մարդկանց, որոնց գրառումները կը ցանկանաս տեսնել։ Ահա մի քանի առաջարկ։",
   "follow_recommendations.lead": "Քո հոսքում, ժամանակագրական դասաւորութեամբ կը տեսնես այն մարդկանց գրառումները, որոնց հետեւում ես։ Մի վախեցիր սխալուել, դու միշտ կարող ես հեշտութեամբ ապահետեւել մարդկանց։",
   "follow_request.authorize": "Վաւերացնել",
   "follow_request.reject": "Մերժել",
   "follow_requests.unlocked_explanation": "Այս հարցումը ուղարկուած է հաշուից, որի համար {domain}-ի անձնակազմը միացրել է ձեռքով ստուգում։",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Պահպանուած է",
-  "getting_started.developers": "Մշակողներ",
-  "getting_started.directory": "Օգտատէրերի շտեմարան",
-  "getting_started.documentation": "Փաստաթղթեր",
   "getting_started.heading": "Ինչպէս սկսել",
-  "getting_started.invite": "Հրաւիրել մարդկանց",
-  "getting_started.open_source_notice": "Մաստոդոնը բաց ելատեքստով ծրագրակազմ է։ Կարող ես ներդրում անել կամ վրէպներ զեկուցել ԳիթՀաբում՝ {github}։",
-  "getting_started.security": "Հաշուի կարգաւորումներ",
-  "getting_started.terms": "Ծառայութեան պայմանները",
   "hashtag.column_header.tag_mode.all": "եւ {additional}",
   "hashtag.column_header.tag_mode.any": "կամ {additional}",
   "hashtag.column_header.tag_mode.none": "առանց {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Ցանկացածը",
   "hashtag.column_settings.tag_mode.none": "Ոչ մեկը",
   "hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
   "home.hide_announcements": "Թաքցնել յայտարարութիւնները",
   "home.show_announcements": "Ցուցադրել յայտարարութիւնները",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# օր} other {# օր}}",
   "intervals.full.hours": "{number, plural, one {# ժամ} other {# ժամ}}",
   "intervals.full.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "սիւներից մէկի վրայ սեւեռուելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրոյթին սեւեռուելու համար",
   "keyboard_shortcuts.description": "Նկարագրութիւն",
-  "keyboard_shortcuts.direct": "հասցէագրուած գրուածքների հոսքը բացելու համար",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժուելու համար",
   "keyboard_shortcuts.enter": "Գրառումը բացելու համար",
   "keyboard_shortcuts.favourite": "հաւանելու համար",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Բացել պատկերի դիտման պատուհանը",
   "lightbox.next": "Յաջորդ",
   "lightbox.previous": "Նախորդ",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Աւելացնել ցանկին",
   "lists.account.remove": "Հանել ցանկից",
   "lists.delete": "Ջնջել ցանկը",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "missing_indicator.label": "Չգտնուեց",
   "missing_indicator.sublabel": "Պաշարը չի գտնւում",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Տեւողութիւն",
   "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
   "mute_modal.indefinite": "Անժամկէտ",
-  "navigation_bar.apps": "Դիւրակիր յաւելուածներ",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
   "navigation_bar.community_timeline": "Տեղական հոսք",
   "navigation_bar.compose": "Ստեղծել նոր գրառում",
-  "navigation_bar.direct": "Հասցէագրուած",
+  "navigation_bar.direct": "Հասցէագրուած նամակներ",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
   "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
+  "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
   "navigation_bar.follow_requests": "Հետեւելու հայցեր",
   "navigation_bar.follows_and_followers": "Հետեւածներ եւ հետեւողներ",
-  "navigation_bar.info": "Այս հանգոյցի մասին",
-  "navigation_bar.keyboard_shortcuts": "Ստեղնաշարի կարճատներ",
   "navigation_bar.lists": "Ցանկեր",
   "navigation_bar.logout": "Դուրս գալ",
   "navigation_bar.mutes": "Լռեցրած օգտատէրեր",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Ամրացուած գրառումներ",
   "navigation_bar.preferences": "Նախապատուութիւններ",
   "navigation_bar.public_timeline": "Դաշնային հոսք",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Անվտանգութիւն",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name}-ը գրանցուած է",
   "notification.favourite": "{name} հաւանեց գրառումդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
   "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
@@ -306,13 +400,16 @@
   "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
   "notification.reblog": "{name} տարածեց գրառումդ",
   "notification.status": "{name} հենց նոր գրառում արեց",
+  "notification.update": "{name}-ը փոխել է գրառումը",
   "notifications.clear": "Մաքրել ծանուցումները",
   "notifications.clear_confirmation": "Վստա՞հ ես, որ ուզում ես մշտապէս մաքրել քո բոլոր ծանուցումները։",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
   "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
   "notifications.column_settings.favourite": "Հաւանածներից՝",
   "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
   "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
-  "notifications.column_settings.filter_bar.show": "Ցուցադրել",
+  "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
   "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Ցուցադրել սիւնում",
   "notifications.column_settings.sound": "Ձայն հանել",
   "notifications.column_settings.status": "Նոր գրառումներ։",
-  "notifications.column_settings.unread_markers.category": "Չկարդացուած ծանուցումների նշաններ",
+  "notifications.column_settings.unread_notifications.category": "Չկարդացուած ծանուցումներ",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Խմբագրածներ՝",
   "notifications.filter.all": "Բոլորը",
   "notifications.filter.boosts": "Տարածածները",
   "notifications.filter.favourites": "Հաւանածները",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# ձայն} other {# ձայն}}",
   "poll.vote": "Քուէարկել",
   "poll.voted": "Դու քուէարկել ես այս տարբերակի համար",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# ձայն} other {# ձայն}}",
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
   "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Հասցէագրուած",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողներին",
-  "privacy.public.long": "Կը տեսնեն բոլոր,  հրապարակային հոսքում",
+  "privacy.private.short": "Միայն հետեւողները",
+  "privacy.public.long": "Տեսանելի բոլորին",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.long": "Կը տեսնեն բոլոր,  բայց ոչ հրապարակային հոսքում",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Ծածուկ",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Թարմացնել",
   "regeneration_indicator.label": "Բեռնւում է…",
   "regeneration_indicator.sublabel": "պատրաստւում է հիմնական հոսքդ",
   "relative_time.days": "{number}օր",
+  "relative_time.full.days": "{number, plural, one {# օր} other {# օր}} առաջ",
+  "relative_time.full.hours": "{number, plural, one {# ժամ} other {# ժամ}} առաջ",
+  "relative_time.full.just_now": "հէնց նոր",
+  "relative_time.full.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}} առաջ",
+  "relative_time.full.seconds": "{number, plural, one {# վայրկեան} other {# վայրկեան}} առաջ",
   "relative_time.hours": "{number}ժ",
   "relative_time.just_now": "նոր",
   "relative_time.minutes": "{number}ր",
   "relative_time.seconds": "{number}վ",
   "relative_time.today": "Այսօր",
   "reply_indicator.cancel": "Չեղարկել",
+  "report.block": "Արգելափակել",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Այլ",
+  "report.categories.spam": "Սպամ",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "հաշիւ",
+  "report.category.title_status": "գրառում",
+  "report.close": "Աւարտել",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Փոխանցել {target}֊ին",
   "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
-  "report.hint": "Այս զեկոյցը կուղարկուի հանգոյցի մոդերատորներին։ Ներքեւում կարող ես տրամադրել բացատրութիւն, թէ ինչու ես զեկուցում այս հաշուի մասին․",
+  "report.mute": "Լռեցնել",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Յաջորդ",
   "report.placeholder": "Լրացուցիչ մեկնաբանութիւններ",
+  "report.reasons.dislike": "Ինձ դուր չի գալիս",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "Այլ բան է",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "Սպամ է",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Ուղարկել",
   "report.target": "Բողոքել {target}֊ի մասին",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Փնտրել",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Փնտրելու առաջադէմ ձեւ",
   "search_popout.tips.full_text": "Պարզ տեքստը վերադարձնում է գրառումներդ, հաւանածներդ, տարածածներդ, որտեղ ես նշուած եղել, ինչպէս նաեւ նման օգտանուններ, անուններ եւ պիտակներ։",
   "search_popout.tips.hashtag": "պիտակ",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Հասարակ տեքստը կը վերադարձնի համընկնող անուններ, օգտանուններ ու պիտակներ",
   "search_popout.tips.user": "օգտատէր",
   "search_results.accounts": "Մարդիկ",
+  "search_results.all": "All",
   "search_results.hashtags": "Պիտակներ",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Գրառումներ",
   "search_results.statuses_fts_disabled": "Այս հանգոյցում միացուած չէ ըստ բովանդակութեան գրառում փնտրելու հնարաւորութիւնը։",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {արդիւնք} other {արդիւնք}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Բացել @{name} օգտատիրոջ մոդերացիայի դիմերէսը։",
   "status.admin_status": "Բացել այս գրառումը մոդերատորի դիմերէսի մէջ",
   "status.block": "Արգելափակել @{name}֊ին",
@@ -396,9 +551,16 @@
   "status.delete": "Ջնջել",
   "status.detailed_status": "Շղթայի ընդլայնուած դիտում",
   "status.direct": "Նամակ գրել {name} -ին",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Ներդնել",
   "status.favourite": "Հաւանել",
+  "status.filter": "Filter this post",
   "status.filtered": "Զտուած",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Բեռնել աւելին",
   "status.media_hidden": "մեդիաբովանդակութիւնը թաքցուած է",
   "status.mention": "Նշել @{name}֊ին",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "Այս գրառումը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ տարածեն։",
   "status.redraft": "Ջնջել եւ վերակազմել",
   "status.remove_bookmark": "Հեռացնել էջանիշերից",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Պատասխանել",
   "status.replyAll": "Պատասխանել շղթային",
   "status.report": "Բողոքել @{name}֊ից",
   "status.sensitive_warning": "Կասկածելի բովանդակութիւն",
   "status.share": "Կիսուել",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Պակաս",
   "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
   "status.show_more": "Աւելին",
   "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
-  "status.show_thread": "Բացել շղթան",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Անհասանելի",
   "status.unmute_conversation": "Ապալռեցնել խօսակցութիւնը",
   "status.unpin": "Հանել անձնական էջից",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Անտեսել առաջարկը",
   "suggestions.header": "Միգուցէ քեզ հետաքրքրի…",
   "tabs_bar.federated_timeline": "Դաշնային",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.local_timeline": "Տեղական",
   "tabs_bar.notifications": "Ծանուցումներ",
-  "tabs_bar.search": "Փնտրել",
   "time_remaining.days": "{number, plural, one {մնաց # օր} other {մնաց # օր}}",
   "time_remaining.hours": "{number, plural, one {# ժամ} other {# ժամ}} անց",
   "time_remaining.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}} անց",
   "time_remaining.moments": "Մնացել է մի քանի վարկեան",
   "time_remaining.seconds": "{number, plural, one {# վարկեան} other {# վարկեան}} անց",
   "timeline_hint.remote_resource_not_displayed": "{resource} այլ սպասարկիչներից չեն ցուցադրվել:",
-  "timeline_hint.resources.followers": "Հետևորդներ",
+  "timeline_hint.resources.followers": "Հետեւորդ",
   "timeline_hint.resources.follows": "Հետեւել",
   "timeline_hint.resources.statuses": "Հին գրառումներ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} մարդ} other {{counter} մարդիկ}} խօսում են",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կը կորի, եթէ լքես Մաստոդոնը։",
   "units.short.billion": "{count}մլրդ",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Հարցումների հետ նիշք կցել հնարաւոր չէ։",
   "upload_form.audio_description": "Նկարագրիր ձայնագրութեան բովանդակութիւնը լսողական խնդիրներով անձանց համար",
   "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Խմբագրել",
   "upload_form.thumbnail": "Փոխել պատկերակը",
   "upload_form.undo": "Յետարկել",
   "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Կիրառւում է...",
   "upload_modal.choose_image": "Ընտրել նկար",
   "upload_modal.description_placeholder": "Բել դղեակի ձախ ժամն օֆ ազգութեանը ցպահանջ չճշտած վնաս էր եւ փառք։",
   "upload_modal.detect_text": "Յայտնաբերել տեքստը նկարից",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Գրաճանաչման նախապատրաստում…",
   "upload_modal.preview_label": "Նախադիտում ({ratio})",
   "upload_progress.label": "Վերբեռնվում է…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Փակել  տեսագրութիւնը",
   "video.download": "Ներբեռնել նիշքը",
   "video.exit_fullscreen": "Անջատել լիաէկրան դիտումը",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index a664aff56..f10b95756 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Server yang dimoderasi",
+  "about.contact": "Hubungi:",
+  "about.disclaimer": "Mastodon addalah perangkat lunak bebas dan sumber terbuka, dan adalah merek dagang dari Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Alasan tidak tersedia",
+  "about.domain_blocks.preamble": "Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.",
+  "about.domain_blocks.silenced.explanation": "Anda secara umum tidak melihat profil dan konten dari server ini, kecuali jika Anda mencarinya atau memilihnya dengan mengikuti secara eksplisit.",
+  "about.domain_blocks.silenced.title": "Terbatas",
+  "about.domain_blocks.suspended.explanation": "Tidak ada data yang diproses, disimpan, atau ditukarkan dari server ini, membuat interaksi atau komunikasi dengan pengguna dari server ini tidak mungkin dilakukan.",
+  "about.domain_blocks.suspended.title": "Ditangguhkan",
+  "about.not_available": "Informasi ini belum tersedia di server ini.",
+  "about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
+  "about.rules": "Aturan server",
   "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
@@ -6,71 +18,93 @@
   "account.block": "Blokir @{name}",
   "account.block_domain": "Blokir domain {domain}",
   "account.blocked": "Terblokir",
-  "account.browse_more_on_origin_server": "Lihat lebih lanjut diprofil asli",
-  "account.cancel_follow_request": "Batalkan permintaan ikuti",
+  "account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
+  "account.cancel_follow_request": "Batalkan permintaan ikut",
   "account.direct": "Pesan Langsung @{name}",
   "account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
   "account.domain_blocked": "Domain diblokir",
   "account.edit_profile": "Ubah profil",
   "account.enable_notifications": "Beritahu saya saat @{name} memposting",
   "account.endorse": "Tampilkan di profil",
+  "account.featured_tags.last_status_at": "Kiriman terakhir pada {date}",
+  "account.featured_tags.last_status_never": "Tidak ada kiriman",
+  "account.featured_tags.title": "Tagar {name} yang difiturkan",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
   "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
+  "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, other {{counter} Mengikuti}}",
-  "account.follows.empty": "Pengguna ini belum mengikuti siapapun.",
-  "account.follows_you": "Mengikuti anda",
+  "account.follows.empty": "Pengguna ini belum mengikuti siapa pun.",
+  "account.follows_you": "Mengikuti Anda",
+  "account.go_to_profile": "Buka profil",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
-  "account.joined": "Bergabung {date}",
-  "account.last_status": "Terakhir aktif",
+  "account.joined_short": "Bergabung",
+  "account.languages": "Ubah langganan bahasa",
   "account.link_verified_on": "Kepemilikan tautan ini telah dicek pada {date}",
   "account.locked_info": "Status privasi akun ini disetel untuk dikunci. Pemilik secara manual meninjau siapa yang dapat mengikutinya.",
   "account.media": "Media",
   "account.mention": "Balasan @{name}",
-  "account.moved_to": "{name} telah pindah ke:",
+  "account.moved_to": "{name} mengabarkan bahwa akun baru mereka kini adalah:",
   "account.mute": "Bisukan @{name}",
   "account.mute_notifications": "Bisukan pemberitahuan dari @{name}",
   "account.muted": "Dibisukan",
-  "account.never_active": "Tak pernah",
+  "account.open_original_page": "Buka halaman asli",
   "account.posts": "Kiriman",
-  "account.posts_with_replies": "Postingan dengan balasan",
+  "account.posts_with_replies": "Kiriman dan balasan",
   "account.report": "Laporkan @{name}",
   "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
+  "account.requested_follow": "{name} ingin mengikuti Anda",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
-  "account.statuses_counter": "{count, plural, other {{counter} Toot}}",
-  "account.unblock": "Hapus blokir @{name}",
+  "account.statuses_counter": "{count, plural, other {{counter} Kiriman}}",
+  "account.unblock": "Buka blokir @{name}",
   "account.unblock_domain": "Buka blokir domain {domain}",
+  "account.unblock_short": "Buka blokir",
   "account.unendorse": "Jangan tampilkan di profil",
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications": "Berhenti bisukan pemberitahuan dari @{name}",
+  "account.unmute_short": "Bunyikan",
   "account_note.placeholder": "Klik untuk menambah catatan",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Tingkat retensi pengguna perhari setelah mendaftar",
+  "admin.dashboard.monthly_retention": "Tingkat retensi pengguna perbulan setelah mendaftar",
+  "admin.dashboard.retention.average": "Rata-rata",
+  "admin.dashboard.retention.cohort": "Bulan pendaftaran",
+  "admin.dashboard.retention.cohort_size": "Pengguna baru",
   "alert.rate_limited.message": "Mohon ulangi setelah {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Batasan tingkat",
+  "alert.rate_limited.title": "Jumlah akses dibatasi",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Pengumuman",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(tidak diproses)",
+  "audio.hide": "Sembunyikan audio",
   "autosuggest_hashtag.per_week": "{count} per minggu",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
-  "bundle_column_error.body": "Kesalahan terjadi saat memuat komponen ini.",
+  "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
+  "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
+  "bundle_column_error.error.title": "Oh, tidak!",
+  "bundle_column_error.network.body": "Ada kesalahan ketika memuat laman ini. Ini dapat terjadi karena masalah sementara dengan koneksi internet Anda atau server ini.",
+  "bundle_column_error.network.title": "Kesalahan jaringan",
   "bundle_column_error.retry": "Coba lagi",
-  "bundle_column_error.title": "Kesalahan jaringan",
+  "bundle_column_error.return": "Kembali ke beranda",
+  "bundle_column_error.routing.body": "Laman yang diminta tidak ditemukan. Apakah Anda yakin bahwa URL dalam bilah alamat benar?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Tutup",
   "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.",
   "bundle_modal_error.retry": "Coba lagi",
-  "column.blocks": "Pengguna diblokir",
+  "closed_registrations.other_server_instructions": "Karena Mastodon itu terdesentralisasi, Anda dapat membuat sebuah akun di server lain dan masih dapat berinteraksi dengan satu ini.",
+  "closed_registrations_modal.description": "Membuat sebuah akun di {domain} saat ini tidak memungkinkan, tetapi diingat bahwa Anda tidak harus memiliki sebuah akun secara khusus di {domain} untuk menggunakan Mastodon.",
+  "closed_registrations_modal.find_another_server": "Cari server lain",
+  "closed_registrations_modal.preamble": "Mastodon itu terdesentralisasi, jadi di mana pun Anda buat akun, Anda masih akan dapat mengikuti dan berinteraksi dengan siapa pun di server ini. Anda bahkan dapat host Mastodon sendiri!",
+  "closed_registrations_modal.title": "Mendaftar di Mastodon",
+  "column.about": "Tentang",
+  "column.blocks": "Pengguna yang diblokir",
   "column.bookmarks": "Markah",
   "column.community": "Linimasa Lokal",
   "column.direct": "Pesan langsung",
   "column.directory": "Jelajahi profil",
-  "column.domain_blocks": "Topik tersembunyi",
+  "column.domain_blocks": "Domain tersembunyi",
   "column.favourites": "Favorit",
   "column.follow_requests": "Permintaan mengikuti",
   "column.home": "Beranda",
@@ -90,20 +124,24 @@
   "community.column_settings.local_only": "Hanya lokal",
   "community.column_settings.media_only": "Hanya media",
   "community.column_settings.remote_only": "Hanya jarak jauh",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "compose.language.change": "Ganti bahasa",
+  "compose.language.search": "Telusuri bahasa...",
   "compose_form.direct_message_warning_learn_more": "Pelajari selengkapnya",
-  "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah di set sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
-  "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
+  "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
+  "compose_form.hashtag_warning": "Kiriman ini tidak akan ada dalam daftar tagar mana pun karena telah diatur sebagai tidak terdaftar. Hanya kiriman publik yang bisa dicari dengan tagar.",
+  "compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
-  "compose_form.placeholder": "Apa yang ada di pikiran anda?",
+  "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
   "compose_form.poll.add_option": "Tambahkan pilihan",
-  "compose_form.poll.duration": "Durasi jajak pendapat",
+  "compose_form.poll.duration": "Durasi polling",
   "compose_form.poll.option_placeholder": "Pilihan {number}",
   "compose_form.poll.remove_option": "Hapus opsi ini",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Terbitkan",
+  "compose_form.publish_form": "Terbitkan",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Simpan perubahan",
   "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
   "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
   "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
@@ -113,37 +151,50 @@
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
-  "confirmations.block.message": "Apa anda yakin ingin memblokir {name}?",
+  "confirmations.block.message": "Apa Anda yakin ingin memblokir {name}?",
+  "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
+  "confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
   "confirmations.delete.confirm": "Hapus",
-  "confirmations.delete.message": "Apa anda yakin untuk menghapus status ini?",
+  "confirmations.delete.message": "Apakah Anda yakin untuk menghapus kiriman ini?",
   "confirmations.delete_list.confirm": "Hapus",
-  "confirmations.delete_list.message": "Apakah anda yakin untuk menghapus daftar ini secara permanen?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
+  "confirmations.discard_edit_media.confirm": "Buang",
+  "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
   "confirmations.domain_block.confirm": "Sembunyikan keseluruhan domain",
-  "confirmations.domain_block.message": "Apakah anda benar benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
+  "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.logout.confirm": "Keluar",
-  "confirmations.logout.message": "Apakah anda yakin ingin keluar?",
+  "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
   "confirmations.mute.confirm": "Bisukan",
   "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.",
-  "confirmations.mute.message": "Apa anda yakin ingin membisukan {name}?",
-  "confirmations.redraft.confirm": "Hapus dan konsep ulang",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?",
+  "confirmations.redraft.confirm": "Hapus dan susun ulang",
+  "confirmations.redraft.message": "Apakah Anda yakin ingin menghapus dan draf ulang? Favorit dan boost akan hilang, dan balasan terhadap kiriman asli akan ditinggalkan.",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
-  "confirmations.unfollow.message": "Apakah anda ingin berhenti mengikuti {name}?",
+  "confirmations.unfollow.message": "Apakah Anda ingin berhenti mengikuti {name}?",
   "conversation.delete": "Hapus percakapan",
   "conversation.mark_as_read": "Tandai sudah dibaca",
   "conversation.open": "Lihat percakapan",
   "conversation.with": "Dengan {names}",
+  "copypaste.copied": "Disalin",
+  "copypaste.copy": "Salin",
   "directory.federated": "Dari fediverse yang dikenal",
   "directory.local": "Dari {domain} saja",
   "directory.new_arrivals": "Yang baru datang",
   "directory.recently_active": "Baru-baru ini aktif",
-  "embed.instructions": "Sematkan status ini di website anda dengan menyalin kode di bawah ini.",
-  "embed.preview": "Seperti ini nantinya:",
+  "disabled_account_banner.account_settings": "Pengaturan akun",
+  "disabled_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan.",
+  "dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
+  "dismissable_banner.dismiss": "Abaikan",
+  "dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.explore_statuses": "Kiriman ini dari server ini dan lainnya dalam jaringan terdesentralisasi sekarang sedang tren di server ini.",
+  "dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.public_timeline": "Ini adalah kiriman publik terkini dari orang di server ini dan lainnya dalam jaringan terdesentralisasi yang server ini tahu.",
+  "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
+  "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
+  "emoji_button.clear": "Hapus",
   "emoji_button.custom": "Kustom",
   "emoji_button.flags": "Bendera",
   "emoji_button.food": "Makanan & Minuman",
@@ -160,44 +211,67 @@
   "empty_column.account_suspended": "Akun ditangguhkan",
   "empty_column.account_timeline": "Tidak ada toot di sini!",
   "empty_column.account_unavailable": "Profil tidak tersedia",
-  "empty_column.blocks": "Anda belum memblokir siapapun.",
-  "empty_column.bookmarked_statuses": "Anda belum memiliki toot termarkah. Saat Anda menandainya sebagai markah, ia akan muncul di sini.",
+  "empty_column.blocks": "Anda belum memblokir siapa pun.",
+  "empty_column.bookmarked_statuses": "Anda belum memiliki kiriman termarkah. Saat Anda menandainya sebagai markah, mereka akan muncul di sini.",
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
   "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
   "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
-  "empty_column.favourited_statuses": "Anda belum memiliki toot favorit. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
-  "empty_column.favourites": "Tidak ada seorangpun yang memfavoritkan toot ini. Ketika seseorang melakukannya, maka akan muncul disini.",
-  "empty_column.follow_recommendations": "Sepertinya tak ada saran yang dibuat untuk Anda. Anda dapat coba menggunakan pencarian untuk menemukan orang yang Anda ketahui atau menjelajahi tagar yang sedang tren.",
-  "empty_column.follow_requests": "Anda belum memiliki permintaan mengikuti. Ketika Anda menerimanya, maka akan muncul disini.",
-  "empty_column.hashtag": "Tidak ada apapun dalam hashtag ini.",
+  "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Periksa lagi nanti!",
+  "empty_column.favourited_statuses": "Anda belum memiliki kiriman favorit. Ketika Anda mengirim atau menerimanya, mereka akan muncul di sini.",
+  "empty_column.favourites": "Belum ada yang memfavoritkan toot ini. Ketika seseorang melakukannya, mereka akan muncul di sini.",
+  "empty_column.follow_recommendations": "Sepertinya tak ada saran yang dibuat untuk Anda. Anda dapat mencoba menggunakan pencarian untuk menemukan orang yang Anda ketahui atau menjelajahi tagar yang sedang tren.",
+  "empty_column.follow_requests": "Anda belum memiliki permintaan mengikuti. Ketika Anda menerimanya, maka itu akan muncul di sini.",
+  "empty_column.hashtag": "Tidak ada apa pun dalam hashtag ini.",
   "empty_column.home": "Linimasa anda kosong! Kunjungi {public} atau gunakan pencarian untuk memulai dan bertemu pengguna lain.",
   "empty_column.home.suggestions": "Lihat beberapa saran",
-  "empty_column.list": "Tidak ada postingan di list ini. Ketika anggota dari list ini memposting status baru, status tersebut akan tampil disini.",
-  "empty_column.lists": "Anda belum memiliki daftar. Ketika Anda membuatnya, maka akan muncul disini.",
-  "empty_column.mutes": "Anda belum membisukan siapapun.",
-  "empty_column.notifications": "Anda tidak memiliki notifikasi apapun. Berinteraksi dengan orang lain untuk memulai percakapan.",
-  "empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini",
+  "empty_column.list": "Belum ada apa pun di daftar ini. Ketika anggota dari daftar ini mengirim kiriman baru, mereka akan tampil di sini.",
+  "empty_column.lists": "Anda belum memiliki daftar. Ketika Anda membuatnya, maka akan muncul di sini.",
+  "empty_column.mutes": "Anda belum membisukan siapa pun.",
+  "empty_column.notifications": "Anda belum memiliki notifikasi. Ketika orang lain berinteraksi dengan Anda, Anda akan melihatnya di sini.",
+  "empty_column.public": "Tidak ada apa pun di sini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini",
   "error.unexpected_crash.explanation": "Karena kutu pada kode kami atau isu kompatibilitas peramban, halaman tak dapat ditampilkan dengan benar.",
   "error.unexpected_crash.explanation_addons": "Halaman ini tidak dapat ditampilkan dengan benar. Kesalahan ini mungkin disebabkan pengaya peramban atau alat terjemahan otomatis.",
-  "error.unexpected_crash.next_steps": "Coba segarkan halaman. Jika tak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi native.",
-  "error.unexpected_crash.next_steps_addons": "Coba nonaktifkan mereka lalu segarkan halaman. Jika tak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi murni.",
+  "error.unexpected_crash.next_steps": "Coba segarkan halaman. Jika itu tidak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi asli.",
+  "error.unexpected_crash.next_steps_addons": "Coba nonaktifkan mereka lalu segarkan halaman. Jika itu tidak membantu, Anda masih bisa memakai Mastodon dengan peramban berbeda atau aplikasi asli.",
   "errors.unexpected_crash.copy_stacktrace": "Salin stacktrace ke papan klip",
   "errors.unexpected_crash.report_issue": "Laporkan masalah",
+  "explore.search_results": "Hasil pencarian",
+  "explore.suggested_follows": "Untuk Anda",
+  "explore.title": "Jelajahi",
+  "explore.trending_links": "Berita",
+  "explore.trending_statuses": "Kiriman",
+  "explore.trending_tags": "Tagar",
+  "filter_modal.added.context_mismatch_explanation": "Indonesia Translate",
+  "filter_modal.added.context_mismatch_title": "Konteks tidak cocok!",
+  "filter_modal.added.expired_explanation": "Kategori saringan ini telah kedaluwarsa, Anda harus mengubah tanggal kedaluwarsa untuk diterapkan.",
+  "filter_modal.added.expired_title": "Saringan kedaluwarsa!",
+  "filter_modal.added.review_and_configure": "Untuk meninjau dan mengatur kategori saringan ini lebih jauh, pergi ke {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Pengaturan saringan",
+  "filter_modal.added.settings_link": "laman pengaturan",
+  "filter_modal.added.short_explanation": "Kiriman ini telah ditambahkan ke kategori saringan berikut: {title}.",
+  "filter_modal.added.title": "Saringan ditambahkan!",
+  "filter_modal.select_filter.context_mismatch": "tidak diterapkan ke konteks ini",
+  "filter_modal.select_filter.expired": "kedaluwarsa",
+  "filter_modal.select_filter.prompt_new": "Kategori baru: {name}",
+  "filter_modal.select_filter.search": "Cari atau buat",
+  "filter_modal.select_filter.subtitle": "Gunakan kategori yang sudah ada atau buat yang baru",
+  "filter_modal.select_filter.title": "Saring kiriman ini",
+  "filter_modal.title.status": "Saring sebuah kiriman",
   "follow_recommendations.done": "Selesai",
   "follow_recommendations.heading": "Ikuti orang yang ingin Anda lihat kirimannya! Ini ada beberapa saran.",
   "follow_recommendations.lead": "Kiriman dari orang yang Anda ikuti akan tampil berdasar waktu di beranda Anda. Jangan takut membuat kesalahan, Anda dapat berhenti mengikuti mereka dengan mudah kapan saja!",
   "follow_request.authorize": "Izinkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+  "footer.about": "Tentang",
+  "footer.directory": "Direktori profil",
+  "footer.get_app": "Dapatkan aplikasi",
+  "footer.invite": "Undang orang",
+  "footer.keyboard_shortcuts": "Pintasan papan ketik",
+  "footer.privacy_policy": "Kebijakan privasi",
+  "footer.source_code": "Lihat kode sumber",
   "generic.saved": "Disimpan",
-  "getting_started.developers": "Pengembang",
-  "getting_started.directory": "Direktori profil",
-  "getting_started.documentation": "Dokumentasi",
   "getting_started.heading": "Mulai",
-  "getting_started.invite": "Undang orang",
-  "getting_started.open_source_notice": "Mastodon adalah perangkat lunak yang bersifat terbuka. Anda dapat berkontribusi atau melaporkan permasalahan/bug di Github {github}.",
-  "getting_started.security": "Keamanan",
-  "getting_started.terms": "Ketentuan layanan",
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
@@ -207,34 +281,48 @@
   "hashtag.column_settings.tag_mode.any": "Semua ini",
   "hashtag.column_settings.tag_mode.none": "Tak satu pun",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Ikuti tagar",
+  "hashtag.unfollow": "Batalkan pengikutan tagar",
   "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.show_announcements": "Tampilkan pengumuman",
+  "interaction_modal.description.favourite": "Dengan sebuah akun di Mastodon, Anda bisa memfavorit kiriman ini untuk memberi tahu penulis bahwa Anda mengapresiasinya dan menyimpannya untuk nanti.",
+  "interaction_modal.description.follow": "Dengan sebuah akun di Mastodon, Anda bisa mengikuti {name} untuk menerima kirimannya di beranda Anda.",
+  "interaction_modal.description.reblog": "Dengan sebuah akun di Mastodon, Anda bisa mem-boost kiriman ini untuk membagikannya ke pengikut Anda sendiri.",
+  "interaction_modal.description.reply": "Dengan sebuah akun di Mastodon, Anda bisa menanggapi kiriman ini.",
+  "interaction_modal.on_another_server": "Di server lain",
+  "interaction_modal.on_this_server": "Di server ini",
+  "interaction_modal.other_server_instructions": "Salin dan tempel URL ini ke bidang telusur aplikasi Mastodon favorit Anda atau antarmuka web server Mastodon Anda.",
+  "interaction_modal.preamble": "Karena Mastodon itu terdesentralisasi, Anda dapat menggunakan akun Anda yang sudah ada yang berada di server Mastodon lain atau platform yang kompatibel jika Anda tidak memiliki sebuah akun di sini.",
+  "interaction_modal.title.favourite": "Favoritkan kiriman {name}",
+  "interaction_modal.title.follow": "Ikuti {name}",
+  "interaction_modal.title.reblog": "Boost kiriman {name}",
+  "interaction_modal.title.reply": "Balas ke kiriman {name}",
   "intervals.full.days": "{number, plural, other {# hari}}",
   "intervals.full.hours": "{number, plural, other {# jam}}",
   "intervals.full.minutes": "{number, plural, other {# menit}}",
   "keyboard_shortcuts.back": "untuk kembali",
   "keyboard_shortcuts.blocked": "buka daftar pengguna terblokir",
   "keyboard_shortcuts.boost": "untuk menyebarkan",
-  "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
+  "keyboard_shortcuts.column": "Fokus kolom",
   "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
   "keyboard_shortcuts.description": "Deskripsi",
-  "keyboard_shortcuts.direct": "buka kolom pesan langsung",
+  "keyboard_shortcuts.direct": "untuk membuka kolom pesan langsung",
   "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
-  "keyboard_shortcuts.enter": "untuk membuka status",
+  "keyboard_shortcuts.enter": "Buka kiriman",
   "keyboard_shortcuts.favourite": "untuk memfavoritkan",
   "keyboard_shortcuts.favourites": "buka daftar favorit",
   "keyboard_shortcuts.federated": "buka linimasa gabungan",
   "keyboard_shortcuts.heading": "Pintasan keyboard",
-  "keyboard_shortcuts.home": "buka linimasa beranda",
+  "keyboard_shortcuts.home": "Buka linimasa beranda",
   "keyboard_shortcuts.hotkey": "Pintasan",
   "keyboard_shortcuts.legend": "tampilkan legenda ini",
   "keyboard_shortcuts.local": "buka linimasa lokal",
   "keyboard_shortcuts.mention": "sebut pencipta",
   "keyboard_shortcuts.muted": "buka daftar pengguna terbisukan",
-  "keyboard_shortcuts.my_profile": "buka profil Anda",
+  "keyboard_shortcuts.my_profile": "Buka profil Anda",
   "keyboard_shortcuts.notifications": "buka kolom notifikasi",
   "keyboard_shortcuts.open_media": "membuka media",
   "keyboard_shortcuts.pinned": "buka daftar toot tersemat",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Besarkan kotak tampilan gambar",
   "lightbox.next": "Selanjutnya",
   "lightbox.previous": "Sebelumnya",
+  "limited_account_hint.action": "Tetap tampilkan profil",
+  "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.",
   "lists.account.add": "Tambah ke daftar",
   "lists.account.remove": "Hapus dari daftar",
   "lists.delete": "Hapus daftar",
@@ -261,7 +351,7 @@
   "lists.edit.submit": "Ubah judul",
   "lists.new.create": "Tambah daftar",
   "lists.new.title_placeholder": "Judul daftar baru",
-  "lists.replies_policy.followed": "Siapapun pengguna yang diikuti",
+  "lists.replies_policy.followed": "Siapa pun pengguna yang diikuti",
   "lists.replies_policy.list": "Anggota di daftar tersebut",
   "lists.replies_policy.none": "Tidak ada satu pun",
   "lists.replies_policy.title": "Tampilkan balasan ke:",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "missing_indicator.label": "Tidak ditemukan",
   "missing_indicator.sublabel": "Sumber daya tak bisa ditemukan",
+  "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
   "mute_modal.duration": "Durasi",
   "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
   "mute_modal.indefinite": "Tak terbatas",
-  "navigation_bar.apps": "Aplikasi mobile",
+  "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
   "navigation_bar.community_timeline": "Linimasa lokal",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
   "navigation_bar.edit_profile": "Ubah profil",
+  "navigation_bar.explore": "Jelajahi",
   "navigation_bar.favourites": "Favorit",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
   "navigation_bar.follows_and_followers": "Ikuti dan pengikut",
-  "navigation_bar.info": "Informasi selengkapnya",
-  "navigation_bar.keyboard_shortcuts": "Pintasan keyboard",
   "navigation_bar.lists": "Daftar",
   "navigation_bar.logout": "Keluar",
   "navigation_bar.mutes": "Pengguna dibisukan",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "Toot tersemat",
   "navigation_bar.preferences": "Pengaturan",
   "navigation_bar.public_timeline": "Linimasa gabungan",
+  "navigation_bar.search": "Cari",
   "navigation_bar.security": "Keamanan",
-  "notification.favourite": "{name} menyukai status anda",
-  "notification.follow": "{name} mengikuti anda",
+  "not_signed_in_indicator.not_signed_in": "Anda harus masuk untuk mengakses sumber daya ini.",
+  "notification.admin.report": "{name} melaporkan {target}",
+  "notification.admin.sign_up": "{name} mendaftar",
+  "notification.favourite": "{name} memfavorit kiriman Anda",
+  "notification.follow": "{name} mengikuti Anda",
   "notification.follow_request": "{name} ingin mengikuti Anda",
   "notification.mention": "{name} menyebut Anda",
   "notification.own_poll": "Japat Anda telah berakhir",
   "notification.poll": "Japat yang Anda ikuti telah berakhir",
-  "notification.reblog": "{name} mem-boost status anda",
-  "notification.status": "{name} baru saja memposting",
+  "notification.reblog": "{name} mem-boost kiriman Anda",
+  "notification.status": "{name} baru saja mengirim",
+  "notification.update": "{name} mengedit kiriman",
   "notifications.clear": "Hapus notifikasi",
-  "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?",
+  "notifications.clear_confirmation": "Apa Anda yakin hendak menghapus semua notifikasi Anda?",
+  "notifications.column_settings.admin.report": "Laporan baru:",
+  "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Notifikasi desktop",
   "notifications.column_settings.favourite": "Favorit:",
   "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
   "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
-  "notifications.column_settings.filter_bar.show": "Tampilkan",
+  "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
   "notifications.column_settings.follow": "Pengikut baru:",
   "notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
   "notifications.column_settings.mention": "Balasan:",
@@ -321,8 +418,10 @@
   "notifications.column_settings.reblog": "Boost:",
   "notifications.column_settings.show": "Tampilkan dalam kolom",
   "notifications.column_settings.sound": "Mainkan suara",
-  "notifications.column_settings.status": "Toot baru:",
-  "notifications.column_settings.unread_markers.category": "Penanda notifikasi belum dibaca",
+  "notifications.column_settings.status": "Kiriman baru:",
+  "notifications.column_settings.unread_notifications.category": "Notifikasi yang belum dibaca",
+  "notifications.column_settings.unread_notifications.highlight": "Sorot notifikasi yang belum dibaca",
+  "notifications.column_settings.update": "Edit:",
   "notifications.filter.all": "Semua",
   "notifications.filter.boosts": "Boost",
   "notifications.filter.favourites": "Favorit",
@@ -338,103 +437,172 @@
   "notifications.permission_required": "Notifikasi desktop tidak tersedia karena izin yang dibutuhkan belum disetujui.",
   "notifications_permission_banner.enable": "Aktifkan notifikasi desktop",
   "notifications_permission_banner.how_to_control": "Untuk menerima notifikasi saat Mastodon terbuka, aktifkan notifikasi desktop. Anda dapat mengendalikan tipe interaksi mana yang ditampilkan notifikasi desktop melalui tombol {icon} di atas saat sudah aktif.",
-  "notifications_permission_banner.title": "Jangan lewatkan apapun",
+  "notifications_permission_banner.title": "Jangan lewatkan apa pun",
   "picture_in_picture.restore": "Taruh kembali",
   "poll.closed": "Ditutup",
   "poll.refresh": "Segarkan",
   "poll.total_people": "{count, plural, other {# orang}}",
   "poll.total_votes": "{count, plural, other {# suara}}",
-  "poll.vote": "Memilih",
+  "poll.vote": "Pilih",
   "poll.voted": "Anda memilih jawaban ini",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, other {# suara}}",
   "poll_button.add_poll": "Tambah japat",
   "poll_button.remove_poll": "Hapus japat",
-  "privacy.change": "Tentukan privasi status",
+  "privacy.change": "Ubah privasi kiriman",
   "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Langsung",
-  "privacy.private.long": "Kirim postingan hanya kepada pengikut",
-  "privacy.private.short": "Pribadi",
-  "privacy.public.long": "Kirim ke linimasa publik",
+  "privacy.direct.short": "Orang yang disebutkan saja",
+  "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
+  "privacy.private.short": "Pengikut saja",
+  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
+  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
   "privacy.unlisted.short": "Tak Terdaftar",
+  "privacy_policy.last_updated": "Terakhir diperbarui {date}",
+  "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
   "regeneration_indicator.label": "Memuat…",
-  "regeneration_indicator.sublabel": "Linimasa anda sedang disiapkan!",
+  "regeneration_indicator.sublabel": "Beranda Anda sedang disiapkan!",
   "relative_time.days": "{number}h",
+  "relative_time.full.days": "{number, plural, other {# hari}} yang lalu",
+  "relative_time.full.hours": "{number, plural, other {# jam}} yang lalu",
+  "relative_time.full.just_now": "baru saja",
+  "relative_time.full.minutes": "{number, plural, other {# menit}} yang lalu",
+  "relative_time.full.seconds": "{number, plural, other {# detik}} yang lalu",
   "relative_time.hours": "{number}j",
   "relative_time.just_now": "sekarang",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "hari ini",
   "reply_indicator.cancel": "Batal",
+  "report.block": "Blokir",
+  "report.block_explanation": "Anda tidak akan melihat kiriman mereka. Mereka tidak akan bisa melihat kiriman Anda atau mengikuti Anda. Mereka akan mampu menduga bahwa mereka diblokir.",
+  "report.categories.other": "Lainnya",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Konten melanggar satu atau lebih peraturan server",
+  "report.category.subtitle": "Pilih pasangan terbaik",
+  "report.category.title": "Beritahu kami apa yang terjadi dengan {type} ini",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "kiriman",
+  "report.close": "Selesai",
+  "report.comment.title": "Adakah hal lain yang perlu kami ketahui?",
   "report.forward": "Teruskan ke {target}",
   "report.forward_hint": "Akun dari server lain. Kirim salinan laporan scr anonim ke sana?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.mute": "Bisukan",
+  "report.mute_explanation": "Anda tidak akan melihat kiriman mereka. Mereka masih dapat mengikuti Anda dan melihat kiriman Anda dan tidak akan mengetahui bahwa mereka dibisukan.",
+  "report.next": "Selanjutnya",
   "report.placeholder": "Komentar tambahan",
+  "report.reasons.dislike": "Saya tidak menyukainya",
+  "report.reasons.dislike_description": "Ini bukan hal yang ingin Anda lihat",
+  "report.reasons.other": "Itu sesuatu yang lain",
+  "report.reasons.other_description": "Permasalahan ini tidak sesuai pada kategori lain",
+  "report.reasons.spam": "Ini spam",
+  "report.reasons.spam_description": "Tautan berbahaya, interaksi palsu, atau balasan berulang",
+  "report.reasons.violation": "Melanggar ketentuan server",
+  "report.reasons.violation_description": "Anda menyadari bahwa ia melanggar ketentuan tertentu",
+  "report.rules.subtitle": "Pilih semua yang berlaku",
+  "report.rules.title": "Ketentuan manakah yang dilanggar?",
+  "report.statuses.subtitle": "Pilih semua yang berlaku",
+  "report.statuses.title": "Adakah kiriman yang mendukung pelaporan ini?",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
+  "report.thanks.take_action": "Berikut adalah pilihan Anda untuk mengatur apa yang Anda lihat di Mastodon:",
+  "report.thanks.take_action_actionable": "Ketika kami meninjau ini, Anda dapat mengambil tindakan terhadap @{name}:",
+  "report.thanks.title": "Tidak ingin melihat ini?",
+  "report.thanks.title_actionable": "Terima kasih atas pelaporan Anda, kami akan memeriksa ini lebih lanjut.",
+  "report.unfollow": "Berhenti mengikuti @{name}",
+  "report.unfollow_explanation": "Anda mengikuti akun ini. Untuk tidak melihat kiriman mereka di beranda Anda, berhenti mengikuti mereka.",
+  "report_notification.attached_statuses": "{count, plural, other {{count} kiriman}} terlampir",
+  "report_notification.categories.other": "Lainnya",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Pelanggaran peraturan",
+  "report_notification.open": "Buka laporan",
   "search.placeholder": "Pencarian",
+  "search.search_or_paste": "Cari atau ketik URL",
   "search_popout.search_format": "Format pencarian mahir",
-  "search_popout.tips.full_text": "Teks simpel menampilkan status yang Anda tulis, favoritkan, boost-kan, atau status yang menyebut Anda, serta nama pengguna, nama yang ditampilkan, dan tagar yang cocok.",
+  "search_popout.tips.full_text": "Teks simpel memberikan kiriman yang Anda telah tulis, favorit, boost, atau status yang menyebut Anda, serta nama pengguna, nama yang ditampilkan, dan tagar yang cocok.",
   "search_popout.tips.hashtag": "tagar",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "kiriman",
   "search_popout.tips.text": "Teks sederhana menampilkan nama yang ditampilkan, nama pengguna, dan tagar yang cocok",
   "search_popout.tips.user": "pengguna",
   "search_results.accounts": "Orang",
+  "search_results.all": "Semua",
   "search_results.hashtags": "Tagar",
-  "search_results.statuses": "Toot",
-  "search_results.statuses_fts_disabled": "Pencarian toot berdasarkan konten tidak diaktifkan di server Mastadon ini.",
+  "search_results.nothing_found": "Tidak dapat menemukan apa pun untuk istilah-istilah pencarian ini",
+  "search_results.statuses": "Kiriman",
+  "search_results.statuses_fts_disabled": "Pencarian kiriman berdasarkan konten tidak diaktifkan di server Mastodon ini.",
+  "search_results.title": "Cari {q}",
   "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}",
-  "status.admin_account": "Buka antar muka moderasi untuk @{name}",
-  "status.admin_status": "Buka status ini dalam antar muka moderasi",
+  "server_banner.about_active_users": "Orang menggunakan server ini selama 30 hari terakhir (Pengguna Aktif Bulanan)",
+  "server_banner.active_users": "pengguna aktif",
+  "server_banner.administered_by": "Dikelola oleh:",
+  "server_banner.introduction": "{domain} adalah bagian dari jaringan sosial terdesentralisasi yang diberdayakan oleh {mastodon}.",
+  "server_banner.learn_more": "Pelajari lebih lanjut",
+  "server_banner.server_stats": "Statistik server:",
+  "sign_in_banner.create_account": "Buat akun",
+  "sign_in_banner.sign_in": "Masuk",
+  "sign_in_banner.text": "Masuk untuk mengikuti profil atau tagar, favorit, bagikan, dan balas ke kiriman, atau berinteraksi dari akun Anda di server yang lain.",
+  "status.admin_account": "Buka antarmuka moderasi untuk @{name}",
+  "status.admin_status": "Buka kiriman ini dalam antar muka moderasi",
   "status.block": "Blokir @{name}",
   "status.bookmark": "Markah",
   "status.cancel_reblog_private": "Batalkan boost",
-  "status.cannot_reblog": "Pos ini tak dapat di-boost",
-  "status.copy": "Salin tautan ke status",
+  "status.cannot_reblog": "Kiriman ini tak dapat di-boost",
+  "status.copy": "Salin tautan ke kiriman",
   "status.delete": "Hapus",
   "status.detailed_status": "Tampilan detail percakapan",
   "status.direct": "Pesan langsung @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Diedit {date}",
+  "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.favourite": "Difavoritkan",
+  "status.filter": "Saring kiriman ini",
   "status.filtered": "Disaring",
+  "status.hide": "Sembunyikan toot",
+  "status.history.created": "{name} membuat {date}",
+  "status.history.edited": "{name} mengedit {date}",
   "status.load_more": "Tampilkan semua",
   "status.media_hidden": "Media disembunyikan",
-  "status.mention": "Balasan @{name}",
+  "status.mention": "Sebutkan @{name}",
   "status.more": "Lebih banyak",
   "status.mute": "Bisukan @{name}",
   "status.mute_conversation": "Bisukan percakapan",
-  "status.open": "Tampilkan status ini",
-  "status.pin": "Sematkan pada profil",
-  "status.pinned": "Toot tersemat",
+  "status.open": "Tampilkan kiriman ini",
+  "status.pin": "Sematkan di profil",
+  "status.pinned": "Kiriman tersemat",
   "status.read_more": "Baca lebih banyak",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost ke audiens asli",
-  "status.reblogged_by": "di-boost {name}",
-  "status.reblogs.empty": "Belum ada yang mem-boost toot ini. Ketika seseorang melakukannya, maka akan muncul di sini.",
-  "status.redraft": "Hapus & redraf",
+  "status.reblog_private": "Boost dengan visibilitas asli",
+  "status.reblogged_by": "{name} mem-boost",
+  "status.reblogs.empty": "Belum ada yang mem-boost toot ini. Ketika seseorang melakukannya, mereka akan muncul di sini.",
+  "status.redraft": "Hapus & draf ulang",
   "status.remove_bookmark": "Hapus markah",
+  "status.replied_to": "Membalas ke {name}",
   "status.reply": "Balas",
-  "status.replyAll": "Balas ke semua",
+  "status.replyAll": "Balas ke utasan",
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Konten sensitif",
   "status.share": "Bagikan",
+  "status.show_filter_reason": "Tampilkan saja",
   "status.show_less": "Tampilkan lebih sedikit",
-  "status.show_less_all": "Tampilkan lebih sedikit",
+  "status.show_less_all": "Tampilkan lebih sedikit untuk semua",
   "status.show_more": "Tampilkan semua",
-  "status.show_more_all": "Tampilkan lebih banyak",
-  "status.show_thread": "Tampilkan utas",
-  "status.uncached_media_warning": "Tak tersedia",
+  "status.show_more_all": "Tampilkan lebih banyak untuk semua",
+  "status.show_original": "Tampilkan yang asli",
+  "status.translate": "Terjemahkan",
+  "status.translated_from_with": "Diterjemahkan dari {lang} menggunakan {provider}",
+  "status.uncached_media_warning": "Tidak tersedia",
   "status.unmute_conversation": "Bunyikan percakapan",
   "status.unpin": "Hapus sematan dari profil",
+  "subscribed_languages.lead": "Hanya kiriman dalam bahasa yang dipilih akan muncul di linimasa beranda dan daftar setelah perubahan. Pilih tidak ada untuk menerima kiriman dalam semua bahasa.",
+  "subscribed_languages.save": "Simpan perubahan",
+  "subscribed_languages.target": "Ubah langganan bahasa untuk {target}",
   "suggestions.dismiss": "Hentikan saran",
-  "suggestions.header": "Anda mungkin tertarik dg…",
+  "suggestions.header": "Anda mungkin tertarik dengan…",
   "tabs_bar.federated_timeline": "Gabungan",
   "tabs_bar.home": "Beranda",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Notifikasi",
-  "tabs_bar.search": "Cari",
   "time_remaining.days": "{number, plural, other {# hari}} tersisa",
   "time_remaining.hours": "{number, plural, other {# jam}} tersisa",
   "time_remaining.minutes": "{number, plural, other {# menit}} tersisa",
@@ -443,10 +611,10 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} dari server lain tidak ditampilkan.",
   "timeline_hint.resources.followers": "Pengikut",
   "timeline_hint.resources.follows": "Ikuti",
-  "timeline_hint.resources.statuses": "Toot lama",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} berbicara",
+  "timeline_hint.resources.statuses": "Kiriman lama",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} terakhir",
   "trends.trending_now": "Sedang tren sekarang",
-  "ui.beforeunload": "Naskah anda akan hilang jika anda keluar dari Mastodon.",
+  "ui.beforeunload": "Draf Anda akan hilang jika Anda keluar dari Mastodon.",
   "units.short.billion": "{count}M",
   "units.short.million": "{count}Jt",
   "units.short.thousand": "{count}Rb",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
   "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
   "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
+  "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
   "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambar…",
   "upload_modal.apply": "Terapkan",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Menerapkan…",
   "upload_modal.choose_image": "Pilih gambar",
   "upload_modal.description_placeholder": "Muharjo seorang xenofobia universal yang takut pada warga jazirah, contohnya Qatar",
   "upload_modal.detect_text": "Deteksi teks pada gambar",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Menyiapkan OCR…",
   "upload_modal.preview_label": "Pratinjau ({ratio})",
   "upload_progress.label": "Mengunggah...",
+  "upload_progress.processing": "Memproses…",
   "video.close": "Tutup video",
   "video.download": "Unduh berkas",
   "video.exit_fullscreen": "Keluar dari layar penuh",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
new file mode 100644
index 000000000..a1e268518
--- /dev/null
+++ b/app/javascript/mastodon/locales/ig.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Tinye ma ọ bụ Wepu na ndepụta",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "Soro",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Na-eso gị",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Mee ogbi @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.open_original_page": "Open original page",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Kwụsị iso",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "Ojiarụ ọhụrụ",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Zoo ụda",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
+  "bundle_column_error.retry": "Nwaa ọzọ",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Nwaa ọzọ",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "Maka",
+  "column.blocks": "Ojiarụ egbochiri",
+  "column.bookmarks": "Ebenrụtụakā",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Be",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned post",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Mwube",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose.language.change": "Gbanwee asụsụ",
+  "compose.language.search": "Chọọ asụsụ...",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Kagbuo",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "Hichapụ",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Hichapụ",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Zaa",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Hichapụ nkata",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Chọọ...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No posts found",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Done",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Iwu nzuzu",
+  "footer.source_code": "View source code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Mbido",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Hichapụ ndepụta",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Ndepụta gị",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Na-adọnye...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "Maka",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Ebenrụtụakā",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.lists": "Ndepụta",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "kịta",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "taa",
+  "reply_indicator.cancel": "Kagbuo",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Ọzọ",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "ojiarụ",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "ojiarụ dị ìrè",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Kee ebenrụtụakā",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Hichapụ",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Wepu ebenrụtụakā",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Show original",
+  "status.translate": "Tụgharịa",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Be",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Nziọkwà",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Ndị na-eso",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Na-ewu ewu kịta",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Hichapụ",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Họrọ onyonyo",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index a0c7c4912..7aaba817e 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -1,227 +1,315 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
+  "about.blocks": "Jerata servili",
+  "about.contact": "Kontaktajo:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generale permisas on vidar kontenajo e interagar kun uzanti de irga altra servilo en fediverso. Existas eceptioni quo facesis che ca partikulara servilo.",
+  "about.domain_blocks.silenced.explanation": "On generale ne vidar profili e kontenajo de ca servilo, se on ne reale trovar o voluntale juntar per sequar.",
+  "about.domain_blocks.silenced.title": "Limitizita",
+  "about.domain_blocks.suspended.explanation": "Nula informi de ca servili procedagesos o retenesos o interchanjesos, do irga interago o komuniko kun uzanti de ca servili esas neposibla.",
+  "about.domain_blocks.suspended.title": "Restriktita",
+  "about.not_available": "Ca informo ne igesis che ca servilo.",
+  "about.powered_by": "Necentraligita sociala ret quo povigesas da {mastodon}",
+  "about.rules": "Servilreguli",
+  "account.account_note_header": "Noto",
+  "account.add_or_remove_from_list": "Insertez o removez de listi",
+  "account.badges.bot": "Boto",
+  "account.badges.group": "Grupo",
   "account.block": "Blokusar @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.blocked": "Restriktita",
+  "account.browse_more_on_origin_server": "Videz pluse che originala profilo",
+  "account.cancel_follow_request": "Desendez sequodemando",
   "account.direct": "Direct Message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "Cesez avizar me kande @{name} postas",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Modifikar profilo",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
+  "account.enable_notifications": "Avizez me kande @{name} postas",
+  "account.endorse": "Traito di profilo",
+  "account.featured_tags.last_status_at": "Antea posto ye {date}",
+  "account.featured_tags.last_status_never": "Nula posti",
+  "account.featured_tags.title": "Estalita hashtagi di {name}",
   "account.follow": "Sequar",
   "account.followers": "Sequanti",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.followers.empty": "Nulu sequas ca uzanto til nun.",
+  "account.followers_counter": "{count, plural, one {{counter} Sequanto} other {{counter} Sequanti}}",
+  "account.following": "Sequata",
+  "account.following_counter": "{count, plural, one {{counter} Sequas} other {{counter} Sequanti}}",
+  "account.follows.empty": "Ca uzanto ne sequa irgu til nun.",
   "account.follows_you": "Sequas tu",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-  "account.media": "Media",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Celez busti de @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Chanjez abonita lingui",
+  "account.link_verified_on": "Proprieteso di ca ligilo kontrolesis ye {date}",
+  "account.locked_info": "La privatesostaco di ca konto fixesas quale lokata. Proprietato manue kontrolas personi qui povas sequar.",
+  "account.media": "Medio",
   "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Celar @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.mute_notifications": "Silencigez avizi de @{name}",
+  "account.muted": "Silencigata",
+  "account.open_original_page": "Open original page",
   "account.posts": "Mesaji",
-  "account.posts_with_replies": "Toots with replies",
+  "account.posts_with_replies": "Posti e respondi",
   "account.report": "Denuncar @{name}",
   "account.requested": "Vartante aprobo",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Partigez profilo di @{name}",
+  "account.show_reblogs": "Montrez busti de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Posto} other {{counter} Posti}}",
   "account.unblock": "Desblokusar @{name}",
   "account.unblock_domain": "Unhide {domain}",
-  "account.unendorse": "Don't feature on profile",
+  "account.unblock_short": "Derestriktez",
+  "account.unendorse": "Ne publikigez che profilo",
   "account.unfollow": "Ne plus sequar",
   "account.unmute": "Ne plus celar @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_notifications": "Desilencigez avizi de @{name}",
+  "account.unmute_short": "Desilencigez",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "admin.dashboard.daily_retention": "Dia uzantoretenseso pos registro",
+  "admin.dashboard.monthly_retention": "Monata uzantoreteneso pos registro",
+  "admin.dashboard.retention.average": "Averajo",
+  "admin.dashboard.retention.cohort": "Registromonato",
+  "admin.dashboard.retention.cohort_size": "Nova uzanti",
+  "alert.rate_limited.message": "Riprobez pos {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Limitizita multeso",
+  "alert.unexpected.message": "Neexpektita eroro eventis.",
+  "alert.unexpected.title": "Problemo!",
+  "announcement.announcement": "Anunco",
+  "attachments_list.unprocessed": "(neprocedita)",
+  "audio.hide": "Celez audio",
+  "autosuggest_hashtag.per_week": "{count} dum singla semano",
   "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.copy_stacktrace": "Kopierorraporto",
+  "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
+  "bundle_column_error.error.title": "Ach!",
+  "bundle_column_error.network.body": "Havas eroro kande probar montrar ca pagino. Forsan ol esas tempala problemo kun vua retkonekteso o ca servilo.",
+  "bundle_column_error.network.title": "Reteroro",
+  "bundle_column_error.retry": "Probez itere",
+  "bundle_column_error.return": "Irez a hemo",
+  "bundle_column_error.routing.body": "Demandita pagino ne povas trovesar. Ka vu certe ke URL en situobuxo esar korekta?",
+  "bundle_column_error.routing.title": "Eroro di 404",
+  "bundle_modal_error.close": "Klozez",
+  "bundle_modal_error.message": "Nulo ne functionis dum chargar ca kompozaj.",
+  "bundle_modal_error.retry": "Probez itere",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "Pri co",
   "column.blocks": "Blokusita uzeri",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "Libromarki",
   "column.community": "Lokala tempolineo",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
+  "column.direct": "Direta mesaji",
+  "column.directory": "Videz profili",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Favorati",
   "column.follow_requests": "Demandi di sequado",
   "column.home": "Hemo",
-  "column.lists": "Lists",
+  "column.lists": "Listi",
   "column.mutes": "Celita uzeri",
   "column.notifications": "Savigi",
   "column.pins": "Pinned toot",
   "column.public": "Federata tempolineo",
   "column_back_button.label": "Retro",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
+  "column_header.hide_settings": "Celez ajusti",
+  "column_header.moveLeft_settings": "Movez kolumno a la sinistro",
+  "column_header.moveRight_settings": "Movez kolumno a la dextro",
+  "column_header.pin": "Pinglagez",
+  "column_header.show_settings": "Montrez ajusti",
+  "column_header.unpin": "Depinglagez",
+  "column_subheading.settings": "Ajusti",
+  "community.column_settings.local_only": "Lokala nur",
   "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "community.column_settings.remote_only": "Fora nur",
+  "compose.language.change": "Chanjez linguo",
+  "compose.language.search": "Trovez linguo...",
+  "compose_form.direct_message_warning_learn_more": "Lernez pluse",
+  "compose_form.encryption_warning": "Posti en Mastodon ne intersequante chifrigesas. Ne partigez irga privata informo che Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
+  "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Siflar",
+  "compose_form.poll.add_option": "Insertez selekto",
+  "compose_form.poll.duration": "Votpostoduro",
+  "compose_form.poll.option_placeholder": "Selektato {number}",
+  "compose_form.poll.remove_option": "Efacez ca selektajo",
+  "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
+  "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
+  "compose_form.publish": "Publikigez",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.save_changes": "Sparez chanji",
+  "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
+  "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
+  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Averto di kontenajo",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
+  "confirmation_modal.cancel": "Anulez",
+  "confirmations.block.block_and_report": "Restriktez e Raportizez",
+  "confirmations.block.confirm": "Restriktez",
+  "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
+  "confirmations.cancel_follow_request.confirm": "Desendez demando",
+  "confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
+  "confirmations.delete.confirm": "Efacez",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.confirm": "Efacez",
+  "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
+  "confirmations.discard_edit_media.confirm": "Efacez",
+  "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
   "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.logout.confirm": "Ekirez",
+  "confirmations.logout.message": "Ka tu certe volas ekirar?",
+  "confirmations.mute.confirm": "Silencigez",
+  "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
+  "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
+  "confirmations.redraft.confirm": "Efacez e riskisez",
   "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "confirmations.reply.confirm": "Respondez",
+  "confirmations.reply.message": "Respondar nun remplos mesajo quon vu nun igas. Ka vu certe volas durar?",
+  "confirmations.unfollow.confirm": "Desequez",
+  "confirmations.unfollow.message": "Ka vu certe volas desequar {name}?",
+  "conversation.delete": "Efacez konverso",
+  "conversation.mark_as_read": "Markizez quale lektita",
+  "conversation.open": "Videz konverso",
+  "conversation.with": "Kun {names}",
+  "copypaste.copied": "Kopiesis",
+  "copypaste.copy": "Kopiez",
+  "directory.federated": "De savita fediverso",
+  "directory.local": "De {domain} nur",
+  "directory.new_arrivals": "Nova venanti",
+  "directory.recently_active": "Recenta aktivo",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "Co esas maxim recenta publika posti de personi quo havas konto quo hostigesas da {domain}.",
+  "dismissable_banner.dismiss": "Ignorez",
+  "dismissable_banner.explore_links": "Ca nova rakonti parolesas da personi che ca e altra servili di necentraligita situo nun.",
+  "dismissable_banner.explore_statuses": "Ca posti de ca e altra servili en la necentraligita situo bezonas plu famoza che ca servilo nun.",
+  "dismissable_banner.explore_tags": "Ca hashtagi bezonas plu famoza inter personi che ca e altra servili di la necentraligita situo nun.",
+  "dismissable_banner.public_timeline": "Co esas maxim recenta publika posti de personi en ca e altra servili di la necentraligita situo quo savesas da ca servilo.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
+  "embed.preview": "Co esas quon ol semblos tale:",
+  "emoji_button.activity": "Ago",
+  "emoji_button.clear": "Efacez",
+  "emoji_button.custom": "Kustumizato",
+  "emoji_button.flags": "Flagi",
+  "emoji_button.food": "Manjajo & Drinkajo",
   "emoji_button.label": "Insertar emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No matching emojis found",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_suspended": "Account suspended",
+  "emoji_button.nature": "Naturo",
+  "emoji_button.not_found": "Nula tala parigata emojii",
+  "emoji_button.objects": "Kozi",
+  "emoji_button.people": "Personi",
+  "emoji_button.recent": "Ofta uzato",
+  "emoji_button.search": "Trovez...",
+  "emoji_button.search_results": "Trovuri",
+  "emoji_button.symbols": "Simboli",
+  "emoji_button.travel": "Vizito & Plasi",
+  "empty_column.account_suspended": "Konto restriktesis",
   "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.account_unavailable": "Profilo esas nedisponebla",
+  "empty_column.blocks": "Vu ne restriktis irga uzanti til nun.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.direct": "Vu ne havas irga direta mesaji til nun. Kande vu sendas o ganas, ol montresos hike.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.explore_statuses": "Nulo esas tendenca nun. Videz itere pose!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_recommendations": "Semblas tale nula sugestato povas facesar por vu. Vu povas probar trovar personi quon vu forsan konocas o exploras tendenca hashtagi.",
+  "empty_column.follow_requests": "Vu ne havas irga sequodemandi til nun. Kande vu ganas talo, ol montresos hike.",
   "empty_column.hashtag": "Esas ankore nulo en ta gretovorto.",
-  "empty_column.home": "Tu sequas ankore nulu. Vizitez {public} od uzez la serchilo por komencar e renkontrar altra uzeri.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home": "Vua hemtempolineo esas vakua! Sequez plu multa personi por plenigar lu. {suggestions}",
+  "empty_column.home.suggestions": "Videz ula sugestati",
   "empty_column.list": "There is nothing in this list yet.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.lists": "Vu ne havas irga listi til nun. Kande vu kreas talo, ol montresos hike.",
+  "empty_column.mutes": "Vu ne silencigis irga uzanti til nun.",
   "empty_column.notifications": "Tu havas ankore nula savigo. Komunikez kun altri por debutar la konverso.",
   "empty_column.public": "Esas nulo hike! Skribez ulo publike, o manuale sequez uzeri de altra instaluri por plenigar ol.",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "error.unexpected_crash.explanation": "Pro eroro en nia kodexo o vidilkonciliebloproblemo, ca pagino ne povas korekte montresar.",
+  "error.unexpected_crash.explanation_addons": "Ca pagino ne povas korekte montresar. Ca eroro posible kauzigesas vidilplusajo o automata tradukutensili.",
+  "error.unexpected_crash.next_steps": "Probez rifreshar pagino. Se to ne helpas, vu forsan ankore povas uzar Mastodon per diferenta vidilo o provizita softwaro.",
+  "error.unexpected_crash.next_steps_addons": "Probez desaktivigar e rifreshar pagino. Se to ne helpas, vu forsan ankore povas uzar Mastodon per diferenta vidilo o provizita softwaro.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiez amastraso a klipplanko",
+  "errors.unexpected_crash.report_issue": "Reportigez problemo",
+  "explore.search_results": "Trovuri",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explorez",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Ca filtrilgrupo ne relatesas kun informo de ca acesesita posto. Se vu volas posto filtresar kun ca informo anke, vu bezonas modifikar filtrilo.",
+  "filter_modal.added.context_mismatch_title": "Kontenajneparigeso!",
+  "filter_modal.added.expired_explanation": "Ca filtrilgrupo expiris, vu bezonas chanjar expirtempo por apliko.",
+  "filter_modal.added.expired_title": "Expirinta filtrilo!",
+  "filter_modal.added.review_and_configure": "Por kontrolar e plue ajustar ca filtrilgrupo, irez a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtrilopcioni",
+  "filter_modal.added.settings_link": "opcionpagino",
+  "filter_modal.added.short_explanation": "Ca posto adjuntesas a ca filtrilgrupo: {title}.",
+  "filter_modal.added.title": "Filtrilo adjuntesas!",
+  "filter_modal.select_filter.context_mismatch": "ne relatesas kun ca informo",
+  "filter_modal.select_filter.expired": "expiris",
+  "filter_modal.select_filter.prompt_new": "Nova grupo: {name}",
+  "filter_modal.select_filter.search": "Trovez o kreez",
+  "filter_modal.select_filter.subtitle": "Usez disponebla grupo o kreez novajo",
+  "filter_modal.select_filter.title": "Filtragez ca posto",
+  "filter_modal.title.status": "Filtragez posto",
+  "follow_recommendations.done": "Fina",
+  "follow_recommendations.heading": "Sequez personi quo igas posti quon vu volas vidar! Hike esas ula sugestati.",
+  "follow_recommendations.lead": "Posti de personi quon vu sequas kronologiale montresos en vua hemniuzeto. Ne timas igar erori, vu povas desequar personi tam same facila irgatempe!",
   "follow_request.authorize": "Yurizar",
   "follow_request.reject": "Refuzar",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
+  "follow_requests.unlocked_explanation": "Quankam vua konto ne klefklozesis, la {domain} laborero pensas ke vu forsan volas kontralar sequodemandi de ca konti manuale.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "Sparesis",
   "getting_started.heading": "Debuto",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon esas programaro kun apertita kodexo. Tu povas kontributar o signalar problemi en GitHub ye {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sen {additional}",
+  "hashtag.column_settings.select.no_options_message": "Nula sugestati",
+  "hashtag.column_settings.select.placeholder": "Insertez hashtagi…",
+  "hashtag.column_settings.tag_mode.all": "Omna co",
+  "hashtag.column_settings.tag_mode.any": "Irga co",
+  "hashtag.column_settings.tag_mode.none": "Nula co",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Sequez hashtago",
+  "hashtag.unfollow": "Desequez hashtago",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "home.hide_announcements": "Celez anunci",
+  "home.show_announcements": "Montrez anunci",
+  "interaction_modal.description.favourite": "Per konto che Mastodon, vu povas favorizar ca posto por savigar postero ke vu gratitudizar lu e retenar por la futuro.",
+  "interaction_modal.description.follow": "Per konto che Mastodon, vu povas sequar {name} por ganar ola posti en vua hemniuzeto.",
+  "interaction_modal.description.reblog": "Per konto che Mastodon, vu povas bustizar ca posti por partigar kun sua sequanti.",
+  "interaction_modal.description.reply": "Per konto che Mastodon, vu povas respondar ca posto.",
+  "interaction_modal.on_another_server": "Che diferanta servilo",
+  "interaction_modal.on_this_server": "Che ca servilo",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Pro ke Mastodon esas necentraligita, on povas uzar vua havata konto quo hostigesas altra servilo di Mastodon o konciliebla metodo se on ne havas konto hike.",
+  "interaction_modal.title.favourite": "Favorata posto di {name}",
+  "interaction_modal.title.follow": "Sequez {name}",
+  "interaction_modal.title.reblog": "Bustizez posto di {name}",
+  "interaction_modal.title.reply": "Respondez posto di {name}",
+  "intervals.full.days": "{number, plural, one {# dio} other {# dii}}",
+  "intervals.full.hours": "{number, plural, one {# horo} other {# hori}}",
+  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.description": "Deskripto",
+  "keyboard_shortcuts.direct": "apertar kolumno di direta mesaji",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -229,7 +317,7 @@
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
   "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.hotkey": "Rapidklavo",
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
@@ -250,235 +338,317 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Klozar",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "lightbox.compress": "Kompresez imajvidbuxo",
+  "lightbox.expand": "Expansez imajvidbuxo",
+  "lightbox.next": "Nexta",
+  "lightbox.previous": "Antea",
+  "limited_account_hint.action": "Jus montrez profilo",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Insertez a listo",
+  "lists.account.remove": "Efacez de listo",
+  "lists.delete": "Efacez listo",
+  "lists.edit": "Modifikez listo",
+  "lists.edit.submit": "Chanjez titulo",
+  "lists.new.create": "Insertez listo",
+  "lists.new.title_placeholder": "Nova listotitulo",
+  "lists.replies_policy.followed": "Irga sequita uzanto",
+  "lists.replies_policy.list": "Membro di listo",
+  "lists.replies_policy.none": "Nulu",
+  "lists.replies_policy.title": "Montrez respondi a:",
+  "lists.search": "Trovez inter personi quon vu sequas",
+  "lists.subheading": "Vua listi",
+  "load_pending": "{count, plural, one {# nova kozo} other {# nova kozi}}",
   "loading_indicator.label": "Kargante...",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "missing_indicator.label": "Ne trovita",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "missing_indicator.sublabel": "Ca moyeno ne existas",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Durado",
+  "mute_modal.hide_notifications": "Celez avizi de ca uzanto?",
+  "mute_modal.indefinite": "Nedefinitiva",
+  "navigation_bar.about": "Pri co",
   "navigation_bar.blocks": "Blokusita uzeri",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "Libromarki",
   "navigation_bar.community_timeline": "Lokala tempolineo",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.direct": "Direta mesaji",
+  "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Modifikar profilo",
+  "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favorati",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Silencigita vorti",
   "navigation_bar.follow_requests": "Demandi di sequado",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "Detaloza informi",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.follows_and_followers": "Sequati e sequanti",
+  "navigation_bar.lists": "Listi",
   "navigation_bar.logout": "Ekirar",
   "navigation_bar.mutes": "Celita uzeri",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Personala",
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferi",
   "navigation_bar.public_timeline": "Federata tempolineo",
-  "navigation_bar.security": "Security",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Sekureso",
+  "not_signed_in_indicator.not_signed_in": "Vu mustas enirar por acesar ca moyeno.",
+  "notification.admin.report": "{name} raportizis {target}",
+  "notification.admin.sign_up": "{name} registresis",
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.follow": "{name} sequeskis tu",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} demandas sequar vu",
   "notification.mention": "{name} mencionis tu",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.own_poll": "Vua votposto finigis",
+  "notification.poll": "Votposto quo havas vua voto finigis",
   "notification.reblog": "{name} repetis tua mesajo",
-  "notification.status": "{name} just posted",
+  "notification.status": "{name} nove postigis",
+  "notification.update": "{name} modifikis posto",
   "notifications.clear": "Efacar savigi",
   "notifications.clear_confirmation": "Ka tu esas certa, ke tu volas efacar omna tua savigi?",
-  "notifications.column_settings.alert": "Surtabla savigi",
+  "notifications.column_settings.admin.report": "Nova raporti:",
+  "notifications.column_settings.admin.sign_up": "Nova registranti:",
+  "notifications.column_settings.alert": "Desktopavizi",
   "notifications.column_settings.favourite": "Favorati:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
+  "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
+  "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
   "notifications.column_settings.follow": "Nova sequanti:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Nova sequodemandi:",
   "notifications.column_settings.mention": "Mencioni:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.poll": "Votpostorezulti:",
+  "notifications.column_settings.push": "Pulsavizi",
   "notifications.column_settings.reblog": "Repeti:",
   "notifications.column_settings.show": "Montrar en kolumno",
   "notifications.column_settings.sound": "Plear sono",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
+  "notifications.column_settings.unread_notifications.category": "Nelektita avizi",
+  "notifications.column_settings.unread_notifications.highlight": "Briligez nelektita avizi",
+  "notifications.column_settings.update": "Modifikati:",
+  "notifications.filter.all": "Omna",
+  "notifications.filter.boosts": "Busti",
+  "notifications.filter.favourites": "Favorati",
+  "notifications.filter.follows": "Sequati",
+  "notifications.filter.mentions": "Mencioni",
+  "notifications.filter.polls": "Votpostorezulti",
+  "notifications.filter.statuses": "Novaji de personi quon vu sequas",
+  "notifications.grant_permission": "Donez permiso.",
+  "notifications.group": "{count} avizi",
+  "notifications.mark_as_read": "Markizez singla avizi quale lektita",
+  "notifications.permission_denied": "Desktopavizi esas nedisplonebla pro antea refuzita vidilpermisdemando",
+  "notifications.permission_denied_alert": "Desktopavizi ne povas aktivigesar pro ke vidilpermiso refuzesis",
+  "notifications.permission_required": "Desktopavizi esas nedisplonebla pro ke bezonata permiso ne donesis.",
+  "notifications_permission_banner.enable": "Aktivigez desktopavizi",
+  "notifications_permission_banner.how_to_control": "Por ganar avizi kande Mastodon ne esas apertita, aktivigez dekstopavizi. Vu povas precize regularar quale interakti facas deskstopavizi tra la supera {icon} butono pos oli aktivigesis.",
+  "notifications_permission_banner.title": "Irga kozo ne pasas vu",
+  "picture_in_picture.restore": "Retropozez",
+  "poll.closed": "Klozita",
+  "poll.refresh": "Rifreshez",
+  "poll.total_people": "{count, plural, one {# persono} other {# personi}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# voti}}",
+  "poll.vote": "Votez",
+  "poll.voted": "Vu ja votis ca respondo",
+  "poll.votes": "{votes, plural, one {# voto} other {# voti}}",
+  "poll_button.add_poll": "Insertez votposto",
+  "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
   "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Direte",
+  "privacy.direct.short": "Mencionita personi nur",
   "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Private",
-  "privacy.public.long": "Sendar a publika tempolinei",
+  "privacy.private.short": "Sequanti nur",
+  "privacy.public.long": "Videbla da omnu",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Ne montrar en publika tempolinei",
+  "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
   "privacy.unlisted.short": "Ne enlistigota",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "privacy_policy.last_updated": "Antea novajo ye {date}",
+  "privacy_policy.title": "Privatesguidilo",
+  "refresh": "Rifreshez",
+  "regeneration_indicator.label": "Chargas…",
+  "regeneration_indicator.sublabel": "Vua hemniuzeto preparesas!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dio} other {# dii}} ante nun",
+  "relative_time.full.hours": "{number, plural, one {# horo} other {# hori}} ante nun",
+  "relative_time.full.just_now": "jus nun",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# minuti}} ante nun",
+  "relative_time.full.seconds": "{number, plural, one {# sekundo} other {# sekundi}} ante nun",
   "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "nun",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
+  "relative_time.today": "hodie",
   "reply_indicator.cancel": "Nihiligar",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.block": "Restriktez",
+  "report.block_explanation": "Vu ne vidos olia posti. Oli ne povas vidar vua posti o sequar vu. Oli savos ke oli restriktesis.",
+  "report.categories.other": "Altra",
+  "report.categories.spam": "Spamo",
+  "report.categories.violation": "Kontenaj nesequas servilregulo",
+  "report.category.subtitle": "Selektez maxim bona parigato",
+  "report.category.title": "Savigez ni pri quo eventas kun ca {type}",
+  "report.category.title_account": "profilo",
+  "report.category.title_status": "posto",
+  "report.close": "Fina",
+  "report.comment.title": "Ka altra irgo quon vu pensas ke ni debas savar?",
+  "report.forward": "Sendez a {target}",
+  "report.forward_hint": "La konto esas de altra servilo. Vu volas sendar raportkopiur sen nomo ibe anke?",
+  "report.mute": "Silencigez",
+  "report.mute_explanation": "Vu ne vidos olia posti. Oli povas ankore sequar vu e vidar vua posti e ne savar ke oli silencigesis.",
+  "report.next": "Nexta",
   "report.placeholder": "Plusa komenti",
+  "report.reasons.dislike": "Me ne amas",
+  "report.reasons.dislike_description": "Ol ne esas olo quon vu volas vidar",
+  "report.reasons.other": "Ol esas altra ulo",
+  "report.reasons.other_description": "La problemo ne fitas a altra kategorii",
+  "report.reasons.spam": "Ol esas spamo",
+  "report.reasons.spam_description": "Mala ligili, falsa interago o repetiva repliki",
+  "report.reasons.violation": "Ol nesequas servilreguli",
+  "report.reasons.violation_description": "Vu remarkas ke ol nesequas partikulara reguli",
+  "report.rules.subtitle": "Selektez relatata omno",
+  "report.rules.title": "Quala reguli nesequesas?",
+  "report.statuses.subtitle": "Selektez relatata omno",
+  "report.statuses.title": "Ka existas irga posti quo suportas ca raporto?",
   "report.submit": "Sendar",
   "report.target": "Denuncante",
+  "report.thanks.take_action": "Co esas vua opcioni por regularar quo vu vidas che Mastodon:",
+  "report.thanks.take_action_actionable": "Dum ke ni kontrolas co, vu povas demarshar kontra @{name}:",
+  "report.thanks.title": "Ka vu ne volas vidar co?",
+  "report.thanks.title_actionable": "Danko por raportizar, ni kontrolos co.",
+  "report.unfollow": "Desequez @{name}",
+  "report.unfollow_explanation": "Vu sequas ca konto. Por ne vidar olia posti en vua hemniuzeto pluse, desequez oli.",
+  "report_notification.attached_statuses": "{count, plural,one {{count} posti} other {{count} posti}} adjuntesas",
+  "report_notification.categories.other": "Altra",
+  "report_notification.categories.spam": "Spamo",
+  "report_notification.categories.violation": "Regulnesequo",
+  "report_notification.open": "Apertez raporto",
   "search.placeholder": "Serchez",
-  "search_popout.search_format": "Advanced search format",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Avancata trovformato",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.hashtag": "hashtago",
   "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
-  "search_popout.tips.user": "user",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_popout.tips.text": "Simpla textoretrovenuri quo parigas trovnomi, uzantonomi e hashtagi",
+  "search_popout.tips.user": "uzanto",
+  "search_results.accounts": "Personi",
+  "search_results.all": "Omna",
+  "search_results.hashtags": "Hashtagi",
+  "search_results.nothing_found": "Ne povas ganar irgo per ca trovvorti",
+  "search_results.statuses": "Posti",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Trovez {q}",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
-  "status.admin_account": "Open moderation interface for @{name}",
+  "server_banner.about_active_users": "Personi quo uzas ca servilo dum antea 30 dii (monate aktiva uzanti)",
+  "server_banner.active_users": "aktiva uzanti",
+  "server_banner.administered_by": "Administresis da:",
+  "server_banner.introduction": "{domain} esas parto di necentraligita sociala ret quo povizesas da {mastodon}.",
+  "server_banner.learn_more": "Lernez plue",
+  "server_banner.server_stats": "Servilstatistiko:",
+  "sign_in_banner.create_account": "Kreez konto",
+  "sign_in_banner.sign_in": "Enirez",
+  "sign_in_banner.text": "Enirez por sequar profili o hashtagi, favorizar, partigar e respondizar posti, o interagar de vua konto de diferanta servilo.",
+  "status.admin_account": "Apertez jerintervizajo por @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
+  "status.block": "Restriktez @{name}",
+  "status.bookmark": "Libromarko",
+  "status.cancel_reblog_private": "Debustez",
+  "status.cannot_reblog": "Ca posto ne povas bustesas",
   "status.copy": "Copy link to status",
   "status.delete": "Efacar",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
+  "status.detailed_status": "Detala konversvido",
+  "status.direct": "Direta mesajigez @{name}",
+  "status.edit": "Modifikez",
+  "status.edited": "Modifikesis ye {date}",
+  "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
+  "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
-  "status.filtered": "Filtered",
+  "status.filter": "Filtragez ca posto",
+  "status.filtered": "Filtrita",
+  "status.hide": "Celez posto",
+  "status.history.created": "{name} kreis ye {date}",
+  "status.history.edited": "{name} modifikis ye {date}",
   "status.load_more": "Kargar pluse",
   "status.media_hidden": "Kontenajo celita",
   "status.mention": "Mencionar @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Mute conversation",
+  "status.more": "Pluse",
+  "status.mute": "Silencigez @{name}",
+  "status.mute_conversation": "Silencigez konverso",
   "status.open": "Detaligar ca mesajo",
-  "status.pin": "Pin on profile",
+  "status.pin": "Pinglagez che profilo",
   "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
+  "status.read_more": "Lektez pluse",
   "status.reblog": "Repetar",
-  "status.reblog_private": "Boost with original visibility",
+  "status.reblog_private": "Bustez kun originala videbleso",
   "status.reblogged_by": "{name} repetita",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.redraft": "Efacez e riskisigez",
+  "status.remove_bookmark": "Efacez libromarko",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Respondar",
   "status.replyAll": "Respondar a filo",
   "status.report": "Denuncar @{name}",
   "status.sensitive_warning": "Trubliva kontenajo",
-  "status.share": "Share",
+  "status.share": "Partigez",
+  "status.show_filter_reason": "Jus montrez",
   "status.show_less": "Montrar mine",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Montrez min por omno",
   "status.show_more": "Montrar plue",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "status.show_more_all": "Montrez pluse por omno",
+  "status.show_original": "Montrez originalo",
+  "status.translate": "Tradukez",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Nedisplonebla",
+  "status.unmute_conversation": "Desilencigez konverso",
+  "status.unpin": "Depinglagez de profilo",
+  "subscribed_languages.lead": "Nur posti en selektita lingui aparos en vua hemo e listotempolineo pos chanjo. Selektez nulo por ganar posti en omna lingui.",
+  "subscribed_languages.save": "Sparez chanji",
+  "subscribed_languages.target": "Chanjez abonita lingui por {target}",
+  "suggestions.dismiss": "Desklozez sugestajo",
+  "suggestions.header": "Vu forsan havas intereso pri…",
   "tabs_bar.federated_timeline": "Federata",
   "tabs_bar.home": "Hemo",
   "tabs_bar.local_timeline": "Lokala",
   "tabs_bar.notifications": "Savigi",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
+  "time_remaining.days": "{number, plural, one {# dio} other {# dii}} restas",
+  "time_remaining.hours": "{number, plural, one {# horo} other {# hori}} restas",
+  "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} restas",
+  "time_remaining.moments": "Poka sekundi restas",
+  "time_remaining.seconds": "{number, plural, one {# sekundo} other {# sekundi}} restas",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de altra servili ne montresas.",
+  "timeline_hint.resources.followers": "Sequanti",
+  "timeline_hint.resources.follows": "Sequati",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "units.short.billion": "{count}B",
+  "trends.counter_by_accounts": "{count, plural,one {{counter} persono} other {{counter} personi}} en antea {days, plural,one {dio} other {{days} dii}}",
+  "trends.trending_now": "Tendencigas nun",
+  "ui.beforeunload": "Vua skisato perdesos se vu ekiras Mastodon.",
+  "units.short.billion": "{count}G",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Tranar faligar por kargar",
   "upload_button.label": "Adjuntar kontenajo",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_error.limit": "Failadcharglimito ecesesis.",
+  "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
+  "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
+  "upload_form.description": "Deskriptez por personi kun vidnekapableso",
+  "upload_form.description_missing": "Deskriptajo ne insertesis",
+  "upload_form.edit": "Modifikez",
+  "upload_form.thumbnail": "Chanjez imajeto",
   "upload_form.undo": "Desfacar",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
+  "upload_modal.analyzing_picture": "Analizas imajo…",
+  "upload_modal.apply": "Aplikez",
+  "upload_modal.applying": "Aplikas…",
+  "upload_modal.choose_image": "Selektez imajo",
+  "upload_modal.description_placeholder": "Rapida bruna foxo saltas super la indolenta hundo",
+  "upload_modal.detect_text": "Deskovrez texto de imajo",
+  "upload_modal.edit_media": "Modifikez medii",
+  "upload_modal.hint": "Kliktez o tirez cirklo che prevido por selektar centrala punto quo sempre montresas kun omna imajeti.",
+  "upload_modal.preparing_ocr": "Preparas OCR…",
+  "upload_modal.preview_label": "Previdez ({ratio})",
   "upload_progress.label": "Kargante...",
-  "video.close": "Close video",
-  "video.download": "Download file",
-  "video.exit_fullscreen": "Exit full screen",
-  "video.expand": "Expand video",
-  "video.fullscreen": "Full screen",
-  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
+  "upload_progress.processing": "Processing…",
+  "video.close": "Klozez video",
+  "video.download": "Deschargez failo",
+  "video.exit_fullscreen": "Ekirez plena skreno",
+  "video.expand": "Expansez video",
+  "video.fullscreen": "Plena skreno",
+  "video.hide": "Celez video",
+  "video.mute": "Silencigez sono",
+  "video.pause": "Pauzez",
+  "video.play": "Pleez",
+  "video.unmute": "Desilencigez sono"
 }
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 9aeca30ac..20604a9e4 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -1,83 +1,117 @@
 {
+  "about.blocks": "Netþjónar með efnisumsjón",
+  "about.contact": "Hafa samband:",
+  "about.disclaimer": "Mastodon er frjáls hugbúnaður með opinn grunnkóða og er skrásett vörumerki í eigu Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Ástæða ekki tiltæk",
+  "about.domain_blocks.preamble": "Mastodon leyfir þér almennt að skoða og eiga við efni frá notendum frá hvaða vefþjóni sem er í vefþjónasambandinu. Þetta eru þær undantekningar sem hafa verið gerðar á þessum tiltekna vefþjóni.",
+  "about.domain_blocks.silenced.explanation": "Þú munt almennt ekki sjá notandasnið og efni af þessum netþjóni nema þú flettir því upp sérstaklega eða veljir að fylgjast með því.",
+  "about.domain_blocks.silenced.title": "Takmarkað",
+  "about.domain_blocks.suspended.explanation": "Engin gögn frá þessum vefþjóni verða unnin, geymd eða skipst á, sem gerir samskipti við notendur frá þessum vefþjóni ómöguleg.",
+  "about.domain_blocks.suspended.title": "Í frysti",
+  "about.not_available": "Þessar upplýsingar hafa ekki verið gerðar aðgengilegar á þessum netþjóni.",
+  "about.powered_by": "Dreifhýstur samskiptamiðill keyrður með {mastodon}",
+  "about.rules": "Reglur netþjónsins",
   "account.account_note_header": "Minnispunktur",
   "account.add_or_remove_from_list": "Bæta við eða fjarlægja af listum",
-  "account.badges.bot": "Þjarkur",
+  "account.badges.bot": "Yrki",
   "account.badges.group": "Hópur",
   "account.block": "Loka á @{name}",
-  "account.block_domain": "Fela allt frá {domain}",
-  "account.blocked": "Lokað á",
+  "account.block_domain": "Útiloka lénið {domain}",
+  "account.blocked": "Útilokaður",
   "account.browse_more_on_origin_server": "Skoða nánari upplýsingar á notandasniðinu",
-  "account.cancel_follow_request": "Hætta við beiðni um að fylgjas",
+  "account.cancel_follow_request": "Taka fylgjendabeiðni til baka",
   "account.direct": "Bein skilaboð til @{name}",
-  "account.disable_notifications": "Hættu að láta mig vita þegar @{name} þýtur",
-  "account.domain_blocked": "Lén falið",
+  "account.disable_notifications": "Hætta að láta mig vita þegar @{name} sendir inn",
+  "account.domain_blocked": "Lén útilokað",
   "account.edit_profile": "Breyta notandasniði",
   "account.enable_notifications": "Láta mig vita þegar @{name} sendir inn",
   "account.endorse": "Birta á notandasniði",
+  "account.featured_tags.last_status_at": "Síðasta færsla þann {date}",
+  "account.featured_tags.last_status_never": "Engar færslur",
+  "account.featured_tags.title": "Myllumerki hjá {name} með aukið vægi",
   "account.follow": "Fylgjast með",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
-  "account.followers_counter": "{count, plural, one {{counter} fylgjandi} other {{counter} fylgjendur}}",
-  "account.following_counter": "{count, plural, one {{counter} fylgist með} other {{counter} fylgjast með}}",
+  "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}",
+  "account.following": "Fylgist með",
+  "account.following_counter": "{count, plural, one {Fylgist með: {counter}} other {Fylgist með: {counter}}}",
   "account.follows.empty": "Þessi notandi fylgist ennþá ekki með neinum.",
   "account.follows_you": "Fylgir þér",
+  "account.go_to_profile": "Fara í notandasnið",
   "account.hide_reblogs": "Fela endurbirtingar fyrir @{name}",
-  "account.joined": "Gerðist þátttakandi {date}",
-  "account.last_status": "Síðasta virkni",
+  "account.joined_short": "Gerðist þátttakandi",
+  "account.languages": "Breyta tungumálum í áskrift",
   "account.link_verified_on": "Eignarhald á þessum tengli var athugað þann {date}",
   "account.locked_info": "Staða gagnaleyndar á þessum aðgangi er stillt á læsingu. Eigandinn yfirfer handvirkt hverjir geti fylgst með honum.",
   "account.media": "Myndskrár",
   "account.mention": "Minnast á @{name}",
-  "account.moved_to": "{name} hefur verið færður til:",
+  "account.moved_to": "{name} hefur gefið til kynna að nýi notandaaðgangurinn sé:",
   "account.mute": "Þagga niður í @{name}",
   "account.mute_notifications": "Þagga tilkynningar frá @{name}",
-  "account.muted": "Þaggað",
-  "account.never_active": "Aldrei",
-  "account.posts": "Þyt",
-  "account.posts_with_replies": "Þyt og svör",
+  "account.muted": "Þaggaður",
+  "account.open_original_page": "Opna upprunalega síðu",
+  "account.posts": "Færslur",
+  "account.posts_with_replies": "Færslur og svör",
   "account.report": "Kæra @{name}",
   "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
+  "account.requested_follow": "{name} hefur beðið um að fylgjast með þér",
   "account.share": "Deila notandasniði fyrir @{name}",
   "account.show_reblogs": "Sýna endurbirtingar frá @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} tíst} other {{counter} tíst}}",
+  "account.statuses_counter": "{count, plural, one {Færsla: {counter}} other {Færslur: {counter}}}",
   "account.unblock": "Aflétta útilokun af @{name}",
-  "account.unblock_domain": "Hætta að fela {domain}",
+  "account.unblock_domain": "Aflétta útilokun lénsins {domain}",
+  "account.unblock_short": "Hætta að loka á",
   "account.unendorse": "Ekki birta á notandasniði",
   "account.unfollow": "Hætta að fylgja",
   "account.unmute": "Hætta að þagga niður í @{name}",
   "account.unmute_notifications": "Hætta að þagga tilkynningar frá @{name}",
-  "account_note.placeholder": "Engin athugasemd gefin",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "Hætta að þagga niður",
+  "account_note.placeholder": "Smelltu til að bæta við minnispunkti",
+  "admin.dashboard.daily_retention": "Hlutfall virkra notenda eftir nýskráningu eftir dögum",
+  "admin.dashboard.monthly_retention": "Hlutfall virkra notenda eftir nýskráningu eftir mánuðum",
+  "admin.dashboard.retention.average": "Meðaltal",
+  "admin.dashboard.retention.cohort": "Mánuður nýskráninga",
+  "admin.dashboard.retention.cohort_size": "Nýir notendur",
   "alert.rate_limited.message": "Prófaðu aftur eftir {retry_time, time, medium}.",
   "alert.rate_limited.title": "Með takmörkum",
   "alert.unexpected.message": "Upp kom óvænt villa.",
   "alert.unexpected.title": "Úbbs!",
   "announcement.announcement": "Auglýsing",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(óunnið)",
+  "audio.hide": "Fela hljóð",
   "autosuggest_hashtag.per_week": "{count} á viku",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
-  "bundle_column_error.body": "Eitthvað fór úrskeiðis við að hlaða inn þessari einingu.",
-  "bundle_column_error.retry": "Reyndu aftur",
-  "bundle_column_error.title": "Villa í netkerfi",
+  "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
+  "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
+  "bundle_column_error.error.title": "Ó-nei!",
+  "bundle_column_error.network.body": "Villa kom upp við að hlaða inn þessari síðu. Þetta gæti stafað af tímabundnum vandamálum með internettenginguna þína eða þennan netþjón.",
+  "bundle_column_error.network.title": "Villa í netkerfi",
+  "bundle_column_error.retry": "Reyna aftur",
+  "bundle_column_error.return": "Fara til baka á upphafssíðu",
+  "bundle_column_error.routing.body": "Umbeðin síða fannst ekki. Ertu viss um að slóðin í vistfangastikunni sé rétt?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Loka",
   "bundle_modal_error.message": "Eitthvað fór úrskeiðis við að hlaða inn þessari einingu.",
   "bundle_modal_error.retry": "Reyndu aftur",
+  "closed_registrations.other_server_instructions": "Þar sem Mastodon er ekki miðstýrt, þá getur þú búið til aðgang á öðrum þjóni, en samt haft samskipti við þennan.",
+  "closed_registrations_modal.description": "Að búa til aðgang á {domain} er ekki mögulegt eins og er, en vinsamlegast hafðu í huga að þú þarft ekki aðgang sérstaklega á {domain} til að nota Mastodon.",
+  "closed_registrations_modal.find_another_server": "Finna annan netþjón",
+  "closed_registrations_modal.preamble": "Mastodon er ekki miðstýrt, svo það skiptir ekki máli hvar þú býrð til aðgang; þú munt get fylgt eftir og haft samskipti við hvern sem er á þessum þjóni. Þú getur jafnvel hýst þinn eigin Mastodon þjón!",
+  "closed_registrations_modal.title": "Að nýskrá sig á Mastodon",
+  "column.about": "Um hugbúnaðinn",
   "column.blocks": "Útilokaðir notendur",
   "column.bookmarks": "Bókamerki",
   "column.community": "Staðvær tímalína",
   "column.direct": "Bein skilaboð",
-  "column.directory": "Skoða notandasnið",
-  "column.domain_blocks": "Falin lén",
-  "column.favourites": "Fílanir",
-  "column.follow_requests": "Fylgja beiðnum",
+  "column.directory": "Skoða notendasnið",
+  "column.domain_blocks": "Útilokuð lén",
+  "column.favourites": "Eftirlæti",
+  "column.follow_requests": "Beiðnir um að fylgjast með",
   "column.home": "Heim",
   "column.lists": "Listar",
   "column.mutes": "Þaggaðir notendur",
   "column.notifications": "Tilkynningar",
-  "column.pins": "Föst tíst",
+  "column.pins": "Festar færslur",
   "column.public": "Sameiginleg tímalína",
   "column_back_button.label": "Til baka",
   "column_header.hide_settings": "Fela stillingar",
@@ -90,45 +124,51 @@
   "community.column_settings.local_only": "Einungis staðvært",
   "community.column_settings.media_only": "Einungis myndskrár",
   "community.column_settings.remote_only": "Einungis fjartengt",
-  "compose_form.direct_message_warning": "Þetta tíst verður aðeins sent á notendur sem minnst er á.",
+  "compose.language.change": "Skipta um tungumál",
+  "compose.language.search": "Leita að tungumálum...",
   "compose_form.direct_message_warning_learn_more": "Kanna nánar",
-  "compose_form.hashtag_warning": "Þetta tíst verður ekki talið með undir nokkru myllumerki þar sem það er óskráð. Einungis er hægt að leita að opinberum tístum eftir myllumerkjum.",
-  "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þeim færslum þínum sem einungis eru til fylgjenda þinna.",
-  "compose_form.lock_disclaimer.lock": "læst",
-  "compose_form.placeholder": "Hvað varstu að hugsa?",
+  "compose_form.encryption_warning": "Færslur á Mastodon eru ekki enda-í-enda dulritaðar. Ekki deila viðkvæmum upplýsingum á Mastodon.",
+  "compose_form.hashtag_warning": "Þessi færsla verður ekki talin með undir nokkru myllumerki þar sem það er óskráð. Einungis er hægt að leita að opinberum færslum eftir myllumerkjum.",
+  "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þér til að sjá þær færslur sem einungis eru til fylgjenda þinna.",
+  "compose_form.lock_disclaimer.lock": "læstur",
+  "compose_form.placeholder": "Hvað liggur þér á hjarta?",
   "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
   "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
-  "compose_form.publish": "Þyt",
+  "compose_form.publish": "Birta",
+  "compose_form.publish_form": "Birta",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Merkja myndir sem viðkvæmar",
-  "compose_form.sensitive.marked": "Mynd er merkt sem viðkvæm",
-  "compose_form.sensitive.unmarked": "Mynd er ekki merkt sem viðkvæm",
-  "compose_form.spoiler.marked": "Texti er falinn á bak við aðvörun",
-  "compose_form.spoiler.unmarked": "Texti er ekki falinn",
+  "compose_form.save_changes": "Vista breytingar",
+  "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+  "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
+  "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
   "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
   "confirmation_modal.cancel": "Hætta við",
   "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
   "confirmations.block.message": "Ertu viss um að þú viljir loka á {name}?",
+  "confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
+  "confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
   "confirmations.delete.confirm": "Eyða",
-  "confirmations.delete.message": "Ertu viss um að þú viljir eyða þessari stöðufærslu?",
+  "confirmations.delete.message": "Ertu viss um að þú viljir eyða þessari færslu?",
   "confirmations.delete_list.confirm": "Eyða",
   "confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Fela allt lénið",
+  "confirmations.discard_edit_media.confirm": "Henda",
+  "confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
+  "confirmations.domain_block.confirm": "Útiloka allt lénið",
   "confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.mute.confirm": "Þagga",
   "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
   "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
-  "confirmations.redraft.confirm": "Eyða og enduvinna drög",
-  "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari stöðufærslu og enduvinna drögin? Fílanir og endurbirtingar munu glatast og svör við upprunalegu fæerslunni munu verða munaðarlaus.",
+  "confirmations.redraft.confirm": "Eyða og endurvinna drög",
+  "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
   "confirmations.reply.confirm": "Svara",
   "confirmations.reply.message": "Ef þú svarar núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
   "confirmations.unfollow.confirm": "Hætta að fylgja",
@@ -137,43 +177,55 @@
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
   "conversation.with": "Með {names}",
+  "copypaste.copied": "Afritað",
+  "copypaste.copy": "Afrita",
   "directory.federated": "Frá samtengdum vefþjónum",
   "directory.local": "Einungis frá {domain}",
   "directory.new_arrivals": "Nýkomnir",
   "directory.recently_active": "Nýleg virkni",
+  "disabled_account_banner.account_settings": "Stillingar notandaaðgangs",
+  "disabled_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu.",
+  "dismissable_banner.community_timeline": "Þetta eru nýjustu opinberu færslurnar frá fólki sem er hýst á {domain}.",
+  "dismissable_banner.dismiss": "Hunsa",
+  "dismissable_banner.explore_links": "Þetta eru fréttafærslur sem í augnablikinu er verið að tala um af fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
+  "dismissable_banner.explore_statuses": "Þessar færslur frá þessum og öðrum netþjónum á dreifhýsta netkerfinu eru að fá aukna athygli í þessu töluðum orðum.",
+  "dismissable_banner.explore_tags": "Þetta eru myllumerki sem í augnablikinu eru að fá aukna athygli hjá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
+  "dismissable_banner.public_timeline": "Þetta eru nýjustu opinberar færslur frá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu sem þessi netþjónn veit um.",
   "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
   "embed.preview": "Svona mun þetta líta út:",
   "emoji_button.activity": "Virkni",
-  "emoji_button.custom": "Sérsniðið",
+  "emoji_button.clear": "Hreinsa",
+  "emoji_button.custom": "Sérsniðin",
   "emoji_button.flags": "Flögg",
   "emoji_button.food": "Matur og drykkur",
   "emoji_button.label": "Setja inn tjáningartákn",
   "emoji_button.nature": "Náttúra",
-  "emoji_button.not_found": "Engin tjáningartákn!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Engin samsvarandi tjáningartákn fundust",
   "emoji_button.objects": "Hlutir",
   "emoji_button.people": "Fólk",
-  "emoji_button.recent": "Oft notað",
+  "emoji_button.recent": "Oft notuð",
   "emoji_button.search": "Leita...",
   "emoji_button.search_results": "Leitarniðurstöður",
   "emoji_button.symbols": "Tákn",
   "emoji_button.travel": "Ferðalög og staðir",
-  "empty_column.account_suspended": "Notandaaðgangur í bið",
-  "empty_column.account_timeline": "Engin þyt hér!",
+  "empty_column.account_suspended": "Notandaaðgangur í frysti",
+  "empty_column.account_timeline": "Engar færslur hér!",
   "empty_column.account_unavailable": "Notandasnið ekki tiltækt",
   "empty_column.blocks": "Þú hefur ekki ennþá útilokað neina notendur.",
-  "empty_column.bookmarked_statuses": "Þú ert ekki ennþá með nein bókamerkt þyt. Þegar þú gefur þyti bókamerki, mun það birtast hér.",
+  "empty_column.bookmarked_statuses": "Þú ert ekki ennþá með neinar bókamerktar færslur. Þegar þú bókamerkir færslu, mun það birtast hér.",
   "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!",
   "empty_column.direct": "Þú átt ennþá engin bein skilaboð. Þegar þú sendir eða tekur á móti slíkum skilaboðum, munu þau birtast hér.",
-  "empty_column.domain_blocks": "Það eru engin falin lén ennþá.",
-  "empty_column.favourited_statuses": "Þú hefur ekki fílað nein þyt. Þegar að þú fílar þyt, þá mun það birtast hér.",
-  "empty_column.favourites": "Enginn hefu fílað þetta þyt ennþá. Þegar einhver gerir það, mun sá birtast hér.",
+  "empty_column.domain_blocks": "Það eru ennþá engin útilokuð lén.",
+  "empty_column.explore_statuses": "Ekkert er á uppleið í augnablikinu. Athugaðu aftur síðar!",
+  "empty_column.favourited_statuses": "Þú ert ekki ennþá með neinar eftirlætisfærslur. Þegar þú setur færslu í eftirlæti, munu þau birtast hér.",
+  "empty_column.favourites": "Enginn hefur ennþá sett þessa færslu í eftirlæti. Þegar einhver gerir það, mun það birtast hér.",
   "empty_column.follow_recommendations": "Það lítur út fyrir að ekki hafi verið hægt að útbúa neinar tillögur fyrir þig. Þú getur reynt að leita að fólki sem þú gætir þekkt eða skoðað myllumerki sem eru í umræðunni.",
   "empty_column.follow_requests": "Þú átt ennþá engar beiðnir um að fylgja þér. Þegar þú færð slíkar beiðnir, munu þær birtast hér.",
   "empty_column.hashtag": "Það er ekkert ennþá undir þessu myllumerki.",
-  "empty_column.home": "Heimatímalínan þín er tóm! Skoðaðu {public} eða notaðu leitina til að komast í gang og finna annað fólk.",
+  "empty_column.home": "Heimatímalínan þín er tóm! Fylgstu með fleira fólki til að fylla hana. {suggestions}",
   "empty_column.home.suggestions": "Skoðaðu nokkrar tillögur",
-  "empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar stöðufærslur, munu þær birtast hér.",
-  "empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú byrð til einhvern lista, munu hann birtast hér.",
+  "empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
+  "empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
   "empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
   "empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
   "empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Prófaðu að gera þau óvirk og svo endurlesa síðuna. Ef það hjálpar ekki til, má samt vera að þú getir notað Mastodon í gegnum annan vafra eða forrit.",
   "errors.unexpected_crash.copy_stacktrace": "Afrita rakningarupplýsingar (stacktrace) á klippispjald",
   "errors.unexpected_crash.report_issue": "Tilkynna vandamál",
+  "explore.search_results": "Leitarniðurstöður",
+  "explore.suggested_follows": "Fyrir þig",
+  "explore.title": "Kanna",
+  "explore.trending_links": "Fréttir",
+  "explore.trending_statuses": "Færslur",
+  "explore.trending_tags": "Myllumerki",
+  "filter_modal.added.context_mismatch_explanation": "Þessi síuflokkur á ekki við í því samhengi sem aðgangur þinn að þessari færslu felur í sér. Ef þú vilt að færslan sé einnig síuð í þessu samhengi, þá þarftu að breyta síunni.",
+  "filter_modal.added.context_mismatch_title": "Misræmi í samhengi!",
+  "filter_modal.added.expired_explanation": "Þessi síuflokkur er útrunninn, þú þarft að breyta gidistímanum svo hann geti átt við.",
+  "filter_modal.added.expired_title": "Útrunnin sía!",
+  "filter_modal.added.review_and_configure": "Til að yfirfara og stilla frekar þennan síuflokk, ættirðu að fara í {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Síustillingar",
+  "filter_modal.added.settings_link": "stillingasíða",
+  "filter_modal.added.short_explanation": "Þessari færslu hefur verið bætt í eftirfarandi síuflokk: {title}.",
+  "filter_modal.added.title": "Síu bætt við!",
+  "filter_modal.select_filter.context_mismatch": "á ekki við í þessu samhengi",
+  "filter_modal.select_filter.expired": "útrunnið",
+  "filter_modal.select_filter.prompt_new": "Nýr flokkur: {name}",
+  "filter_modal.select_filter.search": "Leita eða búa til",
+  "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
+  "filter_modal.select_filter.title": "Sía þessa færslu",
+  "filter_modal.title.status": "Sía færslu",
   "follow_recommendations.done": "Lokið",
   "follow_recommendations.heading": "Fylgstu með fólki sem þú vilt sjá færslur frá! Hér eru nokkrar tillögur.",
   "follow_recommendations.lead": "Færslur frá fólki sem þú fylgist með eru birtar í tímaröð á heimastreyminu þínu. Þú þarft ekki að hræðast mistök, það er jafn auðvelt að hætta að fylgjast með fólki hvenær sem er!",
   "follow_request.authorize": "Heimila",
   "follow_request.reject": "Hafna",
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
+  "footer.about": "Nánari upplýsingar",
+  "footer.directory": "Notandasniðamappa",
+  "footer.get_app": "Ná í forritið",
+  "footer.invite": "Bjóða fólki",
+  "footer.keyboard_shortcuts": "Flýtileiðir á lyklaborði",
+  "footer.privacy_policy": "Persónuverndarstefna",
+  "footer.source_code": "Skoða frumkóða",
   "generic.saved": "Vistað",
-  "getting_started.developers": "Forritarar",
-  "getting_started.directory": "Notandasniðamappa",
-  "getting_started.documentation": "Hjálparskjöl",
   "getting_started.heading": "Komast í gang",
-  "getting_started.invite": "Bjóða fólki",
-  "getting_started.open_source_notice": "Mastodon er opinn og frjáls hugbúnaður. Þú getur lagt þitt af mörkum eða tilkynnt um vandamál á GitHub á slóðinni {github}.",
-  "getting_started.security": "Stillingar notandaaðgangs",
-  "getting_started.terms": "Þjónustuskilmálar",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eða {additional}",
   "hashtag.column_header.tag_mode.none": "án {additional}",
@@ -207,53 +281,69 @@
   "hashtag.column_settings.tag_mode.any": "Hvað sem er af þessu",
   "hashtag.column_settings.tag_mode.none": "Ekkert af þessu",
   "hashtag.column_settings.tag_toggle": "Taka með viðbótarmerki fyrir þennan dálk",
+  "hashtag.follow": "Fylgjast með myllumerki",
+  "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
   "home.hide_announcements": "Fela auglýsingar",
   "home.show_announcements": "Birta auglýsingar",
+  "interaction_modal.description.favourite": "Með notandaaðgangi á Mastodon geturðu sett þessa færslu í eftirlæti og þannig látið höfundinn vita að þú kunnir að meta hana og vistað hana til síðari tíma.",
+  "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
+  "interaction_modal.description.reblog": "Með notandaaðgangi á Mastodon geturðu endurbirt þessa færslu til að deila henni með þeim sem fylgjast með þér.",
+  "interaction_modal.description.reply": "Með notandaaðgangi á Mastodon geturðu svarað þessari færslu.",
+  "interaction_modal.on_another_server": "Á öðrum netþjóni",
+  "interaction_modal.on_this_server": "Á þessum netþjóni",
+  "interaction_modal.other_server_instructions": "Afritaðu og límdu þessa slóð inn í leitarreit Mastodon-forrits þess sem þú vilt nota eða í vefviðmóti Mastodon-netþjónsins þíns.",
+  "interaction_modal.preamble": "Þar sem Mastodon er dreifhýst kerfi, þá geturðu notað aðgang sem er hýstur á öðrum Mastodon-þjóni eða öðru samhæfðu kerfi, ef þú ert ekki með notandaaðgang á þessum hér.",
+  "interaction_modal.title.favourite": "Setja færsluna frá {name} í eftirlæti",
+  "interaction_modal.title.follow": "Fylgjast með {name}",
+  "interaction_modal.title.reblog": "Endurbirta færsluna frá {name}",
+  "interaction_modal.title.reply": "Svara færslunni frá {name}",
   "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# klukkustund} other {# klukkustundir}}",
   "intervals.full.minutes": "{number, plural, one {# mínúta} other {# mínútur}}",
-  "keyboard_shortcuts.back": "að fara til baka",
-  "keyboard_shortcuts.blocked": "að opna lista yfir útilokaða notendur",
-  "keyboard_shortcuts.boost": "að endurbirta",
-  "keyboard_shortcuts.column": "að setja virkni á stöðufærslu í einum af dálkunum",
-  "keyboard_shortcuts.compose": "að setja virkni á textainnsetningarreit",
+  "keyboard_shortcuts.back": "Fara til baka",
+  "keyboard_shortcuts.blocked": "Opna lista yfir útilokaða notendur",
+  "keyboard_shortcuts.boost": "Endurbirta færslu",
+  "keyboard_shortcuts.column": "Setja virkni í dálk",
+  "keyboard_shortcuts.compose": "Setja virkni á textainnsetningarreit",
   "keyboard_shortcuts.description": "Lýsing",
   "keyboard_shortcuts.direct": "að opna dálk með beinum skilaboðum",
-  "keyboard_shortcuts.down": "að fara neðar í listanum",
-  "keyboard_shortcuts.enter": "að opna stöðufærslu",
-  "keyboard_shortcuts.favourite": "Fíla þyt",
-  "keyboard_shortcuts.favourites": "Opna fílanir",
-  "keyboard_shortcuts.federated": "að opna sameiginlega tímalínu",
+  "keyboard_shortcuts.down": "Fara neðar í listanum",
+  "keyboard_shortcuts.enter": "Opna færslu",
+  "keyboard_shortcuts.favourite": "Eftirlætisfærsla",
+  "keyboard_shortcuts.favourites": "Opna eftirlætislista",
+  "keyboard_shortcuts.federated": "Opna sameiginlega tímalínu",
   "keyboard_shortcuts.heading": "Flýtileiðir á lyklaborði",
-  "keyboard_shortcuts.home": "að opna heimatímalínu",
+  "keyboard_shortcuts.home": "Opna heimatímalínu",
   "keyboard_shortcuts.hotkey": "Flýtilykill",
-  "keyboard_shortcuts.legend": "að birta þessa skýringu",
-  "keyboard_shortcuts.local": "að opna staðværa tímalínu",
-  "keyboard_shortcuts.mention": "að minnast á höfund",
-  "keyboard_shortcuts.muted": "að opna lista yfir þaggaða notendur",
-  "keyboard_shortcuts.my_profile": "að opna notandasniðið þitt",
-  "keyboard_shortcuts.notifications": "að opna tilkynningadálk",
-  "keyboard_shortcuts.open_media": "til að opna margmiðlunargögn",
-  "keyboard_shortcuts.pinned": "Opna lista yfir föst þyt",
-  "keyboard_shortcuts.profile": "að opna notandasnið höfundar",
-  "keyboard_shortcuts.reply": "að svara",
-  "keyboard_shortcuts.requests": "að opna lista yfir fylgjendabeiðnir",
-  "keyboard_shortcuts.search": "að setja virkni í leit",
-  "keyboard_shortcuts.spoilers": "til að birta/fela reit með aðvörun vegna efnis",
-  "keyboard_shortcuts.start": "að opna \"komast í gang\" dálk",
-  "keyboard_shortcuts.toggle_hidden": "að birta/fela texta á bak við aðvörun vegna efnis",
-  "keyboard_shortcuts.toggle_sensitivity": "að birta/fela myndir",
-  "keyboard_shortcuts.toot": "Hefja glænýtt þyt",
-  "keyboard_shortcuts.unfocus": "að taka virkni úr textainnsetningarreit eða leit",
-  "keyboard_shortcuts.up": "að fara ofar í listanum",
+  "keyboard_shortcuts.legend": "Birta þessa skýringu",
+  "keyboard_shortcuts.local": "Opna staðværa tímalínu",
+  "keyboard_shortcuts.mention": "Minnast á höfund",
+  "keyboard_shortcuts.muted": "Opna lista yfir þaggaða notendur",
+  "keyboard_shortcuts.my_profile": "Opna notandasniðið þitt",
+  "keyboard_shortcuts.notifications": "Opna tilkynningadálk",
+  "keyboard_shortcuts.open_media": "Opna margmiðlunargögn",
+  "keyboard_shortcuts.pinned": "Opna lista yfir festar færslur",
+  "keyboard_shortcuts.profile": "Opna notandasnið höfundar",
+  "keyboard_shortcuts.reply": "Svara færslu",
+  "keyboard_shortcuts.requests": "Opna lista yfir fylgjendabeiðnir",
+  "keyboard_shortcuts.search": "Setja virkni í leitarreit",
+  "keyboard_shortcuts.spoilers": "Birta/fela reit með aðvörun vegna efnis",
+  "keyboard_shortcuts.start": "Opna \"komast í gang\" dálk",
+  "keyboard_shortcuts.toggle_hidden": "Birta/fela texta á bak við aðvörun vegna efnis",
+  "keyboard_shortcuts.toggle_sensitivity": "Birta/fela myndir",
+  "keyboard_shortcuts.toot": "Byrja nýja færslu",
+  "keyboard_shortcuts.unfocus": "Taka virkni úr textainnsetningarreit eða leit",
+  "keyboard_shortcuts.up": "Fara ofar í listanum",
   "lightbox.close": "Loka",
   "lightbox.compress": "Þjappa myndskoðunarreit",
   "lightbox.expand": "Fletta út myndskoðunarreit",
   "lightbox.next": "Næsta",
   "lightbox.previous": "Fyrra",
+  "limited_account_hint.action": "Birta notandasniðið samt",
+  "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.",
   "lists.account.add": "Bæta á lista",
   "lists.account.remove": "Fjarlægja af lista",
   "lists.delete": "Eyða lista",
@@ -272,47 +362,54 @@
   "media_gallery.toggle_visible": "Víxla sýnileika",
   "missing_indicator.label": "Fannst ekki",
   "missing_indicator.sublabel": "Tilfangið fannst ekki",
+  "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
   "mute_modal.duration": "Lengd",
   "mute_modal.hide_notifications": "Fela tilkynningar frá þessum notanda?",
   "mute_modal.indefinite": "Óendanlegt",
-  "navigation_bar.apps": "Farsímaforrit",
+  "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.blocks": "Útilokaðir notendur",
   "navigation_bar.bookmarks": "Bókamerki",
   "navigation_bar.community_timeline": "Staðvær tímalína",
-  "navigation_bar.compose": "Semja nýtt þyt",
+  "navigation_bar.compose": "Semja nýja færslu",
   "navigation_bar.direct": "Bein skilaboð",
   "navigation_bar.discover": "Uppgötva",
-  "navigation_bar.domain_blocks": "Falin lén",
+  "navigation_bar.domain_blocks": "Útilokuð lén",
   "navigation_bar.edit_profile": "Breyta notandasniði",
-  "navigation_bar.favourites": "Fílanir",
+  "navigation_bar.explore": "Kanna",
+  "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
   "navigation_bar.follow_requests": "Beiðnir um að fylgjast með",
   "navigation_bar.follows_and_followers": "Fylgist með og fylgjendur",
-  "navigation_bar.info": "Um þennan vefþjón",
-  "navigation_bar.keyboard_shortcuts": "Flýtilyklar",
   "navigation_bar.lists": "Listar",
   "navigation_bar.logout": "Útskráning",
   "navigation_bar.mutes": "Þaggaðir notendur",
   "navigation_bar.personal": "Einka",
-  "navigation_bar.pins": "Föst þyt",
+  "navigation_bar.pins": "Festar færslur",
   "navigation_bar.preferences": "Kjörstillingar",
   "navigation_bar.public_timeline": "Sameiginleg tímalína",
+  "navigation_bar.search": "Leita",
   "navigation_bar.security": "Öryggi",
-  "notification.favourite": "{name} filaði stöðufærslu þína",
+  "not_signed_in_indicator.not_signed_in": "Þú þarft að skrá þig inn til að nota þetta tilfang.",
+  "notification.admin.report": "{name} kærði {target}",
+  "notification.admin.sign_up": "{name} skráði sig",
+  "notification.favourite": "{name} setti færslu þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
   "notification.mention": "{name} minntist á þig",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú tókst þátt í er lokið",
-  "notification.reblog": "{name} endurbirti stöðufærsluna þína",
+  "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.status": "{name} sendi inn rétt í þessu",
+  "notification.update": "{name} breytti færslu",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
+  "notifications.column_settings.admin.report": "Nýjar kærur:",
+  "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
-  "notifications.column_settings.favourite": "Fílanir:",
+  "notifications.column_settings.favourite": "Eftirlæti:",
   "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",
-  "notifications.column_settings.filter_bar.show": "Sýna",
+  "notifications.column_settings.filter_bar.show_bar": "Birta síustikuna",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
   "notifications.column_settings.mention": "Tilvísanir:",
@@ -321,11 +418,13 @@
   "notifications.column_settings.reblog": "Endurbirtingar:",
   "notifications.column_settings.show": "Sýna í dálki",
   "notifications.column_settings.sound": "Spila hljóð",
-  "notifications.column_settings.status": "Ný þyt:",
-  "notifications.column_settings.unread_markers.category": "Merki fyrir ólesnar tilkynningar",
+  "notifications.column_settings.status": "Nýjar færslur:",
+  "notifications.column_settings.unread_notifications.category": "Ólesnar tilkynningar",
+  "notifications.column_settings.unread_notifications.highlight": "Áherslulita ólesnar tilkynningar",
+  "notifications.column_settings.update": "Breytingar:",
   "notifications.filter.all": "Allt",
   "notifications.filter.boosts": "Endurbirtingar",
-  "notifications.filter.favourites": "Fílanir",
+  "notifications.filter.favourites": "Eftirlæti",
   "notifications.filter.follows": "Fylgist með",
   "notifications.filter.mentions": "Tilvísanir",
   "notifications.filter.polls": "Niðurstöður könnunar",
@@ -340,101 +439,170 @@
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
   "picture_in_picture.restore": "Setja til baka",
-  "poll.closed": "Lokað",
+  "poll.closed": "Lokuð",
   "poll.refresh": "Endurlesa",
   "poll.total_people": "{count, plural, one {# aðili} other {# aðilar}}",
   "poll.total_votes": "{count, plural, one {# atkvæði} other {# atkvæði}}",
   "poll.vote": "Greiða atkvæði",
   "poll.voted": "Þú kaust þetta svar",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# atkvæði} other {# atkvæði}}",
   "poll_button.add_poll": "Bæta við könnun",
   "poll_button.remove_poll": "Fjarlægja könnun",
-  "privacy.change": "Aðlaga gagnaleynd stöðufærslu",
+  "privacy.change": "Aðlaga gagnaleynd færslu",
   "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Beint",
+  "privacy.direct.short": "Aðeins fólk sem minnst er á",
   "privacy.private.long": "Senda einungis á fylgjendur",
   "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Senda á opinberar tímalínur",
+  "privacy.public.long": "Sýnilegt fyrir alla",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Ekki senda á opinberar tímalínur",
+  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
   "privacy.unlisted.short": "Óskráð",
+  "privacy_policy.last_updated": "Síðast uppfært {date}",
+  "privacy_policy.title": "Persónuverndarstefna",
   "refresh": "Endurlesa",
   "regeneration_indicator.label": "Hleð inn…",
   "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "Fyrir {number, plural, one {# degi} other {# dögum}} síðan",
+  "relative_time.full.hours": "Fyrir {number, plural, one {# klukkustund} other {# klukkustundum}} síðan",
+  "relative_time.full.just_now": "í þessu",
+  "relative_time.full.minutes": "Fyrir {number, plural, one {# mínútu} other {# mínútum}} síðan",
+  "relative_time.full.seconds": "Fyrir {number, plural, one {# sekúndu} other {# sekúndum}} síðan",
   "relative_time.hours": "{number}kl.",
   "relative_time.just_now": "núna",
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
   "reply_indicator.cancel": "Hætta við",
+  "report.block": "Útiloka",
+  "report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
+  "report.categories.other": "Annað",
+  "report.categories.spam": "Ruslpóstur",
+  "report.categories.violation": "Efnið brýtur gegn einni eða fleiri reglum netþjónsins",
+  "report.category.subtitle": "Veldu hvað samsvarar best",
+  "report.category.title": "Segðu okkur hvað er í gangi með þetta {type}-atriði",
+  "report.category.title_account": "notandasnið",
+  "report.category.title_status": "færsla",
+  "report.close": "Lokið",
+  "report.comment.title": "Er eitthvað annað sem þú heldur að við ættum að vita?",
   "report.forward": "Áframsenda til {target}",
   "report.forward_hint": "Notandaaðgangurinn er af öðrum vefþjóni. Á einnig að senda nafnlaust afrit af kærunni þangað?",
-  "report.hint": "Kæran verður send á umsjónarmenn vefþjónsins þíns. Þú getur gefið skýringu hér fyrir neðan á því af hverju þú ert að kæra þennan notandaaðgang:",
+  "report.mute": "Þagga niður",
+  "report.mute_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu samt geta séð færslurnar þínar eða fylgst með þér, en munu ekki geta séð að þaggað sé niður í þeim.",
+  "report.next": "Næsta",
   "report.placeholder": "Viðbótarathugasemdir",
+  "report.reasons.dislike": "Mér líkar það ekki",
+  "report.reasons.dislike_description": "Þetta er ekki eitthvað sem þið viljið sjá",
+  "report.reasons.other": "Það er eitthvað annað",
+  "report.reasons.other_description": "Vandamálið fellur ekki í aðra flokka",
+  "report.reasons.spam": "Þetta er ruslpóstur",
+  "report.reasons.spam_description": "Slæmir tenglar, fölsk samskipti eða endurtekin svör",
+  "report.reasons.violation": "Það gengur þvert á reglur fyrir netþjóninn",
+  "report.reasons.violation_description": "Þið eruð meðvituð um að þetta brýtur sértækar reglur",
+  "report.rules.subtitle": "Veldu allt sem á við",
+  "report.rules.title": "Hvaða reglur eru brotnar?",
+  "report.statuses.subtitle": "Veldu allt sem á við",
+  "report.statuses.title": "Eru einhverjar færslur sem styðja þessa kæru?",
   "report.submit": "Senda inn",
   "report.target": "Kæri {target}",
+  "report.thanks.take_action": "Hér eru nokkrir valkostir til að stýra hvað þú sérð á Mastodon:",
+  "report.thanks.take_action_actionable": "Á meðan við yfirförum þetta, geturðu tekið til aðgerða gegn @{name}:",
+  "report.thanks.title": "Viltu ekki sjá þetta?",
+  "report.thanks.title_actionable": "Takk fyrir tilkynninguna, við munum skoða málið.",
+  "report.unfollow": "Hætta að fylgjast með @{name}",
+  "report.unfollow_explanation": "Þú ert að fylgjast með þessum aðgangi. Til að hætta að sjá viðkomandi færslur á streyminu þínu, skaltu hætta að fylgjast með viðkomandi.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} færsla} other {{count} færslur}} viðhengdar",
+  "report_notification.categories.other": "Annað",
+  "report_notification.categories.spam": "Ruslpóstur",
+  "report_notification.categories.violation": "Brot á reglum",
+  "report_notification.open": "Opin kæra",
   "search.placeholder": "Leita",
+  "search.search_or_paste": "Leita eða líma slóð",
   "search_popout.search_format": "Snið ítarlegrar leitar",
-  "search_popout.tips.full_text": "Einfaldur texti skilar stöðufærslum sem þú hefur skrifað, fílað, endurbirt eða sem á þig hefur verið minnst í, ásamt samsvarandi birtingarnöfnum, notendanöfnum og myllumerkjum.",
+  "search_popout.tips.full_text": "Einfaldur texti skilar færslum sem þú hefur skrifað, sett í eftirlæti, endurbirt eða verið minnst á þig í, ásamt samsvarandi birtingarnöfnum, notendanöfnum og myllumerkjum.",
   "search_popout.tips.hashtag": "myllumerki",
-  "search_popout.tips.status": "stöðufærsla",
+  "search_popout.tips.status": "færsla",
   "search_popout.tips.text": "Einfaldur texti skilar samsvarandi birtingarnöfnum, notendanöfnum og myllumerkjum",
   "search_popout.tips.user": "notandi",
   "search_results.accounts": "Fólk",
+  "search_results.all": "Allt",
   "search_results.hashtags": "Myllumerki",
-  "search_results.statuses": "Þyt",
-  "search_results.statuses_fts_disabled": "Að leita í efni þyta er ekki virk á þessum Mastodon-þjóni.",
+  "search_results.nothing_found": "Gat ekki fundið neitt sem samsvarar þessum leitarorðum",
+  "search_results.statuses": "Færslur",
+  "search_results.statuses_fts_disabled": "Að leita í efni færslna er ekki virkt á þessum Mastodon-þjóni.",
+  "search_results.title": "Leita að {q}",
   "search_results.total": "{count, number} {count, plural, one {niðurstaða} other {niðurstöður}}",
+  "server_banner.about_active_users": "Folk sem hefur notað þennan netþjón síðustu 30 daga (virkir notendur í mánuðinum)",
+  "server_banner.active_users": "virkir notendur",
+  "server_banner.administered_by": "Stýrt af:",
+  "server_banner.introduction": "{domain} er hluti af dreifhýsta samfélagsnetinu sem keyrt er af {mastodon}.",
+  "server_banner.learn_more": "Kanna nánar",
+  "server_banner.server_stats": "Tölfræði þjóns:",
+  "sign_in_banner.create_account": "Búa til notandaaðgang",
+  "sign_in_banner.sign_in": "Skrá inn",
+  "sign_in_banner.text": "Skráðu þig inn til að fylgjast með notendum eða myllumerkjum, svara færslum, deila þeim eða setja í eftirlæti, eða eiga í samskiptum á aðgangnum þínum á öðrum netþjónum.",
   "status.admin_account": "Opna umsjónarviðmót fyrir @{name}",
-  "status.admin_status": "Opna þessa stöðufærslu í umsjónarviðmótinu",
+  "status.admin_status": "Opna þessa færslu í umsjónarviðmótinu",
   "status.block": "Útiloka @{name}",
   "status.bookmark": "Bókamerki",
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
-  "status.copy": "Afrita tengil í stöðufærslu",
+  "status.copy": "Afrita tengil í færslu",
   "status.delete": "Eyða",
   "status.detailed_status": "Nákvæm spjallþráðasýn",
   "status.direct": "Bein skilaboð @{name}",
+  "status.edit": "Breyta",
+  "status.edited": "Breytt {date}",
+  "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
   "status.embed": "Ívefja",
-  "status.favourite": "Fílanir",
+  "status.favourite": "Eftirlæti",
+  "status.filter": "Sía þessa færslu",
   "status.filtered": "Síað",
+  "status.hide": "Fela færslu",
+  "status.history.created": "{name} útbjó {date}",
+  "status.history.edited": "{name} breytti {date}",
   "status.load_more": "Hlaða inn meiru",
   "status.media_hidden": "Mynd er falin",
   "status.mention": "Minnast á @{name}",
   "status.more": "Meira",
   "status.mute": "Þagga niður í @{name}",
   "status.mute_conversation": "Þagga niður í samtali",
-  "status.open": "Útliða þessa stöðu",
+  "status.open": "Útliða þessa færslu",
   "status.pin": "Festa á notandasnið",
-  "status.pinned": "Fast þyt",
+  "status.pinned": "Fest færsla",
   "status.read_more": "Lesa meira",
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
   "status.reblogged_by": "{name} endurbirti",
-  "status.reblogs.empty": "Enginn hefur ennþá endurbirt þetta þyt. Þegar einhver gerir það, mun sá birtast hér.",
-  "status.redraft": "Eyða og enduvinna drög",
+  "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
+  "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
+  "status.replied_to": "Svaraði {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara þræði",
   "status.report": "Kæra @{name}",
   "status.sensitive_warning": "Viðkvæmt efni",
   "status.share": "Deila",
+  "status.show_filter_reason": "Birta samt",
   "status.show_less": "Sýna minna",
   "status.show_less_all": "Sýna minna fyrir allt",
   "status.show_more": "Sýna meira",
   "status.show_more_all": "Sýna meira fyrir allt",
-  "status.show_thread": "Birta þráð",
+  "status.show_original": "Sýna upprunalega",
+  "status.translate": "Þýða",
+  "status.translated_from_with": "Þýtt úr {lang} með {provider}",
   "status.uncached_media_warning": "Ekki tiltækt",
   "status.unmute_conversation": "Hætta að þagga niður í samtali",
   "status.unpin": "Losa af notandasniði",
+  "subscribed_languages.lead": "Einungis færslur á völdum tungumálum munu birtast á upphafssíðu og tímalínum þínum eftir þessa breytingu. Veldu ekkert til að sjá færslur á öllum tungumálum.",
+  "subscribed_languages.save": "Vista breytingar",
+  "subscribed_languages.target": "Breyta tungumálum í áskrift fyrir {target}",
   "suggestions.dismiss": "Hafna tillögu",
   "suggestions.header": "Þú gætir haft áhuga á…",
   "tabs_bar.federated_timeline": "Sameiginlegt",
   "tabs_bar.home": "Heim",
   "tabs_bar.local_timeline": "Staðvært",
   "tabs_bar.notifications": "Tilkynningar",
-  "tabs_bar.search": "Leita",
   "time_remaining.days": "{number, plural, one {# dagur} other {# dagar}} eftir",
   "time_remaining.hours": "{number, plural, one {# klukkustund} other {# klukkustundir}} eftir",
   "time_remaining.minutes": "{number, plural, one {# mínúta} other {# mínútur}} eftir",
@@ -443,9 +611,9 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} frá öðrum netþjónum er ekki birt.",
   "timeline_hint.resources.followers": "Fylgjendur",
   "timeline_hint.resources.follows": "Fylgist með",
-  "timeline_hint.resources.statuses": "Eldri þyt",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} aðilar}} tala",
-  "trends.trending_now": "Í umræðunni núna",
+  "timeline_hint.resources.statuses": "Eldri færslur",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} manns}} {days, plural, one {síðasta sólarhringinn} other {síðustu {days} daga}}",
+  "trends.trending_now": "Vinsælt núna",
   "ui.beforeunload": "Drögin tapast ef þú ferð út úr Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
   "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
   "upload_form.description": "Lýstu þessu fyrir sjónskerta",
+  "upload_form.description_missing": "Engri lýsingu bætt við",
   "upload_form.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
   "upload_form.undo": "Eyða",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Virkja",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Beiti…",
   "upload_modal.choose_image": "Veldu mynd",
   "upload_modal.description_placeholder": "Öllum dýrunum í skóginum þætti bezt að vera vinir",
   "upload_modal.detect_text": "Skynja texta úr mynd",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Undirbý OCR-ljóslestur…",
   "upload_modal.preview_label": "Forskoðun ({ratio})",
   "upload_progress.label": "Er að senda inn...",
+  "upload_progress.processing": "Meðhöndla…",
   "video.close": "Loka myndskeiði",
   "video.download": "Sækja skrá",
   "video.exit_fullscreen": "Hætta í skjáfylli",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index d2c9e1179..82560c040 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,73 +1,107 @@
 {
-  "account.account_note_header": "Le tue note sull'utente",
+  "about.blocks": "Server moderati",
+  "about.contact": "Contatto:",
+  "about.disclaimer": "Mastodon è un software libero e open-source e un marchio di Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Motivo non disponibile",
+  "about.domain_blocks.preamble": "Mastodon, generalmente, ti consente di visualizzare i contenuti e interagire con gli utenti da qualsiasi altro server nel fediverso. Queste sono le eccezioni che sono state fatte su questo particolare server.",
+  "about.domain_blocks.silenced.explanation": "Generalmente non vedrai i profili e i contenuti di questo server, a meno che tu non lo cerchi esplicitamente o che tu scelga di seguirlo.",
+  "about.domain_blocks.silenced.title": "Silenziato",
+  "about.domain_blocks.suspended.explanation": "Nessun dato proveniente da questo server verrà elaborato, conservato o scambiato, rendendo impossibile qualsiasi interazione o comunicazione con gli utenti da questo server.",
+  "about.domain_blocks.suspended.title": "Sospeso",
+  "about.not_available": "Queste informazioni non sono state rese disponibili su questo server.",
+  "about.powered_by": "Social media decentralizzato alimentato da {mastodon}",
+  "about.rules": "Regole del server",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppo",
   "account.block": "Blocca @{name}",
   "account.block_domain": "Blocca dominio {domain}",
   "account.blocked": "Bloccato",
-  "account.browse_more_on_origin_server": "Sfoglia ulteriormente sul profilo originale",
-  "account.cancel_follow_request": "Annulla richiesta di seguire",
+  "account.browse_more_on_origin_server": "Sfoglia di più sul profilo originale",
+  "account.cancel_follow_request": "Annulla la richiesta di seguire",
   "account.direct": "Messaggio diretto a @{name}",
   "account.disable_notifications": "Smetti di avvisarmi quando @{name} pubblica un post",
   "account.domain_blocked": "Dominio bloccato",
   "account.edit_profile": "Modifica profilo",
   "account.enable_notifications": "Avvisami quando @{name} pubblica un post",
-  "account.endorse": "Mostra sul profilo",
+  "account.endorse": "In evidenza sul profilo",
+  "account.featured_tags.last_status_at": "Ultimo post il {date}",
+  "account.featured_tags.last_status_never": "Nessun post",
+  "account.featured_tags.title": "Hashtag in evidenza di {name}",
   "account.follow": "Segui",
   "account.followers": "Follower",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
-  "account.following_counter": "{count, plural, other {{counter} Seguiti}}",
+  "account.followers_counter": "{count, plural, one {{counter} Seguace} other {{counter} Seguaci}}",
+  "account.following": "Seguiti",
+  "account.following_counter": "{count, plural, one {{counter} Seguiti} other {{counter} Seguiti}}",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.follows_you": "Ti segue",
-  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
-  "account.joined": "Su questa istanza dal {date}",
-  "account.last_status": "Ultima attività",
+  "account.go_to_profile": "Vai al profilo",
+  "account.hide_reblogs": "Nascondi potenziamenti da @{name}",
+  "account.joined_short": "Iscritto",
+  "account.languages": "Modifica le lingue d'iscrizione",
   "account.link_verified_on": "La proprietà di questo link è stata controllata il {date}",
-  "account.locked_info": "Questo è un account privato. Il proprietario approva manualmente chi può seguirlo.",
+  "account.locked_info": "Lo stato della privacy di questo profilo è impostato a bloccato. Il proprietario revisiona manualmente chi può seguirlo.",
   "account.media": "Media",
   "account.mention": "Menziona @{name}",
-  "account.moved_to": "{name} si è trasferito su:",
+  "account.moved_to": "{name} ha indicato che il suo nuovo profilo è ora:",
   "account.mute": "Silenzia @{name}",
   "account.mute_notifications": "Silenzia notifiche da @{name}",
-  "account.muted": "Silenziat*",
-  "account.never_active": "Mai",
-  "account.posts": "Toot",
-  "account.posts_with_replies": "Toot e risposte",
+  "account.muted": "Silenziato",
+  "account.open_original_page": "Apri la pagina originale",
+  "account.posts": "Post",
+  "account.posts_with_replies": "Post e risposte",
   "account.report": "Segnala @{name}",
-  "account.requested": "In attesa di approvazione. Clicca per annullare la richiesta di seguire",
+  "account.requested": "In attesa d'approvazione. Clicca per annullare la richiesta di seguire",
+  "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.share": "Condividi il profilo di @{name}",
-  "account.show_reblogs": "Mostra condivisioni da @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toot}}",
+  "account.show_reblogs": "Mostra potenziamenti da @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Post}}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Sblocca il dominio {domain}",
+  "account.unblock_short": "Sblocca",
   "account.unendorse": "Non mostrare sul profilo",
   "account.unfollow": "Smetti di seguire",
   "account.unmute": "Riattiva @{name}",
   "account.unmute_notifications": "Riattiva le notifiche da @{name}",
+  "account.unmute_short": "Riattiva",
   "account_note.placeholder": "Clicca per aggiungere una nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Sei pregato di riprovare tra {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Limitazione per eccesso di richieste",
+  "admin.dashboard.daily_retention": "Tasso di ritenzione dell'utente per giorno, dopo la registrazione",
+  "admin.dashboard.monthly_retention": "Tasso di ritenzione dell'utente per mese, dopo la registrazione",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mese d'iscrizione",
+  "admin.dashboard.retention.cohort_size": "Nuovi utenti",
+  "alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Tasso limitato",
   "alert.unexpected.message": "Si è verificato un errore imprevisto.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Annuncio",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per settimana",
-  "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta",
-  "bundle_column_error.body": "E' avvenuto un errore durante il caricamento di questo componente.",
+  "attachments_list.unprocessed": "(non elaborato)",
+  "audio.hide": "Nascondi audio",
+  "autosuggest_hashtag.per_week": "{count} a settimana",
+  "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
+  "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
+  "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "C'è stato un errore durante il caricamento di questa pagina. Potrebbe essere dovuto a un problema temporaneo con la tua connessione internet o a questo server.",
+  "bundle_column_error.network.title": "Errore di rete",
   "bundle_column_error.retry": "Riprova",
-  "bundle_column_error.title": "Errore di rete",
+  "bundle_column_error.return": "Torna alla home",
+  "bundle_column_error.routing.body": "Impossibile trovare la pagina richiesta. Sei sicuro che l'URL nella barra degli indirizzi sia corretto?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Chiudi",
-  "bundle_modal_error.message": "Qualcosa è andato storto durante il caricamento di questo componente.",
+  "bundle_modal_error.message": "Qualcosa è andato storto scaricando questo componente.",
   "bundle_modal_error.retry": "Riprova",
+  "closed_registrations.other_server_instructions": "Poiché Mastodon è decentralizzato, puoi creare un profilo su un altro server, pur continuando a interagire con questo.",
+  "closed_registrations_modal.description": "Correntemente, è impossibile creare un profilo su {domain}, ma sei pregato di tenere presente che non necessiti di un profilo specificamente su {domain} per utilizzare Mastodon.",
+  "closed_registrations_modal.find_another_server": "Trova un altro server",
+  "closed_registrations_modal.preamble": "Mastodon è decentralizzato, quindi, non importa dove crei il tuo profilo, potrai seguire e interagire con chiunque su questo server. Anche se sei tu stesso a ospitarlo!",
+  "closed_registrations_modal.title": "Registrazione su Mastodon",
+  "column.about": "Info",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
-  "column.community": "Timeline locale",
+  "column.community": "Cronologia locale",
   "column.direct": "Messaggi diretti",
   "column.directory": "Sfoglia profili",
   "column.domain_blocks": "Domini bloccati",
@@ -77,406 +111,542 @@
   "column.lists": "Elenchi",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
-  "column.pins": "Toot in evidenza",
+  "column.pins": "Post fissati",
   "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
   "column_header.moveLeft_settings": "Sposta colonna a sinistra",
   "column_header.moveRight_settings": "Sposta colonna a destra",
-  "column_header.pin": "Evidenzia",
-  "column_header.show_settings": "Mostra impostazioni",
-  "column_header.unpin": "Non mettere in evidenza",
+  "column_header.pin": "Fissa",
+  "column_header.show_settings": "Mostra le impostazioni",
+  "column_header.unpin": "Non fissare",
   "column_subheading.settings": "Impostazioni",
   "community.column_settings.local_only": "Solo Locale",
   "community.column_settings.media_only": "Solo Media",
   "community.column_settings.remote_only": "Solo Remoto",
-  "compose_form.direct_message_warning": "Questo toot sarà inviato solo agli utenti menzionati.",
+  "compose.language.change": "Cambia la lingua",
+  "compose.language.search": "Cerca lingue...",
   "compose_form.direct_message_warning_learn_more": "Scopri di più",
-  "compose_form.hashtag_warning": "Questo toot non sarà elencato sotto alcun hashtag poiché senza elenco. Solo i toot pubblici possono essere ricercati per hashtag.",
-  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti e vedere le tue pubblicazioni visibili solo dai follower.",
+  "compose_form.encryption_warning": "I post su Mastodon non sono crittografati end-to-end. Non condividere alcuna informazione sensibile su Mastodon.",
+  "compose_form.hashtag_warning": "Questo post non sarà elencato sotto alcun hashtag, non avendo una lista. Solo i post pubblici possono esser cercati per hashtag.",
+  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
-  "compose_form.placeholder": "A cosa stai pensando?",
+  "compose_form.placeholder": "Cos'hai in mente?",
   "compose_form.poll.add_option": "Aggiungi una scelta",
   "compose_form.poll.duration": "Durata del sondaggio",
   "compose_form.poll.option_placeholder": "Scelta {number}",
   "compose_form.poll.remove_option": "Rimuovi questa scelta",
-  "compose_form.poll.switch_to_multiple": "Modifica sondaggio per consentire scelte multiple",
-  "compose_form.poll.switch_to_single": "Modifica sondaggio per consentire una singola scelta",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
+  "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+  "compose_form.publish": "Pubblica",
+  "compose_form.publish_form": "Pubblica",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Segna media come sensibile",
-  "compose_form.sensitive.marked": "Questo media è contrassegnato come sensibile",
-  "compose_form.sensitive.unmarked": "Questo media non è contrassegnato come sensibile",
-  "compose_form.spoiler.marked": "Il testo è nascosto dietro l'avviso",
-  "compose_form.spoiler.unmarked": "Il testo non è nascosto",
+  "compose_form.save_changes": "Salva le modifiche",
+  "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+  "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
+  "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
   "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
   "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
-  "confirmations.delete.confirm": "Cancella",
-  "confirmations.delete.message": "Sei sicuro di voler cancellare questo toot?",
-  "confirmations.delete_list.confirm": "Cancella",
-  "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
+  "confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
+  "confirmations.delete.confirm": "Elimina",
+  "confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
+  "confirmations.delete_list.confirm": "Elimina",
+  "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
+  "confirmations.discard_edit_media.confirm": "Scarta",
+  "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
   "confirmations.domain_block.confirm": "Blocca l'intero dominio",
-  "confirmations.domain_block.message": "Sei davvero, davvero sicur@ di voler bloccare {domain} completamente? Nella maggioranza dei casi, è preferibile e sufficiente bloccare o silenziare pochi account in modo mirato. Non vedrai più il contenuto da quel dominio né nelle timeline pubbliche né nelle tue notifiche. Anzi, verranno rimossi dai follower gli account di questo dominio.",
+  "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
-  "confirmations.mute.explanation": "Questo nasconderà i post da loro ed i post che li menzionano, ma consentirà ancora loro di vedere i tuoi post e di seguirti.",
+  "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.",
   "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
-  "confirmations.redraft.confirm": "Cancella e riscrivi",
-  "confirmations.redraft.message": "Sei sicuro di voler eliminare questo toot e riscriverlo? I preferiti e gli incrementi saranno persi e le risposte al post originale saranno perse.",
+  "confirmations.redraft.confirm": "Elimina e riscrivi",
+  "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i potenziamenti andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.reply.confirm": "Rispondi",
   "confirmations.reply.message": "Rispondere ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
-  "confirmations.unfollow.message": "Sei sicur@ di non voler più seguire {name}?",
+  "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
   "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiato",
+  "copypaste.copy": "Copia",
   "directory.federated": "Da un fediverse noto",
   "directory.local": "Solo da {domain}",
   "directory.new_arrivals": "Nuovi arrivi",
   "directory.recently_active": "Attivo di recente",
-  "embed.instructions": "Incorpora questo toot sul tuo sito web copiando il codice sotto.",
+  "disabled_account_banner.account_settings": "Impostazioni del profilo",
+  "disabled_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato.",
+  "dismissable_banner.community_timeline": "Questi sono i post pubblici più recenti da persone i cui profili sono ospitati da {domain}.",
+  "dismissable_banner.dismiss": "Ignora",
+  "dismissable_banner.explore_links": "Queste notizie sono discusse da persone su questo e altri server della rete decentralizzata, al momento.",
+  "dismissable_banner.explore_statuses": "Questi post da questo e altri server nella rete decentralizzata, stanno ottenendo popolarità su questo server al momento.",
+  "dismissable_banner.explore_tags": "Questi hashtag stanno ottenendo popolarità tra le persone su questo e altri server della rete decentralizzata, al momento.",
+  "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti da persone su questo e altri server della rete decentralizzata, noti a questo server.",
+  "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.",
   "embed.preview": "Ecco come apparirà:",
   "emoji_button.activity": "Attività",
+  "emoji_button.clear": "Cancella",
   "emoji_button.custom": "Personalizzato",
-  "emoji_button.flags": "Segnalazioni",
+  "emoji_button.flags": "Bandiere",
   "emoji_button.food": "Cibo & Bevande",
   "emoji_button.label": "Inserisci emoji",
   "emoji_button.nature": "Natura",
-  "emoji_button.not_found": "Nessun emojos!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Nessun emoji corrispondente",
   "emoji_button.objects": "Oggetti",
   "emoji_button.people": "Persone",
-  "emoji_button.recent": "Usati frequentemente",
+  "emoji_button.recent": "Usate frequentemente",
   "emoji_button.search": "Cerca...",
   "emoji_button.search_results": "Risultati della ricerca",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Viaggi & Luoghi",
-  "empty_column.account_suspended": "Account sospeso",
-  "empty_column.account_timeline": "Nessun toot qui!",
+  "empty_column.account_suspended": "Profilo sospeso",
+  "empty_column.account_timeline": "Nessun post qui!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
-  "empty_column.bookmarked_statuses": "Non hai ancora segnato alcun toot. Quando ne segni uno, sarà mostrato qui.",
-  "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
-  "empty_column.direct": "Non hai ancora nessun messaggio privato. Quando ne manderai o riceverai qualcuno, apparirà qui.",
-  "empty_column.domain_blocks": "Non vi sono domini nascosti.",
-  "empty_column.favourited_statuses": "Non hai ancora segnato nessun toot come apprezzato. Quando lo farai, comparirà qui.",
-  "empty_column.favourites": "Nessuno ha ancora segnato questo toot come apprezzato. Quando qualcuno lo farà, apparirà qui.",
-  "empty_column.follow_recommendations": "Sembra che nessun suggerimento possa essere generato per te. Puoi provare a usare la ricerca per cercare persone che potresti conoscere o esplorare hashtag di tendenza.",
-  "empty_column.follow_requests": "Non hai ancora ricevuto nessuna richiesta di follow. Quando ne riceverai una, verrà mostrata qui.",
-  "empty_column.hashtag": "Non c'è ancora nessun post con questo hashtag.",
-  "empty_column.home": "Non stai ancora seguendo nessuno. Visita {public} o usa la ricerca per incontrare nuove persone.",
+  "empty_column.bookmarked_statuses": "Non hai ancora salvato nei segnalibri alcun post. Quando lo farai, apparirà qui.",
+  "empty_column.community": "La cronologia locale è vuota. Scrivi qualcosa pubblicamente per dare inizio alla festa!",
+  "empty_column.direct": "Non hai ancora alcun messaggio diretto. Quando ne invierai o riceverai uno, apparirà qui.",
+  "empty_column.domain_blocks": "Ancora nessun dominio bloccato.",
+  "empty_column.explore_statuses": "Nulla è in tendenza al momento. Ricontrolla più tardi!",
+  "empty_column.favourited_statuses": "Non hai ancora alcun post preferito. Quando ne salverai uno tra i preferiti, apparirà qui.",
+  "empty_column.favourites": "Nessuno ha ancora messo questo post tra i preferiti. Quando qualcuno lo farà, apparirà qui.",
+  "empty_column.follow_recommendations": "Sembra che non sia stato possibile generare alcun suggerimento per te. Puoi provare a utilizzare la ricerca per cercare persone che potresti conoscere, o a esplorare gli hashtag in tendenza.",
+  "empty_column.follow_requests": "Non hai ancora alcuna richiesta di seguirti. Quando ne riceverai una, apparirà qui.",
+  "empty_column.hashtag": "Non c'è ancora nulla in questo hashtag.",
+  "empty_column.home": "La cronologia della tua home è vuota! Segui altre persone per riempirla. {suggestions}",
   "empty_column.home.suggestions": "Vedi alcuni suggerimenti",
-  "empty_column.list": "Non c'è ancora niente in questa lista. Quando i membri di questa lista pubblicheranno nuovi stati, appariranno qui.",
-  "empty_column.lists": "Non hai ancora nessuna lista. Quando ne creerai qualcuna, comparirà qui.",
-  "empty_column.mutes": "Non hai ancora silenziato nessun utente.",
-  "empty_column.notifications": "Non hai ancora nessuna notifica. Interagisci con altri per iniziare conversazioni.",
-  "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o segui utenti da altri server per riempire questo spazio",
-  "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, questa pagina non può essere visualizzata correttamente.",
-  "error.unexpected_crash.explanation_addons": "Questa pagina non può essere visualizzata correttamente. Questo errore è probabilmente causato da un componente aggiuntivo del browser o da strumenti di traduzione automatica.",
-  "error.unexpected_crash.next_steps": "Prova ad aggiornare la pagina. Se non funziona, potresti ancora essere in grado di utilizzare Mastodon attraverso un browser diverso o un'app nativa.",
-  "error.unexpected_crash.next_steps_addons": "Prova a disabilitarli e ad aggiornare la pagina. Se questo non funziona, potresti ancora essere in grado di utilizzare Mastodon attraverso un browser o un'app diversi.",
+  "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
+  "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
+  "empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+  "empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
+  "empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
+  "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
+  "error.unexpected_crash.explanation_addons": "Impossibile mostrare correttamente questa pagina. Questo errore è probabilmente causato da un addon del browser o da strumenti di traduzione automatica.",
+  "error.unexpected_crash.next_steps": "Prova a ricaricare la pagina. Se non aiuta, potresti comunque utilizzare Mastodon tramite un browser differente o un'app nativa.",
+  "error.unexpected_crash.next_steps_addons": "Prova a disabilitarli e a ricaricare la pagina. Se ciò non aiuta, potresti ancora utilizzare Mastodon tramite un browser differente o un'app nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copia stacktrace negli appunti",
-  "errors.unexpected_crash.report_issue": "Segnala il problema",
+  "errors.unexpected_crash.report_issue": "Segnala un problema",
+  "explore.search_results": "Risultati della ricerca",
+  "explore.suggested_follows": "Per te",
+  "explore.title": "Esplora",
+  "explore.trending_links": "Novità",
+  "explore.trending_statuses": "Post",
+  "explore.trending_tags": "Hashtag",
+  "filter_modal.added.context_mismatch_explanation": "La categoria di questo filtro non si applica al contesto in cui hai acceduto a questo post. Se desideri che il post sia filtrato anche in questo contesto, dovrai modificare il filtro.",
+  "filter_modal.added.context_mismatch_title": "Contesto non corrispondente!",
+  "filter_modal.added.expired_explanation": "La categoria di questo filtro è scaduta, dovrvai modificarne la data di scadenza per applicarlo.",
+  "filter_modal.added.expired_title": "Filtro scaduto!",
+  "filter_modal.added.review_and_configure": "Per revisionare e configurare ulteriormente la categoria di questo filtro, vai alle {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Impostazioni del filtro",
+  "filter_modal.added.settings_link": "pagina delle impostazioni",
+  "filter_modal.added.short_explanation": "Questo post è stato aggiunto alla seguente categoria del filtro: {title}.",
+  "filter_modal.added.title": "Filtro aggiunto!",
+  "filter_modal.select_filter.context_mismatch": "non si applica a questo contesto",
+  "filter_modal.select_filter.expired": "scaduto",
+  "filter_modal.select_filter.prompt_new": "Nuova categoria: {name}",
+  "filter_modal.select_filter.search": "Cerca o crea",
+  "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
+  "filter_modal.select_filter.title": "Filtra questo post",
+  "filter_modal.title.status": "Filtra un post",
   "follow_recommendations.done": "Fatto",
-  "follow_recommendations.heading": "Segui le persone da cui vuoi vedere i messaggi! Ecco alcuni suggerimenti.",
-  "follow_recommendations.lead": "I messaggi da persone che segui verranno visualizzati in ordine cronologico nel tuo home feed. Non abbiate paura di commettere errori, potete smettere di seguire le persone altrettanto facilmente in qualsiasi momento!",
+  "follow_recommendations.heading": "Segui le persone di cui vorresti vedere i post! Ecco alcuni suggerimenti.",
+  "follow_recommendations.lead": "I post dalle persone che segui appariranno in ordine cronologico sul feed della tua home. Non preoccuparti di fare errori, è altrettanto facile smettere di seguire le persone, in qualsiasi momento!",
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
-  "follow_requests.unlocked_explanation": "Benché il tuo account non sia privato, lo staff di {domain} ha pensato che potresti voler approvare manualmente le richieste di follow da questi account.",
+  "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
+  "footer.about": "Info",
+  "footer.directory": "Cartella dei profili",
+  "footer.get_app": "Scarica l'app",
+  "footer.invite": "Invita persone",
+  "footer.keyboard_shortcuts": "Scorciatoie da tastiera",
+  "footer.privacy_policy": "Politica sulla privacy",
+  "footer.source_code": "Visualizza il codice sorgente",
   "generic.saved": "Salvato",
-  "getting_started.developers": "Sviluppatori",
-  "getting_started.directory": "Directory dei profili",
-  "getting_started.documentation": "Documentazione",
-  "getting_started.heading": "Come iniziare",
-  "getting_started.invite": "Invita qualcuno",
-  "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.",
-  "getting_started.security": "Sicurezza",
-  "getting_started.terms": "Condizioni del servizio",
+  "getting_started.heading": "Per iniziare",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
   "hashtag.column_settings.select.no_options_message": "Nessun suggerimento trovato",
-  "hashtag.column_settings.select.placeholder": "Inserisci hashtag…",
+  "hashtag.column_settings.select.placeholder": "Inserisci gli hashtag…",
   "hashtag.column_settings.tag_mode.all": "Tutti questi",
   "hashtag.column_settings.tag_mode.any": "Uno o più di questi",
   "hashtag.column_settings.tag_mode.none": "Nessuno di questi",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Semplice",
-  "home.column_settings.show_reblogs": "Mostra post condivisi",
+  "hashtag.column_settings.tag_toggle": "Includi i tag aggiuntivi per questa colonna",
+  "hashtag.follow": "Segui l'hashtag",
+  "hashtag.unfollow": "Smetti di seguire l'hashtag",
+  "home.column_settings.basic": "Base",
+  "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
   "home.hide_announcements": "Nascondi annunci",
   "home.show_announcements": "Mostra annunci",
+  "interaction_modal.description.favourite": "Con un profilo di Mastodon, puoi salvare questo post tra i preferiti per far sapere all'autore che lo apprezzi e lo hai salvato per dopo.",
+  "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
+  "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
+  "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
+  "interaction_modal.on_another_server": "Su un altro server",
+  "interaction_modal.on_this_server": "Su questo server",
+  "interaction_modal.other_server_instructions": "Copia e incolla questo URL nel campo di ricerca della tua app di Mastodon preferita o dell'interfaccia web del tuo server di Mastodon.",
+  "interaction_modal.preamble": "Poiché Mastodon è decentralizzato, puoi utilizzare il tuo profilo esistente ospitato da un altro server di Mastodon on piattaforma compatibile, se non hai un profilo su questo.",
+  "interaction_modal.title.favourite": "Post preferito di {name}",
+  "interaction_modal.title.follow": "Segui {name}",
+  "interaction_modal.title.reblog": "Reblogga il post di {name}",
+  "interaction_modal.title.reply": "Rispondi al post di {name}",
   "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
-  "keyboard_shortcuts.back": "per tornare indietro",
-  "keyboard_shortcuts.blocked": "per aprire l'elenco degli utenti bloccati",
-  "keyboard_shortcuts.boost": "per condividere",
-  "keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne",
-  "keyboard_shortcuts.compose": "per portare il focus nell'area di composizione",
+  "keyboard_shortcuts.back": "Torna indietro",
+  "keyboard_shortcuts.blocked": "Apre l'elenco degli utenti bloccati",
+  "keyboard_shortcuts.boost": "Reblogga il post",
+  "keyboard_shortcuts.column": "Focalizza alla colonna",
+  "keyboard_shortcuts.compose": "Focalizza l'area di composizione testuale",
   "keyboard_shortcuts.description": "Descrizione",
   "keyboard_shortcuts.direct": "per aprire la colonna dei messaggi diretti",
-  "keyboard_shortcuts.down": "per spostarsi in basso nella lista",
-  "keyboard_shortcuts.enter": "per aprire lo status",
-  "keyboard_shortcuts.favourite": "per segnare come apprezzato",
-  "keyboard_shortcuts.favourites": "per aprire l'elenco dei toot apprezzati",
-  "keyboard_shortcuts.federated": "per aprire la timeline federata",
-  "keyboard_shortcuts.heading": "Tasti di scelta rapida",
-  "keyboard_shortcuts.home": "per aprire la timeline home",
+  "keyboard_shortcuts.down": "Scorri in basso nell'elenco",
+  "keyboard_shortcuts.enter": "Apre il post",
+  "keyboard_shortcuts.favourite": "Salva il post tra i preferiti",
+  "keyboard_shortcuts.favourites": "Apre l'elenco dei preferiti",
+  "keyboard_shortcuts.federated": "Apre la cronologia federata",
+  "keyboard_shortcuts.heading": "Scorciatoie da tastiera",
+  "keyboard_shortcuts.home": "Apre la cronologia domestica",
   "keyboard_shortcuts.hotkey": "Tasto di scelta rapida",
-  "keyboard_shortcuts.legend": "per mostrare questa spiegazione",
-  "keyboard_shortcuts.local": "per aprire la timeline locale",
-  "keyboard_shortcuts.mention": "per menzionare l'autore",
-  "keyboard_shortcuts.muted": "per aprire l'elenco degli utenti silenziati",
-  "keyboard_shortcuts.my_profile": "per aprire il tuo profilo",
-  "keyboard_shortcuts.notifications": "per aprire la colonna delle notifiche",
-  "keyboard_shortcuts.open_media": "per aprire media",
-  "keyboard_shortcuts.pinned": "per aprire l'elenco dei toot fissati in cima",
-  "keyboard_shortcuts.profile": "per aprire il profilo dell'autore",
-  "keyboard_shortcuts.reply": "per rispondere",
-  "keyboard_shortcuts.requests": "per aprire l'elenco di richieste di follow",
-  "keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
-  "keyboard_shortcuts.spoilers": "per mostrare/nascondere il campo CW",
-  "keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"",
-  "keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
-  "keyboard_shortcuts.toggle_sensitivity": "mostrare/nascondere media",
-  "keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo",
-  "keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca",
-  "keyboard_shortcuts.up": "per spostarsi in alto nella lista",
+  "keyboard_shortcuts.legend": "Mostra questa legenda",
+  "keyboard_shortcuts.local": "Apre la cronologia locale",
+  "keyboard_shortcuts.mention": "Menziona l'autore",
+  "keyboard_shortcuts.muted": "Apre l'elenco degli utenti silenziati",
+  "keyboard_shortcuts.my_profile": "Apre il tuo profilo",
+  "keyboard_shortcuts.notifications": "Apre la colonna delle notifiche",
+  "keyboard_shortcuts.open_media": "Apre i multimedia",
+  "keyboard_shortcuts.pinned": "Apre l'elenco dei post fissati",
+  "keyboard_shortcuts.profile": "Apre il profilo dell'autore",
+  "keyboard_shortcuts.reply": "Risponde al post",
+  "keyboard_shortcuts.requests": "Apre l'elenco delle richieste di seguirti",
+  "keyboard_shortcuts.search": "Focalizza sulla barra di ricerca",
+  "keyboard_shortcuts.spoilers": "Mostra/Nasconde il campo CW",
+  "keyboard_shortcuts.start": "Apre la colonna \"per iniziare\"",
+  "keyboard_shortcuts.toggle_hidden": "Mostra/Nasconde il testo dietro CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Mostra/Nasconde media",
+  "keyboard_shortcuts.toot": "Crea un nuovo post",
+  "keyboard_shortcuts.unfocus": "Rimuove il focus sull'area di composizione testuale/ricerca",
+  "keyboard_shortcuts.up": "Scorre in su nell'elenco",
   "lightbox.close": "Chiudi",
   "lightbox.compress": "Comprimi casella di visualizzazione immagine",
   "lightbox.expand": "Espandi casella di visualizzazione immagine",
   "lightbox.next": "Successivo",
   "lightbox.previous": "Precedente",
+  "limited_account_hint.action": "Mostra comunque il profilo",
+  "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "lists.account.add": "Aggiungi alla lista",
   "lists.account.remove": "Togli dalla lista",
   "lists.delete": "Elimina lista",
   "lists.edit": "Modifica lista",
-  "lists.edit.submit": "Cambia titolo",
+  "lists.edit.submit": "Cambia il titolo",
   "lists.new.create": "Aggiungi lista",
   "lists.new.title_placeholder": "Titolo della nuova lista",
   "lists.replies_policy.followed": "Qualsiasi utente seguito",
-  "lists.replies_policy.list": "Iscritti alla lista",
+  "lists.replies_policy.list": "Membri della lista",
   "lists.replies_policy.none": "Nessuno",
   "lists.replies_policy.title": "Mostra risposte a:",
   "lists.search": "Cerca tra le persone che segui",
   "lists.subheading": "Le tue liste",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
   "loading_indicator.label": "Caricamento...",
-  "media_gallery.toggle_visible": "Imposta visibilità",
+  "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "missing_indicator.label": "Non trovato",
-  "missing_indicator.sublabel": "Risorsa non trovata",
+  "missing_indicator.sublabel": "Impossibile trovare questa risorsa",
+  "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
   "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Nascondere le notifiche da quest'utente?",
+  "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?",
   "mute_modal.indefinite": "Per sempre",
-  "navigation_bar.apps": "App per dispositivi mobili",
+  "navigation_bar.about": "Info",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.bookmarks": "Segnalibri",
-  "navigation_bar.community_timeline": "Timeline locale",
+  "navigation_bar.community_timeline": "Cronologia locale",
   "navigation_bar.compose": "Componi nuovo toot",
   "navigation_bar.direct": "Messaggi diretti",
   "navigation_bar.discover": "Scopri",
-  "navigation_bar.domain_blocks": "Domini nascosti",
-  "navigation_bar.edit_profile": "Modifica profilo",
-  "navigation_bar.favourites": "Apprezzati",
+  "navigation_bar.domain_blocks": "Domini bloccati",
+  "navigation_bar.edit_profile": "Modifica il profilo",
+  "navigation_bar.explore": "Esplora",
+  "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
   "navigation_bar.follow_requests": "Richieste di seguirti",
   "navigation_bar.follows_and_followers": "Seguiti e seguaci",
-  "navigation_bar.info": "Informazioni su questo server",
-  "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
   "navigation_bar.lists": "Liste",
-  "navigation_bar.logout": "Esci",
+  "navigation_bar.logout": "Disconnettiti",
   "navigation_bar.mutes": "Utenti silenziati",
   "navigation_bar.personal": "Personale",
-  "navigation_bar.pins": "Toot fissati in cima",
-  "navigation_bar.preferences": "Impostazioni",
-  "navigation_bar.public_timeline": "Timeline federata",
+  "navigation_bar.pins": "Post fissati",
+  "navigation_bar.preferences": "Preferenze",
+  "navigation_bar.public_timeline": "Cronologia federata",
+  "navigation_bar.search": "Cerca",
   "navigation_bar.security": "Sicurezza",
-  "notification.favourite": "{name} ha apprezzato il tuo post",
+  "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.",
+  "notification.admin.report": "{name} ha segnalato {target}",
+  "notification.admin.sign_up": "{name} si è iscritto",
+  "notification.favourite": "{name} ha salvato il tuo post tra i preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
-  "notification.follow_request": "{name} ti ha mandato una richiesta di follow",
+  "notification.follow_request": "{name} ha richiesto di seguirti",
   "notification.mention": "{name} ti ha menzionato",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
-  "notification.reblog": "{name} ha condiviso il tuo post",
+  "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.status": "{name} ha appena pubblicato un post",
-  "notifications.clear": "Cancella notifiche",
-  "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?",
+  "notification.update": "{name} ha modificato un post",
+  "notifications.clear": "Cancella le notifiche",
+  "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
+  "notifications.column_settings.admin.report": "Nuove segnalazioni:",
+  "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
-  "notifications.column_settings.favourite": "Apprezzati:",
+  "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
-  "notifications.column_settings.filter_bar.category": "Filtro rapido",
-  "notifications.column_settings.filter_bar.show": "Mostra",
-  "notifications.column_settings.follow": "Nuovi follower:",
-  "notifications.column_settings.follow_request": "Nuove richieste di follow:",
+  "notifications.column_settings.filter_bar.category": "Barra rapida del filtro",
+  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
+  "notifications.column_settings.follow": "Nuovi seguaci:",
+  "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
   "notifications.column_settings.poll": "Risultati del sondaggio:",
   "notifications.column_settings.push": "Notifiche push",
-  "notifications.column_settings.reblog": "Post condivisi:",
-  "notifications.column_settings.show": "Mostra in colonna",
+  "notifications.column_settings.reblog": "Reblog:",
+  "notifications.column_settings.show": "Mostra nella colonna",
   "notifications.column_settings.sound": "Riproduci suono",
-  "notifications.column_settings.status": "Nuovi toot:",
-  "notifications.column_settings.unread_markers.category": "Marcatori di notifica non letti",
+  "notifications.column_settings.status": "Nuovi post:",
+  "notifications.column_settings.unread_notifications.category": "Notifiche non lette",
+  "notifications.column_settings.unread_notifications.highlight": "Evidenzia le notifiche non lette",
+  "notifications.column_settings.update": "Modifiche:",
   "notifications.filter.all": "Tutti",
-  "notifications.filter.boosts": "Condivisioni",
-  "notifications.filter.favourites": "Apprezzati",
-  "notifications.filter.follows": "Follower",
+  "notifications.filter.boosts": "Reblog",
+  "notifications.filter.favourites": "Preferiti",
+  "notifications.filter.follows": "Seguaci",
   "notifications.filter.mentions": "Menzioni",
   "notifications.filter.polls": "Risultati del sondaggio",
   "notifications.filter.statuses": "Aggiornamenti dalle persone che segui",
-  "notifications.grant_permission": "Dai il permesso.",
+  "notifications.grant_permission": "Concedi autorizzazione.",
   "notifications.group": "{count} notifiche",
   "notifications.mark_as_read": "Segna tutte le notifiche come lette",
-  "notifications.permission_denied": "Impossibile abilitare le notifiche sul desktop perché il permesso è stato negato.",
-  "notifications.permission_denied_alert": "Le notifiche sul desktop non possono essere abilitate, poiché il permesso nel browser è stato negato in precedenza",
-  "notifications.permission_required": "Le notifiche desktop non sono disponibili perché l'autorizzazione richiesta non è stata concessa.",
-  "notifications_permission_banner.enable": "Abilita le notifiche sul desktop",
-  "notifications_permission_banner.how_to_control": "Per ricevere notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare con precisione quali tipi di interazioni generano notifiche desktop tramite il pulsante {icon} qui sopra, dopo averle abilitate.",
+  "notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
+  "notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
+  "notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+  "notifications_permission_banner.enable": "Abilita le notifiche desktop",
+  "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
-  "picture_in_picture.restore": "Riportalo indietro",
+  "picture_in_picture.restore": "Ripristinala",
   "poll.closed": "Chiuso",
   "poll.refresh": "Aggiorna",
   "poll.total_people": "{count, plural, one {# persona} other {# persone}}",
   "poll.total_votes": "{count, plural, one {# voto} other {# voti}}",
   "poll.vote": "Vota",
   "poll.voted": "Hai votato per questa risposta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# voti}}",
   "poll_button.add_poll": "Aggiungi un sondaggio",
-  "poll_button.remove_poll": "Rimuovi sondaggio",
+  "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
-  "privacy.direct.long": "Invia solo a utenti menzionati",
-  "privacy.direct.short": "Diretto in privato",
-  "privacy.private.long": "Invia solo ai follower",
-  "privacy.private.short": "Privato",
-  "privacy.public.long": "Invia alla timeline pubblica",
+  "privacy.direct.long": "Visibile solo per gli utenti menzionati",
+  "privacy.direct.short": "Solo persone menzionate",
+  "privacy.private.long": "Visibile solo ai seguaci",
+  "privacy.private.short": "Solo seguaci",
+  "privacy.public.long": "Visibile a tutti",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
+  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
   "privacy.unlisted.short": "Non elencato",
-  "refresh": "Aggiorna",
-  "regeneration_indicator.label": "Caricamento in corso…",
-  "regeneration_indicator.sublabel": "Stiamo preparando il tuo home feed!",
+  "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
+  "privacy_policy.title": "Politica sulla Privacy",
+  "refresh": "Ricarica",
+  "regeneration_indicator.label": "Caricamento…",
+  "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!",
   "relative_time.days": "{number}g",
-  "relative_time.hours": "{number}o",
+  "relative_time.full.days": "{number, plural, one {# giorno} other {# giorni}} fa",
+  "relative_time.full.hours": "{number, plural, one {# ora} other {# ore}} fa",
+  "relative_time.full.just_now": "adesso",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# minuti}} fa",
+  "relative_time.full.seconds": "{number, plural, one {# secondo} other {# secondi}} fa",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "ora",
   "relative_time.minutes": "{number} minuti",
-  "relative_time.seconds": "{number} secondi",
+  "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
   "reply_indicator.cancel": "Annulla",
+  "report.block": "Blocca",
+  "report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
+  "report.categories.other": "Altro",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Il contenuto viola una o più regole del server",
+  "report.category.subtitle": "Scegli la corrispondenza migliore",
+  "report.category.title": "Dicci cosa sta succedendo con questo {type}",
+  "report.category.title_account": "profilo",
+  "report.category.title_status": "post",
+  "report.close": "Fatto",
+  "report.comment.title": "C'è altro che pensi che dovremmo sapere?",
   "report.forward": "Inoltra a {target}",
-  "report.forward_hint": "Questo account appartiene a un altro server. Mandare anche là una copia anonima del rapporto?",
-  "report.hint": "La segnalazione sarà inviata ai moderatori del tuo server. Di seguito, puoi fornire il motivo per il quale stai segnalando questo account:",
+  "report.forward_hint": "Il profilo proviene da un altro server. Inviare anche lì una copia anonima del rapporto?",
+  "report.mute": "Silenzia",
+  "report.mute_explanation": "Non visualizzerai i suoi post. Potrà comunque seguirti e visualizzare i tuoi post e non saprà di esser stato silenziato.",
+  "report.next": "Successivo",
   "report.placeholder": "Commenti aggiuntivi",
+  "report.reasons.dislike": "Non mi piace",
+  "report.reasons.dislike_description": "Non è qualcosa che desideri vedere",
+  "report.reasons.other": "È qualcos'altro",
+  "report.reasons.other_description": "Il problema non rientra in altre categorie",
+  "report.reasons.spam": "È spam",
+  "report.reasons.spam_description": "Link malevoli, false interazioni o risposte ripetitive",
+  "report.reasons.violation": "Viola le regole del server",
+  "report.reasons.violation_description": "Sei consapevole che viola regole specifiche",
+  "report.rules.subtitle": "Seleziona tutte le risposte pertinenti",
+  "report.rules.title": "Quali regole sono violate?",
+  "report.statuses.subtitle": "Seleziona tutte le risposte pertinenti",
+  "report.statuses.title": "Ci sono dei post a sostegno di questa segnalazione?",
   "report.submit": "Invia",
-  "report.target": "Invio la segnalazione {target}",
+  "report.target": "Segnalando {target}",
+  "report.thanks.take_action": "Ecco le tue opzioni per controllare cosa vedi su Mastodon:",
+  "report.thanks.take_action_actionable": "Mentre revisioniamo questa segnalazione, puoi agire contro @{name}:",
+  "report.thanks.title": "Non desideri vederlo?",
+  "report.thanks.title_actionable": "Grazie per la segnalazione, ce ne occuperemo.",
+  "report.unfollow": "Smetti di seguire @{name}",
+  "report.unfollow_explanation": "Segui questo profilo. Per non visualizzare più i suoi post nel feed della tua home, smetti di seguirlo.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post allegato} other {{count} post allegati}}",
+  "report_notification.categories.other": "Altro",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violazione delle regole",
+  "report_notification.open": "Apri segnalazione",
   "search.placeholder": "Cerca",
+  "search.search_or_paste": "Cerca o incolla URL",
   "search_popout.search_format": "Formato di ricerca avanzato",
-  "search_popout.tips.full_text": "Testo semplice per trovare gli status che hai scritto, segnato come apprezzati, condiviso o in cui sei stato citato, e inoltre i nomi utente, nomi visualizzati e hashtag che lo contengono.",
-  "search_popout.tips.hashtag": "etichetta",
-  "search_popout.tips.status": "stato",
-  "search_popout.tips.text": "Testo semplice per trovare nomi visualizzati, nomi utente e hashtag che lo contengono",
+  "search_popout.tips.full_text": "Restituisce in testo semplice i post che hai scritto, salvato tra i preferiti, rebloggato o in cui sei stato menzionato, nonché nomi utenti, nomi visualizzati e hashtag corrispondenti.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "post",
+  "search_popout.tips.text": "Restituisce in testo semplice i nomi utente, i nomi visualizzati e gli hashtag corrispondenti",
   "search_popout.tips.user": "utente",
-  "search_results.accounts": "Gente",
+  "search_results.accounts": "Persone",
+  "search_results.all": "Tutto",
   "search_results.hashtags": "Hashtag",
-  "search_results.statuses": "Toot",
-  "search_results.statuses_fts_disabled": "La ricerca di toot per il loro contenuto non è abilitata su questo server Mastodon.",
-  "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
+  "search_results.nothing_found": "Impossibile trovare qualcosa per questi termini di ricerca",
+  "search_results.statuses": "Post",
+  "search_results.statuses_fts_disabled": "La ricerca dei post per contenuto non è abilitata su questo server di Mastodon.",
+  "search_results.title": "Cerca {q}",
+  "search_results.total": "{count, number} {count, plural, one {risultato} other {risultati}}",
+  "server_banner.about_active_users": "Persone che hanno utilizzato questo server negli ultimi 30 giorni (Utenti Attivi Mensilmente)",
+  "server_banner.active_users": "utenti attivi",
+  "server_banner.administered_by": "Amministrato da:",
+  "server_banner.introduction": "{domain} è parte del social network decentralizzato, sviluppato da {mastodon}.",
+  "server_banner.learn_more": "Scopri di più",
+  "server_banner.server_stats": "Statistiche del server:",
+  "sign_in_banner.create_account": "Crea un profilo",
+  "sign_in_banner.sign_in": "Accedi",
+  "sign_in_banner.text": "Accedi per seguire profili o hashtag, salvare tra i preferiti, condividere e rispondere ai post, o interagire dal tuo profilo su un server differente.",
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
-  "status.admin_status": "Apri questo status nell'interfaccia di moderazione",
+  "status.admin_status": "Apri questo post nell'interfaccia di moderazione",
   "status.block": "Blocca @{name}",
   "status.bookmark": "Aggiungi segnalibro",
-  "status.cancel_reblog_private": "Annulla condivisione",
+  "status.cancel_reblog_private": "Annulla reblog",
   "status.cannot_reblog": "Questo post non può essere condiviso",
-  "status.copy": "Copia link allo status",
+  "status.copy": "Copia link al post",
   "status.delete": "Elimina",
   "status.detailed_status": "Vista conversazione dettagliata",
-  "status.direct": "Messaggio privato @{name}",
+  "status.direct": "Messaggio diretto a @{name}",
+  "status.edit": "Modifica",
+  "status.edited": "Modificato il {date}",
+  "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
   "status.embed": "Incorpora",
-  "status.favourite": "Apprezzato",
+  "status.favourite": "Salva preferito",
+  "status.filter": "Filtra questo post",
   "status.filtered": "Filtrato",
-  "status.load_more": "Mostra di più",
-  "status.media_hidden": "Allegato nascosto",
-  "status.mention": "Nomina @{name}",
+  "status.hide": "Nascondi toot",
+  "status.history.created": "{name} ha creato {date}",
+  "status.history.edited": "Modificato da {name} il {date}",
+  "status.load_more": "Carica altro",
+  "status.media_hidden": "Media nascosto",
+  "status.mention": "Menziona @{name}",
   "status.more": "Altro",
   "status.mute": "Silenzia @{name}",
   "status.mute_conversation": "Silenzia conversazione",
   "status.open": "Espandi questo post",
   "status.pin": "Fissa in cima sul profilo",
-  "status.pinned": "Toot fissato in cima",
-  "status.read_more": "Leggi altro",
-  "status.reblog": "Condividi",
-  "status.reblog_private": "Condividi con i destinatari iniziali",
-  "status.reblogged_by": "{name} ha condiviso",
-  "status.reblogs.empty": "Nessuno ha ancora condiviso questo toot. Quando qualcuno lo farà, comparirà qui.",
-  "status.redraft": "Cancella e riscrivi",
-  "status.remove_bookmark": "Elimina segnalibro",
+  "status.pinned": "Post fissato",
+  "status.read_more": "Leggi di più",
+  "status.reblog": "Reblog",
+  "status.reblog_private": "Reblog con visibilità originale",
+  "status.reblogged_by": "Rebloggato da {name}",
+  "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
+  "status.redraft": "Elimina e riscrivi",
+  "status.remove_bookmark": "Rimuovi segnalibro",
+  "status.replied_to": "Risposta a {name}",
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
   "status.report": "Segnala @{name}",
-  "status.sensitive_warning": "Materiale sensibile",
+  "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
+  "status.show_filter_reason": "Mostra comunque",
   "status.show_less": "Mostra meno",
   "status.show_less_all": "Mostra meno per tutti",
   "status.show_more": "Mostra di più",
   "status.show_more_all": "Mostra di più per tutti",
-  "status.show_thread": "Mostra thread",
+  "status.show_original": "Mostra originale",
+  "status.translate": "Traduci",
+  "status.translated_from_with": "Tradotto da {lang} utilizzando {provider}",
   "status.uncached_media_warning": "Non disponibile",
-  "status.unmute_conversation": "Annulla silenzia conversazione",
-  "status.unpin": "Non fissare in cima al profilo",
-  "suggestions.dismiss": "Elimina suggerimento",
+  "status.unmute_conversation": "Annulla silenziamento conversazione",
+  "status.unpin": "Non fissare sul profilo",
+  "subscribed_languages.lead": "Solo i post nelle lingue selezionate appariranno sulla tua home e nelle cronologie dopo la modifica. Seleziona nessuno per ricevere i post in tutte le lingue.",
+  "subscribed_languages.save": "Salva le modifiche",
+  "subscribed_languages.target": "Modifica le lingue in cui sei iscritto per {target}",
+  "suggestions.dismiss": "Chiudi suggerimento",
   "suggestions.header": "Ti potrebbe interessare…",
-  "tabs_bar.federated_timeline": "Federazione",
+  "tabs_bar.federated_timeline": "Federata",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Locale",
   "tabs_bar.notifications": "Notifiche",
-  "tabs_bar.search": "Cerca",
   "time_remaining.days": "{number, plural, one {# giorno} other {# giorni}} left",
   "time_remaining.hours": "{number, plural, one {# ora} other {# ore}} left",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} left",
   "time_remaining.moments": "Restano pochi istanti",
   "time_remaining.seconds": "{number, plural, one {# secondo} other {# secondi}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource] da altri server non sono mostrati.",
-  "timeline_hint.resources.followers": "Follower",
+  "timeline_hint.remote_resource_not_displayed": "{resource} da altri server non sono mostrati.",
+  "timeline_hint.resources.followers": "Seguaci",
   "timeline_hint.resources.follows": "Segue",
-  "timeline_hint.resources.statuses": "Toot meno recenti",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persone}} ne parla·no",
-  "trends.trending_now": "Di tendenza ora",
-  "ui.beforeunload": "La bozza andrà persa se esci da Mastodon.",
-  "units.short.billion": "{count}G",
+  "timeline_hint.resources.statuses": "Post meno recenti",
+  "trends.counter_by_accounts": "{count, plural, one {{count} persona} other {{count} persone}} {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
+  "trends.trending_now": "Ora in tendenza",
+  "ui.beforeunload": "La tua bozza andrà persa, se abbandoni Mastodon.",
+  "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
-  "upload_area.title": "Trascina per caricare",
-  "upload_button.label": "Aggiungi file multimediale",
-  "upload_error.limit": "Limite al caricamento di file superato.",
-  "upload_error.poll": "Caricamento file non consentito nei sondaggi.",
-  "upload_form.audio_description": "Descrizione per persone con difetti uditivi",
-  "upload_form.description": "Descrizione per utenti con disabilità visive",
+  "upload_area.title": "Trascina e rilascia per caricare",
+  "upload_button.label": "Aggiungi un file immagine, video o audio",
+  "upload_error.limit": "Limite di caricamento dei file superato.",
+  "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
+  "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
+  "upload_form.description": "Descrizione per ipovedenti",
+  "upload_form.description_missing": "Nessuna descrizione aggiunta",
   "upload_form.edit": "Modifica",
-  "upload_form.thumbnail": "Cambia miniatura",
-  "upload_form.undo": "Cancella",
-  "upload_form.video_description": "Descrizione per persone con difetti uditivi o visivi",
-  "upload_modal.analyzing_picture": "Analisi immagine…",
+  "upload_form.thumbnail": "Cambia la miniatura",
+  "upload_form.undo": "Elimina",
+  "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
+  "upload_modal.analyzing_picture": "Analizzando l'immagine…",
   "upload_modal.apply": "Applica",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Scegli immagine",
-  "upload_modal.description_placeholder": "Ma la volpe col suo balzo ha raggiunto il quieto Fido",
-  "upload_modal.detect_text": "Rileva testo dall'immagine",
-  "upload_modal.edit_media": "Modifica media",
+  "upload_modal.applying": "Applicazione…",
+  "upload_modal.choose_image": "Scegli l'immagine",
+  "upload_modal.description_placeholder": "Ma la volpe col suo balzo ha raggiunto il fiero Fido",
+  "upload_modal.detect_text": "Rileva il testo dall'immagine",
+  "upload_modal.edit_media": "Modifica il media",
   "upload_modal.hint": "Clicca o trascina il cerchio sull'anteprima per scegliere il punto focale che sarà sempre visualizzato su tutte le miniature.",
   "upload_modal.preparing_ocr": "Preparazione OCR…",
   "upload_modal.preview_label": "Anteprima ({ratio})",
-  "upload_progress.label": "Invio in corso...",
-  "video.close": "Chiudi video",
+  "upload_progress.label": "Caricamento...",
+  "upload_progress.processing": "Elaborazione…",
+  "video.close": "Chiudi il video",
   "video.download": "Scarica file",
-  "video.exit_fullscreen": "Esci da modalità a schermo intero",
-  "video.expand": "Espandi video",
+  "video.exit_fullscreen": "Esci dallo schermo intero",
+  "video.expand": "Espandi il video",
   "video.fullscreen": "Schermo intero",
-  "video.hide": "Nascondi video",
+  "video.hide": "Nascondi il video",
   "video.mute": "Silenzia suono",
   "video.pause": "Pausa",
   "video.play": "Riproduci",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 43f01924c..eb83b3f3b 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "制限中のサーバー",
+  "about.contact": "連絡先",
+  "about.disclaimer": "Mastodonは自由なオープンソースソフトウェアでMastodon gGmbHの商標です。",
+  "about.domain_blocks.no_reason_available": "制限理由",
+  "about.domain_blocks.preamble": "Mastodonでは連合先のどのようなサーバーのユーザーとも交流できます。ただし次のサーバーには例外が設定されています。",
+  "about.domain_blocks.silenced.explanation": "このサーバーのプロフィールやコンテンツは、明示的に検索したり、フォローでオプトインしない限り、通常は表示されません。",
+  "about.domain_blocks.silenced.title": "制限",
+  "about.domain_blocks.suspended.explanation": "これらのサーバーからのデータは処理されず、保存や変換もされません。該当するユーザーとの交流もできません。",
+  "about.domain_blocks.suspended.title": "停止済み",
+  "about.not_available": "この情報はこのサーバーでは利用できません。",
+  "about.powered_by": "{mastodon}による分散型ソーシャルメディア",
+  "about.rules": "サーバーのルール",
   "account.account_note_header": "メモ",
   "account.add_or_remove_from_list": "リストから追加または外す",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "{domain}全体をブロック",
   "account.blocked": "ブロック済み",
   "account.browse_more_on_origin_server": "リモートで表示",
-  "account.cancel_follow_request": "フォローリクエストを取り消す",
+  "account.cancel_follow_request": "フォローリクエストの取り消し",
   "account.direct": "@{name}さんにダイレクトメッセージ",
-  "account.disable_notifications": "@{name} の投稿時の通知を停止",
+  "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
   "account.domain_blocked": "ドメインブロック中",
   "account.edit_profile": "プロフィール編集",
-  "account.enable_notifications": "@{name} の投稿時に通知",
+  "account.enable_notifications": "@{name}さんの投稿時に通知",
   "account.endorse": "プロフィールで紹介する",
+  "account.featured_tags.last_status_at": "最終投稿 {date}",
+  "account.featured_tags.last_status_never": "投稿がありません",
+  "account.featured_tags.title": "{name}の注目ハッシュタグ",
   "account.follow": "フォロー",
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
   "account.followers_counter": "{counter} フォロワー",
+  "account.following": "フォロー中",
   "account.following_counter": "{counter} フォロー",
   "account.follows.empty": "まだ誰もフォローしていません。",
   "account.follows_you": "フォローされています",
+  "account.go_to_profile": "プロフィールページへ",
   "account.hide_reblogs": "@{name}さんからのブーストを非表示",
-  "account.joined": "{date} に登録",
-  "account.last_status": "最後の活動",
+  "account.joined_short": "登録日",
+  "account.languages": "購読言語の変更",
   "account.link_verified_on": "このリンクの所有権は{date}に確認されました",
   "account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。",
   "account.media": "メディア",
-  "account.mention": "@{name}さんに投稿",
-  "account.moved_to": "{name}さんは引っ越しました:",
+  "account.mention": "@{name}さんにメンション",
+  "account.moved_to": "{name} さんの新しいアカウント:",
   "account.mute": "@{name}さんをミュート",
   "account.mute_notifications": "@{name}さんからの通知を受け取らない",
   "account.muted": "ミュート済み",
-  "account.never_active": "活動なし",
+  "account.open_original_page": "元のページを開く",
   "account.posts": "投稿",
   "account.posts_with_replies": "投稿と返信",
   "account.report": "@{name}さんを通報",
   "account.requested": "フォロー承認待ちです。クリックしてキャンセル",
+  "account.requested_follow": "{name} さんがあなたにフォローリクエストしました",
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
   "account.statuses_counter": "{counter} 投稿",
   "account.unblock": "@{name}さんのブロックを解除",
   "account.unblock_domain": "{domain}のブロックを解除",
+  "account.unblock_short": "ブロック解除",
   "account.unendorse": "プロフィールから外す",
   "account.unfollow": "フォロー解除",
   "account.unmute": "@{name}さんのミュートを解除",
   "account.unmute_notifications": "@{name}さんからの通知を受け取るようにする",
+  "account.unmute_short": "ミュート解除",
   "account_note.placeholder": "クリックしてメモを追加",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "サインアップ後の日ごとのユーザー継続率",
+  "admin.dashboard.monthly_retention": "サインアップ後の月ごとのユーザー継続率",
+  "admin.dashboard.retention.average": "平均",
+  "admin.dashboard.retention.cohort": "サインアップ月",
+  "admin.dashboard.retention.cohort_size": "新しいユーザー",
   "alert.rate_limited.message": "{retry_time, time, medium} 以降に再度実行してください。",
   "alert.rate_limited.title": "制限に達しました",
   "alert.unexpected.message": "不明なエラーが発生しました。",
   "alert.unexpected.title": "エラー！",
   "announcement.announcement": "お知らせ",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(未処理)",
+  "audio.hide": "音声を閉じる",
   "autosuggest_hashtag.per_week": "{count} 回 / 週",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
-  "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。",
+  "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
+  "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
+  "bundle_column_error.error.title": "あらら……",
+  "bundle_column_error.network.body": "このページを読み込もうとしたときにエラーが発生しました。インターネット接続またはこのサーバーの一時的な問題が発生した可能性があります。",
+  "bundle_column_error.network.title": "ネットワークエラー",
   "bundle_column_error.retry": "再試行",
-  "bundle_column_error.title": "ネットワークエラー",
+  "bundle_column_error.return": "ホームに戻る",
+  "bundle_column_error.routing.body": "要求されたページは見つかりませんでした。アドレスバーの URL は正しいですか？",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "閉じる",
   "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_modal_error.retry": "再試行",
+  "closed_registrations.other_server_instructions": "Mastodonは分散型なので他のサーバーにアカウントを作ってもこのサーバーとやり取りできます。",
+  "closed_registrations_modal.description": "現在{domain}でアカウント作成はできませんがMastodonは{domain}のアカウントでなくても利用できます。",
+  "closed_registrations_modal.find_another_server": "別のサーバーを探す",
+  "closed_registrations_modal.preamble": "Mastodonは分散型なのでどのサーバーでアカウントを作成してもこのサーバーのユーザーを誰でもフォローして交流することができます。また自分でホスティングすることもできます！",
+  "closed_registrations_modal.title": "Mastodonでアカウントを作成",
+  "column.about": "About",
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "ブックマーク",
   "column.community": "ローカルタイムライン",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "ローカルのみ表示",
   "community.column_settings.media_only": "メディアのみ表示",
   "community.column_settings.remote_only": "リモートのみ表示",
-  "compose_form.direct_message_warning": "この投稿はメンションされた人にのみ送信されます。",
+  "compose.language.change": "言語を変更",
+  "compose.language.search": "言語を検索...",
   "compose_form.direct_message_warning_learn_more": "もっと詳しく",
+  "compose_form.encryption_warning": "Mastodonの投稿はエンドツーエンド暗号化に対応していません。安全に送受信されるべき情報をMastodonで共有しないでください。",
   "compose_form.hashtag_warning": "この投稿は公開設定ではないのでハッシュタグの一覧に表示されません。公開投稿だけがハッシュタグで検索できます。",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "この項目を削除",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
-  "compose_form.publish": "トゥート",
+  "compose_form.publish": "投稿",
+  "compose_form.publish_form": "投稿",
   "compose_form.publish_loud": "{publish}！",
+  "compose_form.save_changes": "変更を保存",
   "compose_form.sensitive.hide": "メディアを閲覧注意にする",
   "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
   "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
   "confirmations.block.message": "本当に{name}さんをブロックしますか？",
+  "confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
+  "confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか？",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "破棄",
+  "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
   "confirmations.domain_block.confirm": "ドメイン全体をブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.logout.confirm": "ログアウト",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
   "conversation.with": "{names}",
+  "copypaste.copied": "コピーしました",
+  "copypaste.copy": "コピー",
   "directory.federated": "既知の連合より",
   "directory.local": "{domain} のみ",
   "directory.new_arrivals": "新着順",
   "directory.recently_active": "最近の活動順",
+  "disabled_account_banner.account_settings": "アカウント設定",
+  "disabled_account_banner.text": "あなたのアカウント『{disabledAccount}』は現在無効になっています。",
+  "dismissable_banner.community_timeline": "これらは{domain}がホストしている人たちの最新の公開投稿です。",
+  "dismissable_banner.dismiss": "閉じる",
+  "dismissable_banner.explore_links": "これらのニュース記事は現在分散型ネットワークの他のサーバーの人たちに話されています。",
+  "dismissable_banner.explore_statuses": "分散型ネットワーク内の他のサーバーのこれらの投稿は現在このサーバー上で注目されています。",
+  "dismissable_banner.explore_tags": "これらのハッシュタグは現在分散型ネットワークの他のサーバーの人たちに話されています。",
+  "dismissable_banner.public_timeline": "これらの投稿はこのサーバーが知っている分散型ネットワークの他のサーバーの人たちの最新の公開投稿です。",
   "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
   "embed.preview": "表示例:",
   "emoji_button.activity": "活動",
+  "emoji_button.clear": "クリア",
   "emoji_button.custom": "カスタム絵文字",
   "emoji_button.flags": "国旗",
   "emoji_button.food": "食べ物",
@@ -165,6 +216,7 @@
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
   "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
   "empty_column.domain_blocks": "ブロックしているドメインはありません。",
+  "empty_column.explore_statuses": "まだ何もありません。後で確認してください。",
   "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
   "empty_column.favourites": "まだ誰もお気に入り登録していません。お気に入り登録されるとここに表示されます。",
   "empty_column.follow_recommendations": "おすすめを生成できませんでした。検索を使って知り合いを探したり、トレンドハッシュタグを見てみましょう。",
@@ -183,23 +235,45 @@
   "error.unexpected_crash.next_steps_addons": "それらを無効化してからリロードをお試しください。それでも解決しない場合、他のブラウザやアプリで Mastodon をお試しください。",
   "errors.unexpected_crash.copy_stacktrace": "スタックトレースをクリップボードにコピー",
   "errors.unexpected_crash.report_issue": "問題を報告",
+  "explore.search_results": "検索結果",
+  "explore.suggested_follows": "おすすめ",
+  "explore.title": "エクスプローラー",
+  "explore.trending_links": "ニュース",
+  "explore.trending_statuses": "投稿",
+  "explore.trending_tags": "ハッシュタグ",
+  "filter_modal.added.context_mismatch_explanation": "このフィルターカテゴリーはあなたがアクセスした投稿のコンテキストには適用されません。この投稿のコンテキストでもフィルターを適用するにはフィルターを編集する必要があります。",
+  "filter_modal.added.context_mismatch_title": "コンテキストが一致しません！",
+  "filter_modal.added.expired_explanation": "このフィルターカテゴリーは有効期限が切れています。適用するには有効期限を更新してください。",
+  "filter_modal.added.expired_title": "フィルターの有効期限が切れています！",
+  "filter_modal.added.review_and_configure": "このフィルターカテゴリーを確認して設定するには、{settings_link}に移動します。",
+  "filter_modal.added.review_and_configure_title": "フィルター設定",
+  "filter_modal.added.settings_link": "設定",
+  "filter_modal.added.short_explanation": "この投稿はフィルターカテゴリー『{title}』に追加されました。",
+  "filter_modal.added.title": "フィルターを追加しました!",
+  "filter_modal.select_filter.context_mismatch": "このコンテキストには当てはまりません",
+  "filter_modal.select_filter.expired": "期限切れ",
+  "filter_modal.select_filter.prompt_new": "新しいカテゴリー: {name}",
+  "filter_modal.select_filter.search": "検索または新規作成",
+  "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
+  "filter_modal.select_filter.title": "この投稿をフィルターする",
+  "filter_modal.title.status": "投稿をフィルターする",
   "follow_recommendations.done": "完了",
   "follow_recommendations.heading": "投稿を見たい人をフォローしてください！ここにおすすめがあります。",
   "follow_recommendations.lead": "あなたがフォローしている人の投稿は、ホームフィードに時系列で表示されます。いつでも簡単に解除できるので、気軽にフォローしてみてください！",
   "follow_request.authorize": "許可",
   "follow_request.reject": "拒否",
-  "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain} のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "footer.about": "概要",
+  "footer.directory": "ディレクトリ",
+  "footer.get_app": "アプリをダウンロードする",
+  "footer.invite": "新規ユーザーの招待",
+  "footer.keyboard_shortcuts": "キーボードショートカット",
+  "footer.privacy_policy": "プライバシーポリシー",
+  "footer.source_code": "ソースコードを表示",
   "generic.saved": "保存しました",
-  "getting_started.developers": "開発",
-  "getting_started.directory": "ディレクトリ",
-  "getting_started.documentation": "ドキュメント",
   "getting_started.heading": "スタート",
-  "getting_started.invite": "招待",
-  "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub ( {github} ) から開発に参加したり、問題を報告したりできます。",
-  "getting_started.security": "アカウント設定",
-  "getting_started.terms": "プライバシーポリシー",
-  "hashtag.column_header.tag_mode.all": "と {additional}",
-  "hashtag.column_header.tag_mode.any": "か {additional}",
+  "hashtag.column_header.tag_mode.all": "と{additional}",
+  "hashtag.column_header.tag_mode.any": "か{additional}",
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
   "hashtag.column_settings.select.no_options_message": "提案はありません",
   "hashtag.column_settings.select.placeholder": "ハッシュタグを入力してください…",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "いずれかを含む",
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
+  "hashtag.follow": "ハッシュタグをフォローする",
+  "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
   "home.hide_announcements": "お知らせを隠す",
   "home.show_announcements": "お知らせを表示",
+  "interaction_modal.description.favourite": "Mastodonのアカウントでこの投稿をお気に入りに入れて投稿者に感謝を知らせたり保存することができます。",
+  "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。",
+  "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。",
+  "interaction_modal.description.reply": "Mastodonのアカウントでこの投稿に反応できます。",
+  "interaction_modal.on_another_server": "別のサーバー",
+  "interaction_modal.on_this_server": "このサーバー",
+  "interaction_modal.other_server_instructions": "このURLをお気に入りのMastodonアプリやMastodonサーバーのWebインターフェースの検索フィールドにコピーして貼り付けます。",
+  "interaction_modal.preamble": "Mastodonは分散化されているためアカウントを持っていなくても別のMastodonサーバーまたは互換性のあるプラットフォームでホストされているアカウントを使用できます。",
+  "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り",
+  "interaction_modal.title.follow": "{name}さんをフォロー",
+  "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
+  "interaction_modal.title.reply": "{name}さんの投稿にリプライ",
   "intervals.full.days": "{number}日",
   "intervals.full.hours": "{number}時間",
   "intervals.full.minutes": "{number}分",
@@ -254,6 +342,8 @@
   "lightbox.expand": "画像ビューボックスを開く",
   "lightbox.next": "次",
   "lightbox.previous": "前",
+  "limited_account_hint.action": "構わず表示する",
+  "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",
@@ -267,15 +357,16 @@
   "lists.replies_policy.title": "リプライを表示:",
   "lists.search": "フォローしている人の中から検索",
   "lists.subheading": "あなたのリスト",
-  "load_pending": "{count} 件の新着",
+  "load_pending": "{count}件の新着",
   "loading_indicator.label": "読み込み中...",
-  "media_gallery.toggle_visible": "メディアを隠す",
+  "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "missing_indicator.label": "見つかりません",
   "missing_indicator.sublabel": "見つかりませんでした",
+  "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
   "mute_modal.duration": "ミュートする期間",
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
   "mute_modal.indefinite": "無期限",
-  "navigation_bar.apps": "アプリ",
+  "navigation_bar.about": "概要",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.community_timeline": "ローカルタイムライン",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
+  "navigation_bar.explore": "エクスプローラー",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
-  "navigation_bar.info": "このサーバーについて",
-  "navigation_bar.keyboard_shortcuts": "ホットキー",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
   "navigation_bar.mutes": "ミュートしたユーザー",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "固定した投稿",
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.public_timeline": "連合タイムライン",
+  "navigation_bar.search": "検索",
   "navigation_bar.security": "セキュリティ",
+  "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。",
+  "notification.admin.report": "{name}さんが{target}さんを通報しました",
+  "notification.admin.sign_up": "{name}さんがサインアップしました",
   "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
-  "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
+  "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
   "notification.mention": "{name}さんがあなたに返信しました",
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.status": "{name}さんが投稿しました",
+  "notification.update": "{name}さんが投稿を編集しました",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
+  "notifications.column_settings.admin.report": "新しい通報:",
+  "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
-  "notifications.column_settings.filter_bar.category": "クイックフィルターバー",
-  "notifications.column_settings.filter_bar.show": "表示",
+  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
+  "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
   "notifications.column_settings.mention": "返信:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
   "notifications.column_settings.status": "新しい投稿:",
-  "notifications.column_settings.unread_markers.category": "未読マーカー",
+  "notifications.column_settings.unread_notifications.category": "未読の通知:",
+  "notifications.column_settings.unread_notifications.highlight": "未読の通知を強調表示",
+  "notifications.column_settings.update": "編集:",
   "notifications.filter.all": "すべて",
   "notifications.filter.boosts": "ブースト",
   "notifications.filter.favourites": "お気に入り",
@@ -331,13 +430,13 @@
   "notifications.filter.polls": "アンケート結果",
   "notifications.filter.statuses": "フォローしている人の新着情報",
   "notifications.grant_permission": "権限の付与",
-  "notifications.group": "{count} 件の通知",
+  "notifications.group": "{count}件の通知",
   "notifications.mark_as_read": "すべて既読にする",
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
-  "notifications_permission_banner.how_to_control": "Mastodon を閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
+  "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
   "picture_in_picture.restore": "元に戻す",
   "poll.closed": "終了",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count}票",
   "poll.vote": "投票",
   "poll.voted": "この項目に投票しました",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes}票",
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "送信した相手のみ閲覧可",
-  "privacy.direct.short": "ダイレクト",
+  "privacy.direct.long": "指定された相手のみ閲覧可",
+  "privacy.direct.short": "指定された相手のみ",
   "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワー限定",
-  "privacy.public.long": "誰でも閲覧可、公開TLに表示",
+  "privacy.private.short": "フォロワーのみ",
+  "privacy.public.long": "誰でも閲覧可",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、公開TLに非表示",
+  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
   "privacy.unlisted.short": "未収載",
+  "privacy_policy.last_updated": "{date}に更新",
+  "privacy_policy.title": "プライバシーポリシー",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
   "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
   "relative_time.days": "{number}日前",
+  "relative_time.full.days": "{number}日前",
+  "relative_time.full.hours": "{number}時間前",
+  "relative_time.full.just_now": "今",
+  "relative_time.full.minutes": "{number}分前",
+  "relative_time.full.seconds": "{number}秒前",
   "relative_time.hours": "{number}時間前",
   "relative_time.just_now": "今",
   "relative_time.minutes": "{number}分前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今日",
   "reply_indicator.cancel": "キャンセル",
-  "report.forward": "{target} に転送する",
+  "report.block": "ブロック",
+  "report.block_explanation": "相手の投稿が表示されなくなります。相手はあなたの投稿を見ることやフォローすることができません。相手はブロックされていることがわかります。",
+  "report.categories.other": "その他",
+  "report.categories.spam": "スパム",
+  "report.categories.violation": "サーバーのルールに違反",
+  "report.category.subtitle": "近いものを選択してください",
+  "report.category.title": "この{type}について教えてください",
+  "report.category.title_account": "プロフィール",
+  "report.category.title_status": "投稿",
+  "report.close": "完了",
+  "report.comment.title": "その他に私たちに伝えておくべき事はありますか？",
+  "report.forward": "{target}に転送する",
   "report.forward_hint": "このアカウントは別のサーバーに所属しています。通報内容を匿名で転送しますか？",
-  "report.hint": "通報内容はあなたのサーバーのモデレーターへ送信されます。通報理由を入力してください。:",
+  "report.mute": "ミュート",
+  "report.mute_explanation": "相手の投稿は表示されなくなります。相手は引き続きあなたをフォローして、あなたの投稿を表示することができますが、ミュートされていることはわかりません。",
+  "report.next": "次へ",
   "report.placeholder": "追加コメント",
+  "report.reasons.dislike": "興味がありません",
+  "report.reasons.dislike_description": "見たくない内容の場合",
+  "report.reasons.other": "その他",
+  "report.reasons.other_description": "当てはまる選択肢がない場合",
+  "report.reasons.spam": "これはスパムです",
+  "report.reasons.spam_description": "悪意のあるリンクや虚偽の情報、執拗な返信など",
+  "report.reasons.violation": "サーバーのルールに違反しています",
+  "report.reasons.violation_description": "ルールに違反しているのを見つけた場合",
+  "report.rules.subtitle": "当てはまるものをすべて選んでください:",
+  "report.rules.title": "どのルールに違反していますか？",
+  "report.statuses.subtitle": "当てはまるものをすべて選んでください:",
+  "report.statuses.title": "この通報を裏付けるような投稿はありますか？",
   "report.submit": "通報する",
   "report.target": "{target}さんを通報する",
+  "report.thanks.take_action": "次のような方法はいかがでしょうか？",
+  "report.thanks.take_action_actionable": "私達が確認している間でも、あなたは@{name}さんに対して対応することが出来ます：",
+  "report.thanks.title": "見えないようにしたいですか？",
+  "report.thanks.title_actionable": "ご報告ありがとうございます、追って確認します。",
+  "report.unfollow": "@{name}さんのフォローを解除",
+  "report.unfollow_explanation": "このアカウントをフォローしています。ホームフィードに彼らの投稿を表示しないようにするには、彼らのフォローを外してください。",
+  "report_notification.attached_statuses": "{count, plural, one {{count}件の投稿} other {{count}件の投稿}}が添付されました。",
+  "report_notification.categories.other": "その他",
+  "report_notification.categories.spam": "スパム",
+  "report_notification.categories.violation": "ルール違反",
+  "report_notification.open": "通報を開く",
   "search.placeholder": "検索",
+  "search.search_or_paste": "検索またはURLを入力",
   "search_popout.search_format": "高度な検索フォーマット",
   "search_popout.tips.full_text": "表示名やユーザー名、ハッシュタグのほか、あなたの投稿やお気に入り、ブーストした投稿、返信に一致する単純なテキスト。",
   "search_popout.tips.hashtag": "ハッシュタグ",
@@ -382,11 +525,23 @@
   "search_popout.tips.text": "表示名やユーザー名、ハッシュタグに一致する単純なテキスト",
   "search_popout.tips.user": "ユーザー",
   "search_results.accounts": "人々",
+  "search_results.all": "すべて",
   "search_results.hashtags": "ハッシュタグ",
+  "search_results.nothing_found": "この検索条件では何も見つかりませんでした",
   "search_results.statuses": "投稿",
   "search_results.statuses_fts_disabled": "このサーバーでは投稿本文の検索は利用できません。",
+  "search_results.title": "『{q}』の検索結果",
   "search_results.total": "{count, number}件の結果",
-  "status.admin_account": "@{name} のモデレーション画面を開く",
+  "server_banner.about_active_users": "過去30日間にこのサーバーを使用している人 (月間アクティブユーザー)",
+  "server_banner.active_users": "人のアクティブユーザー",
+  "server_banner.administered_by": "管理者",
+  "server_banner.introduction": "{domain}は{mastodon}を使った分散型ソーシャルネットワークの一部です。",
+  "server_banner.learn_more": "もっと詳しく",
+  "server_banner.server_stats": "サーバーの情報",
+  "sign_in_banner.create_account": "アカウント作成",
+  "sign_in_banner.sign_in": "ログイン",
+  "sign_in_banner.text": "ログインしてプロファイルやハッシュタグ、お気に入りをフォローしたり、投稿を共有したり、返信したり、別のサーバーのアカウントと交流したりできます。",
+  "status.admin_account": "@{name}さんのモデレーション画面を開く",
   "status.admin_status": "この投稿をモデレーション画面で開く",
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
@@ -396,9 +551,16 @@
   "status.delete": "削除",
   "status.detailed_status": "詳細な会話ビュー",
   "status.direct": "@{name}さんにダイレクトメッセージ",
+  "status.edit": "編集",
+  "status.edited": "{date}に編集",
+  "status.edited_x_times": "{count}回編集",
   "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
+  "status.filter": "この投稿をフィルターする",
   "status.filtered": "フィルターされました",
+  "status.hide": "投稿を非表示",
+  "status.history.created": "{name}さんが{date}に作成",
+  "status.history.edited": "{name}さんが{date}に編集",
   "status.load_more": "もっと見る",
   "status.media_hidden": "非表示のメディア",
   "status.mention": "@{name}さんに投稿",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
   "status.remove_bookmark": "ブックマークを削除",
+  "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",
   "status.replyAll": "全員に返信",
   "status.report": "@{name}さんを通報",
   "status.sensitive_warning": "閲覧注意",
   "status.share": "共有",
+  "status.show_filter_reason": "表示する",
   "status.show_less": "隠す",
   "status.show_less_all": "全て隠す",
   "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
-  "status.show_thread": "スレッドを表示",
+  "status.show_original": "原文を表示",
+  "status.translate": "翻訳",
+  "status.translated_from_with": "{provider}を使って{lang}から翻訳",
   "status.uncached_media_warning": "利用できません",
   "status.unmute_conversation": "会話のミュートを解除",
   "status.unpin": "プロフィールへの固定を解除",
+  "subscribed_languages.lead": "選択した言語の投稿だけがホームとリストのタイムラインに表示されます。全ての言語の投稿を受け取る場合は全てのチェックを外して下さい。",
+  "subscribed_languages.save": "変更を保存",
+  "subscribed_languages.target": "{target}さんの購読言語を変更します",
   "suggestions.dismiss": "隠す",
   "suggestions.header": "興味あるかもしれません…",
   "tabs_bar.federated_timeline": "連合",
   "tabs_bar.home": "ホーム",
   "tabs_bar.local_timeline": "ローカル",
   "tabs_bar.notifications": "通知",
-  "tabs_bar.search": "検索",
   "time_remaining.days": "残り{number}日",
   "time_remaining.hours": "残り{number}時間",
   "time_remaining.minutes": "残り{number}分",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "フォロワー",
   "timeline_hint.resources.follows": "フォロー",
   "timeline_hint.resources.statuses": "以前の投稿",
-  "trends.counter_by_accounts": "{counter} 人が投稿",
+  "trends.counter_by_accounts": "過去{days, plural, one {{days}日} other {{days}日}}に{count, plural, one {{counter}人} other {{counter} 人}}",
   "trends.trending_now": "トレンドタグ",
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
   "units.short.billion": "{count}B",
@@ -454,23 +622,25 @@
   "upload_button.label": "メディアを追加 (複数の画像または1つの動画か音声ファイル)",
   "upload_error.limit": "アップロードできる上限を超えています。",
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
-  "upload_form.audio_description": "聴取が難しいユーザーへの説明",
+  "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "閲覧が難しいユーザーへの説明",
+  "upload_form.description_missing": "説明を追加していません",
   "upload_form.edit": "編集",
   "upload_form.thumbnail": "サムネイルを変更",
   "upload_form.undo": "削除",
   "upload_form.video_description": "視聴が難しいユーザーへの説明",
   "upload_modal.analyzing_picture": "画像を解析中…",
   "upload_modal.apply": "適用",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "適用中...",
   "upload_modal.choose_image": "画像を選択",
   "upload_modal.description_placeholder": "あのイーハトーヴォのすきとおった風",
   "upload_modal.detect_text": "画像からテキストを検出",
   "upload_modal.edit_media": "メディアを編集",
   "upload_modal.hint": "サムネイルの焦点にしたい場所をクリックするか円形の枠をその場所にドラッグしてください。",
-  "upload_modal.preparing_ocr": "OCR の準備中…",
+  "upload_modal.preparing_ocr": "OCRの準備中…",
   "upload_modal.preview_label": "プレビュー ({ratio})",
   "upload_progress.label": "アップロード中...",
+  "upload_progress.processing": "処理中…",
   "video.close": "動画を閉じる",
   "video.download": "ダウンロード",
   "video.exit_fullscreen": "全画面を終了する",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 2b1221d6f..6f490fdbd 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "ბოტი",
@@ -7,47 +19,56 @@
   "account.block_domain": "დაიმალოს ყველაფერი დომენიდან {domain}",
   "account.blocked": "დაიბლოკა",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "პირდაპირი წერილი @{name}-ს",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "დომენი დამალულია",
   "account.edit_profile": "პროფილის ცვლილება",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "გამორჩევა პროფილზე",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "გაყოლა",
   "account.followers": "მიმდევრები",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "მოგყვებათ",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "დაიმალოს ბუსტები @{name}-სგან",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "მედია",
   "account.mention": "ასახელეთ @{name}",
-  "account.moved_to": "{name} გადავიდა:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "გააჩუმე @{name}",
   "account.mute_notifications": "გააჩუმე შეტყობინებები @{name}-სგან",
   "account.muted": "გაჩუმებული",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "ტუტები",
   "account.posts_with_replies": "ტუტები და პასუხები",
   "account.report": "დაარეპორტე @{name}",
   "account.requested": "დამტკიცების მოლოდინში. დააწკაპუნეთ რომ უარყოთ დადევნების მოთხონვა",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "გააზიარე @{name}-ის პროფილი",
   "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "განბლოკე @{name}",
   "account.unblock_domain": "გამოაჩინე {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "არ გამოირჩეს პროფილზე",
   "account.unfollow": "ნუღარ მიჰყვები",
   "account.unmute": "ნუღარ აჩუმებ @{name}-ს",
   "account.unmute_notifications": "ნუღარ აჩუმებ შეტყობინებებს @{name}-სგან",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "უპს!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "კვირაში {count}",
   "boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
-  "bundle_column_error.body": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
-  "bundle_column_error.title": "ქსელის შეცდომა",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "დახურვა",
   "bundle_modal_error.message": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.",
   "bundle_modal_error.retry": "სცადეთ კიდევ ერთხელ",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "დაბლოკილი მომხმარებლები",
   "column.bookmarks": "Bookmarks",
   "column.community": "ლოკალური თაიმლაინი",
-  "column.direct": "პირდაპირი წერილები",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "დამალული დომენები",
   "column.favourites": "ფავორიტები",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "მხოლოდ მედია",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "ეს ტუტი გაეგზავნება მხოლოდ ნახსენებ მომხმარებლებს.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "გაიგე მეტი",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ეს ტუტი არ მოექცევა ჰეშტეგების ქვეს, რამეთუ ის არაა მითითებული. მხოლოდ ღია ტუტები მოიძებნება ჰეშტეგით.",
   "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.",
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "ტუტი",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
   "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "ბლოკი",
   "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "გაუქმება",
   "confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
   "confirmations.delete_list.confirm": "გაუქმება",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "ეს სტატუსი ჩასვით თქვენს ვებ-საიტზე შემდეგი კოდის კოპირებით.",
   "embed.preview": "ესაა თუ როგორც გამოჩნდება:",
   "emoji_button.activity": "აქტივობა",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "პერსონალიზირებული",
   "emoji_button.flags": "დროშები",
   "emoji_button.food": "საჭმელი და სასლმელი",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!",
-  "empty_column.direct": "ჯერ პირდაპირი წერილები არ გაქვთ. როდესაც მიიღებთ ან გააგზავნით, გამოჩნდება აქ.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "ავტორიზაცია",
   "follow_request.reject": "უარყოფა",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "დეველოპერები",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "დოკუმენტაცია",
   "getting_started.heading": "დაწყება",
-  "getting_started.invite": "ხალხის მოწვევა",
-  "getting_started.open_source_notice": "მასტოდონი ღია პროგრამაა. შეგიძლიათ შეუწყოთ ხელი ან შექმნათ პრობემის რეპორტი {github}-ზე.",
-  "getting_started.security": "უსაფრთხოება",
-  "getting_started.terms": "მომსახურების პირობები",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "შემდეგი",
   "lightbox.previous": "წინა",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "სიაში დამატება",
   "lists.account.remove": "სიიდან ამოშლა",
   "lists.delete": "სიის წაშლა",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
   "missing_indicator.label": "არაა ნაპოვნი",
   "missing_indicator.sublabel": "ამ რესურსის პოვნა ვერ მოხერხდა",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "პირდაპირი წერილები",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
   "navigation_bar.edit_profile": "შეცვალე პროფილი",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "ფავორიტები",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "ამ ინსტანციის შესახებ",
-  "navigation_bar.keyboard_shortcuts": "ცხელი კლავიშები",
   "navigation_bar.lists": "სიები",
   "navigation_bar.logout": "გასვლა",
   "navigation_bar.mutes": "გაჩუმებული მომხმარებლები",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "აპინული ტუტები",
   "navigation_bar.preferences": "პრეფერენსიები",
   "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "უსაფრთხოება",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად",
   "notification.follow": "{name} გამოგყვათ",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name}-მა დაბუსტა თქვენი სტატუსი",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "შეტყობინებების გასუფთავება",
   "notifications.clear_confirmation": "დარწმუნებული ხართ, გსურთ სამუდამოდ წაშალოთ ყველა თქვენი შეტყობინება?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "დესკტოპ შეტყობინებები",
   "notifications.column_settings.favourite": "ფავორიტები:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "ახალი მიმდევრები:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "ხსენებები:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "გამოჩნდეს სვეტში",
   "notifications.column_settings.sound": "ხმის დაკვრა",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
   "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "პირდაპირი",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "მხოლოდ-მიმდევრებისთვის",
-  "privacy.public.long": "დაიპოსტოს საჯარო თაიმლაინებზე",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.long": "არ დაიპოსტოს საჯარო თაიმლაინებზე",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "ჩამოუთვლელი",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "იტვირთება…",
   "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}სთ",
   "relative_time.just_now": "ახლა",
   "relative_time.minutes": "{number}წთ",
   "relative_time.seconds": "{number}წმ",
   "relative_time.today": "today",
   "reply_indicator.cancel": "უარყოფა",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "ფორვარდი {target}-ს",
   "report.forward_hint": "ანგარიში სხვა სერვერიდანაა. გავაგზავნოთ რეპორტის ანონიმური ასლიც?",
-  "report.hint": "რეპორტი გაეგზავნება თქვენი ინსტანციის მოდერატორებს. ქვემოთ შეგიძლიათ დაამატოთ მიზეზი თუ რატომ არეპორტებთ ამ ანგარიშს:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "დამატებითი კომენტარები",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "დასრულება",
   "report.target": "არეპორტებთ {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "ძებნა",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "დეტალური ძებნის ფორმა",
   "search_popout.tips.full_text": "მარტივი ტექსტი აბრუნებს სტატუსებს რომლებიც შექმენით, აქციეთ ფავორიტად, დაბუსტეთ, ან რაშიც ასახელეთ, ასევე ემთხვევა მომხმარებლის სახელებს, დისპლეი სახელებს, და ჰეშტეგებს.",
   "search_popout.tips.hashtag": "ჰეშტეგი",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "მარტივი ტექსტი აბრუნებს დამთხვეულ დისპლეი სახელებს, მომხმარებლის სახელებს და ჰეშტეგებს",
   "search_popout.tips.user": "მომხმარებელი",
   "search_results.accounts": "ხალხი",
+  "search_results.all": "All",
   "search_results.hashtags": "ჰეშტეგები",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "ტუტები",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "დაბლოკე @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "წაშლა",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "პირდაპირი წერილი @{name}-ს",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "ჩართვა",
   "status.favourite": "ფავორიტი",
+  "status.filter": "Filter this post",
   "status.filtered": "ფილტრირებული",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "გაუქმდეს და გადანაწილდეს",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "პასუხი",
   "status.replyAll": "უპასუხე თემას",
   "status.report": "დაარეპორტე @{name}",
   "status.sensitive_warning": "მგრძნობიარე კონტენტი",
   "status.share": "გაზიარება",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "აჩვენე ნაკლები",
   "status.show_less_all": "აჩვენე ნაკლები ყველაზე",
   "status.show_more": "აჩვენე მეტი",
   "status.show_more_all": "აჩვენე მეტი ყველაზე",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "საუბარზე გაჩუმების მოშორება",
   "status.unpin": "პროფილიდან პინის მოშორება",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "ფედერალური",
   "tabs_bar.home": "სახლი",
   "tabs_bar.local_timeline": "ლოკალური",
   "tabs_bar.notifications": "შეტყობინებები",
-  "tabs_bar.search": "ძებნა",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "თქვენი დრაფტი გაუქმდება თუ დატოვებთ მასტოდონს.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "გაუქმება",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "იტვირთება...",
+  "upload_progress.processing": "Processing…",
   "video.close": "ვიდეოს დახურვა",
   "video.download": "Download file",
   "video.exit_fullscreen": "სრულ ეკრანზე ჩვენების გათიშვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 632054786..fbfa13799 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Tazmilt",
   "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
   "account.badges.bot": "Aṛubut",
@@ -7,64 +19,86 @@
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
   "account.blocked": "Yettusewḥel",
   "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
-  "account.cancel_follow_request": "Sefsex asuter n uḍfar",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Izen usrid i @{name}",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
   "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Ḍfer",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
-  "account.following_counter": "{count, plural, one {{counter} yeṭṭafaren} aḍfar {{counter} wayeḍ}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.follows_you": "Yeṭṭafaṛ-ik",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
-  "account.joined": "Yerna-d {date}",
-  "account.last_status": "Armud aneggaru",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
-  "account.media": "Amidya",
+  "account.media": "Timidyatin",
   "account.mention": "Bder-d @{name}",
-  "account.moved_to": "{name} ibeddel ɣer:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Sgugem @{name}",
   "account.mute_notifications": "Sgugem tilɣa sγur @{name}",
   "account.muted": "Yettwasgugem",
-  "account.never_active": "Werǧin",
-  "account.posts": "Tijewwaqin",
-  "account.posts_with_replies": "Tijewwaqin akked tririyin",
+  "account.open_original_page": "Ldi asebter anasli",
+  "account.posts": "Tisuffaɣ",
+  "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} ajewwaq} other {{counter} ijewwaqen}}",
+  "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "account.unblock": "Serreḥ i @{name}",
   "account.unblock_domain": "Ssken-d {domain}",
+  "account.unblock_short": "Serreḥ",
   "account.unendorse": "Ur ttwellih ara fell-as deg umaɣnu-inek",
   "account.unfollow": "Ur ṭṭafaṛ ara",
   "account.unmute": "Kkes asgugem ɣef @{name}",
   "account.unmute_notifications": "Serreḥ ilɣa sɣur @{name}",
+  "account.unmute_short": "Kkes asgugem",
   "account_note.placeholder": "Ulac iwenniten",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.retention.cohort_size": "Iseqdacen imaynuten",
   "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
   "alert.rate_limited.title": "Aktum s talast",
   "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Ffer amesli",
   "autosuggest_hashtag.per_week": "{count} i yimalas",
   "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
-  "bundle_column_error.body": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
+  "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
   "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
-  "bundle_column_error.title": "Tuccḍa deg uẓeṭṭa",
+  "bundle_column_error.return": "Uɣal ɣer ugejdan",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Mdel",
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "Γef",
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
@@ -90,35 +124,41 @@
   "community.column_settings.local_only": "Adigan kan",
   "community.column_settings.media_only": "Allal n teywalt kan",
   "community.column_settings.remote_only": "Anmeggag kan",
-  "compose_form.direct_message_warning": "Tajewwaqt-a ad d-tettwasken kan i yimseqdacen i d-yettwabedren.",
+  "compose.language.change": "Beddel tutlayt",
+  "compose.language.search": "Nadi tutlayin …",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Amiḍan-ik ur yelli ara {locked}. Menwala yezmer ad k-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik.",
+  "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
-  "compose_form.placeholder": "D acu i itezzin deg uqaṛṛu-ik?",
+  "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
   "compose_form.poll.add_option": "Rnu afran",
   "compose_form.poll.duration": "Tanzagt n tefrant",
   "compose_form.poll.option_placeholder": "Afran {number}",
   "compose_form.poll.remove_option": "Sfeḍ afran-agi",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Jewweq",
+  "compose_form.publish": "Suffeɣ",
+  "compose_form.publish_form": "Suffeɣ",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Sekles ibeddilen",
   "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
   "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
-  "compose_form.sensitive.unmarked": "Allal n teywalt ur yettwacreḍ ara d anafri",
-  "compose_form.spoiler.marked": "Aḍris yeffer deffir n walɣu",
-  "compose_form.spoiler.unmarked": "Aḍris ur yettwaffer ara",
-  "compose_form.spoiler_placeholder": "Aru alɣu-inek da",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
+  "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
+  "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
+  "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
   "confirmations.block.message": "Tebγiḍ s tidet ad tesḥebseḍ {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.confirm": "Sefsex",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
+  "copypaste.copied": "Yettwanɣel",
+  "copypaste.copy": "Nγel",
   "directory.federated": "Deg fedivers yettwasnen",
   "directory.local": "Seg {domain} kan",
   "directory.new_arrivals": "Imaynuten id yewḍen",
   "directory.recently_active": "Yermed xas melmi kan",
+  "disabled_account_banner.account_settings": "Iγewwaṛen n umiḍan",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Udmawan",
   "emoji_button.flags": "Innayen",
   "emoji_button.food": "Tegwella & Tissit",
@@ -157,14 +208,15 @@
   "emoji_button.search_results": "Igemmaḍ n unadi",
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
-  "empty_column.account_suspended": "Amiḍan yettwaḥebsen",
+  "empty_column.account_suspended": "Amiḍan yettwaḥbas",
   "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
   "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
   "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
-  "empty_column.direct": "Ulac ɣur-k ula yiwen n yizen usrid. Ad d-yettwasken da, ticki tuzneḍ neɣ teṭṭfeḍ-d yiwen.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.",
   "empty_column.favourites": "Ula yiwen ur yerri tajewwaqt-agi deg yismenyifen-is. Melmi i d-yella waya, ad d-yettwasken da.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
+  "explore.search_results": "Igemmaḍ n unadi",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Snirem",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
+  "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Immed",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "Γef",
+  "footer.directory": "Akaram n imaγnuten",
+  "footer.get_app": "Awi-d asnas",
+  "footer.invite": "Ɛreḍ-d kra n yimdanen",
+  "footer.keyboard_shortcuts": "Inegzumen n unasiw",
+  "footer.privacy_policy": "Tasertit tabaḍnit",
+  "footer.source_code": "Wali tangalt taɣbalut",
   "generic.saved": "Yettwasekles",
-  "getting_started.developers": "Ineflayen",
-  "getting_started.directory": "Akaram n imaɣnuten",
-  "getting_started.documentation": "Amnir",
   "getting_started.heading": "Bdu",
-  "getting_started.invite": "Snebgi-d imdanen",
-  "getting_started.open_source_notice": "Maṣṭudun d aseɣzan s uɣbalu yeldin. Tzemreḍ ad tɛiwneḍ neɣ ad temmleḍ uguren deg GitHub {github}.",
-  "getting_started.security": "Iɣewwaṛen n umiḍan",
-  "getting_started.terms": "Tiwetlin n useqdec",
   "hashtag.column_header.tag_mode.all": "d {additional}",
   "hashtag.column_header.tag_mode.any": "neɣ {additional}",
   "hashtag.column_header.tag_mode.none": "war {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+  "hashtag.follow": "Ḍfeṛ ahacṭag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.show_announcements": "Ssken-d ulɣuyen",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "Deg uqeddac-ayi",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Ḍfer {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Aglam",
-  "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
   "keyboard_shortcuts.favourite": "akken ad ternuḍ ɣer yismenyifen",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
   "lightbox.next": "Γer zdat",
   "lightbox.previous": "Γer deffir",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
   "lists.delete": "Kkes tabdart",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
   "missing_indicator.label": "Ulac-it",
   "missing_indicator.sublabel": "Ur nufi ara aɣbalu-a",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Tanzagt",
   "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
   "mute_modal.indefinite": "Ur yettwasbadu ara",
-  "navigation_bar.apps": "Isnasen izirazen",
+  "navigation_bar.about": "Γef",
   "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.edit_profile": "Ẓreg amaɣnu",
+  "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Ismenyifen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
-  "navigation_bar.info": "Ɣef uqeddac-agi",
-  "navigation_bar.keyboard_shortcuts": "Inegzumen n unasiw",
   "navigation_bar.lists": "Tibdarin",
   "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Tijewwiqin yettwasentḍen",
   "navigation_bar.preferences": "Imenyafen",
   "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
+  "navigation_bar.search": "Nadi",
   "navigation_bar.security": "Taɣellist",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} yesmenyef tasuffeɣt-ik·im",
   "notification.follow": "{name} yeṭṭafaṛ-ik",
   "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
@@ -306,13 +400,16 @@
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
   "notification.status": "{name} akken i d-yessufeɣ",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Ismenyifen:",
   "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
-  "notifications.column_settings.filter_bar.show": "Ssken",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.column_settings.status": "Tiẓenẓunin timaynutin:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Ismenyifen",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
   "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Usrid",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
   "privacy.private.short": "Imeḍfaṛen kan",
-  "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "War tabdert",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
   "relative_time.days": "{number}u",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "tura kan",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}isr",
   "relative_time.just_now": "tura",
   "relative_time.minutes": "{number}tis",
   "relative_time.seconds": "{number}tas",
   "relative_time.today": "assa",
   "reply_indicator.cancel": "Sefsex",
+  "report.block": "Sewḥel",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Tiyyaḍ",
+  "report.categories.spam": "Aspam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "ameγnu",
+  "report.category.title_status": "tasuffeɣt",
+  "report.close": "Immed",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Bren-it ɣeṛ {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.mute": "Sgugem",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Iwenniten-nniḍen",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "D aspam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Azen",
   "report.target": "Mmel {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Seḥbes aḍfar n @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Ayen nniḍen",
+  "report_notification.categories.spam": "Aspam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Ldi aneqqis",
   "search.placeholder": "Nadi",
+  "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
   "search_popout.search_format": "Anadi yenneflin",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "ahacṭag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "amseqdac",
   "search_results.accounts": "Medden",
+  "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
-  "search_results.statuses": "Tibeṛṛaniyin",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Tisuffaɣ",
   "search_results.statuses_fts_disabled": "Anadi ɣef tjewwiqin s ugbur-nsent ur yermid ara deg uqeddac-agi n Maṣṭudun.",
+  "search_results.title": "Anadi ɣef {q}",
   "search_results.total": "{count, number} {count, plural, one {n ugemmuḍ} other {n yigemmuḍen}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Yettwadbel sɣur :",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Issin ugar",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Snulfu-d amiḍan",
+  "sign_in_banner.sign_in": "Qqen",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Seḥbes @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Kkes",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Izen usrid i @{name}",
+  "status.edit": "Ẓreg",
+  "status.edited": "Tettwaẓreg deg {date}",
+  "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
   "status.favourite": "Rnu ɣer yismenyifen",
+  "status.filter": "Filter this post",
   "status.filtered": "Yettwasizdeg",
+  "status.hide": "Ffer tajewwiqt",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Sali ugar",
   "status.media_hidden": "Taɣwalt tettwaffer",
   "status.mention": "Bder-d @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tɛiwdeḍ tira",
   "status.remove_bookmark": "Kkes tacreḍt",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Err",
   "status.replyAll": "Err i lxiḍ",
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Ssken-d drus",
   "status.show_less_all": "Semẓi akk tisuffγin",
   "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
-  "status.show_thread": "Ssken-d lxiḍ",
+  "status.show_original": "Show original",
+  "status.translate": "Suqel",
+  "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
   "status.uncached_media_warning": "Ulac-it",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
   "status.unpin": "Kkes asenteḍ seg umaɣnu",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Sekles ibeddilen",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Sefsex asumer",
   "suggestions.header": "Ahat ad tcelgeḍ deg…",
   "tabs_bar.federated_timeline": "Amatu",
   "tabs_bar.home": "Agejdan",
   "tabs_bar.local_timeline": "Adigan",
   "tabs_bar.notifications": "Tilɣa",
-  "tabs_bar.search": "Nadi",
   "time_remaining.days": "Mazal {number, plural, one {# n wass} other {# n wussan}}",
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -444,8 +612,8 @@
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} amdan} imdanen {{counter} wiyaḍ}} yettmeslayen",
-  "trends.trending_now": "Trending now",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Ur ittusireg ara usali n ufaylu s tefranin.",
   "upload_form.audio_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt",
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Ẓreg",
   "upload_form.thumbnail": "Beddel tugna",
   "upload_form.undo": "Kkes",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Aheyyi n OCR…",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Mdel tabidyutt",
   "video.download": "Sidered afaylu",
   "video.exit_fullscreen": "Ffeɣ seg ugdil ačuran",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 1407a0991..0e92c33c8 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Модерацияланған серверлер",
+  "about.contact": "Байланыс:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Жазба",
   "account.add_or_remove_from_list": "Тізімге қосу немесе жою",
   "account.badges.bot": "Бот",
@@ -7,47 +19,56 @@
   "account.block_domain": "Домендегі барлығын бұғатта {domain}",
   "account.blocked": "Бұғатталды",
   "account.browse_more_on_origin_server": "Толығырақ оригинал профилінде қара",
-  "account.cancel_follow_request": "Жазылуға сұранымды қайтару",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Жеке хат @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Домен жабық",
   "account.edit_profile": "Профильді өңдеу",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Профильде рекомендеу",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Жазылу",
   "account.followers": "Оқырмандар",
   "account.followers.empty": "Әлі ешкім жазылмаған.",
   "account.followers_counter": "{count, plural, one {{counter} Оқырман} other {{counter} Оқырман}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Жазылым} other {{counter} Жазылым}}",
   "account.follows.empty": "Ешкімге жазылмапты.",
   "account.follows_you": "Сізге жазылыпты",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "@{name} атты қолданушының әрекеттерін жасыру",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Соңғы белсенділік",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Сілтеме меншігі расталған күн {date}",
   "account.locked_info": "Бұл қолданушы өзі туралы мәліметтерді жасырған. Тек жазылғандар ғана көре алады.",
   "account.media": "Медиа",
   "account.mention": "Аталым @{name}",
-  "account.moved_to": "{name} көшіп кетті:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Үнсіз қылу @{name}",
   "account.mute_notifications": "@{name} туралы ескертпелерді жасыру",
   "account.muted": "Үнсіз",
-  "account.never_active": "Ешқашан",
+  "account.open_original_page": "Open original page",
   "account.posts": "Жазбалар",
   "account.posts_with_replies": "Жазбалар мен жауаптар",
   "account.report": "Шағымдану @{name}",
   "account.requested": "Растауын күтіңіз. Жазылудан бас тарту үшін басыңыз",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} профилін бөлісу\"",
   "account.show_reblogs": "@{name} бөліскендерін көрсету",
   "account.statuses_counter": "{count, plural, one {{counter} Пост} other {{counter} Пост}}",
   "account.unblock": "Бұғаттан шығару @{name}",
   "account.unblock_domain": "Бұғаттан шығару {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Профильде рекомендемеу",
   "account.unfollow": "Оқымау",
   "account.unmute": "@{name} ескертпелерін қосу",
   "account.unmute_notifications": "@{name} ескертпелерін көрсету",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Жазба қалдыру үшін бас",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "Өй!",
   "announcement.announcement": "Хабарландыру",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} аптасына",
   "boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
-  "bundle_column_error.body": "Бұл компонентті жүктеген кезде бір қате пайда болды.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Қайтадан көріңіз",
-  "bundle_column_error.title": "Желі қатесі",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Жабу",
   "bundle_modal_error.message": "Бұл компонентті жүктеген кезде бір қате пайда болды.",
   "bundle_modal_error.retry": "Қайтадан көріңіз",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Бұғатталғандар",
   "column.bookmarks": "Бетбелгілер",
   "column.community": "Жергілікті желі",
-  "column.direct": "Жеке хаттар",
+  "column.direct": "Direct messages",
   "column.directory": "Профильдерді аралау",
   "column.domain_blocks": "Жасырылған домендер",
   "column.favourites": "Таңдаулылар",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Тек жергілікті",
   "community.column_settings.media_only": "Тек медиа",
   "community.column_settings.remote_only": "Тек сыртқы",
-  "compose_form.direct_message_warning": "Тек аталған қолданушыларға.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Көбірек білу",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Бұл пост іздеуде хэштегпен шықпайды, өйткені ол бәріне ашық емес. Тек ашық жазбаларды ғана хэштег арқылы іздеп табуға болады.",
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Бұл жауапты өшір",
   "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
   "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
-  "compose_form.publish": "Түрт",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
   "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
   "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
   "confirmations.block.message": "{name} атты қолданушыны бұғаттайтыныңызға сенімдісіз бе?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Өшіру",
   "confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
   "confirmations.delete_list.confirm": "Өшіру",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Оқылды деп белгіле",
   "conversation.open": "Пікірталасты қарау",
   "conversation.with": "{names} атты",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Танымал желіден",
   "directory.local": "Тек {domain} доменінен",
   "directory.new_arrivals": "Жаңадан келгендер",
   "directory.recently_active": "Жақында кіргендер",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Төмендегі кодты көшіріп алу арқылы жазбаны басқа сайттарға да орналастыра аласыз.",
   "embed.preview": "Былай көрінетін болады:",
   "emoji_button.activity": "Белсенділік",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Жеке",
   "emoji_button.flags": "Тулар",
   "emoji_button.food": "Тамақ",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Ешкімді бұғаттамағансыз.",
   "empty_column.bookmarked_statuses": "Ешқандай жазба Бетбелгілер тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
   "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!",
-  "empty_column.direct": "Әзірше дым хат жоқ. Өзіңіз жазып көріңіз алдымен.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Бұғатталған домен жоқ.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ешқандай жазба 'Таңдаулылар' тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
   "empty_column.favourites": "Бұл постты әлі ешкім 'Таңдаулылар' тізіміне қоспапты. Біреу бастағаннан кейін осында көрінетін болады.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Жиынтықты көшіріп ал клипбордқа",
   "errors.unexpected_crash.report_issue": "Мәселені хабарла",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Авторизация",
   "follow_request.reject": "Қабылдамау",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Сақталды",
-  "getting_started.developers": "Жасаушылар тобы",
-  "getting_started.directory": "Профильдер каталогы",
-  "getting_started.documentation": "Құжаттама",
   "getting_started.heading": "Желіде",
-  "getting_started.invite": "Адам шақыру",
-  "getting_started.open_source_notice": "Mastodon - ашық кодты құрылым. Түзету енгізу немесе ұсыныстарды GitHub арқылы жасаңыз {github}.",
-  "getting_started.security": "Қауіпсіздік",
-  "getting_started.terms": "Қызмет көрсету шарттары",
   "hashtag.column_header.tag_mode.all": "және {additional}",
   "hashtag.column_header.tag_mode.any": "немесе {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} болмай",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
   "hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
   "hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
   "home.hide_announcements": "Анонстарды жасыр",
   "home.show_announcements": "Анонстарды көрсет",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# күн} other {# күн}}",
   "intervals.full.hours": "{number, plural, one {# сағат} other {# сағат}}",
   "intervals.full.minutes": "{number, plural, one {# минут} other {# минут}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "бағандардағы жазбаны оқу",
   "keyboard_shortcuts.compose": "пост жазу",
   "keyboard_shortcuts.description": "Сипаттама",
-  "keyboard_shortcuts.direct": "жеке хаттар бағаны",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "тізімде төмен түсу",
   "keyboard_shortcuts.enter": "жазбаны ашу",
   "keyboard_shortcuts.favourite": "таңдаулыға қосу",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Келесі",
   "lightbox.previous": "Алдыңғы",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Тізімге қосу",
   "lists.account.remove": "Тізімнен шығару",
   "lists.delete": "Тізімді өшіру",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Көрінуді қосу",
   "missing_indicator.label": "Табылмады",
   "missing_indicator.sublabel": "Бұл ресурс табылмады",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Мобиль қосымшалар",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
   "navigation_bar.compose": "Жаңа жазба бастау",
-  "navigation_bar.direct": "Жеке хаттар",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
   "navigation_bar.edit_profile": "Профиль түзету",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Таңдаулылар",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
   "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
-  "navigation_bar.info": "Сервер туралы",
-  "navigation_bar.keyboard_shortcuts": "Ыстық пернелер",
   "navigation_bar.lists": "Тізімдер",
   "navigation_bar.logout": "Шығу",
   "navigation_bar.mutes": "Үнсіз қолданушылар",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Жабыстырылғандар",
   "navigation_bar.preferences": "Басымдықтар",
   "navigation_bar.public_timeline": "Жаһандық желі",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Қауіпсіздік",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} жазбаңызды таңдаулыға қосты",
   "notification.follow": "{name} сізге жазылды",
   "notification.follow_request": "{name} сізге жазылғысы келеді",
@@ -306,13 +400,16 @@
   "notification.poll": "Бұл сауалнаманың мерзімі аяқталыпты",
   "notification.reblog": "{name} жазбаңызды бөлісті",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Үстел ескертпелері",
   "notifications.column_settings.favourite": "Таңдаулылар:",
   "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет",
   "notifications.column_settings.filter_bar.category": "Жедел сүзгі",
-  "notifications.column_settings.filter_bar.show": "Көрсету",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Жаңа оқырмандар:",
   "notifications.column_settings.follow_request": "Жазылуға жаңа сұранымдар:",
   "notifications.column_settings.mention": "Аталымдар:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Бағанда көрсет",
   "notifications.column_settings.sound": "Дыбысын қос",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Барлығы",
   "notifications.filter.boosts": "Бөлісулер",
   "notifications.filter.favourites": "Таңдаулылар",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
   "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Тікелей",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Оқырмандарға ғана",
-  "privacy.public.long": "Ашық желіге жібер",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Тізімсіз",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",
   "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
   "relative_time.days": "{number}күн",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}сағ",
   "relative_time.just_now": "жаңа",
   "relative_time.minutes": "{number}мин",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "бүгін",
   "reply_indicator.cancel": "Қайтып алу",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Жіберу {target}",
   "report.forward_hint": "Бұл аккаунт басқа серверден. Аноним шағым жібересіз бе?",
-  "report.hint": "Шағым сіздің модераторларға жіберіледі. Шағымның себептерін мына жерге жазуыңызға болады:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Қосымша пікірлер",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Жіберу",
   "report.target": "Шағымдану {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Іздеу",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Кеңейтілген іздеу форматы",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, bоosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "хэштег",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames аnd hashtags",
   "search_popout.tips.user": "қолданушы",
   "search_results.accounts": "Адамдар",
+  "search_results.all": "All",
   "search_results.hashtags": "Хэштегтер",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Жазбалар",
   "search_results.statuses_fts_disabled": "Mastodon серверінде постты толық мәтінмен іздей алмайсыз.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {нәтиже} other {нәтиже}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "@{name} үшін модерация интерфейсін аш",
   "status.admin_status": "Бұл жазбаны модерация интерфейсінде аш",
   "status.block": "Бұғаттау @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Өшіру",
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.direct": "Хат жіберу @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embеd",
   "status.favourite": "Таңдаулы",
+  "status.filter": "Filter this post",
   "status.filtered": "Фильтрленген",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Бұл жазбаны әлі ешкім бөліспеді. Біреу бөліскен кезде осында көрінеді.",
   "status.redraft": "Өшіру & қайта қарастыру",
   "status.remove_bookmark": "Бетбелгілерден алып тастау",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Жауап",
   "status.replyAll": "Тақырыпқа жауап",
   "status.report": "Шағым @{name}",
   "status.sensitive_warning": "Нәзік контент",
   "status.share": "Бөлісу",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Аздап көрсет",
   "status.show_less_all": "Бәрін аздап көрсет",
   "status.show_more": "Толығырақ",
   "status.show_more_all": "Бәрін толығымен",
-  "status.show_thread": "Желіні көрсет",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Қолжетімді емес",
   "status.unmute_conversation": "Пікірталасты үнсіз қылмау",
   "status.unpin": "Профильден алып тастау",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Өткізіп жіберу",
   "suggestions.header": "Қызығуыңыз мүмкін…",
   "tabs_bar.federated_timeline": "Жаһандық",
   "tabs_bar.home": "Басты бет",
   "tabs_bar.local_timeline": "Жергілікті",
   "tabs_bar.notifications": "Ескертпелер",
-  "tabs_bar.search": "Іздеу",
   "time_remaining.days": "{number, plural, one {# күн} other {# күн}}",
   "time_remaining.hours": "{number, plural, one {# сағат} other {# сағат}}",
   "time_remaining.minutes": "{number, plural, one {# минут} other {# минут}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Оқырман",
   "timeline_hint.resources.follows": "Жазылым",
   "timeline_hint.resources.statuses": "Ескі посттары",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} адам} other {{counter} адам}} айтып жатыр",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Тренд тақырыптар",
   "ui.beforeunload": "Mastodon желісінен шықсаңыз, нобайыңыз сақталмайды.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Сауалнамамен бірге файл жүктеуге болмайды.",
   "upload_form.audio_description": "Есту қабілеті нашар адамдарға сипаттама беріңіз",
   "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Түзету",
   "upload_form.thumbnail": "Суретті өзгерту",
   "upload_form.undo": "Өшіру",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Превью ({ratio})",
   "upload_progress.label": "Жүктеп жатыр...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Видеоны жабу",
   "video.download": "Файлды түсіру",
   "video.exit_fullscreen": "Толық экраннан шық",
diff --git a/app/javascript/mastodon/locales/kmr.json b/app/javascript/mastodon/locales/kmr.json
deleted file mode 100644
index 8f862606d..000000000
--- a/app/javascript/mastodon/locales/kmr.json
+++ /dev/null
@@ -1,484 +0,0 @@
-{
-  "account.account_note_header": "Nîşe",
-  "account.add_or_remove_from_list": "Tevlî bike an rake ji rêzokê",
-  "account.badges.bot": "Bot",
-  "account.badges.group": "Kom",
-  "account.block": "@{name} asteng bike",
-  "account.block_domain": "{domain} navpar asteng bike",
-  "account.blocked": "Astengkirî",
-  "account.browse_more_on_origin_server": "Li pelên resen bêhtir bigere",
-  "account.cancel_follow_request": "Daxwaza şopandinê rake",
-  "account.direct": "Peyamekê bişîne @{name}",
-  "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
-  "account.domain_blocked": "Navper hate astengkirin",
-  "account.edit_profile": "Profîl serrast bike",
-  "account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
-  "account.endorse": "Taybetiyên li ser profîl",
-  "account.follow": "Bişopîne",
-  "account.followers": "Şopîner",
-  "account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Dişopîne} other {{counter} Dişopîne}}",
-  "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
-  "account.follows_you": "Te dişopîne",
-  "account.hide_reblogs": "Boost ên ji @{name} veşêre",
-  "account.joined": "Tevlîbû di {date} de",
-  "account.last_status": "Çalakiya dawî",
-  "account.link_verified_on": "Xwedaniya li vê girêdanê di {date} de hatiye kontrolkirin",
-  "account.locked_info": "Rewşa vê ajimêrê wek kilît kirî hatiye saz kirin. Xwedî yê ajimêrê, kesên vê bişopîne bi dest vekolin dike.",
-  "account.media": "Medya",
-  "account.mention": "Qal @{name} bike",
-  "account.moved_to": "{name} hate livandin bo:",
-  "account.mute": "@{name} Bêdeng bike",
-  "account.mute_notifications": "Agahdariyan ji @{name} bêdeng bike",
-  "account.muted": "Bêdengkirî",
-  "account.never_active": "Tu car",
-  "account.posts": "Şandî",
-  "account.posts_with_replies": "Toot û bersiv",
-  "account.report": "@{name} Ragihîne",
-  "account.requested": "Li benda erêkirinê ye. Ji bo betal kirina daxwazê pêl bikin",
-  "account.share": "Profîla @{name} parve bike",
-  "account.show_reblogs": "Boostên @{name} nîşan bike",
-  "account.statuses_counter": "{count, plural,one {{counter} şandî}other {{counter} şandî}}",
-  "account.unblock": "Astengê li ser @{name} rake",
-  "account.unblock_domain": "Astengê li ser navperê {domain} rake",
-  "account.unendorse": "Li ser profîl nîşan neke",
-  "account.unfollow": "Neşopîne",
-  "account.unmute": "@{name} Bêdeng bike",
-  "account.unmute_notifications": "Agahdariyan ji @{name} bêdeng bike",
-  "account_note.placeholder": "Bitikîne bo nîşeyekê tevlî bikî",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Jkx dîsa biceribîne piştî {retry_time, time, medium}.\n \n",
-  "alert.rate_limited.title": "Rêje sînorkirî ye",
-  "alert.unexpected.message": "Çewtiyeke bêhêvî çê bû.",
-  "alert.unexpected.title": "Wey li min!",
-  "announcement.announcement": "Daxuyanî",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "Her hefte {count}",
-  "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
-  "bundle_column_error.body": "Di dema barkirina vê hêmanê de tiştek çewt çê bû.",
-  "bundle_column_error.retry": "Dîsa biceribîne",
-  "bundle_column_error.title": "Çewtiya torê",
-  "bundle_modal_error.close": "Bigire",
-  "bundle_modal_error.message": "Di dema barkirina vê hêmanê de tiştek çewt çê bû.",
-  "bundle_modal_error.retry": "Dîsa bicerbîne",
-  "column.blocks": "Bikarhênerên astengkirî",
-  "column.bookmarks": "Şûnpel",
-  "column.community": "Demnameya herêmî",
-  "column.direct": "Peyamên taybet",
-  "column.directory": "Li profîlan bigere",
-  "column.domain_blocks": "Navperên astengkirî",
-  "column.favourites": "Bijarte",
-  "column.follow_requests": "Daxwazên şopandinê",
-  "column.home": "Serrûpel",
-  "column.lists": "Rêzok",
-  "column.mutes": "Bikarhênerên bêdengkirî",
-  "column.notifications": "Agahdarî",
-  "column.pins": "Toot a derzîkirî",
-  "column.public": "Demnameyê federalîkirî",
-  "column_back_button.label": "Veger",
-  "column_header.hide_settings": "Sazkariyan veşêre",
-  "column_header.moveLeft_settings": "Stûnê bilivîne bo çepê",
-  "column_header.moveRight_settings": "Stûnê bilivîne bo rastê",
-  "column_header.pin": "Bi derzî bike",
-  "column_header.show_settings": "Sazkariyan nîşan bide",
-  "column_header.unpin": "Bi derzî neke",
-  "column_subheading.settings": "Sazkarî",
-  "community.column_settings.local_only": "Tenê herêmî",
-  "community.column_settings.media_only": "Tenê media",
-  "community.column_settings.remote_only": "Tenê ji dûr ve",
-  "compose_form.direct_message_warning": "Ev toot tenê ji bikarhênerên behskirî re were şandin.",
-  "compose_form.direct_message_warning_learn_more": "Bêtir fêr bibe",
-  "compose_form.hashtag_warning": "Ev şandî ji ber ku nehatiye tomarkirin dê di binê hashtagê de neyê tomar kirin. Tenê peyamên gelemperî dikarin bi hashtagê werin lêgerîn.",
-  "compose_form.lock_disclaimer": "Ajimêrê te {locked} nîne. Herkes dikare te bişopîne da ku şandiyên te yên tenê şopînerên te ra xûya dibin bibînin.",
-  "compose_form.lock_disclaimer.lock": "girtî ye",
-  "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijarekî tevlî bike",
-  "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
-  "compose_form.poll.remove_option": "Vê hilbijarê rake",
-  "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
-  "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
-  "compose_form.publish": "Toot",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
-  "compose_form.spoiler.marked": "Hişyariya naverokê rake",
-  "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
-  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
-  "confirmation_modal.cancel": "Dev jê berde",
-  "confirmations.block.block_and_report": "Asteng bike & ragihîne",
-  "confirmations.block.confirm": "Asteng bike",
-  "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
-  "confirmations.delete.confirm": "Jê bibe",
-  "confirmations.delete.message": "Ma tu dixwazî vê şandiyê jê bibî?",
-  "confirmations.delete_list.confirm": "Jê bibe",
-  "confirmations.delete_list.message": "Ma tu dixwazî bi awayekî herdemî vê rêzokê jê bibî?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Hemî navperê asteng bike",
-  "confirmations.domain_block.message": "Tu ji xwe bawerî, bi rastî tu dixwazî hemû {domain} asteng bikî? Di gelek rewşan de asteng kirin an jî bêdeng kirin têrê dike û tê tercîh kirin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê were jêbirin.",
-  "confirmations.logout.confirm": "Derkeve",
-  "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
-  "confirmations.mute.confirm": "Bêdeng bike",
-  "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
-  "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
-  "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
-  "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û nûve reşnivîsek çê bikî? Bijare û şandîyên wenda bibin û bersivên ji bo şandiye orîjînal sêwî bimînin.",
-  "confirmations.reply.confirm": "Bersivê bide",
-  "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
-  "confirmations.unfollow.confirm": "Neşopîne",
-  "confirmations.unfollow.message": "Ma tu dixwazî ku dev ji şopa {name} berdî?",
-  "conversation.delete": "Axaftinê jê bibe",
-  "conversation.mark_as_read": "Wekî xwendî nîşan bide",
-  "conversation.open": "Axaftinê nîşan bide",
-  "conversation.with": "Bi {names} re",
-  "directory.federated": "Ji fediversên naskirî",
-  "directory.local": "Tenê ji {domain}",
-  "directory.new_arrivals": "Kesên ku nû hatine",
-  "directory.recently_active": "Di demên dawî de çalak",
-  "embed.instructions": "Bi jêgirtina koda jêrîn vê şandiyê li ser malpera xwe bicîh bikin.",
-  "embed.preview": "Wa ye wê wusa xuya bike:",
-  "emoji_button.activity": "Çalakî",
-  "emoji_button.custom": "Kesanekirî",
-  "emoji_button.flags": "Nîşankirî",
-  "emoji_button.food": "Xwarin û vexwarin",
-  "emoji_button.label": "Emoji têxe",
-  "emoji_button.nature": "Sirûştî",
-  "emoji_button.not_found": "Hestokên lihevhatî nehate dîtin",
-  "emoji_button.objects": "Tişt",
-  "emoji_button.people": "Mirov",
-  "emoji_button.recent": "Pir caran tê bikaranîn",
-  "emoji_button.search": "Bigere...",
-  "emoji_button.search_results": "Encamên lêgerînê",
-  "emoji_button.symbols": "Sembol",
-  "emoji_button.travel": "Geşt û şûn",
-  "empty_column.account_suspended": "Ajimêr hatiye rawestandin",
-  "empty_column.account_timeline": "Li vir şandî tune!",
-  "empty_column.account_unavailable": "Profîl nayê peydakirin",
-  "empty_column.blocks": "Te tu bikarhêner asteng nekiriye.",
-  "empty_column.bookmarked_statuses": "Hîn tu peyamên şûnpelkirî tuneye. Gava ku hûn yek şûnpel bikin, ew ê li vir xûya bike.",
-  "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!",
-  "empty_column.direct": "Hêj peyameke te yê rasterast tuneye. Gava ku tu yekî bişeynî an jî bigirî, ew ê li vir xûya bike.",
-  "empty_column.domain_blocks": "Hê jî navperên hatine asteng kirin tune ne.",
-  "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
-  "empty_column.favourites": "Hîn tu kes vê peyamê nebijartiye. Gava ku hin kes bijartin, ew ê li vir xûya bikin.",
-  "empty_column.follow_recommendations": "Wusa dixuye ku ji bo we tu pêşniyar nehatine çêkirin. Hûn dikarin lêgerînê bikarbînin da ku li kesên ku hûn nas dikin bigerin an hashtagên trendî bigerin.",
-  "empty_column.follow_requests": "Hê jî daxwaza şopandinê tunne ye. Dema daxwazek hat, yê li vir were nîşan kirin.",
-  "empty_column.hashtag": "Di vê hashtagê de hêj tiştekî tune.",
-  "empty_column.home": "Demnameya mala we vala ye! Ji bona tijîkirinê bêtir mirovan bişopînin. {suggestions}",
-  "empty_column.home.suggestions": "Hinek pêşniyaran bibîne",
-  "empty_column.list": "Di vê rêzokê de hîn tiştek tune ye. Gava ku endamên vê rêzokê peyamên nû biweşînin, ew ê li vir xuya bibin.",
-  "empty_column.lists": "Hêj qet rêzokê te tunne ye. Dema yek peyda bû, yê li vir were nîşan kirin.",
-  "empty_column.mutes": "Te tu bikarhêner bêdeng nekiriye.",
-  "empty_column.notifications": "Hêj hişyariyên te tunene. Dema ku mirovên din bi we re têkilî danîn, hûn ê wê li vir bibînin.",
-  "empty_column.public": "Li vir tiştekî tuneye! Ji raya giştî re tiştekî binivîsîne, an ji bo tijîkirinê ji rajekerên din bikarhêneran bi destan bişopînin",
-  "error.unexpected_crash.explanation": "Ji ber xeletîyeke di koda me da an jî ji ber mijara lihevhatina gerokan, ev rûpel rast nehat nîşandan.",
-  "error.unexpected_crash.explanation_addons": "Ev rûpel bi awayekî rast nehat nîşandan. Ev çewtî mimkûn e ji ber lêzêdekirina gerokan an jî amûrên wergera xweberî pêk tê.",
-  "error.unexpected_crash.next_steps": "Nûkirina rûpelê biceribîne. Heke ev bi kêr neyê, dibe ku te hîn jî bi rêya gerokeke cuda an jî sepana xwecîhê Mastodonê bi kar bîne.",
-  "error.unexpected_crash.next_steps_addons": "Ne çalak kirin û nûkirina rûpelê biceribîne. Heke ev bi kêr neyê, dibe ku te hîn jî bi rêya gerokeke cuda an jî sepana xwecîhê Mastodonê bi kar bîne.",
-  "errors.unexpected_crash.copy_stacktrace": "Şopa gemara (stacktrace) tûrikê ra jê bigire",
-  "errors.unexpected_crash.report_issue": "Pirsgirêkekê ragihîne",
-  "follow_recommendations.done": "Qediya",
-  "follow_recommendations.heading": "Mirovên ku tu dixwazî ji wan peyaman bibînî bişopîne! Hin pêşnîyar li vir in.",
-  "follow_recommendations.lead": "Li gorî rêza kronolojîkî peyamên mirovên ku tu dişopînî dê demnameya te de xûya bike. Ji xeletiyan netirse, bi awayekî hêsan her wextî tu dikarî dev ji şopandinê berdî!",
-  "follow_request.authorize": "Mafê bide",
-  "follow_request.reject": "Nepejir",
-  "follow_requests.unlocked_explanation": "Tevlî ku ajimêra te ne kilît kiriye, karmendên {domain} digotin qey tu dixwazî ku pêşdîtina daxwazên şopandinê bi destan bike.",
-  "generic.saved": "Tomarkirî",
-  "getting_started.developers": "Pêşdebir",
-  "getting_started.directory": "Rêgeha profîlê",
-  "getting_started.documentation": "Pelbend",
-  "getting_started.heading": "Destpêkirin",
-  "getting_started.invite": "Mirovan Vexwîne",
-  "getting_started.open_source_notice": "Mastodon nermalava çavkaniya vekirî ye. Tu dikarî pirsgirêkan li ser GitHub-ê ragihînî di {github} de an jî dikarî tevkariyê bikî.",
-  "getting_started.security": "Sazkariyên ajimêr",
-  "getting_started.terms": "Mercên karûberan",
-  "hashtag.column_header.tag_mode.all": "û {additional}",
-  "hashtag.column_header.tag_mode.any": "an {additional}",
-  "hashtag.column_header.tag_mode.none": "bêyî {additional}",
-  "hashtag.column_settings.select.no_options_message": "Ti pêşniyar nehatin dîtin",
-  "hashtag.column_settings.select.placeholder": "Têkeve hashtagê…",
-  "hashtag.column_settings.tag_mode.all": "Van hemûyan",
-  "hashtag.column_settings.tag_mode.any": "Yek ji van",
-  "hashtag.column_settings.tag_mode.none": "Ne yek ji van",
-  "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
-  "home.column_settings.basic": "Bingehîn",
-  "home.column_settings.show_reblogs": "Boost'an nîşan bike",
-  "home.column_settings.show_replies": "Bersivan nîşan bide",
-  "home.hide_announcements": "Reklaman veşêre",
-  "home.show_announcements": "Reklaman nîşan bide",
-  "intervals.full.days": "{number, plural, one {# roj} other {# roj}}",
-  "intervals.full.hours": "{number, plural, one {# demjimêr} other {# demjimêr}}\n \n",
-  "intervals.full.minutes": "{number, plural, one {# xulek} other {# xulek}}",
-  "keyboard_shortcuts.back": "Vegere paşê",
-  "keyboard_shortcuts.blocked": "Rêzoka bikarhênerên astengkirî veke",
-  "keyboard_shortcuts.boost": "Şandiya parve (boost) bike",
-  "keyboard_shortcuts.column": "Stûna balkişandinê",
-  "keyboard_shortcuts.compose": "Bal bikşîne cîhê nivîsê/textarea",
-  "keyboard_shortcuts.description": "Danasîn",
-  "keyboard_shortcuts.direct": "Ji stûnê peyamên rasterast veke",
-  "keyboard_shortcuts.down": "Di rêzokê de dakêşe jêr",
-  "keyboard_shortcuts.enter": "Şandiyê veke",
-  "keyboard_shortcuts.favourite": "Şandiya bijarte",
-  "keyboard_shortcuts.favourites": "Rêzokên bijarte veke",
-  "keyboard_shortcuts.federated": "Demnameyê federalîkirî veke",
-  "keyboard_shortcuts.heading": "Kurterêyên klavyeyê",
-  "keyboard_shortcuts.home": "Demnameyê veke",
-  "keyboard_shortcuts.hotkey": "Bişkoka kurterê",
-  "keyboard_shortcuts.legend": "Vê çîrokê nîşan bike",
-  "keyboard_shortcuts.local": "Demnameya herêmî veke",
-  "keyboard_shortcuts.mention": "Qala nivîskarî/ê bike",
-  "keyboard_shortcuts.muted": "Rêzoka bikarhênerên bêdeng kirî veke",
-  "keyboard_shortcuts.my_profile": "Profîla xwe veke",
-  "keyboard_shortcuts.notifications": "Stûnê agahdariyan veke",
-  "keyboard_shortcuts.open_media": "Medya veke",
-  "keyboard_shortcuts.pinned": "Şandiyên derzîkirî veke",
-  "keyboard_shortcuts.profile": "Profîla nivîskaran veke",
-  "keyboard_shortcuts.reply": "Bersivê bide şandiyê",
-  "keyboard_shortcuts.requests": "Rêzoka daxwazên şopandinê veke",
-  "keyboard_shortcuts.search": "Bal bide şivika lêgerînê",
-  "keyboard_shortcuts.spoilers": "Zeviya hişyariya naverokê nîşan bide/veşêre",
-  "keyboard_shortcuts.start": "Stûna \"destpêkê\" veke",
-  "keyboard_shortcuts.toggle_hidden": "Nivîsa paş hişyariya naverokê nîşan bide/veşêre",
-  "keyboard_shortcuts.toggle_sensitivity": "Medyayê nîşan bide/veşêre",
-  "keyboard_shortcuts.toot": "Dest bi şandiyeke nû bike",
-  "keyboard_shortcuts.unfocus": "Bal nede cîhê nivîsê /lêgerînê",
-  "keyboard_shortcuts.up": "Di rêzokê de rake jor",
-  "lightbox.close": "Bigire",
-  "lightbox.compress": "Qutîya wêneya nîşan dike bitepisîne",
-  "lightbox.expand": "Qutîya wêneya nîşan dike fireh bike",
-  "lightbox.next": "Pêş",
-  "lightbox.previous": "Paş",
-  "lists.account.add": "Tevlî rêzokê bike",
-  "lists.account.remove": "Ji rêzokê rake",
-  "lists.delete": "Rêzokê jê bibe",
-  "lists.edit": "Rêzokê serrast bike",
-  "lists.edit.submit": "Sernavê biguherîne",
-  "lists.new.create": "Rêzokê tevlî bike",
-  "lists.new.title_placeholder": "Sernavê rêzoka nû",
-  "lists.replies_policy.followed": "Bikarhênereke şopandî",
-  "lists.replies_policy.list": "Endamên rêzokê",
-  "lists.replies_policy.none": "Ne yek",
-  "lists.replies_policy.title": "Bersivan nîşan bide:",
-  "lists.search": "Di navbera kesên ku te dişopînin bigere",
-  "lists.subheading": "Rêzokên te",
-  "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
-  "loading_indicator.label": "Tê barkirin...",
-  "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
-  "missing_indicator.label": "Nehate dîtin",
-  "missing_indicator.sublabel": "Ev çavkanî nehat dîtin",
-  "mute_modal.duration": "Dem",
-  "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
-  "mute_modal.indefinite": "Nediyar",
-  "navigation_bar.apps": "Sepana mobîl",
-  "navigation_bar.blocks": "Bikarhênerên astengkirî",
-  "navigation_bar.bookmarks": "Şûnpel",
-  "navigation_bar.community_timeline": "Demnameya herêmî",
-  "navigation_bar.compose": "Şandiyeke nû binivsîne",
-  "navigation_bar.direct": "Peyamên rasterast",
-  "navigation_bar.discover": "Vekolê",
-  "navigation_bar.domain_blocks": "Navparên astengkirî",
-  "navigation_bar.edit_profile": "Profîl serrast bike",
-  "navigation_bar.favourites": "Bijarte",
-  "navigation_bar.filters": "Peyvên bêdengkirî",
-  "navigation_bar.follow_requests": "Daxwazên şopandinê",
-  "navigation_bar.follows_and_followers": "Yên tê şopandin û şopîner",
-  "navigation_bar.info": "Derbarê vî rajekarî",
-  "navigation_bar.keyboard_shortcuts": "Bişkoka kurterê",
-  "navigation_bar.lists": "Rêzok",
-  "navigation_bar.logout": "Derkeve",
-  "navigation_bar.mutes": "Bikarhênerên bêdengkirî",
-  "navigation_bar.personal": "Kesanî",
-  "navigation_bar.pins": "Toot a derzîkirî",
-  "navigation_bar.preferences": "Hilbijarte",
-  "navigation_bar.public_timeline": "Demnameyê federalîkirî",
-  "navigation_bar.security": "Ewlehî",
-  "notification.favourite": "{name} şandiya te hez kir",
-  "notification.follow": "{name} te şopand",
-  "notification.follow_request": "{name} dixwazê te bişopîne",
-  "notification.mention": "{name} qale te kir",
-  "notification.own_poll": "Rapirsîya te qediya",
-  "notification.poll": "Rapirsiyeke ku te deng daye qediya",
-  "notification.reblog": "{name} şandiya te belav kir/ boost kir",
-  "notification.status": "{name} niha şand",
-  "notifications.clear": "Agahdariyan pak bike",
-  "notifications.clear_confirmation": "Bi rastî tu dixwazî bi awayekî dawî hemû agahdariyên xwe pak bikî?",
-  "notifications.column_settings.alert": "Agahdariyên sermaseyê",
-  "notifications.column_settings.favourite": "Bijarte:",
-  "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
-  "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
-  "notifications.column_settings.filter_bar.show": "Nîşan bike",
-  "notifications.column_settings.follow": "Şopînerên nû:",
-  "notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
-  "notifications.column_settings.mention": "Qalkirin:",
-  "notifications.column_settings.poll": "Encamên rapirsiyê:",
-  "notifications.column_settings.push": "Agahdarîyên yekser",
-  "notifications.column_settings.reblog": "Bilindkirî:",
-  "notifications.column_settings.show": "Di nav stûnê de nîşan bike",
-  "notifications.column_settings.sound": "Deng lêxe",
-  "notifications.column_settings.status": "Şandiyên nû:",
-  "notifications.column_settings.unread_markers.category": "Nîşankerê agahdariyên nexwendî",
-  "notifications.filter.all": "Hemû",
-  "notifications.filter.boosts": "Bilindkirî",
-  "notifications.filter.favourites": "Bijarte",
-  "notifications.filter.follows": "Şopîner",
-  "notifications.filter.mentions": "Qalkirin",
-  "notifications.filter.polls": "Encamên rapirsiyê",
-  "notifications.filter.statuses": "Ji kesên tu dişopînî re rojanekirin",
-  "notifications.grant_permission": "Destûrê bide.",
-  "notifications.group": "{count} agahdarî",
-  "notifications.mark_as_read": "Hemî agahdarîya wek xwendî nîşan bike",
-  "notifications.permission_denied": "Agahdarîyên sermaseyê naxebite ji ber ku berê de daxwazî ya destûr dayîna gerokê hati bû red kirin",
-  "notifications.permission_denied_alert": "Agahdarîyên sermaseyê nay çalak kirin, ji ber ku destûr kirina gerokê pêşî de hati bû red kirin",
-  "notifications.permission_required": "Agahdarîyên sermaseyê naxebite çunkî mafê pêwîst dike nehatiye dayîn.",
-  "notifications_permission_banner.enable": "Agahdarîyên sermaseyê çalak bike",
-  "notifications_permission_banner.how_to_control": "Da ku agahdariyên mastodon bistînî gava ne vekirî be. Agahdariyên sermaseyê çalak bike\n Tu dikarî agahdariyên sermaseyê bi rê ve bibî ku bi hemû cureyên çalakiyên ên ku agahdariyan rû didin ku bi riya tikandînê li ser bişkoka {icon} çalak dibe.",
-  "notifications_permission_banner.title": "Tu tiştî bîr neke",
-  "picture_in_picture.restore": "Vegerîne paş",
-  "poll.closed": "Girtî",
-  "poll.refresh": "Nû bike",
-  "poll.total_people": "{count, plural, one {# kes} other {# kes}}",
-  "poll.total_votes": "{count, plural, one {# deng} other {# deng}}",
-  "poll.vote": "Deng bide",
-  "poll.voted": "Te dengê xwe da vê bersivê",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Rapirsîyek zêde bike",
-  "poll_button.remove_poll": "Rapirsî yê rake",
-  "privacy.change": "Nepênîtiya şandiyan biguherîne",
-  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Taybet",
-  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
-  "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo herkesî li berçav e, di demnameyên gelemperî de dê xûyakirin",
-  "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji herkesî ra tê xûya, lê demnameyê gelemperî ra nay xûyakirin",
-  "privacy.unlisted.short": "Nerêzok",
-  "refresh": "Nû bike",
-  "regeneration_indicator.label": "Tê barkirin…",
-  "regeneration_indicator.sublabel": "Mala te da tê amedekirin!",
-  "relative_time.days": "{number}r",
-  "relative_time.hours": "{number}d",
-  "relative_time.just_now": "niha",
-  "relative_time.minutes": "{number}x",
-  "relative_time.seconds": "{number}ç",
-  "relative_time.today": "îro",
-  "reply_indicator.cancel": "Dev jê berde",
-  "report.forward": "Biçe bo {target}",
-  "report.forward_hint": "Ajimêr ji rajekarek din da ne. Tu kopîyeka anonîm ya raporê bişînî li wur?",
-  "report.hint": "Ev rapor yê rajekarê lihevkarên te ra were şandin. Tu dikarî şiroveyekê pêşkêş bikî bê ka tu çima vê ajimêrê jor radigîhînî:",
-  "report.placeholder": "Şiroveyên zêde",
-  "report.submit": "Bişîne",
-  "report.target": "Ragihandin {target}",
-  "search.placeholder": "Bigere",
-  "search_popout.search_format": "Dirûva lêgerîna pêşketî",
-  "search_popout.tips.full_text": "Nivîsên hêsan, şandiyên ku te nivîsandiye, bijare kiriye, bilind kiriye an jî yên behsa te kirine û her wiha navê bikarhêneran, navên xûya dike û hashtagan vedigerîne.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "şandî",
-  "search_popout.tips.text": "Nivîsên hêsan, navên xûya ên ku li hev hatî, bikarhêner û hashtagan vedigerîne",
-  "search_popout.tips.user": "bikarhêner",
-  "search_results.accounts": "Mirov",
-  "search_results.hashtags": "Hashtag",
-  "search_results.statuses": "Şandî",
-  "search_results.statuses_fts_disabled": "Di vê rajekara Mastodonê da lêgerîna şandîyên li gorî naveroka wan ne çalak e.",
-  "search_results.total": "{count, number} {count, plural, one {encam} other {encam}}",
-  "status.admin_account": "Ji bo @{name} navrûya venihêrtinê veke",
-  "status.admin_status": "Vê şandîyê di navrûya venihêrtinê de veke",
-  "status.block": "@{name} asteng bike",
-  "status.bookmark": "Şûnpel",
-  "status.cancel_reblog_private": "Bilind neke",
-  "status.cannot_reblog": "Ev şandî nayê bilindkirin",
-  "status.copy": "Girêdanê jê bigire bo weşankirinê",
-  "status.delete": "Jê bibe",
-  "status.detailed_status": "Dîtina axaftina berfireh",
-  "status.direct": "Peyama rasterast @{name}",
-  "status.embed": "Hedimandî",
-  "status.favourite": "Bijarte",
-  "status.filtered": "Parzûnkirî",
-  "status.load_more": "Bêtir bar bike",
-  "status.media_hidden": "Medya veşartî ye",
-  "status.mention": "Qal @{name} bike",
-  "status.more": "Bêtir",
-  "status.mute": "@{name} Bêdeng bike",
-  "status.mute_conversation": "Axaftinê bêdeng bike",
-  "status.open": "Vê şandiyê berferh bike",
-  "status.pin": "Li ser profîlê derzî bike",
-  "status.pinned": "Şandiya derzîkirî",
-  "status.read_more": "Bêtir bixwîne",
-  "status.reblog": "Bilindkirî",
-  "status.reblog_private": "Bi dîtina resen bilind bike",
-  "status.reblogged_by": "{name} bilind kir",
-  "status.reblogs.empty": "Kesekî hin ev şandî bilind nekiriye. Gava kesek bilind bike, ew ên li vir werin xuyakirin.",
-  "status.redraft": "Jê bibe & ji nû ve reşnivîs bike",
-  "status.remove_bookmark": "Şûnpêlê jê rake",
-  "status.reply": "Bersivê bide",
-  "status.replyAll": "Mijarê bibersivîne",
-  "status.report": "{name} gilî bike",
-  "status.sensitive_warning": "Naveroka hestiyarî",
-  "status.share": "Parve bike",
-  "status.show_less": "Kêmtir nîşan bide",
-  "status.show_less_all": "Ji bo hemîyan kêmtir nîşan bide",
-  "status.show_more": "Hêj zehftir nîşan bide",
-  "status.show_more_all": "Bêtir nîşan bide bo hemûyan",
-  "status.show_thread": "Mijarê nîşan bide",
-  "status.uncached_media_warning": "Tune ye",
-  "status.unmute_conversation": "Axaftinê bêdeng neke",
-  "status.unpin": "Şandiya derzîkirî ji profîlê rake",
-  "suggestions.dismiss": "Pêşniyarê paşguh bike",
-  "suggestions.header": "Dibe ku bala te bikşîne…",
-  "tabs_bar.federated_timeline": "Giştî",
-  "tabs_bar.home": "Serrûpel",
-  "tabs_bar.local_timeline": "Herêmî",
-  "tabs_bar.notifications": "Agahdarî",
-  "tabs_bar.search": "Bigere",
-  "time_remaining.days": "{number, plural, one {# roj} other {# roj}} mayî",
-  "time_remaining.hours": "{number, plural, one {# demjimêr} other {# demjimêr}} mayî",
-  "time_remaining.minutes": "{number, plural, one {# xulek} other {# xulek}} mayî",
-  "time_remaining.moments": "Demên mayî",
-  "time_remaining.seconds": "{number, plural, one {# çirke} other {# çirke}} maye",
-  "timeline_hint.remote_resource_not_displayed": "{resource} Ji rajekerên din nayê dîtin.",
-  "timeline_hint.resources.followers": "Şopîner",
-  "timeline_hint.resources.follows": "Şopîner",
-  "timeline_hint.resources.statuses": "Şandiyên kevn",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} diaxivin",
-  "trends.trending_now": "Rojev",
-  "ui.beforeunload": "Ger ji Mastodonê veketi wê reşnivîsa te jî winda bibe.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}H",
-  "upload_area.title": "Ji bo barkirinê kaş bike û deyne",
-  "upload_button.label": "Wêne, vîdeoyek an jî pelê dengî tevlî bike",
-  "upload_error.limit": "Sînora barkirina pelan derbas bû.",
-  "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
-  "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
-  "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
-  "upload_form.edit": "Serrast bike",
-  "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "upload_form.undo": "Jê bibe",
-  "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
-  "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
-  "upload_modal.apply": "Bisepîne",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Wêneyê hilbijêre",
-  "upload_modal.description_placeholder": "Rovîyek qehweyî û bilez li ser kûçikê tîral banz dide",
-  "upload_modal.detect_text": "Ji nivîsa wêneyê re serwext be",
-  "upload_modal.edit_media": "Medyayê sererast bike",
-  "upload_modal.hint": "Ji bo hilbijartina xala navendê her tim dîmenê piçûk de pêşdîtina çerxê bitikîne an jî kaş bike.",
-  "upload_modal.preparing_ocr": "OCR dihê amadekirin…",
-  "upload_modal.preview_label": "Pêşdîtin ({ratio})",
-  "upload_progress.label": "Tê barkirin...",
-  "video.close": "Vîdyoyê bigire",
-  "video.download": "Pelê daxe",
-  "video.exit_fullscreen": "Ji dîmendera tijî derkeve",
-  "video.expand": "Vîdyoyê berferh bike",
-  "video.fullscreen": "Dimendera tijî",
-  "video.hide": "Vîdyo veşêre",
-  "video.mute": "Dengê qut bike",
-  "video.pause": "Rawestîne",
-  "video.play": "Vêxe",
-  "video.unmute": "Dengê qut neke"
-}
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 72b8f7f0a..be85666a9 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "ಟಿಪ್ಪಣಿ",
   "account.add_or_remove_from_list": "ಪಟ್ಟಿಗೆ ಸೇರಿಸು ಅಥವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Hide everything from {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "ಹಿಂಬಾಲಿಸಿ",
   "account.followers": "ಹಿಂಬಾಲಕರು",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "ಟೂಟ್‌ಗಳು",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "ಮರಳಿ ಪ್ರಯತ್ನಿಸಿ",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4252141e7..eb92e1bec 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,9 +1,21 @@
 {
+  "about.blocks": "제한된 서버들",
+  "about.contact": "연락처:",
+  "about.disclaimer": "마스토돈은 자유 오픈소스 소프트웨어이며, Mastodon gGmbH의 상표입니다",
+  "about.domain_blocks.no_reason_available": "이유 비공개",
+  "about.domain_blocks.preamble": "마스토돈은 일반적으로 연합우주에 있는 어떤 서버의 사용자와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.",
+  "about.domain_blocks.silenced.explanation": "명시적으로 찾아보거나 팔로우를 하기 전까지는, 이 서버에 있는 프로필이나 게시물 등을 일반적으로 볼 수 없습니다.",
+  "about.domain_blocks.silenced.title": "제한됨",
+  "about.domain_blocks.suspended.explanation": "이 서버의 어떤 데이터도 처리되거나, 저장 되거나 공유되지 않고, 이 서버의 어떤 유저와도 상호작용 하거나 대화할 수 없습니다.",
+  "about.domain_blocks.suspended.title": "정지됨",
+  "about.not_available": "이 정보는 이 서버에서 사용할 수 없습니다.",
+  "about.powered_by": "{mastodon}에 의해 구동되는 분산화된 소셜 미디어",
+  "about.rules": "서버 규칙",
   "account.account_note_header": "노트",
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
   "account.badges.bot": "봇",
   "account.badges.group": "그룹",
-  "account.block": "@{name}을 차단",
+  "account.block": "@{name} 차단",
   "account.block_domain": "도메인 {domain}을 차단",
   "account.blocked": "차단됨",
   "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
@@ -14,68 +26,90 @@
   "account.edit_profile": "프로필 편집",
   "account.enable_notifications": "@{name} 의 게시물 알림 켜기",
   "account.endorse": "프로필에 추천하기",
+  "account.featured_tags.last_status_at": "{date}에 마지막으로 게시",
+  "account.featured_tags.last_status_never": "게시물 없음",
+  "account.featured_tags.title": "{name} 님의 추천 해시태그",
   "account.follow": "팔로우",
   "account.followers": "팔로워",
-  "account.followers.empty": "아직 아무도 이 유저를 팔로우하고 있지 않습니다.",
+  "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
   "account.followers_counter": "{counter} 팔로워",
+  "account.following": "팔로잉",
   "account.following_counter": "{counter} 팔로잉",
-  "account.follows.empty": "이 유저는 아직 아무도 팔로우하고 있지 않습니다.",
+  "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
   "account.follows_you": "날 팔로우합니다",
+  "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
-  "account.joined": "{date}에 가입함",
-  "account.last_status": "마지막 활동",
+  "account.joined_short": "가입",
+  "account.languages": "구독한 언어 변경",
   "account.link_verified_on": "{date}에 이 링크의 소유권이 확인 됨",
   "account.locked_info": "이 계정의 프라이버시 설정은 잠금으로 설정되어 있습니다. 계정 소유자가 수동으로 팔로워를 승인합니다.",
   "account.media": "미디어",
   "account.mention": "@{name}에게 글쓰기",
-  "account.moved_to": "{name}는 계정을 이동했습니다:",
+  "account.moved_to": "{name} 님은 자신의 새 계정이 다음과 같다고 표시했습니다:",
   "account.mute": "@{name} 뮤트",
   "account.mute_notifications": "@{name}의 알림을 뮤트",
-  "account.muted": "뮤트 됨",
-  "account.never_active": "없음",
+  "account.muted": "뮤트됨",
+  "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",
   "account.posts_with_replies": "게시물과 답장",
   "account.report": "@{name} 신고",
   "account.requested": "승인 대기 중. 클릭해서 취소하기",
+  "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.share": "@{name}의 프로필 공유",
   "account.show_reblogs": "@{name}의 부스트 보기",
   "account.statuses_counter": "{counter} 게시물",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
+  "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
   "account.unfollow": "팔로우 해제",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications": "@{name}의 알림 뮤트 해제",
+  "account.unmute_short": "뮤트 해제",
   "account_note.placeholder": "클릭해서 노트 추가",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "가입 후 일별 사용자 유지율",
+  "admin.dashboard.monthly_retention": "가입 후 월별 사용자 유지율",
+  "admin.dashboard.retention.average": "평균",
+  "admin.dashboard.retention.cohort": "가입한 달",
+  "admin.dashboard.retention.cohort_size": "새로운 사용자",
   "alert.rate_limited.message": "{retry_time, time, medium}에 다시 시도해 주세요.",
   "alert.rate_limited.title": "빈도 제한됨",
-  "alert.unexpected.message": "예측하지 못한 에러가 발생했습니다.",
+  "alert.unexpected.message": "예상하지 못한 에러가 발생했습니다.",
   "alert.unexpected.title": "앗!",
   "announcement.announcement": "공지사항",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(처리 안 됨)",
+  "audio.hide": "소리 숨기기",
   "autosuggest_hashtag.per_week": "주간 {count}회",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
-  "bundle_column_error.body": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
+  "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
+  "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
+  "bundle_column_error.error.title": "으악, 안돼!",
+  "bundle_column_error.network.body": "이 페이지를 불러오는 중 오류가 발생했습니다. 일시적으로 서버와의 연결이 불안정한 문제일 수도 있습니다.",
+  "bundle_column_error.network.title": "네트워크 오류",
   "bundle_column_error.retry": "다시 시도",
-  "bundle_column_error.title": "네트워크 에러",
+  "bundle_column_error.return": "홈으로 돌아가기",
+  "bundle_column_error.routing.body": "요청하신 페이지를 찾을 수 없습니다. 주소창에 적힌 URL이 확실히 맞나요?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "닫기",
-  "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
+  "bundle_modal_error.message": "컴포넌트를 불러오는 중 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
-  "column.blocks": "차단된 사용자",
-  "column.bookmarks": "보관함",
+  "closed_registrations.other_server_instructions": "마스토돈은 분산화 되어 있기 때문에, 다른 서버에서 계정을 만들더라도 이 서버와 상호작용 할 수 있습니다.",
+  "closed_registrations_modal.description": "{domain}은 현재 가입이 막혀있는 상태입니다, 만약 마스토돈을 이용하기 위해 꼭 {domain}을 사용할 필요는 없다는 사실을 인지해 두세요.",
+  "closed_registrations_modal.find_another_server": "다른 서버 찾기",
+  "closed_registrations_modal.preamble": "마스토돈은 분산화 되어 있습니다, 그렇기 때문에 어디에서 계정을 생성하든, 이 서버에 있는 누구와도 팔로우와 상호작용을 할 수 있습니다. 심지어는 스스로 서버를 만드는 것도 가능합니다!",
+  "closed_registrations_modal.title": "마스토돈에서 가입",
+  "column.about": "정보",
+  "column.blocks": "차단한 사용자",
+  "column.bookmarks": "북마크",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.directory": "프로필 둘러보기",
-  "column.domain_blocks": "차단된 도메인",
-  "column.favourites": "즐겨찾기",
+  "column.domain_blocks": "차단한 도메인",
+  "column.favourites": "좋아요",
   "column.follow_requests": "팔로우 요청",
   "column.home": "홈",
   "column.lists": "리스트",
-  "column.mutes": "뮤트된 사용자",
+  "column.mutes": "뮤트한 사용자",
   "column.notifications": "알림",
   "column.pins": "고정된 게시물",
   "column.public": "연합 타임라인",
@@ -90,12 +124,14 @@
   "community.column_settings.local_only": "로컬만",
   "community.column_settings.media_only": "미디어만",
   "community.column_settings.remote_only": "원격만",
-  "compose_form.direct_message_warning": "이 게시물은 멘션 된 유저들에게만 보여집니다.",
+  "compose.language.change": "언어 변경",
+  "compose.language.search": "언어 검색...",
   "compose_form.direct_message_warning_learn_more": "더 알아보기",
+  "compose_form.encryption_warning": "마스토돈의 게시물들은 종단간 암호화가 되지 않습니다. 민감한 정보를 마스토돈을 통해 전달하지 마세요.",
   "compose_form.hashtag_warning": "이 게시물은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 게시물만이 해시태그로 검색 될 수 있습니다.",
-  "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
+  "compose_form.lock_disclaimer": "이 계정은 {locked}상태가 아닙니다. 누구나 이 계정을 팔로우 하여 팔로워 전용의 게시물을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
-  "compose_form.placeholder": "지금 무엇을 하고 있나요?",
+  "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
   "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
   "compose_form.poll.option_placeholder": "{number}번 항목",
@@ -103,53 +139,68 @@
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
   "compose_form.publish": "뿌우",
+  "compose_form.publish_form": "뿌우",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "변경사항 저장",
   "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
   "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
   "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
-  "compose_form.spoiler.marked": "열람 주의 제거",
-  "compose_form.spoiler.unmarked": "열람 주의가 설정 되어 있지 않습니다",
+  "compose_form.spoiler.marked": "콘텐츠 경고 제거",
+  "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
   "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
   "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
+  "confirmations.cancel_follow_request.confirm": "요청 삭제",
+  "confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
   "confirmations.delete.confirm": "삭제",
   "confirmations.delete.message": "정말로 이 게시물을 삭제하시겠습니까?",
   "confirmations.delete_list.confirm": "삭제",
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "저장 안함",
+  "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
   "confirmations.domain_block.confirm": "도메인 전체를 차단",
-  "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 컨텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
+  "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.mute.confirm": "뮤트",
-  "confirmations.mute.explanation": "이 동작은 그의 게시물, 그를 멘션하는 게시물을 숨깁니다, 하지만 여전히 그가 당신의 게시물을 보고 팔로우 할 수 있습니다.",
-  "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?",
+  "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
+  "confirmations.mute.message": "정말로 {name} 님을 뮤트하시겠습니까?",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
-  "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 포스트에 대한 부스트와 즐겨찾기를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
+  "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.reply.confirm": "답글",
   "confirmations.reply.message": "답글을 달기 위해 현재 작성 중인 메시지가 덮어 씌워집니다. 진행하시겠습니까?",
-  "confirmations.unfollow.confirm": "언팔로우",
-  "confirmations.unfollow.message": "정말로 {name}를 언팔로우하시겠습니까?",
+  "confirmations.unfollow.confirm": "팔로우 해제",
+  "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
   "conversation.with": "{names} 님과",
-  "directory.federated": "알려진 별무리로부터",
+  "copypaste.copied": "복사됨",
+  "copypaste.copy": "복사",
+  "directory.federated": "알려진 연합우주로부터",
   "directory.local": "{domain}에서만",
   "directory.new_arrivals": "새로운 사람들",
   "directory.recently_active": "최근 활동",
+  "disabled_account_banner.account_settings": "계정 설정",
+  "disabled_account_banner.text": "당신의 계정 {disabledAccount}는 현재 비활성화 상태입니다.",
+  "dismissable_banner.community_timeline": "여기 있는 것들은 계정이 {domain}에 있는 사람들의 최근 공개 게시물들입니다.",
+  "dismissable_banner.dismiss": "지우기",
+  "dismissable_banner.explore_links": "이 뉴스들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들이 지금 많이 이야기 하고 있는 것입니다.",
+  "dismissable_banner.explore_statuses": "이 게시물들은 이 서버와 분산화된 네트워크의 다른 서버에서 지금 인기를 끌고 있는 것들입니다.",
+  "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
+  "dismissable_banner.public_timeline": "이 게시물들은 이 서버와 이 서버가 알고있는 분산화된 네트워크의 다른 서버에서 사람들이 게시한 최근 공개 게시물들입니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
-  "embed.preview": "다음과 같이 표시됩니다:",
+  "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
-  "emoji_button.custom": "커스텀",
+  "emoji_button.clear": "지우기",
+  "emoji_button.custom": "사용자 지정",
   "emoji_button.flags": "깃발",
   "emoji_button.food": "음식과 마실것",
   "emoji_button.label": "에모지를 추가",
   "emoji_button.nature": "자연",
-  "emoji_button.not_found": "맞는 에모지가 없습니다",
+  "emoji_button.not_found": "해당하는 에모지가 없습니다",
   "emoji_button.objects": "물건",
   "emoji_button.people": "사람들",
   "emoji_button.recent": "자주 사용됨",
@@ -161,44 +212,67 @@
   "empty_column.account_timeline": "여긴 게시물이 없어요!",
   "empty_column.account_unavailable": "프로필 사용 불가",
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
-  "empty_column.bookmarked_statuses": "아직 보관한 게시물이 없습니다. 게시물을 보관하면 여기에 나타납니다.",
-  "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
+  "empty_column.bookmarked_statuses": "아직 북마크에 저장한 게시물이 없습니다. 게시물을 북마크 지정하면 여기에 나타납니다.",
+  "empty_column.community": "로컬 타임라인에 아무것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
-  "empty_column.domain_blocks": "아직 차단된 도메인이 없습니다.",
-  "empty_column.favourited_statuses": "아직 즐겨찾기 한 게시물이 없습니다. 게시물을 즐겨찾기 하면 여기에 나타납니다.",
-  "empty_column.favourites": "아직 아무도 이 게시물을 즐겨찾기 하지 않았습니다. 누군가 즐겨찾기를 하면 여기에 나타납니다.",
-  "empty_column.follow_recommendations": "당신을 위한 제안이 생성될 수 없는 것 같습니다. 알 수도 있는 사람을 검색하거나 유행하는 해시태그를 둘러볼 수 있습니다.",
+  "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
+  "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
+  "empty_column.favourited_statuses": "아직 마음에 들어한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
+  "empty_column.favourites": "아직 아무도 이 게시물을 마음에 들어하지 않았습니다. 누군가 좋아요를 하면 여기에 나타납니다.",
+  "empty_column.follow_recommendations": "나를 위한 추천을 만들 수 없는 것 같습니다. 알 수도 있는 사람을 검색하거나 유행하는 해시태그를 둘러볼 수 있습니다.",
   "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.",
   "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
   "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람들을 팔로우 하여 채워보세요. {suggestions}",
   "empty_column.home.suggestions": "몇몇의 제안 보기",
-  "empty_column.list": "리스트에 아직 아무 것도 없습니다.",
+  "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
   "empty_column.notifications": "아직 알림이 없습니다. 다른 사람들이 당신에게 반응했을 때, 여기에서 볼 수 있습니다.",
-  "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 유저를 팔로우 해서 채워보세요",
+  "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
   "error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
   "error.unexpected_crash.explanation_addons": "이 페이지는 올바르게 보여질 수 없습니다. 브라우저 애드온이나 자동 번역 도구 등으로 인해 발생된 에러일 수 있습니다.",
   "error.unexpected_crash.next_steps": "페이지를 새로고침 해보세요. 그래도 해결되지 않는 경우, 다른 브라우저나 네이티브 앱으로도 마스토돈을 이용하실 수 있습니다.",
-  "error.unexpected_crash.next_steps_addons": "그것들을 끄고 페이지를 새로고침 해보세요. 그래도 해결되지 않는 경우, 다른 브라우저나 네이티브 앱으로도 마스토돈을 이용하실 수 있습니다.",
+  "error.unexpected_crash.next_steps_addons": "그걸 끄고 페이지를 새로고침 해보세요. 그래도 해결되지 않으면, 다른 브라우저나 네이티브 앱으로 마스토돈을 이용해 보실 수 있습니다.",
   "errors.unexpected_crash.copy_stacktrace": "에러 내용을 클립보드에 복사",
   "errors.unexpected_crash.report_issue": "문제 신고",
+  "explore.search_results": "검색 결과",
+  "explore.suggested_follows": "추천",
+  "explore.title": "둘러보기",
+  "explore.trending_links": "소식",
+  "explore.trending_statuses": "게시물",
+  "explore.trending_tags": "해시태그",
+  "filter_modal.added.context_mismatch_explanation": "이 필터 카테고리는 당신이 이 게시물에 접근한 문맥에 적용되지 않습니다. 만약 이 문맥에서도 필터되길 원한다면, 필터를 수정해야 합니다.",
+  "filter_modal.added.context_mismatch_title": "문맥 불일치!",
+  "filter_modal.added.expired_explanation": "이 필터 카테고리는 만료되었습니다, 적용하려면 만료 일자를 변경할 필요가 있습니다.",
+  "filter_modal.added.expired_title": "만료된 필터!",
+  "filter_modal.added.review_and_configure": "이 필터 카테고리를 검토하거나 나중에 더 설정하려면, {settings_link}로 가십시오.",
+  "filter_modal.added.review_and_configure_title": "필터 설정",
+  "filter_modal.added.settings_link": "설정 페이지",
+  "filter_modal.added.short_explanation": "이 게시물을 다음 필터 카테고리에 추가되었습니다: {title}.",
+  "filter_modal.added.title": "필터 추가됨!",
+  "filter_modal.select_filter.context_mismatch": "이 문맥에 적용되지 않습니다",
+  "filter_modal.select_filter.expired": "만료됨",
+  "filter_modal.select_filter.prompt_new": "새 카테고리: {name}",
+  "filter_modal.select_filter.search": "검색 또는 생성",
+  "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
+  "filter_modal.select_filter.title": "이 게시물을 필터",
+  "filter_modal.title.status": "게시물 필터",
   "follow_recommendations.done": "완료",
   "follow_recommendations.heading": "게시물을 받아 볼 사람들을 팔로우 하세요! 여기 몇몇의 추천이 있습니다.",
   "follow_recommendations.lead": "당신이 팔로우 하는 사람들의 게시물이 시간순으로 정렬되어 당신의 홈 피드에 표시될 것입니다. 실수를 두려워 하지 마세요, 언제든지 쉽게 팔로우 취소를 할 수 있습니다!",
   "follow_request.authorize": "허가",
   "follow_request.reject": "거부",
-  "follow_requests.unlocked_explanation": "당신의 계정이 잠기지 않았다고 할 지라도, {domain}의 스탭은 당신이 이 계정들로부터의 팔로우 요청을 수동으로 확인하길 원한다고 생각했습니다.",
+  "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
+  "footer.about": "정보",
+  "footer.directory": "프로필 책자",
+  "footer.get_app": "앱 다운로드하기",
+  "footer.invite": "초대하기",
+  "footer.keyboard_shortcuts": "키보드 단축키",
+  "footer.privacy_policy": "개인정보 정책",
+  "footer.source_code": "소스코드 보기",
   "generic.saved": "저장됨",
-  "getting_started.developers": "개발자",
-  "getting_started.directory": "프로필 책자",
-  "getting_started.documentation": "문서",
-  "getting_started.heading": "시작",
-  "getting_started.invite": "초대",
-  "getting_started.open_source_notice": "Mastodon은 오픈 소스 소프트웨어입니다. 누구나 GitHub({github})에서 개발에 참여하거나, 문제를 보고할 수 있습니다.",
-  "getting_started.security": "계정 설정",
-  "getting_started.terms": "이용 약관",
-  "hashtag.column_header.tag_mode.all": "그리고 {additional}",
+  "getting_started.heading": "시작하기",
+  "hashtag.column_header.tag_mode.all": "및 {additional}",
   "hashtag.column_header.tag_mode.any": "또는 {additional}",
   "hashtag.column_header.tag_mode.none": "{additional}를 제외하고",
   "hashtag.column_settings.select.no_options_message": "추천할 내용이 없습니다",
@@ -207,16 +281,30 @@
   "hashtag.column_settings.tag_mode.any": "아무것이든",
   "hashtag.column_settings.tag_mode.none": "이것들을 제외하고",
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
+  "hashtag.follow": "해시태그 팔로우",
+  "hashtag.unfollow": "해시태그 팔로우 해제",
   "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
   "home.show_announcements": "공지사항 보기",
+  "interaction_modal.description.favourite": "마스토돈 계정을 통해, 게시물을 마음에 들어 하는 것으로 작성자에게 호의를 표하고 나중에 보기 위해 저장할 수 있습니다.",
+  "interaction_modal.description.follow": "마스토돈 계정을 통해, {name} 님을 팔로우 하고 그의 게시물을 홈 피드에서 받아 볼 수 있습니다.",
+  "interaction_modal.description.reblog": "마스토돈 계정을 통해, 이 게시물을 부스트 하고 자신의 팔로워들에게 공유할 수 있습니다.",
+  "interaction_modal.description.reply": "마스토돈 계정을 통해, 이 게시물에 응답할 수 있습니다.",
+  "interaction_modal.on_another_server": "다른 서버에",
+  "interaction_modal.on_this_server": "이 서버에서",
+  "interaction_modal.other_server_instructions": "주로 이용하는 마스토돈 앱이나 마스토돈 서버의 웹 인터페이스 내 검색 영역에 이 URL을 복사 및 붙여넣기 하세요.",
+  "interaction_modal.preamble": "마스토돈은 분산화 되어 있기 때문에, 이곳에 계정이 없더라도 다른 곳에서 운영되는 마스토돈 서버나 호환 되는 플랫폼에 있는 계정을 사용할 수 있습니다.",
+  "interaction_modal.title.favourite": "{name} 님의 게시물을 마음에 들어하기",
+  "interaction_modal.title.follow": "{name} 님을 팔로우",
+  "interaction_modal.title.reblog": "{name} 님의 게시물을 부스트",
+  "interaction_modal.title.reply": "{name} 님의 게시물에 답글",
   "intervals.full.days": "{number} 일",
   "intervals.full.hours": "{number} 시간",
   "intervals.full.minutes": "{number} 분",
   "keyboard_shortcuts.back": "뒤로가기",
-  "keyboard_shortcuts.blocked": "차단한 유저 리스트 열기",
+  "keyboard_shortcuts.blocked": "차단된 사용자 목록 열기",
   "keyboard_shortcuts.boost": "게시물 부스트",
   "keyboard_shortcuts.column": "해당 컬럼에 포커스",
   "keyboard_shortcuts.compose": "작성창에 포커스",
@@ -225,7 +313,7 @@
   "keyboard_shortcuts.down": "리스트에서 아래로 이동",
   "keyboard_shortcuts.enter": "게시물 열기",
   "keyboard_shortcuts.favourite": "관심글 지정",
-  "keyboard_shortcuts.favourites": "즐겨찾기 목록 열기",
+  "keyboard_shortcuts.favourites": "좋아요 목록 열기",
   "keyboard_shortcuts.federated": "연합 타임라인 열기",
   "keyboard_shortcuts.heading": "키보드 단축키",
   "keyboard_shortcuts.home": "홈 타임라인 열기",
@@ -233,7 +321,7 @@
   "keyboard_shortcuts.legend": "이 개요 표시",
   "keyboard_shortcuts.local": "로컬 타임라인 열기",
   "keyboard_shortcuts.mention": "작성자에게 멘션",
-  "keyboard_shortcuts.muted": "뮤트 된 유저 리스트 열기",
+  "keyboard_shortcuts.muted": "뮤트된 사용자 목록 열기",
   "keyboard_shortcuts.my_profile": "내 프로필 열기",
   "keyboard_shortcuts.notifications": "알림 컬럼 열기",
   "keyboard_shortcuts.open_media": "미디어 열기",
@@ -254,6 +342,8 @@
   "lightbox.expand": "이미지 박스 확장",
   "lightbox.next": "다음",
   "lightbox.previous": "이전",
+  "limited_account_hint.action": "그래도 프로필 보기",
+  "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "lists.account.add": "리스트에 추가",
   "lists.account.remove": "리스트에서 제거",
   "lists.delete": "리스트 삭제",
@@ -266,53 +356,60 @@
   "lists.replies_policy.none": "아무도 없음",
   "lists.replies_policy.title": "답글 표시:",
   "lists.search": "팔로우 중인 사람들 중에서 찾기",
-  "lists.subheading": "당신의 리스트",
+  "lists.subheading": "리스트",
   "load_pending": "{count}개의 새 항목",
   "loading_indicator.label": "불러오는 중...",
   "media_gallery.toggle_visible": "이미지 숨기기",
   "missing_indicator.label": "찾을 수 없습니다",
   "missing_indicator.sublabel": "이 리소스를 찾을 수 없었습니다",
+  "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
   "mute_modal.duration": "기간",
   "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
   "mute_modal.indefinite": "무기한",
-  "navigation_bar.apps": "모바일 앱",
+  "navigation_bar.about": "정보",
   "navigation_bar.blocks": "차단한 사용자",
-  "navigation_bar.bookmarks": "보관함",
+  "navigation_bar.bookmarks": "북마크",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 게시물 작성",
   "navigation_bar.direct": "다이렉트 메시지",
   "navigation_bar.discover": "발견하기",
-  "navigation_bar.domain_blocks": "차단된 도메인",
+  "navigation_bar.domain_blocks": "차단한 도메인",
   "navigation_bar.edit_profile": "프로필 편집",
-  "navigation_bar.favourites": "즐겨찾기",
-  "navigation_bar.filters": "뮤트된 단어",
+  "navigation_bar.explore": "둘러보기",
+  "navigation_bar.favourites": "좋아요",
+  "navigation_bar.filters": "뮤트한 단어",
   "navigation_bar.follow_requests": "팔로우 요청",
   "navigation_bar.follows_and_followers": "팔로우와 팔로워",
-  "navigation_bar.info": "이 서버에 대해서",
-  "navigation_bar.keyboard_shortcuts": "단축키",
   "navigation_bar.lists": "리스트",
   "navigation_bar.logout": "로그아웃",
-  "navigation_bar.mutes": "뮤트 중인 사용자",
+  "navigation_bar.mutes": "뮤트한 사용자",
   "navigation_bar.personal": "개인용",
   "navigation_bar.pins": "고정된 게시물",
   "navigation_bar.preferences": "사용자 설정",
   "navigation_bar.public_timeline": "연합 타임라인",
+  "navigation_bar.search": "검색",
   "navigation_bar.security": "보안",
-  "notification.favourite": "{name} 님이 즐겨찾기 했습니다",
-  "notification.follow": "{name} 님이 나를 팔로우 했습니다",
+  "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
+  "notification.admin.report": "{name} 님이 {target}를 신고했습니다",
+  "notification.admin.sign_up": "{name} 님이 가입했습니다",
+  "notification.favourite": "{name} 님이 당신의 게시물을 마음에 들어합니다",
+  "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
-  "notification.mention": "{name} 님이 답글을 보냈습니다",
+  "notification.mention": "{name} 님이 언급하였습니다",
   "notification.own_poll": "내 투표가 끝났습니다",
   "notification.poll": "당신이 참여 한 투표가 종료되었습니다",
-  "notification.reblog": "{name} 님이 부스트 했습니다",
+  "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
+  "notification.update": "{name} 님이 게시물을 수정했습니다",
   "notifications.clear": "알림 지우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
+  "notifications.column_settings.admin.report": "새 신고:",
+  "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
-  "notifications.column_settings.favourite": "즐겨찾기:",
+  "notifications.column_settings.favourite": "좋아요:",
   "notifications.column_settings.filter_bar.advanced": "카테고리의 모든 종류를 표시",
   "notifications.column_settings.filter_bar.category": "퀵 필터 바",
-  "notifications.column_settings.filter_bar.show": "표시",
+  "notifications.column_settings.filter_bar.show_bar": "필터 막대 표시",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "답글:",
@@ -322,16 +419,18 @@
   "notifications.column_settings.show": "컬럼에 표시",
   "notifications.column_settings.sound": "효과음 재생",
   "notifications.column_settings.status": "새 게시물:",
-  "notifications.column_settings.unread_markers.category": "읽지 않음 알림 마커",
+  "notifications.column_settings.unread_notifications.category": "읽지 않은 알림",
+  "notifications.column_settings.unread_notifications.highlight": "읽지 않은 알림 강조",
+  "notifications.column_settings.update": "수정내역:",
   "notifications.filter.all": "모두",
   "notifications.filter.boosts": "부스트",
-  "notifications.filter.favourites": "즐겨찾기",
+  "notifications.filter.favourites": "좋아요",
   "notifications.filter.follows": "팔로우",
   "notifications.filter.mentions": "멘션",
   "notifications.filter.polls": "투표 결과",
   "notifications.filter.statuses": "팔로우 하는 사람들의 최신 게시물",
   "notifications.grant_permission": "권한 부여.",
-  "notifications.group": "{count} 개의 알림",
+  "notifications.group": "{count}개의 알림",
   "notifications.mark_as_read": "모든 알림을 읽은 상태로 표시",
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
@@ -346,64 +445,127 @@
   "poll.total_votes": "{count} 표",
   "poll.vote": "투표",
   "poll.voted": "이 답변에 투표했습니다",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes} 표",
   "poll_button.add_poll": "투표 추가",
   "poll_button.remove_poll": "투표 삭제",
-  "privacy.change": "포스트의 프라이버시 설정을 변경",
-  "privacy.direct.long": "멘션한 사용자에게만 공개",
-  "privacy.direct.short": "다이렉트",
+  "privacy.change": "게시물의 프라이버시 설정을 변경",
+  "privacy.direct.long": "언급된 사용자만 볼 수 있음",
+  "privacy.direct.short": "멘션한 사람들만",
   "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "비공개",
-  "privacy.public.long": "공개 타임라인에 표시",
+  "privacy.private.short": "팔로워 전용",
+  "privacy.public.long": "모두가 볼 수 있음",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
+  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
   "privacy.unlisted.short": "타임라인에 비표시",
+  "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
+  "privacy_policy.title": "개인정보 정책",
   "refresh": "새로고침",
   "regeneration_indicator.label": "불러오는 중…",
   "regeneration_indicator.sublabel": "당신의 홈 피드가 준비되는 중입니다!",
   "relative_time.days": "{number}일 전",
+  "relative_time.full.days": "{number} 일 전",
+  "relative_time.full.hours": "{number} 시간 전",
+  "relative_time.full.just_now": "방금 전",
+  "relative_time.full.minutes": "{number} 분 전",
+  "relative_time.full.seconds": "{number} 초 전",
   "relative_time.hours": "{number}시간 전",
   "relative_time.just_now": "방금",
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
   "reply_indicator.cancel": "취소",
+  "report.block": "차단",
+  "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
+  "report.categories.other": "기타",
+  "report.categories.spam": "스팸",
+  "report.categories.violation": "콘텐츠가 한 개 이상의 서버 규칙을 위반합니다",
+  "report.category.subtitle": "가장 알맞은 것을 선택하세요",
+  "report.category.title": "이 {type}에 무슨 문제가 있는지 알려주세요",
+  "report.category.title_account": "프로필",
+  "report.category.title_status": "게시물",
+  "report.close": "완료",
+  "report.comment.title": "우리가 더 알아야 할 내용이 있나요?",
   "report.forward": "{target}에 포워드 됨",
   "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
-  "report.hint": "신고는 당신의 서버 스태프에게 전송 됩니다. 왜 이 계정을 신고하는 지에 대한 설명을 아래에 작성할 수 있습니다:",
+  "report.mute": "침묵",
+  "report.mute_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 해당 계정은 자신이 뮤트 되었는지 알지 못합니다.",
+  "report.next": "다음",
   "report.placeholder": "코멘트",
+  "report.reasons.dislike": "마음에 안듭니다",
+  "report.reasons.dislike_description": "내가 보기 싫은 종류에 속합니다",
+  "report.reasons.other": "기타",
+  "report.reasons.other_description": "이슈가 다른 분류에 속하지 않습니다",
+  "report.reasons.spam": "스팸입니다",
+  "report.reasons.spam_description": "악성 링크, 반응 스팸, 또는 반복적인 답글",
+  "report.reasons.violation": "서버 규칙을 위반합니다",
+  "report.reasons.violation_description": "특정 규칙을 위반합니다",
+  "report.rules.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.rules.title": "어떤 규칙을 위반했나요?",
+  "report.statuses.subtitle": "해당하는 사항을 모두 선택하세요",
+  "report.statuses.title": "이 신고에 대해서 더 참고해야 할 게시물이 있나요?",
   "report.submit": "신고하기",
-  "report.target": "문제가 된 사용자",
+  "report.target": "{target} 신고하기",
+  "report.thanks.take_action": "마스토돈에서 나에게 보이는 것을 조절하기 위한 몇 가지 선택사항들이 존재합니다:",
+  "report.thanks.take_action_actionable": "서버의 중재자들이 이것을 심사하는 동안, 당신은 @{name}에 대한 행동을 취할 수 있습니다:",
+  "report.thanks.title": "이런 것을 보지 않길 원하나요?",
+  "report.thanks.title_actionable": "신고해주셔서 감사합니다, 중재자분들이 확인할 예정입니다.",
+  "report.unfollow": "@{name}을 팔로우 해제",
+  "report.unfollow_explanation": "이 계정을 팔로우하고 있습니다. 홈 피드에서 더 이상 게시물을 받아 보지 않으려면 팔로우를 해제하십시오.",
+  "report_notification.attached_statuses": "{count}개의 게시물 첨부됨",
+  "report_notification.categories.other": "기타",
+  "report_notification.categories.spam": "스팸",
+  "report_notification.categories.violation": "규칙 위반",
+  "report_notification.open": "신고 열기",
   "search.placeholder": "검색",
+  "search.search_or_paste": "검색하거나 URL 붙여넣기",
   "search_popout.search_format": "고급 검색 방법",
-  "search_popout.tips.full_text": "단순한 텍스트 검색은 당신이 작성했거나, 관심글로 지정했거나, 부스트했거나, 멘션을 받은 게시글, 그리고 유저네임, 디스플레이네임, 해시태그를 반환합니다.",
+  "search_popout.tips.full_text": "단순한 텍스트 검색은 당신이 작성했거나, 관심글로 지정했거나, 부스트했거나, 멘션을 받은 게시글, 그리고 사용자명, 표시되는 이름, 해시태그를 반환합니다.",
   "search_popout.tips.hashtag": "해시태그",
   "search_popout.tips.status": "게시물",
-  "search_popout.tips.text": "단순한 텍스트 검색은 관계된 프로필 이름, 유저 이름 그리고 해시태그를 표시합니다",
-  "search_popout.tips.user": "유저",
+  "search_popout.tips.text": "단순한 텍스트 검색은 관계된 프로필 이름, 사용자명 그리고 해시태그를 표시합니다",
+  "search_popout.tips.user": "사용자",
   "search_results.accounts": "사람",
+  "search_results.all": "전부",
   "search_results.hashtags": "해시태그",
+  "search_results.nothing_found": "검색어에 대한 결과를 찾을 수 없습니다",
   "search_results.statuses": "게시물",
   "search_results.statuses_fts_disabled": "이 마스토돈 서버에선 게시물의 내용을 통한 검색이 활성화 되어 있지 않습니다.",
+  "search_results.title": "{q}에 대한 검색",
   "search_results.total": "{count, number}건의 결과",
+  "server_banner.about_active_users": "30일 동안 이 서버를 사용한 사람들 (월간 활성 이용자)",
+  "server_banner.active_users": "활성 사용자",
+  "server_banner.administered_by": "관리자:",
+  "server_banner.introduction": "{domain}은 마스토돈으로 운영되는 탈중앙화 된 소셜 네트워크의 일부입니다.",
+  "server_banner.learn_more": "더 알아보기",
+  "server_banner.server_stats": "서버 통계:",
+  "sign_in_banner.create_account": "계정 생성",
+  "sign_in_banner.sign_in": "로그인",
+  "sign_in_banner.text": "로그인을 통해 프로필이나 해시태그를 팔로우하거나 마음에 들어하거나 공유하고 답글을 달 수 있습니다, 혹은 다른 서버에 있는 본인의 계정을 통해 참여할 수도 있습니다.",
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
   "status.block": "@{name} 차단",
-  "status.bookmark": "보관",
+  "status.bookmark": "북마크",
   "status.cancel_reblog_private": "부스트 취소",
-  "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
+  "status.cannot_reblog": "이 게시물은 부스트 할 수 없습니다",
   "status.copy": "게시물 링크 복사",
   "status.delete": "삭제",
   "status.detailed_status": "대화 자세히 보기",
   "status.direct": "@{name}에게 다이렉트 메시지",
+  "status.edit": "수정",
+  "status.edited": "{date}에 편집됨",
+  "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "공유하기",
-  "status.favourite": "즐겨찾기",
+  "status.favourite": "좋아요",
+  "status.filter": "이 게시물을 필터",
   "status.filtered": "필터로 걸러짐",
+  "status.hide": "툿 숨기기",
+  "status.history.created": "{name} 님이 {date}에 생성함",
+  "status.history.edited": "{name} 님이 {date}에 수정함",
   "status.load_more": "더 보기",
   "status.media_hidden": "미디어 숨겨짐",
-  "status.mention": "답장",
+  "status.mention": "@{name} 님에게 글 쓰기",
   "status.more": "자세히",
-  "status.mute": "@{name} 뮤트",
+  "status.mute": "@{name} 님을 뮤트하기",
   "status.mute_conversation": "이 대화를 뮤트",
   "status.open": "상세 정보 표시",
   "status.pin": "고정",
@@ -411,30 +573,36 @@
   "status.read_more": "더 보기",
   "status.reblog": "부스트",
   "status.reblog_private": "원래의 수신자들에게 부스트",
-  "status.reblogged_by": "{name} 님이 부스트 했습니다",
+  "status.reblogged_by": "{name} 님이 부스트했습니다",
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
-  "status.remove_bookmark": "보관한 게시물 삭제",
+  "status.remove_bookmark": "북마크 삭제",
+  "status.replied_to": "{name} 님에게",
   "status.reply": "답장",
-  "status.replyAll": "전원에게 답장",
-  "status.report": "신고",
+  "status.replyAll": "글타래에 답장",
+  "status.report": "{name} 님을 신고하기",
   "status.sensitive_warning": "민감한 미디어",
   "status.share": "공유",
+  "status.show_filter_reason": "그냥 표시하기",
   "status.show_less": "숨기기",
   "status.show_less_all": "모두 접기",
   "status.show_more": "더 보기",
   "status.show_more_all": "모두 펼치기",
-  "status.show_thread": "글타래 보기",
+  "status.show_original": "원본 보기",
+  "status.translate": "번역",
+  "status.translated_from_with": "{lang}에서 {provider}를 사용해 번역됨",
   "status.uncached_media_warning": "사용할 수 없음",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
+  "subscribed_languages.lead": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
+  "subscribed_languages.save": "변경사항 저장",
+  "subscribed_languages.target": "{target}에 대한 구독 언어 변경",
   "suggestions.dismiss": "추천 지우기",
   "suggestions.header": "여기에 관심이 있을 것 같습니다…",
   "tabs_bar.federated_timeline": "연합",
   "tabs_bar.home": "홈",
   "tabs_bar.local_timeline": "로컬",
   "tabs_bar.notifications": "알림",
-  "tabs_bar.search": "검색",
   "time_remaining.days": "{number} 일 남음",
   "time_remaining.hours": "{number} 시간 남음",
   "time_remaining.minutes": "{number} 분 남음",
@@ -444,25 +612,26 @@
   "timeline_hint.resources.followers": "팔로워",
   "timeline_hint.resources.follows": "팔로우",
   "timeline_hint.resources.statuses": "이전 게시물",
-  "trends.counter_by_accounts": "{counter} 명이 말하는 중",
+  "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}B",
   "units.short.thousand": "{count}K",
   "upload_area.title": "드래그 & 드롭으로 업로드",
-  "upload_button.label": "미디어 추가 (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 투표와 함께 첨부할 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
+  "upload_form.description_missing": "설명이 추가되지 않음",
   "upload_form.edit": "편집",
   "upload_form.thumbnail": "썸네일 변경",
   "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
   "upload_modal.analyzing_picture": "이미지 분석 중…",
   "upload_modal.apply": "적용",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "적용 중...",
   "upload_modal.choose_image": "이미지 선택",
   "upload_modal.description_placeholder": "다람쥐 헌 쳇바퀴 타고파",
   "upload_modal.detect_text": "이미지에서 텍스트 추출",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "OCR 준비 중…",
   "upload_modal.preview_label": "미리보기 ({ratio})",
   "upload_progress.label": "업로드 중...",
+  "upload_progress.processing": "처리 중...",
   "video.close": "동영상 닫기",
   "video.download": "파일 다운로드",
   "video.exit_fullscreen": "전체화면 나가기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 2f0c4e511..92e7e9267 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -1,484 +1,654 @@
 {
-  "account.account_note_header": "تێبینی    ",
-  "account.add_or_remove_from_list": "زیادکردن یان سڕینەوە لە پێرستەکان",
-  "account.badges.bot": "بوت",
-  "account.badges.group": "گرووپ",
-  "account.block": "بلۆکی @{name}",
-  "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
-  "account.blocked": "بلۆککرا",
-  "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
-  "account.cancel_follow_request": "بەتاڵکردنی داوای شوێنکەوتن",
-  "account.direct": "پەیامی تایبەت بە @{name}",
-  "account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
-  "account.domain_blocked": "دۆمەین قەپاتکرا",
-  "account.edit_profile": "دەستکاری پرۆفایل",
-  "account.enable_notifications": "ئاگادارم بکەوە کاتێک @{name} بابەتەکان",
-  "account.endorse": "ناساندن لە پرۆفایل",
-  "account.follow": "شوێنکەوتن",
-  "account.followers": "شوێنکەوتووان",
-  "account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
-  "account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
-  "account.follows_you": "شوێنکەوتووەکانت",
-  "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "دوایین چالاکی",
-  "account.link_verified_on": "خاوەنداریەتی ئەم لینکە لە {date} چێک کراوە",
-  "account.locked_info": "تایبەتمەندی ئەم هەژمارەیە ڕیکخراوە بۆ قوفڵدراوە. خاوەنەکە بە دەستی پێداچوونەوە دەکات کە کێ دەتوانێت شوێنیان بکەوێت.",
-  "account.media": "میدیا",
-  "account.mention": "ئاماژە @{name}",
-  "account.moved_to": "{name} گواسترایەوە بۆ:",
-  "account.mute": "بێدەنگکردن @{name}",
-  "account.mute_notifications": "هۆشیارکەرەوەکان لاببە لە @{name}",
-  "account.muted": "بێ دەنگ",
-  "account.never_active": "هەرگیز",
-  "account.posts": "توتس",
-  "account.posts_with_replies": "توتس و وەڵامەکان",
-  "account.report": "گوزارشت @{name}",
-  "account.requested": "چاوەڕێی ڕەزامەندین. کرتە بکە بۆ هەڵوەشاندنەوەی داواکاری شوێنکەوتن",
-  "account.share": "پرۆفایلی @{name} هاوبەش بکە",
-  "account.show_reblogs": "پیشاندانی بەرزکردنەوەکان لە @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.unblock": "@{name} لاببە",
-  "account.unblock_domain": "کردنەوەی دۆمەینی {domain}",
-  "account.unendorse": "تایبەتمەندی لەسەر پرۆفایلەکە نیە",
-  "account.unfollow": "بەدوادانەچو",
-  "account.unmute": "بێدەنگکردنی @{name}",
-  "account.unmute_notifications": "بێدەنگکردنی هۆشیارییەکان لە @{name}",
-  "account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "تکایە هەوڵبدەرەوە دوای {retry_time, time, medium}.",
-  "alert.rate_limited.title": "ڕێژەی سنووردار",
-  "alert.unexpected.message": "هەڵەیەکی چاوەڕوان نەکراو ڕوویدا.",
-  "alert.unexpected.title": "تەححح!",
-  "announcement.announcement": "بانگەواز",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
-  "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
-  "bundle_column_error.body": "هەڵەیەک ڕوویدا لەکاتی بارکردنی ئەم پێکهاتەیە.",
-  "bundle_column_error.retry": "دووبارە هەوڵبدە",
-  "bundle_column_error.title": "هەڵيی تۆڕ",
-  "bundle_modal_error.close": "داخستن",
-  "bundle_modal_error.message": "هەڵەیەک ڕوویدا لەکاتی بارکردنی ئەم پێکهاتەیە.",
-  "bundle_modal_error.retry": "دووبارە تاقی بکەوە",
-  "column.blocks": "بەکارهێنەرە بلۆککراوەکان",
-  "column.bookmarks": "نیشانەکان",
-  "column.community": "هێڵی کاتی ناوخۆیی",
-  "column.direct": "نامە ڕاستەوخۆکان",
-  "column.directory": "گەڕان لە پرۆفایلەکان",
-  "column.domain_blocks": "دۆمەینە داخراوەکان",
-  "column.favourites": "دڵخوازترینەکان",
-  "column.follow_requests": "بەدواداچوی داواکاریەکان بکە",
-  "column.home": "سەرەتا",
-  "column.lists": "پێرست",
-  "column.mutes": "بێدەنگکردنی بەکارهێنەران",
-  "column.notifications": "ئاگادارییەکان",
-  "column.pins": "تووتسی چەسپاو",
-  "column.public": "نووسراوەکانی هەمووشوێنێک",
-  "column_back_button.label": "دواوە",
-  "column_header.hide_settings": "شاردنەوەی ڕێکخستنەکان",
-  "column_header.moveLeft_settings": "ستوون بگوێزەرەوە بۆ لای چەپ",
-  "column_header.moveRight_settings": "جوولاندنی ئەستوون بۆ لای ڕاست",
-  "column_header.pin": "سنجاق",
-  "column_header.show_settings": "نیشاندانی رێکخستنەکان",
-  "column_header.unpin": "سنجاق نەکردن",
-  "column_subheading.settings": "رێکخستنەکان",
-  "community.column_settings.local_only": "تەنها خۆماڵی",
-  "community.column_settings.media_only": "تەنها میدیا",
-  "community.column_settings.remote_only": "تەنها بۆ دوور",
-  "compose_form.direct_message_warning": "ئەم توتە تەنیا بۆ بەکارهێنەرانی ناوبراو دەنێردرێت.",
-  "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
-  "compose_form.hashtag_warning": "ئەم توتە لە ژێر هیچ هاشتاگییەک دا ناکرێت وەک ئەوەی لە لیستەکەدا نەریزراوە. تەنها توتی گشتی دەتوانرێت بە هاشتاگی بگەڕێت.",
-  "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
-  "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
-  "compose_form.placeholder": "چی لە مێشکتدایە?",
-  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
-  "compose_form.poll.duration": "ماوەی ڕاپرسی",
-  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
-  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
-  "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
-  "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
-  "compose_form.publish": "توت",
+  "about.blocks": "Rajekarên çavdêrkirî",
+  "about.contact": "Têkilî:",
+  "about.disclaimer": "Mastodon belaş e, nermalaveke çavkaniya vekirî ye û markeyeke Mastodon gGmbHê ye.",
+  "about.domain_blocks.no_reason_available": "Sedem ne berdest e",
+  "about.domain_blocks.preamble": "Mastodon bi gelemperî dihêle ku tu naverokê bibînî û bi bikarhênerên ji rajekareke din a li fendiverse re têkilî dayne. Ev awaretyên ku li ser vê rajekara taybetî hatine çêkirin ev in.",
+  "about.domain_blocks.silenced.explanation": "Heye ku tu bi awayekî vekirî lê negerî an jî bi şopandinê hilnebijêrî, tu yêbi giştî profîl û naverok ji vê rajekarê nebînî.",
+  "about.domain_blocks.silenced.title": "Sînorkirî",
+  "about.domain_blocks.suspended.explanation": "Dê tu daneya ji van rajekaran neyê berhev kirin, tomarkirin an jî guhertin, ku têkilî an danûstendinek bi bikarhênerên van rajekaran re tune dike.",
+  "about.domain_blocks.suspended.title": "Hatiye rawestandin",
+  "about.not_available": "Ev zanyarî li ser vê rajekarê nehatine peydakirin.",
+  "about.powered_by": "Medyaya civakî ya nenavendî bi hêzdariya {mastodon}",
+  "about.rules": "Rêbazên rajekar",
+  "account.account_note_header": "Nîşe",
+  "account.add_or_remove_from_list": "Li lîsteyan zêde bike yan jî rake",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Kom",
+  "account.block": "@{name} asteng bike",
+  "account.block_domain": "Navpera {domain} asteng bike",
+  "account.blocked": "Astengkirî",
+  "account.browse_more_on_origin_server": "Li pelên resen bêtir bigere",
+  "account.cancel_follow_request": "Daxwaza şopandinê vekişîne",
+  "account.direct": "Peyamekê bişîne @{name}",
+  "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
+  "account.domain_blocked": "Navper hate astengkirin",
+  "account.edit_profile": "Profîlê serrast bike",
+  "account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
+  "account.endorse": "Taybetiyên li ser profîl",
+  "account.featured_tags.last_status_at": "Şandiya dawî di {date} de",
+  "account.featured_tags.last_status_never": "Şandî tune ne",
+  "account.featured_tags.title": "{name}'s hashtagên taybet",
+  "account.follow": "Bişopîne",
+  "account.followers": "Şopîner",
+  "account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
+  "account.followers_counter": "{count, plural, one {{counter} Şopîner} other {{counter} Şopîner}}",
+  "account.following": "Dişopîne",
+  "account.following_counter": "{count, plural, one {{counter} Dişopîne} other {{counter} Dişopîne}}",
+  "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
+  "account.follows_you": "Te dişopîne",
+  "account.go_to_profile": "Biçe bo profîlê",
+  "account.hide_reblogs": "Bilindkirinên ji @{name} veşêre",
+  "account.joined_short": "Dîroka tevlîbûnê",
+  "account.languages": "Zimanên beşdarbûyî biguherîne",
+  "account.link_verified_on": "Xwedaniya li vê girêdanê di {date} de hatiye kontrolkirin",
+  "account.locked_info": "Rewşa vê ajimêrê wek kilîtkirî hatiye sazkirin. Xwediyê ajimêrê, bi destan dinirxîne şopandinê dinirxîne.",
+  "account.media": "Medya",
+  "account.mention": "Qal @{name} bike",
+  "account.moved_to": "{name} diyar kir ku ajimêra nû ya wan niha ev e:",
+  "account.mute": "@{name} bêdeng bike",
+  "account.mute_notifications": "Agahdariyan ji @{name} bêdeng bike",
+  "account.muted": "Bêdengkirî",
+  "account.open_original_page": "Rûpela resen veke",
+  "account.posts": "Şandî",
+  "account.posts_with_replies": "Şandî û bersiv",
+  "account.report": "@{name} ragihîne",
+  "account.requested": "Li benda erêkirinê ye. Ji bo betal kirina daxwazê pêl bikin",
+  "account.requested_follow": "{name} dixwaze te bişopîne",
+  "account.share": "Profîla @{name} parve bike",
+  "account.show_reblogs": "Bilindkirinên ji @{name} nîşan bike",
+  "account.statuses_counter": "{count, plural,one {{counter} Şandî}other {{counter} Şandî}}",
+  "account.unblock": "Astengê li ser @{name} rake",
+  "account.unblock_domain": "Astengê li ser navperê {domain} rake",
+  "account.unblock_short": "Astengiyê rake",
+  "account.unendorse": "Li ser profîl nîşan neke",
+  "account.unfollow": "Neşopîne",
+  "account.unmute": "@{name} bêdeng neke",
+  "account.unmute_notifications": "Agahdariyan ji @{name} bêdeng neke",
+  "account.unmute_short": "Bêdeng neke",
+  "account_note.placeholder": "Bitikîne bo nîşeyekê tevlî bikî",
+  "admin.dashboard.daily_retention": "Rêjeya ragirtina bikarhêner bi roj piştî tomarkirinê",
+  "admin.dashboard.monthly_retention": "Rêjeya ragirtina bikarhêner bi meh piştî tomarkirinê",
+  "admin.dashboard.retention.average": "Navîn",
+  "admin.dashboard.retention.cohort": "Meha tomarkirinê",
+  "admin.dashboard.retention.cohort_size": "Bikarhênerên nû",
+  "alert.rate_limited.message": "Jkx dîsa biceribîne piştî {retry_time, time, medium}.\n \n",
+  "alert.rate_limited.title": "Rêje sînorkirî ye",
+  "alert.unexpected.message": "Çewtiyeke bêhêvî çê bû.",
+  "alert.unexpected.title": "Wey li min!",
+  "announcement.announcement": "Daxuyanî",
+  "attachments_list.unprocessed": "(bêpêvajo)",
+  "audio.hide": "Dengê veşêre",
+  "autosuggest_hashtag.per_week": "Her hefte {count}",
+  "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
+  "bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
+  "bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
+  "bundle_column_error.error.title": "Ax, na!",
+  "bundle_column_error.network.body": "Di dema hewldana barkirina vê rûpelê de çewtiyek derket. Ev dibe ku ji ber pirsgirêkeke demkî ya girêdana înternetê te be an jî ev rajekar be.",
+  "bundle_column_error.network.title": "Çewtiya torê",
+  "bundle_column_error.retry": "Dîsa biceribîne",
+  "bundle_column_error.return": "Vegere rûpela sereke",
+  "bundle_column_error.routing.body": "Rûpela xwestî nehate dîtin. Tu pê bawerî ku girêdana di darika navnîşanê de rast e?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Bigire",
+  "bundle_modal_error.message": "Di dema barkirina vê hêmanê de tiştek çewt çê bû.",
+  "bundle_modal_error.retry": "Dîsa bicerbîne",
+  "closed_registrations.other_server_instructions": "Ji ber ku Mastodon nenavendî ye, tu dika li ser rajekarek din ajimêrekê biafirînî û hîn jî bi vê yekê re tev bigerî.",
+  "closed_registrations_modal.description": "Afirandina ajimêrekê li ser {domain} niha ne pêkan e, lê ji kerema xwe ji bîr neke ku pêdiviya te bi hebûna ajimêreke taybet li ser {domain} tune ye ku tu Mastodon bi kar bînî.",
+  "closed_registrations_modal.find_another_server": "Rajekareke din bibîne",
+  "closed_registrations_modal.preamble": "Mastodon nenavendî ye, ji ber vê yekê tu li ku derê ajimêrê xwe biafirînê, tu yê bikaribî li ser vê rajekarê her kesî bişopînî û têkilî deynî. Her wiha tu dikarî wê bi xwe pêşkêş bikî!",
+  "closed_registrations_modal.title": "Tomar bibe li ser Mastodon",
+  "column.about": "Derbar",
+  "column.blocks": "Bikarhênerên astengkirî",
+  "column.bookmarks": "Şûnpel",
+  "column.community": "Demnameya herêmî",
+  "column.direct": "Peyamên rasterast",
+  "column.directory": "Li profîlan bigere",
+  "column.domain_blocks": "Navperên astengkirî",
+  "column.favourites": "Bijarte",
+  "column.follow_requests": "Daxwazên şopandinê",
+  "column.home": "Rûpela sereke",
+  "column.lists": "Lîste",
+  "column.mutes": "Bikarhênerên bêdengkirî",
+  "column.notifications": "Agahdarî",
+  "column.pins": "Şandiya derzîkirî",
+  "column.public": "Demnameya giştî",
+  "column_back_button.label": "Vegere",
+  "column_header.hide_settings": "Sazkariyan veşêre",
+  "column_header.moveLeft_settings": "Stûnê bilivîne bo çepê",
+  "column_header.moveRight_settings": "Stûnê bilivîne bo rastê",
+  "column_header.pin": "Bi derzî bike",
+  "column_header.show_settings": "Sazkariyan nîşan bide",
+  "column_header.unpin": "Bi derzî neke",
+  "column_subheading.settings": "Sazkarî",
+  "community.column_settings.local_only": "Tenê herêmî",
+  "community.column_settings.media_only": "Tenê media",
+  "community.column_settings.remote_only": "Tenê ji dûr ve",
+  "compose.language.change": "Ziman biguherîne",
+  "compose.language.search": "Li zimanan bigere...",
+  "compose_form.direct_message_warning_learn_more": "Bêtir fêr bibe",
+  "compose_form.encryption_warning": "Şandiyên li ser Mastodon dawî-bi-dawî ne şîfrekirî ne. Li ser Mastodon zanyariyên hestyar parve neke.",
+  "compose_form.hashtag_warning": "Ev şandî ji ber ku nehatiye tomarkirin dê di binê hashtagê de neyê tomar kirin. Tenê peyamên gelemperî dikarin bi hashtagê werin lêgerîn.",
+  "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
+  "compose_form.lock_disclaimer.lock": "girtî ye",
+  "compose_form.placeholder": "Çi di hişê te derbas dibe?",
+  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
+  "compose_form.poll.duration": "Dema rapirsî yê",
+  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
+  "compose_form.poll.remove_option": "Vê hilbijarê rake",
+  "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
+  "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
+  "compose_form.publish": "Biweşîne",
+  "compose_form.publish_form": "Biweşîne",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
-  "compose_form.sensitive.marked": "وادەی کۆتایی",
-  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
-  "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
-  "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
-  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
-  "confirmation_modal.cancel": "هەڵوەشاندنەوه",
-  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
-  "confirmations.block.confirm": "بلۆک",
-  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
-  "confirmations.delete.confirm": "سڕینەوە",
-  "confirmations.delete.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە?",
-  "confirmations.delete_list.confirm": "سڕینەوە",
-  "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
-  "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
-  "confirmations.logout.confirm": "چوونە دەرەوە",
-  "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
-  "confirmations.mute.confirm": "بێدەنگ",
-  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
-  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
-  "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
-  "confirmations.redraft.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە و دووبارە دایبنووسیتەوە؟ دڵخوازەکان و بەرزکردنەوەکان وون دەبن، و وەڵامەکان بۆ پۆستە ڕەسەنەکە هەتیو دەبن.",
-  "confirmations.reply.confirm": "وەڵام",
-  "confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?",
-  "confirmations.unfollow.confirm": "بەدوادانەچو",
-  "confirmations.unfollow.message": "ئایا دڵنیایت لەوەی دەتەوێت پەیڕەوی {name}?",
-  "conversation.delete": "سڕینەوەی گفتوگۆ",
-  "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
-  "conversation.open": "نیشاندان گفتوگۆ",
-  "conversation.with": "لەگەڵ{names}",
-  "directory.federated": "لە ڕاژەکانی ناسراو",
-  "directory.local": "تەنها لە {domain}",
-  "directory.new_arrivals": "تازە گەیشتنەکان",
-  "directory.recently_active": "بەم دواییانە چالاکە",
-  "embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.",
-  "embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:",
-  "emoji_button.activity": "چالاکی",
-  "emoji_button.custom": "ئاسایی",
-  "emoji_button.flags": "ئاڵاکان",
-  "emoji_button.food": "خواردن& خواردنەوە",
-  "emoji_button.label": "ئیمۆجی بکەنێو",
-  "emoji_button.nature": "سروشت",
-  "emoji_button.not_found": "بێ ئیمۆجی! (╯°□°)╯( ┻━┻",
-  "emoji_button.objects": "ئامانجەکان",
-  "emoji_button.people": "خەڵک",
-  "emoji_button.recent": "زۆرجار بەکارهێنراوە",
-  "emoji_button.search": "گەڕان...",
-  "emoji_button.search_results": "ئەنجامەکانی گەڕان",
-  "emoji_button.symbols": "هێماکان",
-  "emoji_button.travel": "گەشت & شوێنەکان",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "لێرە هیچ توتەک نییە!",
-  "empty_column.account_unavailable": "پرۆفایل بەردەست نیە",
-  "empty_column.blocks": "تۆ هێشتا هیچ بەکارهێنەرێکت بلۆک نەکردووە.",
-  "empty_column.bookmarked_statuses": "تۆ هێشتا هیچ توتێکی دیاریکراوت نیە کاتێک نیشانەیەک نیشان دەکەیت، لێرە دەرئەکەویت.",
-  "empty_column.community": "هێڵی کاتی ناوخۆیی بەتاڵە. شتێک بە ئاشکرا بنووسە بۆ ئەوەی تۆپەکە بسووڕێت!",
-  "empty_column.direct": "تۆ هیچ نامەی ڕاستەوخۆت نیە تا ئێستا. کاتێک دانەیەک دەنێریت یان وەرت دەگرێت، لێرە پیشان دەدات.",
-  "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.",
-  "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.",
-  "empty_column.favourites": "کەس ئەم توتەی دڵخواز نەکردووە،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "تۆ هێشتا هیچ داواکارییەکی بەدواداچووت نیە. کاتێک یەکێکت بۆ هات، لێرە دەرئەکەویت.",
-  "empty_column.hashtag": "هێشتا هیچ شتێک لەم هاشتاگەدا نییە.",
-  "empty_column.home": "تایم لاینی ماڵەوەت بەتاڵە! سەردانی {public} بکە یان گەڕان بەکاربێنە بۆ دەستپێکردن و بینینی بەکارهێنەرانی تر.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "هێشتا هیچ شتێک لەم لیستەدا نییە. کاتێک ئەندامانی ئەم لیستە دەنگی نوێ بڵاودەکەن، لێرە دەردەکەون.",
-  "empty_column.lists": "تۆ هێشتا هیچ لیستت دروست نەکردووە، کاتێک دانەیەک دروست دەکەیت، لێرە پیشان دەدرێت.",
-  "empty_column.mutes": "تۆ هێشتا هیچ بەکارهێنەرێکت بێدەنگ نەکردووە.",
-  "empty_column.notifications": "تۆ هێشتا هیچ ئاگانامێکت نیە. چالاکی لەگەڵ کەسانی دیکە بکە بۆ دەستپێکردنی گفتوگۆکە.",
-  "empty_column.public": "لێرە هیچ نییە! شتێک بە ئاشکرا بنووسە(بەگشتی)، یان بە دەستی شوێن بەکارهێنەران بکەوە لە ڕاژەکانی ترەوە بۆ پڕکردنەوەی",
-  "error.unexpected_crash.explanation": "بەهۆی بوونی کێشە لە کۆدەکەمان یان کێشەی گونجانی وێبگەڕەکە، ئەم لاپەڕەیە بە دروستی پیشان نادرێت.",
-  "error.unexpected_crash.explanation_addons": "ئەم لاپەڕەیە ناتوانرێت بە دروستی پیشان بدرێت. ئەم هەڵەیە لەوانەیە بەهۆی ئامێری وەرگێڕانی خۆکار یان زیادکراوی وێبگەڕەوە بێت.",
-  "error.unexpected_crash.next_steps": "هەوڵدە لاپەڕەکە تازە بکەوە. ئەگەر ئەمە یارمەتیدەر نەبوو، لەوانەیە هێشتا بتوانیت ماستۆدۆن بەکاربێنیت لە ڕێگەی وێبگەڕەکەیان کاربەرنامەی ڕەسەن.",
-  "error.unexpected_crash.next_steps_addons": "هەوڵدە لەکاریان بخەیت و لاپەڕەکە تازە بکەوە. ئەگەر ئەمە یارمەتیدەر نەبوو، لەوانەیە هێشتا بتوانیت ماستۆدۆن بەکاربێنیت لە ڕێگەی وێبگەڕەکانی دیکە یان نەرمەکالاکانی ئەسڵی.",
-  "errors.unexpected_crash.copy_stacktrace": "کۆپیکردنی ستێکتراسی بۆ کلیپ بۆرد",
-  "errors.unexpected_crash.report_issue": "کێشەی گوزارشت",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "ده‌سه‌ڵاتپێدراو",
-  "follow_request.reject": "ڕەتکردنەوە",
-  "follow_requests.unlocked_explanation": "هەرچەندە هەژمارەکەت داخراو نییە، ستافی {domain} وا بیریان کردەوە کە لەوانەیە بتانەوێت پێداچوونەوە بە داواکاریەکانی ئەم هەژمارەدا بکەن بە دەستی.",
-  "generic.saved": "پاشکەوتکرا",
-  "getting_started.developers": "پەرەپێدەران",
-  "getting_started.directory": "پەڕەی پرۆفایل",
-  "getting_started.documentation": "بەڵگەنامە",
-  "getting_started.heading": "دەست پێکردن",
-  "getting_started.invite": "بانگهێشتکردنی خەڵک",
-  "getting_started.open_source_notice": "ماستۆدۆن نەرمەکالایەکی سەرچاوەی کراوەیە. دەتوانیت بەشداری بکەیت یان گوزارشت بکەیت لەسەر کێشەکانی لە پەڕەی گیتهاب {github}.",
-  "getting_started.security": "ڕێکخستنەکانی هەژمارە",
-  "getting_started.terms": "مەرجەکانی خزمەتگوزاری",
-  "hashtag.column_header.tag_mode.all": "و {additional}",
-  "hashtag.column_header.tag_mode.any": "یا {additional}",
-  "hashtag.column_header.tag_mode.none": "بەبێ {additional}",
-  "hashtag.column_settings.select.no_options_message": "هیچ پێشنیارێک نەدۆزرایەوە",
-  "hashtag.column_settings.select.placeholder": "هاشتاگی تێبنووسە…",
-  "hashtag.column_settings.tag_mode.all": "هەموو ئەمانە",
-  "hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
-  "hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
-  "hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
-  "home.column_settings.basic": "بنەڕەتی",
-  "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
-  "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
-  "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
-  "home.show_announcements": "پیشاندانی راگەیەنراوەکان",
-  "intervals.full.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژەک}}",
-  "intervals.full.hours": "{number, plural, one {# کات} other {# کات}}",
-  "intervals.full.minutes": "{number, plural, one {# خولەک} other {# خولەک}}",
-  "keyboard_shortcuts.back": "بۆ گەڕانەوە",
-  "keyboard_shortcuts.blocked": "بۆ کردنەوەی لیستی بەکارهێنەرە بلۆککراوەکان",
-  "keyboard_shortcuts.boost": "بۆ بەهێزکردن",
-  "keyboard_shortcuts.column": "بۆ ئەوەی تیشک بخاتە سەر توتێک لە یەکێک لە ستوونەکان",
-  "keyboard_shortcuts.compose": "بۆ سەرنجدان بە نووسینی ناوچەی دەق",
-  "keyboard_shortcuts.description": "وه‌سف",
-  "keyboard_shortcuts.direct": "بۆ کردنەوەی ستوونی نامە ڕاستەوخۆکان",
-  "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا",
-  "keyboard_shortcuts.enter": "بۆ کردنەوەی توت",
-  "keyboard_shortcuts.favourite": "بۆ دڵخواز",
-  "keyboard_shortcuts.favourites": "بۆ کردنەوەی لیستی دڵخوازەکان",
-  "keyboard_shortcuts.federated": "بۆ کردنەوەی نووسراوەکانی هەمووشوێن",
-  "keyboard_shortcuts.heading": "قه‌دبڕەکانی تەختەکلیل",
-  "keyboard_shortcuts.home": "بۆ کردنەوەی هێڵی کاتی ماڵەوە",
-  "keyboard_shortcuts.hotkey": "هۆتکەی",
-  "keyboard_shortcuts.legend": "بۆ نیشاندانی ئەم نیشانە",
-  "keyboard_shortcuts.local": "بۆ کردنەوەی نووسراوەکانی خۆماڵی",
-  "keyboard_shortcuts.mention": "نۆ ناوبردن لە نووسەر",
-  "keyboard_shortcuts.muted": "بۆ کردنەوەی پێرستی بەکارهێنەرانی بێدەنگ",
-  "keyboard_shortcuts.my_profile": "بۆ کردنەوەی پرۆفایڵ",
-  "keyboard_shortcuts.notifications": "بۆ کردنەوەی ستوونی ئاگانامەکان",
-  "keyboard_shortcuts.open_media": "بۆ کردنەوەی میدیا",
-  "keyboard_shortcuts.pinned": "بۆ کردنەوەی لیستی توتەکانی چەسپێنراو",
-  "keyboard_shortcuts.profile": "بۆ کردنەوەی پرۆفایڵی نووسەر",
-  "keyboard_shortcuts.reply": "بۆ وەڵامدانەوە",
-  "keyboard_shortcuts.requests": "بۆ کردنەوەی لیستی داواکاریەکانی بەدوادا",
-  "keyboard_shortcuts.search": "بۆ جەختکردن لەسەر گەڕان",
-  "keyboard_shortcuts.spoilers": "بۆ پیشاندان/شاردنەوەی خانەی CW",
-  "keyboard_shortcuts.start": "بۆ کردنەوەی ستوونی \"دەست پێبکە\"",
-  "keyboard_shortcuts.toggle_hidden": "بۆ پیشاندان/شاردنەوەی دەق لە پشت CW",
-  "keyboard_shortcuts.toggle_sensitivity": "بۆ پیشاندان/شاردنەوەی میدیا",
-  "keyboard_shortcuts.toot": "بۆ دەست کردن بە براندێکی تازە",
-  "keyboard_shortcuts.unfocus": "بۆ دروستکردنی ناوچەی دەق/گەڕان",
-  "keyboard_shortcuts.up": "بۆ ئەوەی لە لیستەکەدا بڕۆیت",
-  "lightbox.close": "دابخە",
-  "lightbox.compress": "سندوقی نیشاندانی وێنە بپەستێنە",
-  "lightbox.expand": "فراوانکردنی سندوقی بینینی وێنە",
-  "lightbox.next": "داهاتوو",
-  "lightbox.previous": "پێشوو",
-  "lists.account.add": "زیادکردن بۆ لیست",
-  "lists.account.remove": "لابردن لە لیست",
-  "lists.delete": "سڕینەوەی لیست",
-  "lists.edit": "دەستکاری لیست",
-  "lists.edit.submit": "گۆڕینی ناونیشان",
-  "lists.new.create": "زیادکردنی لیست",
-  "lists.new.title_placeholder": "ناونیشانی لیستی نوێ",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "پیشاندانی وەڵامەکان بۆ:",
-  "lists.search": "بگەڕێ لەناو ئەو کەسانەی کە شوێنیان کەوتویت",
-  "lists.subheading": "لیستەکانت",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "بارکردن...",
-  "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
-  "missing_indicator.label": "نەدۆزرایەوە",
-  "missing_indicator.sublabel": "ئەو سەرچاوەیە نادۆزرێتەوە",
-  "mute_modal.duration": "ماوە",
-  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
-  "mute_modal.indefinite": "نادیار",
-  "navigation_bar.apps": "بەرنامەی مۆبایل",
-  "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
-  "navigation_bar.bookmarks": "نیشانکراوەکان",
-  "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
-  "navigation_bar.compose": "نووسینی توتی نوێ",
-  "navigation_bar.direct": "نامە ڕاستەوخۆکان",
-  "navigation_bar.discover": "دۆزینەوە",
-  "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
-  "navigation_bar.favourites": "دڵخوازەکان",
-  "navigation_bar.filters": "وشە کپەکان",
-  "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
-  "navigation_bar.follows_and_followers": "شوێنکەوتوو و شوێنکەوتوان",
-  "navigation_bar.info": "دەربارەی ئەم ڕاژە",
-  "navigation_bar.keyboard_shortcuts": "هۆتکەی",
-  "navigation_bar.lists": "لیستەکان",
-  "navigation_bar.logout": "دەرچوون",
-  "navigation_bar.mutes": "کپکردنی بەکارهێنەران",
-  "navigation_bar.personal": "کەسی",
-  "navigation_bar.pins": "توتی چەسپاو",
-  "navigation_bar.preferences": "پەسەندەکان",
-  "navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
-  "navigation_bar.security": "ئاسایش",
-  "notification.favourite": "{name} نووسراوەکەتی پەسەند کرد",
-  "notification.follow": "{name} دوای تۆ کەوت",
-  "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت",
-  "notification.mention": "{name} باسی ئێوەی کرد",
-  "notification.own_poll": "ڕاپرسیەکەت کۆتایی هات",
-  "notification.poll": "ڕاپرسییەک کە دەنگی پێداویت کۆتایی هات",
-  "notification.reblog": "{name} نووسراوەکەتی دووبارە توتاند",
-  "notification.status": "{name} تازە بڵاوکرایەوە",
-  "notifications.clear": "ئاگانامەکان بسڕیەوە",
-  "notifications.clear_confirmation": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی هەموو ئاگانامەکانت بسڕیتەوە?",
-  "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
-  "notifications.column_settings.favourite": "دڵخوازترین:",
-  "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
-  "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
-  "notifications.column_settings.filter_bar.show": "نیشاندان",
-  "notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
-  "notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
-  "notifications.column_settings.mention": "ئاماژەکان:",
-  "notifications.column_settings.poll": "ئەنجامەکانی ڕاپرسی:",
-  "notifications.column_settings.push": "ئاگانامەکان پاڵ بنێ",
-  "notifications.column_settings.reblog": "دووبارەتوتەکان:",
-  "notifications.column_settings.show": "لە ستووندا پیشان بدە",
-  "notifications.column_settings.sound": "لێدانی دەنگ",
-  "notifications.column_settings.status": "توتەکانی نوێ:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "هەموو",
-  "notifications.filter.boosts": "دووبارەتوتەکان",
-  "notifications.filter.favourites": "دڵخوازەکان",
-  "notifications.filter.follows": "شوێنکەوتن",
-  "notifications.filter.mentions": "ئاماژەکان",
-  "notifications.filter.polls": "ئەنجامەکانی ڕاپرسی",
-  "notifications.filter.statuses": "نوێکردنەوەکان ئەو کەسانەی کە پەیڕەوی دەکەیت",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} ئاگانامە",
-  "notifications.mark_as_read": "هەموو ئاگانامەکان وەک خوێندراوەتەوە نیشان بکە",
-  "notifications.permission_denied": "ناتوانرێت ئاگانامەکانی دێسکتۆپ چالاک بکرێت وەک ڕێپێدان ڕەتکرایەوە.",
-  "notifications.permission_denied_alert": "ناتوانرێت ئاگانامەکانی دێسکتۆپ چالاک بکرێت، چونکە پێشتر مۆڵەتی وێبگەڕ ڕەتکرایەوە",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "چالاککردنی ئاگانامەکانی دێسکتۆپ",
-  "notifications_permission_banner.how_to_control": "بۆ وەرگرتنی ئاگانامەکان کاتێک ماستۆدۆن نەکراوەیە، ئاگانامەکانی دێسکتۆپ چالاک بکە. دەتوانیت بە وردی کۆنترۆڵی جۆری کارلێکەکان بکەیت کە ئاگانامەکانی دێسکتۆپ دروست دەکەن لە ڕێگەی دوگمەی {icon} لەسەرەوە کاتێک چالاک دەکرێن.",
-  "notifications_permission_banner.title": "هەرگیز شتێک لە دەست مەدە",
-  "picture_in_picture.restore": "بیگەڕێنەوە",
-  "poll.closed": "دابخە",
-  "poll.refresh": "نوێکردنەوە",
-  "poll.total_people": "{count, plural, one {# خەڵک} other {# خەڵک}}",
-  "poll.total_votes": "{count, plural, one {# دەنگ} other {# دەنگ}}\n",
-  "poll.vote": "دەنگ",
-  "poll.voted": "تۆ دەنگت بەو وەڵامە دا",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
-  "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
-  "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
-  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "ڕاستەوخۆ",
-  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنها بۆ شوێنکەوتوان",
-  "privacy.public.long": "بۆ هەمووان دیاربێت، لە هێڵی کاتی گشتی دا نیشان دەدرێت",
-  "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە هێڵی کاتی گشتیدا نا",
-  "privacy.unlisted.short": "لە لیست نەکراو",
-  "refresh": "نوێکردنەوە",
-  "regeneration_indicator.label": "بارکردن…",
-  "regeneration_indicator.sublabel": "ڕاگەیەنەری ماڵەوەت ئامادە دەکرێت!",
-  "relative_time.days": "{number}ڕۆژ",
-  "relative_time.hours": "{number}کات",
-  "relative_time.just_now": "ئێستا",
-  "relative_time.minutes": "{number}کات",
-  "relative_time.seconds": "{number}کات",
-  "relative_time.today": "ئیمڕۆ",
-  "reply_indicator.cancel": "هەڵوەشاندنەوه",
-  "report.forward": "ناردن بۆ {target}",
-  "report.forward_hint": "هەژمارەکە لە ڕاژەیەکی ترە. ڕونووسێکی نەناسراو بنێرە بۆ گوزارشت لەوێ?",
-  "report.hint": "گوزارشتەکە دەنێردرێت بۆ بەرپرسانی ڕاژەکەت. دەتوانیت ڕوونکردنەوەیەک پێشکەش بکەیت کە بۆچی ئەم هەژمارە لە خوارەوە گوزارش دەکەیت:",
-  "report.placeholder": "سەرنجەکانی زیاتر",
-  "report.submit": "ناردن",
-  "report.target": "گوزارشتکردنی{target}",
-  "search.placeholder": "گەڕان",
-  "search_popout.search_format": "شێوەی گەڕانی پێشکەوتوو",
-  "search_popout.tips.full_text": "گەڕانێکی دەقی سادە دەتوانێت توتەکانی ئێوە کە، نووسیوتانە،پەسەنتان کردووە، دووبارەتانکردووە، یان ئەو توتانە کە باسی ئێوەی تێدا کراوە پەیدا دەکا. هەروەها ناوی بەکارهێنەران، ناوی پیشاندراو و هەشتەگەکانیش لە خۆ دەگرێت.",
-  "search_popout.tips.hashtag": "هەشتاگ",
-  "search_popout.tips.status": "توت",
-  "search_popout.tips.text": "دەقی سادە هەڵدەسێ بە گەڕاندنەوەی هاوتایی ناوی پیشاندان، ناوی بەکارهێنەر و هاشتاگەکان",
-  "search_popout.tips.user": "بەکارهێنەر",
-  "search_results.accounts": "خەڵک",
-  "search_results.hashtags": "هەشتاگ",
-  "search_results.statuses": "توتەکان",
-  "search_results.statuses_fts_disabled": "گەڕانی توتەکان بە ناوەڕۆکیان لەسەر ئەم ڕاژەی ماستۆدۆن چالاک نەکراوە.",
-  "search_results.total": "{count, number} {count, plural, one {دەرئەنجام} other {دەرئەنجام}}",
-  "status.admin_account": "کردنەوەی میانڕەوی بەڕێوەبەر بۆ @{name}",
-  "status.admin_status": "ئەم توتە بکەوە لە ناو ڕووکاری بەڕیوەبەر",
-  "status.block": "بلۆکی @{name}",
-  "status.bookmark": "نیشانه",
-  "status.cancel_reblog_private": "بێبەهێزکردن",
-  "status.cannot_reblog": "ئەم بابەتە ناتوانرێت بەرزبکرێتەوە",
-  "status.copy": "ڕوونووسی بەستەر بۆ توت",
-  "status.delete": "سڕینەوە",
-  "status.detailed_status": "ڕوانگەی گفتوگۆ بە وردەکاری",
-  "status.direct": "پەیامی ڕاستەوخۆ @{name}",
-  "status.embed": "نیشتەجێ بکە",
-  "status.favourite": "دڵخواز",
-  "status.filtered": "پاڵاوتن",
-  "status.load_more": "بارکردنی زیاتر",
-  "status.media_hidden": "میدیای شاراوە",
-  "status.mention": "ناوبنێ @{name}",
-  "status.more": "زیاتر",
-  "status.mute": "بێدەنگکردن @{name}",
-  "status.mute_conversation": "گفتوگۆی بێدەنگ",
-  "status.open": "ئەم توتە فراوان بکە",
-  "status.pin": "لکاندن لەسەر پرۆفایل",
-  "status.pinned": "توتی چەسپکراو",
-  "status.read_more": "زیاتر بخوێنەوە",
-  "status.reblog": "بەهێزکردن",
-  "status.reblog_private": "بەهێزکردن بۆ بینەرانی سەرەتایی",
-  "status.reblogged_by": "{name} توتی کردەوە",
-  "status.reblogs.empty": "کەس ئەم توتەی دووبارە نەتوتاندوە ،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.",
-  "status.redraft": "سڕینەوەی و دووبارە ڕەشنووس",
-  "status.remove_bookmark": "لابردنی نیشانه",
-  "status.reply": "وەڵام",
-  "status.replyAll": "بە نووسراوە وەڵام بدەوە",
-  "status.report": "گوزارشت @{name}",
-  "status.sensitive_warning": "ناوەڕۆکی هەستیار",
-  "status.share": "هاوبەش کردن",
-  "status.show_less": "کەمتر نیشان بدە",
-  "status.show_less_all": "کەمتر نیشان بدە بۆ هەمووی",
-  "status.show_more": "زیاتر پیشان بدە",
-  "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
-  "status.show_thread": "نیشاندانی گفتوگۆ",
-  "status.uncached_media_warning": "بەردەست نیە",
-  "status.unmute_conversation": "گفتوگۆی بێدەنگ",
-  "status.unpin": "لابردن لە پرۆفایل",
-  "suggestions.dismiss": "ڕەتکردنەوەی پێشنیار",
-  "suggestions.header": "لەوانەیە حەزت لەمەش بێت…",
-  "tabs_bar.federated_timeline": "گشتی",
-  "tabs_bar.home": "سەرەتا",
-  "tabs_bar.local_timeline": "ناوخۆیی",
-  "tabs_bar.notifications": "ئاگادارییەکان",
-  "tabs_bar.search": "گەڕان",
-  "time_remaining.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژ}} ماوە",
-  "time_remaining.hours": "{number, plural, one {# کات} other {# کات}} ماوە",
-  "time_remaining.minutes": "{number, plural, one {# خۆلەک} other {# خولەک}} ماوە",
-  "time_remaining.moments": "ئەو ساتانەی ماونەتەوە",
-  "time_remaining.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
-  "timeline_hint.remote_resource_not_displayed": "{resource} لە ڕاژەکانی ترەوە پیشان نادرێت.",
-  "timeline_hint.resources.followers": "شوێنکەوتووان",
-  "timeline_hint.resources.follows": "شوێنکەوتن",
-  "timeline_hint.resources.statuses": "توتی کۆن",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} کەس} other {{counter} کەس}} گفتوگۆ دەکا",
-  "trends.trending_now": "گۆگران",
-  "ui.beforeunload": "ڕەشنووسەکەت لە دەست دەچێت ئەگەر لە ماستۆدۆن بڕۆیت.",
-  "units.short.billion": "{count}ملیار",
-  "units.short.million": "{count}ملیۆن",
-  "units.short.thousand": "{count}هەزار",
-  "upload_area.title": "ڕاکێشان & دانان بۆ بارکردن",
-  "upload_button.label": "زیادکردنی وێنەکان، ڤیدیۆیەک یان فایلێکی دەنگی",
-  "upload_error.limit": "سنووری بارکردنی فایل تێپەڕیوە.",
-  "upload_error.poll": "پەڕگەکە ڕێی پێنەدراوە بە ڕاپرسی باربکرێت.",
-  "upload_form.audio_description": "بۆ ئەو کەسانەی کە گوێ بیستیان هەیە وەسف دەکات",
-  "upload_form.description": "وەسف بکە بۆ کەمبینایان",
-  "upload_form.edit": "دەستکاری",
-  "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "سڕینەوە",
-  "upload_form.video_description": "بۆ کەم بینایان و کەم بیستان وەسفی بکە",
-  "upload_modal.analyzing_picture": "شیکردنەوەی وێنە…",
-  "upload_modal.apply": "جێبەجێ کردن",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "وێنە هەڵبژێرە",
-  "upload_modal.description_placeholder": "بە دڵ کەین با بە نەشئەی مەی غوباری میحنەتی دونیا",
-  "upload_modal.detect_text": "دەقی وێنەکە بدۆزیەوە",
-  "upload_modal.edit_media": "دەستکاریکردنی میدیا",
-  "upload_modal.hint": "گەر وێنە چکۆلە یان بڕاوەبێت، خاڵی ناوەندی دیار دەکەوێت. خاڵی ناوەندی وێنە بە کرتە یان جێبەجیکردنی رێکبخەن.",
-  "upload_modal.preparing_ocr": "ئامادەکردنی OCR…",
-  "upload_modal.preview_label": "پێشبینی ({ratio})",
-  "upload_progress.label": "بارکردن...",
-  "video.close": "داخستنی ڤیدیۆ",
-  "video.download": "داگرتنی فایل",
-  "video.exit_fullscreen": "دەرچوون لە پڕ شاشە",
-  "video.expand": "ڤیدیۆفراوان بکە",
-  "video.fullscreen": "پڕپیشانگەر",
-  "video.hide": "شاردنەوەی ڤیدیۆ",
-  "video.mute": "دەنگی کپ",
-  "video.pause": "وەستان",
-  "video.play": "پەخشکردن",
-  "video.unmute": "دەنگ لابدە"
+  "compose_form.save_changes": "Guhertinan tomar bike",
+  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
+  "compose_form.spoiler.marked": "Hişyariya naverokê rake",
+  "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
+  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
+  "confirmation_modal.cancel": "Dev jê berde",
+  "confirmations.block.block_and_report": "Asteng bike & ragihîne",
+  "confirmations.block.confirm": "Asteng bike",
+  "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
+  "confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
+  "confirmations.cancel_follow_request.message": "Tu dixwazî ​​daxwaza xwe ya şopandina {name} vekşînî?",
+  "confirmations.delete.confirm": "Jê bibe",
+  "confirmations.delete.message": "Ma tu dixwazî vê şandiyê jê bibî?",
+  "confirmations.delete_list.confirm": "Jê bibe",
+  "confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
+  "confirmations.discard_edit_media.confirm": "Biavêje",
+  "confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
+  "confirmations.domain_block.confirm": "Tevahiya navperê asteng bike",
+  "confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
+  "confirmations.logout.confirm": "Derkeve",
+  "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
+  "confirmations.mute.confirm": "Bêdeng bike",
+  "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
+  "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
+  "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
+  "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û ji nû ve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.",
+  "confirmations.reply.confirm": "Bersivê bide",
+  "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
+  "confirmations.unfollow.confirm": "Neşopîne",
+  "confirmations.unfollow.message": "Ma tu dixwazî ku dev ji şopa {name} berdî?",
+  "conversation.delete": "Axaftinê jê bibe",
+  "conversation.mark_as_read": "Wekî xwendî nîşan bide",
+  "conversation.open": "Axaftinê nîşan bide",
+  "conversation.with": "Bi {names} re",
+  "copypaste.copied": "Hate jêgirtin",
+  "copypaste.copy": "Jê bigire",
+  "directory.federated": "Ji fediversên naskirî",
+  "directory.local": "Tenê ji {domain}",
+  "directory.new_arrivals": "Kesên ku nû hatine",
+  "directory.recently_active": "Di demên dawî de çalak",
+  "disabled_account_banner.account_settings": "Sazkariyên ajimêr",
+  "disabled_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e.",
+  "dismissable_banner.community_timeline": "Ev şandiyên giştî yên herî dawî ji kesên ku ajimêrê wan ji aliyê {domain} ve têne pêşkêşkirin.",
+  "dismissable_banner.dismiss": "Paşguh bike",
+  "dismissable_banner.explore_links": "Ev çîrokên nûçeyan niha li ser vê û rajekarên din ên tora nenavendî ji aliyê mirovan ve têne axaftin.",
+  "dismissable_banner.explore_statuses": "Ev şandiyên ji vê û rajekarên din ên di tora nenavendî de niha li ser vê rajekarê balê dikşînin.",
+  "dismissable_banner.explore_tags": "Ev hashtagên ji vê û rajekarên din ên di tora nenavendî de niha li ser vê rajekarê balê dikşînin.",
+  "dismissable_banner.public_timeline": "Ev şandiyên gelemperî herî dawî yên mirovên li ser vê û rajekarên din ên tora nenavendî ne ku ev rajekar pê tê nasîn.",
+  "embed.instructions": "Bi jêgirtina koda jêrîn vê şandiyê li ser malpera xwe bicîh bikin.",
+  "embed.preview": "Wa ye wê wusa xuya bike:",
+  "emoji_button.activity": "Çalakî",
+  "emoji_button.clear": "Pak bike",
+  "emoji_button.custom": "Kesanekirî",
+  "emoji_button.flags": "Al",
+  "emoji_button.food": "Xwarin û vexwarin",
+  "emoji_button.label": "Emoji têxe",
+  "emoji_button.nature": "Sirûştî",
+  "emoji_button.not_found": "Hestokên lihevhatî nehate dîtin",
+  "emoji_button.objects": "Tişt",
+  "emoji_button.people": "Mirov",
+  "emoji_button.recent": "Pir caran tê bikaranîn",
+  "emoji_button.search": "Bigere...",
+  "emoji_button.search_results": "Encamên lêgerînê",
+  "emoji_button.symbols": "Sembol",
+  "emoji_button.travel": "Geşt û şûn",
+  "empty_column.account_suspended": "Ajimêr hatiye rawestandin",
+  "empty_column.account_timeline": "Li vir şandî tune!",
+  "empty_column.account_unavailable": "Profîl nayê peydakirin",
+  "empty_column.blocks": "Te tu bikarhêner asteng nekiriye.",
+  "empty_column.bookmarked_statuses": "Hîn tu peyamên te yên şûnpelkirî tune ne. Dema ku tu yekî şûnpel bikî, ew ê li vir xuya bibe.",
+  "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!",
+  "empty_column.direct": "Hîn peyamên te yên rasterast tune ne. Dema ku tu yekî bişînî an jî wergirî, ew ê li vir xuya bibe.",
+  "empty_column.domain_blocks": "Hîn tu navperên ku hatine astengkirin tune ne.",
+  "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!",
+  "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
+  "empty_column.favourites": "Hîn tu kes vê peyamê nebijartiye. Gava ku hin kes bijartin, ew ê li vir xûya bikin.",
+  "empty_column.follow_recommendations": "Wusa dixuye ku ji bo we tu pêşniyar nehatine çêkirin. Hûn dikarin lêgerînê bikarbînin da ku li kesên ku hûn nas dikin bigerin an hashtagên trendî bigerin.",
+  "empty_column.follow_requests": "Hê jî daxwaza şopandinê tunne ye. Dema daxwazek hat, yê li vir were nîşan kirin.",
+  "empty_column.hashtag": "Di vê hashtagê de hêj tiştekî tune.",
+  "empty_column.home": "Rojeva demnameya te vala ye! Ji bona tijîkirinê bêtir mirovan bişopîne. {suggestions}",
+  "empty_column.home.suggestions": "Hinek pêşniyaran bibîne",
+  "empty_column.list": "Di vê lîsteyê de hîn tiştek tune ye. Gava ku endamên vê lîsteyê peyamên nû biweşînin, ew ê li virê xuya bibin.",
+  "empty_column.lists": "Hîn tu lîsteyên te tune ne. Dema yekê çêkî, ew ê li virê xuya bibe.",
+  "empty_column.mutes": "Te tu bikarhêner bêdeng nekiriye.",
+  "empty_column.notifications": "Hêj hişyariyên te tunene. Dema ku mirovên din bi we re têkilî danîn, hûn ê wê li vir bibînin.",
+  "empty_column.public": "Li vir tiştekî tuneye! Ji raya giştî re tiştekî binivîsîne, an ji bo tijîkirinê ji rajekerên din bikarhêneran bi destan bişopînin",
+  "error.unexpected_crash.explanation": "Ji ber xeletîyeke di koda me da an jî ji ber mijara lihevhatina gerokan, ev rûpel rast nehat nîşandan.",
+  "error.unexpected_crash.explanation_addons": "Ev rûpel bi awayekî rast nehat nîşandan. Ev çewtî mimkûn e ji ber lêzêdekirina gerokan an jî amûrên wergera xweberî pêk tê.",
+  "error.unexpected_crash.next_steps": "Nûkirina rûpelê biceribîne. Ku ev bi kêr neyê, dibe ku te hîn jî bi riya gerokeke cuda an jî sepana xwecîhî ya Mastodon bi kar bînî.",
+  "error.unexpected_crash.next_steps_addons": "Neçalakkirin û nûkirina rûpelê biceribîne. Ku ev bi kêr neyê, dibe ku te hîn jî bi riya gerokeke cuda an jî sepana xwecihî ya Mastodon bi kar bînî.",
+  "errors.unexpected_crash.copy_stacktrace": "Şopa gemara (stacktrace) tûrikê ra jê bigire",
+  "errors.unexpected_crash.report_issue": "Pirsgirêkekê ragihîne",
+  "explore.search_results": "Encamên lêgerînê",
+  "explore.suggested_follows": "Ji bo te",
+  "explore.title": "Vekole",
+  "explore.trending_links": "Nûçe",
+  "explore.trending_statuses": "Şandî",
+  "explore.trending_tags": "Hashtag",
+  "filter_modal.added.context_mismatch_explanation": "Ev beşa parzûnê ji bo naveroka ku te tê de xwe gihandiye vê şandiyê nayê sepandin. Ku tu dixwazî şandî di vê naverokê de jî werê parzûnkirin, divê tu parzûnê biguherînî.",
+  "filter_modal.added.context_mismatch_title": "Naverok li hev nagire!",
+  "filter_modal.added.expired_explanation": "Ev beşa parzûnê qediya ye, ji bo ku tu bikaribe wê biguherîne divê tu dema qedandinê biguherînî.",
+  "filter_modal.added.expired_title": "Dema parzûnê qediya!",
+  "filter_modal.added.review_and_configure": "Ji bo nîrxandin û bêtir sazkirina vê beşa parzûnê, biçe {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Sazkariyên parzûnê",
+  "filter_modal.added.settings_link": "rûpela sazkariyan",
+  "filter_modal.added.short_explanation": "Ev şandî li beşa parzûna jêrîn hate tevlîkirin: {title}.",
+  "filter_modal.added.title": "Parzûn tevlî bû!",
+  "filter_modal.select_filter.context_mismatch": "di vê naverokê de nayê sepandin",
+  "filter_modal.select_filter.expired": "dema wê qediya",
+  "filter_modal.select_filter.prompt_new": "Beşa nû: {name}",
+  "filter_modal.select_filter.search": "Lê bigere an jî biafirîne",
+  "filter_modal.select_filter.subtitle": "Beşeke nû ya heyî bi kar bîne an jî yekî nû biafirîne",
+  "filter_modal.select_filter.title": "Vê şandiyê parzûn bike",
+  "filter_modal.title.status": "Şandiyekê parzûn bike",
+  "follow_recommendations.done": "Qediya",
+  "follow_recommendations.heading": "Mirovên ku tu dixwazî ji wan peyaman bibînî bişopîne! Hin pêşnîyar li vir in.",
+  "follow_recommendations.lead": "Li gorî rêza kronolojîkî peyamên mirovên ku tu dişopînî dê demnameya te de xûya bike. Ji xeletiyan netirse, bi awayekî hêsan her wextî tu dikarî dev ji şopandinê berdî!",
+  "follow_request.authorize": "Mafê bide",
+  "follow_request.reject": "Nepejirîne",
+  "follow_requests.unlocked_explanation": "Tevlî ku ajimêra te ne kilît kiriye, karmendên {domain} digotin qey tu dixwazî ku pêşdîtina daxwazên şopandinê bi destan bike.",
+  "footer.about": "Derbar",
+  "footer.directory": "Pelrêça profîlan",
+  "footer.get_app": "Bernamokê bistîne",
+  "footer.invite": "Mirovan vexwîne",
+  "footer.keyboard_shortcuts": "Kurteriyên klavyeyê",
+  "footer.privacy_policy": "Peymana nepeniyê",
+  "footer.source_code": "Koda çavkanî nîşan bide",
+  "generic.saved": "Tomarkirî",
+  "getting_started.heading": "Destpêkirin",
+  "hashtag.column_header.tag_mode.all": "û {additional}",
+  "hashtag.column_header.tag_mode.any": "an {additional}",
+  "hashtag.column_header.tag_mode.none": "bêyî {additional}",
+  "hashtag.column_settings.select.no_options_message": "Ti pêşniyar nehatin dîtin",
+  "hashtag.column_settings.select.placeholder": "Têkeve hashtagê…",
+  "hashtag.column_settings.tag_mode.all": "Van hemûyan",
+  "hashtag.column_settings.tag_mode.any": "Yek ji van",
+  "hashtag.column_settings.tag_mode.none": "Ne yek ji van",
+  "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
+  "hashtag.follow": "Hashtagê bişopîne",
+  "hashtag.unfollow": "Hashtagê neşopîne",
+  "home.column_settings.basic": "Bingehîn",
+  "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
+  "home.column_settings.show_replies": "Bersivan nîşan bide",
+  "home.hide_announcements": "Reklaman veşêre",
+  "home.show_announcements": "Reklaman nîşan bide",
+  "interaction_modal.description.favourite": "Bi ajimêrek li ser Mastodon re, tu dikarî vê şandiyê bijarte bikî da ku nivîskar bizanibe ku tu wê/î re rêzê digirî û wê ji bo paşê biparêzî.",
+  "interaction_modal.description.follow": "Bi ajimêrekê li ser Mastodon, tu dikarî {name} bişopînî da ku şandiyan li ser rojeva rûpela xwe bi dest bixe.",
+  "interaction_modal.description.reblog": "Bi ajimêrekê li ser Mastodon, tu dikarî vê şandiyê bilind bikî da ku wê bi şopînerên xwe re parve bikî.",
+  "interaction_modal.description.reply": "Bi ajimêrekê li ser Mastodon, tu dikarî bersiva vê şandiyê bidî.",
+  "interaction_modal.on_another_server": "Li ser rajekareke cuda",
+  "interaction_modal.on_this_server": "Li ser ev rajekar",
+  "interaction_modal.other_server_instructions": "Vê girêdanê jê bigire û pêve bike di zeviya lêgerînê de ji sepana xwe ya Mastodon a bijartekirî yan jî navrûyê bikarhêneriyê ya tevnê ji rajekarê Mastodon.",
+  "interaction_modal.preamble": "Ji ber ku Mastodon nenavendî ye, tu dikarî ajimêrê xwe ya heyî ku ji aliyê rajekarek din a Mastodon an platformek lihevhatî ve hatî pêşkêşkirin bi kar bînî ku ajimêrê te li ser vê yekê tune be.",
+  "interaction_modal.title.favourite": "Şandiyê {name} bijarte bike",
+  "interaction_modal.title.follow": "{name} bişopîne",
+  "interaction_modal.title.reblog": "Şandiyê {name} bilind bike",
+  "interaction_modal.title.reply": "Bersivê bide şandiyê {name}",
+  "intervals.full.days": "{number, plural, one {# roj} other {# roj}}",
+  "intervals.full.hours": "{number, plural, one {# demjimêr} other {# demjimêr}}\n \n",
+  "intervals.full.minutes": "{number, plural, one {# xulek} other {# xulek}}",
+  "keyboard_shortcuts.back": "Vegere paşê",
+  "keyboard_shortcuts.blocked": "Lîsteya bikarhênerên astengkirî veke",
+  "keyboard_shortcuts.boost": "Şandiyê bilind bike",
+  "keyboard_shortcuts.column": "Stûna balkişandinê",
+  "keyboard_shortcuts.compose": "Bal bikşîne cîhê nivîsê/textarea",
+  "keyboard_shortcuts.description": "Danasîn",
+  "keyboard_shortcuts.direct": "ji bo vekirina stûnê peyamên rasterast",
+  "keyboard_shortcuts.down": "Di lîsteyê de dakêşe jêr",
+  "keyboard_shortcuts.enter": "Şandiyê veke",
+  "keyboard_shortcuts.favourite": "Şandiya bijarte",
+  "keyboard_shortcuts.favourites": "Rêzokê bijarteyan veke",
+  "keyboard_shortcuts.federated": "Demnameya giştî veke",
+  "keyboard_shortcuts.heading": "Kurterêyên klavyeyê",
+  "keyboard_shortcuts.home": "Demnameyê veke",
+  "keyboard_shortcuts.hotkey": "Kurte bişkok",
+  "keyboard_shortcuts.legend": "Vê çîrokê nîşan bike",
+  "keyboard_shortcuts.local": "Demnameya herêmî veke",
+  "keyboard_shortcuts.mention": "Qala nivîskarî/ê bike",
+  "keyboard_shortcuts.muted": "Lîsteya bikarhênerên bêdengkirî veke",
+  "keyboard_shortcuts.my_profile": "Profîla xwe veke",
+  "keyboard_shortcuts.notifications": "Stûnê agahdariyan veke",
+  "keyboard_shortcuts.open_media": "Medya veke",
+  "keyboard_shortcuts.pinned": "Şandiyên derzîkirî veke",
+  "keyboard_shortcuts.profile": "Profîla nivîskaran veke",
+  "keyboard_shortcuts.reply": "Bersivê bide şandiyê",
+  "keyboard_shortcuts.requests": "Lîsteya daxwazên şopandinê veke",
+  "keyboard_shortcuts.search": "Bal bide şivika lêgerînê",
+  "keyboard_shortcuts.spoilers": "Zeviya hişyariya naverokê nîşan bide/veşêre",
+  "keyboard_shortcuts.start": "Stûna \"destpêkê\" veke",
+  "keyboard_shortcuts.toggle_hidden": "Nivîsa paş hişyariya naverokê nîşan bide/veşêre",
+  "keyboard_shortcuts.toggle_sensitivity": "Medyayê nîşan bide/veşêre",
+  "keyboard_shortcuts.toot": "Dest bi şandiyeke nû bike",
+  "keyboard_shortcuts.unfocus": "Bal nede cîhê nivîsê /lêgerînê",
+  "keyboard_shortcuts.up": "Di lîsteyê de rake jor",
+  "lightbox.close": "Bigire",
+  "lightbox.compress": "Qutîya wêneya nîşan dike bitepisîne",
+  "lightbox.expand": "Qutîya wêneya nîşan dike fireh bike",
+  "lightbox.next": "Pêş",
+  "lightbox.previous": "Paş",
+  "limited_account_hint.action": "Bi heman awayî profîlê nîşan bide",
+  "limited_account_hint.title": "Profîl ji aliyê rêveberên {domain}ê ve hatiye veşartin.",
+  "lists.account.add": "Li lîsteyê zêde bike",
+  "lists.account.remove": "Ji lîsteyê rake",
+  "lists.delete": "Lîsteyê jê bibe",
+  "lists.edit": "Lîsteyê serrast bike",
+  "lists.edit.submit": "Sernavê biguherîne",
+  "lists.new.create": "Li lîsteyê zêde bike",
+  "lists.new.title_placeholder": "Sernavê lîsteya nû",
+  "lists.replies_policy.followed": "Bikarhênereke şopandî",
+  "lists.replies_policy.list": "Endamên lîsteyê",
+  "lists.replies_policy.none": "Ne yek",
+  "lists.replies_policy.title": "Bersivan nîşan bide:",
+  "lists.search": "Di navbera kesên ku te dişopînin bigere",
+  "lists.subheading": "Lîsteyên te",
+  "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
+  "loading_indicator.label": "Tê barkirin...",
+  "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
+  "missing_indicator.label": "Nehate dîtin",
+  "missing_indicator.sublabel": "Ev çavkanî nehat dîtin",
+  "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
+  "mute_modal.duration": "Dem",
+  "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
+  "mute_modal.indefinite": "Nediyar",
+  "navigation_bar.about": "Derbar",
+  "navigation_bar.blocks": "Bikarhênerên astengkirî",
+  "navigation_bar.bookmarks": "Şûnpel",
+  "navigation_bar.community_timeline": "Demnameya herêmî",
+  "navigation_bar.compose": "Şandiyeke nû binivsîne",
+  "navigation_bar.direct": "Peyamên rasterast",
+  "navigation_bar.discover": "Vekolê",
+  "navigation_bar.domain_blocks": "Navperên astengkirî",
+  "navigation_bar.edit_profile": "Profîlê serrast bike",
+  "navigation_bar.explore": "Vekole",
+  "navigation_bar.favourites": "Bijarte",
+  "navigation_bar.filters": "Peyvên bêdengkirî",
+  "navigation_bar.follow_requests": "Daxwazên şopandinê",
+  "navigation_bar.follows_and_followers": "Şopandin û şopîner",
+  "navigation_bar.lists": "Lîste",
+  "navigation_bar.logout": "Derkeve",
+  "navigation_bar.mutes": "Bikarhênerên bêdengkirî",
+  "navigation_bar.personal": "Kesanî",
+  "navigation_bar.pins": "Şandiya derzîkirî",
+  "navigation_bar.preferences": "Sazkarî",
+  "navigation_bar.public_timeline": "Demnameya giştî",
+  "navigation_bar.search": "Bigere",
+  "navigation_bar.security": "Ewlehî",
+  "not_signed_in_indicator.not_signed_in": "Divê tu têketinê bikî da ku tu bigihîjî vê çavkaniyê.",
+  "notification.admin.report": "{name} hate ragihandin {target}",
+  "notification.admin.sign_up": "{name} tomar bû",
+  "notification.favourite": "{name} şandiya te hez kir",
+  "notification.follow": "{name} te şopand",
+  "notification.follow_request": "{name} dixwazê te bişopîne",
+  "notification.mention": "{name} qale te kir",
+  "notification.own_poll": "Rapirsîya te qediya",
+  "notification.poll": "Rapirsiyeke ku te deng daye qediya",
+  "notification.reblog": "{name} şandiya te bilind kir",
+  "notification.status": "{name} niha şand",
+  "notification.update": "{name} şandiyek serrast kir",
+  "notifications.clear": "Agahdariyan pak bike",
+  "notifications.clear_confirmation": "Bi rastî tu dixwazî bi awayekî dawî hemû agahdariyên xwe pak bikî?",
+  "notifications.column_settings.admin.report": "Ragihandinên nû:",
+  "notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
+  "notifications.column_settings.alert": "Agahdariyên sermaseyê",
+  "notifications.column_settings.favourite": "Bijarte:",
+  "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
+  "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
+  "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
+  "notifications.column_settings.follow": "Şopînerên nû:",
+  "notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
+  "notifications.column_settings.mention": "Qalkirin:",
+  "notifications.column_settings.poll": "Encamên rapirsiyê:",
+  "notifications.column_settings.push": "Agahdarîyên yekser",
+  "notifications.column_settings.reblog": "Bilindkirî:",
+  "notifications.column_settings.show": "Di nav stûnê de nîşan bike",
+  "notifications.column_settings.sound": "Deng lêxe",
+  "notifications.column_settings.status": "Şandiyên nû:",
+  "notifications.column_settings.unread_notifications.category": "Agahdariyên nexwendî",
+  "notifications.column_settings.unread_notifications.highlight": "Agahiyên nexwendî nîşan bike",
+  "notifications.column_settings.update": "Serrastkirin:",
+  "notifications.filter.all": "Hemû",
+  "notifications.filter.boosts": "Bilindkirî",
+  "notifications.filter.favourites": "Bijarte",
+  "notifications.filter.follows": "Dişopîne",
+  "notifications.filter.mentions": "Qalkirin",
+  "notifications.filter.polls": "Encamên rapirsiyê",
+  "notifications.filter.statuses": "Ji kesên tu dişopînî re rojanekirin",
+  "notifications.grant_permission": "Destûrê bide.",
+  "notifications.group": "{count} agahdarî",
+  "notifications.mark_as_read": "Hemî agahdarîya wek xwendî nîşan bike",
+  "notifications.permission_denied": "Agahdarîyên sermaseyê naxebite ji ber ku berê de daxwazî ya destûr dayîna gerokê hati bû red kirin",
+  "notifications.permission_denied_alert": "Agahdarîyên sermaseyê nay çalak kirin, ji ber ku destûr kirina gerokê pêşî de hati bû red kirin",
+  "notifications.permission_required": "Agahdarîyên sermaseyê naxebite çunkî mafê pêwîst dike nehatiye dayîn.",
+  "notifications_permission_banner.enable": "Agahdarîyên sermaseyê çalak bike",
+  "notifications_permission_banner.how_to_control": "Da ku agahdariyên mastodon bistînî gava ne vekirî be. Agahdariyên sermaseyê çalak bike\n Tu dikarî agahdariyên sermaseyê bi rê ve bibî ku bi hemû cureyên çalakiyên ên ku agahdariyan rû didin ku bi riya tikandînê li ser bişkoka {icon} çalak dibe.",
+  "notifications_permission_banner.title": "Tu tiştî bîr neke",
+  "picture_in_picture.restore": "Vegerîne paş",
+  "poll.closed": "Girtî",
+  "poll.refresh": "Nû bike",
+  "poll.total_people": "{count, plural, one {# kes} other {# kes}}",
+  "poll.total_votes": "{count, plural, one {# deng} other {# deng}}",
+  "poll.vote": "Deng bide",
+  "poll.voted": "Te dengê xwe da vê bersivê",
+  "poll.votes": "{votes, plural, one {# deng} other {# deng}}",
+  "poll_button.add_poll": "Rapirsîyek zêde bike",
+  "poll_button.remove_poll": "Rapirsî yê rake",
+  "privacy.change": "Nepênîtiya şandiyan biguherîne",
+  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
+  "privacy.direct.short": "Tenê kesên qalkirî",
+  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
+  "privacy.private.short": "Tenê şopîneran",
+  "privacy.public.long": "Ji bo hemûyan xuyabar e",
+  "privacy.public.short": "Gelemperî",
+  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
+  "privacy.unlisted.short": "Nelîstekirî",
+  "privacy_policy.last_updated": "Rojanekirina dawî {date}",
+  "privacy_policy.title": "Politîka taybetiyê",
+  "refresh": "Nû bike",
+  "regeneration_indicator.label": "Tê barkirin…",
+  "regeneration_indicator.sublabel": "Naveroka rûpela sereke ya te tê amedekirin!",
+  "relative_time.days": "{number}r",
+  "relative_time.full.days": "{number, plural, one {# roj} other {# roj}} berê",
+  "relative_time.full.hours": "{number, plural, one {# demjimêr} other {# demjimêr}} berê",
+  "relative_time.full.just_now": "hema niha",
+  "relative_time.full.minutes": "{number, plural, one {# xulek} other {# xulek}} berê",
+  "relative_time.full.seconds": "{number, plural, one {# çirke} other {# çirke}} berê",
+  "relative_time.hours": "{number}d",
+  "relative_time.just_now": "niha",
+  "relative_time.minutes": "{number}x",
+  "relative_time.seconds": "{number}ç",
+  "relative_time.today": "îro",
+  "reply_indicator.cancel": "Dev jê berde",
+  "report.block": "Asteng bike",
+  "report.block_explanation": "Tu yê şandiyên wan nebînî. Ew ê nikaribin şandiyên te bibînin an jî te bişopînin. Ew ê bizanibin ku ew hatine astengkirin.",
+  "report.categories.other": "Yên din",
+  "report.categories.spam": "Nexwestî (Spam)",
+  "report.categories.violation": "Naverok yek an çend rêbazên rajekar binpê dike",
+  "report.category.subtitle": "Baştirîn lihevhatin hilbijêre",
+  "report.category.title": "Ji me re bêje ka çi diqewime bi vê {type} re",
+  "report.category.title_account": "profîl",
+  "report.category.title_status": "şandî",
+  "report.close": "Qediya",
+  "report.comment.title": "Tiştek din heye ku tu difikirî ku divê em zanibin?",
+  "report.forward": "Biçe bo {target}",
+  "report.forward_hint": "Ajimêr ji rajekareke din e. Tu kopîyeka anonîm ya raporê bişînî wir jî?",
+  "report.mute": "Bêdeng bike",
+  "report.mute_explanation": "Tê yê şandiyên wan nebînî. Ew hin jî dikarin te bişopînin û şandiyên te bibînin û wê nizanibin ku ew hatine bêdengkirin.",
+  "report.next": "Pêş",
+  "report.placeholder": "Şiroveyên zêde",
+  "report.reasons.dislike": "Ez jê hez nakim",
+  "report.reasons.dislike_description": "Ew ne tiştek e ku tu dixwazî bibînî",
+  "report.reasons.other": "Tiştekî din e",
+  "report.reasons.other_description": "Pirsgirêk di kategoriyên din de cih nagire",
+  "report.reasons.spam": "Ew spam e",
+  "report.reasons.spam_description": "Girêdanên xerab, tevlêbûna sexte, an jî bersivên dubarekirî",
+  "report.reasons.violation": "Ew rêzikên rajekar binpê dike",
+  "report.reasons.violation_description": "Tu dizanî ku ew rêzikên taybetiyê binpê dike",
+  "report.rules.subtitle": "Hemûyên ku têne sepandin hibijêre",
+  "report.rules.title": "Kîjan rêzik têne binpêkirin?",
+  "report.statuses.subtitle": "Hemûyên ku têne sepandin hibijêre",
+  "report.statuses.title": "Tu şandiyên ku vê ragihandinê piştgirî dikin hene?",
+  "report.submit": "Bişîne",
+  "report.target": "Ragihandin {target}",
+  "report.thanks.take_action": "Li vir vebijêrkên te hene ji bo kontrolkirina tiştê ku tu li se Mastodon dibînî:",
+  "report.thanks.take_action_actionable": "Dema ku em vê yekê dinirxînin, tu dikarî li dijî @{name} tedbîran bigirî:",
+  "report.thanks.title": "Tu naxwazî vê bibînî?",
+  "report.thanks.title_actionable": "Spas ji bo ragihandina te, em ê binirxînin.",
+  "report.unfollow": "@{name} neşopîne",
+  "report.unfollow_explanation": "Tê vê ajimêrê dişopînî. Ji bo ku êdî şandiyên wan di rojeva xwe de nebînî, wan neşopîne.",
+  "report_notification.attached_statuses": "{count, plural,one {{count} şandî} other {{count} şandî}} pêvekirî",
+  "report_notification.categories.other": "Ên din",
+  "report_notification.categories.spam": "Nexwestî (Spam)",
+  "report_notification.categories.violation": "Binpêkirina rêzîkê",
+  "report_notification.open": "Ragihandinê veke",
+  "search.placeholder": "Bigere",
+  "search.search_or_paste": "Bigere yan jî girêdanê pêve bike",
+  "search_popout.search_format": "Dirûva lêgerîna pêşketî",
+  "search_popout.tips.full_text": "Nivîsên hêsan, şandiyên ku te nivîsandiye, bijare kiriye, bilind kiriye an jî yên behsa te kirine û her wiha navê bikarhêneran, navên xûya dike û hashtagan vedigerîne.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "şandî",
+  "search_popout.tips.text": "Nivîsên hêsan, navên xûya ên ku li hev hatî, bikarhêner û hashtagan vedigerîne",
+  "search_popout.tips.user": "bikarhêner",
+  "search_results.accounts": "Mirov",
+  "search_results.all": "Hemû",
+  "search_results.hashtags": "Hashtag",
+  "search_results.nothing_found": "Ji bo van peyvên lêgerînê tiştek nehate dîtin",
+  "search_results.statuses": "Şandî",
+  "search_results.statuses_fts_disabled": "Di vê rajekara Mastodonê da lêgerîna şandîyên li gorî naveroka wan ne çalak e.",
+  "search_results.title": "Li {q} bigere",
+  "search_results.total": "{count, number} {count, plural, one {encam} other {encam}}",
+  "server_banner.about_active_users": "Kesên ku di van 30 rojên dawî de vê rajekarê bi kar tînin (Bikarhênerên Çalak ên Mehane)",
+  "server_banner.active_users": "bikarhênerên çalak",
+  "server_banner.administered_by": "Tê bi rêvebirin ji aliyê:",
+  "server_banner.introduction": "{domain} beşek ji tora civakî ya nenavendî ye bi hêzdariya {mastodon}.",
+  "server_banner.learn_more": "Bêtir fêr bibe",
+  "server_banner.server_stats": "Amarên rajekar:",
+  "sign_in_banner.create_account": "Ajimêr biafirîne",
+  "sign_in_banner.sign_in": "Têkeve",
+  "sign_in_banner.text": "Têkeve ji bo şopandina profîlan an hashtagan, bijartekirin, parvekirin û bersivdana şandiyan, an ji ajimêrê xwe li ser rajekarek cuda têkilî deyine.",
+  "status.admin_account": "Ji bo @{name} navrûya venihêrtinê veke",
+  "status.admin_status": "Vê şandîyê di navrûya venihêrtinê de veke",
+  "status.block": "@{name} asteng bike",
+  "status.bookmark": "Şûnpel",
+  "status.cancel_reblog_private": "Bilind neke",
+  "status.cannot_reblog": "Ev şandî nayê bilindkirin",
+  "status.copy": "Girêdanê jê bigire bo weşankirinê",
+  "status.delete": "Jê bibe",
+  "status.detailed_status": "Dîtina axaftina berfireh",
+  "status.direct": "Peyama rasterast @{name}",
+  "status.edit": "Serrast bike",
+  "status.edited": "Di {date} de hate serrastkirin",
+  "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
+  "status.embed": "Hedimandî",
+  "status.favourite": "Bijarte bike",
+  "status.filter": "Vê şandiyê parzûn bike",
+  "status.filtered": "Parzûnkirî",
+  "status.hide": "Şandiyê veşêre",
+  "status.history.created": "{name} {date} afirand",
+  "status.history.edited": "{name} {date} serrast kir",
+  "status.load_more": "Bêtir bar bike",
+  "status.media_hidden": "Medya veşartî ye",
+  "status.mention": "Qal @{name} bike",
+  "status.more": "Bêtir",
+  "status.mute": "@{name} bêdeng bike",
+  "status.mute_conversation": "Axaftinê bêdeng bike",
+  "status.open": "Vê şandiyê berferh bike",
+  "status.pin": "Li ser profîlê derzî bike",
+  "status.pinned": "Şandiya derzîkirî",
+  "status.read_more": "Bêtir bixwîne",
+  "status.reblog": "Bilind bike",
+  "status.reblog_private": "Bi dîtina resen bilind bike",
+  "status.reblogged_by": "{name} bilind kir",
+  "status.reblogs.empty": "Kesekî hin ev şandî bilind nekiriye. Gava kesek bilind bike, ew ên li vir werin xuyakirin.",
+  "status.redraft": "Jê bibe & ji nû ve reşnivîs bike",
+  "status.remove_bookmark": "Şûnpêlê jê rake",
+  "status.replied_to": "Bersiv da {name}",
+  "status.reply": "Bersivê bide",
+  "status.replyAll": "Mijarê bibersivîne",
+  "status.report": "@{name} ragihîne",
+  "status.sensitive_warning": "Naveroka hestiyarî",
+  "status.share": "Parve bike",
+  "status.show_filter_reason": "Bi her awayî nîşan bide",
+  "status.show_less": "Kêmtir nîşan bide",
+  "status.show_less_all": "Ji bo hemîyan kêmtir nîşan bide",
+  "status.show_more": "Bêtir nîşan bide",
+  "status.show_more_all": "Bêtir nîşan bide bo hemûyan",
+  "status.show_original": "A resen nîşan bide",
+  "status.translate": "Wergerîne",
+  "status.translated_from_with": "Ji {lang} hate wergerandin bi riya {provider}",
+  "status.uncached_media_warning": "Tune ye",
+  "status.unmute_conversation": "Axaftinê bêdeng neke",
+  "status.unpin": "Şandiya derzîkirî ji profîlê rake",
+  "subscribed_languages.lead": "Tenê şandiyên bi zimanên hilbijartî wê di rojev û demnameya te de wê xuya bibe û piştî guhertinê. Ji bo wergirtina şandiyan di hemû zimanan de ne yek hilbijêre.",
+  "subscribed_languages.save": "Guhertinan tomar bike",
+  "subscribed_languages.target": "Zimanên beşdarbûyî biguherîne ji bo {target}",
+  "suggestions.dismiss": "Pêşniyarê paşguh bike",
+  "suggestions.header": "Dibe ku bala te bikşîne…",
+  "tabs_bar.federated_timeline": "Giştî",
+  "tabs_bar.home": "Rûpela sereke",
+  "tabs_bar.local_timeline": "Herêmî",
+  "tabs_bar.notifications": "Agahdarî",
+  "time_remaining.days": "{number, plural, one {# roj} other {# roj}} maye",
+  "time_remaining.hours": "{number, plural, one {# demjimêr} other {# demjimêr}} maye",
+  "time_remaining.minutes": "{number, plural, one {# xulek} other {# xulek}} maye",
+  "time_remaining.moments": "Demên mayî",
+  "time_remaining.seconds": "{number, plural, one {# çirke} other {# çirke}} maye",
+  "timeline_hint.remote_resource_not_displayed": "{resource} Ji rajekerên din nayê dîtin.",
+  "timeline_hint.resources.followers": "Şopîner",
+  "timeline_hint.resources.follows": "Dişopîne",
+  "timeline_hint.resources.statuses": "Şandiyên kevn",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} berî {days, plural, one {roj} other {{days} roj}}",
+  "trends.trending_now": "Rojev",
+  "ui.beforeunload": "Ger ji Mastodonê veketi wê reşnivîsa te jî winda bibe.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}H",
+  "upload_area.title": "Ji bo barkirinê kaş bike û deyne",
+  "upload_button.label": "Wêne, vîdeoyek an jî pelê dengî tevlî bike",
+  "upload_error.limit": "Sînora barkirina pelan derbas bû.",
+  "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
+  "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
+  "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
+  "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
+  "upload_form.edit": "Serrast bike",
+  "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
+  "upload_form.undo": "Jê bibe",
+  "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
+  "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
+  "upload_modal.apply": "Bisepîne",
+  "upload_modal.applying": "Tê sepandin…",
+  "upload_modal.choose_image": "Wêneyê hilbijêre",
+  "upload_modal.description_placeholder": "Rovîyek qehweyî û bilez li ser kûçikê tîral banz dide",
+  "upload_modal.detect_text": "Ji nivîsa wêneyê re serwext be",
+  "upload_modal.edit_media": "Medyayê sererast bike",
+  "upload_modal.hint": "Ji bo hilbijartina xala navendê her tim dîmenê piçûk de pêşdîtina çerxê bitikîne an jî kaş bike.",
+  "upload_modal.preparing_ocr": "OCR dihê amadekirin…",
+  "upload_modal.preview_label": "Pêşdîtin ({ratio})",
+  "upload_progress.label": "Tê barkirin...",
+  "upload_progress.processing": "Kar tê kirin…",
+  "video.close": "Vîdyoyê bigire",
+  "video.download": "Pelê daxe",
+  "video.exit_fullscreen": "Ji dîmendera tijî derkeve",
+  "video.expand": "Vîdyoyê berferh bike",
+  "video.fullscreen": "Dimendera tijî",
+  "video.hide": "Vîdyo veşêre",
+  "video.mute": "Dengê qut bike",
+  "video.pause": "Rawestîne",
+  "video.play": "Vêxe",
+  "video.unmute": "Dengê qut neke"
 }
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 14dcd9618..50c970519 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Noten",
   "account.add_or_remove_from_list": "Keworra po Dilea a rolyow",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Lettya gorfarth {domain}",
   "account.blocked": "Lettys",
   "account.browse_more_on_origin_server": "Peuri moy y'n profil derowel",
-  "account.cancel_follow_request": "Dilea govyn holya",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Messach didro dhe @{name}",
   "account.disable_notifications": "Hedhi ow gwarnya pan wra @{name} postya",
   "account.domain_blocked": "Gorfarth lettys",
   "account.edit_profile": "Golegi profil",
   "account.enable_notifications": "Gwra ow gwarnya pan wra @{name} postya",
   "account.endorse": "Diskwedhes yn profil",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Holya",
   "account.followers": "Holyoryon",
   "account.followers.empty": "Ny wra nagonan holya'n devnydhyer ma hwath.",
   "account.followers_counter": "{count, plural, one {{counter} Holyer} other {{counter} Holyer}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {Ow holya {counter}} other {Ow holya {counter}}}",
   "account.follows.empty": "Ny wra'n devnydhyer ma holya nagonan hwath.",
   "account.follows_you": "Y'th hol",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Kudha kenerthow a @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Bew diwettha",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Perghenogeth an kolm ma a veu checkys dhe {date}",
   "account.locked_info": "Studh privetter an akont ma yw alhwedhys. An perghen a wra dasweles dre leuv piw a yll aga holya.",
   "account.media": "Myski",
   "account.mention": "Meneges @{name}",
-  "account.moved_to": "{name} a wrug movya dhe:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Tawhe @{name}",
   "account.mute_notifications": "Tawhe gwarnyansow a @{name}",
   "account.muted": "Tawhes",
-  "account.never_active": "Nevra",
+  "account.open_original_page": "Open original page",
   "account.posts": "Postow",
   "account.posts_with_replies": "Postow ha gorthebow",
   "account.report": "Reportya @{name}",
   "account.requested": "Ow kortos komendyans. Klyckyewgh dhe hedhi govyn holya",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kevrenna profil @{name}",
   "account.show_reblogs": "Diskwedhes kenerthow a @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Tout} other {{counter} Tout}}",
   "account.unblock": "Anlettya @{name}",
   "account.unblock_domain": "Anlettya gorfarth {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Na wra diskwedhes yn profil",
   "account.unfollow": "Anholya",
   "account.unmute": "Antawhe @{name}",
   "account.unmute_notifications": "Antawhe gwarnyansow a @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Klyckya dhe geworra noten",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "Oups!",
   "announcement.announcement": "Deklaryans",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} an seythen",
   "boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
-  "bundle_column_error.body": "Neppyth eth yn kamm ow karga'n elven ma.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Assayewgh arta",
-  "bundle_column_error.title": "Gwall ròsweyth",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Degea",
   "bundle_modal_error.message": "Neppyth eth yn kamm ow karga'n elven ma.",
   "bundle_modal_error.retry": "Assayewgh arta",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Devnydhyoryon lettys",
   "column.bookmarks": "Folennosow",
   "column.community": "Amserlin leel",
-  "column.direct": "Messajys didro",
+  "column.direct": "Direct messages",
   "column.directory": "Peuri profilys",
   "column.domain_blocks": "Gorfarthow lettys",
   "column.favourites": "Re drudh",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Leel hepken",
   "community.column_settings.media_only": "Myski hepken",
   "community.column_settings.remote_only": "A-bell hepken",
-  "compose_form.direct_message_warning": "An post ma a vydh danvenys dhe'n dhevnydhyoryon menegys hepken.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Dyski moy",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Ny vydh an post ma diskwedhys yn-dann vòlnos vyth awos y vos mes a rol. Ny yllir hwilas saw poblow postek dre vòlnos.",
   "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
   "compose_form.lock_disclaimer.lock": "Alhwedhys",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Dilea'n dewis ma",
   "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
   "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
-  "compose_form.publish": "Tout",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
   "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
   "confirmations.block.message": "Owgh hwi sur a vynnes lettya {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Dilea",
   "confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
   "confirmations.delete_list.confirm": "Dilea",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Merkya vel redys",
   "conversation.open": "Gweles kesklapp",
   "conversation.with": "Gans {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "A geffrysvys godhvedhys",
   "directory.local": "A {domain} hepken",
   "directory.new_arrivals": "Devedhyansow nowydh",
   "directory.recently_active": "Bew a-gynsow",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Stagewgh an post ma a-berth yn agas gwiasva ow tasskrifa'n kod a-wòles.",
   "embed.preview": "Ottomma fatel hevel:",
   "emoji_button.activity": "Gwrians",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "A-vusur",
   "emoji_button.flags": "Baneryow",
   "emoji_button.food": "Bòs & Diwes",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Ny wrussowgh lettya devnydhyoryon vyth hwath.",
   "empty_column.bookmarked_statuses": "Nyns eus dhywgh postow gans folennos hwath. Pan wrewgh gorra onan, ev a wra omdhiskwedhes omma.",
   "empty_column.community": "An amserlin leel yw gwag. Skrifewgh neppytn yn poblek dh'y lonchya!",
-  "empty_column.direct": "Nyns eus dhywgh messajys didro hwath. Pan wrewgh dannvon po degemeres onan, ev a wra omdhiskwedhes omma.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Nyns eus gorfarthow lettys hwath.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nyns eus dhywgh postow drudh hwath. Pan wrewgh merkya onan vel drudh, ev a wra omdhiskwedhes omma.",
   "empty_column.favourites": "Ny wrug nagonan merkya'n post ma vel drudh hwath. Pan wra, hynn a wra omdhiskwedhes omma.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Assayewgh aga disweythresa ha daskarga'n folen. Mar ny'gas gweres, martesen hwi a yll hwath usya Mastodon dre beurell aral po app teythyek.",
   "errors.unexpected_crash.copy_stacktrace": "Dasskrifa daslergh dhe'n astel glypp",
   "errors.unexpected_crash.report_issue": "Reportya kudyn",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Gwrys",
   "follow_recommendations.heading": "Holyewgh tus a vynnowgh gweles postow anedha! Ottomma nebes profyansow.",
   "follow_recommendations.lead": "Postow a dus a holyewgh a wra omdhiskwedhes omma yn aray termynel yn agas lin dre. Na borthewgh own a gammwul, hwi a yll p'eurpynag anholya tus mar es poran!",
   "follow_request.authorize": "Ri kummyas",
   "follow_request.reject": "Denagha",
   "follow_requests.unlocked_explanation": "Kyn na vo agas akont alhwedhys, an meni {domain} a wrug tybi y fia da genowgh dasweles govynnow holya a'n akontys ma dre leuv.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Gwithys",
-  "getting_started.developers": "Displegyoryon",
-  "getting_started.directory": "Menegva profilys",
-  "getting_started.documentation": "Dogvenva",
   "getting_started.heading": "Dhe dhalleth",
-  "getting_started.invite": "Gelwel tus",
-  "getting_started.open_source_notice": "Mastodon yw medhelweyth a fenten ygor. Hwi a yll kevri po reportya kudynnow dre GitHub dhe {github}.",
-  "getting_started.security": "Dewisyow akont",
-  "getting_started.terms": "Ambosow an gonis",
   "hashtag.column_header.tag_mode.all": "ha(g) {additional}",
   "hashtag.column_header.tag_mode.any": "po {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
   "hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
   "hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Selyek",
   "home.column_settings.show_reblogs": "Diskwedhes kenerthow",
   "home.column_settings.show_replies": "Diskwedhes gorthebow",
   "home.hide_announcements": "Kudha deklaryansow",
   "home.show_announcements": "Diskwedhes deklaryansow",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# jydh} other {# a jydhyow}}",
   "intervals.full.hours": "{number, plural, one {# our} other {# our}}",
   "intervals.full.minutes": "{number, plural, one {# vynysen} other {# a vynysennow}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "Fogella koloven",
   "keyboard_shortcuts.compose": "Fogella tekstva gomposya",
   "keyboard_shortcuts.description": "Deskrifans",
-  "keyboard_shortcuts.direct": "Ygeri koloven messajys didro",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Movya war-nans y'n rol",
   "keyboard_shortcuts.enter": "Ygeri post",
   "keyboard_shortcuts.favourite": "Merkya post vel drudh",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Efani kist a weles aven",
   "lightbox.next": "Nessa",
   "lightbox.previous": "Kynsa",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Keworra dhe rol",
   "lists.account.remove": "Removya a rol",
   "lists.delete": "Dilea rol",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
   "missing_indicator.label": "Ny veu kevys",
   "missing_indicator.sublabel": "Ny yllir kavòs an asnodh ma",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duryans",
   "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
   "mute_modal.indefinite": "Andhevri",
-  "navigation_bar.apps": "Appys klapkodh",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
   "navigation_bar.compose": "Komposya post nowydh",
-  "navigation_bar.direct": "Messajys didro",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
   "navigation_bar.edit_profile": "Golegi profil",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Re drudh",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
   "navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
-  "navigation_bar.info": "A-dro dhe'n leuren ma",
-  "navigation_bar.keyboard_shortcuts": "Buanellow",
   "navigation_bar.lists": "Rolyow",
   "navigation_bar.logout": "Digelmi",
   "navigation_bar.mutes": "Devnydhyoryon tawhes",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Postow fastys",
   "navigation_bar.preferences": "Erviransow",
   "navigation_bar.public_timeline": "Amserlin geffrysys",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Diogeledh",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} a wrug merkya agas post vel drudh",
   "notification.follow": "{name} a wrug agas holya",
   "notification.follow_request": "{name} a bysis agas holya",
@@ -306,13 +400,16 @@
   "notification.poll": "An sondyans may hwrussowgh ragleva a worfennas",
   "notification.reblog": "{name} a generthas agas post",
   "notification.status": "{name} a wrug nowydh postya",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Dilea gwarnyansow",
   "notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Gwarnyansow pennskrin",
   "notifications.column_settings.favourite": "Re drudh:",
   "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
   "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
-  "notifications.column_settings.filter_bar.show": "Diskwedhes",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Holyoryon nowydh:",
   "notifications.column_settings.follow_request": "Govynnow holya nowydh:",
   "notifications.column_settings.mention": "Menegow:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Diskwedhes yn koloven",
   "notifications.column_settings.sound": "Seni son",
   "notifications.column_settings.status": "Postow nowydh:",
-  "notifications.column_settings.unread_markers.category": "Merkys gwarnyansow anredys",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Oll",
   "notifications.filter.boosts": "Kenerthow",
   "notifications.filter.favourites": "Re drudh",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Dilea sondyans",
   "privacy.change": "Chanjya privetter an post",
   "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Didro",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Holyoryon-hepken",
-  "privacy.public.long": "Gweladow dhe beub, diskwedhys yn amserlinyow poblek",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.long": "Gweladow dhe beub, a-der yn amserlinyow poblek",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Anrelys",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",
   "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "lemmyn",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}e",
   "relative_time.today": "hedhyw",
   "reply_indicator.cancel": "Hedhi",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Dasvovya dhe {target}",
   "report.forward_hint": "Yma'n akont ma a leuren aral. Dannvon dasskrif dihanow an derivas ena ynwedh?",
-  "report.hint": "An derivas a vydh danvenys dhe goswydhyon agas leuren. Hwi a yll profya displegyans a prag ytho owgh hwi ow reportya'n akont ma a-wòles:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Kampòllow ynwedhek",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Dannvon",
   "report.target": "Ow reportya {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Hwilas",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Furvas hwilas avonsys",
   "search_popout.tips.full_text": "Tekst sempel a wra daskor postow a wrussowgh aga skrifa, merkya vel drudh, po bos menegys ynna, keffrys ha henwyn devnydhyoryon ha displetyans, ha bòlnosow a dhesedh.",
   "search_popout.tips.hashtag": "bòlnos",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Tekst sempel a wra daskor henwyn displegya ha devnydhyoryon, ha bòlnosow",
   "search_popout.tips.user": "devnydhyer",
   "search_results.accounts": "Tus",
+  "search_results.all": "All",
   "search_results.hashtags": "Bòlnosow",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Postow",
   "search_results.statuses_fts_disabled": "Nyns yw hwilas postow der aga dalgh gweythresys y'n leuren Mastodon ma.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {sewyans} other {sewyans}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Ygeri ynterfas koswa rag @{name}",
   "status.admin_status": "Ygeri an post ma y'n ynterfas koswa",
   "status.block": "Lettya @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Dilea",
   "status.detailed_status": "Gwel kesklapp a-vanyl",
   "status.direct": "Messach didro dhe @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Staga",
   "status.favourite": "Merkya vel drudh",
+  "status.filter": "Filter this post",
   "status.filtered": "Sidhlys",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Karga moy",
   "status.media_hidden": "Myski kudhys",
   "status.mention": "Meneges @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Ny wrug nagonan kenertha'n post ma hwath. Pan wra, hynn a wra omdhiskwedhes omma.",
   "status.redraft": "Dilea ha daskynskrifa",
   "status.remove_bookmark": "Dilea folennos",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Gorthebi",
   "status.replyAll": "Gorthebi orth neusen",
   "status.report": "Reportya @{name}",
   "status.sensitive_warning": "Dalgh tender",
   "status.share": "Kevrenna",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Diskwedhes le",
   "status.show_less_all": "Diskwedhes le rag puptra",
   "status.show_more": "Diskwedhes moy",
   "status.show_more_all": "Diskwedhes moy rag puptra",
-  "status.show_thread": "Diskwedhes neusen",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Ankavadow",
   "status.unmute_conversation": "Antawhe kesklapp",
   "status.unpin": "Anfastya a brofil",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Gordhyllo profyans",
   "suggestions.header": "Martesen y fydh dhe les dhywgh…",
   "tabs_bar.federated_timeline": "Keffrysys",
   "tabs_bar.home": "Tre",
   "tabs_bar.local_timeline": "Leel",
   "tabs_bar.notifications": "Gwarnyansow",
-  "tabs_bar.search": "Hwilas",
   "time_remaining.days": "{number, plural, one {# jydh} other {# a jydhyow}} gesys",
   "time_remaining.hours": "{number, plural, one {# our} other {# our}} gesys",
   "time_remaining.minutes": "{number, plural, one {# vynysen} other {# a vynysennow}} gesys",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Holyoryon",
   "timeline_hint.resources.follows": "Holyansow",
   "timeline_hint.resources.statuses": "Kottha postow",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} den} other {{counter} a dus}} ow kewsel",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tuedhegus lemmyn",
   "ui.beforeunload": "Agas kysnkrif a vydh kellys mar kwrewgh diberth a Mastodon.",
   "units.short.billion": "{count}Mek",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Nyns yw gesys ughkarga restrennow gans sondyansow.",
   "upload_form.audio_description": "Deskrifewgh rag tus vodharek",
   "upload_form.description": "Deskrifewgh rag tus dhallek",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Golegi",
   "upload_form.thumbnail": "Chanjya avenik",
   "upload_form.undo": "Dilea",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Ow pareusi ANG…",
   "upload_modal.preview_label": "Kynwel ({ratio})",
   "upload_progress.label": "Owth ughkarga...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Degea gwydhyow",
   "video.download": "Iskarga restren",
   "video.exit_fullscreen": "Diberth a skrin leun",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
new file mode 100644
index 000000000..ebae90919
--- /dev/null
+++ b/app/javascript/mastodon/locales/la.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderated servers",
+  "about.contact": "Ratio:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Annotatio",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Robotum",
+  "account.badges.group": "Congregatio",
+  "account.block": "Impedire @{name}",
+  "account.block_domain": "Imperire dominium {domain}",
+  "account.blocked": "Impeditum est",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Dominium impeditum",
+  "account.edit_profile": "Recolere notionem",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "Nulla contributa",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Confutatus",
+  "account.open_original_page": "Open original page",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Solvere impedimentum",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Mediocritas",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Proclamatio",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Eheu!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
+  "bundle_column_error.retry": "Retemptare",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "CCCCIIII",
+  "bundle_modal_error.close": "Claudere",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Retemptare",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "De",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Signa paginales",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Dilecti",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Domi",
+  "column.lists": "Catalogi",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned post",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose.language.change": "Mutare linguam",
+  "compose.language.search": "Quaerere linguas...",
+  "compose_form.direct_message_warning_learn_more": "Discere plura",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "clausum",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Barrire",
+  "compose_form.publish_form": "Barrire",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Impedire",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "Oblitterare",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Oblitterare",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Confutare",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Respondere",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "Homines",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Quaerere...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "Hic nulla contributa!",
+  "empty_column.account_unavailable": "Notio non impetrabilis",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Contributa",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Confectum",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Getting started",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Descriptio",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "Aperire contributum",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "Respondere ad contributum",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Claudere",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Secundum",
+  "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "About",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "Omnia",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Eventus electionis",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Clausum",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Eligere",
+  "poll.voted": "Elegisti hoc responsum",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Addere electionem",
+  "poll_button.remove_poll": "Auferre electionem",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Coram publico",
+  "privacy.public.short": "Coram publico",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "nunc",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "nunc",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "hodie",
+  "reply_indicator.cancel": "Cancel",
+  "report.block": "Impedimentum",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Altera",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "notio",
+  "report.category.title_status": "contributum",
+  "report.close": "Confectum",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Confutare",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Secundum",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Mittere",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Altera",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Quaerere",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Discere plura",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Impedire @{name}",
+  "status.bookmark": "Signa paginaris",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Oblitterare",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Recolere",
+  "status.edited": "Recultum {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Foederatum",
+  "tabs_bar.home": "Domi",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Contributa pristina",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people who are hard of hearing",
+  "upload_form.description": "Describe for people who are blind or have low vision",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Recolere",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Oblitterare",
+  "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Confutare soni",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/locale-data/sa.js b/app/javascript/mastodon/locales/locale-data/sa.js
new file mode 100644
index 000000000..946dfde0f
--- /dev/null
+++ b/app/javascript/mastodon/locales/locale-data/sa.js
@@ -0,0 +1,97 @@
+/*eslint eqeqeq: "off"*/
+/*eslint no-nested-ternary: "off"*/
+/*eslint quotes: "off"*/
+/*eslint comma-dangle: "off"*/
+/*eslint semi: "off"*/
+
+export default [
+  {
+    locale: "sa",
+    fields: {
+      year: {
+        displayName: "year",
+        relative: {
+          0: "this year",
+          1: "next year",
+          "-1": "last year"
+        },
+        relativeTime: {
+          future: {
+            other: "+{0} y"
+          },
+          past: {
+            other: "-{0} y"
+          }
+        }
+      },
+      month: {
+        displayName: "month",
+        relative: {
+          0: "this month",
+          1: "next month",
+          "-1": "last month"
+        },
+        relativeTime: {
+          future: {
+            other: "+{0} m"
+          },
+          past: {
+            other: "-{0} m"
+          }
+        }
+      },
+      day: {
+        displayName: "day",
+        relative: {
+          0: "अद्य",
+          1: "श्वः",
+          "-1": "गतदिनम्"
+        },
+        relativeTime: {
+          future: {
+            other: "+{0} d"
+          },
+          past: {
+            other: "-{0} d"
+          }
+        }
+      },
+      hour: {
+        displayName: "hour",
+        relativeTime: {
+          future: {
+            other: "+{0} h"
+          },
+          past: {
+            other: "-{0} h"
+          }
+        }
+      },
+      minute: {
+        displayName: "minute",
+        relativeTime: {
+          future: {
+            other: "+{0} min"
+          },
+          past: {
+            other: "-{0} min"
+          }
+        }
+      },
+      second: {
+        displayName: "second",
+        relative: {
+          0: "now"
+        },
+        relativeTime: {
+          future: {
+            other: "+{0} s"
+          },
+          past: {
+            other: "-{0} s"
+          }
+        }
+      }
+    }
+  }
+]
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 0c1a46de3..fff232ee8 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,53 +1,74 @@
 {
+  "about.blocks": "Moderatorių prižiūrimi serveriai",
+  "about.contact": "Kontaktai:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Priežastis nežinoma",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Uždraustas",
+  "about.not_available": "Šiame serveryje informacijos nėra.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Serverio taisyklės",
   "account.account_note_header": "Pastaba",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
+  "account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašo",
+  "account.badges.bot": "Robotas",
   "account.badges.group": "Grupė",
-  "account.block": "Block @{name}",
+  "account.block": "Užblokuoti @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Blocked",
+  "account.blocked": "Užblokuota",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Sekti",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
+  "account.follows_you": "Seka jus",
+  "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Prisijungė",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Užtildyti @{name}",
+  "account.mute_notifications": "Užtildyti žinutes iš @{name}",
   "account.muted": "Užtildytas",
-  "account.never_active": "Niekada",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
+  "account.report": "Pranešti apie @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unhide {domain}",
+  "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Nebesekti",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Atitildyti",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oi!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Tinklo klaida",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 4d65daa83..3322be0ca 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -1,74 +1,108 @@
 {
+  "about.blocks": "Moderētie serveri",
+  "about.contact": "Kontakts:",
+  "about.disclaimer": "Mastodon ir bezmaksas atklātā pirmkoda programmatūra un Mastodon gGmbH preču zīme.",
+  "about.domain_blocks.no_reason_available": "Iemesls nav norādīts",
+  "about.domain_blocks.preamble": "Mastodon parasti ļauj apskatīt saturu un mijiedarboties ar lietotājiem no jebkura cita federācijas servera. Šie ir izņēmumi, kas veikti šajā konkrētajā serverī.",
+  "about.domain_blocks.silenced.explanation": "Parasti tu neredzēsi profilus un saturu no šī servera, ja vien tu nepārprotami izvēlēsies to pārskatīt vai sekot.",
+  "about.domain_blocks.silenced.title": "Ierobežotie",
+  "about.domain_blocks.suspended.explanation": "Nekādi dati no šī servera netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu mijiedarbību vai saziņu ar lietotājiem no šī servera.",
+  "about.domain_blocks.suspended.title": "Apturētie",
+  "about.not_available": "Šī informācija šajā serverī nav bijusi pieejama.",
+  "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
+  "about.rules": "Servera noteikumi",
   "account.account_note_header": "Piezīme",
   "account.add_or_remove_from_list": "Pievienot vai noņemt no saraksta",
-  "account.badges.bot": "Bots",
+  "account.badges.bot": "Robots",
   "account.badges.group": "Grupa",
   "account.block": "Bloķēt @{name}",
   "account.block_domain": "Bloķēt domēnu {domain}",
   "account.blocked": "Bloķēts",
   "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
-  "account.cancel_follow_request": "Atcelt sekošanas pieprasījumu",
+  "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
   "account.direct": "Privāta ziņa @{name}",
   "account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
   "account.domain_blocked": "Domēns ir bloķēts",
   "account.edit_profile": "Rediģēt profilu",
-  "account.enable_notifications": "Man paziņot, kad @{name} publicē ierakstu",
-  "account.endorse": "Izcelts profilā",
+  "account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
+  "account.endorse": "Izcelt profilā",
+  "account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
+  "account.featured_tags.last_status_never": "Ierakstu nav",
+  "account.featured_tags.title": "{name} izceltie tēmturi",
   "account.follow": "Sekot",
   "account.followers": "Sekotāji",
-  "account.followers.empty": "Šim lietotājam patreiz nav sekotāju.",
-  "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
-  "account.following_counter": "{count, plural, one {{counter} Sekojošs} other {{counter} Sekojoši}}",
+  "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
+  "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
+  "account.following": "Seko",
+  "account.following_counter": "{count, plural, one {{counter} sekojamais} other {{counter} sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.follows_you": "Seko tev",
-  "account.hide_reblogs": "Paslēpt paceltos ierakstus no lietotāja @{name}",
-  "account.joined": "Pievienojās {date}",
-  "account.last_status": "Pēdējā aktivitāte",
-  "account.link_verified_on": "Šīs saites piederība ir pārbaudīta {date}",
+  "account.go_to_profile": "Doties uz profilu",
+  "account.hide_reblogs": "Paslēpt pastiprinātos ierakstus no lietotāja @{name}",
+  "account.joined_short": "Pievienojās",
+  "account.languages": "Mainīt abonētās valodas",
+  "account.link_verified_on": "Šīs saites piederība tika pārbaudīta {date}",
   "account.locked_info": "Šī konta privātuma statuss ir slēgts. Īpašnieks izskatīs, kurš viņam drīkst sekot.",
-  "account.media": "Mediji",
-  "account.mention": "Piemin @{name}",
-  "account.moved_to": "{name} ir pārcelts uz:",
+  "account.media": "Multivide",
+  "account.mention": "Pieminēt @{name}",
+  "account.moved_to": "{name} norādīja, ka viņu jaunais konts tagad ir:",
   "account.mute": "Apklusināt @{name}",
   "account.mute_notifications": "Nerādīt paziņojumus no @{name}",
   "account.muted": "Apklusināts",
-  "account.never_active": "Nekad",
-  "account.posts": "Ziņas",
-  "account.posts_with_replies": "Ziņas un atbildes",
-  "account.report": "Ziņot par lietotāju @{name}",
-  "account.requested": "Gaidām apstiprinājumu. Nospied lai atceltu sekošanas pieparasījumu",
+  "account.open_original_page": "Atvērt oriģinālo lapu",
+  "account.posts": "Ieraksti",
+  "account.posts_with_replies": "Ieraksti un atbildes",
+  "account.report": "Sūdzēties par @{name}",
+  "account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
+  "account.requested_follow": "{name} nosūtīja tev sekošanas pieprasījumu",
   "account.share": "Dalīties ar @{name} profilu",
-  "account.show_reblogs": "Parādīt @{name} paaugstinātās ziņas",
-  "account.statuses_counter": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}}",
-  "account.unblock": "Atbloķēt lietotāju @{name}",
+  "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
+  "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
+  "account.unblock": "Atbloķēt @{name}",
   "account.unblock_domain": "Atbloķēt domēnu {domain}",
-  "account.unendorse": "Neattēlot profilā",
+  "account.unblock_short": "Atbloķēt",
+  "account.unendorse": "Neizcelt profilā",
   "account.unfollow": "Pārstāt sekot",
   "account.unmute": "Noņemt apklusinājumu @{name}",
-  "account.unmute_notifications": "Rādīt paziņojumus no lietotāja @{name}",
-  "account_note.placeholder": "Noklikšķiniet, lai pievienotu piezīmi",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Lūdzu, mēģini vēlreiz pāc {retry_time, time, medium}.",
+  "account.unmute_notifications": "Rādīt paziņojumus no @{name}",
+  "account.unmute_short": "Noņemt apklusinājumu",
+  "account_note.placeholder": "Noklikšķini, lai pievienotu piezīmi",
+  "admin.dashboard.daily_retention": "Lietotāju saglabāšanas rādītājs dienā pēc reģistrēšanās",
+  "admin.dashboard.monthly_retention": "Lietotāju saglabāšanas rādītājs mēnesī pēc reģistrēšanās",
+  "admin.dashboard.retention.average": "Vidēji",
+  "admin.dashboard.retention.cohort": "Reģistrēšanās mēnesis",
+  "admin.dashboard.retention.cohort_size": "Jauni lietotāji",
+  "alert.rate_limited.message": "Lūdzu, mēģini vēlreiz pēc {retry_time, time, medium}.",
   "alert.rate_limited.title": "Biežums ierobežots",
-  "alert.unexpected.message": "Negaidīta kļūda.",
+  "alert.unexpected.message": "Radās negaidīta kļūda.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Paziņojums",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(neapstrādāti)",
+  "audio.hide": "Slēpt audio",
   "autosuggest_hashtag.per_week": "{count} nedēļā",
-  "boost_modal.combo": "Nospied {combo} lai izlaistu šo nākamreiz",
-  "bundle_column_error.body": "Kaut kas nogāja greizi ielādējot šo komponenti.",
-  "bundle_column_error.retry": "Mēģini vēlreiz",
-  "bundle_column_error.title": "Tīkla kļūda",
+  "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
+  "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
+  "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
+  "bundle_column_error.error.title": "Ak vai!",
+  "bundle_column_error.network.body": "Mēģinot ielādēt šo lapu, radās kļūda. Tas varētu būt saistīts ar īslaicīgu interneta savienojuma vai šī servera problēmu.",
+  "bundle_column_error.network.title": "Tīkla kļūda",
+  "bundle_column_error.retry": "Mēģināt vēlreiz",
+  "bundle_column_error.return": "Atgriezties",
+  "bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Aizvērt",
-  "bundle_modal_error.message": "Kaut kas nogāja greizi ielādējot šo komponenti.",
-  "bundle_modal_error.retry": "Mēģini vēlreiz",
+  "bundle_modal_error.message": "Kaut kas nogāja greizi, ielādējot šo komponenti.",
+  "bundle_modal_error.retry": "Mēģināt vēlreiz",
+  "closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
+  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču ņem vērā, ka tev nav nepieciešams konts tieši domēnā {domain}, lai izmantotu Mastodon.",
+  "closed_registrations_modal.find_another_server": "Atrast citu serveri",
+  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsi sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
+  "closed_registrations_modal.title": "Reģistrēšanās Mastodon",
+  "column.about": "Par",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
-  "column.community": "Vietējā ziņu līnija",
-  "column.direct": "Privātās ziņas",
+  "column.community": "Vietējā laika līnija",
+  "column.direct": "Privātie ziņojumi",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
   "column.favourites": "Izlase",
@@ -78,72 +112,89 @@
   "column.mutes": "Apklusinātie lietotāji",
   "column.notifications": "Paziņojumi",
   "column.pins": "Piespraustie ziņojumi",
-  "column.public": "Apvienotā ziņu lenta",
+  "column.public": "Apvienotā laika līnija",
   "column_back_button.label": "Atpakaļ",
   "column_header.hide_settings": "Paslēpt iestatījumus",
-  "column_header.moveLeft_settings": "Pārvietot kolonu pa kreisi",
-  "column_header.moveRight_settings": "Pārvietot kolonu pa labi",
+  "column_header.moveLeft_settings": "Pārvietot kolonnu pa kreisi",
+  "column_header.moveRight_settings": "Pārvietot kolonnu pa labi",
   "column_header.pin": "Piespraust",
   "column_header.show_settings": "Rādīt iestatījumus",
   "column_header.unpin": "Atspraust",
   "column_subheading.settings": "Iestatījumi",
   "community.column_settings.local_only": "Tikai vietējie",
-  "community.column_settings.media_only": "Tikai mediji",
+  "community.column_settings.media_only": "Tikai multivide",
   "community.column_settings.remote_only": "Tikai attālinātie",
-  "compose_form.direct_message_warning": "Šis ziņojums tiks nosūtīts tikai pieminētajiem lietotājiem.",
+  "compose.language.change": "Mainīt valodu",
+  "compose.language.search": "Meklēt valodas...",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
-  "compose_form.hashtag_warning": "Ziņojumu nebūs iespējams atrast zem haštagiem jo tas nav publisks. Tikai publiskos ziņojumus ir iespējams meklēt pēc tiem.",
-  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot lai apskatītu tikai sekotājiem paredzētos ziņojumus.",
+  "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
+  "compose_form.hashtag_warning": "Šo ziņu nebūs iespējams atrast tēmturos, jo tā ir nerindota. Tēmturos ir redzamas tikai publiskas ziņas.",
+  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas tev padomā?",
   "compose_form.poll.add_option": "Pievienot izvēli",
   "compose_form.poll.duration": "Aptaujas ilgums",
   "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
   "compose_form.poll.remove_option": "Noņemt šo izvēli",
-  "compose_form.poll.switch_to_multiple": "Maini aptaujas veidu, lai atļautu vairākas izvēles",
-  "compose_form.poll.switch_to_single": "Maini aptaujas veidu, lai atļautu vienu izvēli",
-  "compose_form.publish": "Taurēt",
+  "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
+  "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
+  "compose_form.publish": "Publicēt",
+  "compose_form.publish_form": "Publicēt",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt mediju kā sensitīvu} other {Atzīmēt medijus kā sensitīvus}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medijs ir atzīmēts kā sensitīvs} other {Mediji ir atzīmēti kā sensitīvi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medijs nav atzīmēts kā sensitīvs} other {Mediji nav atzīmēti kā sensitīvi}}",
+  "compose_form.save_changes": "Saglabāt izmaiņas",
+  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
   "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
   "confirmation_modal.cancel": "Atcelt",
-  "confirmations.block.block_and_report": "Bloķēt un ziņot",
+  "confirmations.block.block_and_report": "Bloķēt un sūdzēties",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.block.message": "Vai tiešām vēlies bloķēt lietotāju {name}?",
+  "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
+  "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
+  "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
-  "confirmations.delete.message": "Vai tiešām vēlaties dzēst šo ziņu?",
+  "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ziņu?",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Atmest",
+  "confirmations.discard_edit_media.message": "Tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā. Vēlies tās atmest?",
   "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
-  "confirmations.domain_block.message": "Vai tu tiešām, tiešam vēlies bloķēt visu domēnu {domain}? Lielākajā daļā gadījumu pietiek ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
+  "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.",
-  "confirmations.mute.message": "Vai Tu tiešām velies apklusināt {name}?",
+  "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
-  "confirmations.redraft.message": "Vai tiešām vēlies dzēst un pārrakstīt šo ierakstu? Favorīti un paceltie ieraksti tiks dzēsti, kā arī atbildes tiks atsaistītas no šī ieraksta.",
+  "confirmations.redraft.message": "Vai tiešām vēlies dzēst un pārrakstīt šo ierakstu? Favorīti un pastiprinātie ieraksti tiks dzēsti, un atbildes tiks atsaistītas no šī ieraksta.",
   "confirmations.reply.confirm": "Atbildēt",
-  "confirmations.reply.message": "Atbildot tagad tava ziņa ko šobrīd raksti tiks pārrakstīta. Vai tiešām vēlies turpināt?",
+  "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
   "conversation.with": "Ar {names}",
+  "copypaste.copied": "Nokopēts",
+  "copypaste.copy": "Kopēt",
   "directory.federated": "No pazīstamas federācijas",
   "directory.local": "Tikai no {domain}",
   "directory.new_arrivals": "Jaunpienācēji",
-  "directory.recently_active": "Nesen aktīvs",
-  "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzmo kodu.",
+  "directory.recently_active": "Nesen aktīvie",
+  "disabled_account_banner.account_settings": "Konta iestatījumi",
+  "disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
+  "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.",
+  "dismissable_banner.dismiss": "Atcelt",
+  "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
+  "dismissable_banner.explore_statuses": "Šīs ziņas no šī un citiem decentralizētajā tīkla serveriem šobrīd gūst panākumus šajā serverī.",
+  "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
+  "dismissable_banner.public_timeline": "Šīs ir jaunākās publiskās ziņas no cilvēkiem šajā un citos decentralizētā tīkla serveros, par kuriem šis serveris zina.",
+  "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
+  "emoji_button.clear": "Notīrīt",
   "emoji_button.custom": "Pielāgots",
   "emoji_button.flags": "Karogi",
   "emoji_button.food": "Ēdieni un dzērieni",
@@ -156,104 +207,143 @@
   "emoji_button.search": "Meklēt...",
   "emoji_button.search_results": "Meklēšanas rezultāti",
   "emoji_button.symbols": "Simboli",
-  "emoji_button.travel": "Ceļošana & Vietas",
+  "emoji_button.travel": "Ceļošana un vietas",
   "empty_column.account_suspended": "Konta darbība ir apturēta",
   "empty_column.account_timeline": "Šeit ziņojumu nav!",
   "empty_column.account_unavailable": "Profils nav pieejams",
-  "empty_column.blocks": "Patreiz tu neesi nevienu bloķējis.",
-  "empty_column.bookmarked_statuses": "Patreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
-  "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
+  "empty_column.blocks": "Pašreiz tu neesi nevienu bloķējis.",
+  "empty_column.bookmarked_statuses": "Pašreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
+  "empty_column.community": "Vietējā laika līnija ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
+  "empty_column.direct": "Pašreiz tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
-  "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
-  "empty_column.favourites": "Neviens šo ziņojumu vel nav izcēlis. Kad būs, tie parādīsies šeit.",
-  "empty_column.follow_recommendations": "Šķiet, ka tev nevarēja ģenerēt ieteikumus. Vari mēģināt izmantot meklēšanu, lai meklētu cilvēkus, kurus tu varētu pazīt, vai izpētīt populārākās atsauces.",
-  "empty_column.follow_requests": "Šobrīd neviens nav pieteicies tev sekot. Kad kāds pieteiksies tas parādīsies šeit.",
+  "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!",
+  "empty_column.favourited_statuses": "Pašreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
+  "empty_column.favourites": "Neviens šo ziņojumu vel nav izcēlis. Kad kāds to izdarīs, tas parādīsies šeit.",
+  "empty_column.follow_recommendations": "Neizdevās ģenerēt tev pielāgotus ieteikumus. Vari mēģināt izmantot meklēšanu, lai meklētu cilvēkus, kurus tu varētu pazīt, vai izpētīt populārākos tēmturus.",
+  "empty_column.follow_requests": "Šobrīd tev nav sekošanas pieprasījumu. Kad kāds pieteiksies tev sekot, pieprasījums parādīsies šeit.",
   "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
-  "empty_column.home": "Tava vietējā ziņu lenta ir tukša! Lai to aizpildītu, piesekojies vairāk cilvēkiem. {suggestions}",
+  "empty_column.home": "Tava mājas laika līnija ir tukša! Lai to aizpildītu, pieseko vairāk cilvēkiem. {suggestions}",
   "empty_column.home.suggestions": "Apskatīt dažus ieteikumus",
-  "empty_column.list": "Šis saraksts patreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
-  "empty_column.lists": "Patreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
+  "empty_column.list": "Šis saraksts pašreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
+  "empty_column.lists": "Pašreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
   "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.",
   "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar tevi mijiedarbosies, tu to redzēsi šeit.",
-  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai sāc sekot lietotājiem no citiem serveriem, lai veidotu saturu",
+  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai pieseko lietotājiem no citiem serveriem",
   "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.",
   "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.",
-  "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai vietējo lietotni.",
-  "error.unexpected_crash.next_steps_addons": "Mēģini tos atspējot un atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai vietējo lietotni.",
-  "errors.unexpected_crash.copy_stacktrace": "Iekopēt starpliktuvē",
+  "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.",
+  "error.unexpected_crash.next_steps_addons": "Mēģini tos atspējot un atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopēt stacktrace uz starpliktuvi",
   "errors.unexpected_crash.report_issue": "Ziņot par problēmu",
-  "follow_recommendations.done": "Izpildīts",
+  "explore.search_results": "Meklēšanas rezultāti",
+  "explore.suggested_follows": "Tev",
+  "explore.title": "Pārlūkot",
+  "explore.trending_links": "Jaunumi",
+  "explore.trending_statuses": "Ziņas",
+  "explore.trending_tags": "Tēmturi",
+  "filter_modal.added.context_mismatch_explanation": "Šī filtra kategorija neattiecas uz kontekstu, kurā esi piekļuvis šai ziņai. Ja vēlies, lai ziņa tiktu filtrēta arī šajā kontekstā, tev būs jārediģē filtrs.",
+  "filter_modal.added.context_mismatch_title": "Konteksta neatbilstība!",
+  "filter_modal.added.expired_explanation": "Šai filtra kategorijai ir beidzies derīguma termiņš. Lai to lietotu, tev būs jāmaina derīguma termiņš.",
+  "filter_modal.added.expired_title": "Filtra termiņš beidzies!",
+  "filter_modal.added.review_and_configure": "Lai pārskatītu un tālāk konfigurētu šo filtru kategoriju, dodies uz {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtra iestatījumi",
+  "filter_modal.added.settings_link": "iestatījumu lapu",
+  "filter_modal.added.short_explanation": "Šī ziņa ir pievienota šai filtra kategorijai: {title}.",
+  "filter_modal.added.title": "Filtrs pievienots!",
+  "filter_modal.select_filter.context_mismatch": "neattiecas uz šo kontekstu",
+  "filter_modal.select_filter.expired": "beidzies",
+  "filter_modal.select_filter.prompt_new": "Jauna kategorija: {name}",
+  "filter_modal.select_filter.search": "Meklē vai izveido",
+  "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
+  "filter_modal.select_filter.title": "Filtrēt šo ziņu",
+  "filter_modal.title.status": "Filtrēt ziņu",
+  "follow_recommendations.done": "Darīts",
   "follow_recommendations.heading": "Seko cilvēkiem, no kuriem vēlies redzēt ziņas! Šeit ir daži ieteikumi.",
   "follow_recommendations.lead": "Ziņas no cilvēkiem, kuriem seko, mājas plūsmā tiks parādītas hronoloģiskā secībā. Nebaidies kļūdīties, tu tikpat viegli vari pārtraukt sekot cilvēkiem jebkurā laikā!",
   "follow_request.authorize": "Autorizēt",
   "follow_request.reject": "Noraidīt",
   "follow_requests.unlocked_explanation": "Lai gan tavs konts nav bloķēts, {domain} darbinieki iedomājās, ka, iespējams, vēlēsies pārskatīt pieprasījumus no šiem kontiem.",
+  "footer.about": "Par",
+  "footer.directory": "Profilu direktorija",
+  "footer.get_app": "Iegūt lietotni",
+  "footer.invite": "Uzaicināt cilvēkus",
+  "footer.keyboard_shortcuts": "Īsinājumtaustiņi",
+  "footer.privacy_policy": "Privātuma politika",
+  "footer.source_code": "Skatīt pirmkodu",
   "generic.saved": "Saglabāts",
-  "getting_started.developers": "Izstrādātāji",
-  "getting_started.directory": "Profila direktorija",
-  "getting_started.documentation": "Dokumentācija",
   "getting_started.heading": "Darba sākšana",
-  "getting_started.invite": "Uzaiciniet cilvēkus",
-  "getting_started.open_source_notice": "Mastodon ir atvērtā koda programmatūra. Tu vari dot savu ieguldījumu vai arī ziņot par problēmām {github}.",
-  "getting_started.security": "Konta iestatījumi",
-  "getting_started.terms": "Pakalpojuma noteikumi",
   "hashtag.column_header.tag_mode.all": "un {additional}",
   "hashtag.column_header.tag_mode.any": "vai {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "hashtag.column_settings.select.no_options_message": "Ieteikumi netika atrasti",
-  "hashtag.column_settings.select.placeholder": "Ievadīt mirkļbirkas…",
+  "hashtag.column_settings.select.placeholder": "Ievadīt tēmturus…",
   "hashtag.column_settings.tag_mode.all": "Visi no šiem",
   "hashtag.column_settings.tag_mode.any": "Kāds no šiem",
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
-  "hashtag.column_settings.tag_toggle": "Iekļaut šai kolonnai papildu tagus",
+  "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
+  "hashtag.follow": "Sekot tēmturim",
+  "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "home.column_settings.basic": "Pamata",
-  "home.column_settings.show_reblogs": "Rādīt palielinājumus",
+  "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
-  "home.hide_announcements": "Slēpt paziņojumus",
-  "home.show_announcements": "Rādīt paziņojumus",
+  "home.hide_announcements": "Slēpt anonsus",
+  "home.show_announcements": "Rādīt anonsus",
+  "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
+  "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.",
+  "interaction_modal.description.reblog": "Ar Mastodon kontu tu vari pastiprināt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
+  "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
+  "interaction_modal.on_another_server": "Citā serverī",
+  "interaction_modal.on_this_server": "Šajā serverī",
+  "interaction_modal.other_server_instructions": "Nokopē un ielīmē šo URL savas Mastodon lietotnes vai Mastodon tīmekļa vietnes meklēšanas laukā.",
+  "interaction_modal.preamble": "Tā kā Mastodon ir decentralizēts, tu vari izmantot savu esošo kontu, ko mitina cits Mastodon serveris vai saderīga platforma, ja tev nav konta šajā serverī.",
+  "interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei",
+  "interaction_modal.title.follow": "Sekot {name}",
+  "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
+  "interaction_modal.title.reply": "Atbildēt uz {name} ziņu",
   "intervals.full.days": "{number, plural, one {# diena} other {# dienas}}",
   "intervals.full.hours": "{number, plural, one {# stunda} other {# stundas}}",
   "intervals.full.minutes": "{number, plural, one {# minūte} other {# minūtes}}",
   "keyboard_shortcuts.back": "Pāriet atpakaļ",
   "keyboard_shortcuts.blocked": "Atvērt bloķēto lietotāju sarakstu",
-  "keyboard_shortcuts.boost": "Palielināt ziņu",
+  "keyboard_shortcuts.boost": "Pastiprināt ierakstu",
   "keyboard_shortcuts.column": "Fokusēt kolonnu",
   "keyboard_shortcuts.compose": "Fokusēt veidojamā teksta lauku",
   "keyboard_shortcuts.description": "Apraksts",
-  "keyboard_shortcuts.direct": "Atvērt privāto ziņojumu kolonnu",
-  "keyboard_shortcuts.down": "Pārvietot sarakstā uz leju",
+  "keyboard_shortcuts.direct": "lai atvērtu privāto ziņojumu kolonnu",
+  "keyboard_shortcuts.down": "Pārvietoties lejup sarakstā",
   "keyboard_shortcuts.enter": "Atvērt ziņu",
   "keyboard_shortcuts.favourite": "Pievienot izlasei",
   "keyboard_shortcuts.favourites": "Atvērt izlašu sarakstu",
-  "keyboard_shortcuts.federated": "Atvērt apvienoto ziņu lenti",
-  "keyboard_shortcuts.heading": "Klaviatūras saīsnes",
-  "keyboard_shortcuts.home": "Atvērt vietējo ziņu lenti",
+  "keyboard_shortcuts.federated": "Atvērt apvienoto laika līniju",
+  "keyboard_shortcuts.heading": "Īsinājumtaustiņi",
+  "keyboard_shortcuts.home": "Atvērt mājas laika līniju",
   "keyboard_shortcuts.hotkey": "Ātrais taustiņš",
   "keyboard_shortcuts.legend": "Parādīt šo leģendu",
-  "keyboard_shortcuts.local": "Atvērt vietējo ziņu lenti",
-  "keyboard_shortcuts.mention": "Minējuma autors",
+  "keyboard_shortcuts.local": "Atvērt vietējo laika līniju",
+  "keyboard_shortcuts.mention": "Pieminēt autoru",
   "keyboard_shortcuts.muted": "Atvērt apklusināto lietotāju sarakstu",
-  "keyboard_shortcuts.my_profile": "Atvērt manu profilu",
+  "keyboard_shortcuts.my_profile": "Atvērt savu profilu",
   "keyboard_shortcuts.notifications": "Atvērt paziņojumu kolonnu",
-  "keyboard_shortcuts.open_media": "Atvērt mediju",
+  "keyboard_shortcuts.open_media": "Atvērt multividi",
   "keyboard_shortcuts.pinned": "Atvērt piesprausto ziņu sarakstu",
   "keyboard_shortcuts.profile": "Atvērt autora profilu",
   "keyboard_shortcuts.reply": "Atbildēt",
   "keyboard_shortcuts.requests": "Atvērt sekošanas pieprasījumu sarakstu",
   "keyboard_shortcuts.search": "Fokusēt meklēšanas joslu",
-  "keyboard_shortcuts.spoilers": "Rādīt/slēpt CW lauku",
+  "keyboard_shortcuts.spoilers": "Rādīt/slēpt satura brīdinājumu lauku",
   "keyboard_shortcuts.start": "Atvērt kolonnu “Darba sākšana”",
-  "keyboard_shortcuts.toggle_hidden": "Rādīt/slēpt tekstu aiz CW",
-  "keyboard_shortcuts.toggle_sensitivity": "Rādīt/slēpt mediju",
+  "keyboard_shortcuts.toggle_hidden": "Rādīt/slēpt tekstu aiz satura brīdinājuma",
+  "keyboard_shortcuts.toggle_sensitivity": "Rādīt/slēpt multividi",
   "keyboard_shortcuts.toot": "Sākt jaunu ziņu",
-  "keyboard_shortcuts.unfocus": "Atfokusēt teksta veidošanu/meklēšanu",
-  "keyboard_shortcuts.up": "Pārvietot sarakstā uz augšu",
+  "keyboard_shortcuts.unfocus": "Atfokusēt veidojamā teksta/meklēšanas lauku",
+  "keyboard_shortcuts.up": "Pārvietoties augšup sarakstā",
   "lightbox.close": "Aizvērt",
-  "lightbox.compress": "Saspiest attēla ietvaru",
-  "lightbox.expand": "Paplašināt attēla ietvaru",
-  "lightbox.next": "Tālāk",
-  "lightbox.previous": "Iepriekš",
+  "lightbox.compress": "Saspiest attēla skata lodziņu",
+  "lightbox.expand": "Izvērst attēla skata lodziņu",
+  "lightbox.next": "Nākamais",
+  "lightbox.previous": "Iepriekšējais",
+  "limited_account_hint.action": "Tik un tā rādīt profilu",
+  "limited_account_hint.title": "{domain} moderatori ir paslēpuši šo profilu.",
   "lists.account.add": "Pievienot sarakstam",
   "lists.account.remove": "Noņemt no saraksta",
   "lists.delete": "Dzēst sarakstu",
@@ -261,144 +351,216 @@
   "lists.edit.submit": "Mainīt virsrakstu",
   "lists.new.create": "Pievienot sarakstu",
   "lists.new.title_placeholder": "Jaunais saraksta nosaukums",
-  "lists.replies_policy.followed": "Jebkuram lietotājam, kuram seko",
-  "lists.replies_policy.list": "Saraksta dalībnieki",
+  "lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
+  "lists.replies_policy.list": "Saraksta dalībniekiem",
   "lists.replies_policy.none": "Nevienam",
   "lists.replies_policy.title": "Rādīt atbildes:",
   "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
   "loading_indicator.label": "Ielādē...",
-  "media_gallery.toggle_visible": "{number, plural, one {Slēpt # attēlu} other {Slēpt # attēlus}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "missing_indicator.label": "Nav atrasts",
   "missing_indicator.sublabel": "Šo resursu nevarēja atrast",
+  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
   "mute_modal.duration": "Ilgums",
   "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
-  "mute_modal.indefinite": "Nenoteikts",
-  "navigation_bar.apps": "Mobilās lietotnes",
+  "mute_modal.indefinite": "Beztermiņa",
+  "navigation_bar.about": "Par",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
-  "navigation_bar.community_timeline": "Vietējā ziņu lenta",
+  "navigation_bar.community_timeline": "Vietējā laika līnija",
   "navigation_bar.compose": "Veidot jaunu ziņu",
-  "navigation_bar.direct": "Privātās ziņas",
+  "navigation_bar.direct": "Privātie ziņojumi",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
   "navigation_bar.edit_profile": "Rediģēt profilu",
+  "navigation_bar.explore": "Pārlūkot",
   "navigation_bar.favourites": "Izlases",
-  "navigation_bar.filters": "Klusināti vārdi",
+  "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
-  "navigation_bar.follows_and_followers": "Man seko un sekotāji",
-  "navigation_bar.info": "Par šo serveri",
-  "navigation_bar.keyboard_shortcuts": "Ātrie taustiņi",
+  "navigation_bar.follows_and_followers": "Sekojamie un sekotāji",
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
-  "navigation_bar.personal": "Personīgi",
+  "navigation_bar.personal": "Personīgie",
   "navigation_bar.pins": "Piespraustās ziņas",
   "navigation_bar.preferences": "Iestatījumi",
-  "navigation_bar.public_timeline": "Apvienotā ziņu lenta",
+  "navigation_bar.public_timeline": "Apvienotā laika līnija",
+  "navigation_bar.search": "Meklēt",
   "navigation_bar.security": "Drošība",
-  "notification.favourite": "{name} izcēla tavu ziņu",
+  "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.",
+  "notification.admin.report": "{name} sūdzējās par {target}",
+  "notification.admin.sign_up": "{name} pierakstījās",
+  "notification.favourite": "{name} patika tava ziņa",
   "notification.follow": "{name} uzsāka tev sekot",
-  "notification.follow_request": "{name} vēlas tev sekot",
+  "notification.follow_request": "{name} nosūtīja tev sekošanas pieprasījumu",
   "notification.mention": "{name} pieminēja tevi",
-  "notification.own_poll": "Tava aptauja ir pabeigta",
-  "notification.poll": "Aprauja, kurā tu piedalījies, ir pabeigta",
-  "notification.reblog": "{name} paaugstināja tavu ziņu",
+  "notification.own_poll": "Tava aptauja ir noslēgusies",
+  "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
+  "notification.reblog": "{name} pastiprināja tavu ierakstu",
   "notification.status": "{name} tikko publicēja",
+  "notification.update": "{name} rediģēja ierakstu",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
+  "notifications.column_settings.admin.report": "Jaunas sūdzības:",
+  "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlases:",
   "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
   "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
-  "notifications.column_settings.filter_bar.show": "Parādīt",
+  "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
-  "notifications.column_settings.follow_request": "Jauni sekotāju pieprasījumi:",
+  "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminējumi:",
-  "notifications.column_settings.poll": "Aptaujas rezultāti:",
+  "notifications.column_settings.poll": "Aptauju rezultāti:",
   "notifications.column_settings.push": "Uznirstošie paziņojumi",
-  "notifications.column_settings.reblog": "Palielinājumi:",
+  "notifications.column_settings.reblog": "Pastiprinātie ieraksti:",
   "notifications.column_settings.show": "Rādīt kolonnā",
   "notifications.column_settings.sound": "Atskaņot skaņu",
-  "notifications.column_settings.status": "Jaunas ziņas:",
-  "notifications.column_settings.unread_markers.category": "Nelasīto paziņojumu marķieri",
+  "notifications.column_settings.status": "Jauni ieraksti:",
+  "notifications.column_settings.unread_notifications.category": "Nelasītie paziņojumi",
+  "notifications.column_settings.unread_notifications.highlight": "Iezīmēt nelasītos paziņojumus",
+  "notifications.column_settings.update": "Labojumi:",
   "notifications.filter.all": "Visi",
-  "notifications.filter.boosts": "Palielinājumi",
+  "notifications.filter.boosts": "Pastiprinātie ieraksti",
   "notifications.filter.favourites": "Izlases",
-  "notifications.filter.follows": "Seko",
+  "notifications.filter.follows": "Sekošana",
   "notifications.filter.mentions": "Pieminējumi",
-  "notifications.filter.polls": "Aptaujas rezultāti",
+  "notifications.filter.polls": "Aptauju rezultāti",
   "notifications.filter.statuses": "Jaunumi no cilvēkiem, kuriem tu seko",
   "notifications.grant_permission": "Piešķirt atļauju.",
   "notifications.group": "{count} paziņojumi",
-  "notifications.mark_as_read": "Atzīmēt katru paziņojumu kā izlasītu",
+  "notifications.mark_as_read": "Atzīmēt visus paziņojumus kā izlasītus",
   "notifications.permission_denied": "Darbvirsmas paziņojumi nav pieejami, jo iepriekš tika noraidīts pārlūka atļauju pieprasījums",
   "notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
-  "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības ģenerē darbvirsmas paziņojumus, izmantojot iepriekš redzamo pogu {icon}, ja tie ir iespējoti.",
+  "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
-  "picture_in_picture.restore": "Novietot apakšā",
+  "picture_in_picture.restore": "Novietot atpakaļ",
   "poll.closed": "Pabeigta",
   "poll.refresh": "Atsvaidzināt",
-  "poll.total_people": "{count, plural, one {# persona} other {# cilvēki}}",
-  "poll.total_votes": "{count, plural, one {# balsojums} other {# balsojumi}}",
+  "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}",
+  "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}",
   "poll.vote": "Balsot",
   "poll.voted": "Tu balsoji par šo atbildi",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, zero {# balsu} one {# balss} other {# balsis}}",
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
-  "privacy.change": "Mainīt ziņas privātumu",
-  "privacy.direct.long": "Redzams tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tiešs",
-  "privacy.private.long": "Redzams tikai sekotājiem",
+  "privacy.change": "Mainīt ieraksta privātumu",
+  "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
+  "privacy.direct.short": "Tikai minētie cilvēki",
+  "privacy.private.long": "Redzama tikai sekotājiem",
   "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem, rāda publiskajās ziņu lentās",
-  "privacy.public.short": "Publisks",
-  "privacy.unlisted.long": "Redzams visiem, bet ne publiskajās ziņu lentās",
-  "privacy.unlisted.short": "Neminētie",
+  "privacy.public.long": "Redzama visiem",
+  "privacy.public.short": "Publiska",
+  "privacy.unlisted.long": "Redzama visiem, bet izslēgta no satura atklāšanas funkcijām",
+  "privacy.unlisted.short": "Nerindota",
+  "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
+  "privacy_policy.title": "Privātuma politika",
   "refresh": "Atsvaidzināt",
   "regeneration_indicator.label": "Ielādē…",
   "regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "Pirms {number, plural, one {# dienas} other {# dienām}}",
+  "relative_time.full.hours": "Pirms {number, plural, one {# stundas} other {# stundām}}",
+  "relative_time.full.just_now": "tikko",
+  "relative_time.full.minutes": "Pirms {number, plural, one {# minūtes} other {# minūtēm}}",
+  "relative_time.full.seconds": "Pirms {number, plural, one {# sekundes} other {# sekundēm}}",
   "relative_time.hours": "{number}st",
   "relative_time.just_now": "tagad",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "šodien",
   "reply_indicator.cancel": "Atcelt",
+  "report.block": "Bloķēt",
+  "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
+  "report.categories.other": "Citi",
+  "report.categories.spam": "Spams",
+  "report.categories.violation": "Saturs pārkāpj vienu vai vairākus servera noteikumus",
+  "report.category.subtitle": "Izvēlieties labāko atbilstību",
+  "report.category.title": "Pastāsti mums, kas notiek ar šo {type}",
+  "report.category.title_account": "profilu",
+  "report.category.title_status": "ziņu",
+  "report.close": "Darīts",
+  "report.comment.title": "Vai, tavuprāt, mums vēl būtu kas jāzina?",
   "report.forward": "Pārsūtīt {target}",
-  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu ziņojuma kopiju arī tam?",
-  "report.hint": "Pārskats tiks nosūtīts tava servera moderatoriem. Tu vari pievienot paskaidrojumu, kādēļ tu ziņo par kontu:",
+  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
+  "report.mute": "Apklusināt",
+  "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņi ir apklusināti.",
+  "report.next": "Tālāk",
   "report.placeholder": "Papildu komentāri",
+  "report.reasons.dislike": "Man tas nepatīk",
+  "report.reasons.dislike_description": "Tas ir kaut kas, ko tu nevēlies redzēt",
+  "report.reasons.other": "Tas ir kaut kas cits",
+  "report.reasons.other_description": "Šī sūdzība neatbilst pārējām kategorijām",
+  "report.reasons.spam": "Tas ir spams",
+  "report.reasons.spam_description": "Ļaunprātīgas saites, viltus iesaistīšana vai atkārtotas atbildes",
+  "report.reasons.violation": "Tas pārkāpj servera noteikumus",
+  "report.reasons.violation_description": "Tu zini, ka tas pārkāpj konkrētus noteikumus",
+  "report.rules.subtitle": "Atlasi visus atbilstošos",
+  "report.rules.title": "Kuri noteikumi tiek pārkāpti?",
+  "report.statuses.subtitle": "Atlasi visus atbilstošos",
+  "report.statuses.title": "Vai ir kādi ieraksti, kas atbalsta šo sūdzību?",
   "report.submit": "Iesniegt",
-  "report.target": "Ziņošana par: {target}",
+  "report.target": "Sūdzība par {target}",
+  "report.thanks.take_action": "Vari veikt šīs darbības, lai kontrolētu Mastodon redzamo saturu:",
+  "report.thanks.take_action_actionable": "Kamēr mēs to izskatām, tu vari veikt darbības pret @{name}:",
+  "report.thanks.title": "Vai nevēlies to redzēt?",
+  "report.thanks.title_actionable": "Paldies, ka ziņoji, mēs to izskatīsim.",
+  "report.unfollow": "Pārtraukt sekot @{name}",
+  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā mājas plūsmā, pārtrauc viņiem sekot.",
+  "report_notification.attached_statuses": "{count, plural, one {Pievienots {count} ieraksts} other {Pievienoti {count} ieraksti}}",
+  "report_notification.categories.other": "Cita",
+  "report_notification.categories.spam": "Spams",
+  "report_notification.categories.violation": "Noteikumu pārkāpums",
+  "report_notification.open": "Atvērt sūdzību",
   "search.placeholder": "Meklēšana",
+  "search.search_or_paste": "Meklē vai iekopē URL",
   "search_popout.search_format": "Paplašināts meklēšanas formāts",
-  "search_popout.tips.full_text": "Vienkāršs teksts atgriež ziņas, kuras esi rakstījis, iecienījis, paaugstinājis vai pieminējis, kā arī atbilstošie lietotājvārdi, parādāmie vārdi un tēmturi.",
-  "search_popout.tips.hashtag": "mirkļbirka",
-  "search_popout.tips.status": "ziņa",
-  "search_popout.tips.text": "Vienkāršs teksts atgriež atbilstošus parādāmos vārdus, lietotājvārdus un mirkļbirkas",
+  "search_popout.tips.full_text": "Vienkāršs teksts atgriež ierakstus, kurus rakstīji, atzīmēji kā favorītus, pastiprināji vai pieminēji, kā arī atbilstošus lietotājvārdus, parādāmos vārdus un tēmturus.",
+  "search_popout.tips.hashtag": "tēmturis",
+  "search_popout.tips.status": "ieraksts",
+  "search_popout.tips.text": "Vienkāršs teksts atgriež atbilstošus parādāmos vārdus, lietotājvārdus un tēmturus",
   "search_popout.tips.user": "lietotājs",
   "search_results.accounts": "Cilvēki",
-  "search_results.hashtags": "Mirkļbirkas",
-  "search_results.statuses": "Ziņas",
+  "search_results.all": "Visi",
+  "search_results.hashtags": "Tēmturi",
+  "search_results.nothing_found": "Nevarēja atrast neko šiem meklēšanas vienumiem",
+  "search_results.statuses": "Ieraksti",
   "search_results.statuses_fts_disabled": "Šajā Mastodon serverī nav iespējota ziņu meklēšana pēc to satura.",
-  "search_results.total": "{count, number} {count, plural, one {rezultāts} other {rezultāti}}",
+  "search_results.title": "Meklēt {q}",
+  "search_results.total": "{count, number} {count, plural, zero {rezultātu} one {rezultāts} other {rezultāti}}",
+  "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
+  "server_banner.active_users": "aktīvie lietotāji",
+  "server_banner.administered_by": "Administrē:",
+  "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
+  "server_banner.learn_more": "Uzzināt vairāk",
+  "server_banner.server_stats": "Servera statistika:",
+  "sign_in_banner.create_account": "Izveidot kontu",
+  "sign_in_banner.sign_in": "Pierakstīties",
+  "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu ziņas izlasei, kopīgotu ziņas un atbildētu uz tām vai mijiedarbotos no sava konta citā serverī.",
   "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
-  "status.cancel_reblog_private": "Nepaaugstināt",
-  "status.cannot_reblog": "Nevar paaugstināt ziņu",
+  "status.cancel_reblog_private": "Noņemt pastiprinājumu",
+  "status.cannot_reblog": "Nevar pastiprināt šo ierakstu",
   "status.copy": "Kopēt saiti uz ziņu",
   "status.delete": "Dzēst",
   "status.detailed_status": "Detalizēts sarunas skats",
   "status.direct": "Privāta ziņa @{name}",
+  "status.edit": "Rediģēt",
+  "status.edited": "Rediģēts {date}",
+  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
-  "status.favourite": "Iecienītā",
+  "status.favourite": "Patīk",
+  "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
+  "status.hide": "Slēpt ierakstu",
+  "status.history.created": "{name} izveidoja {date}",
+  "status.history.edited": "{name} rediģēja {date}",
   "status.load_more": "Ielādēt vairāk",
   "status.media_hidden": "Medijs ir paslēpts",
   "status.mention": "Pieminēt @{name}",
@@ -407,70 +569,78 @@
   "status.mute_conversation": "Apklusināt sarunu",
   "status.open": "Paplašināt šo ziņu",
   "status.pin": "Piespraust profilam",
-  "status.pinned": "Piespraustā ziņa",
+  "status.pinned": "Piespraustais ieraksts",
   "status.read_more": "Lasīt vairāk",
-  "status.reblog": "Paaugstināt",
-  "status.reblog_private": "Paaugstināt ar sākotnējo izskatu",
-  "status.reblogged_by": "{name} paaugstināts",
-  "status.reblogs.empty": "Neviens šo ziņojumu vel nav paaugstinājis. Kad būs, tie parādīsies šeit.",
+  "status.reblog": "Pastiprināt",
+  "status.reblog_private": "Pastiprināt, nemainot redzamību",
+  "status.reblogged_by": "{name} pastiprināja",
+  "status.reblogs.empty": "Neviens šo ierakstu vēl nav pastiprinājis. Kad būs, tie parādīsies šeit.",
   "status.redraft": "Dzēst un pārrakstīt",
   "status.remove_bookmark": "Noņemt grāmatzīmi",
+  "status.replied_to": "Atbildēja {name}",
   "status.reply": "Atbildēt",
-  "status.replyAll": "Atbildēt uz tematu",
-  "status.report": "Atskaite @{name}",
+  "status.replyAll": "Atbildēt uz pavedienu",
+  "status.report": "Sūdzēties par @{name}",
   "status.sensitive_warning": "Sensitīvs saturs",
   "status.share": "Kopīgot",
+  "status.show_filter_reason": "Tomēr rādīt",
   "status.show_less": "Rādīt mazāk",
   "status.show_less_all": "Rādīt mazāk visiem",
   "status.show_more": "Rādīt vairāk",
   "status.show_more_all": "Rādīt vairāk visiem",
-  "status.show_thread": "Rādīt tematu",
+  "status.show_original": "Rādīt oriģinālu",
+  "status.translate": "Tulkot",
+  "status.translated_from_with": "Tulkots no {lang}, izmantojot {provider}",
   "status.uncached_media_warning": "Nav pieejams",
-  "status.unmute_conversation": "Atvērt sarunu",
-  "status.unpin": "Noņemt no profila",
+  "status.unmute_conversation": "Noņemt sarunas apklusinājumu",
+  "status.unpin": "Noņemt profila piespraudumu",
+  "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas un sarakstu laika līnijā tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
+  "subscribed_languages.save": "Saglabāt izmaiņas",
+  "subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
   "suggestions.dismiss": "Noraidīt ieteikumu",
-  "suggestions.header": "Jūs varētu interesēt arī…",
+  "suggestions.header": "Tevi varētu interesēt arī…",
   "tabs_bar.federated_timeline": "Apvienotā",
   "tabs_bar.home": "Sākums",
   "tabs_bar.local_timeline": "Vietējā",
   "tabs_bar.notifications": "Paziņojumi",
-  "tabs_bar.search": "Meklēt",
-  "time_remaining.days": "Atlikušas {number, plural, one {# diena} other {# dienas}}",
-  "time_remaining.hours": "Atlikušas {number, plural, one {# stunda} other {# stundas}}",
-  "time_remaining.minutes": "Atlikušas {number, plural, one {# minūte} other {# minūtes}}",
+  "time_remaining.days": "{number, plural, one {Atlikusi # diena} other {Atlikušas # dienas}}",
+  "time_remaining.hours": "{number, plural, one {Atlikusi # stunda} other {Atlikušas # stundas}}",
+  "time_remaining.minutes": "{number, plural, one {Atlikusi # minūte} other {Atlikušas # minūtes}}",
   "time_remaining.moments": "Atlikuši daži mirkļi",
-  "time_remaining.seconds": "Atlikušas {number, plural, one {# sekunde} other {# sekundes}}",
+  "time_remaining.seconds": "{number, plural, one {Atlikusi # sekunde} other {Atlikušas # sekundes}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} no citiem serveriem nav parādīti.",
   "timeline_hint.resources.followers": "Sekotāji",
-  "timeline_hint.resources.follows": "Seko",
-  "timeline_hint.resources.statuses": "Vecākas ziņas",
-  "trends.counter_by_accounts": "Sarunājas {count, plural, one {{counter} persona} other {{counter} cilvēki}}",
-  "trends.trending_now": "Šobrīd tendences",
-  "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
-  "units.short.billion": "{count}M",
-  "units.short.million": "{count}M",
+  "timeline_hint.resources.follows": "Sekojošie",
+  "timeline_hint.resources.statuses": "Vecāki ieraksti",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {# dienu} other {{days} dienām}}",
+  "trends.trending_now": "Aktuālās tendences",
+  "ui.beforeunload": "Ja pametīsiet Mastodon, jūsu melnraksts tiks zaudēts.",
+  "units.short.billion": "{count}Mjd",
+  "units.short.million": "{count}Mjn",
   "units.short.thousand": "{count}Tk",
   "upload_area.title": "Velc un nomet, lai augšupielādētu",
   "upload_button.label": "Pievienot bildi, video vai audio datni",
   "upload_error.limit": "Sasniegts datņu augšupielādes ierobežojums.",
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
-  "upload_form.audio_description": "Aprakstiet cilvēkiem ar dzirdes zudumu",
-  "upload_form.description": "Aprakstiet vājredzīgajiem",
+  "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
+  "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
+  "upload_form.description_missing": "Apraksts nav pievienots",
   "upload_form.edit": "Rediģēt",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
   "upload_form.undo": "Dzēst",
-  "upload_form.video_description": "Aprakstiet cilvēkiem ar dzirdes vai redzes traucējumiem",
+  "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
-  "upload_modal.apply": "Apstiprināt",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.apply": "Pielietot",
+  "upload_modal.applying": "Pielieto…",
   "upload_modal.choose_image": "Izvēlēties attēlu",
-  "upload_modal.description_placeholder": "Raibais runcis rīgā ratu rumbā rūc",
+  "upload_modal.description_placeholder": "Raibais runcis Rīgā ratu rumbā rūc",
   "upload_modal.detect_text": "Noteikt tekstu no attēla",
   "upload_modal.edit_media": "Rediģēt mediju",
-  "upload_modal.hint": "Noklikšķiniet vai velciet apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
+  "upload_modal.hint": "Noklikšķini vai velc apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
   "upload_modal.preparing_ocr": "Sagatavo OCR…",
   "upload_modal.preview_label": "Priekšskatīt ({ratio})",
   "upload_progress.label": "Augšupielādē...",
+  "upload_progress.processing": "Apstrādā…",
   "video.close": "Aizvērt video",
   "video.download": "Lejupielādēt datni",
   "video.exit_fullscreen": "Iziet no pilnekrāna",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 36ea33bb8..f01f84c9e 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -1,53 +1,74 @@
 {
-  "account.account_note_header": "Note",
+  "about.blocks": "Модерирани сервери",
+  "about.contact": "Контакт:",
+  "about.disclaimer": "Mastodon е бесплатен, open-source софтвер, и заштитен знак на Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon вообичаено ви дозволува да прегледувате содржини и комуницирате со корисниците од било кој сервер во федиверзумот. На овој сервер има исклучоци.",
+  "about.domain_blocks.silenced.explanation": "Вообичаено нема да гледате профили и содржина од овој сервер, освен ако не го пребарате намерно, или го заследите.",
+  "about.domain_blocks.silenced.title": "Ограничено",
+  "about.domain_blocks.suspended.explanation": "Податоците од овој сервер нема да бидат процесирани, зачувани или сменети и било која интеракција или комуникација со корисниците од овој сервер ќе биде невозможна.",
+  "about.domain_blocks.suspended.title": "Суспендиран",
+  "about.not_available": "Оваа информација не е достапна на овој сервер.",
+  "about.powered_by": "Децентрализиран друштвен медиум овозможен од {mastodon}",
+  "about.rules": "Правила на серверот",
+  "account.account_note_header": "Белешка",
   "account.add_or_remove_from_list": "Додади или одстрани од листа",
   "account.badges.bot": "Бот",
-  "account.badges.group": "Group",
+  "account.badges.group": "Група",
   "account.block": "Блокирај @{name}",
   "account.block_domain": "Сокријај се од {domain}",
   "account.blocked": "Блокиран",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Одкажи барање за следење",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Директна порана @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Скриен домен",
   "account.edit_profile": "Измени профил",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Карактеристики на профилот",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Следи",
   "account.followers": "Следбеници",
   "account.followers.empty": "Никој не го следи овој корисник сеуште.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "Корисникот не следи никој сеуште.",
   "account.follows_you": "Те следи тебе",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Сокриј буст од @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Последно активен",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Сопстевноста на овај линк беше проверен на {date}",
   "account.locked_info": "Статусот на приватност на овај корисник е сетиран како заклучен. Корисникот одлучува кој можи да го следи него.",
   "account.media": "Медија",
   "account.mention": "Спомни @{name}",
-  "account.moved_to": "{name} се пресели во:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Зачути го @{name}",
   "account.mute_notifications": "Исклучи известувања од @{name}",
   "account.muted": "Зачутено",
-  "account.never_active": "Никогаш",
+  "account.open_original_page": "Open original page",
   "account.posts": "Тутови",
   "account.posts_with_replies": "Тутови и реплики",
   "account.report": "Пријави @{name}",
   "account.requested": "Се чека одобрување. Кликни за да одкажиш барање за следење",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Сподели @{name} профил",
   "account.show_reblogs": "Прикажи бустови од @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Одблокирај @{name}",
   "account.unblock_domain": "Прикажи {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Не прикажувај на профил",
   "account.unfollow": "Одследи",
   "account.unmute": "Зачути го @{name}",
   "account.unmute_notifications": "Исклучи известувања од @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "Упс!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} неделно",
   "boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
-  "bundle_column_error.body": "Се случи проблем при вчитувањето.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Обидете се повторно",
-  "bundle_column_error.title": "Мрежна грешка",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Настана грешка при прикажувањето на оваа веб-страница.",
   "bundle_modal_error.retry": "Обидете се повторно",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
   "column.community": "Локална временска зона",
-  "column.direct": "Директна порака",
+  "column.direct": "Direct messages",
   "column.directory": "Види профили",
   "column.domain_blocks": "Скриени домеини",
   "column.favourites": "Омилени",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Само медиа",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Научи повеќе",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "заклучен",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Избриши избор",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Тутови",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
   "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
   "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
   "confirmations.block.message": "Сигурни сте дека дека го блокирате {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Избриши",
   "confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
   "confirmations.delete_list.confirm": "Избриши",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Означете како прочитано",
   "conversation.open": "Прегледај разговор",
   "conversation.with": "Со {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Од познати fediverse",
   "directory.local": "Само од {domain}",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Активност",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Храна &amp; Пијалаци",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Немате сеуште блокирано корисници.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Локалниот времеплов е празен. Објавете нешто јавно за да може да почне шоуто!",
-  "empty_column.direct": "Немате директни пораки. Кога ќе пратите или примите, ќе се појават тука.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Немате сокриени домеини уште.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Пријавете проблем",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Програмери",
-  "getting_started.directory": "Профил директориум",
-  "getting_started.documentation": "Документација",
   "getting_started.heading": "Започни",
-  "getting_started.invite": "Покани луѓе",
-  "getting_started.open_source_notice": "Мастодон е софтвер со отворен код. Можете да придонесувате или пријавувате проблеми во GitHub на {github}.",
-  "getting_started.security": "Поставки на сметката",
-  "getting_started.terms": "Услови на користење",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Било кои",
   "hashtag.column_settings.tag_mode.none": "Никои",
   "hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи бустирања",
   "home.column_settings.show_replies": "Прикажи одговори",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# ден} other {# дена}}",
   "intervals.full.hours": "{number, plural, one {# час} other {# часа}}",
   "intervals.full.minutes": "{number, plural, one {# минута} other {# минути}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Уреди профил",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Омилени",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
   "navigation_bar.follows_and_followers": "Следења и следбеници",
-  "navigation_bar.info": "За овој сервер",
-  "navigation_bar.keyboard_shortcuts": "Кратенки",
   "navigation_bar.lists": "Листи",
   "navigation_bar.logout": "Одјави се",
   "navigation_bar.mutes": "Заќутени корисници",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Федеративен времеплов",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Безбедност",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Прикажи во колона",
   "notifications.column_settings.sound": "Свири звуци",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Сите",
   "notifications.filter.boosts": "Бустови",
   "notifications.filter.favourites": "Омилени",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
   "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Директно",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Само следбеници",
-  "privacy.public.long": "Објави во јавни времплови",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Не објавувај на јавни времеплови",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Необјавено",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",
   "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
   "relative_time.days": "{number}д",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}ч",
   "relative_time.just_now": "сега",
   "relative_time.minutes": "{number}м",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Откажи",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Проследи до {target}",
   "report.forward_hint": "Оваа сметка е од друг сервер. Испрати анонимна копија од пријавата и таму?",
-  "report.hint": "Пријавата ќе биде испратена до вашиот серверски модератор. Подолу можете да ставите опис зошто ја пријавувате сметката:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Додатни коментари",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Испрати",
   "report.target": "Пријавување {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Барај",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Напреден формат за барање",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "хештег",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Прост текст враќа совпаднати имиња, корисници и хештагови",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Дома",
   "tabs_bar.local_timeline": "Локално",
   "tabs_bar.notifications": "Нотификации",
-  "tabs_bar.search": "Барај",
   "time_remaining.days": "{number, plural, one {# ден} other {# дена}} {number, plural, one {остана} other {останаа}}",
   "time_remaining.hours": "{number, plural, one {# час} other {# часа}} {number, plural, one {остана} other {останаа}}",
   "time_remaining.minutes": "{number, plural, one {# минута} other {# минути}} {number, plural, one {остана} other {останаа}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index cb320a661..39766a775 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "മോഡറേറ്റഡ് സെർവറുകൾ",
+  "about.contact": "ബന്ധപ്പെടുക:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "കാരണം ലഭ്യമല്",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "പരിമിതമായത്",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "താൽക്കാലികമായി നിർത്തിവെച്ചിരിക്കുന്നു",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "സെർവ്വർ നിയമങ്ങൾ",
   "account.account_note_header": "കുറിപ്പ്",
   "account.add_or_remove_from_list": "പട്ടികയിൽ ചേർക്കുകയോ/മാറ്റുകയോ ചെയ്യുക",
   "account.badges.bot": "റോബോട്ട്",
@@ -7,64 +19,86 @@
   "account.block_domain": "{domain} എന്ന മേഖല തടയുക",
   "account.blocked": "തടഞ്ഞു",
   "account.browse_more_on_origin_server": "യഥാർത്ഥ പ്രൊഫൈലിലേക്ക് പോവുക",
-  "account.cancel_follow_request": "പിന്തുടരാനുള്ള അപേക്ഷ നിരസിക്കുക",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "@{name}-ന്(ക്ക്) നേരിട്ട് സന്ദേശം അയക്കുക",
   "account.disable_notifications": "@{name} പോസ്റ്റുചെയ്യുന്നത് എന്നെ അറിയിക്കുന്നത് നിർത്തുക",
   "account.domain_blocked": "മേഖല തടഞ്ഞു",
   "account.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "account.enable_notifications": "@{name} പോസ്റ്റ് ചെയ്യുമ്പോൾ എന്നെ അറിയിക്കുക",
   "account.endorse": "പ്രൊഫൈലിൽ പ്രകടമാക്കുക",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "പിന്തുടരുക",
   "account.followers": "പിന്തുടരുന്നവർ",
   "account.followers.empty": "ഈ ഉപയോക്താവിനെ ആരും ഇതുവരെ പിന്തുടരുന്നില്ല.",
   "account.followers_counter": "{count, plural, one {{counter} പിന്തുടരുന്നവർ} other {{counter} പിന്തുടരുന്നവർ}}",
+  "account.following": "പിന്തുടരുന്നു",
   "account.following_counter": "{count, plural, one {{counter} പിന്തുടരുന്നു} other {{counter} പിന്തുടരുന്നു}}",
   "account.follows.empty": "ഈ ഉപയോക്താവ് ആരേയും ഇതുവരെ പിന്തുടരുന്നില്ല.",
   "account.follows_you": "നിങ്ങളെ പിന്തുടരുന്നു",
+  "account.go_to_profile": "പ്രൊഫൈലിലേക്ക് പോകാം",
   "account.hide_reblogs": "@{name} ബൂസ്റ്റ് ചെയ്തവ മറയ്കുക",
-  "account.joined": "{date} ൽ ചേർന്നു",
-  "account.last_status": "അവസാനം കണ്ടത്",
+  "account.joined_short": "ജോയിൻ ചെയ്‌തിരിക്കുന്നു",
+  "account.languages": "സബ്‌സ്‌ക്രൈബ് ചെയ്‌ത ഭാഷകൾ മാറ്റുക",
   "account.link_verified_on": "ഈ ലിങ്കിന്റെ ഉടമസ്തത {date} ഇൽ ഉറപ്പാക്കിയതാണ്",
   "account.locked_info": "ഈ അംഗത്വത്തിന്റെ സ്വകാര്യതാ നിലപാട് അനുസരിച്ച് പിന്തുടരുന്നവരെ തിരഞ്ഞെടുക്കാനുള്ള വിവേചനാധികാരം ഉടമസ്ഥനിൽ നിഷിപ്തമായിരിക്കുന്നു.",
   "account.media": "മീഡിയ",
   "account.mention": "@{name} സൂചിപ്പിക്കുക",
-  "account.moved_to": "{name} ഇതിലേക്ക് മാറിയിരിക്കുന്നു:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "@{name}-നെ(യെ) നിശ്ശബ്ദമാക്കൂ",
   "account.mute_notifications": "@{name} യിൽ നിന്നുള്ള അറിയിപ്പുകൾ നിശബ്ദമാക്കുക",
   "account.muted": "നിശ്ശബ്ദമാക്കിയിരിക്കുന്നു",
-  "account.never_active": "ഒരിക്കലും ഇല്ല",
+  "account.open_original_page": "Open original page",
   "account.posts": "പോസ്റ്റുകൾ",
   "account.posts_with_replies": "പോസ്റ്റുകളും മറുപടികളും",
   "account.report": "റിപ്പോർട്ട് ചെയ്യുക @{name}",
   "account.requested": "അനുവാദത്തിനായി കാത്തിരിക്കുന്നു. പിന്തുടരാനുള്ള അപേക്ഷ റദ്ദാക്കുവാൻ ഞെക്കുക",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} ന്റെ പ്രൊഫൈൽ പങ്കിടുക",
   "account.show_reblogs": "@{name} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക",
   "account.statuses_counter": "{count, plural, one {{counter} ടൂട്ട്} other {{counter} ടൂട്ടുകൾ}}",
   "account.unblock": "@{name} തടഞ്ഞത് മാറ്റുക",
   "account.unblock_domain": "{domain} എന്ന മേഖല വെളിപ്പെടുത്തുക",
+  "account.unblock_short": "അൺബ്ലോക്കു ചെയ്യുക",
   "account.unendorse": "പ്രൊഫൈലിൽ പ്രകടമാക്കരുത്",
   "account.unfollow": "പിന്തുടരുന്നത് നിര്‍ത്തുക",
   "account.unmute": "നിശ്ശബ്ദമാക്കുന്നത് നിർത്തുക @{name}",
   "account.unmute_notifications": "@{name} യിൽ നിന്നുള്ള അറിയിപ്പുകൾ പ്രസിദ്ധപ്പെടുത്തുക",
+  "account.unmute_short": "അൺമ്യൂട്ട് ചെയ്യുക",
   "account_note.placeholder": "കുറിപ്പ് ചേർക്കാൻ ക്ലിക്കുചെയ്യുക",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "ശരാശരി",
   "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.retention.cohort_size": "പുതിയ ഉപയോക്താക്കൾ",
   "alert.rate_limited.message": "{retry_time, time, medium} നു ശേഷം വീണ്ടും ശ്രമിക്കുക.",
   "alert.rate_limited.title": "തോത് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു",
   "alert.unexpected.message": "അപ്രതീക്ഷിതമായി എന്തോ സംഭവിച്ചു.",
   "alert.unexpected.title": "ശ്ശോ!",
   "announcement.announcement": "അറിയിപ്പ്",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
+  "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
   "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
-  "bundle_column_error.body": "ഈ ഘടകം പ്രദശിപ്പിക്കുമ്പോൾ എന്തോ കുഴപ്പം സംഭവിച്ചു.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
-  "bundle_column_error.title": "ശൃംഖലയിലെ പിഴവ്",
+  "bundle_column_error.return": "ഹോം പേജിലേക്ക് മടങ്ങാം",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "അടയ്ക്കുക",
   "bundle_modal_error.message": "ഈ വെബ്പേജ് പ്രദർശിപ്പിക്കുമ്പോൾ എന്തോ കുഴപ്പം സംഭവിച്ചു.",
   "bundle_modal_error.retry": "വീണ്ടും ശ്രമിക്കുക",
+  "closed_registrations.other_server_instructions": "Mastodon വികേന്ദ്രീകൃത സംവിധാനം ആയതിനാൽ, നിങ്ങൾക്ക് മറ്റൊരു സെർവറിൽ ഒരു അക്കൗണ്ട് ഉണ്ടാക്കിയും ഇതുമായി ആശയവിനിമയം നടത്താൻ സാധിക്കുന്നതാണ്.",
+  "closed_registrations_modal.description": "{domain} ഇൽ ഇപ്പോൾ അക്കൗണ്ട് ഉണ്ടാക്കാൻ സാധിക്കുന്നതല്ല, Mastodon ഉപയോഗിക്കുന്നതിനായി നിങ്ങൾക്ക് {domain}-ൽ പ്രത്യേകമായി ഒരു അക്കൗണ്ട് ആവശ്യമില്ല എന്നത് ദയവായി ഓർക്കുക.",
+  "closed_registrations_modal.find_another_server": "മറ്റൊരു സെർവർ കണ്ടെത്തുക",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "അപ്ലിക്കേഷനെക്കുറിച്ച്",
   "column.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "column.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "column.community": "പ്രാദേശികമായ സമയരേഖ",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
   "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "പരാമർശിക്കപ്പെട്ടിരിക്കുന്ന ഉപയോഗ്താക്കൾക്കെ ഈ ടൂട്ട് അയക്കപ്പെടുകയുള്ളു.",
+  "compose.language.change": "ഭാഷ മാറ്റുക",
+  "compose.language.search": "ഭാഷകൾ തിരയുക...",
   "compose_form.direct_message_warning_learn_more": "കൂടുതൽ പഠിക്കുക",
+  "compose_form.encryption_warning": "Mastodon-ലെ പോസ്റ്റുകൾ എൻഡ്-ടു-എൻഡ് എൻക്രിപ്റ്റ് ചെയ്തവയല്ല. അതിനാൽ Mastodon-ൽ പ്രധാനപ്പെട്ട വിവരങ്ങളൊന്നും പങ്കിടരുത്.",
   "compose_form.hashtag_warning": "ഈ ടൂട്ട് പട്ടികയിൽ ഇല്ലാത്തതിനാൽ ഒരു ചർച്ചാവിഷയത്തിന്റെ പട്ടികയിലും പെടുകയില്ല. പരസ്യമായ ടൂട്ടുകൾ മാത്രമേ ചർച്ചാവിഷയം അടിസ്ഥാനമാക്കി തിരയുവാൻ സാധിക്കുകയുള്ളു.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
-  "compose_form.publish": "ടൂട്ട്",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
   "confirmations.block.message": "{name} തടയാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "മായ്ക്കുക",
   "confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "confirmations.delete_list.confirm": "മായ്ക്കുക",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "വായിച്ചതായി അടയാളപ്പെടുത്തുക",
   "conversation.open": "സംഭാഷണം കാണുക",
   "conversation.with": "{names} കൂടെ",
+  "copypaste.copied": "പകർത്തി",
+  "copypaste.copy": "പകര്‍ത്തുക",
   "directory.federated": "അറിയപ്പെടുന്ന ഫെഡിവേഴ്‌സ്ൽ നിന്ന്",
   "directory.local": "{domain} ൽ നിന്ന് മാത്രം",
   "directory.new_arrivals": "പുതിയ വരവുകൾ",
   "directory.recently_active": "അടുത്തിടെയായി സജീവമായ",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "നിങ്ങളുടെ {disabledAccount} എന്ന അക്കൗണ്ട് ഇപ്പോൾ പ്രവർത്തനരഹിതമാണ്.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "ചുവടെയുള്ള കോഡ് പകർത്തിക്കൊണ്ട് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ഈ ടൂട്ട് ഉൾച്ചേർക്കുക.",
   "embed.preview": "ഇത് ഇങ്ങനെ കാണപ്പെടും:",
   "emoji_button.activity": "പ്രവര്‍ത്തനം",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "സ്വന്തമായ ഭേദഗതി",
   "emoji_button.flags": "കൊടികൾ",
   "emoji_button.food": "ഭക്ഷണവും പാനീയവും",
@@ -163,18 +214,19 @@
   "empty_column.blocks": "നിങ്ങൾ ഇതുവരെ ഒരു ഉപയോക്താക്കളെയും തടഞ്ഞിട്ടില്ല.",
   "empty_column.bookmarked_statuses": "നിങ്ങൾക് ഇതുവരെ അടയാളപ്പെടുത്തിയ ടൂട്ടുകൾ ഇല്ല. അടയാളപ്പെടുത്തിയാൽ അത് ഇവിടെ വരും.",
   "empty_column.community": "പ്രാദേശികമായ സമയരേഖ ശൂന്യമാണ്. എന്തെങ്കിലും പരസ്യമായി എഴുതി തുടക്കം കുറിക്കു!",
-  "empty_column.direct": "നിങ്ങൾക്ക് ഇതുവരെ നേരിട്ടുള്ള സന്ദേശങ്ങൾ ഒന്നുമില്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് അയക്കുകയോ, നിങ്ങൾക്ക് ലഭിക്കുകയോ ചെയ്യുന്നപക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "മറയ്ക്കപ്പെട്ടിരിക്കുന്ന മേഖലകൾ ഇതുവരെ ഇല്ല.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "നിങ്ങൾക്ക് ഇത് വരെ ഒരു പ്രിയപ്പെട്ട ടൂട്ടും ഇല്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് പ്രിയപ്പെടുന്ന പക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
   "empty_column.favourites": "ഇതുവരെ ആരും ഈ ടൂട്ട് പ്രിയപ്പെട്ടതായി അടയാളപ്പെടുത്തിയിട്ടില്ല. ആരെങ്കിലും അങ്ങനെ ചെയ്യുന്നപക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "ഈ ഹാഷ്‌ടാഗിൽ ഇതുവരെ ഒന്നുമില്ല.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home.suggestions": "ചില നിർദ്ദേശങ്ങൾ കാണുക",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.mutes": "നിങ്ങൾ ഇതുവരെ ഒരു ഉപയോക്താക്കളെയും തടഞ്ഞിട്ടില്ല.",
   "empty_column.notifications": "നിങ്ങൾക്ക് ഇതുവരെ ഒരു അറിയിപ്പുകളും ഇല്ല. മറ്റുള്ളവരുമായി ഇടപെട്ട് സംഭാഷണത്തിന് തുടക്കം കുറിക്കു.",
   "empty_column.public": "ഇവിടെ ഒന്നുമില്ലല്ലോ! ഇവിടെ നിറയ്ക്കാൻ എന്തെങ്കിലും പരസ്യമായി എഴുതുകയോ മറ്റ് ഉപഭോക്താക്കളെ പിന്തുടരുകയോ ചെയ്യുക",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "പ്രശ്നം അറിയിക്കുക",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "പര്യവേക്ഷണം നടത്തുക",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "പുതിയ വിഭാഗം: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "പൂര്‍ത്തിയായീ",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "ചുമതലപ്പെടുത്തുക",
   "follow_request.reject": "നിരസിക്കുക",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "സംരക്ഷിച്ചു",
-  "getting_started.developers": "വികസിപ്പിക്കുന്നവർ",
-  "getting_started.directory": "പ്രൊഫൈൽ ഡയറക്ടറി",
-  "getting_started.documentation": "രേഖാ സമാഹരണം",
   "getting_started.heading": "തുടക്കം കുറിക്കുക",
-  "getting_started.invite": "ആളുകളെ ക്ഷണിക്കുക",
-  "getting_started.open_source_notice": "മാസ്റ്റഡോൺ ഒരു സ്വതന്ത്ര സോഫ്ട്‍വെയർ ആണ്. നിങ്ങൾക്ക് {github} GitHub ൽ സംഭാവന ചെയ്യുകയോ പ്രശ്നങ്ങൾ അറിയിക്കുകയോ ചെയ്യാം.",
-  "getting_started.security": "അംഗത്വ ക്രമീകരണങ്ങൾ",
-  "getting_started.terms": "സേവന വ്യവസ്ഥകൾ",
   "hashtag.column_header.tag_mode.all": "{additional} ഉം കൂടെ",
   "hashtag.column_header.tag_mode.any": "അല്ലെങ്കിൽ {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} ഇല്ലാതെ",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "അടിസ്ഥാനം",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
   "home.show_announcements": "പ്രഖ്യാപനങ്ങൾ കാണിക്കുക",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "ഈ സെർവറീൽ",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "അടുത്തത്",
   "lightbox.previous": "പുറകോട്ട്",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "പട്ടികയിലേക്ക് ചേർക്കുക",
   "lists.account.remove": "പട്ടികയിൽ നിന്ന് ഒഴിവാക്കുക",
   "lists.delete": "പട്ടിക ഒഴിവാക്കുക",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "കാണാനില്ല",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "കാലാവധി",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "അനിശ്ചിതകാല",
-  "navigation_bar.apps": "മൊബൈൽ ആപ്പുകൾ",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
-  "navigation_bar.direct": "നേരിട്ടുള്ള സന്ദേശങ്ങൾ",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "പ്രിയപ്പെട്ടവ",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "ഈ സെർവറിനെക്കുറിച്ച്",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
   "navigation_bar.mutes": "നിശബ്ദമാക്കപ്പെട്ട ഉപയോക്താക്കൾ",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "ക്രമീകരണങ്ങൾ",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "സുരക്ഷ",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു",
   "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} നിങ്ങളുടെ പോസ്റ്റ് ബൂസ്റ്റ് ചെയ്തു",
   "notification.status": "{name} ഇപ്പോൾ പോസ്റ്റുചെയ്‌തു",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
   "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
   "notifications.column_settings.favourite": "പ്രിയപ്പെട്ടവ:",
   "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "കാണിക്കുക",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
   "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
   "notifications.column_settings.mention": "സൂചനകൾ:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "ശബ്ദം പ്ലേ ചെയ്യുക",
   "notifications.column_settings.status": "പുതിയ ടൂട്ടുകൾ:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "എല്ലാം",
   "notifications.filter.boosts": "ബൂസ്റ്റുകൾ",
   "notifications.filter.favourites": "പ്രിയപ്പെട്ടവ",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
   "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "നേരിട്ട്",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "പിന്തുടരുന്നവർക്ക് മാത്രം",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
   "regeneration_indicator.sublabel": "നിങ്ങളുടെ ഹോം ഫീഡ് തയാറാക്കുന്നു!",
   "relative_time.days": "{number}ദിവസം",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}മണി",
   "relative_time.just_now": "ഇപ്പോൾ",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "ഇന്ന്",
   "reply_indicator.cancel": "റദ്ദാക്കുക",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "ഈ അക്കൗണ്ട് മറ്റൊരു സെർവറിൽ നിന്നാണ്. റിപ്പോർട്ടിന്റെ അജ്ഞാത പകർപ്പ് അവിടെ അയയ്ക്കണോ?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "കൂടുതൽ അഭിപ്രായങ്ങൾ",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "സമർപ്പിക്കുക",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "തിരയുക",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "ഹാഷ്ടാഗ്",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "ഉപയോക്താവ്",
   "search_results.accounts": "ആളുകൾ",
+  "search_results.all": "All",
   "search_results.hashtags": "ഹാഷ്ടാഗുകൾ",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "ടൂട്ടുകൾ",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "@{name} -നെ തടയുക",
@@ -396,9 +551,16 @@
   "status.delete": "മായ്ക്കുക",
   "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
   "status.direct": "@{name} ന് നേരിട്ട് മെസേജ് അയക്കുക",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "ഉൾച്ചേർക്കുക",
   "status.favourite": "പ്രിയപ്പെട്ടത്",
+  "status.filter": "Filter this post",
   "status.filtered": "ഫിൽട്ടർ ചെയ്‌തു",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക",
   "status.media_hidden": "മീഡിയ മറച്ചു",
   "status.mention": "@{name} സൂചിപ്പിക്കുക",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "ഇല്ലാതാക്കുക & വീണ്ടും ഡ്രാഫ്റ്റ് ചെയ്യുക",
   "status.remove_bookmark": "ബുക്ക്മാർക്ക് നീക്കംചെയ്യുക",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "മറുപടി",
   "status.replyAll": "Reply to thread",
   "status.report": "@{name}--നെ റിപ്പോർട്ട് ചെയ്യുക",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "പങ്കിടുക",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "കുറച്ച് കാണിക്കുക",
   "status.show_less_all": "Show less for all",
   "status.show_more": "കൂടുതകൽ കാണിക്കുക",
   "status.show_more_all": "എല്ലാവർക്കുമായി കൂടുതൽ കാണിക്കുക",
-  "status.show_thread": "ത്രെഡ് കാണിക്കുക",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "ലഭ്യമല്ല",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "നിർദ്ദേശം ഒഴിവാക്കൂ",
   "suggestions.header": "നിങ്ങൾക്ക് താൽപ്പര്യമുണ്ടാകാം…",
   "tabs_bar.federated_timeline": "സംയുക്തമായ",
   "tabs_bar.home": "ഹോം",
   "tabs_bar.local_timeline": "പ്രാദേശികം",
   "tabs_bar.notifications": "അറിയിപ്പുകൾ",
-  "tabs_bar.search": "തിരയുക",
   "time_remaining.days": "{number, plural, one {# ദിവസം} other {# ദിവസങ്ങൾ}} ബാക്കി",
   "time_remaining.hours": "{number, plural, one {# മണിക്കൂർ} other {# മണിക്കൂർ}} ശേഷിക്കുന്നു",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "പിന്തുടരുന്നവർ",
   "timeline_hint.resources.follows": "പിന്തുടരുന്നു",
   "timeline_hint.resources.statuses": "പഴയ ടൂട്ടുകൾ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "ഇപ്പോൾ ട്രെൻഡിംഗ്",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "കേൾവിശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "തിരുത്തുക",
   "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
   "upload_form.undo": "ഇല്ലാതാക്കുക",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "OCR തയ്യാറാക്കുന്നു…",
   "upload_modal.preview_label": "പൂര്‍വ്വദൃശ്യം({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "വീഡിയോ അടയ്ക്കുക",
   "video.download": "ഫയൽ ഡൌൺലോഡ് ചെയ്യുക",
   "video.exit_fullscreen": "പൂർണ്ണ സ്ക്രീനിൽ നിന്ന് പുറത്തുകടക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 979f910ee..b52a85197 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -1,74 +1,108 @@
 {
-  "account.account_note_header": "Note",
+  "about.blocks": "नियंत्रित सर्व्हर",
+  "about.contact": "संपर्क:",
+  "about.disclaimer": "Mastodon हे विनामूल्य, मुक्त-स्रोत सॉफ्टवेअर आहे आणि Mastodon gGmbH चे ट्रेडमार्क आहे.",
+  "about.domain_blocks.no_reason_available": "कारण उपलब्ध नाही",
+  "about.domain_blocks.preamble": "मास्टोडॉन तुम्हाला सामान्यत: फेडिव्हर्समधील इतर कोणत्याही सर्व्हरवरील वापरकर्त्यांवरील मजकूर पाहण्याची आणि त्यांच्याशी संवाद साधण्याची परवानगी देते. या विशिष्ट सर्व्हरवर केलेले हे अपवाद आहेत.",
+  "about.domain_blocks.silenced.explanation": "जोपर्यंत तुम्ही ते स्पष्टपणे शोधत नाही किंवा अनुसरण करून निवड करत नाही तोपर्यंत तुम्हाला या सर्व्हरवरील प्रोफाइल आणि मजकूर दिसणार नाही.",
+  "about.domain_blocks.silenced.title": "मर्यादित",
+  "about.domain_blocks.suspended.explanation": "या सर्व्हरवरील कोणत्याही डेटावर प्रक्रिया, संचयित किंवा देवाणघेवाण केली जाणार नाही, ज्यामुळे या सर्व्हरवरील वापरकर्त्यांशी कोणताही संवाद किंवा परस्पर क्रिया अशक्य होईल.",
+  "about.domain_blocks.suspended.title": "निलंबित",
+  "about.not_available": "ही माहिती या सर्व्हरवर उपलब्ध करून देण्यात आलेली नाही.",
+  "about.powered_by": "{mastodon} द्वारा समर्थित विकेंद्रित सोशल मीडिया",
+  "about.rules": "सर्व्हर नियम",
+  "account.account_note_header": "नोंद",
   "account.add_or_remove_from_list": "यादीत घाला किंवा यादीतून काढून टाका",
   "account.badges.bot": "स्वयंचलित खाते",
-  "account.badges.group": "Group",
+  "account.badges.group": "गट",
   "account.block": "@{name} यांना ब्लॉक करा",
   "account.block_domain": "{domain} पासून सर्व लपवा",
   "account.blocked": "ब्लॉक केले आहे",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "अनुयायी होण्याची विनंती रद्द करा",
+  "account.browse_more_on_origin_server": "मूळ प्रोफाइलवर अधिक ब्राउझ करा",
+  "account.cancel_follow_request": "फॉलो विनंती मागे घ्या",
   "account.direct": "थेट संदेश @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "जेव्हा @{name} पोस्ट करतात तेव्हा मला सूचित करणे थांबवा",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "प्रोफाइल एडिट करा",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
+  "account.enable_notifications": "जेव्हा @{name} पोस्ट करते तेव्हा मला सूचित करा",
+  "account.endorse": "प्रोफाइलवरील वैशिष्ट्य",
+  "account.featured_tags.last_status_at": "शेवटचे पोस्ट {date} रोजी",
+  "account.featured_tags.last_status_never": "पोस्ट नाहीत",
+  "account.featured_tags.title": "{name} चे वैशिष्ट्यीकृत हॅशटॅग",
   "account.follow": "अनुयायी व्हा",
   "account.followers": "अनुयायी",
   "account.followers.empty": "ह्या वापरकर्त्याचा आतापर्यंत कोणी अनुयायी नाही.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.following": "अनुसरण",
+  "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "हा वापरकर्ता अजूनपर्यंत कोणाचा अनुयायी नाही.",
   "account.follows_you": "तुमचा अनुयायी आहे",
+  "account.go_to_profile": "प्रोफाइल वर जा",
   "account.hide_reblogs": "@{name} पासून सर्व बूस्ट लपवा",
-  "account.joined": "Joined {date}",
-  "account.last_status": "शेवटचे सक्रिय",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.joined_short": "सामील झाले",
+  "account.languages": "सदस्यता घेतलेल्या भाषा बदला",
+  "account.link_verified_on": "या लिंकची मालकी {date} रोजी तपासली गेली",
+  "account.locked_info": "या खात्याची गोपनीयता स्थिती लॉक वर सेट केली आहे. त्यांचे अनुसरण कोण करू शकते याचे मालक स्वतः पुनरावलोकन करतात.",
   "account.media": "दृक्‌‌श्राव्य मजकूर",
   "account.mention": "@{name} चा उल्लेख करा",
-  "account.moved_to": "{name} आता आहे:",
+  "account.moved_to": "{name} ने सूचित केले आहे की त्यांचे नवीन खाते आता आहे:",
   "account.mute": "@{name} ला मूक कारा",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.mute_notifications": "@{name} कडील सूचना नि: शब्द करा",
+  "account.muted": "मौन",
+  "account.open_original_page": "मूळ पृष्ठ उघडा",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
+  "account.report": "@{name} ची तक्रार करा",
   "account.requested": "Awaiting approval",
-  "account.share": "Share @{name}'s profile",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "@{name} चे प्रोफाइल शेअर करा",
   "account.show_reblogs": "{name}चे सर्व बुस्ट्स दाखवा",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} ला ब्लॉक करा",
   "account.unblock_domain": "उघड करा {domain}",
-  "account.unendorse": "Don't feature on profile",
+  "account.unblock_short": "अनब्लॉक करा",
+  "account.unendorse": "प्रोफाइलवर वैशिष्ट्य देऊ नका",
   "account.unfollow": "अनुयायी असणे थांबवा",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute": "@{name} अनम्यूट करा",
+  "account.unmute_notifications": "@{name} कडील सूचना अनम्यूट करा",
+  "account.unmute_short": "अनम्यूट करा",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
+  "admin.dashboard.daily_retention": "साइन अप केल्यानंतर दिवसा वापरकर्ता धारणा दर",
+  "admin.dashboard.monthly_retention": "साइन अप केल्यानंतर महिन्यानुसार वापरकर्ता धारणा दर",
+  "admin.dashboard.retention.average": "सरासरी",
+  "admin.dashboard.retention.cohort": "साइन-अप महिना",
+  "admin.dashboard.retention.cohort_size": "नवीन वापरकर्ता",
+  "alert.rate_limited.message": "कृपया {retry_time, time, medium} नंतर पुन्हा प्रयत्न करा.",
+  "alert.rate_limited.title": "दर मर्यादित",
+  "alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
   "alert.unexpected.title": "अरेरे!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "पुन्हा प्रयत्न करा",
-  "bundle_column_error.title": "नेटवर्क त्रुटी",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "बंद करा",
   "bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
   "bundle_modal_error.retry": "पुन्हा प्रयत्न करा",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "ब्लॉक केलेले खातेधारक",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.direct": "थेट संदेश",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "गुप्त डोमेन्स",
   "column.favourites": "आवडते",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "केवळ मीडिया",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "अधिक जाणून घ्या",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "हा पर्याय काढा",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "हटवा",
   "confirmations.delete.message": "हे स्टेटस तुम्हाला नक्की हटवायचंय?",
   "confirmations.delete_list.confirm": "हटवा",
@@ -123,8 +163,8 @@
   "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Mute",
+  "confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?",
+  "confirmations.mute.confirm": "आवाज बंद करा",
   "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,35 +235,71 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "hashtag.column_settings.select.no_options_message": "No suggestions found",
   "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_mode.all": "यातील सर्व",
+  "hashtag.column_settings.tag_mode.any": "यापैकी कोणतेही",
+  "hashtag.column_settings.tag_mode.none": "यापैकी एकही नाही",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "hashtag.follow": "हॅशटॅग फॉलो करा",
+  "hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
+  "home.column_settings.basic": "मूळ",
+  "home.column_settings.show_reblogs": "बूस्ट दाखवा",
+  "home.column_settings.show_replies": "उत्तरे दाखवा",
+  "home.hide_announcements": "घोषणा लपवा",
+  "home.show_announcements": "घोषणा दाखवा",
+  "interaction_modal.description.favourite": "मॅस्टोडॉनवरील खात्यासह, तुम्ही हे पोस्ट आवडते म्हणून लेखकाला कळवून तुम्ही त्याचे कौतुक करू शकता आणि ते नंतरसाठी जतन करू शकता.",
+  "interaction_modal.description.follow": "मॅस्टोडॉन वरील खात्यासह, तुम्ही त्यांच्या पोस्ट तुमच्या होम फीडमध्ये प्राप्त करण्यासाठी {name} चे अनुसरण करू शकता.",
+  "interaction_modal.description.reblog": "मॅस्टोडॉन वरील खात्यासह, तुम्ही ही पोस्ट तुमच्या स्वतःच्या अनुयायांसह शेअर करण्यासाठी बूस्ट करू शकता.",
+  "interaction_modal.description.reply": "मॅस्टोडॉनवरील खात्यासह, तुम्ही या पोस्टला प्रतिसाद देऊ शकता.",
+  "interaction_modal.on_another_server": "वेगळ्या सर्व्हरवर",
+  "interaction_modal.on_this_server": "या सर्व्हरवर",
+  "interaction_modal.other_server_instructions": "तुमच्या आवडत्या मॅस्टोडॉन अँपच्या सर्च फिल्डमध्ये किंवा तुमच्या मॅस्टोडॉन सर्व्हरच्या वेब इंटरफेसमध्ये ही URL कॉपी आणि पेस्ट करा.",
+  "interaction_modal.preamble": "मास्टोडॉन विकेंद्रित असल्याने, तुमचे खाते नसेल तर तुम्ही दुसरे मॅस्टोडॉन सर्व्हर किंवा सुसंगत प्लॅटफॉर्मद्वारे होस्ट केलेले तुमचे विद्यमान खाते वापरू शकता.",
+  "interaction_modal.title.favourite": "आवडत्या {name} ची पोस्ट",
+  "interaction_modal.title.follow": "{name} चे अनुसरण करा",
+  "interaction_modal.title.reblog": "{name} ची पोस्ट बूस्ट करा",
+  "interaction_modal.title.reply": "{name} च्या पोस्टला उत्तर द्या",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -220,8 +308,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.description": "वर्णन",
+  "keyboard_shortcuts.direct": "थेट संदेश स्तंभ उघडण्यासाठी",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -229,7 +317,7 @@
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
   "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.hotkey": "हॉटकी",
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
@@ -249,33 +337,36 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "lightbox.close": "Close",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
-  "lightbox.next": "Next",
-  "lightbox.previous": "Previous",
-  "lists.account.add": "Add to list",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
-  "lists.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lightbox.close": "बंद करा",
+  "lightbox.compress": "प्रतिमा दृश्य बॉक्स कॉम्प्रेस करा",
+  "lightbox.expand": "प्रतिमा दृश्य बॉक्स विस्तृत करा",
+  "lightbox.next": "पुढे",
+  "lightbox.previous": "मागील",
+  "limited_account_hint.action": "तरीही प्रोफाइल दाखवा",
+  "limited_account_hint.title": "हे प्रोफाइल {domain} च्या नियंत्रकांनी लपवले आहे.",
+  "lists.account.add": "यादीमध्ये जोडा",
+  "lists.account.remove": "यादीमधून काढा",
+  "lists.delete": "सूची हटवा",
+  "lists.edit": "सूची संपादित करा",
+  "lists.edit.submit": "शीर्षक बदला",
+  "lists.new.create": "यादी जोडा",
+  "lists.new.title_placeholder": "नवीन सूची शीर्षक",
+  "lists.replies_policy.followed": "कोणताही फॉलो केलेला वापरकर्ता",
+  "lists.replies_policy.list": "यादीतील सदस्य",
+  "lists.replies_policy.none": "कोणीच नाही",
+  "lists.replies_policy.title": "यांना उत्तरे दाखवा:",
+  "lists.search": "तुम्ही फॉलो करत असलेल्या लोकांमध्ये शोधा",
+  "lists.subheading": "तुमच्या याद्या",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Loading...",
+  "loading_indicator.label": "लोड करत आहे...",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,30 +400,35 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.push": "सूचना",
+  "notifications.column_settings.reblog": "बूस्ट:",
+  "notifications.column_settings.show": "स्तंभात दाखवा",
+  "notifications.column_settings.sound": "ध्वनी प्ले करा",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.column_settings.unread_notifications.category": "अपठित अधिसूचना",
+  "notifications.column_settings.unread_notifications.highlight": "न वाचलेल्या सूचना हायलाइट करा",
+  "notifications.column_settings.update": "संपादने:",
+  "notifications.filter.all": "सर्व",
+  "notifications.filter.boosts": "बूस्ट",
+  "notifications.filter.favourites": "आवडते",
+  "notifications.filter.follows": "अनुयायी आहे",
+  "notifications.filter.mentions": "उल्लेख केलेले",
+  "notifications.filter.polls": "मतदान परिणाम",
+  "notifications.filter.statuses": "तुम्ही फॉलो करत असलेल्या लोकांकडून अपडेट",
   "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
   "notifications.mark_as_read": "Mark every notification as read",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50526f74c..7e1205d88 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Pelayan yang disederhanakan",
+  "about.contact": "Hubungi:",
+  "about.disclaimer": "Mastodon ialah perisian sumber terbuka percuma, dan merupakan tanda dagangan Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Sebab tidak tersedia",
+  "about.domain_blocks.preamble": "Secara amnya, Mastodon membenarkan anda melihat kandungan daripada dan berinteraksi dengan pengguna daripada mana-mana pelayan dalam dunia persekutuan. Berikut ialah pengecualian yang telah dibuat pada pelayan ini secara khususnya.",
+  "about.domain_blocks.silenced.explanation": "Secara amnya, anda tidak akan melihat profil dan kandungan daripada pelayan ini, kecuali anda mencarinya secara khusus atau ikut serta dengan mengikutinya.",
+  "about.domain_blocks.silenced.title": "Terhad",
+  "about.domain_blocks.suspended.explanation": "Tiada data daripada pelayan ini yang akan diproses, disimpan atau ditukar, menjadikan sebarang interaksi atau perhubungan dengan pengguna daripada pelayan ini adalah mustahil.",
+  "about.domain_blocks.suspended.title": "Digantung",
+  "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
+  "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
+  "about.rules": "Peraturan pelayan",
   "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Sekat domain {domain}",
   "account.blocked": "Disekat",
   "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
-  "account.cancel_follow_request": "Batalkan permintaan ikutan",
+  "account.cancel_follow_request": "Menarik balik permintaan mengikut",
   "account.direct": "Mesej terus @{name}",
-  "account.disable_notifications": "Berhenti memaklumi saya apabila @{name} mengirim hantaran",
+  "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocked": "Domain disekat",
   "account.edit_profile": "Sunting profil",
   "account.enable_notifications": "Maklumi saya apabila @{name} mengirim hantaran",
   "account.endorse": "Tampilkan di profil",
+  "account.featured_tags.last_status_at": "Hantaran terakhir pada {date}",
+  "account.featured_tags.last_status_never": "Tiada hantaran",
+  "account.featured_tags.title": "Tanda pagar pilihan {name}",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
   "account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
+  "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.follows_you": "Mengikuti anda",
+  "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
-  "account.joined": "Sertai pada {date}",
-  "account.last_status": "Terakhir aktif",
+  "account.joined_short": "Menyertai",
+  "account.languages": "Tukar bahasa yang dilanggan",
   "account.link_verified_on": "Pemilikan pautan ini telah disemak pada {date}",
   "account.locked_info": "Status privasi akaun ini dikunci. Pemiliknya menyaring sendiri siapa yang boleh mengikutinya.",
   "account.media": "Media",
   "account.mention": "Sebut @{name}",
-  "account.moved_to": "{name} telah berpindah ke:",
+  "account.moved_to": "{name} telah menandakan bahawa akaun baru mereka sekarang ialah:",
   "account.mute": "Bisukan @{name}",
   "account.mute_notifications": "Bisukan pemberitahuan daripada @{name}",
   "account.muted": "Dibisukan",
-  "account.never_active": "Jangan sesekali",
+  "account.open_original_page": "Buka halaman asal",
   "account.posts": "Hantaran",
   "account.posts_with_replies": "Hantaran dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikutan",
+  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikut",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Hantaran} other {{counter} Hantaran}}",
+  "account.statuses_counter": "{count, plural, other {{counter} kiriman}}",
   "account.unblock": "Nyahsekat @{name}",
   "account.unblock_domain": "Nyahsekat domain {domain}",
+  "account.unblock_short": "Nyahsekat",
   "account.unendorse": "Jangan tampilkan di profil",
   "account.unfollow": "Nyahikut",
   "account.unmute": "Nyahbisukan @{name}",
   "account.unmute_notifications": "Nyahbisukan pemberitahuan daripada @{name}",
-  "account_note.placeholder": "Klik untuk tambah catatan",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "Nyahbisu",
+  "account_note.placeholder": "Klik untuk menambah catatan",
+  "admin.dashboard.daily_retention": "Kadar pengekalan pengguna mengikut hari selepas mendaftar",
+  "admin.dashboard.monthly_retention": "Kadar pengekalan pengguna mengikut bulan selepas mendaftar",
+  "admin.dashboard.retention.average": "Purata",
+  "admin.dashboard.retention.cohort": "Bulan pendaftaran",
+  "admin.dashboard.retention.cohort_size": "Pengguna baru",
   "alert.rate_limited.message": "Sila cuba semula selepas {retry_time, time, medium}.",
   "alert.rate_limited.title": "Kadar terhad",
   "alert.unexpected.message": "Berlaku ralat di luar jangkaan.",
   "alert.unexpected.title": "Alamak!",
   "announcement.announcement": "Pengumuman",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(belum diproses)",
+  "audio.hide": "Sembunyikan audio",
   "autosuggest_hashtag.per_week": "{count} seminggu",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
-  "bundle_column_error.body": "Terdapat kesilapan ketika memuatkan komponen ini.",
+  "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
+  "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
+  "bundle_column_error.error.title": "Alamak!",
+  "bundle_column_error.network.body": "Terdapat suatu ralat apabila cuba memuatkan halaman ini. Keadaan ini mungkin berlaku disebabkan oleh masalah pada sambungan internet anda atau pelayan ini.",
+  "bundle_column_error.network.title": "Ralat rangkaian",
   "bundle_column_error.retry": "Cuba lagi",
-  "bundle_column_error.title": "Ralat rangkaian",
+  "bundle_column_error.return": "Kembali ke halaman utama",
+  "bundle_column_error.routing.body": "Halaman tersebut tidak dapat ditemui. Adakah anda pasti URL dalam bar alamat adalah betul?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Tutup",
   "bundle_modal_error.message": "Ada yang tidak kena semasa memuatkan komponen ini.",
   "bundle_modal_error.retry": "Cuba lagi",
+  "closed_registrations.other_server_instructions": "Oleh sebab Mastodon terpencar, anda boleh mencipta akaun pada pelayan lain dan masih berinteraksi dengan pelayan ini.",
+  "closed_registrations_modal.description": "Mencipta akaun pada {domain} tidak dapat dibuat sekarang, tetapi sila ingat bahawa anda tidak memerlukan akaun khususnya pada {domain} untuk menggunakan Mastodon.",
+  "closed_registrations_modal.find_another_server": "Cari pelayan lain",
+  "closed_registrations_modal.preamble": "Mastodon adalah terpencar, oleh itu di mana-mana anda mencipta akaun anda, anda boleh mengikut dan berinteraksi dengan sesiapa pada pelayan ini. Anda juga boleh hos sendiri!",
+  "closed_registrations_modal.title": "Mendaftar pada Mastodon",
+  "column.about": "Perihal",
   "column.blocks": "Pengguna yang disekat",
   "column.bookmarks": "Tanda buku",
   "column.community": "Garis masa tempatan",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Tempatan sahaja",
   "community.column_settings.media_only": "Media sahaja",
   "community.column_settings.remote_only": "Jauh sahaja",
-  "compose_form.direct_message_warning": "Hantaran ini hanya akan dihantar kepada pengguna yang disebut.",
+  "compose.language.change": "Tukar bahasa",
+  "compose.language.search": "Cari bahasa...",
   "compose_form.direct_message_warning_learn_more": "Ketahui lebih lanjut",
+  "compose_form.encryption_warning": "Hantaran pada Mastodon tidak disulitkan hujung ke hujung. Jangan berkongsi sebarang maklumat sensitif melalui Mastodon.",
   "compose_form.hashtag_warning": "Hantaran ini tidak akan disenaraikan di bawah mana-mana tanda pagar kerana ia tidak tersenarai. Hanya hantaran awam sahaja boleh dicari menggunakan tanda pagar.",
   "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
   "compose_form.lock_disclaimer.lock": "dikunci",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Buang pilihan ini",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Terbit",
+  "compose_form.publish_form": "Terbit",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Simpan perubahan",
   "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
   "confirmations.block.message": "Adakah anda pasti anda ingin menyekat {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
+  "confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
   "confirmations.delete.confirm": "Padam",
   "confirmations.delete.message": "Adakah anda pasti anda ingin memadam hantaran ini?",
   "confirmations.delete_list.confirm": "Padam",
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Singkir",
+  "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
   "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.logout.confirm": "Log keluar",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Tanda sudah dibaca",
   "conversation.open": "Lihat perbualan",
   "conversation.with": "Dengan {names}",
+  "copypaste.copied": "Disalin",
+  "copypaste.copy": "Salin",
   "directory.federated": "Dari fediverse yang diketahui",
   "directory.local": "Dari {domain} sahaja",
   "directory.new_arrivals": "Ketibaan baharu",
   "directory.recently_active": "Aktif baru-baru ini",
+  "disabled_account_banner.account_settings": "Tetapan akaun",
+  "disabled_account_banner.text": "Akaun anda {disabledAccount} telah dinyahaktif.",
+  "dismissable_banner.community_timeline": "Inilah hantaran awam terkini daripada orang yang akaun dihos oleh {domain}.",
+  "dismissable_banner.dismiss": "Ketepikan",
+  "dismissable_banner.explore_links": "Berita-berita ini sedang dibualkan oleh orang di pelayar ini dan pelayar lain dalam rangkaian terpencar sekarang.",
+  "dismissable_banner.explore_statuses": "Hantaran-hantaran ini daripada pelayar ini dan pelayar lain dalam rangkaian terpencar sedang hangat pada pelayar ini sekarang.",
+  "dismissable_banner.explore_tags": "Tanda-tanda pagar ini daripada pelayar ini dan pelayar lain dalam rangkaian terpencar sedang hangat pada pelayar ini sekarang.",
+  "dismissable_banner.public_timeline": "Ini adalah hantaran awam yang terkini daripada orang pada pelayar ini dan pelayar lain dalam rangkaian terpencar yang dikenali oleh pelayar ini.",
   "embed.instructions": "Benam hantaran ini di laman sesawang anda dengan menyalin kod berikut.",
   "embed.preview": "Begini rupanya nanti:",
   "emoji_button.activity": "Aktiviti",
+  "emoji_button.clear": "Padam",
   "emoji_button.custom": "Tersuai",
   "emoji_button.flags": "Bendera",
   "emoji_button.food": "Makanan & Minuman",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Anda belum menyekat sesiapa.",
   "empty_column.bookmarked_statuses": "Anda belum ada hantaran yang ditanda buku. Apabila anda menanda buku sesuatu, ia akan muncul di sini.",
   "empty_column.community": "Garis masa tempatan kosong. Tulislah secara awam untuk memulakan sesuatu!",
-  "empty_column.direct": "Anda tidak mempunyai mesej terus. Apabila anda menghantar atau menerimanya, ia akan muncul di sini.",
+  "empty_column.direct": "Anda belum mempunyai mesej terus. Apabila anda menghantar atau menerima mesej, mesej-mesej akan dipaparkan di sini.",
   "empty_column.domain_blocks": "Belum ada domain yang disekat.",
+  "empty_column.explore_statuses": "Tiada apa-apa yang sohor kini sekarang. Semaklah kemudian!",
   "empty_column.favourited_statuses": "Anda belum ada hantaran yang digemari. Apabila anda menggemari sesuatu, ia akan muncul di sini.",
   "empty_column.favourites": "Tiada sesiapa yang menggemari hantaran ini. Apabila ada yang menggemari, ia akan muncul di sini.",
   "empty_column.follow_recommendations": "Nampaknya tiada cadangan yang boleh dijana untuk anda. Anda boleh cuba gunakan gelintar untuk mencari orang yang anda mungkin kenal atau jelajahi tanda pagar sohor kini.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Cuba nyahdaya pemalam dan segarkan semula halaman. Jika itu tidak membantu, anda masih boleh menggunakan Mastodon dengan pelayar yang berlainan atau aplikasi natif.",
   "errors.unexpected_crash.copy_stacktrace": "Salin surih tindanan ke papan keratan",
   "errors.unexpected_crash.report_issue": "Laporkan masalah",
+  "explore.search_results": "Hasil carian",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Terokai",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Kumpulan penapis ini tidak terpakai pada konteks di mana anda mengakses hantaran ini. Jika anda ingin hantaran ini untuk ditapis dalam konteks ini juga, anda perlu menyunting penapis tersebut.",
+  "filter_modal.added.context_mismatch_title": "Konteks tidak sepadan!",
+  "filter_modal.added.expired_explanation": "Kumpulan filter ini telah tamat tempoh, anda perlu mengubah tarikh luput untuk melaksanakannya.",
+  "filter_modal.added.expired_title": "Penapis tamat tempoh!",
+  "filter_modal.added.review_and_configure": "Untuk menyemak dan menetap kumpulan penapis ini secara lanjut, pergi ke {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Tetapan penapis",
+  "filter_modal.added.settings_link": "halaman tetapan",
+  "filter_modal.added.short_explanation": "Hantaran ini telah ditambah kepada kumpulan penapis berikut: {title}.",
+  "filter_modal.added.title": "Penapis ditambah!",
+  "filter_modal.select_filter.context_mismatch": "tidak terpakai pada konteks ini",
+  "filter_modal.select_filter.expired": "tamat tempoh",
+  "filter_modal.select_filter.prompt_new": "Kumpulan baru: {name}",
+  "filter_modal.select_filter.search": "Cari atau cipta",
+  "filter_modal.select_filter.subtitle": "Gunakan kumpulan yang sedia ada atau mencipta kumpulan baru",
+  "filter_modal.select_filter.title": "Tapiskan hantaran ini",
+  "filter_modal.title.status": "Tapiskan sesuatu hantaran",
   "follow_recommendations.done": "Selesai",
   "follow_recommendations.heading": "Ikuti orang yang anda ingin lihat hantarannya! Di sini ada beberapa cadangan.",
   "follow_recommendations.lead": "Hantaran daripada orang yang anda ikuti akan muncul dalam susunan kronologi di suapan rumah anda. Jangan takut melakukan kesilapan, anda boleh nyahikuti orang dengan mudah pada bila-bila masa!",
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
+  "footer.about": "Perihal",
+  "footer.directory": "Direktori profil",
+  "footer.get_app": "Dapatkan app",
+  "footer.invite": "Jemput kenalan",
+  "footer.keyboard_shortcuts": "Pintasan papan kekunci",
+  "footer.privacy_policy": "Dasar privasi",
+  "footer.source_code": "Lihat kod sumber",
   "generic.saved": "Disimpan",
-  "getting_started.developers": "Pembangun",
-  "getting_started.directory": "Direktori profil",
-  "getting_started.documentation": "Pendokumenan",
   "getting_started.heading": "Mari bermula",
-  "getting_started.invite": "Undang orang",
-  "getting_started.open_source_notice": "Mastodon itu perisian bersumber terbuka. Anda boleh menyumbang atau melaporkan masalah di GitHub menerusi {github}.",
-  "getting_started.security": "Tetapan akaun",
-  "getting_started.terms": "Terma perkhidmatan",
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Mana-mana daripada yang ini",
   "hashtag.column_settings.tag_mode.none": "Tiada apa pun daripada yang ini",
   "hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
+  "hashtag.follow": "Ikuti hashtag",
+  "hashtag.unfollow": "Nyahikut tanda pagar",
   "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.show_announcements": "Tunjukkan pengumuman",
+  "interaction_modal.description.favourite": "Dengan akaun pada Mastodon, anda boleh menggemarkan hantaran ini untuk memberitahu penulis bahawa anda menghargainya dan menyimpannya untuk kemudian.",
+  "interaction_modal.description.follow": "Dengan akaun pada Mastodon, anda boleh mengikut {name} untuk menerima hantaran mereka di suapan rumah anda.",
+  "interaction_modal.description.reblog": "Dengan akaun pada Mastodon, anda boleh menggalakkan hantaran ini untuk dikongsi dengan pengikut anda.",
+  "interaction_modal.description.reply": "Dengan akaun pada Mastodon, anda boleh membalas kepada hantaran ini.",
+  "interaction_modal.on_another_server": "Di pelayan lain",
+  "interaction_modal.on_this_server": "Pada pelayan ini",
+  "interaction_modal.other_server_instructions": "Salin dan tampal URL ini ke dalam medan carian app Mastodon kegemaran anda atau antara muka web pelayan Mastodon anda.",
+  "interaction_modal.preamble": "Oleh sebab Mastodon terpencar, anda boleh menggunakan akaun sedia ada anda yang dihos oleh pelayan Mastodon lain atau platform yang serasi jika anda tidak mempunyai akaun pada platform ini.",
+  "interaction_modal.title.favourite": "Menggemarkan hantaran {name}",
+  "interaction_modal.title.follow": "Ikuti {name}",
+  "interaction_modal.title.reblog": "Galak hantaran {name}",
+  "interaction_modal.title.reply": "Balas siaran {name}",
   "intervals.full.days": "{number, plural, other {# hari}}",
   "intervals.full.hours": "{number, plural, other {# jam}}",
   "intervals.full.minutes": "{number, plural, other {# minit}}",
@@ -221,10 +309,10 @@
   "keyboard_shortcuts.column": "Tumpu pada lajur",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Keterangan",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "untuk membuka lajur mesej terus",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "Buka hantaran",
-  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourite": "Hantaran kegemaran",
   "keyboard_shortcuts.favourites": "to open favourites list",
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Pintasan papan kekunci",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Besarkan kotak paparan imej",
   "lightbox.next": "Seterusnya",
   "lightbox.previous": "Sebelumnya",
+  "limited_account_hint.action": "Paparkan profil",
+  "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.",
   "lists.account.add": "Tambah ke senarai",
   "lists.account.remove": "Buang daripada senarai",
   "lists.delete": "Padam senarai",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "missing_indicator.label": "Tidak dijumpai",
   "missing_indicator.sublabel": "Sumber ini tidak dijumpai",
+  "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
   "mute_modal.duration": "Tempoh",
   "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?",
   "mute_modal.indefinite": "Tidak tentu",
-  "navigation_bar.apps": "Aplikasi mudah alih",
+  "navigation_bar.about": "Perihal",
   "navigation_bar.blocks": "Pengguna yang disekat",
   "navigation_bar.bookmarks": "Tanda buku",
   "navigation_bar.community_timeline": "Garis masa tempatan",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
   "navigation_bar.edit_profile": "Sunting profil",
+  "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan ikutan",
   "navigation_bar.follows_and_followers": "Ikutan dan pengikut",
-  "navigation_bar.info": "Perihal pelayan ini",
-  "navigation_bar.keyboard_shortcuts": "Kekunci pantas",
   "navigation_bar.lists": "Senarai",
   "navigation_bar.logout": "Log keluar",
   "navigation_bar.mutes": "Pengguna yang dibisukan",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Hantaran disemat",
   "navigation_bar.preferences": "Keutamaan",
   "navigation_bar.public_timeline": "Garis masa bersekutu",
+  "navigation_bar.search": "Cari",
   "navigation_bar.security": "Keselamatan",
+  "not_signed_in_indicator.not_signed_in": "Anda perlu daftar masuk untuk mencapai sumber ini.",
+  "notification.admin.report": "{name} melaporkan {target}",
+  "notification.admin.sign_up": "{name} mendaftar",
   "notification.favourite": "{name} menggemari hantaran anda",
   "notification.follow": "{name} mengikuti anda",
   "notification.follow_request": "{name} meminta untuk mengikuti anda",
@@ -306,13 +400,16 @@
   "notification.poll": "Sebuah undian yang anda undi telah tamat",
   "notification.reblog": "{name} menggalak hantaran anda",
   "notification.status": "{name} baru sahaja mengirim hantaran",
+  "notification.update": "{name} menyunting hantaran",
   "notifications.clear": "Buang pemberitahuan",
   "notifications.clear_confirmation": "Adakah anda pasti anda ingin membuang semua pemberitahuan anda secara kekal?",
+  "notifications.column_settings.admin.report": "Laporan baru:",
+  "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Pemberitahuan atas meja",
   "notifications.column_settings.favourite": "Kegemaran:",
   "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
   "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
-  "notifications.column_settings.filter_bar.show": "Tunjuk",
+  "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
   "notifications.column_settings.follow": "Pengikut baharu:",
   "notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
   "notifications.column_settings.mention": "Sebutan:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Tunjukkan dalam lajur",
   "notifications.column_settings.sound": "Mainkan bunyi",
   "notifications.column_settings.status": "Hantaran baharu:",
-  "notifications.column_settings.unread_markers.category": "Penanda pemberitahuan belum dibaca",
+  "notifications.column_settings.unread_notifications.category": "Pemberitahuan belum dibaca",
+  "notifications.column_settings.unread_notifications.highlight": "Serlahkan pemberitahuan yang belum dibaca",
+  "notifications.column_settings.update": "Suntingan:",
   "notifications.filter.all": "Semua",
   "notifications.filter.boosts": "Galakan",
   "notifications.filter.favourites": "Kegemaran",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, other {# undian}}",
   "poll.vote": "Undi",
   "poll.voted": "Anda mengundi jawapan ini",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, other {# undi}}",
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
   "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Terus",
+  "privacy.direct.short": "Orang yang disebut sahaja",
   "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
   "privacy.private.short": "Pengikut sahaja",
-  "privacy.public.long": "Boleh dilihat oleh semua orang, ditunjukkan di garis masa awam",
+  "privacy.public.long": "Kelihatan untuk semua",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Boleh dilihat oleh semua orang, tapi jangan tunjukkan di garis masa awam",
+  "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
   "privacy.unlisted.short": "Tidak tersenarai",
+  "privacy_policy.last_updated": "Dikemaskini {date}",
+  "privacy_policy.title": "Dasar Privasi",
   "refresh": "Muat semula",
   "regeneration_indicator.label": "Memuatkan…",
   "regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
   "relative_time.days": "{number}h",
+  "relative_time.full.days": "{number, plural, other {# hari}} yang lalu",
+  "relative_time.full.hours": "{number, plural, other {# jam}} yang lalu",
+  "relative_time.full.just_now": "sebentar tadi",
+  "relative_time.full.minutes": "{number, plural, other {# minit}} yang lalu",
+  "relative_time.full.seconds": "{number, plural, other {# saat}} yang lalu",
   "relative_time.hours": "{number}j",
   "relative_time.just_now": "sekarang",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hari ini",
   "reply_indicator.cancel": "Batal",
+  "report.block": "Sekat",
+  "report.block_explanation": "Anda tidak akan melihat hantaran mereka. Mereka tidak dapat melihat hantaran anda atau mengikuti anda. Mereka akan sedar bahawa mereka disekat.",
+  "report.categories.other": "Lain-lain",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Kandungan melanggar satu atau lebih peraturan pelayan",
+  "report.category.subtitle": "Pilih yang terdekat",
+  "report.category.title": "Beritahu kami apa yang berlaku dengan {type} ini",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "siaran",
+  "report.close": "Selesai",
+  "report.comment.title": "Adakah ada hal-hal lain yang perlu kita ketahui?",
   "report.forward": "Panjangkan ke {target}",
   "report.forward_hint": "Akaun ini daripada pelayan lain. Hantar salinan laporan yang ditanpanamakan ke sana juga?",
-  "report.hint": "Laporan akan dihantar ke penyederhana pelayan anda. Anda boleh sertakan penerangan kenapa anda laporkan akaun ini di bawah:",
+  "report.mute": "Bisukan",
+  "report.mute_explanation": "Anda tidak akan melihat siaran mereka. Mereka masih boleh mengikuti dan melihat siaran anda dan tidak akan mengetahui bahawa mereka telah dibisukan.",
+  "report.next": "Seterusnya",
   "report.placeholder": "Ulasan tambahan",
+  "report.reasons.dislike": "Saya tidak suka",
+  "report.reasons.dislike_description": "Inilah sesuatu yang anda tidak ingin lihat",
+  "report.reasons.other": "Inilah sesuatu yang lain",
+  "report.reasons.other_description": "Isu ini tidak sesuai untuk kategori lain",
+  "report.reasons.spam": "Inilah spam",
+  "report.reasons.spam_description": "Pautan berbahaya, keterlibatan palsu atau balasan berulang",
+  "report.reasons.violation": "Ini melanggar peraturan pelayan",
+  "report.reasons.violation_description": "Anda menyedari bahawa ini melanggar peraturan yang tertentu",
+  "report.rules.subtitle": "Pilih semua yang berkenaan",
+  "report.rules.title": "Peraturan-peraturan manakah yang telah dilanggar?",
+  "report.statuses.subtitle": "Pilih semua yang berkenaan",
+  "report.statuses.title": "Adakah terdapat siaran-siaran lain yang dapat menyokong laporan ini?",
   "report.submit": "Serah",
   "report.target": "Melaporkan {target}",
+  "report.thanks.take_action": "Berikut ialah pilihan anda untuk mengawal apa yang anda lihat di Mastodon:",
+  "report.thanks.take_action_actionable": "Sementara kami menyemak ini, anda boleh mengambil tindakan terhadap @{name}:",
+  "report.thanks.title": "Tidak ingin melihat ini?",
+  "report.thanks.title_actionable": "Terima kasih untuk laporan anda, kami akan menyemaknya.",
+  "report.unfollow": "Nyahikut @{name}",
+  "report.unfollow_explanation": "Anda sedang mengikuti akaun ini. Untuk memadam siaran mereka daripada suapan berita anda, nyahikutkan mereka.",
+  "report_notification.attached_statuses": "{count, plural, other {{count} hantaran}} dilampirkan",
+  "report_notification.categories.other": "Lain-lain",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Langgaran peraturan",
+  "report_notification.open": "Buka laporan",
   "search.placeholder": "Cari",
+  "search.search_or_paste": "Cari atau tampal URL",
   "search_popout.search_format": "Format gelintar lanjutan",
   "search_popout.tips.full_text": "Teks ringkas mengembalikan hantaran yang anda telah tulis, menggemari, menggalak, atau telah disebutkan, dan juga nama pengguna, nama paparan, dan tanda pagar yang dipadankan.",
   "search_popout.tips.hashtag": "tanda pagar",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Teks ringkas mengembalikan nama paparan, nama pengguna dan tanda pagar yang sepadan",
   "search_popout.tips.user": "pengguna",
   "search_results.accounts": "Orang",
+  "search_results.all": "Semua",
   "search_results.hashtags": "Tanda pagar",
+  "search_results.nothing_found": "Tidak dapat menemui apa-apa untuk istilah carian tersebut",
   "search_results.statuses": "Hantaran",
   "search_results.statuses_fts_disabled": "Menggelintar hantaran menggunakan kandungannya tidak didayakan di pelayan Mastodon ini.",
+  "search_results.title": "Mencari {q}",
   "search_results.total": "{count, number} {count, plural, other {hasil}}",
+  "server_banner.about_active_users": "Pengguna pelayan ini sepanjang 30 hari yang lalu (Pengguna Aktif Bulanan)",
+  "server_banner.active_users": "pengguna aktif",
+  "server_banner.administered_by": "Ditadbir oleh:",
+  "server_banner.introduction": "{domain} ialah sebahagian daripada rangkaian sosial terpencar dikuasakan oleh {mastodon}.",
+  "server_banner.learn_more": "Maklumat lanjut",
+  "server_banner.server_stats": "Statistik pelayan:",
+  "sign_in_banner.create_account": "Cipta akaun",
+  "sign_in_banner.sign_in": "Daftar masuk",
+  "sign_in_banner.text": "Daftar masuk untuk mengikut profil atau tanda pagar, menggemari, mengkongsi dan membalas kepada hantaran, atau berinteraksi daripada akaun anda pada pelayan lain.",
   "status.admin_account": "Buka antara muka penyederhanaan untuk @{name}",
   "status.admin_status": "Buka hantaran ini dalam antara muka penyederhanaan",
   "status.block": "Sekat @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Padam",
   "status.detailed_status": "Paparan perbualan terperinci",
   "status.direct": "Mesej terus @{name}",
+  "status.edit": "Sunting",
+  "status.edited": "Disunting {date}",
+  "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
+  "status.filter": "Tapiskan hantaran ini",
   "status.filtered": "Ditapis",
+  "status.hide": "Sembunyikan siaran",
+  "status.history.created": "{name} mencipta pada {date}",
+  "status.history.edited": "{name} menyunting pada {date}",
   "status.load_more": "Muatkan lagi",
   "status.media_hidden": "Media disembunyikan",
   "status.mention": "Sebut @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Tiada sesiapa yang menggalak hantaran ini. Apabila ada yang menggalak, ia akan muncul di sini.",
   "status.redraft": "Padam & rangka semula",
   "status.remove_bookmark": "Buang tanda buku",
+  "status.replied_to": "Menjawab kepada {name}",
   "status.reply": "Balas",
   "status.replyAll": "Balas ke bebenang",
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Kandungan sensitif",
   "status.share": "Kongsi",
+  "status.show_filter_reason": "Paparkan juga",
   "status.show_less": "Tunjukkan kurang",
   "status.show_less_all": "Tunjukkan kurang untuk semua",
   "status.show_more": "Tunjukkan lebih",
   "status.show_more_all": "Tunjukkan lebih untuk semua",
-  "status.show_thread": "Tunjuk bebenang",
+  "status.show_original": "Paparkan yang asal",
+  "status.translate": "Menterjemah",
+  "status.translated_from_with": "Diterjemah daripada {lang} dengan {provider}",
   "status.uncached_media_warning": "Tidak tersedia",
   "status.unmute_conversation": "Nyahbisukan perbualan",
   "status.unpin": "Nyahsemat daripada profil",
+  "subscribed_languages.lead": "Hanya hantaran dalam bahasa-bahasa terpilih akan dipaparkan pada garis masa rumah dan senarai selepas perubahan. Pilih tiada untuk menerima hantaran dalam semua bahasa.",
+  "subscribed_languages.save": "Simpan perubahan",
+  "subscribed_languages.target": "Tukar bahasa-bahasa dilanggan untuk {target}",
   "suggestions.dismiss": "Batalkan cadangan",
   "suggestions.header": "Anda mungkin berminat dengan…",
   "tabs_bar.federated_timeline": "Bersekutu",
   "tabs_bar.home": "Laman utama",
   "tabs_bar.local_timeline": "Tempatan",
   "tabs_bar.notifications": "Pemberitahuan",
-  "tabs_bar.search": "Cari",
   "time_remaining.days": "Tinggal {number, plural, other {# hari}}",
   "time_remaining.hours": "Tinggal {number, plural, other {# jam}}",
   "time_remaining.minutes": "Tinggal {number, plural, other {# minit}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Pengikut",
   "timeline_hint.resources.follows": "Ikutan",
   "timeline_hint.resources.statuses": "Hantaran lebih lama",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} bercakap",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} yang lalu",
   "trends.trending_now": "Sohor kini",
   "ui.beforeunload": "Rangka anda akan terhapus jika anda meninggalkan Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
   "upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
   "upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
+  "upload_form.description_missing": "Tiada keterangan ditambah",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
   "upload_form.undo": "Padam",
   "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Menganalisis gambar…",
   "upload_modal.apply": "Guna",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Terapkan…",
   "upload_modal.choose_image": "Pilih imej",
   "upload_modal.description_placeholder": "Seekor rubah perang pantas melompat merentasi anjing yang pemalas",
   "upload_modal.detect_text": "Kesan teks daripada gambar",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Mempersiapkan OCR…",
   "upload_modal.preview_label": "Pratonton ({ratio})",
   "upload_progress.label": "Memuat naik...",
+  "upload_progress.processing": "Memproses…",
   "video.close": "Tutup video",
   "video.download": "Muat turun fail",
   "video.exit_fullscreen": "Keluar skrin penuh",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
new file mode 100644
index 000000000..c6b348b19
--- /dev/null
+++ b/app/javascript/mastodon/locales/my.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "စောင့်ကြည့်မည်",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "စောင့်ကြည့်နေသည်",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "မီဒီယာ",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has indicated that their new account is now:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.open_original_page": "Open original page",
+  "account.posts": "ပို့စ်များ",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "အကြောင်း",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "အသိပေးချက်များ",
+  "column.pins": "Pinned post",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "ဆက်တင်များ",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "စာပြန်မည်",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No posts found",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Done",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Getting started",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "hashtag.column_settings.tag_mode.any": "Any of these",
+  "hashtag.column_settings.tag_mode.none": "None of these",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "အကြောင်း",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "ကိုယ်ရေးမှတ်တမ်း",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "ဟက်ရှ်တက်များ",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index c73e5ac0e..81375f51a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,70 +1,104 @@
 {
+  "about.blocks": "Gemodereerde servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is vrije, opensourcesoftware en een handelsmerk van Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reden niet beschikbaar",
+  "about.domain_blocks.preamble": "In het algemeen kun je met Mastodon berichten ontvangen van, en interactie hebben met gebruikers van elke server in de fediverse. Dit zijn de uitzonderingen die op deze specifieke server gelden.",
+  "about.domain_blocks.silenced.explanation": "In het algemeen zie je geen berichten en accounts van deze server, tenzij je berichten expliciet opzoekt of ervoor kiest om een account van deze server te volgen.",
+  "about.domain_blocks.silenced.title": "Beperkt",
+  "about.domain_blocks.suspended.explanation": "Er worden geen gegevens van deze server verwerkt, opgeslagen of uitgewisseld, wat interactie of communicatie met gebruikers van deze server onmogelijk maakt.",
+  "about.domain_blocks.suspended.title": "Opgeschort",
+  "about.not_available": "Deze informatie is niet beschikbaar gemaakt op deze server.",
+  "about.powered_by": "Gedecentraliseerde sociale media mogelijk gemaakt door {mastodon}",
+  "about.rules": "Serverregels",
   "account.account_note_header": "Opmerking",
-  "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
+  "account.add_or_remove_from_list": "Toevoegen aan of verwijderen uit lijsten",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groep",
   "account.block": "@{name} blokkeren",
-  "account.block_domain": "Alles van {domain} verbergen",
+  "account.block_domain": "Alles van {domain} blokkeren",
   "account.blocked": "Geblokkeerd",
-  "account.browse_more_on_origin_server": "Meer op het originele profiel bekijken",
+  "account.browse_more_on_origin_server": "Zie meer op het originele profiel",
   "account.cancel_follow_request": "Volgverzoek annuleren",
   "account.direct": "@{name} een direct bericht sturen",
-  "account.disable_notifications": "Geef geen melding meer wanneer @{name} toot",
+  "account.disable_notifications": "Geen melding meer geven wanneer @{name} een bericht plaatst",
   "account.domain_blocked": "Domein geblokkeerd",
   "account.edit_profile": "Profiel bewerken",
-  "account.enable_notifications": "Geef een melding wanneer @{name} toot",
+  "account.enable_notifications": "Geef een melding wanneer @{name} een bericht plaatst",
   "account.endorse": "Op profiel weergeven",
+  "account.featured_tags.last_status_at": "Laatste bericht op {date}",
+  "account.featured_tags.last_status_never": "Geen berichten",
+  "account.featured_tags.title": "Uitgelichte hashtags van {name}",
   "account.follow": "Volgen",
   "account.followers": "Volgers",
-  "account.followers.empty": "Niemand volgt nog deze gebruiker.",
+  "account.followers.empty": "Deze gebruiker heeft nog geen volgers.",
   "account.followers_counter": "{count, plural, one {{counter} volger} other {{counter} volgers}}",
+  "account.following": "Volgend",
   "account.following_counter": "{count, plural, one {{counter} volgend} other {{counter} volgend}}",
   "account.follows.empty": "Deze gebruiker volgt nog niemand.",
   "account.follows_you": "Volgt jou",
+  "account.go_to_profile": "Ga naar profiel",
   "account.hide_reblogs": "Boosts van @{name} verbergen",
-  "account.joined": "Geregistreerd in {date}",
-  "account.last_status": "Laatst actief",
+  "account.joined_short": "Geregistreerd op",
+  "account.languages": "Getoonde talen wijzigen",
   "account.link_verified_on": "Eigendom van deze link is gecontroleerd op {date}",
-  "account.locked_info": "De privacystatus van dit account is op besloten gezet. De eigenaar bepaalt handmatig wie hen kan volgen.",
+  "account.locked_info": "De privacystatus van dit account is ingesteld op vergrendeld. De eigenaar beoordeelt handmatig wie diegene kan volgen.",
   "account.media": "Media",
   "account.mention": "@{name} vermelden",
   "account.moved_to": "{name} is verhuisd naar:",
   "account.mute": "@{name} negeren",
   "account.mute_notifications": "Meldingen van @{name} negeren",
   "account.muted": "Genegeerd",
-  "account.never_active": "Nooit",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots en reacties",
+  "account.open_original_page": "Originele pagina openen",
+  "account.posts": "Berichten",
+  "account.posts_with_replies": "Berichten en reacties",
   "account.report": "@{name} rapporteren",
-  "account.requested": "Wacht op goedkeuring. Klik om het volgverzoek te annuleren",
+  "account.requested": "Wachten op goedkeuring. Klik om het volgverzoek te annuleren",
+  "account.requested_follow": "{name} wil je graag volgen",
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Boosts van @{name} tonen",
-  "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
   "account.unblock": "@{name} deblokkeren",
-  "account.unblock_domain": "{domain} niet langer verbergen",
+  "account.unblock_domain": "{domain} niet langer blokkeren",
+  "account.unblock_short": "Deblokkeren",
   "account.unendorse": "Niet op profiel weergeven",
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet langer negeren",
   "account.unmute_notifications": "Meldingen van @{name} niet langer negeren",
+  "account.unmute_short": "Niet langer negeren",
   "account_note.placeholder": "Klik om een opmerking toe te voegen",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Retentiegraad van gebruikers per dag, vanaf registratie",
+  "admin.dashboard.monthly_retention": "Retentiegraad van gebruikers per maand, vanaf registratie",
+  "admin.dashboard.retention.average": "Gemiddelde",
+  "admin.dashboard.retention.cohort": "Maand van registratie",
+  "admin.dashboard.retention.cohort_size": "Nieuwe gebruikers",
   "alert.rate_limited.message": "Probeer het nog een keer na {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Beperkt te gebruiken",
+  "alert.rate_limited.title": "Dataverkeer beperkt",
   "alert.unexpected.message": "Er deed zich een onverwachte fout voor",
   "alert.unexpected.title": "Oeps!",
   "announcement.announcement": "Mededeling",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(niet verwerkt)",
+  "audio.hide": "Audio verbergen",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
-  "bundle_column_error.body": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
+  "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
+  "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
+  "bundle_column_error.error.title": "O nee!",
+  "bundle_column_error.network.body": "Er is een fout opgetreden tijdens het laden van deze pagina. Dit kan veroorzaakt zijn door een tijdelijk probleem met je internetverbinding of met deze server.",
+  "bundle_column_error.network.title": "Netwerkfout",
   "bundle_column_error.retry": "Opnieuw proberen",
-  "bundle_column_error.title": "Netwerkfout",
+  "bundle_column_error.return": "Terug naar start",
+  "bundle_column_error.routing.body": "De opgevraagde pagina kon niet worden gevonden. Weet je zeker dat de URL in de adresbalk de juiste is?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sluiten",
-  "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
+  "bundle_modal_error.message": "Er ging iets mis tijdens het laden van dit component.",
   "bundle_modal_error.retry": "Opnieuw proberen",
+  "closed_registrations.other_server_instructions": "Omdat Mastodon gedecentraliseerd is, kun je op een andere server een account registreren en vanaf daar nog steeds met deze server communiceren.",
+  "closed_registrations_modal.description": "Momenteel is het niet mogelijk om op {domain} een account aan te maken. Hou echter in gedachte dat om Mastodon te kunnen gebruiken het niet een vereiste is om op {domain} een account te hebben.",
+  "closed_registrations_modal.find_another_server": "Een andere server zoeken",
+  "closed_registrations_modal.preamble": "Mastodon is gedecentraliseerd. Op welke server je ook een account hebt, je kunt overal vandaan mensen op deze server volgen en er mee interactie hebben. Je kunt zelfs zelf een Mastodon-server hosten!",
+  "closed_registrations_modal.title": "Registreren op Mastodon",
+  "column.about": "Over",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bladwijzers",
   "column.community": "Lokale tijdlijn",
@@ -77,7 +111,7 @@
   "column.lists": "Lijsten",
   "column.mutes": "Genegeerde gebruikers",
   "column.notifications": "Meldingen",
-  "column.pins": "Vastgezette toots",
+  "column.pins": "Vastgezette berichten",
   "column.public": "Globale tijdlijn",
   "column_back_button.label": "Terug",
   "column_header.hide_settings": "Instellingen verbergen",
@@ -90,10 +124,12 @@
   "community.column_settings.local_only": "Alleen lokaal",
   "community.column_settings.media_only": "Alleen media",
   "community.column_settings.remote_only": "Alleen andere servers",
-  "compose_form.direct_message_warning": "Deze toot wordt alleen naar vermelde gebruikers verstuurd.",
+  "compose.language.change": "Taal veranderen",
+  "compose.language.search": "Talen zoeken...",
   "compose_form.direct_message_warning_learn_more": "Meer leren",
-  "compose_form.hashtag_warning": "Deze toot valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare toots kunnen via hashtags gevonden worden.",
-  "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de toots zien die je alleen aan jouw volgers hebt gericht.",
+  "compose_form.encryption_warning": "Berichten op Mastodon worden, net zoals op andere social media, niet end-to-end versleuteld. Deel daarom geen gevoelige informatie via Mastodon.",
+  "compose_form.hashtag_warning": "Dit bericht valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare berichten kunnen via hashtags gevonden worden.",
+  "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "besloten",
   "compose_form.placeholder": "Wat wil je kwijt?",
   "compose_form.poll.add_option": "Keuze toevoegen",
@@ -103,7 +139,9 @@
   "compose_form.poll.switch_to_multiple": "Poll wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Poll wijzigen om een enkele keuze toe te staan",
   "compose_form.publish": "Toot",
+  "compose_form.publish_form": "Toot",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Wijzigingen opslaan",
   "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
@@ -114,36 +152,49 @@
   "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
   "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
+  "confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
+  "confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
   "confirmations.delete.confirm": "Verwijderen",
-  "confirmations.delete.message": "Weet je het zeker dat je deze toot wilt verwijderen?",
+  "confirmations.delete.message": "Weet je het zeker dat je dit bericht wilt verwijderen?",
   "confirmations.delete_list.confirm": "Verwijderen",
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Verberg alles van deze server",
-  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt negeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen toots van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
+  "confirmations.discard_edit_media.confirm": "Weggooien",
+  "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
+  "confirmations.domain_block.confirm": "Blokkeer alles van deze server",
+  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen berichten van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.mute.confirm": "Negeren",
-  "confirmations.mute.explanation": "Dit verbergt toots van hen en toots waar hen in wordt vermeld, maar hen kan nog steeds jouw toots bekijken en jou volgen.",
+  "confirmations.mute.explanation": "Dit verbergt diens berichten en berichten waar diegene in wordt vermeld, maar diegene kan nog steeds jouw berichten bekijken en jou volgen.",
   "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
-  "confirmations.redraft.message": "Weet je zeker dat je deze toot wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op de originele toot zitten niet meer aan de nieuwe toot vast.",
+  "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
   "confirmations.reply.confirm": "Reageren",
-  "confirmations.reply.message": "Door nu te reageren overschrijf je de toot die je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
+  "confirmations.reply.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
   "confirmations.unfollow.confirm": "Ontvolgen",
   "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
   "conversation.with": "Met {names}",
+  "copypaste.copied": "Gekopieerd",
+  "copypaste.copy": "Kopiëren",
   "directory.federated": "Fediverse (wat bekend is)",
   "directory.local": "Alleen {domain}",
   "directory.new_arrivals": "Nieuwe accounts",
   "directory.recently_active": "Onlangs actief",
-  "embed.instructions": "Embed deze toot op jouw website, door de onderstaande code te kopiëren.",
+  "disabled_account_banner.account_settings": "Accountinstellingen",
+  "disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.",
+  "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
+  "dismissable_banner.dismiss": "Sluiten",
+  "dismissable_banner.explore_links": "Deze nieuwsberichten winnen aan populariteit op deze en andere servers binnen het decentrale netwerk.",
+  "dismissable_banner.explore_statuses": "Deze berichten winnen aan populariteit op deze en andere servers binnen het decentrale netwerk.",
+  "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op deze en andere servers binnen het decentrale netwerk.",
+  "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op deze en andere servers binnen het decentrale netwerk. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
+  "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
+  "emoji_button.clear": "Leegmaken",
   "emoji_button.custom": "Lokale emoji’s",
   "emoji_button.flags": "Vlaggen",
   "emoji_button.food": "Eten en drinken",
@@ -158,46 +209,69 @@
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en locaties",
   "empty_column.account_suspended": "Account opgeschort",
-  "empty_column.account_timeline": "Hier zijn geen toots!",
+  "empty_column.account_timeline": "Hier zijn geen berichten!",
   "empty_column.account_unavailable": "Profiel is niet beschikbaar",
   "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
-  "empty_column.bookmarked_statuses": "Jij hebt nog geen toots aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
-  "empty_column.community": "De lokale tijdlijn is nog leeg. Toot iets in het openbaar om de spits af te bijten!",
-  "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
+  "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
+  "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
+  "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, komt deze hier te staan.",
   "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
-  "empty_column.favourited_statuses": "Jij hebt nog geen favoriete toots. Wanneer je er een aan jouw favorieten toevoegt, valt deze hier te zien.",
-  "empty_column.favourites": "Niemand heeft deze toot nog aan hun favorieten toegevoegd. Wanneer iemand dit doet, valt dat hier te zien.",
+  "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
+  "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
+  "empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
   "empty_column.follow_recommendations": "Het lijkt er op dat er geen aanbevelingen voor jou aangemaakt kunnen worden. Je kunt proberen te zoeken naar mensen die je wellicht kent, zoeken op hashtags, de lokale en globale tijdlijnen bekijken of de gebruikersgids doorbladeren.",
   "empty_column.follow_requests": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Deze tijdlijn is leeg! Volg meer mensen om het te vullen. {suggestions}",
   "empty_column.home.suggestions": "Enkele aanbevelingen bekijken",
-  "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe toots publiceren, zijn deze hier te zien.",
+  "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
   "empty_column.lists": "Jij hebt nog geen enkele lijst. Wanneer je er eentje hebt aangemaakt, valt deze hier te zien.",
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
-  "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen",
+  "empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
   "error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
   "error.unexpected_crash.explanation_addons": "Deze pagina kon niet correct geladen worden. Deze fout wordt waarschijnlijk door een browser-add-on of een automatische vertalingshulpmiddel veroorzaakt.",
   "error.unexpected_crash.next_steps": "Probeer deze pagina te vernieuwen. Wanneer dit niet helpt is het nog steeds mogelijk om Mastodon in een andere webbrowser of mobiele app te gebruiken.",
   "error.unexpected_crash.next_steps_addons": "Probeer deze uit te schakelen en de pagina te verversen. Wanneer dat niet helpt, kun je Mastodon nog altijd met een andere webbrowser of mobiele app gebruiken.",
   "errors.unexpected_crash.copy_stacktrace": "Stacktrace naar klembord kopiëren",
   "errors.unexpected_crash.report_issue": "Technisch probleem melden",
+  "explore.search_results": "Zoekresultaten",
+  "explore.suggested_follows": "Voor jou",
+  "explore.title": "Verkennen",
+  "explore.trending_links": "Nieuws",
+  "explore.trending_statuses": "Berichten",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Deze filtercategorie is niet van toepassing op de context waarin je dit bericht hebt benaderd. Als je wilt dat het bericht ook in deze context wordt gefilterd, moet je het filter bewerken.",
+  "filter_modal.added.context_mismatch_title": "Context komt niet overeen!",
+  "filter_modal.added.expired_explanation": "Deze filtercategorie is verlopen. Je moet de vervaldatum wijzigen om de categorie toe te kunnen passen.",
+  "filter_modal.added.expired_title": "Filter verlopen!",
+  "filter_modal.added.review_and_configure": "Ga naar {settings_link} om deze filtercategorie opnieuw te bekijken en verder te configureren.",
+  "filter_modal.added.review_and_configure_title": "Filterinstellingen",
+  "filter_modal.added.settings_link": "instellingspagina",
+  "filter_modal.added.short_explanation": "Dit bericht is toegevoegd aan de volgende filtercategorie: {title}.",
+  "filter_modal.added.title": "Filter toegevoegd!",
+  "filter_modal.select_filter.context_mismatch": "is niet van toepassing op deze context",
+  "filter_modal.select_filter.expired": "verlopen",
+  "filter_modal.select_filter.prompt_new": "Nieuwe categorie: {name}",
+  "filter_modal.select_filter.search": "Zoeken of toevoegen",
+  "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
+  "filter_modal.select_filter.title": "Dit bericht filteren",
+  "filter_modal.title.status": "Een bericht filteren",
   "follow_recommendations.done": "Klaar",
-  "follow_recommendations.heading": "Volg mensen waarvan je graag toots wil zien! Hier zijn enkele aanbevelingen.",
-  "follow_recommendations.lead": "Toots van mensen die je volgt zullen in chronologische volgorde onder start verschijnen. Wees niet bang om hierin fouten te maken, want je kunt mensen op elk moment net zo eenvoudig ontvolgen!",
+  "follow_recommendations.heading": "Volg mensen waarvan je graag berichten wil zien! Hier zijn enkele aanbevelingen.",
+  "follow_recommendations.lead": "Berichten van mensen die je volgt zullen in chronologische volgorde op jouw starttijdlijn verschijnen. Wees niet bang om hierin fouten te maken, want je kunt mensen op elk moment net zo eenvoudig ontvolgen!",
   "follow_request.authorize": "Goedkeuren",
-  "follow_request.reject": "Afkeuren",
+  "follow_request.reject": "Afwijzen",
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
+  "footer.about": "Over",
+  "footer.directory": "Gebruikersgids",
+  "footer.get_app": "App downloaden",
+  "footer.invite": "Mensen uitnodigen",
+  "footer.keyboard_shortcuts": "Sneltoetsen",
+  "footer.privacy_policy": "Privacybeleid",
+  "footer.source_code": "Broncode bekijken",
   "generic.saved": "Opgeslagen",
-  "getting_started.developers": "Ontwikkelaars",
-  "getting_started.directory": "Gebruikersgids",
-  "getting_started.documentation": "Documentatie",
   "getting_started.heading": "Aan de slag",
-  "getting_started.invite": "Mensen uitnodigen",
-  "getting_started.open_source_notice": "Mastodon is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.",
-  "getting_started.security": "Accountinstellingen",
-  "getting_started.terms": "Voorwaarden",
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "of {additional}",
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
@@ -207,37 +281,51 @@
   "hashtag.column_settings.tag_mode.any": "Een van deze",
   "hashtag.column_settings.tag_mode.none": "Geen van deze",
   "hashtag.column_settings.tag_toggle": "Additionele tags aan deze kolom toevoegen",
+  "hashtag.follow": "Hashtag volgen",
+  "hashtag.unfollow": "Hashtag ontvolgen",
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
   "home.hide_announcements": "Mededelingen verbergen",
   "home.show_announcements": "Mededelingen tonen",
+  "interaction_modal.description.favourite": "Je kunt met een Mastodon-account dit bericht als favoriet markeren, om die gebruiker te laten weten dat je het bericht waardeert en om het op te slaan.",
+  "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
+  "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
+  "interaction_modal.description.reply": "Je kunt met een Mastodon-account op dit bericht reageren.",
+  "interaction_modal.on_another_server": "Op een andere server",
+  "interaction_modal.on_this_server": "Op deze server",
+  "interaction_modal.other_server_instructions": "Kopieer en plak eenvoudig deze URL in het zoekveld van de door jou gebruikte Mastodon-app of op de website van de Mastodon-server waarop je bent ingelogd.",
+  "interaction_modal.preamble": "Mastodon is gedecentraliseerd. Daarom heb je geen account op deze Mastodon-server nodig, wanneer je al een account op een andere Mastodon-server of compatibel platform hebt.",
+  "interaction_modal.title.favourite": "Bericht van {name} als favoriet markeren",
+  "interaction_modal.title.follow": "{name} volgen",
+  "interaction_modal.title.reblog": "Bericht van {name} boosten",
+  "interaction_modal.title.reply": "Op het bericht van {name} reageren",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagen}}",
   "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
   "intervals.full.minutes": "{number, plural, one {# minuut} other {# minuten}}",
   "keyboard_shortcuts.back": "Ga terug",
   "keyboard_shortcuts.blocked": "Geblokkeerde gebruikers tonen",
-  "keyboard_shortcuts.boost": "Toot boosten",
+  "keyboard_shortcuts.boost": "Bericht boosten",
   "keyboard_shortcuts.column": "Op één van de kolommen focussen",
-  "keyboard_shortcuts.compose": "Tekstveld voor toots focussen",
+  "keyboard_shortcuts.compose": "Tekstveld om een bericht te schrijven focussen",
   "keyboard_shortcuts.description": "Omschrijving",
-  "keyboard_shortcuts.direct": "Jouw directe berichten tonen",
+  "keyboard_shortcuts.direct": "Directe berichten tonen",
   "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen",
-  "keyboard_shortcuts.enter": "Toot volledig tonen",
-  "keyboard_shortcuts.favourite": "Aan jouw favorieten toevoegen",
+  "keyboard_shortcuts.enter": "Volledig bericht tonen",
+  "keyboard_shortcuts.favourite": "Als favoriet markeren",
   "keyboard_shortcuts.favourites": "Favorieten tonen",
   "keyboard_shortcuts.federated": "Globale tijdlijn tonen",
   "keyboard_shortcuts.heading": "Sneltoetsen",
-  "keyboard_shortcuts.home": "Start tonen",
+  "keyboard_shortcuts.home": "Starttijdlijn tonen",
   "keyboard_shortcuts.hotkey": "Sneltoets",
   "keyboard_shortcuts.legend": "Deze legenda tonen",
   "keyboard_shortcuts.local": "Lokale tijdlijn tonen",
-  "keyboard_shortcuts.mention": "Auteur vermelden",
+  "keyboard_shortcuts.mention": "Account vermelden",
   "keyboard_shortcuts.muted": "Genegeerde gebruikers tonen",
   "keyboard_shortcuts.my_profile": "Jouw profiel tonen",
   "keyboard_shortcuts.notifications": "Meldingen tonen",
   "keyboard_shortcuts.open_media": "Media openen",
-  "keyboard_shortcuts.pinned": "Jouw vastgezette toots tonen",
+  "keyboard_shortcuts.pinned": "Jouw vastgemaakte berichten tonen",
   "keyboard_shortcuts.profile": "Gebruikersprofiel auteur openen",
   "keyboard_shortcuts.reply": "Reageren",
   "keyboard_shortcuts.requests": "Jouw volgverzoeken tonen",
@@ -246,7 +334,7 @@
   "keyboard_shortcuts.start": "\"Aan de slag\" tonen",
   "keyboard_shortcuts.toggle_hidden": "Inhoudswaarschuwing tonen/verbergen",
   "keyboard_shortcuts.toggle_sensitivity": "Media tonen/verbergen",
-  "keyboard_shortcuts.toot": "Nieuwe toot schrijven",
+  "keyboard_shortcuts.toot": "Nieuw bericht schrijven",
   "keyboard_shortcuts.unfocus": "Tekst- en zoekveld ontfocussen",
   "keyboard_shortcuts.up": "Naar boven in de lijst bewegen",
   "lightbox.close": "Sluiten",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Afbeelding groot weergeven",
   "lightbox.next": "Volgende",
   "lightbox.previous": "Vorige",
+  "limited_account_hint.action": "Alsnog het profiel tonen",
+  "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.",
   "lists.account.add": "Aan lijst toevoegen",
   "lists.account.remove": "Uit lijst verwijderen",
   "lists.delete": "Lijst verwijderen",
@@ -272,47 +362,54 @@
   "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
+  "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
   "mute_modal.duration": "Duur",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
   "mute_modal.indefinite": "Voor onbepaalde tijd",
-  "navigation_bar.apps": "Mobiele apps",
+  "navigation_bar.about": "Over",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.bookmarks": "Bladwijzers",
   "navigation_bar.community_timeline": "Lokale tijdlijn",
-  "navigation_bar.compose": "Nieuw toot schrijven",
+  "navigation_bar.compose": "Nieuw bericht schrijven",
   "navigation_bar.direct": "Directe berichten",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
   "navigation_bar.edit_profile": "Profiel bewerken",
+  "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
   "navigation_bar.follow_requests": "Volgverzoeken",
   "navigation_bar.follows_and_followers": "Volgers en gevolgden",
-  "navigation_bar.info": "Over deze server",
-  "navigation_bar.keyboard_shortcuts": "Sneltoetsen",
   "navigation_bar.lists": "Lijsten",
   "navigation_bar.logout": "Uitloggen",
   "navigation_bar.mutes": "Genegeerde gebruikers",
   "navigation_bar.personal": "Persoonlijk",
-  "navigation_bar.pins": "Vastgezette toots",
+  "navigation_bar.pins": "Vastgemaakte berichten",
   "navigation_bar.preferences": "Instellingen",
   "navigation_bar.public_timeline": "Globale tijdlijn",
+  "navigation_bar.search": "Zoeken",
   "navigation_bar.security": "Beveiliging",
-  "notification.favourite": "{name} voegde jouw toot als favoriet toe",
+  "not_signed_in_indicator.not_signed_in": "Je moet inloggen om toegang tot deze informatie te krijgen.",
+  "notification.admin.report": "{name} heeft {target} geapporteerd",
+  "notification.admin.sign_up": "{name} heeft zich geregistreerd",
+  "notification.favourite": "{name} markeerde jouw bericht als favoriet",
   "notification.follow": "{name} volgt jou nu",
   "notification.follow_request": "{name} wil jou graag volgen",
   "notification.mention": "{name} vermeldde jou",
   "notification.own_poll": "Jouw poll is beëindigd",
   "notification.poll": "Een poll waaraan jij hebt meegedaan is beëindigd",
-  "notification.reblog": "{name} boostte jouw toot",
-  "notification.status": "{name} heeft zojuist een toot geplaatst",
+  "notification.reblog": "{name} boostte jouw bericht",
+  "notification.status": "{name} heeft zojuist een bericht geplaatst",
+  "notification.update": "{name} heeft een bericht bewerkt",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
+  "notifications.column_settings.admin.report": "Nieuwe rapportages:",
+  "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
-  "notifications.column_settings.filter_bar.show": "Tonen",
+  "notifications.column_settings.filter_bar.show_bar": "Filterbalk tonen",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
   "notifications.column_settings.mention": "Vermeldingen:",
@@ -321,8 +418,10 @@
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
-  "notifications.column_settings.status": "Nieuwe toots:",
-  "notifications.column_settings.unread_markers.category": "Markeringen voor ongelezen meldingen",
+  "notifications.column_settings.status": "Nieuwe berichten:",
+  "notifications.column_settings.unread_notifications.category": "Ongelezen meldingen",
+  "notifications.column_settings.unread_notifications.highlight": "Ongelezen meldingen markeren",
+  "notifications.column_settings.update": "Bewerkingen:",
   "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favorieten",
@@ -337,7 +436,7 @@
   "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
   "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
-  "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open is. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
+  "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
   "picture_in_picture.restore": "Terugzetten",
   "poll.closed": "Gesloten",
@@ -346,95 +445,164 @@
   "poll.total_votes": "{count, plural, one {# stem} other {# stemmen}}",
   "poll.vote": "Stemmen",
   "poll.voted": "Je hebt hier op gestemd",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# stem} other {# stemmen}}",
   "poll_button.add_poll": "Poll toevoegen",
   "poll_button.remove_poll": "Poll verwijderen",
-  "privacy.change": "Zichtbaarheid van toot aanpassen",
+  "privacy.change": "Zichtbaarheid van bericht aanpassen",
   "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Direct bericht",
   "privacy.private.long": "Alleen aan volgers tonen",
   "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar en op openbare tijdlijnen tonen",
+  "privacy.public.long": "Voor iedereen zichtbaar",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet op openbare tijdlijnen tonen",
+  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
+  "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
+  "privacy_policy.title": "Privacybeleid",
   "refresh": "Vernieuwen",
   "regeneration_indicator.label": "Aan het laden…",
-  "regeneration_indicator.sublabel": "Jouw tijdlijn wordt aangemaakt!",
+  "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dag} other {# dagen}} geleden",
+  "relative_time.full.hours": "{number, plural, one {# uur} other {# uur}} geleden",
+  "relative_time.full.just_now": "zojuist",
+  "relative_time.full.minutes": "{number, plural, one {# minuut} other {# minuten}} geleden",
+  "relative_time.full.seconds": "{number, plural, one {# seconde} other {# seconden}} geleden",
   "relative_time.hours": "{number}u",
   "relative_time.just_now": "nu",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
   "reply_indicator.cancel": "Annuleren",
+  "report.block": "Blokkeren",
+  "report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
+  "report.categories.other": "Overig",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "De inhoud overtreedt een of meerdere serverregels",
+  "report.category.subtitle": "Kies wat het beste overeenkomt",
+  "report.category.title": "Vertel ons wat er met dit {type} aan de hand is",
+  "report.category.title_account": "profiel",
+  "report.category.title_status": "bericht",
+  "report.close": "Klaar",
+  "report.comment.title": "Zijn er nog andere dingen waarvan je denkt dat wij dat moeten weten?",
   "report.forward": "Naar {target} doorsturen",
   "report.forward_hint": "Het account bevindt zich op een andere server. Wil je daar eveneens een geanonimiseerde kopie van deze rapportage naar toe sturen?",
-  "report.hint": "De rapportage wordt naar de moderator(en) van jouw server gestuurd. Je kunt hieronder een uitleg geven waarom je dit account rapporteert:",
+  "report.mute": "Negeren",
+  "report.mute_explanation": "Je kunt diens berichten niet zien. Je kunt nog wel gevolgd worden en jouw berichten zijn nog zichtbaar, maar diegene kan niet zien dat die wordt genegeerd.",
+  "report.next": "Volgende",
   "report.placeholder": "Extra opmerkingen",
+  "report.reasons.dislike": "Ik vind het niet leuk",
+  "report.reasons.dislike_description": "Het is iets wat je niet wilt zien",
+  "report.reasons.other": "Het is iets anders",
+  "report.reasons.other_description": "Het probleem past niet in een andere categorie",
+  "report.reasons.spam": "Het is spam",
+  "report.reasons.spam_description": "Schadelijke links, reclame, misleiding of herhalende antwoorden",
+  "report.reasons.violation": "Het schendt de serverregels",
+  "report.reasons.violation_description": "Je weet dat het specifieke regels schendt",
+  "report.rules.subtitle": "Selecteer wat van toepassing is",
+  "report.rules.title": "Welke regels worden geschonden?",
+  "report.statuses.subtitle": "Selecteer wat van toepassing is",
+  "report.statuses.title": "Zijn er berichten die deze rapportage ondersteunen?",
   "report.submit": "Verzenden",
   "report.target": "{target} rapporteren",
+  "report.thanks.take_action": "Hier zijn jouw opties waarmee je kunt bepalen wat je in Mastodon wilt zien:",
+  "report.thanks.take_action_actionable": "Terwijl wij jouw rapportage beoordelen, kun je deze maatregelen tegen @{name} nemen:",
+  "report.thanks.title": "Wil je dit niet zien?",
+  "report.thanks.title_actionable": "Dank je voor het rapporteren. Wij gaan er naar kijken.",
+  "report.unfollow": "@{name} ontvolgen",
+  "report.unfollow_explanation": "Je volgt dit account. Om diens berichten niet meer op jouw starttijdlijn te zien, kun je diegene ontvolgen.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} bericht} other {{count} berichten}} toegevoegd",
+  "report_notification.categories.other": "Overig",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Overtreden regel(s)",
+  "report_notification.open": "Rapportage openen",
   "search.placeholder": "Zoeken",
+  "search.search_or_paste": "Zoek of voer een URL in",
   "search_popout.search_format": "Geavanceerd zoeken",
-  "search_popout.tips.full_text": "Gebruik gewone tekst om te zoeken in jouw toots, gebooste toots, favorieten en in toots waarin je bent vermeldt, en tevens naar gebruikersnamen, weergavenamen en hashtags.",
+  "search_popout.tips.full_text": "Gebruik gewone tekst om te zoeken in jouw berichten, gebooste berichten, favorieten en in berichten waarin je bent vermeldt, en tevens naar gebruikersnamen, weergavenamen en hashtags.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "toot",
+  "search_popout.tips.status": "bericht",
   "search_popout.tips.text": "Gebruik gewone tekst om te zoeken op weergavenamen, gebruikersnamen en hashtags",
   "search_popout.tips.user": "gebruiker",
   "search_results.accounts": "Gebruikers",
+  "search_results.all": "Alles",
   "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Het zoeken in toots is op deze Mastodon-server niet ingeschakeld.",
+  "search_results.nothing_found": "Deze zoektermen leveren geen resultaat op",
+  "search_results.statuses": "Berichten",
+  "search_results.statuses_fts_disabled": "Het zoeken in berichten is op deze Mastodon-server niet ingeschakeld.",
+  "search_results.title": "Naar {q} zoeken",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
+  "server_banner.about_active_users": "Aantal gebruikers tijdens de afgelopen 30 dagen (MAU)",
+  "server_banner.active_users": "actieve gebruikers",
+  "server_banner.administered_by": "Beheerd door:",
+  "server_banner.introduction": "{domain} is onderdeel van het gedecentraliseerde sociale netwerk {mastodon}.",
+  "server_banner.learn_more": "Meer leren",
+  "server_banner.server_stats": "Serverstats:",
+  "sign_in_banner.create_account": "Registreren",
+  "sign_in_banner.sign_in": "Inloggen",
+  "sign_in_banner.text": "Wanneer je een account op deze server hebt, kun je inloggen om mensen of hashtags te volgen, op berichten te reageren of om deze te delen. Wanneer je een account op een andere server hebt, kun je daar inloggen en daar interactie met mensen op deze server hebben.",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
-  "status.admin_status": "Deze toot in de moderatie-omgeving openen",
+  "status.admin_status": "Dit bericht in de moderatie-omgeving tonen",
   "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
-  "status.cannot_reblog": "Deze toot kan niet geboost worden",
-  "status.copy": "Link naar toot kopiëren",
+  "status.cannot_reblog": "Dit bericht kan niet geboost worden",
+  "status.copy": "Link naar bericht kopiëren",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",
   "status.direct": "@{name} een direct bericht sturen",
+  "status.edit": "Bewerken",
+  "status.edited": "Bewerkt op {date}",
+  "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
   "status.embed": "Insluiten",
   "status.favourite": "Favoriet",
+  "status.filter": "Dit bericht filteren",
   "status.filtered": "Gefilterd",
+  "status.hide": "Bericht verbergen",
+  "status.history.created": "{name} plaatste dit {date}",
+  "status.history.edited": "{name} bewerkte dit {date}",
   "status.load_more": "Meer laden",
   "status.media_hidden": "Media verborgen",
   "status.mention": "@{name} vermelden",
   "status.more": "Meer",
   "status.mute": "@{name} negeren",
   "status.mute_conversation": "Negeer gesprek",
-  "status.open": "Volledige toot tonen",
+  "status.open": "Volledig bericht tonen",
   "status.pin": "Aan profielpagina vastmaken",
-  "status.pinned": "Vastgemaakte toot",
+  "status.pinned": "Vastgemaakt bericht",
   "status.read_more": "Meer lezen",
   "status.reblog": "Boosten",
   "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
   "status.reblogged_by": "{name} boostte",
-  "status.reblogs.empty": "Niemand heeft deze toot nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
+  "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
+  "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
   "status.replyAll": "Reageer op iedereen",
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
+  "status.show_filter_reason": "Alsnog tonen",
   "status.show_less": "Minder tonen",
   "status.show_less_all": "Alles minder tonen",
   "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
-  "status.show_thread": "Gesprek tonen",
+  "status.show_original": "Origineel bekijken",
+  "status.translate": "Vertalen",
+  "status.translated_from_with": "Vertaald vanuit het {lang} met behulp van {provider}",
   "status.uncached_media_warning": "Niet beschikbaar",
   "status.unmute_conversation": "Gesprek niet langer negeren",
   "status.unpin": "Van profielpagina losmaken",
+  "subscribed_languages.lead": "Na de wijziging worden alleen berichten van geselecteerde talen op jouw starttijdlijn en in lijsten weergegeven.",
+  "subscribed_languages.save": "Wijzigingen opslaan",
+  "subscribed_languages.target": "Getoonde talen voor {target} wijzigen",
   "suggestions.dismiss": "Aanbeveling verwerpen",
   "suggestions.header": "Je bent waarschijnlijk ook geïnteresseerd in…",
   "tabs_bar.federated_timeline": "Globaal",
   "tabs_bar.home": "Start",
   "tabs_bar.local_timeline": "Lokaal",
   "tabs_bar.notifications": "Meldingen",
-  "tabs_bar.search": "Zoeken",
   "time_remaining.days": "{number, plural, one {# dag} other {# dagen}} te gaan",
   "time_remaining.hours": "{number, plural, one {# uur} other {# uur}} te gaan",
   "time_remaining.minutes": "{number, plural, one {# minuut} other {# minuten}} te gaan",
@@ -443,8 +611,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} van andere servers worden niet getoond.",
   "timeline_hint.resources.followers": "Volgers",
   "timeline_hint.resources.follows": "Volgend",
-  "timeline_hint.resources.statuses": "Oudere toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} personen}} zijn aan het praten",
+  "timeline_hint.resources.statuses": "Oudere berichten",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} mensen}} {days, plural, one {in het afgelopen etmaal} other {in de afgelopen {days} dagen}}",
   "trends.trending_now": "Huidige trends",
   "ui.beforeunload": "Je concept gaat verloren wanneer je Mastodon verlaat.",
   "units.short.billion": "{count} mrd.",
@@ -456,21 +624,23 @@
   "upload_error.poll": "Het uploaden van bestanden is in polls niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor mensen met een auditieve beperking",
   "upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
+  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
   "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor mensen met een auditieve of visuele beperking",
   "upload_modal.analyzing_picture": "Afbeelding analyseren…",
   "upload_modal.apply": "Toepassen",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aan het toepassen…",
   "upload_modal.choose_image": "Kies een afbeelding",
   "upload_modal.description_placeholder": "Pa's wijze lynx bezag vroom het fikse aquaduct",
   "upload_modal.detect_text": "Tekst in een afbeelding detecteren",
   "upload_modal.edit_media": "Media bewerken",
-  "upload_modal.hint": "Klik of sleep de cirkel in de voorvertoning naar een centraal punt dat op elke thumbnail zichtbaar moet blijven.",
+  "upload_modal.hint": "Klik of sleep de cirkel in de voorvertoning naar een centraal focuspunt dat op elke thumbnail zichtbaar moet blijven.",
   "upload_modal.preparing_ocr": "OCR voorbereiden…",
   "upload_modal.preview_label": "Voorvertoning ({ratio})",
   "upload_progress.label": "Uploaden...",
+  "upload_progress.processing": "Bezig…",
   "video.close": "Video sluiten",
   "video.download": "Bestand downloaden",
   "video.exit_fullscreen": "Volledig scherm sluiten",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index cfd9aaca9..169363602 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -1,76 +1,110 @@
 {
+  "about.blocks": "Modererte tenarar",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon er gratis programvare med open kjeldekode, og eit varemerke frå Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Årsaka er ikkje tilgjengeleg",
+  "about.domain_blocks.preamble": "Mastodon gjev deg som regel lov til å sjå innhald og samhandla med brukarar frå alle andre tenarar i allheimen. Dette er unntaka som er valde for akkurat denne tenaren.",
+  "about.domain_blocks.silenced.explanation": "Med mindre du leiter den opp eller fylgjer profiler på tenaren, vil du vanlegvis ikkje sjå profilar og innhald frå denne tenaren.",
+  "about.domain_blocks.silenced.title": "Avgrensa",
+  "about.domain_blocks.suspended.explanation": "Ingen data frå denne tenaren vert handsama, lagra eller sende til andre, noko som gjer det umogeleg å samhandla eller kommunisera med brukarar på denne tenaren.",
+  "about.domain_blocks.suspended.title": "Utestengd",
+  "about.not_available": "Denne informasjonen er ikkje gjort tilgjengeleg på denne tenaren.",
+  "about.powered_by": "Desentraliserte sosiale medium drive av {mastodon}",
+  "about.rules": "Tenarreglar",
   "account.account_note_header": "Merknad",
-  "account.add_or_remove_from_list": "Legg til eller tak vekk frå listene",
+  "account.add_or_remove_from_list": "Legg til eller fjern frå lister",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
   "account.block": "Blokker @{name}",
   "account.block_domain": "Skjul alt frå {domain}",
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Sjå gjennom meir på den opphavlege profilen",
-  "account.cancel_follow_request": "Fjern fylgjeførespurnad",
+  "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
   "account.direct": "Send melding til @{name}",
-  "account.disable_notifications": "Slutt å varsle meg når @{name} legger ut innlegg",
-  "account.domain_blocked": "Domenet er gøymt",
+  "account.disable_notifications": "Slutt å varsle meg når @{name} skriv innlegg",
+  "account.domain_blocked": "Domenet er sperra",
   "account.edit_profile": "Rediger profil",
-  "account.enable_notifications": "Varsle meg når @{name} legger ut innlegg",
-  "account.endorse": "Framhev på profil",
+  "account.enable_notifications": "Varsle meg når @{name} skriv innlegg",
+  "account.endorse": "Vis på profilen",
+  "account.featured_tags.last_status_at": "Sist nytta {date}",
+  "account.featured_tags.last_status_never": "Ingen innlegg",
+  "account.featured_tags.title": "{name} sine framheva emneknaggar",
   "account.follow": "Fylg",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
+  "account.following": "Fylgjer",
   "account.following_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjar}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.follows_you": "Fylgjer deg",
-  "account.hide_reblogs": "Gøym fremhevingar frå @{name}",
-  "account.joined": "Ble med den {date}",
-  "account.last_status": "Sist aktiv",
+  "account.go_to_profile": "Gå til profil",
+  "account.hide_reblogs": "Skjul framhevingar frå @{name}",
+  "account.joined_short": "Vart med",
+  "account.languages": "Endre språktingingar",
   "account.link_verified_on": "Eigarskap for denne lenkja vart sist sjekka {date}",
   "account.locked_info": "Denne kontoen er privat. Eigaren kan sjølv velja kven som kan fylgja han.",
   "account.media": "Media",
   "account.mention": "Nemn @{name}",
-  "account.moved_to": "{name} har flytta til:",
+  "account.moved_to": "{name} seier at deira nye konto no er:",
   "account.mute": "Målbind @{name}",
   "account.mute_notifications": "Målbind varsel frå @{name}",
   "account.muted": "Målbunden",
-  "account.never_active": "Aldri",
+  "account.open_original_page": "Opne originalsida",
   "account.posts": "Tut",
   "account.posts_with_replies": "Tut og svar",
   "account.report": "Rapporter @{name}",
-  "account.requested": "Ventar på samtykke. Klikk for å avbryta fylgjeførespurnaden",
+  "account.requested": "Ventar på aksept. Klikk for å avbryta fylgjeførespurnaden",
+  "account.requested_follow": "{name} har bedt om å få fylgja deg",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Vis framhevingar frå @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tut}}",
-  "account.unblock": "Slutt å blokera @{name}",
-  "account.unblock_domain": "Vis {domain}",
-  "account.unendorse": "Ikkje framhev på profil",
+  "account.unblock": "Stopp blokkering av @{name}",
+  "account.unblock_domain": "Stopp blokkering av domenet {domain}",
+  "account.unblock_short": "Stopp blokkering",
+  "account.unendorse": "Ikkje vis på profil",
   "account.unfollow": "Slutt å fylgja",
-  "account.unmute": "Av-demp @{name}",
+  "account.unmute": "Opphev målbinding av @{name}",
   "account.unmute_notifications": "Vis varsel frå @{name}",
+  "account.unmute_short": "Opphev målbinding",
   "account_note.placeholder": "Klikk for å leggja til merknad",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Ver venleg å prøva igjen etter {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Begrensa rate",
-  "alert.unexpected.message": "Eit uventa problem oppstod.",
+  "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering",
+  "admin.dashboard.monthly_retention": "Mengda brukarar aktive ved månader etter registrering",
+  "admin.dashboard.retention.average": "Gjennomsnitt",
+  "admin.dashboard.retention.cohort": "Registrert månad",
+  "admin.dashboard.retention.cohort_size": "Nye brukarar",
+  "alert.rate_limited.message": "Ver venleg å prøv på nytt etter {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Redusert kapasitet",
+  "alert.unexpected.message": "Det oppstod eit uventa problem.",
   "alert.unexpected.title": "Oi sann!",
   "announcement.announcement": "Kunngjering",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ubehandla)",
+  "audio.hide": "Gøym lyd",
   "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
-  "bundle_column_error.body": "Noko gjekk gale mens denne komponenten vart lasta ned.",
+  "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
+  "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
+  "bundle_column_error.error.title": "Ånei!",
+  "bundle_column_error.network.body": "Det oppsto ein feil ved lasting av denne sida. Dette kan skuldast eit midlertidig problem med nettkoplinga eller denne tenaren.",
+  "bundle_column_error.network.title": "Nettverksfeil",
   "bundle_column_error.retry": "Prøv igjen",
-  "bundle_column_error.title": "Nettverksfeil",
+  "bundle_column_error.return": "Gå heim att",
+  "bundle_column_error.routing.body": "Den etterspurde sida vart ikkje funnen. Er du sikker på at URL-adressa er rett?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Lat att",
   "bundle_modal_error.message": "Noko gjekk gale under lastinga av denne komponenten.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "closed_registrations.other_server_instructions": "Sidan Mastodon er desentralisert kan du lage ein brukar på ein anna tenar og framleis interagere med denne.",
+  "closed_registrations_modal.description": "Det er ikkje mogleg å opprette ein konto på {domain} nett no, men hugs at du ikkje treng ein konto på akkurat {domain} for å nytte Mastodon.",
+  "closed_registrations_modal.find_another_server": "Finn ein annan tenar",
+  "closed_registrations_modal.preamble": "Mastodon er desentralisert, så uansett kvar du opprettar ein konto, vil du kunne fylgje og samhandle med alle på denne tenaren. Du kan til og med ha din eigen tenar!",
+  "closed_registrations_modal.title": "Registrer deg på Mastodon",
+  "column.about": "Om",
   "column.blocks": "Blokkerte brukarar",
   "column.bookmarks": "Bokmerke",
   "column.community": "Lokal tidsline",
-  "column.direct": "Meldingar",
+  "column.direct": "Direktemeldingar",
   "column.directory": "Sjå gjennom profilar",
-  "column.domain_blocks": "Gøymde domene",
+  "column.domain_blocks": "Skjulte domene",
   "column.favourites": "Favorittar",
   "column.follow_requests": "Fylgjeførespurnadar",
   "column.home": "Heim",
@@ -79,7 +113,7 @@
   "column.notifications": "Varsel",
   "column.pins": "Festa tut",
   "column.public": "Samla tidsline",
-  "column_back_button.label": "Tilbake",
+  "column_back_button.label": "Attende",
   "column_header.hide_settings": "Gøym innstillingar",
   "column_header.moveLeft_settings": "Flytt kolonne til venstre",
   "column_header.moveRight_settings": "Flytt kolonne til høgre",
@@ -90,66 +124,83 @@
   "community.column_settings.local_only": "Berre lokalt",
   "community.column_settings.media_only": "Berre media",
   "community.column_settings.remote_only": "Berre eksternt",
-  "compose_form.direct_message_warning": "Dette tutet vert berre synleg for nemnde brukarar.",
+  "compose.language.change": "Byt språk",
+  "compose.language.search": "Søk språk...",
   "compose_form.direct_message_warning_learn_more": "Lær meir",
-  "compose_form.hashtag_warning": "Dette tutet vert ikkje oppført under nokon emneknagg sidan det ikkje er oppført. Berre offentlege tut kan verta søkt etter med emneknagg.",
-  "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine som berre visast til fylgjarar.",
+  "compose_form.encryption_warning": "Innlegg på Mastodon er ikkje ende-til-ende-krypterte. Ikkje del eventuell ømtolig informasjon via Mastodon.",
+  "compose_form.hashtag_warning": "Dette tutet vert ikkje oppført under nokon emneknagg sidan ingen emneknagg er oppført. Det er kun emneknaggar som er søkbare i offentlege tutar.",
+  "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
   "compose_form.poll.add_option": "Legg til eit val",
-  "compose_form.poll.duration": "Varigskap for røysting",
+  "compose_form.poll.duration": "Varigheit for rundspørjing",
   "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Ta vekk dette valet",
-  "compose_form.poll.switch_to_multiple": "Endre avstemninga til å tillate fleirval",
-  "compose_form.poll.switch_to_single": "Endra avstemninga til tillate berre eitt val",
-  "compose_form.publish": "Tut",
+  "compose_form.poll.remove_option": "Fjern dette valet",
+  "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
+  "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
+  "compose_form.publish": "Legg ut",
+  "compose_form.publish_form": "Publisér",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Merk medium som sensitivt",
-  "compose_form.sensitive.marked": "Medium er markert som sensitivt",
-  "compose_form.sensitive.unmarked": "Medium er ikkje merka som sensitivt",
-  "compose_form.spoiler.marked": "Tekst er gøymd bak åtvaring",
-  "compose_form.spoiler.unmarked": "Tekst er ikkje gøymd",
+  "compose_form.save_changes": "Lagre endringar",
+  "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+  "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
+  "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
   "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
   "confirmations.block.message": "Er du sikker på at du vil blokkera {name}?",
+  "confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
+  "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil sletta denne statusen?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Gøym heile domenet",
-  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil blokkera heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå det domenet i nokon fødererte tidsliner eller i varsla dine. Fylgjarane dine frå det domenet vert fjerna.",
+  "confirmations.discard_edit_media.confirm": "Forkast",
+  "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkaste dei likevel?",
+  "confirmations.domain_block.confirm": "Skjul alt frå domenet",
+  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
   "confirmations.mute.confirm": "Målbind",
-  "confirmations.mute.explanation": "Dette gøymer innlegg frå dei og innlegg som nemner dei, men tillèt dei framleis å sjå dine innlegg og fylgja deg.",
+  "confirmations.mute.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.",
   "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
-  "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opphavlege innlegget vert einstøingar.",
+  "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og eventuelle svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
-  "confirmations.reply.message": "Å svara no vil overskriva meldinga du skriv no. Er du sikker på at du vil halda fram?",
+  "confirmations.reply.message": "Å svara no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.unfollow.confirm": "Slutt å fylgja",
   "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
   "conversation.delete": "Slett samtale",
-  "conversation.mark_as_read": "Merk som lese",
+  "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
   "conversation.with": "Med {names}",
-  "directory.federated": "Frå kjent fedivers",
+  "copypaste.copied": "Kopiert",
+  "copypaste.copy": "Kopiér",
+  "directory.federated": "Frå den kjende allheimen",
   "directory.local": "Berre frå {domain}",
-  "directory.new_arrivals": "Nyankommne",
+  "directory.new_arrivals": "Nyleg tilkomne",
   "directory.recently_active": "Nyleg aktive",
-  "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden under.",
-  "embed.preview": "Slik bid det å sjå ut:",
+  "disabled_account_banner.account_settings": "Kontoinnstillingar",
+  "disabled_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert.",
+  "dismissable_banner.community_timeline": "Dette er dei nylegaste offentlege innlegga frå personar med kontoar frå {domain}.",
+  "dismissable_banner.dismiss": "Avvis",
+  "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.",
+  "dismissable_banner.explore_statuses": "Desse innlegga frå denne tenaren og andre tenarar i det desentraliserte nettverket er i støytet på denne tenaren nett no.",
+  "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
+  "dismissable_banner.public_timeline": "Dette er dei siste offentlege innlegga frå folk på denne tenaren og andre tenarar på det desentraliserte nettverket som denne tenaren veit om.",
+  "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
+  "embed.preview": "Slik kjem det til å sjå ut:",
   "emoji_button.activity": "Aktivitet",
-  "emoji_button.custom": "Eige",
+  "emoji_button.clear": "Tøm",
+  "emoji_button.custom": "Tilpassa",
   "emoji_button.flags": "Flagg",
   "emoji_button.food": "Mat & drikke",
   "emoji_button.label": "Legg til emoji",
   "emoji_button.nature": "Natur",
-  "emoji_button.not_found": "Ingen emojojoer!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Finn ingen samsvarande emojiar",
   "emoji_button.objects": "Objekt",
   "emoji_button.people": "Folk",
   "emoji_button.recent": "Ofte brukt",
@@ -159,45 +210,68 @@
   "emoji_button.travel": "Reise & stader",
   "empty_column.account_suspended": "Kontoen er suspendert",
   "empty_column.account_timeline": "Ingen tut her!",
-  "empty_column.account_unavailable": "Profil ikkje tilgjengelig",
-  "empty_column.blocks": "Du har ikkje blokkert nokon brukarar enno.",
-  "empty_column.bookmarked_statuses": "Du har ikkje nokon bokmerkte tut enno. Når du bokmerkjer eit, dukkar det opp her.",
-  "empty_column.community": "Den lokale samtiden er tom. Skriv noko offentleg å få ballen til å rulle!",
-  "empty_column.direct": "Du har ingen direktemeldingar ennå. Når du sender eller får ein vil den dukke opp her.",
-  "empty_column.domain_blocks": "Det er ingen gøymde domene ennå.",
-  "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer ein som favoritt, så dukkar det opp her.",
+  "empty_column.account_unavailable": "Profil ikkje tilgjengeleg",
+  "empty_column.blocks": "Du har ikkje blokkert nokon enno.",
+  "empty_column.bookmarked_statuses": "Du har ikkje lagra noko bokmerke enno. Når du set bokmerke på eit innlegg, dukkar det opp her.",
+  "empty_column.community": "Den lokale tidslina er tom. Skriv noko offentleg å få ballen til å rulle!",
+  "empty_column.direct": "Du har ingen direktemeldingar enno. Når du sender eller får ei, vil ho dukka opp her.",
+  "empty_column.domain_blocks": "Det er ingen skjulte domene til no.",
+  "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!",
+  "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer eit som favoritt, så dukkar det opp her.",
   "empty_column.favourites": "Ingen har merkt dette tutet som favoritt enno. Når nokon gjer det, så dukkar det opp her.",
-  "empty_column.follow_recommendations": "Ser ut som at det ikke finnes noen forslag for deg. Du kan prøve å bruke søk for å se etter folk du kan vite eller utforske trendende hashtags.",
+  "empty_column.follow_recommendations": "Det ser ikkje ut til at noko forslag kunne genererast til deg. Prøv søkjefunksjonen for å finna folk du kjenner, eller utforsk populære emneknaggar.",
   "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.",
-  "empty_column.hashtag": "Det er ingenting i denne emneknaggen ennå.",
-  "empty_column.home": "Heime-tidslinja di er tom! Besøk {public} eller søk for å starte og å møte andre brukarar.",
-  "empty_column.home.suggestions": "Se noen forslag",
+  "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.",
+  "empty_column.home": "Heime-tidslina di er tom! Følg fleire folk for å fylle ho med innhald. {suggestions}",
+  "empty_column.home.suggestions": "Sjå nokre forslag",
   "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.",
   "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.",
-  "empty_column.mutes": "Du har ikkje målbunde nokon brukarar enno.",
-  "empty_column.notifications": "Du har ingen varsel ennå. Kommuniser med andre for å starte samtalen.",
+  "empty_column.mutes": "Du har ikkje målbunde nokon enno.",
+  "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp",
-  "error.unexpected_crash.explanation": "På grunn av ein feil i vår kode eller eit nettlesarkompatibilitetsproblem, kunne ikkje denne sida verte vist korrekt.",
-  "error.unexpected_crash.explanation_addons": "Denne siden kunne ikke vises riktig. Denne feilen er sannsynligvis forårsaket av en nettleserutvidelse eller automatiske oversettelsesverktøy.",
-  "error.unexpected_crash.next_steps": "Prøv å lasta inn sida på nytt. Om det ikkje hjelper så kan du framleis nytta Mastodon i ein annan nettlesar eller app.",
-  "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
+  "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.",
+  "error.unexpected_crash.explanation_addons": "Denne sida kunne ikkje visast som den skulle. Feilen kjem truleg frå ei nettleserutviding eller frå automatiske omsetjingsverktøy.",
+  "error.unexpected_crash.next_steps": "Prøv å lasta inn sida på nytt. Hjelper ikkje dette kan du framleis nytta Mastodon i ein annan nettlesar eller app.",
+  "error.unexpected_crash.next_steps_addons": "Prøv å skru dei av og last inn sida på nytt. Hjelper ikkje det kan du framleis bruka Mastodon i ein annan nettlesar eller app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace til utklippstavla",
   "errors.unexpected_crash.report_issue": "Rapporter problem",
-  "follow_recommendations.done": "Utført",
-  "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
-  "follow_recommendations.lead": "Innlegg fra mennesker du følger vil vises i kronologisk rekkefølge på hjemmefeed. Ikke vær redd for å gjøre feil, du kan slutte å følge folk like enkelt som alt!",
+  "explore.search_results": "Søkeresultat",
+  "explore.suggested_follows": "For deg",
+  "explore.title": "Utforsk",
+  "explore.trending_links": "Nytt",
+  "explore.trending_statuses": "Innlegg",
+  "explore.trending_tags": "Emneknaggar",
+  "filter_modal.added.context_mismatch_explanation": "Denne filterkategorien gjeld ikkje i den samanhengen du har lese dette innlegget. Viss du vil at innlegget skal filtrerast i denne samanhengen òg, må du endra filteret.",
+  "filter_modal.added.context_mismatch_title": "Konteksten passar ikkje!",
+  "filter_modal.added.expired_explanation": "Denne filterkategorien har gått ut på dato. Du må endre best før datoen for at den skal gjelde.",
+  "filter_modal.added.expired_title": "Filteret har gått ut på dato!",
+  "filter_modal.added.review_and_configure": "For å gjennomgå og konfigurere denne filterkategorien, gå til {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filterinnstillingar",
+  "filter_modal.added.settings_link": "innstillingar",
+  "filter_modal.added.short_explanation": "Dette innlegget er lagt til i denne filterkategorien: {title}.",
+  "filter_modal.added.title": "Filteret er lagt til!",
+  "filter_modal.select_filter.context_mismatch": "gjeld ikkje i denne samanhengen",
+  "filter_modal.select_filter.expired": "gått ut på dato",
+  "filter_modal.select_filter.prompt_new": "Ny kategori: {name}",
+  "filter_modal.select_filter.search": "Søk eller opprett",
+  "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
+  "filter_modal.select_filter.title": "Filtrer dette innlegget",
+  "filter_modal.title.status": "Filtrer eit innlegg",
+  "follow_recommendations.done": "Ferdig",
+  "follow_recommendations.heading": "Fylg folk du ønsker å sjå innlegg frå! Her er nokre forslag.",
+  "follow_recommendations.lead": "Innlegg frå folk du fylgjer, kjem kronologisk i heimestraumen din. Ikkje ver redd for å gjera feil, du kan enkelt avfylgja folk når som helst!",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
-  "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte {domain} tilsette at du ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+  "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+  "footer.about": "Om",
+  "footer.directory": "Profilmappe",
+  "footer.get_app": "Få appen",
+  "footer.invite": "Inviter folk",
+  "footer.keyboard_shortcuts": "Snøggtastar",
+  "footer.privacy_policy": "Personvernsreglar",
+  "footer.source_code": "Vis kjeldekode",
   "generic.saved": "Lagra",
-  "getting_started.developers": "Utviklarar",
-  "getting_started.directory": "Profilkatalog",
-  "getting_started.documentation": "Dokumentasjon",
   "getting_started.heading": "Kom i gang",
-  "getting_started.invite": "Byd folk inn",
-  "getting_started.open_source_notice": "Mastodon er fri programvare. Du kan bidraga eller rapportera problem med GitHub på {github}.",
-  "getting_started.security": "Kontoinnstillingar",
-  "getting_started.terms": "Brukarvilkår",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
@@ -205,55 +279,71 @@
   "hashtag.column_settings.select.placeholder": "Legg til emneknaggar…",
   "hashtag.column_settings.tag_mode.all": "Alle disse",
   "hashtag.column_settings.tag_mode.any": "Kva som helst av desse",
-  "hashtag.column_settings.tag_mode.none": "Ikkje nokon av disse",
-  "hashtag.column_settings.tag_toggle": "Inkluder ekstra emneknaggar for denne kolonna",
-  "home.column_settings.basic": "Enkelt",
+  "hashtag.column_settings.tag_mode.none": "Ingen av desse",
+  "hashtag.column_settings.tag_toggle": "Inkluder fleire emneord for denne kolonna",
+  "hashtag.follow": "Fylg emneknagg",
+  "hashtag.unfollow": "Slutt å fylgje emneknaggen",
+  "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjeringar",
   "home.show_announcements": "Vis kunngjeringar",
+  "interaction_modal.description.favourite": "Med ein konto på Mastodon kan du favorittmerkja dette innlegget for å visa forfattaren at du set pris på det, og for å lagra det til seinare.",
+  "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
+  "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
+  "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.",
+  "interaction_modal.on_another_server": "På ein annan tenar",
+  "interaction_modal.on_this_server": "På denne tenaren",
+  "interaction_modal.other_server_instructions": "Kopier og lim inn denne URLen i søkefeltet til din favoritt Mastodon-app eller web-grensesnittet i din Mastodon server.",
+  "interaction_modal.preamble": "Sidan Mastodon er desentralisert, kan du bruke ein konto frå ein annan Mastodontenar eller frå ei anna kompatibel plattform dersom du ikkje har konto på denne tenaren.",
+  "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}",
+  "interaction_modal.title.follow": "Fylg {name}",
+  "interaction_modal.title.reblog": "Framhev {name} sitt innlegg",
+  "interaction_modal.title.reply": "Svar på innlegge til {name}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
   "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutt}}",
-  "keyboard_shortcuts.back": "for å gå tilbake",
-  "keyboard_shortcuts.blocked": "for å opna lista med blokkerte brukarar",
-  "keyboard_shortcuts.boost": "for å framheva",
-  "keyboard_shortcuts.column": "for å fokusera på ein status i ei av kolonnane",
+  "keyboard_shortcuts.back": "Gå tilbake",
+  "keyboard_shortcuts.blocked": "Opne lista over blokkerte brukarar",
+  "keyboard_shortcuts.boost": "Framhev innlegg",
+  "keyboard_shortcuts.column": "Fokuskolonne",
   "keyboard_shortcuts.compose": "for å fokusera tekstfeltet for skriving",
   "keyboard_shortcuts.description": "Skildring",
   "keyboard_shortcuts.direct": "for å opna direktemeldingskolonna",
-  "keyboard_shortcuts.down": "for å flytta seg opp og ned i lista",
-  "keyboard_shortcuts.enter": "for å opna status",
-  "keyboard_shortcuts.favourite": "for å merkja som favoritt",
-  "keyboard_shortcuts.favourites": "for å opna favorittlista",
-  "keyboard_shortcuts.federated": "for å opna den samla tidslina",
+  "keyboard_shortcuts.down": "Flytt nedover i lista",
+  "keyboard_shortcuts.enter": "Opne innlegg",
+  "keyboard_shortcuts.favourite": "Merk som favoritt",
+  "keyboard_shortcuts.favourites": "Opne favorittlista",
+  "keyboard_shortcuts.federated": "Opne den samla tidslina",
   "keyboard_shortcuts.heading": "Snøggtastar",
-  "keyboard_shortcuts.home": "for opna heimetidslina",
+  "keyboard_shortcuts.home": "Opne heimetidslina",
   "keyboard_shortcuts.hotkey": "Snøggtast",
-  "keyboard_shortcuts.legend": "for å visa denne forklåringa",
-  "keyboard_shortcuts.local": "for å opna den lokale tidslina",
-  "keyboard_shortcuts.mention": "for å nemna forfattaren",
-  "keyboard_shortcuts.muted": "for å opna lista over målbundne brukarar",
-  "keyboard_shortcuts.my_profile": "for å opna profilen din",
-  "keyboard_shortcuts.notifications": "for å opna varselskolonna",
-  "keyboard_shortcuts.open_media": "for å opna media",
-  "keyboard_shortcuts.pinned": "for å opna lista over festa tut",
-  "keyboard_shortcuts.profile": "for å opna forfattaren sin profil",
-  "keyboard_shortcuts.reply": "for å svara",
-  "keyboard_shortcuts.requests": "for å opna lista med fylgjeførespurnader",
+  "keyboard_shortcuts.legend": "Vis denne forklaringa",
+  "keyboard_shortcuts.local": "Opne lokal tidsline",
+  "keyboard_shortcuts.mention": "Nemn forfattaren",
+  "keyboard_shortcuts.muted": "Opne liste over målbundne brukarar",
+  "keyboard_shortcuts.my_profile": "Opne profilen din",
+  "keyboard_shortcuts.notifications": "Opne varselkolonna",
+  "keyboard_shortcuts.open_media": "Opne media",
+  "keyboard_shortcuts.pinned": "Opne lista over festa tut",
+  "keyboard_shortcuts.profile": "Opne forfattaren sin profil",
+  "keyboard_shortcuts.reply": "Svar på innlegg",
+  "keyboard_shortcuts.requests": "Opne lista med fylgjeførespurnader",
   "keyboard_shortcuts.search": "for å fokusera søket",
-  "keyboard_shortcuts.spoilers": "for å visa/gøyma CW-felt",
-  "keyboard_shortcuts.start": "for å opna \"kom i gang\"-feltet",
-  "keyboard_shortcuts.toggle_hidden": "for å visa/gøyma tekst bak innhaldsvarsel",
-  "keyboard_shortcuts.toggle_sensitivity": "for å visa/gøyma media",
-  "keyboard_shortcuts.toot": "for å laga ein heilt ny tut",
+  "keyboard_shortcuts.spoilers": "Vis/gøym CW-felt",
+  "keyboard_shortcuts.start": "Opne kolonna \"kom i gang\"",
+  "keyboard_shortcuts.toggle_hidden": "Vis/gøym tekst bak innhaldsvarsel",
+  "keyboard_shortcuts.toggle_sensitivity": "Vis/gøym media",
+  "keyboard_shortcuts.toot": "Lag nytt tut",
   "keyboard_shortcuts.unfocus": "for å fokusere vekk skrive-/søkefeltet",
-  "keyboard_shortcuts.up": "for å flytta seg opp på lista",
-  "lightbox.close": "Lukk att",
-  "lightbox.compress": "Komprimer bildevisningsboks",
-  "lightbox.expand": "Ekspander bildevisning boks",
+  "keyboard_shortcuts.up": "Flytt opp på lista",
+  "lightbox.close": "Lukk",
+  "lightbox.compress": "Komprimer biletvisningsboksen",
+  "lightbox.expand": "Utvid biletvisningsboksen",
   "lightbox.next": "Neste",
   "lightbox.previous": "Førre",
+  "limited_account_hint.action": "Vis profilen likevel",
+  "limited_account_hint.title": "Denne profilen er skjult av moderatorane på {domain}.",
   "lists.account.add": "Legg til i liste",
   "lists.account.remove": "Fjern frå liste",
   "lists.delete": "Slett liste",
@@ -261,35 +351,35 @@
   "lists.edit.submit": "Endre tittel",
   "lists.new.create": "Legg til liste",
   "lists.new.title_placeholder": "Ny listetittel",
-  "lists.replies_policy.followed": "Enhver fulgt bruker",
-  "lists.replies_policy.list": "Medlemmer i listen",
+  "lists.replies_policy.followed": "Alle fylgde brukarar",
+  "lists.replies_policy.list": "Medlemar i lista",
   "lists.replies_policy.none": "Ingen",
   "lists.replies_policy.title": "Vis svar på:",
-  "lists.search": "Søk gjennom folk du følgjer",
-  "lists.subheading": "Dine lister",
+  "lists.search": "Søk blant folk du fylgjer",
+  "lists.subheading": "Listene dine",
   "load_pending": "{count, plural, one {# nytt element} other {# nye element}}",
   "loading_indicator.label": "Lastar...",
-  "media_gallery.toggle_visible": "Gjer synleg/usynleg",
+  "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "missing_indicator.label": "Ikkje funne",
   "missing_indicator.sublabel": "Fann ikkje ressursen",
-  "mute_modal.duration": "Varighet",
-  "mute_modal.hide_notifications": "Gøyme varsel frå denne brukaren?",
+  "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
+  "mute_modal.duration": "Varigheit",
+  "mute_modal.hide_notifications": "Skjul varsel frå denne brukaren?",
   "mute_modal.indefinite": "På ubestemt tid",
-  "navigation_bar.apps": "Mobilappar",
+  "navigation_bar.about": "Om",
   "navigation_bar.blocks": "Blokkerte brukarar",
   "navigation_bar.bookmarks": "Bokmerke",
   "navigation_bar.community_timeline": "Lokal tidsline",
-  "navigation_bar.compose": "Lag eit nytt tut",
+  "navigation_bar.compose": "Lag nytt tut",
   "navigation_bar.direct": "Direktemeldingar",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
   "navigation_bar.edit_profile": "Rediger profil",
+  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
   "navigation_bar.follow_requests": "Fylgjeførespurnader",
   "navigation_bar.follows_and_followers": "Fylgje og fylgjarar",
-  "navigation_bar.info": "Om denne tenaren",
-  "navigation_bar.keyboard_shortcuts": "Snøggtastar",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Logg ut",
   "navigation_bar.mutes": "Målbundne brukarar",
@@ -297,48 +387,57 @@
   "navigation_bar.pins": "Festa tut",
   "navigation_bar.preferences": "Innstillingar",
   "navigation_bar.public_timeline": "Føderert tidsline",
+  "navigation_bar.search": "Søk",
   "navigation_bar.security": "Tryggleik",
+  "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
+  "notification.admin.report": "{name} rapporterte {target}",
+  "notification.admin.sign_up": "{name} er registrert",
   "notification.favourite": "{name} merkte statusen din som favoritt",
   "notification.follow": "{name} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
   "notification.mention": "{name} nemnde deg",
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
-  "notification.reblog": "{name} framheva statusen din",
+  "notification.reblog": "{name} framheva innlegget ditt",
   "notification.status": "{name} la nettopp ut",
+  "notification.update": "{name} redigerte eit innlegg",
   "notifications.clear": "Tøm varsel",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
+  "notifications.column_settings.admin.report": "Nye rapportar:",
+  "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
   "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
   "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
-  "notifications.column_settings.filter_bar.show": "Vis",
+  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
-  "notifications.column_settings.mention": "Nemningar:",
+  "notifications.column_settings.mention": "Omtalar:",
   "notifications.column_settings.poll": "Røysteresultat:",
   "notifications.column_settings.push": "Pushvarsel",
   "notifications.column_settings.reblog": "Framhevingar:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spel av lyd",
-  "notifications.column_settings.status": "Nye tuter:",
-  "notifications.column_settings.unread_markers.category": "Ulest meldingsmarkører",
+  "notifications.column_settings.status": "Nye tut:",
+  "notifications.column_settings.unread_notifications.category": "Uleste varsel",
+  "notifications.column_settings.unread_notifications.highlight": "Framhev ulesne varsel",
+  "notifications.column_settings.update": "Redigeringar:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Framhevingar",
   "notifications.filter.favourites": "Favorittar",
   "notifications.filter.follows": "Fylgjer",
-  "notifications.filter.mentions": "Nemningar",
+  "notifications.filter.mentions": "Omtalar",
   "notifications.filter.polls": "Røysteresultat",
-  "notifications.filter.statuses": "Oppdateringer fra folk du følger",
-  "notifications.grant_permission": "Gi tillatelse.",
+  "notifications.filter.statuses": "Oppdateringar frå folk du fylgjer",
+  "notifications.grant_permission": "Gje løyve.",
   "notifications.group": "{count} varsel",
-  "notifications.mark_as_read": "Merk alle varsler som lest",
-  "notifications.permission_denied": "Skrivebordsvarsler er ikke tilgjengelige på grunn av tidligere nektet nettlesertillatelser",
-  "notifications.permission_denied_alert": "Skrivebordsvarsler kan ikke aktiveres, ettersom lesertillatelse har blitt nektet før",
-  "notifications.permission_required": "Skrivebordsvarsler er utilgjengelige fordi nødvendige rettigheter ikke er gitt.",
-  "notifications_permission_banner.enable": "Skru på skrivebordsvarsler",
-  "notifications_permission_banner.how_to_control": "For å motta varsler når Mastodon ikke er åpne, aktiver desktop varsler. Du kan kontrollere nøyaktig hvilke typer interaksjoner genererer skrivebordsvarsler gjennom {icon} -knappen ovenfor når de er aktivert.",
-  "notifications_permission_banner.title": "Aldri gå glipp av noe",
+  "notifications.mark_as_read": "Marker alle varsel som lesne",
+  "notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
+  "notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
+  "notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+  "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
+  "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
+  "notifications_permission_banner.title": "Gå aldri glipp av noko",
   "picture_in_picture.restore": "Legg den tilbake",
   "poll.closed": "Lukka",
   "poll.refresh": "Oppdater",
@@ -346,59 +445,122 @@
   "poll.total_votes": "{count, plural, one {# røyst} other {# røyster}}",
   "poll.vote": "Røyst",
   "poll.voted": "Du røysta på dette svaret",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Start ei meiningsmåling",
-  "poll_button.remove_poll": "Fjern røyst",
-  "privacy.change": "Juster status-synlegheit",
-  "privacy.direct.long": "Legg berre ut for nemnde brukarar",
-  "privacy.direct.short": "Direkte",
-  "privacy.private.long": "Post kun til følgjarar",
-  "privacy.private.short": "Kun følgjarar",
-  "privacy.public.long": "Post til offentlege tidslinjer",
+  "poll.votes": "{votes, plural, one {# røyst} other {# røyster}}",
+  "poll_button.add_poll": "Lag ei rundspørjing",
+  "poll_button.remove_poll": "Fjern rundspørjing",
+  "privacy.change": "Endre personvernet på innlegg",
+  "privacy.direct.long": "Synleg kun for omtala brukarar",
+  "privacy.direct.short": "Kun nemnde personar",
+  "privacy.private.long": "Kun synleg for fylgjarar",
+  "privacy.private.short": "Kun fylgjarar",
+  "privacy.public.long": "Synleg for alle",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Ikkje post til offentlege tidslinjer",
+  "privacy.unlisted.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
   "privacy.unlisted.short": "Uoppført",
+  "privacy_policy.last_updated": "Sist oppdatert {date}",
+  "privacy_policy.title": "Personvernsreglar",
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
-  "regeneration_indicator.sublabel": "Heimetidslinja di vert førebudd!",
+  "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
   "relative_time.days": "{number}dg",
+  "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sidan",
+  "relative_time.full.hours": "{number, plural, one {# time} other {# timar}} sidan",
+  "relative_time.full.just_now": "nett no",
+  "relative_time.full.minutes": "{number, plural, one {# minutt} other {# minutt}} sidan",
+  "relative_time.full.seconds": "{number, plural, one {# sekund} other {# sekund}} sidan",
   "relative_time.hours": "{number}t",
-  "relative_time.just_now": "nå",
+  "relative_time.just_now": "no",
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
   "reply_indicator.cancel": "Avbryt",
+  "report.block": "Blokker",
+  "report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
+  "report.categories.other": "Anna",
+  "report.categories.spam": "Søppelpost",
+  "report.categories.violation": "Innhaldet bryt med ein eller fleire reglar for tenaren",
+  "report.category.subtitle": "Vel det som passar best",
+  "report.category.title": "Fortel oss kva som skjer med denne {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "innlegg",
+  "report.close": "Ferdig",
+  "report.comment.title": "Er det noko anna du meiner me bør vite?",
   "report.forward": "Vidaresend til {target}",
   "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
-  "report.hint": "Rapporten vil verte sendt til dine tenarmoderatorar. Du kan oppgje ei forklaring på kvifor du rapporterer denne kontoen, under:",
+  "report.mute": "Målbind",
+  "report.mute_explanation": "Du vil ikkje lenger sjå innlegga deira. Dei kan framleis fylgje deg og sjå innlegga dine, men vil ikkje vite at du har valt å ikkje sjå innlegga deira.",
+  "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarar",
+  "report.reasons.dislike": "Eg likar det ikkje",
+  "report.reasons.dislike_description": "Det er ikkje noko du ønsker å sjå",
+  "report.reasons.other": "Det er noko anna",
+  "report.reasons.other_description": "Problemet passar ikkje inn i dei andre kategoriane",
+  "report.reasons.spam": "Det er søppelpost",
+  "report.reasons.spam_description": "Skadelege lenker, falskt engasjement og gjentakande svar",
+  "report.reasons.violation": "Det bryt tenaren sine reglar",
+  "report.reasons.violation_description": "Du veit at den bryt spesifikke reglar",
+  "report.rules.subtitle": "Velg det som gjeld",
+  "report.rules.title": "Kva reglar vert brotne?",
+  "report.statuses.subtitle": "Velg det som gjeld",
+  "report.statuses.title": "Er det innlegg som støttar opp under denne rapporten?",
   "report.submit": "Send inn",
   "report.target": "Rapporterer {target}",
+  "report.thanks.take_action": "Dette er dei ulike alternativa for å kontrollere kva du ser på Mastodon:",
+  "report.thanks.take_action_actionable": "Medan me undersøker rapporteringa, kan du utføre desse handlingane mot @{name}:",
+  "report.thanks.title": "Vil du ikkje sjå dette?",
+  "report.thanks.title_actionable": "Takk for at du rapporterer, me skal sjå på dette.",
+  "report.unfollow": "Slutt å fylgje @{name}",
+  "report.unfollow_explanation": "Du fylgjer denne kontoen. Slutt å fylgje dei for ikkje lenger å sjå innlegga deira i heimestraumen din.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} innlegg} other {{count} innlegg}} lagt ved",
+  "report_notification.categories.other": "Anna",
+  "report_notification.categories.spam": "Søppelpost",
+  "report_notification.categories.violation": "Regelbrot",
+  "report_notification.open": "Opne rapport",
   "search.placeholder": "Søk",
+  "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.search_format": "Avansert søkeformat",
   "search_popout.tips.full_text": "Enkel tekst returnerer statusar du har skrive, likt, framheva eller vorte nemnd i, i tillegg til samsvarande brukarnamn, visningsnamn og emneknaggar.",
   "search_popout.tips.hashtag": "emneknagg",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "innlegg",
   "search_popout.tips.text": "Enkel tekst returnerer samsvarande visningsnamn, brukarnamn og emneknaggar",
   "search_popout.tips.user": "brukar",
   "search_results.accounts": "Folk",
+  "search_results.all": "Alt",
   "search_results.hashtags": "Emneknaggar",
+  "search_results.nothing_found": "Kunne ikkje finne noko for desse søkeorda",
   "search_results.statuses": "Tut",
-  "search_results.statuses_fts_disabled": "På denne Matsodon-tenaren kan du ikkje søkja på tut etter innhaldet deira.",
+  "search_results.statuses_fts_disabled": "På denne Matsodon-tenaren kan du ikkje søkja på innlegg etter innhaldet deira.",
+  "search_results.title": "Søk etter {q}",
   "search_results.total": "{count, number} {count, plural, one {treff} other {treff}}",
+  "server_banner.about_active_users": "Personar som har brukt denne tenaren dei siste 30 dagane (Månadlege Aktive Brukarar)",
+  "server_banner.active_users": "aktive brukarar",
+  "server_banner.administered_by": "Administrert av:",
+  "server_banner.introduction": "{domain} er del av det desentraliserte sosiale nettverket drive av {mastodon}.",
+  "server_banner.learn_more": "Lær meir",
+  "server_banner.server_stats": "Tenarstatistikk:",
+  "sign_in_banner.create_account": "Opprett konto",
+  "sign_in_banner.sign_in": "Logg inn",
+  "sign_in_banner.text": "Logg inn for å fylgje profiler eller emneknaggar, markere, framheve og svare på innlegg – eller samhandle med aktivitet på denne tenaren frå kontoen din på ein annan tenar.",
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
   "status.admin_status": "Opne denne statusen i moderasjonsgrensesnittet",
   "status.block": "Blokker @{name}",
-  "status.bookmark": "Bokmerk",
+  "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
   "status.cannot_reblog": "Denne posten kan ikkje framhevast",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",
   "status.detailed_status": "Detaljert samtalevisning",
   "status.direct": "Send melding til @{name}",
+  "status.edit": "Rediger",
+  "status.edited": "Redigert {date}",
+  "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",
+  "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
+  "status.hide": "Gøym innlegg",
+  "status.history.created": "{name} oppretta {date}",
+  "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last inn meir",
   "status.media_hidden": "Medium gøymd",
   "status.mention": "Nemn @{name}",
@@ -415,62 +577,70 @@
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
+  "status.replied_to": "Svarte {name}",
   "status.reply": "Svar",
   "status.replyAll": "Svar til tråd",
   "status.report": "Rapporter @{name}",
-  "status.sensitive_warning": "Sensitivt innhald",
+  "status.sensitive_warning": "Ømtolig innhald",
   "status.share": "Del",
+  "status.show_filter_reason": "Vis likevel",
   "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
   "status.show_more": "Vis meir",
   "status.show_more_all": "Vis meir for alle",
-  "status.show_thread": "Vis tråd",
+  "status.show_original": "Vis original",
+  "status.translate": "Omset",
+  "status.translated_from_with": "Omsett frå {lang} ved bruk av {provider}",
   "status.uncached_media_warning": "Ikkje tilgjengeleg",
   "status.unmute_conversation": "Opphev målbinding av samtalen",
   "status.unpin": "Løys frå profil",
-  "suggestions.dismiss": "Avslå framlegg",
+  "subscribed_languages.lead": "Kun innlegg på valde språk vil bli dukke opp i heimestraumen din og i listene dine etter denne endringa. For å motta innlegg på alle språk, la vere å velje nokon.",
+  "subscribed_languages.save": "Lagre endringar",
+  "subscribed_languages.target": "Endre abonnerte språk for {target}",
+  "suggestions.dismiss": "Avslå forslag",
   "suggestions.header": "Du er kanskje interessert i…",
   "tabs_bar.federated_timeline": "Føderert",
   "tabs_bar.home": "Heim",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Varsel",
-  "tabs_bar.search": "Søk",
   "time_remaining.days": "{number, plural, one {# dag} other {# dagar}} igjen",
   "time_remaining.hours": "{number, plural, one {# time} other {# timar}} igjen",
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutt}} igjen",
   "time_remaining.moments": "Kort tid igjen",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frå andre tenarar synest ikkje.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} frå andre tenarar blir ikkje vist.",
   "timeline_hint.resources.followers": "Fylgjarar",
   "timeline_hint.resources.follows": "Fylgjer",
   "timeline_hint.resources.statuses": "Eldre tut",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} pratar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} siste {days, plural, one {døgnet} other {{days} dagane}}",
   "trends.trending_now": "Populært no",
   "ui.beforeunload": "Kladden din forsvinn om du forlèt Mastodon no.",
   "units.short.billion": "{count}m.ard",
   "units.short.million": "{count}mill",
   "units.short.thousand": "{count}T",
-  "upload_area.title": "Drag & slepp for å lasta opp",
+  "upload_area.title": "Dra & slepp for å lasta opp",
   "upload_button.label": "Legg til medium",
   "upload_error.limit": "Du har gått over opplastingsgrensa.",
-  "upload_error.poll": "Filopplasting ikkje tillate med meiningsmålingar.",
-  "upload_form.audio_description": "Grei ut for folk med nedsett høyrsel",
-  "upload_form.description": "Skildr for synshemja",
+  "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
+  "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
+  "upload_form.description": "Skildre for dei om har redusert syn",
+  "upload_form.description_missing": "Inga skildring er lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
   "upload_form.undo": "Slett",
-  "upload_form.video_description": "Greit ut for folk med nedsett høyrsel eller syn",
+  "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Utfører…",
   "upload_modal.choose_image": "Vel bilete",
   "upload_modal.description_placeholder": "Ein rask brun rev hoppar over den late hunden",
-  "upload_modal.detect_text": "Gjenkjenn tekst i biletet",
+  "upload_modal.detect_text": "Oppdag tekst i biletet",
   "upload_modal.edit_media": "Rediger medium",
-  "upload_modal.hint": "Klikk og dra sirkelen på førehandsvisninga for å velge fokuspunktet som alltid vil vere synleg på alle miniatyrbileta.",
-  "upload_modal.preparing_ocr": "Forbereder OCR…",
+  "upload_modal.hint": "Klikk og dra sirkelen på førehandsvisninga for å velja eit fokuspunkt som alltid vil vera synleg på miniatyrbilete.",
+  "upload_modal.preparing_ocr": "Førebur OCR…",
   "upload_modal.preview_label": "Førehandsvis ({ratio})",
   "upload_progress.label": "Lastar opp...",
+  "upload_progress.processing": "Handsamar…",
   "video.close": "Lukk video",
   "video.download": "Last ned fil",
   "video.exit_fullscreen": "Lukk fullskjerm",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 179bbd1bd..b40ca049e 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,86 +1,120 @@
 {
-  "account.account_note_header": "Notis",
+  "about.blocks": "Modererte tjenere",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon er gratis, åpen kildekode-programvare og et varemerke fra Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Årsak ikke oppgitt",
+  "about.domain_blocks.preamble": "Mastodon lar deg normalt sett se innholdet fra og samhandle med brukere fra enhver annen server i fødiverset. Dette er unntakene som har blitt lagt inn på denne serveren.",
+  "about.domain_blocks.silenced.explanation": "Du vil vanligvis ikke se profiler og innhold fra denne serveren, med mindre du eksplisitt søker dem opp eller velger å følge dem.",
+  "about.domain_blocks.silenced.title": "Begrenset",
+  "about.domain_blocks.suspended.explanation": "Ikke noe innhold fra denne serveren vil bli behandlet, lagret eller utvekslet. Det gjør det umulig å samhandle eller kommunisere med brukere fra denne serveren.",
+  "about.domain_blocks.suspended.title": "Suspendert",
+  "about.not_available": "Denne informasjonen er ikke gjort tilgjengelig på denne serveren.",
+  "about.powered_by": "Desentraliserte sosiale medier drevet av {mastodon}",
+  "about.rules": "Regler for serveren",
+  "account.account_note_header": "Notat",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "Blokkér @{name}",
-  "account.block_domain": "Skjul alt fra {domain}",
+  "account.block_domain": "Blokkér domenet {domain}",
   "account.blocked": "Blokkert",
   "account.browse_more_on_origin_server": "Bla mer på den opprinnelige profilen",
-  "account.cancel_follow_request": "Avbryt følge forespørsel",
-  "account.direct": "Direct Message @{name}",
+  "account.cancel_follow_request": "Trekk tilbake følge-forespørselen",
+  "account.direct": "Send direktemelding til @{name}",
   "account.disable_notifications": "Slutt å varsle meg når @{name} legger ut innlegg",
-  "account.domain_blocked": "Domenet skjult",
+  "account.domain_blocked": "Domene blokkert",
   "account.edit_profile": "Rediger profil",
   "account.enable_notifications": "Varsle meg når @{name} legger ut innlegg",
   "account.endorse": "Vis frem på profilen",
+  "account.featured_tags.last_status_at": "Siste innlegg {date}",
+  "account.featured_tags.last_status_never": "Ingen Innlegg",
+  "account.featured_tags.title": "{name} sine fremhevede emneknagger",
   "account.follow": "Følg",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne brukeren ennå.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
+  "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
   "account.follows.empty": "Denne brukeren følger ikke noen enda.",
   "account.follows_you": "Følger deg",
+  "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
-  "account.joined": "Ble med den {date}",
-  "account.last_status": "Sist aktiv",
+  "account.joined_short": "Ble med",
+  "account.languages": "Endre hvilke språk du abonnerer på",
   "account.link_verified_on": "Eierskap av denne lenken ble sjekket {date}",
   "account.locked_info": "Denne kontoens personvernstatus er satt til låst. Eieren vurderer manuelt hvem som kan følge dem.",
   "account.media": "Media",
   "account.mention": "Nevn @{name}",
-  "account.moved_to": "{name} har flyttet til:",
+  "account.moved_to": "{name} har angitt at deres nye konto nå er:",
   "account.mute": "Demp @{name}",
-  "account.mute_notifications": "Ignorer varsler fra @{name}",
+  "account.mute_notifications": "Demp varsler fra @{name}",
   "account.muted": "Dempet",
-  "account.never_active": "Aldri",
+  "account.open_original_page": "Gå til originalsiden",
   "account.posts": "Innlegg",
-  "account.posts_with_replies": "Toots with replies",
+  "account.posts_with_replies": "Innlegg med svar",
   "account.report": "Rapportér @{name}",
-  "account.requested": "Venter på godkjennelse",
+  "account.requested": "Venter på godkjennelse. Klikk for å avbryte forespørselen",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Del @{name}s profil",
-  "account.show_reblogs": "Vis boosts fra @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} tut} other {{counter} tuter}}",
-  "account.unblock": "Avblokker @{name}",
-  "account.unblock_domain": "Vis {domain}",
+  "account.show_reblogs": "Vis fremhevinger fra @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} innlegg} other {{counter} innlegg}}",
+  "account.unblock": "Opphev blokkering av @{name}",
+  "account.unblock_domain": "Opphev blokkering av {domain}",
+  "account.unblock_short": "Opphev blokkering",
   "account.unendorse": "Ikke vis frem på profilen",
   "account.unfollow": "Avfølg",
-  "account.unmute": "Avdemp @{name}",
-  "account.unmute_notifications": "Vis varsler fra @{name}",
+  "account.unmute": "Opphev demping av @{name}",
+  "account.unmute_notifications": "Opphev demping av varsler fra @{name}",
+  "account.unmute_short": "Opphev demping",
   "account_note.placeholder": "Klikk for å legge til et notat",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Andel brukere som er aktive, per dag etter registrering",
+  "admin.dashboard.monthly_retention": "Andel brukere som er aktive, per måned etter registrering",
+  "admin.dashboard.retention.average": "Gjennomsnitt",
+  "admin.dashboard.retention.cohort": "Registreringsmåned",
+  "admin.dashboard.retention.cohort_size": "Nye brukere",
   "alert.rate_limited.message": "Vennligst prøv igjen etter kl. {retry_time, time, medium}.",
   "alert.rate_limited.title": "Hastighetsbegrenset",
   "alert.unexpected.message": "En uventet feil oppstod.",
   "alert.unexpected.title": "Oi!",
   "announcement.announcement": "Kunngjøring",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ubehandlet)",
+  "audio.hide": "Skjul lyd",
   "autosuggest_hashtag.per_week": "{count} per uke",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
-  "bundle_column_error.body": "Noe gikk galt mens denne komponenten lastet.",
+  "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
+  "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
+  "bundle_column_error.error.title": "Å nei!",
+  "bundle_column_error.network.body": "Det oppsto en feil under forsøk på å laste inn denne siden. Dette kan skyldes et midlertidig problem med din internettilkobling eller denne serveren.",
+  "bundle_column_error.network.title": "Nettverksfeil",
   "bundle_column_error.retry": "Prøv igjen",
-  "bundle_column_error.title": "Nettverksfeil",
+  "bundle_column_error.return": "Gå hjem igjen",
+  "bundle_column_error.routing.body": "Den forespurte siden ble ikke funnet. Er du sikker på at URL-en i adresselinjen er riktig?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Lukk",
   "bundle_modal_error.message": "Noe gikk galt da denne komponenten lastet.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "closed_registrations.other_server_instructions": "Siden Mastodon er desentralizert, kan du opprette en konto på en annen server og fortsatt kommunisere med denne.",
+  "closed_registrations_modal.description": "Opprettelse av en konto på {domain} er for tiden ikke mulig, men vær oppmerksom på at du ikke trenger en konto spesifikt på {domain} for å kunne bruke Mastodon.",
+  "closed_registrations_modal.find_another_server": "Finn en annen server",
+  "closed_registrations_modal.preamble": "Mastodon er desentralisert, så uansett hvor du oppretter kontoen din, vil du kunne følge og samhandle med alle på denne serveren. Du kan til og med kjøre serveren selv!",
+  "closed_registrations_modal.title": "Registrerer deg på Mastodon",
+  "column.about": "Om",
   "column.blocks": "Blokkerte brukere",
   "column.bookmarks": "Bokmerker",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direktemeldinger",
   "column.directory": "Bla gjennom profiler",
   "column.domain_blocks": "Skjulte domener",
-  "column.favourites": "Likt",
+  "column.favourites": "Favoritter",
   "column.follow_requests": "Følgeforespørsler",
   "column.home": "Hjem",
   "column.lists": "Lister",
   "column.mutes": "Dempede brukere",
   "column.notifications": "Varsler",
-  "column.pins": "Pinned toot",
+  "column.pins": "Festede innlegg",
   "column.public": "Felles tidslinje",
   "column_back_button.label": "Tilbake",
-  "column_header.hide_settings": "Gjem  innstillinger",
+  "column_header.hide_settings": "Skjul innstillinger",
   "column_header.moveLeft_settings": "Flytt feltet til venstre",
   "column_header.moveRight_settings": "Flytt feltet til høyre",
   "column_header.pin": "Fest",
@@ -90,9 +124,11 @@
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Kun eksternt",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "compose.language.change": "Bytt språk",
+  "compose.language.search": "Søk etter språk...",
   "compose_form.direct_message_warning_learn_more": "Lær mer",
-  "compose_form.hashtag_warning": "Denne tuten blir ikke listet under noen emneknagger da den er ulistet. Kun offentlige tuter kan søktes etter med emneknagg.",
+  "compose_form.encryption_warning": "Innlegg på Mastodon er ikke ende-til-ende-krypterte. Ikke del sensitive opplysninger via Mastodon.",
+  "compose_form.hashtag_warning": "Dette innlegget blir vist under noen emneknagger da det er uoppført. Kun offentlige innlegg kan søkes opp med emneknagg.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
@@ -102,24 +138,28 @@
   "compose_form.poll.remove_option": "Fjern dette valget",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
-  "compose_form.publish": "Tut",
+  "compose_form.publish": "Publiser",
+  "compose_form.publish_form": "Publiser",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Merk media som sensitivt",
-  "compose_form.sensitive.marked": "Mediet er merket som sensitiv",
-  "compose_form.sensitive.unmarked": "Mediet er ikke merket som sensitiv",
-  "compose_form.spoiler.marked": "Teksten er skjult bak en advarsel",
-  "compose_form.spoiler.unmarked": "Teksten er ikke skjult",
-  "compose_form.spoiler_placeholder": "Innholdsadvarsel",
+  "compose_form.save_changes": "Lagre endringer",
+  "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
+  "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
+  "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+  "compose_form.spoiler.marked": "Fjern innholdsvarsel",
+  "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
+  "compose_form.spoiler_placeholder": "Skriv advarselen din her",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
   "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
+  "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
+  "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
   "confirmations.delete.message": "Er du sikker på at du vil slette denne statusen?",
   "confirmations.delete_list.confirm": "Slett",
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Forkast",
+  "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
   "confirmations.domain_block.confirm": "Skjul alt fra domenet",
   "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.logout.confirm": "Logg ut",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marker som lest",
   "conversation.open": "Vis samtale",
   "conversation.with": "Med {names}",
+  "copypaste.copied": "Kopiert",
+  "copypaste.copy": "Kopier",
   "directory.federated": "Fra det kjente strømiverset",
   "directory.local": "Kun fra {domain}",
   "directory.new_arrivals": "Nye ankomster",
   "directory.recently_active": "Nylig aktiv",
+  "disabled_account_banner.account_settings": "Kontoinnstillinger",
+  "disabled_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert.",
+  "dismissable_banner.community_timeline": "Dette er de nyeste offentlige innleggene fra personer med kontoer på {domain}.",
+  "dismissable_banner.dismiss": "Avvis",
+  "dismissable_banner.explore_links": "Disse nyhetene snakker folk om akkurat nå på denne og andre servere i det desentraliserte nettverket.",
+  "dismissable_banner.explore_statuses": "Disse innleggene fra denne og andre servere i det desentraliserte nettverket får økt oppmerksomhet på denne serveren akkurat nå.",
+  "dismissable_banner.explore_tags": "Disse emneknaggene snakker folk om akkurat nå, på denne og andre servere i det desentraliserte nettverket.",
+  "dismissable_banner.public_timeline": "Dette er de nyeste offentlige innleggene fra personer på denne og andre servere i det desentraliserte nettverket som denne serveren kjenner til.",
   "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.",
   "embed.preview": "Slik kommer det til å se ut:",
   "emoji_button.activity": "Aktivitet",
+  "emoji_button.clear": "Nullstill",
   "emoji_button.custom": "Tilpasset",
   "emoji_button.flags": "Flagg",
   "emoji_button.food": "Mat og drikke",
@@ -158,19 +209,20 @@
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
   "empty_column.account_suspended": "Kontoen er suspendert",
-  "empty_column.account_timeline": "Ingen tuter er her!",
+  "empty_column.account_timeline": "Ingen innlegg her!",
   "empty_column.account_unavailable": "Profilen er utilgjengelig",
   "empty_column.blocks": "Du har ikke blokkert noen brukere enda.",
-  "empty_column.bookmarked_statuses": "Du har ikke bokmerket noen tuter enda. Når du bokmerker en, vil den dukke opp her.",
+  "empty_column.bookmarked_statuses": "Du har ikke noen bokmerkede innlegg enda. Når du har noen bokmerkede innlegg, vil de dukke opp her.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
-  "empty_column.direct": "Du har ingen direktemeldinger enda. Når du mottar eller sender en, vil den dukke opp her.",
+  "empty_column.direct": "Du har ingen direktemeldinger enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
   "empty_column.domain_blocks": "Det er ingen skjulte domener enda.",
-  "empty_column.favourited_statuses": "Du har ikke likt noen tuter enda. Når du liker en, vil den dukke opp her.",
-  "empty_column.favourites": "Ingen har likt denne tuten enda. Når noen gjør det, vil de dukke opp her.",
+  "empty_column.explore_statuses": "Ingenting er populært akkurat nå. Prøv igjen senere!",
+  "empty_column.favourited_statuses": "Du har ikke noen favorittinnlegg enda. Når du favorittmarkerer et inlegg, vil det dukke opp her.",
+  "empty_column.favourites": "Ingen har favorittmarkert dette innlegget ennå. Når noen gjør det, vil de dukke opp her.",
   "empty_column.follow_recommendations": "Ser ut som at det ikke finnes noen forslag for deg. Du kan prøve å bruke søk for å se etter folk du kan vite eller utforske trendende hashtags.",
   "empty_column.follow_requests": "Du har ingen følgeforespørsler enda. Når du mottar en, vil den dukke opp her.",
-  "empty_column.hashtag": "Det er ingenting i denne hashtagen ennå.",
-  "empty_column.home": "Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.",
+  "empty_column.hashtag": "Det er ingenting i denne emneknaggen ennå.",
+  "empty_column.home": "Hjem-tidslinjen din er tom! Følg flere folk for å fylle den. {suggestions}",
   "empty_column.home.suggestions": "Se noen forslag",
   "empty_column.list": "Det er ingenting i denne listen ennå. Når medlemmene av denne listen legger ut nye statuser vil de dukke opp her.",
   "empty_column.lists": "Du har ingen lister enda. Når du lager en, vil den dukke opp her.",
@@ -183,83 +235,121 @@
   "error.unexpected_crash.next_steps_addons": "Prøv å deaktivere dem og laste siden på nytt. Hvis det ikke hjelper, kan du fremdeles bruke Mastodon via en annen nettleser eller en annen app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopier stacktrace-en til utklippstavlen",
   "errors.unexpected_crash.report_issue": "Rapporter en feil",
+  "explore.search_results": "Søkeresultater",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Utforsk",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Denne filterkategorien gjelder ikke for den konteksten du har åpnet dette innlegget i. Hvis du vil at innlegget skal filtreres i denne konteksten også, må du redigere filteret.",
+  "filter_modal.added.context_mismatch_title": "Feil sammenheng!",
+  "filter_modal.added.expired_explanation": "Denne filterkategorien er utløpt, du må endre utløpsdato for at den skal gjelde.",
+  "filter_modal.added.expired_title": "Utløpt filter!",
+  "filter_modal.added.review_and_configure": "For å gjennomgå og ytterligere konfigurere denne filterkategorien, gå til {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filterinnstillinger",
+  "filter_modal.added.settings_link": "innstillinger-siden",
+  "filter_modal.added.short_explanation": "Dette innlegget er lagt til i følgende filterkategori: {title}.",
+  "filter_modal.added.title": "Filter lagt til!",
+  "filter_modal.select_filter.context_mismatch": "gjelder ikke for denne sammenhengen",
+  "filter_modal.select_filter.expired": "utløpt",
+  "filter_modal.select_filter.prompt_new": "Ny kategori: {name}",
+  "filter_modal.select_filter.search": "Søk eller opprett",
+  "filter_modal.select_filter.subtitle": "Bruk en eksisterende kategori eller opprett en ny",
+  "filter_modal.select_filter.title": "Filtrer dette innlegget",
+  "filter_modal.title.status": "Filtrer et innlegg",
   "follow_recommendations.done": "Utført",
   "follow_recommendations.heading": "Følg folk du ønsker å se innlegg fra! Her er noen forslag.",
   "follow_recommendations.lead": "Innlegg fra mennesker du følger vil vises i kronologisk rekkefølge på hjemmefeed. Ikke vær redd for å gjøre feil, du kan slutte å følge folk like enkelt som alt!",
   "follow_request.authorize": "Autorisér",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
+  "footer.about": "Om",
+  "footer.directory": "Profilkatalog",
+  "footer.get_app": "Last ned appen",
+  "footer.invite": "Invitér folk",
+  "footer.keyboard_shortcuts": "Hurtigtaster",
+  "footer.privacy_policy": "Personvernregler",
+  "footer.source_code": "Vis kildekode",
   "generic.saved": "Lagret",
-  "getting_started.developers": "Utviklere",
-  "getting_started.directory": "Profilmappe",
-  "getting_started.documentation": "Dokumentasjon",
   "getting_started.heading": "Kom i gang",
-  "getting_started.invite": "Inviter folk",
-  "getting_started.open_source_notice": "Mastodon er fri programvare. Du kan bidra eller rapportere problemer på GitHub på {github}.",
-  "getting_started.security": "Kontoinnstillinger",
-  "getting_started.terms": "Bruksvilkår",
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",
   "hashtag.column_settings.select.no_options_message": "Ingen forslag ble funnet",
-  "hashtag.column_settings.select.placeholder": "Skriv inn emneknagger …",
+  "hashtag.column_settings.select.placeholder": "Skriv inn emneknagger…",
   "hashtag.column_settings.tag_mode.all": "Alle disse",
   "hashtag.column_settings.tag_mode.any": "Enhver av disse",
   "hashtag.column_settings.tag_mode.none": "Ingen av disse",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Følg emneknagg",
+  "hashtag.unfollow": "Slutt å følge emneknagg",
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjøring",
   "home.show_announcements": "Vis kunngjøring",
+  "interaction_modal.description.favourite": "Med en konto på Mastodon, kan du favorittmarkere dette innlegget for å la forfatteren vite at du satte pris på det, og lagre innlegget til senere.",
+  "interaction_modal.description.follow": "Med en konto på Mastodon, kan du følge {name} for å få innleggene deres i hjem-feeden din.",
+  "interaction_modal.description.reblog": "Med en konto på Mastodon, kan du fremheve dette innlegget for å dele det med dine egne følgere.",
+  "interaction_modal.description.reply": "Med en konto på Mastodon, kan du svare på dette innlegget.",
+  "interaction_modal.on_another_server": "På en annen server",
+  "interaction_modal.on_this_server": "På denne serveren",
+  "interaction_modal.other_server_instructions": "Kopier og lim inn denne URLen i søkefeltet til din favoritt Mastodon-app eller web-grensesnittet i din Mastodon server.",
+  "interaction_modal.preamble": "Siden Mastodon er desentralisert, kan du bruke din eksisterende konto på en annen Mastodon-tjener eller en kompatibel plattform hvis du ikke har en konto her.",
+  "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}",
+  "interaction_modal.title.follow": "Følg {name}",
+  "interaction_modal.title.reblog": "Fremhev {name} sitt innlegg",
+  "interaction_modal.title.reply": "Svar på {name} sitt innlegg",
   "intervals.full.days": "{number, plural,one {# dag} other {# dager}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutter}}",
-  "keyboard_shortcuts.back": "for å navigere tilbake",
-  "keyboard_shortcuts.blocked": "åpne listen over blokkerte brukere",
-  "keyboard_shortcuts.boost": "å fremheve",
-  "keyboard_shortcuts.column": "å fokusere en status i en av kolonnene",
-  "keyboard_shortcuts.compose": "å fokusere komponeringsfeltet",
+  "keyboard_shortcuts.back": "Gå tilbake",
+  "keyboard_shortcuts.blocked": "Åpne listen over blokkerte brukere",
+  "keyboard_shortcuts.boost": "Fremhev innlegg",
+  "keyboard_shortcuts.column": "Gå til en kolonne",
+  "keyboard_shortcuts.compose": "Gå til komponeringsfeltet",
   "keyboard_shortcuts.description": "Beskrivelse",
-  "keyboard_shortcuts.direct": "åpne direktemeldingskolonnen",
-  "keyboard_shortcuts.down": "for å flytte ned i listen",
-  "keyboard_shortcuts.enter": "å åpne status",
-  "keyboard_shortcuts.favourite": "for å favorittmarkere",
-  "keyboard_shortcuts.favourites": "åpne listen over likte ting",
-  "keyboard_shortcuts.federated": "for å åpne fellestidslinjen",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "åpne hjemmetidslinjen",
+  "keyboard_shortcuts.direct": "for å åpne kolonne med direktemeldinger",
+  "keyboard_shortcuts.down": "Flytt nedover i listen",
+  "keyboard_shortcuts.enter": "Åpne innlegg",
+  "keyboard_shortcuts.favourite": "Marker innlegg som favoritt",
+  "keyboard_shortcuts.favourites": "Åpne listen over favoritter",
+  "keyboard_shortcuts.federated": "Åpne fellestidslinjen",
+  "keyboard_shortcuts.heading": "Hurtigtaster",
+  "keyboard_shortcuts.home": "Åpne hjemmetidslinjen",
   "keyboard_shortcuts.hotkey": "Lyntast",
-  "keyboard_shortcuts.legend": "å vise denne forklaringen",
-  "keyboard_shortcuts.local": "åpne den lokale tidslinjen",
-  "keyboard_shortcuts.mention": "å nevne forfatter",
-  "keyboard_shortcuts.muted": "åpne listen over dempede brukere",
-  "keyboard_shortcuts.my_profile": "å åpne profilen din",
-  "keyboard_shortcuts.notifications": "åpne varslingskolonnen",
-  "keyboard_shortcuts.open_media": "å åpne media",
-  "keyboard_shortcuts.pinned": "åpne listen over klistrede tuter",
-  "keyboard_shortcuts.profile": "åpne forfatterens profil",
-  "keyboard_shortcuts.reply": "for å svare",
-  "keyboard_shortcuts.requests": "åpne følgingsforespørselslisten",
-  "keyboard_shortcuts.search": "å fokusere søk",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "åpne «Sett i gang»-kolonnen",
-  "keyboard_shortcuts.toggle_hidden": "å vise/skjule tekst bak en innholdsadvarsel",
-  "keyboard_shortcuts.toggle_sensitivity": "å vise/skjule media",
+  "keyboard_shortcuts.legend": "Vis denne tegnforklaringen",
+  "keyboard_shortcuts.local": "Åpne den lokale tidslinjen",
+  "keyboard_shortcuts.mention": "Nevn forfatter",
+  "keyboard_shortcuts.muted": "Åpne listen over dempede brukere",
+  "keyboard_shortcuts.my_profile": "Åpne profilen din",
+  "keyboard_shortcuts.notifications": "Åpne varslingskolonnen",
+  "keyboard_shortcuts.open_media": "Åpne media",
+  "keyboard_shortcuts.pinned": "Åpne listen over festede innlegg",
+  "keyboard_shortcuts.profile": "Åpne forfatterens profil",
+  "keyboard_shortcuts.reply": "Svar på innlegg",
+  "keyboard_shortcuts.requests": "Åpne listen over følgeforespørsler",
+  "keyboard_shortcuts.search": "Gå til søkefeltet",
+  "keyboard_shortcuts.spoilers": "Vis/skjul CW-felt",
+  "keyboard_shortcuts.start": "Åpne kolonnen «Kom i gang»",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bak innholdsvarsel",
+  "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul media",
   "keyboard_shortcuts.toot": "Start et nytt innlegg",
-  "keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet",
-  "keyboard_shortcuts.up": "å flytte opp i listen",
+  "keyboard_shortcuts.unfocus": "Fjern fokus fra komponerings-/søkefeltet",
+  "keyboard_shortcuts.up": "Flytt oppover i listen",
   "lightbox.close": "Lukk",
   "lightbox.compress": "Komprimer bildevisningsboks",
   "lightbox.expand": "Ekspander bildevisning boks",
   "lightbox.next": "Neste",
   "lightbox.previous": "Forrige",
+  "limited_account_hint.action": "Vis profil likevel",
+  "limited_account_hint.title": "Denne profilen har blitt skjult av moderatorene til {domain}.",
   "lists.account.add": "Legg til i listen",
   "lists.account.remove": "Fjern fra listen",
   "lists.delete": "Slett listen",
   "lists.edit": "Rediger listen",
   "lists.edit.submit": "Endre tittel",
-  "lists.new.create": "Ligg til liste",
+  "lists.new.create": "Legg til liste",
   "lists.new.title_placeholder": "Ny listetittel",
   "lists.replies_policy.followed": "Enhver fulgt bruker",
   "lists.replies_policy.list": "Medlemmer i listen",
@@ -272,47 +362,54 @@
   "media_gallery.toggle_visible": "Veksle synlighet",
   "missing_indicator.label": "Ikke funnet",
   "missing_indicator.sublabel": "Denne ressursen ble ikke funnet",
+  "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
   "mute_modal.duration": "Varighet",
   "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
   "mute_modal.indefinite": "På ubestemt tid",
-  "navigation_bar.apps": "Mobilapper",
+  "navigation_bar.about": "Om",
   "navigation_bar.blocks": "Blokkerte brukere",
   "navigation_bar.bookmarks": "Bokmerker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Skriv en ny tut",
+  "navigation_bar.compose": "Skriv et nytt innlegg",
   "navigation_bar.direct": "Direktemeldinger",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
   "navigation_bar.edit_profile": "Rediger profil",
+  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
   "navigation_bar.follow_requests": "Følgeforespørsler",
   "navigation_bar.follows_and_followers": "Følginger og følgere",
-  "navigation_bar.info": "Utvidet informasjon",
-  "navigation_bar.keyboard_shortcuts": "Tastatursnarveier",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Logg ut",
   "navigation_bar.mutes": "Dempede brukere",
   "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Festa tuter",
+  "navigation_bar.pins": "Festede innlegg",
   "navigation_bar.preferences": "Innstillinger",
   "navigation_bar.public_timeline": "Felles tidslinje",
+  "navigation_bar.search": "Søk",
   "navigation_bar.security": "Sikkerhet",
-  "notification.favourite": "{name} likte din status",
+  "not_signed_in_indicator.not_signed_in": "Du må logge inn for å få tilgang til denne ressursen.",
+  "notification.admin.report": "{name} rapporterte {target}",
+  "notification.admin.sign_up": "{name} registrerte seg",
+  "notification.favourite": "{name} favorittmarkerte innlegget ditt",
   "notification.follow": "{name} fulgte deg",
   "notification.follow_request": "{name} har bedt om å få følge deg",
   "notification.mention": "{name} nevnte deg",
   "notification.own_poll": "Avstemningen din er ferdig",
-  "notification.poll": "En avstemning du har stemt på har avsluttet",
-  "notification.reblog": "{name} fremhevde din status",
+  "notification.poll": "En avstemning du stemte på har avsluttet",
+  "notification.reblog": "{name} fremhevet ditt innlegg",
   "notification.status": "{name} la nettopp ut",
+  "notification.update": "{name} redigerte et innlegg",
   "notifications.clear": "Fjern varsler",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerne alle dine varsler permanent?",
+  "notifications.column_settings.admin.report": "Nye rapporter:",
+  "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
-  "notifications.column_settings.favourite": "Likt:",
+  "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
-  "notifications.column_settings.filter_bar.show": "Vis",
+  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgerforespørsler:",
   "notifications.column_settings.mention": "Nevnt:",
@@ -321,8 +418,10 @@
   "notifications.column_settings.reblog": "Fremhevet:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spill lyd",
-  "notifications.column_settings.status": "Nye tuter:",
-  "notifications.column_settings.unread_markers.category": "Ulest meldingsmarkører",
+  "notifications.column_settings.status": "Nye innlegg:",
+  "notifications.column_settings.unread_notifications.category": "Uleste varslinger",
+  "notifications.column_settings.unread_notifications.highlight": "Marker uleste varslinger",
+  "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Fremhevinger",
   "notifications.filter.favourites": "Favoritter",
@@ -346,95 +445,164 @@
   "poll.total_votes": "{count, plural, one {# stemme} other {# stemmer}}",
   "poll.vote": "Stem",
   "poll.voted": "Du stemte på dette svaret",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# stemme} other {# stemmer}}",
   "poll_button.add_poll": "Legg til en avstemning",
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Justér synlighet",
   "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Direkte",
+  "privacy.direct.short": "Kun nevnte personer",
   "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Privat",
-  "privacy.public.long": "Post kun til offentlige tidslinjer",
+  "privacy.private.short": "Kun følgere",
+  "privacy.public.long": "Synlig for alle",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
+  "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
   "privacy.unlisted.short": "Uoppført",
+  "privacy_policy.last_updated": "Sist oppdatert {date}",
+  "privacy_policy.title": "Personvernregler",
   "refresh": "Oppfrisk",
   "regeneration_indicator.label": "Laster…",
   "regeneration_indicator.sublabel": "Dine startside forberedes!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dag} other {# dager}} siden",
+  "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",
+  "relative_time.full.just_now": "nettopp",
+  "relative_time.full.minutes": "for {number, plural, one {# minutt} other {# minutter}} siden",
+  "relative_time.full.seconds": "for {number, plural, one {# sekund} other {# sekunder}} siden",
   "relative_time.hours": "{number}t",
   "relative_time.just_now": "nå",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
   "reply_indicator.cancel": "Avbryt",
+  "report.block": "Blokker",
+  "report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
+  "report.categories.other": "Annet",
+  "report.categories.spam": "Søppelpost",
+  "report.categories.violation": "Innholdet bryter en eller flere serverregler",
+  "report.category.subtitle": "Velg det som passer best",
+  "report.category.title": "Fortell oss hva som skjer med denne {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "innlegg",
+  "report.close": "Utført",
+  "report.comment.title": "Er det noe annet du mener vi burde vite?",
   "report.forward": "Videresend til {target}",
   "report.forward_hint": "Denne kontoen er fra en annen tjener. Vil du sende en anonymisert kopi av rapporten dit også?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.mute": "Demp",
+  "report.mute_explanation": "Du kommer ikke til å se deres innlegg. De kan fortsatt følge deg og se dine innlegg, og kan ikke se at de er dempet.",
+  "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarer",
+  "report.reasons.dislike": "Jeg liker det ikke",
+  "report.reasons.dislike_description": "Det er ikke noe du har lyst til å se",
+  "report.reasons.other": "Det er noe annet",
+  "report.reasons.other_description": "Problemet passer ikke inn i de andre kategoriene",
+  "report.reasons.spam": "Det er spam",
+  "report.reasons.spam_description": "Ondsinnede lenker, falsk engasjement eller repeterende svar",
+  "report.reasons.violation": "Det bryter serverregler",
+  "report.reasons.violation_description": "Du er klar over at det bryter spesifikke regler",
+  "report.rules.subtitle": "Velg alle som passer",
+  "report.rules.title": "Hvilke regler brytes?",
+  "report.statuses.subtitle": "Velg alle som passer",
+  "report.statuses.title": "Er det noen innlegg som støtter opp under denne rapporten?",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
+  "report.thanks.take_action": "Her er alternativene dine for å kontrollere hva du ser på Mastodon:",
+  "report.thanks.take_action_actionable": "Mens vi går gjennom dette, kan du iverksettet tiltak mot @{name}:",
+  "report.thanks.title": "Ønsker du ikke å se dette?",
+  "report.thanks.title_actionable": "Takk for at du rapporterer, vi skal se på dette.",
+  "report.unfollow": "Slutt å følge @{name}",
+  "report.unfollow_explanation": "Du følger denne kontoen. For ikke å se innleggene deres i din hjem-feed lenger, slutt å følge dem.",
+  "report_notification.attached_statuses": "{count, plural,one {{count} innlegg} other {{count} innlegg}} vedlagt",
+  "report_notification.categories.other": "Annet",
+  "report_notification.categories.spam": "Søppelpost",
+  "report_notification.categories.violation": "Regelbrudd",
+  "report_notification.open": "Åpne rapport",
   "search.placeholder": "Søk",
+  "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.search_format": "Avansert søkeformat",
-  "search_popout.tips.full_text": "Enkel tekst gir resultater for statuser du har skrevet, likt, fremhevet, eller har blitt nevnt i, i tillegg til samsvarende brukernavn, visningsnavn og emneknagger.",
+  "search_popout.tips.full_text": "Enkel tekst gir resultater for innlegg du har skrevet, favorittmarkert, fremhevet, eller har blitt nevnt i, i tillegg til samsvarende brukernavn, visningsnavn og emneknagger.",
   "search_popout.tips.hashtag": "emneknagg",
   "search_popout.tips.status": "status",
   "search_popout.tips.text": "Enkel tekst returnerer matchende visningsnavn, brukernavn og emneknagger",
   "search_popout.tips.user": "bruker",
   "search_results.accounts": "Folk",
+  "search_results.all": "Alle",
   "search_results.hashtags": "Emneknagger",
-  "search_results.statuses": "Tuter",
-  "search_results.statuses_fts_disabled": "Å søke i tuter etter innhold er ikke skrudd på i denne Mastodon-tjeneren.",
+  "search_results.nothing_found": "Fant ikke noe for disse søkeordene",
+  "search_results.statuses": "Innlegg",
+  "search_results.statuses_fts_disabled": "Å søke i innlegg etter innhold er ikke skrudd på i denne Mastodon-tjeneren.",
+  "search_results.title": "Søk etter {q}",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
+  "server_banner.about_active_users": "Personer som har brukt denne serveren i løpet av de siste 30 dagene (aktive brukere månedlig)",
+  "server_banner.active_users": "aktive brukere",
+  "server_banner.administered_by": "Administrert av:",
+  "server_banner.introduction": "{domain} er en del av det desentraliserte sosiale nettverket drevet av {mastodon}.",
+  "server_banner.learn_more": "Finn ut mer",
+  "server_banner.server_stats": "Serverstatistikk:",
+  "sign_in_banner.create_account": "Opprett konto",
+  "sign_in_banner.sign_in": "Logg inn",
+  "sign_in_banner.text": "Logg inn for å følge profiler eller hashtags, like, dele og svare på innlegg eller interagere fra din konto på en annen server.",
   "status.admin_account": "Åpne moderatorgrensesnittet for @{name}",
   "status.admin_status": "Åpne denne statusen i moderatorgrensesnittet",
   "status.block": "Blokkér @{name}",
   "status.bookmark": "Bokmerke",
   "status.cancel_reblog_private": "Fjern fremheving",
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
-  "status.copy": "Kopier lenken til statusen",
+  "status.copy": "Kopier lenken til innlegget",
   "status.delete": "Slett",
   "status.detailed_status": "Detaljert samtalevisning",
   "status.direct": "Send direktemelding til @{name}",
+  "status.edit": "Redigér",
+  "status.edited": "Redigert {date}",
+  "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
   "status.embed": "Bygge inn",
-  "status.favourite": "Lik",
+  "status.favourite": "Marker som favoritt",
+  "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
+  "status.hide": "Skjul innlegg",
+  "status.history.created": "{name} opprettet {date}",
+  "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last mer",
   "status.media_hidden": "Media skjult",
   "status.mention": "Nevn @{name}",
   "status.more": "Mer",
   "status.mute": "Demp @{name}",
   "status.mute_conversation": "Demp samtale",
-  "status.open": "Utvid denne statusen",
+  "status.open": "Utvid dette innlegget",
   "status.pin": "Fest på profilen",
-  "status.pinned": "Festet tut",
+  "status.pinned": "Festet innlegg",
   "status.read_more": "Les mer",
   "status.reblog": "Fremhev",
   "status.reblog_private": "Fremhev til det opprinnelige publikummet",
-  "status.reblogged_by": "Fremhevd av {name}",
-  "status.reblogs.empty": "Ingen har fremhevet denne tuten enda. Når noen gjør det, vil de dukke opp her.",
+  "status.reblogged_by": "Fremhevet av {name}",
+  "status.reblogs.empty": "Ingen har fremhevet dette innlegget enda. Når noen gjør det, vil de dukke opp her.",
   "status.redraft": "Slett og drøft på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
+  "status.replied_to": "Som svar til {name}",
   "status.reply": "Svar",
   "status.replyAll": "Svar til samtale",
   "status.report": "Rapporter @{name}",
   "status.sensitive_warning": "Følsomt innhold",
   "status.share": "Del",
+  "status.show_filter_reason": "Vis likevel",
   "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
   "status.show_more": "Vis mer",
   "status.show_more_all": "Vis mer for alle",
-  "status.show_thread": "Vis tråden",
+  "status.show_original": "Vis original",
+  "status.translate": "Oversett",
+  "status.translated_from_with": "Oversatt fra {lang} ved å bruke {provider}",
   "status.uncached_media_warning": "Ikke tilgjengelig",
   "status.unmute_conversation": "Ikke demp samtale",
   "status.unpin": "Angre festing på profilen",
+  "subscribed_languages.lead": "Bare innlegg på valgte språk vil dukke opp i dine hjem- og liste-tidslinjer etter endringen. Velg ingen for å motta innlegg på alle språk.",
+  "subscribed_languages.save": "Lagre endringer",
+  "subscribed_languages.target": "Endre abonnerte språk for {target}",
   "suggestions.dismiss": "Utelukk forslaget",
   "suggestions.header": "Du er kanskje interessert i …",
   "tabs_bar.federated_timeline": "Felles",
   "tabs_bar.home": "Hjem",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Varslinger",
-  "tabs_bar.search": "Søk",
   "time_remaining.days": "{number, plural,one {# dag} other {# dager}} igjen",
   "time_remaining.hours": "{number, plural, one {# time} other {# timer}} igjen",
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutter}} igjen",
@@ -443,8 +611,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
   "timeline_hint.resources.followers": "Følgere",
   "timeline_hint.resources.follows": "Følger",
-  "timeline_hint.resources.statuses": "Eldre tuter",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} snakker",
+  "timeline_hint.resources.statuses": "Eldre innlegg",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} {days, plural, one {den siste dagen} other {de siste {days} dagene}}",
   "trends.trending_now": "Trender nå",
   "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.",
   "units.short.billion": "{count}m.ard",
@@ -453,16 +621,17 @@
   "upload_area.title": "Dra og slipp for å laste opp",
   "upload_button.label": "Legg til media",
   "upload_error.limit": "Filopplastingsgrensen er oversteget.",
-  "upload_error.poll": "Filopplasting inni avstemninger er ikke tillatt.",
+  "upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
   "upload_form.audio_description": "Beskriv det for folk med hørselstap",
   "upload_form.description": "Beskriv for synshemmede",
+  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
   "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet …",
   "upload_modal.apply": "Bruk",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Utfører…",
   "upload_modal.choose_image": "Velg et bilde",
   "upload_modal.description_placeholder": "Når du en gang kommer, neste sommer, skal vi atter drikke vin",
   "upload_modal.detect_text": "Oppdag tekst i bildet",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Forbereder OCR…",
   "upload_modal.preview_label": "Forhåndsvisning ({ratio})",
   "upload_progress.label": "Laster opp...",
+  "upload_progress.processing": "Behandler…",
   "video.close": "Lukk video",
   "video.download": "Last ned fil",
   "video.exit_fullscreen": "Lukk fullskjerm",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 6f7bc9761..b4fbcec33 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servidors moderats",
+  "about.contact": "Contacte :",
+  "about.disclaimer": "Mastodon es gratuit, un logicial libre e una marca de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Rason pas disponibla",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limitats",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspenduts",
+  "about.not_available": "Aquesta informacion foguèt pas renduda disponibla sus aqueste servidor.",
+  "about.powered_by": "Malhum social descentralizat propulsat per {mastodon}",
+  "about.rules": "Règlas del servidor",
   "account.account_note_header": "Nòta",
   "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
   "account.badges.bot": "Robòt",
@@ -7,64 +19,86 @@
   "account.block_domain": "Tot amagar del domeni {domain}",
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Navigar sul perfil original",
-  "account.cancel_follow_request": "Anullar la demanda de seguiment",
+  "account.cancel_follow_request": "Retirar la demanda d’abonament",
   "account.direct": "Escriure un MP a @{name}",
   "account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
   "account.domain_blocked": "Domeni amagat",
   "account.edit_profile": "Modificar lo perfil",
   "account.enable_notifications": "M’avisar quand @{name} publica quicòm",
   "account.endorse": "Mostrar pel perfil",
+  "account.featured_tags.last_status_at": "Darrièra publicacion lo {date}",
+  "account.featured_tags.last_status_never": "Cap de publicacion",
+  "account.featured_tags.title": "Etiquetas en avant de {name}",
   "account.follow": "Sègre",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
+  "account.following": "Abonat",
   "account.following_counter": "{count, plural, one {{counter} Abonaments} other {{counter} Abonaments}}",
   "account.follows.empty": "Aqueste utilizaire sèc pas degun pel moment.",
   "account.follows_you": "Vos sèc",
+  "account.go_to_profile": "Anar al perfil",
   "account.hide_reblogs": "Rescondre los partatges de @{name}",
-  "account.joined": "Arribèt en {date}",
-  "account.last_status": "Darrièra activitat",
+  "account.joined_short": "Venguèt lo",
+  "account.languages": "Modificar las lengas seguidas",
   "account.link_verified_on": "La proprietat d’aqueste ligam foguèt verificada lo {date}",
   "account.locked_info": "L’estatut de privacitat del compte es configurat sus clavat. Lo proprietari causís qual pòt sègre son compte.",
   "account.media": "Mèdias",
   "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} a mudat los catons a :",
+  "account.moved_to": "{name} indiquèt que son nòu compte es ara :",
   "account.mute": "Rescondre @{name}",
   "account.mute_notifications": "Rescondre las notificacions de @{name}",
   "account.muted": "Mes en silenci",
-  "account.never_active": "Jamai",
+  "account.open_original_page": "Dobrir la pagina d’origina",
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts e responsas",
   "account.report": "Senhalar @{name}",
   "account.requested": "Invitacion mandada. Clicatz per anullar",
+  "account.requested_follow": "{name} a demandat a vos sègre",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
   "account.unblock": "Desblocar @{name}",
   "account.unblock_domain": "Desblocar {domain}",
+  "account.unblock_short": "Desblocat",
   "account.unendorse": "Mostrar pas pel perfil",
   "account.unfollow": "Quitar de sègre",
   "account.unmute": "Quitar de rescondre @{name}",
   "account.unmute_notifications": "Mostrar las notificacions de @{name}",
+  "account.unmute_short": "Tornar afichar",
   "account_note.placeholder": "Clicar per ajustar una nòta",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Mejana",
+  "admin.dashboard.retention.cohort": "Mes d’inscripcion",
+  "admin.dashboard.retention.cohort_size": "Utilizaires novèls",
   "alert.rate_limited.message": "Mercés de tornar ensajar aprèp {retry_time, time, medium}.",
   "alert.rate_limited.title": "Taus limitat",
   "alert.unexpected.message": "Una error s’es producha.",
   "alert.unexpected.title": "Ops !",
   "announcement.announcement": "Anóncia",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(pas tractat)",
+  "audio.hide": "Amagar àudio",
   "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
-  "bundle_column_error.body": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.",
+  "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh non !",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Error de ret",
   "bundle_column_error.retry": "Tornar ensajar",
-  "bundle_column_error.title": "Error de ret",
+  "bundle_column_error.return": "Tornar a l’acuèlh",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Tampar",
   "bundle_modal_error.message": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.",
   "bundle_modal_error.retry": "Tornar ensajar",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Trobar un autre servidor",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "S’inscriure a Mastodon",
+  "column.about": "A prepaus",
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Marcadors",
   "column.community": "Flux public local",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Sonque local",
   "community.column_settings.media_only": "Solament los mèdias",
   "community.column_settings.remote_only": "Sonque alonhat",
-  "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.",
+  "compose.language.change": "Cambiar de lenga",
+  "compose.language.search": "Recercar de lengas...",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
+  "compose_form.encryption_warning": "Las publicacions sus Mastodon son pas chifradas del cap a la fin. Partegetz pas d’informacions sensiblas sus Mastodon.",
   "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.",
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Levar aquesta opcion",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
-  "compose_form.publish": "Tut",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "{publish} !",
+  "compose_form.save_changes": "Salvar los cambiaments",
   "compose_form.sensitive.hide": "Marcar coma sensible",
   "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
   "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
@@ -114,11 +152,13 @@
   "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.block.message": "Volètz vertadièrament blocar {name} ?",
+  "confirmations.cancel_follow_request.confirm": "Retirar la demandar",
+  "confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
   "confirmations.delete.confirm": "Escafar",
   "confirmations.delete.message": "Volètz vertadièrament escafar l’estatut ?",
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
-  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.confirm": "Ignorar",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.domain_block.confirm": "Amagar tot lo domeni",
   "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
   "conversation.with": "Amb {names}",
+  "copypaste.copied": "Copiat",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Del fediverse conegut",
   "directory.local": "Solament de {domain}",
   "directory.new_arrivals": "Nòus-venguts",
   "directory.recently_active": "Actius fa res",
+  "disabled_account_banner.account_settings": "Paramètres de compte",
+  "disabled_account_banner.text": "Vòstre compte {disabledAccount} es actualament desactivat.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Ignorar",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embarcar aqueste estatut per lo far veire sus un site Internet en copiar lo còdi çai-jos.",
   "embed.preview": "Semblarà aquò :",
   "emoji_button.activity": "Activitats",
+  "emoji_button.clear": "Escafar",
   "emoji_button.custom": "Personalizats",
   "emoji_button.flags": "Drapèus",
   "emoji_button.food": "Beure e manjar",
@@ -165,6 +216,7 @@
   "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !",
   "empty_column.direct": "Avètz pas encara cap de messatges. Quand ne mandatz un o que ne recebètz un, serà mostrat aquí.",
   "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.",
+  "empty_column.explore_statuses": "I a pas res en tendéncia pel moment. Tornatz mai tard !",
   "empty_column.favourited_statuses": "Avètz pas encara cap de tut favorit. Quand n’auretz un, apareisserà aquí.",
   "empty_column.favourites": "Degun a pas encara mes en favorit aqueste tut. Quand qualqu’un o farà, apareisserà aquí.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Ensajatz de los desactivar o actualizatz la pagina. Se aquò ajuda pas, podètz ensajar d’utilizar Mastodon via un autre navigador o una aplicacion nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar las traças al quichapapièrs",
   "errors.unexpected_crash.report_issue": "Senhalar un problèma",
+  "explore.search_results": "Resultats de recèrca",
+  "explore.suggested_follows": "Per vos",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Novèlas",
+  "explore.trending_statuses": "Publicacions",
+  "explore.trending_tags": "Etiquetas",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Filtre expirat !",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Paramètres del filtre",
+  "filter_modal.added.settings_link": "page de parametratge",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filtre apondut !",
+  "filter_modal.select_filter.context_mismatch": "s’aplica pas a aqueste contèxte",
+  "filter_modal.select_filter.expired": "expirat",
+  "filter_modal.select_filter.prompt_new": "Categoria novèla : {name}",
+  "filter_modal.select_filter.search": "Cercar o crear",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filtrar aquesta publicacion",
+  "filter_modal.title.status": "Filtrar una publicacion",
   "follow_recommendations.done": "Acabat",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Acceptar",
   "follow_request.reject": "Regetar",
   "follow_requests.unlocked_explanation": "Encara que vòstre compte siasque pas verrolhat, la còla de {domain} pensèt que volriatz benlèu repassar las demandas d’abonament d’aquestes comptes.",
+  "footer.about": "A prepaus",
+  "footer.directory": "Annuari de perfils",
+  "footer.get_app": "Obténer l’aplicacion",
+  "footer.invite": "Convidar de monde",
+  "footer.keyboard_shortcuts": "Acorchis clavièr",
+  "footer.privacy_policy": "Politica de confidencialitat",
+  "footer.source_code": "Veire lo còdi font",
   "generic.saved": "Enregistrat",
-  "getting_started.developers": "Desvelopaires",
-  "getting_started.directory": "Annuari de perfils",
-  "getting_started.documentation": "Documentacion",
   "getting_started.heading": "Per començar",
-  "getting_started.invite": "Convidar de mond",
-  "getting_started.open_source_notice": "Mastodon es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {github} sus GitHub.",
-  "getting_started.security": "Seguretat",
-  "getting_started.terms": "Condicions d’utilizacion",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sens {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Un d’aquestes",
   "hashtag.column_settings.tag_mode.none": "Cap d’aquestes",
   "hashtag.column_settings.tag_toggle": "Inclure las etiquetas suplementàrias dins aquesta colomna",
+  "hashtag.follow": "Sègre l’etiqueta",
+  "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
   "home.hide_announcements": "Rescondre las anóncias",
   "home.show_announcements": "Mostrar las anóncias",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "Sus un autre servidor",
+  "interaction_modal.on_this_server": "Sus aqueste servidor",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Metre en favorit la publicacion de {name}",
+  "interaction_modal.title.follow": "Sègre {name}",
+  "interaction_modal.title.reblog": "Partejar la publicacion de {name}",
+  "interaction_modal.title.reply": "Respondre a la publicacion de {name}",
   "intervals.full.days": "{number, plural, one {# jorn} other {# jorns}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Espandir la fenèstra de visualizacion d’imatge",
   "lightbox.next": "Seguent",
   "lightbox.previous": "Precedent",
+  "limited_account_hint.action": "Afichar lo perfil de tota manièra",
+  "limited_account_hint.title": "Aqueste perfil foguèt rescondut per la moderacion de {domain}.",
   "lists.account.add": "Ajustar a la lista",
   "lists.account.remove": "Levar de la lista",
   "lists.delete": "Suprimir la lista",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Modificar la visibilitat",
   "missing_indicator.label": "Pas trobat",
   "missing_indicator.sublabel": "Aquesta ressorsa es pas estada trobada",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
   "mute_modal.indefinite": "Cap de data de fin",
-  "navigation_bar.apps": "Aplicacions mobil",
+  "navigation_bar.about": "A prepaus",
   "navigation_bar.blocks": "Personas blocadas",
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.community_timeline": "Flux public local",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
   "navigation_bar.edit_profile": "Modificar lo perfil",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
   "navigation_bar.follow_requests": "Demandas d’abonament",
   "navigation_bar.follows_and_followers": "Abonament e seguidors",
-  "navigation_bar.info": "Tocant aqueste servidor",
-  "navigation_bar.keyboard_shortcuts": "Acorchis clavièr",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Desconnexion",
   "navigation_bar.mutes": "Personas rescondudas",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Tuts penjats",
   "navigation_bar.preferences": "Preferéncias",
   "navigation_bar.public_timeline": "Flux public global",
+  "navigation_bar.search": "Recercar",
   "navigation_bar.security": "Seguretat",
+  "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
+  "notification.admin.report": "{name} senhalèt {target}",
+  "notification.admin.sign_up": "{name} se marquèt",
   "notification.favourite": "{name} a ajustat a sos favorits",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} a demandat a vos sègre",
@@ -306,13 +400,16 @@
   "notification.poll": "Avètz participat a un sondatge que ven de s’acabar",
   "notification.reblog": "{name} a partejat vòstre estatut",
   "notification.status": "{name} ven de publicar",
+  "notification.update": "{name} modiquè sa publicacion",
   "notifications.clear": "Escafar",
   "notifications.clear_confirmation": "Volètz vertadièrament escafar totas vòstras las notificacions ?",
+  "notifications.column_settings.admin.report": "Senhalaments novèls :",
+  "notifications.column_settings.admin.sign_up": "Nòus inscrits :",
   "notifications.column_settings.alert": "Notificacions localas",
   "notifications.column_settings.favourite": "Favorits :",
   "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
   "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
   "notifications.column_settings.mention": "Mencions :",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
   "notifications.column_settings.status": "Tuts novèls :",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Notificacions pas legidas",
+  "notifications.column_settings.unread_notifications.highlight": "Forçar sus las notificacions pas legidas",
+  "notifications.column_settings.update": "Modificacions :",
   "notifications.filter.all": "Totas",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favorits",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# vòte} other {# vòtes}}",
   "poll.vote": "Votar",
   "poll.voted": "Avètz votat per aquesta responsa",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# vòte} other {# vòtes}}",
   "poll_button.add_poll": "Ajustar un sondatge",
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
   "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Dirècte",
+  "privacy.direct.short": "Sonque per las personas mencionadas",
   "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Privat",
-  "privacy.public.long": "Mostrar dins los fluxes publics",
+  "privacy.private.short": "Sonque pels seguidors",
+  "privacy.public.long": "Visiblas per totes",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
+  "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
   "privacy.unlisted.short": "Pas-listat",
+  "privacy_policy.last_updated": "Darrièra actualizacion {date}",
+  "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargament…",
   "regeneration_indicator.sublabel": "Sèm a preparar vòstre flux d’acuèlh !",
   "relative_time.days": "fa {number}d",
+  "relative_time.full.days": "{number, plural, one {# jorn} other {# jorns}} ago",
+  "relative_time.full.hours": "fa {number, plural, one {# ora} other {# oras}}",
+  "relative_time.full.just_now": "ara",
+  "relative_time.full.minutes": "fa {number, plural, one {# minuta} other {# minutas}}",
+  "relative_time.full.seconds": "fa {number, plural, one {# segonda} other {# segondas}}",
   "relative_time.hours": "fa {number}h",
   "relative_time.just_now": "ara",
   "relative_time.minutes": "fa {number} min",
   "relative_time.seconds": "fa {number}s",
   "relative_time.today": "uèi",
   "reply_indicator.cancel": "Anullar",
+  "report.block": "Blocar",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Autre",
+  "report.categories.spam": "Messatge indesirable",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Causissètz çò que correspond mai",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicacion",
+  "report.close": "Acabat",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Far sègre a {target}",
   "report.forward_hint": "Lo compte ven d’un autre servidor. Volètz mandar una còpia anonima del rapòrt enlai tanben ?",
-  "report.hint": "Lo moderator del servidor aurà lo rapòrt. Podètz fornir una explicacion de vòstre senhalament aquí dejós  :",
+  "report.mute": "Amudir",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Seguent",
   "report.placeholder": "Comentaris addicionals",
+  "report.reasons.dislike": "M’agrada pas",
+  "report.reasons.dislike_description": "Es pas quicòm que volriatz veire",
+  "report.reasons.other": "Es quicòm mai",
+  "report.reasons.other_description": "Lo problèma es pas dins cap d’autra categoria",
+  "report.reasons.spam": "Es un messatge indesirable",
+  "report.reasons.spam_description": "Ligams enganaires, fals engatjament o responsas repetitivas",
+  "report.reasons.violation": "Viòla las règlas del servidor",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Seleccionatz çò que s’aplica",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Mandar",
   "report.target": "Senhalar {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Volètz pas veire aquò ?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Quitar de sègre {name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publicacion junta} other {{count} publicacions juntas}}",
+  "report_notification.categories.other": "Autre",
+  "report_notification.categories.spam": "Messatge indesirable",
+  "report_notification.categories.violation": "Violacion de las règlas",
+  "report_notification.open": "Dobrir lo senhalament",
   "search.placeholder": "Recercar",
+  "search.search_or_paste": "Recercar o picar una URL",
   "search_popout.search_format": "Format recèrca avançada",
   "search_popout.tips.full_text": "Un tèxte simple que tòrna los estatuts qu’avètz escriches, mes en favorits, partejats, o ont sètz mencionat, e tanben los noms d’utilizaires, escais-noms e etiquetas que correspondonas.",
   "search_popout.tips.hashtag": "etiqueta",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Lo tèxte brut tòrna escais, noms d’utilizaire e etiquetas correspondents",
   "search_popout.tips.user": "utilizaire",
   "search_results.accounts": "Gents",
+  "search_results.all": "Tot",
   "search_results.hashtags": "Etiquetas",
+  "search_results.nothing_found": "Cap de resultat per aquestes tèrmes de recèrca",
   "search_results.statuses": "Tuts",
   "search_results.statuses_fts_disabled": "La recèrca de tuts per lor contengut es pas activada sus aqueste servidor Mastodon.",
+  "search_results.title": "Recèrca : {q}",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "utilizaires actius",
+  "server_banner.administered_by": "Administrat per :",
+  "server_banner.introduction": "{domain} fa part del malhum social descentralizat propulsat per {mastodon}.",
+  "server_banner.learn_more": "Ne saber mai",
+  "server_banner.server_stats": "Estatisticas del servidor :",
+  "sign_in_banner.create_account": "Crear un compte",
+  "sign_in_banner.sign_in": "Se marcar",
+  "sign_in_banner.text": "Connectatz-vos per sègre perfils o etiquetas, apondre als favorits, partejar e respondre als messatges o interagir de vòstre compte estant d’un autre servidor.",
   "status.admin_account": "Dobrir l’interfàcia de moderacion per @{name}",
   "status.admin_status": "Dobrir aqueste estatut dins l’interfàcia de moderacion",
   "status.block": "Blocar @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Escafar",
   "status.detailed_status": "Vista detalhada de la convèrsa",
   "status.direct": "Messatge per @{name}",
+  "status.edit": "Modificar",
+  "status.edited": "Modificat {date}",
+  "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
+  "status.filter": "Filtrar aquesta publicacion",
   "status.filtered": "Filtrat",
+  "status.hide": "Amagar aqueste tut",
+  "status.history.created": "{name} o creèt lo {date}",
+  "status.history.edited": "{name} o modifiquèt lo {date}",
   "status.load_more": "Cargar mai",
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Degun a pas encara partejat aqueste tut. Quand qualqu’un o farà, apareisserà aquí.",
   "status.redraft": "Escafar e tornar formular",
   "status.remove_bookmark": "Suprimir lo marcador",
+  "status.replied_to": "Respondut a {name}",
   "status.reply": "Respondre",
   "status.replyAll": "Respondre a la conversacion",
   "status.report": "Senhalar @{name}",
   "status.sensitive_warning": "Contengut sensible",
   "status.share": "Partejar",
+  "status.show_filter_reason": "Afichar de tot biais",
   "status.show_less": "Tornar plegar",
   "status.show_less_all": "Los tornar plegar totes",
   "status.show_more": "Desplegar",
   "status.show_more_all": "Los desplegar totes",
-  "status.show_thread": "Mostrar lo fil",
+  "status.show_original": "Veire l’original",
+  "status.translate": "Traduire",
+  "status.translated_from_with": "Traduch del {lang} amb {provider}",
   "status.uncached_media_warning": "Pas disponible",
   "status.unmute_conversation": "Tornar mostrar la conversacion",
   "status.unpin": "Tirar del perfil",
+  "subscribed_languages.lead": "Sonque las publicacions dins las lengas seleccionadas apreissaràn dins vòstre acuèlh e linha cronologica aprèp aqueste cambiament. Seleccionatz pas res per recebre las publicacions en quina lenga que siá.",
+  "subscribed_languages.save": "Salvar los cambiaments",
+  "subscribed_languages.target": "Lengas d’abonaments cambiadas per {target}",
   "suggestions.dismiss": "Regetar la suggestion",
   "suggestions.header": "Vos poiriá interessar…",
   "tabs_bar.federated_timeline": "Flux public global",
   "tabs_bar.home": "Acuèlh",
   "tabs_bar.local_timeline": "Flux public local",
   "tabs_bar.notifications": "Notificacions",
-  "tabs_bar.search": "Recèrcas",
   "time_remaining.days": "demòra{number, plural, one  { # jorn} other {n # jorns}}",
   "time_remaining.hours": "demòra{number, plural, one { # ora} other {n # oras}}",
   "time_remaining.minutes": "demòra{number, plural, one { # minuta} other {n # minutas}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Abonaments",
   "timeline_hint.resources.statuses": "Tuts mai ancians",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona ne parla} other {{counter} personas ne parlan}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} dins los darrièrs {days, plural, one {jorn} other {{days} jorns}}",
   "trends.trending_now": "Tendéncia del moment",
   "ui.beforeunload": "Vòstre brolhon serà perdut se quitatz Mastodon.",
   "units.short.billion": "{count}Md",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
   "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
+  "upload_form.description_missing": "Cap de descripcion pas aponduda",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar la vinheta",
   "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de l’imatge…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicacion…",
   "upload_modal.choose_image": "Causir un imatge",
   "upload_modal.description_placeholder": "Lo dròlle bilingüe manja un yaourt de ròcs exagonals e kiwis verds farà un an mai",
   "upload_modal.detect_text": "Detectar lo tèxt de l’imatge",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparacion de la ROC…",
   "upload_modal.preview_label": "Apercebut ({ratio})",
   "upload_progress.label": "Mandadís…",
+  "upload_progress.processing": "Tractament…",
   "video.close": "Tampar la vidèo",
   "video.download": "Telecargar lo fichièr",
   "video.exit_fullscreen": "Sortir plen ecran",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index eca4765c4..f31ea8537 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 1c8db1a1d..b096fde4f 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Serwery moderowane",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon jest darmowym, otwartym oprogramowaniem i znakiem towarowym Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Powód niedostępny",
+  "about.domain_blocks.preamble": "Domyślnie Mastodon pozwala ci przeglądać i reagować na treści od innych użytkowników z jakiegokolwiek serwera w fediwersum. Poniżej znajduje się lista wyjątków, które zostały stworzone na tym konkretnym serwerze.",
+  "about.domain_blocks.silenced.explanation": "Zazwyczaj nie zobaczysz profili i treści z tego serwera, chyba że wyraźnie go poszukasz lub zdecydujesz się go obserwować.",
+  "about.domain_blocks.silenced.title": "Ograniczone",
+  "about.domain_blocks.suspended.explanation": "Żadne dane z tego serwera nie będą przetwarzane, przechowywane lub wymieniane, co uniemożliwia jakąkolwiek interakcję lub komunikację z użytkownikami z tego serwera.",
+  "about.domain_blocks.suspended.title": "Zawieszono",
+  "about.not_available": "Ta informacja nie została udostępniona na tym serwerze.",
+  "about.powered_by": "Zdecentralizowane media społecznościowe napędzane przez {mastodon}",
+  "about.rules": "Regulamin serwera",
   "account.account_note_header": "Notatka",
   "account.add_or_remove_from_list": "Dodaj lub usuń z list",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.blocked": "Zablokowany(-a)",
   "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu",
-  "account.cancel_follow_request": "Zrezygnuj z prośby o możliwość śledzenia",
+  "account.cancel_follow_request": "Wycofaj żądanie obserwowania",
   "account.direct": "Wyślij wiadomość bezpośrednią do @{name}",
   "account.disable_notifications": "Przestań powiadamiać mnie o wpisach @{name}",
   "account.domain_blocked": "Ukryto domenę",
   "account.edit_profile": "Edytuj profil",
   "account.enable_notifications": "Powiadamiaj mnie o wpisach @{name}",
   "account.endorse": "Wyróżnij na profilu",
-  "account.follow": "Śledź",
-  "account.followers": "Śledzący",
-  "account.followers.empty": "Nikt jeszcze nie śledzi tego użytkownika.",
-  "account.followers_counter": "{count, plural, one {{counter} śledzący} few {{counter} śledzących} many {{counter} śledzących} other {{counter} śledzących}}",
-  "account.following_counter": "{count, plural, one {{counter} śledzony} few {{counter} śledzonych} many {{counter} śledzonych} other {{counter} śledzonych}}",
-  "account.follows.empty": "Ten użytkownik nie śledzi jeszcze nikogo.",
-  "account.follows_you": "Śledzi Cię",
+  "account.featured_tags.last_status_at": "Ostatni post {date}",
+  "account.featured_tags.last_status_never": "Brak postów",
+  "account.featured_tags.title": "Polecane hasztagi {name}",
+  "account.follow": "Obserwuj",
+  "account.followers": "Obserwujący",
+  "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
+  "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
+  "account.following": "Obserwowani",
+  "account.following_counter": "{count, plural, one {{counter} obserwowany} few {{counter} obserwowanych} many {{counter} obserwowanych} other {{counter} obserwowanych}}",
+  "account.follows.empty": "Ten użytkownik nie obserwuje jeszcze nikogo.",
+  "account.follows_you": "Obserwuje Cię",
+  "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
-  "account.joined": "Dołączył(a) {date}",
-  "account.last_status": "Ostatnia aktywność",
+  "account.joined_short": "Dołączył(a)",
+  "account.languages": "Zmień subskrybowane języki",
   "account.link_verified_on": "Własność tego odnośnika została potwierdzona {date}",
-  "account.locked_info": "To konto jest prywatne. Właściciel ręcznie wybiera kto może go śledzić.",
-  "account.media": "Zawartość multimedialna",
+  "account.locked_info": "To konto jest prywatne. Właściciel ręcznie wybiera kto może go obserwować.",
+  "account.media": "Multimedia",
   "account.mention": "Wspomnij o @{name}",
-  "account.moved_to": "{name} przeniósł(-osła) się do:",
+  "account.moved_to": "{name} jako swoje nowe konto wskazał/a:",
   "account.mute": "Wycisz @{name}",
   "account.mute_notifications": "Wycisz powiadomienia o @{name}",
   "account.muted": "Wyciszony",
-  "account.never_active": "Nigdy",
+  "account.open_original_page": "Otwórz stronę oryginalną",
   "account.posts": "Wpisy",
   "account.posts_with_replies": "Wpisy i odpowiedzi",
   "account.report": "Zgłoś @{name}",
   "account.requested": "Oczekująca prośba, kliknij aby anulować",
+  "account.requested_follow": "{name} poprosił(a) o możliwość zaobserwowania twojego profilu",
   "account.share": "Udostępnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
+  "account.unblock_short": "Odblokuj",
   "account.unendorse": "Przestań polecać",
-  "account.unfollow": "Przestań śledzić",
+  "account.unfollow": "Przestań obserwować",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "account.unmute_notifications": "Cofnij wyciszenie powiadomień od @{name}",
+  "account.unmute_short": "Włącz dźwięki",
   "account_note.placeholder": "Naciśnij aby dodać notatkę",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Wskaźnik utrzymania użytkowników po dniach od rejestracji",
+  "admin.dashboard.monthly_retention": "Wskaźnik utrzymania użytkowników po miesiącach od rejestracji",
+  "admin.dashboard.retention.average": "Średnia",
+  "admin.dashboard.retention.cohort": "Miesiąc rejestracji",
+  "admin.dashboard.retention.cohort_size": "Nowi użytkownicy",
   "alert.rate_limited.message": "Spróbuj ponownie po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ograniczony czasowo",
   "alert.unexpected.message": "Wystąpił nieoczekiwany błąd.",
   "alert.unexpected.title": "O nie!",
   "announcement.announcement": "Ogłoszenie",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(nieprzetworzone)",
+  "audio.hide": "Ukryj dźwięk",
   "autosuggest_hashtag.per_week": "{count} co tydzień",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
-  "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.",
+  "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
+  "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
+  "bundle_column_error.error.title": "O nie!",
+  "bundle_column_error.network.body": "Wystąpił błąd podczas próby załadowania tej strony. Może to być spowodowane tymczasowym problemem z połączeniem z internetem lub serwerem.",
+  "bundle_column_error.network.title": "Błąd sieci",
   "bundle_column_error.retry": "Spróbuj ponownie",
-  "bundle_column_error.title": "Błąd sieci",
+  "bundle_column_error.return": "Wróć do strony głównej",
+  "bundle_column_error.routing.body": "Żądana strona nie została znaleziona. Czy na pewno adres URL w pasku adresu jest poprawny?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zamknij",
   "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_modal_error.retry": "Spróbuj ponownie",
+  "closed_registrations.other_server_instructions": "Ponieważ Mastodon jest zdecentralizowany, możesz założyć konto na innym serwerze i wciąż mieć możliwość wchodzenia w interakcję z tym serwerem.",
+  "closed_registrations_modal.description": "Opcja tworzenia kont na {domain} jest aktualnie niedostępna, ale miej na uwadze to, że nie musisz mieć konta konkretnie na {domain} by używać Mastodona.",
+  "closed_registrations_modal.find_another_server": "Znajdź inny serwer",
+  "closed_registrations_modal.preamble": "Mastodon jest zdecentralizowany, więc bez względu na to, gdzie się zarejestrujesz, będziesz w stanie obserwować i wchodzić w interakcje z innymi osobami na tym serwerze. Możesz nawet uruchomić własny serwer!",
+  "closed_registrations_modal.title": "Rejestracja na Mastodonie",
+  "column.about": "O serwerze",
   "column.blocks": "Zablokowani użytkownicy",
   "column.bookmarks": "Zakładki",
   "column.community": "Lokalna oś czasu",
@@ -72,7 +106,7 @@
   "column.directory": "Przeglądaj profile",
   "column.domain_blocks": "Ukryte domeny",
   "column.favourites": "Ulubione",
-  "column.follow_requests": "Prośby o śledzenie",
+  "column.follow_requests": "Prośby o obserwację",
   "column.home": "Strona główna",
   "column.lists": "Listy",
   "column.mutes": "Wyciszeni użytkownicy",
@@ -88,12 +122,14 @@
   "column_header.unpin": "Cofnij przypięcie",
   "column_subheading.settings": "Ustawienia",
   "community.column_settings.local_only": "Tylko Lokalne",
-  "community.column_settings.media_only": "Tylko zawartość multimedialna",
+  "community.column_settings.media_only": "Tylko multimedia",
   "community.column_settings.remote_only": "Tylko Zdalne",
-  "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.",
+  "compose.language.change": "Zmień język",
+  "compose.language.search": "Szukaj języków...",
   "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej",
-  "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.",
-  "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.",
+  "compose_form.encryption_warning": "Posty na Mastodon nie są szyfrowane end-to-end. Nie udostępniaj żadnych wrażliwych informacji przez Mastodon.",
+  "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hasztagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hasztagów.",
+  "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię obserwuje, może wyświetlać Twoje wpisy przeznaczone tylko dla obserwujących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
   "compose_form.placeholder": "Co Ci chodzi po głowie?",
   "compose_form.poll.add_option": "Dodaj opcję",
@@ -102,11 +138,13 @@
   "compose_form.poll.remove_option": "Usuń tę opcję",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
-  "compose_form.publish": "Wyślij",
+  "compose_form.publish": "Opublikuj",
+  "compose_form.publish_form": "Publikuj",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Oznacz multimedia jako wrażliwe",
-  "compose_form.sensitive.marked": "Zawartość multimedia jest oznaczona jako wrażliwa",
-  "compose_form.sensitive.unmarked": "Zawartość multimedialna nie jest oznaczona jako wrażliwa",
+  "compose_form.save_changes": "Zapisz zmiany",
+  "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
   "compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeżeniem",
   "compose_form.spoiler.unmarked": "Tekst nie jest ukryty",
   "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości",
@@ -114,36 +152,49 @@
   "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
   "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
+  "confirmations.cancel_follow_request.confirm": "Wycofaj żądanie",
+  "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o możliwość obserwacji {name}?",
   "confirmations.delete.confirm": "Usuń",
   "confirmations.delete.message": "Czy na pewno chcesz usunąć ten wpis?",
   "confirmations.delete_list.confirm": "Usuń",
   "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Odrzuć",
+  "confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
   "confirmations.domain_block.confirm": "Ukryj wszystko z domeny",
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.logout.confirm": "Wyloguj",
   "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
   "confirmations.mute.confirm": "Wycisz",
-  "confirmations.mute.explanation": "To schowa ich i wspominające ich posty, ale wciąż pozwoli im widzieć twoje posty i śledzić cię.",
+  "confirmations.mute.explanation": "To schowa ich i wspominające ich posty, ale wciąż pozwoli im widzieć twoje posty i obserwować cię.",
   "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
   "confirmations.reply.confirm": "Odpowiedz",
   "confirmations.reply.message": "W ten sposób utracisz wpis który obecnie tworzysz. Czy na pewno chcesz to zrobić?",
-  "confirmations.unfollow.confirm": "Przestań śledzić",
-  "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać śledzić {name}?",
+  "confirmations.unfollow.confirm": "Przestań obserwować",
+  "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać obserwować {name}?",
   "conversation.delete": "Usuń rozmowę",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz rozmowę",
   "conversation.with": "Z {names}",
+  "copypaste.copied": "Skopiowano",
+  "copypaste.copy": "Kopiuj",
   "directory.federated": "Ze znanego fediwersum",
   "directory.local": "Tylko z {domain}",
   "directory.new_arrivals": "Nowości",
   "directory.recently_active": "Ostatnio aktywne",
+  "disabled_account_banner.account_settings": "Ustawienia konta",
+  "disabled_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone.",
+  "dismissable_banner.community_timeline": "To są najnowsze wpisy publiczne od osób, które mają założone konta na {domain}.",
+  "dismissable_banner.dismiss": "Schowaj",
+  "dismissable_banner.explore_links": "Te wiadomości obecnie są komentowane przez osoby z tego serwera i pozostałych w zdecentralizowanej sieci.",
+  "dismissable_banner.explore_statuses": "Obecnie te wpisy z tego serwera i pozostałych serwerów w zdecentralizowanej sieci zyskują popularność na tym serwerze.",
+  "dismissable_banner.explore_tags": "Te hasztagi obecnie zyskują popularność wśród osób z tego serwera i pozostałych w zdecentralizowanej sieci.",
+  "dismissable_banner.public_timeline": "To są najnowsze publiczne wpisy od osób z tego i innych serwerów zdecentralizowanej sieci, o których ten serwer wie.",
   "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.",
   "embed.preview": "Tak będzie to wyglądać:",
   "emoji_button.activity": "Aktywność",
+  "emoji_button.clear": "Wyczyść",
   "emoji_button.custom": "Niestandardowe",
   "emoji_button.flags": "Flagi",
   "emoji_button.food": "Żywność i napoje",
@@ -165,12 +216,13 @@
   "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
   "empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
   "empty_column.domain_blocks": "Brak ukrytych domen.",
+  "empty_column.explore_statuses": "Nic nie jest w tej chwili popularne. Sprawdź później!",
   "empty_column.favourited_statuses": "Nie dodałeś(-aś) żadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.",
   "empty_column.favourites": "Nikt nie dodał tego wpisu do ulubionych. Gdy ktoś to zrobi, pojawi się tutaj.",
-  "empty_column.follow_recommendations": "Wygląda na to, że nie można wygenerować dla Ciebie żadnych sugestii. Możesz spróbować wyszukać osoby, które znasz, lub przeglądać popularne hashtagi.",
-  "empty_column.follow_requests": "Nie masz żadnych próśb o możliwość śledzenia. Kiedy ktoś utworzy ją, pojawi się tutaj.",
-  "empty_column.hashtag": "Nie ma wpisów oznaczonych tym hashtagiem. Możesz napisać pierwszy(-a)!",
-  "empty_column.home": "Nie śledzisz nikogo. Odwiedź globalną oś czasu lub użyj wyszukiwarki, aby znaleźć interesujące Cię profile.",
+  "empty_column.follow_recommendations": "Wygląda na to, że nie można wygenerować dla Ciebie żadnych sugestii. Możesz spróbować wyszukać osoby, które znasz, lub przeglądać popularne hasztagi.",
+  "empty_column.follow_requests": "Nie masz żadnych próśb o możliwość obserwacji. Kiedy ktoś utworzy ją, pojawi się tutaj.",
+  "empty_column.hashtag": "Nie ma wpisów oznaczonych tym hasztagiem. Możesz napisać pierwszy(-a).",
+  "empty_column.home": "Nie obserwujesz nikogo. Odwiedź globalną oś czasu lub użyj wyszukiwarki, aby znaleźć interesujące Cię profile.",
   "empty_column.home.suggestions": "Zobacz kilka sugestii",
   "empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
   "empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
@@ -183,35 +235,71 @@
   "error.unexpected_crash.next_steps_addons": "Spróbuj je wyłączyć lub odświeżyć stronę. Jeśli to nie pomoże, możesz wciąż korzystać z Mastodona w innej przeglądarce lub natywnej aplikacji.",
   "errors.unexpected_crash.copy_stacktrace": "Skopiuj ślad stosu do schowka",
   "errors.unexpected_crash.report_issue": "Zgłoś problem",
+  "explore.search_results": "Wyniki wyszukiwania",
+  "explore.suggested_follows": "Dla Ciebie",
+  "explore.title": "Odkrywaj",
+  "explore.trending_links": "Aktualności",
+  "explore.trending_statuses": "Posty",
+  "explore.trending_tags": "Hasztagi",
+  "filter_modal.added.context_mismatch_explanation": "Ta kategoria filtrów nie ma zastosowania do kontekstu, w którym uzyskałeś dostęp do tego wpisu. Jeśli chcesz, aby wpis został przefiltrowany również w tym kontekście, będziesz musiał edytować filtr.",
+  "filter_modal.added.context_mismatch_title": "Niezgodność kontekstów!",
+  "filter_modal.added.expired_explanation": "Ta kategoria filtra wygasła, będziesz musiał zmienić datę wygaśnięcia, aby ją zastosować.",
+  "filter_modal.added.expired_title": "Wygasły filtr!",
+  "filter_modal.added.review_and_configure": "Aby przejrzeć i skonfigurować tę kategorię filtrów, przejdź do {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Ustawienia filtra",
+  "filter_modal.added.settings_link": "strona ustawień",
+  "filter_modal.added.short_explanation": "Ten wpis został dodany do następującej kategorii filtrów: {title}.",
+  "filter_modal.added.title": "Filtr dodany!",
+  "filter_modal.select_filter.context_mismatch": "nie dotyczy tego kontekstu",
+  "filter_modal.select_filter.expired": "wygasły",
+  "filter_modal.select_filter.prompt_new": "Nowa kategoria: {name}",
+  "filter_modal.select_filter.search": "Szukaj lub utwórz",
+  "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
+  "filter_modal.select_filter.title": "Filtruj ten wpis",
+  "filter_modal.title.status": "Filtruj wpis",
   "follow_recommendations.done": "Gotowe",
-  "follow_recommendations.heading": "Śledź ludzi, których wpisy chcesz czytać. Oto kilka propozycji.",
-  "follow_recommendations.lead": "Wpisy osób, które śledzisz będą pojawiać się w porządku chronologicznym na stronie głównej. Nie bój się popełniać błędów, możesz bez problemu przestać śledzić każdego w każdej chwili!",
+  "follow_recommendations.heading": "Obserwuj ludzi, których wpisy chcesz czytać. Oto kilka propozycji.",
+  "follow_recommendations.lead": "Wpisy osób, które obserwujesz będą pojawiać się w porządku chronologicznym na stronie głównej. Nie bój się popełniać błędów, możesz bez problemu przestać obserwować każdego w każdej chwili!",
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "Odrzuć",
-  "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość śledzenia.",
+  "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
+  "footer.about": "O serwerze",
+  "footer.directory": "Katalog profilów",
+  "footer.get_app": "Pobierz aplikację",
+  "footer.invite": "Zaproś znajomych",
+  "footer.keyboard_shortcuts": "Skróty klawiszowe",
+  "footer.privacy_policy": "Polityka prywatności",
+  "footer.source_code": "Zobacz kod źródłowy",
   "generic.saved": "Zapisano",
-  "getting_started.developers": "Dla programistów",
-  "getting_started.directory": "Katalog profilów",
-  "getting_started.documentation": "Dokumentacja",
   "getting_started.heading": "Rozpocznij",
-  "getting_started.invite": "Zaproś znajomych",
-  "getting_started.open_source_notice": "Mastodon jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitHubie tutaj: {github}.",
-  "getting_started.security": "Bezpieczeństwo",
-  "getting_started.terms": "Zasady użytkowania",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "lub {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "hashtag.column_settings.select.no_options_message": "Nie odnaleziono sugestii",
-  "hashtag.column_settings.select.placeholder": "Wprowadź hashtagi…",
+  "hashtag.column_settings.select.placeholder": "Wprowadź hasztagi…",
   "hashtag.column_settings.tag_mode.all": "Wszystkie",
   "hashtag.column_settings.tag_mode.any": "Dowolne",
   "hashtag.column_settings.tag_mode.none": "Żadne",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Obserwuj hasztag",
+  "hashtag.unfollow": "Przestań obserwować hashtag",
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
   "home.hide_announcements": "Ukryj ogłoszenia",
   "home.show_announcements": "Pokaż ogłoszenia",
+  "interaction_modal.description.favourite": "Mając konto na Mastodonie, możesz dodawać wpisy do ulubionych by dać znać jego autorowi, że podoba Ci się ten wpis i zachować go na później.",
+  "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
+  "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
+  "interaction_modal.description.reply": "Mając konto na Mastodonie, możesz odpowiedzieć na ten wpis.",
+  "interaction_modal.on_another_server": "Na innym serwerze",
+  "interaction_modal.on_this_server": "Na tym serwerze",
+  "interaction_modal.other_server_instructions": "Skopiuj i wklej ten adres URL do pola wyszukiwania w swojej ulubionej aplikacji Mastodon lub interfejsu internetowego swojego serwera Mastodon.",
+  "interaction_modal.preamble": "Ponieważ Mastodon jest zdecentralizowany, możesz użyć swojego istniejącego konta z innego serwera Mastodona lub innej kompatybilnej usługi, jeśli nie masz konta na tym serwerze.",
+  "interaction_modal.title.favourite": "Polub wpis użytkownika {name}",
+  "interaction_modal.title.follow": "Śledź {name}",
+  "interaction_modal.title.reblog": "Podbij wpis {name}",
+  "interaction_modal.title.reply": "Odpowiedz na post {name}",
   "intervals.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# godzina} few {# godziny} many {# godzin} other {# godzin}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",
@@ -236,17 +324,17 @@
   "keyboard_shortcuts.muted": "aby przejść do listy wyciszonych użytkowników",
   "keyboard_shortcuts.my_profile": "aby otworzyć własny profil",
   "keyboard_shortcuts.notifications": "aby otworzyć kolumnę powiadomień",
-  "keyboard_shortcuts.open_media": "aby otworzyć zawartość multimedialną",
+  "keyboard_shortcuts.open_media": "Otwórz multimedia",
   "keyboard_shortcuts.pinned": "aby przejść do listy przypiętych wpisów",
   "keyboard_shortcuts.profile": "aby przejść do profilu autora wpisu",
   "keyboard_shortcuts.reply": "aby odpowiedzieć",
-  "keyboard_shortcuts.requests": "aby przejść do listy próśb o możliwość śledzenia",
+  "keyboard_shortcuts.requests": "aby przejść do listy próśb o możliwość obserwacji",
   "keyboard_shortcuts.search": "aby przejść do pola wyszukiwania",
   "keyboard_shortcuts.spoilers": "aby pokazać/ukryć pole CW",
   "keyboard_shortcuts.start": "aby otworzyć kolumnę „Rozpocznij”",
   "keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
-  "keyboard_shortcuts.toggle_sensitivity": "by pokazać/ukryć multimedia",
-  "keyboard_shortcuts.toot": "aby utworzyć nowy wpis",
+  "keyboard_shortcuts.toggle_sensitivity": "Pokaż/ukryj multimedia",
+  "keyboard_shortcuts.toot": "Stwórz nowy post",
   "keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania",
   "keyboard_shortcuts.up": "aby przejść na górę listy",
   "lightbox.close": "Zamknij",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Rozwiń pole widoku obrazu",
   "lightbox.next": "Następne",
   "lightbox.previous": "Poprzednie",
+  "limited_account_hint.action": "Pokaż profil mimo wszystko",
+  "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.",
   "lists.account.add": "Dodaj do listy",
   "lists.account.remove": "Usunąć z listy",
   "lists.delete": "Usuń listę",
@@ -265,17 +355,18 @@
   "lists.replies_policy.list": "Członkowie listy",
   "lists.replies_policy.none": "Nikt",
   "lists.replies_policy.title": "Pokazuj odpowiedzi dla:",
-  "lists.search": "Szukaj wśród osób które śledzisz",
+  "lists.search": "Szukaj wśród osób które obserwujesz",
   "lists.subheading": "Twoje listy",
-  "load_pending": "{count, plural, one {# nowy przedmiot} other {nowe przedmioty}}",
+  "load_pending": "{count, plural, one {# nowa pozycja} other {nowe pozycje}}",
   "loading_indicator.label": "Ładowanie…",
   "media_gallery.toggle_visible": "Przełącz widoczność",
   "missing_indicator.label": "Nie znaleziono",
   "missing_indicator.sublabel": "Nie można odnaleźć tego zasobu",
+  "moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, ponieważ zostało przeniesione na {movedToAccount}.",
   "mute_modal.duration": "Czas",
   "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
   "mute_modal.indefinite": "Nieokreślony",
-  "navigation_bar.apps": "Aplikacje mobilne",
+  "navigation_bar.about": "O serwerze",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
   "navigation_bar.bookmarks": "Zakładki",
   "navigation_bar.community_timeline": "Lokalna oś czasu",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
+  "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Ulubione",
   "navigation_bar.filters": "Wyciszone słowa",
-  "navigation_bar.follow_requests": "Prośby o śledzenie",
-  "navigation_bar.follows_and_followers": "Śledzeni i śledzący",
-  "navigation_bar.info": "Szczegółowe informacje",
-  "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe",
+  "navigation_bar.follow_requests": "Prośby o obserwację",
+  "navigation_bar.follows_and_followers": "Obserwowani i obserwujący",
   "navigation_bar.lists": "Listy",
   "navigation_bar.logout": "Wyloguj",
   "navigation_bar.mutes": "Wyciszeni użytkownicy",
@@ -297,24 +387,31 @@
   "navigation_bar.pins": "Przypięte wpisy",
   "navigation_bar.preferences": "Preferencje",
   "navigation_bar.public_timeline": "Globalna oś czasu",
+  "navigation_bar.search": "Szukaj",
   "navigation_bar.security": "Bezpieczeństwo",
+  "not_signed_in_indicator.not_signed_in": "Musisz się zalogować, aby otrzymać dostęp do tego zasobu.",
+  "notification.admin.report": "{name} zgłosił {target}",
+  "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
   "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
-  "notification.follow": "{name} zaczął(-ęła) Cię śledzić",
-  "notification.follow_request": "{name} poprosił(a) o możliwość śledzenia Cię",
+  "notification.follow": "{name} zaczął(-ęła) Cię obserwować",
+  "notification.follow_request": "{name} poprosił(a) o możliwość obserwacji Cię",
   "notification.mention": "{name} wspomniał(a) o tobie",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
   "notification.reblog": "{name} podbił(a) Twój wpis",
   "notification.status": "{name} właśnie utworzył(a) wpis",
+  "notification.update": "{name} edytował post",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
+  "notifications.column_settings.admin.report": "Nowe raporty:",
+  "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
   "notifications.column_settings.favourite": "Dodanie do ulubionych:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
-  "notifications.column_settings.filter_bar.show": "Pokaż",
-  "notifications.column_settings.follow": "Nowi śledzący:",
-  "notifications.column_settings.follow_request": "Nowe prośby o możliwość śledzenia:",
+  "notifications.column_settings.filter_bar.show_bar": "Pokaż filtry",
+  "notifications.column_settings.follow": "Nowi obserwujący:",
+  "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
   "notifications.column_settings.mention": "Wspomnienia:",
   "notifications.column_settings.poll": "Wyniki głosowania:",
   "notifications.column_settings.push": "Powiadomienia push",
@@ -322,11 +419,13 @@
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
   "notifications.column_settings.status": "Nowe wpisy:",
-  "notifications.column_settings.unread_markers.category": "Znaczniki nieprzeczytanych powiadomień",
+  "notifications.column_settings.unread_notifications.category": "Nieprzeczytane powiadomienia",
+  "notifications.column_settings.unread_notifications.highlight": "Podświetl nieprzeczytane powiadomienia",
+  "notifications.column_settings.update": "Edycje:",
   "notifications.filter.all": "Wszystkie",
   "notifications.filter.boosts": "Podbicia",
   "notifications.filter.favourites": "Ulubione",
-  "notifications.filter.follows": "Śledzenia",
+  "notifications.filter.follows": "Obserwacje",
   "notifications.filter.mentions": "Wspomienia",
   "notifications.filter.polls": "Wyniki głosowania",
   "notifications.filter.statuses": "Aktualizacje od osób które obserwujesz",
@@ -346,46 +445,102 @@
   "poll.total_votes": "{count, plural, one {# głos} few {# głosy} many {# głosów} other {# głosów}}",
   "poll.vote": "Zagłosuj",
   "poll.voted": "Zagłosowałeś_aś na tą odpowiedź",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# głos} few {# głosy} many {# głosów} other {# głosów}}",
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
   "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Bezpośrednio",
-  "privacy.private.long": "Widoczny tylko dla osób, które Cię śledzą",
-  "privacy.private.short": "Tylko dla śledzących",
-  "privacy.public.long": "Widoczny na publicznych osiach czasu",
+  "privacy.direct.short": "Tylko wspomniane osoby",
+  "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
+  "privacy.private.short": "Tylko obserwujący",
+  "privacy.public.long": "Widoczne dla każdego",
   "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu",
+  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
   "privacy.unlisted.short": "Niewidoczny",
+  "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
+  "privacy_policy.title": "Polityka prywatności",
   "refresh": "Odśwież",
   "regeneration_indicator.label": "Ładuję…",
   "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
   "relative_time.days": "{number} dni",
+  "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
+  "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",
+  "relative_time.full.just_now": "przed chwilą",
+  "relative_time.full.minutes": "{number, plural, one {# minutę} few {# minuty} many {# minut} other {# minut}} temu",
+  "relative_time.full.seconds": "{number, plural, one {# sekundę} few {# sekundy} many {# sekund} other {# sekund}} temu",
   "relative_time.hours": "{number} godz.",
   "relative_time.just_now": "teraz",
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} s.",
   "relative_time.today": "dzisiaj",
   "reply_indicator.cancel": "Anuluj",
+  "report.block": "Zablokuj",
+  "report.block_explanation": "Nie zobaczysz ich wpisów. Nie będą mogli zobaczyć Twoich postów ani cię obserwować. Będą mogli domyślić się, że są zablokowani.",
+  "report.categories.other": "Inne",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Zawartość narusza co najmniej jedną zasadę serwera",
+  "report.category.subtitle": "Wybierz najbardziej pasującą opcję",
+  "report.category.title": "Powiedz, co się dzieje z tym {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "post",
+  "report.close": "Gotowe",
+  "report.comment.title": "Czy jest jeszcze coś, co uważasz, że powinniśmy wiedzieć?",
   "report.forward": "Przekaż na {target}",
   "report.forward_hint": "To konto znajduje się na innej instancji. Czy chcesz wysłać anonimową kopię zgłoszenia rnież na nią?",
-  "report.hint": "Zgłoszenie zostanie wysłane moderatorom Twojego serwera. Poniżej możesz też umieścić wyjaśnienie dlaczego zgłaszasz to konto:",
+  "report.mute": "Wycisz",
+  "report.mute_explanation": "Nie zobaczysz ich wpisów. Mimo to będą mogli wciąż obserwować cię i widzieć twoje wpisy, ale nie będą widzieli, że są wyciszeni.",
+  "report.next": "Dalej",
   "report.placeholder": "Dodatkowe komentarze",
+  "report.reasons.dislike": "Nie podoba mi się to",
+  "report.reasons.dislike_description": "Nie jest to coś, co chciałoby się zobaczyć",
+  "report.reasons.other": "Coś innego",
+  "report.reasons.other_description": "Zgłoszenie nie pasuje do żadnej z pozostałych kategorii",
+  "report.reasons.spam": "To spam",
+  "report.reasons.spam_description": "Niebezpieczne linki, fałszywe zaangażowanie lub powtarzające się odpowiedzi",
+  "report.reasons.violation": "Narusza to zasady serwera",
+  "report.reasons.violation_description": "Zdajesz sobie sprawę, że narusza to szczególne zasady",
+  "report.rules.subtitle": "Wybierz wszystkie pasujące",
+  "report.rules.title": "Które zasady zostały złamane?",
+  "report.statuses.subtitle": "Wybierz wszystkie pasujące",
+  "report.statuses.title": "Czy są jakieś wpisy, które obrazują opisany w zgłoszeniu problem?",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",
+  "report.thanks.take_action": "Oto opcje, dzięki którym możesz kontrolować, co widzisz na Mastodon:",
+  "report.thanks.take_action_actionable": "W trakcie jak będziemy się przyglądać tej sprawie, możesz podjąć akcje przeciwko @{name}:",
+  "report.thanks.title": "Nie chcesz tego widzieć?",
+  "report.thanks.title_actionable": "Dziękujemy za zgłoszenie. Przyjrzymy się tej sprawie.",
+  "report.unfollow": "Przestań obserwować @{name}",
+  "report.unfollow_explanation": "Obserwujesz to konto. Jeśli nie chcesz już widzieć postów z tego konta w swojej głównej osi czasu, przestań je obserwować.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} wpis} few {{count} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
+  "report_notification.categories.other": "Inne",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Naruszenie zasad",
+  "report_notification.open": "Otwórz raport",
   "search.placeholder": "Szukaj",
+  "search.search_or_paste": "Wyszukaj lub wklej adres",
   "search_popout.search_format": "Zaawansowane wyszukiwanie",
   "search_popout.tips.full_text": "Pozwala na wyszukiwanie wpisów które napisałeś(-aś), dodałeś(-aś) do ulubionych lub podbiłeś(-aś), w których o Tobie wspomniano, oraz pasujące nazwy użytkowników, pełne nazwy i hashtagi.",
   "search_popout.tips.hashtag": "hasztag",
   "search_popout.tips.status": "wpis",
-  "search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hashtagów",
+  "search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hasztagów",
   "search_popout.tips.user": "użytkownik",
   "search_results.accounts": "Ludzie",
-  "search_results.hashtags": "Hashtagi",
+  "search_results.all": "Wszystkie",
+  "search_results.hashtags": "Hasztagi",
+  "search_results.nothing_found": "Nie znaleziono innych wyników dla tego wyszukania",
   "search_results.statuses": "Wpisy",
   "search_results.statuses_fts_disabled": "Szukanie wpisów przy pomocy ich zawartości nie jest włączone na tym serwerze Mastodona.",
-  "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
+  "search_results.title": "Wyszukiwanie {q}",
+  "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} other {wyników}}",
+  "server_banner.about_active_users": "Osoby korzystające z tego serwera w ciągu ostatnich 30 dni (Miesięcznie aktywni użytkownicy)",
+  "server_banner.active_users": "aktywni użytkownicy",
+  "server_banner.administered_by": "Zarządzana przez:",
+  "server_banner.introduction": "{domain} jest częścią zdecentralizowanej sieci społecznościowej wspieranej przez {mastodon}.",
+  "server_banner.learn_more": "Dowiedz się więcej",
+  "server_banner.server_stats": "Statystyki serwera:",
+  "sign_in_banner.create_account": "Załóż konto",
+  "sign_in_banner.sign_in": "Zaloguj się",
+  "sign_in_banner.text": "Zaloguj się, aby obserwować profile lub hasztagi, jak również dodawaj wpisy do ulubionych, udostępniaj je dalej i odpowiadaj na nie lub wchodź w interakcje z kontem na innym serwerze.",
   "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}",
   "status.admin_status": "Otwórz ten wpis w interfejsie moderacyjnym",
   "status.block": "Zablokuj @{name}",
@@ -396,11 +551,18 @@
   "status.delete": "Usuń",
   "status.detailed_status": "Szczegółowy widok konwersacji",
   "status.direct": "Wyślij wiadomość bezpośrednią do @{name}",
+  "status.edit": "Edytuj",
+  "status.edited": "Edytowano {date}",
+  "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
   "status.embed": "Osadź",
   "status.favourite": "Dodaj do ulubionych",
+  "status.filter": "Filtruj ten wpis",
   "status.filtered": "Filtrowany(-a)",
+  "status.hide": "Schowaj toota",
+  "status.history.created": "{name} utworzył(a) {date}",
+  "status.history.edited": "{name} edytował(a) {date}",
   "status.load_more": "Załaduj więcej",
-  "status.media_hidden": "Zawartość multimedialna ukryta",
+  "status.media_hidden": "Multimedia ukryte",
   "status.mention": "Wspomnij o @{name}",
   "status.more": "Więcej",
   "status.mute": "Wycisz @{name}",
@@ -415,54 +577,61 @@
   "status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
   "status.redraft": "Usuń i przeredaguj",
   "status.remove_bookmark": "Usuń zakładkę",
+  "status.replied_to": "Odpowiedź do wpisu użytkownika {name}",
   "status.reply": "Odpowiedz",
   "status.replyAll": "Odpowiedz na wątek",
   "status.report": "Zgłoś @{name}",
   "status.sensitive_warning": "Wrażliwa zawartość",
   "status.share": "Udostępnij",
+  "status.show_filter_reason": "Pokaż mimo wszystko",
   "status.show_less": "Zwiń",
   "status.show_less_all": "Zwiń wszystkie",
   "status.show_more": "Rozwiń",
   "status.show_more_all": "Rozwiń wszystkie",
-  "status.show_thread": "Pokaż wątek",
+  "status.show_original": "Pokaż oryginał",
+  "status.translate": "Przetłumacz",
+  "status.translated_from_with": "Przetłumaczono z {lang} przy użyciu {provider}",
   "status.uncached_media_warning": "Niedostępne",
   "status.unmute_conversation": "Cofnij wyciszenie konwersacji",
   "status.unpin": "Odepnij z profilu",
+  "subscribed_languages.lead": "Tylko posty w wybranych językach pojawią się na Twojej osi czasu po zmianie. Nie wybieraj żadnego języka aby otrzymywać posty we wszystkich językach.",
+  "subscribed_languages.save": "Zapisz zmiany",
+  "subscribed_languages.target": "Zmień subskrybowane języki dla {target}",
   "suggestions.dismiss": "Odrzuć sugestię",
   "suggestions.header": "Może Cię zainteresować…",
   "tabs_bar.federated_timeline": "Globalne",
   "tabs_bar.home": "Strona główna",
   "tabs_bar.local_timeline": "Lokalne",
   "tabs_bar.notifications": "Powiadomienia",
-  "tabs_bar.search": "Szukaj",
   "time_remaining.days": "{number, plural, one {Pozostał # dzień} few {Pozostały # dni} many {Pozostało # dni} other {Pozostało # dni}}",
   "time_remaining.hours": "{number, plural, one {Pozostała # godzina} few {Pozostały # godziny} many {Pozostało # godzin} other {Pozostało # godzin}}",
   "time_remaining.minutes": "{number, plural, one {Pozostała # minuta} few {Pozostały # minuty} many {Pozostało # minut} other {Pozostało # minut}}",
   "time_remaining.moments": "Pozostała chwila",
   "time_remaining.seconds": "{number, plural, one {Pozostała # sekunda} few {Pozostały # sekundy} many {Pozostało # sekund} other {Pozostało # sekund}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} z innych serwerów nie są wyświetlane.",
-  "timeline_hint.resources.followers": "Śledzący",
-  "timeline_hint.resources.follows": "Śledzeni",
+  "timeline_hint.resources.followers": "Obserwujący",
+  "timeline_hint.resources.follows": "Obserwowani",
   "timeline_hint.resources.statuses": "Starsze wpisy",
-  "trends.counter_by_accounts": "rozmawiają: {count, plural, one {{counter} osoba} few {{counter} osoby} many {{counter} osób} other {{counter} osoby}}",
+  "trends.counter_by_accounts": "{count, plural, one {jedna osoba} few {{count} osoby} many {{count} osób} other {{counter} ludzie}} w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
   "units.short.billion": "{count} mld",
   "units.short.million": "{count} mln",
   "units.short.thousand": "{count} tys.",
   "upload_area.title": "Przeciągnij i upuść aby wysłać",
-  "upload_button.label": "Dodaj zawartość multimedialną (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Dodaj zdjęcia, filmy lub audio",
   "upload_error.limit": "Przekroczono limit plików do wysłania.",
   "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
   "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
   "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
+  "upload_form.description_missing": "Nie dodano opisu",
   "upload_form.edit": "Edytuj",
   "upload_form.thumbnail": "Zmień miniaturę",
   "upload_form.undo": "Usuń",
   "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
   "upload_modal.analyzing_picture": "Analizowanie obrazu…",
   "upload_modal.apply": "Zastosuj",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Stosowanie…",
   "upload_modal.choose_image": "Wybierz obraz",
   "upload_modal.description_placeholder": "Pchnąć w tę łódź jeża lub ośm skrzyń fig",
   "upload_modal.detect_text": "Wykryj tekst z obrazu",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Przygotowywanie OCR…",
   "upload_modal.preview_label": "Podgląd ({ratio})",
   "upload_progress.label": "Wysyłanie…",
+  "upload_progress.processing": "Przetwarzanie…",
   "video.close": "Zamknij film",
   "video.download": "Pobierz plik",
   "video.exit_fullscreen": "Opuść tryb pełnoekranowy",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 3fc47a212..54faf79cd 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servidores moderados",
+  "about.contact": "Contato:",
+  "about.disclaimer": "Mastodon é um software de código aberto e livre, e uma marca registrada de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razão não disponível",
+  "about.domain_blocks.preamble": "O Mastodon geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outro servidor no fediverso. Estas são as exceções deste servidor em específico.",
+  "about.domain_blocks.silenced.explanation": "Você geralmente não verá perfis e conteúdo deste servidor, a menos que você o procure explicitamente ou opte por seguir.",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Nenhum dado desse servidor será processado, armazenado ou trocado, impossibilitando qualquer interação ou comunicação com os usuários deste servidor.",
+  "about.domain_blocks.suspended.title": "Suspenso",
+  "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
+  "about.powered_by": "Redes sociais descentralizadas alimentadas por {mastodon}",
+  "about.rules": "Regras do servidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adicionar ou remover de listas",
   "account.badges.bot": "Robô",
@@ -7,68 +19,90 @@
   "account.block_domain": "Bloquear domínio {domain}",
   "account.blocked": "Bloqueado",
   "account.browse_more_on_origin_server": "Veja mais no perfil original",
-  "account.cancel_follow_request": "Cancelar solicitação",
+  "account.cancel_follow_request": "Cancelar solicitação para seguir",
   "account.direct": "Enviar toot direto para @{name}",
   "account.disable_notifications": "Cancelar notificações de @{name}",
   "account.domain_blocked": "Domínio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificar novos toots de @{name}",
   "account.endorse": "Recomendar",
+  "account.featured_tags.last_status_at": "Última publicação em {date}",
+  "account.featured_tags.last_status_never": "Sem publicações",
+  "account.featured_tags.title": "Hashtags em destaque de {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
+  "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {segue {counter}} other {segue {counter}}}",
   "account.follows.empty": "Nada aqui.",
   "account.follows_you": "te segue",
+  "account.go_to_profile": "Ir para o perfil",
   "account.hide_reblogs": "Ocultar boosts de @{name}",
-  "account.joined": "Entrou em {date}",
-  "account.last_status": "Ativo pela última vez",
+  "account.joined_short": "Entrou",
+  "account.languages": "Mudar idiomas inscritos",
   "account.link_verified_on": "link verificado em {date}",
   "account.locked_info": "Trancado. Seguir requer aprovação manual do perfil.",
   "account.media": "Mídia",
   "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} se mudou para:",
+  "account.moved_to": "{name} indicou que sua nova conta agora é:",
   "account.mute": "Silenciar @{name}",
   "account.mute_notifications": "Ocultar notificações de @{name}",
   "account.muted": "Silenciado",
-  "account.never_active": "Nunca",
+  "account.open_original_page": "Abrir a página original",
   "account.posts": "Toots",
   "account.posts_with_replies": "Com respostas",
   "account.report": "Denunciar @{name}",
   "account.requested": "Aguardando aprovação. Clique para cancelar a solicitação",
+  "account.requested_follow": "{name} quer te seguir",
   "account.share": "Compartilhar perfil de @{name}",
   "account.show_reblogs": "Mostrar boosts de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear domínio {domain}",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "Remover",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Dessilenciar @{name}",
   "account.unmute_notifications": "Mostrar notificações de @{name}",
+  "account.unmute_short": "Dessilenciar",
   "account_note.placeholder": "Nota pessoal sobre este perfil aqui",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Taxa de retenção de usuários por dia, após a inscrição",
+  "admin.dashboard.monthly_retention": "Taxa de retenção de usuários por mês, após a inscrição",
+  "admin.dashboard.retention.average": "Média",
+  "admin.dashboard.retention.cohort": "Mês de inscrição",
+  "admin.dashboard.retention.cohort_size": "Novos usuários",
   "alert.rate_limited.message": "Tente novamente após {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tentativas limitadas",
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
   "alert.unexpected.title": "Eita!",
   "announcement.announcement": "Comunicados",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(não processado)",
+  "audio.hide": "Ocultar áudio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
-  "bundle_column_error.body": "Erro ao carregar este componente.",
+  "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
+  "bundle_column_error.error.body": "A página solicitada não pode ser renderizada. Pode ser devido a um erro em nosso código ou um problema de compatibilidade do navegador.",
+  "bundle_column_error.error.title": "Ah, não!",
+  "bundle_column_error.network.body": "Ocorreu um erro ao tentar carregar esta página. Isso pode ser devido a um problema temporário com sua conexão de internet ou deste servidor.",
+  "bundle_column_error.network.title": "Erro de rede",
   "bundle_column_error.retry": "Tente novamente",
-  "bundle_column_error.title": "Erro de rede",
+  "bundle_column_error.return": "Voltar à página inicial",
+  "bundle_column_error.routing.body": "A página solicitada não foi encontrada. Tem certeza de que a URL na barra de endereços está correta?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Erro ao carregar este componente.",
   "bundle_modal_error.retry": "Tente novamente",
+  "closed_registrations.other_server_instructions": "Como o Mastodon é descentralizado, você pode criar uma conta em outro servidor e ainda pode interagir com este.",
+  "closed_registrations_modal.description": "Não é possível criar uma conta em {domain} no momento, mas atente que você não precisa de uma conta especificamente em {domain} para usar o Mastodon.",
+  "closed_registrations_modal.find_another_server": "Encontrar outro servidor",
+  "closed_registrations_modal.preamble": "O Mastodon é descentralizado, não importa onde você criou a sua conta, será possível seguir e interagir com qualquer pessoa neste servidor. Você pode até mesmo criar o seu próprio servidor!",
+  "closed_registrations_modal.title": "Inscrevendo-se no Mastodon",
+  "column.about": "Sobre",
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Salvos",
   "column.community": "Linha local",
-  "column.direct": "Toots Diretos",
+  "column.direct": "Mensagens diretas",
   "column.directory": "Explorar perfis",
   "column.domain_blocks": "Domínios bloqueados",
   "column.favourites": "Favoritos",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Somente local",
   "community.column_settings.media_only": "Somente mídia",
   "community.column_settings.remote_only": "Somente global",
-  "compose_form.direct_message_warning": "Este toot só será enviado aos usuários mencionados.",
+  "compose.language.change": "Alterar idioma",
+  "compose.language.search": "Pesquisar idiomas...",
   "compose_form.direct_message_warning_learn_more": "Saiba mais",
+  "compose_form.encryption_warning": "As publicações no Mastodon não são criptografadas de ponta-a-ponta. Não compartilhe nenhuma informação sensível no Mastodon.",
   "compose_form.hashtag_warning": "Este toot não aparecerá em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
   "compose_form.lock_disclaimer.lock": "trancado",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remover opção",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
-  "compose_form.publish": "TOOT",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Salvar alterações",
   "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
   "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
+  "confirmations.cancel_follow_request.confirm": "Cancelar a solicitação",
+  "confirmations.cancel_follow_request.message": "Tem certeza de que deseja cancelar seu pedido para seguir {name}?",
   "confirmations.delete.confirm": "Excluir",
   "confirmations.delete.message": "Você tem certeza de que deseja excluir este toot?",
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
   "confirmations.domain_block.confirm": "Bloquear instância",
   "confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
   "confirmations.logout.confirm": "Sair",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Somente de {domain}",
   "directory.new_arrivals": "Acabaram de chegar",
   "directory.recently_active": "Ativos recentemente",
+  "disabled_account_banner.account_settings": "Configurações da conta",
+  "disabled_account_banner.text": "Sua conta {disabledAccount} está desativada no momento.",
+  "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes das pessoas cujas contas são hospedadas por {domain}.",
+  "dismissable_banner.dismiss": "Dispensar",
+  "dismissable_banner.explore_links": "Estas novas histórias estão sendo contadas por pessoas neste e em outros servidores da rede descentralizada no momento.",
+  "dismissable_banner.explore_statuses": "Estas publicações deste e de outros servidores na rede descentralizada estão ganhando popularidade neste servidor agora.",
+  "dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.",
+  "dismissable_banner.public_timeline": "Estas são as publicações mais recentes de pessoas deste e de outros servidores da rede descentralizada que este servidor conhece.",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
+  "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizados",
   "emoji_button.flags": "Bandeiras",
   "emoji_button.food": "Comida e Bebida",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "Nada aqui.",
   "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
   "empty_column.community": "A linha local está vazia. Publique algo para começar!",
-  "empty_column.direct": "Nada aqui. Quando você enviar ou receber toots diretos, eles aparecerão aqui.",
+  "empty_column.direct": "Você ainda não tem mensagens diretas. Quando você enviar ou receber uma, será exibida aqui.",
   "empty_column.domain_blocks": "Nada aqui.",
+  "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!",
   "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.",
   "empty_column.favourites": "Nada aqui. Quando alguém favoritar, o autor aparecerá aqui.",
   "empty_column.follow_recommendations": "Parece que não há sugestões para você. Tente usar a pesquisa para encontrar pessoas que você possa conhecer ou explorar hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Tente desativá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar dados do erro para área de transferência",
   "errors.unexpected_crash.report_issue": "Reportar problema",
+  "explore.search_results": "Resultado da pesquisa",
+  "explore.suggested_follows": "Para você",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Notícias",
+  "explore.trending_statuses": "Publicações",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto no qual você acessou esta publicação. Se quiser que a publicação seja filtrada nesse contexto também, você terá que editar o filtro.",
+  "filter_modal.added.context_mismatch_title": "Incompatibilidade de contexto!",
+  "filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, você precisará alterar a data de expiração para aplicar.",
+  "filter_modal.added.expired_title": "Filtro expirado!",
+  "filter_modal.added.review_and_configure": "Para revisar e configurar ainda mais esta categoria de filtro, vá até {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Configurações de filtro",
+  "filter_modal.added.settings_link": "página de configurações",
+  "filter_modal.added.short_explanation": "Esta publicação foi adicionada à seguinte categoria de filtro: {title}.",
+  "filter_modal.added.title": "Filtro adicionado!",
+  "filter_modal.select_filter.context_mismatch": "não se aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirado",
+  "filter_modal.select_filter.prompt_new": "Nova categoria: {name}",
+  "filter_modal.select_filter.search": "Buscar ou criar",
+  "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
+  "filter_modal.select_filter.title": "Filtrar esta publicação",
+  "filter_modal.title.status": "Filtrar uma publicação",
   "follow_recommendations.done": "Salvar",
   "follow_recommendations.heading": "Siga pessoas que você gostaria de acompanhar! Aqui estão algumas sugestões.",
   "follow_recommendations.lead": "Toots de pessoas que você segue aparecerão em ordem cronológica na página inicial. Não tenha medo de cometer erros, você pode facilmente deixar de seguir a qualquer momento!",
   "follow_request.authorize": "Aprovar",
   "follow_request.reject": "Recusar",
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
+  "footer.about": "Sobre",
+  "footer.directory": "Diretório de perfis",
+  "footer.get_app": "Baixe o app",
+  "footer.invite": "Convidar pessoas",
+  "footer.keyboard_shortcuts": "Atalhos de teclado",
+  "footer.privacy_policy": "Política de privacidade",
+  "footer.source_code": "Exibir código-fonte",
   "generic.saved": "Salvo",
-  "getting_started.developers": "Desenvolvedores",
-  "getting_started.directory": "Centro de usuários",
-  "getting_started.documentation": "Documentação",
   "getting_started.heading": "Primeiros passos",
-  "getting_started.invite": "Convidar pessoas",
-  "getting_started.open_source_notice": "Mastodon é um software de código aberto. Você pode contribuir ou reportar problemas na página do projeto no GitHub em {github}.",
-  "getting_started.security": "Configurações da conta",
-  "getting_started.terms": "Termos de serviço",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Qualquer uma",
   "hashtag.column_settings.tag_mode.none": "Nenhuma",
   "hashtag.column_settings.tag_toggle": "Adicionar mais hashtags aqui",
+  "hashtag.follow": "Seguir hashtag",
+  "hashtag.unfollow": "Parar de seguir hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
   "home.show_announcements": "Mostrar comunicados",
+  "interaction_modal.description.favourite": "Com uma conta no Mastodon, você pode favoritar esta publicação para que o autor saiba que você gostou e salvá-lo para mais ler mais tarde.",
+  "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.",
+  "interaction_modal.description.reblog": "Com uma conta no Mastodon, você pode impulsionar esta publicação para compartilhá-lo com seus próprios seguidores.",
+  "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.",
+  "interaction_modal.on_another_server": "Em um servidor diferente",
+  "interaction_modal.on_this_server": "Neste servidor",
+  "interaction_modal.other_server_instructions": "Copie e cole esta URL no campo de pesquisa do seu aplicativo Mastodon favorito ou a interface web do seu servidor Mastodon.",
+  "interaction_modal.preamble": "Como o Mastodon é descentralizado, você pode usar sua conta existente em outro servidor Mastodon ou plataforma compatível se você não tiver uma conta neste servidor.",
+  "interaction_modal.title.favourite": "Favoritar publicação de {name}",
+  "interaction_modal.title.follow": "Seguir {name}",
+  "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
+  "interaction_modal.title.reply": "Responder à publicação de {name}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "focar na coluna",
   "keyboard_shortcuts.compose": "focar no compositor",
   "keyboard_shortcuts.description": "Descrição",
-  "keyboard_shortcuts.direct": "abrir toots diretos",
+  "keyboard_shortcuts.direct": "para abrir a coluna de mensagens diretas",
   "keyboard_shortcuts.down": "mover para baixo",
   "keyboard_shortcuts.enter": "abrir toot",
   "keyboard_shortcuts.favourite": "favoritar toot",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Abrir imagem",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Exibir perfil mesmo assim",
+  "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores do {domain}.",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Excluir lista",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Recurso não encontrado",
+  "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
   "mute_modal.duration": "Duração",
   "mute_modal.hide_notifications": "Ocultar notificações deste usuário?",
   "mute_modal.indefinite": "Indefinido",
-  "navigation_bar.apps": "Aplicativos",
+  "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuários bloqueados",
   "navigation_bar.bookmarks": "Salvos",
   "navigation_bar.community_timeline": "Linha do tempo local",
   "navigation_bar.compose": "Compor novo toot",
-  "navigation_bar.direct": "Toots diretos",
+  "navigation_bar.direct": "Mensagens diretas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.follows_and_followers": "Segue e seguidores",
-  "navigation_bar.info": "Sobre este servidor",
-  "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
   "navigation_bar.mutes": "Usuários silenciados",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Toots fixados",
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Linha global",
+  "navigation_bar.search": "Buscar",
   "navigation_bar.security": "Segurança",
+  "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.",
+  "notification.admin.report": "{name} denunciou {target}",
+  "notification.admin.sign_up": "{name} se inscreveu",
   "notification.favourite": "{name} favoritou teu toot",
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
@@ -306,13 +400,16 @@
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.status": "{name} acabou de tootar",
+  "notification.update": "{name} editou uma publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
+  "notifications.column_settings.admin.report": "Novas denúncias:",
+  "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro",
   "notifications.column_settings.follow": "Seguidores:",
   "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Tocar som",
   "notifications.column_settings.status": "Novos toots:",
-  "notifications.column_settings.unread_markers.category": "Marcar como não lidas",
+  "notifications.column_settings.unread_notifications.category": "Notificações não lidas",
+  "notifications.column_settings.unread_notifications.highlight": "Destacar notificações não lidas",
+  "notifications.column_settings.update": "Editar:",
   "notifications.filter.all": "Tudo",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritos",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Você votou nesta opção",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
   "poll_button.add_poll": "Adicionar enquete",
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
   "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Direto",
+  "privacy.direct.short": "Apenas pessoas mencionadas",
   "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Privado",
-  "privacy.public.long": "Postar em linhas públicas",
+  "privacy.private.short": "Apenas seguidores",
+  "privacy.public.long": "Visível para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Não postar em linhas públicas",
+  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
   "privacy.unlisted.short": "Não-listado",
+  "privacy_policy.last_updated": "Atualizado {date}",
+  "privacy_policy.title": "Política de privacidade",
   "refresh": "Atualizar",
   "regeneration_indicator.label": "Carregando…",
   "regeneration_indicator.sublabel": "Sua página inicial está sendo preparada!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dia} other {# dias}} atrás",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} atrás",
+  "relative_time.full.just_now": "agora mesmo",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# minutos}} atrás",
+  "relative_time.full.seconds": "{number, plural, one {# segundo} other {# segundos}} atrás",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "agora",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
+  "report.categories.other": "Outro",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
+  "report.category.subtitle": "Escolha a alternativa de melhor correspondência",
+  "report.category.title": "Conte-nos o que está acontecendo com esse {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicação",
+  "report.close": "Concluir",
+  "report.comment.title": "Há algo mais que você acredita que devemos saber?",
   "report.forward": "Encaminhar para {target}",
   "report.forward_hint": "A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá?",
-  "report.hint": "A denúncia será enviada aos moderadores da instância. Explique por que denunciou a conta:",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "Você não verá suas publicações. Ele ainda pode seguir você e ver suas publicações, e não saberá que está silenciado.",
+  "report.next": "Próximo",
   "report.placeholder": "Comentários adicionais aqui",
+  "report.reasons.dislike": "Eu não gosto disso",
+  "report.reasons.dislike_description": "Não é algo que você quer ver",
+  "report.reasons.other": "É outra coisa",
+  "report.reasons.other_description": "O problema não se encaixa em outras categorias",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Links maliciosos, envolvimento falso ou respostas repetitivas",
+  "report.reasons.violation": "Viola as regras do servidor",
+  "report.reasons.violation_description": "Você está ciente de que isso quebra regras específicas",
+  "report.rules.subtitle": "Selecione tudo que se aplica",
+  "report.rules.title": "Quais regras estão sendo violadas?",
+  "report.statuses.subtitle": "Selecione tudo que se aplica",
+  "report.statuses.title": "Existem postagens que respaldam esse relatório?",
   "report.submit": "Enviar",
   "report.target": "Denunciando {target}",
+  "report.thanks.take_action": "Aqui estão suas opções para controlar o que você vê no Mastodon:",
+  "report.thanks.take_action_actionable": "Enquanto revisamos isso, você pode tomar uma atitude contra @{name}:",
+  "report.thanks.title": "Não quer ver isto?",
+  "report.thanks.title_actionable": "Obrigado por denunciar, nós vamos analisar.",
+  "report.unfollow": "Deixar de seguir @{name}",
+  "report.unfollow_explanation": "Você está seguindo esta conta. Para não ver as publicações dela em sua página inicial, deixe de segui-la.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publicação anexada} other {{count} publicações anexadas}}",
+  "report_notification.categories.other": "Outro",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violação de regra",
+  "report_notification.open": "Abrir denúncia",
   "search.placeholder": "Pesquisar",
+  "search.search_or_paste": "Buscar ou colar URL",
   "search_popout.search_format": "Formato de pesquisa avançada",
   "search_popout.tips.full_text": "Texto simples retorna toots que você escreveu, favoritou, deu boost, ou em que foi mencionado, assim como nomes de usuário e de exibição, e hashtags correspondentes.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Texto simples retorna nomes de exibição e de usuário, e hashtags correspondentes",
   "search_popout.tips.user": "usuário",
   "search_results.accounts": "Pessoas",
+  "search_results.all": "Tudo",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Não foi possível encontrar nada para estes termos de busca",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Pesquisar toots por seu conteúdo não está ativado nesta instância Mastodon.",
+  "search_results.title": "Buscar {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Pessoas usando este servidor durante os últimos 30 dias (Usuários ativos mensalmente)",
+  "server_banner.active_users": "usuários ativos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} faz parte da rede social descentralizada desenvolvida por {mastodon}.",
+  "server_banner.learn_more": "Saiba mais",
+  "server_banner.server_stats": "Estatísticas do servidor:",
+  "sign_in_banner.create_account": "Criar conta",
+  "sign_in_banner.sign_in": "Entrar",
+  "sign_in_banner.text": "Entre para seguir perfis ou hashtags, favoritar, compartilhar e responder publicações, interagir a partir da sua conta em um servidor diferente.",
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_status": "Abrir este toot na interface de moderação",
   "status.block": "Bloquear @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Excluir",
   "status.detailed_status": "Visão detalhada da conversa",
   "status.direct": "Enviar toot direto para @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado em {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Favoritar",
+  "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrado",
+  "status.hide": "Ocultar publicação",
+  "status.history.created": "{name} criou {date}",
+  "status.history.edited": "{name} editou {date}",
   "status.load_more": "Ver mais",
   "status.media_hidden": "Mídia sensível",
   "status.mention": "Mencionar @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
   "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover do Salvos",
+  "status.replied_to": "Em resposta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder a conversa",
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Mídia sensível",
   "status.share": "Compartilhar",
+  "status.show_filter_reason": "Mostrar mesmo assim",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos em tudo",
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais em tudo",
-  "status.show_thread": "Mostrar conversa",
+  "status.show_original": "Mostrar original",
+  "status.translate": "Traduzir",
+  "status.translated_from_with": "Traduzido do {lang} usando {provider}",
   "status.uncached_media_warning": "Não disponível",
   "status.unmute_conversation": "Dessilenciar conversa",
   "status.unpin": "Desafixar",
+  "subscribed_languages.lead": "Apenas publicações nos idiomas selecionados aparecerão na sua página inicial e outras linhas do tempo após a mudança. Selecione nenhum para receber publicações em todos os idiomas.",
+  "subscribed_languages.save": "Salvar alterações",
+  "subscribed_languages.target": "Alterar idiomas inscritos para {target}",
   "suggestions.dismiss": "Ignorar sugestão",
   "suggestions.header": "Talvez seja do teu interesse…",
   "tabs_bar.federated_timeline": "Linha global",
   "tabs_bar.home": "Página inicial",
   "tabs_bar.local_timeline": "Linha local",
   "tabs_bar.notifications": "Notificações",
-  "tabs_bar.search": "Pesquisar",
   "time_remaining.days": "{number, plural, one {# dia restante} other {# dias restantes}}",
   "time_remaining.hours": "{number, plural, one {# hora restante} other {# horas restantes}}",
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Segue",
   "timeline_hint.resources.statuses": "Toots anteriores",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} falando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} no(s) último(s) {days, plural, one {dia} other {{days} dias}}",
   "trends.trending_now": "Em alta agora",
   "ui.beforeunload": "Seu rascunho será perdido se sair do Mastodon.",
   "units.short.billion": "{count} bi",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
   "upload_form.audio_description": "Descrever para deficientes auditivos",
   "upload_form.description": "Descrever para deficientes visuais",
+  "upload_form.description_missing": "Sem descrição",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
   "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
   "upload_modal.analyzing_picture": "Analisando imagem…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Aplicando…",
   "upload_modal.choose_image": "Escolher imagem",
   "upload_modal.description_placeholder": "Um pequeno jabuti xereta viu dez cegonhas felizes",
   "upload_modal.detect_text": "Transcrever imagem",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Prévia ({ratio})",
   "upload_progress.label": "Enviando...",
+  "upload_progress.processing": "Processando…",
   "video.close": "Fechar vídeo",
   "video.download": "Baixar",
   "video.exit_fullscreen": "Sair da tela cheia",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a5cb6a335..83a351dcd 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servidores moderados",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon é um software livre, de código aberto e uma marca registada do Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Motivo não disponível",
+  "about.domain_blocks.preamble": "Mastodon geralmente permite que veja e interaja com o conteúdo de utilizadores de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.",
+  "about.domain_blocks.silenced.explanation": "Geralmente não verá perfis e conteúdo deste servidor, a menos que os procure explicitamente ou opte por os seguir.",
+  "about.domain_blocks.silenced.title": "Limitados",
+  "about.domain_blocks.suspended.explanation": "Nenhum dado dessas instâncias será processado, armazenado ou trocado, tornando qualquer interação ou comunicação com os utilizadores dessas instâncias impossível.",
+  "about.domain_blocks.suspended.title": "Supensos",
+  "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
+  "about.powered_by": "Rede social descentralizada baseada no {mastodon}",
+  "about.rules": "Regras da instância",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
   "account.badges.bot": "Robô",
@@ -7,64 +19,86 @@
   "account.block_domain": "Esconder tudo do domínio {domain}",
   "account.blocked": "Bloqueado(a)",
   "account.browse_more_on_origin_server": "Encontrar mais no perfil original",
-  "account.cancel_follow_request": "Cancelar pedido para seguir",
+  "account.cancel_follow_request": "Retirar pedido para seguir",
   "account.direct": "Enviar mensagem direta para @{name}",
   "account.disable_notifications": "Parar de me notificar das publicações de @{name}",
   "account.domain_blocked": "Domínio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificar-me das publicações de @{name}",
   "account.endorse": "Destacar no perfil",
+  "account.featured_tags.last_status_at": "Última publicação em {date}",
+  "account.featured_tags.last_status_never": "Sem publicações",
+  "account.featured_tags.title": "Hashtags destacadas por {name}",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
+  "account.following": "A seguir",
   "account.following_counter": "{count, plural, other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
   "account.follows_you": "Segue-te",
+  "account.go_to_profile": "Ir para o perfil",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
-  "account.joined": "Ingressou em {date}",
-  "account.last_status": "Última atividade",
+  "account.joined_short": "Juntou-se a",
+  "account.languages": "Alterar idiomas subscritos",
   "account.link_verified_on": "A posse deste link foi verificada em {date}",
   "account.locked_info": "Esta conta é privada. O proprietário revê manualmente quem a pode seguir.",
   "account.media": "Média",
   "account.mention": "Mencionar @{name}",
-  "account.moved_to": "{name} mudou a sua conta para:",
+  "account.moved_to": "{name} indicou que a sua nova conta é agora:",
   "account.mute": "Silenciar @{name}",
   "account.mute_notifications": "Silenciar notificações de @{name}",
   "account.muted": "Silenciada",
-  "account.never_active": "Nunca",
+  "account.open_original_page": "Abrir a página original",
   "account.posts": "Toots",
   "account.posts_with_replies": "Publicações e respostas",
   "account.report": "Denunciar @{name}",
   "account.requested": "A aguardar aprovação. Clique para cancelar o pedido de seguidor",
+  "account.requested_follow": "{name} pediu para segui-lo",
   "account.share": "Partilhar o perfil @{name}",
   "account.show_reblogs": "Mostrar partilhas de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Mostrar {domain}",
+  "account.unblock_short": "Desbloquear",
   "account.unendorse": "Não mostrar no perfil",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
   "account.unmute_notifications": "Deixar de silenciar @{name}",
+  "account.unmute_short": "Deixar de silenciar",
   "account_note.placeholder": "Clique para adicionar nota",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Taxa de retenção de utilizadores por dia após a inscrição",
+  "admin.dashboard.monthly_retention": "Taxa de retenção de utilizadores por mês após a inscrição",
+  "admin.dashboard.retention.average": "Média",
+  "admin.dashboard.retention.cohort": "Mês de inscrição",
+  "admin.dashboard.retention.cohort_size": "Novos utilizadores",
   "alert.rate_limited.message": "Volte a tentar depois das {retry_time, time, medium}.",
   "alert.rate_limited.title": "Limite de tentativas",
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
   "alert.unexpected.title": "Bolas!",
   "announcement.announcement": "Anúncio",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(não processado)",
+  "audio.hide": "Ocultar áudio",
   "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
-  "bundle_column_error.body": "Algo de errado aconteceu enquanto este componente era carregado.",
+  "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
+  "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
+  "bundle_column_error.error.title": "Oh, não!",
+  "bundle_column_error.network.body": "Houve um erro ao tentar carregar esta página. Isto pode ocorrer devido a um problema temporário com a sua conexão à internet ou a este servidor.",
+  "bundle_column_error.network.title": "Erro de rede",
   "bundle_column_error.retry": "Tente de novo",
-  "bundle_column_error.title": "Erro de rede",
+  "bundle_column_error.return": "Voltar à página inicial",
+  "bundle_column_error.routing.body": "A página solicitada não foi encontrada. Tem a certeza que o URL na barra de endereços está correto?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
+  "closed_registrations.other_server_instructions": "Visto que o Mastodon é descentralizado, pode criar uma conta noutro servidor e interagir com este na mesma.",
+  "closed_registrations_modal.description": "Neste momento não é possível criar uma conta em {domain}, mas lembramos que não é preciso ter uma conta especificamente em {domain} para usar o Mastodon.",
+  "closed_registrations_modal.find_another_server": "Procurar outro servidor",
+  "closed_registrations_modal.preamble": "O Mastodon é descentralizado, por isso não importa onde a sua conta é criada, continuará a poder acompanhar e interagir com qualquer um neste servidor. Pode até alojar o seu próprio servidor!",
+  "closed_registrations_modal.title": "Inscrevendo-se no Mastodon",
+  "column.about": "Sobre",
   "column.blocks": "Utilizadores Bloqueados",
   "column.bookmarks": "Itens salvos",
   "column.community": "Cronologia local",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local apenas",
   "community.column_settings.media_only": "Somente media",
   "community.column_settings.remote_only": "Remoto apenas",
-  "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
+  "compose.language.change": "Alterar idioma",
+  "compose.language.search": "Pesquisar idiomas...",
   "compose_form.direct_message_warning_learn_more": "Conhecer mais",
+  "compose_form.encryption_warning": "As publicações no Mastodon não são encriptadas ponta a ponta. Não partilhe nenhuma informação sensível através do Mastodon.",
   "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Eliminar esta opção",
   "compose_form.poll.switch_to_multiple": "Alterar a votação para permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Alterar a votação para permitir uma única escolha",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Publicar",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Guardar alterações",
   "compose_form.sensitive.hide": "Marcar media como sensível",
   "compose_form.sensitive.marked": "Media marcada como sensível",
   "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
@@ -111,15 +149,17 @@
   "compose_form.spoiler.unmarked": "O texto não está escondido",
   "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
+  "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "De certeza que queres bloquear {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retirar pedido",
+  "confirmations.cancel_follow_request.message": "Tem a certeza que pretende retirar o pedido para seguir {name}?",
   "confirmations.delete.confirm": "Eliminar",
   "confirmations.delete.message": "De certeza que quer eliminar esta publicação?",
   "confirmations.delete_list.confirm": "Eliminar",
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Descartar",
+  "confirmations.discard_edit_media.message": "Tem alterações não salvas na descrição ou pré-visualização da media. Descartar mesmo assim?",
   "confirmations.domain_block.confirm": "Esconder tudo deste domínio",
   "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.logout.confirm": "Terminar sessão",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
+  "copypaste.copied": "Copiado",
+  "copypaste.copy": "Copiar",
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Apenas de {domain}",
   "directory.new_arrivals": "Recém chegados",
   "directory.recently_active": "Com actividade recente",
+  "disabled_account_banner.account_settings": "Definições da conta",
+  "disabled_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada.",
+  "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes de pessoas cujas contas são hospedadas por {domain}.",
+  "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Essas histórias de notícias estão, no momento, a ser faladas por pessoas neste e noutros servidores da rede descentralizada.",
+  "dismissable_banner.explore_statuses": "Estas publicações, deste e de outros servidores na rede descentralizada, estão, neste momento, a ganhar atenção neste servidor.",
+  "dismissable_banner.explore_tags": "Estas hashtags estão, neste momento, a ganhar atenção entre as pessoas neste e outros servidores da rede descentralizada.",
+  "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas neste e outros servidores da rede descentralizada que esse servidor conhece.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
+  "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizar",
   "emoji_button.flags": "Bandeiras",
   "emoji_button.food": "Comida & Bebida",
@@ -165,6 +216,7 @@
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
   "empty_column.direct": "Ainda não tem qualquer mensagem direta. Quando enviar ou receber alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
+  "empty_column.explore_statuses": "Nada em destaque por agora. Volte mais tarde!",
   "empty_column.favourited_statuses": "Ainda não tens quaisquer toots favoritos. Quando tiveres algum, ele irá aparecer aqui.",
   "empty_column.favourites": "Ainda ninguém marcou este toot como favorito. Quando alguém o fizer, ele irá aparecer aqui.",
   "empty_column.follow_recommendations": "Parece que não foi possível gerar nenhuma sugestão para si. Pode tentar utilizar a pesquisa para procurar pessoas que conheça ou explorar as hashtags em destaque.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Tente desabilitá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar a stacktrace para o clipboard",
   "errors.unexpected_crash.report_issue": "Reportar problema",
+  "explore.search_results": "Resultados da pesquisa",
+  "explore.suggested_follows": "Para si",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Notícias",
+  "explore.trending_statuses": "Publicações",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto em que acedeu a esta publicação. Se pretender que esta publicação seja filtrada também neste contexto, terá que editar o filtro.",
+  "filter_modal.added.context_mismatch_title": "Contexto incoerente!",
+  "filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, necessita alterar a data de validade para que ele seja aplicado.",
+  "filter_modal.added.expired_title": "Filtro expirado!",
+  "filter_modal.added.review_and_configure": "Para rever e configurar mais detalhadamente esta categoria de filtro, vá a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Definições do filtro",
+  "filter_modal.added.settings_link": "página de definições",
+  "filter_modal.added.short_explanation": "Esta publicação foi adicionada à seguinte categoria de filtro: {title}.",
+  "filter_modal.added.title": "Filtro adicionado!",
+  "filter_modal.select_filter.context_mismatch": "não se aplica a este contexto",
+  "filter_modal.select_filter.expired": "expirado",
+  "filter_modal.select_filter.prompt_new": "Nova categoria: {name}",
+  "filter_modal.select_filter.search": "Pesquisar ou criar",
+  "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
+  "filter_modal.select_filter.title": "Filtrar esta publicação",
+  "filter_modal.title.status": "Filtrar uma publicação",
   "follow_recommendations.done": "Concluído",
   "follow_recommendations.heading": "Siga pessoas das quais gostaria de ver publicações! Aqui estão algumas sugestões.",
   "follow_recommendations.lead": "As publicações das pessoas que segue serão exibidos em ordem cronológica na sua página inicial. Não tenha medo de cometer erros, você pode deixar de seguir as pessoas tão facilmente a qualquer momento!",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
+  "footer.about": "Sobre",
+  "footer.directory": "Diretório de perfis",
+  "footer.get_app": "Obtém a aplicação",
+  "footer.invite": "Convidar pessoas",
+  "footer.keyboard_shortcuts": "Atalhos do teclado",
+  "footer.privacy_policy": "Política de privacidade",
+  "footer.source_code": "Ver código-fonte",
   "generic.saved": "Salvo",
-  "getting_started.developers": "Responsáveis pelo desenvolvimento",
-  "getting_started.directory": "Diretório de perfis",
-  "getting_started.documentation": "Documentação",
   "getting_started.heading": "Primeiros passos",
-  "getting_started.invite": "Convidar pessoas",
-  "getting_started.open_source_notice": "Mastodon é um software de código aberto. Podes contribuir ou reportar problemas no GitHub do projeto: {github}.",
-  "getting_started.security": "Segurança",
-  "getting_started.terms": "Termos de serviço",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Qualquer destes",
   "hashtag.column_settings.tag_mode.none": "Nenhum destes",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionais para esta coluna",
+  "hashtag.follow": "Seguir hashtag",
+  "hashtag.unfollow": "Parar de seguir hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar anúncios",
   "home.show_announcements": "Exibir anúncios",
+  "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar esta publicação aos favoritos para que o autor saiba que gostou e salvá-la para mais tarde.",
+  "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
+  "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
+  "interaction_modal.description.reply": "Com uma conta no Mastodon, pode responder a esta publicação.",
+  "interaction_modal.on_another_server": "Num servidor diferente",
+  "interaction_modal.on_this_server": "Neste servidor",
+  "interaction_modal.other_server_instructions": "Copie e cole este URL no campo de pesquisa do seu aplicativo Mastodon favorito ou da interface web do seu servidor Mastodon.",
+  "interaction_modal.preamble": "Uma vez que o Mastodon é descentralizado, pode utilizar a sua conta existente, hospedada em outro servidor Mastodon ou plataforma compatível, se não tiver uma conta neste servidor.",
+  "interaction_modal.title.favourite": "Adicionar a publicação de {name} aos favoritos",
+  "interaction_modal.title.follow": "Seguir {name}",
+  "interaction_modal.title.reblog": "Impulsionar a publicação de {name}",
+  "interaction_modal.title.reply": "Responder à publicação de {name}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expandir caixa de visualização de imagem",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Exibir perfil mesmo assim",
+  "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
   "lists.account.add": "Adicionar à lista",
   "lists.account.remove": "Remover da lista",
   "lists.delete": "Eliminar lista",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Este recurso não foi encontrado",
+  "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
   "mute_modal.duration": "Duração",
   "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
   "mute_modal.indefinite": "Indefinidamente",
-  "navigation_bar.apps": "Aplicações móveis",
+  "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.bookmarks": "Itens salvos",
   "navigation_bar.community_timeline": "Cronologia local",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
   "navigation_bar.edit_profile": "Editar perfil",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras silenciadas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.follows_and_followers": "Seguindo e seguidores",
-  "navigation_bar.info": "Sobre esta instância",
-  "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
   "navigation_bar.mutes": "Utilizadores silenciados",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Toots afixados",
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Cronologia federada",
+  "navigation_bar.search": "Pesquisar",
   "navigation_bar.security": "Segurança",
+  "not_signed_in_indicator.not_signed_in": "Necessita de iniciar sessão para utilizar esta funcionalidade.",
+  "notification.admin.report": "{name} denunciou {target}",
+  "notification.admin.sign_up": "{name} inscreveu-se",
   "notification.favourite": "{name} adicionou a tua publicação aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
@@ -306,13 +400,16 @@
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} partilhou a tua publicação",
   "notification.status": "{name} acabou de publicar",
+  "notification.update": "{name} editou uma publicação",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
+  "notifications.column_settings.admin.report": "Novas denúncias:",
+  "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
-  "notifications.column_settings.filter_bar.show": "Mostrar",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
   "notifications.column_settings.mention": "Menções:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Reproduzir som",
   "notifications.column_settings.status": "Novos toots:",
-  "notifications.column_settings.unread_markers.category": "Marcadores de notificação não lidas",
+  "notifications.column_settings.unread_notifications.category": "Notificações não lidas",
+  "notifications.column_settings.unread_notifications.highlight": "Destacar notificações não lidas",
+  "notifications.column_settings.update": "Edições:",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritos",
@@ -343,38 +442,82 @@
   "poll.closed": "Fechado",
   "poll.refresh": "Recarregar",
   "poll.total_people": "{count, plural, one {# pessoa} other {# pessoas}}",
-  "poll.total_votes": "{contar, plural, um {# vote} outro {# votes}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaste nesta resposta",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# voto } other {# votos}}",
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover votação",
   "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Directo",
+  "privacy.direct.short": "Apenas pessoas mencionadas",
   "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Privado",
-  "privacy.public.long": "Publicar em todos os feeds",
+  "privacy.private.short": "Apenas seguidores",
+  "privacy.public.long": "Visível para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Não publicar nos feeds públicos",
+  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
   "privacy.unlisted.short": "Não listar",
+  "privacy_policy.last_updated": "Última atualização em {date}",
+  "privacy_policy.title": "Política de Privacidade",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "A carregar…",
   "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural,one {# dia} other {# dias}} atrás",
+  "relative_time.full.hours": "{number, plural,one {# hora}other {# horas}} atrás",
+  "relative_time.full.just_now": "agora mesmo",
+  "relative_time.full.minutes": "{number, plural,one {# minuto}other {# minutos}} atrás",
+  "relative_time.full.seconds": "{number, plural,one {# segundo} other {# segundos}} atrás",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "agora",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
+  "report.block": "Bloquear",
+  "report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
+  "report.categories.other": "Outro",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
+  "report.category.subtitle": "Escolha a melhor correspondência",
+  "report.category.title": "Diga-nos o que se passa com esse {type}",
+  "report.category.title_account": "perfil",
+  "report.category.title_status": "publicação",
+  "report.close": "Concluído",
+  "report.comment.title": "Há algo mais que pensa que devemos saber?",
   "report.forward": "Reenviar para {target}",
-  "report.forward_hint": "A conta é de outra instância. Enviar uma cópia anónima do relatório para lá também?",
-  "report.hint": "O relatório será enviado para os moderadores da sua instância. Pode fornecer, em baixo, uma explicação do motivo pelo qual está a denunciar esta conta:",
+  "report.forward_hint": "A conta é de outro servidor. Enviar uma cópia anónima da denúncia para lá também?",
+  "report.mute": "Silenciar",
+  "report.mute_explanation": "Não verá as publicações deles. Eles ainda poderão segui-lo e ver as suas publicações e não saberão que estão silenciados.",
+  "report.next": "Seguinte",
   "report.placeholder": "Comentários adicionais",
+  "report.reasons.dislike": "Não gosto disso",
+  "report.reasons.dislike_description": "Não é algo que deseje ver",
+  "report.reasons.other": "É outra coisa",
+  "report.reasons.other_description": "O problema não se encaixa nas outras categorias",
+  "report.reasons.spam": "É spam",
+  "report.reasons.spam_description": "Links maliciosos, contactos falsos, ou respostas repetitivas",
+  "report.reasons.violation": "Viola as regras do servidor",
+  "report.reasons.violation_description": "Está ciente de que infringe regras específicas",
+  "report.rules.subtitle": "Selecione tudo o que se aplicar",
+  "report.rules.title": "Que regras estão a ser violadas?",
+  "report.statuses.subtitle": "Selecione tudo o que se aplicar",
+  "report.statuses.title": "Existe alguma publicação que suporte esta denúncia?",
   "report.submit": "Enviar",
-  "report.target": "Denunciar",
+  "report.target": "A denunciar {target}",
+  "report.thanks.take_action": "Aqui estão as suas opções para controlar o que vê no Mastodon:",
+  "report.thanks.take_action_actionable": "Enquanto revemos a sua denúncia, pode tomar medidas contra @{name}:",
+  "report.thanks.title": "Não quer ver isto?",
+  "report.thanks.title_actionable": "Obrigado por reportar, vamos analisar.",
+  "report.unfollow": "Deixar de seguir @{name}",
+  "report.unfollow_explanation": "Está a seguir esta conta. Para não ver mais as publicações desta conta na sua página inicial, deixe de segui-la.",
+  "report_notification.attached_statuses": "{count, plural,one {{count} publicação} other {{count} publicações}} em anexo",
+  "report_notification.categories.other": "Outro",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violação de regra",
+  "report_notification.open": "Abrir denúncia",
   "search.placeholder": "Pesquisar",
+  "search.search_or_paste": "Pesquisar ou introduzir URL",
   "search_popout.search_format": "Formato avançado de pesquisa",
   "search_popout.tips.full_text": "Texto simples devolve publicações que escreveu, marcou como favorita, partilhou ou em que foi mencionado, tal como nomes de utilizador, alcunhas e hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "O texto simples retorna a correspondência de nomes, utilizadores e hashtags",
   "search_popout.tips.user": "utilizador",
   "search_results.accounts": "Pessoas",
+  "search_results.all": "Tudo",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Não foi possível encontrar resultados para as expressões pesquisadas",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "A pesquisa de toots pelo seu conteúdo não está disponível nesta instância Mastodon.",
+  "search_results.title": "Pesquisar por {q}",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "server_banner.about_active_users": "Pessoas que utilizaram este servidor nos últimos 30 dias (Utilizadores Ativos Mensais)",
+  "server_banner.active_users": "utilizadores ativos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} faz parte da rede social descentralizada baseada no {mastodon}.",
+  "server_banner.learn_more": "Saber mais",
+  "server_banner.server_stats": "Estatísticas do servidor:",
+  "sign_in_banner.create_account": "Criar conta",
+  "sign_in_banner.sign_in": "Iniciar sessão",
+  "sign_in_banner.text": "Inicie sessão para seguir perfis ou hashtags, favoritos, partilhar e responder às publicações ou interagir através da sua conta noutro servidor.",
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
   "status.block": "Bloquear @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista de conversação detalhada",
   "status.direct": "Mensagem direta @{name}",
+  "status.edit": "Editar",
+  "status.edited": "Editado em {date}",
+  "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Adicionar aos favoritos",
+  "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrada",
+  "status.hide": "Esconder publicação",
+  "status.history.created": "{name} criado em {date}",
+  "status.history.edited": "{name} editado em {date}",
   "status.load_more": "Carregar mais",
   "status.media_hidden": "Media escondida",
   "status.mention": "Mencionar @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Ainda ninguém fez boost a este toot. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
   "status.remove_bookmark": "Remover dos itens salvos",
+  "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Conteúdo sensível",
   "status.share": "Partilhar",
+  "status.show_filter_reason": "Mostrar mesmo assim",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todas",
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
-  "status.show_thread": "Mostrar conversa",
+  "status.show_original": "Mostrar original",
+  "status.translate": "Traduzir",
+  "status.translated_from_with": "Traduzido do {lang} usando {provider}",
   "status.uncached_media_warning": "Não disponível",
   "status.unmute_conversation": "Deixar de silenciar esta conversa",
   "status.unpin": "Não fixar no perfil",
+  "subscribed_languages.lead": "Após a alteração, apenas as publicações nos idiomas selecionados aparecerão na sua página inicial e listas. Não selecione nenhuma para receber publicações de todos os idiomas.",
+  "subscribed_languages.save": "Guardar alterações",
+  "subscribed_languages.target": "Alterar idiomas subscritos para {target}",
   "suggestions.dismiss": "Dispensar a sugestão",
   "suggestions.header": "Tu podes estar interessado em…",
   "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Início",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificações",
-  "tabs_bar.search": "Pesquisar",
   "time_remaining.days": "{número, plural, um {# day} outro {# days}} faltam",
   "time_remaining.hours": "{número, plural, um {# hour} outro {# hours}} faltam",
   "time_remaining.minutes": "{número, plural, um {# minute} outro {# minutes}} faltam",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguindo",
   "timeline_hint.resources.statuses": "Toots antigos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} a conversar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
   "trends.trending_now": "Tendências atuais",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
   "units.short.billion": "{count}MM",
@@ -455,14 +623,15 @@
   "upload_error.limit": "Limite máximo do ficheiro a carregar excedido.",
   "upload_error.poll": "Carregamento de ficheiros não é permitido em votações.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
-  "upload_form.description": "Descrição da imagem para pessoas com dificuldades visuais",
+  "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
+  "upload_form.description_missing": "Nenhuma descrição adicionada",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
   "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
   "upload_modal.analyzing_picture": "A analizar imagem…",
   "upload_modal.apply": "Aplicar",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "A aplicar…",
   "upload_modal.choose_image": "Escolher imagem",
   "upload_modal.description_placeholder": "Grave e cabisbaixo, o filho justo zelava pela querida mãe doente",
   "upload_modal.detect_text": "Detectar texto na imagem",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "A preparar OCR…",
   "upload_modal.preview_label": "Pré-visualizar ({ratio})",
   "upload_progress.label": "A enviar...",
+  "upload_progress.processing": "A processar…",
   "video.close": "Fechar vídeo",
   "video.download": "Descarregar ficheiro",
   "video.exit_fullscreen": "Sair de full screen",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index b6cb0a86c..175d2216e 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Servere moderate",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon este o aplicație gratuită, cu sursă deschisă și o marcă înregistrată a Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Motivul nu este disponibil",
+  "about.domain_blocks.preamble": "Mastodon îți permite în general să vezi conținut de la și să interacționezi cu utilizatori de pe oricare server în fediverse. Acestea sunt excepțiile care au fost făcute pe acest server.",
+  "about.domain_blocks.silenced.explanation": "În general, nu vei vedea profiluri și conținut de pe acest server, cu excepția cazului în care îl cauți în mod explicit sau optezi pentru el prin urmărire.",
+  "about.domain_blocks.silenced.title": "Limitat",
+  "about.domain_blocks.suspended.explanation": "Nicio informație de la acest server nu va fi procesată, stocată sau trimisă, făcând imposibilă orice interacțiune sau comunicare cu utilizatorii de pe acest server.",
+  "about.domain_blocks.suspended.title": "Suspendat",
+  "about.not_available": "Această informație nu a fost pusă la dispoziție pe acest server.",
+  "about.powered_by": "Media socială descentralizată furnizată de {mastodon}",
+  "about.rules": "Reguli server",
   "account.account_note_header": "Notă",
   "account.add_or_remove_from_list": "Adaugă sau elimină din liste",
   "account.badges.bot": "Robot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Blochează domeniul {domain}",
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
-  "account.cancel_follow_request": "Anulează cererea de abonare",
+  "account.cancel_follow_request": "Retrage cererea de urmărire",
   "account.direct": "Trimite-i un mesaj direct lui @{name}",
   "account.disable_notifications": "Nu îmi mai trimite notificări când postează @{name}",
   "account.domain_blocked": "Domeniu blocat",
   "account.edit_profile": "Modifică profilul",
   "account.enable_notifications": "Trimite-mi o notificare când postează @{name}",
   "account.endorse": "Promovează pe profil",
+  "account.featured_tags.last_status_at": "Ultima postare pe {date}",
+  "account.featured_tags.last_status_never": "Fără postări",
+  "account.featured_tags.title": "Haștagurile recomandate de {name}",
   "account.follow": "Abonează-te",
-  "account.followers": "Abonați",
-  "account.followers.empty": "Acest utilizator încă nu are abonați.",
-  "account.followers_counter": "{count, plural, one {{counter} Abonat} few {{counter} Abonați} other {{counter} Abonați}}",
-  "account.following_counter": "{count, plural, one {{counter} Abonament} few {{counter} Abonamente} other {{counter} Abonamente}}",
+  "account.followers": "Urmăritori",
+  "account.followers.empty": "Acest utilizator nu are încă urmăritori.",
+  "account.followers_counter": "{count, plural, one {Un abonat} few {{counter} abonați} other {{counter} de abonați}}",
+  "account.following": "Urmăriți",
+  "account.following_counter": "{count, plural, one {Un abonament} few {{counter} abonamente} other {{counter} de abonamente}}",
   "account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
   "account.follows_you": "Este abonat la tine",
+  "account.go_to_profile": "Mergi la profil",
   "account.hide_reblogs": "Ascunde distribuirile de la @{name}",
-  "account.joined": "S-a înscris în {date}",
-  "account.last_status": "Ultima activitate",
+  "account.joined_short": "Înscris",
+  "account.languages": "Schimbă limbile abonate",
   "account.link_verified_on": "Proprietatea acestui link a fost verificată pe {date}",
   "account.locked_info": "Acest profil este privat. Această persoană aprobă manual conturile care se abonează la ea.",
   "account.media": "Media",
   "account.mention": "Menționează pe @{name}",
-  "account.moved_to": "{name} a fost mutat la:",
-  "account.mute": "Ignoră pe @{name}",
-  "account.mute_notifications": "Ignoră notificările de la @{name}",
-  "account.muted": "Ignorat",
-  "account.never_active": "Niciodată",
+  "account.moved_to": "{name} a indicat că noul său cont este acum:",
+  "account.mute": "Pune pe @{name} pe silențios",
+  "account.mute_notifications": "Pune pe silențios notificările de la @{name}",
+  "account.muted": "Pus pe silențios",
+  "account.open_original_page": "Deschide pagina originală",
   "account.posts": "Postări",
   "account.posts_with_replies": "Postări și răspunsuri",
   "account.report": "Raportează pe @{name}",
   "account.requested": "Se așteaptă aprobarea. Apasă pentru a anula cererea de urmărire",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Distribuie profilul lui @{name}",
   "account.show_reblogs": "Arată impulsurile de la @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Deblochează pe @{name}",
   "account.unblock_domain": "Deblochează domeniul {domain}",
+  "account.unblock_short": "Deblochează",
   "account.unendorse": "Nu promova pe profil",
   "account.unfollow": "Nu mai urmări",
   "account.unmute": "Nu mai ignora pe @{name}",
   "account.unmute_notifications": "Activează notificările de la @{name}",
+  "account.unmute_short": "Reafișare",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Rata de retenţie a utilizatorului pe zi după înregistrare",
+  "admin.dashboard.monthly_retention": "Rata de retenţie a utilizatorului după luna de înscriere",
+  "admin.dashboard.retention.average": "În medie",
+  "admin.dashboard.retention.cohort": "Înregistrări lunar",
+  "admin.dashboard.retention.cohort_size": "Utilizatori noi",
   "alert.rate_limited.message": "Vă rugăm să reîncercați după {retry_time, time, medium}.",
   "alert.rate_limited.title": "Debit limitat",
   "alert.unexpected.message": "A apărut o eroare neașteptată.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Anunț",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(neprocesate)",
+  "audio.hide": "Ascunde audio",
   "autosuggest_hashtag.per_week": "{count} pe săptămână",
   "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
-  "bundle_column_error.body": "A apărut o eroare la încărcarea acestui element.",
+  "bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
+  "bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
+  "bundle_column_error.error.title": "Vai Nu!",
+  "bundle_column_error.network.body": "A apărut o eroare la încărcarea acestei pagini. Acest lucru se poate datora unei probleme temporare cu conexiunea la internet sau cu acest server.",
+  "bundle_column_error.network.title": "Eroare de rețea",
   "bundle_column_error.retry": "Încearcă din nou",
-  "bundle_column_error.title": "Eroare de rețea",
+  "bundle_column_error.return": "Înapoi acasă",
+  "bundle_column_error.routing.body": "Pagina solicitată nu a putut fi găsită. Ești sigur că adresa URL din bara de adrese este corectă?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Închide",
   "bundle_modal_error.message": "A apărut o eroare la încărcarea acestui element.",
   "bundle_modal_error.retry": "Încearcă din nou",
+  "closed_registrations.other_server_instructions": "Deoarece Mastodon este descentralizat, poți crea un cont pe un alt server și încă poți interacționa cu acesta.",
+  "closed_registrations_modal.description": "Crearea unui cont pe {domain} nu este posibilă momentan, dar aveți în vedere că nu aveți nevoie de un cont specific pe {domain} pentru a utiliza Mastodon.",
+  "closed_registrations_modal.find_another_server": "Caută un alt server",
+  "closed_registrations_modal.preamble": "Mastodon este descentralizat, deci indiferent unde îți creezi contul, vei putea urmări și interacționa cu oricine de pe acest server. Poți chiar să te găzduiești de unul singur!",
+  "closed_registrations_modal.title": "Înscrie-te pe Mastodon",
+  "column.about": "Despre",
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
   "column.community": "Cronologie locală",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Doar local",
   "community.column_settings.media_only": "Doar media",
   "community.column_settings.remote_only": "Doar la distanţă",
-  "compose_form.direct_message_warning": "Această postare va fi trimisă doar utilizatorilor menționați.",
+  "compose.language.change": "Schimbare limbă",
+  "compose.language.search": "Căutare limbi…",
   "compose_form.direct_message_warning_learn_more": "Află mai multe",
+  "compose_form.encryption_warning": "Postările pe Mastodon nu sunt criptate în ambele părți. Nu împărtășiți nici o informație sensibilă pe Mastodon.",
   "compose_form.hashtag_warning": "Această postare nu va fi listată sub niciun hashtag deoarece este nelistată. Doar postările publice pot fi căutate cu un hashtag.",
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
   "compose_form.lock_disclaimer.lock": "privat",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Elimină acestă opțiune",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
-  "compose_form.publish": "Postează",
+  "compose_form.publish": "Publică",
+  "compose_form.publish_form": "Publică",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Salvează modificările",
   "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
   "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
   "confirmations.block.message": "Ești sigur că vrei să blochezi pe {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retrage cererea",
+  "confirmations.cancel_follow_request.message": "Sunteți sigur că doriți să retrageți cererea dvs. de urmărire pentru {name}?",
   "confirmations.delete.confirm": "Elimină",
   "confirmations.delete.message": "Ești sigur că vrei să elimini această postare?",
   "confirmations.delete_list.confirm": "Elimină",
   "confirmations.delete_list.message": "Ești sigur că vrei să elimini definitiv această listă?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Renunță",
+  "confirmations.discard_edit_media.message": "Ai modificări nesalvate în descrierea sau previzualizarea media, renunți oricum?",
   "confirmations.domain_block.confirm": "Blochează întregul domeniu",
   "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
   "confirmations.logout.confirm": "Deconectare",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Marchează ca citit",
   "conversation.open": "Vizualizează conversația",
   "conversation.with": "Cu {names}",
+  "copypaste.copied": "Copiat",
+  "copypaste.copy": "Copiere",
   "directory.federated": "Din fediversul cunoscut",
   "directory.local": "Doar din {domain}",
   "directory.new_arrivals": "Înscriși recent",
   "directory.recently_active": "Activi recent",
+  "disabled_account_banner.account_settings": "Setări cont",
+  "disabled_account_banner.text": "Contul tău {disabledAccount} este momentan dezactivat.",
+  "dismissable_banner.community_timeline": "Acestea sunt cele mai recente postări publice de la persoane ale căror conturi sunt găzduite de {domain}.",
+  "dismissable_banner.dismiss": "Renunțare",
+  "dismissable_banner.explore_links": "În acest moment, oamenii vorbesc despre aceste știri, pe acesta dar și pe alte servere ale rețelei descentralizate.",
+  "dismissable_banner.explore_statuses": "Aceste postări de pe acesta dar și alte servere din rețeaua descentralizată câștigă teren pe acest server chiar acum.",
+  "dismissable_banner.explore_tags": "Aceste hashtag-uri câștigă teren în rândul oamenilor de pe acesta și pe alte servere ale rețelei descentralizate chiar acum.",
+  "dismissable_banner.public_timeline": "Acestea sunt cele mai recente postări publice de la utilizatorii acestui server sau ai altor servere ale rețelei descentralizate cunoscute de acest server.",
   "embed.instructions": "Integrează această postare în site-ul tău copiind codul de mai jos.",
   "embed.preview": "Iată cum va arăta:",
   "emoji_button.activity": "Activități",
+  "emoji_button.clear": "Ștergeți",
   "emoji_button.custom": "Personalizați",
   "emoji_button.flags": "Steaguri",
   "emoji_button.food": "Alimente și băuturi",
@@ -165,6 +216,7 @@
   "empty_column.community": "Nu există nimic în cronologia locală. Postează ceva public pentru a sparge gheața!",
   "empty_column.direct": "Momentan nu ai niciun mesaj direct. Când trimiți sau primești un mesaj, va apărea aici.",
   "empty_column.domain_blocks": "Momentan nu există domenii blocate.",
+  "empty_column.explore_statuses": "Nimic nu figurează în tendințe în acest moment. Verifică din nou mai târziu!",
   "empty_column.favourited_statuses": "Momentan nu ai nicio postare favorită. Când vei adăuga una, va apărea aici.",
   "empty_column.favourites": "Momentan nimeni nu a adăugat această postare la favorite. Când cineva o va face, va apărea aici.",
   "empty_column.follow_recommendations": "Se pare că nu am putut genera nicio sugestie pentru tine. Poți încerca funcția de căutare pentru a căuta persoane pe care le cunoști, sau poți explora tendințele.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Încearcă să le dezactivezi și să reîmprospătezi pagina. Dacă tot nu funcționează, poți accesa Mastodon dintr-un alt navigator sau dintr-o aplicație nativă.",
   "errors.unexpected_crash.copy_stacktrace": "Copiere stacktrace în clipboard",
   "errors.unexpected_crash.report_issue": "Raportează o problemă",
+  "explore.search_results": "Rezultatele căutării",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explorează",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Această categorie de filtre nu se aplică în contextul în care ați accesat acestă postare. Dacă doriți ca postarea să fie filtrată și în acest context, va trebui să editați filtrul.",
+  "filter_modal.added.context_mismatch_title": "Nepotrivire contextuală!",
+  "filter_modal.added.expired_explanation": "Această categorie de filtre a expirat, va trebui să modifici data de expirare pentru ca aceasta să se aplice.",
+  "filter_modal.added.expired_title": "Filtru expirat!",
+  "filter_modal.added.review_and_configure": "Pentru a revizui și a configura în continuare această categorie de filtre, mergi la {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Configurări pentru filtre",
+  "filter_modal.added.settings_link": "pagina configurărilor",
+  "filter_modal.added.short_explanation": "Această postare a fost adăugată la următoarea categorie de filtre: {title}.",
+  "filter_modal.added.title": "Filtru adăugat!",
+  "filter_modal.select_filter.context_mismatch": "nu se aplică acestui context",
+  "filter_modal.select_filter.expired": "expirat",
+  "filter_modal.select_filter.prompt_new": "Categorie nouă: {name}",
+  "filter_modal.select_filter.search": "Caută sau creează",
+  "filter_modal.select_filter.subtitle": "Folosește o categorie existentă sau creează una nouă",
+  "filter_modal.select_filter.title": "Filtrează această postare",
+  "filter_modal.title.status": "Filtrează o postare",
   "follow_recommendations.done": "Terminat",
   "follow_recommendations.heading": "Urmărește persoanele ale căror postări te-ar interesa! Iată câteva sugestii.",
   "follow_recommendations.lead": "Postările de la persoanele la care te-ai abonat vor apărea în ordine cronologică în cronologia principală. Nu-ți fie teamă să faci greșeli, poți să te dezabonezi oricând de la ei la fel de ușor!",
   "follow_request.authorize": "Acceptă",
   "follow_request.reject": "Respinge",
   "follow_requests.unlocked_explanation": "Chiar dacă contul tău nu este blocat, personalul {domain} a considerat că ai putea prefera să consulți manual cererile de abonare de la aceste conturi.",
+  "footer.about": "Despre",
+  "footer.directory": "Catalogul de profiluri",
+  "footer.get_app": "Obține aplicația",
+  "footer.invite": "Invită persoane",
+  "footer.keyboard_shortcuts": "Comenzi rapide de la tastatură",
+  "footer.privacy_policy": "Politica de confidenţialitate",
+  "footer.source_code": "Vizualizează codul sursă",
   "generic.saved": "Salvat",
-  "getting_started.developers": "Dezvoltatori",
-  "getting_started.directory": "Catalog de profiluri",
-  "getting_started.documentation": "Documentație",
   "getting_started.heading": "Primii pași",
-  "getting_started.invite": "Invită persoane",
-  "getting_started.open_source_notice": "Mastodon este un software cu sursă deschisă (open source). Poți contribui la dezvoltarea lui sau raporta probleme pe GitHub la {github}.",
-  "getting_started.security": "Setări cont",
-  "getting_started.terms": "Termeni și condiții",
   "hashtag.column_header.tag_mode.all": "și {additional}",
   "hashtag.column_header.tag_mode.any": "sau {additional}",
   "hashtag.column_header.tag_mode.none": "fără {additional}",
@@ -207,21 +281,35 @@
   "hashtag.column_settings.tag_mode.any": "Oricare din acestea",
   "hashtag.column_settings.tag_mode.none": "Niciuna dintre acestea",
   "hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
+  "hashtag.follow": "Urmărește haștagul",
+  "hashtag.unfollow": "Nu mai urmări haștagul",
   "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Afișează distribuirile",
   "home.column_settings.show_replies": "Afișează răspunsurile",
   "home.hide_announcements": "Ascunde anunțurile",
   "home.show_announcements": "Afișează anunțurile",
-  "intervals.full.days": "{number, plural,one {# zi} other {# zile}}",
-  "intervals.full.hours": "{number, plural, one {# oră} other {# ore}}",
-  "intervals.full.minutes": "{number, plural, one {# minut} other {# minute}}",
+  "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.",
+  "interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.",
+  "interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.",
+  "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
+  "interaction_modal.on_another_server": "Pe un alt server",
+  "interaction_modal.on_this_server": "Pe acest server",
+  "interaction_modal.other_server_instructions": "Copiază și lipește acest URL în câmpul de căutare al aplicației tale preferate Mastodon sau în interfața web a serverului tău Mastodon.",
+  "interaction_modal.preamble": "De vreme ce Mastodon este descentralizat, poți folosi contul tău existent, găzduit de un alt server Mastodon, sau o platformă compatibilă dacă nu ai un cont pe acesta.",
+  "interaction_modal.title.favourite": "Adaugă la favorite postarea lui {name}",
+  "interaction_modal.title.follow": "Urmărește pe {name}",
+  "interaction_modal.title.reblog": "Distribuie postarea lui {name}",
+  "interaction_modal.title.reply": "Răspunde postării lui {name}",
+  "intervals.full.days": "{number, plural, one {o zi} few {# zile} other {# de zile}}",
+  "intervals.full.hours": "{number, plural, one {o oră} few {# ore} other {# de ore}}",
+  "intervals.full.minutes": "{number, plural, one {un minut} few {# minute} other {# de minute}}",
   "keyboard_shortcuts.back": "Navighează înapoi",
   "keyboard_shortcuts.blocked": "Deschide lista utilizatorilor blocați",
   "keyboard_shortcuts.boost": "Distribuie postarea",
   "keyboard_shortcuts.column": "Focalizează pe coloană",
   "keyboard_shortcuts.compose": "Focalizează pe zona de text",
   "keyboard_shortcuts.description": "Descriere",
-  "keyboard_shortcuts.direct": "Deschide coloana de mesaje directe",
+  "keyboard_shortcuts.direct": "pentru a deschide coloana cu mesaje directe",
   "keyboard_shortcuts.down": "Coboară în listă",
   "keyboard_shortcuts.enter": "Deschide postarea",
   "keyboard_shortcuts.favourite": "Adaugă postarea la favorite",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Deschide panoul de vizualizare a imaginilor",
   "lightbox.next": "Înainte",
   "lightbox.previous": "Înapoi",
+  "limited_account_hint.action": "Afișează profilul oricum",
+  "limited_account_hint.title": "Acest profil a fost ascuns de moderatorii domeniului {domain}.",
   "lists.account.add": "Adaugă în listă",
   "lists.account.remove": "Elimină din listă",
   "lists.delete": "Șterge lista",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
   "missing_indicator.label": "Nu a fost găsit",
   "missing_indicator.sublabel": "Această resursă nu a putut fi găsită",
+  "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
   "mute_modal.duration": "Durata",
   "mute_modal.hide_notifications": "Ascunde notificările de la acest utilizator?",
   "mute_modal.indefinite": "Nedeterminat",
-  "navigation_bar.apps": "Aplicații mobile",
+  "navigation_bar.about": "Despre",
   "navigation_bar.blocks": "Utilizatori blocați",
   "navigation_bar.bookmarks": "Marcaje",
   "navigation_bar.community_timeline": "Cronologie locală",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
   "navigation_bar.edit_profile": "Modifică profilul",
+  "navigation_bar.explore": "Explorează",
   "navigation_bar.favourites": "Favorite",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
   "navigation_bar.follows_and_followers": "Abonamente și abonați",
-  "navigation_bar.info": "Despre această instanță",
-  "navigation_bar.keyboard_shortcuts": "Taste rapide",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Deconectare",
   "navigation_bar.mutes": "Utilizatori ignorați",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Postări fixate",
   "navigation_bar.preferences": "Preferințe",
   "navigation_bar.public_timeline": "Cronologie globală",
+  "navigation_bar.search": "Caută",
   "navigation_bar.security": "Securitate",
+  "not_signed_in_indicator.not_signed_in": "Trebuie să te conectezi pentru a accesa această resursă.",
+  "notification.admin.report": "{name} a raportat pe {target}",
+  "notification.admin.sign_up": "{name} s-a înscris",
   "notification.favourite": "{name} a adăugat postarea ta la favorite",
   "notification.follow": "{name} s-a abonat la tine",
   "notification.follow_request": "{name} a trimis o cerere de abonare",
@@ -306,13 +400,16 @@
   "notification.poll": "Un sondaj pentru care ai votat s-a încheiat",
   "notification.reblog": "{name} ți-a distribuit postarea",
   "notification.status": "{name} tocmai a postat",
+  "notification.update": "{name} și-a modificat o postare",
   "notifications.clear": "Șterge notificările",
   "notifications.clear_confirmation": "Ești sigur că vrei să ștergi permanent toate notificările?",
+  "notifications.column_settings.admin.report": "Raportări noi:",
+  "notifications.column_settings.admin.sign_up": "Înscrieri noi:",
   "notifications.column_settings.alert": "Notificări pe desktop",
   "notifications.column_settings.favourite": "Favorite:",
   "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile",
   "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă",
-  "notifications.column_settings.filter_bar.show": "Afișează",
+  "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare",
   "notifications.column_settings.follow": "Noi abonați:",
   "notifications.column_settings.follow_request": "Noi cereri de abonare:",
   "notifications.column_settings.mention": "Mențiuni:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Afișează în coloană",
   "notifications.column_settings.sound": "Redare sunet",
   "notifications.column_settings.status": "Postări noi:",
-  "notifications.column_settings.unread_markers.category": "Marcaje de notificări necitite",
+  "notifications.column_settings.unread_notifications.category": "Notificări necitite",
+  "notifications.column_settings.unread_notifications.highlight": "Evidențiază notificările necitite",
+  "notifications.column_settings.update": "Modificări:",
   "notifications.filter.all": "Toate",
   "notifications.filter.boosts": "Distribuiri",
   "notifications.filter.favourites": "Favorite",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# vot} other {# voturi}}",
   "poll.vote": "Votează",
   "poll.voted": "Ai votat pentru acest răspuns",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# vot} other {# voturi}}",
   "poll_button.add_poll": "Adaugă un sondaj",
   "poll_button.remove_poll": "Elimină sondajul",
   "privacy.change": "Modifică confidențialitatea postării",
   "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Doar persoane menționate",
   "privacy.private.long": "Vizibil doar pentru abonați",
   "privacy.private.short": "Doar abonați",
-  "privacy.public.long": "Vizibil pentru toți, afișat în cronologiile publice",
+  "privacy.public.long": "Vizibil pentru toți",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți, dar nu și în cronologiile publice",
+  "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
   "privacy.unlisted.short": "Nelistat",
+  "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
+  "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
   "regeneration_indicator.label": "Se încarcă…",
   "regeneration_indicator.sublabel": "Cronologia ta principală este în curs de pregătire!",
   "relative_time.days": "{number}z",
+  "relative_time.full.days": "acum {number, plural, one {o zi} few {# zile} other {# de zile}}",
+  "relative_time.full.hours": "acum {number, plural, one {o oră} few {# ore} other {# de ore}}",
+  "relative_time.full.just_now": "chiar acum",
+  "relative_time.full.minutes": "acum {number, plural, one {un minut} few {# minute} other {# de minute}}",
+  "relative_time.full.seconds": "acum {number, plural, one {o secundă} few {# secunde} other {# de secunde}}",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "acum",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "astăzi",
   "reply_indicator.cancel": "Anulează",
+  "report.block": "Blochează",
+  "report.block_explanation": "Nu îi vei mai vedea postările. Nu va mai putea să îți vadă postările sau să ți se aboneze. Va putea să își dea seama că a fost blocat·ă.",
+  "report.categories.other": "Altele",
+  "report.categories.spam": "Mesaje nedorite",
+  "report.categories.violation": "Conținutul încalcă una sau mai multe dintre regulile serverului",
+  "report.category.subtitle": "Alege varianta care se potrivește cel mai bine",
+  "report.category.title": "Spune-ne care este problema cu acest {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "mesaj",
+  "report.close": "Gata",
+  "report.comment.title": "Mai este ceva important pe care ai vrea să ni-l spui?",
   "report.forward": "Redirecționează către {target}",
   "report.forward_hint": "Acest cont este de pe un alt server. Trimitem o copie anonimă a raportului și acolo?",
-  "report.hint": "Sesizarea va fi trimisă către moderatorii acestei instanțe. Poți oferi o explicație pentru această sesizare mai jos:",
+  "report.mute": "Pune pe silențios",
+  "report.mute_explanation": "Nu îi vei mai vedea postările. Va mai putea să îți vadă postările sau să ți se aboneze și nu va putea să își dea seama că a fost pus·ă pe silențios.",
+  "report.next": "Înainte",
   "report.placeholder": "Comentarii adiționale",
+  "report.reasons.dislike": "Nu-mi place",
+  "report.reasons.dislike_description": "Nu este ceva ce ai vrea să vezi",
+  "report.reasons.other": "Este altceva",
+  "report.reasons.other_description": "Problema nu se încadrează în vreuna dintre categoriile de mai sus",
+  "report.reasons.spam": "Este spam",
+  "report.reasons.spam_description": "Linkuri malițioase, reclame false sau mesaje care se tot repetă",
+  "report.reasons.violation": "Încalcă regulile serverului",
+  "report.reasons.violation_description": "Știi că încalcă anumite reguli specifice",
+  "report.rules.subtitle": "Selectează toate variantele care se aplică",
+  "report.rules.title": "Care reguli sunt încălcate?",
+  "report.statuses.subtitle": "Selectează toate variantele care se aplică",
+  "report.statuses.title": "Există vreo postare care să susțină această raportare?",
   "report.submit": "Trimite",
   "report.target": "Raportează {target}",
+  "report.thanks.take_action": "Aici poți controla ceea ce vezi pe Mastodon:",
+  "report.thanks.take_action_actionable": "Cât timp consultăm raportarea ta, poți să iei măsuri împotriva @{name}:",
+  "report.thanks.title": "Nu vrei să vezi aceste lucruri?",
+  "report.thanks.title_actionable": "Îți mulțumim pentru raportare, o vom analiza în curând.",
+  "report.unfollow": "Dezabonează-te de la @{name}",
+  "report.unfollow_explanation": "Ești abonat acestui cont. Pentru a nu-i mai vedea postările în cronologia ta principală, dezabonează-te.",
+  "report_notification.attached_statuses": "{count, plural, one {o postare legată} few {{count} postări legate} other {{count} de postări legate}}",
+  "report_notification.categories.other": "Altele",
+  "report_notification.categories.spam": "Mesaje nedorite",
+  "report_notification.categories.violation": "Încălcare a regulilor",
+  "report_notification.open": "Deschide raportarea",
   "search.placeholder": "Caută",
+  "search.search_or_paste": "Caută sau lipește un URL",
   "search_popout.search_format": "Formate pentru căutare avansată",
   "search_popout.tips.full_text": "Textele simple returnează postări pe care le-ai scris, favorizat, impulsionat, sau în care sunt menționate, deasemenea și utilizatorii sau hashtag-urile care se potrivesc.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Textele simple returnează nume, nume de utilizatori și hashtag-urile care se potrivesc",
   "search_popout.tips.user": "utilizator",
   "search_results.accounts": "Persoane",
+  "search_results.all": "Toate",
   "search_results.hashtags": "Hashtag-uri",
+  "search_results.nothing_found": "Nu am putut găsi nimic care să corespundă termenilor de căutare",
   "search_results.statuses": "Postări",
   "search_results.statuses_fts_disabled": "Căutarea de postări după conținutul lor nu este activată pe acest server.",
+  "search_results.title": "Caută „{q}”",
   "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultate}}",
+  "server_banner.about_active_users": "Persoane care au folosit acest server în ultimele 30 de zile (Utilizatori Lunari Activi)",
+  "server_banner.active_users": "utilizatori activi",
+  "server_banner.administered_by": "Administrat de:",
+  "server_banner.introduction": "{domain} face parte din rețeaua socială descentralizată alimentată de {mastodon}.",
+  "server_banner.learn_more": "Află mai multe",
+  "server_banner.server_stats": "Statisticile serverului:",
+  "sign_in_banner.create_account": "Creează-ți un cont",
+  "sign_in_banner.sign_in": "Conectează-te",
+  "sign_in_banner.text": "Conectează-te pentru a te abona la profiluri și haștaguri, pentru a aprecia, distribui și a răspunde postărilor, sau interacționează folosindu-ți contul de pe un alt server.",
   "status.admin_account": "Deschide interfața de moderare pentru @{name}",
   "status.admin_status": "Deschide această stare în interfața de moderare",
   "status.block": "Blochează pe @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Șterge",
   "status.detailed_status": "Conversația detaliată",
   "status.direct": "Mesaj direct către @{name}",
+  "status.edit": "Modifică",
+  "status.edited": "Modificat în data de {date}",
+  "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
   "status.embed": "Înglobează",
   "status.favourite": "Favorite",
+  "status.filter": "Filtrează această postare",
   "status.filtered": "Sortate",
+  "status.hide": "Ascunde postarea",
+  "status.history.created": "creată de {name} pe {date}",
+  "status.history.edited": "modificată de {name} pe {date}",
   "status.load_more": "Încarcă mai multe",
   "status.media_hidden": "Media ascunsă",
   "status.mention": "Menționează pe @{name}",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "Nimeni nu a impulsionat această postare până acum. Când cineva o va face, va apărea aici.",
   "status.redraft": "Șterge și adaugă la ciorne",
   "status.remove_bookmark": "Îndepărtează marcajul",
+  "status.replied_to": "Răspunde-i lui {name}",
   "status.reply": "Răspunde",
   "status.replyAll": "Răspunde la discuție",
   "status.report": "Raportează pe @{name}",
   "status.sensitive_warning": "Conținut sensibil",
   "status.share": "Distribuie",
+  "status.show_filter_reason": "Afișează oricum",
   "status.show_less": "Arată mai puțin",
   "status.show_less_all": "Arată mai puțin pentru toți",
   "status.show_more": "Arată mai mult",
   "status.show_more_all": "Arată mai mult pentru toți",
-  "status.show_thread": "Arată discuția",
+  "status.show_original": "Afișează originalul",
+  "status.translate": "Traduce",
+  "status.translated_from_with": "Tradus din {lang} folosind serviciile {provider}",
   "status.uncached_media_warning": "Indisponibil",
   "status.unmute_conversation": "Repornește conversația",
   "status.unpin": "Eliberează din profil",
+  "subscribed_languages.lead": "Doar postări în limbile selectate vor apărea în cronologia ta principală după ce efectuezi modificarea. Alege „niciuna” pentru a primi postări în orice limbă.",
+  "subscribed_languages.save": "Salvează modificările",
+  "subscribed_languages.target": "Modifică limbile abonate pentru {target}",
   "suggestions.dismiss": "Omite sugestia",
   "suggestions.header": "Ai putea fi interesat de…",
   "tabs_bar.federated_timeline": "Global",
   "tabs_bar.home": "Acasă",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificări",
-  "tabs_bar.search": "Căutare",
-  "time_remaining.days": "{number, plural, one {# zi} other {# zile}} rămase",
-  "time_remaining.hours": "{number, plural, one {# oră} other {# ore}} rămase",
-  "time_remaining.minutes": "{number, plural, one {# minut} other {# minute}} rămase",
+  "time_remaining.days": "{number, plural, one {o zi rămasă} few {# zile rămase} other {# de zile rămase}}",
+  "time_remaining.hours": "{number, plural, one {o oră rămasă} few {# ore rămase} other {# de ore rămase}}",
+  "time_remaining.minutes": "{number, plural, one {un minut rămas} few {# minute rămase} other {# de minute rămase}}",
   "time_remaining.moments": "Momente rămase",
-  "time_remaining.seconds": "{number, plural, one {# secundă} other {# secunde}} rămase",
+  "time_remaining.seconds": "{number, plural, one {o secundă rămasă} few {# secunde rămase} other {# de secunde rămase}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} de la alte servere nu sunt afișate.",
   "timeline_hint.resources.followers": "Urmăritori",
   "timeline_hint.resources.follows": "Urmăriri",
   "timeline_hint.resources.statuses": "Postări mai vechi",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoană postează} other {{counter} persoane postează}}",
+  "trends.counter_by_accounts": "{count, plural, one {o persoană} few {{counter} persoane} other {{counter} de persoane}} în {days, plural, one {ultima zi} few {ultimele {days} zile} other {ultimele {days} de zile}}",
   "trends.trending_now": "În tendință acum",
   "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.",
   "units.short.billion": "{count}Mld",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
   "upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
   "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
+  "upload_form.description_missing": "Nicio descriere adăugată",
   "upload_form.edit": "Modifică",
   "upload_form.thumbnail": "Schimbă miniatura",
   "upload_form.undo": "Șterge",
   "upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
   "upload_modal.analyzing_picture": "Se analizează imaginea…",
   "upload_modal.apply": "Aplică",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Se aplică…",
   "upload_modal.choose_image": "Alege imaginea",
   "upload_modal.description_placeholder": "Vând muzică de jazz și haine de bun-gust în New-York și Quebec la preț fix",
   "upload_modal.detect_text": "Detectare text din imagine",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Se pregătește OCR…",
   "upload_modal.preview_label": "Previzualizare ({ratio})",
   "upload_progress.label": "Se încarcă...",
+  "upload_progress.processing": "Se procesează…",
   "video.close": "Închide video",
   "video.download": "Descarcă fișierul",
   "video.exit_fullscreen": "Ieși din modul ecran complet",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 30abbc0c2..7d28a5e43 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -1,70 +1,104 @@
 {
+  "about.blocks": "Модерируемые серверы",
+  "about.contact": "Связаться:",
+  "about.disclaimer": "Mastodon — свободное программное обеспечение с открытым исходным кодом и торговая марка Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Причина не указана",
+  "about.domain_blocks.preamble": "Mastodon обычно позволяет просматривать содержимое и взаимодействовать с другими пользователями любых серверов в Федиверсе. Вот исключения, сделанные конкретно для этого сервера.",
+  "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и контент с этого сервера, если вы явно не будете их искать или не подпишетесь на них.",
+  "about.domain_blocks.silenced.title": "Ограничивается",
+  "about.domain_blocks.suspended.explanation": "Никакие данные с этого сервера не будут обрабатываться, храниться или обмениваться, что делает невозможным любое взаимодействие или связь с пользователями с этого сервера.",
+  "about.domain_blocks.suspended.title": "Заблокирован",
+  "about.not_available": "Эта информация не указана на данном сервере.",
+  "about.powered_by": "Децентрализованная социальная сеть на базе {mastodon}",
+  "about.rules": "Правила сервера",
   "account.account_note_header": "Заметка",
   "account.add_or_remove_from_list": "Управление списками",
   "account.badges.bot": "Бот",
   "account.badges.group": "Группа",
   "account.block": "Заблокировать @{name}",
   "account.block_domain": "Заблокировать {domain}",
-  "account.blocked": "Заблокирован(а)",
+  "account.blocked": "Заблокировано",
   "account.browse_more_on_origin_server": "Посмотреть в оригинальном профиле",
-  "account.cancel_follow_request": "Отменить запрос",
+  "account.cancel_follow_request": "Отозвать запрос на подписку",
   "account.direct": "Написать @{name}",
-  "account.disable_notifications": "Отключить уведомления от @{name}",
+  "account.disable_notifications": "Не уведомлять о постах от @{name}",
   "account.domain_blocked": "Домен заблокирован",
   "account.edit_profile": "Редактировать профиль",
-  "account.enable_notifications": "Включить уведомления для @{name}",
+  "account.enable_notifications": "Уведомлять о постах от @{name}",
   "account.endorse": "Рекомендовать в профиле",
+  "account.featured_tags.last_status_at": "Последний пост {date}",
+  "account.featured_tags.last_status_never": "Нет постов",
+  "account.featured_tags.title": "Избранные хэштеги {name}",
   "account.follow": "Подписаться",
   "account.followers": "Подписчики",
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
   "account.followers_counter": "{count, plural, one {{counter} подписчик} many {{counter} подписчиков} other {{counter} подписчика}}",
+  "account.following": "Подписки",
   "account.following_counter": "{count, plural, one {{counter} подписка} many {{counter} подписок} other {{counter} подписки}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
   "account.follows_you": "Подписан(а) на вас",
+  "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
-  "account.joined": "Зарегистрирован(а) с {date}",
-  "account.last_status": "Последняя активность",
+  "account.joined_short": "Присоединился",
+  "account.languages": "Изменить языки подписки",
   "account.link_verified_on": "Владение этой ссылкой было проверено {date}",
   "account.locked_info": "Это закрытый аккаунт. Его владелец вручную одобряет подписчиков.",
   "account.media": "Медиа",
   "account.mention": "Упомянуть @{name}",
-  "account.moved_to": "Ищите {name} здесь:",
+  "account.moved_to": "У {name} теперь новый аккаунт:",
   "account.mute": "Игнорировать @{name}",
-  "account.mute_notifications": "Скрыть уведомления от @{name}",
+  "account.mute_notifications": "Игнорировать уведомления от @{name}",
   "account.muted": "Игнорируется",
-  "account.never_active": "Никогда",
+  "account.open_original_page": "Открыть исходную страницу",
   "account.posts": "Посты",
   "account.posts_with_replies": "Посты и ответы",
-  "account.report": "Жалоба №{name}",
+  "account.report": "Пожаловаться на @{name}",
   "account.requested": "Ожидает подтверждения. Нажмите для отмены запроса",
+  "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} пост} many {{counter} постов} other {{counter} поста}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
+  "account.unblock_short": "Разблокировать",
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unfollow": "Отписаться",
   "account.unmute": "Убрать {name} из игнорируемых",
   "account.unmute_notifications": "Показывать уведомления от @{name}",
+  "account.unmute_short": "Не игнорировать",
   "account_note.placeholder": "Текст заметки",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Уровень удержания пользователей после регистрации, в днях",
+  "admin.dashboard.monthly_retention": "Уровень удержания пользователей после регистрации, в месяцах",
+  "admin.dashboard.retention.average": "Среднее",
+  "admin.dashboard.retention.cohort": "Месяц регистрации",
+  "admin.dashboard.retention.cohort_size": "Новые пользователи",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Вы выполняете действие слишком часто",
+  "alert.rate_limited.title": "Ограничение количества запросов",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Упс!",
   "announcement.announcement": "Объявление",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(не обработан)",
+  "audio.hide": "Скрыть аудио",
   "autosuggest_hashtag.per_week": "{count} / неделю",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
-  "bundle_column_error.body": "Что-то пошло не так при загрузке этого компонента.",
+  "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
+  "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
+  "bundle_column_error.error.title": "О нет!",
+  "bundle_column_error.network.body": "При загрузке этой страницы произошла ошибка. Это может быть связано с Вашим Интернет-соединением или неполадками на сервере.",
+  "bundle_column_error.network.title": "Ошибка сети",
   "bundle_column_error.retry": "Попробовать снова",
-  "bundle_column_error.title": "Ошибка сети",
+  "bundle_column_error.return": "Вернуться на главную",
+  "bundle_column_error.routing.body": "Запрошенная страница не найдена. Вы уверены, что URL в адресной строке правильный?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Закрыть",
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
+  "closed_registrations.other_server_instructions": "Поскольку Mastodon децентрализован, вы можете создать учетную запись на другом сервере и всё ещё взаимодействовать с этим сервером.",
+  "closed_registrations_modal.description": "Создание учетной записи на {domain} в настоящее время невозможно, но имейте в виду, что для использования Mastodon вам не нужен аккаунт именно на {domain}.",
+  "closed_registrations_modal.find_another_server": "Найти другой сервер",
+  "closed_registrations_modal.preamble": "Mastodon децентрализован, поэтому независимо от того, где вы создадите свою учетную запись, вы сможете следить и взаимодействовать с кем угодно на этом сервере. Вы даже можете разместить свой собственный сервер!",
+  "closed_registrations_modal.title": "Регистрация в Mastodon",
+  "column.about": "О проекте",
   "column.blocks": "Заблокированные пользователи",
   "column.bookmarks": "Закладки",
   "column.community": "Локальная лента",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Только локальные",
   "community.column_settings.media_only": "Только с медиафайлами",
   "community.column_settings.remote_only": "Только удалённые",
-  "compose_form.direct_message_warning": "Адресованные посты отправляются и видны только упомянутым в них пользователям.",
+  "compose.language.change": "Изменить язык",
+  "compose.language.search": "Поиск языков...",
   "compose_form.direct_message_warning_learn_more": "Подробнее",
+  "compose_form.encryption_warning": "Посты в Mastodon не защищены сквозным шифрованием. Не делитесь конфиденциальной информацией через Mastodon.",
   "compose_form.hashtag_warning": "Так как этот пост не публичный, он не отобразится в поиске по хэштегам.",
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Убрать этот вариант",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.publish": "Запостить",
+  "compose_form.publish": "Опубликовать",
+  "compose_form.publish_form": "Опубликовать",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Сохранить",
   "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
   "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
   "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
@@ -114,14 +152,16 @@
   "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
   "confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",
+  "confirmations.cancel_follow_request.confirm": "Отменить запрос",
+  "confirmations.cancel_follow_request.message": "Вы уверены, что хотите отозвать свой запрос на подписку {name}?",
   "confirmations.delete.confirm": "Удалить",
   "confirmations.delete.message": "Вы уверены, что хотите удалить этот пост?",
   "confirmations.delete_list.confirm": "Удалить",
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Отменить",
+  "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
   "confirmations.domain_block.confirm": "Да, заблокировать узел",
-  "confirmations.domain_block.message": "Вы точно уверены, что хотите скрыть все посты с узла {domain}? В большинстве случаев пары блокировок и скрытий вполне достаточно.\n\nПри блокировке узла, вы перестанете получать уведомления оттуда, все посты будут скрыты из публичных лент, а подписчики убраны.",
+  "confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.mute.confirm": "Игнорировать",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
   "conversation.with": "С {names}",
+  "copypaste.copied": "Скопировано",
+  "copypaste.copy": "Скопировать",
   "directory.federated": "Со всей федерации",
   "directory.local": "Только с {domain}",
   "directory.new_arrivals": "Новички",
   "directory.recently_active": "Недавно активные",
+  "disabled_account_banner.account_settings": "Настройки учётной записи",
+  "disabled_account_banner.text": "Ваша учётная запись {disabledAccount} в настоящее время отключена.",
+  "dismissable_banner.community_timeline": "Это самые последние публичные сообщения от людей, чьи учетные записи размещены в {domain}.",
+  "dismissable_banner.dismiss": "Закрыть",
+  "dismissable_banner.explore_links": "Об этих новостях прямо сейчас говорят люди на этом и других серверах децентрализованной сети.",
+  "dismissable_banner.explore_statuses": "Эти сообщения с этого и других серверов в децентрализованной сети сейчас набирают популярность на этом сервере.",
+  "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
+  "dismissable_banner.public_timeline": "Это самые последние публичные посты от людей на этом и других серверах децентрализованной сети, о которых знает этот сервер.",
   "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
+  "emoji_button.clear": "Очистить",
   "emoji_button.custom": "С этого узла",
   "emoji_button.flags": "Флаги",
   "emoji_button.food": "Еда и напитки",
@@ -165,6 +216,7 @@
   "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
   "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
   "empty_column.domain_blocks": "Скрытых доменов пока нет.",
+  "empty_column.explore_statuses": "Нет актуального. Проверьте позже!",
   "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.",
   "empty_column.favourites": "Никто ещё не добавил этот пост в «Избранное». Как только кто-то это сделает, это отобразится здесь.",
   "empty_column.follow_recommendations": "Похоже, у нас нет предложений для вас. Вы можете попробовать поискать людей, которых уже знаете, или изучить актуальные хэштеги.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Попробуйте их отключить и перезагрузить страницу. Если это не поможет, вы по-прежнему сможете войти в Mastodon через другой браузер или приложение.",
   "errors.unexpected_crash.copy_stacktrace": "Скопировать диагностическую информацию",
   "errors.unexpected_crash.report_issue": "Сообщить о проблеме",
+  "explore.search_results": "Результаты поиска",
+  "explore.suggested_follows": "Для вас",
+  "explore.title": "Обзор",
+  "explore.trending_links": "Новости",
+  "explore.trending_statuses": "Посты",
+  "explore.trending_tags": "Хэштеги",
+  "filter_modal.added.context_mismatch_explanation": "Эта категория не применяется к контексту, в котором вы получили доступ к этому посту. Если вы хотите, чтобы пост был отфильтрован в этом контексте, вам придётся отредактировать фильтр.",
+  "filter_modal.added.context_mismatch_title": "Несоответствие контекста!",
+  "filter_modal.added.expired_explanation": "Эта категория фильтра устарела, вам нужно изменить дату окончания фильтра, чтобы применить его.",
+  "filter_modal.added.expired_title": "Истёкший фильтр!",
+  "filter_modal.added.review_and_configure": "Для просмотра и настройки этой категории фильтра, перейдите в {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Настройки фильтра",
+  "filter_modal.added.settings_link": "страница настроек",
+  "filter_modal.added.short_explanation": "Этот пост был добавлен в следующую категорию фильтра: {title}.",
+  "filter_modal.added.title": "Фильтр добавлен!",
+  "filter_modal.select_filter.context_mismatch": "не применяется к этому контексту",
+  "filter_modal.select_filter.expired": "истекло",
+  "filter_modal.select_filter.prompt_new": "Новая категория: {name}",
+  "filter_modal.select_filter.search": "Поиск или создание",
+  "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
+  "filter_modal.select_filter.title": "Фильтровать этот пост",
+  "filter_modal.title.status": "Фильтровать пост",
   "follow_recommendations.done": "Готово",
   "follow_recommendations.heading": "Подпишитесь на людей, чьи посты вы бы хотели видеть. Вот несколько предложений.",
   "follow_recommendations.lead": "Посты от людей, на которых вы подписаны, будут отображаться в вашей домашней ленте в хронологическом порядке. Не бойтесь ошибиться — вы так же легко сможете отписаться от них в любое время!",
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
-  "follow_requests.unlocked_explanation": "Этот запрос отправлен с учётной записи, для которой администрация {domain} включила ручную проверку подписок.",
+  "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
+  "footer.about": "О проекте",
+  "footer.directory": "Каталог профилей",
+  "footer.get_app": "Скачать приложение",
+  "footer.invite": "Пригласить людей",
+  "footer.keyboard_shortcuts": "Сочетания клавиш",
+  "footer.privacy_policy": "Политика конфиденциальности",
+  "footer.source_code": "Исходный код",
   "generic.saved": "Сохранено",
-  "getting_started.developers": "Разработчикам",
-  "getting_started.directory": "Каталог профилей",
-  "getting_started.documentation": "Документация",
-  "getting_started.heading": "Добро пожаловать",
-  "getting_started.invite": "Пригласить людей",
-  "getting_started.open_source_notice": "Mastodon — сервис с открытым исходным кодом. Вы можете внести вклад или сообщить о проблемах на GitHub: {github}.",
-  "getting_started.security": "Безопасность",
-  "getting_started.terms": "Условия использования",
+  "getting_started.heading": "Начать",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Любой из списка",
   "hashtag.column_settings.tag_mode.none": "Ни один из списка",
   "hashtag.column_settings.tag_toggle": "Включить дополнительные теги для этой колонки",
+  "hashtag.follow": "Подписаться на новые посты",
+  "hashtag.unfollow": "Отписаться",
   "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
   "home.hide_announcements": "Скрыть объявления",
   "home.show_announcements": "Показать объявления",
+  "interaction_modal.description.favourite": "С учётной записью Mastodon, вы можете добавить этот пост в избранное, чтобы сохранить его на будущее и дать автору знать, что пост вам понравился.",
+  "interaction_modal.description.follow": "С учётной записью Mastodon вы можете подписаться на {name}, чтобы получать их посты в своей домашней ленте.",
+  "interaction_modal.description.reblog": "С учётной записью Mastodon, вы можете продвинуть этот пост, чтобы поделиться им со своими подписчиками.",
+  "interaction_modal.description.reply": "Вы можете ответить на этот пост с учётной записью Mastodon.",
+  "interaction_modal.on_another_server": "На другом сервере",
+  "interaction_modal.on_this_server": "На этом сервере",
+  "interaction_modal.other_server_instructions": "Скопируйте и вставьте этот URL в поле поиска вашего любимого приложения Mastodon или веб-интерфейс вашего сервера Mastodon.",
+  "interaction_modal.preamble": "Поскольку Mastodon децентрализован, вы можете использовать существующую учётную запись, размещенную на другом сервере Mastodon или совместимой платформе, если у вас нет учётной записи на этом сервере.",
+  "interaction_modal.title.favourite": "Добавить пост {name} в избранное",
+  "interaction_modal.title.follow": "Подписаться на {name}",
+  "interaction_modal.title.reblog": "Продвинуть публикацию {name}",
+  "interaction_modal.title.reply": "Ответить на пост {name}",
   "intervals.full.days": "{number, plural, one {# день} few {# дня} other {# дней}}",
   "intervals.full.hours": "{number, plural, one {# час} few {# часа} other {# часов}}",
   "intervals.full.minutes": "{number, plural, one {# минута} few {# минуты} other {# минут}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "фокус на одном из столбцов",
   "keyboard_shortcuts.compose": "фокус на поле ввода",
   "keyboard_shortcuts.description": "Описание",
-  "keyboard_shortcuts.direct": "чтобы показать колонку личных сообщений",
+  "keyboard_shortcuts.direct": "чтобы открыть колонку с личными сообщениями",
   "keyboard_shortcuts.down": "вниз по списку",
   "keyboard_shortcuts.enter": "открыть пост",
   "keyboard_shortcuts.favourite": "в избранное",
@@ -233,7 +321,7 @@
   "keyboard_shortcuts.legend": "показать это окно",
   "keyboard_shortcuts.local": "перейти к локальной ленте",
   "keyboard_shortcuts.mention": "упомянуть автора поста",
-  "keyboard_shortcuts.muted": "открыть список игнорируемых",
+  "keyboard_shortcuts.muted": "Открыть список игнорируемых",
   "keyboard_shortcuts.my_profile": "перейти к своему профилю",
   "keyboard_shortcuts.notifications": "перейти к уведомлениям",
   "keyboard_shortcuts.open_media": "открыть вложение",
@@ -243,9 +331,9 @@
   "keyboard_shortcuts.requests": "перейти к запросам на подписку",
   "keyboard_shortcuts.search": "перейти к поиску",
   "keyboard_shortcuts.spoilers": "показать/скрыть поле предупреждения о содержании",
-  "keyboard_shortcuts.start": "перейти к разделу \"добро пожаловать\"",
+  "keyboard_shortcuts.start": "Перейти к разделу \"Начать\"",
   "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
-  "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
+  "keyboard_shortcuts.toggle_sensitivity": "Показать/скрыть медиафайлы",
   "keyboard_shortcuts.toot": "начать писать новый пост",
   "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
   "keyboard_shortcuts.up": "вверх по списку",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Развернуть окно просмотра изображений",
   "lightbox.next": "Далее",
   "lightbox.previous": "Назад",
+  "limited_account_hint.action": "Все равно показать профиль",
+  "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
   "lists.account.add": "Добавить в список",
   "lists.account.remove": "Убрать из списка",
   "lists.delete": "Удалить список",
@@ -272,11 +362,12 @@
   "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "missing_indicator.label": "Не найдено",
   "missing_indicator.sublabel": "Запрашиваемый ресурс не найден",
+  "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
   "mute_modal.duration": "Продолжительность",
   "mute_modal.hide_notifications": "Скрыть уведомления от этого пользователя?",
   "mute_modal.indefinite": "Не определена",
-  "navigation_bar.apps": "Мобильные приложения",
-  "navigation_bar.blocks": "Список блокировки",
+  "navigation_bar.about": "О проекте",
+  "navigation_bar.blocks": "Заблокированные пользователи",
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальная лента",
   "navigation_bar.compose": "Создать новый пост",
@@ -284,20 +375,23 @@
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
   "navigation_bar.edit_profile": "Изменить профиль",
+  "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранное",
   "navigation_bar.filters": "Игнорируемые слова",
   "navigation_bar.follow_requests": "Запросы на подписку",
   "navigation_bar.follows_and_followers": "Подписки и подписчики",
-  "navigation_bar.info": "Об узле",
-  "navigation_bar.keyboard_shortcuts": "Сочетания клавиш",
   "navigation_bar.lists": "Списки",
   "navigation_bar.logout": "Выйти",
-  "navigation_bar.mutes": "Список игнорируемых пользователей",
+  "navigation_bar.mutes": "Игнорируемые пользователи",
   "navigation_bar.personal": "Личное",
   "navigation_bar.pins": "Закреплённые посты",
   "navigation_bar.preferences": "Настройки",
   "navigation_bar.public_timeline": "Глобальная лента",
+  "navigation_bar.search": "Поиск",
   "navigation_bar.security": "Безопасность",
+  "not_signed_in_indicator.not_signed_in": "Войдите в систему, чтобы получить доступ к ресурсу.",
+  "notification.admin.report": "{name} сообщил о {target}",
+  "notification.admin.sign_up": "{name} зарегистрирован",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
@@ -306,13 +400,16 @@
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
   "notification.status": "{name} только что запостил",
+  "notification.update": "{name} изменил(а) пост",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
+  "notifications.column_settings.admin.report": "Новые жалобы:",
+  "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
   "notifications.column_settings.favourite": "Ваш пост добавили в «избранное»:",
   "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",
-  "notifications.column_settings.filter_bar.show": "Отображать панель сортировки",
+  "notifications.column_settings.filter_bar.show_bar": "Отображать панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Отображать в списке",
   "notifications.column_settings.sound": "Проигрывать звук",
   "notifications.column_settings.status": "Новые посты:",
-  "notifications.column_settings.unread_markers.category": "Маркеры непрочитанных уведомлений",
+  "notifications.column_settings.unread_notifications.category": "Непрочитанные уведомления",
+  "notifications.column_settings.unread_notifications.highlight": "Выделять непрочитанные уведомления",
+  "notifications.column_settings.update": "Правки:",
   "notifications.filter.all": "Все",
   "notifications.filter.boosts": "Продвижения",
   "notifications.filter.favourites": "Отметки «избранного»",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# голос} few {# голоса} many {# голосов} other {# голосов}}",
   "poll.vote": "Голосовать",
   "poll.voted": "Вы проголосовали за этот вариант",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# голос} many {# голосов} other {# голоса}}",
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
   "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Адресованный",
+  "privacy.direct.short": "Только упомянутые",
   "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Приватный",
-  "privacy.public.long": "Показать в публичных лентах",
+  "privacy.private.short": "Для подписчиков",
+  "privacy.public.long": "Виден всем",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Не показывать в публичных лентах",
+  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
   "privacy.unlisted.short": "Скрытый",
+  "privacy_policy.last_updated": "Последнее обновление {date}",
+  "privacy_policy.title": "Политика конфиденциальности",
   "refresh": "Обновить",
   "regeneration_indicator.label": "Загрузка…",
   "regeneration_indicator.sublabel": "Один момент, мы подготавливаем вашу ленту!",
   "relative_time.days": "{number} д",
+  "relative_time.full.days": "{number, plural, one {# день} many {# дней} other {# дня}} назад",
+  "relative_time.full.hours": "{number, plural, one {# час} many {# часов} other {# часа}} назад",
+  "relative_time.full.just_now": "только что",
+  "relative_time.full.minutes": "{number, plural, one {# минуту} many {# минут} other {# минуты}} назад",
+  "relative_time.full.seconds": "{number, plural, one {# секунду} many {# секунд} other {# секунды}} назад",
   "relative_time.hours": "{number} ч",
   "relative_time.just_now": "только что",
   "relative_time.minutes": "{number} мин",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сегодня",
   "reply_indicator.cancel": "Отмена",
+  "report.block": "Заблокировать",
+  "report.block_explanation": "В перестаните видеть посты этого пользователя, а он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять что вы заблокировали его/её.",
+  "report.categories.other": "Другое",
+  "report.categories.spam": "Спам",
+  "report.categories.violation": "Содержимое нарушает одно или несколько правил узла",
+  "report.category.subtitle": "Выберите наиболее подходящее",
+  "report.category.title": "Расскажите нам, что не так с {type}",
+  "report.category.title_account": "этим профилем",
+  "report.category.title_status": "этим постом",
+  "report.close": "Готово",
+  "report.comment.title": "Есть ли что-нибудь ещё, что нам стоит знать?",
   "report.forward": "Переслать в {target}",
   "report.forward_hint": "Эта учётная запись расположена на другом узле. Отправить туда анонимную копию вашей жалобы?",
-  "report.hint": "Жалоба будет отправлена модераторам вашего узла. Вы также можете указать подробную причину жалобы ниже:",
-  "report.placeholder": "Комментарий",
+  "report.mute": "Игнорировать",
+  "report.mute_explanation": "Вы не будете видеть их посты. Они по-прежнему могут подписываться на вас и видеть ваши посты, но не будут знать, что они в списке игнорируемых.",
+  "report.next": "Далее",
+  "report.placeholder": "Дополнительные комментарии",
+  "report.reasons.dislike": "Мне не нравится",
+  "report.reasons.dislike_description": "Не хотел(а) бы видеть такой контент",
+  "report.reasons.other": "Другое",
+  "report.reasons.other_description": "Проблема не попадает ни под одну из категорий",
+  "report.reasons.spam": "Это спам",
+  "report.reasons.spam_description": "Вредоносные ссылки, фальшивое взаимодействие или повторяющиеся ответы",
+  "report.reasons.violation": "Нарушаются правила сервера",
+  "report.reasons.violation_description": "Вы знаете, что подобное нарушает определенные правила",
+  "report.rules.subtitle": "Выберите все подходящие варианты",
+  "report.rules.title": "Какие правила нарушены?",
+  "report.statuses.subtitle": "Выберите все подходящие варианты",
+  "report.statuses.title": "Выберите посты, которые относятся к вашей жалобе.",
   "report.submit": "Отправить",
   "report.target": "Жалоба на {target}",
+  "report.thanks.take_action": "Вот несколько опций управления тем, что вы видите в Mastodon:",
+  "report.thanks.take_action_actionable": "Пока мы рассматриваем его, вот действия, которые вы можете предпринять лично против @{name}:",
+  "report.thanks.title": "Не хотите видеть это?",
+  "report.thanks.title_actionable": "Спасибо за обращение, мы его рассмотрим.",
+  "report.unfollow": "Отписаться от @{name}",
+  "report.unfollow_explanation": "Вы подписаны на этого пользователя. Чтобы не видеть его/её посты в своей домашней ленте, отпишитесь от него/неё.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} сообщение} few {{count} сообщения} many {{count} сообщений} other {{count} сообщений}} вложено",
+  "report_notification.categories.other": "Прочее",
+  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.violation": "Нарушение правил",
+  "report_notification.open": "Открыть жалобу",
   "search.placeholder": "Поиск",
+  "search.search_or_paste": "Поиск (или вставьте URL)",
   "search_popout.search_format": "Продвинутый формат поиска",
   "search_popout.tips.full_text": "Поиск по простому тексту отобразит посты, которые вы написали, добавили в избранное, продвинули или в которых были упомянуты, а также подходящие имена пользователей и хэштеги.",
   "search_popout.tips.hashtag": "хэштег",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Простой ввод текста покажет совпадающие имена пользователей, отображаемые имена и хэштеги",
   "search_popout.tips.user": "пользователь",
   "search_results.accounts": "Люди",
+  "search_results.all": "Все",
   "search_results.hashtags": "Хэштеги",
+  "search_results.nothing_found": "Ничего не найдено по этому запросу",
   "search_results.statuses": "Посты",
-  "search_results.statuses_fts_disabled": "Поиск постов по их содержанию не поддерживается данным узлом Mastodon.",
+  "search_results.statuses_fts_disabled": "Поиск постов по их содержанию не поддерживается данным сервером Mastodon.",
+  "search_results.title": "Поиск {q}",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
+  "server_banner.about_active_users": "Люди, заходившие на этот сервер за последние 30 дней (ежемесячные активные пользователи)",
+  "server_banner.active_users": "активные пользователи",
+  "server_banner.administered_by": "Управляется:",
+  "server_banner.introduction": "{domain} является частью децентрализованной социальной сети, основанной на {mastodon}.",
+  "server_banner.learn_more": "Узнать больше",
+  "server_banner.server_stats": "Статистика сервера:",
+  "sign_in_banner.create_account": "Создать учётную запись",
+  "sign_in_banner.sign_in": "Войти",
+  "sign_in_banner.text": "Войдите, чтобы следить за профилями, хэштегами или избранным, делиться сообщениями и отвечать на них или взаимодействовать с вашей учётной записью на другом сервере.",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",
   "status.block": "Заблокировать @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Удалить",
   "status.detailed_status": "Подробный просмотр обсуждения",
   "status.direct": "Написать @{name}",
+  "status.edit": "Изменить",
+  "status.edited": "Последнее изменение: {date}",
+  "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "В избранное",
+  "status.filter": "Фильтровать этот пост",
   "status.filtered": "Отфильтровано",
+  "status.hide": "Скрыть пост",
+  "status.history.created": "{name} создал {date}",
+  "status.history.edited": "{name} отредактировал(а) {date}",
   "status.load_more": "Загрузить остальное",
   "status.media_hidden": "Файл скрыт",
   "status.mention": "Упомянуть @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.",
   "status.redraft": "Удалить и исправить",
   "status.remove_bookmark": "Убрать из закладок",
+  "status.replied_to": "Ответил(а) {name}",
   "status.reply": "Ответить",
   "status.replyAll": "Ответить всем",
   "status.report": "Пожаловаться",
   "status.sensitive_warning": "Содержимое «деликатного характера»",
   "status.share": "Поделиться",
+  "status.show_filter_reason": "Все равно показать",
   "status.show_less": "Свернуть",
   "status.show_less_all": "Свернуть все спойлеры в ветке",
   "status.show_more": "Развернуть",
   "status.show_more_all": "Развернуть все спойлеры в ветке",
-  "status.show_thread": "Показать обсуждение",
+  "status.show_original": "Показать оригинал",
+  "status.translate": "Перевод",
+  "status.translated_from_with": "Переведено с {lang}, используя {provider}",
   "status.uncached_media_warning": "Невозможно отобразить файл",
   "status.unmute_conversation": "Не игнорировать обсуждение",
   "status.unpin": "Открепить от профиля",
+  "subscribed_languages.lead": "Посты только на выбранных языках будут отображаться на вашей домашней странице и в списке лент после изменения. Выберите «Нет», чтобы получать посты на всех языках.",
+  "subscribed_languages.save": "Сохранить изменения",
+  "subscribed_languages.target": "Изменить языки подписки для {target}",
   "suggestions.dismiss": "Удалить предложение",
   "suggestions.header": "Вам может быть интересно…",
   "tabs_bar.federated_timeline": "Глобальная",
   "tabs_bar.home": "Главная",
   "tabs_bar.local_timeline": "Локальная",
   "tabs_bar.notifications": "Уведомления",
-  "tabs_bar.search": "Поиск",
   "time_remaining.days": "{number, plural, one {остался # день} few {осталось # дня} many {осталось # дней} other {осталось # дней}}",
   "time_remaining.hours": "{number, plural, one {остался # час} few {осталось # часа} many {осталось # часов} other {осталось # часов}}",
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "подписчиков",
   "timeline_hint.resources.follows": "подписки",
   "timeline_hint.resources.statuses": "прошлые посты",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} человек обсуждает} few {{counter} человека обсуждает} many {{counter} человек обсуждают} other {{counter} обсуждают}} ",
+  "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний день} few {последние {days} дня} other {последние {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
   "units.short.billion": "{count} млрд",
@@ -456,13 +624,14 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
+  "upload_form.description_missing": "Описание не добавлено",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
   "upload_form.undo": "Отменить",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
   "upload_modal.analyzing_picture": "Обработка изображения…",
   "upload_modal.apply": "Применить",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Применение…",
   "upload_modal.choose_image": "Выбрать изображение",
   "upload_modal.description_placeholder": "На дворе трава, на траве дрова",
   "upload_modal.detect_text": "Найти текст на картинке",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Подготовка распознования…",
   "upload_modal.preview_label": "Предпросмотр ({ratio})",
   "upload_progress.label": "Загрузка...",
+  "upload_progress.processing": "Обработка…",
   "video.close": "Закрыть видео",
   "video.download": "Загрузить файл",
   "video.exit_fullscreen": "Покинуть полноэкранный режим",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 1e496c3ec..cf21d3775 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "प्रशमितानि सर्वरः",
+  "about.contact": "सम्पर्कः:",
+  "about.disclaimer": "मास्तोडनस्ति निश्शुल्को विवृत्तस्तन्त्रांशः, मास्तोडन् gGmbH इत्यस्य च व्यापारमुद्रा।",
+  "about.domain_blocks.no_reason_available": "कारणं न लभ्यते",
+  "about.domain_blocks.preamble": "मास्तोडन्सामान्यतया फेडिभर्सि अन्यस्मात्सर्वरादुपयोक्तृभ्यस्सामग्रीं द्रष्टुम्, तैस्संवादं कर्तुञ्च शक्नोति । एतानि वर्जनानि अस्मिन्सर्वरि कृतास्सन्ति।",
+  "about.domain_blocks.silenced.explanation": "सामान्यतया अस्मात्सर्वरात्प्रोफाइल्सामग्रीञ्च न पश्यसि, यावत्स्पष्टतया तन्न पश्यसि अथवा अनुसरणं कृत्वा तस्मिन्विकल्पं न करोति ।",
+  "about.domain_blocks.silenced.title": "निबद्धम्",
+  "about.domain_blocks.suspended.explanation": "अस्मात्सर्वरः कोऽपि दत्तांशस्संसाधितः, संगृहीतो वा आदानप्रदानो वा न भविष्यति, येन अस्मात्सर्वरः उपयोक्तृभिः किमपि अन्तरक्रिया वा सञ्चारो वा असम्भवति।",
+  "about.domain_blocks.suspended.title": "प्रलम्बितः",
+  "about.not_available": "अस्मिन्सर्वरि अस्यास्सूचनायाः उपलभ्यो न कृतः।",
+  "about.powered_by": "अकेन्द्रीयितसामाजिकजालकर्म {mastodon} द्वारा आधारितम्",
+  "about.rules": "सर्वरो नियमाः",
   "account.account_note_header": "टीका",
   "account.add_or_remove_from_list": "युज्यतां / नश्यतां सूच्याः",
   "account.badges.bot": "यन्त्रम्",
@@ -7,68 +19,90 @@
   "account.block_domain": "अवरुध्यतां प्रदेशः {domain}",
   "account.blocked": "अवरुद्धम्",
   "account.browse_more_on_origin_server": "अधिकं मूलव्यक्तिगतविवरणे दृश्यताम्",
-  "account.cancel_follow_request": "अनुसरणानुरोधो नश्यताम्",
+  "account.cancel_follow_request": "अनुसरणयाचनामपनय",
   "account.direct": "प्रत्यक्षसन्देशः @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "यदा @{name} स्थापयति तदा माम्मा ज्ञापय",
   "account.domain_blocked": "प्रदेशो निषिद्धः",
   "account.edit_profile": "सम्पाद्यताम्",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "यदा @{name} स्थापयति तदा मां ज्ञापय",
   "account.endorse": "व्यक्तिगतविवरणे वैशिष्ट्यम्",
+  "account.featured_tags.last_status_at": "{date} दिने गतस्थापनम्",
+  "account.featured_tags.last_status_never": "न स्थापनम्",
+  "account.featured_tags.title": "{name} इत्यस्य विशेषहैस्टैगः",
   "account.follow": "अनुस्रियताम्",
   "account.followers": "अनुसर्तारः",
   "account.followers.empty": "नाऽनुसर्तारो वर्तन्ते",
   "account.followers_counter": "{count, plural, one {{counter} अनुसर्ता} two {{counter} अनुसर्तारौ} other {{counter} अनुसर्तारः}}",
+  "account.following": "अनुसरति",
   "account.following_counter": "{count, plural, one {{counter} अनुसृतः} two {{counter} अनुसृतौ} other {{counter} अनुसृताः}}",
   "account.follows.empty": "न कोऽप्यनुसृतो वर्तते",
   "account.follows_you": "त्वामनुसरति",
+  "account.go_to_profile": "प्रोफायिलं गच्छ",
   "account.hide_reblogs": "@{name} मित्रस्य प्रकाशनानि छिद्यन्ताम्",
-  "account.joined": "Joined {date}",
-  "account.last_status": "गतसक्रियता",
+  "account.joined_short": "युक्तम्",
+  "account.languages": "निवेशितभाषां परिवर्तय",
   "account.link_verified_on": "अन्तर्जालस्थानस्यास्य स्वामित्वं परीक्षितमासीत् {date} दिने",
   "account.locked_info": "एतस्या लेखायाः गुह्यता \"निषिद्ध\"इति वर्तते । स्वामी स्वयञ्चिनोति कोऽनुसर्ता भवितुमर्हतीति ।",
   "account.media": "सामग्री",
   "account.mention": "उल्लिख्यताम् @{name}",
-  "account.moved_to": "{name} अत्र प्रस्थापितम्:",
+  "account.moved_to": "{name} द्वारा सूचितं यत्तस्य नव एकाउण्ट् सद्यः अस्ति :",
   "account.mute": "निःशब्दम् @{name}",
   "account.mute_notifications": "@{name} सूचनाः निष्क्रियन्ताम्",
   "account.muted": "निःशब्दम्",
-  "account.never_active": "नैव कदापि",
+  "account.open_original_page": "मूलपृष्ठमुट्घाटय",
   "account.posts": "दौत्यानि",
   "account.posts_with_replies": "दौत्यानि प्रत्युत्तराणि च",
   "account.report": "आविद्यताम् @{name}",
   "account.requested": "स्वीकृतिः प्रतीक्ष्यते । नश्यतामित्यस्मिन्नुद्यतां निराकर्तुम् ।",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} मित्रस्य विवरणं विभाज्यताम्",
   "account.show_reblogs": "@{name} मित्रस्य प्रकाशनानि दृश्यन्ताम्",
   "account.statuses_counter": "{count, plural, one {{counter} दौत्यम्} two {{counter} दौत्ये} other {{counter} दौत्यानि}}",
   "account.unblock": "निषेधता नश्यताम् @{name}",
   "account.unblock_domain": "प्रदेशनिषेधता नश्यताम् {domain}",
+  "account.unblock_short": "अनवरुन्धि",
   "account.unendorse": "व्यक्तिगतविवरणे मा प्रकाश्यताम्",
   "account.unfollow": "नश्यतामनुसरणम्",
   "account.unmute": "सशब्दम् @{name}",
   "account.unmute_notifications": "@{name} सूचनाः सक्रियन्ताम्",
+  "account.unmute_short": "अनमूकीकुरु",
   "account_note.placeholder": "टीकायोजनार्थं नुद्यताम्",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "पञ्जीकरणस्यानन्तरमुपयोक्तृधारणदरो दिनेन",
+  "admin.dashboard.monthly_retention": "पञ्जीकरणस्यानन्तरमुपयोक्तृधारणदरो मासेन",
+  "admin.dashboard.retention.average": "मध्यत्वम्",
+  "admin.dashboard.retention.cohort": "पञ्जीकरणमासः",
+  "admin.dashboard.retention.cohort_size": "नवोपभोक्तारः",
   "alert.rate_limited.message": "{retry_time, time, medium}. समयात् पश्चात् प्रयतताम्",
   "alert.rate_limited.title": "सीमितगतिः",
   "alert.unexpected.message": "अनपेक्षितदोषो जातः ।",
   "alert.unexpected.title": "अरे !",
   "announcement.announcement": "उद्घोषणा",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(अप्रकृतम्)",
+  "audio.hide": "ध्वनिं प्रच्छादय",
   "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
   "boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
-  "bundle_column_error.body": "विषयस्याऽऽरोपणे कश्चिद्दोषो जातः",
+  "bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
+  "bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
+  "bundle_column_error.error.title": "हा हन्त!",
+  "bundle_column_error.network.body": "पृष्ठमिदं लोडङ्कर्तुं प्रयतमाने त्रुटिरभवत्। एतत्तव अन्तर्जालसम्पर्कस्य अथवा अस्य सर्वरोऽस्थायिन्यास्समस्यायाः कारणेन भवितुमर्हति।",
+  "bundle_column_error.network.title": "अन्तर्जालस्य त्रुटिः",
   "bundle_column_error.retry": "पुनः यतताम्",
-  "bundle_column_error.title": "जाले दोषः",
+  "bundle_column_error.return": "गृहं प्रतिगच्छ",
+  "bundle_column_error.routing.body": "अनुरोधितं पृष्ठं न लब्धम्। URL सङ्केतं सम्यगस्तीति कृपया दृढीकुरु।",
+  "bundle_column_error.routing.title": "४०४",
   "bundle_modal_error.close": "पिधीयताम्",
   "bundle_modal_error.message": "आरोपणे कश्चन दोषो जातः",
   "bundle_modal_error.retry": "पुनः यतताम्",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "निषिद्धभोक्तारः",
   "column.bookmarks": "पुटचिह्नानि",
   "column.community": "स्थानीयसमयतालिका",
-  "column.direct": "प्रत्यक्षसन्देशाः",
+  "column.direct": "Direct messages",
   "column.directory": "व्यक्तित्वानि दृश्यन्ताम्",
   "column.domain_blocks": "निषिद्धप्रदेशाः",
   "column.favourites": "प्रियाः",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "केवलं स्थानीयम्",
   "community.column_settings.media_only": "सामग्री केवलम्",
   "community.column_settings.remote_only": "दर्गमः केवलम्",
-  "compose_form.direct_message_warning": "दौत्यमेतत्केवलमुल्लेखितजनानां कृते वर्तते",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "अधिकं ज्ञायताम्",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "न कस्मिन्नपि प्रचलितवस्तुषु सूचितमिदं दौत्यम् । केवलं सार्वजनिकदौत्यानि प्रचलितवस्तुचिह्नेन अन्वेषयितुं शक्यते ।",
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि दौत्यानि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
   "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
   "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
-  "compose_form.publish": "दौत्यम्",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
   "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
   "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
   "confirmations.block.message": "निश्चयेनाऽवरोधो विधेयः {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "नश्यताम्",
   "confirmations.delete.message": "निश्चयेन दौत्यमिदं नश्यताम्?",
   "confirmations.delete_list.confirm": "नश्यताम्",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "पठितमित्यङ्क्यताम्",
   "conversation.open": "वार्तालापो दृश्यताम्",
   "conversation.with": "{names} जनैः साकम्",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "सुपरिचितं Fediverse इति स्थानात्",
   "directory.local": "{domain} प्रदेशात्केवलम्",
   "directory.new_arrivals": "नवामगमाः",
   "directory.recently_active": "नातिपूर्वं सक्रियः",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "दौत्यमेतत् स्वीयजालस्थाने स्थापयितुमधो लिखितो विध्यादेशो युज्यताम्",
   "embed.preview": "अत्रैवं दृश्यते तत्:",
   "emoji_button.activity": "आचरणम्",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "स्वीयानुकूलम्",
   "emoji_button.flags": "ध्वजाः",
   "emoji_button.food": "भोजनं पेयञ्च",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "नैकोऽप्युपभोक्ता निषिद्धो वर्तते",
   "empty_column.bookmarked_statuses": "नैकमपि पुटचिह्नयुक्तदौत्यानि सन्ति । यदा भविष्यति तदत्र दृश्यते ।",
   "empty_column.community": "स्थानीयसमयतालिका रिक्ता । सार्वजनिकत्वेनाऽत्र किमपि लिख्यताम् ।",
-  "empty_column.direct": "नैकोऽपि प्रत्यक्षसन्देशो वर्तते । यदा प्रेष्यते वा प्राप्यतेऽत्र दृश्यते",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "न निषिद्धप्रदेशाः सन्ति ।",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "न प्रियदौत्यानि सन्ति । यदा प्रीतिरित्यङ्क्यतेऽत्र दृश्यते ।",
   "empty_column.favourites": "नैतद्दौत्यं प्रियमस्ति कस्मै अपि । यदा कस्मै प्रियं भवति तदाऽत्र दृश्यते ।",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 339bbac09..6949c8cc0 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Serbidores moderados",
+  "about.contact": "Contatu:",
+  "about.disclaimer": "Mastodon est software de còdigu lìberu e unu màrchiu de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Rasone no a disponimentu",
+  "about.domain_blocks.preamble": "Mastodon ti permitit de bìdere su cuntenutu de utentes de cale si siat àteru serbidore de su fediversu. Custas sunt etzetziones fatas in custu serbidore ispetzìficu.",
+  "about.domain_blocks.silenced.explanation": "As a bìere perfilos e contenutos dae custu serbidore sceti chi ddos chircas o detzidas de ddu sighere.",
+  "about.domain_blocks.silenced.title": "Limitadu",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspèndidu",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Règulas de su serbidore",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
   "account.badges.bot": "Robot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Bloca su domìniu {domain}",
   "account.blocked": "Blocadu",
   "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
-  "account.cancel_follow_request": "Annulla rechesta de sighidura",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Messàgiu deretu a @{name}",
   "account.disable_notifications": "Non mi notìfiches prus cando @{name} pùblichet messàgios",
   "account.domain_blocked": "Domìniu blocadu",
   "account.edit_profile": "Modìfica profilu",
   "account.enable_notifications": "Notìfica·mi cando @{name} pùblicat messàgios",
   "account.endorse": "Cussìgia in su profilu tuo",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Sighi",
   "account.followers": "Sighiduras",
   "account.followers.empty": "Nemos sighit ancora custa persone.",
   "account.followers_counter": "{count, plural, one {{counter} sighidura} other {{counter} sighiduras}}",
+  "account.following": "Sighende",
   "account.following_counter": "{count, plural, one {Sighende a {counter}} other {Sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
   "account.follows_you": "Ti sighit",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
-  "account.joined": "At aderidu su {date}",
-  "account.last_status": "Ùrtima atividade",
+  "account.joined_short": "At aderidu",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Sa propiedade de custu ligòngiu est istada controllada su {date}",
   "account.locked_info": "S'istadu de riservadesa de custu contu est istadu cunfiguradu comente blocadu. Sa persone chi tenet sa propiedade revisionat a manu chie dda podet sighire.",
   "account.media": "Cuntenutu multimediale",
   "account.mention": "Mèntova a @{name}",
-  "account.moved_to": "{name} at cambiadu a:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Pone a @{name} a sa muda",
   "account.mute_notifications": "Disativa is notìficas de @{name}",
   "account.muted": "A sa muda",
-  "account.never_active": "Mai",
+  "account.open_original_page": "Open original page",
   "account.posts": "Publicatziones",
   "account.posts_with_replies": "Publicatziones e rispostas",
   "account.report": "Signala @{name}",
   "account.requested": "Abetende s'aprovatzione. Incarca pro annullare sa rechesta de sighidura",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "account.unblock": "Isbloca a @{name}",
   "account.unblock_domain": "Isbloca su domìniu {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Non cussiges in su profilu",
   "account.unfollow": "Non sigas prus",
   "account.unmute": "Torra a ativare a @{name}",
   "account.unmute_notifications": "Ativa notìficas pro @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Incarca pro agiùnghere una nota",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Cua s'àudio",
   "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
-  "bundle_column_error.body": "Faddina in su carrigamentu de custu cumponente.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Faddina de connessione",
   "bundle_column_error.retry": "Torra·bi a proare",
-  "bundle_column_error.title": "Faddina de connessione",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Serra",
   "bundle_modal_error.message": "Faddina in su carrigamentu de custu cumponente.",
   "bundle_modal_error.retry": "Torra·bi a proare",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "Informatziones",
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
   "column.community": "Lìnia de tempus locale",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Isceti locale",
   "community.column_settings.media_only": "Isceti multimediale",
   "community.column_settings.remote_only": "Isceti remotu",
-  "compose_form.direct_message_warning": "Custa publicatzione at a èssere imbiada isceti a is persones mentovadas.",
+  "compose.language.change": "Càmbia sa limba",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Àteras informatziones",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "Custa publicatzione no at a èssere ammustrada in peruna eticheta, dae chi no est listada. Isceti is publicatziones pùblicas podent èssere chircadas cun etichetas.",
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Boga custa optzione",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish": "Tut",
+  "compose_form.publish": "Pùblica",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
   "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
   "confirmations.block.message": "Seguru chi boles blocare {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Cantzella",
   "confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
   "confirmations.delete_list.confirm": "Cantzella",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Signala comente lèghidu",
   "conversation.open": "Ammustra arresonada",
   "conversation.with": "Cun {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "Dae unu fediversu connotu",
   "directory.local": "Isceti dae {domain}",
   "directory.new_arrivals": "Arribos noos",
   "directory.recently_active": "Cun atividade dae pagu",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.",
   "embed.preview": "At a aparèssere aici:",
   "emoji_button.activity": "Atividade",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Personalizadu",
   "emoji_button.flags": "Banderas",
   "emoji_button.food": "Mandigòngiu e bufòngiu",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "No as blocadu ancora nemos.",
   "empty_column.bookmarked_statuses": "Non tenes ancora peruna publicatzione in is marcadores. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
   "empty_column.community": "Sa lìnia de tempus locale est bòida. Iscrie inoghe pro cumintzare sa festa!",
-  "empty_column.direct": "Non tenes ancora perunu messàgiu deretu. Cando nd'as a imbiare o nd'as a retzire unu, at a èssere ammustradu inoghe.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Non tenes ancora perunu domìniu blocadu.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Non tenes ancora peruna publicatzione in is preferidos. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
   "empty_column.favourites": "Nemos at marcadu ancora custa publicatzione comente preferida. Cando calicunu dd'at a fàghere, at a èssere ammustrada inoghe.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Proa a ddos disabilitare e torra a carrigare sa pàgina. Si custu no acontzat su problema, podes chircare de impreare Mastodon in unu navigadore diferente o in un'aplicatzione nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Còpia stacktrace in punta de billete",
   "errors.unexpected_crash.report_issue": "Sinnala unu problema",
+  "explore.search_results": "Resurtados de sa chirca",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "iscadidu",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Fatu",
   "follow_recommendations.heading": "Sighi gente de chie boles bìdere is publicatziones! Càstia custos cussìgios.",
   "follow_recommendations.lead": "Is messàgios de gente a sa chi ses sighende ant a èssere ammustrados in òrdine cronològicu in sa lìnia de tempus printzipale tua. Non timas de fàghere errores, acabbare de sighire gente est fàtzile in cale si siat momentu!",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuda",
   "follow_requests.unlocked_explanation": "Fintzas si su contu tuo no est blocadu, su personale de {domain} at pensadu chi forsis bolias revisionare a manu is rechestas de custos contos.",
+  "footer.about": "Informatziones",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invita gente",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Polìtica de riservadesa",
+  "footer.source_code": "View source code",
   "generic.saved": "Sarvadu",
-  "getting_started.developers": "Iscuadra de isvilupu",
-  "getting_started.directory": "Diretòriu de profilos",
-  "getting_started.documentation": "Documentatzione",
   "getting_started.heading": "Comente cumintzare",
-  "getting_started.invite": "Invita gente",
-  "getting_started.open_source_notice": "Mastodon est de còdighe abertu. Bi podes contribuire o sinnalare faddinas in {github}.",
-  "getting_started.security": "Cunfiguratziones de su contu",
-  "getting_started.terms": "Cunditziones de su servìtziu",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sena {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Cale si siat de custos",
   "hashtag.column_settings.tag_mode.none": "Perunu de custos",
   "hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
+  "hashtag.follow": "Sighi su hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bàsicu",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
   "home.show_announcements": "Ammustra annùntzios",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "Podes arrespondere a custu post con una conta in Mastodon.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "In custu serbidore",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Sighi a {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Arresponde a su post de {name}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "pro atzentrare una publicatzione in una de is colunnas",
   "keyboard_shortcuts.compose": "pro atzentrare in s'àrea de cumpositzione de testu",
   "keyboard_shortcuts.description": "Descritzione",
-  "keyboard_shortcuts.direct": "pro abèrrere sa colunna de messàgios diretos",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "pro mòere in bàsciu in sa lista",
   "keyboard_shortcuts.enter": "pro abèrrere una publicatzione",
   "keyboard_shortcuts.favourite": "pro marcare comente a preferidu",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Ismànnia sa casella de visualizatzione de is immàgines",
   "lightbox.next": "Imbeniente",
   "lightbox.previous": "Pretzedente",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "Custu perfilu dd'ant cuadu is moderadores de {domain}.",
   "lists.account.add": "Agiunghe a sa lista",
   "lists.account.remove": "Boga dae sa lista",
   "lists.delete": "Cantzella sa lista",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
   "missing_indicator.label": "Perunu resurtadu",
   "missing_indicator.sublabel": "Resursa no agatada",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
   "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.apps": "Aplicatziones mòbiles",
+  "navigation_bar.about": "Informatziones",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "Lìnia de tempus locale",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
   "navigation_bar.edit_profile": "Modìfica profilu",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Preferidos",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
-  "navigation_bar.info": "Informatziones de su serbidore",
-  "navigation_bar.keyboard_shortcuts": "Teclas de atzessu diretu",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Essi",
   "navigation_bar.mutes": "Persones a sa muda",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Publicatziones apicadas",
   "navigation_bar.preferences": "Preferèntzias",
   "navigation_bar.public_timeline": "Lìnia de tempus federada",
+  "navigation_bar.search": "Chirca",
   "navigation_bar.security": "Seguresa",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} at marcadu sa publicatzione tua comente a preferida",
   "notification.follow": "{name} ti sighit",
   "notification.follow_request": "{name} at dimandadu de ti sighire",
@@ -306,13 +400,16 @@
   "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
   "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
   "notification.status": "{name} at publicadu cosa",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Lìmpia notìficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
   "notifications.column_settings.favourite": "Preferidos:",
   "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
   "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
-  "notifications.column_settings.filter_bar.show": "Ammustra",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "Sighiduras noas:",
   "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
   "notifications.column_settings.mention": "Mèntovos:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Ammustra in sa colunna",
   "notifications.column_settings.sound": "Reprodue unu sonu",
   "notifications.column_settings.status": "Publicatziones noas:",
-  "notifications.column_settings.unread_markers.category": "Marcadores de notìficas de lèghere",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Totus",
   "notifications.filter.boosts": "Cumpartziduras",
   "notifications.filter.favourites": "Preferidos",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
   "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Deretu",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Isceti pro chie ti sighit",
-  "privacy.public.long": "Visìbile pro chie si siat, ammustra in lìnias de tempus pùblicas",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.long": "Visìbile pro chie si siat, però no ammustres in lìnias de tempus pùblicas",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Esclùidu de sa lista",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
   "regeneration_indicator.sublabel": "Preparende sa lìnia de tempus printzipale tua.",
   "relative_time.days": "{number} dies a oe",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number} oras a immoe",
   "relative_time.just_now": "immoe",
   "relative_time.minutes": "{number} minutos a immoe",
   "relative_time.seconds": "{number} segundos a immoe",
   "relative_time.today": "oe",
   "reply_indicator.cancel": "Annulla",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Torra a imbiare a {target}",
   "report.forward_hint": "Custu contu est de un'àteru serbidore. Ddi boles imbiare puru una còpia anònima de custu informe?",
-  "report.hint": "S'informe at a èssere imbiadu a sa moderatzione de su serbidore. Podes frunire un'ispiegatzione de sa signalatzione tua de custu contu:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "Cummentos additzionales",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Imbia",
   "report.target": "Informende de {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Chirca",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Formadu de chirca avantzada",
   "search_popout.tips.full_text": "Testu sèmplitze pro agatare publicatziones chi as iscritu, marcadu comente a preferidas, cumpartzidu o chi t'ant mentovadu, e fintzas nòmines, nòmines de utente e etichetas.",
   "search_popout.tips.hashtag": "eticheta",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Testu sèmplitze pro agatare nòmines visualizados, nòmines de utente e etichetas",
   "search_popout.tips.user": "utente",
   "search_results.accounts": "Gente",
+  "search_results.all": "All",
   "search_results.hashtags": "Etichetas",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Publicatziones",
   "search_results.statuses_fts_disabled": "Sa chirca de publicatziones pro su cuntenutu issoro no est abilitada in custu serbidore de Mastodon.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {resurtadu} other {resurtados}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}",
   "status.admin_status": "Aberi custa publicatzione in s'interfache de moderatzione",
   "status.block": "Bloca a @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Cantzella",
   "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
   "status.direct": "Messàgiu deretu a @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Afissa",
   "status.favourite": "Preferidos",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtradu",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",
   "status.mention": "Mèntova a @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Nemos at ancora cumpartzidu custa publicatzione. Cando calicunu dd'at a fàghere, at a èssere ammustrada inoghe.",
   "status.redraft": "Cantzella e torra a iscrìere",
   "status.remove_bookmark": "Boga su sinnalibru",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Risponde",
   "status.replyAll": "Risponde a su tema",
   "status.report": "Sinnala @{name}",
   "status.sensitive_warning": "Cuntenutu sensìbile",
   "status.share": "Cumpartzi",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Ammustra·nde prus pagu",
   "status.show_less_all": "Ammustra·nde prus pagu pro totus",
   "status.show_more": "Ammustra·nde prus",
   "status.show_more_all": "Ammustra·nde prus pro totus",
-  "status.show_thread": "Ammustra su tema",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "No est a disponimentu",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
   "status.unpin": "Boga dae pitzu de su profilu",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Iscarta cussìgiu",
   "suggestions.header": "Est possìbile chi tèngias interessu in…",
   "tabs_bar.federated_timeline": "Federada",
   "tabs_bar.home": "Printzipale",
   "tabs_bar.local_timeline": "Locale",
   "tabs_bar.notifications": "Notìficas",
-  "tabs_bar.search": "Chirca",
   "time_remaining.days": "{number, plural, one {abarrat # die} other {abarrant # dies}}",
   "time_remaining.hours": "{number, plural, one {abarrat # ora} other {abarrant # oras}}",
   "time_remaining.minutes": "{number, plural, one {abarrat # minutu} other {abarrant # minutos}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Sighiduras",
   "timeline_hint.resources.follows": "Sighende",
   "timeline_hint.resources.statuses": "Publicatziones prus betzas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} chistionende",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Est tendèntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a èssere pèrdidu si essis dae Mastodon.",
   "units.short.billion": "{count}Mrd",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Non si permitit s'imbiu de archìvios in is sondàgios.",
   "upload_form.audio_description": "Descritzione pro persones cun pèrdida auditiva",
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
   "upload_form.undo": "Cantzella",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Ammaniende s'OCR…",
   "upload_modal.preview_label": "Previsualiza ({ratio})",
   "upload_progress.label": "Carrighende...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Serra su vìdeu",
   "video.download": "Iscàrriga archìviu",
   "video.exit_fullscreen": "Essi de ischermu in mannària prena",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
new file mode 100644
index 000000000..57c3b1c1c
--- /dev/null
+++ b/app/javascript/mastodon/locales/sco.json
@@ -0,0 +1,654 @@
+{
+  "about.blocks": "Moderatit servers",
+  "about.contact": "Contack:",
+  "about.disclaimer": "Mastodon is free, open-soorced saftware, an a trademairk o Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Raison no available",
+  "about.domain_blocks.preamble": "On the hail, Mastodon lats ye view content frae an interack wi uisers fae onie ither server in the fediverse.",
+  "about.domain_blocks.silenced.explanation": "Ye'll generally no see profiles an content frae this server, unless ye explicitly luik it up or opt intae it bi follaein.",
+  "about.domain_blocks.silenced.title": "Limitit",
+  "about.domain_blocks.suspended.explanation": "Nae data frae this server wull bi processed, stored or exchynged, makkin onie interaction or communication wi uisers frae this server no possible.",
+  "about.domain_blocks.suspended.title": "Suspendit",
+  "about.not_available": "This information haesnae been made available on this server.",
+  "about.powered_by": "Decentralised social media pooert bi {mastodon}",
+  "about.rules": "Server rules",
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remuive frae lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Dingie @{name}",
+  "account.block_domain": "Dingie domain {domain}",
+  "account.blocked": "Dingied",
+  "account.browse_more_on_origin_server": "Luik mair oan the oreeginal profile",
+  "account.cancel_follow_request": "Resile follae requeest",
+  "account.direct": "Direck message @{name}",
+  "account.disable_notifications": "Stap notifyin me whan @{name} posts",
+  "account.domain_blocked": "Domain dingied",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me whan @{name} posts",
+  "account.endorse": "Shaw oan profile",
+  "account.featured_tags.last_status_at": "Last post oan {date}",
+  "account.featured_tags.last_status_never": "Nae posts",
+  "account.featured_tags.title": "{name}'s hielichtit hashtags",
+  "account.follow": "Follae",
+  "account.followers": "Follaers",
+  "account.followers.empty": "Naebody follaes this uiser yit.",
+  "account.followers_counter": "{count, plural, one {{counter} Follaer} other {{counter} Follaers}}",
+  "account.following": "Follaein",
+  "account.following_counter": "{count, plural, one {{counter} Follaein} other {{counter} Follaein}}",
+  "account.follows.empty": "This uiser disnae follae oniebody yit.",
+  "account.follows_you": "Follaes ye",
+  "account.go_to_profile": "Gang tae profile",
+  "account.hide_reblogs": "Dinnae shaw heezes fae @{name}",
+  "account.joined_short": "Jynt",
+  "account.languages": "Chynge subscribed leids",
+  "account.link_verified_on": "Ainership o this link wis checked on {date}",
+  "account.locked_info": "This accoont privacy status is snibbed. The ainer picks wha kin follae them bi haun.",
+  "account.media": "Media",
+  "account.mention": "Menshie@{name}",
+  "account.moved_to": "{name} haes sayed thit their new accoont is noo:",
+  "account.mute": "Wheesht@{name}",
+  "account.mute_notifications": "Wheesht notifications frae @{name}",
+  "account.muted": "Whesht",
+  "account.open_original_page": "Open the furst page",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts an repones",
+  "account.report": "Clype @{name}",
+  "account.requested": "Haudin fir approval. Chap tae cancel follae request",
+  "account.requested_follow": "{name} has requested to follow you",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Shaw heezes frae @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Undingie @{name}",
+  "account.unblock_domain": "Undingie domain {domain}",
+  "account.unblock_short": "Undingie",
+  "account.unendorse": "Dinnae pit on profile",
+  "account.unfollow": "Unfollae",
+  "account.unmute": "Unwheesht @{name}",
+  "account.unmute_notifications": "Unwheesht notes frae @{name}",
+  "account.unmute_short": "Unwheesht",
+  "account_note.placeholder": "Chap tae eik note",
+  "admin.dashboard.daily_retention": "Uiser retention rate bi day efter signin-up",
+  "admin.dashboard.monthly_retention": "Uiser retention rate bi month efter signin-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Signin-up month",
+  "admin.dashboard.retention.cohort_size": "New uisers",
+  "alert.rate_limited.message": "Please hae anither shot efter {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limitit",
+  "alert.unexpected.message": "A error thit wisnae expectit happent.",
+  "alert.unexpected.title": "Crivvens!",
+  "announcement.announcement": "Annooncement",
+  "attachments_list.unprocessed": "(No processed)",
+  "audio.hide": "Stow audio",
+  "autosuggest_hashtag.per_week": "{count} a week",
+  "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
+  "bundle_column_error.error.title": "Aw naw!",
+  "bundle_column_error.network.body": "There wis a error whan gaun tae load this page. This cuid be doon tae a temporary snaffle wi yer internet connexion or wi this server.",
+  "bundle_column_error.network.title": "Netwirk error",
+  "bundle_column_error.retry": "Gie it anither shot",
+  "bundle_column_error.return": "Gae back hame",
+  "bundle_column_error.routing.body": "The requestit page cuidnae be fun. Are ye shair thit the URL in the addres baur is richt?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Shut",
+  "bundle_modal_error.message": "Somehin went wrang whilst loadin this component.",
+  "bundle_modal_error.retry": "Gie it anither shot",
+  "closed_registrations.other_server_instructions": "Seein Mastodon is decentralized ye kin mak a accoont on anither server an stull interact wi this ane.",
+  "closed_registrations_modal.description": "Makkin a accoont on {domain} isnae possible the noo, but mind ye dinnae need a accoont on {domain} specific for tae uise Mastodon.",
+  "closed_registrations_modal.find_another_server": "Fin anither server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, sae nae maitter whaur ye mak yer accoont, ye'll can follae an interack wi oniebody on this server. Ye kin even sel-host it!",
+  "closed_registrations_modal.title": "Signin up on Mastodon",
+  "column.about": "Aboot",
+  "column.blocks": "Dingied uisers",
+  "column.bookmarks": "Buikmairks",
+  "column.community": "Local timeline",
+  "column.direct": "Direck messages",
+  "column.directory": "Broose profiles",
+  "column.domain_blocks": "Dingied domains",
+  "column.favourites": "Best anes",
+  "column.follow_requests": "Follae requests",
+  "column.home": "Hame",
+  "column.lists": "Lists",
+  "column.mutes": "Wheesht uisers",
+  "column.notifications": "Notes",
+  "column.pins": "Preenit posts",
+  "column.public": "Federatit timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settins",
+  "column_header.moveLeft_settings": "Shift column tae the left",
+  "column_header.moveRight_settings": "Shift column tae the richt",
+  "column_header.pin": "Preen",
+  "column_header.show_settings": "Shaw settins",
+  "column_header.unpin": "Unpreen",
+  "column_subheading.settings": "Settins",
+  "community.column_settings.local_only": "Local ainly",
+  "community.column_settings.media_only": "Media ainly",
+  "community.column_settings.remote_only": "Remote ainly",
+  "compose.language.change": "Chynge Leid",
+  "compose.language.search": "Seirch leids...",
+  "compose_form.direct_message_warning_learn_more": "Lairn mair",
+  "compose_form.encryption_warning": "Posts on Mastodon isnae en-tae-en encryptit. Dinnae share onie sensitive information ower Mastodon.",
+  "compose_form.hashtag_warning": "This post wulnae be listit unner onie hashtag seein it is no listit. Ainly public posts kin be seirchit oot bi hashtag.",
+  "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
+  "compose_form.lock_disclaimer.lock": "lockit",
+  "compose_form.placeholder": "Whit's on yer mind?",
+  "compose_form.poll.add_option": "Pit in a chyce",
+  "compose_form.poll.duration": "Poll lenth",
+  "compose_form.poll.option_placeholder": "Chyce {number}",
+  "compose_form.poll.remove_option": "Tak oot this chyce",
+  "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
+  "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save chynges",
+  "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
+  "compose_form.spoiler.marked": "Tak aff the content warnin",
+  "compose_form.spoiler.unmarked": "Pit on a content warnin",
+  "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
+  "confirmation_modal.cancel": "Stap",
+  "confirmations.block.block_and_report": "Dingie & Clype",
+  "confirmations.block.confirm": "Dingie",
+  "confirmations.block.message": "Ye shair thit ye'r wantin tae dingie {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tak back yer request",
+  "confirmations.cancel_follow_request.message": "Ye shair thit ye'r wantin tae tak back yer request fir tae follae {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Ye shair thit ye'r wantin tae delete this post?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
+  "confirmations.discard_edit_media.confirm": "Fling awa",
+  "confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
+  "confirmations.domain_block.confirm": "Dingie the hail domain",
+  "confirmations.domain_block.message": "Ye a hunner percent shair thit ye'r wantin tae dingie the hail {domain}? In maist cases a haunfae tairgtit dingies an wheeshts are eneuch an preferit. Ye wullnae see content fae that domain in onie public timelines or in yer notes. Yer follaers fae that domain wull be taen awa.",
+  "confirmations.logout.confirm": "Log oot",
+  "confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
+  "confirmations.mute.confirm": "Wheesht",
+  "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.",
+  "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?",
+  "confirmations.redraft.confirm": "Delete an stert anew",
+  "confirmations.redraft.message": "Ye shuir thit ye'r wantin tae delete this post an stert again? Favourites an boosts'll be lost, an the replies tae the original post'll be orphant.",
+  "confirmations.reply.confirm": "Reply",
+  "confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?",
+  "confirmations.unfollow.confirm": "Unfollae",
+  "confirmations.unfollow.message": "Ye shuir thit ye'r wantin tae unfollae {name}?",
+  "conversation.delete": "Delete the conversation",
+  "conversation.mark_as_read": "Mairk as seen",
+  "conversation.open": "Luik at conversation",
+  "conversation.with": "Wi {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
+  "directory.federated": "Fae a kent fediverse",
+  "directory.local": "Fae {domain} ainly",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Active recent",
+  "disabled_account_banner.account_settings": "Accoont settins",
+  "disabled_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo.",
+  "dismissable_banner.community_timeline": "Here the maist recent public posts fae fowk thit's accoonts is hostit bi {domain}.",
+  "dismissable_banner.dismiss": "Pit awa",
+  "dismissable_banner.explore_links": "Thir news stories is bein talked aboot bi fowk on this an ither servers o the decentralized netwirk richt noo.",
+  "dismissable_banner.explore_statuses": "Thir posts fae this an ither servers in this decentralized netwirk ur gainin traction on this server richt noo.",
+  "dismissable_banner.explore_tags": "Thir hashtags is gaitherin traction amang the fowk on thit an ither servers o the decentralized netwirk richt noo.",
+  "dismissable_banner.public_timeline": "Thir's the maist recent public posts fae fowk on this an ither server o the decentralized netwirk thit this server kens aboot.",
+  "embed.instructions": "Embed this post on yer wabsteid bi copyin the code ablow.",
+  "embed.preview": "Here whit it'll luik lik:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Claer",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Fid & drink",
+  "emoji_button.label": "Pit in emoji",
+  "emoji_button.nature": "Naiture",
+  "emoji_button.not_found": "Nae matchin emoji fun",
+  "emoji_button.objects": "Objecks",
+  "emoji_button.people": "Fowk",
+  "emoji_button.recent": "Maist aften uised",
+  "emoji_button.search": "Seirch...",
+  "emoji_button.search_results": "Seirch results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Traivel & steidins",
+  "empty_column.account_suspended": "Accoont suspendit",
+  "empty_column.account_timeline": "Nae posts here!",
+  "empty_column.account_unavailable": "Profile isnae available",
+  "empty_column.blocks": "Ye huvnae dingied onie uisers yit.",
+  "empty_column.bookmarked_statuses": "Ye dinnae hae onie buikmairkt posts yit. Efter ye buikmairk ane, it'll shaw up here.",
+  "empty_column.community": "The loval timeline is toum. Screive socht public fir tae get gaun!",
+  "empty_column.direct": "Ye dinnae hae onie direck messages yit. Ance ye sen or get ane, it'll shaw up here.",
+  "empty_column.domain_blocks": "There nae dingied domains yit.",
+  "empty_column.explore_statuses": "Naethin is trendin the noo. Check back efter!",
+  "empty_column.favourited_statuses": "Ye dinnae hae onie favourite posts yit. Whan ye favourite ane, it'll shaw up here.",
+  "empty_column.favourites": "Naebody haes favouritit this post yit. Whan somebody dis, they'll shaw up here.",
+  "empty_column.follow_recommendations": "It luiks lik nae suggestions cuid be generatit fir ye. Ye kin try uisin seirch fir tae luik fir fowk ye wad mibbie ken, or splore uisin trendin hashtags.",
+  "empty_column.follow_requests": "Ye dinnae hae onie follaer requests yit. Whan ye get ane, it'll shaw up here.",
+  "empty_column.hashtag": "There naethin in this hashtag yit.",
+  "empty_column.home": "Yer hame timeline is toum! Follae mair fowk fir tae full it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There naethin in this list yit. Whan memmers o this list publish new posts, ye'll see them here.",
+  "empty_column.lists": "Ye dinnae hae onie lists yit. Ance ye mak ane, it'll shaw up here.",
+  "empty_column.mutes": "Ye'v no wheesht onie uisers yit.",
+  "empty_column.notifications": "Ye dinnae hae onie notes yit. Whan ither fowk interacks wi ye, ye'll see it here.",
+  "empty_column.public": "There naethin here! Scrieve socht public, or follae uisers fae ither servers fir tae full it up",
+  "error.unexpected_crash.explanation": "Doon tae a bug in wir code or a brooser compatibility maitter, this page cuidnae get displayed richt.",
+  "error.unexpected_crash.explanation_addons": "This page cannae be displayit richt. This error is maist lik tae be doon tae a brooser add-on or autimatic owersettin tools.",
+  "error.unexpected_crash.next_steps": "Gie refreshin the page a shot. Gin thon disnae help ye, ye kin mibbie stull be able tae uise Mastodon throu anither brooser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try oot pittin them aff an rejiggin the page. Gin thon disnae wirk, ye kin mibbie uise Mastodon on a different brooser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace tae yer clipboord",
+  "errors.unexpected_crash.report_issue": "Sen in a issue",
+  "explore.search_results": "Seirch finnins",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Splore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter caitegory disnae apply tae the context thit ye'v uised tae access this post. Gin ye'r wantin the post tae be filtert in this context tae, ye'll hae tae edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context disnae match!",
+  "filter_modal.added.expired_explanation": "This filter caitegory haes expirit, ye'll hae tae chynge the expiration date fir it tae apply.",
+  "filter_modal.added.expired_title": "Expirit filter!",
+  "filter_modal.added.review_and_configure": "Tae luik ower an configure this filter caitegort mair, awa tae the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settins",
+  "filter_modal.added.settings_link": "settins page",
+  "filter_modal.added.short_explanation": "This post haes been eikit tae the follaein filter caitegory: {title}.",
+  "filter_modal.added.title": "Filter pit on!",
+  "filter_modal.select_filter.context_mismatch": "disnae apply tae this context",
+  "filter_modal.select_filter.expired": "expirit",
+  "filter_modal.select_filter.prompt_new": "New caitegory: {name}",
+  "filter_modal.select_filter.search": "Seirch or mak",
+  "filter_modal.select_filter.subtitle": "Uise a awriddy existin caitegory or mak a new ane",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "Duin",
+  "follow_recommendations.heading": "Follae fowk thit ye'd want tae see posts fae! Here some suggestions.",
+  "follow_recommendations.lead": "Posts fae thaim thit ye follae wull shaw up in chronological order on yer hame feed. Dinnae be feart tae mak mistaks, ye kin unfollae fowk juist as easy onie tim!",
+  "follow_request.authorize": "Gie permission",
+  "follow_request.reject": "Dingie",
+  "follow_requests.unlocked_explanation": "Tho yer accoont isnae snibbed, the {domain} staff thocht ye'd mibbie want tae review follae requests fae thir accoonts bi haun.",
+  "footer.about": "Aboot",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite fowk",
+  "footer.keyboard_shortcuts": "Keyboord shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View the soorce code",
+  "generic.saved": "Saved",
+  "getting_started.heading": "Gettin stertit",
+  "hashtag.column_header.tag_mode.all": "an {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "athoot {additional}",
+  "hashtag.column_settings.select.no_options_message": "Nae suggestions fun",
+  "hashtag.column_settings.select.placeholder": "Pit in hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Aw o thir",
+  "hashtag.column_settings.tag_mode.any": "Onie o thir",
+  "hashtag.column_settings.tag_mode.none": "Naen o thir",
+  "hashtag.column_settings.tag_toggle": "Pit in mair hashtags fir this column",
+  "hashtag.follow": "Follae hashtag",
+  "hashtag.unfollow": "Unfollae hashtag",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Shaw boosts",
+  "home.column_settings.show_replies": "Shaw replies",
+  "home.hide_announcements": "Hide annooncements",
+  "home.show_announcements": "Shaw annooncements",
+  "interaction_modal.description.favourite": "Wi a accoont on Mastodon ye kinnfavourite this post fir tae let the writer ken thit ye like it an save it fir efter.",
+  "interaction_modal.description.follow": "Wi a accoont on Mastodon, ye kin follae {name} tae get their posts on yer hame feed.",
+  "interaction_modal.description.reblog": "Wi a accoont on Mastodon, ye kin heeze this post tae ahare it wi yer ain follaers.",
+  "interaction_modal.description.reply": "Wi a accoont on Mastodon, ye kin sen a repone tae this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy an paste this URL intae the seirch field o yer favourite Mastodon app or the wab interface o yer Mastodon server.",
+  "interaction_modal.preamble": "Seein Mastodon is decentralized, ye kin uise the accoont thit ye awriddy hae hostit on anither Mastodon server or compatable platforn gien thit dinnae hae a accoont in this yin.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follae {name}",
+  "interaction_modal.title.reblog": "Heeze {name}'s post",
+  "interaction_modal.title.reply": "Reply tae {name}'s post",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# oor} other {# oors}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minties}}",
+  "keyboard_shortcuts.back": "Awa back",
+  "keyboard_shortcuts.blocked": "Open dingied uisers list",
+  "keyboard_shortcuts.boost": "Heeze post",
+  "keyboard_shortcuts.column": "Focus column",
+  "keyboard_shortcuts.compose": "Focus compose text area",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "tae open direct messages column",
+  "keyboard_shortcuts.down": "Muive doon in the list",
+  "keyboard_shortcuts.enter": "Open post",
+  "keyboard_shortcuts.favourite": "Favourite post",
+  "keyboard_shortcuts.favourites": "Open favourites list",
+  "keyboard_shortcuts.federated": "Open federatit timeline",
+  "keyboard_shortcuts.heading": "Keyboord shortcuts",
+  "keyboard_shortcuts.home": "Open hame timeline",
+  "keyboard_shortcuts.hotkey": "Hetkey",
+  "keyboard_shortcuts.legend": "Display this legend",
+  "keyboard_shortcuts.local": "Open local timeline",
+  "keyboard_shortcuts.mention": "Menshie author",
+  "keyboard_shortcuts.muted": "Open wheesht uisers list",
+  "keyboard_shortcuts.my_profile": "Open yer profile",
+  "keyboard_shortcuts.notifications": "Open notes column",
+  "keyboard_shortcuts.open_media": "Open media",
+  "keyboard_shortcuts.pinned": "Open preenit posts list",
+  "keyboard_shortcuts.profile": "Open author's profile",
+  "keyboard_shortcuts.reply": "Reply tae post",
+  "keyboard_shortcuts.requests": "Open follae requests list",
+  "keyboard_shortcuts.search": "Focus seirch baur",
+  "keyboard_shortcuts.spoilers": "Shaw/hide CW field",
+  "keyboard_shortcuts.start": "Open “get stertit” column",
+  "keyboard_shortcuts.toggle_hidden": "Show/hide text ahin CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
+  "keyboard_shortcuts.toot": "Stert a new post",
+  "keyboard_shortcuts.unfocus": "Unfocus scrieve textarea/seirch",
+  "keyboard_shortcuts.up": "Muive up in the list",
+  "lightbox.close": "Shut",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Neist",
+  "lightbox.previous": "Last ane",
+  "limited_account_hint.action": "Shaw profile onieweys",
+  "limited_account_hint.title": "This profile haes been planked bi the moderators o {domain}.",
+  "lists.account.add": "Add tae list",
+  "lists.account.remove": "Tak aff o the list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Chynge title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Onie follaed uiser",
+  "lists.replies_policy.list": "Memmers o the list",
+  "lists.replies_policy.none": "Naebody",
+  "lists.replies_policy.title": "Shaw replies tae:",
+  "lists.search": "Seirch amang the fowk ye ken",
+  "lists.subheading": "Yer lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loadin...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "No fun",
+  "missing_indicator.sublabel": "This resoorce cuidnae be fun",
+  "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
+  "mute_modal.duration": "Lenth",
+  "mute_modal.hide_notifications": "Hide notifications fae this uiser?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.about": "Aboot",
+  "navigation_bar.blocks": "Dingied uisers",
+  "navigation_bar.bookmarks": "Buikmairks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Scrieve new post",
+  "navigation_bar.direct": "Direck messages",
+  "navigation_bar.discover": "Fin",
+  "navigation_bar.domain_blocks": "Dingied domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Splore",
+  "navigation_bar.favourites": "Best anes",
+  "navigation_bar.filters": "Wheesht wirds",
+  "navigation_bar.follow_requests": "Follae requests",
+  "navigation_bar.follows_and_followers": "Follaes an follaers",
+  "navigation_bar.lists": "Leets",
+  "navigation_bar.logout": "Logoot",
+  "navigation_bar.mutes": "Wheesht uisers",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Preenit posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federatit timeline",
+  "navigation_bar.search": "Seirch",
+  "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "Ye'r needin tae sign in fir tae access this resoorce.",
+  "notification.admin.report": "{name} reportit {target}",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favouritit yer post",
+  "notification.follow": "{name} follaed ye",
+  "notification.follow_request": "{name} is wantin tae follae ye",
+  "notification.mention": "{name} menshied ye",
+  "notification.own_poll": "Yer poll is duin",
+  "notification.poll": "A poll thit ye votit in is duin",
+  "notification.reblog": "{name} heezed yer post",
+  "notification.status": "{name} juist postit",
+  "notification.update": "{name} editit a post",
+  "notifications.clear": "Claer yer notes",
+  "notifications.clear_confirmation": "Ye shaire thit ye'r wantin tae claer yer notes fir ever?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktap notes",
+  "notifications.column_settings.favourite": "Best anes:",
+  "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories",
+  "notifications.column_settings.filter_bar.category": "Quick filter baur",
+  "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur",
+  "notifications.column_settings.follow": "New follaers:",
+  "notifications.column_settings.follow_request": "New follae requests:",
+  "notifications.column_settings.mention": "Menshies:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notes",
+  "notifications.column_settings.reblog": "Heezes:",
+  "notifications.column_settings.show": "Shaw in column",
+  "notifications.column_settings.sound": "Pley soond",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Notes no read",
+  "notifications.column_settings.unread_notifications.highlight": "Heichlicht notes no read",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "Aw",
+  "notifications.filter.boosts": "Heezes",
+  "notifications.filter.favourites": "Best anes",
+  "notifications.filter.follows": "Follaes",
+  "notifications.filter.mentions": "Menshies",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates fae fowk thit ye follae",
+  "notifications.grant_permission": "Gie permission.",
+  "notifications.group": "{count} notes",
+  "notifications.mark_as_read": "Mairk ilka note as read",
+  "notifications.permission_denied": "Desktap notes urnae available doon tae denied brooser permissions requests aforehaun",
+  "notifications.permission_denied_alert": "Desktap notes cannae be turnt on, as brooser permission haes been denied aforehaun",
+  "notifications.permission_required": "Desktap notes urnae available acause the needit permission haesnae been gien.",
+  "notifications_permission_banner.enable": "Turn on desktap notes",
+  "notifications_permission_banner.how_to_control": "Fir tae get notes whan Mastodon isnae open, turn on desktap notes. Ye kin pick exactly whit types o interactions gie ye desktap notes throu the {icon} button abuin ance they'r turnt on.",
+  "notifications_permission_banner.title": "Dinnae miss a hing",
+  "picture_in_picture.restore": "Pit it back",
+  "poll.closed": "Shut",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# fowk} other {# fowk}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "Ye votit fir this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Dae a poll",
+  "poll_button.remove_poll": "Tak doon poll",
+  "privacy.change": "Chynge post privacy",
+  "privacy.direct.long": "Ainly menshied uisers kin see this",
+  "privacy.direct.short": "Menshied fowk ainly",
+  "privacy.private.long": "Ainly follaers kin see this",
+  "privacy.private.short": "Ainly follaers",
+  "privacy.public.long": "Awbody kin see this",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
+  "privacy.unlisted.short": "No listit",
+  "privacy_policy.last_updated": "Last updatit {date}",
+  "privacy_policy.title": "Privacy Policy",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loadin…",
+  "regeneration_indicator.sublabel": "Yer hame feed is gettin sortit fir ye!",
+  "relative_time.days": "{number}t",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} syne",
+  "relative_time.full.hours": "{number, plural, one {# oor} other {# oors}} syne",
+  "relative_time.full.just_now": "the noo",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minties}} syne",
+  "relative_time.full.seconds": "{number, plural, one {# saicont} other {# saiconts}} syne",
+  "relative_time.hours": "{number}o",
+  "relative_time.just_now": "noo",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "the day",
+  "reply_indicator.cancel": "Cancel",
+  "report.block": "Dingie",
+  "report.block_explanation": "Ye'll no see their posts. They wullnae be able tae see your posts or follae ye. They wull be able tae tell thit they're dingied.",
+  "report.categories.other": "Ither",
+  "report.categories.spam": "Guff",
+  "report.categories.violation": "Content breks ae or mair server rules",
+  "report.category.subtitle": "Pick the best match",
+  "report.category.title": "Tell us whit's gaun on wi this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Duin",
+  "report.comment.title": "There ocht else thit ye hink we shuid ken?",
+  "report.forward": "Forret tae {target}",
+  "report.forward_hint": "The accoont is fae anither server. Sen an anonymized copy o the report tae there tae?",
+  "report.mute": "Wheesht",
+  "report.mute_explanation": "Ye wullnae see theirposts. They kin follae ye stull an see yer posts an wullnae ken thit they'r wheesht.",
+  "report.next": "Neist",
+  "report.placeholder": "Mair comments",
+  "report.reasons.dislike": "A dinnae like it",
+  "report.reasons.dislike_description": "It's no somehin thit ye want tae see",
+  "report.reasons.other": "It's anither hing",
+  "report.reasons.other_description": "The maitter disnae fir intae ither caitegories",
+  "report.reasons.spam": "It's mince",
+  "report.reasons.spam_description": "Fly links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It breks server rules",
+  "report.reasons.violation_description": "Ke ken thit it breks specific rules",
+  "report.rules.subtitle": "Puck aw thit apply",
+  "report.rules.title": "Whit rules is bein broke?",
+  "report.statuses.subtitle": "Pick aw thit apply",
+  "report.statuses.title": "Is there onie posts thit back up this report?",
+  "report.submit": "Pit in",
+  "report.target": "Reportin {target}",
+  "report.thanks.take_action": "Here yer options fir pickin whit ye see on Mastodon:",
+  "report.thanks.take_action_actionable": "Whilst we'r luikin ower this, ye kin tak steps aginst @{name}:",
+  "report.thanks.title": "Ye dinnae want tae see this?",
+  "report.thanks.title_actionable": "Ta fir reportin, we'll tak a luik intae this.",
+  "report.unfollow": "Unfollae @{name}",
+  "report.unfollow_explanation": "Ye'r follaein this accoont. Tae stap seein their post in yer hame feed onie mair, unfollae them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Ither",
+  "report_notification.categories.spam": "Mince",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
+  "search.placeholder": "Seirch",
+  "search.search_or_paste": "Seirch or paste URL",
+  "search_popout.search_format": "Advanced seirch format",
+  "search_popout.tips.full_text": "Simple text gie ye posts thit ye'v wrate, favouritit, heezed, or hae been menshied in, as weil as matchinnuisernemms, displey nemms, an hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "post",
+  "search_popout.tips.text": "Simple text gies ye matchin dipley nemms, uisernemms an hashtags",
+  "search_popout.tips.user": "uiser",
+  "search_results.accounts": "Fowk",
+  "search_results.all": "Aw",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Cuidnae fin ocht fir thir seirch terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Seirchin posts bi theri content isnae turnt on on this Mastadon server.",
+  "search_results.title": "Seirch fir {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "Fowk uisin this server in the last 30 days (Monthly Active Uisers)",
+  "server_banner.active_users": "active uisers",
+  "server_banner.administered_by": "Administert bi:",
+  "server_banner.introduction": "{domain} is pairt o the decentralized social network pooery bi {mastodon}.",
+  "server_banner.learn_more": "Lairn mair",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Mak accoont",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in fir tae follae profiles o hashtags, favourite, shaire an reply tae posts, or interack fae yer accoont on a different server.",
+  "status.admin_account": "Open moderation interface fir @{name}",
+  "status.admin_status": "Open this post in the moderation interface",
+  "status.block": "Dingie @{name}",
+  "status.bookmark": "Buikmairk",
+  "status.cancel_reblog_private": "Unheeze",
+  "status.cannot_reblog": "This post cannae be heezed",
+  "status.copy": "Copy link tae post",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailt conversation view",
+  "status.direct": "Direck message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Editit {date}",
+  "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
+  "status.filtered": "Filtert",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} creatit {date}",
+  "status.history.edited": "{name} editit {date}",
+  "status.load_more": "Load mair",
+  "status.media_hidden": "Media planked",
+  "status.mention": "Menshie @{name}",
+  "status.more": "Mair",
+  "status.mute": "Wheesht @{name}",
+  "status.mute_conversation": "Wheesht conversation",
+  "status.open": "Expand this post",
+  "status.pin": "Preen tae profile",
+  "status.pinned": "Preenit post",
+  "status.read_more": "Read mair",
+  "status.reblog": "Heeze",
+  "status.reblog_private": "Heeze wi original visibility",
+  "status.reblogged_by": "{name} heezed",
+  "status.reblogs.empty": "Naebody haes heezed this post yit. Whan somebody dis, they wull shaw up here.",
+  "status.redraft": "Delete & re-dae",
+  "status.remove_bookmark": "Tak doon buikmairk",
+  "status.replied_to": "Replied tae {name}",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply tae threid",
+  "status.report": "Clype @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Shaire",
+  "status.show_filter_reason": "Shaw onieweys",
+  "status.show_less": "Shaw less",
+  "status.show_less_all": "Shaw less fir aw",
+  "status.show_more": "Shaw mair",
+  "status.show_more_all": "Shaw mair fir aw",
+  "status.show_original": "Shaw original",
+  "status.translate": "Owerset",
+  "status.translated_from_with": "Owerset fae {lang} uisin {provider}",
+  "status.uncached_media_warning": "No available",
+  "status.unmute_conversation": "Unwheesht conversation",
+  "status.unpin": "Unpreen fae profile",
+  "subscribed_languages.lead": "Ainly posts in the leids ye pick wull shaw on yer hame an list timelines efter the chynge. Pick naen fir tae get posts in aw leids.",
+  "subscribed_languages.save": "Save chynges",
+  "subscribed_languages.target": "Chynge subscribed leids fir {target}",
+  "suggestions.dismiss": "Pit awa suggestions",
+  "suggestions.header": "Ye'd mibbie be interestit in…",
+  "tabs_bar.federated_timeline": "Federatit",
+  "tabs_bar.home": "Hame",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notes",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# oor} other {# oors}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minties}} left",
+  "time_remaining.moments": "Moments remainin",
+  "time_remaining.seconds": "{number, plural, one {# saicont} other {# saiconts}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} fae ither servers urnae displayed.",
+  "timeline_hint.resources.followers": "Follaers",
+  "timeline_hint.resources.follows": "Follaes",
+  "timeline_hint.resources.statuses": "Aulder posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} body} other {{counter} fowk}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "Trendin noo",
+  "ui.beforeunload": "Yer draft wull be lost if ye lea Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drap fir tae upload",
+  "upload_button.label": "Add images, a video or a audio file",
+  "upload_error.limit": "File upload limit exceedit.",
+  "upload_error.poll": "File upload isnae allooed wi polls.",
+  "upload_form.audio_description": "Describe fir fowk wi hearin loss",
+  "upload_form.description": "Describe fir thaim wi visual impairments",
+  "upload_form.description_missing": "Nae description addit",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Chynge thoomnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
+  "upload_modal.analyzing_picture": "Analyzin picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applyin…",
+  "upload_modal.choose_image": "Pick image",
+  "upload_modal.description_placeholder": "A quick broon fox jamps ower the lazy dug",
+  "upload_modal.detect_text": "Detect text fae picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview tae pick the focal pynt thit wull aye be in view on aw thoomnails.",
+  "upload_modal.preparing_ocr": "Preparin OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploadin...",
+  "upload_progress.processing": "Processin…",
+  "video.close": "Shut video",
+  "video.download": "Doonload file",
+  "video.exit_fullscreen": "Lea fu-screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Fu-screen",
+  "video.hide": "Plank video",
+  "video.mute": "Wheesht soond",
+  "video.pause": "Pause",
+  "video.play": "Pley",
+  "video.unmute": "Unwheesht soond"
+}
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 0baa6c7ae..84d2a1e4e 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "සටහන",
   "account.add_or_remove_from_list": "ලැයිස්තු වලින් එකතු හෝ ඉවත් කරන්න",
   "account.badges.bot": "ස්වයං ක්‍රමලේඛය",
@@ -7,149 +19,188 @@
   "account.block_domain": "{domain} වසම අවහිර කරන්න",
   "account.blocked": "අවහිර කර ඇත",
   "account.browse_more_on_origin_server": "මුල් පැතිකඩෙහි තවත් පිරික්සන්න",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "@{name} සෘජු පණිවිඩය",
-  "account.disable_notifications": "@{name} පළ කරන විට මට දැනුම් දීම නවත්වන්න",
+  "account.disable_notifications": "@{name} පළ කරන විට මට දැනුම් නොදෙන්න",
   "account.domain_blocked": "වසම අවහිර කර ඇත",
   "account.edit_profile": "පැතිකඩ සංස්කරණය",
   "account.enable_notifications": "@{name} පළ කරන විට මට දැනුම් දෙන්න",
   "account.endorse": "පැතිකඩෙහි විශේෂාංගය",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "{date} එක් වී ඇත",
-  "account.last_status": "අවසන් වරට සක්‍රීය",
-  "account.link_verified_on": "මෙම සබැඳියේ හිමිකාරිත්වය {date} දින පරීක්ෂා කරන ලදි",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
+  "account.follow": "අනුගමනය",
+  "account.followers": "අනුගාමිකයින්",
+  "account.followers.empty": "කිසිවෙක් අනුගමනය කර නැත.",
+  "account.followers_counter": "{count, plural, one {{counter} අනුගාමිකයෙක්} other {{counter} අනුගාමිකයින්}}",
+  "account.following": "අනුගමනය",
+  "account.following_counter": "{count, plural, one {අනුගාමිකයින් {counter}} other {අනුගාමිකයින් {counter}}}",
+  "account.follows.empty": "තවමත් කිසිවෙක් අනුගමනය නොකරයි.",
+  "account.follows_you": "ඔබව අනුගමනය කරයි",
+  "account.go_to_profile": "Go to profile",
+  "account.hide_reblogs": "@{name}සිට බූස්ට් සඟවන්න",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
+  "account.link_verified_on": "මෙම සබැඳියේ අයිතිය {date} දී පරීක්‍ෂා කෙරිණි",
+  "account.locked_info": "මෙම ගිණුමේ රහස්‍යතා තත්ත්වය අගුලු දමා ඇත. හිමිකරු ඔවුන් අනුගමනය කළ හැක්කේ කාටදැයි හස්තීයව සමාලෝචනය කරයි.",
   "account.media": "මාධ්‍යය",
   "account.mention": "@{name} සැඳහුම",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "@{name} නිහඬ කරන්න",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
+  "account.mute_notifications": "@{name}වෙතින් දැනුම්දීම් නිහඬ කරන්න",
+  "account.muted": "නිහඬ කළා",
+  "account.open_original_page": "Open original page",
+  "account.posts": "ලිපි",
+  "account.posts_with_replies": "ටූට්ස් සහ පිළිතුරු",
   "account.report": "@{name} වාර්තා කරන්න",
-  "account.requested": "Awaiting approval",
+  "account.requested": "අනුමැතිය බලාපොරොත්තුවෙන්",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} ගේ පැතිකඩ බෙදාගන්න",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.show_reblogs": "@{name}සිට බූස්ට් පෙන්වන්න",
+  "account.statuses_counter": "{count, plural, one {{counter} ටූට්} other {{counter} ටූට්ස්}}",
   "account.unblock": "@{name} අනවහිර කරන්න",
   "account.unblock_domain": "{domain} වසම අනවහිර කරන්න",
+  "account.unblock_short": "අනවහිර",
   "account.unendorse": "පැතිකඩෙහි විශේෂාංග නොකරන්න",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account_note.placeholder": "සටහන එකතු කිරීමට ක්ලික් කරන්න",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "කරුණාකර {retry_time, time, medium} ට පසු නැවත උත්සාහ කරන්න.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
+  "account.unfollow": "අනුගමනය නොකරන්න",
+  "account.unmute": "@{name}නිහඬ නොකරන්න",
+  "account.unmute_notifications": "@{name}වෙතින් දැනුම්දීම් නිහඬ නොකරන්න",
+  "account.unmute_short": "නොනිහඬ",
+  "account_note.placeholder": "සටහන යෙදීමට ඔබන්න",
+  "admin.dashboard.daily_retention": "ලියාපදිංචි වීමෙන් පසු දිනකට පරිශීලක රඳවා ගැනීමේ අනුපාතය",
+  "admin.dashboard.monthly_retention": "ලියාපදිංචි වීමෙන් පසු මාසය අනුව පරිශීලක රඳවා ගැනීමේ අනුපාතය",
+  "admin.dashboard.retention.average": "සාමාන්යය",
+  "admin.dashboard.retention.cohort": "ලියාපදිංචි වීමේ මාසය",
+  "admin.dashboard.retention.cohort_size": "නව පරිශ්‍රීලකයින්",
+  "alert.rate_limited.message": "{retry_time, time, medium} කට පසුව උත්සාහ කරන්න.",
+  "alert.rate_limited.title": "මිල සීමා සහිතයි",
+  "alert.unexpected.message": "අනපේක්ෂිත දෝෂයක් ඇතිවුනා.",
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per week",
-  "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "attachments_list.unprocessed": "(සැකසුම් නොකළ)",
+  "audio.hide": "හඬපටය සඟවන්න",
+  "autosuggest_hashtag.per_week": "සතියකට {count}",
+  "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට ඔබට {combo} එබිය හැක",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "නැවත උත්සාහ කරන්න",
-  "bundle_column_error.title": "ජාලයේ දෝෂයකි",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "වසන්න",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.message": "මෙම සංරචකය පූරණය කිරීමේදී යම් දෙයක් වැරදී ඇත.",
   "bundle_modal_error.retry": "නැවත උත්සාහ කරන්න",
-  "column.blocks": "අවහිර කළ පරිශීලකයින්",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "පිලිබඳව",
+  "column.blocks": "අවහිර කළ අය",
   "column.bookmarks": "පොත් යොමු",
-  "column.community": "Local timeline",
+  "column.community": "දේශීය කාලරේඛාව",
   "column.direct": "සෘජු පණිවිඩ",
-  "column.directory": "පැතිකඩයන් පිරික්සන්න",
+  "column.directory": "පැතිකඩ පිරික්සන්න",
   "column.domain_blocks": "අවහිර කළ වසම්",
   "column.favourites": "ප්‍රියතමයන්",
-  "column.follow_requests": "Follow requests",
+  "column.follow_requests": "අනුගමන ඉල්ලීම්",
   "column.home": "මුල් පිටුව",
-  "column.lists": "ලැයිස්තු",
-  "column.mutes": "නිහඬ කළ පරිශීලකයන්",
+  "column.lists": "ලේඛන",
+  "column.mutes": "නිහඬ කළ අය",
   "column.notifications": "දැනුම්දීම්",
-  "column.pins": "Pinned toot",
-  "column.public": "Federated timeline",
+  "column.pins": "ඇමිණූ ලිපි",
+  "column.public": "ෆෙඩරේටඩ් කාලරේඛාව",
   "column_back_button.label": "ආපසු",
   "column_header.hide_settings": "සැකසුම් සඟවන්න",
   "column_header.moveLeft_settings": "තීරුව වමට ගෙනයන්න",
   "column_header.moveRight_settings": "තීරුව දකුණට ගෙනයන්න",
-  "column_header.pin": "Pin",
+  "column_header.pin": "අමුණන්න",
   "column_header.show_settings": "සැකසුම් පෙන්වන්න",
-  "column_header.unpin": "Unpin",
+  "column_header.unpin": "ගළවන්න",
   "column_subheading.settings": "සැකසුම්",
   "community.column_settings.local_only": "ස්ථානීයව පමණයි",
   "community.column_settings.media_only": "මාධ්‍ය පමණයි",
   "community.column_settings.remote_only": "දුරස්ථව පමණයි",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "භාෂාව සංශෝධනය",
+  "compose.language.search": "භාෂා සොයන්න...",
   "compose_form.direct_message_warning_learn_more": "තව දැනගන්න",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.encryption_warning": "Mastodon හි පළ කිරීම් අන්තයේ සිට අවසානය දක්වා සංකේතනය කර නොමැත. Mastodon හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
+  "compose_form.hashtag_warning": "මෙම මෙවලම ලැයිස්තුගත කර නොමැති බැවින් කිසිදු හැෂ් ටැගය යටතේ ලැයිස්තුගත නොකෙරේ. හැෂ් ටැග් මගින් සෙවිය හැක්කේ පොදු මෙවලම් පමණි.",
+  "compose_form.lock_disclaimer": "ඔබගේ ගිණුම {locked}නොවේ. ඔබගේ අනුගාමිකයින්ට පමණක් පළ කිරීම් බැලීමට ඕනෑම කෙනෙකුට ඔබව අනුගමනය කළ හැක.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
-  "compose_form.poll.add_option": "තේරීමක් එකතු කරන්න",
+  "compose_form.poll.add_option": "තේරීමක් යොදන්න",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "මෙම තේරීම ඉවත් කරන්න",
-  "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට ඉඩ දීම සඳහා මත විමසුම වෙනස් කරන්න",
+  "compose_form.poll.option_placeholder": "තේරීම {number}",
+  "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
+  "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයක් ඉඩ දීම සඳහා මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට ඉඩ දීම සඳහා මත විමසුම වෙනස් කරන්න",
-  "compose_form.publish": "පිඹින්න",
+  "compose_form.publish": "ප්‍රකාශනය",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {මාධ්‍ය සංවේදී ලෙස සලකුණු කරන්න} other {මාධ්‍ය සංවේදී ලෙස සලකුණු කරන්න}}",
+  "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
+  "compose_form.sensitive.hide": "{count, plural, one {මාධ්ය සංවේදී ලෙස සලකුණු කරන්න} other {මාධ්ය සංවේදී ලෙස සලකුණු කරන්න}}",
   "compose_form.sensitive.marked": "{count, plural, one {මාධ්‍ය සංවේදී ලෙස සලකුණු කර ඇත} other {මාධ්‍ය සංවේදී ලෙස සලකුණු කර ඇත}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {මාධ්‍ය සංවේදී ලෙස සලකුණු කර නැත} other {මාධ්‍ය සංවේදී ලෙස සලකුණු කර නැත}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "පාඨය සඟවා නැත",
-  "compose_form.spoiler_placeholder": "ඔබගේ අවවාදය මෙහි ලියන්න",
+  "compose_form.spoiler.marked": "අනතුරු ඇඟවීම පිටුපස පෙළ සඟවා ඇත",
+  "compose_form.spoiler.unmarked": "ප්‍රයෝජනය සඟවා නැත",
+  "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
   "confirmation_modal.cancel": "අවලංගු",
   "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
-  "confirmations.block.message": "ඔබට {name} අවහිර කිරීමට අවශ්‍ය බව විශ්වාසද?",
-  "confirmations.delete.confirm": "Delete",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.block.message": "ඔබට {name} අවහිර කිරීමට වුවමනා ද?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
+  "confirmations.delete.confirm": "මකන්න",
+  "confirmations.delete.message": "ඔබට මෙම තත්ත්වය මැකීමට අවශ්‍ය බව විශ්වාසද?",
+  "confirmations.delete_list.confirm": "මකන්න",
+  "confirmations.delete_list.message": "ඔබට මෙම ලැයිස්තුව ස්ථිරවම මැකීමට අවශ්‍ය බව විශ්වාසද?",
+  "confirmations.discard_edit_media.confirm": "ඉවත ලන්න",
+  "confirmations.discard_edit_media.message": "ඔබට මාධ්‍ය විස්තරයට හෝ පෙරදසුනට නොසුරකින ලද වෙනස්කම් තිබේ, කෙසේ වෙතත් ඒවා ඉවත දමන්නද?",
   "confirmations.domain_block.confirm": "සම්පූර්ණ වසම අවහිර කරන්න",
-  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.domain_block.message": "ඔබට සම්පූර්ණ {domain}අවහිර කිරීමට අවශ්‍ය බව ඔබට සැබවින්ම විශ්වාසද? බොහෝ අවස්ථාවලදී ඉලක්කගත බ්ලොක් හෝ නිශ්ශබ්ද කිරීම් කිහිපයක් ප්රමාණවත් වන අතර වඩාත් යෝග්ය වේ. ඔබ කිසිදු පොදු කාලරාමුවක හෝ ඔබගේ දැනුම්දීම් වල එම වසමේ අන්තර්ගතය නොදකිනු ඇත. එම වසමෙන් ඔබගේ අනුගාමිකයින් ඉවත් කරනු ලැබේ.",
   "confirmations.logout.confirm": "නික්මෙන්න",
   "confirmations.logout.message": "ඔබට නික්මෙන්න අවශ්‍ය බව විශ්වාසද?",
   "confirmations.mute.confirm": "නිශ්ශබ්ද",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "මෙය ඔවුන්ගෙන් පළ කිරීම් සහ ඒවා සඳහන් කරන පළ කිරීම් සඟවයි, නමුත් එය ඔවුන්ට ඔබේ පළ කිරීම් බැලීමට සහ ඔබව අනුගමනය කිරීමට තවමත් ඉඩ ලබා දේ.",
   "confirmations.mute.message": "ඔබට {name} නිශ්ශබ්ද කිරීමට අවශ්‍ය බව විශ්වාසද?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.redraft.confirm": "මකන්න සහ නැවත කෙටුම්පත් කරන්න",
+  "confirmations.redraft.message": "ඔබට මෙම තත්ත්වය මකා එය නැවත කෙටුම්පත් කිරීමට අවශ්‍ය බව විශ්වාසද? ප්‍රියතමයන් සහ බූස්ට් අහිමි වනු ඇත, මුල් පළ කිරීම සඳහා පිළිතුරු අනාථ වනු ඇත.",
   "confirmations.reply.confirm": "පිළිතුර",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "කියවූ ලෙස සලකුණු කරන්න",
+  "confirmations.reply.message": "දැන් පිළිතුරු දීම ඔබ දැනට රචනා කරන පණිවිඩය උඩින් ලියයි. ඔබට ඉදිරියට යාමට අවශ්‍ය බව විශ්වාසද?",
+  "confirmations.unfollow.confirm": "අනුගමනය නොකරන්න",
+  "confirmations.unfollow.message": "ඔබට {name}අනුගමනය නොකිරීමට අවශ්‍ය බව විශ්වාසද?",
+  "conversation.delete": "සංවාදය මකන්න",
+  "conversation.mark_as_read": "කියවූ බව යොදන්න",
   "conversation.open": "සංවාදය බලන්න",
   "conversation.with": "{names} සමඟ",
-  "directory.federated": "From known fediverse",
+  "copypaste.copied": "පිටපත් විය",
+  "copypaste.copy": "පිටපතක්",
+  "directory.federated": "දන්නා fediverse වලින්",
   "directory.local": "{domain} වෙතින් පමණි",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
+  "directory.new_arrivals": "නව පැමිණීම්",
+  "directory.recently_active": "මෑත දී සක්‍රියයි",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "embed.instructions": "පහත කේතය පිටපත් කිරීමෙන් මෙම තත්ත්වය ඔබේ වෙබ් අඩවියට ඇතුළත් කරන්න.",
+  "embed.preview": "එය පෙනෙන්නේ කෙසේද යන්න මෙන්න:",
   "emoji_button.activity": "ක්‍රියාකාරකම",
+  "emoji_button.clear": "මකන්න",
   "emoji_button.custom": "අභිරුචි",
-  "emoji_button.flags": "Flags",
+  "emoji_button.flags": "කොඩි",
   "emoji_button.food": "ආහාර සහ පාන",
-  "emoji_button.label": "Insert emoji",
-  "emoji_button.nature": "සොබාදහම",
-  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.label": "ඉමොජි යොදන්න",
+  "emoji_button.nature": "ස්වභාවික",
+  "emoji_button.not_found": "ගැළපෙන ඉමෝජි හමු නොවිණි",
   "emoji_button.objects": "වස්තූන්",
   "emoji_button.people": "මිනිසුන්",
   "emoji_button.recent": "නිතර භාවිතා වූ",
@@ -158,327 +209,446 @@
   "emoji_button.symbols": "සංකේත",
   "emoji_button.travel": "චාරිකා සහ ස්ථාන",
   "empty_column.account_suspended": "ගිණුම අත්හිටුවා ඇත",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "ඔබ තවමත් කිසිදු පරිශීලකයෙකු අවහිර කර නැත.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "අවහිර කළ වසම් නොමැත.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
-  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "ප්‍රතික්ෂේප",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "empty_column.account_timeline": "මෙහි දත් නැත!",
+  "empty_column.account_unavailable": "පැතිකඩ නොතිබේ",
+  "empty_column.blocks": "කිසිදු පරිශීලකයෙකු අවහිර කර නැත.",
+  "empty_column.bookmarked_statuses": "ඔබට තවමත් පිටු සලකුණු කළ මෙවලම් කිසිවක් නොමැත. ඔබ එකක් පිටු සලකුණු කළ විට, එය මෙහි පෙන්වනු ඇත.",
+  "empty_column.community": "දේශීය කාලරේඛාව හිස් ය. පන්දුව පෙරළීමට ප්‍රසිද්ධියේ යමක් ලියන්න!",
+  "empty_column.direct": "ඔබට තවමත් සෘජු පණිවිඩ කිසිවක් නොමැත. ඔබ එකක් යවන විට හෝ ලැබුණු විට, එය මෙහි පෙන්වනු ඇත.",
+  "empty_column.domain_blocks": "අවහිර කරන ලද වසම් නැත.",
+  "empty_column.explore_statuses": "දැන් කිසිවක් නැඹුරු නොවේ. පසුව නැවත පරීක්ෂා කරන්න!",
+  "empty_column.favourited_statuses": "ඔබට තවමත් ප්‍රියතම දත් කිසිවක් නැත. ඔබ කැමති එකක් වූ විට, එය මෙහි පෙන්වනු ඇත.",
+  "empty_column.favourites": "කිසිවෙකු තවමත් මෙම මෙවලමට ප්‍රිය කර නැත. යමෙකු එසේ කළ විට, ඔවුන් මෙහි පෙන්වනු ඇත.",
+  "empty_column.follow_recommendations": "ඔබ වෙනුවෙන් යෝජනා ජනනය කළ නොහැකි බව පෙනේ. ඔබ දන්නා හඳුනන පුද්ගලයින් සෙවීමට හෝ ප්‍රවණතා හැෂ් ටැග් ගවේෂණය කිරීමට ඔබට සෙවීම භාවිත කිරීමට උත්සාහ කළ හැක.",
+  "empty_column.follow_requests": "ඔබට තවමත් අනුගමනය කිරීමේ ඉල්ලීම් කිසිවක් නොමැත. ඔබට එකක් ලැබුණු විට, එය මෙහි පෙන්වනු ඇත.",
+  "empty_column.hashtag": "මෙම හැෂ් ටැග් එකේ තවම කිසිවක් නොමැත.",
+  "empty_column.home": "ඔබගේ නිවසේ කාලරේඛාව හිස්ය! එය පිරවීම සඳහා තවත් පුද්ගලයින් අනුගමනය කරන්න. {suggestions}",
+  "empty_column.home.suggestions": "යෝජනා කිහිපයක් බලන්න",
+  "empty_column.list": "මෙම ලැයිස්තුවේ තවමත් කිසිවක් නොමැත. මෙම ලැයිස්තුවේ සාමාජිකයන් නව තත්ව පළ කරන විට, ඔවුන් මෙහි දිස් වනු ඇත.",
+  "empty_column.lists": "ඔබට තවමත් ලැයිස්තු කිසිවක් නැත. ඔබ එකක් සාදන විට, එය මෙහි පෙන්වනු ඇත.",
+  "empty_column.mutes": "ඔබ තවමත් කිසිදු පරිශීලකයෙකු නිහඬ කර නැත.",
+  "empty_column.notifications": "ඔබට තවම දැනුම්දීම් කිසිවක් නැත. වෙනත් පුද්ගලයින් ඔබ සමඟ අන්තර් ක්‍රියා කරන විට, ඔබ එය මෙහි දකිනු ඇත.",
+  "empty_column.public": "මෙහි කිසිවක් නැත! යමක් ප්‍රසිද්ධියේ ලියන්න, නැතහොත් එය පිරවීම සඳහා වෙනත් සේවාදායකයන්ගෙන් පරිශීලකයන් හස්තීයව අනුගමනය කරන්න",
+  "error.unexpected_crash.explanation": "අපගේ කේතයේ දෝෂයක් හෝ බ්‍රවුසර ගැළපුම් ගැටලුවක් හේතුවෙන්, මෙම පිටුව නිවැරදිව ප්‍රදර්ශනය කළ නොහැක.",
+  "error.unexpected_crash.explanation_addons": "මෙම පිටුව නිවැරදිව ප්‍රදර්ශනය කළ නොහැක. මෙම දෝෂය බ්‍රවුසර ඇඩෝනයක් හෝ ස්වයංක්‍රීය පරිවර්තන මෙවලම් නිසා ඇති විය හැක.",
+  "error.unexpected_crash.next_steps": "පිටුව නැවුම් කිරීමට උත්සාහ කරන්න. එය උදව් නොකළහොත්, ඔබට තවමත් වෙනත් බ්‍රවුසරයක් හෝ ස්වදේශීය යෙදුමක් හරහා Mastodon භාවිත කිරීමට හැකි වේ.",
+  "error.unexpected_crash.next_steps_addons": "ඒවා අක්‍රිය කර පිටුව නැවුම් කිරීමට උත්සාහ කරන්න. එය උදව් නොකළහොත්, ඔබට තවමත් වෙනත් බ්‍රවුසරයක් හෝ ස්වදේශීය යෙදුමක් හරහා Mastodon භාවිත කිරීමට හැකි වේ.",
+  "errors.unexpected_crash.copy_stacktrace": "ස්ටැක්ට්රේස් පසුරු පුවරුවට පිටපත් කරන්න",
+  "errors.unexpected_crash.report_issue": "ගැටළුව වාර්තාව",
+  "explore.search_results": "සෙවුම් ප්‍රතිඵල",
+  "explore.suggested_follows": "For you",
+  "explore.title": "ගවේශණය",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "පෙරහන ඉකුත්ය!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "පෙරහන් සැකසුම්",
+  "filter_modal.added.settings_link": "සැකසුම් පිටුව",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "ඉකුත්ය",
+  "filter_modal.select_filter.prompt_new": "නව ප්‍රවර්ගය: {name}",
+  "filter_modal.select_filter.search": "සොයන්න හෝ සාදන්න",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
+  "follow_recommendations.done": "අහවරයි",
+  "follow_recommendations.heading": "ඔබ පළ කිරීම් බැලීමට කැමති පුද්ගලයින් අනුගමනය කරන්න! මෙන්න යෝජනා කිහිපයක්.",
+  "follow_recommendations.lead": "ඔබ අනුගමන කරන පුද්ගලයින්ගේ පළ කිරීම් ඔබගේ නිවසේ සංග්‍රහයේ කාලානුක්‍රමික අනුපිළිවෙලට පෙන්වනු ඇත. වැරදි කිරීමට බිය නොවන්න, ඔබට ඕනෑම වේලාවක පහසුවෙන් මිනිසුන් අනුගමනය කළ නොහැක!",
+  "follow_request.authorize": "අවසරලත්",
+  "follow_request.reject": "ප්‍රතික්‍ෂේප",
+  "follow_requests.unlocked_explanation": "ඔබගේ ගිණුම අගුලු දමා නොතිබුණද, {domain} කාර්ය මණ්ඩලය සිතුවේ ඔබට මෙම ගිණුම් වලින් ලැබෙන ඉල්ලීම් හස්තීයව සමාලෝචනය කිරීමට අවශ්‍ය විය හැකි බවයි.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "සුරැකිණි",
-  "getting_started.developers": "සංවර්ධකයින්",
-  "getting_started.directory": "පැතිකඩ නාමාවලිය",
-  "getting_started.documentation": "ප්‍රලේඛනය",
-  "getting_started.heading": "Getting started",
-  "getting_started.invite": "මිනිසුන්ට ආරාධනා කරන්න",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "ගිණුමේ සැකසුම්",
-  "getting_started.terms": "සේවාවේ කොන්දේසි",
+  "getting_started.heading": "පටන් ගන්න",
   "hashtag.column_header.tag_mode.all": "සහ {additional}",
   "hashtag.column_header.tag_mode.any": "හෝ {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "යෝජනා කිසිවක් හමු නොවිණි",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_header.tag_mode.none": "{additional}නොමැතිව",
+  "hashtag.column_settings.select.no_options_message": "යෝජනා හමු නොවිණි",
+  "hashtag.column_settings.select.placeholder": "හැෂ් ටැග්…ඇතුලත් කරන්න",
   "hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
-  "hashtag.column_settings.tag_mode.any": "මෙයින් ඕනෑම එකක්",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_mode.any": "ඇතුළත් එකක්",
+  "hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
+  "hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "මූලික",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "ප්‍රතිචාර පෙන්වන්න",
+  "home.column_settings.show_reblogs": "බූස්ට් පෙන්වන්න",
+  "home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
   "home.hide_announcements": "නිවේදන සඟවන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
+  "intervals.full.days": "{number, plural, one {# දින} other {# දින}}",
+  "intervals.full.hours": "{number, plural, one {# පැය} other {# පැය}}",
+  "intervals.full.minutes": "{number, plural, one {විනාඩි #} other {# මිනිත්තු}}",
+  "keyboard_shortcuts.back": "ආපසු යාත්‍රණය",
+  "keyboard_shortcuts.blocked": "අවහිර කළ පරිශීලක ලැයිස්තුව විවෘත කිරීමට",
+  "keyboard_shortcuts.boost": "වැඩි කිරීමට",
+  "keyboard_shortcuts.column": "එක් තීරුවක තත්ත්වය නාභිගත කිරීමට",
+  "keyboard_shortcuts.compose": "රචනා පාඨ ප්‍රදේශය නාභිගත කිරීමට",
   "keyboard_shortcuts.description": "සවිස්තරය",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
-  "keyboard_shortcuts.hotkey": "උණුසුම් යතුර",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.direct": "සෘජු පණිවිඩ තීරුව විවෘත කිරීමට",
+  "keyboard_shortcuts.down": "ලැයිස්තුවේ පහළට ගමන් කිරීමට",
+  "keyboard_shortcuts.enter": "ලිපිය අරින්න",
+  "keyboard_shortcuts.favourite": "කැමති කිරීමට",
+  "keyboard_shortcuts.favourites": "ප්රියතම ලැයිස්තුව විවෘත කිරීමට",
+  "keyboard_shortcuts.federated": "ෆෙඩරේටඩ් කාලරාමුව විවෘත කිරීමට",
+  "keyboard_shortcuts.heading": "යතුරුපුවරු කෙටිමං",
+  "keyboard_shortcuts.home": "නිවසේ කාලරේඛාව විවෘත කිරීමට",
+  "keyboard_shortcuts.hotkey": "උණු යතුර",
+  "keyboard_shortcuts.legend": "මෙම පුරාවෘත්තය ප්රදර්ශනය කිරීමට",
+  "keyboard_shortcuts.local": "දේශීය කාලරේඛාව විවෘත කිරීමට",
+  "keyboard_shortcuts.mention": "කතුවරයා සඳහන් කිරීමට",
+  "keyboard_shortcuts.muted": "නිශ්ශබ්ද පරිශීලක ලැයිස්තුව විවෘත කිරීමට",
+  "keyboard_shortcuts.my_profile": "ඔබගේ පැතිකඩ අරින්න",
+  "keyboard_shortcuts.notifications": "දැනුම්දීම් තීරුව විවෘත කිරීමට",
+  "keyboard_shortcuts.open_media": "මාධ්‍ය අරින්න",
+  "keyboard_shortcuts.pinned": "ඇමිණූ ලිපි ලේඛනය අරින්න",
+  "keyboard_shortcuts.profile": "කතෘගේ පැතිකඩ අරින්න",
+  "keyboard_shortcuts.reply": "පිළිතුරු දීමට",
+  "keyboard_shortcuts.requests": "පහත ඉල්ලීම් ලැයිස්තුව විවෘත කිරීමට",
+  "keyboard_shortcuts.search": "සෙවුම් අවධානය යොමු කිරීමට",
+  "keyboard_shortcuts.spoilers": "CW ක්ෂේත්‍රය පෙන්වීමට/සැඟවීමට",
+  "keyboard_shortcuts.start": "\"පටන් ගන්න\" තීරුව අරින්න",
+  "keyboard_shortcuts.toggle_hidden": "CW පිටුපස පෙළ පෙන්වීමට/සැඟවීමට",
+  "keyboard_shortcuts.toggle_sensitivity": "මාධ්‍ය පෙන්වන්න/සඟවන්න",
+  "keyboard_shortcuts.toot": "අලුත්ම ටූට් එකක් පටන් ගන්න",
+  "keyboard_shortcuts.unfocus": "අවධානය යොමු නොකිරීමට textarea/search රචනා කරන්න",
+  "keyboard_shortcuts.up": "ලැයිස්තුවේ ඉහළට යාමට",
   "lightbox.close": "වසන්න",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "රූප බැලීමේ කොටුව සම්පීඩනය කරන්න",
+  "lightbox.expand": "රූප දර්ශන පෙට්ටිය දිග හරින්න",
   "lightbox.next": "ඊළඟ",
   "lightbox.previous": "පෙර",
-  "lists.account.add": "ලැයිස්තුවට එකතු කරන්න",
-  "lists.account.remove": "Remove from list",
-  "lists.delete": "Delete list",
-  "lists.edit": "ලැයිස්තුව සංස්කරණය කරන්න",
-  "lists.edit.submit": "Change title",
+  "limited_account_hint.action": "කෙසේ හෝ පැතිකඩ පෙන්වන්න",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "lists.account.add": "ලේඛනයට දමන්න",
+  "lists.account.remove": "ලේඛනයෙන් ඉවතලන්න",
+  "lists.delete": "ලේඛනය මකන්න",
+  "lists.edit": "ලේඛනය සංස්කරණය",
+  "lists.edit.submit": "මාතෘකාව වෙනස් කරන්න",
   "lists.new.create": "ලැයිස්තුව එකතු කරන්න",
-  "lists.new.title_placeholder": "New list title",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
+  "lists.new.title_placeholder": "නව ලැයිස්තු මාතෘකාව",
+  "lists.replies_policy.followed": "අනුගමනය කරන ඕනෑම පරිශීලකයෙක්",
+  "lists.replies_policy.list": "ලැයිස්තුවේ සාමාජිකයන්",
   "lists.replies_policy.none": "කිසිවෙක් නැත",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "lists.replies_policy.title": "පිළිතුරු පෙන්වන්න:",
+  "lists.search": "ඔබ අනුගමනය කරන පුද්ගලයින් අතර සොයන්න",
+  "lists.subheading": "ඔබගේ ලේඛන",
+  "load_pending": "{count, plural, one {# නව අයිතමයක්} other {නව අයිතම #ක්}}",
   "loading_indicator.label": "පූරණය වෙමින්...",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
-  "missing_indicator.label": "Not found",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "ජංගම යෙදුම්",
-  "navigation_bar.blocks": "අවහිර කළ පරිශීලකයින්",
-  "navigation_bar.bookmarks": "පොත් යොමු",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new toot",
+  "media_gallery.toggle_visible": "{number, plural, one {රූපය සඟවන්න} other {පින්තූර සඟවන්න}}",
+  "missing_indicator.label": "හමු නොවිණි",
+  "missing_indicator.sublabel": "මෙම සම්පත හමු නොවිණි",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "mute_modal.duration": "පරාසය",
+  "mute_modal.hide_notifications": "මෙම පරිශීලකයාගෙන් දැනුම්දීම් සඟවන්නද?",
+  "mute_modal.indefinite": "අවිනිශ්චිත",
+  "navigation_bar.about": "About",
+  "navigation_bar.blocks": "අවහිර කළ අය",
+  "navigation_bar.bookmarks": "පොත්යොමු",
+  "navigation_bar.community_timeline": "දේශීය කාලරේඛාව",
+  "navigation_bar.compose": "නව ටූට් සාදන්න",
   "navigation_bar.direct": "සෘජු පණිවිඩ",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.discover": "සොයා ගන්න",
+  "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
   "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
+  "navigation_bar.explore": "ගවේෂණය කරන්න",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
-  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "මෙම සේවාදායකය පිළිබඳව",
-  "navigation_bar.keyboard_shortcuts": "උණුසුම් යතුරු",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.follow_requests": "අනුගමන ඉල්ලීම්",
+  "navigation_bar.follows_and_followers": "අනුගමනය හා අනුගාමිකයින්",
+  "navigation_bar.lists": "ලේඛන",
   "navigation_bar.logout": "නික්මෙන්න",
-  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.mutes": "නිහඬ කළ අය",
   "navigation_bar.personal": "පුද්ගලික",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.pins": "ඇමිණූ ලිපි",
+  "navigation_bar.preferences": "අභිප්‍රේත",
+  "navigation_bar.public_timeline": "ෆෙඩරේටඩ් කාලරේඛාව",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "ආරක්ෂාව",
-  "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} mentioned you",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} boosted your status",
-  "notification.status": "{name} just posted",
-  "notifications.clear": "දැනුම්දීම් හිස්කරන්න",
-  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
-  "notifications.column_settings.alert": "Desktop notifications",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} වාර්තා {target}",
+  "notification.admin.sign_up": "{name} අත්සන් කර ඇත",
+  "notification.favourite": "{name} ඔබගේ තත්වයට කැමති විය",
+  "notification.follow": "{name} ඔබව අනුගමනය කළා",
+  "notification.follow_request": "{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත",
+  "notification.mention": "{name} ඔබව සඳහන් කර ඇත",
+  "notification.own_poll": "ඔබගේ මත විමසුම නිමයි",
+  "notification.poll": "ඔබ ඡන්දය දුන් මත විමසුමක් නිමයි",
+  "notification.reblog": "{name} ඔබේ තත්ත්වය ඉහළ නැංවීය",
+  "notification.status": "{name} දැන් පළ කළා",
+  "notification.update": "{name} පළ කිරීමක් සංස්කරණය කළා",
+  "notifications.clear": "දැනුම්දීම් මකන්න",
+  "notifications.clear_confirmation": "ඔබට ඔබගේ සියලු දැනුම්දීම් ස්ථිරවම හිස් කිරීමට අවශ්‍ය බව විශ්වාසද?",
+  "notifications.column_settings.admin.report": "නව වාර්තා:",
+  "notifications.column_settings.admin.sign_up": "නව ලියාපදිංචි:",
+  "notifications.column_settings.alert": "වැඩතල දැනුම්දීම්",
   "notifications.column_settings.favourite": "ප්‍රියතමයන්:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "පෙන්වන්න",
-  "notifications.column_settings.follow": "New followers:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.filter_bar.advanced": "සියළු ප්‍රවර්ග පෙන්වන්න",
+  "notifications.column_settings.filter_bar.category": "ඉක්මන් පෙරහන් තීරුව",
+  "notifications.column_settings.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න",
+  "notifications.column_settings.follow": "නව අනුගාමිකයින්:",
+  "notifications.column_settings.follow_request": "නව අනුගමන ඉල්ලීම්:",
   "notifications.column_settings.mention": "සැඳහුම්:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.poll": "ඡන්ද ප්‍රතිඵල:",
+  "notifications.column_settings.push": "තල්ලු දැනුම්දීම්",
+  "notifications.column_settings.reblog": "තල්ලු කිරීම්:",
   "notifications.column_settings.show": "තීරුවෙහි පෙන්වන්න",
-  "notifications.column_settings.sound": "ශබ්දය ධාවනය",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.sound": "ශබ්දය වාදනය",
+  "notifications.column_settings.status": "නව ලිපි:",
+  "notifications.column_settings.unread_notifications.category": "නොකියවූ දැනුම්දීම්",
+  "notifications.column_settings.unread_notifications.highlight": "නොකියවූ දැනුම්දීම් ඉස්මතු කරන්න",
+  "notifications.column_settings.update": "සංශෝධන:",
   "notifications.filter.all": "සියල්ල",
-  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.boosts": "බූස්ට් කරයි",
   "notifications.filter.favourites": "ප්‍රියතමයන්",
-  "notifications.filter.follows": "Follows",
+  "notifications.filter.follows": "අනුගමනය",
   "notifications.filter.mentions": "සැඳහුම්",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
+  "notifications.filter.polls": "ඡන්ද ප්‍රතිඵල",
+  "notifications.filter.statuses": "ඔබ අනුගමනය කරන පුද්ගලයින්ගෙන් යාවත්කාලීන",
+  "notifications.grant_permission": "අවසර දෙන්න.",
   "notifications.group": "දැනුම්දීම් {count}",
-  "notifications.mark_as_read": "සෑම දැනුම්දීමක්ම කියවූ ලෙස සලකුණු කරන්න",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
+  "notifications.mark_as_read": "සියළු දැනුම්දීම් කියවූ බව යොදන්න",
+  "notifications.permission_denied": "කලින් ප්‍රතික්ෂේප කළ බ්‍රවුසර අවසර ඉල්ලීම හේතුවෙන් ඩෙස්ක්ටොප් දැනුම්දීම් නොමැත",
+  "notifications.permission_denied_alert": "බ්‍රවුසර අවසරය පෙර ප්‍රතික්ෂේප කර ඇති බැවින්, ඩෙස්ක්ටොප් දැනුම්දීම් සබල කළ නොහැක",
+  "notifications.permission_required": "අවශ්‍ය අවසරය ලබා දී නොමැති නිසා ඩෙස්ක්ටොප් දැනුම්දීම් නොමැත.",
+  "notifications_permission_banner.enable": "වැඩතල දැනුම්දීම් සබල කරන්න",
+  "notifications_permission_banner.how_to_control": "Mastodon විවෘතව නොමැති විට දැනුම්දීම් ලබා ගැනීමට, ඩෙස්ක්ටොප් දැනුම්දීම් සබල කරන්න. ඔබට ඒවා සක්‍රිය කළ පසු ඉහත {icon} බොත්තම හරහා ඩෙස්ක්ටොප් දැනුම්දීම් ජනනය කරන්නේ කුමන ආකාරයේ අන්තර්ක්‍රියාද යන්න නිවැරදිව පාලනය කළ හැක.",
+  "notifications_permission_banner.title": "කිසිම දෙයක් අතපසු කරන්න එපා",
+  "picture_in_picture.restore": "ආපහු දාන්න",
   "poll.closed": "වසා ඇත",
   "poll.refresh": "නැවුම් කරන්න",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "මනාපය",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "සෘජු",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "poll.total_people": "{count, plural, one {# පුද්ගලයා} other {# මහජන}}",
+  "poll.total_votes": "{count, plural, one {# ඡන්දය} other {ඡන්ද #}}",
+  "poll.vote": "ඡන්දය",
+  "poll.voted": "ඔබ මෙම පිළිතුරට ඡන්දය දුන්නා",
+  "poll.votes": "{votes, plural, one {# ඡන්දය} other {ඡන්ද #}}",
+  "poll_button.add_poll": "මත විමසුමක් යොදන්න",
+  "poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
+  "privacy.change": "ලිපියේ රහස්‍යතාව සංශෝධනය",
+  "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
+  "privacy.direct.short": "සඳහන් කළ අයට පමණි",
+  "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
+  "privacy.private.short": "අනුගාමිකයින් පමණි",
+  "privacy.public.long": "සැමට දිස්වෙයි",
   "privacy.public.short": "ප්‍රසිද්ධ",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.unlisted.long": "සැමට දෘශ්‍යමාන, නමුත් සොයාගැනීමේ විශේෂාංග වලින් ඉවත් විය",
+  "privacy.unlisted.short": "ලැයිස්තුගත නොකළ",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "නැවුම් කරන්න",
   "regeneration_indicator.label": "පූරණය වෙමින්…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "regeneration_indicator.sublabel": "ඔබේ නිවසේ පෝෂණය සූදානම් වෙමින් පවතී!",
+  "relative_time.days": "ද. {number}",
+  "relative_time.full.days": "{number, plural, one {# දින} other {# දින}} පෙර",
+  "relative_time.full.hours": "{number, plural, one {පැය #} other {පැය #}} කට පෙර",
+  "relative_time.full.just_now": "මේ දැන්",
+  "relative_time.full.minutes": "{number, plural, one {විනාඩි #} other {විනාඩි #}} කට පෙර",
+  "relative_time.full.seconds": "{number, plural, one {තත්පර #} other {තත්පර #}} කට පෙර",
+  "relative_time.hours": "පැය {number}",
   "relative_time.just_now": "දැන්",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
+  "relative_time.minutes": "වි. {number}",
+  "relative_time.seconds": "තත්. {number}",
   "relative_time.today": "අද",
   "reply_indicator.cancel": "අවලංගු කරන්න",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.block": "අවහිර",
+  "report.block_explanation": "ඔබට ඔවුන්ගේ පෝස්ට් නොපෙනේ. ඔවුන්ට ඔබේ පළ කිරීම් බැලීමට හෝ ඔබව අනුගමනය කිරීමට නොහැකි වනු ඇත. ඔවුන් අවහිර කර ඇති බව ඔවුන්ට පැවසිය හැකිය.",
+  "report.categories.other": "වෙනත්",
+  "report.categories.spam": "ආයාචිත",
+  "report.categories.violation": "අන්තර්ගතය සේවාදායක නීති එකක් හෝ කිහිපයක් උල්ලංඝනය කරයි",
+  "report.category.subtitle": "හොඳම ගැලපීම තෝරන්න",
+  "report.category.title": "මෙම {type}සමඟ සිදුවන්නේ කුමක්දැයි අපට කියන්න",
+  "report.category.title_account": "පැතිකඩ",
+  "report.category.title_status": "තැපැල්",
+  "report.close": "අහවරයි",
+  "report.comment.title": "අප දැනගත යුතු යැයි ඔබ සිතන තවත් යමක් තිබේද?",
+  "report.forward": "{target} වෙත හරවන්න",
+  "report.forward_hint": "ගිණුම වෙනත් සේවාදායකයකින්. වාර්තාවේ නිර්නාමික පිටපතක් එතනටත් එවන්න?",
+  "report.mute": "නිහඬ",
+  "report.mute_explanation": "ඔබට ඔවුන්ගේ පෝස්ට් නොපෙනේ. ඔවුන්ට තවමත් ඔබව අනුගමනය කිරීමට සහ ඔබේ පළ කිරීම් දැකීමට හැකි අතර ඒවා නිශ්ශබ්ද කර ඇති බව නොදැනේ.",
+  "report.next": "ඊළඟ",
   "report.placeholder": "අමතර අදහස්",
+  "report.reasons.dislike": "මම එයට අකැමතියි",
+  "report.reasons.dislike_description": "ඒක බලන්න ඕන දෙයක් නෙවෙයි",
+  "report.reasons.other": "ඒක වෙන දෙයක්",
+  "report.reasons.other_description": "ගැටළුව වෙනත් වර්ග වලට නොගැලපේ",
+  "report.reasons.spam": "එය අයාචිතයි",
+  "report.reasons.spam_description": "අනිෂ්ට සබැඳි, ව්‍යාජ නියැලීම, හෝ පුනරාවර්තන පිළිතුරු",
+  "report.reasons.violation": "එය සේවාදායකයේ නීති කඩ කරයි",
+  "report.reasons.violation_description": "එය නිශ්චිත නීති කඩ කරන බව ඔබ දන්නවා",
+  "report.rules.subtitle": "අදාළ සියල්ල තෝරන්න",
+  "report.rules.title": "කුමන නීති උල්ලංඝනය කරන්නේද?",
+  "report.statuses.subtitle": "අදාළ සියල්ල තෝරන්න",
+  "report.statuses.title": "මෙම වාර්තාව උපස්ථ කරන පෝස්ට් තිබේද?",
   "report.submit": "යොමන්න",
-  "report.target": "Report {target}",
+  "report.target": "වාර්තාව {target}",
+  "report.thanks.take_action": "Mastodon හි ඔබ දකින දේ පාලනය කිරීම සඳහා ඔබේ විකල්ප මෙන්න:",
+  "report.thanks.take_action_actionable": "අපි මෙය සමාලෝචනය කරන අතරතුර, ඔබට @{name}ට එරෙහිව පියවර ගත හැක:",
+  "report.thanks.title": "මෙය නොපෙන්විය යුතුද?",
+  "report.thanks.title_actionable": "වාර්තා කිරීමට ස්තූතියි, අපි මේ ගැන සොයා බලමු.",
+  "report.unfollow": "@{name}අනුගමනය නොකරන්න",
+  "report.unfollow_explanation": "ඔබ මෙම ගිණුම අනුගමනය කරයි. ඔබේ නිවසේ සංග්‍රහයේ ඔවුන්ගේ පළ කිරීම් තවදුරටත් නොදැකීමට, ඒවා අනුගමනය නොකරන්න.",
+  "report_notification.attached_statuses": "{count, plural, one {ලිපි {count}} other {ලිපි {count} ක්}} අමුණා ඇත",
+  "report_notification.categories.other": "වෙනත්",
+  "report_notification.categories.spam": "ආයාචිත",
+  "report_notification.categories.violation": "නීතිය කඩ කිරීම",
+  "report_notification.open": "විවෘත වාර්තාව",
   "search.placeholder": "සොයන්න",
-  "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search.search_or_paste": "Search or paste URL",
+  "search_popout.search_format": "උසස් සෙවුම් ආකෘතිය",
+  "search_popout.tips.full_text": "සරල පෙළ ඔබ ලියා ඇති, ප්‍රිය කළ, වැඩි කළ හෝ සඳහන් කර ඇති තත්ත්වයන් මෙන්ම ගැළපෙන පරිශීලක නාම, සංදර්ශක නම් සහ හැෂ් ටැග් ලබා දෙයි.",
+  "search_popout.tips.hashtag": "හෑෂ් ටැගය",
+  "search_popout.tips.status": "ලිපිය",
+  "search_popout.tips.text": "සරල පෙළ ගැළපෙන සංදර්ශක නම්, පරිශීලක නාම සහ හැෂ් ටැග් ලබා දෙයි",
   "search_popout.tips.user": "පරිශීලක",
   "search_results.accounts": "මිනිසුන්",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "@{name} අවහිර කරන්න",
-  "status.bookmark": "පොත් යොමුව",
+  "search_results.all": "සියල්ල",
+  "search_results.hashtags": "හැෂ් ටැග්",
+  "search_results.nothing_found": "මෙම සෙවුම් පද සඳහා කිසිවක් සොයාගත නොහැකි විය",
+  "search_results.statuses": "ලිපි",
+  "search_results.statuses_fts_disabled": "මෙම Mastodon සේවාදායකයේ ඒවායේ අන්තර්ගතය අනුව මෙවලම් සෙවීම සබල නොවේ.",
+  "search_results.title": "Search for {q}",
+  "search_results.total": "{count, number} {count, plural, one {ප්රතිඵලය} other {ප්රතිපල}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+  "status.admin_account": "@{name}සඳහා මධ්‍යස්ථ අතුරුමුහුණත විවෘත කරන්න",
+  "status.admin_status": "මධ්‍යස්ථ අතුරුමුහුණතෙහි මෙම තත්ත්වය විවෘත කරන්න",
+  "status.block": "@{name} අවහිර",
+  "status.bookmark": "පොත්යොමුවක්",
   "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.copy": "Copy link to status",
-  "status.delete": "Delete",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "@{name} සෘජු පණිවිඩය",
-  "status.embed": "එබ්බවූ",
+  "status.cannot_reblog": "මෙම තනතුර වැඩි කළ නොහැක",
+  "status.copy": "තත්වයට සබැඳිය පිටපත් කරන්න",
+  "status.delete": "මකන්න",
+  "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
+  "status.direct": "@{name} සෘජු පණිවිඩයක්",
+  "status.edit": "සංස්කරණය",
+  "status.edited": "සංශෝධිතයි {date}",
+  "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
+  "status.embed": "කාවැද්දූ",
   "status.favourite": "ප්‍රියතම",
+  "status.filter": "Filter this post",
   "status.filtered": "පෙරන ලද",
-  "status.load_more": "තව පූරණය කරන්න",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} නිර්මාණය {date}",
+  "status.history.edited": "{name} සංස්කරණය {date}",
+  "status.load_more": "තව පූරණය",
   "status.media_hidden": "මාධ්‍ය සඟවා ඇත",
   "status.mention": "@{name} සැඳහුම",
   "status.more": "තව",
-  "status.mute": "@{name} නිහඬ කරන්න",
-  "status.mute_conversation": "සංවාදය නිහඬ කරන්න",
-  "status.open": "Expand this status",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned toot",
+  "status.mute": "@{name} නිහඬව",
+  "status.mute_conversation": "සංවාදය නිහඬව",
+  "status.open": "මෙම ලිපිය විහිදන්න",
+  "status.pin": "පැතිකඩට අමුණන්න",
+  "status.pinned": "ඇමිණූ ලිපියකි",
   "status.read_more": "තව කියවන්න",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "{name} boosted",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "පොත්යොමුව ඉවත් කරන්න",
+  "status.reblog": "බූස්ට් කරන්න",
+  "status.reblog_private": "මුල් දෘශ්‍යතාව සමඟ වැඩි කරන්න",
+  "status.reblogged_by": "{name} වැඩි කරන ලදී",
+  "status.reblogs.empty": "තාම කවුරුත් මේ toot එක boost කරලා නැහැ. යමෙකු එසේ කළ විට, ඔවුන් මෙහි පෙන්වනු ඇත.",
+  "status.redraft": "මකන්න සහ නැවත කෙටුම්පත",
+  "status.remove_bookmark": "පොත්යොමුව ඉවතලන්න",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "පිළිතුරු",
-  "status.replyAll": "Reply to thread",
-  "status.report": "@{name} වාර්තා කරන්න",
+  "status.replyAll": "ත්‍රෙඩ් එකට පිළිතුරු දෙන්න",
+  "status.report": "@{name} වාර්තාව",
   "status.sensitive_warning": "සංවේදී අන්තර්ගතයකි",
   "status.share": "බෙදාගන්න",
+  "status.show_filter_reason": "කෙසේ වුවද පෙන්වන්න",
   "status.show_less": "අඩුවෙන් පෙන්වන්න",
-  "status.show_less_all": "Show less for all",
-  "status.show_more": "තව පෙන්වන්න",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Federated",
+  "status.show_less_all": "සියල්ල අඩුවෙන් පෙන්වන්න",
+  "status.show_more": "තවත් පෙන්වන්න",
+  "status.show_more_all": "සියල්ල වැඩියෙන් පෙන්වන්න",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
+  "status.uncached_media_warning": "නොතිබේ",
+  "status.unmute_conversation": "සංවාදය නොනිහඬ",
+  "status.unpin": "පැතිකඩෙන් ගළවන්න",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "වෙනස්කම් සුරකින්න",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "suggestions.dismiss": "යෝජනාව ඉවතලන්න",
+  "suggestions.header": "ඔබ…ගැන උනන්දු විය හැකිය",
+  "tabs_bar.federated_timeline": "ෆෙඩරල්",
   "tabs_bar.home": "මුල් පිටුව",
   "tabs_bar.local_timeline": "ස්ථානීය",
   "tabs_bar.notifications": "දැනුම්දීම්",
-  "tabs_bar.search": "සොයන්න",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "උඩුගත කිරීමට ඇද දමන්න",
-  "upload_button.label": "Add images, a video or an audio file",
-  "upload_error.limit": "ගොනුව උඩුගත කළ හැකි සීමාව ඉක්මවා ඇත.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
+  "time_remaining.days": "{number, plural, one {# දින} other {# දින}} අත්හැරියා",
+  "time_remaining.hours": "{number, plural, one {# පැය} other {# පැය}} අත්හැරියා",
+  "time_remaining.minutes": "{number, plural, one {විනාඩි #} other {# මිනිත්තු}} අත්හැරියා",
+  "time_remaining.moments": "ඉතිරිව ඇති මොහොත",
+  "time_remaining.seconds": "{number, plural, one {# දෙවැනි} other {# තත්පර}} අත්හැරියා",
+  "timeline_hint.remote_resource_not_displayed": "වෙනත් සේවාදායකයන්ගෙන් {resource} දර්ශනය නොවේ.",
+  "timeline_hint.resources.followers": "අනුගාමිකයින්",
+  "timeline_hint.resources.follows": "අනුගමනය",
+  "timeline_hint.resources.statuses": "පරණ ලිපි",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.trending_now": "දැන් ප්‍රවණතාවය",
+  "ui.beforeunload": "ඔබ මාස්ටඩන් හැර ගියහොත් කටුපිටපත අහිමි වේ.",
+  "units.short.billion": "{count}බී",
+  "units.short.million": "ද.ල. {count}",
+  "units.short.thousand": "{count}කි",
+  "upload_area.title": "උඩුගතයට ඇද දමන්න",
+  "upload_button.label": "රූප, දෘශ්‍යක හෝ හඬපට යොදන්න",
+  "upload_error.limit": "සීමාව ඉක්මවා ඇත.",
+  "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
+  "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
+  "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
+  "upload_form.description_missing": "සවිස්තරයක් නැත",
   "upload_form.edit": "සංස්කරණය",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
+  "upload_form.undo": "මකන්න",
+  "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
   "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
   "upload_modal.apply": "යොදන්න",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "පින්තුරයක් තෝරන්න",
+  "upload_modal.applying": "යොදමින්…",
+  "upload_modal.choose_image": "රූපයක් තෝරන්න",
   "upload_modal.description_placeholder": "කඩිසර දුඹුරු හිවලෙක් කම්මැලි බල්ලා මතින් පනී",
-  "upload_modal.detect_text": "පින්තූරයෙන් පාඨ හඳුනාගන්න",
+  "upload_modal.detect_text": "රූපයෙහි පෙළ අනාවරණය",
   "upload_modal.edit_media": "මාධ්‍ය සංස්කරණය",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.hint": "සියලුම සිඟිති රූ මත සැම විටම දර්ශනය වන නාභි ලක්ෂ්‍යය තේරීමට පෙරදසුනෙහි රවුම ක්ලික් කරන්න හෝ අදින්න.",
+  "upload_modal.preparing_ocr": "OCR…සූදානම් කරමින්",
   "upload_modal.preview_label": "පෙරදසුන ({ratio})",
   "upload_progress.label": "උඩුගත වෙමින්...",
+  "upload_progress.processing": "Processing…",
   "video.close": "දෘශ්‍යකය වසන්න",
   "video.download": "ගොනුව බාගන්න",
   "video.exit_fullscreen": "පූර්ණ තිරයෙන් පිටවන්න",
-  "video.expand": "Expand video",
+  "video.expand": "දෘශ්‍යකය විහිදන්න",
   "video.fullscreen": "පූර්ණ තිරය",
   "video.hide": "දෘශ්‍යකය සඟවන්න",
-  "video.mute": "Mute sound",
+  "video.mute": "ශබ්දය නිහඬ",
   "video.pause": "විරාමය",
   "video.play": "ධාවනය",
-  "video.unmute": "Unmute sound"
+  "video.unmute": "ශබ්දය නොනිහඬ"
 }
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 5911881bb..0e9177c7d 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderované servery",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon je bezplatný softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Dôvod nie je k dispozícii",
+  "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverse. Toto sú výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
+  "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ho nevyhľadáte alebo sa neprihlásite k jeho sledovaniu.",
+  "about.domain_blocks.silenced.title": "Obmedzená",
+  "about.domain_blocks.suspended.explanation": "Žiadne údaje z tohto servera nebudú spracovávané, ukladané ani vymieňané, čo znemožní akúkoľvek interakciu alebo komunikáciu s používateľmi z tohto servera.",
+  "about.domain_blocks.suspended.title": "Vylúčený/á",
+  "about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
+  "about.powered_by": "Decentralizované sociálne médiá poháňané technológiou {mastodon}",
+  "about.rules": "Serverové pravidlá",
   "account.account_note_header": "Poznámka",
   "account.add_or_remove_from_list": "Pridaj do, alebo odober zo zoznamov",
   "account.badges.bot": "Bot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Ukry všetko z {domain}",
   "account.blocked": "Blokovaný/á",
   "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
-  "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
+  "account.cancel_follow_request": "Stiahni žiadosť o nasledovanie",
   "account.direct": "Priama správa pre @{name}",
-  "account.disable_notifications": "Prestaň oboznamovať keď má príspevky @{name}",
+  "account.disable_notifications": "Prestaň oznamovať, keď má príspevky @{name}",
   "account.domain_blocked": "Doména ukrytá",
   "account.edit_profile": "Uprav profil",
   "account.enable_notifications": "Oboznamuj ma, keď má @{name} príspevky",
   "account.endorse": "Zobrazuj na profile",
+  "account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
+  "account.featured_tags.last_status_never": "Žiadne príspevky",
+  "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}",
   "account.follow": "Nasleduj",
   "account.followers": "Sledujúci",
-  "account.followers.empty": "Tohto používateľa ešte nikto nenásleduje.",
+  "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúci} other {{counter} Sledujúci}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.following": "Nasledujem",
+  "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
   "account.follows.empty": "Tento používateľ ešte nikoho nenasleduje.",
   "account.follows_you": "Nasleduje ťa",
+  "account.go_to_profile": "Prejdi na profil",
   "account.hide_reblogs": "Skry vyzdvihnutia od @{name}",
-  "account.joined": "Pridal/a sa v {date}",
-  "account.last_status": "Naposledy aktívny",
+  "account.joined_short": "Pridal/a sa",
+  "account.languages": "Zmeniť odoberané jazyky",
   "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
   "account.locked_info": "Stav súkromia pre tento účet je nastavený na zamknutý. Jeho vlastník sám prehodnocuje, kto ho môže sledovať.",
   "account.media": "Médiá",
   "account.mention": "Spomeň @{name}",
-  "account.moved_to": "{name} sa presunul/a na:",
+  "account.moved_to": "{name} uvádza, že jeho/jej nový účet je:",
   "account.mute": "Nevšímaj si @{name}",
   "account.mute_notifications": "Stĺm oboznámenia od @{name}",
-  "account.muted": "Utíšený/á",
-  "account.never_active": "Nikdy",
-  "account.posts": "Príspevkov",
-  "account.posts_with_replies": "Príspevky, aj s odpoveďami",
+  "account.muted": "Nevšímaný/á",
+  "account.open_original_page": "Otvor pôvodnú stránku",
+  "account.posts": "Príspevky/ov",
+  "account.posts_with_replies": "Príspevky a odpovede",
   "account.report": "Nahlás @{name}",
   "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Zdieľaj @{name} profil",
   "account.show_reblogs": "Ukáž vyzdvihnutia od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Prestaň skrývať {domain}",
+  "account.unblock_short": "Odblokuj",
   "account.unendorse": "Nezobrazuj na profile",
   "account.unfollow": "Prestaň následovať",
   "account.unmute": "Prestaň ignorovať @{name}",
-  "account.unmute_notifications": "Zruš stĺmenie oboznámení od @{name}",
+  "account.unmute_notifications": "Zruš nevšímanie si oznámení od @{name}",
+  "account.unmute_short": "Zruš nevšímanie",
   "account_note.placeholder": "Klikni pre vloženie poznámky",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Miera udržania používateľov podľa dňa po registrácii",
+  "admin.dashboard.monthly_retention": "Miera udržania používateľov podľa mesiaca po registrácii",
+  "admin.dashboard.retention.average": "Priemer",
+  "admin.dashboard.retention.cohort": "Mesiac zaregistrovania sa",
+  "admin.dashboard.retention.cohort_size": "Noví užívatelia",
   "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tempo obmedzené",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Oboznámenie",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(nespracované)",
+  "audio.hide": "Skry zvuk",
   "autosuggest_hashtag.per_week": "{count} týždenne",
   "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
-  "bundle_column_error.body": "Pri načítaní tohto prvku nastala nejaká chyba.",
+  "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
+  "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
+  "bundle_column_error.error.title": "Ale nie!",
+  "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s Vaším internetovým pripojením alebo týmto serverom.",
+  "bundle_column_error.network.title": "Chyba siete",
   "bundle_column_error.retry": "Skús to znova",
-  "bundle_column_error.title": "Chyba siete",
+  "bundle_column_error.return": "Prejdi späť na domovskú stránku",
+  "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istý, že zadaná adresa URL je správna?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvor",
   "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
   "bundle_modal_error.retry": "Skúsiť znova",
+  "closed_registrations.other_server_instructions": "Keďže Mastodon je decentralizovaný, môžete si vytvoriť účet na inom serveri a stále komunikovať s týmto serverom.",
+  "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale majte prosím na pamäti, že nepotrebujete účet práve na {domain}, aby bolo možné používať Mastodon.",
+  "closed_registrations_modal.find_another_server": "Nájdi iný server",
+  "closed_registrations_modal.preamble": "Mastodon je decentralizovaný, takže bez ohľadu na to, kde si vytvoríte účet, budete môcť sledovať a komunikovať s kýmkoľvek na tomto serveri. Môžete ho dokonca hostiť sami!",
+  "closed_registrations_modal.title": "Registrácia na Mastodon",
+  "column.about": "O tomto serveri",
   "column.blocks": "Blokovaní užívatelia",
   "column.bookmarks": "Záložky",
   "column.community": "Miestna časová os",
@@ -75,7 +109,7 @@
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
-  "column.mutes": "Ignorovaní užívatelia",
+  "column.mutes": "Nevšímaní užívatelia",
   "column.notifications": "Oboznámenia",
   "column.pins": "Pripnuté príspevky",
   "column.public": "Federovaná časová os",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Iba miestna",
   "community.column_settings.media_only": "Iba médiá",
   "community.column_settings.remote_only": "Iba odľahlé",
-  "compose_form.direct_message_warning": "Tento príspevok bude boslaný iba spomenutým užívateľom.",
+  "compose.language.change": "Zmeň jazyk",
+  "compose.language.search": "Hľadaj medzi jazykmi...",
   "compose_form.direct_message_warning_learn_more": "Zisti viac",
+  "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
   "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.",
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Odstráň túto voľbu",
   "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
-  "compose_form.publish": "Pošli",
+  "compose_form.publish": "Zverejni",
+  "compose_form.publish_form": "Zverejniť",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Ulož zmeny",
   "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
   "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
   "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
@@ -114,19 +152,21 @@
   "confirmations.block.block_and_report": "Zablokuj a nahlás",
   "confirmations.block.confirm": "Blokuj",
   "confirmations.block.message": "Si si istý/á, že chceš blokovať {name}?",
+  "confirmations.cancel_follow_request.confirm": "Odvolanie žiadosti",
+  "confirmations.cancel_follow_request.message": "Naozaj chcete stiahnuť svoju žiadosť o sledovanie {name}?",
   "confirmations.delete.confirm": "Vymaž",
   "confirmations.delete.message": "Si si istý/á, že chceš vymazať túto správu?",
   "confirmations.delete_list.confirm": "Vymaž",
   "confirmations.delete_list.message": "Si si istý/á, že chceš natrvalo vymazať tento zoznam?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Zahoď",
+  "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
   "confirmations.domain_block.confirm": "Skry celú doménu",
   "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.logout.confirm": "Odhlás sa",
   "confirmations.logout.message": "Si si istý/á, že sa chceš odhlásiť?",
-  "confirmations.mute.confirm": "Ignoruj",
+  "confirmations.mute.confirm": "Nevšímaj si",
   "confirmations.mute.explanation": "Toto nastavenie pred tebou skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa následovať.",
-  "confirmations.mute.message": "Naozaj chceš ignorovať {name}?",
+  "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
   "confirmations.redraft.confirm": "Vyčisti a prepíš",
   "confirmations.redraft.message": "Si si istý/á, že chceš premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.reply.confirm": "Odpovedz",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Označ za prečítané",
   "conversation.open": "Ukáž konverzáciu",
   "conversation.with": "S {names}",
+  "copypaste.copied": "Skopírované",
+  "copypaste.copy": "Kopíruj",
   "directory.federated": "Zo známého fedivesmíru",
   "directory.local": "Iba z {domain}",
   "directory.new_arrivals": "Nové príchody",
   "directory.recently_active": "Nedávno aktívne",
+  "disabled_account_banner.account_settings": "Nastavenia účtu",
+  "disabled_account_banner.text": "Vaše konto {disabledAccount} je momentálne vypnuté.",
+  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
+  "dismissable_banner.dismiss": "Zrušiť",
+  "dismissable_banner.explore_links": "O týchto správach práve teraz hovoria ľudia na tomto a ďalších serveroch decentralizovanej siete.",
+  "dismissable_banner.explore_statuses": "Tieto príspevky z tohto a ďalších serverov v decentralizovanej sieti získavajú na tomto serveri práve teraz na sile.",
+  "dismissable_banner.explore_tags": "Tieto hashtagy práve teraz získavajú popularitu medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
+  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí z tohto a ďalších serverov decentralizovanej siete, o ktorých tento server vie.",
   "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
   "embed.preview": "Tu je ako to bude vyzerať:",
   "emoji_button.activity": "Aktivita",
+  "emoji_button.clear": "Vyčisti",
   "emoji_button.custom": "Vlastné",
   "emoji_button.flags": "Vlajky",
   "emoji_button.food": "Jedlá a nápoje",
@@ -158,13 +209,14 @@
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
   "empty_column.account_suspended": "Účet bol vylúčený",
-  "empty_column.account_timeline": "Niesú tu žiadne príspevky!",
+  "empty_column.account_timeline": "Niesu tu žiadne príspevky!",
   "empty_column.account_unavailable": "Profil nedostupný",
   "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
   "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
   "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
   "empty_column.direct": "Ešte nemáš žiadne priame správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
+  "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
   "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.",
   "empty_column.favourites": "Tento toot si ešte nikto neobľúbil. Ten kto si ho obľúbi, bude zobrazený tu.",
   "empty_column.follow_recommendations": "Zdá sa že pre Vás nemohli byť vygenerované žiadne návrhy. Môžete skúsiť použiť vyhľadávanie aby ste našli ľudi ktorých poznáte, alebo preskúmať trendujúce heštegy.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Skús ich vypnúť, a obnoviť túto stránku. Ak to nepomôže, pravdepodobne budeš stále môcť Mastodon používať cez iný prehliadač, alebo natívnu aplikáciu.",
   "errors.unexpected_crash.copy_stacktrace": "Skopíruj stacktrace do schránky",
   "errors.unexpected_crash.report_issue": "Nahlás problém",
+  "explore.search_results": "Výsledky hľadania",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Objavuj",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
+  "filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
+  "filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
+  "filter_modal.added.expired_title": "Vypršala platnosť filtra!",
+  "filter_modal.added.review_and_configure": "Ak chcete skontrolovať a ďalej konfigurovať túto kategóriu filtrov, prejdite na odkaz {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Nastavenie triedenia",
+  "filter_modal.added.settings_link": "stránka s nastaveniami",
+  "filter_modal.added.short_explanation": "Tento príspevok bol pridaný do nasledujúcej kategórie filtrov: {title}.",
+  "filter_modal.added.title": "Triedenie pridané!",
+  "filter_modal.select_filter.context_mismatch": "sa na tento kontext nevzťahuje",
+  "filter_modal.select_filter.expired": "vypršalo",
+  "filter_modal.select_filter.prompt_new": "Nová kategória: {name}",
+  "filter_modal.select_filter.search": "Vyhľadávať alebo vytvoriť",
+  "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
+  "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
+  "filter_modal.title.status": "Filtrovanie príspevku",
   "follow_recommendations.done": "Hotovo",
   "follow_recommendations.heading": "Následuj ľudí od ktorých by si chcel/a vidieť príspevky! Tu sú nejaké návrhy.",
   "follow_recommendations.lead": "Príspevky od ľudi ktorých sledujete sa zobrazia v chronologickom poradí na Vašej nástenke. Nebojte sa spraviť chyby, vždy môžete zrušiť sledovanie konkrétnych ľudí!",
   "follow_request.authorize": "Povoľ prístup",
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "footer.about": "O",
+  "footer.directory": "Adresár profilov",
+  "footer.get_app": "Stiahnuť aplikáciu",
+  "footer.invite": "Pozvi ľudí",
+  "footer.keyboard_shortcuts": "Klávesové skratky",
+  "footer.privacy_policy": "Zásady súkromia",
+  "footer.source_code": "Zobraziť zdrojový kód",
   "generic.saved": "Uložené",
-  "getting_started.developers": "Vývojári",
-  "getting_started.directory": "Zoznam profilov",
-  "getting_started.documentation": "Dokumentácia",
   "getting_started.heading": "Začni tu",
-  "getting_started.invite": "Pozvi ľudí",
-  "getting_started.open_source_notice": "Mastodon je softvér s otvoreným kódom. Nahlásiť chyby, alebo prispievať môžeš na GitHube v {github}.",
-  "getting_started.security": "Zabezpečenie",
-  "getting_started.terms": "Podmienky prevozu",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
@@ -207,23 +281,37 @@
   "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
   "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
+  "hashtag.follow": "Nasleduj haštag",
+  "hashtag.unfollow": "Nesleduj haštag",
   "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
   "home.column_settings.show_replies": "Ukáž odpovede",
   "home.hide_announcements": "Skry oboznámenia",
   "home.show_announcements": "Ukáž oboznámenia",
+  "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok obľúbiť, aby ste dali autorovi vedieť, že ho oceňujete, a uložiť si ho na neskôr.",
+  "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
+  "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
+  "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
+  "interaction_modal.on_another_server": "Na inom serveri",
+  "interaction_modal.on_this_server": "Na tomto serveri",
+  "interaction_modal.other_server_instructions": "Skopírujte a vložte túto adresu URL do vyhľadávacieho poľa vašej obľúbenej aplikácie Mastodon alebo do webového rozhrania vášho servera Mastodon.",
+  "interaction_modal.preamble": "Keďže Mastodon je decentralizovaný, ak nemáte účet na tomto serveri, môžete použiť svoj existujúci účet hostovaný na inom serveri Mastodon alebo kompatibilnej platforme.",
+  "interaction_modal.title.favourite": "Obľúbiť si {name}ov/in príspevok",
+  "interaction_modal.title.follow": "Nasleduj {name}",
+  "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
+  "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok",
   "intervals.full.days": "{number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodín}}",
   "intervals.full.minutes": "{number, plural, one {# minúta} few {# minút} many {# minút} other {# minút}}",
   "keyboard_shortcuts.back": "dostať sa naspäť",
   "keyboard_shortcuts.blocked": "otvor zoznam blokovaných užívateľov",
-  "keyboard_shortcuts.boost": "vyzdvihnúť",
+  "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
   "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
   "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
   "keyboard_shortcuts.description": "Popis",
   "keyboard_shortcuts.direct": "pre otvorenie panelu priamých správ",
   "keyboard_shortcuts.down": "posunúť sa dole v zozname",
-  "keyboard_shortcuts.enter": "otvoriť správu",
+  "keyboard_shortcuts.enter": "Otvor príspevok",
   "keyboard_shortcuts.favourite": "pridaj do obľúbených",
   "keyboard_shortcuts.favourites": "otvor zoznam obľúbených",
   "keyboard_shortcuts.federated": "otvor federovanú časovú os",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Rozšíriť náhľad obrázku",
   "lightbox.next": "Ďalšie",
   "lightbox.previous": "Predchádzajúci",
+  "limited_account_hint.action": "Ukáž profil aj tak",
+  "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
   "lists.account.add": "Pridaj do zoznamu",
   "lists.account.remove": "Odober zo zoznamu",
   "lists.delete": "Vymaž list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
   "missing_indicator.label": "Nenájdené",
   "missing_indicator.sublabel": "Tento zdroj sa ešte nepodarilo nájsť",
+  "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.duration": "Trvanie",
   "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
   "mute_modal.indefinite": "Bez obmedzenia",
-  "navigation_bar.apps": "Aplikácie",
+  "navigation_bar.about": "O tomto serveri",
   "navigation_bar.blocks": "Blokovaní užívatelia",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Miestna časová os",
@@ -284,20 +375,23 @@
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Uprav profil",
+  "navigation_bar.explore": "Objavuj",
   "navigation_bar.favourites": "Obľúbené",
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
   "navigation_bar.follows_and_followers": "Sledovania a následovatelia",
-  "navigation_bar.info": "O tomto serveri",
-  "navigation_bar.keyboard_shortcuts": "Klávesové skratky",
   "navigation_bar.lists": "Zoznamy",
   "navigation_bar.logout": "Odhlás sa",
-  "navigation_bar.mutes": "Ignorovaní užívatelia",
+  "navigation_bar.mutes": "Stíšení užívatelia",
   "navigation_bar.personal": "Osobné",
   "navigation_bar.pins": "Pripnuté príspevky",
   "navigation_bar.preferences": "Nastavenia",
   "navigation_bar.public_timeline": "Federovaná časová os",
+  "navigation_bar.search": "Hľadaj",
   "navigation_bar.security": "Zabezbečenie",
+  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
+  "notification.admin.report": "{name} nahlásil/a {target}",
+  "notification.admin.sign_up": "{name} sa zaregistroval/a",
   "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
   "notification.follow": "{name} ťa začal/a následovať",
   "notification.follow_request": "{name} žiada ťa následovať",
@@ -306,13 +400,16 @@
   "notification.poll": "Anketa v ktorej si hlasoval/a sa skončila",
   "notification.reblog": "{name} zdieľal/a tvoj príspevok",
   "notification.status": "{name} práve uverejnil/a",
+  "notification.update": "{name} upravil/a príspevok",
   "notifications.clear": "Vyčisti oboznámenia",
   "notifications.clear_confirmation": "Naozaj chceš nenávratne prečistiť všetky tvoje oboznámenia?",
+  "notifications.column_settings.admin.report": "Nové hlásenia:",
+  "notifications.column_settings.admin.sign_up": "Nové registrácie:",
   "notifications.column_settings.alert": "Oboznámenia na ploche",
   "notifications.column_settings.favourite": "Obľúbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobraz všetky kategórie",
   "notifications.column_settings.filter_bar.category": "Rýchle triedenie",
-  "notifications.column_settings.filter_bar.show": "Ukáž",
+  "notifications.column_settings.filter_bar.show_bar": "Ukáž filtrovací panel",
   "notifications.column_settings.follow": "Noví sledujúci:",
   "notifications.column_settings.follow_request": "Nové žiadosti o následovanie:",
   "notifications.column_settings.mention": "Zmienenia:",
@@ -321,15 +418,17 @@
   "notifications.column_settings.reblog": "Vyzdvihnutia:",
   "notifications.column_settings.show": "Ukáž v stĺpci",
   "notifications.column_settings.sound": "Prehraj zvuk",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Značenia neprečítaných oboznámení",
+  "notifications.column_settings.status": "Nové príspevky:",
+  "notifications.column_settings.unread_notifications.category": "Neprečítané oboznámenia",
+  "notifications.column_settings.unread_notifications.highlight": "Zdôrazni neprečítané oboznámenia",
+  "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Všetky",
   "notifications.filter.boosts": "Vyzdvihnutia",
   "notifications.filter.favourites": "Obľúbené",
   "notifications.filter.follows": "Sledovania",
   "notifications.filter.mentions": "Iba spomenutia",
   "notifications.filter.polls": "Výsledky ankiet",
-  "notifications.filter.statuses": "Aktualizácie od ľudí, ktorých následuješ",
+  "notifications.filter.statuses": "Aktualizácie od ľudí, ktorých nasleduješ",
   "notifications.grant_permission": "Udeľ povolenie.",
   "notifications.group": "{count} oboznámení",
   "notifications.mark_as_read": "Označ každé oboznámenie za prečítané",
@@ -337,7 +436,7 @@
   "notifications.permission_denied_alert": "Oboznámenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača o to, bola už skôr zamietnutá",
   "notifications.permission_required": "Oboznámenia na ploche sú nedostupné, pretože potrebné povolenia neboli udelené.",
   "notifications_permission_banner.enable": "Povoliť oboznámenia na plochu",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nikdy nezmeškaj jedinú vec",
   "picture_in_picture.restore": "Vrátiť späť",
   "poll.closed": "Uzatvorená",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
   "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Súkromne",
+  "privacy.direct.short": "Iba spomenutým ľudom",
   "privacy.private.long": "Pošli iba následovateľom",
   "privacy.private.short": "Iba pre sledujúcich",
-  "privacy.public.long": "Pošli všetkým verejne",
+  "privacy.public.long": "Viditeľné pre všetkých",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Neposielaj do verejných časových osí",
+  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
   "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
+  "privacy_policy.last_updated": "Posledná úprava {date}",
+  "privacy_policy.title": "Zásady súkromia",
   "refresh": "Obnoviť",
   "regeneration_indicator.label": "Načítava sa…",
-  "regeneration_indicator.sublabel": "Vaša nástenka sa pripravuje!",
+  "regeneration_indicator.sublabel": "Tvoja domovská nástenka sa pripravuje!",
   "relative_time.days": "{number}dní",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "práve teraz",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}hod",
   "relative_time.just_now": "teraz",
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušiť",
+  "report.block": "Blokuj",
+  "report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
+  "report.categories.other": "Ostatné",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
+  "report.category.subtitle": "Vyberte si najlepšiu voľbu",
+  "report.category.title": "Povedzte nám, čo sa deje s týmto {type}",
+  "report.category.title_account": "profilom",
+  "report.category.title_status": "príspevkom",
+  "report.close": "Hotovo",
+  "report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
   "report.forward": "Posuň ku {target}",
   "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
-  "report.hint": "Toto nahlásenie bude zaslané správcom tvojho servera. Môžeš napísať odvôvodnenie, prečo nahlasuješ tento účet:",
+  "report.mute": "Nevšímaj si",
+  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že sú stlmené.",
+  "report.next": "Ďalej",
   "report.placeholder": "Ďalšie komentáre",
+  "report.reasons.dislike": "Nepáči sa mi",
+  "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
+  "report.reasons.other": "Je to niečo iné",
+  "report.reasons.other_description": "Tento problém nepatrí do iných kategórií",
+  "report.reasons.spam": "Je to spam",
+  "report.reasons.spam_description": "Škodlivé odkazy, falošné zapojenie alebo opakované odpovede",
+  "report.reasons.violation": "Porušuje pravidlá servera",
+  "report.reasons.violation_description": "Ste si vedomí, že porušuje špecifické pravidlá",
+  "report.rules.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
+  "report.rules.title": "Ktoré pravidlá sa porušujú?",
+  "report.statuses.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Odošli",
   "report.target": "Nahlás {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Nechceš to vidieť?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Nesleduj @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Ostatné",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Hľadaj",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Pokročilé vyhľadávanie",
   "search_popout.tips.full_text": "Vráti jednoduchý textový výpis príspevkov ktoré si napísal/a, ktoré si obľúbil/a, povýšil/a, alebo aj tých, v ktorých si bol/a spomenutý/á, a potom všetky zadaniu odpovedajúce prezývky, mená a haštagy.",
   "search_popout.tips.hashtag": "haštag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Vráti jednoduchý textový výpis zhodujúcich sa mien, prezývok a haštagov",
   "search_popout.tips.user": "užívateľ",
   "search_results.accounts": "Ľudia",
+  "search_results.all": "Všetky",
   "search_results.hashtags": "Haštagy",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Príspevky",
   "search_results.statuses_fts_disabled": "Vyhľadávanie v obsahu príspevkov nieje na tomto Mastodon serveri povolené.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {výsledok} many {výsledkov} other {výsledky}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Správcom je:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Zisti viac",
+  "server_banner.server_stats": "Serverové štatistiky:",
+  "sign_in_banner.create_account": "Vytvor účet",
+  "sign_in_banner.sign_in": "Prihlás sa",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
   "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
   "status.block": "Blokuj @{name}",
@@ -396,15 +551,22 @@
   "status.delete": "Zmazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",
   "status.direct": "Priama správa pre @{name}",
+  "status.edit": "Uprav",
+  "status.edited": "Upravené {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Vložiť",
   "status.favourite": "Páči sa mi",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtrované",
+  "status.hide": "Skry príspevok",
+  "status.history.created": "{name} vytvoril/a {date}",
+  "status.history.edited": "{name} upravil/a {date}",
   "status.load_more": "Ukáž viac",
   "status.media_hidden": "Skryté médiá",
   "status.mention": "Spomeň @{name}",
   "status.more": "Viac",
-  "status.mute": "Utíš @{name}",
-  "status.mute_conversation": "Ignoruj konverzáciu",
+  "status.mute": "Nevšímaj si @{name}",
+  "status.mute_conversation": "Nevšímaj si konverzáciu",
   "status.open": "Otvor tento príspevok",
   "status.pin": "Pripni na profil",
   "status.pinned": "Pripnutý príspevok",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Nikto ešte nevyzdvihol tento príspevok. Keď tak niekto urobí, bude to zobrazené práve tu.",
   "status.redraft": "Vymaž a prepíš",
   "status.remove_bookmark": "Odstráň záložku",
+  "status.replied_to": "Odpoveď na {name}",
   "status.reply": "Odpovedať",
   "status.replyAll": "Odpovedz na diskusiu",
   "status.report": "Nahlás @{name}",
   "status.sensitive_warning": "Chúlostivý obsah",
   "status.share": "Zdieľaj",
+  "status.show_filter_reason": "Ukáž aj tak",
   "status.show_less": "Zobraz menej",
   "status.show_less_all": "Všetkým ukáž menej",
   "status.show_more": "Ukáž viac",
   "status.show_more_all": "Všetkým ukáž viac",
-  "status.show_thread": "Ukáž diskusné vlákno",
+  "status.show_original": "Ukáž pôvodný",
+  "status.translate": "Preložiť",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Nedostupný/é",
-  "status.unmute_conversation": "Prestaň ignorovať konverzáciu",
+  "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
   "status.unpin": "Odopni z profilu",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Ulož zmeny",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Zavrhni návrh",
   "suggestions.header": "Mohlo by ťa zaujímať…",
   "tabs_bar.federated_timeline": "Federovaná",
   "tabs_bar.home": "Domov",
   "tabs_bar.local_timeline": "Miestna",
   "tabs_bar.notifications": "Oboznámenia",
-  "tabs_bar.search": "Hľadaj",
   "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
   "time_remaining.hours": "Ostáva {number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodiny}}",
   "time_remaining.minutes": "Ostáva {number, plural, one {# minúta} few {# minút} many {# minút} other {# minúty}}",
@@ -442,9 +610,9 @@
   "time_remaining.seconds": "Ostáva {number, plural, one {# sekunda} few {# sekúnd} many {# sekúnd} other {# sekúnd}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazí.",
   "timeline_hint.resources.followers": "Sledujúci",
-  "timeline_hint.resources.follows": "Následuje",
+  "timeline_hint.resources.follows": "Nasleduje",
   "timeline_hint.resources.statuses": "Staršie príspevky",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} človek rozpráva} few {{counter} ľudia rozprávajú} many {{counter} ľudia rozprávajú} other {{counter} ľudí rozpráva}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Teraz populárne",
   "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
   "units.short.billion": "{count}mld.",
@@ -456,6 +624,7 @@
   "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
   "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
   "upload_form.description": "Opis pre slabo vidiacich",
+  "upload_form.description_missing": "Nepridaný žiadny popis",
   "upload_form.edit": "Uprav",
   "upload_form.thumbnail": "Zmeniť miniatúru",
   "upload_form.undo": "Vymaž",
@@ -471,13 +640,14 @@
   "upload_modal.preparing_ocr": "Pripravujem OCR…",
   "upload_modal.preview_label": "Náhľad ({ratio})",
   "upload_progress.label": "Nahráva sa...",
+  "upload_progress.processing": "Processing…",
   "video.close": "Zavri video",
   "video.download": "Stiahni súbor",
   "video.exit_fullscreen": "Vypni zobrazenie na celú obrazovku",
   "video.expand": "Zväčši video",
   "video.fullscreen": "Zobraz na celú obrazovku",
   "video.hide": "Skry video",
-  "video.mute": "Vypni zvuk",
+  "video.mute": "Stlm zvuk",
   "video.pause": "Pauza",
   "video.play": "Prehraj",
   "video.unmute": "Zapni zvuk"
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 0919fc3cd..2616c8e7d 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -1,259 +1,349 @@
 {
+  "about.blocks": "Moderirani strežniki",
+  "about.contact": "Stik:",
+  "about.disclaimer": "Mastodon je prosto, odprto-kodno programje in blagovna znamka Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razlog ni na voljo",
+  "about.domain_blocks.preamble": "Mastodon vam splošno omogoča ogled vsebin in interakcijo z uporabniki iz vseh drugih strežnikov v fediverzumu. To so izjeme, opravljene na tem strežniku.",
+  "about.domain_blocks.silenced.explanation": "V splošnem ne boste videli profilov in vsebin s tega strežnika, če jih eksplicino ne poiščete ali nanje naročite s sledenjem.",
+  "about.domain_blocks.silenced.title": "Omejeno",
+  "about.domain_blocks.suspended.explanation": "Nobeni podatki s tega strežnika ne bodo obdelani, shranjeni ali izmenjani, zaradi česar je nemogoča kakršna koli interakcija ali komunikacija z uporabniki s tega strežnika.",
+  "about.domain_blocks.suspended.title": "Suspendiran",
+  "about.not_available": "Ti podatki še niso na voljo na tem strežniku.",
+  "about.powered_by": "Decentraliziran družabni medij, ki ga poganja {mastodon}",
+  "about.rules": "Pravila strežnika",
   "account.account_note_header": "Opombe",
-  "account.add_or_remove_from_list": "Dodaj ali odstrani iz seznama",
+  "account.add_or_remove_from_list": "Dodaj ali odstrani s seznamov",
   "account.badges.bot": "Robot",
-  "account.badges.group": "Group",
+  "account.badges.group": "Skupina",
   "account.block": "Blokiraj @{name}",
-  "account.block_domain": "Skrij vse iz {domain}",
+  "account.block_domain": "Blokiraj domeno {domain}",
   "account.blocked": "Blokirano",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.browse_more_on_origin_server": "Brskaj več po izvirnem profilu",
+  "account.cancel_follow_request": "Umakni zahtevo za sledenje",
   "account.direct": "Neposredno sporočilo @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Skrita domena",
+  "account.disable_notifications": "Ne obveščaj me več, ko ima @{name} novo objavo",
+  "account.domain_blocked": "Blokirana domena",
   "account.edit_profile": "Uredi profil",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Zmožnost profila",
+  "account.enable_notifications": "Obvesti me, ko ima @{name} novo objavo",
+  "account.endorse": "Izpostavi v profilu",
+  "account.featured_tags.last_status_at": "Zadnja objava {date}",
+  "account.featured_tags.last_status_never": "Ni objav",
+  "account.featured_tags.title": "Izpostavljeni ključniki {name}",
   "account.follow": "Sledi",
   "account.followers": "Sledilci",
   "account.followers.empty": "Nihče ne sledi temu uporabniku.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.followers_counter": "{count, plural, one {ima {counter} sledilca} two {ima {counter} sledilca} few {ima {counter} sledilce} other {ima {counter} sledilcev}}",
+  "account.following": "Sledim",
+  "account.following_counter": "{count, plural, one {sledi {count} osebi} two {sledi {count} osebama} few {sledi {count} osebam} other {sledi {count} osebam}}",
   "account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
-  "account.follows_you": "Sledi tebi",
-  "account.hide_reblogs": "Skrij spodbude od @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Zadnja dejavnost",
+  "account.follows_you": "Vam sledi",
+  "account.go_to_profile": "Pojdi na profil",
+  "account.hide_reblogs": "Skrij izpostavitve od @{name}",
+  "account.joined_short": "Pridružil/a",
+  "account.languages": "Spremeni naročene jezike",
   "account.link_verified_on": "Lastništvo te povezave je bilo preverjeno {date}",
   "account.locked_info": "Stanje zasebnosti računa je nastavljeno na zaklenjeno. Lastnik ročno pregleda, kdo ga lahko spremlja.",
   "account.media": "Mediji",
   "account.mention": "Omeni @{name}",
-  "account.moved_to": "{name} se je premaknil na:",
+  "account.moved_to": "{name} nakazuje, da ima zdaj nov račun:",
   "account.mute": "Utišaj @{name}",
   "account.mute_notifications": "Utišaj obvestila od @{name}",
   "account.muted": "Utišan",
-  "account.never_active": "Nikoli",
-  "account.posts": "Tuti",
-  "account.posts_with_replies": "Tuti in odgovori",
+  "account.open_original_page": "Odpri izvirno stran",
+  "account.posts": "Objave",
+  "account.posts_with_replies": "Objave in odgovori",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
-  "account.share": "Delite profil osebe @{name}",
-  "account.show_reblogs": "Pokaži spodbude osebe @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.requested_follow": "{name} vam želi slediti",
+  "account.share": "Deli profil osebe @{name}",
+  "account.show_reblogs": "Pokaži izpostavitve osebe @{name}",
+  "account.statuses_counter": "{count, plural, one {{count} tut} two {{count} tuta} few {{count} tuti} other {{count} tutov}}",
   "account.unblock": "Odblokiraj @{name}",
-  "account.unblock_domain": "Razkrij {domain}",
+  "account.unblock_domain": "Odblokiraj domeno {domain}",
+  "account.unblock_short": "Odblokiraj",
   "account.unendorse": "Ne vključi v profil",
   "account.unfollow": "Prenehaj slediti",
   "account.unmute": "Odtišaj @{name}",
   "account.unmute_notifications": "Vklopi obvestila od @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
+  "account.unmute_short": "Odtišaj",
+  "account_note.placeholder": "Kliknite za dodajanje opombe",
+  "admin.dashboard.daily_retention": "Mera ohranjanja uporabnikov po dnevih od registracije",
+  "admin.dashboard.monthly_retention": "Mera ohranjanja uporabnikov po mesecih od registracije",
+  "admin.dashboard.retention.average": "Povprečje",
+  "admin.dashboard.retention.cohort": "Mesec prijave",
+  "admin.dashboard.retention.cohort_size": "Novi uporabniki",
+  "alert.rate_limited.message": "Poskusite znova čez {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Hitrost omejena",
   "alert.unexpected.message": "Zgodila se je nepričakovana napaka.",
-  "alert.unexpected.title": "Uups!",
-  "announcement.announcement": "Announcement",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "alert.unexpected.title": "Ojoj!",
+  "announcement.announcement": "Obvestilo",
+  "attachments_list.unprocessed": "(neobdelano)",
+  "audio.hide": "Skrij zvok",
+  "autosuggest_hashtag.per_week": "{count} na teden",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
-  "bundle_column_error.body": "Med nalaganjem te komponente je prišlo do napake.",
-  "bundle_column_error.retry": "Poskusi ponovno",
-  "bundle_column_error.title": "Napaka omrežja",
+  "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
+  "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
+  "bundle_column_error.error.title": "Oh, ne!",
+  "bundle_column_error.network.body": "Pri poskusu nalaganja te strani je prišlo do napake. Vzrok je lahko začasna težava z vašo internetno povezavo ali s tem strežnikom.",
+  "bundle_column_error.network.title": "Napaka v omrežju",
+  "bundle_column_error.retry": "Poskusi znova",
+  "bundle_column_error.return": "Nazaj domov",
+  "bundle_column_error.routing.body": "Zahtevane strani ni mogoče najti. Ali ste prepričani, da je naslov URL v naslovni vrstici pravilen?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zapri",
   "bundle_modal_error.message": "Med nalaganjem te komponente je prišlo do napake.",
-  "bundle_modal_error.retry": "Poskusi ponovno",
+  "bundle_modal_error.retry": "Poskusi znova",
+  "closed_registrations.other_server_instructions": "Ker je Mastodon decentraliziran, lahko ustvarite račun na drugem strežniku in ste še vedno v interakciji s tem.",
+  "closed_registrations_modal.description": "Odpiranje računa na {domain} trenutno ni možno, upoštevajte pa, da ne potrebujete računa prav na {domain}, da bi uporabljali Mastodon.",
+  "closed_registrations_modal.find_another_server": "Najdi drug strežnik",
+  "closed_registrations_modal.preamble": "Mastodon je decentraliziran, kar pomeni, da ni pomembno, kje ustvarite svoj račun; od koder koli je omogočeno sledenje in interakcija z vsemi s tega strežnika. Strežnik lahko gostite tudi sami!",
+  "closed_registrations_modal.title": "Registracija v Mastodon",
+  "column.about": "O programu",
   "column.blocks": "Blokirani uporabniki",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Lokalna časovnica",
+  "column.bookmarks": "Zaznamki",
+  "column.community": "Krajevna časovnica",
   "column.direct": "Neposredna sporočila",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Skrite domene",
+  "column.directory": "Prebrskaj profile",
+  "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Priljubljene",
   "column.follow_requests": "Sledi prošnjam",
   "column.home": "Domov",
   "column.lists": "Seznami",
   "column.mutes": "Utišani uporabniki",
   "column.notifications": "Obvestila",
-  "column.pins": "Pripeti tuti",
+  "column.pins": "Pripete objave",
   "column.public": "Združena časovnica",
   "column_back_button.label": "Nazaj",
   "column_header.hide_settings": "Skrij nastavitve",
   "column_header.moveLeft_settings": "Premakni stolpec na levo",
   "column_header.moveRight_settings": "Premakni stolpec na desno",
   "column_header.pin": "Pripni",
-  "column_header.show_settings": "Prikaži nastavitve",
+  "column_header.show_settings": "Pokaži nastavitve",
   "column_header.unpin": "Odpni",
   "column_subheading.settings": "Nastavitve",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo mediji",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "Ta tut bo viden le vsem omenjenim uporabnikom.",
-  "compose_form.direct_message_warning_learn_more": "Nauči se več",
-  "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim ključnikom, ker ni javen. Samo javne tute lahko iščete s ključniki.",
+  "community.column_settings.remote_only": "Samo oddaljeno",
+  "compose.language.change": "Spremeni jezik",
+  "compose.language.search": "Poišči jezik ...",
+  "compose_form.direct_message_warning_learn_more": "Izvej več",
+  "compose_form.encryption_warning": "Objave na Mastodonu niso šifrirane od kraja do kraja. Prek Mastodona ne delite nobenih občutljivih informacij.",
+  "compose_form.hashtag_warning": "Ta objava ne bo navedena pod nobenim ključnikom, ker ni javna. Samo javne objave lahko iščete s ključniki.",
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
-  "compose_form.placeholder": "O čem razmišljaš?",
+  "compose_form.placeholder": "O čem razmišljate?",
   "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
   "compose_form.poll.option_placeholder": "Izbira {number}",
   "compose_form.poll.remove_option": "Odstrani to izbiro",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Tutni",
+  "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
+  "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
+  "compose_form.publish": "Objavi",
+  "compose_form.publish_form": "Objavi",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Označi medij kot občutljiv",
-  "compose_form.sensitive.marked": "Medij je označen kot občutljiv",
-  "compose_form.sensitive.unmarked": "Medij ni označen kot občutljiv",
-  "compose_form.spoiler.marked": "Besedilo je skrito za opozorilom",
-  "compose_form.spoiler.unmarked": "Besedilo ni skrito",
+  "compose_form.save_changes": "Shrani spremembe",
+  "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
+  "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
+  "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
+  "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
+  "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
   "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
   "confirmation_modal.cancel": "Prekliči",
-  "confirmations.block.block_and_report": "Blokiraj in Prijavi",
+  "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
+  "confirmations.cancel_follow_request.confirm": "Umakni zahtevo",
+  "confirmations.cancel_follow_request.message": "Ali ste prepričani, da želite umakniti svojo zahtevo, da bi sledili {name}?",
   "confirmations.delete.confirm": "Izbriši",
-  "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to stanje?",
+  "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to objavo?",
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Skrij celotno domeno",
+  "confirmations.discard_edit_media.confirm": "Opusti",
+  "confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
+  "confirmations.domain_block.confirm": "Blokiraj celotno domeno",
   "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.logout.confirm": "Odjava",
+  "confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišanje",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "S tem boste skrili objave pred njimi in objave, ki jih omenjajo, še vedno pa bodo lahko videli vaše objave in vam sledili.",
   "confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
-  "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in spodbude bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
+  "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovarjanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
   "confirmations.unfollow.confirm": "Prenehaj slediti",
   "confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Vstavi ta status na svojo spletno stran tako, da kopirate spodnjo kodo.",
+  "conversation.delete": "Izbriši pogovor",
+  "conversation.mark_as_read": "Označi kot prebrano",
+  "conversation.open": "Pokaži pogovor",
+  "conversation.with": "Z {names}",
+  "copypaste.copied": "Kopirano",
+  "copypaste.copy": "Kopiraj",
+  "directory.federated": "Iz znanega fediverzuma",
+  "directory.local": "Samo iz {domain}",
+  "directory.new_arrivals": "Novi prišleki",
+  "directory.recently_active": "Nedavno aktiven/a",
+  "disabled_account_banner.account_settings": "Nastavitve računa",
+  "disabled_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen.",
+  "dismissable_banner.community_timeline": "To so najnovejše javne objave oseb, katerih računi gostujejo na {domain}.",
+  "dismissable_banner.dismiss": "Opusti",
+  "dismissable_banner.explore_links": "O teh novicah ravno zdaj veliko govorijo osebe na tem in drugih strežnikih decentraliziranega omrežja.",
+  "dismissable_banner.explore_statuses": "Te objave s tega in drugih strežnikov v decentraliziranem omrežju pridobivajo ravno zdaj veliko pozornosti na tem strežniku.",
+  "dismissable_banner.explore_tags": "Ravno zdaj dobivajo ti ključniki veliko pozoronosti med osebami na tem in drugih strežnikih decentraliziranega omrežja.",
+  "dismissable_banner.public_timeline": "To so zadnje javne objave oseb na tem in drugih strežnikih decentraliziranega omrežja, za katera ve ta strežnik.",
+  "embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
   "embed.preview": "Tako bo izgledalo:",
   "emoji_button.activity": "Dejavnost",
+  "emoji_button.clear": "Počisti",
   "emoji_button.custom": "Po meri",
   "emoji_button.flags": "Zastave",
-  "emoji_button.food": "Hrana in Pijača",
+  "emoji_button.food": "Hrana in pijača",
   "emoji_button.label": "Vstavi emotikon",
   "emoji_button.nature": "Narava",
-  "emoji_button.not_found": "Ni emotikonov!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Ni zadetkov med emotikoni",
   "emoji_button.objects": "Predmeti",
   "emoji_button.people": "Ljudje",
   "emoji_button.recent": "Pogosto uporabljeni",
-  "emoji_button.search": "Poišči...",
+  "emoji_button.search": "Poišči ...",
   "emoji_button.search_results": "Rezultati iskanja",
   "emoji_button.symbols": "Simboli",
-  "emoji_button.travel": "Potovanja in Kraji",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "Tukaj ni tutov!",
+  "emoji_button.travel": "Potovanja in kraji",
+  "empty_column.account_suspended": "Račun je suspendiran",
+  "empty_column.account_timeline": "Tukaj ni objav!",
   "empty_column.account_unavailable": "Profil ni na voljo",
   "empty_column.blocks": "Niste še blokirali nobenega uporabnika.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
+  "empty_column.bookmarked_statuses": "Zaenkrat še nimate zaznamovanih objav. Ko objavo zaznamujete, se pojavi tukaj.",
+  "empty_column.community": "Krajevna časovnica je prazna. Napišite nekaj javnega, da se bo snežna kepa zakotalila!",
   "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
-  "empty_column.domain_blocks": "Še vedno ni skritih domen.",
-  "empty_column.favourited_statuses": "Nimate priljubljenih tutov. Ko boste vzljubili kakšnega, se bo prikazal tukaj.",
-  "empty_column.favourites": "Nihče še ni vzljubil tega tuta. Ko ga bo nekdo, se bo pojavil tukaj.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.domain_blocks": "Zaenkrat ni blokiranih domen.",
+  "empty_column.explore_statuses": "Trenutno ni nič v trendu. Preverite znova kasneje!",
+  "empty_column.favourited_statuses": "Nimate priljubljenih objav. Ko boste vzljubili kakšno, bo prikazana tukaj.",
+  "empty_column.favourites": "Nihče še ni vzljubil te objave. Ko jo bo nekdo, se bo pojavila tukaj.",
+  "empty_column.follow_recommendations": "Kaže, da za vas ni mogoče pripraviti nobenih predlogov. Poskusite uporabiti iskanje, da poiščete osebe, ki jih poznate, ali raziščete ključnike, ki so v trendu.",
   "empty_column.follow_requests": "Nimate prošenj za sledenje. Ko boste prejeli kakšno, se bo prikazala tukaj.",
   "empty_column.hashtag": "V tem ključniku še ni nič.",
-  "empty_column.home": "Vaša domača časovnica je prazna! Obiščite {public} ali uporabite iskanje, da se boste srečali druge uporabnike.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home": "Vaša domača časovnica je prazna! Sledite več osebam, da jo zapolnite. {suggestions}",
+  "empty_column.home.suggestions": "Oglejte si nekaj predlogov",
   "empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
   "empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
   "empty_column.mutes": "Niste utišali še nobenega uporabnika.",
   "empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
   "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "error.unexpected_crash.explanation": "Zaradi hrošča v naši kodi ali težave z združljivostjo brskalnika te strani ni mogoče ustrezno prikazati.",
+  "error.unexpected_crash.explanation_addons": "Te strani ni mogoče ustrezno prikazati. To napako najverjetneje povzroča dodatek briskalnika ali samodejna orodja za prevajanje.",
+  "error.unexpected_crash.next_steps": "Poskusite osvežiti stran. Če to ne pomaga, boste morda še vedno lahko uporabljali Mastodon prek drugega brskalnika ali z domorodno aplikacijo.",
+  "error.unexpected_crash.next_steps_addons": "Poskusite jih onemogočiti in osvežiti stran. Če to ne pomaga, boste morda še vedno lahko uporabljali Mastodon prek drugega brskalnika ali z domorodno aplikacijo.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiraj sledenje skladu na odložišče",
+  "errors.unexpected_crash.report_issue": "Prijavi težavo",
+  "explore.search_results": "Rezultati iskanja",
+  "explore.suggested_follows": "Za vas",
+  "explore.title": "Razišči",
+  "explore.trending_links": "Novice",
+  "explore.trending_statuses": "Objave",
+  "explore.trending_tags": "Ključniki",
+  "filter_modal.added.context_mismatch_explanation": "Ta kategorija filtra ne velja za kontekst, v katerem ste dostopali do te objave. Če želite, da je objava filtrirana tudi v tem kontekstu, morate urediti filter.",
+  "filter_modal.added.context_mismatch_title": "Neujemanje konteksta!",
+  "filter_modal.added.expired_explanation": "Ta kategorija filtra je pretekla, morali boste spremeniti datum veljavnosti, da bo veljal še naprej.",
+  "filter_modal.added.expired_title": "Filter je pretekel!",
+  "filter_modal.added.review_and_configure": "Če želite pregledati in nadalje prilagoditi kategorijo filtra, obiščite {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Nastavitve filtra",
+  "filter_modal.added.settings_link": "stran nastavitev",
+  "filter_modal.added.short_explanation": "Ta objava je bila dodana v naslednjo kategorijo filtra: {title}.",
+  "filter_modal.added.title": "Filter dodan!",
+  "filter_modal.select_filter.context_mismatch": "ne velja za ta kontekst",
+  "filter_modal.select_filter.expired": "poteklo",
+  "filter_modal.select_filter.prompt_new": "Nova kategorija: {name}",
+  "filter_modal.select_filter.search": "Išči ali ustvari",
+  "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
+  "filter_modal.select_filter.title": "Filtriraj to objavo",
+  "filter_modal.title.status": "Filtrirajte objavo",
+  "follow_recommendations.done": "Opravljeno",
+  "follow_recommendations.heading": "Sledite osebam, katerih objave želite videti! Tukaj je nekaj predlogov.",
+  "follow_recommendations.lead": "Objave oseb, ki jim sledite, se bodo prikazale v kronološkem zaporedju v vašem domačem viru. Ne bojte se storiti napake, osebam enako enostavno nehate slediti kadar koli!",
   "follow_request.authorize": "Overi",
   "follow_request.reject": "Zavrni",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Razvijalci",
-  "getting_started.directory": "Imenik profilov",
-  "getting_started.documentation": "Dokumentacija",
+  "follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
+  "footer.about": "O Mastodonu",
+  "footer.directory": "Imenik profilov",
+  "footer.get_app": "Prenesite aplikacijo",
+  "footer.invite": "Povabite osebe",
+  "footer.keyboard_shortcuts": "Tipkovne bližnjice",
+  "footer.privacy_policy": "Pravilnik o zasebnosti",
+  "footer.source_code": "Pokaži izvorno kodo",
+  "generic.saved": "Shranjeno",
   "getting_started.heading": "Kako začeti",
-  "getting_started.invite": "Povabite osebe",
-  "getting_started.open_source_notice": "Mastodon je odprtokodna programska oprema. Na GitHubu na {github} lahko prispevate ali poročate o napakah.",
-  "getting_started.security": "Varnost",
-  "getting_started.terms": "Pogoji uporabe",
   "hashtag.column_header.tag_mode.all": "in {additional}",
   "hashtag.column_header.tag_mode.any": "ali {additional}",
   "hashtag.column_header.tag_mode.none": "brez {additional}",
   "hashtag.column_settings.select.no_options_message": "Ni najdenih predlogov",
-  "hashtag.column_settings.select.placeholder": "Vpiši ključnik…",
+  "hashtag.column_settings.select.placeholder": "Vnesi ključnike …",
   "hashtag.column_settings.tag_mode.all": "Vse od naštetega",
   "hashtag.column_settings.tag_mode.any": "Karkoli od naštetega",
   "hashtag.column_settings.tag_mode.none": "Nič od naštetega",
   "hashtag.column_settings.tag_toggle": "Za ta stolpec vključi dodatne oznake",
+  "hashtag.follow": "Sledi ključniku",
+  "hashtag.unfollow": "Nehaj slediti ključniku",
   "home.column_settings.basic": "Osnovno",
-  "home.column_settings.show_reblogs": "Pokaži spodbude",
+  "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.hide_announcements": "Skrij obvestila",
+  "home.show_announcements": "Pokaži obvestila",
+  "interaction_modal.description.favourite": "Z računom na Mastodonu lahko to objavo postavite med priljubljene in tako avtorju nakažete, da jo cenite, in jo shranite za kasneje.",
+  "interaction_modal.description.follow": "Z računom na Mastodonu lahko sledite {name}, da prejemate njihove objave v svoj domači vir.",
+  "interaction_modal.description.reblog": "Z računom na Mastodonu lahko izpostavite to objavo, tako da jo delite s svojimi sledilci.",
+  "interaction_modal.description.reply": "Z računom na Mastodonu lahko odgovorite na to objavo.",
+  "interaction_modal.on_another_server": "Na drugem strežniku",
+  "interaction_modal.on_this_server": "Na tem strežniku",
+  "interaction_modal.other_server_instructions": "Kopirajte in prilepite ta URL v polje iskanja vašega priljubljenega programa Mastodon ali spletnega vmesnika vašega strežnika Mastodon.",
+  "interaction_modal.preamble": "Ker je Mastodon decentraliziran, lahko uporabite svoj obstoječi račun, ki gostuje na drugem strežniku Mastodon ali združljivi platformi, če nimate računa na tej.",
+  "interaction_modal.title.favourite": "Daj objavo {name} med priljubljene",
+  "interaction_modal.title.follow": "Sledi {name}",
+  "interaction_modal.title.reblog": "Izpostavi objavo {name}",
+  "interaction_modal.title.reply": "Odgovori na objavo {name}",
   "intervals.full.days": "{number, plural, one {# dan} two {# dni} few {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# ura} two {# uri} few {# ure} other {# ur}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} two {# minuti} few {# minute} other {# minut}}",
-  "keyboard_shortcuts.back": "pojdi nazaj",
-  "keyboard_shortcuts.blocked": "odpri seznam blokiranih uporabnikov",
-  "keyboard_shortcuts.boost": "spodbudi",
-  "keyboard_shortcuts.column": "fokusiraj na status v enemu od stolpcev",
-  "keyboard_shortcuts.compose": "fokusiraj na območje za sestavljanje besedila",
+  "keyboard_shortcuts.back": "Pojdi nazaj",
+  "keyboard_shortcuts.blocked": "Odpri seznam blokiranih uporabnikov",
+  "keyboard_shortcuts.boost": "Izpostavi objavo",
+  "keyboard_shortcuts.column": "Pozornost na stolpec",
+  "keyboard_shortcuts.compose": "Pozornost na območje za sestavljanje besedila",
   "keyboard_shortcuts.description": "Opis",
   "keyboard_shortcuts.direct": "odpri stolpec za neposredna sporočila",
-  "keyboard_shortcuts.down": "premakni se navzdol po seznamu",
-  "keyboard_shortcuts.enter": "odpri status",
-  "keyboard_shortcuts.favourite": "vzljubi",
-  "keyboard_shortcuts.favourites": "odpri seznam priljubljenih",
-  "keyboard_shortcuts.federated": "odpri združeno časovnico",
+  "keyboard_shortcuts.down": "Premakni navzdol po seznamu",
+  "keyboard_shortcuts.enter": "Odpri objavo",
+  "keyboard_shortcuts.favourite": "Vzljubi objavo",
+  "keyboard_shortcuts.favourites": "Odpri seznam priljubljenih",
+  "keyboard_shortcuts.federated": "Odpri združeno časovnico",
   "keyboard_shortcuts.heading": "Tipkovne bližnjice",
-  "keyboard_shortcuts.home": "odpri domačo časovnico",
+  "keyboard_shortcuts.home": "Odpri domačo časovnico",
   "keyboard_shortcuts.hotkey": "Hitra tipka",
-  "keyboard_shortcuts.legend": "pokaži to legendo",
-  "keyboard_shortcuts.local": "odpri lokalno časovnico",
-  "keyboard_shortcuts.mention": "omeni avtorja",
-  "keyboard_shortcuts.muted": "odpri seznam utišanih uporabnikov",
-  "keyboard_shortcuts.my_profile": "odpri svoj profil",
-  "keyboard_shortcuts.notifications": "odpri stolpec z obvestili",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "odpri seznam pripetih tutov",
-  "keyboard_shortcuts.profile": "odpri avtorjev profil",
-  "keyboard_shortcuts.reply": "odgovori",
-  "keyboard_shortcuts.requests": "odpri seznam s prošnjami za sledenje",
-  "keyboard_shortcuts.search": "fokusiraj na iskanje",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "odpri stolpec \"začni\"",
-  "keyboard_shortcuts.toggle_hidden": "prikaži/skrij besedilo za CW",
-  "keyboard_shortcuts.toggle_sensitivity": "prikaži/skrij medije",
-  "keyboard_shortcuts.toot": "začni povsem nov tut",
-  "keyboard_shortcuts.unfocus": "odfokusiraj območje za sestavljanje besedila/iskanje",
-  "keyboard_shortcuts.up": "premakni se navzgor po seznamu",
+  "keyboard_shortcuts.legend": "Pokaži to legendo",
+  "keyboard_shortcuts.local": "Odpri krajevno časovnico",
+  "keyboard_shortcuts.mention": "Omeni avtorja",
+  "keyboard_shortcuts.muted": "Odpri seznam utišanih uporabnikov",
+  "keyboard_shortcuts.my_profile": "Odprite svoj profil",
+  "keyboard_shortcuts.notifications": "Odpri stolpec z obvestili",
+  "keyboard_shortcuts.open_media": "Odpri medij",
+  "keyboard_shortcuts.pinned": "Odpri seznam pripetih objav",
+  "keyboard_shortcuts.profile": "Odpri avtorjev profil",
+  "keyboard_shortcuts.reply": "Odgovori na objavo",
+  "keyboard_shortcuts.requests": "Odpri seznam s prošnjami za sledenje",
+  "keyboard_shortcuts.search": "Pozornost na iskalno vrstico",
+  "keyboard_shortcuts.spoilers": "Pokaži/skrij polje CW",
+  "keyboard_shortcuts.start": "Odpri stolpec \"začni\"",
+  "keyboard_shortcuts.toggle_hidden": "Pokaži/skrij besedilo za CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Pokaži/skrij medije",
+  "keyboard_shortcuts.toot": "Začni povsem novo objavo",
+  "keyboard_shortcuts.unfocus": "Odstrani pozornost z območja za sestavljanje besedila/iskanje",
+  "keyboard_shortcuts.up": "Premakni navzgor po seznamu",
   "lightbox.close": "Zapri",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "Strni ogledno polje slike",
+  "lightbox.expand": "Razširi ogledno polje slike",
   "lightbox.next": "Naslednji",
   "lightbox.previous": "Prejšnji",
+  "limited_account_hint.action": "Vseeno pokaži profil",
+  "limited_account_hint.title": "Profil so moderatorji strežnika {domain} skrili.",
   "lists.account.add": "Dodaj na seznam",
   "lists.account.remove": "Odstrani s seznama",
   "lists.delete": "Izbriši seznam",
@@ -261,218 +351,298 @@
   "lists.edit.submit": "Spremeni naslov",
   "lists.new.create": "Dodaj seznam",
   "lists.new.title_placeholder": "Nov naslov seznama",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
-  "lists.search": "Išči med ljudmi, katerim sledite",
+  "lists.replies_policy.followed": "Vsem sledenim uporabnikom",
+  "lists.replies_policy.list": "Članom seznama",
+  "lists.replies_policy.none": "Nikomur",
+  "lists.replies_policy.title": "Pokaži odgovore:",
+  "lists.search": "Iščite med ljudmi, katerim sledite",
   "lists.subheading": "Vaši seznami",
-  "load_pending": "{count, plural, one {# nov element} other {# novih elementov}}",
-  "loading_indicator.label": "Nalaganje...",
-  "media_gallery.toggle_visible": "Preklopi vidljivost",
+  "load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}",
+  "loading_indicator.label": "Nalaganje ...",
+  "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
   "missing_indicator.label": "Ni najdeno",
   "missing_indicator.sublabel": "Tega vira ni bilo mogoče najti",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Skrij obvestila tega uporabnika?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobilne aplikacije",
+  "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
+  "mute_modal.duration": "Trajanje",
+  "mute_modal.hide_notifications": "Ali želite skriti obvestila tega uporabnika?",
+  "mute_modal.indefinite": "Nedoločeno",
+  "navigation_bar.about": "O Mastodonu",
   "navigation_bar.blocks": "Blokirani uporabniki",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Lokalna časovnica",
-  "navigation_bar.compose": "Sestavi nov tut",
+  "navigation_bar.bookmarks": "Zaznamki",
+  "navigation_bar.community_timeline": "Krajevna časovnica",
+  "navigation_bar.compose": "Sestavi novo objavo",
   "navigation_bar.direct": "Neposredna sporočila",
   "navigation_bar.discover": "Odkrijte",
-  "navigation_bar.domain_blocks": "Skrite domene",
+  "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
+  "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
   "navigation_bar.follow_requests": "Prošnje za sledenje",
   "navigation_bar.follows_and_followers": "Sledenja in sledilci",
-  "navigation_bar.info": "O tem strežniku",
-  "navigation_bar.keyboard_shortcuts": "Hitre tipke",
   "navigation_bar.lists": "Seznami",
   "navigation_bar.logout": "Odjava",
   "navigation_bar.mutes": "Utišani uporabniki",
   "navigation_bar.personal": "Osebno",
-  "navigation_bar.pins": "Pripeti tuti",
+  "navigation_bar.pins": "Pripete objave",
   "navigation_bar.preferences": "Nastavitve",
   "navigation_bar.public_timeline": "Združena časovnica",
+  "navigation_bar.search": "Iskanje",
   "navigation_bar.security": "Varnost",
+  "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.",
+  "notification.admin.report": "{name} je prijavil/a {target}",
+  "notification.admin.sign_up": "{name} se je vpisal/a",
   "notification.favourite": "{name} je vzljubil/a vaš status",
   "notification.follow": "{name} vam sledi",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} vam želi slediti",
   "notification.mention": "{name} vas je omenil/a",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "Glasovanje, v katerem ste sodelovali, se je končalo",
-  "notification.reblog": "{name} je spodbudil/a vaš status",
-  "notification.status": "{name} just posted",
+  "notification.own_poll": "Vaša anketa je zaključena",
+  "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
+  "notification.reblog": "{name} je izpostavila/a vašo objavo",
+  "notification.status": "{name} je pravkar objavil/a",
+  "notification.update": "{name} je uredil(a) objavo",
   "notifications.clear": "Počisti obvestila",
-  "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa vaša obvestila?",
+  "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
+  "notifications.column_settings.admin.report": "Nove prijave:",
+  "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
-  "notifications.column_settings.filter_bar.show": "Pokaži",
+  "notifications.column_settings.filter_bar.show_bar": "Pokaži vrstico s filtri",
   "notifications.column_settings.follow": "Novi sledilci:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
   "notifications.column_settings.mention": "Omembe:",
-  "notifications.column_settings.poll": "Rezultati glasovanja:",
+  "notifications.column_settings.poll": "Rezultati ankete:",
   "notifications.column_settings.push": "Potisna obvestila",
-  "notifications.column_settings.reblog": "Spodbude:",
-  "notifications.column_settings.show": "Prikaži v stolpcu",
+  "notifications.column_settings.reblog": "Izpostavitve:",
+  "notifications.column_settings.show": "Pokaži v stolpcu",
   "notifications.column_settings.sound": "Predvajaj zvok",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.status": "Nove objave:",
+  "notifications.column_settings.unread_notifications.category": "Neprebrana obvestila",
+  "notifications.column_settings.unread_notifications.highlight": "Poudari neprebrana obvestila",
+  "notifications.column_settings.update": "Urejanja:",
   "notifications.filter.all": "Vse",
-  "notifications.filter.boosts": "Spodbude",
+  "notifications.filter.boosts": "Izpostavitev",
   "notifications.filter.favourites": "Priljubljeni",
   "notifications.filter.follows": "Sledi",
   "notifications.filter.mentions": "Omembe",
-  "notifications.filter.polls": "Rezultati glasovanj",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
+  "notifications.filter.polls": "Rezultati anket",
+  "notifications.filter.statuses": "Posodobitve pri osebah, ki jih spremljate",
+  "notifications.grant_permission": "Dovoli.",
   "notifications.group": "{count} obvestil",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
+  "notifications.mark_as_read": "Vsa obvestila označi kot prebrana",
+  "notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
+  "notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
+  "notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+  "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
+  "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
+  "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
+  "picture_in_picture.restore": "Postavi nazaj",
   "poll.closed": "Zaprto",
   "poll.refresh": "Osveži",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural,one {# glas} other {# glasov}}",
+  "poll.total_people": "{count, plural, one {# oseba} two {# osebi} few {# osebe} other {# oseb}}",
+  "poll.total_votes": "{count, plural, one {# glas} two {# glasova} few {# glasovi} other {# glasov}}",
   "poll.vote": "Glasuj",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Glasovali ste za ta odgovor",
+  "poll.votes": "{votes, plural, one {# glas} two {# glasova} few {# glasovi} other {# glasov}}",
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
-  "privacy.change": "Prilagodi zasebnost statusa",
+  "privacy.change": "Spremeni zasebnost objave",
   "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Neposredno",
-  "privacy.private.long": "Objavi samo sledilcem",
+  "privacy.direct.short": "Samo omenjeni",
+  "privacy.private.long": "Vidno samo sledilcem",
   "privacy.private.short": "Samo sledilci",
-  "privacy.public.long": "Objavi na javne časovnice",
+  "privacy.public.long": "Vidno vsem",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Ne objavi na javne časovnice",
+  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
   "privacy.unlisted.short": "Ni prikazano",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Nalaganje…",
+  "privacy_policy.last_updated": "Zadnja posodobitev {date}",
+  "privacy_policy.title": "Pravilnik o zasebnosti",
+  "refresh": "Osveži",
+  "regeneration_indicator.label": "Nalaganje …",
   "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.days": "{number} d",
+  "relative_time.full.days": "{number, plural, one {pred # dnem} two {pred # dnevoma} few {pred # dnevi} other {pred # dnevi}}",
+  "relative_time.full.hours": "{number, plural, one {pred # uro} two {pred # urama} few {pred # urami} other {pred # urami}}",
+  "relative_time.full.just_now": "pravkar",
+  "relative_time.full.minutes": "{number, plural, one {pred # minuto} two {pred # minutama} few {pred # minutami} other {pred # minutami}}",
+  "relative_time.full.seconds": "{number, plural, one {pred # sekundo} two {pred # sekundama} few {pred # sekundami} other {pred # sekundami}}",
+  "relative_time.hours": "{number} u",
   "relative_time.just_now": "zdaj",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
+  "relative_time.minutes": "{number} m",
+  "relative_time.seconds": "{number} s",
   "relative_time.today": "danes",
   "reply_indicator.cancel": "Prekliči",
-  "report.forward": "Posreduj do {target}",
-  "report.forward_hint": "Račun je iz drugega strežnika. Pošljem anonimno kopijo poročila tudi na drugi strežnik?",
-  "report.hint": "Poročilo bo poslano moderatorjem vašega vozlišča. Spodaj lahko navedete, zakaj prijavljate ta račun:",
+  "report.block": "Blokiraj",
+  "report.block_explanation": "Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.",
+  "report.categories.other": "Drugo",
+  "report.categories.spam": "Neželeno",
+  "report.categories.violation": "Vsebina krši eno ali več pravil strežnika",
+  "report.category.subtitle": "Izberite najustreznejši zadetek",
+  "report.category.title": "Povejte nam, kaj se dogaja s to/tem {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "objava",
+  "report.close": "Opravljeno",
+  "report.comment.title": "Je še kaj, za kar menite, da bi morali vedeti?",
+  "report.forward": "Posreduj k {target}",
+  "report.forward_hint": "Račun je z drugega strežnika. Ali želite poslati anonimno kopijo prijave tudi na drugi strežnik?",
+  "report.mute": "Utišaj",
+  "report.mute_explanation": "Njihovih objav ne boste videli. Še vedno vam lahko sledijo in vidijo vaše objave, ne bodo pa vedeli, da so utišani.",
+  "report.next": "Naprej",
   "report.placeholder": "Dodatni komentarji",
+  "report.reasons.dislike": "Ni mi všeč",
+  "report.reasons.dislike_description": "To ni tisto, kar želim videti",
+  "report.reasons.other": "Gre za nekaj drugega",
+  "report.reasons.other_description": "Težava ne sodi v druge kategorije",
+  "report.reasons.spam": "To je neželena vsebina",
+  "report.reasons.spam_description": "Škodljive povezave, lažno prizadevanje ali ponavljajoči se odgovori",
+  "report.reasons.violation": "Krši strežniška pravila",
+  "report.reasons.violation_description": "Zavedate se, da krši določena pravila",
+  "report.rules.subtitle": "Izberite vse, kar ustreza",
+  "report.rules.title": "Katera pravila so kršena?",
+  "report.statuses.subtitle": "Izberite vse, kar ustreza",
+  "report.statuses.title": "Ali so kakšne objave, ki dokazujejo trditve iz te prijave?",
   "report.submit": "Pošlji",
   "report.target": "Prijavi {target}",
+  "report.thanks.take_action": "Tukaj so vaše možnosti za nadzor tistega, kar vidite na Mastodonu:",
+  "report.thanks.take_action_actionable": "Medtem, ko to pregledujemo, lahko proti @{name} ukrepate:",
+  "report.thanks.title": "Ali ne želite tega videti?",
+  "report.thanks.title_actionable": "Hvala za prijavo, bomo preverili.",
+  "report.unfollow": "Ne sledi več @{name}",
+  "report.unfollow_explanation": "Temu računu sledite. Da ne boste več videli njegovih objav v svojem domačem viru, mu prenehajte slediti.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} objava pripeta} two {{count} objavi pripeti} few {{count} objave pripete} other {{count} objav pripetih}}",
+  "report_notification.categories.other": "Drugo",
+  "report_notification.categories.spam": "Neželeno",
+  "report_notification.categories.violation": "Kršitev pravila",
+  "report_notification.open": "Odpri prijavo",
   "search.placeholder": "Iskanje",
+  "search.search_or_paste": "Iščite ali prilepite URL",
   "search_popout.search_format": "Napredna oblika iskanja",
-  "search_popout.tips.full_text": "Enostavno besedilo vrne statuse, ki ste jih napisali, vzljubili, spodbudili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
+  "search_popout.tips.full_text": "Enostavno besedilo vrne objave, ki ste jih napisali, vzljubili, izpostavili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
   "search_popout.tips.hashtag": "ključnik",
-  "search_popout.tips.status": "stanje",
+  "search_popout.tips.status": "objava",
   "search_popout.tips.text": "Enostavno besedilo vrne ujemajoča se prikazna imena, uporabniška imena in ključnike",
   "search_popout.tips.user": "uporabnik",
   "search_results.accounts": "Ljudje",
+  "search_results.all": "Vse",
   "search_results.hashtags": "Ključniki",
-  "search_results.statuses": "Tuti",
-  "search_results.statuses_fts_disabled": "Iskanje tutov po njihovi vsebini ni omogočeno na tem strežniku Mastodon.",
-  "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}",
+  "search_results.nothing_found": "Za ta iskalni niz ni zadetkov",
+  "search_results.statuses": "Objave",
+  "search_results.statuses_fts_disabled": "Iskanje objav po njihovi vsebini ni omogočeno na tem strežniku Mastodon.",
+  "search_results.title": "Išči {q}",
+  "search_results.total": "{count, number} {count, plural, one {rezultat} two {rezultata} few {rezultati} other {rezultatov}}",
+  "server_banner.about_active_users": "Osebe, ki so uporabljale ta strežnik zadnjih 30 dni (dejavni uporabniki meseca)",
+  "server_banner.active_users": "dejavnih uporabnikov",
+  "server_banner.administered_by": "Upravlja:",
+  "server_banner.introduction": "{domain} je del decentraliziranega družbenega omrežja, ki ga poganja {mastodon}.",
+  "server_banner.learn_more": "Več o tem",
+  "server_banner.server_stats": "Statistika strežnika:",
+  "sign_in_banner.create_account": "Ustvari račun",
+  "sign_in_banner.sign_in": "Prijava",
+  "sign_in_banner.text": "Prijavite se, da sledite profilom ali ključnikom, dodajate med priljubljene, delite z drugimi ter odgovarjate na objave, pa tudi ostajate v interakciji iz svojega računa na drugem strežniku.",
   "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
-  "status.admin_status": "Odpri status v vmesniku za moderiranje",
+  "status.admin_status": "Odpri to objavo v vmesniku za moderiranje",
   "status.block": "Blokiraj @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Prekini spodbudo",
-  "status.cannot_reblog": "Te objave ni mogoče spodbuditi",
-  "status.copy": "Kopiraj povezavo do statusa",
+  "status.bookmark": "Dodaj med zaznamke",
+  "status.cancel_reblog_private": "Prekliči izpostavitev",
+  "status.cannot_reblog": "Te objave ni mogoče izpostaviti",
+  "status.copy": "Kopiraj povezavo do objave",
   "status.delete": "Izbriši",
   "status.detailed_status": "Podroben pogled pogovora",
   "status.direct": "Neposredno sporočilo @{name}",
-  "status.embed": "Vgradi",
+  "status.edit": "Uredi",
+  "status.edited": "Urejeno {date}",
+  "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
+  "status.embed": "Vdelaj",
   "status.favourite": "Priljubljen",
+  "status.filter": "Filtriraj to objavo",
   "status.filtered": "Filtrirano",
+  "status.hide": "Skrij tut",
+  "status.history.created": "{name}: ustvarjeno {date}",
+  "status.history.edited": "{name}: urejeno {date}",
   "status.load_more": "Naloži več",
   "status.media_hidden": "Mediji so skriti",
   "status.mention": "Omeni @{name}",
   "status.more": "Več",
   "status.mute": "Utišaj @{name}",
   "status.mute_conversation": "Utišaj pogovor",
-  "status.open": "Razširi ta status",
+  "status.open": "Razširi to objavo",
   "status.pin": "Pripni na profil",
-  "status.pinned": "Pripeti tut",
+  "status.pinned": "Pripeta objava",
   "status.read_more": "Preberi več",
-  "status.reblog": "Spodbudi",
-  "status.reblog_private": "Spodbudi izvirnemu občinstvu",
-  "status.reblogged_by": "{name} spodbuja",
-  "status.reblogs.empty": "Nihče še ni spodbudil tega tuta. Ko se bo to zgodilo, se bodo pojavili tukaj.",
+  "status.reblog": "Izpostavi",
+  "status.reblog_private": "Izpostavi z izvirno vidljivostjo",
+  "status.reblogged_by": "{name} je izpostavil/a",
+  "status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
   "status.redraft": "Izbriši in preoblikuj",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.remove_bookmark": "Odstrani zaznamek",
+  "status.replied_to": "Odgovoril/a {name}",
   "status.reply": "Odgovori",
-  "status.replyAll": "Odgovori na objavo",
+  "status.replyAll": "Odgovori na nit",
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Občutljiva vsebina",
   "status.share": "Deli",
-  "status.show_less": "Prikaži manj",
+  "status.show_filter_reason": "Vseeno pokaži",
+  "status.show_less": "Pokaži manj",
   "status.show_less_all": "Prikaži manj za vse",
-  "status.show_more": "Prikaži več",
-  "status.show_more_all": "Prikaži več za vse",
-  "status.show_thread": "Prikaži objavo",
-  "status.uncached_media_warning": "Not available",
+  "status.show_more": "Pokaži več",
+  "status.show_more_all": "Pokaži več za vse",
+  "status.show_original": "Pokaži izvirnik",
+  "status.translate": "Prevedi",
+  "status.translated_from_with": "Prevedeno iz {lang} s pomočjo {provider}",
+  "status.uncached_media_warning": "Ni na voljo",
   "status.unmute_conversation": "Odtišaj pogovor",
   "status.unpin": "Odpni iz profila",
+  "subscribed_languages.lead": "Po spremembi bodo na vaši domači in seznamski časovnici prikazane objave samo v izbranih jezikih. Izberite brez, da boste prejemali objave v vseh jezikih.",
+  "subscribed_languages.save": "Shrani spremembe",
+  "subscribed_languages.target": "Spremeni naročene jezike za {target}",
   "suggestions.dismiss": "Zavrni predlog",
-  "suggestions.header": "Morda bi vas zanimalo…",
+  "suggestions.header": "Morda bi vas zanimalo …",
   "tabs_bar.federated_timeline": "Združeno",
   "tabs_bar.home": "Domov",
-  "tabs_bar.local_timeline": "Lokalno",
+  "tabs_bar.local_timeline": "Krajevno",
   "tabs_bar.notifications": "Obvestila",
-  "tabs_bar.search": "Iskanje",
-  "time_remaining.days": "{number, plural, one {# dan} other {# dni}} je ostalo",
+  "time_remaining.days": "{number, plural, one {preostaja # dan} two {preostajata # dneva} few {preostajajo # dnevi} other {preostaja # dni}}",
   "time_remaining.hours": "{number, plural, one {# ura} other {# ur}} je ostalo",
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minut}} je ostalo",
   "time_remaining.moments": "Preostali trenutki",
-  "time_remaining.seconds": "{number, plural, one {# sekunda} other {# sekund}} je ostalo",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
+  "time_remaining.seconds": "{number, plural, one {# sekunda je preostala} two {# sekundi sta preostali} few {# sekunde so preostale} other {# sekund je preostalo}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z drugih strežnikov ni prikazano.",
+  "timeline_hint.resources.followers": "sledilcev",
+  "timeline_hint.resources.follows": "Sledi",
+  "timeline_hint.resources.statuses": "Starejše objave",
+  "trends.counter_by_accounts": "{count, plural, one {{count} oseba} two {{count} osebi} few {{count} osebe} other {{count} oseb}} v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
+  "trends.trending_now": "Zdaj v trendu",
   "ui.beforeunload": "Vaš osnutek bo izgubljen, če zapustite Mastodona.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} milijard",
+  "units.short.million": "{count} mio.",
+  "units.short.thousand": "{count} tisoč",
   "upload_area.title": "Za pošiljanje povlecite in spustite",
-  "upload_button.label": "Dodaj medije",
+  "upload_button.label": "Dodajte slike, video ali zvočno datoteko",
   "upload_error.limit": "Omejitev prenosa datoteke je presežena.",
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.description_missing": "Noben opis ni dodan",
+  "upload_form.edit": "Uredi",
+  "upload_form.thumbnail": "Spremeni sličico",
   "upload_form.undo": "Izbriši",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
+  "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
+  "upload_modal.analyzing_picture": "Analiziranje slike …",
+  "upload_modal.apply": "Uveljavi",
+  "upload_modal.applying": "Uveljavljanje poteka …",
+  "upload_modal.choose_image": "Izberite sliko",
   "upload_modal.description_placeholder": "Pri Jakcu bom vzel šest čudežnih fig",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Pošiljanje...",
+  "upload_modal.detect_text": "Zaznaj besedilo v sliki",
+  "upload_modal.edit_media": "Uredi medij",
+  "upload_modal.hint": "Kliknite ali povlecite krog v predogledu, da izberete točko pozornosti, ki bo vedno vidna na vseh oglednih sličicah.",
+  "upload_modal.preparing_ocr": "Priprava optične prepoznave znakov (OCR) …",
+  "upload_modal.preview_label": "Predogled ({ratio})",
+  "upload_progress.label": "Pošiljanje ...",
+  "upload_progress.processing": "Obdelovanje …",
   "video.close": "Zapri video",
-  "video.download": "Download file",
+  "video.download": "Prenesi datoteko",
   "video.exit_fullscreen": "Izhod iz celozaslonskega načina",
   "video.expand": "Razširi video",
   "video.fullscreen": "Celozaslonski način",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 062b566d0..4b5125065 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Shërbyes të moderuar",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon-i është software i lirë, me burim të hapët dhe shenjë tregtare e Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "S’ka arsye",
+  "about.domain_blocks.preamble": "Mastodon-i ju lë përgjithësisht të shihni lëndë prej përdoruesish dhe të ndërveproni me ta nga cilido shërbyes tjetër qofshin në fedivers. Ka përjashtime që janë bërë në këtë shërbyes të dhënë.",
+  "about.domain_blocks.silenced.explanation": "Përgjithësisht s’do të shihni profile dhe lëndë nga ky shërbyes, veç në i kërkofshi shprehimisht apo zgjidhni të bëhet kjo, duke i ndjekur.",
+  "about.domain_blocks.silenced.title": "E kufizuar",
+  "about.domain_blocks.suspended.explanation": "S’do të përpunohen, depozitohen apo shkëmbehen të dhëna të këtij shërbyesi, duke e bërë të pamundur çfarëdo ndërveprimi apo komunikimi me përdorues nga ky shërbyes.",
+  "about.domain_blocks.suspended.title": "E pezulluar",
+  "about.not_available": "Ky informacion nuk jepet në këtë shërbyes.",
+  "about.powered_by": "Media shoqërore e decentralizuar, bazuar në {mastodon}",
+  "about.rules": "Rregulla shërbyesi",
   "account.account_note_header": "Shënim",
   "account.add_or_remove_from_list": "Shtoni ose Hiqni prej listash",
   "account.badges.bot": "Robot",
@@ -7,64 +19,86 @@
   "account.block_domain": "Blloko përkatësinë {domain}",
   "account.blocked": "E bllokuar",
   "account.browse_more_on_origin_server": "Shfletoni më tepër rreth profilit origjinal",
-  "account.cancel_follow_request": "Anulo kërkesë ndjekjeje",
+  "account.cancel_follow_request": "Tërhiq mbrapsht kërkesë për ndjekje",
   "account.direct": "Mesazh i drejtpërdrejtë për @{name}",
   "account.disable_notifications": "Resht së njoftuari mua, kur poston @{name}",
   "account.domain_blocked": "Përkatësia u bllokua",
   "account.edit_profile": "Përpunoni profilin",
   "account.enable_notifications": "Njoftomë, kur poston @{name}",
   "account.endorse": "Pasqyrojeni në profil",
+  "account.featured_tags.last_status_at": "Postimi i fundit më {date}",
+  "account.featured_tags.last_status_never": "Pa postime",
+  "account.featured_tags.title": "Hashtagë të zgjedhur të {name}",
   "account.follow": "Ndiqeni",
   "account.followers": "Ndjekës",
   "account.followers.empty": "Këtë përdorues ende s’e ndjek kush.",
   "account.followers_counter": "{count, plural, one {{counter} Ndjekës} other {{counter} Ndjekës}}",
+  "account.following": "Ndjekje",
   "account.following_counter": "{count, plural, one {{counter} i Ndjekur} other {{counter} të Ndjekur}}",
   "account.follows.empty": "Ky përdorues ende s’ndjek kënd.",
   "account.follows_you": "Ju ndjek",
+  "account.go_to_profile": "Kalo te profili",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
-  "account.joined": "U bë pjesë më {date}",
-  "account.last_status": "Aktiv së fundi më",
+  "account.joined_short": "U bë pjesë",
+  "account.languages": "Ndryshoni gjuhë pajtimesh",
   "account.link_verified_on": "Pronësia e kësaj lidhjeje qe kontrolluar më {date}",
   "account.locked_info": "Gjendja e privatësisë së kësaj llogarie është caktuar si e kyçur. I zoti merr dorazi në shqyrtim cilët mund ta ndjekin.",
   "account.media": "Media",
   "account.mention": "Përmendni @{name}",
-  "account.moved_to": "{name} ka kaluar te:",
+  "account.moved_to": "{name} ka treguar se llogari e vet e re tani është:",
   "account.mute": "Heshtoni @{name}",
   "account.mute_notifications": "Heshtoji njoftimet prej @{name}",
   "account.muted": "Heshtuar",
-  "account.never_active": "Kurrë",
+  "account.open_original_page": "Hap faqen origjinale",
   "account.posts": "Mesazhe",
   "account.posts_with_replies": "Mesazhe dhe përgjigje",
   "account.report": "Raportojeni @{name}",
   "account.requested": "Në pritje të miratimit. Që të anuloni kërkesën për ndjekje, klikojeni",
+  "account.requested_follow": "{name} ka kërkuar t’ju ndjekë",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
   "account.show_reblogs": "Shfaq përforcime nga @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Mesazh} other {{counter} Mesazhe}}",
   "account.unblock": "Zhbllokoje @{name}",
   "account.unblock_domain": "Zhblloko përkatësinë {domain}",
+  "account.unblock_short": "Zhbllokoje",
   "account.unendorse": "Mos e përfshi në profil",
   "account.unfollow": "Resht së ndjekuri",
   "account.unmute": "Ktheji zërin @{name}",
   "account.unmute_notifications": "Hiqua ndalimin e shfaqjes njoftimeve nga @{name}",
+  "account.unmute_short": "Çheshtoje",
   "account_note.placeholder": "Klikoni për të shtuar shënim",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Shkallë mbajtjeje përdoruesi, në ditë, pas regjistrimit",
+  "admin.dashboard.monthly_retention": "Shkallë mbajtjeje përdoruesi, në muaj, pas regjistrimit",
+  "admin.dashboard.retention.average": "Mesatare",
+  "admin.dashboard.retention.cohort": "Muaj regjistrimi",
+  "admin.dashboard.retention.cohort_size": "Përdorues të rinj",
   "alert.rate_limited.message": "Ju lutemi, riprovoni pas {retry_time, time, medium}.",
   "alert.rate_limited.title": "Shpejtësi e kufizuar",
   "alert.unexpected.message": "Ndodhi një gabim të papritur.",
   "alert.unexpected.title": "Hëm!",
   "announcement.announcement": "Lajmërim",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(e papërpunuar)",
+  "audio.hide": "Fshihe audion",
   "autosuggest_hashtag.per_week": "{count} për javë",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
-  "bundle_column_error.body": "Diç shkoi ters teksa ngarkohej ky përbërës.",
+  "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
+  "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
+  "bundle_column_error.error.title": "Oh, mos!",
+  "bundle_column_error.network.body": "Pati një gabim teksa provohej të ngarkohej kjo faqe. Kjo mund të vijë për shkak të një problemi të përkohshëm me lidhjen tuaj internet ose me këtë shërbyes.",
+  "bundle_column_error.network.title": "Gabim rrjeti",
   "bundle_column_error.retry": "Riprovoni",
-  "bundle_column_error.title": "Gabim rrjeti",
+  "bundle_column_error.return": "Shko mbrapsht te kreu",
+  "bundle_column_error.routing.body": "Faqja e kërkuar s’u gjet dot. Jeni i sigurt se URL-ja te shtylla e adresave është e saktë?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Mbylle",
   "bundle_modal_error.message": "Diç shkoi ters teksa ngarkohej ky përbërës.",
   "bundle_modal_error.retry": "Riprovoni",
+  "closed_registrations.other_server_instructions": "Ngaqë Mastodon-i është i decentralizuar, mund të krijoni një llogari në një tjetër shërbyes dhe prapë të ndëveproni me këtë këtu.",
+  "closed_registrations_modal.description": "Krijimi i një llogarie te {domain} aktualisht është i pamundur, por kini parasysh se s’keni nevojë për një llogari posaçërisht në {domain} që të përdorni Mastodon-in.",
+  "closed_registrations_modal.find_another_server": "Gjeni shërbyes tjetër",
+  "closed_registrations_modal.preamble": "Mastodon-i është i decentralizuar, ndaj pavarësisht se ku krijoni llogarinë tuaj, do të jeni në gjendje të ndiqni dhe ndërveproni me këdo në këtë shërbyes. Mundeni madje edhe ta strehoni ju vetë!",
+  "closed_registrations_modal.title": "Po regjistroheni në Mastodon",
+  "column.about": "Mbi",
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Faqerojtës",
   "column.community": "Rrjedhë kohore vendore",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Vetëm vendore",
   "community.column_settings.media_only": "Vetëm Media",
   "community.column_settings.remote_only": "Vetëm të largëta",
-  "compose_form.direct_message_warning": "Ky mesazh do t’u dërgohet përdoruesve të përmendur.",
+  "compose.language.change": "Ndryshoni gjuhën",
+  "compose.language.search": "Kërkoni te gjuhët…",
   "compose_form.direct_message_warning_learn_more": "Mësoni më tepër",
+  "compose_form.encryption_warning": "Postimet në Mastodon nuk fshehtëzohen skaj-më-skaj. Mos ndani me të tjerë gjëra me spec në Mastodon.",
   "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.",
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
-  "compose_form.publish": "Mesazh",
+  "compose_form.publish": "Botoje",
+  "compose_form.publish_form": "Publikoje",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Ruaji ndryshimet",
   "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
   "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
   "confirmations.block.message": "Jeni i sigurt se doni të bllokohet {name}?",
+  "confirmations.cancel_follow_request.confirm": "Tërhiqeni mbrapsht kërkesën",
+  "confirmations.cancel_follow_request.message": "Jeni i sigurt se doni të tërhiqni mbrapsht kërkesën tuaj për ndjekje të {name}?",
   "confirmations.delete.confirm": "Fshije",
   "confirmations.delete.message": "Jeni i sigurt se doni të fshihet kjo gjendje?",
   "confirmations.delete_list.confirm": "Fshije",
   "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Hidhe tej",
+  "confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
   "confirmations.domain_block.confirm": "Bllokoje krejt përkatësinë",
   "confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
   "confirmations.logout.confirm": "Dilni",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
   "conversation.with": "Me {names}",
+  "copypaste.copied": "U kopjua",
+  "copypaste.copy": "Kopjoje",
   "directory.federated": "Nga fedivers i njohur",
   "directory.local": "Vetëm nga {domain}",
   "directory.new_arrivals": "Të ardhur rishtas",
   "directory.recently_active": "Aktivë së fundi",
+  "disabled_account_banner.account_settings": "Rregullime llogarie",
+  "disabled_account_banner.text": "Llogaria juaj {disabledAccount} është aktualisht e çaktivizuar.",
+  "dismissable_banner.community_timeline": "Këto janë postime më të freskëta publike nga persona llogaritë e të cilëve strehohen nga {domain}.",
+  "dismissable_banner.dismiss": "Hidhe tej",
+  "dismissable_banner.explore_links": "Këto histori të reja po tirren nga persona në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.",
+  "dismissable_banner.explore_statuses": "Këto postime nga ky shërbyes dhe të tjerë në rrjetin e decentralizuar po tërheqin vëmendjen tani.",
+  "dismissable_banner.explore_tags": "Këta hashtag-ë po tërheqin vëmendjen mes personave në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.",
+  "dismissable_banner.public_timeline": "Këto janë postimet publike më të freskëta nga persona në këtë shërbyes dhe të tjerë të rrejtit të decentralizuar për të cilët ky shërbyes ka dijeni.",
   "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
   "embed.preview": "Ja si do të duket:",
   "emoji_button.activity": "Veprimtari",
+  "emoji_button.clear": "Spastroje",
   "emoji_button.custom": "Vetjak",
   "emoji_button.flags": "Flamuj",
   "emoji_button.food": "Ushqim & Pije",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.",
   "empty_column.bookmarked_statuses": "S’keni faqeruajtur ende ndonjë mesazh. Kur faqeruani një të tillë, ai do të shfaqet këtu.",
   "empty_column.community": "Rrjedha kohore vendore është e zbrazët. Shkruani diçka publikisht që t’i hyhet valles!",
-  "empty_column.direct": "S’keni ende ndonjë mesazh të drejtpërdrejt. Kur dërgoni ose merrni një të tillë, ai do të shfaqet këtu.",
+  "empty_column.direct": "S’keni ende ndonjë mesazh të drejtpërdrejtë. Kur dërgoni ose merrni një të tillë, ai do të shfaqet këtu.",
   "empty_column.domain_blocks": "Ende s’ka përkatësi të fshehura.",
+  "empty_column.explore_statuses": "Asgjë në modë tani. Kontrolloni më vonë!",
   "empty_column.favourited_statuses": "S’keni ende ndonjë mesazh të parapëlqyer. Kur parapëlqeni një të tillë, ai do të shfaqet këtu.",
   "empty_column.favourites": "Askush s’e ka parapëlqyer ende këtë mesazh. Kur e bën dikush, ai do të shfaqet këtu.",
   "empty_column.follow_recommendations": "Duket se s’u prodhuan dot sugjerime për ju. Mund të provoni të kërkoni për persona që mund të njihni, ose të eksploroni hashtag-ë që janë në modë.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Provoni t’i çaktivizoni dhe të rifreskoni faqen. Nëse kjo s’bën punë, mundeni prapë të jeni në gjendje të përdorni Mastodon-in përmes një shfletuesi tjetër, apo një aplikacioni prej Mastodon-it.",
   "errors.unexpected_crash.copy_stacktrace": "Kopjo stacktrace-in në të papastër",
   "errors.unexpected_crash.report_issue": "Raportoni problemin",
+  "explore.search_results": "Përfundime kërkimi",
+  "explore.suggested_follows": "Për ju",
+  "explore.title": "Eksploroni",
+  "explore.trending_links": "Lajme",
+  "explore.trending_statuses": "Postime",
+  "explore.trending_tags": "Hashtagë",
+  "filter_modal.added.context_mismatch_explanation": "Kjo kategori filtrash nuk aplikohet për kontekstin nën të cilin po merreni me këtë postim. Nëse doni që postimi të filtrohet edhe në këtë kontekst, do t’ju duhet të përpunoni filtrin.",
+  "filter_modal.added.context_mismatch_title": "Mospërputhje kontekstesh!",
+  "filter_modal.added.expired_explanation": "Kjo kategori filtrash ka skaduar, do t’ju duhet të ndryshoni datën e skadimit për të, pa të aplikohet.",
+  "filter_modal.added.expired_title": "Filtër i skaduar!",
+  "filter_modal.added.review_and_configure": "Që të shqyrtoni dhe formësoni më tej këtë kategori filtrash, kaloni te {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Rregullime filtrash",
+  "filter_modal.added.settings_link": "faqe rregullimesh",
+  "filter_modal.added.short_explanation": "Ky postim është shtuar te kategoria vijuese e filtrave: {title}.",
+  "filter_modal.added.title": "U shtua filtër!",
+  "filter_modal.select_filter.context_mismatch": "mos e apliko mbi këtë kontekst",
+  "filter_modal.select_filter.expired": "ka skaduar",
+  "filter_modal.select_filter.prompt_new": "Kategori e re: {name}",
+  "filter_modal.select_filter.search": "Kërkoni, ose krijoni",
+  "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
+  "filter_modal.select_filter.title": "Filtroje këtë postim",
+  "filter_modal.title.status": "Filtroni një postim",
   "follow_recommendations.done": "U bë",
   "follow_recommendations.heading": "Ndiqni persona prej të cilëve doni të shihni postime! Ja ca sugjerime.",
   "follow_recommendations.lead": "Postimet prej personash që ndiqni do të shfaqen në rend kohor te prurja juaj kryesore. Mos kini frikë të bëni gabime, mund të ndalni po aq kollaj ndjekjen e dikujt, në çfarëdo kohe!",
   "follow_request.authorize": "Autorizoje",
   "follow_request.reject": "Hidhe tej",
   "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
+  "footer.about": "Mbi",
+  "footer.directory": "Drejtori profilesh",
+  "footer.get_app": "Merreni aplikacionin",
+  "footer.invite": "Ftoni njerëz",
+  "footer.keyboard_shortcuts": "Shkurtore tastiere",
+  "footer.privacy_policy": "Rregulla privatësie",
+  "footer.source_code": "Shihni kodin burim",
   "generic.saved": "U ruajt",
-  "getting_started.developers": "Zhvillues",
-  "getting_started.directory": "Drejtori profilesh",
-  "getting_started.documentation": "Dokumentim",
   "getting_started.heading": "Si t’ia fillohet",
-  "getting_started.invite": "Ftoni njerëz",
-  "getting_started.open_source_notice": "Mastodon-i është software me burim të hapur. Mund të jepni ndihmesë ose të njoftoni probleme në GitHub, te {github}.",
-  "getting_started.security": "Rregullime llogarie",
-  "getting_started.terms": "Kushte shërbimi",
   "hashtag.column_header.tag_mode.all": "dhe {additional}",
   "hashtag.column_header.tag_mode.any": "ose {additional}",
   "hashtag.column_header.tag_mode.none": "pa {additional}",
@@ -207,53 +281,69 @@
   "hashtag.column_settings.tag_mode.any": "Cilindo prej këtyre",
   "hashtag.column_settings.tag_mode.none": "Asnjë prej këtyre",
   "hashtag.column_settings.tag_toggle": "Përfshi etiketa shtesë për këtë shtyllë",
+  "hashtag.follow": "Ndiqe hashtag-un",
+  "hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
   "home.hide_announcements": "Fshihi lajmërimet",
   "home.show_announcements": "Shfaqi lajmërimet",
+  "interaction_modal.description.favourite": "Me një llogari në Mastodon, mund ta pëlqeni këtë postim, për t’i bërë të ditur autorit se e çmoni dhe e ruani për më vonë.",
+  "interaction_modal.description.follow": "Me një llogari në Mastodon, mund ta ndiqni {name} për të marrë postimet e tyre në prurjen tuaj të kreut.",
+  "interaction_modal.description.reblog": "Me një llogari në Mastodon, mund ta përforconi këtë postim për ta ndarë me ndjekësit tuaj.",
+  "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.",
+  "interaction_modal.on_another_server": "Në një tjetër shërbyes",
+  "interaction_modal.on_this_server": "Në këtë shërbyes",
+  "interaction_modal.other_server_instructions": "Kopjojeni dhe ngjiteni këtë URL te fusha e kërkimeve të aplikacionit tuaj të parapëlqyer Mastodon, ose të ndërfaqes web të shërbyesit tuaj Mastodon.",
+  "interaction_modal.preamble": "Ngaqë Mastodon-i është i decentralizuar, mund të përdorni llogarinë tuaj ekzistuese të sterhuar nga një tjetër shërbyes Mastodon, ose platformë e përputhshme, nëse s’keni një llogari në këtë shërbyes.",
+  "interaction_modal.title.favourite": "Parapëlqejeni postimin e {name}",
+  "interaction_modal.title.follow": "Ndiq {name}",
+  "interaction_modal.title.reblog": "Përforconi postimin e {name}",
+  "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
   "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}",
   "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}",
   "intervals.full.minutes": "{number, plural, one {# minutë} other {# minuta}}",
-  "keyboard_shortcuts.back": "për shkuarje mbrapsht",
-  "keyboard_shortcuts.blocked": "për hapje liste përdoruesish të bllokuar",
-  "keyboard_shortcuts.boost": "për përforcim",
-  "keyboard_shortcuts.column": "për kalim fokusi mbi një gjendje te një nga shtyllat",
-  "keyboard_shortcuts.compose": "për kalim fokusi te fusha e hartimit të mesazheve",
+  "keyboard_shortcuts.back": "Për shkuarje mbrapsht",
+  "keyboard_shortcuts.blocked": "Për hapje liste përdoruesish të bllokuar",
+  "keyboard_shortcuts.boost": "Përforcim postimi",
+  "keyboard_shortcuts.column": "Fokusi mbi një shtyllë",
+  "keyboard_shortcuts.compose": "Fokusi te fusha e hartimit të mesazheve",
   "keyboard_shortcuts.description": "Përshkrim",
   "keyboard_shortcuts.direct": "për hapje shtylle mesazhesh të drejtpërdrejtë",
-  "keyboard_shortcuts.down": "për zbritje poshtë nëpër listë",
-  "keyboard_shortcuts.enter": "për hapje gjendjeje",
-  "keyboard_shortcuts.favourite": "për t’i vënë shenjë si të parapëlqyer",
-  "keyboard_shortcuts.favourites": "për hapje liste të parapëlqyerish",
-  "keyboard_shortcuts.federated": "për hapje rrjedhe kohore të të federuarve",
+  "keyboard_shortcuts.down": "Për zbritje poshtë nëpër listë",
+  "keyboard_shortcuts.enter": "Për hapje postimi",
+  "keyboard_shortcuts.favourite": "Për t’i vënë shenjë si të parapëlqyer një postimi",
+  "keyboard_shortcuts.favourites": "Për hapje liste të parapëlqyerish",
+  "keyboard_shortcuts.federated": "Për hapje rrjedhe kohore të të federuarve",
   "keyboard_shortcuts.heading": "Shkurtore tastiere",
-  "keyboard_shortcuts.home": "për hapje rrjedhe kohore vetjake",
+  "keyboard_shortcuts.home": "Për hapje rrjedhe kohore vetjake",
   "keyboard_shortcuts.hotkey": "Tast përkatës",
-  "keyboard_shortcuts.legend": "për shfaqje të kësaj legjende",
-  "keyboard_shortcuts.local": "për hapje rrjedhe kohore vendore",
-  "keyboard_shortcuts.mention": "për përmendje të autorit",
-  "keyboard_shortcuts.muted": "për hapje liste përdoruesish të heshtuar",
-  "keyboard_shortcuts.my_profile": "për hapjen e profilit tuaj",
-  "keyboard_shortcuts.notifications": "për hapje shtylle njoftimesh",
-  "keyboard_shortcuts.open_media": "për hapje mediash",
-  "keyboard_shortcuts.pinned": "për hapje liste mesazhesh të fiksuar",
-  "keyboard_shortcuts.profile": "për hapje të profilit të autorit",
-  "keyboard_shortcuts.reply": "për t’u përgjigjur",
-  "keyboard_shortcuts.requests": "për hapje liste kërkesash për ndjekje",
-  "keyboard_shortcuts.search": "për kalim fokusi te kërkimi",
-  "keyboard_shortcuts.spoilers": "për shfaqje/fshehje fushe CW",
-  "keyboard_shortcuts.start": "për hapjen e shtyllës “fillojani”",
-  "keyboard_shortcuts.toggle_hidden": "për shfaqje/fshehje teksti pas CW",
-  "keyboard_shortcuts.toggle_sensitivity": "për shfaqje/fshehje mediash",
-  "keyboard_shortcuts.toot": "për të filluar një mesazh fringo të ri",
-  "keyboard_shortcuts.unfocus": "për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve",
-  "keyboard_shortcuts.up": "për ngjitje sipër nëpër listë",
+  "keyboard_shortcuts.legend": "Për shfaqje të kësaj legjende",
+  "keyboard_shortcuts.local": "Për hapje rrjedhe kohore vendore",
+  "keyboard_shortcuts.mention": "Për përmendje të autorit",
+  "keyboard_shortcuts.muted": "Për hapje liste përdoruesish të heshtuar",
+  "keyboard_shortcuts.my_profile": "Për hapjen e profilit tuaj",
+  "keyboard_shortcuts.notifications": "Për hapje shtylle njoftimesh",
+  "keyboard_shortcuts.open_media": "Për hapje mediash",
+  "keyboard_shortcuts.pinned": "Për hapje liste mesazhesh të fiksuar",
+  "keyboard_shortcuts.profile": "Për hapje të profilit të autorit",
+  "keyboard_shortcuts.reply": "Për t’iu përgjigjur një postimi",
+  "keyboard_shortcuts.requests": "Për hapje liste kërkesash për ndjekje",
+  "keyboard_shortcuts.search": "Për kalim fokusi te kërkimi",
+  "keyboard_shortcuts.spoilers": "Për shfaqje/fshehje fushe CW",
+  "keyboard_shortcuts.start": "Për hapjen e shtyllës “fillojani”",
+  "keyboard_shortcuts.toggle_hidden": "Për shfaqje/fshehje teksti pas CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Për shfaqje/fshehje mediash",
+  "keyboard_shortcuts.toot": "Për të filluar një mesazh të ri",
+  "keyboard_shortcuts.unfocus": "Për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve",
+  "keyboard_shortcuts.up": "Për ngjitje sipër nëpër listë",
   "lightbox.close": "Mbylle",
   "lightbox.compress": "Ngjeshe kuadratin e parjes së figurave",
   "lightbox.expand": "Zgjeroje kuadratin e parjes së figurave",
   "lightbox.next": "Pasuesja",
   "lightbox.previous": "E mëparshmja",
+  "limited_account_hint.action": "Shfaqe profilin sido qoftë",
+  "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e {domain}.",
   "lists.account.add": "Shto në listë",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listën",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
   "missing_indicator.label": "S’u gjet",
   "missing_indicator.sublabel": "Ky burim s’u gjet dot",
+  "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
   "mute_modal.duration": "Kohëzgjatje",
   "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?",
   "mute_modal.indefinite": "E pacaktuar",
-  "navigation_bar.apps": "Aplikacione për celular",
+  "navigation_bar.about": "Mbi",
   "navigation_bar.blocks": "Përdorues të bllokuar",
   "navigation_bar.bookmarks": "Faqerojtës",
   "navigation_bar.community_timeline": "Rrjedhë kohore vendore",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
   "navigation_bar.edit_profile": "Përpunoni profilin",
+  "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
   "navigation_bar.follow_requests": "Kërkesa për ndjekje",
   "navigation_bar.follows_and_followers": "Ndjekje dhe ndjekës",
-  "navigation_bar.info": "Mbi këtë shërbyes",
-  "navigation_bar.keyboard_shortcuts": "Taste përkatës",
   "navigation_bar.lists": "Lista",
   "navigation_bar.logout": "Dalje",
   "navigation_bar.mutes": "Përdorues të heshtuar",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Mesazhe të fiksuar",
   "navigation_bar.preferences": "Parapëlqime",
   "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish",
+  "navigation_bar.search": "Kërkoni",
   "navigation_bar.security": "Siguri",
+  "not_signed_in_indicator.not_signed_in": "Që të përdorni këtë burim, lypset të bëni hyrjen.",
+  "notification.admin.report": "{name} raportoi {target}",
+  "notification.admin.sign_up": "{name} u regjistrua",
   "notification.favourite": "{name} pëlqeu mesazhin tuaj",
   "notification.follow": "{name} zuri t’ju ndjekë",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
@@ -306,13 +400,16 @@
   "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.status": "{name} sapo postoi",
+  "notification.update": "{name} përpunoi një postim",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
+  "notifications.column_settings.admin.report": "Raportime të reja:",
+  "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
-  "notifications.column_settings.filter_bar.show": "Shfaq",
+  "notifications.column_settings.filter_bar.show_bar": "Shfaq shtyllë filtrash",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
   "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
   "notifications.column_settings.mention": "Përmendje:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Shfaqi në shtylla",
   "notifications.column_settings.sound": "Luaj një tingull",
   "notifications.column_settings.status": "Mesazhe të rinj:",
-  "notifications.column_settings.unread_markers.category": "Shenja njoftimesh të palexuara",
+  "notifications.column_settings.unread_notifications.category": "Njoftime të palexuara",
+  "notifications.column_settings.unread_notifications.highlight": "Theksoji njoftimet e palexuara",
+  "notifications.column_settings.update": "Përpunime:",
   "notifications.filter.all": "Krejt",
   "notifications.filter.boosts": "Përforcime",
   "notifications.filter.favourites": "Të parapëlqyer",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural,one {# votë }other {# vota }}",
   "poll.vote": "Votoni",
   "poll.voted": "Votuat për këtë përgjigje",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# votë} other {# vota}}",
   "poll_button.add_poll": "Shtoni një pyetësor",
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
   "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "I drejtpërdrejtë",
+  "privacy.direct.short": "Vetëm për personat e përmendur",
   "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekësve",
-  "privacy.public.long": "I dukshëm për të tërë, shfaqur në rrjedha kohore publike",
+  "privacy.private.short": "Vetëm ndjekës",
+  "privacy.public.long": "I dukshëm për të tërë",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por jo në rrjedha kohore publike",
+  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
   "privacy.unlisted.short": "Jo në lista",
+  "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
+  "privacy_policy.title": "Rregulla Privatësie",
   "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",
   "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# ditë} other {# ditë}} më parë",
+  "relative_time.full.hours": "{number, plural, one {# orë} other {# orë}} më parë",
+  "relative_time.full.just_now": "mu tani",
+  "relative_time.full.minutes": "{number, plural, one {# minutë} other {# minuta}} më parë",
+  "relative_time.full.seconds": "{number, plural, one {# sekondë} other {# sekonda}} më parë",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "tani",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
   "reply_indicator.cancel": "Anuloje",
+  "report.block": "Bllokoje",
+  "report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
+  "report.categories.other": "Tjetër",
+  "report.categories.spam": "I padëshiruar",
+  "report.categories.violation": "Lënda shkel një ose disa rregulla shërbyesi",
+  "report.category.subtitle": "Zgjidhni përputhjen më të mirë",
+  "report.category.title": "Tregonani se ç’po ndodh me këtë {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "postim",
+  "report.close": "U bë",
+  "report.comment.title": "Ka ndonjë gjë tjetër që do të duhej ta dinim?",
   "report.forward": "Përcillja {target}",
   "report.forward_hint": "Llogaria është nga një shërbyes tjetër. Të dërgohet edhe një kopje e anonimizuar e raportimit?",
-  "report.hint": "Raportimi do t’u dërgohet moderatorëve të shërbyesit tuaj. Më poshtë mund të jepni një shpjegim se pse po e raportoni këtë llogari:",
+  "report.mute": "Heshtoje",
+  "report.mute_explanation": "S’do të shihni postimet e tyre. Ende mund t’ju ndjekin dhe të shohin postimet tuaja dhe s’do ta dinë që janë heshtuar.",
+  "report.next": "Pasuesi",
   "report.placeholder": "Komente shtesë",
+  "report.reasons.dislike": "S’më pëlqen",
+  "report.reasons.dislike_description": "S’është gjë që do të doja ta shihja",
+  "report.reasons.other": "Është tjetër gjë",
+  "report.reasons.other_description": "Problemi nuk hyn te kategoritë e tjera",
+  "report.reasons.spam": "Është mesazh i padëshiruar",
+  "report.reasons.spam_description": "Lidhje dashakeqe, angazhim i rremë, ose përgjigje të përsëritura",
+  "report.reasons.violation": "Cenon rregulla shërbyesi",
+  "report.reasons.violation_description": "Jeni i ndërgjegjshëm që cenon rregulla specifike",
+  "report.rules.subtitle": "Përzgjidhni gjithçka që ka vend",
+  "report.rules.title": "Cilat rregulla po cenohen?",
+  "report.statuses.subtitle": "Përzgjidhni gjithçka që ka vend",
+  "report.statuses.title": "A ka postime që dëshmojnë problemet e këtij raporti?",
   "report.submit": "Parashtroje",
   "report.target": "Raportim i {target}",
+  "report.thanks.take_action": "Ja mundësitë tuaja për të kontrolluar ç’shihni në Mastodon:",
+  "report.thanks.take_action_actionable": "Teksa e shqyrtojmë, mund të ndërmerrni veprim kundër @{name}:",
+  "report.thanks.title": "S’doni të shihni këtë?",
+  "report.thanks.title_actionable": "Faleminderit për raportimin, do ta shohim.",
+  "report.unfollow": "Mos e ndiq më @{name}",
+  "report.unfollow_explanation": "Po e ndiqni këtë llogari. Për të mos parë më postimet e tyre te prurja juaj e kreut, ndalni ndjekjen e tyre.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postim} other {{count} postime}} bashkëngjitur",
+  "report_notification.categories.other": "Tjetër",
+  "report_notification.categories.spam": "I padëshiruar",
+  "report_notification.categories.violation": "Cenim rregullash",
+  "report_notification.open": "Hape raportimin",
   "search.placeholder": "Kërkoni",
+  "search.search_or_paste": "Kërkoni, ose hidhni një URL",
   "search_popout.search_format": "Format kërkimi të mëtejshëm",
   "search_popout.tips.full_text": "Kërkimi për tekst të thjeshtë përgjigjet me mesazhe që keni shkruar, parapëlqyer, përforcuar, ose ku jeni përmendur, si dhe emra përdoruesish, emra ekrani dhe hashtag-ë që kanë përputhje me termin e kërkimit.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Kërkim për tekst të thjeshtë përgjigjet me emra, emra përdoruesish dhe hashtag-ë që kanë përputhje me termin e kërkimit",
   "search_popout.tips.user": "përdorues",
   "search_results.accounts": "Persona",
+  "search_results.all": "Krejt",
   "search_results.hashtags": "Hashtag-ë",
+  "search_results.nothing_found": "S’u gjet gjë për këto terma kërkimi",
   "search_results.statuses": "Mesazhe",
   "search_results.statuses_fts_disabled": "Kërkimi i mesazheve sipas lëndës së tyre s’është i aktivizuar në këtë shërbyes Mastodon.",
+  "search_results.title": "Kërkoni për {q}",
   "search_results.total": "{count, number} {count, plural, one {përfundim} other {përfundime}}",
+  "server_banner.about_active_users": "Persona që përdorin këtë shërbyes gjatë 30 ditëve të fundit (Përdorues Mujorë Aktivë)",
+  "server_banner.active_users": "përdorues aktivë",
+  "server_banner.administered_by": "Administruar nga:",
+  "server_banner.introduction": "{domain} është pjesë e rrjetit shoqëror të decentralizuar të ngritur mbi {mastodon}.",
+  "server_banner.learn_more": "Mësoni më tepër",
+  "server_banner.server_stats": "Statistika shërbyesi:",
+  "sign_in_banner.create_account": "Krijoni llogari",
+  "sign_in_banner.sign_in": "Hyni",
+  "sign_in_banner.text": "Që të ndiqni profile ose hashtag-ë, të pëlqeni, të ndani me të tjerë dhe të përgjigjeni në postime, apo të ndërveproni me llogarinë tuaj nga një shërbyes tjetër, bëni hyrjen.",
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
   "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit",
   "status.block": "Blloko @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Fshije",
   "status.detailed_status": "Pamje e hollësishme bisede",
   "status.direct": "Mesazh i drejtpërdrejtë për @{name}",
+  "status.edit": "Përpunojeni",
+  "status.edited": "Përpunuar më {date}",
+  "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
   "status.embed": "Trupëzim",
   "status.favourite": "I parapëlqyer",
+  "status.filter": "Filtroje këtë postim",
   "status.filtered": "I filtruar",
+  "status.hide": "Fshihe mesazhin",
+  "status.history.created": "{name} u krijua më {date}",
+  "status.history.edited": "{name} u përpunua më {date}",
   "status.load_more": "Ngarko më tepër",
   "status.media_hidden": "Me media të fshehur",
   "status.mention": "Përmendni @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
   "status.remove_bookmark": "Hiqe faqerojtësin",
+  "status.replied_to": "Iu përgjigj {name}",
   "status.reply": "Përgjigjuni",
   "status.replyAll": "Përgjigjuni rrjedhës",
   "status.report": "Raportojeni @{name}",
   "status.sensitive_warning": "Lëndë rezervat",
   "status.share": "Ndajeni me të tjerë",
+  "status.show_filter_reason": "Shfaqe, sido qoftë",
   "status.show_less": "Shfaq më pak",
   "status.show_less_all": "Shfaq më pak për të tërë",
   "status.show_more": "Shfaq më tepër",
   "status.show_more_all": "Shfaq më tepër për të tërë",
-  "status.show_thread": "Shfaq rrjedhën",
+  "status.show_original": "Shfaq origjinalin",
+  "status.translate": "Përktheje",
+  "status.translated_from_with": "Përkthyer nga {lang} duke përdorur {provider}",
   "status.uncached_media_warning": "Jo e passhme",
   "status.unmute_conversation": "Ktheji zërin bisedës",
   "status.unpin": "Shfiksoje nga profili",
+  "subscribed_languages.lead": "Pas ndryshimit, te kreu juaj dhe te rrjedha kohore liste do të shfaqen vetëm postime në gjuhët e përzgjedhura. Që të merrni postime në krejt gjuhë, mos përzgjidhni gjë.",
+  "subscribed_languages.save": "Ruaji ndryshimet",
+  "subscribed_languages.target": "Ndryshoni gjuhë pajtimesh për {target}",
   "suggestions.dismiss": "Mos e merr parasysh sugjerimin",
   "suggestions.header": "Mund t’ju interesonte…",
   "tabs_bar.federated_timeline": "E federuar",
   "tabs_bar.home": "Kreu",
   "tabs_bar.local_timeline": "Vendore",
   "tabs_bar.notifications": "Njoftime",
-  "tabs_bar.search": "Kërkim",
   "time_remaining.days": "Edhe {number, plural, one {# ditë} other {# ditë}}",
   "time_remaining.hours": "Edhe {number, plural, one {# orë} other {# orë}}",
   "time_remaining.minutes": "Edhe {number, plural, one {# minutë} other {# minuta}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Ndjekës",
   "timeline_hint.resources.follows": "Ndjekje",
   "timeline_hint.resources.statuses": "Mesazhe të vjetër",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} vetë}} duke folur",
+  "trends.counter_by_accounts": "{count, plural, një {{counter} person} other {{counter} vetë}} në {days, plural, një {day} other {{days} ditë}} të kaluar",
   "trends.trending_now": "Prirjet e tashme",
   "ui.beforeunload": "Skica juaj do të humbë, nëse dilni nga Mastodon-i.",
   "units.short.billion": "{count}Md",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
   "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
+  "upload_form.description_missing": "S’u shtua përshkrim",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
   "upload_form.undo": "Fshije",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
   "upload_modal.analyzing_picture": "Po analizohet fotoja…",
   "upload_modal.apply": "Aplikoje",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Po zbatohet…",
   "upload_modal.choose_image": "Zgjidhni figurë",
   "upload_modal.description_placeholder": "Deshe Korçën, Korçën të dhamë",
   "upload_modal.detect_text": "Pikase tekstin prej fotoje",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Po përgatitet OCR-ja…",
   "upload_modal.preview_label": "Paraparje ({ratio})",
   "upload_progress.label": "Po ngarkohet…",
+  "upload_progress.processing": "Po përpunon…",
   "video.close": "Mbylle videon",
   "video.download": "Shkarkoje kartelën",
   "video.exit_fullscreen": "Dil nga mënyra Sa Krejt Ekrani",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 3e29734ef..23d52021d 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -1,484 +1,654 @@
 {
-  "account.account_note_header": "Note",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "about.blocks": "Moderirani serveri",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon je besplatan softver otvorenog koda i zaštićeni znak kompanije Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razlog nije naveden",
+  "about.domain_blocks.preamble": "Mastodon vam generalno omogućava da vidite sadržaj i komunicirate sa korisnicima sa bilo kog drugog servera u fediverzumu. Ovo su izuzeci koji su napravljeni na ovom serveru.",
+  "about.domain_blocks.silenced.explanation": "U načelu nećete videti profile i sadržaj sa ovog servera, osim ako ga eksplicitno ne potražite ili se uključite tako što ćete ga pratiti.",
+  "about.domain_blocks.silenced.title": "Ograničen",
+  "about.domain_blocks.suspended.explanation": "Podaci sa ovog servera neće se obrađivati, čuvati ili razmenjivati, što onemogućava bilo kakvu interakciju ili komunikaciju sa korisnicima sa ovog servera.",
+  "about.domain_blocks.suspended.title": "Suspendovan",
+  "about.not_available": "Ove informacije nisu dostupne na ovom serveru.",
+  "about.powered_by": "Decentralizovana društvena medija koju pokreće {mastodon}",
+  "about.rules": "Pravila servera",
+  "account.account_note_header": "Napomena",
+  "account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
   "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
-  "account.block": "Blokiraj korisnika @{name}",
-  "account.block_domain": "Sakrij sve sa domena {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct Message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain hidden",
-  "account.edit_profile": "Izmeni profil",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Zaprati",
-  "account.followers": "Pratioca",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Prati Vas",
-  "account.hide_reblogs": "Sakrij podrške koje daje korisnika @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-  "account.media": "Mediji",
+  "account.badges.group": "Grupa",
+  "account.block": "Blokiraj @{name}",
+  "account.block_domain": "Blokiraj domen {domain}",
+  "account.blocked": "Blokiran",
+  "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
+  "account.cancel_follow_request": "Povuci zahtev za praćenje",
+  "account.direct": "Direktna poruka @{name}",
+  "account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
+  "account.domain_blocked": "Domen je blokiran",
+  "account.edit_profile": "Uredi profil",
+  "account.enable_notifications": "Obavesti me kada @{name} objavi",
+  "account.endorse": "Istakni na profilu",
+  "account.featured_tags.last_status_at": "Poslednja objava {date}",
+  "account.featured_tags.last_status_never": "Nema objava",
+  "account.featured_tags.title": "Istaknute heš oznake korisnika {name}",
+  "account.follow": "Prati",
+  "account.followers": "Pratioci",
+  "account.followers.empty": "Još uvek niko ne prati ovog korisnika.",
+  "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}",
+  "account.following": "Prati",
+  "account.following_counter": "{count, plural, one {{counter} prati} few {{counter} prati} other {{counter} prati}}",
+  "account.follows.empty": "Ovaj korisnik još uvek nikog ne prati.",
+  "account.follows_you": "Prati vas",
+  "account.go_to_profile": "Idi na profil",
+  "account.hide_reblogs": "Sakrij podržavanja od @{name}",
+  "account.joined_short": "Pridružio se",
+  "account.languages": "Promeni pretplaćene jezike",
+  "account.link_verified_on": "Vlasništvo nad ovom vezom je provereno {date}",
+  "account.locked_info": "Status privatnosti ovog naloga je podešen na zaključano. Vlasnik ručno pregleda ko ga može pratiti.",
+  "account.media": "Multimedija",
   "account.mention": "Pomeni korisnika @{name}",
-  "account.moved_to": "{name} se pomerio na:",
-  "account.mute": "Ućutkaj korisnika @{name}",
-  "account.mute_notifications": "Isključi obaveštenja od korisnika @{name}",
-  "account.muted": "Muted",
-  "account.never_active": "Never",
-  "account.posts": "Statusa",
-  "account.posts_with_replies": "Toots with replies",
+  "account.moved_to": "Korisnik {name} je naznačio da je njegov novi nalog sada:",
+  "account.mute": "Ignoriši korisnika @{name}",
+  "account.mute_notifications": "Ignoriši obaveštenja od @{name}",
+  "account.muted": "Ignorisan",
+  "account.open_original_page": "Otvori originalnu stranicu",
+  "account.posts": "Objave",
+  "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekam odobrenje. Kliknite da poništite zahtev za praćenje",
+  "account.requested": "Čekanje odobrenja. Kliknite za otkazivanje zahteva za praćenje",
+  "account.requested_follow": "{name} je zatražio da vas prati",
   "account.share": "Podeli profil korisnika @{name}",
-  "account.show_reblogs": "Prikaži podrške od korisnika @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} objavio} few {{counter} objavio} other {{counter} objavio}}",
   "account.unblock": "Odblokiraj korisnika @{name}",
   "account.unblock_domain": "Odblokiraj domen {domain}",
-  "account.unendorse": "Don't feature on profile",
+  "account.unblock_short": "Odblokiraj",
+  "account.unendorse": "Ne ističi na profilu",
   "account.unfollow": "Otprati",
-  "account.unmute": "Ukloni ućutkavanje korisniku @{name}",
-  "account.unmute_notifications": "Uključi nazad obaveštenja od korisnika @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rate limited",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "account.unmute": "Ne ignoriši @{name}",
+  "account.unmute_notifications": "Ne ignoriši obaveštenja od @{name}",
+  "account.unmute_short": "Ne ignoriši",
+  "account_note.placeholder": "Kliknite da dodate napomenu",
+  "admin.dashboard.daily_retention": "Stopa zadržavanja korisnika po danima nakon registracije",
+  "admin.dashboard.monthly_retention": "Stopa zadržavanja korisnika po mesecima nakon registracije",
+  "admin.dashboard.retention.average": "Prosek",
+  "admin.dashboard.retention.cohort": "Mesec pristupanja",
+  "admin.dashboard.retention.cohort_size": "Novi korisnici",
+  "alert.rate_limited.message": "Pokušajte ponovo posle {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ograničenje zahteva",
+  "alert.unexpected.message": "Došlo je do neočekivane greške.",
+  "alert.unexpected.title": "Ups!",
+  "announcement.announcement": "Najava",
+  "attachments_list.unprocessed": "(neobrađeno)",
+  "audio.hide": "Sakrij audio",
+  "autosuggest_hashtag.per_week": "{count} nedeljno",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
-  "bundle_column_error.body": "Nešto je pošlo po zlu prilikom učitavanja ove komponente.",
+  "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
+  "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
+  "bundle_column_error.error.title": "O, ne!",
+  "bundle_column_error.network.body": "Došlo je do greške pri pokušaju učitavanja ove stranice. Razlog može biti trenutni problem sa vašom internet vezom ili sa ovim serverom.",
+  "bundle_column_error.network.title": "Greška na mreži",
   "bundle_column_error.retry": "Pokušajte ponovo",
-  "bundle_column_error.title": "Mrežna greška",
+  "bundle_column_error.return": "Idi na početak",
+  "bundle_column_error.routing.body": "Nije moguće pronaći traženu stranicu. Da li ste sigurni da je URL u adresnom polju ispravan?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovo",
+  "closed_registrations.other_server_instructions": "Pošto je Mastodon decentralizovan, možete napraviti nalog na drugom serveru ali i dalje komunicirati sa ovim.",
+  "closed_registrations_modal.description": "Kreiranje naloga na {domain} trenutno nije moguće, ali imajte u vidu da vam ne treba nalog zasebno na {domain} da biste koristili Mastodon.",
+  "closed_registrations_modal.find_another_server": "Pronađite drugi server",
+  "closed_registrations_modal.preamble": "Mastodon je decentralizovan, tako da bez obzira gde kreirate svoj nalog, moći ćete da pratite i komunicirate sa bilo kim na ovom serveru. Možete čak i sami da ga hostujete!",
+  "closed_registrations_modal.title": "Registracija za Mastodon",
+  "column.about": "Osnovni podaci",
   "column.blocks": "Blokirani korisnici",
-  "column.bookmarks": "Bookmarks",
-  "column.community": "Lokalna lajna",
-  "column.direct": "Direct messages",
-  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
-  "column.favourites": "Omiljeni",
+  "column.bookmarks": "Obeleživači",
+  "column.community": "Lokalna vremenska linija",
+  "column.direct": "Direktne poruke",
+  "column.directory": "Pregledaj profile",
+  "column.domain_blocks": "Blokirani domeni",
+  "column.favourites": "Omiljeno",
   "column.follow_requests": "Zahtevi za praćenje",
   "column.home": "Početna",
   "column.lists": "Liste",
-  "column.mutes": "Ućutkani korisnici",
+  "column.mutes": "Ignorisani korisnici",
   "column.notifications": "Obaveštenja",
-  "column.pins": "Prikačeni tutovi",
-  "column.public": "Federisana lajna",
+  "column.pins": "Zakačene objave",
+  "column.public": "Združena vremenska linija",
   "column_back_button.label": "Nazad",
-  "column_header.hide_settings": "Sakrij postavke",
-  "column_header.moveLeft_settings": "Pomeri kolonu ulevo",
-  "column_header.moveRight_settings": "Pomeri kolonu udesno",
-  "column_header.pin": "Prikači",
-  "column_header.show_settings": "Prikaži postavke",
+  "column_header.hide_settings": "Sakrij podešavanja",
+  "column_header.moveLeft_settings": "Premesti kolonu ulevo",
+  "column_header.moveRight_settings": "Premesti kolonu udesno",
+  "column_header.pin": "Zakači",
+  "column_header.show_settings": "Prikaži podešavanja",
   "column_header.unpin": "Otkači",
-  "column_subheading.settings": "Postavke",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da Vas zaprati i da vidi objave namenjene samo Vašim pratiocima.",
+  "column_subheading.settings": "Podešavanja",
+  "community.column_settings.local_only": "Samo lokalno",
+  "community.column_settings.media_only": "Samo multimedija",
+  "community.column_settings.remote_only": "Samo udaljeno",
+  "compose.language.change": "Promeni jezik",
+  "compose.language.search": "Pretraga jezika...",
+  "compose_form.direct_message_warning_learn_more": "Saznajte više",
+  "compose_form.encryption_warning": "Objave na Mastodon-u nisu potpuno šifrovane. Nemojte deliti nikakve osetljive informacije preko Mastodon-a.",
+  "compose_form.hashtag_warning": "Ova objava neće biti navedena ni pod jednom heš oznakom jer je nenavedena. Samo javne objave mogu se pretraživati po heš oznakama.",
+  "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
-  "compose_form.placeholder": "Šta Vam je na umu?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Tutni",
+  "compose_form.placeholder": "O čemu razmišljate?",
+  "compose_form.poll.add_option": "Dodajte izbor",
+  "compose_form.poll.duration": "Trajanje ankete",
+  "compose_form.poll.option_placeholder": "Izbor {number}",
+  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
+  "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
+  "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
+  "compose_form.publish": "Objavi",
+  "compose_form.publish_form": "Objavi",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Ovde upišite upozorenje",
-  "confirmation_modal.cancel": "Poništi",
-  "confirmations.block.block_and_report": "Block & Report",
+  "compose_form.save_changes": "Sačuvaj promene",
+  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
+  "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
+  "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
+  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
+  "confirmation_modal.cancel": "Otkaži",
+  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.block.message": "Da li ste sigurni da želite da blokirate korisnika {name}?",
-  "confirmations.delete.confirm": "Obriši",
-  "confirmations.delete.message": "Da li ste sigurni da želite obrišete ovaj status?",
-  "confirmations.delete_list.confirm": "Obriši",
-  "confirmations.delete_list.message": "Da li ste sigurni da želite da bespovratno obrišete ovu listu?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Sakrij ceo domen",
-  "confirmations.domain_block.message": "Da li ste stvarno, stvarno sigurno da želite da blokirate ceo domen {domain}? U većini slučajeva, par dobrih blokiranja ili ućutkavanja su dovoljna i preporučljiva.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Ućutkaj",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Da li stvarno želite da ućutkate korisnika {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
-  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.cancel_follow_request.confirm": "Povuci zahtev",
+  "confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
+  "confirmations.delete.confirm": "Izbriši",
+  "confirmations.delete.message": "Da li ste sigurni da želite izrišete ovu objavu?",
+  "confirmations.delete_list.confirm": "Izbriši",
+  "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
+  "confirmations.discard_edit_media.confirm": "Odbaci",
+  "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
+  "confirmations.domain_block.confirm": "Blokiraj ceo domen",
+  "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
+  "confirmations.logout.confirm": "Odjavi se",
+  "confirmations.logout.message": "Da li se sigurni da želite da se odjavite?",
+  "confirmations.mute.confirm": "Ignoriši",
+  "confirmations.mute.explanation": "Ovo će sakriti objave od korisnika i objave koje ga pominju, ali će mu i dalje biti dozvoljeno da vidi vaše objave i da vas prati.",
+  "confirmations.mute.message": "Da li stvarno želite da ignorišete korisnika {name}?",
+  "confirmations.redraft.confirm": "Izbriši i prepravi",
+  "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
+  "confirmations.reply.confirm": "Odgovori",
+  "confirmations.reply.message": "Odgovaranjem ćete obrisati poruku koju sastavljate. Da li sigurni da želite da nastavite?",
   "confirmations.unfollow.confirm": "Otprati",
   "confirmations.unfollow.message": "Da li ste sigurni da želite da otpratite korisnika {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
-  "embed.instructions": "Ugradi ovaj status na Vaš veb sajt kopiranjem koda ispod.",
-  "embed.preview": "Ovako će da izgleda:",
+  "conversation.delete": "Izbriši razgovor",
+  "conversation.mark_as_read": "Označi kao pročitano",
+  "conversation.open": "Prikaži razgovor",
+  "conversation.with": "Sa {names}",
+  "copypaste.copied": "Kopirano",
+  "copypaste.copy": "Kopiraj",
+  "directory.federated": "Sa znanog fideverzuma",
+  "directory.local": "Samo sa {domain}",
+  "directory.new_arrivals": "Novopridošli",
+  "directory.recently_active": "Nedavno aktivni",
+  "disabled_account_banner.account_settings": "Podešavanja naloga",
+  "disabled_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen.",
+  "dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.",
+  "dismissable_banner.dismiss": "Odbaci",
+  "dismissable_banner.explore_links": "O ovim vestima upravo sada razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_statuses": "Ove objave sa ovog i drugih servera u decentralizovanoj mreži postaju sve popularnije na ovom serveru.",
+  "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi na ovom i drugim serverima decentralizovane mreže za koje ovaj server zna.",
+  "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
+  "embed.preview": "Evo kako će to izgledati:",
   "emoji_button.activity": "Aktivnost",
-  "emoji_button.custom": "Proizvoljno",
-  "emoji_button.flags": "Zastave",
-  "emoji_button.food": "Hrana & piće",
-  "emoji_button.label": "Ubaci smajli",
+  "emoji_button.clear": "Obriši",
+  "emoji_button.custom": "Prilagođeno",
+  "emoji_button.flags": "Zastavice",
+  "emoji_button.food": "Hrana i piće",
+  "emoji_button.label": "Ubaci emodži",
   "emoji_button.nature": "Priroda",
-  "emoji_button.not_found": "Nema smajlija!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Nema pronađih odgovarajućih emodžija",
   "emoji_button.objects": "Objekti",
   "emoji_button.people": "Ljudi",
   "emoji_button.recent": "Najčešće korišćeni",
   "emoji_button.search": "Pretraga...",
   "emoji_button.search_results": "Rezultati pretrage",
   "emoji_button.symbols": "Simboli",
-  "emoji_button.travel": "Putovanja & mesta",
-  "empty_column.account_suspended": "Account suspended",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "Lokalna lajna je prazna. Napišite nešto javno da lajna produva!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
-  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
-  "empty_column.hashtag": "Trenutno nema ništa na ovom heštegu.",
-  "empty_column.home": "Vaša lajna je prazna! Posetite {public} ili koristite pretragu da počnete i upoznajete nove ljude.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "U ovoj listi još nema ničega. Kada članovi liste objave nove statuse, oni će se pojavljivati ovde.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "Trenutno nemate obaveštenja. Družite se malo da započnete razgovore.",
-  "empty_column.public": "Ovde nema ničega! Napišite nešto javno, ili nađite korisnike sa drugih instanci koje ćete zapratiti da popunite ovu prazninu",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "emoji_button.travel": "Putovanja i mesta",
+  "empty_column.account_suspended": "Nalog je suspendovan",
+  "empty_column.account_timeline": "Nema objava ovde!",
+  "empty_column.account_unavailable": "Profil je nedostupan",
+  "empty_column.blocks": "Još uvek niste blokirali nijednog korisnika.",
+  "empty_column.bookmarked_statuses": "Još uvek nemate objava dodanih u obeleživače. Kada dodate neku, pojaviće se ovde.",
+  "empty_column.community": "Lokalna vremenska linija je prazna. Napišite nešto javno da započnete!",
+  "empty_column.direct": "Još uvek nemate nijednu direktnu poruku. Kada pošaljete ili primite neku, pojaviće se ovde.",
+  "empty_column.domain_blocks": "Još uvek nema blokiranih domena.",
+  "empty_column.explore_statuses": "Trenutno ništa nije u trendu. Proverite ponovo kasnije!",
+  "empty_column.favourited_statuses": "Još uvek nemate objava označenih kao omiljene. Kada označite neku, pojaviće se ovde.",
+  "empty_column.favourites": "Niko još nije označio ovu objavu kao omiljenu. Kada neko to uradi, pojaviće se ovde.",
+  "empty_column.follow_recommendations": "Izgleda da ne mogu da se generišu bilo kakvi predlozi za vas. Možete pokušati da koristite pretragu kako biste potražili ljude koje možda poznajete ili istražili popularne heš oznake.",
+  "empty_column.follow_requests": "Još uvek nemate zahteva za praćenje. Kada primite zahtev, pojaviće se ovde.",
+  "empty_column.hashtag": "Još uvek nema ničega u ovoj heš oznaci.",
+  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili. {suggestions}",
+  "empty_column.home.suggestions": "Pogledajte neke predloge",
+  "empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
+  "empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, pojaviće se ovde.",
+  "empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
+  "empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
+  "empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
+  "error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
+  "error.unexpected_crash.explanation_addons": "Ova stranica se nije mogla pravilno prikazati. Ovu grešku verovatno uzrokuju dodaci pregledača ili alati za automatsko prevođenje.",
+  "error.unexpected_crash.next_steps": "Pokušajte da osvežite stranicu. Ako to ne pomogne, možda ćete i dalje moći da koristite Mastodon putem drugog pregledača ili matične aplikacije.",
+  "error.unexpected_crash.next_steps_addons": "Pokušajte da ih onemogućite i osvežite stranicu. Ako to ne pomogne, možda ćete i dalje moći da koristite Mastodon preko drugog pregledača ili matične aplikacije.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiraj „stacktrace” u klipbord",
+  "errors.unexpected_crash.report_issue": "Prijavi problem",
+  "explore.search_results": "Rezultati pretrage",
+  "explore.suggested_follows": "Za tebe",
+  "explore.title": "Istraži",
+  "explore.trending_links": "Vesti",
+  "explore.trending_statuses": "Objave",
+  "explore.trending_tags": "Heš oznake",
+  "filter_modal.added.context_mismatch_explanation": "Ova kategorija filtera se ne odnosi na kontekst u kojem ste pristupili ovoj objavi. Ako želite da se objava filtrira i u ovom kontekstu, morate urediti filter.",
+  "filter_modal.added.context_mismatch_title": "Kontekst se ne podudara!",
+  "filter_modal.added.expired_explanation": "Ova kategorija filtera je istekla, morate promeniti datum isteka da bi se primenjivala.",
+  "filter_modal.added.expired_title": "Filter je istekao!",
+  "filter_modal.added.review_and_configure": "Za pregled i dalju konfiguraciju ove kategorije filtera, idite na {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Podešavanja filtera",
+  "filter_modal.added.settings_link": "stranica podešavanja",
+  "filter_modal.added.short_explanation": "Ova objava je dodata u sledeću kategoriju filtera: {title}.",
+  "filter_modal.added.title": "Filter je dodat!",
+  "filter_modal.select_filter.context_mismatch": "ne odnosi se na ovaj kontekst",
+  "filter_modal.select_filter.expired": "isteklo",
+  "filter_modal.select_filter.prompt_new": "Nova kategorija: {name}",
+  "filter_modal.select_filter.search": "Pretraži ili kreiraj",
+  "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
+  "filter_modal.select_filter.title": "Filtriraj ovu objavu",
+  "filter_modal.title.status": "Filtriraj objavu",
+  "follow_recommendations.done": "Gotovo",
+  "follow_recommendations.heading": "Pratite ljude čije objave želite da vidite! Evo nekih predloga.",
+  "follow_recommendations.lead": "Objave korisnika koje pratite će se pojavljivati hronološkim redosledom na početnoj stranici. Ne plašite se grešaka, možete otpratiti korisnike u bilo kom trenutku!",
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
-  "getting_started.heading": "Da počnete",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodont je softver otvorenog koda. Možete mu doprineti ili prijaviti probleme preko GitHub-a na {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
+  "footer.about": "Osnovni podaci",
+  "footer.directory": "Direktorijum profila",
+  "footer.get_app": "Preuzmite aplikaciju",
+  "footer.invite": "Pozovi osobe",
+  "footer.keyboard_shortcuts": "Tasterske prečice",
+  "footer.privacy_policy": "Politika privatnosti",
+  "footer.source_code": "Prikaži izvorni kod",
+  "generic.saved": "Sačuvano",
+  "getting_started.heading": "Prvi koraci",
+  "hashtag.column_header.tag_mode.all": "i {additional}",
+  "hashtag.column_header.tag_mode.any": "ili {additional}",
+  "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "hashtag.column_settings.select.no_options_message": "Nisu pronađeni predlozi",
+  "hashtag.column_settings.select.placeholder": "Unesite heš oznake…",
+  "hashtag.column_settings.tag_mode.all": "Sve ove",
+  "hashtag.column_settings.tag_mode.any": "Bilo koje od ovih",
+  "hashtag.column_settings.tag_mode.none": "Nijedan od ovih",
+  "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovu kolonu",
+  "hashtag.follow": "Prati heš oznaku",
+  "hashtag.unfollow": "Otprati heš oznaku",
   "home.column_settings.basic": "Osnovno",
-  "home.column_settings.show_reblogs": "Prikaži i podržavanja",
+  "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
-  "keyboard_shortcuts.back": "da odete nazad",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "da podržite",
-  "keyboard_shortcuts.column": "da se prebacite na status u jednoj od kolona",
-  "keyboard_shortcuts.compose": "da se prebacite na pisanje novog tuta",
+  "home.hide_announcements": "Sakrij najave",
+  "home.show_announcements": "Prijaži najave",
+  "interaction_modal.description.favourite": "Sa nalogom na Mastodon-u, možete označiti ovu objavu kao omiljenu kako biste dali do znanja autoru da vam se sviđa i sačuvali je za kasnije.",
+  "interaction_modal.description.follow": "Sa nalogom na Mastodon-u, možete pratiti korisnika {name} kako biste primali njegove objave na početnoj stranici.",
+  "interaction_modal.description.reblog": "Sa nalogom na Mastodon-u, možete podržati ovu objavu kako bite je podelili sa svojim pratiocima.",
+  "interaction_modal.description.reply": "Sa nalogom na Mastodon-u, možete odgovoriti na ovu objavu.",
+  "interaction_modal.on_another_server": "Na drugom serveru",
+  "interaction_modal.on_this_server": "Na ovom serveru",
+  "interaction_modal.other_server_instructions": "Kopirajte i nalepite ovu URL adresu u polje pretrage svoje omiljene Mastodon aplikacije ili veb okruženje svog Mastodon servera.",
+  "interaction_modal.preamble": "Pošto je Mastodon decentralizovan, možete koristiti svoj postojeći nalog koji hostuje drugi Mastodon server ili kompatibilna platforma ako nemate nalog na ovom.",
+  "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
+  "interaction_modal.title.follow": "Prati {name}",
+  "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
+  "interaction_modal.title.reply": "Odgovori na objavu korisnika {name}",
+  "intervals.full.days": "{number, plural, one {# dan} few {# dana} other {# dana}}",
+  "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
+  "intervals.full.minutes": "{number, plural, one {# minut} few {# minuta} other {# minuta}}",
+  "keyboard_shortcuts.back": "Idi nazad",
+  "keyboard_shortcuts.blocked": "Otvori listu blokiranih korisnika",
+  "keyboard_shortcuts.boost": "Podrži objavu",
+  "keyboard_shortcuts.column": "Fokusiraj kolonu",
+  "keyboard_shortcuts.compose": "Fokusiraj polje za sastavljanje objave",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "da se pomerite na dole u listi",
-  "keyboard_shortcuts.enter": "da otvorite status",
-  "keyboard_shortcuts.favourite": "da označite kao omiljeno",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Prečice na tastaturi",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.direct": "za otvaranje kolone direktnih poruka",
+  "keyboard_shortcuts.down": "Premesti nadole u listi",
+  "keyboard_shortcuts.enter": "Otvori objavu",
+  "keyboard_shortcuts.favourite": "Označi objavu kao omiljenu",
+  "keyboard_shortcuts.favourites": "Otvori listu omiljenih",
+  "keyboard_shortcuts.federated": "Otvori združenu vremensku liniju",
+  "keyboard_shortcuts.heading": "Tasterske prečice",
+  "keyboard_shortcuts.home": "Otvori početnu vremensku liniju",
   "keyboard_shortcuts.hotkey": "Prečica",
-  "keyboard_shortcuts.legend": "da prikažete ovaj podsetnik",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "da pomenete autora",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "da odgovorite",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "da se prebacite na pretragu",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "da započnete skroz novi tut",
-  "keyboard_shortcuts.unfocus": "da ne budete više na pretrazi/pravljenju novog tuta",
-  "keyboard_shortcuts.up": "da se pomerite na gore u listi",
+  "keyboard_shortcuts.legend": "Prikaži ovu legendu",
+  "keyboard_shortcuts.local": "Otvori lokalnu vremensku liniju",
+  "keyboard_shortcuts.mention": "Pomeni autora",
+  "keyboard_shortcuts.muted": "Otvori listu ignorisanih korisnika",
+  "keyboard_shortcuts.my_profile": "Otvorite svoj profil",
+  "keyboard_shortcuts.notifications": "Otvori kolonu obaveštenja",
+  "keyboard_shortcuts.open_media": "Otvori multimediju",
+  "keyboard_shortcuts.pinned": "Otvori listu zakačenih objava",
+  "keyboard_shortcuts.profile": "Otvori profil autora",
+  "keyboard_shortcuts.reply": "Odgovori na objavu",
+  "keyboard_shortcuts.requests": "Otvori listu zahteva za praćenje",
+  "keyboard_shortcuts.search": "Fokusiraj traku pretrage",
+  "keyboard_shortcuts.spoilers": "Prikaži/sakrij polje teksta upozorenja o sadržaju (CW)",
+  "keyboard_shortcuts.start": "Otvori kolonu „prvi koraci”",
+  "keyboard_shortcuts.toggle_hidden": "Prikaži/sakrij tekst iza CW-a",
+  "keyboard_shortcuts.toggle_sensitivity": "Prikaži/sakrij multimediju",
+  "keyboard_shortcuts.toot": "Započni novu objavu",
+  "keyboard_shortcuts.unfocus": "Ukloni fokus sa polja za unos teksta/pretrage",
+  "keyboard_shortcuts.up": "Premesti nagore u listi",
   "lightbox.close": "Zatvori",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
-  "lightbox.next": "Sledeći",
-  "lightbox.previous": "Prethodni",
+  "lightbox.compress": "Komprimuj okvir za prikaz slike",
+  "lightbox.expand": "Proširi okvir za prikaz slike",
+  "lightbox.next": "Sledeće",
+  "lightbox.previous": "Prethodno",
+  "limited_account_hint.action": "Ipak prikaži profil",
+  "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
-  "lists.delete": "Obriši listu",
-  "lists.edit": "Izmeni listu",
-  "lists.edit.submit": "Change title",
+  "lists.delete": "Izbriši listu",
+  "lists.edit": "Uredi listu",
+  "lists.edit.submit": "Promeni naslov",
   "lists.new.create": "Dodaj listu",
   "lists.new.title_placeholder": "Naslov nove liste",
-  "lists.replies_policy.followed": "Any followed user",
-  "lists.replies_policy.list": "Members of the list",
-  "lists.replies_policy.none": "No one",
-  "lists.replies_policy.title": "Show replies to:",
+  "lists.replies_policy.followed": "Svaki praćeni korisnik",
+  "lists.replies_policy.list": "Članovi liste",
+  "lists.replies_policy.none": "Niko",
+  "lists.replies_policy.title": "Prikaži odgovore na:",
   "lists.search": "Pretraži među ljudima koje pratite",
   "lists.subheading": "Vaše liste",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "loading_indicator.label": "Učitavam...",
-  "media_gallery.toggle_visible": "Uključi/isključi vidljivost",
+  "load_pending": "{count, plural, one {# nova stavka} few {# nove stavke} other {# novih stavki}}",
+  "loading_indicator.label": "Učitavanje...",
+  "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "missing_indicator.label": "Nije pronađeno",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Sakrij obaveštenja od ovog korisnika?",
-  "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "missing_indicator.sublabel": "Ovaj resurs nije moguće pronaći",
+  "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
+  "mute_modal.duration": "Trajanje",
+  "mute_modal.hide_notifications": "Sakriti obaveštenja od ovog korisnika?",
+  "mute_modal.indefinite": "Neodređen",
+  "navigation_bar.about": "Osnovni podaci",
   "navigation_bar.blocks": "Blokirani korisnici",
-  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Lokalna lajna",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Izmeni profil",
-  "navigation_bar.favourites": "Omiljeni",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.bookmarks": "Obeleživači",
+  "navigation_bar.community_timeline": "Lokalna vremenska linija",
+  "navigation_bar.compose": "Sastavi novu objavu",
+  "navigation_bar.direct": "Direktne poruke",
+  "navigation_bar.discover": "Otkrij",
+  "navigation_bar.domain_blocks": "Blokirani domeni",
+  "navigation_bar.edit_profile": "Uredi profil",
+  "navigation_bar.explore": "Istraži",
+  "navigation_bar.favourites": "Omiljeno",
+  "navigation_bar.filters": "Ignorisane reči",
   "navigation_bar.follow_requests": "Zahtevi za praćenje",
-  "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "O ovoj instanci",
-  "navigation_bar.keyboard_shortcuts": "Prečice na tastaturi",
+  "navigation_bar.follows_and_followers": "Praćenja i pratioci",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Odjava",
-  "navigation_bar.mutes": "Ućutkani korisnici",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Prikačeni tutovi",
+  "navigation_bar.mutes": "Ignorisani korisnici",
+  "navigation_bar.personal": "Lično",
+  "navigation_bar.pins": "Zakačene objave",
   "navigation_bar.preferences": "Podešavanja",
-  "navigation_bar.public_timeline": "Federisana lajna",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} je stavio Vaš status kao omiljeni",
-  "notification.follow": "{name} Vas je zapratio",
-  "notification.follow_request": "{name} has requested to follow you",
-  "notification.mention": "{name} Vas je pomenuo",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
-  "notification.reblog": "{name} je podržao(la) Vaš status",
-  "notification.status": "{name} just posted",
-  "notifications.clear": "Očisti obaveštenja",
-  "notifications.clear_confirmation": "Da li ste sigurno da trajno želite da očistite Vaša obaveštenja?",
+  "navigation_bar.public_timeline": "Združena vremenska linija",
+  "navigation_bar.search": "Pretraga",
+  "navigation_bar.security": "Bezbednost",
+  "not_signed_in_indicator.not_signed_in": "Morate da se prijavite da pristupite ovom resursu.",
+  "notification.admin.report": "{name} je prijavio {target}",
+  "notification.admin.sign_up": "{name} se registrovao",
+  "notification.favourite": "{name} je označio vašu objavu kao omiljenu",
+  "notification.follow": "{name} vas je zapratio",
+  "notification.follow_request": "{name} je zatražio da vas prati",
+  "notification.mention": "{name} vas je pomenuo",
+  "notification.own_poll": "Vaša anketa je završena",
+  "notification.poll": "Završena je anketa u kojoj ste glasali",
+  "notification.reblog": "{name} je podržao vašu objavu",
+  "notification.status": "{name} je upravo objavio",
+  "notification.update": "{name} je uredio objavu",
+  "notifications.clear": "Obriši obaveštenja",
+  "notifications.clear_confirmation": "Da li ste sigurni da želite trajno da obrišete sva vaša obaveštenja?",
+  "notifications.column_settings.admin.report": "Nove prijave:",
+  "notifications.column_settings.admin.sign_up": "Nove ragistracije:",
   "notifications.column_settings.alert": "Obaveštenja na radnoj površini",
   "notifications.column_settings.favourite": "Omiljeni:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
+  "notifications.column_settings.filter_bar.category": "Traka za brzi filter",
+  "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima",
   "notifications.column_settings.follow": "Novi pratioci:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
   "notifications.column_settings.mention": "Pominjanja:",
-  "notifications.column_settings.poll": "Poll results:",
-  "notifications.column_settings.push": "Guraj obaveštenja",
-  "notifications.column_settings.reblog": "Podrški:",
+  "notifications.column_settings.poll": "Rezultati ankete:",
+  "notifications.column_settings.push": "Prosleđena obaveštenja",
+  "notifications.column_settings.reblog": "Podržavanja:",
   "notifications.column_settings.show": "Prikaži u koloni",
-  "notifications.column_settings.sound": "Puštaj zvuk",
-  "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Podesi status privatnosti",
-  "privacy.direct.long": "Objavi samo korisnicima koji su pomenuti",
-  "privacy.direct.short": "Direktno",
-  "privacy.private.long": "Objavi samo pratiocima",
-  "privacy.private.short": "Samo za pratioce",
-  "privacy.public.long": "Objavi na javnoj lajni",
+  "notifications.column_settings.sound": "Reprodukuj zvuk",
+  "notifications.column_settings.status": "Nove objave:",
+  "notifications.column_settings.unread_notifications.category": "Nepročitana obaveštenja",
+  "notifications.column_settings.unread_notifications.highlight": "Istakni nepročitana obaveštenja",
+  "notifications.column_settings.update": "Uređivanja:",
+  "notifications.filter.all": "Sve",
+  "notifications.filter.boosts": "Podržavanja",
+  "notifications.filter.favourites": "Omiljeno",
+  "notifications.filter.follows": "Praćenja",
+  "notifications.filter.mentions": "Pominjanja",
+  "notifications.filter.polls": "Rezultati ankete",
+  "notifications.filter.statuses": "Ažuriranja od ljudi koje pratite",
+  "notifications.grant_permission": "Odobri dozvolu.",
+  "notifications.group": "{count} obaveštenja",
+  "notifications.mark_as_read": "Označi svako obaveštenje kao pročitano",
+  "notifications.permission_denied": "Obaveštenja na radnoj površini nisu dostupna zbog prethodno odbijenog zahteva za dozvolom pregledača",
+  "notifications.permission_denied_alert": "Obaveštenja na radnoj površini ne mogu biti omogućena, jer je dozvola pregledača ranije bila odbijena",
+  "notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
+  "notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
+  "notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
+  "notifications_permission_banner.title": "Nikada ništa ne propustite",
+  "picture_in_picture.restore": "Vrati to nazad",
+  "poll.closed": "Zatvoreno",
+  "poll.refresh": "Osveži",
+  "poll.total_people": "{count, plural, one {# osoba} few {# osobe} other {# osoba}}",
+  "poll.total_votes": "{count, plural, one {# glas} few {# glasa} other {# glasova}}",
+  "poll.vote": "Glasajte",
+  "poll.voted": "Glasali ste za ovaj odgovor",
+  "poll.votes": "{votes, plural, one {# glas} few {# glasa} other {# glasova}}",
+  "poll_button.add_poll": "Dodaj anketu",
+  "poll_button.remove_poll": "Ukloni anketu",
+  "privacy.change": "Promeni privatnost objave",
+  "privacy.direct.long": "Vidljivo samo za pomenute korisnike",
+  "privacy.direct.short": "Samo pomenute osobe",
+  "privacy.private.long": "Vidljivo samo za pratioce",
+  "privacy.private.short": "Samo pratioci",
+  "privacy.public.long": "Vidljivo za sve",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Ne objavljuj na javnim lajnama",
+  "privacy.unlisted.long": "Vidljivo za sve, ali isključeno iz funkcije otkrivanja",
   "privacy.unlisted.short": "Neizlistano",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
+  "privacy_policy.title": "Politika privatnosti",
+  "refresh": "Osveži",
+  "regeneration_indicator.label": "Učitavanje…",
+  "regeneration_indicator.sublabel": "Vaša početna stranica se priprema!",
+  "relative_time.days": "{number} dan.",
+  "relative_time.full.days": "Pre {number, plural, one {# dan} few {# dana} other {# dana}}",
+  "relative_time.full.hours": "pre {number, plural, one {# sat} few {# sata} other {# sati}}",
+  "relative_time.full.just_now": "upravo sad",
+  "relative_time.full.minutes": "pre {number, plural, one {# minut} few {# minuta} other {# minuta}}",
+  "relative_time.full.seconds": "pre {number, plural, one {# sekundu} few {# sekunde} other {# sekundi}}",
+  "relative_time.hours": "{number} čas.",
   "relative_time.just_now": "sada",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
-  "reply_indicator.cancel": "Poništi",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "relative_time.minutes": "{number} min.",
+  "relative_time.seconds": "{number} sek.",
+  "relative_time.today": "danas",
+  "reply_indicator.cancel": "Otkaži",
+  "report.block": "Blokiraj",
+  "report.block_explanation": "Nećete videti objave korisnika. Ni on neće videti vaše objave niti će moći da vas prati. Takođe može da zna da je blokiran.",
+  "report.categories.other": "Ostalo",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Sadržaj krši jedno ili više pravila servera",
+  "report.category.subtitle": "Odaberite najpribližnije",
+  "report.category.title": "Recite nam šta je problem sa ovim {type}",
+  "report.category.title_account": "profilom",
+  "report.category.title_status": "objavom",
+  "report.close": "Gotovo",
+  "report.comment.title": "Da li ima nešto dodatno što treba da znamo?",
+  "report.forward": "Proslediti {target}",
+  "report.forward_hint": "Nalog je sa drugog servera. Poslati anonimnu kopiju prijave i tamo?",
+  "report.mute": "Ignoriši",
+  "report.mute_explanation": "Nećete videti objave korisnika. On i i dalje može da vas prati i vidi vaše objave i neće znati da je ignorisan.",
+  "report.next": "Sledeće",
   "report.placeholder": "Dodatni komentari",
+  "report.reasons.dislike": "Ne sviđa mi se",
+  "report.reasons.dislike_description": "Ovo nije nešto što želiš da vidite",
+  "report.reasons.other": "Nešto drugo",
+  "report.reasons.other_description": "Problem se ne uklapa u druge kategorije",
+  "report.reasons.spam": "Ovo je spam",
+  "report.reasons.spam_description": "Zlonamerne veze, lažno angažovanje ili odgovori koji se ponavljaju",
+  "report.reasons.violation": "Krši pravila servera",
+  "report.reasons.violation_description": "Svesni ste da krši neka određena pravila",
+  "report.rules.subtitle": "Izaberi sve što važi",
+  "report.rules.title": "Koja pravila su prekršena?",
+  "report.statuses.subtitle": "Izaberi sve što važi",
+  "report.statuses.title": "Da li postoje bilo kakve objave koje podržavaju ovu prijavu?",
   "report.submit": "Pošalji",
   "report.target": "Prijavljujem {target}",
+  "report.thanks.take_action": "Ovo su Vaše opcije da kontrolišete šta vidite na Mastodon-u:",
+  "report.thanks.take_action_actionable": "Dok mi pregledamo ovo, možete primeniti sledeće radnje protiv @{name}:",
+  "report.thanks.title": "Ne želite da vidite ovo?",
+  "report.thanks.title_actionable": "Hvala na prijavi, pregledaćemo je.",
+  "report.unfollow": "Otprati @{name}",
+  "report.unfollow_explanation": "Pratite ovaj nalog. Da ne biste više videli njegove objave na početnoj stranici, otpratite ga.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} objava} few {{count} objave} other {{count} objava}} u prilogu",
+  "report_notification.categories.other": "Ostalo",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Kršenje pravila",
+  "report_notification.open": "Otvori prijavu",
   "search.placeholder": "Pretraga",
+  "search.search_or_paste": "Pretražite ili unesite adresu",
   "search_popout.search_format": "Napredni format pretrage",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-  "search_popout.tips.hashtag": "hešteg",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Traženjem običnog teksta ćete dobiti sva pronađena imena, sva korisnička imena i sve nađene heštegove",
+  "search_popout.tips.full_text": "Jednostavan tekst vraća objave koje ste napisali, dodali u omiljene, podržali ili u kojima ste bili pomenuti, kao i podudaranje korisničkih imena, prikazana imena i heš oznake.",
+  "search_popout.tips.hashtag": "heš oznaka",
+  "search_popout.tips.status": "objava",
+  "search_popout.tips.text": "Jednostavan tekst vraća podudaranje imena za prikaz, korisnička imena i heš oznake",
   "search_popout.tips.user": "korisnik",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.accounts": "Ljudi",
+  "search_results.all": "Sve",
+  "search_results.hashtags": "Heš oznake",
+  "search_results.nothing_found": "Nije moguće pronaći ništa za ove termine za pretragu",
+  "search_results.statuses": "Objave",
+  "search_results.statuses_fts_disabled": "Pretraga objava po sadržaju nije omogućena na ovom Mastodon serveru.",
+  "search_results.title": "Pretraži {q}",
   "search_results.total": "{count, number} {count, plural, one {rezultat} few {rezultata} other {rezultata}}",
-  "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "Ovaj status ne može da se podrži",
-  "status.copy": "Copy link to status",
-  "status.delete": "Obriši",
-  "status.detailed_status": "Detailed conversation view",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Ugradi na sajt",
+  "server_banner.about_active_users": "Ljudi koji su koristili ovaj server u prethodnih 30 dana (mesečno aktivnih korisnika)",
+  "server_banner.active_users": "aktivnih korisnika",
+  "server_banner.administered_by": "Administrirano od strane:",
+  "server_banner.introduction": "{domain} je deo decentralizovane društvene mreže koju pokreće {mastodon}.",
+  "server_banner.learn_more": "Saznajte više",
+  "server_banner.server_stats": "Statistike servera:",
+  "sign_in_banner.create_account": "Napravi nalog",
+  "sign_in_banner.sign_in": "Prijavi se",
+  "sign_in_banner.text": "Prijavite se da pratite profile ili heštegove, stavite objave kao omiljene, delite i odgovarate na njih ili komunicirate sa svog naloga sa drugog servera.",
+  "status.admin_account": "Otvori moderatorsko okruženje za @{name}",
+  "status.admin_status": "Otvori ovu objavu u moderatorskom okruženju",
+  "status.block": "Blokiraj @{name}",
+  "status.bookmark": "Dodaj u obeleživače",
+  "status.cancel_reblog_private": "Ukloni podršku",
+  "status.cannot_reblog": "Ova objava se ne može podržati",
+  "status.copy": "Kopiraj vezu u objavu",
+  "status.delete": "Izbriši",
+  "status.detailed_status": "Detaljan prikaz razgovora",
+  "status.direct": "Direktna poruka @{name}",
+  "status.edit": "Uredi",
+  "status.edited": "Uređeno {date}",
+  "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
+  "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
-  "status.filtered": "Filtered",
+  "status.filter": "Filtriraj ovu objavu",
+  "status.filtered": "Filtrirano",
+  "status.hide": "Sakrij objavu",
+  "status.history.created": "{name} napisao/la {date}",
+  "status.history.edited": "{name} uredio/la {date}",
   "status.load_more": "Učitaj još",
   "status.media_hidden": "Multimedija sakrivena",
-  "status.mention": "Pomeni korisnika @{name}",
+  "status.mention": "Pomeni @{name}",
   "status.more": "Još",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "Ućutkaj prepisku",
-  "status.open": "Proširi ovaj status",
-  "status.pin": "Prikači na profil",
-  "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
+  "status.mute": "Ignoriši @{name}",
+  "status.mute_conversation": "Ignoriši razgovor",
+  "status.open": "Proširi ovu objavu",
+  "status.pin": "Zakači na profil",
+  "status.pinned": "Zakačene objave",
+  "status.read_more": "Pročitajte više",
   "status.reblog": "Podrži",
-  "status.reblog_private": "Boost with original visibility",
-  "status.reblogged_by": "{name} podržao(la)",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.reblog_private": "Podrži sa originalnom vidljivošću",
+  "status.reblogged_by": "{name} je podržao/la",
+  "status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
+  "status.redraft": "Izbriši i preoblikuj",
+  "status.remove_bookmark": "Ukloni obeleživač",
+  "status.replied_to": "Odgovor za {name}",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na diskusiju",
-  "status.report": "Prijavi korisnika @{name}",
+  "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osetljiv sadržaj",
   "status.share": "Podeli",
+  "status.show_filter_reason": "Ipak prikaži",
   "status.show_less": "Prikaži manje",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Prikaži manje za sve",
   "status.show_more": "Prikaži više",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
-  "status.unmute_conversation": "Uključi prepisku",
+  "status.show_more_all": "Prikaži više za sve",
+  "status.show_original": "Prikaži orginal",
+  "status.translate": "Prevedi",
+  "status.translated_from_with": "Prevedeno sa {lang} koristeći {provider}",
+  "status.uncached_media_warning": "Nije dostupno",
+  "status.unmute_conversation": "Ne ignoriši razgovor",
   "status.unpin": "Otkači sa profila",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Federisano",
+  "subscribed_languages.lead": "Samo objave na označenim jezicima će se pojavljivati na početnoj liniji i na listama posle ove izmene. Odaberite ništa da primate objave na svim jezicima.",
+  "subscribed_languages.save": "Sačuvaj izmene",
+  "subscribed_languages.target": "Promeni jezike na koje je {target} prijavljen",
+  "suggestions.dismiss": "Odbaci predlog",
+  "suggestions.header": "Možda će vas zanimati…",
+  "tabs_bar.federated_timeline": "Združeno",
   "tabs_bar.home": "Početna",
   "tabs_bar.local_timeline": "Lokalno",
   "tabs_bar.notifications": "Obaveštenja",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Ako napustite Mastodont, izgubićete napisani nacrt.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
-  "upload_area.title": "Prevucite ovde da otpremite",
-  "upload_button.label": "Dodaj multimediju",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Opiši za slabovide osobe",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Opozovi",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Otpremam...",
+  "time_remaining.days": "Ostalo {number, plural, one {# dan} few {# dana} other {# dana}}",
+  "time_remaining.hours": "Ostalo {number, plural, one {# sat} few {# sata} other {# sati}}",
+  "time_remaining.minutes": "Ostalo {number, plural, one {# minut} few {# minuta} other {# minuta}}",
+  "time_remaining.moments": "Još nekoliko trenutaka",
+  "time_remaining.seconds": "Ostalo {number, plural, one {# sekund} few {# sekunde} other {# sekundi}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} sa drugih servera se ne prikazuju.",
+  "timeline_hint.resources.followers": "Pratioci",
+  "timeline_hint.resources.follows": "Praćeni",
+  "timeline_hint.resources.statuses": "Starije objave",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} osobe} other {{counter} osoba}} u proteklih {days, plural, one {dan} few {{days} dana} other {{days} dana}}",
+  "trends.trending_now": "U trendu sada",
+  "ui.beforeunload": "Vaš nacrt će biti izgubljen ako napustite Mastodon.",
+  "units.short.billion": "{count} mlrd.",
+  "units.short.million": "{count} mil.",
+  "units.short.thousand": "{count} hilj.",
+  "upload_area.title": "Prevucite i otpustite za otpremanje",
+  "upload_button.label": "Dodaj slike, video ili audio datoteku",
+  "upload_error.limit": "Dostignuto je ograničenje za otpremanje datoteka.",
+  "upload_error.poll": "Otpremanje datoteka nije dozvoljeno sa anketama.",
+  "upload_form.audio_description": "Opišite za osobe sa oštećenim sluhom",
+  "upload_form.description": "Opišite za osobe sa oštećenim vidom",
+  "upload_form.description_missing": "Nema dodatog opisa",
+  "upload_form.edit": "Uredi",
+  "upload_form.thumbnail": "Promeni sličicu",
+  "upload_form.undo": "Izbriši",
+  "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
+  "upload_modal.analyzing_picture": "Analiziranje slike…",
+  "upload_modal.apply": "Primeni",
+  "upload_modal.applying": "Primena…",
+  "upload_modal.choose_image": "Odaberite sliku",
+  "upload_modal.description_placeholder": "Ljubazni fenjerdžija čađavog lica hoće da mi pokaže štos",
+  "upload_modal.detect_text": "Otkrij tekst sa slike",
+  "upload_modal.edit_media": "Uredi miltimediju",
+  "upload_modal.hint": "Kliknite ili prevucite kružić na pregledu za izbor tačke fokusa koja će uvek biti vidljiva na svim sličicama.",
+  "upload_modal.preparing_ocr": "Priprema OCR-a…",
+  "upload_modal.preview_label": "Pregled ({ratio})",
+  "upload_progress.label": "Otpremanje...",
+  "upload_progress.processing": "Obrada…",
   "video.close": "Zatvori video",
-  "video.download": "Download file",
-  "video.exit_fullscreen": "Napusti ceo ekran",
+  "video.download": "Preuzimanje datoteke",
+  "video.exit_fullscreen": "Izađi iz režima celog ekrana",
   "video.expand": "Proširi video",
   "video.fullscreen": "Ceo ekran",
   "video.hide": "Sakrij video",
-  "video.mute": "Ugasi zvuk",
+  "video.mute": "Isključi zvuk",
   "video.pause": "Pauziraj",
-  "video.play": "Pusti",
-  "video.unmute": "Vrati zvuk"
+  "video.play": "Reprodukuj",
+  "video.unmute": "Uključi zvuk"
 }
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index ba822e15d..5ad0bb50b 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -1,155 +1,206 @@
 {
+  "about.blocks": "Модерирани сервери",
+  "about.contact": "Контакт:",
+  "about.disclaimer": "Mastodon је бесплатан софтвер отвореног кода и заштићени знак компаније Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Разлог није наведен",
+  "about.domain_blocks.preamble": "Мастодон вам генерално омогућава да видите садржај и комуницирате са корисницима са било ког другог сервера у федиверзуму. Ово су изузеци који су направљени на овом серверу.",
+  "about.domain_blocks.silenced.explanation": "У начелу нећете видети профиле и садржај са овог сервера, осим ако га експлицитно не потражите или се укључите тако што ћете га пратити.",
+  "about.domain_blocks.silenced.title": "Ограничен",
+  "about.domain_blocks.suspended.explanation": "Подаци са овог сервера неће се обрађивати, чувати или размењивати, што онемогућава било какву интеракцију или комуникацију са корисницима са овог сервера.",
+  "about.domain_blocks.suspended.title": "Суспендован",
+  "about.not_available": "Ове информације нису доступне на овом серверу.",
+  "about.powered_by": "Децентрализована друштвена медија коју покреће {mastodon}",
+  "about.rules": "Правила сервера",
   "account.account_note_header": "Напомена",
-  "account.add_or_remove_from_list": "Додај или Одстрани са листа",
+  "account.add_or_remove_from_list": "Додај или уклони са листа",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
   "account.block": "Блокирај @{name}",
-  "account.block_domain": "Сакриј све са домена {domain}",
+  "account.block_domain": "Блокирај домен {domain}",
   "account.blocked": "Блокиран",
-  "account.browse_more_on_origin_server": "Погледајте још на оригиналном налогу",
-  "account.cancel_follow_request": "Поништи захтеве за праћење",
+  "account.browse_more_on_origin_server": "Прегледајте још на оригиналном профилу",
+  "account.cancel_follow_request": "Повуци захтев за праћење",
   "account.direct": "Директна порука @{name}",
-  "account.disable_notifications": "Прекини обавештавање за објаве корисника @{name}",
-  "account.domain_blocked": "Домен сакривен",
-  "account.edit_profile": "Уреди налог",
+  "account.disable_notifications": "Заустави обавештавање за објаве корисника @{name}",
+  "account.domain_blocked": "Домен је блокиран",
+  "account.edit_profile": "Уреди профил",
   "account.enable_notifications": "Обавести ме када @{name} објави",
-  "account.endorse": "Истакнуто на налогу",
-  "account.follow": "Запрати",
+  "account.endorse": "Истакни на профилу",
+  "account.featured_tags.last_status_at": "Последња објава {date}",
+  "account.featured_tags.last_status_never": "Нема објава",
+  "account.featured_tags.title": "Истакнуте хеш ознаке корисника {name}",
+  "account.follow": "Прати",
   "account.followers": "Пратиоци",
-  "account.followers.empty": "Тренутно нико не прати овог корисника.",
+  "account.followers.empty": "Још увек нико не прати овог корисника.",
   "account.followers_counter": "{count, plural, one {{counter} пратилац} few {{counter} пратиоца} other {{counter} пратилаца}}",
+  "account.following": "Прати",
   "account.following_counter": "{count, plural, one {{counter} прати} few {{counter} прати} other {{counter} прати}}",
-  "account.follows.empty": "Корисник тренутно не прати никога.",
-  "account.follows_you": "Прати Вас",
-  "account.hide_reblogs": "Сакриј подршке које даје корисника @{name}",
-  "account.joined": "Придружио/ла се {date}",
-  "account.last_status": "Последњи пут активан/на",
+  "account.follows.empty": "Овај корисник још увек никог не прати.",
+  "account.follows_you": "Прати вас",
+  "account.go_to_profile": "Иди на профил",
+  "account.hide_reblogs": "Сакриј подржавања од @{name}",
+  "account.joined_short": "Придружио се",
+  "account.languages": "Промени претплаћене језике",
   "account.link_verified_on": "Власништво над овом везом је проверено {date}",
   "account.locked_info": "Статус приватности овог налога је подешен на закључано. Власник ручно прегледа ко га може пратити.",
-  "account.media": "Медији",
+  "account.media": "Мултимедија",
   "account.mention": "Помени корисника @{name}",
-  "account.moved_to": "{name} се померио на:",
-  "account.mute": "Ућуткај корисника @{name}",
-  "account.mute_notifications": "Искључи обавештења од корисника @{name}",
-  "account.muted": "Ућуткан",
-  "account.never_active": "Никада",
-  "account.posts": "Трубе",
-  "account.posts_with_replies": "Трубе и одговори",
+  "account.moved_to": "Корисник {name} је назначио да је његов нови налог сада:",
+  "account.mute": "Игнориши корисника @{name}",
+  "account.mute_notifications": "Игнориши обавештења од @{name}",
+  "account.muted": "Игнорисан",
+  "account.open_original_page": "Отвори оригиналну страницу",
+  "account.posts": "Објаве",
+  "account.posts_with_replies": "Објаве и одговори",
   "account.report": "Пријави @{name}",
-  "account.requested": "Чекам одобрење. Кликните да поништите захтев за праћење",
-  "account.share": "Подели налог корисника @{name}",
-  "account.show_reblogs": "Прикажи подршке од корисника @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} објава} few {{counter} објаве} other {{counter} објава}}",
+  "account.requested": "Чекање одобрења. Кликните за отказивање захтева за праћење",
+  "account.requested_follow": "{name} је затражио да вас прати",
+  "account.share": "Подели профил корисника @{name}",
+  "account.show_reblogs": "Прикажи подржавања од корисника @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} објавио} few {{counter} објавио} other {{counter} објавио}}",
   "account.unblock": "Одблокирај корисника @{name}",
   "account.unblock_domain": "Одблокирај домен {domain}",
-  "account.unendorse": "Не истичи на налогу",
+  "account.unblock_short": "Одблокирај",
+  "account.unendorse": "Не истичи на профилу",
   "account.unfollow": "Отпрати",
-  "account.unmute": "Уклони ућуткавање кориснику @{name}",
-  "account.unmute_notifications": "Укључи назад обавештења од корисника @{name}",
-  "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "Молимо покушајте поново после {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Ограничена брзина",
-  "alert.unexpected.message": "Појавила се неочекивана грешка.",
+  "account.unmute": "Не игнориши @{name}",
+  "account.unmute_notifications": "Не игнориши обавештења од @{name}",
+  "account.unmute_short": "Не игнориши",
+  "account_note.placeholder": "Кликните да додате напомену",
+  "admin.dashboard.daily_retention": "Стопа задржавања корисника по данима након регистрације",
+  "admin.dashboard.monthly_retention": "Стопа задржавања корисника по месецима након регистрације",
+  "admin.dashboard.retention.average": "Просек",
+  "admin.dashboard.retention.cohort": "Месец приступања",
+  "admin.dashboard.retention.cohort_size": "Нови корисници",
+  "alert.rate_limited.message": "Покушајте поново после {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Ограничење захтева",
+  "alert.unexpected.message": "Дошло је до неочекиване грешке.",
   "alert.unexpected.title": "Упс!",
   "announcement.announcement": "Најава",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(необрађено)",
+  "audio.hide": "Сакриј аудио",
   "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
-  "bundle_column_error.body": "Нешто је пошло по злу приликом учитавања ове компоненте.",
+  "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
+  "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
+  "bundle_column_error.error.title": "О, не!",
+  "bundle_column_error.network.body": "Дошло је до грешке при покушају учитавања ове странице. Разлог може бити тренутни проблем са вашом интернет везом или са овим сервером.",
+  "bundle_column_error.network.title": "Грешка на мрежи",
   "bundle_column_error.retry": "Покушајте поново",
-  "bundle_column_error.title": "Мрежна грешка",
+  "bundle_column_error.return": "Иди на почетак",
+  "bundle_column_error.routing.body": "Није могуће пронаћи тражену страницу. Да ли сте сигурни да је URL у адресном пољу исправан?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
+  "closed_registrations.other_server_instructions": "Пошто је Mastodon децентрализован, можете направити налог на другом серверу али и даље комуницирати са овим.",
+  "closed_registrations_modal.description": "Креирање налога на {domain} тренутно није могуће, али имајте у виду да вам не треба налог засебно на {domain} да бисте користили Mastodon.",
+  "closed_registrations_modal.find_another_server": "Пронађите други сервер",
+  "closed_registrations_modal.preamble": "Mastodon је децентрализован, тако да без обзира где креирате свој налог, моћи ћете да пратите и комуницирате са било ким на овом серверу. Можете чак и сами да га хостујете!",
+  "closed_registrations_modal.title": "Регистрација за Mastodon",
+  "column.about": "Основни подаци",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
-  "column.directory": "Претражи налоге",
-  "column.domain_blocks": "Скривени домени",
-  "column.favourites": "Омиљене",
+  "column.directory": "Прегледај профиле",
+  "column.domain_blocks": "Блокирани домени",
+  "column.favourites": "Омиљено",
   "column.follow_requests": "Захтеви за праћење",
   "column.home": "Почетна",
   "column.lists": "Листе",
-  "column.mutes": "Ућуткани корисници",
+  "column.mutes": "Игнорисани корисници",
   "column.notifications": "Обавештења",
-  "column.pins": "Прикачене трубе",
+  "column.pins": "Закачене објаве",
   "column.public": "Здружена временска линија",
   "column_back_button.label": "Назад",
-  "column_header.hide_settings": "Сакриј поставке",
-  "column_header.moveLeft_settings": "Помери колону улево",
-  "column_header.moveRight_settings": "Помери колону удесно",
-  "column_header.pin": "Прикачи",
-  "column_header.show_settings": "Прикажи поставке",
+  "column_header.hide_settings": "Сакриј подешавања",
+  "column_header.moveLeft_settings": "Премести колону улево",
+  "column_header.moveRight_settings": "Премести колону удесно",
+  "column_header.pin": "Закачи",
+  "column_header.show_settings": "Прикажи подешавања",
   "column_header.unpin": "Откачи",
-  "column_subheading.settings": "Поставке",
+  "column_subheading.settings": "Подешавања",
   "community.column_settings.local_only": "Само локално",
-  "community.column_settings.media_only": "Само Медији",
+  "community.column_settings.media_only": "Само мултимедија",
   "community.column_settings.remote_only": "Само удаљено",
-  "compose_form.direct_message_warning": "Ова труба ће бити послата споменутим корисницима.",
+  "compose.language.change": "Промени језик",
+  "compose.language.search": "Претрага језика...",
   "compose_form.direct_message_warning_learn_more": "Сазнајте више",
-  "compose_form.hashtag_warning": "Ова труба неће бити излистана под било којом тарабом јер је сакривена. Само јавне трубе могу бити претражене тарабом.",
-  "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
+  "compose_form.encryption_warning": "Објаве на Mastodon-у нису потпуно шифроване. Немојте делити никакве осетљиве информације преко Mastodon-а.",
+  "compose_form.hashtag_warning": "Ова објава неће бити наведена ни под једном хеш ознаком јер је ненаведена. Само јавне објаве могу се претраживати по хеш ознакама.",
+  "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да вас прати и да види ваше објаве намењене само за ваше пратиоце.",
   "compose_form.lock_disclaimer.lock": "закључан",
-  "compose_form.placeholder": "Шта Вам је на уму?",
+  "compose_form.placeholder": "О чему размишљате?",
   "compose_form.poll.add_option": "Додајте избор",
   "compose_form.poll.duration": "Трајање анкете",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Одстрани овај избор",
+  "compose_form.poll.remove_option": "Уклони овај избор",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
-  "compose_form.publish": "Труби",
+  "compose_form.publish": "Објави",
+  "compose_form.publish_form": "Објави",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Означи мултимедију као осетљиву",
-  "compose_form.sensitive.marked": "Медији су означени као осетљиви",
-  "compose_form.sensitive.unmarked": "Медији су означени као не-осетљиви",
-  "compose_form.spoiler.marked": "Текст је сакривен иза упозорења",
-  "compose_form.spoiler.unmarked": "Текст није сакривен",
-  "compose_form.spoiler_placeholder": "Овде упишите упозорење",
-  "confirmation_modal.cancel": "Поништи",
-  "confirmations.block.block_and_report": "Блокирај и Пријави",
+  "compose_form.save_changes": "Сачувај промене",
+  "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+  "compose_form.spoiler.marked": "Уклони упозорење о садржају",
+  "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
+  "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+  "confirmation_modal.cancel": "Откажи",
+  "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
   "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
-  "confirmations.delete.confirm": "Обриши",
-  "confirmations.delete.message": "Да ли сте сигурни да желите обришете овај статус?",
-  "confirmations.delete_list.confirm": "Обриши",
-  "confirmations.delete_list.message": "Да ли сте сигурни да желите да бесповратно обришете ову листу?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Сакриј цео домен",
-  "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, неколико добро промишљених блокирања или ућуткавања су довољна и препоручљива.",
+  "confirmations.cancel_follow_request.confirm": "Повуци захтев",
+  "confirmations.cancel_follow_request.message": "Да ли сте сигурни да желите да повучете захтев да пратите {name}?",
+  "confirmations.delete.confirm": "Избриши",
+  "confirmations.delete.message": "Да ли сте сигурни да желите изришете ову објаву?",
+  "confirmations.delete_list.confirm": "Избриши",
+  "confirmations.delete_list.message": "Да ли сте сигурни да желите да трајно избришете ову листу?",
+  "confirmations.discard_edit_media.confirm": "Одбаци",
+  "confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
+  "confirmations.domain_block.confirm": "Блокирај цео домен",
+  "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Да ли се сигурни да желите да се одјавите?",
-  "confirmations.mute.confirm": "Ућуткај",
-  "confirmations.mute.explanation": "Ово ће сакрити објаве од њих и објаве које их помињу, али ће им и даље дозволити да виде ваше постове и да вас запрате.",
-  "confirmations.mute.message": "Да ли стварно желите да ућуткате корисника {name}?",
+  "confirmations.mute.confirm": "Игнориши",
+  "confirmations.mute.explanation": "Ово ће сакрити објаве од корисника и објаве које га помињу, али ће му и даље бити дозвољено да види ваше објаве и да вас прати.",
+  "confirmations.mute.message": "Да ли стварно желите да игноришете корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
-  "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете овај статус и да га преправите? Сва стављања у омиљене трубе, као и подршке ће бити изгубљене, а одговори на оригинални пост ће бити поништени.",
+  "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.reply.confirm": "Одговори",
-  "confirmations.reply.message": "Одговарањем ћете обрисати поруку коју састављате. Јесте ли сигурни да желите да наставите?",
+  "confirmations.reply.message": "Одговарањем ћете обрисати поруку коју састављате. Да ли сигурни да желите да наставите?",
   "confirmations.unfollow.confirm": "Отпрати",
   "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
-  "conversation.delete": "Обриши преписку",
+  "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означи као прочитано",
-  "conversation.open": "Прикажи преписку",
+  "conversation.open": "Прикажи разговор",
   "conversation.with": "Са {names}",
-  "directory.federated": "Са знаних здружених инстанци",
+  "copypaste.copied": "Копирано",
+  "copypaste.copy": "Копирај",
+  "directory.federated": "Са знаног фидеверзума",
   "directory.local": "Само са {domain}",
   "directory.new_arrivals": "Новопридошли",
   "directory.recently_active": "Недавно активни",
-  "embed.instructions": "Угради овај статус на Ваш веб сајт копирањем кода испод.",
-  "embed.preview": "Овако ће да изгледа:",
+  "disabled_account_banner.account_settings": "Подешавања налога",
+  "disabled_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен.",
+  "dismissable_banner.community_timeline": "Ово су најновије јавне објаве људи чије налоге хостује {domain}.",
+  "dismissable_banner.dismiss": "Одбаци",
+  "dismissable_banner.explore_links": "О овим вестима управо сада разговарају људи на овом и другим серверима децентрализоване мреже.",
+  "dismissable_banner.explore_statuses": "Ове објаве са овог и других сервера у децентрализованој мрежи постају све популарније на овом серверу.",
+  "dismissable_banner.explore_tags": "Ове хеш ознаке постају све популарније међу људима на овом и другим серверима децентрализоване мреже.",
+  "dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи на овом и другим серверима децентрализоване мреже за које овај сервер зна.",
+  "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
+  "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активност",
-  "emoji_button.custom": "Произвољно",
-  "emoji_button.flags": "Заставе",
+  "emoji_button.clear": "Обриши",
+  "emoji_button.custom": "Прилагођено",
+  "emoji_button.flags": "Заставице",
   "emoji_button.food": "Храна и пиће",
   "emoji_button.label": "Убаци емоџи",
   "emoji_button.nature": "Природа",
-  "emoji_button.not_found": "Нема емоџија!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Нема пронађих одговарајућих емоџија",
   "emoji_button.objects": "Објекти",
   "emoji_button.people": "Људи",
   "emoji_button.recent": "Најчешће коришћени",
@@ -157,176 +208,224 @@
   "emoji_button.search_results": "Резултати претраге",
   "emoji_button.symbols": "Симболи",
   "emoji_button.travel": "Путовања и места",
-  "empty_column.account_suspended": "Налог суспендован",
-  "empty_column.account_timeline": "Овде нема труба!",
-  "empty_column.account_unavailable": "Налог је недоступан",
-  "empty_column.blocks": "Још увек немате блокираних корисника.",
-  "empty_column.bookmarked_statuses": "Још увек немате обележене трубе. Када их обележите, појавиће се овде.",
+  "empty_column.account_suspended": "Налог је суспендован",
+  "empty_column.account_timeline": "Нема објава овде!",
+  "empty_column.account_unavailable": "Профил је недоступан",
+  "empty_column.blocks": "Још увек нисте блокирали ниједног корисника.",
+  "empty_column.bookmarked_statuses": "Још увек немате објава доданих у обележиваче. Када додате неку, појавиће се овде.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
-  "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.",
-  "empty_column.domain_blocks": "Још увек нема сакривених домена.",
-  "empty_column.favourited_statuses": "Још увек немате труба које су вам се свиделе. Када вам се једна свиди, појавиће се овде.",
-  "empty_column.favourites": "Још увек се никоме није свидела ова труба. Када се некоме свиди, појавиће се овде.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.direct": "Још увек немате ниједну директну поруку. Када пошаљете или примите неку, појавиће се овде.",
+  "empty_column.domain_blocks": "Још увек нема блокираних домена.",
+  "empty_column.explore_statuses": "Тренутно ништа није у тренду. Проверите поново касније!",
+  "empty_column.favourited_statuses": "Још увек немате објава означених као омиљене. Када означите неку, појавиће се овде.",
+  "empty_column.favourites": "Нико још није означио ову објаву као омиљену. Када неко то уради, појавиће се овде.",
+  "empty_column.follow_recommendations": "Изгледа да не могу да се генеришу било какви предлози за вас. Можете покушати да користите претрагу како бисте потражили људе које можда познајете или истражили популарне хеш ознаке.",
   "empty_column.follow_requests": "Још увек немате захтева за праћење. Када примите захтев, појавиће се овде.",
-  "empty_column.hashtag": "Тренутно нема ништа на овој означеној тараби.",
-  "empty_column.home": "Ваша временска линија је празна! Посетите {public} или користите претрагу да почнете и да упознате нове људе.",
-  "empty_column.home.suggestions": "See some suggestions",
-  "empty_column.list": "У овој листи још нема ничега. Када чланови листе објаве нове статусе, они ће се појавити овде.",
+  "empty_column.hashtag": "Још увек нема ничега у овој хеш ознаци.",
+  "empty_column.home": "Ваша почетна временска линија је празна! Пратите више људи да бисте је попунили. {suggestions}",
+  "empty_column.home.suggestions": "Погледајте неке предлоге",
+  "empty_column.list": "У овој листи још нема ничега. Када чланови ове листе објаве нешто ново, појавиће се овде.",
   "empty_column.lists": "Још увек немате ниједну листу. Када направите једну, појавиће се овде.",
-  "empty_column.mutes": "Још увек немате ућутканих корисника.",
-  "empty_column.notifications": "Тренутно немате обавештења. Дружите се мало да започнете разговор.",
-  "empty_column.public": "Овде нема ничега! Напишите нешто јавно, или нађите кориснике са других инстанци које ћете запратити да попуните ову празнину",
+  "empty_column.mutes": "Још увек не игноришете ниједног корисника.",
+  "empty_column.notifications": "Још увек немате никаква обавештења. Када други људи буду у интеракцији са вама, видећете то овде.",
+  "empty_column.public": "Овде нема ничега! Напишите нешто јавно или ручно пратите кориснике са других сервера да бисте ово попунили",
   "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
   "error.unexpected_crash.explanation_addons": "Ова страница се није могла правилно приказати. Ову грешку вероватно узрокују додаци прегледача или алати за аутоматско превођење.",
-  "error.unexpected_crash.next_steps": "Покушајте да освежите страницу. Ако то не помогне, можда ћете и даље моћи да користите Мастодон путем другог прегледача или матичне апликације.",
+  "error.unexpected_crash.next_steps": "Покушајте да освежите страницу. Ако то не помогне, можда ћете и даље моћи да користите Mastodon путем другог прегледача или матичне апликације.",
   "error.unexpected_crash.next_steps_addons": "Покушајте да их онемогућите и освежите страницу. Ако то не помогне, можда ћете и даље моћи да користите Mastodon преко другог прегледача или матичне апликације.",
-  "errors.unexpected_crash.copy_stacktrace": "Копирај \"stacktrace\" у клипборд",
+  "errors.unexpected_crash.copy_stacktrace": "Копирај „stacktrace” у клипборд",
   "errors.unexpected_crash.report_issue": "Пријави проблем",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "explore.search_results": "Резултати претраге",
+  "explore.suggested_follows": "За тебе",
+  "explore.title": "Истражи",
+  "explore.trending_links": "Вести",
+  "explore.trending_statuses": "Објаве",
+  "explore.trending_tags": "Хеш ознаке",
+  "filter_modal.added.context_mismatch_explanation": "Ова категорија филтера се не односи на контекст у којем сте приступили овој објави. Ако желите да се објава филтрира и у овом контексту, морате уредити филтер.",
+  "filter_modal.added.context_mismatch_title": "Контекст се не подудара!",
+  "filter_modal.added.expired_explanation": "Ова категорија филтера је истекла, морате променити датум истека да би се примењивала.",
+  "filter_modal.added.expired_title": "Филтер је истекао!",
+  "filter_modal.added.review_and_configure": "За преглед и даљу конфигурацију ове категорије филтера, идите на {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Подешавања филтера",
+  "filter_modal.added.settings_link": "страница подешавања",
+  "filter_modal.added.short_explanation": "Ова објава је додата у следећу категорију филтера: {title}.",
+  "filter_modal.added.title": "Филтер је додат!",
+  "filter_modal.select_filter.context_mismatch": "не односи се на овај контекст",
+  "filter_modal.select_filter.expired": "истекло",
+  "filter_modal.select_filter.prompt_new": "Нова категорија: {name}",
+  "filter_modal.select_filter.search": "Претражи или креирај",
+  "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
+  "filter_modal.select_filter.title": "Филтрирај ову објаву",
+  "filter_modal.title.status": "Филтрирај објаву",
+  "follow_recommendations.done": "Готово",
+  "follow_recommendations.heading": "Пратите људе чије објаве желите да видите! Ево неких предлога.",
+  "follow_recommendations.lead": "Објаве корисника које пратите ће се појављивати хронолошким редоследом на почетној страници. Не плашите се грешака, можете отпратити кориснике у било ком тренутку!",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
-  "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} је помислило да бисте можда желели ручно да прегледате захтеве за праћење са ових налога.",
+  "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
+  "footer.about": "Основни подаци",
+  "footer.directory": "Директоријум профила",
+  "footer.get_app": "Преузмите апликацију",
+  "footer.invite": "Позови особе",
+  "footer.keyboard_shortcuts": "Тастерске пречице",
+  "footer.privacy_policy": "Политика приватности",
+  "footer.source_code": "Прикажи изворни код",
   "generic.saved": "Сачувано",
-  "getting_started.developers": "Програмери",
-  "getting_started.directory": "Директоријум налога",
-  "getting_started.documentation": "Документација",
-  "getting_started.heading": "Да почнете",
-  "getting_started.invite": "Позовите људе",
-  "getting_started.open_source_notice": "Мастoдон је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко ГитХаба на {github}.",
-  "getting_started.security": "Безбедност",
-  "getting_started.terms": "Услови коришћења",
+  "getting_started.heading": "Први кораци",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
   "hashtag.column_settings.select.no_options_message": "Нису пронађени предлози",
-  "hashtag.column_settings.select.placeholder": "Унеси хештег…",
+  "hashtag.column_settings.select.placeholder": "Унесите хеш ознаке…",
   "hashtag.column_settings.tag_mode.all": "Све оve",
   "hashtag.column_settings.tag_mode.any": "Било које од ових",
-  "hashtag.column_settings.tag_mode.none": "Ништа од ових",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.column_settings.tag_mode.none": "Ниједан од ових",
+  "hashtag.column_settings.tag_toggle": "Укључи додатне ознаке за ову колону",
+  "hashtag.follow": "Прати хеш ознаку",
+  "hashtag.unfollow": "Отпрати хеш ознаку",
   "home.column_settings.basic": "Основно",
-  "home.column_settings.show_reblogs": "Прикажи и подржавања",
+  "home.column_settings.show_reblogs": "Прикажи подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
   "home.hide_announcements": "Сакриј најаве",
   "home.show_announcements": "Пријажи најаве",
-  "intervals.full.days": "{number, plural, one {# дан} other {# дана}}",
-  "intervals.full.hours": "{number, plural, one {# сат} other {# сати}}",
-  "intervals.full.minutes": "{number, plural, one {# минут} other {# минута}}",
-  "keyboard_shortcuts.back": "да одете назад",
-  "keyboard_shortcuts.blocked": "да отворите листу блокираних корисника",
-  "keyboard_shortcuts.boost": "да подржите",
-  "keyboard_shortcuts.column": "да се пребаците на статус у једној од колона",
-  "keyboard_shortcuts.compose": "да се пребаците на писање новог тута",
+  "interaction_modal.description.favourite": "Са налогом на Mastodon-у, можете означити ову објаву као омиљену како бисте дали до знања аутору да вам се свиђа и сачували је за касније.",
+  "interaction_modal.description.follow": "Са налогом на Mastodon-у, можете пратити корисника {name} како бисте примали његове објаве на почетној страници.",
+  "interaction_modal.description.reblog": "Са налогом на Mastodon-у, можете подржати ову објаву како бите је поделили са својим пратиоцима.",
+  "interaction_modal.description.reply": "Са налогом на Mastodon-у, можете одговорити на ову објаву.",
+  "interaction_modal.on_another_server": "На другом серверу",
+  "interaction_modal.on_this_server": "На овом серверу",
+  "interaction_modal.other_server_instructions": "Копирајте и налепите ову URL адресу у поље претраге своје омиљене Mastodon апликације или веб окружење свог Mastodon сервера.",
+  "interaction_modal.preamble": "Пошто је Mastodon децентрализован, можете користити свој постојећи налог који хостује други Mastodon сервер или компатибилна платформа ако немате налог на овом.",
+  "interaction_modal.title.favourite": "Означи објаву корисника {name} као омиљену",
+  "interaction_modal.title.follow": "Прати {name}",
+  "interaction_modal.title.reblog": "Подржи објаву корисника {name}",
+  "interaction_modal.title.reply": "Одговори на објаву корисника {name}",
+  "intervals.full.days": "{number, plural, one {# дан} few {# дана} other {# дана}}",
+  "intervals.full.hours": "{number, plural, one {# сат} few {# сата} other {# сати}}",
+  "intervals.full.minutes": "{number, plural, one {# минут} few {# минута} other {# минута}}",
+  "keyboard_shortcuts.back": "Иди назад",
+  "keyboard_shortcuts.blocked": "Отвори листу блокираних корисника",
+  "keyboard_shortcuts.boost": "Подржи објаву",
+  "keyboard_shortcuts.column": "Фокусирај колону",
+  "keyboard_shortcuts.compose": "Фокусирај поље за састављање објаве",
   "keyboard_shortcuts.description": "Опис",
-  "keyboard_shortcuts.direct": "да отворите колону за директне поруке",
-  "keyboard_shortcuts.down": "да се померите на доле у листи",
-  "keyboard_shortcuts.enter": "да отворите статус",
-  "keyboard_shortcuts.favourite": "да означите као омиљено",
-  "keyboard_shortcuts.favourites": "да отворите листу фаворита",
-  "keyboard_shortcuts.federated": "да отворите здружену временску линију",
-  "keyboard_shortcuts.heading": "Пречице на тастатури",
-  "keyboard_shortcuts.home": "да отворите временску линију почетне",
+  "keyboard_shortcuts.direct": "за отварање колоне директних порука",
+  "keyboard_shortcuts.down": "Премести надоле у листи",
+  "keyboard_shortcuts.enter": "Отвори објаву",
+  "keyboard_shortcuts.favourite": "Означи објаву као омиљену",
+  "keyboard_shortcuts.favourites": "Отвори листу омиљених",
+  "keyboard_shortcuts.federated": "Отвори здружену временску линију",
+  "keyboard_shortcuts.heading": "Тастерске пречице",
+  "keyboard_shortcuts.home": "Отвори почетну временску линију",
   "keyboard_shortcuts.hotkey": "Пречица",
-  "keyboard_shortcuts.legend": "да прикажете овај подсетник",
-  "keyboard_shortcuts.local": "да отворите локалну временску линију",
-  "keyboard_shortcuts.mention": "да поменете аутора",
-  "keyboard_shortcuts.muted": "да отворите листу ућутканих корисника",
-  "keyboard_shortcuts.my_profile": "Погледајте ваш налог",
-  "keyboard_shortcuts.notifications": "да отворите колону обавештења",
-  "keyboard_shortcuts.open_media": "за отварање медија",
-  "keyboard_shortcuts.pinned": "да отворите листу закачених труба",
-  "keyboard_shortcuts.profile": "Погледајте налог аутора",
-  "keyboard_shortcuts.reply": "да одговорите",
-  "keyboard_shortcuts.requests": "да отворите листу примљених захтева за праћење",
-  "keyboard_shortcuts.search": "да се пребаците на претрагу",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "да отворите колону \"почнимо\"",
-  "keyboard_shortcuts.toggle_hidden": "да прикажете/сакријте текст иза CW-а",
-  "keyboard_shortcuts.toggle_sensitivity": "за приказивање/сакривање медија",
-  "keyboard_shortcuts.toot": "да започнете скроз нову трубу",
-  "keyboard_shortcuts.unfocus": "да одфокусирате/не будете више на претрази/прављењу нове трубе",
-  "keyboard_shortcuts.up": "да се померите на горе у листи",
+  "keyboard_shortcuts.legend": "Прикажи ову легенду",
+  "keyboard_shortcuts.local": "Отвори локалну временску линију",
+  "keyboard_shortcuts.mention": "Помени аутора",
+  "keyboard_shortcuts.muted": "Отвори листу игнорисаних корисника",
+  "keyboard_shortcuts.my_profile": "Отворите свој профил",
+  "keyboard_shortcuts.notifications": "Отвори колону обавештења",
+  "keyboard_shortcuts.open_media": "Отвори мултимедију",
+  "keyboard_shortcuts.pinned": "Отвори листу закачених објава",
+  "keyboard_shortcuts.profile": "Отвори профил аутора",
+  "keyboard_shortcuts.reply": "Одговори на објаву",
+  "keyboard_shortcuts.requests": "Отвори листу захтева за праћење",
+  "keyboard_shortcuts.search": "Фокусирај траку претраге",
+  "keyboard_shortcuts.spoilers": "Прикажи/сакриј поље текста упозорења о садржају (CW)",
+  "keyboard_shortcuts.start": "Отвори колону „први кораци”",
+  "keyboard_shortcuts.toggle_hidden": "Прикажи/сакриј текст иза CW-а",
+  "keyboard_shortcuts.toggle_sensitivity": "Прикажи/сакриј мултимедију",
+  "keyboard_shortcuts.toot": "Започни нову објаву",
+  "keyboard_shortcuts.unfocus": "Уклони фокус са поља за унос текста/претраге",
+  "keyboard_shortcuts.up": "Премести нагоре у листи",
   "lightbox.close": "Затвори",
-  "lightbox.compress": "Умањи преглед слике",
-  "lightbox.expand": "Увећај преглед слике",
-  "lightbox.next": "Следећи",
-  "lightbox.previous": "Претходни",
+  "lightbox.compress": "Компримуј оквир за приказ слике",
+  "lightbox.expand": "Прошири оквир за приказ слике",
+  "lightbox.next": "Следеће",
+  "lightbox.previous": "Претходно",
+  "limited_account_hint.action": "Ипак прикажи профил",
+  "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.",
   "lists.account.add": "Додај на листу",
   "lists.account.remove": "Уклони са листе",
-  "lists.delete": "Обриши листу",
-  "lists.edit": "Измени листу",
+  "lists.delete": "Избриши листу",
+  "lists.edit": "Уреди листу",
   "lists.edit.submit": "Промени наслов",
   "lists.new.create": "Додај листу",
   "lists.new.title_placeholder": "Наслов нове листе",
-  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.followed": "Сваки праћени корисник",
   "lists.replies_policy.list": "Чланови листе",
   "lists.replies_policy.none": "Нико",
   "lists.replies_policy.title": "Прикажи одговоре на:",
   "lists.search": "Претражи међу људима које пратите",
   "lists.subheading": "Ваше листе",
   "load_pending": "{count, plural, one {# нова ставка} few {# нове ставке} other {# нових ставки}}",
-  "loading_indicator.label": "Учитавам...",
-  "media_gallery.toggle_visible": "Укључи/искључи видљивост",
+  "loading_indicator.label": "Учитавање...",
+  "media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
   "missing_indicator.label": "Није пронађено",
-  "missing_indicator.sublabel": "Овај ресурс није пронађен",
+  "missing_indicator.sublabel": "Овај ресурс није могуће пронаћи",
+  "moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
   "mute_modal.duration": "Трајање",
-  "mute_modal.hide_notifications": "Сакриј обавештења од овог корисника?",
+  "mute_modal.hide_notifications": "Сакрити обавештења од овог корисника?",
   "mute_modal.indefinite": "Неодређен",
-  "navigation_bar.apps": "Мобилне апликације",
+  "navigation_bar.about": "Основни подаци",
   "navigation_bar.blocks": "Блокирани корисници",
-  "navigation_bar.bookmarks": "Маркери",
+  "navigation_bar.bookmarks": "Обележивачи",
   "navigation_bar.community_timeline": "Локална временска линија",
-  "navigation_bar.compose": "Саставите нову трубу",
+  "navigation_bar.compose": "Састави нову објаву",
   "navigation_bar.direct": "Директне поруке",
   "navigation_bar.discover": "Откриј",
-  "navigation_bar.domain_blocks": "Сакривени домени",
-  "navigation_bar.edit_profile": "Измени налог",
-  "navigation_bar.favourites": "Омиљене",
-  "navigation_bar.filters": "Пригушене речи",
+  "navigation_bar.domain_blocks": "Блокирани домени",
+  "navigation_bar.edit_profile": "Уреди профил",
+  "navigation_bar.explore": "Истражи",
+  "navigation_bar.favourites": "Омиљено",
+  "navigation_bar.filters": "Игнорисане речи",
   "navigation_bar.follow_requests": "Захтеви за праћење",
   "navigation_bar.follows_and_followers": "Праћења и пратиоци",
-  "navigation_bar.info": "О овој инстанци",
-  "navigation_bar.keyboard_shortcuts": "Пречице на тастатури",
   "navigation_bar.lists": "Листе",
   "navigation_bar.logout": "Одјава",
-  "navigation_bar.mutes": "Ућуткани корисници",
+  "navigation_bar.mutes": "Игнорисани корисници",
   "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Прикачене трубе",
+  "navigation_bar.pins": "Закачене објаве",
   "navigation_bar.preferences": "Подешавања",
   "navigation_bar.public_timeline": "Здружена временска линија",
+  "navigation_bar.search": "Претрага",
   "navigation_bar.security": "Безбедност",
-  "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени",
-  "notification.follow": "{name} Вас је запратио/ла",
-  "notification.follow_request": "{name} је затражио да Вас запрати",
-  "notification.mention": "{name} Вас је поменуо/ла",
+  "not_signed_in_indicator.not_signed_in": "Морате да се пријавите да приступите овом ресурсу.",
+  "notification.admin.report": "{name} је пријавио {target}",
+  "notification.admin.sign_up": "{name} се регистровао",
+  "notification.favourite": "{name} је означио вашу објаву као омиљену",
+  "notification.follow": "{name} вас је запратио",
+  "notification.follow_request": "{name} је затражио да вас прати",
+  "notification.mention": "{name} вас је поменуо",
   "notification.own_poll": "Ваша анкета је завршена",
   "notification.poll": "Завршена је анкета у којој сте гласали",
-  "notification.reblog": "{name} је подржао/ла Ваш статус",
-  "notification.status": "{name} управо објавио",
-  "notifications.clear": "Очисти обавештења",
-  "notifications.clear_confirmation": "Да ли сте сигурно да трајно желите да очистите Ваша обавештења?",
+  "notification.reblog": "{name} је подржао вашу објаву",
+  "notification.status": "{name} је управо објавио",
+  "notification.update": "{name} је уредио објаву",
+  "notifications.clear": "Обриши обавештења",
+  "notifications.clear_confirmation": "Да ли сте сигурни да желите трајно да обришете сва ваша обавештења?",
+  "notifications.column_settings.admin.report": "Нове пријаве:",
+  "notifications.column_settings.admin.sign_up": "Нове рагистрације:",
   "notifications.column_settings.alert": "Обавештења на радној површини",
   "notifications.column_settings.favourite": "Омиљени:",
   "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
   "notifications.column_settings.filter_bar.category": "Трака за брзи филтер",
-  "notifications.column_settings.filter_bar.show": "Прикажи",
+  "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима",
   "notifications.column_settings.follow": "Нови пратиоци:",
   "notifications.column_settings.follow_request": "Нови захтеви за праћење:",
   "notifications.column_settings.mention": "Помињања:",
   "notifications.column_settings.poll": "Резултати анкете:",
-  "notifications.column_settings.push": "Гурај обавештења",
-  "notifications.column_settings.reblog": "Подршки:",
+  "notifications.column_settings.push": "Прослеђена обавештења",
+  "notifications.column_settings.reblog": "Подржавања:",
   "notifications.column_settings.show": "Прикажи у колони",
-  "notifications.column_settings.sound": "Пуштај звук",
-  "notifications.column_settings.status": "Нови тутови:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.sound": "Репродукуј звук",
+  "notifications.column_settings.status": "Нове објаве:",
+  "notifications.column_settings.unread_notifications.category": "Непрочитана обавештења",
+  "notifications.column_settings.unread_notifications.highlight": "Истакни непрочитана обавештења",
+  "notifications.column_settings.update": "Уређивања:",
   "notifications.filter.all": "Све",
-  "notifications.filter.boosts": "Подршки",
-  "notifications.filter.favourites": "Омиљене",
-  "notifications.filter.follows": "Праћени",
+  "notifications.filter.boosts": "Подржавања",
+  "notifications.filter.favourites": "Омиљено",
+  "notifications.filter.follows": "Праћења",
   "notifications.filter.mentions": "Помињања",
   "notifications.filter.polls": "Резултати анкете",
   "notifications.filter.statuses": "Ажурирања од људи које пратите",
@@ -337,148 +436,219 @@
   "notifications.permission_denied_alert": "Обавештења на радној површини не могу бити омогућена, јер је дозвола прегледача раније била одбијена",
   "notifications.permission_required": "Обавештења на радној површини нису доступна јер потребна дозвола није додељена.",
   "notifications_permission_banner.enable": "Омогућити обавештења на радној површини",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Ништа не пропустите",
+  "notifications_permission_banner.how_to_control": "Да бисте примали обавештења када Mastodon није отворен, омогућите обавештења на радној површини. Kада су обавештења на радној површини омогућена врсте интеракција које она генеришу могу се подешавати помоћу дугмета {icon}.",
+  "notifications_permission_banner.title": "Никада ништа не пропустите",
   "picture_in_picture.restore": "Врати то назад",
   "poll.closed": "Затворено",
   "poll.refresh": "Освежи",
   "poll.total_people": "{count, plural, one {# особа} few {# особе} other {# особа}}",
-  "poll.total_votes": "{count, plural, one {# гласање} few {# гласања} other {# гласања}}",
+  "poll.total_votes": "{count, plural, one {# глас} few {# гласа} other {# гласова}}",
   "poll.vote": "Гласајте",
   "poll.voted": "Гласали сте за овај одговор",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# глас} few {# гласа} other {# гласова}}",
   "poll_button.add_poll": "Додај анкету",
   "poll_button.remove_poll": "Уклони анкету",
-  "privacy.change": "Подеси статус приватности",
-  "privacy.direct.long": "Објави само корисницима који су поменути",
-  "privacy.direct.short": "Директно",
-  "privacy.private.long": "Објави само пратиоцима",
-  "privacy.private.short": "Само за пратиоце",
-  "privacy.public.long": "Објави на јавној лајни",
+  "privacy.change": "Промени приватност објаве",
+  "privacy.direct.long": "Видљиво само за поменуте кориснике",
+  "privacy.direct.short": "Само поменуте особе",
+  "privacy.private.long": "Видљиво само за пратиоце",
+  "privacy.private.short": "Само пратиоци",
+  "privacy.public.long": "Видљиво за све",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Не објављуј на јавним временским линијама",
+  "privacy.unlisted.long": "Видљиво за све, али искључено из функције откривања",
   "privacy.unlisted.short": "Неизлистано",
+  "privacy_policy.last_updated": "Последње ажурирање {date}",
+  "privacy_policy.title": "Политика приватности",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Учитавање…",
   "regeneration_indicator.sublabel": "Ваша почетна страница се припрема!",
-  "relative_time.days": "{number}д",
-  "relative_time.hours": "{number}х",
+  "relative_time.days": "{number} дан.",
+  "relative_time.full.days": "Пре {number, plural, one {# дан} few {# дана} other {# дана}}",
+  "relative_time.full.hours": "пре {number, plural, one {# сат} few {# сата} other {# сати}}",
+  "relative_time.full.just_now": "управо сад",
+  "relative_time.full.minutes": "пре {number, plural, one {# минут} few {# минута} other {# минута}}",
+  "relative_time.full.seconds": "пре {number, plural, one {# секунду} few {# секунде} other {# секунди}}",
+  "relative_time.hours": "{number} час.",
   "relative_time.just_now": "сада",
-  "relative_time.minutes": "{number}м",
-  "relative_time.seconds": "{number}с",
+  "relative_time.minutes": "{number} мин.",
+  "relative_time.seconds": "{number} сек.",
   "relative_time.today": "данас",
-  "reply_indicator.cancel": "Поништи",
+  "reply_indicator.cancel": "Откажи",
+  "report.block": "Блокирај",
+  "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети ваше објаве нити ће моћи да вас прати. Такође може да зна да је блокиран.",
+  "report.categories.other": "Остало",
+  "report.categories.spam": "Спам",
+  "report.categories.violation": "Садржај крши једно или више правила сервера",
+  "report.category.subtitle": "Одаберите најприближније",
+  "report.category.title": "Реците нам шта је проблем са овим {type}",
+  "report.category.title_account": "профилом",
+  "report.category.title_status": "објавом",
+  "report.close": "Готово",
+  "report.comment.title": "Да ли има нешто додатно што треба да знамо?",
   "report.forward": "Проследити {target}",
   "report.forward_hint": "Налог је са другог сервера. Послати анонимну копију пријаве и тамо?",
-  "report.hint": "Пријава ће бити послата модераторима ваше инстанце. Можете додати објашњење зашто пријављујете овај налог у наставку:",
+  "report.mute": "Игнориши",
+  "report.mute_explanation": "Нећете видети објаве корисника. Он и и даље може да вас прати и види ваше објаве и неће знати да је игнорисан.",
+  "report.next": "Следеће",
   "report.placeholder": "Додатни коментари",
+  "report.reasons.dislike": "Не свиђа ми се",
+  "report.reasons.dislike_description": "Ово није нешто што желиш да видите",
+  "report.reasons.other": "Нешто друго",
+  "report.reasons.other_description": "Проблем се не уклапа у друге категорије",
+  "report.reasons.spam": "Ово је спам",
+  "report.reasons.spam_description": "Злонамерне везе, лажно ангажовање или одговори који се понављају",
+  "report.reasons.violation": "Крши правила сервера",
+  "report.reasons.violation_description": "Свесни сте да крши нека одређена правила",
+  "report.rules.subtitle": "Изабери све што важи",
+  "report.rules.title": "Која правила су прекршена?",
+  "report.statuses.subtitle": "Изабери све што важи",
+  "report.statuses.title": "Да ли постоје било какве објаве које подржавају ову пријаву?",
   "report.submit": "Пошаљи",
   "report.target": "Пријављујем {target}",
+  "report.thanks.take_action": "Ово су Ваше опције да контролишете шта видите на Mastodon-у:",
+  "report.thanks.take_action_actionable": "Док ми прегледамо ово, можете применити следеће радње против @{name}:",
+  "report.thanks.title": "Не желите да видите ово?",
+  "report.thanks.title_actionable": "Хвала на пријави, прегледаћемо је.",
+  "report.unfollow": "Отпрати @{name}",
+  "report.unfollow_explanation": "Пратите овај налог. Да не бисте више видели његове објаве на почетној страници, отпратите га.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} објава} few {{count} објаве} other {{count} објава}} у прилогу",
+  "report_notification.categories.other": "Остало",
+  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.violation": "Кршење правила",
+  "report_notification.open": "Отвори пријаву",
   "search.placeholder": "Претрага",
+  "search.search_or_paste": "Претражите или унесите адресу",
   "search_popout.search_format": "Напредни формат претраге",
-  "search_popout.tips.full_text": "Једноставан текст враћа статусе које сте написали, фаворизовали, подржали или били поменути, као и подударање корисничких имена, приказаних имена, и тараба.",
-  "search_popout.tips.hashtag": "хештег",
-  "search_popout.tips.status": "статус",
-  "search_popout.tips.text": "Тражењем обичног текста ћете добити сва пронађена имена, сва корисничка имена и све нађене хештегове",
+  "search_popout.tips.full_text": "Једноставан текст враћа објаве које сте написали, додали у омиљене, подржали или у којима сте били поменути, као и подударање корисничких имена, приказана имена и хеш ознаке.",
+  "search_popout.tips.hashtag": "хеш ознака",
+  "search_popout.tips.status": "објава",
+  "search_popout.tips.text": "Једноставан текст враћа подударање имена за приказ, корисничка имена и хеш ознаке",
   "search_popout.tips.user": "корисник",
   "search_results.accounts": "Људи",
-  "search_results.hashtags": "Тарабе",
-  "search_results.statuses": "Трубе",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.all": "Све",
+  "search_results.hashtags": "Хеш ознаке",
+  "search_results.nothing_found": "Није могуће пронаћи ништа за ове термине за претрагу",
+  "search_results.statuses": "Објаве",
+  "search_results.statuses_fts_disabled": "Претрага објава по садржају није омогућена на овом Mastodon серверу.",
+  "search_results.title": "Претражи {q}",
   "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
-  "status.admin_account": "Отвори модераторски интерфејс за @{name}",
-  "status.admin_status": "Отвори овај статус у модераторском интерфејсу",
+  "server_banner.about_active_users": "Људи који су користили овај сервер у претходних 30 дана (месечно активних корисника)",
+  "server_banner.active_users": "активних корисника",
+  "server_banner.administered_by": "Администрирано од стране:",
+  "server_banner.introduction": "{domain} је део децентрализоване друштвене мреже коју покреће {mastodon}.",
+  "server_banner.learn_more": "Сазнајте више",
+  "server_banner.server_stats": "Статистике сервера:",
+  "sign_in_banner.create_account": "Направи налог",
+  "sign_in_banner.sign_in": "Пријави се",
+  "sign_in_banner.text": "Пријавите се да пратите профиле или хештегове, ставите објаве као омиљене, делите и одговарате на њих или комуницирате са свог налога са другог сервера.",
+  "status.admin_account": "Отвори модераторско окружење за @{name}",
+  "status.admin_status": "Отвори ову објаву у модераторском окружењу",
   "status.block": "Блокирај @{name}",
-  "status.bookmark": "Обележи",
+  "status.bookmark": "Додај у обележиваче",
   "status.cancel_reblog_private": "Уклони подршку",
-  "status.cannot_reblog": "Овај статус не може да се подржи",
-  "status.copy": "Копирај везу на статус",
-  "status.delete": "Обриши",
-  "status.detailed_status": "Детаљни преглед разговора",
+  "status.cannot_reblog": "Ова објава се не може подржати",
+  "status.copy": "Копирај везу у објаву",
+  "status.delete": "Избриши",
+  "status.detailed_status": "Детаљан приказ разговора",
   "status.direct": "Директна порука @{name}",
-  "status.embed": "Угради на сајт",
+  "status.edit": "Уреди",
+  "status.edited": "Уређено {date}",
+  "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
+  "status.embed": "Угради",
   "status.favourite": "Омиљено",
+  "status.filter": "Филтрирај ову објаву",
   "status.filtered": "Филтрирано",
+  "status.hide": "Сакриј објаву",
+  "status.history.created": "{name} написао/ла {date}",
+  "status.history.edited": "{name} уредио/ла {date}",
   "status.load_more": "Учитај још",
   "status.media_hidden": "Мултимедија сакривена",
-  "status.mention": "Помени корисника @{name}",
+  "status.mention": "Помени @{name}",
   "status.more": "Још",
-  "status.mute": "Ућуткај @{name}",
-  "status.mute_conversation": "Ућуткај преписку",
-  "status.open": "Прошири овај статус",
-  "status.pin": "Закачи на налог",
-  "status.pinned": "Закачена труба",
+  "status.mute": "Игнориши @{name}",
+  "status.mute_conversation": "Игнориши разговор",
+  "status.open": "Прошири ову објаву",
+  "status.pin": "Закачи на профил",
+  "status.pinned": "Закачене објаве",
   "status.read_more": "Прочитајте више",
   "status.reblog": "Подржи",
-  "status.reblog_private": "Подржи да види првобитна публика",
-  "status.reblogged_by": "{name} подржао/ла",
-  "status.reblogs.empty": "Још увек нико није подржао ову трубу. Када буде подржана, појавиће се овде.",
-  "status.redraft": "Избриши и преправи",
+  "status.reblog_private": "Подржи са оригиналном видљивошћу",
+  "status.reblogged_by": "{name} је подржао/ла",
+  "status.reblogs.empty": "Још увек нико није подржао ову објаву. Када буде подржана, појавиће се овде.",
+  "status.redraft": "Избриши и преобликуј",
   "status.remove_bookmark": "Уклони обележивач",
+  "status.replied_to": "Одговор за {name}",
   "status.reply": "Одговори",
   "status.replyAll": "Одговори на дискусију",
-  "status.report": "Пријави корисника @{name}",
+  "status.report": "Пријави @{name}",
   "status.sensitive_warning": "Осетљив садржај",
   "status.share": "Подели",
+  "status.show_filter_reason": "Ипак прикажи",
   "status.show_less": "Прикажи мање",
   "status.show_less_all": "Прикажи мање за све",
   "status.show_more": "Прикажи више",
   "status.show_more_all": "Прикажи више за све",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Прикажи оргинал",
+  "status.translate": "Преведи",
+  "status.translated_from_with": "Преведено са {lang} користећи {provider}",
   "status.uncached_media_warning": "Није доступно",
-  "status.unmute_conversation": "Укључи преписку",
-  "status.unpin": "Откачи са налога",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
-  "tabs_bar.federated_timeline": "Федерисано",
+  "status.unmute_conversation": "Не игнориши разговор",
+  "status.unpin": "Откачи са профила",
+  "subscribed_languages.lead": "Само објаве на означеним језицима ће се појављивати на почетној линији и на листама после ове измене. Одаберите ништа да примате објаве на свим језицима.",
+  "subscribed_languages.save": "Сачувај измене",
+  "subscribed_languages.target": "Промени језике на које је {target} пријављен",
+  "suggestions.dismiss": "Одбаци предлог",
+  "suggestions.header": "Можда ће вас занимати…",
+  "tabs_bar.federated_timeline": "Здружено",
   "tabs_bar.home": "Почетна",
   "tabs_bar.local_timeline": "Локално",
   "tabs_bar.notifications": "Обавештења",
-  "tabs_bar.search": "Претрага",
   "time_remaining.days": "Остало {number, plural, one {# дан} few {# дана} other {# дана}}",
   "time_remaining.hours": "Остало {number, plural, one {# сат} few {# сата} other {# сати}}",
   "time_remaining.minutes": "Остало {number, plural, one {# минут} few {# минута} other {# минута}}",
-  "time_remaining.moments": "Moments remaining",
+  "time_remaining.moments": "Још неколико тренутака",
   "time_remaining.seconds": "Остало {number, plural, one {# секунд} few {# секунде} other {# секунди}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} са других сервера се не приказују.",
   "timeline_hint.resources.followers": "Пратиоци",
   "timeline_hint.resources.follows": "Праћени",
-  "timeline_hint.resources.statuses": "Старији тут",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
-  "ui.beforeunload": "Ако напустите Мастодонт, изгубићете написани нацрт.",
-  "units.short.billion": "{count}Б",
-  "units.short.million": "{count}М",
-  "units.short.thousand": "{count}К",
-  "upload_area.title": "Превуците овде да отпремите",
-  "upload_button.label": "Додај мултимедију (JPEG, PNG, GIF, WebM, MP4, MOV)",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "timeline_hint.resources.statuses": "Старије објаве",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особе} other {{counter} особа}} у протеклих {days, plural, one {дан} few {{days} дана} other {{days} дана}}",
+  "trends.trending_now": "У тренду сада",
+  "ui.beforeunload": "Ваш нацрт ће бити изгубљен ако напустите Mastodon.",
+  "units.short.billion": "{count} млрд.",
+  "units.short.million": "{count} мил.",
+  "units.short.thousand": "{count} хиљ.",
+  "upload_area.title": "Превуците и отпустите за отпремање",
+  "upload_button.label": "Додај слике, видео или аудио датотеку",
+  "upload_error.limit": "Достигнуто је ограничење за отпремање датотека.",
+  "upload_error.poll": "Отпремање датотека није дозвољено са анкетама.",
+  "upload_form.audio_description": "Опишите за особе са оштећеним слухом",
   "upload_form.description": "Опишите за особе са оштећеним видом",
+  "upload_form.description_missing": "Нема додатог описа",
   "upload_form.edit": "Уреди",
-  "upload_form.thumbnail": "Промени приказ слика",
-  "upload_form.undo": "Обриши",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Анализа слике…",
+  "upload_form.thumbnail": "Промени сличицу",
+  "upload_form.undo": "Избриши",
+  "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
+  "upload_modal.analyzing_picture": "Анализирање слике…",
   "upload_modal.apply": "Примени",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Изабери слику",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Уреди милтимедијум",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.applying": "Примена…",
+  "upload_modal.choose_image": "Одаберите слику",
+  "upload_modal.description_placeholder": "Љубазни фењерџија чађавог лица хоће да ми покаже штос",
+  "upload_modal.detect_text": "Откриј текст са слике",
+  "upload_modal.edit_media": "Уреди милтимедију",
+  "upload_modal.hint": "Кликните или превуците кружић на прегледу за избор тачке фокуса која ће увек бити видљива на свим сличицама.",
+  "upload_modal.preparing_ocr": "Припрема OCR-а…",
   "upload_modal.preview_label": "Преглед ({ratio})",
-  "upload_progress.label": "Отпремам...",
+  "upload_progress.label": "Отпремање...",
+  "upload_progress.processing": "Обрада…",
   "video.close": "Затвори видео",
   "video.download": "Преузимање датотеке",
-  "video.exit_fullscreen": "Напусти цео екран",
+  "video.exit_fullscreen": "Изађи из режима целог екрана",
   "video.expand": "Прошири видео",
   "video.fullscreen": "Цео екран",
   "video.hide": "Сакриј видео",
-  "video.mute": "Угаси звук",
+  "video.mute": "Искључи звук",
   "video.pause": "Паузирај",
-  "video.play": "Пусти",
-  "video.unmute": "Врати звук"
+  "video.play": "Репродукуј",
+  "video.unmute": "Укључи звук"
 }
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index efcdd187c..6adec8c77 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -1,84 +1,118 @@
 {
+  "about.blocks": "Modererade servrar",
+  "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon är fri programvara med öppen källkod och ett varumärke tillhörande Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Okänd orsak",
+  "about.domain_blocks.preamble": "Som regel låter Mastodon dig interagera med användare från andra servrar i fediversumet och se deras innehåll. Detta är de undantag som gjorts på just denna servern.",
+  "about.domain_blocks.silenced.explanation": "Såvida du inte uttryckligen söker upp dem eller samtycker till att se dem genom att följa dem kommer du i allmänhet inte se profiler från den här servern, eller deras innehåll.",
+  "about.domain_blocks.silenced.title": "Begränsat",
+  "about.domain_blocks.suspended.explanation": "Inga data från denna server kommer behandlas, lagras eller bytas ut, vilket omöjliggör kommunikation med användare på denna server.",
+  "about.domain_blocks.suspended.title": "Avstängd",
+  "about.not_available": "Denna information har inte gjorts tillgänglig på denna server.",
+  "about.powered_by": "En decentraliserad plattform for sociala medier, drivet av {mastodon}",
+  "about.rules": "Serverregler",
   "account.account_note_header": "Anteckning",
   "account.add_or_remove_from_list": "Lägg till i eller ta bort från listor",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Grupp",
   "account.block": "Blockera @{name}",
-  "account.block_domain": "Dölj allt från {domain}",
+  "account.block_domain": "Blockera domänen {domain}",
   "account.blocked": "Blockerad",
-  "account.browse_more_on_origin_server": "Läs mer på original profilen",
-  "account.cancel_follow_request": "Avbryt följarförfrågan",
-  "account.direct": "Skicka ett direktmeddelande till @{name}",
-  "account.disable_notifications": "Sluta meddela mig när @{name} tutar",
-  "account.domain_blocked": "Domän dold",
+  "account.browse_more_on_origin_server": "Läs mer på den ursprungliga profilen",
+  "account.cancel_follow_request": "Återkalla din begäran om att få följa",
+  "account.direct": "Skicka direktmeddelande till @{name}",
+  "account.disable_notifications": "Sluta notifiera mig när @{name} gör inlägg",
+  "account.domain_blocked": "Domän blockerad",
   "account.edit_profile": "Redigera profil",
-  "account.enable_notifications": "Meddela mig när @{name} tutar",
+  "account.enable_notifications": "Notifiera mig när @{name} gör inlägg",
   "account.endorse": "Visa på profil",
+  "account.featured_tags.last_status_at": "Senaste inlägg den {date}",
+  "account.featured_tags.last_status_never": "Inga inlägg",
+  "account.featured_tags.title": "{name}s utvalda hashtaggar",
   "account.follow": "Följ",
   "account.followers": "Följare",
   "account.followers.empty": "Ingen följer denna användare än.",
   "account.followers_counter": "{count, plural, one {{counter} Följare} other {{counter} Följare}}",
+  "account.following": "Följer",
   "account.following_counter": "{count, plural, one {{counter} Följer} other {{counter} Följer}}",
   "account.follows.empty": "Denna användare följer inte någon än.",
   "account.follows_you": "Följer dig",
-  "account.hide_reblogs": "Dölj knuffar från @{name}",
-  "account.joined": "Gick med {date}",
-  "account.last_status": "Senast aktiv",
-  "account.link_verified_on": "Ägarskap för detta konto kontrollerades den {date}",
-  "account.locked_info": "Detta konto har låst integritetsstatus. Ägaren väljer manuellt vem som kan följa.",
+  "account.go_to_profile": "Gå till profilen",
+  "account.hide_reblogs": "Dölj boostar från @{name}",
+  "account.joined_short": "Gick med",
+  "account.languages": "Ändra vilka språk du helst vill se i ditt flöde",
+  "account.link_verified_on": "Ägarskap för denna länk kontrollerades den {date}",
+  "account.locked_info": "För detta konto har ägaren valt att manuellt godkänna vem som kan följa dem.",
   "account.media": "Media",
   "account.mention": "Nämn @{name}",
-  "account.moved_to": "{name} har flyttat till:",
+  "account.moved_to": "{name} har indikerat att hen har ett nytt konto:",
   "account.mute": "Tysta @{name}",
-  "account.mute_notifications": "Stäng av notifieringar från @{name}",
+  "account.mute_notifications": "Stäng av notifikationer från @{name}",
   "account.muted": "Tystad",
-  "account.never_active": "Aldrig",
-  "account.posts": "Tutningar",
-  "account.posts_with_replies": "Tutningar och svar",
+  "account.open_original_page": "Öppna den ursprungliga sidan",
+  "account.posts": "Inlägg",
+  "account.posts_with_replies": "Inlägg och svar",
   "account.report": "Rapportera @{name}",
-  "account.requested": "Inväntar godkännande. Klicka för att avbryta följarförfrågan",
+  "account.requested": "Inväntar godkännande. Klicka för att ta tillbaka din begäran om att få följa",
+  "account.requested_follow": "{name} har begärt att följa dig",
   "account.share": "Dela @{name}s profil",
-  "account.show_reblogs": "Visa knuffar från @{name}",
-  "account.statuses_counter": "{count, plural,one {{counter} Tuta} other {{counter} Tutor}}",
+  "account.show_reblogs": "Visa boostar från @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Inlägg} other {{counter} Inlägg}}",
   "account.unblock": "Avblockera @{name}",
-  "account.unblock_domain": "Sluta dölja {domain}",
+  "account.unblock_domain": "Avblockera {domain}",
+  "account.unblock_short": "Avblockera",
   "account.unendorse": "Visa inte på profil",
   "account.unfollow": "Sluta följ",
   "account.unmute": "Sluta tysta @{name}",
   "account.unmute_notifications": "Återaktivera aviseringar från @{name}",
+  "account.unmute_short": "Avtysta",
   "account_note.placeholder": "Klicka för att lägga till anteckning",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Användarlojalitet per dag efter registrering",
+  "admin.dashboard.monthly_retention": "Användarlojalitet per månad efter registrering",
+  "admin.dashboard.retention.average": "Genomsnittlig",
+  "admin.dashboard.retention.cohort": "Registreringsmånad",
+  "admin.dashboard.retention.cohort_size": "Nya användare",
   "alert.rate_limited.message": "Vänligen försök igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mängd begränsad",
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
   "alert.unexpected.title": "Hoppsan!",
   "announcement.announcement": "Meddelande",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(obehandlad)",
+  "audio.hide": "Dölj audio",
   "autosuggest_hashtag.per_week": "{count} per vecka",
-  "boost_modal.combo": "Du kan trycka {combo} för att slippa detta nästa gång",
-  "bundle_column_error.body": "Något gick fel medan denna komponent laddades.",
+  "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
+  "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
+  "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
+  "bundle_column_error.error.title": "Åh nej!",
+  "bundle_column_error.network.body": "Det uppstod ett fel när denna sida skulle visas. Detta kan bero på ett tillfälligt problem med din internetanslutning eller med servern.",
+  "bundle_column_error.network.title": "Nätverksfel",
   "bundle_column_error.retry": "Försök igen",
-  "bundle_column_error.title": "Nätverksfel",
+  "bundle_column_error.return": "Tillbaka till startsidan",
+  "bundle_column_error.routing.body": "Den begärda sidan kunde inte hittas. Är du säker på att adressen angivits korrekt?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Stäng",
-  "bundle_modal_error.message": "Något gick fel när denna komponent laddades.",
+  "bundle_modal_error.message": "Något gick fel när komponenten skulle läsas in.",
   "bundle_modal_error.retry": "Försök igen",
+  "closed_registrations.other_server_instructions": "Eftersom Mastodon är decentraliserat kan du skapa ett konto på en annan server och fortfarande interagera med denna.",
+  "closed_registrations_modal.description": "Det är för närvarande inte möjligt att skapa ett konto på {domain} men kom ihåg att du inte behöver ett konto specifikt på {domain} för att använda Mastodon.",
+  "closed_registrations_modal.find_another_server": "Hitta en annan server",
+  "closed_registrations_modal.preamble": "Mastodon är decentraliserat så oavsett var du skapar ditt konto kommer du att kunna följa och interagera med någon på denna server. Du kan också köra din egen server!",
+  "closed_registrations_modal.title": "Registrera sig på Mastodon",
+  "column.about": "Om",
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bokmärken",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direktmeddelanden",
   "column.directory": "Bläddra bland profiler",
-  "column.domain_blocks": "Dolda domäner",
+  "column.domain_blocks": "Blockerade domäner",
   "column.favourites": "Favoriter",
   "column.follow_requests": "Följarförfrågningar",
   "column.home": "Hem",
   "column.lists": "Listor",
   "column.mutes": "Tystade användare",
-  "column.notifications": "Aviseringar",
-  "column.pins": "Nålade toots",
-  "column.public": "Förenad tidslinje",
+  "column.notifications": "Notifikationer",
+  "column.pins": "Fästa inlägg",
+  "column.public": "Global tidslinje",
   "column_back_button.label": "Tillbaka",
   "column_header.hide_settings": "Dölj inställningar",
   "column_header.moveLeft_settings": "Flytta kolumnen åt vänster",
@@ -90,9 +124,11 @@
   "community.column_settings.local_only": "Endast lokalt",
   "community.column_settings.media_only": "Endast media",
   "community.column_settings.remote_only": "Endast fjärr",
-  "compose_form.direct_message_warning": "Denna tutning kommer endast skickas till de nämnda användarna.",
-  "compose_form.direct_message_warning_learn_more": "Lär dig mer",
-  "compose_form.hashtag_warning": "Denna toot kommer inte att visas under någon hashtag eftersom den är onoterad. Endast offentliga toots kan sökas med hashtag.",
+  "compose.language.change": "Ändra språk",
+  "compose.language.search": "Sök språk...",
+  "compose_form.direct_message_warning_learn_more": "Läs mer",
+  "compose_form.encryption_warning": "Inlägg på Mastodon är inte obrutet krypterade. Dela inte känslig information på Mastodon.",
+  "compose_form.hashtag_warning": "Detta inlägg kommer inte listas under någon hashtagg eftersom det är olistat. Endast offentliga inlägg kan eftersökas med hashtagg.",
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Ta bort detta val",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
-  "compose_form.publish": "Tut",
+  "compose_form.publish": "Publicera",
+  "compose_form.publish_form": "Publicera",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Spara ändringar",
   "compose_form.sensitive.hide": "Markera media som känsligt",
   "compose_form.sensitive.marked": "Media har markerats som känsligt",
   "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
@@ -114,21 +152,23 @@
   "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
   "confirmations.block.message": "Är du säker på att du vill blockera {name}?",
+  "confirmations.cancel_follow_request.confirm": "Återkalla förfrågan",
+  "confirmations.cancel_follow_request.message": "Är du säker på att du vill återkalla din begäran om att följa {name}?",
   "confirmations.delete.confirm": "Radera",
-  "confirmations.delete.message": "Är du säker på att du vill radera denna status?",
+  "confirmations.delete.message": "Är du säker på att du vill radera detta inlägg?",
   "confirmations.delete_list.confirm": "Radera",
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Kasta",
+  "confirmations.discard_edit_media.message": "Du har o-sparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
   "confirmations.domain_block.confirm": "Dölj hela domänen",
   "confirmations.domain_block.message": "Är du verkligen, verkligen säker på att du vill blockera hela {domain}? I de flesta fall är några riktade blockeringar eller nedtystade konton tillräckligt och att föredra. Du kommer inte se innehåll från den domänen i den allmänna tidslinjen eller i dina aviseringar. Dina följare från den domänen komer att tas bort.",
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
   "confirmations.mute.confirm": "Tysta",
-  "confirmations.mute.explanation": "Detta kommer att dölja poster från dem och poster som nämner dem, men fortfarande tillåta dem att se dina poster och följa dig.",
+  "confirmations.mute.explanation": "Detta kommer dölja inlägg från dem och inlägg som nämner dem, men de tillåts fortfarande se dina inlägg och följa dig.",
   "confirmations.mute.message": "Är du säker på att du vill tysta {name}?",
   "confirmations.redraft.confirm": "Radera & gör om",
-  "confirmations.redraft.message": "Är du säker på att du vill radera detta meddelande och göra om det? Du kommer förlora alla favoriter, knuffar och svar till det ursprungliga meddelandet.",
+  "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
   "confirmations.reply.confirm": "Svara",
   "confirmations.reply.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
   "confirmations.unfollow.confirm": "Avfölj",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Markera som läst",
   "conversation.open": "Visa konversation",
   "conversation.with": "Med {names}",
-  "directory.federated": "Från känt servernätverk",
+  "copypaste.copied": "Kopierad",
+  "copypaste.copy": "Kopiera",
+  "directory.federated": "Från känt fediversum",
   "directory.local": "Endast från {domain}",
   "directory.new_arrivals": "Nyanlända",
   "directory.recently_active": "Nyligen aktiva",
-  "embed.instructions": "Lägg in denna status på din webbplats genom att kopiera koden nedan.",
+  "disabled_account_banner.account_settings": "Kontoinställningar",
+  "disabled_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat.",
+  "dismissable_banner.community_timeline": "Dessa är de senaste offentliga inläggen från personer vars konton tillhandahålls av {domain}.",
+  "dismissable_banner.dismiss": "Avfärda",
+  "dismissable_banner.explore_links": "Dessa nyheter pratas det om just nu, på denna och på andra servrar i det decentraliserade nätverket.",
+  "dismissable_banner.explore_statuses": "Dessa inlägg, från denna och andra servrar i det decentraliserade nätverket, pratas det om just nu på denna server.",
+  "dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.",
+  "dismissable_banner.public_timeline": "Dessa är de senaste offentliga inläggen från personer på denna och andra servrar på det decentraliserade nätverket som denna server känner till.",
+  "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
   "embed.preview": "Så här kommer det att se ut:",
   "emoji_button.activity": "Aktivitet",
+  "emoji_button.clear": "Rensa",
   "emoji_button.custom": "Anpassad",
   "emoji_button.flags": "Flaggor",
   "emoji_button.food": "Mat & dryck",
@@ -161,18 +212,19 @@
   "empty_column.account_timeline": "Inga inlägg här!",
   "empty_column.account_unavailable": "Profilen ej tillgänglig",
   "empty_column.blocks": "Du har ännu ej blockerat några användare.",
-  "empty_column.bookmarked_statuses": "Du har inte bokmärkt några tutar än. När du gör ett bokmärke kommer det synas här.",
+  "empty_column.bookmarked_statuses": "Du har inte bokmärkt några inlägg än. När du bokmärker ett inlägg kommer det synas här.",
   "empty_column.community": "Den lokala tidslinjen är tom. Skriv något offentligt för att sätta bollen i rullning!",
-  "empty_column.direct": "Du har inga direktmeddelanden än. När du skickar eller tar emot ett kommer det att visas här.",
+  "empty_column.direct": "Du har inga direktmeddelanden. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
-  "empty_column.favourited_statuses": "Du har inga favoritmarkerade toots än. När du favoritmarkerar en kommer den visas här.",
-  "empty_column.favourites": "Ingen har favoritmarkerat den här tooten än. När någon gör det kommer den visas här.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!",
+  "empty_column.favourited_statuses": "Du har inga favoritmarkerade inlägg än. När du favoritmarkerar ett inlägg kommer det visas här.",
+  "empty_column.favourites": "Ingen har favoritmarkerat detta inlägg än. När någon gör det kommer de synas här.",
+  "empty_column.follow_recommendations": "Det ser ut som om inga förslag kan genereras till dig. Du kan prova att använda sök för att leta efter personer som du kanske känner eller utforska trendande hash-taggar.",
   "empty_column.follow_requests": "Du har inga följarförfrågningar än. När du får en kommer den visas här.",
   "empty_column.hashtag": "Det finns inget i denna hashtag ännu.",
-  "empty_column.home": "Din hemma-tidslinje är tom! Besök {public} eller använd sökning för att komma igång och träffa andra användare.",
+  "empty_column.home": "Din hemma-tidslinje är tom! Följ fler användare för att fylla den. {suggestions}",
   "empty_column.home.suggestions": "Se några förslag",
-  "empty_column.list": "Det finns inget i denna lista än. När medlemmar i denna lista lägger till nya statusar kommer de att visas här.",
+  "empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
   "empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
   "empty_column.mutes": "Du har ännu inte tystat några användare.",
   "empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
@@ -183,77 +235,115 @@
   "error.unexpected_crash.next_steps_addons": "Prova att avaktivera dem och uppdatera sidan. Om detta inte hjälper kan du försöka använda Mastodon med en annan webbläsare eller en app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiera stacktrace till urklipp",
   "errors.unexpected_crash.report_issue": "Rapportera problem",
+  "explore.search_results": "Sökresultat",
+  "explore.suggested_follows": "För dig",
+  "explore.title": "Utforska",
+  "explore.trending_links": "Nyheter",
+  "explore.trending_statuses": "Inlägg",
+  "explore.trending_tags": "Hashtaggar",
+  "filter_modal.added.context_mismatch_explanation": "Denna filterkategori gäller inte för det sammanhang där du har tillgång till det här inlägget. Om du vill att inlägget ska filtreras även i detta sammanhang måste du redigera filtret.",
+  "filter_modal.added.context_mismatch_title": "Misspassning av sammanhang!",
+  "filter_modal.added.expired_explanation": "Denna filterkategori har utgått, du måste ändra utgångsdatum för att den ska kunna tillämpas.",
+  "filter_modal.added.expired_title": "Utgånget filter!",
+  "filter_modal.added.review_and_configure": "För att granska och vidare konfigurera denna filterkategorin, gå till {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filterinställningar",
+  "filter_modal.added.settings_link": "inställningar",
+  "filter_modal.added.short_explanation": "Inlägget har lagts till i följande filterkategori: {title}.",
+  "filter_modal.added.title": "Filter tillagt!",
+  "filter_modal.select_filter.context_mismatch": "gäller inte för detta sammanhang",
+  "filter_modal.select_filter.expired": "utgånget",
+  "filter_modal.select_filter.prompt_new": "Ny kategori: {name}",
+  "filter_modal.select_filter.search": "Sök eller skapa",
+  "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
+  "filter_modal.select_filter.title": "Filtrera detta inlägg",
+  "filter_modal.title.status": "Filtrera ett inlägg",
   "follow_recommendations.done": "Klar",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.heading": "Följ personer du skulle vilja se inlägg från! Här kommer några förslag.",
+  "follow_recommendations.lead": "Inlägg från personer du följer kommer att dyka upp i kronologisk ordning i ditt hemflöde. Var inte rädd för att göra misstag, du kan sluta följa folk när som helst!",
   "follow_request.authorize": "Godkänn",
   "follow_request.reject": "Avvisa",
   "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain} personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "footer.about": "Om",
+  "footer.directory": "Profilkatalog",
+  "footer.get_app": "Skaffa appen",
+  "footer.invite": "Bjud in personer",
+  "footer.keyboard_shortcuts": "Tangentbordsgenvägar",
+  "footer.privacy_policy": "Integritetspolicy",
+  "footer.source_code": "Visa källkod",
   "generic.saved": "Sparad",
-  "getting_started.developers": "Utvecklare",
-  "getting_started.directory": "Profilkatalog",
-  "getting_started.documentation": "Dokumentation",
   "getting_started.heading": "Kom igång",
-  "getting_started.invite": "Skicka inbjudningar",
-  "getting_started.open_source_notice": "Mastodon är programvara med öppen källkod. Du kan bidra eller rapportera problem via GitHub på {github}.",
-  "getting_started.security": "Kontoinställningar",
-  "getting_started.terms": "Användarvillkor",
   "hashtag.column_header.tag_mode.all": "och {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
   "hashtag.column_settings.select.no_options_message": "Inga förslag hittades",
-  "hashtag.column_settings.select.placeholder": "Ange hashtags …",
+  "hashtag.column_settings.select.placeholder": "Ange hashtaggar…",
   "hashtag.column_settings.tag_mode.all": "Alla dessa",
   "hashtag.column_settings.tag_mode.any": "Någon av dessa",
   "hashtag.column_settings.tag_mode.none": "Ingen av dessa",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Följ hashtagg",
+  "hashtag.unfollow": "Avfölj hashtagg",
   "home.column_settings.basic": "Grundläggande",
-  "home.column_settings.show_reblogs": "Visa knuffar",
+  "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
   "home.hide_announcements": "Dölj notiser",
   "home.show_announcements": "Visa notiser",
+  "interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.",
+  "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se deras inlägg i ditt hemflöde.",
+  "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
+  "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.",
+  "interaction_modal.on_another_server": "På en annan server",
+  "interaction_modal.on_this_server": "På denna server",
+  "interaction_modal.other_server_instructions": "Kopiera och klistra in denna URL i sökfältet i din favorit-Mastodon-app eller webbgränssnittet på din Mastodon-server.",
+  "interaction_modal.preamble": "Eftersom Mastodon är decentraliserat kan du använda ditt befintliga konto från en annan Mastodonserver, eller annan kompatibel plattform, om du inte har ett konto på denna.",
+  "interaction_modal.title.favourite": "Favoritmarkera {name}s inlägg",
+  "interaction_modal.title.follow": "Följ {name}",
+  "interaction_modal.title.reblog": "Boosta {name}s inlägg",
+  "interaction_modal.title.reply": "Svara på {name}s inlägg",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# timme} other {# timmar}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuter}}",
-  "keyboard_shortcuts.back": "för att gå bakåt",
-  "keyboard_shortcuts.blocked": "för att öppna listan över blockerade användare",
-  "keyboard_shortcuts.boost": "för att knuffa",
+  "keyboard_shortcuts.back": "Gå bakåt",
+  "keyboard_shortcuts.blocked": "Öppna listan över blockerade användare",
+  "keyboard_shortcuts.boost": "Boosta inlägg",
   "keyboard_shortcuts.column": "för att fokusera en status i en av kolumnerna",
   "keyboard_shortcuts.compose": "för att fokusera skrivfältet",
   "keyboard_shortcuts.description": "Beskrivning",
   "keyboard_shortcuts.direct": "för att öppna Direktmeddelanden",
   "keyboard_shortcuts.down": "för att flytta nedåt i listan",
-  "keyboard_shortcuts.enter": "för att öppna en status",
-  "keyboard_shortcuts.favourite": "för att sätta som favorit",
+  "keyboard_shortcuts.enter": "Öppna inlägg",
+  "keyboard_shortcuts.favourite": "Favoritmarkera inlägg",
   "keyboard_shortcuts.favourites": "för att öppna Favoriter",
-  "keyboard_shortcuts.federated": "för att öppna Förenad tidslinje",
+  "keyboard_shortcuts.federated": "Öppna federerad tidslinje",
   "keyboard_shortcuts.heading": "Tangentbordsgenvägar",
   "keyboard_shortcuts.home": "för att öppna Hem-tidslinjen",
   "keyboard_shortcuts.hotkey": "Kommando",
   "keyboard_shortcuts.legend": "för att visa denna översikt",
   "keyboard_shortcuts.local": "för att öppna Lokal tidslinje",
   "keyboard_shortcuts.mention": "för att nämna skaparen",
-  "keyboard_shortcuts.muted": "för att öppna listan över tystade användare",
+  "keyboard_shortcuts.muted": "Öppna listan över tystade användare",
   "keyboard_shortcuts.my_profile": "för att öppna din profil",
   "keyboard_shortcuts.notifications": "för att öppna Meddelanden",
   "keyboard_shortcuts.open_media": "öppna media",
-  "keyboard_shortcuts.pinned": "för att öppna Nålade toots",
+  "keyboard_shortcuts.pinned": "Öppna listan över fästa inlägg",
   "keyboard_shortcuts.profile": "för att öppna skaparens profil",
-  "keyboard_shortcuts.reply": "för att svara",
+  "keyboard_shortcuts.reply": "Svara på inlägg",
   "keyboard_shortcuts.requests": "för att öppna Följförfrågningar",
   "keyboard_shortcuts.search": "för att fokusera sökfältet",
   "keyboard_shortcuts.spoilers": "visa/dölja CW-fält",
   "keyboard_shortcuts.start": "för att öppna \"Kom igång\"-kolumnen",
   "keyboard_shortcuts.toggle_hidden": "för att visa/gömma text bakom CW",
   "keyboard_shortcuts.toggle_sensitivity": "för att visa/gömma media",
-  "keyboard_shortcuts.toot": "för att påbörja en helt ny toot",
+  "keyboard_shortcuts.toot": "Starta nytt inlägg",
   "keyboard_shortcuts.unfocus": "för att avfokusera skrivfält/sökfält",
   "keyboard_shortcuts.up": "för att flytta uppåt i listan",
   "lightbox.close": "Stäng",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "Komprimera bildvyrutan",
+  "lightbox.expand": "Utöka bildvyrutan",
   "lightbox.next": "Nästa",
   "lightbox.previous": "Tidigare",
+  "limited_account_hint.action": "Visa profil ändå",
+  "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.",
   "lists.account.add": "Lägg till i lista",
   "lists.account.remove": "Ta bort från lista",
   "lists.delete": "Radera lista",
@@ -261,7 +351,7 @@
   "lists.edit.submit": "Ändra titel",
   "lists.new.create": "Lägg till lista",
   "lists.new.title_placeholder": "Ny listrubrik",
-  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.followed": "Alla användare som följs",
   "lists.replies_policy.list": "Medlemmar i listan",
   "lists.replies_policy.none": "Ingen",
   "lists.replies_policy.title": "Visa svar till:",
@@ -272,59 +362,68 @@
   "media_gallery.toggle_visible": "Växla synlighet",
   "missing_indicator.label": "Hittades inte",
   "missing_indicator.sublabel": "Den här resursen kunde inte hittas",
+  "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
   "mute_modal.duration": "Varaktighet",
   "mute_modal.hide_notifications": "Dölj aviseringar från denna användare?",
   "mute_modal.indefinite": "Obestämt",
-  "navigation_bar.apps": "Mobilappar",
+  "navigation_bar.about": "Om",
   "navigation_bar.blocks": "Blockerade användare",
   "navigation_bar.bookmarks": "Bokmärken",
   "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Författa ny toot",
+  "navigation_bar.compose": "Författa nytt inlägg",
   "navigation_bar.direct": "Direktmeddelanden",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
   "navigation_bar.edit_profile": "Redigera profil",
+  "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
   "navigation_bar.follow_requests": "Följförfrågningar",
   "navigation_bar.follows_and_followers": "Följer och följare",
-  "navigation_bar.info": "Om denna instans",
-  "navigation_bar.keyboard_shortcuts": "Kortkommandon",
   "navigation_bar.lists": "Listor",
   "navigation_bar.logout": "Logga ut",
   "navigation_bar.mutes": "Tystade användare",
   "navigation_bar.personal": "Personligt",
-  "navigation_bar.pins": "Nålade inlägg (toots)",
+  "navigation_bar.pins": "Fästa inlägg",
   "navigation_bar.preferences": "Inställningar",
-  "navigation_bar.public_timeline": "Förenad tidslinje",
+  "navigation_bar.public_timeline": "Federerad tidslinje",
+  "navigation_bar.search": "Sök",
   "navigation_bar.security": "Säkerhet",
-  "notification.favourite": "{name} favoriserade din status",
+  "not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.",
+  "notification.admin.report": "{name} rapporterade {target}",
+  "notification.admin.sign_up": "{name} registrerade sig",
+  "notification.favourite": "{name} favoritmarkerade din status",
   "notification.follow": "{name} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.mention": "{name} nämnde dig",
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
-  "notification.reblog": "{name} knuffade din status",
-  "notification.status": "{name} skrev just",
+  "notification.reblog": "{name} boostade ditt inlägg",
+  "notification.status": "{name} publicerade just ett inlägg",
+  "notification.update": "{name} redigerade ett inlägg",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
+  "notifications.column_settings.admin.report": "Nya rapporter:",
+  "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
-  "notifications.column_settings.filter_bar.show": "Visa",
+  "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
   "notifications.column_settings.mention": "Omnämningar:",
   "notifications.column_settings.poll": "Omröstningsresultat:",
   "notifications.column_settings.push": "Push-aviseringar",
-  "notifications.column_settings.reblog": "Knuffar:",
+  "notifications.column_settings.reblog": "Boostar:",
   "notifications.column_settings.show": "Visa i kolumnen",
   "notifications.column_settings.sound": "Spela upp ljud",
-  "notifications.column_settings.status": "Nya tutor:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.status": "Nya inlägg:",
+  "notifications.column_settings.unread_notifications.category": "O-lästa aviseringar",
+  "notifications.column_settings.unread_notifications.highlight": "Markera o-lästa aviseringar",
+  "notifications.column_settings.update": "Redigeringar:",
   "notifications.filter.all": "Alla",
-  "notifications.filter.boosts": "Knuffar",
+  "notifications.filter.boosts": "Boostar",
   "notifications.filter.favourites": "Favoriter",
   "notifications.filter.follows": "Följer",
   "notifications.filter.mentions": "Omnämningar",
@@ -333,9 +432,9 @@
   "notifications.grant_permission": "Godkänn åtkomst.",
   "notifications.group": "{count} aviseringar",
   "notifications.mark_as_read": "Markera varje avisering som läst",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
+  "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
+  "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
@@ -346,95 +445,164 @@
   "poll.total_votes": "{count, plural, one {1 röst} other {# röster}}",
   "poll.vote": "Rösta",
   "poll.voted": "Du röstade för detta svar",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# röst} other {# röster}}",
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
-  "privacy.change": "Justera sekretess",
+  "privacy.change": "Ändra inläggsintegritet",
   "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Direkt",
+  "privacy.direct.short": "Endast omnämnda personer",
   "privacy.private.long": "Endast synligt för följare",
   "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Skicka till publik tidslinje",
+  "privacy.public.long": "Synlig för alla",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Skicka inte till publik tidslinje",
+  "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
   "privacy.unlisted.short": "Olistad",
+  "privacy_policy.last_updated": "Senast uppdaterad {date}",
+  "privacy_policy.title": "Integritetspolicy",
   "refresh": "Läs om",
   "regeneration_indicator.label": "Laddar…",
   "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sedan",
+  "relative_time.full.hours": "{number, plural, one {# timme} other {# timmar}} sedan",
+  "relative_time.full.just_now": "just nu",
+  "relative_time.full.minutes": "{number, plural, one {# minut} other {# minuter}} sedan",
+  "relative_time.full.seconds": "{number, plural, one {# sekund} other {# sekunder}} sedan",
   "relative_time.hours": "{number}tim",
   "relative_time.just_now": "nu",
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
+  "report.block": "Blockera",
+  "report.block_explanation": "Du kommer inte se deras inlägg. De kommer inte kunna se dina inlägg eller följa dig. De kommer kunna se att de är blockerade.",
+  "report.categories.other": "Övrigt",
+  "report.categories.spam": "Skräppost",
+  "report.categories.violation": "Innehåll bryter mot en eller flera serverregler",
+  "report.category.subtitle": "Välj den bästa träffen",
+  "report.category.title": "Berätta för oss vad som händer med den här {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "inlägg",
+  "report.close": "Färdig",
+  "report.comment.title": "Finns det något annat vi borde veta?",
   "report.forward": "Vidarebefordra till {target}",
   "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
-  "report.hint": "Anmälan skickas till din instans moderatorer. Du kan ge en förklaring till varför du har anmält detta konto nedan:",
+  "report.mute": "Tysta",
+  "report.mute_explanation": "Du kommer inte se deras inlägg. De kan fortfarande följa dig och se dina inlägg. De kommer inte veta att de är tystade.",
+  "report.next": "Nästa",
   "report.placeholder": "Ytterligare kommentarer",
+  "report.reasons.dislike": "Jag tycker inte om det",
+  "report.reasons.dislike_description": "Det är inget som du vill se",
+  "report.reasons.other": "Det är något annat",
+  "report.reasons.other_description": "Problemet passar inte in i andra kategorier",
+  "report.reasons.spam": "Det är skräppost",
+  "report.reasons.spam_description": "Skadliga länkar, bedrägligt beteende eller repetitiva svar",
+  "report.reasons.violation": "Det bryter mot serverns regler",
+  "report.reasons.violation_description": "Du är medveten om att det bryter mot specifika regler",
+  "report.rules.subtitle": "Välj alla som stämmer",
+  "report.rules.title": "Vilka regler överträds?",
+  "report.statuses.subtitle": "Välj alla som stämmer",
+  "report.statuses.title": "Finns det några inlägg som stöder denna rapport?",
   "report.submit": "Skicka",
   "report.target": "Rapporterar {target}",
+  "report.thanks.take_action": "Här är dina alternativ för att bestämma vad du ser på Mastodon:",
+  "report.thanks.take_action_actionable": "Medan vi granskar detta kan du vidta åtgärder mot {name}:",
+  "report.thanks.title": "Vill du inte se det här?",
+  "report.thanks.title_actionable": "Tack för att du rapporterar, vi kommer att titta på detta.",
+  "report.unfollow": "Sluta följ @{username}",
+  "report.unfollow_explanation": "Du följer detta konto. Avfölj dem för att inte se deras inlägg i ditt hemflöde.",
+  "report_notification.attached_statuses": "bifogade {count, plural, one {{count} inlägg} other {{count} inlägg}}",
+  "report_notification.categories.other": "Övrigt",
+  "report_notification.categories.spam": "Skräppost",
+  "report_notification.categories.violation": "Regelöverträdelse",
+  "report_notification.open": "Öppna rapport",
   "search.placeholder": "Sök",
+  "search.search_or_paste": "Sök eller klistra in URL",
   "search_popout.search_format": "Avancerat sökformat",
-  "search_popout.tips.full_text": "Enkel text returnerar statusar där du har skrivit, favoriserat, knuffat eller nämnts samt med matchande användarnamn, visningsnamn och hashtags.",
+  "search_popout.tips.full_text": "Enkel text returnerar inlägg du har skrivit, favoritmarkerat, boostat eller blivit nämnd i, samt matchar användarnamn, visningsnamn och hashtaggar.",
   "search_popout.tips.hashtag": "hash-tagg",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "inlägg",
   "search_popout.tips.text": "Enkel text returnerar matchande visningsnamn, användarnamn och hashtags",
   "search_popout.tips.user": "användare",
   "search_results.accounts": "Människor",
+  "search_results.all": "Alla",
   "search_results.hashtags": "Hashtaggar",
-  "search_results.statuses": "Tutor",
-  "search_results.statuses_fts_disabled": "Att söka toots med deras innehåll är inte möjligt på denna Mastodon-server.",
-  "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
+  "search_results.nothing_found": "Kunde inte hitta något för dessa sökord",
+  "search_results.statuses": "Inlägg",
+  "search_results.statuses_fts_disabled": "Att söka efter inlägg baserat på innehåll är inte aktiverat på denna Mastodon-server.",
+  "search_results.title": "Sök efter {q}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "Personer som använt denna server de senaste 30 dagarna (månatligt aktiva användare)",
+  "server_banner.active_users": "aktiva användare",
+  "server_banner.administered_by": "Administrerad av:",
+  "server_banner.introduction": "{domain} är en del av det decentraliserade sociala nätverket som drivs av {mastodon}.",
+  "server_banner.learn_more": "Lär dig mer",
+  "server_banner.server_stats": "Serverstatistik:",
+  "sign_in_banner.create_account": "Skapa konto",
+  "sign_in_banner.sign_in": "Logga in",
+  "sign_in_banner.text": "Logga in för att följa profiler eller hashtaggar, favoritmarkera, dela och svara på inlägg eller interagera från ditt konto på en annan server.",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
-  "status.admin_status": "Öppna denna status i modereringsgränssnittet",
+  "status.admin_status": "Öppna detta inlägg i modereringsgränssnittet",
   "status.block": "Blockera @{name}",
   "status.bookmark": "Bokmärk",
-  "status.cancel_reblog_private": "Ta bort knuff",
-  "status.cannot_reblog": "Detta inlägg kan inte knuffas",
-  "status.copy": "Kopiera länk till status",
+  "status.cancel_reblog_private": "Sluta boosta",
+  "status.cannot_reblog": "Detta inlägg kan inte boostas",
+  "status.copy": "Kopiera inläggslänk",
   "status.delete": "Radera",
   "status.detailed_status": "Detaljerad samtalsvy",
   "status.direct": "Direktmeddela @{name}",
+  "status.edit": "Redigera",
+  "status.edited": "Ändrad {date}",
+  "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
   "status.embed": "Bädda in",
   "status.favourite": "Favorit",
+  "status.filter": "Filtrera detta inlägg",
   "status.filtered": "Filtrerat",
+  "status.hide": "Göm inlägg",
+  "status.history.created": "{name} skapade {date}",
+  "status.history.edited": "{name} redigerade {date}",
   "status.load_more": "Ladda fler",
   "status.media_hidden": "Media dold",
   "status.mention": "Omnämn @{name}",
   "status.more": "Mer",
   "status.mute": "Tysta @{name}",
   "status.mute_conversation": "Tysta konversation",
-  "status.open": "Utvidga denna status",
+  "status.open": "Utvidga detta inlägg",
   "status.pin": "Fäst i profil",
-  "status.pinned": "Fäst toot",
+  "status.pinned": "Fästa inlägg",
   "status.read_more": "Läs mer",
-  "status.reblog": "Knuffa",
-  "status.reblog_private": "Knuffa till de ursprungliga åhörarna",
-  "status.reblogged_by": "{name} knuffade",
-  "status.reblogs.empty": "Ingen har favoriserat den här tutningen än. När någon gör det kommer den att synas här.",
+  "status.reblog": "Boosta",
+  "status.reblog_private": "Boosta med ursprunglig synlighet",
+  "status.reblogged_by": "{name} boostade",
+  "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
   "status.redraft": "Radera & gör om",
   "status.remove_bookmark": "Ta bort bokmärke",
+  "status.replied_to": "Svarade på {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara på tråden",
   "status.report": "Rapportera @{name}",
   "status.sensitive_warning": "Känsligt innehåll",
   "status.share": "Dela",
+  "status.show_filter_reason": "Visa ändå",
   "status.show_less": "Visa mindre",
   "status.show_less_all": "Visa mindre för alla",
   "status.show_more": "Visa mer",
   "status.show_more_all": "Visa mer för alla",
-  "status.show_thread": "Visa tråd",
+  "status.show_original": "Visa original",
+  "status.translate": "Översätt",
+  "status.translated_from_with": "Översatt från {lang} med {provider}",
   "status.uncached_media_warning": "Ej tillgängligt",
   "status.unmute_conversation": "Öppna konversation",
   "status.unpin": "Ångra fäst i profil",
+  "subscribed_languages.lead": "Endast inlägg på valda språk kommer att visas på dina hem- och listflöden efter ändringen. Välj ingenting för att se inlägg på alla språk.",
+  "subscribed_languages.save": "Spara ändringar",
+  "subscribed_languages.target": "Ändra språkprenumerationer för {target}",
   "suggestions.dismiss": "Avfärda förslag",
   "suggestions.header": "Du kanske är intresserad av…",
-  "tabs_bar.federated_timeline": "Förenad",
+  "tabs_bar.federated_timeline": "Federerad",
   "tabs_bar.home": "Hem",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Aviseringar",
-  "tabs_bar.search": "Sök",
   "time_remaining.days": "{number, plural, one {# dag} other {# dagar}} kvar",
   "time_remaining.hours": "{hours, plural, one {# timme} other {# timmar}} kvar",
   "time_remaining.minutes": "{minutes, plural, one {1 minut} other {# minuter}} kvar",
@@ -443,8 +611,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} från andra servrar visas inte.",
   "timeline_hint.resources.followers": "Följare",
   "timeline_hint.resources.follows": "Följer",
-  "timeline_hint.resources.statuses": "Äldre tutningar",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} pratar",
+  "timeline_hint.resources.statuses": "Äldre inlägg",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} senaste {days, plural, one {dygnet} other {{days} dagarna}}",
   "trends.trending_now": "Trendar nu",
   "ui.beforeunload": "Ditt utkast kommer att förloras om du lämnar Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
+  "upload_form.description_missing": "Beskrivning saknas",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
   "upload_form.undo": "Radera",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
   "upload_modal.analyzing_picture": "Analyserar bild…",
   "upload_modal.apply": "Verkställ",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Verkställer…",
   "upload_modal.choose_image": "Välj bild",
   "upload_modal.description_placeholder": "En snabb brun räv hoppar över den lata hunden",
   "upload_modal.detect_text": "Upptäck bildens text",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Förbereder OCR…",
   "upload_modal.preview_label": "Förhandstitt ({ratio})",
   "upload_progress.label": "Laddar upp...",
+  "upload_progress.processing": "Bearbetar…",
   "video.close": "Stäng video",
   "video.download": "Ladda ner fil",
   "video.exit_fullscreen": "Stäng helskärm",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index eca4765c4..f31ea8537 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 1b3e70fb6..8d001d9bb 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "நடுநிலையான சேவையகங்கள்",
+  "about.contact": "தொடர்பு:",
+  "about.disclaimer": "மாஸ்டோடன் இலவச, திறந்த மூல மென்பொருள் மற்றும் மாஸ்டோடன் gGmbH இன் வர்த்தக முத்திரை.",
+  "about.domain_blocks.no_reason_available": "காரணம் கிடைக்கவில்லை",
+  "about.domain_blocks.preamble": "மாஸ்டோடன் பொதுவாக நீங்கள் ஃபெடிவர்ஸில் உள்ள வேறு எந்தச் சர்வரிலிருந்தும் உள்ளடக்கத்தைப் பார்க்கவும், பயனர்களுடன் தொடர்பு கொள்ளவும் அனுமதிக்கிறது. இந்தக் குறிப்பிட்ட சர்வரில் செய்யப்பட்ட விதிவிலக்குகள் இவை.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "குறிப்பு",
   "account.add_or_remove_from_list": "பட்டியல்களில் சேர்/நீக்கு",
   "account.badges.bot": "பாட்",
@@ -7,68 +19,90 @@
   "account.block_domain": "{domain} யில் இருந்து வரும் எல்லாவற்றையும் மறை",
   "account.blocked": "முடக்கப்பட்டது",
   "account.browse_more_on_origin_server": "மேலும் உலாவ சுயவிவரத்திற்குச் செல்க",
-  "account.cancel_follow_request": "பின்தொடரும் கோரிக்கையை நிராகரி",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "நேரடி செய்தி @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.disable_notifications": "@{name} பதிவிட்டல் எனக்கு தெரியபடுத்த வேண்டாம்",
   "account.domain_blocked": "மறைக்கப்பட்டத் தளங்கள்",
   "account.edit_profile": "சுயவிவரத்தை மாற்று",
-  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.enable_notifications": "@{name} பதிவிட்டல் எனக்குத் தெரியப்படுத்தவும்",
   "account.endorse": "சுயவிவரத்தில் வெளிப்படுத்து",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "பின்தொடர்",
   "account.followers": "பின்தொடர்பவர்கள்",
   "account.followers.empty": "இதுவரை யாரும் இந்த பயனரைப் பின்தொடரவில்லை.",
   "account.followers_counter": "{count, plural, one {{counter} வாசகர்} other {{counter} வாசகர்கள்}}",
+  "account.following": "பின்தொடரும்",
   "account.following_counter": "{count, plural,one {{counter} சந்தா} other {{counter} சந்தாக்கள்}}",
   "account.follows.empty": "இந்த பயனர் இதுவரை யாரையும் பின்தொடரவில்லை.",
   "account.follows_you": "உங்களைப் பின்தொடர்கிறார்",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "இருந்து ஊக்கியாக மறை @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "கடைசி செயல்பாடு",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "இந்த இணைப்பை உரிமையாளர் சரிபார்க்கப்பட்டது {date}",
   "account.locked_info": "இந்தக் கணக்கு தனியுரிமை நிலை பூட்டப்பட்டுள்ளது. அவர்களைப் பின்தொடர்பவர் யார் என்பதை உரிமையாளர் கைமுறையாக மதிப்பாய்வு செய்கிறார்.",
   "account.media": "ஊடகங்கள்",
   "account.mention": "குறிப்பிடு @{name}",
-  "account.moved_to": "{name} நகர்த்தப்பட்டது:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "ஊமையான @{name}",
   "account.mute_notifications": "அறிவிப்புகளை முடக்கு @{name}",
   "account.muted": "முடக்கியது",
-  "account.never_active": "எப்போதுமில்லை",
+  "account.open_original_page": "Open original page",
   "account.posts": "டூட்டுகள்",
   "account.posts_with_replies": "Toots மற்றும் பதில்கள்",
   "account.report": "@{name} -ஐப் புகாரளி",
   "account.requested": "ஒப்புதலுக்காகக் காத்திருக்கிறது. பின்தொடரும் கோரிக்கையை நீக்க அழுத்தவும்",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} உடைய விவரத்தை பகிர்",
   "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} டூட்} other {{counter} டூட்டுகள்}}",
   "account.unblock": "@{name} மீது தடை நீக்குக",
   "account.unblock_domain": "{domain} ஐ காண்பி",
+  "account.unblock_short": "தடையை நீக்கு",
   "account.unendorse": "சுயவிவரத்தில் இடம்பெற வேண்டாம்",
   "account.unfollow": "பின்தொடர்வதை நிறுத்துக",
   "account.unmute": "@{name} இன் மீது மௌனத் தடையை நீக்குக",
   "account.unmute_notifications": "@{name} இலிருந்து அறிவிப்புகளின் மீது மௌனத் தடையை நீக்குக",
+  "account.unmute_short": "அமைதியை நீக்கு",
   "account_note.placeholder": "குறிப்பு ஒன்றை சேர்க்க சொடுக்கவும்",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "பதிவுசெய்த பிறகு நாள்தோறும் பயனர் தக்கவைப்பு விகிதம்",
+  "admin.dashboard.monthly_retention": "பதிவுசெய்த பிறகு மாதந்தோறும் பயனர் தக்கவைப்பு விகிதம்",
+  "admin.dashboard.retention.average": "சராசரி",
+  "admin.dashboard.retention.cohort": "பதிவுசெய்த மாதம்",
+  "admin.dashboard.retention.cohort_size": "புதிய பயனர்கள்",
   "alert.rate_limited.message": "{retry_time, time, medium} க்கு பிறகு மீண்டும் முயற்சிக்கவும்.",
   "alert.rate_limited.title": "பயன்பாடு கட்டுப்படுத்தப்பட்டுள்ளது",
   "alert.unexpected.message": "எதிர்பாராத பிழை ஏற்பட்டுவிட்டது.",
   "alert.unexpected.title": "அச்சச்சோ!",
   "announcement.announcement": "அறிவிப்பு",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
+  "audio.hide": "ஆடியோவை மறை",
   "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
-  "bundle_column_error.body": "இக்கூற்றை ஏற்றம் செய்யும்பொழுது ஏதோ தவறு ஏற்பட்டுள்ளது.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "மீண்டும் முயற்சிக்கவும்",
-  "bundle_column_error.title": "பிணையப் பிழை",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "மூடுக",
   "bundle_modal_error.message": "இக்கூற்றை ஏற்றம் செய்யும்பொழுது ஏதோ தவறு ஏற்பட்டுள்ளது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "அடையாளக்குறிகள்",
   "column.community": "சுய நிகழ்வு காலவரிசை",
-  "column.direct": "நேர் சேதிகள்",
+  "column.direct": "நேரடி செய்திகள்",
   "column.directory": "சுயவிவரங்களை உலாவு",
   "column.domain_blocks": "மறைந்திருக்கும் திரளங்கள்",
   "column.favourites": "பிடித்தவைகள்",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "அருகிலிருந்து மட்டுமே",
   "community.column_settings.media_only": "படங்கள் மட்டுமே",
   "community.column_settings.remote_only": "தொலைவிலிருந்து மட்டுமே",
-  "compose_form.direct_message_warning": "இந்த டூட் இதில் குறிப்பிடப்பட்டுள்ள பயனர்களுக்கு மட்டுமே அனுப்பப்படும்.",
+  "compose.language.change": "மொழியை மாற்று",
+  "compose.language.search": "தேடல் மொழிகள்...",
   "compose_form.direct_message_warning_learn_more": "மேலும் அறிய",
+  "compose_form.encryption_warning": "Mastodonல் உள்ள பதிவுகள் முறையாக என்க்ரிப்ட்(encrypt) செய்யபடவில்லை. அதனால் முக்கிய தகவல்களை இங்கே பகிர வேண்டாம்.",
   "compose_form.hashtag_warning": "இது ஒரு பட்டியலிடப்படாத டூட் என்பதால் எந்த ஹேஷ்டேகின் கீழும் வராது. ஹேஷ்டேகின் மூலம் பொதுவில் உள்ள டூட்டுகளை மட்டுமே தேட முடியும்.",
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
   "compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
   "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
   "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
-  "compose_form.publish": "டூட்",
+  "compose_form.publish": "வெளியிடு",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "மாற்றங்களை சேமி",
   "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
   "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
   "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
   "confirmations.block.message": "{name}-ஐ நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "நீக்கு",
   "confirmations.delete.message": "இப்பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
   "confirmations.delete_list.confirm": "நீக்கு",
   "confirmations.delete_list.message": "இப்பட்டியலை நிரந்தரமாக நீக்க நிச்சயம் விரும்புகிறீர்களா?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "நிராகரி",
+  "confirmations.discard_edit_media.message": "சேமிக்கப்படாத மாற்றங்கள் ஊடக விளக்கம் அல்லது முன்னோட்டத்தில் உள்ளது. அவற்றை நிராகரிக்கவா?",
   "confirmations.domain_block.confirm": "முழு களத்தையும் மறை",
   "confirmations.domain_block.message": "நீங்கள் முழு {domain} களத்தையும் நிச்சயமாக, நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா? பெரும்பாலும் சில குறிப்பிட்ட பயனர்களைத் தடுப்பதே போதுமானது. முழு களத்தையும் தடுத்தால், அதிலிருந்து வரும் எந்தப் பதிவையும் உங்களால் காண முடியாது, மேலும் அப்பதிவுகள் குறித்த அறிவிப்புகளும் உங்களுக்கு வராது. அந்தக் களத்தில் இருக்கும் பின்தொடர்பவர்கள் உங்கள் பக்கத்திலிருந்து நீக்கப்படுவார்கள்.",
   "confirmations.logout.confirm": "வெளியேறு",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "படிக்கபட்டதாகக் குறி",
   "conversation.open": "உரையாடலைக் காட்டு",
   "conversation.with": "{names} உடன்",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "அறியப்பட்ட ஃபெடிவெர்சிலிருந்து",
   "directory.local": "{domain} களத்திலிருந்து மட்டும்",
   "directory.new_arrivals": "புதிய வரவு",
   "directory.recently_active": "சற்றுமுன் செயல்பாட்டில் இருந்தவர்கள்",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "இந்தப் பதிவை உங்கள் வலைதளத்தில் பொதிக்கக் கீழே உள்ள வரிகளை காப்பி செய்யவும்.",
   "embed.preview": "பார்க்க இப்படி இருக்கும்:",
   "emoji_button.activity": "செயல்பாடு",
+  "emoji_button.clear": "அழி",
   "emoji_button.custom": "தனிப்பயன்",
   "emoji_button.flags": "கொடிகள்",
   "emoji_button.food": "உணவு மற்றும் பானம்",
@@ -157,14 +208,15 @@
   "emoji_button.search_results": "தேடல் முடிவுகள்",
   "emoji_button.symbols": "குறியீடுகள்",
   "emoji_button.travel": "சுற்றுலா மற்றும் இடங்கள்",
-  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_suspended": "கணக்கு இடைநீக்கப்பட்டது",
   "empty_column.account_timeline": "டூட்டுகள் ஏதும் இல்லை!",
   "empty_column.account_unavailable": "சுயவிவரம் கிடைக்கவில்லை",
   "empty_column.blocks": "நீங்கள் இதுவரை எந்தப் பயனர்களையும் முடக்கியிருக்கவில்லை.",
   "empty_column.bookmarked_statuses": "உங்களிடம் அடையாளக்குறியிட்ட டூட்டுகள் எவையும் இல்லை. அடையாளக்குறியிட்ட பிறகு அவை இங்கே காட்டப்படும்.",
   "empty_column.community": "உங்கள் மாஸ்டடான் முச்சந்தியில் யாரும் இல்லை. எதையேனும் எழுதி ஆட்டத்தைத் துவக்குங்கள்!",
-  "empty_column.direct": "உங்கள் தனிப்பெட்டியில் செய்திகள் ஏதும் இல்லை. செய்தியை நீங்கள் அனுப்பும்போதோ அல்லது பெறும்போதோ, அது இங்கே காண்பிக்கப்படும்.",
+  "empty_column.direct": "உங்களுக்குத் தனிப்பட்ட செய்திகள் ஏதும் இல்லை. செய்தியை நீங்கள் அனுப்பும்போதோ அல்லது பெறும்போதோ, அது இங்கே காண்பிக்கப்படும்.",
   "empty_column.domain_blocks": "தடுக்கப்பட்டக் களங்கள் இதுவரை இல்லை.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "உங்களுக்குப் பிடித்த டூட்டுகள் இதுவரை இல்லை. ஒரு டூட்டில் நீங்கள் விருப்பக்குறி இட்டால், அது இங்கே காண்பிக்கப்படும்.",
   "empty_column.favourites": "இந்த டூட்டில் இதுவரை யாரும் விருப்பக்குறி இடவில்லை. யாரேனும் விரும்பினால், அது இங்கே காண்பிக்கப்படும்.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Stacktrace-ஐ clipboard-ல் நகலெடு",
   "errors.unexpected_crash.report_issue": "புகாரளி",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "அனுமதியளி",
   "follow_request.reject": "நிராகரி",
   "follow_requests.unlocked_explanation": "உங்கள் கணக்கு பூட்டப்படவில்லை என்றாலும், இந்தக் கணக்குகளிலிருந்து உங்களைப் பின்தொடர விரும்பும் கோரிக்கைகளை நீங்கள் பரீசீலிப்பது நலம் என்று {domain} ஊழியர் எண்ணுகிறார்.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "சேமிக்கப்பட்டது",
-  "getting_started.developers": "உருவாக்குநர்கள்",
-  "getting_started.directory": "பயனர்கள்",
-  "getting_started.documentation": "ஆவணங்கள்",
   "getting_started.heading": "முதன்மைப் பக்கம்",
-  "getting_started.invite": "நண்பர்களை அழைக்க",
-  "getting_started.open_source_notice": "மாஸ்டடான் ஒரு open source மென்பொருள் ஆகும். {github} -இன் மூலம் உங்களால் இதில் பங்களிக்கவோ, சிக்கல்களைத் தெரியப்படுத்தவோ முடியும்.",
-  "getting_started.security": "கணக்கு அமைப்புகள்",
-  "getting_started.terms": "சேவை விதிமுறைகள்",
   "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
   "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} தவிர்த்து",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
   "hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
   "hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "அடிப்படையானவை",
   "home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
   "home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
   "home.hide_announcements": "அறிவிப்புகளை மறை",
   "home.show_announcements": "அறிவிப்புகளைக் காட்டு",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# நாள்} other {# நாட்கள்}}",
   "intervals.full.hours": "{number, plural, one {# மணிநேரம்} other {# மணிநேரங்கள்}}",
   "intervals.full.minutes": "{number, plural, one {# நிமிடம்} other {# நிமிடங்கள்}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "ஏதேனும் ஒரு நெடுவரிசையில் உள்ள டூட்டுல் கவனம் செலுத்த",
   "keyboard_shortcuts.compose": "பதிவு எழுதும் பெட்டியில் கவனம் செலுத்த",
   "keyboard_shortcuts.description": "விவரம்",
-  "keyboard_shortcuts.direct": "தனிப்பெட்டியைத் திறக்க",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "பட்டியலின் கீழே செல்ல",
   "keyboard_shortcuts.enter": "டூட்டைத் திறக்க",
   "keyboard_shortcuts.favourite": "விருப்பக்குறி இட",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "அடுத்த",
   "lightbox.previous": "சென்ற",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "பட்டியலில் சேர்",
   "lists.account.remove": "பட்டியலில் இருந்து அகற்று",
   "lists.delete": "பட்டியலை நீக்கு",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
   "missing_indicator.label": "கிடைக்கவில்லை",
   "missing_indicator.sublabel": "இந்த ஆதாரத்தை காண முடியவில்லை",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "மொபைல் பயன்பாடுகள்",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
-  "navigation_bar.direct": "நேரடி செய்திகள்",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
   "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "விருப்பத்துக்குகந்த",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
   "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
-  "navigation_bar.info": "இந்த நிகழ்வு பற்றி",
-  "navigation_bar.keyboard_shortcuts": "சுருக்குவிசைகள்",
   "navigation_bar.lists": "குதிரை வீர்ர்கள்",
   "navigation_bar.logout": "விடு பதிகை",
   "navigation_bar.mutes": "முடக்கப்பட்ட பயனர்கள்",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "பொருத்தப்பட்டன toots",
   "navigation_bar.preferences": "விருப்பங்கள்",
   "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "பத்திரம்",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை",
   "notification.follow": "{name} உங்களைப் பின்தொடர்கிறார்",
   "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்",
@@ -306,13 +400,16 @@
   "notification.poll": "நீங்கள் வாக்களித்த வாக்கெடுப்பு முடிவடைந்தது",
   "notification.reblog": "{name} உங்கள் நிலை அதிகரித்தது",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
   "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
   "notifications.column_settings.favourite": "பிடித்தவை:",
   "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு",
   "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை",
-  "notifications.column_settings.filter_bar.show": "காட்டு",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:",
   "notifications.column_settings.follow_request": "புதிய பின்தொடர் கோரிக்கைகள்:",
   "notifications.column_settings.mention": "குறிப்பிடுகிறது:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "பத்தியில் காண்பி",
   "notifications.column_settings.sound": "ஒலி விளையாட",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "எல்லா",
   "notifications.filter.boosts": "மதிப்பை உயர்த்து",
   "notifications.filter.favourites": "விருப்பத்துக்குகந்த",
@@ -343,7 +442,7 @@
   "poll.closed": "மூடிய",
   "poll.refresh": "பத்துயிர்ப்ப?ட்டு",
   "poll.total_people": "{count, plural, one {# நபர்} other {# நபர்கள்}}",
-  "poll.total_votes": "{count, plural, one {# vote} மற்ற {# votes}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
   "poll.vote": "வாக்களி",
   "poll.voted": "உங்கள் தேர்வு",
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
   "privacy.change": "நிலை தனியுரிமை",
   "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
-  "privacy.direct.short": "நடத்து",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
-  "privacy.private.short": "பின்பற்றுபவர்கள் மட்டும்",
-  "privacy.public.long": "பொது நேரங்களுக்கான இடுகை",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "பொது",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "பட்டியலிடப்படாத",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "புதுப்பி",
   "regeneration_indicator.label": "சுமையேற்றம்…",
   "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
   "relative_time.days": "{number}நா",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}ம",
   "relative_time.just_now": "இப்பொழுது",
   "relative_time.minutes": "{number}நி",
   "relative_time.seconds": "{number}வி",
   "relative_time.today": "இன்று",
   "reply_indicator.cancel": "எதிராணை",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "முன்னோக்கி {target}",
   "report.forward_hint": "கணக்கு மற்றொரு சேவையகத்திலிருந்து வருகிறது. அறிக்கையின் அநாமதேய பிரதி ஒன்றை அனுப்பவும்.?",
-  "report.hint": "அறிக்கை உங்கள் மாதிரியாக மாற்றியமைக்கப்படும். கீழே உள்ள கணக்கை நீங்கள் ஏன் புகாரளிக்கிறீர்கள் என்பதற்கான விளக்கத்தை வழங்கலாம்:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "கூடுதல் கருத்துரைகள்",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "சமர்ப்பி",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "தேடு",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "மேம்பட்ட தேடல் வடிவம்",
   "search_popout.tips.full_text": "எளிமையான உரை நீங்கள் எழுதப்பட்ட, புகழ், அதிகரித்தது, அல்லது குறிப்பிட்டுள்ள, அதே போல் பயனர் பெயர்கள், காட்சி பெயர்கள், மற்றும் ஹேஸ்டேகைகளை கொண்டுள்ளது என்று நிலைகளை கொடுக்கிறது.",
   "search_popout.tips.hashtag": "ஹேஸ்டேக்",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "எளிய உரை காட்சி பெயர்கள், பயனர்பெயர்கள் மற்றும் ஹாஷ்டேட்களுடன் பொருந்துகிறது",
   "search_popout.tips.user": "பயனர்",
   "search_results.accounts": "மக்கள்",
+  "search_results.all": "All",
   "search_results.hashtags": "ஹாஷ்டேக்குகளைச்",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "டூட்டுகள்",
   "search_results.statuses_fts_disabled": "டூட்டுகளின் வார்த்தைகளைக்கொண்டு தேடுவது இந்த மச்டோடன் வழங்கியில் இயல்விக்கப்படவில்லை.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} மற்ற {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "மிதமான இடைமுகத்தை திறக்க @{name}",
   "status.admin_status": "மிதமான இடைமுகத்தில் இந்த நிலையை திறக்கவும்",
   "status.block": "@{name} -ஐத் தடு",
@@ -396,9 +551,16 @@
   "status.delete": "நீக்கு",
   "status.detailed_status": "விரிவான உரையாடல் காட்சி",
   "status.direct": "நேரடி செய்தி @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "கிடத்து",
   "status.favourite": "விருப்பத்துக்குகந்த",
+  "status.filter": "Filter this post",
   "status.filtered": "வடிகட்டு",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "அதிகமாய் ஏற்று",
   "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
   "status.mention": "குறிப்பிடு @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "இதுவரை யாரும் இந்த மோதலை அதிகரிக்கவில்லை. யாராவது செய்தால், அவர்கள் இங்கே காண்பார்கள்.",
   "status.redraft": "நீக்கு மற்றும் மீண்டும் வரைவு",
   "status.remove_bookmark": "அடையாளம் நீக்கு",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "பதில்",
   "status.replyAll": "நூலுக்கு பதிலளிக்கவும்",
   "status.report": "@{name} மீது புகாரளி",
   "status.sensitive_warning": "உணர்திறன் உள்ளடக்கம்",
   "status.share": "பங்கிடு",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "குறைவாகக் காண்பி",
   "status.show_less_all": "அனைத்தையும் குறைவாக காட்டு",
   "status.show_more": "மேலும் காட்ட",
   "status.show_more_all": "அனைவருக்கும் மேலும் காட்டு",
-  "status.show_thread": "நூல் காட்டு",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "கிடைக்கவில்லை",
   "status.unmute_conversation": "ஊமையாக உரையாடல் இல்லை",
   "status.unpin": "சுயவிவரத்திலிருந்து நீக்கவும்",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "பரிந்துரை விலக்க",
   "suggestions.header": "நீங்கள் ஆர்வமாக இருக்கலாம் …",
   "tabs_bar.federated_timeline": "கூட்டமைந்த",
   "tabs_bar.home": "முகப்பு",
   "tabs_bar.local_timeline": "உள்ளூர்",
   "tabs_bar.notifications": "அறிவிப்புகள்",
-  "tabs_bar.search": "தேடு",
   "time_remaining.days": "{number, plural, one {# day} மற்ற {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} மற்ற {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} மற்ற {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "வாசகர்கள்",
   "timeline_hint.resources.follows": "வாசிக்கிறார்",
   "timeline_hint.resources.statuses": "பழைய டூட்டுகள்",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} நபர்} other {{counter} நபர்கள்}} உரையாடலில்",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "இப்போது செல்திசையில் இருப்பவை",
   "ui.beforeunload": "நீங்கள் வெளியே சென்றால் உங்கள் வரைவு இழக்கப்படும் மஸ்தோடோன்.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "கோப்பு பதிவேற்றம் அனுமதிக்கப்படவில்லை.",
   "upload_form.audio_description": "செவித்திறன் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
   "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "தொகு",
   "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
   "upload_form.undo": "நீக்கு",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "முன்னோட்டம் ({ratio})",
   "upload_progress.label": "ஏற்றுகிறது ...",
+  "upload_progress.processing": "Processing…",
   "video.close": "வீடியோவை மூடு",
   "video.download": "கோப்பைப் பதிவிறக்கவும்",
   "video.exit_fullscreen": "முழு திரையில் இருந்து வெளியேறவும்",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 2302e7ccc..cff5cb4de 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Mûi-thé",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 348d753dc..ac675d660 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "జాబితాల నుండి చేర్చు లేదా తీసివేయి",
   "account.badges.bot": "బాట్",
@@ -7,47 +19,56 @@
   "account.block_domain": "{domain} నుంచి అన్నీ దాచిపెట్టు",
   "account.blocked": "బ్లాక్ అయినవి",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "@{name}కు నేరుగా సందేశం పంపు",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "డొమైన్ దాచిపెట్టబడినది",
   "account.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "ప్రొఫైల్లో చూపించు",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "అనుసరించు",
   "account.followers": "అనుచరులు",
   "account.followers.empty": "ఈ వినియోగదారుడిని ఇంకా ఎవరూ అనుసరించడంలేదు.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "ఈ వినియోగదారి ఇంకా ఎవరినీ అనుసరించడంలేదు.",
   "account.follows_you": "మిమ్మల్ని అనుసరిస్తున్నారు",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "@{name} నుంచి బూస్ట్ లను దాచిపెట్టు",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "ఈ లంకె యొక్క యాజమాన్యం {date}న పరీక్షించబడింది",
   "account.locked_info": "ఈ ఖాతా యొక్క గోప్యత స్థితి లాక్ చేయబడి వుంది. ఈ ఖాతాను ఎవరు అనుసరించవచ్చో యజమానే నిర్ణయం తీసుకుంటారు.",
   "account.media": "మీడియా",
   "account.mention": "@{name}ను ప్రస్తావించు",
-  "account.moved_to": "{name} ఇక్కడికి మారారు:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "@{name}ను మ్యూట్ చెయ్యి",
   "account.mute_notifications": "@{name}నుంచి ప్రకటనలను మ్యూట్ చెయ్యి",
   "account.muted": "మ్యూట్ అయినవి",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "టూట్లు",
   "account.posts_with_replies": "టూట్లు మరియు ప్రత్యుత్తరములు",
   "account.report": "@{name}పై ఫిర్యాదుచేయు",
   "account.requested": "ఆమోదం కోసం వేచి ఉంది. అభ్యర్థనను రద్దు చేయడానికి క్లిక్ చేయండి",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి",
   "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు",
   "account.unblock_domain": "{domain}ను దాచవద్దు",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "ప్రొఫైల్లో చూపించవద్దు",
   "account.unfollow": "అనుసరించవద్దు",
   "account.unmute": "@{name}పై మ్యూట్ ని తొలగించు",
   "account.unmute_notifications": "@{name} నుంచి ప్రకటనలపై మ్యూట్ ని తొలగించు",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "అయ్యో!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "మీరు తదుపరిసారి దీనిని దాటవేయడానికి {combo} నొక్కవచ్చు",
-  "bundle_column_error.body": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "మళ్ళీ ప్రయత్నించండి",
-  "bundle_column_error.title": "నెట్వర్క్ లోపం",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "మూసివేయు",
   "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
   "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "column.bookmarks": "Bookmarks",
   "column.community": "స్థానిక కాలక్రమం",
-  "column.direct": "ప్రత్యక్ష సందేశాలు",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "దాచిన డొమైన్లు",
   "column.favourites": "ఇష్టపడినవి",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "మీడియా మాత్రమే",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "ఈ టూట్ పేర్కొన్న వినియోగదారులకు మాత్రమే పంపబడుతుంది.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "మరింత తెలుసుకోండి",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ఈ టూట్ అన్లిస్టెడ్ కాబట్టి ఏ హాష్ ట్యాగ్ క్రిందకూ రాదు. పబ్లిక్ టూట్ లను మాత్రమే హాష్ ట్యాగ్ ద్వారా శోధించవచ్చు.",
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "టూట్",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
   "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
   "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "తొలగించు",
   "confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
   "confirmations.delete_list.confirm": "తొలగించు",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.",
   "embed.preview": "అది ఈ క్రింది విధంగా కనిపిస్తుంది:",
   "emoji_button.activity": "కార్యకలాపాలు",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "అనుకూలీకరించిన",
   "emoji_button.flags": "ఫ్లాగ్స్",
   "emoji_button.food": "ఆహారం & పానీయం",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "మీరు ఇంకా ఏ వినియోగదారులనూ బ్లాక్ చేయలేదు.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!",
-  "empty_column.direct": "మీకు ఇంకా ఏ ప్రత్యక్ష సందేశాలు లేవు. మీరు ఒకదాన్ని పంపినప్పుడు లేదా స్వీకరించినప్పుడు, అది ఇక్కడ చూపబడుతుంది.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "దాచబడిన డొమైన్లు ఇంకా ఏమీ లేవు.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "మీకు ఇష్టపడిన టూట్లు ఇంకా ఎమీ లేవు. మీరు ఒకదానిని ఇష్టపడినప్పుడు, అది ఇక్కడ కనిపిస్తుంది.",
   "empty_column.favourites": "ఈ టూట్ను ఇంకా ఎవరూ ఇష్టపడలేదు. ఎవరైనా అలా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "అనుమతించు",
   "follow_request.reject": "తిరస్కరించు",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "డెవలపర్లు",
-  "getting_started.directory": "ప్రొఫైల్ డైరెక్టరీ",
-  "getting_started.documentation": "డాక్యుమెంటేషన్",
   "getting_started.heading": "మొదలుపెడదాం",
-  "getting_started.invite": "వ్యక్తులను ఆహ్వానించండి",
-  "getting_started.open_source_notice": "మాస్టొడొన్ ఓపెన్ సోర్స్ సాఫ్ట్వేర్. మీరు {github} వద్ద GitHub పై సమస్యలను నివేదించవచ్చు లేదా తోడ్పడచ్చు.",
-  "getting_started.security": "భద్రత",
-  "getting_started.terms": "సేవా నిబంధనలు",
   "hashtag.column_header.tag_mode.all": "మరియు {additional}",
   "hashtag.column_header.tag_mode.any": "లేదా {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} లేకుండా",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
   "hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
   "hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "నిలువు వరుసలలో ఒకదానిపై దృష్టి పెట్టడానికి",
   "keyboard_shortcuts.compose": "కంపోజ్ టెక్స్ట్ఏరియా పై దృష్టి పెట్టడానికి",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.direct": "నేరుగా పంపిన సందేశాల నిలువు వరుసను తెరువడానికి",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "ఇష్టపడడానికి",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "తరువాత",
   "lightbox.previous": "మునుపటి",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "జాబితాకు జోడించు",
   "lists.account.remove": "జాబితా నుండి తొలగించు",
   "lists.delete": "జాబితాను తొలగించు",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
   "missing_indicator.label": "దొరకలేదు",
   "missing_indicator.sublabel": "ఈ వనరు కనుగొనబడలేదు",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "మొబైల్ ఆప్ లు",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
-  "navigation_bar.direct": "ప్రత్యక్ష సందేశాలు",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
   "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "ఇష్టపడినవి",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "ఈ సేవిక గురించి",
-  "navigation_bar.keyboard_shortcuts": "హాట్ కీలు",
   "navigation_bar.lists": "జాబితాలు",
   "navigation_bar.logout": "లాగ్ అవుట్ చేయండి",
   "navigation_bar.mutes": "మ్యూట్ చేయబడిన వినియోగదారులు",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "అతికించిన టూట్లు",
   "navigation_bar.preferences": "ప్రాధాన్యతలు",
   "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "భద్రత",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "మీరు పాల్గొనిన ఎన్సిక ముగిసినది",
   "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
   "notifications.column_settings.favourite": "ఇష్టపడినవి:",
   "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు",
   "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్",
-  "notifications.column_settings.filter_bar.show": "చూపించు",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "ప్రస్తావనలు:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "నిలువు వరుసలో చూపు",
   "notifications.column_settings.sound": "ధ్వనిని ప్లే చేయి",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "అన్నీ",
   "notifications.filter.boosts": "బూస్ట్లు",
   "notifications.filter.favourites": "ఇష్టాలు",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
   "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.direct.short": "ప్రత్యక్ష",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.private.short": "అనుచరులకు మాత్రమే",
-  "privacy.public.long": "ప్రజా కాలక్రమాలకు పోస్ట్ చేయండి",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "ప్రజా",
-  "privacy.unlisted.long": "ప్రజా కాలక్రమాలలో చూపించవద్దు",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "జాబితా చేయబడనిది",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "లోడ్ అవుతోంది…",
   "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "ఇప్పుడు",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "రద్దు చెయ్యి",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "{target}కి ఫార్వార్డ్ చేయండి",
   "report.forward_hint": "ఖాతా మరొక సర్వర్లో ఉంది. నివేదిక యొక్క ఒక అనామకంగా ఉన్న కాపీని అక్కడికి కూడా పంపించమంటారా?",
-  "report.hint": "మీ సేవిక మోడరేటర్లకు నివేదిక పంపబడుతుంది. ఈ ఖాతాను ఎందుకు నివేదిస్తున్నారనేదాని వివరణను మీరు దిగువన అందించవచ్చు:",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
   "report.placeholder": "అదనపు వ్యాఖ్యలు",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "సమర్పించండి",
   "report.target": "{target}పై ఫిర్యాదు చేయండి",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "శోధన",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "అధునాతన శోధన ఆకృతి",
   "search_popout.tips.full_text": "సాధారణ వచనం మీరు వ్రాసిన, ఇష్టపడే, పెంచబడిన లేదా పేర్కొనబడిన, అలాగే యూజర్పేర్లు, ప్రదర్శన పేర్లు, మరియు హ్యాష్ట్యాగ్లను నమోదు చేసిన హోదాలను అందిస్తుంది.",
   "search_popout.tips.hashtag": "హాష్ ట్యాగ్",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "సింపుల్ టెక్స్ట్ ప్రదర్శన పేర్లు, యూజర్ పేర్లు మరియు హ్యాష్ట్యాగ్లను సరిపోలుస్తుంది",
   "search_popout.tips.user": "వాడుకరి",
   "search_results.accounts": "వ్యక్తులు",
+  "search_results.all": "All",
   "search_results.hashtags": "హాష్ ట్యాగ్లు",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "టూట్లు",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "@{name} కొరకు సమన్వయ వినిమయసీమను తెరువు",
   "status.admin_status": "సమన్వయ వినిమయసీమలో ఈ స్టేటస్ ను తెరవండి",
   "status.block": "@{name} ను బ్లాక్ చేయి",
@@ -396,9 +551,16 @@
   "status.delete": "తొలగించు",
   "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ",
   "status.direct": "@{name}కు నేరుగా సందేశం పంపు",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "ఎంబెడ్",
   "status.favourite": "ఇష్టపడు",
+  "status.filter": "Filter this post",
   "status.filtered": "వడకట్టబడిన",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "మరిన్ని లోడ్ చేయి",
   "status.media_hidden": "మీడియా దాచబడింది",
   "status.mention": "@{name}ను ప్రస్తావించు",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "ఈ టూట్ను ఇంకా ఎవరూ బూస్ట్ చేయలేదు. ఎవరైనా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.",
   "status.redraft": "తొలగించు & తిరగరాయు",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "ప్రత్యుత్తరం",
   "status.replyAll": "సంభాషణకు ప్రత్యుత్తరం ఇవ్వండి",
   "status.report": "@{name}పై ఫిర్యాదుచేయు",
   "status.sensitive_warning": "సున్నితమైన కంటెంట్",
   "status.share": "పంచుకోండి",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "తక్కువ చూపించు",
   "status.show_less_all": "అన్నిటికీ తక్కువ చూపించు",
   "status.show_more": "ఇంకా చూపించు",
   "status.show_more_all": "అన్నిటికీ ఇంకా చూపించు",
-  "status.show_thread": "గొలుసును చూపించు",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "సంభాషణను అన్మ్యూట్ చేయి",
   "status.unpin": "ప్రొఫైల్ నుండి పీకివేయు",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "సూచనను రద్దు చేయి",
   "suggestions.header": "మీకు వీటి మీద ఆసక్తి ఉండవచ్చు…",
   "tabs_bar.federated_timeline": "సమాఖ్య",
   "tabs_bar.home": "హోమ్",
   "tabs_bar.local_timeline": "స్థానిక",
   "tabs_bar.notifications": "ప్రకటనలు",
-  "tabs_bar.search": "శోధన",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "తొలగించు",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
+  "upload_progress.processing": "Processing…",
   "video.close": "వీడియోని మూసివేయి",
   "video.download": "Download file",
   "video.exit_fullscreen": "పూర్తి స్క్రీన్ నుండి నిష్క్రమించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 90b8ba464..4ab9e84d8 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "เซิร์ฟเวอร์ที่มีการควบคุม",
+  "about.contact": "ติดต่อ:",
+  "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
+  "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
+  "about.domain_blocks.preamble": "โดยทั่วไป Mastodon อนุญาตให้คุณดูเนื้อหาจากและโต้ตอบกับผู้ใช้จากเซิร์ฟเวอร์อื่นใดในจักรวาลสหพันธ์ นี่คือข้อยกเว้นที่ทำขึ้นในเซิร์ฟเวอร์นี้โดยเฉพาะ",
+  "about.domain_blocks.silenced.explanation": "โดยทั่วไปคุณจะไม่เห็นโปรไฟล์และเนื้อหาจากเซิร์ฟเวอร์นี้ เว้นแต่คุณจะค้นหาเซิร์ฟเวอร์หรือเลือกรับเซิร์ฟเวอร์โดยการติดตามอย่างชัดเจน",
+  "about.domain_blocks.silenced.title": "จำกัดอยู่",
+  "about.domain_blocks.suspended.explanation": "จะไม่ประมวลผล จัดเก็บ หรือแลกเปลี่ยนข้อมูลจากเซิร์ฟเวอร์นี้ ทำให้การโต้ตอบหรือการสื่อสารใด ๆ กับผู้ใช้จากเซิร์ฟเวอร์นี้เป็นไปไม่ได้",
+  "about.domain_blocks.suspended.title": "ระงับอยู่",
+  "about.not_available": "ไม่ได้ทำให้ข้อมูลนี้พร้อมใช้งานในเซิร์ฟเวอร์นี้",
+  "about.powered_by": "สื่อสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
+  "about.rules": "กฎของเซิร์ฟเวอร์",
   "account.account_note_header": "หมายเหตุ",
   "account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
   "account.badges.bot": "บอต",
@@ -7,64 +19,86 @@
   "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.blocked": "ปิดกั้นอยู่",
   "account.browse_more_on_origin_server": "เรียกดูเพิ่มเติมในโปรไฟล์ดั้งเดิม",
-  "account.cancel_follow_request": "ยกเลิกคำขอติดตาม",
+  "account.cancel_follow_request": "ถอนคำขอติดตาม",
   "account.direct": "ส่งข้อความโดยตรงถึง @{name}",
   "account.disable_notifications": "หยุดแจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
   "account.edit_profile": "แก้ไขโปรไฟล์",
   "account.enable_notifications": "แจ้งเตือนฉันเมื่อ @{name} โพสต์",
-  "account.endorse": "แสดงให้เห็นในโปรไฟล์",
+  "account.endorse": "แนะนำในโปรไฟล์",
+  "account.featured_tags.last_status_at": "โพสต์ล่าสุดเมื่อ {date}",
+  "account.featured_tags.last_status_never": "ไม่มีโพสต์",
+  "account.featured_tags.title": "แฮชแท็กที่แนะนำของ {name}",
   "account.follow": "ติดตาม",
   "account.followers": "ผู้ติดตาม",
   "account.followers.empty": "ยังไม่มีใครติดตามผู้ใช้นี้",
   "account.followers_counter": "{count, plural, other {{counter} ผู้ติดตาม}}",
+  "account.following": "กำลังติดตาม",
   "account.following_counter": "{count, plural, other {{counter} กำลังติดตาม}}",
   "account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
   "account.follows_you": "ติดตามคุณ",
+  "account.go_to_profile": "ไปยังโปรไฟล์",
   "account.hide_reblogs": "ซ่อนการดันจาก @{name}",
-  "account.joined": "เข้าร่วมเมื่อ {date}",
-  "account.last_status": "ใช้งานล่าสุด",
+  "account.joined_short": "เข้าร่วมเมื่อ",
+  "account.languages": "เปลี่ยนภาษาที่บอกรับ",
   "account.link_verified_on": "ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ {date}",
   "account.locked_info": "มีการตั้งสถานะความเป็นส่วนตัวของบัญชีนี้เป็นล็อคอยู่ เจ้าของตรวจทานผู้ที่สามารถติดตามเขาด้วยตนเอง",
   "account.media": "สื่อ",
   "account.mention": "กล่าวถึง @{name}",
-  "account.moved_to": "{name} ได้ย้ายไปยัง:",
+  "account.moved_to": "{name} ได้ระบุว่าบัญชีใหม่ของเขาในตอนนี้คือ:",
   "account.mute": "ซ่อน @{name}",
   "account.mute_notifications": "ซ่อนการแจ้งเตือนจาก @{name}",
   "account.muted": "ซ่อนอยู่",
-  "account.never_active": "ไม่เลย",
+  "account.open_original_page": "เปิดหน้าดั้งเดิม",
   "account.posts": "โพสต์",
   "account.posts_with_replies": "โพสต์และการตอบกลับ",
   "account.report": "รายงาน @{name}",
   "account.requested": "กำลังรอการอนุมัติ คลิกเพื่อยกเลิกคำขอติดตาม",
+  "account.requested_follow": "{name} ได้ขอติดตามคุณ",
   "account.share": "แบ่งปันโปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
   "account.statuses_counter": "{count, plural, other {{counter} โพสต์}}",
   "account.unblock": "เลิกปิดกั้น @{name}",
   "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
-  "account.unendorse": "ไม่แสดงให้เห็นในโปรไฟล์",
+  "account.unblock_short": "เลิกปิดกั้น",
+  "account.unendorse": "ไม่แนะนำในโปรไฟล์",
   "account.unfollow": "เลิกติดตาม",
   "account.unmute": "เลิกซ่อน @{name}",
   "account.unmute_notifications": "เลิกซ่อนการแจ้งเตือนจาก @{name}",
+  "account.unmute_short": "เลิกซ่อน",
   "account_note.placeholder": "คลิกเพื่อเพิ่มหมายเหตุ",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "อัตราการเก็บรักษาผู้ใช้ตามวันหลังจากลงทะเบียน",
+  "admin.dashboard.monthly_retention": "อัตราการเก็บรักษาผู้ใช้ตามเดือนหลังจากลงทะเบียน",
+  "admin.dashboard.retention.average": "ค่าเฉลี่ย",
+  "admin.dashboard.retention.cohort": "เดือนที่ลงทะเบียน",
+  "admin.dashboard.retention.cohort_size": "ผู้ใช้ใหม่",
   "alert.rate_limited.message": "โปรดลองใหม่หลังจาก {retry_time, time, medium}",
   "alert.rate_limited.title": "มีการจำกัดอัตรา",
   "alert.unexpected.message": "เกิดข้อผิดพลาดที่ไม่คาดคิด",
   "alert.unexpected.title": "อุปส์!",
   "announcement.announcement": "ประกาศ",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
+  "audio.hide": "ซ่อนเสียง",
   "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
-  "bundle_column_error.body": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
+  "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
+  "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
+  "bundle_column_error.error.title": "โอ้ ไม่!",
+  "bundle_column_error.network.body": "มีข้อผิดพลาดขณะพยายามโหลดหน้านี้ นี่อาจเป็นเพราะปัญหาชั่วคราวกับการเชื่อมต่ออินเทอร์เน็ตของคุณหรือเซิร์ฟเวอร์นี้",
+  "bundle_column_error.network.title": "ข้อผิดพลาดเครือข่าย",
   "bundle_column_error.retry": "ลองอีกครั้ง",
-  "bundle_column_error.title": "ข้อผิดพลาดเครือข่าย",
+  "bundle_column_error.return": "กลับไปที่หน้าแรก",
+  "bundle_column_error.routing.body": "ไม่พบหน้าที่ขอ คุณแน่ใจหรือไม่ว่า URL ในแถบที่อยู่ถูกต้อง?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ปิด",
   "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
   "bundle_modal_error.retry": "ลองอีกครั้ง",
+  "closed_registrations.other_server_instructions": "เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ คุณสามารถสร้างบัญชีในเซิร์ฟเวอร์อื่นและยังคงโต้ตอบกับเซิร์ฟเวอร์นี้",
+  "closed_registrations_modal.description": "ไม่สามารถสร้างบัญชีใน {domain} ได้ในปัจจุบัน แต่โปรดจำไว้ว่าคุณไม่จำเป็นต้องมีบัญชีใน {domain} โดยเฉพาะเพื่อใช้ Mastodon",
+  "closed_registrations_modal.find_another_server": "ค้นหาเซิร์ฟเวอร์อื่น",
+  "closed_registrations_modal.preamble": "Mastodon เป็นแบบกระจายศูนย์ ดังนั้นไม่ว่าคุณจะสร้างบัญชีของคุณที่ใด คุณจะสามารถติดตามและโต้ตอบกับใครก็ตามในเซิร์ฟเวอร์นี้ คุณยังสามารถโฮสต์บัญชีด้วยตนเองได้อีกด้วย!",
+  "closed_registrations_modal.title": "การลงทะเบียนใน Mastodon",
+  "column.about": "เกี่ยวกับ",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "ที่คั่นหน้า",
   "column.community": "เส้นเวลาในเซิร์ฟเวอร์",
@@ -90,9 +124,11 @@
   "community.column_settings.local_only": "ในเซิร์ฟเวอร์เท่านั้น",
   "community.column_settings.media_only": "สื่อเท่านั้น",
   "community.column_settings.remote_only": "ระยะไกลเท่านั้น",
-  "compose_form.direct_message_warning": "จะส่งโพสต์นี้ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
+  "compose.language.change": "เปลี่ยนภาษา",
+  "compose.language.search": "ค้นหาภาษา...",
   "compose_form.direct_message_warning_learn_more": "เรียนรู้เพิ่มเติม",
-  "compose_form.hashtag_warning": "จะไม่แสดงรายการโพสต์นี้ภายใต้แฮชแท็กใด ๆ เนื่องจากไม่อยู่ในรายการ เฉพาะโพสต์สาธารณะเท่านั้นที่สามารถค้นหาได้โดยแฮชแท็ก",
+  "compose_form.encryption_warning": "โพสต์ใน Mastodon ไม่ได้เข้ารหัสแบบต้นทางถึงปลายทาง อย่าแบ่งปันข้อมูลที่ละเอียดอ่อนใด ๆ ผ่าน Mastodon",
+  "compose_form.hashtag_warning": "จะไม่แสดงรายการโพสต์นี้ภายใต้แฮชแท็กใด ๆ เนื่องจากโพสต์ไม่อยู่ในรายการ เฉพาะโพสต์สาธารณะเท่านั้นที่สามารถค้นหาได้โดยแฮชแท็ก",
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
-  "compose_form.publish": "โพสต์",
+  "compose_form.publish": "เผยแพร่",
+  "compose_form.publish_form": "เผยแพร่",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
   "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
   "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
   "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
@@ -114,36 +152,49 @@
   "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
   "confirmations.block.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดกั้น {name}?",
+  "confirmations.cancel_follow_request.confirm": "ถอนคำขอ",
+  "confirmations.cancel_follow_request.message": "คุณแน่ใจหรือไม่ว่าต้องการถอนคำขอเพื่อติดตาม {name} ของคุณ?",
   "confirmations.delete.confirm": "ลบ",
   "confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้?",
   "confirmations.delete_list.confirm": "ลบ",
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "ละทิ้ง",
+  "confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงต่อไป?",
   "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
   "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
   "confirmations.mute.confirm": "ซ่อน",
-  "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
+  "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังคงอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
   "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการซ่อน {name}?",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะหายไป และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.reply.confirm": "ตอบกลับ",
-  "confirmations.reply.message": "การตอบกลับตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
+  "confirmations.reply.message": "การตอบกลับในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.unfollow.confirm": "เลิกติดตาม",
   "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
   "conversation.delete": "ลบการสนทนา",
   "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
   "conversation.open": "ดูการสนทนา",
   "conversation.with": "กับ {names}",
-  "directory.federated": "จากเฟดิเวิร์สที่รู้จัก",
+  "copypaste.copied": "คัดลอกแล้ว",
+  "copypaste.copy": "คัดลอก",
+  "directory.federated": "จากจักรวาลสหพันธ์ที่รู้จัก",
   "directory.local": "จาก {domain} เท่านั้น",
   "directory.new_arrivals": "มาใหม่",
   "directory.recently_active": "ใช้งานล่าสุด",
+  "disabled_account_banner.account_settings": "การตั้งค่าบัญชี",
+  "disabled_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบัน",
+  "dismissable_banner.community_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนที่บัญชีได้รับการโฮสต์โดย {domain}",
+  "dismissable_banner.dismiss": "ปิด",
+  "dismissable_banner.explore_links": "เรื่องข่าวเหล่านี้กำลังได้รับการพูดถึงโดยผู้คนในเซิร์ฟเวอร์นี้และอื่น ๆ ของเครือข่ายแบบกระจายศูนย์ในตอนนี้",
+  "dismissable_banner.explore_statuses": "โพสต์เหล่านี้จากเซิร์ฟเวอร์นี้และอื่น ๆ ในเครือข่ายแบบกระจายศูนย์กำลังได้รับความสนใจในเซิร์ฟเวอร์นี้ในตอนนี้",
+  "dismissable_banner.explore_tags": "แฮชแท็กเหล่านี้กำลังได้รับความสนใจในหมู่ผู้คนในเซิร์ฟเวอร์นี้และอื่น ๆ ของเครือข่ายแบบกระจายศูนย์ในตอนนี้",
+  "dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเซิร์ฟเวอร์นี้และอื่น ๆ ของเครือข่ายแบบกระจายศูนย์ที่เซิร์ฟเวอร์นี้ทราบเกี่ยวกับ",
   "embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
   "embed.preview": "นี่คือลักษณะที่จะปรากฏ:",
   "emoji_button.activity": "กิจกรรม",
+  "emoji_button.clear": "ล้าง",
   "emoji_button.custom": "กำหนดเอง",
   "emoji_button.flags": "ธง",
   "emoji_button.food": "อาหารและเครื่องดื่ม",
@@ -165,9 +216,10 @@
   "empty_column.community": "เส้นเวลาในเซิร์ฟเวอร์ว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
   "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
   "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ปิดกั้นอยู่",
+  "empty_column.explore_statuses": "ไม่มีสิ่งใดที่กำลังนิยมในตอนนี้ กลับมาตรวจสอบในภายหลัง!",
   "empty_column.favourited_statuses": "คุณยังไม่มีโพสต์ที่ชื่นชอบใด ๆ เมื่อคุณชื่นชอบโพสต์ โพสต์จะปรากฏที่นี่",
   "empty_column.favourites": "ยังไม่มีใครชื่นชอบโพสต์นี้ เมื่อใครสักคนชื่นชอบ เขาจะปรากฏที่นี่",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_recommendations": "ดูเหมือนว่าจะไม่สามารถสร้างข้อเสนอแนะสำหรับคุณ คุณสามารถลองใช้การค้นหาเพื่อมองหาผู้คนที่คุณอาจรู้จักหรือสำรวจแฮชแท็กที่กำลังนิยม",
   "empty_column.follow_requests": "คุณยังไม่มีคำขอติดตามใด ๆ เมื่อคุณได้รับคำขอ คำขอจะปรากฏที่นี่",
   "empty_column.hashtag": "ยังไม่มีสิ่งใดในแฮชแท็กนี้",
   "empty_column.home": "เส้นเวลาหน้าแรกของคุณว่างเปล่า! ติดตามผู้คนเพิ่มเติมเพื่อเติมเส้นเวลาให้เต็ม {suggestions}",
@@ -176,28 +228,50 @@
   "empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
   "empty_column.mutes": "คุณยังไม่ได้ซ่อนผู้ใช้ใด ๆ",
   "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ เมื่อผู้คนอื่น ๆ โต้ตอบกับคุณ คุณจะเห็นการแจ้งเตือนที่นี่",
-  "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมให้เต็ม",
+  "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมเส้นเวลาให้เต็ม",
   "error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
   "error.unexpected_crash.explanation_addons": "ไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง ข้อผิดพลาดนี้เป็นไปได้ว่าเกิดจากส่วนเสริมของเบราว์เซอร์หรือเครื่องมือการแปลอัตโนมัติ",
-  "error.unexpected_crash.next_steps": "ลองรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอป",
-  "error.unexpected_crash.next_steps_addons": "ลองปิดใช้งานส่วนเสริมหรือเครื่องมือแล้วรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอป",
+  "error.unexpected_crash.next_steps": "ลองรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอปเนทีฟ",
+  "error.unexpected_crash.next_steps_addons": "ลองปิดใช้งานส่วนเสริมหรือเครื่องมือแล้วรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอปเนทีฟ",
   "errors.unexpected_crash.copy_stacktrace": "คัดลอกการติดตามสแตกไปยังคลิปบอร์ด",
   "errors.unexpected_crash.report_issue": "รายงานปัญหา",
+  "explore.search_results": "ผลลัพธ์การค้นหา",
+  "explore.suggested_follows": "สำหรับคุณ",
+  "explore.title": "สำรวจ",
+  "explore.trending_links": "ข่าว",
+  "explore.trending_statuses": "โพสต์",
+  "explore.trending_tags": "แฮชแท็ก",
+  "filter_modal.added.context_mismatch_explanation": "หมวดหมู่ตัวกรองนี้ไม่ได้นำไปใช้กับบริบทที่คุณได้เข้าถึงโพสต์นี้ หากคุณต้องการกรองโพสต์ในบริบทนี้ด้วย คุณจะต้องแก้ไขตัวกรอง",
+  "filter_modal.added.context_mismatch_title": "บริบทไม่ตรงกัน!",
+  "filter_modal.added.expired_explanation": "หมวดหมู่ตัวกรองนี้หมดอายุแล้ว คุณจะต้องเปลี่ยนวันหมดอายุสำหรับหมวดหมู่เพื่อนำไปใช้",
+  "filter_modal.added.expired_title": "ตัวกรองหมดอายุแล้ว!",
+  "filter_modal.added.review_and_configure": "เพื่อตรวจทานและกำหนดค่าหมวดหมู่ตัวกรองนี้เพิ่มเติม ไปยัง {settings_link}",
+  "filter_modal.added.review_and_configure_title": "การตั้งค่าตัวกรอง",
+  "filter_modal.added.settings_link": "หน้าการตั้งค่า",
+  "filter_modal.added.short_explanation": "เพิ่มโพสต์นี้ไปยังหมวดหมู่ตัวกรองดังต่อไปนี้แล้ว: {title}",
+  "filter_modal.added.title": "เพิ่มตัวกรองแล้ว!",
+  "filter_modal.select_filter.context_mismatch": "ไม่นำไปใช้กับบริบทนี้",
+  "filter_modal.select_filter.expired": "หมดอายุแล้ว",
+  "filter_modal.select_filter.prompt_new": "หมวดหมู่ใหม่: {name}",
+  "filter_modal.select_filter.search": "ค้นหาหรือสร้าง",
+  "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
+  "filter_modal.select_filter.title": "กรองโพสต์นี้",
+  "filter_modal.title.status": "กรองโพสต์",
   "follow_recommendations.done": "เสร็จสิ้น",
   "follow_recommendations.heading": "ติดตามผู้คนที่คุณต้องการเห็นโพสต์! นี่คือข้อเสนอแนะบางส่วน",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_recommendations.lead": "โพสต์จากผู้คนที่คุณติดตามจะแสดงตามลำดับเวลาในฟีดหน้าแรกของคุณ อย่ากลัวที่จะทำผิดพลาด คุณสามารถเลิกติดตามผู้คนได้อย่างง่ายดายเมื่อใดก็ตาม!",
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
+  "footer.about": "เกี่ยวกับ",
+  "footer.directory": "ไดเรกทอรีโปรไฟล์",
+  "footer.get_app": "รับแอป",
+  "footer.invite": "เชิญผู้คน",
+  "footer.keyboard_shortcuts": "แป้นพิมพ์ลัด",
+  "footer.privacy_policy": "นโยบายความเป็นส่วนตัว",
+  "footer.source_code": "ดูโค้ดต้นฉบับ",
   "generic.saved": "บันทึกแล้ว",
-  "getting_started.developers": "นักพัฒนา",
-  "getting_started.directory": "ไดเรกทอรีโปรไฟล์",
-  "getting_started.documentation": "เอกสารประกอบ",
   "getting_started.heading": "เริ่มต้นใช้งาน",
-  "getting_started.invite": "เชิญผู้คน",
-  "getting_started.open_source_notice": "Mastodon เป็นซอฟต์แวร์โอเพนซอร์ส คุณสามารถมีส่วนร่วมหรือรายงานปัญหาได้ใน GitHub ที่ {github}",
-  "getting_started.security": "การตั้งค่าบัญชี",
-  "getting_started.terms": "เงื่อนไขการให้บริการ",
   "hashtag.column_header.tag_mode.all": "และ {additional}",
   "hashtag.column_header.tag_mode.any": "หรือ {additional}",
   "hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "ใดก็ตามนี้",
   "hashtag.column_settings.tag_mode.none": "ไม่ใช่ทั้งหมดนี้",
   "hashtag.column_settings.tag_toggle": "รวมแท็กเพิ่มเติมสำหรับคอลัมน์นี้",
+  "hashtag.follow": "ติดตามแฮชแท็ก",
+  "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
   "home.hide_announcements": "ซ่อนประกาศ",
   "home.show_announcements": "แสดงประกาศ",
+  "interaction_modal.description.favourite": "เมื่อมีบัญชีใน Mastodon คุณสามารถชื่นชอบโพสต์นี้เพื่อให้ผู้สร้างทราบว่าคุณชื่นชมโพสต์และบันทึกโพสต์ไว้สำหรับภายหลัง",
+  "interaction_modal.description.follow": "เมื่อมีบัญชีใน Mastodon คุณสามารถติดตาม {name} เพื่อรับโพสต์ของเขาในฟีดหน้าแรกของคุณ",
+  "interaction_modal.description.reblog": "เมื่อมีบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแบ่งปันโพสต์กับผู้ติดตามของคุณเอง",
+  "interaction_modal.description.reply": "เมื่อมีบัญชีใน Mastodon คุณสามารถตอบกลับโพสต์นี้",
+  "interaction_modal.on_another_server": "ในเซิร์ฟเวอร์อื่น",
+  "interaction_modal.on_this_server": "ในเซิร์ฟเวอร์นี้",
+  "interaction_modal.other_server_instructions": "คัดลอกแล้ววาง URL นี้ลงในช่องค้นหาของแอป Mastodon โปรดของคุณหรือส่วนติดต่อเว็บของเซิร์ฟเวอร์ Mastodon ของคุณ",
+  "interaction_modal.preamble": "เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ คุณสามารถใช้บัญชีที่มีอยู่ของคุณที่ได้รับการโฮสต์โดยเซิร์ฟเวอร์ Mastodon อื่นหรือแพลตฟอร์มที่เข้ากันได้หากคุณไม่มีบัญชีในเซิร์ฟเวอร์นี้",
+  "interaction_modal.title.favourite": "ชื่นชอบโพสต์ของ {name}",
+  "interaction_modal.title.follow": "ติดตาม {name}",
+  "interaction_modal.title.reblog": "ดันโพสต์ของ {name}",
+  "interaction_modal.title.reply": "ตอบกลับโพสต์ของ {name}",
   "intervals.full.days": "{number, plural, other {# วัน}}",
   "intervals.full.hours": "{number, plural, other {# ชั่วโมง}}",
   "intervals.full.minutes": "{number, plural, other {# นาที}}",
@@ -221,7 +309,7 @@
   "keyboard_shortcuts.column": "โฟกัสคอลัมน์",
   "keyboard_shortcuts.compose": "โฟกัสพื้นที่เขียนข้อความ",
   "keyboard_shortcuts.description": "คำอธิบาย",
-  "keyboard_shortcuts.direct": "เปิดคอลัมน์ข้อความโดยตรง",
+  "keyboard_shortcuts.direct": "เพื่อเปิดคอลัมน์ข้อความโดยตรง",
   "keyboard_shortcuts.down": "ย้ายลงในรายการ",
   "keyboard_shortcuts.enter": "เปิดโพสต์",
   "keyboard_shortcuts.favourite": "ชื่นชอบโพสต์",
@@ -254,6 +342,8 @@
   "lightbox.expand": "ขยายกล่องดูภาพ",
   "lightbox.next": "ถัดไป",
   "lightbox.previous": "ก่อนหน้า",
+  "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
+  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของ {domain}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
   "lists.delete": "ลบรายการ",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
   "missing_indicator.label": "ไม่พบ",
   "missing_indicator.sublabel": "ไม่พบทรัพยากรนี้",
+  "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
   "mute_modal.duration": "ระยะเวลา",
   "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
   "mute_modal.indefinite": "ไม่มีกำหนด",
-  "navigation_bar.apps": "แอปมือถือ",
+  "navigation_bar.about": "เกี่ยวกับ",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
   "navigation_bar.community_timeline": "เส้นเวลาในเซิร์ฟเวอร์",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
+  "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
   "navigation_bar.follow_requests": "คำขอติดตาม",
   "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
-  "navigation_bar.info": "เกี่ยวกับเซิร์ฟเวอร์นี้",
-  "navigation_bar.keyboard_shortcuts": "ปุ่มลัด",
   "navigation_bar.lists": "รายการ",
   "navigation_bar.logout": "ออกจากระบบ",
   "navigation_bar.mutes": "ผู้ใช้ที่ซ่อนอยู่",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "โพสต์ที่ปักหมุด",
   "navigation_bar.preferences": "การกำหนดลักษณะ",
   "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
+  "navigation_bar.search": "ค้นหา",
   "navigation_bar.security": "ความปลอดภัย",
+  "not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องลงชื่อเข้าเพื่อเข้าถึงทรัพยากรนี้",
+  "notification.admin.report": "{name} ได้รายงาน {target}",
+  "notification.admin.sign_up": "{name} ได้ลงทะเบียน",
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
@@ -306,13 +400,16 @@
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.status": "{name} เพิ่งโพสต์",
+  "notification.update": "{name} ได้แก้ไขโพสต์",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
+  "notifications.column_settings.admin.report": "รายงานใหม่:",
+  "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
   "notifications.column_settings.favourite": "รายการโปรด:",
   "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
   "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
-  "notifications.column_settings.filter_bar.show": "แสดง",
+  "notifications.column_settings.filter_bar.show_bar": "แสดงแถบตัวกรอง",
   "notifications.column_settings.follow": "ผู้ติดตามใหม่:",
   "notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
   "notifications.column_settings.mention": "การกล่าวถึง:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "แสดงในคอลัมน์",
   "notifications.column_settings.sound": "เล่นเสียง",
   "notifications.column_settings.status": "โพสต์ใหม่:",
-  "notifications.column_settings.unread_markers.category": "เครื่องหมายการแจ้งเตือนที่ยังไม่ได้อ่าน",
+  "notifications.column_settings.unread_notifications.category": "การแจ้งเตือนที่ยังไม่ได้อ่าน",
+  "notifications.column_settings.unread_notifications.highlight": "เน้นการแจ้งเตือนที่ยังไม่ได้อ่าน",
+  "notifications.column_settings.update": "การแก้ไข:",
   "notifications.filter.all": "ทั้งหมด",
   "notifications.filter.boosts": "การดัน",
   "notifications.filter.favourites": "รายการโปรด",
@@ -333,12 +432,12 @@
   "notifications.grant_permission": "ให้สิทธิอนุญาต",
   "notifications.group": "{count} การแจ้งเตือน",
   "notifications.mark_as_read": "ทำเครื่องหมายทุกการแจ้งเตือนว่าอ่านแล้ว",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
+  "notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
+  "notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "ไม่พลาดสิ่งต่าง ๆ",
+  "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
+  "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
   "picture_in_picture.restore": "นำกลับมา",
   "poll.closed": "ปิดแล้ว",
   "poll.refresh": "รีเฟรช",
@@ -346,46 +445,102 @@
   "poll.total_votes": "{count, plural, other {# การลงคะแนน}}",
   "poll.vote": "ลงคะแนน",
   "poll.voted": "คุณได้ลงคะแนนให้กับคำตอบนี้",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, other {# การลงคะแนน}}",
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
   "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "โดยตรง",
+  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
   "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
   "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "ปรากฏแก่ทุกคน แสดงในเส้นเวลาสาธารณะ",
+  "privacy.public.long": "ปรากฏแก่ทั้งหมด",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ปรากฏแก่ทุกคน แต่ไม่อยู่ในเส้นเวลาสาธารณะ",
+  "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
   "privacy.unlisted.short": "ไม่อยู่ในรายการ",
+  "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
+  "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "refresh": "รีเฟรช",
   "regeneration_indicator.label": "กำลังโหลด…",
   "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
   "relative_time.days": "{number} วัน",
+  "relative_time.full.days": "{number, plural, other {# วัน}}ที่แล้ว",
+  "relative_time.full.hours": "{number, plural, other {# ชั่วโมง}}ที่แล้ว",
+  "relative_time.full.just_now": "เมื่อกี้นี้",
+  "relative_time.full.minutes": "{number, plural, other {# นาที}}ที่แล้ว",
+  "relative_time.full.seconds": "{number, plural, other {# วินาที}}ที่แล้ว",
   "relative_time.hours": "{number} ชั่วโมง",
   "relative_time.just_now": "ตอนนี้",
   "relative_time.minutes": "{number} นาที",
   "relative_time.seconds": "{number} วินาที",
   "relative_time.today": "วันนี้",
   "reply_indicator.cancel": "ยกเลิก",
+  "report.block": "ปิดกั้น",
+  "report.block_explanation": "คุณจะไม่เห็นโพสต์ของเขา เขาจะไม่สามารถเห็นโพสต์ของคุณหรือติดตามคุณ เขาจะสามารถบอกได้ว่ามีการปิดกั้นเขา",
+  "report.categories.other": "อื่น ๆ",
+  "report.categories.spam": "สแปม",
+  "report.categories.violation": "เนื้อหาละเมิดหนึ่งกฎของเซิร์ฟเวอร์หรือมากกว่า",
+  "report.category.subtitle": "เลือกที่ตรงกันที่สุด",
+  "report.category.title": "บอกเราถึงสิ่งที่กำลังเกิดขึ้นกับ {type} นี้",
+  "report.category.title_account": "โปรไฟล์",
+  "report.category.title_status": "โพสต์",
+  "report.close": "เสร็จสิ้น",
+  "report.comment.title": "มีสิ่งอื่นใดที่คุณคิดว่าเราควรทราบหรือไม่?",
   "report.forward": "ส่งต่อไปยัง {target}",
   "report.forward_hint": "บัญชีมาจากเซิร์ฟเวอร์อื่น ส่งสำเนาของรายงานที่ไม่ระบุตัวตนไปที่นั่นด้วย?",
-  "report.hint": "จะส่งรายงานไปยังผู้ควบคุมเซิร์ฟเวอร์ของคุณ คุณสามารถให้คำอธิบายเหตุผลที่คุณรายงานบัญชีนี้ได้ด้านล่าง:",
+  "report.mute": "ซ่อน",
+  "report.mute_explanation": "คุณจะไม่เห็นโพสต์ของเขา เขายังคงสามารถติดตามคุณและเห็นโพสต์ของคุณและจะไม่ทราบว่ามีการซ่อนเขา",
+  "report.next": "ถัดไป",
   "report.placeholder": "ความคิดเห็นเพิ่มเติม",
+  "report.reasons.dislike": "ฉันไม่ชอบโพสต์",
+  "report.reasons.dislike_description": "โพสต์ไม่ใช่บางอย่างที่คุณต้องการเห็น",
+  "report.reasons.other": "โพสต์เป็นอย่างอื่น",
+  "report.reasons.other_description": "ปัญหาไม่เข้าหมวดหมู่อื่น ๆ",
+  "report.reasons.spam": "โพสต์เป็นสแปม",
+  "report.reasons.spam_description": "ลิงก์ที่เป็นอันตราย, การมีส่วนร่วมปลอม หรือการตอบกลับซ้ำ ๆ",
+  "report.reasons.violation": "โพสต์ละเมิดกฎของเซิร์ฟเวอร์",
+  "report.reasons.violation_description": "คุณตระหนักว่าโพสต์แหกกฎเฉพาะ",
+  "report.rules.subtitle": "เลือกทั้งหมดที่นำไปใช้",
+  "report.rules.title": "กำลังละเมิดกฎใด?",
+  "report.statuses.subtitle": "เลือกทั้งหมดที่นำไปใช้",
+  "report.statuses.title": "มีโพสต์ใด ๆ ที่สนับสนุนรายงานนี้หรือไม่?",
   "report.submit": "ส่ง",
   "report.target": "กำลังรายงาน {target}",
+  "report.thanks.take_action": "นี่คือตัวเลือกของคุณสำหรับการควบคุมสิ่งที่คุณเห็นใน Mastodon:",
+  "report.thanks.take_action_actionable": "ขณะที่เราตรวจทานสิ่งนี้ คุณสามารถใช้การกระทำกับ @{name}:",
+  "report.thanks.title": "ไม่ต้องการเห็นสิ่งนี้?",
+  "report.thanks.title_actionable": "ขอบคุณสำหรับการรายงาน เราจะตรวจสอบสิ่งนี้",
+  "report.unfollow": "เลิกติดตาม @{name}",
+  "report.unfollow_explanation": "คุณกำลังติดตามบัญชีนี้ เพื่อไม่ให้เห็นโพสต์ของเขาในฟีดหน้าแรกของคุณอีกต่อไป เลิกติดตามเขา",
+  "report_notification.attached_statuses": "{count, plural, other {{count} โพสต์}}ที่แนบมา",
+  "report_notification.categories.other": "อื่น ๆ",
+  "report_notification.categories.spam": "สแปม",
+  "report_notification.categories.violation": "การละเมิดกฎ",
+  "report_notification.open": "รายงานที่เปิด",
   "search.placeholder": "ค้นหา",
+  "search.search_or_paste": "ค้นหาหรือวาง URL",
   "search_popout.search_format": "รูปแบบการค้นหาขั้นสูง",
-  "search_popout.tips.full_text": "ข้อความแบบง่ายส่งคืนโพสต์ที่คุณได้เขียน ชื่นชอบ ดัน หรือได้รับการกล่าวถึง ตลอดจนชื่อผู้ใช้, ชื่อที่แสดง และแฮชแท็กที่ตรงกัน",
+  "search_popout.tips.full_text": "ข้อความแบบง่ายส่งคืนโพสต์ที่คุณได้เขียน ชื่นชอบ ดัน หรือได้รับการกล่าวถึง เช่นเดียวกับชื่อผู้ใช้, ชื่อที่แสดง และแฮชแท็กที่ตรงกัน",
   "search_popout.tips.hashtag": "แฮชแท็ก",
   "search_popout.tips.status": "โพสต์",
   "search_popout.tips.text": "ข้อความแบบง่ายส่งคืนชื่อที่แสดง, ชื่อผู้ใช้ และแฮชแท็กที่ตรงกัน",
   "search_popout.tips.user": "ผู้ใช้",
   "search_results.accounts": "ผู้คน",
+  "search_results.all": "ทั้งหมด",
   "search_results.hashtags": "แฮชแท็ก",
+  "search_results.nothing_found": "ไม่พบสิ่งใดสำหรับคำค้นหาเหล่านี้",
   "search_results.statuses": "โพสต์",
   "search_results.statuses_fts_disabled": "ไม่มีการเปิดใช้งานการค้นหาโพสต์โดยเนื้อหาของโพสต์ในเซิร์ฟเวอร์ Mastodon นี้",
+  "search_results.title": "ค้นหาสำหรับ {q}",
   "search_results.total": "{count, number} {count, plural, other {ผลลัพธ์}}",
+  "server_banner.about_active_users": "ผู้คนที่ใช้เซิร์ฟเวอร์นี้ในระหว่าง 30 วันที่ผ่านมา (ผู้ใช้ที่ใช้งานอยู่รายเดือน)",
+  "server_banner.active_users": "ผู้ใช้ที่ใช้งานอยู่",
+  "server_banner.administered_by": "ดูแลโดย:",
+  "server_banner.introduction": "{domain} เป็นส่วนหนึ่งของเครือข่ายสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
+  "server_banner.learn_more": "เรียนรู้เพิ่มเติม",
+  "server_banner.server_stats": "สถิติเซิร์ฟเวอร์:",
+  "sign_in_banner.create_account": "สร้างบัญชี",
+  "sign_in_banner.sign_in": "ลงชื่อเข้า",
+  "sign_in_banner.text": "ลงชื่อเข้าเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แบ่งปัน และตอบกลับโพสต์ หรือโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
   "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
   "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
   "status.block": "ปิดกั้น @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "ลบ",
   "status.detailed_status": "มุมมองการสนทนาโดยละเอียด",
   "status.direct": "ส่งข้อความโดยตรงถึง @{name}",
+  "status.edit": "แก้ไข",
+  "status.edited": "แก้ไขเมื่อ {date}",
+  "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
   "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
+  "status.filter": "กรองโพสต์นี้",
   "status.filtered": "กรองอยู่",
+  "status.hide": "ซ่อนโพสต์",
+  "status.history.created": "{name} ได้สร้างเมื่อ {date}",
+  "status.history.edited": "{name} ได้แก้ไขเมื่อ {date}",
   "status.load_more": "โหลดเพิ่มเติม",
   "status.media_hidden": "ซ่อนสื่ออยู่",
   "status.mention": "กล่าวถึง @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
   "status.redraft": "ลบแล้วร่างใหม่",
   "status.remove_bookmark": "เอาที่คั่นหน้าออก",
+  "status.replied_to": "ตอบกลับ {name}",
   "status.reply": "ตอบกลับ",
   "status.replyAll": "ตอบกลับกระทู้",
   "status.report": "รายงาน @{name}",
   "status.sensitive_warning": "เนื้อหาที่ละเอียดอ่อน",
   "status.share": "แบ่งปัน",
+  "status.show_filter_reason": "แสดงต่อไป",
   "status.show_less": "แสดงน้อยลง",
   "status.show_less_all": "แสดงน้อยลงทั้งหมด",
   "status.show_more": "แสดงเพิ่มเติม",
   "status.show_more_all": "แสดงเพิ่มเติมทั้งหมด",
-  "status.show_thread": "แสดงกระทู้",
+  "status.show_original": "แสดงดั้งเดิม",
+  "status.translate": "แปล",
+  "status.translated_from_with": "แปลจาก {lang} โดยใช้ {provider}",
   "status.uncached_media_warning": "ไม่พร้อมใช้งาน",
   "status.unmute_conversation": "เลิกซ่อนการสนทนา",
   "status.unpin": "ถอนหมุดจากโปรไฟล์",
+  "subscribed_languages.lead": "เฉพาะโพสต์ในภาษาที่เลือกเท่านั้นที่จะปรากฏในเส้นเวลาหน้าแรกและรายการหลังจากการเปลี่ยนแปลง เลือก ไม่มี เพื่อรับโพสต์ในภาษาทั้งหมด",
+  "subscribed_languages.save": "บันทึกการเปลี่ยนแปลง",
+  "subscribed_languages.target": "เปลี่ยนภาษาที่บอกรับสำหรับ {target}",
   "suggestions.dismiss": "ปิดข้อเสนอแนะ",
   "suggestions.header": "คุณอาจสนใจ…",
   "tabs_bar.federated_timeline": "ที่ติดต่อกับภายนอก",
   "tabs_bar.home": "หน้าแรก",
   "tabs_bar.local_timeline": "ในเซิร์ฟเวอร์",
   "tabs_bar.notifications": "การแจ้งเตือน",
-  "tabs_bar.search": "ค้นหา",
   "time_remaining.days": "เหลืออีก {number, plural, other {# วัน}}",
   "time_remaining.hours": "เหลืออีก {number, plural, other {# ชั่วโมง}}",
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "ผู้ติดตาม",
   "timeline_hint.resources.follows": "การติดตาม",
   "timeline_hint.resources.statuses": "โพสต์ที่เก่ากว่า",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} คน}}กำลังพูดคุย",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} คน}}ใน {days, plural, other {{days} วัน}}ที่ผ่านมา",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
   "units.short.billion": "{count} พันล้าน",
@@ -454,15 +622,16 @@
   "upload_button.label": "เพิ่มไฟล์ภาพ, วิดีโอ หรือเสียง",
   "upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์",
   "upload_error.poll": "ไม่อนุญาตให้อัปโหลดไฟล์กับการลงคะแนน",
-  "upload_form.audio_description": "อธิบายสำหรับผู้สูญเสียการได้ยิน",
+  "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้บกพร่องทางการมองเห็น",
+  "upload_form.description_missing": "ไม่มีการเพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
   "upload_form.undo": "ลบ",
-  "upload_form.video_description": "อธิบายสำหรับผู้สูญเสียการได้ยินหรือบกพร่องทางการมองเห็น",
+  "upload_form.video_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยินหรือบกพร่องทางการมองเห็น",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "กำลังนำไปใช้…",
   "upload_modal.choose_image": "เลือกภาพ",
   "upload_modal.description_placeholder": "สุนัขจิ้งจอกสีน้ำตาลที่ว่องไวกระโดดข้ามสุนัขขี้เกียจ",
   "upload_modal.detect_text": "ตรวจหาข้อความจากรูปภาพ",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "กำลังเตรียม OCR…",
   "upload_modal.preview_label": "ตัวอย่าง ({ratio})",
   "upload_progress.label": "กำลังอัปโหลด...",
+  "upload_progress.processing": "กำลังประมวลผล…",
   "video.close": "ปิดวิดีโอ",
   "video.download": "ดาวน์โหลดไฟล์",
   "video.exit_fullscreen": "ออกจากเต็มหน้าจอ",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 2ae8a908a..ffa439db9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Denetlenen sunucular",
+  "about.contact": "İletişim:",
+  "about.disclaimer": "Mastodon özgür, açık kaynak bir yazılımdır ve Mastodon gGmbH şirketinin ticari markasıdır.",
+  "about.domain_blocks.no_reason_available": "Gerekçe mevcut değil",
+  "about.domain_blocks.preamble": "Mastodon, genel olarak fediverse'teki herhangi bir sunucudan içerik görüntülemenize ve kullanıcılarıyla etkileşim kurmanıza izin verir. Bunlar, bu sunucuda yapılmış olan istisnalardır.",
+  "about.domain_blocks.silenced.explanation": "Açık bir şekilde aramadığınız veya takip ederek abone olmadığınız sürece, bu sunucudaki profilleri veya içerikleri genelde göremeyeceksiniz.",
+  "about.domain_blocks.silenced.title": "Sınırlı",
+  "about.domain_blocks.suspended.explanation": "Bu sunucudaki hiçbir veri işlenmeyecek, saklanmayacak veya değiş tokuş edilmeyecektir, dolayısıyla bu sunucudaki kullanıcılarla herhangi bir etkileşim veya iletişim imkansız olacaktır.",
+  "about.domain_blocks.suspended.title": "Askıya alındı",
+  "about.not_available": "Bu sunucuda bu bilgi kullanıma sunulmadı.",
+  "about.powered_by": "{mastodon} destekli merkeziyetsiz sosyal medya",
+  "about.rules": "Sunucu kuralları",
   "account.account_note_header": "Not",
   "account.add_or_remove_from_list": "Listelere ekle veya kaldır",
   "account.badges.bot": "Bot",
@@ -7,68 +19,90 @@
   "account.block_domain": "{domain} alan adını engelle",
   "account.blocked": "Engellendi",
   "account.browse_more_on_origin_server": "Orijinal profilde daha fazlasına göz atın",
-  "account.cancel_follow_request": "Takip isteğini iptal et",
+  "account.cancel_follow_request": "Takip isteğini geri çek",
   "account.direct": "@{name} adlı kişiye mesaj gönder",
-  "account.disable_notifications": "@{name} gönderi atınca bana bildirmeyi durdur",
+  "account.disable_notifications": "@{name} kişisinin gönderi bildirimlerini kapat",
   "account.domain_blocked": "Alan adı engellendi",
   "account.edit_profile": "Profili düzenle",
-  "account.enable_notifications": "@{name} gönderi atınca bana bildir",
-  "account.endorse": "Profildeki özellik",
+  "account.enable_notifications": "@{name} kişisinin gönderi bildirimlerini aç",
+  "account.endorse": "Profilimde öne çıkar",
+  "account.featured_tags.last_status_at": "Son gönderinin tarihi {date}",
+  "account.featured_tags.last_status_never": "Gönderi yok",
+  "account.featured_tags.title": "{name} kişisinin öne çıkan etiketleri",
   "account.follow": "Takip et",
   "account.followers": "Takipçi",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
   "account.followers_counter": "{count, plural, one {{counter} Takipçi} other {{counter} Takipçi}}",
+  "account.following": "Takip Ediliyor",
   "account.following_counter": "{count, plural, one {{counter} Takip Edilen} other {{counter} Takip Edilen}}",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
+  "account.go_to_profile": "Profile git",
   "account.hide_reblogs": "@{name} kişisinin boostlarını gizle",
-  "account.joined": "{date} tarihinde katıldı",
-  "account.last_status": "Son etkinlik",
-  "account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde kontrol edildi",
-  "account.locked_info": "Bu hesabın gizlilik durumu kilitli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini elle inceliyor.",
+  "account.joined_short": "Katıldı",
+  "account.languages": "Abone olunan dilleri değiştir",
+  "account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde denetlendi",
+  "account.locked_info": "Bu hesabın gizlilik durumu gizli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini manuel olarak onaylıyor.",
   "account.media": "Medya",
   "account.mention": "@{name} kişisinden bahset",
-  "account.moved_to": "{name} şuraya taşındı:",
+  "account.moved_to": "{name} yeni hesabının artık şu olduğunu belirtti:",
   "account.mute": "@{name} adlı kişiyi sessize al",
-  "account.mute_notifications": "@{name} adlı kişinin bildirimlerini kapat",
+  "account.mute_notifications": "@{name}'in bildirimlerini sustur",
   "account.muted": "Susturuldu",
-  "account.never_active": "Asla",
+  "account.open_original_page": "Asıl sayfayı aç",
   "account.posts": "Gönderiler",
   "account.posts_with_replies": "Gönderiler ve yanıtlar",
   "account.report": "@{name} adlı kişiyi bildir",
   "account.requested": "Onay bekleniyor. Takip isteğini iptal etmek için tıklayın",
+  "account.requested_follow": "{name} size takip isteği gönderdi",
   "account.share": "@{name} adlı kişinin profilini paylaş",
   "account.show_reblogs": "@{name} kişisinin boostlarını göster",
   "account.statuses_counter": "{count, plural, one {{counter} Gönderi} other {{counter} Gönderi}}",
-  "account.unblock": "@{name} adlı kişinin engelini kaldır",
+  "account.unblock": "@{name}'in engelini kaldır",
   "account.unblock_domain": "{domain} alan adının engelini kaldır",
-  "account.unendorse": "Profilde gösterme",
+  "account.unblock_short": "Engeli kaldır",
+  "account.unendorse": "Profilimde öne çıkarma",
   "account.unfollow": "Takibi bırak",
   "account.unmute": "@{name} adlı kişinin sesini aç",
   "account.unmute_notifications": "@{name} adlı kişinin bildirimlerini aç",
+  "account.unmute_short": "Susturmayı kaldır",
   "account_note.placeholder": "Not eklemek için tıklayın",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Kayıttan sonra günlük kullanıcı saklama oranı",
+  "admin.dashboard.monthly_retention": "Kayıttan sonra aylık kullanıcı saklama oranı",
+  "admin.dashboard.retention.average": "Ortalama",
+  "admin.dashboard.retention.cohort": "Kayıt ayı",
+  "admin.dashboard.retention.cohort_size": "Yeni kullanıcılar",
   "alert.rate_limited.message": "Lütfen {retry_time, time, medium} süresinden sonra tekrar deneyin.",
   "alert.rate_limited.title": "Oran sınırlıdır",
   "alert.unexpected.message": "Beklenmedik bir hata oluştu.",
   "alert.unexpected.title": "Hay aksi!",
   "announcement.announcement": "Duyuru",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(işlenmemiş)",
+  "audio.hide": "Sesi gizle",
   "autosuggest_hashtag.per_week": "Haftada {count}",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
-  "bundle_column_error.body": "Bu bileşen yüklenirken bir şeyler ters gitti.",
+  "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
+  "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
+  "bundle_column_error.error.title": "Ah, hayır!",
+  "bundle_column_error.network.body": "Sayfayı yüklemeye çalışırken bir hata oluştu. Bu durum internet bağlantınızdaki veya bu sunucudaki geçici bir sorundan kaynaklanıyor olabilir.",
+  "bundle_column_error.network.title": "Ağ hatası",
   "bundle_column_error.retry": "Tekrar deneyin",
-  "bundle_column_error.title": "Ağ hatası",
+  "bundle_column_error.return": "Anasayfaya geri dön",
+  "bundle_column_error.routing.body": "İstenen sayfa bulunamadı. Adres çubuğundaki URL'nin doğru olduğundan emin misiniz?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Kapat",
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
+  "closed_registrations.other_server_instructions": "Mastodon merkeziyetsiz olduğu için, başka bir sunucuda bir hesap oluşturabilir ve bu sunucuyla etkileşimde bulunmaya devam edebilirsiniz.",
+  "closed_registrations_modal.description": "{domain} adresinde hesap oluşturmak şu an mümkün değil ancak unutmayın ki Mastodon kullanmak için özellikle {domain} adresinde hesap oluşturmanız gerekmez.",
+  "closed_registrations_modal.find_another_server": "Başka sunucu bul",
+  "closed_registrations_modal.preamble": "Mastodon merkeziyetsizdir, bu yüzden hesabınızı nerede oluşturursanız oluşturun, bu sunucudaki herhangi birini takip edebilecek veya onunla etkileşebileceksiniz. Hatta kendi sunucunuzu bile barındırabilirsiniz!",
+  "closed_registrations_modal.title": "Mastodon'a kayıt olmak",
+  "column.about": "Hakkında",
   "column.blocks": "Engellenen kullanıcılar",
-  "column.bookmarks": "Yer İmleri",
+  "column.bookmarks": "Yer İşaretleri",
   "column.community": "Yerel zaman tüneli",
-  "column.direct": "Direkt Mesajlar",
+  "column.direct": "Doğrudan iletiler",
   "column.directory": "Profillere göz at",
   "column.domain_blocks": "Engellenen alan adları",
   "column.favourites": "Favoriler",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Sadece yerel",
   "community.column_settings.media_only": "Sadece medya",
   "community.column_settings.remote_only": "Sadece uzak",
-  "compose_form.direct_message_warning": "Bu gönderi sadece belirtilen kullanıcılara gönderilecektir.",
+  "compose.language.change": "Dili değiştir",
+  "compose.language.search": "Dilleri ara...",
   "compose_form.direct_message_warning_learn_more": "Daha fazla bilgi edinin",
+  "compose_form.encryption_warning": "Mastodon gönderileri uçtan uca şifrelemeli değildir. Hassas olabilecek herhangi bir bilgiyi Mastodon'da paylaşmayın.",
   "compose_form.hashtag_warning": "Bu gönderi liste dışı olduğu için hiç bir etikette yer almayacak. Sadece herkese açık gönderiler etiketlerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Bu seçeneği kaldır",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
-  "compose_form.publish": "Tootla",
+  "compose_form.publish": "Yayınla",
+  "compose_form.publish_form": "Yayınla",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Değişiklikleri kaydet",
   "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
   "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
   "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istediğinden emin misin?",
+  "confirmations.cancel_follow_request.confirm": "İsteği geri çek",
+  "confirmations.cancel_follow_request.message": "{name} kişisini takip etme isteğini geri çekmek istediğinden emin misin?",
   "confirmations.delete.confirm": "Sil",
   "confirmations.delete.message": "Bu tootu silmek istediğinden emin misin?",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Vazgeç",
+  "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
   "confirmations.domain_block.confirm": "Alanın tamamını engelle",
   "confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
   "confirmations.logout.confirm": "Oturumu kapat",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Okundu olarak işaretle",
   "conversation.open": "Sohbeti görüntüle",
   "conversation.with": "{names} ile",
+  "copypaste.copied": "Kopyalandı",
+  "copypaste.copy": "Kopyala",
   "directory.federated": "Bilinen fediverse'lerden",
   "directory.local": "Yalnızca {domain} adresinden",
   "directory.new_arrivals": "Yeni gelenler",
   "directory.recently_active": "Son zamanlarda aktif",
+  "disabled_account_banner.account_settings": "Hesap ayarları",
+  "disabled_account_banner.text": "{disabledAccount} hesabınız şu an devre dışı.",
+  "dismissable_banner.community_timeline": "Bunlar, {domain} sunucusunda hesabı olanların yakın zamandaki herkese açık gönderileridir.",
+  "dismissable_banner.dismiss": "Yoksay",
+  "dismissable_banner.explore_links": "Bu haberler, merkeziyetsiz ağın bu ve diğer sunucularındaki insanlar tarafından şimdilerde konuşuluyor.",
+  "dismissable_banner.explore_statuses": "Merkeziyetsiz ağın bu ve diğer sunucularındaki bu gönderiler, mevcut sunucuda şimdilerde ilgi çekiyorlar.",
+  "dismissable_banner.explore_tags": "Bu etiketler, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların şimdilerde ilgisini çekiyor.",
+  "dismissable_banner.public_timeline": "Bunlar, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların son zamanlardaki herkese açık gönderilerinden bu sunucunun haberdar olduklarıdır.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "embed.preview": "İşte nasıl görüneceği:",
   "emoji_button.activity": "Aktivite",
+  "emoji_button.clear": "Temizle",
   "emoji_button.custom": "Özel",
   "emoji_button.flags": "Bayraklar",
   "emoji_button.food": "Yiyecek ve İçecek",
@@ -163,16 +214,17 @@
   "empty_column.blocks": "Henüz herhangi bir kullanıcıyı engellemedin.",
   "empty_column.bookmarked_statuses": "Henüz yer imine eklediğin toot yok. Bir tanesi yer imine eklendiğinde burada görünür.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
-  "empty_column.direct": "Henüz direkt mesajın yok. Bir tane gönderdiğinde veya aldığında burada görünür.",
-  "empty_column.domain_blocks": "Henüz hiçbir gizli alan adı yok.",
+  "empty_column.direct": "Henüz doğrudan iletiniz yok. Bir tane gönderdiğinizde veya aldığınız burada listelenecekler.",
+  "empty_column.domain_blocks": "Henüz engellenmiş bir alan adı yok.",
+  "empty_column.explore_statuses": "Şu an öne çıkan birşey yok. Daha sonra tekrar bakın!",
   "empty_column.favourited_statuses": "Favori tootun yok. Favori tootun olduğunda burada görünür.",
   "empty_column.favourites": "Kimse bu gönderiyi favorilerine eklememiş. Biri eklediğinde burada görünecek.",
   "empty_column.follow_recommendations": "Öyle görünüyor ki sizin için hiçbir öneri oluşturulamıyor. Tanıdığınız kişileri aramak için aramayı kullanabilir veya öne çıkanlara bakabilirsiniz.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
-  "empty_column.hashtag": "Henüz bu hashtag’e sahip hiçbir gönderi yok.",
+  "empty_column.hashtag": "Henüz bu etikete sahip hiçbir gönderi yok.",
   "empty_column.home": "Ana zaman tünelin boş! Akışını doldurmak için daha fazla kişiyi takip et. {suggestions}",
   "empty_column.home.suggestions": "Bazı önerileri görün",
-  "empty_column.list": "Bu listede henüz hiçbir şey yok.",
+  "empty_column.list": "Henüz bu listede bir şey yok. Bu listenin üyeleri bir şey paylaşığında burada gözükecek.",
   "empty_column.lists": "Henüz listen yok. Liste oluşturduğunda burada görünür.",
   "empty_column.mutes": "Henüz bir kullanıcıyı sessize almadınız.",
   "empty_column.notifications": "Henüz bildiriminiz yok. Sohbete başlamak için başkalarıyla etkileşim kurun.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Bunları devre dışı bırakmayı ve sayfayı yenilemeyi deneyin. Bu yardımcı olmazsa, Mastodon'u başka bir tarayıcı veya yerel uygulama aracılığıyla kullanabilirsiniz.",
   "errors.unexpected_crash.copy_stacktrace": "Yığın izlemeyi (stacktrace) panoya kopyala",
   "errors.unexpected_crash.report_issue": "Sorun bildir",
+  "explore.search_results": "Arama sonuçları",
+  "explore.suggested_follows": "Sizin için",
+  "explore.title": "Keşfet",
+  "explore.trending_links": "Haberler",
+  "explore.trending_statuses": "Gönderiler",
+  "explore.trending_tags": "Etiketler",
+  "filter_modal.added.context_mismatch_explanation": "Bu filtre kategorisi, bu gönderide eriştiğin bağlama uymuyor. Eğer gönderinin bu bağlamda da filtrelenmesini istiyorsanız, filtreyi düzenlemeniz gerekiyor.",
+  "filter_modal.added.context_mismatch_title": "Bağlam uyumsuzluğu!",
+  "filter_modal.added.expired_explanation": "Bu filtre kategorisinin süresi dolmuş, filtreyi uygulamak için bitiş tarihini değiştirmeniz gerekiyor.",
+  "filter_modal.added.expired_title": "Süresi dolmuş filtre!",
+  "filter_modal.added.review_and_configure": "Bu filtre kategorisini gözden geçirmek ve daha ayrıntılı bir şekilde yapılandırmak için {settings_link} adresine gidin.",
+  "filter_modal.added.review_and_configure_title": "Filtre ayarları",
+  "filter_modal.added.settings_link": "ayarlar sayfası",
+  "filter_modal.added.short_explanation": "Bu gönderi şu filtre kategorisine eklendi: {title}.",
+  "filter_modal.added.title": "Filtre eklendi!",
+  "filter_modal.select_filter.context_mismatch": "bu bağlama uymuyor",
+  "filter_modal.select_filter.expired": "süresi dolmuş",
+  "filter_modal.select_filter.prompt_new": "Yeni kategori: {name}",
+  "filter_modal.select_filter.search": "Ara veya oluştur",
+  "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
+  "filter_modal.select_filter.title": "Bu gönderiyi filtrele",
+  "filter_modal.title.status": "Bir gönderi filtrele",
   "follow_recommendations.done": "Tamam",
   "follow_recommendations.heading": "Gönderilerini görmek isteyeceğiniz kişileri takip edin! Burada bazı öneriler bulabilirsiniz.",
   "follow_recommendations.lead": "Takip ettiğiniz kişilerin gönderileri anasayfa akışınızda kronolojik sırada görünmeye devam edecek. Hata yapmaktan çekinmeyin, kişileri istediğiniz anda kolayca takipten çıkabilirsiniz!",
   "follow_request.authorize": "İzin Ver",
   "follow_request.reject": "Reddet",
   "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa bile, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
+  "footer.about": "Hakkında",
+  "footer.directory": "Profil dizini",
+  "footer.get_app": "Uygulamayı indir",
+  "footer.invite": "İnsanları davet et",
+  "footer.keyboard_shortcuts": "Klavye kısayolları",
+  "footer.privacy_policy": "Gizlilik politikası",
+  "footer.source_code": "Kaynak kodu görüntüle",
   "generic.saved": "Kaydedildi",
-  "getting_started.developers": "Geliştiriciler",
-  "getting_started.directory": "Profil Dizini",
-  "getting_started.documentation": "Belgeler",
   "getting_started.heading": "Başlarken",
-  "getting_started.invite": "İnsanları davet et",
-  "getting_started.open_source_notice": "Mastodon açık kaynaklı bir yazılımdır. GitHub'taki {github} üzerinden katkıda bulunabilir veya sorunları bildirebilirsiniz.",
-  "getting_started.security": "Hesap ayarları",
-  "getting_started.terms": "Kullanım şartları",
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
@@ -207,31 +281,45 @@
   "hashtag.column_settings.tag_mode.any": "Herhangi biri",
   "hashtag.column_settings.tag_mode.none": "Bunların hiçbiri",
   "hashtag.column_settings.tag_toggle": "Bu sütundaki ek etiketleri içer",
+  "hashtag.follow": "Etiketi takip et",
+  "hashtag.unfollow": "Etiketi takibi bırak",
   "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Boostları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
   "home.hide_announcements": "Duyuruları gizle",
   "home.show_announcements": "Duyuruları göster",
+  "interaction_modal.description.favourite": "Mastodon'da bir hesapla, bu gönderiyi, yazarın onu beğendiğinizi bilmesi ve daha sonrası saklamak için beğenebilirsiniz.",
+  "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.",
+  "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için yükseltebilirsiniz.",
+  "interaction_modal.description.reply": "Mastodon'daki bir hesapla, bu gönderiye yanıt verebilirsiniz.",
+  "interaction_modal.on_another_server": "Farklı bir sunucuda",
+  "interaction_modal.on_this_server": "Bu sunucuda",
+  "interaction_modal.other_server_instructions": "Bu URL'yi kopyalayın ve Mastodon sunucunuzun web arayüzündeki veya gözde Mastodon uygulamanızdaki arama sahasına yapıştırın.",
+  "interaction_modal.preamble": "Mastodon merkeziyetsiz olduğu için, bu sunucuda bir hesabınız yoksa bile başka bir Mastodon sunucusunda veya uyumlu bir platformda barındırılan mevcut hesabınızı kullanabilirsiniz.",
+  "interaction_modal.title.favourite": "{name} kişisinin gönderisini favorilerine ekle",
+  "interaction_modal.title.follow": "{name} kişisini takip et",
+  "interaction_modal.title.reblog": "{name} kişisinin gönderisini yükselt",
+  "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
   "keyboard_shortcuts.back": "geriye gitmek için",
   "keyboard_shortcuts.blocked": "engellenen kullanıcılar listesini açmak için",
-  "keyboard_shortcuts.boost": "Gönderiyi teşvik et",
+  "keyboard_shortcuts.boost": "gönderiyi boostla",
   "keyboard_shortcuts.column": "sütunlardan birindeki duruma odaklanmak için",
   "keyboard_shortcuts.compose": "yazma alanına odaklanmak için",
   "keyboard_shortcuts.description": "Açıklama",
-  "keyboard_shortcuts.direct": "direkt mesajlar sütununu açmak için",
+  "keyboard_shortcuts.direct": "doğrudan iletiler sütununu açmak için",
   "keyboard_shortcuts.down": "listede aşağıya inmek için",
-  "keyboard_shortcuts.enter": "Gönderiyi aç",
-  "keyboard_shortcuts.favourite": "Gönderiyi beğen",
-  "keyboard_shortcuts.favourites": "favoriler listesini açmak için",
-  "keyboard_shortcuts.federated": "federe edilmiş zaman tünelini açmak için",
+  "keyboard_shortcuts.enter": "gönderiyi aç",
+  "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
+  "keyboard_shortcuts.favourites": "Favoriler listesini aç",
+  "keyboard_shortcuts.federated": "federe akışı aç",
   "keyboard_shortcuts.heading": "Klavye kısayolları",
-  "keyboard_shortcuts.home": "anasayfa zaman çizelgesini açmak için",
+  "keyboard_shortcuts.home": "ana akışı aç",
   "keyboard_shortcuts.hotkey": "Kısayol tuşu",
   "keyboard_shortcuts.legend": "bu efsaneyi görüntülemek için",
-  "keyboard_shortcuts.local": "yerel zaman tünelini açmak için",
+  "keyboard_shortcuts.local": "yerel akışı aç",
   "keyboard_shortcuts.mention": "yazardan bahsetmek için",
   "keyboard_shortcuts.muted": "sessize alınmış kullanıcı listesini açmak için",
   "keyboard_shortcuts.my_profile": "profilinizi açmak için",
@@ -239,7 +327,7 @@
   "keyboard_shortcuts.open_media": "medyayı açmak için",
   "keyboard_shortcuts.pinned": "Sabitlenmiş gönderilerin listesini aç",
   "keyboard_shortcuts.profile": "yazarın profilini açmak için",
-  "keyboard_shortcuts.reply": "Gönderiyi yanıtla",
+  "keyboard_shortcuts.reply": "gönderiyi yanıtla",
   "keyboard_shortcuts.requests": "takip istekleri listesini açmak için",
   "keyboard_shortcuts.search": "aramaya odaklanmak için",
   "keyboard_shortcuts.spoilers": "CW alanını göstermek/gizlemek için",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Resim görüntüleme kutusunu genişlet",
   "lightbox.next": "Sonraki",
   "lightbox.previous": "Önceki",
+  "limited_account_hint.action": "Yine de profili göster",
+  "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
   "lists.delete": "Listeyi sil",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
   "missing_indicator.label": "Bulunamadı",
   "missing_indicator.sublabel": "Bu kaynak bulunamadı",
+  "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
   "mute_modal.duration": "Süre",
   "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
   "mute_modal.indefinite": "Belirsiz",
-  "navigation_bar.apps": "Mobil uygulamalar",
+  "navigation_bar.about": "Hakkında",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
-  "navigation_bar.bookmarks": "Yer İmleri",
+  "navigation_bar.bookmarks": "Yer İşaretleri",
   "navigation_bar.community_timeline": "Yerel Zaman Tüneli",
   "navigation_bar.compose": "Yeni gönderi yaz",
-  "navigation_bar.direct": "Direkt Mesajlar",
+  "navigation_bar.direct": "Doğrudan iletiler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
   "navigation_bar.edit_profile": "Profili düzenle",
+  "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favoriler",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.follows_and_followers": "Takip edilenler ve takipçiler",
-  "navigation_bar.info": "Bu sunucu hakkında",
-  "navigation_bar.keyboard_shortcuts": "Klavye kısayolları",
   "navigation_bar.lists": "Listeler",
   "navigation_bar.logout": "Oturumu kapat",
   "navigation_bar.mutes": "Sessize alınmış kullanıcılar",
@@ -297,22 +387,29 @@
   "navigation_bar.pins": "Sabitlenmiş gönderiler",
   "navigation_bar.preferences": "Tercihler",
   "navigation_bar.public_timeline": "Federe zaman tüneli",
+  "navigation_bar.search": "Arama",
   "navigation_bar.security": "Güvenlik",
-  "notification.favourite": "{name} gönderini beğendi",
+  "not_signed_in_indicator.not_signed_in": "Bu kaynağa erişmek için oturum açmanız gerekir.",
+  "notification.admin.report": "{name}, {target} kişisini bildirdi",
+  "notification.admin.sign_up": "{name} kaydoldu",
+  "notification.favourite": "{name} gönderini favorilerine ekledi",
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
   "notification.mention": "{name} senden bahsetti",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
-  "notification.reblog": "{name} gönderini teşvik etti",
+  "notification.reblog": "{name} gönderini boostladı",
   "notification.status": "{name} az önce gönderdi",
+  "notification.update": "{name} bir gönderiyi düzenledi",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
+  "notifications.column_settings.admin.report": "Yeni bildirimler:",
+  "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
-  "notifications.column_settings.favourite": "Beğeniler:",
+  "notifications.column_settings.favourite": "Favoriler:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
-  "notifications.column_settings.filter_bar.show": "Göster",
+  "notifications.column_settings.filter_bar.show_bar": "Süzme çubuğunu göster",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
   "notifications.column_settings.mention": "Bahsetmeler:",
@@ -322,10 +419,12 @@
   "notifications.column_settings.show": "Sütunda göster",
   "notifications.column_settings.sound": "Ses çal",
   "notifications.column_settings.status": "Yeni gönderiler:",
-  "notifications.column_settings.unread_markers.category": "Okunmamış bildirim işaretleri",
+  "notifications.column_settings.unread_notifications.category": "Okunmamış bildirimler",
+  "notifications.column_settings.unread_notifications.highlight": "Okunmamış bildirimleri öne çıkar",
+  "notifications.column_settings.update": "Düzenlemeler:",
   "notifications.filter.all": "Tümü",
   "notifications.filter.boosts": "Boostlar",
-  "notifications.filter.favourites": "Beğeniler",
+  "notifications.filter.favourites": "Favoriler",
   "notifications.filter.follows": "Takip edilenler",
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
@@ -346,95 +445,164 @@
   "poll.total_votes": "{count, plural, one {# oy} other {# oy}}",
   "poll.vote": "Oy ver",
   "poll.voted": "Bu cevap için oy kullandınız",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# oy} other {# oy}}",
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
   "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Direkt",
+  "privacy.direct.short": "Sadece bahsedilen kişiler",
   "privacy.private.long": "Sadece takipçiler için görünür",
   "privacy.private.short": "Sadece takipçiler",
-  "privacy.public.long": "Herkese görünür, herkese açık zaman çizelgelerinde gösterilir",
+  "privacy.public.long": "Herkese açık",
   "privacy.public.short": "Herkese açık",
-  "privacy.unlisted.long": "Herkese görünür, ancak genel zaman çizelgelerinde gösterilmez",
+  "privacy.unlisted.long": "Keşfet harici herkese açık",
   "privacy.unlisted.short": "Listelenmemiş",
+  "privacy_policy.last_updated": "Son güncelleme {date}",
+  "privacy_policy.title": "Gizlilik Politikası",
   "refresh": "Yenile",
   "regeneration_indicator.label": "Yükleniyor…",
   "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
   "relative_time.days": "{number}g",
-  "relative_time.hours": "{number}sa",
+  "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce",
+  "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce",
+  "relative_time.full.just_now": "şimdi",
+  "relative_time.full.minutes": "{number, plural, one {# dakika} other {# dakika}} önce",
+  "relative_time.full.seconds": "{number, plural, one {# saniye} other {# saniye}} önce",
+  "relative_time.hours": "{number}s",
   "relative_time.just_now": "şimdi",
   "relative_time.minutes": "{number}dk",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
   "reply_indicator.cancel": "İptal",
+  "report.block": "Engelle",
+  "report.block_explanation": "Gönderilerini göremeyeceksiniz. Gönderilerinizi göremezler veya sizi takip edemezler. Engelli olduklarını anlayabilecekler.",
+  "report.categories.other": "Diğer",
+  "report.categories.spam": "İstenmeyen",
+  "report.categories.violation": "İçerik bir veya daha fazla sunucu kuralını ihlal ediyor",
+  "report.category.subtitle": "En uygun eşleşmeyi seçin",
+  "report.category.title": "Bu {type} ile ilgili neler oluyor bize söyleyin",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "gönderi",
+  "report.close": "Tamam",
+  "report.comment.title": "Bilmemizi istediğiniz başka bir şey var mı?",
   "report.forward": "{target} ilet",
   "report.forward_hint": "Hesap başka bir sunucudan. Raporun anonim bir kopyası da oraya gönderilsin mi?",
-  "report.hint": "Bu rapor sunucu moderatörlerine gönderilecek. Bu hesabı neden bildirdiğiniz hakkında bilgi verebirsiniz:",
+  "report.mute": "Sessiz",
+  "report.mute_explanation": "Gönderilerini göremeyeceksiniz. Sizi takip etmeyi sürdürebilir ve gönderilerinizi görebilirler ama sessize alındıklarını anlamayacaklar.",
+  "report.next": "Sonraki",
   "report.placeholder": "Ek yorumlar",
+  "report.reasons.dislike": "Beğenmedim",
+  "report.reasons.dislike_description": "Görmek isteyeceğiniz bir şey değil",
+  "report.reasons.other": "Başka bir şey",
+  "report.reasons.other_description": "Sorun başka kategorilere uymuyor",
+  "report.reasons.spam": "İstenmeyen",
+  "report.reasons.spam_description": "Kötü niyetli bağlantılar, sahte etkileşim veya tekrarlayan yanıtlar",
+  "report.reasons.violation": "Sunucu kurallarını ihlal ediyor",
+  "report.reasons.violation_description": "Belirli kuralları ihlal ettiğinin farkındasınız",
+  "report.rules.subtitle": "Geçerli olanların hepsini seçin",
+  "report.rules.title": "Hangi kurallar ihlal ediliyor?",
+  "report.statuses.subtitle": "Geçerli olanların hepsini seçin",
+  "report.statuses.title": "Bu bildirimi destekleyecek herhangi bir gönderi var mı?",
   "report.submit": "Gönder",
   "report.target": "{target} Bildiriliyor",
+  "report.thanks.take_action": "Mastodon'da ne görebileceğinizi denetlemeye ilişkin seçenekler şunlardır:",
+  "report.thanks.take_action_actionable": "Biz değerlendirirken, @{name} hesabına yönelik bir şeyler yapabilirsiniz:",
+  "report.thanks.title": "Bunu görmek istemiyor musunuz?",
+  "report.thanks.title_actionable": "Bildirdiğiniz için teşekkürler, konuyu araştıracağız.",
+  "report.unfollow": "@{name} takip etmeyi bırak",
+  "report.unfollow_explanation": "Bu hesabı takip ediyorsunuz. Ana akışınızda gönderilerini görmek istemiyorsanız, onu takip etmeyi bırakın.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} gönderi} other {{count} gönderi}} eklendi",
+  "report_notification.categories.other": "Diğer",
+  "report_notification.categories.spam": "İstenmeyen",
+  "report_notification.categories.violation": "Kural ihlali",
+  "report_notification.open": "Bildirim aç",
   "search.placeholder": "Ara",
+  "search.search_or_paste": "Ara veya URL gir",
   "search_popout.search_format": "Gelişmiş arama biçimi",
-  "search_popout.tips.full_text": "Basit metin yazdığınız, beğendiğiniz, teşvik ettiğiniz veya söz edilen gönderilerin yanı sıra kullanıcı adlarını, görünen adları ve hashtag'leri eşleştiren gönderileri de döndürür.",
+  "search_popout.tips.full_text": "Basit metin yazdığınız, beğendiğiniz, teşvik ettiğiniz veya söz edilen gönderilerin yanı sıra kullanıcı adlarını, görünen adları ve etiketleri eşleşen gönderileri de döndürür.",
   "search_popout.tips.hashtag": "etiket",
   "search_popout.tips.status": "gönderi",
   "search_popout.tips.text": "Basit metin, eşleşen görünen adları, kullanıcı adlarını ve hashtag'leri döndürür",
   "search_popout.tips.user": "kullanıcı",
   "search_results.accounts": "İnsanlar",
+  "search_results.all": "Tümü",
   "search_results.hashtags": "Etiketler",
+  "search_results.nothing_found": "Bu arama seçenekleriyle bir sonuç bulunamadı",
   "search_results.statuses": "Gönderiler",
   "search_results.statuses_fts_disabled": "Bu Mastodon sunucusunda gönderi içeriğine göre arama etkin değil.",
+  "search_results.title": "{q} araması",
   "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuç}}",
+  "server_banner.about_active_users": "Bu sunucuyu son 30 günde kullanan insanlar (Aylık Etkin Kullanıcılar)",
+  "server_banner.active_users": "etkin kullanıcılar",
+  "server_banner.administered_by": "Yönetici:",
+  "server_banner.introduction": "{domain}, {mastodon} destekli merkeziyetsiz sosyal ağın bir parçasıdır.",
+  "server_banner.learn_more": "Daha fazlasını öğrenin",
+  "server_banner.server_stats": "Sunucu istatistikleri:",
+  "sign_in_banner.create_account": "Hesap oluştur",
+  "sign_in_banner.sign_in": "Giriş yap",
+  "sign_in_banner.text": "Profilleri veya etiketleri izlemek, gönderileri beğenmek, paylaşmak ve yanıtlamak için veya başka bir sunucunuzdaki hesabınızla etkileşmek için giriş yapın.",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
   "status.admin_status": "Denetim arayüzünde bu gönderiyi açın",
   "status.block": "@{name} adlı kişiyi engelle",
-  "status.bookmark": "Yer imlerine ekle",
+  "status.bookmark": "Yer işareti ekle",
   "status.cancel_reblog_private": "Boostu geri al",
   "status.cannot_reblog": "Bu gönderi boost edilemez",
   "status.copy": "Bağlantı durumunu kopyala",
   "status.delete": "Sil",
   "status.detailed_status": "Ayrıntılı sohbet görünümü",
   "status.direct": "@{name} adlı kişiye direkt mesaj",
+  "status.edit": "Düzenle",
+  "status.edited": "{date} tarihinde düzenlenmiş",
+  "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
   "status.embed": "Gömülü",
-  "status.favourite": "Beğen",
+  "status.favourite": "Favorilerine ekle",
+  "status.filter": "Bu gönderiyi filtrele",
   "status.filtered": "Filtrelenmiş",
+  "status.hide": "Gönderiyi gizle",
+  "status.history.created": "{name} oluşturdu {date}",
+  "status.history.edited": "{name} düzenledi {date}",
   "status.load_more": "Daha fazlasını yükle",
   "status.media_hidden": "Medya gizli",
   "status.mention": "@{name} kişisinden bahset",
   "status.more": "Daha fazla",
   "status.mute": "@{name} kişisini sessize al",
   "status.mute_conversation": "Sohbeti sessize al",
-  "status.open": "Bu tootu genişlet",
+  "status.open": "Bu gönderiyi genişlet",
   "status.pin": "Profile sabitle",
-  "status.pinned": "Sabitlenmiş toot",
+  "status.pinned": "Sabitlenmiş gönderi",
   "status.read_more": "Devamını okuyun",
   "status.reblog": "Boostla",
   "status.reblog_private": "Orijinal görünürlük ile boostla",
   "status.reblogged_by": "{name} boostladı",
   "status.reblogs.empty": "Henüz kimse bu tootu boostlamadı. Biri yaptığında burada görünecek.",
   "status.redraft": "Sil ve yeniden taslak yap",
-  "status.remove_bookmark": "Yer imini kaldır",
+  "status.remove_bookmark": "Yer işaretini kaldır",
+  "status.replied_to": "{name} kullanıcısına yanıt verildi",
   "status.reply": "Yanıtla",
   "status.replyAll": "Konuyu yanıtla",
   "status.report": "@{name} adlı kişiyi bildir",
   "status.sensitive_warning": "Hassas içerik",
   "status.share": "Paylaş",
+  "status.show_filter_reason": "Yine de göster",
   "status.show_less": "Daha az göster",
   "status.show_less_all": "Hepsi için daha az göster",
   "status.show_more": "Daha fazlasını göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
-  "status.show_thread": "Konuyu göster",
+  "status.show_original": "Orijinali göster",
+  "status.translate": "Çevir",
+  "status.translated_from_with": "{provider} kullanılarak {lang} dilinden çevrildi",
   "status.uncached_media_warning": "Mevcut değil",
   "status.unmute_conversation": "Sohbet sesini aç",
   "status.unpin": "Profilden sabitlemeyi kaldır",
+  "subscribed_languages.lead": "Değişiklikten sonra ana akışınızda sadece seçili dillerdeki gönderiler görüntülenecek ve zaman akışları listelenecektir. Tüm dillerde gönderiler için hiçbirini seçin.",
+  "subscribed_languages.save": "Değişiklikleri kaydet",
+  "subscribed_languages.target": "{target} abone olduğu dilleri değiştir",
   "suggestions.dismiss": "Öneriyi görmezden gel",
   "suggestions.header": "Şuna ilgi duyuyor olabilirsiniz…",
   "tabs_bar.federated_timeline": "Federe",
   "tabs_bar.home": "Ana Sayfa",
   "tabs_bar.local_timeline": "Yerel",
   "tabs_bar.notifications": "Bildirimler",
-  "tabs_bar.search": "Ara",
   "time_remaining.days": "{number, plural, one {# gün} other {# gün}} kaldı",
   "time_remaining.hours": "{number, plural, one {# saat} other {# saat}} kaldı",
   "time_remaining.minutes": "{number, plural, one {# dakika} other {# dakika}} kaldı",
@@ -443,26 +611,27 @@
   "timeline_hint.remote_resource_not_displayed": "diğer sunucudaki {resource} gösterilemiyor.",
   "timeline_hint.resources.followers": "Takipçiler",
   "timeline_hint.resources.follows": "Takip Edilenler",
-  "timeline_hint.resources.statuses": "Eski tootlar",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} kişi} other {{counter} kişi}} konuşuyor",
+  "timeline_hint.resources.statuses": "Eski gönderiler",
+  "trends.counter_by_accounts": "Son {days, plural, one {gündeki} other {{days} gündeki}} {count, plural, one {{counter} kişi} other {{counter} kişi}}",
   "trends.trending_now": "Şu an gündemde",
   "ui.beforeunload": "Mastodon'u terk ederseniz taslağınız kaybolacak.",
   "units.short.billion": "{count}Mr",
-  "units.short.million": "{count}Mn",
-  "units.short.thousand": "{count}Mn",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}Bin",
   "upload_area.title": "Karşıya yükleme için sürükle bırak yapınız",
   "upload_button.label": "Resim, video veya ses dosyası ekleyin",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.audio_description": "İşitme kaybı olan kişiler için tarif edin",
   "upload_form.description": "Görme engelliler için açıklama",
+  "upload_form.description_missing": "Açıklama eklenmedi",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
   "upload_form.undo": "Sil",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için tarif edin",
   "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
   "upload_modal.apply": "Uygula",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Uygulanıyor…",
   "upload_modal.choose_image": "Resim seç",
   "upload_modal.description_placeholder": "Pijamalı hasta yağız şoföre çabucak güvendi",
   "upload_modal.detect_text": "Resimdeki metni algıla",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "OCR hazırlanıyor…",
   "upload_modal.preview_label": "Ön izleme ({ratio})",
   "upload_progress.label": "Yükleniyor...",
+  "upload_progress.processing": "İşleniyor…",
   "video.close": "Videoyu kapat",
   "video.download": "Dosyayı indir",
   "video.exit_fullscreen": "Tam ekrandan çık",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 456c5f72d..a3b18a269 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -1,53 +1,74 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Язма",
   "account.add_or_remove_from_list": "Исемлеккә кертү я бетерү",
   "account.badges.bot": "Бот",
   "account.badges.group": "Төркем",
   "account.block": "@{name} блоклау",
-  "account.block_domain": "Block domain {domain}",
+  "account.block_domain": "{domain} доменын блоклау",
   "account.blocked": "Блокланган",
   "account.browse_more_on_origin_server": "Тулырак оригинал профилендә карап була",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain blocked",
+  "account.cancel_follow_request": "Withdraw follow request",
+  "account.direct": "@{name} өчен яңа хат",
+  "account.disable_notifications": "@{name} язулары өчен белдерүләр сүндерү",
+  "account.domain_blocked": "Домен блокланган",
   "account.edit_profile": "Профильны үзгәртү",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
+  "account.enable_notifications": "@{name} язулары өчен белдерүләр яндыру",
+  "account.endorse": "Профильдә рекомендацияләү",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Языл",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.followers": "Язылучылар",
+  "account.followers.empty": "Әле беркем дә язылмаган.",
+  "account.followers_counter": "{count, plural,one {{counter} Язылучы} other {{counter} Язылучы}}",
+  "account.following": "Язылган",
+  "account.following_counter": "{count, plural, one {{counter} Язылган} other {{counter} Язылган}}",
+  "account.follows.empty": "Беркемгә дә язылмаган әле.",
   "account.follows_you": "Сезгә язылган",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.locked_info": "Бу - ябык аккаунт. Аны язылучылар гына күрә ала.",
   "account.media": "Медиа",
-  "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.mention": "@{name} искәртү",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Беркайчан да",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Язылынмау",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Ой!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Ябу",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Кыстыргычлар",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Блоклау",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Бетерү",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Бетерү",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Активлык",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Куелган",
   "emoji_button.flags": "Байраклар",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Сакланды",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Киләсе",
   "lightbox.previous": "Алдагы",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Исемлектән бетерергә",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Дәвамлык",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Кыстыргычлар",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Профильны үзгәртү",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Caylaw",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Хәвефсезлек",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Күрсәтү",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "Бөтенесе",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Яңарту",
   "regeneration_indicator.label": "Йөкләү...",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}к",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}с",
   "relative_time.just_now": "хәзер",
   "relative_time.minutes": "{number}м",
   "relative_time.seconds": "{number}сек",
   "relative_time.today": "бүген",
   "reply_indicator.cancel": "Баш тарту",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "профиль",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Җибәрү",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Эзләү",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "кулланучы",
   "search_results.accounts": "Кешеләр",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "@{name} блоклау",
@@ -396,9 +551,16 @@
   "status.delete": "Бетерү",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Уртаклашу",
-  "status.show_less": "Show less",
+  "status.show_filter_reason": "Show anyway",
+  "status.show_less": "Әзрәк күрсәтү",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
+  "status.show_more": "Күбрәк күрсәтү",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Баш бит",
   "tabs_bar.local_timeline": "Җирле",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Эзләү",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Үзгәртү",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Бетерү",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Видеоны ябу",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index eca4765c4..f31ea8537 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
@@ -7,47 +19,56 @@
   "account.block_domain": "Block domain {domain}",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Direct message @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
-  "account.never_active": "Never",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Delete",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,10 +362,11 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
@@ -284,12 +375,11 @@
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "About this server",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 808701957..bae66ac69 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Модеровані сервери",
+  "about.contact": "Контакти:",
+  "about.disclaimer": "Mastodon — це вільне програмне забезпечення з відкритим кодом і торгова марка компанії Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Причина недоступна",
+  "about.domain_blocks.preamble": "Mastodon зазвичай дозволяє вам взаємодіяти з користувачами будь-яких серверів у Федіверсі та переглядати їх вміст. Ось винятки, які було зроблено на цьому конкретному сервері.",
+  "about.domain_blocks.silenced.explanation": "Ви загалом не будете бачити профілі та вміст цього сервера, якщо ви не шукаєте їх цілеспрямовано або не підписані на його користувачів.",
+  "about.domain_blocks.silenced.title": "Обмежені",
+  "about.domain_blocks.suspended.explanation": "Дані з цього сервера не будуть оброблятися, зберігатися чи обмінюватися, що унеможливить взаємодію чи спілкування з користувачами цього сервера.",
+  "about.domain_blocks.suspended.title": "Заблоковані",
+  "about.not_available": "Ця інформація не доступна на цьому сервері.",
+  "about.powered_by": "Децентралізовані соціальні мережі від {mastodon}",
+  "about.rules": "Правила сервера",
   "account.account_note_header": "Примітка",
   "account.add_or_remove_from_list": "Додати або видалити зі списків",
   "account.badges.bot": "Бот",
@@ -6,78 +18,100 @@
   "account.block": "Заблокувати @{name}",
   "account.block_domain": "Заблокувати домен {domain}",
   "account.blocked": "Заблоковані",
-  "account.browse_more_on_origin_server": "Переглянути більше в оригіналі",
-  "account.cancel_follow_request": "Скасувати запит на підписку",
-  "account.direct": "Пряме повідомлення @{name}",
+  "account.browse_more_on_origin_server": "Переглянути більше в оригінальному профілі",
+  "account.cancel_follow_request": "Відкликати запит на стеження",
+  "account.direct": "Надіслати пряме повідомлення @{name}",
   "account.disable_notifications": "Не повідомляти мене про дописи @{name}",
-  "account.domain_blocked": "Домен приховано",
+  "account.domain_blocked": "Домен заблоковано",
   "account.edit_profile": "Редагувати профіль",
   "account.enable_notifications": "Повідомляти мене про дописи @{name}",
-  "account.endorse": "Публікувати у профілі",
+  "account.endorse": "Рекомендувати у моєму профілі",
+  "account.featured_tags.last_status_at": "Останній допис {date}",
+  "account.featured_tags.last_status_never": "Немає дописів",
+  "account.featured_tags.title": "{name} виділяє хештеґи",
   "account.follow": "Підписатися",
   "account.followers": "Підписники",
-  "account.followers.empty": "Ніхто ще не підписався на цього користувача.",
-  "account.followers_counter": "{count, plural, one {{counter} Підписник} few {{counter} Підписники} many {{counter} Підписників} other {{counter} Підписники}}",
-  "account.following_counter": "{count, plural, one {{counter} Підписка} few {{counter} Підписки} many {{counter} Підписок} other {{counter} Підписки}}",
+  "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
+  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
+  "account.following": "Ви стежите",
+  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
-  "account.follows_you": "Підписаний(-а) на вас",
-  "account.hide_reblogs": "Сховати передмухи від @{name}",
-  "account.joined": "Долучення {date}",
-  "account.last_status": "Крайня активність",
+  "account.follows_you": "Підписується на вас",
+  "account.go_to_profile": "Перейти до профілю",
+  "account.hide_reblogs": "Сховати поширення від @{name}",
+  "account.joined_short": "Дата приєднання",
+  "account.languages": "Змінити обрані мови",
   "account.link_verified_on": "Права власності на це посилання були перевірені {date}",
-  "account.locked_info": "Статус конфіденційності цього облікового запису встановлено у заблокований. Власник вручну переглядає, хто може за ним стежити.",
+  "account.locked_info": "Це закритий обліковий запис. Власник вручну обирає, хто може на нього підписуватися.",
   "account.media": "Медіа",
   "account.mention": "Згадати @{name}",
-  "account.moved_to": "{name} переїхав на:",
-  "account.mute": "Заглушити @{name}",
+  "account.moved_to": "{name} вказує, що їхній новий обліковий запис тепер:",
+  "account.mute": "Приховати @{name}",
   "account.mute_notifications": "Не показувати сповіщення від @{name}",
-  "account.muted": "Заглушений",
-  "account.never_active": "Ніколи",
-  "account.posts": "Дмухи",
-  "account.posts_with_replies": "Дмухи й відповіді",
+  "account.muted": "Приховується",
+  "account.open_original_page": "Відкрити оригінальну сторінку",
+  "account.posts": "Дописи",
+  "account.posts_with_replies": "Дописи й відповіді",
   "account.report": "Поскаржитися на @{name}",
-  "account.requested": "Очікує підтвердження. Натисніть щоб відмінити запит",
+  "account.requested": "Очікує підтвердження. Натисніть, щоб скасувати запит на підписку",
+  "account.requested_follow": "{name} надсилає запит на стеження",
   "account.share": "Поділитися профілем @{name}",
-  "account.show_reblogs": "Показати передмухи від @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Пост} few {{counter} Пости} many {{counter} Постів} other {{counter} Пости}}",
+  "account.show_reblogs": "Показати поширення від @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} дописи}}",
   "account.unblock": "Розблокувати @{name}",
   "account.unblock_domain": "Розблокувати {domain}",
+  "account.unblock_short": "Розблокувати",
   "account.unendorse": "Не публікувати у профілі",
   "account.unfollow": "Відписатися",
-  "account.unmute": "Зняти глушення з @{name}",
+  "account.unmute": "Не приховувати @{name}",
   "account.unmute_notifications": "Показувати сповіщення від @{name}",
-  "account_note.placeholder": "Коментарі відсутні",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.unmute_short": "Не приховувати",
+  "account_note.placeholder": "Натисніть, щоб додати примітку",
+  "admin.dashboard.daily_retention": "Щоденний показник утримання користувачів після реєстрації",
+  "admin.dashboard.monthly_retention": "Щомісячний показник утримання користувачів після реєстрації",
+  "admin.dashboard.retention.average": "Середнє",
+  "admin.dashboard.retention.cohort": "Місяць реєстрації",
+  "admin.dashboard.retention.cohort_size": "Нові користувачі",
   "alert.rate_limited.message": "Спробуйте ще раз через {retry_time, time, medium}.",
   "alert.rate_limited.title": "Швидкість обмежена",
-  "alert.unexpected.message": "Трапилась неочікувана помилка.",
+  "alert.unexpected.message": "Сталася неочікувана помилка.",
   "alert.unexpected.title": "Ой!",
   "announcement.announcement": "Оголошення",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(не оброблено)",
+  "audio.hide": "Сховати аудіо",
   "autosuggest_hashtag.per_week": "{count} в тиждень",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу",
-  "bundle_column_error.body": "Щось пішло не так під час завантаження компоненту.",
+  "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
+  "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
+  "bundle_column_error.error.title": "О, ні!",
+  "bundle_column_error.network.body": "Під час завантаження цієї сторінки сталася помилка. Це могло статися через тимчасову проблему з вашим інтернетом чи цим сервером.",
+  "bundle_column_error.network.title": "Помилка мережі",
   "bundle_column_error.retry": "Спробуйте ще раз",
-  "bundle_column_error.title": "Помилка мережі",
+  "bundle_column_error.return": "На головну",
+  "bundle_column_error.routing.body": "Запитувана сторінка не знайдена. Ви впевнені, що URL-адреса у панелі адрес правильна?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Закрити",
-  "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.",
+  "bundle_modal_error.message": "Щось пішло не так під час завантаження цього компоненту.",
   "bundle_modal_error.retry": "Спробувати ще раз",
+  "closed_registrations.other_server_instructions": "Оскільки Mastodon децентралізований, ви можете створити обліковий запис на іншому сервері й досі взаємодіяти з ним.",
+  "closed_registrations_modal.description": "Створення облікового запису на {domain} наразі неможливе, але майте на увазі, що вам не потрібен обліковий запис саме на {domain}, щоб використовувати Mastodon.",
+  "closed_registrations_modal.find_another_server": "Знайти інший сервер",
+  "closed_registrations_modal.preamble": "Mastodon децентралізований, тож незалежно від того, де ви створюєте свій обліковий запис, ви зможете слідкувати та взаємодіяти з будь-ким на цьому сервері. Ви навіть можете розмістити його самостійно!",
+  "closed_registrations_modal.title": "Реєстрація на Mastodon",
+  "column.about": "Про застосунок",
   "column.blocks": "Заблоковані користувачі",
   "column.bookmarks": "Закладки",
   "column.community": "Локальна стрічка",
   "column.direct": "Прямі повідомлення",
   "column.directory": "Переглянути профілі",
-  "column.domain_blocks": "Приховані домени",
+  "column.domain_blocks": "Заблоковані домени",
   "column.favourites": "Вподобане",
   "column.follow_requests": "Запити на підписку",
   "column.home": "Головна",
   "column.lists": "Списки",
-  "column.mutes": "Заглушені користувачі",
+  "column.mutes": "Приховані користувачі",
   "column.notifications": "Сповіщення",
-  "column.pins": "Закріплені дмухи",
+  "column.pins": "Закріплені дописи",
   "column.public": "Глобальна стрічка",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Приховати налаштування",
@@ -87,175 +121,231 @@
   "column_header.show_settings": "Показати налаштування",
   "column_header.unpin": "Відкріпити",
   "column_subheading.settings": "Налаштування",
-  "community.column_settings.local_only": "Тільки локальні",
-  "community.column_settings.media_only": "Тільки медіа",
-  "community.column_settings.remote_only": "Тільки видалені",
-  "compose_form.direct_message_warning": "Цей дмух буде видимий тільки згаданим користувачам.",
+  "community.column_settings.local_only": "Лише локальні",
+  "community.column_settings.media_only": "Лише з медіа",
+  "community.column_settings.remote_only": "Лише віддалені",
+  "compose.language.change": "Змінити мову",
+  "compose.language.search": "Шукати мови...",
   "compose_form.direct_message_warning_learn_more": "Дізнатися більше",
-  "compose_form.hashtag_warning": "Цей дмух не буде відображений у жодній стрічці хештеґу, оскільки він прихований. Тільки публічні дмухи можуть бути знайдені за хештеґом.",
-  "compose_form.lock_disclaimer": "Ваш акаунт не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші приватні пости.",
+  "compose_form.encryption_warning": "Дописи на Mastodon не захищені шифруванням. Не поширюйте жодну делікатну інформацію.",
+  "compose_form.hashtag_warning": "Цей допис не буде зображений у жодній стрічці гештеґу, оскільки він прихований. Тільки публічні дописи можуть бути знайдені за гештеґом.",
+  "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
   "compose_form.poll.add_option": "Додати варіант",
   "compose_form.poll.duration": "Тривалість опитування",
   "compose_form.poll.option_placeholder": "Варіант {number}",
   "compose_form.poll.remove_option": "Видалити цей варіант",
-  "compose_form.poll.switch_to_multiple": "Перемкнути у режим вибору декількох відповідей",
+  "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
-  "compose_form.publish": "Дмухнути",
+  "compose_form.publish": "Опублікувати",
+  "compose_form.publish_form": "Опублікувати",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Зберегти зміни",
   "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
   "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
-  "compose_form.spoiler.marked": "Текст приховано під попередженням",
-  "compose_form.spoiler.unmarked": "Текст видимий",
+  "compose_form.spoiler.marked": "Прибрати попередження про вміст",
+  "compose_form.spoiler.unmarked": "Додати попередження про вміст",
   "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
   "confirmation_modal.cancel": "Відмінити",
   "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
   "confirmations.block.message": "Ви впевнені, що хочете заблокувати {name}?",
+  "confirmations.cancel_follow_request.confirm": "Відкликати запит",
+  "confirmations.cancel_follow_request.message": "Ви дійсно бажаєте відкликати запит на стеження за {name}?",
   "confirmations.delete.confirm": "Видалити",
   "confirmations.delete.message": "Ви впевнені, що хочете видалити цей допис?",
   "confirmations.delete_list.confirm": "Видалити",
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Сховати весь домен",
-  "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати/заглушити лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
+  "confirmations.discard_edit_media.confirm": "Відкинути",
+  "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
+  "confirmations.domain_block.confirm": "Заблокувати весь домен",
+  "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
-  "confirmations.mute.confirm": "Заглушити",
-  "confirmations.mute.explanation": "Це приховає пости від них і пости зі згадками про них, проте вони все одно матимуть змогу бачити ваші пости і підписуватися на вас.",
-  "confirmations.mute.message": "Ви впевнені, що хочете заглушити {name}?",
-  "confirmations.redraft.confirm": "Видалити та перестворити",
-  "confirmations.redraft.message": "Ви впевнені, що хочете видалити допис і перестворити його? Ви втратите всі відповіді, передмухи та вподобайки допису.",
+  "confirmations.mute.confirm": "Приховати",
+  "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.",
+  "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?",
+  "confirmations.redraft.confirm": "Видалити та виправити",
+  "confirmations.redraft.message": "Ви впевнені, що хочете відредагувати допис? Ви втратите всі відповіді, поширення та вподобайки допису.",
   "confirmations.reply.confirm": "Відповісти",
-  "confirmations.reply.message": "Поточна відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
+  "confirmations.reply.message": "Нова відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
   "confirmations.unfollow.confirm": "Відписатися",
   "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
-  "conversation.delete": "Видалити цю бесіду",
+  "conversation.delete": "Видалити бесіду",
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
   "conversation.with": "З {names}",
+  "copypaste.copied": "Скопійовано",
+  "copypaste.copy": "Копіювати",
   "directory.federated": "З відомого федесвіту",
-  "directory.local": "Тільки з домену {domain}",
+  "directory.local": "Лише з домену {domain}",
   "directory.new_arrivals": "Нові надходження",
-  "directory.recently_active": "Активні нещодавно",
-  "embed.instructions": "Вбудуйте цей статус до вашого вебсайту, скопіювавши код нижче.",
+  "directory.recently_active": "Нещодавно активні",
+  "disabled_account_banner.account_settings": "Налаштування облікового запису",
+  "disabled_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений.",
+  "dismissable_banner.community_timeline": "Це останні публічні дописи від людей, чиї облікові записи розміщені на {domain}.",
+  "dismissable_banner.dismiss": "Відхилити",
+  "dismissable_banner.explore_links": "Ці новини розповідають історії про людей на цих та інших серверах децентралізованої мережі прямо зараз.",
+  "dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері.",
+  "dismissable_banner.explore_tags": "Ці хештеги зараз набирають популярності серед людей на цьому та інших серверах децентралізованої мережі.",
+  "dismissable_banner.public_timeline": "Це останні публічні дописи від людей на цьому та інших серверах децентралізованої мережі, про які відомо цьому серверу.",
+  "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось як він виглядатиме:",
-  "emoji_button.activity": "Заняття",
-  "emoji_button.custom": "Особливі",
+  "emoji_button.activity": "Діяльність",
+  "emoji_button.clear": "Очистити",
+  "emoji_button.custom": "Власні",
   "emoji_button.flags": "Прапори",
   "emoji_button.food": "Їжа та напої",
-  "emoji_button.label": "Вставити емодзі",
+  "emoji_button.label": "Вставити емоджі",
   "emoji_button.nature": "Природа",
-  "emoji_button.not_found": "Немає емодзі!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Відповідних емоджі не знайдено",
   "emoji_button.objects": "Предмети",
   "emoji_button.people": "Люди",
   "emoji_button.recent": "Часто використовувані",
   "emoji_button.search": "Шукати...",
   "emoji_button.search_results": "Результати пошуку",
   "emoji_button.symbols": "Символи",
-  "emoji_button.travel": "Подорожі",
+  "emoji_button.travel": "Подорожі та місця",
   "empty_column.account_suspended": "Обліковий запис заблоковано",
-  "empty_column.account_timeline": "Тут дмухалок немає!",
+  "empty_column.account_timeline": "Тут немає дописів!",
   "empty_column.account_unavailable": "Профіль недоступний",
   "empty_column.blocks": "Ви ще не заблокували жодного користувача.",
-  "empty_column.bookmarked_statuses": "У вас ще немає дмухів у закладках. Коли ви щось додасте до заклкдок, воно з'явиться тут.",
+  "empty_column.bookmarked_statuses": "У вас ще немає дописів у закладках. Коли ви щось додасте до закладок, воно з'явиться тут.",
   "empty_column.community": "Локальна стрічка пуста. Напишіть щось, щоб розігріти народ!",
-  "empty_column.direct": "У вас ще немає прямих повідомлень. Коли ви відправите чи отримаєте якесь, воно з'явиться тут.",
+  "empty_column.direct": "У вас ще немає прямих повідомлень. Коли ви щось отримаєте чи надішлете, воно з'явиться тут.",
   "empty_column.domain_blocks": "Тут поки немає прихованих доменів.",
-  "empty_column.favourited_statuses": "У вас ще немає вподобаних дмухів. Коли ви щось вподобаєте, воно з'явиться тут.",
-  "empty_column.favourites": "Ніхто ще не вподобав цього дмуху. Коли хтось це зробить, вони з'являться тут.",
-  "empty_column.follow_recommendations": "Схоже, для вас не буде створено жодної пропозиції. Ви можете спробувати скористатися пошуком людей, яких ви можете знати або переглянути популярні хештеґи.",
+  "empty_column.explore_statuses": "Нема нічого популярного. Подивіться пізніше!",
+  "empty_column.favourited_statuses": "У вас ще немає вподобаних дописів. Коли ви щось вподобаєте, воно з'явиться тут.",
+  "empty_column.favourites": "Ніхто ще не вподобав цей допис. Коли хтось це зробить, він з'явиться тут.",
+  "empty_column.follow_recommendations": "Схоже, для вас не було створено жодної пропозиції. Ви можете спробувати скористатися пошуком людей, яких ви можете знати, або переглянути популярні гештеґи.",
   "empty_column.follow_requests": "У вас ще немає запитів на підписку. Коли ви їх отримаєте, вони з'являться тут.",
-  "empty_column.hashtag": "Дописів з цим хештегом поки не існує.",
-  "empty_column.home": "Ви поки ні на кого не підписані. Погортайте {public}, або скористуйтесь пошуком, щоб освоїтися та познайомитися з іншими користувачами.",
+  "empty_column.hashtag": "Дописів з цим гештеґом поки не існує.",
+  "empty_column.home": "Ваша стрічка порожня! Підпишіться на інших, щоб її заповнити. {suggestions}",
   "empty_column.home.suggestions": "Переглянути пропозиції",
-  "empty_column.list": "Немає нічого в цьому списку. Коли його учасники дмухнуть нові статуси, вони з'являться тут.",
+  "empty_column.list": "Цей список порожній. Коли його учасники додадуть нові дописи, вони з'являться тут.",
   "empty_column.lists": "У вас ще немає списків. Коли ви їх створите, вони з'являться тут.",
-  "empty_column.mutes": "Ви ще не заглушили жодного користувача.",
+  "empty_column.mutes": "Ви ще не приховали жодного користувача.",
   "empty_column.notifications": "У вас ще немає сповіщень. Переписуйтесь з іншими користувачами, щоб почати розмову.",
-  "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших інстанцій, щоб заповнити стрічку",
-  "error.unexpected_crash.explanation": "Ця сторінка не може бути коректно відображена через баґ у нашому коді або через проблему сумісності браузера.",
+  "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших серверів, щоб заповнити стрічку",
+  "error.unexpected_crash.explanation": "Через помилку у нашому коді або несумісність браузера, ця сторінка не може бути зображена коректно.",
   "error.unexpected_crash.explanation_addons": "Неможливо правильно показати цю сторінку. Ймовірно, цю помилку викликано додатком браузера або автоматичним засобом перекладу.",
-  "error.unexpected_crash.next_steps": "Спробуйте перезавантажити сторінку. Якщо це не допоможе, ви все ще зможете використовувати Mastodon через інший браузер або рідний додаток.",
+  "error.unexpected_crash.next_steps": "Спробуйте перезавантажити сторінку. Якщо це не допоможе, ви все ще зможете використовувати Mastodon через інший браузер або рідний застосунок.",
   "error.unexpected_crash.next_steps_addons": "Спробуйте їх вимкнути та оновити сторінку. Якщо це не допомагає, ви можете використовувати Mastodon через інший браузер або окремий застосунок.",
   "errors.unexpected_crash.copy_stacktrace": "Скопіювати трасування стека у буфер обміну",
   "errors.unexpected_crash.report_issue": "Повідомити про проблему",
+  "explore.search_results": "Результати пошуку",
+  "explore.suggested_follows": "Для вас",
+  "explore.title": "Огляд",
+  "explore.trending_links": "Новини",
+  "explore.trending_statuses": "Дописи",
+  "explore.trending_tags": "Хештеґи",
+  "filter_modal.added.context_mismatch_explanation": "Ця категорія фільтра не застосовується до контексту, в якому ви отримали доступ до цього допису. Якщо ви хочете, щоб дописи також фільтрувалися за цим контекстом, вам доведеться редагувати фільтр.",
+  "filter_modal.added.context_mismatch_title": "Невідповідність контексту!",
+  "filter_modal.added.expired_explanation": "Категорія цього фільтра застаріла, Вам потрібно змінити дату закінчення терміну дії, щоб застосувати її.",
+  "filter_modal.added.expired_title": "Застарілий фільтр!",
+  "filter_modal.added.review_and_configure": "Щоб розглянути та далі налаштувати цю категорію фільтрів, перейдіть на {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Налаштування фільтра",
+  "filter_modal.added.settings_link": "сторінка налаштувань",
+  "filter_modal.added.short_explanation": "Цей допис було додано до такої категорії фільтра: {title}.",
+  "filter_modal.added.title": "Фільтр додано!",
+  "filter_modal.select_filter.context_mismatch": "не застосовується до цього контексту",
+  "filter_modal.select_filter.expired": "застарілий",
+  "filter_modal.select_filter.prompt_new": "Нова категорія: {name}",
+  "filter_modal.select_filter.search": "Пошук або створення",
+  "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
+  "filter_modal.select_filter.title": "Фільтрувати цей допис",
+  "filter_modal.title.status": "Фільтрувати допис",
   "follow_recommendations.done": "Готово",
   "follow_recommendations.heading": "Підпишіться на людей, чиї дописи ви хочете бачити! Ось деякі пропозиції.",
   "follow_recommendations.lead": "Дописи від людей, за якими ви стежите, з'являться в хронологічному порядку у вашій домашній стрічці. Не бійся помилятися, ви можете відписатися від людей так само легко в будь-який час!",
   "follow_request.authorize": "Авторизувати",
   "follow_request.reject": "Відмовити",
-  "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, працівники {domain} припускають, що, можливо, ви хотіли б переглянути ці запити на підписку.",
+  "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
+  "footer.about": "Про проєкт",
+  "footer.directory": "Каталог профілів",
+  "footer.get_app": "Завантажити застосунок",
+  "footer.invite": "Запросити людей",
+  "footer.keyboard_shortcuts": "Комбінації клавіш",
+  "footer.privacy_policy": "Політика приватності",
+  "footer.source_code": "Перегляд програмного коду",
   "generic.saved": "Збережено",
-  "getting_started.developers": "Розробникам",
-  "getting_started.directory": "Каталог профілів",
-  "getting_started.documentation": "Документація",
-  "getting_started.heading": "Ласкаво просимо",
-  "getting_started.invite": "Запросіть людей",
-  "getting_started.open_source_notice": "Mastodon — програма з відкритим сирцевим кодом. Ви можете допомогти проекту, або повідомити про проблеми на GitHub за адресою {github}.",
-  "getting_started.security": "Безпека",
-  "getting_started.terms": "Умови використання",
+  "getting_started.heading": "Розпочати",
   "hashtag.column_header.tag_mode.all": "та {additional}",
   "hashtag.column_header.tag_mode.any": "або {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
-  "hashtag.column_settings.select.no_options_message": "Не знайдено пропозицій",
-  "hashtag.column_settings.select.placeholder": "Введіть хештеґи…",
-  "hashtag.column_settings.tag_mode.all": "Усі ці",
-  "hashtag.column_settings.tag_mode.any": "Який-небудь з цих",
-  "hashtag.column_settings.tag_mode.none": "Жоден з цих",
-  "hashtag.column_settings.tag_toggle": "Додайте додаткові теґи до цього стовпчика",
+  "hashtag.column_settings.select.no_options_message": "Пропозицій не знайдено",
+  "hashtag.column_settings.select.placeholder": "Введіть гештеґи…",
+  "hashtag.column_settings.tag_mode.all": "Усе зі списку",
+  "hashtag.column_settings.tag_mode.any": "Який-небудь зі списку",
+  "hashtag.column_settings.tag_mode.none": "Жоден зі списку",
+  "hashtag.column_settings.tag_toggle": "Додати додаткові теґи до цього стовпчика",
+  "hashtag.follow": "Стежити за хештегом",
+  "hashtag.unfollow": "Не стежити за хештегом",
   "home.column_settings.basic": "Основні",
-  "home.column_settings.show_reblogs": "Показувати передмухи",
+  "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
   "home.show_announcements": "Показати оголошення",
+  "interaction_modal.description.favourite": "Маючи обліковий запис на Mastodon, ви можете вподобати цей допис, щоб дати автору знати, що ви його цінуєте, і зберегти його на потім.",
+  "interaction_modal.description.follow": "Маючи обліковий запис на Mastodon, ви можете підписатися на {name}, щоб отримувати дописи цього користувача у свою стрічку.",
+  "interaction_modal.description.reblog": "Маючи обліковий запис на Mastodon, ви можете поширити цей допис, щоб поділитися ним зі своїми підписниками.",
+  "interaction_modal.description.reply": "Маючи обліковий запис на Mastodon, ви можете відповісти на цей допис.",
+  "interaction_modal.on_another_server": "На іншому сервері",
+  "interaction_modal.on_this_server": "На цьому сервері",
+  "interaction_modal.other_server_instructions": "Скопіюйте та вставте цю URL-адресу в поле пошуку вашого улюбленого застосунку Mastodon або вебінтерфейсу вашого сервера Mastodon.",
+  "interaction_modal.preamble": "Оскільки Mastodon децентралізований, ви можете використовувати свій наявний обліковий запис, розміщений на іншому сервері Mastodon або сумісній платформі, якщо у вас немає облікового запису на цьому сервері.",
+  "interaction_modal.title.favourite": "Вподобати допис {name}",
+  "interaction_modal.title.follow": "Підписатися на {name}",
+  "interaction_modal.title.reblog": "Поширити допис {name}",
+  "interaction_modal.title.reply": "Відповісти на допис {name}",
   "intervals.full.days": "{number, plural, one {# день} few {# дні} other {# днів}}",
   "intervals.full.hours": "{number, plural, one {# година} few {# години} other {# годин}}",
   "intervals.full.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
-  "keyboard_shortcuts.back": "переходити назад",
-  "keyboard_shortcuts.blocked": "відкрити список заблокованих користувачів",
-  "keyboard_shortcuts.boost": "передмухувати",
-  "keyboard_shortcuts.column": "фокусуватися на одній з колонок",
-  "keyboard_shortcuts.compose": "фокусуватися на полі введення",
+  "keyboard_shortcuts.back": "Перейти назад",
+  "keyboard_shortcuts.blocked": "Відкрити список заблокованих користувачів",
+  "keyboard_shortcuts.boost": "Поширити допис",
+  "keyboard_shortcuts.column": "Фокусуватися на одній з колонок",
+  "keyboard_shortcuts.compose": "Фокусуватися на полі введення",
   "keyboard_shortcuts.description": "Опис",
-  "keyboard_shortcuts.direct": "відкрити колонку прямих повідомлень",
-  "keyboard_shortcuts.down": "рухатися вниз стрічкою",
-  "keyboard_shortcuts.enter": "відкрити статус",
-  "keyboard_shortcuts.favourite": "вподобати",
-  "keyboard_shortcuts.favourites": "відкрити список улюбленого",
-  "keyboard_shortcuts.federated": "відкрити глобальну стрічку",
-  "keyboard_shortcuts.heading": "Гарячі клавіші",
-  "keyboard_shortcuts.home": "відкрити домашню стрічку",
+  "keyboard_shortcuts.direct": "щоб відкрити колонку прямих повідомлень",
+  "keyboard_shortcuts.down": "Рухатися вниз стрічкою",
+  "keyboard_shortcuts.enter": "Відкрити допис",
+  "keyboard_shortcuts.favourite": "Вподобати допис",
+  "keyboard_shortcuts.favourites": "Відкрити список вподобаного",
+  "keyboard_shortcuts.federated": "Відкрити глобальну стрічку",
+  "keyboard_shortcuts.heading": "Комбінації клавіш",
+  "keyboard_shortcuts.home": "Відкрити домашню стрічку",
   "keyboard_shortcuts.hotkey": "Гаряча клавіша",
-  "keyboard_shortcuts.legend": "показати підказку",
-  "keyboard_shortcuts.local": "відкрити локальну стрічку",
-  "keyboard_shortcuts.mention": "згадати автора",
-  "keyboard_shortcuts.muted": "відкрити список заглушених користувачів",
-  "keyboard_shortcuts.my_profile": "відкрити ваш профіль",
-  "keyboard_shortcuts.notifications": "відкрити колонку сповіщень",
-  "keyboard_shortcuts.open_media": "відкрити медіа",
-  "keyboard_shortcuts.pinned": "відкрити список закріплених дмухів",
-  "keyboard_shortcuts.profile": "відкрити профіль автора",
-  "keyboard_shortcuts.reply": "відповісти",
-  "keyboard_shortcuts.requests": "відкрити список бажаючих підписатися",
-  "keyboard_shortcuts.search": "сфокусуватися на пошуку",
-  "keyboard_shortcuts.spoilers": "показати/приховати поле CW",
-  "keyboard_shortcuts.start": "відкрити колонку \"Початок\"",
-  "keyboard_shortcuts.toggle_hidden": "показати/приховати текст під попередженням",
-  "keyboard_shortcuts.toggle_sensitivity": "показати/приховати медіа",
-  "keyboard_shortcuts.toot": "почати писати новий дмух",
-  "keyboard_shortcuts.unfocus": "розфокусуватися з нового допису чи пошуку",
-  "keyboard_shortcuts.up": "рухатися вверх списком",
+  "keyboard_shortcuts.legend": "Показати легенду",
+  "keyboard_shortcuts.local": "Відкрити локальну стрічку",
+  "keyboard_shortcuts.mention": "Згадати автора",
+  "keyboard_shortcuts.muted": "Відкрити список прихованих користувачів",
+  "keyboard_shortcuts.my_profile": "Відкрити ваш профіль",
+  "keyboard_shortcuts.notifications": "Відкрити колонку сповіщень",
+  "keyboard_shortcuts.open_media": "Відкрити медіа",
+  "keyboard_shortcuts.pinned": "Відкрити список закріплених дописів",
+  "keyboard_shortcuts.profile": "Відкрити профіль автора",
+  "keyboard_shortcuts.reply": "Відповісти",
+  "keyboard_shortcuts.requests": "Відкрити список охочих підписатися",
+  "keyboard_shortcuts.search": "Сфокусуватися на пошуку",
+  "keyboard_shortcuts.spoilers": "Показати/приховати поле попередження про вміст",
+  "keyboard_shortcuts.start": "Відкрити колонку \"Розпочати\"",
+  "keyboard_shortcuts.toggle_hidden": "Показати/приховати текст під попередженням про вміст",
+  "keyboard_shortcuts.toggle_sensitivity": "Показати/приховати медіа",
+  "keyboard_shortcuts.toot": "Створити новий допис",
+  "keyboard_shortcuts.unfocus": "Розфокусуватися з нового допису чи пошуку",
+  "keyboard_shortcuts.up": "Рухатися вгору списком",
   "lightbox.close": "Закрити",
   "lightbox.compress": "Стиснути поле перегляду зображень",
   "lightbox.expand": "Розгорнути поле перегляду зображень",
   "lightbox.next": "Далі",
   "lightbox.previous": "Назад",
+  "limited_account_hint.action": "Усе одно показати профіль",
+  "limited_account_hint.title": "Цей профіль сховали модератори {domain}.",
   "lists.account.add": "Додати до списку",
-  "lists.account.remove": "Видалити зі списку",
+  "lists.account.remove": "Вилучити зі списку",
   "lists.delete": "Видалити список",
   "lists.edit": "Редагувати список",
   "lists.edit.submit": "Змінити назву",
@@ -269,63 +359,72 @@
   "lists.subheading": "Ваші списки",
   "load_pending": "{count, plural, one {# новий елемент} other {# нових елементів}}",
   "loading_indicator.label": "Завантаження...",
-  "media_gallery.toggle_visible": "Показати/приховати",
+  "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
   "missing_indicator.label": "Не знайдено",
-  "missing_indicator.sublabel": "Ресурс не знайдений",
+  "missing_indicator.sublabel": "Ресурс не знайдено",
+  "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
   "mute_modal.duration": "Тривалість",
-  "mute_modal.hide_notifications": "Приховати сповіщення від користувача?",
-  "mute_modal.indefinite": "Не визначено",
-  "navigation_bar.apps": "Мобільні додатки",
+  "mute_modal.hide_notifications": "Сховати сповіщення цього користувача?",
+  "mute_modal.indefinite": "Назавжди",
+  "navigation_bar.about": "Про застосунок",
   "navigation_bar.blocks": "Заблоковані користувачі",
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальна стрічка",
-  "navigation_bar.compose": "Написати новий дмух",
+  "navigation_bar.compose": "Написати новий допис",
   "navigation_bar.direct": "Прямі повідомлення",
-  "navigation_bar.discover": "Знайти",
-  "navigation_bar.domain_blocks": "Приховані домени",
+  "navigation_bar.discover": "Дослідити",
+  "navigation_bar.domain_blocks": "Заблоковані домени",
   "navigation_bar.edit_profile": "Редагувати профіль",
+  "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Вподобане",
   "navigation_bar.filters": "Приховані слова",
   "navigation_bar.follow_requests": "Запити на підписку",
-  "navigation_bar.follows_and_followers": "Підписки і підписники",
-  "navigation_bar.info": "Про сайт",
-  "navigation_bar.keyboard_shortcuts": "Гарячі клавіші",
+  "navigation_bar.follows_and_followers": "Підписки та підписники",
   "navigation_bar.lists": "Списки",
   "navigation_bar.logout": "Вийти",
-  "navigation_bar.mutes": "Заглушені користувачі",
+  "navigation_bar.mutes": "Приховані користувачі",
   "navigation_bar.personal": "Особисте",
-  "navigation_bar.pins": "Закріплені дмухи",
+  "navigation_bar.pins": "Закріплені дописи",
   "navigation_bar.preferences": "Налаштування",
   "navigation_bar.public_timeline": "Глобальна стрічка",
+  "navigation_bar.search": "Пошук",
   "navigation_bar.security": "Безпека",
-  "notification.favourite": "{name} вподобав(-ла) ваш допис",
-  "notification.follow": "{name} підписався(-лась) на вас",
-  "notification.follow_request": "{name} відправив(-ла) запит на підписку",
-  "notification.mention": "{name} згадав(-ла) вас",
+  "not_signed_in_indicator.not_signed_in": "Для доступу до цього ресурсу вам потрібно увійти.",
+  "notification.admin.report": "Скарга від {name} на {target}",
+  "notification.admin.sign_up": "{name} приєдналися",
+  "notification.favourite": "Ваш допис подобається {name}",
+  "notification.follow": "{name} підписалися на вас",
+  "notification.follow_request": "{name} відправили запит на підписку",
+  "notification.mention": "{name} згадали вас",
   "notification.own_poll": "Ваше опитування завершено",
-  "notification.poll": "Опитування, у якому ви голосували, закінчилося",
-  "notification.reblog": "{name} передмухнув(-ла) Ваш допис",
+  "notification.poll": "Опитування, у якому ви голосували, скінчилося",
+  "notification.reblog": "{name} поширює ваш допис",
   "notification.status": "{name} щойно дописує",
+  "notification.update": "{name} змінює допис",
   "notifications.clear": "Очистити сповіщення",
-  "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщеня?",
-  "notifications.column_settings.alert": "Сповіщення на комп'ютері",
+  "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
+  "notifications.column_settings.admin.report": "Нові скарги:",
+  "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
+  "notifications.column_settings.alert": "Сповіщення стільниці",
   "notifications.column_settings.favourite": "Вподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
-  "notifications.column_settings.filter_bar.show": "Показати",
+  "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
   "notifications.column_settings.mention": "Згадки:",
   "notifications.column_settings.poll": "Результати опитування:",
   "notifications.column_settings.push": "Push-сповіщення",
-  "notifications.column_settings.reblog": "Передмухи:",
-  "notifications.column_settings.show": "Показати в колонці",
+  "notifications.column_settings.reblog": "Поширення:",
+  "notifications.column_settings.show": "Показати в стовпчику",
   "notifications.column_settings.sound": "Відтворювати звуки",
-  "notifications.column_settings.status": "Нові дмухи:",
-  "notifications.column_settings.unread_markers.category": "Мітки непрочитаних сповіщень",
+  "notifications.column_settings.status": "Нові дописи:",
+  "notifications.column_settings.unread_notifications.category": "Непрочитані сповіщення",
+  "notifications.column_settings.unread_notifications.highlight": "Виділити непрочитані сповіщення",
+  "notifications.column_settings.update": "Зміни:",
   "notifications.filter.all": "Усі",
-  "notifications.filter.boosts": "Передмухи",
-  "notifications.filter.favourites": "Улюблені",
+  "notifications.filter.boosts": "Поширення",
+  "notifications.filter.favourites": "Вподобані",
   "notifications.filter.follows": "Підписки",
   "notifications.filter.mentions": "Згадки",
   "notifications.filter.polls": "Результати опитування",
@@ -342,139 +441,210 @@
   "picture_in_picture.restore": "Повернути назад",
   "poll.closed": "Закрито",
   "poll.refresh": "Оновити",
-  "poll.total_people": "{count, plural, one {# особа} other {# осіб}}",
+  "poll.total_people": "{count, plural, one {# особа} few {# особи} many {# осіб} other {# особи}}",
   "poll.total_votes": "{count, plural, one {# голос} few {# голоси} many {# голосів} other {# голосів}}",
   "poll.vote": "Проголосувати",
-  "poll.voted": "Ви голосували за цю відповідь",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.voted": "Ви проголосували за цю відповідь",
+  "poll.votes": "{votes, plural, one {# голос} few {# голоси} many {# голосів} other {# голоса}}",
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
   "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Особисто",
+  "privacy.direct.short": "Лише згадані люди",
   "privacy.private.long": "Показати тільки підписникам",
   "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Показувати у публічних стрічках",
+  "privacy.public.long": "Видимий для всіх",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Не показувати у публічних стрічках",
+  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
   "privacy.unlisted.short": "Прихований",
+  "privacy_policy.last_updated": "Оновлено {date}",
+  "privacy_policy.title": "Політика приватності",
   "refresh": "Оновити",
   "regeneration_indicator.label": "Завантаження…",
-  "regeneration_indicator.sublabel": "Ваша домашня стрічка готується!",
+  "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!",
   "relative_time.days": "{number}д",
+  "relative_time.full.days": "{number, plural, one {# день} few {# дні} other {# днів}} тому",
+  "relative_time.full.hours": "{number, plural, one {# година} few {# години} other {# годин}} тому",
+  "relative_time.full.just_now": "щойно",
+  "relative_time.full.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}} тому",
+  "relative_time.full.seconds": "{number, plural, one {# секунда} few {# секунди} other {# секунд}} тому",
   "relative_time.hours": "{number}г",
   "relative_time.just_now": "щойно",
   "relative_time.minutes": "{number}х",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "сьогодні",
   "reply_indicator.cancel": "Відмінити",
+  "report.block": "Заблокувати",
+  "report.block_explanation": "Ви не будете бачити дописи цього користувача, а вони не зможуть бачити ваші дописи або підписуватися на вас. Вони будуть бачити, що ви їх заблокували.",
+  "report.categories.other": "Інше",
+  "report.categories.spam": "Спам",
+  "report.categories.violation": "Контент порушує одне або кілька правил сервера",
+  "report.category.subtitle": "Оберіть найкращий збіг",
+  "report.category.title": "Розкажіть нам, що не так з цим {type}",
+  "report.category.title_account": "профіль",
+  "report.category.title_status": "допис",
+  "report.close": "Готово",
+  "report.comment.title": "Чи є щось, що нам потрібно знати?",
   "report.forward": "Надіслати до {target}",
-  "report.forward_hint": "Це акаунт з іншого серверу. Відправити анонімізовану копію скарги і туди?",
-  "report.hint": "Скаргу буде відправлено модераторам Вашого сайту. Ви можете надати їм пояснення, чому ви скаржитесь на акаунт нижче:",
+  "report.forward_hint": "Це обліковий запис з іншого сервера. Відправити анонімізовану копію скарги й туди?",
+  "report.mute": "Приховати",
+  "report.mute_explanation": "Ви не побачите їхніх дописів. Вони все ще можуть стежити за вами, бачити ваші дописи, але не знатимуть що їх приховано.",
+  "report.next": "Далі",
   "report.placeholder": "Додаткові коментарі",
+  "report.reasons.dislike": "Мені це не подобається",
+  "report.reasons.dislike_description": "Вам би не хотілося це бачити",
+  "report.reasons.other": "Це щось інше",
+  "report.reasons.other_description": "Ця проблема не відповідає жодній іншій категорії",
+  "report.reasons.spam": "Це спам",
+  "report.reasons.spam_description": "Шкідливі посилання, фальшиві взаємодії, або повідомлення, що повторюються",
+  "report.reasons.violation": "Порушує правила сервера",
+  "report.reasons.violation_description": "Ви впевнені, що це порушує певні правила",
+  "report.rules.subtitle": "Виберіть усі варіанти, що підходять",
+  "report.rules.title": "Які правила порушено?",
+  "report.statuses.subtitle": "Виберіть усі варіанти, що підходять",
+  "report.statuses.title": "Чи є дописи, які належать до цієї скарги?",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на {target}",
+  "report.thanks.take_action": "Ось ваші варіанти керування тим, що ви бачите в Mastodon:",
+  "report.thanks.take_action_actionable": "Поки ми переглядаємо це, ви можете вжити власних заходів проти @{name}:",
+  "report.thanks.title": "Не хочете це бачити?",
+  "report.thanks.title_actionable": "Дякуємо за скаргу, ми розглянемо її.",
+  "report.unfollow": "Відписатися від @{name}",
+  "report.unfollow_explanation": "Ви підписані на цього користувача. Щоб більше не бачити їхні дописи у вашій стрічці, відпишіться від них.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} допис} few {{count} дописи} many {{count} дописів} other {{count} дописи}} прикріплено",
+  "report_notification.categories.other": "Інше",
+  "report_notification.categories.spam": "Спам",
+  "report_notification.categories.violation": "Порушення правил",
+  "report_notification.open": "Відкрити скаргу",
   "search.placeholder": "Пошук",
+  "search.search_or_paste": "Введіть адресу або пошуковий запит",
   "search_popout.search_format": "Розширений формат пошуку",
-  "search_popout.tips.full_text": "Пошук за текстом знаходить статуси, які ви написали, вподобали, передмухнули, або в яких вас згадували. Також він знаходить імена користувачів, реальні імена та хештеґи.",
+  "search_popout.tips.full_text": "Пошук за текстом знаходить дописи, які ви написали, вподобали, поширили, або в яких вас згадували. Також він знаходить імена користувачів, реальні імена та гештеґи.",
   "search_popout.tips.hashtag": "хештеґ",
-  "search_popout.tips.status": "статус",
+  "search_popout.tips.status": "допис",
   "search_popout.tips.text": "Пошук за текстом знаходить імена користувачів, реальні імена та хештеґи",
   "search_popout.tips.user": "користувач",
   "search_results.accounts": "Люди",
+  "search_results.all": "Усі",
   "search_results.hashtags": "Хештеґи",
-  "search_results.statuses": "Дмухів",
-  "search_results.statuses_fts_disabled": "Пошук дмухів за вмістом недоступний на цьому сервері Mastodon.",
+  "search_results.nothing_found": "Нічого не вдалося знайти за цими пошуковими термінами",
+  "search_results.statuses": "Дописів",
+  "search_results.statuses_fts_disabled": "Пошук дописів за вмістом недоступний на даному сервері Mastodon.",
+  "search_results.title": "Шукати {q}",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}",
+  "server_banner.about_active_users": "Люди, які використовують цей сервер протягом останніх 30 днів (Щомісячні Активні Користувачі)",
+  "server_banner.active_users": "активні користувачі",
+  "server_banner.administered_by": "Адміністратор:",
+  "server_banner.introduction": "{domain} є частиною децентралізованої соціальної мережі від {mastodon}.",
+  "server_banner.learn_more": "Дізнайтесь більше",
+  "server_banner.server_stats": "Статистика сервера:",
+  "sign_in_banner.create_account": "Створити обліковий запис",
+  "sign_in_banner.sign_in": "Увійти",
+  "sign_in_banner.text": "Увійдіть, щоб слідкувати за профілями або хештеґами, вподобаними, ділитися і відповідати на повідомлення або взаємодіяти з вашого облікового запису на іншому сервері.",
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
-  "status.admin_status": "Відкрити цей статус в інтерфейсі модерації",
+  "status.admin_status": "Відкрити цей допис в інтерфейсі модерації",
   "status.block": "Заблокувати @{name}",
-  "status.bookmark": "Додати в закладки",
-  "status.cancel_reblog_private": "Відмінити передмухання",
-  "status.cannot_reblog": "Цей допис не може бути передмухнутий",
-  "status.copy": "Копіювати посилання до статусу",
+  "status.bookmark": "Додати до закладок",
+  "status.cancel_reblog_private": "Скасувати поширення",
+  "status.cannot_reblog": "Цей допис не може бути поширений",
+  "status.copy": "Копіювати посилання на допис",
   "status.delete": "Видалити",
   "status.detailed_status": "Детальний вигляд бесіди",
   "status.direct": "Пряме повідомлення до @{name}",
+  "status.edit": "Редагувати",
+  "status.edited": "Відредаговано {date}",
+  "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
   "status.embed": "Вбудувати",
   "status.favourite": "Подобається",
+  "status.filter": "Фільтрувати цей допис",
   "status.filtered": "Відфільтровано",
+  "status.hide": "Сховати дмух",
+  "status.history.created": "{name} створює {date}",
+  "status.history.edited": "{name} змінює {date}",
   "status.load_more": "Завантажити більше",
   "status.media_hidden": "Медіа приховано",
   "status.mention": "Згадати @{name}",
   "status.more": "Більше",
-  "status.mute": "Заглушити @{name}",
-  "status.mute_conversation": "Заглушити діалог",
+  "status.mute": "Приховати @{name}",
+  "status.mute_conversation": "Ігнорувати розмову",
   "status.open": "Розгорнути допис",
   "status.pin": "Закріпити у профілі",
-  "status.pinned": "Закріплений дмух",
+  "status.pinned": "Закріплений допис",
   "status.read_more": "Дізнатися більше",
-  "status.reblog": "Передмухнути",
-  "status.reblog_private": "Передмухнути для початкової аудиторії",
-  "status.reblogged_by": "{name} передмухнув(-ла)",
-  "status.reblogs.empty": "Ніхто ще не передмухнув цього дмуху. Коли якісь користувачі це зроблять, вони будуть відображені тут.",
-  "status.redraft": "Видалити та перестворити",
+  "status.reblog": "Поширити",
+  "status.reblog_private": "Поширити для початкової аудиторії",
+  "status.reblogged_by": "{name} поширює",
+  "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
+  "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
+  "status.replied_to": "Відповідь для {name}",
   "status.reply": "Відповісти",
   "status.replyAll": "Відповісти на ланцюжок",
   "status.report": "Поскаржитися на @{name}",
-  "status.sensitive_warning": "Делікатний зміст",
+  "status.sensitive_warning": "Делікатний вміст",
   "status.share": "Поділитися",
+  "status.show_filter_reason": "Усе одно показати",
   "status.show_less": "Згорнути",
-  "status.show_less_all": "Показувати менше для всіх",
+  "status.show_less_all": "Згорнути для всіх",
   "status.show_more": "Розгорнути",
-  "status.show_more_all": "Показувати більше для всіх",
-  "status.show_thread": "Показати ланцюжок",
+  "status.show_more_all": "Розгорнути для всіх",
+  "status.show_original": "Показати оригінал",
+  "status.translate": "Перекласти",
+  "status.translated_from_with": "Перекладено з {lang} за допомогою {provider}",
   "status.uncached_media_warning": "Недоступно",
-  "status.unmute_conversation": "Зняти глушення з діалогу",
+  "status.unmute_conversation": "Не ігнорувати розмову",
   "status.unpin": "Відкріпити від профілю",
+  "subscribed_languages.lead": "Лише дописи вибраними мовами з'являтимуться на вашій домівці та у списку стрічок після змін. Виберіть «none», щоб отримувати повідомлення всіма мовами.",
+  "subscribed_languages.save": "Зберегти зміни",
+  "subscribed_languages.target": "Змінити підписані мови для {target}",
   "suggestions.dismiss": "Відхилити пропозицію",
   "suggestions.header": "Вас може зацікавити…",
   "tabs_bar.federated_timeline": "Глобальна",
   "tabs_bar.home": "Головна",
   "tabs_bar.local_timeline": "Локальна",
   "tabs_bar.notifications": "Сповіщення",
-  "tabs_bar.search": "Пошук",
   "time_remaining.days": "{number, plural, one {# день} few {# дні} other {# днів}}",
   "time_remaining.hours": "{number, plural, one {# година} few {# години} other {# годин}}",
   "time_remaining.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
   "time_remaining.moments": "Залишилось секунд",
   "time_remaining.seconds": "{number, plural, one {# секунда} few {# секунди} other {# секунд}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} з інших серверів не відображається.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} з інших серверів не зображується.",
   "timeline_hint.resources.followers": "Підписники",
   "timeline_hint.resources.follows": "Підписки",
-  "timeline_hint.resources.statuses": "Старіші дмухи",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} особа обговорює} few {{counter} особи обговорюють} many {{counter} осіб обговорюють} other {{counter} особи обговорюють}}",
-  "trends.trending_now": "Актуальні",
+  "timeline_hint.resources.statuses": "Попередні дописи",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особи} other {{counter} осіб}} {days, plural, one {за останній {days} день} few {за останні {days} дні} other {за останні {days} днів}}",
+  "trends.trending_now": "Популярне зараз",
   "ui.beforeunload": "Вашу чернетку буде втрачено, якщо ви покинете Mastodon.",
   "units.short.billion": "{count} млрд",
   "units.short.million": "{count} млн",
   "units.short.thousand": "{count} тис",
   "upload_area.title": "Перетягніть сюди, щоб завантажити",
-  "upload_button.label": "Додати медіа",
+  "upload_button.label": "Додати зображення, відео або аудіо",
   "upload_error.limit": "Ліміт завантаження файлів перевищено.",
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
+  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
   "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
-  "upload_modal.analyzing_picture": "Аналізуємо малюнок…",
+  "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Застосування…",
   "upload_modal.choose_image": "Вибрати зображення",
   "upload_modal.description_placeholder": "Щурячий бугай із їжаком-харцизом в'ючись підписали ґешефт у єнах",
-  "upload_modal.detect_text": "Виявити текст на малюнку",
+  "upload_modal.detect_text": "Виявити текст на зображенні",
   "upload_modal.edit_media": "Редагувати медіа",
-  "upload_modal.hint": "Клацніть або перетягніть коло на превью, щоб обрати точку, яку буде завжди видно на мініатюрах.",
+  "upload_modal.hint": "Клацніть або перетягніть коло на превʼю, щоб обрати точку, яку буде завжди видно на мініатюрах.",
   "upload_modal.preparing_ocr": "Підготовка OCR…",
   "upload_modal.preview_label": "Переглянути ({ratio})",
   "upload_progress.label": "Завантаження...",
+  "upload_progress.processing": "Обробка…",
   "video.close": "Закрити відео",
-  "video.download": "Завантаження файла",
+  "video.download": "Завантажити файл",
   "video.exit_fullscreen": "Вийти з повноекранного режиму",
-  "video.expand": "Розширити відео",
+  "video.expand": "Розгорнути відео",
   "video.fullscreen": "На весь екран",
   "video.hide": "Приховати відео",
   "video.mute": "Вимкнути звук",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 55f6856d2..9be90fa24 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "معتدل سرورز",
+  "about.contact": "رابطہ:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "وجوہات نہیں دستیاب",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "محدود",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "معطل شدہ",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "نوٹ",
   "account.add_or_remove_from_list": "فہرست میں شامل یا برطرف کریں",
   "account.badges.bot": "روبوٹ",
@@ -7,47 +19,56 @@
   "account.block_domain": "{domain} سے سب چھپائیں",
   "account.blocked": "مسدود کردہ",
   "account.browse_more_on_origin_server": "اصل پروفائل پر مزید براؤز کریں",
-  "account.cancel_follow_request": "درخواستِ پیروی منسوخ کریں",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "راست پیغام @{name}",
   "account.disable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع نہ کریں",
   "account.domain_blocked": "پوشیدہ ڈومین",
   "account.edit_profile": "مشخص ترمیم کریں",
   "account.enable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع کریں",
   "account.endorse": "مشکص پر نمایاں کریں",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "کوئی مراسلہ نہیں",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "پیروی کریں",
   "account.followers": "پیروکار",
   "account.followers.empty": "\"ہنوز اس صارف کی کوئی پیروی نہیں کرتا\".",
   "account.followers_counter": "{count, plural,one {{counter} پیروکار} other {{counter} پیروکار}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} پیروی کر رہے ہیں} other {{counter} پیروی کر رہے ہیں}}",
   "account.follows.empty": "\"یہ صارف ہنوز کسی کی پیروی نہیں کرتا ہے\".",
   "account.follows_you": "آپ کا پیروکار ہے",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "@{name} سے فروغ چھپائیں",
-  "account.joined": "{date} شامل ہوئے",
-  "account.last_status": "آخری فعال",
+  "account.joined_short": "شمولیت",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "اس لنک کی ملکیت کی توثیق {date} پر کی گئی تھی",
   "account.locked_info": "اس اکاونٹ کا اخفائی ضابطہ مقفل ہے۔ صارف کی پیروی کون کر سکتا ہے اس کا جائزہ وہ خود لیتا ہے.",
   "account.media": "وسائل",
   "account.mention": "ذکر @{name}",
-  "account.moved_to": "{name} منتقل ہگیا ہے بہ:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "خاموش @{name}",
   "account.mute_notifications": "@{name} سے اطلاعات خاموش کریں",
   "account.muted": "خاموش کردہ",
-  "account.never_active": "کبھی نہیں",
+  "account.open_original_page": "Open original page",
   "account.posts": "ٹوٹ",
   "account.posts_with_replies": "ٹوٹ اور جوابات",
   "account.report": "@{name} اطلاع کریں",
   "account.requested": "منظوری کا منتظر۔ درخواستِ پیروی منسوخ کرنے کیلئے کلک کریں",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "@{name} کے مشخص کو بانٹیں",
   "account.show_reblogs": "@{name} کی افزائشات کو دکھائیں",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} کو بحال کریں",
   "account.unblock_domain": "{domain} کو نہ چھپائیں",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "مشخص پر نمایاں نہ کریں",
   "account.unfollow": "پیروی ترک کریں",
   "account.unmute": "@{name} کو با آواز کریں",
   "account.unmute_notifications": "@{name} سے اطلاعات کو با آواز کریں",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,18 +78,31 @@
   "alert.unexpected.title": "ا رے!",
   "announcement.announcement": "اعلان",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
-  "bundle_column_error.body": "اس عنصر کو برآمد کرتے وقت کچھ خرابی پیش آئی ہے.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "دوبارہ کوشش کریں",
-  "bundle_column_error.title": "نیٹ ورک کی خرابی",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "بند کریں",
   "bundle_modal_error.message": "اس عنصر کو برآمد کرتے وقت کچھ خرابی پیش آئی ہے.",
   "bundle_modal_error.retry": "دوبارہ کوشش کریں",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "متعلق",
   "column.blocks": "مسدود صارفین",
   "column.bookmarks": "بُک مارکس",
   "column.community": "مقامی زمانی جدول",
-  "column.direct": "راست پیغام",
+  "column.direct": "براہ راست پیغامات",
   "column.directory": "مشخصات کا مطالعہ کریں",
   "column.domain_blocks": "پوشیدہ ڈومین",
   "column.favourites": "پسندیدہ",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "صرف مقامی",
   "community.column_settings.media_only": "وسائل فقط",
   "community.column_settings.remote_only": "صرف خارجی",
-  "compose_form.direct_message_warning": "یہ ٹوٹ صرف مذکورہ صارفین کو بھیجا جائے گا.",
+  "compose.language.change": "زبان تبدیل کریں",
+  "compose.language.search": "زبان تلاش کریں...",
   "compose_form.direct_message_warning_learn_more": "مزید جانیں",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "چونکہ یہ ٹوٹ غیر مندرجہ ہے لہذا یہ کسی بھی ہیش ٹیگ کے تحت درج نہیں کیا جائے گا. ہیش ٹیگ کے تحت صرف \nعمومی ٹوٹ تلاش کئے جا سکتے ہیں.",
   "compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
   "compose_form.lock_disclaimer.lock": "مقفل",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
   "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
   "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
-  "compose_form.publish": "ٹوٹ",
+  "compose_form.publish": "اشاعت کردہ",
+  "compose_form.publish_form": "اشاعت کریں",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
   "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
   "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
   "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
   "confirmations.block.message": "کیا واقعی آپ {name} کو بلاک کرنا چاہتے ہیں؟",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "ڈیلیٹ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "ڈیلیٹ",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "بطور پڑھا ہوا دکھائیں",
   "conversation.open": "گفتگو دیکھیں",
   "conversation.with": "{names} کے ساتھ",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "کاپی کریں",
   "directory.federated": "معروف فیڈی ورس سے",
   "directory.local": "صرف {domain} سے",
   "directory.new_arrivals": "نئے آنے والے",
   "directory.recently_active": "حال میں میں ایکٹیو",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "برخاست کریں",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "یہ اس طرح نظر آئے گا:",
   "emoji_button.activity": "سرگرمی",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "حسب منشا",
   "emoji_button.flags": "پرچم",
   "emoji_button.food": "عذا و مشروب",
@@ -163,8 +214,9 @@
   "empty_column.blocks": "آپ نے ابھی کسی صارف کو مسدود نہیں کیا ہے.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "مقامی جدول خالی ہے. کچھ تحریر کریں تاکہ بات آگے بڑھے!",
-  "empty_column.direct": "آپ کیلئے کوئی راست پیغام نہیں ہے. جب آپ بھیجیں گے یا وصول کریں گے، یہاں نظر آئےگا.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "ابھی تک کوئی چھپا ہوا ڈومین نہیں ہے.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "آپ کا کوئی پسندیدہ ٹوٹ نہیں ہے. جب آپ پسند کریں گے، یہاں نظر آئےگا.",
   "empty_column.favourites": "ابھی تک کسی نے بھی اس ٹوٹ کو پسند نہیں کیا ہے. جب بھی کوئی اسے پسند کرے گا، ان کا نام یہاں نظر آئے گا.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "مسئلہ کی اطلاع کریں",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "اجازت دیں",
   "follow_request.reject": "انکار کریں",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "فہرست مشخصات",
-  "getting_started.documentation": "اسناد",
   "getting_started.heading": "آغاز کریں",
-  "getting_started.invite": "دوستوں کو دعوت دیں",
-  "getting_started.open_source_notice": "ماسٹوڈون آزاد منبع سوفٹویر ہے. آپ {github} گِٹ ہب پر مسائل میں معاونت یا مشکلات کی اطلاع دے سکتے ہیں.",
-  "getting_started.security": "ترتیباتِ اکاؤنٹ",
-  "getting_started.terms": "شرائط خدمات",
   "hashtag.column_header.tag_mode.all": "اور {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
   "hashtag.column_header.tag_mode.none": "بغیر {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
   "hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
   "hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "بنیادی",
   "home.column_settings.show_reblogs": "افزائشات دکھائیں",
   "home.column_settings.show_replies": "جوابات دکھائیں",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
   "intervals.full.hours": "{number, plural, one {# ساعت} other {# ساعت}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "غیر معینہ",
-  "navigation_bar.apps": "موبائل ایپس",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "مسدود صارفین",
   "navigation_bar.bookmarks": "بُک مارکس",
   "navigation_bar.community_timeline": "مقامی ٹائم لائن",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "براہ راست پیغامات",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "پسندیدہ",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
   "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
-  "navigation_bar.info": "اس سرور کے بارے میں",
-  "navigation_bar.keyboard_shortcuts": "ہوٹ کیز",
   "navigation_bar.lists": "فہرستیں",
   "navigation_bar.logout": "لاگ آؤٹ",
   "navigation_bar.mutes": "خاموش کردہ صارفین",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "ترجیحات",
   "navigation_bar.public_timeline": "وفاقی ٹائم لائن",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "سیکورٹی",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "{name} آپ کی پیروی کی",
   "notification.follow_request": "{name} نے آپ کی پیروی کی درخواست کی",
@@ -306,13 +400,16 @@
   "notification.poll": "آپ کا ووٹ دیا گیا ایک پول ختم ہو گیا ہے",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} نے ابھی ابھی پوسٹ کیا",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "اطلاعات ہٹائیں",
   "notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات",
   "notifications.column_settings.favourite": "پسندیدہ:",
   "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -354,27 +453,71 @@
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
-  "report.submit": "Submit",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "Search",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "People",
+  "search_results.all": "All",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "Delete",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "Close video",
   "video.download": "Download file",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9922707be..05608928f 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -1,74 +1,108 @@
 {
+  "about.blocks": "Giới hạn chung",
+  "about.contact": "Liên lạc:",
+  "about.disclaimer": "Mastodon là phần mềm tự do mã nguồn mở, một thương hiệu của Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Lý do không được cung cấp",
+  "about.domain_blocks.preamble": "Mastodon cho phép bạn tương tác nội dung và giao tiếp với mọi người từ bất kỳ máy chủ nào khác trong mạng liên hợp. Còn máy chủ này có những ngoại lệ riêng.",
+  "about.domain_blocks.silenced.explanation": "Nói chung, bạn sẽ không thấy người và nội dung từ máy chủ này, trừ khi bạn tự tìm kiếm hoặc tự theo dõi.",
+  "about.domain_blocks.silenced.title": "Hạn chế",
+  "about.domain_blocks.suspended.explanation": "Dữ liệu từ máy chủ này sẽ không được xử lý, lưu trữ hoặc trao đổi. Mọi tương tác hoặc giao tiếp với người từ máy chủ này đều bị cấm.",
+  "about.domain_blocks.suspended.title": "Vô hiệu hóa",
+  "about.not_available": "Máy chủ này chưa cung cấp thông tin.",
+  "about.powered_by": "Mạng xã hội liên hợp {mastodon}",
+  "about.rules": "Quy tắc máy chủ",
   "account.account_note_header": "Ghi chú",
-  "account.add_or_remove_from_list": "Thêm hoặc Xóa khỏi danh sách",
+  "account.add_or_remove_from_list": "Thêm hoặc xóa khỏi danh sách",
   "account.badges.bot": "Bot",
   "account.badges.group": "Nhóm",
   "account.block": "Chặn @{name}",
-  "account.block_domain": "Ẩn mọi thứ từ {domain}",
+  "account.block_domain": "Chặn mọi thứ từ {domain}",
   "account.blocked": "Đã chặn",
   "account.browse_more_on_origin_server": "Truy cập trang của người này",
-  "account.cancel_follow_request": "Hủy yêu cầu theo dõi",
-  "account.direct": "Nhắn tin @{name}",
-  "account.disable_notifications": "Không thông báo khi @{name} đăng tút",
-  "account.domain_blocked": "Người đã chặn",
-  "account.edit_profile": "Chỉnh sửa trang cá nhân",
-  "account.enable_notifications": "Thông báo khi @{name} đăng tút",
+  "account.cancel_follow_request": "Thu hồi yêu cầu theo dõi",
+  "account.direct": "Nhắn riêng @{name}",
+  "account.disable_notifications": "Tắt thông báo khi @{name} đăng bài viết",
+  "account.domain_blocked": "Tên miền đã chặn",
+  "account.edit_profile": "Sửa hồ sơ",
+  "account.enable_notifications": "Nhận thông báo khi @{name} đăng tút",
   "account.endorse": "Tôn vinh người này",
+  "account.featured_tags.last_status_at": "Tút gần nhất {date}",
+  "account.featured_tags.last_status_never": "Chưa có tút",
+  "account.featured_tags.title": "Hashtag {name} thường dùng",
   "account.follow": "Theo dõi",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
   "account.followers_counter": "{count, plural, one {{counter} Người theo dõi} other {{counter} Người theo dõi}}",
+  "account.following": "Đang theo dõi",
   "account.following_counter": "{count, plural, one {{counter} Theo dõi} other {{counter} Theo dõi}}",
   "account.follows.empty": "Người này chưa theo dõi ai.",
   "account.follows_you": "Đang theo dõi bạn",
-  "account.hide_reblogs": "Ẩn chia sẻ từ @{name}",
-  "account.joined": "Đã tham gia {date}",
-  "account.last_status": "Online",
-  "account.link_verified_on": "Liên kết này đã được xác thực vào {date}",
-  "account.locked_info": "Đây là tài khoản riêng tư. Họ sẽ tự mình xét duyệt các yêu cầu theo dõi.",
+  "account.go_to_profile": "Xem hồ sơ",
+  "account.hide_reblogs": "Ẩn tút @{name} đăng lại",
+  "account.joined_short": "Đã tham gia",
+  "account.languages": "Đổi ngôn ngữ mong muốn",
+  "account.link_verified_on": "Liên kết này đã được xác minh vào {date}",
+  "account.locked_info": "Đây là tài khoản riêng tư. Chủ tài khoản tự mình xét duyệt các yêu cầu theo dõi.",
   "account.media": "Media",
   "account.mention": "Nhắc đến @{name}",
-  "account.moved_to": "{name} đã đổi thành:",
+  "account.moved_to": "{name} đã chuyển sang máy chủ khác:",
   "account.mute": "Ẩn @{name}",
   "account.mute_notifications": "Tắt thông báo từ @{name}",
   "account.muted": "Đã ẩn",
-  "account.never_active": "Chưa có bất cứ hoạt động nào",
+  "account.open_original_page": "Mở trang gốc",
   "account.posts": "Tút",
   "account.posts_with_replies": "Trả lời",
   "account.report": "Báo cáo @{name}",
   "account.requested": "Đang chờ chấp thuận. Nhấp vào đây để hủy yêu cầu theo dõi",
+  "account.requested_follow": "{name} yêu cầu theo dõi bạn",
   "account.share": "Chia sẻ trang @{name}",
-  "account.show_reblogs": "Hiện chia sẻ từ @{name}",
+  "account.show_reblogs": "Hiện tút do @{name} đăng lại",
   "account.statuses_counter": "{count, plural, one {{counter} Tút} other {{counter} Tút}}",
   "account.unblock": "Bỏ chặn @{name}",
   "account.unblock_domain": "Bỏ ẩn {domain}",
+  "account.unblock_short": "Bỏ chặn",
   "account.unendorse": "Ngưng tôn vinh người này",
   "account.unfollow": "Ngưng theo dõi",
   "account.unmute": "Bỏ ẩn @{name}",
   "account.unmute_notifications": "Mở lại thông báo từ @{name}",
+  "account.unmute_short": "Bỏ ẩn",
   "account_note.placeholder": "Nhấn để thêm",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "Tỉ lệ người dùng sau đăng ký ở lại theo ngày",
+  "admin.dashboard.monthly_retention": "Tỉ lệ người dùng ở lại sau khi đăng ký",
+  "admin.dashboard.retention.average": "Trung bình",
+  "admin.dashboard.retention.cohort": "Tháng đăng ký",
+  "admin.dashboard.retention.cohort_size": "Người mới",
   "alert.rate_limited.message": "Vui lòng thử lại sau {retry_time, time, medium}.",
   "alert.rate_limited.title": "Vượt giới hạn",
   "alert.unexpected.message": "Đã xảy ra lỗi không mong muốn.",
   "alert.unexpected.title": "Ốiii!",
-  "announcement.announcement": "Thông báo chung",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "announcement.announcement": "Có gì mới?",
+  "attachments_list.unprocessed": "(chưa xử lí)",
+  "audio.hide": "Ẩn âm thanh",
   "autosuggest_hashtag.per_week": "{count} mỗi tuần",
-  "boost_modal.combo": "Nhấn {combo} để chia sẻ nhanh hơn",
-  "bundle_column_error.body": "Đã có lỗi xảy ra trong khi tải nội dung này.",
+  "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
+  "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
+  "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
+  "bundle_column_error.error.title": "Ôi không!",
+  "bundle_column_error.network.body": "Đã xảy ra lỗi khi tải trang này. Đây có thể là vấn đề tạm thời rớt mạng của bạn hoặc máy chủ này.",
+  "bundle_column_error.network.title": "Lỗi mạng",
   "bundle_column_error.retry": "Thử lại",
-  "bundle_column_error.title": "Không có kết nối internet",
+  "bundle_column_error.return": "Quay lại trang chủ",
+  "bundle_column_error.routing.body": "Không thể tìm thấy trang cần tìm. Bạn có chắc URL trong thanh địa chỉ là chính xác?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Đóng",
   "bundle_modal_error.message": "Đã có lỗi xảy ra trong khi tải nội dung này.",
   "bundle_modal_error.retry": "Thử lại",
+  "closed_registrations.other_server_instructions": "Vì Mastodon liên hợp nên bạn có thể tạo tài khoản trên máy chủ khác và vẫn tương tác với máy chủ này.",
+  "closed_registrations_modal.description": "{domain} hiện tắt đăng ký, nhưng hãy lưu ý rằng bạn không cần một tài khoản riêng trên {domain} để sử dụng Mastodon.",
+  "closed_registrations_modal.find_another_server": "Tìm máy chủ khác",
+  "closed_registrations_modal.preamble": "Mastodon liên hợp, vì vậy bất kể bạn tạo tài khoản ở đâu, bạn sẽ có thể theo dõi và tương tác với bất kỳ ai trên máy chủ này. Bạn thậm chí có thể tự mở máy chủ!",
+  "closed_registrations_modal.title": "Đăng ký trên Mastodon",
+  "column.about": "Giới thiệu",
   "column.blocks": "Người đã chặn",
   "column.bookmarks": "Đã lưu",
-  "column.community": "Máy chủ của bạn",
-  "column.direct": "Tin nhắn",
+  "column.community": "Máy chủ này",
+  "column.direct": "Nhắn riêng",
   "column.directory": "Tìm người cùng sở thích",
   "column.domain_blocks": "Máy chủ đã chặn",
   "column.favourites": "Thích",
@@ -78,7 +112,7 @@
   "column.mutes": "Người đã ẩn",
   "column.notifications": "Thông báo",
   "column.pins": "Tút ghim",
-  "column.public": "Mạng liên hợp",
+  "column.public": "Liên hợp",
   "column_back_button.label": "Quay lại",
   "column_header.hide_settings": "Ẩn bộ lọc",
   "column_header.moveLeft_settings": "Dời cột sang bên trái",
@@ -89,9 +123,11 @@
   "column_subheading.settings": "Cài đặt",
   "community.column_settings.local_only": "Chỉ máy chủ của bạn",
   "community.column_settings.media_only": "Chỉ xem media",
-  "community.column_settings.remote_only": "Chỉ người dùng ở máy chủ khác",
-  "compose_form.direct_message_warning": "Tút này sẽ chỉ gửi cho người được nhắc đến.",
+  "community.column_settings.remote_only": "Chỉ người ở máy chủ khác",
+  "compose.language.change": "Chọn ngôn ngữ tút",
+  "compose.language.search": "Tìm ngôn ngữ...",
   "compose_form.direct_message_warning_learn_more": "Tìm hiểu thêm",
+  "compose_form.encryption_warning": "Các tút trên Mastodon không được mã hóa đầu cuối. Không chia sẻ bất kỳ thông tin nhạy cảm nào qua Mastodon.",
   "compose_form.hashtag_warning": "Tút này sẽ không xuất hiện công khai. Chỉ những tút công khai mới có thể được tìm kiếm thông qua hashtag.",
   "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
@@ -102,24 +138,28 @@
   "compose_form.poll.remove_option": "Xóa lựa chọn này",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
-  "compose_form.publish": "Đăng tút",
+  "compose_form.publish": "Đăng",
+  "compose_form.publish_form": "Đăng",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Lưu thay đổi",
   "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
   "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
   "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
-  "compose_form.spoiler_placeholder": "Viết nội dung ẩn của bạn ở đây",
+  "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
   "confirmations.block.message": "Bạn có thật sự muốn chặn {name}?",
+  "confirmations.cancel_follow_request.confirm": "Thu hồi yêu cầu",
+  "confirmations.cancel_follow_request.message": "Bạn có chắc muốn thu hồi yêu cầu theo dõi của bạn với {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
-  "confirmations.delete.message": "Bạn \bthật sự muốn xóa tút này?",
+  "confirmations.delete.message": "Bạn thật sự muốn xóa tút này?",
   "confirmations.delete_list.confirm": "Xóa bỏ",
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Bỏ qua",
+  "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
   "confirmations.domain_block.confirm": "Ẩn toàn bộ máy chủ",
   "confirmations.domain_block.message": "Bạn thật sự muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
   "confirmations.logout.confirm": "Đăng xuất",
@@ -128,7 +168,7 @@
   "confirmations.mute.explanation": "Điều này sẽ khiến tút của họ và những tút có nhắc đến họ bị ẩn, tuy nhiên họ vẫn có thể xem tút của bạn và theo dõi bạn.",
   "confirmations.mute.message": "Bạn thật sự muốn ẩn {name}?",
   "confirmations.redraft.confirm": "Xóa & viết lại",
-  "confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và chia sẻ của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
+  "confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và đăng lại của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
   "confirmations.reply.confirm": "Trả lời",
   "confirmations.reply.message": "Nội dung bạn đang soạn thảo sẽ bị ghi đè, bạn có tiếp tục?",
   "confirmations.unfollow.confirm": "Ngưng theo dõi",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
   "conversation.with": "Với {names}",
+  "copypaste.copied": "Đã sao chép",
+  "copypaste.copy": "Sao chép",
   "directory.federated": "Từ mạng liên hợp",
   "directory.local": "Từ {domain}",
   "directory.new_arrivals": "Mới tham gia",
   "directory.recently_active": "Hoạt động gần đây",
+  "disabled_account_banner.account_settings": "Cài đặt tài khoản",
+  "disabled_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng.",
+  "dismissable_banner.community_timeline": "Những tút gần đây của những người có tài khoản thuộc máy chủ {domain}.",
+  "dismissable_banner.dismiss": "Bỏ qua",
+  "dismissable_banner.explore_links": "Những sự kiện đang được thảo luận nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
+  "dismissable_banner.explore_statuses": "Những tút đang phổ biến trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
+  "dismissable_banner.explore_tags": "Những hashtag đang được sử dụng nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
+  "dismissable_banner.public_timeline": "Những tút công khai gần đây nhất trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.",
   "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
   "embed.preview": "Nó sẽ hiển thị như vầy:",
   "emoji_button.activity": "Hoạt động",
+  "emoji_button.clear": "Xóa",
   "emoji_button.custom": "Độc đáo",
   "emoji_button.flags": "Cờ",
   "emoji_button.food": "Ăn uống",
@@ -163,11 +214,12 @@
   "empty_column.blocks": "Bạn chưa chặn bất cứ ai.",
   "empty_column.bookmarked_statuses": "Bạn chưa lưu tút nào. Nếu có, nó sẽ hiển thị ở đây.",
   "empty_column.community": "Máy chủ của bạn chưa có tút nào công khai. Bạn hãy thử viết gì đó đi!",
-  "empty_column.direct": "Bạn chưa có tin nhắn nào. Khi bạn gửi hoặc nhận tin nhắn, nó sẽ hiển thị ở đây.",
+  "empty_column.direct": "Bạn chưa có tin nhắn riêng nào. Khi bạn gửi hoặc nhận một tin nhắn riêng, nó sẽ xuất hiện ở đây.",
   "empty_column.domain_blocks": "Chưa ẩn bất kỳ máy chủ nào.",
+  "empty_column.explore_statuses": "Chưa có gì hot. Kiểm tra lại sau!",
   "empty_column.favourited_statuses": "Bạn chưa thích tút nào. Hãy thử đi, nó sẽ xuất hiện ở đây.",
   "empty_column.favourites": "Chưa có ai thích tút này.",
-  "empty_column.follow_recommendations": "Bạn chưa có gợi ý theo dõi nào. Hãy thử tìm kiếm những người thú vị hoặc khám phá những hashtag xu hướng.",
+  "empty_column.follow_recommendations": "Bạn chưa có gợi ý theo dõi nào. Hãy thử tìm kiếm những người thú vị hoặc khám phá những hashtag nổi bật.",
   "empty_column.follow_requests": "Bạn chưa có yêu cầu theo dõi nào.",
   "empty_column.hashtag": "Chưa có bài đăng nào dùng hashtag này.",
   "empty_column.home": "Bảng tin của bạn đang trống! Hãy theo dõi nhiều người hơn. {suggestions}",
@@ -175,7 +227,7 @@
   "empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
   "empty_column.lists": "Bạn chưa tạo danh sách nào.",
   "empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
-  "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn tin cho một ai đó.",
+  "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho một ai đó.",
   "empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu theo dõi những người khác",
   "error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
   "error.unexpected_crash.explanation_addons": "Trang này không thể hiển thị do xung khắc với add-on của trình duyệt hoặc công cụ tự động dịch ngôn ngữ.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Hãy tắt add-on và làm tươi trang. Nếu vẫn không được, bạn nên thử đăng nhập Mastodon trên trình duyệt khác hoặc app khác.",
   "errors.unexpected_crash.copy_stacktrace": "Sao chép stacktrace vào clipboard",
   "errors.unexpected_crash.report_issue": "Báo cáo lỗi",
+  "explore.search_results": "Kết quả tìm kiếm",
+  "explore.suggested_follows": "Đề xuất",
+  "explore.title": "Khám phá",
+  "explore.trending_links": "Tin tức",
+  "explore.trending_statuses": "Tút",
+  "explore.trending_tags": "Hashtag",
+  "filter_modal.added.context_mismatch_explanation": "Danh mục bộ lọc này không áp dụng cho ngữ cảnh mà bạn đã truy cập tút này. Nếu bạn muốn tút cũng được lọc trong ngữ cảnh này, bạn sẽ phải chỉnh sửa bộ lọc.",
+  "filter_modal.added.context_mismatch_title": "Bối cảnh không phù hợp!",
+  "filter_modal.added.expired_explanation": "Danh mục bộ lọc này đã hết hạn, bạn sẽ cần thay đổi ngày hết hạn để áp dụng.",
+  "filter_modal.added.expired_title": "Bộ lọc đã hết hạn!",
+  "filter_modal.added.review_and_configure": "Để xem lại và định cấu hình thêm danh mục bộ lọc này, hãy xem {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Thiết lập bộ lọc",
+  "filter_modal.added.settings_link": "trang cài đặt",
+  "filter_modal.added.short_explanation": "Tút này đã được thêm vào danh mục bộ lọc sau: {title}.",
+  "filter_modal.added.title": "Đã thêm bộ lọc!",
+  "filter_modal.select_filter.context_mismatch": "không áp dụng cho bối cảnh này",
+  "filter_modal.select_filter.expired": "hết hạn",
+  "filter_modal.select_filter.prompt_new": "Danh mục mới: {name}",
+  "filter_modal.select_filter.search": "Tìm kiếm hoặc tạo mới",
+  "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
+  "filter_modal.select_filter.title": "Lọc tút này",
+  "filter_modal.title.status": "Lọc một tút",
   "follow_recommendations.done": "Xong",
   "follow_recommendations.heading": "Theo dõi những người bạn muốn đọc tút của họ! Dưới đây là vài gợi ý.",
   "follow_recommendations.lead": "Tút từ những người bạn theo dõi sẽ hiện theo thứ tự thời gian trên bảng tin. Đừng ngại, bạn có thể dễ dàng ngưng theo dõi họ bất cứ lúc nào!",
   "follow_request.authorize": "Cho phép",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
+  "footer.about": "Giới thiệu",
+  "footer.directory": "Cộng đồng",
+  "footer.get_app": "Ứng dụng",
+  "footer.invite": "Mời bạn bè",
+  "footer.keyboard_shortcuts": "Phím tắt",
+  "footer.privacy_policy": "Chính sách bảo mật",
+  "footer.source_code": "Mã nguồn",
   "generic.saved": "Đã lưu",
-  "getting_started.developers": "Nhà phát triển",
-  "getting_started.directory": "Cộng đồng",
-  "getting_started.documentation": "Tài liệu",
   "getting_started.heading": "Quản lý",
-  "getting_started.invite": "Mời bạn bè",
-  "getting_started.open_source_notice": "Mastodon là phần mềm mã nguồn mở. Bạn có thể đóng góp hoặc báo lỗi trên GitHub tại {github}.",
-  "getting_started.security": "Bảo mật",
-  "getting_started.terms": "Điều khoản dịch vụ",
   "hashtag.column_header.tag_mode.all": "và {additional}",
   "hashtag.column_header.tag_mode.any": "hoặc {additional}",
   "hashtag.column_header.tag_mode.none": "mà không {additional}",
@@ -207,21 +281,35 @@
   "hashtag.column_settings.tag_mode.any": "Một phần",
   "hashtag.column_settings.tag_mode.none": "Không chọn",
   "hashtag.column_settings.tag_toggle": "Bao gồm thêm hashtag cho cột này",
+  "hashtag.follow": "Theo dõi hashtag",
+  "hashtag.unfollow": "Ngưng theo dõi hashtag",
   "home.column_settings.basic": "Tùy chỉnh",
-  "home.column_settings.show_reblogs": "Hiện những lượt chia sẻ",
+  "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
-  "home.hide_announcements": "Ẩn thông báo",
-  "home.show_announcements": "Hiện thông báo",
+  "home.hide_announcements": "Ẩn thông báo máy chủ",
+  "home.show_announcements": "Hiện thông báo máy chủ",
+  "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể yêu thích tút này để cho người đăng biết bạn thích nó và lưu lại tút.",
+  "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để nhận những tút của họ trên bảng tin của mình.",
+  "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.",
+  "interaction_modal.description.reply": "Với tài khoản Mastodon, bạn có thể bình luận tút này.",
+  "interaction_modal.on_another_server": "Trên một máy chủ khác",
+  "interaction_modal.on_this_server": "Trên máy chủ này",
+  "interaction_modal.other_server_instructions": "Sao chép và dán URL này vào thanh tìm kiếm của ứng dụng Mastodon hoặc giao diện web máy chủ Mastodon mà bạn hiện dùng.",
+  "interaction_modal.preamble": "Do Mastodon phi tập trung, bạn có thể sử dụng tài khoản hiện có trên một máy chủ Mastodon khác hoặc một nền tảng tương thích nếu bạn chưa có tài khoản trên máy chủ này.",
+  "interaction_modal.title.favourite": "Thích tút của {name}",
+  "interaction_modal.title.follow": "Theo dõi {name}",
+  "interaction_modal.title.reblog": "Đăng lại tút của {name}",
+  "interaction_modal.title.reply": "Trả lời tút của {name}",
   "intervals.full.days": "{number, plural, other {# ngày}}",
   "intervals.full.hours": "{number, plural, other {# giờ}}",
   "intervals.full.minutes": "{number, plural, other {# phút}}",
   "keyboard_shortcuts.back": "trở lại",
   "keyboard_shortcuts.blocked": "mở danh sách người đã chặn",
-  "keyboard_shortcuts.boost": "chia sẻ",
+  "keyboard_shortcuts.boost": "đăng lại",
   "keyboard_shortcuts.column": "mở các mục",
   "keyboard_shortcuts.compose": "mở khung soạn tút",
   "keyboard_shortcuts.description": "Mô tả",
-  "keyboard_shortcuts.direct": "mở mục tin nhắn",
+  "keyboard_shortcuts.direct": "để mở cột tin nhắn",
   "keyboard_shortcuts.down": "di chuyển xuống dưới danh sách",
   "keyboard_shortcuts.enter": "viết tút mới",
   "keyboard_shortcuts.favourite": "thích",
@@ -234,11 +322,11 @@
   "keyboard_shortcuts.local": "mở máy chủ của bạn",
   "keyboard_shortcuts.mention": "nhắc đến ai đó",
   "keyboard_shortcuts.muted": "mở danh sách người đã ẩn",
-  "keyboard_shortcuts.my_profile": "mở trang cá nhân của bạn",
+  "keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
   "keyboard_shortcuts.notifications": "mở mục thông báo",
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
   "keyboard_shortcuts.pinned": "mở danh sách tút ghim",
-  "keyboard_shortcuts.profile": "mở trang cá nhân của người viết tút",
+  "keyboard_shortcuts.profile": "mở hồ sơ của người viết tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
   "keyboard_shortcuts.search": "mở tìm kiếm",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Phóng to hình",
   "lightbox.next": "Tiếp",
   "lightbox.previous": "Trước",
+  "limited_account_hint.action": "Vẫn cứ xem",
+  "limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên của {domain}.",
   "lists.account.add": "Thêm vào danh sách",
   "lists.account.remove": "Xóa khỏi danh sách",
   "lists.delete": "Xóa danh sách",
@@ -272,59 +362,68 @@
   "media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
   "missing_indicator.label": "Không tìm thấy",
   "missing_indicator.sublabel": "Nội dung này không còn tồn tại",
+  "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
   "mute_modal.duration": "Thời hạn",
   "mute_modal.hide_notifications": "Ẩn thông báo từ người này?",
   "mute_modal.indefinite": "Vĩnh viễn",
-  "navigation_bar.apps": "Apps",
+  "navigation_bar.about": "Giới thiệu",
   "navigation_bar.blocks": "Người đã chặn",
   "navigation_bar.bookmarks": "Đã lưu",
   "navigation_bar.community_timeline": "Cộng đồng",
   "navigation_bar.compose": "Viết tút mới",
-  "navigation_bar.direct": "Tin nhắn",
+  "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.edit_profile": "Trang cá nhân",
+  "navigation_bar.edit_profile": "Sửa hồ sơ",
+  "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
   "navigation_bar.follow_requests": "Yêu cầu theo dõi",
   "navigation_bar.follows_and_followers": "Quan hệ",
-  "navigation_bar.info": "Về máy chủ này",
-  "navigation_bar.keyboard_shortcuts": "Phím tắt",
   "navigation_bar.lists": "Danh sách",
   "navigation_bar.logout": "Đăng xuất",
   "navigation_bar.mutes": "Người đã ẩn",
   "navigation_bar.personal": "Cá nhân",
   "navigation_bar.pins": "Tút ghim",
   "navigation_bar.preferences": "Cài đặt",
-  "navigation_bar.public_timeline": "Thế giới",
+  "navigation_bar.public_timeline": "Liên hợp",
+  "navigation_bar.search": "Tìm kiếm",
   "navigation_bar.security": "Bảo mật",
+  "not_signed_in_indicator.not_signed_in": "Bạn cần đăng nhập để truy cập mục này.",
+  "notification.admin.report": "{name} báo cáo {target}",
+  "notification.admin.sign_up": "{name} tham gia máy chủ của bạn",
   "notification.favourite": "{name} thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
   "notification.mention": "{name} nhắc đến bạn",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn đã kết thúc",
-  "notification.reblog": "{name} chia sẻ tút của bạn",
+  "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.status": "{name} vừa đăng",
+  "notification.update": "{name} đã viết lại một tút",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
+  "notifications.column_settings.admin.report": "Báo cáo mới:",
+  "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Thông báo trên máy tính",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
   "notifications.column_settings.filter_bar.category": "Phân loại",
-  "notifications.column_settings.filter_bar.show": "Lượt nhắc",
+  "notifications.column_settings.filter_bar.show_bar": "Hiện bộ lọc",
   "notifications.column_settings.follow": "Người theo dõi mới:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi mới:",
   "notifications.column_settings.mention": "Lượt nhắc đến:",
   "notifications.column_settings.poll": "Kết quả bình chọn:",
   "notifications.column_settings.push": "Thông báo đẩy",
-  "notifications.column_settings.reblog": "Lượt chia sẻ mới:",
-  "notifications.column_settings.show": "Thông báo trên thanh menu",
-  "notifications.column_settings.sound": "Kèm theo tiếng \"bíp\"",
+  "notifications.column_settings.reblog": "Lượt đăng lại mới:",
+  "notifications.column_settings.show": "Hiện trên thanh bên",
+  "notifications.column_settings.sound": "Kèm âm thanh",
   "notifications.column_settings.status": "Tút mới:",
-  "notifications.column_settings.unread_markers.category": "Đánh dấu những thông báo chưa đọc",
+  "notifications.column_settings.unread_notifications.category": "Thông báo chưa đọc",
+  "notifications.column_settings.unread_notifications.highlight": "Nổi bật thông báo chưa đọc",
+  "notifications.column_settings.update": "Lượt sửa:",
   "notifications.filter.all": "Toàn bộ",
-  "notifications.filter.boosts": "Chia sẻ",
+  "notifications.filter.boosts": "Đăng lại",
   "notifications.filter.favourites": "Thích",
   "notifications.filter.follows": "Đang theo dõi",
   "notifications.filter.mentions": "Lượt nhắc đến",
@@ -346,95 +445,164 @@
   "poll.total_votes": "{count, plural, other {# người bình chọn}}",
   "poll.vote": "Bình chọn",
   "poll.voted": "Bạn đã bình chọn rồi",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, other {# lượt bình chọn}}",
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Thay đổi quyền riêng tư",
-  "privacy.direct.long": "Gửi trực tiếp cho người được nhắc đến",
-  "privacy.direct.short": "Tin nhắn",
+  "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
+  "privacy.direct.short": "Nhắn riêng",
   "privacy.private.long": "Dành riêng cho người theo dõi",
-  "privacy.private.short": "Riêng tư",
-  "privacy.public.long": "Hiện trên bảng tin máy chủ",
+  "privacy.private.short": "Chỉ người theo dõi",
+  "privacy.public.long": "Hiển thị với mọi người",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Không hiện trên bảng tin máy chủ",
+  "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
   "privacy.unlisted.short": "Hạn chế",
+  "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
+  "privacy_policy.title": "Chính sách bảo mật",
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
   "regeneration_indicator.sublabel": "Bảng tin của bạn đang được cập nhật!",
   "relative_time.days": "{number} ngày",
+  "relative_time.full.days": "{number, plural, other {# ngày}}",
+  "relative_time.full.hours": "{number, plural, other {# giờ}}",
+  "relative_time.full.just_now": "vừa xong",
+  "relative_time.full.minutes": "{number, plural, other {# phút}}",
+  "relative_time.full.seconds": "{number, plural, other {#s}}",
   "relative_time.hours": "{number} giờ",
   "relative_time.just_now": "vừa xong",
   "relative_time.minutes": "{number} phút",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hôm nay",
   "reply_indicator.cancel": "Hủy bỏ",
+  "report.block": "Chặn",
+  "report.block_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ biết là họ đã bị chặn.",
+  "report.categories.other": "Khác",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Vi phạm quy tắc máy chủ",
+  "report.category.subtitle": "Chọn mục gần khớp nhất",
+  "report.category.title": "Có vấn đề gì với {type}",
+  "report.category.title_account": "người này",
+  "report.category.title_status": "tút",
+  "report.close": "Xong",
+  "report.comment.title": "Bạn nghĩ chúng tôi nên biết thêm điều gì?",
   "report.forward": "Chuyển đến {target}",
   "report.forward_hint": "Người này thuộc máy chủ khác. Gửi một báo cáo ẩn danh tới máy chủ đó?",
-  "report.hint": "Hãy cho quản trị viên biết lý do vì sao bạn báo cáo người này:",
+  "report.mute": "Ẩn",
+  "report.mute_explanation": "Bạn sẽ không thấy tút của họ nữa. Họ cũng không thể theo dõi hoặc thấy tút của bạn. Họ sẽ không biết là họ đã bị bạn ẩn.",
+  "report.next": "Tiếp theo",
   "report.placeholder": "Bổ sung thêm",
+  "report.reasons.dislike": "Tôi không thích nó",
+  "report.reasons.dislike_description": "Đó không phải là thứ gì mà bạn muốn thấy",
+  "report.reasons.other": "Một lý do khác",
+  "report.reasons.other_description": "Vấn đề không nằm trong những mục trên",
+  "report.reasons.spam": "Đây là spam",
+  "report.reasons.spam_description": "Liên kết độc hại, tạo tương tác giả hoặc trả lời lặp đi lặp lại",
+  "report.reasons.violation": "Vi phạm quy tắc máy chủ",
+  "report.reasons.violation_description": "Bạn nhận thấy nó vi phạm quy tắc máy chủ",
+  "report.rules.subtitle": "Chọn tất cả những gì phù hợp",
+  "report.rules.title": "Vi phạm quy tắc nào?",
+  "report.statuses.subtitle": "Chọn tất cả những gì phù hợp",
+  "report.statuses.title": "Bạn muốn gửi tút nào kèm báo cáo này?",
   "report.submit": "Gửi đi",
   "report.target": "Báo cáo {target}",
+  "report.thanks.take_action": "Đây là một số cách để kiểm soát thứ bạn nhìn thấy trên Mastodon:",
+  "report.thanks.take_action_actionable": "Trong lúc chờ chúng tôi xem xét, bạn có thể áp dụng hành động với @{name}:",
+  "report.thanks.title": "Không muốn xem thứ này?",
+  "report.thanks.title_actionable": "Cảm ơn đã báo cáo, chúng tôi sẽ xem xét kỹ.",
+  "report.unfollow": "Ngưng theo dõi @{name}",
+  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trong bảng tin nữa, hãy ngưng theo dõi.",
+  "report_notification.attached_statuses": "{count, plural, other {{count} tút}} đính kèm",
+  "report_notification.categories.other": "Khác",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Vi phạm quy tắc",
+  "report_notification.open": "Mở báo cáo",
   "search.placeholder": "Tìm kiếm",
+  "search.search_or_paste": "Tìm kiếm hoặc nhập URL",
   "search_popout.search_format": "Gợi ý",
-  "search_popout.tips.full_text": "Nội dung trả về bao gồm những tút mà bạn đã viết, thích, chia sẻ hoặc những tút có nhắc đến bạn. Bạn cũng có thể tìm địa chỉ người dùng, tên hiển thị và hashtag.",
+  "search_popout.tips.full_text": "Nội dung trả về bao gồm những tút mà bạn đã viết, thích, đăng lại hoặc những tút có nhắc đến bạn. Bạn cũng có thể tìm tên người dùng, biệt danh và hashtag.",
   "search_popout.tips.hashtag": "hashtag",
   "search_popout.tips.status": "tút",
-  "search_popout.tips.text": "Nội dung trả về là tên người dùng, tên hiển thị và hashtag",
-  "search_popout.tips.user": "người dùng",
-  "search_results.accounts": "Người dùng",
+  "search_popout.tips.text": "Nội dung trả về là tên người dùng, biệt danh và hashtag",
+  "search_popout.tips.user": "mọi người",
+  "search_results.accounts": "Mọi người",
+  "search_results.all": "Toàn bộ",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Không tìm thấy kết quả trùng khớp",
   "search_results.statuses": "Tút",
   "search_results.statuses_fts_disabled": "Máy chủ của bạn không bật tính năng tìm kiếm tút.",
+  "search_results.title": "Tìm kiếm {q}",
   "search_results.total": "{count, number} {count, plural, one {kết quả} other {kết quả}}",
+  "server_banner.about_active_users": "Những người ở máy chủ này trong 30 ngày qua (MAU)",
+  "server_banner.active_users": "người hoạt động",
+  "server_banner.administered_by": "Vận hành:",
+  "server_banner.introduction": "{domain} là một phần của mạng xã hội liên hợp {mastodon}.",
+  "server_banner.learn_more": "Tìm hiểu",
+  "server_banner.server_stats": "Thống kê:",
+  "sign_in_banner.create_account": "Đăng ký",
+  "sign_in_banner.sign_in": "Đăng nhập",
+  "sign_in_banner.text": "Đăng nhập để theo dõi người hoặc hashtag; cũng như thích, chia sẻ và trả lời tút.",
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_status": "Mở tút này trong giao diện quản trị",
   "status.block": "Chặn @{name}",
   "status.bookmark": "Lưu",
-  "status.cancel_reblog_private": "Hủy chia sẻ",
-  "status.cannot_reblog": "Không thể chia sẻ tút này",
+  "status.cancel_reblog_private": "Hủy đăng lại",
+  "status.cannot_reblog": "Không thể đăng lại tút này",
   "status.copy": "Sao chép URL",
   "status.delete": "Xóa",
   "status.detailed_status": "Xem chi tiết thêm",
-  "status.direct": "Nhắn tin @{name}",
+  "status.direct": "Nhắn riêng @{name}",
+  "status.edit": "Sửa",
+  "status.edited": "Đã sửa {date}",
+  "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
   "status.embed": "Nhúng",
   "status.favourite": "Thích",
+  "status.filter": "Lọc tút này",
   "status.filtered": "Bộ lọc",
-  "status.load_more": "Xem thêm",
+  "status.hide": "Ẩn tút",
+  "status.history.created": "{name} tạo vào {date}",
+  "status.history.edited": "{name} sửa vào {date}",
+  "status.load_more": "Tải thêm",
   "status.media_hidden": "Đã ẩn",
   "status.mention": "Nhắc đến @{name}",
   "status.more": "Thêm",
   "status.mute": "Ẩn @{name}",
   "status.mute_conversation": "Không quan tâm nữa",
   "status.open": "Xem nguyên văn",
-  "status.pin": "Ghim lên trang cá nhân",
+  "status.pin": "Ghim lên hồ sơ",
   "status.pinned": "Tút đã ghim",
   "status.read_more": "Đọc tiếp",
-  "status.reblog": "Chia sẻ",
-  "status.reblog_private": "Chia sẻ (Riêng tư)",
-  "status.reblogged_by": "{name} chia sẻ",
-  "status.reblogs.empty": "Tút này chưa có ai chia sẻ. Nếu có, nó sẽ hiển thị ở đây.",
+  "status.reblog": "Đăng lại",
+  "status.reblog_private": "Đăng lại (Riêng tư)",
+  "status.reblogged_by": "{name} đăng lại",
+  "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
+  "status.replied_to": "{name} viết tiếp",
   "status.reply": "Trả lời",
   "status.replyAll": "Trả lời người đăng tút",
   "status.report": "Báo cáo @{name}",
   "status.sensitive_warning": "Nhạy cảm",
   "status.share": "Chia sẻ",
+  "status.show_filter_reason": "Vẫn cứ xem",
   "status.show_less": "Thu gọn",
   "status.show_less_all": "Thu gọn toàn bộ",
   "status.show_more": "Xem thêm",
   "status.show_more_all": "Hiển thị tất cả",
-  "status.show_thread": "Toàn chủ đề",
+  "status.show_original": "Bản gốc",
+  "status.translate": "Dịch",
+  "status.translated_from_with": "Dịch từ {lang} bằng {provider}",
   "status.uncached_media_warning": "Uncached",
   "status.unmute_conversation": "Quan tâm",
-  "status.unpin": "Bỏ ghim trên trang cá nhân",
+  "status.unpin": "Bỏ ghim trên hồ sơ",
+  "subscribed_languages.lead": "Chỉ các tút đăng bằng các ngôn ngữ đã chọn mới được xuất hiện trên bảng tin của bạn. Không chọn gì cả để đọc tút đăng bằng mọi ngôn ngữ.",
+  "subscribed_languages.save": "Lưu thay đổi",
+  "subscribed_languages.target": "Đổi ngôn ngữ mong muốn cho {target}",
   "suggestions.dismiss": "Tắt đề xuất",
   "suggestions.header": "Có thể bạn quan tâm…",
-  "tabs_bar.federated_timeline": "Thế giới",
+  "tabs_bar.federated_timeline": "Liên hợp",
   "tabs_bar.home": "Bảng tin",
   "tabs_bar.local_timeline": "Máy chủ",
   "tabs_bar.notifications": "Thông báo",
-  "tabs_bar.search": "Tìm kiếm",
   "time_remaining.days": "{number, plural, other {# ngày}}",
   "time_remaining.hours": "{number, plural, other {# giờ}}",
   "time_remaining.minutes": "{number, plural, other {# phút}}",
@@ -444,8 +612,8 @@
   "timeline_hint.resources.followers": "Người theo dõi",
   "timeline_hint.resources.follows": "Đang theo dõi",
   "timeline_hint.resources.statuses": "Tút cũ hơn",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} người} other {{counter} người}} đang thảo luận",
-  "trends.trending_now": "Xu hướng",
+  "trends.counter_by_accounts": "{count, plural, other {{count} lượt}} dùng trong {days, plural, other {{days} ngày}} qua",
+  "trends.trending_now": "Thịnh hành",
   "ui.beforeunload": "Bản nháp của bạn sẽ bị mất nếu bạn thoát khỏi Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
@@ -456,13 +624,14 @@
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
   "upload_form.audio_description": "Mô tả cho người mất thính giác",
   "upload_form.description": "Mô tả cho người khiếm thị",
+  "upload_form.description_missing": "Chưa thêm mô tả",
   "upload_form.edit": "Biên tập",
   "upload_form.thumbnail": "Đổi ảnh thumbnail",
   "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
   "upload_modal.apply": "Áp dụng",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "Đang áp dụng…",
   "upload_modal.choose_image": "Chọn ảnh",
   "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
   "upload_modal.detect_text": "Trích văn bản từ trong ảnh",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Đang nhận dạng ký tự…",
   "upload_modal.preview_label": "Xem trước ({ratio})",
   "upload_progress.label": "Đang tải lên...",
+  "upload_progress.processing": "Đang tải lên…",
   "video.close": "Đóng video",
   "video.download": "Lưu về máy",
   "video.exit_fullscreen": "Thoát toàn màn hình",
diff --git a/app/javascript/mastodon/locales/whitelist_kmr.json b/app/javascript/mastodon/locales/whitelist_an.json
similarity index 100%
rename from app/javascript/mastodon/locales/whitelist_kmr.json
rename to app/javascript/mastodon/locales/whitelist_an.json
diff --git a/app/javascript/mastodon/locales/whitelist_be.json b/app/javascript/mastodon/locales/whitelist_be.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_be.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_bs.json b/app/javascript/mastodon/locales/whitelist_bs.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_bs.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ckb.json b/app/javascript/mastodon/locales/whitelist_ckb.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ckb.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_de.json b/app/javascript/mastodon/locales/whitelist_de.json
index 6c9617e60..c311ad048 100644
--- a/app/javascript/mastodon/locales/whitelist_de.json
+++ b/app/javascript/mastodon/locales/whitelist_de.json
@@ -1,8 +1,4 @@
 [
-  "relative_time.seconds",
-  "relative_time.minutes",
-  "relative_time.hours",
-  "relative_time.days",
   "account.badges.bot",
   "compose_form.publish_loud",
   "search_results.hashtags"
diff --git a/app/javascript/mastodon/locales/whitelist_en-GB.json b/app/javascript/mastodon/locales/whitelist_en-GB.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_en-GB.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_fo.json b/app/javascript/mastodon/locales/whitelist_fo.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_fo.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_fr-QC.json b/app/javascript/mastodon/locales/whitelist_fr-QC.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_fr-QC.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_fy.json b/app/javascript/mastodon/locales/whitelist_fy.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_fy.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ig.json b/app/javascript/mastodon/locales/whitelist_ig.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ig.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_la.json b/app/javascript/mastodon/locales/whitelist_la.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_la.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_my.json b/app/javascript/mastodon/locales/whitelist_my.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_my.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_sco.json b/app/javascript/mastodon/locales/whitelist_sco.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_sco.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 22f6823fe..63b58a46b 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -1,4 +1,16 @@
 {
+  "about.blocks": "Moderated servers",
+  "about.contact": "Contact:",
+  "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
+  "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
+  "about.domain_blocks.silenced.title": "Limited",
+  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.title": "Suspended",
+  "about.not_available": "This information has not been made available on this server.",
+  "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.rules": "Server rules",
   "account.account_note_header": "ⵍⵎⴷ ⵓⴳⴳⴰⵔ",
   "account.add_or_remove_from_list": "ⵔⵏⵓ ⵏⵖ ⵙⵉⵜⵜⵢ ⵙⴳ ⵜⵍⴳⴰⵎⵜ",
   "account.badges.bot": "ⴰⴱⵓⵜ",
@@ -7,47 +19,56 @@
   "account.block_domain": "ⴳⴷⵍ ⵉⴳⵔ {domain}",
   "account.blocked": "ⵉⵜⵜⵓⴳⴷⵍ",
   "account.browse_more_on_origin_server": "ⵙⵜⴰⵔⴰ ⵓⴳⴳⴰⵔ ⴳ ⵉⴼⵔⵙ ⴰⵏⵚⵍⵉ",
-  "account.cancel_follow_request": "ⵙⵔ ⵜⵓⵜⵔⴰ ⵏ ⵓⴹⴼⵕ",
+  "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "ⵜⵓⵣⵉⵏⵜ ⵜⵓⵙⵔⵉⴷⵜ @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "ⵉⵜⵜⵓⴳⴷⵍ ⵉⴳⵔ",
   "account.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.featured_tags.last_status_at": "Last post on {date}",
+  "account.featured_tags.last_status_never": "No posts",
+  "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "ⴹⴼⵕ",
   "account.followers": "ⵉⵎⴹⴼⴰⵕⵏ",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "ⴹⴼⵕⵏ ⴽⵯⵏ",
+  "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
-  "account.last_status": "Last active",
+  "account.joined_short": "Joined",
+  "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "ⴰⵙⵏⵖⵎⵉⵙ",
   "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
+  "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "ⵥⵥⵉⵥⵏ @{name}",
   "account.mute_notifications": "ⵥⵥⵉⵥⵏ ⵜⵉⵏⵖⵎⵉⵙⵉⵏ ⵙⴳ @{name}",
   "account.muted": "ⵉⵜⵜⵓⵥⵉⵥⵏ",
-  "account.never_active": "ⵓⵙⴰⵔ",
+  "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.retention": "Retention",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
@@ -57,14 +78,27 @@
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.copy_stacktrace": "Copy error report",
+  "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.title": "Network error",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
-  "bundle_column_error.title": "ⴰⵣⴳⴰⵍ ⵏ ⵓⵥⵟⵟⴰ",
+  "bundle_column_error.return": "Go back home",
+  "bundle_column_error.routing.body": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
+  "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
+  "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.find_another_server": "Find another server",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
+  "closed_registrations_modal.title": "Signing up on Mastodon",
+  "column.about": "About",
   "column.blocks": "ⵉⵏⵙⵙⵎⵔⵙⵏ ⵜⵜⵓⴳⴷⵍⵏⵉⵏ",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "ⵖⴰⵙ ⴰⴷⵖⴰⵔⴰⵏ",
   "community.column_settings.media_only": "ⵖⴰⵙ ⵉⵙⵏⵖⵎⵉⵙⵏ",
   "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose.language.change": "Change language",
+  "compose.language.search": "Search languages...",
   "compose_form.direct_message_warning_learn_more": "ⵙⵙⵏ ⵓⴳⴳⴰⵔ",
+  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Publish",
+  "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
   "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
   "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
@@ -114,6 +152,8 @@
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "ⴳⴷⵍ",
   "confirmations.block.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴳⴷⵍⴷ {name}?",
+  "confirmations.cancel_follow_request.confirm": "Withdraw request",
+  "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "ⴽⴽⵙ",
   "confirmations.delete.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⵜⴰⵥⵕⵉⴳⵜ ⴰ?",
   "confirmations.delete_list.confirm": "ⴽⴽⵙ",
@@ -137,13 +177,24 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "ⴰⴽⴷ {names}",
+  "copypaste.copied": "Copied",
+  "copypaste.copy": "Copy",
   "directory.federated": "From known fediverse",
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
+  "disabled_account_banner.account_settings": "Account settings",
+  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
+  "emoji_button.clear": "Clear",
   "emoji_button.custom": "Custom",
   "emoji_button.flags": "ⵉⵛⵏⵢⴰⵍⵏ",
   "emoji_button.food": "ⵓⵜⵛⵉ & ⵜⵉⵙⵙⵉ",
@@ -165,6 +216,7 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filter settings",
+  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.title": "Filter added!",
+  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.expired": "expired",
+  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.title.status": "Filter a post",
   "follow_recommendations.done": "Done",
   "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
   "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "ⴰⴳⵢ",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "footer.about": "About",
+  "footer.directory": "Profiles directory",
+  "footer.get_app": "Get the app",
+  "footer.invite": "Invite people",
+  "footer.keyboard_shortcuts": "Keyboard shortcuts",
+  "footer.privacy_policy": "Privacy policy",
+  "footer.source_code": "View source code",
   "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
   "getting_started.heading": "Getting started",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
-  "getting_started.security": "ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ",
-  "getting_started.terms": "Terms of service",
   "hashtag.column_header.tag_mode.all": "ⴷ {additional}",
   "hashtag.column_header.tag_mode.any": "ⵏⵖ {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.on_another_server": "On a different server",
+  "interaction_modal.on_this_server": "On this server",
+  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.title.favourite": "Favourite {name}'s post",
+  "interaction_modal.title.follow": "Follow {name}",
+  "interaction_modal.title.reblog": "Boost {name}'s post",
+  "interaction_modal.title.reply": "Reply to {name}'s post",
   "intervals.full.days": "{number, plural, one {# ⵡⴰⵙⵙ} other {# ⵡⵓⵙⵙⴰⵏ}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# ⵜⵓⵙⴷⵉⴷⵜ} other {# ⵜⵓⵙⴷⵉⴷⵉⵏ}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited_account_hint.action": "Show profile anyway",
+  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
   "lists.account.add": "ⵔⵏⵓ ⵖⵔ ⵜⵍⴳⴰⵎⵜ",
   "lists.account.remove": "ⴽⴽⵙ ⵙⴳ ⵜⵍⴳⴰⵎⵜ",
   "lists.delete": "ⴽⴽⵙ ⵜⴰⵍⴳⴰⵎⵜ",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "mute_modal.indefinite": "Indefinite",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.about": "About",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.direct": "ⵜⵓⵣⵉⵏⵉⵏ ⵜⵓⵙⵔⵉⴷⵉⵏ",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
+  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.info": "ⵅⴼ ⵓⵎⴰⴽⴽⴰⵢ ⴰ",
-  "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
   "navigation_bar.mutes": "Muted users",
@@ -297,7 +387,11 @@
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
+  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favourited your status",
   "notification.follow": "ⵉⴹⴼⴼⴰⵔ ⴽ {name}",
   "notification.follow_request": "{name} has requested to follow you",
@@ -306,13 +400,16 @@
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
   "notifications.clear": "ⵙⴼⴹ ⵜⵉⵏⵖⵎⵉⵙⵉⵏ",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -322,7 +419,9 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "ⵖⵔ ⵉⵎⵙⵍⵉ",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_markers.category": "Unread notification markers",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "ⴰⴽⴽⵯ",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favourites",
@@ -351,30 +450,74 @@
   "poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "ⵜⵓⵔⴷⵉⵜ",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all, shown in public timelines",
+  "privacy.public.long": "Visible for all",
   "privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
-  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
   "privacy.unlisted.short": "Unlisted",
+  "privacy_policy.last_updated": "Last updated {date}",
+  "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
   "regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}ⴰⵙ",
+  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.just_now": "just now",
+  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
   "relative_time.hours": "{number}ⵙⵔⴳ",
   "relative_time.just_now": "ⴷⵖⵉ",
   "relative_time.minutes": "{number}ⵙⴷ",
   "relative_time.seconds": "{number}ⵙⵏ",
   "relative_time.today": "ⴰⵙⵙⴰ",
   "reply_indicator.cancel": "ⵙⵔ",
+  "report.block": "Block",
+  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "ⵙⵙⵉⴼⴹ ⵉ {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Additional comments",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "ⴰⵣⵏ",
   "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.other": "Other",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Rule violation",
+  "report_notification.open": "Open report",
   "search.placeholder": "ⵔⵣⵓ",
+  "search.search_or_paste": "Search or paste URL",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
   "search_popout.tips.user": "user",
   "search_results.accounts": "ⵎⵉⴷⴷⵏ",
+  "search_results.all": "All",
   "search_results.hashtags": "ⵀⴰⵛⵟⴰⴳ",
+  "search_results.nothing_found": "Could not find anything for these search terms",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.title": "Search for {q}",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
+  "server_banner.active_users": "active users",
+  "server_banner.administered_by": "Administered by:",
+  "server_banner.introduction": "{domain} is part of the decentralized social network powered by {mastodon}.",
+  "server_banner.learn_more": "Learn more",
+  "server_banner.server_stats": "Server stats:",
+  "sign_in_banner.create_account": "Create account",
+  "sign_in_banner.sign_in": "Sign in",
+  "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "ⴳⴷⵍ @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "ⴽⴽⵙ",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "ⵜⵓⵣⵉⵏⵜ ⵜⵓⵙⵔⵉⴷⵜ ⵉ @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.filter": "Filter this post",
   "status.filtered": "Filtered",
+  "status.hide": "Hide toot",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
   "status.load_more": "ⵙⵙⵉⵍⵉ ⵓⴳⴳⴰⵔ",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
@@ -415,26 +577,32 @@
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_to": "Replied to {name}",
   "status.reply": "ⵔⴰⵔ",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "ⴱⴹⵓ",
+  "status.show_filter_reason": "Show anyway",
   "status.show_less": "ⵙⵎⴰⵍ ⴷⵔⵓⵙ",
   "status.show_less_all": "ⵙⵎⴰⵍ ⴷⵔⵓⵙ ⵉ ⵎⴰⵕⵕⴰ",
   "status.show_more": "ⵙⵎⴰⵍ ⵓⴳⴳⴰⵔ",
   "status.show_more_all": "ⵙⵎⴰⵍ ⵓⴳⴳⴰⵔ ⵉ ⵎⴰⵕⵕⴰ",
-  "status.show_thread": "Show thread",
+  "status.show_original": "Show original",
+  "status.translate": "Translate",
+  "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Not available",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
+  "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
+  "subscribed_languages.save": "Save changes",
+  "subscribed_languages.target": "Change subscribed languages for {target}",
   "suggestions.dismiss": "Dismiss suggestion",
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "ⴰⵙⵏⵓⴱⴳ",
   "tabs_bar.local_timeline": "ⴰⴷⵖⴰⵔⴰⵏ",
   "tabs_bar.notifications": "ⵜⵉⵏⵖⵎⵉⵙⵉⵏ",
-  "tabs_bar.search": "ⵔⵣⵓ",
   "time_remaining.days": "{number, plural, one {# ⵡⴰⵙⵙ} other {# ⵡⵓⵙⵙⴰⵏ}} ⵉⵇⵇⵉⵎⵏ",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -444,7 +612,7 @@
   "timeline_hint.resources.followers": "ⵉⵎⴹⴼⴰⵕⵏ",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} ⵓⴼⴳⴰⵏ} other {{counter} ⵉⴼⴳⴰⵏⵏ}} ⴰⴳ ⵙⵙⴰⵡⴰⵍⵏ",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",
@@ -456,6 +624,7 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
   "upload_form.edit": "ⵙⵏⴼⵍ",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.undo": "ⴽⴽⵙ",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "Preparing OCR…",
   "upload_modal.preview_label": "Preview ({ratio})",
   "upload_progress.label": "Uploading…",
+  "upload_progress.processing": "Processing…",
   "video.close": "ⵔⴳⵍ ⴰⴼⵉⴷⵢⵓ",
   "video.download": "ⴰⴳⵎ ⴰⴼⴰⵢⵍⵓ",
   "video.exit_fullscreen": "Exit full screen",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 286d54fb8..e03c891ef 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,76 +1,110 @@
 {
+  "about.blocks": "被限制的服务器",
+  "about.contact": "联系方式:",
+  "about.disclaimer": "Mastodon 是自由的开源软件，商标由 Mastodon gGmbH 持有。",
+  "about.domain_blocks.no_reason_available": "原因不可用",
+  "about.domain_blocks.preamble": "通常来说，在 Mastodon 上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但其中一些在本服务器上被设置为例外。",
+  "about.domain_blocks.silenced.explanation": "除非明确地搜索并关注对方，否则你不会看到来自此服务器的用户信息与内容。",
+  "about.domain_blocks.silenced.title": "已隐藏",
+  "about.domain_blocks.suspended.explanation": "此服务器的数据将不会被处理、存储或者交换，本站也将无法和来自此服务器的用户互动或者交流。",
+  "about.domain_blocks.suspended.title": "已封禁",
+  "about.not_available": "此信息在当前服务器尚不可用。",
+  "about.powered_by": "由 {mastodon} 驱动的分布式社交媒体",
+  "about.rules": "站点规则",
   "account.account_note_header": "备注",
-  "account.add_or_remove_from_list": "从列表中添加或删除",
+  "account.add_or_remove_from_list": "从列表中添加或移除",
   "account.badges.bot": "机器人",
   "account.badges.group": "群组",
   "account.block": "屏蔽 @{name}",
   "account.block_domain": "屏蔽 {domain} 实例",
   "account.blocked": "已屏蔽",
   "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
-  "account.cancel_follow_request": "取消关注请求",
+  "account.cancel_follow_request": "撤回关注请求",
   "account.direct": "发送私信给 @{name}",
   "account.disable_notifications": "当 @{name} 发嘟时不要通知我",
   "account.domain_blocked": "域名已屏蔽",
   "account.edit_profile": "修改个人资料",
   "account.enable_notifications": "当 @{name} 发嘟时通知我",
   "account.endorse": "在个人资料中推荐此用户",
+  "account.featured_tags.last_status_at": "最近发言于 {date}",
+  "account.featured_tags.last_status_never": "暂无嘟文",
+  "account.featured_tags.title": "{name} 的精选标签",
   "account.follow": "关注",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "被 {counter} 人关注",
+  "account.following": "正在关注",
   "account.following_counter": "正在关注 {counter} 人",
   "account.follows.empty": "此用户目前尚未关注任何人。",
   "account.follows_you": "关注了你",
-  "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
-  "account.joined": "加入于 {date}",
-  "account.last_status": "最近活动",
+  "account.go_to_profile": "转到个人资料界面",
+  "account.hide_reblogs": "隐藏来自 @{name} 的转贴",
+  "account.joined_short": "加入于",
+  "account.languages": "更改订阅语言",
   "account.link_verified_on": "此链接的所有权已在 {date} 检查",
-  "account.locked_info": "此账户已锁嘟。账户的主人会手动审核关注者。",
+  "account.locked_info": "此账户已锁嘟。账户所有者会手动审核关注者。",
   "account.media": "媒体",
   "account.mention": "提及 @{name}",
-  "account.moved_to": "{name} 已经迁移到：",
+  "account.moved_to": "{name} 的新账号是：",
   "account.mute": "隐藏 @{name}",
   "account.mute_notifications": "隐藏来自 @{name} 的通知",
   "account.muted": "已隐藏",
-  "account.never_active": "从未活跃",
+  "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
   "account.posts_with_replies": "嘟文和回复",
   "account.report": "举报 @{name}",
   "account.requested": "正在等待对方同意。点击以取消发送关注请求",
-  "account.share": "分享 @{name} 的个人资料",
+  "account.requested_follow": "{name} 已经向你发送了关注请求",
+  "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
   "account.statuses_counter": "{counter} 条嘟文",
-  "account.unblock": "解除屏蔽 @{name}",
+  "account.unblock": "取消屏蔽 @{name}",
   "account.unblock_domain": "不再屏蔽 {domain} 实例",
+  "account.unblock_short": "取消屏蔽",
   "account.unendorse": "不在个人资料中推荐此用户",
   "account.unfollow": "取消关注",
   "account.unmute": "不再隐藏 @{name}",
   "account.unmute_notifications": "不再隐藏来自 @{name} 的通知",
+  "account.unmute_short": "取消隐藏",
   "account_note.placeholder": "点击添加备注",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dashboard.daily_retention": "注册后用户留存率（按日计算）",
+  "admin.dashboard.monthly_retention": "注册后用户留存率（按月计算）",
+  "admin.dashboard.retention.average": "平均",
+  "admin.dashboard.retention.cohort": "注册月份",
+  "admin.dashboard.retention.cohort_size": "新用户",
   "alert.rate_limited.message": "请在{retry_time, time, medium}后重试。",
   "alert.rate_limited.title": "频率受限",
   "alert.unexpected.message": "发生了意外错误。",
   "alert.unexpected.title": "哎呀！",
   "announcement.announcement": "公告",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "(未处理)",
+  "audio.hide": "隐藏音频",
   "autosuggest_hashtag.per_week": "每星期 {count} 条",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
-  "bundle_column_error.body": "载入这个组件时发生了错误。",
+  "bundle_column_error.copy_stacktrace": "复制错误报告",
+  "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
+  "bundle_column_error.error.title": "糟糕！",
+  "bundle_column_error.network.body": "页面加载出错，可能是你的网络连接或这个服务器目前存在问题。",
+  "bundle_column_error.network.title": "网络错误",
   "bundle_column_error.retry": "重试",
-  "bundle_column_error.title": "网络错误",
+  "bundle_column_error.return": "回到首页",
+  "bundle_column_error.routing.body": "找不到请求的页面。你确定地址栏中的 URL 正确吗？",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "关闭",
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
-  "column.blocks": "已屏蔽的用户",
+  "closed_registrations.other_server_instructions": "基于 Mastodon 去中心化的特性，你可以在其它服务器上创建账号并继续与此服务器互动。",
+  "closed_registrations_modal.description": "目前不能在 {domain} 上创建账号，但请注意使用 Mastodon 并非必须持有 {domain} 上的账号。",
+  "closed_registrations_modal.find_another_server": "查找另一个服务器",
+  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以无论在哪个实例创建账号，都可以关注本服务器上的账号并与之交流。 或者你还可以自己搭建实例！",
+  "closed_registrations_modal.title": "注册 Mastodon 账号",
+  "column.about": "关于",
+  "column.blocks": "屏蔽的用户",
   "column.bookmarks": "书签",
   "column.community": "本站时间轴",
   "column.direct": "私信",
   "column.directory": "浏览用户资料",
-  "column.domain_blocks": "已屏蔽的网站",
+  "column.domain_blocks": "已屏蔽的域名",
   "column.favourites": "喜欢",
   "column.follow_requests": "关注请求",
   "column.home": "主页",
@@ -83,52 +117,58 @@
   "column_header.hide_settings": "隐藏设置",
   "column_header.moveLeft_settings": "将此栏左移",
   "column_header.moveRight_settings": "将此栏右移",
-  "column_header.pin": "固定",
+  "column_header.pin": "置顶",
   "column_header.show_settings": "显示设置",
-  "column_header.unpin": "取消固定",
+  "column_header.unpin": "取消置顶",
   "column_subheading.settings": "设置",
-  "community.column_settings.local_only": "只显示本站",
-  "community.column_settings.media_only": "仅媒体",
-  "community.column_settings.remote_only": "只显示外站",
-  "compose_form.direct_message_warning": "这条嘟文仅对所有被提及的用户可见。",
+  "community.column_settings.local_only": "仅限本站",
+  "community.column_settings.media_only": "仅限媒体",
+  "community.column_settings.remote_only": "仅限外部",
+  "compose.language.change": "更改语言",
+  "compose.language.search": "搜索语言...",
   "compose_form.direct_message_warning_learn_more": "了解详情",
+  "compose_form.encryption_warning": "Mastodon 上的嘟文并未端到端加密。请不要在 Mastodon 上分享敏感信息。",
   "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
   "compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
   "compose_form.lock_disclaimer.lock": "开启保护",
-  "compose_form.placeholder": "在想啥？",
+  "compose_form.placeholder": "在想些什么？",
   "compose_form.poll.add_option": "添加一个选项",
   "compose_form.poll.duration": "投票持续时间",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "移除这个选项",
+  "compose_form.poll.remove_option": "移除此选项",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
-  "compose_form.publish": "嘟嘟",
+  "compose_form.publish": "发布",
+  "compose_form.publish_form": "发布",
   "compose_form.publish_loud": "{publish}！",
-  "compose_form.sensitive.hide": "标记媒体为敏感内容",
+  "compose_form.save_changes": "保存更改",
+  "compose_form.sensitive.hide": "将媒体标记为敏感内容",
   "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
   "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
-  "compose_form.spoiler.marked": "正文已被折叠在警告信息之后",
-  "compose_form.spoiler.unmarked": "正文未被折叠",
-  "compose_form.spoiler_placeholder": "折叠部分的警告消息",
+  "compose_form.spoiler.marked": "移除内容警告",
+  "compose_form.spoiler.unmarked": "添加内容警告",
+  "compose_form.spoiler_placeholder": "写下你的警告",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
   "confirmations.block.message": "你确定要屏蔽 {name} 吗？",
+  "confirmations.cancel_follow_request.confirm": "撤回请求",
+  "confirmations.cancel_follow_request.message": "确定撤回关注 {name} 的请求吗？",
   "confirmations.delete.confirm": "删除",
   "confirmations.delete.message": "你确定要删除这条嘟文吗？",
   "confirmations.delete_list.confirm": "删除",
-  "confirmations.delete_list.message": "你确定要永久删除这个列表吗？",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "隐藏整个网站的内容",
+  "confirmations.delete_list.message": "确定永久删除这个列表吗？",
+  "confirmations.discard_edit_media.confirm": "丢弃",
+  "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍然丢弃它们吗？",
+  "confirmations.domain_block.confirm": "屏蔽整个域名",
   "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户就已经足够了。来自该网站的内容将不再出现在你的任何公共时间轴或通知列表里。来自该网站的关注者将会被移除。",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "你确定要登出吗？",
   "confirmations.mute.confirm": "隐藏",
-  "confirmations.mute.explanation": "这将隐藏他们的嘟文以及提到他们的嘟文，但他们仍可以看到你的嘟文并关注你。",
+  "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文都会隐藏，但他们仍然可以看到你的嘟文，也可以关注你。",
   "confirmations.mute.message": "你确定要隐藏 {name} 吗？",
   "confirmations.redraft.confirm": "删除并重新编辑",
-  "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗？所有相关的转嘟和喜欢都会被清除，回复将会失去关联。",
+  "confirmations.redraft.message": "确定删除这条嘟文并重写吗？与它相关的所有转嘟和收藏都会清除，嘟文的回复也会失去关联。",
   "confirmations.reply.confirm": "回复",
   "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
   "confirmations.unfollow.confirm": "取消关注",
@@ -137,17 +177,28 @@
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
   "conversation.with": "与 {names}",
-  "directory.federated": "来自联邦宇宙的已知部分",
+  "copypaste.copied": "已复制",
+  "copypaste.copy": "复制",
+  "directory.federated": "来自已知联邦宇宙",
   "directory.local": "仅来自 {domain}",
   "directory.new_arrivals": "新来者",
   "directory.recently_active": "最近活跃",
-  "embed.instructions": "要在你的网站上嵌入此嘟文，请复制以下代码。",
+  "disabled_account_banner.account_settings": "账号设置",
+  "disabled_account_banner.text": "您的账号 {disabledAccount} 目前已被禁用。",
+  "dismissable_banner.community_timeline": "这些是来自 {domain} 用户的最新公共嘟文。",
+  "dismissable_banner.dismiss": "忽略",
+  "dismissable_banner.explore_links": "这些新闻故事正被本站和分布式网络上其他站点的用户谈论。",
+  "dismissable_banner.explore_statuses": "来自本站和分布式网络上其他站点的这些嘟文正在本站引起关注。",
+  "dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。",
+  "dismissable_banner.public_timeline": "这些是来自本站和分布式网络上其他已知站点用户的最新公共嘟文。",
+  "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
   "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
+  "emoji_button.clear": "清除",
   "emoji_button.custom": "自定义",
   "emoji_button.flags": "旗帜",
   "emoji_button.food": "食物和饮料",
-  "emoji_button.label": "加入表情符号",
+  "emoji_button.label": "插入表情符号",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "木有这个表情符号！(╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "物体",
@@ -157,22 +208,23 @@
   "emoji_button.search_results": "搜索结果",
   "emoji_button.symbols": "符号",
   "emoji_button.travel": "旅行和地点",
-  "empty_column.account_suspended": "账户被封禁",
+  "empty_column.account_suspended": "账户已停用",
   "empty_column.account_timeline": "这里没有嘟文！",
   "empty_column.account_unavailable": "个人资料不可用",
-  "empty_column.blocks": "你目前没有屏蔽任何用户。",
+  "empty_column.blocks": "你还未屏蔽任何用户。",
   "empty_column.bookmarked_statuses": "你还没有给任何嘟文添加过书签。在你添加书签后，嘟文就会显示在这里。",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
-  "empty_column.direct": "你还没有使用过私信。当你发出或者收到私信时，它会在这里显示。",
-  "empty_column.domain_blocks": "目前没有被隐藏的站点。",
+  "empty_column.direct": "你还未使用过私信。当你发出或者收到私信时，它将显示在此。",
+  "empty_column.domain_blocks": "暂且没有被屏蔽的站点。",
+  "empty_column.explore_statuses": "目前没有热门话题，稍后再来看看吧！",
   "empty_column.favourited_statuses": "你还没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。",
   "empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。",
   "empty_column.follow_recommendations": "似乎无法为你生成任何建议。你可以尝试使用搜索寻找你可能知道的人或探索热门标签。",
-  "empty_column.follow_requests": "你没有收到新的关注请求。收到了之后就会显示在这里。",
+  "empty_column.follow_requests": "你没有收到新的关注请求。收到后将显示在此。",
   "empty_column.hashtag": "这个话题标签下暂时没有内容。",
   "empty_column.home": "你的主页时间线是空的！快去关注更多人吧。 {suggestions}",
   "empty_column.home.suggestions": "查看一些建议",
-  "empty_column.list": "此列表中暂时没有内容。列表中用户所发送的的新嘟文将会在这里显示。",
+  "empty_column.list": "此列表中暂时没有内容。列表中用户所发送的新嘟文将会在这里显示。",
   "empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
   "empty_column.mutes": "你没有隐藏任何用户。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "请尝试禁用它们并刷新页面。如果没有帮助，你仍可以尝试使用其他浏览器或原生应用来使用 Mastodon。",
   "errors.unexpected_crash.copy_stacktrace": "把堆栈跟踪信息复制到剪贴板",
   "errors.unexpected_crash.report_issue": "报告问题",
+  "explore.search_results": "搜索结果",
+  "explore.suggested_follows": "为你推荐",
+  "explore.title": "探索",
+  "explore.trending_links": "新闻",
+  "explore.trending_statuses": "嘟文",
+  "explore.trending_tags": "话题标签",
+  "filter_modal.added.context_mismatch_explanation": "此过滤器分类不适用访问过嘟文的环境中。如果你想要在环境中过滤嘟文，你必须编辑此过滤器。",
+  "filter_modal.added.context_mismatch_title": "环境不匹配！",
+  "filter_modal.added.expired_explanation": "此过滤器分类已过期，你需要修改到期日期才能应用。",
+  "filter_modal.added.expired_title": "过滤器已过期！",
+  "filter_modal.added.review_and_configure": "要审核并进一步配置此过滤器分类，请前往{settings_link}。",
+  "filter_modal.added.review_and_configure_title": "过滤器设置",
+  "filter_modal.added.settings_link": "设置页面",
+  "filter_modal.added.short_explanation": "此嘟文已添加到以下过滤器分类：{title}。",
+  "filter_modal.added.title": "过滤器已添加 ！",
+  "filter_modal.select_filter.context_mismatch": "不适用于此环境",
+  "filter_modal.select_filter.expired": "已过期",
+  "filter_modal.select_filter.prompt_new": "新分类：{name}",
+  "filter_modal.select_filter.search": "搜索或创建",
+  "filter_modal.select_filter.subtitle": "使用一个已存在分类，或创建一个新分类",
+  "filter_modal.select_filter.title": "过滤此嘟文",
+  "filter_modal.title.status": "过滤一条嘟文",
   "follow_recommendations.done": "完成",
   "follow_recommendations.heading": "关注你感兴趣的用户！这里有一些推荐。",
-  "follow_recommendations.lead": "你关注的人的嘟文将按时间顺序在你的主页上显示。 别担心，你可以随时取消关注！",
-  "follow_request.authorize": "同意",
+  "follow_recommendations.lead": "你关注的人的嘟文将按时间顺序显示在你的主页上。别担心，你可以在任何时候取消对别人的关注！",
+  "follow_request.authorize": "授权",
   "follow_request.reject": "拒绝",
-  "follow_requests.unlocked_explanation": "虽说你没有锁嘟，但是 {domain} 的工作人员觉得你可能想手工审核关注请求。",
+  "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
+  "footer.about": "关于",
+  "footer.directory": "用户目录",
+  "footer.get_app": "获取应用程序",
+  "footer.invite": "邀请",
+  "footer.keyboard_shortcuts": "快捷键列表",
+  "footer.privacy_policy": "隐私政策",
+  "footer.source_code": "查看源代码",
   "generic.saved": "已保存",
-  "getting_started.developers": "开发",
-  "getting_started.directory": "用户目录",
-  "getting_started.documentation": "文档",
   "getting_started.heading": "开始使用",
-  "getting_started.invite": "邀请用户",
-  "getting_started.open_source_notice": "Mastodon 是开源软件。欢迎前往 GitHub（{github}）贡献代码或反馈问题。",
-  "getting_started.security": "帐户安全",
-  "getting_started.terms": "使用条款",
   "hashtag.column_header.tag_mode.all": "以及 {additional}",
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
@@ -205,21 +279,35 @@
   "hashtag.column_settings.select.placeholder": "输入话题标签…",
   "hashtag.column_settings.tag_mode.all": "全部",
   "hashtag.column_settings.tag_mode.any": "任一",
-  "hashtag.column_settings.tag_mode.none": "全都不要",
+  "hashtag.column_settings.tag_mode.none": "无一",
   "hashtag.column_settings.tag_toggle": "在此栏加入额外的标签",
+  "hashtag.follow": "关注话题标签",
+  "hashtag.unfollow": "取消关注话题标签",
   "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
   "home.hide_announcements": "隐藏公告",
   "home.show_announcements": "显示公告",
+  "interaction_modal.description.favourite": "拥有一个 Mastodon 账号，你可以对此嘟文点赞及收藏，并让其作者收到你的赞赏。",
+  "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的首页上接收对方的新嘟文。",
+  "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。",
+  "interaction_modal.description.reply": "拥有一个 Mastodon 账号，你可以回复此嘟文。",
+  "interaction_modal.on_another_server": "在另一服务器",
+  "interaction_modal.on_this_server": "在此服务器",
+  "interaction_modal.other_server_instructions": "复制此链接并粘贴到你使用的 Mastodon 应用或者 Mastodon 服务器网页版搜索栏中。",
+  "interaction_modal.preamble": "基于 Mastodon 去中心化的特性，如果你在本站没有账号，也可以使用在另一 Mastodon 服务器或其他兼容平台上的已有账号。",
+  "interaction_modal.title.favourite": "喜欢 {name} 的嘟文",
+  "interaction_modal.title.follow": "关注 {name}",
+  "interaction_modal.title.reblog": "转发 {name} 的嘟文",
+  "interaction_modal.title.reply": "回复 {name} 的嘟文",
   "intervals.full.days": "{number} 天",
   "intervals.full.hours": "{number} 小时",
   "intervals.full.minutes": "{number} 分钟",
   "keyboard_shortcuts.back": "返回上一页",
   "keyboard_shortcuts.blocked": "打开被屏蔽用户列表",
   "keyboard_shortcuts.boost": "转嘟",
-  "keyboard_shortcuts.column": "选择某一栏中的嘟文",
-  "keyboard_shortcuts.compose": "选择嘟文撰写框",
+  "keyboard_shortcuts.column": "选择某栏",
+  "keyboard_shortcuts.compose": "选择输入框",
   "keyboard_shortcuts.description": "说明",
   "keyboard_shortcuts.direct": "打开私信栏",
   "keyboard_shortcuts.down": "在列表中让光标下移",
@@ -233,7 +321,7 @@
   "keyboard_shortcuts.legend": "显示此列表",
   "keyboard_shortcuts.local": "打开本站时间轴",
   "keyboard_shortcuts.mention": "提及嘟文作者",
-  "keyboard_shortcuts.muted": "打开已隐藏用户列表",
+  "keyboard_shortcuts.muted": "打开隐藏用户列表",
   "keyboard_shortcuts.my_profile": "打开你的个人资料",
   "keyboard_shortcuts.notifications": "打开通知栏",
   "keyboard_shortcuts.open_media": "打开媒体",
@@ -247,13 +335,15 @@
   "keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
   "keyboard_shortcuts.toggle_sensitivity": "显示/隐藏媒体",
   "keyboard_shortcuts.toot": "发送新嘟文",
-  "keyboard_shortcuts.unfocus": "取消输入",
+  "keyboard_shortcuts.unfocus": "取消输入/搜索",
   "keyboard_shortcuts.up": "在列表中让光标上移",
   "lightbox.close": "关闭",
   "lightbox.compress": "返回图片全览",
   "lightbox.expand": "放大查看图片",
   "lightbox.next": "下一个",
   "lightbox.previous": "上一个",
+  "limited_account_hint.action": "仍然显示个人资料",
+  "limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。",
   "lists.account.add": "添加到列表",
   "lists.account.remove": "从列表中移除",
   "lists.delete": "删除列表",
@@ -263,33 +353,33 @@
   "lists.new.title_placeholder": "新列表的标题",
   "lists.replies_policy.followed": "任何被关注的用户",
   "lists.replies_policy.list": "列表成员",
-  "lists.replies_policy.none": "没有人",
+  "lists.replies_policy.none": "无人",
   "lists.replies_policy.title": "显示回复给：",
   "lists.search": "搜索你关注的人",
   "lists.subheading": "你的列表",
   "load_pending": "{count} 项",
   "loading_indicator.label": "加载中……",
-  "media_gallery.toggle_visible": "隐藏 {number} 张图片",
+  "media_gallery.toggle_visible": "隐藏图片",
   "missing_indicator.label": "找不到内容",
   "missing_indicator.sublabel": "无法找到此资源",
-  "mute_modal.duration": "持续期间",
+  "moved_to_account_banner.text": "您的账号 {disabledAccount} 已停用，因为您已迁移到 {movedToAccount} 。",
+  "mute_modal.duration": "持续时长",
   "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
   "mute_modal.indefinite": "无期限",
-  "navigation_bar.apps": "移动应用",
+  "navigation_bar.about": "关于",
   "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.bookmarks": "书签",
   "navigation_bar.community_timeline": "本站时间轴",
   "navigation_bar.compose": "撰写新嘟文",
   "navigation_bar.direct": "私信",
   "navigation_bar.discover": "发现",
-  "navigation_bar.domain_blocks": "已屏蔽的网站",
+  "navigation_bar.domain_blocks": "已屏蔽的域名",
   "navigation_bar.edit_profile": "修改个人资料",
+  "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
-  "navigation_bar.filters": "隐藏关键词",
+  "navigation_bar.filters": "忽略的关键词",
   "navigation_bar.follow_requests": "关注请求",
   "navigation_bar.follows_and_followers": "关注管理",
-  "navigation_bar.info": "关于本站",
-  "navigation_bar.keyboard_shortcuts": "快捷键列表",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "登出",
   "navigation_bar.mutes": "已隐藏的用户",
@@ -297,32 +387,41 @@
   "navigation_bar.pins": "置顶嘟文",
   "navigation_bar.preferences": "首选项",
   "navigation_bar.public_timeline": "跨站公共时间轴",
+  "navigation_bar.search": "搜索",
   "navigation_bar.security": "安全",
+  "not_signed_in_indicator.not_signed_in": "您需要登录才能访问此资源。",
+  "notification.admin.report": "{name} 举报了 {target}",
+  "notification.admin.sign_up": "{name} 注册了",
   "notification.favourite": "{name} 喜欢了你的嘟文",
   "notification.follow": "{name} 开始关注你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.mention": "{name} 提及了你",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
-  "notification.reblog": "{name} 转嘟了你的嘟文",
+  "notification.reblog": "{name} 转发了你的嘟文",
   "notification.status": "{name} 刚刚发嘟",
+  "notification.update": "{name} 编辑了嘟文",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
+  "notifications.column_settings.admin.report": "新举报：",
+  "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
-  "notifications.column_settings.favourite": "当你的嘟文被喜欢时：",
+  "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
   "notifications.column_settings.filter_bar.category": "快速过滤栏",
-  "notifications.column_settings.filter_bar.show": "显示",
-  "notifications.column_settings.follow": "当有人关注你时：",
-  "notifications.column_settings.follow_request": "新的关注请求：",
-  "notifications.column_settings.mention": "当有人在嘟文中提及你时：",
+  "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
+  "notifications.column_settings.follow": "新关注者：",
+  "notifications.column_settings.follow_request": "新关注请求：",
+  "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票结果：",
   "notifications.column_settings.push": "推送通知",
-  "notifications.column_settings.reblog": "当有人转嘟了你的嘟文时：",
+  "notifications.column_settings.reblog": "转嘟：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
   "notifications.column_settings.status": "新嘟文：",
-  "notifications.column_settings.unread_markers.category": "未读通知标记",
+  "notifications.column_settings.unread_notifications.category": "未读通知",
+  "notifications.column_settings.unread_notifications.highlight": "高亮显示未读通知",
+  "notifications.column_settings.update": "编辑：",
   "notifications.filter.all": "全部",
   "notifications.filter.boosts": "转嘟",
   "notifications.filter.favourites": "喜欢",
@@ -342,99 +441,168 @@
   "picture_in_picture.restore": "恢复",
   "poll.closed": "已关闭",
   "poll.refresh": "刷新",
-  "poll.total_people": "{count}人",
+  "poll.total_people": "{count} 人",
   "poll.total_votes": "{count} 票",
   "poll.vote": "投票",
   "poll.voted": "你已经对这个答案投过票了",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# 票} other {# 票}}",
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
   "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "私信",
-  "privacy.private.long": "只有关注你的用户能看到",
-  "privacy.private.short": "仅关注者",
-  "privacy.public.long": "所有人可见，并会出现在公共时间轴上",
+  "privacy.direct.short": "仅提到的人",
+  "privacy.private.long": "仅对关注者可见",
+  "privacy.private.short": "仅关注可见",
+  "privacy.public.long": "所有人可见",
   "privacy.public.short": "公开",
-  "privacy.unlisted.long": "所有人可见，但不会出现在公共时间轴上",
+  "privacy.unlisted.long": "对所有人可见，但不加入探索功能",
   "privacy.unlisted.short": "不公开",
+  "privacy_policy.last_updated": "最近更新于 {date}",
+  "privacy_policy.title": "隐私政策",
   "refresh": "刷新",
-  "regeneration_indicator.label": "加载中……",
+  "regeneration_indicator.label": "加载中…",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
-  "relative_time.days": "{number}天",
-  "relative_time.hours": "{number}时",
+  "relative_time.days": "{number} 天",
+  "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
+  "relative_time.full.hours": "{number, plural, one {# 小时} other {# 小时}}前",
+  "relative_time.full.just_now": "刚刚",
+  "relative_time.full.minutes": "{number, plural, one {# 分钟} other {# 分钟}}前",
+  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
+  "relative_time.hours": "{number} 时",
   "relative_time.just_now": "刚刚",
-  "relative_time.minutes": "{number}分",
-  "relative_time.seconds": "{number}秒",
+  "relative_time.minutes": "{number} 分",
+  "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
+  "report.block": "屏蔽",
+  "report.block_explanation": "你将无法看到他们的帖子。他们也将无法看到你的帖子或关注你。他们将能够判断出他们被屏蔽了。",
+  "report.categories.other": "其他",
+  "report.categories.spam": "垃圾信息",
+  "report.categories.violation": "内容违反一条或多条服务器规则",
+  "report.category.subtitle": "选择最佳匹配",
+  "report.category.title": "告诉我们这个 {type} 的情况",
+  "report.category.title_account": "个人资料",
+  "report.category.title_status": "嘟文",
+  "report.close": "完成",
+  "report.comment.title": "还有什么你认为我们应该知道的吗？",
   "report.forward": "转发举报至 {target}",
   "report.forward_hint": "这名用户来自另一个服务器。是否要向那个服务器发送一条匿名的举报？",
-  "report.hint": "举报将会发送给你所在服务器的监察员。你可以在下面填写举报该用户的理由：",
+  "report.mute": "隐藏",
+  "report.mute_explanation": "你将不会看到他们的嘟文。他们仍然可以关注你并看到你的嘟文，但他们不会知道你忽略了来自他们的信息。",
+  "report.next": "下一步",
   "report.placeholder": "备注",
+  "report.reasons.dislike": "我不喜欢它",
+  "report.reasons.dislike_description": "这不是你想看到的东西",
+  "report.reasons.other": "其他原因",
+  "report.reasons.other_description": "该问题不符合其他类别",
+  "report.reasons.spam": "它是垃圾信息",
+  "report.reasons.spam_description": "恶意链接，虚假互动和重复回复",
+  "report.reasons.violation": "它违反了服务器规则",
+  "report.reasons.violation_description": "你清楚它违反了特定的规则",
+  "report.rules.subtitle": "选择所有适用选项",
+  "report.rules.title": "哪些规则被违反了？",
+  "report.statuses.subtitle": "选择所有适用选项",
+  "report.statuses.title": "是否有任何嘟文可以支持这一报告？",
   "report.submit": "提交",
   "report.target": "举报 {target}",
+  "report.thanks.take_action": "以下是您控制您在 Mastodon 上能看到哪些内容的选项：",
+  "report.thanks.take_action_actionable": "在我们审阅这个问题时，你可以对 @{name} 采取行动",
+  "report.thanks.title": "不想看到这个内容？",
+  "report.thanks.title_actionable": "感谢提交举报，我们将会进行处理。",
+  "report.unfollow": "取消关注 @{name}",
+  "report.unfollow_explanation": "你正在关注此账户。如果要想在你的主页上不再看到他们的帖子，取消对他们的关注即可。",
+  "report_notification.attached_statuses": "附上 {count} 条嘟文",
+  "report_notification.categories.other": "其他",
+  "report_notification.categories.spam": "骚扰",
+  "report_notification.categories.violation": "违反规则",
+  "report_notification.open": "打开举报",
   "search.placeholder": "搜索",
+  "search.search_or_paste": "搜索或输入链接",
   "search_popout.search_format": "高级搜索格式",
-  "search_popout.tips.full_text": "输入关键词检索所有你发送、喜欢、转嘟过或提及到你的嘟文，以及其他用户公开的用户名、昵称和话题标签。",
+  "search_popout.tips.full_text": "输入关键词检索所有你发送、喜欢、转嘟过或提及到你的帖子，以及其他用户公开的用户名、昵称和话题标签。",
   "search_popout.tips.hashtag": "话题标签",
   "search_popout.tips.status": "嘟文",
   "search_popout.tips.text": "输入关键词检索昵称、用户名和话题标签",
   "search_popout.tips.user": "用户",
   "search_results.accounts": "用户",
+  "search_results.all": "全部",
   "search_results.hashtags": "话题标签",
+  "search_results.nothing_found": "无法找到符合这些搜索词的任何内容",
   "search_results.statuses": "嘟文",
-  "search_results.statuses_fts_disabled": "此Mastodon服务器未启用嘟文内容搜索。",
+  "search_results.statuses_fts_disabled": "此 Mastodon 服务器未启用帖子内容搜索。",
+  "search_results.title": "搜索 {q}",
   "search_results.total": "共 {count, number} 个结果",
+  "server_banner.about_active_users": "过去 30 天内使用此服务器的人(每月活跃用户)",
+  "server_banner.active_users": "活跃用户",
+  "server_banner.administered_by": "本站管理员：",
+  "server_banner.introduction": "{domain} 是由 {mastodon} 驱动的去中心化社交网络的一部分。",
+  "server_banner.learn_more": "了解更多",
+  "server_banner.server_stats": "服务器统计数据：",
+  "sign_in_banner.create_account": "创建账户",
+  "sign_in_banner.sign_in": "登录",
+  "sign_in_banner.text": "登录以关注个人资料或话题标签、喜欢、分享和嘟文，或与在不同服务器上的账号进行互动。",
   "status.admin_account": "打开 @{name} 的管理界面",
-  "status.admin_status": "打开这条嘟文的管理界面",
+  "status.admin_status": "打开此帖的管理界面",
   "status.block": "屏蔽 @{name}",
   "status.bookmark": "添加到书签",
-  "status.cancel_reblog_private": "取消转嘟",
+  "status.cancel_reblog_private": "取消转贴",
   "status.cannot_reblog": "这条嘟文不允许被转嘟",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",
-  "status.detailed_status": "对话详情",
-  "status.direct": "发送私信给 @{name}",
+  "status.detailed_status": "详细的对话视图",
+  "status.direct": "私信 @{name}",
+  "status.edit": "编辑",
+  "status.edited": "编辑于 {date}",
+  "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "喜欢",
+  "status.filter": "过滤此嘟文",
   "status.filtered": "已过滤",
+  "status.hide": "屏蔽嘟文",
+  "status.history.created": "{name} 创建于 {date}",
+  "status.history.edited": "{name} 编辑于 {date}",
   "status.load_more": "加载更多",
   "status.media_hidden": "已隐藏的媒体内容",
   "status.mention": "提及 @{name}",
   "status.more": "更多",
   "status.mute": "隐藏 @{name}",
-  "status.mute_conversation": "将此对话静音",
+  "status.mute_conversation": "禁用此对话的消息提醒",
   "status.open": "展开嘟文",
   "status.pin": "在个人资料页面置顶",
   "status.pinned": "置顶嘟文",
-  "status.read_more": "阅读全文",
+  "status.read_more": "查看更多",
   "status.reblog": "转嘟",
   "status.reblog_private": "转嘟（可见者不变）",
   "status.reblogged_by": "{name} 转嘟了",
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
+  "status.replied_to": "回复给 {name}",
   "status.reply": "回复",
   "status.replyAll": "回复所有人",
   "status.report": "举报 @{name}",
   "status.sensitive_warning": "敏感内容",
   "status.share": "分享",
+  "status.show_filter_reason": "继续显示",
   "status.show_less": "隐藏内容",
-  "status.show_less_all": "隐藏所有内容",
-  "status.show_more": "显示内容",
-  "status.show_more_all": "显示所有内容",
-  "status.show_thread": "显示全部对话",
+  "status.show_less_all": "隐藏全部内容",
+  "status.show_more": "显示更多",
+  "status.show_more_all": "显示全部内容",
+  "status.show_original": "显示原文",
+  "status.translate": "翻译",
+  "status.translated_from_with": "由 {provider} 翻译自 {lang}",
   "status.uncached_media_warning": "暂不可用",
-  "status.unmute_conversation": "将此对话解除静音",
+  "status.unmute_conversation": "恢复此对话的通知提醒",
   "status.unpin": "在个人资料页面取消置顶",
+  "subscribed_languages.lead": "更改此选择后，仅选定语言的嘟文会出现在您的主页和列表时间轴上。选择「无」将接收所有语言的嘟文。",
+  "subscribed_languages.save": "保存更改",
+  "subscribed_languages.target": "为 {target} 更改订阅语言",
   "suggestions.dismiss": "关闭建议",
   "suggestions.header": "你可能会感兴趣…",
   "tabs_bar.federated_timeline": "跨站",
   "tabs_bar.home": "主页",
-  "tabs_bar.local_timeline": "本站",
+  "tabs_bar.local_timeline": "本地",
   "tabs_bar.notifications": "通知",
-  "tabs_bar.search": "搜索",
   "time_remaining.days": "剩余 {number, plural, one {# 天} other {# 天}}",
   "time_remaining.hours": "剩余 {number, plural, one {# 小时} other {# 小时}}",
   "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
@@ -444,33 +612,35 @@
   "timeline_hint.resources.followers": "关注者",
   "timeline_hint.resources.follows": "关注",
   "timeline_hint.resources.statuses": "更早的嘟文",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}正在讨论",
+  "trends.counter_by_accounts": "过去 {day} 天有 {counter} 人讨论",
   "trends.trending_now": "现在流行",
   "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会丢失。",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} B",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} K",
   "upload_area.title": "将文件拖放到此处开始上传",
   "upload_button.label": "上传图片、视频或音频",
   "upload_error.limit": "文件大小超过限制。",
   "upload_error.poll": "投票中不允许上传文件。",
   "upload_form.audio_description": "为听障人士添加文字描述",
   "upload_form.description": "为视觉障碍人士添加文字说明",
+  "upload_form.description_missing": "没有添加描述",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
   "upload_form.undo": "删除",
   "upload_form.video_description": "为听障人士和视障人士添加文字描述",
   "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "正在应用…",
   "upload_modal.choose_image": "选择图像",
-  "upload_modal.description_placeholder": "天地玄黄 宇宙洪荒 日月盈仄 辰宿列张",
+  "upload_modal.description_placeholder": "快狐跨懒狗",
   "upload_modal.detect_text": "从图片中检测文本",
   "upload_modal.edit_media": "编辑媒体",
   "upload_modal.hint": "在预览图上点击或拖动圆圈，以选择缩略图的焦点。",
-  "upload_modal.preparing_ocr": "正在准备文字识别……",
+  "upload_modal.preparing_ocr": "正在准备文字识别…",
   "upload_modal.preview_label": "预览 ({ratio})",
-  "upload_progress.label": "上传中……",
+  "upload_progress.label": "上传中…",
+  "upload_progress.processing": "正在处理…",
   "video.close": "关闭视频",
   "video.download": "下载文件",
   "video.exit_fullscreen": "退出全屏",
@@ -480,5 +650,5 @@
   "video.mute": "静音",
   "video.pause": "暂停",
   "video.play": "播放",
-  "video.unmute": "取消静音"
+  "video.unmute": "解除禁音"
 }
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index e93c81f94..5080b7b17 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,78 +1,112 @@
 {
-  "account.account_note_header": "筆記",
+  "about.blocks": "受管制的伺服器",
+  "about.contact": "聯絡我們：",
+  "about.disclaimer": "Mastodon 是免費的開源軟件，為 Mastodon gGmbH 的商標。",
+  "about.domain_blocks.no_reason_available": "沒有原因",
+  "about.domain_blocks.preamble": "Mastodon 通常也讓你查看聯邦宇宙中各伺服器的內容，並與使用者互動。這些是發生在這個特定伺服器上的例外情況。",
+  "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確地打開或著追蹤此個人檔案。",
+  "about.domain_blocks.silenced.title": "受限",
+  "about.domain_blocks.suspended.explanation": "來自此伺服器的所有資料都不會被處理、儲存或交換，因此不可能從此伺服器跟使用者互動或交流。",
+  "about.domain_blocks.suspended.title": "已停權",
+  "about.not_available": "本伺服器尚未提供這資訊。",
+  "about.powered_by": "由 {mastodon} 提供之去中心化社交媒體",
+  "about.rules": "伺服器規則",
+  "account.account_note_header": "備忘",
   "account.add_or_remove_from_list": "從列表中新增或移除",
   "account.badges.bot": "機械人",
   "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
-  "account.block_domain": "封鎖來自 {domain} 的一切文章",
+  "account.block_domain": "封鎖網域 {domain}",
   "account.blocked": "已封鎖",
-  "account.browse_more_on_origin_server": "瀏覽原服務站上的個人資料頁",
-  "account.cancel_follow_request": "取消關注請求",
+  "account.browse_more_on_origin_server": "前往原始的個人檔案頁瀏覽更多",
+  "account.cancel_follow_request": "撤回追蹤請求",
   "account.direct": "私訊 @{name}",
-  "account.disable_notifications": "如果 @{name} 發文請不要再通知我",
-  "account.domain_blocked": "服務站被封鎖",
-  "account.edit_profile": "修改個人資料",
-  "account.enable_notifications": "如果 @{name} 發文請通知我",
-  "account.endorse": "在個人資料頁推薦對方",
+  "account.disable_notifications": "當 @{name} 發文時不要再通知我",
+  "account.domain_blocked": "網域被封鎖",
+  "account.edit_profile": "修改個人檔案",
+  "account.enable_notifications": "當 @{name} 發文時通知我",
+  "account.endorse": "在個人檔案中推薦對方",
+  "account.featured_tags.last_status_at": "上次帖文於 {date}",
+  "account.featured_tags.last_status_never": "暫無文章",
+  "account.featured_tags.title": "{name} 的精選標籤",
   "account.follow": "關注",
-  "account.followers": "關注者",
-  "account.followers.empty": "尚未有人關注這位使用者。",
-  "account.followers_counter": "有 {count, plural,one {{counter} 個} other {{counter} 個}}關注者",
-  "account.following_counter": "正在關注 {count, plural,one {{counter}}other {{counter} 人}}",
-  "account.follows.empty": "這位使用者尚未關注任何人。",
-  "account.follows_you": "關注你",
+  "account.followers": "追蹤者",
+  "account.followers.empty": "尚未有人追蹤這位使用者。",
+  "account.followers_counter": "有 {count, plural,one {{counter} 個} other {{counter} 個}}追蹤者",
+  "account.following": "正在追蹤",
+  "account.following_counter": "正在追蹤 {count, plural,one {{counter}}other {{counter} 人}}",
+  "account.follows.empty": "這位使用者尚未追蹤任何人。",
+  "account.follows_you": "追蹤你",
+  "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏 @{name} 的轉推",
-  "account.joined": "於 {date} 加入",
-  "account.last_status": "上次活躍時間",
-  "account.link_verified_on": "此連結的所有權已在 {date} 檢查過",
+  "account.joined_short": "加入於",
+  "account.languages": "變更訂閱語言",
+  "account.link_verified_on": "已於 {date} 檢查此連結的所有權",
   "account.locked_info": "這位使用者將私隱設定為「不公開」，會手動審批誰能關注他/她。",
   "account.media": "媒體",
   "account.mention": "提及 @{name}",
-  "account.moved_to": "{name} 已經遷移到：",
+  "account.moved_to": "{name} 表示現在的新帳號是：",
   "account.mute": "將 @{name} 靜音",
   "account.mute_notifications": "將來自 @{name} 的通知靜音",
   "account.muted": "靜音",
-  "account.never_active": "永不",
-  "account.posts": "文章",
-  "account.posts_with_replies": "包含回覆的文章",
-  "account.report": "舉報 @{name}",
-  "account.requested": "等候審批",
-  "account.share": "分享 @{name} 的個人資料",
-  "account.show_reblogs": "顯示 @{name} 的推文",
-  "account.statuses_counter": "{count, plural,one {{counter} 篇}other {{counter} 篇}}文章",
-  "account.unblock": "解除對 @{name} 的封鎖",
-  "account.unblock_domain": "解除對域名 {domain} 的封鎖",
-  "account.unendorse": "不再於個人資料頁面推薦對方",
-  "account.unfollow": "取消關注",
-  "account.unmute": "取消 @{name} 的靜音",
-  "account.unmute_notifications": "取消來自 @{name} 通知的靜音",
-  "account_note.placeholder": "按此添加備注",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
+  "account.open_original_page": "打開原始頁面",
+  "account.posts": "帖文",
+  "account.posts_with_replies": "帖文與回覆",
+  "account.report": "檢舉 @{name}",
+  "account.requested": "正在等待核准。按一下以取消追蹤請求",
+  "account.requested_follow": "{name} 要求追蹤你",
+  "account.share": "分享 @{name} 的個人檔案",
+  "account.show_reblogs": "顯示 @{name} 的轉推",
+  "account.statuses_counter": "{count, plural,one {{counter} 篇}other {{counter} 篇}}帖文",
+  "account.unblock": "解除封鎖 @{name}",
+  "account.unblock_domain": "解除封鎖網域 {domain}",
+  "account.unblock_short": "解除封鎖",
+  "account.unendorse": "不要在個人檔案中推薦",
+  "account.unfollow": "取消追蹤",
+  "account.unmute": "取消靜音 @{name}",
+  "account.unmute_notifications": "解除來自 @{name} 通知的靜音",
+  "account.unmute_short": "解除靜音",
+  "account_note.placeholder": "點擊添加備注",
+  "admin.dashboard.daily_retention": "註冊後按天計算的使用者存留率",
+  "admin.dashboard.monthly_retention": "註冊後按月計算的使用者存留率",
+  "admin.dashboard.retention.average": "平均",
+  "admin.dashboard.retention.cohort": "註冊月份",
+  "admin.dashboard.retention.cohort_size": "新使用者",
   "alert.rate_limited.message": "請在 {retry_time, time, medium} 後重試",
   "alert.rate_limited.title": "已限速",
-  "alert.unexpected.message": "發生不可預期的錯誤。",
-  "alert.unexpected.title": "噢！",
+  "alert.unexpected.message": "發生意外錯誤。",
+  "alert.unexpected.title": "失敗！",
   "announcement.announcement": "公告",
-  "attachments_list.unprocessed": "(unprocessed)",
-  "autosuggest_hashtag.per_week": "{count} / 週",
-  "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，",
-  "bundle_column_error.body": "加載本組件出錯。",
+  "attachments_list.unprocessed": "（未處理）",
+  "audio.hide": "隱藏音訊",
+  "autosuggest_hashtag.per_week": "每週 {count} 次",
+  "boost_modal.combo": "你下次可以按 {combo} 來跳過",
+  "bundle_column_error.copy_stacktrace": "複製錯誤報告",
+  "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
+  "bundle_column_error.error.title": "大鑊！",
+  "bundle_column_error.network.body": "嘗試載入此頁面時發生錯誤。這可能是因為您的網路連線或此伺服器暫時出現問題。",
+  "bundle_column_error.network.title": "網絡錯誤",
   "bundle_column_error.retry": "重試",
-  "bundle_column_error.title": "網絡錯誤",
+  "bundle_column_error.return": "返回主頁",
+  "bundle_column_error.routing.body": "找不到請求的頁面。您確定網址欄中的 URL 正確嗎？",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "加載本組件出錯。",
   "bundle_modal_error.retry": "重試",
+  "closed_registrations.other_server_instructions": "基於Mastodon去中心化的特性，你可以在其他伺服器上創建賬戶並與本站互動。",
+  "closed_registrations_modal.description": "目前無法在 {domain} 建立新帳號，但您並不一定需要擁有 {domain} 的帳號亦能使用 Mastodon 。",
+  "closed_registrations_modal.find_another_server": "尋找另外的伺服器",
+  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您在哪個伺服器建立帳號，都可以追蹤此伺服器上的任何人並與他們互動。您甚至可以自行搭建一個全新的伺服器！",
+  "closed_registrations_modal.title": "在 Mastodon 註冊",
+  "column.about": "關於",
   "column.blocks": "封鎖名單",
   "column.bookmarks": "書籤",
   "column.community": "本站時間軸",
-  "column.direct": "個人訊息",
+  "column.direct": "私訊",
   "column.directory": "瀏覽個人資料",
   "column.domain_blocks": "封鎖的服務站",
   "column.favourites": "最愛的文章",
-  "column.follow_requests": "關注請求",
+  "column.follow_requests": "追蹤請求",
   "column.home": "主頁",
   "column.lists": "列表",
   "column.mutes": "靜音名單",
@@ -90,8 +124,10 @@
   "community.column_settings.local_only": "只顯示本站",
   "community.column_settings.media_only": "只顯示多媒體",
   "community.column_settings.remote_only": "只顯示外站",
-  "compose_form.direct_message_warning": "這文章只有被提及的使用者才可以看到。",
+  "compose.language.change": "更改語言",
+  "compose.language.search": "搜尋語言...",
   "compose_form.direct_message_warning_learn_more": "了解更多",
+  "compose_form.encryption_warning": "Mastodon 上的帖文並未端對端加密。請不要透過 Mastodon 分享任何敏感資訊。",
   "compose_form.hashtag_warning": "這文章因為不是公開，所以不會被標籤搜索。只有公開的文章才會被標籤搜索。",
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
@@ -102,8 +138,10 @@
   "compose_form.poll.remove_option": "移除此選擇",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
-  "compose_form.publish": "發文",
+  "compose_form.publish": "發佈",
+  "compose_form.publish_form": "發佈",
   "compose_form.publish_loud": "{publish}！",
+  "compose_form.save_changes": "儲存變更",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
   "compose_form.sensitive.marked": "媒體被標示為敏感",
   "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
@@ -114,12 +152,14 @@
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
   "confirmations.block.message": "你確定要封鎖{name}嗎？",
+  "confirmations.cancel_follow_request.confirm": "撤回請求",
+  "confirmations.cancel_follow_request.message": "您確定要撤回追蹤 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
   "confirmations.delete.message": "你確定要刪除這文章嗎？",
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "捨棄",
+  "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
   "confirmations.domain_block.confirm": "封鎖整個網站",
   "confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，封鎖或靜音幾個特定目標就已經有效，也是比較建議的做法。若然封鎖全站，你將不會再在這裏看到該站的內容和通知。來自該站的關注者亦會被移除。",
   "confirmations.logout.confirm": "登出",
@@ -131,19 +171,30 @@
   "confirmations.redraft.message": "你確定要刪除並重新編輯嗎？所有相關的回覆、轉推與最愛都會被刪除。",
   "confirmations.reply.confirm": "回覆",
   "confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆？",
-  "confirmations.unfollow.confirm": "取消關注",
-  "confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎？",
+  "confirmations.unfollow.confirm": "取消追蹤",
+  "confirmations.unfollow.message": "真的不要繼續追蹤 {name} 了嗎？",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標為已讀",
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
+  "copypaste.copied": "已複製",
+  "copypaste.copy": "複製",
   "directory.federated": "來自已知的聯盟網絡",
   "directory.local": "僅來自 {domain}",
   "directory.new_arrivals": "新內容",
   "directory.recently_active": "最近活躍",
+  "disabled_account_banner.account_settings": "帳號設定",
+  "disabled_account_banner.text": "您的帳號 {disabledAccount} 目前已停用。",
+  "dismissable_banner.community_timeline": "這些是 {domain} 上用戶的最新公開帖文。",
+  "dismissable_banner.dismiss": "關閉",
+  "dismissable_banner.explore_links": "這些新聞內容正在被本站以及去中心化網路上其他伺服器的人們熱烈討論。",
+  "dismissable_banner.explore_statuses": "來自本站以及去中心化網路中其他伺服器的這些帖文正在本站引起關注。",
+  "dismissable_banner.explore_tags": "這些主題標籤正在被本站以及去中心化網路上的人們熱烈討論。",
+  "dismissable_banner.public_timeline": "這些是來自本站以及去中心化網路中其他已知伺服器之最新公開帖文。",
   "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。",
   "embed.preview": "看上去會是這樣：",
   "emoji_button.activity": "活動",
+  "emoji_button.clear": "清除",
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "飲飲食食",
@@ -163,12 +214,13 @@
   "empty_column.blocks": "你還沒有封鎖任何使用者。",
   "empty_column.bookmarked_statuses": "你還沒建立任何書籤。這裡將會顯示你建立的書籤。",
   "empty_column.community": "本站時間軸暫時未有內容，快寫一點東西來搶頭香啊！",
-  "empty_column.direct": "你沒有個人訊息。當你發出或接收個人訊息，就會在這裡出現。",
+  "empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時，它將在此顯示。",
   "empty_column.domain_blocks": "尚未隱藏任何網域。",
+  "empty_column.explore_statuses": "目前沒有熱門話題，請稍候再回來看看！",
   "empty_column.favourited_statuses": "你還沒收藏任何文章。這裡將會顯示你收藏的嘟文。",
   "empty_column.favourites": "還沒有人收藏這則文章。這裡將會顯示被收藏的嘟文。",
   "empty_column.follow_recommendations": "似乎未能替您產生任何建議。您可以試著搜尋您知道的帳戶或者探索熱門主題標籤",
-  "empty_column.follow_requests": "您尚未收到任何關注請求。這裡將會顯示收到的關注請求。",
+  "empty_column.follow_requests": "您尚未收到任何追蹤請求。這裡將會顯示收到的追蹤請求。",
   "empty_column.hashtag": "這個標籤暫時未有內容。",
   "empty_column.home": "你還沒有關注任何使用者。快看看{public}，向其他使用者搭訕吧。",
   "empty_column.home.suggestions": "檢視部份建議",
@@ -183,21 +235,43 @@
   "error.unexpected_crash.next_steps_addons": "請嘗試停止使用這些附加元件然後重新載入頁面。如果問題沒有解決，你仍然可以使用不同的瀏覽器或 Mastodon 應用程式來檢視。",
   "errors.unexpected_crash.copy_stacktrace": "複製 stacktrace 到剪貼簿",
   "errors.unexpected_crash.report_issue": "舉報問題",
+  "explore.search_results": "搜尋結果",
+  "explore.suggested_follows": "為您推薦",
+  "explore.title": "探索",
+  "explore.trending_links": "最新消息",
+  "explore.trending_statuses": "帖文",
+  "explore.trending_tags": "標籤",
+  "filter_modal.added.context_mismatch_explanation": "此過濾器類別不適用於您所存取帖文的情境。如果您想要此帖文被於此情境被過濾，您必須編輯過濾器。",
+  "filter_modal.added.context_mismatch_title": "情境不符合！",
+  "filter_modal.added.expired_explanation": "此過濾器類別已失效，您需要更新過期日期才能套用。",
+  "filter_modal.added.expired_title": "過期的過濾器！",
+  "filter_modal.added.review_and_configure": "若欲檢視並進一步配置此過濾器類別，請前往 {settings_link}。",
+  "filter_modal.added.review_and_configure_title": "過濾器設定",
+  "filter_modal.added.settings_link": "設定頁面",
+  "filter_modal.added.short_explanation": "此帖文已被新增至以下過濾器類別：{title}。",
+  "filter_modal.added.title": "已新增過濾器！",
+  "filter_modal.select_filter.context_mismatch": "不適用於目前情境",
+  "filter_modal.select_filter.expired": "已過期",
+  "filter_modal.select_filter.prompt_new": "新類別：{name}",
+  "filter_modal.select_filter.search": "搜尋或新增",
+  "filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
+  "filter_modal.select_filter.title": "過濾此帖文",
+  "filter_modal.title.status": "過濾一則帖文",
   "follow_recommendations.done": "完成",
-  "follow_recommendations.heading": "跟隨人們以看到來自他們的嘟文！這裡有些建議。",
-  "follow_recommendations.lead": "您跟隨對象知嘟文將會以時間順序顯示於您的 home feed 上。別擔心犯下錯誤，您隨時可以取消跟隨人們！",
+  "follow_recommendations.heading": "追蹤人們以看到他們的帖文！這裡有些建議。",
+  "follow_recommendations.lead": "您所追蹤的對象之帖文將會以時間順序顯示於您的首頁時間軸上。別擔心犯下錯誤，您隨時可以取消追蹤任何人！",
   "follow_request.authorize": "批准",
   "follow_request.reject": "拒絕",
-  "follow_requests.unlocked_explanation": "即使您的帳戶未上鎖，{domain} 的工作人員認為您可能想手動審核來自這些帳戶的關注請求。",
+  "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
+  "footer.about": "關於",
+  "footer.directory": "個人檔案目錄",
+  "footer.get_app": "取得應用程式",
+  "footer.invite": "邀請他人",
+  "footer.keyboard_shortcuts": "鍵盤快速鍵",
+  "footer.privacy_policy": "私隱政策",
+  "footer.source_code": "查看原始碼",
   "generic.saved": "已儲存",
-  "getting_started.developers": "開發者",
-  "getting_started.directory": "個人資料目錄",
-  "getting_started.documentation": "文件",
   "getting_started.heading": "開始使用",
-  "getting_started.invite": "邀請使用者",
-  "getting_started.open_source_notice": "Mastodon（萬象）是一個開放源碼的軟件。你可以在官方 GitHub {github} 貢獻或者回報問題。",
-  "getting_started.security": "帳戶設定",
-  "getting_started.terms": "服務條款",
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
   "hashtag.column_header.tag_mode.none": "而無需{additional}",
@@ -207,11 +281,25 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "全不",
   "hashtag.column_settings.tag_toggle": "在這欄位加入額外的標籤",
+  "hashtag.follow": "追蹤主題標籤",
+  "hashtag.unfollow": "取消追蹤主題標籤",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
   "home.hide_announcements": "隱藏公告",
   "home.show_announcements": "顯示公告",
+  "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以點讚並收藏此帖文，讓作者知道您對它的欣賞。",
+  "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以追蹤 {name} 以於首頁時間軸接收他們的帖文。",
+  "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以向自己的追縱者們轉發此帖文。",
+  "interaction_modal.description.reply": "在 Mastodon 上擁有帳號的話，您可以回覆此帖文。",
+  "interaction_modal.on_another_server": "於不同伺服器",
+  "interaction_modal.on_this_server": "於此伺服器",
+  "interaction_modal.other_server_instructions": "複製此 URL 並貼上到你最喜歡的 Mastodon 應用程式或 Mastodon 伺服器網頁介面的搜尋欄中。",
+  "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即使您於此伺服器上沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。",
+  "interaction_modal.title.favourite": "將 {name} 的帖文加入最愛",
+  "interaction_modal.title.follow": "追蹤 {name}",
+  "interaction_modal.title.reblog": "轉發 {name} 的帖文",
+  "interaction_modal.title.reply": "回覆 {name} 的帖文",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -254,6 +342,8 @@
   "lightbox.expand": "擴大檢視",
   "lightbox.next": "下一頁",
   "lightbox.previous": "上一頁",
+  "limited_account_hint.action": "一律顯示個人檔案",
+  "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
   "lists.account.add": "新增到列表",
   "lists.account.remove": "從列表刪除",
   "lists.delete": "刪除列表",
@@ -272,24 +362,24 @@
   "media_gallery.toggle_visible": "隱藏圖片",
   "missing_indicator.label": "找不到內容",
   "missing_indicator.sublabel": "無法找到內容",
+  "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.duration": "時間",
   "mute_modal.hide_notifications": "需要隱藏這使用者的通知嗎？",
   "mute_modal.indefinite": "沒期限",
-  "navigation_bar.apps": "手機 App",
+  "navigation_bar.about": "關於",
   "navigation_bar.blocks": "封鎖名單",
   "navigation_bar.bookmarks": "書籤",
   "navigation_bar.community_timeline": "本站時間軸",
   "navigation_bar.compose": "撰寫新文章",
-  "navigation_bar.direct": "個人訊息",
+  "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
   "navigation_bar.edit_profile": "修改個人資料",
+  "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛的內容",
   "navigation_bar.filters": "靜音詞彙",
-  "navigation_bar.follow_requests": "關注請求",
-  "navigation_bar.follows_and_followers": "關注及關注者",
-  "navigation_bar.info": "關於本服務站",
-  "navigation_bar.keyboard_shortcuts": "鍵盤快速鍵",
+  "navigation_bar.follow_requests": "追蹤請求",
+  "navigation_bar.follows_and_followers": "追蹤及追蹤者",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "登出",
   "navigation_bar.mutes": "靜音名單",
@@ -297,24 +387,31 @@
   "navigation_bar.pins": "置頂文章",
   "navigation_bar.preferences": "偏好設定",
   "navigation_bar.public_timeline": "跨站時間軸",
+  "navigation_bar.search": "搜尋",
   "navigation_bar.security": "安全",
+  "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
+  "notification.admin.report": "{name} 檢舉了 {target}",
+  "notification.admin.sign_up": "{name} 已經註冊",
   "notification.favourite": "{name} 喜歡你的文章",
-  "notification.follow": "{name} 開始關注你",
-  "notification.follow_request": "{name} 要求關注你",
+  "notification.follow": "{name} 開始追蹤你",
+  "notification.follow_request": "{name} 要求追蹤你",
   "notification.mention": "{name} 提及你",
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
   "notification.status": "{name} 剛發表了文章",
+  "notification.update": "{name} 編輯了帖文",
   "notifications.clear": "清空通知紀錄",
   "notifications.clear_confirmation": "你確定要清空通知紀錄嗎？",
+  "notifications.column_settings.admin.report": "新舉報：",
+  "notifications.column_settings.admin.sign_up": "新註冊：",
   "notifications.column_settings.alert": "顯示桌面通知",
   "notifications.column_settings.favourite": "你最愛的文章：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
   "notifications.column_settings.filter_bar.category": "快速過濾欄",
-  "notifications.column_settings.filter_bar.show": "顯示",
-  "notifications.column_settings.follow": "關注你：",
-  "notifications.column_settings.follow_request": "新的關注請求:",
+  "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄",
+  "notifications.column_settings.follow": "新追蹤者：",
+  "notifications.column_settings.follow_request": "新的追蹤請求：",
   "notifications.column_settings.mention": "提及你：",
   "notifications.column_settings.poll": "投票結果：",
   "notifications.column_settings.push": "推送通知",
@@ -322,11 +419,13 @@
   "notifications.column_settings.show": "在通知欄顯示",
   "notifications.column_settings.sound": "播放音效",
   "notifications.column_settings.status": "新的文章",
-  "notifications.column_settings.unread_markers.category": "未讀通知標記",
+  "notifications.column_settings.unread_notifications.category": "未讀通知",
+  "notifications.column_settings.unread_notifications.highlight": "突顯未讀通知",
+  "notifications.column_settings.update": "編輯：",
   "notifications.filter.all": "全部",
   "notifications.filter.boosts": "轉推",
   "notifications.filter.favourites": "最愛",
-  "notifications.filter.follows": "關注的使用者",
+  "notifications.filter.follows": "追蹤的使用者",
   "notifications.filter.mentions": "提及",
   "notifications.filter.polls": "投票結果",
   "notifications.filter.statuses": "已關注的用戶的最新動態",
@@ -346,35 +445,79 @@
   "poll.total_votes": "{count, plural, one {# 票} other {# 票}}",
   "poll.vote": "投票",
   "poll.voted": "你已投票給這答案",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# 票} other {# 票}}",
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整私隱設定",
   "privacy.direct.long": "只有提及的使用者能看到",
-  "privacy.direct.short": "私人訊息",
+  "privacy.direct.short": "僅限提及的人",
   "privacy.private.long": "只有你的關注者能看到",
-  "privacy.private.short": "關注者",
-  "privacy.public.long": "在公共時間軸顯示",
+  "privacy.private.short": "僅限追隨者",
+  "privacy.public.long": "對所有人可見",
   "privacy.public.short": "公共",
-  "privacy.unlisted.long": "公開，但不在公共時間軸顯示",
+  "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
   "privacy.unlisted.short": "公開",
+  "privacy_policy.last_updated": "最後更新 {date}",
+  "privacy_policy.title": "私隱政策",
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中……",
   "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中！",
   "relative_time.days": "{number}日前",
+  "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
+  "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
+  "relative_time.full.just_now": "剛剛",
+  "relative_time.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}前",
+  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
   "relative_time.hours": "{number}小時前",
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number}分鐘前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
+  "report.block": "封鎖",
+  "report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
+  "report.categories.other": "其他",
+  "report.categories.spam": "垃圾訊息",
+  "report.categories.violation": "內容違犯一項或多項伺服器規則",
+  "report.category.subtitle": "選擇最佳選項",
+  "report.category.title": "告訴我們這個 {type} 發生了甚麼事",
+  "report.category.title_account": "個人檔案",
+  "report.category.title_status": "帖文",
+  "report.close": "完成",
+  "report.comment.title": "還有甚麼你想讓我們知道的嗎？",
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳戶屬於其他服務站。要向該服務站發送匿名的舉報訊息嗎？",
-  "report.hint": "這訊息會發送到你服務站的管理員。你可以提供舉報這個帳戶的理由：",
+  "report.mute": "靜音",
+  "report.mute_explanation": "你將不會看到他們的帖文。他們仍然能夠追蹤你和查看你的帖文，並且不會知道他們自己已被靜音。",
+  "report.next": "繼續",
   "report.placeholder": "額外訊息",
+  "report.reasons.dislike": "我不喜歡它",
+  "report.reasons.dislike_description": "這不是你想看到的東西",
+  "report.reasons.other": "其他原因",
+  "report.reasons.other_description": "這個問題不屬於其他類別",
+  "report.reasons.spam": "這是垃圾訊息",
+  "report.reasons.spam_description": "惡意連結、虛假互動或重複回覆",
+  "report.reasons.violation": "它違反了伺服器規則",
+  "report.reasons.violation_description": "你知道它違反了特定規則",
+  "report.rules.subtitle": "選擇所有適用選項",
+  "report.rules.title": "違反了哪些規則？",
+  "report.statuses.subtitle": "選擇所有適用選項",
+  "report.statuses.title": "有沒有能夠佐證這個檢舉的帖文？",
   "report.submit": "提交",
   "report.target": "舉報",
+  "report.thanks.take_action": "以下是控制你在 Mastodon 上看到的內容的選項：",
+  "report.thanks.take_action_actionable": "在我們審核期間，你可以對 @{name} 採取以下行動：",
+  "report.thanks.title": "不想看到這個嗎？",
+  "report.thanks.title_actionable": "感謝你的檢舉，我們會著手調查。",
+  "report.unfollow": "取消追蹤 @{name}",
+  "report.unfollow_explanation": "你正在追蹤此帳號。如果不想再在首頁時間軸看到他們的帖文，請取消追蹤。",
+  "report_notification.attached_statuses": "已附上 {count, plural, one {{count} 則帖文} other {{count} 則帖文}}",
+  "report_notification.categories.other": "其他",
+  "report_notification.categories.spam": "垃圾訊息",
+  "report_notification.categories.violation": "違反規則",
+  "report_notification.open": "打開檢舉報告",
   "search.placeholder": "搜尋",
+  "search.search_or_paste": "搜尋或貼上網址",
   "search_popout.search_format": "高級搜索格式",
   "search_popout.tips.full_text": "輸入簡單的文字，搜索由你發放、收藏、轉推和提及你的文章，以及符合的使用者名稱，顯示名稱和標籤。",
   "search_popout.tips.hashtag": "標籤",
@@ -382,10 +525,22 @@
   "search_popout.tips.text": "輸入簡單的文字，搜索符合的顯示名稱、使用者名稱和標籤",
   "search_popout.tips.user": "使用者",
   "search_results.accounts": "使用者",
+  "search_results.all": "全部",
   "search_results.hashtags": "標籤",
+  "search_results.nothing_found": "找不到與搜尋字詞相關的內容",
   "search_results.statuses": "文章",
   "search_results.statuses_fts_disabled": "此 Mastodon 伺服器並未啟用「搜尋文章內章」功能。",
+  "search_results.title": "搜尋 {q}",
   "search_results.total": "{count, number} 項結果",
+  "server_banner.about_active_users": "在最近 30 天內內使用此伺服器的人 (月活躍用戶)",
+  "server_banner.active_users": "活躍用戶",
+  "server_banner.administered_by": "管理者：",
+  "server_banner.introduction": "{domain} 是由 {mastodon} 提供之去中心化社交網絡的一部份。",
+  "server_banner.learn_more": "了解更多",
+  "server_banner.server_stats": "伺服器統計：",
+  "sign_in_banner.create_account": "建立帳號",
+  "sign_in_banner.sign_in": "登入",
+  "sign_in_banner.text": "登入以追蹤個人檔案、標籤、最愛、分享和回覆帖文，或用你在其他伺服器的帳號進行互動。",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_status": "在管理介面開啟這篇文章",
   "status.block": "封鎖 @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "刪除",
   "status.detailed_status": "詳細對話內容",
   "status.direct": "私訊 @{name}",
+  "status.edit": "編輯",
+  "status.edited": "編輯於 {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "最愛",
+  "status.filter": "篩選此帖文",
   "status.filtered": "已過濾",
+  "status.hide": "隱藏帖文",
+  "status.history.created": "{name} 於 {date} 建立",
+  "status.history.edited": "{name} 於 {date} 編輯",
   "status.load_more": "載入更多",
   "status.media_hidden": "隱藏媒體內容",
   "status.mention": "提及 @{name}",
@@ -415,36 +577,42 @@
   "status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。",
   "status.redraft": "刪除並編輯",
   "status.remove_bookmark": "移除書籤",
+  "status.replied_to": "回覆 {name}",
   "status.reply": "回應",
   "status.replyAll": "回應所有人",
   "status.report": "舉報 @{name}",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
+  "status.show_filter_reason": "仍要顯示",
   "status.show_less": "收起",
   "status.show_less_all": "全部收起",
   "status.show_more": "展開",
   "status.show_more_all": "全部展開",
-  "status.show_thread": "顯示討論串",
+  "status.show_original": "顯示原文",
+  "status.translate": "翻譯",
+  "status.translated_from_with": "使用 {provider} 翻譯 {lang}",
   "status.uncached_media_warning": "無法使用",
   "status.unmute_conversation": "對話解除靜音",
   "status.unpin": "解除置頂",
+  "subscribed_languages.lead": "更改後，只有所選語言的帖文會出現在你的主頁和列表時間軸上。選擇「無」以接收所有語言的帖文。",
+  "subscribed_languages.save": "儲存變更",
+  "subscribed_languages.target": "變更 {target} 的訂閱語言",
   "suggestions.dismiss": "關閉建議",
   "suggestions.header": "你可能對這些感興趣…",
   "tabs_bar.federated_timeline": "跨站",
   "tabs_bar.home": "主頁",
   "tabs_bar.local_timeline": "本站",
   "tabs_bar.notifications": "通知",
-  "tabs_bar.search": "搜尋",
   "time_remaining.days": "剩餘 {number, plural, one {# 天} other {# 天}}",
   "time_remaining.hours": "剩餘 {number, plural, one {# 小時} other {# 小時}}",
   "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
   "time_remaining.moments": "剩餘時間",
   "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
   "timeline_hint.remote_resource_not_displayed": "不會顯示來自其他伺服器的 {resource}",
-  "timeline_hint.resources.followers": "關注者",
-  "timeline_hint.resources.follows": "關注中",
+  "timeline_hint.resources.followers": "追蹤者",
+  "timeline_hint.resources.follows": "追蹤中",
   "timeline_hint.resources.statuses": "更早的文章",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} 個人}other {{counter} 個人}}正在討論",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}} 於過去 {days, plural, one {日} other {{days} days}} 之間",
   "trends.trending_now": "現在流行",
   "ui.beforeunload": "如果你現在離開 Mastodon，你的草稿內容將會被丟棄。",
   "units.short.billion": "{count}B",
@@ -456,13 +624,14 @@
   "upload_error.poll": "不允許在投票上傳檔案。",
   "upload_form.audio_description": "簡單描述內容給聽障人士",
   "upload_form.description": "為視覺障礙人士添加文字說明",
+  "upload_form.description_missing": "沒有加入描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
   "upload_form.undo": "刪除",
   "upload_form.video_description": "簡單描述給聽障或視障人士",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "套用中…",
   "upload_modal.choose_image": "選擇圖片",
   "upload_modal.description_placeholder": "一隻敏捷的狐狸，輕巧地跳過那隻懶洋洋的狗",
   "upload_modal.detect_text": "從圖片偵測文字",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "準備辨識圖片文字…",
   "upload_modal.preview_label": "預覽 ({ratio})",
   "upload_progress.label": "上載中……",
+  "upload_progress.processing": "處理中...",
   "video.close": "關閉影片",
   "video.download": "下載檔案",
   "video.exit_fullscreen": "退出全螢幕",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 7fdd156ea..1cffc2c0f 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,83 +1,117 @@
 {
+  "about.blocks": "受管制的伺服器",
+  "about.contact": "聯絡我們：",
+  "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 的註冊商標。",
+  "about.domain_blocks.no_reason_available": "無法存取之原因",
+  "about.domain_blocks.preamble": "Mastodon 一般來說允許您閱讀並和聯邦宇宙上任何伺服器的使用者互動。這些伺服器是這個站台設下的例外。",
+  "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確地打開或著跟隨此個人檔案。",
+  "about.domain_blocks.silenced.title": "受限的",
+  "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法和此伺服器上的使用者互動與溝通。",
+  "about.domain_blocks.suspended.title": "已停權",
+  "about.not_available": "這個資料於此伺服器上不可存取。",
+  "about.powered_by": "由 {mastodon} 提供之去中心化社群媒體",
+  "about.rules": "伺服器規則",
   "account.account_note_header": "備註",
-  "account.add_or_remove_from_list": "從名單中新增或移除",
+  "account.add_or_remove_from_list": "從列表中新增或移除",
   "account.badges.bot": "機器人",
   "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "封鎖來自 {domain} 網域的所有內容",
   "account.blocked": "已封鎖",
-  "account.browse_more_on_origin_server": "在該伺服器的個人檔案頁上瀏覽更多",
-  "account.cancel_follow_request": "取消跟隨請求",
+  "account.browse_more_on_origin_server": "於該伺服器的個人檔案頁上瀏覽更多",
+  "account.cancel_follow_request": "收回跟隨請求",
   "account.direct": "傳私訊給 @{name}",
   "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
   "account.domain_blocked": "已封鎖網域",
-  "account.edit_profile": "編輯個人資料",
+  "account.edit_profile": "編輯個人檔案",
   "account.enable_notifications": "當 @{name} 嘟文時通知我",
-  "account.endorse": "在個人資料推薦對方",
+  "account.endorse": "在個人檔案推薦對方",
+  "account.featured_tags.last_status_at": "上次嘟文於 {date}",
+  "account.featured_tags.last_status_never": "沒有嘟文",
+  "account.featured_tags.title": "{name} 的特色主題標籤",
   "account.follow": "跟隨",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
   "account.followers_counter": "被 {count, plural,one {{counter} 人}other {{counter} 人}} 跟隨",
+  "account.following": "跟隨中",
   "account.following_counter": "正在跟隨 {count, plural,one {{counter}}other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
   "account.follows_you": "跟隨了您",
+  "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏來自 @{name} 的轉嘟",
-  "account.joined": "加入於 {date}",
-  "account.last_status": "上次活躍時間",
-  "account.link_verified_on": "已在 {date} 檢查此連結的擁有者權限",
-  "account.locked_info": "此帳戶的隱私狀態被設為鎖定。該擁有者會手動審核能跟隨此帳戶的人。",
+  "account.joined_short": "加入時間",
+  "account.languages": "變更訂閱的語言",
+  "account.link_verified_on": "已於 {date} 檢查此連結的擁有者權限",
+  "account.locked_info": "此帳號的隱私狀態被設為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
   "account.media": "媒體",
   "account.mention": "提及 @{name}",
-  "account.moved_to": "{name} 已遷移至：",
+  "account.moved_to": "{name} 現在的新帳號為：",
   "account.mute": "靜音 @{name}",
   "account.mute_notifications": "靜音來自 @{name} 的通知",
   "account.muted": "已靜音",
-  "account.never_active": "永不",
+  "account.open_original_page": "檢視原始頁面",
   "account.posts": "嘟文",
   "account.posts_with_replies": "嘟文與回覆",
   "account.report": "檢舉 @{name}",
   "account.requested": "正在等待核准。按一下以取消跟隨請求",
-  "account.share": "分享 @{name} 的個人資料",
+  "account.requested_follow": "{name} 要求跟隨您",
+  "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示來自 @{name} 的嘟文",
   "account.statuses_counter": "{count, plural,one {{counter} 則}other {{counter} 則}}嘟文",
   "account.unblock": "取消封鎖 @{name}",
   "account.unblock_domain": "取消封鎖域名 {domain}",
-  "account.unendorse": "不再於個人資料頁面推薦對方",
+  "account.unblock_short": "解除封鎖",
+  "account.unendorse": "不再於個人檔案頁面推薦對方",
   "account.unfollow": "取消跟隨",
   "account.unmute": "取消靜音 @{name}",
   "account.unmute_notifications": "重新接收來自 @{name} 的通知",
+  "account.unmute_short": "解除靜音",
   "account_note.placeholder": "按此添加備注",
-  "admin.dashboard.retention": "Retention",
-  "admin.dashboard.retention.average": "Average",
-  "admin.dashboard.retention.cohort": "Sign-up month",
-  "admin.dashboard.retention.cohort_size": "New users",
-  "alert.rate_limited.message": "請在 {retry_time, time, medium} 後重試",
+  "admin.dashboard.daily_retention": "註冊後使用者存留率(日)",
+  "admin.dashboard.monthly_retention": "註冊後使用者存留率(月)",
+  "admin.dashboard.retention.average": "平均",
+  "admin.dashboard.retention.cohort": "註冊月份",
+  "admin.dashboard.retention.cohort_size": "新使用者",
+  "alert.rate_limited.message": "請在 {retry_time, time, medium} 後重試。",
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生了非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
   "announcement.announcement": "公告",
-  "attachments_list.unprocessed": "(unprocessed)",
+  "attachments_list.unprocessed": "（未經處理）",
+  "audio.hide": "隱藏音訊",
   "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
-  "bundle_column_error.body": "載入此元件時發生錯誤。",
+  "bundle_column_error.copy_stacktrace": "複製錯誤報告",
+  "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
+  "bundle_column_error.error.title": "糟糕！",
+  "bundle_column_error.network.body": "嘗試載入此頁面時發生錯誤。這可能是因為您的網際網路連線或此伺服器有暫時性的問題。",
+  "bundle_column_error.network.title": "網路錯誤",
   "bundle_column_error.retry": "重試",
-  "bundle_column_error.title": "網路錯誤",
+  "bundle_column_error.return": "返回首頁",
+  "bundle_column_error.routing.body": "找不到請求的頁面。您確定網址列中的 URL 是正確的嗎？",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
+  "closed_registrations.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與這個伺服器互動。",
+  "closed_registrations_modal.description": "目前無法在 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon 。",
+  "closed_registrations_modal.find_another_server": "尋找另一個伺服器",
+  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您在哪個伺服器新增帳號，都可以與此伺服器上的任何人追蹤及互動。您甚至能自行架一個自己的伺服器！",
+  "closed_registrations_modal.title": "註冊 Mastodon",
+  "column.about": "關於",
   "column.blocks": "已封鎖的使用者",
   "column.bookmarks": "書籤",
-  "column.community": "本機時間軸",
+  "column.community": "本站時間軸",
   "column.direct": "私訊",
-  "column.directory": "瀏覽個人資料",
+  "column.directory": "瀏覽個人檔案",
   "column.domain_blocks": "已封鎖的網域",
   "column.favourites": "最愛",
   "column.follow_requests": "跟隨請求",
   "column.home": "首頁",
-  "column.lists": "名單",
+  "column.lists": "列表",
   "column.mutes": "已靜音的使用者",
   "column.notifications": "通知",
-  "column.pins": "釘選的嘟文",
+  "column.pins": "釘選嘟文",
   "column.public": "聯邦時間軸",
   "column_back_button.label": "上一頁",
   "column_header.hide_settings": "隱藏設定",
@@ -87,13 +121,15 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取消釘選",
   "column_subheading.settings": "設定",
-  "community.column_settings.local_only": "只有本機",
-  "community.column_settings.media_only": "只有媒體",
-  "community.column_settings.remote_only": "只有遠端",
-  "compose_form.direct_message_warning": "這條嘟文只有被提及的使用者才看得到。",
+  "community.column_settings.local_only": "只顯示本站",
+  "community.column_settings.media_only": "只顯示媒體",
+  "community.column_settings.remote_only": "只顯示遠端",
+  "compose.language.change": "變更語言",
+  "compose.language.search": "搜尋語言...",
   "compose_form.direct_message_warning_learn_more": "了解更多",
-  "compose_form.hashtag_warning": "由於這則嘟文設定為「不公開」，它將不會被列於任何主題標籤下。只有公開的嘟文才能藉由主題標籤找到。",
-  "compose_form.lock_disclaimer": "您的帳戶尚未{locked}。任何人都能關注您並看到您設定成只有跟隨者能看的嘟文。",
+  "compose_form.encryption_warning": "Mastodon 上的嘟文並未進行端到端加密。請不要透過 Mastodon 分享任何敏感資訊。",
+  "compose_form.hashtag_warning": "由於這則嘟文設定為「不公開」，它將不被列於任何主題標籤下。只有公開的嘟文才能藉由主題標籤被找到。",
+  "compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成只有跟隨者能看的嘟文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
   "compose_form.placeholder": "正在想些什麼嗎？",
   "compose_form.poll.add_option": "新增選項",
@@ -103,47 +139,62 @@
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.publish": "嘟出去",
+  "compose_form.publish_form": "嘟出去",
   "compose_form.publish_loud": "{publish}！",
+  "compose_form.save_changes": "儲存變更",
   "compose_form.sensitive.hide": "標記媒體為敏感內容",
   "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
   "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
-  "compose_form.spoiler.marked": "正文已隱藏到警告之後",
-  "compose_form.spoiler.unmarked": "正文未被隱藏",
+  "compose_form.spoiler.marked": "移除內容警告",
+  "compose_form.spoiler.unmarked": "新增內容警告",
   "compose_form.spoiler_placeholder": "請在此處寫入警告訊息",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.block.message": "確定要封鎖 {name} 嗎？",
+  "confirmations.block.message": "您確定要封鎖 {name} ？",
+  "confirmations.cancel_follow_request.confirm": "收回請求",
+  "confirmations.cancel_follow_request.message": "您確定要收回跟隨 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
   "confirmations.delete.message": "您確定要刪除這則嘟文？",
   "confirmations.delete_list.confirm": "刪除",
-  "confirmations.delete_list.message": "確定永久刪除此名單？",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.message": "您確定要永久刪除此列表？",
+  "confirmations.discard_edit_media.confirm": "捨棄",
+  "confirmations.discard_edit_media.message": "您在媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
   "confirmations.domain_block.confirm": "隱藏整個域名",
-  "confirmations.domain_block.message": "真的非常確定封鎖整個 {domain} 網域嗎？大部分情況下，您只需要封鎖或靜音少數特定的帳帳戶能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
+  "confirmations.domain_block.message": "真的非常確定封鎖整個 {domain} 網域嗎？大部分情況下，您只需要封鎖或靜音少數特定的帳號能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
   "confirmations.logout.confirm": "登出",
-  "confirmations.logout.message": "確定要登出嗎？",
+  "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
   "confirmations.mute.explanation": "這將會隱藏來自他們的嘟文與通知，但是他們還是可以查閱您的嘟文與跟隨您。",
-  "confirmations.mute.message": "確定靜音 {name} ？",
+  "confirmations.mute.message": "您確定要靜音 {name} ？",
   "confirmations.redraft.confirm": "刪除並重新編輯",
-  "confirmations.redraft.message": "確定刪掉這則嘟文並重新編輯嗎？將會失去這則嘟文的轉嘟及最愛，且回覆這則的嘟文將會變成獨立的嘟文。",
+  "confirmations.redraft.message": "您確定要刪掉這則嘟文並重新編輯嗎？將會失去這則嘟文的轉嘟及最愛，且回覆這則的嘟文將會變成獨立的嘟文。",
   "confirmations.reply.confirm": "回覆",
   "confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆？",
   "confirmations.unfollow.confirm": "取消跟隨",
-  "confirmations.unfollow.message": "確定要取消跟隨 {name} 嗎？",
+  "confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標記為已讀",
   "conversation.open": "檢視對話",
   "conversation.with": "與 {names}",
+  "copypaste.copied": "已複製",
+  "copypaste.copy": "複製",
   "directory.federated": "來自已知聯邦宇宙",
   "directory.local": "僅來自 {domain} 網域",
   "directory.new_arrivals": "新人",
   "directory.recently_active": "最近活躍",
+  "disabled_account_banner.account_settings": "帳號設定",
+  "disabled_account_banner.text": "您的帳號 {disabledAccount} 目前已停用。",
+  "dismissable_banner.community_timeline": "這些是 {domain} 上面託管帳號之最新公開嘟文。",
+  "dismissable_banner.dismiss": "關閉",
+  "dismissable_banner.explore_links": "這些新聞故事正在被此伺服器以及去中心化網路上的人們熱烈討論著。",
+  "dismissable_banner.explore_statuses": "這些於這個伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。",
+  "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。",
+  "dismissable_banner.public_timeline": "這些是來自這裡以及去中心化網路中其他已知伺服器之最新公開嘟文。",
   "embed.instructions": "要在您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
+  "emoji_button.clear": "清除",
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物 & 飲料",
@@ -157,47 +208,70 @@
   "emoji_button.search_results": "搜尋結果",
   "emoji_button.symbols": "符號",
   "emoji_button.travel": "旅遊與地點",
-  "empty_column.account_suspended": "帳戶被暫停",
+  "empty_column.account_suspended": "帳號被暫停",
   "empty_column.account_timeline": "這裡還沒有嘟文！",
-  "empty_column.account_unavailable": "無法取得個人資料",
+  "empty_column.account_unavailable": "無法取得個人檔案",
   "empty_column.blocks": "您還沒有封鎖任何使用者。",
-  "empty_column.bookmarked_statuses": "您還沒建立任何書籤。當您建立書簽時，它將於此顯示。",
-  "empty_column.community": "本機時間軸是空的。快公開嘟些文搶頭香啊！",
+  "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
+  "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未封鎖任何網域。",
-  "empty_column.favourited_statuses": "您還沒加過任何嘟文至最愛。當您收藏嘟文時，它將於此顯示。",
+  "empty_column.explore_statuses": "目前沒有熱門討論，請稍候再回來看看！",
+  "empty_column.favourited_statuses": "您還沒有加過任何嘟文至最愛。當您收藏嘟文時，它將於此顯示。",
   "empty_column.favourites": "還沒有人加過這則嘟文至最愛。當有人收藏嘟文時，它將於此顯示。",
   "empty_column.follow_recommendations": "似乎未能為您產生任何建議。您可以嘗試使用搜尋來尋找您可能認識的人，或是探索熱門主題標籤。",
-  "empty_column.follow_requests": "您尚未收到任何跟隨請求。這裡將會顯示收到的跟隨請求。",
+  "empty_column.follow_requests": "您還沒有收到任何跟隨請求。這裡將會顯示收到的跟隨請求。",
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
   "empty_column.home": "您的首頁時間軸是空的！前往 {suggestions} 或使用搜尋功能來認識其他人。",
   "empty_column.home.suggestions": "檢視部份建議",
-  "empty_column.list": "這份名單還沒有東西。當此名單的成員嘟出了新的嘟文時，它們就會顯示於此。",
-  "empty_column.lists": "您還沒有建立任何名單。這裡將會顯示您所建立的名單。",
-  "empty_column.mutes": "您尚未靜音任何使用者。",
-  "empty_column.notifications": "您尚未收到任何通知，和別人互動開啟對話吧。",
+  "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出了新的嘟文時，它們就會顯示於此。",
+  "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
+  "empty_column.mutes": "您還沒有靜音任何使用者。",
+  "empty_column.notifications": "您還沒有收到任何通知，當您和別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或著自己跟隨其他伺服器的使用者後就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
   "error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",
   "error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
-  "error.unexpected_crash.next_steps_addons": "請嘗試關閉他們然後重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
+  "error.unexpected_crash.next_steps_addons": "請嘗試關閉它們然後重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式來檢視來使用 Mastodon。",
   "errors.unexpected_crash.copy_stacktrace": "複製 stacktrace 到剪貼簿",
   "errors.unexpected_crash.report_issue": "回報問題",
+  "explore.search_results": "搜尋結果",
+  "explore.suggested_follows": "為您推薦",
+  "explore.title": "探索",
+  "explore.trending_links": "最新消息",
+  "explore.trending_statuses": "嘟文",
+  "explore.trending_tags": "主題標籤",
+  "filter_modal.added.context_mismatch_explanation": "此過濾器類別不是用您所存取嘟文的情境。若您想要此嘟文被於此情境被過濾，您必須編輯過濾器。",
+  "filter_modal.added.context_mismatch_title": "不符合情境！",
+  "filter_modal.added.expired_explanation": "此過濾器類別已失效，您需要更新過期日期以套用。",
+  "filter_modal.added.expired_title": "過期的過濾器！",
+  "filter_modal.added.review_and_configure": "若欲檢視和進一步設定此過濾器類別，請至 {settings_link}。",
+  "filter_modal.added.review_and_configure_title": "過濾器設定",
+  "filter_modal.added.settings_link": "設定頁面",
+  "filter_modal.added.short_explanation": "此嘟文已被新增至以下過濾器類別：{title}。",
+  "filter_modal.added.title": "已新增過濾器！",
+  "filter_modal.select_filter.context_mismatch": "不是用目前情境",
+  "filter_modal.select_filter.expired": "已過期",
+  "filter_modal.select_filter.prompt_new": "新類別：{name}",
+  "filter_modal.select_filter.search": "搜尋或新增",
+  "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
+  "filter_modal.select_filter.title": "過濾此嘟文",
+  "filter_modal.title.status": "過濾一則嘟文",
   "follow_recommendations.done": "完成",
-  "follow_recommendations.heading": "跟隨您想檢視其貼文的人！這裡有一些建議。",
-  "follow_recommendations.lead": "來自您跟隨的人的貼文將會按時間順序顯示在您的家 feed 上。不要害怕犯錯，您隨時都可以取消跟隨其他人！",
+  "follow_recommendations.heading": "跟隨您想檢視其嘟文的人！這裡有一些建議。",
+  "follow_recommendations.lead": "來自您跟隨的人之嘟文將會按時間順序顯示在您的首頁時間軸上。不要害怕犯錯，您隨時都可以取消跟隨其他人！",
   "follow_request.authorize": "授權",
   "follow_request.reject": "拒絕",
-  "follow_requests.unlocked_explanation": "即便您的帳戶未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳戶的跟隨請求。",
+  "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
+  "footer.about": "關於",
+  "footer.directory": "個人檔案目錄",
+  "footer.get_app": "取得應用程式",
+  "footer.invite": "邀請他人",
+  "footer.keyboard_shortcuts": "鍵盤快速鍵",
+  "footer.privacy_policy": "隱私權政策",
+  "footer.source_code": "檢視原始碼",
   "generic.saved": "已儲存",
-  "getting_started.developers": "開發者",
-  "getting_started.directory": "個人資料目錄",
-  "getting_started.documentation": "文件",
   "getting_started.heading": "開始使用",
-  "getting_started.invite": "邀請使用者",
-  "getting_started.open_source_notice": "Mastodon 是開源軟體。您可以在 GitHub {github} 上貢獻或是回報問題。",
-  "getting_started.security": "帳戶安全性設定",
-  "getting_started.terms": "服務條款",
   "hashtag.column_header.tag_mode.all": "以及 {additional}",
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而無需 {additional}",
@@ -207,97 +281,117 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "全不",
   "hashtag.column_settings.tag_toggle": "將額外標籤加入到這個欄位",
-  "home.column_settings.basic": "基本",
+  "hashtag.follow": "追蹤主題標籤",
+  "hashtag.unfollow": "取消追蹤主題標籤",
+  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
   "home.hide_announcements": "隱藏公告",
   "home.show_announcements": "顯示公告",
+  "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以將此嘟文加入最愛以讓作者知道您欣賞它且將它儲存下來。",
+  "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
+  "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以轉嘟此嘟文以分享給您的跟隨者們。",
+  "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。",
+  "interaction_modal.on_another_server": "於不同伺服器",
+  "interaction_modal.on_this_server": "於此伺服器",
+  "interaction_modal.other_server_instructions": "複製貼上此 URL 至您愛用的 Mastodon 應用程式或您 Mastodon 伺服器之網頁介面的搜尋欄。",
+  "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即便您於此沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。",
+  "interaction_modal.title.favourite": "將 {name} 的嘟文加入最愛",
+  "interaction_modal.title.follow": "跟隨 {name}",
+  "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文",
+  "interaction_modal.title.reply": "回覆 {name} 的嘟文",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
   "keyboard_shortcuts.back": "返回上一頁",
   "keyboard_shortcuts.blocked": "開啟「封鎖使用者」名單",
   "keyboard_shortcuts.boost": "轉嘟",
-  "keyboard_shortcuts.column": "將焦點放在其中一欄的嘟文",
-  "keyboard_shortcuts.compose": "將焦點移至撰寫文字區塊",
+  "keyboard_shortcuts.column": "聚焦至其中一欄的嘟文",
+  "keyboard_shortcuts.compose": "聚焦至撰寫文字區塊",
   "keyboard_shortcuts.description": "說明",
   "keyboard_shortcuts.direct": "開啟私訊欄",
-  "keyboard_shortcuts.down": "在名單中往下移動",
+  "keyboard_shortcuts.down": "往下移動",
   "keyboard_shortcuts.enter": "檢視嘟文",
   "keyboard_shortcuts.favourite": "加到最愛",
-  "keyboard_shortcuts.favourites": "開啟最愛名單",
+  "keyboard_shortcuts.favourites": "開啟最愛列表",
   "keyboard_shortcuts.federated": "開啟聯邦時間軸",
   "keyboard_shortcuts.heading": "鍵盤快速鍵",
   "keyboard_shortcuts.home": "開啟首頁時間軸",
   "keyboard_shortcuts.hotkey": "快速鍵",
-  "keyboard_shortcuts.legend": "顯示此圖例",
-  "keyboard_shortcuts.local": "開啟本機時間軸",
+  "keyboard_shortcuts.legend": "顯示此說明選單",
+  "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
-  "keyboard_shortcuts.muted": "開啟靜音使用者名單",
-  "keyboard_shortcuts.my_profile": "開啟個人資料頁面",
+  "keyboard_shortcuts.muted": "開啟靜音使用者列表",
+  "keyboard_shortcuts.my_profile": "開啟個人檔案頁面",
   "keyboard_shortcuts.notifications": "開啟通知欄",
   "keyboard_shortcuts.open_media": "開啟媒體",
-  "keyboard_shortcuts.pinned": "開啟釘選的嘟文名單",
-  "keyboard_shortcuts.profile": "開啟作者的個人資料頁面",
+  "keyboard_shortcuts.pinned": "開啟釘選嘟文列表",
+  "keyboard_shortcuts.profile": "開啟作者的個人檔案頁面",
   "keyboard_shortcuts.reply": "回應嘟文",
-  "keyboard_shortcuts.requests": "開啟跟隨請求名單",
-  "keyboard_shortcuts.search": "將焦點移至搜尋框",
-  "keyboard_shortcuts.spoilers": "顯示或隱藏被折疊的正文",
+  "keyboard_shortcuts.requests": "開啟跟隨請求列表",
+  "keyboard_shortcuts.search": "聚焦至搜尋框",
+  "keyboard_shortcuts.spoilers": "顯示或隱藏內容警告之嘟文",
   "keyboard_shortcuts.start": "開啟「開始使用」欄位",
-  "keyboard_shortcuts.toggle_hidden": "顯示/隱藏在內容警告之後的正文",
-  "keyboard_shortcuts.toggle_sensitivity": "顯示 / 隱藏媒體",
-  "keyboard_shortcuts.toot": "開始發出新嘟文",
-  "keyboard_shortcuts.unfocus": "取消輸入文字區塊 / 搜尋的焦點",
-  "keyboard_shortcuts.up": "在名單中往上移動",
+  "keyboard_shortcuts.toggle_hidden": "顯示或隱藏在內容警告之後的嘟文",
+  "keyboard_shortcuts.toggle_sensitivity": "顯示或隱藏媒體",
+  "keyboard_shortcuts.toot": "發個新嘟文",
+  "keyboard_shortcuts.unfocus": "取消輸入文字區塊或搜尋之焦點",
+  "keyboard_shortcuts.up": "往上移動",
   "lightbox.close": "關閉",
   "lightbox.compress": "折疊圖片檢視框",
   "lightbox.expand": "展開圖片檢視框",
   "lightbox.next": "下一步",
   "lightbox.previous": "上一步",
-  "lists.account.add": "新增至名單",
-  "lists.account.remove": "從名單中移除",
-  "lists.delete": "刪除名單",
-  "lists.edit": "編輯名單",
+  "limited_account_hint.action": "一律顯示個人檔案",
+  "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
+  "lists.account.add": "新增至列表",
+  "lists.account.remove": "從列表中移除",
+  "lists.delete": "刪除列表",
+  "lists.edit": "編輯列表",
   "lists.edit.submit": "變更標題",
-  "lists.new.create": "新增名單",
-  "lists.new.title_placeholder": "新名單標題",
+  "lists.new.create": "新增列表",
+  "lists.new.title_placeholder": "新列表標題",
   "lists.replies_policy.followed": "任何跟隨的使用者",
   "lists.replies_policy.list": "列表成員",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆：",
   "lists.search": "搜尋您跟隨的使用者",
-  "lists.subheading": "您的名單",
+  "lists.subheading": "您的列表",
   "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
   "loading_indicator.label": "讀取中...",
   "media_gallery.toggle_visible": "切換可見性",
   "missing_indicator.label": "找不到",
   "missing_indicator.sublabel": "找不到此資源",
+  "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.duration": "持續時間",
-  "mute_modal.hide_notifications": "隱藏來自這位使用者的通知？",
+  "mute_modal.hide_notifications": "是否隱藏來自這位使用者的通知？",
   "mute_modal.indefinite": "無期限",
-  "navigation_bar.apps": "行動應用程式",
+  "navigation_bar.about": "關於",
   "navigation_bar.blocks": "封鎖使用者",
   "navigation_bar.bookmarks": "書籤",
-  "navigation_bar.community_timeline": "本機時間軸",
+  "navigation_bar.community_timeline": "本站時間軸",
   "navigation_bar.compose": "撰寫新嘟文",
   "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "隱藏的網域",
-  "navigation_bar.edit_profile": "編輯個人資料",
-  "navigation_bar.favourites": "收藏",
+  "navigation_bar.edit_profile": "編輯個人檔案",
+  "navigation_bar.explore": "探索",
+  "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
   "navigation_bar.follow_requests": "跟隨請求",
   "navigation_bar.follows_and_followers": "跟隨中與跟隨者",
-  "navigation_bar.info": "關於此伺服器",
-  "navigation_bar.keyboard_shortcuts": "快速鍵",
-  "navigation_bar.lists": "名單",
+  "navigation_bar.lists": "列表",
   "navigation_bar.logout": "登出",
   "navigation_bar.mutes": "靜音的使用者",
   "navigation_bar.personal": "個人",
-  "navigation_bar.pins": "釘選的嘟文",
+  "navigation_bar.pins": "釘選嘟文",
   "navigation_bar.preferences": "偏好設定",
   "navigation_bar.public_timeline": "聯邦時間軸",
+  "navigation_bar.search": "搜尋",
   "navigation_bar.security": "安全性",
+  "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
+  "notification.admin.report": "{name} 檢舉了 {target}",
+  "notification.admin.sign_up": "{name} 已經註冊",
   "notification.favourite": "{name} 把您的嘟文加入了最愛",
   "notification.follow": "{name} 跟隨了您",
   "notification.follow_request": "{name} 要求跟隨您",
@@ -306,13 +400,16 @@
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 轉嘟了您的嘟文",
   "notification.status": "{name} 剛剛嘟文",
+  "notification.update": "{name} 編輯了嘟文",
   "notifications.clear": "清除通知",
-  "notifications.clear_confirmation": "確定要永久清除您的通知嗎？",
+  "notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
+  "notifications.column_settings.admin.report": "新檢舉報告：",
+  "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
-  "notifications.column_settings.filter_bar.category": "快速過濾欄",
-  "notifications.column_settings.filter_bar.show": "顯示",
+  "notifications.column_settings.filter_bar.category": "快速過濾器",
+  "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
   "notifications.column_settings.follow": "新的跟隨者：",
   "notifications.column_settings.follow_request": "新的跟隨請求：",
   "notifications.column_settings.mention": "提及：",
@@ -322,20 +419,22 @@
   "notifications.column_settings.show": "在欄位中顯示",
   "notifications.column_settings.sound": "播放聲音",
   "notifications.column_settings.status": "新嘟文：",
-  "notifications.column_settings.unread_markers.category": "未讀通知標記",
+  "notifications.column_settings.unread_notifications.category": "未讀通知",
+  "notifications.column_settings.unread_notifications.highlight": "突顯未讀通知",
+  "notifications.column_settings.update": "編輯：",
   "notifications.filter.all": "全部",
   "notifications.filter.boosts": "轉嘟",
   "notifications.filter.favourites": "最愛",
   "notifications.filter.follows": "跟隨的使用者",
   "notifications.filter.mentions": "提及",
   "notifications.filter.polls": "投票結果",
-  "notifications.filter.statuses": "已跟隨使用者的最新動態",
+  "notifications.filter.statuses": "您跟隨的使用者之最新動態",
   "notifications.grant_permission": "授予權限",
   "notifications.group": "{count} 條通知",
   "notifications.mark_as_read": "將所有通知都標記為已讀",
   "notifications.permission_denied": "由於之前拒絕了瀏覽器請求，因此桌面通知不可用",
-  "notifications.permission_denied_alert": "因為之前瀏覽器權限被拒絕，無法啟用桌面通知",
-  "notifications.permission_required": "因為尚未授予所需的權限，所以桌面通知不可用。",
+  "notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
+  "notifications.permission_required": "由於尚未授予所需的權限，所以桌面通知不可用。",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "啟用桌面通知以在 Mastodon 沒有開啟的時候接收通知。在已經啟用桌面通知的時候，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不要錯過任何東西！",
@@ -346,46 +445,102 @@
   "poll.total_votes": "{count, plural, one {# 個投票} other {# 個投票}}",
   "poll.vote": "投票",
   "poll.voted": "您已對此問題投票",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
   "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "私訊",
+  "privacy.direct.short": "僅限提及的人",
   "privacy.private.long": "只有跟隨您的使用者能看到",
-  "privacy.private.short": "僅跟隨者",
-  "privacy.public.long": "公開，且顯示於公開時間軸",
+  "privacy.private.short": "僅限跟隨者",
+  "privacy.public.long": "對所有人可見",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "公開，但不會顯示在公開時間軸",
+  "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
   "privacy.unlisted.short": "不公開",
+  "privacy_policy.last_updated": "最後更新：{date}",
+  "privacy_policy.title": "隱私權政策",
   "refresh": "重新整理",
   "regeneration_indicator.label": "載入中…",
-  "regeneration_indicator.sublabel": "您的主頁時間軸正在準備中！",
+  "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
   "relative_time.days": "{number} 天",
-  "relative_time.hours": "{number}小時前",
+  "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
+  "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
+  "relative_time.full.just_now": "剛剛",
+  "relative_time.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}前",
+  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
+  "relative_time.hours": "{number} 小時前",
   "relative_time.just_now": "剛剛",
-  "relative_time.minutes": "{number} 分前",
+  "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
   "reply_indicator.cancel": "取消",
+  "report.block": "封鎖",
+  "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
+  "report.categories.other": "其他",
+  "report.categories.spam": "垃圾訊息",
+  "report.categories.violation": "內容違反一項或多項伺服器條款",
+  "report.category.subtitle": "選擇最佳條件符合",
+  "report.category.title": "告訴我們這個 {type} 發生了什麼事",
+  "report.category.title_account": "個人檔案",
+  "report.category.title_status": "嘟文",
+  "report.close": "已完成",
+  "report.comment.title": "有什麼其他您想讓我們知道的嗎？",
   "report.forward": "轉寄到 {target}",
-  "report.forward_hint": "這個帳戶屬於其他伺服器。要像該伺服器發送匿名的檢舉訊息嗎?",
-  "report.hint": "這項訊息會發送到您伺服器的管理員。您可以提供檢舉這個帳戶的理由：",
+  "report.forward_hint": "這個帳號屬於其他伺服器。要向該伺服器發送匿名的檢舉訊息嗎？",
+  "report.mute": "靜音",
+  "report.mute_explanation": "您將不再看到他們的嘟文。他們仍能可以跟隨您以及察看您的嘟文，並且不會知道他們已被靜音。",
+  "report.next": "繼續",
   "report.placeholder": "其他備註",
+  "report.reasons.dislike": "我不喜歡",
+  "report.reasons.dislike_description": "這是您不想看到的",
+  "report.reasons.other": "其他原因",
+  "report.reasons.other_description": "這個問題不屬於其他分類",
+  "report.reasons.spam": "垃圾訊息",
+  "report.reasons.spam_description": "有害連結、假造的互動，或是重複性回覆",
+  "report.reasons.violation": "違反伺服器規則",
+  "report.reasons.violation_description": "您知道它違反特定規則",
+  "report.rules.subtitle": "請選擇所有適用的選項",
+  "report.rules.title": "違反了哪些規則？",
+  "report.statuses.subtitle": "請選擇所有適用的選項",
+  "report.statuses.title": "是否有能佐證這份檢舉之嘟文？",
   "report.submit": "送出",
   "report.target": "檢舉 {target}",
+  "report.thanks.take_action": "以下是控制您想於 Mastodon 看到什麼內容之選項：",
+  "report.thanks.take_action_actionable": "當我們正在審核期間，您可以對 @{name} 採取以下措施：",
+  "report.thanks.title": "不想再看到這個？",
+  "report.thanks.title_actionable": "感謝您的檢舉，我們將會著手處理。",
+  "report.unfollow": "取消跟隨 @{name}",
+  "report.unfollow_explanation": "您正在跟隨此帳號。如不欲於首頁時間軸再見到他們的嘟文，請取消跟隨。",
+  "report_notification.attached_statuses": "{count, plural, one {{count} 則} other {{count} 則}} 嘟文",
+  "report_notification.categories.other": "其他",
+  "report_notification.categories.spam": "垃圾訊息",
+  "report_notification.categories.violation": "違反規則",
+  "report_notification.open": "開啟檢舉報告",
   "search.placeholder": "搜尋",
+  "search.search_or_paste": "搜尋或輸入網址",
   "search_popout.search_format": "進階搜尋格式",
-  "search_popout.tips.full_text": "輸入簡單的文字，搜尋由您撰寫、最愛、轉嘟或提您的嘟文，以及與關鍵詞匹配的使用者名稱、帳戶顯示名稱和主題標籤。",
+  "search_popout.tips.full_text": "輸入簡單的文字，搜尋由您撰寫、最愛、轉嘟或提您的嘟文，以及與關鍵詞匹配的使用者名稱、帳號顯示名稱和主題標籤。",
   "search_popout.tips.hashtag": "主題標籤",
   "search_popout.tips.status": "嘟文",
-  "search_popout.tips.text": "輸入簡單的文字，搜尋符合的使用者名稱，帳戶名稱與標籤",
+  "search_popout.tips.text": "輸入簡單的文字，搜尋符合的使用者名稱，帳號名稱與標籤",
   "search_popout.tips.user": "使用者",
   "search_results.accounts": "使用者",
+  "search_results.all": "全部",
   "search_results.hashtags": "主題標籤",
+  "search_results.nothing_found": "無法找到符合搜尋條件之結果",
   "search_results.statuses": "嘟文",
   "search_results.statuses_fts_disabled": "「依內容搜尋嘟文」未在此 Mastodon 伺服器啟用。",
+  "search_results.title": "搜尋：{q}",
   "search_results.total": "{count, number} 項結果",
+  "server_banner.about_active_users": "最近三十日內使用此伺服器的人 (月活躍使用者)",
+  "server_banner.active_users": "活躍使用者",
+  "server_banner.administered_by": "管理者：",
+  "server_banner.introduction": "{domain} 是由 {mastodon} 提供之去中心化社群網路一部分。",
+  "server_banner.learn_more": "了解更多",
+  "server_banner.server_stats": "伺服器統計：",
+  "sign_in_banner.create_account": "新增帳號",
+  "sign_in_banner.sign_in": "登入",
+  "sign_in_banner.text": "登入以追蹤個人檔案、主題標籤、最愛，分享和回覆嘟文，或以您其他伺服器之帳號進行互動：",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_status": "在管理介面開啟此嘟文",
   "status.block": "封鎖 @{name}",
@@ -396,9 +551,16 @@
   "status.delete": "刪除",
   "status.detailed_status": "詳細的對話內容",
   "status.direct": "發送私訊給 @{name}",
+  "status.edit": "編輯",
+  "status.edited": "編輯於 {date}",
+  "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "內嵌",
   "status.favourite": "最愛",
+  "status.filter": "過濾此嘟文",
   "status.filtered": "已過濾",
+  "status.hide": "隱藏嘟文",
+  "status.history.created": "{name} 於 {date} 建立",
+  "status.history.edited": "{name} 於 {date} 修改",
   "status.load_more": "載入更多",
   "status.media_hidden": "隱藏媒體內容",
   "status.mention": "提及 @{name}",
@@ -406,46 +568,52 @@
   "status.mute": "靜音 @{name}",
   "status.mute_conversation": "靜音對話",
   "status.open": "展開此嘟文",
-  "status.pin": "釘選到個人資料頁",
-  "status.pinned": "釘選的嘟文",
+  "status.pin": "釘選到個人檔案頁面",
+  "status.pinned": "釘選嘟文",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
-  "status.reblog_private": "轉嘟給原有關注者",
+  "status.reblog_private": "依照原嘟可見性轉嘟",
   "status.reblogged_by": "{name} 轉嘟了",
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
-  "status.redraft": "刪除 & 編輯",
+  "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
+  "status.replied_to": "回覆給 {name}",
   "status.reply": "回覆",
   "status.replyAll": "回覆討論串",
   "status.report": "檢舉 @{name}",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
+  "status.show_filter_reason": "仍要顯示",
   "status.show_less": "減少顯示",
   "status.show_less_all": "減少顯示這類嘟文",
   "status.show_more": "顯示更多",
   "status.show_more_all": "顯示更多這類嘟文",
-  "status.show_thread": "顯示討論串",
+  "status.show_original": "顯示原文",
+  "status.translate": "翻譯",
+  "status.translated_from_with": "透過 {provider} 翻譯 {lang}",
   "status.uncached_media_warning": "無法使用",
   "status.unmute_conversation": "解除此對話的靜音",
-  "status.unpin": "從個人頁面解除釘選",
+  "status.unpin": "從個人檔案頁面取消釘選",
+  "subscribed_languages.lead": "僅選定語言的嘟文才會出現在您的首頁上，並在變更後列出時間軸。選取「無」以接收所有語言的嘟文。",
+  "subscribed_languages.save": "儲存變更",
+  "subscribed_languages.target": "變更 {target} 的訂閱語言",
   "suggestions.dismiss": "關閉建議",
   "suggestions.header": "您可能對這些東西有興趣…",
   "tabs_bar.federated_timeline": "聯邦宇宙",
   "tabs_bar.home": "首頁",
-  "tabs_bar.local_timeline": "本機",
+  "tabs_bar.local_timeline": "本站",
   "tabs_bar.notifications": "通知",
-  "tabs_bar.search": "搜尋",
-  "time_remaining.days": "剩餘{number, plural, one {# 天} other {# 天}}",
-  "time_remaining.hours": "剩餘{number, plural, one {# 小時} other {# 小時}}",
-  "time_remaining.minutes": "剩餘{number, plural, one {# 分鐘} other {# 分鐘}}",
+  "time_remaining.days": "剩餘 {number, plural, one {# 天} other {# 天}}",
+  "time_remaining.hours": "剩餘 {number, plural, one {# 小時} other {# 小時}}",
+  "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
   "time_remaining.moments": "剩餘時間",
   "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
   "timeline_hint.remote_resource_not_displayed": "不會顯示來自其他伺服器的 {resource}",
   "timeline_hint.resources.followers": "跟隨者",
   "timeline_hint.resources.follows": "正在跟隨",
   "timeline_hint.resources.statuses": "更早的嘟文",
-  "trends.counter_by_accounts": "{count, plural,one {{counter} 人}other {{counter} 人}}正在討論",
-  "trends.trending_now": "目前趨勢",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}} 於過去 {days, plural, one {日} other {{days} days}} 之間",
+  "trends.trending_now": "現正熱門趨勢",
   "ui.beforeunload": "如果離開 Mastodon，您的草稿將會不見。",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
@@ -454,15 +622,16 @@
   "upload_button.label": "上傳圖像、影片、或音樂檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許在投票中上傳檔案。",
-  "upload_form.audio_description": "描述內容給聽障人士",
+  "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
+  "upload_form.description_missing": "沒有任何描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
   "upload_form.undo": "刪除",
-  "upload_form.video_description": "描述給聽障或視障人士",
+  "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
-  "upload_modal.applying": "Applying…",
+  "upload_modal.applying": "正在套用⋯⋯",
   "upload_modal.choose_image": "選擇圖片",
   "upload_modal.description_placeholder": "我能吞下玻璃而不傷身體",
   "upload_modal.detect_text": "從圖片中偵測文字",
@@ -471,6 +640,7 @@
   "upload_modal.preparing_ocr": "準備 OCR 中……",
   "upload_modal.preview_label": "預覽 ({ratio})",
   "upload_progress.label": "上傳中...",
+  "upload_progress.processing": "處理中...",
   "video.close": "關閉影片",
   "video.download": "下載檔案",
   "video.exit_fullscreen": "退出全螢幕",
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index bda51f692..69a7ee91f 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,34 +1,44 @@
-import * as registerPushNotifications from './actions/push_notifications';
-import { setupBrowserNotifications } from './actions/notifications';
-import { default as Mastodon, store } from './containers/mastodon';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import ready from './ready';
+import { setupBrowserNotifications } from 'mastodon/actions/notifications';
+import Mastodon, { store } from 'mastodon/containers/mastodon';
+import { me } from 'mastodon/initial_state';
+import ready from 'mastodon/ready';
 
-const perf = require('./performance');
+const perf = require('mastodon/performance');
 
+/**
+ * @returns {Promise<void>}
+ */
 function main() {
   perf.start('main()');
 
-  if (window.history && history.replaceState) {
-    const { pathname, search, hash } = window.location;
-    const path = pathname + search + hash;
-    if (!(/^\/web($|\/)/).test(path)) {
-      history.replaceState(null, document.title, `/web${path}`);
-    }
-  }
-
-  ready(() => {
+  return ready(async () => {
     const mountNode = document.getElementById('mastodon');
     const props = JSON.parse(mountNode.getAttribute('data-props'));
 
     ReactDOM.render(<Mastodon {...props} />, mountNode);
     store.dispatch(setupBrowserNotifications());
-    if (process.env.NODE_ENV === 'production') {
-      // avoid offline in dev mode because it's harder to debug
-      require('offline-plugin/runtime').install();
-      store.dispatch(registerPushNotifications.register());
+
+    if (process.env.NODE_ENV === 'production' && me && 'serviceWorker' in navigator) {
+      const { Workbox } = await import('workbox-window');
+      const wb = new Workbox('/sw.js');
+      /** @type {ServiceWorkerRegistration} */
+      let registration;
+
+      try {
+        registration = await wb.register();
+      } catch (err) {
+        console.error(err);
+      }
+
+      if (registration) {
+        const registerPushNotifications = await import('mastodon/actions/push_notifications');
+
+        store.dispatch(registerPushNotifications.register());
+      }
     }
+
     perf.stop('main()');
   });
 }
diff --git a/app/javascript/mastodon/middleware/errors.js b/app/javascript/mastodon/middleware/errors.js
index 0a65fd321..708df6bb8 100644
--- a/app/javascript/mastodon/middleware/errors.js
+++ b/app/javascript/mastodon/middleware/errors.js
@@ -14,4 +14,4 @@ export default function errorsMiddleware() {
 
     return next(action);
   };
-};
+}
diff --git a/app/javascript/mastodon/middleware/loading_bar.js b/app/javascript/mastodon/middleware/loading_bar.js
index a98f1bb2b..da8cc4c7d 100644
--- a/app/javascript/mastodon/middleware/loading_bar.js
+++ b/app/javascript/mastodon/middleware/loading_bar.js
@@ -22,4 +22,4 @@ export default function loadingBarMiddleware(config = {}) {
 
     return next(action);
   };
-};
+}
diff --git a/app/javascript/mastodon/middleware/sounds.js b/app/javascript/mastodon/middleware/sounds.js
index 9f1bc02b9..7f2388983 100644
--- a/app/javascript/mastodon/middleware/sounds.js
+++ b/app/javascript/mastodon/middleware/sounds.js
@@ -43,4 +43,4 @@ export default function soundsMiddleware() {
 
     return next(action);
   };
-};
+}
diff --git a/app/javascript/mastodon/permissions.js b/app/javascript/mastodon/permissions.js
new file mode 100644
index 000000000..752ddd6c5
--- /dev/null
+++ b/app/javascript/mastodon/permissions.js
@@ -0,0 +1,3 @@
+export const PERMISSION_INVITE_USERS   = 0x0000000000010000;
+export const PERMISSION_MANAGE_USERS   = 0x0000000000000400;
+export const PERMISSION_MANAGE_REPORTS = 0x0000000000000010;
diff --git a/app/javascript/mastodon/ready.js b/app/javascript/mastodon/ready.js
index dd543910b..e769cc756 100644
--- a/app/javascript/mastodon/ready.js
+++ b/app/javascript/mastodon/ready.js
@@ -1,7 +1,32 @@
-export default function ready(loaded) {
-  if (['interactive', 'complete'].includes(document.readyState)) {
-    loaded();
-  } else {
-    document.addEventListener('DOMContentLoaded', loaded);
-  }
+// @ts-check
+
+/**
+ * @param {(() => void) | (() => Promise<void>)} callback
+ * @returns {Promise<void>}
+ */
+export default function ready(callback) {
+  return new Promise((resolve, reject) => {
+    function loaded() {
+      let result;
+      try {
+        result = callback();
+      } catch (err) {
+        reject(err);
+
+        return;
+      }
+
+      if (typeof result?.then === 'function') {
+        result.then(resolve).catch(reject);
+      } else {
+        resolve();
+      }
+    }
+
+    if (['interactive', 'complete'].includes(document.readyState)) {
+      loaded();
+    } else {
+      document.addEventListener('DOMContentLoaded', loaded);
+    }
+  });
 }
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index 530ed8e60..44973e939 100644
--- a/app/javascript/mastodon/reducers/accounts.js
+++ b/app/javascript/mastodon/reducers/accounts.js
@@ -1,4 +1,5 @@
-import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
+import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from 'mastodon/actions/importer';
+import { ACCOUNT_REVEAL } from 'mastodon/actions/accounts';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const initialState = ImmutableMap();
@@ -10,6 +11,8 @@ const normalizeAccount = (state, account) => {
   delete account.following_count;
   delete account.statuses_count;
 
+  account.hidden = state.getIn([account.id, 'hidden']) === false ? false : account.limited;
+
   return state.set(account.id, fromJS(account));
 };
 
@@ -27,7 +30,9 @@ export default function accounts(state = initialState, action) {
     return normalizeAccount(state, action.account);
   case ACCOUNTS_IMPORT:
     return normalizeAccounts(state, action.accounts);
+  case ACCOUNT_REVEAL:
+    return state.setIn([action.id, 'hidden'], false);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/accounts_counters.js b/app/javascript/mastodon/reducers/accounts_counters.js
index 9ebf72af9..4e1256d1b 100644
--- a/app/javascript/mastodon/reducers/accounts_counters.js
+++ b/app/javascript/mastodon/reducers/accounts_counters.js
@@ -35,4 +35,4 @@ export default function accountsCounters(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/accounts_map.js b/app/javascript/mastodon/reducers/accounts_map.js
index e0d42e9cd..8412ad4d0 100644
--- a/app/javascript/mastodon/reducers/accounts_map.js
+++ b/app/javascript/mastodon/reducers/accounts_map.js
@@ -1,15 +1,20 @@
 import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
+import { ACCOUNT_LOOKUP_FAIL } from '../actions/accounts';
 import { Map as ImmutableMap } from 'immutable';
 
+export const normalizeForLookup = str => str.toLowerCase();
+
 const initialState = ImmutableMap();
 
 export default function accountsMap(state = initialState, action) {
   switch(action.type) {
+  case ACCOUNT_LOOKUP_FAIL:
+    return action.error?.response?.status === 404 ? state.set(normalizeForLookup(action.acct), null) : state;
   case ACCOUNT_IMPORT:
-    return state.set(action.account.acct, action.account.id);
+    return state.set(normalizeForLookup(action.account.acct), action.account.id);
   case ACCOUNTS_IMPORT:
-    return state.withMutations(map => action.accounts.forEach(account => map.set(account.acct, account.id)));
+    return state.withMutations(map => action.accounts.forEach(account => map.set(normalizeForLookup(account.acct), account.id)));
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/alerts.js b/app/javascript/mastodon/reducers/alerts.js
index c62ab0dfd..5b3010a59 100644
--- a/app/javascript/mastodon/reducers/alerts.js
+++ b/app/javascript/mastodon/reducers/alerts.js
@@ -23,4 +23,4 @@ export default function alerts(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/announcements.js b/app/javascript/mastodon/reducers/announcements.js
index 34e08eac8..b53f93a4a 100644
--- a/app/javascript/mastodon/reducers/announcements.js
+++ b/app/javascript/mastodon/reducers/announcements.js
@@ -99,4 +99,4 @@ export default function announcementsReducer(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 06a908e9d..9ce7e97ed 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -14,6 +14,7 @@ import {
   COMPOSE_UPLOAD_FAIL,
   COMPOSE_UPLOAD_UNDO,
   COMPOSE_UPLOAD_PROGRESS,
+  COMPOSE_UPLOAD_PROCESSING,
   THUMBNAIL_UPLOAD_REQUEST,
   THUMBNAIL_UPLOAD_SUCCESS,
   THUMBNAIL_UPLOAD_FAIL,
@@ -28,6 +29,7 @@ import {
   COMPOSE_SPOILERNESS_CHANGE,
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
+  COMPOSE_LANGUAGE_CHANGE,
   COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
   COMPOSE_UPLOAD_CHANGE_REQUEST,
@@ -43,6 +45,7 @@ import {
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
   COMPOSE_CHANGE_MEDIA_FOCUS,
+  COMPOSE_SET_STATUS,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';
@@ -58,6 +61,7 @@ const initialState = ImmutableMap({
   spoiler: false,
   spoiler_text: '',
   privacy: null,
+  id: null,
   text: '',
   focusDate: null,
   caretPosition: null,
@@ -77,6 +81,7 @@ const initialState = ImmutableMap({
   suggestions: ImmutableList(),
   default_privacy: 'public',
   default_sensitive: false,
+  default_language: 'en',
   resetFileKey: Math.floor((Math.random() * 0x10000)),
   idempotencyKey: null,
   tagHistory: ImmutableList(),
@@ -103,10 +108,11 @@ function statusToTextMentions(state, status) {
   }
 
   return set.union(status.get('mentions').filterNot(mention => mention.get('id') === me).map(mention => `@${mention.get('acct')} `)).join('');
-};
+}
 
 function clearAll(state) {
   return state.withMutations(map => {
+    map.set('id', null);
     map.set('text', '');
     map.set('spoiler', false);
     map.set('spoiler_text', '');
@@ -114,12 +120,13 @@ function clearAll(state) {
     map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
     map.set('privacy', state.get('default_privacy'));
-    map.set('sensitive', false);
+    map.set('sensitive', state.get('default_sensitive'));
+    map.set('language', state.get('default_language'));
     map.update('media_attachments', list => list.clear());
     map.set('poll', null);
     map.set('idempotencyKey', uuid());
   });
-};
+}
 
 function appendMedia(state, media, file) {
   const prevSize = state.get('media_attachments').size;
@@ -128,8 +135,9 @@ function appendMedia(state, media, file) {
     if (media.get('type') === 'image') {
       media = media.set('file', file);
     }
-    map.update('media_attachments', list => list.push(media));
+    map.update('media_attachments', list => list.push(media.set('unattached', true)));
     map.set('is_uploading', false);
+    map.set('is_processing', false);
     map.set('resetFileKey', Math.floor((Math.random() * 0x10000)));
     map.set('idempotencyKey', uuid());
     map.update('pending_media_attachments', n => n - 1);
@@ -138,7 +146,7 @@ function appendMedia(state, media, file) {
       map.set('sensitive', true);
     }
   });
-};
+}
 
 function removeMedia(state, mediaId) {
   const prevSize = state.get('media_attachments').size;
@@ -151,7 +159,7 @@ function removeMedia(state, mediaId) {
       map.set('sensitive', false);
     }
   });
-};
+}
 
 const insertSuggestion = (state, position, token, completion, path) => {
   return state.withMutations(map => {
@@ -313,6 +321,7 @@ export default function compose(state = initialState, action) {
     return state.set('is_composing', action.value);
   case COMPOSE_REPLY:
     return state.withMutations(map => {
+      map.set('id', null);
       map.set('in_reply_to', action.status.get('id'));
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
@@ -321,29 +330,30 @@ export default function compose(state = initialState, action) {
       map.set('preselectDate', new Date());
       map.set('idempotencyKey', uuid());
 
+      if (action.status.get('language') && !action.status.has('translation')) {
+        map.set('language', action.status.get('language'));
+      } else {
+        map.set('language', state.get('default_language'));
+      }
+
       if (action.status.get('spoiler_text').length > 0) {
         map.set('spoiler', true);
         map.set('spoiler_text', action.status.get('spoiler_text'));
+
+        if (map.get('media_attachments').size >= 1) {
+          map.set('sensitive', true);
+        }
       } else {
         map.set('spoiler', false);
         map.set('spoiler_text', '');
       }
     });
-  case COMPOSE_REPLY_CANCEL:
-  case COMPOSE_RESET:
-    return state.withMutations(map => {
-      map.set('in_reply_to', null);
-      map.set('text', '');
-      map.set('spoiler', false);
-      map.set('spoiler_text', '');
-      map.set('privacy', state.get('default_privacy'));
-      map.set('poll', null);
-      map.set('idempotencyKey', uuid());
-    });
   case COMPOSE_SUBMIT_REQUEST:
     return state.set('is_submitting', true);
   case COMPOSE_UPLOAD_CHANGE_REQUEST:
     return state.set('is_changing_upload', true);
+  case COMPOSE_REPLY_CANCEL:
+  case COMPOSE_RESET:
   case COMPOSE_SUBMIT_SUCCESS:
     return clearAll(state);
   case COMPOSE_SUBMIT_FAIL:
@@ -352,10 +362,12 @@ export default function compose(state = initialState, action) {
     return state.set('is_changing_upload', false);
   case COMPOSE_UPLOAD_REQUEST:
     return state.set('is_uploading', true).update('pending_media_attachments', n => n + 1);
+  case COMPOSE_UPLOAD_PROCESSING:
+    return state.set('is_processing', true);
   case COMPOSE_UPLOAD_SUCCESS:
     return appendMedia(state, fromJS(action.media), action.file);
   case COMPOSE_UPLOAD_FAIL:
-    return state.set('is_uploading', false).update('pending_media_attachments', n => n - 1);
+    return state.set('is_uploading', false).set('is_processing', false).update('pending_media_attachments', n => n - 1);
   case COMPOSE_UPLOAD_UNDO:
     return removeMedia(state, action.media_id);
   case COMPOSE_UPLOAD_PROGRESS:
@@ -419,6 +431,8 @@ export default function compose(state = initialState, action) {
   case TIMELINE_DELETE:
     if (action.id === state.get('in_reply_to')) {
       return state.set('in_reply_to', null);
+    } else if (action.id === state.get('id')) {
+      return state.set('id', null);
     } else {
       return state;
     }
@@ -430,7 +444,7 @@ export default function compose(state = initialState, action) {
       .setIn(['media_modal', 'dirty'], false)
       .update('media_attachments', list => list.map(item => {
         if (item.get('id') === action.media.id) {
-          return fromJS(action.media);
+          return fromJS(action.media).set('unattached', true);
         }
 
         return item;
@@ -440,15 +454,46 @@ export default function compose(state = initialState, action) {
       map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
       map.set('privacy', action.status.get('visibility'));
+      map.set('media_attachments', action.status.get('media_attachments').map((media) => media.set('unattached', true)));
+      map.set('focusDate', new Date());
+      map.set('caretPosition', null);
+      map.set('idempotencyKey', uuid());
+      map.set('sensitive', action.status.get('sensitive'));
+      map.set('language', action.status.get('language'));
+      map.set('id', null);
+
+      if (action.status.get('spoiler_text').length > 0) {
+        map.set('spoiler', true);
+        map.set('spoiler_text', action.status.get('spoiler_text'));
+      } else {
+        map.set('spoiler', false);
+        map.set('spoiler_text', '');
+      }
+
+      if (action.status.get('poll')) {
+        map.set('poll', ImmutableMap({
+          options: action.status.getIn(['poll', 'options']).map(x => x.get('title')),
+          multiple: action.status.getIn(['poll', 'multiple']),
+          expires_in: expiresInFromExpiresAt(action.status.getIn(['poll', 'expires_at'])),
+        }));
+      }
+    });
+  case COMPOSE_SET_STATUS:
+    return state.withMutations(map => {
+      map.set('id', action.status.get('id'));
+      map.set('text', action.text);
+      map.set('in_reply_to', action.status.get('in_reply_to_id'));
+      map.set('privacy', action.status.get('visibility'));
       map.set('media_attachments', action.status.get('media_attachments'));
       map.set('focusDate', new Date());
       map.set('caretPosition', null);
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
+      map.set('language', action.status.get('language'));
 
-      if (action.status.get('spoiler_text').length > 0) {
+      if (action.spoiler_text.length > 0) {
         map.set('spoiler', true);
-        map.set('spoiler_text', action.status.get('spoiler_text'));
+        map.set('spoiler_text', action.spoiler_text);
       } else {
         map.set('spoiler', false);
         map.set('spoiler_text', '');
@@ -474,7 +519,9 @@ export default function compose(state = initialState, action) {
     return state.updateIn(['poll', 'options'], options => options.delete(action.index));
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
+  case COMPOSE_LANGUAGE_CHANGE:
+    return state.set('language', action.language);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/contexts.js b/app/javascript/mastodon/reducers/contexts.js
index 4c2d6cc8a..7aa95b5d5 100644
--- a/app/javascript/mastodon/reducers/contexts.js
+++ b/app/javascript/mastodon/reducers/contexts.js
@@ -103,4 +103,4 @@ export default function replies(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/conversations.js b/app/javascript/mastodon/reducers/conversations.js
index 975418eda..feccf18f0 100644
--- a/app/javascript/mastodon/reducers/conversations.js
+++ b/app/javascript/mastodon/reducers/conversations.js
@@ -113,4 +113,4 @@ export default function conversations(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/custom_emojis.js b/app/javascript/mastodon/reducers/custom_emojis.js
index d2c801ade..0338c2e53 100644
--- a/app/javascript/mastodon/reducers/custom_emojis.js
+++ b/app/javascript/mastodon/reducers/custom_emojis.js
@@ -12,4 +12,4 @@ export default function custom_emojis(state = initialState, action) {
   }
 
   return state;
-};
+}
diff --git a/app/javascript/mastodon/reducers/domain_lists.js b/app/javascript/mastodon/reducers/domain_lists.js
index eff97fbd6..6bf8cee68 100644
--- a/app/javascript/mastodon/reducers/domain_lists.js
+++ b/app/javascript/mastodon/reducers/domain_lists.js
@@ -22,4 +22,4 @@ export default function domainLists(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/filters.js b/app/javascript/mastodon/reducers/filters.js
index 33f0c6732..e1f014046 100644
--- a/app/javascript/mastodon/reducers/filters.js
+++ b/app/javascript/mastodon/reducers/filters.js
@@ -1,11 +1,44 @@
-import { FILTERS_FETCH_SUCCESS } from '../actions/filters';
-import { List as ImmutableList, fromJS } from 'immutable';
+import { FILTERS_IMPORT } from '../actions/importer';
+import { FILTERS_FETCH_SUCCESS, FILTERS_CREATE_SUCCESS } from '../actions/filters';
+import { Map as ImmutableMap, is, fromJS } from 'immutable';
 
-export default function filters(state = ImmutableList(), action) {
+const normalizeFilter = (state, filter) => {
+  const normalizedFilter = fromJS({
+    id: filter.id,
+    title: filter.title,
+    context: filter.context,
+    filter_action: filter.filter_action,
+    keywords: filter.keywords,
+    expires_at: filter.expires_at ? Date.parse(filter.expires_at) : null,
+  });
+
+  if (is(state.get(filter.id), normalizedFilter)) {
+    return state;
+  } else {
+    // Do not overwrite keywords when receiving a partial filter
+    return state.update(filter.id, ImmutableMap(), (old) => (
+      old.mergeWith(((old_value, new_value) => (new_value === undefined ? old_value : new_value)), normalizedFilter)
+    ));
+  }
+};
+
+const normalizeFilters = (state, filters) => {
+  filters.forEach(filter => {
+    state = normalizeFilter(state, filter);
+  });
+
+  return state;
+};
+
+export default function filters(state = ImmutableMap(), action) {
   switch(action.type) {
+  case FILTERS_CREATE_SUCCESS:
+    return normalizeFilter(state, action.filter);
   case FILTERS_FETCH_SUCCESS:
-    return fromJS(action.filters);
+    return normalizeFilters(ImmutableMap(), action.filters);
+  case FILTERS_IMPORT:
+    return normalizeFilters(state, action.filters);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/height_cache.js b/app/javascript/mastodon/reducers/height_cache.js
index 2f5716fae..77a59c8c5 100644
--- a/app/javascript/mastodon/reducers/height_cache.js
+++ b/app/javascript/mastodon/reducers/height_cache.js
@@ -20,4 +20,4 @@ export default function statuses(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/history.js b/app/javascript/mastodon/reducers/history.js
new file mode 100644
index 000000000..00b01aa6e
--- /dev/null
+++ b/app/javascript/mastodon/reducers/history.js
@@ -0,0 +1,28 @@
+import { HISTORY_FETCH_REQUEST, HISTORY_FETCH_SUCCESS, HISTORY_FETCH_FAIL } from 'mastodon/actions/history';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+const initialHistory = ImmutableMap({
+  loading: false,
+  items: ImmutableList(),
+});
+
+const initialState = ImmutableMap();
+
+export default function history(state = initialState, action) {
+  switch(action.type) {
+  case HISTORY_FETCH_REQUEST:
+    return state.update(action.statusId, initialHistory, history => history.withMutations(map => {
+      map.set('loading', true);
+      map.set('items', ImmutableList());
+    }));
+  case HISTORY_FETCH_SUCCESS:
+    return state.update(action.statusId, initialHistory, history => history.withMutations(map => {
+      map.set('loading', false);
+      map.set('items', fromJS(action.history.map((x, i) => ({ ...x, account: x.account.id, original: i === 0 })).reverse()));
+    }));
+  case HISTORY_FETCH_FAIL:
+    return state.update(action.statusId, initialHistory, history => history.set('loading', false));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 53e2dd681..bccdc1865 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -17,7 +17,7 @@ import status_lists from './status_lists';
 import mutes from './mutes';
 import blocks from './blocks';
 import boosts from './boosts';
-import reports from './reports';
+import server from './server';
 import contexts from './contexts';
 import compose from './compose';
 import search from './search';
@@ -38,6 +38,8 @@ import announcements from './announcements';
 import markers from './markers';
 import picture_in_picture from './picture_in_picture';
 import accounts_map from './accounts_map';
+import history from './history';
+import tags from './tags';
 
 const reducers = {
   announcements,
@@ -60,7 +62,7 @@ const reducers = {
   mutes,
   blocks,
   boosts,
-  reports,
+  server,
   contexts,
   compose,
   search,
@@ -79,6 +81,8 @@ const reducers = {
   missed_updates,
   markers,
   picture_in_picture,
+  history,
+  tags,
 };
 
 export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/list_adder.js b/app/javascript/mastodon/reducers/list_adder.js
index b8c1b0e26..b144610a5 100644
--- a/app/javascript/mastodon/reducers/list_adder.js
+++ b/app/javascript/mastodon/reducers/list_adder.js
@@ -44,4 +44,4 @@ export default function listAdderReducer(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/list_editor.js b/app/javascript/mastodon/reducers/list_editor.js
index 91e524dd5..6e020dbe6 100644
--- a/app/javascript/mastodon/reducers/list_editor.js
+++ b/app/javascript/mastodon/reducers/list_editor.js
@@ -93,4 +93,4 @@ export default function listEditorReducer(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/lists.js b/app/javascript/mastodon/reducers/lists.js
index f30ffbcbd..ba3e2b3cb 100644
--- a/app/javascript/mastodon/reducers/lists.js
+++ b/app/javascript/mastodon/reducers/lists.js
@@ -34,4 +34,4 @@ export default function lists(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/markers.js b/app/javascript/mastodon/reducers/markers.js
index fb1572ff5..e3d1b1936 100644
--- a/app/javascript/mastodon/reducers/markers.js
+++ b/app/javascript/mastodon/reducers/markers.js
@@ -22,4 +22,4 @@ export default function markers(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/media_attachments.js b/app/javascript/mastodon/reducers/media_attachments.js
index 24119f628..7a155b77f 100644
--- a/app/javascript/mastodon/reducers/media_attachments.js
+++ b/app/javascript/mastodon/reducers/media_attachments.js
@@ -12,4 +12,4 @@ export default function meta(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index 65becc44f..755dd7390 100644
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -7,15 +7,16 @@ const initialState = ImmutableMap({
   streaming_api_base_url: null,
   access_token: null,
   layout: layoutFromWindow(),
+  permissions: '0',
 });
 
 export default function meta(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
-    return state.merge(action.state.get('meta'));
+    return state.merge(action.state.get('meta')).set('permissions', action.state.getIn(['role', 'permissions']));
   case APP_LAYOUT_CHANGE:
     return state.set('layout', action.layout);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/missed_updates.js b/app/javascript/mastodon/reducers/missed_updates.js
index b71d62d82..a3141d854 100644
--- a/app/javascript/mastodon/reducers/missed_updates.js
+++ b/app/javascript/mastodon/reducers/missed_updates.js
@@ -18,4 +18,4 @@ export default function missed_updates(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/modal.js b/app/javascript/mastodon/reducers/modal.js
index 41161a206..edde2f947 100644
--- a/app/javascript/mastodon/reducers/modal.js
+++ b/app/javascript/mastodon/reducers/modal.js
@@ -3,17 +3,37 @@ import { TIMELINE_DELETE } from '../actions/timelines';
 import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import { Stack as ImmutableStack, Map as ImmutableMap } from 'immutable';
 
-export default function modal(state = ImmutableStack(), action) {
-  switch(action.type) {
-  case MODAL_OPEN:
-    return state.unshift(ImmutableMap({ modalType: action.modalType, modalProps: action.modalProps }));
-  case MODAL_CLOSE:
-    return (action.modalType === undefined || action.modalType === state.getIn([0, 'modalType'])) ? state.shift() : state;
-  case COMPOSE_UPLOAD_CHANGE_SUCCESS:
-    return state.getIn([0, 'modalType']) === 'FOCAL_POINT' ? state.shift() : state;
-  case TIMELINE_DELETE:
-    return state.filterNot((modal) => modal.get('modalProps').statusId === action.id);
-  default:
+const initialState = ImmutableMap({
+  ignoreFocus: false,
+  stack: ImmutableStack(),
+});
+
+const popModal = (state, { modalType, ignoreFocus }) => {
+  if (modalType === undefined || modalType === state.getIn(['stack', 0, 'modalType'])) {
+    return state.set('ignoreFocus', !!ignoreFocus).update('stack', stack => stack.shift());
+  } else {
     return state;
   }
 };
+
+const pushModal = (state, modalType, modalProps) => {
+  return state.withMutations(map => {
+    map.set('ignoreFocus', false);
+    map.update('stack', stack => stack.unshift(ImmutableMap({ modalType, modalProps })));
+  });
+};
+
+export default function modal(state = initialState, action) {
+  switch(action.type) {
+  case MODAL_OPEN:
+    return pushModal(state, action.modalType, action.modalProps);
+  case MODAL_CLOSE:
+    return popModal(state, action);
+  case COMPOSE_UPLOAD_CHANGE_SUCCESS:
+    return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
+  case TIMELINE_DELETE:
+    return state.update('stack', stack => stack.filterNot((modal) => modal.get('modalProps').statusId === action.id));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index b587b6d0f..44fa1c613 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -28,7 +28,7 @@ import {
 } from '../actions/app';
 import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
 import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { fromJS, Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import compareId from '../compare_id';
 
 const initialState = ImmutableMap({
@@ -41,7 +41,7 @@ const initialState = ImmutableMap({
   lastReadId: '0',
   readMarkerId: '0',
   isTabVisible: true,
-  isLoading: false,
+  isLoading: 0,
   browserSupport: false,
   browserPermission: 'default',
 });
@@ -52,11 +52,17 @@ const notificationToMap = notification => ImmutableMap({
   account: notification.account.id,
   created_at: notification.created_at,
   status: notification.status ? notification.status.id : null,
+  report: notification.report ? fromJS(notification.report) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {
   const top = state.get('top');
 
+  // Under currently unknown conditions, the client may receive duplicates from the server
+  if (state.get('pendingItems').some((item) => item?.get('id') === notification.id) || state.get('items').some((item) => item?.get('id') === notification.id)) {
+    return state;
+  }
+
   if (usePendingItems || !state.get('pendingItems').isEmpty()) {
     return state.update('pendingItems', list => list.unshift(notificationToMap(notification))).update('unread', unread => unread + 1);
   }
@@ -76,28 +82,74 @@ const normalizeNotification = (state, notification, usePendingItems) => {
   });
 };
 
-const expandNormalizedNotifications = (state, notifications, next, isLoadingRecent, usePendingItems) => {
-  const lastReadId = state.get('lastReadId');
-  let items = ImmutableList();
+const expandNormalizedNotifications = (state, notifications, next, isLoadingMore, isLoadingRecent, usePendingItems) => {
+  // This method is pretty tricky because:
+  // - existing notifications might be out of order
+  // - the existing notifications may have gaps, most often explicitly noted with a `null` item
+  // - ideally, we don't want it to reorder existing items
+  // - `notifications` may include items that are already included
+  // - this function can be called either to fill in a gap, or load newer items
 
-  notifications.forEach((n, i) => {
-    items = items.set(i, notificationToMap(n));
-  });
+  const lastReadId = state.get('lastReadId');
+  const newItems = ImmutableList(notifications.map(notificationToMap));
 
   return state.withMutations(mutable => {
-    if (!items.isEmpty()) {
+    if (!newItems.isEmpty()) {
       usePendingItems = isLoadingRecent && (usePendingItems || !mutable.get('pendingItems').isEmpty());
 
-      mutable.update(usePendingItems ? 'pendingItems' : 'items', list => {
-        const lastIndex = 1 + list.findLastIndex(
-          item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id')),
-        );
+      mutable.update(usePendingItems ? 'pendingItems' : 'items', oldItems => {
+        // If called to poll *new* notifications, we just need to add them on top without duplicates
+        if (isLoadingRecent) {
+          const idsToCheck = oldItems.map(item => item?.get('id')).toSet();
+          const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
+          return insertedItems.concat(oldItems);
+        }
 
-        const firstIndex = 1 + list.take(lastIndex).findLastIndex(
-          item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0,
-        );
+        // If called to expand more (presumably older than any known to the WebUI), we just have to
+        // add them to the bottom without duplicates
+        if (isLoadingMore) {
+          const idsToCheck = oldItems.map(item => item?.get('id')).toSet();
+          const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
+          return oldItems.concat(insertedItems);
+        }
 
-        return list.take(firstIndex).concat(items, list.skip(lastIndex));
+        // Now this gets tricky, as we don't necessarily know for sure where the gap to fill is,
+        // and some items in the timeline may not be properly ordered.
+
+        // However, we know that `newItems.last()` is the oldest item that was requested and that
+        // there is no “hole” between `newItems.last()` and `newItems.first()`.
+
+        // First, find the furthest (if properly sorted, oldest) item in the notifications that is
+        // newer than the oldest fetched one, as it's most likely that it delimits the gap.
+        // Start the gap *after* that item.
+        const lastIndex = oldItems.findLastIndex(item => item !== null && compareId(item.get('id'), newItems.last().get('id')) >= 0) + 1;
+
+        // Then, try to find the furthest (if properly sorted, oldest) item in the notifications that
+        // is newer than the most recent fetched one, as it delimits a section comprised of only
+        // items older or within `newItems` (or that were deleted from the server, so should be removed
+        // anyway).
+        // Stop the gap *after* that item.
+        const firstIndex = oldItems.take(lastIndex).findLastIndex(item => item !== null && compareId(item.get('id'), newItems.first().get('id')) > 0) + 1;
+
+        // At this point:
+        // - no `oldItems` after `firstIndex` is newer than any of the `newItems`
+        // - all `oldItems` after `lastIndex` are older than every of the `newItems`
+        // - it is possible for items in the replaced slice to be older than every `newItems`
+        // - it is possible for items before `firstIndex` to be in the `newItems` range
+        // Therefore:
+        // - to avoid losing items, items from the replaced slice that are older than `newItems`
+        //   should be added in the back.
+        // - to avoid duplicates, `newItems` should be checked the first `firstIndex` items of
+        //   `oldItems`
+        const idsToCheck = oldItems.take(firstIndex).map(item => item?.get('id')).toSet();
+        const insertedItems = newItems.filterNot(item => idsToCheck.includes(item.get('id')));
+        const olderItems = oldItems.slice(firstIndex, lastIndex).filter(item => item !== null && compareId(item.get('id'), newItems.last().get('id')) < 0);
+
+        return oldItems.take(firstIndex).concat(
+          insertedItems,
+          olderItems,
+          oldItems.skip(lastIndex),
+        );
       });
     }
 
@@ -108,13 +160,13 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
     if (shouldCountUnreadNotifications(state)) {
       mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), lastReadId) > 0));
     } else {
-      const mostRecent = items.find(item => item !== null);
+      const mostRecent = newItems.find(item => item !== null);
       if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) {
         mutable.set('lastReadId', mostRecent.get('id'));
       }
     }
 
-    mutable.set('isLoading', false);
+    mutable.update('isLoading', (nbLoading) => nbLoading - 1);
   });
 };
 
@@ -213,9 +265,9 @@ export default function notifications(state = initialState, action) {
   case NOTIFICATIONS_LOAD_PENDING:
     return state.update('items', list => state.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0);
   case NOTIFICATIONS_EXPAND_REQUEST:
-    return state.set('isLoading', true);
+    return state.update('isLoading', (nbLoading) => nbLoading + 1);
   case NOTIFICATIONS_EXPAND_FAIL:
-    return state.set('isLoading', false);
+    return state.update('isLoading', (nbLoading) => nbLoading - 1);
   case NOTIFICATIONS_FILTER_SET:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', true);
   case NOTIFICATIONS_SCROLL_TOP:
@@ -223,7 +275,7 @@ export default function notifications(state = initialState, action) {
   case NOTIFICATIONS_UPDATE:
     return normalizeNotification(state, action.notification, action.usePendingItems);
   case NOTIFICATIONS_EXPAND_SUCCESS:
-    return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingRecent, action.usePendingItems);
+    return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingMore, action.isLoadingRecent, action.usePendingItems);
   case ACCOUNT_BLOCK_SUCCESS:
     return filterNotifications(state, [action.relationship.id]);
   case ACCOUNT_MUTE_SUCCESS:
@@ -233,8 +285,6 @@ export default function notifications(state = initialState, action) {
   case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
   case FOLLOW_REQUEST_REJECT_SUCCESS:
     return filterNotifications(state, [action.id], 'follow_request');
-  case ACCOUNT_MUTE_SUCCESS:
-    return action.relationship.muting_notifications ? filterNotifications(state, [action.relationship.id]) : state;
   case NOTIFICATIONS_CLEAR:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case TIMELINE_DELETE:
@@ -253,4 +303,4 @@ export default function notifications(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.js b/app/javascript/mastodon/reducers/picture_in_picture.js
index 48772ae7f..10fbc1695 100644
--- a/app/javascript/mastodon/reducers/picture_in_picture.js
+++ b/app/javascript/mastodon/reducers/picture_in_picture.js
@@ -22,4 +22,4 @@ export default function pictureInPicture(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/push_notifications.js b/app/javascript/mastodon/reducers/push_notifications.js
index c48cfb705..6a62ecb81 100644
--- a/app/javascript/mastodon/reducers/push_notifications.js
+++ b/app/javascript/mastodon/reducers/push_notifications.js
@@ -50,4 +50,4 @@ export default function push_subscriptions(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index 53949258a..a3b01a0f6 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -1,3 +1,6 @@
+import {
+  NOTIFICATIONS_UPDATE,
+} from '../actions/notifications';
 import {
   ACCOUNT_FOLLOW_SUCCESS,
   ACCOUNT_FOLLOW_REQUEST,
@@ -12,6 +15,8 @@ import {
   ACCOUNT_PIN_SUCCESS,
   ACCOUNT_UNPIN_SUCCESS,
   RELATIONSHIPS_FETCH_SUCCESS,
+  FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
+  FOLLOW_REQUEST_REJECT_SUCCESS,
 } from '../actions/accounts';
 import {
   DOMAIN_BLOCK_SUCCESS,
@@ -44,6 +49,12 @@ const initialState = ImmutableMap();
 
 export default function relationships(state = initialState, action) {
   switch(action.type) {
+  case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
+    return state.setIn([action.id, 'followed_by'], true).setIn([action.id, 'requested_by'], false);
+  case FOLLOW_REQUEST_REJECT_SUCCESS:
+    return state.setIn([action.id, 'followed_by'], false).setIn([action.id, 'requested_by'], false);
+  case NOTIFICATIONS_UPDATE:
+    return action.notification.type === 'follow_request' ? state.setIn([action.notification.account.id, 'requested_by'], true) : state;
   case ACCOUNT_FOLLOW_REQUEST:
     return state.getIn([action.id, 'following']) ? state : state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
   case ACCOUNT_FOLLOW_FAIL:
@@ -71,4 +82,4 @@ export default function relationships(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/reports.js b/app/javascript/mastodon/reducers/reports.js
deleted file mode 100644
index 21ae6f93f..000000000
--- a/app/javascript/mastodon/reducers/reports.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  REPORT_INIT,
-  REPORT_SUBMIT_REQUEST,
-  REPORT_SUBMIT_SUCCESS,
-  REPORT_SUBMIT_FAIL,
-  REPORT_CANCEL,
-  REPORT_STATUS_TOGGLE,
-  REPORT_COMMENT_CHANGE,
-  REPORT_FORWARD_CHANGE,
-} from '../actions/reports';
-import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
-
-const initialState = ImmutableMap({
-  new: ImmutableMap({
-    isSubmitting: false,
-    account_id: null,
-    status_ids: ImmutableSet(),
-    comment: '',
-    forward: false,
-  }),
-});
-
-export default function reports(state = initialState, action) {
-  switch(action.type) {
-  case REPORT_INIT:
-    return state.withMutations(map => {
-      map.setIn(['new', 'isSubmitting'], false);
-      map.setIn(['new', 'account_id'], action.account.get('id'));
-
-      if (state.getIn(['new', 'account_id']) !== action.account.get('id')) {
-        map.setIn(['new', 'status_ids'], action.status ? ImmutableSet([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : ImmutableSet());
-        map.setIn(['new', 'comment'], '');
-      } else if (action.status) {
-        map.updateIn(['new', 'status_ids'], ImmutableSet(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
-      }
-    });
-  case REPORT_STATUS_TOGGLE:
-    return state.updateIn(['new', 'status_ids'], ImmutableSet(), set => {
-      if (action.checked) {
-        return set.add(action.statusId);
-      }
-
-      return set.remove(action.statusId);
-    });
-  case REPORT_COMMENT_CHANGE:
-    return state.setIn(['new', 'comment'], action.comment);
-  case REPORT_FORWARD_CHANGE:
-    return state.setIn(['new', 'forward'], action.forward);
-  case REPORT_SUBMIT_REQUEST:
-    return state.setIn(['new', 'isSubmitting'], true);
-  case REPORT_SUBMIT_FAIL:
-    return state.setIn(['new', 'isSubmitting'], false);
-  case REPORT_CANCEL:
-  case REPORT_SUBMIT_SUCCESS:
-    return state.withMutations(map => {
-      map.setIn(['new', 'account_id'], null);
-      map.setIn(['new', 'status_ids'], ImmutableSet());
-      map.setIn(['new', 'comment'], '');
-      map.setIn(['new', 'isSubmitting'], false);
-    });
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 875b2d92b..d3e71da9d 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -1,6 +1,8 @@
 import {
   SEARCH_CHANGE,
   SEARCH_CLEAR,
+  SEARCH_FETCH_REQUEST,
+  SEARCH_FETCH_FAIL,
   SEARCH_FETCH_SUCCESS,
   SEARCH_SHOW,
   SEARCH_EXPAND_SUCCESS,
@@ -17,6 +19,7 @@ const initialState = ImmutableMap({
   submitted: false,
   hidden: false,
   results: ImmutableMap(),
+  isLoading: false,
   searchTerm: '',
 });
 
@@ -37,16 +40,28 @@ export default function search(state = initialState, action) {
   case COMPOSE_MENTION:
   case COMPOSE_DIRECT:
     return state.set('hidden', true);
+  case SEARCH_FETCH_REQUEST:
+    return state.withMutations(map => {
+      map.set('isLoading', true);
+      map.set('submitted', true);
+    });
+  case SEARCH_FETCH_FAIL:
+    return state.set('isLoading', false);
   case SEARCH_FETCH_SUCCESS:
-    return state.set('results', ImmutableMap({
-      accounts: ImmutableList(action.results.accounts.map(item => item.id)),
-      statuses: ImmutableList(action.results.statuses.map(item => item.id)),
-      hashtags: fromJS(action.results.hashtags),
-    })).set('submitted', true).set('searchTerm', action.searchTerm);
+    return state.withMutations(map => {
+      map.set('results', ImmutableMap({
+        accounts: ImmutableList(action.results.accounts.map(item => item.id)),
+        statuses: ImmutableList(action.results.statuses.map(item => item.id)),
+        hashtags: fromJS(action.results.hashtags),
+      }));
+
+      map.set('searchTerm', action.searchTerm);
+      map.set('isLoading', false);
+    });
   case SEARCH_EXPAND_SUCCESS:
     const results = action.searchType === 'hashtags' ? fromJS(action.results.hashtags) : action.results[action.searchType].map(item => item.id);
     return state.updateIn(['results', action.searchType], list => list.concat(results));
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/server.js b/app/javascript/mastodon/reducers/server.js
new file mode 100644
index 000000000..db9f2b5e6
--- /dev/null
+++ b/app/javascript/mastodon/reducers/server.js
@@ -0,0 +1,53 @@
+import {
+  SERVER_FETCH_REQUEST,
+  SERVER_FETCH_SUCCESS,
+  SERVER_FETCH_FAIL,
+  EXTENDED_DESCRIPTION_REQUEST,
+  EXTENDED_DESCRIPTION_SUCCESS,
+  EXTENDED_DESCRIPTION_FAIL,
+  SERVER_DOMAIN_BLOCKS_FETCH_REQUEST,
+  SERVER_DOMAIN_BLOCKS_FETCH_SUCCESS,
+  SERVER_DOMAIN_BLOCKS_FETCH_FAIL,
+} from 'mastodon/actions/server';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+const initialState = ImmutableMap({
+  server: ImmutableMap({
+    isLoading: true,
+  }),
+
+  extendedDescription: ImmutableMap({
+    isLoading: true,
+  }),
+
+  domainBlocks: ImmutableMap({
+    isLoading: true,
+    isAvailable: true,
+    items: ImmutableList(),
+  }),
+});
+
+export default function server(state = initialState, action) {
+  switch (action.type) {
+  case SERVER_FETCH_REQUEST:
+    return state.setIn(['server', 'isLoading'], true);
+  case SERVER_FETCH_SUCCESS:
+    return state.set('server', fromJS(action.server)).setIn(['server', 'isLoading'], false);
+  case SERVER_FETCH_FAIL:
+    return state.setIn(['server', 'isLoading'], false);
+  case EXTENDED_DESCRIPTION_REQUEST:
+    return state.setIn(['extendedDescription', 'isLoading'], true);
+  case EXTENDED_DESCRIPTION_SUCCESS:
+    return state.set('extendedDescription', fromJS(action.description)).setIn(['extendedDescription', 'isLoading'], false);
+  case EXTENDED_DESCRIPTION_FAIL:
+    return state.setIn(['extendedDescription', 'isLoading'], false);
+  case SERVER_DOMAIN_BLOCKS_FETCH_REQUEST:
+    return state.setIn(['domainBlocks', 'isLoading'], true);
+  case SERVER_DOMAIN_BLOCKS_FETCH_SUCCESS:
+    return state.setIn(['domainBlocks', 'items'], fromJS(action.blocks)).setIn(['domainBlocks', 'isLoading'], false).setIn(['domainBlocks', 'isAvailable'], action.isAvailable);
+  case SERVER_DOMAIN_BLOCKS_FETCH_FAIL:
+    return state.setIn(['domainBlocks', 'isLoading'], false);
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 2a89919e1..f48d58bdc 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -3,6 +3,7 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
 import { STORE_HYDRATE } from '../actions/store';
 import { EMOJI_USE } from '../actions/emojis';
+import { LANGUAGE_USE } from '../actions/languages';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 import uuid from '../uuid';
@@ -36,6 +37,9 @@ const initialState = ImmutableMap({
       mention: false,
       poll: false,
       status: false,
+      update: false,
+      'admin.sign_up': false,
+      'admin.report': false,
     }),
 
     quickFilter: ImmutableMap({
@@ -55,6 +59,9 @@ const initialState = ImmutableMap({
       mention: true,
       poll: true,
       status: true,
+      update: true,
+      'admin.sign_up': true,
+      'admin.report': true,
     }),
 
     sounds: ImmutableMap({
@@ -65,6 +72,9 @@ const initialState = ImmutableMap({
       mention: true,
       poll: true,
       status: true,
+      update: true,
+      'admin.sign_up': true,
+      'admin.report': true,
     }),
   }),
 
@@ -123,6 +133,8 @@ const changeColumnParams = (state, uuid, path, value) => {
 
 const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmojis', ImmutableMap(), map => map.update(emoji.id, 0, count => count + 1)).set('saved', false);
 
+const updateFrequentLanguages = (state, language) => state.update('frequentlyUsedLanguages', ImmutableMap(), map => map.update(language, 0, count => count + 1)).set('saved', false);
+
 const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
 
 export default function settings(state = initialState, action) {
@@ -148,6 +160,8 @@ export default function settings(state = initialState, action) {
     return changeColumnParams(state, action.uuid, action.path, action.value);
   case EMOJI_USE:
     return updateFrequentEmojis(state, action.emoji);
+  case LANGUAGE_USE:
+    return updateFrequentLanguages(state, action.language);
   case SETTING_SAVE:
     return state.set('saved', true);
   case LIST_FETCH_FAIL:
@@ -157,4 +171,4 @@ export default function settings(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index 9f8f28dee..b1716e9cf 100644
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -17,7 +17,15 @@ import {
 import {
   PINNED_STATUSES_FETCH_SUCCESS,
 } from '../actions/pin_statuses';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import {
+  TRENDS_STATUSES_FETCH_REQUEST,
+  TRENDS_STATUSES_FETCH_SUCCESS,
+  TRENDS_STATUSES_FETCH_FAIL,
+  TRENDS_STATUSES_EXPAND_REQUEST,
+  TRENDS_STATUSES_EXPAND_SUCCESS,
+  TRENDS_STATUSES_EXPAND_FAIL,
+} from '../actions/trends';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
@@ -26,22 +34,31 @@ import {
   PIN_SUCCESS,
   UNPIN_SUCCESS,
 } from '../actions/interactions';
+import {
+  ACCOUNT_BLOCK_SUCCESS,
+  ACCOUNT_MUTE_SUCCESS,
+} from '../actions/accounts';
 
 const initialState = ImmutableMap({
   favourites: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   bookmarks: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   pins: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
+  }),
+  trending: ImmutableMap({
+    next: null,
+    loaded: false,
+    items: ImmutableOrderedSet(),
   }),
 });
 
@@ -50,7 +67,7 @@ const normalizeList = (state, listType, statuses, next) => {
     map.set('next', next);
     map.set('loaded', true);
     map.set('isLoading', false);
-    map.set('items', ImmutableList(statuses.map(item => item.id)));
+    map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
   }));
 };
 
@@ -58,20 +75,22 @@ const appendToList = (state, listType, statuses, next) => {
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('isLoading', false);
-    map.set('items', map.get('items').concat(statuses.map(item => item.id)));
+    map.set('items', map.get('items').union(statuses.map(item => item.id)));
   }));
 };
 
 const prependOneToList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
-    map.set('items', map.get('items').unshift(status.get('id')));
-  }));
+  return state.updateIn([listType, 'items'], (list) => {
+    if (list.includes(status.get('id'))) {
+      return list;
+    } else {
+      return ImmutableOrderedSet([status.get('id')]).union(list);
+    }
+  });
 };
 
 const removeOneFromList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
-    map.set('items', map.get('items').filter(item => item !== status.get('id')));
-  }));
+  return state.updateIn([listType, 'items'], (list) => list.delete(status.get('id')));
 };
 
 export default function statusLists(state = initialState, action) {
@@ -96,6 +115,16 @@ export default function statusLists(state = initialState, action) {
     return normalizeList(state, 'bookmarks', action.statuses, action.next);
   case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
     return appendToList(state, 'bookmarks', action.statuses, action.next);
+  case TRENDS_STATUSES_FETCH_REQUEST:
+  case TRENDS_STATUSES_EXPAND_REQUEST:
+    return state.setIn(['trending', 'isLoading'], true);
+  case TRENDS_STATUSES_FETCH_FAIL:
+  case TRENDS_STATUSES_EXPAND_FAIL:
+    return state.setIn(['trending', 'isLoading'], false);
+  case TRENDS_STATUSES_FETCH_SUCCESS:
+    return normalizeList(state, 'trending', action.statuses, action.next);
+  case TRENDS_STATUSES_EXPAND_SUCCESS:
+    return appendToList(state, 'trending', action.statuses, action.next);
   case FAVOURITE_SUCCESS:
     return prependOneToList(state, 'favourites', action.status);
   case UNFAVOURITE_SUCCESS:
@@ -110,7 +139,10 @@ export default function statusLists(state = initialState, action) {
     return prependOneToList(state, 'pins', action.status);
   case UNPIN_SUCCESS:
     return removeOneFromList(state, 'pins', action.status);
+  case ACCOUNT_BLOCK_SUCCESS:
+  case ACCOUNT_MUTE_SUCCESS:
+    return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 53dec9585..a39ac6b64 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -13,6 +13,10 @@ import {
   STATUS_REVEAL,
   STATUS_HIDE,
   STATUS_COLLAPSE,
+  STATUS_TRANSLATE_SUCCESS,
+  STATUS_TRANSLATE_UNDO,
+  STATUS_FETCH_REQUEST,
+  STATUS_FETCH_FAIL,
 } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
@@ -35,6 +39,10 @@ const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
   switch(action.type) {
+  case STATUS_FETCH_REQUEST:
+    return state.setIn([action.id, 'isLoading'], true);
+  case STATUS_FETCH_FAIL:
+    return state.delete(action.id);
   case STATUS_IMPORT:
     return importStatus(state, action.status);
   case STATUSES_IMPORT:
@@ -77,7 +85,11 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.id, 'collapsed'], action.isCollapsed);
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
+  case STATUS_TRANSLATE_SUCCESS:
+    return state.setIn([action.id, 'translation'], fromJS(action.translation));
+  case STATUS_TRANSLATE_UNDO:
+    return state.deleteIn([action.id, 'translation']);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
index 1a6e66ee7..0b4bc7789 100644
--- a/app/javascript/mastodon/reducers/suggestions.js
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -34,4 +34,4 @@ export default function suggestionsReducer(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/tags.js b/app/javascript/mastodon/reducers/tags.js
new file mode 100644
index 000000000..ea73af452
--- /dev/null
+++ b/app/javascript/mastodon/reducers/tags.js
@@ -0,0 +1,25 @@
+import {
+  HASHTAG_FETCH_SUCCESS,
+  HASHTAG_FOLLOW_REQUEST,
+  HASHTAG_FOLLOW_FAIL,
+  HASHTAG_UNFOLLOW_REQUEST,
+  HASHTAG_UNFOLLOW_FAIL,
+} from 'mastodon/actions/tags';
+import { Map as ImmutableMap, fromJS } from 'immutable';
+
+const initialState = ImmutableMap();
+
+export default function tags(state = initialState, action) {
+  switch(action.type) {
+  case HASHTAG_FETCH_SUCCESS:
+    return state.set(action.name, fromJS(action.tag));
+  case HASHTAG_FOLLOW_REQUEST:
+  case HASHTAG_UNFOLLOW_FAIL:
+    return state.setIn([action.name, 'following'], true);
+  case HASHTAG_FOLLOW_FAIL:
+  case HASHTAG_UNFOLLOW_REQUEST:
+    return state.setIn([action.name, 'following'], false);
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index b66c19fd5..973e3cf18 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -16,7 +16,7 @@ import {
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNFOLLOW_SUCCESS,
 } from '../actions/accounts';
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 import compareId from '../compare_id';
 
 const initialState = ImmutableMap();
@@ -32,6 +32,13 @@ const initialTimeline = ImmutableMap({
 });
 
 const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
+  // This method is pretty tricky because:
+  // - existing items in the timeline might be out of order
+  // - the existing timeline may have gaps, most often explicitly noted with a `null` item
+  // - ideally, we don't want it to reorder existing items of the timeline
+  // - `statuses` may include items that are already included in the timeline
+  // - this function can be called either to fill in a gap, or load newer items
+
   return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
     mMap.set('isLoading', false);
     mMap.set('isPartial', isPartial);
@@ -46,15 +53,42 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
       mMap.update(usePendingItems ? 'pendingItems' : 'items', ImmutableList(), oldIds => {
         const newIds = statuses.map(status => status.get('id'));
 
-        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
-        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0);
+        // Now this gets tricky, as we don't necessarily know for sure where the gap to fill is
+        // and some items in the timeline may not be properly ordered.
 
-        if (firstIndex < 0) {
-          return (isPartial ? newIds.unshift(null) : newIds).concat(oldIds.skip(lastIndex));
+        // However, we know that `newIds.last()` is the oldest item that was requested and that
+        // there is no “hole” between `newIds.last()` and `newIds.first()`.
+
+        // First, find the furthest (if properly sorted, oldest) item in the timeline that is
+        // newer than the oldest fetched one, as it's most likely that it delimits the gap.
+        // Start the gap *after* that item.
+        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+
+        // Then, try to find the furthest (if properly sorted, oldest) item in the timeline that
+        // is newer than the most recent fetched one, as it delimits a section comprised of only
+        // items older or within `newIds` (or that were deleted from the server, so should be removed
+        // anyway).
+        // Stop the gap *after* that item.
+        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0) + 1;
+
+        let insertedIds = ImmutableOrderedSet(newIds).withMutations(insertedIds => {
+          // It is possible, though unlikely, that the slice we are replacing contains items older
+          // than the elements we got from the API. Get them and add them back at the back of the
+          // slice.
+          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => id !== null && compareId(id, newIds.last()) < 0);
+          insertedIds.union(olderIds);
+
+          // Make sure we aren't inserting duplicates
+          insertedIds.subtract(oldIds.take(firstIndex), oldIds.skip(lastIndex));
+        }).toList();
+
+        // Finally, insert a gap marker if the data is marked as partial by the server
+        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== null)) {
+          insertedIds = insertedIds.unshift(null);
         }
 
-        return oldIds.take(firstIndex + 1).concat(
-          isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds,
+        return oldIds.take(firstIndex).concat(
+          insertedIds,
           oldIds.skip(lastIndex),
         );
       });
@@ -137,6 +171,17 @@ const updateTop = (state, timeline, top) => {
   }));
 };
 
+const reconnectTimeline = (state, usePendingItems) => {
+  if (state.get('online')) {
+    return state;
+  }
+
+  return state.withMutations(mMap => {
+    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items);
+    mMap.set('online', true);
+  });
+};
+
 export default function timelines(state = initialState, action) {
   switch(action.type) {
   case TIMELINE_LOAD_PENDING:
@@ -162,7 +207,7 @@ export default function timelines(state = initialState, action) {
   case TIMELINE_SCROLL_TOP:
     return updateTop(state, action.timeline, action.top);
   case TIMELINE_CONNECT:
-    return state.update(action.timeline, initialTimeline, map => map.set('online', true));
+    return state.update(action.timeline, initialTimeline, map => reconnectTimeline(map, action.usePendingItems));
   case TIMELINE_DISCONNECT:
     return state.update(
       action.timeline,
@@ -178,4 +223,4 @@ export default function timelines(state = initialState, action) {
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/trends.js b/app/javascript/mastodon/reducers/trends.js
index 5cecc8fca..3d5f6ecd6 100644
--- a/app/javascript/mastodon/reducers/trends.js
+++ b/app/javascript/mastodon/reducers/trends.js
@@ -1,23 +1,46 @@
-import { TRENDS_FETCH_REQUEST, TRENDS_FETCH_SUCCESS, TRENDS_FETCH_FAIL } from '../actions/trends';
+import {
+  TRENDS_TAGS_FETCH_REQUEST,
+  TRENDS_TAGS_FETCH_SUCCESS,
+  TRENDS_TAGS_FETCH_FAIL,
+  TRENDS_LINKS_FETCH_REQUEST,
+  TRENDS_LINKS_FETCH_SUCCESS,
+  TRENDS_LINKS_FETCH_FAIL,
+} from 'mastodon/actions/trends';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 const initialState = ImmutableMap({
-  items: ImmutableList(),
-  isLoading: false,
+  tags: ImmutableMap({
+    items: ImmutableList(),
+    isLoading: false,
+  }),
+
+  links: ImmutableMap({
+    items: ImmutableList(),
+    isLoading: false,
+  }),
 });
 
 export default function trendsReducer(state = initialState, action) {
   switch(action.type) {
-  case TRENDS_FETCH_REQUEST:
-    return state.set('isLoading', true);
-  case TRENDS_FETCH_SUCCESS:
+  case TRENDS_TAGS_FETCH_REQUEST:
+    return state.setIn(['tags', 'isLoading'], true);
+  case TRENDS_TAGS_FETCH_SUCCESS:
     return state.withMutations(map => {
-      map.set('items', fromJS(action.trends));
-      map.set('isLoading', false);
+      map.setIn(['tags', 'items'], fromJS(action.trends));
+      map.setIn(['tags', 'isLoading'], false);
     });
-  case TRENDS_FETCH_FAIL:
-    return state.set('isLoading', false);
+  case TRENDS_TAGS_FETCH_FAIL:
+    return state.setIn(['tags', 'isLoading'], false);
+  case TRENDS_LINKS_FETCH_REQUEST:
+    return state.setIn(['links', 'isLoading'], true);
+  case TRENDS_LINKS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.setIn(['links', 'items'], fromJS(action.trends));
+      map.setIn(['links', 'isLoading'], false);
+    });
+  case TRENDS_LINKS_FETCH_FAIL:
+    return state.setIn(['links', 'isLoading'], false);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 10aaa2d68..2a80cf639 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -51,7 +51,12 @@ import {
   DIRECTORY_EXPAND_SUCCESS,
   DIRECTORY_EXPAND_FAIL,
 } from 'mastodon/actions/directory';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import {
+  FEATURED_TAGS_FETCH_REQUEST,
+  FEATURED_TAGS_FETCH_SUCCESS,
+  FEATURED_TAGS_FETCH_FAIL,
+} from 'mastodon/actions/featured_tags';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 const initialListState = ImmutableMap({
   next: null,
@@ -67,6 +72,7 @@ const initialState = ImmutableMap({
   follow_requests: initialListState,
   blocks: initialListState,
   mutes: initialListState,
+  featured_tags: initialListState,
 });
 
 const normalizeList = (state, path, accounts, next) => {
@@ -89,6 +95,18 @@ const normalizeFollowRequest = (state, notification) => {
   });
 };
 
+const normalizeFeaturedTag = (featuredTags, accountId) => {
+  const normalizeFeaturedTag = { ...featuredTags, accountId: accountId };
+  return fromJS(normalizeFeaturedTag);
+};
+
+const normalizeFeaturedTags = (state, path, featuredTags, accountId) => {
+  return state.setIn(path, ImmutableMap({
+    items: ImmutableList(featuredTags.map(featuredTag => normalizeFeaturedTag(featuredTag, accountId)).sort((a, b) => b.get('statuses_count') - a.get('statuses_count'))),
+    isLoading: false,
+  }));
+};
+
 export default function userLists(state = initialState, action) {
   switch(action.type) {
   case FOLLOWERS_FETCH_SUCCESS:
@@ -160,7 +178,13 @@ export default function userLists(state = initialState, action) {
   case DIRECTORY_FETCH_FAIL:
   case DIRECTORY_EXPAND_FAIL:
     return state.setIn(['directory', 'isLoading'], false);
+  case FEATURED_TAGS_FETCH_SUCCESS:
+    return normalizeFeaturedTags(state, ['featured_tags', action.id], action.tags, action.id);
+  case FEATURED_TAGS_FETCH_REQUEST:
+    return state.setIn(['featured_tags', action.id, 'isLoading'], true);
+  case FEATURED_TAGS_FETCH_FAIL:
+    return state.setIn(['featured_tags', action.id, 'isLoading'], false);
   default:
     return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d..bf46c810e 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,5 +1,6 @@
 import { createSelector } from 'reselect';
-import { List as ImmutableList, Map as ImmutableMap, is } from 'immutable';
+import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
+import { toServerSideType } from 'mastodon/utils/filters';
 import { me } from '../initial_state';
 
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
@@ -20,69 +21,15 @@ export const makeGetAccount = () => {
   });
 };
 
-const toServerSideType = columnType => {
-  switch (columnType) {
-  case 'home':
-  case 'notifications':
-  case 'public':
-  case 'thread':
-  case 'account':
-    return columnType;
-  default:
-    if (columnType.indexOf('list:') > -1) {
-      return 'home';
-    } else {
-      return 'public'; // community, account, hashtag
-    }
-  }
+const getFilters = (state, { contextType }) => {
+  if (!contextType) return null;
+
+  const serverSideType = toServerSideType(contextType);
+  const now = new Date();
+
+  return state.get('filters').filter((filter) => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
 };
 
-const escapeRegExp = string =>
-  string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
-
-const regexFromFilters = filters => {
-  if (filters.size === 0) {
-    return null;
-  }
-
-  return new RegExp(filters.map(filter => {
-    let expr = escapeRegExp(filter.get('phrase'));
-
-    if (filter.get('whole_word')) {
-      if (/^[\w]/.test(expr)) {
-        expr = `\\b${expr}`;
-      }
-
-      if (/[\w]$/.test(expr)) {
-        expr = `${expr}\\b`;
-      }
-    }
-
-    return expr;
-  }).join('|'), 'i');
-};
-
-// Memoize the filter regexps for each valid server contextType
-const makeGetFiltersRegex = () => {
-  let memo = {};
-
-  return (state, { contextType }) => {
-    if (!contextType) return ImmutableList();
-
-    const serverSideType = toServerSideType(contextType);
-    const filters = state.get('filters', ImmutableList()).filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || Date.parse(filter.get('expires_at')) > (new Date())));
-
-    if (!memo[serverSideType] || !is(memo[serverSideType].filters, filters)) {
-      const dropRegex = regexFromFilters(filters.filter(filter => filter.get('irreversible')));
-      const regex = regexFromFilters(filters);
-      memo[serverSideType] = { filters: filters, results: [dropRegex, regex] };
-    }
-    return memo[serverSideType].results;
-  };
-};
-
-export const getFiltersRegex = makeGetFiltersRegex();
-
 export const makeGetStatus = () => {
   return createSelector(
     [
@@ -90,11 +37,11 @@ export const makeGetStatus = () => {
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
-      getFiltersRegex,
+      getFilters,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => {
-      if (!statusBase) {
+    (statusBase, statusReblog, accountBase, accountReblog, filters) => {
+      if (!statusBase || statusBase.get('isLoading')) {
         return null;
       }
 
@@ -104,18 +51,22 @@ export const makeGetStatus = () => {
         statusReblog = null;
       }
 
-      const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0];
-      if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
-        return null;
+      let filtered = false;
+      if ((accountReblog || accountBase).get('id') !== me && filters) {
+        let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
+        if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
+          return null;
+        }
+        filterResults = filterResults.filter(result => filters.has(result.get('filter')));
+        if (!filterResults.isEmpty()) {
+          filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
+        }
       }
 
-      const regex     = (accountReblog || accountBase).get('id') !== me && filtersRegex[1];
-      const filtered  = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
-
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
         map.set('account', accountBase);
-        map.set('filtered', filtered);
+        map.set('matched_filters', filtered);
       });
     },
   );
@@ -152,14 +103,15 @@ export const getAlerts = createSelector([getAlertsBase], (base) => {
   return arr;
 });
 
-export const makeGetNotification = () => {
-  return createSelector([
-    (_, base)             => base,
-    (state, _, accountId) => state.getIn(['accounts', accountId]),
-  ], (base, account) => {
-    return base.set('account', account);
-  });
-};
+export const makeGetNotification = () => createSelector([
+  (_, base)             => base,
+  (state, _, accountId) => state.getIn(['accounts', accountId]),
+], (base, account) => base.set('account', account));
+
+export const makeGetReport = () => createSelector([
+  (_, base) => base,
+  (state, _, targetAccountId) => state.getIn(['accounts', targetAccountId]),
+], (base, targetAccount) => base.set('target_account', targetAccount));
 
 export const getAccountGallery = createSelector([
   (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], ImmutableList()),
@@ -175,3 +127,11 @@ export const getAccountGallery = createSelector([
 
   return medias;
 });
+
+export const getAccountHidden = createSelector([
+  (state, id) => state.getIn(['accounts', id, 'hidden']),
+  (state, id) => state.getIn(['relationships', id, 'following']) || state.getIn(['relationships', id, 'requested']),
+  (state, id) => id === me,
+], (hidden, followingOrRequested, isSelf) => {
+  return hidden && !(isSelf || followingOrRequested);
+});
diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js
index b354f3b33..9026012fe 100644
--- a/app/javascript/mastodon/service_worker/entry.js
+++ b/app/javascript/mastodon/service_worker/entry.js
@@ -1,44 +1,74 @@
-// import { freeStorage, storageFreeable } from '../storage/modifier';
-import './web_push_notifications';
+import { ExpirationPlugin } from 'workbox-expiration';
+import { precacheAndRoute } from 'workbox-precaching';
+import { registerRoute } from 'workbox-routing';
+import { CacheFirst } from 'workbox-strategies';
+import { handleNotificationClick, handlePush } from './web_push_notifications';
 
-// function openSystemCache() {
-//   return caches.open('mastodon-system');
-// }
+const CACHE_NAME_PREFIX = 'mastodon-';
 
 function openWebCache() {
-  return caches.open('mastodon-web');
+  return caches.open(`${CACHE_NAME_PREFIX}web`);
 }
 
 function fetchRoot() {
   return fetch('/', { credentials: 'include', redirect: 'manual' });
 }
 
-// const firefox = navigator.userAgent.match(/Firefox\/(\d+)/);
-// const invalidOnlyIfCached = firefox && firefox[1] < 60;
+precacheAndRoute(self.__WB_MANIFEST);
+
+registerRoute(
+  /locale_.*\.js$/,
+  new CacheFirst({
+    cacheName: `${CACHE_NAME_PREFIX}locales`,
+    plugins: [
+      new ExpirationPlugin({
+        maxAgeSeconds: 30 * 24 * 60 * 60, // 1 month
+        maxEntries: 5,
+      }),
+    ],
+  }),
+);
+
+registerRoute(
+  ({ request }) => request.destination === 'font',
+  new CacheFirst({
+    cacheName: `${CACHE_NAME_PREFIX}fonts`,
+    plugins: [
+      new ExpirationPlugin({
+        maxAgeSeconds: 30 * 24 * 60 * 60, // 1 month
+        maxEntries: 5,
+      }),
+    ],
+  }),
+);
+
+registerRoute(
+  ({ request }) => request.destination === 'image',
+  new CacheFirst({
+    cacheName: `m${CACHE_NAME_PREFIX}media`,
+    plugins: [
+      new ExpirationPlugin({
+        maxAgeSeconds: 7 * 24 * 60 * 60, // 1 week
+        maxEntries: 256,
+      }),
+    ],
+  }),
+);
 
 // Cause a new version of a registered Service Worker to replace an existing one
 // that is already installed, and replace the currently active worker on open pages.
 self.addEventListener('install', function(event) {
   event.waitUntil(Promise.all([openWebCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
 });
+
 self.addEventListener('activate', function(event) {
   event.waitUntil(self.clients.claim());
 });
+
 self.addEventListener('fetch', function(event) {
   const url = new URL(event.request.url);
 
-  if (url.pathname.startsWith('/web/')) {
-    const asyncResponse = fetchRoot();
-    const asyncCache = openWebCache();
-
-    event.respondWith(asyncResponse.then(
-      response => {
-        const clonedResponse = response.clone();
-        asyncCache.then(cache => cache.put('/', clonedResponse)).catch();
-        return response;
-      },
-      () => asyncCache.then(cache => cache.match('/'))));
-  } else if (url.pathname === '/auth/sign_out') {
+  if (url.pathname === '/auth/sign_out') {
     const asyncResponse = fetch(event.request);
     const asyncCache = openWebCache();
 
@@ -52,26 +82,8 @@ self.addEventListener('fetch', function(event) {
 
       return response;
     }));
-  } /* else if (storageFreeable && (ATTACHMENT_HOST ? url.host === ATTACHMENT_HOST : url.pathname.startsWith('/system/'))) {
-    event.respondWith(openSystemCache().then(cache => {
-      return cache.match(event.request.url).then(cached => {
-        if (cached === undefined) {
-          const asyncResponse = invalidOnlyIfCached && event.request.cache === 'only-if-cached' ?
-            fetch(event.request, { cache: 'no-cache' }) : fetch(event.request);
-
-          return asyncResponse.then(response => {
-            if (response.ok) {
-              cache
-                .put(event.request.url, response.clone())
-                .catch(()=>{}).then(freeStorage()).catch();
-            }
-
-            return response;
-          });
-        }
-
-        return cached;
-      });
-    }));
-  } */
+  }
 });
+
+self.addEventListener('push', handlePush);
+self.addEventListener('notificationclick', handleNotificationClick);
diff --git a/app/javascript/mastodon/service_worker/web_push_locales.js b/app/javascript/mastodon/service_worker/web_push_locales.js
index 1265f3cfa..7d713cd37 100644
--- a/app/javascript/mastodon/service_worker/web_push_locales.js
+++ b/app/javascript/mastodon/service_worker/web_push_locales.js
@@ -20,6 +20,9 @@ filenames.forEach(filename => {
     'notification.mention': full['notification.mention'] || '',
     'notification.reblog': full['notification.reblog'] || '',
     'notification.poll': full['notification.poll'] || '',
+    'notification.status': full['notification.status'] || '',
+    'notification.update': full['notification.update'] || '',
+    'notification.admin.sign_up': full['notification.admin.sign_up'] || '',
 
     'status.show_more': full['status.show_more'] || '',
     'status.reblog': full['status.reblog'] || '',
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 926c5c4d7..f12595777 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -15,7 +15,7 @@ const notify = options =>
         icon: '/android-chrome-192x192.png',
         tag: GROUP_TAG,
         data: {
-          url: (new URL('/web/notifications', self.location)).href,
+          url: (new URL('/notifications', self.location)).href,
           count: notifications.length + 1,
           preferred_locale: options.data.preferred_locale,
         },
@@ -75,7 +75,7 @@ const formatMessage = (messageId, locale, values = {}) =>
 const htmlToPlainText = html =>
   unescape(html.replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n').replace(/<[^>]*>/g, ''));
 
-const handlePush = (event) => {
+export const handlePush = (event) => {
   const { access_token, notification_id, preferred_locale, title, body, icon } = event.data.json();
 
   // Placeholder until more information can be loaded
@@ -90,7 +90,7 @@ const handlePush = (event) => {
       options.tag       = notification.id;
       options.badge     = '/badge.png';
       options.image     = notification.status && notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url || undefined;
-      options.data      = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/web/@${notification.account.acct}/${notification.status.id}` : `/web/@${notification.account.acct}` };
+      options.data      = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/@${notification.account.acct}/${notification.status.id}` : `/@${notification.account.acct}` };
 
       if (notification.status && notification.status.spoiler_text || notification.status.sensitive) {
         options.data.hiddenBody  = htmlToPlainText(notification.status.content);
@@ -102,7 +102,7 @@ const handlePush = (event) => {
 
         options.image   = undefined;
         options.actions = [actionExpand(preferred_locale)];
-      } else if (notification.type === 'mention') {
+      } else if (['mention', 'status'].includes(notification.type)) {
         options.actions = [actionReblog(preferred_locale), actionFavourite(preferred_locale)];
       }
 
@@ -115,7 +115,7 @@ const handlePush = (event) => {
         tag: notification_id,
         timestamp: new Date(),
         badge: '/badge.png',
-        data: { access_token, preferred_locale, url: '/web/notifications' },
+        data: { access_token, preferred_locale, url: '/notifications' },
       });
     }),
   );
@@ -166,30 +166,16 @@ const removeActionFromNotification = (notification, action) => {
 
 const openUrl = url =>
   self.clients.matchAll({ type: 'window' }).then(clientList => {
-    if (clientList.length !== 0) {
-      const webClients = clientList.filter(client => /\/web\//.test(client.url));
+    if (clientList.length !== 0 && 'navigate' in clientList[0]) { // Chrome 42-48 does not support navigate
+      const client = findBestClient(clientList);
 
-      if (webClients.length !== 0) {
-        const client       = findBestClient(webClients);
-        const { pathname } = new URL(url, self.location);
-
-        if (pathname.startsWith('/web/')) {
-          return client.focus().then(client => client.postMessage({
-            type: 'navigate',
-            path: pathname.slice('/web/'.length - 1),
-          }));
-        }
-      } else if ('navigate' in clientList[0]) { // Chrome 42-48 does not support navigate
-        const client = findBestClient(clientList);
-
-        return client.navigate(url).then(client => client.focus());
-      }
+      return client.navigate(url).then(client => client.focus());
     }
 
     return self.clients.openWindow(url);
   });
 
-const handleNotificationClick = (event) => {
+export const handleNotificationClick = (event) => {
   const reactToNotificationClick = new Promise((resolve, reject) => {
     if (event.action) {
       if (event.action === 'expand') {
@@ -211,6 +197,3 @@ const handleNotificationClick = (event) => {
 
   event.waitUntil(reactToNotificationClick);
 };
-
-self.addEventListener('push', handlePush);
-self.addEventListener('notificationclick', handleNotificationClick);
diff --git a/app/javascript/mastodon/settings.js b/app/javascript/mastodon/settings.js
index 7643a508e..46cfadfa3 100644
--- a/app/javascript/mastodon/settings.js
+++ b/app/javascript/mastodon/settings.js
@@ -45,3 +45,4 @@ export default class Settings {
 
 export const pushNotificationsSetting = new Settings('mastodon_push_notification_data');
 export const tagHistory = new Settings('mastodon_tag_history');
+export const bannerSettings = new Settings('mastodon_banner_settings');
diff --git a/app/javascript/mastodon/storage/db.js b/app/javascript/mastodon/storage/db.js
deleted file mode 100644
index 377a792a7..000000000
--- a/app/javascript/mastodon/storage/db.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default () => new Promise((resolve, reject) => {
-  // ServiceWorker is required to synchronize the login state.
-  // Microsoft Edge 17 does not support getAll according to:
-  // Catalog of standard and vendor APIs across browsers - Microsoft Edge Development
-  // https://developer.microsoft.com/en-us/microsoft-edge/platform/catalog/?q=specName%3Aindexeddb
-  if (!('caches' in self && 'getAll' in IDBObjectStore.prototype)) {
-    reject();
-    return;
-  }
-
-  const request = indexedDB.open('mastodon');
-
-  request.onerror = reject;
-  request.onsuccess = ({ target }) => resolve(target.result);
-
-  request.onupgradeneeded = ({ target }) => {
-    const accounts = target.result.createObjectStore('accounts', { autoIncrement: true });
-    const statuses = target.result.createObjectStore('statuses', { autoIncrement: true });
-
-    accounts.createIndex('id', 'id', { unique: true });
-    accounts.createIndex('moved', 'moved');
-
-    statuses.createIndex('id', 'id', { unique: true });
-    statuses.createIndex('account', 'account');
-    statuses.createIndex('reblog', 'reblog');
-  };
-});
diff --git a/app/javascript/mastodon/storage/modifier.js b/app/javascript/mastodon/storage/modifier.js
deleted file mode 100644
index 9fadabef4..000000000
--- a/app/javascript/mastodon/storage/modifier.js
+++ /dev/null
@@ -1,211 +0,0 @@
-import openDB from './db';
-
-const accountAssetKeys = ['avatar', 'avatar_static', 'header', 'header_static'];
-const storageMargin = 8388608;
-const storeLimit = 1024;
-
-// navigator.storage is not present on:
-// Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.100 Safari/537.36 Edge/16.16299
-// estimate method is not present on Chrome 57.0.2987.98 on Linux.
-export const storageFreeable = 'storage' in navigator && 'estimate' in navigator.storage;
-
-function openCache() {
-  // ServiceWorker and Cache API is not available on iOS 11
-  // https://webkit.org/status/#specification-service-workers
-  return self.caches ? caches.open('mastodon-system') : Promise.reject();
-}
-
-function printErrorIfAvailable(error) {
-  if (error) {
-    console.warn(error);
-  }
-}
-
-function put(name, objects, onupdate, oncreate) {
-  return openDB().then(db => (new Promise((resolve, reject) => {
-    const putTransaction = db.transaction(name, 'readwrite');
-    const putStore = putTransaction.objectStore(name);
-    const putIndex = putStore.index('id');
-
-    objects.forEach(object => {
-      putIndex.getKey(object.id).onsuccess = retrieval => {
-        function addObject() {
-          putStore.add(object);
-        }
-
-        function deleteObject() {
-          putStore.delete(retrieval.target.result).onsuccess = addObject;
-        }
-
-        if (retrieval.target.result) {
-          if (onupdate) {
-            onupdate(object, retrieval.target.result, putStore, deleteObject);
-          } else {
-            deleteObject();
-          }
-        } else {
-          if (oncreate) {
-            oncreate(object, addObject);
-          } else {
-            addObject();
-          }
-        }
-      };
-    });
-
-    putTransaction.oncomplete = () => {
-      const readTransaction = db.transaction(name, 'readonly');
-      const readStore = readTransaction.objectStore(name);
-      const count = readStore.count();
-
-      count.onsuccess = () => {
-        const excess = count.result - storeLimit;
-
-        if (excess > 0) {
-          const retrieval = readStore.getAll(null, excess);
-
-          retrieval.onsuccess = () => resolve(retrieval.result);
-          retrieval.onerror = reject;
-        } else {
-          resolve([]);
-        }
-      };
-
-      count.onerror = reject;
-    };
-
-    putTransaction.onerror = reject;
-  })).then(resolved => {
-    db.close();
-    return resolved;
-  }, error => {
-    db.close();
-    throw error;
-  }));
-}
-
-function evictAccountsByRecords(records) {
-  return openDB().then(db => {
-    const transaction = db.transaction(['accounts', 'statuses'], 'readwrite');
-    const accounts = transaction.objectStore('accounts');
-    const accountsIdIndex = accounts.index('id');
-    const accountsMovedIndex = accounts.index('moved');
-    const statuses = transaction.objectStore('statuses');
-    const statusesIndex = statuses.index('account');
-
-    function evict(toEvict) {
-      toEvict.forEach(record => {
-        openCache()
-          .then(cache => accountAssetKeys.forEach(key => cache.delete(records[key])))
-          .catch(printErrorIfAvailable);
-
-        accountsMovedIndex.getAll(record.id).onsuccess = ({ target }) => evict(target.result);
-
-        statusesIndex.getAll(record.id).onsuccess =
-          ({ target }) => evictStatusesByRecords(target.result);
-
-        accountsIdIndex.getKey(record.id).onsuccess =
-          ({ target }) => target.result && accounts.delete(target.result);
-      });
-    }
-
-    evict(records);
-
-    db.close();
-  }).catch(printErrorIfAvailable);
-}
-
-export function evictStatus(id) {
-  evictStatuses([id]);
-}
-
-export function evictStatuses(ids) {
-  return openDB().then(db => {
-    const transaction = db.transaction('statuses', 'readwrite');
-    const store = transaction.objectStore('statuses');
-    const idIndex = store.index('id');
-    const reblogIndex = store.index('reblog');
-
-    ids.forEach(id => {
-      reblogIndex.getAllKeys(id).onsuccess =
-        ({ target }) => target.result.forEach(reblogKey => store.delete(reblogKey));
-
-      idIndex.getKey(id).onsuccess =
-        ({ target }) => target.result && store.delete(target.result);
-    });
-
-    db.close();
-  }).catch(printErrorIfAvailable);
-}
-
-function evictStatusesByRecords(records) {
-  return evictStatuses(records.map(({ id }) => id));
-}
-
-export function putAccounts(records, avatarStatic) {
-  const avatarKey = avatarStatic ? 'avatar_static' : 'avatar';
-  const newURLs = [];
-
-  put('accounts', records, (newRecord, oldKey, store, oncomplete) => {
-    store.get(oldKey).onsuccess = ({ target }) => {
-      accountAssetKeys.forEach(key => {
-        const newURL = newRecord[key];
-        const oldURL = target.result[key];
-
-        if (newURL !== oldURL) {
-          openCache()
-            .then(cache => cache.delete(oldURL))
-            .catch(printErrorIfAvailable);
-        }
-      });
-
-      const newURL = newRecord[avatarKey];
-      const oldURL = target.result[avatarKey];
-
-      if (newURL !== oldURL) {
-        newURLs.push(newURL);
-      }
-
-      oncomplete();
-    };
-  }, (newRecord, oncomplete) => {
-    newURLs.push(newRecord[avatarKey]);
-    oncomplete();
-  }).then(records => Promise.all([
-    evictAccountsByRecords(records),
-    openCache().then(cache => cache.addAll(newURLs)),
-  ])).then(freeStorage, error => {
-    freeStorage();
-    throw error;
-  }).catch(printErrorIfAvailable);
-}
-
-export function putStatuses(records) {
-  put('statuses', records)
-    .then(evictStatusesByRecords)
-    .catch(printErrorIfAvailable);
-}
-
-export function freeStorage() {
-  return storageFreeable && navigator.storage.estimate().then(({ quota, usage }) => {
-    if (usage + storageMargin < quota) {
-      return null;
-    }
-
-    return openDB().then(db => new Promise((resolve, reject) => {
-      const retrieval = db.transaction('accounts', 'readonly').objectStore('accounts').getAll(null, 1);
-
-      retrieval.onsuccess = () => {
-        if (retrieval.result.length > 0) {
-          resolve(evictAccountsByRecords(retrieval.result).then(freeStorage));
-        } else {
-          resolve(caches.delete('mastodon-system'));
-        }
-      };
-
-      retrieval.onerror = reject;
-
-      db.close();
-    }));
-  });
-}
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index e18af842f..0e0d45c66 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -12,4 +12,4 @@ export default function configureStore() {
     errorsMiddleware(),
     soundsMiddleware(),
   ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f));
-};
+}
diff --git a/app/javascript/mastodon/utils/filters.js b/app/javascript/mastodon/utils/filters.js
new file mode 100644
index 000000000..97b433a99
--- /dev/null
+++ b/app/javascript/mastodon/utils/filters.js
@@ -0,0 +1,16 @@
+export const toServerSideType = columnType => {
+  switch (columnType) {
+  case 'home':
+  case 'notifications':
+  case 'public':
+  case 'thread':
+  case 'account':
+    return columnType;
+  default:
+    if (columnType.indexOf('list:') > -1) {
+      return 'home';
+    } else {
+      return 'public'; // community, account, hashtag
+    }
+  }
+};
diff --git a/app/javascript/mastodon/utils/icons.js b/app/javascript/mastodon/utils/icons.js
new file mode 100644
index 000000000..c3e362e39
--- /dev/null
+++ b/app/javascript/mastodon/utils/icons.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+// Copied from emoji-mart for consistency with emoji picker and since
+// they don't export the icons in the package
+export const loupeIcon = (
+  <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' width='13' height='13'>
+    <path d='M12.9 14.32a8 8 0 1 1 1.41-1.41l5.35 5.33-1.42 1.42-5.33-5.34zM8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12z' />
+  </svg>
+);
+
+export const deleteIcon = (
+  <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' width='13' height='13'>
+    <path d='M10 8.586L2.929 1.515 1.515 2.929 8.586 10l-7.071 7.071 1.414 1.414L10 11.414l7.071 7.071 1.414-1.414L11.414 10l7.071-7.071-1.414-1.414L10 8.586z' />
+  </svg>
+);
diff --git a/app/javascript/mastodon/utils/resize_image.js b/app/javascript/mastodon/utils/resize_image.js
index 22ff86801..fb8c3c11e 100644
--- a/app/javascript/mastodon/utils/resize_image.js
+++ b/app/javascript/mastodon/utils/resize_image.js
@@ -109,7 +109,7 @@ const loadImage = inputFile => new Promise((resolve, reject) => {
 });
 
 const getOrientation = (img, type = 'image/png') => new Promise(resolve => {
-  if (type !== 'image/jpeg') {
+  if (!['image/jpeg', 'image/webp'].includes(type)) {
     resolve(1);
     return;
   }
diff --git a/app/javascript/mastodon/uuid.js b/app/javascript/mastodon/uuid.js
index be1899305..0d2cfaa77 100644
--- a/app/javascript/mastodon/uuid.js
+++ b/app/javascript/mastodon/uuid.js
@@ -1,3 +1,3 @@
 export default function uuid(a) {
   return a ? (a^Math.random() * 16 >> a / 4).toString(16) : ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, uuid);
-};
+}
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js
deleted file mode 100644
index 892d825ec..000000000
--- a/app/javascript/packs/about.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import './public-path';
-import loadPolyfills from '../mastodon/load_polyfills';
-import { start } from '../mastodon/common';
-
-start();
-
-function loaded() {
-  const TimelineContainer = require('../mastodon/containers/timeline_container').default;
-  const React             = require('react');
-  const ReactDOM          = require('react-dom');
-  const mountNode         = document.getElementById('mastodon-timeline');
-
-  if (mountNode !== null) {
-    const props = JSON.parse(mountNode.getAttribute('data-props'));
-    ReactDOM.render(<TimelineContainer {...props} />, mountNode);
-  }
-}
-
-function main() {
-  const ready = require('../mastodon/ready').default;
-  ready(loaded);
-}
-
-loadPolyfills().then(main).catch(error => {
-  console.error(error);
-});
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index f32679619..4e817129d 100644
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -2,20 +2,91 @@ import './public-path';
 import { delegate } from '@rails/ujs';
 import ready from '../mastodon/ready';
 
+const setAnnouncementEndsAttributes = (target) => {
+  const valid = target?.value && target?.validity?.valid;
+  const element = document.querySelector('input[type="datetime-local"]#announcement_ends_at');
+  if (valid) {
+    element.classList.remove('optional');
+    element.required = true;
+    element.min = target.value;
+  } else {
+    element.classList.add('optional');
+    element.removeAttribute('required');
+    element.removeAttribute('min');
+  }
+};
+
+delegate(document, 'input[type="datetime-local"]#announcement_starts_at', 'change', ({ target }) => {
+  setAnnouncementEndsAttributes(target);
+});
+
 const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
 
+const showSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
+  selectAllMatchingElement.classList.add('active');
+};
+
+const hideSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
+  const hiddenField = document.querySelector('#select_all_matching');
+  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
+  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
+
+  selectAllMatchingElement.classList.remove('active');
+  selectedMsg.classList.remove('active');
+  notSelectedMsg.classList.add('active');
+  hiddenField.value = '0';
+};
+
 delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
+
   [].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
     content.checked = target.checked;
   });
+
+  if (selectAllMatchingElement) {
+    if (target.checked) {
+      showSelectAll();
+    } else {
+      hideSelectAll();
+    }
+  }
+});
+
+delegate(document, '.batch-table__select-all button', 'click', () => {
+  const hiddenField = document.querySelector('#select_all_matching');
+  const active = hiddenField.value === '1';
+  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
+  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
+
+  if (active) {
+    hiddenField.value = '0';
+    selectedMsg.classList.remove('active');
+    notSelectedMsg.classList.add('active');
+  } else {
+    hiddenField.value = '1';
+    notSelectedMsg.classList.remove('active');
+    selectedMsg.classList.add('active');
+  }
 });
 
 delegate(document, batchCheckboxClassName, 'change', () => {
   const checkAllElement = document.querySelector('#batch_checkbox_all');
+  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
 
   if (checkAllElement) {
     checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
     checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+
+    if (selectAllMatchingElement) {
+      if (checkAllElement.checked) {
+        showSelectAll();
+      } else {
+        hideSelectAll();
+      }
+    }
   }
 });
 
@@ -88,6 +159,20 @@ const onChangeRegistrationMode = (target) => {
   });
 };
 
+const convertUTCDateTimeToLocal = (value) => {
+  const date = new Date(value + 'Z');
+  const twoChars = (x) => (x.toString().padStart(2, '0'));
+  return `${date.getFullYear()}-${twoChars(date.getMonth()+1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+const convertLocalDatetimeToUTC = (value) => {
+  const re = /^([0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})/;
+  const match = re.exec(value);
+  const date = new Date(match[1], match[2] - 1, match[3], match[4], match[5]);
+  const fullISO8601 = date.toISOString();
+  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+};
+
 delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
 
 ready(() => {
@@ -100,6 +185,44 @@ ready(() => {
   const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
   if (registrationMode) onChangeRegistrationMode(registrationMode);
 
+  const checkAllElement = document.querySelector('#batch_checkbox_all');
+  if (checkAllElement) {
+    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+  }
+
+  document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
+    const domain = document.getElementById('by_domain')?.value;
+
+    if (domain) {
+      const url = new URL(event.target.href);
+      url.searchParams.set('_domain', domain);
+      e.target.href = url;
+    }
+  });
+
+  [].forEach.call(document.querySelectorAll('input[type="datetime-local"]'), element => {
+    if (element.value) {
+      element.value = convertUTCDateTimeToLocal(element.value);
+    }
+    if (element.placeholder) {
+      element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+    }
+  });
+
+  delegate(document, 'form', 'submit', ({ target }) => {
+    [].forEach.call(target.querySelectorAll('input[type="datetime-local"]'), element => {
+      if (element.value && element.validity.valid) {
+        element.value = convertLocalDatetimeToUTC(element.value);
+      }
+    });
+  });
+
+  const announcementStartsAt = document.querySelector('input[type="datetime-local"]#announcement_starts_at');
+  if (announcementStartsAt) {
+    setAnnouncementEndsAttributes(announcementStartsAt);
+  }
+
   const React    = require('react');
   const ReactDOM = require('react-dom');
 
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 91240aecf..020f2b4a0 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -4,8 +4,10 @@ import { start } from '../mastodon/common';
 
 start();
 
-loadPolyfills().then(() => {
-  require('../mastodon/main').default();
+loadPolyfills().then(async () => {
+  const { default: main } = await import('mastodon/main');
+
+  return main();
 }).catch(e => {
   console.error(e);
 });
diff --git a/app/javascript/packs/mailer.js b/app/javascript/packs/mailer.js
index 732fc1698..a4b6d5446 100644
--- a/app/javascript/packs/mailer.js
+++ b/app/javascript/packs/mailer.js
@@ -1 +1,3 @@
 require('../styles/mailer.scss');
+
+require.context('../icons');
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index c0c088646..a5e2014f7 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -4,6 +4,7 @@ import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
 import { start } from '../mastodon/common';
 import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
+import 'cocoon-js-vanilla';
 
 start();
 
@@ -32,7 +33,6 @@ function main() {
   const { messages } = getLocale();
   const React = require('react');
   const ReactDOM = require('react-dom');
-  const Rellax = require('rellax');
   const { createBrowserHistory } = require('history');
 
   const scrollToDetailedStatus = () => {
@@ -63,6 +63,18 @@ function main() {
       minute: 'numeric',
     });
 
+    const dateFormat = new Intl.DateTimeFormat(locale, {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      timeFormat: false,
+    });
+
+    const timeFormat = new Intl.DateTimeFormat(locale, {
+      timeStyle: 'short',
+      hour12: false,
+    });
+
     [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
       content.innerHTML = emojify(content.innerHTML);
     });
@@ -75,6 +87,32 @@ function main() {
       content.textContent = formattedDate;
     });
 
+    const isToday = date => {
+      const today = new Date();
+
+      return date.getDate() === today.getDate() &&
+        date.getMonth() === today.getMonth() &&
+        date.getFullYear() === today.getFullYear();
+    };
+    const todayFormat = new IntlMessageFormat(messages['relative_format.today'] || 'Today at {time}', locale);
+
+    [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
+      const datetime = new Date(content.getAttribute('datetime'));
+
+      let formattedContent;
+
+      if (isToday(datetime)) {
+        const formattedTime = timeFormat.format(datetime);
+
+        formattedContent = todayFormat.format({ time: formattedTime });
+      } else {
+        formattedContent = dateFormat.format(datetime);
+      }
+
+      content.title = formattedContent;
+      content.textContent = formattedContent;
+    });
+
     [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
       const datetime = new Date(content.getAttribute('datetime'));
       const now      = new Date();
@@ -111,12 +149,6 @@ function main() {
       scrollToDetailedStatus();
     }
 
-    const parallaxComponents = document.querySelectorAll('.parallax');
-
-    if (parallaxComponents.length > 0 ) {
-      new Rellax('.parallax', { speed: -1 });
-    }
-
     delegate(document, '#registration_user_password_confirmation,#registration_user_password', 'input', () => {
       const password = document.getElementById('registration_user_password');
       const confirmation = document.getElementById('registration_user_password_confirmation');
@@ -167,28 +199,6 @@ function main() {
     });
   });
 
-  delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
-    if (button !== 0) {
-      return true;
-    }
-    window.location.href = target.href;
-    return false;
-  });
-
-  delegate(document, '.modal-button', 'click', e => {
-    e.preventDefault();
-
-    let href;
-
-    if (e.target.nodeName !== 'A') {
-      href = e.target.parentNode.href;
-    } else {
-      href = e.target.href;
-    }
-
-    window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
-  });
-
   delegate(document, '#account_display_name', 'input', ({ target }) => {
     const name = document.querySelector('.card .display-name strong');
     if (name) {
@@ -275,13 +285,30 @@ function main() {
     input.readonly = oldReadOnly;
   });
 
-  delegate(document, '.sidebar__toggle__icon', 'click', () => {
-    const target = document.querySelector('.sidebar ul');
+  const toggleSidebar = () => {
+    const sidebar = document.querySelector('.sidebar ul');
+    const toggleButton = document.querySelector('.sidebar__toggle__icon');
 
-    if (target.style.display === 'block') {
-      target.style.display = 'none';
+    if (sidebar.classList.contains('visible')) {
+      document.body.style.overflow = null;
+      toggleButton.setAttribute('aria-expanded', false);
     } else {
-      target.style.display = 'block';
+      document.body.style.overflow = 'hidden';
+      toggleButton.setAttribute('aria-expanded', true);
+    }
+
+    toggleButton.classList.toggle('active');
+    sidebar.classList.toggle('visible');
+  };
+
+  delegate(document, '.sidebar__toggle__icon', 'click', () => {
+    toggleSidebar();
+  });
+
+  delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
+    if (e.key === ' ' || e.key === 'Enter') {
+      e.preventDefault();
+      toggleSidebar();
     }
   });
 
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 8ebc45b62..81a040108 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -2,14 +2,12 @@
 @import 'mastodon/variables';
 @import 'fonts/roboto';
 @import 'fonts/roboto-mono';
-@import 'fonts/montserrat';
 
 @import 'mastodon/reset';
 @import 'mastodon/basics';
+@import 'mastodon/branding';
 @import 'mastodon/containers';
 @import 'mastodon/lists';
-@import 'mastodon/footer';
-@import 'mastodon/compact_header';
 @import 'mastodon/widgets';
 @import 'mastodon/forms';
 @import 'mastodon/accounts';
@@ -17,7 +15,6 @@
 @import 'mastodon/boost';
 @import 'mastodon/components';
 @import 'mastodon/polls';
-@import 'mastodon/introduction';
 @import 'mastodon/modal';
 @import 'mastodon/emoji_picker';
 @import 'mastodon/about';
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 841ed6648..4fa1a0361 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,4 +1,3 @@
-// components.scss
 .compose-form {
   .compose-form__modifiers {
     .compose-form__upload {
@@ -13,41 +12,9 @@
   }
 }
 
-.rich-formatting a,
-.rich-formatting p a,
-.rich-formatting li a,
-.landing-page__short-description p a,
 .status__content a,
-.reply-indicator__content a {
-  color: lighten($ui-highlight-color, 12%);
-  text-decoration: underline;
-
-  &.mention {
-    text-decoration: none;
-  }
-
-  &.mention span {
-    text-decoration: underline;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: none;
-    }
-  }
-
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none;
-  }
-
-  &.status__content__spoiler-link {
-    color: $secondary-text-color;
-    text-decoration: none;
-  }
-}
-
+.link-footer a,
+.reply-indicator__content a,
 .status__content__read-more-button {
   text-decoration: underline;
 
@@ -56,27 +23,56 @@
   &:active {
     text-decoration: none;
   }
+
+  &.mention {
+    text-decoration: none;
+
+    span {
+      text-decoration: underline;
+    }
+
+    &:hover,
+    &:focus,
+    &:active {
+      span {
+        text-decoration: none;
+      }
+    }
+  }
 }
 
-.getting-started__footer a {
-  text-decoration: underline;
-
-  &:hover,
-  &:focus,
-  &:active {
-    text-decoration: none;
-  }
+.status__content a {
+  color: $highlight-text-color;
 }
 
 .nothing-here {
   color: $darker-text-color;
 }
 
-.public-layout .public-account-header__tabs__tabs .counter.active::after {
-  border-bottom: 4px solid $ui-highlight-color;
-}
-
+.compose-form__poll-wrapper .button.button-secondary,
 .compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder {
+.compose-form .spoiler-input__input::placeholder,
+.report-dialog-modal__textarea::placeholder,
+.language-dropdown__dropdown__results__item__common-name,
+.compose-form .icon-button {
   color: $inverted-text-color;
 }
+
+.text-icon-button.active {
+  color: $ui-highlight-color;
+}
+
+.language-dropdown__dropdown__results__item.active {
+  background: $ui-highlight-color;
+  font-weight: 500;
+}
+
+.link-button:disabled {
+  cursor: not-allowed;
+
+  &:hover,
+  &:focus,
+  &:active {
+    text-decoration: none !important;
+  }
+}
diff --git a/app/javascript/styles/contrast/variables.scss b/app/javascript/styles/contrast/variables.scss
index cfe3b21db..e38d24b27 100644
--- a/app/javascript/styles/contrast/variables.scss
+++ b/app/javascript/styles/contrast/variables.scss
@@ -4,20 +4,18 @@ $black: #000000;
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #2b90d9;
+$classic-highlight-color: #6364ff;
 
 $ui-base-color: $classic-base-color !default;
 $ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-secondary-color !default;
-
-// Differences
-$ui-highlight-color: #2b5fd9;
+$ui-highlight-color: $classic-highlight-color !default;
 
 $darker-text-color: lighten($ui-primary-color, 20%) !default;
 $dark-text-color: lighten($ui-primary-color, 12%) !default;
 $secondary-text-color: lighten($ui-secondary-color, 6%) !default;
-$highlight-text-color: $classic-highlight-color !default;
-$action-button-color: #8d9ac2;
+$highlight-text-color: lighten($ui-highlight-color, 10%) !default;
+$action-button-color: lighten($ui-base-color, 50%);
 
 $inverted-text-color: $black !default;
 $lighter-text-color: darken($ui-base-color, 6%) !default;
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss
deleted file mode 100644
index ea7e04536..000000000
--- a/app/javascript/styles/fonts/montserrat.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-@font-face {
-  font-family: 'mastodon-font-display';
-  src: local('Montserrat'),
-    url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
-    url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
-    url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
-  font-weight: 400;
-  font-display: swap;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'mastodon-font-display';
-  src: local('Montserrat Medium'),
-    url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
-  font-weight: 500;
-  font-display: swap;
-  font-style: normal;
-}
diff --git a/app/javascript/styles/fonts/roboto-mono.scss b/app/javascript/styles/fonts/roboto-mono.scss
index bd9839abf..3802212a9 100644
--- a/app/javascript/styles/fonts/roboto-mono.scss
+++ b/app/javascript/styles/fonts/roboto-mono.scss
@@ -1,6 +1,7 @@
 @font-face {
-  font-family: 'mastodon-font-monospace';
-  src: local('Roboto Mono'),
+  font-family: mastodon-font-monospace;
+  src:
+    local('Roboto Mono'),
     url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
     url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
     url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss
index f3a6dcb6e..657152380 100644
--- a/app/javascript/styles/fonts/roboto.scss
+++ b/app/javascript/styles/fonts/roboto.scss
@@ -1,6 +1,7 @@
 @font-face {
-  font-family: 'mastodon-font-sans-serif';
-  src: local('Roboto Italic'),
+  font-family: mastodon-font-sans-serif;
+  src:
+    local('Roboto Italic'),
     url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
     url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'),
     url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
@@ -11,8 +12,9 @@
 }
 
 @font-face {
-  font-family: 'mastodon-font-sans-serif';
-  src: local('Roboto Bold'),
+  font-family: mastodon-font-sans-serif;
+  src:
+    local('Roboto Bold'),
     url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
     url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'),
     url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
@@ -23,8 +25,9 @@
 }
 
 @font-face {
-  font-family: 'mastodon-font-sans-serif';
-  src: local('Roboto Medium'),
+  font-family: mastodon-font-sans-serif;
+  src:
+    local('Roboto Medium'),
     url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
     url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'),
     url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
@@ -35,8 +38,9 @@
 }
 
 @font-face {
-  font-family: 'mastodon-font-sans-serif';
-  src: local('Roboto'),
+  font-family: mastodon-font-sans-serif;
+  src:
+    local('Roboto'),
     url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
     url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'),
     url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 92c02e847..18fe522eb 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -435,6 +435,10 @@ h5 {
     background: $success-green;
   }
 
+  &.warning-icon td {
+    background: $gold-star;
+  }
+
   &.alert-icon td {
     background: $error-red;
   }
@@ -533,6 +537,10 @@ ul {
   }
 }
 
+ul.rules-list {
+  padding-top: 0;
+}
+
 @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
   body {
     min-height: 1024px !important;
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 8e6b0cdd5..928af8453 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -36,27 +36,30 @@ html {
   border-top: 0;
 }
 
+.column > .scrollable.about {
+  border-top: 1px solid lighten($ui-base-color, 8%);
+}
+
+.about__meta,
+.about__section__title,
+.interaction-modal {
+  background: $white;
+  border: 1px solid lighten($ui-base-color, 8%);
+}
+
+.rules-list li::before {
+  background: $ui-highlight-color;
+}
+
 .directory__card__img {
   background: lighten($ui-base-color, 12%);
 }
 
-.filter-form,
-.directory__card__bar {
+.filter-form {
   background: $white;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 }
 
-.scrollable .directory__list {
-  width: calc(100% + 2px);
-  margin-left: -1px;
-  margin-right: -1px;
-}
-
-.directory__card,
-.table-of-contents {
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
 .column-back-button,
 .column-header {
   background: $white;
@@ -75,8 +78,7 @@ html {
 .column-header__back-button,
 .column-header__button,
 .column-header__button.active,
-.account__header__bar,
-.directory__card__extra {
+.account__header {
   background: $white;
 }
 
@@ -147,15 +149,15 @@ html {
 .compose-form__poll-wrapper select,
 .search__input,
 .setting-text,
-.box-widget input[type="text"],
-.box-widget input[type="email"],
-.box-widget input[type="password"],
-.box-widget textarea,
-.statuses-grid .detailed-status,
+.report-dialog-modal__textarea,
 .audio-player {
   border: 1px solid lighten($ui-base-color, 8%);
 }
 
+.report-dialog-modal .dialog-option .poll__input {
+  color: $white;
+}
+
 .search__input {
   @media screen and (max-width: $no-gap-breakpoint) {
     border-top: 0;
@@ -201,7 +203,8 @@ html {
 // Change the colors used in compose-form
 .compose-form {
   .compose-form__modifiers {
-    .compose-form__upload__actions .icon-button {
+    .compose-form__upload__actions .icon-button,
+    .compose-form__upload__warning .icon-button {
       color: lighten($white, 7%);
 
       &:active,
@@ -210,14 +213,6 @@ html {
         color: $white;
       }
     }
-
-    .compose-form__upload-description input {
-      color: lighten($white, 7%);
-
-      &::placeholder {
-        color: lighten($white, 7%);
-      }
-    }
   }
 
   .compose-form__buttons-wrapper {
@@ -266,7 +261,8 @@ html {
 .status__content .status__content__spoiler-link {
   background: $ui-base-color;
 
-  &:hover {
+  &:hover,
+  &:focus {
     background: lighten($ui-base-color, 4%);
   }
 }
@@ -308,7 +304,8 @@ html {
   }
 
   &__item {
-    a {
+    a,
+    button {
       background: $white;
       color: $darker-text-color;
     }
@@ -333,6 +330,7 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
+.language-dropdown__dropdown__results__item.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
@@ -340,10 +338,26 @@ html {
   color: $white;
 }
 
-.dropdown-menu__separator {
+.language-dropdown__dropdown__results__item .language-dropdown__dropdown__results__item__common-name {
+  color: lighten($ui-base-color, 8%);
+}
+
+.language-dropdown__dropdown__results__item.active .language-dropdown__dropdown__results__item__common-name {
+  color: darken($ui-base-color, 12%);
+}
+
+.dropdown-menu__separator,
+.dropdown-menu__item.edited-timestamp__history__item,
+.dropdown-menu__container__header,
+.compare-history-modal .report-modal__target,
+.report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
 }
 
+.report-dialog-modal__container {
+  border-top-color: lighten($ui-base-color, 4%);
+}
+
 // Change the background colors of modals
 .actions-modal,
 .boost-modal,
@@ -351,9 +365,11 @@ html {
 .mute-modal,
 .block-modal,
 .report-modal,
+.report-dialog-modal,
 .embed-modal,
 .error-modal,
 .onboarding-modal,
+.compare-history-modal,
 .report-modal__comment .setting-text__wrapper,
 .report-modal__comment .setting-text,
 .announcements,
@@ -364,12 +380,13 @@ html {
   border: 1px solid lighten($ui-base-color, 8%);
 }
 
-.reactions-bar__item {
-  &:hover,
-  &:focus,
-  &:active {
-    background-color: $ui-base-color;
-  }
+.reactions-bar__item:hover,
+.reactions-bar__item:focus,
+.reactions-bar__item:active,
+.language-dropdown__dropdown__results__item:hover,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item:active {
+  background-color: $ui-base-color;
 }
 
 .reactions-bar__item.active {
@@ -392,6 +409,7 @@ html {
 
 .icon-with-badge__badge {
   border-color: $white;
+  color: $white;
 }
 
 .report-modal__comment {
@@ -408,10 +426,36 @@ html {
   border-top: 0;
 }
 
-.focal-point__preview strong {
+.dashboard__quick-access,
+.focal-point__preview strong,
+.admin-wrapper .content__heading__tabs a.selected {
   color: $white;
 }
 
+.button.button-tertiary {
+  &:hover,
+  &:focus,
+  &:active {
+    color: $white;
+  }
+}
+
+.button.button-secondary {
+  border-color: $darker-text-color;
+  color: $darker-text-color;
+
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: darken($darker-text-color, 8%);
+    color: darken($darker-text-color, 8%);
+  }
+}
+
+.flash-message.warning {
+  color: lighten($gold-star, 16%);
+}
+
 .boost-modal__action-bar,
 .confirmation-modal__action-bar,
 .mute-modal__action-bar,
@@ -463,52 +507,16 @@ html {
   background: $white;
 }
 
-.tabs-bar {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 0;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
-
-  &__link {
-    padding-bottom: 14px;
-    border-bottom-width: 1px;
-    border-bottom-color: lighten($ui-base-color, 8%);
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: $ui-base-color;
-    }
-
-    &.active {
-      &:hover,
-      &:active,
-      &:focus {
-        background: transparent;
-        border-bottom-color: $ui-highlight-color;
-      }
-    }
-  }
-}
-
 // Change the default colors used on some parts of the profile pages
 .activity-stream-tabs {
   background: $account-background-color;
   border-bottom-color: lighten($ui-base-color, 8%);
 }
 
-.box-widget,
 .nothing-here,
 .page-header,
 .directory__tag > a,
-.directory__tag > div,
-.landing-page__call-to-action,
-.contact-widget,
-.landing .hero-widget__text,
-.landing-page__information.contact-widget {
+.directory__tag > div {
   background: $white;
   border: 1px solid lighten($ui-base-color, 8%);
 
@@ -519,16 +527,11 @@ html {
   }
 }
 
-.landing .hero-widget__text {
-  border-top: 0;
-  border-bottom: 0;
-}
-
 .simple_form {
-  input[type=text],
-  input[type=number],
-  input[type=email],
-  input[type=password],
+  input[type="text"],
+  input[type="number"],
+  input[type="email"],
+  input[type="password"],
   textarea {
     &:hover {
       border-color: lighten($ui-base-color, 12%);
@@ -536,26 +539,12 @@ html {
   }
 }
 
-.landing .hero-widget__footer {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border: 0;
-  }
-}
-
 .picture-in-picture-placeholder {
   background: $white;
   border-color: lighten($ui-base-color, 8%);
   color: lighten($ui-base-color, 8%);
 }
 
-.brand__tagline {
-  color: $ui-secondary-color;
-}
-
 .directory__tag > a {
   &:hover,
   &:active,
@@ -649,8 +638,7 @@ html {
   }
 }
 
-.simple_form,
-.table-form {
+.simple_form {
   .warning {
     box-shadow: none;
     background: rgba($error-red, 0.5);
@@ -674,6 +662,16 @@ html {
   }
 }
 
+.reply-indicator {
+  background: transparent;
+  border: 1px solid lighten($ui-base-color, 8%);
+}
+
+.dismissable-banner {
+  border-left: 1px solid lighten($ui-base-color, 8%);
+  border-right: 1px solid lighten($ui-base-color, 8%);
+}
+
 .status__content,
 .reply-indicator__content {
   a {
@@ -689,104 +687,12 @@ html {
   }
 }
 
-.public-layout {
-  .account__section-headline {
-    border: 1px solid lighten($ui-base-color, 8%);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-top: 0;
-    }
-  }
-
-  .header,
-  .public-account-header,
-  .public-account-bio {
-    box-shadow: none;
-  }
-
-  .public-account-bio,
-  .hero-widget__text {
-    background: $account-background-color;
-  }
-
-  .header {
-    background: $ui-base-color;
-    border: 1px solid lighten($ui-base-color, 8%);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border: 0;
-    }
-
-    .brand {
-      &:hover,
-      &:focus,
-      &:active {
-        background: lighten($ui-base-color, 4%);
-      }
-    }
-  }
-
-  .public-account-header {
-    &__image {
-      background: lighten($ui-base-color, 12%);
-
-      &::after {
-        box-shadow: none;
-      }
-    }
-
-    &__bar {
-      &::before {
-        background: $account-background-color;
-        border: 1px solid lighten($ui-base-color, 8%);
-        border-top: 0;
-      }
-
-      .avatar img {
-        border-color: $account-background-color;
-      }
-
-      @media screen and (max-width: $no-columns-breakpoint) {
-        background: $account-background-color;
-        border: 1px solid lighten($ui-base-color, 8%);
-        border-top: 0;
-      }
-    }
-
-    &__tabs {
-      &__name {
-        h1,
-        h1 small {
-          color: $white;
-
-          @media screen and (max-width: $no-columns-breakpoint) {
-            color: $primary-text-color;
-          }
-        }
-      }
-    }
-
-    &__extra {
-      .public-account-bio {
-        border: 0;
-      }
-
-      .public-account-bio .account__header__fields {
-        border-color: lighten($ui-base-color, 8%);
-      }
-    }
-  }
-}
-
 .notification__filter-bar button.active::after,
 .account__section-headline a.active::after {
   border-color: transparent transparent $white;
 }
 
 .hero-widget,
-.box-widget,
-.contact-widget,
-.landing-page__information.contact-widget,
 .moved-account-widget,
 .memoriam-widget,
 .activity-stream,
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index bc039ff03..cae065878 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -5,7 +5,7 @@ $white: #ffffff;
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #2b90d9;
+$classic-highlight-color: #6364ff;
 
 // Differences
 $success-green: lighten(#3c754d, 8%);
@@ -17,10 +17,11 @@ $ui-base-color: $classic-secondary-color !default;
 $ui-base-lighter-color: #b0c0cf;
 $ui-primary-color: #9bcbed;
 $ui-secondary-color: $classic-base-color !default;
-$ui-highlight-color: #2b90d9;
+$ui-highlight-color: $classic-highlight-color !default;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
+$highlight-text-color: darken($ui-highlight-color, 8%) !default;
 $dark-text-color: #444b5d;
 $action-button-color: #606984;
 
@@ -28,10 +29,10 @@ $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
 $light-text-color: #444b5d;
 
-//Newly added colors
+// Newly added colors
 $account-background-color: $white !default;
 
-//Invert darkened and lightened colors
+// Invert darkened and lightened colors
 @function darken($color, $amount) {
   @return hsl(hue($color), saturation($color), lightness($color) + $amount);
 }
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index 68cad0fde..dcfab6bd0 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -20,6 +20,7 @@
   font-family: inherit;
   background: $ui-base-color;
   color: $darker-text-color;
+  border-radius: 4px;
   font-size: 14px;
   margin: 0;
 }
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 9f2a1a3af..0183c43d5 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -1,7 +1,5 @@
 $maximum-width: 1235px;
 $fluid-breakpoint: $maximum-width + 20px;
-$column-breakpoint: 700px;
-$small-breakpoint: 960px;
 
 .container {
   box-sizing: border-box;
@@ -15,892 +13,44 @@ $small-breakpoint: 960px;
   }
 }
 
-.rich-formatting {
-  font-family: $font-sans-serif, sans-serif;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.7;
-  word-wrap: break-word;
-  color: $darker-text-color;
-
-  a {
-    color: $highlight-text-color;
-    text-decoration: underline;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: none;
-    }
-  }
-
-  p,
-  li {
-    color: $darker-text-color;
-  }
-
-  p {
-    margin-top: 0;
-    margin-bottom: .85em;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  strong {
-    font-weight: 700;
-    color: $secondary-text-color;
-  }
-
-  em {
-    font-style: italic;
-    color: $secondary-text-color;
-  }
-
-  code {
-    font-size: 0.85em;
-    background: darken($ui-base-color, 8%);
-    border-radius: 4px;
-    padding: 0.2em 0.3em;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    font-family: $font-display, sans-serif;
-    margin-top: 1.275em;
-    margin-bottom: .85em;
-    font-weight: 500;
-    color: $secondary-text-color;
-  }
-
-  h1 {
-    font-size: 2em;
-  }
-
-  h2 {
-    font-size: 1.75em;
-  }
-
-  h3 {
-    font-size: 1.5em;
-  }
-
-  h4 {
-    font-size: 1.25em;
-  }
-
-  h5,
-  h6 {
-    font-size: 1em;
-  }
-
-  ul {
-    list-style: disc;
-  }
-
-  ol {
-    list-style: decimal;
-  }
-
-  ul,
-  ol {
-    margin: 0;
-    padding: 0;
-    padding-left: 2em;
-    margin-bottom: 0.85em;
-
-    &[type='a'] {
-      list-style-type: lower-alpha;
-    }
-
-    &[type='i'] {
-      list-style-type: lower-roman;
-    }
-  }
-
-  hr {
-    width: 100%;
-    height: 0;
-    border: 0;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
-    margin: 1.7em 0;
-
-    &.spacer {
-      height: 1px;
-      border: 0;
-    }
-  }
-
-  table {
-    width: 100%;
-    border-collapse: collapse;
-    break-inside: auto;
-    margin-top: 24px;
-    margin-bottom: 32px;
-
-    thead tr,
-    tbody tr {
-      border-bottom: 1px solid lighten($ui-base-color, 4%);
-      font-size: 1em;
-      line-height: 1.625;
-      font-weight: 400;
-      text-align: left;
-      color: $darker-text-color;
-    }
-
-    thead tr {
-      border-bottom-width: 2px;
-      line-height: 1.5;
-      font-weight: 500;
-      color: $dark-text-color;
-    }
-
-    th,
-    td {
-      padding: 8px;
-      align-self: start;
-      align-items: start;
-      word-break: break-all;
-
-      &.nowrap {
-        width: 25%;
-        position: relative;
-
-        &::before {
-          content: '&nbsp;';
-          visibility: hidden;
-        }
-
-        span {
-          position: absolute;
-          left: 8px;
-          right: 8px;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
-    }
-  }
-
-  & > :first-child {
-    margin-top: 0;
-  }
-}
-
-.information-board {
-  background: darken($ui-base-color, 4%);
-  padding: 20px 0;
-
-  .container-alt {
-    position: relative;
-    padding-right: 280px + 15px;
-  }
-
-  &__sections {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-  }
-
-  &__section {
-    flex: 1 0 0;
-    font-family: $font-sans-serif, sans-serif;
-    font-size: 16px;
-    line-height: 28px;
-    color: $primary-text-color;
-    text-align: right;
-    padding: 10px 15px;
-
-    span,
-    strong {
-      display: block;
-    }
-
-    span {
-      &:last-child {
-        color: $secondary-text-color;
-      }
-    }
-
-    strong {
-      font-family: $font-display, sans-serif;
-      font-weight: 500;
-      font-size: 32px;
-      line-height: 48px;
-    }
-
-    @media screen and (max-width: $column-breakpoint) {
-      text-align: center;
-    }
-  }
-
-  .panel {
-    position: absolute;
-    width: 280px;
-    box-sizing: border-box;
-    background: darken($ui-base-color, 8%);
-    padding: 20px;
-    padding-top: 10px;
-    border-radius: 4px 4px 0 0;
-    right: 0;
-    bottom: -40px;
-
-    .panel-header {
-      font-family: $font-display, sans-serif;
-      font-size: 14px;
-      line-height: 24px;
-      font-weight: 500;
-      color: $darker-text-color;
-      padding-bottom: 5px;
-      margin-bottom: 15px;
-      border-bottom: 1px solid lighten($ui-base-color, 4%);
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-
-      a,
-      span {
-        font-weight: 400;
-        color: darken($darker-text-color, 10%);
-      }
-
-      a {
-        text-decoration: none;
-      }
-    }
-  }
-
-  .owner {
-    text-align: center;
-
-    .avatar {
-      width: 80px;
-      height: 80px;
-      margin: 0 auto;
-      margin-bottom: 15px;
-
-      img {
-        display: block;
-        width: 80px;
-        height: 80px;
-        border-radius: 48px;
-      }
-    }
-
-    .name {
-      font-size: 14px;
-
-      a {
-        display: block;
-        color: $primary-text-color;
-        text-decoration: none;
-
-        &:hover {
-          .display_name {
-            text-decoration: underline;
-          }
-        }
-      }
-
-      .username {
-        display: block;
-        color: $darker-text-color;
-      }
-    }
-  }
-}
-
-.landing-page {
-  p,
-  li {
-    font-family: $font-sans-serif, sans-serif;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 30px;
-    margin-bottom: 12px;
-    color: $darker-text-color;
-
-    a {
-      color: $highlight-text-color;
-      text-decoration: underline;
-    }
-  }
-
-  em {
-    display: inline;
-    margin: 0;
-    padding: 0;
-    font-weight: 700;
-    background: transparent;
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit;
-    color: lighten($darker-text-color, 10%);
-  }
-
-  h1 {
-    font-family: $font-display, sans-serif;
-    font-size: 26px;
-    line-height: 30px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-
-    small {
-      font-family: $font-sans-serif, sans-serif;
-      display: block;
-      font-size: 18px;
-      font-weight: 400;
-      color: lighten($darker-text-color, 10%);
-    }
-  }
-
-  h2 {
-    font-family: $font-display, sans-serif;
-    font-size: 22px;
-    line-height: 26px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-  }
-
-  h3 {
-    font-family: $font-display, sans-serif;
-    font-size: 18px;
-    line-height: 24px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-  }
-
-  h4 {
-    font-family: $font-display, sans-serif;
-    font-size: 16px;
-    line-height: 24px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-  }
-
-  h5 {
-    font-family: $font-display, sans-serif;
-    font-size: 14px;
-    line-height: 24px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-  }
-
-  h6 {
-    font-family: $font-display, sans-serif;
-    font-size: 12px;
-    line-height: 24px;
-    font-weight: 500;
-    margin-bottom: 20px;
-    color: $secondary-text-color;
-  }
-
-  ul,
-  ol {
-    margin-left: 20px;
-
-    &[type='a'] {
-      list-style-type: lower-alpha;
-    }
-
-    &[type='i'] {
-      list-style-type: lower-roman;
-    }
-  }
-
-  ul {
-    list-style: disc;
-  }
-
-  ol {
-    list-style: decimal;
-  }
-
-  li > ol,
-  li > ul {
-    margin-top: 6px;
-  }
-
-  hr {
-    width: 100%;
-    height: 0;
-    border: 0;
-    border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
-    margin: 20px 0;
-
-    &.spacer {
-      height: 1px;
-      border: 0;
-    }
-  }
-
-  &__information,
-  &__forms {
-    padding: 20px;
-  }
-
-  &__call-to-action {
-    background: $ui-base-color;
-    border-radius: 4px;
-    padding: 25px 40px;
-    overflow: hidden;
-    box-sizing: border-box;
-
-    .row {
-      width: 100%;
-      display: flex;
-      flex-direction: row-reverse;
-      flex-wrap: nowrap;
-      justify-content: space-between;
-      align-items: center;
-    }
-
-    .row__information-board {
-      display: flex;
-      justify-content: flex-end;
-      align-items: flex-end;
-
-      .information-board__section {
-        flex: 1 0 auto;
-        padding: 0 10px;
-      }
-
-      @media screen and (max-width: $no-gap-breakpoint) {
-        width: 100%;
-        justify-content: space-between;
-      }
-    }
-
-    .row__mascot {
-      flex: 1;
-      margin: 10px -50px 0 0;
-
-      @media screen and (max-width: $no-gap-breakpoint) {
-        display: none;
-      }
-    }
-  }
-
-  &__logo {
-    margin-right: 20px;
-
-    img {
-      height: 50px;
-      width: auto;
-      mix-blend-mode: lighten;
-    }
-  }
-
-  &__information {
-    padding: 45px 40px;
-    margin-bottom: 10px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    strong {
-      font-weight: 500;
-      color: lighten($darker-text-color, 10%);
-    }
-
-    .account {
-      border-bottom: 0;
-      padding: 0;
-
-      &__display-name {
-        align-items: center;
-        display: flex;
-        margin-right: 5px;
-      }
-
-      div.account__display-name {
-        &:hover {
-          .display-name strong {
-            text-decoration: none;
-          }
-        }
-
-        .account__avatar {
-          cursor: default;
-        }
-      }
-
-      &__avatar-wrapper {
-        margin-left: 0;
-        flex: 0 0 auto;
-      }
-
-      .display-name {
-        font-size: 15px;
-
-        &__account {
-          font-size: 14px;
-        }
-      }
-    }
-
-    @media screen and (max-width: $small-breakpoint) {
-      .contact {
-        margin-top: 30px;
-      }
-    }
-
-    @media screen and (max-width: $column-breakpoint) {
-      padding: 25px 20px;
-    }
-  }
-
-  &__information,
-  &__forms,
-  #mastodon-timeline {
-    box-sizing: border-box;
-    background: $ui-base-color;
-    border-radius: 4px;
-    box-shadow: 0 0 6px rgba($black, 0.1);
-  }
-
-  &__mascot {
-    height: 104px;
-    position: relative;
-    left: -40px;
-    bottom: 25px;
-
-    img {
-      height: 190px;
-      width: auto;
-    }
-  }
-
-  &__short-description {
-    .row {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      margin-bottom: 40px;
-    }
-
-    @media screen and (max-width: $column-breakpoint) {
-      .row {
-        margin-bottom: 20px;
-      }
-    }
-
-    p a {
-      color: $secondary-text-color;
-    }
-
-    h1 {
-      font-weight: 500;
-      color: $primary-text-color;
-      margin-bottom: 0;
-
-      small {
-        color: $darker-text-color;
-
-        span {
-          color: $secondary-text-color;
-        }
-      }
-    }
-
-    p:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  &__hero {
-    margin-bottom: 10px;
-
-    img {
-      display: block;
-      margin: 0;
-      max-width: 100%;
-      height: auto;
-      border-radius: 4px;
-    }
-  }
-
-  @media screen and (max-width: 840px) {
-    .information-board {
-      .container-alt {
-        padding-right: 20px;
-      }
-
-      .panel {
-        position: static;
-        margin-top: 20px;
-        width: 100%;
-        border-radius: 4px;
-
-        .panel-header {
-          text-align: center;
-        }
-      }
-    }
-  }
-
-  @media screen and (max-width: 675px) {
-    .header-wrapper {
-      padding-top: 0;
-
-      &.compact {
-        padding-bottom: 0;
-      }
-
-      &.compact .hero .heading {
-        text-align: initial;
-      }
-    }
-
-    .header .container-alt,
-    .features .container-alt {
-      display: block;
-    }
-  }
-
-  .cta {
-    margin: 20px;
-  }
-}
-
-.landing {
-  margin-bottom: 100px;
-
-  @media screen and (max-width: 738px) {
-    margin-bottom: 0;
-  }
-
-  &__brand {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 50px;
-
-    svg {
-      fill: $primary-text-color;
-      height: 52px;
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      padding: 0;
-      margin-bottom: 30px;
-    }
-  }
-
-  .directory {
-    margin-top: 30px;
-    background: transparent;
-    box-shadow: none;
-    border-radius: 0;
-  }
-
-  .hero-widget {
-    margin-top: 30px;
-    margin-bottom: 0;
-
-    h4 {
-      padding: 10px;
-      text-transform: uppercase;
-      font-weight: 700;
-      font-size: 13px;
-      color: $darker-text-color;
-    }
-
-    &__text {
-      border-radius: 0;
-      padding-bottom: 0;
-    }
-
-    &__footer {
-      background: $ui-base-color;
-      padding: 10px;
-      border-radius: 0 0 4px 4px;
-      display: flex;
-
-      &__column {
-        flex: 1 1 50%;
-        overflow-x: hidden;
-      }
-    }
-
-    .account {
-      padding: 10px 0;
-      border-bottom: 0;
-
-      .account__display-name {
-        display: flex;
-        align-items: center;
-      }
-    }
-
-    &__counters__wrapper {
-      display: flex;
-    }
-
-    &__counter {
-      padding: 10px;
-      width: 50%;
-
-      strong {
-        font-family: $font-display, sans-serif;
-        font-size: 15px;
-        font-weight: 700;
-        display: block;
-      }
-
-      span {
-        font-size: 14px;
-        color: $darker-text-color;
-      }
-    }
-  }
-
-  .simple_form .user_agreement .label_input > label {
-    font-weight: 400;
-    color: $darker-text-color;
-  }
-
-  .simple_form p.lead {
-    color: $darker-text-color;
-    font-size: 15px;
-    line-height: 20px;
-    font-weight: 400;
-    margin-bottom: 25px;
-  }
-
-  &__grid {
-    max-width: 960px;
-    margin: 0 auto;
-    display: grid;
-    grid-template-columns: minmax(0, 50%) minmax(0, 50%);
-    grid-gap: 30px;
-
-    @media screen and (max-width: 738px) {
-      grid-template-columns: minmax(0, 100%);
-      grid-gap: 10px;
-
-      &__column-login {
-        grid-row: 1;
-        display: flex;
-        flex-direction: column;
-
-        .box-widget {
-          order: 2;
-          flex: 0 0 auto;
-        }
-
-        .hero-widget {
-          margin-top: 0;
-          margin-bottom: 10px;
-          order: 1;
-          flex: 0 0 auto;
-        }
-      }
-
-      &__column-registration {
-        grid-row: 2;
-      }
-
-      .directory {
-        margin-top: 10px;
-      }
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      grid-gap: 0;
-
-      .hero-widget {
-        display: block;
-        margin-bottom: 0;
-        box-shadow: none;
-
-        &__img,
-        &__img img,
-        &__footer {
-          border-radius: 0;
-        }
-      }
-
-      .hero-widget,
-      .box-widget,
-      .directory__tag {
-        border-bottom: 1px solid lighten($ui-base-color, 8%);
-      }
-
-      .directory {
-        margin-top: 0;
-
-        &__tag {
-          margin-bottom: 0;
-
-          & > a,
-          & > div {
-            border-radius: 0;
-            box-shadow: none;
-          }
-
-          &:last-child {
-            border-bottom: 0;
-          }
-        }
-      }
-    }
-  }
-}
-
 .brand {
   position: relative;
   text-decoration: none;
 }
 
-.brand__tagline {
-  display: block;
-  position: absolute;
-  bottom: -10px;
-  left: 50px;
-  width: 300px;
-  color: $ui-primary-color;
-  text-decoration: none;
-  font-size: 14px;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    position: static;
-    width: auto;
-    margin-top: 20px;
-    color: $dark-text-color;
-  }
-}
-
 .rules-list {
-  background: darken($ui-base-color, 2%);
-  border: 1px solid darken($ui-base-color, 8%);
-  border-radius: 4px;
-  padding: 0.5em 2.5em !important;
-  margin-top: 1.85em !important;
+  font-size: 15px;
+  line-height: 22px;
+  color: $primary-text-color;
+  counter-reset: list-counter;
 
   li {
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
-    color: $dark-text-color;
-    padding: 1em;
+    position: relative;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    padding: 1em 1.75em;
+    padding-left: 3em;
+    font-weight: 500;
+    counter-increment: list-counter;
+
+    &::before {
+      content: counter(list-counter);
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      background: $highlight-text-color;
+      color: $ui-base-color;
+      border-radius: 50%;
+      width: 4ch;
+      height: 4ch;
+      font-weight: 500;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
 
     &:last-child {
       border-bottom: 0;
     }
   }
-
-  &__text {
-    color: $primary-text-color;
-  }
 }
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 485fe4a9d..c007eb4b5 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -202,7 +202,8 @@
 }
 
 .account-role,
-.simple_form .recommended {
+.simple_form .recommended,
+.simple_form .not_recommended {
   display: inline-block;
   padding: 4px 6px;
   cursor: default;
@@ -210,9 +211,9 @@
   font-size: 12px;
   line-height: 12px;
   font-weight: 500;
-  color: $ui-secondary-color;
-  background-color: rgba($ui-secondary-color, 0.1);
-  border: 1px solid rgba($ui-secondary-color, 0.5);
+  color: var(--user-role-accent, $ui-secondary-color);
+  background-color: var(--user-role-background, rgba($ui-secondary-color, 0.1));
+  border: 1px solid var(--user-role-border, rgba($ui-secondary-color, 0.5));
 
   &.moderator {
     color: $success-green;
@@ -227,6 +228,12 @@
   }
 }
 
+.simple_form .not_recommended {
+  color: lighten($error-red, 12%);
+  background-color: rgba(lighten($error-red, 12%), 0.1);
+  border-color: rgba(lighten($error-red, 12%), 0.5);
+}
+
 .account__header__fields {
   max-width: 100vw;
   padding: 0;
@@ -331,7 +338,8 @@
 }
 
 .batch-table__row--muted .pending-account__header,
-.batch-table__row--muted .accounts-table {
+.batch-table__row--muted .accounts-table,
+.batch-table__row--muted .name-tag {
   &,
   a,
   strong {
@@ -339,6 +347,10 @@
   }
 }
 
+.batch-table__row--muted .name-tag .avatar {
+  opacity: 0.5;
+}
+
 .batch-table__row--muted .accounts-table {
   tbody td.accounts-table__extra,
   &__count,
@@ -352,7 +364,8 @@
 }
 
 .batch-table__row--attention .pending-account__header,
-.batch-table__row--attention .accounts-table {
+.batch-table__row--attention .accounts-table,
+.batch-table__row--attention .name-tag {
   &,
   a,
   strong {
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index dbf8a6e7a..ba64fde09 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -31,23 +31,17 @@ $content-width: 840px;
 
     &__toggle {
       display: none;
-      background: lighten($ui-base-color, 8%);
-      height: 48px;
+      background: darken($ui-base-color, 4%);
+      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      align-items: center;
 
       &__logo {
         flex: 1 1 auto;
 
         a {
-          display: inline-block;
+          display: block;
           padding: 15px;
         }
-
-        svg {
-          fill: $primary-text-color;
-          height: 20px;
-          position: relative;
-          bottom: -2px;
-        }
       }
 
       &__icon {
@@ -55,15 +49,27 @@ $content-width: 840px;
         color: $darker-text-color;
         text-decoration: none;
         flex: 0 0 auto;
-        font-size: 20px;
-        padding: 15px;
-      }
+        font-size: 18px;
+        padding: 10px;
+        margin: 5px 10px;
+        border-radius: 4px;
 
-      a {
-        &:hover,
-        &:focus,
-        &:active {
-          background: lighten($ui-base-color, 12%);
+        &:focus {
+          background: $ui-base-color;
+        }
+
+        .fa-times {
+          display: none;
+        }
+
+        &.active {
+          .fa-times {
+            display: block;
+          }
+
+          .fa-bars {
+            display: none;
+          }
         }
       }
     }
@@ -75,6 +81,13 @@ $content-width: 840px;
       height: 100px;
     }
 
+    .logo--wordmark {
+      display: inherit;
+      margin: inherit;
+      width: inherit;
+      height: 25px;
+    }
+
     @media screen and (max-width: $no-columns-breakpoint) {
       & > a:first-child {
         display: none;
@@ -133,12 +146,12 @@ $content-width: 840px;
 
       .simple-navigation-active-leaf a {
         color: $primary-text-color;
-        background-color: $ui-highlight-color;
+        background-color: darken($ui-highlight-color, 2%);
         border-bottom: 0;
         border-radius: 0;
 
         &:hover {
-          background-color: lighten($ui-highlight-color, 5%);
+          background-color: $ui-highlight-color;
         }
       }
     }
@@ -181,24 +194,65 @@ $content-width: 840px;
       padding-top: 30px;
     }
 
-    &-heading {
-      display: flex;
+    &__heading {
+      margin-bottom: 45px;
 
-      padding-bottom: 36px;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      &__row {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        justify-content: space-between;
+        margin: -15px -15px 0 0;
 
-      margin: -15px -15px 40px 0;
-
-      flex-wrap: wrap;
-      align-items: center;
-      justify-content: space-between;
-
-      & > * {
-        margin-top: 15px;
-        margin-right: 15px;
+        & > * {
+          margin-top: 15px;
+          margin-right: 15px;
+        }
       }
 
-      &-actions {
+      &__tabs {
+        margin-top: 30px;
+        width: 100%;
+
+        & > div {
+          display: flex;
+          flex-wrap: wrap;
+          gap: 5px;
+        }
+
+        a {
+          font-size: 14px;
+          display: inline-flex;
+          align-items: center;
+          padding: 7px 10px;
+          border-radius: 4px;
+          color: $darker-text-color;
+          text-decoration: none;
+          font-weight: 500;
+          gap: 5px;
+          white-space: nowrap;
+
+          &:hover,
+          &:focus,
+          &:active {
+            background: lighten($ui-base-color, 4%);
+          }
+
+          &.selected {
+            font-weight: 700;
+            color: $primary-text-color;
+            background: $ui-highlight-color;
+
+            &:hover,
+            &:focus,
+            &:active {
+              background: lighten($ui-highlight-color, 4%);
+            }
+          }
+        }
+      }
+
+      &__actions {
         display: inline-flex;
 
         & > :not(:first-child) {
@@ -206,6 +260,14 @@ $content-width: 840px;
         }
       }
 
+      h2 small {
+        font-size: 12px;
+        display: block;
+        font-weight: 500;
+        color: $darker-text-color;
+        line-height: 18px;
+      }
+
       @media screen and (max-width: $no-columns-breakpoint) {
         border-bottom: 0;
         padding-bottom: 0;
@@ -216,11 +278,7 @@ $content-width: 840px;
       color: $secondary-text-color;
       font-size: 24px;
       line-height: 36px;
-      font-weight: 400;
-
-      @media screen and (max-width: $no-columns-breakpoint) {
-        font-weight: 700;
-      }
+      font-weight: 700;
     }
 
     h3 {
@@ -294,7 +352,7 @@ $content-width: 840px;
       width: 100%;
       height: 0;
       border: 0;
-      border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
+      border-bottom: 1px solid rgba($ui-base-lighter-color, 0.6);
       margin: 20px 0;
 
       &.spacer {
@@ -322,6 +380,18 @@ $content-width: 840px;
 
       & > ul {
         display: none;
+
+        &.visible {
+          display: block;
+          position: fixed;
+          z-index: 10;
+          width: 100%;
+          height: calc(100vh - 56px);
+          left: 0;
+          bottom: 0;
+          overflow-y: auto;
+          background: $ui-base-color;
+        }
       }
 
       ul a,
@@ -363,6 +433,21 @@ body,
     }
   }
 
+  .positive-hint,
+  .negative-hint,
+  .neutral-hint {
+    a {
+      color: inherit;
+      text-decoration: underline;
+
+      &:focus,
+      &:hover,
+      &:active {
+        text-decoration: none;
+      }
+    }
+  }
+
   .positive-hint {
     color: $valid-value-color;
     font-weight: 500;
@@ -406,6 +491,11 @@ body,
       }
     }
 
+    & > div {
+      display: flex;
+      gap: 5px;
+    }
+
     strong {
       font-weight: 500;
       text-transform: uppercase;
@@ -578,40 +668,46 @@ body,
 }
 
 .log-entry {
+  display: block;
   line-height: 20px;
-  padding: 15px 0;
+  padding: 15px;
+  padding-left: 15px * 2 + 40px;
   background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 4%);
+  border-bottom: 1px solid darken($ui-base-color, 8%);
+  position: relative;
+  text-decoration: none;
+  color: $darker-text-color;
+  font-size: 14px;
+
+  &:first-child {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+  }
 
   &:last-child {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
     border-bottom: 0;
   }
 
-  &__header {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    color: $darker-text-color;
-    font-size: 14px;
-    padding: 0 10px;
+  &:hover,
+  &:focus,
+  &:active {
+    background: lighten($ui-base-color, 4%);
   }
 
   &__avatar {
-    margin-right: 10px;
+    position: absolute;
+    left: 15px;
+    top: 15px;
 
     .avatar {
-      display: block;
-      margin: 0;
-      border-radius: 50%;
+      border-radius: 4px;
       width: 40px;
       height: 40px;
     }
   }
 
-  &__content {
-    max-width: calc(100% - 90px);
-  }
-
   &__title {
     word-wrap: break-word;
   }
@@ -627,6 +723,14 @@ body,
     text-decoration: none;
     font-weight: 500;
   }
+
+  a {
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+    }
+  }
 }
 
 a.name-tag,
@@ -655,8 +759,9 @@ a.inline-name-tag,
 
 a.name-tag,
 .name-tag {
-  display: flex;
+  display: inline-flex;
   align-items: center;
+  vertical-align: top;
 
   .avatar {
     display: block;
@@ -846,7 +951,7 @@ a.name-tag,
     border: 0;
 
     a {
-      color: lighten($ui-highlight-color, 8%);
+      color: $highlight-text-color;
     }
 
     dl:first-child .verified {
@@ -869,7 +974,21 @@ a.name-tag,
   text-align: center;
 }
 
-.announcements-list {
+.applications-list__item,
+.filters-list__item {
+  padding: 15px 0;
+  background: $ui-base-color;
+  border: 1px solid lighten($ui-base-color, 4%);
+  border-radius: 4px;
+  margin-top: 15px;
+}
+
+.user-role {
+  color: var(--user-role-accent);
+}
+
+.announcements-list,
+.filters-list {
   border: 1px solid lighten($ui-base-color, 4%);
   border-radius: 4px;
 
@@ -888,6 +1007,12 @@ a.name-tag,
       text-decoration: none;
       margin-bottom: 10px;
 
+      .account-role {
+        vertical-align: middle;
+      }
+    }
+
+    a.announcements-list__item__title {
       &:hover,
       &:focus,
       &:active {
@@ -898,6 +1023,17 @@ a.name-tag,
     &__meta {
       padding: 0 15px;
       color: $dark-text-color;
+
+      a {
+        color: inherit;
+        text-decoration: underline;
+
+        &:hover,
+        &:focus,
+        &:active {
+          text-decoration: none;
+        }
+      }
     }
 
     &__action-bar {
@@ -906,12 +1042,43 @@ a.name-tag,
       align-items: center;
     }
 
+    &__permissions {
+      margin-top: 10px;
+    }
+
     &:last-child {
       border-bottom: 0;
     }
   }
 }
 
+.filters-list__item {
+  &__title {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 0;
+  }
+
+  &__permissions {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+
+  .expiration {
+    font-size: 13px;
+  }
+
+  &.expired {
+    .expiration {
+      color: lighten($error-red, 12%);
+    }
+
+    .permissions-list__item__icon {
+      color: $dark-text-color;
+    }
+  }
+}
+
 .dashboard__counters.admin-account-counters {
   margin-top: 10px;
 }
@@ -1035,7 +1202,7 @@ a.name-tag,
 
     path:first-child {
       fill: rgba($highlight-text-color, 0.25) !important;
-      fill-opacity: 1 !important;
+      fill-opacity: 100% !important;
     }
 
     path:last-child {
@@ -1114,3 +1281,556 @@ a.sparkline {
     }
   }
 }
+
+.report-reason-selector {
+  border-radius: 4px;
+  background: $ui-base-color;
+  margin-bottom: 20px;
+
+  &__category {
+    cursor: pointer;
+    border-bottom: 1px solid darken($ui-base-color, 8%);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    &__label {
+      padding: 15px;
+    }
+
+    &__rules {
+      margin-left: 30px;
+    }
+  }
+
+  &__rule {
+    cursor: pointer;
+    padding: 15px;
+  }
+}
+
+.report-header {
+  display: grid;
+  grid-gap: 15px;
+  grid-template-columns: minmax(0, 1fr) 300px;
+
+  &__details {
+    &__item {
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      padding: 15px 0;
+
+      &:last-child {
+        border-bottom: 0;
+      }
+
+      &__header {
+        font-weight: 600;
+        padding: 4px 0;
+      }
+    }
+
+    &--horizontal {
+      display: grid;
+      grid-auto-columns: minmax(0, 1fr);
+      grid-auto-flow: column;
+
+      .report-header__details__item {
+        border-bottom: 0;
+      }
+    }
+  }
+
+  @media screen and (max-width: 930px) {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}
+
+.account-card {
+  background: $ui-base-color;
+  border-radius: 4px;
+
+  &__permalink {
+    color: inherit;
+    text-decoration: none;
+  }
+
+  &__header {
+    padding: 4px;
+    border-radius: 4px;
+    height: 128px;
+
+    img {
+      display: block;
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      background: darken($ui-base-color, 8%);
+    }
+  }
+
+  &__title {
+    margin-top: -(15px + 8px);
+    display: flex;
+    align-items: flex-end;
+
+    &__avatar {
+      padding: 14px;
+
+      img,
+      .account__avatar {
+        display: block;
+        margin: 0;
+        width: 56px;
+        height: 56px;
+        background-color: darken($ui-base-color, 8%);
+        border-radius: 8px;
+        border: 1px solid $ui-base-color;
+      }
+    }
+
+    .display-name {
+      color: $darker-text-color;
+      padding-bottom: 15px;
+      font-size: 15px;
+      line-height: 20px;
+
+      bdi {
+        display: block;
+        color: $primary-text-color;
+        font-weight: 700;
+      }
+    }
+  }
+
+  &__bio {
+    padding: 0 15px;
+    margin: 8px 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-wrap: break-word;
+    max-height: 21px * 2;
+    position: relative;
+    font-size: 15px;
+    line-height: 21px;
+
+    &::after {
+      display: block;
+      content: "";
+      width: 50px;
+      height: 21px;
+      position: absolute;
+      bottom: 0;
+      right: 15px;
+      background: linear-gradient(to left, $ui-base-color, transparent);
+      pointer-events: none;
+    }
+
+    a {
+      color: $secondary-text-color;
+      text-decoration: none;
+      unicode-bidi: isolate;
+
+      &:hover {
+        text-decoration: underline;
+      }
+
+      &.mention {
+        &:hover {
+          text-decoration: none;
+
+          span {
+            text-decoration: underline;
+          }
+        }
+      }
+    }
+  }
+
+  &__actions {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    &__button {
+      flex-shrink: 1;
+      padding: 0 15px;
+      overflow: hidden;
+
+      .button {
+        min-width: 0;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        max-width: 100%;
+      }
+    }
+  }
+
+  &__counters {
+    flex: 1 1 auto;
+    display: grid;
+    grid-auto-columns: minmax(0, 1fr);
+    grid-auto-flow: column;
+    max-width: 340px;
+    min-width: 65px * 3;
+
+    &__item {
+      padding: 15px 0;
+      text-align: center;
+      color: $primary-text-color;
+      font-weight: 600;
+      font-size: 15px;
+      line-height: 21px;
+
+      small {
+        display: block;
+        color: $darker-text-color;
+        font-weight: 400;
+        font-size: 13px;
+        line-height: 18px;
+      }
+    }
+  }
+}
+
+.report-notes {
+  margin-bottom: 20px;
+
+  &__item {
+    background: $ui-base-color;
+    position: relative;
+    padding: 15px;
+    padding-left: 15px * 2 + 40px;
+    border-bottom: 1px solid darken($ui-base-color, 8%);
+
+    &:first-child {
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+    }
+
+    &:last-child {
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+      border-bottom: 0;
+    }
+
+    &:hover {
+      background-color: lighten($ui-base-color, 4%);
+    }
+
+    &__avatar {
+      position: absolute;
+      left: 15px;
+      top: 15px;
+      border-radius: 4px;
+      width: 40px;
+      height: 40px;
+    }
+
+    &__header {
+      color: $darker-text-color;
+      font-size: 15px;
+      line-height: 20px;
+      margin-bottom: 4px;
+
+      .username {
+        color: $primary-text-color;
+        font-weight: 500;
+        margin-right: 5px;
+
+        a {
+          color: inherit;
+          text-decoration: none;
+
+          &:hover,
+          &:focus,
+          &:active {
+            text-decoration: underline;
+          }
+        }
+      }
+
+      time {
+        margin-left: 5px;
+        vertical-align: baseline;
+      }
+    }
+
+    &__content {
+      font-size: 15px;
+      line-height: 20px;
+      word-wrap: break-word;
+      font-weight: 400;
+      color: $primary-text-color;
+
+      p {
+        margin-bottom: 20px;
+        white-space: pre-wrap;
+        unicode-bidi: plaintext;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+
+    &__actions {
+      position: absolute;
+      top: 15px;
+      right: 15px;
+      text-align: right;
+    }
+  }
+}
+
+.report-actions {
+  border: 1px solid darken($ui-base-color, 8%);
+
+  &__item {
+    display: flex;
+    align-items: center;
+    line-height: 18px;
+    border-bottom: 1px solid darken($ui-base-color, 8%);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    &__button {
+      box-sizing: border-box;
+      flex: 0 0 auto;
+      width: 200px;
+      padding: 15px;
+      padding-right: 0;
+
+      .button {
+        display: block;
+        width: 100%;
+      }
+    }
+
+    &__description {
+      padding: 15px;
+      font-size: 14px;
+      color: $dark-text-color;
+    }
+  }
+
+  @media screen and (max-width: 800px) {
+    border: 0;
+
+    &__item {
+      flex-direction: column;
+      border: 0;
+
+      &__button {
+        width: 100%;
+        padding: 15px 0;
+      }
+
+      &__description {
+        padding: 0;
+        padding-bottom: 15px;
+      }
+    }
+  }
+}
+
+.section-skip-link {
+  float: right;
+
+  a {
+    color: $ui-highlight-color;
+    text-decoration: none;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+    }
+  }
+}
+
+.strike-card {
+  padding: 15px;
+  border-radius: 4px;
+  background: $ui-base-color;
+  font-size: 15px;
+  line-height: 20px;
+  word-wrap: break-word;
+  font-weight: 400;
+  color: $primary-text-color;
+  box-sizing: border-box;
+  min-height: 100%;
+
+  a {
+    color: $highlight-text-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  p {
+    margin-bottom: 20px;
+    unicode-bidi: plaintext;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    strong {
+      font-weight: 700;
+    }
+  }
+
+  &__rules {
+    list-style: disc;
+    padding-left: 15px;
+    margin-bottom: 20px;
+    color: $darker-text-color;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &__text {
+      color: $primary-text-color;
+    }
+  }
+
+  &__statuses-list {
+    border-radius: 4px;
+    border: 1px solid darken($ui-base-color, 8%);
+    font-size: 13px;
+    line-height: 18px;
+    overflow: hidden;
+
+    &__item {
+      padding: 16px;
+      background: lighten($ui-base-color, 2%);
+      border-bottom: 1px solid darken($ui-base-color, 8%);
+
+      &:last-child {
+        border-bottom: 0;
+      }
+
+      &__meta {
+        color: $darker-text-color;
+      }
+
+      a {
+        color: inherit;
+        text-decoration: none;
+
+        &:hover,
+        &:focus,
+        &:active {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+}
+
+.availability-indicator {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+  font-size: 14px;
+  line-height: 21px;
+
+  &__hint {
+    padding: 0 15px;
+  }
+
+  &__graphic {
+    display: flex;
+    margin: 0 -2px;
+
+    &__item {
+      display: block;
+      flex: 0 0 auto;
+      width: 4px;
+      height: 21px;
+      background: lighten($ui-base-color, 8%);
+      margin: 0 2px;
+      border-radius: 2px;
+
+      &.positive {
+        background: $valid-value-color;
+      }
+
+      &.negative {
+        background: $error-value-color;
+      }
+    }
+  }
+}
+
+.history {
+  counter-reset: step 0;
+  font-size: 15px;
+  line-height: 22px;
+
+  li {
+    counter-increment: step 1;
+    padding-left: 2.5rem;
+    padding-bottom: 8px;
+    position: relative;
+    margin-bottom: 8px;
+
+    &::before {
+      position: absolute;
+      content: counter(step);
+      font-size: 0.625rem;
+      font-weight: 500;
+      left: 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: calc(1.375rem + 1px);
+      height: calc(1.375rem + 1px);
+      background: $ui-base-color;
+      border: 1px solid $highlight-text-color;
+      color: $highlight-text-color;
+      border-radius: 8px;
+    }
+
+    &::after {
+      position: absolute;
+      content: "";
+      width: 1px;
+      background: $highlight-text-color;
+      bottom: 0;
+      top: calc(1.875rem + 1px);
+      left: 0.6875rem;
+    }
+
+    &:last-child {
+      margin-bottom: 0;
+
+      &::after {
+        display: none;
+      }
+    }
+  }
+
+  &__entry {
+    h5 {
+      font-weight: 500;
+      color: $primary-text-color;
+      line-height: 25px;
+      margin-bottom: 16px;
+    }
+
+    .status {
+      border: 1px solid lighten($ui-base-color, 4%);
+      background: $ui-base-color;
+      border-radius: 4px;
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 9e63b1d31..413a1cdd6 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -16,7 +16,7 @@ body {
   text-rendering: optimizelegibility;
   font-feature-settings: "kern";
   text-size-adjust: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   -webkit-tap-highlight-color: transparent;
 
   &.system-font {
@@ -31,7 +31,7 @@ body {
     // Droid Sans => Older Androids (<4.0)
     // Helvetica Neue => Older macOS <10.11
     // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
-    font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
   }
 
   &.app-body {
@@ -202,7 +202,7 @@ button {
   }
 
   p {
-    margin-bottom: .85em;
+    margin-bottom: 0.85em;
 
     &:last-child {
       margin-bottom: 0;
@@ -256,7 +256,17 @@ button {
 }
 
 .logo-resources {
-  display: none;
+  // Not using display: none because of https://bugs.chromium.org/p/chromium/issues/detail?id=258029
+  visibility: hidden;
+  user-select: none;
+  pointer-events: none;
+  width: 0;
+  height: 0;
+  overflow: hidden;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: -1000;
 }
 
 // NoScript adds a __ns__pop2top class to the full ancestry of blocked elements,
diff --git a/app/javascript/styles/mastodon/branding.scss b/app/javascript/styles/mastodon/branding.scss
new file mode 100644
index 000000000..d1bddc68b
--- /dev/null
+++ b/app/javascript/styles/mastodon/branding.scss
@@ -0,0 +1,3 @@
+.logo {
+  color: $primary-text-color;
+}
diff --git a/app/javascript/styles/mastodon/compact_header.scss b/app/javascript/styles/mastodon/compact_header.scss
deleted file mode 100644
index 4980ab5f1..000000000
--- a/app/javascript/styles/mastodon/compact_header.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.compact-header {
-  h1 {
-    font-size: 24px;
-    line-height: 28px;
-    color: $darker-text-color;
-    font-weight: 500;
-    margin-bottom: 20px;
-    padding: 0 10px;
-    word-wrap: break-word;
-
-    @media screen and (max-width: 740px) {
-      text-align: center;
-      padding: 20px 10px 0;
-    }
-
-    a {
-      color: inherit;
-      text-decoration: none;
-    }
-
-    small {
-      font-weight: 400;
-      color: $secondary-text-color;
-    }
-
-    img {
-      display: inline-block;
-      margin-bottom: -5px;
-      margin-right: 15px;
-      width: 36px;
-      height: 36px;
-    }
-  }
-}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0a62e6b82..6a22f6009 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -24,11 +24,16 @@
   display: block;
   font-size: 15px;
   line-height: 20px;
-  color: $ui-highlight-color;
+  color: $highlight-text-color;
   border: 0;
   background: transparent;
   padding: 0;
   cursor: pointer;
+  text-decoration: none;
+
+  &--destructive {
+    color: $error-value-color;
+  }
 
   &:hover,
   &:active {
@@ -42,7 +47,7 @@
 }
 
 .button {
-  background-color: $ui-highlight-color;
+  background-color: darken($ui-highlight-color, 2%);
   border: 10px none;
   border-radius: 4px;
   box-sizing: border-box;
@@ -50,32 +55,26 @@
   cursor: pointer;
   display: inline-block;
   font-family: inherit;
-  font-size: 14px;
+  font-size: 15px;
   font-weight: 500;
-  height: 36px;
   letter-spacing: 0;
-  line-height: 36px;
+  line-height: 22px;
   overflow: hidden;
-  padding: 0 16px;
+  padding: 7px 18px;
   position: relative;
   text-align: center;
-  text-transform: uppercase;
   text-decoration: none;
   text-overflow: ellipsis;
-  transition: all 100ms ease-in;
   white-space: nowrap;
   width: auto;
 
   &:active,
   &:focus,
   &:hover {
-    background-color: lighten($ui-highlight-color, 10%);
-    transition: all 200ms ease-out;
+    background-color: $ui-highlight-color;
   }
 
   &--destructive {
-    transition: none;
-
     &:active,
     &:focus,
     &:hover {
@@ -90,6 +89,15 @@
     cursor: default;
   }
 
+  &.copyable {
+    transition: background 300ms linear;
+  }
+
+  &.copied {
+    background: $valid-value-color;
+    transition: none;
+  }
+
   &::-moz-focus-inner {
     border: 0;
   }
@@ -100,17 +108,6 @@
     outline: 0 !important;
   }
 
-  &.button-primary,
-  &.button-alternative,
-  &.button-secondary,
-  &.button-alternative-2 {
-    font-size: 16px;
-    line-height: 36px;
-    height: auto;
-    text-transform: none;
-    padding: 4px 16px;
-  }
-
   &.button-alternative {
     color: $inverted-text-color;
     background: $ui-primary-color;
@@ -135,7 +132,7 @@
   &.button-secondary {
     color: $darker-text-color;
     background: transparent;
-    padding: 3px 15px;
+    padding: 6px 17px;
     border: 1px solid $ui-primary-color;
 
     &:active,
@@ -143,6 +140,7 @@
     &:hover {
       border-color: lighten($ui-primary-color, 4%);
       color: lighten($darker-text-color, 4%);
+      text-decoration: none;
     }
 
     &:disabled {
@@ -150,6 +148,50 @@
     }
   }
 
+  &.button-tertiary {
+    background: transparent;
+    padding: 6px 17px;
+    color: $highlight-text-color;
+    border: 1px solid $highlight-text-color;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background: $ui-highlight-color;
+      color: $primary-text-color;
+      border: 0;
+      padding: 7px 18px;
+    }
+
+    &:disabled {
+      opacity: 0.5;
+    }
+
+    &.button--confirmation {
+      color: $valid-value-color;
+      border-color: $valid-value-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        background: $valid-value-color;
+        color: $primary-text-color;
+      }
+    }
+
+    &.button--destructive {
+      color: $error-value-color;
+      border-color: $error-value-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        background: $error-value-color;
+        color: $primary-text-color;
+      }
+    }
+  }
+
   &.button--block {
     display: block;
     width: 100%;
@@ -179,6 +221,11 @@
   transition-property: background-color, color;
   text-decoration: none;
 
+  a {
+    color: inherit;
+    text-decoration: none;
+  }
+
   &:hover,
   &:active,
   &:focus {
@@ -256,11 +303,12 @@
     display: inline-flex;
     align-items: center;
     width: auto !important;
+    padding: 0 4px 0 2px;
   }
 
   &__counter {
     display: inline-block;
-    width: 14px;
+    width: auto;
     margin-left: 4px;
     font-size: 12px;
     font-weight: 500;
@@ -344,12 +392,11 @@
 }
 
 .compose-form {
-  padding: 10px;
+  padding: 15px;
 
   &__sensitive-button {
     padding: 10px;
     padding-top: 0;
-
     font-size: 14px;
     font-weight: 500;
 
@@ -357,7 +404,7 @@
       color: $highlight-text-color;
     }
 
-    input[type=checkbox] {
+    input[type="checkbox"] {
       display: none;
     }
 
@@ -604,30 +651,24 @@
         display: flex;
         align-items: flex-start;
         justify-content: space-between;
-        opacity: 0;
-        transition: opacity .1s ease;
+      }
 
-        .icon-button {
-          flex: 0 1 auto;
-          color: $secondary-text-color;
-          font-size: 14px;
-          font-weight: 500;
-          padding: 10px;
-          font-family: inherit;
+      .icon-button {
+        flex: 0 1 auto;
+        color: $secondary-text-color;
+        font-size: 14px;
+        font-weight: 500;
+        padding: 10px;
+        font-family: inherit;
 
-          &:hover,
-          &:focus,
-          &:active {
-            color: lighten($secondary-text-color, 7%);
-          }
-        }
-
-        &.active {
-          opacity: 1;
+        &:hover,
+        &:focus,
+        &:active {
+          color: lighten($secondary-text-color, 7%);
         }
       }
 
-      &-description {
+      &__warning {
         position: absolute;
         z-index: 2;
         bottom: 0;
@@ -635,34 +676,6 @@
         right: 0;
         box-sizing: border-box;
         background: linear-gradient(0deg, rgba($base-shadow-color, 0.8) 0, rgba($base-shadow-color, 0.35) 80%, transparent);
-        padding: 10px;
-        opacity: 0;
-        transition: opacity .1s ease;
-
-        textarea {
-          background: transparent;
-          color: $secondary-text-color;
-          border: 0;
-          padding: 0;
-          margin: 0;
-          width: 100%;
-          font-family: inherit;
-          font-size: 14px;
-          font-weight: 500;
-
-          &:focus {
-            color: $white;
-          }
-
-          &::placeholder {
-            opacity: 0.75;
-            color: $secondary-text-color;
-          }
-        }
-
-        &.active {
-          opacity: 1;
-        }
       }
     }
 
@@ -726,7 +739,7 @@
 
     .compose-form__publish-button-wrapper {
       overflow: hidden;
-      padding-top: 10px;
+      padding-top: 15px;
     }
   }
 }
@@ -747,11 +760,38 @@
   transition: height 0.4s ease, opacity 0.4s ease;
 }
 
+.sign-in-banner {
+  padding: 10px;
+
+  p {
+    color: $darker-text-color;
+    margin-bottom: 20px;
+
+    a {
+      color: $secondary-text-color;
+      text-decoration: none;
+      unicode-bidi: isolate;
+
+      &:hover {
+        text-decoration: underline;
+
+        .fa {
+          color: lighten($dark-text-color, 7%);
+        }
+      }
+    }
+  }
+
+  .button {
+    margin-bottom: 10px;
+  }
+}
+
 .emojione {
   font-size: inherit;
   vertical-align: middle;
   object-fit: contain;
-  margin: -.2ex .15em .2ex;
+  margin: -0.2ex 0.15em 0.2ex;
   width: 16px;
   height: 16px;
 
@@ -807,7 +847,7 @@
 .reply-indicator__content {
   position: relative;
   font-size: 15px;
-  line-height: 20px;
+  line-height: 22px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
@@ -872,13 +912,14 @@
   }
 
   a.unhandled-link {
-    color: lighten($ui-highlight-color, 8%);
+    color: $highlight-text-color;
   }
 
   .status__content__spoiler-link {
     background: $action-button-color;
 
-    &:hover {
+    &:hover,
+    &:focus {
       background: lighten($action-button-color, 7%);
       text-decoration: none;
     }
@@ -941,24 +982,24 @@
     }
 
     &.unhandled-link {
-      color: lighten($ui-highlight-color, 8%);
+      color: $highlight-text-color;
     }
   }
 }
 
 .status__content.status__content--collapsed {
-  max-height: 20px * 15; // 15 lines is roughly above 500 characters
+  max-height: 22px * 15; // 15 lines is roughly above 500 characters
 }
 
 .status__content__read-more-button {
   display: block;
   font-size: 15px;
-  line-height: 20px;
-  color: lighten($ui-highlight-color, 8%);
+  line-height: 22px;
+  color: $highlight-text-color;
   border: 0;
   background: transparent;
   padding: 0;
-  padding-top: 8px;
+  padding-top: 16px;
   text-decoration: none;
 
   &:hover,
@@ -967,6 +1008,15 @@
   }
 }
 
+.translate-button {
+  margin-top: 16px;
+  font-size: 15px;
+  line-height: 22px;
+  display: flex;
+  justify-content: space-between;
+  color: $dark-text-color;
+}
+
 .status__content__spoiler-link {
   display: inline-block;
   border-radius: 2px;
@@ -979,7 +1029,7 @@
   text-transform: uppercase;
   line-height: 20px;
   cursor: pointer;
-  vertical-align: middle;
+  vertical-align: top;
 }
 
 .status__wrapper--filtered {
@@ -994,11 +1044,21 @@
   width: 100%;
   clear: both;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
 
-.status__prepend-icon-wrapper {
-  left: -26px;
-  position: absolute;
+  &__button {
+    display: inline;
+    color: lighten($ui-highlight-color, 8%);
+    border: 0;
+    background: transparent;
+    padding: 0;
+    font-size: inherit;
+    line-height: inherit;
+
+    &:hover,
+    &:active {
+      text-decoration: underline;
+    }
+  }
 }
 
 .focusable {
@@ -1014,19 +1074,11 @@
 }
 
 .status {
-  padding: 8px 10px;
-  padding-left: 68px;
-  position: relative;
+  padding: 16px;
   min-height: 54px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: auto;
 
-  @supports (-ms-overflow-style: -ms-autohiding-scrollbar) {
-    // Add margin to avoid Edge auto-hiding scrollbar appearing over content.
-    // On Edge 16 this is 16px and Edge <=15 it's 12px, so aim for 16px.
-    padding-right: 26px; // 10px + 16px
-  }
-
   @keyframes fade {
     0% { opacity: 0; }
     100% { opacity: 1; }
@@ -1035,9 +1087,11 @@
   opacity: 1;
   animation: fade 150ms linear;
 
+  .media-gallery,
   .video-player,
-  .audio-player {
-    margin-top: 8px;
+  .audio-player,
+  .attachment-list {
+    margin-top: 16px;
   }
 
   &.light {
@@ -1065,11 +1119,12 @@
         color: $highlight-text-color;
       }
 
-      a.status__content__spoiler-link {
+      &__spoiler-link {
         color: $primary-text-color;
         background: $ui-primary-color;
 
-        &:hover {
+        &:hover,
+        &:focus {
           background: lighten($ui-primary-color, 8%);
         }
       }
@@ -1077,7 +1132,16 @@
   }
 }
 
-.status__relative-time,
+.status__relative-time {
+  display: block;
+  font-size: 15px;
+  line-height: 22px;
+  height: 40px;
+  order: 2;
+  flex: 0 0 auto;
+  color: $dark-text-color;
+}
+
 .notification__relative_time {
   color: $dark-text-color;
   float: right;
@@ -1094,60 +1158,82 @@
 }
 
 .status__info .status__display-name {
-  display: block;
   max-width: 100%;
-  padding-right: 25px;
-}
-
-.status__info {
-  font-size: 15px;
-}
-
-.status-check-box {
-  border-bottom: 1px solid $ui-secondary-color;
   display: flex;
+  font-size: 15px;
+  line-height: 22px;
+  align-items: center;
+  gap: 10px;
+  overflow: hidden;
 
-  .status-check-box__status {
-    margin: 10px 0 10px 10px;
-    flex: 1;
-    overflow: hidden;
-
-    .media-gallery {
-      max-width: 250px;
+  .display-name {
+    bdi {
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
-    .status__content {
-      padding: 0;
-      white-space: normal;
-    }
-
-    .video-player,
-    .audio-player {
-      margin-top: 8px;
-      max-width: 250px;
-    }
-
-    .media-gallery__item-thumbnail {
-      cursor: default;
+    &__account {
+      white-space: nowrap;
+      display: block;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
 }
 
-.status-check-box-toggle {
-  align-items: center;
+.status__info {
+  font-size: 15px;
+  margin-bottom: 10px;
   display: flex;
-  flex: 0 0 auto;
-  justify-content: center;
-  padding: 10px;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+}
+
+.status-check-box__status {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 10px;
+
+  .detailed-status__display-name {
+    color: lighten($inverted-text-color, 16%);
+
+    span {
+      display: inline;
+    }
+
+    &:hover strong {
+      text-decoration: none;
+    }
+  }
+
+  .media-gallery,
+  .audio-player,
+  .video-player {
+    margin-top: 15px;
+    max-width: 250px;
+  }
+
+  .status__content {
+    padding: 0;
+    white-space: normal;
+  }
+
+  .media-gallery__item-thumbnail {
+    cursor: default;
+  }
 }
 
 .status__prepend {
-  margin-left: 68px;
+  padding: 16px;
+  padding-bottom: 0;
+  display: flex;
+  gap: 10px;
+  font-size: 15px;
+  line-height: 22px;
+  font-weight: 500;
   color: $dark-text-color;
-  padding: 8px 0;
-  padding-bottom: 2px;
-  font-size: 14px;
-  position: relative;
 
   .status__display-name strong {
     color: $dark-text-color;
@@ -1161,22 +1247,11 @@
 }
 
 .status__action-bar {
-  align-items: center;
   display: flex;
-  margin-top: 8px;
-}
-
-.status__action-bar-button {
-  margin-right: 18px;
-
-  &.icon-button--with-counter {
-    margin-right: 14px;
-  }
-}
-
-.status__action-bar-dropdown {
-  height: 23.15px;
-  width: 23.15px;
+  justify-content: space-between;
+  align-items: center;
+  gap: 18px;
+  margin-top: 16px;
 }
 
 .detailed-status__action-bar-dropdown {
@@ -1189,7 +1264,7 @@
 
 .detailed-status {
   background: lighten($ui-base-color, 4%);
-  padding: 14px 10px;
+  padding: 16px;
 
   &--flex {
     display: flex;
@@ -1219,14 +1294,15 @@
     }
   }
 
+  .media-gallery,
   .video-player,
   .audio-player {
-    margin-top: 8px;
+    margin-top: 16px;
   }
 }
 
 .detailed-status__meta {
-  margin-top: 15px;
+  margin-top: 16px;
   color: $dark-text-color;
   font-size: 14px;
   line-height: 18px;
@@ -1251,6 +1327,7 @@
   display: inline-block;
   font-weight: 500;
   font-size: 12px;
+  line-height: 17px;
   margin-left: 6px;
 }
 
@@ -1288,7 +1365,7 @@
 }
 
 .account {
-  padding: 10px;
+  padding: 16px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   &.compact {
@@ -1302,7 +1379,9 @@
 
   .account__display-name {
     flex: 1 1 auto;
-    display: block;
+    display: flex;
+    align-items: center;
+    gap: 10px;
     color: $darker-text-color;
     overflow: hidden;
     text-decoration: none;
@@ -1335,22 +1414,22 @@
 
 .account__wrapper {
   display: flex;
-}
-
-.account__avatar-wrapper {
-  float: left;
-  margin-left: 12px;
-  margin-right: 12px;
+  gap: 10px;
 }
 
 .account__avatar {
   @include avatar-radius;
+
   display: block;
   position: relative;
+  overflow: hidden;
 
-  width: 36px;
-  height: 36px;
-  background-size: 36px 36px;
+  img {
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
 
   &-inline {
     display: inline-block;
@@ -1359,7 +1438,6 @@
   }
 
   &-composite {
-    @include avatar-radius;
     border-radius: 50%;
     overflow: hidden;
     position: relative;
@@ -1370,6 +1448,11 @@
       box-sizing: border-box;
     }
 
+    .account__avatar {
+      width: 100% !important;
+      height: 100% !important;
+    }
+
     &__label {
       display: block;
       position: absolute;
@@ -1389,33 +1472,13 @@ a .account__avatar {
 }
 
 .account__avatar-overlay {
-  @include avatar-size(48px);
-
-  &-base {
-    @include avatar-radius;
-    @include avatar-size(36px);
-
-    img {
-      @include avatar-radius;
-      width: 100%;
-      height: 100%;
-    }
-  }
+  position: relative;
 
   &-overlay {
-    @include avatar-radius;
-    @include avatar-size(24px);
-
     position: absolute;
     bottom: 0;
     right: 0;
     z-index: 1;
-
-    img {
-      @include avatar-radius;
-      width: 100%;
-      height: 100%;
-    }
   }
 }
 
@@ -1586,10 +1649,13 @@ a.account__display-name {
 }
 
 .detailed-status__display-name {
-  color: $secondary-text-color;
-  display: block;
-  line-height: 24px;
-  margin-bottom: 15px;
+  color: $darker-text-color;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 15px;
+  line-height: 22px;
+  margin-bottom: 16px;
   overflow: hidden;
 
   strong,
@@ -1600,31 +1666,13 @@ a.account__display-name {
   }
 
   strong {
-    font-size: 16px;
     color: $primary-text-color;
   }
 }
 
-.detailed-status__display-avatar {
-  float: left;
-  margin-right: 10px;
-}
-
 .status__avatar {
-  height: 48px;
-  left: 10px;
-  position: absolute;
-  top: 10px;
-  width: 48px;
-}
-
-.status__expand {
-  width: 68px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100%;
-  cursor: pointer;
+  width: 46px;
+  height: 46px;
 }
 
 .muted {
@@ -1646,21 +1694,61 @@ a.account__display-name {
     background: $ui-base-lighter-color;
     color: $inverted-text-color;
 
-    &:hover {
+    &:hover,
+    &:focus {
       background: lighten($ui-base-lighter-color, 7%);
       text-decoration: none;
     }
   }
 }
 
+.notification__report {
+  padding: 16px;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  gap: 10px;
+
+  &__avatar {
+    flex: 0 0 auto;
+  }
+
+  &__details {
+    flex: 1 1 auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $darker-text-color;
+    gap: 10px;
+    font-size: 15px;
+    line-height: 22px;
+    white-space: nowrap;
+    overflow: hidden;
+
+    & > div {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    strong {
+      font-weight: 500;
+    }
+  }
+
+  &__actions {
+    flex: 0 0 auto;
+  }
+}
+
 .notification__message {
-  margin: 0 10px 0 68px;
-  padding: 8px 0 0;
+  padding: 16px;
+  padding-bottom: 0;
   cursor: default;
   color: $darker-text-color;
   font-size: 15px;
   line-height: 22px;
-  position: relative;
+  font-weight: 500;
+  display: flex;
+  gap: 10px;
 
   .fa {
     color: $highlight-text-color;
@@ -1674,9 +1762,6 @@ a.account__display-name {
 }
 
 .notification__favourite-icon-wrapper {
-  left: -26px;
-  position: absolute;
-
   .star-icon {
     color: $gold-star;
   }
@@ -1710,15 +1795,10 @@ a.account__display-name {
   text-decoration: none;
 
   &:hover {
-    color: $primary-text-color;
     text-decoration: underline;
   }
 }
 
-.notification__relative_time {
-  float: right;
-}
-
 .display-name {
   display: block;
   max-width: 100%;
@@ -1731,10 +1811,6 @@ a.account__display-name {
   font-weight: 500;
 }
 
-.display-name__account {
-  font-size: 14px;
-}
-
 .status__relative-time,
 .detailed-status__datetime {
   &:hover {
@@ -1772,10 +1848,14 @@ a.account__display-name {
     object-fit: contain;
   }
 
-  .loading-bar {
+  .loading-bar__container {
     position: relative;
   }
 
+  .loading-bar {
+    position: absolute;
+  }
+
   &.image-loader--amorphous .image-loader__preview-canvas {
     display: none;
   }
@@ -1799,11 +1879,12 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 10px;
+  padding: 15px;
   display: flex;
   align-items: center;
   flex-shrink: 0;
   cursor: default;
+  gap: 10px;
   color: $darker-text-color;
 
   strong {
@@ -1812,9 +1893,6 @@ a.account__display-name {
 
   a {
     color: inherit;
-  }
-
-  .permalink {
     text-decoration: none;
   }
 
@@ -1838,9 +1916,7 @@ a.account__display-name {
 
 .navigation-bar__profile {
   flex: 1 1 auto;
-  margin-left: 8px;
   line-height: 20px;
-  margin-top: -1px;
   overflow: hidden;
 }
 
@@ -1878,8 +1954,47 @@ a.account__display-name {
   box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
   z-index: 9999;
 
-  ul {
-    list-style: none;
+  &__text-button {
+    display: inline;
+    color: inherit;
+    background: transparent;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+
+    &:focus {
+      outline: 1px dotted;
+    }
+  }
+
+  &__container {
+    &__header {
+      border-bottom: 1px solid darken($ui-secondary-color, 8%);
+      padding: 4px 14px;
+      padding-bottom: 8px;
+      font-size: 13px;
+      line-height: 18px;
+      color: $inverted-text-color;
+    }
+
+    &__list {
+      list-style: none;
+
+      &--scrollable {
+        max-height: 300px;
+        overflow-y: scroll;
+      }
+    }
+
+    &--loading {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 30px 45px;
+    }
   }
 
   &.left {
@@ -1935,18 +2050,29 @@ a.account__display-name {
 }
 
 .dropdown-menu__item {
-  a {
-    font-size: 13px;
-    line-height: 18px;
+  font-size: 13px;
+  line-height: 18px;
+  display: block;
+  color: $inverted-text-color;
+
+  a,
+  button {
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
     display: block;
+    width: 100%;
     padding: 4px 14px;
+    border: 0;
+    margin: 0;
     box-sizing: border-box;
     text-decoration: none;
     background: $ui-secondary-color;
-    color: $inverted-text-color;
+    color: inherit;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    text-align: inherit;
 
     &:focus,
     &:hover,
@@ -1958,6 +2084,42 @@ a.account__display-name {
   }
 }
 
+.dropdown-menu__item--text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 4px 14px;
+}
+
+.dropdown-menu__item.edited-timestamp__history__item {
+  border-bottom: 1px solid darken($ui-secondary-color, 8%);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &.dropdown-menu__item--text,
+  a,
+  button {
+    padding: 8px 14px;
+  }
+}
+
+.inline-account {
+  display: inline-flex;
+  align-items: center;
+  vertical-align: top;
+
+  .account__avatar {
+    margin-right: 5px;
+    border-radius: 50%;
+  }
+
+  strong {
+    font-weight: 600;
+  }
+}
+
 .dropdown--active .dropdown__content {
   display: block;
   line-height: 18px;
@@ -2056,27 +2218,68 @@ a.account__display-name {
     &__main {
       box-sizing: border-box;
       width: 100%;
-      max-width: 600px;
       flex: 0 0 auto;
       display: flex;
       flex-direction: column;
 
       @media screen and (min-width: $no-gap-breakpoint) {
         padding: 0 10px;
+        max-width: 600px;
       }
     }
   }
 }
 
+$ui-header-height: 55px;
+
+.ui__header {
+  display: none;
+  box-sizing: border-box;
+  height: $ui-header-height;
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  justify-content: space-between;
+  align-items: center;
+  overflow: hidden;
+
+  &__logo {
+    display: inline-flex;
+    padding: 15px;
+
+    .logo {
+      height: $ui-header-height - 30px;
+      width: auto;
+    }
+  }
+
+  &__links {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 0 10px;
+    overflow: hidden;
+
+    .button {
+      flex: 0 0 auto;
+    }
+
+    .button-tertiary {
+      flex-shrink: 1;
+    }
+  }
+}
+
 .tabs-bar__wrapper {
   background: darken($ui-base-color, 8%);
   position: sticky;
-  top: 0;
+  top: $ui-header-height;
   z-index: 2;
   padding-top: 0;
 
   @media screen and (min-width: $no-gap-breakpoint) {
     padding-top: 10px;
+    top: 0;
   }
 
   .tabs-bar {
@@ -2113,6 +2316,8 @@ a.account__display-name {
 
   > .scrollable {
     background: $ui-base-color;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
   }
 }
 
@@ -2247,17 +2452,7 @@ a.account__display-name {
     padding: 0;
   }
 
-  .directory__list {
-    display: grid;
-    grid-gap: 10px;
-    grid-template-columns: minmax(0, 50%) minmax(0, 50%);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      display: block;
-    }
-  }
-
-  .directory__card {
+  .account-card {
     margin-bottom: 0;
   }
 
@@ -2283,7 +2478,7 @@ a.account__display-name {
   .scrollable {
     overflow: visible;
 
-    @supports(display: grid) {
+    @supports (display: grid) {
       contain: content;
     }
   }
@@ -2292,117 +2487,6 @@ a.account__display-name {
     padding: 10px 0;
     padding-top: 0;
   }
-
-  @media screen and (min-width: 630px) {
-    .detailed-status {
-      padding: 15px;
-
-      .media-gallery,
-      .video-player,
-      .audio-player {
-        margin-top: 15px;
-      }
-    }
-
-    .account__header__bar {
-      padding: 5px 10px;
-    }
-
-    .navigation-bar,
-    .compose-form {
-      padding: 15px;
-    }
-
-    .compose-form .compose-form__publish .compose-form__publish-button-wrapper {
-      padding-top: 15px;
-    }
-
-    .status {
-      padding: 15px 15px 15px (48px + 15px * 2);
-      min-height: 48px + 2px;
-
-      &__avatar {
-        left: 15px;
-        top: 17px;
-      }
-
-      &__content {
-        padding-top: 5px;
-      }
-
-      &__prepend {
-        margin-left: 48px + 15px * 2;
-        padding-top: 15px;
-      }
-
-      &__prepend-icon-wrapper {
-        left: -32px;
-      }
-
-      .media-gallery,
-      &__action-bar,
-      .video-player,
-      .audio-player {
-        margin-top: 10px;
-      }
-    }
-
-    .account {
-      padding: 15px 10px;
-
-      &__header__bio {
-        margin: 0 -10px;
-      }
-    }
-
-    .notification {
-      &__message {
-        margin-left: 48px + 15px * 2;
-        padding-top: 15px;
-      }
-
-      &__favourite-icon-wrapper {
-        left: -32px;
-      }
-
-      .status {
-        padding-top: 8px;
-      }
-
-      .account {
-        padding-top: 8px;
-      }
-
-      .account__avatar-wrapper {
-        margin-left: 17px;
-        margin-right: 15px;
-      }
-    }
-  }
-}
-
-.floating-action-button {
-  position: fixed;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 3.9375rem;
-  height: 3.9375rem;
-  bottom: 1.3125rem;
-  right: 1.3125rem;
-  background: darken($ui-highlight-color, 3%);
-  color: $white;
-  border-radius: 50%;
-  font-size: 21px;
-  line-height: 21px;
-  text-decoration: none;
-  box-shadow: 2px 3px 9px rgba($base-shadow-color, 0.4);
-
-  &:hover,
-  &:focus,
-  &:active {
-    background: lighten($ui-highlight-color, 7%);
-  }
 }
 
 @media screen and (min-width: $no-gap-breakpoint) {
@@ -2414,20 +2498,10 @@ a.account__display-name {
     height: calc(100% - 10px) !important;
   }
 
-  .getting-started__wrapper,
-  .search {
+  .getting-started__wrapper {
     margin-bottom: 10px;
   }
-}
 
-@media screen and (max-width: 600px + (285px * 1) + (10px * 1)) {
-  .columns-area__panels__pane--compositional {
-    display: none;
-  }
-}
-
-@media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
-  .floating-action-button,
   .tabs-bar__link.optional {
     display: none;
   }
@@ -2435,18 +2509,98 @@ a.account__display-name {
   .search-page .search {
     display: none;
   }
-}
 
-@media screen and (max-width: 600px + (285px * 2) + (10px * 2)) {
-  .columns-area__panels__pane--navigational {
+  .navigation-panel__legal {
     display: none;
   }
 }
 
-@media screen and (min-width: 600px + (285px * 2) + (10px * 2)) {
-  .tabs-bar {
+@media screen and (max-width: $no-gap-breakpoint - 1px) {
+  $sidebar-width: 285px;
+
+  .columns-area__panels__main {
+    width: calc(100% - $sidebar-width);
+  }
+
+  .columns-area__panels {
+    min-height: calc(100vh - $ui-header-height);
+  }
+
+  .columns-area__panels__pane--navigational {
+    min-width: $sidebar-width;
+
+    .columns-area__panels__pane__inner {
+      width: $sidebar-width;
+    }
+
+    .navigation-panel {
+      margin: 0;
+      background: $ui-base-color;
+      border-left: 1px solid lighten($ui-base-color, 8%);
+      height: 100vh;
+    }
+
+    .navigation-panel__sign-in-banner,
+    .navigation-panel__logo,
+    .getting-started__trends {
+      display: none;
+    }
+
+    .column-link__icon {
+      font-size: 18px;
+    }
+  }
+
+  .layout-single-column .ui__header {
+    display: flex;
+    background: $ui-base-color;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+  }
+
+  .column-header,
+  .column-back-button,
+  .scrollable,
+  .error-column {
+    border-radius: 0 !important;
+  }
+}
+
+@media screen and (max-width: $no-gap-breakpoint - 285px - 1px) {
+  $sidebar-width: 55px;
+
+  .columns-area__panels__main {
+    width: calc(100% - $sidebar-width);
+  }
+
+  .columns-area__panels__pane--navigational {
+    min-width: $sidebar-width;
+
+    .columns-area__panels__pane__inner {
+      width: $sidebar-width;
+    }
+
+    .column-link span {
+      display: none;
+    }
+
+    .list-panel {
+      display: none;
+    }
+  }
+}
+
+.explore__search-header {
+  display: none;
+}
+
+@media screen and (max-width: $no-gap-breakpoint - 1px) {
+  .columns-area__panels__pane--compositional {
     display: none;
   }
+
+  .explore__search-header {
+    display: flex;
+  }
 }
 
 .icon-with-badge {
@@ -2487,7 +2641,6 @@ a.account__display-name {
   padding: 40px;
 
   .logo {
-    fill: $primary-text-color;
     width: 50px;
     margin: 0 auto;
     margin-bottom: 40px;
@@ -2515,7 +2668,7 @@ a.account__display-name {
 
 .column-actions {
   display: flex;
-  align-items: start;
+  align-items: flex-start;
   justify-content: center;
   padding: 40px;
   padding-top: 40px;
@@ -2556,15 +2709,28 @@ a.account__display-name {
   height: calc(100% - 10px);
   overflow-y: hidden;
 
-  .navigation-bar {
-    padding-top: 20px;
-    padding-bottom: 20px;
-    flex: 0 1 48px;
-    min-height: 20px;
+  .hero-widget {
+    box-shadow: none;
+
+    &__text,
+    &__img,
+    &__img img {
+      border-radius: 0;
+    }
+
+    &__text {
+      padding: 15px;
+      color: $secondary-text-color;
+
+      strong {
+        font-weight: 700;
+        color: $primary-text-color;
+      }
+    }
   }
 
-  .flex-spacer {
-    background: transparent;
+  .navigation-bar {
+    flex: 0 1 48px;
   }
 
   .compose-form {
@@ -2605,6 +2771,14 @@ a.account__display-name {
     flex: 0 0 auto;
   }
 
+  .logo {
+    height: 30px;
+    width: auto;
+  }
+}
+
+.navigation-panel,
+.compose-panel {
   hr {
     flex: 0 0 auto;
     border: 0;
@@ -2702,7 +2876,7 @@ a.account__display-name {
     overflow-y: auto;
   }
 
-  @supports(display: grid) { // hack to fix Chrome <57
+  @supports (display: grid) { // hack to fix Chrome <57
     contain: strict;
   }
 
@@ -2716,10 +2890,14 @@ a.account__display-name {
     position: relative;
     min-height: 120px;
   }
+
+  .scrollable {
+    flex: 1 1 auto;
+  }
 }
 
 .scrollable.fullscreen {
-  @supports(display: grid) { // hack to fix Chrome <57
+  @supports (display: grid) { // hack to fix Chrome <57
     contain: none;
   }
 }
@@ -2728,6 +2906,7 @@ a.account__display-name {
   box-sizing: border-box;
   width: 100%;
   background: lighten($ui-base-color, 4%);
+  border-radius: 4px 4px 0 0;
   color: $highlight-text-color;
   cursor: pointer;
   flex: 0 0 auto;
@@ -2827,11 +3006,11 @@ a.account__display-name {
 }
 
 .react-toggle--checked .react-toggle-track {
-  background-color: $ui-highlight-color;
+  background-color: darken($ui-highlight-color, 2%);
 }
 
 .react-toggle--checked:is(:hover, :focus-within):not(.react-toggle--disabled) .react-toggle-track {
-  background-color: lighten($ui-highlight-color, 10%);
+  background-color: $ui-highlight-color;
 }
 
 .react-toggle-track-check {
@@ -2897,6 +3076,8 @@ a.account__display-name {
   font-size: 16px;
   padding: 15px;
   text-decoration: none;
+  overflow: hidden;
+  white-space: nowrap;
 
   &:hover,
   &:focus,
@@ -2920,7 +3101,18 @@ a.account__display-name {
     }
 
     &.active {
-      color: $ui-highlight-color;
+      color: $highlight-text-color;
+    }
+  }
+
+  &--logo {
+    background: transparent;
+    padding: 10px;
+
+    &:hover,
+    &:focus,
+    &:active {
+      background: transparent;
     }
   }
 }
@@ -2969,43 +3161,6 @@ a.account__display-name {
   color: $dark-text-color;
   overflow: auto;
 
-  &__footer {
-    flex: 0 0 auto;
-    padding: 10px;
-    padding-top: 20px;
-    z-index: 1;
-
-    ul {
-      margin-bottom: 10px;
-    }
-
-    ul li {
-      display: inline;
-    }
-
-    p {
-      color: $dark-text-color;
-      font-size: 13px;
-      margin-bottom: 20px;
-
-      a {
-        color: $dark-text-color;
-        text-decoration: underline;
-      }
-    }
-
-    a {
-      text-decoration: none;
-      color: $darker-text-color;
-
-      &:hover,
-      &:focus,
-      &:active {
-        text-decoration: underline;
-      }
-    }
-  }
-
   &__trends {
     flex: 0 1 auto;
     opacity: 1;
@@ -3013,12 +3168,16 @@ a.account__display-name {
     margin-top: 10px;
 
     h4 {
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      padding: 10px;
       font-size: 12px;
       text-transform: uppercase;
-      color: $darker-text-color;
-      padding: 10px;
       font-weight: 500;
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+      a {
+        color: $darker-text-color;
+        text-decoration: none;
+      }
     }
 
     @media screen and (max-height: 810px) {
@@ -3072,23 +3231,49 @@ a.account__display-name {
 .setting-text {
   display: block;
   box-sizing: border-box;
-  width: 100%;
   margin: 0;
-  color: $darker-text-color;
-  background: transparent;
-  padding: 7px 0;
+  color: $inverted-text-color;
+  background: $white;
+  padding: 7px 10px;
   font-family: inherit;
   font-size: 14px;
-  resize: vertical;
-  border: 0;
-  border-bottom: 2px solid $ui-primary-color;
-  outline: 0;
+  line-height: 22px;
+  border-radius: 4px;
+  border: 1px solid $white;
 
-  &:focus,
-  &:active {
-    color: $primary-text-color;
-    border-bottom-color: $ui-highlight-color;
+  &:focus {
     outline: 0;
+    border-color: lighten($ui-highlight-color, 12%);
+  }
+
+  &__wrapper {
+    background: $white;
+    border: 1px solid $ui-secondary-color;
+    margin-bottom: 10px;
+    border-radius: 4px;
+
+    .setting-text {
+      border: 0;
+      margin-bottom: 0;
+      border-radius: 0;
+
+      &:focus {
+        border: 0;
+      }
+    }
+
+    &__modifiers {
+      color: $inverted-text-color;
+      font-family: inherit;
+      font-size: 14px;
+      background: $white;
+    }
+  }
+
+  &__toolbar {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
   }
 
   @media screen and (max-width: 600px) {
@@ -3353,14 +3538,14 @@ a.status-card.compact:hover {
   }
 
   a {
-    color: lighten($ui-highlight-color, 8%);
+    color: $highlight-text-color;
     text-decoration: none;
 
     &:hover,
     &:focus,
     &:active {
       text-decoration: underline;
-      color: lighten($ui-highlight-color, 12%);
+      color: lighten($highlight-text-color, 4%);
     }
   }
 }
@@ -3443,6 +3628,7 @@ a.status-card.compact:hover {
   display: flex;
   font-size: 16px;
   background: lighten($ui-base-color, 4%);
+  border-radius: 4px 4px 0 0;
   flex: 0 0 auto;
   cursor: pointer;
   position: relative;
@@ -3515,6 +3701,11 @@ a.status-card.compact:hover {
       background: lighten($ui-base-color, 8%);
     }
   }
+
+  &:disabled {
+    color: $dark-text-color;
+    cursor: default;
+  }
 }
 
 .column-header__collapsible {
@@ -3620,36 +3811,48 @@ a.status-card.compact:hover {
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 
-  span {
-    display: block;
-    float: left;
-    transform: translateX(-50%);
-    margin: 82px 0 0 50%;
-    white-space: nowrap;
+.circular-progress {
+  color: lighten($ui-base-color, 26%);
+  animation: 1.4s linear 0s infinite normal none running simple-rotate;
+
+  circle {
+    stroke: currentColor;
+    stroke-dasharray: 80px, 200px;
+    stroke-dashoffset: 0;
+    animation: circular-progress 1.4s ease-in-out infinite;
   }
 }
 
-.loading-indicator__figure {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 42px;
-  height: 42px;
-  box-sizing: border-box;
-  background-color: transparent;
-  border: 0 solid lighten($ui-base-color, 26%);
-  border-width: 6px;
-  border-radius: 50%;
+@keyframes circular-progress {
+  0% {
+    stroke-dasharray: 1px, 200px;
+    stroke-dashoffset: 0;
+  }
+
+  50% {
+    stroke-dasharray: 100px, 200px;
+    stroke-dashoffset: -15px;
+  }
+
+  100% {
+    stroke-dasharray: 100px, 200px;
+    stroke-dashoffset: -125px;
+  }
 }
 
-.no-reduce-motion .loading-indicator span {
-  animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
-}
+@keyframes simple-rotate {
+  0% {
+    transform: rotate(0deg);
+  }
 
-.no-reduce-motion .loading-indicator__figure {
-  animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
+  100% {
+    transform: rotate(360deg);
+  }
 }
 
 @keyframes spring-rotate-in {
@@ -3696,40 +3899,6 @@ a.status-card.compact:hover {
   }
 }
 
-@keyframes loader-figure {
-  0% {
-    width: 0;
-    height: 0;
-    background-color: lighten($ui-base-color, 26%);
-  }
-
-  29% {
-    background-color: lighten($ui-base-color, 26%);
-  }
-
-  30% {
-    width: 42px;
-    height: 42px;
-    background-color: transparent;
-    border-width: 21px;
-    opacity: 1;
-  }
-
-  100% {
-    width: 42px;
-    height: 42px;
-    border-width: 0;
-    opacity: 0;
-    background-color: transparent;
-  }
-}
-
-@keyframes loader-label {
-  0% { opacity: 0.25; }
-  30% { opacity: 1; }
-  100% { opacity: 0.25; }
-}
-
 .video-error-cover {
   align-items: center;
   background: $base-overlay-background;
@@ -3949,6 +4118,7 @@ a.status-card.compact:hover {
 
     &__menu {
       @include search-popout;
+
       padding: 0;
       background: $ui-secondary-color;
     }
@@ -4006,8 +4176,16 @@ a.status-card.compact:hover {
   vertical-align: middle;
 }
 
+.limited-account-hint {
+  p {
+    color: $secondary-text-color;
+    font-size: 15px;
+    font-weight: 500;
+    margin-bottom: 20px;
+  }
+}
+
 .empty-column-indicator,
-.error-column,
 .follow_requests-unlocked_explanation {
   color: $dark-text-color;
   background: $ui-base-color;
@@ -4021,12 +4199,12 @@ a.status-card.compact:hover {
   align-items: center;
   justify-content: center;
 
-  @supports(display: grid) { // hack to fix Chrome <57
+  @supports (display: grid) { // hack to fix Chrome <57
     contain: strict;
   }
 
   & > span {
-    max-width: 400px;
+    max-width: 500px;
   }
 
   a {
@@ -4045,7 +4223,48 @@ a.status-card.compact:hover {
 }
 
 .error-column {
+  padding: 20px;
+  background: $ui-base-color;
+  border-radius: 4px;
+  display: flex;
+  flex: 1 1 auto;
+  align-items: center;
+  justify-content: center;
   flex-direction: column;
+  cursor: default;
+
+  &__image {
+    width: 70%;
+    max-width: 350px;
+    margin-top: -50px;
+  }
+
+  &__message {
+    text-align: center;
+    color: $darker-text-color;
+    font-size: 15px;
+    line-height: 22px;
+
+    h1 {
+      font-size: 28px;
+      line-height: 33px;
+      font-weight: 700;
+      margin-bottom: 15px;
+      color: $primary-text-color;
+    }
+
+    p {
+      max-width: 48ch;
+    }
+
+    &__actions {
+      margin-top: 30px;
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      justify-content: center;
+    }
+  }
 }
 
 @keyframes heartbeat {
@@ -4247,7 +4466,7 @@ a.status-card.compact:hover {
   }
 }
 
-.upload-progess__message {
+.upload-progress__message {
   flex: 1 1 auto;
 }
 
@@ -4309,7 +4528,6 @@ a.status-card.compact:hover {
   background: $simple-background-color;
   box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
   border-radius: 4px;
-  margin-left: 40px;
   overflow: hidden;
   z-index: 2;
 
@@ -4410,7 +4628,73 @@ a.status-card.compact:hover {
   }
 }
 
+.language-dropdown {
+  &__dropdown {
+    position: absolute;
+    background: $simple-background-color;
+    box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+    border-radius: 4px;
+    overflow: hidden;
+    z-index: 2;
+
+    &.top {
+      transform-origin: 50% 100%;
+    }
+
+    &.bottom {
+      transform-origin: 50% 0;
+    }
+
+    .emoji-mart-search {
+      padding-right: 10px;
+    }
+
+    .emoji-mart-search-icon {
+      right: 10px + 5px;
+    }
+
+    .emoji-mart-scroll {
+      padding: 0 10px 10px;
+    }
+
+    &__results {
+      &__item {
+        cursor: pointer;
+        color: $inverted-text-color;
+        font-weight: 500;
+        padding: 10px;
+        border-radius: 4px;
+
+        &:focus,
+        &:active,
+        &:hover {
+          background: $ui-secondary-color;
+        }
+
+        &__common-name {
+          color: $darker-text-color;
+        }
+
+        &.active {
+          background: $ui-highlight-color;
+          color: $primary-text-color;
+          outline: 0;
+
+          .language-dropdown__dropdown__results__item__common-name {
+            color: $secondary-text-color;
+          }
+
+          &:hover {
+            background: lighten($ui-highlight-color, 4%);
+          }
+        }
+      }
+    }
+  }
+}
+
 .search {
+  margin-bottom: 10px;
   position: relative;
 }
 
@@ -4440,10 +4724,6 @@ a.status-card.compact:hover {
   &:focus {
     background: lighten($ui-base-color, 4%);
   }
-
-  @media screen and (max-width: 600px) {
-    font-size: 16px;
-  }
 }
 
 .search__icon {
@@ -4583,6 +4863,7 @@ a.status-card.compact:hover {
   left: 0;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -4774,7 +5055,7 @@ a.status-card.compact:hover {
   padding: 0;
   border: 0;
   font-size: 0;
-  transition: opacity .2s ease-in-out;
+  transition: opacity 0.2s ease-in-out;
 
   &.active {
     opacity: 1;
@@ -4829,7 +5110,6 @@ a.status-card.compact:hover {
     height: 100%;
     box-sizing: border-box;
     padding: 25px;
-    display: none;
     flex-direction: column;
     align-items: center;
     justify-content: center;
@@ -4929,7 +5209,8 @@ a.status-card.compact:hover {
 .report-modal,
 .actions-modal,
 .mute-modal,
-.block-modal {
+.block-modal,
+.compare-history-modal {
   background: lighten($ui-secondary-color, 8%);
   color: $inverted-text-color;
   border-radius: 8px;
@@ -4938,24 +5219,6 @@ a.status-card.compact:hover {
   width: 480px;
   position: relative;
   flex-direction: column;
-
-  .status__display-name {
-    display: block;
-    max-width: 100%;
-    padding-right: 25px;
-  }
-
-  .status__avatar {
-    height: 28px;
-    left: 10px;
-    position: absolute;
-    top: 10px;
-    width: 48px;
-  }
-
-  .status__content__spoiler-link {
-    color: lighten($secondary-text-color, 8%);
-  }
 }
 
 .actions-modal {
@@ -4987,9 +5250,9 @@ a.status-card.compact:hover {
 .block-modal__action-bar {
   display: flex;
   justify-content: space-between;
+  align-items: center;
   background: $ui-secondary-color;
-  padding: 10px;
-  line-height: 36px;
+  padding: 15px;
 
   & > div {
     flex: 1 1 auto;
@@ -5003,15 +5266,6 @@ a.status-card.compact:hover {
   }
 }
 
-.boost-modal__status-header {
-  font-size: 15px;
-}
-
-.boost-modal__status-time {
-  float: right;
-  font-size: 14px;
-}
-
 .mute-modal,
 .block-modal {
   line-height: 24px;
@@ -5027,6 +5281,218 @@ a.status-card.compact:hover {
   max-width: 700px;
 }
 
+.report-dialog-modal {
+  max-width: 90vw;
+  width: 480px;
+  height: 80vh;
+  background: lighten($ui-secondary-color, 8%);
+  color: $inverted-text-color;
+  border-radius: 8px;
+  overflow: hidden;
+  position: relative;
+  flex-direction: column;
+  display: flex;
+
+  &__container {
+    box-sizing: border-box;
+    border-top: 1px solid $ui-secondary-color;
+    padding: 20px;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    overflow: auto;
+  }
+
+  &__title {
+    font-size: 28px;
+    line-height: 33px;
+    font-weight: 700;
+    margin-bottom: 15px;
+
+    @media screen and (max-height: 800px) {
+      font-size: 22px;
+    }
+  }
+
+  &__subtitle {
+    font-size: 17px;
+    font-weight: 600;
+    line-height: 22px;
+    margin-bottom: 4px;
+  }
+
+  &__lead {
+    font-size: 17px;
+    line-height: 22px;
+    color: lighten($inverted-text-color, 16%);
+    margin-bottom: 30px;
+
+    a {
+      text-decoration: none;
+      color: $inverted-text-color;
+      font-weight: 500;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__actions {
+    margin-top: 30px;
+    display: flex;
+
+    .button {
+      flex: 1 1 auto;
+    }
+  }
+
+  &__statuses {
+    flex-grow: 1;
+    min-height: 0;
+    overflow: auto;
+  }
+
+  .status__content a {
+    color: $highlight-text-color;
+  }
+
+  .status__content,
+  .status__content p {
+    color: $inverted-text-color;
+  }
+
+  .status__content__spoiler-link {
+    color: $primary-text-color;
+    background: $ui-primary-color;
+
+    &:hover {
+      background: lighten($ui-primary-color, 8%);
+    }
+  }
+
+  .dialog-option .poll__input {
+    border-color: $inverted-text-color;
+    color: $ui-secondary-color;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+
+    svg {
+      width: 8px;
+      height: auto;
+    }
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: lighten($inverted-text-color, 15%);
+      border-width: 4px;
+    }
+
+    &.active {
+      border-color: $inverted-text-color;
+      background: $inverted-text-color;
+    }
+  }
+
+  .poll__option.dialog-option {
+    padding: 15px 0;
+    flex: 0 0 auto;
+    border-bottom: 1px solid $ui-secondary-color;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    & > .poll__option__text {
+      font-size: 13px;
+      color: lighten($inverted-text-color, 16%);
+
+      strong {
+        font-size: 17px;
+        font-weight: 500;
+        line-height: 22px;
+        color: $inverted-text-color;
+        display: block;
+        margin-bottom: 4px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  .flex-spacer {
+    background: transparent;
+  }
+
+  &__textarea {
+    display: block;
+    box-sizing: border-box;
+    width: 100%;
+    color: $inverted-text-color;
+    background: $simple-background-color;
+    padding: 10px;
+    font-family: inherit;
+    font-size: 17px;
+    line-height: 22px;
+    resize: vertical;
+    border: 0;
+    outline: 0;
+    border-radius: 4px;
+    margin: 20px 0;
+
+    &::placeholder {
+      color: $dark-text-color;
+    }
+
+    &:focus {
+      outline: 0;
+    }
+  }
+
+  &__toggle {
+    display: flex;
+    align-items: center;
+
+    & > span {
+      font-size: 17px;
+      font-weight: 500;
+      margin-left: 10px;
+    }
+  }
+
+  .button.button-secondary {
+    border-color: $inverted-text-color;
+    color: $inverted-text-color;
+    flex: 0 0 auto;
+
+    &:hover,
+    &:focus,
+    &:active {
+      border-color: lighten($inverted-text-color, 15%);
+      color: lighten($inverted-text-color, 15%);
+    }
+  }
+
+  hr {
+    border: 0;
+    background: transparent;
+    margin: 15px 0;
+  }
+
+  .emoji-mart-search {
+    padding-right: 10px;
+  }
+
+  .emoji-mart-search-icon {
+    right: 10px + 5px;
+  }
+}
+
 .report-modal__container {
   display: flex;
   border-top: 1px solid $ui-secondary-color;
@@ -5095,60 +5561,6 @@ a.status-card.compact:hover {
     margin-bottom: 20px;
   }
 
-  .setting-text {
-    display: block;
-    box-sizing: border-box;
-    width: 100%;
-    margin: 0;
-    color: $inverted-text-color;
-    background: $white;
-    padding: 10px;
-    font-family: inherit;
-    font-size: 14px;
-    resize: none;
-    border: 0;
-    outline: 0;
-    border-radius: 4px;
-    border: 1px solid $ui-secondary-color;
-    min-height: 100px;
-    max-height: 50vh;
-    margin-bottom: 10px;
-
-    &:focus {
-      border: 1px solid darken($ui-secondary-color, 8%);
-    }
-
-    &__wrapper {
-      background: $white;
-      border: 1px solid $ui-secondary-color;
-      margin-bottom: 10px;
-      border-radius: 4px;
-
-      .setting-text {
-        border: 0;
-        margin-bottom: 0;
-        border-radius: 0;
-
-        &:focus {
-          border: 0;
-        }
-      }
-
-      &__modifiers {
-        color: $inverted-text-color;
-        font-family: inherit;
-        font-size: 14px;
-        background: $white;
-      }
-    }
-
-    &__toolbar {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 20px;
-    }
-  }
-
   .setting-text-label {
     display: block;
     color: $inverted-text-color;
@@ -5157,6 +5569,14 @@ a.status-card.compact:hover {
     margin-bottom: 10px;
   }
 
+  .setting-text {
+    width: 100%;
+    resize: none;
+    min-height: 100px;
+    max-height: 50vh;
+    border: 0;
+  }
+
   .setting-toggle {
     margin-top: 20px;
     margin-bottom: 24px;
@@ -5331,10 +5751,51 @@ a.status-card.compact:hover {
   }
 }
 
+.compare-history-modal {
+  .report-modal__target {
+    border-bottom: 1px solid $ui-secondary-color;
+  }
+
+  &__container {
+    padding: 30px;
+    pointer-events: all;
+  }
+
+  .status__content {
+    color: $inverted-text-color;
+    font-size: 19px;
+    line-height: 24px;
+
+    .emojione {
+      width: 24px;
+      height: 24px;
+      margin: -1px 0 0;
+    }
+
+    a {
+      color: $highlight-text-color;
+    }
+
+    hr {
+      height: 0.25rem;
+      padding: 0;
+      background-color: $ui-secondary-color;
+      border: 0;
+      margin: 20px 0;
+    }
+  }
+
+  .media-gallery,
+  .audio-player,
+  .video-player {
+    margin-top: 15px;
+  }
+}
+
 .loading-bar {
   background-color: $highlight-text-color;
   height: 3px;
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
   z-index: 9999;
@@ -5371,7 +5832,7 @@ a.status-card.compact:hover {
   font-size: 14px;
   border: 1px solid lighten($ui-base-color, 8%);
   border-radius: 4px;
-  margin-top: 14px;
+  margin-top: 16px;
   overflow: hidden;
 
   &__icon {
@@ -5417,7 +5878,6 @@ a.status-card.compact:hover {
 
   &.compact {
     border: 0;
-    margin-top: 4px;
 
     .attachment-list__list {
       padding: 0;
@@ -5516,6 +5976,7 @@ a.status-card.compact:hover {
   overflow: hidden;
   position: absolute;
 }
+
 /* End Media Gallery */
 
 .detailed,
@@ -5528,7 +5989,6 @@ a.status-card.compact:hover {
   .video-player__volume__handle {
     bottom: 23px;
   }
-
 }
 
 .audio-player {
@@ -5545,6 +6005,13 @@ a.status-card.compact:hover {
     height: 100%;
   }
 
+  &.inactive {
+    audio,
+    .video-player__controls {
+      visibility: hidden;
+    }
+  }
+
   .video-player__volume::before,
   .video-player__seek::before {
     background: currentColor;
@@ -5650,7 +6117,7 @@ a.status-card.compact:hover {
     background: linear-gradient(0deg, rgba($base-shadow-color, 0.85) 0, rgba($base-shadow-color, 0.45) 60%, transparent);
     padding: 0 15px;
     opacity: 0;
-    transition: opacity .1s ease;
+    transition: opacity 0.1s ease;
 
     &.active {
       opacity: 1;
@@ -5725,7 +6192,6 @@ a.status-card.compact:hover {
     .player-button {
       display: inline-block;
       outline: 0;
-
       flex: 0 0 auto;
       background: transparent;
       padding: 5px;
@@ -5896,7 +6362,7 @@ a.status-card.compact:hover {
       box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
 
       .no-reduce-motion & {
-        transition: opacity .1s ease;
+        transition: opacity 0.1s ease;
       }
 
       &.active {
@@ -5929,136 +6395,20 @@ a.status-card.compact:hover {
   }
 }
 
-.directory {
-  &__list {
-    width: 100%;
-    margin: 10px 0;
-    transition: opacity 100ms ease-in;
+.scrollable .account-card {
+  margin: 10px;
+  background: lighten($ui-base-color, 8%);
+}
 
-    &.loading {
-      opacity: 0.7;
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      margin: 0;
-    }
+.scrollable .account-card__title__avatar {
+  img,
+  .account__avatar {
+    border-color: lighten($ui-base-color, 8%);
   }
+}
 
-  &__card {
-    box-sizing: border-box;
-    margin-bottom: 10px;
-
-    &__img {
-      height: 125px;
-      position: relative;
-      background: darken($ui-base-color, 12%);
-      overflow: hidden;
-
-      img {
-        display: block;
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        object-fit: cover;
-      }
-    }
-
-    &__bar {
-      display: flex;
-      align-items: center;
-      background: lighten($ui-base-color, 4%);
-      padding: 10px;
-
-      &__name {
-        flex: 1 1 auto;
-        display: flex;
-        align-items: center;
-        text-decoration: none;
-        overflow: hidden;
-      }
-
-      &__relationship {
-        width: 23px;
-        min-height: 1px;
-        flex: 0 0 auto;
-      }
-
-      .avatar {
-        flex: 0 0 auto;
-        width: 48px;
-        height: 48px;
-        padding-top: 2px;
-
-        img {
-          width: 100%;
-          height: 100%;
-          display: block;
-          margin: 0;
-          border-radius: 4px;
-          background: darken($ui-base-color, 8%);
-          object-fit: cover;
-        }
-      }
-
-      .display-name {
-        margin-left: 15px;
-        text-align: left;
-
-        strong {
-          font-size: 15px;
-          color: $primary-text-color;
-          font-weight: 500;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        span {
-          display: block;
-          font-size: 14px;
-          color: $darker-text-color;
-          font-weight: 400;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
-    }
-
-    &__extra {
-      background: $ui-base-color;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .accounts-table__count {
-        width: 33.33%;
-        flex: 0 0 auto;
-        padding: 15px 0;
-      }
-
-      .account__header__content {
-        box-sizing: border-box;
-        padding: 15px 10px;
-        border-bottom: 1px solid lighten($ui-base-color, 8%);
-        width: 100%;
-        min-height: 18px + 30px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        p {
-          display: none;
-
-          &:first-child {
-            display: inline;
-          }
-        }
-
-        br {
-          display: none;
-        }
-      }
-    }
-  }
+.scrollable .account-card__bio::after {
+  background: linear-gradient(to left, lighten($ui-base-color, 8%), transparent);
 }
 
 .account-gallery__container {
@@ -6162,6 +6512,7 @@ a.status-card.compact:hover {
 
   &__column {
     padding: 10px 15px;
+    padding-bottom: 0;
   }
 
   .radio-button {
@@ -6179,14 +6530,13 @@ a.status-card.compact:hover {
   display: inline-block;
   padding: 6px 0;
   line-height: 18px;
-  cursor: default;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   cursor: pointer;
 
-  input[type=radio],
-  input[type=checkbox] {
+  input[type="radio"],
+  input[type="checkbox"] {
     display: none;
   }
 
@@ -6204,8 +6554,8 @@ a.status-card.compact:hover {
     vertical-align: middle;
 
     &.checked {
-      border-color: lighten($ui-highlight-color, 8%);
-      background: lighten($ui-highlight-color, 8%);
+      border-color: lighten($ui-highlight-color, 4%);
+      background: lighten($ui-highlight-color, 4%);
     }
   }
 }
@@ -6279,14 +6629,16 @@ noscript {
     .navigation-bar__actions {
       & > .icon-button.close {
         will-change: opacity transform;
-        transition: opacity $duration * 0.5 $delay,
-                    transform $duration $delay;
+        transition:
+          opacity $duration * 0.5 $delay,
+          transform $duration $delay;
       }
 
       & > .compose__action-bar .icon-button {
         will-change: opacity transform;
-        transition: opacity $duration * 0.5 $delay + $duration * 0.5,
-                    transform $duration $delay;
+        transition:
+          opacity $duration * 0.5 $delay + $duration * 0.5,
+          transform $duration $delay;
       }
     }
   }
@@ -6394,36 +6746,31 @@ noscript {
   }
 }
 
-.account__moved-note {
-  padding: 14px 10px;
-  padding-bottom: 16px;
+.moved-account-banner,
+.follow-request-banner {
+  padding: 20px;
   background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  align-items: center;
+  flex-direction: column;
 
   &__message {
-    position: relative;
-    margin-left: 58px;
-    color: $dark-text-color;
+    color: $darker-text-color;
     padding: 8px 0;
     padding-top: 0;
     padding-bottom: 4px;
     font-size: 14px;
-
-    > span {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
+    font-weight: 500;
+    text-align: center;
+    margin-bottom: 16px;
   }
 
-  &__icon-wrapper {
-    left: -26px;
-    position: absolute;
-  }
-
-  .detailed-status__display-avatar {
-    position: relative;
+  &__action {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 15px;
+    width: 100%;
   }
 
   .detailed-status__display-name {
@@ -6431,11 +6778,15 @@ noscript {
   }
 }
 
+.follow-request-banner .button {
+  width: 100%;
+}
+
 .column-inline-form {
   padding: 15px;
-  padding-right: 0;
   display: flex;
   justify-content: flex-start;
+  gap: 15px;
   align-items: center;
   background: lighten($ui-base-color, 4%);
 
@@ -6444,17 +6795,8 @@ noscript {
 
     input {
       width: 100%;
-
-      &:focus {
-        outline: 0;
-      }
     }
   }
-
-  .icon-button {
-    flex: 0 0 auto;
-    margin: 0 10px;
-  }
 }
 
 .drawer__backdrop {
@@ -6668,6 +7010,7 @@ noscript {
 
 .account__header {
   overflow: hidden;
+  background: lighten($ui-base-color, 4%);
 
   &.inactive {
     opacity: 0.5;
@@ -6701,15 +7044,13 @@ noscript {
 
   &__bar {
     position: relative;
-    background: lighten($ui-base-color, 4%);
-    padding: 5px;
+    padding: 0 20px;
     border-bottom: 1px solid lighten($ui-base-color, 12%);
 
     .avatar {
       display: block;
       flex: 0 0 auto;
       width: 94px;
-      margin-left: -2px;
 
       .account__avatar {
         background: darken($ui-base-color, 8%);
@@ -6721,33 +7062,40 @@ noscript {
   &__tabs {
     display: flex;
     align-items: flex-start;
-    padding: 7px 10px;
+    justify-content: space-between;
     margin-top: -55px;
+    padding-top: 10px;
+    gap: 8px;
+    overflow: hidden;
+    margin-left: -2px; // aligns the pfp with content below
 
     &__buttons {
       display: flex;
       align-items: center;
+      gap: 8px;
       padding-top: 55px;
       overflow: hidden;
 
+      .button {
+        flex-shrink: 1;
+        white-space: nowrap;
+
+        @media screen and (max-width: $no-gap-breakpoint) {
+          min-width: 0;
+        }
+      }
+
       .icon-button {
         border: 1px solid lighten($ui-base-color, 12%);
         border-radius: 4px;
         box-sizing: content-box;
         padding: 2px;
       }
-
-      & > .icon-button {
-        margin-right: 8px;
-      }
-
-      .button {
-        margin: 0 8px;
-      }
     }
 
     &__name {
-      padding: 5px 10px;
+      margin-top: 16px;
+      margin-bottom: 16px;
 
       .account-role {
         vertical-align: top;
@@ -6759,21 +7107,25 @@ noscript {
       }
 
       h1 {
-        font-size: 16px;
-        line-height: 24px;
+        font-size: 17px;
+        line-height: 22px;
         color: $primary-text-color;
-        font-weight: 500;
+        font-weight: 700;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
 
         small {
           display: block;
-          font-size: 14px;
+          font-size: 15px;
           color: $darker-text-color;
           font-weight: 400;
           overflow: hidden;
           text-overflow: ellipsis;
+
+          span {
+            user-select: all;
+          }
         }
       }
     }
@@ -6784,56 +7136,82 @@ noscript {
   }
 
   &__bio {
-    overflow: hidden;
-    margin: 0 -5px;
-
     .account__header__content {
-      padding: 20px 15px;
-      padding-bottom: 5px;
       color: $primary-text-color;
-
-      .columns-area--mobile & {
-        padding-left: 20px;
-        padding-right: 20px;
-      }
-    }
-
-    .account__header__joined {
-      font-size: 14px;
-      padding: 5px 15px;
-      color: $darker-text-color;
-
-      .columns-area--mobile & {
-        padding-left: 20px;
-        padding-right: 20px;
-      }
     }
 
     .account__header__fields {
       margin: 0;
-      border-top: 1px solid lighten($ui-base-color, 12%);
+      margin-top: 16px;
+      border-radius: 4px;
+      background: darken($ui-base-color, 4%);
+      border: 0;
+
+      dl {
+        display: block;
+        padding: 11px 16px;
+        border-bottom-color: lighten($ui-base-color, 4%);
+      }
+
+      dd,
+      dt {
+        font-size: 13px;
+        line-height: 18px;
+        padding: 0;
+        text-align: initial;
+      }
+
+      dt {
+        width: auto;
+        background: transparent;
+        text-transform: uppercase;
+        color: $dark-text-color;
+      }
+
+      dd {
+        color: $darker-text-color;
+      }
 
       a {
         color: lighten($ui-highlight-color, 8%);
       }
 
-      dl:first-child .verified {
-        border-radius: 0 4px 0 0;
-      }
+      .verified {
+        border: 1px solid rgba($valid-value-color, 0.5);
+        margin-top: -1px;
 
-      .verified a {
-        color: $valid-value-color;
+        &:first-child {
+          border-top-left-radius: 4px;
+          border-top-right-radius: 4px;
+          margin-top: 0;
+        }
+
+        &:last-child {
+          border-bottom-left-radius: 4px;
+          border-bottom-right-radius: 4px;
+        }
+
+        dt,
+        dd {
+          color: $valid-value-color;
+        }
+
+        a {
+          color: $valid-value-color;
+        }
       }
     }
   }
 
   &__extra {
-    margin-top: 4px;
+    margin-top: 16px;
 
     &__links {
       font-size: 14px;
       color: $darker-text-color;
-      padding: 10px 0;
+      margin: 0 -10px;
+      padding-top: 16px;
+      padding-bottom: 10px;
 
       a {
         display: inline-block;
@@ -6851,17 +7229,10 @@ noscript {
   }
 
   &__account-note {
-    padding: 15px;
-    padding-bottom: 10px;
     color: $primary-text-color;
     font-size: 14px;
     font-weight: 400;
-    border-bottom: 1px solid lighten($ui-base-color, 12%);
-
-    .columns-area--mobile & {
-      padding-left: 20px;
-      padding-right: 20px;
-    }
+    margin-bottom: 10px;
 
     label {
       display: block;
@@ -6920,6 +7291,7 @@ noscript {
     align-items: center;
     padding: 15px;
     border-bottom: 1px solid lighten($ui-base-color, 8%);
+    gap: 15px;
 
     &:last-child {
       border-bottom: 0;
@@ -6961,9 +7333,8 @@ noscript {
       font-size: 24px;
       font-weight: 500;
       text-align: right;
-      padding-right: 15px;
-      margin-left: 5px;
       color: $secondary-text-color;
+      text-decoration: none;
     }
 
     &__sparkline {
@@ -6972,7 +7343,7 @@ noscript {
 
       path:first-child {
         fill: rgba($highlight-text-color, 0.25) !important;
-        fill-opacity: 1 !important;
+        fill-opacity: 100% !important;
       }
 
       path:last-child {
@@ -7060,7 +7431,7 @@ noscript {
     border-radius: 50%;
     width: 0.625rem;
     height: 0.625rem;
-    margin: -.1ex .15em .1ex;
+    margin: -0.1ex 0.15em 0.1ex;
   }
 
   &__content {
@@ -7323,10 +7694,9 @@ noscript {
       position: absolute;
       top: 0;
       left: 0;
-      pointer-events: 0;
       width: 100%;
       height: 100%;
-      border-left: 2px solid $highlight-text-color;
+      border-left: 4px solid $highlight-text-color;
       pointer-events: none;
     }
   }
@@ -7443,3 +7813,845 @@ noscript {
     text-align: center;
   }
 }
+
+.explore__search-header {
+  background: darken($ui-base-color, 4%);
+  justify-content: center;
+  align-items: center;
+  padding: 15px;
+
+  .search {
+    width: 100%;
+    margin-bottom: 0;
+  }
+
+  .search__input {
+    border: 1px solid lighten($ui-base-color, 8%);
+    padding: 10px;
+  }
+
+  .search .fa {
+    top: 10px;
+    right: 10px;
+    color: $dark-text-color;
+  }
+
+  .search .fa-times-circle {
+    top: 12px;
+  }
+}
+
+.explore__search-results {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+}
+
+.story {
+  display: flex;
+  align-items: center;
+  color: $primary-text-color;
+  text-decoration: none;
+  padding: 15px 0;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &:hover,
+  &:active,
+  &:focus {
+    background-color: lighten($ui-base-color, 4%);
+  }
+
+  &__details {
+    padding: 0 15px;
+    flex: 1 1 auto;
+
+    &__publisher {
+      color: $darker-text-color;
+      margin-bottom: 4px;
+    }
+
+    &__title {
+      font-size: 19px;
+      line-height: 24px;
+      font-weight: 500;
+      margin-bottom: 4px;
+    }
+
+    &__shared {
+      color: $darker-text-color;
+    }
+  }
+
+  &__thumbnail {
+    flex: 0 0 auto;
+    margin: 0 15px;
+    position: relative;
+    width: 120px;
+    height: 120px;
+
+    .skeleton {
+      width: 100%;
+      height: 100%;
+    }
+
+    img {
+      border-radius: 4px;
+      display: block;
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    &__preview {
+      border-radius: 4px;
+      display: block;
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      object-fit: fill;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 0;
+
+      &--hidden {
+        display: none;
+      }
+    }
+  }
+}
+
+.server-banner {
+  padding: 20px 0;
+
+  &__introduction {
+    color: $darker-text-color;
+    margin-bottom: 20px;
+
+    strong {
+      font-weight: 600;
+    }
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+
+      &:hover,
+      &:active,
+      &:focus {
+        text-decoration: none;
+      }
+    }
+  }
+
+  &__hero {
+    display: block;
+    border-radius: 4px;
+    width: 100%;
+    height: auto;
+    margin-bottom: 20px;
+    aspect-ratio: 1.9;
+    border: 0;
+    background: $ui-base-color;
+    object-fit: cover;
+  }
+
+  &__description {
+    margin-bottom: 20px;
+  }
+
+  &__meta {
+    display: flex;
+    gap: 10px;
+    max-width: 100%;
+
+    &__column {
+      flex: 0 0 auto;
+      width: calc(50% - 5px);
+      overflow: hidden;
+    }
+  }
+
+  &__number {
+    font-weight: 600;
+    color: $primary-text-color;
+    font-size: 14px;
+  }
+
+  &__number-label {
+    color: $darker-text-color;
+    font-weight: 500;
+    font-size: 14px;
+  }
+
+  h4 {
+    text-transform: uppercase;
+    color: $darker-text-color;
+    margin-bottom: 10px;
+    font-weight: 600;
+  }
+
+  .account {
+    padding: 0;
+    border: 0;
+  }
+
+  .account__avatar-wrapper {
+    margin-left: 0;
+  }
+
+  .spacer {
+    margin: 10px 0;
+  }
+}
+
+.interaction-modal {
+  max-width: 90vw;
+  width: 600px;
+  background: $ui-base-color;
+  border-radius: 8px;
+  overflow-x: hidden;
+  overflow-y: auto;
+  position: relative;
+  display: block;
+  padding: 20px;
+
+  h3 {
+    font-size: 22px;
+    line-height: 33px;
+    font-weight: 700;
+    text-align: center;
+  }
+
+  &__icon {
+    color: $highlight-text-color;
+    margin: 0 5px;
+  }
+
+  &__lead {
+    padding: 20px;
+    text-align: center;
+
+    h3 {
+      margin-bottom: 15px;
+    }
+
+    p {
+      font-size: 17px;
+      line-height: 22px;
+      color: $darker-text-color;
+    }
+  }
+
+  &__choices {
+    display: flex;
+
+    &__choice {
+      flex: 0 0 auto;
+      width: 50%;
+      box-sizing: border-box;
+      padding: 20px;
+
+      h3 {
+        margin-bottom: 20px;
+      }
+
+      p {
+        color: $darker-text-color;
+        margin-bottom: 20px;
+      }
+
+      .button {
+        margin-bottom: 10px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint - 1px) {
+    &__choices {
+      display: block;
+
+      &__choice {
+        width: auto;
+        margin-bottom: 20px;
+      }
+    }
+  }
+}
+
+.copypaste {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+
+  input {
+    display: block;
+    font-family: inherit;
+    background: darken($ui-base-color, 8%);
+    border: 1px solid $highlight-text-color;
+    color: $darker-text-color;
+    border-radius: 4px;
+    padding: 6px 9px;
+    line-height: 22px;
+    font-size: 14px;
+    transition: border-color 300ms linear;
+    flex: 1 1 auto;
+    overflow: hidden;
+
+    &:focus {
+      outline: 0;
+      background: darken($ui-base-color, 4%);
+    }
+  }
+
+  .button {
+    flex: 0 0 auto;
+    transition: background 300ms linear;
+  }
+
+  &.copied {
+    input {
+      border: 1px solid $valid-value-color;
+      transition: none;
+    }
+
+    .button {
+      background: $valid-value-color;
+      transition: none;
+    }
+  }
+}
+
+.privacy-policy {
+  background: $ui-base-color;
+  padding: 20px;
+
+  @media screen and (min-width: $no-gap-breakpoint) {
+    border-radius: 4px;
+  }
+
+  &__body {
+    margin-top: 20px;
+  }
+}
+
+.prose {
+  color: $secondary-text-color;
+  font-size: 15px;
+  line-height: 22px;
+
+  p,
+  ul,
+  ol {
+    margin-top: 1.25em;
+    margin-bottom: 1.25em;
+  }
+
+  img {
+    margin-top: 2em;
+    margin-bottom: 2em;
+  }
+
+  video {
+    margin-top: 2em;
+    margin-bottom: 2em;
+  }
+
+  figure {
+    margin-top: 2em;
+    margin-bottom: 2em;
+
+    figcaption {
+      font-size: 0.875em;
+      line-height: 1.4285714;
+      margin-top: 0.8571429em;
+    }
+  }
+
+  figure > * {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
+  h1 {
+    font-size: 1.5em;
+    margin-top: 0;
+    margin-bottom: 1em;
+    line-height: 1.33;
+  }
+
+  h2 {
+    font-size: 1.25em;
+    margin-top: 1.6em;
+    margin-bottom: 0.6em;
+    line-height: 1.6;
+  }
+
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin-top: 1.5em;
+    margin-bottom: 0.5em;
+    line-height: 1.5;
+  }
+
+  ol {
+    counter-reset: list-counter;
+  }
+
+  li {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
+
+  ol > li {
+    counter-increment: list-counter;
+
+    &::before {
+      content: counter(list-counter) ".";
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  ul > li::before {
+    content: "";
+    position: absolute;
+    background-color: $darker-text-color;
+    border-radius: 50%;
+    width: 0.375em;
+    height: 0.375em;
+    top: 0.5em;
+    left: 0.25em;
+  }
+
+  ul > li,
+  ol > li {
+    position: relative;
+    padding-left: 1.75em;
+  }
+
+  & > ul > li p {
+    margin-top: 0.75em;
+    margin-bottom: 0.75em;
+  }
+
+  & > ul > li > *:first-child {
+    margin-top: 1.25em;
+  }
+
+  & > ul > li > *:last-child {
+    margin-bottom: 1.25em;
+  }
+
+  & > ol > li > *:first-child {
+    margin-top: 1.25em;
+  }
+
+  & > ol > li > *:last-child {
+    margin-bottom: 1.25em;
+  }
+
+  ul ul,
+  ul ol,
+  ol ul,
+  ol ol {
+    margin-top: 0.75em;
+    margin-bottom: 0.75em;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  strong,
+  b {
+    color: $primary-text-color;
+    font-weight: 700;
+  }
+
+  em,
+  i {
+    font-style: italic;
+  }
+
+  a {
+    color: $highlight-text-color;
+    text-decoration: underline;
+
+    &:focus,
+    &:hover,
+    &:active {
+      text-decoration: none;
+    }
+  }
+
+  code {
+    font-size: 0.875em;
+    background: darken($ui-base-color, 8%);
+    border-radius: 4px;
+    padding: 0.2em 0.3em;
+  }
+
+  hr {
+    border: 0;
+    border-top: 1px solid lighten($ui-base-color, 4%);
+    margin-top: 3em;
+    margin-bottom: 3em;
+  }
+
+  hr + * {
+    margin-top: 0;
+  }
+
+  h2 + * {
+    margin-top: 0;
+  }
+
+  h3 + * {
+    margin-top: 0;
+  }
+
+  h4 + *,
+  h5 + *,
+  h6 + * {
+    margin-top: 0;
+  }
+
+  & > :first-child {
+    margin-top: 0;
+  }
+
+  & > :last-child {
+    margin-bottom: 0;
+  }
+}
+
+.dismissable-banner {
+  background: $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  display: flex;
+  align-items: center;
+  gap: 30px;
+
+  &__message {
+    flex: 1 1 auto;
+    padding: 20px 15px;
+    cursor: default;
+    font-size: 14px;
+    line-height: 18px;
+    color: $primary-text-color;
+  }
+
+  &__action {
+    padding: 15px;
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.image {
+  position: relative;
+  overflow: hidden;
+
+  &__preview {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
+  &.loaded &__preview {
+    display: none;
+  }
+
+  img {
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border: 0;
+    background: transparent;
+    opacity: 0;
+  }
+
+  &.loaded img {
+    opacity: 1;
+  }
+}
+
+.link-footer {
+  flex: 0 0 auto;
+  padding: 10px;
+  padding-top: 20px;
+  z-index: 1;
+  font-size: 13px;
+
+  p {
+    color: $dark-text-color;
+    margin-bottom: 20px;
+
+    strong {
+      font-weight: 500;
+    }
+
+    a {
+      color: $dark-text-color;
+      text-decoration: underline;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: none;
+      }
+    }
+  }
+}
+
+.about {
+  padding: 20px;
+
+  @media screen and (min-width: $no-gap-breakpoint) {
+    border-radius: 4px;
+  }
+
+  &__footer {
+    color: $dark-text-color;
+    text-align: center;
+    font-size: 15px;
+    line-height: 22px;
+    margin-top: 20px;
+  }
+
+  &__header {
+    margin-bottom: 30px;
+
+    &__hero {
+      width: 100%;
+      height: auto;
+      aspect-ratio: 1.9;
+      background: lighten($ui-base-color, 4%);
+      border-radius: 8px;
+      margin-bottom: 30px;
+    }
+
+    h1,
+    p {
+      text-align: center;
+    }
+
+    h1 {
+      font-size: 24px;
+      line-height: 1.5;
+      font-weight: 700;
+      margin-bottom: 10px;
+    }
+
+    p {
+      font-size: 16px;
+      line-height: 24px;
+      font-weight: 400;
+      color: $darker-text-color;
+    }
+  }
+
+  &__meta {
+    background: lighten($ui-base-color, 4%);
+    border-radius: 4px;
+    display: flex;
+    margin-bottom: 30px;
+    font-size: 15px;
+
+    &__column {
+      box-sizing: border-box;
+      width: 50%;
+      padding: 20px;
+    }
+
+    &__divider {
+      width: 0;
+      border: 0;
+      border-style: solid;
+      border-color: lighten($ui-base-color, 8%);
+      border-left-width: 1px;
+      min-height: calc(100% - 60px);
+      flex: 0 0 auto;
+    }
+
+    h4 {
+      font-size: 15px;
+      text-transform: uppercase;
+      color: $darker-text-color;
+      font-weight: 500;
+      margin-bottom: 20px;
+    }
+
+    @media screen and (max-width: 600px) {
+      display: block;
+
+      h4 {
+        text-align: center;
+      }
+
+      &__column {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+
+      &__divider {
+        min-height: 0;
+        width: 100%;
+        border-left-width: 0;
+        border-top-width: 1px;
+      }
+    }
+
+    .layout-multiple-columns & {
+      display: block;
+
+      h4 {
+        text-align: center;
+      }
+
+      &__column {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+
+      &__divider {
+        min-height: 0;
+        width: 100%;
+        border-left-width: 0;
+        border-top-width: 1px;
+      }
+    }
+  }
+
+  &__mail {
+    color: $primary-text-color;
+    text-decoration: none;
+    font-weight: 500;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+    }
+  }
+
+  .link-footer {
+    padding: 0;
+    margin-top: 60px;
+    text-align: center;
+    font-size: 15px;
+    line-height: 22px;
+
+    @media screen and (min-width: $no-gap-breakpoint) {
+      display: none;
+    }
+  }
+
+  .account {
+    padding: 0;
+    border: 0;
+  }
+
+  .account__avatar-wrapper {
+    margin-left: 0;
+  }
+
+  .account__relationship {
+    display: none;
+  }
+
+  &__section {
+    margin-bottom: 10px;
+
+    &__title {
+      font-size: 17px;
+      font-weight: 600;
+      line-height: 22px;
+      padding: 20px;
+      border-radius: 4px;
+      background: lighten($ui-base-color, 4%);
+      color: $highlight-text-color;
+      cursor: pointer;
+    }
+
+    &.active &__title {
+      border-radius: 4px 4px 0 0;
+    }
+
+    &__body {
+      border: 1px solid lighten($ui-base-color, 4%);
+      border-top: 0;
+      padding: 20px;
+      font-size: 15px;
+      line-height: 22px;
+    }
+  }
+
+  &__domain-blocks {
+    margin-top: 30px;
+    background: darken($ui-base-color, 4%);
+    border: 1px solid lighten($ui-base-color, 4%);
+    border-radius: 4px;
+
+    &__domain {
+      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      padding: 10px;
+      font-size: 15px;
+      color: $darker-text-color;
+
+      &:nth-child(2n) {
+        background: darken($ui-base-color, 2%);
+      }
+
+      &:last-child {
+        border-bottom: 0;
+      }
+
+      &__header {
+        display: flex;
+        gap: 10px;
+        justify-content: space-between;
+        font-weight: 500;
+        margin-bottom: 4px;
+      }
+
+      h6 {
+        color: $secondary-text-color;
+        font-size: inherit;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      p {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index e40ad18ff..b49b93984 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -1,7 +1,6 @@
 .container-alt {
   width: 700px;
   margin: 0 auto;
-  margin-top: 40px;
 
   @media screen and (max-width: 740px) {
     width: 100%;
@@ -10,19 +9,14 @@
 }
 
 .logo-container {
-  margin: 100px auto 50px;
-
-  @media screen and (max-width: 500px) {
-    margin: 40px auto 0;
-  }
+  margin: 50px auto;
 
   h1 {
     display: flex;
     justify-content: center;
     align-items: center;
 
-    svg {
-      fill: $primary-text-color;
+    .logo {
       height: 42px;
       margin-right: 10px;
     }
@@ -36,7 +30,6 @@
       outline: 0;
       padding: 12px 16px;
       line-height: 32px;
-      font-family: $font-display, sans-serif;
       font-weight: 500;
       font-size: 14px;
     }
@@ -67,22 +60,20 @@
   line-height: 18px;
   box-sizing: border-box;
   padding: 20px 0;
-  padding-bottom: 0;
-  margin-bottom: -30px;
   margin-top: 40px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid $ui-base-color;
 
   @media screen and (max-width: 440px) {
     width: 100%;
     margin: 0;
-    margin-bottom: 10px;
     padding: 20px;
-    padding-bottom: 0;
   }
 
   .avatar {
     width: 40px;
     height: 40px;
-    margin-right: 8px;
+    margin-right: 10px;
 
     img {
       width: 100%;
@@ -96,7 +87,7 @@
   .name {
     flex: 1 1 auto;
     color: $secondary-text-color;
-    width: calc(100% - 88px);
+    width: calc(100% - 90px);
 
     .username {
       display: block;
@@ -110,794 +101,6 @@
     display: block;
     font-size: 32px;
     line-height: 40px;
-    margin-left: 8px;
-  }
-}
-
-.grid-3 {
-  display: grid;
-  grid-gap: 10px;
-  grid-template-columns: 3fr 1fr;
-  grid-auto-columns: 25%;
-  grid-auto-rows: max-content;
-
-  .column-0 {
-    grid-column: 1 / 3;
-    grid-row: 1;
-  }
-
-  .column-1 {
-    grid-column: 1;
-    grid-row: 2;
-  }
-
-  .column-2 {
-    grid-column: 2;
-    grid-row: 2;
-  }
-
-  .column-3 {
-    grid-column: 1 / 3;
-    grid-row: 3;
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    grid-gap: 0;
-    grid-template-columns: minmax(0, 100%);
-
-    .column-0 {
-      grid-column: 1;
-    }
-
-    .column-1 {
-      grid-column: 1;
-      grid-row: 3;
-    }
-
-    .column-2 {
-      grid-column: 1;
-      grid-row: 2;
-    }
-
-    .column-3 {
-      grid-column: 1;
-      grid-row: 4;
-    }
-  }
-}
-
-.grid-4 {
-  display: grid;
-  grid-gap: 10px;
-  grid-template-columns: repeat(4, minmax(0, 1fr));
-  grid-auto-columns: 25%;
-  grid-auto-rows: max-content;
-
-  .column-0 {
-    grid-column: 1 / 5;
-    grid-row: 1;
-  }
-
-  .column-1 {
-    grid-column: 1 / 4;
-    grid-row: 2;
-  }
-
-  .column-2 {
-    grid-column: 4;
-    grid-row: 2;
-  }
-
-  .column-3 {
-    grid-column: 2 / 5;
-    grid-row: 3;
-  }
-
-  .column-4 {
-    grid-column: 1;
-    grid-row: 3;
-  }
-
-  .landing-page__call-to-action {
-    min-height: 100%;
-  }
-
-  .flash-message {
-    margin-bottom: 10px;
-  }
-
-  @media screen and (max-width: 738px) {
-    grid-template-columns: minmax(0, 50%) minmax(0, 50%);
-
-    .landing-page__call-to-action {
-      padding: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .row__information-board {
-      width: 100%;
-      justify-content: center;
-      align-items: center;
-    }
-
-    .row__mascot {
-      display: none;
-    }
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    grid-gap: 0;
-    grid-template-columns: minmax(0, 100%);
-
-    .column-0 {
-      grid-column: 1;
-    }
-
-    .column-1 {
-      grid-column: 1;
-      grid-row: 3;
-    }
-
-    .column-2 {
-      grid-column: 1;
-      grid-row: 2;
-    }
-
-    .column-3 {
-      grid-column: 1;
-      grid-row: 5;
-    }
-
-    .column-4 {
-      grid-column: 1;
-      grid-row: 4;
-    }
-  }
-}
-
-.public-layout {
-  @media screen and (max-width: $no-gap-breakpoint) {
-    padding-top: 48px;
-  }
-
-  .container {
-    max-width: 960px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      padding: 0;
-    }
-  }
-
-  .header {
-    background: lighten($ui-base-color, 8%);
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-    border-radius: 4px;
-    height: 48px;
-    margin: 10px 0;
-    display: flex;
-    align-items: stretch;
-    justify-content: center;
-    flex-wrap: nowrap;
-    overflow: hidden;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      position: fixed;
-      width: 100%;
-      top: 0;
-      left: 0;
-      margin: 0;
-      border-radius: 0;
-      box-shadow: none;
-      z-index: 110;
-    }
-
-    & > div {
-      flex: 1 1 33.3%;
-      min-height: 1px;
-    }
-
-    .nav-left {
-      display: flex;
-      align-items: stretch;
-      justify-content: flex-start;
-      flex-wrap: nowrap;
-    }
-
-    .nav-center {
-      display: flex;
-      align-items: stretch;
-      justify-content: center;
-      flex-wrap: nowrap;
-    }
-
-    .nav-right {
-      display: flex;
-      align-items: stretch;
-      justify-content: flex-end;
-      flex-wrap: nowrap;
-    }
-
-    .brand {
-      display: block;
-      padding: 15px;
-
-      svg {
-        display: block;
-        height: 18px;
-        width: auto;
-        position: relative;
-        bottom: -2px;
-        fill: $primary-text-color;
-
-        @media screen and (max-width: $no-gap-breakpoint) {
-          height: 20px;
-        }
-      }
-
-      &:hover,
-      &:focus,
-      &:active {
-        background: lighten($ui-base-color, 12%);
-      }
-    }
-
-    .nav-link {
-      display: flex;
-      align-items: center;
-      padding: 0 1rem;
-      font-size: 12px;
-      font-weight: 500;
-      text-decoration: none;
-      color: $darker-text-color;
-      white-space: nowrap;
-      text-align: center;
-
-      &:hover,
-      &:focus,
-      &:active {
-        text-decoration: underline;
-        color: $primary-text-color;
-      }
-
-      @media screen and (max-width: 550px) {
-        &.optional {
-          display: none;
-        }
-      }
-    }
-
-    .nav-button {
-      background: lighten($ui-base-color, 16%);
-      margin: 8px;
-      margin-left: 0;
-      border-radius: 4px;
-
-      &:hover,
-      &:focus,
-      &:active {
-        text-decoration: none;
-        background: lighten($ui-base-color, 20%);
-      }
-    }
-  }
-
-  $no-columns-breakpoint: 600px;
-
-  .grid {
-    display: grid;
-    grid-gap: 10px;
-    grid-template-columns: minmax(300px, 3fr) minmax(298px, 1fr);
-    grid-auto-columns: 25%;
-    grid-auto-rows: max-content;
-
-    .column-0 {
-      grid-row: 1;
-      grid-column: 1;
-    }
-
-    .column-1 {
-      grid-row: 1;
-      grid-column: 2;
-    }
-
-    @media screen and (max-width: $no-columns-breakpoint) {
-      grid-template-columns: 100%;
-      grid-gap: 0;
-
-      .column-1 {
-        display: none;
-      }
-    }
-  }
-
-  .directory__card {
-    border-radius: 4px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-radius: 0;
-    }
-  }
-
-  .page-header {
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-bottom: 0;
-    }
-  }
-
-  .public-account-header {
-    overflow: hidden;
-    margin-bottom: 10px;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-    &.inactive {
-      opacity: 0.5;
-
-      .public-account-header__image,
-      .avatar {
-        filter: grayscale(100%);
-      }
-
-      .logo-button {
-        background-color: $secondary-text-color;
-      }
-    }
-
-    .logo-button {
-      padding: 3px 15px;
-    }
-
-    &__image {
-      border-radius: 4px 4px 0 0;
-      overflow: hidden;
-      height: 300px;
-      position: relative;
-      background: darken($ui-base-color, 12%);
-
-      &::after {
-        content: "";
-        display: block;
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        box-shadow: inset 0 -1px 1px 1px rgba($base-shadow-color, 0.15);
-        top: 0;
-        left: 0;
-      }
-
-      img {
-        object-fit: cover;
-        display: block;
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        border-radius: 4px 4px 0 0;
-      }
-
-      @media screen and (max-width: 600px) {
-        height: 200px;
-      }
-    }
-
-    &--no-bar {
-      margin-bottom: 0;
-
-      .public-account-header__image,
-      .public-account-header__image img {
-        border-radius: 4px;
-
-        @media screen and (max-width: $no-gap-breakpoint) {
-          border-radius: 0;
-        }
-      }
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      margin-bottom: 0;
-      box-shadow: none;
-
-      &__image::after {
-        display: none;
-      }
-
-      &__image,
-      &__image img {
-        border-radius: 0;
-      }
-    }
-
-    &__bar {
-      position: relative;
-      margin-top: -80px;
-      display: flex;
-      justify-content: flex-start;
-
-      &::before {
-        content: "";
-        display: block;
-        background: lighten($ui-base-color, 4%);
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        height: 60px;
-        border-radius: 0 0 4px 4px;
-        z-index: -1;
-      }
-
-      .avatar {
-        display: block;
-        width: 120px;
-        height: 120px;
-        padding-left: 20px - 4px;
-        flex: 0 0 auto;
-
-        img {
-          display: block;
-          width: 100%;
-          height: 100%;
-          margin: 0;
-          border-radius: 50%;
-          border: 4px solid lighten($ui-base-color, 4%);
-          background: darken($ui-base-color, 8%);
-        }
-      }
-
-      @media screen and (max-width: 600px) {
-        margin-top: 0;
-        background: lighten($ui-base-color, 4%);
-        border-radius: 0 0 4px 4px;
-        padding: 5px;
-
-        &::before {
-          display: none;
-        }
-
-        .avatar {
-          width: 48px;
-          height: 48px;
-          padding: 7px 0;
-          padding-left: 10px;
-
-          img {
-            border: 0;
-            border-radius: 4px;
-          }
-
-          @media screen and (max-width: 360px) {
-            display: none;
-          }
-        }
-      }
-
-      @media screen and (max-width: $no-gap-breakpoint) {
-        border-radius: 0;
-      }
-
-      @media screen and (max-width: $no-columns-breakpoint) {
-        flex-wrap: wrap;
-      }
-    }
-
-    &__tabs {
-      flex: 1 1 auto;
-      margin-left: 20px;
-
-      &__name {
-        padding-top: 20px;
-        padding-bottom: 8px;
-
-        h1 {
-          font-size: 20px;
-          line-height: 18px * 1.5;
-          color: $primary-text-color;
-          font-weight: 500;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          text-shadow: 1px 1px 1px $base-shadow-color;
-
-          small {
-            display: block;
-            font-size: 14px;
-            color: $primary-text-color;
-            font-weight: 400;
-            overflow: hidden;
-            text-overflow: ellipsis;
-          }
-        }
-      }
-
-      @media screen and (max-width: 600px) {
-        margin-left: 15px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        &__name {
-          padding-top: 0;
-          padding-bottom: 0;
-
-          h1 {
-            font-size: 16px;
-            line-height: 24px;
-            text-shadow: none;
-
-            small {
-              color: $darker-text-color;
-            }
-          }
-        }
-      }
-
-      &__tabs {
-        display: flex;
-        justify-content: flex-start;
-        align-items: stretch;
-        height: 58px;
-
-        .details-counters {
-          display: flex;
-          flex-direction: row;
-          min-width: 300px;
-        }
-
-        @media screen and (max-width: $no-columns-breakpoint) {
-          .details-counters {
-            display: none;
-          }
-        }
-
-        .counter {
-          min-width: 33.3%;
-          box-sizing: border-box;
-          flex: 0 0 auto;
-          color: $darker-text-color;
-          padding: 10px;
-          border-right: 1px solid lighten($ui-base-color, 4%);
-          cursor: default;
-          text-align: center;
-          position: relative;
-
-          a {
-            display: block;
-          }
-
-          &:last-child {
-            border-right: 0;
-          }
-
-          &::after {
-            display: block;
-            content: "";
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            border-bottom: 4px solid $ui-primary-color;
-            opacity: 0.5;
-            transition: all 400ms ease;
-          }
-
-          &.active {
-            &::after {
-              border-bottom: 4px solid $highlight-text-color;
-              opacity: 1;
-            }
-
-            &.inactive::after {
-              border-bottom-color: $secondary-text-color;
-            }
-          }
-
-          &:hover {
-            &::after {
-              opacity: 1;
-              transition-duration: 100ms;
-            }
-          }
-
-          a {
-            text-decoration: none;
-            color: inherit;
-          }
-
-          .counter-label {
-            font-size: 12px;
-            display: block;
-          }
-
-          .counter-number {
-            font-weight: 500;
-            font-size: 18px;
-            margin-bottom: 5px;
-            color: $primary-text-color;
-            font-family: $font-display, sans-serif;
-          }
-        }
-
-        .spacer {
-          flex: 1 1 auto;
-          height: 1px;
-        }
-
-        &__buttons {
-          padding: 7px 8px;
-        }
-      }
-    }
-
-    &__extra {
-      display: none;
-      margin-top: 4px;
-
-      .public-account-bio {
-        border-radius: 0;
-        box-shadow: none;
-        background: transparent;
-        margin: 0 -5px;
-
-        .account__header__fields {
-          border-top: 1px solid lighten($ui-base-color, 12%);
-        }
-
-        .roles {
-          display: none;
-        }
-      }
-
-      &__links {
-        margin-top: -15px;
-        font-size: 14px;
-        color: $darker-text-color;
-
-        a {
-          display: inline-block;
-          color: $darker-text-color;
-          text-decoration: none;
-          padding: 15px;
-          font-weight: 500;
-
-          strong {
-            font-weight: 700;
-            color: $primary-text-color;
-          }
-        }
-      }
-
-      @media screen and (max-width: $no-columns-breakpoint) {
-        display: block;
-        flex: 100%;
-      }
-    }
-  }
-
-  .account__section-headline {
-    border-radius: 4px 4px 0 0;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-radius: 0;
-    }
-  }
-
-  .detailed-status__meta {
-    margin-top: 25px;
-  }
-
-  .public-account-bio {
-    background: lighten($ui-base-color, 8%);
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-    border-radius: 4px;
-    overflow: hidden;
-    margin-bottom: 10px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      box-shadow: none;
-      margin-bottom: 0;
-      border-radius: 0;
-    }
-
-    .account__header__fields {
-      margin: 0;
-      border-top: 0;
-
-      a {
-        color: lighten($ui-highlight-color, 8%);
-      }
-
-      dl:first-child .verified {
-        border-radius: 0 4px 0 0;
-      }
-
-      .verified a {
-        color: $valid-value-color;
-      }
-    }
-
-    .account__header__content {
-      padding: 20px;
-      padding-bottom: 0;
-      color: $primary-text-color;
-    }
-
-    &__extra,
-    .roles {
-      padding: 20px;
-      font-size: 14px;
-      color: $darker-text-color;
-    }
-
-    .roles {
-      padding-bottom: 0;
-    }
-  }
-
-  .directory__list {
-    display: grid;
-    grid-gap: 10px;
-    grid-template-columns: minmax(0, 50%) minmax(0, 50%);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      display: block;
-    }
-
-    .icon-button {
-      font-size: 18px;
-    }
-  }
-
-  .directory__card {
-    margin-bottom: 0;
-  }
-
-  .card-grid {
-    display: flex;
-    flex-wrap: wrap;
-    min-width: 100%;
-    margin: 0 -5px;
-
-    & > div {
-      box-sizing: border-box;
-      flex: 1 0 auto;
-      width: 300px;
-      padding: 0 5px;
-      margin-bottom: 10px;
-      max-width: 33.333%;
-
-      @media screen and (max-width: 900px) {
-        max-width: 50%;
-      }
-
-      @media screen and (max-width: 600px) {
-        max-width: 100%;
-      }
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      margin: 0;
-      border-top: 1px solid lighten($ui-base-color, 8%);
-
-      & > div {
-        width: 100%;
-        padding: 0;
-        margin-bottom: 0;
-        border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-        &:last-child {
-          border-bottom: 0;
-        }
-
-        .card__bar {
-          background: $ui-base-color;
-
-          &:hover,
-          &:active,
-          &:focus {
-            background: lighten($ui-base-color, 4%);
-          }
-        }
-      }
-    }
+    margin-left: 10px;
   }
 }
diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss
index 0a881bc10..f25765d1d 100644
--- a/app/javascript/styles/mastodon/dashboard.scss
+++ b/app/javascript/styles/mastodon/dashboard.scss
@@ -37,9 +37,7 @@
     text-align: center;
     font-weight: 500;
     font-size: 24px;
-    line-height: 21px;
     color: $primary-text-color;
-    font-family: $font-display, sans-serif;
     margin-bottom: 20px;
     line-height: 30px;
   }
@@ -83,7 +81,7 @@
     display: flex;
     align-items: baseline;
     border-radius: 4px;
-    background: $ui-highlight-color;
+    background: darken($ui-highlight-color, 2%);
     color: $primary-text-color;
     transition: all 100ms ease-in;
     font-size: 14px;
@@ -96,7 +94,7 @@
     &:active,
     &:focus,
     &:hover {
-      background-color: lighten($ui-highlight-color, 10%);
+      background-color: $ui-highlight-color;
       transition: all 200ms ease-out;
     }
 
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index e73057465..1042ddda8 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -46,7 +46,7 @@
   text-align: center;
   padding: 12px 4px;
   overflow: hidden;
-  transition: color .1s ease-out;
+  transition: color 0.1s ease-out;
   cursor: pointer;
   background: transparent;
   border: 0;
@@ -111,7 +111,7 @@
   position: relative;
 
   input {
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 400;
     padding: 7px 9px;
     padding-right: 25px;
@@ -132,6 +132,10 @@
     &:active {
       outline: 0 !important;
     }
+
+    &::-webkit-search-cancel-button {
+      display: none;
+    }
   }
 }
 
@@ -242,8 +246,8 @@
   padding: 5px 6px;
   padding-top: 70px;
 
- .emoji-mart-no-results-label {
-    margin-top: .2em;
+  .emoji-mart-no-results-label {
+    margin-top: 0.2em;
   }
 
   .emoji-mart-emoji:hover::before {
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
deleted file mode 100644
index 00d290883..000000000
--- a/app/javascript/styles/mastodon/footer.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-.public-layout {
-  .footer {
-    text-align: left;
-    padding-top: 20px;
-    padding-bottom: 60px;
-    font-size: 12px;
-    color: lighten($ui-base-color, 34%);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      padding-left: 20px;
-      padding-right: 20px;
-    }
-
-    .grid {
-      display: grid;
-      grid-gap: 10px;
-      grid-template-columns: 1fr 1fr 2fr 1fr 1fr;
-
-      .column-0 {
-        grid-column: 1;
-        grid-row: 1;
-        min-width: 0;
-      }
-
-      .column-1 {
-        grid-column: 2;
-        grid-row: 1;
-        min-width: 0;
-      }
-
-      .column-2 {
-        grid-column: 3;
-        grid-row: 1;
-        min-width: 0;
-        text-align: center;
-
-        h4 a {
-          color: lighten($ui-base-color, 34%);
-        }
-      }
-
-      .column-3 {
-        grid-column: 4;
-        grid-row: 1;
-        min-width: 0;
-      }
-
-      .column-4 {
-        grid-column: 5;
-        grid-row: 1;
-        min-width: 0;
-      }
-
-      @media screen and (max-width: 690px) {
-        grid-template-columns: 1fr 2fr 1fr;
-
-        .column-0,
-        .column-1 {
-          grid-column: 1;
-        }
-
-        .column-1 {
-          grid-row: 2;
-        }
-
-        .column-2 {
-          grid-column: 2;
-        }
-
-        .column-3,
-        .column-4 {
-          grid-column: 3;
-        }
-
-        .column-4 {
-          grid-row: 2;
-        }
-      }
-
-      @media screen and (max-width: 600px) {
-        .column-1 {
-          display: block;
-        }
-      }
-
-      @media screen and (max-width: $no-gap-breakpoint) {
-        .column-0,
-        .column-1,
-        .column-3,
-        .column-4 {
-          display: none;
-        }
-      }
-    }
-
-    h4 {
-      text-transform: uppercase;
-      font-weight: 700;
-      margin-bottom: 8px;
-      color: $darker-text-color;
-
-      a {
-        color: inherit;
-        text-decoration: none;
-      }
-    }
-
-    ul a {
-      text-decoration: none;
-      color: lighten($ui-base-color, 34%);
-
-      &:hover,
-      &:active,
-      &:focus {
-        text-decoration: underline;
-      }
-    }
-
-    .brand {
-      svg {
-        display: block;
-        height: 36px;
-        width: auto;
-        margin: 0 auto;
-        fill: lighten($ui-base-color, 34%);
-      }
-
-      &:hover,
-      &:focus,
-      &:active {
-        svg {
-          fill: lighten($ui-base-color, 38%);
-        }
-      }
-    }
-  }
-}
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 65f53471d..1841dc8bf 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -6,9 +6,10 @@ code {
 }
 
 .form-container {
-  max-width: 400px;
+  max-width: 450px;
   padding: 20px;
-  margin: 0 auto;
+  padding-bottom: 50px;
+  margin: 50px auto;
 }
 
 .indicator-icon {
@@ -102,7 +103,8 @@ code {
         }
       }
 
-      .recommended {
+      .recommended,
+      .not_recommended {
         position: absolute;
         margin: 0 4px;
         margin-top: -2px;
@@ -123,10 +125,22 @@ code {
   }
 
   .title {
-    color: #d9e1e8;
-    font-size: 20px;
-    line-height: 28px;
-    font-weight: 400;
+    font-size: 28px;
+    line-height: 33px;
+    font-weight: 700;
+    margin-bottom: 15px;
+  }
+
+  .lead {
+    font-size: 17px;
+    line-height: 22px;
+    color: $secondary-text-color;
+    margin-bottom: 30px;
+  }
+
+  .rules-list {
+    font-size: 17px;
+    line-height: 22px;
     margin-bottom: 30px;
   }
 
@@ -240,7 +254,7 @@ code {
 
     & > label {
       font-family: inherit;
-      font-size: 16px;
+      font-size: 14px;
       color: $primary-text-color;
       display: block;
       font-weight: 500;
@@ -256,6 +270,10 @@ code {
     }
   }
 
+  .input.with_block_label.user_role_permissions_as_keys ul {
+    columns: unset;
+  }
+
   .input.datetime .label_input select {
     display: inline-block;
     width: auto;
@@ -273,6 +291,20 @@ code {
     .input:last-child {
       margin-bottom: 0;
     }
+
+    &__thumbnail {
+      display: block;
+      margin: 0;
+      margin-bottom: 10px;
+      max-width: 100%;
+      height: auto;
+      border-radius: 4px;
+      background: url("images/void.png");
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .fields-row {
@@ -352,7 +384,7 @@ code {
         flex: 1 1 auto;
       }
 
-      input[type=checkbox] {
+      input[type="checkbox"] {
         position: absolute;
         left: 0;
         top: 5px;
@@ -368,11 +400,12 @@ code {
     border-radius: 4px;
   }
 
-  input[type=text],
-  input[type=number],
-  input[type=email],
-  input[type=password],
-  input[type=url],
+  input[type="text"],
+  input[type="number"],
+  input[type="email"],
+  input[type="password"],
+  input[type="url"],
+  input[type="datetime-local"],
   textarea {
     box-sizing: border-box;
     font-size: 16px;
@@ -410,10 +443,11 @@ code {
     }
   }
 
-  input[type=text],
-  input[type=number],
-  input[type=email],
-  input[type=password] {
+  input[type="text"],
+  input[type="number"],
+  input[type="email"],
+  input[type="password"],
+  input[type="datetime-local"] {
     &:focus:invalid:not(:placeholder-shown),
     &:required:invalid:not(:placeholder-shown) {
       border-color: lighten($error-red, 12%);
@@ -425,10 +459,11 @@ code {
       color: lighten($error-red, 12%);
     }
 
-    input[type=text],
-    input[type=number],
-    input[type=email],
-    input[type=password],
+    input[type="text"],
+    input[type="number"],
+    input[type="email"],
+    input[type="password"],
+    input[type="datetime-local"],
     textarea,
     select {
       border-color: lighten($error-red, 12%);
@@ -456,6 +491,11 @@ code {
     }
   }
 
+  .stacked-actions {
+    margin-top: 30px;
+    margin-bottom: 15px;
+  }
+
   button,
   .button,
   .block-button {
@@ -463,14 +503,14 @@ code {
     width: 100%;
     border: 0;
     border-radius: 4px;
-    background: $ui-highlight-color;
+    background: darken($ui-highlight-color, 2%);
     color: $primary-text-color;
     font-size: 18px;
     line-height: inherit;
     height: auto;
     padding: 10px;
-    text-transform: uppercase;
     text-decoration: none;
+    text-transform: uppercase;
     text-align: center;
     box-sizing: border-box;
     cursor: pointer;
@@ -483,13 +523,10 @@ code {
       margin-right: 0;
     }
 
-    &:hover {
-      background-color: lighten($ui-highlight-color, 5%);
-    }
-
     &:active,
-    &:focus {
-      background-color: darken($ui-highlight-color, 5%);
+    &:focus,
+    &:hover {
+      background-color: $ui-highlight-color;
     }
 
     &:disabled:hover {
@@ -510,6 +547,16 @@ code {
     }
   }
 
+  .button.button-tertiary {
+    padding: 9px;
+
+    &:hover,
+    &:focus,
+    &:active {
+      padding: 10px;
+    }
+  }
+
   select {
     appearance: none;
     box-sizing: border-box;
@@ -564,41 +611,6 @@ code {
       }
     }
   }
-
-  &__overlay-area {
-    position: relative;
-
-    &__blurred form {
-      filter: blur(2px);
-    }
-
-    &__overlay {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      background: rgba($ui-base-color, 0.65);
-      border-radius: 4px;
-      margin-left: -4px;
-      margin-top: -4px;
-      padding: 4px;
-
-      &__content {
-        text-align: center;
-
-        &.rich-formatting {
-          &,
-          p {
-            color: $primary-text-color;
-          }
-        }
-      }
-    }
-  }
 }
 
 .block-icon {
@@ -800,9 +812,41 @@ code {
       }
     }
   }
+}
 
-  @media screen and (max-width: 740px) and (min-width: 441px) {
-    margin-top: 40px;
+.oauth-prompt {
+  h3 {
+    color: $ui-secondary-color;
+    font-size: 17px;
+    line-height: 22px;
+    font-weight: 500;
+    margin-bottom: 30px;
+  }
+
+  p {
+    font-size: 14px;
+    line-height: 18px;
+    margin-bottom: 30px;
+  }
+
+  .permissions-list {
+    border: 1px solid $ui-base-color;
+    border-radius: 4px;
+    background: darken($ui-base-color, 4%);
+    margin-bottom: 30px;
+  }
+
+  .actions {
+    margin: 0 -10px;
+    display: flex;
+
+    form {
+      box-sizing: border-box;
+      padding: 0 10px;
+      flex: 1 1 auto;
+      min-height: 1px;
+      width: 50%;
+    }
   }
 }
 
@@ -837,24 +881,7 @@ code {
   }
 }
 
-.table-form {
-  p {
-    margin-bottom: 15px;
-
-    strong {
-      font-weight: 500;
-
-      @each $lang in $cjk-langs {
-        &:lang(#{$lang}) {
-          font-weight: 700;
-        }
-      }
-    }
-  }
-}
-
-.simple_form,
-.table-form {
+.simple_form {
   .warning {
     box-sizing: border-box;
     background: rgba($error-value-color, 0.5);
@@ -968,7 +995,7 @@ code {
     flex: 1 1 auto;
   }
 
-  input[type=text] {
+  input[type="text"] {
     background: transparent;
     border: 0;
     padding: 10px;
@@ -1005,3 +1032,77 @@ code {
     display: none;
   }
 }
+
+.permissions-list {
+  &__item {
+    padding: 15px;
+    color: $ui-secondary-color;
+    border-bottom: 1px solid lighten($ui-base-color, 4%);
+    display: flex;
+    align-items: center;
+
+    &__text {
+      flex: 1 1 auto;
+
+      &__title {
+        font-weight: 500;
+      }
+
+      &__type {
+        color: $darker-text-color;
+      }
+    }
+
+    &__icon {
+      flex: 0 0 auto;
+      font-size: 18px;
+      width: 30px;
+      color: $valid-value-color;
+      display: flex;
+      align-items: center;
+    }
+
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+}
+
+// Only remove padding when listing applications, to prevent styling issues on
+// the Authorization page.
+.applications-list {
+  .permissions-list__item:last-child {
+    padding-bottom: 0;
+  }
+}
+
+.keywords-table {
+  thead {
+    th {
+      white-space: nowrap;
+    }
+
+    th:first-child {
+      width: 100%;
+    }
+  }
+
+  tfoot {
+    td {
+      border: 0;
+    }
+  }
+
+  .input.string {
+    margin-bottom: 0;
+  }
+
+  .label_input__wrapper {
+    margin-top: 10px;
+  }
+
+  .table-action-link {
+    margin-top: 10px;
+    white-space: nowrap;
+  }
+}
diff --git a/app/javascript/styles/mastodon/introduction.scss b/app/javascript/styles/mastodon/introduction.scss
deleted file mode 100644
index b44ae7306..000000000
--- a/app/javascript/styles/mastodon/introduction.scss
+++ /dev/null
@@ -1,154 +0,0 @@
-.introduction {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  height: 100vh;
-  background: $ui-base-color;
-
-  @media screen and (max-width: 920px) {
-    display: block !important;
-  }
-
-  &__pager {
-    background: darken($ui-base-color, 8%);
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-    overflow: hidden;
-  }
-
-  &__pager,
-  &__frame {
-    border-radius: 10px;
-    width: 50vw;
-    min-width: 920px;
-
-    @media screen and (max-width: 920px) {
-      min-width: 0;
-      width: 100%;
-      border-radius: 0;
-      box-shadow: none;
-    }
-  }
-
-  &__frame-wrapper {
-    opacity: 0;
-    transition: opacity 500ms linear;
-
-    &.active {
-      opacity: 1;
-      transition: opacity 50ms linear;
-    }
-  }
-
-  &__frame {
-    overflow: hidden;
-  }
-
-  &__illustration {
-    height: 50vh;
-
-    @media screen and (max-width: 630px) {
-      height: auto;
-    }
-
-    img {
-      object-fit: cover;
-      display: block;
-      margin: 0;
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  &__text {
-    border-top: 2px solid $ui-highlight-color;
-
-    &--columnized {
-      display: flex;
-
-      & > div {
-        flex: 1 1 33.33%;
-        text-align: center;
-        padding: 25px;
-        padding-bottom: 30px;
-      }
-
-      @media screen and (max-width: 630px) {
-        display: block;
-        padding: 15px 0;
-        padding-bottom: 20px;
-
-        & > div {
-          padding: 10px 25px;
-        }
-      }
-    }
-
-    h3 {
-      font-size: 24px;
-      line-height: 1.5;
-      font-weight: 700;
-      margin-bottom: 10px;
-    }
-
-    p {
-      font-size: 16px;
-      line-height: 24px;
-      font-weight: 400;
-      color: $darker-text-color;
-
-      code {
-        display: inline-block;
-        background: darken($ui-base-color, 8%);
-        font-size: 15px;
-        border: 1px solid lighten($ui-base-color, 8%);
-        border-radius: 2px;
-        padding: 1px 3px;
-      }
-    }
-
-    &--centered {
-      padding: 25px;
-      padding-bottom: 30px;
-      text-align: center;
-    }
-  }
-
-  &__dots {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 25px;
-
-    @media screen and (max-width: 630px) {
-      display: none;
-    }
-  }
-
-  &__dot {
-    width: 14px;
-    height: 14px;
-    border-radius: 14px;
-    border: 1px solid $ui-highlight-color;
-    background: transparent;
-    margin: 0 3px;
-    cursor: pointer;
-
-    &:hover {
-      background: lighten($ui-base-color, 8%);
-    }
-
-    &.active {
-      cursor: default;
-      background: $ui-highlight-color;
-    }
-  }
-
-  &__action {
-    padding: 25px;
-    padding-top: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-}
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 6c6de4206..a333926dd 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
 .modal-layout {
-  background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}"/></svg>') repeat-x bottom fixed;
+  background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}33"/></svg>') repeat-x bottom fixed;
   display: flex;
   flex-direction: column;
   height: 100vh;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index ad7088982..f553c5501 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -64,16 +64,16 @@
       max-width: calc(100% - 45px - 25px);
     }
 
-    input[type=radio],
-    input[type=checkbox] {
+    input[type="radio"],
+    input[type="checkbox"] {
       display: none;
     }
 
-    .autossugest-input {
+    .autosuggest-input {
       flex: 1 1 auto;
     }
 
-    input[type=text] {
+    input[type="text"] {
       display: block;
       box-sizing: border-box;
       width: 100%;
@@ -109,7 +109,6 @@
     box-sizing: border-box;
     width: 18px;
     height: 18px;
-    flex: 0 0 auto;
     margin-right: 10px;
     top: -1px;
     border-radius: 50%;
@@ -143,6 +142,21 @@
     &:active {
       outline: 0 !important;
     }
+
+    &.disabled {
+      border-color: $dark-text-color;
+
+      &.active {
+        background: $dark-text-color;
+      }
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: $dark-text-color;
+        border-width: 1px;
+      }
+    }
   }
 
   &__number {
@@ -183,7 +197,7 @@
 
     &:active,
     &:focus {
-      background-color: rgba($dark-text-color, .1);
+      background-color: rgba($dark-text-color, 0.1);
     }
   }
 
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index ea7bb5113..ccec8e95e 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -12,11 +12,6 @@ body.rtl {
     margin-left: 10px;
   }
 
-  .directory__card__bar .display-name {
-    margin-left: 0;
-    margin-right: 15px;
-  }
-
   .display-name,
   .announcements__item {
     text-align: right;
@@ -58,16 +53,6 @@ body.rtl {
     right: -26px;
   }
 
-  .landing-page__logo {
-    margin-right: 0;
-    margin-left: 20px;
-  }
-
-  .landing-page .features-list .features-list__row .visual {
-    margin-left: 0;
-    margin-right: 15px;
-  }
-
   .column-link__icon,
   .column-header__icon {
     margin-right: 0;
@@ -355,44 +340,6 @@ body.rtl {
     margin-left: 45px;
   }
 
-  .landing-page .header-wrapper .mascot {
-    right: 60px;
-    left: auto;
-  }
-
-  .landing-page__call-to-action .row__information-board {
-    direction: rtl;
-  }
-
-  .landing-page .header .hero .floats .float-1 {
-    left: -120px;
-    right: auto;
-  }
-
-  .landing-page .header .hero .floats .float-2 {
-    left: 210px;
-    right: auto;
-  }
-
-  .landing-page .header .hero .floats .float-3 {
-    left: 110px;
-    right: auto;
-  }
-
-  .landing-page .header .links .brand img {
-    left: 0;
-  }
-
-  .landing-page .fa-external-link {
-    padding-right: 5px;
-    padding-left: 0 !important;
-  }
-
-  .landing-page .features #mastodon-timeline {
-    margin-right: 0;
-    margin-left: 30px;
-  }
-
   @media screen and (min-width: 631px) {
     .column,
     .drawer {
@@ -420,32 +367,6 @@ body.rtl {
     padding-right: 0;
   }
 
-  .public-layout {
-    .header {
-      .nav-button {
-        margin-left: 8px;
-        margin-right: 0;
-      }
-    }
-
-    .public-account-header__tabs {
-      margin-left: 0;
-      margin-right: 20px;
-    }
-  }
-
-  .landing-page__information {
-    .account__display-name {
-      margin-right: 0;
-      margin-left: 5px;
-    }
-
-    .account__avatar-wrapper {
-      margin-left: 12px;
-      margin-right: 0;
-    }
-  }
-
   .card__bar .display-name {
     margin-left: 0;
     margin-right: 15px;
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 078714325..ce71d11e4 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -80,7 +80,7 @@
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;
-  background: $ui-highlight-color;
+  background: darken($ui-highlight-color, 2%);
   color: $primary-text-color;
   text-transform: none;
   line-height: 1.2;
@@ -104,7 +104,7 @@
   &:active,
   &:focus,
   &:hover {
-    background: lighten($ui-highlight-color, 10%);
+    background: $ui-highlight-color;
   }
 
   &:disabled,
@@ -137,9 +137,8 @@ a.button.logo-button {
   justify-content: center;
 }
 
-.embed,
-.public-layout {
-  .status__content[data-spoiler=folded] {
+.embed {
+  .status__content[data-spoiler="folded"] {
     .e-content {
       display: none;
     }
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index 36bc07a72..b644b38f1 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -65,6 +65,24 @@
     }
   }
 
+  &.horizontal-table {
+    border-collapse: collapse;
+    border-style: hidden;
+
+    & > tbody > tr > th,
+    & > tbody > tr > td {
+      padding: 11px 10px;
+      background: transparent;
+      border: 1px solid lighten($ui-base-color, 8%);
+      color: $secondary-text-color;
+    }
+
+    & > tbody > tr > th {
+      color: $darker-text-color;
+      font-weight: 600;
+    }
+  }
+
   &.batch-table {
     & > thead > tr > th {
       background: $ui-base-color;
@@ -160,6 +178,9 @@ a.table-action-link {
   }
 
   &__toolbar {
+    position: sticky;
+    top: 0;
+    z-index: 1;
     border: 1px solid darken($ui-base-color, 8%);
     background: $ui-base-color;
     border-radius: 4px 0 0;
@@ -172,6 +193,55 @@ a.table-action-link {
     }
   }
 
+  &__select-all {
+    background: $ui-base-color;
+    height: 47px;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid darken($ui-base-color, 8%);
+    border-top: 0;
+    color: $secondary-text-color;
+    display: none;
+
+    &.active {
+      display: flex;
+    }
+
+    .selected,
+    .not-selected {
+      display: none;
+
+      &.active {
+        display: block;
+      }
+    }
+
+    strong {
+      font-weight: 700;
+    }
+
+    span {
+      padding: 8px;
+      display: inline-block;
+    }
+
+    button {
+      background: transparent;
+      border: 0;
+      font: inherit;
+      color: $highlight-text-color;
+      border-radius: 4px;
+      font-weight: 700;
+      padding: 8px;
+
+      &:hover,
+      &:focus,
+      &:active {
+        background: lighten($ui-base-color, 8%);
+      }
+    }
+  }
+
   &__form {
     padding: 16px;
     border: 1px solid darken($ui-base-color, 8%);
@@ -210,6 +280,7 @@ a.table-action-link {
     &__content {
       padding-top: 12px;
       padding-bottom: 16px;
+      overflow: hidden;
 
       &--unpadded {
         padding: 0;
@@ -296,3 +367,9 @@ a.table-action-link {
     }
   }
 }
+
+.one-liner {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index f463419c8..2f6c41d5f 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -12,7 +12,7 @@ $red-bookmark: $warning-red;
 $classic-base-color: #282c37;         // Midnight Express
 $classic-primary-color: #9baec8;      // Echo Blue
 $classic-secondary-color: #d9e1e8;    // Pattens Blue
-$classic-highlight-color: #2b90d9;    // Summer Sky
+$classic-highlight-color: #6364ff;    // Brand purple
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;
@@ -34,10 +34,11 @@ $primary-text-color: $white !default;
 $darker-text-color: $ui-primary-color !default;
 $dark-text-color: $ui-base-lighter-color !default;
 $secondary-text-color: $ui-secondary-color !default;
-$highlight-text-color: $ui-highlight-color !default;
+$highlight-text-color: lighten($ui-highlight-color, 8%) !default;
 $action-button-color: $ui-base-lighter-color !default;
 $passive-text-color: $gold-star !default;
 $active-passive-text-color: $success-green !default;
+
 // For texts on inverted backgrounds
 $inverted-text-color: $ui-base-color !default;
 $lighter-text-color: $ui-base-lighter-color !default;
@@ -48,10 +49,11 @@ $cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
 
 // Variables for components
 $media-modal-media-max-width: 100%;
+
 // put margins on top and bottom of image to avoid the screen covered by image.
 $media-modal-media-max-height: 80%;
 
-$no-gap-breakpoint: 415px;
+$no-gap-breakpoint: 1175px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;
 $font-display: 'mastodon-font-display' !default;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 43284eb48..7a25d121b 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -39,6 +39,8 @@
       width: 20px;
       height: 20px;
       margin: -3px 0 0;
+      margin-left: 0.075em;
+      margin-right: 0.075em;
     }
 
     p {
@@ -112,13 +114,6 @@
   }
 }
 
-.box-widget {
-  padding: 20px;
-  border-radius: 4px;
-  background: $ui-base-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-}
-
 .placeholder-widget {
   padding: 16px;
   border-radius: 4px;
@@ -128,47 +123,6 @@
   margin-bottom: 10px;
 }
 
-.contact-widget {
-  min-height: 100%;
-  font-size: 15px;
-  color: $darker-text-color;
-  line-height: 20px;
-  word-wrap: break-word;
-  font-weight: 400;
-  padding: 0;
-
-  h4 {
-    padding: 10px;
-    text-transform: uppercase;
-    font-weight: 700;
-    font-size: 13px;
-    color: $darker-text-color;
-  }
-
-  .account {
-    border-bottom: 0;
-    padding: 10px 0;
-    padding-top: 5px;
-  }
-
-  & > a {
-    display: inline-block;
-    padding: 10px;
-    padding-top: 0;
-    color: $darker-text-color;
-    text-decoration: none;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: underline;
-    }
-  }
-}
-
 .moved-account-widget {
   padding: 15px;
   padding-bottom: 20px;
@@ -249,37 +203,6 @@
   margin-bottom: 10px;
 }
 
-.page-header {
-  background: lighten($ui-base-color, 8%);
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  border-radius: 4px;
-  padding: 60px 15px;
-  text-align: center;
-  margin: 10px 0;
-
-  h1 {
-    color: $primary-text-color;
-    font-size: 36px;
-    line-height: 1.1;
-    font-weight: 700;
-    margin-bottom: 10px;
-  }
-
-  p {
-    font-size: 15px;
-    color: $darker-text-color;
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    margin-top: 0;
-    background: lighten($ui-base-color, 4%);
-
-    h1 {
-      font-size: 24px;
-    }
-  }
-}
-
 .directory {
   background: $ui-base-color;
   border-radius: 4px;
@@ -366,34 +289,6 @@
   }
 }
 
-.avatar-stack {
-  display: flex;
-  justify-content: flex-end;
-
-  .account__avatar {
-    flex: 0 0 auto;
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    position: relative;
-    margin-left: -10px;
-    background: darken($ui-base-color, 8%);
-    border: 2px solid $ui-base-color;
-
-    &:nth-child(1) {
-      z-index: 1;
-    }
-
-    &:nth-child(2) {
-      z-index: 2;
-    }
-
-    &:nth-child(3) {
-      z-index: 3;
-    }
-  }
-}
-
 .accounts-table {
   width: 100%;
 
@@ -466,8 +361,9 @@
     vertical-align: initial !important;
   }
 
-  &__interrelationships {
+  tbody td.accounts-table__interrelationships {
     width: 21px;
+    padding-right: 16px;
   }
 
   .fa {
@@ -495,11 +391,7 @@
 
 .moved-account-widget,
 .memoriam-widget,
-.box-widget,
-.contact-widget,
-.landing-page__information.contact-widget,
-.directory,
-.page-header {
+.directory {
   @media screen and (max-width: $no-gap-breakpoint) {
     margin-bottom: 0;
     box-shadow: none;
@@ -507,88 +399,6 @@
   }
 }
 
-$maximum-width: 1235px;
-$fluid-breakpoint: $maximum-width + 20px;
-
-.statuses-grid {
-  min-height: 600px;
-
-  @media screen and (max-width: 640px) {
-    width: 100% !important; // Masonry layout is unnecessary at this width
-  }
-
-  &__item {
-    width: math.div(960px - 20px, 3);
-
-    @media screen and (max-width: $fluid-breakpoint) {
-      width: math.div(940px - 20px, 3);
-    }
-
-    @media screen and (max-width: 640px) {
-      width: 100%;
-    }
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      width: 100vw;
-    }
-  }
-
-  .detailed-status {
-    border-radius: 4px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-top: 1px solid lighten($ui-base-color, 16%);
-    }
-
-    &.compact {
-      .detailed-status__meta {
-        margin-top: 15px;
-      }
-
-      .status__content {
-        font-size: 15px;
-        line-height: 20px;
-
-        .emojione {
-          width: 20px;
-          height: 20px;
-          margin: -3px 0 0;
-        }
-
-        .status__content__spoiler-link {
-          line-height: 20px;
-          margin: 0;
-        }
-      }
-
-      .media-gallery,
-      .status-card,
-      .video-player {
-        margin-top: 15px;
-      }
-    }
-  }
-}
-
-.notice-widget {
-  margin-bottom: 10px;
-  color: $darker-text-color;
-
-  p {
-    margin-bottom: 10px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  a {
-    font-size: 14px;
-    line-height: 20px;
-  }
-}
-
-.notice-widget,
 .placeholder-widget {
   a {
     text-decoration: none;
@@ -602,37 +412,3 @@ $fluid-breakpoint: $maximum-width + 20px;
     }
   }
 }
-
-.table-of-contents {
-  background: darken($ui-base-color, 4%);
-  min-height: 100%;
-  font-size: 14px;
-  border-radius: 4px;
-
-  li a {
-    display: block;
-    font-weight: 500;
-    padding: 15px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    text-decoration: none;
-    color: $primary-text-color;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: underline;
-    }
-  }
-
-  li:last-child a {
-    border-bottom: 0;
-  }
-
-  li ul {
-    padding-left: 20px;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
-  }
-}
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
index 3e184e775..f51bde492 100644
--- a/app/lib/access_token_extension.rb
+++ b/app/lib/access_token_extension.rb
@@ -4,6 +4,8 @@ module AccessTokenExtension
   extend ActiveSupport::Concern
 
   included do
+    include Redisable
+
     after_commit :push_to_streaming_api
   end
 
@@ -11,7 +13,11 @@ module AccessTokenExtension
     update(revoked_at: clock.now.utc)
   end
 
+  def update_last_used(request, clock = Time)
+    update(last_used_at: clock.now.utc, last_used_ip: request.remote_ip)
+  end
+
   def push_to_streaming_api
-    Redis.current.publish("timeline:access_token:#{id}", Oj.dump(event: :kill)) if revoked? || destroyed?
+    redis.publish("timeline:access_token:#{id}", Oj.dump(event: :kill)) if revoked? || destroyed?
   end
 end
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 3aeecb4ec..f4c67cccd 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -3,6 +3,7 @@
 class ActivityPub::Activity
   include JsonLdHelper
   include Redisable
+  include Lockable
 
   SUPPORTED_TYPES = %w(Note Question).freeze
   CONVERTED_TYPES = %w(Image Audio Video Article Page Event).freeze
@@ -71,15 +72,7 @@ class ActivityPub::Activity
   end
 
   def object_uri
-    @object_uri ||= begin
-      str = value_or_id(@object)
-
-      if str&.start_with?('bear:')
-        Addressable::URI.parse(str).query_values['u']
-      else
-        str
-      end
-    end
+    @object_uri ||= uri_from_bearcap(value_or_id(@object))
   end
 
   def unsupported_object_type?
@@ -94,49 +87,6 @@ class ActivityPub::Activity
     equals_or_includes_any?(@object['type'], CONVERTED_TYPES)
   end
 
-  def distribute(status)
-    crawl_links(status)
-
-    notify_about_reblog(status) if reblog_of_local_account?(status) && !reblog_by_following_group_account?(status)
-    notify_about_mentions(status)
-
-    # Only continue if the status is supposed to have arrived in real-time.
-    # Note that if @options[:override_timestamps] isn't set, the status
-    # may have a lower snowflake id than other existing statuses, potentially
-    # "hiding" it from paginated API calls
-    return unless @options[:override_timestamps] || status.within_realtime_window?
-
-    distribute_to_followers(status)
-  end
-
-  def reblog_of_local_account?(status)
-    status.reblog? && status.reblog.account.local?
-  end
-
-  def reblog_by_following_group_account?(status)
-    status.reblog? && status.account.group? && status.reblog.account.following?(status.account)
-  end
-
-  def notify_about_reblog(status)
-    NotifyService.new.call(status.reblog.account, :reblog, status)
-  end
-
-  def notify_about_mentions(status)
-    status.active_mentions.includes(:account).each do |mention|
-      next unless mention.account.local? && audience_includes?(mention.account)
-      NotifyService.new.call(mention.account, :mention, mention)
-    end
-  end
-
-  def crawl_links(status)
-    # Spread out crawling randomly to avoid DDoSing the link
-    LinkCrawlWorker.perform_in(rand(1..59).seconds, status.id)
-  end
-
-  def distribute_to_followers(status)
-    ::DistributionWorker.perform_async(status.id)
-  end
-
   def delete_arrived_first?(uri)
     redis.exists?("delete_upon_arrival:#{@account.id}:#{uri}")
   end
@@ -166,12 +116,12 @@ class ActivityPub::Activity
   def dereference_object!
     return unless @object.is_a?(String)
 
-    dereferencer = ActivityPub::Dereferencer.new(@object, permitted_origin: @account.uri, signature_account: signed_fetch_account)
+    dereferencer = ActivityPub::Dereferencer.new(@object, permitted_origin: @account.uri, signature_actor: signed_fetch_actor)
 
     @object = dereferencer.object unless dereferencer.object.nil?
   end
 
-  def signed_fetch_account
+  def signed_fetch_actor
     return Account.find(@options[:delivered_to_account_id]) if @options[:delivered_to_account_id].present?
 
     first_mentioned_local_account || first_local_follower
@@ -208,36 +158,20 @@ class ActivityPub::Activity
     end
   end
 
-  def lock_or_return(key, expire_after = 2.hours.seconds)
-    yield if redis.set(key, true, nx: true, ex: expire_after)
-  ensure
-    redis.del(key)
-  end
-
-  def lock_or_fail(key, expire_after = 15.minutes.seconds)
-    RedisLock.acquire({ redis: Redis.current, key: key, autorelease: expire_after }) do |lock|
-      if lock.acquired?
-        yield
-      else
-        raise Mastodon::RaceConditionError
-      end
-    end
-  end
-
   def fetch?
     !@options[:delivery]
   end
 
   def followed_by_local_accounts?
-    @account.passive_relationships.exists? || @options[:relayed_through_account]&.passive_relationships&.exists?
+    @account.passive_relationships.exists? || (@options[:relayed_through_actor].is_a?(Account) && @options[:relayed_through_actor].passive_relationships&.exists?)
   end
 
   def requested_through_relay?
-    @options[:relayed_through_account] && Relay.find_by(inbox_url: @options[:relayed_through_account].inbox_url)&.enabled?
+    @options[:relayed_through_actor] && Relay.find_by(inbox_url: @options[:relayed_through_actor].inbox_url)&.enabled?
   end
 
   def reject_payload!
-    Rails.logger.info("Rejected #{@json['type']} activity #{@json['id']} from #{@account.uri}#{@options[:relayed_through_account] && "via #{@options[:relayed_through_account].uri}"}")
+    Rails.logger.info("Rejected #{@json['type']} activity #{@json['id']} from #{@account.uri}#{@options[:relayed_through_actor] && "via #{@options[:relayed_through_actor].uri}"}")
     nil
   end
 end
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb
index 7010ff43e..5126e23c6 100644
--- a/app/lib/activitypub/activity/accept.rb
+++ b/app/lib/activitypub/activity/accept.rb
@@ -3,7 +3,7 @@
 class ActivityPub::Activity::Accept < ActivityPub::Activity
   def perform
     return accept_follow_for_relay if relay_follow?
-    return follow_request_from_object.authorize! unless follow_request_from_object.nil?
+    return accept_follow!(follow_request_from_object) unless follow_request_from_object.nil?
 
     case @object['type']
     when 'Follow'
@@ -19,7 +19,16 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
     return if target_account.nil? || !target_account.local?
 
     follow_request = FollowRequest.find_by(account: target_account, target_account: @account)
-    follow_request&.authorize!
+    accept_follow!(follow_request)
+  end
+
+  def accept_follow!(request)
+    return if request.nil?
+
+    is_first_follow = !request.target_account.followers.local.exists?
+    request.authorize!
+
+    RemoteAccountRefreshWorker.perform_async(request.target_account_id) if is_first_follow
   end
 
   def accept_follow_for_relay
diff --git a/app/lib/activitypub/activity/add.rb b/app/lib/activitypub/activity/add.rb
index 688ab00b3..9e2483983 100644
--- a/app/lib/activitypub/activity/add.rb
+++ b/app/lib/activitypub/activity/add.rb
@@ -2,13 +2,32 @@
 
 class ActivityPub::Activity::Add < ActivityPub::Activity
   def perform
-    return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url
+    return if @json['target'].blank?
 
-    status   = status_from_uri(object_uri)
-    status ||= fetch_remote_original_status
+    case value_or_id(@json['target'])
+    when @account.featured_collection_url
+      case @object['type']
+      when 'Hashtag'
+        add_featured_tags
+      else
+        add_featured
+      end
+    end
+  end
+
+  private
+
+  def add_featured
+    status = status_from_object
 
     return unless !status.nil? && status.account_id == @account.id && !@account.pinned?(status)
 
     StatusPin.create!(account: @account, status: status)
   end
+
+  def add_featured_tags
+    name = @object['name']&.delete_prefix('#')
+
+    FeaturedTag.create!(account: @account, name: name) if name.present?
+  end
 end
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 6c5d88d18..e6674be8a 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -4,10 +4,11 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
   def perform
     return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity?
 
-    lock_or_fail("announce:#{@object['id']}") do
+    with_lock("announce:#{value_or_id(@object)}") do
       original_status = status_from_object
 
       return reject_payload! if original_status.nil? || !announceable?(original_status)
+      return if requested_through_relay?
 
       @status = Status.find_by(account: @account, reblog: original_status)
 
@@ -22,10 +23,9 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
         visibility: visibility_from_audience
       )
 
-      Trends.tags.register(@status)
-      Trends.links.register(@status)
+      Trends.register!(@status)
 
-      distribute(@status)
+      distribute
     end
 
     @status
@@ -33,6 +33,22 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
 
   private
 
+  def distribute
+    # Notify the author of the original status if that status is local
+    LocalNotificationWorker.perform_async(@status.reblog.account_id, @status.id, 'Status', 'reblog') if reblog_of_local_account?(@status) && !reblog_by_following_group_account?(@status)
+
+    # Distribute into home and list feeds
+    ::DistributionWorker.perform_async(@status.id) if @options[:override_timestamps] || @status.within_realtime_window?
+  end
+
+  def reblog_of_local_account?(status)
+    status.reblog? && status.reblog.account.local?
+  end
+
+  def reblog_by_following_group_account?(status)
+    status.reblog? && status.account.group? && status.reblog.account.following?(status.account)
+  end
+
   def audience_to
     as_array(@json['to']).map { |x| value_or_id(x) }
   end
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 8a0dc9d33..b15e66ca2 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Create < ActivityPub::Activity
+  include FormattingHelper
+
   def perform
     dereference_object!
 
@@ -45,7 +47,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def create_status
     return reject_payload! if unsupported_object_type? || invalid_origin?(object_uri) || tombstone_exists? || !related_to_local_activity?
 
-    lock_or_fail("create:#{object_uri}") do
+    with_lock("create:#{object_uri}") do
       return if delete_arrived_first?(object_uri) || poll_vote?
 
       @status = find_existing_status
@@ -69,9 +71,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status
-    @tags     = []
-    @mentions = []
-    @params   = {}
+    @tags                 = []
+    @mentions             = []
+    @silenced_account_ids = []
+    @params               = {}
 
     process_status_params
     process_tags
@@ -84,10 +87,18 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     resolve_thread(@status)
     fetch_replies(@status)
-    distribute(@status)
+    distribute
     forward_for_reply
   end
 
+  def distribute
+    # Spread out crawling randomly to avoid DDoSing the link
+    LinkCrawlWorker.perform_in(rand(1..59).seconds, @status.id)
+
+    # Distribute into home and list feeds and notify mentioned accounts
+    ::DistributionWorker.perform_async(@status.id, { 'silenced_account_ids' => @silenced_account_ids }) if @options[:override_timestamps] || @status.within_realtime_window?
+  end
+
   def find_existing_status
     status   = status_from_uri(object_uri)
     status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present?
@@ -95,19 +106,22 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status_params
+    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
+
     @params = begin
       {
-        uri: object_uri,
-        url: object_url || object_uri,
+        uri: @status_parser.uri,
+        url: @status_parser.url || @status_parser.uri,
         account: @account,
-        text: text_from_content || '',
-        language: detected_language,
-        spoiler_text: converted_object_type? ? '' : (text_from_summary || ''),
-        created_at: @object['published'],
+        text: converted_object_type? ? converted_text : (@status_parser.text || ''),
+        language: @status_parser.language,
+        spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''),
+        created_at: @status_parser.created_at,
+        edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil,
         override_timestamps: @options[:override_timestamps],
-        reply: @object['inReplyTo'].present?,
-        sensitive: @account.sensitized? || @object['sensitive'] || false,
-        visibility: visibility_from_audience,
+        reply: @status_parser.reply,
+        sensitive: @account.sensitized? || @status_parser.sensitive || false,
+        visibility: @status_parser.visibility,
         thread: replied_to_status,
         conversation: conversation_from_uri(@object['conversation']),
         media_attachment_ids: process_attachments.take(4).map(&:id),
@@ -117,48 +131,50 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_audience
-    (audience_to + audience_cc).uniq.each do |audience|
-      next if ActivityPub::TagManager.instance.public_collection?(audience)
+    # Unlike with tags, there is no point in resolving accounts we don't already
+    # know here, because silent mentions would only be used for local access control anyway
+    accounts_in_audience = (audience_to + audience_cc).uniq.filter_map do |audience|
+      account_from_uri(audience) unless ActivityPub::TagManager.instance.public_collection?(audience)
+    end
 
-      # Unlike with tags, there is no point in resolving accounts we don't already
-      # know here, because silent mentions would only be used for local access
-      # control anyway
-      account = account_from_uri(audience)
+    # If the payload was delivered to a specific inbox, the inbox owner must have
+    # access to it, unless they already have access to it anyway
+    if @options[:delivered_to_account_id]
+      accounts_in_audience << delivered_to_account
+      accounts_in_audience.uniq!
+    end
 
-      next if account.nil? || @mentions.any? { |mention| mention.account_id == account.id }
+    accounts_in_audience.each do |account|
+      # This runs after tags are processed, and those translate into non-silent
+      # mentions, which take precedence
+      next if @mentions.any? { |mention| mention.account_id == account.id }
 
       @mentions << Mention.new(account: account, silent: true)
 
       # If there is at least one silent mention, then the status can be considered
       # as a limited-audience status, and not strictly a direct message, but only
       # if we considered a direct message in the first place
-      next unless @params[:visibility] == :direct
-
-      @params[:visibility] = :limited
+      @params[:visibility] = :limited if @params[:visibility] == :direct
     end
 
-    # If the payload was delivered to a specific inbox, the inbox owner must have
-    # access to it, unless they already have access to it anyway
-    return if @options[:delivered_to_account_id].nil? || @mentions.any? { |mention| mention.account_id == @options[:delivered_to_account_id] }
-
-    @mentions << Mention.new(account_id: @options[:delivered_to_account_id], silent: true)
-
-    return unless @params[:visibility] == :direct
-
-    @params[:visibility] = :limited
+    # Accounts that are tagged but are not in the audience are not
+    # supposed to be notified explicitly
+    @silenced_account_ids = @mentions.map(&:account_id) - accounts_in_audience.map(&:id)
   end
 
   def postprocess_audience_and_deliver
     return if @status.mentions.find_by(account_id: @options[:delivered_to_account_id])
 
-    delivered_to_account = Account.find(@options[:delivered_to_account_id])
-
     @status.mentions.create(account: delivered_to_account, silent: true)
     @status.update(visibility: :limited) if @status.direct_visibility?
 
     return unless delivered_to_account.following?(@account)
 
-    FeedInsertWorker.perform_async(@status.id, delivered_to_account.id, :home)
+    FeedInsertWorker.perform_async(@status.id, delivered_to_account.id, 'home')
+  end
+
+  def delivered_to_account
+    @delivered_to_account ||= Account.find(@options[:delivered_to_account_id])
   end
 
   def attach_tags(status)
@@ -206,7 +222,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     return if tag['href'].blank?
 
     account = account_from_uri(tag['href'])
-    account = ActivityPub::FetchRemoteAccountService.new.call(tag['href']) if account.nil?
+    account = ActivityPub::FetchRemoteAccountService.new.call(tag['href'], request_id: @options[:request_id]) if account.nil?
 
     return if account.nil?
 
@@ -215,21 +231,22 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
   def process_emoji(tag)
     return if skip_download?
-    return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank?
 
-    shortcode = tag['name'].delete(':')
-    image_url = tag['icon']['url']
-    uri       = tag['id']
-    updated   = tag['updated']
-    emoji     = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
+    custom_emoji_parser = ActivityPub::Parser::CustomEmojiParser.new(tag)
 
-    return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
+    return if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank?
 
-    emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
-    emoji.image_remote_url = image_url
-    emoji.save
-  rescue Seahorse::Client::NetworkingError => e
-    Rails.logger.warn "Error storing emoji: #{e}"
+    emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
+
+    return unless emoji.nil? || custom_emoji_parser.image_remote_url != emoji.image_remote_url || (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
+
+    begin
+      emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri)
+      emoji.image_remote_url = custom_emoji_parser.image_remote_url
+      emoji.save
+    rescue Seahorse::Client::NetworkingError => e
+      Rails.logger.warn "Error storing emoji: #{e}"
+    end
   end
 
   def process_attachments
@@ -238,14 +255,23 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     media_attachments = []
 
     as_array(@object['attachment']).each do |attachment|
-      next if attachment['url'].blank? || media_attachments.size >= 4
+      media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
+
+      next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4
 
       begin
-        href             = Addressable::URI.parse(attachment['url']).normalize.to_s
-        media_attachment = MediaAttachment.create(account: @account, remote_url: href, thumbnail_remote_url: icon_url_from_attachment(attachment), description: attachment['summary'].presence || attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil)
+        media_attachment = MediaAttachment.create(
+          account: @account,
+          remote_url: media_attachment_parser.remote_url,
+          thumbnail_remote_url: media_attachment_parser.thumbnail_remote_url,
+          description: media_attachment_parser.description,
+          focus: media_attachment_parser.focus,
+          blurhash: media_attachment_parser.blurhash
+        )
+
         media_attachments << media_attachment
 
-        next if unsupported_media_type?(attachment['mediaType']) || skip_download?
+        next if unsupported_media_type?(media_attachment_parser.file_content_type) || skip_download?
 
         media_attachment.download_file!
         media_attachment.download_thumbnail!
@@ -263,42 +289,17 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     media_attachments
   end
 
-  def icon_url_from_attachment(attachment)
-    url = attachment['icon'].is_a?(Hash) ? attachment['icon']['url'] : attachment['icon']
-    Addressable::URI.parse(url).normalize.to_s if url.present?
-  rescue Addressable::URI::InvalidURIError
-    nil
-  end
-
   def process_poll
-    return unless @object['type'] == 'Question' && (@object['anyOf'].is_a?(Array) || @object['oneOf'].is_a?(Array))
+    poll_parser = ActivityPub::Parser::PollParser.new(@object)
 
-    expires_at = begin
-      if @object['closed'].is_a?(String)
-        @object['closed']
-      elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
-        Time.now.utc
-      else
-        @object['endTime']
-      end
-    end
-
-    if @object['anyOf'].is_a?(Array)
-      multiple = true
-      items    = @object['anyOf']
-    else
-      multiple = false
-      items    = @object['oneOf']
-    end
-
-    voters_count = @object['votersCount']
+    return unless poll_parser.valid?
 
     @account.polls.new(
-      multiple: multiple,
-      expires_at: expires_at,
-      options: items.map { |item| item['name'].presence || item['content'] }.compact,
-      cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 },
-      voters_count: voters_count
+      multiple: poll_parser.multiple,
+      expires_at: poll_parser.expires_at,
+      options: poll_parser.options,
+      cached_tallies: poll_parser.cached_tallies,
+      voters_count: poll_parser.voters_count
     )
   end
 
@@ -314,7 +315,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     poll = replied_to_status.preloadable_poll
     already_voted = true
 
-    lock_or_fail("vote:#{replied_to_status.poll_id}:#{@account.id}") do
+    with_lock("vote:#{replied_to_status.poll_id}:#{@account.id}") do
       already_voted = poll.votes.where(account: @account).exists?
       poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: object_uri)
     end
@@ -351,23 +352,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
   end
 
-  def visibility_from_audience
-    if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
-      :public
-    elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
-      :unlisted
-    elsif audience_to.include?(@account.followers_url)
-      :private
-    else
-      :direct
-    end
-  end
-
-  def audience_includes?(account)
-    uri = ActivityPub::TagManager.instance.uri_for(account)
-    audience_to.include?(uri) || audience_cc.include?(uri)
-  end
-
   def replied_to_status
     return @replied_to_status if defined?(@replied_to_status)
 
@@ -384,81 +368,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     value_or_id(@object['inReplyTo'])
   end
 
-  def text_from_content
-    return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || object_uri].join(' ')) if converted_object_type?
-
-    if @object['content'].present?
-      @object['content']
-    elsif content_language_map?
-      @object['contentMap'].values.first
-    end
-  end
-
-  def text_from_summary
-    if @object['summary'].present?
-      @object['summary']
-    elsif summary_language_map?
-      @object['summaryMap'].values.first
-    end
-  end
-
-  def text_from_name
-    if @object['name'].present?
-      @object['name']
-    elsif name_language_map?
-      @object['nameMap'].values.first
-    end
-  end
-
-  def detected_language
-    if content_language_map?
-      @object['contentMap'].keys.first
-    elsif name_language_map?
-      @object['nameMap'].keys.first
-    elsif summary_language_map?
-      @object['summaryMap'].keys.first
-    elsif supported_object_type?
-      LanguageDetector.instance.detect(text_from_content, @account)
-    end
-  end
-
-  def object_url
-    return if @object['url'].blank?
-
-    url_candidate = url_to_href(@object['url'], 'text/html')
-
-    if invalid_origin?(url_candidate)
-      nil
-    else
-      url_candidate
-    end
-  end
-
-  def summary_language_map?
-    @object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
-  end
-
-  def content_language_map?
-    @object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty?
-  end
-
-  def name_language_map?
-    @object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty?
+  def converted_text
+    linkify([@status_parser.title.presence, @status_parser.spoiler_text.presence, @status_parser.url || @status_parser.uri].compact.join("\n\n"))
   end
 
   def unsupported_media_type?(mime_type)
     mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type)
   end
 
-  def supported_blurhash?(blurhash)
-    components = blurhash.blank? || !blurhash_valid_chars?(blurhash) ? nil : Blurhash.components(blurhash)
-    components.present? && components.none? { |comp| comp > 5 }
-  end
-
-  def blurhash_valid_chars?(blurhash)
-    /^[\w#$%*+-.:;=?@\[\]^{|}~]+$/.match?(blurhash)
-  end
-
   def skip_download?
     return @skip_download if defined?(@skip_download)
 
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 801647cf7..871eb3966 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -12,7 +12,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   private
 
   def delete_person
-    lock_or_return("delete_in_progress:#{@account.id}") do
+    with_lock("delete_in_progress:#{@account.id}", autorelease: 2.hours, raise_on_failure: false) do
       DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true)
     end
   end
@@ -20,14 +20,14 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def delete_note
     return if object_uri.nil?
 
-    lock_or_return("delete_status_in_progress:#{object_uri}", 5.minutes.seconds) do
+    with_lock("delete_status_in_progress:#{object_uri}", raise_on_failure: false) do
       unless invalid_origin?(object_uri)
         # This lock ensures a concurrent `ActivityPub::Activity::Create` either
         # does not create a status at all, or has finished saving it to the
         # database before we try to load it.
         # Without the lock, `delete_later!` could be called after `delete_arrived_first?`
         # and `Status.find` before `Status.create!`
-        lock_or_fail("create:#{object_uri}") { delete_later!(object_uri) }
+        with_lock("create:#{object_uri}") { delete_later!(object_uri) }
 
         Tombstone.find_or_create_by(uri: object_uri, account: @account)
       end
@@ -37,50 +37,16 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
 
       return if @status.nil?
 
-      forward! if @json['signature'].present? && @status.distributable?
+      forwarder.forward! if forwarder.forwardable?
       delete_now!
     end
   end
 
-  def rebloggers_ids
-    return @rebloggers_ids if defined?(@rebloggers_ids)
-    @rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
-  end
-
-  def inboxes_for_reblogs
-    Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes
-  end
-
-  def replied_to_status
-    return @replied_to_status if defined?(@replied_to_status)
-    @replied_to_status = @status.thread
-  end
-
-  def reply_to_local?
-    !replied_to_status.nil? && replied_to_status.account.local?
-  end
-
-  def inboxes_for_reply
-    replied_to_status.account.followers.inboxes
-  end
-
-  def forward!
-    inboxes = inboxes_for_reblogs
-    inboxes += inboxes_for_reply if reply_to_local?
-    inboxes -= [@account.preferred_inbox_url]
-
-    sender_id = reply_to_local? ? replied_to_status.account_id : rebloggers_ids.first
-
-    ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes.uniq) do |inbox_url|
-      [payload, sender_id, inbox_url]
-    end
+  def forwarder
+    @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
   end
 
   def delete_now!
     RemoveStatusService.new.call(@status, redraft: false)
   end
-
-  def payload
-    @payload ||= Oj.dump(@json)
-  end
 end
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 4efb84b8c..97e41ab78 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -31,10 +31,10 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
     follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id'])
 
     if target_account.locked? || @account.silenced?
-      NotifyService.new.call(target_account, :follow_request, follow_request)
+      LocalNotificationWorker.perform_async(target_account.id, follow_request.id, 'FollowRequest', 'follow_request')
     else
       AuthorizeFollowService.new.call(@account, target_account)
-      NotifyService.new.call(target_account, :follow, ::Follow.find_by(account: @account, target_account: target_account))
+      LocalNotificationWorker.perform_async(target_account.id, ::Follow.find_by(account: @account, target_account: target_account).id, 'Follow', 'follow')
     end
   end
 
diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb
index c065f01f8..aa1dc3040 100644
--- a/app/lib/activitypub/activity/like.rb
+++ b/app/lib/activitypub/activity/like.rb
@@ -7,6 +7,8 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
     return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) || @account.favourited?(original_status)
 
     favourite = original_status.favourites.create!(account: @account)
-    NotifyService.new.call(original_status.account, :favourite, favourite)
+
+    LocalNotificationWorker.perform_async(original_status.account_id, favourite.id, 'Favourite', 'favourite')
+    Trends.statuses.register(original_status)
   end
 end
diff --git a/app/lib/activitypub/activity/remove.rb b/app/lib/activitypub/activity/remove.rb
index f523ead9f..f5cbef675 100644
--- a/app/lib/activitypub/activity/remove.rb
+++ b/app/lib/activitypub/activity/remove.rb
@@ -2,8 +2,22 @@
 
 class ActivityPub::Activity::Remove < ActivityPub::Activity
   def perform
-    return unless @json['target'].present? && value_or_id(@json['target']) == @account.featured_collection_url
+    return if @json['target'].blank?
 
+    case value_or_id(@json['target'])
+    when @account.featured_collection_url
+      case @object['type']
+      when 'Hashtag'
+        remove_featured_tags
+      else
+        remove_featured
+      end
+    end
+  end
+
+  private
+
+  def remove_featured
     status = status_from_uri(object_uri)
 
     return unless !status.nil? && status.account_id == @account.id
@@ -11,4 +25,13 @@ class ActivityPub::Activity::Remove < ActivityPub::Activity
     pin = StatusPin.find_by(account: @account, status: status)
     pin&.destroy!
   end
+
+  def remove_featured_tags
+    name = @object['name']&.delete_prefix('#')
+
+    return if name.blank?
+
+    featured_tag = FeaturedTag.by_name(name).find_by(account: @account)
+    featured_tag&.destroy!
+  end
 end
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 018e2df54..e7c3bc9bf 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -1,32 +1,33 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Update < ActivityPub::Activity
-  SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
-
   def perform
     dereference_object!
 
-    if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES)
+    if equals_or_includes_any?(@object['type'], %w(Application Group Organization Person Service))
       update_account
-    elsif equals_or_includes_any?(@object['type'], %w(Question))
-      update_poll
+    elsif equals_or_includes_any?(@object['type'], %w(Note Question))
+      update_status
+    elsif converted_object_type?
+      Status.find_by(uri: object_uri, account_id: @account.id)
     end
   end
 
   private
 
   def update_account
-    return if @account.uri != object_uri
+    return reject_payload! if @account.uri != object_uri
 
-    ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true)
+    ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true, request_id: @options[:request_id])
   end
 
-  def update_poll
-    return reject_payload! if invalid_origin?(@object['id'])
+  def update_status
+    return reject_payload! if invalid_origin?(object_uri)
 
-    status = Status.find_by(uri: object_uri, account_id: @account.id)
-    return if status.nil? || status.preloadable_poll.nil?
+    @status = Status.find_by(uri: object_uri, account_id: @account.id)
 
-    ActivityPub::ProcessPollService.new.call(status.preloadable_poll, @object)
+    return if @status.nil?
+
+    ActivityPub::ProcessStatusUpdateService.new.call(@status, @object, request_id: @options[:request_id])
   end
 end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 776e1d3da..098b6296f 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -1,29 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
-  NAMED_CONTEXT_MAP = {
-    activitystreams: 'https://www.w3.org/ns/activitystreams',
-    security: 'https://w3id.org/security/v1',
-  }.freeze
-
-  CONTEXT_EXTENSION_MAP = {
-    manually_approves_followers: { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers' },
-    sensitive: { 'sensitive' => 'as:sensitive' },
-    hashtag: { 'Hashtag' => 'as:Hashtag' },
-    moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } },
-    also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } },
-    emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' },
-    featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } },
-    property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' },
-    atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' },
-    conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' },
-    focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
-    blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' },
-    discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
-    voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
-    olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
-    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
-  }.freeze
+  include ContextHelper
 
   def self.default_key_transform
     :camel_lower
@@ -34,7 +12,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
   end
 
   def serializable_hash(options = nil)
-    named_contexts     = {}
+    named_contexts     = { activitystreams: NAMED_CONTEXT_MAP['activitystreams'] }
     context_extensions = {}
 
     options         = serialization_options(options)
@@ -44,29 +22,4 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
 
     { '@context' => serialized_context(named_contexts, context_extensions) }.merge(serialized_hash)
   end
-
-  private
-
-  def serialized_context(named_contexts_map, context_extensions_map)
-    context_array = []
-
-    named_contexts     = [:activitystreams] + named_contexts_map.keys
-    context_extensions = context_extensions_map.keys
-
-    named_contexts.each do |key|
-      context_array << NAMED_CONTEXT_MAP[key]
-    end
-
-    extensions = context_extensions.each_with_object({}) do |key, h|
-      h.merge!(CONTEXT_EXTENSION_MAP[key])
-    end
-
-    context_array << extensions unless extensions.empty?
-
-    if context_array.size == 1
-      context_array.first
-    else
-      context_array
-    end
-  end
 end
diff --git a/app/lib/activitypub/dereferencer.rb b/app/lib/activitypub/dereferencer.rb
index bea69608f..4d7756d71 100644
--- a/app/lib/activitypub/dereferencer.rb
+++ b/app/lib/activitypub/dereferencer.rb
@@ -3,10 +3,10 @@
 class ActivityPub::Dereferencer
   include JsonLdHelper
 
-  def initialize(uri, permitted_origin: nil, signature_account: nil)
+  def initialize(uri, permitted_origin: nil, signature_actor: nil)
     @uri               = uri
     @permitted_origin  = permitted_origin
-    @signature_account = signature_account
+    @signature_actor = signature_actor
   end
 
   def object
@@ -46,7 +46,7 @@ class ActivityPub::Dereferencer
 
     req.add_headers('Accept' => 'application/activity+json, application/ld+json')
     req.add_headers(headers) if headers
-    req.on_behalf_of(@signature_account) if @signature_account
+    req.on_behalf_of(@signature_actor) if @signature_actor
 
     req.perform do |res|
       if res.code == 200
diff --git a/app/lib/activitypub/forwarder.rb b/app/lib/activitypub/forwarder.rb
new file mode 100644
index 000000000..4206b9d82
--- /dev/null
+++ b/app/lib/activitypub/forwarder.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+class ActivityPub::Forwarder
+  def initialize(account, original_json, status)
+    @json    = original_json
+    @account = account
+    @status  = status
+  end
+
+  def forwardable?
+    @json['signature'].present? && @status.distributable?
+  end
+
+  def forward!
+    ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url|
+      [payload, signature_account_id, inbox_url]
+    end
+  end
+
+  private
+
+  def payload
+    @payload ||= Oj.dump(@json)
+  end
+
+  def reblogged_by_account_ids
+    @reblogged_by_account_ids ||= @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
+  end
+
+  def signature_account_id
+    @signature_account_id ||= begin
+      if in_reply_to_local?
+        in_reply_to.account_id
+      else
+        reblogged_by_account_ids.first
+      end
+    end
+  end
+
+  def inboxes
+    @inboxes ||= begin
+      arr  = inboxes_for_followers_of_reblogged_by_accounts
+      arr += inboxes_for_followers_of_replied_to_account if in_reply_to_local?
+      arr -= [@account.preferred_inbox_url]
+      arr.uniq!
+      arr
+    end
+  end
+
+  def inboxes_for_followers_of_reblogged_by_accounts
+    Account.where(id: ::Follow.where(target_account_id: reblogged_by_account_ids).select(:account_id)).inboxes
+  end
+
+  def inboxes_for_followers_of_replied_to_account
+    in_reply_to.account.followers.inboxes
+  end
+
+  def in_reply_to
+    @status.thread
+  end
+
+  def in_reply_to_local?
+    @status.thread&.account&.local?
+  end
+end
diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index e853a970e..f90adaf6c 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -9,7 +9,7 @@ class ActivityPub::LinkedDataSignature
     @json = json.with_indifferent_access
   end
 
-  def verify_account!
+  def verify_actor!
     return unless @json['signature'].is_a?(Hash)
 
     type        = @json['signature']['type']
@@ -18,7 +18,7 @@ class ActivityPub::LinkedDataSignature
 
     return unless type == 'RsaSignature2017'
 
-    creator   = ActivityPub::TagManager.instance.uri_to_resource(creator_uri, Account)
+    creator   = ActivityPub::TagManager.instance.uri_to_actor(creator_uri)
     creator ||= ActivityPub::FetchRemoteKeyService.new.call(creator_uri, id: false)
 
     return if creator.nil?
@@ -35,7 +35,7 @@ class ActivityPub::LinkedDataSignature
   def sign!(creator, sign_with: nil)
     options = {
       'type'    => 'RsaSignature2017',
-      'creator' => [ActivityPub::TagManager.instance.uri_for(creator), '#main-key'].join,
+      'creator' => ActivityPub::TagManager.instance.key_uri_for(creator),
       'created' => Time.now.utc.iso8601,
     }
 
diff --git a/app/lib/activitypub/parser/custom_emoji_parser.rb b/app/lib/activitypub/parser/custom_emoji_parser.rb
new file mode 100644
index 000000000..724c60215
--- /dev/null
+++ b/app/lib/activitypub/parser/custom_emoji_parser.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class ActivityPub::Parser::CustomEmojiParser
+  include JsonLdHelper
+
+  def initialize(json)
+    @json = json
+  end
+
+  def uri
+    @json['id']
+  end
+
+  def shortcode
+    @json['name']&.delete(':')
+  end
+
+  def image_remote_url
+    @json.dig('icon', 'url')
+  end
+
+  def updated_at
+    @json['updated']&.to_datetime
+  rescue ArgumentError
+    nil
+  end
+end
diff --git a/app/lib/activitypub/parser/media_attachment_parser.rb b/app/lib/activitypub/parser/media_attachment_parser.rb
new file mode 100644
index 000000000..656be84b7
--- /dev/null
+++ b/app/lib/activitypub/parser/media_attachment_parser.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class ActivityPub::Parser::MediaAttachmentParser
+  include JsonLdHelper
+
+  def initialize(json)
+    @json = json
+  end
+
+  # @param [MediaAttachment] previous_record
+  def significantly_changes?(previous_record)
+    remote_url != previous_record.remote_url ||
+      thumbnail_remote_url != previous_record.thumbnail_remote_url ||
+      description != previous_record.description
+  end
+
+  def remote_url
+    Addressable::URI.parse(@json['url'])&.normalize&.to_s
+  rescue Addressable::URI::InvalidURIError
+    nil
+  end
+
+  def thumbnail_remote_url
+    Addressable::URI.parse(@json['icon'].is_a?(Hash) ? @json['icon']['url'] : @json['icon'])&.normalize&.to_s
+  rescue Addressable::URI::InvalidURIError
+    nil
+  end
+
+  def description
+    str = @json['summary'].presence || @json['name'].presence
+    str = str.strip[0...MediaAttachment::MAX_DESCRIPTION_LENGTH] if str.present?
+    str
+  end
+
+  def focus
+    @json['focalPoint']
+  end
+
+  def blurhash
+    supported_blurhash? ? @json['blurhash'] : nil
+  end
+
+  def file_content_type
+    @json['mediaType']
+  end
+
+  private
+
+  def supported_blurhash?
+    components = begin
+      blurhash = @json['blurhash']
+
+      if blurhash.present? && /^[\w#$%*+,-.:;=?@\[\]^{|}~]+$/.match?(blurhash)
+        Blurhash.components(blurhash)
+      end
+    end
+
+    components.present? && components.none? { |comp| comp > 5 }
+  end
+end
diff --git a/app/lib/activitypub/parser/poll_parser.rb b/app/lib/activitypub/parser/poll_parser.rb
new file mode 100644
index 000000000..758c03f07
--- /dev/null
+++ b/app/lib/activitypub/parser/poll_parser.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class ActivityPub::Parser::PollParser
+  include JsonLdHelper
+
+  def initialize(json)
+    @json = json
+  end
+
+  def valid?
+    equals_or_includes?(@json['type'], 'Question') && items.is_a?(Array)
+  end
+
+  # @param [Poll] previous_record
+  def significantly_changes?(previous_record)
+    options != previous_record.options ||
+      multiple != previous_record.multiple
+  end
+
+  def options
+    items.filter_map { |item| item['name'].presence || item['content'] }
+  end
+
+  def multiple
+    @json['anyOf'].is_a?(Array)
+  end
+
+  def expires_at
+    if @json['closed'].is_a?(String)
+      @json['closed'].to_datetime
+    elsif !@json['closed'].nil? && !@json['closed'].is_a?(FalseClass)
+      Time.now.utc
+    else
+      @json['endTime']&.to_datetime
+    end
+  rescue ArgumentError
+    nil
+  end
+
+  def voters_count
+    @json['votersCount']
+  end
+
+  def cached_tallies
+    items.map { |item| item.dig('replies', 'totalItems') || 0 }
+  end
+
+  private
+
+  def items
+    @json['anyOf'] || @json['oneOf']
+  end
+end
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
new file mode 100644
index 000000000..3ba154d01
--- /dev/null
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+class ActivityPub::Parser::StatusParser
+  include JsonLdHelper
+
+  # @param [Hash] json
+  # @param [Hash] magic_values
+  # @option magic_values [String] :followers_collection
+  def initialize(json, magic_values = {})
+    @json         = json
+    @object       = json['object'] || json
+    @magic_values = magic_values
+  end
+
+  def uri
+    id = @object['id']
+
+    if id&.start_with?('bear:')
+      Addressable::URI.parse(id).query_values['u']
+    else
+      id
+    end
+  rescue Addressable::URI::InvalidURIError
+    id
+  end
+
+  def url
+    url_to_href(@object['url'], 'text/html') if @object['url'].present?
+  end
+
+  def text
+    if @object['content'].present?
+      @object['content']
+    elsif content_language_map?
+      @object['contentMap'].values.first
+    end
+  end
+
+  def spoiler_text
+    if @object['summary'].present?
+      @object['summary']
+    elsif summary_language_map?
+      @object['summaryMap'].values.first
+    end
+  end
+
+  def title
+    if @object['name'].present?
+      @object['name']
+    elsif name_language_map?
+      @object['nameMap'].values.first
+    end
+  end
+
+  def created_at
+    @object['published']&.to_datetime
+  rescue ArgumentError
+    nil
+  end
+
+  def edited_at
+    @object['updated']&.to_datetime
+  rescue ArgumentError
+    nil
+  end
+
+  def reply
+    @object['inReplyTo'].present?
+  end
+
+  def sensitive
+    @object['sensitive']
+  end
+
+  def visibility
+    if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
+      :public
+    elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
+      :unlisted
+    elsif audience_to.include?(@magic_values[:followers_collection])
+      :private
+    else
+      :direct
+    end
+  end
+
+  def language
+    if content_language_map?
+      @object['contentMap'].keys.first
+    elsif name_language_map?
+      @object['nameMap'].keys.first
+    elsif summary_language_map?
+      @object['summaryMap'].keys.first
+    end
+  end
+
+  private
+
+  def audience_to
+    as_array(@object['to'] || @json['to']).map { |x| value_or_id(x) }
+  end
+
+  def audience_cc
+    as_array(@object['cc'] || @json['cc']).map { |x| value_or_id(x) }
+  end
+
+  def summary_language_map?
+    @object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
+  end
+
+  def content_language_map?
+    @object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty?
+  end
+
+  def name_language_map?
+    @object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty?
+  end
+end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index f6b9741fa..3d6b28ef5 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -44,6 +44,10 @@ class ActivityPub::TagManager
     end
   end
 
+  def key_uri_for(target)
+    [uri_for(target), '#main-key'].join
+  end
+
   def uri_for_username(username)
     account_url(username: username)
   end
@@ -155,6 +159,10 @@ class ActivityPub::TagManager
     path_params[param]
   end
 
+  def uri_to_actor(uri)
+    uri_to_resource(uri, Account)
+  end
+
   def uri_to_resource(uri, klass)
     return if uri.nil?
 
diff --git a/app/lib/admin/metrics/dimension.rb b/app/lib/admin/metrics/dimension.rb
index d8392ddfc..81b89d9b3 100644
--- a/app/lib/admin/metrics/dimension.rb
+++ b/app/lib/admin/metrics/dimension.rb
@@ -9,6 +9,8 @@ class Admin::Metrics::Dimension
     software_versions: Admin::Metrics::Dimension::SoftwareVersionsDimension,
     tag_servers: Admin::Metrics::Dimension::TagServersDimension,
     tag_languages: Admin::Metrics::Dimension::TagLanguagesDimension,
+    instance_accounts: Admin::Metrics::Dimension::InstanceAccountsDimension,
+    instance_languages: Admin::Metrics::Dimension::InstanceLanguagesDimension,
   }.freeze
 
   def self.retrieve(dimension_keys, start_at, end_at, limit, params)
diff --git a/app/lib/admin/metrics/dimension/base_dimension.rb b/app/lib/admin/metrics/dimension/base_dimension.rb
index 5872c22cb..bd2e4ecec 100644
--- a/app/lib/admin/metrics/dimension/base_dimension.rb
+++ b/app/lib/admin/metrics/dimension/base_dimension.rb
@@ -1,23 +1,34 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::BaseDimension
+  CACHE_TTL = 5.minutes.freeze
+
   def self.with_params?
     false
   end
 
+  attr_reader :loaded
+
+  alias loaded? loaded
+
   def initialize(start_at, end_at, limit, params)
     @start_at = start_at&.to_datetime
     @end_at   = end_at&.to_datetime
     @limit    = limit&.to_i
     @params   = params
+    @loaded   = false
   end
 
   def key
     raise NotImplementedError
   end
 
+  def cache_key
+    ["metrics/dimension/#{key}", @start_at, @end_at, @limit, canonicalized_params].join(';')
+  end
+
   def data
-    raise NotImplementedError
+    load
   end
 
   def self.model_name
@@ -30,11 +41,28 @@ class Admin::Metrics::Dimension::BaseDimension
 
   protected
 
+  def load
+    unless loaded?
+      @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_query }
+      @loaded = true
+    end
+
+    @values
+  end
+
+  def perform_query
+    raise NotImplementedError
+  end
+
   def time_period
     (@start_at..@end_at)
   end
 
   def params
-    raise NotImplementedError
+    {}
+  end
+
+  def canonicalized_params
+    params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
   end
 end
diff --git a/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb b/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb
new file mode 100644
index 000000000..4eac8e611
--- /dev/null
+++ b/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Dimension::InstanceAccountsDimension < Admin::Metrics::Dimension::BaseDimension
+  include LanguagesHelper
+
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_accounts'
+  end
+
+  protected
+
+  def perform_query
+    sql = <<-SQL.squish
+      SELECT accounts.username, count(follows.*) AS value
+      FROM accounts
+      LEFT JOIN follows ON follows.target_account_id = accounts.id
+      WHERE accounts.domain = $1
+      GROUP BY accounts.id, follows.target_account_id
+      ORDER BY value DESC
+      LIMIT $2
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:domain]], [nil, @limit]])
+
+    rows.map { |row| { key: row['username'], human_key: row['username'], value: row['value'].to_s } }
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
new file mode 100644
index 000000000..1ede1a56e
--- /dev/null
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Dimension::BaseDimension
+  include LanguagesHelper
+
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_languages'
+  end
+
+  protected
+
+  def perform_query
+    sql = <<-SQL.squish
+      SELECT COALESCE(statuses.language, 'und') AS language, count(*) AS value
+      FROM statuses
+      INNER JOIN accounts ON accounts.id = statuses.account_id
+      WHERE accounts.domain = $1
+        AND statuses.id BETWEEN $2 AND $3
+        AND statuses.reblog_of_id IS NULL
+      GROUP BY COALESCE(statuses.language, 'und')
+      ORDER BY count(*) DESC
+      LIMIT $4
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:domain]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]])
+
+    rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/dimension/languages_dimension.rb b/app/lib/admin/metrics/dimension/languages_dimension.rb
index a6aaf5d21..f1cf82cf2 100644
--- a/app/lib/admin/metrics/dimension/languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/languages_dimension.rb
@@ -7,7 +7,9 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension:
     'languages'
   end
 
-  def data
+  protected
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT locale, count(*) AS value
       FROM users
@@ -20,6 +22,6 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension:
 
     rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, @limit]])
 
-    rows.map { |row| { key: row['locale'], human_key: human_locale(row['locale']), value: row['value'].to_s } }
+    rows.map { |row| { key: row['locale'], human_key: standard_locale_name(row['locale']), value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 3e80b6625..91bcce655 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -5,7 +5,9 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
     'servers'
   end
 
-  def data
+  protected
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT accounts.domain, count(*) AS value
       FROM statuses
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 34917404d..816615f99 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -7,12 +7,12 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
     'software_versions'
   end
 
-  def data
+  protected
+
+  def perform_query
     [mastodon_version, ruby_version, postgresql_version, redis_version]
   end
 
-  private
-
   def mastodon_version
     value = Mastodon::Version.to_s
 
diff --git a/app/lib/admin/metrics/dimension/sources_dimension.rb b/app/lib/admin/metrics/dimension/sources_dimension.rb
index a9f061809..122807cdc 100644
--- a/app/lib/admin/metrics/dimension/sources_dimension.rb
+++ b/app/lib/admin/metrics/dimension/sources_dimension.rb
@@ -5,7 +5,9 @@ class Admin::Metrics::Dimension::SourcesDimension < Admin::Metrics::Dimension::B
     'sources'
   end
 
-  def data
+  protected
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT oauth_applications.name, count(*) AS value
       FROM users
diff --git a/app/lib/admin/metrics/dimension/space_usage_dimension.rb b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
index aa00a2e18..5867c5bab 100644
--- a/app/lib/admin/metrics/dimension/space_usage_dimension.rb
+++ b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
@@ -8,12 +8,12 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
     'space_usage'
   end
 
-  def data
+  protected
+
+  def perform_query
     [postgresql_size, redis_size, media_size]
   end
 
-  private
-
   def postgresql_size
     value = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size']
 
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index 1cfa07478..e1349c229 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -11,7 +11,9 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
     'tag_languages'
   end
 
-  def data
+  protected
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT COALESCE(statuses.language, 'und') AS language, count(*) AS value
       FROM statuses
@@ -25,11 +27,9 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
 
     rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]])
 
-    rows.map { |row| { key: row['language'], human_key: human_locale(row['language']), value: row['value'].to_s } }
+    rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
   end
 
-  private
-
   def params
     @params.permit(:id)
   end
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index 12c5980d7..7ddf3378c 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -9,7 +9,9 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
     'tag_servers'
   end
 
-  def data
+  protected
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT accounts.domain, count(*) AS value
       FROM statuses
@@ -27,8 +29,6 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
     rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
   end
 
-  private
-
   def params
     @params.permit(:id)
   end
diff --git a/app/lib/admin/metrics/measure.rb b/app/lib/admin/metrics/measure.rb
index a839498a1..0b510eb25 100644
--- a/app/lib/admin/metrics/measure.rb
+++ b/app/lib/admin/metrics/measure.rb
@@ -10,6 +10,12 @@ class Admin::Metrics::Measure
     tag_accounts: Admin::Metrics::Measure::TagAccountsMeasure,
     tag_uses: Admin::Metrics::Measure::TagUsesMeasure,
     tag_servers: Admin::Metrics::Measure::TagServersMeasure,
+    instance_accounts: Admin::Metrics::Measure::InstanceAccountsMeasure,
+    instance_media_attachments: Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure,
+    instance_reports: Admin::Metrics::Measure::InstanceReportsMeasure,
+    instance_statuses: Admin::Metrics::Measure::InstanceStatusesMeasure,
+    instance_follows: Admin::Metrics::Measure::InstanceFollowsMeasure,
+    instance_followers: Admin::Metrics::Measure::InstanceFollowersMeasure,
   }.freeze
 
   def self.retrieve(measure_keys, start_at, end_at, params)
diff --git a/app/lib/admin/metrics/measure/active_users_measure.rb b/app/lib/admin/metrics/measure/active_users_measure.rb
index 513189780..e6f09d4bc 100644
--- a/app/lib/admin/metrics/measure/active_users_measure.rb
+++ b/app/lib/admin/metrics/measure/active_users_measure.rb
@@ -5,20 +5,20 @@ class Admin::Metrics::Measure::ActiveUsersMeasure < Admin::Metrics::Measure::Bas
     'active_users'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     activity_tracker.sum(time_period.first, time_period.last)
   end
 
-  def previous_total
+  def perform_previous_total_query
     activity_tracker.sum(previous_time_period.first, previous_time_period.last)
   end
 
-  def data
+  def perform_data_query
     activity_tracker.get(time_period.first, time_period.last).map { |date, value| { date: date.to_time(:utc).iso8601, value: value.to_s } }
   end
 
-  protected
-
   def activity_tracker
     @activity_tracker ||= ActivityTracker.new('activity:logins', :unique)
   end
diff --git a/app/lib/admin/metrics/measure/base_measure.rb b/app/lib/admin/metrics/measure/base_measure.rb
index 0107ffd9c..e33a6c494 100644
--- a/app/lib/admin/metrics/measure/base_measure.rb
+++ b/app/lib/admin/metrics/measure/base_measure.rb
@@ -1,30 +1,49 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::BaseMeasure
+  CACHE_TTL = 5.minutes.freeze
+
   def self.with_params?
     false
   end
 
+  attr_reader :loaded
+
+  alias loaded? loaded
+
   def initialize(start_at, end_at, params)
     @start_at = start_at&.to_datetime
     @end_at   = end_at&.to_datetime
     @params   = params
+    @loaded   = false
+  end
+
+  def cache_key
+    ["metrics/measure/#{key}", @start_at, @end_at, canonicalized_params].join(';')
   end
 
   def key
     raise NotImplementedError
   end
 
+  def unit
+    nil
+  end
+
+  def total_in_time_range?
+    true
+  end
+
   def total
-    raise NotImplementedError
+    load[:total]
   end
 
   def previous_total
-    raise NotImplementedError
+    load[:previous_total]
   end
 
   def data
-    raise NotImplementedError
+    load[:data]
   end
 
   def self.model_name
@@ -37,6 +56,35 @@ class Admin::Metrics::Measure::BaseMeasure
 
   protected
 
+  def load
+    unless loaded?
+      @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_queries }.with_indifferent_access
+      @loaded = true
+    end
+
+    @values
+  end
+
+  def perform_queries
+    {
+      total: perform_total_query,
+      previous_total: perform_previous_total_query,
+      data: perform_data_query,
+    }
+  end
+
+  def perform_total_query
+    raise NotImplementedError
+  end
+
+  def perform_previous_total_query
+    raise NotImplementedError
+  end
+
+  def perform_data_query
+    raise NotImplementedError
+  end
+
   def time_period
     (@start_at..@end_at)
   end
@@ -50,6 +98,10 @@ class Admin::Metrics::Measure::BaseMeasure
   end
 
   def params
-    raise NotImplementedError
+    {}
+  end
+
+  def canonicalized_params
+    params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_accounts_measure.rb b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
new file mode 100644
index 000000000..4c61a064a
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure::BaseMeasure
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_accounts'
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    Account.where(domain: params[:domain]).count
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_accounts AS (
+          SELECT accounts.id
+          FROM accounts
+          WHERE date_trunc('day', accounts.created_at)::date = axis.period
+            AND accounts.domain = $3::text
+        )
+        SELECT count(*) FROM new_accounts
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/instance_followers_measure.rb b/app/lib/admin/metrics/measure/instance_followers_measure.rb
new file mode 100644
index 000000000..caa60013b
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_followers_measure.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measure::BaseMeasure
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_followers'
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    Follow.joins(:account).merge(Account.where(domain: params[:domain])).count
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_followers AS (
+          SELECT follows.id
+          FROM follows
+          INNER JOIN accounts ON follows.account_id = accounts.id
+          WHERE date_trunc('day', follows.created_at)::date = axis.period
+            AND accounts.domain = $3::text
+        )
+        SELECT count(*) FROM new_followers
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/instance_follows_measure.rb b/app/lib/admin/metrics/measure/instance_follows_measure.rb
new file mode 100644
index 000000000..b026c7e6d
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_follows_measure.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure::BaseMeasure
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_follows'
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    Follow.joins(:target_account).merge(Account.where(domain: params[:domain])).count
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_follows AS (
+          SELECT follows.id
+          FROM follows
+          INNER JOIN accounts ON follows.target_account_id = accounts.id
+          WHERE date_trunc('day', follows.created_at)::date = axis.period
+            AND accounts.domain = $3::text
+        )
+        SELECT count(*) FROM new_follows
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
new file mode 100644
index 000000000..2e2154c92
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include ActionView::Helpers::NumberHelper
+
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_media_attachments'
+  end
+
+  def unit
+    'bytes'
+  end
+
+  def value_to_human_value(value)
+    number_to_human_size(value)
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    MediaAttachment.joins(:account).merge(Account.where(domain: params[:domain])).sum('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_media_attachments AS (
+          SELECT COALESCE(media_attachments.file_file_size, 0) + COALESCE(media_attachments.thumbnail_file_size, 0) AS size
+          FROM media_attachments
+          INNER JOIN accounts ON accounts.id = media_attachments.account_id
+          WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
+            AND accounts.domain = $3::text
+        )
+        SELECT SUM(size) FROM new_media_attachments
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/instance_reports_measure.rb b/app/lib/admin/metrics/measure/instance_reports_measure.rb
new file mode 100644
index 000000000..6b3f35067
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_reports_measure.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure::BaseMeasure
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_reports'
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    Report.where(target_account: Account.where(domain: params[:domain])).count
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_reports AS (
+          SELECT reports.id
+          FROM reports
+          INNER JOIN accounts ON accounts.id = reports.target_account_id
+          WHERE date_trunc('day', reports.created_at)::date = axis.period
+            AND accounts.domain = $3::text
+        )
+        SELECT count(*) FROM new_reports
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
new file mode 100644
index 000000000..86b10da6c
--- /dev/null
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure::BaseMeasure
+  def self.with_params?
+    true
+  end
+
+  def key
+    'instance_statuses'
+  end
+
+  def total_in_time_range?
+    false
+  end
+
+  protected
+
+  def perform_total_query
+    Status.joins(:account).merge(Account.where(domain: params[:domain])).count
+  end
+
+  def perform_previous_total_query
+    nil
+  end
+
+  def perform_data_query
+    sql = <<-SQL.squish
+      SELECT axis.*, (
+        WITH new_statuses AS (
+          SELECT statuses.id
+          FROM statuses
+          INNER JOIN accounts ON accounts.id = statuses.account_id
+          WHERE statuses.id BETWEEN $3 AND $4
+            AND accounts.domain = $5::text
+            AND date_trunc('day', statuses.created_at)::date = axis.period
+        )
+        SELECT count(*) FROM new_statuses
+      ) AS value
+      FROM (
+        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+      ) AS axis
+    SQL
+
+    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, params[:domain]]])
+
+    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def time_period
+    (@start_at.to_date..@end_at.to_date)
+  end
+
+  def previous_time_period
+    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+  end
+
+  def params
+    @params.permit(:domain)
+  end
+end
diff --git a/app/lib/admin/metrics/measure/interactions_measure.rb b/app/lib/admin/metrics/measure/interactions_measure.rb
index b928fdb8f..7a2b7e0fa 100644
--- a/app/lib/admin/metrics/measure/interactions_measure.rb
+++ b/app/lib/admin/metrics/measure/interactions_measure.rb
@@ -5,20 +5,20 @@ class Admin::Metrics::Measure::InteractionsMeasure < Admin::Metrics::Measure::Ba
     'interactions'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     activity_tracker.sum(time_period.first, time_period.last)
   end
 
-  def previous_total
+  def perform_previous_total_query
     activity_tracker.sum(previous_time_period.first, previous_time_period.last)
   end
 
-  def data
+  def perform_data_query
     activity_tracker.get(time_period.first, time_period.last).map { |date, value| { date: date.to_time(:utc).iso8601, value: value.to_s } }
   end
 
-  protected
-
   def activity_tracker
     @activity_tracker ||= ActivityTracker.new('activity:interactions', :basic)
   end
diff --git a/app/lib/admin/metrics/measure/new_users_measure.rb b/app/lib/admin/metrics/measure/new_users_measure.rb
index b31679ad3..71191f1a2 100644
--- a/app/lib/admin/metrics/measure/new_users_measure.rb
+++ b/app/lib/admin/metrics/measure/new_users_measure.rb
@@ -5,15 +5,17 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
     'new_users'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     User.where(created_at: time_period).count
   end
 
-  def previous_total
+  def perform_previous_total_query
     User.where(created_at: previous_time_period).count
   end
 
-  def data
+  def perform_data_query
     sql = <<-SQL.squish
       SELECT axis.*, (
         WITH new_users AS (
diff --git a/app/lib/admin/metrics/measure/opened_reports_measure.rb b/app/lib/admin/metrics/measure/opened_reports_measure.rb
index 9acc2c33d..4b80a0c8c 100644
--- a/app/lib/admin/metrics/measure/opened_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/opened_reports_measure.rb
@@ -5,15 +5,17 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
     'opened_reports'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     Report.where(created_at: time_period).count
   end
 
-  def previous_total
+  def perform_previous_total_query
     Report.where(created_at: previous_time_period).count
   end
 
-  def data
+  def perform_data_query
     sql = <<-SQL.squish
       SELECT axis.*, (
         WITH new_reports AS (
diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
index 0dcecbbad..4ab746c8f 100644
--- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
@@ -5,22 +5,23 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
     'resolved_reports'
   end
 
-  def total
-    Report.resolved.where(updated_at: time_period).count
+  protected
+
+  def perform_total_query
+    Report.resolved.where(action_taken_at: time_period).count
   end
 
-  def previous_total
-    Report.resolved.where(updated_at: previous_time_period).count
+  def perform_previous_total_query
+    Report.resolved.where(action_taken_at: previous_time_period).count
   end
 
-  def data
+  def perform_data_query
     sql = <<-SQL.squish
       SELECT axis.*, (
         WITH resolved_reports AS (
           SELECT reports.id
           FROM reports
-          WHERE action_taken
-            AND date_trunc('day', reports.updated_at)::date = axis.period
+          WHERE date_trunc('day', reports.action_taken_at)::date = axis.period
         )
         SELECT count(*) FROM resolved_reports
       ) AS value
diff --git a/app/lib/admin/metrics/measure/tag_accounts_measure.rb b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
index ef773081b..8f4512efe 100644
--- a/app/lib/admin/metrics/measure/tag_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
@@ -9,20 +9,20 @@ class Admin::Metrics::Measure::TagAccountsMeasure < Admin::Metrics::Measure::Bas
     'tag_accounts'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     tag.history.aggregate(time_period).accounts
   end
 
-  def previous_total
+  def perform_previous_total_query
     tag.history.aggregate(previous_time_period).accounts
   end
 
-  def data
+  def perform_data_query
     time_period.map { |date| { date: date.to_time(:utc).iso8601, value: tag.history.get(date).accounts.to_s } }
   end
 
-  protected
-
   def tag
     @tag ||= Tag.find(params[:id])
   end
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index cc064f63f..11f229602 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -9,15 +9,17 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
     'tag_servers'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at, with_random: false), Mastodon::Snowflake.id_at(@end_at, with_random: false)).joins(:account).count('distinct accounts.domain')
   end
 
-  def previous_total
+  def perform_previous_total_query
     tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at - length_of_period, with_random: false), Mastodon::Snowflake.id_at(@end_at - length_of_period, with_random: false)).joins(:account).count('distinct accounts.domain')
   end
 
-  def data
+  def perform_data_query
     sql = <<-SQL.squish
       SELECT axis.*, (
         SELECT count(distinct accounts.domain) AS value
@@ -38,8 +40,6 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
     rows.map { |row| { date: row['day'], value: row['value'].to_s } }
   end
 
-  protected
-
   def tag
     @tag ||= Tag.find(params[:id])
   end
diff --git a/app/lib/admin/metrics/measure/tag_uses_measure.rb b/app/lib/admin/metrics/measure/tag_uses_measure.rb
index b7667bc6c..bce86b89f 100644
--- a/app/lib/admin/metrics/measure/tag_uses_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_uses_measure.rb
@@ -9,20 +9,20 @@ class Admin::Metrics::Measure::TagUsesMeasure < Admin::Metrics::Measure::BaseMea
     'tag_uses'
   end
 
-  def total
+  protected
+
+  def perform_total_query
     tag.history.aggregate(time_period).uses
   end
 
-  def previous_total
+  def perform_previous_total_query
     tag.history.aggregate(previous_time_period).uses
   end
 
-  def data
+  def perform_data_query
     time_period.map { |date| { date: date.to_time(:utc).iso8601, value: tag.history.get(date).uses.to_s } }
   end
 
-  protected
-
   def tag
     @tag ||= Tag.find(params[:id])
   end
diff --git a/app/lib/admin/metrics/retention.rb b/app/lib/admin/metrics/retention.rb
index 6b9dfde49..f6135ac1e 100644
--- a/app/lib/admin/metrics/retention.rb
+++ b/app/lib/admin/metrics/retention.rb
@@ -1,21 +1,47 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Retention
+  CACHE_TTL = 5.minutes.freeze
+
   class Cohort < ActiveModelSerializers::Model
     attributes :period, :frequency, :data
   end
 
   class CohortData < ActiveModelSerializers::Model
-    attributes :date, :percent, :value
+    attributes :date, :rate, :value
   end
 
+  attr_reader :loaded
+
+  alias loaded? loaded
+
   def initialize(start_at, end_at, frequency)
     @start_at  = start_at&.to_date
     @end_at    = end_at&.to_date
     @frequency = %w(day month).include?(frequency) ? frequency : 'day'
+    @loaded    = false
+  end
+
+  def cache_key
+    ['metrics/retention', @start_at, @end_at, @frequency].join(';')
   end
 
   def cohorts
+    load
+  end
+
+  protected
+
+  def load
+    unless loaded?
+      @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_query }
+      @loaded = true
+    end
+
+    @values
+  end
+
+  def perform_query
     sql = <<-SQL.squish
       SELECT axis.*, (
         WITH new_users AS (
@@ -59,7 +85,7 @@ class Admin::Metrics::Retention
 
       current_cohort.data << CohortData.new(
         date: row['retention_period'],
-        percent: rate.to_f,
+        rate: rate.to_f,
         value: value.to_s
       )
     end
diff --git a/app/lib/admin/system_check.rb b/app/lib/admin/system_check.rb
index afb20cb47..f512635ab 100644
--- a/app/lib/admin/system_check.rb
+++ b/app/lib/admin/system_check.rb
@@ -5,13 +5,14 @@ class Admin::SystemCheck
     Admin::SystemCheck::DatabaseSchemaCheck,
     Admin::SystemCheck::SidekiqProcessCheck,
     Admin::SystemCheck::RulesCheck,
+    Admin::SystemCheck::ElasticsearchCheck,
   ].freeze
 
-  def self.perform
+  def self.perform(current_user)
     ACTIVE_CHECKS.each_with_object([]) do |klass, arr|
-      check = klass.new
+      check = klass.new(current_user)
 
-      if check.pass?
+      if check.skip? || check.pass?
         arr
       else
         arr << check.message
diff --git a/app/lib/admin/system_check/base_check.rb b/app/lib/admin/system_check/base_check.rb
index fcad8daca..c2974c218 100644
--- a/app/lib/admin/system_check/base_check.rb
+++ b/app/lib/admin/system_check/base_check.rb
@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
 class Admin::SystemCheck::BaseCheck
+  attr_reader :current_user
+
+  def initialize(current_user)
+    @current_user = current_user
+  end
+
+  def skip?
+    false
+  end
+
   def pass?
     raise NotImplementedError
   end
diff --git a/app/lib/admin/system_check/database_schema_check.rb b/app/lib/admin/system_check/database_schema_check.rb
index b93d1954e..c2f01fd55 100644
--- a/app/lib/admin/system_check/database_schema_check.rb
+++ b/app/lib/admin/system_check/database_schema_check.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Admin::SystemCheck::DatabaseSchemaCheck < Admin::SystemCheck::BaseCheck
+  def skip?
+    !current_user.can?(:view_devops)
+  end
+
   def pass?
     !ActiveRecord::Base.connection.migration_context.needs_migration?
   end
diff --git a/app/lib/admin/system_check/elasticsearch_check.rb b/app/lib/admin/system_check/elasticsearch_check.rb
new file mode 100644
index 000000000..a63988224
--- /dev/null
+++ b/app/lib/admin/system_check/elasticsearch_check.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
+  def skip?
+    !current_user.can?(:view_devops)
+  end
+
+  def pass?
+    return true unless Chewy.enabled?
+
+    running_version.present? && compatible_version?
+  end
+
+  def message
+    if running_version.present?
+      Admin::SystemCheck::Message.new(:elasticsearch_version_check, I18n.t('admin.system_checks.elasticsearch_version_check.version_comparison', running_version: running_version, required_version: required_version))
+    else
+      Admin::SystemCheck::Message.new(:elasticsearch_running_check)
+    end
+  end
+
+  private
+
+  def running_version
+    @running_version ||= begin
+      Chewy.client.info['version']['number']
+    rescue Faraday::ConnectionFailed
+      nil
+    end
+  end
+
+  def required_version
+    '7.x'
+  end
+
+  def compatible_version?
+    return false if running_version.nil?
+    Gem::Version.new(running_version) >= Gem::Version.new(required_version)
+  end
+end
diff --git a/app/lib/admin/system_check/rules_check.rb b/app/lib/admin/system_check/rules_check.rb
index 1fbdf955d..8206a5df3 100644
--- a/app/lib/admin/system_check/rules_check.rb
+++ b/app/lib/admin/system_check/rules_check.rb
@@ -3,6 +3,10 @@
 class Admin::SystemCheck::RulesCheck < Admin::SystemCheck::BaseCheck
   include RoutingHelper
 
+  def skip?
+    !current_user.can?(:manage_rules)
+  end
+
   def pass?
     Rule.kept.exists?
   end
diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb
index 22446edaf..d577b3bf3 100644
--- a/app/lib/admin/system_check/sidekiq_process_check.rb
+++ b/app/lib/admin/system_check/sidekiq_process_check.rb
@@ -7,8 +7,13 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck
     mailers
     pull
     scheduler
+    ingress
   ).freeze
 
+  def skip?
+    !current_user.can?(:view_devops)
+  end
+
   def pass?
     missing_queues.empty?
   end
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index e61cd0721..d61ec0e6e 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -8,4 +8,12 @@ module ApplicationExtension
     validates :website, url: true, length: { maximum: 2_000 }, if: :website?
     validates :redirect_uri, length: { maximum: 2_000 }
   end
+
+  def most_recently_used_access_token
+    @most_recently_used_access_token ||= access_tokens.where.not(last_used_at: nil).order(last_used_at: :desc).first
+  end
+
+  def confirmation_redirect_uri
+    redirect_uri.lines.first.strip
+  end
 end
diff --git a/app/lib/ascii_folding.rb b/app/lib/ascii_folding.rb
new file mode 100644
index 000000000..1798d3d0e
--- /dev/null
+++ b/app/lib/ascii_folding.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class ASCIIFolding
+  NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž'
+  EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz'
+
+  def fold(str)
+    str.tr(NON_ASCII_CHARS, EQUIVALENT_ASCII_CHARS)
+  end
+end
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index 8907ade4c..66c1fd8c0 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class DeliveryFailureTracker
+  include Redisable
+
   FAILURE_DAYS_THRESHOLD = 7
 
   def initialize(url_or_host)
@@ -8,21 +10,21 @@ class DeliveryFailureTracker
   end
 
   def track_failure!
-    Redis.current.sadd(exhausted_deliveries_key, today)
+    redis.sadd(exhausted_deliveries_key, today)
     UnavailableDomain.create(domain: @host) if reached_failure_threshold?
   end
 
   def track_success!
-    Redis.current.del(exhausted_deliveries_key)
+    redis.del(exhausted_deliveries_key)
     UnavailableDomain.find_by(domain: @host)&.destroy
   end
 
   def clear_failures!
-    Redis.current.del(exhausted_deliveries_key)
+    redis.del(exhausted_deliveries_key)
   end
 
   def days
-    Redis.current.scard(exhausted_deliveries_key) || 0
+    redis.scard(exhausted_deliveries_key) || 0
   end
 
   def available?
@@ -30,12 +32,14 @@ class DeliveryFailureTracker
   end
 
   def exhausted_deliveries_days
-    Redis.current.smembers(exhausted_deliveries_key).sort.map { |date| Date.new(date.slice(0, 4).to_i, date.slice(4, 2).to_i, date.slice(6, 2).to_i) }
+    @exhausted_deliveries_days ||= redis.smembers(exhausted_deliveries_key).sort.map { |date| Date.new(date.slice(0, 4).to_i, date.slice(4, 2).to_i, date.slice(6, 2).to_i) }
   end
 
   alias reset! track_success!
 
   class << self
+    include Redisable
+
     def without_unavailable(urls)
       unavailable_domains_map = Rails.cache.fetch('unavailable_domains') { UnavailableDomain.pluck(:domain).index_with(true) }
 
@@ -54,15 +58,20 @@ class DeliveryFailureTracker
     end
 
     def warning_domains
-      domains = Redis.current.keys(exhausted_deliveries_key_by('*')).map do |key|
+      domains = redis.keys(exhausted_deliveries_key_by('*')).map do |key|
         key.delete_prefix(exhausted_deliveries_key_by(''))
       end
 
       domains - UnavailableDomain.all.pluck(:domain)
     end
 
-    def warning_domains_map
-      warning_domains.index_with { |domain| Redis.current.scard(exhausted_deliveries_key_by(domain)) }
+    def warning_domains_map(domains = nil)
+      if domains.nil?
+        warning_domains.index_with { |domain| redis.scard(exhausted_deliveries_key_by(domain)) }
+      else
+        domains -= UnavailableDomain.where(domain: domains).pluck(:domain)
+        domains.index_with { |domain| redis.scard(exhausted_deliveries_key_by(domain)) }.filter { |_, days| days.positive? }
+      end
     end
 
     private
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
new file mode 100644
index 000000000..a9785d5f9
--- /dev/null
+++ b/app/lib/emoji_formatter.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+class EmojiFormatter
+  include RoutingHelper
+
+  DISALLOWED_BOUNDING_REGEX = /[[:alnum:]:]/.freeze
+
+  attr_reader :html, :custom_emojis, :options
+
+  # @param [ActiveSupport::SafeBuffer] html
+  # @param [Array<CustomEmoji>] custom_emojis
+  # @param [Hash] options
+  # @option options [Boolean] :animate
+  # @option options [String] :style
+  def initialize(html, custom_emojis, options = {})
+    raise ArgumentError unless html.html_safe?
+
+    @html = html
+    @custom_emojis = custom_emojis
+    @options = options
+  end
+
+  def to_s
+    return html if custom_emojis.empty? || html.blank?
+
+    tree = Nokogiri::HTML.fragment(html)
+    tree.xpath('./text()|.//text()[not(ancestor[@class="invisible"])]').to_a.each do |node|
+      i                     = -1
+      inside_shortname      = false
+      shortname_start_index = -1
+      last_index            = 0
+      text                  = node.content
+      result                = Nokogiri::XML::NodeSet.new(tree.document)
+
+      while i + 1 < text.size
+        i += 1
+
+        if inside_shortname && text[i] == ':'
+          inside_shortname = false
+          shortcode = text[shortname_start_index + 1..i - 1]
+          char_after = text[i + 1]
+
+          next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
+
+          result << Nokogiri::XML::Text.new(text[last_index..shortname_start_index - 1], tree.document) if shortname_start_index.positive?
+          result << Nokogiri::HTML.fragment(image_for_emoji(shortcode, emoji))
+
+          last_index = i + 1
+        elsif text[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(text[i - 1]))
+          inside_shortname = true
+          shortname_start_index = i
+        end
+      end
+
+      result << Nokogiri::XML::Text.new(text[last_index..-1], tree.document)
+      node.replace(result)
+    end
+
+    tree.to_html.html_safe # rubocop:disable Rails/OutputSafety
+  end
+
+  private
+
+  def emoji_map
+    @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
+  end
+
+  def count_tag_nesting(tag)
+    if tag[1] == '/'
+      -1
+    elsif tag[-2] == '/'
+      0
+    else
+      1
+    end
+  end
+
+  def image_for_emoji(shortcode, emoji)
+    original_url, static_url = emoji
+
+    image_tag(
+      animate? ? original_url : static_url,
+      image_attributes.merge(alt: ":#{shortcode}:", title: ":#{shortcode}:", data: image_data_attributes(original_url, static_url))
+    )
+  end
+
+  def image_attributes
+    { rel: 'emoji', draggable: false, width: 16, height: 16, class: image_class_names, style: image_style }
+  end
+
+  def image_data_attributes(original_url, static_url)
+    { original: original_url, static: static_url } unless animate?
+  end
+
+  def image_class_names
+    animate? ? 'emojione' : 'emojione custom-emoji'
+  end
+
+  def image_style
+    @options[:style]
+  end
+
+  def animate?
+    @options[:animate] || @options.key?(:style)
+  end
+end
diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb
index 8020aa916..aea60dae5 100644
--- a/app/lib/extractor.rb
+++ b/app/lib/extractor.rb
@@ -1,22 +1,44 @@
 # frozen_string_literal: true
 
 module Extractor
+  MAX_DOMAIN_LENGTH = 253
+
   extend Twitter::TwitterText::Extractor
 
   module_function
 
-  # :yields: username, list_slug, start, end
+  def extract_entities_with_indices(text, options = {}, &block)
+    entities = begin
+      extract_urls_with_indices(text, options) +
+        extract_hashtags_with_indices(text, check_url_overlap: false) +
+        extract_mentions_or_lists_with_indices(text) +
+        extract_extra_uris_with_indices(text)
+    end
+
+    return [] if entities.empty?
+
+    entities = remove_overlapping_entities(entities)
+    entities.each(&block) if block_given?
+    entities
+  end
+
   def extract_mentions_or_lists_with_indices(text)
-    return [] unless Twitter::TwitterText::Regex[:at_signs].match?(text)
+    return [] unless text && Twitter::TwitterText::Regex[:at_signs].match?(text)
 
     possible_entries = []
 
-    text.to_s.scan(Account::MENTION_RE) do |screen_name, _|
+    text.scan(Account::MENTION_RE) do |screen_name, _|
       match_data = $LAST_MATCH_INFO
-      after = $'
+      after      = $'
+
       unless Twitter::TwitterText::Regex[:end_mention_match].match?(after)
+        _, domain = screen_name.split('@')
+
+        next if domain.present? && domain.length > MAX_DOMAIN_LENGTH
+
         start_position = match_data.char_begin(1) - 1
-        end_position = match_data.char_end(1)
+        end_position   = match_data.char_end(1)
+
         possible_entries << {
           screen_name: screen_name,
           indices: [start_position, end_position],
@@ -29,36 +51,70 @@ module Extractor
         yield mention[:screen_name], mention[:indices].first, mention[:indices].last
       end
     end
+
     possible_entries
   end
 
-  def extract_hashtags_with_indices(text, **)
-    return [] unless /#/.match?(text)
+  def extract_hashtags_with_indices(text, _options = {})
+    return [] unless text&.index('#')
+
+    possible_entries = []
 
-    tags = []
     text.scan(Tag::HASHTAG_RE) do |hash_text, _|
-      match_data = $LAST_MATCH_INFO
+      match_data     = $LAST_MATCH_INFO
       start_position = match_data.char_begin(1) - 1
-      end_position = match_data.char_end(1)
-      after = $'
+      end_position   = match_data.char_end(1)
+      after          = $'
+
       if %r{\A://}.match?(after)
         hash_text.match(/(.+)(https?\Z)/) do |matched|
-          hash_text = matched[1]
+          hash_text     = matched[1]
           end_position -= matched[2].codepoint_length
         end
       end
 
-      tags << {
+      possible_entries << {
         hashtag: hash_text,
         indices: [start_position, end_position],
       }
     end
 
-    tags.each { |tag| yield tag[:hashtag], tag[:indices].first, tag[:indices].last } if block_given?
-    tags
+    if block_given?
+      possible_entries.each do |tag|
+        yield tag[:hashtag], tag[:indices].first, tag[:indices].last
+      end
+    end
+
+    possible_entries
   end
 
   def extract_cashtags_with_indices(_text)
-    [] # always returns empty array
+    []
+  end
+
+  def extract_extra_uris_with_indices(text)
+    return [] unless text&.index(':')
+
+    possible_entries = []
+
+    text.scan(Twitter::TwitterText::Regex[:valid_extended_uri]) do
+      valid_uri_match_data = $LAST_MATCH_INFO
+
+      start_position = valid_uri_match_data.char_begin(3)
+      end_position   = valid_uri_match_data.char_end(3)
+
+      possible_entries << {
+        url: valid_uri_match_data[3],
+        indices: [start_position, end_position],
+      }
+    end
+
+    if block_given?
+      possible_entries.each do |url|
+        yield url[:url], url[:indices].first, url[:indices].last
+      end
+    end
+
+    possible_entries
   end
 end
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index d5e435216..510667558 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -45,6 +45,8 @@ class FeedManager
       filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]))
     when :mentions
       filter_from_mentions?(status, receiver.id)
+    when :tags
+      filter_from_tags?(status, receiver.id, build_crutches(receiver.id, [status]))
     else
       false
     end
@@ -53,46 +55,50 @@ class FeedManager
   # Add a status to a home feed and send a streaming API update
   # @param [Account] account
   # @param [Status] status
+  # @param [Boolean] update
   # @return [Boolean]
-  def push_to_home(account, status)
-    return false unless add_to_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
+  def push_to_home(account, status, update: false)
+    return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?)
 
     trim(:home, account.id)
-    PushUpdateWorker.perform_async(account.id, status.id, "timeline:#{account.id}") if push_update_required?("timeline:#{account.id}")
+    PushUpdateWorker.perform_async(account.id, status.id, "timeline:#{account.id}", { 'update' => update }) if push_update_required?("timeline:#{account.id}")
     true
   end
 
   # Remove a status from a home feed and send a streaming API update
   # @param [Account] account
   # @param [Status] status
+  # @param [Boolean] update
   # @return [Boolean]
-  def unpush_from_home(account, status)
-    return false unless remove_from_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
+  def unpush_from_home(account, status, update: false)
+    return false unless remove_from_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?)
 
-    redis.publish("timeline:#{account.id}", Oj.dump(event: :delete, payload: status.id.to_s))
+    redis.publish("timeline:#{account.id}", Oj.dump(event: :delete, payload: status.id.to_s)) unless update
     true
   end
 
   # Add a status to a list feed and send a streaming API update
   # @param [List] list
   # @param [Status] status
+  # @param [Boolean] update
   # @return [Boolean]
-  def push_to_list(list, status)
-    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
+  def push_to_list(list, status, update: false)
+    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
 
     trim(:list, list.id)
-    PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}") if push_update_required?("timeline:list:#{list.id}")
+    PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}", { 'update' => update }) if push_update_required?("timeline:list:#{list.id}")
     true
   end
 
   # Remove a status from a list feed and send a streaming API update
   # @param [List] list
   # @param [Status] status
+  # @param [Boolean] update
   # @return [Boolean]
-  def unpush_from_list(list, status)
-    return false unless remove_from_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
+  def unpush_from_list(list, status, update: false)
+    return false unless remove_from_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
 
-    redis.publish("timeline:list:#{list.id}", Oj.dump(event: :delete, payload: status.id.to_s))
+    redis.publish("timeline:list:#{list.id}", Oj.dump(event: :delete, payload: status.id.to_s)) unless update
     true
   end
 
@@ -103,7 +109,7 @@ class FeedManager
   def merge_into_home(from_account, into_account)
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -116,7 +122,7 @@ class FeedManager
     statuses.each do |status|
       next if filter_from_home?(status, into_account.id, crutches)
 
-      add_to_feed(:home, into_account.id, status, aggregate)
+      add_to_feed(:home, into_account.id, status, aggregate_reblogs: aggregate)
     end
 
     trim(:home, into_account.id)
@@ -129,7 +135,7 @@ class FeedManager
   def merge_into_list(from_account, list)
     timeline_key = key(:list, list.id)
     aggregate    = list.account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -142,7 +148,7 @@ class FeedManager
     statuses.each do |status|
       next if filter_from_home?(status, list.account_id, crutches) || filter_from_list?(status, list)
 
-      add_to_feed(:list, list.id, status, aggregate)
+      add_to_feed(:list, list.id, status, aggregate_reblogs: aggregate)
     end
 
     trim(:list, list.id)
@@ -153,11 +159,11 @@ class FeedManager
   # @param [Account] into_account
   # @return [void]
   def unmerge_from_home(from_account, into_account)
-    timeline_key      = key(:home, into_account.id)
-    oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
+    timeline_key        = key(:home, into_account.id)
+    timeline_status_ids = redis.zrange(timeline_key, 0, -1)
 
-    from_account.statuses.select('id, reblog_of_id').where('id > ?', oldest_home_score).reorder(nil).find_each do |status|
-      remove_from_feed(:home, into_account.id, status, into_account.user&.aggregates_reblogs?)
+    from_account.statuses.select('id, reblog_of_id').where(id: timeline_status_ids).reorder(nil).find_each do |status|
+      remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)
     end
   end
 
@@ -166,11 +172,11 @@ class FeedManager
   # @param [List] list
   # @return [void]
   def unmerge_from_list(from_account, list)
-    timeline_key      = key(:list, list.id)
-    oldest_list_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
+    timeline_key        = key(:list, list.id)
+    timeline_status_ids = redis.zrange(timeline_key, 0, -1)
 
-    from_account.statuses.select('id, reblog_of_id').where('id > ?', oldest_list_score).reorder(nil).find_each do |status|
-      remove_from_feed(:list, list.id, status, list.account.user&.aggregates_reblogs?)
+    from_account.statuses.select('id, reblog_of_id').where(id: timeline_status_ids).reorder(nil).find_each do |status|
+      remove_from_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
     end
   end
 
@@ -233,13 +239,13 @@ class FeedManager
     timeline_key = key(:home, account.id)
 
     account.statuses.limit(limit).each do |status|
-      add_to_feed(:home, account.id, status, aggregate)
+      add_to_feed(:home, account.id, status, aggregate_reblogs: aggregate)
     end
 
     account.following.includes(:account_stat).find_each do |target_account|
       if redis.zcard(timeline_key) >= limit
         oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
-        last_status_score = Mastodon::Snowflake.id_at(account.last_status_at)
+        last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at)
 
         # If the feed is full and this account has not posted more recently
         # than the last item on the feed, then we can skip the whole account
@@ -247,13 +253,13 @@ class FeedManager
         next if last_status_score < oldest_home_score
       end
 
-      statuses = target_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, reblog: :account).limit(limit)
+      statuses = target_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
       crutches = build_crutches(account.id, statuses)
 
       statuses.each do |status|
         next if filter_from_home?(status, account.id, crutches)
 
-        add_to_feed(:home, account.id, status, aggregate)
+        add_to_feed(:home, account.id, status, aggregate_reblogs: aggregate)
       end
 
       trim(:home, account.id)
@@ -348,7 +354,7 @@ class FeedManager
   def filter_from_home?(status, receiver_id, crutches)
     return false if receiver_id == status.account_id
     return true  if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
-    return true  if phrase_filtered?(status, receiver_id, :home)
+    return true  if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
 
     check_for_blocks = crutches[:active_mentions][status.id] || []
     check_for_blocks.concat([status.account_id])
@@ -384,7 +390,6 @@ class FeedManager
   # @return [Boolean]
   def filter_from_mentions?(status, receiver_id)
     return true if receiver_id == status.account_id
-    return true if phrase_filtered?(status, receiver_id, :notifications)
 
     # This filter is called from NotifyService, but already after the sender of
     # the notification has been checked for mute/block. Therefore, it's not
@@ -414,40 +419,14 @@ class FeedManager
     false
   end
 
-  # Check if the status hits a phrase filter
+  # Check if a status should not be added to the home feed when it comes
+  # from a followed hashtag
   # @param [Status] status
   # @param [Integer] receiver_id
-  # @param [Symbol] context
+  # @param [Hash] crutches
   # @return [Boolean]
-  def phrase_filtered?(status, receiver_id, context)
-    active_filters = Rails.cache.fetch("filters:#{receiver_id}") { CustomFilter.where(account_id: receiver_id).active_irreversible.to_a }.to_a
-
-    active_filters.select! { |filter| filter.context.include?(context.to_s) && !filter.expired? }
-
-    active_filters.map! do |filter|
-      if filter.whole_word
-        sb = /\A[[:word:]]/.match?(filter.phrase) ? '\b' : ''
-        eb = /[[:word:]]\z/.match?(filter.phrase) ? '\b' : ''
-
-        /(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/
-      else
-        /#{Regexp.escape(filter.phrase)}/i
-      end
-    end
-
-    return false if active_filters.empty?
-
-    combined_regex = active_filters.reduce { |memo, obj| Regexp.union(memo, obj) }
-    status         = status.reblog if status.reblog?
-
-    combined_text = [
-      Formatter.instance.plaintext(status),
-      status.spoiler_text,
-      status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil,
-      status.media_attachments.map(&:description).join("\n\n"),
-    ].compact.join("\n\n")
-
-    combined_regex.match?(combined_text)
+  def filter_from_tags?(status, receiver_id, crutches)
+    receiver_id == status.account_id || ((crutches[:active_mentions][status.id] || []) + [status.account_id]).any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || crutches[:blocked_by][status.account_id] || crutches[:domain_blocking][status.account.domain]
   end
 
   # Adds a status to an account's feed, returning true if a status was
@@ -459,7 +438,7 @@ class FeedManager
   # @param [Status] status
   # @param [Boolean] aggregate_reblogs
   # @return [Boolean]
-  def add_to_feed(timeline_type, account_id, status, aggregate_reblogs = true)
+  def add_to_feed(timeline_type, account_id, status, aggregate_reblogs: true)
     timeline_key = key(timeline_type, account_id)
     reblog_key   = key(timeline_type, account_id, 'reblogs')
 
@@ -487,7 +466,7 @@ class FeedManager
       end
     else
       # A reblog may reach earlier than the original status because of the
-      # delay of the worker deliverying the original status, the late addition
+      # delay of the worker delivering the original status, the late addition
       # by merging timelines, and other reasons.
       # If such a reblog already exists, just do not re-insert it into the feed.
       return false unless redis.zscore(reblog_key, status.id).nil?
@@ -507,7 +486,7 @@ class FeedManager
   # @param [Status] status
   # @param [Boolean] aggregate_reblogs
   # @return [Boolean]
-  def remove_from_feed(timeline_type, account_id, status, aggregate_reblogs = true)
+  def remove_from_feed(timeline_type, account_id, status, aggregate_reblogs: true)
     timeline_key = key(timeline_type, account_id)
     reblog_key   = key(timeline_type, account_id, 'reblogs')
 
@@ -564,10 +543,11 @@ class FeedManager
     end
 
     crutches[:following]       = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:in_reply_to_account_id).compact).pluck(:target_account_id).index_with(true)
+    crutches[:languages]       = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:account_id)).pluck(:target_account_id, :languages).to_h
     crutches[:hiding_reblogs]  = Follow.where(account_id: receiver_id, target_account_id: statuses.map { |s| s.account_id if s.reblog? }.compact, show_reblogs: false).pluck(:target_account_id).index_with(true)
     crutches[:blocking]        = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
     crutches[:muting]          = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
-    crutches[:domain_blocking] = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.map { |s| s.reblog&.account&.domain }.compact).pluck(:domain).index_with(true)
+    crutches[:domain_blocking] = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.flat_map { |s| [s.account.domain, s.reblog&.account&.domain] }.compact).pluck(:domain).index_with(true)
     crutches[:blocked_by]      = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| s.reblog&.account_id }.compact).pluck(:account_id).index_with(true)
 
     crutches
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
deleted file mode 100644
index 1610f3689..000000000
--- a/app/lib/formatter.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-class Formatter
-  include Singleton
-  include RoutingHelper
-
-  include ActionView::Helpers::TextHelper
-
-  def format(status, **options)
-    if status.reblog?
-      prepend_reblog = status.reblog.account.acct
-      status         = status.proper
-    else
-      prepend_reblog = false
-    end
-
-    raw_content = status.text
-
-    if options[:inline_poll_options] && status.preloadable_poll
-      raw_content = raw_content + "\n\n" + status.preloadable_poll.options.map { |title| "[ ] #{title}" }.join("\n")
-    end
-
-    return '' if raw_content.blank?
-
-    unless status.local?
-      html = reformat(raw_content)
-      html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
-      return html.html_safe # rubocop:disable Rails/OutputSafety
-    end
-
-    linkable_accounts = status.active_mentions.map(&:account)
-    linkable_accounts << status.account
-
-    html = raw_content
-    html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
-    html = encode_and_link_urls(html, linkable_accounts)
-    html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
-    html = simple_format(html, {}, sanitize: false)
-    html = html.delete("\n")
-
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def reformat(html)
-    sanitize(html, Sanitize::Config::MASTODON_STRICT)
-  rescue ArgumentError
-    ''
-  end
-
-  def plaintext(status)
-    return status.text if status.local?
-
-    text = status.text.gsub(/(<br \/>|<br>|<\/p>)+/) { |match| "#{match}\n" }
-    strip_tags(text)
-  end
-
-  def simplified_format(account, **options)
-    html = account.local? ? linkify(account.note) : reformat(account.note)
-    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def sanitize(html, config)
-    Sanitize.fragment(html, config)
-  end
-
-  def format_spoiler(status, **options)
-    html = encode(status.spoiler_text)
-    html = encode_custom_emojis(html, status.emojis, options[:autoplay])
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def format_poll_option(status, option, **options)
-    html = encode(option.title)
-    html = encode_custom_emojis(html, status.emojis, options[:autoplay])
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def format_display_name(account, **options)
-    html = encode(account.display_name.presence || account.username)
-    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def format_field(account, str, **options)
-    html = account.local? ? encode_and_link_urls(str, me: true, with_domain: true) : reformat(str)
-    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def linkify(text)
-    html = encode_and_link_urls(text)
-    html = simple_format(html, {}, sanitize: false)
-    html = html.delete("\n")
-
-    html.html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  private
-
-  def html_entities
-    @html_entities ||= HTMLEntities.new
-  end
-
-  def encode(html)
-    html_entities.encode(html)
-  end
-
-  def encode_and_link_urls(html, accounts = nil, options = {})
-    entities = utf8_friendly_extractor(html, extract_url_without_protocol: false)
-
-    if accounts.is_a?(Hash)
-      options  = accounts
-      accounts = nil
-    end
-
-    rewrite(html.dup, entities) do |entity|
-      if entity[:url]
-        link_to_url(entity, options)
-      elsif entity[:hashtag]
-        link_to_hashtag(entity)
-      elsif entity[:screen_name]
-        link_to_mention(entity, accounts, options)
-      end
-    end
-  end
-
-  def count_tag_nesting(tag)
-    if tag[1] == '/' then -1
-    elsif tag[-2] == '/' then 0
-    else 1
-    end
-  end
-
-  # rubocop:disable Metrics/BlockNesting
-  def encode_custom_emojis(html, emojis, animate = false)
-    return html if emojis.empty?
-
-    emoji_map = emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
-
-    i                     = -1
-    tag_open_index        = nil
-    inside_shortname      = false
-    shortname_start_index = -1
-    invisible_depth       = 0
-
-    while i + 1 < html.size
-      i += 1
-
-      if invisible_depth.zero? && inside_shortname && html[i] == ':'
-        shortcode = html[shortname_start_index + 1..i - 1]
-        emoji     = emoji_map[shortcode]
-
-        if emoji
-          original_url, static_url = emoji
-          replacement = begin
-            if animate
-              image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:")
-            else
-              image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url })
-            end
-          end
-          before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : ''
-          html        = before_html + replacement + html[i + 1..-1]
-          i          += replacement.size - (shortcode.size + 2) - 1
-        else
-          i -= 1
-        end
-
-        inside_shortname = false
-      elsif tag_open_index && html[i] == '>'
-        tag = html[tag_open_index..i]
-        tag_open_index = nil
-        if invisible_depth.positive?
-          invisible_depth += count_tag_nesting(tag)
-        elsif tag == '<span class="invisible">'
-          invisible_depth = 1
-        end
-      elsif html[i] == '<'
-        tag_open_index   = i
-        inside_shortname = false
-      elsif !tag_open_index && html[i] == ':'
-        inside_shortname      = true
-        shortname_start_index = i
-      end
-    end
-
-    html
-  end
-  # rubocop:enable Metrics/BlockNesting
-
-  def rewrite(text, entities)
-    text = text.to_s
-
-    # Sort by start index
-    entities = entities.sort_by do |entity|
-      indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
-      indices.first
-    end
-
-    result = []
-
-    last_index = entities.reduce(0) do |index, entity|
-      indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
-      result << encode(text[index...indices.first])
-      result << yield(entity)
-      indices.last
-    end
-
-    result << encode(text[last_index..-1])
-
-    result.flatten.join
-  end
-
-  def utf8_friendly_extractor(text, options = {})
-    # Note: I couldn't obtain list_slug with @user/list-name format
-    # for mention so this requires additional check
-    special = Extractor.extract_urls_with_indices(text, options)
-    standard = Extractor.extract_entities_with_indices(text, options)
-    extra = Extractor.extract_extra_uris_with_indices(text, options)
-
-    Extractor.remove_overlapping_entities(special + standard + extra)
-  end
-
-  def link_to_url(entity, options = {})
-    url        = Addressable::URI.parse(entity[:url])
-    html_attrs = { target: '_blank', rel: 'nofollow noopener noreferrer' }
-
-    html_attrs[:rel] = "me #{html_attrs[:rel]}" if options[:me]
-
-    Twitter::TwitterText::Autolink.send(:link_to_text, entity, link_html(entity[:url]), url, html_attrs)
-  rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
-    encode(entity[:url])
-  end
-
-  def link_to_mention(entity, linkable_accounts, options = {})
-    acct = entity[:screen_name]
-
-    return link_to_account(acct, options) unless linkable_accounts
-
-    same_username_hits = 0
-    account = nil
-    username, domain = acct.split('@')
-    domain = nil if TagManager.instance.local_domain?(domain)
-
-    linkable_accounts.each do |item|
-      same_username = item.username.casecmp(username).zero?
-      same_domain   = item.domain.nil? ? domain.nil? : item.domain.casecmp(domain)&.zero?
-
-      if same_username && !same_domain
-        same_username_hits += 1
-      elsif same_username && same_domain
-        account = item
-      end
-    end
-
-    account ? mention_html(account, with_domain: same_username_hits.positive? || options[:with_domain]) : "@#{encode(acct)}"
-  end
-
-  def link_to_account(acct, options = {})
-    username, domain = acct.split('@')
-
-    domain  = nil if TagManager.instance.local_domain?(domain)
-    account = EntityCache.instance.mention(username, domain)
-
-    account ? mention_html(account, with_domain: options[:with_domain]) : "@#{encode(acct)}"
-  end
-
-  def link_to_hashtag(entity)
-    hashtag_html(entity[:hashtag])
-  end
-
-  def link_html(url)
-    url    = Addressable::URI.parse(url).to_s
-    prefix = url.match(/\A(https?:\/\/(www\.)?|xmpp:)/).to_s
-    text   = url[prefix.length, 30]
-    suffix = url[prefix.length + 30..-1]
-    cutoff = url[prefix.length..-1].length > 30
-
-    "<span class=\"invisible\">#{encode(prefix)}</span><span class=\"#{cutoff ? 'ellipsis' : ''}\">#{encode(text)}</span><span class=\"invisible\">#{encode(suffix)}</span>"
-  end
-
-  def hashtag_html(tag)
-    "<a href=\"#{encode(tag_url(tag))}\" class=\"mention hashtag\" rel=\"tag\">#<span>#{encode(tag)}</span></a>"
-  end
-
-  def mention_html(account, with_domain: false)
-    "<span class=\"h-card\"><a href=\"#{encode(ActivityPub::TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(with_domain ? account.pretty_acct : account.username)}</span></a></span>"
-  end
-end
diff --git a/app/lib/hashtag_normalizer.rb b/app/lib/hashtag_normalizer.rb
new file mode 100644
index 000000000..49fa6101d
--- /dev/null
+++ b/app/lib/hashtag_normalizer.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class HashtagNormalizer
+  def normalize(str)
+    remove_invalid_characters(ascii_folding(lowercase(cjk_width(str))))
+  end
+
+  private
+
+  def remove_invalid_characters(str)
+    str.gsub(Tag::HASHTAG_INVALID_CHARS_RE, '')
+  end
+
+  def ascii_folding(str)
+    ASCIIFolding.new.fold(str)
+  end
+
+  def lowercase(str)
+    str.mb_chars.downcase.to_s
+  end
+
+  def cjk_width(str)
+    str.unicode_normalize(:nfkc)
+  end
+end
diff --git a/app/lib/html_aware_formatter.rb b/app/lib/html_aware_formatter.rb
new file mode 100644
index 000000000..64edba09b
--- /dev/null
+++ b/app/lib/html_aware_formatter.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class HtmlAwareFormatter
+  attr_reader :text, :local, :options
+
+  alias local? local
+
+  # @param [String] text
+  # @param [Boolean] local
+  # @param [Hash] options
+  def initialize(text, local, options = {})
+    @text    = text
+    @local   = local
+    @options = options
+  end
+
+  def to_s
+    return ''.html_safe if text.blank?
+
+    if local?
+      linkify
+    else
+      reformat.html_safe # rubocop:disable Rails/OutputSafety
+    end
+  rescue ArgumentError
+    ''.html_safe
+  end
+
+  private
+
+  def reformat
+    Sanitize.fragment(text, Sanitize::Config::MASTODON_STRICT)
+  end
+
+  def linkify
+    TextFormatter.new(text, options).to_s
+  end
+end
diff --git a/app/lib/importer/accounts_index_importer.rb b/app/lib/importer/accounts_index_importer.rb
new file mode 100644
index 000000000..792a31b1b
--- /dev/null
+++ b/app/lib/importer/accounts_index_importer.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Importer::AccountsIndexImporter < Importer::BaseImporter
+  def import!
+    scope.includes(:account_stat).find_in_batches(batch_size: @batch_size) do |tmp|
+      in_work_unit(tmp) do |accounts|
+        bulk = Chewy::Index::Import::BulkBuilder.new(index, to_index: accounts).bulk_body
+
+        indexed = bulk.select { |entry| entry[:index] }.size
+        deleted = bulk.select { |entry| entry[:delete] }.size
+
+        Chewy::Index::Import::BulkRequest.new(index).perform(bulk)
+
+        [indexed, deleted]
+      end
+    end
+
+    wait!
+  end
+
+  private
+
+  def index
+    AccountsIndex
+  end
+
+  def scope
+    Account.searchable
+  end
+end
diff --git a/app/lib/importer/base_importer.rb b/app/lib/importer/base_importer.rb
new file mode 100644
index 000000000..ea522c600
--- /dev/null
+++ b/app/lib/importer/base_importer.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class Importer::BaseImporter
+  # @param [Integer] batch_size
+  # @param [Concurrent::ThreadPoolExecutor] executor
+  def initialize(batch_size:, executor:)
+    @batch_size = batch_size
+    @executor   = executor
+    @wait_for   = Concurrent::Set.new
+  end
+
+  # Callback to run when a concurrent work unit completes
+  # @param [Proc]
+  def on_progress(&block)
+    @on_progress = block
+  end
+
+  # Callback to run when a concurrent work unit fails
+  # @param [Proc]
+  def on_failure(&block)
+    @on_failure = block
+  end
+
+  # Reduce resource usage during and improve speed of indexing
+  def optimize_for_import!
+    Chewy.client.indices.put_settings index: index.index_name, body: { index: { refresh_interval: -1 } }
+  end
+
+  # Restore original index settings
+  def optimize_for_search!
+    Chewy.client.indices.put_settings index: index.index_name, body: { index: { refresh_interval: index.settings_hash[:settings][:index][:refresh_interval] } }
+  end
+
+  # Estimate the amount of documents that would be indexed. Not exact!
+  # @returns [Integer]
+  def estimate!
+    ActiveRecord::Base.connection_pool.with_connection { |connection| connection.select_one("SELECT reltuples AS estimate FROM pg_class WHERE relname = '#{index.adapter.target.table_name}'")['estimate'].to_i }
+  end
+
+  # Import data from the database into the index
+  def import!
+    raise NotImplementedError
+  end
+
+  # Remove documents from the index that no longer exist in the database
+  def clean_up!
+    index.scroll_batches do |documents|
+      ids           = documents.map { |doc| doc['_id'] }
+      existence_map = index.adapter.target.where(id: ids).pluck(:id).each_with_object({}) { |id, map| map[id.to_s] = true }
+      tmp           = ids.reject { |id| existence_map[id] }
+
+      next if tmp.empty?
+
+      in_work_unit(tmp) do |deleted_ids|
+        bulk = Chewy::Index::Import::BulkBuilder.new(index, delete: deleted_ids).bulk_body
+
+        Chewy::Index::Import::BulkRequest.new(index).perform(bulk)
+
+        [0, bulk.size]
+      end
+    end
+
+    wait!
+  end
+
+  protected
+
+  def in_work_unit(*args, &block)
+    work_unit = Concurrent::Promises.future_on(@executor, *args, &block)
+
+    work_unit.on_fulfillment!(&@on_progress)
+    work_unit.on_rejection!(&@on_failure)
+    work_unit.on_resolution! { @wait_for.delete(work_unit) }
+
+    @wait_for << work_unit
+  rescue Concurrent::RejectedExecutionError
+    sleep(0.1) && retry # Backpressure
+  end
+
+  def wait!
+    Concurrent::Promises.zip(*@wait_for).wait
+  end
+
+  def index
+    raise NotImplementedError
+  end
+end
diff --git a/app/lib/importer/statuses_index_importer.rb b/app/lib/importer/statuses_index_importer.rb
new file mode 100644
index 000000000..5b5153d5c
--- /dev/null
+++ b/app/lib/importer/statuses_index_importer.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+class Importer::StatusesIndexImporter < Importer::BaseImporter
+  def import!
+    # The idea is that instead of iterating over all statuses in the database
+    # and calculating the searchable_by for each of them (majority of which
+    # would be empty), we approach the index from the other end
+
+    scopes.each do |scope|
+      # We could be tempted to keep track of status IDs we have already processed
+      # from a different scope to avoid indexing them multiple times, but that
+      # could end up being a very large array
+
+      scope.find_in_batches(batch_size: @batch_size) do |tmp|
+        in_work_unit(tmp.map(&:status_id)) do |status_ids|
+          bulk = ActiveRecord::Base.connection_pool.with_connection do
+            Chewy::Index::Import::BulkBuilder.new(index, to_index: Status.includes(:media_attachments, :preloadable_poll).where(id: status_ids)).bulk_body
+          end
+
+          indexed = 0
+          deleted = 0
+
+          # We can't use the delete_if proc to do the filtering because delete_if
+          # is called before rendering the data and we need to filter based
+          # on the results of the filter, so this filtering happens here instead
+          bulk.map! do |entry|
+            new_entry = begin
+              if entry[:index] && entry.dig(:index, :data, 'searchable_by').blank?
+                { delete: entry[:index].except(:data) }
+              else
+                entry
+              end
+            end
+
+            if new_entry[:index]
+              indexed += 1
+            else
+              deleted += 1
+            end
+
+            new_entry
+          end
+
+          Chewy::Index::Import::BulkRequest.new(index).perform(bulk)
+
+          [indexed, deleted]
+        end
+      end
+    end
+
+    wait!
+  end
+
+  private
+
+  def index
+    StatusesIndex
+  end
+
+  def scopes
+    [
+      local_statuses_scope,
+      local_mentions_scope,
+      local_favourites_scope,
+      local_votes_scope,
+      local_bookmarks_scope,
+    ]
+  end
+
+  def local_mentions_scope
+    Mention.where(account: Account.local, silent: false).select(:id, :status_id)
+  end
+
+  def local_favourites_scope
+    Favourite.where(account: Account.local).select(:id, :status_id)
+  end
+
+  def local_bookmarks_scope
+    Bookmark.select(:id, :status_id)
+  end
+
+  def local_votes_scope
+    Poll.joins(:votes).where(votes: { account: Account.local }).select('polls.id, polls.status_id')
+  end
+
+  def local_statuses_scope
+    Status.local.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id')
+  end
+end
diff --git a/app/lib/importer/tags_index_importer.rb b/app/lib/importer/tags_index_importer.rb
new file mode 100644
index 000000000..f5bd8f052
--- /dev/null
+++ b/app/lib/importer/tags_index_importer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Importer::TagsIndexImporter < Importer::BaseImporter
+  def import!
+    index.adapter.default_scope.find_in_batches(batch_size: @batch_size) do |tmp|
+      in_work_unit(tmp) do |tags|
+        bulk = Chewy::Index::Import::BulkBuilder.new(index, to_index: tags).bulk_body
+
+        indexed = bulk.select { |entry| entry[:index] }.size
+        deleted = bulk.select { |entry| entry[:delete] }.size
+
+        Chewy::Index::Import::BulkRequest.new(index).perform(bulk)
+
+        [indexed, deleted]
+      end
+    end
+
+    wait!
+  end
+
+  private
+
+  def index
+    TagsIndex
+  end
+end
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index b70814748..4bb240b48 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -11,6 +11,7 @@ class InlineRenderer
     case @template
     when :status
       serializer = REST::StatusSerializer
+      preload_associations_for_status
     when :notification
       serializer = REST::NotificationSerializer
     when :conversation
@@ -35,6 +36,16 @@ class InlineRenderer
 
   private
 
+  def preload_associations_for_status
+    ActiveRecord::Associations::Preloader.new.preload(@object, {
+      active_mentions: :account,
+
+      reblog: {
+        active_mentions: :account,
+      },
+    })
+  end
+
   def current_user
     @current_account&.user
   end
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
deleted file mode 100644
index 40452eddc..000000000
--- a/app/lib/language_detector.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-class LanguageDetector
-  include Singleton
-
-  WORDS_THRESHOLD        = 4
-  RELIABLE_CHARACTERS_RE = /[\p{Hebrew}\p{Arabic}\p{Syriac}\p{Thaana}\p{Nko}\p{Han}\p{Katakana}\p{Hiragana}\p{Hangul}\p{Thai}]+/m
-
-  def initialize
-    @identifier = CLD3::NNetLanguageIdentifier.new(1, 2048)
-  end
-
-  def detect(text, account)
-    input_text = prepare_text(text)
-
-    return if input_text.blank?
-
-    detect_language_code(input_text) || default_locale(account)
-  end
-
-  def language_names
-    @language_names = CLD3::TaskContextParams::LANGUAGE_NAMES.map { |name| iso6391(name.to_s).to_sym }.uniq
-  end
-
-  private
-
-  def prepare_text(text)
-    simplify_text(text).strip
-  end
-
-  def unreliable_input?(text)
-    !reliable_input?(text)
-  end
-
-  def reliable_input?(text)
-    sufficient_text_length?(text) || language_specific_character_set?(text)
-  end
-
-  def sufficient_text_length?(text)
-    text.split(/\s+/).size >= WORDS_THRESHOLD
-  end
-
-  def language_specific_character_set?(text)
-    words = text.scan(RELIABLE_CHARACTERS_RE)
-
-    if words.present?
-      words.reduce(0) { |acc, elem| acc + elem.size }.to_f / text.size > 0.3
-    else
-      false
-    end
-  end
-
-  def detect_language_code(text)
-    return if unreliable_input?(text)
-
-    result = @identifier.find_language(text)
-
-    iso6391(result.language.to_s).to_sym if result&.reliable?
-  end
-
-  def iso6391(bcp47)
-    iso639 = bcp47.split('-').first
-
-    # CLD3 returns grandfathered language code for Hebrew
-    return 'he' if iso639 == 'iw'
-
-    ISO_639.find(iso639).alpha2
-  end
-
-  def simplify_text(text)
-    new_text = remove_html(text)
-    new_text.gsub!(FetchLinkCardService::URL_PATTERN, '\1')
-    new_text.gsub!(Account::MENTION_RE, '')
-    new_text.gsub!(Tag::HASHTAG_RE) { |string| string.gsub(/[#_]/, '#' => '', '_' => ' ').gsub(/[a-z][A-Z]|[a-zA-Z][\d]/) { |s| s.insert(1, ' ') }.downcase }
-    new_text.gsub!(/:#{CustomEmoji::SHORTCODE_RE_FRAGMENT}:/, '')
-    new_text.gsub!(/\s+/, ' ')
-    new_text
-  end
-
-  def new_scrubber
-    scrubber = Rails::Html::PermitScrubber.new
-    scrubber.tags = %w(br p)
-    scrubber
-  end
-
-  def scrubber
-    @scrubber ||= new_scrubber
-  end
-
-  def remove_html(text)
-    text = Loofah.fragment(text).scrub!(scrubber).to_s
-    text.gsub!('<br>', "\n")
-    text.gsub!('</p><p>', "\n\n")
-    text.gsub!(/(^<p>|<\/p>$)/, '')
-    text
-  end
-
-  def default_locale(account)
-    account.user_locale&.to_sym || I18n.default_locale if account.local?
-  end
-end
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 56ad0717b..b0c4e4f42 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -2,6 +2,20 @@
 
 class LinkDetailsExtractor
   include ActionView::Helpers::TagHelper
+  include LanguagesHelper
+
+  # Some publications wrap their JSON-LD data in their <script> tags
+  # in commented-out CDATA blocks, they need to be removed before
+  # attempting to parse JSON
+  CDATA_JUNK_PATTERN = %r{^[\s]*(
+    (/\*[\s]*<!\[CDATA\[[\s]*\*/) # Block comment style opening
+    |
+    (//[\s]*<!\[CDATA\[) # Single-line comment style opening
+    |
+    (/\*[\s]*\]\]>[\s]*\*/) # Block comment style closing
+    |
+    (//[\s]*\]\]>) # Single-line comment style closing
+  )[\s]*$}x
 
   class StructuredData
     SUPPORTED_TYPES = %w(
@@ -61,6 +75,10 @@ class LinkDetailsExtractor
       publisher.dig('logo', 'url')
     end
 
+    def valid?
+      json.present?
+    end
+
     private
 
     def author
@@ -134,11 +152,11 @@ class LinkDetailsExtractor
   end
 
   def title
-    structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first
+    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
   end
 
   def description
-    structured_data&.description || opengraph_tag('og:description') || meta_tag('description')
+    html_entities.decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
   end
 
   def image
@@ -146,11 +164,11 @@ class LinkDetailsExtractor
   end
 
   def canonical_url
-    valid_url_or_nil(opengraph_tag('og:url') || link_tag('canonical'), same_origin_only: true) || @original_url.to_s
+    valid_url_or_nil(link_tag('canonical') || opengraph_tag('og:url'), same_origin_only: true) || @original_url.to_s
   end
 
   def provider_name
-    structured_data&.publisher_name || opengraph_tag('og:site_name')
+    html_entities.decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
   end
 
   def provider_url
@@ -158,7 +176,7 @@ class LinkDetailsExtractor
   end
 
   def author_name
-    structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username')
+    html_entities.decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
   end
 
   def author_url
@@ -190,7 +208,7 @@ class LinkDetailsExtractor
   end
 
   def valid_url_or_nil(str, same_origin_only: false)
-    return if str.blank?
+    return if str.blank? || str == 'null'
 
     url = @original_url + Addressable::URI.parse(str)
 
@@ -201,14 +219,6 @@ class LinkDetailsExtractor
     nil
   end
 
-  def valid_locale_or_nil(str)
-    return nil if str.blank?
-
-    code,  = str.split(/_-/) # Strip out the region from e.g. en_US or ja-JA
-    locale = ISO_639.find(code)
-    locale&.alpha2
-  end
-
   def link_tag(name)
     document.xpath("//link[@rel=\"#{name}\"]").map { |link| link['href'] }.first
   end
@@ -223,10 +233,24 @@ class LinkDetailsExtractor
 
   def structured_data
     @structured_data ||= begin
-      json_ld = document.xpath('//script[@type="application/ld+json"]').map(&:content).first
-      json_ld.present? ? StructuredData.new(json_ld) : nil
-    rescue Oj::ParseError
-      nil
+      # Some publications have more than one JSON-LD definition on the page,
+      # and some of those definitions aren't valid JSON either, so we have
+      # to loop through here until we find something that is the right type
+      # and doesn't break
+      document.xpath('//script[@type="application/ld+json"]').filter_map do |element|
+        json_ld = element.content&.gsub(CDATA_JUNK_PATTERN, '')
+
+        next if json_ld.blank?
+
+        structured_data = StructuredData.new(html_entities.decode(json_ld))
+
+        next unless structured_data.valid?
+
+        structured_data
+      rescue Oj::ParseError, EncodingError
+        Rails.logger.debug("Invalid JSON-LD in #{@original_url}")
+        next
+      end.first
     end
   end
 
@@ -246,4 +270,8 @@ class LinkDetailsExtractor
       detector.strip_tags = true
     end
   end
+
+  def html_entities
+    @html_entities ||= HTMLEntities.new
+  end
 end
diff --git a/app/lib/permalink_redirector.rb b/app/lib/permalink_redirector.rb
index e48bce060..cf1a37625 100644
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -8,20 +8,14 @@ class PermalinkRedirector
   end
 
   def redirect_path
-    if path_segments[0] == 'web'
-      if path_segments[1].present? && path_segments[1].start_with?('@') && path_segments[2] =~ /\d/
-        find_status_url_by_id(path_segments[2])
-      elsif path_segments[1].present? && path_segments[1].start_with?('@')
-        find_account_url_by_name(path_segments[1])
-      elsif path_segments[1] == 'statuses' && path_segments[2] =~ /\d/
-        find_status_url_by_id(path_segments[2])
-      elsif path_segments[1] == 'accounts' && path_segments[2] =~ /\d/
-        find_account_url_by_id(path_segments[2])
-      elsif path_segments[1] == 'timelines' && path_segments[2] == 'tag' && path_segments[3].present?
-        find_tag_url_by_name(path_segments[3])
-      elsif path_segments[1] == 'tags' && path_segments[2].present?
-        find_tag_url_by_name(path_segments[2])
-      end
+    if path_segments[0].present? && path_segments[0].start_with?('@') && path_segments[1] =~ /\d/
+      find_status_url_by_id(path_segments[1])
+    elsif path_segments[0].present? && path_segments[0].start_with?('@')
+      find_account_url_by_name(path_segments[0])
+    elsif path_segments[0] == 'statuses' && path_segments[1] =~ /\d/
+      find_status_url_by_id(path_segments[1])
+    elsif path_segments[0] == 'accounts' && path_segments[1] =~ /\d/
+      find_account_url_by_id(path_segments[1])
     end
   end
 
@@ -33,18 +27,12 @@ class PermalinkRedirector
 
   def find_status_url_by_id(id)
     status = Status.find_by(id: id)
-
-    return unless status&.distributable?
-
-    ActivityPub::TagManager.instance.url_for(status)
+    ActivityPub::TagManager.instance.url_for(status) if status&.distributable? && !status.account.local?
   end
 
   def find_account_url_by_id(id)
     account = Account.find_by(id: id)
-
-    return unless account
-
-    ActivityPub::TagManager.instance.url_for(account)
+    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
   end
 
   def find_account_url_by_name(name)
@@ -52,12 +40,6 @@ class PermalinkRedirector
     domain           = nil if TagManager.instance.local_domain?(domain)
     account          = Account.find_remote(username, domain)
 
-    return unless account
-
-    ActivityPub::TagManager.instance.url_for(account)
-  end
-
-  def find_tag_url_by_name(name)
-    tag_path(CGI.unescape(name))
+    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
   end
 end
diff --git a/app/lib/plain_text_formatter.rb b/app/lib/plain_text_formatter.rb
new file mode 100644
index 000000000..08aa29696
--- /dev/null
+++ b/app/lib/plain_text_formatter.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class PlainTextFormatter
+  include ActionView::Helpers::TextHelper
+
+  NEWLINE_TAGS_RE = /(<br \/>|<br>|<\/p>)+/.freeze
+
+  attr_reader :text, :local
+
+  alias local? local
+
+  def initialize(text, local)
+    @text  = text
+    @local = local
+  end
+
+  def to_s
+    if local?
+      text
+    else
+      strip_tags(insert_newlines).chomp
+    end
+  end
+
+  private
+
+  def insert_newlines
+    text.gsub(NEWLINE_TAGS_RE) { |match| "#{match}\n" }
+  end
+end
diff --git a/app/lib/redis_configuration.rb b/app/lib/redis_configuration.rb
new file mode 100644
index 000000000..f0e86d985
--- /dev/null
+++ b/app/lib/redis_configuration.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class RedisConfiguration
+  class << self
+    def establish_pool(new_pool_size)
+      @pool&.shutdown(&:close)
+      @pool = ConnectionPool.new(size: new_pool_size) { new.connection }
+    end
+
+    delegate :with, to: :pool
+
+    def pool
+      @pool ||= establish_pool(pool_size)
+    end
+
+    def pool_size
+      if Sidekiq.server?
+        Sidekiq[:concurrency]
+      else
+        ENV['MAX_THREADS'] || 5
+      end
+    end
+  end
+
+  def connection
+    if namespace?
+      Redis::Namespace.new(namespace, redis: raw_connection)
+    else
+      raw_connection
+    end
+  end
+
+  def namespace?
+    namespace.present?
+  end
+
+  def namespace
+    ENV.fetch('REDIS_NAMESPACE', nil)
+  end
+
+  def url
+    ENV['REDIS_URL']
+  end
+
+  private
+
+  def raw_connection
+    Redis.new(url: url, driver: :hiredis)
+  end
+end
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 4289da933..b2819c8ed 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -30,8 +30,9 @@ class Request
     @verb        = verb
     @url         = Addressable::URI.parse(url).normalize
     @http_client = options.delete(:http_client)
-    @options     = options.merge(socket_class: use_proxy? ? ProxySocket : Socket)
-    @options     = @options.merge(Rails.configuration.x.http_client_proxy) if use_proxy?
+    @allow_local = options.delete(:allow_local)
+    @options     = options.merge(socket_class: use_proxy? || @allow_local ? ProxySocket : Socket)
+    @options     = @options.merge(proxy_url) if use_proxy?
     @headers     = {}
 
     raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?
@@ -40,12 +41,11 @@ class Request
     set_digest! if options.key?(:body)
   end
 
-  def on_behalf_of(account, key_id_format = :uri, sign_with: nil)
-    raise ArgumentError, 'account must not be nil' if account.nil?
+  def on_behalf_of(actor, sign_with: nil)
+    raise ArgumentError, 'actor must not be nil' if actor.nil?
 
-    @account       = account
-    @keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @account.keypair
-    @key_id_format = key_id_format
+    @actor         = actor
+    @keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @actor.keypair
 
     self
   end
@@ -63,8 +63,6 @@ class Request
     end
 
     begin
-      response = response.extend(ClientLimit)
-
       # If we are using a persistent connection, we have to
       # read every response to be able to move forward at all.
       # However, simply calling #to_s or #flush may not be safe,
@@ -79,7 +77,7 @@ class Request
   end
 
   def headers
-    (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
+    (@actor ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
   end
 
   class << self
@@ -128,12 +126,7 @@ class Request
   end
 
   def key_id
-    case @key_id_format
-    when :acct
-      @account.to_webfinger_s
-    when :uri
-      [ActivityPub::TagManager.instance.uri_for(@account), '#main-key'].join
-    end
+    ActivityPub::TagManager.instance.key_uri_for(@actor)
   end
 
   def http_client
@@ -141,11 +134,23 @@ class Request
   end
 
   def use_proxy?
-    Rails.configuration.x.http_client_proxy.present?
+    proxy_url.present?
+  end
+
+  def proxy_url
+    if hidden_service? && Rails.configuration.x.http_client_hidden_proxy.present?
+      Rails.configuration.x.http_client_hidden_proxy
+    else
+      Rails.configuration.x.http_client_proxy
+    end
   end
 
   def block_hidden_service?
-    !Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match?(@url.host)
+    !Rails.configuration.x.access_to_hidden_service && hidden_service?
+  end
+
+  def hidden_service?
+    /\.(onion|i2p)$/.match?(@url.host)
   end
 
   module ClientLimit
@@ -175,6 +180,14 @@ class Request
     end
   end
 
+  if ::HTTP::Response.methods.include?(:body_with_limit) && !Rails.env.production?
+    abort 'HTTP::Response#body_with_limit is already defined, the monkey patch will not be applied'
+  else
+    class ::HTTP::Response
+      include Request::ClientLimit
+    end
+  end
+
   class Socket < TCPSocket
     class << self
       def open(host, *args)
@@ -187,7 +200,8 @@ class Request
         rescue IPAddr::InvalidAddressError
           Resolv::DNS.open do |dns|
             dns.timeouts = 5
-            addresses = dns.getaddresses(host).take(2)
+            addresses = dns.getaddresses(host)
+            addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
           end
         end
 
@@ -196,7 +210,7 @@ class Request
 
         addresses.each do |address|
           begin
-            check_private_address(address)
+            check_private_address(address, host)
 
             sock     = ::Socket.new(address.is_a?(Resolv::IPv6) ? ::Socket::AF_INET6 : ::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
             sockaddr = ::Socket.pack_sockaddr_in(port, address.to_s)
@@ -252,10 +266,10 @@ class Request
 
       alias new open
 
-      def check_private_address(address)
+      def check_private_address(address, host)
         addr = IPAddr.new(address.to_s)
         return if private_address_exceptions.any? { |range| range.include?(addr) }
-        raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(addr)
+        raise Mastodon::PrivateNetworkAddressError, host if PrivateAddressCheck.private_address?(addr)
       end
 
       def private_address_exceptions
@@ -268,7 +282,7 @@ class Request
 
   class ProxySocket < Socket
     class << self
-      def check_private_address(_address)
+      def check_private_address(_address, _host)
         # Accept connections to private addresses as HTTP proxies will usually
         # be on local addresses
         nil
diff --git a/app/lib/rss/builder.rb b/app/lib/rss/builder.rb
new file mode 100644
index 000000000..a9b3f08c5
--- /dev/null
+++ b/app/lib/rss/builder.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class RSS::Builder
+  attr_reader :dsl
+
+  def self.build
+    new.tap do |builder|
+      yield builder.dsl
+    end.to_xml
+  end
+
+  def initialize
+    @dsl = RSS::Channel.new
+  end
+
+  def to_xml
+    ('<?xml version="1.0" encoding="UTF-8"?>'.dup << Ox.dump(wrap_in_document, effort: :tolerant)).force_encoding('UTF-8')
+  end
+
+  private
+
+  def wrap_in_document
+    Ox::Document.new(version: '1.0').tap do |document|
+      document << Ox::Element.new('rss').tap do |rss|
+        rss['version']        = '2.0'
+        rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
+        rss['xmlns:media']    = 'http://search.yahoo.com/mrss/'
+
+        rss << @dsl.to_element
+      end
+    end
+  end
+end
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
new file mode 100644
index 000000000..1dba94e47
--- /dev/null
+++ b/app/lib/rss/channel.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class RSS::Channel < RSS::Element
+  def initialize
+    super()
+
+    @root = create_element('channel')
+  end
+
+  def title(str)
+    append_element('title', str)
+  end
+
+  def link(str)
+    append_element('link', str)
+  end
+
+  def last_build_date(date)
+    append_element('lastBuildDate', date.to_formatted_s(:rfc822))
+  end
+
+  def image(url, title, link)
+    append_element('image') do |image|
+      image << create_element('url', url)
+      image << create_element('title', title)
+      image << create_element('link', link)
+    end
+  end
+
+  def description(str)
+    append_element('description', str)
+  end
+
+  def generator(str)
+    append_element('generator', str)
+  end
+
+  def icon(str)
+    append_element('webfeeds:icon', str)
+  end
+
+  def logo(str)
+    append_element('webfeeds:logo', str)
+  end
+
+  def item(&block)
+    @root << RSS::Item.with(&block)
+  end
+end
diff --git a/app/lib/rss/element.rb b/app/lib/rss/element.rb
new file mode 100644
index 000000000..7142fa039
--- /dev/null
+++ b/app/lib/rss/element.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class RSS::Element
+  def self.with(*args, &block)
+    new(*args).tap(&block).to_element
+  end
+
+  def create_element(name, content = nil)
+    Ox::Element.new(name).tap do |element|
+      yield element if block_given?
+      element << content if content.present?
+    end
+  end
+
+  def append_element(name, content = nil)
+    @root << create_element(name, content).tap do |element|
+      yield element if block_given?
+    end
+  end
+
+  def to_element
+    @root
+  end
+end
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
new file mode 100644
index 000000000..c02991ace
--- /dev/null
+++ b/app/lib/rss/item.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class RSS::Item < RSS::Element
+  def initialize
+    super()
+
+    @root = create_element('item')
+  end
+
+  def title(str)
+    append_element('title', str)
+  end
+
+  def link(str)
+    append_element('guid', str) do |guid|
+      guid['isPermaLink'] = 'true'
+    end
+
+    append_element('link', str)
+  end
+
+  def pub_date(date)
+    append_element('pubDate', date.to_formatted_s(:rfc822))
+  end
+
+  def description(str)
+    append_element('description', str)
+  end
+
+  def category(str)
+    append_element('category', str)
+  end
+
+  def enclosure(url, type, size)
+    append_element('enclosure') do |enclosure|
+      enclosure['url']    = url
+      enclosure['length'] = size
+      enclosure['type']   = type
+    end
+  end
+
+  def media_content(url, type, size, &block)
+    @root << RSS::MediaContent.with(url, type, size, &block)
+  end
+end
diff --git a/app/lib/rss/media_content.rb b/app/lib/rss/media_content.rb
new file mode 100644
index 000000000..f281fe29e
--- /dev/null
+++ b/app/lib/rss/media_content.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class RSS::MediaContent < RSS::Element
+  def initialize(url, type, size)
+    super()
+
+    @root = create_element('media:content') do |content|
+      content['url']      = url
+      content['type']     = type
+      content['fileSize'] = size
+    end
+  end
+
+  def medium(str)
+    @root['medium'] = str
+  end
+
+  def rating(str)
+    append_element('media:rating', str) do |rating|
+      rating['scheme'] = 'urn:simple'
+    end
+  end
+
+  def description(str)
+    append_element('media:description', str) do |description|
+      description['type'] = 'plain'
+    end
+  end
+
+  def thumbnail(str)
+    append_element('media:thumbnail') do |thumbnail|
+      thumbnail['url'] = str
+    end
+  end
+end
diff --git a/app/lib/rss/serializer.rb b/app/lib/rss/serializer.rb
deleted file mode 100644
index fd56c568c..000000000
--- a/app/lib/rss/serializer.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::Serializer
-  private
-
-  def render_statuses(builder, statuses)
-    statuses.each do |status|
-      builder.item do |item|
-        item.title(status_title(status))
-            .link(ActivityPub::TagManager.instance.url_for(status))
-            .pub_date(status.created_at)
-            .description(status.spoiler_text.presence || Formatter.instance.format(status, inline_poll_options: true).to_str)
-
-        status.media_attachments.each do |media|
-          item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
-        end
-      end
-    end
-  end
-
-  def status_title(status)
-    return "#{status.account.acct} deleted status" if status.destroyed?
-
-    preview = status.proper.spoiler_text.presence || status.proper.text
-    if preview.length > 30 || preview[0, 30].include?("\n")
-      preview = preview[0, 30]
-      preview = preview[0, preview.index("\n").presence || 30] + '…'
-    end
-
-    preview = "#{status.proper.spoiler_text.present? ? 'CW ' : ''}“#{preview}”#{status.proper.sensitive? ? ' (sensitive)' : ''}"
-
-    if status.reblog?
-      "#{status.account.acct} boosted #{status.reblog.account.acct}: #{preview}"
-    else
-      "#{status.account.acct}: #{preview}"
-    end
-  end
-end
diff --git a/app/lib/rss_builder.rb b/app/lib/rss_builder.rb
deleted file mode 100644
index 63ddba2e8..000000000
--- a/app/lib/rss_builder.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-class RSSBuilder
-  class ItemBuilder
-    def initialize
-      @item = Ox::Element.new('item')
-    end
-
-    def title(str)
-      @item << (Ox::Element.new('title') << str)
-
-      self
-    end
-
-    def link(str)
-      @item << Ox::Element.new('guid').tap do |guid|
-        guid['isPermalink'] = 'true'
-        guid << str
-      end
-
-      @item << (Ox::Element.new('link') << str)
-
-      self
-    end
-
-    def pub_date(date)
-      @item << (Ox::Element.new('pubDate') << date.to_formatted_s(:rfc822))
-
-      self
-    end
-
-    def description(str)
-      @item << (Ox::Element.new('description') << str)
-
-      self
-    end
-
-    def enclosure(url, type, size)
-      @item << Ox::Element.new('enclosure').tap do |enclosure|
-        enclosure['url']    = url
-        enclosure['length'] = size
-        enclosure['type']   = type
-      end
-
-      self
-    end
-
-    def to_element
-      @item
-    end
-  end
-
-  def initialize
-    @document = Ox::Document.new(version: '1.0')
-    @channel  = Ox::Element.new('channel')
-
-    @document << (rss << @channel)
-  end
-
-  def title(str)
-    @channel << (Ox::Element.new('title') << str)
-
-    self
-  end
-
-  def link(str)
-    @channel << (Ox::Element.new('link') << str)
-
-    self
-  end
-
-  def image(str)
-    @channel << Ox::Element.new('image').tap do |image|
-      image << (Ox::Element.new('url') << str)
-      image << (Ox::Element.new('title') << '')
-      image << (Ox::Element.new('link') << '')
-    end
-
-    @channel << (Ox::Element.new('webfeeds:icon') << str)
-
-    self
-  end
-
-  def cover(str)
-    @channel << Ox::Element.new('webfeeds:cover').tap do |cover|
-      cover['image'] = str
-    end
-
-    self
-  end
-
-  def logo(str)
-    @channel << (Ox::Element.new('webfeeds:logo') << str)
-
-    self
-  end
-
-  def accent_color(str)
-    @channel << (Ox::Element.new('webfeeds:accentColor') << str)
-
-    self
-  end
-
-  def description(str)
-    @channel << (Ox::Element.new('description') << str)
-
-    self
-  end
-
-  def item
-    @channel << ItemBuilder.new.tap do |item|
-      yield item
-    end.to_element
-
-    self
-  end
-
-  def to_xml
-    ('<?xml version="1.0" encoding="UTF-8"?>' + Ox.dump(@document, effort: :tolerant)).force_encoding('UTF-8')
-  end
-
-  private
-
-  def rss
-    Ox::Element.new('rss').tap do |rss|
-      rss['version']        = '2.0'
-      rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
-    end
-  end
-end
diff --git a/app/lib/scope_parser.rb b/app/lib/scope_parser.rb
new file mode 100644
index 000000000..d268688c8
--- /dev/null
+++ b/app/lib/scope_parser.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class ScopeParser < Parslet::Parser
+  rule(:term)      { match('[a-z]').repeat(1).as(:term) }
+  rule(:colon)     { str(':') }
+  rule(:access)    { (str('write') | str('read')).as(:access) }
+  rule(:namespace) { str('admin').as(:namespace) }
+  rule(:scope)     { ((namespace >> colon).maybe >> ((access >> colon >> term) | access | term)).as(:scope) }
+  root(:scope)
+end
diff --git a/app/lib/scope_transformer.rb b/app/lib/scope_transformer.rb
new file mode 100644
index 000000000..fdfc6cf13
--- /dev/null
+++ b/app/lib/scope_transformer.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class ScopeTransformer < Parslet::Transform
+  class Scope
+    DEFAULT_TERM   = 'all'
+    DEFAULT_ACCESS = %w(read write).freeze
+
+    attr_reader :namespace, :term
+
+    def initialize(scope)
+      @namespace = scope[:namespace]&.to_s
+      @access    = scope[:access] ? [scope[:access].to_s] : DEFAULT_ACCESS.dup
+      @term      = scope[:term]&.to_s || DEFAULT_TERM
+    end
+
+    def key
+      @key ||= [@namespace, @term].compact.join('/')
+    end
+
+    def access
+      @access.join('/')
+    end
+
+    def merge(other_scope)
+      clone.merge!(other_scope)
+    end
+
+    def merge!(other_scope)
+      raise ArgumentError unless other_scope.namespace == namespace && other_scope.term == term
+
+      @access.concat(other_scope.instance_variable_get('@access'))
+      @access.uniq!
+      @access.sort!
+
+      self
+    end
+  end
+
+  rule(scope: subtree(:scope)) { Scope.new(scope) }
+end
diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index e07ebfffe..aef05e9d9 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -2,19 +2,21 @@
 
 class SearchQueryTransformer < Parslet::Transform
   class Query
-    attr_reader :should_clauses, :must_not_clauses, :must_clauses
+    attr_reader :should_clauses, :must_not_clauses, :must_clauses, :filter_clauses
 
     def initialize(clauses)
       grouped = clauses.chunk(&:operator).to_h
       @should_clauses = grouped.fetch(:should, [])
       @must_not_clauses = grouped.fetch(:must_not, [])
       @must_clauses = grouped.fetch(:must, [])
+      @filter_clauses = grouped.fetch(:filter, [])
     end
 
     def apply(search)
       should_clauses.each { |clause| search = search.query.should(clause_to_query(clause)) }
       must_clauses.each { |clause| search = search.query.must(clause_to_query(clause)) }
       must_not_clauses.each { |clause| search = search.query.must_not(clause_to_query(clause)) }
+      filter_clauses.each { |clause| search = search.filter(**clause_to_filter(clause)) }
       search.query.minimum_should_match(1)
     end
 
@@ -30,6 +32,15 @@ class SearchQueryTransformer < Parslet::Transform
         raise "Unexpected clause type: #{clause}"
       end
     end
+
+    def clause_to_filter(clause)
+      case clause
+      when PrefixClause
+        { term: { clause.filter => clause.term } }
+      else
+        raise "Unexpected clause type: #{clause}"
+      end
+    end
   end
 
   class Operator
@@ -69,11 +80,33 @@ class SearchQueryTransformer < Parslet::Transform
     end
   end
 
+  class PrefixClause
+    attr_reader :filter, :operator, :term
+
+    def initialize(prefix, term)
+      @operator = :filter
+      case prefix
+      when 'from'
+        @filter = :account_id
+
+        username, domain = term.gsub(/\A@/, '').split('@')
+        domain           = nil if TagManager.instance.local_domain?(domain)
+        account          = Account.find_remote!(username, domain)
+
+        @term = account.id
+      else
+        raise Mastodon::SyntaxError
+      end
+    end
+  end
+
   rule(clause: subtree(:clause)) do
     prefix   = clause[:prefix][:term].to_s if clause[:prefix]
     operator = clause[:operator]&.to_s
 
-    if clause[:term]
+    if clause[:prefix]
+      PrefixClause.new(prefix, clause[:term].to_s)
+    elsif clause[:term]
       TermClause.new(prefix, operator, clause[:term].to_s)
     elsif clause[:shortcode]
       TermClause.new(prefix, operator, ":#{clause[:term]}:")
diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
deleted file mode 100644
index ab555b1be..000000000
--- a/app/lib/sidekiq_error_handler.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class SidekiqErrorHandler
-  BACKTRACE_LIMIT = 3
-
-  def call(*)
-    yield
-  rescue Mastodon::HostValidationError
-    # Do not retry
-  rescue => e
-    limit_backtrace_and_raise(e)
-  ensure
-    socket = Thread.current[:statsd_socket]
-    socket&.close
-    Thread.current[:statsd_socket] = nil
-  end
-
-  private
-
-  # rubocop:disable Naming/MethodParameterName
-  def limit_backtrace_and_raise(e)
-    e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
-    raise e
-  end
-  # rubocop:enable Naming/MethodParameterName
-end
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
new file mode 100644
index 000000000..a84d25694
--- /dev/null
+++ b/app/lib/status_cache_hydrator.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+class StatusCacheHydrator
+  def initialize(status)
+    @status = status
+  end
+
+  def hydrate(account_id)
+    # The cache of the serialized hash is generated by the fan-out-on-write service
+    payload = Rails.cache.fetch("fan-out/#{@status.id}") { InlineRenderer.render(@status, nil, :status) }
+
+    # If we're delivering to the author who disabled the display of the application used to create the
+    # status, we need to hydrate the application, since it was not rendered for the basic payload
+    payload[:application] = @status.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:application].nil? && @status.account_id == account_id
+
+    # We take advantage of the fact that some relationships can only occur with an original status, not
+    # the reblog that wraps it, so we can assume that some values are always false
+    if payload[:reblog]
+      payload[:muted]      = false
+      payload[:bookmarked] = false
+      payload[:pinned]     = false if @status.account_id == account_id
+      payload[:filtered]   = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status.reblog).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json }
+
+      # If the reblogged status is being delivered to the author who disabled the display of the application
+      # used to create the status, we need to hydrate it here too
+      payload[:reblog][:application] = @status.reblog.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.reblog.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
+
+      payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
+      payload[:reblog][:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
+      payload[:reblog][:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.reblog.conversation_id).exists?
+      payload[:reblog][:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
+      payload[:reblog][:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.reblog_of_id).exists? if @status.reblog.account_id == account_id
+      payload[:reblog][:filtered]   = payload[:filtered]
+
+      if payload[:reblog][:poll]
+        if @status.reblog.account_id == account_id
+          payload[:reblog][:poll][:voted] = true
+          payload[:reblog][:poll][:own_votes] = []
+        else
+          own_votes = PollVote.where(poll_id: @status.reblog.poll_id, account_id: account_id).pluck(:choice)
+          payload[:reblog][:poll][:voted] = !own_votes.empty?
+          payload[:reblog][:poll][:own_votes] = own_votes
+        end
+      end
+
+      payload[:favourited] = payload[:reblog][:favourited]
+      payload[:reblogged]  = payload[:reblog][:reblogged]
+    else
+      payload[:favourited] = Favourite.where(account_id: account_id, status_id: @status.id).exists?
+      payload[:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.id).exists?
+      payload[:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
+      payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
+      payload[:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
+      payload[:filtered]   = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json }
+
+      if payload[:poll]
+        payload[:poll][:voted] = @status.account_id == account_id
+        payload[:poll][:own_votes] = []
+      end
+    end
+
+    payload
+  end
+end
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index 735d66a4f..36fb0e80f 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 class StatusReachFinder
-  def initialize(status)
-    @status = status
+  # @param [Status] status
+  # @param [Hash] options
+  # @option options [Boolean] :unsafe
+  def initialize(status, options = {})
+    @status  = status
+    @options = options
   end
 
   def inboxes
@@ -38,7 +42,7 @@ class StatusReachFinder
   end
 
   def replied_to_account_id
-    @status.in_reply_to_account_id
+    @status.in_reply_to_account_id if distributable?
   end
 
   def reblog_of_account_id
@@ -49,21 +53,26 @@ class StatusReachFinder
     @status.mentions.pluck(:account_id)
   end
 
+  # Beware: Reblogs can be created without the author having had access to the status
   def reblogs_account_ids
-    @status.reblogs.pluck(:account_id)
+    @status.reblogs.rewhere(deleted_at: [nil, @status.deleted_at]).pluck(:account_id) if distributable? || unsafe?
   end
 
+  # Beware: Favourites can be created without the author having had access to the status
   def favourites_account_ids
-    @status.favourites.pluck(:account_id)
+    @status.favourites.pluck(:account_id) if distributable? || unsafe?
   end
 
+  # Beware: Replies can be created without the author having had access to the status
   def replies_account_ids
-    @status.replies.pluck(:account_id)
+    @status.replies.pluck(:account_id) if distributable? || unsafe?
   end
 
   def followers_inboxes
-    if @status.in_reply_to_local_account? && @status.distributable?
-      @status.account.followers.or(@status.thread.account.followers).inboxes
+    if @status.in_reply_to_local_account? && distributable?
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).inboxes
+    elsif @status.direct_visibility? || @status.limited_visibility?
+      []
     else
       @status.account.followers.inboxes
     end
@@ -76,4 +85,12 @@ class StatusReachFinder
       []
     end
   end
+
+  def distributable?
+    @status.public_visibility? || @status.unlisted_visibility?
+  end
+
+  def unsafe?
+    @options[:unsafe]
+  end
 end
diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
new file mode 100644
index 000000000..1af5188c6
--- /dev/null
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class SuspiciousSignInDetector
+  IPV6_TOLERANCE_MASK = 64
+  IPV4_TOLERANCE_MASK = 16
+
+  def initialize(user)
+    @user = user
+  end
+
+  def suspicious?(request)
+    !sufficient_security_measures? && !freshly_signed_up? && !previously_seen_ip?(request)
+  end
+
+  private
+
+  def sufficient_security_measures?
+    @user.otp_required_for_login?
+  end
+
+  def previously_seen_ip?(request)
+    @user.ips.where('ip <<= ?', masked_ip(request)).exists?
+  end
+
+  def freshly_signed_up?
+    @user.current_sign_in_at.blank?
+  end
+
+  def masked_ip(request)
+    masked_ip_addr = begin
+      ip_addr = IPAddr.new(request.remote_ip)
+
+      if ip_addr.ipv6?
+        ip_addr.mask(IPV6_TOLERANCE_MASK)
+      else
+        ip_addr.mask(IPV4_TOLERANCE_MASK)
+      end
+    end
+
+    "#{masked_ip_addr}/#{masked_ip_addr.prefix}"
+  end
+end
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
index 39a98c3eb..a1d12a654 100644
--- a/app/lib/tag_manager.rb
+++ b/app/lib/tag_manager.rb
@@ -24,8 +24,11 @@ class TagManager
 
   def local_url?(url)
     uri    = Addressable::URI.parse(url).normalize
+    return false unless uri.host
     domain = uri.host + (uri.port ? ":#{uri.port}" : '')
 
     TagManager.instance.web_domain?(domain)
+  rescue Addressable::URI::InvalidURIError
+    false
   end
 end
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
new file mode 100644
index 000000000..48e2fc233
--- /dev/null
+++ b/app/lib/text_formatter.rb
@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+class TextFormatter
+  include ActionView::Helpers::TextHelper
+  include ERB::Util
+  include RoutingHelper
+
+  URL_PREFIX_REGEX = /\A(https?:\/\/(www\.)?|xmpp:)/.freeze
+
+  DEFAULT_REL = %w(nofollow noopener noreferrer).freeze
+
+  DEFAULT_OPTIONS = {
+    multiline: true,
+  }.freeze
+
+  attr_reader :text, :options
+
+  # @param [String] text
+  # @param [Hash] options
+  # @option options [Boolean] :multiline
+  # @option options [Boolean] :with_domains
+  # @option options [Boolean] :with_rel_me
+  # @option options [Array<Account>] :preloaded_accounts
+  def initialize(text, options = {})
+    @text    = text
+    @options = DEFAULT_OPTIONS.merge(options)
+  end
+
+  def entities
+    @entities ||= Extractor.extract_entities_with_indices(text, extract_url_without_protocol: false)
+  end
+
+  def to_s
+    return ''.html_safe if text.blank?
+
+    html = rewrite do |entity|
+      if entity[:url]
+        link_to_url(entity)
+      elsif entity[:hashtag]
+        link_to_hashtag(entity)
+      elsif entity[:screen_name]
+        link_to_mention(entity)
+      end
+    end
+
+    html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+
+    html.html_safe # rubocop:disable Rails/OutputSafety
+  end
+
+  private
+
+  def rewrite
+    entities.sort_by! do |entity|
+      entity[:indices].first
+    end
+
+    result = ''.dup
+
+    last_index = entities.reduce(0) do |index, entity|
+      indices = entity[:indices]
+      result << h(text[index...indices.first])
+      result << yield(entity)
+      indices.last
+    end
+
+    result << h(text[last_index..-1])
+
+    result
+  end
+
+  def link_to_url(entity)
+    url = Addressable::URI.parse(entity[:url]).to_s
+    rel = with_rel_me? ? (DEFAULT_REL + %w(me)) : DEFAULT_REL
+
+    prefix      = url.match(URL_PREFIX_REGEX).to_s
+    display_url = url[prefix.length, 30]
+    suffix      = url[prefix.length + 30..-1]
+    cutoff      = url[prefix.length..-1].length > 30
+
+    <<~HTML.squish
+      <a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a>
+    HTML
+  rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
+    h(entity[:url])
+  end
+
+  def link_to_hashtag(entity)
+    hashtag = entity[:hashtag]
+    url     = tag_url(hashtag)
+
+    <<~HTML.squish
+      <a href="#{h(url)}" class="mention hashtag" rel="tag">#<span>#{h(hashtag)}</span></a>
+    HTML
+  end
+
+  def link_to_mention(entity)
+    username, domain = entity[:screen_name].split('@')
+    domain           = nil if local_domain?(domain)
+    account          = nil
+
+    if preloaded_accounts?
+      same_username_hits = 0
+
+      preloaded_accounts.each do |other_account|
+        same_username = other_account.username.casecmp(username).zero?
+        same_domain   = other_account.domain.nil? ? domain.nil? : other_account.domain.casecmp(domain)&.zero?
+
+        if same_username && !same_domain
+          same_username_hits += 1
+        elsif same_username && same_domain
+          account = other_account
+        end
+      end
+    else
+      account = entity_cache.mention(username, domain)
+    end
+
+    return "@#{h(entity[:screen_name])}" if account.nil?
+
+    url = ActivityPub::TagManager.instance.url_for(account)
+    display_username = same_username_hits&.positive? || with_domains? ? account.pretty_acct : account.username
+
+    <<~HTML.squish
+      <span class="h-card"><a href="#{h(url)}" class="u-url mention">@<span>#{h(display_username)}</span></a></span>
+    HTML
+  end
+
+  def entity_cache
+    @entity_cache ||= EntityCache.instance
+  end
+
+  def tag_manager
+    @tag_manager ||= TagManager.instance
+  end
+
+  delegate :local_domain?, to: :tag_manager
+
+  def multiline?
+    options[:multiline]
+  end
+
+  def with_domains?
+    options[:with_domains]
+  end
+
+  def with_rel_me?
+    options[:with_rel_me]
+  end
+
+  def preloaded_accounts
+    options[:preloaded_accounts]
+  end
+
+  def preloaded_accounts?
+    preloaded_accounts.present?
+  end
+end
diff --git a/app/lib/translation_service.rb b/app/lib/translation_service.rb
new file mode 100644
index 000000000..285f30939
--- /dev/null
+++ b/app/lib/translation_service.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class TranslationService
+  class Error < StandardError; end
+  class NotConfiguredError < Error; end
+  class TooManyRequestsError < Error; end
+  class QuotaExceededError < Error; end
+  class UnexpectedResponseError < Error; end
+
+  def self.configured
+    if ENV['DEEPL_API_KEY'].present?
+      TranslationService::DeepL.new(ENV.fetch('DEEPL_PLAN', 'free'), ENV['DEEPL_API_KEY'])
+    elsif ENV['LIBRE_TRANSLATE_ENDPOINT'].present?
+      TranslationService::LibreTranslate.new(ENV['LIBRE_TRANSLATE_ENDPOINT'], ENV['LIBRE_TRANSLATE_API_KEY'])
+    else
+      raise NotConfiguredError
+    end
+  end
+
+  def self.configured?
+    ENV['DEEPL_API_KEY'].present? || ENV['LIBRE_TRANSLATE_ENDPOINT'].present?
+  end
+
+  def translate(_text, _source_language, _target_language)
+    raise NotImplementedError
+  end
+end
diff --git a/app/lib/translation_service/deepl.rb b/app/lib/translation_service/deepl.rb
new file mode 100644
index 000000000..537fd24c0
--- /dev/null
+++ b/app/lib/translation_service/deepl.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class TranslationService::DeepL < TranslationService
+  include JsonLdHelper
+
+  def initialize(plan, api_key)
+    super()
+
+    @plan    = plan
+    @api_key = api_key
+  end
+
+  def translate(text, source_language, target_language)
+    request(text, source_language, target_language).perform do |res|
+      case res.code
+      when 429
+        raise TooManyRequestsError
+      when 456
+        raise QuotaExceededError
+      when 200...300
+        transform_response(res.body_with_limit)
+      else
+        raise UnexpectedResponseError
+      end
+    end
+  end
+
+  private
+
+  def request(text, source_language, target_language)
+    req = Request.new(:post, endpoint_url, form: { text: text, source_lang: source_language&.upcase, target_lang: target_language, tag_handling: 'html' })
+    req.add_headers('Authorization': "DeepL-Auth-Key #{@api_key}")
+    req
+  end
+
+  def endpoint_url
+    if @plan == 'free'
+      'https://api-free.deepl.com/v2/translate'
+    else
+      'https://api.deepl.com/v2/translate'
+    end
+  end
+
+  def transform_response(str)
+    json = Oj.load(str, mode: :strict)
+
+    raise UnexpectedResponseError unless json.is_a?(Hash)
+
+    Translation.new(text: json.dig('translations', 0, 'text'), detected_source_language: json.dig('translations', 0, 'detected_source_language')&.downcase, provider: 'DeepL.com')
+  rescue Oj::ParseError
+    raise UnexpectedResponseError
+  end
+end
diff --git a/app/lib/translation_service/libre_translate.rb b/app/lib/translation_service/libre_translate.rb
new file mode 100644
index 000000000..4ebe21e45
--- /dev/null
+++ b/app/lib/translation_service/libre_translate.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class TranslationService::LibreTranslate < TranslationService
+  def initialize(base_url, api_key)
+    super()
+
+    @base_url = base_url
+    @api_key  = api_key
+  end
+
+  def translate(text, source_language, target_language)
+    request(text, source_language, target_language).perform do |res|
+      case res.code
+      when 429
+        raise TooManyRequestsError
+      when 403
+        raise QuotaExceededError
+      when 200...300
+        transform_response(res.body_with_limit, source_language)
+      else
+        raise UnexpectedResponseError
+      end
+    end
+  end
+
+  private
+
+  def request(text, source_language, target_language)
+    body = Oj.dump(q: text, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
+    req = Request.new(:post, "#{@base_url}/translate", body: body, allow_local: true)
+    req.add_headers('Content-Type': 'application/json')
+    req
+  end
+
+  def transform_response(str, source_language)
+    json = Oj.load(str, mode: :strict)
+
+    raise UnexpectedResponseError unless json.is_a?(Hash)
+
+    Translation.new(text: json['translatedText'], detected_source_language: source_language, provider: 'LibreTranslate')
+  rescue Oj::ParseError
+    raise UnexpectedResponseError
+  end
+end
diff --git a/app/lib/translation_service/translation.rb b/app/lib/translation_service/translation.rb
new file mode 100644
index 000000000..19318c7e9
--- /dev/null
+++ b/app/lib/translation_service/translation.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class TranslationService::Translation < ActiveModelSerializers::Model
+  attributes :text, :detected_source_language, :provider
+end
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index e37bc6d9f..5fb7655a9 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -31,7 +31,6 @@ class UserSettingsDecorator
     user.settings['system_font_ui']      = system_font_ui_preference if change?('setting_system_font_ui')
     user.settings['noindex']             = noindex_preference if change?('setting_noindex')
     user.settings['theme']               = theme_preference if change?('setting_theme')
-    user.settings['hide_network']        = hide_network_preference if change?('setting_hide_network')
     user.settings['aggregate_reblogs']   = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
     user.settings['show_application']    = show_application_preference if change?('setting_show_application')
     user.settings['advanced_layout']     = advanced_layout_preference if change?('setting_advanced_layout')
@@ -39,6 +38,7 @@ class UserSettingsDecorator
     user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
     user.settings['trends']              = trends_preference if change?('setting_trends')
     user.settings['crop_images']         = crop_images_preference if change?('setting_crop_images')
+    user.settings['always_send_emails']  = always_send_emails_preference if change?('setting_always_send_emails')
   end
 
   def merged_notification_emails
@@ -97,10 +97,6 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_noindex'
   end
 
-  def hide_network_preference
-    boolean_cast_setting 'setting_hide_network'
-  end
-
   def show_application_preference
     boolean_cast_setting 'setting_show_application'
   end
@@ -137,6 +133,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_crop_images'
   end
 
+  def always_send_emails_preference
+    boolean_cast_setting 'setting_always_send_emails'
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/lib/vacuum.rb b/app/lib/vacuum.rb
new file mode 100644
index 000000000..9db1ec90b
--- /dev/null
+++ b/app/lib/vacuum.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+module Vacuum; end
diff --git a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb b/app/lib/vacuum/access_tokens_vacuum.rb
similarity index 56%
rename from app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
rename to app/lib/vacuum/access_tokens_vacuum.rb
index 9303a352f..4f3878027 100644
--- a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
+++ b/app/lib/vacuum/access_tokens_vacuum.rb
@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
-class Scheduler::DoorkeeperCleanupScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options retry: 0
-
+class Vacuum::AccessTokensVacuum
   def perform
+    vacuum_revoked_access_tokens!
+    vacuum_revoked_access_grants!
+  end
+
+  private
+
+  def vacuum_revoked_access_tokens!
     Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
+  end
+
+  def vacuum_revoked_access_grants!
     Doorkeeper::AccessGrant.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
-    SystemKey.expired.delete_all
   end
 end
diff --git a/app/lib/vacuum/backups_vacuum.rb b/app/lib/vacuum/backups_vacuum.rb
new file mode 100644
index 000000000..3b83072f3
--- /dev/null
+++ b/app/lib/vacuum/backups_vacuum.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Vacuum::BackupsVacuum
+  def initialize(retention_period)
+    @retention_period = retention_period
+  end
+
+  def perform
+    vacuum_expired_backups! if retention_period?
+  end
+
+  private
+
+  def vacuum_expired_backups!
+    backups_past_retention_period.in_batches.destroy_all
+  end
+
+  def backups_past_retention_period
+    Backup.unscoped.where(Backup.arel_table[:created_at].lt(@retention_period.ago))
+  end
+
+  def retention_period?
+    @retention_period.present?
+  end
+end
diff --git a/app/lib/vacuum/feeds_vacuum.rb b/app/lib/vacuum/feeds_vacuum.rb
new file mode 100644
index 000000000..f46bcf75f
--- /dev/null
+++ b/app/lib/vacuum/feeds_vacuum.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Vacuum::FeedsVacuum
+  def perform
+    vacuum_inactive_home_feeds!
+    vacuum_inactive_list_feeds!
+  end
+
+  private
+
+  def vacuum_inactive_home_feeds!
+    inactive_users.select(:id, :account_id).find_in_batches do |users|
+      feed_manager.clean_feeds!(:home, users.map(&:account_id))
+    end
+  end
+
+  def vacuum_inactive_list_feeds!
+    inactive_users_lists.select(:id).find_in_batches do |lists|
+      feed_manager.clean_feeds!(:list, lists.map(&:id))
+    end
+  end
+
+  def inactive_users
+    User.confirmed.inactive
+  end
+
+  def inactive_users_lists
+    List.where(account_id: inactive_users.select(:account_id))
+  end
+
+  def feed_manager
+    FeedManager.instance
+  end
+end
diff --git a/app/lib/vacuum/media_attachments_vacuum.rb b/app/lib/vacuum/media_attachments_vacuum.rb
new file mode 100644
index 000000000..7c0a85a9d
--- /dev/null
+++ b/app/lib/vacuum/media_attachments_vacuum.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class Vacuum::MediaAttachmentsVacuum
+  TTL = 1.day.freeze
+
+  def initialize(retention_period)
+    @retention_period = retention_period
+  end
+
+  def perform
+    vacuum_orphaned_records!
+    vacuum_cached_files! if retention_period?
+  end
+
+  private
+
+  def vacuum_cached_files!
+    media_attachments_past_retention_period.find_each do |media_attachment|
+      media_attachment.file.destroy
+      media_attachment.thumbnail.destroy
+      media_attachment.save
+    end
+  end
+
+  def vacuum_orphaned_records!
+    orphaned_media_attachments.in_batches.destroy_all
+  end
+
+  def media_attachments_past_retention_period
+    MediaAttachment.unscoped.remote.cached.where(MediaAttachment.arel_table[:created_at].lt(@retention_period.ago)).where(MediaAttachment.arel_table[:updated_at].lt(@retention_period.ago))
+  end
+
+  def orphaned_media_attachments
+    MediaAttachment.unscoped.unattached.where(MediaAttachment.arel_table[:created_at].lt(TTL.ago))
+  end
+
+  def retention_period?
+    @retention_period.present?
+  end
+end
diff --git a/app/lib/vacuum/preview_cards_vacuum.rb b/app/lib/vacuum/preview_cards_vacuum.rb
new file mode 100644
index 000000000..14fdeda1c
--- /dev/null
+++ b/app/lib/vacuum/preview_cards_vacuum.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Vacuum::PreviewCardsVacuum
+  TTL = 1.day.freeze
+
+  def initialize(retention_period)
+    @retention_period = retention_period
+  end
+
+  def perform
+    vacuum_cached_images! if retention_period?
+  end
+
+  private
+
+  def vacuum_cached_images!
+    preview_cards_past_retention_period.find_each do |preview_card|
+      preview_card.image.destroy
+      preview_card.save
+    end
+  end
+
+  def preview_cards_past_retention_period
+    PreviewCard.cached.where(PreviewCard.arel_table[:updated_at].lt(@retention_period.ago))
+  end
+
+  def retention_period?
+    @retention_period.present?
+  end
+end
diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb
new file mode 100644
index 000000000..d1c4e7197
--- /dev/null
+++ b/app/lib/vacuum/statuses_vacuum.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Vacuum::StatusesVacuum
+  include Redisable
+
+  def initialize(retention_period)
+    @retention_period = retention_period
+  end
+
+  def perform
+    vacuum_statuses! if @retention_period.present?
+  end
+
+  private
+
+  def vacuum_statuses!
+    statuses_scope.in_batches do |statuses|
+      # Side-effects not covered by foreign keys, such
+      # as the search index, must be handled first.
+      statuses.direct_visibility
+              .includes(mentions: :account)
+              .find_each do |status|
+        # TODO: replace temporary solution - call of private model method
+        status.send(:unlink_from_conversations)
+      end
+      remove_from_search_index(statuses.ids) if Chewy.enabled?
+
+      # Foreign keys take care of most associated records for us.
+      # Media attachments will be orphaned.
+      statuses.delete_all
+    end
+  end
+
+  def statuses_scope
+    Status.unscoped.kept
+          .joins(:account).merge(Account.remote)
+          .where('statuses.id < ?', retention_period_as_id)
+  end
+
+  def retention_period_as_id
+    Mastodon::Snowflake.id_at(@retention_period.ago, with_random: false)
+  end
+
+  def remove_from_search_index(status_ids)
+    with_redis { |redis| redis.sadd('chewy:queue:StatusesIndex', status_ids) }
+  end
+end
diff --git a/app/lib/vacuum/system_keys_vacuum.rb b/app/lib/vacuum/system_keys_vacuum.rb
new file mode 100644
index 000000000..ceee2fd16
--- /dev/null
+++ b/app/lib/vacuum/system_keys_vacuum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Vacuum::SystemKeysVacuum
+  def perform
+    vacuum_expired_system_keys!
+  end
+
+  private
+
+  def vacuum_expired_system_keys!
+    SystemKey.expired.delete_all
+  end
+end
diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index 03e40f923..2896620cb 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -2,7 +2,7 @@
 
 class VideoMetadataExtractor
   attr_reader :duration, :bitrate, :video_codec, :audio_codec,
-              :colorspace, :width, :height, :frame_rate
+              :colorspace, :width, :height, :frame_rate, :r_frame_rate
 
   def initialize(path)
     @path     = path
@@ -42,6 +42,7 @@ class VideoMetadataExtractor
         @width       = video_stream[:width]
         @height      = video_stream[:height]
         @frame_rate  = video_stream[:avg_frame_rate] == '0/0' ? nil : Rational(video_stream[:avg_frame_rate])
+        @r_frame_rate = video_stream[:r_frame_rate] == '0/0' ? nil : Rational(video_stream[:r_frame_rate])
       end
 
       if (audio_stream = audio_streams.first)
diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index 1ffb5b4bf..7c0c10c33 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -3,11 +3,16 @@
 class Webfinger
   class Error < StandardError; end
   class GoneError < Error; end
-  class RedirectError < StandardError; end
+  class RedirectError < Error; end
 
   class Response
-    def initialize(body)
+    attr_reader :uri
+
+    def initialize(uri, body)
+      @uri  = uri
       @json = Oj.load(body, mode: :strict)
+
+      validate_response!
     end
 
     def subject
@@ -23,6 +28,10 @@ class Webfinger
     def links
       @links ||= @json['links'].index_by { |link| link['rel'] }
     end
+
+    def validate_response!
+      raise Webfinger::Error, "Missing subject in response for #{@uri}" if subject.blank?
+    end
   end
 
   def initialize(uri)
@@ -34,7 +43,7 @@ class Webfinger
   end
 
   def perform
-    Response.new(body_from_webfinger)
+    Response.new(@uri, body_from_webfinger)
   rescue Oj::ParseError
     raise Webfinger::Error, "Invalid JSON in response for #{@uri}"
   rescue Addressable::URI::InvalidURIError
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index b23bd1296..bc6d87ae6 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -4,6 +4,7 @@ class AdminMailer < ApplicationMailer
   layout 'plain_mailer'
 
   helper :accounts
+  helper :languages
 
   def new_report(recipient, report)
     @report   = report
@@ -15,6 +16,16 @@ class AdminMailer < ApplicationMailer
     end
   end
 
+  def new_appeal(recipient, appeal)
+    @appeal   = appeal
+    @me       = recipient
+    @instance = Rails.configuration.x.local_domain
+
+    locale_for_account(@me) do
+      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_appeal.subject', instance: @instance, username: @appeal.account.username)
+    end
+  end
+
   def new_pending_account(recipient, user)
     @account  = user.account
     @me       = recipient
@@ -25,25 +36,15 @@ class AdminMailer < ApplicationMailer
     end
   end
 
-  def new_trending_tags(recipient, tags)
-    @tags                = tags
-    @me                  = recipient
-    @instance            = Rails.configuration.x.local_domain
-    @lowest_trending_tag = Trends.tags.get(true, Trends.tags.options[:review_threshold]).last
+  def new_trends(recipient, links, tags, statuses)
+    @links                  = links
+    @tags                   = tags
+    @statuses               = statuses
+    @me                     = recipient
+    @instance               = Rails.configuration.x.local_domain
 
     locale_for_account(@me) do
-      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trending_tags.subject', instance: @instance)
-    end
-  end
-
-  def new_trending_links(recipient, links)
-    @links                = links
-    @me                   = recipient
-    @instance             = Rails.configuration.x.local_domain
-    @lowest_trending_link = Trends.links.get(true, Trends.links.options[:review_threshold]).last
-
-    locale_for_account(@me) do
-      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trending_links.subject', instance: @instance)
+      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trends.subject', instance: @instance)
     end
   end
 end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index cc585c3b7..a37682eca 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -5,6 +5,7 @@ class ApplicationMailer < ActionMailer::Base
 
   helper :application
   helper :instance
+  helper :formatting
 
   protected
 
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 9e683b6a1..ab73826ab 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -66,24 +66,6 @@ class NotificationMailer < ApplicationMailer
     end
   end
 
-  def digest(recipient, **opts)
-    return unless recipient.user.functional?
-
-    @me                  = recipient
-    @since               = opts[:since] || [@me.user.last_emailed_at, (@me.user.current_sign_in_at + 1.day)].compact.max
-    @notifications_count = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since).count
-
-    return if @notifications_count.zero?
-
-    @notifications = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since).limit(40)
-    @follows_since = Notification.where(account: @me, activity_type: 'Follow').where('created_at > ?', @since).count
-
-    locale_for_account(@me) do
-      mail to: @me.user.email,
-           subject: I18n.t(:subject, scope: [:notification_mailer, :digest], count: @notifications_count)
-    end
-  end
-
   private
 
   def thread_by_conversation(conversation)
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 68d1c4507..2889d13b5 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -7,108 +7,109 @@ class UserMailer < Devise::Mailer
   helper :application
   helper :instance
   helper :statuses
+  helper :formatting
 
   helper RoutingHelper
 
-  def confirmation_instructions(user, token, **)
+  def confirmation_instructions(user, token, *, **)
     @resource = user
     @token    = token
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.unconfirmed_email.presence || @resource.email,
            subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance),
            template_name: @resource.pending_reconfirmation? ? 'reconfirmation_instructions' : 'confirmation_instructions'
     end
   end
 
-  def reset_password_instructions(user, token, **)
+  def reset_password_instructions(user, token, *, **)
     @resource = user
     @token    = token
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
     end
   end
 
-  def password_change(user, **)
+  def password_change(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
     end
   end
 
-  def email_changed(user, **)
+  def email_changed(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
     end
   end
 
-  def two_factor_enabled(user, **)
+  def two_factor_enabled(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_enabled.subject')
     end
   end
 
-  def two_factor_disabled(user, **)
+  def two_factor_disabled(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_disabled.subject')
     end
   end
 
-  def two_factor_recovery_codes_changed(user, **)
+  def two_factor_recovery_codes_changed(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
     end
   end
 
-  def webauthn_enabled(user, **)
+  def webauthn_enabled(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_enabled.subject')
     end
   end
 
-  def webauthn_disabled(user, **)
+  def webauthn_disabled(user, *, **)
     @resource = user
     @instance = Rails.configuration.x.local_domain
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_disabled.subject')
     end
   end
@@ -120,7 +121,7 @@ class UserMailer < Devise::Mailer
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
     end
   end
@@ -132,7 +133,7 @@ class UserMailer < Devise::Mailer
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
     end
   end
@@ -143,7 +144,7 @@ class UserMailer < Devise::Mailer
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
     end
   end
@@ -155,25 +156,43 @@ class UserMailer < Devise::Mailer
 
     return unless @resource.active_for_authentication?
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
+    I18n.with_locale(locale) do
       mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
     end
   end
 
-  def warning(user, warning, status_ids = nil)
+  def warning(user, warning)
     @resource = user
     @warning  = warning
     @instance = Rails.configuration.x.local_domain
-    @statuses = Status.where(id: status_ids).includes(:account) if status_ids.is_a?(Array)
+    @statuses = @warning.statuses.includes(:account, :preloadable_poll, :media_attachments, active_mentions: [:account])
 
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
-      mail to: @resource.email,
-           subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"),
-           reply_to: Setting.site_contact_email
+    I18n.with_locale(locale) do
+      mail to: @resource.email, subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
     end
   end
 
-  def sign_in_token(user, remote_ip, user_agent, timestamp)
+  def appeal_approved(user, appeal)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+    @appeal   = appeal
+
+    I18n.with_locale(locale) do
+      mail to: @resource.email, subject: I18n.t('user_mailer.appeal_approved.subject', date: l(@appeal.created_at))
+    end
+  end
+
+  def appeal_rejected(user, appeal)
+    @resource = user
+    @instance = Rails.configuration.x.local_domain
+    @appeal   = appeal
+
+    I18n.with_locale(locale) do
+      mail to: @resource.email, subject: I18n.t('user_mailer.appeal_rejected.subject', date: l(@appeal.created_at))
+    end
+  end
+
+  def suspicious_sign_in(user, remote_ip, user_agent, timestamp)
     @resource   = user
     @instance   = Rails.configuration.x.local_domain
     @remote_ip  = remote_ip
@@ -181,12 +200,14 @@ class UserMailer < Devise::Mailer
     @detection  = Browser.new(user_agent)
     @timestamp  = timestamp.to_time.utc
 
-    return unless @resource.active_for_authentication?
-
-    I18n.with_locale(@resource.locale || I18n.default_locale) do
-      mail to: @resource.email,
-           subject: I18n.t('user_mailer.sign_in_token.subject'),
-           reply_to: Setting.site_contact_email
+    I18n.with_locale(locale) do
+      mail to: @resource.email, subject: I18n.t('user_mailer.suspicious_sign_in.subject')
     end
   end
+
+  private
+
+  def locale
+    @resource.locale.presence || I18n.default_locale
+  end
 end
diff --git a/app/models/account.rb b/app/models/account.rb
index 238ea1d65..a7bda15d3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -40,13 +40,15 @@
 #  also_known_as                 :string           is an Array
 #  silenced_at                   :datetime
 #  suspended_at                  :datetime
-#  trust_level                   :integer
 #  hide_collections              :boolean
 #  avatar_storage_schema_version :integer
 #  header_storage_schema_version :integer
 #  devices_url                   :string
 #  suspension_origin             :integer
 #  sensitized_at                 :datetime
+#  trendable                     :boolean
+#  reviewed_at                   :datetime
+#  requested_review_at           :datetime
 #
 
 class Account < ApplicationRecord
@@ -56,11 +58,13 @@ class Account < ApplicationRecord
     remote_url
     salmon_url
     hub_url
+    trust_level
   )
 
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
   MENTION_RE    = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i
   URL_PREFIX_RE = /\Ahttp(s?):\/\/[^\/]+/
+  USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
 
   include Attachmentable
   include AccountAssociations
@@ -74,11 +78,6 @@ class Account < ApplicationRecord
   include DomainMaterializable
   include AccountMerging
 
-  TRUST_LEVELS = {
-    untrusted: 0,
-    trusted: 1,
-  }.freeze
-
   enum protocol: [:ostatus, :activitypub]
   enum suspension_origin: [:local, :remote], _prefix: true
 
@@ -86,11 +85,11 @@ class Account < ApplicationRecord
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
 
   # Remote user validations
-  validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, if: -> { !local? && will_save_change_to_username? }
+  validates :username, format: { with: USERNAME_ONLY_RE }, if: -> { !local? && will_save_change_to_username? }
 
   # Local user validations
   validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
-  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
+  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
   validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
   validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
@@ -111,19 +110,19 @@ class Account < ApplicationRecord
   scope :matches_username, ->(value) { where(arel_table[:username].matches("#{value}%")) }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
-  scope :searchable, -> { without_suspended.where(moved_to_account_id: nil) }
+  scope :without_unapproved, -> { left_outer_joins(:user).remote.or(left_outer_joins(:user).merge(User.approved.confirmed)) }
+  scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).left_outer_joins(:account_stat) }
   scope :followable_by, ->(account) { joins(arel_table.join(Follow.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(Follow.arel_table[:target_account_id]).and(Follow.arel_table[:account_id].eq(account.id))).join_sources).where(Follow.arel_table[:id].eq(nil)).joins(arel_table.join(FollowRequest.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(FollowRequest.arel_table[:target_account_id]).and(FollowRequest.arel_table[:account_id].eq(account.id))).join_sources).where(FollowRequest.arel_table[:id].eq(nil)) }
   scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc, accounts.id desc')) }
   scope :by_recent_sign_in, -> { order(Arel.sql('(case when users.current_sign_in_at is null then 1 else 0 end) asc, users.current_sign_in_at desc, accounts.id desc')) }
   scope :popular, -> { order('account_stats.followers_count desc') }
-  scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
+  scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches("%.#{domain}"))) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
 
   delegate :email,
            :unconfirmed_email,
-           :current_sign_in_ip,
            :current_sign_in_at,
            :created_at,
            :sign_up_ip,
@@ -131,14 +130,12 @@ class Account < ApplicationRecord
            :approved?,
            :pending?,
            :disabled?,
+           :unconfirmed?,
            :unconfirmed_or_pending?,
            :role,
-           :admin?,
-           :moderator?,
-           :staff?,
            :locale,
-           :hides_network?,
            :shows_application?,
+           :prefers_noindex?,
            to: :user,
            prefix: true,
            allow_nil: true
@@ -195,18 +192,10 @@ class Account < ApplicationRecord
     "acct:#{local_username_and_domain}"
   end
 
-  def searchable?
-    !(suspended? || moved?)
-  end
-
   def possibly_stale?
     last_webfingered_at.nil? || last_webfingered_at <= 1.day.ago
   end
 
-  def trust_level
-    self[:trust_level] || 0
-  end
-
   def refresh!
     ResolveAccountService.new.call(acct) unless local?
   end
@@ -267,10 +256,18 @@ class Account < ApplicationRecord
     update!(memorial: true)
   end
 
+  def trendable?
+    boolean_with_default('trendable', Setting.trendable_by_default)
+  end
+
   def sign?
     true
   end
 
+  def previous_strikes_count
+    strikes.where(overruled_at: nil).count
+  end
+
   def keypair
     @keypair ||= OpenSSL::PKey::RSA.new(private_key || public_key)
   end
@@ -299,7 +296,7 @@ class Account < ApplicationRecord
 
   def fields
     (self[:fields] || []).map do |f|
-      Field.new(self, f)
+      Account::Field.new(self, f)
     rescue
       nil
     end.compact
@@ -344,19 +341,25 @@ class Account < ApplicationRecord
 
   def save_with_optional_media!
     save!
-  rescue ActiveRecord::RecordInvalid
-    self.avatar = nil
-    self.header = nil
+  rescue ActiveRecord::RecordInvalid => e
+    errors = e.record.errors.errors
+    errors.each do |err|
+      if err.attribute == :avatar
+        self.avatar = nil
+      elsif err.attribute == :header
+        self.header = nil
+      end
+    end
 
     save!
   end
 
   def hides_followers?
-    hide_collections? || user_hides_network?
+    hide_collections?
   end
 
   def hides_following?
-    hide_collections? || user_hides_network?
+    hide_collections?
   end
 
   def object_type
@@ -367,6 +370,10 @@ class Account < ApplicationRecord
     username
   end
 
+  def to_log_human_identifier
+    acct
+  end
+
   def excluded_from_timeline_account_ids
     Rails.cache.fetch("exclude_account_ids_for:#{id}") { block_relationships.pluck(:target_account_id) + blocked_by_relationships.pluck(:account_id) + mute_relationships.pluck(:target_account_id) }
   end
@@ -385,49 +392,31 @@ class Account < ApplicationRecord
     @synchronization_uri_prefix ||= "#{uri[URL_PREFIX_RE]}/"
   end
 
-  class Field < ActiveModelSerializers::Model
-    attributes :name, :value, :verified_at, :account
+  def requires_review?
+    reviewed_at.nil?
+  end
 
-    def initialize(account, attributes)
-      @original_field = attributes
-      string_limit = account.local? ? 255 : 2047
-      super(
-        account:     account,
-        name:        attributes['name'].strip[0, string_limit],
-        value:       attributes['value'].strip[0, string_limit],
-        verified_at: attributes['verified_at']&.to_datetime,
-      )
-    end
+  def reviewed?
+    reviewed_at.present?
+  end
 
-    def verified?
-      verified_at.present?
-    end
+  def requested_review?
+    requested_review_at.present?
+  end
 
-    def value_for_verification
-      @value_for_verification ||= begin
-        if account.local?
-          value
-        else
-          ActionController::Base.helpers.strip_tags(value)
-        end
-      end
-    end
-
-    def verifiable?
-      value_for_verification.present? && value_for_verification.start_with?('http://', 'https://')
-    end
-
-    def mark_verified!
-      self.verified_at = Time.now.utc
-      @original_field['verified_at'] = verified_at
-    end
-
-    def to_h
-      { name: name, value: value, verified_at: verified_at }
-    end
+  def requires_review_notification?
+    requires_review? && !requested_review?
   end
 
   class << self
+    DISALLOWED_TSQUERY_CHARACTERS = /['?\\:‘’]/.freeze
+    TEXTSEARCH = "(setweight(to_tsvector('simple', accounts.display_name), 'A') || setweight(to_tsvector('simple', accounts.username), 'B') || setweight(to_tsvector('simple', coalesce(accounts.domain, '')), 'C'))"
+
+    REPUTATION_SCORE_FUNCTION = '(greatest(0, coalesce(s.followers_count, 0)) / (greatest(0, coalesce(s.following_count, 0)) + 1.0))'
+    FOLLOWERS_SCORE_FUNCTION  = 'log(greatest(0, coalesce(s.followers_count, 0)) + 2)'
+    TIME_DISTANCE_FUNCTION    = '(case when s.last_status_at is null then 0 else exp(-1.0 * ((greatest(0, abs(extract(DAY FROM age(s.last_status_at))) - 30.0)^2) / (2.0 * ((-1.0 * 30^2) / (2.0 * ln(0.3)))))) end)'
+    BOOST                     = "((#{REPUTATION_SCORE_FUNCTION} + #{FOLLOWERS_SCORE_FUNCTION} + #{TIME_DISTANCE_FUNCTION}) / 3.0)"
+
     def readonly_attributes
       super - %w(statuses_count following_count followers_count)
     end
@@ -437,71 +426,33 @@ class Account < ApplicationRecord
       DeliveryFailureTracker.without_unavailable(urls)
     end
 
-    def search_for(terms, limit = 10, offset = 0)
-      textsearch, query = generate_query_for_search(terms)
+    def search_for(terms, limit: 10, offset: 0)
+      tsquery = generate_query_for_search(terms)
 
       sql = <<-SQL.squish
         SELECT
           accounts.*,
-          ts_rank_cd(#{textsearch}, #{query}, 32) AS rank
+          #{BOOST} * ts_rank_cd(#{TEXTSEARCH}, to_tsquery('simple', :tsquery), 32) AS rank
         FROM accounts
-        WHERE #{query} @@ #{textsearch}
+        LEFT JOIN users ON accounts.id = users.account_id
+        LEFT JOIN account_stats AS s ON accounts.id = s.account_id
+        WHERE to_tsquery('simple', :tsquery) @@ #{TEXTSEARCH}
           AND accounts.suspended_at IS NULL
           AND accounts.moved_to_account_id IS NULL
+          AND (accounts.domain IS NOT NULL OR (users.approved = TRUE AND users.confirmed_at IS NOT NULL))
         ORDER BY rank DESC
-        LIMIT ? OFFSET ?
+        LIMIT :limit OFFSET :offset
       SQL
 
-      records = find_by_sql([sql, limit, offset])
+      records = find_by_sql([sql, limit: limit, offset: offset, tsquery: tsquery])
       ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
       records
     end
 
-    def advanced_search_for(terms, account, limit = 10, following = false, offset = 0)
-      textsearch, query = generate_query_for_search(terms)
-
-      if following
-        sql = <<-SQL.squish
-          WITH first_degree AS (
-            SELECT target_account_id
-            FROM follows
-            WHERE account_id = ?
-            UNION ALL
-            SELECT ?
-          )
-          SELECT
-            accounts.*,
-            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank
-          FROM accounts
-          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?)
-          WHERE accounts.id IN (SELECT * FROM first_degree)
-            AND #{query} @@ #{textsearch}
-            AND accounts.suspended_at IS NULL
-            AND accounts.moved_to_account_id IS NULL
-          GROUP BY accounts.id
-          ORDER BY rank DESC
-          LIMIT ? OFFSET ?
-        SQL
-
-        records = find_by_sql([sql, account.id, account.id, account.id, limit, offset])
-      else
-        sql = <<-SQL.squish
-          SELECT
-            accounts.*,
-            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank
-          FROM accounts
-          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?) OR (accounts.id = f.target_account_id AND f.account_id = ?)
-          WHERE #{query} @@ #{textsearch}
-            AND accounts.suspended_at IS NULL
-            AND accounts.moved_to_account_id IS NULL
-          GROUP BY accounts.id
-          ORDER BY rank DESC
-          LIMIT ? OFFSET ?
-        SQL
-
-        records = find_by_sql([sql, account.id, account.id, limit, offset])
-      end
-
+    def advanced_search_for(terms, account, limit: 10, following: false, offset: 0)
+      tsquery = generate_query_for_search(terms)
+      sql = advanced_search_for_sql_template(following)
+      records = find_by_sql([sql, id: account.id, limit: limit, offset: offset, tsquery: tsquery])
       ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
       records
     end
@@ -523,12 +474,59 @@ class Account < ApplicationRecord
 
     private
 
-    def generate_query_for_search(terms)
-      terms      = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' ')))
-      textsearch = "(setweight(to_tsvector('simple', accounts.display_name), 'A') || setweight(to_tsvector('simple', accounts.username), 'B') || setweight(to_tsvector('simple', coalesce(accounts.domain, '')), 'C'))"
-      query      = "to_tsquery('simple', ''' ' || #{terms} || ' ''' || ':*')"
+    def generate_query_for_search(unsanitized_terms)
+      terms = unsanitized_terms.gsub(DISALLOWED_TSQUERY_CHARACTERS, ' ')
 
-      [textsearch, query]
+      # The final ":*" is for prefix search.
+      # The trailing space does not seem to fit any purpose, but `to_tsquery`
+      # behaves differently with and without a leading space if the terms start
+      # with `./`, `../`, or `.. `. I don't understand why, so, in doubt, keep
+      # the same query.
+      "' #{terms} ':*"
+    end
+
+    def advanced_search_for_sql_template(following)
+      if following
+        <<-SQL.squish
+          WITH first_degree AS (
+            SELECT target_account_id
+            FROM follows
+            WHERE account_id = :id
+            UNION ALL
+            SELECT :id
+          )
+          SELECT
+            accounts.*,
+            (count(f.id) + 1) * #{BOOST} * ts_rank_cd(#{TEXTSEARCH}, to_tsquery('simple', :tsquery), 32) AS rank
+          FROM accounts
+          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = :id)
+          LEFT JOIN account_stats AS s ON accounts.id = s.account_id
+          WHERE accounts.id IN (SELECT * FROM first_degree)
+            AND to_tsquery('simple', :tsquery) @@ #{TEXTSEARCH}
+            AND accounts.suspended_at IS NULL
+            AND accounts.moved_to_account_id IS NULL
+          GROUP BY accounts.id, s.id
+          ORDER BY rank DESC
+          LIMIT :limit OFFSET :offset
+        SQL
+      else
+        <<-SQL.squish
+          SELECT
+            accounts.*,
+            (count(f.id) + 1) * #{BOOST} * ts_rank_cd(#{TEXTSEARCH}, to_tsquery('simple', :tsquery), 32) AS rank
+          FROM accounts
+          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = :id) OR (accounts.id = f.target_account_id AND f.account_id = :id)
+          LEFT JOIN users ON accounts.id = users.account_id
+          LEFT JOIN account_stats AS s ON accounts.id = s.account_id
+          WHERE to_tsquery('simple', :tsquery) @@ #{TEXTSEARCH}
+            AND accounts.suspended_at IS NULL
+            AND accounts.moved_to_account_id IS NULL
+            AND (accounts.domain IS NOT NULL OR (users.approved = TRUE AND users.confirmed_at IS NOT NULL))
+          GROUP BY accounts.id, s.id
+          ORDER BY rank DESC
+          LIMIT :limit OFFSET :offset
+        SQL
+      end
     end
   end
 
@@ -541,6 +539,12 @@ class Account < ApplicationRecord
   before_validation :prepare_username, on: :create
   before_destroy :clean_feed_manager
 
+  def ensure_keys!
+    return unless local? && private_key.blank? && public_key.blank?
+    generate_keys
+    save!
+  end
+
   private
 
   def prepare_contents
diff --git a/app/models/account/field.rb b/app/models/account/field.rb
new file mode 100644
index 000000000..4db4cac30
--- /dev/null
+++ b/app/models/account/field.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+class Account::Field < ActiveModelSerializers::Model
+  MAX_CHARACTERS_LOCAL  = 255
+  MAX_CHARACTERS_COMPAT = 2_047
+  ACCEPTED_SCHEMES      = %w(https).freeze
+
+  attributes :name, :value, :verified_at, :account
+
+  def initialize(account, attributes)
+    # Keeping this as reference allows us to update the field on the account
+    # from methods in this class, so that changes can be saved.
+    @original_field = attributes
+    @account        = account
+
+    super(
+      name:        sanitize(attributes['name']),
+      value:       sanitize(attributes['value']),
+      verified_at: attributes['verified_at']&.to_datetime,
+    )
+  end
+
+  def verified?
+    verified_at.present?
+  end
+
+  def value_for_verification
+    @value_for_verification ||= begin
+      if account.local?
+        value
+      else
+        extract_url_from_html
+      end
+    end
+  end
+
+  def verifiable?
+    return false if value_for_verification.blank?
+
+    # This is slower than checking through a regular expression, but we
+    # need to confirm that it's not an IDN domain.
+
+    parsed_url = Addressable::URI.parse(value_for_verification)
+
+    ACCEPTED_SCHEMES.include?(parsed_url.scheme) &&
+      parsed_url.user.nil? &&
+      parsed_url.password.nil? &&
+      parsed_url.host.present? &&
+      parsed_url.normalized_host == parsed_url.host &&
+      (parsed_url.path.empty? || parsed_url.path == parsed_url.normalized_path)
+  rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
+    false
+  end
+
+  def requires_verification?
+    !verified? && verifiable?
+  end
+
+  def mark_verified!
+    @original_field['verified_at'] = self.verified_at = Time.now.utc
+  end
+
+  def to_h
+    { name: name, value: value, verified_at: verified_at }
+  end
+
+  private
+
+  def sanitize(str)
+    str.strip[0, character_limit]
+  end
+
+  def character_limit
+    account.local? ? MAX_CHARACTERS_LOCAL : MAX_CHARACTERS_COMPAT
+  end
+
+  def extract_url_from_html
+    doc = Nokogiri::HTML(value).at_xpath('//body')
+
+    return if doc.nil?
+    return if doc.children.size > 1
+
+    element = doc.children.first
+
+    return if element.name != 'a' || element['href'] != element.text
+
+    element['href']
+  end
+end
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index 3d659142a..b7267d632 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -28,6 +28,11 @@ class AccountAlias < ApplicationRecord
     super(val.start_with?('@') ? val[1..-1] : val)
   end
 
+  def pretty_acct
+    username, domain = acct.split('@', 2)
+    domain.nil? ? username : "#{username}@#{Addressable::IDNA.to_unicode(domain)}"
+  end
+
   private
 
   def set_uri
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
index 56fd13543..45e74bbeb 100644
--- a/app/models/account_conversation.rb
+++ b/app/models/account_conversation.rb
@@ -14,6 +14,8 @@
 #
 
 class AccountConversation < ApplicationRecord
+  include Redisable
+
   after_commit :push_to_streaming_api
 
   belongs_to :account
@@ -109,7 +111,7 @@ class AccountConversation < ApplicationRecord
   end
 
   def subscribed_to_timeline?
-    Redis.current.exists?("subscribed:#{streaming_channel}")
+    redis.exists?("subscribed:#{streaming_channel}")
   end
 
   def streaming_channel
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index c9000b54c..d27bb46fc 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -4,7 +4,7 @@ class AccountFilter
   KEYS = %i(
     origin
     status
-    permissions
+    role_ids
     username
     by_domain
     display_name
@@ -21,10 +21,12 @@ class AccountFilter
   end
 
   def results
-    scope = Account.includes(:account_stat, user: [:ips, :invite, :invite_request]).without_instance_actor.reorder(nil)
+    scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor.reorder(nil)
 
     params.each do |key, value|
-      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+      next if key.to_s == 'page'
+
+      scope.merge!(scope_for(key, value)) if value.present?
     end
 
     scope
@@ -36,26 +38,26 @@ class AccountFilter
     case key.to_s
     when 'origin'
       origin_scope(value)
-    when 'permissions'
-      permissions_scope(value)
+    when 'role_ids'
+      role_scope(value)
     when 'status'
       status_scope(value)
     when 'by_domain'
-      Account.where(domain: value)
+      Account.where(domain: value.to_s.strip)
     when 'username'
-      Account.matches_username(value)
+      Account.matches_username(value.to_s.strip)
     when 'display_name'
-      Account.matches_display_name(value)
+      Account.matches_display_name(value.to_s.strip)
     when 'email'
-      accounts_with_users.merge(User.matches_email(value))
+      accounts_with_users.merge(User.matches_email(value.to_s.strip))
     when 'ip'
-      valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value)) : Account.none
+      valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value).group('users.id, accounts.id')) : Account.none
     when 'invited_by'
       invited_by_scope(value)
     when 'order'
       order_scope(value)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 
@@ -66,7 +68,7 @@ class AccountFilter
     when 'remote'
       Account.remote
     else
-      raise "Unknown origin: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown origin: #{value}"
     end
   end
 
@@ -78,8 +80,14 @@ class AccountFilter
       accounts_with_users.merge(User.pending)
     when 'suspended'
       Account.suspended
+    when 'disabled'
+      accounts_with_users.merge(User.disabled).without_suspended
+    when 'silenced'
+      Account.silenced
+    when 'sensitized'
+      Account.sensitized
     else
-      raise "Unknown status: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
     end
   end
 
@@ -90,7 +98,7 @@ class AccountFilter
     when 'recent'
       Account.recent
     else
-      raise "Unknown order: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown order: #{value}"
     end
   end
 
@@ -98,13 +106,8 @@ class AccountFilter
     Account.left_joins(user: :invite).merge(Invite.where(user_id: value.to_s))
   end
 
-  def permissions_scope(value)
-    case value.to_s
-    when 'staff'
-      accounts_with_users.merge(User.staff)
-    else
-      raise "Unknown permissions: #{value}"
-    end
+  def role_scope(value)
+    accounts_with_users.merge(User.where(role_id: Array(value).map(&:to_s)))
   end
 
   def accounts_with_users
@@ -112,7 +115,7 @@ class AccountFilter
   end
 
   def valid_ip?(value)
-    IPAddr.new(value) && true
+    IPAddr.new(value.to_s) && true
   rescue IPAddr::InvalidAddressError
     false
   end
diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index ded32c9c6..fa8cb6013 100644
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@@ -15,6 +15,7 @@
 
 class AccountMigration < ApplicationRecord
   include Redisable
+  include Lockable
 
   COOLDOWN_PERIOD = 30.days.freeze
 
@@ -41,12 +42,8 @@ class AccountMigration < ApplicationRecord
 
     return false unless errors.empty?
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        save
-      else
-        raise Mastodon::RaceConditionError
-      end
+    with_lock("account_migration:#{account.id}") do
+      save
     end
   end
 
@@ -61,8 +58,8 @@ class AccountMigration < ApplicationRecord
   private
 
   def set_target_account
-    self.target_account = ResolveAccountService.new.call(acct)
-  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+    self.target_account = ResolveAccountService.new.call(acct, skip_cache: true)
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error, Addressable::URI::InvalidURIError
     # Validation will take care of it
   end
 
@@ -83,8 +80,4 @@ class AccountMigration < ApplicationRecord
   def validate_migration_cooldown
     errors.add(:base, I18n.t('migrations.errors.on_cooldown')) if account.migrations.within_cooldown.exists?
   end
-
-  def lock_options
-    { redis: redis, key: "account_migration:#{account.id}" }
-  end
 end
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb
index b49827267..a5d71a5b8 100644
--- a/app/models/account_stat.rb
+++ b/app/models/account_stat.rb
@@ -20,4 +20,16 @@ class AccountStat < ApplicationRecord
   belongs_to :account, inverse_of: :account_stat
 
   update_index('accounts', :account)
+
+  def following_count
+    [attributes['following_count'], 0].max
+  end
+
+  def followers_count
+    [attributes['followers_count'], 0].max
+  end
+
+  def statuses_count
+    [attributes['statuses_count'], 0].max
+  end
 end
diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb
index 0f78c1a54..49adc6ad0 100644
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -23,6 +23,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
   include Redisable
 
   ALLOWED_MIN_STATUS_AGE = [
+    1.week.seconds,
     2.weeks.seconds,
     1.month.seconds,
     2.months.seconds,
@@ -138,7 +139,12 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
     # Filtering on `id` rather than `min_status_age` ago will treat
     # non-snowflake statuses as older than they really are, but Mastodon
     # has switched to snowflake IDs significantly over 2 years ago anyway.
-    max_id = [max_id, Mastodon::Snowflake.id_at(min_status_age.seconds.ago, with_random: false)].compact.min
+    snowflake_id = Mastodon::Snowflake.id_at(min_status_age.seconds.ago, with_random: false)
+
+    if max_id.nil? || snowflake_id < max_id
+      max_id = snowflake_id
+    end
+
     Status.where(Status.arel_table[:id].lteq(max_id))
   end
 
diff --git a/app/models/account_statuses_filter.rb b/app/models/account_statuses_filter.rb
new file mode 100644
index 000000000..211f41478
--- /dev/null
+++ b/app/models/account_statuses_filter.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+class AccountStatusesFilter
+  KEYS = %i(
+    pinned
+    tagged
+    only_media
+    exclude_replies
+    exclude_reblogs
+  ).freeze
+
+  attr_reader :params, :account, :current_account
+
+  def initialize(account, current_account, params = {})
+    @account         = account
+    @current_account = current_account
+    @params          = params
+  end
+
+  def results
+    scope = initial_scope
+
+    scope.merge!(pinned_scope)     if pinned?
+    scope.merge!(only_media_scope) if only_media?
+    scope.merge!(no_replies_scope) if exclude_replies?
+    scope.merge!(no_reblogs_scope) if exclude_reblogs?
+    scope.merge!(hashtag_scope)    if tagged?
+
+    scope
+  end
+
+  private
+
+  def initial_scope
+    if suspended?
+      Status.none
+    elsif anonymous?
+      account.statuses.where(visibility: %i(public unlisted))
+    elsif author?
+      account.statuses.all # NOTE: #merge! does not work without the #all
+    elsif blocked?
+      Status.none
+    else
+      filtered_scope
+    end
+  end
+
+  def filtered_scope
+    scope = account.statuses.left_outer_joins(:mentions)
+
+    scope.merge!(scope.where(visibility: follower? ? %i(public unlisted private) : %i(public unlisted)).or(scope.where(mentions: { account_id: current_account.id })).group(Status.arel_table[:id]))
+    scope.merge!(filtered_reblogs_scope) if reblogs_may_occur?
+
+    scope
+  end
+
+  def filtered_reblogs_scope
+    Status.left_outer_joins(:reblog).where(reblog_of_id: nil).or(Status.where.not(reblogs_statuses: { account_id: current_account.excluded_from_timeline_account_ids }))
+  end
+
+  def only_media_scope
+    Status.joins(:media_attachments).merge(account.media_attachments.reorder(nil)).group(Status.arel_table[:id])
+  end
+
+  def no_replies_scope
+    Status.without_replies
+  end
+
+  def no_reblogs_scope
+    Status.without_reblogs
+  end
+
+  def pinned_scope
+    account.pinned_statuses.group(Status.arel_table[:id], StatusPin.arel_table[:created_at])
+  end
+
+  def hashtag_scope
+    tag = Tag.find_normalized(params[:tagged])
+
+    if tag
+      Status.tagged_with(tag.id)
+    else
+      Status.none
+    end
+  end
+
+  def suspended?
+    account.suspended?
+  end
+
+  def anonymous?
+    current_account.nil?
+  end
+
+  def author?
+    current_account.id == account.id
+  end
+
+  def blocked?
+    account.blocking?(current_account) || (current_account.domain.present? && account.domain_blocking?(current_account.domain))
+  end
+
+  def follower?
+    current_account.following?(account)
+  end
+
+  def reblogs_may_occur?
+    !exclude_reblogs? && !only_media? && !tagged?
+  end
+
+  def pinned?
+    truthy_param?(:pinned)
+  end
+
+  def only_media?
+    truthy_param?(:only_media)
+  end
+
+  def exclude_replies?
+    truthy_param?(:exclude_replies)
+  end
+
+  def exclude_reblogs?
+    truthy_param?(:exclude_reblogs)
+  end
+
+  def tagged?
+    params[:tagged].present?
+  end
+
+  def truthy_param?(key)
+    ActiveModel::Type::Boolean.new.cast(params[key])
+  end
+end
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb
index ac764de50..651041d67 100644
--- a/app/models/account_suggestions/global_source.rb
+++ b/app/models/account_suggestions/global_source.rb
@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::GlobalSource < AccountSuggestions::Source
+  include Redisable
+
   def key
     :global
   end
 
   def get(account, skip_account_ids: [], limit: 40)
-    account_ids = account_ids_for_locale(account.user_locale) - [account.id] - skip_account_ids
+    account_ids = account_ids_for_locale(I18n.locale.to_s.split(/[_-]/).first) - [account.id] - skip_account_ids
 
     as_ordered_suggestions(
       scope(account).where(id: account_ids),
@@ -28,7 +30,7 @@ class AccountSuggestions::GlobalSource < AccountSuggestions::Source
   end
 
   def account_ids_for_locale(locale)
-    Redis.current.zrevrange("follow_recommendations:#{locale}", 0, -1).map(&:to_i)
+    redis.zrevrange("follow_recommendations:#{locale}", 0, -1).map(&:to_i)
   end
 
   def to_ordered_list_key(account)
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 5efc924d5..961a078b9 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -10,14 +10,41 @@
 #  text              :text             default(""), not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
+#  report_id         :bigint(8)
+#  status_ids        :string           is an Array
+#  overruled_at      :datetime
 #
 
 class AccountWarning < ApplicationRecord
-  enum action: %i(none disable sensitive silence suspend), _suffix: :action
+  enum action: {
+    none:                       0,
+    disable:                    1_000,
+    mark_statuses_as_sensitive: 1_250,
+    delete_statuses:            1_500,
+    sensitive:                  2_000,
+    silence:                    3_000,
+    suspend:                    4_000,
+  }, _suffix: :action
 
   belongs_to :account, inverse_of: :account_warnings
-  belongs_to :target_account, class_name: 'Account', inverse_of: :targeted_account_warnings
+  belongs_to :target_account, class_name: 'Account', inverse_of: :strikes
+  belongs_to :report, optional: true
 
-  scope :latest, -> { order(created_at: :desc) }
+  has_one :appeal, dependent: :destroy, inverse_of: :strike
+
+  scope :latest, -> { order(id: :desc) }
   scope :custom, -> { where.not(text: '') }
+  scope :recent, -> { where('account_warnings.created_at >= ?', 3.months.ago) }
+
+  def statuses
+    Status.with_discarded.where(id: status_ids || [])
+  end
+
+  def overruled?
+    overruled_at.present?
+  end
+
+  def to_log_human_identifier
+    target_account.acct
+  end
 end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index bf222391f..bce0d6e17 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -22,6 +22,18 @@ class Admin::AccountAction
 
   attr_reader :warning, :send_email_notification, :include_statuses
 
+  alias send_email_notification? send_email_notification
+  alias include_statuses? include_statuses
+
+  validates :type, :target_account, :current_account, presence: true
+
+  def initialize(attributes = {})
+    @send_email_notification = true
+    @include_statuses        = true
+
+    super
+  end
+
   def send_email_notification=(value)
     @send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
   end
@@ -31,13 +43,15 @@ class Admin::AccountAction
   end
 
   def save!
+    raise ActiveRecord::RecordInvalid, self unless valid?
+
     ApplicationRecord.transaction do
       process_action!
-      process_warning!
+      process_strike!
+      process_reports!
     end
 
     process_email!
-    process_reports!
     process_queue!
   end
 
@@ -74,20 +88,18 @@ class Admin::AccountAction
     end
   end
 
-  def process_warning!
-    return unless warnable?
-
-    authorize(target_account, :warn?)
-
-    @warning = AccountWarning.create!(target_account: target_account,
-                                      account: current_account,
-                                      action: type,
-                                      text: text_for_warning)
+  def process_strike!
+    @warning = target_account.strikes.create!(
+      account: current_account,
+      report: report,
+      action: type,
+      text: text_for_warning,
+      status_ids: status_ids
+    )
 
     # A log entry is only interesting if the warning contains
     # custom text from someone. Otherwise it's just noise.
-
-    log_action(:create, warning) if warning.text.present?
+    log_action(:create, @warning) if @warning.text.present? && type == 'none'
   end
 
   def process_reports!
@@ -98,9 +110,8 @@ class Admin::AccountAction
     # Otherwise, we will mark all unresolved reports about
     # the account as resolved.
 
-    reports.each { |report| authorize(report, :update?) }
-
     reports.each do |report|
+      authorize(report, :update?)
       log_action(:resolve, report)
       report.resolve!(current_account)
     end
@@ -143,21 +154,21 @@ class Admin::AccountAction
   end
 
   def process_email!
-    UserMailer.warning(target_account.user, warning, status_ids).deliver_later! if warnable?
+    UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
   end
 
   def warnable?
-    send_email_notification && target_account.local?
+    send_email_notification? && target_account.local?
   end
 
   def status_ids
-    report.status_ids if report && include_statuses
+    report.status_ids if with_report? && include_statuses?
   end
 
   def reports
     @reports ||= begin
-      if type == 'none' && with_report?
-        [report]
+      if type == 'none'
+        with_report? ? [report] : []
       else
         Report.where(target_account: target_account).unresolved
       end
diff --git a/app/models/admin/action_log.rb b/app/models/admin/action_log.rb
index 852bff713..4fa8008f5 100644
--- a/app/models/admin/action_log.rb
+++ b/app/models/admin/action_log.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: admin_action_logs
@@ -8,38 +9,42 @@
 #  action           :string           default(""), not null
 #  target_type      :string
 #  target_id        :bigint(8)
-#  recorded_changes :text             default(""), not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
+#  human_identifier :string
+#  route_param      :string
+#  permalink        :string
 #
 
 class Admin::ActionLog < ApplicationRecord
-  serialize :recorded_changes
+  self.ignored_columns = %w(
+    recorded_changes
+  )
 
   belongs_to :account
   belongs_to :target, polymorphic: true, optional: true
 
   default_scope -> { order('id desc') }
 
+  before_validation :set_human_identifier
+  before_validation :set_route_param
+  before_validation :set_permalink
+
   def action
     super.to_sym
   end
 
-  before_validation :set_changes
-
   private
 
-  def set_changes
-    case action
-    when :destroy, :create
-      self.recorded_changes = target.attributes
-    when :update, :promote, :demote
-      self.recorded_changes = target.previous_changes
-    when :change_email
-      self.recorded_changes = ActiveSupport::HashWithIndifferentAccess.new(
-        email: [target.email, nil],
-        unconfirmed_email: [nil, target.unconfirmed_email]
-      )
-    end
+  def set_human_identifier
+    self.human_identifier = target.to_log_human_identifier if target.respond_to?(:to_log_human_identifier)
+  end
+
+  def set_route_param
+    self.route_param = target.to_log_route_param if target.respond_to?(:to_log_route_param)
+  end
+
+  def set_permalink
+    self.permalink = target.to_log_permalink if target.respond_to?(:to_log_permalink)
   end
 end
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index 12136223b..f89d452ef 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -8,8 +8,11 @@ class Admin::ActionLogFilter
   ).freeze
 
   ACTION_TYPE_MAP = {
+    approve_appeal: { target_type: 'Appeal', action: 'approve' }.freeze,
+    reject_appeal: { target_type: 'Appeal', action: 'reject' }.freeze,
     assigned_to_self_report: { target_type: 'Report', action: 'assigned_to_self' }.freeze,
     change_email_user: { target_type: 'User', action: 'change_email' }.freeze,
+    change_role_user: { target_type: 'User', action: 'change_role' }.freeze,
     confirm_user: { target_type: 'User', action: 'confirm' }.freeze,
     approve_user: { target_type: 'User', action: 'approve' }.freeze,
     reject_user: { target_type: 'User', action: 'reject' }.freeze,
@@ -19,16 +22,22 @@ class Admin::ActionLogFilter
     create_domain_allow: { target_type: 'DomainAllow', action: 'create' }.freeze,
     create_domain_block: { target_type: 'DomainBlock', action: 'create' }.freeze,
     create_email_domain_block: { target_type: 'EmailDomainBlock', action: 'create' }.freeze,
+    create_ip_block: { target_type: 'IpBlock', action: 'create' }.freeze,
     create_unavailable_domain: { target_type: 'UnavailableDomain', action: 'create' }.freeze,
+    create_user_role: { target_type: 'UserRole', action: 'create' }.freeze,
+    create_canonical_email_block: { target_type: 'CanonicalEmailBlock', action: 'create' }.freeze,
     demote_user: { target_type: 'User', action: 'demote' }.freeze,
     destroy_announcement: { target_type: 'Announcement', action: 'destroy' }.freeze,
     destroy_custom_emoji: { target_type: 'CustomEmoji', action: 'destroy' }.freeze,
     destroy_domain_allow: { target_type: 'DomainAllow', action: 'destroy' }.freeze,
     destroy_domain_block: { target_type: 'DomainBlock', action: 'destroy' }.freeze,
+    destroy_ip_block: { target_type: 'IpBlock', action: 'destroy' }.freeze,
     destroy_email_domain_block: { target_type: 'EmailDomainBlock', action: 'destroy' }.freeze,
     destroy_instance: { target_type: 'Instance', action: 'destroy' }.freeze,
     destroy_unavailable_domain: { target_type: 'UnavailableDomain', action: 'destroy' }.freeze,
     destroy_status: { target_type: 'Status', action: 'destroy' }.freeze,
+    destroy_user_role: { target_type: 'UserRole', action: 'destroy' }.freeze,
+    destroy_canonical_email_block: { target_type: 'CanonicalEmailBlock', action: 'destroy' }.freeze,
     disable_2fa_user: { target_type: 'User', action: 'disable' }.freeze,
     disable_custom_emoji: { target_type: 'CustomEmoji', action: 'disable' }.freeze,
     disable_user: { target_type: 'User', action: 'disable' }.freeze,
@@ -38,6 +47,7 @@ class Admin::ActionLogFilter
     promote_user: { target_type: 'User', action: 'promote' }.freeze,
     remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze,
     reopen_report: { target_type: 'Report', action: 'reopen' }.freeze,
+    resend_user: { target_type: 'User', action: 'resend' }.freeze,
     reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze,
     resolve_report: { target_type: 'Report', action: 'resolve' }.freeze,
     sensitive_account: { target_type: 'Account', action: 'sensitive' }.freeze,
@@ -50,6 +60,8 @@ class Admin::ActionLogFilter
     update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
     update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
     update_status: { target_type: 'Status', action: 'update' }.freeze,
+    update_user_role: { target_type: 'UserRole', action: 'update' }.freeze,
+    update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze,
     unblock_email_account: { target_type: 'Account', action: 'unblock_email' }.freeze,
   }.freeze
 
@@ -83,7 +95,7 @@ class Admin::ActionLogFilter
       account = Account.find_or_initialize_by(id: value)
       Admin::ActionLog.where(target: [account, account.user].compact)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 end
diff --git a/app/models/admin/appeal_filter.rb b/app/models/admin/appeal_filter.rb
new file mode 100644
index 000000000..f5dcc0f54
--- /dev/null
+++ b/app/models/admin/appeal_filter.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class Admin::AppealFilter
+  KEYS = %i(
+    status
+  ).freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Appeal.order(id: :desc)
+
+    params.each do |key, value|
+      next if %w(page).include?(key.to_s)
+
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key.to_s
+    when 'status'
+      status_scope(value)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+
+  def status_scope(value)
+    case value
+    when 'approved'
+      Appeal.approved
+    when 'rejected'
+      Appeal.rejected
+    when 'pending'
+      Appeal.pending
+    else
+      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
+    end
+  end
+end
diff --git a/app/models/admin/import.rb b/app/models/admin/import.rb
new file mode 100644
index 000000000..79c0722d5
--- /dev/null
+++ b/app/models/admin/import.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# A non-activerecord helper class for csv upload
+class Admin::Import
+  include ActiveModel::Model
+
+  ROWS_PROCESSING_LIMIT = 20_000
+
+  attr_accessor :data
+
+  validates :data, presence: true
+  validate :validate_data
+
+  def data_file_name
+    data.original_filename
+  end
+
+  private
+
+  def validate_data
+    return if data.blank?
+
+    csv_data = CSV.read(data.path, encoding: 'UTF-8')
+
+    row_count  = csv_data.size
+    row_count -= 1 if csv_data.first&.first == '#domain'
+
+    errors.add(:data, I18n.t('imports.errors.over_rows_processing_limit', count: ROWS_PROCESSING_LIMIT)) if row_count > ROWS_PROCESSING_LIMIT
+  rescue CSV::MalformedCSVError => e
+    errors.add(:data, I18n.t('imports.errors.invalid_csv_file', error: e.message))
+  end
+end
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
new file mode 100644
index 000000000..0f019b854
--- /dev/null
+++ b/app/models/admin/status_batch_action.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+class Admin::StatusBatchAction
+  include ActiveModel::Model
+  include AccountableConcern
+  include Authorization
+
+  attr_accessor :current_account, :type,
+                :status_ids, :report_id
+
+  attr_reader :send_email_notification
+
+  def send_email_notification=(value)
+    @send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
+  end
+
+  def save!
+    process_action!
+  end
+
+  private
+
+  def statuses
+    Status.with_discarded.where(id: status_ids)
+  end
+
+  def process_action!
+    return if status_ids.empty?
+
+    case type
+    when 'delete'
+      handle_delete!
+    when 'mark_as_sensitive'
+      handle_mark_as_sensitive!
+    when 'report'
+      handle_report!
+    when 'remove_from_report'
+      handle_remove_from_report!
+    end
+  end
+
+  def handle_delete!
+    statuses.each { |status| authorize([:admin, status], :destroy?) }
+
+    ApplicationRecord.transaction do
+      statuses.each do |status|
+        status.discard_with_reblogs
+        log_action(:destroy, status)
+      end
+
+      if with_report?
+        report.resolve!(current_account)
+        log_action(:resolve, report)
+      end
+
+      @warning = target_account.strikes.create!(
+        action: :delete_statuses,
+        account: current_account,
+        report: report,
+        status_ids: status_ids
+      )
+
+      statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
+    end
+
+    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
+  end
+
+  def handle_mark_as_sensitive!
+    representative_account = Account.representative
+
+    # Can't use a transaction here because UpdateStatusService queues
+    # Sidekiq jobs
+    statuses.includes(:media_attachments, :preview_cards).find_each do |status|
+      next unless status.with_media? || status.with_preview_card?
+
+      authorize([:admin, status], :update?)
+
+      if target_account.local?
+        UpdateStatusService.new.call(status, representative_account.id, sensitive: true)
+      else
+        status.update(sensitive: true)
+      end
+
+      log_action(:update, status)
+
+      if with_report?
+        report.resolve!(current_account)
+        log_action(:resolve, report)
+      end
+
+      @warning = target_account.strikes.create!(
+        action: :mark_statuses_as_sensitive,
+        account: current_account,
+        report: report,
+        status_ids: status_ids
+      )
+    end
+
+    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+  end
+
+  def handle_report!
+    @report = Report.new(report_params) unless with_report?
+    @report.status_ids = (@report.status_ids + allowed_status_ids).uniq
+    @report.save!
+
+    @report_id = @report.id
+  end
+
+  def handle_remove_from_report!
+    return unless with_report?
+
+    report.status_ids -= status_ids.map(&:to_i)
+    report.save!
+  end
+
+  def report
+    @report ||= Report.find(report_id) if report_id.present?
+  end
+
+  def with_report?
+    !report.nil?
+  end
+
+  def warnable?
+    send_email_notification && target_account.local?
+  end
+
+  def target_account
+    @target_account ||= statuses.first.account
+  end
+
+  def report_params
+    { account: current_account, target_account: target_account }
+  end
+
+  def allowed_status_ids
+    AccountStatusesFilter.new(@report.target_account, current_account).results.with_discarded.where(id: status_ids).pluck(:id)
+  end
+end
diff --git a/app/models/admin/status_filter.rb b/app/models/admin/status_filter.rb
new file mode 100644
index 000000000..4d439e9a1
--- /dev/null
+++ b/app/models/admin/status_filter.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class Admin::StatusFilter
+  KEYS = %i(
+    media
+    report_id
+  ).freeze
+
+  attr_reader :params
+
+  def initialize(account, params)
+    @account = account
+    @params  = params
+  end
+
+  def results
+    scope = @account.statuses.where(visibility: [:public, :unlisted])
+
+    params.each do |key, value|
+      next if %w(page report_id).include?(key.to_s)
+
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, _value)
+    case key.to_s
+    when 'media'
+      Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id).reorder('statuses.id desc')
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index f8183aabc..4b2cb4c6d 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -31,9 +31,12 @@ class Announcement < ApplicationRecord
   validates :starts_at, presence: true, if: -> { ends_at.present? }
   validates :ends_at, presence: true, if: -> { starts_at.present? }
 
-  before_validation :set_all_day
   before_validation :set_published, on: :create
 
+  def to_log_human_identifier
+    text
+  end
+
   def publish!
     update!(published: true, published_at: Time.now.utc, scheduled_at: nil)
   end
@@ -85,10 +88,6 @@ class Announcement < ApplicationRecord
 
   private
 
-  def set_all_day
-    self.all_day = false if starts_at.blank? || ends_at.blank?
-  end
-
   def set_published
     return unless scheduled_at.blank? || scheduled_at.past?
 
diff --git a/app/models/announcement_filter.rb b/app/models/announcement_filter.rb
index 950852460..85c3b1d2c 100644
--- a/app/models/announcement_filter.rb
+++ b/app/models/announcement_filter.rb
@@ -33,7 +33,7 @@ class AnnouncementFilter
     when 'unpublished'
       Announcement.unpublished
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 end
diff --git a/app/models/appeal.rb b/app/models/appeal.rb
new file mode 100644
index 000000000..6fbf60b39
--- /dev/null
+++ b/app/models/appeal.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: appeals
+#
+#  id                     :bigint(8)        not null, primary key
+#  account_id             :bigint(8)        not null
+#  account_warning_id     :bigint(8)        not null
+#  text                   :text             default(""), not null
+#  approved_at            :datetime
+#  approved_by_account_id :bigint(8)
+#  rejected_at            :datetime
+#  rejected_by_account_id :bigint(8)
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#
+class Appeal < ApplicationRecord
+  MAX_STRIKE_AGE = 20.days
+
+  belongs_to :account
+  belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id'
+  belongs_to :approved_by_account, class_name: 'Account', optional: true
+  belongs_to :rejected_by_account, class_name: 'Account', optional: true
+
+  validates :text, presence: true, length: { maximum: 2_000 }
+  validates :account_warning_id, uniqueness: true
+
+  validate :validate_time_frame, on: :create
+
+  scope :approved, -> { where.not(approved_at: nil) }
+  scope :rejected, -> { where.not(rejected_at: nil) }
+  scope :pending, -> { where(approved_at: nil, rejected_at: nil) }
+
+  def pending?
+    !approved? && !rejected?
+  end
+
+  def approved?
+    approved_at.present?
+  end
+
+  def rejected?
+    rejected_at.present?
+  end
+
+  def approve!(current_account)
+    update!(approved_at: Time.now.utc, approved_by_account: current_account)
+  end
+
+  def reject!(current_account)
+    update!(rejected_at: Time.now.utc, rejected_by_account: current_account)
+  end
+
+  def to_log_human_identifier
+    account.acct
+  end
+
+  def to_log_route_param
+    account_warning_id
+  end
+
+  private
+
+  def validate_time_frame
+    errors.add(:base, I18n.t('strikes.errors.too_late')) if strike.created_at < MAX_STRIKE_AGE.ago
+  end
+end
diff --git a/app/models/canonical_email_block.rb b/app/models/canonical_email_block.rb
index 94781386c..1eb69ac67 100644
--- a/app/models/canonical_email_block.rb
+++ b/app/models/canonical_email_block.rb
@@ -5,27 +5,30 @@
 #
 #  id                   :bigint(8)        not null, primary key
 #  canonical_email_hash :string           default(""), not null
-#  reference_account_id :bigint(8)        not null
+#  reference_account_id :bigint(8)
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #
 
 class CanonicalEmailBlock < ApplicationRecord
   include EmailHelper
+  include Paginable
 
-  belongs_to :reference_account, class_name: 'Account'
+  belongs_to :reference_account, class_name: 'Account', optional: true
 
   validates :canonical_email_hash, presence: true, uniqueness: true
 
+  scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
+
+  def to_log_human_identifier
+    canonical_email_hash
+  end
+
   def email=(email)
     self.canonical_email_hash = email_to_canonical_email_hash(email)
   end
 
   def self.block?(email)
-    where(canonical_email_hash: email_to_canonical_email_hash(email)).exists?
-  end
-
-  def self.find_blocks(email)
-    where(canonical_email_hash: email_to_canonical_email_hash(email))
+    matching_email(email).exists?
   end
 end
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb
index f9e7a3bea..bbe269e8f 100644
--- a/app/models/concerns/account_associations.rb
+++ b/app/models/concerns/account_associations.rb
@@ -42,7 +42,7 @@ module AccountAssociations
     has_many :account_moderation_notes, dependent: :destroy, inverse_of: :account
     has_many :targeted_moderation_notes, class_name: 'AccountModerationNote', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
     has_many :account_warnings, dependent: :destroy, inverse_of: :account
-    has_many :targeted_account_warnings, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
+    has_many :strikes, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
 
     # Lists (that the account is on, not owned by the account)
     has_many :list_accounts, inverse_of: :account, dependent: :destroy
diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb
index 1af53ed23..e9b8b4adb 100644
--- a/app/models/concerns/account_avatar.rb
+++ b/app/models/concerns/account_avatar.rb
@@ -3,7 +3,7 @@
 module AccountAvatar
   extend ActiveSupport::Concern
 
-  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
+  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
   LIMIT = 2.megabytes
 
   class_methods do
@@ -18,7 +18,7 @@ module AccountAvatar
 
   included do
     # Avatar upload
-    has_attached_file :avatar, styles: ->(f) { avatar_styles(f) }, convert_options: { all: '-strip' }, processors: [:lazy_thumbnail]
+    has_attached_file :avatar, styles: ->(f) { avatar_styles(f) }, convert_options: { all: '+profile "!icc,*" +set modify-date +set create-date' }, processors: [:lazy_thumbnail]
     validates_attachment_content_type :avatar, content_type: IMAGE_MIME_TYPES
     validates_attachment_size :avatar, less_than: LIMIT
     remotable_attachment :avatar, LIMIT, suppress_errors: false
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index 0dadddad1..e8b804934 100644
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -13,7 +13,7 @@ module AccountFinderConcern
     end
 
     def representative
-      Account.find(-99)
+      Account.find(-99).tap(&:ensure_keys!)
     rescue ActiveRecord::RecordNotFound
       Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
     end
diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb
index 72a3d0566..0d197abfc 100644
--- a/app/models/concerns/account_header.rb
+++ b/app/models/concerns/account_header.rb
@@ -3,7 +3,7 @@
 module AccountHeader
   extend ActiveSupport::Concern
 
-  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
+  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
   LIMIT = 2.megabytes
   MAX_PIXELS = 750_000 # 1500x500px
 
@@ -19,7 +19,7 @@ module AccountHeader
 
   included do
     # Header upload
-    has_attached_file :header, styles: ->(f) { header_styles(f) }, convert_options: { all: '-strip' }, processors: [:lazy_thumbnail]
+    has_attached_file :header, styles: ->(f) { header_styles(f) }, convert_options: { all: '+profile "!icc,*" +set modify-date +set create-date' }, processors: [:lazy_thumbnail]
     validates_attachment_content_type :header, content_type: IMAGE_MIME_TYPES
     validates_attachment_size :header, less_than: LIMIT
     remotable_attachment :header, LIMIT, suppress_errors: false
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index ad1665dc4..de8bf338f 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -9,6 +9,7 @@ module AccountInteractions
         mapping[follow.target_account_id] = {
           reblogs: follow.show_reblogs?,
           notify: follow.notify?,
+          languages: follow.languages,
         }
       end
     end
@@ -38,10 +39,15 @@ module AccountInteractions
         mapping[follow_request.target_account_id] = {
           reblogs: follow_request.show_reblogs?,
           notify: follow_request.notify?,
+          languages: follow_request.languages,
         }
       end
     end
 
+    def requested_by_map(target_account_ids, account_id)
+      follow_mapping(FollowRequest.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
+    end
+
     def endorsed_map(target_account_ids, account_id)
       follow_mapping(AccountPin.where(account_id: account_id, target_account_id: target_account_ids), :target_account_id)
     end
@@ -100,12 +106,13 @@ module AccountInteractions
     has_many :announcement_mutes, dependent: :destroy
   end
 
-  def follow!(other_account, reblogs: nil, notify: nil, uri: nil, rate_limit: false, bypass_limit: false)
-    rel = active_relationships.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
+  def follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
+    rel = active_relationships.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, languages: languages, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
                               .find_or_create_by!(target_account: other_account)
 
-    rel.show_reblogs = reblogs unless reblogs.nil?
-    rel.notify       = notify  unless notify.nil?
+    rel.show_reblogs = reblogs   unless reblogs.nil?
+    rel.notify       = notify    unless notify.nil?
+    rel.languages    = languages unless languages.nil?
 
     rel.save! if rel.changed?
 
@@ -114,12 +121,13 @@ module AccountInteractions
     rel
   end
 
-  def request_follow!(other_account, reblogs: nil, notify: nil, uri: nil, rate_limit: false, bypass_limit: false)
-    rel = follow_requests.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
+  def request_follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
+    rel = follow_requests.create_with(show_reblogs: reblogs.nil? ? true : reblogs, notify: notify.nil? ? false : notify, uri: uri, languages: languages, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
                          .find_or_create_by!(target_account: other_account)
 
-    rel.show_reblogs = reblogs unless reblogs.nil?
-    rel.notify       = notify  unless notify.nil?
+    rel.show_reblogs = reblogs   unless reblogs.nil?
+    rel.notify       = notify    unless notify.nil?
+    rel.languages    = languages unless languages.nil?
 
     rel.save! if rel.changed?
 
@@ -247,6 +255,11 @@ module AccountInteractions
     account_pins.where(target_account: account).exists?
   end
 
+  def status_matches_filters(status)
+    active_filters = CustomFilter.cached_filters_for(id)
+    CustomFilter.apply_cached_filters(active_filters, status)
+  end
+
   def followers_for_local_distribution
     followers.local
              .joins(:user)
@@ -283,8 +296,7 @@ module AccountInteractions
 
   private
 
-  def remove_potential_friendship(other_account, mutual = false)
+  def remove_potential_friendship(other_account)
     PotentialFriendshipTracker.remove(id, other_account.id)
-    PotentialFriendshipTracker.remove(other_account.id, id) if mutual
   end
 end
diff --git a/app/models/concerns/account_merging.rb b/app/models/concerns/account_merging.rb
index 119773e6b..8161761fb 100644
--- a/app/models/concerns/account_merging.rb
+++ b/app/models/concerns/account_merging.rb
@@ -15,7 +15,8 @@ module AccountMerging
       Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite,
       Follow, FollowRequest, Block, Mute,
       AccountModerationNote, AccountPin, AccountStat, ListAccount,
-      PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression
+      PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
+      Appeal
     ]
 
     owned_classes.each do |klass|
@@ -47,6 +48,10 @@ module AccountMerging
       record.update_attribute(:reference_account_id, id)
     end
 
+    Appeal.where(account_warning_id: other_account.id).find_each do |record|
+      record.update_attribute(:account_warning_id, id)
+    end
+
     # Some follow relationships have moved, so the cache is stale
     Rails.cache.delete_matched("followers_hash:#{id}:*")
     Rails.cache.delete_matched("relationships:#{id}:*")
diff --git a/app/models/concerns/domain_materializable.rb b/app/models/concerns/domain_materializable.rb
index 88337f8c0..0eac6878e 100644
--- a/app/models/concerns/domain_materializable.rb
+++ b/app/models/concerns/domain_materializable.rb
@@ -3,11 +3,24 @@
 module DomainMaterializable
   extend ActiveSupport::Concern
 
+  include Redisable
+
   included do
     after_create_commit :refresh_instances_view
   end
 
   def refresh_instances_view
-    Instance.refresh unless domain.nil? || Instance.where(domain: domain).exists?
+    return if domain.nil? || Instance.exists?(domain: domain)
+
+    Instance.refresh
+    count_unique_subdomains!
+  end
+
+  def count_unique_subdomains!
+    second_and_top_level_domain = PublicSuffix.domain(domain, ignore_private: true)
+    with_redis do |redis|
+      redis.pfadd("unique_subdomains_for:#{second_and_top_level_domain}", domain)
+      redis.expire("unique_subdomains_for:#{second_and_top_level_domain}", 1.minute.seconds)
+    end
   end
 end
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
index fb84058fc..8e244c1d8 100644
--- a/app/models/concerns/domain_normalizable.rb
+++ b/app/models/concerns/domain_normalizable.rb
@@ -11,5 +11,7 @@ module DomainNormalizable
 
   def normalize_domain
     self.domain = TagManager.instance.normalize_domain(domain&.strip)
+  rescue Addressable::URI::InvalidURIError
+    errors.add(:domain, :invalid)
   end
 end
diff --git a/app/models/concerns/lockable.rb b/app/models/concerns/lockable.rb
new file mode 100644
index 000000000..55a9714ca
--- /dev/null
+++ b/app/models/concerns/lockable.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Lockable
+  # @param [String] lock_name
+  # @param [ActiveSupport::Duration] autorelease Automatically release the lock after this time
+  # @param [Boolean] raise_on_failure Raise an error if a lock cannot be acquired, or fail silently
+  # @raise [Mastodon::RaceConditionError]
+  def with_lock(lock_name, autorelease: 15.minutes, raise_on_failure: true)
+    with_redis do |redis|
+      RedisLock.acquire(redis: redis, key: "lock:#{lock_name}", autorelease: autorelease.seconds) do |lock|
+        if lock.acquired?
+          yield
+        elsif raise_on_failure
+          raise Mastodon::RaceConditionError, "Could not acquire lock for #{lock_name}, try again later"
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 791a94911..a90d5d888 100644
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@@ -13,7 +13,7 @@ module Omniauthable
       Devise.omniauth_configs.keys
     end
 
-    def email_verified?
+    def email_present?
       email && email !~ TEMP_EMAIL_REGEX
     end
   end
@@ -40,16 +40,14 @@ module Omniauthable
     end
 
     def create_for_oauth(auth)
-      # Check if the user exists with provided email if the provider gives us a
-      # verified email.  If no verified email was provided or the user already
-      # exists, we assign a temporary email and ask the user to verify it on
+      # Check if the user exists with provided email. If no email was provided,
+      # we assign a temporary email and ask the user to verify it on
       # the next step via Auth::SetupController.show
 
       strategy          = Devise.omniauth_configs[auth.provider.to_sym].strategy
       assume_verified   = strategy&.security&.assume_email_is_verified
-      email_is_verified = auth.info.verified || auth.info.verified_email || assume_verified
+      email_is_verified = auth.info.verified || auth.info.verified_email || auth.info.email_verified || assume_verified
       email             = auth.info.verified_email || auth.info.email
-      email             = nil unless email_is_verified
 
       user = User.find_by(email: email) if email_is_verified
 
@@ -58,7 +56,7 @@ module Omniauthable
       user = User.new(user_params_from_auth(email, auth))
 
       user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image)
-      user.skip_confirmation!
+      user.skip_confirmation! if email_is_verified
       user.save!
       user
     end
@@ -71,8 +69,8 @@ module Omniauthable
         agreement: true,
         external: true,
         account_attributes: {
-          username: ensure_unique_username(auth.uid),
-          display_name: auth.info.full_name || [auth.info.first_name, auth.info.last_name].join(' '),
+          username: ensure_unique_username(ensure_valid_username(auth.uid)),
+          display_name: auth.info.full_name || auth.info.name || [auth.info.first_name, auth.info.last_name].join(' '),
         },
       }
     end
@@ -88,5 +86,12 @@ module Omniauthable
 
       username
     end
+
+    def ensure_valid_username(starting_username)
+      starting_username = starting_username.split('@')[0]
+      temp_username = starting_username.gsub(/[^a-z0-9_]+/i, '')
+      validated_username = temp_username.truncate(30, omission: '')
+      validated_username
+    end
   end
 end
diff --git a/app/models/concerns/redisable.rb b/app/models/concerns/redisable.rb
index c6cf97359..0dad3abb2 100644
--- a/app/models/concerns/redisable.rb
+++ b/app/models/concerns/redisable.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module Redisable
-  extend ActiveSupport::Concern
-
-  private
-
   def redis
-    Redis.current
+    Thread.current[:redis] ||= RedisConfiguration.pool.checkout
+  end
+
+  def with_redis(&block)
+    RedisConfiguration.with(&block)
   end
 end
diff --git a/app/models/concerns/status_snapshot_concern.rb b/app/models/concerns/status_snapshot_concern.rb
new file mode 100644
index 000000000..9741b9aeb
--- /dev/null
+++ b/app/models/concerns/status_snapshot_concern.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module StatusSnapshotConcern
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :edits, class_name: 'StatusEdit', inverse_of: :status, dependent: :destroy
+  end
+
+  def edited?
+    edited_at.present?
+  end
+
+  def build_snapshot(account_id: nil, at_time: nil, rate_limit: true)
+    # We don't use `edits#new` here to avoid it having saved when the
+    # status is saved, since we want to control that manually
+
+    StatusEdit.new(
+      status_id: id,
+      text: text,
+      spoiler_text: spoiler_text,
+      sensitive: sensitive,
+      ordered_media_attachment_ids: ordered_media_attachment_ids&.dup || media_attachments.pluck(:id),
+      media_descriptions: ordered_media_attachments.map(&:description),
+      poll_options: preloadable_poll&.options&.dup,
+      account_id: account_id || self.account_id,
+      created_at: at_time || edited_at,
+      rate_limit: rate_limit
+    )
+  end
+
+  def snapshot!(**options)
+    build_snapshot(**options).save!
+  end
+end
diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb
index 5c04108e4..8b628beea 100644
--- a/app/models/concerns/status_threading_concern.rb
+++ b/app/models/concerns/status_threading_concern.rb
@@ -7,8 +7,8 @@ module StatusThreadingConcern
     find_statuses_from_tree_path(ancestor_ids(limit), account)
   end
 
-  def descendants(limit, account = nil, max_child_id = nil, since_child_id = nil, depth = nil)
-    find_statuses_from_tree_path(descendant_ids(limit, max_child_id, since_child_id, depth), account, promote: true)
+  def descendants(limit, account = nil, depth = nil)
+    find_statuses_from_tree_path(descendant_ids(limit, depth), account, promote: true)
   end
 
   def self_replies(limit)
@@ -50,22 +50,17 @@ module StatusThreadingConcern
     SQL
   end
 
-  def descendant_ids(limit, max_child_id, since_child_id, depth)
-    descendant_statuses(limit, max_child_id, since_child_id, depth).pluck(:id)
-  end
-
-  def descendant_statuses(limit, max_child_id, since_child_id, depth)
+  def descendant_ids(limit, depth)
     # use limit + 1 and depth + 1 because 'self' is included
     depth += 1 if depth.present?
     limit += 1 if limit.present?
 
-    descendants_with_self = Status.find_by_sql([<<-SQL.squish, id: id, limit: limit, max_child_id: max_child_id, since_child_id: since_child_id, depth: depth])
-      WITH RECURSIVE search_tree(id, path)
-      AS (
+    descendants_with_self = Status.find_by_sql([<<-SQL.squish, id: id, limit: limit, depth: depth])
+      WITH RECURSIVE search_tree(id, path) AS (
         SELECT id, ARRAY[id]
         FROM statuses
-        WHERE id = :id AND COALESCE(id < :max_child_id, TRUE) AND COALESCE(id > :since_child_id, TRUE)
-        UNION ALL
+        WHERE id = :id
+      UNION ALL
         SELECT statuses.id, path || statuses.id
         FROM search_tree
         JOIN statuses ON statuses.in_reply_to_id = search_tree.id
@@ -77,7 +72,7 @@ module StatusThreadingConcern
       LIMIT :limit
     SQL
 
-    descendants_with_self - [self]
+    descendants_with_self.pluck(:id) - [id]
   end
 
   def find_statuses_from_tree_path(ids, account, promote: false)
diff --git a/app/models/concerns/user_roles.rb b/app/models/concerns/user_roles.rb
deleted file mode 100644
index a42b4a172..000000000
--- a/app/models/concerns/user_roles.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module UserRoles
-  extend ActiveSupport::Concern
-
-  included do
-    scope :admins, -> { where(admin: true) }
-    scope :moderators, -> { where(moderator: true) }
-    scope :staff, -> { admins.or(moderators) }
-  end
-
-  def staff?
-    admin? || moderator?
-  end
-
-  def role=(value)
-    case value
-    when 'admin'
-      self.admin     = true
-      self.moderator = false
-    when 'moderator'
-      self.admin     = false
-      self.moderator = true
-    else
-      self.admin     = false
-      self.moderator = false
-    end
-  end
-
-  def role
-    if admin?
-      'admin'
-    elsif moderator?
-      'moderator'
-    else
-      'user'
-    end
-  end
-
-  def role?(role)
-    case role
-    when 'user'
-      true
-    when 'moderator'
-      staff?
-    when 'admin'
-      admin?
-    else
-      false
-    end
-  end
-
-  def promote!
-    if moderator?
-      update!(moderator: false, admin: true)
-    elsif !admin?
-      update!(moderator: true)
-    end
-  end
-
-  def demote!
-    if admin?
-      update!(admin: false, moderator: true)
-    elsif moderator?
-      update!(moderator: false)
-    end
-  end
-end
diff --git a/app/models/content_retention_policy.rb b/app/models/content_retention_policy.rb
new file mode 100644
index 000000000..b5e922c8c
--- /dev/null
+++ b/app/models/content_retention_policy.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class ContentRetentionPolicy
+  def self.current
+    new
+  end
+
+  def media_cache_retention_period
+    retention_period Setting.media_cache_retention_period
+  end
+
+  def content_cache_retention_period
+    retention_period Setting.content_cache_retention_period
+  end
+
+  def backups_retention_period
+    retention_period Setting.backups_retention_period
+  end
+
+  private
+
+  def retention_period(value)
+    value.days if value.is_a?(Integer) && value.positive?
+  end
+end
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index a85feb73a..304805659 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -23,30 +23,31 @@
 class CustomEmoji < ApplicationRecord
   include Attachmentable
 
-  LIMIT = 50.kilobytes
+  LIMIT = 256.kilobytes
 
   SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
 
   SCAN_RE = /(?<=[^[:alnum:]:]|\n|^)
     :(#{SHORTCODE_RE_FRAGMENT}):
     (?=[^[:alnum:]:]|$)/x
+  SHORTCODE_ONLY_RE = /\A#{SHORTCODE_RE_FRAGMENT}\z/
 
-  IMAGE_MIME_TYPES = %w(image/png image/gif).freeze
+  IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze
 
   belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
   has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode
 
-  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }, validate_media_type: false
+  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set modify-date +set create-date' } }, validate_media_type: false
 
   before_validation :downcase_domain
 
   validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true, size: { less_than: LIMIT }
-  validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 }
+  validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: 2 }
 
   scope :local, -> { where(domain: nil) }
   scope :remote, -> { where.not(domain: nil) }
   scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) }
-  scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
+  scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches("%.#{domain}"))) }
   scope :listed, -> { local.where(disabled: false).where(visible_in_picker: true) }
 
   remotable_attachment :image, LIMIT
@@ -67,6 +68,10 @@ class CustomEmoji < ApplicationRecord
     copy.tap(&:save!)
   end
 
+  def to_log_human_identifier
+    shortcode
+  end
+
   class << self
     def from_text(text, domain = nil)
       return [] if text.blank?
diff --git a/app/models/custom_emoji_filter.rb b/app/models/custom_emoji_filter.rb
index 414e1fcdd..ed7a8dda1 100644
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@@ -39,7 +39,7 @@ class CustomEmojiFilter
     when 'shortcode'
       CustomEmoji.search(value.strip)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 end
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 9d0f3729b..5a4a974be 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -3,18 +3,22 @@
 #
 # Table name: custom_filters
 #
-#  id           :bigint(8)        not null, primary key
-#  account_id   :bigint(8)
-#  expires_at   :datetime
-#  phrase       :text             default(""), not null
-#  context      :string           default([]), not null, is an Array
-#  whole_word   :boolean          default(TRUE), not null
-#  irreversible :boolean          default(FALSE), not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id         :bigint(8)        not null, primary key
+#  account_id :bigint(8)
+#  expires_at :datetime
+#  phrase     :text             default(""), not null
+#  context    :string           default([]), not null, is an Array
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  action     :integer          default("warn"), not null
 #
 
 class CustomFilter < ApplicationRecord
+  self.ignored_columns = %w(whole_word irreversible)
+
+  alias_attribute :title, :phrase
+  alias_attribute :filter_action, :action
+
   VALID_CONTEXTS = %w(
     home
     notifications
@@ -24,17 +28,23 @@ class CustomFilter < ApplicationRecord
   ).freeze
 
   include Expireable
+  include Redisable
+
+  enum action: [:warn, :hide], _suffix: :action
 
   belongs_to :account
+  has_many :keywords, class_name: 'CustomFilterKeyword', foreign_key: :custom_filter_id, inverse_of: :custom_filter, dependent: :destroy
+  has_many :statuses, class_name: 'CustomFilterStatus', foreign_key: :custom_filter_id, inverse_of: :custom_filter, dependent: :destroy
+  accepts_nested_attributes_for :keywords, reject_if: :all_blank, allow_destroy: true
 
-  validates :phrase, :context, presence: true
+  validates :title, :context, presence: true
   validate :context_must_be_valid
-  validate :irreversible_must_be_within_context
-
-  scope :active_irreversible, -> { where(irreversible: true).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()')) }
 
   before_validation :clean_up_contexts
-  after_commit :remove_cache
+
+  before_save :prepare_cache_invalidation!
+  before_destroy :prepare_cache_invalidation!
+  after_commit :invalidate_cache!
 
   def expires_in
     return @expires_in if defined?(@expires_in)
@@ -43,22 +53,78 @@ class CustomFilter < ApplicationRecord
     [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
   end
 
+  def irreversible=(value)
+    self.action = ActiveModel::Type::Boolean.new.cast(value) ? :hide : :warn
+  end
+
+  def irreversible?
+    hide_action?
+  end
+
+  def self.cached_filters_for(account_id)
+    active_filters = Rails.cache.fetch("filters:v3:#{account_id}") do
+      filters_hash = {}
+
+      scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+      scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
+        keywords.map! do |keyword|
+          if keyword.whole_word
+            sb = /\A[[:word:]]/.match?(keyword.keyword) ? '\b' : ''
+            eb = /[[:word:]]\z/.match?(keyword.keyword) ? '\b' : ''
+
+            /(?mix:#{sb}#{Regexp.escape(keyword.keyword)}#{eb})/
+          else
+            /#{Regexp.escape(keyword.keyword)}/i
+          end
+        end
+
+        filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
+      end.to_h
+
+      scope = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+      scope.to_a.group_by(&:custom_filter).each do |filter, statuses|
+        filters_hash[filter.id] ||= { filter: filter }
+        filters_hash[filter.id].merge!(status_ids: statuses.map(&:status_id))
+      end
+
+      filters_hash.values.map { |cache| [cache.delete(:filter), cache] }
+    end.to_a
+
+    active_filters.select { |custom_filter, _| !custom_filter.expired? }
+  end
+
+  def self.apply_cached_filters(cached_filters, status)
+    cached_filters.filter_map do |filter, rules|
+      match = rules[:keywords].match(status.proper.searchable_text) if rules[:keywords].present?
+      keyword_matches = [match.to_s] unless match.nil?
+
+      status_matches = [status.id, status.reblog_of_id].compact & rules[:status_ids] if rules[:status_ids].present?
+
+      next if keyword_matches.blank? && status_matches.blank?
+      FilterResultPresenter.new(filter: filter, keyword_matches: keyword_matches, status_matches: status_matches)
+    end
+  end
+
+  def prepare_cache_invalidation!
+    @should_invalidate_cache = true
+  end
+
+  def invalidate_cache!
+    return unless @should_invalidate_cache
+    @should_invalidate_cache = false
+
+    Rails.cache.delete("filters:v3:#{account_id}")
+    redis.publish("timeline:#{account_id}", Oj.dump(event: :filters_changed))
+    redis.publish("timeline:system:#{account_id}", Oj.dump(event: :filters_changed))
+  end
+
   private
 
   def clean_up_contexts
     self.context = Array(context).map(&:strip).filter_map(&:presence)
   end
 
-  def remove_cache
-    Rails.cache.delete("filters:#{account_id}")
-    Redis.current.publish("timeline:#{account_id}", Oj.dump(event: :filters_changed))
-  end
-
   def context_must_be_valid
     errors.add(:context, I18n.t('filters.errors.invalid_context')) if context.empty? || context.any? { |c| !VALID_CONTEXTS.include?(c) }
   end
-
-  def irreversible_must_be_within_context
-    errors.add(:irreversible, I18n.t('filters.errors.invalid_irreversible')) if irreversible? && !context.include?('home') && !context.include?('notifications')
-  end
 end
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
new file mode 100644
index 000000000..e0d0289ae
--- /dev/null
+++ b/app/models/custom_filter_keyword.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: custom_filter_keywords
+#
+#  id               :bigint(8)        not null, primary key
+#  custom_filter_id :bigint(8)        not null
+#  keyword          :text             default(""), not null
+#  whole_word       :boolean          default(TRUE), not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+
+class CustomFilterKeyword < ApplicationRecord
+  belongs_to :custom_filter
+
+  validates :keyword, presence: true
+
+  alias_attribute :phrase, :keyword
+
+  before_save :prepare_cache_invalidation!
+  before_destroy :prepare_cache_invalidation!
+  after_commit :invalidate_cache!
+
+  private
+
+  def prepare_cache_invalidation!
+    custom_filter.prepare_cache_invalidation!
+  end
+
+  def invalidate_cache!
+    custom_filter.invalidate_cache!
+  end
+end
diff --git a/app/models/custom_filter_status.rb b/app/models/custom_filter_status.rb
new file mode 100644
index 000000000..e748d6963
--- /dev/null
+++ b/app/models/custom_filter_status.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: custom_filter_statuses
+#
+#  id               :bigint(8)        not null, primary key
+#  custom_filter_id :bigint(8)        not null
+#  status_id        :bigint(8)        not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+
+class CustomFilterStatus < ApplicationRecord
+  belongs_to :custom_filter
+  belongs_to :status
+
+  validates :status, uniqueness: { scope: :custom_filter }
+  validate :validate_status_access
+
+  before_save :prepare_cache_invalidation!
+  before_destroy :prepare_cache_invalidation!
+  after_commit :invalidate_cache!
+
+  private
+
+  def validate_status_access
+    errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter.account, status).show?
+  end
+
+  def prepare_cache_invalidation!
+    custom_filter.prepare_cache_invalidation!
+  end
+
+  def invalidate_cache!
+    custom_filter.invalidate_cache!
+  end
+end
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index 4b0a89c18..9e746b915 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -11,6 +11,7 @@
 #
 
 class DomainAllow < ApplicationRecord
+  include Paginable
   include DomainNormalizable
   include DomainMaterializable
 
@@ -18,11 +19,19 @@ class DomainAllow < ApplicationRecord
 
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
 
+  def to_log_human_identifier
+    domain
+  end
+
   class << self
     def allowed?(domain)
       !rule_for(domain).nil?
     end
 
+    def allowed_domains
+      select(:domain)
+    end
+
     def rule_for(domain)
       return if domain.blank?
 
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index bba04c603..8e298ac9d 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -16,6 +16,7 @@
 #
 
 class DomainBlock < ApplicationRecord
+  include Paginable
   include DomainNormalizable
   include DomainMaterializable
 
@@ -27,8 +28,21 @@ class DomainBlock < ApplicationRecord
   delegate :count, to: :accounts, prefix: true
 
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
-  scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
-  scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), reject_media, domain')) }
+  scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
+  scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
+  scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) }
+
+  def to_log_human_identifier
+    domain
+  end
+
+  def policies
+    if suspend?
+      [:suspend]
+    else
+      [severity.to_sym, reject_media? ? :reject_media : nil, reject_reports? ? :reject_reports : nil].reject { |policy| policy == :noop || policy.nil? }
+    end
+  end
 
   class << self
     def suspend?(domain)
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index f50fa46ba..10a0e5102 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -11,34 +11,80 @@
 #
 
 class EmailDomainBlock < ApplicationRecord
+  self.ignored_columns = %w(
+    ips
+    last_refresh_at
+  )
+
   include DomainNormalizable
+  include Paginable
 
   belongs_to :parent, class_name: 'EmailDomainBlock', optional: true
   has_many :children, class_name: 'EmailDomainBlock', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
-  def with_dns_records=(val)
-    @with_dns_records = ActiveModel::Type::Boolean.new.cast(val)
+  # Used for adding multiple blocks at once
+  attr_accessor :other_domains
+
+  def to_log_human_identifier
+    domain
   end
 
-  def with_dns_records?
-    @with_dns_records
+  def history
+    @history ||= Trends::History.new('email_domain_blocks', id)
   end
 
-  alias with_dns_records with_dns_records?
-
-  def self.block?(email)
-    _, domain = email.split('@', 2)
-
-    return true if domain.nil?
-
-    begin
-      domain = TagManager.instance.normalize_domain(domain)
-    rescue Addressable::URI::InvalidURIError
-      return true
+  class Matcher
+    def initialize(domain_or_domains, attempt_ip: nil)
+      @uris       = extract_uris(domain_or_domains)
+      @attempt_ip = attempt_ip
     end
 
-    where(domain: domain).exists?
+    def match?
+      blocking? || invalid_uri?
+    end
+
+    private
+
+    def invalid_uri?
+      @uris.any?(&:nil?)
+    end
+
+    def blocking?
+      blocks = EmailDomainBlock.where(domain: domains_with_variants).order(Arel.sql('char_length(domain) desc'))
+      blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
+      blocks.any?
+    end
+
+    def domains_with_variants
+      @uris.flat_map do |uri|
+        next if uri.nil?
+
+        segments = uri.normalized_host.split('.')
+
+        segments.map.with_index { |_, i| segments[i..-1].join('.') }
+      end
+    end
+
+    def extract_uris(domain_or_domains)
+      Array(domain_or_domains).map do |str|
+        domain = begin
+          if str.include?('@')
+            str.split('@', 2).last
+          else
+            str
+          end
+        end
+
+        Addressable::URI.new.tap { |u| u.host = domain.strip } if domain.present?
+      rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
+        nil
+      end
+    end
+  end
+
+  def self.block?(domain_or_domains, attempt_ip: nil)
+    Matcher.new(domain_or_domains, attempt_ip: attempt_ip).match?
   end
 end
diff --git a/app/models/encrypted_message.rb b/app/models/encrypted_message.rb
index aa4182b4e..7b4e32283 100644
--- a/app/models/encrypted_message.rb
+++ b/app/models/encrypted_message.rb
@@ -19,6 +19,7 @@ class EncryptedMessage < ApplicationRecord
   self.inheritance_column = nil
 
   include Paginable
+  include Redisable
 
   scope :up_to, ->(id) { where(arel_table[:id].lteq(id)) }
 
@@ -38,7 +39,7 @@ class EncryptedMessage < ApplicationRecord
   end
 
   def subscribed_to_timeline?
-    Redis.current.exists?("subscribed:#{streaming_channel}")
+    redis.exists?("subscribed:#{streaming_channel}")
   end
 
   def streaming_channel
diff --git a/app/models/export.rb b/app/models/export.rb
index 5216eed5e..2457dcc15 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -30,9 +30,9 @@ class Export
   end
 
   def to_following_accounts_csv
-    CSV.generate(headers: ['Account address', 'Show boosts'], write_headers: true) do |csv|
+    CSV.generate(headers: ['Account address', 'Show boosts', 'Notify on new posts', 'Languages'], write_headers: true) do |csv|
       account.active_relationships.includes(:target_account).reorder(id: :desc).each do |follow|
-        csv << [acct(follow.target_account), follow.show_reblogs]
+        csv << [acct(follow.target_account), follow.show_reblogs, follow.notify, follow.languages&.join(', ')]
       end
     end
   end
diff --git a/app/models/extended_description.rb b/app/models/extended_description.rb
new file mode 100644
index 000000000..6e5c0d1b6
--- /dev/null
+++ b/app/models/extended_description.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ExtendedDescription < ActiveModelSerializers::Model
+  attributes :updated_at, :text
+
+  def self.current
+    custom = Setting.find_by(var: 'site_extended_description')
+
+    if custom&.value.present?
+      new(text: custom.value, updated_at: custom.updated_at)
+    else
+      new
+    end
+  end
+end
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index e02ae0705..70f949b6a 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -4,26 +4,39 @@
 # Table name: featured_tags
 #
 #  id             :bigint(8)        not null, primary key
-#  account_id     :bigint(8)
-#  tag_id         :bigint(8)
+#  account_id     :bigint(8)        not null
+#  tag_id         :bigint(8)        not null
 #  statuses_count :bigint(8)        default(0), not null
 #  last_status_at :datetime
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
+#  name           :string
 #
 
 class FeaturedTag < ApplicationRecord
-  belongs_to :account, inverse_of: :featured_tags, required: true
-  belongs_to :tag, inverse_of: :featured_tags, required: true
+  belongs_to :account, inverse_of: :featured_tags
+  belongs_to :tag, inverse_of: :featured_tags, optional: true # Set after validation
 
-  delegate :name, to: :tag, allow_nil: true
+  validates :name, presence: true, format: { with: Tag::HASHTAG_NAME_RE }, on: :create
 
-  validates_associated :tag, on: :create
-  validates :name, presence: true, on: :create
+  validate :validate_tag_uniqueness, on: :create
   validate :validate_featured_tags_limit, on: :create
 
-  def name=(str)
-    self.tag = Tag.find_or_create_by_names(str.strip)&.first
+  before_validation :strip_name
+
+  before_create :set_tag
+  before_create :reset_data
+
+  scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) }
+
+  LIMIT = 10
+
+  def sign?
+    true
+  end
+
+  def display_name
+    attributes['name'] || tag.display_name
   end
 
   def increment(timestamp)
@@ -34,14 +47,28 @@ class FeaturedTag < ApplicationRecord
     update(statuses_count: [0, statuses_count - 1].max, last_status_at: account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).where.not(id: deleted_status_id).select(:created_at).first&.created_at)
   end
 
+  private
+
+  def strip_name
+    self.name = name&.strip&.gsub(/\A#/, '')
+  end
+
+  def set_tag
+    self.tag = Tag.find_or_create_by_names(name)&.first
+  end
+
   def reset_data
     self.statuses_count = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).count
     self.last_status_at = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).select(:created_at).first&.created_at
   end
 
-  private
-
   def validate_featured_tags_limit
-    errors.add(:base, I18n.t('featured_tags.errors.limit')) if account.featured_tags.count >= 10
+    return unless account.local?
+
+    errors.add(:base, I18n.t('featured_tags.errors.limit')) if account.featured_tags.count >= LIMIT
+  end
+
+  def validate_tag_uniqueness
+    errors.add(:name, :taken) if FeaturedTag.by_name(name).where(account_id: account_id).exists?
   end
 end
diff --git a/app/models/follow.rb b/app/models/follow.rb
index a5e3fe809..e5cecbbc1 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -11,6 +11,7 @@
 #  show_reblogs      :boolean          default(TRUE), not null
 #  uri               :string
 #  notify            :boolean          default(FALSE), not null
+#  languages         :string           is an Array
 #
 
 class Follow < ApplicationRecord
@@ -27,6 +28,7 @@ class Follow < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+  validates :languages, language: true
 
   scope :recent, -> { reorder(id: :desc) }
 
@@ -35,7 +37,7 @@ class Follow < ApplicationRecord
   end
 
   def revoke_request!
-    FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, notify: notify, uri: uri)
+    FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, notify: notify, languages: languages, uri: uri)
     destroy!
   end
 
diff --git a/app/models/follow_recommendation_filter.rb b/app/models/follow_recommendation_filter.rb
index acf03cd84..531332614 100644
--- a/app/models/follow_recommendation_filter.rb
+++ b/app/models/follow_recommendation_filter.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class FollowRecommendationFilter
+  include Redisable
+
   KEYS = %i(
     language
     status
@@ -17,7 +19,7 @@ class FollowRecommendationFilter
     if params['status'] == 'suppressed'
       Account.joins(:follow_recommendation_suppression).order(FollowRecommendationSuppression.arel_table[:id].desc).to_a
     else
-      account_ids = Redis.current.zrevrange("follow_recommendations:#{@language}", 0, -1).map(&:to_i)
+      account_ids = redis.zrevrange("follow_recommendations:#{@language}", 0, -1).map(&:to_i)
       accounts    = Account.where(id: account_ids).index_by(&:id)
 
       account_ids.map { |id| accounts[id] }.compact
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 0b6f7629a..9034250c0 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -11,6 +11,7 @@
 #  show_reblogs      :boolean          default(TRUE), not null
 #  uri               :string
 #  notify            :boolean          default(FALSE), not null
+#  languages         :string           is an Array
 #
 
 class FollowRequest < ApplicationRecord
@@ -27,9 +28,10 @@ class FollowRequest < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+  validates :languages, language: true
 
   def authorize!
-    account.follow!(target_account, reblogs: show_reblogs, notify: notify, uri: uri, bypass_limit: true)
+    account.follow!(target_account, reblogs: show_reblogs, notify: notify, languages: languages, uri: uri, bypass_limit: true)
     MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 4bf1775bb..473622edf 100644
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -6,7 +6,8 @@ class Form::AccountBatch
   include AccountableConcern
   include Payloadable
 
-  attr_accessor :account_ids, :action, :current_account
+  attr_accessor :account_ids, :action, :current_account,
+                :select_all_matching, :query
 
   def save
     case action
@@ -60,7 +61,11 @@ class Form::AccountBatch
   end
 
   def accounts
-    Account.where(id: account_ids)
+    if select_all_matching?
+      query
+    else
+      Account.where(id: account_ids)
+    end
   end
 
   def approve!
@@ -101,15 +106,19 @@ class Form::AccountBatch
 
   def reject_account(account)
     authorize(account.user, :reject?)
-    log_action(:reject, account.user, username: account.username)
+    log_action(:reject, account.user)
     account.suspend!(origin: :local)
-    AccountDeletionWorker.perform_async(account.id, reserve_username: false)
+    AccountDeletionWorker.perform_async(account.id, { 'reserve_username' => false })
   end
 
   def suspend_account(account)
     authorize(account, :suspend?)
     log_action(:suspend, account)
     account.suspend!(origin: :local)
+    account.strikes.create!(
+      account: current_account,
+      action: :suspend
+    )
     Admin::SuspensionWorker.perform_async(account.id)
   end
 
@@ -118,4 +127,8 @@ class Form::AccountBatch
     log_action(:approve, account.user)
     account.user.approve!
   end
+
+  def select_all_matching?
+    select_all_matching == '1'
+  end
 end
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 6fc7c56fd..431d33bcd 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -8,25 +8,19 @@ class Form::AdminSettings
     site_contact_email
     site_title
     site_short_description
-    site_description
     site_extended_description
     site_terms
     registrations_mode
     closed_registrations_message
-    open_deletion
     timeline_preview
-    show_staff_badge
     bootstrap_timeline_accounts
     theme
-    min_invite_role
     activity_api_enabled
     peers_api_enabled
-    show_known_fediverse_at_about_page
     preview_sensitive_media
     custom_css
     profile_directory
     thumbnail
-    hero
     mascot
     trends
     trendable_by_default
@@ -34,15 +28,21 @@ class Form::AdminSettings
     show_domain_blocks_rationale
     noindex
     require_invite_text
+    media_cache_retention_period
+    content_cache_retention_period
+    backups_retention_period
+  ).freeze
+
+  INTEGER_KEYS = %i(
+    media_cache_retention_period
+    content_cache_retention_period
+    backups_retention_period
   ).freeze
 
   BOOLEAN_KEYS = %i(
-    open_deletion
     timeline_preview
-    show_staff_badge
     activity_api_enabled
     peers_api_enabled
-    show_known_fediverse_at_about_page
     preview_sensitive_media
     profile_directory
     trends
@@ -53,54 +53,65 @@ class Form::AdminSettings
 
   UPLOAD_KEYS = %i(
     thumbnail
-    hero
     mascot
   ).freeze
 
   attr_accessor(*KEYS)
 
-  validates :site_short_description, :site_description, html: { wrap_with: :p }
-  validates :site_extended_description, :site_terms, :closed_registrations_message, html: true
-  validates :registrations_mode, inclusion: { in: %w(open approved none) }
-  validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) }
-  validates :site_contact_email, :site_contact_username, presence: true
-  validates :site_contact_username, existing_username: true
-  validates :bootstrap_timeline_accounts, existing_username: { multiple: true }
-  validates :show_domain_blocks, inclusion: { in: %w(disabled users all) }
-  validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }
+  validates :registrations_mode, inclusion: { in: %w(open approved none) }, if: -> { defined?(@registrations_mode) }
+  validates :site_contact_email, :site_contact_username, presence: true, if: -> { defined?(@site_contact_username) || defined?(@site_contact_email) }
+  validates :site_contact_username, existing_username: true, if: -> { defined?(@site_contact_username) }
+  validates :bootstrap_timeline_accounts, existing_username: { multiple: true }, if: -> { defined?(@bootstrap_timeline_accounts) }
+  validates :show_domain_blocks, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks) }
+  validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
+  validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
+  validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) }
 
-  def initialize(_attributes = {})
-    super
-    initialize_attributes
+  KEYS.each do |key|
+    define_method(key) do
+      return instance_variable_get("@#{key}") if instance_variable_defined?("@#{key}")
+
+      stored_value = begin
+        if UPLOAD_KEYS.include?(key)
+          SiteUpload.where(var: key).first_or_initialize(var: key)
+        else
+          Setting.public_send(key)
+        end
+      end
+
+      instance_variable_set("@#{key}", stored_value)
+    end
+  end
+
+  UPLOAD_KEYS.each do |key|
+    define_method("#{key}=") do |file|
+      value = public_send(key)
+      value.file = file
+    end
   end
 
   def save
     return false unless valid?
 
     KEYS.each do |key|
-      value = instance_variable_get("@#{key}")
+      next unless instance_variable_defined?("@#{key}")
 
-      if UPLOAD_KEYS.include?(key) && !value.nil?
-        upload = SiteUpload.where(var: key).first_or_initialize(var: key)
-        upload.update(file: value)
+      if UPLOAD_KEYS.include?(key)
+        public_send(key).save
       else
         setting = Setting.where(var: key).first_or_initialize(var: key)
-        setting.update(value: typecast_value(key, value))
+        setting.update(value: typecast_value(key, instance_variable_get("@#{key}")))
       end
     end
   end
 
   private
 
-  def initialize_attributes
-    KEYS.each do |key|
-      instance_variable_set("@#{key}", Setting.public_send(key)) if instance_variable_get("@#{key}").nil?
-    end
-  end
-
   def typecast_value(key, value)
     if BOOLEAN_KEYS.include?(key)
       value == '1'
+    elsif INTEGER_KEYS.include?(key)
+      value.blank? ? value : Integer(value)
     else
       value
     end
diff --git a/app/models/form/domain_block_batch.rb b/app/models/form/domain_block_batch.rb
new file mode 100644
index 000000000..39012df51
--- /dev/null
+++ b/app/models/form/domain_block_batch.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Form::DomainBlockBatch
+  include ActiveModel::Model
+  include Authorization
+  include AccountableConcern
+
+  attr_accessor :domain_blocks_attributes, :action, :current_account
+
+  def save
+    case action
+    when 'save'
+      save!
+    end
+  end
+
+  private
+
+  def domain_blocks
+    @domain_blocks ||= domain_blocks_attributes.values.filter_map do |attributes|
+      DomainBlock.new(attributes.without('enabled')) if ActiveModel::Type::Boolean.new.cast(attributes['enabled'])
+    end
+  end
+
+  def save!
+    domain_blocks.each do |domain_block|
+      authorize(domain_block, :create?)
+      next if DomainBlock.rule_for(domain_block.domain).present?
+
+      domain_block.save!
+      DomainBlockWorker.perform_async(domain_block.id)
+      log_action :create, domain_block
+    end
+  end
+end
diff --git a/app/models/form/email_domain_block_batch.rb b/app/models/form/email_domain_block_batch.rb
new file mode 100644
index 000000000..df120182b
--- /dev/null
+++ b/app/models/form/email_domain_block_batch.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Form::EmailDomainBlockBatch
+  include ActiveModel::Model
+  include Authorization
+  include AccountableConcern
+
+  attr_accessor :email_domain_block_ids, :action, :current_account
+
+  def save
+    case action
+    when 'delete'
+      delete!
+    end
+  end
+
+  private
+
+  def email_domain_blocks
+    @email_domain_blocks ||= EmailDomainBlock.where(id: email_domain_block_ids)
+  end
+
+  def delete!
+    email_domain_blocks.each do |email_domain_block|
+      authorize(email_domain_block, :destroy?)
+      email_domain_block.destroy!
+      log_action :destroy, email_domain_block
+    end
+  end
+end
diff --git a/app/models/form/redirect.rb b/app/models/form/redirect.rb
index 19ee9faed..3cd5731e6 100644
--- a/app/models/form/redirect.rb
+++ b/app/models/form/redirect.rb
@@ -31,8 +31,8 @@ class Form::Redirect
   private
 
   def set_target_account
-    @target_account = ResolveAccountService.new.call(acct)
-  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error
+    @target_account = ResolveAccountService.new.call(acct, skip_cache: true)
+  rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error, Addressable::URI::InvalidURIError
     # Validation will take care of it
   end
 
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb
deleted file mode 100644
index c4943a7ea..000000000
--- a/app/models/form/status_batch.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class Form::StatusBatch
-  include ActiveModel::Model
-  include AccountableConcern
-
-  attr_accessor :status_ids, :action, :current_account
-
-  def save
-    case action
-    when 'nsfw_on', 'nsfw_off'
-      change_sensitive(action == 'nsfw_on')
-    when 'delete'
-      delete_statuses
-    end
-  end
-
-  private
-
-  def change_sensitive(sensitive)
-    media_attached_status_ids = MediaAttachment.where(status_id: status_ids).pluck(:status_id)
-
-    ApplicationRecord.transaction do
-      Status.where(id: media_attached_status_ids).reorder(nil).find_each do |status|
-        status.update!(sensitive: sensitive)
-        log_action :update, status
-      end
-    end
-
-    true
-  rescue ActiveRecord::RecordInvalid
-    false
-  end
-
-  def delete_statuses
-    Status.where(id: status_ids).reorder(nil).find_each do |status|
-      status.discard
-      RemovalWorker.perform_async(status.id, immediate: true)
-      Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true)
-      log_action :destroy, status
-    end
-
-    true
-  end
-end
diff --git a/app/models/form/status_filter_batch_action.rb b/app/models/form/status_filter_batch_action.rb
new file mode 100644
index 000000000..d87bd5cc4
--- /dev/null
+++ b/app/models/form/status_filter_batch_action.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Form::StatusFilterBatchAction
+  include ActiveModel::Model
+  include AccountableConcern
+  include Authorization
+
+  attr_accessor :current_account, :type,
+                :status_filter_ids, :filter_id
+
+  def save!
+    process_action!
+  end
+
+  private
+
+  def status_filters
+    filter = current_account.custom_filters.find(filter_id)
+    filter.statuses.where(id: status_filter_ids)
+  end
+
+  def process_action!
+    return if status_filter_ids.empty?
+
+    case type
+    when 'remove'
+      handle_remove!
+    end
+  end
+
+  def handle_remove!
+    status_filters.destroy_all
+  end
+end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 8949be054..edbf02a6d 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -32,35 +32,33 @@ class Instance < ApplicationRecord
     @delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
   end
 
-  def following_count
-    @following_count ||= Follow.where(account: accounts).count
+  def purgeable?
+    unavailable? || domain_block&.suspend?
   end
 
-  def followers_count
-    @followers_count ||= Follow.where(target_account: accounts).count
+  def unavailable?
+    unavailable_domain.present?
   end
 
-  def reports_count
-    @reports_count ||= Report.where(target_account: accounts).count
-  end
-
-  def blocks_count
-    @blocks_count ||= Block.where(target_account: accounts).count
-  end
-
-  def public_comment
-    domain_block&.public_comment
-  end
-
-  def private_comment
-    domain_block&.private_comment
-  end
-
-  def media_storage
-    @media_storage ||= MediaAttachment.where(account: accounts).sum(:file_file_size)
+  def failing?
+    failure_days.present? || unavailable?
   end
 
   def to_param
     domain
   end
+
+  alias to_log_human_identifier to_param
+
+  delegate :exhausted_deliveries_days, to: :delivery_failure_tracker
+
+  def availability_over_days(num_days, end_date = Time.now.utc.to_date)
+    failures_map    = exhausted_deliveries_days.index_with { true }
+    period_end_at   = exhausted_deliveries_days.last || end_date
+    period_start_at = period_end_at - num_days.days
+
+    (period_start_at..period_end_at).map do |date|
+      [date, failures_map[date]]
+    end
+  end
 end
diff --git a/app/models/instance_filter.rb b/app/models/instance_filter.rb
index 9e533c4aa..1d94c919f 100644
--- a/app/models/instance_filter.rb
+++ b/app/models/instance_filter.rb
@@ -4,8 +4,7 @@ class InstanceFilter
   KEYS = %i(
     limited
     by_domain
-    warning
-    unavailable
+    availability
   ).freeze
 
   attr_reader :params
@@ -34,12 +33,21 @@ class InstanceFilter
       Instance.joins(:domain_allow).reorder(Arel.sql('domain_allows.id desc'))
     when 'by_domain'
       Instance.matches_domain(value)
-    when 'warning'
+    when 'availability'
+      availability_scope(value)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+
+  def availability_scope(value)
+    case value
+    when 'failing'
       Instance.where(domain: DeliveryFailureTracker.warning_domains)
     when 'unavailable'
       Instance.joins(:unavailable_domain)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown availability: #{value}"
     end
   end
 end
diff --git a/app/models/invite_filter.rb b/app/models/invite_filter.rb
index 9685d4abb..c1edb3871 100644
--- a/app/models/invite_filter.rb
+++ b/app/models/invite_filter.rb
@@ -31,7 +31,7 @@ class InviteFilter
     when 'expired'
       Invite.expired
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 end
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index aedd3ca0d..31343f0e1 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -16,16 +16,23 @@ class IpBlock < ApplicationRecord
   CACHE_KEY = 'blocked_ips'
 
   include Expireable
+  include Paginable
 
   enum severity: {
     sign_up_requires_approval: 5000,
+    sign_up_block: 5500,
     no_access: 9999,
   }
 
   validates :ip, :severity, presence: true
+  validates :ip, uniqueness: true
 
   after_commit :reset_cache
 
+  def to_log_human_identifier
+    "#{ip}/#{ip.prefix}"
+  end
+
   class << self
     def blocked?(remote_ip)
       blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(IpBlock.where(severity: :no_access).pluck(:ip)) }
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 1741d20e9..5916b0b4b 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -38,7 +38,13 @@ class MediaAttachment < ApplicationRecord
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
-  IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze
+  IMAGE_LIMIT = 10.megabytes
+  VIDEO_LIMIT = 40.megabytes
+
+  MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
+  MAX_VIDEO_FRAME_RATE   = 60
+
+  IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp .heic .heif .avif).freeze
   VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
   AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze
 
@@ -49,10 +55,11 @@ class MediaAttachment < ApplicationRecord
     small
   ).freeze
 
-  IMAGE_MIME_TYPES             = %w(image/jpeg image/png image/gif).freeze
+  IMAGE_MIME_TYPES             = %w(image/jpeg image/png image/gif image/heic image/heif image/webp image/avif).freeze
+  IMAGE_CONVERTIBLE_MIME_TYPES = %w(image/heic image/heif).freeze
   VIDEO_MIME_TYPES             = %w(video/webm video/mp4 video/quicktime video/ogg).freeze
   VIDEO_CONVERTIBLE_MIME_TYPES = %w(video/webm video/quicktime).freeze
-  AUDIO_MIME_TYPES             = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/ogg audio/vorbis audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/x-m4a audio/mp4 audio/3gpp video/x-ms-asf).freeze
+  AUDIO_MIME_TYPES             = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/vnd.wave audio/ogg audio/vorbis audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/x-m4a audio/mp4 audio/3gpp video/x-ms-asf).freeze
 
   BLURHASH_OPTIONS = {
     x_comp: 4,
@@ -66,15 +73,27 @@ class MediaAttachment < ApplicationRecord
     }.freeze,
 
     small: {
-      pixels: 160_000, # 400x400px
+      pixels: 230_400, # 640x360px
       file_geometry_parser: FastGeometryParser,
       blurhash: BLURHASH_OPTIONS,
     }.freeze,
   }.freeze
 
+  IMAGE_CONVERTED_STYLES = {
+    original: {
+      format: 'jpeg',
+      content_type: 'image/jpeg',
+    }.merge(IMAGE_STYLES[:original]).freeze,
+
+    small: {
+      format: 'jpeg',
+    }.merge(IMAGE_STYLES[:small]).freeze,
+  }.freeze
+
   VIDEO_FORMAT = {
     format: 'mp4',
     content_type: 'video/mp4',
+    vfr_frame_rate_threshold: MAX_VIDEO_FRAME_RATE,
     convert_options: {
       output: {
         'loglevel' => 'fatal',
@@ -85,6 +104,7 @@ class MediaAttachment < ApplicationRecord
         'c:v' => 'h264',
         'maxrate' => '1300K',
         'bufsize' => '1300K',
+        'b:v' => '1300K',
         'frames:v' => 60 * 60 * 3,
         'crf' => 18,
         'map_metadata' => '-1',
@@ -149,15 +169,9 @@ class MediaAttachment < ApplicationRecord
   }.freeze
 
   GLOBAL_CONVERT_OPTIONS = {
-    all: '-quality 90 -strip +set modify-date +set create-date',
+    all: '-quality 90 +profile "!icc,*" +set modify-date +set create-date',
   }.freeze
 
-  IMAGE_LIMIT = 10.megabytes
-  VIDEO_LIMIT = 40.megabytes
-
-  MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
-  MAX_VIDEO_FRAME_RATE   = 60
-
   belongs_to :account,          inverse_of: :media_attachments, optional: true
   belongs_to :status,           inverse_of: :media_attachments, optional: true
   belongs_to :scheduled_status, inverse_of: :media_attachments, optional: true
@@ -184,7 +198,7 @@ class MediaAttachment < ApplicationRecord
   remotable_attachment :thumbnail, IMAGE_LIMIT, suppress_errors: true, download_on_assign: false
 
   validates :account, presence: true
-  validates :description, length: { maximum: MAX_DESCRIPTION_LENGTH }, if: :local?
+  validates :description, length: { maximum: MAX_DESCRIPTION_LENGTH }
   validates :file, presence: true, if: :local?
   validates :thumbnail, absence: true, if: -> { local? && !audio_or_video? }
 
@@ -196,6 +210,8 @@ class MediaAttachment < ApplicationRecord
 
   default_scope { order(id: :asc) }
 
+  attr_accessor :skip_download
+
   def local?
     remote_url.blank?
   end
@@ -208,6 +224,10 @@ class MediaAttachment < ApplicationRecord
     file.blank? && remote_url.present?
   end
 
+  def significantly_changed?
+    description_previously_changed? || thumbnail_updated_at_previously_changed? || file_meta_previously_changed?
+  end
+
   def larger_media_format?
     video? || gifv? || audio?
   end
@@ -243,17 +263,16 @@ class MediaAttachment < ApplicationRecord
   attr_writer :delay_processing
 
   def delay_processing?
-    @delay_processing
+    @delay_processing && larger_media_format?
   end
 
   def delay_processing_for_attachment?(attachment_name)
-    @delay_processing && attachment_name == :file
+    delay_processing? && attachment_name == :file
   end
 
   after_commit :enqueue_processing, on: :create
   after_commit :reset_parent_cache, on: :update
 
-  before_create :prepare_description, unless: :local?
   before_create :set_unknown_type
   before_create :set_processing
 
@@ -273,6 +292,8 @@ class MediaAttachment < ApplicationRecord
     def file_styles(attachment)
       if attachment.instance.file_content_type == 'image/gif' || VIDEO_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
         VIDEO_CONVERTED_STYLES
+      elsif IMAGE_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
+        IMAGE_CONVERTED_STYLES
       elsif IMAGE_MIME_TYPES.include?(attachment.instance.file_content_type)
         IMAGE_STYLES
       elsif VIDEO_MIME_TYPES.include?(attachment.instance.file_content_type)
@@ -301,10 +322,6 @@ class MediaAttachment < ApplicationRecord
     self.type = :unknown if file.blank? && !type_changed?
   end
 
-  def prepare_description
-    self.description = description.strip[0...MAX_DESCRIPTION_LENGTH] unless description.nil?
-  end
-
   def set_type_and_extension
     self.type = begin
       if VIDEO_MIME_TYPES.include?(file_content_type)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3bf9dd483..bbc63c1c0 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -35,6 +35,9 @@ class Notification < ApplicationRecord
     follow_request
     favourite
     poll
+    update
+    admin.sign_up
+    admin.report
   ).freeze
 
   TARGET_STATUS_INCLUDES_BY_TYPE = {
@@ -43,6 +46,8 @@ class Notification < ApplicationRecord
     mention: [mention: :status],
     favourite: [favourite: :status],
     poll: [poll: :status],
+    update: :status,
+    'admin.report': [report: :target_account],
   }.freeze
 
   belongs_to :account, optional: true
@@ -55,28 +60,19 @@ class Notification < ApplicationRecord
   belongs_to :follow_request, foreign_key: 'activity_id', optional: true
   belongs_to :favourite,      foreign_key: 'activity_id', optional: true
   belongs_to :poll,           foreign_key: 'activity_id', optional: true
+  belongs_to :report,         foreign_key: 'activity_id', optional: true
 
   validates :type, inclusion: { in: TYPES }
 
   scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }
 
-  scope :browserable, ->(exclude_types = [], account_id = nil) {
-    types = TYPES - exclude_types.map(&:to_sym)
-
-    if account_id.nil?
-      where(type: types)
-    else
-      where(type: types, from_account_id: account_id)
-    end
-  }
-
   def type
     @type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym
   end
 
   def target_status
     case type
-    when :status
+    when :status, :update
       status
     when :reblog
       status&.reblog
@@ -90,6 +86,23 @@ class Notification < ApplicationRecord
   end
 
   class << self
+    def browserable(types: [], exclude_types: [], from_account_id: nil)
+      requested_types = begin
+        if types.empty?
+          TYPES
+        else
+          types.map(&:to_sym) & TYPES
+        end
+      end
+
+      requested_types -= exclude_types.map(&:to_sym)
+
+      all.tap do |scope|
+        scope.merge!(where(from_account_id: from_account_id)) if from_account_id.present?
+        scope.merge!(where(type: requested_types)) unless requested_types.size == TYPES.size
+      end
+    end
+
     def preload_cache_collection_target_statuses(notifications, &_block)
       notifications.group_by(&:type).each do |type, grouped_notifications|
         associations = TARGET_STATUS_INCLUDES_BY_TYPE[type]
@@ -110,7 +123,7 @@ class Notification < ApplicationRecord
         cached_status = cached_statuses_by_id[notification.target_status.id]
 
         case notification.type
-        when :status
+        when :status, :update
           notification.status = cached_status
         when :reblog
           notification.status.reblog = cached_status
@@ -136,10 +149,12 @@ class Notification < ApplicationRecord
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id
+    when 'Account'
+      self.from_account_id = activity&.id
     end
   end
 end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index d2a17277b..af3b09315 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -26,6 +26,7 @@ class Poll < ApplicationRecord
   belongs_to :status
 
   has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :delete_all
+  has_many :voters, -> { group('accounts.id') }, through: :votes, class_name: 'Account', source: :account
 
   has_many :notifications, as: :activity, dependent: :destroy
 
@@ -38,13 +39,12 @@ class Poll < ApplicationRecord
 
   before_validation :prepare_options, if: :local?
   before_validation :prepare_votes_count
-
-  after_initialize :prepare_cached_tallies
+  before_validation :prepare_cached_tallies
 
   after_commit :reset_parent_cache, on: :update
 
   def loaded_options
-    options.map.with_index { |title, key| Option.new(self, key.to_s, title, show_totals_now? ? cached_tallies[key] : nil) }
+    options.map.with_index { |title, key| Option.new(self, key.to_s, title, show_totals_now? ? (cached_tallies[key] || 0) : nil) }
   end
 
   def possibly_stale?
@@ -82,6 +82,13 @@ class Poll < ApplicationRecord
     end
   end
 
+  def reset_votes!
+    self.cached_tallies = options.map { 0 }
+    self.votes_count = 0
+    self.voters_count = 0
+    votes.delete_all unless new_record?
+  end
+
   private
 
   def prepare_cached_tallies
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 0f9e23fa1..56ca62d5e 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -34,7 +34,7 @@
 class PreviewCard < ApplicationRecord
   include Attachmentable
 
-  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
+  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
   LIMIT = 1.megabytes
 
   BLURHASH_OPTIONS = {
@@ -48,8 +48,9 @@ class PreviewCard < ApplicationRecord
   enum link_type: [:unknown, :article]
 
   has_and_belongs_to_many :statuses
+  has_one :trend, class_name: 'PreviewCardTrend', inverse_of: :preview_card, dependent: :destroy
 
-  has_attached_file :image, processors: [:thumbnail, :blurhash_transcoder], styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 80 -strip' }, validate_media_type: false
+  has_attached_file :image, processors: [:thumbnail, :blurhash_transcoder], styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 90 +profile "!icc,*" +set modify-date +set create-date' }, validate_media_type: false
 
   validates :url, presence: true, uniqueness: true
   validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES
@@ -80,6 +81,10 @@ class PreviewCard < ApplicationRecord
     end
   end
 
+  def requires_review?
+    attributes['trendable'].nil? && (provider.nil? || provider.requires_review?)
+  end
+
   def requires_review_notification?
     attributes['trendable'].nil? && (provider.nil? || provider.requires_review_notification?)
   end
@@ -117,7 +122,7 @@ class PreviewCard < ApplicationRecord
         original: {
           geometry: '400x400>',
           file_geometry_parser: FastGeometryParser,
-          convert_options: '-coalesce -strip',
+          convert_options: '-coalesce',
           blurhash: BLURHASH_OPTIONS,
         },
       }
diff --git a/app/models/preview_card_filter.rb b/app/models/preview_card_filter.rb
deleted file mode 100644
index 8dda9989c..000000000
--- a/app/models/preview_card_filter.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-class PreviewCardFilter
-  KEYS = %i(
-    trending
-  ).freeze
-
-  attr_reader :params
-
-  def initialize(params)
-    @params = params
-  end
-
-  def results
-    scope = PreviewCard.unscoped
-
-    params.each do |key, value|
-      next if key.to_s == 'page'
-
-      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
-    end
-
-    scope
-  end
-
-  private
-
-  def scope_for(key, value)
-    case key.to_s
-    when 'trending'
-      trending_scope(value)
-    else
-      raise "Unknown filter: #{key}"
-    end
-  end
-
-  def trending_scope(value)
-    ids = begin
-      case value.to_s
-      when 'allowed'
-        Trends.links.currently_trending_ids(true, -1)
-      else
-        Trends.links.currently_trending_ids(false, -1)
-      end
-    end
-
-    if ids.empty?
-      PreviewCard.none
-    else
-      PreviewCard.joins("join unnest(array[#{ids.map(&:to_i).join(',')}]::integer[]) with ordinality as x (id, ordering) on preview_cards.id = x.id").order('x.ordering')
-    end
-  end
-end
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 15b24e2bd..d61fe6020 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -25,7 +25,7 @@ class PreviewCardProvider < ApplicationRecord
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
-  has_attached_file :icon, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }, validate_media_type: false
+  has_attached_file :icon, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set modify-date +set create-date' } }, validate_media_type: false
   validates_attachment :icon, content_type: { content_type: ICON_MIME_TYPES }, size: { less_than: LIMIT }
   remotable_attachment :icon, LIMIT
 
diff --git a/app/models/preview_card_trend.rb b/app/models/preview_card_trend.rb
new file mode 100644
index 000000000..018400dfa
--- /dev/null
+++ b/app/models/preview_card_trend.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: preview_card_trends
+#
+#  id              :bigint(8)        not null, primary key
+#  preview_card_id :bigint(8)        not null
+#  score           :float            default(0.0), not null
+#  rank            :integer          default(0), not null
+#  allowed         :boolean          default(FALSE), not null
+#  language        :string
+#
+class PreviewCardTrend < ApplicationRecord
+  belongs_to :preview_card
+  scope :allowed, -> { where(allowed: true) }
+end
diff --git a/app/models/privacy_policy.rb b/app/models/privacy_policy.rb
new file mode 100644
index 000000000..36cbf1882
--- /dev/null
+++ b/app/models/privacy_policy.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class PrivacyPolicy < ActiveModelSerializers::Model
+  DEFAULT_PRIVACY_POLICY = <<~TXT
+    This privacy policy describes how %{domain} ("%{domain}", "we", "us") collects, protects and uses the personally identifiable information you may provide through the %{domain} website or its API. The policy also describes the choices available to you regarding our use of your personal information and how you can access and update this information. This policy does not apply to the practices of companies that %{domain} does not own or control, or to individuals that %{domain} does not employ or manage.
+
+    # What information do we collect?
+
+    - **Basic account information**: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
+    - **Posts, following and other public information**: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+    - **Direct and followers-only posts**: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. **Please keep in mind that the operators of the server and any receiving server may view such messages**, and that recipients may screenshot, copy or otherwise re-share them. **Do not share any sensitive information over Mastodon.**
+    - **IPs and other metadata**: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
+
+    # What do we use your information for?
+
+    Any of the information we collect from you may be used in the following ways:
+
+    - To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+    - To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+    - The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
+
+    # How do we protect your information?
+
+    We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.
+
+    # What is our data retention policy?
+
+    We will make a good faith effort to:
+
+    - Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+    - Retain the IP addresses associated with registered users no more than 12 months.
+
+    You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
+
+    You may irreversibly delete your account at any time.
+
+    # Do we use cookies?
+
+    Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+
+    We use cookies to understand and save your preferences for future visits.
+
+    # Do we disclose any information to outside parties?
+
+    We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.
+
+    Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.
+
+    When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.
+
+    # Site usage by children
+
+    If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.
+
+    If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
+
+    Law requirements can be different if this server is in another jurisdiction.
+
+    ___
+
+    This document is CC-BY-SA. Originally adapted from the [Discourse privacy policy](https://github.com/discourse/discourse).
+  TXT
+
+  DEFAULT_UPDATED_AT = DateTime.new(2022, 10, 7).freeze
+
+  attributes :updated_at, :text
+
+  def self.current
+    custom = Setting.find_by(var: 'site_terms')
+
+    if custom&.value.present?
+      new(text: custom.value, updated_at: custom.updated_at)
+    else
+      new(text: DEFAULT_PRIVACY_POLICY, updated_at: DEFAULT_UPDATED_AT)
+    end
+  end
+end
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index 5e4c3e1ce..1cfd9a500 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -27,6 +27,7 @@ class PublicFeed
     scope.merge!(remote_only_scope) if remote_only?
     scope.merge!(account_filters_scope) if account?
     scope.merge!(media_only_scope) if media_only?
+    scope.merge!(language_scope) if account&.chosen_languages.present?
 
     scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end
@@ -83,10 +84,13 @@ class PublicFeed
     Status.joins(:media_attachments).group(:id)
   end
 
+  def language_scope
+    Status.where(language: account.chosen_languages)
+  end
+
   def account_filters_scope
     Status.not_excluded_by_account(account).tap do |scope|
       scope.merge!(Status.not_domain_blocked_by_account(account)) unless local_only?
-      scope.merge!(Status.in_chosen_languages(account)) if account.chosen_languages.present?
     end
   end
 end
diff --git a/app/models/relationship_filter.rb b/app/models/relationship_filter.rb
index 9135ff144..249fe3df8 100644
--- a/app/models/relationship_filter.rb
+++ b/app/models/relationship_filter.rb
@@ -53,7 +53,7 @@ class RelationshipFilter
     when 'activity'
       activity_scope(value)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 
@@ -68,7 +68,7 @@ class RelationshipFilter
     when 'invited'
       Account.joins(user: :invite).merge(Invite.where(user: account.user)).eager_load(:account_stat).reorder(nil)
     else
-      raise "Unknown relationship: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown relationship: #{value}"
     end
   end
 
@@ -83,7 +83,7 @@ class RelationshipFilter
     when 'remote'
       Account.remote
     else
-      raise "Unknown location: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown location: #{value}"
     end
   end
 
@@ -94,7 +94,7 @@ class RelationshipFilter
     when 'primary'
       Account.where(moved_to_account_id: nil)
     else
-      raise "Unknown status: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
     end
   end
 
@@ -105,7 +105,7 @@ class RelationshipFilter
     when 'recent'
       params[:relationship] == 'invited' ? Account.recent : Follow.recent
     else
-      raise "Unknown order: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown order: #{value}"
     end
   end
 
@@ -114,7 +114,7 @@ class RelationshipFilter
     when 'dormant'
       AccountStat.where(last_status_at: nil).or(AccountStat.where(AccountStat.arel_table[:last_status_at].lt(1.month.ago)))
     else
-      raise "Unknown activity: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown activity: #{value}"
     end
   end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
index ef41547d9..525d22ad5 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -6,7 +6,6 @@
 #  id                         :bigint(8)        not null, primary key
 #  status_ids                 :bigint(8)        default([]), not null, is an Array
 #  comment                    :text             default(""), not null
-#  action_taken               :boolean          default(FALSE), not null
 #  created_at                 :datetime         not null
 #  updated_at                 :datetime         not null
 #  account_id                 :bigint(8)        not null
@@ -15,9 +14,14 @@
 #  assigned_account_id        :bigint(8)
 #  uri                        :string
 #  forwarded                  :boolean
+#  category                   :integer          default("other"), not null
+#  action_taken_at            :datetime
+#  rule_ids                   :bigint(8)        is an Array
 #
 
 class Report < ApplicationRecord
+  self.ignored_columns = %w(action_taken)
+
   include Paginable
   include RateLimitable
 
@@ -29,12 +33,22 @@ class Report < ApplicationRecord
   belongs_to :assigned_account, class_name: 'Account', optional: true
 
   has_many :notes, class_name: 'ReportNote', foreign_key: :report_id, inverse_of: :report, dependent: :destroy
+  has_many :notifications, as: :activity, dependent: :destroy
 
-  scope :unresolved, -> { where(action_taken: false) }
-  scope :resolved,   -> { where(action_taken: true) }
+  scope :unresolved, -> { where(action_taken_at: nil) }
+  scope :resolved,   -> { where.not(action_taken_at: nil) }
   scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
 
-  validates :comment, length: { maximum: 1000 }
+  validates :comment, length: { maximum: 1_000 }
+  validates :rule_ids, absence: true, unless: :violation?
+
+  validate :validate_rule_ids
+
+  enum category: {
+    other: 0,
+    spam: 1_000,
+    violation: 2_000,
+  }
 
   def local?
     false # Force uri_for to use uri attribute
@@ -42,16 +56,34 @@ class Report < ApplicationRecord
 
   before_validation :set_uri, only: :create
 
+  after_create_commit :trigger_webhooks
+
   def object_type
     :flag
   end
 
   def statuses
-    Status.with_discarded.where(id: status_ids).includes(:account, :media_attachments, :mentions)
+    Status.with_discarded.where(id: status_ids)
   end
 
-  def media_attachments
-    MediaAttachment.where(status_id: status_ids)
+  def media_attachments_count
+    statuses_to_query = []
+    count = 0
+
+    statuses.pluck(:id, :ordered_media_attachment_ids).each do |id, ordered_ids|
+      if ordered_ids.nil?
+        statuses_to_query << id
+      else
+        count += ordered_ids.size
+      end
+    end
+
+    count += MediaAttachment.where(status_id: statuses_to_query).count unless statuses_to_query.empty?
+    count
+  end
+
+  def rules
+    Rule.with_discarded.where(id: rule_ids)
   end
 
   def assign_to_self!(current_account)
@@ -63,22 +95,19 @@ class Report < ApplicationRecord
   end
 
   def resolve!(acting_account)
-    if account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
-      # This is an automated report and it is being dismissed, so it's
-      # a false positive, in which case update the account's trust level
-      # to prevent further spam checks
-
-      target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
-    end
-
-    RemovalWorker.push_bulk(Status.with_discarded.discarded.where(id: status_ids).pluck(:id)) { |status_id| [status_id, { immediate: true }] }
-    update!(action_taken: true, action_taken_by_account_id: acting_account.id)
+    update!(action_taken_at: Time.now.utc, action_taken_by_account_id: acting_account.id)
   end
 
   def unresolve!
-    update!(action_taken: false, action_taken_by_account_id: nil)
+    update!(action_taken_at: nil, action_taken_by_account_id: nil)
   end
 
+  def action_taken?
+    action_taken_at.present?
+  end
+
+  alias action_taken action_taken?
+
   def unresolved?
     !action_taken?
   end
@@ -87,33 +116,44 @@ class Report < ApplicationRecord
     Report.where.not(id: id).where(target_account_id: target_account_id).unresolved.exists?
   end
 
-  def history
-    time_range = created_at..updated_at
+  def to_log_human_identifier
+    id
+  end
 
-    sql = [
+  def history
+    subquery = [
       Admin::ActionLog.where(
         target_type: 'Report',
-        target_id: id,
-        created_at: time_range
-      ).unscope(:order),
+        target_id: id
+      ).unscope(:order).arel,
 
       Admin::ActionLog.where(
         target_type: 'Account',
-        target_id: target_account_id,
-        created_at: time_range
-      ).unscope(:order),
+        target_id: target_account_id
+      ).unscope(:order).arel,
 
       Admin::ActionLog.where(
         target_type: 'Status',
-        target_id: status_ids,
-        created_at: time_range
-      ).unscope(:order),
-    ].map { |query| "(#{query.to_sql})" }.join(' UNION ALL ')
+        target_id: status_ids
+      ).unscope(:order).arel,
+    ].reduce { |union, query| Arel::Nodes::UnionAll.new(union, query) }
 
-    Admin::ActionLog.from("(#{sql}) AS admin_action_logs")
+    Admin::ActionLog.from(Arel::Nodes::As.new(subquery, Admin::ActionLog.arel_table))
   end
 
+  private
+
   def set_uri
     self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? && account.local?
   end
+
+  def validate_rule_ids
+    return unless violation?
+
+    errors.add(:rule_ids, I18n.t('reports.errors.invalid_rules')) unless rules.size == rule_ids&.size
+  end
+
+  def trigger_webhooks
+    TriggerWebhookWorker.perform_async('report.created', 'Report', id)
+  end
 end
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
index ee5825108..c9b3bce2d 100644
--- a/app/models/report_filter.rb
+++ b/app/models/report_filter.rb
@@ -2,10 +2,10 @@
 
 class ReportFilter
   KEYS = %i(
-    status
+    resolved
     account_id
     target_account_id
-    target_domain
+    by_target_domain
     target_origin
   ).freeze
 
@@ -16,10 +16,10 @@ class ReportFilter
   end
 
   def results
-    scope = Report.order(id: :desc)
+    scope = Report.unresolved
 
     params.each do |key, value|
-      scope = scope.merge scope_for(key, value)
+      scope = scope.merge scope_for(key, value), rewhere: true
     end
 
     scope
@@ -27,10 +27,10 @@ class ReportFilter
 
   def scope_for(key, value)
     case key.to_sym
-    when :target_domain
+    when :by_target_domain
       Report.where(target_account: Account.where(domain: value))
-    when :status
-      status_scope(value)
+    when :resolved
+      Report.resolved
     when :account_id
       Report.where(account_id: value)
     when :target_account_id
@@ -38,7 +38,7 @@ class ReportFilter
     when :target_origin
       target_origin_scope(value)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 
@@ -49,18 +49,7 @@ class ReportFilter
     when :remote
       Report.where(target_account: Account.remote)
     else
-      raise "Unknown value: #{value}"
-    end
-  end
-
-  def status_scope(value)
-    case value.to_sym
-    when :resolved
-      Report.resolved
-    when :unresolved
-      Report.unresolved
-    else
-      raise "Unknown value: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown value: #{value}"
     end
   end
 end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index 7b62f2b35..602e5d587 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -18,5 +18,5 @@ class Rule < ApplicationRecord
 
   validates :text, presence: true, length: { maximum: 300 }
 
-  scope :ordered, -> { kept.order(priority: :asc) }
+  scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
 end
diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index cf10b30fc..167131fdd 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -12,10 +12,35 @@
 #  meta              :json
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
+#  blurhash          :string
 #
 
 class SiteUpload < ApplicationRecord
-  has_attached_file :file
+  include Attachmentable
+
+  STYLES = {
+    thumbnail: {
+      '@1x': {
+        format: 'png',
+        geometry: '1200x630#',
+        file_geometry_parser: FastGeometryParser,
+        blurhash: {
+          x_comp: 4,
+          y_comp: 4,
+        }.freeze,
+      },
+
+      '@2x': {
+        format: 'png',
+        geometry: '2400x1260#',
+        file_geometry_parser: FastGeometryParser,
+      }.freeze,
+    }.freeze,
+
+    mascot: {}.freeze,
+  }.freeze
+
+  has_attached_file :file, styles: ->(file) { STYLES[file.instance.var.to_sym] }, convert_options: { all: '-coalesce +profile "!icc,*" +set modify-date +set create-date' }, processors: [:lazy_thumbnail, :blurhash_transcoder, :type_corrector]
 
   validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
   validates :file, presence: true
diff --git a/app/models/status.rb b/app/models/status.rb
index 749a23718..2fe9f2de0 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -3,26 +3,29 @@
 #
 # Table name: statuses
 #
-#  id                     :bigint(8)        not null, primary key
-#  uri                    :string
-#  text                   :text             default(""), not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  in_reply_to_id         :bigint(8)
-#  reblog_of_id           :bigint(8)
-#  url                    :string
-#  sensitive              :boolean          default(FALSE), not null
-#  visibility             :integer          default("public"), not null
-#  spoiler_text           :text             default(""), not null
-#  reply                  :boolean          default(FALSE), not null
-#  language               :string
-#  conversation_id        :bigint(8)
-#  local                  :boolean
-#  account_id             :bigint(8)        not null
-#  application_id         :bigint(8)
-#  in_reply_to_account_id :bigint(8)
-#  poll_id                :bigint(8)
-#  deleted_at             :datetime
+#  id                           :bigint(8)        not null, primary key
+#  uri                          :string
+#  text                         :text             default(""), not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  in_reply_to_id               :bigint(8)
+#  reblog_of_id                 :bigint(8)
+#  url                          :string
+#  sensitive                    :boolean          default(FALSE), not null
+#  visibility                   :integer          default("public"), not null
+#  spoiler_text                 :text             default(""), not null
+#  reply                        :boolean          default(FALSE), not null
+#  language                     :string
+#  conversation_id              :bigint(8)
+#  local                        :boolean
+#  account_id                   :bigint(8)        not null
+#  application_id               :bigint(8)
+#  in_reply_to_account_id       :bigint(8)
+#  poll_id                      :bigint(8)
+#  deleted_at                   :datetime
+#  edited_at                    :datetime
+#  trendable                    :boolean
+#  ordered_media_attachment_ids :bigint(8)        is an Array
 #
 
 class Status < ApplicationRecord
@@ -32,6 +35,7 @@ class Status < ApplicationRecord
   include Paginable
   include Cacheable
   include StatusThreadingConcern
+  include StatusSnapshotConcern
   include RateLimitable
 
   rate_limit by: :account, family: :statuses
@@ -59,8 +63,10 @@ class Status < ApplicationRecord
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
   has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
+  has_many :reblogged_by_accounts, through: :reblogs, class_name: 'Account', source: :account
   has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
   has_many :mentions, dependent: :destroy, inverse_of: :status
+  has_many :mentioned_accounts, through: :mentions, source: :account, class_name: 'Account'
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status
   has_many :media_attachments, dependent: :nullify
 
@@ -70,6 +76,7 @@ class Status < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
   has_one :status_stat, inverse_of: :status
   has_one :poll, inverse_of: :status, dependent: :destroy
+  has_one :trend, class_name: 'StatusTrend', inverse_of: :status
 
   validates :uri, uniqueness: true, presence: true, unless: :local?
   validates :text, presence: true, unless: -> { with_media? || reblog? }
@@ -90,21 +97,17 @@ class Status < ApplicationRecord
   scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
   scope :with_public_visibility, -> { where(visibility: :public) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
-  scope :in_chosen_languages, ->(account) { where(language: nil).or where(language: account.chosen_languages) }
   scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
   scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
   scope :tagged_with_all, ->(tag_ids) {
-    Array(tag_ids).reduce(self) do |result, id|
+    Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
       result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
     end
   }
   scope :tagged_with_none, ->(tag_ids) {
-    Array(tag_ids).reduce(self) do |result, id|
-      result.joins("LEFT OUTER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
-            .where("t#{id}.tag_id IS NULL")
-    end
+    where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
   }
 
   cache_associated :application,
@@ -139,20 +142,39 @@ class Status < ApplicationRecord
     ids << account_id if local?
 
     if preloaded.nil?
-      ids += mentions.where(account: Account.local, silent: false).pluck(:account_id)
-      ids += favourites.where(account: Account.local).pluck(:account_id)
-      ids += reblogs.where(account: Account.local).pluck(:account_id)
-      ids += bookmarks.where(account: Account.local).pluck(:account_id)
+      ids += mentions.joins(:account).merge(Account.local).active.pluck(:account_id)
+      ids += favourites.joins(:account).merge(Account.local).pluck(:account_id)
+      ids += reblogs.joins(:account).merge(Account.local).pluck(:account_id)
+      ids += bookmarks.joins(:account).merge(Account.local).pluck(:account_id)
+      ids += poll.votes.joins(:account).merge(Account.local).pluck(:account_id) if poll.present?
     else
       ids += preloaded.mentions[id] || []
       ids += preloaded.favourites[id] || []
       ids += preloaded.reblogs[id] || []
       ids += preloaded.bookmarks[id] || []
+      ids += preloaded.votes[id] || []
     end
 
     ids.uniq
   end
 
+  def searchable_text
+    [
+      spoiler_text,
+      FormattingHelper.extract_status_plain_text(self),
+      preloadable_poll ? preloadable_poll.options.join("\n\n") : nil,
+      ordered_media_attachments.map(&:description).join("\n\n"),
+    ].compact.join("\n\n")
+  end
+
+  def to_log_human_identifier
+    account.acct
+  end
+
+  def to_log_permalink
+    ActivityPub::TagManager.instance.uri_for(self)
+  end
+
   def reply?
     !in_reply_to_id.nil? || attributes['reply']
   end
@@ -212,7 +234,11 @@ class Status < ApplicationRecord
   alias sign? distributable?
 
   def with_media?
-    media_attachments.any?
+    ordered_media_attachments.any?
+  end
+
+  def with_preview_card?
+    preview_cards.any?
   end
 
   def non_sensitive_with_media?
@@ -232,6 +258,15 @@ class Status < ApplicationRecord
     @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
   end
 
+  def ordered_media_attachments
+    if ordered_media_attachment_ids.nil?
+      media_attachments
+    else
+      map = media_attachments.index_by(&:id)
+      ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
+    end
+  end
+
   def replies_count
     status_stat&.replies_count || 0
   end
@@ -252,6 +287,22 @@ class Status < ApplicationRecord
     update_status_stat!(key => [public_send(key) - 1, 0].max)
   end
 
+  def trendable?
+    if attributes['trendable'].nil?
+      account.trendable?
+    else
+      attributes['trendable']
+    end
+  end
+
+  def requires_review?
+    attributes['trendable'].nil? && account.requires_review?
+  end
+
+  def requires_review_notification?
+    attributes['trendable'].nil? && account.requires_review_notification?
+  end
+
   after_create_commit  :increment_counter_caches
   after_destroy_commit :decrement_counter_caches
 
@@ -313,28 +364,6 @@ class Status < ApplicationRecord
       end
     end
 
-    def permitted_for(target_account, account)
-      visibility = [:public, :unlisted]
-
-      if account.nil?
-        where(visibility: visibility)
-      elsif target_account.blocking?(account) || (account.domain.present? && target_account.domain_blocking?(account.domain)) # get rid of blocked peeps
-        none
-      elsif account.id == target_account.id # author can see own stuff
-        all
-      else
-        # followers can see followers-only stuff, but also things they are mentioned in.
-        # non-followers can see everything that isn't private/direct, but can see stuff they are mentioned in.
-        visibility.push(:private) if account.following?(target_account)
-
-        scope = left_outer_joins(:reblog)
-
-        scope.where(visibility: visibility)
-             .or(scope.where(id: account.mentions.select(:status_id)))
-             .merge(scope.where(reblog_of_id: nil).or(scope.where.not(reblogs_statuses: { account_id: account.excluded_from_timeline_account_ids })))
-      end
-    end
-
     def from_text(text)
       return [] if text.blank?
 
@@ -355,6 +384,69 @@ class Status < ApplicationRecord
     super || build_status_stat
   end
 
+  # Hack to use a "INSERT INTO ... SELECT ..." query instead of "INSERT INTO ... VALUES ..." query
+  def self._insert_record(values)
+    if values.is_a?(Hash) && values['reblog_of_id'].present?
+      primary_key = self.primary_key
+      primary_key_value = nil
+
+      if primary_key
+        primary_key_value = values[primary_key]
+
+        if !primary_key_value && prefetch_primary_key?
+          primary_key_value = next_sequence_value
+          values[primary_key] = primary_key_value
+        end
+      end
+
+      # The following line is where we differ from stock ActiveRecord implementation
+      im = _compile_reblog_insert(values)
+
+      # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible.
+      # For our purposes, it's equivalent to a foreign key constraint violation
+      result = connection.insert(im, "#{self} Create", primary_key || false, primary_key_value)
+      raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id']}) is not present in table \"statuses\"" if result.nil?
+
+      result
+    else
+      super
+    end
+  end
+
+  def self._compile_reblog_insert(values)
+    # This is somewhat equivalent to the following code of ActiveRecord::Persistence:
+    # `arel_table.compile_insert(_substitute_values(values))`
+    # The main difference is that we use a `SELECT` instead of a `VALUES` clause,
+    # which means we have to build the `SELECT` clause ourselves and do a bit more
+    # manual work.
+
+    # Instead of using Arel::InsertManager#values, we are going to use Arel::InsertManager#select
+    im = Arel::InsertManager.new
+    im.into(arel_table)
+
+    binds = []
+    reblog_bind = nil
+    values.each do |name, value|
+      attr = arel_table[name]
+      bind = predicate_builder.build_bind_attribute(attr.name, value)
+
+      im.columns << attr
+      binds << bind
+
+      reblog_bind = bind if name == 'reblog_of_id'
+    end
+
+    im.select(arel_table.where(arel_table[:id].eq(reblog_bind)).where(arel_table[:deleted_at].eq(nil)).project(*binds))
+
+    im
+  end
+
+  def discard_with_reblogs
+    discard_time = Time.current
+    Status.unscoped.where(reblog_of_id: id, deleted_at: [nil, deleted_at]).in_batches.update_all(deleted_at: discard_time) unless reblog?
+    update_attribute(:deleted_at, discard_time)
+  end
+
   private
 
   def update_status_stat!(attrs)
@@ -377,7 +469,7 @@ class Status < ApplicationRecord
   end
 
   def set_poll_id
-    update_column(:poll_id, poll.id) unless poll.nil?
+    update_column(:poll_id, poll.id) if association(:poll).loaded? && poll.present?
   end
 
   def set_visibility
@@ -436,8 +528,8 @@ class Status < ApplicationRecord
   def unlink_from_conversations
     return unless direct_visibility?
 
-    mentioned_accounts = (association(:mentions).loaded? ? mentions : mentions.includes(:account)).map(&:account)
-    inbox_owners       = mentioned_accounts.select(&:local?) + (account.local? ? [account] : [])
+    inbox_owners = mentioned_accounts.local
+    inbox_owners += [account] if account.local?
 
     inbox_owners.each do |inbox_owner|
       AccountConversation.remove_status(inbox_owner, self)
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
new file mode 100644
index 000000000..e33470226
--- /dev/null
+++ b/app/models/status_edit.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: status_edits
+#
+#  id                           :bigint(8)        not null, primary key
+#  status_id                    :bigint(8)        not null
+#  account_id                   :bigint(8)
+#  text                         :text             default(""), not null
+#  spoiler_text                 :text             default(""), not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  ordered_media_attachment_ids :bigint(8)        is an Array
+#  media_descriptions           :text             is an Array
+#  poll_options                 :string           is an Array
+#  sensitive                    :boolean
+#
+
+class StatusEdit < ApplicationRecord
+  include RateLimitable
+
+  self.ignored_columns = %w(
+    media_attachments_changed
+  )
+
+  class PreservedMediaAttachment < ActiveModelSerializers::Model
+    attributes :media_attachment, :description
+
+    delegate :id, :type, :url, :preview_url, :remote_url,
+             :preview_remote_url, :text_url, :meta, :blurhash,
+             :not_processed?, :needs_redownload?, :local?,
+             :file, :thumbnail, :thumbnail_remote_url,
+             :shortcode, :video?, :audio?, to: :media_attachment
+  end
+
+  rate_limit by: :account, family: :statuses
+
+  belongs_to :status
+  belongs_to :account, optional: true
+
+  default_scope { order(id: :asc) }
+
+  delegate :local?, :application, :edited?, :edited_at,
+           :discarded?, :visibility, to: :status
+
+  def emojis
+    return @emojis if defined?(@emojis)
+    @emojis = CustomEmoji.from_text([spoiler_text, text].join(' '), status.account.domain)
+  end
+
+  def ordered_media_attachments
+    return @ordered_media_attachments if defined?(@ordered_media_attachments)
+
+    @ordered_media_attachments = begin
+      if ordered_media_attachment_ids.nil?
+        []
+      else
+        map = status.media_attachments.index_by(&:id)
+        ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
+      end
+    end
+  end
+
+  def proper
+    self
+  end
+
+  def reblog?
+    false
+  end
+end
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
index 024c467e7..437861d1c 100644
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@@ -17,6 +17,18 @@ class StatusStat < ApplicationRecord
 
   after_commit :reset_parent_cache
 
+  def replies_count
+    [attributes['replies_count'], 0].max
+  end
+
+  def reblogs_count
+    [attributes['reblogs_count'], 0].max
+  end
+
+  def favourites_count
+    [attributes['favourites_count'], 0].max
+  end
+
   private
 
   def reset_parent_cache
diff --git a/app/models/status_trend.rb b/app/models/status_trend.rb
new file mode 100644
index 000000000..b0f1b6942
--- /dev/null
+++ b/app/models/status_trend.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: status_trends
+#
+#  id         :bigint(8)        not null, primary key
+#  status_id  :bigint(8)        not null
+#  account_id :bigint(8)        not null
+#  score      :float            default(0.0), not null
+#  rank       :integer          default(0), not null
+#  allowed    :boolean          default(FALSE), not null
+#  language   :string
+#
+
+class StatusTrend < ApplicationRecord
+  belongs_to :status
+  belongs_to :account
+
+  scope :allowed, -> { joins('INNER JOIN (SELECT account_id, MAX(score) AS max_score FROM status_trends GROUP BY account_id) AS grouped_status_trends ON status_trends.account_id = grouped_status_trends.account_id AND status_trends.score = grouped_status_trends.max_score').where(allowed: true) }
+end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index a64042614..b66f85423 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -15,20 +15,28 @@
 #  last_status_at      :datetime
 #  max_score           :float
 #  max_score_at        :datetime
+#  display_name        :string
 #
 
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
 
+  has_many :passive_relationships, class_name: 'TagFollow', inverse_of: :tag, dependent: :destroy
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag
+  has_many :followers, through: :passive_relationships, source: :account
 
   HASHTAG_SEPARATORS = "_\u00B7\u200c"
-  HASHTAG_NAME_RE    = "([[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}][[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)"
-  HASHTAG_RE         = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i
+  HASHTAG_NAME_PAT = "([[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}][[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)"
 
-  validates :name, presence: true, format: { with: /\A(#{HASHTAG_NAME_RE})\z/i }
+  HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_PAT})/i
+  HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
+  HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/
+
+  validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
+  validates :display_name, format: { with: HASHTAG_NAME_RE }
   validate :validate_name_change, if: -> { !new_record? && name_changed? }
+  validate :validate_display_name_change, if: -> { !new_record? && display_name_changed? }
 
   scope :reviewed, -> { where.not(reviewed_at: nil) }
   scope :unreviewed, -> { where(reviewed_at: nil) }
@@ -46,6 +54,10 @@ class Tag < ApplicationRecord
     name
   end
 
+  def display_name
+    attributes['display_name'] || name
+  end
+
   def usable
     boolean_with_default('usable', true)
   end
@@ -90,8 +102,10 @@ class Tag < ApplicationRecord
 
   class << self
     def find_or_create_by_names(name_or_names)
-      Array(name_or_names).map(&method(:normalize)).uniq { |str| str.mb_chars.downcase.to_s }.map do |normalized_name|
-        tag = matching_name(normalized_name).first || create(name: normalized_name)
+      names = Array(name_or_names).map { |str| [normalize(str), str] }.uniq(&:first)
+
+      names.map do |(normalized_name, display_name)|
+        tag = matching_name(normalized_name).first || create(name: normalized_name, display_name: display_name.gsub(HASHTAG_INVALID_CHARS_RE, ''))
 
         yield tag if block_given?
 
@@ -129,7 +143,7 @@ class Tag < ApplicationRecord
     end
 
     def normalize(str)
-      str.gsub(/\A#/, '')
+      HashtagNormalizer.new.normalize(str)
     end
   end
 
@@ -138,4 +152,8 @@ class Tag < ApplicationRecord
   def validate_name_change
     errors.add(:name, I18n.t('tags.does_not_match_previous_name')) unless name_was.mb_chars.casecmp(name.mb_chars).zero?
   end
+
+  def validate_display_name_change
+    errors.add(:display_name, I18n.t('tags.does_not_match_previous_name')) unless HashtagNormalizer.new.normalize(display_name).casecmp(name.mb_chars).zero?
+  end
 end
diff --git a/app/models/tag_follow.rb b/app/models/tag_follow.rb
new file mode 100644
index 000000000..abe36cd17
--- /dev/null
+++ b/app/models/tag_follow.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: tag_follows
+#
+#  id         :bigint(8)        not null, primary key
+#  tag_id     :bigint(8)        not null
+#  account_id :bigint(8)        not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class TagFollow < ApplicationRecord
+  include RateLimitable
+  include Paginable
+
+  belongs_to :tag
+  belongs_to :account
+
+  accepts_nested_attributes_for :tag
+
+  rate_limit by: :account, family: :follows
+end
diff --git a/app/models/trends.rb b/app/models/trends.rb
index 7dd3a9c87..d07d62b71 100644
--- a/app/models/trends.rb
+++ b/app/models/trends.rb
@@ -13,15 +13,41 @@ module Trends
     @tags ||= Trends::Tags.new
   end
 
+  def self.statuses
+    @statuses ||= Trends::Statuses.new
+  end
+
+  def self.register!(status)
+    [links, tags, statuses].each { |trend_type| trend_type.register(status) }
+  end
+
   def self.refresh!
-    [links, tags].each(&:refresh)
+    [links, tags, statuses].each(&:refresh)
   end
 
   def self.request_review!
-    [links, tags].each(&:request_review) if enabled?
+    return if skip_review? || !enabled?
+
+    links_requiring_review    = links.request_review
+    tags_requiring_review     = tags.request_review
+    statuses_requiring_review = statuses.request_review
+
+    return if links_requiring_review.empty? && tags_requiring_review.empty? && statuses_requiring_review.empty?
+
+    User.those_who_can(:manage_taxonomies).includes(:account).find_each do |user|
+      AdminMailer.new_trends(user.account, links_requiring_review, tags_requiring_review, statuses_requiring_review).deliver_later! if user.allows_trends_review_emails?
+    end
   end
 
   def self.enabled?
     Setting.trends
   end
+
+  def self.skip_review?
+    Setting.trendable_by_default
+  end
+
+  def self.available_locales
+    @available_locales ||= I18n.available_locales.map { |locale| locale.to_s.split(/[_-]/).first }.uniq
+  end
 end
diff --git a/app/models/trends/base.rb b/app/models/trends/base.rb
index b767dcb1a..a189f11f2 100644
--- a/app/models/trends/base.rb
+++ b/app/models/trends/base.rb
@@ -2,6 +2,7 @@
 
 class Trends::Base
   include Redisable
+  include LanguagesHelper
 
   class_attribute :default_options
 
@@ -32,16 +33,16 @@ class Trends::Base
     raise NotImplementedError
   end
 
-  def get(*)
-    raise NotImplementedError
+  def query
+    Trends::Query.new(key_prefix, klass)
   end
 
-  def score(id)
-    redis.zscore("#{key_prefix}:all", id) || 0
+  def score(id, locale: nil)
+    redis.zscore([key_prefix, 'all', locale].compact.join(':'), id) || 0
   end
 
-  def rank(id)
-    redis.zrevrank("#{key_prefix}:allowed", id)
+  def rank(id, locale: nil)
+    redis.zrevrank([key_prefix, 'allowed', locale].compact.join(':'), id)
   end
 
   def currently_trending_ids(allowed, limit)
@@ -63,18 +64,42 @@ class Trends::Base
     redis.expire(used_key(at_time), 1.day.seconds)
   end
 
-  def trim_older_items
-    redis.zremrangebyscore("#{key_prefix}:all", '-inf', '(1')
-    redis.zremrangebyscore("#{key_prefix}:allowed", '-inf', '(1')
-  end
-
   def score_at_rank(rank)
     redis.zrevrange("#{key_prefix}:allowed", 0, rank, with_scores: true).last&.last || 0
   end
 
+  def replace_items(suffix, items)
+    tmp_prefix    = "#{key_prefix}:tmp:#{SecureRandom.alphanumeric(6)}#{suffix}"
+    allowed_items = filter_for_allowed_items(items)
+
+    redis.pipelined do |pipeline|
+      items.each { |item| pipeline.zadd("#{tmp_prefix}:all", item[:score], item[:item].id) }
+      allowed_items.each { |item| pipeline.zadd("#{tmp_prefix}:allowed", item[:score], item[:item].id) }
+
+      rename_set(pipeline, "#{tmp_prefix}:all", "#{key_prefix}:all#{suffix}", items)
+      rename_set(pipeline, "#{tmp_prefix}:allowed", "#{key_prefix}:allowed#{suffix}", allowed_items)
+    end
+  end
+
+  def filter_for_allowed_items(items)
+    raise NotImplementedError
+  end
+
   private
 
   def used_key(at_time)
     "#{key_prefix}:used:#{at_time.beginning_of_day.to_i}"
   end
+
+  def rename_set(pipeline, from_key, to_key, set_items)
+    if set_items.empty?
+      pipeline.del(to_key)
+    else
+      pipeline.rename(from_key, to_key)
+    end
+  end
+
+  def skip_review?
+    Setting.trendable_by_default
+  end
 end
diff --git a/app/models/trends/history.rb b/app/models/trends/history.rb
index 608e33792..74723e35c 100644
--- a/app/models/trends/history.rb
+++ b/app/models/trends/history.rb
@@ -11,11 +11,11 @@ class Trends::History
     end
 
     def uses
-      redis.mget(*@days.map { |day| day.key_for(:uses) }).map(&:to_i).sum
+      with_redis { |redis| redis.mget(*@days.map { |day| day.key_for(:uses) }).map(&:to_i).sum }
     end
 
     def accounts
-      redis.pfcount(*@days.map { |day| day.key_for(:accounts) })
+      with_redis { |redis| redis.pfcount(*@days.map { |day| day.key_for(:accounts) }) }
     end
   end
 
@@ -33,19 +33,21 @@ class Trends::History
     attr_reader :day
 
     def accounts
-      redis.pfcount(key_for(:accounts))
+      with_redis { |redis| redis.pfcount(key_for(:accounts)) }
     end
 
     def uses
-      redis.get(key_for(:uses))&.to_i || 0
+      with_redis { |redis| redis.get(key_for(:uses))&.to_i || 0 }
     end
 
     def add(account_id)
-      redis.pipelined do
-        redis.incrby(key_for(:uses), 1)
-        redis.pfadd(key_for(:accounts), account_id)
-        redis.expire(key_for(:uses), EXPIRE_AFTER)
-        redis.expire(key_for(:accounts), EXPIRE_AFTER)
+      with_redis do |redis|
+        redis.pipelined do |pipeline|
+          pipeline.incrby(key_for(:uses), 1)
+          pipeline.pfadd(key_for(:accounts), account_id)
+          pipeline.expire(key_for(:uses), EXPIRE_AFTER)
+          pipeline.expire(key_for(:accounts), EXPIRE_AFTER)
+        end
       end
     end
 
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index a0d65138b..8808b3ab6 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -4,18 +4,53 @@ class Trends::Links < Trends::Base
   PREFIX = 'trending_links'
 
   self.default_options = {
-    threshold: 15,
-    review_threshold: 10,
+    threshold: 5,
+    review_threshold: 3,
     max_score_cooldown: 2.days.freeze,
     max_score_halflife: 8.hours.freeze,
+    decay_threshold: 1,
   }
 
-  def register(status, at_time = Time.now.utc)
-    original_status = status.reblog? ? status.reblog : status
+  class Query < Trends::Query
+    def filtered_for!(account)
+      @account = account
+      self
+    end
 
-    return unless original_status.public_visibility? && status.public_visibility? &&
-                  !original_status.account.silenced? && !status.account.silenced? &&
-                  !original_status.spoiler_text?
+    def filtered_for(account)
+      clone.filtered_for!(account)
+    end
+
+    def to_arel
+      scope = PreviewCard.joins(:trend).reorder(score: :desc)
+      scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
+      scope = scope.merge(PreviewCardTrend.allowed) if @allowed
+      scope = scope.offset(@offset) if @offset.present?
+      scope = scope.limit(@limit) if @limit.present?
+      scope
+    end
+
+    private
+
+    def language_order_clause
+      Arel::Nodes::Case.new.when(PreviewCardTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+    end
+
+    def preferred_languages
+      if @account&.chosen_languages.present?
+        @account.chosen_languages
+      else
+        @locale
+      end
+    end
+  end
+
+  def register(status, at_time = Time.now.utc)
+    original_status = status.proper
+
+    return unless (original_status.public_visibility? && status.public_visibility?) &&
+                  !(original_status.account.silenced? || status.account.silenced?) &&
+                  !(original_status.spoiler_text? || original_status.sensitive?)
 
     original_status.preview_cards.each do |preview_card|
       add(preview_card, status.account_id, at_time) if preview_card.appropriate_for_trends?
@@ -27,37 +62,33 @@ class Trends::Links < Trends::Base
     record_used_id(preview_card.id, at_time)
   end
 
-  def get(allowed, limit)
-    preview_card_ids = currently_trending_ids(allowed, limit)
-    preview_cards = PreviewCard.where(id: preview_card_ids).index_by(&:id)
-    preview_card_ids.map { |id| preview_cards[id] }.compact
+  def query
+    Query.new(key_prefix, klass)
   end
 
   def refresh(at_time = Time.now.utc)
-    preview_cards = PreviewCard.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq)
+    preview_cards = PreviewCard.where(id: (recently_used_ids(at_time) + PreviewCardTrend.pluck(:preview_card_id)).uniq)
     calculate_scores(preview_cards, at_time)
-    trim_older_items
   end
 
   def request_review
-    preview_cards = PreviewCard.where(id: currently_trending_ids(false, -1))
+    PreviewCardTrend.pluck('distinct language').flat_map do |language|
+      score_at_threshold  = PreviewCardTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+      preview_card_trends = PreviewCardTrend.where(language: language, allowed: false).joins(:preview_card)
 
-    preview_cards_requiring_review = preview_cards.filter_map do |preview_card|
-      next unless would_be_trending?(preview_card.id) && !preview_card.trendable? && preview_card.requires_review_notification?
+      preview_card_trends.filter_map do |trend|
+        preview_card = trend.preview_card
 
-      if preview_card.provider.nil?
-        preview_card.provider = PreviewCardProvider.create(domain: preview_card.domain, requested_review_at: Time.now.utc)
-      else
-        preview_card.provider.touch(:requested_review_at)
+        next unless trend.score > score_at_threshold && !preview_card.trendable? && preview_card.requires_review_notification?
+
+        if preview_card.provider.nil?
+          preview_card.provider = PreviewCardProvider.create(domain: preview_card.domain, requested_review_at: Time.now.utc)
+        else
+          preview_card.provider.touch(:requested_review_at)
+        end
+
+        preview_card
       end
-
-      preview_card
-    end
-
-    return if preview_cards_requiring_review.empty?
-
-    User.staff.includes(:account).find_each do |user|
-      AdminMailer.new_trending_links(user.account, preview_cards_requiring_review).deliver_later! if user.allows_trending_tag_emails?
     end
   end
 
@@ -67,10 +98,14 @@ class Trends::Links < Trends::Base
     PREFIX
   end
 
+  def klass
+    PreviewCard
+  end
+
   private
 
   def calculate_scores(preview_cards, at_time)
-    preview_cards.each do |preview_card|
+    items = preview_cards.map do |preview_card|
       expected  = preview_card.history.get(at_time - 1.day).accounts.to_f
       expected  = 1.0 if expected.zero?
       observed  = preview_card.history.get(at_time).accounts.to_f
@@ -94,24 +129,24 @@ class Trends::Links < Trends::Base
         preview_card.update_columns(max_score: max_score, max_score_at: max_time)
       end
 
-      decaying_score = max_score * (0.5**((at_time.to_f - max_time.to_f) / options[:max_score_halflife].to_f))
-
-      if decaying_score.zero?
-        redis.zrem("#{PREFIX}:all", preview_card.id)
-        redis.zrem("#{PREFIX}:allowed", preview_card.id)
-      else
-        redis.zadd("#{PREFIX}:all", decaying_score, preview_card.id)
-
-        if preview_card.trendable?
-          redis.zadd("#{PREFIX}:allowed", decaying_score, preview_card.id)
+      decaying_score = begin
+        if max_score.zero? || !valid_locale?(preview_card.language)
+          0
         else
-          redis.zrem("#{PREFIX}:allowed", preview_card.id)
+          max_score * (0.5**((at_time.to_f - max_time.to_f) / options[:max_score_halflife].to_f))
         end
       end
+
+      [decaying_score, preview_card]
+    end
+
+    to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
+    to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
+
+    PreviewCardTrend.transaction do
+      PreviewCardTrend.upsert_all(to_insert.map { |(score, preview_card)| { preview_card_id: preview_card.id, score: score, language: preview_card.language, allowed: preview_card.trendable? || false } }, unique_by: :preview_card_id) if to_insert.any?
+      PreviewCardTrend.where(preview_card_id: to_delete.map { |(_, preview_card)| preview_card.id }).delete_all if to_delete.any?
+      PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
     end
   end
-
-  def would_be_trending?(id)
-    score(id) > score_at_rank(options[:review_threshold] - 1)
-  end
 end
diff --git a/app/models/form/preview_card_batch.rb b/app/models/trends/preview_card_batch.rb
similarity index 82%
rename from app/models/form/preview_card_batch.rb
rename to app/models/trends/preview_card_batch.rb
index 5f6e6522a..b1d682910 100644
--- a/app/models/form/preview_card_batch.rb
+++ b/app/models/trends/preview_card_batch.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::PreviewCardBatch
+class Trends::PreviewCardBatch
   include ActiveModel::Model
   include Authorization
 
@@ -10,12 +10,12 @@ class Form::PreviewCardBatch
     case action
     when 'approve'
       approve!
-    when 'approve_all'
-      approve_all!
+    when 'approve_providers'
+      approve_providers!
     when 'reject'
       reject!
-    when 'reject_all'
-      reject_all!
+    when 'reject_providers'
+      reject_providers!
     end
   end
 
@@ -30,13 +30,13 @@ class Form::PreviewCardBatch
   end
 
   def approve!
-    preview_cards.each { |preview_card| authorize(preview_card, :update?) }
+    preview_cards.each { |preview_card| authorize(preview_card, :review?) }
     preview_cards.update_all(trendable: true)
   end
 
-  def approve_all!
+  def approve_providers!
     preview_card_providers.each do |provider|
-      authorize(provider, :update?)
+      authorize(provider, :review?)
       provider.update(trendable: true, reviewed_at: action_time)
     end
 
@@ -45,13 +45,13 @@ class Form::PreviewCardBatch
   end
 
   def reject!
-    preview_cards.each { |preview_card| authorize(preview_card, :update?) }
+    preview_cards.each { |preview_card| authorize(preview_card, :review?) }
     preview_cards.update_all(trendable: false)
   end
 
-  def reject_all!
+  def reject_providers!
     preview_card_providers.each do |provider|
-      authorize(provider, :update?)
+      authorize(provider, :review?)
       provider.update(trendable: false, reviewed_at: action_time)
     end
 
diff --git a/app/models/trends/preview_card_filter.rb b/app/models/trends/preview_card_filter.rb
new file mode 100644
index 000000000..f0214c3f0
--- /dev/null
+++ b/app/models/trends/preview_card_filter.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Trends::PreviewCardFilter
+  KEYS = %i(
+    trending
+    locale
+  ).freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = initial_scope
+
+    params.each do |key, value|
+      next if %w(page).include?(key.to_s)
+
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def initial_scope
+    PreviewCard.select(PreviewCard.arel_table[Arel.star])
+               .joins(:trend)
+               .eager_load(:trend)
+               .reorder(score: :desc)
+  end
+
+  def scope_for(key, value)
+    case key.to_s
+    when 'trending'
+      trending_scope(value)
+    when 'locale'
+      PreviewCardTrend.where(language: value)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+
+  def trending_scope(value)
+    case value
+    when 'allowed'
+      PreviewCardTrend.allowed
+    else
+      PreviewCardTrend.all
+    end
+  end
+end
diff --git a/app/models/form/preview_card_provider_batch.rb b/app/models/trends/preview_card_provider_batch.rb
similarity index 91%
rename from app/models/form/preview_card_provider_batch.rb
rename to app/models/trends/preview_card_provider_batch.rb
index e6ab3d8fa..062720c81 100644
--- a/app/models/form/preview_card_provider_batch.rb
+++ b/app/models/trends/preview_card_provider_batch.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::PreviewCardProviderBatch
+class Trends::PreviewCardProviderBatch
   include ActiveModel::Model
   include Authorization
 
@@ -22,12 +22,12 @@ class Form::PreviewCardProviderBatch
   end
 
   def approve!
-    preview_card_providers.each { |provider| authorize(provider, :update?) }
+    preview_card_providers.each { |provider| authorize(provider, :review?) }
     preview_card_providers.update_all(trendable: true, reviewed_at: Time.now.utc)
   end
 
   def reject!
-    preview_card_providers.each { |provider| authorize(provider, :update?) }
+    preview_card_providers.each { |provider| authorize(provider, :review?) }
     preview_card_providers.update_all(trendable: false, reviewed_at: Time.now.utc)
   end
 end
diff --git a/app/models/preview_card_provider_filter.rb b/app/models/trends/preview_card_provider_filter.rb
similarity index 80%
rename from app/models/preview_card_provider_filter.rb
rename to app/models/trends/preview_card_provider_filter.rb
index 1e90d3c9d..219793f01 100644
--- a/app/models/preview_card_provider_filter.rb
+++ b/app/models/trends/preview_card_provider_filter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class PreviewCardProviderFilter
+class Trends::PreviewCardProviderFilter
   KEYS = %i(
     status
   ).freeze
@@ -30,7 +30,7 @@ class PreviewCardProviderFilter
     when 'status'
       status_scope(value)
     else
-      raise "Unknown filter: #{key}"
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
     end
   end
 
@@ -43,7 +43,7 @@ class PreviewCardProviderFilter
     when 'pending_review'
       PreviewCardProvider.pending_review
     else
-      raise "Unknown status: #{value}"
+      raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
     end
   end
 end
diff --git a/app/models/trends/query.rb b/app/models/trends/query.rb
new file mode 100644
index 000000000..cd5571bc6
--- /dev/null
+++ b/app/models/trends/query.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+class Trends::Query
+  include Redisable
+  include Enumerable
+
+  attr_reader :prefix, :klass, :loaded
+
+  alias loaded? loaded
+
+  def initialize(prefix, klass)
+    @prefix  = prefix
+    @klass   = klass
+    @records = []
+    @loaded  = false
+    @allowed = false
+    @limit   = nil
+    @offset  = nil
+  end
+
+  def allowed!
+    @allowed = true
+    self
+  end
+
+  def allowed
+    clone.allowed!
+  end
+
+  def in_locale!(value)
+    @locale = value
+    self
+  end
+
+  def in_locale(value)
+    clone.in_locale!(value)
+  end
+
+  def offset!(value)
+    @offset = value.to_i
+    self
+  end
+
+  def offset(value)
+    clone.offset!(value)
+  end
+
+  def limit!(value)
+    @limit = value.to_i
+    self
+  end
+
+  def limit(value)
+    clone.limit!(value)
+  end
+
+  def records
+    load
+    @records
+  end
+
+  delegate :each, :empty?, :first, :last, :size, to: :records
+
+  def to_ary
+    records.dup
+  end
+
+  alias to_a to_ary
+
+  def to_arel
+    tmp_ids = ids
+
+    if tmp_ids.empty?
+      klass.none
+    else
+      scope = klass.joins("join unnest(array[#{tmp_ids.join(',')}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id").reorder('x.ordering')
+      scope = scope.offset(@offset) if @offset.present?
+      scope = scope.limit(@limit) if @limit.present?
+      scope
+    end
+  end
+
+  private
+
+  def key
+    [@prefix, @allowed ? 'allowed' : 'all', @locale].compact.join(':')
+  end
+
+  def load
+    unless loaded?
+      @records = perform_queries
+      @loaded  = true
+    end
+
+    self
+  end
+
+  def ids
+    redis.zrevrange(key, 0, -1).map(&:to_i)
+  end
+
+  def perform_queries
+    apply_scopes(to_arel).to_a
+  end
+
+  def apply_scopes(scope)
+    scope
+  end
+end
diff --git a/app/models/trends/status_batch.rb b/app/models/trends/status_batch.rb
new file mode 100644
index 000000000..f9b97b224
--- /dev/null
+++ b/app/models/trends/status_batch.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+class Trends::StatusBatch
+  include ActiveModel::Model
+  include Authorization
+
+  attr_accessor :status_ids, :action, :current_account
+
+  def save
+    case action
+    when 'approve'
+      approve!
+    when 'approve_accounts'
+      approve_accounts!
+    when 'reject'
+      reject!
+    when 'reject_accounts'
+      reject_accounts!
+    end
+  end
+
+  private
+
+  def statuses
+    @statuses ||= Status.where(id: status_ids)
+  end
+
+  def status_accounts
+    @status_accounts ||= Account.where(id: statuses.map(&:account_id).uniq)
+  end
+
+  def approve!
+    statuses.each { |status| authorize([:admin, status], :review?) }
+    statuses.update_all(trendable: true)
+  end
+
+  def approve_accounts!
+    status_accounts.each do |account|
+      authorize(account, :review?)
+      account.update(trendable: true, reviewed_at: action_time)
+    end
+
+    # Reset any individual overrides
+    statuses.update_all(trendable: nil)
+  end
+
+  def reject!
+    statuses.each { |status| authorize([:admin, status], :review?) }
+    statuses.update_all(trendable: false)
+  end
+
+  def reject_accounts!
+    status_accounts.each do |account|
+      authorize(account, :review?)
+      account.update(trendable: false, reviewed_at: action_time)
+    end
+
+    # Reset any individual overrides
+    statuses.update_all(trendable: nil)
+  end
+
+  def action_time
+    @action_time ||= Time.now.utc
+  end
+end
diff --git a/app/models/trends/status_filter.rb b/app/models/trends/status_filter.rb
new file mode 100644
index 000000000..de435a026
--- /dev/null
+++ b/app/models/trends/status_filter.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Trends::StatusFilter
+  KEYS = %i(
+    trending
+    locale
+  ).freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = initial_scope
+
+    params.each do |key, value|
+      next if %w(page).include?(key.to_s)
+
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def initial_scope
+    Status.select(Status.arel_table[Arel.star])
+          .joins(:trend)
+          .eager_load(:trend)
+          .reorder(score: :desc)
+  end
+
+  def scope_for(key, value)
+    case key.to_s
+    when 'trending'
+      trending_scope(value)
+    when 'locale'
+      StatusTrend.where(language: value)
+    else
+      raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
+    end
+  end
+
+  def trending_scope(value)
+    case value
+    when 'allowed'
+      StatusTrend.allowed
+    else
+      StatusTrend.all
+    end
+  end
+end
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
new file mode 100644
index 000000000..c9ef7c8f2
--- /dev/null
+++ b/app/models/trends/statuses.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+class Trends::Statuses < Trends::Base
+  PREFIX = 'trending_statuses'
+
+  self.default_options = {
+    threshold: 5,
+    review_threshold: 3,
+    score_halflife: 2.hours.freeze,
+    decay_threshold: 0.3,
+  }
+
+  class Query < Trends::Query
+    def filtered_for!(account)
+      @account = account
+      self
+    end
+
+    def filtered_for(account)
+      clone.filtered_for!(account)
+    end
+
+    def to_arel
+      scope = Status.joins(:trend).reorder(score: :desc)
+      scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
+      scope = scope.merge(StatusTrend.allowed) if @allowed
+      scope = scope.not_excluded_by_account(@account).not_domain_blocked_by_account(@account) if @account.present?
+      scope = scope.offset(@offset) if @offset.present?
+      scope = scope.limit(@limit) if @limit.present?
+      scope
+    end
+
+    private
+
+    def language_order_clause
+      Arel::Nodes::Case.new.when(StatusTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+    end
+
+    def preferred_languages
+      if @account&.chosen_languages.present?
+        @account.chosen_languages
+      else
+        @locale
+      end
+    end
+  end
+
+  def register(status, at_time = Time.now.utc)
+    add(status.proper, status.account_id, at_time) if eligible?(status.proper)
+  end
+
+  def add(status, _account_id, at_time = Time.now.utc)
+    record_used_id(status.id, at_time)
+  end
+
+  def query
+    Query.new(key_prefix, klass)
+  end
+
+  def refresh(at_time = Time.now.utc)
+    statuses = Status.where(id: (recently_used_ids(at_time) + StatusTrend.pluck(:status_id)).uniq).includes(:status_stat, :account)
+    calculate_scores(statuses, at_time)
+  end
+
+  def request_review
+    StatusTrend.pluck('distinct language').flat_map do |language|
+      score_at_threshold = StatusTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+      status_trends      = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account)
+
+      status_trends.filter_map do |trend|
+        status = trend.status
+
+        if trend.score > score_at_threshold && !status.trendable? && status.requires_review_notification?
+          status.account.touch(:requested_review_at)
+          status
+        end
+      end
+    end
+  end
+
+  protected
+
+  def key_prefix
+    PREFIX
+  end
+
+  def klass
+    Status
+  end
+
+  private
+
+  def eligible?(status)
+    status.public_visibility? && status.account.discoverable? && !status.account.silenced? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
+  end
+
+  def calculate_scores(statuses, at_time)
+    items = statuses.map do |status|
+      expected  = 1.0
+      observed  = (status.reblogs_count + status.favourites_count).to_f
+
+      score = begin
+        if expected > observed || observed < options[:threshold]
+          0
+        else
+          ((observed - expected)**2) / expected
+        end
+      end
+
+      decaying_score = begin
+        if score.zero? || !eligible?(status)
+          0
+        else
+          score * (0.5**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f))
+        end
+      end
+
+      [decaying_score, status]
+    end
+
+    to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
+    to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
+
+    StatusTrend.transaction do
+      StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
+      StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
+      StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
+    end
+  end
+end
diff --git a/app/models/form/tag_batch.rb b/app/models/trends/tag_batch.rb
similarity index 81%
rename from app/models/form/tag_batch.rb
rename to app/models/trends/tag_batch.rb
index b9330745f..16ee08c06 100644
--- a/app/models/form/tag_batch.rb
+++ b/app/models/trends/tag_batch.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::TagBatch
+class Trends::TagBatch
   include ActiveModel::Model
   include Authorization
 
@@ -22,12 +22,12 @@ class Form::TagBatch
   end
 
   def approve!
-    tags.each { |tag| authorize(tag, :update?) }
+    tags.each { |tag| authorize(tag, :review?) }
     tags.update_all(trendable: true, reviewed_at: action_time)
   end
 
   def reject!
-    tags.each { |tag| authorize(tag, :update?) }
+    tags.each { |tag| authorize(tag, :review?) }
     tags.update_all(trendable: false, reviewed_at: action_time)
   end
 
diff --git a/app/models/tag_filter.rb b/app/models/trends/tag_filter.rb
similarity index 76%
rename from app/models/tag_filter.rb
rename to app/models/trends/tag_filter.rb
index ecdb52503..3b142efc4 100644
--- a/app/models/tag_filter.rb
+++ b/app/models/trends/tag_filter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class TagFilter
+class Trends::TagFilter
   KEYS = %i(
     trending
     status
@@ -42,13 +42,7 @@ class TagFilter
   end
 
   def trending_scope
-    ids = Trends.tags.currently_trending_ids(false, -1)
-
-    if ids.empty?
-      Tag.none
-    else
-      Tag.joins("join unnest(array[#{ids.map(&:to_i).join(',')}]::integer[]) with ordinality as x (id, ordering) on tags.id = x.id").order('x.ordering')
-    end
+    Trends.tags.query.to_arel
   end
 
   def status_scope(value)
diff --git a/app/models/trends/tags.rb b/app/models/trends/tags.rb
index a425fd207..19ade52ba 100644
--- a/app/models/trends/tags.rb
+++ b/app/models/trends/tags.rb
@@ -5,18 +5,16 @@ class Trends::Tags < Trends::Base
 
   self.default_options = {
     threshold: 5,
-    review_threshold: 10,
+    review_threshold: 3,
     max_score_cooldown: 2.days.freeze,
     max_score_halflife: 4.hours.freeze,
+    decay_threshold: 1,
   }
 
   def register(status, at_time = Time.now.utc)
-    original_status = status.reblog? ? status.reblog : status
+    return unless !status.reblog? && status.public_visibility? && !status.account.silenced?
 
-    return unless original_status.public_visibility? && status.public_visibility? &&
-                  !original_status.account.silenced? && !status.account.silenced?
-
-    original_status.tags.each do |tag|
+    status.tags.each do |tag|
       add(tag, status.account_id, at_time) if tag.usable?
     end
   end
@@ -29,30 +27,17 @@ class Trends::Tags < Trends::Base
   def refresh(at_time = Time.now.utc)
     tags = Tag.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq)
     calculate_scores(tags, at_time)
-    trim_older_items
-  end
-
-  def get(allowed, limit)
-    tag_ids = currently_trending_ids(allowed, limit)
-    tags = Tag.where(id: tag_ids).index_by(&:id)
-    tag_ids.map { |id| tags[id] }.compact
   end
 
   def request_review
     tags = Tag.where(id: currently_trending_ids(false, -1))
 
-    tags_requiring_review = tags.filter_map do |tag|
+    tags.filter_map do |tag|
       next unless would_be_trending?(tag.id) && !tag.trendable? && tag.requires_review_notification?
 
       tag.touch(:requested_review_at)
       tag
     end
-
-    return if tags_requiring_review.empty?
-
-    User.staff.includes(:account).find_each do |user|
-      AdminMailer.new_trending_tags(user.account, tags_requiring_review).deliver_later! if user.allows_trending_tag_emails?
-    end
   end
 
   protected
@@ -61,9 +46,15 @@ class Trends::Tags < Trends::Base
     PREFIX
   end
 
+  def klass
+    Tag
+  end
+
   private
 
   def calculate_scores(tags, at_time)
+    items = []
+
     tags.each do |tag|
       expected  = tag.history.get(at_time - 1.day).accounts.to_f
       expected  = 1.0 if expected.zero?
@@ -90,19 +81,16 @@ class Trends::Tags < Trends::Base
 
       decaying_score = max_score * (0.5**((at_time.to_f - max_time.to_f) / options[:max_score_halflife].to_f))
 
-      if decaying_score.zero?
-        redis.zrem("#{PREFIX}:all", tag.id)
-        redis.zrem("#{PREFIX}:allowed", tag.id)
-      else
-        redis.zadd("#{PREFIX}:all", decaying_score, tag.id)
+      next unless decaying_score >= options[:decay_threshold]
 
-        if tag.trendable?
-          redis.zadd("#{PREFIX}:allowed", decaying_score, tag.id)
-        else
-          redis.zrem("#{PREFIX}:allowed", tag.id)
-        end
-      end
+      items << { score: decaying_score, item: tag }
     end
+
+    replace_items('', items)
+  end
+
+  def filter_for_allowed_items(items)
+    items.select { |item| item[:item].trendable? }
   end
 
   def would_be_trending?(id)
diff --git a/app/models/unavailable_domain.rb b/app/models/unavailable_domain.rb
index 5e8870bde..dfc0ef14e 100644
--- a/app/models/unavailable_domain.rb
+++ b/app/models/unavailable_domain.rb
@@ -16,6 +16,10 @@ class UnavailableDomain < ApplicationRecord
 
   after_commit :reset_cache!
 
+  def to_log_human_identifier
+    domain
+  end
+
   private
 
   def reset_cache!
diff --git a/app/models/user.rb b/app/models/user.rb
index 374b82d05..ca98a0afa 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,12 +10,9 @@
 #  encrypted_password        :string           default(""), not null
 #  reset_password_token      :string
 #  reset_password_sent_at    :datetime
-#  remember_created_at       :datetime
 #  sign_in_count             :integer          default(0), not null
 #  current_sign_in_at        :datetime
 #  last_sign_in_at           :datetime
-#  current_sign_in_ip        :inet
-#  last_sign_in_ip           :inet
 #  admin                     :boolean          default(FALSE), not null
 #  confirmation_token        :string
 #  confirmed_at              :datetime
@@ -29,12 +26,10 @@
 #  otp_required_for_login    :boolean          default(FALSE), not null
 #  last_emailed_at           :datetime
 #  otp_backup_codes          :string           is an Array
-#  filtered_languages        :string           default([]), not null, is an Array
 #  account_id                :bigint(8)        not null
 #  disabled                  :boolean          default(FALSE), not null
 #  moderator                 :boolean          default(FALSE), not null
 #  invite_id                 :bigint(8)
-#  remember_token            :string
 #  chosen_languages          :string           is an Array
 #  created_by_application_id :bigint(8)
 #  approved                  :boolean          default(TRUE), not null
@@ -42,12 +37,22 @@
 #  sign_in_token_sent_at     :datetime
 #  webauthn_id               :string
 #  sign_up_ip                :inet
-#  skip_sign_in_token        :boolean
+#  role_id                   :bigint(8)
 #
 
 class User < ApplicationRecord
+  self.ignored_columns = %w(
+    remember_created_at
+    remember_token
+    current_sign_in_ip
+    last_sign_in_ip
+    skip_sign_in_token
+    filtered_languages
+  )
+
   include Settings::Extend
-  include UserRoles
+  include Redisable
+  include LanguagesHelper
 
   # The home and list feeds will be stored in Redis for this amount
   # of time, and status fan-out to followers will include only people
@@ -74,6 +79,7 @@ class User < ApplicationRecord
   belongs_to :account, inverse_of: :user
   belongs_to :invite, counter_cache: :uses, optional: true
   belongs_to :created_by_application, class_name: 'Doorkeeper::Application', optional: true
+  belongs_to :role, class_name: 'UserRole', optional: true
   accepts_nested_attributes_for :account
 
   has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
@@ -81,22 +87,24 @@ class User < ApplicationRecord
   has_many :invites, inverse_of: :user
   has_many :markers, inverse_of: :user, dependent: :destroy
   has_many :webauthn_credentials, dependent: :destroy
+  has_many :ips, class_name: 'UserIp', inverse_of: :user
 
   has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
   accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
   validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
-  validates_with BlacklistedEmailValidator, on: :create
+  validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
 
-  # Those are honeypot/antispam fields
+  # Honeypot/anti-spam fields
   attr_accessor :registration_form_time, :website, :confirm_password
 
   validates_with RegistrationFormTimeValidator, on: :create
   validates :website, absence: true, on: :create
   validates :confirm_password, absence: true, on: :create
+  validate :validate_role_elevation
 
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
@@ -107,12 +115,14 @@ class User < ApplicationRecord
   scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
   scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
-  scope :matches_ip, ->(value) { where('current_sign_in_ip <<= ?', value).or(where('users.sign_up_ip <<= ?', value)).or(where('users.last_sign_in_ip <<= ?', value)).or(where(id: SessionActivation.select(:user_id).where('ip <<= ?', value))) }
+  scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
   scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
 
   before_validation :sanitize_languages
+  before_validation :sanitize_role
   before_create :set_approved
   after_commit :send_pending_devise_notifications
+  after_create_commit :trigger_webhooks
 
   # This avoids a deprecation warning from Rails 5.1
   # It seems possible that a future release of devise-two-factor will
@@ -122,14 +132,34 @@ class User < ApplicationRecord
   has_many :session_activations, dependent: :destroy
 
   delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
-           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
+           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media,
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
-           :disable_swiping,
+           :disable_swiping, :always_send_emails,
            to: :settings, prefix: :setting, allow_nil: false
 
-  attr_reader :invite_code, :sign_in_token_attempt
-  attr_writer :external, :bypass_invite_request_check
+  delegate :can?, to: :role
+
+  attr_reader :invite_code
+  attr_writer :external, :bypass_invite_request_check, :current_account
+
+  def self.those_who_can(*any_of_privileges)
+    matching_role_ids = UserRole.that_can(*any_of_privileges).map(&:id)
+
+    if matching_role_ids.empty?
+      none
+    else
+      where(role_id: matching_role_ids)
+    end
+  end
+
+  def role
+    if role_id.nil?
+      UserRole.everyone
+    else
+      super
+    end
+  end
 
   def confirmed?
     confirmed_at.present?
@@ -151,6 +181,14 @@ class User < ApplicationRecord
     update!(disabled: false)
   end
 
+  def to_log_human_identifier
+    account.acct
+  end
+
+  def to_log_route_param
+    account_id
+  end
+
   def confirm
     new_user      = !confirmed?
     self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
@@ -174,15 +212,13 @@ class User < ApplicationRecord
     prepare_new_user! if new_user && approved?
   end
 
-  def update_sign_in!(request, new_sign_in: false)
-    old_current, new_current = current_sign_in_at, Time.now.utc
+  def update_sign_in!(new_sign_in: false)
+    old_current = current_sign_in_at
+    new_current = Time.now.utc
+
     self.last_sign_in_at     = old_current || new_current
     self.current_sign_in_at  = new_current
 
-    old_current, new_current = current_sign_in_ip, request.remote_ip
-    self.last_sign_in_ip     = old_current || new_current
-    self.current_sign_in_ip  = new_current
-
     if new_sign_in
       self.sign_in_count ||= 0
       self.sign_in_count  += 1
@@ -200,16 +236,20 @@ class User < ApplicationRecord
     !account.memorial?
   end
 
-  def suspicious_sign_in?(ip)
-    !otp_required_for_login? && !skip_sign_in_token? && current_sign_in_at.present? && !recent_ip?(ip)
+  def functional?
+    functional_or_moved? && account.moved_to_account_id.nil?
   end
 
-  def functional?
-    confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
+  def functional_or_moved?
+    confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial?
+  end
+
+  def unconfirmed?
+    !confirmed?
   end
 
   def unconfirmed_or_pending?
-    !(confirmed? && approved?)
+    unconfirmed? || pending?
   end
 
   def inactive_message
@@ -245,12 +285,16 @@ class User < ApplicationRecord
     save!
   end
 
-  def setting_default_privacy
-    settings.default_privacy || (account.locked? ? 'private' : 'public')
+  def prefers_noindex?
+    setting_noindex
   end
 
-  def allows_digest_emails?
-    settings.notification_emails['digest']
+  def preferred_posting_language
+    valid_locale_cascade(settings.default_language, locale, I18n.locale)
+  end
+
+  def setting_default_privacy
+    settings.default_privacy || (account.locked? ? 'private' : 'public')
   end
 
   def allows_report_emails?
@@ -261,12 +305,12 @@ class User < ApplicationRecord
     settings.notification_emails['pending_account']
   end
 
-  def allows_trending_tag_emails?
-    settings.notification_emails['trending_tag']
+  def allows_appeal_emails?
+    settings.notification_emails['appeal']
   end
 
-  def hides_network?
-    @hides_network ||= settings.hide_network
+  def allows_trends_review_emails?
+    settings.notification_emails['trending_tag']
   end
 
   def aggregates_reblogs?
@@ -277,31 +321,28 @@ class User < ApplicationRecord
     @shows_application ||= settings.show_application
   end
 
-  # rubocop:disable Naming/MethodParameterName
-  def token_for_app(a)
-    return nil if a.nil? || a.owner != self
-    Doorkeeper::AccessToken.find_or_create_by(application_id: a.id, resource_owner_id: id) do |t|
-      t.scopes = a.scopes
-      t.expires_in = Doorkeeper.configuration.access_token_expires_in
+  def token_for_app(app)
+    return nil if app.nil? || app.owner != self
+
+    Doorkeeper::AccessToken.find_or_create_by(application_id: app.id, resource_owner_id: id) do |t|
+      t.scopes            = app.scopes
+      t.expires_in        = Doorkeeper.configuration.access_token_expires_in
       t.use_refresh_token = Doorkeeper.configuration.refresh_token_enabled?
     end
   end
-  # rubocop:enable Naming/MethodParameterName
 
   def activate_session(request)
-    session_activations.activate(session_id: SecureRandom.hex,
-                                 user_agent: request.user_agent,
-                                 ip: request.remote_ip).session_id
+    session_activations.activate(
+      session_id: SecureRandom.hex,
+      user_agent: request.user_agent,
+      ip: request.remote_ip
+    ).session_id
   end
 
   def clear_other_sessions(id)
     session_activations.exclusive(id)
   end
 
-  def session_active?(id)
-    session_activations.active? id
-  end
-
   def web_push_subscription(session)
     session.web_push_subscription.nil? ? nil : session.web_push_subscription
   end
@@ -336,21 +377,24 @@ class User < ApplicationRecord
     super
   end
 
-  def reset_password!
-    # First, change password to something random, invalidate the remember-me token,
-    # and deactivate all sessions
-    transaction do
-      update(remember_token: nil, remember_created_at: nil, password: SecureRandom.hex)
-      session_activations.destroy_all
-    end
-
-    # Then, remove all authorized applications and connected push subscriptions
-    Doorkeeper::AccessGrant.by_resource_owner(self).in_batches.update_all(revoked_at: Time.now.utc)
+  def revoke_access!
+    Doorkeeper::AccessGrant.by_resource_owner(self).update_all(revoked_at: Time.now.utc)
 
     Doorkeeper::AccessToken.by_resource_owner(self).in_batches do |batch|
       batch.update_all(revoked_at: Time.now.utc)
       Web::PushSubscription.where(access_token_id: batch).delete_all
     end
+  end
+
+  def reset_password!
+    # First, change password to something random and deactivate all sessions
+    transaction do
+      update(password: SecureRandom.hex)
+      session_activations.destroy_all
+    end
+
+    # Then, remove all authorized applications and connected push subscriptions
+    revoke_access!
 
     # Finally, send a reset password prompt to the user
     send_reset_password_instructions
@@ -364,31 +408,6 @@ class User < ApplicationRecord
     setting_display_media == 'hide_all'
   end
 
-  def recent_ips
-    @recent_ips ||= begin
-      arr = []
-
-      session_activations.each do |session_activation|
-        arr << [session_activation.updated_at, session_activation.ip]
-      end
-
-      arr << [current_sign_in_at, current_sign_in_ip] if current_sign_in_ip.present?
-      arr << [last_sign_in_at, last_sign_in_ip] if last_sign_in_ip.present?
-      arr << [created_at, sign_up_ip] if sign_up_ip.present?
-
-      arr.sort_by { |pair| pair.first || Time.now.utc }.uniq(&:last).reverse!
-    end
-  end
-
-  def sign_in_token_expired?
-    sign_in_token_sent_at.nil? || sign_in_token_sent_at < 5.minutes.ago
-  end
-
-  def generate_sign_in_token
-    self.sign_in_token         = Devise.friendly_token(6)
-    self.sign_in_token_sent_at = Time.now.utc
-  end
-
   protected
 
   def send_devise_notification(notification, *args, **kwargs)
@@ -410,10 +429,6 @@ class User < ApplicationRecord
 
   private
 
-  def recent_ip?(ip)
-    recent_ips.any? { |(_, recent_ip)| recent_ip == ip }
-  end
-
   def send_pending_devise_notifications
     pending_devise_notifications.each do |notification, args, kwargs|
       render_and_send_devise_message(notification, *args, **kwargs)
@@ -465,6 +480,11 @@ class User < ApplicationRecord
     self.chosen_languages = nil if chosen_languages.empty?
   end
 
+  def sanitize_role
+    return if role.nil?
+    self.role = nil if role.everyone?
+  end
+
   def prepare_new_user!
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
@@ -477,14 +497,14 @@ class User < ApplicationRecord
   end
 
   def notify_staff_about_pending_account!
-    User.staff.includes(:account).find_each do |u|
+    User.those_who_can(:manage_users).includes(:account).find_each do |u|
       next unless u.allows_pending_account_emails?
       AdminMailer.new_pending_account(u.account, self).deliver_later
     end
   end
 
   def regenerate_feed!
-    RegenerationWorker.perform_async(account_id) if Redis.current.set("account:#{account_id}:regeneration", true, nx: true, ex: 1.day.seconds)
+    RegenerationWorker.perform_async(account_id) if redis.set("account:#{account_id}:regeneration", true, nx: true, ex: 1.day.seconds)
   end
 
   def needs_feed_update?
@@ -495,7 +515,15 @@ class User < ApplicationRecord
     email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
   end
 
+  def validate_role_elevation
+    errors.add(:role_id, :elevated) if defined?(@current_account) && role&.overrides?(@current_account&.user_role)
+  end
+
   def invite_text_required?
-    Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check?
+    Setting.require_invite_text && !open_registrations? && !invited? && !external? && !bypass_invite_request_check?
+  end
+
+  def trigger_webhooks
+    TriggerWebhookWorker.perform_async('account.created', 'Account', account_id)
   end
 end
diff --git a/app/models/user_ip.rb b/app/models/user_ip.rb
new file mode 100644
index 000000000..a8e802e13
--- /dev/null
+++ b/app/models/user_ip.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: user_ips
+#
+#  user_id :bigint(8)        primary key
+#  ip      :inet
+#  used_at :datetime
+#
+
+class UserIp < ApplicationRecord
+  self.primary_key = :user_id
+
+  belongs_to :user, foreign_key: :user_id
+
+  def readonly?
+    true
+  end
+end
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
new file mode 100644
index 000000000..74dfdc220
--- /dev/null
+++ b/app/models/user_role.rb
@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: user_roles
+#
+#  id          :bigint(8)        not null, primary key
+#  name        :string           default(""), not null
+#  color       :string           default(""), not null
+#  position    :integer          default(0), not null
+#  permissions :bigint(8)        default(0), not null
+#  highlighted :boolean          default(FALSE), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+class UserRole < ApplicationRecord
+  FLAGS = {
+    administrator: (1 << 0),
+    view_devops: (1 << 1),
+    view_audit_log: (1 << 2),
+    view_dashboard: (1 << 3),
+    manage_reports: (1 << 4),
+    manage_federation: (1 << 5),
+    manage_settings: (1 << 6),
+    manage_blocks: (1 << 7),
+    manage_taxonomies: (1 << 8),
+    manage_appeals: (1 << 9),
+    manage_users: (1 << 10),
+    manage_invites: (1 << 11),
+    manage_rules: (1 << 12),
+    manage_announcements: (1 << 13),
+    manage_custom_emojis: (1 << 14),
+    manage_webhooks: (1 << 15),
+    invite_users: (1 << 16),
+    manage_roles: (1 << 17),
+    manage_user_access: (1 << 18),
+    delete_user_data: (1 << 19),
+  }.freeze
+
+  module Flags
+    NONE = 0
+    ALL  = FLAGS.values.reduce(&:|)
+
+    DEFAULT = FLAGS[:invite_users]
+
+    CATEGORIES = {
+      invites: %i(
+        invite_users
+      ).freeze,
+
+      moderation: %w(
+        view_dashboard
+        view_audit_log
+        manage_users
+        manage_user_access
+        delete_user_data
+        manage_reports
+        manage_appeals
+        manage_federation
+        manage_blocks
+        manage_taxonomies
+        manage_invites
+      ).freeze,
+
+      administration: %w(
+        manage_settings
+        manage_rules
+        manage_roles
+        manage_webhooks
+        manage_custom_emojis
+        manage_announcements
+      ).freeze,
+
+      devops: %w(
+        view_devops
+      ).freeze,
+
+      special: %i(
+        administrator
+      ).freeze,
+    }.freeze
+  end
+
+  attr_writer :current_account
+
+  validates :name, presence: true, unless: :everyone?
+  validates :color, format: { with: /\A#?(?:[A-F0-9]{3}){1,2}\z/i }, unless: -> { color.blank? }
+
+  validate :validate_permissions_elevation
+  validate :validate_position_elevation
+  validate :validate_dangerous_permissions
+  validate :validate_own_role_edition
+
+  before_validation :set_position
+
+  scope :assignable, -> { where.not(id: -99).order(position: :asc) }
+
+  has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
+
+  def self.nobody
+    @nobody ||= UserRole.new(permissions: Flags::NONE, position: -1)
+  end
+
+  def self.everyone
+    UserRole.find(-99)
+  rescue ActiveRecord::RecordNotFound
+    UserRole.create!(id: -99, permissions: Flags::DEFAULT)
+  end
+
+  def self.that_can(*any_of_privileges)
+    all.select { |role| role.can?(*any_of_privileges) }
+  end
+
+  def everyone?
+    id == -99
+  end
+
+  def nobody?
+    id.nil?
+  end
+
+  def permissions_as_keys
+    FLAGS.keys.select { |privilege| permissions & FLAGS[privilege] == FLAGS[privilege] }.map(&:to_s)
+  end
+
+  def permissions_as_keys=(value)
+    self.permissions = value.map(&:presence).compact.reduce(Flags::NONE) { |bitmask, privilege| FLAGS.key?(privilege.to_sym) ? (bitmask | FLAGS[privilege.to_sym]) : bitmask }
+  end
+
+  def can?(*any_of_privileges)
+    any_of_privileges.any? { |privilege| in_permissions?(privilege) }
+  end
+
+  def overrides?(other_role)
+    other_role.nil? || position > other_role.position
+  end
+
+  def computed_permissions
+    # If called on the everyone role, no further computation needed
+    return permissions if everyone?
+
+    # If called on the nobody role, no permissions are there to be given
+    return Flags::NONE if nobody?
+
+    # Otherwise, compute permissions based on special conditions
+    @computed_permissions ||= begin
+      permissions = self.class.everyone.permissions | self.permissions
+
+      if permissions & FLAGS[:administrator] == FLAGS[:administrator]
+        Flags::ALL
+      else
+        permissions
+      end
+    end
+  end
+
+  def to_log_human_identifier
+    name
+  end
+
+  private
+
+  def in_permissions?(privilege)
+    raise ArgumentError, "Unknown privilege: #{privilege}" unless FLAGS.key?(privilege)
+    computed_permissions & FLAGS[privilege] == FLAGS[privilege]
+  end
+
+  def set_position
+    self.position = -1 if everyone?
+  end
+
+  def validate_own_role_edition
+    return unless defined?(@current_account) && @current_account.user_role.id == id
+    errors.add(:permissions_as_keys, :own_role) if permissions_changed?
+    errors.add(:position, :own_role) if position_changed?
+  end
+
+  def validate_permissions_elevation
+    errors.add(:permissions_as_keys, :elevated) if defined?(@current_account) && @current_account.user_role.computed_permissions & permissions != permissions
+  end
+
+  def validate_position_elevation
+    errors.add(:position, :elevated) if defined?(@current_account) && @current_account.user_role.position < position
+  end
+
+  def validate_dangerous_permissions
+    errors.add(:permissions_as_keys, :dangerous) if everyone? && Flags::DEFAULT & permissions != permissions
+  end
+end
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
new file mode 100644
index 000000000..431edd75d
--- /dev/null
+++ b/app/models/webhook.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: webhooks
+#
+#  id         :bigint(8)        not null, primary key
+#  url        :string           not null
+#  events     :string           default([]), not null, is an Array
+#  secret     :string           default(""), not null
+#  enabled    :boolean          default(TRUE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Webhook < ApplicationRecord
+  EVENTS = %w(
+    account.created
+    report.created
+  ).freeze
+
+  scope :enabled, -> { where(enabled: true) }
+
+  validates :url, presence: true, url: true
+  validates :secret, presence: true, length: { minimum: 12 }
+  validates :events, presence: true
+
+  validate :validate_events
+
+  before_validation :strip_events
+  before_validation :generate_secret
+
+  def rotate_secret!
+    update!(secret: SecureRandom.hex(20))
+  end
+
+  def enable!
+    update!(enabled: true)
+  end
+
+  def disable!
+    update!(enabled: false)
+  end
+
+  private
+
+  def validate_events
+    errors.add(:events, :invalid) if events.any? { |e| !EVENTS.include?(e) }
+  end
+
+  def strip_events
+    self.events = events.map { |str| str.strip.presence }.compact if events.present?
+  end
+
+  def generate_secret
+    self.secret = SecureRandom.hex(20) if secret.blank?
+  end
+end
diff --git a/app/policies/account_moderation_note_policy.rb b/app/policies/account_moderation_note_policy.rb
index 885411a5b..310ce854c 100644
--- a/app/policies/account_moderation_note_policy.rb
+++ b/app/policies/account_moderation_note_policy.rb
@@ -2,11 +2,11 @@
 
 class AccountModerationNotePolicy < ApplicationPolicy
   def create?
-    staff?
+    role.can?(:manage_reports)
   end
 
   def destroy?
-    admin? || owner?
+    owner? || (role.can?(:manage_reports) && role.overrides?(record.account.user_role))
   end
 
   private
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index 46237e45c..a744af81d 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -2,70 +2,66 @@
 
 class AccountPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_users)
   end
 
   def show?
-    staff?
+    role.can?(:manage_users)
   end
 
   def warn?
-    staff? && !record.user&.staff?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role)
   end
 
   def suspend?
-    staff? && !record.user&.staff? && !record.instance_actor?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role) && !record.instance_actor?
   end
 
   def destroy?
-    record.suspended_temporarily? && admin?
+    record.suspended_temporarily? && role.can?(:delete_user_data)
   end
 
   def unsuspend?
-    staff? && record.suspension_origin_local?
+    role.can?(:manage_users) && record.suspension_origin_local?
   end
 
   def sensitive?
-    staff? && !record.user&.staff?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role)
   end
 
   def unsensitive?
-    staff?
+    role.can?(:manage_users)
   end
 
   def silence?
-    staff? && !record.user&.staff?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role)
   end
 
   def unsilence?
-    staff?
+    role.can?(:manage_users)
   end
 
   def redownload?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def remove_avatar?
-    staff?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role)
   end
 
   def remove_header?
-    staff?
-  end
-
-  def subscribe?
-    admin?
-  end
-
-  def unsubscribe?
-    admin?
+    role.can?(:manage_users, :manage_reports) && role.overrides?(record.user_role)
   end
 
   def memorialize?
-    admin? && !record.user&.admin? && !record.instance_actor?
+    role.can?(:delete_user_data) && role.overrides?(record.user_role) && !record.instance_actor?
   end
 
   def unblock_email?
-    staff?
+    role.can?(:manage_users)
+  end
+
+  def review?
+    role.can?(:manage_taxonomies)
   end
 end
diff --git a/app/policies/account_warning_policy.rb b/app/policies/account_warning_policy.rb
new file mode 100644
index 000000000..4f8df7420
--- /dev/null
+++ b/app/policies/account_warning_policy.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AccountWarningPolicy < ApplicationPolicy
+  def show?
+    target? || role.can?(:manage_appeals)
+  end
+
+  def appeal?
+    target? && record.created_at >= Appeal::MAX_STRIKE_AGE.ago
+  end
+
+  private
+
+  def target?
+    record.target_account_id == current_account&.id
+  end
+end
diff --git a/app/policies/account_warning_preset_policy.rb b/app/policies/account_warning_preset_policy.rb
index bccbd33ef..59514e951 100644
--- a/app/policies/account_warning_preset_policy.rb
+++ b/app/policies/account_warning_preset_policy.rb
@@ -2,18 +2,18 @@
 
 class AccountWarningPresetPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_settings)
   end
 
   def create?
-    staff?
+    role.can?(:manage_settings)
   end
 
   def update?
-    staff?
+    role.can?(:manage_settings)
   end
 
   def destroy?
-    staff?
+    role.can?(:manage_settings)
   end
 end
diff --git a/app/policies/admin/status_policy.rb b/app/policies/admin/status_policy.rb
new file mode 100644
index 000000000..ffaa30f13
--- /dev/null
+++ b/app/policies/admin/status_policy.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Admin::StatusPolicy < ApplicationPolicy
+  def initialize(current_account, record, preloaded_relations = {})
+    super(current_account, record)
+
+    @preloaded_relations = preloaded_relations
+  end
+
+  def index?
+    role.can?(:manage_reports, :manage_users)
+  end
+
+  def show?
+    role.can?(:manage_reports, :manage_users) && (record.public_visibility? || record.unlisted_visibility? || record.reported?)
+  end
+
+  def destroy?
+    role.can?(:manage_reports)
+  end
+
+  def update?
+    role.can?(:manage_reports)
+  end
+
+  def review?
+    role.can?(:manage_taxonomies)
+  end
+end
diff --git a/app/policies/announcement_policy.rb b/app/policies/announcement_policy.rb
index 0a4e4575c..b5dc6a18a 100644
--- a/app/policies/announcement_policy.rb
+++ b/app/policies/announcement_policy.rb
@@ -2,18 +2,18 @@
 
 class AnnouncementPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_announcements)
   end
 
   def create?
-    admin?
+    role.can?(:manage_announcements)
   end
 
   def update?
-    admin?
+    role.can?(:manage_announcements)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_announcements)
   end
 end
diff --git a/app/policies/appeal_policy.rb b/app/policies/appeal_policy.rb
new file mode 100644
index 000000000..7466b334b
--- /dev/null
+++ b/app/policies/appeal_policy.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AppealPolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_appeals)
+  end
+
+  def approve?
+    record.pending? && role.can?(:manage_appeals)
+  end
+
+  def reject?
+    record.pending? && role.can?(:manage_appeals)
+  end
+end
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index d1de5e81a..163b81e9e 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -8,8 +8,6 @@ class ApplicationPolicy
     @record          = record
   end
 
-  delegate :admin?, :moderator?, :staff?, to: :current_user, allow_nil: true
-
   private
 
   def current_user
@@ -19,4 +17,8 @@ class ApplicationPolicy
   def user_signed_in?
     !current_user.nil?
   end
+
+  def role
+    current_user&.role || UserRole.nobody
+  end
 end
diff --git a/app/policies/audit_log_policy.rb b/app/policies/audit_log_policy.rb
new file mode 100644
index 000000000..f78aa9a8e
--- /dev/null
+++ b/app/policies/audit_log_policy.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AuditLogPolicy < ApplicationPolicy
+  def index?
+    role.can?(:view_audit_log)
+  end
+end
diff --git a/app/policies/canonical_email_block_policy.rb b/app/policies/canonical_email_block_policy.rb
new file mode 100644
index 000000000..8d76075c9
--- /dev/null
+++ b/app/policies/canonical_email_block_policy.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CanonicalEmailBlockPolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_blocks)
+  end
+
+  def show?
+    role.can?(:manage_blocks)
+  end
+
+  def test?
+    role.can?(:manage_blocks)
+  end
+
+  def create?
+    role.can?(:manage_blocks)
+  end
+
+  def destroy?
+    role.can?(:manage_blocks)
+  end
+end
diff --git a/app/policies/custom_emoji_policy.rb b/app/policies/custom_emoji_policy.rb
index a8c3cbc73..18de71c19 100644
--- a/app/policies/custom_emoji_policy.rb
+++ b/app/policies/custom_emoji_policy.rb
@@ -2,30 +2,30 @@
 
 class CustomEmojiPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_custom_emojis)
   end
 
   def create?
-    admin?
+    role.can?(:manage_custom_emojis)
   end
 
   def update?
-    admin?
+    role.can?(:manage_custom_emojis)
   end
 
   def copy?
-    admin?
+    role.can?(:manage_custom_emojis)
   end
 
   def enable?
-    staff?
+    role.can?(:manage_custom_emojis)
   end
 
   def disable?
-    staff?
+    role.can?(:manage_custom_emojis)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_custom_emojis)
   end
 end
diff --git a/app/policies/dashboard_policy.rb b/app/policies/dashboard_policy.rb
new file mode 100644
index 000000000..3df1c3088
--- /dev/null
+++ b/app/policies/dashboard_policy.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class DashboardPolicy < ApplicationPolicy
+  def index?
+    role.can?(:view_dashboard)
+  end
+end
diff --git a/app/policies/delivery_policy.rb b/app/policies/delivery_policy.rb
index 24d06c168..f6ba2eb18 100644
--- a/app/policies/delivery_policy.rb
+++ b/app/policies/delivery_policy.rb
@@ -2,14 +2,14 @@
 
 class DeliveryPolicy < ApplicationPolicy
   def clear_delivery_errors?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def restart_delivery?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def stop_delivery?
-    admin?
+    role.can?(:manage_federation)
   end
 end
diff --git a/app/policies/domain_allow_policy.rb b/app/policies/domain_allow_policy.rb
index 5030453bb..45c797ecd 100644
--- a/app/policies/domain_allow_policy.rb
+++ b/app/policies/domain_allow_policy.rb
@@ -1,11 +1,19 @@
 # frozen_string_literal: true
 
 class DomainAllowPolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_federation)
+  end
+
+  def show?
+    role.can?(:manage_federation)
+  end
+
   def create?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_federation)
   end
 end
diff --git a/app/policies/domain_block_policy.rb b/app/policies/domain_block_policy.rb
index 543259cce..0fea2e035 100644
--- a/app/policies/domain_block_policy.rb
+++ b/app/policies/domain_block_policy.rb
@@ -2,22 +2,22 @@
 
 class DomainBlockPolicy < ApplicationPolicy
   def index?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def show?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def create?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def update?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_federation)
   end
 end
diff --git a/app/policies/email_domain_block_policy.rb b/app/policies/email_domain_block_policy.rb
index 5a75ee183..0d167ea3e 100644
--- a/app/policies/email_domain_block_policy.rb
+++ b/app/policies/email_domain_block_policy.rb
@@ -2,14 +2,18 @@
 
 class EmailDomainBlockPolicy < ApplicationPolicy
   def index?
-    admin?
+    role.can?(:manage_blocks)
+  end
+
+  def show?
+    role.can?(:manage_blocks)
   end
 
   def create?
-    admin?
+    role.can?(:manage_blocks)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_blocks)
   end
 end
diff --git a/app/policies/follow_recommendation_policy.rb b/app/policies/follow_recommendation_policy.rb
index 68cd0e547..9245733ea 100644
--- a/app/policies/follow_recommendation_policy.rb
+++ b/app/policies/follow_recommendation_policy.rb
@@ -2,14 +2,14 @@
 
 class FollowRecommendationPolicy < ApplicationPolicy
   def show?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
   def suppress?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
   def unsuppress?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 end
diff --git a/app/policies/instance_policy.rb b/app/policies/instance_policy.rb
index 801ca162e..b15e123fe 100644
--- a/app/policies/instance_policy.rb
+++ b/app/policies/instance_policy.rb
@@ -2,14 +2,14 @@
 
 class InstancePolicy < ApplicationPolicy
   def index?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def show?
-    admin?
+    role.can?(:manage_federation)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_federation)
   end
 end
diff --git a/app/policies/invite_policy.rb b/app/policies/invite_policy.rb
index 14236f78b..24eacd08e 100644
--- a/app/policies/invite_policy.rb
+++ b/app/policies/invite_policy.rb
@@ -2,19 +2,19 @@
 
 class InvitePolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_invites)
   end
 
   def create?
-    min_required_role?
+    role.can?(:invite_users)
   end
 
   def deactivate_all?
-    admin?
+    role.can?(:manage_invites)
   end
 
   def destroy?
-    owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?)
+    owner? || role.can?(:manage_invites)
   end
 
   private
@@ -22,8 +22,4 @@ class InvitePolicy < ApplicationPolicy
   def owner?
     record.user_id == current_user&.id
   end
-
-  def min_required_role?
-    current_user&.role?(Setting.min_invite_role)
-  end
 end
diff --git a/app/policies/ip_block_policy.rb b/app/policies/ip_block_policy.rb
index 34dbd746a..8baf6ee2d 100644
--- a/app/policies/ip_block_policy.rb
+++ b/app/policies/ip_block_policy.rb
@@ -2,14 +2,22 @@
 
 class IpBlockPolicy < ApplicationPolicy
   def index?
-    admin?
+    role.can?(:manage_blocks)
+  end
+
+  def show?
+    role.can?(:manage_blocks)
   end
 
   def create?
-    admin?
+    role.can?(:manage_blocks)
+  end
+
+  def update?
+    role.can?(:manage_blocks)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_blocks)
   end
 end
diff --git a/app/policies/preview_card_policy.rb b/app/policies/preview_card_policy.rb
index 4f485d7fc..a7bb41634 100644
--- a/app/policies/preview_card_policy.rb
+++ b/app/policies/preview_card_policy.rb
@@ -2,10 +2,10 @@
 
 class PreviewCardPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
-  def update?
-    staff?
+  def review?
+    role.can?(:manage_taxonomies)
   end
 end
diff --git a/app/policies/preview_card_provider_policy.rb b/app/policies/preview_card_provider_policy.rb
index 598d54a5e..131ccb5dd 100644
--- a/app/policies/preview_card_provider_policy.rb
+++ b/app/policies/preview_card_provider_policy.rb
@@ -2,10 +2,10 @@
 
 class PreviewCardProviderPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
-  def update?
-    staff?
+  def review?
+    role.can?(:manage_taxonomies)
   end
 end
diff --git a/app/policies/relay_policy.rb b/app/policies/relay_policy.rb
index bd75e2197..4305bcfaa 100644
--- a/app/policies/relay_policy.rb
+++ b/app/policies/relay_policy.rb
@@ -2,6 +2,6 @@
 
 class RelayPolicy < ApplicationPolicy
   def update?
-    admin?
+    role.can?(:manage_federation)
   end
 end
diff --git a/app/policies/report_note_policy.rb b/app/policies/report_note_policy.rb
index 694bc096b..dc31416e8 100644
--- a/app/policies/report_note_policy.rb
+++ b/app/policies/report_note_policy.rb
@@ -2,11 +2,11 @@
 
 class ReportNotePolicy < ApplicationPolicy
   def create?
-    staff?
+    role.can?(:manage_reports)
   end
 
   def destroy?
-    admin? || owner?
+    owner? || (role.can?(:manage_reports) && role.overrides?(record.account.user_role))
   end
 
   private
diff --git a/app/policies/report_policy.rb b/app/policies/report_policy.rb
index 95b5c30c8..c9f7639bd 100644
--- a/app/policies/report_policy.rb
+++ b/app/policies/report_policy.rb
@@ -2,14 +2,14 @@
 
 class ReportPolicy < ApplicationPolicy
   def update?
-    staff?
+    role.can?(:manage_reports)
   end
 
   def index?
-    staff?
+    role.can?(:manage_reports)
   end
 
   def show?
-    staff?
+    role.can?(:manage_reports)
   end
 end
diff --git a/app/policies/rule_policy.rb b/app/policies/rule_policy.rb
index 6a4def009..51b2a6977 100644
--- a/app/policies/rule_policy.rb
+++ b/app/policies/rule_policy.rb
@@ -2,18 +2,18 @@
 
 class RulePolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_rules)
   end
 
   def create?
-    admin?
+    role.can?(:manage_rules)
   end
 
   def update?
-    admin?
+    role.can?(:manage_rules)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_rules)
   end
 end
diff --git a/app/policies/settings_policy.rb b/app/policies/settings_policy.rb
index 874f97bab..2b052af27 100644
--- a/app/policies/settings_policy.rb
+++ b/app/policies/settings_policy.rb
@@ -2,14 +2,14 @@
 
 class SettingsPolicy < ApplicationPolicy
   def update?
-    admin?
+    role.can?(:manage_settings)
   end
 
   def show?
-    admin?
+    role.can?(:manage_settings)
   end
 
   def destroy?
-    admin?
+    role.can?(:manage_settings)
   end
 end
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index bcf9c3395..f3d0ffdba 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -7,10 +7,6 @@ class StatusPolicy < ApplicationPolicy
     @preloaded_relations = preloaded_relations
   end
 
-  def index?
-    staff?
-  end
-
   def show?
     return false if author.suspended?
 
@@ -32,13 +28,13 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def destroy?
-    staff? || owned?
+    owned?
   end
 
   alias unreblog? destroy?
 
   def update?
-    staff?
+    owned?
   end
 
   private
diff --git a/app/policies/tag_policy.rb b/app/policies/tag_policy.rb
index aaf70fcab..bb1d37d6c 100644
--- a/app/policies/tag_policy.rb
+++ b/app/policies/tag_policy.rb
@@ -2,14 +2,18 @@
 
 class TagPolicy < ApplicationPolicy
   def index?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
   def show?
-    staff?
+    role.can?(:manage_taxonomies)
   end
 
   def update?
-    staff?
+    role.can?(:manage_taxonomies)
+  end
+
+  def review?
+    role.can?(:manage_taxonomies)
   end
 end
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index 6695a0ddf..6751b8b8f 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -2,60 +2,38 @@
 
 class UserPolicy < ApplicationPolicy
   def reset_password?
-    staff? && !record.staff?
+    role.can?(:manage_user_access) && role.overrides?(record.role)
   end
 
   def change_email?
-    staff? && !record.staff?
+    role.can?(:manage_user_access) && role.overrides?(record.role)
   end
 
   def disable_2fa?
-    admin? && !record.staff?
+    role.can?(:manage_user_access) && role.overrides?(record.role)
   end
 
-  def disable_sign_in_token_auth?
-    staff?
-  end
-
-  def enable_sign_in_token_auth?
-    staff?
+  def change_role?
+    role.can?(:manage_roles) && role.overrides?(record.role)
   end
 
   def confirm?
-    staff? && !record.confirmed?
+    role.can?(:manage_user_access) && !record.confirmed?
   end
 
   def enable?
-    staff?
+    role.can?(:manage_users)
   end
 
   def approve?
-    staff? && !record.approved?
+    role.can?(:manage_users) && !record.approved?
   end
 
   def reject?
-    staff? && !record.approved?
+    role.can?(:manage_users) && !record.approved?
   end
 
   def disable?
-    staff? && !record.admin?
-  end
-
-  def promote?
-    admin? && promoteable?
-  end
-
-  def demote?
-    admin? && !record.admin? && demoteable?
-  end
-
-  private
-
-  def promoteable?
-    record.approved? && (!record.staff? || !record.admin?)
-  end
-
-  def demoteable?
-    record.staff?
+    role.can?(:manage_users) && role.overrides?(record.role)
   end
 end
diff --git a/app/policies/user_role_policy.rb b/app/policies/user_role_policy.rb
new file mode 100644
index 000000000..6144a0ec4
--- /dev/null
+++ b/app/policies/user_role_policy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class UserRolePolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_roles)
+  end
+
+  def create?
+    role.can?(:manage_roles)
+  end
+
+  def update?
+    role.can?(:manage_roles) && (role.overrides?(record) || role.id == record.id)
+  end
+
+  def destroy?
+    !record.everyone? && role.can?(:manage_roles) && role.overrides?(record) && role.id != record.id
+  end
+end
diff --git a/app/policies/webhook_policy.rb b/app/policies/webhook_policy.rb
new file mode 100644
index 000000000..a2199a333
--- /dev/null
+++ b/app/policies/webhook_policy.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class WebhookPolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_webhooks)
+  end
+
+  def create?
+    role.can?(:manage_webhooks)
+  end
+
+  def show?
+    role.can?(:manage_webhooks)
+  end
+
+  def update?
+    role.can?(:manage_webhooks)
+  end
+
+  def enable?
+    role.can?(:manage_webhooks)
+  end
+
+  def disable?
+    role.can?(:manage_webhooks)
+  end
+
+  def rotate_secret?
+    role.can?(:manage_webhooks)
+  end
+
+  def destroy?
+    role.can?(:manage_webhooks)
+  end
+end
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
index d662380f6..ab8bac412 100644
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@@ -2,7 +2,7 @@
 
 class AccountRelationshipsPresenter
   attr_reader :following, :followed_by, :blocking, :blocked_by,
-              :muting, :requested, :domain_blocking,
+              :muting, :requested, :requested_by, :domain_blocking,
               :endorsed, :account_note
 
   def initialize(account_ids, current_account_id, **options)
@@ -15,6 +15,7 @@ class AccountRelationshipsPresenter
     @blocked_by      = cached[:blocked_by].merge(Account.blocked_by_map(@uncached_account_ids, @current_account_id))
     @muting          = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id))
     @requested       = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id))
+    @requested_by    = cached[:requested_by].merge(Account.requested_by_map(@uncached_account_ids, @current_account_id))
     @domain_blocking = cached[:domain_blocking].merge(Account.domain_blocking_map(@uncached_account_ids, @current_account_id))
     @endorsed        = cached[:endorsed].merge(Account.endorsed_map(@uncached_account_ids, @current_account_id))
     @account_note    = cached[:account_note].merge(Account.account_note_map(@uncached_account_ids, @current_account_id))
@@ -27,6 +28,7 @@ class AccountRelationshipsPresenter
     @blocked_by.merge!(options[:blocked_by_map] || {})
     @muting.merge!(options[:muting_map] || {})
     @requested.merge!(options[:requested_map] || {})
+    @requested_by.merge!(options[:requested_by_map] || {})
     @domain_blocking.merge!(options[:domain_blocking_map] || {})
     @endorsed.merge!(options[:endorsed_map] || {})
     @account_note.merge!(options[:account_note_map] || {})
@@ -44,6 +46,7 @@ class AccountRelationshipsPresenter
       blocked_by: {},
       muting: {},
       requested: {},
+      requested_by: {},
       domain_blocking: {},
       endorsed: {},
       account_note: {},
@@ -73,6 +76,7 @@ class AccountRelationshipsPresenter
         blocked_by:      { account_id => blocked_by[account_id] },
         muting:          { account_id => muting[account_id] },
         requested:       { account_id => requested[account_id] },
+        requested_by:    { account_id => requested_by[account_id] },
         domain_blocking: { account_id => domain_blocking[account_id] },
         endorsed:        { account_id => endorsed[account_id] },
         account_note:    { account_id => account_note[account_id] },
diff --git a/app/presenters/activitypub/activity_presenter.rb b/app/presenters/activitypub/activity_presenter.rb
index 5d174767f..38e8527e8 100644
--- a/app/presenters/activitypub/activity_presenter.rb
+++ b/app/presenters/activitypub/activity_presenter.rb
@@ -4,7 +4,7 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
   attributes :id, :type, :actor, :published, :to, :cc, :virtual_object
 
   class << self
-    def from_status(status)
+    def from_status(status, allow_inlining: true)
       new.tap do |presenter|
         presenter.id        = ActivityPub::TagManager.instance.activity_uri_for(status)
         presenter.type      = status.reblog? ? 'Announce' : 'Create'
@@ -15,7 +15,7 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
 
         presenter.virtual_object = begin
           if status.reblog?
-            if status.account == status.proper.account && status.proper.private_visibility? && status.local?
+            if allow_inlining && status.account == status.proper.account && status.proper.private_visibility? && status.local?
               status.proper
             else
               ActivityPub::TagManager.instance.uri_for(status.proper)
diff --git a/app/presenters/familiar_followers_presenter.rb b/app/presenters/familiar_followers_presenter.rb
new file mode 100644
index 000000000..c1d944b80
--- /dev/null
+++ b/app/presenters/familiar_followers_presenter.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class FamiliarFollowersPresenter
+  class Result < ActiveModelSerializers::Model
+    attributes :id, :accounts
+  end
+
+  def initialize(accounts, current_account_id)
+    @accounts           = accounts
+    @current_account_id = current_account_id
+  end
+
+  def accounts
+    map = Follow.includes(account: :account_stat).where(target_account_id: @accounts.map(&:id)).where(account_id: Follow.where(account_id: @current_account_id).joins(:target_account).merge(Account.where(hide_collections: [nil, false])).select(:target_account_id)).group_by(&:target_account_id)
+    @accounts.map { |account| Result.new(id: account.id, accounts: (account.hide_collections? ? [] : (map[account.id] || [])).map(&:account)) }
+  end
+end
diff --git a/app/presenters/filter_result_presenter.rb b/app/presenters/filter_result_presenter.rb
new file mode 100644
index 000000000..1e9e8f3c1
--- /dev/null
+++ b/app/presenters/filter_result_presenter.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class FilterResultPresenter < ActiveModelSerializers::Model
+  attributes :filter, :keyword_matches, :status_matches
+end
diff --git a/app/presenters/initial_state_presenter.rb b/app/presenters/initial_state_presenter.rb
index 06482935c..b87cff51e 100644
--- a/app/presenters/initial_state_presenter.rb
+++ b/app/presenters/initial_state_presenter.rb
@@ -2,5 +2,10 @@
 
 class InitialStatePresenter < ActiveModelSerializers::Model
   attributes :settings, :push_subscription, :token,
-             :current_account, :admin, :text, :visibility
+             :current_account, :admin, :owner, :text, :visibility,
+             :disabled_account, :moved_to_account
+
+  def role
+    current_account&.user_role
+  end
 end
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 3e85faa92..fba3cc734 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -1,19 +1,53 @@
 # frozen_string_literal: true
 
-class InstancePresenter
-  delegate(
-    :site_contact_email,
-    :site_title,
-    :site_short_description,
-    :site_description,
-    :site_extended_description,
-    :site_terms,
-    :closed_registrations_message,
-    to: Setting
-  )
+class InstancePresenter < ActiveModelSerializers::Model
+  attributes :domain, :title, :version, :source_url,
+             :description, :languages, :rules, :contact
 
-  def contact_account
-    Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, ''))
+  class ContactPresenter < ActiveModelSerializers::Model
+    attributes :email, :account
+
+    def email
+      Setting.site_contact_email
+    end
+
+    def account
+      username, domain = Setting.site_contact_username.strip.gsub(/\A@/, '').split('@', 2)
+      domain = nil if TagManager.instance.local_domain?(domain)
+      Account.find_remote(username, domain) if username.present?
+    end
+  end
+
+  def contact
+    ContactPresenter.new
+  end
+
+  def closed_registrations_message
+    Setting.closed_registrations_message
+  end
+
+  def description
+    Setting.site_short_description
+  end
+
+  def extended_description
+    Setting.site_extended_description
+  end
+
+  def privacy_policy
+    Setting.site_terms
+  end
+
+  def domain
+    Rails.configuration.x.local_domain
+  end
+
+  def title
+    Setting.site_title
+  end
+
+  def languages
+    [I18n.default_locale]
   end
 
   def rules
@@ -40,8 +74,8 @@ class InstancePresenter
     Rails.cache.fetch('sample_accounts', expires_in: 12.hours) { Account.local.discoverable.popular.limit(3) }
   end
 
-  def version_number
-    Mastodon::Version
+  def version
+    Mastodon::Version.to_s
   end
 
   def source_url
@@ -52,10 +86,6 @@ class InstancePresenter
     @thumbnail ||= Rails.cache.fetch('site_uploads/thumbnail') { SiteUpload.find_by(var: 'thumbnail') }
   end
 
-  def hero
-    @hero ||= Rails.cache.fetch('site_uploads/hero') { SiteUpload.find_by(var: 'hero') }
-  end
-
   def mascot
     @mascot ||= Rails.cache.fetch('site_uploads/mascot') { SiteUpload.find_by(var: 'mascot') }
   end
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index 70fb2ba90..be818a2de 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -2,7 +2,7 @@
 
 class StatusRelationshipsPresenter
   attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map,
-              :bookmarks_map
+              :bookmarks_map, :filters_map
 
   def initialize(statuses, current_account_id = nil, **options)
     if current_account_id.nil?
@@ -11,12 +11,14 @@ class StatusRelationshipsPresenter
       @bookmarks_map  = {}
       @mutes_map      = {}
       @pins_map       = {}
+      @filters_map    = {}
     else
       statuses            = statuses.compact
       status_ids          = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
       conversation_ids    = statuses.filter_map(&:conversation_id).uniq
-      pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }
+      pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted private).include?(s.visibility) }
 
+      @filters_map     = build_filters_map(statuses, current_account_id).merge(options[:filters_map] || {})
       @reblogs_map     = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
       @favourites_map  = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
       @bookmarks_map   = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
@@ -24,4 +26,19 @@ class StatusRelationshipsPresenter
       @pins_map        = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
     end
   end
+
+  private
+
+  def build_filters_map(statuses, current_account_id)
+    active_filters = CustomFilter.cached_filters_for(current_account_id)
+
+    @filters_map = statuses.each_with_object({}) do |status, h|
+      filter_matches = CustomFilter.apply_cached_filters(active_filters, status)
+
+      unless filter_matches.empty?
+        h[status.id] = filter_matches
+        h[status.reblog_of_id] = filter_matches if status.reblog?
+      end
+    end
+  end
 end
diff --git a/app/presenters/tag_relationships_presenter.rb b/app/presenters/tag_relationships_presenter.rb
new file mode 100644
index 000000000..c3bdbaf07
--- /dev/null
+++ b/app/presenters/tag_relationships_presenter.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class TagRelationshipsPresenter
+  attr_reader :following_map
+
+  def initialize(tags, current_account_id = nil, **options)
+    @following_map = begin
+      if current_account_id.nil?
+        {}
+      else
+        TagFollow.select(:tag_id).where(tag_id: tags.map(&:id), account_id: current_account_id).each_with_object({}) { |f, h| h[f.tag_id] = true }.merge(options[:following_map] || {})
+      end
+    end
+  end
+end
diff --git a/app/presenters/webhooks/event_presenter.rb b/app/presenters/webhooks/event_presenter.rb
new file mode 100644
index 000000000..dac14a3f0
--- /dev/null
+++ b/app/presenters/webhooks/event_presenter.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Webhooks::EventPresenter < ActiveModelSerializers::Model
+  attributes :type, :created_at, :object
+
+  def initialize(type, object)
+    super()
+
+    @type       = type
+    @created_at = Time.now.utc
+    @object     = object
+  end
+end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 48707aa16..e6dd8040e 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -2,6 +2,7 @@
 
 class ActivityPub::ActorSerializer < ActivityPub::Serializer
   include RoutingHelper
+  include FormattingHelper
 
   context :security
 
@@ -102,7 +103,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   end
 
   def summary
-    object.suspended? ? '' : Formatter.instance.simplified_format(object)
+    object.suspended? ? '' : account_bio_format(object)
   end
 
   def icon
@@ -185,6 +186,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   end
 
   class Account::FieldSerializer < ActivityPub::Serializer
+    include FormattingHelper
+
     attributes :type, :name, :value
 
     def type
@@ -192,7 +195,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     end
 
     def value
-      Formatter.instance.format_field(object.account, object.value)
+      account_field_value_format(object)
     end
   end
 
diff --git a/app/serializers/activitypub/add_serializer.rb b/app/serializers/activitypub/add_serializer.rb
index 6f5aab17f..436b05086 100644
--- a/app/serializers/activitypub/add_serializer.rb
+++ b/app/serializers/activitypub/add_serializer.rb
@@ -1,10 +1,29 @@
 # frozen_string_literal: true
 
 class ActivityPub::AddSerializer < ActivityPub::Serializer
+  class UriSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    def serializable_hash(*_args)
+      ActivityPub::TagManager.instance.uri_for(object)
+    end
+  end
+
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      UriSerializer
+    when 'FeaturedTag'
+      ActivityPub::HashtagSerializer
+    else
+      super
+    end
+  end
+
   include RoutingHelper
 
   attributes :type, :actor, :target
-  attribute :proper_object, key: :object
+  has_one :proper_object, key: :object
 
   def type
     'Add'
@@ -15,7 +34,7 @@ class ActivityPub::AddSerializer < ActivityPub::Serializer
   end
 
   def proper_object
-    ActivityPub::TagManager.instance.uri_for(object)
+    object
   end
 
   def target
diff --git a/app/serializers/activitypub/hashtag_serializer.rb b/app/serializers/activitypub/hashtag_serializer.rb
index 1a56e4dfe..2b24eb8cc 100644
--- a/app/serializers/activitypub/hashtag_serializer.rb
+++ b/app/serializers/activitypub/hashtag_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::HashtagSerializer < ActivityPub::Serializer
+  context_extensions :hashtag
+
   include RoutingHelper
 
   attributes :type, :href, :name
@@ -10,11 +12,11 @@ class ActivityPub::HashtagSerializer < ActivityPub::Serializer
   end
 
   def name
-    "##{object.name}"
+    "##{object.display_name}"
   end
 
   def href
-    if object.class.name == 'FeaturedTag'
+    if object.instance_of?(FeaturedTag)
       short_account_tag_url(object.account, object.tag)
     else
       tag_url(object)
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 7c52b634d..27e058199 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::NoteSerializer < ActivityPub::Serializer
+  include FormattingHelper
+
   context_extensions :atom_uri, :conversation, :sensitive, :voters_count
 
   attributes :id, :type, :summary,
@@ -11,8 +13,9 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 
   attribute :content
   attribute :content_map, if: :language?
+  attribute :updated, if: :edited?
 
-  has_many :media_attachments, key: :attachment
+  has_many :virtual_attachments, key: :attachment
   has_many :virtual_tags, key: :tag
 
   has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
@@ -38,11 +41,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def content
-    Formatter.instance.format(object)
+    status_content_format(object)
   end
 
   def content_map
-    { object.language => Formatter.instance.format(object) }
+    { object.language => content }
   end
 
   def replies
@@ -65,6 +68,8 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     object.language.present?
   end
 
+  delegate :edited?, to: :object
+
   def in_reply_to
     return unless object.reply? && !object.thread.nil?
 
@@ -79,6 +84,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     object.created_at.iso8601
   end
 
+  def updated
+    object.edited_at.iso8601
+  end
+
   def url
     ActivityPub::TagManager.instance.url_for(object)
   end
@@ -99,6 +108,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     object.account.sensitized? || object.sensitive
   end
 
+  def virtual_attachments
+    object.ordered_media_attachments
+  end
+
   def virtual_tags
     object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
   end
diff --git a/app/serializers/activitypub/public_key_serializer.rb b/app/serializers/activitypub/public_key_serializer.rb
index 62ed49e81..8621517e7 100644
--- a/app/serializers/activitypub/public_key_serializer.rb
+++ b/app/serializers/activitypub/public_key_serializer.rb
@@ -6,7 +6,7 @@ class ActivityPub::PublicKeySerializer < ActivityPub::Serializer
   attributes :id, :owner, :public_key_pem
 
   def id
-    [ActivityPub::TagManager.instance.uri_for(object), '#main-key'].join
+    ActivityPub::TagManager.instance.key_uri_for(object)
   end
 
   def owner
diff --git a/app/serializers/activitypub/remove_serializer.rb b/app/serializers/activitypub/remove_serializer.rb
index 7fefda59d..fb224f8a9 100644
--- a/app/serializers/activitypub/remove_serializer.rb
+++ b/app/serializers/activitypub/remove_serializer.rb
@@ -1,10 +1,29 @@
 # frozen_string_literal: true
 
 class ActivityPub::RemoveSerializer < ActivityPub::Serializer
+  class UriSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    def serializable_hash(*_args)
+      ActivityPub::TagManager.instance.uri_for(object)
+    end
+  end
+
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      UriSerializer
+    when 'FeaturedTag'
+      ActivityPub::HashtagSerializer
+    else
+      super
+    end
+  end
+
   include RoutingHelper
 
   attributes :type, :actor, :target
-  attribute :proper_object, key: :object
+  has_one :proper_object, key: :object
 
   def type
     'Remove'
@@ -15,7 +34,7 @@ class ActivityPub::RemoveSerializer < ActivityPub::Serializer
   end
 
   def proper_object
-    ActivityPub::TagManager.instance.uri_for(object)
+    object
   end
 
   def target
diff --git a/app/serializers/activitypub/undo_announce_serializer.rb b/app/serializers/activitypub/undo_announce_serializer.rb
index a925efc18..a0f09e8ab 100644
--- a/app/serializers/activitypub/undo_announce_serializer.rb
+++ b/app/serializers/activitypub/undo_announce_serializer.rb
@@ -22,6 +22,6 @@ class ActivityPub::UndoAnnounceSerializer < ActivityPub::Serializer
   end
 
   def virtual_object
-    ActivityPub::ActivityPresenter.from_status(object)
+    ActivityPub::ActivityPresenter.from_status(object, allow_inlining: false)
   end
 end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index b3b913946..70f40088d 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -1,28 +1,37 @@
 # frozen_string_literal: true
 
 class InitialStateSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
   attributes :meta, :compose, :accounts,
-             :media_attachments, :settings
+             :media_attachments, :settings,
+             :languages
 
   has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
+  has_one :role, serializer: REST::RoleSerializer
 
+  # rubocop:disable Metrics/AbcSize
   def meta
     store = {
       streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
       access_token: object.token,
       locale: I18n.locale,
-      domain: Rails.configuration.x.local_domain,
-      title: instance_presenter.site_title,
+      domain: Addressable::IDNA.to_unicode(instance_presenter.domain),
+      title: instance_presenter.title,
       admin: object.admin&.id&.to_s,
       search_enabled: Chewy.enabled?,
       repository: Mastodon::Version.repository,
-      source_url: Mastodon::Version.source_url,
-      version: Mastodon::Version.to_s,
-      invites_enabled: Setting.min_invite_role == 'user',
+      source_url: instance_presenter.source_url,
+      version: instance_presenter.version,
       limited_federation_mode: Rails.configuration.x.whitelist_mode,
       mascot: instance_presenter.mascot&.file&.url,
       profile_directory: Setting.profile_directory,
       trends: Setting.trends,
+      registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
+      timeline_preview: Setting.timeline_preview,
+      activity_api_enabled: Setting.activity_api_enabled,
+      single_user_mode: Rails.configuration.x.single_user_mode,
+      translation_enabled: TranslationService.configured?,
     }
 
     if object.current_account
@@ -38,7 +47,6 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:advanced_layout]   = object.current_account.user.setting_advanced_layout
       store[:use_blurhash]      = object.current_account.user.setting_use_blurhash
       store[:use_pending_items] = object.current_account.user.setting_use_pending_items
-      store[:is_staff]          = object.current_account.user.staff?
       store[:trends]            = Setting.trends && object.current_account.user.setting_trends
       store[:crop_images]       = object.current_account.user.setting_crop_images
     else
@@ -49,8 +57,16 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:crop_images]   = Setting.crop_images
     end
 
+    store[:disabled_account_id] = object.disabled_account.id.to_s if object.disabled_account
+    store[:moved_to_account_id] = object.moved_to_account.id.to_s if object.moved_to_account
+
+    if Rails.configuration.x.single_user_mode
+      store[:owner] = object.owner&.id&.to_s
+    end
+
     store
   end
+  # rubocop:enable Metrics/AbcSize
 
   def compose
     store = {}
@@ -59,6 +75,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:me]                = object.current_account.id.to_s
       store[:default_privacy]   = object.visibility || object.current_account.user.setting_default_privacy
       store[:default_sensitive] = object.current_account.user.setting_default_sensitive
+      store[:default_language]  = object.current_account.user.preferred_posting_language
     end
 
     store[:text] = object.text if object.text
@@ -68,8 +85,15 @@ class InitialStateSerializer < ActiveModel::Serializer
 
   def accounts
     store = {}
-    store[object.current_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
-    store[object.admin.id.to_s]           = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
+
+    ActiveRecord::Associations::Preloader.new.preload([object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact, [:account_stat, :user, { moved_to_account: [:account_stat, :user] }])
+
+    store[object.current_account.id.to_s]  = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
+    store[object.admin.id.to_s]            = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
+    store[object.owner.id.to_s]            = ActiveModelSerializers::SerializableResource.new(object.owner, serializer: REST::AccountSerializer) if object.owner
+    store[object.disabled_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.disabled_account, serializer: REST::AccountSerializer) if object.disabled_account
+    store[object.moved_to_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.moved_to_account, serializer: REST::AccountSerializer) if object.moved_to_account
+
     store
   end
 
@@ -77,6 +101,10 @@ class InitialStateSerializer < ActiveModel::Serializer
     { accept_content_types: MediaAttachment.supported_file_extensions + MediaAttachment.supported_mime_types }
   end
 
+  def languages
+    LanguagesHelper::SUPPORTED_LOCALES.map { |(key, value)| [key, value[0], value[1]] }
+  end
+
   private
 
   def instance_presenter
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 4786aa760..48f3aa7a6 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -4,35 +4,44 @@ class ManifestSerializer < ActiveModel::Serializer
   include RoutingHelper
   include ActionView::Helpers::TextHelper
 
-  attributes :name, :short_name, :description,
+  ICON_SIZES = %w(
+    36
+    48
+    72
+    96
+    144
+    192
+    256
+    384
+    512
+  ).freeze
+
+  attributes :name, :short_name,
              :icons, :theme_color, :background_color,
              :display, :start_url, :scope,
              :share_target, :shortcuts
 
   def name
-    object.site_title
+    object.title
   end
 
   def short_name
-    object.site_title
-  end
-
-  def description
-    strip_tags(object.site_short_description.presence || I18n.t('about.about_mastodon_html'))
+    object.title
   end
 
   def icons
-    [
+    ICON_SIZES.map do |size|
       {
-        src: '/android-chrome-192x192.png',
-        sizes: '192x192',
+        src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
+        sizes: "#{size}x#{size}",
         type: 'image/png',
-      },
-    ]
+        purpose: 'any maskable',
+      }
+    end
   end
 
   def theme_color
-    '#282c37'
+    '#191b22'
   end
 
   def background_color
@@ -44,7 +53,7 @@ class ManifestSerializer < ActiveModel::Serializer
   end
 
   def start_url
-    '/web/timelines/home'
+    '/home'
   end
 
   def scope
@@ -68,37 +77,12 @@ class ManifestSerializer < ActiveModel::Serializer
   def shortcuts
     [
       {
-        name: 'New toot',
-        url: '/web/statuses/new',
-        icons: [
-          {
-            src: '/shortcuts/new-status.png',
-            type: 'image/png',
-            sizes: '192x192',
-          },
-        ],
+        name: 'Compose new post',
+        url: '/publish',
       },
       {
         name: 'Notifications',
-        url: '/web/notifications',
-        icons: [
-          {
-            src: '/shortcuts/notifications.png',
-            type: 'image/png',
-            sizes: '192x192',
-          },
-        ],
-      },
-      {
-        name: 'Direct messages',
-        url: '/web/timelines/direct',
-        icons: [
-          {
-            src: '/shortcuts/direct.png',
-            type: 'image/png',
-            sizes: '192x192',
-          },
-        ],
+        url: '/notifications',
       },
     ]
   end
diff --git a/app/serializers/nodeinfo/serializer.rb b/app/serializers/nodeinfo/serializer.rb
index 7ff8aabec..f70cc38f0 100644
--- a/app/serializers/nodeinfo/serializer.rb
+++ b/app/serializers/nodeinfo/serializer.rb
@@ -3,7 +3,7 @@
 class NodeInfo::Serializer < ActiveModel::Serializer
   include RoutingHelper
 
-  attributes :version, :software, :protocols, :usage, :open_registrations
+  attributes :version, :software, :protocols, :services, :usage, :open_registrations, :metadata
 
   def version
     '2.0'
@@ -37,6 +37,10 @@ class NodeInfo::Serializer < ActiveModel::Serializer
     Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
   end
 
+  def metadata
+    {}
+  end
+
   private
 
   def instance_presenter
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index a78ec4507..e521dacaa 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -2,6 +2,7 @@
 
 class REST::AccountSerializer < ActiveModel::Serializer
   include RoutingHelper
+  include FormattingHelper
 
   attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at,
              :note, :url, :avatar, :avatar_static, :header, :header_static,
@@ -12,12 +13,16 @@ class REST::AccountSerializer < ActiveModel::Serializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
   attribute :suspended, if: :suspended?
+  attribute :silenced, key: :limited, if: :silenced?
+  attribute :noindex, if: :local?
 
   class FieldSerializer < ActiveModel::Serializer
+    include FormattingHelper
+
     attributes :name, :value, :verified_at
 
     def value
-      Formatter.instance.format_field(object.account, object.value)
+      account_field_value_format(object)
     end
   end
 
@@ -32,7 +37,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def note
-    object.suspended? ? '' : Formatter.instance.simplified_format(object)
+    object.suspended? ? '' : account_bio_format(object)
   end
 
   def url
@@ -95,7 +100,15 @@ class REST::AccountSerializer < ActiveModel::Serializer
     object.suspended?
   end
 
-  delegate :suspended?, to: :object
+  def silenced
+    object.silenced?
+  end
+
+  def noindex
+    object.user_prefers_noindex?
+  end
+
+  delegate :suspended?, :silenced?, :local?, to: :object
 
   def moved_and_not_nested?
     object.moved? && object.moved_to_account.moved_to_account_id.nil?
diff --git a/app/serializers/rest/admin/account_serializer.rb b/app/serializers/rest/admin/account_serializer.rb
index f579d3302..ad98a53e8 100644
--- a/app/serializers/rest/admin/account_serializer.rb
+++ b/app/serializers/rest/admin/account_serializer.rb
@@ -3,12 +3,13 @@
 class REST::Admin::AccountSerializer < ActiveModel::Serializer
   attributes :id, :username, :domain, :created_at,
              :email, :ip, :role, :confirmed, :suspended,
-             :silenced, :disabled, :approved, :locale,
+             :silenced, :sensitized, :disabled, :approved, :locale,
              :invite_request
 
   attribute :created_by_application_id, if: :created_by_application?
   attribute :invited_by_account_id, if: :invited?
 
+  has_many :ips, serializer: REST::Admin::IpSerializer
   has_one :account, serializer: REST::AccountSerializer
 
   def id
@@ -19,10 +20,6 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer
     object.user_email
   end
 
-  def ip
-    object.user_current_sign_in_ip.to_s.presence
-  end
-
   def role
     object.user_role
   end
@@ -35,6 +32,10 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer
     object.silenced?
   end
 
+  def sensitized
+    object.sensitized?
+  end
+
   def confirmed
     object.user_confirmed?
   end
@@ -74,4 +75,12 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer
   def created_by_application?
     object.user&.created_by_application_id&.present?
   end
+
+  def ips
+    object.user&.ips
+  end
+
+  def ip
+    ips&.first&.ip
+  end
 end
diff --git a/app/serializers/rest/admin/canonical_email_block_serializer.rb b/app/serializers/rest/admin/canonical_email_block_serializer.rb
new file mode 100644
index 000000000..fe385940a
--- /dev/null
+++ b/app/serializers/rest/admin/canonical_email_block_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::Admin::CanonicalEmailBlockSerializer < ActiveModel::Serializer
+  attributes :id, :canonical_email_hash
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/admin/cohort_serializer.rb b/app/serializers/rest/admin/cohort_serializer.rb
index 56b35c699..f68173616 100644
--- a/app/serializers/rest/admin/cohort_serializer.rb
+++ b/app/serializers/rest/admin/cohort_serializer.rb
@@ -4,7 +4,7 @@ class REST::Admin::CohortSerializer < ActiveModel::Serializer
   attributes :period, :frequency
 
   class CohortDataSerializer < ActiveModel::Serializer
-    attributes :date, :percent, :value
+    attributes :date, :rate, :value
 
     def date
       object.date.iso8601
diff --git a/app/serializers/rest/admin/domain_allow_serializer.rb b/app/serializers/rest/admin/domain_allow_serializer.rb
new file mode 100644
index 000000000..ebdf33815
--- /dev/null
+++ b/app/serializers/rest/admin/domain_allow_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::Admin::DomainAllowSerializer < ActiveModel::Serializer
+  attributes :id, :domain, :created_at
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/admin/domain_block_serializer.rb b/app/serializers/rest/admin/domain_block_serializer.rb
new file mode 100644
index 000000000..b955d008a
--- /dev/null
+++ b/app/serializers/rest/admin/domain_block_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
+  attributes :id, :domain, :created_at, :severity,
+             :reject_media, :reject_reports,
+             :private_comment, :public_comment, :obfuscate
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/admin/email_domain_block_serializer.rb b/app/serializers/rest/admin/email_domain_block_serializer.rb
new file mode 100644
index 000000000..a026ff680
--- /dev/null
+++ b/app/serializers/rest/admin/email_domain_block_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::Admin::EmailDomainBlockSerializer < ActiveModel::Serializer
+  attributes :id, :domain, :created_at, :history
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/admin/existing_domain_block_error_serializer.rb b/app/serializers/rest/admin/existing_domain_block_error_serializer.rb
new file mode 100644
index 000000000..629566dad
--- /dev/null
+++ b/app/serializers/rest/admin/existing_domain_block_error_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::Admin::ExistingDomainBlockErrorSerializer < ActiveModel::Serializer
+  attributes :error
+
+  has_one :existing_domain_block, serializer: REST::Admin::DomainBlockSerializer
+
+  def error
+    I18n.t('admin.domain_blocks.existing_domain_block', name: existing_domain_block.domain)
+  end
+
+  def existing_domain_block
+    object
+  end
+end
diff --git a/app/serializers/rest/admin/ip_block_serializer.rb b/app/serializers/rest/admin/ip_block_serializer.rb
new file mode 100644
index 000000000..6a38f8b56
--- /dev/null
+++ b/app/serializers/rest/admin/ip_block_serializer.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class REST::Admin::IpBlockSerializer < ActiveModel::Serializer
+  attributes :id, :ip, :severity, :comment,
+             :created_at, :expires_at
+
+  def id
+    object.id.to_s
+  end
+
+  def ip
+    "#{object.ip}/#{object.ip.prefix}"
+  end
+end
diff --git a/app/serializers/rest/admin/ip_serializer.rb b/app/serializers/rest/admin/ip_serializer.rb
new file mode 100644
index 000000000..d11699dc4
--- /dev/null
+++ b/app/serializers/rest/admin/ip_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::Admin::IpSerializer < ActiveModel::Serializer
+  attributes :ip, :used_at
+end
diff --git a/app/serializers/rest/admin/measure_serializer.rb b/app/serializers/rest/admin/measure_serializer.rb
index 81d655c1a..fc16b85f2 100644
--- a/app/serializers/rest/admin/measure_serializer.rb
+++ b/app/serializers/rest/admin/measure_serializer.rb
@@ -1,12 +1,20 @@
 # frozen_string_literal: true
 
 class REST::Admin::MeasureSerializer < ActiveModel::Serializer
-  attributes :key, :total, :previous_total, :data
+  attributes :key, :unit, :total
+
+  attribute :human_value, if: -> { object.respond_to?(:value_to_human_value) }
+  attribute :previous_total, if: -> { object.total_in_time_range? }
+  attribute :data
 
   def total
     object.total.to_s
   end
 
+  def human_value
+    object.value_to_human_value(object.total)
+  end
+
   def previous_total
     object.previous_total.to_s
   end
diff --git a/app/serializers/rest/admin/report_serializer.rb b/app/serializers/rest/admin/report_serializer.rb
index 7a77132c0..44b4726e4 100644
--- a/app/serializers/rest/admin/report_serializer.rb
+++ b/app/serializers/rest/admin/report_serializer.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 class REST::Admin::ReportSerializer < ActiveModel::Serializer
-  attributes :id, :action_taken, :comment, :created_at, :updated_at
+  attributes :id, :action_taken, :action_taken_at, :category, :comment,
+             :forwarded, :created_at, :updated_at
 
   has_one :account, serializer: REST::Admin::AccountSerializer
   has_one :target_account, serializer: REST::Admin::AccountSerializer
@@ -9,8 +10,13 @@ class REST::Admin::ReportSerializer < ActiveModel::Serializer
   has_one :action_taken_by_account, serializer: REST::Admin::AccountSerializer
 
   has_many :statuses, serializer: REST::StatusSerializer
+  has_many :rules, serializer: REST::RuleSerializer
 
   def id
     object.id.to_s
   end
+
+  def statuses
+    object.statuses.with_includes
+  end
 end
diff --git a/app/serializers/rest/admin/webhook_event_serializer.rb b/app/serializers/rest/admin/webhook_event_serializer.rb
new file mode 100644
index 000000000..fe0ac23f9
--- /dev/null
+++ b/app/serializers/rest/admin/webhook_event_serializer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class REST::Admin::WebhookEventSerializer < ActiveModel::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Account'
+      REST::Admin::AccountSerializer
+    when 'Report'
+      REST::Admin::ReportSerializer
+    else
+      super
+    end
+  end
+
+  attributes :event, :created_at
+
+  has_one :virtual_object, key: :object
+
+  def virtual_object
+    object.object
+  end
+
+  def event
+    object.type
+  end
+end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 9343b97d2..23b2fa514 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class REST::AnnouncementSerializer < ActiveModel::Serializer
+  include FormattingHelper
+
   attributes :id, :content, :starts_at, :ends_at, :all_day,
              :published_at, :updated_at
 
@@ -25,7 +27,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   end
 
   def content
-    Formatter.instance.linkify(object.text)
+    linkify(object.text)
   end
 
   def reactions
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
index be0d763dc..27e1db207 100644
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -3,6 +3,8 @@
 class REST::CredentialAccountSerializer < REST::AccountSerializer
   attributes :source
 
+  has_one :role, serializer: REST::RoleSerializer
+
   def source
     user = object.user
 
@@ -15,4 +17,8 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
       follow_requests_count: FollowRequest.where(target_account: object).limit(40).count,
     }
   end
+
+  def role
+    object.user_role
+  end
 end
diff --git a/app/serializers/rest/domain_block_serializer.rb b/app/serializers/rest/domain_block_serializer.rb
new file mode 100644
index 000000000..678463e13
--- /dev/null
+++ b/app/serializers/rest/domain_block_serializer.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class REST::DomainBlockSerializer < ActiveModel::Serializer
+  attributes :domain, :digest, :severity, :comment
+
+  def domain
+    object.public_domain
+  end
+
+  def digest
+    object.domain_digest
+  end
+
+  def comment
+    object.public_comment if instance_options[:with_comment]
+  end
+end
diff --git a/app/serializers/rest/extended_description_serializer.rb b/app/serializers/rest/extended_description_serializer.rb
new file mode 100644
index 000000000..c0fa3450d
--- /dev/null
+++ b/app/serializers/rest/extended_description_serializer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class REST::ExtendedDescriptionSerializer < ActiveModel::Serializer
+  attributes :updated_at, :content
+
+  def updated_at
+    object.updated_at&.iso8601
+  end
+
+  def content
+    if object.text.present?
+      markdown.render(object.text)
+    else
+      ''
+    end
+  end
+
+  private
+
+  def markdown
+    @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+  end
+end
diff --git a/app/serializers/rest/familiar_followers_serializer.rb b/app/serializers/rest/familiar_followers_serializer.rb
new file mode 100644
index 000000000..0a7e923f8
--- /dev/null
+++ b/app/serializers/rest/familiar_followers_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class REST::FamiliarFollowersSerializer < ActiveModel::Serializer
+  attribute :id
+
+  has_many :accounts, serializer: REST::AccountSerializer
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/featured_tag_serializer.rb b/app/serializers/rest/featured_tag_serializer.rb
index 96adcc7d0..c4b35ab03 100644
--- a/app/serializers/rest/featured_tag_serializer.rb
+++ b/app/serializers/rest/featured_tag_serializer.rb
@@ -12,4 +12,16 @@ class REST::FeaturedTagSerializer < ActiveModel::Serializer
   def url
     short_account_tag_url(object.account, object.tag)
   end
+
+  def name
+    object.display_name
+  end
+
+  def statuses_count
+    object.statuses_count.to_s
+  end
+
+  def last_status_at
+    object.last_status_at&.to_date&.iso8601
+  end
 end
diff --git a/app/serializers/rest/filter_keyword_serializer.rb b/app/serializers/rest/filter_keyword_serializer.rb
new file mode 100644
index 000000000..dd2ebac6e
--- /dev/null
+++ b/app/serializers/rest/filter_keyword_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::FilterKeywordSerializer < ActiveModel::Serializer
+  attributes :id, :keyword, :whole_word
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/filter_result_serializer.rb b/app/serializers/rest/filter_result_serializer.rb
new file mode 100644
index 000000000..54ead2f1f
--- /dev/null
+++ b/app/serializers/rest/filter_result_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class REST::FilterResultSerializer < ActiveModel::Serializer
+  belongs_to :filter, serializer: REST::FilterSerializer
+  has_many :keyword_matches
+  has_many :status_matches
+
+  def status_matches
+    object.status_matches&.map(&:to_s)
+  end
+end
diff --git a/app/serializers/rest/filter_serializer.rb b/app/serializers/rest/filter_serializer.rb
index 57205630b..8816dd807 100644
--- a/app/serializers/rest/filter_serializer.rb
+++ b/app/serializers/rest/filter_serializer.rb
@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 class REST::FilterSerializer < ActiveModel::Serializer
-  attributes :id, :phrase, :context, :whole_word, :expires_at,
-             :irreversible
+  attributes :id, :title, :context, :expires_at, :filter_action
+  has_many :keywords, serializer: REST::FilterKeywordSerializer, if: :rules_requested?
+  has_many :statuses, serializer: REST::FilterStatusSerializer, if: :rules_requested?
 
   def id
     object.id.to_s
   end
+
+  def rules_requested?
+    instance_options[:rules_requested]
+  end
 end
diff --git a/app/serializers/rest/filter_status_serializer.rb b/app/serializers/rest/filter_status_serializer.rb
new file mode 100644
index 000000000..6bcbaa249
--- /dev/null
+++ b/app/serializers/rest/filter_status_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class REST::FilterStatusSerializer < ActiveModel::Serializer
+  attributes :id, :status_id
+
+  def id
+    object.id.to_s
+  end
+
+  def status_id
+    object.status_id.to_s
+  end
+end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 0dc44b623..5ae1099d0 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -1,61 +1,56 @@
 # frozen_string_literal: true
 
 class REST::InstanceSerializer < ActiveModel::Serializer
+  class ContactSerializer < ActiveModel::Serializer
+    attributes :email
+
+    has_one :account, serializer: REST::AccountSerializer
+  end
+
   include RoutingHelper
 
-  attributes :uri, :title, :short_description, :description, :email,
-             :version, :urls, :stats, :thumbnail,
-             :languages, :registrations, :approval_required, :invites_enabled,
-             :configuration
-
-  has_one :contact_account, serializer: REST::AccountSerializer
+  attributes :domain, :title, :version, :source_url, :description,
+             :usage, :thumbnail, :languages, :configuration,
+             :registrations
 
+  has_one :contact, serializer: ContactSerializer
   has_many :rules, serializer: REST::RuleSerializer
 
-  delegate :contact_account, :rules, to: :instance_presenter
-
-  def uri
-    Rails.configuration.x.local_domain
-  end
-
-  def title
-    Setting.site_title
-  end
-
-  def short_description
-    Setting.site_short_description
-  end
-
-  def description
-    Setting.site_description
-  end
-
-  def email
-    Setting.site_contact_email
-  end
-
-  def version
-    Mastodon::Version.to_s
-  end
-
   def thumbnail
-    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('media/images/preview.jpg')
+    if object.thumbnail
+      {
+        url: full_asset_url(object.thumbnail.file.url(:'@1x')),
+        blurhash: object.thumbnail.blurhash,
+        versions: {
+          '@1x': full_asset_url(object.thumbnail.file.url(:'@1x')),
+          '@2x': full_asset_url(object.thumbnail.file.url(:'@2x')),
+        },
+      }
+    else
+      {
+        url: full_pack_url('media/images/preview.png'),
+      }
+    end
   end
 
-  def stats
+  def usage
     {
-      user_count: instance_presenter.user_count,
-      status_count: instance_presenter.status_count,
-      domain_count: instance_presenter.domain_count,
+      users: {
+        active_month: object.active_user_count(4),
+      },
     }
   end
 
-  def urls
-    { streaming_api: Rails.configuration.x.streaming_api_base_url }
-  end
-
   def configuration
     {
+      urls: {
+        streaming: Rails.configuration.x.streaming_api_base_url,
+      },
+
+      accounts: {
+        max_featured_tags: FeaturedTag::LIMIT,
+      },
+
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
         max_media_attachments: 4,
@@ -77,28 +72,36 @@ class REST::InstanceSerializer < ActiveModel::Serializer
         min_expiration: PollValidator::MIN_EXPIRATION,
         max_expiration: PollValidator::MAX_EXPIRATION,
       },
+
+      translation: {
+        enabled: TranslationService.configured?,
+      },
     }
   end
 
-  def languages
-    [I18n.default_locale]
-  end
-
   def registrations
-    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
-  end
-
-  def approval_required
-    Setting.registrations_mode == 'approved'
-  end
-
-  def invites_enabled
-    Setting.min_invite_role == 'user'
+    {
+      enabled: registrations_enabled?,
+      approval_required: Setting.registrations_mode == 'approved',
+      message: registrations_enabled? ? nil : registrations_message,
+    }
   end
 
   private
 
-  def instance_presenter
-    @instance_presenter ||= InstancePresenter.new
+  def registrations_enabled?
+    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+  end
+
+  def registrations_message
+    if Setting.closed_registrations_message.present?
+      markdown.render(Setting.closed_registrations_message)
+    else
+      nil
+    end
+  end
+
+  def markdown
+    @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
   end
 end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 27b031fcc..137fc53dd 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -5,12 +5,17 @@ class REST::NotificationSerializer < ActiveModel::Serializer
 
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
+  belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
 
   def id
     object.id.to_s
   end
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+  end
+
+  def report_type?
+    object.type == :'admin.report'
   end
 end
diff --git a/app/serializers/rest/preferences_serializer.rb b/app/serializers/rest/preferences_serializer.rb
index 119f0e06d..874bd990d 100644
--- a/app/serializers/rest/preferences_serializer.rb
+++ b/app/serializers/rest/preferences_serializer.rb
@@ -17,7 +17,7 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
   end
 
   def posting_default_language
-    object.user.setting_default_language.presence
+    object.user.preferred_posting_language
   end
 
   def reading_default_sensitive_media
diff --git a/app/serializers/rest/privacy_policy_serializer.rb b/app/serializers/rest/privacy_policy_serializer.rb
new file mode 100644
index 000000000..f0572e714
--- /dev/null
+++ b/app/serializers/rest/privacy_policy_serializer.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class REST::PrivacyPolicySerializer < ActiveModel::Serializer
+  attributes :updated_at, :content
+
+  def updated_at
+    object.updated_at.iso8601
+  end
+
+  def content
+    markdown.render(object.text % { domain: Rails.configuration.x.local_domain })
+  end
+
+  private
+
+  def markdown
+    @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, escape_html: true, no_images: true)
+  end
+end
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
index afd4cddf9..b53387401 100644
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class REST::RelationshipSerializer < ActiveModel::Serializer
-  attributes :id, :following, :showing_reblogs, :notifying, :followed_by,
-             :blocking, :blocked_by, :muting, :muting_notifications, :requested,
-             :domain_blocking, :endorsed, :note
+  attributes :id, :following, :showing_reblogs, :notifying, :languages, :followed_by,
+             :blocking, :blocked_by, :muting, :muting_notifications,
+             :requested, :requested_by, :domain_blocking, :endorsed, :note
 
   def id
     object.id.to_s
@@ -25,6 +25,11 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
       false
   end
 
+  def languages
+    (instance_options[:relationships].following[object.id] || {})[:languages] ||
+      (instance_options[:relationships].requested[object.id] || {})[:languages]
+  end
+
   def followed_by
     instance_options[:relationships].followed_by[object.id] || false
   end
@@ -49,6 +54,10 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
     instance_options[:relationships].requested[object.id] ? true : false
   end
 
+  def requested_by
+    instance_options[:relationships].requested_by[object.id] ? true : false
+  end
+
   def domain_blocking
     instance_options[:relationships].domain_blocking[object.id] || false
   end
diff --git a/app/serializers/rest/report_serializer.rb b/app/serializers/rest/report_serializer.rb
index ecb88d653..f4e9af249 100644
--- a/app/serializers/rest/report_serializer.rb
+++ b/app/serializers/rest/report_serializer.rb
@@ -1,9 +1,20 @@
 # frozen_string_literal: true
 
 class REST::ReportSerializer < ActiveModel::Serializer
-  attributes :id, :action_taken
+  attributes :id, :action_taken, :action_taken_at, :category, :comment,
+             :forwarded, :created_at, :status_ids, :rule_ids
+
+  has_one :target_account, serializer: REST::AccountSerializer
 
   def id
     object.id.to_s
   end
+
+  def status_ids
+    object&.status_ids&.map(&:to_s)
+  end
+
+  def rule_ids
+    object&.rule_ids&.map(&:to_s)
+  end
 end
diff --git a/app/serializers/rest/role_serializer.rb b/app/serializers/rest/role_serializer.rb
new file mode 100644
index 000000000..5b81c6e04
--- /dev/null
+++ b/app/serializers/rest/role_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class REST::RoleSerializer < ActiveModel::Serializer
+  attributes :id, :name, :permissions, :color, :highlighted
+
+  def id
+    object.id.to_s
+  end
+
+  def permissions
+    object.computed_permissions.to_s
+  end
+end
diff --git a/app/serializers/rest/status_edit_serializer.rb b/app/serializers/rest/status_edit_serializer.rb
new file mode 100644
index 000000000..f7a48797d
--- /dev/null
+++ b/app/serializers/rest/status_edit_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class REST::StatusEditSerializer < ActiveModel::Serializer
+  include FormattingHelper
+
+  has_one :account, serializer: REST::AccountSerializer
+
+  attributes :content, :spoiler_text, :sensitive, :created_at
+
+  has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
+  has_many :emojis, serializer: REST::CustomEmojiSerializer
+
+  attribute :poll, if: -> { object.poll_options.present? }
+
+  def content
+    status_content_format(object)
+  end
+
+  def poll
+    { options: object.poll_options.map { |title| { title: title } } }
+  end
+end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bb6df90b7..e0b8f32a6 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 class REST::StatusSerializer < ActiveModel::Serializer
+  include FormattingHelper
+
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
              :uri, :url, :replies_count, :reblogs_count,
-             :favourites_count
+             :favourites_count, :edited_at
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
   attribute :muted, if: :current_user?
   attribute :bookmarked, if: :current_user?
   attribute :pinned, if: :pinnable?
+  has_many :filtered, serializer: REST::FilterResultSerializer, if: :current_user?
 
   attribute :content, unless: :source_requested?
   attribute :text, if: :source_requested?
@@ -19,7 +22,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
 
-  has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
+  has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
   has_many :tags
   has_many :emojis, serializer: REST::CustomEmojiSerializer
@@ -71,7 +74,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   end
 
   def content
-    Formatter.instance.format(object)
+    status_content_format(object)
   end
 
   def url
@@ -118,11 +121,19 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 
+  def filtered
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].filters_map[object.id] || []
+    else
+      current_user.account.status_matches_filters(object)
+    end
+  end
+
   def pinnable?
     current_user? &&
       current_user.account_id == object.account_id &&
       !object.reblog? &&
-      %w(public unlisted).include?(object.visibility)
+      %w(public unlisted private).include?(object.visibility)
   end
 
   def source_requested?
@@ -135,6 +146,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
 
   class ApplicationSerializer < ActiveModel::Serializer
     attributes :name, :website
+
+    def website
+      object.website.presence
+    end
   end
 
   class MentionSerializer < ActiveModel::Serializer
diff --git a/app/serializers/rest/status_source_serializer.rb b/app/serializers/rest/status_source_serializer.rb
new file mode 100644
index 000000000..cd3c74084
--- /dev/null
+++ b/app/serializers/rest/status_source_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::StatusSourceSerializer < ActiveModel::Serializer
+  attributes :id, :text, :spoiler_text
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb
index 74aa571a4..7801e77d1 100644
--- a/app/serializers/rest/tag_serializer.rb
+++ b/app/serializers/rest/tag_serializer.rb
@@ -5,7 +5,25 @@ class REST::TagSerializer < ActiveModel::Serializer
 
   attributes :name, :url, :history
 
+  attribute :following, if: :current_user?
+
   def url
     tag_url(object)
   end
+
+  def name
+    object.display_name
+  end
+
+  def following
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].following_map[object.id] || false
+    else
+      TagFollow.where(tag_id: object.id, account_id: current_user.account_id).exists?
+    end
+  end
+
+  def current_user?
+    !current_user.nil?
+  end
 end
diff --git a/app/serializers/rest/translation_serializer.rb b/app/serializers/rest/translation_serializer.rb
new file mode 100644
index 000000000..05ededc95
--- /dev/null
+++ b/app/serializers/rest/translation_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::TranslationSerializer < ActiveModel::Serializer
+  attributes :content, :detected_source_language, :provider
+
+  def content
+    object.text
+  end
+end
diff --git a/app/serializers/rest/v1/filter_serializer.rb b/app/serializers/rest/v1/filter_serializer.rb
new file mode 100644
index 000000000..455f17efd
--- /dev/null
+++ b/app/serializers/rest/v1/filter_serializer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class REST::V1::FilterSerializer < ActiveModel::Serializer
+  attributes :id, :phrase, :context, :whole_word, :expires_at,
+             :irreversible
+
+  delegate :context, :expires_at, to: :custom_filter
+
+  def id
+    object.id.to_s
+  end
+
+  def phrase
+    object.keyword
+  end
+
+  def irreversible
+    custom_filter.irreversible?
+  end
+
+  private
+
+  def custom_filter
+    object.custom_filter
+  end
+end
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
new file mode 100644
index 000000000..99d1b2bd6
--- /dev/null
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+class REST::V1::InstanceSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :uri, :title, :short_description, :description, :email,
+             :version, :urls, :stats, :thumbnail,
+             :languages, :registrations, :approval_required, :invites_enabled,
+             :configuration
+
+  has_one :contact_account, serializer: REST::AccountSerializer
+
+  has_many :rules, serializer: REST::RuleSerializer
+
+  def uri
+    object.domain
+  end
+
+  def short_description
+    object.description
+  end
+
+  def description
+    Setting.site_description # Legacy
+  end
+
+  def email
+    object.contact.email
+  end
+
+  def contact_account
+    object.contact.account
+  end
+
+  def thumbnail
+    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
+  end
+
+  def stats
+    {
+      user_count: instance_presenter.user_count,
+      status_count: instance_presenter.status_count,
+      domain_count: instance_presenter.domain_count,
+    }
+  end
+
+  def urls
+    { streaming_api: Rails.configuration.x.streaming_api_base_url }
+  end
+
+  def usage
+    {
+      users: {
+        active_month: instance_presenter.active_user_count(4),
+      },
+    }
+  end
+
+  def configuration
+    {
+      accounts: {
+        max_featured_tags: FeaturedTag::LIMIT,
+      },
+
+      statuses: {
+        max_characters: StatusLengthValidator::MAX_CHARS,
+        max_media_attachments: 4,
+        characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
+      },
+
+      media_attachments: {
+        supported_mime_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES,
+        image_size_limit: MediaAttachment::IMAGE_LIMIT,
+        image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
+        video_size_limit: MediaAttachment::VIDEO_LIMIT,
+        video_frame_rate_limit: MediaAttachment::MAX_VIDEO_FRAME_RATE,
+        video_matrix_limit: MediaAttachment::MAX_VIDEO_MATRIX_LIMIT,
+      },
+
+      polls: {
+        max_options: PollValidator::MAX_OPTIONS,
+        max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
+        min_expiration: PollValidator::MIN_EXPIRATION,
+        max_expiration: PollValidator::MAX_EXPIRATION,
+      },
+    }
+  end
+
+  def registrations
+    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+  end
+
+  def approval_required
+    Setting.registrations_mode == 'approved'
+  end
+
+  def invites_enabled
+    UserRole.everyone.can?(:invite_users)
+  end
+
+  private
+
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+end
diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb
deleted file mode 100644
index 81e24af0d..000000000
--- a/app/serializers/rss/account_serializer.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::AccountSerializer < RSS::Serializer
-  include ActionView::Helpers::NumberHelper
-  include AccountsHelper
-  include RoutingHelper
-
-  def render(account, statuses, tag)
-    builder = RSSBuilder.new
-
-    builder.title("#{display_name(account)} (@#{account.local_username_and_domain})")
-           .description(account_description(account))
-           .link(tag.present? ? short_account_tag_url(account, tag) : short_account_url(account))
-           .logo(full_pack_url('media/images/logo.svg'))
-           .accent_color('2b90d9')
-
-    builder.image(full_asset_url(account.avatar.url(:original))) if account.avatar?
-    builder.cover(full_asset_url(account.header.url(:original))) if account.header?
-
-    render_statuses(builder, statuses)
-
-    builder.to_xml
-  end
-
-  def self.render(account, statuses, tag)
-    new.render(account, statuses, tag)
-  end
-end
diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb
deleted file mode 100644
index e549ac367..000000000
--- a/app/serializers/rss/tag_serializer.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::TagSerializer < RSS::Serializer
-  include ActionView::Helpers::NumberHelper
-  include ActionView::Helpers::SanitizeHelper
-  include RoutingHelper
-
-  def render(tag, statuses)
-    builder = RSSBuilder.new
-
-    builder.title("##{tag.name}")
-           .description(strip_tags(I18n.t('about.about_hashtag_html', hashtag: tag.name)))
-           .link(tag_url(tag))
-           .logo(full_pack_url('media/images/logo.svg'))
-           .accent_color('2b90d9')
-
-    render_statuses(builder, statuses)
-
-    builder.to_xml
-  end
-
-  def self.render(tag, statuses)
-    new.render(tag, statuses)
-  end
-end
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index ee83ec8b2..c5a908b19 100644
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@@ -34,6 +34,6 @@ class Web::NotificationSerializer < ActiveModel::Serializer
 
   def body
     str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note)
-    truncate(HTMLEntities.new.decode(str.to_str), length: 140) # Do not encode entities, since this value will not be used in HTML
+    truncate(HTMLEntities.new.decode(str.to_str), length: 140, escape: false) # Do not encode entities, since this value will not be used in HTML
   end
 end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 6fe4b6593..85538870b 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -3,6 +3,11 @@
 class AccountSearchService < BaseService
   attr_reader :query, :limit, :offset, :options, :account
 
+  MENTION_ONLY_RE = /\A#{Account::MENTION_RE}\z/i
+
+  # Min. number of characters to look for non-exact matches
+  MIN_QUERY_LENGTH = 5
+
   def call(query, account = nil, options = {})
     @acct_hint = query&.start_with?('@')
     @query     = query&.strip&.gsub(/\A@/, '')
@@ -61,11 +66,11 @@ class AccountSearchService < BaseService
   end
 
   def advanced_search_results
-    Account.advanced_search_for(terms_for_query, account, limit_for_non_exact_results, options[:following], offset)
+    Account.advanced_search_for(terms_for_query, account, limit: limit_for_non_exact_results, following: options[:following], offset: offset)
   end
 
   def simple_search_results
-    Account.search_for(terms_for_query, limit_for_non_exact_results, offset)
+    Account.search_for(terms_for_query, limit: limit_for_non_exact_results, offset: offset)
   end
 
   def from_elasticsearch
@@ -102,7 +107,7 @@ class AccountSearchService < BaseService
     {
       script_score: {
         script: {
-          source: "(doc['followers_count'].value + 0.0) / (doc['followers_count'].value + doc['following_count'].value + 1)",
+          source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
         },
       },
     }
@@ -110,10 +115,10 @@ class AccountSearchService < BaseService
 
   def followers_score_function
     {
-      field_value_factor: {
-        field: 'followers_count',
-        modifier: 'log2p',
-        missing: 0,
+      script_score: {
+        script: {
+          source: "Math.log10(Math.max(doc['followers_count'].value, 0) + 2)",
+        },
       },
     }
   end
@@ -135,6 +140,8 @@ class AccountSearchService < BaseService
   end
 
   def limit_for_non_exact_results
+    return 0 if @account.nil? && query.size < MIN_QUERY_LENGTH
+
     if exact_match?
       limit - 1
     else
@@ -175,7 +182,7 @@ class AccountSearchService < BaseService
   end
 
   def username_complete?
-    query.include?('@') && "@#{query}".match?(/\A#{Account::MENTION_RE}\Z/)
+    query.include?('@') && "@#{query}".match?(MENTION_ONLY_RE)
   end
 
   def likely_acct?
diff --git a/app/services/account_statuses_cleanup_service.rb b/app/services/account_statuses_cleanup_service.rb
index cbadecc63..96bc3db7d 100644
--- a/app/services/account_statuses_cleanup_service.rb
+++ b/app/services/account_statuses_cleanup_service.rb
@@ -14,8 +14,8 @@ class AccountStatusesCleanupService < BaseService
     last_deleted = nil
 
     account_policy.statuses_to_delete(budget, cutoff_id, account_policy.last_inspected).reorder(nil).find_each(order: :asc) do |status|
-      status.discard
-      RemovalWorker.perform_async(status.id, redraft: false)
+      status.discard_with_reblogs
+      RemovalWorker.perform_async(status.id, { 'redraft' => false })
       num_deleted += 1
       last_deleted = status.id
     end
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index 72352aca6..a746ef4d6 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -3,28 +3,60 @@
 class ActivityPub::FetchFeaturedCollectionService < BaseService
   include JsonLdHelper
 
-  def call(account)
+  def call(account, **options)
     return if account.featured_collection_url.blank? || account.suspended? || account.local?
 
     @account = account
-    @json    = fetch_resource(@account.featured_collection_url, true)
+    @options = options
+    @json    = fetch_resource(@account.featured_collection_url, true, local_follower)
 
-    return unless supported_context?
+    return unless supported_context?(@json)
 
-    case @json['type']
-    when 'Collection', 'CollectionPage'
-      process_items @json['items']
-    when 'OrderedCollection', 'OrderedCollectionPage'
-      process_items @json['orderedItems']
-    end
+    process_items(collection_items(@json))
   end
 
   private
 
+  def collection_items(collection)
+    collection = fetch_collection(collection['first']) if collection['first'].present?
+    return unless collection.is_a?(Hash)
+
+    case collection['type']
+    when 'Collection', 'CollectionPage'
+      collection['items']
+    when 'OrderedCollection', 'OrderedCollectionPage'
+      collection['orderedItems']
+    end
+  end
+
+  def fetch_collection(collection_or_uri)
+    return collection_or_uri if collection_or_uri.is_a?(Hash)
+    return if invalid_origin?(collection_or_uri)
+
+    fetch_resource_without_id_validation(collection_or_uri, local_follower, true)
+  end
+
   def process_items(items)
-    status_ids = items.map { |item| value_or_id(item) }
-                      .filter_map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) unless ActivityPub::TagManager.instance.local_uri?(uri) }
-                      .filter_map { |status| status.id if status.account_id == @account.id }
+    process_note_items(items) if @options[:note]
+    process_hashtag_items(items) if @options[:hashtag]
+  end
+
+  def process_note_items(items)
+    status_ids = items.filter_map do |item|
+      next unless item.is_a?(String) || item['type'] == 'Note'
+
+      uri = value_or_id(item)
+      next if ActivityPub::TagManager.instance.local_uri?(uri) || invalid_origin?(uri)
+
+      status = ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: local_follower, expected_actor_uri: @account.uri, request_id: @options[:request_id])
+      next unless status&.account_id == @account.id
+
+      status.id
+    rescue ActiveRecord::RecordInvalid => e
+      Rails.logger.debug "Invalid pinned status #{uri}: #{e.message}"
+      nil
+    end
+
     to_remove = []
     to_add    = status_ids
 
@@ -43,7 +75,29 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
     end
   end
 
-  def supported_context?
-    super(@json)
+  def process_hashtag_items(items)
+    names     = items.filter_map { |item| item['type'] == 'Hashtag' && item['name']&.delete_prefix('#') }.map { |name| HashtagNormalizer.new.normalize(name) }
+    to_remove = []
+    to_add    = names
+
+    FeaturedTag.where(account: @account).map(&:name).each do |name|
+      if names.include?(name)
+        to_add.delete(name)
+      else
+        to_remove << name
+      end
+    end
+
+    FeaturedTag.includes(:tag).where(account: @account, tags: { name: to_remove }).delete_all unless to_remove.empty?
+
+    to_add.each do |name|
+      FeaturedTag.create!(account: @account, name: name)
+    end
+  end
+
+  def local_follower
+    return @local_follower if defined?(@local_follower)
+
+    @local_follower = @account.followers.local.without_suspended.first
   end
 end
diff --git a/app/services/activitypub/fetch_featured_tags_collection_service.rb b/app/services/activitypub/fetch_featured_tags_collection_service.rb
new file mode 100644
index 000000000..ab047a0f8
--- /dev/null
+++ b/app/services/activitypub/fetch_featured_tags_collection_service.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class ActivityPub::FetchFeaturedTagsCollectionService < BaseService
+  include JsonLdHelper
+
+  def call(account, url)
+    return if url.blank? || account.suspended? || account.local?
+
+    @account = account
+    @json    = fetch_resource(url, true, local_follower)
+
+    return unless supported_context?(@json)
+
+    process_items(collection_items(@json))
+  end
+
+  private
+
+  def collection_items(collection)
+    all_items = []
+
+    collection = fetch_collection(collection['first']) if collection['first'].present?
+
+    while collection.is_a?(Hash)
+      items = begin
+        case collection['type']
+        when 'Collection', 'CollectionPage'
+          collection['items']
+        when 'OrderedCollection', 'OrderedCollectionPage'
+          collection['orderedItems']
+        end
+      end
+
+      break if items.blank?
+
+      all_items.concat(items)
+
+      break if all_items.size >= FeaturedTag::LIMIT
+
+      collection = collection['next'].present? ? fetch_collection(collection['next']) : nil
+    end
+
+    all_items
+  end
+
+  def fetch_collection(collection_or_uri)
+    return collection_or_uri if collection_or_uri.is_a?(Hash)
+    return if invalid_origin?(collection_or_uri)
+
+    fetch_resource_without_id_validation(collection_or_uri, local_follower, true)
+  end
+
+  def process_items(items)
+    names            = items.filter_map { |item| item['type'] == 'Hashtag' && item['name']&.delete_prefix('#') }.take(FeaturedTag::LIMIT)
+    tags             = names.index_by { |name| HashtagNormalizer.new.normalize(name) }
+    normalized_names = tags.keys
+
+    FeaturedTag.includes(:tag).references(:tag).where(account: @account).where.not(tag: { name: normalized_names }).delete_all
+
+    FeaturedTag.includes(:tag).references(:tag).where(account: @account, tag: { name: normalized_names }).each do |featured_tag|
+      featured_tag.update(name: tags.delete(featured_tag.tag.name))
+    end
+
+    tags.each_value do |name|
+      FeaturedTag.create!(account: @account, name: name)
+    end
+  end
+
+  def local_follower
+    return @local_follower if defined?(@local_follower)
+
+    @local_follower = @account.followers.local.without_suspended.first
+  end
+end
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 9d01f5386..7aba8269e 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -1,66 +1,12 @@
 # frozen_string_literal: true
 
-class ActivityPub::FetchRemoteAccountService < BaseService
-  include JsonLdHelper
-  include DomainControlHelper
-  include WebfingerHelper
-
-  SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
-
+class ActivityPub::FetchRemoteAccountService < ActivityPub::FetchRemoteActorService
   # Does a WebFinger roundtrip on each call, unless `only_key` is true
-  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false)
-    return if domain_not_allowed?(uri)
-    return ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri)
+  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+    actor = super
+    return actor if actor.nil? || actor.is_a?(Account)
 
-    @json = begin
-      if prefetched_body.nil?
-        fetch_resource(uri, id)
-      else
-        body_to_json(prefetched_body, compare_id: id ? uri : nil)
-      end
-    end
-
-    return if !supported_context? || !expected_type? || (break_on_redirect && @json['movedTo'].present?)
-
-    @uri      = @json['id']
-    @username = @json['preferredUsername']
-    @domain   = Addressable::URI.parse(@uri).normalized_host
-
-    return unless only_key || verified_webfinger?
-
-    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key, verified_webfinger: !only_key)
-  rescue Oj::ParseError
-    nil
-  end
-
-  private
-
-  def verified_webfinger?
-    webfinger                            = webfinger!("acct:#{@username}@#{@domain}")
-    confirmed_username, confirmed_domain = split_acct(webfinger.subject)
-
-    return webfinger.link('self', 'href') == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
-
-    webfinger                            = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
-    @username, @domain                   = split_acct(webfinger.subject)
-
-    return false unless @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
-    return false if webfinger.link('self', 'href') != @uri
-
-    true
-  rescue Webfinger::Error
-    false
-  end
-
-  def split_acct(acct)
-    acct.gsub(/\Aacct:/, '').split('@')
-  end
-
-  def supported_context?
-    super(@json)
-  end
-
-  def expected_type?
-    equals_or_includes_any?(@json['type'], SUPPORTED_TYPES)
+    Rails.logger.debug "Fetching account #{uri} failed: Expected Account, got #{actor.class.name}"
+    raise Error, "Expected Account, got #{actor.class.name}" unless suppress_errors
   end
 end
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
new file mode 100644
index 000000000..a25fa54c4
--- /dev/null
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+class ActivityPub::FetchRemoteActorService < BaseService
+  include JsonLdHelper
+  include DomainControlHelper
+  include WebfingerHelper
+
+  class Error < StandardError; end
+
+  SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
+
+  # Does a WebFinger roundtrip on each call, unless `only_key` is true
+  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+    return if domain_not_allowed?(uri)
+    return ActivityPub::TagManager.instance.uri_to_actor(uri) if ActivityPub::TagManager.instance.local_uri?(uri)
+
+    @json = begin
+      if prefetched_body.nil?
+        fetch_resource(uri, id)
+      else
+        body_to_json(prefetched_body, compare_id: id ? uri : nil)
+      end
+    rescue Oj::ParseError
+      raise Error, "Error parsing JSON-LD document #{uri}"
+    end
+
+    raise Error, "Error fetching actor JSON at #{uri}" if @json.nil?
+    raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?
+    raise Error, "Unexpected object type for actor #{uri} (expected any of: #{SUPPORTED_TYPES})" unless expected_type?
+    raise Error, "Actor #{uri} has moved to #{@json['movedTo']}" if break_on_redirect && @json['movedTo'].present?
+
+    @uri      = @json['id']
+    @username = @json['preferredUsername']
+    @domain   = Addressable::URI.parse(@uri).normalized_host
+
+    check_webfinger! unless only_key
+
+    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key, verified_webfinger: !only_key, request_id: request_id)
+  rescue Error => e
+    Rails.logger.debug "Fetching actor #{uri} failed: #{e.message}"
+    raise unless suppress_errors
+  end
+
+  private
+
+  def check_webfinger!
+    webfinger                            = webfinger!("acct:#{@username}@#{@domain}")
+    confirmed_username, confirmed_domain = split_acct(webfinger.subject)
+
+    if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
+      raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.link('self', 'href') != @uri
+      return
+    end
+
+    webfinger                            = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+    @username, @domain                   = split_acct(webfinger.subject)
+
+    unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
+      raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{@uri} (stopped at #{@username}@#{@domain})"
+    end
+
+    raise Error, "Webfinger response for #{@username}@#{@domain} does not loop back to #{@uri}" if webfinger.link('self', 'href') != @uri
+  rescue Webfinger::RedirectError => e
+    raise Error, e.message
+  rescue Webfinger::Error => e
+    raise Error, "Webfinger error when resolving #{@username}@#{@domain}: #{e.message}"
+  end
+
+  def split_acct(acct)
+    acct.gsub(/\Aacct:/, '').split('@')
+  end
+
+  def supported_context?
+    super(@json)
+  end
+
+  def expected_type?
+    equals_or_includes_any?(@json['type'], SUPPORTED_TYPES)
+  end
+end
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb
index c48288b3b..32e82b47a 100644
--- a/app/services/activitypub/fetch_remote_key_service.rb
+++ b/app/services/activitypub/fetch_remote_key_service.rb
@@ -3,17 +3,19 @@
 class ActivityPub::FetchRemoteKeyService < BaseService
   include JsonLdHelper
 
-  # Returns account that owns the key
-  def call(uri, id: true, prefetched_body: nil)
-    return if uri.blank?
+  class Error < StandardError; end
+
+  # Returns actor that owns the key
+  def call(uri, id: true, prefetched_body: nil, suppress_errors: true)
+    raise Error, 'No key URI given' if uri.blank?
 
     if prefetched_body.nil?
       if id
         @json = fetch_resource_without_id_validation(uri)
-        if person?
+        if actor_type?
           @json = fetch_resource(@json['id'], true)
         elsif uri != @json['id']
-          return
+          raise Error, "Fetched URI #{uri} has wrong id #{@json['id']}"
         end
       else
         @json = fetch_resource(uri, id)
@@ -22,30 +24,38 @@ class ActivityPub::FetchRemoteKeyService < BaseService
       @json = body_to_json(prefetched_body, compare_id: id ? uri : nil)
     end
 
-    return unless supported_context?(@json) && expected_type?
-    return find_account(@json['id'], @json) if person?
+    raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil?
+    raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json)
+    raise Error, "Unexpected object type for key #{uri}" unless expected_type?
+    return find_actor(@json['id'], @json, suppress_errors) if actor_type?
 
     @owner = fetch_resource(owner_uri, true)
 
-    return unless supported_context?(@owner) && confirmed_owner?
+    raise Error, "Unable to fetch actor JSON #{owner_uri}" if @owner.nil?
+    raise Error, "Unsupported JSON-LD context for document #{owner_uri}" unless supported_context?(@owner)
+    raise Error, "Unexpected object type for actor #{owner_uri} (expected any of: #{SUPPORTED_TYPES})" unless expected_owner_type?
+    raise Error, "publicKey id for #{owner_uri} does not correspond to #{@json['id']}" unless confirmed_owner?
 
-    find_account(owner_uri, @owner)
+    find_actor(owner_uri, @owner, suppress_errors)
+  rescue Error => e
+    Rails.logger.debug "Fetching key #{uri} failed: #{e.message}"
+    raise unless suppress_errors
   end
 
   private
 
-  def find_account(uri, prefetched_body)
-    account   = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
-    account ||= ActivityPub::FetchRemoteAccountService.new.call(uri, prefetched_body: prefetched_body)
-    account
+  def find_actor(uri, prefetched_body, suppress_errors)
+    actor   = ActivityPub::TagManager.instance.uri_to_actor(uri)
+    actor ||= ActivityPub::FetchRemoteActorService.new.call(uri, prefetched_body: prefetched_body, suppress_errors: suppress_errors)
+    actor
   end
 
   def expected_type?
-    person? || public_key?
+    actor_type? || public_key?
   end
 
-  def person?
-    equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES)
+  def actor_type?
+    equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES)
   end
 
   def public_key?
@@ -56,7 +66,11 @@ class ActivityPub::FetchRemoteKeyService < BaseService
     @owner_uri ||= value_or_id(@json['owner'])
   end
 
+  def expected_owner_type?
+    equals_or_includes_any?(@owner['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES)
+  end
+
   def confirmed_owner?
-    equals_or_includes_any?(@owner['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && value_or_id(@owner['publicKey']) == @json['id']
+    value_or_id(@owner['publicKey']) == @json['id']
   end
 end
diff --git a/app/services/activitypub/fetch_remote_poll_service.rb b/app/services/activitypub/fetch_remote_poll_service.rb
index 1c79ecf11..1829e791c 100644
--- a/app/services/activitypub/fetch_remote_poll_service.rb
+++ b/app/services/activitypub/fetch_remote_poll_service.rb
@@ -8,6 +8,6 @@ class ActivityPub::FetchRemotePollService < BaseService
 
     return unless supported_context?(json)
 
-    ActivityPub::ProcessPollService.new.call(poll, json)
+    ActivityPub::ProcessStatusUpdateService.new.call(poll.status, json)
   end
 end
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 4f789d50b..21b9242f8 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -4,7 +4,8 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   include JsonLdHelper
 
   # Should be called when uri has already been checked for locality
-  def call(uri, id: true, prefetched_body: nil, on_behalf_of: nil)
+  def call(uri, id: true, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
+    @request_id = request_id
     @json = begin
       if prefetched_body.nil?
         fetch_resource(uri, id, on_behalf_of)
@@ -15,25 +16,33 @@ class ActivityPub::FetchRemoteStatusService < BaseService
 
     return unless supported_context?
 
-    actor_id = nil
+    actor_uri     = nil
     activity_json = nil
+    object_uri    = nil
 
     if expected_object_type?
-      actor_id = value_or_id(first_of_value(@json['attributedTo']))
-      activity_json = { 'type' => 'Create', 'actor' => actor_id, 'object' => @json }
+      actor_uri     = value_or_id(first_of_value(@json['attributedTo']))
+      activity_json = { 'type' => 'Create', 'actor' => actor_uri, 'object' => @json }
+      object_uri    = uri_from_bearcap(@json['id'])
     elsif expected_activity_type?
-      actor_id = value_or_id(first_of_value(@json['actor']))
+      actor_uri     = value_or_id(first_of_value(@json['actor']))
       activity_json = @json
+      object_uri    = uri_from_bearcap(value_or_id(@json['object']))
     end
 
-    return if activity_json.nil? || !trustworthy_attribution?(@json['id'], actor_id)
+    return if activity_json.nil? || object_uri.nil? || !trustworthy_attribution?(@json['id'], actor_uri)
+    return if expected_actor_uri.present? && actor_uri != expected_actor_uri
+    return ActivityPub::TagManager.instance.uri_to_resource(object_uri, Status) if ActivityPub::TagManager.instance.local_uri?(object_uri)
 
-    actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
-    actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update?(actor)
+    actor = account_from_uri(actor_uri)
 
     return if actor.nil? || actor.suspended?
 
-    ActivityPub::Activity.factory(activity_json, actor).perform
+    # If we fetched a status that already exists, then we need to treat the
+    # activity as an update rather than create
+    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
+
+    ActivityPub::Activity.factory(activity_json, actor, request_id: request_id).perform
   end
 
   private
@@ -43,6 +52,12 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
   end
 
+  def account_from_uri(uri)
+    actor = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
+    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, id: true, request_id: @request_id) if actor.nil? || actor.possibly_stale?
+    actor
+  end
+
   def supported_context?
     super(@json)
   end
@@ -54,8 +69,4 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   def expected_object_type?
     equals_or_includes_any?(@json['type'], ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES)
   end
-
-  def needs_update?(actor)
-    actor.possibly_stale?
-  end
 end
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index ec5140720..2da9096c7 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -3,6 +3,11 @@
 class ActivityPub::ProcessAccountService < BaseService
   include JsonLdHelper
   include DomainControlHelper
+  include Redisable
+  include Lockable
+
+  SUBDOMAINS_RATELIMIT = 10
+  DISCOVERIES_PER_REQUEST = 400
 
   # Should be called with confirmed valid JSON
   # and WebFinger-resolved username and domain
@@ -13,28 +18,36 @@ class ActivityPub::ProcessAccountService < BaseService
     @json        = json
     @uri         = @json['id']
     @username    = username
-    @domain      = domain
+    @domain      = TagManager.instance.normalize_domain(domain)
     @collections = {}
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        @account            = Account.remote.find_by(uri: @uri) if @options[:only_key]
-        @account          ||= Account.find_remote(@username, @domain)
-        @old_public_key     = @account&.public_key
-        @old_protocol       = @account&.protocol
-        @suspension_changed = false
+    # The key does not need to be unguessable, it just needs to be somewhat unique
+    @options[:request_id] ||= "#{Time.now.utc.to_i}-#{username}@#{domain}"
 
-        create_account if @account.nil?
-        update_account
-        process_tags
+    with_lock("process_account:#{@uri}") do
+      @account            = Account.remote.find_by(uri: @uri) if @options[:only_key]
+      @account          ||= Account.find_remote(@username, @domain)
+      @old_public_key     = @account&.public_key
+      @old_protocol       = @account&.protocol
+      @suspension_changed = false
 
-        process_duplicate_accounts! if @options[:verified_webfinger]
-      else
-        raise Mastodon::RaceConditionError
+      if @account.nil?
+        with_redis do |redis|
+          return nil if redis.pfcount("unique_subdomains_for:#{PublicSuffix.domain(@domain, ignore_private: true)}") >= SUBDOMAINS_RATELIMIT
+
+          discoveries = redis.incr("discovery_per_request:#{@options[:request_id]}")
+          redis.expire("discovery_per_request:#{@options[:request_id]}", 5.minutes.seconds)
+          return nil if discoveries > DISCOVERIES_PER_REQUEST
+        end
+
+        create_account
       end
-    end
 
-    return if @account.nil?
+      update_account
+      process_tags
+
+      process_duplicate_accounts! if @options[:verified_webfinger]
+    end
 
     after_protocol_change! if protocol_changed?
     after_key_change! if key_changed? && !@options[:signed_with_known_key]
@@ -43,7 +56,8 @@ class ActivityPub::ProcessAccountService < BaseService
 
     unless @options[:only_key] || @account.suspended?
       check_featured_collection! if @account.featured_collection_url.present?
-      check_links! unless @account.fields.empty?
+      check_featured_tags_collection! if @json['featuredTags'].present?
+      check_links! if @account.fields.any?(&:requires_verification?)
     end
 
     @account
@@ -107,11 +121,13 @@ class ActivityPub::ProcessAccountService < BaseService
   def set_fetchable_attributes!
     begin
       @account.avatar_remote_url = image_url('icon') || '' unless skip_download?
+      @account.avatar = nil if @account.avatar_remote_url.blank?
     rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
       RedownloadAvatarWorker.perform_in(rand(30..600).seconds, @account.id)
     end
     begin
       @account.header_remote_url = image_url('image') || '' unless skip_download?
+      @account.header = nil if @account.header_remote_url.blank?
     rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
       RedownloadHeaderWorker.perform_in(rand(30..600).seconds, @account.id)
     end
@@ -151,7 +167,11 @@ class ActivityPub::ProcessAccountService < BaseService
   end
 
   def check_featured_collection!
-    ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id)
+    ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id, { 'hashtag' => @json['featuredTags'].blank?, 'request_id' => @options[:request_id] })
+  end
+
+  def check_featured_tags_collection!
+    ActivityPub::SynchronizeFeaturedTagsCollectionWorker.perform_async(@account.id, @json['featuredTags'])
   end
 
   def check_links!
@@ -251,7 +271,7 @@ class ActivityPub::ProcessAccountService < BaseService
 
   def moved_account
     account   = ActivityPub::TagManager.instance.uri_to_resource(@json['movedTo'], Account)
-    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true)
+    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true, request_id: @options[:request_id])
     account
   end
 
@@ -288,10 +308,6 @@ class ActivityPub::ProcessAccountService < BaseService
     !@old_protocol.nil? && @old_protocol != @account.protocol
   end
 
-  def lock_options
-    { redis: Redis.current, key: "process_account:#{@uri}", autorelease: 15.minutes.seconds }
-  end
-
   def process_tags
     return if @json['tag'].blank?
 
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index 170e6709c..fffe30195 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -3,12 +3,29 @@
 class ActivityPub::ProcessCollectionService < BaseService
   include JsonLdHelper
 
-  def call(body, account, **options)
-    @account = account
-    @json    = Oj.load(body, mode: :strict)
+  def call(body, actor, **options)
+    @account = actor
+    @json    = original_json = Oj.load(body, mode: :strict)
     @options = options
 
+    begin
+      @json = compact(@json) if @json['signature'].is_a?(Hash)
+    rescue JSON::LD::JsonLdError => e
+      Rails.logger.debug "Error when compacting JSON-LD document for #{value_or_id(@json['actor'])}: #{e.message}"
+      @json = original_json.without('signature')
+    end
+
     return if !supported_context? || (different_actor? && verify_account!.nil?) || suspended_actor? || @account.local?
+    return unless @account.is_a?(Account)
+
+    if @json['signature'].present?
+      # We have verified the signature, but in the compaction step above, might
+      # have introduced incompatibilities with other servers that do not
+      # normalize the JSON-LD documents (for instance, previous Mastodon
+      # versions), so skip redistribution if we can't get a safe document.
+      patch_for_forwarding!(original_json, @json)
+      @json.delete('signature') unless safe_for_forwarding?(original_json, @json)
+    end
 
     case @json['type']
     when 'Collection', 'CollectionPage'
@@ -50,8 +67,10 @@ class ActivityPub::ProcessCollectionService < BaseService
   end
 
   def verify_account!
-    @options[:relayed_through_account] = @account
-    @account = ActivityPub::LinkedDataSignature.new(@json).verify_account!
+    @options[:relayed_through_actor] = @account
+    @account = ActivityPub::LinkedDataSignature.new(@json).verify_actor!
+    @account = nil unless @account.is_a?(Account)
+    @account
   rescue JSON::LD::JsonLdError => e
     Rails.logger.debug "Could not verify LD-Signature for #{value_or_id(@json['actor'])}: #{e.message}"
     nil
diff --git a/app/services/activitypub/process_poll_service.rb b/app/services/activitypub/process_poll_service.rb
deleted file mode 100644
index d83e614d8..000000000
--- a/app/services/activitypub/process_poll_service.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::ProcessPollService < BaseService
-  include JsonLdHelper
-
-  def call(poll, json)
-    @json = json
-
-    return unless expected_type?
-
-    previous_expires_at = poll.expires_at
-
-    expires_at = begin
-      if @json['closed'].is_a?(String)
-        @json['closed']
-      elsif !@json['closed'].nil? && !@json['closed'].is_a?(FalseClass)
-        Time.now.utc
-      else
-        @json['endTime']
-      end
-    end
-
-    items = begin
-      if @json['anyOf'].is_a?(Array)
-        @json['anyOf']
-      else
-        @json['oneOf']
-      end
-    end
-
-    voters_count = @json['votersCount']
-
-    latest_options = items.filter_map { |item| item['name'].presence || item['content'] }
-
-    # If for some reasons the options were changed, it invalidates all previous
-    # votes, so we need to remove them
-    poll.votes.delete_all if latest_options != poll.options
-
-    begin
-      poll.update!(
-        last_fetched_at: Time.now.utc,
-        expires_at: expires_at,
-        options: latest_options,
-        cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 },
-        voters_count: voters_count
-      )
-    rescue ActiveRecord::StaleObjectError
-      poll.reload
-      retry
-    end
-
-    # If the poll had no expiration date set but now has, and people have voted,
-    # schedule a notification.
-    if previous_expires_at.nil? && poll.expires_at.present? && poll.votes.exists?
-      PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)
-    end
-  end
-
-  private
-
-  def expected_type?
-    equals_or_includes_any?(@json['type'], %w(Question))
-  end
-end
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
new file mode 100644
index 000000000..11b38ab92
--- /dev/null
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -0,0 +1,313 @@
+# frozen_string_literal: true
+
+class ActivityPub::ProcessStatusUpdateService < BaseService
+  include JsonLdHelper
+  include Redisable
+  include Lockable
+
+  def call(status, json, request_id: nil)
+    raise ArgumentError, 'Status has unsaved changes' if status.changed?
+
+    @json                      = json
+    @status_parser             = ActivityPub::Parser::StatusParser.new(@json)
+    @uri                       = @status_parser.uri
+    @status                    = status
+    @account                   = status.account
+    @media_attachments_changed = false
+    @poll_changed              = false
+    @request_id                = request_id
+
+    # Only native types can be updated at the moment
+    return @status if !expected_type? || already_updated_more_recently?
+
+    if @status_parser.edited_at.present? && (@status.edited_at.nil? || @status_parser.edited_at > @status.edited_at)
+      handle_explicit_update!
+    else
+      handle_implicit_update!
+    end
+
+    @status
+  end
+
+  private
+
+  def handle_explicit_update!
+    last_edit_date = @status.edited_at.presence || @status.created_at
+
+    # Only allow processing one create/update per status at a time
+    with_lock("create:#{@uri}") do
+      Status.transaction do
+        record_previous_edit!
+        update_media_attachments!
+        update_poll!
+        update_immediate_attributes!
+        update_metadata!
+        create_edits!
+      end
+
+      download_media_files!
+      queue_poll_notifications!
+
+      next unless significant_changes?
+
+      reset_preview_card!
+      broadcast_updates!
+    end
+
+    forward_activity! if significant_changes? && @status_parser.edited_at > last_edit_date
+  end
+
+  def handle_implicit_update!
+    with_lock("create:#{@uri}") do
+      update_poll!(allow_significant_changes: false)
+      queue_poll_notifications!
+    end
+  end
+
+  def update_media_attachments!
+    previous_media_attachments     = @status.media_attachments.to_a
+    previous_media_attachments_ids = @status.ordered_media_attachment_ids || previous_media_attachments.map(&:id)
+    @next_media_attachments        = []
+
+    as_array(@json['attachment']).each do |attachment|
+      media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
+
+      next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > 4
+
+      begin
+        media_attachment   = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }
+        media_attachment ||= MediaAttachment.new(account: @account, remote_url: media_attachment_parser.remote_url)
+
+        # If a previously existing media attachment was significantly updated, mark
+        # media attachments as changed even if none were added or removed
+        if media_attachment_parser.significantly_changes?(media_attachment)
+          @media_attachments_changed = true
+        end
+
+        media_attachment.description          = media_attachment_parser.description
+        media_attachment.focus                = media_attachment_parser.focus
+        media_attachment.thumbnail_remote_url = media_attachment_parser.thumbnail_remote_url
+        media_attachment.blurhash             = media_attachment_parser.blurhash
+        media_attachment.status_id            = @status.id
+        media_attachment.skip_download        = unsupported_media_type?(media_attachment_parser.file_content_type) || skip_download?
+        media_attachment.save!
+
+        @next_media_attachments << media_attachment
+      rescue Addressable::URI::InvalidURIError => e
+        Rails.logger.debug "Invalid URL in attachment: #{e}"
+      end
+    end
+
+    added_media_attachments = @next_media_attachments - previous_media_attachments
+
+    @status.ordered_media_attachment_ids = @next_media_attachments.map(&:id)
+
+    @media_attachments_changed = true if @status.ordered_media_attachment_ids != previous_media_attachments_ids
+  end
+
+  def download_media_files!
+    @next_media_attachments.each do |media_attachment|
+      next if media_attachment.skip_download
+
+      media_attachment.download_file! if media_attachment.remote_url_previously_changed?
+      media_attachment.download_thumbnail! if media_attachment.thumbnail_remote_url_previously_changed?
+      media_attachment.save
+    rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError
+      RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id)
+    rescue Seahorse::Client::NetworkingError => e
+      Rails.logger.warn "Error storing media attachment: #{e}"
+    end
+
+    @status.media_attachments.reload
+  end
+
+  def update_poll!(allow_significant_changes: true)
+    previous_poll        = @status.preloadable_poll
+    @previous_expires_at = previous_poll&.expires_at
+    poll_parser          = ActivityPub::Parser::PollParser.new(@json)
+
+    if poll_parser.valid?
+      poll = previous_poll || @account.polls.new(status: @status)
+
+      # If for some reasons the options were changed, it invalidates all previous
+      # votes, so we need to remove them
+      @poll_changed = true if poll_parser.significantly_changes?(poll)
+      return if @poll_changed && !allow_significant_changes
+
+      poll.last_fetched_at = Time.now.utc
+      poll.options         = poll_parser.options
+      poll.multiple        = poll_parser.multiple
+      poll.expires_at      = poll_parser.expires_at
+      poll.voters_count    = poll_parser.voters_count
+      poll.cached_tallies  = poll_parser.cached_tallies
+      poll.reset_votes! if @poll_changed
+      poll.save!
+
+      @status.poll_id = poll.id
+    elsif previous_poll.present?
+      return unless allow_significant_changes
+
+      previous_poll.destroy!
+      @poll_changed = true
+      @status.poll_id = nil
+    end
+  end
+
+  def update_immediate_attributes!
+    @status.text         = @status_parser.text || ''
+    @status.spoiler_text = @status_parser.spoiler_text || ''
+    @status.sensitive    = @account.sensitized? || @status_parser.sensitive || false
+    @status.language     = @status_parser.language
+
+    @significant_changes = text_significantly_changed? || @status.spoiler_text_changed? || @media_attachments_changed || @poll_changed
+
+    @status.edited_at = @status_parser.edited_at if significant_changes?
+
+    @status.save!
+  end
+
+  def update_metadata!
+    @raw_tags     = []
+    @raw_mentions = []
+    @raw_emojis   = []
+
+    as_array(@json['tag']).each do |tag|
+      if equals_or_includes?(tag['type'], 'Hashtag')
+        @raw_tags << tag['name']
+      elsif equals_or_includes?(tag['type'], 'Mention')
+        @raw_mentions << tag['href']
+      elsif equals_or_includes?(tag['type'], 'Emoji')
+        @raw_emojis << tag
+      end
+    end
+
+    update_tags!
+    update_mentions!
+    update_emojis!
+  end
+
+  def update_tags!
+    @status.tags = Tag.find_or_create_by_names(@raw_tags)
+  end
+
+  def update_mentions!
+    previous_mentions = @status.active_mentions.includes(:account).to_a
+    current_mentions  = []
+
+    @raw_mentions.each do |href|
+      next if href.blank?
+
+      account   = ActivityPub::TagManager.instance.uri_to_resource(href, Account)
+      account ||= ActivityPub::FetchRemoteAccountService.new.call(href, request_id: @request_id)
+
+      next if account.nil?
+
+      mention   = previous_mentions.find { |x| x.account_id == account.id }
+      mention ||= account.mentions.new(status: @status)
+
+      current_mentions << mention
+    end
+
+    current_mentions.each do |mention|
+      mention.save if mention.new_record?
+    end
+
+    # If previous mentions are no longer contained in the text, convert them
+    # to silent mentions, since withdrawing access from someone who already
+    # received a notification might be more confusing
+    removed_mentions = previous_mentions - current_mentions
+
+    Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
+  end
+
+  def update_emojis!
+    return if skip_download?
+
+    @raw_emojis.each do |raw_emoji|
+      custom_emoji_parser = ActivityPub::Parser::CustomEmojiParser.new(raw_emoji)
+
+      next if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank?
+
+      emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
+
+      next unless emoji.nil? || custom_emoji_parser.image_remote_url != emoji.image_remote_url || (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
+
+      begin
+        emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri)
+        emoji.image_remote_url = custom_emoji_parser.image_remote_url
+        emoji.save
+      rescue Seahorse::Client::NetworkingError => e
+        Rails.logger.warn "Error storing emoji: #{e}"
+      end
+    end
+  end
+
+  def expected_type?
+    equals_or_includes_any?(@json['type'], %w(Note Question))
+  end
+
+  def record_previous_edit!
+    @previous_edit = @status.build_snapshot(at_time: @status.created_at, rate_limit: false) if @status.edits.empty?
+  end
+
+  def create_edits!
+    return unless significant_changes?
+
+    @previous_edit&.save!
+    @status.snapshot!(account_id: @account.id, rate_limit: false)
+  end
+
+  def skip_download?
+    return @skip_download if defined?(@skip_download)
+
+    @skip_download ||= DomainBlock.reject_media?(@account.domain)
+  end
+
+  def unsupported_media_type?(mime_type)
+    mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type)
+  end
+
+  def significant_changes?
+    @significant_changes
+  end
+
+  def text_significantly_changed?
+    return false unless @status.text_changed?
+
+    old, new = @status.text_change
+    HtmlAwareFormatter.new(old, false).to_s != HtmlAwareFormatter.new(new, false).to_s
+  end
+
+  def already_updated_more_recently?
+    @status.edited_at.present? && @status_parser.edited_at.present? && @status.edited_at > @status_parser.edited_at
+  end
+
+  def reset_preview_card!
+    @status.preview_cards.clear
+    LinkCrawlWorker.perform_in(rand(1..59).seconds, @status.id)
+  end
+
+  def broadcast_updates!
+    ::DistributionWorker.perform_async(@status.id, { 'update' => true })
+  end
+
+  def queue_poll_notifications!
+    poll = @status.preloadable_poll
+
+    # If the poll had no expiration date set but now has, or now has a sooner
+    # expiration date, and people have voted, schedule a notification
+
+    return unless poll.present? && poll.expires_at.present? && poll.votes.exists?
+
+    PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
+    PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)
+  end
+
+  def forward_activity!
+    forwarder.forward! if forwarder.forwardable?
+  end
+
+  def forwarder
+    @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
+  end
+end
diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb
index e00694157..3833327bb 100644
--- a/app/services/app_sign_up_service.rb
+++ b/app/services/app_sign_up_service.rb
@@ -2,23 +2,67 @@
 
 class AppSignUpService < BaseService
   def call(app, remote_ip, params)
-    return unless allowed_registrations?
+    @app       = app
+    @remote_ip = remote_ip
+    @params    = params
 
-    user_params           = params.slice(:email, :password, :agreement, :locale)
-    account_params        = params.slice(:username)
-    invite_request_params = { text: params[:reason] }
-    user                  = User.create!(user_params.merge(created_by_application: app, sign_up_ip: remote_ip, password_confirmation: user_params[:password], account_attributes: account_params, invite_request_attributes: invite_request_params))
+    raise Mastodon::NotPermittedError unless allowed_registrations?
 
-    Doorkeeper::AccessToken.create!(application: app,
-                                    resource_owner_id: user.id,
-                                    scopes: app.scopes,
-                                    expires_in: Doorkeeper.configuration.access_token_expires_in,
-                                    use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?)
+    ApplicationRecord.transaction do
+      create_user!
+      create_access_token!
+    end
+
+    @access_token
   end
 
   private
 
+  def create_user!
+    @user = User.create!(
+      user_params.merge(created_by_application: @app, sign_up_ip: @remote_ip, password_confirmation: user_params[:password], account_attributes: account_params, invite_request_attributes: invite_request_params)
+    )
+  end
+
+  def create_access_token!
+    @access_token = Doorkeeper::AccessToken.create!(
+      application: @app,
+      resource_owner_id: @user.id,
+      scopes: @app.scopes,
+      expires_in: Doorkeeper.configuration.access_token_expires_in,
+      use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?
+    )
+  end
+
+  def user_params
+    @params.slice(:email, :password, :agreement, :locale)
+  end
+
+  def account_params
+    @params.slice(:username)
+  end
+
+  def invite_request_params
+    { text: @params[:reason] }
+  end
+
   def allowed_registrations?
-    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+    registrations_open? && !single_user_mode? && !omniauth_only? && !ip_blocked?
+  end
+
+  def registrations_open?
+    Setting.registrations_mode != 'none'
+  end
+
+  def single_user_mode?
+    Rails.configuration.x.single_user_mode
+  end
+
+  def omniauth_only?
+    ENV['OMNIAUTH_ONLY'] == 'true'
+  end
+
+  def ip_blocked?
+    IpBlock.where(severity: :sign_up_block).where('ip >>= ?', @remote_ip.to_s).exists?
   end
 end
diff --git a/app/services/appeal_service.rb b/app/services/appeal_service.rb
new file mode 100644
index 000000000..399a053d6
--- /dev/null
+++ b/app/services/appeal_service.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AppealService < BaseService
+  def call(strike, text)
+    @strike = strike
+    @text   = text
+
+    create_appeal!
+    notify_staff!
+
+    @appeal
+  end
+
+  private
+
+  def create_appeal!
+    @appeal = Appeal.create!(
+      strike: @strike,
+      text: @text,
+      account: @strike.target_account
+    )
+  end
+
+  def notify_staff!
+    User.those_who_can(:manage_appeals).includes(:account).each do |u|
+      AdminMailer.new_appeal(u.account, @appeal).deliver_later if u.allows_appeal_emails?
+    end
+  end
+end
diff --git a/app/services/approve_appeal_service.rb b/app/services/approve_appeal_service.rb
new file mode 100644
index 000000000..96aaaa7d0
--- /dev/null
+++ b/app/services/approve_appeal_service.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+class ApproveAppealService < BaseService
+  def call(appeal, current_account)
+    @appeal          = appeal
+    @strike          = appeal.strike
+    @current_account = current_account
+
+    ApplicationRecord.transaction do
+      undo_strike_action!
+      mark_strike_as_appealed!
+    end
+
+    queue_workers!
+    notify_target_account!
+  end
+
+  private
+
+  def target_account
+    @strike.target_account
+  end
+
+  def undo_strike_action!
+    case @strike.action
+    when 'disable'
+      undo_disable!
+    when 'delete_statuses'
+      undo_delete_statuses!
+    when 'mark_statuses_as_sensitive'
+      undo_mark_statuses_as_sensitive!
+    when 'sensitive'
+      undo_sensitive!
+    when 'silence'
+      undo_silence!
+    when 'suspend'
+      undo_suspend!
+    end
+  end
+
+  def mark_strike_as_appealed!
+    @appeal.approve!(@current_account)
+    @strike.touch(:overruled_at)
+  end
+
+  def undo_disable!
+    target_account.user.enable!
+  end
+
+  def undo_delete_statuses!
+    # Cannot be undone
+  end
+
+  def undo_mark_statuses_as_sensitive!
+    representative_account = Account.representative
+    @strike.statuses.includes(:media_attachments).each do |status|
+      UpdateStatusService.new.call(status, representative_account.id, sensitive: false) if status.with_media?
+    end
+  end
+
+  def undo_sensitive!
+    target_account.unsensitize!
+  end
+
+  def undo_silence!
+    target_account.unsilence!
+  end
+
+  def undo_suspend!
+    target_account.unsuspend!
+  end
+
+  def queue_workers!
+    case @strike.action
+    when 'suspend'
+      Admin::UnsuspensionWorker.perform_async(target_account.id)
+    end
+  end
+
+  def notify_target_account!
+    UserMailer.appeal_approved(target_account.user, @appeal).deliver_later
+  end
+end
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index 99e8c875f..b0c0f9ec4 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -5,4 +5,8 @@ class BaseService
   include ActionView::Helpers::SanitizeHelper
 
   include RoutingHelper
+
+  def call(*)
+    raise NotImplementedError
+  end
 end
diff --git a/app/services/bootstrap_timeline_service.rb b/app/services/bootstrap_timeline_service.rb
index e1a1b98c3..126c0fa2e 100644
--- a/app/services/bootstrap_timeline_service.rb
+++ b/app/services/bootstrap_timeline_service.rb
@@ -5,6 +5,7 @@ class BootstrapTimelineService < BaseService
     @source_account = source_account
 
     autofollow_inviter!
+    notify_staff!
   end
 
   private
@@ -14,4 +15,10 @@ class BootstrapTimelineService < BaseService
 
     FollowService.new.call(@source_account, @source_account.user.invite.user.account)
   end
+
+  def notify_staff!
+    User.those_who_can(:manage_users).includes(:account).find_each do |user|
+      LocalNotificationWorker.perform_async(user.account_id, @source_account.id, 'Account', 'admin.sign_up')
+    end
+  end
 end
diff --git a/app/services/clear_domain_media_service.rb b/app/services/clear_domain_media_service.rb
index 704cfb71a..9e70ebe51 100644
--- a/app/services/clear_domain_media_service.rb
+++ b/app/services/clear_domain_media_service.rb
@@ -10,24 +10,18 @@ class ClearDomainMediaService < BaseService
 
   private
 
-  def invalidate_association_caches!
+  def invalidate_association_caches!(status_ids)
     # Normally, associated models of a status are immutable (except for accounts)
     # so they are aggressively cached. After updating the media attachments to no
     # longer point to a local file, we need to clear the cache to make those
     # changes appear in the API and UI
-    @affected_status_ids.each { |id| Rails.cache.delete_matched("statuses/#{id}-*") }
+    Rails.cache.delete_multi(status_ids.map { |id| "statuses/#{id}" })
   end
 
   def clear_media!
-    @affected_status_ids = []
-
-    begin
-      clear_account_images!
-      clear_account_attachments!
-      clear_emojos!
-    ensure
-      invalidate_association_caches!
-    end
+    clear_account_images!
+    clear_account_attachments!
+    clear_emojos!
   end
 
   def clear_account_images!
@@ -39,12 +33,18 @@ class ClearDomainMediaService < BaseService
   end
 
   def clear_account_attachments!
-    media_from_blocked_domain.reorder(nil).find_each do |attachment|
-      @affected_status_ids << attachment.status_id if attachment.status_id.present?
+    media_from_blocked_domain.reorder(nil).find_in_batches do |attachments|
+      affected_status_ids = []
 
-      attachment.file.destroy if attachment.file&.exists?
-      attachment.type = :unknown
-      attachment.save
+      attachments.each do |attachment|
+        affected_status_ids << attachment.status_id if attachment.status_id.present?
+
+        attachment.file.destroy if attachment.file&.exists?
+        attachment.type = :unknown
+        attachment.save
+      end
+
+      invalidate_association_caches!(affected_status_ids) unless affected_status_ids.empty?
     end
   end
 
diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
index 3e45570c3..04c3798fe 100644
--- a/app/services/concerns/payloadable.rb
+++ b/app/services/concerns/payloadable.rb
@@ -1,13 +1,21 @@
 # frozen_string_literal: true
 
 module Payloadable
+  # @param [ActiveModelSerializers::Model] record
+  # @param [ActiveModelSerializers::Serializer] serializer
+  # @param [Hash] options
+  # @option options [Account] :signer
+  # @option options [String] :sign_with
+  # @option options [Boolean] :always_sign
+  # @return [Hash]
   def serialize_payload(record, serializer, options = {})
-    signer    = options.delete(:signer)
-    sign_with = options.delete(:sign_with)
-    payload   = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
-    object    = record.respond_to?(:virtual_object) ? record.virtual_object : record
+    signer      = options.delete(:signer)
+    sign_with   = options.delete(:sign_with)
+    always_sign = options.delete(:always_sign)
+    payload     = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
+    object      = record.respond_to?(:virtual_object) ? record.virtual_object : record
 
-    if (object.respond_to?(:sign?) && object.sign?) && signer && signing_enabled?
+    if (object.respond_to?(:sign?) && object.sign?) && signer && (always_sign || signing_enabled?)
       ActivityPub::LinkedDataSignature.new(payload).sign!(signer, sign_with: sign_with)
     else
       payload
diff --git a/app/services/create_featured_tag_service.rb b/app/services/create_featured_tag_service.rb
new file mode 100644
index 000000000..3cc59156d
--- /dev/null
+++ b/app/services/create_featured_tag_service.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class CreateFeaturedTagService < BaseService
+  include Payloadable
+
+  def call(account, name, force: true)
+    @account = account
+
+    FeaturedTag.create!(account: account, name: name).tap do |featured_tag|
+      ActivityPub::AccountRawDistributionWorker.perform_async(build_json(featured_tag), account.id) if @account.local?
+    end
+  rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid => e
+    if force && e.is_a(ActiveRecord::RecordNotUnique)
+      FeaturedTag.by_name(name).find_by!(account: account)
+    else
+      account.featured_tags.new(name: name)
+    end
+  end
+
+  private
+
+  def build_json(featured_tag)
+    Oj.dump(serialize_payload(featured_tag, ActivityPub::AddSerializer, signer: @account))
+  end
+end
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 0e3fedfe7..3a082c7c8 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -220,21 +220,23 @@ class DeleteAccountService < BaseService
 
     return unless keep_account_record?
 
-    @account.silenced_at       = nil
-    @account.suspended_at      = @options[:suspended_at] || Time.now.utc
-    @account.suspension_origin = :local
-    @account.locked            = false
-    @account.memorial          = false
-    @account.discoverable      = false
-    @account.display_name      = ''
-    @account.note              = ''
-    @account.fields            = []
-    @account.statuses_count    = 0
-    @account.followers_count   = 0
-    @account.following_count   = 0
-    @account.moved_to_account  = nil
-    @account.also_known_as     = []
-    @account.trust_level       = :untrusted
+    @account.silenced_at         = nil
+    @account.suspended_at        = @options[:suspended_at] || Time.now.utc
+    @account.suspension_origin   = :local
+    @account.locked              = false
+    @account.memorial            = false
+    @account.discoverable        = false
+    @account.trendable           = false
+    @account.display_name        = ''
+    @account.note                = ''
+    @account.fields              = []
+    @account.statuses_count      = 0
+    @account.followers_count     = 0
+    @account.following_count     = 0
+    @account.moved_to_account    = nil
+    @account.reviewed_at         = nil
+    @account.requested_review_at = nil
+    @account.also_known_as       = []
     @account.avatar.destroy
     @account.header.destroy
     @account.save!
@@ -265,7 +267,7 @@ class DeleteAccountService < BaseService
   end
 
   def delete_actor_json
-    @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account))
+    @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer))
   end
 
   def delivery_inboxes
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index b72bb82d3..2554756a5 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -1,109 +1,161 @@
 # frozen_string_literal: true
 
 class FanOutOnWriteService < BaseService
+  include Redisable
+
   # Push a status into home and mentions feeds
   # @param [Status] status
-  def call(status)
-    raise Mastodon::RaceConditionError if status.visibility.nil?
+  # @param [Hash] options
+  # @option options [Boolean] update
+  # @option options [Array<Integer>] silenced_account_ids
+  def call(status, options = {})
+    @status    = status
+    @account   = status.account
+    @options   = options
 
-    deliver_to_self(status) if status.account.local?
+    check_race_condition!
+    warm_payload_cache!
 
-    if status.direct_visibility?
-      deliver_to_mentioned_followers(status)
-      deliver_to_own_conversation(status)
-    elsif status.limited_visibility?
-      deliver_to_mentioned_followers(status)
-    else
-      deliver_to_followers(status)
-      deliver_to_lists(status)
-    end
-
-    return if status.account.silenced? || !status.public_visibility? || status.reblog?
-
-    render_anonymous_payload(status)
-
-    deliver_to_hashtags(status)
-
-    return if status.reply? && status.in_reply_to_account_id != status.account_id
-
-    deliver_to_public(status)
-    deliver_to_media(status) if status.media_attachments.any?
+    fan_out_to_local_recipients!
+    fan_out_to_public_recipients! if broadcastable?
+    fan_out_to_public_streams! if broadcastable?
   end
 
   private
 
-  def deliver_to_self(status)
-    Rails.logger.debug "Delivering status #{status.id} to author"
-    FeedManager.instance.push_to_home(status.account, status)
+  def check_race_condition!
+    # I don't know why but at some point we had an issue where
+    # this service was being executed with status objects
+    # that had a null visibility - which should not be possible
+    # since the column in the database is not nullable.
+    #
+    # This check re-queues the service to be run at a later time
+    # with the full object, if something like it occurs
+
+    raise Mastodon::RaceConditionError if @status.visibility.nil?
   end
 
-  def deliver_to_followers(status)
-    Rails.logger.debug "Delivering status #{status.id} to followers"
+  def fan_out_to_local_recipients!
+    deliver_to_self!
+    notify_mentioned_accounts!
+    notify_about_update! if update?
 
-    status.account.followers_for_local_distribution.select(:id).reorder(nil).find_in_batches do |followers|
+    case @status.visibility.to_sym
+    when :public, :unlisted, :private
+      deliver_to_all_followers!
+      deliver_to_lists!
+    when :limited
+      deliver_to_mentioned_followers!
+    else
+      deliver_to_mentioned_followers!
+      deliver_to_conversation!
+    end
+  end
+
+  def fan_out_to_public_recipients!
+    deliver_to_hashtag_followers!
+  end
+
+  def fan_out_to_public_streams!
+    broadcast_to_hashtag_streams!
+    broadcast_to_public_streams!
+  end
+
+  def deliver_to_self!
+    FeedManager.instance.push_to_home(@account, @status, update: update?) if @account.local?
+  end
+
+  def notify_mentioned_accounts!
+    @status.active_mentions.where.not(id: @options[:silenced_account_ids] || []).joins(:account).merge(Account.local).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+      LocalNotificationWorker.push_bulk(mentions) do |mention|
+        [mention.account_id, mention.id, 'Mention', 'mention']
+      end
+    end
+  end
+
+  def notify_about_update!
+    @status.reblogged_by_accounts.merge(Account.local).select(:id).reorder(nil).find_in_batches do |accounts|
+      LocalNotificationWorker.push_bulk(accounts) do |account|
+        [account.id, @status.id, 'Status', 'update']
+      end
+    end
+  end
+
+  def deliver_to_all_followers!
+    @account.followers_for_local_distribution.select(:id).reorder(nil).find_in_batches do |followers|
       FeedInsertWorker.push_bulk(followers) do |follower|
-        [status.id, follower.id, :home]
+        [@status.id, follower.id, 'home', { 'update' => update? }]
       end
     end
   end
 
-  def deliver_to_lists(status)
-    Rails.logger.debug "Delivering status #{status.id} to lists"
+  def deliver_to_hashtag_followers!
+    TagFollow.where(tag_id: @status.tags.map(&:id)).select(:id, :account_id).reorder(nil).find_in_batches do |follows|
+      FeedInsertWorker.push_bulk(follows) do |follow|
+        [@status.id, follow.account_id, 'tags', { 'update' => update? }]
+      end
+    end
+  end
 
-    status.account.lists_for_local_distribution.select(:id).reorder(nil).find_in_batches do |lists|
+  def deliver_to_lists!
+    @account.lists_for_local_distribution.select(:id).reorder(nil).find_in_batches do |lists|
       FeedInsertWorker.push_bulk(lists) do |list|
-        [status.id, list.id, :list]
+        [@status.id, list.id, 'list', { 'update' => update? }]
       end
     end
   end
 
-  def deliver_to_mentioned_followers(status)
-    Rails.logger.debug "Delivering status #{status.id} to limited followers"
-
-    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+  def deliver_to_mentioned_followers!
+    @status.mentions.joins(:account).merge(@account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
       FeedInsertWorker.push_bulk(mentions) do |mention|
-        [status.id, mention.account_id, :home]
+        [@status.id, mention.account_id, 'home', { 'update' => update? }]
       end
     end
   end
 
-  def render_anonymous_payload(status)
-    @payload = InlineRenderer.render(status, nil, :status)
-    @payload = Oj.dump(event: :update, payload: @payload)
-  end
-
-  def deliver_to_hashtags(status)
-    Rails.logger.debug "Delivering status #{status.id} to hashtags"
-
-    status.tags.pluck(:name).each do |hashtag|
-      Redis.current.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", @payload)
-      Redis.current.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", @payload) if status.local?
+  def broadcast_to_hashtag_streams!
+    @status.tags.map(&:name).each do |hashtag|
+      redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", anonymous_payload)
+      redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", anonymous_payload) if @status.local?
     end
   end
 
-  def deliver_to_public(status)
-    Rails.logger.debug "Delivering status #{status.id} to public timeline"
+  def broadcast_to_public_streams!
+    return if @status.reply? && @status.in_reply_to_account_id != @account.id
 
-    Redis.current.publish('timeline:public', @payload)
-    if status.local?
-      Redis.current.publish('timeline:public:local', @payload)
-    else
-      Redis.current.publish('timeline:public:remote', @payload)
+    redis.publish('timeline:public', anonymous_payload)
+    redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
+
+    if @status.with_media?
+      redis.publish('timeline:public:media', anonymous_payload)
+      redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
     end
   end
 
-  def deliver_to_media(status)
-    Rails.logger.debug "Delivering status #{status.id} to media timeline"
-
-    Redis.current.publish('timeline:public:media', @payload)
-    if status.local?
-      Redis.current.publish('timeline:public:local:media', @payload)
-    else
-      Redis.current.publish('timeline:public:remote:media', @payload)
-    end
+  def deliver_to_conversation!
+    AccountConversation.add_status(@account, @status) unless update?
   end
 
-  def deliver_to_own_conversation(status)
-    AccountConversation.add_status(status.account, status)
+  def warm_payload_cache!
+    Rails.cache.write("fan-out/#{@status.id}", rendered_status)
+  end
+
+  def anonymous_payload
+    @anonymous_payload ||= Oj.dump(
+      event: update? ? :'status.update' : :update,
+      payload: rendered_status
+    )
+  end
+
+  def rendered_status
+    @rendered_status ||= InlineRenderer.render(@status, nil, :status)
+  end
+
+  def update?
+    @options[:update]
+  end
+
+  def broadcastable?
+    @status.public_visibility? && !@status.reblog? && !@account.silenced?
   end
 end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index a0ab3b4b7..dc7fe8855 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -17,6 +17,8 @@ class FavouriteService < BaseService
 
     favourite = Favourite.create!(account: account, status: status)
 
+    Trends.statuses.register(status)
+
     create_notification(favourite)
     bump_potential_friendship(account, status)
 
@@ -29,7 +31,7 @@ class FavouriteService < BaseService
     status = favourite.status
 
     if status.account.local?
-      NotifyService.new.call(status.account, :favourite, favourite)
+      LocalNotificationWorker.perform_async(status.account_id, favourite.id, 'Favourite', 'favourite')
     elsif status.account.activitypub?
       ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url)
     end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 94dc6389f..e5b5b730e 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 class FetchLinkCardService < BaseService
+  include Redisable
+  include Lockable
+
   URL_PATTERN = %r{
-    (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceeding chars
+    (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceding chars
     (                                                                                                                           #   $2 URL
       (https?:\/\/)                                                                                                             #   $3 Protocol (required)
       (#{Twitter::TwitterText::Regex[:valid_domain]})                                                                           #   $4 Domain(s)
@@ -20,13 +23,9 @@ class FetchLinkCardService < BaseService
 
     @url = @original_url.to_s
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        @card = PreviewCard.find_by(url: @url)
-        process_url if @card.nil? || @card.updated_at <= 2.weeks.ago || @card.missing_image?
-      else
-        raise Mastodon::RaceConditionError
-      end
+    with_lock("fetch:#{@original_url}") do
+      @card = PreviewCard.find_by(url: @url)
+      process_url if @card.nil? || @card.updated_at <= 2.weeks.ago || @card.missing_image?
     end
 
     attach_card if @card&.persisted?
@@ -134,7 +133,7 @@ class FetchLinkCardService < BaseService
     when 'video'
       @card.width            = embed[:width].presence  || 0
       @card.height           = embed[:height].presence || 0
-      @card.html             = Formatter.instance.sanitize(embed[:html], Sanitize::Config::MASTODON_OEMBED)
+      @card.html             = Sanitize.fragment(embed[:html], Sanitize::Config::MASTODON_OEMBED)
       @card.image_remote_url = (url + embed[:thumbnail_url]).to_s if embed[:thumbnail_url].present?
     when 'rich'
       # Most providers rely on <script> tags, which is a no-no
@@ -153,8 +152,4 @@ class FetchLinkCardService < BaseService
     @card.assign_attributes(link_details_extractor.to_preview_card_attributes)
     @card.save_with_optional_image! unless @card.title.blank? && @card.html.blank?
   end
-
-  def lock_options
-    { redis: Redis.current, key: "fetch:#{@original_url}", autorelease: 15.minutes.seconds }
-  end
 end
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index 6c0093cd4..73204e55d 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -47,7 +47,7 @@ class FetchResourceService < BaseService
       body = response.body_with_limit
       json = body_to_json(body)
 
-      [json['id'], { prefetched_body: body, id: true }] if supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) || expected_type?(json))
+      [json['id'], { prefetched_body: body, id: true }] if supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) || expected_type?(json))
     elsif !terminal
       link_header = response['Link'] && parse_link_header(response)
 
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 329262cca..feea40e3c 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -11,6 +11,7 @@ class FollowService < BaseService
   # @param [Hash] options
   # @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
   # @option [Boolean] :notify Whether to create notifications about new posts, defaults to false
+  # @option [Array<String>] :languages Which languages to allow on the home feed from this account, defaults to all
   # @option [Boolean] :bypass_locked
   # @option [Boolean] :bypass_limit Allow following past the total follow number
   # @option [Boolean] :with_rate_limit
@@ -57,18 +58,18 @@ class FollowService < BaseService
   end
 
   def change_follow_options!
-    @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
+    @source_account.follow!(@target_account, **follow_options)
   end
 
   def change_follow_request_options!
-    @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
+    @source_account.request_follow!(@target_account, **follow_options)
   end
 
   def request_follow!
-    follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
+    follow_request = @source_account.request_follow!(@target_account, **follow_options.merge(rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit]))
 
     if @target_account.local?
-      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name, :follow_request)
+      LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name, 'follow_request')
     elsif @target_account.activitypub?
       ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
     end
@@ -77,9 +78,9 @@ class FollowService < BaseService
   end
 
   def direct_follow!
-    follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
+    follow = @source_account.follow!(@target_account, **follow_options.merge(rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit]))
 
-    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name, :follow)
+    LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name, 'follow')
     MergeWorker.perform_async(@target_account.id, @source_account.id)
 
     follow
@@ -88,4 +89,8 @@ class FollowService < BaseService
   def build_json(follow_request)
     Oj.dump(serialize_payload(follow_request, ActivityPub::FollowSerializer))
   end
+
+  def follow_options
+    @options.slice(:reblogs, :notify, :languages)
+  end
 end
diff --git a/app/services/import_service.rb b/app/services/import_service.rb
index 74ad5b79f..2f48abc36 100644
--- a/app/services/import_service.rb
+++ b/app/services/import_service.rb
@@ -27,7 +27,7 @@ class ImportService < BaseService
 
   def import_follows!
     parse_import_data!(['Account address'])
-    import_relationships!('follow', 'unfollow', @account.following, ROWS_PROCESSING_LIMIT, reblogs: { header: 'Show boosts', default: true })
+    import_relationships!('follow', 'unfollow', @account.following, ROWS_PROCESSING_LIMIT, reblogs: { header: 'Show boosts', default: true }, notify: { header: 'Notify on new posts', default: false }, languages: { header: 'Languages', default: nil })
   end
 
   def import_blocks!
@@ -76,7 +76,7 @@ class ImportService < BaseService
         if presence_hash[target_account.acct]
           items.delete(target_account.acct)
           extra = presence_hash[target_account.acct][1]
-          Import::RelationshipWorker.perform_async(@account.id, target_account.acct, action, extra)
+          Import::RelationshipWorker.perform_async(@account.id, target_account.acct, action, extra.stringify_keys)
         else
           Import::RelationshipWorker.perform_async(@account.id, target_account.acct, undo_action)
         end
@@ -87,7 +87,7 @@ class ImportService < BaseService
     tail_items = items - head_items
 
     Import::RelationshipWorker.push_bulk(head_items + tail_items) do |acct, extra|
-      [@account.id, acct, action, extra]
+      [@account.id, acct, action, extra.stringify_keys]
     end
   end
 
@@ -112,6 +112,11 @@ class ImportService < BaseService
       next if status.nil? && ActivityPub::TagManager.instance.local_uri?(uri)
 
       status || ActivityPub::FetchRemoteStatusService.new.call(uri)
+    rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
+      nil
+    rescue StandardError => e
+      Rails.logger.warn "Unexpected error when importing bookmark: #{e}"
+      nil
     end
 
     account_ids         = statuses.map(&:account_id)
@@ -131,7 +136,7 @@ class ImportService < BaseService
   end
 
   def import_data
-    Paperclip.io_adapters.for(@import.data).read
+    Paperclip.io_adapters.for(@import.data).read.force_encoding(Encoding::UTF_8)
   end
 
   def relations_map_for_account(account, account_ids)
diff --git a/app/services/keys/claim_service.rb b/app/services/keys/claim_service.rb
index 69568a0d1..ae9e24a24 100644
--- a/app/services/keys/claim_service.rb
+++ b/app/services/keys/claim_service.rb
@@ -72,7 +72,7 @@ class Keys::ClaimService < BaseService
 
   def build_post_request(uri)
     Request.new(:post, uri).tap do |request|
-      request.on_behalf_of(@source_account, :uri)
+      request.on_behalf_of(@source_account)
       request.add_headers(HEADERS)
     end
   end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 09e28b76b..c7454fc60 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class NotifyService < BaseService
+  include Redisable
+
   def call(recipient, type, activity)
     @recipient    = recipient
     @activity     = activity
@@ -8,10 +10,15 @@ class NotifyService < BaseService
 
     return if recipient.user.nil? || blocked?
 
-    create_notification!
+    @notification.save!
+
+    # It's possible the underlying activity has been deleted
+    # between the save call and now
+    return if @notification.activity.nil?
+
     push_notification!
     push_to_conversation! if direct_message?
-    send_email! if email_enabled?
+    send_email! if email_needed?
   rescue ActiveRecord::RecordInvalid
     nil
   end
@@ -22,30 +29,6 @@ class NotifyService < BaseService
     FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
   end
 
-  def blocked_status?
-    false
-  end
-
-  def blocked_favourite?
-    false
-  end
-
-  def blocked_follow?
-    false
-  end
-
-  def blocked_reblog?
-    false
-  end
-
-  def blocked_follow_request?
-    false
-  end
-
-  def blocked_poll?
-    false
-  end
-
   def following_sender?
     return @following_sender if defined?(@following_sender)
     @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
@@ -67,53 +50,33 @@ class NotifyService < BaseService
     message? && @notification.target_status.direct_visibility?
   end
 
-  # Returns true if the sender has been mentionned by the recipient up the thread
+  # Returns true if the sender has been mentioned by the recipient up the thread
   def response_to_recipient?
     return false if @notification.target_status.in_reply_to_id.nil?
 
     # Using an SQL CTE to avoid unneeded back-and-forth with SQL server in case of long threads
-    !Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @notification.from_account.id]).zero?
-      WITH RECURSIVE ancestors(id, in_reply_to_id, replying_to_sender) AS (
-          SELECT
-            s.id, s.in_reply_to_id, (CASE
-              WHEN s.account_id = :recipient_id THEN
-                EXISTS (
-                  SELECT *
-                  FROM mentions m
-                  WHERE m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-                )
-              ELSE
-                FALSE
-             END)
+    !Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @notification.from_account.id, depth_limit: 100]).zero?
+      WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
+          SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
           FROM statuses s
+          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
           WHERE s.id = :id
         UNION ALL
-          SELECT
-            s.id,
-            s.in_reply_to_id,
-            (CASE
-              WHEN s.account_id = :recipient_id THEN
-                EXISTS (
-                  SELECT *
-                  FROM mentions m
-                  WHERE m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-                )
-              ELSE
-                FALSE
-             END)
+          SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
           FROM ancestors st
           JOIN statuses s ON s.id = st.in_reply_to_id
-          WHERE st.replying_to_sender IS FALSE
+          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+          WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
       )
       SELECT COUNT(*)
       FROM ancestors st
       JOIN statuses s ON s.id = st.id
-      WHERE st.replying_to_sender IS TRUE AND s.visibility = 3
+      WHERE st.mention_id IS NOT NULL AND s.visibility = 3
     SQL
   end
 
   def from_staff?
-    @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user.staff?
+    @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role)
   end
 
   def optional_non_following_and_direct?
@@ -136,20 +99,20 @@ class NotifyService < BaseService
   end
 
   def blocked?
-    blocked   = @recipient.suspended?                            # Skip if the recipient account is suspended anyway
-    blocked ||= from_self? && @notification.type != :poll        # Skip for interactions with self
+    blocked   = @recipient.suspended?
+    blocked ||= from_self? && @notification.type != :poll
 
     return blocked if message? && from_staff?
 
-    blocked ||= domain_blocking?                                 # Skip for domain blocked accounts
-    blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts
+    blocked ||= domain_blocking?
+    blocked ||= @recipient.blocking?(@notification.from_account)
     blocked ||= @recipient.muting_notifications?(@notification.from_account)
-    blocked ||= hellbanned?                                      # Hellban
-    blocked ||= optional_non_follower?                           # Options
-    blocked ||= optional_non_following?                          # Options
-    blocked ||= optional_non_following_and_direct?               # Options
+    blocked ||= hellbanned?
+    blocked ||= optional_non_follower?
+    blocked ||= optional_non_following?
+    blocked ||= optional_non_following_and_direct?
     blocked ||= conversation_muted?
-    blocked ||= send("blocked_#{@notification.type}?")           # Type-dependent filters
+    blocked ||= blocked_mention? if @notification.type == :mention
     blocked
   end
 
@@ -161,38 +124,52 @@ class NotifyService < BaseService
     end
   end
 
-  def create_notification!
-    @notification.save!
+  def push_notification!
+    push_to_streaming_api! if subscribed_to_streaming_api?
+    push_to_web_push_subscriptions!
   end
 
-  def push_notification!
-    return if @notification.activity.nil?
+  def push_to_streaming_api!
+    redis.publish("timeline:#{@recipient.id}:notifications", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
+  end
 
-    Redis.current.publish("timeline:#{@recipient.id}:notifications", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
-    send_push_notifications!
+  def subscribed_to_streaming_api?
+    redis.exists?("subscribed:timeline:#{@recipient.id}") || redis.exists?("subscribed:timeline:#{@recipient.id}:notifications")
   end
 
   def push_to_conversation!
-    return if @notification.activity.nil?
     AccountConversation.add_status(@recipient, @notification.target_status)
   end
 
-  def send_push_notifications!
-    subscriptions_ids = ::Web::PushSubscription.where(user_id: @recipient.user.id)
-                                               .select { |subscription| subscription.pushable?(@notification) }
-                                               .map(&:id)
+  def push_to_web_push_subscriptions!
+    ::Web::PushNotificationWorker.push_bulk(web_push_subscriptions.select { |subscription| subscription.pushable?(@notification) }) { |subscription| [subscription.id, @notification.id] }
+  end
 
-    ::Web::PushNotificationWorker.push_bulk(subscriptions_ids) do |subscription_id|
-      [subscription_id, @notification.id]
-    end
+  def web_push_subscriptions
+    @web_push_subscriptions ||= ::Web::PushSubscription.where(user_id: @recipient.user.id).to_a
+  end
+
+  def subscribed_to_web_push?
+    web_push_subscriptions.any?
   end
 
   def send_email!
-    return if @notification.activity.nil?
-    NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later(wait: 2.minutes)
+    NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later(wait: 2.minutes) if NotificationMailer.respond_to?(@notification.type)
   end
 
-  def email_enabled?
+  def email_needed?
+    (!recipient_online? || always_send_emails?) && send_email_for_notification_type?
+  end
+
+  def recipient_online?
+    subscribed_to_streaming_api? || subscribed_to_web_push?
+  end
+
+  def always_send_emails?
+    @recipient.user.settings.always_send_emails
+  end
+
+  def send_email_for_notification_type?
     @recipient.user.settings.notification_emails[@notification.type.to_s]
   end
 end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 294ae43eb..bd3b69632 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -2,6 +2,7 @@
 
 class PostStatusService < BaseService
   include Redisable
+  include LanguagesHelper
 
   MIN_SCHEDULE_OFFSET = 5.minutes.freeze
 
@@ -36,12 +37,15 @@ class PostStatusService < BaseService
       schedule_status!
     else
       process_status!
-      postprocess_status!
-      bump_potential_friendship!
     end
 
     redis.setex(idempotency_key, 3_600, @status.id) if idempotency_given?
 
+    unless scheduled?
+      postprocess_status!
+      bump_potential_friendship!
+    end
+
     @status
   end
 
@@ -65,9 +69,6 @@ class PostStatusService < BaseService
     ApplicationRecord.transaction do
       @status = @account.statuses.create!(status_attributes)
     end
-
-    process_hashtags_service.call(@status)
-    process_mentions_service.call(@status)
   end
 
   def schedule_status!
@@ -91,6 +92,8 @@ class PostStatusService < BaseService
   end
 
   def postprocess_status!
+    process_hashtags_service.call(@status)
+    process_mentions_service.call(@status)
     Trends.tags.register(@status)
     LinkCrawlWorker.perform_async(@status.id)
     DistributionWorker.perform_async(@status.id)
@@ -99,7 +102,10 @@ class PostStatusService < BaseService
   end
 
   def validate_media!
-    return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
+    if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
+      @media = []
+      return
+    end
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
 
@@ -109,10 +115,6 @@ class PostStatusService < BaseService
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
   end
 
-  def language_from_option(str)
-    ISO_639.find(str)&.alpha2
-  end
-
   def process_mentions_service
     ProcessMentionsService.new
   end
@@ -160,12 +162,13 @@ class PostStatusService < BaseService
     {
       text: @text,
       media_attachments: @media || [],
+      ordered_media_attachment_ids: (@options[:media_ids] || []).map(&:to_i) & @media.map(&:id),
       thread: @in_reply_to,
       poll_attributes: poll_attributes,
       sensitive: @sensitive,
       spoiler_text: @options[:spoiler_text] || '',
       visibility: @visibility,
-      language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
+      language: valid_locale_cascade(@options[:language], @account.user&.preferred_posting_language, I18n.default_locale),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
     }.compact
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 61f573534..f813f06b2 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 class PrecomputeFeedService < BaseService
+  include Redisable
+
   def call(account)
     FeedManager.instance.populate_home(account)
   ensure
-    Redis.current.del("account:#{account.id}:regeneration")
+    redis.del("account:#{account.id}:regeneration")
   end
 end
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 47277c56c..43d7bcca6 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -1,20 +1,40 @@
 # frozen_string_literal: true
 
 class ProcessHashtagsService < BaseService
-  def call(status, tags = [])
-    tags    = Extractor.extract_hashtags(status.text) if status.local?
-    records = []
+  def call(status, raw_tags = [])
+    @status        = status
+    @account       = status.account
+    @raw_tags      = status.local? ? Extractor.extract_hashtags(status.text) : raw_tags
+    @previous_tags = status.tags.to_a
+    @current_tags  = []
 
-    Tag.find_or_create_by_names(tags) do |tag|
-      status.tags << tag
-      records << tag
-      tag.update(last_status_at: status.created_at) if tag.last_status_at.nil? || (tag.last_status_at < status.created_at && tag.last_status_at < 12.hours.ago)
+    assign_tags!
+    update_featured_tags!
+  end
+
+  private
+
+  def assign_tags!
+    @status.tags = @current_tags = Tag.find_or_create_by_names(@raw_tags)
+  end
+
+  def update_featured_tags!
+    return unless @status.distributable?
+
+    added_tags = @current_tags - @previous_tags
+
+    unless added_tags.empty?
+      @account.featured_tags.where(tag_id: added_tags.map(&:id)).each do |featured_tag|
+        featured_tag.increment(@status.created_at)
+      end
     end
 
-    return unless status.distributable?
+    removed_tags = @previous_tags - @current_tags
 
-    status.account.featured_tags.where(tag_id: records.map(&:id)).each do |featured_tag|
-      featured_tag.increment(status.created_at)
+    unless removed_tags.empty?
+      @account.featured_tags.where(tag_id: removed_tags.map(&:id)).each do |featured_tag|
+        featured_tag.decrement(@status.id)
+      end
     end
   end
 end
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 73dbb1834..b117db8c2 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -8,12 +8,23 @@ class ProcessMentionsService < BaseService
   # remote users
   # @param [Status] status
   def call(status)
-    return unless status.local?
+    @status = status
 
-    @status  = status
-    mentions = []
+    return unless @status.local?
 
-    status.text = status.text.gsub(Account::MENTION_RE) do |match|
+    @previous_mentions = @status.active_mentions.includes(:account).to_a
+    @current_mentions  = []
+
+    Status.transaction do
+      scan_text!
+      assign_mentions!
+    end
+  end
+
+  private
+
+  def scan_text!
+    @status.text = @status.text.gsub(Account::MENTION_RE) do |match|
       username, domain = Regexp.last_match(1).split('@')
 
       domain = begin
@@ -26,49 +37,58 @@ class ProcessMentionsService < BaseService
 
       mentioned_account = Account.find_remote(username, domain)
 
+      # Unapproved and unconfirmed accounts should not be mentionable
+      next match if mentioned_account&.local? && !(mentioned_account.user_confirmed? && mentioned_account.user_approved?)
+
+      # If the account cannot be found or isn't the right protocol,
+      # first try to resolve it
       if mention_undeliverable?(mentioned_account)
         begin
-          mentioned_account = resolve_account_service.call(Regexp.last_match(1))
+          mentioned_account = ResolveAccountService.new.call(Regexp.last_match(1))
         rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
           mentioned_account = nil
         end
       end
 
+      # If after resolving it still isn't found or isn't the right
+      # protocol, then give up
       next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
 
-      mention = mentioned_account.mentions.new(status: status)
-      mentions << mention if mention.save
+      mention   = @previous_mentions.find { |x| x.account_id == mentioned_account.id }
+      mention ||= mentioned_account.mentions.new(status: @status)
+
+      @current_mentions << mention
 
       "@#{mentioned_account.acct}"
     end
 
-    status.save!
-
-    mentions.each { |mention| create_notification(mention) }
+    @status.save!
   end
 
-  private
+  def assign_mentions!
+    # Make sure we never mention blocked accounts
+    unless @current_mentions.empty?
+      mentioned_domains = @current_mentions.map { |m| m.account.domain }.compact.uniq
+      blocked_domains   = Set.new(mentioned_domains.empty? ? [] : AccountDomainBlock.where(account_id: @status.account_id, domain: mentioned_domains))
+      mentioned_account_ids = @current_mentions.map(&:account_id)
+      blocked_account_ids = Set.new(@status.account.block_relationships.where(target_account_id: mentioned_account_ids).pluck(:target_account_id))
+
+      @current_mentions.select! { |mention| !(blocked_account_ids.include?(mention.account_id) || blocked_domains.include?(mention.account.domain)) }
+    end
+
+    @current_mentions.each do |mention|
+      mention.save if mention.new_record?
+    end
+
+    # If previous mentions are no longer contained in the text, convert them
+    # to silent mentions, since withdrawing access from someone who already
+    # received a notification might be more confusing
+    removed_mentions = @previous_mentions - @current_mentions
+
+    Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
+  end
 
   def mention_undeliverable?(mentioned_account)
-    mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus?)
-  end
-
-  def create_notification(mention)
-    mentioned_account = mention.account
-
-    if mentioned_account.local?
-      LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name, :mention)
-    elsif mentioned_account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url, { synchronize_followers: !mention.status.distributable? })
-    end
-  end
-
-  def activitypub_json
-    return @activitypub_json if defined?(@activitypub_json)
-    @activitypub_json = Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @status.account))
-  end
-
-  def resolve_account_service
-    ResolveAccountService.new
+    mentioned_account.nil? || (!mentioned_account.local? && !mentioned_account.activitypub?)
   end
 end
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index e10a8f0c8..9df81f13e 100644
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -5,6 +5,7 @@ class PurgeDomainService < BaseService
     Account.remote.where(domain: domain).reorder(nil).find_each do |account|
       DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
     end
+    CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy)
     Instance.refresh
   end
 end
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index ece91847a..7d2981709 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -30,8 +30,7 @@ class ReblogService < BaseService
 
     reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility, rate_limit: options[:with_rate_limit])
 
-    Trends.tags.register(reblog)
-    Trends.links.register(reblog)
+    Trends.register!(reblog)
     DistributionWorker.perform_async(reblog.id)
     ActivityPub::DistributionWorker.perform_async(reblog.id)
 
@@ -47,7 +46,7 @@ class ReblogService < BaseService
     reblogged_status = reblog.reblog
 
     if reblogged_status.account.local?
-      LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, :reblog)
+      LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, 'reblog')
     elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account)
       ActivityPub::DeliveryWorker.perform_async(build_json(reblog), reblog.account_id, reblogged_status.account.inbox_url)
     end
diff --git a/app/services/remove_featured_tag_service.rb b/app/services/remove_featured_tag_service.rb
new file mode 100644
index 000000000..2aa70e8fc
--- /dev/null
+++ b/app/services/remove_featured_tag_service.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class RemoveFeaturedTagService < BaseService
+  include Payloadable
+
+  def call(account, featured_tag)
+    @account = account
+
+    featured_tag.destroy!
+    ActivityPub::AccountRawDistributionWorker.perform_async(build_json(featured_tag), account.id) if @account.local?
+  end
+
+  private
+
+  def build_json(featured_tag)
+    Oj.dump(serialize_payload(featured_tag, ActivityPub::RemoveSerializer, signer: @account))
+  end
+end
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index f9c3dcf78..45cfb75f4 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -3,12 +3,14 @@
 class RemoveStatusService < BaseService
   include Redisable
   include Payloadable
+  include Lockable
 
   # Delete a status
   # @param   [Status] status
   # @param   [Hash] options
   # @option  [Boolean] :redraft
   # @option  [Boolean] :immediate
+  # @option  [Boolean] :preserve
   # @option  [Boolean] :original_removed
   def call(status, **options)
     @payload  = Oj.dump(event: :delete, payload: status.id.to_s)
@@ -16,37 +18,35 @@ class RemoveStatusService < BaseService
     @account  = status.account
     @options  = options
 
-    @status.discard
+    with_lock("distribute:#{@status.id}") do
+      @status.discard_with_reblogs
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        remove_from_self if @account.local?
-        remove_from_followers
-        remove_from_lists
+      StatusPin.find_by(status: @status)&.destroy
 
-        # There is no reason to send out Undo activities when the
-        # cause is that the original object has been removed, since
-        # original object being removed implicitly removes reblogs
-        # of it. The Delete activity of the original is forwarded
-        # separately.
-        remove_from_remote_reach if @account.local? && !@options[:original_removed]
+      remove_from_self if @account.local?
+      remove_from_followers
+      remove_from_lists
 
-        # Since reblogs don't mention anyone, don't get reblogged,
-        # favourited and don't contain their own media attachments
-        # or hashtags, this can be skipped
-        unless @status.reblog?
-          remove_from_mentions
-          remove_reblogs
-          remove_from_hashtags
-          remove_from_public
-          remove_from_media if @status.media_attachments.any?
-          remove_media
-        end
+      # There is no reason to send out Undo activities when the
+      # cause is that the original object has been removed, since
+      # original object being removed implicitly removes reblogs
+      # of it. The Delete activity of the original is forwarded
+      # separately.
+      remove_from_remote_reach if @account.local? && !@options[:original_removed]
 
-        @status.destroy! if @options[:immediate] || !@status.reported?
-      else
-        raise Mastodon::RaceConditionError
+      # Since reblogs don't mention anyone, don't get reblogged,
+      # favourited and don't contain their own media attachments
+      # or hashtags, this can be skipped
+      unless @status.reblog?
+        remove_from_mentions
+        remove_reblogs
+        remove_from_hashtags
+        remove_from_public
+        remove_from_media if @status.with_media?
+        remove_media
       end
+
+      @status.destroy! if permanently?
     end
   end
 
@@ -57,13 +57,13 @@ class RemoveStatusService < BaseService
   end
 
   def remove_from_followers
-    @account.followers_for_local_distribution.reorder(nil).find_each do |follower|
+    @account.followers_for_local_distribution.includes(:user).reorder(nil).find_each do |follower|
       FeedManager.instance.unpush_from_home(follower, @status)
     end
   end
 
   def remove_from_lists
-    @account.lists_for_local_distribution.select(:id, :account_id).reorder(nil).find_each do |list|
+    @account.lists_for_local_distribution.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |list|
       FeedManager.instance.unpush_from_list(list, @status)
     end
   end
@@ -86,7 +86,7 @@ class RemoveStatusService < BaseService
     # the author and wouldn't normally receive the delete
     # notification - so here, we explicitly send it to them
 
-    status_reach_finder = StatusReachFinder.new(@status)
+    status_reach_finder = StatusReachFinder.new(@status, unsafe: true)
 
     ActivityPub::DeliveryWorker.push_bulk(status_reach_finder.inboxes) do |inbox_url|
       [signed_activity_json, @account.id, inbox_url]
@@ -94,7 +94,7 @@ class RemoveStatusService < BaseService
   end
 
   def signed_activity_json
-    @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account))
+    @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account, always_sign: true))
   end
 
   def remove_reblogs
@@ -102,7 +102,7 @@ class RemoveStatusService < BaseService
     # because once original status is gone, reblogs will disappear
     # without us being able to do all the fancy stuff
 
-    @status.reblogs.includes(:account).reorder(nil).find_each do |reblog|
+    @status.reblogs.rewhere(deleted_at: [nil, @status.deleted_at]).includes(:account).reorder(nil).find_each do |reblog|
       RemoveStatusService.new.call(reblog, original_removed: true)
     end
   end
@@ -135,12 +135,12 @@ class RemoveStatusService < BaseService
   end
 
   def remove_media
-    return if @options[:redraft] || (!@options[:immediate] && @status.reported?)
+    return if @options[:redraft] || !permanently?
 
     @status.media_attachments.destroy_all
   end
 
-  def lock_options
-    { redis: Redis.current, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds }
+  def permanently?
+    @options[:immediate] || !(@options[:preserve] || @status.reported?)
   end
 end
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index bc0a8b464..0ce525b07 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -6,15 +6,17 @@ class ReportService < BaseService
   def call(source_account, target_account, options = {})
     @source_account = source_account
     @target_account = target_account
-    @status_ids     = options.delete(:status_ids) || []
-    @comment        = options.delete(:comment) || ''
+    @status_ids     = options.delete(:status_ids).presence || []
+    @comment        = options.delete(:comment).presence || ''
+    @category       = options[:rule_ids].present? ? 'violation' : (options.delete(:category).presence || 'other')
+    @rule_ids       = options.delete(:rule_ids).presence
     @options        = options
 
     raise ActiveRecord::RecordNotFound if @target_account.suspended?
 
     create_report!
     notify_staff!
-    forward_to_origin! if !@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward])
+    forward_to_origin! if forward?
 
     @report
   end
@@ -24,19 +26,21 @@ class ReportService < BaseService
   def create_report!
     @report = @source_account.reports.create!(
       target_account: @target_account,
-      status_ids: @status_ids,
+      status_ids: reported_status_ids,
       comment: @comment,
       uri: @options[:uri],
-      forwarded: ActiveModel::Type::Boolean.new.cast(@options[:forward])
+      forwarded: forward?,
+      category: @category,
+      rule_ids: @rule_ids
     )
   end
 
   def notify_staff!
     return if @report.unresolved_siblings?
 
-    User.staff.includes(:account).each do |u|
-      next unless u.allows_report_emails?
-      AdminMailer.new_report(u.account, @report).deliver_later
+    User.those_who_can(:manage_reports).includes(:account).each do |u|
+      LocalNotificationWorker.perform_async(u.account_id, @report.id, 'Report', 'admin.report')
+      AdminMailer.new_report(u.account, @report).deliver_later if u.allows_report_emails?
     end
   end
 
@@ -48,6 +52,23 @@ class ReportService < BaseService
     )
   end
 
+  def forward?
+    !@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward])
+  end
+
+  def reported_status_ids
+    return AccountStatusesFilter.new(@target_account, @source_account).results.with_discarded.find(Array(@status_ids)).pluck(:id) if @source_account.local?
+
+    # If the account making reports is remote, it is likely anonymized so we have to relax the requirements for attaching statuses.
+    domain = @source_account.domain.to_s.downcase
+    has_followers = @target_account.followers.where(Account.arel_table[:domain].lower.eq(domain)).exists?
+    visibility = has_followers ? %i(public unlisted private) : %i(public unlisted)
+    scope = @target_account.statuses.with_discarded
+    scope.merge!(scope.where(visibility: visibility).or(scope.where('EXISTS (SELECT 1 FROM mentions m JOIN accounts a ON m.account_id = a.id WHERE lower(a.domain) = ?)', domain)))
+    # Allow missing posts to not drop reports that include e.g. a deleted post
+    scope.where(id: Array(@status_ids)).pluck(:id)
+  end
+
   def payload
     Oj.dump(serialize_payload(@report, ActivityPub::FlagSerializer, account: some_local_account))
   end
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index b266c019e..d8b81a7b9 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 class ResolveAccountService < BaseService
-  include JsonLdHelper
   include DomainControlHelper
   include WebfingerHelper
+  include Redisable
+  include Lockable
 
   # Find or create an account record for a remote user. When creating,
   # look up the user's webfinger and fetch ActivityPub data
@@ -11,6 +12,8 @@ class ResolveAccountService < BaseService
   # @param [Hash] options
   # @option options [Boolean] :redirected Do not follow further Webfinger redirects
   # @option options [Boolean] :skip_webfinger Do not attempt any webfinger query or refreshing account data
+  # @option options [Boolean] :skip_cache Get the latest data from origin even if cache is not due to update yet
+  # @option options [Boolean] :suppress_errors When failing, return nil instead of raising an error
   # @return [Account]
   def call(uri, options = {})
     return if uri.blank?
@@ -50,22 +53,22 @@ class ResolveAccountService < BaseService
     # either needs to be created, or updated from fresh data
 
     fetch_account!
-  rescue Webfinger::Error, Oj::ParseError => e
+  rescue Webfinger::Error => e
     Rails.logger.debug "Webfinger query for #{@uri} failed: #{e}"
-    nil
+    raise unless @options[:suppress_errors]
   end
 
   private
 
   def process_options!(uri, options)
-    @options = options
+    @options = { suppress_errors: true }.merge(options)
 
     if uri.is_a?(Account)
       @account  = uri
       @username = @account.username
       @domain   = @account.domain
     else
-      @username, @domain = uri.split('@')
+      @username, @domain = uri.strip.gsub(/\A@/, '').split('@')
     end
 
     @domain = begin
@@ -94,7 +97,7 @@ class ResolveAccountService < BaseService
     @username, @domain = split_acct(@webfinger.subject)
 
     unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
-      raise Webfinger::RedirectError, "The URI #{uri} tries to hijack #{@username}@#{@domain}"
+      raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{uri} (stopped at #{@username}@#{@domain})"
     end
   rescue Webfinger::GoneError
     @gone = true
@@ -107,12 +110,8 @@ class ResolveAccountService < BaseService
   def fetch_account!
     return unless activitypub_ready?
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        @account = ActivityPub::FetchRemoteAccountService.new.call(actor_url)
-      else
-        raise Mastodon::RaceConditionError
-      end
+    with_lock("resolve:#{@username}@#{@domain}") do
+      @account = ActivityPub::FetchRemoteAccountService.new.call(actor_url, suppress_errors: @options[:suppress_errors])
     end
 
     @account
@@ -122,7 +121,7 @@ class ResolveAccountService < BaseService
     return false if @options[:check_delivery_availability] && !DeliveryFailureTracker.available?(@domain)
     return false if @options[:skip_webfinger]
 
-    @account.nil? || @account.possibly_stale?
+    @options[:skip_cache] || @account.nil? || @account.possibly_stale?
   end
 
   def activitypub_ready?
@@ -143,10 +142,6 @@ class ResolveAccountService < BaseService
 
   def queue_deletion!
     @account.suspend!(origin: :remote)
-    AccountDeletionWorker.perform_async(@account.id, reserve_username: false, skip_activitypub: true)
-  end
-
-  def lock_options
-    { redis: Redis.current, key: "resolve:#{@username}@#{@domain}", autorelease: 15.minutes.seconds }
+    AccountDeletionWorker.perform_async(@account.id, { 'reserve_username' => false, 'skip_activitypub' => true })
   end
 end
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index 5981e4d98..52f35daf3 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -4,6 +4,8 @@ class ResolveURLService < BaseService
   include JsonLdHelper
   include Authorization
 
+  USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}
+
   def call(url, on_behalf_of: nil)
     @url          = url
     @on_behalf_of = on_behalf_of
@@ -20,8 +22,8 @@ class ResolveURLService < BaseService
   private
 
   def process_url
-    if equals_or_includes_any?(type, ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES)
-      ActivityPub::FetchRemoteAccountService.new.call(resource_url, prefetched_body: body)
+    if equals_or_includes_any?(type, ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES)
+      ActivityPub::FetchRemoteActorService.new.call(resource_url, prefetched_body: body)
     elsif equals_or_includes_any?(type, ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES)
       status = FetchRemoteStatusService.new.call(resource_url, body)
       authorize_with @on_behalf_of, status, :show? unless status.nil?
@@ -30,6 +32,11 @@ class ResolveURLService < BaseService
   end
 
   def process_url_from_db
+    if [500, 502, 503, 504, nil].include?(fetch_resource_service.response_code)
+      account = Account.find_by(uri: @url)
+      return account unless account.nil?
+    end
+
     return unless @on_behalf_of.present? && [401, 403, 404].include?(fetch_resource_service.response_code)
 
     # It may happen that the resource is a private toot, and thus not fetchable,
@@ -38,7 +45,7 @@ class ResolveURLService < BaseService
 
     # We don't have an index on `url`, so try guessing the `uri` from `url`
     parsed_url = Addressable::URI.parse(@url)
-    parsed_url.path.match(%r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}) do |matched|
+    parsed_url.path.match(USERNAME_STATUS_RE) do |matched|
       parsed_url.path = "/users/#{matched[:username]}/statuses/#{matched[:status_id]}"
       scope = scope.or(Status.where(uri: parsed_url.to_s, url: @url))
     end
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index b8dc8d5e0..6856c2c51 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -76,10 +76,15 @@ class SuspendAccountService < BaseService
         styles.each do |style|
           case Paperclip::Attachment.default_options[:storage]
           when :s3
+            # Prevent useless S3 calls if ACLs are disabled
+            next if ENV['S3_PERMISSION'] == ''
+
             begin
               attachment.s3_object(style).acl.put(acl: 'private')
             rescue Aws::S3::Errors::NoSuchKey
               Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            rescue Aws::S3::Errors::NotImplemented => e
+              Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
             end
           when :fog
             # Not supported
diff --git a/app/services/tag_search_service.rb b/app/services/tag_search_service.rb
index b78d65625..b66ccced9 100644
--- a/app/services/tag_search_service.rb
+++ b/app/services/tag_search_service.rb
@@ -76,11 +76,27 @@ class TagSearchService < BaseService
     definition = TagsIndex.query(query)
     definition = definition.filter(filter) if @options[:exclude_unreviewed]
 
-    definition.limit(@limit).offset(@offset).objects.compact
+    ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
   rescue Faraday::ConnectionFailed, Parslet::ParseFailed
     nil
   end
 
+  # Since the ElasticSearch Query doesn't guarantee the exact match will be the
+  # first result or that it will even be returned, patch the results accordingly
+  def ensure_exact_match(results)
+    return results unless @offset.nil? || @offset.zero?
+
+    normalized_query = Tag.normalize(@query)
+    exact_match = results.find { |tag| tag.name.downcase == normalized_query }
+    exact_match ||= Tag.find_normalized(normalized_query)
+    unless exact_match.nil?
+      results.delete(exact_match)
+      results = [exact_match] + results
+    end
+
+    results
+  end
+
   def from_database
     Tag.search_for(@query, @limit, @offset, @options)
   end
diff --git a/app/services/translate_status_service.rb b/app/services/translate_status_service.rb
new file mode 100644
index 000000000..539a0d9db
--- /dev/null
+++ b/app/services/translate_status_service.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class TranslateStatusService < BaseService
+  CACHE_TTL = 1.day.freeze
+
+  include FormattingHelper
+
+  def call(status, target_language)
+    raise Mastodon::NotPermittedError unless status.public_visibility? || status.unlisted_visibility?
+
+    @status = status
+    @content = status_content_format(@status)
+    @target_language = target_language
+
+    Rails.cache.fetch("translations/#{@status.language}/#{@target_language}/#{content_hash}", expires_in: CACHE_TTL) { translation_backend.translate(@content, @status.language, @target_language) }
+  end
+
+  private
+
+  def translation_backend
+    TranslationService.configured
+  end
+
+  def content_hash
+    Digest::SHA256.base64digest(@content)
+  end
+end
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 151f3674f..d83a60e4e 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -2,6 +2,8 @@
 
 class UnfollowService < BaseService
   include Payloadable
+  include Redisable
+  include Lockable
 
   # Unfollow and notify the remote user
   # @param [Account] source_account Where to unfollow from
@@ -13,7 +15,9 @@ class UnfollowService < BaseService
     @target_account = target_account
     @options        = options
 
-    unfollow! || undo_follow_request!
+    with_lock("relationship:#{[source_account.id, target_account.id].sort.join(':')}") do
+      unfollow! || undo_follow_request!
+    end
   end
 
   private
diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb
index 39d8a6ba7..534203dce 100644
--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@@ -73,10 +73,15 @@ class UnsuspendAccountService < BaseService
         styles.each do |style|
           case Paperclip::Attachment.default_options[:storage]
           when :s3
+            # Prevent useless S3 calls if ACLs are disabled
+            next if ENV['S3_PERMISSION'] == ''
+
             begin
               attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions])
             rescue Aws::S3::Errors::NoSuchKey
               Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            rescue Aws::S3::Errors::NotImplemented => e
+              Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
             end
           when :fog
             # Not supported
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
index 77f794e17..71976ab00 100644
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@@ -28,7 +28,7 @@ class UpdateAccountService < BaseService
   end
 
   def check_links(account)
-    VerifyAccountLinksWorker.perform_async(account.id)
+    VerifyAccountLinksWorker.perform_async(account.id) if account.fields.any?(&:requires_verification?)
   end
 
   def process_hashtags(account)
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
new file mode 100644
index 000000000..c4c934976
--- /dev/null
+++ b/app/services/update_status_service.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+class UpdateStatusService < BaseService
+  include Redisable
+  include LanguagesHelper
+
+  class NoChangesSubmittedError < StandardError; end
+
+  # @param [Status] status
+  # @param [Integer] account_id
+  # @param [Hash] options
+  # @option options [Array<Integer>] :media_ids
+  # @option options [Hash] :poll
+  # @option options [String] :text
+  # @option options [String] :spoiler_text
+  # @option options [Boolean] :sensitive
+  # @option options [String] :language
+  def call(status, account_id, options = {})
+    @status                    = status
+    @options                   = options
+    @account_id                = account_id
+    @media_attachments_changed = false
+    @poll_changed              = false
+
+    Status.transaction do
+      create_previous_edit!
+      update_media_attachments! if @options.key?(:media_ids)
+      update_poll! if @options.key?(:poll)
+      update_immediate_attributes!
+      create_edit!
+    end
+
+    queue_poll_notifications!
+    reset_preview_card!
+    update_metadata!
+    broadcast_updates!
+
+    @status
+  rescue NoChangesSubmittedError
+    # For calls that result in no changes, swallow the error
+    # but get back to the original state
+
+    @status.reload
+  end
+
+  private
+
+  def update_media_attachments!
+    previous_media_attachments = @status.ordered_media_attachments.to_a
+    next_media_attachments     = validate_media!
+    added_media_attachments    = next_media_attachments - previous_media_attachments
+
+    MediaAttachment.where(id: added_media_attachments.map(&:id)).update_all(status_id: @status.id)
+
+    @status.ordered_media_attachment_ids = (@options[:media_ids] || []).map(&:to_i) & next_media_attachments.map(&:id)
+    @media_attachments_changed = previous_media_attachments.map(&:id) != @status.ordered_media_attachment_ids
+    @status.media_attachments.reload
+  end
+
+  def validate_media!
+    return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
+
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+
+    media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a
+
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
+
+    media_attachments
+  end
+
+  def update_poll!
+    previous_poll        = @status.preloadable_poll
+    @previous_expires_at = previous_poll&.expires_at
+
+    if @options[:poll].present?
+      poll = previous_poll || @status.account.polls.new(status: @status, votes_count: 0)
+
+      # If for some reasons the options were changed, it invalidates all previous
+      # votes, so we need to remove them
+      @poll_changed = true if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
+
+      poll.options     = @options[:poll][:options]
+      poll.hide_totals = @options[:poll][:hide_totals] || false
+      poll.multiple    = @options[:poll][:multiple] || false
+      poll.expires_in  = @options[:poll][:expires_in]
+      poll.reset_votes! if @poll_changed
+      poll.save!
+
+      @status.poll_id = poll.id
+    elsif previous_poll.present?
+      previous_poll.destroy
+      @poll_changed = true
+      @status.poll_id = nil
+    end
+
+    @poll_changed = true if @previous_expires_at != @status.preloadable_poll&.expires_at
+  end
+
+  def update_immediate_attributes!
+    @status.text         = @options[:text].presence || @options.delete(:spoiler_text) || '' if @options.key?(:text)
+    @status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text)
+    @status.sensitive    = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text)
+    @status.language     = valid_locale_cascade(@options[:language], @status.language, @status.account.user&.preferred_posting_language, I18n.default_locale)
+
+    # We raise here to rollback the entire transaction
+    raise NoChangesSubmittedError unless significant_changes?
+
+    @status.edited_at = Time.now.utc
+    @status.save!
+  end
+
+  def reset_preview_card!
+    return unless @status.text_previously_changed?
+
+    @status.preview_cards.clear
+    LinkCrawlWorker.perform_async(@status.id)
+  end
+
+  def update_metadata!
+    ProcessHashtagsService.new.call(@status)
+    ProcessMentionsService.new.call(@status)
+  end
+
+  def broadcast_updates!
+    DistributionWorker.perform_async(@status.id, { 'update' => true })
+    ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id)
+  end
+
+  def queue_poll_notifications!
+    poll = @status.preloadable_poll
+
+    # If the poll had no expiration date set but now has, or now has a sooner
+    # expiration date, and people have voted, schedule a notification
+
+    return unless poll.present? && poll.expires_at.present? && poll.votes.exists?
+
+    PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
+    PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)
+  end
+
+  def create_previous_edit!
+    # We only need to create a previous edit when no previous edits exist, e.g.
+    # when the status has never been edited. For other cases, we always create
+    # an edit, so the step can be skipped
+
+    return if @status.edits.any?
+
+    @status.snapshot!(at_time: @status.created_at, rate_limit: false)
+  end
+
+  def create_edit!
+    @status.snapshot!(account_id: @account_id)
+  end
+
+  def significant_changes?
+    @status.changed? || @poll_changed || @media_attachments_changed
+  end
+end
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 878a2188d..7496fe2d5 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -28,7 +28,7 @@ class VerifyLinkService < BaseService
 
     links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]')
 
-    if links.any? { |link| link['href'] == @link_back }
+    if links.any? { |link| link['href']&.downcase == @link_back.downcase }
       true
     elsif links.empty?
       false
@@ -38,6 +38,8 @@ class VerifyLinkService < BaseService
   end
 
   def link_redirects_back?(test_url)
+    return false if test_url.blank?
+
     redirect_to_url = Request.new(:head, test_url, follow: false).perform do |res|
       res.headers['Location']
     end
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 19e453332..114ec285c 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -3,8 +3,12 @@
 class VoteService < BaseService
   include Authorization
   include Payloadable
+  include Redisable
+  include Lockable
 
   def call(account, poll, choices)
+    return if choices.empty?
+
     authorize_with account, poll, :vote?
 
     @account = account
@@ -14,17 +18,13 @@ class VoteService < BaseService
 
     already_voted = true
 
-    RedisLock.acquire(lock_options) do |lock|
-      if lock.acquired?
-        already_voted = @poll.votes.where(account: @account).exists?
+    with_lock("vote:#{@poll.id}:#{@account.id}") do
+      already_voted = @poll.votes.where(account: @account).exists?
 
-        ApplicationRecord.transaction do
-          @choices.each do |choice|
-            @votes << @poll.votes.create!(account: @account, choice: Integer(choice))
-          end
+      ApplicationRecord.transaction do
+        @choices.each do |choice|
+          @votes << @poll.votes.create!(account: @account, choice: Integer(choice))
         end
-      else
-        raise Mastodon::RaceConditionError
       end
     end
 
@@ -75,8 +75,4 @@ class VoteService < BaseService
     @poll.reload
     retry
   end
-
-  def lock_options
-    { redis: Redis.current, key: "vote:#{@poll.id}:#{@account.id}" }
-  end
 end
diff --git a/app/services/webhook_service.rb b/app/services/webhook_service.rb
new file mode 100644
index 000000000..aafa38318
--- /dev/null
+++ b/app/services/webhook_service.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class WebhookService < BaseService
+  def call(event, object)
+    @event  = Webhooks::EventPresenter.new(event, object)
+    @body   = serialize_event
+
+    webhooks_for_event.each do |webhook_id|
+      Webhooks::DeliveryWorker.perform_async(webhook_id, @body)
+    end
+  end
+
+  private
+
+  def webhooks_for_event
+    Webhook.enabled.where('? = ANY(events)', @event.type).pluck(:id)
+  end
+
+  def serialize_event
+    Oj.dump(ActiveModelSerializers::SerializableResource.new(@event, serializer: REST::Admin::WebhookEventSerializer, scope: nil, scope_name: :current_user).as_json)
+  end
+end
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index eb66ad93d..9b3f2e33e 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -4,41 +4,39 @@ class BlacklistedEmailValidator < ActiveModel::Validator
   def validate(user)
     return if user.valid_invitation? || user.email.blank?
 
-    @email = user.email
-
-    user.errors.add(:email, :blocked) if blocked_email_provider?
-    user.errors.add(:email, :taken) if blocked_canonical_email?
+    user.errors.add(:email, :blocked) if blocked_email_provider?(user.email, user.sign_up_ip)
+    user.errors.add(:email, :taken) if blocked_canonical_email?(user.email)
   end
 
   private
 
-  def blocked_email_provider?
-    disallowed_through_email_domain_block? || disallowed_through_configuration? || not_allowed_through_configuration?
+  def blocked_email_provider?(email, ip)
+    disallowed_through_email_domain_block?(email, ip) || disallowed_through_configuration?(email) || not_allowed_through_configuration?(email)
   end
 
-  def blocked_canonical_email?
-    CanonicalEmailBlock.block?(@email)
+  def blocked_canonical_email?(email)
+    CanonicalEmailBlock.block?(email)
   end
 
-  def disallowed_through_email_domain_block?
-    EmailDomainBlock.block?(@email)
+  def disallowed_through_email_domain_block?(email, ip)
+    EmailDomainBlock.block?(email, attempt_ip: ip)
   end
 
-  def not_allowed_through_configuration?
+  def not_allowed_through_configuration?(email)
     return false if Rails.configuration.x.email_domains_whitelist.blank?
 
     domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})$", true)
 
-    @email !~ regexp
+    email !~ regexp
   end
 
-  def disallowed_through_configuration?
+  def disallowed_through_configuration?(email)
     return false if Rails.configuration.x.email_domains_blacklist.blank?
 
     domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})", true)
 
-    regexp.match?(@email)
+    regexp.match?(email)
   end
 end
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index dceef5029..20f2fd37c 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -11,11 +11,11 @@ class EmailMxValidator < ActiveModel::Validator
     if domain.blank?
       user.errors.add(:email, :invalid)
     elsif !on_allowlist?(domain)
-      ips, hostnames = resolve_mx(domain)
+      resolved_ips, resolved_domains = resolve_mx(domain)
 
-      if ips.empty?
+      if resolved_ips.empty?
         user.errors.add(:email, :unreachable)
-      elsif on_blacklist?(hostnames + ips)
+      elsif on_blacklist?(resolved_domains, user.sign_up_ip)
         user.errors.add(:email, :blocked)
       end
     end
@@ -40,24 +40,24 @@ class EmailMxValidator < ActiveModel::Validator
   end
 
   def resolve_mx(domain)
-    hostnames = []
-    ips       = []
+    records = []
+    ips     = []
 
     Resolv::DNS.open do |dns|
       dns.timeouts = 5
 
-      hostnames = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+      records = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
 
-      ([domain] + hostnames).uniq.each do |hostname|
+      ([domain] + records).uniq.each do |hostname|
         ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
         ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
       end
     end
 
-    [ips, hostnames]
+    [ips, records]
   end
 
-  def on_blacklist?(values)
-    EmailDomainBlock.where(domain: values.uniq).any?
+  def on_blacklist?(domains, attempt_ip)
+    EmailDomainBlock.block?(domains, attempt_ip: attempt_ip)
   end
 end
diff --git a/app/validators/existing_username_validator.rb b/app/validators/existing_username_validator.rb
index 8f7d96b8e..1c5596821 100644
--- a/app/validators/existing_username_validator.rb
+++ b/app/validators/existing_username_validator.rb
@@ -6,7 +6,7 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
 
     usernames_and_domains = begin
       value.split(',').map do |str|
-        username, domain = str.strip.gsub(/\A@/, '').split('@')
+        username, domain = str.strip.gsub(/\A@/, '').split('@', 2)
         domain = nil if TagManager.instance.local_domain?(domain)
 
         next if username.blank?
@@ -21,8 +21,8 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
 
     if options[:multiple]
       record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) if usernames_with_no_accounts.any?
-    else
-      record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) if usernames_with_no_accounts.any? || usernames_and_domains.size > 1
+    elsif usernames_with_no_accounts.any? || usernames_and_domains.size > 1
+      record.errors.add(attribute, I18n.t('existing_username_validator.not_found'))
     end
   end
 end
diff --git a/app/validators/import_validator.rb b/app/validators/import_validator.rb
index a182abfa5..cbad56df6 100644
--- a/app/validators/import_validator.rb
+++ b/app/validators/import_validator.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'csv'
+
 class ImportValidator < ActiveModel::Validator
   KNOWN_HEADERS = [
     'Account address',
@@ -24,6 +26,8 @@ class ImportValidator < ActiveModel::Validator
     when 'following'
       validate_following_import(import, row_count)
     end
+  rescue CSV::MalformedCSVError
+    import.errors.add(:data, :malformed)
   end
 
   private
diff --git a/app/validators/language_validator.rb b/app/validators/language_validator.rb
new file mode 100644
index 000000000..b723e1a40
--- /dev/null
+++ b/app/validators/language_validator.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class LanguageValidator < ActiveModel::EachValidator
+  include LanguagesHelper
+
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, :invalid) unless valid?(value)
+  end
+
+  private
+
+  def valid?(str)
+    if str.nil?
+      true
+    elsif str.is_a?(Array)
+      str.all? { |x| valid_locale?(x) }
+    else
+      valid_locale?(str)
+    end
+  end
+end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 4c258ec16..e107912b7 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -3,35 +3,57 @@
 class StatusLengthValidator < ActiveModel::Validator
   MAX_CHARS = 500
   URL_PLACEHOLDER_CHARS = 23
-  URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}"
+  URL_PLACEHOLDER = 'x' * 23
 
   def validate(status)
     return unless status.local? && !status.reblog?
 
-    @status = status
-    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?
+    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status)
   end
 
   private
 
-  def too_long?
-    countable_length > MAX_CHARS
+  def too_long?(status)
+    countable_length(combined_text(status)) > MAX_CHARS
   end
 
-  def countable_length
-    total_text.mb_chars.grapheme_length
+  def countable_length(str)
+    str.mb_chars.grapheme_length
   end
 
-  def total_text
-    [@status.spoiler_text, countable_text].join
+  def combined_text(status)
+    [status.spoiler_text, countable_text(status.text)].join
   end
 
-  def countable_text
-    return '' if @status.text.nil?
+  def countable_text(str)
+    return '' if str.blank?
 
-    @status.text.dup.tap do |new_text|
-      new_text.gsub!(FetchLinkCardService::URL_PATTERN, URL_PLACEHOLDER)
-      new_text.gsub!(Account::MENTION_RE, '@\2')
+    # To ensure that we only give length concessions to entities that
+    # will be correctly parsed during formatting, we go through full
+    # entity extraction
+
+    entities = Extractor.remove_overlapping_entities(Extractor.extract_urls_with_indices(str, extract_url_without_protocol: false) + Extractor.extract_mentions_or_lists_with_indices(str))
+
+    rewrite_entities(str, entities) do |entity|
+      if entity[:url]
+        URL_PLACEHOLDER
+      elsif entity[:screen_name]
+        "@#{entity[:screen_name].split('@').first}"
+      end
     end
   end
+
+  def rewrite_entities(str, entities)
+    entities.sort_by! { |entity| entity[:indices].first }
+    result = ''.dup
+
+    last_index = entities.reduce(0) do |index, entity|
+      result << str[index...entity[:indices].first]
+      result << yield(entity)
+      entity[:indices].last
+    end
+
+    result << str[last_index..-1]
+    result
+  end
 end
diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb
index 2c7bce674..2fdd5b34f 100644
--- a/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@@ -4,7 +4,7 @@ class StatusPinValidator < ActiveModel::Validator
   def validate(pin)
     pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
     pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
-    pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility)
+    pin.errors.add(:base, I18n.t('statuses.pin_errors.direct')) if pin.status.direct_visibility?
     pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 && pin.account.local?
   end
 end
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index f50abbe24..75d1edb87 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -2,7 +2,7 @@
 
 class URLValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, I18n.t('applications.invalid_url')) unless compliant?(value)
+    record.errors.add(attribute, :invalid) unless compliant?(value)
   end
 
   private
diff --git a/app/views/about/_domain_blocks.html.haml b/app/views/about/_domain_blocks.html.haml
deleted file mode 100644
index 35a30f16e..000000000
--- a/app/views/about/_domain_blocks.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%table
-  %thead
-    %tr
-      %th= t('about.unavailable_content_description.domain')
-      %th= t('about.unavailable_content_description.reason')
-  %tbody
-    - domain_blocks.each do |domain_block|
-      %tr
-        %td.nowrap
-          %span{ title: "SHA-256: #{domain_block.domain_digest}" }= domain_block.public_domain
-        %td
-          = domain_block.public_comment if display_blocks_rationale?
diff --git a/app/views/about/_login.html.haml b/app/views/about/_login.html.haml
deleted file mode 100644
index fa58f04d7..000000000
--- a/app/views/about/_login.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-= simple_form_for(new_user, url: user_session_path, namespace: 'login') do |f|
-  .fields-group
-    - if use_seamless_external_login?
-      = f.input :email, placeholder: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
-    - else
-      = f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
-
-    = f.input :password, placeholder: t('simple_form.labels.defaults.password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }, hint: false
-
-  .actions
-    = f.button :button, t('auth.login'), type: :submit, class: 'button button-primary'
-
-  %p.hint.subtle-hint= link_to t('auth.trouble_logging_in'), new_user_password_path
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml
deleted file mode 100644
index e4d614d71..000000000
--- a/app/views/about/_registration.html.haml
+++ /dev/null
@@ -1,31 +0,0 @@
-.simple_form__overlay-area{ class: (closed_registrations? && @instance_presenter.closed_registrations_message.present?) ? 'simple_form__overlay-area__blurred' : '' }
-  = simple_form_for(new_user, url: user_registration_path, namespace: 'registration', html: { novalidate: false }) do |f|
-    %p.lead= t('about.federation_hint_html', instance: content_tag(:strong, site_hostname))
-
-    .fields-group
-      = f.simple_fields_for :account do |account_fields|
-        = account_fields.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: false, disabled: closed_registrations?
-
-      = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
-      = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, hint: false, disabled: closed_registrations?
-      = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
-
-      = f.input :confirm_password, as: :string, placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
-      = f.input :website, as: :url, placeholder: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
-
-    - if approved_registrations?
-      .fields-group
-        = f.simple_fields_for :invite_request do |invite_request_fields|
-          = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text
-
-    .fields-group
-      = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true, disabled: closed_registrations?
-
-    .actions
-      = f.button :button, sign_up_message, type: :submit, class: 'button button-primary', disabled: closed_registrations?
-
-  - if closed_registrations? && @instance_presenter.closed_registrations_message.present?
-    .simple_form__overlay-area__overlay
-      .simple_form__overlay-area__overlay__content.rich-formatting
-        .block-icon= fa_icon 'warning'
-        = @instance_presenter.closed_registrations_message.html_safe
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
deleted file mode 100644
index f4429622c..000000000
--- a/app/views/about/more.html.haml
+++ /dev/null
@@ -1,96 +0,0 @@
-- content_for :page_title do
-  = site_hostname
-
-- content_for :header_tags do
-  = javascript_pack_tag 'public', crossorigin: 'anonymous'
-  = render partial: 'shared/og'
-
-.grid-4
-  .column-0
-    .public-account-header.public-account-header--no-bar
-      .public-account-header__image
-        = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title, class: 'parallax'
-
-  .column-1
-    .landing-page__call-to-action{ dir: 'ltr' }
-      .row
-        .row__information-board
-          .information-board__section
-            %span= t 'about.user_count_before'
-            %strong= friendly_number_to_human @instance_presenter.user_count
-            %span= t 'about.user_count_after', count: @instance_presenter.user_count
-          .information-board__section
-            %span= t 'about.status_count_before'
-            %strong= friendly_number_to_human @instance_presenter.status_count
-            %span= t 'about.status_count_after', count: @instance_presenter.status_count
-        .row__mascot
-          .landing-page__mascot
-            = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
-
-  .column-2
-    .contact-widget
-      %h4= t 'about.administered_by'
-
-      = account_link_to(@instance_presenter.contact_account)
-
-      - if @instance_presenter.site_contact_email.present?
-        %h4
-          = succeed ':' do
-            = t 'about.contact'
-
-        = mail_to @instance_presenter.site_contact_email, nil, title: @instance_presenter.site_contact_email
-
-  .column-3
-    = render 'application/flashes'
-
-    - if @contents.blank? && @rules.empty? && (!display_blocks? || @blocks&.empty?)
-      = nothing_here
-    - else
-      .box-widget
-        .rich-formatting
-          - unless @rules.empty?
-            %h2#rules= t('about.rules')
-
-            %p= t('about.rules_html')
-
-            %ol.rules-list
-              - @rules.each do |rule|
-                %li
-                  .rules-list__text= rule.text
-
-          = @contents.html_safe
-
-          - if display_blocks? && !@blocks.empty?
-            %h2#unavailable-content= t('about.unavailable_content')
-
-            %p= t('about.unavailable_content_html')
-
-            - if (blocks = @blocks.select(&:reject_media?)) && !blocks.empty?
-              %h3= t('about.unavailable_content_description.rejecting_media_title')
-              %p= t('about.unavailable_content_description.rejecting_media')
-              = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
-            - if (blocks = @blocks.select(&:silence?)) && !blocks.empty?
-              %h3= t('about.unavailable_content_description.silenced_title')
-              %p= t('about.unavailable_content_description.silenced')
-              = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
-            - if (blocks = @blocks.select(&:suspend?)) && !blocks.empty?
-              %h3= t('about.unavailable_content_description.suspended_title')
-              %p= t('about.unavailable_content_description.suspended')
-              = render partial: 'domain_blocks', locals: { domain_blocks: blocks }
-
-  .column-4
-    %ul.table-of-contents
-      - unless @rules.empty?
-        %li= link_to t('about.rules'), '#rules'
-
-      - @table_of_contents.each do |item|
-        %li
-          = link_to item.title, "##{item.anchor}"
-
-          - unless item.children.empty?
-            %ul
-              - item.children.each do |sub_item|
-                %li= link_to sub_item.title, "##{sub_item.anchor}"
-
-      - if display_blocks? && !@blocks.empty?
-        %li= link_to t('about.unavailable_content'), '#unavailable-content'
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 6ae9e6ae0..05d8989ad 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -1,79 +1,7 @@
 - content_for :page_title do
-  = site_hostname
+  = t('about.title')
 
 - content_for :header_tags do
-  %link{ rel: 'canonical', href: about_url }/
   = render partial: 'shared/og'
 
-.landing
-  .landing__brand
-    = link_to root_url, class: 'brand' do
-      = svg_logo_full
-      %span.brand__tagline=t 'about.tagline'
-
-  .landing__grid
-    .landing__grid__column.landing__grid__column-registration
-      .box-widget
-        = render 'registration'
-
-      .directory
-        - if Setting.profile_directory
-          .directory__tag
-            = optional_link_to Setting.profile_directory, explore_path do
-              %h4
-                = fa_icon 'address-book fw'
-                = t('about.discover_users')
-                %small= t('about.browse_directory')
-
-              .avatar-stack
-                - @instance_presenter.sample_accounts.each do |account|
-                  = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, alt: '', class: 'account__avatar'
-
-        - if Setting.timeline_preview
-          .directory__tag
-            = optional_link_to Setting.timeline_preview, public_timeline_path do
-              %h4
-                = fa_icon 'globe fw'
-                = t('about.see_whats_happening')
-                %small= t('about.browse_public_posts')
-
-        .directory__tag
-          = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do
-            %h4
-              = fa_icon 'tablet fw'
-              = t('about.get_apps')
-              %small= t('about.apps_platforms')
-
-    .landing__grid__column.landing__grid__column-login
-      .box-widget
-        = render 'login'
-
-      .hero-widget
-        .hero-widget__img
-          = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
-
-        .hero-widget__text
-          %p
-            = @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
-            = link_to about_more_path do
-              = t('about.learn_more')
-              = fa_icon 'angle-double-right'
-
-        .hero-widget__footer
-          .hero-widget__footer__column
-            %h4= t 'about.administered_by'
-
-            = account_link_to @instance_presenter.contact_account
-
-          .hero-widget__footer__column
-            %h4= t 'about.server_stats'
-
-            .hero-widget__counters__wrapper
-              .hero-widget__counter
-                %strong= friendly_number_to_human @instance_presenter.user_count
-                %span= t 'about.user_count_after', count: @instance_presenter.user_count
-              .hero-widget__counter
-                %strong= friendly_number_to_human @instance_presenter.active_user_count
-                %span
-                  = t 'about.active_count_after'
-                  %abbr{ title: t('about.active_footnote') } *
+= render partial: 'shared/web_app'
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
deleted file mode 100644
index 9d076a91b..000000000
--- a/app/views/about/terms.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-- content_for :page_title do
-  = t('terms.title', instance: site_hostname)
-
-.grid
-  .column-0
-    .box-widget
-      .rich-formatting= @instance_presenter.site_terms.html_safe.presence || t('terms.body_html')
-  .column-1
-    = render 'application/sidebar'
diff --git a/app/views/accounts/_bio.html.haml b/app/views/accounts/_bio.html.haml
deleted file mode 100644
index e8a49a1aa..000000000
--- a/app/views/accounts/_bio.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-- fields = account.fields
-
-.public-account-bio
-  - unless fields.empty?
-    .account__header__fields
-      - fields.each do |field|
-        %dl
-          %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true)
-          %dd{ title: field.value, class: custom_field_classes(field) }
-            - if field.verified?
-              %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
-                = fa_icon 'check'
-            = Formatter.instance.format_field(account, field.value, custom_emojify: true)
-
-  = account_badge(account)
-
-  - if account.note.present?
-    .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
-
-  .public-account-bio__extra
-    = t 'accounts.joined', date: l(account.created_at, format: :month)
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
deleted file mode 100644
index d9966723a..000000000
--- a/app/views/accounts/_header.html.haml
+++ /dev/null
@@ -1,43 +0,0 @@
-.public-account-header{:class => ("inactive" if account.moved?)}
-  .public-account-header__image
-    = image_tag (prefers_autoplay? ? account.header_original_url : account.header_static_url), class: 'parallax'
-  .public-account-header__bar
-    = link_to short_account_url(account), class: 'avatar' do
-      = image_tag (prefers_autoplay? ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: { original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: prefers_autoplay? }
-    .public-account-header__tabs
-      .public-account-header__tabs__name
-        %h1
-          = display_name(account, custom_emojify: true)
-          %small
-            = acct(account)
-            = fa_icon('lock') if account.locked?
-      .public-account-header__tabs__tabs
-        .details-counters
-          .counter{ class: active_nav_class(short_account_url(account), short_account_with_replies_url(account), short_account_media_url(account)) }
-            = link_to short_account_url(account), class: 'u-url u-uid', title: number_with_delimiter(account.statuses_count) do
-              %span.counter-number= friendly_number_to_human account.statuses_count
-              %span.counter-label= t('accounts.posts', count: account.statuses_count)
-
-          .counter{ class: active_nav_class(account_following_index_url(account)) }
-            = link_to account_following_index_url(account), title: number_with_delimiter(account.following_count) do
-              %span.counter-number= friendly_number_to_human account.following_count
-              %span.counter-label= t('accounts.following', count: account.following_count)
-
-          .counter{ class: active_nav_class(account_followers_url(account)) }
-            = link_to account_followers_url(account), title: number_with_delimiter(account.followers_count) do
-              %span.counter-number= friendly_number_to_human account.followers_count
-              %span.counter-label= t('accounts.followers', count: account.followers_count)
-        .spacer
-        .public-account-header__tabs__tabs__buttons
-          = account_action_button(account)
-
-    .public-account-header__extra
-      = render 'accounts/bio', account: account
-
-      .public-account-header__extra__links
-        = link_to account_following_index_url(account) do
-          %strong= friendly_number_to_human account.following_count
-          = t('accounts.following', count: account.following_count)
-        = link_to account_followers_url(account) do
-          %strong= friendly_number_to_human account.followers_count
-          = t('accounts.followers', count: account.followers_count)
diff --git a/app/views/accounts/_moved.html.haml b/app/views/accounts/_moved.html.haml
deleted file mode 100644
index 4f71b062d..000000000
--- a/app/views/accounts/_moved.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-- moved_to_account = account.moved_to_account
-
-.moved-account-widget
-  .moved-account-widget__message
-    = fa_icon 'suitcase'
-    = t('accounts.moved_html', name: content_tag(:bdi, content_tag(:strong, display_name(account, custom_emojify: true), class: :emojify)), new_profile_link: link_to(content_tag(:strong, safe_join(['@', content_tag(:span, moved_to_account.acct)])), ActivityPub::TagManager.instance.url_for(moved_to_account), class: 'mention'))
-
-  .moved-account-widget__card
-    = link_to ActivityPub::TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'me noopener noreferrer' do
-      .detailed-status__display-avatar
-        .account__avatar-overlay
-          .account__avatar-overlay-base
-            = image_tag moved_to_account.avatar_static_url
-          .account__avatar-overlay-overlay
-            = image_tag account.avatar_static_url
-
-      %span.display-name
-        %bdi
-          %strong.emojify= display_name(moved_to_account, custom_emojify: true)
-        %span @#{moved_to_account.acct}
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 72e9c6611..e8fd27e10 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -2,85 +2,16 @@
   = "#{display_name(@account)} (#{acct(@account)})"
 
 - content_for :header_tags do
-  - if @account.user&.setting_noindex
+  - if @account.user_prefers_noindex?
     %meta{ name: 'robots', content: 'noindex, noarchive' }/
 
   %link{ rel: 'alternate', type: 'application/rss+xml', href: @rss_url }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
 
-  - if @older_url
-    %link{ rel: 'next', href: @older_url }/
-  - if @newer_url
-    %link{ rel: 'prev', href: @newer_url }/
+  - @account.fields.select(&:verifiable?).each do |field|
+    %link{ rel: 'me', type: 'text/html', href: field.value }/
 
   = opengraph 'og:type', 'profile'
   = render 'og', account: @account, url: short_account_url(@account, only_path: false)
 
-
-= render 'header', account: @account, with_bio: true
-
-.grid
-  .column-0
-    .h-feed
-      %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
-
-      .account__section-headline
-        = active_link_to t('accounts.posts_tab_heading'), short_account_url(@account)
-        = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account)
-        = active_link_to t('accounts.media'), short_account_media_url(@account)
-
-      - if user_signed_in? && @account.blocking?(current_account)
-        .nothing-here.nothing-here--under-tabs= t('accounts.unavailable')
-      - elsif @statuses.empty?
-        = nothing_here 'nothing-here--under-tabs'
-      - else
-        .activity-stream.activity-stream--under-tabs
-          - if params[:page].to_i.zero?
-            = render partial: 'statuses/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
-
-          - if @newer_url
-            .entry= link_to_newer @newer_url
-
-          = render partial: 'statuses/status', collection: @statuses, as: :status
-
-          - if @older_url
-            .entry= link_to_older @older_url
-
-  .column-1
-    - if @account.memorial?
-      .memoriam-widget= t('in_memoriam_html')
-    - elsif @account.moved?
-      = render 'moved', account: @account
-
-    = render 'bio', account: @account
-
-    - if @endorsed_accounts.empty? && @account.id == current_account&.id
-      .placeholder-widget= t('accounts.endorsements_hint')
-    - elsif !@endorsed_accounts.empty?
-      .endorsements-widget
-        %h4= t 'accounts.choices_html', name: content_tag(:bdi, display_name(@account, custom_emojify: true))
-
-        - @endorsed_accounts.each do |account|
-          = account_link_to account
-
-    - if @featured_hashtags.empty? && @account.id == current_account&.id
-      .placeholder-widget
-        = t('accounts.featured_tags_hint')
-        = link_to settings_featured_tags_path do
-          = t('featured_tags.add_new')
-          = fa_icon 'chevron-right fw'
-    - else
-      - @featured_hashtags.each do |featured_tag|
-        .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
-          = link_to short_account_tag_path(@account, featured_tag.tag) do
-            %h4
-              = fa_icon 'hashtag'
-              = featured_tag.name
-              %small
-                - if featured_tag.last_status_at.nil?
-                  = t('accounts.nothing_here')
-                - else
-                  %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
-            .trends__item__current= friendly_number_to_human featured_tag.statuses_count
-
-    = render 'application/sidebar'
+= render partial: 'shared/web_app'
diff --git a/app/views/accounts/show.rss.ruby b/app/views/accounts/show.rss.ruby
new file mode 100644
index 000000000..34e29d483
--- /dev/null
+++ b/app/views/accounts/show.rss.ruby
@@ -0,0 +1,35 @@
+RSS::Builder.build do |doc|
+  doc.title(display_name(@account))
+  doc.description(I18n.t('rss.descriptions.account', acct: @account.local_username_and_domain))
+  doc.link(params[:tag].present? ? short_account_tag_url(@account, params[:tag]) : short_account_url(@account))
+  doc.image(full_asset_url(@account.avatar.url(:original)), display_name(@account), params[:tag].present? ? short_account_tag_url(@account, params[:tag]) : short_account_url(@account))
+  doc.last_build_date(@statuses.first.created_at) if @statuses.any?
+  doc.icon(full_asset_url(@account.avatar.url(:original)))
+  doc.generator("Mastodon v#{Mastodon::Version.to_s}")
+
+  @statuses.each do |status|
+    doc.item do |item|
+      item.link(ActivityPub::TagManager.instance.url_for(status))
+      item.pub_date(status.created_at)
+      item.description(rss_status_content_format(status))
+
+      if status.ordered_media_attachments.first&.audio?
+        media = status.ordered_media_attachments.first
+        item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
+      end
+
+      status.ordered_media_attachments.each do |media|
+        item.media_content(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size) do |media_content|
+          media_content.medium(media.gifv? ? 'image' : media.type.to_s)
+          media_content.rating(status.sensitive? ? 'adult' : 'nonadult')
+          media_content.description(media.description) if media.description.present?
+          media_content.thumbnail(media.thumbnail.url(:original, false)) if media.thumbnail?
+        end
+      end
+
+      status.tags.each do |tag|
+        item.category(tag.display_name)
+      end
+    end
+  end
+end
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index ca4f9663f..c7bb618df 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -1,11 +1,11 @@
 - content_for :page_title do
-  = t('admin.account_actions.title', acct: @account.acct)
+  = t('admin.account_actions.title', acct: @account.pretty_acct)
 
 = simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
   = f.input :report_id, as: :hidden
 
   .fields-group
-    = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct)
+    = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct)
 
   - if @account.local?
     %hr.spacer/
diff --git a/app/views/admin/account_moderation_notes/_account_moderation_note.html.haml b/app/views/admin/account_moderation_notes/_account_moderation_note.html.haml
deleted file mode 100644
index 432fb79a6..000000000
--- a/app/views/admin/account_moderation_notes/_account_moderation_note.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.speech-bubble
-  .speech-bubble__bubble
-    = simple_format(h(account_moderation_note.content))
-  .speech-bubble__owner
-    = admin_account_link_to account_moderation_note.account
-    %time.formatted{ datetime: account_moderation_note.created_at.iso8601 }= l account_moderation_note.created_at
-    = table_link_to 'trash', t('admin.account_moderation_notes.delete'), admin_account_moderation_note_path(account_moderation_note), method: :delete if can?(:destroy, account_moderation_note)
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 8c9c9679c..030635185 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -1,6 +1,25 @@
-.speech-bubble.warning
-  .speech-bubble__bubble
-    = Formatter.instance.linkify(account_warning.text)
-  .speech-bubble__owner
-    = admin_account_link_to account_warning.account
-    %time.formatted{ datetime: account_warning.created_at.iso8601 }= l account_warning.created_at
+= link_to disputes_strike_path(account_warning), class: 'log-entry' do
+  .log-entry__header
+    .log-entry__avatar
+      .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
+        = fa_icon 'warning'
+    .log-entry__content
+      .log-entry__title
+        = t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
+      .log-entry__timestamp
+        %time.formatted{ datetime: account_warning.created_at.iso8601 }
+          = l(account_warning.created_at)
+
+        - if account_warning.report_id.present?
+          ·
+          = t('admin.reports.report', id: account_warning.report_id)
+
+        - if account_warning.overruled?
+          ·
+          %span.positive-hint= t('admin.strikes.appeal_approved')
+        - elsif account_warning.appeal&.pending?
+          ·
+          %span.warning-hint= t('admin.strikes.appeal_pending')
+        - elsif account_warning.appeal&.rejected?
+          ·
+          %span.negative-hint= t('admin.strikes.appeal_rejected')
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index 2df91301e..82dd8dfb2 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -1,4 +1,4 @@
-.batch-table__row{ class: [!account.suspended? && account.user_pending? && 'batch-table__row--attention', account.suspended? && 'batch-table__row--muted'] }
+.batch-table__row{ class: [!account.suspended? && account.user_pending? && 'batch-table__row--attention', (account.suspended? || account.user_unconfirmed?) && 'batch-table__row--muted'] }
   %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
     = f.check_box :account_ids, { multiple: true, include_hidden: false }, account.id
   .batch-table__row__content.batch-table__row__content--unpadded
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 7c0045145..d0897221d 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -4,48 +4,40 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-.filters
-  .filter-subset
-    %strong= t('admin.accounts.location.title')
-    %ul
-      %li= filter_link_to t('generic.all'), origin: nil
-      %li= filter_link_to t('admin.accounts.location.local'), origin: 'local'
-      %li= filter_link_to t('admin.accounts.location.remote'), origin: 'remote'
-  .filter-subset
-    %strong= t('admin.accounts.moderation.title')
-    %ul
-      %li= filter_link_to t('generic.all'), status: nil
-      %li= filter_link_to t('admin.accounts.moderation.active'), status: 'active'
-      %li= filter_link_to t('admin.accounts.moderation.suspended'), status: 'suspended'
-      %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{number_with_delimiter(User.pending.count)})"], ' '), status: 'pending'
-  .filter-subset
-    %strong= t('admin.accounts.role')
-    %ul
-      %li= filter_link_to t('admin.accounts.moderation.all'), permissions: nil
-      %li= filter_link_to t('admin.accounts.roles.staff'), permissions: 'staff'
-  .filter-subset
-    %strong= t 'generic.order_by'
-    %ul
-      %li= filter_link_to t('relationships.most_recent'), order: nil
-      %li= filter_link_to t('relationships.last_active'), order: 'active'
-
 = form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
-  .fields-group
-    - (AccountFilter::KEYS - %i(origin status permissions)).each do |key|
-      - if params[key].present?
-        = hidden_field_tag key, params[key]
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.accounts.location.title')
+      .input.select.optional
+        = select_tag :origin, options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]), prompt: I18n.t('generic.all')
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.accounts.moderation.title')
+      .input.select.optional
+        = select_tag :status, options_for_select([[t('admin.accounts.moderation.active'), 'active'], [t('admin.accounts.moderation.silenced'), 'silenced'], [t('admin.accounts.moderation.disabled'), 'disabled'], [t('admin.accounts.moderation.suspended'), 'suspended'], [safe_join([t('admin.accounts.moderation.pending'), "(#{number_with_delimiter(User.pending.count)})"], ' '), 'pending']], params[:status]), prompt: I18n.t('generic.all')
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.accounts.role')
+      .input.select.optional
+        = select_tag :role_ids, options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]), prompt: I18n.t('admin.accounts.moderation.all')
+    .filter-subset.filter-subset--with-select
+      %strong= t 'generic.order_by'
+      .input.select
+        = select_tag :order, options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
 
+  .fields-group
     - %i(username by_domain display_name email ip).each do |key|
-      - unless key == :by_domain && params[:remote].blank?
+      - unless key == :by_domain && params[:origin] != 'remote'
         .input.string.optional
           = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
 
-    .actions
-      %button.button= t('admin.accounts.search')
-      = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
+  .actions
+    %button.button= t('admin.accounts.search')
+    = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
+
+%hr.spacer/
 
 = form_for(@form, url: batch_admin_accounts_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
+  = hidden_field_tag :select_all_matching, '0'
 
   - AccountFilter::KEYS.each do |key|
     = hidden_field_tag key, params[key] if params[key].present?
@@ -61,6 +53,14 @@
           = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    - if @accounts.total_count > @accounts.size
+      .batch-table__select-all
+        .not-selected.active
+          %span= t('generic.all_items_on_page_selected_html', count: @accounts.size)
+          %button{ type: 'button' }= t('generic.select_all_matching_items', count: @accounts.total_count)
+        .selected
+          %span= t('generic.all_matching_items_selected_html', count: @accounts.total_count)
+          %button{ type: 'button' }= t('generic.deselect')
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 64cfc9a77..db5c255c9 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = @account.acct
+  = @account.pretty_acct
 
 - if @account.instance_actor?
   .flash-message.notice
@@ -16,16 +16,16 @@
         .account__header__fields
           - fields.each do |field|
             %dl
-              %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true)
+              %dt.emojify{ title: field.name }= prerender_custom_emojis(h(field.name), account.emojis)
               %dd{ title: field.value, class: custom_field_classes(field) }
                 - if field.verified?
                   %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
                     = fa_icon 'check'
-                = Formatter.instance.format_field(account, field.value, custom_emojify: true)
+                = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
 
     - if account.note.present?
       %div
-        .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
+        .account__header__content.emojify= prerender_custom_emojis(account_bio_format(account), account.emojis)
 
 .dashboard__counters.admin-account-counters
   %div
@@ -92,10 +92,13 @@
 
           %tr
             %th= t('admin.accounts.role')
-            %td= t("admin.accounts.roles.#{@account.user&.role}")
             %td
-              = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user)
-              = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user)
+              - if @account.user_role&.everyone?
+                = t('admin.accounts.no_role_assigned')
+              - else
+                = @account.user_role&.name
+            %td
+              = table_link_to 'vcard', t('admin.accounts.change_role.label'), admin_user_role_path(@account.user) if can?(:change_role, @account.user)
 
           %tr
             %th{ rowspan: can?(:create, :email_domain_block) ? 3 : 2 }= t('admin.accounts.email')
@@ -128,17 +131,11 @@
             %td{ rowspan: can?(:reset_password, @account.user) ? 2 : 1 }
               - if @account.user&.two_factor_enabled?
                 = t 'admin.accounts.security_measures.password_and_2fa'
-              - elsif @account.user&.skip_sign_in_token?
-                = t 'admin.accounts.security_measures.only_password'
               - else
-                = t 'admin.accounts.security_measures.password_and_sign_in_token'
+                = t 'admin.accounts.security_measures.only_password'
             %td
               - if @account.user&.two_factor_enabled?
                 = table_link_to 'unlock', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete if can?(:disable_2fa, @account.user)
-              - elsif @account.user&.skip_sign_in_token?
-                = table_link_to 'lock', t('admin.accounts.enable_sign_in_token_auth'), admin_user_sign_in_token_authentication_path(@account.user.id), method: :post if can?(:enable_sign_in_token_auth, @account.user)
-              - else
-                = table_link_to 'unlock', t('admin.accounts.disable_sign_in_token_auth'), admin_user_sign_in_token_authentication_path(@account.user.id), method: :delete if can?(:disable_sign_in_token_auth, @account.user)
 
           - if can?(:reset_password, @account.user)
             %tr
@@ -147,7 +144,7 @@
 
           %tr
             %th= t('simple_form.labels.defaults.locale')
-            %td= @account.user_locale
+            %td= standard_locale_name(@account.user_locale)
             %td
 
           %tr
@@ -156,12 +153,14 @@
               %time.formatted{ datetime: @account.created_at.iso8601, title: l(@account.created_at) }= l @account.created_at
             %td
 
-          - @account.user.recent_ips.each_with_index do |(_, ip), i|
+          - recent_ips = @account.user.ips.order(used_at: :desc).to_a
+
+          - recent_ips.each_with_index do |recent_ip, i|
             %tr
               - if i.zero?
-                %th{ rowspan: @account.user.recent_ips.size }= t('admin.accounts.most_recent_ip')
-              %td= ip
-              %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: ip)
+                %th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip')
+              %td= recent_ip.ip
+              %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip)
 
           %tr
             %th= t('admin.accounts.most_recent_activity')
@@ -196,9 +195,13 @@
   - if @account.suspended?
     %hr.spacer/
 
-    %p.muted-hint= @deletion_request.present? ? t('admin.accounts.suspension_reversible_hint_html', date: content_tag(:strong, l(@deletion_request.due_at.to_date))) : t('admin.accounts.suspension_irreversible')
+    - if @account.suspension_origin_remote?
+      %p.muted-hint= @deletion_request.present? ? t('admin.accounts.remote_suspension_reversible_hint_html', date: content_tag(:strong, l(@deletion_request.due_at.to_date))) : t('admin.accounts.remote_suspension_irreversible')
+    - else
+      %p.muted-hint= @deletion_request.present? ? t('admin.accounts.suspension_reversible_hint_html', date: content_tag(:strong, l(@deletion_request.due_at.to_date))) : t('admin.accounts.suspension_irreversible')
 
     = link_to t('admin.accounts.undo_suspension'), unsuspend_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsuspend, @account)
+    = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account) && @account.suspension_origin_remote?
 
     - if @deletion_request.present?
       = link_to t('admin.accounts.delete'), admin_account_path(@account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, @account)
@@ -244,18 +247,29 @@
   %hr.spacer/
 
   - unless @warnings.empty?
-    = render @warnings
+
+    %h3= t 'admin.accounts.previous_strikes'
+
+    %p= t('admin.accounts.previous_strikes_description_html', count: @account.previous_strikes_count)
+
+    .account-strikes
+      = render @warnings
 
     %hr.spacer/
 
-  = render @moderation_notes
+  %h3= t 'admin.reports.notes.title'
+
+  %p= t 'admin.reports.notes_description_html'
+
+  .report-notes
+    = render partial: 'admin/report_notes/report_note', collection: @moderation_notes
 
   = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
-    = render 'shared/error_messages', object: @account_moderation_note
-
-    = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
     = f.hidden_field :target_account_id
 
+    .field-group
+      = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+
     .actions
       = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
 
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index f7f73150b..d8b7132f5 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -11,7 +11,7 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.action_logs.filter_by_user')
       .input.select.optional
-        = select_tag :account_id, options_from_collection_for_select(Account.joins(:user).merge(User.staff), :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
+        = select_tag :account_id, options_from_collection_for_select(@auditable_accounts, :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
 
     .filter-subset.filter-subset--with-select
       %strong= t('admin.action_logs.filter_by_action')
@@ -22,7 +22,7 @@
   %div.muted-hint.center-text
     = t 'admin.action_logs.empty'
 - else
-  .announcements-list
+  .report-notes
     = render partial: 'action_log', collection: @action_logs
 
 = paginate @action_logs
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 5f56db5e7..66c8d31a7 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -1,12 +1,15 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcement_path(@announcement) do |f|
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label
+    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}(:[0-9]{2}){1,2}', placeholder: Time.now.strftime('%FT%R') }
+    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}(:[0-9]{2}){1,2}', placeholder: Time.now.strftime('%FT%R') }
 
   .fields-group
     = f.input :all_day, as: :boolean, wrapper: :with_label
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index a5298c5f6..57b7d5e0c 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -1,12 +1,15 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcements_path do |f|
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
   = render 'shared/error_messages', object: @announcement
 
   .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label
+    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}(:[0-9]{2}){1,2}', placeholder: Time.now.strftime('%FT%R') }
+    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}(:[0-9]{2}){1,2}', placeholder: Time.now.strftime('%FT%R') }
 
   .fields-group
     = f.input :all_day, as: :boolean, wrapper: :with_label
@@ -15,7 +18,7 @@
     = f.input :text, wrapper: :with_block_label
 
   .fields-group
-    = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label
+    = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}(:[0-9]{2}){1,2}', placeholder: Time.now.strftime('%FT%R') }
 
   .actions
     = f.button :button, t('.create'), type: :submit
diff --git a/app/views/admin/change_emails/show.html.haml b/app/views/admin/change_emails/show.html.haml
index 6ff0d785e..bc00d6114 100644
--- a/app/views/admin/change_emails/show.html.haml
+++ b/app/views/admin/change_emails/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('admin.accounts.change_email.title', username: @account.acct)
+  = t('admin.accounts.change_email.title', username: @account.username)
 
 = simple_form_for @user, url: admin_account_change_email_path(@account.id) do |f|
   .fields-group
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml
index 526c844e9..8d34d38e5 100644
--- a/app/views/admin/custom_emojis/_custom_emoji.html.haml
+++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml
@@ -3,7 +3,7 @@
     = f.check_box :custom_emoji_ids, { multiple: true, include_hidden: false }, custom_emoji.id
   .batch-table__row__content.batch-table__row__content--with-image
     .batch-table__row__content__image
-      = custom_emoji_tag(custom_emoji, animate = current_account&.user&.setting_auto_play_gif)
+      = custom_emoji_tag(custom_emoji)
 
     .batch-table__row__content__text
       %samp= ":#{custom_emoji.shortcode}:"
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index e15a07cb8..95996dec8 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -7,7 +7,7 @@
   .fields-group
     = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
   .fields-group
-    = f.input :image, wrapper: :with_label, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint')
+    = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
 
   .actions
     = f.button :button, t('admin.custom_emojis.upload'), type: :submit
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 4b581f5ea..8354f0b9f 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -19,10 +19,10 @@
 
 .dashboard
   .dashboard__item
-    = react_admin_component :counter, measure: 'new_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.new_users'), href: admin_accounts_path
+    = react_admin_component :counter, measure: 'new_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.new_users'), href: admin_accounts_path(origin: 'local')
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'active_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.active_users'), href: admin_accounts_path
+    = react_admin_component :counter, measure: 'active_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.active_users'), href: admin_accounts_path(origin: 'local')
 
   .dashboard__item
     = react_admin_component :counter, measure: 'interactions', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.interactions')
@@ -46,6 +46,9 @@
       %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
       = fa_icon 'chevron-right fw'
 
+    = link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
+      %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
+      = fa_icon 'chevron-right fw'
   .dashboard__item
     = react_admin_component :dimension, dimension: 'sources', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.sources')
 
diff --git a/app/views/admin/disputes/appeals/_appeal.html.haml b/app/views/admin/disputes/appeals/_appeal.html.haml
new file mode 100644
index 000000000..3f6efb856
--- /dev/null
+++ b/app/views/admin/disputes/appeals/_appeal.html.haml
@@ -0,0 +1,21 @@
+= link_to disputes_strike_path(appeal.strike), class: ['log-entry', appeal.approved? && 'log-entry--inactive'] do
+  .log-entry__header
+    .log-entry__avatar
+      = image_tag appeal.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
+    .log-entry__content
+      .log-entry__title
+        = t(appeal.strike.action, scope: 'admin.strikes.actions', name: content_tag(:span, appeal.strike.account.username, class: 'username'), target: content_tag(:span, appeal.account.username, class: 'target')).html_safe
+      .log-entry__timestamp
+        %time.formatted{ datetime: appeal.strike.created_at.iso8601 }
+          = l(appeal.strike.created_at)
+
+        - if appeal.strike.report_id.present?
+          ·
+          = t('admin.reports.title', id: appeal.strike.report_id)
+        ·
+        - if appeal.approved?
+          %span.positive-hint= t('admin.strikes.appeal_approved')
+        - elsif appeal.rejected?
+          %span.negative-hint= t('admin.strikes.appeal_rejected')
+        - else
+          %span.warning-hint= t('admin.strikes.appeal_pending')
diff --git a/app/views/admin/disputes/appeals/index.html.haml b/app/views/admin/disputes/appeals/index.html.haml
new file mode 100644
index 000000000..dd6a6f403
--- /dev/null
+++ b/app/views/admin/disputes/appeals/index.html.haml
@@ -0,0 +1,22 @@
+- content_for :page_title do
+  = t('admin.disputes.appeals.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+.filters
+  .filter-subset
+    %strong= t('admin.tags.review')
+    %ul
+      %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Appeal.pending.count})"], ' '), status: 'pending'
+      %li= filter_link_to t('admin.trends.approved'), status: 'approved'
+      %li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
+
+- if @appeals.empty?
+  %div.muted-hint.center-text
+    = t 'admin.disputes.appeals.empty'
+- else
+  .announcements-list
+    = render partial: 'appeal', collection: @appeals
+
+= paginate @appeals
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index 6fe2edc82..39c6d108a 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -24,10 +24,10 @@
     = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
 
   .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), rows: 6
+    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
 
   .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), rows: 6
+    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 8b78f71f2..bcaa331b5 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -24,10 +24,10 @@
     = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
 
   .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), rows: 6
+    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
 
   .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), rows: 6
+    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
 
   .actions
     = f.button :button, t('.create'), type: :submit
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml
deleted file mode 100644
index e64aaa629..000000000
--- a/app/views/admin/domain_blocks/show.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- content_for :page_title do
-  = t('admin.domain_blocks.show.title', domain: @domain_block.domain)
-
-- if @domain_block.private_comment.present?
-  .speech-bubble
-    .speech-bubble__bubble
-      = simple_format(h(@domain_block.private_comment))
-    .speech-bubble__owner= t 'admin.instances.private_comment'
-
-- if @domain_block.public_comment.present?
-  .speech-bubble
-    .speech-bubble__bubble
-      = simple_format(h(@domain_block.public_comment))
-    .speech-bubble__owner= t 'admin.instances.public_comment'
-
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
-
-  - unless (@domain_block.noop?)
-    %p= t(".retroactive.#{@domain_block.severity}")
-    %p.hint= t(:affected_accounts,
-      scope: [:admin, :domain_blocks, :show],
-      count: @domain_block.affected_accounts_count)
-
-  .actions
-    = f.button :button, t('.undo'), type: :submit
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
index 41ab8c171..c5a55bc27 100644
--- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
+++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
@@ -1,15 +1,14 @@
-%tr
-  %td
-    %samp= email_domain_block.domain
-  %td
-    = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(email_domain_block), method: :delete
+.batch-table__row
+  %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+    = f.check_box :email_domain_block_ids, { multiple: true, include_hidden: false }, email_domain_block.id
+  .batch-table__row__content.pending-account
+    .pending-account__header
+      %samp= link_to email_domain_block.domain, admin_accounts_path(email: "%@#{email_domain_block.domain}")
 
-- email_domain_block.children.each do |child_email_domain_block|
-  %tr
-    %td
-      %samp= child_email_domain_block.domain
-      %span.muted-hint
-        = surround '(', ')' do
-          = t('admin.email_domain_blocks.from_html', domain: content_tag(:samp, email_domain_block.domain))
-    %td
-      = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(child_email_domain_block), method: :delete
+      %br/
+
+      - if email_domain_block.parent.present?
+        = t('admin.email_domain_blocks.resolved_through_html', domain: content_tag(:samp, email_domain_block.parent.domain))
+        •
+
+      = t('admin.email_domain_blocks.attempts_over_week', count: email_domain_block.history.reduce(0) { |sum, day| sum + day.accounts })
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index fa5d86b67..b073e8716 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -4,16 +4,22 @@
 - content_for :heading_actions do
   = link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
 
-- if @email_domain_blocks.empty?
-  %div.muted-hint.center-text=t 'admin.email_domain_blocks.empty'
-- else
-  .table-wrapper
-    %table.table
-      %thead
-        %tr
-          %th= t('admin.email_domain_blocks.domain')
-          %th
-      %tbody
-        = render partial: 'email_domain_block', collection: @email_domain_blocks
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= form_for(@form, url: batch_admin_email_domain_blocks_path) do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      - if @email_domain_blocks.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'email_domain_block', collection: @email_domain_blocks.flat_map { |x| [x, x.children.to_a].flatten }, locals: { f: f }
 
 = paginate @email_domain_blocks
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index 4a346f240..524b69968 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -1,14 +1,38 @@
 - content_for :page_title do
   = t('.title')
 
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
 = simple_form_for @email_domain_block, url: admin_email_domain_blocks_path do |f|
   = render 'shared/error_messages', object: @email_domain_block
 
   .fields-group
-    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain')
+    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain'), input_html: { readonly: defined?(@resolved_records) }
 
-  .fields-group
-    = f.input :with_dns_records, as: :boolean, wrapper: :with_label
+  - if defined?(@resolved_records)
+    %p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
+
+    .batch-table
+      .batch-table__toolbar
+        %label.batch-table__toolbar__select.batch-checkbox-all
+          = check_box_tag :batch_checkbox_all, nil, false
+        .batch-table__toolbar__actions
+      .batch-table__body
+        - @resolved_records.each do |record|
+          .batch-table__row
+            %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+              = f.input_field :other_domains, as: :boolean, checked_value: record.exchange.to_s, include_hidden: false, multiple: true
+            .batch-table__row__content.pending-account
+              .pending-account__header
+                %samp= record.exchange.to_s
+                %br
+                = t('admin.email_domain_blocks.dns.types.mx')
+
+    %hr.spacer/
 
   .actions
-    = f.button :button, t('.create'), type: :submit
+    - if defined?(@resolved_records)
+      = f.button :button, t('.create'), type: :submit, name: :save
+    - else
+      = f.button :button, t('.resolve'), type: :submit, name: :resolve
diff --git a/app/views/admin/export_domain_allows/new.html.haml b/app/views/admin/export_domain_allows/new.html.haml
new file mode 100644
index 000000000..dc0cf8c52
--- /dev/null
+++ b/app/views/admin/export_domain_allows/new.html.haml
@@ -0,0 +1,10 @@
+- content_for :page_title do
+  = t('.title')
+
+= simple_form_for @import, url: import_admin_export_domain_allows_path, html: { multipart: true } do |f|
+  .fields-row
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+
+  .actions
+    = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
new file mode 100644
index 000000000..5d4b6c4d0
--- /dev/null
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -0,0 +1,27 @@
+- existing_relationships ||= false
+
+.batch-table__row{ class: [existing_relationships && 'batch-table__row--attention'] }
+  %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+    = f.check_box :enabled, checked: !existing_relationships
+  .batch-table__row__content.pending-account
+    .pending-account__header
+      %strong
+        = f.object.domain
+      = f.hidden_field :domain
+      = f.hidden_field :severity
+      = f.hidden_field :reject_media
+      = f.hidden_field :reject_reports
+      = f.hidden_field :obfuscate
+      = f.hidden_field :private_comment
+      = f.hidden_field :public_comment
+
+      %br/
+
+      = f.object.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' • ')
+      - if f.object.public_comment.present?
+        •
+        = f.object.public_comment
+      - if existing_relationships
+        •
+        = fa_icon 'warning fw'
+        = t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
new file mode 100644
index 000000000..804e61199
--- /dev/null
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -0,0 +1,24 @@
+- content_for :page_title do
+  = t('admin.export_domain_blocks.import.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+%p= t('admin.export_domain_blocks.import.description_html')
+
+- if defined?(@global_private_comment) && @global_private_comment.present?
+  %p= t('admin.export_domain_blocks.import.private_comment_description_html', comment: @global_private_comment)
+
+= form_for(@form, url: batch_admin_domain_blocks_path) do |f|
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]), name: :save, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      - if @domain_blocks.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = f.simple_fields_for :domain_blocks, @domain_blocks do |ff|
+          = render 'domain_block', f: ff, existing_relationships: @warning_domains.include?(ff.object.domain)
diff --git a/app/views/admin/export_domain_blocks/new.html.haml b/app/views/admin/export_domain_blocks/new.html.haml
new file mode 100644
index 000000000..0291aeed7
--- /dev/null
+++ b/app/views/admin/export_domain_blocks/new.html.haml
@@ -0,0 +1,10 @@
+- content_for :page_title do
+  = t('.title')
+
+= simple_form_for @import, url: import_admin_export_domain_blocks_path, html: { multipart: true } do |f|
+  .fields-row
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+
+  .actions
+    = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 5b949a165..ebc4a2c6b 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -9,12 +9,14 @@
 %hr.spacer/
 
 = form_tag admin_follow_recommendations_path, method: 'GET', class: 'simple_form' do
+  - RelationshipFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
   .filters
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :language, options_for_select(I18n.available_locales.map { |key| [human_locale(key), key]}, @language)
-
+        = select_tag :language, options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
     .filter-subset
       %strong= t('admin.follow_recommendations.status')
       %ul
diff --git a/app/views/admin/instances/_exhausted_deliveries_days.haml b/app/views/admin/instances/_exhausted_deliveries_days.haml
deleted file mode 100644
index e581f542d..000000000
--- a/app/views/admin/instances/_exhausted_deliveries_days.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%li.negative-hint
-  = l(exhausted_deliveries_days)
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index dc81007ac..93f9bd418 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -1,33 +1,15 @@
 .directory__tag
   = link_to admin_instance_path(instance) do
     %h4
+      = fa_icon 'warning fw', title: t('admin.instances.availability.warning') if instance.failing?
       = instance.domain
+
       %small
         - if instance.domain_block
-          - first_item = true
-          - if !instance.domain_block.noop?
-            = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
-            - first_item = false
-          - unless instance.domain_block.suspend?
-            - if instance.domain_block.reject_media?
-              - unless first_item
-                &bull;
-              = t('admin.domain_blocks.rejecting_media')
-              - first_item = false
-            - if instance.domain_block.reject_reports?
-              - unless first_item
-                &bull;
-              = t('admin.domain_blocks.rejecting_reports')
-        - elsif whitelist_mode?
+          = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' • ')
+        - elsif instance.domain_allow
           = t('admin.accounts.whitelisted')
         - else
           = t('admin.accounts.no_limits_imposed')
-        - if instance.failure_days
-          = ' / '
-          %span.negative-hint
-            = t('admin.instances.delivery.warning_message', count: instance.failure_days)
-        - if instance.unavailable_domain
-          = ' / '
-          %span.negative-hint
-            = t('admin.instances.delivery.unavailable_message')
+
     .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= friendly_number_to_human instance.accounts_count
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 797948d94..8f7e3e67d 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -1,11 +1,18 @@
 - content_for :page_title do
   = t('admin.instances.title')
 
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
 - content_for :heading_actions do
   - if whitelist_mode?
-    = link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button'
+    = link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button', id: 'add-instance-button'
+    = link_to t('admin.domain_allows.export'), export_admin_export_domain_allows_path(format: :csv), class: 'button'
+    = link_to t('admin.domain_allows.import'), new_admin_export_domain_allow_path, class: 'button'
   - else
-    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
+    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button', id: 'add-instance-button'
+    = link_to t('admin.domain_blocks.export'), export_admin_export_domain_blocks_path(format: :csv), class: 'button'
+    = link_to t('admin.domain_blocks.import'), new_admin_export_domain_block_path, class: 'button'
 
 .filters
   .filter-subset
@@ -17,22 +24,11 @@
         %li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'
 
   .filter-subset
-    %strong= t('admin.instances.delivery.title')
+    %strong= t('admin.instances.availability.title')
     %ul
-      %li= filter_link_to t('admin.instances.delivery.all'), warning: nil, unavailable: nil
-      %li= filter_link_to t('admin.instances.delivery.warning'), warning: '1', unavailable: nil
-      %li= filter_link_to t('admin.instances.delivery.unavailable'), warning: nil, unavailable: '1'
-
-  .back-link
-    = link_to admin_instances_path() do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_all')
-    = link_to admin_instances_path(limited: 1) do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_limited')
-    = link_to admin_instances_path(warning: 1) do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_warning')
+      %li= filter_link_to t('admin.instances.delivery.all'), availability: nil
+      %li= filter_link_to t('admin.instances.delivery.failing'), availability: 'failing'
+      %li= filter_link_to t('admin.instances.delivery.unavailable'), availability: 'unavailable'
 
 - unless whitelist_mode?
   = form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index e520bca0c..ab290912e 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -1,88 +1,97 @@
 - content_for :page_title do
   = @instance.domain
 
-.filters
-  .back-link
-    = link_to admin_instances_path() do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_all')
-    = link_to admin_instances_path(limited: 1) do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_limited')
-    = link_to admin_instances_path(warning: 1) do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.instances.back_to_warning')
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-.dashboard__counters
-  %div
-    = link_to admin_accounts_path(origin: 'remote', by_domain: @instance.domain) do
-      .dashboard__counters__num= number_with_delimiter @instance.accounts_count
-      .dashboard__counters__label= t 'admin.accounts.title'
-  %div
-    = link_to admin_reports_path(by_target_domain: @instance.domain) do
-      .dashboard__counters__num= number_with_delimiter @instance.reports_count
-      .dashboard__counters__label= t 'admin.instances.total_reported'
-  %div
-    %div
-      .dashboard__counters__num= number_to_human_size @instance.media_storage
-      .dashboard__counters__label= t 'admin.instances.total_storage'
-  %div
-    %div
-      .dashboard__counters__num= number_with_delimiter @instance.following_count
-      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
-  %div
-    %div
-      .dashboard__counters__num= number_with_delimiter @instance.followers_count
-      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
-  %div
-    %div
-      .dashboard__counters__num= number_with_delimiter @instance.blocks_count
-      .dashboard__counters__label= t 'admin.instances.total_blocked_by_us'
+- if current_user.can?(:view_dashboard)
+  - content_for :heading_actions do
+    = l(@time_period.first)
+    = ' - '
+    = l(@time_period.last)
 
-  %div
-    %div
-      .dashboard__counters__num
-        - if @instance.delivery_failure_tracker.available?
-          = fa_icon 'check'
-        - else
-          = fa_icon 'times'
-      .dashboard__counters__label= t 'admin.instances.delivery_available'
+  %p
+    = fa_icon 'info fw'
+    = t('admin.instances.totals_time_period_hint_html')
 
-- if @instance.private_comment.present?
-  .speech-bubble
-    .speech-bubble__bubble
-      = simple_format(h(@instance.private_comment))
-    .speech-bubble__owner= t 'admin.instances.private_comment'
-
-- if @instance.public_comment.present?
-  .speech-bubble
-    .speech-bubble__bubble
-      = simple_format(h(@instance.public_comment))
-    .speech-bubble__owner= t 'admin.instances.public_comment'
-
-- unless @exhausted_deliveries_days.empty?
-  %h4= t 'admin.instances.delivery_error_days'
-  %ul
-    = render partial: 'exhausted_deliveries_days', collection: @exhausted_deliveries_days
-  %p.hint
-    = t 'admin.instances.delivery_error_hint', count: DeliveryFailureTracker::FAILURE_DAYS_THRESHOLD
+  .dashboard
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_accounts_measure'), href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain)
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_statuses', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_statuses_measure')
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_media_attachments', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_media_attachments_measure')
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_follows', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_follows_measure')
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_followers', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_followers_measure')
+    .dashboard__item
+      = react_admin_component :counter, measure: 'instance_reports', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_reports_measure'), href: admin_reports_path(by_target_domain: @instance.domain)
+    .dashboard__item
+      = react_admin_component :dimension, dimension: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_accounts_dimension')
+    .dashboard__item
+      = react_admin_component :dimension, dimension: 'instance_languages', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_languages_dimension')
 
 %hr.spacer/
 
-%div.action-buttons
-  %div
-    - 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 }
-    - elsif @instance.domain_block
-      = 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'
+%h3= t('admin.instances.content_policies.title')
+
+- if whitelist_mode?
+  %p= t('admin.instances.content_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')
+
+  - if @instance.domain_block
+    .table-wrapper
+      %table.table.horizontal-table
+        %tbody
+          %tr
+            %th= t('admin.instances.content_policies.comment')
+            %td= @instance.domain_block.private_comment
+          %tr
+            %th= t('admin.instances.content_policies.reason')
+            %td= @instance.domain_block.public_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(' • ')
+
+    = 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 }
+  - else
+    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
+
+%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
-      = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
-    - if @instance.delivery_failure_tracker.available?
-      - unless @exhausted_deliveries_days.empty?
-        = 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'
-      = 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'
-    - else
-      = 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'
-    - unless @instance.delivery_failure_tracker.available? && @instance.accounts_count > 0
-      = link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button'
+      %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'
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index 907477f24..f82cf26a3 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('admin.relationships.title', acct: @account.acct)
+  = t('admin.relationships.title', acct: @account.pretty_acct)
 
 .filters
   .filter-subset
@@ -24,16 +24,17 @@
 
 %hr.spacer/
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.accounts.username')
-        %th= t('admin.accounts.role')
-        %th= t('admin.accounts.most_recent_ip')
-        %th= t('admin.accounts.most_recent_activity')
-        %th
-    %tbody
-      = render partial: 'admin/accounts/account', collection: @accounts
+= form_for(@form, url: batch_admin_accounts_path) do |f|
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      - if @accounts.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'admin/accounts/account', collection: @accounts, locals: { f: f }
 
 = paginate @accounts
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml
index d34dc3d15..14df2f609 100644
--- a/app/views/admin/report_notes/_report_note.html.haml
+++ b/app/views/admin/report_notes/_report_note.html.haml
@@ -1,7 +1,18 @@
-.speech-bubble
-  .speech-bubble__bubble
+.report-notes__item
+  = image_tag report_note.account.avatar.url, class: 'report-notes__item__avatar'
+
+  .report-notes__item__header
+    %span.username
+      = link_to report_note.account.username, admin_account_path(report_note.account_id)
+    %time.relative-formatted{ datetime: report_note.created_at }
+      = t('admin.report_notes.created_at')
+
+  .report-notes__item__content
     = simple_format(h(report_note.content))
-  .speech-bubble__owner
-    = admin_account_link_to report_note.account
-    %time.formatted{ datetime: report_note.created_at.iso8601 }= l report_note.created_at
-    = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete if can?(:destroy, report_note)
+
+  - if can?(:destroy, report_note)
+    .report-notes__item__actions
+      - if report_note.is_a?(AccountModerationNote)
+        = table_link_to 'trash', t('admin.reports.notes.delete'), admin_account_moderation_note_path(report_note), method: :delete
+      - else
+        = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete
diff --git a/app/views/admin/reports/_action_log.html.haml b/app/views/admin/reports/_action_log.html.haml
deleted file mode 100644
index 0f7d05867..000000000
--- a/app/views/admin/reports/_action_log.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-.speech-bubble.positive
-  .speech-bubble__bubble
-    = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}_html", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target'))
-  .speech-bubble__owner
-    = admin_account_link_to(action_log.account)
-    %time.formatted{ datetime: action_log.created_at.iso8601 }= l action_log.created_at
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
new file mode 100644
index 000000000..404d53a77
--- /dev/null
+++ b/app/views/admin/reports/_actions.html.haml
@@ -0,0 +1,33 @@
+= form_tag admin_report_actions_path(@report), method: :post do
+  .report-actions
+    .report-actions__item
+      .report-actions__item__button
+        = link_to t('admin.reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button'
+      .report-actions__item__description
+        = t('admin.reports.actions.resolve_description_html')
+    - if @statuses.any? { |status| status.with_media? || status.with_preview_card? }
+      .report-actions__item
+        .report-actions__item__button
+          = button_tag t('admin.reports.mark_as_sensitive'), name: :mark_as_sensitive, class: 'button'
+        .report-actions__item__description
+          = t('admin.reports.actions.mark_as_sensitive_description_html')
+    .report-actions__item
+      .report-actions__item__button
+        = button_tag t('admin.reports.delete_and_resolve'), name: :delete, class: 'button button--destructive'
+      .report-actions__item__description
+        = t('admin.reports.actions.delete_description_html')
+    .report-actions__item
+      .report-actions__item__button
+        = button_tag t('admin.accounts.silence'), name: :silence, class: 'button button--destructive'
+      .report-actions__item__description
+        = t('admin.reports.actions.silence_description_html')
+    .report-actions__item
+      .report-actions__item__button
+        = button_tag t('admin.accounts.suspend'), name: :suspend, class: 'button button--destructive'
+      .report-actions__item__description
+        = t('admin.reports.actions.suspend_description_html')
+    .report-actions__item
+      .report-actions__item__button
+        = link_to t('admin.accounts.custom'), new_admin_account_action_path(@report.target_account_id, report_id: @report.id), class: 'button'
+      .report-actions__item__description
+        = t('admin.reports.actions.other_description_html')
diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
new file mode 100644
index 000000000..d0b7d52c3
--- /dev/null
+++ b/app/views/admin/reports/_media_attachments.html.haml
@@ -0,0 +1,8 @@
+- if status.ordered_media_attachments.first.video?
+  - video = status.ordered_media_attachments.first
+  = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: status.sensitive?, visible: false, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json
+- elsif status.ordered_media_attachments.first.audio?
+  - audio = status.ordered_media_attachments.first
+  = react_component :audio, src: audio.file.url(:original), height: 110, alt: audio.description, duration: audio.file.meta.dig(:original, :duration)
+- else
+  = react_component :media_gallery, height: 343, sensitive: status.sensitive?, visible: false, media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index ada6dd2bc..b2982a42b 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -4,26 +4,25 @@
   .batch-table__row__content
     .status__content><
       - if status.proper.spoiler_text.blank?
-        = Formatter.instance.format(status.proper, custom_emojify: true)
+        = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis)
       - else
         %details<
           %summary><
-            %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)}
-          = Formatter.instance.format(status.proper, custom_emojify: true)
+            %strong> Content warning: #{prerender_custom_emojis(h(status.proper.spoiler_text), status.proper.emojis)}
+          = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis)
 
-    - unless status.proper.media_attachments.empty?
-      - if status.proper.media_attachments.first.video?
-        - video = status.proper.media_attachments.first
-        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: status.proper.sensitive?, visible: false, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json
-      - elsif status.proper.media_attachments.first.audio?
-        - audio = status.proper.media_attachments.first
-        = react_component :audio, src: audio.file.url(:original), height: 110, alt: audio.description, duration: audio.file.meta.dig(:original, :duration)
-      - else
-        = react_component :media_gallery, height: 343, sensitive: status.proper.sensitive?, visible: false, media: status.proper.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+    - unless status.proper.ordered_media_attachments.empty?
+      = render partial: 'admin/reports/media_attachments', locals: { status: status.proper }
 
     .detailed-status__meta
+      - if status.application
+        = status.application.name
+        ·
       = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do
         %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+      - if status.edited?
+        ·
+        = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')), admin_account_status_path(status.account_id, status), class: 'detailed-status__datetime'
       - if status.discarded?
         ·
         %span.negative-hint= t('admin.statuses.deleted')
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index dc2d79be4..248718a73 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -5,8 +5,8 @@
   .filter-subset
     %strong= t('admin.reports.status')
     %ul
-      %li= filter_link_to t('admin.reports.unresolved'), status: 'unresolved'
-      %li= filter_link_to t('admin.reports.resolved'), status: 'resolved'
+      %li= filter_link_to t('admin.reports.unresolved'), resolved: nil
+      %li= filter_link_to t('admin.reports.resolved'), resolved: '1'
   .filter-subset
     %strong= t('admin.reports.target_origin')
     %ul
@@ -19,7 +19,7 @@
     - ReportFilter::KEYS.each do |key|
       = hidden_field_tag key, params[key] if params[key].present?
 
-    - %i(target_domain).each do |key|
+    - %i(by_target_domain).each do |key|
       .input.string.optional
         = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}")
 
@@ -59,11 +59,11 @@
 
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') }
                 = fa_icon('comment')
-                = report.statuses.count
+                = report.status_ids.size
 
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') }
                 = fa_icon('camera')
-                = report.media_attachments.count
+                = report.media_attachments_count
 
               - if report.forwarded?
                 ·
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index b060c553f..50ec64b06 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -1,5 +1,6 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+  = javascript_pack_tag 'public', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
   = t('admin.reports.report', id: @report.id)
@@ -10,122 +11,198 @@
   - else
     = link_to t('admin.reports.mark_as_unresolved'), reopen_admin_report_path(@report), method: :post, class: 'button'
 
-.table-wrapper
-  %table.table.inline-table
-    %tbody
-      %tr
-        %th= t('admin.reports.reported_account')
-        %td= admin_account_link_to @report.target_account
-        %td= table_link_to 'flag', t('admin.reports.account.reports', count: @report.target_account.targeted_reports.count), admin_reports_path(target_account_id: @report.target_account.id)
-        %td= table_link_to 'file', t('admin.reports.account.notes', count: @report.target_account.targeted_moderation_notes.count), admin_reports_path(target_account_id: @report.target_account.id)
-      %tr
-        %th= t('admin.reports.reported_by')
+.report-header
+  .report-header__card
+    .account-card
+      .account-card__header
+        = image_tag @report.target_account.header.url, alt: ''
+      .account-card__title
+        .account-card__title__avatar
+          = image_tag @report.target_account.avatar.url, alt: ''
+        .display-name
+          %bdi
+            %strong.emojify.p-name= display_name(@report.target_account, custom_emojify: true)
+          %span
+            = acct(@report.target_account)
+            = fa_icon('lock') if @report.target_account.locked?
+      - if @report.target_account.note.present?
+        .account-card__bio.emojify
+          = prerender_custom_emojis(account_bio_format(@report.target_account), @report.target_account.emojis)
+      .account-card__actions
+        .account-card__counters
+          .account-card__counters__item
+            = friendly_number_to_human @report.target_account.statuses_count
+            %small= t('accounts.posts', count: @report.target_account.statuses_count).downcase
+          .account-card__counters__item
+            = friendly_number_to_human @report.target_account.followers_count
+            %small= t('accounts.followers', count: @report.target_account.followers_count).downcase
+          .account-card__counters__item
+            = friendly_number_to_human @report.target_account.following_count
+            %small= t('accounts.following', count: @report.target_account.following_count).downcase
+        .account-card__actions__button
+          = link_to t('admin.reports.view_profile'), admin_account_path(@report.target_account_id), class: 'button'
+    .report-header__details.report-header__details--horizontal
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('admin.accounts.joined')
+        .report-header__details__item__content
+          %time.time-ago{ datetime: @report.target_account.created_at.iso8601, title: l(@report.target_account.created_at) }= l @report.target_account.created_at
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('accounts.last_active')
+        .report-header__details__item__content
+          - if @report.target_account.last_status_at.present?
+            %time.time-ago{ datetime: @report.target_account.last_status_at.to_date.iso8601, title: l(@report.target_account.last_status_at.to_date) }= l @report.target_account.last_status_at
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('admin.accounts.strikes')
+        .report-header__details__item__content
+          = @report.target_account.previous_strikes_count
+
+  .report-header__details
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('admin.reports.created_at')
+      .report-header__details__item__content
+        %time.formatted{ datetime: @report.created_at.iso8601 }
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('admin.reports.reported_by')
+      .report-header__details__item__content
         - if @report.account.instance_actor?
-          %td{ colspan: 3 }= site_hostname
+          = site_hostname
         - elsif @report.account.local?
-          %td= admin_account_link_to @report.account
-          %td= table_link_to 'flag', t('admin.reports.account.reports', count: @report.account.targeted_reports.count), admin_reports_path(target_account_id: @report.account.id)
-          %td= table_link_to 'file', t('admin.reports.account.notes', count: @report.account.targeted_moderation_notes.count), admin_reports_path(target_account_id: @report.account.id)
+          = admin_account_link_to @report.account
         - else
-          %td{ colspan: 3 }= @report.account.domain
-      %tr
-        %th= t('admin.reports.created_at')
-        %td{ colspan: 3 }
-          %time.formatted{ datetime: @report.created_at.iso8601 }
-      %tr
-        %th= t('admin.reports.updated_at')
-        %td{ colspan: 3 }
-          %time.formatted{ datetime: @report.updated_at.iso8601 }
-      %tr
-        %th= t('admin.reports.status')
-        %td
-          - if @report.action_taken?
-            = t('admin.reports.resolved')
+          = @report.account.domain
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('admin.reports.status')
+      .report-header__details__item__content
+        - if @report.action_taken?
+          = t('admin.reports.resolved')
+        - else
+          = t('admin.reports.unresolved')
+    - unless @report.target_account.local?
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('admin.reports.forwarded')
+        .report-header__details__item__content
+          - if @report.forwarded?
+            = t('simple_form.yes')
           - else
-            = t('admin.reports.unresolved')
-        %td{ colspan: 2 }
-          - if @report.action_taken?
-            = table_link_to 'envelope-open', t('admin.reports.reopen'), admin_report_path(@report, outcome: 'reopen'), method: :put
-      - unless @report.target_account.local?
-        %tr
-          %th= t('admin.reports.forwarded')
-          %td{ colspan: 3 }
-            - if @report.forwarded.nil?
-              \-
-            - elsif @report.forwarded?
-              = t('simple_form.yes')
-            - else
-              = t('simple_form.no')
-      - if !@report.action_taken_by_account.nil?
-        %tr
-          %th= t('admin.reports.action_taken_by')
-          %td{ colspan: 3 }
-            = admin_account_link_to @report.action_taken_by_account
-      - else
-        %tr
-          %th= t('admin.reports.assigned')
-          %td
-            - if @report.assigned_account.nil?
-              \-
-            - else
-              = admin_account_link_to @report.assigned_account
-          %td
-            - if @report.assigned_account != current_user.account
-              = table_link_to 'user', t('admin.reports.assign_to_self'), assign_to_self_admin_report_path(@report), method: :post
-          %td
-            - if !@report.assigned_account.nil?
-              = table_link_to 'trash', t('admin.reports.unassign'), unassign_admin_report_path(@report), method: :post
-
-%hr.spacer
-
-%div.action-buttons
-  %div
-
-  - if @report.unresolved?
-    %div
-      - if @report.target_account.local?
-        = link_to t('admin.accounts.warn'), new_admin_account_action_path(@report.target_account_id, type: 'none', report_id: @report.id), class: 'button'
-        = link_to t('admin.accounts.disable'), new_admin_account_action_path(@report.target_account_id, type: 'disable', report_id: @report.id), class: 'button button--destructive'
-      = link_to t('admin.accounts.silence'), new_admin_account_action_path(@report.target_account_id, type: 'silence', report_id: @report.id), class: 'button button--destructive'
-      = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@report.target_account_id, type: 'suspend', report_id: @report.id), class: 'button button--destructive'
-
-%hr.spacer
-
-.speech-bubble
-  .speech-bubble__bubble= simple_format(@report.comment.presence || t('admin.reports.comment.none'))
-  .speech-bubble__owner
-    - if @report.account.local?
-      = admin_account_link_to @report.account
+            = t('simple_form.no')
+    - if !@report.action_taken_by_account.nil?
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('admin.reports.action_taken_by')
+        .report-header__details__item__content
+          = admin_account_link_to @report.action_taken_by_account
     - else
-      = @report.account.domain
-      %br/
-    %time.formatted{ datetime: @report.created_at.iso8601 }
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('admin.reports.assigned')
+        .report-header__details__item__content
+          - if @report.assigned_account.nil?
+            = t 'admin.reports.no_one_assigned'
+          - else
+            = admin_account_link_to @report.assigned_account
+          —
+          - if @report.assigned_account != current_user.account
+            = table_link_to 'user', t('admin.reports.assign_to_self'), assign_to_self_admin_report_path(@report), method: :post
+          - elsif !@report.assigned_account.nil?
+            = table_link_to 'trash', t('admin.reports.unassign'), unassign_admin_report_path(@report), method: :post
 
-- unless @report.statuses.empty?
-  %hr.spacer/
+%hr.spacer
 
-  = form_for(@form, url: admin_report_reported_statuses_path(@report.id)) do |f|
-    .batch-table
-      .batch-table__toolbar
-        %label.batch-table__toolbar__select.batch-checkbox-all
-          = check_box_tag :batch_checkbox_all, nil, false
-        .batch-table__toolbar__actions
-          = f.button safe_join([fa_icon('eye-slash'), t('admin.statuses.batch.nsfw_on')]), name: :nsfw_on, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-          = f.button safe_join([fa_icon('eye'), t('admin.statuses.batch.nsfw_off')]), name: :nsfw_off, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-          = f.button safe_join([fa_icon('trash'), t('admin.statuses.batch.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-      .batch-table__body
-        = render partial: 'admin/reports/status', collection: @report.statuses, locals: { f: f }
+%h3= t 'admin.reports.category'
+
+%p= t 'admin.reports.category_description_html'
+
+= react_admin_component :report_reason_selector, id: @report.id, category: @report.category, rule_ids: @report.rule_ids&.map(&:to_s), disabled: @report.action_taken?
+
+- if @report.comment.present?
+  - if @report.account.instance_actor?
+    %p= t('admin.reports.comment_description_html', name: content_tag(:strong, site_hostname, class: 'username'))
+  - elsif @report.account.local?
+    %p= t('admin.reports.comment_description_html', name: content_tag(:strong, @report.account.username, class: 'username'))
+  - else
+    %p= t('admin.reports.comment_description_html', name: t('admin.reports.remote_user_placeholder', instance: @report.account.domain))
+
+  .report-notes
+    .report-notes__item
+      - if @report.account.local? && !@report.account.instance_actor?
+        = image_tag @report.account.avatar.url, class: 'report-notes__item__avatar'
+      - else
+        = image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'report-notes__item__avatar')
+
+      .report-notes__item__header
+        %span.username
+          - if @report.account.instance_actor?
+            = site_hostname
+          - elsif @report.account.local?
+            = link_to @report.account.username, admin_account_path(@report.account_id)
+          - else
+            = link_to @report.account.domain, admin_instance_path(@report.account.domain)
+        %time.relative-formatted{ datetime: @report.created_at.iso8601 }
+          = t('admin.report_notes.created_at')
+
+      .report-notes__item__content
+        = simple_format(h(@report.comment))
 
 %hr.spacer/
 
-- @report_notes.each do |item|
-  - if item.is_a?(Admin::ActionLog)
-    = render partial: 'action_log', locals: { action_log: item }
-  - else
-    = render item
+%h3
+  = t 'admin.reports.statuses'
+  %small.section-skip-link
+    = link_to '#actions' do
+      = fa_icon 'angle-double-down'
+      = t('admin.reports.skip_to_actions')
+
+%p
+  = t 'admin.reports.statuses_description_html'
+  —
+  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]), admin_account_statuses_path(@report.target_account_id, report_id: @report.id), class: 'table-action-link'
+
+= form_for(@form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id)) do |f|
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        - if !@statuses.empty? && @report.unresolved?
+          = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+    .batch-table__body
+      - if @statuses.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
+
+- if @report.unresolved?
+  %hr.spacer/
+
+  %p#actions= t 'admin.reports.actions_description_html'
+
+  = render partial: 'admin/reports/actions'
+
+- unless @action_logs.empty?
+  %hr.spacer/
+
+  %h3= t 'admin.reports.action_log'
+
+  .report-notes
+    = render @action_logs
+
+%hr.spacer/
+
+%h3= t 'admin.reports.notes.title'
+
+%p= t 'admin.reports.notes_description_html'
+
+.report-notes
+  = render @report_notes
 
 = simple_form_for @report_note, url: admin_report_notes_path do |f|
-  = render 'shared/error_messages', object: @report_note
   = f.input :report_id, as: :hidden
 
   .field-group
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
new file mode 100644
index 000000000..31f78f240
--- /dev/null
+++ b/app/views/admin/roles/_form.html.haml
@@ -0,0 +1,40 @@
+= simple_form_for @role, url: @role.new_record? ? admin_roles_path : admin_role_path(@role) do |f|
+  = render 'shared/error_messages', object: @role
+
+  - if @role.everyone?
+    .flash-message.info
+      = t('admin.roles.everyone_full_description_html')
+  - else
+    .fields-group
+      = f.input :name, wrapper: :with_label
+
+    - unless current_user.role.id == @role.id
+      .fields-group
+        = f.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 }
+
+    .fields-group
+      = f.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' }
+
+    %hr.spacer/
+
+    .fields-group
+      = f.input :highlighted, wrapper: :with_label
+
+    %hr.spacer/
+
+  - unless current_user.role.id == @role.id
+
+    .field-group
+      .input.with_block_label
+        %label= t('simple_form.labels.user_role.permissions_as_keys')
+        %span.hint= t('simple_form.hints.user_role.permissions_as_keys')
+
+      - (@role.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions|
+        %h4= t(category, scope: 'admin.roles.categories')
+
+        = f.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: lambda { |privilege| safe_join([t("admin.roles.privileges.#{privilege}"), content_tag(:span, t("admin.roles.privileges.#{privilege}_description"), class: 'hint')]) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: permissions.filter { |privilege| UserRole::FLAGS[privilege] & current_user.role.computed_permissions == 0 }
+
+    %hr.spacer/
+
+  .actions
+    = f.button :button, @role.new_record? ? t('admin.roles.add_new') : t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
new file mode 100644
index 000000000..798d8d8b4
--- /dev/null
+++ b/app/views/admin/roles/_role.html.haml
@@ -0,0 +1,30 @@
+.announcements-list__item
+  - if can?(:update, role)
+    = link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
+      %span.user-role{ class: "user-role-#{role.id}" }
+        = fa_icon 'users fw'
+
+        - if role.everyone?
+          = t('admin.roles.everyone')
+        - else
+          = role.name
+  - else
+    %span.announcements-list__item__title
+      %span.user-role{ class: "user-role-#{role.id}" }
+        = fa_icon 'users fw'
+
+        - if role.everyone?
+          = t('admin.roles.everyone')
+        - else
+          = role.name
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      - if role.everyone?
+        = t('admin.roles.everyone_full_description_html')
+      - else
+        = link_to t('admin.roles.assigned_users', count: role.users.count), admin_accounts_path(role_ids: role.id)
+        •
+        %abbr{ title: role.permissions_as_keys.map { |privilege| I18n.t("admin.roles.privileges.#{privilege}") }.join(', ') }= t('admin.roles.permissions_count', count: role.permissions_as_keys.size)
+    %div
+      = table_link_to 'pencil', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
diff --git a/app/views/admin/roles/edit.html.haml b/app/views/admin/roles/edit.html.haml
new file mode 100644
index 000000000..659ccb8dc
--- /dev/null
+++ b/app/views/admin/roles/edit.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  = t('admin.roles.edit', name: @role.everyone? ? t('admin.roles.everyone') : @role.name)
+
+- content_for :heading_actions do
+  = link_to t('admin.roles.delete'), admin_role_path(@role), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:destroy, @role)
+
+= render partial: 'form'
+
diff --git a/app/views/admin/roles/index.html.haml b/app/views/admin/roles/index.html.haml
new file mode 100644
index 000000000..4f6c511b4
--- /dev/null
+++ b/app/views/admin/roles/index.html.haml
@@ -0,0 +1,17 @@
+- content_for :page_title do
+  = t('admin.roles.title')
+
+- content_for :heading_actions do
+  = link_to t('admin.roles.add_new'), new_admin_role_path, class: 'button' if can?(:create, :user_role)
+
+%p= t('admin.roles.description_html')
+
+%hr.spacer/
+
+.applications-list
+  = render partial: 'role', collection: @roles.select(&:everyone?)
+
+%hr.spacer/
+
+.applications-list
+  = render partial: 'role', collection: @roles.reject(&:everyone?)
diff --git a/app/views/admin/roles/new.html.haml b/app/views/admin/roles/new.html.haml
new file mode 100644
index 000000000..821079271
--- /dev/null
+++ b/app/views/admin/roles/new.html.haml
@@ -0,0 +1,4 @@
+- content_for :page_title do
+  = t('admin.roles.add_new')
+
+= render partial: 'form'
diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml
new file mode 100644
index 000000000..366d213f6
--- /dev/null
+++ b/app/views/admin/settings/about/show.html.haml
@@ -0,0 +1,33 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.about.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_about_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.about.preamble')
+
+  .fields-group
+    = f.input :site_extended_description, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+
+    %p.hint
+      = t 'admin.settings.about.rules_hint'
+      = link_to t('admin.settings.about.manage_rules'), admin_rules_path
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+
+  .fields-group
+    = f.input :site_terms, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml
new file mode 100644
index 000000000..d321c4b04
--- /dev/null
+++ b/app/views/admin/settings/appearance/show.html.haml
@@ -0,0 +1,34 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.appearance.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_appearance_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.appearance.preamble')
+
+  .fields-group
+    = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+
+  .fields-group
+    = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :mascot, as: :file, wrapper: :with_block_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.mascot.persisted?
+        = image_tag @admin_settings.mascot.file.url, class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.mascot), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
new file mode 100644
index 000000000..74a6fadf9
--- /dev/null
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -0,0 +1,39 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.branding.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_branding_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.branding.preamble')
+
+  .fields-group
+    = f.input :site_title, wrapper: :with_label
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :site_contact_username, wrapper: :with_label
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :site_contact_email, wrapper: :with_label
+
+  .fields-group
+    = f.input :site_short_description, wrapper: :with_block_label, as: :text, input_html: { rows: 2, maxlength: 200 }
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :thumbnail, as: :file, wrapper: :with_block_label
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.thumbnail.persisted?
+        = image_tag @admin_settings.thumbnail.file.url(:'@1x'), class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.thumbnail), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
new file mode 100644
index 000000000..36856127f
--- /dev/null
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -0,0 +1,22 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.content_retention.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_content_retention_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.content_retention.preamble')
+
+  .fields-group
+    = f.input :media_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+    = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+    = f.input :backups_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/discovery/show.html.haml b/app/views/admin/settings/discovery/show.html.haml
new file mode 100644
index 000000000..f60d1c766
--- /dev/null
+++ b/app/views/admin/settings/discovery/show.html.haml
@@ -0,0 +1,43 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.discovery.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_discovery_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.discovery.preamble')
+
+  %h4= t('admin.settings.discovery.trends')
+
+  .fields-group
+    = f.input :trends, as: :boolean, wrapper: :with_label
+
+  .fields-group
+    = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, recommended: :not_recommended
+
+  %h4= t('admin.settings.discovery.public_timelines')
+
+  .fields-group
+    = f.input :timeline_preview, as: :boolean, wrapper: :with_label
+
+  .fields-group
+    = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
+
+  %h4= t('admin.settings.discovery.follow_recommendations')
+
+  .fields-group
+    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label
+
+  %h4= t('admin.settings.discovery.profile_directory')
+
+  .fields-group
+    = f.input :profile_directory, as: :boolean, wrapper: :with_label
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
deleted file mode 100644
index 33bfc43d3..000000000
--- a/app/views/admin/settings/edit.html.haml
+++ /dev/null
@@ -1,110 +0,0 @@
-- content_for :header_tags do
-  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
-
-- content_for :page_title do
-  = t('admin.settings.title')
-
-  - content_for :heading_actions do
-    = button_tag t('generic.save_changes'), class: 'button', form: 'edit_admin'
-
-= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch, id: 'edit_admin' } do |f|
-  = render 'shared/error_messages', object: @admin_settings
-
-  .fields-group
-    = f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')
-
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :theme, collection: Themes.instance.names, label: t('simple_form.labels.defaults.setting_theme'), label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, label: t('admin.settings.registrations_mode.title'), include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
-
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_username, wrapper: :with_label, label: t('admin.settings.contact_information.username')
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_email, wrapper: :with_label, label: t('admin.settings.contact_information.email')
-
-  .fields-group
-    = f.input :site_short_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_short_description.title'), hint: t('admin.settings.site_short_description.desc_html'), input_html: { rows: 2 }
-
-  .fields-group
-    = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 2 }
-
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: site_upload_delete_hint(t('admin.settings.thumbnail.desc_html'), :thumbnail)
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: site_upload_delete_hint(t('admin.settings.hero.desc_html'), :hero)
-
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: site_upload_delete_hint(t('admin.settings.mascot.desc_html'), :mascot)
-
-  %hr.spacer/
-
-  .fields-group
-    = f.input :require_invite_text, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.require_invite_text.title'), hint: t('admin.settings.registrations.require_invite_text.desc_html'), disabled: !approved_registrations?
-  .fields-group
-
-  %hr.spacer/
-
-  .fields-group
-    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html')
-
-  %hr.spacer/
-
-  - unless whitelist_mode?
-    .fields-group
-      = f.input :timeline_preview, as: :boolean, wrapper: :with_label, label: t('admin.settings.timeline_preview.title'), hint: t('admin.settings.timeline_preview.desc_html')
-
-    .fields-group
-      = f.input :show_known_fediverse_at_about_page, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_known_fediverse_at_about_page.title'), hint: t('admin.settings.show_known_fediverse_at_about_page.desc_html')
-
-  .fields-group
-    = f.input :show_staff_badge, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_staff_badge.title'), hint: t('admin.settings.show_staff_badge.desc_html')
-
-  .fields-group
-    = f.input :open_deletion, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.deletion.title'), hint: t('admin.settings.registrations.deletion.desc_html')
-
-  - unless whitelist_mode?
-    .fields-group
-      = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.activity_api_enabled.title'), hint: t('admin.settings.activity_api_enabled.desc_html'), recommended: true
-
-    .fields-group
-      = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html'), recommended: true
-
-    .fields-group
-      = f.input :preview_sensitive_media, as: :boolean, wrapper: :with_label, label: t('admin.settings.preview_sensitive_media.title'), hint: t('admin.settings.preview_sensitive_media.desc_html')
-
-    .fields-group
-      = f.input :profile_directory, as: :boolean, wrapper: :with_label, label: t('admin.settings.profile_directory.title'), hint: t('admin.settings.profile_directory.desc_html')
-
-    .fields-group
-      = f.input :trends, as: :boolean, wrapper: :with_label, label: t('admin.settings.trends.title'), hint: t('admin.settings.trends.desc_html')
-
-    .fields-group
-      = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html')
-
-    .fields-group
-      = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
-
-  %hr.spacer/
-
-  .fields-group
-    = f.input :min_invite_role, wrapper: :with_label, collection: %i(disabled user moderator admin), label: t('admin.settings.registrations.min_invite_role.title'), label_method: lambda { |role| role == :disabled ? t('admin.settings.registrations.min_invite_role.disabled') : t("admin.accounts.roles.#{role}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label: t('admin.settings.domain_blocks.title'), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label: t('admin.settings.domain_blocks_rationale.title'), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-
-  .fields-group
-    = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 } unless whitelist_mode?
-    = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, label: t('admin.settings.registrations.closed_message.title'), hint: t('admin.settings.registrations.closed_message.desc_html'), input_html: { rows: 8 }
-    = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 }
-    = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }, label: t('admin.settings.custom_css.title'), hint: t('admin.settings.custom_css.desc_html')
-
-  .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
new file mode 100644
index 000000000..0db9f3536
--- /dev/null
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -0,0 +1,27 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.settings.registrations.title')
+
+- content_for :heading do
+  %h2= t('admin.settings.title')
+  = render partial: 'admin/settings/shared/links'
+
+= simple_form_for @admin_settings, url: admin_settings_registrations_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t('admin.settings.registrations.preamble')
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
+
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations?
+
+  .fields-group
+    = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, input_html: { rows: 2 }
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
new file mode 100644
index 000000000..1294c26ce
--- /dev/null
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -0,0 +1,8 @@
+.content__heading__tabs
+  = render_navigation renderer: :links do |primary|
+    - primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
+    - primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
+    - primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+    - primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
+    - primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
+    - primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
new file mode 100644
index 000000000..19a0e063d
--- /dev/null
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -0,0 +1,20 @@
+.status
+  .status__content><
+    - if status_edit.spoiler_text.blank?
+      = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+    - else
+      %details<
+        %summary><
+          %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
+        = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+
+  - unless status_edit.ordered_media_attachments.empty?
+    = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+
+  .detailed-status__meta
+    %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+    - if status_edit.sensitive?
+      ·
+      = fa_icon('eye-slash fw')
+      = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index c39ba9071..d3d7cc160 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -4,34 +4,43 @@
 - content_for :page_title do
   = t('admin.statuses.title')
   \-
-  = "@#{@account.acct}"
+  = "@#{@account.pretty_acct}"
 
 .filters
   .filter-subset
     %strong= t('admin.statuses.media.title')
     %ul
-      %li= link_to t('admin.statuses.no_media'), admin_account_statuses_path(@account.id, current_params.merge(media: nil)), class: !params[:media] && 'selected'
-      %li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
+      %li= filter_link_to t('generic.all'), media: nil, id: nil
+      %li= filter_link_to t('admin.statuses.with_media'), media: '1'
   .back-link
-    = link_to admin_account_path(@account.id) do
-      = fa_icon 'chevron-left fw'
-      = t('admin.statuses.back_to_account')
+    - if params[:report_id]
+      = link_to admin_report_path(params[:report_id].to_i) do
+        = fa_icon 'chevron-left fw'
+        = t('admin.statuses.back_to_report')
+    - else
+      = link_to admin_account_path(@account.id) do
+        = fa_icon 'chevron-left fw'
+        = t('admin.statuses.back_to_account')
 
 %hr.spacer/
 
-= form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
-  = hidden_field_tag :page, params[:page]
-  = hidden_field_tag :media, params[:media]
+= form_for(@status_batch_action, url: batch_admin_account_statuses_path(@account.id)) do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  - Admin::StatusFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
 
   .batch-table
     .batch-table__toolbar
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('eye-slash'), t('admin.statuses.batch.nsfw_on')]), name: :nsfw_on, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('eye'), t('admin.statuses.batch.nsfw_off')]), name: :nsfw_off, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('trash'), t('admin.statuses.batch.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        - unless @statuses.empty?
+          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]), name: :report, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
     .batch-table__body
-      = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
+      - if @statuses.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
 
 = paginate @statuses
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
index e2470198d..62b49de8c 100644
--- a/app/views/admin/statuses/show.html.haml
+++ b/app/views/admin/statuses/show.html.haml
@@ -1,27 +1,64 @@
-- content_for :page_title do
-  = t('admin.statuses.title')
-  \-
-  = "@#{@account.acct}"
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-.filters
-  .back-link
-    = link_to admin_account_path(@account.id) do
-      %i.fa.fa-chevron-left.fa-fw
-      = t('admin.statuses.back_to_account')
+- content_for :page_title do
+  = t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false))
+
+- content_for :heading_actions do
+  = link_to t('admin.statuses.open'), ActivityPub::TagManager.instance.url_for(@status), class: 'button', target: '_blank'
+
+%h3= t('admin.statuses.metadata')
+
+.table-wrapper
+  %table.table.horizontal-table
+    %tbody
+      %tr
+        %th= t('admin.statuses.account')
+        %td= admin_account_link_to @status.account
+      - if @status.reply?
+        %tr
+          %th= t('admin.statuses.in_reply_to')
+          %td= admin_account_link_to @status.in_reply_to_account, path: admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id)
+      %tr
+        %th= t('admin.statuses.application')
+        %td= @status.application&.name
+      %tr
+        %th= t('admin.statuses.language')
+        %td= standard_locale_name(@status.language)
+      %tr
+        %th= t('admin.statuses.visibility')
+        %td= t("statuses.visibilities.#{@status.visibility}")
+      - if @status.trend
+        %tr
+          %th= t('admin.statuses.trending')
+          %td
+            - if @status.trend.allowed?
+              %abbr{ title: t('admin.trends.tags.current_score', score: @status.trend.score) }= t('admin.trends.tags.trending_rank', rank: @status.trend.rank)
+            - elsif @status.trend.requires_review?
+              = t('admin.trends.pending_review')
+            - else
+              = t('admin.trends.not_allowed_to_trend')
+      %tr
+        %th= t('admin.statuses.reblogs')
+        %td= friendly_number_to_human @status.reblogs_count
+      %tr
+        %th= t('admin.statuses.favourites')
+        %td= friendly_number_to_human @status.favourites_count
 
 %hr.spacer/
 
-= form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
-  = hidden_field_tag :page, params[:page]
-  = hidden_field_tag :media, params[:media]
+%h3= t('admin.statuses.history')
 
-  .batch-table
-    .batch-table__toolbar
-      %label.batch-table__toolbar__select.batch-checkbox-all
-        = check_box_tag :batch_checkbox_all, nil, false
-      .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('eye-slash'), t('admin.statuses.batch.nsfw_on')]), name: :nsfw_on, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('eye'), t('admin.statuses.batch.nsfw_off')]), name: :nsfw_off, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('trash'), t('admin.statuses.batch.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-    .batch-table__body
-      = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
+%ol.history
+  - @status.edits.includes(:account, status: [:account]).each.with_index do |status_edit, i|
+    %li
+      .history__entry
+        %h5
+          - if i.zero?
+            = t('admin.statuses.original_status')
+          - else
+            = t('admin.statuses.status_changed')
+          ·
+          %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+        = render status_edit
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index 007dc005e..104190b58 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -2,57 +2,58 @@
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
-  = "##{@tag.name}"
+  = "##{@tag.display_name}"
 
-- content_for :heading_actions do
-  = l(@time_period.first)
-  = ' - '
-  = l(@time_period.last)
+- if current_user.can?(:view_dashboard)
+  - content_for :heading_actions do
+    = l(@time_period.first)
+    = ' - '
+    = l(@time_period.last)
 
-.dashboard
-  .dashboard__item
-    = react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure')
-  .dashboard__item
-    = react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
-  .dashboard__item
-    = react_admin_component :counter, measure: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_servers_measure')
-  .dashboard__item
-    = react_admin_component :dimension, dimension: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_servers_dimension')
-  .dashboard__item
-    = react_admin_component :dimension, dimension: 'tag_languages', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_languages_dimension')
-  .dashboard__item
-    = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
-      - if @tag.usable?
-        %span= t('admin.trends.tags.usable')
-        = fa_icon 'check fw'
-      - else
-        %span= t('admin.trends.tags.not_usable')
-        = fa_icon 'lock fw'
+  .dashboard
+    .dashboard__item
+      = react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure'), href: tag_url(@tag), target: '_blank'
+    .dashboard__item
+      = react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
+    .dashboard__item
+      = react_admin_component :counter, measure: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_servers_measure')
+    .dashboard__item
+      = react_admin_component :dimension, dimension: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_servers_dimension')
+    .dashboard__item
+      = react_admin_component :dimension, dimension: 'tag_languages', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_languages_dimension')
+    .dashboard__item
+      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
+        - if @tag.usable?
+          %span= t('admin.trends.tags.usable')
+          = fa_icon 'check fw'
+        - else
+          %span= t('admin.trends.tags.not_usable')
+          = fa_icon 'lock fw'
 
-    = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
-      - if @tag.trendable?
-        %span= t('admin.trends.tags.trendable')
-        = fa_icon 'check fw'
-      - else
-        %span= t('admin.trends.tags.not_trendable')
-        = fa_icon 'lock fw'
+      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
+        - if @tag.trendable?
+          %span= t('admin.trends.tags.trendable')
+          = fa_icon 'check fw'
+        - else
+          %span= t('admin.trends.tags.not_trendable')
+          = fa_icon 'lock fw'
 
 
-    = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
-      - if @tag.listable?
-        %span= t('admin.trends.tags.listable')
-        = fa_icon 'check fw'
-      - else
-        %span= t('admin.trends.tags.not_listable')
-        = fa_icon 'lock fw'
+      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
+        - if @tag.listable?
+          %span= t('admin.trends.tags.listable')
+          = fa_icon 'check fw'
+        - else
+          %span= t('admin.trends.tags.not_listable')
+          = fa_icon 'lock fw'
 
-%hr.spacer/
+  %hr.spacer/
 
 = simple_form_for @tag, url: admin_tag_path(@tag.id) do |f|
   = render 'shared/error_messages', object: @tag
 
   .fields-group
-    = f.input :name, wrapper: :with_block_label
+    = f.input :display_name, wrapper: :with_block_label
 
   .fields-group
     = f.input :usable, as: :boolean, wrapper: :with_label
diff --git a/app/views/admin/trends/links/_preview_card.html.haml b/app/views/admin/trends/links/_preview_card.html.haml
index b88c1be2f..8812feb31 100644
--- a/app/views/admin/trends/links/_preview_card.html.haml
+++ b/app/views/admin/trends/links/_preview_card.html.haml
@@ -1,4 +1,4 @@
-.batch-table__row{ class: [preview_card.provider&.requires_review? && 'batch-table__row--attention', !preview_card.provider&.requires_review? && !preview_card.trendable? && 'batch-table__row--muted'] }
+.batch-table__row{ class: [preview_card.requires_review? && 'batch-table__row--attention', !preview_card.requires_review? && !preview_card.trendable? && 'batch-table__row--muted'] }
   %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
     = f.check_box :preview_card_ids, { multiple: true, include_hidden: false }, preview_card.id
 
@@ -13,18 +13,18 @@
         •
 
       - if preview_card.language.present?
-        = human_locale(preview_card.language)
+        = standard_locale_name(preview_card.language)
         •
 
       = t('admin.trends.links.shared_by_over_week', count: preview_card.history.reduce(0) { |sum, day| sum + day.accounts })
 
-      - if preview_card.trendable? && (rank = Trends.links.rank(preview_card.id))
+      - if preview_card.trend.allowed?
         •
-        %abbr{ title: t('admin.trends.tags.current_score', score: Trends.links.score(preview_card.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
+        %abbr{ title: t('admin.trends.tags.current_score', score: preview_card.trend.score) }= t('admin.trends.tags.trending_rank', rank: preview_card.trend.rank)
 
         - if preview_card.decaying?
           •
           = t('admin.trends.tags.peaked_on_and_decaying', date: l(preview_card.max_score_at.to_date, format: :short))
-      - elsif preview_card.provider&.requires_review?
+      - elsif preview_card.requires_review?
         •
         = t('admin.trends.pending_review')
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index 240ae722b..7b5122cf1 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -4,23 +4,33 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
-.filters
-  .filter-subset
-    %strong= t('admin.trends.trending')
-    %ul
-      %li= filter_link_to t('generic.all'), trending: nil
-      %li= filter_link_to t('admin.trends.only_allowed'), trending: 'allowed'
-  .back-link
-    = link_to admin_trends_links_preview_card_providers_path do
-      = t('admin.trends.preview_card_providers.title')
-      = fa_icon 'chevron-right fw'
+%p= t('admin.trends.links.description_html')
 
 %hr.spacer/
 
+= form_tag admin_trends_links_path, method: 'GET', class: 'simple_form' do
+  - Trends::PreviewCardFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.follow_recommendations.language')
+      .input.select.optional
+        = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+    .filter-subset
+      %strong= t('admin.trends.trending')
+      %ul
+        %li= filter_link_to t('generic.all'), trending: nil
+        %li= filter_link_to t('admin.trends.only_allowed'), trending: 'allowed'
+    .back-link
+      = link_to admin_trends_links_preview_card_providers_path do
+        = t('admin.trends.preview_card_providers.title')
+        = fa_icon 'chevron-right fw'
+
 = form_for(@form, url: batch_admin_trends_links_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
-  - PreviewCardFilter::KEYS.each do |key|
+  - Trends::PreviewCardFilter::KEYS.each do |key|
     = hidden_field_tag key, params[key] if params[key].present?
 
   .batch-table
@@ -29,9 +39,9 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]), name: :approve_all, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]), name: :approve_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
         = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]), name: :reject_all, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]), name: :reject_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
     .batch-table__body
       - if @preview_cards.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index eac6e641f..c3648c35e 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -4,6 +4,10 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
+%p= t('admin.trends.preview_card_providers.description_html')
+
+%hr.spacer/
+
 .filters
   .filter-subset
     %strong= t('admin.tags.review')
@@ -17,13 +21,12 @@
       = fa_icon 'chevron-left fw'
       = t('admin.trends.links.title')
 
-
 %hr.spacer/
 
 = form_for(@form, url: batch_admin_trends_links_preview_card_providers_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
-  - PreviewCardProviderFilter::KEYS.each do |key|
+  - Trends::PreviewCardProviderFilter::KEYS.each do |key|
     = hidden_field_tag key, params[key] if params[key].present?
 
   .batch-table.optional
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
new file mode 100644
index 000000000..f35e13d12
--- /dev/null
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -0,0 +1,33 @@
+.batch-table__row{ class: [status.requires_review? && 'batch-table__row--attention', !status.requires_review? && !status.trendable? && 'batch-table__row--muted'] }
+  %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+    = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+
+  .batch-table__row__content.pending-account__header
+    .one-liner
+      = admin_account_link_to status.account
+
+      = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', class: 'emojify', rel: 'noopener noreferrer' do
+        = one_line_preview(status)
+
+        - status.ordered_media_attachments.each do |media_attachment|
+          %abbr{ title: media_attachment.description }
+            = fa_icon 'link'
+            = media_attachment.file_file_name
+
+    = t('admin.trends.statuses.shared_by', count: status.reblogs_count + status.favourites_count, friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count))
+
+    - if status.account.domain.present?
+      •
+      = status.account.domain
+    - if status.language.present?
+      •
+      = standard_locale_name(status.language)
+    - if status.trendable? && !status.account.discoverable?
+      •
+      = t('admin.trends.statuses.not_discoverable')
+    - if status.trend.allowed?
+      •
+      %abbr{ title: t('admin.trends.tags.current_score', score: status.trend.score) }= t('admin.trends.tags.trending_rank', rank: status.trend.rank)
+    - elsif status.requires_review?
+      •
+      = t('admin.trends.pending_review')
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
new file mode 100644
index 000000000..a42d60b00
--- /dev/null
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -0,0 +1,47 @@
+- content_for :page_title do
+  = t('admin.trends.statuses.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+%p= t('admin.trends.statuses.description_html')
+
+%hr.spacer/
+
+= form_tag admin_trends_statuses_path, method: 'GET', class: 'simple_form' do
+  - Trends::StatusFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .filters
+    .filter-subset.filter-subset--with-select
+      %strong= t('admin.follow_recommendations.language')
+      .input.select.optional
+        = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+    .filter-subset
+      %strong= t('admin.trends.trending')
+      %ul
+        %li= filter_link_to t('generic.all'), trending: nil
+        %li= filter_link_to t('admin.trends.only_allowed'), trending: 'allowed'
+
+= form_for(@form, url: batch_admin_trends_statuses_path) do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  - Trends::StatusFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]), name: :approve_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]), name: :reject_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+    .batch-table__body
+      - if @statuses.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'status', collection: @statuses, locals: { f: f }
+
+= paginate @statuses
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 7bb99b158..a30666a08 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -6,7 +6,7 @@
     .pending-account__header
       = link_to admin_tag_path(tag.id) do
         = fa_icon 'hashtag'
-        = tag.name
+        = tag.display_name
 
       %br/
 
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 8df0a9920..bde32a295 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -4,6 +4,10 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
 
+%p= t('admin.trends.tags.description_html')
+
+%hr.spacer/
+
 .filters
   .filter-subset
     %strong= t('admin.tags.review')
@@ -13,12 +17,10 @@
       %li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
       %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Tag.pending_review.count})"], ' '), status: 'pending_review'
 
-%hr.spacer/
-
 = form_for(@form, url: batch_admin_trends_tags_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
-  - TagFilter::KEYS.each do |key|
+  - Trends::TagFilter::KEYS.each do |key|
     = hidden_field_tag key, params[key] if params[key].present?
 
   .batch-table.optional
diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
new file mode 100644
index 000000000..821618060
--- /dev/null
+++ b/app/views/admin/users/roles/show.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('admin.accounts.change_role.title', username: @user.account.username)
+
+= simple_form_for @user, url: admin_user_role_path(@user) do |f|
+  .fields-group
+    = f.association :role, wrapper: :with_block_label, collection: UserRole.assignable, label_method: :name, include_blank: I18n.t('admin.accounts.change_role.no_role')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/_form.html.haml b/app/views/admin/webhooks/_form.html.haml
new file mode 100644
index 000000000..c1e8f8979
--- /dev/null
+++ b/app/views/admin/webhooks/_form.html.haml
@@ -0,0 +1,11 @@
+= simple_form_for @webhook, url: @webhook.new_record? ? admin_webhooks_path : admin_webhook_path(@webhook) do |f|
+  = render 'shared/error_messages', object: @webhook
+
+  .fields-group
+    = f.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' }
+
+  .fields-group
+    = f.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+
+  .actions
+    = f.button :button, @webhook.new_record? ? t('admin.webhooks.add_new') : t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/_webhook.html.haml b/app/views/admin/webhooks/_webhook.html.haml
new file mode 100644
index 000000000..d94a41eb3
--- /dev/null
+++ b/app/views/admin/webhooks/_webhook.html.haml
@@ -0,0 +1,19 @@
+.applications-list__item
+  = link_to admin_webhook_path(webhook), class: 'announcements-list__item__title' do
+    = fa_icon 'inbox'
+    = webhook.url
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      - if webhook.enabled?
+        %span.positive-hint= t('admin.webhooks.enabled')
+      - else
+        %span.negative-hint= t('admin.webhooks.disabled')
+
+      •
+
+      %abbr{ title: webhook.events.join(', ') }= t('admin.webhooks.enabled_events', count: webhook.events.size)
+
+    %div
+      = table_link_to 'pencil', t('admin.webhooks.edit'), edit_admin_webhook_path(webhook) if can?(:update, webhook)
+      = table_link_to 'trash', t('admin.webhooks.delete'), admin_webhook_path(webhook), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, webhook)
diff --git a/app/views/admin/webhooks/edit.html.haml b/app/views/admin/webhooks/edit.html.haml
new file mode 100644
index 000000000..3dc0ace9b
--- /dev/null
+++ b/app/views/admin/webhooks/edit.html.haml
@@ -0,0 +1,4 @@
+- content_for :page_title do
+  = t('admin.webhooks.edit')
+
+= render partial: 'form'
diff --git a/app/views/admin/webhooks/index.html.haml b/app/views/admin/webhooks/index.html.haml
new file mode 100644
index 000000000..e4499e078
--- /dev/null
+++ b/app/views/admin/webhooks/index.html.haml
@@ -0,0 +1,18 @@
+- content_for :page_title do
+  = t('admin.webhooks.title')
+
+- content_for :heading_actions do
+  = link_to t('admin.webhooks.add_new'), new_admin_webhook_path, class: 'button' if can?(:create, :webhook)
+
+%p= t('admin.webhooks.description_html')
+
+%hr.spacer/
+
+- if @webhooks.empty?
+  %div.muted-hint.center-text
+    = t 'admin.webhooks.empty'
+- else
+  .applications-list
+    = render partial: 'webhook', collection: @webhooks
+
+  = paginate @webhooks
diff --git a/app/views/admin/webhooks/new.html.haml b/app/views/admin/webhooks/new.html.haml
new file mode 100644
index 000000000..1258df74a
--- /dev/null
+++ b/app/views/admin/webhooks/new.html.haml
@@ -0,0 +1,4 @@
+- content_for :page_title do
+  = t('admin.webhooks.new')
+
+= render partial: 'form'
diff --git a/app/views/admin/webhooks/show.html.haml b/app/views/admin/webhooks/show.html.haml
new file mode 100644
index 000000000..cc450de26
--- /dev/null
+++ b/app/views/admin/webhooks/show.html.haml
@@ -0,0 +1,34 @@
+- content_for :page_title do
+  = t('admin.webhooks.title')
+
+- content_for :heading do
+  %h2
+    %small
+      = fa_icon 'inbox'
+      = t('admin.webhooks.webhook')
+    = @webhook.url
+
+- content_for :heading_actions do
+  = link_to t('admin.webhooks.edit'), edit_admin_webhook_path, class: 'button' if can?(:update, @webhook)
+
+.table-wrapper
+  %table.table.horizontal-table
+    %tbody
+      %tr
+        %th= t('admin.webhooks.status')
+        %td
+          - if @webhook.enabled?
+            %span.positive-hint= t('admin.webhooks.enabled')
+            = table_link_to 'power-off', t('admin.webhooks.disable'), disable_admin_webhook_path(@webhook), method: :post if can?(:disable, @webhook)
+          - else
+            %span.negative-hint= t('admin.webhooks.disabled')
+            = table_link_to 'power-off', t('admin.webhooks.enable'), enable_admin_webhook_path(@webhook), method: :post if can?(:enable, @webhook)
+      %tr
+        %th= t('admin.webhooks.events')
+        %td
+          %abbr{ title: @webhook.events.join(', ') }= t('admin.webhooks.enabled_events', count: @webhook.events.size)
+      %tr
+        %th= t('admin.webhooks.secret')
+        %td
+          %samp= @webhook.secret
+          = table_link_to 'refresh', t('admin.webhooks.rotate_secret'), rotate_admin_webhook_secret_path(@webhook), method: :post if can?(:rotate_secret, @webhook)
diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb
new file mode 100644
index 000000000..602e12793
--- /dev/null
+++ b/app/views/admin_mailer/_new_trending_links.text.erb
@@ -0,0 +1,8 @@
+<%= raw t('admin_mailer.new_trends.new_trending_links.title') %>
+
+<% @links.each do |link| %>
+- <%= link.title %> • <%= link.url %>
+  <%= standard_locale_name(link.language) %> • <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %>
+<% end %>
+
+<%= raw t('application_mailer.view')%> <%= admin_trends_links_url %>
diff --git a/app/views/admin_mailer/_new_trending_statuses.text.erb b/app/views/admin_mailer/_new_trending_statuses.text.erb
new file mode 100644
index 000000000..1ed3ae857
--- /dev/null
+++ b/app/views/admin_mailer/_new_trending_statuses.text.erb
@@ -0,0 +1,8 @@
+<%= raw t('admin_mailer.new_trends.new_trending_statuses.title') %>
+
+<% @statuses.each do |status| %>
+- <%= ActivityPub::TagManager.instance.url_for(status) %>
+  <%= standard_locale_name(status.language) %> • <%= raw t('admin.trends.tags.current_score', score: status.trend.score.round(2)) %>
+<% end %>
+
+<%= raw t('application_mailer.view')%> <%= admin_trends_statuses_url %>
diff --git a/app/views/admin_mailer/_new_trending_tags.text.erb b/app/views/admin_mailer/_new_trending_tags.text.erb
new file mode 100644
index 000000000..363df369d
--- /dev/null
+++ b/app/views/admin_mailer/_new_trending_tags.text.erb
@@ -0,0 +1,14 @@
+<%= raw t('admin_mailer.new_trends.new_trending_tags.title') %>
+
+<% @tags.each do |tag| %>
+- #<%= tag.display_name %>
+  <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
+<% end %>
+
+<% if @lowest_trending_tag %>
+<%= raw t('admin_mailer.new_trends.new_trending_tags.requirements', lowest_tag_name: @lowest_trending_tag.display_name, lowest_tag_score: Trends.tags.score(@lowest_trending_tag.id).round(2), rank: Trends.tags.options[:review_threshold]) %>
+<% else %>
+<%= raw t('admin_mailer.new_trends.new_trending_tags.no_approved_tags') %>
+<% end %>
+
+<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %>
diff --git a/app/views/admin_mailer/new_appeal.text.erb b/app/views/admin_mailer/new_appeal.text.erb
new file mode 100644
index 000000000..db4529eb7
--- /dev/null
+++ b/app/views/admin_mailer/new_appeal.text.erb
@@ -0,0 +1,9 @@
+<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
+
+<%= raw t('admin_mailer.new_appeal.body', target: @appeal.account.username, action_taken_by: @appeal.strike.account.username, date: l(@appeal.strike.created_at), type: t(@appeal.strike.action, scope: 'admin_mailer.new_appeal.actions')) %>
+
+> <%= raw word_wrap(@appeal.text, break_sequence: "\n> ") %>
+
+<%= raw t('admin_mailer.new_appeal.next_steps') %>
+
+<%= raw t('application_mailer.view')%> <%= disputes_strike_url(@appeal.strike) %>
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb
index bcc251819..a8a2a35fa 100644
--- a/app/views/admin_mailer/new_pending_account.text.erb
+++ b/app/views/admin_mailer/new_pending_account.text.erb
@@ -3,7 +3,7 @@
 <%= raw t('admin_mailer.new_pending_account.body') %>
 
 <%= @account.user_email %> (@<%= @account.username %>)
-<%= @account.user_current_sign_in_ip %>
+<%= @account.user_sign_up_ip %>
 <% if @account.user&.invite_request&.text.present? %>
 
 <%= quote_wrap(@account.user&.invite_request&.text) %>
diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb
index d6c7d6bab..f8a5224a1 100644
--- a/app/views/admin_mailer/new_report.text.erb
+++ b/app/views/admin_mailer/new_report.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
+<%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.pretty_acct, reporter: @report.account.pretty_acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
 
 <%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>
diff --git a/app/views/admin_mailer/new_trending_links.text.erb b/app/views/admin_mailer/new_trending_links.text.erb
deleted file mode 100644
index 51789aca5..000000000
--- a/app/views/admin_mailer/new_trending_links.text.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
-<%= raw t('admin_mailer.new_trending_links.body') %>
-
-<% @links.each do |link| %>
-- <%= link.title %> • <%= link.url %>
-  <%= t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: Trends.links.score(link.id).round(2)) %>
-<% end %>
-
-<% if @lowest_trending_link %>
-<%= t('admin_mailer.new_trending_links.requirements', lowest_link_title: @lowest_trending_link.title, lowest_link_score: Trends.links.score(@lowest_trending_link.id).round(2)) %>
-<% else %>
-<%= t('admin_mailer.new_trending_links.no_approved_links') %>
-<% end %>
-
-<%= raw t('application_mailer.view')%> <%= admin_trends_links_url %>
diff --git a/app/views/admin_mailer/new_trending_tags.text.erb b/app/views/admin_mailer/new_trending_tags.text.erb
deleted file mode 100644
index 5051e8a96..000000000
--- a/app/views/admin_mailer/new_trending_tags.text.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
-<%= raw t('admin_mailer.new_trending_tags.body') %>
-
-<% @tags.each do |tag| %>
-- #<%= tag.name %>
-  <%= t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
-<% end %>
-
-<% if @lowest_trending_tag %>
-<%= t('admin_mailer.new_trending_tags.requirements', lowest_tag_name: @lowest_trending_tag.name, lowest_tag_score: Trends.tags.score(@lowest_trending_tag.id).round(2)) %>
-<% else %>
-<%= t('admin_mailer.new_trending_tags.no_approved_tags') %>
-<% end %>
-
-<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(pending_review: '1') %>
diff --git a/app/views/admin_mailer/new_trends.text.erb b/app/views/admin_mailer/new_trends.text.erb
new file mode 100644
index 000000000..13b296846
--- /dev/null
+++ b/app/views/admin_mailer/new_trends.text.erb
@@ -0,0 +1,13 @@
+<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
+
+<%= raw t('admin_mailer.new_trends.body') %>
+
+<% unless @links.empty? %>
+<%= render 'new_trending_links' %>
+<% end %>
+<% unless @tags.empty? %>
+<%= render 'new_trending_tags' unless @tags.empty? %>
+<% end %>
+<% unless @statuses.empty? %>
+<%= render 'new_trending_statuses' unless @statuses.empty? %>
+<% end %>
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml
index 909d9ff81..3d0e6b1da 100644
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@@ -13,4 +13,4 @@
           %strong.emojify.p-name= display_name(account, custom_emojify: true)
         %span
           = acct(account)
-          = fa_icon('lock', { :data => ({hidden: true} unless account.locked?)})
+          = fa_icon('lock', { data: ({hidden: true} unless account.locked?)})
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml
index 6826c3b58..6d18668b0 100644
--- a/app/views/application/_sidebar.html.haml
+++ b/app/views/application/_sidebar.html.haml
@@ -1,16 +1,16 @@
 .hero-widget
   .hero-widget__img
-    = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
+    = image_tag @instance_presenter.thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title
 
   .hero-widget__text
-    %p= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
+    %p= @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html')
 
 - if Setting.trends && !(user_signed_in? && !current_user.setting_trends)
-  - trends = Trends.tags.get(true, 3)
+  - trends = Trends.tags.query.allowed.limit(3)
 
   - unless trends.empty?
     .endorsements-widget.trends-widget
       %h4.emojify= t('footer.trending_now')
 
       - trends.each do |tag|
-        = react_component :hashtag, hashtag: ActiveModelSerializers::SerializableResource.new(tag, serializer: REST::TagSerializer).as_json
+        = react_component :hashtag, hashtag: ActiveModelSerializers::SerializableResource.new(tag, serializer: REST::TagSerializer, scope: current_user, scope_name: :current_user).as_json
diff --git a/app/views/auth/challenges/new.html.haml b/app/views/auth/challenges/new.html.haml
index 9aef2c35d..4f21e4af6 100644
--- a/app/views/auth/challenges/new.html.haml
+++ b/app/views/auth/challenges/new.html.haml
@@ -5,7 +5,7 @@
   = f.input :return_to, as: :hidden
 
   .field-group
-    = f.input :current_password, wrapper: :with_block_label, input_html: { :autocomplete => 'off', :autofocus => true }, label: t('challenge.prompt'), required: true
+    = f.input :current_password, wrapper: :with_block_label, input_html: { autocomplete: 'current-password', autofocus: true }, label: t('challenge.prompt'), required: true
 
   .actions
     = f.button :button, t('challenge.confirm'), type: :submit
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index 4a1bedaa4..a294d3cb5 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -5,7 +5,7 @@
   = render 'shared/error_messages', object: resource
 
   .fields-group
-    = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
+    = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false
 
   .actions
     = f.button :button, t('auth.resend_confirmation'), type: :submit
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 114a74454..b95a9b676 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -8,9 +8,9 @@
     = f.input :reset_password_token, as: :hidden
 
     .fields-group
-      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, required: true
+      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, required: true
     .fields-group
-      = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }, required: true
+      = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' }, required: true
 
     .actions
       = f.button :button, t('auth.set_new_password'), type: :submit
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index bae5b24ba..10ad108ea 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -5,7 +5,7 @@
   = render 'shared/error_messages', object: resource
 
   .fields-group
-    = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
+    = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false
 
   .actions
     = f.button :button, t('auth.reset_password'), type: :submit
diff --git a/app/views/auth/registrations/_account_warning.html.haml b/app/views/auth/registrations/_account_warning.html.haml
new file mode 100644
index 000000000..40e7e1296
--- /dev/null
+++ b/app/views/auth/registrations/_account_warning.html.haml
@@ -0,0 +1,20 @@
+= link_to disputes_strike_path(account_warning), class: 'log-entry' do
+  .log-entry__header
+    .log-entry__avatar
+      .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
+        = fa_icon 'warning'
+    .log-entry__content
+      .log-entry__title
+        = t('disputes.strikes.title', action: t(account_warning.action, scope: 'disputes.strikes.title_actions'), date: l(account_warning.created_at.to_date))
+      .log-entry__timestamp
+        %time.formatted{ datetime: account_warning.created_at.iso8601 }= l(account_warning.created_at)
+
+        - if account_warning.overruled?
+          ·
+          %span.positive-hint= t('disputes.strikes.your_appeal_approved')
+        - elsif account_warning.appeal&.pending?
+          ·
+          %span.warning-hint= t('disputes.strikes.your_appeal_pending')
+        - elsif account_warning.appeal&.rejected?
+          ·
+          %span.negative-hint= t('disputes.strikes.your_appeal_rejected')
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 5d993f574..c094dfd25 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -18,7 +18,7 @@
         %tr
           %td
             %span{ title: session.user_agent }<
-              = fa_icon "#{session_device_icon(session)} fw", 'aria-label' => session_device_icon(session)
+              = fa_icon "#{session_device_icon(session)} fw", 'aria-label': session_device_icon(session)
               = ' '
               = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}", default: "#{session.browser}"), platform: t("sessions.platforms.#{session.platform}", default: "#{session.platform}")
           %td
diff --git a/app/views/auth/registrations/_status.html.haml b/app/views/auth/registrations/_status.html.haml
index 47112dae0..759bbc41c 100644
--- a/app/views/auth/registrations/_status.html.haml
+++ b/app/views/auth/registrations/_status.html.haml
@@ -1,22 +1,33 @@
+- if !@user.confirmed?
+  .flash-message.warning
+    = t('auth.status.confirming')
+    = link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
+- elsif !@user.approved?
+  .flash-message.warning
+    = t('auth.status.pending')
+- elsif @user.account.moved_to_account_id.present?
+  .flash-message.warning
+    = t('auth.status.redirecting_to', acct: @user.account.moved_to_account.pretty_acct)
+    = link_to t('migrations.cancel'), settings_migration_path
+
 %h3= t('auth.status.account_status')
 
-.simple_form
-  %p.hint
-    - if @user.account.suspended?
-      %span.negative-hint= t('user_mailer.warning.explanation.suspend')
-    - elsif @user.disabled?
-      %span.negative-hint= t('user_mailer.warning.explanation.disable')
-    - elsif @user.account.silenced?
-      %span.warning-hint= t('user_mailer.warning.explanation.silence')
-    - elsif !@user.confirmed?
-      %span.warning-hint= t('auth.status.confirming')
-      = link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
-    - elsif !@user.approved?
-      %span.warning-hint= t('auth.status.pending')
-    - elsif @user.account.moved_to_account_id.present?
-      %span.positive-hint= t('auth.status.redirecting_to', acct: @user.account.moved_to_account.acct)
-      = link_to t('migrations.cancel'), settings_migration_path
-    - else
-      %span.positive-hint= t('auth.status.functional')
+%p.hint
+  - if @user.account.suspended?
+    %span.negative-hint= t('user_mailer.warning.explanation.suspend')
+  - elsif @user.disabled?
+    %span.negative-hint= t('user_mailer.warning.explanation.disable')
+  - elsif @user.account.silenced?
+    %span.warning-hint= t('user_mailer.warning.explanation.silence')
+  - else
+    %span.positive-hint= t('auth.status.functional')
+
+= render partial: 'account_warning', collection: @strikes
+
+- if @user.account.strikes.exists?
+  %hr.spacer/
+
+  %p.muted-hint
+    = link_to t('auth.status.view_strikes'), disputes_strikes_path
 
 %hr.spacer/
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index a3445b421..60fd1635e 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -11,15 +11,15 @@
   - if !use_seamless_external_login? || resource.encrypted_password.present?
     .fields-row
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :email, wrapper: :with_label, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, required: true, disabled: current_account.suspended?
+        = f.input :email, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, required: true, disabled: current_account.suspended?
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :current_password, wrapper: :with_label, input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' }, required: true, disabled: current_account.suspended?, hint: false
+        = f.input :current_password, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.current_password'), autocomplete: 'current-password' }, required: true, disabled: current_account.suspended?, hint: false
 
     .fields-row
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, hint: t('simple_form.hints.defaults.password'), disabled: current_account.suspended?
+        = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, hint: t('simple_form.hints.defaults.password'), disabled: current_account.suspended?
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }, disabled: current_account.suspended?
+        = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' }, disabled: current_account.suspended?
 
     .actions
       = f.button :button, t('generic.save_changes'), type: :submit, class: 'button', disabled: current_account.suspended?
@@ -41,8 +41,7 @@
   %h3= t('migrations.incoming_migrations')
   %p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
 
-  - if open_deletion?
-    %hr.spacer/
+  %hr.spacer/
 
-    %h3= t('auth.delete_account')
-    %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
+  %h3= t('auth.delete_account')
+  %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 6981195ed..0d8fd800f 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -5,6 +5,9 @@
   = render partial: 'shared/og', locals: { description: description_for_sign_up }
 
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { novalidate: false }) do |f|
+  %h1.title= t('auth.sign_up.title', domain: site_hostname)
+  %p.lead= t('auth.sign_up.preamble')
+
   = render 'shared/error_messages', object: resource
 
   - if @invite.present? && @invite.autofollow?
@@ -12,31 +15,27 @@
       %p.hint= t('invites.invited_by')
       = render 'application/card', account: @invite.user.account
 
-  = f.simple_fields_for :account do |ff|
-    .fields-group
-      = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: t('simple_form.hints.defaults.username', domain: site_hostname)
-
   .fields-group
-    = f.input :email, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }
-
-  .fields-group
-    = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }
-
-  .fields-group
-    = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }
-    = f.input :confirm_password, as: :string, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), :autocomplete => 'off' }
-
-  = f.input :website, as: :url, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }
+    = f.simple_fields_for :account do |ff|
+      = ff.input :display_name, wrapper: :with_label, label: false, required: false, input_html: { 'aria-label': t('simple_form.labels.defaults.display_name'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.display_name') }
+      = ff.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.username'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}", hint: false
+    = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'username' }, hint: false
+    = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, hint: false
+    = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' }, hint: false
+    = f.input :confirm_password, as: :string, placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), autocomplete: 'off' }, hint: false
+    = f.input :website, as: :url, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: 'Website'), autocomplete: 'off' }
 
   - if approved_registrations? && !@invite.present?
     .fields-group
       = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
         = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text
 
+
+  = hidden_field_tag :accept, params[:accept]
   = f.input :invite_code, as: :hidden
 
   .fields-group
-    = f.input :agreement, as: :boolean, wrapper: :with_label, label: whitelist_mode? ? t('auth.checkbox_agreement_without_rules_html', terms_path: terms_path) : t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true
+    = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path), required: true
 
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
new file mode 100644
index 000000000..8e7a90cbe
--- /dev/null
+++ b/app/views/auth/registrations/rules.html.haml
@@ -0,0 +1,21 @@
+- content_for :page_title do
+  = t('auth.register')
+
+- content_for :header_tags do
+  = render partial: 'shared/og', locals: { description: description_for_sign_up }
+
+.simple_form
+  %h1.title= t('auth.rules.title')
+  %p.lead= t('auth.rules.preamble', domain: site_hostname)
+
+  %ol.rules-list
+    - @rules.each do |rule|
+      %li
+        .rules-list__text= rule.text
+
+  .stacked-actions
+    - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
+    = link_to t('auth.rules.accept'), accept_path, class: 'button'
+    = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
+
+.form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 9713bdaeb..e98c1ff3d 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -4,24 +4,27 @@
 - content_for :header_tags do
   = render partial: 'shared/og'
 
-= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  .fields-group
-    - if use_seamless_external_login?
-      = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
-    - else
-      = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
-  .fields-group
-    = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, hint: false
+- unless omniauth_only?
+  = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+    %h1.title= t('auth.sign_in.title', domain: site_hostname)
+    %p.lead= t('auth.sign_in.preamble_html', domain: site_hostname)
+    .fields-group
+      - if use_seamless_external_login?
+        = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label': t('simple_form.labels.defaults.username_or_email') }, hint: false
+      - else
+        = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false
+    .fields-group
+      = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'current-password' }, hint: false
 
-  .actions
-    = f.button :button, t('auth.login'), type: :submit
+    .actions
+      = f.button :button, t('auth.login'), type: :submit
 
 - if devise_mapping.omniauthable? and resource_class.omniauth_providers.any?
   .simple_form.alternative-login
-    %h4= t('auth.or_log_in_with')
+    %h4= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with')
 
     .actions
       - resource_class.omniauth_providers.each do |provider|
-        = link_to t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize), omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}", method: :post
+        = provider_sign_in_link(provider)
 
 .form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/sessions/sign_in_token.html.haml b/app/views/auth/sessions/sign_in_token.html.haml
deleted file mode 100644
index 8923203cd..000000000
--- a/app/views/auth/sessions/sign_in_token.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- content_for :page_title do
-  = t('auth.login')
-
-= simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-  %p.hint.otp-hint= t('users.suspicious_sign_in_confirmation')
-
-  .fields-group
-    = f.input :sign_in_token_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.sign_in_token_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.sign_in_token_attempt'), :autocomplete => 'off' }, autofocus: true
-
-  .actions
-    = f.button :button, t('auth.login'), type: :submit
-
-  - if Setting.site_contact_email.present?
-    %p.hint.subtle-hint= t('users.generic_access_help_html', email: mail_to(Setting.site_contact_email, nil))
diff --git a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
index ab2d48c0a..094b502b1 100644
--- a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
+++ b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
@@ -5,7 +5,7 @@
   %p.hint.authentication-hint= t('simple_form.hints.sessions.otp')
 
   .fields-group
-    = f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, autofocus: true
+    = f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label': t('simple_form.labels.defaults.otp_attempt'), autocomplete: 'one-time-code' }, autofocus: true
 
   .actions
     = f.button :button, t('auth.login'), type: :submit
diff --git a/app/views/auth/setup/show.html.haml b/app/views/auth/setup/show.html.haml
index c14fed56f..1a6611ceb 100644
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@@ -9,7 +9,7 @@
       %p.hint= t('auth.setup.email_below_hint_html')
 
     .fields-group
-      = f.input :email, required: true, hint: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }
+      = f.input :email, required: true, hint: false, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' }
 
     .actions
       = f.submit t('admin.accounts.change_email.label'), class: 'button'
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml
index 66ed5b93f..f078e2f7e 100644
--- a/app/views/auth/shared/_links.html.haml
+++ b/app/views/auth/shared/_links.html.haml
@@ -3,7 +3,7 @@
     %li= link_to t('settings.account_settings'), edit_user_registration_path
   - else
     - if controller_name != 'sessions'
-      %li= link_to t('auth.login'), new_user_session_path
+      %li= link_to_login t('auth.login')
 
     - if controller_name != 'registrations'
       %li= link_to t('auth.register'), available_sign_up_path
diff --git a/app/views/authorize_interactions/_post_follow_actions.html.haml b/app/views/authorize_interactions/_post_follow_actions.html.haml
index dd71160e2..e30097964 100644
--- a/app/views/authorize_interactions/_post_follow_actions.html.haml
+++ b/app/views/authorize_interactions/_post_follow_actions.html.haml
@@ -1,4 +1,4 @@
 .post-follow-actions
-  %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@resource.id}"), class: 'button button--block'
+  %div= link_to t('authorize_follow.post_follow.web'), web_url("@#{@resource.pretty_acct}"), class: 'button button--block'
   %div= link_to t('authorize_follow.post_follow.return'), ActivityPub::TagManager.instance.url_for(@resource), class: 'button button--block'
   %div= t('authorize_follow.post_follow.close')
diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml
index 42c874134..2b4d2ed62 100644
--- a/app/views/authorize_interactions/show.html.haml
+++ b/app/views/authorize_interactions/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('authorize_follow.title', acct: @resource.acct)
+  = t('authorize_follow.title', acct: @resource.pretty_acct)
 
 .form-container
   .follow-prompt
diff --git a/app/views/authorize_interactions/success.html.haml b/app/views/authorize_interactions/success.html.haml
index 47fd09767..86fa55eac 100644
--- a/app/views/authorize_interactions/success.html.haml
+++ b/app/views/authorize_interactions/success.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('authorize_follow.title', acct: @resource.acct)
+  = t('authorize_follow.title', acct: @resource.pretty_acct)
 
 .form-container
   .follow-prompt
diff --git a/app/views/custom_css/show.css.erb b/app/views/custom_css/show.css.erb
new file mode 100644
index 000000000..bcbe81962
--- /dev/null
+++ b/app/views/custom_css/show.css.erb
@@ -0,0 +1,12 @@
+<%- if Setting.custom_css.present? %>
+<%= raw Setting.custom_css %>
+
+<%- end %>
+<%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %>
+.user-role-<%= role.id %> {
+  --user-role-accent: <%= role.color %>;
+  --user-role-background: <%= role.color + '19' %>;
+  --user-role-border: <%= role.color + '80' %>;
+}
+
+<%- end %>
diff --git a/app/views/directories/index.html.haml b/app/views/directories/index.html.haml
deleted file mode 100644
index 04639e32c..000000000
--- a/app/views/directories/index.html.haml
+++ /dev/null
@@ -1,55 +0,0 @@
-- content_for :page_title do
-  = t('directories.explore_mastodon', title: site_title)
-
-- content_for :header_tags do
-  %meta{ name: 'description', content: t('directories.explanation') }
-
-  = opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname)
-  = opengraph 'og:type', 'website'
-  = opengraph 'og:title', t('directories.explore_mastodon', title: site_title)
-  = opengraph 'og:description', t('directories.explanation')
-  = opengraph 'og:image', File.join(root_url, 'android-chrome-192x192.png')
-
-.page-header
-  %h1= t('directories.explore_mastodon', title: site_title)
-  %p= t('directories.explanation')
-
-- if @accounts.empty?
-  = nothing_here
-- else
-  .directory__list
-    - @accounts.each do |account|
-      .directory__card
-        .directory__card__img
-          = image_tag account.header.url, alt: ''
-        .directory__card__bar
-          = link_to TagManager.instance.url_for(account), class: 'directory__card__bar__name' do
-            .avatar
-              = image_tag account.avatar.url, alt: '', class: 'u-photo'
-
-            .display-name
-              %bdi
-                %strong.emojify.p-name= display_name(account, custom_emojify: true)
-              %span= acct(account)
-          .directory__card__bar__relationship.account__relationship
-            = minimal_account_action_button(account)
-
-        .directory__card__extra
-          .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
-
-        .directory__card__extra
-          .accounts-table__count
-            = friendly_number_to_human account.statuses_count
-            %small= t('accounts.posts', count: account.statuses_count).downcase
-          .accounts-table__count
-            = friendly_number_to_human account.followers_count
-            %small= t('accounts.followers', count: account.followers_count).downcase
-          .accounts-table__count
-            - if account.last_status_at.present?
-              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at.to_date
-            - else
-              = t('accounts.never_active')
-
-            %small= t('accounts.last_active')
-
-  = paginate @accounts
diff --git a/app/views/disputes/strikes/index.html.haml b/app/views/disputes/strikes/index.html.haml
new file mode 100644
index 000000000..6789fa405
--- /dev/null
+++ b/app/views/disputes/strikes/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+  = t('settings.strikes')
+
+%p= t('disputes.strikes.description_html', instance: Rails.configuration.x.local_domain)
+
+= render partial: 'auth/registrations/account_warning', collection: @strikes
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
new file mode 100644
index 000000000..cab0a17eb
--- /dev/null
+++ b/app/views/disputes/strikes/show.html.haml
@@ -0,0 +1,126 @@
+- content_for :page_title do
+  = t('disputes.strikes.title', action: t(@strike.action, scope: 'disputes.strikes.title_actions'), date: l(@strike.created_at.to_date))
+
+- content_for :heading_actions do
+  - if @appeal.persisted?
+    = link_to t('disputes.strikes.approve_appeal'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal)
+    = link_to t('disputes.strikes.reject_appeal'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal)
+
+- if @strike.overruled?
+  %p.hint
+    %span.positive-hint
+      = fa_icon 'check'
+      = ' '
+      = t 'disputes.strikes.appeal_approved'
+- elsif @appeal.persisted? && @appeal.rejected?
+  %p.hint
+    %span.negative-hint
+      = fa_icon 'times'
+      = ' '
+      = t 'disputes.strikes.appeal_rejected'
+
+.report-header
+  .report-header__card
+    .strike-card
+      - unless @strike.none_action?
+        %p= t "user_mailer.warning.explanation.#{@strike.action}", instance: Rails.configuration.x.local_domain
+
+      - unless @strike.text.blank?
+        = linkify(@strike.text)
+
+      - if @strike.report && !@strike.report.other?
+        %p
+          %strong= t('user_mailer.warning.reason')
+          = t("user_mailer.warning.categories.#{@strike.report.category}")
+
+        - if @strike.report.violation? && @strike.report.rule_ids.present?
+          %ul.strike-card__rules
+            - @strike.report.rules.each do |rule|
+              %li
+                %span.strike-card__rules__text= rule.text
+
+      - if @strike.status_ids.present? && !@strike.status_ids.empty?
+        %p
+          %strong= t('user_mailer.warning.statuses')
+
+        .strike-card__statuses-list
+          - status_map = @strike.statuses.includes(:application, :media_attachments).index_by(&:id)
+
+          - @strike.status_ids.each do |status_id|
+            .strike-card__statuses-list__item
+              - if (status = status_map[status_id.to_i])
+                .one-liner
+                  = link_to short_account_status_url(@strike.target_account, status_id), class: 'emojify' do
+                    = one_line_preview(status)
+
+                    - status.ordered_media_attachments.each do |media_attachment|
+                      %abbr{ title: media_attachment.description }
+                        = fa_icon 'link'
+                        = media_attachment.file_file_name
+                .strike-card__statuses-list__item__meta
+                  %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+                  - unless status.application.nil?
+                    ·
+                    = status.application.name
+              - else
+                .one-liner= t('disputes.strikes.status', id: status_id)
+                .strike-card__statuses-list__item__meta
+                  = t('disputes.strikes.status_removed')
+
+  .report-header__details
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('disputes.strikes.created_at')
+      .report-header__details__item__content
+        %time.formatted{ datetime: @strike.created_at.iso8601, title: l(@strike.created_at) }= l(@strike.created_at)
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('disputes.strikes.recipient')
+      .report-header__details__item__content
+        = link_to @strike.target_account.username, can?(:show, @strike.target_account) ? admin_account_path(@strike.target_account_id) : ActivityPub::TagManager.instance.url_for(@strike.target_account), class: 'table-action-link'
+    .report-header__details__item
+      .report-header__details__item__header
+        %strong= t('disputes.strikes.action_taken')
+      .report-header__details__item__content
+        - if @strike.overruled?
+          %del= t(@strike.action, scope: 'user_mailer.warning.title')
+        - else
+          = t(@strike.action, scope: 'user_mailer.warning.title')
+    - if @strike.report && can?(:show, @strike.report)
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('disputes.strikes.associated_report')
+        .report-header__details__item__content
+          = link_to t('admin.reports.report', id: @strike.report.id), admin_report_path(@strike.report), class: 'table-action-link'
+    - if @appeal.persisted?
+      .report-header__details__item
+        .report-header__details__item__header
+          %strong= t('disputes.strikes.appeal_submitted_at')
+        .report-header__details__item__content
+          %time.formatted{ datetime: @appeal.created_at.iso8601, title: l(@appeal.created_at) }= l(@appeal.created_at)
+%hr.spacer/
+
+- if @appeal.persisted?
+  %h3= t('disputes.strikes.appeal')
+
+  .report-notes
+    .report-notes__item
+      = image_tag @appeal.account.avatar.url, class: 'report-notes__item__avatar'
+
+      .report-notes__item__header
+        %span.username
+          = link_to @appeal.account.username, can?(:show, @appeal.account) ? admin_account_path(@appeal.account_id) : short_account_url(@appeal.account)
+        %time.relative-formatted{ datetime: @appeal.created_at.iso8601 }
+          = t('admin.report_notes.created_at')
+
+      .report-notes__item__content
+        = simple_format(h(@appeal.text))
+- elsif can?(:appeal, @strike)
+  %h3= t('disputes.strikes.appeals.submit')
+
+  = simple_form_for(@appeal, url: disputes_strike_appeal_path(@strike)) do |f|
+    .fields-group
+      = f.input :text, wrapper: :with_label, input_html: { maxlength: 500 }
+
+    .actions
+      = f.button :button, t('disputes.strikes.appeals.submit'), type: :submit
diff --git a/app/views/filters/_fields.html.haml b/app/views/filters/_fields.html.haml
deleted file mode 100644
index 84dcdcca5..000000000
--- a/app/views/filters/_fields.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-.fields-row
-  .fields-row__column.fields-row__column-6.fields-group
-    = f.input :phrase, as: :string, wrapper: :with_label, hint: false
-  .fields-row__column.fields-row__column-6.fields-group
-    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
-
-.fields-group
-  = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: lambda { |context| I18n.t("filters.contexts.#{context}") }, include_blank: false
-
-%hr.spacer/
-
-.fields-group
-  = f.input :irreversible, wrapper: :with_label
-
-.fields-group
-  = f.input :whole_word, wrapper: :with_label
diff --git a/app/views/filters/_filter.html.haml b/app/views/filters/_filter.html.haml
new file mode 100644
index 000000000..9993ad2ee
--- /dev/null
+++ b/app/views/filters/_filter.html.haml
@@ -0,0 +1,41 @@
+.filters-list__item{ class: [filter.expired? && 'expired'] }
+  = link_to edit_filter_path(filter), class: 'filters-list__item__title' do
+    = filter.title
+
+    - if filter.expires?
+      .expiration{ title: t('filters.index.expires_on', date: l(filter.expires_at)) }
+        - if filter.expired?
+          = t('invites.expired')
+        - else
+          = t('filters.index.expires_in', distance: distance_of_time_in_words_to_now(filter.expires_at))
+
+  .filters-list__item__permissions
+    %ul.permissions-list
+      - unless filter.keywords.empty?
+        %li.permissions-list__item
+          .permissions-list__item__icon
+            = fa_icon('paragraph')
+          .permissions-list__item__text
+            .permissions-list__item__text__title
+              = t('filters.index.keywords', count: filter.keywords.size)
+            .permissions-list__item__text__type
+              - keywords = filter.keywords.map(&:keyword)
+              - keywords = keywords.take(5) + ['…'] if keywords.size > 5 # TODO
+              = keywords.join(', ')
+      - unless filter.statuses.empty?
+        %li.permissions-list__item
+          .permissions-list__item__icon
+            = fa_icon('comment')
+          .permissions-list__item__text
+            .permissions-list__item__text__title
+              = t('filters.index.statuses', count: filter.statuses.size)
+            .permissions-list__item__text__type
+              = t('filters.index.statuses_long', count: filter.statuses.size)
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      = t('filters.index.contexts', contexts: filter.context.map { |context| I18n.t("filters.contexts.#{context}") }.join(', '))
+
+    %div
+      = table_link_to 'pencil', t('filters.edit.title'), edit_filter_path(filter)
+      = table_link_to 'times', t('filters.index.delete'), filter_path(filter), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
new file mode 100644
index 000000000..c58978f5a
--- /dev/null
+++ b/app/views/filters/_filter_fields.html.haml
@@ -0,0 +1,40 @@
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :title, as: :string, wrapper: :with_label, hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+
+.fields-group
+  = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: lambda { |context| I18n.t("filters.contexts.#{context}") }, include_blank: false
+
+%hr.spacer/
+
+.fields-group
+  = f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { safe_join([t("simple_form.labels.filters.actions.#{action}"), content_tag(:span, t("simple_form.hints.filters.actions.#{action}"), class: 'hint')]) }, hint: t('simple_form.hints.filters.action'), required: true
+
+%hr.spacer/
+
+- unless f.object.statuses.empty?
+  %h4= t('filters.edit.statuses')
+
+  %p.muted-hint= t('filters.edit.statuses_hint_html', path: filter_statuses_path(f.object))
+
+  %hr.spacer/
+
+%h4= t('filters.edit.keywords')
+
+.table-wrapper
+  %table.table.keywords-table
+    %thead
+      %tr
+        %th= t('simple_form.labels.defaults.phrase')
+        %th= t('simple_form.labels.defaults.whole_word')
+        %th
+    %tbody
+      = f.simple_fields_for :keywords do |keyword|
+        = render 'keyword_fields', f: keyword
+    %tfoot
+      %tr
+        %td{ colspan: 3}
+          = link_to_add_association f, :keywords, class: 'table-action-link', partial: 'keyword_fields', 'data-association-insertion-node': '.keywords-table tbody', 'data-association-insertion-method': 'append' do
+            = safe_join([fa_icon('plus'), t('filters.edit.add_keyword')])
diff --git a/app/views/filters/_keyword_fields.html.haml b/app/views/filters/_keyword_fields.html.haml
new file mode 100644
index 000000000..eedd514ef
--- /dev/null
+++ b/app/views/filters/_keyword_fields.html.haml
@@ -0,0 +1,8 @@
+%tr.nested-fields
+  %td= f.input :keyword, as: :string
+  %td
+    .label_input__wrapper= f.input_field :whole_word
+  %td
+    = f.hidden_field :id if f.object&.persisted? # Required so Rails doesn't put the field outside of the <tr/>
+    = link_to_remove_association(f, class: 'table-action-link') do
+      = safe_join([fa_icon('times'), t('filters.index.delete')])
diff --git a/app/views/filters/edit.html.haml b/app/views/filters/edit.html.haml
index e971215ac..3dc3f07b7 100644
--- a/app/views/filters/edit.html.haml
+++ b/app/views/filters/edit.html.haml
@@ -2,7 +2,7 @@
   = t('filters.edit.title')
 
 = simple_form_for @filter, url: filter_path(@filter), method: :put do |f|
-  = render 'fields', f: f
+  = render 'filter_fields', f: f
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/filters/index.html.haml b/app/views/filters/index.html.haml
index b4d5333aa..0227526a4 100644
--- a/app/views/filters/index.html.haml
+++ b/app/views/filters/index.html.haml
@@ -7,18 +7,5 @@
 - if @filters.empty?
   %div.muted-hint.center-text= t 'filters.index.empty'
 - else
-  .table-wrapper
-    %table.table
-      %thead
-        %tr
-          %th= t('simple_form.labels.defaults.phrase')
-          %th= t('simple_form.labels.defaults.context')
-          %th
-      %tbody
-        - @filters.each do |filter|
-          %tr
-            %td= filter.phrase
-            %td= filter.context.map { |context| I18n.t("filters.contexts.#{context}") }.join(', ')
-            %td
-              = table_link_to 'pencil', t('filters.edit.title'), edit_filter_path(filter)
-              = table_link_to 'times', t('filters.index.delete'), filter_path(filter), method: :delete
+  .applications-list
+    = render partial: 'filter', collection: @filters
diff --git a/app/views/filters/new.html.haml b/app/views/filters/new.html.haml
index 05bec343f..5f400e604 100644
--- a/app/views/filters/new.html.haml
+++ b/app/views/filters/new.html.haml
@@ -2,7 +2,7 @@
   = t('filters.new.title')
 
 = simple_form_for @filter, url: filters_path do |f|
-  = render 'fields', f: f
+  = render 'filter_fields', f: f
 
   .actions
-    = f.button :button, t('filters.new.title'), type: :submit
+    = f.button :button, t('filters.new.save'), type: :submit
diff --git a/app/views/filters/statuses/_status_filter.html.haml b/app/views/filters/statuses/_status_filter.html.haml
new file mode 100644
index 000000000..ba1170cf9
--- /dev/null
+++ b/app/views/filters/statuses/_status_filter.html.haml
@@ -0,0 +1,37 @@
+- status = status_filter.status.proper
+
+.batch-table__row
+  %label.batch-table__row__select.batch-checkbox
+    = f.check_box :status_filter_ids, { multiple: true, include_hidden: false }, status_filter.id
+  .batch-table__row__content
+    .status__content><
+      - if status.spoiler_text.blank?
+        = prerender_custom_emojis(status_content_format(status), status.emojis)
+      - else
+        %details<
+          %summary><
+            %strong> Content warning: #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
+          = prerender_custom_emojis(status_content_format(status), status.emojis)
+
+    - status.ordered_media_attachments.each do |media_attachment|
+      %abbr{ title: media_attachment.description }
+        = fa_icon 'link'
+        = media_attachment.file_file_name
+
+    .detailed-status__meta
+      = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'name-tag', target: '_blank', rel: 'noopener noreferrer' do
+        = image_tag(status.account.avatar.url, width: 15, height: 15, alt: display_name(status.account), class: 'avatar')
+        .username= status.account.acct
+      ·
+      = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do
+        %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+      - if status.edited?
+        ·
+        = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted'))
+      ·
+      = fa_visibility_icon(status)
+      = t("statuses.visibilities.#{status.visibility}")
+      - if status.sensitive?
+        ·
+        = fa_icon('eye-slash fw')
+        = t('stream_entries.sensitive_content')
diff --git a/app/views/filters/statuses/index.html.haml b/app/views/filters/statuses/index.html.haml
new file mode 100644
index 000000000..886de58fa
--- /dev/null
+++ b/app/views/filters/statuses/index.html.haml
@@ -0,0 +1,38 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('filters.statuses.index.title')
+  \-
+  = @filter.title
+
+.filters
+  .back-link
+    = link_to edit_filter_path(@filter) do
+      = fa_icon 'chevron-left fw'
+      = t('filters.statuses.back_to_filter')
+
+%p.hint= t('filters.statuses.index.hint')
+
+%hr.spacer/
+
+= form_for(@status_filter_batch_action, url: batch_filter_statuses_path(@filter.id)) do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  - Admin::StatusFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        - unless @status_filters.empty?
+          = f.button safe_join([fa_icon('times'), t('filters.statuses.batch.remove')]), name: :remove, class: 'table-action-link', type: :submit
+    .batch-table__body
+      - if @status_filters.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'status_filter', collection: @status_filters, locals: { f: f }
+
+= paginate @status_filters
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
index 645dd2de1..d93540c02 100644
--- a/app/views/follower_accounts/index.html.haml
+++ b/app/views/follower_accounts/index.html.haml
@@ -1,20 +1,6 @@
-- content_for :page_title do
-  = t('accounts.people_who_follow', name: display_name(@account))
-
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
+
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
-= render 'accounts/header', account: @account
-
-- if @account.user_hides_network?
-  .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
-  .nothing-here= t('accounts.unavailable')
-- elsif @follows.empty?
-  = nothing_here
-- else
-  .card-grid
-    = render partial: 'application/card', collection: @follows.map(&:account), as: :account
-
-  = paginate @follows
+= render 'shared/web_app'
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
index 17fe79018..d93540c02 100644
--- a/app/views/following_accounts/index.html.haml
+++ b/app/views/following_accounts/index.html.haml
@@ -1,20 +1,6 @@
-- content_for :page_title do
-  = t('accounts.people_followed_by', name: display_name(@account))
-
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
+
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
-= render 'accounts/header', account: @account
-
-- if @account.user_hides_network?
-  .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
-  .nothing-here= t('accounts.unavailable')
-- elsif @follows.empty?
-  = nothing_here
-- else
-  .card-grid
-    = render partial: 'application/card', collection: @follows.map(&:target_account), as: :account
-
-  = paginate @follows
+= render 'shared/web_app'
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 3d6283fba..45990cd10 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,16 +1,7 @@
 - content_for :header_tags do
-  = preload_pack_asset 'features/getting_started.js', crossorigin: 'anonymous'
-  = preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
-  = preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
-  = preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
+  - unless request.path == '/'
+    %meta{ name: 'robots', content: 'noindex' }/
 
-  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
-  = render_initial_state
-  = javascript_pack_tag 'application', crossorigin: 'anonymous'
+  = render partial: 'shared/og'
 
-.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
-  %noscript
-    = image_pack_tag 'logo.svg', alt: 'Mastodon'
-
-    %div
-      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
+= render 'shared/web_app'
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 62716ab1e..e7a163c92 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -8,26 +8,31 @@
       .sidebar-wrapper__inner
         .sidebar
           = link_to root_path do
-            = image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
+            = render_logo
 
           .sidebar__toggle
             .sidebar__toggle__logo
               = link_to root_path do
-                = svg_logo_full
+                = logo_as_symbol(:wordmark)
 
-            = link_to '#', class: 'sidebar__toggle__icon' do
+            = link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do
               = fa_icon 'bars'
+              = fa_icon 'times'
 
           = render_navigation
 
     .content-wrapper
       .content
-        .content-heading
-          %h2= yield :page_title
+        .content__heading
+          - if content_for?(:heading)
+            = yield :heading
+          - else
+            .content__heading__row
+              %h2= yield :page_title
 
-          - if :heading_actions
-            .content-heading-actions
-              = yield :heading_actions
+              - if content_for?(:heading_actions)
+                .content__heading__actions
+                  = yield :heading_actions
 
         = render 'application/flashes'
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f5a963e00..7b9434d6f 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,12 +11,17 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: favicon_path, type: 'image/x-icon' }/
-    %link{ rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' }/
-    %link{ rel: 'mask-icon', href: '/mask-icon.svg', color: '#2B90D9' }/
-    %link{ rel: 'manifest', href: '/manifest.json' }/
-    %meta{ name: 'msapplication-config', content: '/browserconfig.xml' }/
-    %meta{ name: 'theme-color', content: '#282c37' }/
+    %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
+
+    - %w(16 32 48).each do |size|
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+
+    - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
+
+    %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+    %link{ rel: 'manifest', href: manifest_path(format: :json) }/
+    %meta{ name: 'theme-color', content: '#191b22' }/
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
     %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
@@ -29,15 +34,13 @@
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
     = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
-
-    - if Setting.custom_css.present?
-      = stylesheet_link_tag custom_css_path, host: request.host, media: 'all'
+    = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
 
     = yield :header_tags
 
   %body{ class: body_classes }
     = content_for?(:content) ? yield(:content) : yield
 
-    .logo-resources
-      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
-      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
+    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
+      = render_symbol :icon
+      = render_symbol :wordmark
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 0ea3bbe3b..6096eada4 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,7 @@
     .logo-container
       %h1
         = link_to root_path do
-          = svg_logo_full
+          = logo_as_symbol(:wordmark)
 
     .form-container
       = render 'flashes'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 719c21a9a..e74bff9cc 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -20,5 +20,5 @@
   %body.embed
     = yield
 
-    .logo-resources
-      = raw render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+    .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
+      = render_symbol :icon
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 343bcb265..f26de8d99 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -24,7 +24,7 @@
                               %tr
                                 %td.column-cell
                                   = link_to root_url do
-                                    = image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
+                                    = image_tag full_pack_url('media/images/mailer/wordmark.png'), alt: 'Mastodon', height: 34, class: 'logo'
 
     = yield
 
@@ -49,4 +49,4 @@
                                 %p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
                               %td.column-cell.text-right
                                 = link_to root_url do
-                                  = image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24
+                                  = image_tag full_pack_url('media/images/mailer/logo.png'), alt: 'Mastodon', height: 24
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index a2cd1193f..c0ea211ff 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -12,8 +12,9 @@
         = fa_icon 'sign-out'
 
   .container-alt= yield
+
   .modal-layout__mastodon
     %div
-      %img{alt:'', draggable:'false', src:"#{mascot_url}"}
+      %img{alt: '', draggable: 'false', src: mascot_url }
 
 = render template: 'layouts/application'
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
deleted file mode 100644
index bdb8a3a8e..000000000
--- a/app/views/layouts/public.html.haml
+++ /dev/null
@@ -1,58 +0,0 @@
-- content_for :header_tags do
-  = render_initial_state
-  = javascript_pack_tag 'public', crossorigin: 'anonymous'
-
-- content_for :content do
-  .public-layout
-    - unless @hide_navbar
-      .container
-        %nav.header
-          .nav-left
-            = link_to root_url, class: 'brand' do
-              = svg_logo_full
-
-            - unless whitelist_mode?
-              = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
-              = link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
-              = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
-
-          .nav-center
-
-          .nav-right
-            - if user_signed_in?
-              = link_to t('settings.back'), root_url, class: 'nav-link nav-button webapp-btn'
-            - else
-              = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn nav-link nav-button'
-              = link_to t('auth.register'), available_sign_up_path, class: 'webapp-btn nav-link nav-button'
-
-    .container= yield
-
-    .container
-      .footer
-        .grid
-          .column-0
-            %h4= t 'footer.resources'
-            %ul
-              %li= link_to t('about.terms'), terms_path
-              %li= link_to t('about.privacy_policy'), terms_path
-          .column-1
-            %h4= t 'footer.developers'
-            %ul
-              %li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
-              %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
-          .column-2
-            %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
-            = link_to svg_logo, root_url, class: 'brand'
-          .column-3
-            %h4= site_hostname
-            %ul
-              - unless whitelist_mode?
-                %li= link_to t('about.about_this'), about_more_path
-              %li= "v#{Mastodon::Version.to_s}"
-          .column-4
-            %h4= t 'footer.more'
-            %ul
-              %li= link_to t('about.source_code'), Mastodon::Version.source_url
-              %li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
-
-= render template: 'layouts/application'
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index 31460a76e..e7cd5ba3e 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -23,23 +23,23 @@
                                       = image_tag full_asset_url(status.account.avatar.url), alt:''
                                     %td{ align: 'left' }
                                       %bdi= display_name(status.account)
-                                      = "@#{status.account.acct}"
+                                      = "@#{status.account.pretty_acct}"
 
                               - if status.spoiler_text?
                                 %div.auto-dir
                                   %p
-                                    = Formatter.instance.format_spoiler(status)
+                                    = status.spoiler_text
 
                               %div.auto-dir
-                                = Formatter.instance.format(status)
+                                = status_content_format(status)
 
-                                - if status.media_attachments.size > 0
+                                - if status.ordered_media_attachments.size > 0
                                   %p
-                                    - status.media_attachments.each do |a|
+                                    - status.ordered_media_attachments.each do |a|
                                       - if status.local?
                                         = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
                                       - else
                                         = link_to a.remote_url, a.remote_url
 
                               %p.status-footer
-                                = link_to l(status.created_at), web_url("statuses/#{status.id}")
+                                = link_to l(status.created_at), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
index 8999a1f8e..e03e8346c 100644
--- a/app/views/notification_mailer/_status.text.erb
+++ b/app/views/notification_mailer/_status.text.erb
@@ -1,8 +1,8 @@
 <% if status.spoiler_text? %>
-<%= raw status.spoiler_text %>
-----
-
+> <%= raw word_wrap(status.spoiler_text, break_sequence: "\n> ") %>
+> ----
+>
 <% end %>
-<%= raw Formatter.instance.plaintext(status) %>
+> <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>
+<%= raw t('application_mailer.view')%> <%= web_url("@#{status.account.pretty_acct}/#{status.id}") %>
diff --git a/app/views/notification_mailer/digest.html.haml b/app/views/notification_mailer/digest.html.haml
deleted file mode 100644
index a94ace228..000000000
--- a/app/views/notification_mailer/digest.html.haml
+++ /dev/null
@@ -1,44 +0,0 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.darker.hero-with-button
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %h1= t 'notification_mailer.digest.title'
-                              %p.lead= t('notification_mailer.digest.body', since: l((@me.user_current_sign_in_at || @since).to_date, format: :short), instance: site_hostname)
-                              %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to web_url do
-                                        %span= t 'notification_mailer.digest.action'
-
-- @notifications.each_with_index do |n, i|
-  = render 'status', status: n.target_status, i: i
-
-- unless @follows_since.zero?
-  %table.email-table{ cellspacing: 0, cellpadding: 0 }
-    %tbody
-      %tr
-        %td.email-body
-          .email-container
-            %table.content-section{ cellspacing: 0, cellpadding: 0 }
-              %tbody
-                %tr
-                  %td.content-cell.content-start.border-top
-                    .email-row
-                      .col-6
-                        %table.column{ cellspacing: 0, cellpadding: 0 }
-                          %tbody
-                            %tr
-                              %td.column-cell.text-center
-                                %p= t('notification_mailer.digest.new_followers_summary', count: @follows_since)
diff --git a/app/views/notification_mailer/digest.text.erb b/app/views/notification_mailer/digest.text.erb
deleted file mode 100644
index b2c85a9e3..000000000
--- a/app/views/notification_mailer/digest.text.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
-<%= raw t('notification_mailer.digest.body', since: l(@me.user_current_sign_in_at || @since), instance: root_url) %>
-<% @notifications.each do |notification| %>
-
-* <%= raw t('notification_mailer.digest.mention', name: notification.from_account.acct) %>
-
-  <%= raw Formatter.instance.plaintext(notification.target_status) %>
-
-  <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %>
-<% end %>
-<% if @follows_since > 0 %>
-
-<%= raw t('notification_mailer.digest.new_followers_summary', count: @follows_since) %>
-<% end %>
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index a715d615c..5d9be3f57 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -20,7 +20,7 @@
                                       = image_tag full_pack_url('media/images/mailer/icon_grade.png'), alt:''
 
                               %h1= t 'notification_mailer.favourite.title'
-                              %p.lead= t('notification_mailer.favourite.body', name: @account.acct)
+                              %p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)
 
 = render 'status', status: @status
 
@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
                                     %span= t 'application_mailer.view_status'
diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb
index 2581b4909..f4f869656 100644
--- a/app/views/notification_mailer/favourite.text.erb
+++ b/app/views/notification_mailer/favourite.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.favourite.body', name: @account.acct) %>
+<%= raw t('notification_mailer.favourite.body', name: @account.pretty_acct) %>
 
 <%= render 'status', status: @status %>
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index cd84f7858..f250cbbd2 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -20,7 +20,7 @@
                                       = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
 
                               %h1= t 'notification_mailer.follow.title'
-                              %p.lead= t('notification_mailer.follow.body', name: @account.acct)
+                              %p.lead= t('notification_mailer.follow.body', name: @account.pretty_acct)
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
@@ -39,5 +39,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("accounts/#{@account.id}") do
+                                  = link_to web_url("@#{@account.pretty_acct}") do
                                     %span= t 'application_mailer.view_profile'
diff --git a/app/views/notification_mailer/follow.text.erb b/app/views/notification_mailer/follow.text.erb
index cbe46f552..e498df093 100644
--- a/app/views/notification_mailer/follow.text.erb
+++ b/app/views/notification_mailer/follow.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.follow.body', name: @account.acct) %>
+<%= raw t('notification_mailer.follow.body', name: @account.pretty_acct) %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("accounts/#{@account.id}") %>
+<%= raw t('application_mailer.view')%> <%= web_url("@#{@account.pretty_acct}") %>
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index a63e27a90..4c32c831e 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -20,7 +20,7 @@
                                       = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
 
                               %h1= t 'notification_mailer.follow_request.title'
-                              %p.lead= t('notification_mailer.follow_request.body', name: @account.acct)
+                              %p.lead= t('notification_mailer.follow_request.body', name: @account.pretty_acct)
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/notification_mailer/follow_request.text.erb b/app/views/notification_mailer/follow_request.text.erb
index a018394b8..66aa97fe3 100644
--- a/app/views/notification_mailer/follow_request.text.erb
+++ b/app/views/notification_mailer/follow_request.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.follow_request.body', name: @account.acct) %>
+<%= raw t('notification_mailer.follow_request.body', name: @account.pretty_acct) %>
 
 <%= raw t('application_mailer.view')%> <%= web_url("follow_requests") %>
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 619873cfa..4ae9bb7b0 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -20,7 +20,7 @@
                                       = image_tag full_pack_url('media/images/mailer/icon_reply.png'), alt: ''
 
                               %h1= t 'notification_mailer.mention.title'
-                              %p.lead= t('notification_mailer.mention.body', name: @status.account.acct)
+                              %p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)
 
 = render 'status', status: @status
 
@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
                                     %span= t 'notification_mailer.mention.action'
diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb
index 03f53813b..f104d5f92 100644
--- a/app/views/notification_mailer/mention.text.erb
+++ b/app/views/notification_mailer/mention.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.mention.body', name: @status.account.acct) %>
+<%= raw t('notification_mailer.mention.body', name: @status.account.pretty_acct) %>
 
 <%= render 'status', status: @status %>
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index a2811be23..f805c79f0 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -20,7 +20,7 @@
                                       = image_tag full_pack_url('media/images/mailer/icon_cached.png'), alt: ''
 
                               %h1= t 'notification_mailer.reblog.title'
-                              %p.lead= t('notification_mailer.reblog.body', name: @account.acct)
+                              %p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)
 
 = render 'status', status: @status
 
@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
                                     %span= t 'application_mailer.view_status'
diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb
index 8fc841bf6..73a3b3945 100644
--- a/app/views/notification_mailer/reblog.text.erb
+++ b/app/views/notification_mailer/reblog.text.erb
@@ -1,5 +1,5 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.reblog.body', name: @account.acct) %>
+<%= raw t('notification_mailer.reblog.body', name: @account.pretty_acct) %>
 
 <%= render 'status', status: @status %>
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index 05ff9582e..50f671b26 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -1,26 +1,38 @@
 - content_for :page_title do
   = t('doorkeeper.authorizations.new.title')
 
-.form-container
+.form-container.simple_form
   .oauth-prompt
-    %h2= t('doorkeeper.authorizations.new.prompt', client_name: @pre_auth.client.name)
+    %h3= t('doorkeeper.authorizations.new.title')
 
-    %p
-      = t('doorkeeper.authorizations.new.able_to')
-      != @pre_auth.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.map { |s| "<strong>#{s}</strong>" }.to_sentence
+    %p= t('doorkeeper.authorizations.new.prompt_html', client_name: content_tag(:strong, @pre_auth.client.name))
 
-  = form_tag oauth_authorization_path, method: :post, class: 'simple_form' do
-    = hidden_field_tag :client_id, @pre_auth.client.uid
-    = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
-    = hidden_field_tag :state, @pre_auth.state
-    = hidden_field_tag :response_type, @pre_auth.response_type
-    = hidden_field_tag :scope, @pre_auth.scope
-    = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
+    %h3= t('doorkeeper.authorizations.new.review_permissions')
 
-  = form_tag oauth_authorization_path, method: :delete, class: 'simple_form' do
-    = hidden_field_tag :client_id, @pre_auth.client.uid
-    = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
-    = hidden_field_tag :state, @pre_auth.state
-    = hidden_field_tag :response_type, @pre_auth.response_type
-    = hidden_field_tag :scope, @pre_auth.scope
-    = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
+    %ul.permissions-list
+      - grouped_scopes(@pre_auth.scopes).each do |scope|
+        %li.permissions-list__item
+          .permissions-list__item__icon
+            = fa_icon('check')
+          .permissions-list__item__text
+            .permissions-list__item__text__title
+              = t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])
+            .permissions-list__item__text__type
+              = t(scope.access, scope: [:doorkeeper, :grouped_scopes, :access])
+
+    .actions
+      = form_tag oauth_authorization_path, method: :post do
+        = hidden_field_tag :client_id, @pre_auth.client.uid
+        = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
+        = hidden_field_tag :state, @pre_auth.state
+        = hidden_field_tag :response_type, @pre_auth.response_type
+        = hidden_field_tag :scope, @pre_auth.scope
+        = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
+
+      = form_tag oauth_authorization_path, method: :delete do
+        = hidden_field_tag :client_id, @pre_auth.client.uid
+        = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
+        = hidden_field_tag :state, @pre_auth.state
+        = hidden_field_tag :response_type, @pre_auth.response_type
+        = hidden_field_tag :scope, @pre_auth.scope
+        = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index fbb733db4..0280d8aef 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -1,24 +1,44 @@
 - content_for :page_title do
   = t('doorkeeper.authorized_applications.index.title')
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('doorkeeper.authorized_applications.index.application')
-        %th= t('doorkeeper.authorized_applications.index.scopes')
-        %th= t('doorkeeper.authorized_applications.index.created_at')
-        %th
-    %tbody
-      - @applications.each do |application|
-        %tr
-          %td
-            - if application.website.blank?
-              = application.name
-            - else
-              = link_to application.name, application.website, target: '_blank', rel: 'noopener noreferrer'
-          %th!= application.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.join(', ')
-          %td= l application.created_at
-          %td
-            - unless application.superapp? || current_account.suspended?
-              = table_link_to 'times', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
+%p= t('doorkeeper.authorized_applications.index.description_html')
+
+%hr.spacer/
+
+.applications-list
+  - @applications.each do |application|
+    .applications-list__item
+      - if application.website.present?
+        = link_to application.name, application.website, target: '_blank', rel: 'noopener noreferrer', class: 'announcements-list__item__title'
+      - else
+        %strong.announcements-list__item__title
+          = application.name
+          - if application.superapp?
+            %span.account-role.moderator= t('doorkeeper.authorized_applications.index.superapp')
+
+      .announcements-list__item__action-bar
+        .announcements-list__item__meta
+          - if application.most_recently_used_access_token
+            = t('doorkeeper.authorized_applications.index.last_used_at', date: l(application.most_recently_used_access_token.last_used_at.to_date))
+          - else
+            = t('doorkeeper.authorized_applications.index.never_used')
+
+          •
+
+          = t('doorkeeper.authorized_applications.index.authorized_at', date: l(application.created_at.to_date))
+
+        - unless application.superapp? || current_account.suspended?
+          %div
+            = table_link_to 'times', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
+
+      .announcements-list__item__permissions
+        %ul.permissions-list
+          - grouped_scopes(application.scopes).each do |scope|
+            %li.permissions-list__item
+              .permissions-list__item__icon
+                = fa_icon('check')
+              .permissions-list__item__text
+                .permissions-list__item__text__title
+                  = t(scope.key, scope: [:doorkeeper, :grouped_scopes, :title])
+                .permissions-list__item__text__type
+                  = t(scope.access, scope: [:doorkeeper, :grouped_scopes, :access])
diff --git a/app/views/privacy/show.html.haml b/app/views/privacy/show.html.haml
new file mode 100644
index 000000000..95e506641
--- /dev/null
+++ b/app/views/privacy/show.html.haml
@@ -0,0 +1,7 @@
+- content_for :page_title do
+  = t('privacy_policy.title')
+
+- content_for :header_tags do
+  = render partial: 'shared/og'
+
+= render 'shared/web_app'
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml
deleted file mode 100644
index 9254bd348..000000000
--- a/app/views/public_timelines/show.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  = t('about.see_whats_happening')
-
-- content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
-  = javascript_pack_tag 'about', crossorigin: 'anonymous'
-
-.page-header
-  %h1= t('about.see_whats_happening')
-
-  - if Setting.show_known_fediverse_at_about_page
-    %p= t('about.browse_public_posts')
-  - else
-    %p= t('about.browse_local_posts')
-
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
-.notranslate#modal-container
diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml
deleted file mode 100644
index 4e9601f6a..000000000
--- a/app/views/remote_follow/new.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-- content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
-
-.form-container
-  .follow-prompt
-    %h2= t('remote_follow.prompt')
-
-    = render partial: 'application/card', locals: { account: @account }
-
-  = simple_form_for @remote_follow, as: :remote_follow, url: account_remote_follow_path(@account) do |f|
-    = render 'shared/error_messages', object: @remote_follow
-
-    = f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' }
-
-    .actions
-      = f.button :button, t('remote_follow.proceed'), type: :submit
-
-    %p.hint.subtle-hint
-      = t('remote_follow.reason_html', instance: site_hostname)
-      = t('remote_follow.no_account_html', sign_up_path: available_sign_up_path)
diff --git a/app/views/remote_interaction/new.html.haml b/app/views/remote_interaction/new.html.haml
deleted file mode 100644
index 2cc0fcb93..000000000
--- a/app/views/remote_interaction/new.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-- content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
-
-.form-container
-  .follow-prompt
-    %h2= t("remote_interaction.#{@interaction_type}.prompt")
-
-    .public-layout
-      .activity-stream.activity-stream--highlighted
-        = render 'statuses/status', status: @status
-
-  = simple_form_for @remote_follow, as: :remote_follow, url: remote_interaction_path(@status) do |f|
-    = render 'shared/error_messages', object: @remote_follow
-
-    = hidden_field_tag :type, @interaction_type
-
-    = f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' }
-
-    .actions
-      = f.button :button, t("remote_interaction.#{@interaction_type}.proceed"), type: :submit
-
-    %p.hint.subtle-hint
-      = t('remote_follow.reason_html', instance: site_hostname)
-      = t('remote_follow.no_account_html', sign_up_path: available_sign_up_path)
diff --git a/app/views/settings/aliases/index.html.haml b/app/views/settings/aliases/index.html.haml
index 5df0c9669..c618a82f1 100644
--- a/app/views/settings/aliases/index.html.haml
+++ b/app/views/settings/aliases/index.html.haml
@@ -29,5 +29,5 @@
       - else
         - @aliases.each do |account_alias|
           %tr
-            %td= account_alias.acct
+            %td= account_alias.pretty_acct
             %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
diff --git a/app/views/settings/deletes/show.html.haml b/app/views/settings/deletes/show.html.haml
index 08792e0af..2e9785c89 100644
--- a/app/views/settings/deletes/show.html.haml
+++ b/app/views/settings/deletes/show.html.haml
@@ -16,14 +16,14 @@
       %li.positive-hint= t('deletes.warning.email_contact_html', email: Setting.site_contact_email)
       %li.positive-hint= t('deletes.warning.username_available')
 
-  %p.hint= t('deletes.warning.more_details_html', terms_path: terms_path)
+  %p.hint= t('deletes.warning.more_details_html', terms_path: privacy_policy_path)
 
   %hr.spacer/
 
   - if current_user.encrypted_password.present?
-    = f.input :password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_password')
+    = f.input :password, wrapper: :with_block_label, input_html: { autocomplete: 'current-password' }, hint: t('deletes.confirm_password')
   - else
-    = f.input :username, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_username')
+    = f.input :username, wrapper: :with_block_label, input_html: { autocomplete: 'off' }, hint: t('deletes.confirm_username')
 
   .actions
     = f.button :button, t('deletes.proceed'), type: :submit, class: 'negative'
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index 65de7f8f3..078abd788 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -9,7 +9,7 @@
   = render 'shared/error_messages', object: @featured_tag
 
   .fields-group
-    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')
+    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.display_name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')
 
   .actions
     = f.button :button, t('featured_tags.add_new'), type: :submit
@@ -21,11 +21,11 @@
     %div
       %h4
         = fa_icon 'hashtag'
-        = featured_tag.name
+        = featured_tag.display_name
         %small
           - if featured_tag.last_status_at.nil?
             = t('accounts.nothing_here')
           - else
-            %time{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
+            %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
           = table_link_to 'trash', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
       .trends__item__current= friendly_number_to_human featured_tag.statuses_count
diff --git a/app/views/settings/migration/redirects/new.html.haml b/app/views/settings/migration/redirects/new.html.haml
index 017450f4b..370087879 100644
--- a/app/views/settings/migration/redirects/new.html.haml
+++ b/app/views/settings/migration/redirects/new.html.haml
@@ -19,9 +19,9 @@
 
     .fields-row__column.fields-group.fields-row__column-6
       - if current_user.encrypted_password.present?
-        = f.input :current_password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, required: true
+        = f.input :current_password, wrapper: :with_block_label, input_html: { autocomplete: 'current-password' }, required: true
       - else
-        = f.input :current_username, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, required: true
+        = f.input :current_username, wrapper: :with_block_label, input_html: { autocomplete: 'off' }, required: true
 
   .actions
     = f.button :button, t('migrations.set_redirect'), type: :submit, class: 'button button--destructive'
diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml
index 078eaebc6..31f7d5e58 100644
--- a/app/views/settings/migrations/show.html.haml
+++ b/app/views/settings/migrations/show.html.haml
@@ -8,7 +8,7 @@
         = render 'application/card', account: current_account.moved_to_account
       .fields-row__column.fields-group.fields-row__column-6
         %p.hint
-          %span.positive-hint= t('migrations.redirecting_to', acct: current_account.moved_to_account.acct)
+          %span.positive-hint= t('migrations.redirecting_to', acct: current_account.moved_to_account.pretty_acct)
 
         %p.hint= t('migrations.cancel_explanation')
 
@@ -48,9 +48,9 @@
 
     .fields-row__column.fields-group.fields-row__column-6
       - if current_user.encrypted_password.present?
-        = f.input :current_password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, required: true, disabled: on_cooldown?
+        = f.input :current_password, wrapper: :with_block_label, input_html: { autocomplete: 'current-password' }, required: true, disabled: on_cooldown?
       - else
-        = f.input :current_username, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, required: true, disabled: on_cooldown?
+        = f.input :current_username, wrapper: :with_block_label, input_html: { autocomplete: 'off' }, required: true, disabled: on_cooldown?
 
   .actions
     = f.button :button, t('migrations.proceed_with_move'), type: :submit, class: 'button button--destructive', disabled: on_cooldown?
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 14941d5fd..9e3964f21 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -7,7 +7,7 @@
 = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
+      = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
     .fields-group.fields-row__column.fields-row__column-6
       = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
 
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index d7cc1ed5d..f00dbadd4 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -18,15 +18,13 @@
       = ff.input :reblog, as: :boolean, wrapper: :with_label
       = ff.input :favourite, as: :boolean, wrapper: :with_label
       = ff.input :mention, as: :boolean, wrapper: :with_label
-
-      - if current_user.staff?
-        = ff.input :report, as: :boolean, wrapper: :with_label
-        = ff.input :pending_account, as: :boolean, wrapper: :with_label
-        = ff.input :trending_tag, as: :boolean, wrapper: :with_label
+      = ff.input :report, as: :boolean, wrapper: :with_label if current_user.can?(:manage_reports)
+      = ff.input :appeal, as: :boolean, wrapper: :with_label if current_user.can?(:manage_appeals)
+      = ff.input :pending_account, as: :boolean, wrapper: :with_label if current_user.can?(:manage_users)
+      = ff.input :trending_tag, as: :boolean, wrapper: :with_label if current_user.can?(:manage_taxonomies)
 
   .fields-group
-    = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
-      = ff.input :digest, as: :boolean, wrapper: :with_label
+    = f.input :setting_always_send_emails, as: :boolean, wrapper: :with_label
 
   %h4= t 'notifications.other_settings'
 
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 539a70056..44f4af2eb 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -10,9 +10,6 @@
   .fields-group
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
 
-  .fields-group
-    = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
-
   .fields-group
     = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
 
@@ -23,7 +20,7 @@
       = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false
 
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false, hint: false
+      = f.input :setting_default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false
 
   .fields-group
     = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
@@ -34,7 +31,7 @@
   %h4= t 'preferences.public_timelines'
 
   .fields-group
-    = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+    = f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index d325a9ea5..3067b3737 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -30,7 +30,10 @@
     = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
 
   .fields-group
-    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t(Setting.profile_directory ? 'simple_form.hints.defaults.discoverable' : 'simple_form.hints.defaults.discoverable_no_directory'), recommended: true
+    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
+
+  .fields-group
+    = f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network')
 
   %hr.spacer/
 
@@ -67,8 +70,7 @@
 %h6= t 'migrations.incoming_migrations'
 %p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
 
-- if open_deletion?
-  %hr.spacer/
+%hr.spacer/
 
-  %h6= t('auth.delete_account')
-  %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
+%h6= t('auth.delete_account')
+%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
index 671237db5..43830ac27 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -12,7 +12,7 @@
       %samp.qr-alternative__code= @new_otp_secret.scan(/.{4}/).join(' ')
 
   .fields-group
-    = f.input :otp_attempt, wrapper: :with_label, hint: t('otp_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
+    = f.input :otp_attempt, wrapper: :with_label, hint: t('otp_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { autocomplete: 'off' }, required: true
 
   .actions
     = f.button :button, t('otp_authentication.enable'), type: :submit
diff --git a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
index 1148d5ed7..5e9d22571 100644
--- a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
@@ -8,7 +8,7 @@
   %p.hint= t('webauthn_credentials.description_html')
 
   .fields_group
-    = f.input :nickname, wrapper: :with_block_label, hint: t('webauthn_credentials.nickname_hint'), input_html: { :autocomplete => 'off' }, required: true
+    = f.input :nickname, wrapper: :with_block_label, hint: t('webauthn_credentials.nickname_hint'), input_html: { autocomplete: 'off' }, required: true
 
   .actions
     = f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index c8f12974e..2941b566e 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -1,14 +1,14 @@
 - thumbnail     = @instance_presenter.thumbnail
-- description ||= strip_tags(@instance_presenter.site_short_description.presence || t('about.about_mastodon_html'))
+- description ||= strip_tags(@instance_presenter.description.presence || t('about.about_mastodon_html'))
 
 %meta{ name: 'description', content: description }/
 
 = opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname)
 = opengraph 'og:url', url_for(only_path: false)
 = opengraph 'og:type', 'website'
-= opengraph 'og:title', @instance_presenter.site_title
+= opengraph 'og:title', @instance_presenter.title
 = opengraph 'og:description', description
-= opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg', protocol: :request))
+= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png', protocol: :request))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
 = opengraph 'twitter:card', 'summary_large_image'
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
new file mode 100644
index 000000000..998cee9fa
--- /dev/null
+++ b/app/views/shared/_web_app.html.haml
@@ -0,0 +1,17 @@
+- content_for :header_tags do
+  - if user_signed_in?
+    = preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
+    = preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
+    = preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
+
+  %meta{ name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key }
+
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
+
+.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
+
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index 6b3b81306..bf498e33d 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -15,20 +15,21 @@
 
   = account_action_button(status.account)
 
-  .status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
+  .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
     - if status.spoiler_text?
       %p<
-        %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: prefers_autoplay?)}&nbsp;
+        %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content
-      = Formatter.instance.format(status, custom_emojify: true, autoplay: prefers_autoplay?)
+    .e-content{ lang: status.language }
+      = prerender_custom_emojis(status_content_format(status), status.emojis)
+
       - if status.preloadable_poll
         = render_poll_component(status)
 
-  - if !status.media_attachments.empty?
-    - if status.media_attachments.first.video?
+  - if !status.ordered_media_attachments.empty?
+    - if status.ordered_media_attachments.first.video?
       = render_video_component(status, width: 670, height: 380, detailed: true)
-    - elsif status.media_attachments.first.audio?
+    - elsif status.ordered_media_attachments.first.audio?
       = render_audio_component(status, width: 670, height: 380)
     - else
       = render_media_gallery_component(status, height: 380, standalone: true)
@@ -37,20 +38,25 @@
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
+    - if status.edited?
+      %data.dt-updated{ value: status.edited_at.to_time.iso8601 }
 
     = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
       %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
     ·
+    - if status.edited?
+      = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted'))
+      ·
     %span.detailed-status__visibility-icon
       = visibility_icon status
     ·
-    - if status.application && @account.user&.setting_show_application
+    - if status.application && status.account.user&.setting_show_application
       - if status.application.website.blank?
         %strong.detailed-status__application= status.application.name
       - else
         = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener noreferrer'
       ·
-    = link_to remote_interaction_path(status, type: :reply), class: 'modal-button detailed-status__link' do
+    %span.detailed-status__link
       - if status.in_reply_to_id.nil?
         = fa_icon('reply')
       - else
@@ -59,16 +65,16 @@
       = " "
     ·
     - if status.public_visibility? || status.unlisted_visibility?
-      = link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link' do
+      %span.detailed-status__link
         = fa_icon('retweet')
         %span.detailed-status__reblogs>= friendly_number_to_human status.reblogs_count
         = " "
       ·
-    = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do
+    %span.detailed-status__link
       = fa_icon('star')
       %span.detailed-status__favorites>= friendly_number_to_human status.favourites_count
       = " "
 
     - if user_signed_in?
       ·
-      = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank'
+      = link_to t('statuses.open_in_web'), web_url("@#{status.account.pretty_acct}/#{status.id}"), class: 'detailed-status__application', target: '_blank'
diff --git a/app/views/statuses/_og_image.html.haml b/app/views/statuses/_og_image.html.haml
index c8b6147ef..5a647531a 100644
--- a/app/views/statuses/_og_image.html.haml
+++ b/app/views/statuses/_og_image.html.haml
@@ -1,6 +1,6 @@
 - if activity.is_a?(Status) && (activity.non_sensitive_with_media? || (activity.with_media? && Setting.preview_sensitive_media))
   - player_card = false
-  - activity.media_attachments.each do |media|
+  - activity.ordered_media_attachments.each do |media|
     - if media.image?
       = opengraph 'og:image', full_asset_url(media.file.url(:original))
       = opengraph 'og:image:type', media.file_content_type
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
index 3546a923e..d0f264095 100644
--- a/app/views/statuses/_poll.html.haml
+++ b/app/views/statuses/_poll.html.haml
@@ -12,7 +12,7 @@
             %span.poll__number><
               = "#{percent.round}%"
             %span.poll__option__text
-              = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?)
+              = prerender_custom_emojis(h(option.title), status.emojis)
             - if own_votes.include?(index)
               %span.poll__voted
                 %i.poll__voted__mark.fa.fa-check
@@ -23,7 +23,7 @@
           %label.poll__option><
             %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
             %span.poll__option__text
-              = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?)
+              = prerender_custom_emojis(h(option.title), status.emojis)
   .poll__footer
     - unless show_results
       %button.button.button-secondary{ disabled: true }
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 728e6b9b0..32584c92a 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -7,6 +7,9 @@
       %span.status__visibility-icon><
         = visibility_icon status
       %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+      - if status.edited?
+        %abbr{ title: t('statuses.edited_at_html', date: l(status.edited_at.to_date)) }
+          *
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
 
     .p-author.h-card
@@ -24,20 +27,21 @@
           %span.display-name__account
             = acct(status.account)
             = fa_icon('lock') if status.account.locked?
-  .status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
+  .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
     - if status.spoiler_text?
       %p<
-        %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: prefers_autoplay?)}&nbsp;
+        %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}&nbsp;
         %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content
-      = Formatter.instance.format(status, custom_emojify: true, autoplay: prefers_autoplay?)
+    .e-content{ lang: status.language }
+      = prerender_custom_emojis(status_content_format(status), status.emojis)
+
       - if status.preloadable_poll
         = render_poll_component(status)
 
-  - if !status.media_attachments.empty?
-    - if status.media_attachments.first.video?
+  - if !status.ordered_media_attachments.empty?
+    - if status.ordered_media_attachments.first.video?
       = render_video_component(status, width: 610, height: 343)
-    - elsif status.media_attachments.first.audio?
+    - elsif status.ordered_media_attachments.first.audio?
       = render_audio_component(status, width: 610, height: 343)
     - else
       = render_media_gallery_component(status, height: 343)
@@ -49,18 +53,18 @@
       = t 'statuses.show_thread'
 
   .status__action-bar
-    = link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button icon-button--with-counter modal-button' do
+    %span.status__action-bar-button.icon-button.icon-button--with-counter
       - if status.in_reply_to_id.nil?
         = fa_icon 'reply fw'
       - else
         = fa_icon 'reply-all fw'
       %span.icon-button__counter= obscured_counter status.replies_count
-    = link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button' do
+    %span.status__action-bar-button.icon-button
       - if status.distributable?
         = fa_icon 'retweet fw'
       - elsif status.private_visibility? || status.limited_visibility?
         = fa_icon 'lock fw'
       - else
-        = fa_icon 'envelope fw'
-    = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button' do
+        = fa_icon 'at fw'
+    %span.status__action-bar-button.icon-button
       = fa_icon 'star fw'
diff --git a/app/views/statuses/_status.html.haml b/app/views/statuses/_status.html.haml
index 9f3197d0d..3b7152753 100644
--- a/app/views/statuses/_status.html.haml
+++ b/app/views/statuses/_status.html.haml
@@ -56,6 +56,6 @@
 
 - if include_threads && !embedded_view? && !user_signed_in?
   .entry{ class: entry_classes }
-    = link_to new_user_session_path, class: 'load-more load-gap' do
+    = link_to_login class: 'load-more load-gap' do
       = fa_icon 'comments'
       = t('statuses.sign_in_to_participate')
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 7ef7b09a2..cb6b4c619 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -2,7 +2,7 @@
   = t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false))
 
 - content_for :header_tags do
-  - if @account.user&.setting_noindex
+  - if @account.user_prefers_noindex?
     %meta{ name: 'robots', content: 'noindex, noarchive' }/
 
   %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: short_account_status_url(@account, @status), format: 'json') }/
@@ -13,13 +13,9 @@
   = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
   = opengraph 'og:url', short_account_status_url(@account, @status)
   = opengraph 'og:published_time', @status.created_at.iso8601
+  = opengraph 'profile:username', acct(@account)[1..-1]
 
   = render 'og_description', activity: @status
   = render 'og_image', activity: @status, account: @account
 
-.grid
-  .column-0
-    .activity-stream.h-entry
-      = render partial: 'status', locals: { status: @status, include_threads: true }
-  .column-1
-    = render 'application/sidebar'
+= render 'shared/web_app'
diff --git a/app/views/tags/_og.html.haml b/app/views/tags/_og.html.haml
deleted file mode 100644
index a7c289bcb..000000000
--- a/app/views/tags/_og.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-= opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname)
-= opengraph 'og:url', tag_url(@tag)
-= opengraph 'og:type', 'website'
-= opengraph 'og:title', "##{@tag.name}"
-= opengraph 'og:description', strip_tags(t('about.about_hashtag_html', hashtag: @tag.name))
-= opengraph 'twitter:card', 'summary'
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 5cd513b32..4b4967a8f 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -1,16 +1,5 @@
-- content_for :page_title do
-  = "##{@tag.name}"
-
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
-  %link{ rel: 'alternate', type: 'application/rss+xml', href: tag_url(@tag, format: 'rss') }/
+  = render partial: 'shared/og'
 
-  = javascript_pack_tag 'about', crossorigin: 'anonymous'
-  = render 'og'
-
-.page-header
-  %h1= "##{@tag.name}"
-  %p= t('about.about_hashtag_html', hashtag: @tag.name)
-
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }}
-.notranslate#modal-container
+= render partial: 'shared/web_app'
diff --git a/app/views/tags/show.rss.ruby b/app/views/tags/show.rss.ruby
new file mode 100644
index 000000000..8e0c2327b
--- /dev/null
+++ b/app/views/tags/show.rss.ruby
@@ -0,0 +1,33 @@
+RSS::Builder.build do |doc|
+  doc.title("##{@tag.display_name}")
+  doc.description(I18n.t('rss.descriptions.tag', hashtag: @tag.display_name))
+  doc.link(tag_url(@tag))
+  doc.last_build_date(@statuses.first.created_at) if @statuses.any?
+  doc.generator("Mastodon v#{Mastodon::Version.to_s}")
+
+  @statuses.each do |status|
+    doc.item do |item|
+      item.link(ActivityPub::TagManager.instance.url_for(status))
+      item.pub_date(status.created_at)
+      item.description(rss_status_content_format(status))
+
+      if status.ordered_media_attachments.first&.audio?
+        media = status.ordered_media_attachments.first
+        item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
+      end
+
+      status.ordered_media_attachments.each do |media|
+        item.media_content(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size) do |media_content|
+          media_content.medium(media.gifv? ? 'image' : media.type.to_s)
+          media_content.rating(status.sensitive? ? 'adult' : 'nonadult')
+          media_content.description(media.description) if media.description.present?
+          media_content.thumbnail(media.thumbnail.url(:original, false)) if media.thumbnail?
+        end
+      end
+
+      status.tags.each do |tag|
+        item.category(tag.display_name)
+      end
+    end
+  end
+end
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
new file mode 100644
index 000000000..962cab2e2
--- /dev/null
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -0,0 +1,59 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
+
+                              %h1= t 'user_mailer.appeal_approved.title'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center
+                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to root_url do
+                                    %span= t 'user_mailer.appeal_approved.action'
diff --git a/app/views/user_mailer/appeal_approved.text.erb b/app/views/user_mailer/appeal_approved.text.erb
new file mode 100644
index 000000000..290fa24c3
--- /dev/null
+++ b/app/views/user_mailer/appeal_approved.text.erb
@@ -0,0 +1,7 @@
+<%= t 'user_mailer.appeal_approved.title' %>
+
+===
+
+<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+
+=> <%= root_url %>
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
new file mode 100644
index 000000000..75cd9d023
--- /dev/null
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -0,0 +1,59 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.hero
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center.padded
+                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('media/images/mailer/icon_warning.png'), alt: ''
+
+                              %h1= t 'user_mailer.appeal_rejected.title'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell.content-start
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center
+                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+  %tbody
+    %tr
+      %td.email-body
+        .email-container
+          %table.content-section{ cellspacing: 0, cellpadding: 0 }
+            %tbody
+              %tr
+                %td.content-cell
+                  %table.column{ cellspacing: 0, cellpadding: 0 }
+                    %tbody
+                      %tr
+                        %td.column-cell.button-cell
+                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                            %tbody
+                              %tr
+                                %td.button-primary
+                                  = link_to root_url do
+                                    %span= t 'user_mailer.appeal_approved.action'
diff --git a/app/views/user_mailer/appeal_rejected.text.erb b/app/views/user_mailer/appeal_rejected.text.erb
new file mode 100644
index 000000000..f47a76818
--- /dev/null
+++ b/app/views/user_mailer/appeal_rejected.text.erb
@@ -0,0 +1,7 @@
+<%= t 'user_mailer.appeal_rejected.title' %>
+
+===
+
+<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+
+=> <%= root_url %>
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 39a83faff..447e689b4 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -77,4 +77,4 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url
+                              %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url
diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb
index aad91cd9d..a1b2ba7d2 100644
--- a/app/views/user_mailer/confirmation_instructions.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@@ -6,7 +6,7 @@
 
 => <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>
 
-<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url)) %>
+<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url)) %>
 
 => <%= about_more_url %>
-=> <%= terms_url %>
+=> <%= privacy_policy_url %>
diff --git a/app/views/user_mailer/sign_in_token.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
similarity index 55%
rename from app/views/user_mailer/sign_in_token.html.haml
rename to app/views/user_mailer/suspicious_sign_in.html.haml
index 826b34e7c..856f9fb7c 100644
--- a/app/views/user_mailer/sign_in_token.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -13,32 +13,14 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                              %table.hero-icon.warning-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
+                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
 
-                              %h1= t 'user_mailer.sign_in_token.title'
-                              %p.lead= t 'user_mailer.sign_in_token.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.input-cell
-                          %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td= @resource.sign_in_token
+                              %h1= t 'user_mailer.suspicious_sign_in.title'
+                              %p= t 'user_mailer.suspicious_sign_in.explanation'
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
@@ -55,7 +37,7 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.sign_in_token.details'
+                              %p= t 'user_mailer.suspicious_sign_in.details'
                           %tr
                             %td.column-cell.text-center
                               %p
@@ -82,24 +64,4 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.sign_in_token.further_actions'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t 'settings.account_settings'
+                              %p= t 'user_mailer.suspicious_sign_in.further_actions_html', action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/sign_in_token.text.erb b/app/views/user_mailer/suspicious_sign_in.text.erb
similarity index 56%
rename from app/views/user_mailer/sign_in_token.text.erb
rename to app/views/user_mailer/suspicious_sign_in.text.erb
index 2539ddaf6..7d2ca28e8 100644
--- a/app/views/user_mailer/sign_in_token.text.erb
+++ b/app/views/user_mailer/suspicious_sign_in.text.erb
@@ -1,17 +1,15 @@
-<%= t 'user_mailer.sign_in_token.title' %>
+<%= t 'user_mailer.suspicious_sign_in.title' %>
 
 ===
 
-<%= t 'user_mailer.sign_in_token.explanation' %>
+<%= t 'user_mailer.suspicious_sign_in.explanation' %>
 
-=> <%= @resource.sign_in_token %>
-
-<%= t 'user_mailer.sign_in_token.details' %>
+<%= t 'user_mailer.suspicious_sign_in.details' %>
 
 <%= t('sessions.ip') %>: <%= @remote_ip %>
 <%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
 <%= l(@timestamp) %>
 
-<%= t 'user_mailer.sign_in_token.further_actions' %>
+<%= t 'user_mailer.suspicious_sign_in.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
 
 => <%= edit_user_registration_url %>
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 5a2911ecb..b9422e950 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -17,7 +17,7 @@
                                 %tbody
                                   %tr
                                     %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_warning.png'), alt: ''
+                                      = image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
 
                               %h1= t "user_mailer.warning.title.#{@warning.action}"
 
@@ -37,16 +37,26 @@
                           %tr
                             %td.column-cell.text-center
                               - unless @warning.none_action?
-                                %p= t "user_mailer.warning.explanation.#{@warning.action}"
+                                %p= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance
 
                               - unless @warning.text.blank?
-                                = Formatter.instance.linkify(@warning.text)
+                                = linkify(@warning.text)
 
-                              - if !@statuses.nil? && !@statuses.empty?
+                              - if @warning.report && !@warning.report.other?
+                                %p
+                                  %strong= t('user_mailer.warning.reason')
+                                  = t("user_mailer.warning.categories.#{@warning.report.category}")
+
+                                - if @warning.report.violation? && @warning.report.rule_ids.present?
+                                  %ul.rules-list
+                                    - @warning.report.rules.each do |rule|
+                                      %li= rule.text
+
+                              - unless @statuses.empty?
                                 %p
                                   %strong= t('user_mailer.warning.statuses')
 
-- if !@statuses.nil? && !@statuses.empty?
+- unless @statuses.empty?
   - @statuses.each_with_index do |status, i|
     = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true
 
@@ -67,8 +77,8 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to about_more_url do
-                                    %span= t 'user_mailer.warning.review_server_policies'
+                                  = link_to disputes_strike_url(@warning) do
+                                    %span= t 'user_mailer.warning.appeal'
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
@@ -85,4 +95,4 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.warning.get_in_touch', instance: @instance
+                              %p= t 'user_mailer.warning.appeal_description', instance: @instance
diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb
index bb6610c79..1f410f441 100644
--- a/app/views/user_mailer/warning.text.erb
+++ b/app/views/user_mailer/warning.text.erb
@@ -3,11 +3,24 @@
 ===
 
 <% unless @warning.none_action? %>
-<%= t "user_mailer.warning.explanation.#{@warning.action}" %>
+<%= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance %>
 
 <% end %>
+<% if @warning.text.present? %>
 <%= @warning.text %>
-<% if !@statuses.nil? && !@statuses.empty? %>
+
+<% end %>
+<% if @warning.report && !@warning.report.other? %>
+**<%= t('user_mailer.warning.reason') %>** <%= t("user_mailer.warning.categories.#{@warning.report.category}") %>
+
+<% if @warning.report.violation? && @warning.report.rule_ids.present? %>
+<% @warning.report.rules.each do |rule| %>
+- <%= rule.text %>
+<% end %>
+
+<% end %>
+<% end %>
+<% if !@statuses.empty? %>
 <%= t('user_mailer.warning.statuses') %>
 
 <% @statuses.each do |status| %>
@@ -19,4 +32,5 @@
 ---
 <% end %>
 
-<%= t 'user_mailer.warning.get_in_touch', instance: @instance %>
+<%= t 'user_mailer.warning.appeal_description', instance: @instance %>
+<%= disputes_strike_url(@warning) %>
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 1f75ff48a..3ab994ad3 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -76,26 +76,7 @@
                                     %td.button-primary
                                       = link_to settings_profile_url do
                                         %span= t 'user_mailer.welcome.edit_profile_action'
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.review_preferences_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_preferences_url do
-                                        %span= t 'user_mailer.welcome.review_preferences_action'
+
               %tr
                 %td.content-cell.padded-bottom
                   .email-row
@@ -116,29 +97,3 @@
                                     %td.button-primary
                                       = link_to web_url do
                                         %span= t 'user_mailer.welcome.final_action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.border-top
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %h5= t 'user_mailer.welcome.tips'
-                              %ul
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_mobile_webapp'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_following'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_local_timeline', instance: @instance
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_federated_timeline'
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index e310d7ca6..d78cdb938 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -11,19 +11,6 @@
 
 => <%= settings_profile_url %>
 
-<%= t 'user_mailer.welcome.review_preferences_step' %>
-
-=> <%= settings_preferences_url %>
-
 <%= t 'user_mailer.welcome.final_step' %>
 
 => <%= web_url %>
-
----
-
-<%= t 'user_mailer.welcome.tips' %>
-
-* <%= t 'user_mailer.welcome.tip_mobile_webapp' %>
-* <%= t 'user_mailer.welcome.tip_following' %>
-* <%= t 'user_mailer.welcome.tip_local_timeline', instance: @instance %>
-* <%= t 'user_mailer.welcome.tip_federated_timeline' %>
diff --git a/app/workers/activitypub/account_raw_distribution_worker.rb b/app/workers/activitypub/account_raw_distribution_worker.rb
new file mode 100644
index 000000000..a84c7d214
--- /dev/null
+++ b/app/workers/activitypub/account_raw_distribution_worker.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ActivityPub::AccountRawDistributionWorker < ActivityPub::RawDistributionWorker
+  protected
+
+  def inboxes
+    @inboxes ||= AccountReachFinder.new(@account).inboxes
+  end
+end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 788f2cf80..d9153132b 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -37,7 +37,7 @@ class ActivityPub::DeliveryWorker
 
   def build_request(http_client)
     Request.new(:post, @inbox_url, body: @json, http_client: http_client).tap do |request|
-      request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with])
+      request.on_behalf_of(@source_account, sign_with: @options[:sign_with])
       request.add_headers(HEADERS)
       request.add_headers({ 'Collection-Synchronization' => synchronization_header }) if ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] != 'true' && @options[:synchronize_followers]
     end
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index 09898ca49..575e11025 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -1,54 +1,32 @@
 # frozen_string_literal: true
 
-class ActivityPub::DistributionWorker
-  include Sidekiq::Worker
-  include Payloadable
-
-  sidekiq_options queue: 'push'
-
+class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
+  # Distribute a new status or an edit of a status to all the places
+  # where the status is supposed to go or where it was interacted with
   def perform(status_id)
     @status  = Status.find(status_id)
     @account = @status.account
 
-    return if skip_distribution?
-
-    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [payload, @account.id, inbox_url, { synchronize_followers: !@status.distributable? }]
-    end
-
-    relay! if relayable?
+    distribute!
   rescue ActiveRecord::RecordNotFound
     true
   end
 
-  private
-
-  def skip_distribution?
-    @status.direct_visibility? || @status.limited_visibility?
-  end
-
-  def relayable?
-    @status.public_visibility?
-  end
+  protected
 
   def inboxes
-    # Deliver the status to all followers.
-    # If the status is a reply to another local status, also forward it to that
-    # status' authors' followers.
-    @inboxes ||= if @status.in_reply_to_local_account? && @status.distributable?
-                   @account.followers.or(@status.thread.account.followers).inboxes
-                 else
-                   @account.followers.inboxes
-                 end
+    @inboxes ||= StatusReachFinder.new(@status).inboxes
   end
 
   def payload
-    @payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @account))
+    @payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
   end
 
-  def relay!
-    ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
-      [payload, @account.id, inbox_url]
-    end
+  def activity
+    ActivityPub::ActivityPresenter.from_status(@status)
+  end
+
+  def options
+    { 'synchronize_followers' => @status.private_visibility? }
   end
 end
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index cef595319..5e36fab51 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -3,10 +3,17 @@
 class ActivityPub::ProcessingWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true, retry: 8
+  sidekiq_options queue: 'ingress', backtrace: true, retry: 8
 
-  def perform(account_id, body, delivered_to_account_id = nil)
-    ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
+  def perform(actor_id, body, delivered_to_account_id = nil, actor_type = 'Account')
+    case actor_type
+    when 'Account'
+      actor = Account.find_by(id: actor_id)
+    end
+
+    return if actor.nil?
+
+    ActivityPub::ProcessCollectionService.new.call(body, actor, override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
   rescue ActiveRecord::RecordInvalid => e
     Rails.logger.debug "Error processing incoming ActivityPub object: #{e}"
   end
diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb
index 41e61132f..8ecc17db9 100644
--- a/app/workers/activitypub/raw_distribution_worker.rb
+++ b/app/workers/activitypub/raw_distribution_worker.rb
@@ -2,22 +2,47 @@
 
 class ActivityPub::RawDistributionWorker
   include Sidekiq::Worker
+  include Payloadable
 
   sidekiq_options queue: 'push'
 
+  # Base worker for when you want to queue up a bunch of deliveries of
+  # some payload. In this case, we have already generated JSON and
+  # we are going to distribute it to the account's followers minus
+  # the explicitly provided inboxes
   def perform(json, source_account_id, exclude_inboxes = [])
-    @account = Account.find(source_account_id)
+    @account         = Account.find(source_account_id)
+    @json            = json
+    @exclude_inboxes = exclude_inboxes
 
-    ActivityPub::DeliveryWorker.push_bulk(inboxes - exclude_inboxes) do |inbox_url|
-      [json, @account.id, inbox_url]
-    end
+    distribute!
   rescue ActiveRecord::RecordNotFound
     true
   end
 
-  private
+  protected
+
+  def distribute!
+    return if inboxes.empty?
+
+    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
+      [payload, source_account_id, inbox_url, options]
+    end
+  end
+
+  def payload
+    @json
+  end
+
+  def source_account_id
+    @account.id
+  end
 
   def inboxes
-    @inboxes ||= @account.followers.inboxes
+    @inboxes ||= @account.followers.inboxes - @exclude_inboxes
+  end
+
+  def options
+    {}
   end
 end
diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
deleted file mode 100644
index d4d0148ac..000000000
--- a/app/workers/activitypub/reply_distribution_worker.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# Obsolete but kept around to make sure existing jobs do not fail after upgrade.
-# Should be removed in a subsequent release.
-
-class ActivityPub::ReplyDistributionWorker
-  include Sidekiq::Worker
-  include Payloadable
-
-  sidekiq_options queue: 'push'
-
-  def perform(status_id)
-    @status  = Status.find(status_id)
-    @account = @status.thread&.account
-
-    return unless @account.present? && @status.distributable?
-
-    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [payload, @status.account_id, inbox_url]
-    end
-  rescue ActiveRecord::RecordNotFound
-    true
-  end
-
-  private
-
-  def inboxes
-    @inboxes ||= @account.followers.inboxes
-  end
-
-  def payload
-    @payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @status.account))
-  end
-end
diff --git a/app/workers/activitypub/status_update_distribution_worker.rb b/app/workers/activitypub/status_update_distribution_worker.rb
new file mode 100644
index 000000000..a79ede2bf
--- /dev/null
+++ b/app/workers/activitypub/status_update_distribution_worker.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWorker
+  # Distribute an profile update to servers that might have a copy
+  # of the account in question
+  def perform(status_id, options = {})
+    @options = options.with_indifferent_access
+    @status  = Status.find(status_id)
+    @account = @status.account
+
+    distribute!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  protected
+
+  def activity
+    ActivityPub::ActivityPresenter.new(
+      id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
+      type: 'Update',
+      actor: ActivityPub::TagManager.instance.uri_for(@status.account),
+      published: @status.edited_at,
+      to: ActivityPub::TagManager.instance.to(@status),
+      cc: ActivityPub::TagManager.instance.cc(@status),
+      virtual_object: @status
+    )
+  end
+end
diff --git a/app/workers/activitypub/synchronize_featured_collection_worker.rb b/app/workers/activitypub/synchronize_featured_collection_worker.rb
index 7a0898e89..f67d693cb 100644
--- a/app/workers/activitypub/synchronize_featured_collection_worker.rb
+++ b/app/workers/activitypub/synchronize_featured_collection_worker.rb
@@ -5,8 +5,10 @@ class ActivityPub::SynchronizeFeaturedCollectionWorker
 
   sidekiq_options queue: 'pull', lock: :until_executed
 
-  def perform(account_id)
-    ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id))
+  def perform(account_id, options = {})
+    options = { note: true, hashtag: false }.deep_merge(options.deep_symbolize_keys)
+
+    ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id), **options)
   rescue ActiveRecord::RecordNotFound
     true
   end
diff --git a/app/workers/activitypub/synchronize_featured_tags_collection_worker.rb b/app/workers/activitypub/synchronize_featured_tags_collection_worker.rb
new file mode 100644
index 000000000..14af4f725
--- /dev/null
+++ b/app/workers/activitypub/synchronize_featured_tags_collection_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ActivityPub::SynchronizeFeaturedTagsCollectionWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', lock: :until_executed
+
+  def perform(account_id, url)
+    ActivityPub::FetchFeaturedTagsCollectionService.new.call(Account.find(account_id), url)
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/activitypub/update_distribution_worker.rb b/app/workers/activitypub/update_distribution_worker.rb
index 3a207f071..d0391bb6f 100644
--- a/app/workers/activitypub/update_distribution_worker.rb
+++ b/app/workers/activitypub/update_distribution_worker.rb
@@ -1,33 +1,26 @@
 # frozen_string_literal: true
 
-class ActivityPub::UpdateDistributionWorker
-  include Sidekiq::Worker
-  include Payloadable
-
-  sidekiq_options queue: 'push'
+class ActivityPub::UpdateDistributionWorker < ActivityPub::RawDistributionWorker
+  sidekiq_options queue: 'push', lock: :until_executed
 
+  # Distribute an profile update to servers that might have a copy
+  # of the account in question
   def perform(account_id, options = {})
     @options = options.with_indifferent_access
     @account = Account.find(account_id)
 
-    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [signed_payload, @account.id, inbox_url]
-    end
-
-    ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
-      [signed_payload, @account.id, inbox_url]
-    end
+    distribute!
   rescue ActiveRecord::RecordNotFound
     true
   end
 
-  private
+  protected
 
   def inboxes
-    @inboxes ||= @account.followers.inboxes
+    @inboxes ||= AccountReachFinder.new(@account).inboxes
   end
 
-  def signed_payload
-    @signed_payload ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account, sign_with: @options[:sign_with]))
+  def payload
+    @payload ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account, sign_with: @options[:sign_with]))
   end
 end
diff --git a/app/workers/admin/account_deletion_worker.rb b/app/workers/admin/account_deletion_worker.rb
index 82f269ad6..6e0eb331b 100644
--- a/app/workers/admin/account_deletion_worker.rb
+++ b/app/workers/admin/account_deletion_worker.rb
@@ -3,7 +3,7 @@
 class Admin::AccountDeletionWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull'
+  sidekiq_options queue: 'pull', lock: :until_executed
 
   def perform(account_id)
     DeleteAccountService.new.call(Account.find(account_id), reserve_username: true, reserve_email: true)
diff --git a/app/workers/admin/domain_purge_worker.rb b/app/workers/admin/domain_purge_worker.rb
index 7cba2c89e..095232a6d 100644
--- a/app/workers/admin/domain_purge_worker.rb
+++ b/app/workers/admin/domain_purge_worker.rb
@@ -3,6 +3,8 @@
 class Admin::DomainPurgeWorker
   include Sidekiq::Worker
 
+  sidekiq_options queue: 'pull', lock: :until_executed
+
   def perform(domain)
     PurgeDomainService.new.call(domain)
   end
diff --git a/app/workers/digest_mailer_worker.rb b/app/workers/digest_mailer_worker.rb
deleted file mode 100644
index 21f1c357a..000000000
--- a/app/workers/digest_mailer_worker.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class DigestMailerWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'mailers'
-
-  attr_reader :user
-
-  def perform(user_id)
-    @user = User.find(user_id)
-    deliver_digest if @user.allows_digest_emails?
-  end
-
-  private
-
-  def deliver_digest
-    NotificationMailer.digest(user.account).deliver_now!
-    user.touch(:last_emailed_at)
-  end
-end
diff --git a/app/workers/distribution_worker.rb b/app/workers/distribution_worker.rb
index e85cd7e95..59cdbc7b2 100644
--- a/app/workers/distribution_worker.rb
+++ b/app/workers/distribution_worker.rb
@@ -2,14 +2,12 @@
 
 class DistributionWorker
   include Sidekiq::Worker
+  include Redisable
+  include Lockable
 
-  def perform(status_id)
-    RedisLock.acquire(redis: Redis.current, key: "distribute:#{status_id}", autorelease: 5.minutes.seconds) do |lock|
-      if lock.acquired?
-        FanOutOnWriteService.new.call(Status.find(status_id))
-      else
-        raise Mastodon::RaceConditionError
-      end
+  def perform(status_id, options = {})
+    with_lock("distribute:#{status_id}") do
+      FanOutOnWriteService.new.call(Status.find(status_id), **options.symbolize_keys)
     end
   rescue ActiveRecord::RecordNotFound
     true
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb
index b70c7e389..758cebd4b 100644
--- a/app/workers/feed_insert_worker.rb
+++ b/app/workers/feed_insert_worker.rb
@@ -3,12 +3,13 @@
 class FeedInsertWorker
   include Sidekiq::Worker
 
-  def perform(status_id, id, type = :home)
-    @type     = type.to_sym
-    @status   = Status.find(status_id)
+  def perform(status_id, id, type = 'home', options = {})
+    @type      = type.to_sym
+    @status    = Status.find(status_id)
+    @options   = options.symbolize_keys
 
     case @type
-    when :home
+    when :home, :tags
       @follower = Account.find(id)
     when :list
       @list     = List.find(id)
@@ -23,16 +24,20 @@ class FeedInsertWorker
   private
 
   def check_and_insert
-    return if feed_filtered?
-
-    perform_push
-    perform_notify if notify?
+    if feed_filtered?
+      perform_unpush if update?
+    else
+      perform_push
+      perform_notify if notify?
+    end
   end
 
   def feed_filtered?
     case @type
     when :home
       FeedManager.instance.filter?(:home, @status, @follower)
+    when :tags
+      FeedManager.instance.filter?(:tags, @status, @follower)
     when :list
       FeedManager.instance.filter?(:list, @status, @list)
     end
@@ -46,14 +51,27 @@ class FeedInsertWorker
 
   def perform_push
     case @type
-    when :home
-      FeedManager.instance.push_to_home(@follower, @status)
+    when :home, :tags
+      FeedManager.instance.push_to_home(@follower, @status, update: update?)
     when :list
-      FeedManager.instance.push_to_list(@list, @status)
+      FeedManager.instance.push_to_list(@list, @status, update: update?)
+    end
+  end
+
+  def perform_unpush
+    case @type
+    when :home, :tags
+      FeedManager.instance.unpush_from_home(@follower, @status, update: true)
+    when :list
+      FeedManager.instance.unpush_from_list(@list, @status, update: true)
     end
   end
 
   def perform_notify
-    NotifyService.new.call(@follower, :status, @status)
+    LocalNotificationWorker.perform_async(@follower.id, @status.id, 'Status', 'status')
+  end
+
+  def update?
+    @options[:update]
   end
 end
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb
index 6b08ca6fc..749a54b73 100644
--- a/app/workers/local_notification_worker.rb
+++ b/app/workers/local_notification_worker.rb
@@ -12,6 +12,15 @@ class LocalNotificationWorker
       activity = activity_class_name.constantize.find(activity_id)
     end
 
+    # For most notification types, only one notification should exist, and the older one is
+    # preferred. For updates, such as when a status is edited, the new notification
+    # should replace the previous ones.
+    if type == 'update'
+      Notification.where(account: receiver, activity: activity, type: 'update').in_batches.delete_all
+    elsif Notification.where(account: receiver, activity: activity, type: type).any?
+      return
+    end
+
     NotifyService.new.call(receiver, type || activity_class_name.underscore, activity)
   rescue ActiveRecord::RecordNotFound
     true
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index 6ebb9a400..e526d2887 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -2,12 +2,13 @@
 
 class MergeWorker
   include Sidekiq::Worker
+  include Redisable
 
   def perform(from_account_id, into_account_id)
     FeedManager.instance.merge_into_home(Account.find(from_account_id), Account.find(into_account_id))
   rescue ActiveRecord::RecordNotFound
     true
   ensure
-    Redis.current.del("account:#{into_account_id}:regeneration")
+    redis.del("account:#{into_account_id}:regeneration")
   end
 end
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index 4a900e3b8..3b429928e 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -8,7 +8,9 @@ class MoveWorker
     @target_account = Account.find(target_account_id)
 
     if @target_account.local? && @source_account.local?
-      rewrite_follows!
+      nb_moved = rewrite_follows!
+      @source_account.update_count!(:followers_count, -nb_moved)
+      @target_account.update_count!(:followers_count, nb_moved)
     else
       queue_follow_unfollows!
     end
@@ -47,7 +49,7 @@ class MoveWorker
 
   def copy_account_notes!
     AccountNote.where(target_account: @source_account).find_each do |note|
-      text = I18n.with_locale(note.account.user&.locale || I18n.default_locale) do
+      text = I18n.with_locale(note.account.user&.locale.presence || I18n.default_locale) do
         I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct)
       end
 
@@ -90,7 +92,7 @@ class MoveWorker
 
   def add_account_note_if_needed!(account, id)
     unless AccountNote.where(account: account, target_account: @target_account).exists?
-      text = I18n.with_locale(account.user&.locale || I18n.default_locale) do
+      text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
         I18n.t(id, acct: @source_account.acct)
       end
       AccountNote.create!(account: account, target_account: @target_account, comment: text)
diff --git a/app/workers/poll_expiration_notify_worker.rb b/app/workers/poll_expiration_notify_worker.rb
index f0191d479..0e29a5f60 100644
--- a/app/workers/poll_expiration_notify_worker.rb
+++ b/app/workers/poll_expiration_notify_worker.rb
@@ -6,19 +6,46 @@ class PollExpirationNotifyWorker
   sidekiq_options lock: :until_executed
 
   def perform(poll_id)
-    poll = Poll.find(poll_id)
+    @poll = Poll.find(poll_id)
 
-    # Notify poll owner and remote voters
-    if poll.local?
-      ActivityPub::DistributePollUpdateWorker.perform_async(poll.status.id)
-      NotifyService.new.call(poll.account, :poll, poll)
-    end
+    return if does_not_expire?
+    requeue! && return if not_due_yet?
 
-    # Notify local voters
-    poll.votes.includes(:account).group(:account_id).select(:account_id).map(&:account).select(&:local?).each do |account|
-      NotifyService.new.call(account, :poll, poll)
-    end
+    notify_remote_voters_and_owner! if @poll.local?
+    notify_local_voters!
   rescue ActiveRecord::RecordNotFound
     true
   end
+
+  def self.remove_from_scheduled(poll_id)
+    queue = Sidekiq::ScheduledSet.new
+    queue.select { |scheduled| scheduled.klass == name && scheduled.args[0] == poll_id }.map(&:delete)
+  end
+
+  private
+
+  def does_not_expire?
+    @poll.expires_at.nil?
+  end
+
+  def not_due_yet?
+    @poll.expires_at.present? && !@poll.expired?
+  end
+
+  def requeue!
+    PollExpirationNotifyWorker.perform_at(@poll.expires_at + 5.minutes, @poll.id)
+  end
+
+  def notify_remote_voters_and_owner!
+    ActivityPub::DistributePollUpdateWorker.perform_async(@poll.status.id)
+    LocalNotificationWorker.perform_async(@poll.account_id, @poll.id, 'Poll', 'poll')
+  end
+
+  def notify_local_voters!
+    @poll.voters.merge(Account.local).select(:id).find_in_batches do |accounts|
+      LocalNotificationWorker.push_bulk(accounts) do |account|
+        [account.id, @poll.id, 'Poll', 'poll']
+      end
+    end
+  end
 end
diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb
index d76d73d96..72c781749 100644
--- a/app/workers/push_update_worker.rb
+++ b/app/workers/push_update_worker.rb
@@ -2,15 +2,39 @@
 
 class PushUpdateWorker
   include Sidekiq::Worker
+  include Redisable
 
-  def perform(account_id, status_id, timeline_id = nil)
-    account     = Account.find(account_id)
-    status      = Status.find(status_id)
-    message     = InlineRenderer.render(status, account, :status)
-    timeline_id = "timeline:#{account.id}" if timeline_id.nil?
+  def perform(account_id, status_id, timeline_id = nil, options = {})
+    @status      = Status.find(status_id)
+    @account_id  = account_id
+    @timeline_id = timeline_id || "timeline:#{account_id}"
+    @options     = options.symbolize_keys
 
-    Redis.current.publish(timeline_id, Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
+    render_payload!
+    publish!
   rescue ActiveRecord::RecordNotFound
     true
   end
+
+  private
+
+  def render_payload!
+    @payload = StatusCacheHydrator.new(@status).hydrate(@account_id)
+  end
+
+  def message
+    Oj.dump(
+      event: update? ? :'status.update' : :update,
+      payload: @payload,
+      queued_at: (Time.now.to_f * 1000.0).to_i
+    )
+  end
+
+  def publish!
+    redis.publish(@timeline_id, message)
+  end
+
+  def update?
+    @options[:update]
+  end
 end
diff --git a/app/workers/refollow_worker.rb b/app/workers/refollow_worker.rb
index 319b00109..4b712d3aa 100644
--- a/app/workers/refollow_worker.rb
+++ b/app/workers/refollow_worker.rb
@@ -10,8 +10,9 @@ class RefollowWorker
     return unless target_account.activitypub?
 
     target_account.passive_relationships.where(account: Account.where(domain: nil)).includes(:account).reorder(nil).find_each do |follow|
-      reblogs = follow.show_reblogs?
-      notify  = follow.notify?
+      reblogs   = follow.show_reblogs?
+      notify    = follow.notify?
+      languages = follow.languages
 
       # Locally unfollow remote account
       follower = follow.account
@@ -19,7 +20,7 @@ class RefollowWorker
 
       # Schedule re-follow
       begin
-        FollowService.new.call(follower, target_account, reblogs: reblogs, notify: notify, bypass_limit: true)
+        FollowService.new.call(follower, target_account, reblogs: reblogs, notify: notify, languages: languages, bypass_limit: true)
       rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
diff --git a/app/workers/remote_account_refresh_worker.rb b/app/workers/remote_account_refresh_worker.rb
new file mode 100644
index 000000000..9632936b5
--- /dev/null
+++ b/app/workers/remote_account_refresh_worker.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class RemoteAccountRefreshWorker
+  include Sidekiq::Worker
+  include ExponentialBackoff
+  include JsonLdHelper
+
+  sidekiq_options queue: 'pull', retry: 3
+
+  def perform(id)
+    account = Account.find_by(id: id)
+    return if account.nil? || account.local?
+
+    ActivityPub::FetchRemoteAccountService.new.call(account.uri)
+  rescue Mastodon::UnexpectedResponseError => e
+    response = e.response
+
+    if response_error_unsalvageable?(response)
+      # Give up
+    else
+      raise e
+    end
+  end
+end
diff --git a/app/workers/remove_featured_tag_worker.rb b/app/workers/remove_featured_tag_worker.rb
new file mode 100644
index 000000000..065ec79d8
--- /dev/null
+++ b/app/workers/remove_featured_tag_worker.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveFeaturedTagWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, featured_tag_id)
+    RemoveFeaturedTagService.new.call(Account.find(account_id), FeaturedTag.find(featured_tag_id))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/scheduler/accounts_statuses_cleanup_scheduler.rb b/app/workers/scheduler/accounts_statuses_cleanup_scheduler.rb
index f42d4bca6..bd92fe32c 100644
--- a/app/workers/scheduler/accounts_statuses_cleanup_scheduler.rb
+++ b/app/workers/scheduler/accounts_statuses_cleanup_scheduler.rb
@@ -2,6 +2,7 @@
 
 class Scheduler::AccountsStatusesCleanupScheduler
   include Sidekiq::Worker
+  include Redisable
 
   # This limit is mostly to be nice to the fediverse at large and not
   # generate too much traffic.
@@ -66,7 +67,7 @@ class Scheduler::AccountsStatusesCleanupScheduler
   end
 
   def compute_budget
-    threads = Sidekiq::ProcessSet.new.filter { |x| x['queues'].include?('push') }.map { |x| x['concurrency'] }.sum
+    threads = Sidekiq::ProcessSet.new.select { |x| x['queues'].include?('push') }.map { |x| x['concurrency'] }.sum
     [PER_THREAD_BUDGET * threads, MAX_BUDGET].min
   end
 
@@ -83,14 +84,14 @@ class Scheduler::AccountsStatusesCleanupScheduler
   end
 
   def last_processed_id
-    Redis.current.get('account_statuses_cleanup_scheduler:last_account_id')
+    redis.get('account_statuses_cleanup_scheduler:last_account_id')
   end
 
   def save_last_processed_id(id)
     if id.nil?
-      Redis.current.del('account_statuses_cleanup_scheduler:last_account_id')
+      redis.del('account_statuses_cleanup_scheduler:last_account_id')
     else
-      Redis.current.set('account_statuses_cleanup_scheduler:last_account_id', id, ex: 1.hour.seconds)
+      redis.set('account_statuses_cleanup_scheduler:last_account_id', id, ex: 1.hour.seconds)
     end
   end
 end
diff --git a/app/workers/scheduler/backup_cleanup_scheduler.rb b/app/workers/scheduler/backup_cleanup_scheduler.rb
deleted file mode 100644
index 85d5312c0..000000000
--- a/app/workers/scheduler/backup_cleanup_scheduler.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::BackupCleanupScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options retry: 0
-
-  def perform
-    old_backups.reorder(nil).find_each(&:destroy!)
-  end
-
-  private
-
-  def old_backups
-    Backup.where('created_at < ?', 7.days.ago)
-  end
-end
diff --git a/app/workers/scheduler/email_scheduler.rb b/app/workers/scheduler/email_scheduler.rb
deleted file mode 100644
index c052f2fce..000000000
--- a/app/workers/scheduler/email_scheduler.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::EmailScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options retry: 0
-
-  FREQUENCY      = 7.days.freeze
-  SIGN_IN_OFFSET = 1.day.freeze
-
-  def perform
-    eligible_users.reorder(nil).find_each do |user|
-      next unless user.allows_digest_emails?
-      DigestMailerWorker.perform_async(user.id)
-    end
-  end
-
-  private
-
-  def eligible_users
-    User.emailable
-        .where('current_sign_in_at < ?', (FREQUENCY + SIGN_IN_OFFSET).ago)
-        .where('last_emailed_at IS NULL OR last_emailed_at < ?', FREQUENCY.ago)
-  end
-end
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb
deleted file mode 100644
index aa0cc8b8d..000000000
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::FeedCleanupScheduler
-  include Sidekiq::Worker
-  include Redisable
-
-  sidekiq_options retry: 0
-
-  def perform
-    clean_home_feeds!
-    clean_list_feeds!
-  end
-
-  private
-
-  def clean_home_feeds!
-    feed_manager.clean_feeds!(:home, inactive_account_ids)
-  end
-
-  def clean_list_feeds!
-    feed_manager.clean_feeds!(:list, inactive_list_ids)
-  end
-
-  def inactive_account_ids
-    @inactive_account_ids ||= User.confirmed.inactive.pluck(:account_id)
-  end
-
-  def inactive_list_ids
-    List.where(account_id: inactive_account_ids).pluck(:id)
-  end
-
-  def feed_manager
-    FeedManager.instance
-  end
-end
diff --git a/app/workers/scheduler/follow_recommendations_scheduler.rb b/app/workers/scheduler/follow_recommendations_scheduler.rb
index effc63e59..57f78170e 100644
--- a/app/workers/scheduler/follow_recommendations_scheduler.rb
+++ b/app/workers/scheduler/follow_recommendations_scheduler.rb
@@ -16,39 +16,44 @@ class Scheduler::FollowRecommendationsScheduler
     AccountSummary.refresh
     FollowRecommendation.refresh
 
-    fallback_recommendations = FollowRecommendation.order(rank: :desc).limit(SET_SIZE).index_by(&:account_id)
+    fallback_recommendations = FollowRecommendation.order(rank: :desc).limit(SET_SIZE)
 
-    I18n.available_locales.each do |locale|
+    Trends.available_locales.each do |locale|
       recommendations = begin
         if AccountSummary.safe.filtered.localized(locale).exists? # We can skip the work if no accounts with that language exist
-          FollowRecommendation.localized(locale).order(rank: :desc).limit(SET_SIZE).index_by(&:account_id)
+          FollowRecommendation.localized(locale).order(rank: :desc).limit(SET_SIZE).map { |recommendation| [recommendation.account_id, recommendation.rank] }
         else
-          {}
+          []
         end
       end
 
       # Use language-agnostic results if there are not enough language-specific ones
-      missing = SET_SIZE - recommendations.keys.size
+      missing = SET_SIZE - recommendations.size
+
+      if missing.positive? && fallback_recommendations.size.positive?
+        max_fallback_rank = fallback_recommendations.first.rank || 0
+
+        # Language-specific results should be above language-agnostic ones,
+        # otherwise language-agnostic ones will always overshadow them
+        recommendations.map! { |(account_id, rank)| [account_id, rank + max_fallback_rank] }
 
-      if missing.positive?
         added = 0
 
-        # Avoid duplicate results
-        fallback_recommendations.each_value do |recommendation|
-          next if recommendations.key?(recommendation.account_id)
+        fallback_recommendations.each do |recommendation|
+          next if recommendations.any? { |(account_id, _)| account_id == recommendation.account_id }
 
-          recommendations[recommendation.account_id] = recommendation
+          recommendations << [recommendation.account_id, recommendation.rank]
           added += 1
 
           break if added >= missing
         end
       end
 
-      redis.pipelined do
-        redis.del(key(locale))
+      redis.multi do |multi|
+        multi.del(key(locale))
 
-        recommendations.each_value do |recommendation|
-          redis.zadd(key(locale), recommendation.rank, recommendation.account_id)
+        recommendations.each do |(account_id, rank)|
+          multi.zadd(key(locale), rank, account_id)
         end
       end
     end
diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb
new file mode 100644
index 000000000..c42396629
--- /dev/null
+++ b/app/workers/scheduler/indexing_scheduler.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Scheduler::IndexingScheduler
+  include Sidekiq::Worker
+  include Redisable
+
+  sidekiq_options retry: 0
+
+  def perform
+    return unless Chewy.enabled?
+
+    indexes.each do |type|
+      with_redis do |redis|
+        ids = redis.smembers("chewy:queue:#{type.name}")
+
+        type.import!(ids)
+
+        redis.pipelined do |pipeline|
+          ids.each { |id| pipeline.srem("chewy:queue:#{type.name}", id) }
+        end
+      end
+    end
+  end
+
+  def indexes
+    [AccountsIndex, TagsIndex, StatusesIndex]
+  end
+end
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 918c10ac9..8f607db03 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -3,7 +3,8 @@
 class Scheduler::IpCleanupScheduler
   include Sidekiq::Worker
 
-  IP_RETENTION_PERIOD = 1.year.freeze
+  IP_RETENTION_PERIOD = ENV.fetch('IP_RETENTION_PERIOD', 1.year).to_i.seconds.freeze
+  SESSION_RETENTION_PERIOD = ENV.fetch('SESSION_RETENTION_PERIOD', 1.year).to_i.seconds.freeze
 
   sidekiq_options retry: 0
 
@@ -15,9 +16,11 @@ class Scheduler::IpCleanupScheduler
   private
 
   def clean_ip_columns!
-    SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all
-    User.where('current_sign_in_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(last_sign_in_ip: nil, current_sign_in_ip: nil, sign_up_ip: nil)
+    SessionActivation.where('updated_at < ?', SESSION_RETENTION_PERIOD.ago).in_batches.destroy_all
+    SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(ip: nil)
+    User.where('current_sign_in_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(sign_up_ip: nil)
     LoginActivity.where('created_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all
+    Doorkeeper::AccessToken.where('last_used_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(last_used_ip: nil)
   end
 
   def clean_expired_ip_blocks!
diff --git a/app/workers/scheduler/media_cleanup_scheduler.rb b/app/workers/scheduler/media_cleanup_scheduler.rb
deleted file mode 100644
index 24d30a6be..000000000
--- a/app/workers/scheduler/media_cleanup_scheduler.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class Scheduler::MediaCleanupScheduler
-  include Sidekiq::Worker
-
-  sidekiq_options retry: 0
-
-  def perform
-    unattached_media.find_each(&:destroy)
-  end
-
-  private
-
-  def unattached_media
-    MediaAttachment.reorder(nil).unattached.where('created_at < ?', 1.day.ago)
-  end
-end
diff --git a/app/workers/scheduler/suspended_user_cleanup_scheduler.rb b/app/workers/scheduler/suspended_user_cleanup_scheduler.rb
new file mode 100644
index 000000000..87e22161b
--- /dev/null
+++ b/app/workers/scheduler/suspended_user_cleanup_scheduler.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class Scheduler::SuspendedUserCleanupScheduler
+  include Sidekiq::Worker
+
+  # Each processed deletion request may enqueue an enormous
+  # amount of jobs in the `pull` queue, so only enqueue when
+  # the queue is empty or close to being so.
+  MAX_PULL_SIZE = 50
+
+  # Since account deletion is very expensive, we want to avoid
+  # overloading the server by queuing too much at once.
+  # This job runs approximately once per 2 minutes, so with a
+  # value of `MAX_DELETIONS_PER_JOB` of 10, a server can
+  # handle the deletion of 7200 accounts per day, provided it
+  # has the capacity for it.
+  MAX_DELETIONS_PER_JOB = 10
+
+  sidekiq_options retry: 0
+
+  def perform
+    return if Sidekiq::Queue.new('pull').size > MAX_PULL_SIZE
+
+    clean_suspended_accounts!
+  end
+
+  private
+
+  def clean_suspended_accounts!
+    # This should be fine because we only process a small amount of deletion requests at once and
+    # `id` and `created_at` should follow the same order.
+    AccountDeletionRequest.reorder(id: :asc).take(MAX_DELETIONS_PER_JOB).each do |deletion_request|
+      next unless deletion_request.created_at < AccountDeletionRequest::DELAY_TO_DELETION.ago
+
+      Admin::AccountDeletionWorker.perform_async(deletion_request.account_id)
+    end
+  end
+end
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index be0c4277d..63f9ed78c 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -7,21 +7,25 @@ class Scheduler::UserCleanupScheduler
 
   def perform
     clean_unconfirmed_accounts!
-    clean_suspended_accounts!
+    clean_discarded_statuses!
   end
 
   private
 
   def clean_unconfirmed_accounts!
     User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
+      # We have to do it separately because of missing database constraints
+      AccountModerationNote.where(account_id: batch.map(&:account_id)).delete_all
       Account.where(id: batch.map(&:account_id)).delete_all
       User.where(id: batch.map(&:id)).delete_all
     end
   end
 
-  def clean_suspended_accounts!
-    AccountDeletionRequest.where('created_at <= ?', AccountDeletionRequest::DELAY_TO_DELETION.ago).reorder(nil).find_each do |deletion_request|
-      Admin::AccountDeletionWorker.perform_async(deletion_request.account_id)
+  def clean_discarded_statuses!
+    Status.unscoped.discarded.where('deleted_at <= ?', 30.days.ago).find_in_batches do |statuses|
+      RemovalWorker.push_bulk(statuses) do |status|
+        [status.id, { 'immediate' => true }]
+      end
     end
   end
 end
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
new file mode 100644
index 000000000..9544f808b
--- /dev/null
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class Scheduler::VacuumScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options retry: 0, lock: :until_executed
+
+  def perform
+    vacuum_operations.each do |operation|
+      operation.perform
+    rescue => e
+      Rails.logger.error("Error while running #{operation.class.name}: #{e}")
+    end
+  end
+
+  private
+
+  def vacuum_operations
+    [
+      statuses_vacuum,
+      media_attachments_vacuum,
+      preview_cards_vacuum,
+      backups_vacuum,
+      access_tokens_vacuum,
+      feeds_vacuum,
+    ]
+  end
+
+  def statuses_vacuum
+    Vacuum::StatusesVacuum.new(content_retention_policy.content_cache_retention_period)
+  end
+
+  def media_attachments_vacuum
+    Vacuum::MediaAttachmentsVacuum.new(content_retention_policy.media_cache_retention_period)
+  end
+
+  def preview_cards_vacuum
+    Vacuum::PreviewCardsVacuum.new(content_retention_policy.media_cache_retention_period)
+  end
+
+  def backups_vacuum
+    Vacuum::BackupsVacuum.new(content_retention_policy.backups_retention_period)
+  end
+
+  def access_tokens_vacuum
+    Vacuum::AccessTokensVacuum.new
+  end
+
+  def feeds_vacuum
+    Vacuum::FeedsVacuum.new
+  end
+
+  def content_retention_policy
+    ContentRetentionPolicy.current
+  end
+end
diff --git a/app/workers/trigger_webhook_worker.rb b/app/workers/trigger_webhook_worker.rb
new file mode 100644
index 000000000..2ffb6246f
--- /dev/null
+++ b/app/workers/trigger_webhook_worker.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class TriggerWebhookWorker
+  include Sidekiq::Worker
+
+  def perform(event, class_name, id)
+    object = class_name.constantize.find(id)
+    WebhookService.new.call(event, object)
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/unfollow_follow_worker.rb b/app/workers/unfollow_follow_worker.rb
index 0bd5ff472..7203b4888 100644
--- a/app/workers/unfollow_follow_worker.rb
+++ b/app/workers/unfollow_follow_worker.rb
@@ -10,11 +10,12 @@ class UnfollowFollowWorker
     old_target_account = Account.find(old_target_account_id)
     new_target_account = Account.find(new_target_account_id)
 
-    follow  = follower_account.active_relationships.find_by(target_account: old_target_account)
-    reblogs = follow&.show_reblogs?
-    notify  = follow&.notify?
+    follow    = follower_account.active_relationships.find_by(target_account: old_target_account)
+    reblogs   = follow&.show_reblogs?
+    notify    = follow&.notify?
+    languages = follow&.languages
 
-    FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, notify: notify, bypass_locked: bypass_locked, bypass_limit: true)
+    FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, notify: notify, languages: languages, bypass_locked: bypass_locked, bypass_limit: true)
     UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true)
   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     true
diff --git a/app/workers/verify_account_links_worker.rb b/app/workers/verify_account_links_worker.rb
index 8114d59be..f606e6c26 100644
--- a/app/workers/verify_account_links_worker.rb
+++ b/app/workers/verify_account_links_worker.rb
@@ -3,14 +3,13 @@
 class VerifyAccountLinksWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull', retry: false, lock: :until_executed
+  sidekiq_options queue: 'default', retry: false, lock: :until_executed
 
   def perform(account_id)
     account = Account.find(account_id)
 
     account.fields.each do |field|
-      next unless !field.verified? && field.verifiable?
-      VerifyLinkService.new.call(field)
+      VerifyLinkService.new.call(field) if field.requires_verification?
     end
 
     account.save! if account.changed?
diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
index 57f5b5c22..1ed5bb9e0 100644
--- a/app/workers/web/push_notification_worker.rb
+++ b/app/workers/web/push_notification_worker.rb
@@ -51,7 +51,7 @@ class Web::PushNotificationWorker
   private
 
   def push_notification_json
-    json = I18n.with_locale(@subscription.locale || I18n.default_locale) do
+    json = I18n.with_locale(@subscription.locale.presence || I18n.default_locale) do
       ActiveModelSerializers::SerializableResource.new(
         @notification,
         serializer: Web::NotificationSerializer,
diff --git a/app/workers/webhooks/delivery_worker.rb b/app/workers/webhooks/delivery_worker.rb
new file mode 100644
index 000000000..b1e345c5e
--- /dev/null
+++ b/app/workers/webhooks/delivery_worker.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Webhooks::DeliveryWorker
+  include Sidekiq::Worker
+  include JsonLdHelper
+
+  sidekiq_options queue: 'push', retry: 16, dead: false
+
+  def perform(webhook_id, body)
+    @webhook   = Webhook.find(webhook_id)
+    @body      = body
+    @response  = nil
+
+    perform_request
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  private
+
+  def perform_request
+    request = Request.new(:post, @webhook.url, body: @body)
+
+    request.add_headers(
+      'Content-Type' => 'application/json',
+      'X-Hub-Signature' => "sha256=#{signature}"
+    )
+
+    request.perform do |response|
+      raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
+    end
+  end
+
+  def signature
+    OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @webhook.secret, @body)
+  end
+end
diff --git a/boxfile.yml b/boxfile.yml
deleted file mode 100644
index c1d89bb15..000000000
--- a/boxfile.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-run.config:
-  engine: ruby
-  engine.config:
-    runtime: ruby-2.5
-
-  extra_packages:
-    # basic servers:
-    - nginx
-    - nodejs
-
-    # for images:
-    - ImageMagick
-    - jemalloc
-
-    # for videos:
-    - ffmpeg3
-
-    # to prep the .env file:
-    - gettext-tools
-
-    # for node-gyp, used in the asset compilation process:
-    - python-2
-
-    # i18n:
-    - libidn
-
-  cache_dirs:
-    - node_modules
-
-  extra_path_dirs:
-    - node_modules/.bin
-
-  build_triggers:
-    - .ruby-version
-    - Gemfile
-    - Gemfile.lock
-    - package.json
-    - yarn.lock
-
-  extra_steps:
-    - cp .env.nanobox .env
-    - yarn
-
-  fs_watch: true
-
-
-deploy.config:
-  extra_steps:
-    - NODE_ENV=production bundle exec rake assets:precompile
-  transform:
-    - "envsubst < /app/.env.nanobox > /app/.env.production"
-    - |-
-        if [ -z "$LOCAL_DOMAIN" ]
-        then
-          . /app/.env.production
-          export LOCAL_DOMAIN
-        fi
-        erb /app/nanobox/nginx-web.conf.erb > /app/nanobox/nginx-web.conf
-        erb /app/nanobox/nginx-stream.conf.erb > /app/nanobox/nginx-stream.conf
-    - touch /app/log/production.log
-  before_live:
-    web.web:
-      - bin/tootctl cache clear
-      - bundle exec rake db:migrate:setup
-  after_live:
-    worker.sidekiq:
-      - |-
-          if [[ "${ES_ENABLED}" != "false" ]]
-          then
-            bin/tootctl search deploy
-          fi
-
-
-web.web:
-  start:
-    nginx: nginx -c /app/nanobox/nginx-web.conf
-    rails: bundle exec puma -C /app/config/puma.rb
-
-  routes:
-    - '/'
-
-  writable_dirs:
-    - tmp
-
-  log_watch:
-    rails: 'log/production.log'
-
-  network_dirs:
-    data.storage:
-      - public/system
-
-
-web.stream:
-  start:
-    nginx: nginx -c /app/nanobox/nginx-stream.conf
-    node: yarn run start
-
-  routes:
-    - '/api/v1/streaming*'
-    # Somehow we're getting requests for scheme://domain//api/v1/streaming* - match those, too
-    - '//api/v1/streaming*'
-
-  writable_dirs:
-    - tmp
-
-
-worker.sidekiq:
-  start:
-    default: bundle exec sidekiq -c 5 -q default -L /app/log/sidekiq.log
-    mailers: bundle exec sidekiq -c 5 -q mailers -L /app/log/sidekiq.log
-    pull: bundle exec sidekiq -c 5 -q pull -L /app/log/sidekiq.log
-    push: bundle exec sidekiq -c 5 -q push -L /app/log/sidekiq.log
-    scheduler: bundle exec sidekiq -c 5 -q scheduler -L /app/log/sidekiq.log
-
-  writable_dirs:
-    - tmp
-
-  log_watch:
-    rails: 'log/production.log'
-    sidekiq: 'log/sidekiq.log'
-
-  network_dirs:
-    data.storage:
-      - public/system
-
-
-data.db:
-  image: nanobox/postgresql:9.6
-
-  cron:
-    - id: backup
-      schedule: '0 3 * * *'
-      command: |
-        PGPASSWORD=${DATA_DB_PASS} pg_dump -U ${DATA_DB_USER} -w -Fc -O gonano |
-        gzip |
-        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz -X POST -T - >&2
-        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
-        sed 's/,/\n/g' |
-        grep ${HOSTNAME} |
-        sort |
-        head -n-${BACKUP_COUNT:-1} |
-        sed 's/.*: \?"\(.*\)".*/\1/' |
-        while read file
-        do
-          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
-        done
-
-
-data.elastic:
-  image: nanobox/elasticsearch:5
-
-  cron:
-    - id: backup
-      schedule: '0 3 * * *'
-      command: |
-        id=$(cat /proc/sys/kernel/random/uuid)
-        curl -X PUT -H "Content-Type: application/json" "127.0.0.1:9200/_snapshot/${id}" -d "{\"type\": \"fs\",\"settings\": {\"location\": \"/var/tmp/${id}\",\"compress\": true}}"
-        curl -X PUT -H "Content-Type: application/json" "127.0.0.1:9200/_snapshot/${id}/backup?wait_for_completion=true&pretty"
-        tar -cz -C "/var/tmp/${id}" . |
-        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz -X POST -T - >&2
-        curl -X DELETE -H "Content-Type: application/json" "127.0.0.1:9200/_snapshot/${id}"
-        rm -rf "/var/tmp/${id}"
-        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
-        sed 's/,/\n/g' |
-        grep ${HOSTNAME} |
-        sort |
-        head -n-${BACKUP_COUNT:-1} |
-        sed 's/.*: \?"\(.*\)".*/\1/' |
-        while read file
-        do
-          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
-        done
-
-
-data.redis:
-  image: nanobox/redis:4.0
-
-  cron:
-    - id: backup
-      schedule: '0 3 * * *'
-      command: |
-        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).rdb -X POST -T /data/var/db/redis/dump.rdb >&2
-        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
-        sed 's/,/\n/g' |
-        grep ${HOSTNAME} |
-        sort |
-        head -n-${BACKUP_COUNT:-1} |
-        sed 's/.*: \?"\(.*\)".*/\1/' |
-        while read file
-        do
-          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
-        done
-
-
-data.storage:
-  image: nanobox/unfs:0.9
-
-  cron:
-    - id: backup
-      schedule: '0 3 * * *'
-      command: |
-        tar cz -C /data/var/db/unfs/ . |
-        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz -X POST -T - >&2
-        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
-        sed 's/,/\n/g' |
-        grep ${HOSTNAME} |
-        sort |
-        head -n-${BACKUP_COUNT:-1} |
-        sed 's/.*: \?"\(.*\)".*/\1/' |
-        while read file
-        do
-          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
-        done
diff --git a/chart/.helmignore b/chart/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/chart/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/chart/Chart.lock b/chart/Chart.lock
deleted file mode 100644
index d74e7570c..000000000
--- a/chart/Chart.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies:
-- name: elasticsearch
-  repository: https://charts.bitnami.com/bitnami
-  version: 15.10.3
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 8.10.14
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.9.0
-digest: sha256:f5c57108f7768fd16391c1a050991c7809f84a640cca308d7d24d87379d04000
-generated: "2021-08-05T08:01:01.457727804Z"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
deleted file mode 100644
index a09ae8e8a..000000000
--- a/chart/Chart.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: v2
-name: mastodon
-description: Mastodon is a free, open-source social network server based on ActivityPub.
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 3.3.0
-
-dependencies:
-  - name: elasticsearch
-    version: 15.10.3
-    repository: https://charts.bitnami.com/bitnami
-    condition: elasticsearch.enabled
-  - name: postgresql
-    version: 8.10.14
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgresql.enabled
-  - name: redis
-    version: 10.9.0
-    repository: https://charts.bitnami.com/bitnami
diff --git a/chart/README.md b/chart/README.md
new file mode 100644
index 000000000..67cb18eec
--- /dev/null
+++ b/chart/README.md
@@ -0,0 +1,3 @@
+# This Helm chart has moved
+
+The Mastodon Helm chart is now maintained in https://github.com/mastodon/chart.
diff --git a/chart/readme.md b/chart/readme.md
deleted file mode 100644
index 9f7a88958..000000000
--- a/chart/readme.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Introduction
-
-This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
-Kubernetes cluster.  The basic usage is:
-
-1. edit `values.yaml` or create a separate yaml file for custom values
-1. `helm dep update`
-1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
-
-This chart has been tested on Helm 3.0.1 and above.
-
-# Configuration
-
-The variables that _must_ be configured are:
-
-- password and keys in the `mastodon.secrets`, `postgresql`, and `redis` groups; if
-  left blank, some of those values will be autogenerated, but will not persist
-  across upgrades.
-
-- SMTP settings for your mailer in the `mastodon.smtp` group.
-
-# Missing features
-
-Currently this chart does _not_ support:
-
-- Hidden services
-- Single Sign-On
-- Swift
-- configurations using `WEB_DOMAIN`
-
-# Upgrading
-
-Because database migrations are managed as a Job separate from the Rails and
-Sidekiq deployments, it’s possible they will occur in the wrong order.  After
-upgrading Mastodon versions, it may sometimes be necessary to manually delete
-the Rails and Sidekiq pods so that they are recreated against the latest
-migration.
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
deleted file mode 100644
index b09c40bec..000000000
--- a/chart/templates/NOTES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mastodon.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "mastodon.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "mastodon.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "mastodon.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
deleted file mode 100644
index 5814a3120..000000000
--- a/chart/templates/_helpers.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "mastodon.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "mastodon.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "mastodon.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "mastodon.labels" -}}
-helm.sh/chart: {{ include "mastodon.chart" . }}
-{{ include "mastodon.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "mastodon.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "mastodon.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "mastodon.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "mastodon.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create a default fully qualified name for dependent services.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "mastodon.elasticsearch.fullname" -}}
-{{- printf "%s-%s" .Release.Name "elasticsearch" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mastodon.redis.fullname" -}}
-{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mastodon.postgresql.fullname" -}}
-{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml
deleted file mode 100644
index 701368e49..000000000
--- a/chart/templates/configmap-env.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "mastodon.fullname" . }}-env
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-data:
-  {{- if .Values.postgresql.enabled }}
-  DB_HOST: {{ template "mastodon.postgresql.fullname" . }}
-  {{- else }}
-  DB_HOST: {{ .Values.postgresql.postgresqlHostname }}
-  {{- end }}
-  DB_NAME: {{ .Values.postgresql.postgresqlDatabase }}
-  DB_POOL: {{ .Values.mastodon.sidekiq.concurrency | quote }}
-  DB_PORT: "5432"
-  DB_USER: {{ .Values.postgresql.postgresqlUsername }}
-  DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
-  {{- if .Values.elasticsearch.enabled }}
-  ES_ENABLED: "true"
-  ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master
-  ES_PORT: "9200"
-  {{- end }}
-  LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
-  # https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior
-  MALLOC_ARENA_MAX: "2"
-  NODE_ENV: "production"
-  RAILS_ENV: "production"
-  REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master
-  REDIS_PORT: "6379"
-  {{- if .Values.mastodon.s3.enabled }}
-  S3_BUCKET: {{ .Values.mastodon.s3.bucket }}
-  S3_ENABLED: "true"
-  S3_ENDPOINT: {{ .Values.mastodon.s3.endpoint }}
-  S3_HOSTNAME: {{ .Values.mastodon.s3.hostname }}
-  S3_PROTOCOL: "https"
-  {{- if .Values.mastodon.s3.region }}
-  S3_REGION: {{ .Values.mastodon.s3.region }}
-  {{- end }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.auth_method }}
-  SMTP_AUTH_METHOD: {{ .Values.mastodon.smtp.auth_method }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.ca_file }}
-  SMTP_CA_FILE: {{ .Values.mastodon.smtp.ca_file }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.delivery_method }}
-  SMTP_DELIVERY_METHOD: {{ .Values.mastodon.smtp.delivery_method }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.domain }}
-  SMTP_DOMAIN: {{ .Values.mastodon.smtp.domain }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.enable_starttls_auto }}
-  SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.mastodon.smtp.enable_starttls_auto | quote }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.from_address }}
-  SMTP_FROM_ADDRESS: {{ .Values.mastodon.smtp.from_address }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.login }}
-  SMTP_LOGIN: {{ .Values.mastodon.smtp.login }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.openssl_verify_mode }}
-  SMTP_OPENSSL_VERIFY_MODE: {{ .Values.mastodon.smtp.openssl_verify_mode }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.password }}
-  SMTP_PASSWORD: {{ .Values.mastodon.smtp.password }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.port }}
-  SMTP_PORT: {{ .Values.mastodon.smtp.port | quote }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.reply_to }}
-  SMTP_REPLY_TO: {{ .Values.mastodon.smtp.reply_to }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.server }}
-  SMTP_SERVER: {{ .Values.mastodon.smtp.server }}
-  {{- end }}
-  {{- if .Values.mastodon.smtp.tls }}
-  SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }}
-  {{- end }}
-  STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}
diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml
deleted file mode 100644
index 3d6e25cc6..000000000
--- a/chart/templates/cronjob-media-remove.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{ if .Values.mastodon.cron.removeMedia.enabled }}
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ include "mastodon.fullname" . }}-media-remove
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  schedule: {{ .Values.mastodon.cron.removeMedia.schedule }}
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          name: {{ include "mastodon.fullname" . }}-media-remove
-        spec:
-          restartPolicy: OnFailure
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          # ensure we run on the same node as the other rails components; only
-          # required when using PVCs that are ReadWriteOnce
-          {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-          affinity:
-            podAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-              - labelSelector:
-                  matchExpressions:
-                    - key: component
-                      operator: In
-                      values:
-                        - rails
-                topologyKey: kubernetes.io/hostname
-          {{- end }}
-          volumes:
-            - name: assets
-              persistentVolumeClaim:
-                claimName: {{ template "mastodon.fullname" . }}-assets
-            - name: system
-              persistentVolumeClaim:
-                claimName: {{ template "mastodon.fullname" . }}-system
-          {{- end }}
-          containers:
-            - name: {{ include "mastodon.fullname" . }}-media-remove
-              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-              imagePullPolicy: {{ .Values.image.pullPolicy }}
-              command:
-                - bin/tootctl
-                - media
-                - remove
-              envFrom:
-                - configMapRef:
-                    name: {{ include "mastodon.fullname" . }}-env
-                - secretRef:
-                    name: {{ template "mastodon.fullname" . }}
-              env:
-                - name: "DB_PASS"
-                  valueFrom:
-                    secretKeyRef:
-                      {{- if .Values.postgresql.enabled }}
-                      name: {{ .Release.Name }}-postgresql
-                      {{- else }}
-                      name: {{ template "mastodon.fullname" . }}
-                      {{- end }}
-                      key: postgresql-password
-                - name: "REDIS_PASSWORD"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ .Release.Name }}-redis
-                      key: redis-password
-                - name: "PORT"
-                  value: {{ .Values.mastodon.web.port | quote }}
-              {{- if (not .Values.mastodon.s3.enabled) }}
-              volumeMounts:
-                - name: assets
-                  mountPath: /opt/mastodon/public/assets
-                - name: system
-                  mountPath: /opt/mastodon/public/system
-              {{- end }}
-{{- end }}
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
deleted file mode 100644
index baf6c2b2d..000000000
--- a/chart/templates/deployment-sidekiq.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" . }}-sidekiq
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-{{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-{{- end }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      component: rails
-  template:
-    metadata:
-    {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-        # roll the pods to pick up any db migrations
-        rollme: {{ randAlphaNum 5 | quote }}
-    {{- end }}
-      labels:
-        {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        component: rails
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: component
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - sidekiq
-            - -c
-            - {{ .Values.mastodon.sidekiq.concurrency | quote }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml
deleted file mode 100644
index b332b686a..000000000
--- a/chart/templates/deployment-streaming.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" . }}-streaming
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-{{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-{{- end }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-    {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      labels:
-        {{- include "mastodon.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - node
-            - ./streaming
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.streaming.port | quote }}
-          ports:
-            - name: streaming
-              containerPort: {{ .Values.mastodon.streaming.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
-          readinessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml
deleted file mode 100644
index 8b8bb4f29..000000000
--- a/chart/templates/deployment-web.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" . }}-web
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-{{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-{{- end }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      component: rails
-  template:
-    metadata:
-    {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-        # roll the pods to pick up any db migrations
-        rollme: {{ randAlphaNum 5 | quote }}
-    {{- end }}
-      labels:
-        {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        component: rails
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - puma
-            - -C
-            - config/puma.rb
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.mastodon.web.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/chart/templates/hpa.yaml b/chart/templates/hpa.yaml
deleted file mode 100644
index 3f9aa8a93..000000000
--- a/chart/templates/hpa.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "mastodon.fullname" . }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "mastodon.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-  {{- end }}
-  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-  {{- end }}
-{{- end }}
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
deleted file mode 100644
index 8930d2c10..000000000
--- a/chart/templates/ingress.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "mastodon.fullname" . -}}
-{{- $webPort := .Values.mastodon.web.port -}}
-{{- $streamingPort := .Values.mastodon.streaming.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ $fullName }}-web
-              servicePort: {{ $webPort }}
-          - path: {{ .path }}api/v1/streaming
-            backend:
-              serviceName: {{ $fullName }}-streaming
-              servicePort: {{ $streamingPort }}
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml
deleted file mode 100644
index 825a7e916..000000000
--- a/chart/templates/job-assets-precompile.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-assets-precompile
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-2"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-assets-precompile
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: component
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-assets-precompile
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bash
-            - -c
-            - |
-                bundle exec rake assets:precompile && yarn cache clean
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml
deleted file mode 100644
index cc68a3385..000000000
--- a/chart/templates/job-chewy-upgrade.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-{{- if .Values.elasticsearch.enabled }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-chewy-upgrade
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-1"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-chewy-upgrade
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: component
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-chewy-setup
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - rake
-            - chewy:upgrade
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-{{- end }}
diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml
deleted file mode 100644
index ffb8bb059..000000000
--- a/chart/templates/job-create-admin.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-{{- if .Values.mastodon.createAdmin.enabled }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-create-admin
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-1"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-create-admin
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: component
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-create-admin
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bin/tootctl
-            - accounts
-            - create
-            - {{ .Values.mastodon.createAdmin.username }}
-            - --email
-            - {{ .Values.mastodon.createAdmin.email }}
-            - --confirmed
-            - --role
-            - admin
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-{{- end }}
diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml
deleted file mode 100644
index 72f910e3b..000000000
--- a/chart/templates/job-db-migrate.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-db-migrate
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install,pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-2"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-db-migrate
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: component
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-db-migrate
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - rake
-            - db:migrate
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.fullname" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-redis
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
diff --git a/chart/templates/pvc-assets.yaml b/chart/templates/pvc-assets.yaml
deleted file mode 100644
index 58b2179df..000000000
--- a/chart/templates/pvc-assets.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if (not .Values.mastodon.s3.enabled) }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ template "mastodon.fullname" . }}-assets
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.mastodon.persistence.system.accessMode }}
-  resources:
-    {{- toYaml .Values.mastodon.persistence.assets.resources | nindent 4}}
-  storageClassName: {{ .Values.mastodon.persistence.assets.storageClassName }}
-{{- end }}
diff --git a/chart/templates/pvc-system.yaml b/chart/templates/pvc-system.yaml
deleted file mode 100644
index 52398f0da..000000000
--- a/chart/templates/pvc-system.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if (not .Values.mastodon.s3.enabled) }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ template "mastodon.fullname" . }}-system
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.mastodon.persistence.system.accessMode }}
-  resources:
-    {{- toYaml .Values.mastodon.persistence.system.resources | nindent 4}}
-  storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }}
-{{- end }}
diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
deleted file mode 100644
index 0452a8ae1..000000000
--- a/chart/templates/secrets.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "mastodon.fullname" . }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-type: Opaque
-data:
-  {{- if .Values.mastodon.s3.enabled }}
-  AWS_ACCESS_KEY_ID: "{{ .Values.mastodon.s3.access_key | b64enc }}"
-  AWS_SECRET_ACCESS_KEY: "{{ .Values.mastodon.s3.access_secret | b64enc }}"
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.secret_key_base) }}
-  SECRET_KEY_BASE: "{{ .Values.mastodon.secrets.secret_key_base | b64enc }}"
-  {{- else }}
-  SECRET_KEY_BASE: {{ required "secret_key_base is required" .Values.mastodon.secrets.secret_key_base }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.otp_secret) }}
-  OTP_SECRET: "{{ .Values.mastodon.secrets.otp_secret | b64enc }}"
-  {{- else }}
-  OTP_SECRET: {{ required "otp_secret is required" .Values.mastodon.secrets.otp_secret }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.vapid.private_key) }}
-  VAPID_PRIVATE_KEY: "{{ .Values.mastodon.secrets.vapid.private_key | b64enc }}"
-  {{- else }}
-  VAPID_PRIVATE_KEY: {{ required "vapid.private_key is required" .Values.mastodon.secrets.vapid.private_key }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.vapid.public_key) }}
-  VAPID_PUBLIC_KEY: "{{ .Values.mastodon.secrets.vapid.public_key | b64enc }}"
-  {{- else }}
-  VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.mastodon.secrets.vapid.public_key }}
-  {{- end }}
-  {{- if not .Values.postgresql.enabled }}
-  postgresql-password: "{{ .Values.postgresql.postgresqlPassword | b64enc }}"
-  {{- end }}
diff --git a/chart/templates/service-streaming.yaml b/chart/templates/service-streaming.yaml
deleted file mode 100644
index a005e617c..000000000
--- a/chart/templates/service-streaming.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "mastodon.fullname" . }}-streaming
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.mastodon.streaming.port }}
-      targetPort: streaming
-      protocol: TCP
-      name: streaming
-  selector:
-    {{- include "mastodon.selectorLabels" . | nindent 4 }}
diff --git a/chart/templates/service-web.yaml b/chart/templates/service-web.yaml
deleted file mode 100644
index 3563fde70..000000000
--- a/chart/templates/service-web.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "mastodon.fullname" . }}-web
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.mastodon.web.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "mastodon.selectorLabels" . | nindent 4 }}
diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml
deleted file mode 100644
index b2f3d87c5..000000000
--- a/chart/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "mastodon.serviceAccountName" . }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/chart/templates/tests/test-connection.yaml b/chart/templates/tests/test-connection.yaml
deleted file mode 100644
index 09d981691..000000000
--- a/chart/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "mastodon.fullname" . }}-test-connection"
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "mastodon.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
diff --git a/chart/values.yaml b/chart/values.yaml
deleted file mode 100644
index 4fc4084d4..000000000
--- a/chart/values.yaml
+++ /dev/null
@@ -1,186 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: tootsuite/mastodon
-  # https://hub.docker.com/r/tootsuite/mastodon/tags
-  #
-  # alternatively, use `latest` for the latest release or `edge` for the image
-  # built from the most recent commit
-  #
-  # tag: latest
-  tag: v3.4.4
-  # use `Always` when using `latest` tag
-  pullPolicy: IfNotPresent
-
-mastodon:
-  # create an initial administrator user; the password is autogenerated and will
-  # have to be reset
-  createAdmin:
-    enabled: false
-    username: not_gargron
-    email: not@example.com
-  cron:
-    # run `tootctl media remove` every week
-    removeMedia:
-      enabled: true
-      schedule: "0 0 * * 0"
-  # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
-  locale: en
-  local_domain: mastodon.local
-  persistence:
-    assets:
-      # ReadWriteOnce is more widely supported than ReadWriteMany, but limits
-      # scalability, since it requires the Rails and Sidekiq pods to run on the
-      # same node.
-      accessMode: ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Gi
-    system:
-      accessMode: ReadWriteOnce
-      resources:
-        requests:
-          storage: 100Gi
-  s3:
-    enabled: false
-    access_key: ""
-    access_secret: ""
-    bucket: ""
-    endpoint: https://us-east-1.linodeobjects.com
-    hostname: us-east-1.linodeobjects.com
-    region: ""
-  # these must be set manually; autogenerated keys are rotated on each upgrade
-  secrets:
-    secret_key_base: ""
-    otp_secret: ""
-    vapid:
-      private_key: ""
-      public_key: ""
-  sidekiq:
-    concurrency: 25
-  smtp:
-    auth_method: plain
-    ca_file: /etc/ssl/certs/ca-certificates.crt
-    delivery_method: smtp
-    domain:
-    enable_starttls_auto: true
-    from_address: notifications@example.com
-    login:
-    openssl_verify_mode: peer
-    password:
-    port: 587
-    reply_to:
-    server: smtp.mailgun.org
-    tls: false
-  streaming:
-    port: 4000
-    # this should be set manually since os.cpus() returns the number of CPUs on
-    # the node running the pod, which is unrelated to the resources allocated to
-    # the pod by k8s
-    workers: 1
-  web:
-    port: 3000
-
-ingress:
-  enabled: true
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
-    # cert-manager.io/cluster-issuer: "letsencrypt"
-    #
-    # ensure that NGINX's upload size matches Mastodon's
-    #   for the K8s ingress controller:
-    # nginx.ingress.kubernetes.io/proxy-body-size: 40m
-    #   for the NGINX ingress controller:
-    # nginx.org/client-max-body-size: 40m
-  hosts:
-    - host: mastodon.local
-      paths:
-        - path: '/'
-  tls:
-    - secretName: mastodon-tls
-      hosts:
-        - mastodon.local
-
-# https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
-elasticsearch:
-  # `false` will disable full-text search
-  #
-  # if you enable ES after the initial install, you will need to manually run
-  # RAILS_ENV=production bundle exec rake chewy:sync
-  # (https://docs.joinmastodon.org/admin/optional/elasticsearch/)
-  enabled: true
-  # may be removed once https://github.com/tootsuite/mastodon/pull/13828 is part
-  # of a tagged release
-  image:
-    tag: 6
-
-# https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters
-postgresql:
-  # disable if you want to use an existing db; in which case the values below
-  # must match those of that external postgres instance
-  enabled: true
-  # postgresqlHostname: preexisting-postgresql
-  postgresqlDatabase: mastodon_production
-  # you must set a password; the password generated by the postgresql chart will
-  # be rotated on each upgrade:
-  # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade
-  postgresqlPassword: ""
-  postgresqlUsername: postgres
-
-# https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters
-redis:
-  # you must set a password; the password generated by the redis chart will be
-  # rotated on each upgrade:
-  password: ""
-
-service:
-  type: ClusterIP
-  port: 80
-
-# https://github.com/tootsuite/mastodon/blob/master/Dockerfile#L88
-#
-# if you manually change the UID/GID environment variables, ensure these values
-# match:
-podSecurityContext:
-  runAsUser: 991
-  runAsGroup: 991
-  fsGroup: 991
-
-securityContext: {}
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/config/application.rb b/config/application.rb
index 561722884..929a44948 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,12 +22,10 @@ require 'mail'
 Bundler.require(*Rails.groups)
 
 require_relative '../lib/exceptions'
-require_relative '../lib/enumerable'
 require_relative '../lib/sanitize_ext/sanitize_config'
 require_relative '../lib/redis/namespace_extensions'
 require_relative '../lib/paperclip/url_generator_extensions'
 require_relative '../lib/paperclip/attachment_extensions'
-require_relative '../lib/paperclip/storage_extensions'
 require_relative '../lib/paperclip/lazy_thumbnail'
 require_relative '../lib/paperclip/gif_transcoder'
 require_relative '../lib/paperclip/transcoder'
@@ -36,15 +34,16 @@ require_relative '../lib/paperclip/response_with_limit_adapter'
 require_relative '../lib/terrapin/multi_pipe_extensions'
 require_relative '../lib/mastodon/snowflake'
 require_relative '../lib/mastodon/version'
+require_relative '../lib/mastodon/rack_middleware'
 require_relative '../lib/devise/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/two_factor_pam_authenticatable'
-require_relative '../lib/chewy/strategy/custom_sidekiq'
+require_relative '../lib/chewy/strategy/mastodon'
 require_relative '../lib/webpacker/manifest_extensions'
 require_relative '../lib/webpacker/helper_extensions'
-require_relative '../lib/action_dispatch/cookie_jar_extensions'
 require_relative '../lib/rails/engine_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
+require_relative '../lib/simple_navigation/item_extensions'
 
 Dotenv::Railtie.load
 
@@ -72,10 +71,12 @@ module Mastodon
       :af,
       :ar,
       :ast,
+      :be,
       :bg,
       :bn,
       :br,
       :ca,
+      :ckb,
       :co,
       :cs,
       :cy,
@@ -92,6 +93,7 @@ module Mastodon
       :fa,
       :fi,
       :fr,
+      :fy,
       :ga,
       :gd,
       :gl,
@@ -108,7 +110,6 @@ module Mastodon
       :ka,
       :kab,
       :kk,
-      :kmr,
       :kn,
       :ko,
       :ku,
@@ -149,19 +150,24 @@ module Mastodon
       :'zh-TW',
     ]
 
-    config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
+    config.i18n.default_locale = begin
+      custom_default_locale = ENV['DEFAULT_LOCALE']&.to_sym
 
-    unless config.i18n.available_locales.include?(config.i18n.default_locale)
-      config.i18n.default_locale = :en
+      if config.i18n.available_locales.include?(custom_default_locale)
+        custom_default_locale
+      else
+        :en
+      end
     end
 
     # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
     # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
 
     config.active_job.queue_adapter = :sidekiq
+    config.action_mailer.deliver_later_queue_name = 'mailers'
 
     config.middleware.use Rack::Attack
-    config.middleware.use Rack::Deflater
+    config.middleware.use Mastodon::RackMiddleware
 
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'modal'
@@ -169,7 +175,6 @@ module Mastodon
       Doorkeeper::Application.send :include, ApplicationExtension
       Doorkeeper::AccessToken.send :include, AccessTokenExtension
       Devise::FailureApp.send :include, AbstractController::Callbacks
-      Devise::FailureApp.send :include, HttpAcceptLanguage::EasyAccess
       Devise::FailureApp.send :include, Localized
     end
   end
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index c032e5412..80c5f6d4e 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,25 +1,5 @@
 {
   "ignored_warnings": [
-    {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "04dbbc249b989db2e0119bbb0f59c9818e12889d2b97c529cdc0b1526002ba4b",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/report.rb",
-      "line": 113,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "Admin::ActionLog.from(\"(#{[Admin::ActionLog.where(:target_type => \"Report\", :target_id => id, :created_at => ((created_at..updated_at))).unscope(:order), Admin::ActionLog.where(:target_type => \"Account\", :target_id => target_account_id, :created_at => ((created_at..updated_at))).unscope(:order), Admin::ActionLog.where(:target_type => \"Status\", :target_id => status_ids, :created_at => ((created_at..updated_at))).unscope(:order)].map do\n \"(#{query.to_sql})\"\n end.join(\" UNION ALL \")}) AS admin_action_logs\")",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "Report",
-        "method": "history"
-      },
-      "user_input": "Admin::ActionLog.where(:target_type => \"Status\", :target_id => status_ids, :created_at => ((created_at..updated_at))).unscope(:order)",
-      "confidence": "High",
-      "note": ""
-    },
     {
       "warning_type": "SQL Injection",
       "warning_code": 0,
@@ -27,7 +7,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/models/status.rb",
-      "line": 100,
+      "line": 106,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "result.joins(\"INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}\")",
       "render_path": null,
@@ -40,6 +20,26 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "30dfe36e87fe1b8f239df9a33d576e44a9863f73b680198d4713be6540ae61d3",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/trends/query.rb",
+      "line": 76,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "klass.joins(\"join unnest(array[#{ids.join(\",\")}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Trends::Query",
+        "method": "to_arel"
+      },
+      "user_input": "ids.join(\",\")",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -61,42 +61,32 @@
       "note": ""
     },
     {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "6e4051854bb62e2ddbc671f82d6c2328892e1134b8b28105ecba9b0122540714",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/account.rb",
-      "line": 484,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "find_by_sql([\"          WITH first_degree AS (\\n            SELECT target_account_id\\n            FROM follows\\n            WHERE account_id = ?\\n            UNION ALL\\n            SELECT ?\\n          )\\n          SELECT\\n            accounts.*,\\n            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n          FROM accounts\\n          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?)\\n          WHERE accounts.id IN (SELECT * FROM first_degree)\\n            AND #{query} @@ #{textsearch}\\n            AND accounts.suspended_at IS NULL\\n            AND accounts.moved_to_account_id IS NULL\\n          GROUP BY accounts.id\\n          ORDER BY rank DESC\\n          LIMIT ? OFFSET ?\\n\".squish, account.id, account.id, account.id, limit, offset])",
-      "render_path": null,
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "71cf98c8235b5cfa9946b5db8fdc1a2f3a862566abb34e4542be6f3acae78233",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped model attribute",
+      "file": "app/views/admin/disputes/appeals/_appeal.html.haml",
+      "line": 7,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "t((Unresolved Model).new.strike.action, :scope => \"admin.strikes.actions\", :name => content_tag(:span, (Unresolved Model).new.strike.account.username, :class => \"username\"), :target => content_tag(:span, (Unresolved Model).new.account.username, :class => \"target\"))",
+      "render_path": [
+        {
+          "type": "template",
+          "name": "admin/disputes/appeals/index",
+          "line": 20,
+          "file": "app/views/admin/disputes/appeals/index.html.haml",
+          "rendered": {
+            "name": "admin/disputes/appeals/_appeal",
+            "file": "app/views/admin/disputes/appeals/_appeal.html.haml"
+          }
+        }
+      ],
       "location": {
-        "type": "method",
-        "class": "Account",
-        "method": "advanced_search_for"
+        "type": "template",
+        "template": "admin/disputes/appeals/_appeal"
       },
-      "user_input": "textsearch",
-      "confidence": "Medium",
-      "note": ""
-    },
-    {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "6f075c1484908e3ec9bed21ab7cf3c7866be8da3881485d1c82e13093aefcbd7",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/status.rb",
-      "line": 105,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "result.joins(\"LEFT OUTER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}\")",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "Status",
-        "method": null
-      },
-      "user_input": "id",
+      "user_input": "(Unresolved Model).new.strike",
       "confidence": "Weak",
       "note": ""
     },
@@ -147,7 +137,7 @@
       "check_name": "PermitAttributes",
       "message": "Potentially dangerous key allowed for mass assignment",
       "file": "app/controllers/api/v1/admin/reports_controller.rb",
-      "line": 78,
+      "line": 90,
       "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
       "code": "params.permit(:resolved, :account_id, :target_account_id)",
       "render_path": null,
@@ -161,43 +151,23 @@
       "note": ""
     },
     {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "8c1d8c4b76c1cd3960e90dff999f854a6ff742fcfd8de6c7184ac5a1b1a4d7dd",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/preview_card_filter.rb",
-      "line": 50,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "PreviewCard.joins(\"join unnest(array[#{(Trends.links.currently_trending_ids(true, -1) or Trends.links.currently_trending_ids(false, -1)).map(&:to_i).join(\",\")}]::integer[]) with ordinality as x (id, ordering) on preview_cards.id = x.id\")",
+      "warning_type": "Mass Assignment",
+      "warning_code": 105,
+      "fingerprint": "ab5035dd1a9f8c3a8d92fb2c37e8fe86fede4f87c91b71aa32e89c9eede602fc",
+      "check_name": "PermitAttributes",
+      "message": "Potentially dangerous key allowed for mass assignment",
+      "file": "app/controllers/api/v1/notifications_controller.rb",
+      "line": 81,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.permit(:account_id, :types => ([]), :exclude_types => ([]))",
       "render_path": null,
       "location": {
         "type": "method",
-        "class": "PreviewCardFilter",
-        "method": "trending_scope"
+        "class": "Api::V1::NotificationsController",
+        "method": "browserable_params"
       },
-      "user_input": "(Trends.links.currently_trending_ids(true, -1) or Trends.links.currently_trending_ids(false, -1)).map(&:to_i).join(\",\")",
-      "confidence": "Medium",
-      "note": ""
-    },
-    {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "9251d682c4e2840e1b2fea91e7d758efe2097ecb7f6255c065e3750d25eb178c",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/account.rb",
-      "line": 453,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "find_by_sql([\"        SELECT\\n          accounts.*,\\n          ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n        FROM accounts\\n        WHERE #{query} @@ #{textsearch}\\n          AND accounts.suspended_at IS NULL\\n          AND accounts.moved_to_account_id IS NULL\\n        ORDER BY rank DESC\\n        LIMIT ? OFFSET ?\\n\".squish, limit, offset])",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "Account",
-        "method": "search_for"
-      },
-      "user_input": "textsearch",
-      "confidence": "Medium",
+      "user_input": ":account_id",
+      "confidence": "High",
       "note": ""
     },
     {
@@ -220,26 +190,6 @@
       "confidence": "High",
       "note": ""
     },
-    {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "c32a484ccd9da46abd3bc93d08b72029d7dbc0576ccf4e878a9627e9a83cad2e",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/tag_filter.rb",
-      "line": 50,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "Tag.joins(\"join unnest(array[#{Trends.tags.currently_trending_ids(false, -1).map(&:to_i).join(\",\")}]::integer[]) with ordinality as x (id, ordering) on tags.id = x.id\")",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "TagFilter",
-        "method": "trending_scope"
-      },
-      "user_input": "Trends.tags.currently_trending_ids(false, -1).map(&:to_i).join(\",\")",
-      "confidence": "Medium",
-      "note": ""
-    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 4,
@@ -254,7 +204,7 @@
         {
           "type": "template",
           "name": "admin/trends/links/index",
-          "line": 37,
+          "line": 49,
           "file": "app/views/admin/trends/links/index.html.haml",
           "rendered": {
             "name": "admin/trends/links/_preview_card",
@@ -270,36 +220,16 @@
       "confidence": "Weak",
       "note": ""
     },
-    {
-      "warning_type": "SQL Injection",
-      "warning_code": 0,
-      "fingerprint": "e21d8fee7a5805761679877ca35ed1029c64c45ef3b4012a30262623e1ba8bb9",
-      "check_name": "SQL",
-      "message": "Possible SQL injection",
-      "file": "app/models/account.rb",
-      "line": 500,
-      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
-      "code": "find_by_sql([\"          SELECT\\n            accounts.*,\\n            (count(f.id) + 1) * ts_rank_cd(#{textsearch}, #{query}, 32) AS rank\\n          FROM accounts\\n          LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?) OR (accounts.id = f.target_account_id AND f.account_id = ?)\\n          WHERE #{query} @@ #{textsearch}\\n            AND accounts.suspended_at IS NULL\\n            AND accounts.moved_to_account_id IS NULL\\n          GROUP BY accounts.id\\n          ORDER BY rank DESC\\n          LIMIT ? OFFSET ?\\n\".squish, account.id, account.id, limit, offset])",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "Account",
-        "method": "advanced_search_for"
-      },
-      "user_input": "textsearch",
-      "confidence": "Medium",
-      "note": ""
-    },
     {
       "warning_type": "Mass Assignment",
       "warning_code": 105,
-      "fingerprint": "e867661b2c9812bc8b75a5df12b28e2a53ab97015de0638b4e732fe442561b28",
+      "fingerprint": "f9de0ca4b04ae4b51b74d98db14dcbb6dae6809e627b58e711019cf9b4a47866",
       "check_name": "PermitAttributes",
       "message": "Potentially dangerous key allowed for mass assignment",
       "file": "app/controllers/api/v1/reports_controller.rb",
-      "line": 36,
+      "line": 26,
       "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
-      "code": "params.permit(:account_id, :comment, :forward, :status_ids => ([]))",
+      "code": "params.permit(:account_id, :comment, :category, :forward, :status_ids => ([]), :rule_ids => ([]))",
       "render_path": null,
       "location": {
         "type": "method",
@@ -311,6 +241,6 @@
       "note": ""
     }
   ],
-  "updated": "2021-11-14 05:26:09 +0100",
-  "brakeman_version": "5.1.2"
+  "updated": "2022-03-22 07:48:32 +0100",
+  "brakeman_version": "5.2.1"
 }
diff --git a/config/database.yml b/config/database.yml
index c10bff6b2..bfb53f21b 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -2,6 +2,7 @@ default: &default
   adapter: postgresql
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
+  connect_timeout: 15
   encoding: unicode
   sslmode: <%= ENV['DB_SSLMODE'] || "prefer" %>
 
@@ -9,7 +10,7 @@ development:
   <<: *default
   database: <%= ENV['DB_NAME'] || 'mastodon_development' %>
   username: <%= ENV['DB_USER'] %>
-  password: <%= ENV['DB_PASS'] %>
+  password: <%= (ENV['DB_PASS'] || '').to_json %>
   host: <%= ENV['DB_HOST'] %>
   port: <%= ENV['DB_PORT'] %>
 
@@ -20,7 +21,7 @@ test:
   <<: *default
   database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %>
   username: <%= ENV['DB_USER'] %>
-  password: <%= ENV['DB_PASS'] %>
+  password: <%= (ENV['DB_PASS'] || '').to_json %>
   host: <%= ENV['DB_HOST'] %>
   port: <%= ENV['DB_PORT'] %>
 
@@ -28,8 +29,7 @@ production:
   <<: *default
   database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
   username: <%= ENV['DB_USER'] || 'mastodon' %>
-  password: <%= ENV['DB_PASS'] || '' %>
+  password: <%= (ENV['DB_PASS'] || '').to_json %>
   host: <%= ENV['DB_HOST'] || 'localhost' %>
   port: <%= ENV['DB_PORT'] || 5432 %>
   prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
-
diff --git a/config/deploy.rb b/config/deploy.rb
index f642e6e59..b69a83067 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-lock '3.16.0'
+lock '3.17.1'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/mastodon/mastodon.git')
-set :branch, ENV.fetch('BRANCH', 'master')
+set :branch, ENV.fetch('BRANCH', 'main')
 
 set :application, 'mastodon'
 set :rbenv_type, :user
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d76361c60..de8762ff7 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -81,7 +81,7 @@ Rails.application.configure do
     Bullet.bullet_logger = true
     Bullet.rails_logger  = false
 
-    Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account
+    Bullet.add_safelist type: :n_plus_one_query, class_name: 'User', association: :account
   end
 
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4a8899944..5ea9ea9ba 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -42,12 +42,12 @@ Rails.application.configure do
   config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Allow to specify public IP of reverse proxy if it's needed
-  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split.map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
+  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split(/(?:\s*,\s*|\s+)/).map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
 
   config.force_ssl = true
   config.ssl_options = {
     redirect: {
-      exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') }
+      exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
     }
   }
 
@@ -91,25 +91,43 @@ Rails.application.configure do
 
   # E-mails
   outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost')
-  outgoing_mail_domain   = Mail::Address.new(outgoing_email_address).domain
+  outgoing_email_domain  = Mail::Address.new(outgoing_email_address).domain
+
   config.action_mailer.default_options = {
     from: outgoing_email_address,
-    reply_to: ENV['SMTP_REPLY_TO'],
-    'Message-ID': -> { "<#{Mail.random_tag}@#{outgoing_mail_domain}>" },
+    message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" },
   }
 
+  config.action_mailer.default_options[:reply_to]    = ENV['SMTP_REPLY_TO'] if ENV['SMTP_REPLY_TO'].present?
+  config.action_mailer.default_options[:return_path] = ENV['SMTP_RETURN_PATH'] if ENV['SMTP_RETURN_PATH'].present?
+
+  enable_starttls = nil
+  enable_starttls_auto = nil
+
+  case ENV['SMTP_ENABLE_STARTTLS']
+  when 'always'
+    enable_starttls = true
+  when 'never'
+    enable_starttls = false
+  when 'auto'
+    enable_starttls_auto = true
+  else
+    enable_starttls_auto = ENV['SMTP_ENABLE_STARTTLS_AUTO'] != 'false'
+  end
+
   config.action_mailer.smtp_settings = {
-    :port                 => ENV['SMTP_PORT'],
-    :address              => ENV['SMTP_SERVER'],
-    :user_name            => ENV['SMTP_LOGIN'].presence,
-    :password             => ENV['SMTP_PASSWORD'].presence,
-    :domain               => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'],
-    :authentication       => ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain,
-    :ca_file              => ENV['SMTP_CA_FILE'].presence || '/etc/ssl/certs/ca-certificates.crt',
-    :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
-    :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
-    :tls                  => ENV['SMTP_TLS'].presence,
-    :ssl                  => ENV['SMTP_SSL'].presence,
+    port: ENV['SMTP_PORT'],
+    address: ENV['SMTP_SERVER'],
+    user_name: ENV['SMTP_LOGIN'].presence,
+    password: ENV['SMTP_PASSWORD'].presence,
+    domain: ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'],
+    authentication: ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain,
+    ca_file: ENV['SMTP_CA_FILE'].presence || '/etc/ssl/certs/ca-certificates.crt',
+    openssl_verify_mode: ENV['SMTP_OPENSSL_VERIFY_MODE'],
+    enable_starttls: enable_starttls,
+    enable_starttls_auto: enable_starttls_auto,
+    tls: ENV['SMTP_TLS'].presence && ENV['SMTP_TLS'] == 'true',
+    ssl: ENV['SMTP_SSL'].presence && ENV['SMTP_SSL'] == 'true',
   }
 
   config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
@@ -118,7 +136,7 @@ Rails.application.configure do
     'Server'                 => 'Mastodon',
     'X-Frame-Options'        => 'DENY',
     'X-Content-Type-Options' => 'nosniff',
-    'X-XSS-Protection'       => '1; mode=block',
+    'X-XSS-Protection'       => '0',
     'Permissions-Policy'     => 'interest-cohort=()',
   }
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a35cadcfa..ef3cb2e48 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -70,3 +70,6 @@ if ENV['PAM_ENABLED'] == 'true'
       env: { email: 'pam@example.com' }
     }
 end
+
+# Catch serialization warnings early
+Sidekiq.strict_args!
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 2dc6f880b..c1da42bd8 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -17,8 +17,8 @@ data:
 
 search:
   paths:
-   - app/
-   - config/navigation.rb
+    - app/
+    - config/navigation.rb
 
   relative_roots:
     - app/controllers
@@ -40,7 +40,6 @@ ignore_missing:
   - 'errors.messages.*'
   - 'activerecord.errors.models.doorkeeper/*'
   - 'sessions.{browsers,platforms}.*'
-  - 'terms.body_html'
   - 'application_mailer.salutation'
   - 'errors.500'
   - 'auth.providers.*'
@@ -51,7 +50,7 @@ ignore_unused:
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
   - '{date,datetime,time,number}.*'
-  - 'simple_form.{yes,no,recommended}'
+  - 'simple_form.{yes,no,recommended,not_recommended}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
   - 'errors.messages.*'
@@ -59,8 +58,10 @@ ignore_unused:
   - 'errors.429'
   - 'admin.accounts.roles.*'
   - 'admin.action_logs.actions.*'
+  - 'admin_mailer.new_appeal.actions.*'
   - 'statuses.attached.*'
   - 'move_handler.carry_{mutes,blocks}_over_text'
+  - 'notification_mailer.*'
 
 ignore_inconsistent_interpolations:
   - '*.one'
diff --git a/config/initializers/cache_logging.rb b/config/initializers/cache_logging.rb
new file mode 100644
index 000000000..08aa80742
--- /dev/null
+++ b/config/initializers/cache_logging.rb
@@ -0,0 +1,3 @@
+# Log cache errors with Rail's logger
+# This used to be the default in old Rails versions: https://github.com/rails/rails/commit/7fcf8590e788cef8b64cc266f75931c418902ca9#diff-f0748f0be8a653eea13369ebb1cadabcad71ede7cfaf20282447e64329817befL86
+Rails.cache.logger = Rails.logger
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index f303fc54d..752fc3c6d 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -13,15 +13,14 @@ Chewy.settings = {
   journal: false,
   user: user,
   password: password,
-  sidekiq: { queue: 'pull' },
 }
 
 # We use our own async strategy even outside the request-response
 # cycle, which takes care of checking if Elasticsearch is enabled
 # or not. However, mind that for the Rails console, the :urgent
 # strategy is set automatically with no way to override it.
-Chewy.root_strategy              = :custom_sidekiq
-Chewy.request_strategy           = :custom_sidekiq
+Chewy.root_strategy              = :mastodon
+Chewy.request_strategy           = :mastodon
 Chewy.use_after_commit_callbacks = false
 
 module Chewy
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index b377b7b4d..cb5629337 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -26,6 +26,7 @@ Rails.application.config.content_security_policy do |p|
   p.media_src       :self, :https, :data, assets_host
   p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
+  p.form_action     :self
 
   if Rails.env.development?
     webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
@@ -36,7 +37,7 @@ Rails.application.config.content_security_policy do |p|
     p.worker_src  :self, :blob, assets_host
   else
     p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
-    p.script_src  :self, assets_host
+    p.script_src  :self, assets_host, "'wasm-unsafe-eval'"
     p.child_src   :self, :blob, assets_host
     p.worker_src  :self, :blob, assets_host
   end
@@ -60,4 +61,20 @@ Rails.application.reloader.to_prepare do
   PgHero::HomeController.after_action do
     request.content_security_policy_nonce_generator = nil
   end
+
+  if Rails.env.development?
+    LetterOpenerWeb::LettersController.content_security_policy do |p|
+      p.child_src       :self
+      p.connect_src     :none
+      p.frame_ancestors :self
+      p.frame_src       :self
+      p.script_src      :unsafe_inline
+      p.style_src       :unsafe_inline
+      p.worker_src      :none
+    end
+
+    LetterOpenerWeb::LettersController.after_action do |p|
+      request.content_security_policy_nonce_directives = %w(script-src)
+    end
+  end
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 5232e6cfd..d7b252c3f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,28 +1,27 @@
 require 'devise/strategies/authenticatable'
 
 Warden::Manager.after_set_user except: :fetch do |user, warden|
-  if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'])
-    session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
-  else
-    session_id = user.activate_session(warden.request)
-  end
+  session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
+  session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
 
   warden.cookies.signed['_session_id'] = {
     value: session_id,
     expires: 1.year.from_now,
     httponly: true,
-    secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
     same_site: :lax,
   }
 end
 
 Warden::Manager.after_fetch do |user, warden|
-  if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'])
+  session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
+
+  if session_id && (session = user.session_activations.find_by(session_id: session_id))
+    session.update(ip: warden.request.remote_ip) if session.ip != warden.request.remote_ip
+
     warden.cookies.signed['_session_id'] = {
-      value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'],
+      value: session_id,
       expires: 1.year.from_now,
       httponly: true,
-      secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
       same_site: :lax,
     }
   else
@@ -160,7 +159,7 @@ Devise.setup do |config|
   # config.request_keys = []
 
   # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
+  # These keys will be lowercased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [:email]
 
@@ -264,7 +263,7 @@ Devise.setup do |config|
 
   # Options to be passed to the created cookie. For instance, you can set
   # secure: true in order to force SSL only cookies.
-  config.rememberable_options = { secure: true }
+  config.rememberable_options = {}
 
   # ==> Configuration for :validatable
   # Range for password length.
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index f78db8653..43aac5769 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -98,9 +98,19 @@ Doorkeeper.configure do
                   :'admin:read',
                   :'admin:read:accounts',
                   :'admin:read:reports',
+                  :'admin:read:domain_allows',
+                  :'admin:read:domain_blocks',
+                  :'admin:read:ip_blocks',
+                  :'admin:read:email_domain_blocks',
+                  :'admin:read:canonical_email_blocks',
                   :'admin:write',
                   :'admin:write:accounts',
                   :'admin:write:reports',
+                  :'admin:write:domain_allows',
+                  :'admin:write:domain_blocks',
+                  :'admin:write:ip_blocks',
+                  :'admin:write:email_domain_blocks',
+                  :'admin:write:canonical_email_blocks',
                   :crypto
 
   # Change the way client credentials are retrieved from the request object.
@@ -128,6 +138,13 @@ Doorkeeper.configure do
   #
   force_ssl_in_redirect_uri false
 
+  # Specify what redirect URI's you want to block during Application creation.
+  # Any redirect URI is whitelisted by default.
+  #
+  # You can use this option in order to forbid URI's with 'javascript' scheme
+  # for example.
+  forbid_redirect_uri { |uri| %w[data vbscript javascript].include?(uri.scheme.to_s.downcase) }
+
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:
   #
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index 7a9b7b86d..b29e9edd7 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -18,5 +18,22 @@ Rails.application.configure do
     }.compact
   end
 
+  if ENV['http_hidden_proxy'].present?
+    proxy = URI.parse(ENV['http_hidden_proxy'])
+
+    raise "Unsupported proxy type: #{proxy.scheme}" unless %w(http https).include? proxy.scheme
+    raise "No proxy host" unless proxy.host
+
+    host = proxy.host
+    host = host[1...-1] if host[0] == '[' # for IPv6 address
+
+    config.x.http_client_hidden_proxy[:proxy] = {
+      proxy_address: host,
+      proxy_port: proxy.port,
+      proxy_username: proxy.user,
+      proxy_password: proxy.password,
+    }.compact
+  end
+
   config.x.access_to_hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
 end
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 9bc9a54b2..a361cb0ec 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -24,6 +24,8 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'RSS'
   inflect.acronym 'REST'
   inflect.acronym 'URL'
+  inflect.acronym 'ASCII'
+  inflect.acronym 'DeepL'
 
   inflect.singular 'data', 'data'
 end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 5039b4c1f..f01670146 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,15 +1,15 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
-  # Vanilla omniauth stategies
+  # Vanilla omniauth strategies
 end
 
 Devise.setup do |config|
   # Devise omniauth strategies
   options = {}
-  options[:redirect_at_sign_in] = ENV['OAUTH_REDIRECT_AT_SIGN_IN'] == 'true'
 
   # CAS strategy
   if ENV['CAS_ENABLED'] == 'true'
-    cas_options = options
+    cas_options = {}
+    cas_options[:display_name] = ENV['CAS_DISPLAY_NAME']
     cas_options[:url] = ENV['CAS_URL'] if ENV['CAS_URL']
     cas_options[:host] = ENV['CAS_HOST'] if ENV['CAS_HOST']
     cas_options[:port] = ENV['CAS_PORT'] if ENV['CAS_PORT']
@@ -37,7 +37,8 @@ Devise.setup do |config|
 
   # SAML strategy
   if ENV['SAML_ENABLED'] == 'true'
-    saml_options = options
+    saml_options = {}
+    saml_options[:display_name] = ENV['SAML_DISPLAY_NAME']
     saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL']
     saml_options[:issuer] = ENV['SAML_ISSUER'] if ENV['SAML_ISSUER']
     saml_options[:idp_sso_target_url] = ENV['SAML_IDP_SSO_TARGET_URL'] if ENV['SAML_IDP_SSO_TARGET_URL']
@@ -65,4 +66,39 @@ Devise.setup do |config|
     saml_options[:allowed_clock_drift] = ENV['SAML_ALLOWED_CLOCK_DRIFT'] if ENV['SAML_ALLOWED_CLOCK_DRIFT']
     config.omniauth :saml, saml_options
   end
+
+  # OpenID Connect Strategy
+  if ENV['OIDC_ENABLED'] == 'true'
+    oidc_options = {}
+    oidc_options[:display_name] = ENV['OIDC_DISPLAY_NAME'] #OPTIONAL
+    oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] #NEED
+    oidc_options[:discovery] = ENV['OIDC_DISCOVERY'] == 'true' if ENV['OIDC_DISCOVERY'] #OPTIONAL (default: false)
+    oidc_options[:client_auth_method] =  ENV['OIDC_CLIENT_AUTH_METHOD'] if ENV['OIDC_CLIENT_AUTH_METHOD'] #OPTIONAL (default: basic)
+    scope_string = ENV['OIDC_SCOPE'] if ENV['OIDC_SCOPE'] #NEED
+    scopes = scope_string.split(',')
+    oidc_options[:scope] = scopes.map { |x| x.to_sym }
+    oidc_options[:response_type] = ENV['OIDC_RESPONSE_TYPE'] if ENV['OIDC_RESPONSE_TYPE'] #OPTIONAL (default: code)
+    oidc_options[:response_mode] = ENV['OIDC_RESPONSE_MODE'] if ENV['OIDC_RESPONSE_MODE'] #OPTIONAL (default: query)
+    oidc_options[:display] = ENV['OIDC_DISPLAY'] if ENV['OIDC_DISPLAY'] #OPTIONAL (default: page)
+    oidc_options[:prompt] = ENV['OIDC_PROMPT'] if ENV['OIDC_PROMPT'] #OPTIONAL
+    oidc_options[:send_nonce] = ENV['OIDC_SEND_NONCE'] == 'true' if ENV['OIDC_SEND_NONCE'] #OPTIONAL (default: true)
+    oidc_options[:send_scope_to_token_endpoint] = ENV['OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT'] == 'true' if ENV['OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT'] #OPTIONAL (default: true)
+    oidc_options[:post_logout_redirect_uri] = ENV['OIDC_IDP_LOGOUT_REDIRECT_URI'] if ENV['OIDC_IDP_LOGOUT_REDIRECT_URI'] #OPTIONAL
+    oidc_options[:uid_field] = ENV['OIDC_UID_FIELD'] if ENV['OIDC_UID_FIELD'] #NEED
+    oidc_options[:client_options] = {}
+    oidc_options[:client_options][:identifier] = ENV['OIDC_CLIENT_ID'] if ENV['OIDC_CLIENT_ID'] #NEED
+    oidc_options[:client_options][:secret] = ENV['OIDC_CLIENT_SECRET'] if ENV['OIDC_CLIENT_SECRET'] #NEED
+    oidc_options[:client_options][:redirect_uri] = ENV['OIDC_REDIRECT_URI'] if ENV['OIDC_REDIRECT_URI'] #NEED
+    oidc_options[:client_options][:scheme] = ENV['OIDC_HTTP_SCHEME'] if ENV['OIDC_HTTP_SCHEME'] #OPTIONAL (default: https)
+    oidc_options[:client_options][:host] = ENV['OIDC_HOST'] if ENV['OIDC_HOST'] #OPTIONAL
+    oidc_options[:client_options][:port] = ENV['OIDC_PORT'] if ENV['OIDC_PORT'] #OPTIONAL
+    oidc_options[:client_options][:authorization_endpoint] = ENV['OIDC_AUTH_ENDPOINT'] if ENV['OIDC_AUTH_ENDPOINT'] #NEED when discovery != true
+    oidc_options[:client_options][:token_endpoint] = ENV['OIDC_TOKEN_ENDPOINT'] if ENV['OIDC_TOKEN_ENDPOINT'] #NEED when discovery != true
+    oidc_options[:client_options][:userinfo_endpoint] = ENV['OIDC_USER_INFO_ENDPOINT'] if ENV['OIDC_USER_INFO_ENDPOINT'] #NEED when discovery != true
+    oidc_options[:client_options][:jwks_uri] = ENV['OIDC_JWKS_URI'] if ENV['OIDC_JWKS_URI'] #NEED when discovery != true
+    oidc_options[:client_options][:end_session_endpoint] = ENV['OIDC_END_SESSION_ENDPOINT'] if ENV['OIDC_END_SESSION_ENDPOINT'] #OPTIONAL
+    oidc_options[:security] = {}
+    oidc_options[:security][:assume_email_is_verified] = ENV['OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED'] == 'true' #OPTIONAL
+    config.omniauth :openid_connect, oidc_options
+  end
 end
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index e2a045647..a2285427c 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -67,6 +67,12 @@ if ENV['S3_ENABLED'] == 'true'
       retry_limit: 0,
     }
   )
+  
+  if ENV['S3_PERMISSION'] == ''
+    Paperclip::Attachment.default_options.merge!(
+      s3_permissions: ->(*) { nil }
+    )
+  end
 
   if ENV.has_key?('S3_ENDPOINT')
     Paperclip::Attachment.default_options[:s3_options].merge!(
@@ -83,6 +89,26 @@ if ENV['S3_ENABLED'] == 'true'
       s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST']
     )
   end
+
+  # Some S3-compatible providers might not actually be compatible with some APIs
+  # used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822
+  if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
+    module Paperclip
+      module Storage
+        module S3Extensions
+          def copy_to_local_file(style, local_dest_path)
+            log("copying #{path(style)} to local file #{local_dest_path}")
+            s3_object(style).download_file(local_dest_path, { mode: 'single_request' })
+          rescue Aws::Errors::ServiceError => e
+            warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
+            false
+          end
+        end
+      end
+    end
+
+    Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions)
+  end
 elsif ENV['SWIFT_ENABLED'] == 'true'
   require 'fog/openstack'
 
@@ -99,6 +125,8 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
       openstack_region: ENV['SWIFT_REGION'],
       openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 },
     },
+    
+    fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' },
 
     fog_directory: ENV['SWIFT_CONTAINER'],
     fog_host: ENV['SWIFT_OBJECT_URL'],
diff --git a/config/initializers/pghero.rb b/config/initializers/pghero.rb
new file mode 100644
index 000000000..0c77d6d0f
--- /dev/null
+++ b/config/initializers/pghero.rb
@@ -0,0 +1 @@
+PgHero.show_migrations = Rails.env.development?
diff --git a/config/initializers/preload_link_headers.rb b/config/initializers/preload_link_headers.rb
index 9f21c45ec..364a7cc1b 100644
--- a/config/initializers/preload_link_headers.rb
+++ b/config/initializers/preload_link_headers.rb
@@ -2,7 +2,7 @@
 # in the Links header per default.
 
 # In our case, that will bloat headers too much and potentially cause
-# issues with reverse proxies. Furhermore, we don't need those links,
+# issues with reverse proxies. Furthermore, we don't need those links,
 # as we already output them as HTML link tags.
 
 Rails.application.config.action_view.preload_links_header = false
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 2a6cca7dc..72ef7ba80 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -17,6 +17,18 @@ class Rack::Attack
       @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
     end
 
+    def throttleable_remote_ip
+      @throttleable_remote_ip ||= begin
+        ip = IPAddr.new(remote_ip)
+
+        if ip.ipv6?
+          ip.mask(64)
+        else
+          ip
+        end
+      end.to_s
+    end
+
     def authenticated_user_id
       authenticated_token&.resource_owner_id
     end
@@ -29,6 +41,10 @@ class Rack::Attack
       path.start_with?('/api')
     end
 
+    def path_matches?(other_path)
+      /\A#{Regexp.escape(other_path)}(\..*)?\z/ =~ path
+    end
+
     def web_request?
       !api_request?
     end
@@ -51,19 +67,19 @@ class Rack::Attack
   end
 
   throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req|
-    req.remote_ip if req.api_request? && req.unauthenticated?
+    req.throttleable_remote_ip if req.api_request? && req.unauthenticated?
   end
 
   throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req|
-    req.authenticated_user_id if req.post? && req.path.start_with?('/api/v1/media')
+    req.authenticated_user_id if req.post? && req.path.match?(/\A\/api\/v\d+\/media\z/i)
   end
 
   throttle('throttle_media_proxy', limit: 30, period: 10.minutes) do |req|
-    req.remote_ip if req.path.start_with?('/media_proxy')
+    req.throttleable_remote_ip if req.path.start_with?('/media_proxy')
   end
 
   throttle('throttle_api_sign_up', limit: 5, period: 30.minutes) do |req|
-    req.remote_ip if req.post? && req.path == '/api/v1/accounts'
+    req.throttleable_remote_ip if req.post? && req.path == '/api/v1/accounts'
   end
 
   throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
@@ -71,34 +87,34 @@ class Rack::Attack
   end
 
   throttle('throttle_unauthenticated_paging', limit: 300, period: 15.minutes) do |req|
-    req.remote_ip if req.paging_request? && req.unauthenticated?
+    req.throttleable_remote_ip if req.paging_request? && req.unauthenticated?
   end
 
-  API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog/.freeze
-  API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze
+  API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog\z/.freeze
+  API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+\z/.freeze
 
   throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
     req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
   end
 
   throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && req.path == '/auth'
+    req.throttleable_remote_ip if req.post? && req.path_matches?('/auth')
   end
 
   throttle('throttle_password_resets/ip', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && req.path == '/auth/password'
+    req.throttleable_remote_ip if req.post? && req.path_matches?('/auth/password')
   end
 
   throttle('throttle_password_resets/email', limit: 5, period: 30.minutes) do |req|
-    req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/password'
+    req.params.dig('user', 'email').presence if req.post? && req.path_matches?('/auth/password')
   end
 
   throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && %w(/auth/confirmation /api/v1/emails/confirmations).include?(req.path)
+    req.throttleable_remote_ip if req.post? && (req.path_matches?('/auth/confirmation') || req.path == '/api/v1/emails/confirmations')
   end
 
   throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
-    if req.post? && req.path == '/auth/password'
+    if req.post? && req.path_matches?('/auth/password')
       req.params.dig('user', 'email').presence
     elsif req.post? && req.path == '/api/v1/emails/confirmations'
       req.authenticated_user_id
@@ -106,16 +122,16 @@ class Rack::Attack
   end
 
   throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && req.path == '/auth/sign_in'
+    req.throttleable_remote_ip if req.post? && req.path_matches?('/auth/sign_in')
   end
 
   throttle('throttle_login_attempts/email', limit: 25, period: 1.hour) do |req|
-    req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/sign_in'
+    req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path_matches?('/auth/sign_in')
   end
 
-  self.throttled_response = lambda do |env|
+  self.throttled_responder = lambda do |request|
     now        = Time.now.utc
-    match_data = env['rack.attack.match_data']
+    match_data = request.env['rack.attack.match_data']
 
     headers = {
       'Content-Type'          => 'application/json',
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
deleted file mode 100644
index 7573fc9f7..000000000
--- a/config/initializers/redis.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-redis_connection = Redis.new(
-  url: ENV['REDIS_URL'],
-  driver: :hiredis
-)
-
-namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
-
-if namespace
-  Redis.current = Redis::Namespace.new(namespace, redis: redis_connection)
-else
-  Redis.current = redis_connection
-end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 3d9bf96fd..210964b1f 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,5 +2,5 @@
 
 Rails.application.config.session_store :cookie_store,
   key: '_mastodon_session',
-  secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
+  secure: false, # All cookies have their secure flag set by the force_ssl option in production
   same_site: :lax
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 219554df4..9d2abf074 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require_relative '../../lib/mastodon/sidekiq_middleware'
+
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 
   config.server_middleware do |chain|
-    chain.add SidekiqErrorHandler
+    chain.add Mastodon::SidekiqMiddleware
   end
 
   config.server_middleware do |chain|
@@ -33,4 +35,5 @@ SidekiqUniqueJobs.configure do |config|
   config.reaper_count    = 1000
   config.reaper_interval = 600
   config.reaper_timeout  = 150
+  config.lock_ttl        = 50.days.to_i
 end
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 3a2097d2f..92cffc5a2 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -11,7 +11,10 @@ end
 module RecommendedComponent
   def recommended(_wrapper_options = nil)
     return unless options[:recommended]
-    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
+
+    key = options[:recommended].is_a?(Symbol) ? options[:recommended] : :recommended
+    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t(key, scope: 'simple_form'), class: key)]) }
+
     nil
   end
 end
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 7384b2e9a..8c3c5755a 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -1,4 +1,6 @@
 require 'stoplight'
 
-Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(Redis.current)
-Stoplight::Light.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
+Rails.application.reloader.to_prepare do
+  Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
+  Stoplight::Light.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
+end
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index d2ea5f974..6a7723fd2 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -75,30 +75,4 @@ module Twitter::TwitterText
       )
     }iox
   end
-
-  module Extractor
-    # Extracts a list of all XMPP and magnet URIs included in the Toot <tt>text</tt> along
-    # with the indices. If the <tt>text</tt> is <tt>nil</tt> or contains no
-    # XMPP or magnet URIs an empty array will be returned.
-    #
-    # If a block is given then it will be called for each XMPP URI.
-    def extract_extra_uris_with_indices(text, _options = {}) # :yields: uri, start, end
-      return [] unless text && text.index(":")
-      urls = []
-
-      text.to_s.scan(Twitter::TwitterText::Regex[:valid_extended_uri]) do
-        valid_uri_match_data = $~
-
-        start_position = valid_uri_match_data.char_begin(3)
-        end_position = valid_uri_match_data.char_end(3)
-
-        urls << {
-          :url => valid_uri_match_data[3],
-          :indices => [start_position, end_position]
-        }
-      end
-      urls.each{|url| yield url[:url], url[:indices].first, url[:indices].last} if block_given?
-      urls
-    end
-  end
 end
diff --git a/config/locales/activerecord.af.yml b/config/locales/activerecord.af.yml
index 252f9fd5a..c0810999d 100644
--- a/config/locales/activerecord.af.yml
+++ b/config/locales/activerecord.af.yml
@@ -1 +1,55 @@
+---
 af:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Sperdatum
+        options: Keuses
+      user:
+        agreement: Diensooreenkoms
+        email: E-posadres
+        locale: Plaaslik
+        password: Wagwoord
+      user/account:
+        username: Gebruikersnaam
+      user/invite_request:
+        text: Rede
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: mag slegs letters, syfers en onderstrepe bevat
+              reserved: is gereserveer
+        admin/webhook:
+          attributes:
+            url:
+              invalid: is nie ’n geldige URL nie
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: is nie 'n geldige URL nie
+        import:
+          attributes:
+            data:
+              malformed: is misvorm
+        status:
+          attributes:
+            reblog:
+              taken: van plasing bestaan reeds
+        user:
+          attributes:
+            email:
+              blocked: gebruik ’n ontoelaatbare e-posverskaffer
+              unreachable: blyk nie te bestaan nie
+            role_id:
+              elevated: kan nie hoër as jou huidige rol wees nie
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: bevat toestemmings wat vir die basisrol onveilig is
+              elevated: kan nie toestemmings bevat waaroor jou huidige rol nie beskik nie
+              own_role: kan nie verander word met jou huidige rol nie
+            position:
+              elevated: kan nie hoër as jou huidige rol wees nie
+              own_role: kan nie verander word met jou huidige rol nie
diff --git a/config/locales/activerecord.an.yml b/config/locales/activerecord.an.yml
new file mode 100644
index 000000000..79cfb2a4e
--- /dev/null
+++ b/config/locales/activerecord.an.yml
@@ -0,0 +1,55 @@
+---
+an:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Vencimiento
+        options: Opcions
+      user:
+        agreement: Acuerdo de Servicio
+        email: Adreza de correu electronico
+        locale: Idioma
+        password: Clau
+      user/account:
+        username: Nombre d'usuario
+      user/invite_request:
+        text: Razón
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: nomás puede contener letras, numeros y guions baixos
+              reserved: ye reservau
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no ye una URL valida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no ye una URL valida
+        import:
+          attributes:
+            data:
+              malformed: tiene un formato incorrecto
+        status:
+          attributes:
+            reblog:
+              taken: d'o estau ya existe
+        user:
+          attributes:
+            email:
+              blocked: utiliza un furnidor de correu no autorizau
+              unreachable: no pareixe existir
+            role_id:
+              elevated: no puede estar mayor que lo tuyo rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluyir permisos que no son seguros pa lo rol base
+              elevated: no se pueden incluyir permisos que lo tuyo rol actual no poseiga
+              own_role: no se puede cambiar con o tuyo rol actual
+            position:
+              elevated: no puede estar mayor que lo tuyo rol actual
+              own_role: no se puede cambiar con o tuyo rol actual
diff --git a/config/locales/activerecord.ar.yml b/config/locales/activerecord.ar.yml
index 3f89ea6fa..a30fd9f38 100644
--- a/config/locales/activerecord.ar.yml
+++ b/config/locales/activerecord.ar.yml
@@ -21,6 +21,18 @@ ar:
             username:
               invalid: يجب فقط أن يحتوي على حروف، وأرقام، وخطوط سفلية
               reserved: محجوز
+        admin/webhook:
+          attributes:
+            url:
+              invalid: رابط غير صحيح
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: رابط غير صحيح
+        import:
+          attributes:
+            data:
+              malformed: معتل
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ ar:
             email:
               blocked: يستخدم مزوّد بريد إلكتروني غير مسموح به
               unreachable: يبدو أنه لا وجود
+            role_id:
+              elevated: لا يمكن أن يكون أعلى من الدور الحالي
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: تضمين استأذانات ليست آمنة للدور الأساسي
+              elevated: لا يمكن تضمين استأذانات التي لا يملكها دورك الحالي
+              own_role: لا يمكن تغييرها مع دورك الحالي
+            position:
+              elevated: لا يمكن أن يكون أعلى من دورك الحالي
+              own_role: لا يمكن تغييرها مع دورك الحالي
diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml
index 4dfa507fc..2d532071a 100644
--- a/config/locales/activerecord.ast.yml
+++ b/config/locales/activerecord.ast.yml
@@ -3,10 +3,43 @@ ast:
   activerecord:
     attributes:
       poll:
-        options: Escoyetes
+        options: Opciones
+      user:
+        agreement: Acuerdu del serviciu
+        email: Direición de corréu electrónicu
+        locale: Locale
+        password: Contraseña
+      user/account:
+        username: Nome d'usuariu
+      user/invite_request:
+        text: Motivu
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: namái lletres, númberos y guiones baxos
+              invalid: ha contener namás lletres, númberos ya guiones baxos
+              reserved: ta acutáu
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nun ye una URL válida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nun ye una URL válida
+        user:
+          attributes:
+            email:
+              blocked: usa un fornidor de corréu electrónicu que nun ta permitíu
+              unreachable: nun paez qu'esista
+            role_id:
+              elevated: nun pue ser mayor que'l to rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              elevated: nun se puen incluyir los permisos que'l to rol nun poseye
+              own_role: nun se pue camudar col to rol actual
+            position:
+              elevated: nun pue ser mayor que'l to rol actual
+              own_role: nun se pue camudar col to rol actual
diff --git a/config/locales/activerecord.be.yml b/config/locales/activerecord.be.yml
new file mode 100644
index 000000000..6245ee090
--- /dev/null
+++ b/config/locales/activerecord.be.yml
@@ -0,0 +1,55 @@
+---
+be:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Дэдлайн
+        options: Выбар
+      user:
+        agreement: Пагадненне аб абслугоўванні
+        email: Адрас электроннай пошты
+        locale: Лакаль
+        password: Пароль
+      user/account:
+        username: Імя карыстальніка
+      user/invite_request:
+        text: Прычына
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: павінна змяшчаць толькі літары, лічбы і ніжнія падкрэсліванні
+              reserved: зарэзервавана
+        admin/webhook:
+          attributes:
+            url:
+              invalid: нядзейсны URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: нядзейсны URL
+        import:
+          attributes:
+            data:
+              malformed: дэфармаваны
+        status:
+          attributes:
+            reblog:
+              taken: гэтага допісу ўжо існуе
+        user:
+          attributes:
+            email:
+              blocked: выкарыстоўвае забароненую крыніцу электроннай пошты
+              unreachable: не існуе
+            role_id:
+              elevated: не можа быць вышэй за вашу бягучую ролю
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: уключаць дазволы, якія не з'яўляюцца бяспечнымі для базавай ролі
+              elevated: не можа ўключыць дазволы, якімі не валодае ваша бягучая роля
+              own_role: не можа быць зменены з вашай бягучай роляй
+            position:
+              elevated: не можа быць вышэй за вашу бягучую ролю
+              own_role: не можа быць зменены з вашай бягучай роляй
diff --git a/config/locales/activerecord.bg.yml b/config/locales/activerecord.bg.yml
index 601d6dcd9..07c0d8bb4 100644
--- a/config/locales/activerecord.bg.yml
+++ b/config/locales/activerecord.bg.yml
@@ -7,7 +7,7 @@ bg:
         options: Избори
       user:
         agreement: Споразумение за обслужване
-        email: Имейл адрес
+        email: Адрес на имейла
         locale: Локално
         password: Парола
       user/account:
@@ -19,10 +19,37 @@ bg:
         account:
           attributes:
             username:
-              invalid: само букви, цифри и долни черти
+              invalid: трябва да има само букви, цифри и долни черти
               reserved: е запазено
+        admin/webhook:
+          attributes:
+            url:
+              invalid: е невалиден URL адрес
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: е невалиден URL адрес
+        import:
+          attributes:
+            data:
+              malformed: е деформиран
+        status:
+          attributes:
+            reblog:
+              taken: от публикациите вече съществуват
         user:
           attributes:
             email:
-              blocked: използва се непозволен имейл доставчик
+              blocked: използва се непозволен доставчик на услуга за е-поща
               unreachable: изглежда, че не съществува
+            role_id:
+              elevated: не може да е по-висока от текущата ви роля
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: включва разрешения, които не са безопасни за базова роля
+              elevated: не може да включва разрешения, които настоящата ви роля не притежава
+              own_role: не може да се промени с текущата ви роля
+            position:
+              elevated: не може да е по-висока от текущата ви роля
+              own_role: не може да се промени с текущата ви роля
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
index e16e78eb3..dc35f326f 100644
--- a/config/locales/activerecord.br.yml
+++ b/config/locales/activerecord.br.yml
@@ -6,6 +6,7 @@ br:
         expires_at: Deiziad termen
         options: Dibaboù
       user:
+        agreement: Emglev gant ar servij
         email: Chomlec'h postel
         locale: Lec'hel
         password: Ger-tremen
@@ -28,3 +29,4 @@ br:
           attributes:
             email:
               blocked: a implij ur pourvezour postel berzet
+              unreachable: ne dle ket bezañ implijet
diff --git a/config/locales/activerecord.bs.yml b/config/locales/activerecord.bs.yml
new file mode 100644
index 000000000..e9e174462
--- /dev/null
+++ b/config/locales/activerecord.bs.yml
@@ -0,0 +1 @@
+bs:
diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml
index e74146645..79db38a29 100644
--- a/config/locales/activerecord.ca.yml
+++ b/config/locales/activerecord.ca.yml
@@ -7,7 +7,7 @@ ca:
         options: Opcions
       user:
         agreement: Acord de servei
-        email: Adreça de correu electrònic
+        email: Adreça de correu-e
         locale: Idioma
         password: Contrasenya
       user/account:
@@ -19,14 +19,37 @@ ca:
         account:
           attributes:
             username:
-              invalid: només lletres, números i subratllats
+              invalid: només pot contenir lletres, números i guions baixos
               reserved: està reservat
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no és una URL vàlida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no és una URL vàlida
+        import:
+          attributes:
+            data:
+              malformed: està mal format
         status:
           attributes:
             reblog:
-              taken: del tut ja existeix
+              taken: de la publicació ja existeix
         user:
           attributes:
             email:
-              blocked: utilitza un proveïdor de correu electrònic no autoritzat
+              blocked: utilitza un proveïdor de correu-e no autoritzat
               unreachable: sembla que no existeix
+            role_id:
+              elevated: no pot ser superior al teu rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inclou permisos que no són segurs per al rol base
+              elevated: no pot incloure permisos que el teu rol actual no té
+              own_role: no es pot canviar amb el teu rol actual
+            position:
+              elevated: no pot ser superior al teu rol actual
+              own_role: no es pot canviar amb el teu rol actual
diff --git a/config/locales/activerecord.ckb.yml b/config/locales/activerecord.ckb.yml
new file mode 100644
index 000000000..8bdad2173
--- /dev/null
+++ b/config/locales/activerecord.ckb.yml
@@ -0,0 +1,55 @@
+---
+ckb:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: وادەی کۆتایی
+        options: هەڵبژاردنەکان
+      user:
+        agreement: ڕێکەوتنی خزمەتگوزاری
+        email: ناونیشانی ئیمەیڵ
+        locale: ناوچەیی
+        password: تێپەڕوشە
+      user/account:
+        username: ناوی بەکارهێنەر
+      user/invite_request:
+        text: هۆکار
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: تەنها پیت، ژمارە و ژێرەوە
+              reserved: تەرخان کراوە
+        admin/webhook:
+          attributes:
+            url:
+              invalid: بەستەرەکە دروست نیە
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: بەستەرەکە دروست نیە
+        import:
+          attributes:
+            data:
+              malformed: ناتەواوە
+        status:
+          attributes:
+            reblog:
+              taken: لە بار بوونی هەیە
+        user:
+          attributes:
+            email:
+              blocked: دابینکەرێکی ئیمەیڵی ڕێگەپێنەدراو بەکاردەهێنێت
+              unreachable: پێناچێت بوونی هەبێت
+            role_id:
+              elevated: ناتوانرێت بەرزتربێت لە ڕۆلەکەی خۆت
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: ئەو مۆڵەتانەش لەخۆبگرێت کە سەلامەت نین بۆ ڕۆلی سەرەکی
+              elevated: ناتوانێت ئەو مۆڵەتانە لەخۆبگرێت کە ڕۆڵی ئێستات خاوەنی نییە
+              own_role: ناتوانرێت بە ڕۆڵی ئێستات بگۆڕدرێت
+            position:
+              elevated: ناتوانێت لە ڕۆڵی ئێستات بەرزتر بێت
+              own_role: ناتوانرێت بە ڕۆڵی ئێستات بگۆڕدرێت
diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
index bd0b28efb..def69db1f 100644
--- a/config/locales/activerecord.cs.yml
+++ b/config/locales/activerecord.cs.yml
@@ -11,9 +11,9 @@ cs:
         locale: Lokalizace
         password: Heslo
       user/account:
-        username: Uživatel
+        username: Uživatelské jméno
       user/invite_request:
-        text: Zdůvodnění
+        text: Důvod
     errors:
       models:
         account:
@@ -21,6 +21,18 @@ cs:
             username:
               invalid: musí obsahovat pouze písmena, číslice a podtržítka
               reserved: je vyhrazeno
+        admin/webhook:
+          attributes:
+            url:
+              invalid: není platná URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: není platná URL
+        import:
+          attributes:
+            data:
+              malformed: je chybný
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ cs:
             email:
               blocked: používá zakázanou e-mailovou službu
               unreachable: pravděpodobně neexistuje
+            role_id:
+              elevated: nemůže být vyšší než vaše aktuální role
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: obsahuje oprávnění, která nejsou bezpečná pro základní roli
+              elevated: nemůže obsahovat oprávnění, která vaše aktuální role nemá
+              own_role: nelze změnit s vaší aktuální rolí
+            position:
+              elevated: nemůže být vyšší než vaše aktuální role
+              own_role: nelze změnit s vaší aktuální rolí
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml
index 92fba043f..cadc4eee4 100644
--- a/config/locales/activerecord.cy.yml
+++ b/config/locales/activerecord.cy.yml
@@ -5,13 +5,51 @@ cy:
       poll:
         expires_at: Terfyn amser
         options: Dewisiadau
+      user:
+        agreement: Cytundeb gwasanaeth
+        email: Cyfeiriad e-bost
+        locale: Locale
+        password: Cyfrinair
+      user/account:
+        username: Enw defnyddiwr
+      user/invite_request:
+        text: Rheswm
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: dim ond llythrennau, rhifau a tanlinellau
+              invalid: rhaid iddo gynnwys dim ond llythrennau, rhifau a thanlinellau
+              reserved: wedi ei neilltuo
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nid yw'n URL dilys
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nid yw'n URL dilys
+        import:
+          attributes:
+            data:
+              malformed: wedi'i gamffurfio
         status:
           attributes:
             reblog:
               taken: o'r statws yn bodoli'n barod
+        user:
+          attributes:
+            email:
+              blocked: yn defnyddio darparwr e-bost nad yw'n cael ei ganiatáu
+              unreachable: nid yw i weld yn bodoli
+            role_id:
+              elevated: nid yw'n gallu bod yn uwch na'ch rôl presennol
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: yn cynnwys caniatâd nad ydynt yn ddiogel ar gyfer rôl sail
+              elevated: yn methu a chynnwys caniatâd nad yw eich rôl cyfredol yn ei gynnwys
+              own_role: nid oes modd ei newid gyda'ch rôl cyfredol
+            position:
+              elevated: nid yw'n gallu bod yn uwch na'ch rôl cyfredol
+              own_role: nid oes modd ei newid gyda'ch rôl cyfredol
diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml
index 513cb2a8f..35d63da49 100644
--- a/config/locales/activerecord.da.yml
+++ b/config/locales/activerecord.da.yml
@@ -3,7 +3,7 @@ da:
   activerecord:
     attributes:
       poll:
-        expires_at: Tidsfrist
+        expires_at: 截止时间
         options: Valgmuligheder
       user:
         agreement: Tjenesteaftale
@@ -21,6 +21,18 @@ da:
             username:
               invalid: må kun indeholde cifre, bogstaver og understreger
               reserved: er reserveret
+        admin/webhook:
+          attributes:
+            url:
+              invalid: "'er ikke en gyldig URL"
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: "'er ikke en gyldig URL"
+        import:
+          attributes:
+            data:
+              malformed: er forkert udformet
         status:
           attributes:
             reblog:
@@ -29,4 +41,15 @@ da:
           attributes:
             email:
               blocked: bruger en ikke-tilladt e-mailudbyder
-              unreachable: synes ikke at findes
+              unreachable: ser ikke ud til at eksistere
+            role_id:
+              elevated: kan ikke være højere end din aktuelle rolle
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: omfat tilladelser, som ikke er sikre for basisrollen
+              elevated: kan ikke omfatte tilladelser, din aktuelle rolle ikke besidder
+              own_role: kan ikke ændres med din aktuelle rolle
+            position:
+              elevated: kan ikke være højere end din aktuelle rolle
+              own_role: kan ikke ændres med din aktuelle rolle
diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml
index 31c410fa3..53a04e700 100644
--- a/config/locales/activerecord.de.yml
+++ b/config/locales/activerecord.de.yml
@@ -3,7 +3,7 @@ de:
   activerecord:
     attributes:
       poll:
-        expires_at: Frist
+        expires_at: Abstimmungsende
         options: Wahlmöglichkeiten
       user:
         agreement: Service-Vereinbarung
@@ -20,7 +20,19 @@ de:
           attributes:
             username:
               invalid: nur Buchstaben, Ziffern und Unterstriche
-              reserved: ist reserviert
+              reserved: ist bereits vergeben
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ist keine gültige URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ist keine gültige URL
+        import:
+          attributes:
+            data:
+              malformed: ist fehlerhaft
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ de:
             email:
               blocked: verwendet einen nicht erlaubten E-Mail-Anbieter
               unreachable: scheint nicht zu existieren
+            role_id:
+              elevated: Kann nicht höher als Ihre aktuelle Rolle sein
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: enthalte Berechtigungen, die für die Basisrolle nicht sicher sind
+              elevated: kann keine Berechtigungen enthalten, die deine aktuelle Rolle nicht besitzt
+              own_role: kann nicht mit deiner aktuellen Rolle geändert werden
+            position:
+              elevated: kann nicht höher sein als deine aktuelle Rolle
+              own_role: kann nicht mit deiner aktuellen Rolle geändert werden
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index 67ce1758e..b285e457a 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -21,6 +21,10 @@ el:
             username:
               invalid: μόνο γράμματα, αριθμοί και κάτω παύλες
               reserved: είναι δεσμευμένο
+        import:
+          attributes:
+            data:
+              malformed: δεν είναι έγκυρα
         status:
           attributes:
             reblog:
@@ -30,3 +34,9 @@ el:
             email:
               blocked: χρησιμοποιεί μη επιτρεπόμενο πάροχο e-mail
               unreachable: δεν φαίνεται να υπάρχει
+        user_role:
+          attributes:
+            permissions_as_keys:
+              own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας
+            position:
+              own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας
diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml
new file mode 100644
index 000000000..e651708c2
--- /dev/null
+++ b/config/locales/activerecord.en-GB.yml
@@ -0,0 +1,55 @@
+---
+en-GB:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Terfyn amser
+        options: Choices
+      user:
+        agreement: Service agreement
+        email: E-mail address
+        locale: Locale
+        password: Password
+      user/account:
+        username: Username
+      user/invite_request:
+        text: Reason
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: must contain only letters, numbers and underscores
+              reserved: is reserved
+        admin/webhook:
+          attributes:
+            url:
+              invalid: is not a valid URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: is not a valid URL
+        import:
+          attributes:
+            data:
+              malformed: is malformed
+        status:
+          attributes:
+            reblog:
+              taken: of post already exists
+        user:
+          attributes:
+            email:
+              blocked: uses a disallowed e-mail provider
+              unreachable: does not seem to exist
+            role_id:
+              elevated: cannot be higher than your current role
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: include permissions that are not safe for the base role
+              elevated: cannot include permissions your current role does not possess
+              own_role: cannot be changed with your current role
+            position:
+              elevated: cannot be higher than your current role
+              own_role: cannot be changed with your current role
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index d5f19ca64..8aee15659 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -21,6 +21,18 @@ en:
             username:
               invalid: must contain only letters, numbers and underscores
               reserved: is reserved
+        admin/webhook:
+          attributes:
+            url:
+              invalid: is not a valid URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: is not a valid URL
+        import:
+          attributes:
+            data:
+              malformed: is malformed
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ en:
             email:
               blocked: uses a disallowed e-mail provider
               unreachable: does not seem to exist
+            role_id:
+              elevated: cannot be higher than your current role
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: include permissions that are not safe for the base role
+              elevated: cannot include permissions your current role does not possess
+              own_role: cannot be changed with your current role
+            position:
+              elevated: cannot be higher than your current role
+              own_role: cannot be changed with your current role
diff --git a/config/locales/activerecord.eo.yml b/config/locales/activerecord.eo.yml
index ca48e0fe0..9ae8bab42 100644
--- a/config/locales/activerecord.eo.yml
+++ b/config/locales/activerecord.eo.yml
@@ -4,10 +4,10 @@ eo:
     attributes:
       poll:
         expires_at: Limdato
-        options: Elektoj
+        options: Elektebloj
       user:
         agreement: Servo-interkonsento
-        email: Retadreso
+        email: Retpoŝtadreso
         locale: Lokaĵaro
         password: Pasvorto
       user/account:
@@ -19,14 +19,37 @@ eo:
         account:
           attributes:
             username:
-              invalid: nur leteroj, ciferoj kaj substrekoj
+              invalid: nur literoj, ciferoj kaj substrekoj
               reserved: rezervita
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ne estas valida URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ne estas valida URL
+        import:
+          attributes:
+            data:
+              malformed: estas misformita
         status:
           attributes:
             reblog:
-              taken: de statuso jam ekzistas
+              taken: de afiŝo jam ekzistas
         user:
           attributes:
             email:
               blocked: uzas nepermesitan retpoŝtan provizanton
-              unreachable: ne ŝajnas ekzisti
+              unreachable: ŝajne ne ekzistas
+            role_id:
+              elevated: ne povas esti pli altranga ol via aktuala rolo
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkluzivi permesojn kiuj ne estas sekuraj por la baza rolo
+              elevated: ne povas inkluzivi permesojn kiujn via aktuala rolo ne rajtas
+              own_role: ne eblas esti ŝanĝita per via aktuala rolo
+            position:
+              elevated: ne povas esti pli altranga ol via aktuala rolo
+              own_role: ne eblas esti ŝanĝita per via aktuala rolo
diff --git a/config/locales/activerecord.es-AR.yml b/config/locales/activerecord.es-AR.yml
index 9d6a479a7..e00b80696 100644
--- a/config/locales/activerecord.es-AR.yml
+++ b/config/locales/activerecord.es-AR.yml
@@ -21,6 +21,18 @@ es-AR:
             username:
               invalid: sólo letras, números y subguiones ("_")
               reserved: está reservado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no es una dirección web válida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no es una dirección web válida
+        import:
+          attributes:
+            data:
+              malformed: está malformado
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ es-AR:
             email:
               blocked: usa un proveedor de correo electrónico no permitido
               unreachable: no parece existir
+            role_id:
+              elevated: no puede ser mayor que tu rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluir permisos que no son seguros para el rol base
+              elevated: no se pueden incluir permisos que tu rol actual no posea
+              own_role: no se puede cambiar con tu rol actual
+            position:
+              elevated: no puede ser mayor que tu rol actual
+              own_role: no se puede cambiar con tu rol actual
diff --git a/config/locales/activerecord.es-MX.yml b/config/locales/activerecord.es-MX.yml
index c316a70a7..da7611005 100644
--- a/config/locales/activerecord.es-MX.yml
+++ b/config/locales/activerecord.es-MX.yml
@@ -3,7 +3,7 @@ es-MX:
   activerecord:
     attributes:
       poll:
-        expires_at: Vencimiento
+        expires_at: Fecha límite
         options: Opciones
       user:
         agreement: Contrato de servicio
@@ -13,14 +13,26 @@ es-MX:
       user/account:
         username: Nombre de usuario
       user/invite_request:
-        text: Razón
+        text: Motivo
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: solo puede contener letras, números y guiones bajos
+              invalid: debe contener sólo letras, números y guiones bajos
               reserved: está reservado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no es una dirección URL válida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no es un URL válido
+        import:
+          attributes:
+            data:
+              malformed: tiene un formato incorrecto
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ es-MX:
             email:
               blocked: utiliza un proveedor de correo no autorizado
               unreachable: no parece existir
+            role_id:
+              elevated: no puede ser mayor a tu rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluir permisos que no son seguros para el rol base
+              elevated: no se pueden incluir permisos que tu rol actual no posea
+              own_role: no se puede cambiar con tu rol actual
+            position:
+              elevated: no puede ser mayor que tu rol actual
+              own_role: no se puede cambiar con tu rol actual
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 0c4d6e5cf..450658fa1 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -21,6 +21,18 @@ es:
             username:
               invalid: solo puede contener letras, números y guiones bajos
               reserved: está reservado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no es una URL válida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no es una URL válida
+        import:
+          attributes:
+            data:
+              malformed: tiene un formato incorrecto
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ es:
             email:
               blocked: utiliza un proveedor de correo no autorizado
               unreachable: no parece existir
+            role_id:
+              elevated: no puede ser mayor que tu rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluir permisos que no son seguros para el rol base
+              elevated: no se pueden incluir permisos que tu rol actual no posea
+              own_role: no se puede cambiar con tu rol actual
+            position:
+              elevated: no puede ser mayor que tu rol actual
+              own_role: no se puede cambiar con tu rol actual
diff --git a/config/locales/activerecord.et.yml b/config/locales/activerecord.et.yml
index 5679a91fe..b76001ed9 100644
--- a/config/locales/activerecord.et.yml
+++ b/config/locales/activerecord.et.yml
@@ -5,13 +5,51 @@ et:
       poll:
         expires_at: Tähtaeg
         options: Valikud
+      user:
+        agreement: Teenusetingimused
+        email: E-posti aadress
+        locale: Keel
+        password: Salasõna
+      user/account:
+        username: Kasutajanimi
+      user/invite_request:
+        text: Põhjus
     errors:
       models:
         account:
           attributes:
             username:
               invalid: ainult tähtmärgid, numbrid ja alakriipsud
+              reserved: on reserveeritud
+        admin/webhook:
+          attributes:
+            url:
+              invalid: pole sobiv URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: pole sobiv URL
+        import:
+          attributes:
+            data:
+              malformed: on vigasel kujul
         status:
           attributes:
             reblog:
-              taken: staatusel juba eksisteerib
+              taken: postitusel on juba
+        user:
+          attributes:
+            email:
+              blocked: kasutab mitte lubatud e-posti teenusepakkujat
+              unreachable: ei paista eksisteerivat
+            role_id:
+              elevated: ei saa olla kõrgem kui teie enda roll
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: hõlmata õiguseid, mis ei ole turvalised baasrollile
+              elevated: ei saa hõlmata õiguseid, mida teie praegune roll ei sisalda
+              own_role: ei saa muuta teie praeguse rolliga
+            position:
+              elevated: ei saa olla kõrgem, kui teie praegune roll
+              own_role: ei saa muuta teie praeguse rolliga
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index 83b01f91d..8b83b4ef8 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -21,6 +21,18 @@ eu:
             username:
               invalid: letrak, zenbakiak eta gidoi baxuak besterik ez
               reserved: erreserbatuta dago
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ez da baliozko URL bat
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ez da baliozko URL bat
+        import:
+          attributes:
+            data:
+              malformed: gaizki eratua dago
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ eu:
             email:
               blocked: onartu gabeko e-posta hornitzaile bat erabiltzen du
               unreachable: dirudienez ez da existitzen
+            role_id:
+              elevated: ezin du gaur egungo zure rola baino goragokoa izan
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: oinarrizko rolarentzat seguruak ez diren baimenak ditu
+              elevated: ezin du eduki zure uneko rolak ez duen baimenik
+              own_role: ezin da aldatu zure uneko rolarekin aldatu
+            position:
+              elevated: ezin du zure uneko rola baino goragokoa izan
+              own_role: ezin da aldatu zure uneko rolarekin
diff --git a/config/locales/activerecord.fa.yml b/config/locales/activerecord.fa.yml
index 291958d01..7af0975ff 100644
--- a/config/locales/activerecord.fa.yml
+++ b/config/locales/activerecord.fa.yml
@@ -21,6 +21,18 @@ fa:
             username:
               invalid: تنها حروف، اعداد، و زیرخط
               reserved: محفوظ است
+        admin/webhook:
+          attributes:
+            url:
+              invalid: نشانی معتبری نیست
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: نشانی معتبری نیست
+        import:
+          attributes:
+            data:
+              malformed: بدریخت است
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ fa:
             email:
               blocked: از فراهم‌کنندهٔ رایانامهٔ غیرمجازی استفاده می‌کند
               unreachable: به نظر نمی‌رسد وجود داشته باشد
+            role_id:
+              elevated: نمی‌تواند بالاتر از نقش کنونیتان باشد
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: شاما اجازه‌هایی که برای نقش پایه امن نیستند
+              elevated: نمی‌تواند شامل اجازه‌هایی باشد که نقش کنونیتان ندارد
+              own_role: نمی‌تواند با نقش کنونیتان تغییر کند
+            position:
+              elevated: نمی‌تواند بالاتر از نقش کنونیتان باشد
+              own_role: نمی‌تواند با نقش کنونیتان تغییر کند
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index 40dd81812..c1dbaff0f 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -8,7 +8,7 @@ fi:
       user:
         agreement: Palvelusopimus
         email: Sähköpostiosoite
-        locale: Paikallinen
+        locale: Alue
         password: Salasana
       user/account:
         username: Käyttäjätunnus
@@ -21,6 +21,18 @@ fi:
             username:
               invalid: saa sisältää vain kirjaimia, numeroita ja alaviivoja
               reserved: on varattu
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ei ole kelvollinen URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ei ole kelvollinen URL
+        import:
+          attributes:
+            data:
+              malformed: on väärin muodostettu
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ fi:
             email:
               blocked: käyttää kiellettyä sähköpostipalvelun tarjoajaa
               unreachable: ei näytä olevan olemassa
+            role_id:
+              elevated: ei voi olla korkeampi kuin nykyinen roolisi
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: sisältää oikeudet, jotka eivät ole turvallisia perusroolille
+              elevated: ei voi sisältää oikeuksia, joita nykyisellä roolillasi ei ole
+              own_role: ei voi muuttaa nykyisellä roolillasi
+            position:
+              elevated: ei voi olla korkeampi kuin nykyinen roolisi
+              own_role: ei voi muuttaa nykyisellä roolillasi
diff --git a/config/locales/activerecord.fo.yml b/config/locales/activerecord.fo.yml
new file mode 100644
index 000000000..4e1a39596
--- /dev/null
+++ b/config/locales/activerecord.fo.yml
@@ -0,0 +1,55 @@
+---
+fo:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Freist
+        options: Val
+      user:
+        agreement: Tænastuavtala
+        email: Teldupostur
+        locale: Staðbundið
+        password: Loyniorð
+      user/account:
+        username: Brúkaranavn
+      user/invite_request:
+        text: Orsøk
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: kann bara innihalda bókstavir, tøl og botnstriku
+              reserved: er umbiðið
+        admin/webhook:
+          attributes:
+            url:
+              invalid: er ikki eitt rætt leinki
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: er ikki eitt rætt leinki
+        import:
+          attributes:
+            data:
+              malformed: er avskeplað
+        status:
+          attributes:
+            reblog:
+              taken: frá posti sum longu finst
+        user:
+          attributes:
+            email:
+              blocked: brúkar ein ikki loyvdan teldopostveitara
+              unreachable: tykist ikki at vera til
+            role_id:
+              elevated: kann ikki vera hægri enn verandi støða
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inniheldur loyvi, ið ikki eru trygg, á grundstøði
+              elevated: rúmar ikki loyvum ið tín verandi støða loyvir
+              own_role: kann ikki verða broytt við verandi rættindum
+            position:
+              elevated: loyvi kunnu ikki setast hægri, við verandi rættindum
+              own_role: kann ikki verða broytt við tínum verandi rættindum
diff --git a/config/locales/activerecord.fr-QC.yml b/config/locales/activerecord.fr-QC.yml
new file mode 100644
index 000000000..aed5d290a
--- /dev/null
+++ b/config/locales/activerecord.fr-QC.yml
@@ -0,0 +1,55 @@
+---
+fr-QC:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Échéance
+        options: Choix
+      user:
+        agreement: Contrat de service
+        email: Adresse courriel
+        locale: Localisation
+        password: Mot de passe
+      user/account:
+        username: Nom d’utilisateur·rice
+      user/invite_request:
+        text: Raison
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: doit ne contenir que des lettres, des nombres et des tirets bas
+              reserved: est réservé
+        admin/webhook:
+          attributes:
+            url:
+              invalid: n’est pas un URL valide
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: n’est pas un URL valide
+        import:
+          attributes:
+            data:
+              malformed: est malformé
+        status:
+          attributes:
+            reblog:
+              taken: de la publication existe déjà
+        user:
+          attributes:
+            email:
+              blocked: utilise un fournisseur de courriel interdit
+              unreachable: ne semble pas exister
+            role_id:
+              elevated: ne peut pas être supérieur à votre rôle actuel
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inclure des autorisations non sécurisées pour le rôle de base
+              elevated: ne peut pas inclure des autorisations que votre rôle actuel ne possède pas
+              own_role: ne peut pas être modifié avec votre rôle actuel
+            position:
+              elevated: ne peut pas être supérieur à votre rôle actuel
+              own_role: ne peut pas être modifié avec votre rôle actuel
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 00d40aaf0..e2d950d1f 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -7,11 +7,11 @@ fr:
         options: Choix
       user:
         agreement: Contrat de service
-        email: Adresse courriel
+        email: Adresse de courriel
         locale: Langue
         password: Mot de passe
       user/account:
-        username: Nom d’utilisateur
+        username: Nom d’utilisateur·ice
       user/invite_request:
         text: Raison
     errors:
@@ -21,12 +21,35 @@ fr:
             username:
               invalid: seulement des lettres, des nombres et des tirets bas
               reserved: est réservé
+        admin/webhook:
+          attributes:
+            url:
+              invalid: n’est pas une URL valide
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: n’est pas une URL valide
+        import:
+          attributes:
+            data:
+              malformed: est mal formé
         status:
           attributes:
             reblog:
-              taken: du statut existe déjà
+              taken: du message existe déjà
         user:
           attributes:
             email:
               blocked: utilise un fournisseur de courriel interdit
               unreachable: ne semble pas exister
+            role_id:
+              elevated: ne peut pas être supérieur à votre rôle actuel
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inclure des autorisations non sécurisées pour le rôle de base
+              elevated: ne peut pas inclure des autorisations que votre rôle actuel ne possède pas
+              own_role: ne peut pas être modifié avec votre rôle actuel
+            position:
+              elevated: ne peut pas être supérieur à votre rôle actuel
+              own_role: ne peut pas être modifié avec votre rôle actuel
diff --git a/config/locales/activerecord.fy.yml b/config/locales/activerecord.fy.yml
new file mode 100644
index 000000000..cc10d817d
--- /dev/null
+++ b/config/locales/activerecord.fy.yml
@@ -0,0 +1,55 @@
+---
+fy:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Deadline
+        options: Karren
+      user:
+        agreement: Tsjinstbetingsten
+        email: E-mailadres
+        locale: Taal
+        password: Wachtwurd
+      user/account:
+        username: Brûkersnamme
+      user/invite_request:
+        text: Reden
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: mei allinnich letters, nûmers en ûnderstreekjes befetsje
+              reserved: reservearre
+        admin/webhook:
+          attributes:
+            url:
+              invalid: is in ûnjildige URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: is in ûnjildige URL
+        import:
+          attributes:
+            data:
+              malformed: hat de ferkearde opmaak
+        status:
+          attributes:
+            reblog:
+              taken: fan berjocht bestiet al
+        user:
+          attributes:
+            email:
+              blocked: brûkt in net tastiene e-mailprovider
+              unreachable: liket net te bestean
+            role_id:
+              elevated: kin net heger wêze as dyn aktuele rol
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: rjochten tafoegje dy’t net feilich binne foar de basisrol
+              elevated: kin gjin rjochten tafoegje dy’t dyn aktuele rol net besit
+              own_role: kin net mei dyn aktuele rol wizige wurde
+            position:
+              elevated: kin net heger wêze as dyn aktuele rol
+              own_role: kin net mei dyn aktuele rol wizige wurde
diff --git a/config/locales/activerecord.ga.yml b/config/locales/activerecord.ga.yml
new file mode 100644
index 000000000..236cc479e
--- /dev/null
+++ b/config/locales/activerecord.ga.yml
@@ -0,0 +1,26 @@
+---
+ga:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Sprioc-am
+        options: Roghanna
+      user:
+        agreement: Comhaontú seirbhísí
+        email: Seoladh ríomhphoist
+        locale: Láthair
+        password: Pasfhocal
+      user/account:
+        username: Ainm úsáideora
+      user/invite_request:
+        text: Fáth
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              reserved: in áirithe
+        import:
+          attributes:
+            data:
+              malformed: míchumtha
diff --git a/config/locales/activerecord.gd.yml b/config/locales/activerecord.gd.yml
index 2920b561e..5e1657d7b 100644
--- a/config/locales/activerecord.gd.yml
+++ b/config/locales/activerecord.gd.yml
@@ -21,6 +21,18 @@ gd:
             username:
               invalid: "– chan fhaod ach litrichean gun sràcan, àireamhan ’s fo-loidhnichean a bhith ’na bhroinn"
               reserved: "– tha e glèidhte"
+        admin/webhook:
+          attributes:
+            url:
+              invalid: "– chan eil seo ’na URL dligheach"
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: "– chan eil seo ’na URL dligheach"
+        import:
+          attributes:
+            data:
+              malformed: "– chan eil cruth dligheach air"
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ gd:
             email:
               blocked: "– tha seo a’ chleachdadh solaraiche puist-d nach eil ceadaichte"
               unreachable: "– tha coltas nach eil seo ann"
+            role_id:
+              elevated: "– chan fhaod seo a bhith nas àirde na an dreuchd a th’ agad an-dràsta"
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: gabh a-staigh na ceadan nach eil sàbhailte dhan bhun-dreuchd
+              elevated: chan urrainn dhut ceadan a ghabhail a-staigh nach eil aig an dreuchd a th’ agad an-dràsta
+              own_role: cha ghabh seo atharrachadh leis an dreuchd a th’ agad an-dràsta
+            position:
+              elevated: chan fhaod seo a bhith nas àirde na an dreuchd a th’ agad an-dràsta
+              own_role: cha ghabh seo atharrachadh leis an dreuchd a th’ agad an-dràsta
diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml
index cbdd801e5..939300894 100644
--- a/config/locales/activerecord.gl.yml
+++ b/config/locales/activerecord.gl.yml
@@ -21,6 +21,18 @@ gl:
             username:
               invalid: só letras, números e trazo baixo
               reserved: está reservado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: non é un URL válido
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: non é un URL válido
+        import:
+          attributes:
+            data:
+              malformed: ten formato incorrecto
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ gl:
             email:
               blocked: utiliza un provedor de email non autorizado
               unreachable: semella que non existe
+            role_id:
+              elevated: non pode superar o teu rol actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inclúe permisos que non son seguros para o rol básico
+              elevated: non pode incluir permisos que o teu rol actual non posúe
+              own_role: non pode ser modificado co teu rol actual
+            position:
+              elevated: non pode superar ao teu rol actual
+              own_role: non pode ser modificado co teu rol actual
diff --git a/config/locales/activerecord.he.yml b/config/locales/activerecord.he.yml
index e3b363efc..6fe455678 100644
--- a/config/locales/activerecord.he.yml
+++ b/config/locales/activerecord.he.yml
@@ -1,13 +1,55 @@
 ---
 he:
   activerecord:
+    attributes:
+      poll:
+        expires_at: מועד אחרון
+        options: ברירות
+      user:
+        agreement: הסכם שירות
+        email: כתובת דוא"ל
+        locale: הגדרות אזוריות
+        password: סיסמא
+      user/account:
+        username: שם משתמש/ת
+      user/invite_request:
+        text: סיבה
     errors:
       models:
         account:
           attributes:
             username:
               invalid: ספרות, אותיות לטיניות וקו תחתי בלבד
+              reserved: שמור
+        admin/webhook:
+          attributes:
+            url:
+              invalid: כתובת לא חוקית
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: היא כתובת לא חוקית
+        import:
+          attributes:
+            data:
+              malformed: בתצורה לא תואמת
         status:
           attributes:
             reblog:
-              taken: של החצרוץ כבר קיים
+              taken: של ההודעה כבר קיים
+        user:
+          attributes:
+            email:
+              blocked: עושה שימוש בספק דוא"ל אסור
+              unreachable: נראה שלא קיים
+            role_id:
+              elevated: לא יכול להיות גבוה יותר מתפקידך הנוכחי
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: לכלול הרשאות לא בטוחות לתפקיד הבסיסי
+              elevated: לא ניתן לכלול הרשאות שתפקידך הנוכחי לא כולל
+              own_role: לא ניתן למזג עם תפקידך הנוכחי
+            position:
+              elevated: לא יכול להיות גבוה יותר מתפקידך הנוכחי
+              own_role: לא ניתן לשנות באמצעות תפקידך הנוכחי
diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml
index ac8cfd773..67bad4cb4 100644
--- a/config/locales/activerecord.hu.yml
+++ b/config/locales/activerecord.hu.yml
@@ -21,6 +21,18 @@ hu:
             username:
               invalid: csak betűket, számokat vagy alávonást tartalmazhat
               reserved: fenntartott
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nem érvényes URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nem érvényes URL
+        import:
+          attributes:
+            data:
+              malformed: hibás
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ hu:
             email:
               blocked: egy letiltott e-mail szolgáltatót használ
               unreachable: úgy tűnik, hogy nem létezik
+            role_id:
+              elevated: nem lehet magasabb, mint a jelenlegi szereped
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: tartalmaz olyan engedélyeket is, melyek az alap szerephez nem biztonságosak
+              elevated: nem tartalmazhat olyan engedélyeket, melyek nincsenek benne a jelenlegi szerepedben
+              own_role: nem megváltoztatható a jelenlegi szerepköröddel
+            position:
+              elevated: nem lehet magasabb, mint a jelenlegi szereped
+              own_role: nem megváltoztatható a jelenlegi szerepköröddel
diff --git a/config/locales/activerecord.id.yml b/config/locales/activerecord.id.yml
index dc90c1322..47d200864 100644
--- a/config/locales/activerecord.id.yml
+++ b/config/locales/activerecord.id.yml
@@ -21,6 +21,18 @@ id:
             username:
               invalid: hanya boleh berisi huruf, angka, dan garis bawah
               reserved: sudah dipesan
+        admin/webhook:
+          attributes:
+            url:
+              invalid: bukan URL valid
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: bukan URL valid
+        import:
+          attributes:
+            data:
+              malformed: dalam bentuk yang salah
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ id:
             email:
               blocked: menggunakan layanan email yang tidak diizinkan
               unreachable: sepertinya tidak ada
+            role_id:
+              elevated: tidak dapat lebih tinggi dari peran Anda saat ini
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: berisi izin yang tidak aman untuk peran dasaran
+              elevated: tidak dapat berisi izin yang peran Anda tidak miliki
+              own_role: tidak dapat diubah dengan peran Anda saat ini
+            position:
+              elevated: tidak bisa lebih tinggi dari peran Anda saat ini
+              own_role: tidak dapat diubah dengan peran Anda saat ini
diff --git a/config/locales/activerecord.ig.yml b/config/locales/activerecord.ig.yml
new file mode 100644
index 000000000..7c264f0d7
--- /dev/null
+++ b/config/locales/activerecord.ig.yml
@@ -0,0 +1 @@
+ig:
diff --git a/config/locales/activerecord.io.yml b/config/locales/activerecord.io.yml
index c63dc0e8d..5c809ce2e 100644
--- a/config/locales/activerecord.io.yml
+++ b/config/locales/activerecord.io.yml
@@ -1 +1,51 @@
+---
 io:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Fina dato
+        options: Selektaji
+      user:
+        agreement: Servokonkordo
+        email: Retpostoadreso
+        locale: Regiono
+        password: Pasvorto
+      user/account:
+        username: Uzantonomo
+      user/invite_request:
+        text: Rezono
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: mustas konsistar nur literi, nombri e sublinei
+              reserved: rezervitas
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ne esas valida URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ne esas valida URL
+        status:
+          attributes:
+            reblog:
+              taken: de postajo ja existas
+        user:
+          attributes:
+            email:
+              blocked: uzas nepermisata retpostodomeno
+              unreachable: semblas ne existar
+            role_id:
+              elevated: ne povas divenar plu alta kam vua nuna rolo
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkluzas permisi quo ne esas segura por bazrolo
+              elevated: ne povas inkluzar permisi quon vua nuna rolo ne havas
+              own_role: ne povas divenesar kun vua nuna rolo
+            position:
+              elevated: ne povas divenar plu alta kam vua nuna rolo
+              own_role: ne povas divenesar kun vua nuna rolo
diff --git a/config/locales/activerecord.is.yml b/config/locales/activerecord.is.yml
index cdd803318..fa3406fe3 100644
--- a/config/locales/activerecord.is.yml
+++ b/config/locales/activerecord.is.yml
@@ -21,12 +21,35 @@ is:
             username:
               invalid: má aðeins innihalda bókstafi, tölur og undirstrik
               reserved: er frátekið
+        admin/webhook:
+          attributes:
+            url:
+              invalid: er ekki gild vefslóð
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: er ekki gild vefslóð
+        import:
+          attributes:
+            data:
+              malformed: er rangt formað
         status:
           attributes:
             reblog:
-              taken: af stöðu er þegar fyrirliggjandi
+              taken: af færslum er þegar fyrirliggjandi
         user:
           attributes:
             email:
               blocked: notar óleyfilega tölvupóstþjónustu
               unreachable: virðist ekki vera til
+            role_id:
+              elevated: getur ekki verið veigameiri en núverandi hlutverk þitt
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: hefur heimildir sem ekki eru öruggar fyrir grunnhlutverk
+              elevated: getur ekki haft heimildir sem núverandi hlutverk þitt er ekki með
+              own_role: er ekki hægt að breyta með þinu hlutverki
+            position:
+              elevated: getur ekki verið veigameiri en núverandi hlutverk þitt
+              own_role: er ekki hægt að breyta með þinu hlutverki
diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml
index 7e16990b5..0acbd8747 100644
--- a/config/locales/activerecord.it.yml
+++ b/config/locales/activerecord.it.yml
@@ -8,7 +8,7 @@ it:
       user:
         agreement: Condizioni di servizio
         email: Indirizzo email
-        locale: Localizzazione
+        locale: Locale
         password: Password
       user/account:
         username: Nome utente
@@ -19,14 +19,37 @@ it:
         account:
           attributes:
             username:
-              invalid: solo lettere, numeri e trattini bassi
+              invalid: deve contenere solo lettere, numeri e trattini bassi
               reserved: è riservato
+        admin/webhook:
+          attributes:
+            url:
+              invalid: non è un URL valido
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: non è un URL valido
+        import:
+          attributes:
+            data:
+              malformed: è malformato
         status:
           attributes:
             reblog:
-              taken: dello stato esiste già
+              taken: del post esiste già
         user:
           attributes:
             email:
               blocked: utilizza un provider di posta elettronica non autorizzato
               unreachable: non sembra esistere
+            role_id:
+              elevated: non può essere superiore al tuo ruolo corrente
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: include autorizzazioni che non sono sicure per il ruolo di base
+              elevated: non può includere le autorizzazioni che il tuo ruolo corrente non possiede
+              own_role: non può essere modificato con il tuo ruolo attuale
+            position:
+              elevated: non può essere superiore al tuo ruolo corrente
+              own_role: non può essere modificato con il tuo ruolo corrente
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
index ad4c1eccf..91fa04492 100644
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@@ -21,6 +21,18 @@ ja:
             username:
               invalid: アルファベット・数字・アンダーバーの組み合わせで入力してください
               reserved: は予約されています
+        admin/webhook:
+          attributes:
+            url:
+              invalid: は無効なURLです
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: は無効なURLです
+        import:
+          attributes:
+            data:
+              malformed: は不正です
         status:
           attributes:
             reblog:
@@ -28,5 +40,16 @@ ja:
         user:
           attributes:
             email:
-              blocked: は禁止されているプロバイダメールを使用します
-              unreachable: 存在しないようです
+              blocked: は禁止されているメールプロバイダを使用しています
+              unreachable: は存在しないようです
+            role_id:
+              elevated: 現在と同じロールには変更できません
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: 基本ロールにとって安全でない権限を含みます
+              elevated: 現在のロールが所有していない権限は含めることはできません
+              own_role: 現在と同じロールには変更できません
+            position:
+              elevated: 現在と同じロールには変更できません
+              own_role: 現在と同じロールには変更できません
diff --git a/config/locales/activerecord.kmr.yml b/config/locales/activerecord.kmr.yml
deleted file mode 100644
index 616c4966f..000000000
--- a/config/locales/activerecord.kmr.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-kmr:
-  activerecord:
-    attributes:
-      poll:
-        expires_at: Dîroka dawîbûnê
-        options: Hilbijark
-      user:
-        agreement: Peymana karûbarê
-        email: Navnîşana E-nameyê
-        locale: Herêm
-        password: Pêborîn
-      user/account:
-        username: Navê bikarhêneriyê
-      user/invite_request:
-        text: Sedem
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: pêdivî ye ku tenê tîp, hejmar û xêzikên jêrîn hebin
-              reserved: hatiye bikaranîn
-        status:
-          attributes:
-            reblog:
-              taken: ev nivîs berê heye jixwe
-        user:
-          attributes:
-            email:
-              blocked: dabînkerê e-nameya qedexe bi kar tîne
-              unreachable: xuya ye ku tune ye
diff --git a/config/locales/activerecord.ko.yml b/config/locales/activerecord.ko.yml
index 07f8a39f7..5d6b6693c 100644
--- a/config/locales/activerecord.ko.yml
+++ b/config/locales/activerecord.ko.yml
@@ -4,7 +4,7 @@ ko:
     attributes:
       poll:
         expires_at: 마감 기한
-        options: 선택
+        options: 선택지
       user:
         agreement: 이용약관
         email: 이메일 주소
@@ -19,8 +19,20 @@ ko:
         account:
           attributes:
             username:
-              invalid: 영문자, 숫자, _만 사용 가능
-              reserved: 이미 예약되어 있습니다
+              invalid: 영문자와 숫자, 밑줄만 사용 가능합니다
+              reserved: 예약되어 있습니다
+        admin/webhook:
+          attributes:
+            url:
+              invalid: 올바른 URL이 아닙니다
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: 올바른 URL이 아닙니다
+        import:
+          attributes:
+            data:
+              malformed: 데이터가 올바르지 않습니다
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ ko:
             email:
               blocked: 허용되지 않은 이메일 제공자입니다
               unreachable: 존재하지 않는 것 같습니다
+            role_id:
+              elevated: 당신의 현재 역할보다 높을 수 없습니다
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: 기본 역할로 사용하기에 안전하지 않은 권한을 포함하고 있습니다
+              elevated: 당신의 현재 역할이 가지고 있지 않은 권한은 포함할 수 없습니다
+              own_role: 당신의 현재 역할을 변경할 수 없습니다
+            position:
+              elevated: 당신의 현재 역할보다 높을 수 없습니다
+              own_role: 당신의 현재 역할을 변경할 수 없습니다
diff --git a/config/locales/activerecord.ku.yml b/config/locales/activerecord.ku.yml
index 3b976de8c..09dd5d16d 100644
--- a/config/locales/activerecord.ku.yml
+++ b/config/locales/activerecord.ku.yml
@@ -3,15 +3,53 @@ ku:
   activerecord:
     attributes:
       poll:
-        expires_at: وادەی کۆتایی
-        options: هەڵبژاردنەکان
+        expires_at: Dîroka dawîbûnê
+        options: Hilbijark
+      user:
+        agreement: Peymana karûbarê
+        email: Navnîşana E-nameyê
+        locale: Herêmî
+        password: Borînpeyv
+      user/account:
+        username: Navê bikarhêneriyê
+      user/invite_request:
+        text: Sedem
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: تەنها پیت، ژمارە و ژێرەوە
+              invalid: pêdivî ye ku tenê tîp, hejmar û xêzikên jêrîn hebin
+              reserved: hatiye bikaranîn
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ev girêdaneke nederbasdar e
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ev girêdaneke nederbasdar e
+        import:
+          attributes:
+            data:
+              malformed: xerab bûye
         status:
           attributes:
             reblog:
-              taken: لە بار بوونی هەیە
+              taken: ev nivîs berê heye jixwe
+        user:
+          attributes:
+            email:
+              blocked: dabînkerê e-nameya qedexe bi kar tîne
+              unreachable: xuya ye ku tune ye
+            role_id:
+              elevated: nabe ku ji rola te ya heyî bilindtir be
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: mafdayînên ku ji bo rola bingehîn ne ewle ne tê de hene
+              elevated: di rola te ya heyî de nabe mafdayîn tê de hebin
+              own_role: bi rola te ya heyî nayê guhertin
+            position:
+              elevated: nabe ku ji rola te ya heyî bilindtir be
+              own_role: bi rola te ya heyî nayê guhertin
diff --git a/config/locales/activerecord.la.yml b/config/locales/activerecord.la.yml
new file mode 100644
index 000000000..3a7ba0d44
--- /dev/null
+++ b/config/locales/activerecord.la.yml
@@ -0,0 +1 @@
+la:
diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml
index f3524811b..097a29621 100644
--- a/config/locales/activerecord.lv.yml
+++ b/config/locales/activerecord.lv.yml
@@ -21,12 +21,35 @@ lv:
             username:
               invalid: drīkst saturēt tikai burtus, ciparus un pasvītras
               reserved: ir rezervēts
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nav derīgs URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nav derīgs URL
+        import:
+          attributes:
+            data:
+              malformed: ir nepareizi veidots
         status:
           attributes:
             reblog:
-              taken: ziņa jau pastāv
+              taken: ziņai jau pastāv
         user:
           attributes:
             email:
-              blocked: lieto neatļautu epasta pakalpojuma sniedzēju
-              unreachable: šķiet, ka neeksistē
+              blocked: lieto neatļautu e-pasta pakalpojuma sniedzēju
+              unreachable: šķietami neeksistē
+            role_id:
+              elevated: nevar būt augstāka par tavu pašreizējo lomu
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: ietver atļaujas, kas nav drošas pamata lomai
+              elevated: nevar ietvert atļaujas, kas nepieder tavai pašreizējai lomai
+              own_role: nevar mainīt pret tavu pašreizējo lomu
+            position:
+              elevated: nevar būt augstāka par tavu pašreizējo lomu
+              own_role: nevar mainīt pret tavu pašreizējo lomu
diff --git a/config/locales/activerecord.ms.yml b/config/locales/activerecord.ms.yml
index 2925688a0..6b84248de 100644
--- a/config/locales/activerecord.ms.yml
+++ b/config/locales/activerecord.ms.yml
@@ -1 +1,55 @@
+---
 ms:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Tarikh akhir
+        options: Pilihan
+      user:
+        agreement: Perjanjian perkhidmatan
+        email: Alamat e-mel
+        locale: Tempatan
+        password: Kata laluan
+      user/account:
+        username: Nama pengguna
+      user/invite_request:
+        text: Sebab
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: hanya mengandungi aksara, nombor dan garis bawah sahaja
+              reserved: dikhaskan
+        admin/webhook:
+          attributes:
+            url:
+              invalid: bukanlah URL yang sah
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: bukanlah URL yang sah
+        import:
+          attributes:
+            data:
+              malformed: tersalah bentuk
+        status:
+          attributes:
+            reblog:
+              taken: hantaran sudah wujud
+        user:
+          attributes:
+            email:
+              blocked: menggunakan pembekal e-mel yang tidak dibenarkan
+              unreachable: nampaknya tidak wujud
+            role_id:
+              elevated: tidak boleh lebih tinggi daripada peranan semasa anda
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: termasuklah keizinan yang tidak selamat untuk peranan asas
+              elevated: tidak boleh memasukkan kebenaran yang tidak dimiliki oleh peranan semasa anda
+              own_role: tidak boleh diubah dengan peranan semasa anda
+            position:
+              elevated: tidak boleh lebih tinggi daripada peranan semasa anda
+              own_role: tidak boleh diubah dengan peranan semasa anda
diff --git a/config/locales/activerecord.my.yml b/config/locales/activerecord.my.yml
new file mode 100644
index 000000000..5e1fc6bee
--- /dev/null
+++ b/config/locales/activerecord.my.yml
@@ -0,0 +1 @@
+my:
diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml
index 6bbdc5b40..0e1f824b7 100644
--- a/config/locales/activerecord.nl.yml
+++ b/config/locales/activerecord.nl.yml
@@ -21,12 +21,35 @@ nl:
             username:
               invalid: alleen letters, nummers en underscores
               reserved: gereserveerd
+        admin/webhook:
+          attributes:
+            url:
+              invalid: is een ongeldige URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: is een ongeldige URL
+        import:
+          attributes:
+            data:
+              malformed: heeft de verkeerde opmaak
         status:
           attributes:
             reblog:
-              taken: van toot bestaat al
+              taken: van bericht bestaat al
         user:
           attributes:
             email:
               blocked: gebruikt een niet toegestane e-mailprovider
               unreachable: schijnt niet te bestaan
+            role_id:
+              elevated: kan niet hoger zijn dan jouw huidige rol
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: rechten toevoegen die niet veilig zijn voor de basisrol
+              elevated: kan geen rechten toevoegen die jouw huidige rol niet bezit
+              own_role: kan niet met jouw huidige rol worden gewijzigd
+            position:
+              elevated: kan niet hoger zijn dan jouw huidige rol
+              own_role: kan niet met jouw huidige rol worden gewijzigd
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
index 4f6a348dd..30afb8b07 100644
--- a/config/locales/activerecord.nn.yml
+++ b/config/locales/activerecord.nn.yml
@@ -6,10 +6,12 @@ nn:
         expires_at: Frist
         options: Val
       user:
-        email: E-mail address
+        agreement: Serviceavtale
+        email: Epostadresse
+        locale: Lokale
         password: Passord
       user/account:
-        username: Brukernavn
+        username: Brukarnamn
       user/invite_request:
         text: Grunn
     errors:
@@ -17,9 +19,37 @@ nn:
         account:
           attributes:
             username:
-              invalid: bare bokstaver, tall og understreker
+              invalid: kan berre innehalda bokstavar, tal og understrekar
               reserved: er reservert
+        admin/webhook:
+          attributes:
+            url:
+              invalid: er ikkje ein gyldig URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: er ikkje ein gyldig URL
+        import:
+          attributes:
+            data:
+              malformed: er feilutforma
         status:
           attributes:
             reblog:
-              taken: av status eksisterer allerede
+              taken: av innlegg eksisterer allereie
+        user:
+          attributes:
+            email:
+              blocked: bruker ein forboden epostleverandør
+              unreachable: ser ikkje ut til å eksistere
+            role_id:
+              elevated: kan ikkje vere høgare enn di noverande rolle
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkluder tillatingar som ikkje er trygge for basisrolla
+              elevated: kan ikkje inkludere rettigheiter di noverande rolle ikkje innehar
+              own_role: kan ikkje endrast med di noverande rolle
+            position:
+              elevated: kan ikkje vere høgare enn di noverande rolle
+              own_role: kan ikkje endrast med di noverande rolle
diff --git a/config/locales/activerecord.no.yml b/config/locales/activerecord.no.yml
index 43b589745..eb1793ca7 100644
--- a/config/locales/activerecord.no.yml
+++ b/config/locales/activerecord.no.yml
@@ -6,21 +6,50 @@
         expires_at: Tidsfrist
         options: Valg
       user:
-        email: E-mail address
-        locale: Område
+        agreement: Tjenesteavtale
+        email: E-postadresse
+        locale: Landstandard
         password: Passord
       user/account:
         username: Brukernavn
       user/invite_request:
-        text: Grunn
+        text: Årsak
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: bare bokstaver, tall og understreker
+              invalid: må inneholde kun bokstaver, tall og understrekingstegn
               reserved: er reservert
+        admin/webhook:
+          attributes:
+            url:
+              invalid: er ikke en gyldig nettadresse
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: er ikke en gyldig nettadresse
+        import:
+          attributes:
+            data:
+              malformed: er feilformet
         status:
           attributes:
             reblog:
-              taken: av status eksisterer allerede
+              taken: av innlegg finnes fra før
+        user:
+          attributes:
+            email:
+              blocked: bruker en forbudt e-postleverandør
+              unreachable: ser ikke ut til å finnes
+            role_id:
+              elevated: kan ikke være høyere enn din nåværende rolle
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkluder tillatelser som ikke er trygge for grunn-rollen
+              elevated: kan ikke inneholde rettigheter som din nåværende rolle ikke innehar
+              own_role: kan ikke endres med din nåværende rolle
+            position:
+              elevated: kan ikke være høyere enn din nåværende rolle
+              own_role: kan ikke endres med din nåværende rolle
diff --git a/config/locales/activerecord.oc.yml b/config/locales/activerecord.oc.yml
index 8a7b70d44..f10a9f90d 100644
--- a/config/locales/activerecord.oc.yml
+++ b/config/locales/activerecord.oc.yml
@@ -21,6 +21,18 @@ oc:
             username:
               invalid: solament letras, nombres e tirets basses
               reserved: es reservat
+        admin/webhook:
+          attributes:
+            url:
+              invalid: es pas una URL valida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: es pas una URL valida
+        import:
+          attributes:
+            data:
+              malformed: es mal formatat
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ oc:
             email:
               blocked: utilizar un provesidor d’email pas autorizat
               unreachable: semblar pas existir
+            role_id:
+              elevated: pòt pas èsser superior a vòstre ròtle actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inclure d’autorizacions que son pas seguras pel ròtle de basa
+              elevated: pòt pas inclure d’autorizacions que vòstre ròtle possedís pas
+              own_role: se pòt pas modificar amb vòstre ròtle actual
+            position:
+              elevated: pòt pas èsser superior a vòstre ròtle actual
+              own_role: se pòt pas modificar amb vòstre ròtle actual
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index c7b1e7fab..0d1d9efb1 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -21,6 +21,18 @@ pl:
             username:
               invalid: może składać się tylko z liter, cyfr i podkreślników
               reserved: jest zarezerwowana
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nie jest poprawnym adresem URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nie jest poprawnym adresem URL
+        import:
+          attributes:
+            data:
+              malformed: jest uszkodzona
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ pl:
             email:
               blocked: używa niedozwolonego dostawcy poczty elektronicznej
               unreachable: wydaje się nie istnieć
+            role_id:
+              elevated: nie może być wyższa niż twoja bieżąca rola
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: dołącz uprawnienia, które nie są bezpieczne dla roli podstawowej
+              elevated: nie może zawierać uprawnień, jakie twoja obecna rola nie posiada
+              own_role: nie można zmienić z aktualną rolą
+            position:
+              elevated: nie może być wyższa niż twoja bieżąca rola
+              own_role: nie może być zmieniona z twoją aktualną rolą
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml
index 8b4d3439a..9aa9af62e 100644
--- a/config/locales/activerecord.pt-BR.yml
+++ b/config/locales/activerecord.pt-BR.yml
@@ -21,6 +21,18 @@ pt-BR:
             username:
               invalid: apenas letras, números e underlines ( "_" )
               reserved: já existe
+        admin/webhook:
+          attributes:
+            url:
+              invalid: não é uma URL válida
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: não é uma URL válida
+        import:
+          attributes:
+            data:
+              malformed: está incorreto
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ pt-BR:
             email:
               blocked: usa provedor de e-mail não permitido
               unreachable: parece não existir
+            role_id:
+              elevated: não pode ser maior do que seu cargo atual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluir permissões que não são seguras para o cargo base
+              elevated: não pode incluir permissões que o seu cargo atual não possui
+              own_role: não pode ser alterado com seu cargo atual
+            position:
+              elevated: não pode ser maior do que seu cargo atual
+              own_role: não pode ser alterado com seu cargo atual
diff --git a/config/locales/activerecord.pt-PT.yml b/config/locales/activerecord.pt-PT.yml
index 17c199ea8..388e21fe1 100644
--- a/config/locales/activerecord.pt-PT.yml
+++ b/config/locales/activerecord.pt-PT.yml
@@ -21,6 +21,18 @@ pt-PT:
             username:
               invalid: apenas letras, números e underscores
               reserved: está reservado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: não é um URL válido
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: não é um URL válido
+        import:
+          attributes:
+            data:
+              malformed: está malformado
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ pt-PT:
             email:
               blocked: utiliza um provedor de e-mail não permitido
               unreachable: não parece existir
+            role_id:
+              elevated: não pode ser maior que o da sua função atual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: incluir permissões que não são seguras para a função base
+              elevated: não pode incluir permissões que a sua função atual não possui
+              own_role: não pode ser alterado com a sua função atual
+            position:
+              elevated: não pode ser maior que o da sua função atual
+              own_role: não pode ser alterado com a sua função atual
diff --git a/config/locales/activerecord.ro.yml b/config/locales/activerecord.ro.yml
index 1da164190..33be0258b 100644
--- a/config/locales/activerecord.ro.yml
+++ b/config/locales/activerecord.ro.yml
@@ -6,15 +6,50 @@ ro:
         expires_at: Termen limită
         options: Alegeri
       user:
+        agreement: Acord de servicii
         email: Adresă e-mail
+        locale: Localizare
         password: Parolă
+      user/account:
+        username: Nume utilizator
+      user/invite_request:
+        text: Motiv
     errors:
       models:
         account:
           attributes:
             username:
               invalid: doar litere, numere și sublinieri
+              reserved: este rezervat
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nu este un URL valid
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nu este un URL valid
+        import:
+          attributes:
+            data:
+              malformed: este malformat
         status:
           attributes:
             reblog:
-              taken: de stare există deja
+              taken: de postare există deja
+        user:
+          attributes:
+            email:
+              blocked: utilizează un furnizor de e-mail neautorizat
+              unreachable: pare să nu existe
+            role_id:
+              elevated: nu poate fi mai mare decât rolul curent
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: include permisiuni care nu sunt sigure pentru rolul de bază
+              elevated: nu poate include permisiuni pe care rolul dvs. nu le deține
+              own_role: nu poate fi schimbat cu rolul curent
+            position:
+              elevated: nu poate fi mai mare decât rolul curent
+              own_role: nu poate fi schimbat cu rolul curent
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 2f9210519..17b13fc7b 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -21,6 +21,18 @@ ru:
             username:
               invalid: только буквы, цифры и символ подчёркивания
               reserved: зарезервировано
+        admin/webhook:
+          attributes:
+            url:
+              invalid: не является допустимым URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: не является допустимым URL
+        import:
+          attributes:
+            data:
+              malformed: неверный формат
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ ru:
             email:
               blocked: использует запрещённого провайдера эл. почты
               unreachable: не существует
+            role_id:
+              elevated: не может быть выше вашей текущей роли
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: включить разрешения, небезопасные для базовой роли
+              elevated: не может включать разрешения, которыми не обладает ваша текущая роль
+              own_role: невозможно изменить с вашей текущей ролью
+            position:
+              elevated: не может быть выше, чем ваша текущая роль
+              own_role: невозможно изменить с вашей текущей ролью
diff --git a/config/locales/activerecord.sco.yml b/config/locales/activerecord.sco.yml
new file mode 100644
index 000000000..084c3370b
--- /dev/null
+++ b/config/locales/activerecord.sco.yml
@@ -0,0 +1,55 @@
+---
+sco:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Deidline
+        options: Chyces
+      user:
+        agreement: Service greeance
+        email: E-mail address
+        locale: Locale
+        password: Passwird
+      user/account:
+        username: Uisernemm
+      user/invite_request:
+        text: Raison
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: haes tae ainly hae letters, nummers an unnerscores
+              reserved: is reseirvit
+        admin/webhook:
+          attributes:
+            url:
+              invalid: isnae a guid URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: isnae a guid URL
+        import:
+          attributes:
+            data:
+              malformed: isnae o the expectit form
+        status:
+          attributes:
+            reblog:
+              taken: o post awriddy exists
+        user:
+          attributes:
+            email:
+              blocked: uises a e-mail provider thit's no allooed
+              unreachable: disnae seem tae exist
+            role_id:
+              elevated: cannae be heicher nor yer role the noo
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: hae permissions thit urnae safe fir the base role
+              elevated: cannae include permissions thit yer role the noo disnae haud
+              own_role: cannae be chynged wi the role ye hae the noo
+            position:
+              elevated: cannae be heicher nor the role ye hae the noo
+              own_role: cannae be chynged wi the role ye hae the noo
diff --git a/config/locales/activerecord.sk.yml b/config/locales/activerecord.sk.yml
index eb8d75d48..33f53a88e 100644
--- a/config/locales/activerecord.sk.yml
+++ b/config/locales/activerecord.sk.yml
@@ -5,13 +5,51 @@ sk:
       poll:
         expires_at: Trvá do
         options: Voľby
+      user:
+        agreement: Dohoda o poskytovaní služieb
+        email: Emailová adresa
+        locale: Jazyk
+        password: Heslo
+      user/account:
+        username: Meno používateľa
+      user/invite_request:
+        text: Dôvod
     errors:
       models:
         account:
           attributes:
             username:
               invalid: iba písmená, číslice a podčiarkovníky
+              reserved: je obsadené
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nie je platnou URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nie je platnou URL
+        import:
+          attributes:
+            data:
+              malformed: je deformovaný
         status:
           attributes:
             reblog:
               taken: príspevku už existuje
+        user:
+          attributes:
+            email:
+              blocked: používa nepovoleného poskytovateľa e-mailu
+              unreachable: zdá sa, že neexistuje
+            role_id:
+              elevated: nemôže byť vyššia ako vaša súčasná rola
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: zahrnúť povolenia, ktoré nie sú bezpečné pre základnú rolu
+              elevated: nemôže obsahovať povolenia, ktoré vaša aktuálna rola nemá
+              own_role: nie je možné zmeniť s vašou aktuálnou rolou
+            position:
+              elevated: nemôže byť vyššia ako vaša súčasná rola
+              own_role: nie je možné zmeniť s vašou aktuálnou rolou
diff --git a/config/locales/activerecord.sl.yml b/config/locales/activerecord.sl.yml
index 1df109579..be6cea871 100644
--- a/config/locales/activerecord.sl.yml
+++ b/config/locales/activerecord.sl.yml
@@ -5,13 +5,51 @@ sl:
       poll:
         expires_at: Rok
         options: Izbire
+      user:
+        agreement: Sporazum o storitvah
+        email: E-poštni naslov
+        locale: Krajevne nastavitve
+        password: Geslo
+      user/account:
+        username: Uporabniško ime
+      user/invite_request:
+        text: Razlog
     errors:
       models:
         account:
           attributes:
             username:
               invalid: samo črke, številke in podčrtaji
+              reserved: je rezerviran
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ni veljaven URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ni veljaven URL
+        import:
+          attributes:
+            data:
+              malformed: je napačno oblikovan
         status:
           attributes:
             reblog:
-              taken: od statusa že obstajajo
+              taken: od objave že obstajajo
+        user:
+          attributes:
+            email:
+              blocked: uporablja nedovoljenega ponudnika e-poštnih storitev
+              unreachable: kot kaže ne obstaja
+            role_id:
+              elevated: ne more biti višje od vaše trenutne vloge
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: vključi pravice, ki niso varne za osnovno vlogo
+              elevated: ni mogoče vključiti pravic, ki jih vaša trenutna vloga ne vsebuje
+              own_role: ni mogoče spremeniti z vašo trenutno vlogo
+            position:
+              elevated: ne more biti višje od vaše trenutne vloge
+              own_role: ni mogoče spremeniti z vašo trenutno vlogo
diff --git a/config/locales/activerecord.sq.yml b/config/locales/activerecord.sq.yml
index 920b73e7a..f2ceee70d 100644
--- a/config/locales/activerecord.sq.yml
+++ b/config/locales/activerecord.sq.yml
@@ -21,6 +21,18 @@ sq:
             username:
               invalid: duhet të përmbajë vetëm shkronja, numra dhe nënvija
               reserved: është i rezervuar
+        admin/webhook:
+          attributes:
+            url:
+              invalid: s’është URL e vlefshme
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: s’është URL
+        import:
+          attributes:
+            data:
+              malformed: janë të keqformuara
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ sq:
             email:
               blocked: përdor një shërbim email të palejuar
               unreachable: s’duket se ekziston
+            role_id:
+              elevated: s’mund të jetë më i lartë sesa roli juaj i tanishëm
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: përfshi leje që s’janë të parrezik për rolin bazë
+              elevated: s’mund të përfshijë leje të cilat roli juaj i tanishëm s’i përfshin
+              own_role: s’mund të ndryshohet me rolin tuaj të tanishëm
+            position:
+              elevated: s’mund të jetë më i lartë sesa roli juaj i tanishëm
+              own_role: s’mund të ndryshohet me rolin tuaj të tanishëm
diff --git a/config/locales/activerecord.sr-Latn.yml b/config/locales/activerecord.sr-Latn.yml
index 1527a0d8c..c6b5e7761 100644
--- a/config/locales/activerecord.sr-Latn.yml
+++ b/config/locales/activerecord.sr-Latn.yml
@@ -1,13 +1,55 @@
 ---
 sr-Latn:
   activerecord:
+    attributes:
+      poll:
+        expires_at: Krajnji rok
+        options: Izbori
+      user:
+        agreement: Ugovor o usluzi
+        email: E-adresa
+        locale: Lokalno
+        password: Lozinka
+      user/account:
+        username: Korisničko ime
+      user/invite_request:
+        text: Razlog
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: samo slova, brojevi i donje crte
+              invalid: mora da sadrži samo slova, brojeve i donje crte
+              reserved: je rezervisano
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nije važeća URL adresa
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nije važeća URL adresa
+        import:
+          attributes:
+            data:
+              malformed: nije dobro formiran
         status:
           attributes:
             reblog:
-              taken: statusa već postoji
+              taken: objave već postoji
+        user:
+          attributes:
+            email:
+              blocked: koristi nedozvoljeni provajder e-pošte
+              unreachable: izgleda da ne postoji
+            role_id:
+              elevated: ne može biti više sa vašom trenutnom ulogom
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: uključuje dozvole koje nisu bezbedne za osnovnu ulogu
+              elevated: ne može da uključi dozvole koje vaša trenutna uloga ne poseduje
+              own_role: ne može da se promeni sa vašom trenutnom ulogom
+            position:
+              elevated: ne može biti više sa vašom trenutnom ulogom
+              own_role: ne može da se promeni sa vašom trenutnom ulogom
diff --git a/config/locales/activerecord.sr.yml b/config/locales/activerecord.sr.yml
index feebfb6dc..e3fcdd691 100644
--- a/config/locales/activerecord.sr.yml
+++ b/config/locales/activerecord.sr.yml
@@ -7,8 +7,8 @@ sr:
         options: Избори
       user:
         agreement: Уговор о услузи
-        email: Имејл адреса
-        locale: Регионална подешавања
+        email: Е-адреса
+        locale: Локално
         password: Лозинка
       user/account:
         username: Корисничко име
@@ -21,12 +21,35 @@ sr:
             username:
               invalid: мора да садржи само слова, бројеве и доње црте
               reserved: је резервисано
+        admin/webhook:
+          attributes:
+            url:
+              invalid: није важећа УРЛ адреса
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: није важећа УРЛ адреса
+        import:
+          attributes:
+            data:
+              malformed: није добро формиран
         status:
           attributes:
             reblog:
-              taken: објава већ постоји
+              taken: објаве већ постоји
         user:
           attributes:
             email:
-              blocked: користи недозвољени имејл сервис
+              blocked: користи недозвољени провајдер е-поште
               unreachable: изгледа да не постоји
+            role_id:
+              elevated: не може бити више са вашом тренутном улогом
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: укључује дозволе које нису безбедне за основну улогу
+              elevated: не може да укључи дозволе које ваша тренутна улога не поседује
+              own_role: не може да се промени са вашом тренутном улогом
+            position:
+              elevated: не може бити више са вашом тренутном улогом
+              own_role: не може да се промени са вашом тренутном улогом
diff --git a/config/locales/activerecord.sv.yml b/config/locales/activerecord.sv.yml
index 7c217efca..5a009becc 100644
--- a/config/locales/activerecord.sv.yml
+++ b/config/locales/activerecord.sv.yml
@@ -21,6 +21,18 @@ sv:
             username:
               invalid: endast bokstäver, siffror och understrykning
               reserved: är reserverat
+        admin/webhook:
+          attributes:
+            url:
+              invalid: är inte en giltig URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: är inte en giltig URL
+        import:
+          attributes:
+            data:
+              malformed: är felformad
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ sv:
             email:
               blocked: använder en icke tillåten e-postleverantör
               unreachable: verkar inte existera
+            role_id:
+              elevated: kan inte vara högre än din nuvarande roll
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkludera behörigheter som inte är säkra för grundrollen
+              elevated: kan inte inkludera behörigheter som din nuvarande roll inte innehar
+              own_role: kan inte ändras med din nuvarande roll
+            position:
+              elevated: kan inte vara högre än din nuvarande roll
+              own_role: kan inte ändras med din nuvarande roll
diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml
index 4957ab7bd..45d556542 100644
--- a/config/locales/activerecord.th.yml
+++ b/config/locales/activerecord.th.yml
@@ -8,6 +8,7 @@ th:
       user:
         agreement: ข้อตกลงการให้บริการ
         email: ที่อยู่อีเมล
+        locale: ตำแหน่งที่ตั้ง
         password: รหัสผ่าน
       user/account:
         username: ชื่อผู้ใช้
@@ -20,6 +21,18 @@ th:
             username:
               invalid: ต้องมีเฉพาะตัวอักษร, ตัวเลข และขีดล่างเท่านั้น
               reserved: ถูกสงวนไว้
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ไม่ใช่ URL ที่ถูกต้อง
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ไม่ใช่ URL ที่ถูกต้อง
+        import:
+          attributes:
+            data:
+              malformed: ผิดรูปแบบ
         status:
           attributes:
             reblog:
@@ -28,4 +41,15 @@ th:
           attributes:
             email:
               blocked: ใช้ผู้ให้บริการอีเมลที่ไม่ได้รับอนุญาต
-              unreachable: ดูเหมือนว่าจะไม่มีอยู่จริง
+              unreachable: ดูเหมือนว่าจะไม่มีอยู่
+            role_id:
+              elevated: ไม่สามารถสูงกว่าบทบาทปัจจุบันของคุณ
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: รวมสิทธิอนุญาตที่ไม่ปลอดภัยสำหรับบทบาทพื้นฐาน
+              elevated: ไม่สามารถรวมสิทธิอนุญาตที่บทบาทปัจจุบันของคุณไม่มี
+              own_role: ไม่สามารถเปลี่ยนด้วยบทบาทปัจจุบันของคุณ
+            position:
+              elevated: ไม่สามารถสูงกว่าบทบาทปัจจุบันของคุณ
+              own_role: ไม่สามารถเปลี่ยนด้วยบทบาทปัจจุบันของคุณ
diff --git a/config/locales/activerecord.tr.yml b/config/locales/activerecord.tr.yml
index 890f065b1..c9695c1a6 100644
--- a/config/locales/activerecord.tr.yml
+++ b/config/locales/activerecord.tr.yml
@@ -21,6 +21,18 @@ tr:
             username:
               invalid: sadece harfler, sayılar ve alt çizgiler
               reserved: kullanılamaz
+        admin/webhook:
+          attributes:
+            url:
+              invalid: geçerli bir URL değil
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: geçerli bir URL değil
+        import:
+          attributes:
+            data:
+              malformed: bozulmuştur
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ tr:
             email:
               blocked: izin verilmeyen bir e-posta sağlayıcı kullanıyor
               unreachable: mevcut gözükmüyor
+            role_id:
+              elevated: mevcut rolünüzden yüksek olamaz
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: temel rol için güvenli olmayan izinleri içerir
+              elevated: mevcut rolünüzün sahip olmadığı izinleri içeremez
+              own_role: mevcut rolünüzle değiştirilemez
+            position:
+              elevated: mevcut rolünüzden yüksek olamaz
+              own_role: mevcut rolünüzle değiştirilemez
diff --git a/config/locales/activerecord.tt.yml b/config/locales/activerecord.tt.yml
index a689958c4..5f28508d6 100644
--- a/config/locales/activerecord.tt.yml
+++ b/config/locales/activerecord.tt.yml
@@ -8,3 +8,5 @@ tt:
         password: Парол
       user/account:
         username: Кулланучы исеме
+      user/invite_request:
+        text: Сәбаб
diff --git a/config/locales/activerecord.uk.yml b/config/locales/activerecord.uk.yml
index 38d4771b3..f02064283 100644
--- a/config/locales/activerecord.uk.yml
+++ b/config/locales/activerecord.uk.yml
@@ -7,7 +7,7 @@ uk:
         options: Варіанти вибору
       user:
         agreement: Угода про надання послуг
-        email: E-mail адреса
+        email: Адреса е-пошти
         locale: Локаль
         password: Пароль
       user/account:
@@ -19,14 +19,37 @@ uk:
         account:
           attributes:
             username:
-              invalid: тільки літери, цифри та підкреслення
+              invalid: має містити лише літери, цифри та підкреслення
               reserved: зарезервовано
+        admin/webhook:
+          attributes:
+            url:
+              invalid: не є дійсною URL-адресою
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: не є дійсною URL-адресою
+        import:
+          attributes:
+            data:
+              malformed: неправильний
         status:
           attributes:
             reblog:
-              taken: статусу вже існує
+              taken: цього допису вже існує
         user:
           attributes:
             email:
               blocked: використовує не дозволенного постачальника електронної пошти
               unreachable: не існує
+            role_id:
+              elevated: не може бути вищою за поточну роль
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: включити небезпечні для базової ролі дозволи
+              elevated: не можна включити права, якими не володіє ваша поточна роль
+              own_role: не можна змінити у вашій поточній ролі
+            position:
+              elevated: не може бути вищою за поточну роль
+              own_role: не можна змінити у вашій поточній ролі
diff --git a/config/locales/activerecord.vi.yml b/config/locales/activerecord.vi.yml
index c0e989563..9dd6b2136 100644
--- a/config/locales/activerecord.vi.yml
+++ b/config/locales/activerecord.vi.yml
@@ -6,7 +6,7 @@ vi:
         expires_at: Hạn chót
         options: Lựa chọn
       user:
-        agreement: Đồng ý quy tắc
+        agreement: Thỏa thuận dịch vụ
         email: Địa chỉ email
         locale: Quốc gia
         password: Mật khẩu
@@ -21,6 +21,18 @@ vi:
             username:
               invalid: chỉ chấp nhận ký tự, số và dấu gạch dưới
               reserved: bị cấm sử dụng
+        admin/webhook:
+          attributes:
+            url:
+              invalid: không phải là một URL hợp lệ
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: không phải là một URL hợp lệ
+        import:
+          attributes:
+            data:
+              malformed: bị hỏng
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ vi:
             email:
               blocked: sử dụng dịch vụ email bị cấm
               unreachable: không tồn tại
+            role_id:
+              elevated: không thể cao hơn vai trò hiện tại của bạn
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: bao gồm các quyền không an toàn cho vai trò cơ bản
+              elevated: không thể bao gồm các quyền mà vai trò hiện tại của bạn không có
+              own_role: không thể thay đổi vai trò hiện tại của bạn
+            position:
+              elevated: không thể cao hơn vai trò hiện tại của bạn
+              own_role: không thể thay đổi vai trò hiện tại của bạn
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index 946e81893..e36ea6662 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -19,14 +19,37 @@ zh-CN:
         account:
           attributes:
             username:
-              invalid: 只能使用字母、数字和下划线
+              invalid: 只能包含字母、数字和下划线
               reserved: 是保留关键字
+        admin/webhook:
+          attributes:
+            url:
+              invalid: 非有效网址
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: 非有效网址
+        import:
+          attributes:
+            data:
+              malformed: 格式错误
         status:
           attributes:
             reblog:
-              taken: 已经被转嘟过
+              taken: 已被转嘟过
         user:
           attributes:
             email:
               blocked: 使用了被封禁的电子邮件提供商
               unreachable: 似乎不存在
+            role_id:
+              elevated: 不能高于您当前的身份
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: 包含对基本角色不安全的权限
+              elevated: 不能包含您当前角色不拥有的权限
+              own_role: 无法以您当前的身份更改
+            position:
+              elevated: 不能高于您当前的角色
+              own_role: 无法以您当前的身份更改
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml
index 1aa9dfebe..a4ca66386 100644
--- a/config/locales/activerecord.zh-HK.yml
+++ b/config/locales/activerecord.zh-HK.yml
@@ -21,6 +21,18 @@ zh-HK:
             username:
               invalid: 只能使用字母、數字和下劃線
               reserved: 已被保留
+        admin/webhook:
+          attributes:
+            url:
+              invalid: 不是一個有效的網址
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: 不是一個有效的網址
+        import:
+          attributes:
+            data:
+              malformed: 是畸形
         status:
           attributes:
             reblog:
@@ -30,3 +42,14 @@ zh-HK:
             email:
               blocked: 使用不被允許的電子郵件供應商
               unreachable: 似乎不存在
+            role_id:
+              elevated: 不可高於你目前的身份
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: 包括對基本身份不安全的權限
+              elevated: 不能包括你當前身份不具備的權限
+              own_role: 無法以你目前的身份更改
+            position:
+              elevated: 不可高於你目前的身份
+              own_role: 無法以你目前的身份更改
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml
index c6856c386..002ca9519 100644
--- a/config/locales/activerecord.zh-TW.yml
+++ b/config/locales/activerecord.zh-TW.yml
@@ -7,7 +7,7 @@ zh-TW:
         options: 選擇
       user:
         agreement: 服務同意書
-        email: 電子信箱地址
+        email: 電子郵件地址
         locale: 地區
         password: 密碼
       user/account:
@@ -21,6 +21,18 @@ zh-TW:
             username:
               invalid: 只能有字母、數字及底線
               reserved: 是保留關鍵字
+        admin/webhook:
+          attributes:
+            url:
+              invalid: 不是有效的 URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: 不是有效的 URL
+        import:
+          attributes:
+            data:
+              malformed: 資料不正確
         status:
           attributes:
             reblog:
@@ -28,5 +40,16 @@ zh-TW:
         user:
           attributes:
             email:
-              blocked: 使用不被允許的電子信箱供應商
+              blocked: 使用不被允許的電子郵件供應商
               unreachable: 似乎不存在
+            role_id:
+              elevated: 不能高於您目前的角色
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: 包含對基本角色不安全的權限
+              elevated: 不能包含您目前角色不具備的權限
+              own_role: 無法被您目前的角色更改
+            position:
+              elevated: 不能高於您目前的角色
+              own_role: 無法被您目前的角色更改
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 4afb11de5..dadb61c75 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1,8 +1,98 @@
 ---
 af:
+  about:
+    contact_missing: Nie ingestel nie
+    contact_unavailable: NVT
+    hosted_on: Mastodon gehuisves op %{domain}
+    title: Aangaande
+  admin:
+    accounts:
+      location:
+        local: Plaaslik
+      moderation:
+        silenced: Beperk
+      search: Soek
+      silenced: Beperk
+    action_logs:
+      actions:
+        silence_account_html: "%{name} het %{target} se rekening beperk"
+      deleted_account: geskrapte rekening
+    announcements:
+      publish: Publiseer
+      published_msg: Aankondiging suksesvol gepubliseer!
+      unpublish: Depubliseer
+    domain_allows:
+      export: Voer uit
+      import: Voer in
+    domain_blocks:
+      existing_domain_block: Jy het %{name} al strenger ingeperk.
+      export: Voer uit
+      import: Voer in
+      new:
+        severity:
+          desc_html: "<strong>Beperk</strong> maak plasings deur ’n rekening op hierdie domein onsigbaar vir alle nievolgers van die beperkte rekening. <strong>Skort op</strong> haal alle inhoud, media en profieldata van rekeninge van die opgeskorte domein van jou bediener af. Gebruik <strong>Geen</strong> as jy slegs medialêers wil verwerp."
+          silence: Beperk
+    export_domain_allows:
+      no_file: Geen lêer is gekies nie
+    instances:
+      back_to_limited: Beperk
+      moderation:
+        limited: Beperk
+    roles:
+      categories:
+        devops: DevOps
+      privileges:
+        invite_users_description: Laat gebruikers toe om nuwe mense te nooi na die bediener
+        view_devops: DevOps
+    settings:
+      about:
+        title: Oor
+    statuses:
+      favourites: Gunstelinge
+      in_reply_to: Antwoord op
+    strikes:
+      actions:
+        silence: "%{name} het %{target} se rekening beperk"
+    trends:
+      only_allowed: Slegs toegelate
+      preview_card_providers:
+        title: Publiseerders
+      trending: Gewild
+    webhooks:
+      add_new: Voeg eindpunt by
+      delete: Wis uit
+      disable: Deaktiveer
+      disabled: Gedeaktiveer
+      edit: Redigeer eindpunt
+      empty: Jy het nog nie webhoekeindpunte oogestel nie.
+      enable: Aktiveer
+      enabled: Aktief
+      new: Nuwe webhoek
+      rotate_secret: Roteer geheim
+      secret: Onderteken geheim
+      status: Status
+      title: Webhoeke
+      webhook: Web-hoek
+  appearance:
+    advanced_web_interface_hint: As jy die volle wydte van jou skerm gebruik, laat die gevorderde webkoppelvlak jou toe om kolomme met verskillende soorte inligting langs mekaar te rangskik. So kan jy, byvoorbeeld, tegelyk jou tuistoevoer, kennisgewings, gefedereerde tydlyn en nog ander lyste of hutsetikette dophou.
+  application_mailer:
+    notification_preferences: Verander e-posvoorkeure
+    settings: 'Verander e-posvoorkeure: %{link}'
+  auth:
+    apply_for_account: Doen aansoek om ’n rekening
+    logout: Teken uit
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} uur"
+      about_x_months: "%{count} maande"
+      about_x_years: "%{count} jaar"
+  disputes:
+    strikes:
+      approve_appeal: Aanvaar appèl
+      reject_appeal: Verwerp appèl
   errors:
     '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
+    '403': Jy het nie toestemming om hierdie bladsy te sien nie.
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
@@ -10,3 +100,61 @@ af:
     '429': Too many requests
     '500': 
     '503': The page could not be served due to a temporary server failure.
+  exports:
+    bookmarks: Boekmerke
+    lists: Lyste
+  filters:
+    contexts:
+      home: Tuis en lyste
+  imports:
+    types:
+      bookmarks: Boekmerke
+  invites:
+    title: Nooi ander
+  login_activities:
+    description_html: Indien jy onbekende aktiwiteite gewaar, oorweeg dit om jou wagwoord te verander en tweefaktorverifikasie te aktiveer.
+  navigation:
+    toggle_menu: Wisselkieslys
+  notification_mailer:
+    mention:
+      action: Reageer
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+  preferences:
+    other: Ander
+    posting_defaults: Standaardplasings
+    public_timelines: Openbare tydlyne
+  privacy_policy:
+    title: Privaatheidsbeleid
+  rss:
+    content_warning: 'Inhoudwaarskuwing:'
+    descriptions:
+      account: Openbare plasings vanaf @%{acct}
+      tag: 'Openbare plasings met die etiket #%{hashtag}'
+  sessions:
+    browsers:
+      blackberry: BlackBerry
+      uc_browser: UC Browser
+    platforms:
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+  settings:
+    edit_profile: Redigeer profiel
+    preferences: Voorkeure
+  statuses:
+    content_warning: 'Inhoud waarskuwing: %{warning}'
+    errors:
+      in_reply_not_found: Die plasing waarop jy probeer reageer blyk nie te bestaan nie.
+  statuses_cleanup:
+    ignore_favs: Ignoreer gunstelinge
+  strikes:
+    errors:
+      too_late: Dit is te laat om hierteen te appelleer
+  user_mailer:
+    warning:
+      title:
+        silence: Rekening beperk
+    welcome:
+      edit_profile_action: Stel profiel op
diff --git a/config/locales/an.yml b/config/locales/an.yml
new file mode 100644
index 000000000..f3bb5a895
--- /dev/null
+++ b/config/locales/an.yml
@@ -0,0 +1,1661 @@
+---
+an:
+  about:
+    about_mastodon_html: 'Lo ret social d''o futuro: Sin anuncios, sin vichilancia corporativa, disenyo etico, y descentralización! Sé duenyo d''a tuya información con Mastodon!'
+    contact_missing: No especificau
+    contact_unavailable: No disponible
+    hosted_on: Mastodon alochau en %{domain}
+    title: Sobre
+  accounts:
+    follow: Seguir
+    followers:
+      one: Seguidor
+      other: Seguidores
+    following: Seguindo
+    instance_actor_flash: Esta cuenta ye un actor virtual utilizau pa representar a lo servidor en ell mesmo y no a garra usuario individual. S'utiliza pa propositos d'a federación y no s'ha de suspender.
+    last_active: zaguera connexión
+    link_verified_on: La propiedat d'este vinclo estió verificada lo %{date}
+    nothing_here: No i hai cosa aquí!
+    pin_errors:
+      following: Has d'estar seguindo a la persona a la quala quiers aprebar
+    posts:
+      one: Publicación
+      other: Publicacions
+    posts_tab_heading: Publicacions
+  admin:
+    account_actions:
+      action: Realizar acción
+      title: Amoderar %{acct}
+    account_moderation_notes:
+      create: Creyar
+      created_msg: Nota de moderación creyada con exito!
+      destroyed_msg: Nota de moderación destruyida con exito!
+    accounts:
+      add_email_domain_block: Meter en lista negra lo dominio d'o correu
+      approve: Aprebar
+      approved_msg: La solicitut de rechistro de %{username} ha estau aprebada correctament
+      are_you_sure: Yes seguro?
+      avatar: Avatar
+      by_domain: Dominio
+      change_email:
+        changed_msg: Email cambiau con exito!
+        current_email: Correu electronico actual
+        label: Cambiar lo correu electronico
+        new_email: Nuevo correu electronico
+        submit: Cambiar lo correu electronico
+        title: Cambiar lo correu electronico de %{username}
+      change_role:
+        changed_msg: Rol cambiau con exito!
+        label: Cambiar rol
+        no_role: Sin rol
+        title: Cambiar rol pa %{username}
+      confirm: Confirmar
+      confirmed: Confirmau
+      confirming: Confirmando
+      custom: Personalizau
+      delete: Eliminar datos
+      deleted: Borrau
+      demote: Degradar
+      destroyed_msg: Los datos de %{username} son ya en coda pa estar eliminaus de camín
+      disable: Deshabilitar
+      disable_sign_in_token_auth: Deshabilitar l'autenticación per token de correu electronico
+      disable_two_factor_authentication: Desactivar autenticación de dos factors
+      disabled: Deshabilitada
+      display_name: Nombre
+      domain: Dominio
+      edit: Editar
+      email: Adreza de correu-e
+      email_status: Status de correu-e
+      enable: Habilitar
+      enable_sign_in_token_auth: Habilitar l'autenticación per token de correu electronico
+      enabled: Habilitada
+      enabled_msg: S'ha descongelado correctament la cuenta de %{username}
+      followers: Seguidores
+      follows: Sigue
+      header: Capitero
+      inbox_url: URL d'a servilla de dentrada
+      invite_request_text: Razons pa unir-se
+      invited_by: Convidau per
+      ip: IP
+      joined: Uniu
+      location:
+        all: Totz
+        local: Local
+        remote: Remoto
+        title: Localización
+      login_status: Estau d'o login
+      media_attachments: Multimedia
+      memorialize: Convertir en memorial
+      memorialized: Cuenta commemorativa
+      memorialized_msg: "%{username} se convirtió con exito en una cuenta commemorativa"
+      moderation:
+        active: Activo
+        all: Totz
+        pending: Pendient
+        silenced: Limitau
+        suspended: Suspendius
+        title: Moderación
+      moderation_notes: Notas de moderación
+      most_recent_activity: Actividat mas recient
+      most_recent_ip: IP mas recient
+      no_account_selected: Garra cuenta se cambió como garra estió triada
+      no_limits_imposed: Sin limites imposaus
+      no_role_assigned: Garra rol asignau
+      not_subscribed: No se ye suscrito
+      pending: Revisión pendient
+      perform_full_suspension: Suspender
+      previous_strikes: Amonestacions anteriors
+      previous_strikes_description_html:
+        one: Esta cuenta tiene <strong>una</strong> amonestación.
+        other: Esta cuenta tiene <strong>%{count}</strong> amonestacions.
+      promote: Promocionar
+      protocol: Protocolo
+      public: Publico
+      push_subscription_expires: Expiración d'a conduta PuSH
+      redownload: Refrescar avatar
+      redownloaded_msg: S'actualizó correctament lo perfil de %{username} dende l'orichen
+      reject: Refusar
+      rejected_msg: La solicitut de rechistro de %{username} ha estau refusada con exito
+      remove_avatar: Eliminar lo avatar
+      remove_header: Eliminar capitero
+      removed_avatar_msg: S'ha eliminau exitosament la imachen d'o avatar de %{username}
+      removed_header_msg: S'ha eliminau con exito la imachen de capitero de %{username}
+      resend_confirmation:
+        already_confirmed: Este usuario ya ye confirmau
+        send: Reninviar lo correu electronico de confirmación
+        success: Correu electronico de confirmación ninviau con exito!
+      reset: Reiniciar
+      reset_password: Reiniciar clau
+      resubscribe: Re-suscribir
+      role: Rol
+      search: Buscar
+      search_same_email_domain: Atros usuarios con o mesmo dominio de correu
+      search_same_ip: Atros usuarios con a mesma IP
+      security_measures:
+        only_password: Nomás clau
+        password_and_2fa: Clau y 2FA
+      sensitive: Sensible
+      sensitized: Marcau como sensible
+      shared_inbox_url: URL de servilla compartida
+      show:
+        created_reports: Reportes feitos per esta cuenta
+        targeted_reports: Reportes feitos sobre esta cuenta
+      silence: Silenciar
+      silenced: Silenciau
+      statuses: Estaus
+      strikes: Amonestacions previas
+      subscribe: Suscribir
+      suspend: Suspender
+      suspended: Suspendiu
+      suspension_irreversible: Los datos d'esta cuenta han estau irreversiblement eliminaus. Puetz desfer la suspensión d'a cuenta pa fer-la utilizable, pero no recuperará los datos que tenebas anteriorment.
+      suspension_reversible_hint_html: La cuenta ha estau suspendida y los datos s'eliminarán completament lo %{date}. Dica alavez, la cuenta puede estar restaurada sin garra efecto perchudicial. Si deseya eliminar totz los datos d'a cuenta immediatament, puede fer-lo contino.
+      title: Cuentas
+      unblock_email: Desblocar adreza de correu
+      unblocked_email_msg: S'ha desblocau correctament l'adreza de correu de %{username}
+      unconfirmed_email: Correu electronico sin confirmar
+      undo_sensitized: Desmarcar como sensible
+      undo_silenced: Des-silenciar
+      undo_suspension: Des-suspender
+      unsilenced_msg: Se sacó con exito lo limite d'a cuenta %{username}
+      unsubscribe: Desuscribir
+      unsuspended_msg: Se sacó con exito la suspensión d'a cuenta de %{username}
+      username: Nombre d'usuario
+      view_domain: Veyer resumen d'o dominio
+      warn: Adevertir
+      web: Web
+      whitelisted: Anyadiu a la lista blanca
+    action_logs:
+      action_types:
+        approve_appeal: Aprebar Apelación
+        approve_user: Aprebar Usuario
+        assigned_to_self_report: Asignar Reporte
+        change_email_user: Cambiar Correu Electronico de l'Usuario
+        change_role_user: Cambiar Rol d'Usuario
+        confirm_user: Confirmar Usuario
+        create_account_warning: Creyar Alvertencia
+        create_announcement: Creyar Anuncio
+        create_canonical_email_block: Creyar Bloqueyo de Correu Electronico
+        create_custom_emoji: Creyar Emoji Personalizau
+        create_domain_allow: Creyar Permiso de Dominio
+        create_domain_block: Creyar Bloqueyo de Dominio
+        create_email_domain_block: Creyar Bloqueyo de Dominio de Correu Electronico
+        create_ip_block: Creyar regla IP
+        create_unavailable_domain: Creyar Dominio No Disponible
+        create_user_role: Creyar Rol
+        demote_user: Degradar Usuario
+        destroy_announcement: Eliminar Anuncio
+        destroy_canonical_email_block: Eliminar Bloqueyo de Correu Electronico
+        destroy_custom_emoji: Eliminar Emoji Personalizau
+        destroy_domain_allow: Eliminar Permiso de Dominio
+        destroy_domain_block: Eliminar Bloqueyo de Dominio
+        destroy_email_domain_block: Eliminar Bloqueyo de Dominio de Correu Electronico
+        destroy_instance: Purgar Dominio
+        destroy_ip_block: Eliminar regla IP
+        destroy_status: Eliminar Estau
+        destroy_unavailable_domain: Eliminar Dominio No Disponible
+        destroy_user_role: Destruyir Rol
+        disable_2fa_user: Deshabilitar 2FA
+        disable_custom_emoji: Deshabilitar Emoji Personalizau
+        disable_sign_in_token_auth_user: Deshabilitar l'Autenticación per Token de Correu Electronico pa l'Usuario
+        disable_user: Deshabilitar Usuario
+        enable_custom_emoji: Habilitar Emoji Personalizau
+        enable_sign_in_token_auth_user: Habilitar l'Autenticación per Token de Correu Electronico pa l'Usuario
+        enable_user: Habilitar Usuario
+        memorialize_account: Transformar en Cuenta Commemorativa
+        promote_user: Promover Usuario
+        reject_appeal: Refusar Apelación
+        reject_user: Refusar Usuario
+        remove_avatar_user: Eliminar Avatar
+        reopen_report: Reubrir Reporte
+        resend_user: Reninviar Correu de Confirmación
+        reset_password_user: Restablir Clau
+        resolve_report: Resolver Reporte
+        sensitive_account: Marcar multimedia en a tuya cuenta como sensible
+        silence_account: Silenciar Cuenta
+        suspend_account: Suspender Cuenta
+        unassigned_report: Desasignar Reporte
+        unblock_email_account: Desblocar adreza de correu
+        unsensitive_account: Desmarcar multimedia en a tuya cuenta como sensible
+        unsilence_account: Deixar de Silenciar Cuenta
+        unsuspend_account: Deixar de Suspender Cuenta
+        update_announcement: Actualizar Anuncio
+        update_custom_emoji: Actualizar Emoji Personalizau
+        update_domain_block: Actualizar lo Bloqueyo de Dominio
+        update_ip_block: Actualizar regla IP
+        update_status: Actualizar Estau
+        update_user_role: Actualizar Rol
+      actions:
+        approve_appeal_html: "%{name} aprebó la solicitut de moderación de %{target}"
+        approve_user_html: "%{name} aprebó lo rechistro de %{target}"
+        assigned_to_self_report_html: "%{name} asignó l'informe %{target} a ell mesmo"
+        change_email_user_html: "%{name} cambió l'adreza de correu electronico de l'usuario %{target}"
+        change_role_user_html: "%{name} cambió lo rol de %{target}"
+        confirm_user_html: "%{name} confirmó l'adreza de correu electronico de l'usuario %{target}"
+        create_account_warning_html: "%{name} ninvió una alvertencia a %{target}"
+        create_announcement_html: "%{name} ha creyau un nuevo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} blocó lo correu electronico con o hash %{target}"
+        create_custom_emoji_html: "%{name} puyó un nuevo emoji %{target}"
+        create_domain_allow_html: "%{name} permitió la federación con o dominio %{target}"
+        create_domain_block_html: "%{name} blocó lo dominio %{target}"
+        create_email_domain_block_html: "%{name} blocó lo dominio de correu electronico %{target}"
+        create_ip_block_html: "%{name} creyó una regla pa la IP %{target}"
+        create_unavailable_domain_html: "%{name} aturó las entregas a lo dominio %{target}"
+        create_user_role_html: "%{name} creyó lo rol %{target}"
+        demote_user_html: "%{name} degradó a l'usuario %{target}"
+        destroy_announcement_html: "%{name} eliminó l'anuncio %{target}"
+        destroy_canonical_email_block_html: "%{name} desblocó lo correu electronico con o hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminó lo emoji %{target}"
+        destroy_domain_allow_html: "%{name} blocó la federación con o dominio %{target}"
+        destroy_domain_block_html: "%{name} desblocó lo dominio %{target}"
+        destroy_email_domain_block_html: "%{name} desblocó lo dominio de correu electronico %{target}"
+        destroy_instance_html: "%{name} purgó lo dominio %{target}"
+        destroy_ip_block_html: "%{name} eliminó una regla pa la IP %{target}"
+        destroy_status_html: "%{name} eliminó lo estau per %{target}"
+        destroy_unavailable_domain_html: "%{name} reprenió las entregas a lo dominio %{target}"
+        destroy_user_role_html: "%{name} eliminó lo rol %{target}"
+        disable_2fa_user_html: "%{name} desactivó lo requisito de dos factors pa l'usuario %{target}"
+        disable_custom_emoji_html: "%{name} desactivó lo emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} ha deshabilitau l'autenticación per token de correu electronico pa %{target}"
+        disable_user_html: "%{name} deshabilitó l'inicio de sesión pa l'usuario %{target}"
+        enable_custom_emoji_html: "%{name} activó lo emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ha habilitau l'autenticación per token de correu electronico pa %{target}"
+        enable_user_html: "%{name} habilitó l'inicio de sesión pa l'usuario %{target}"
+        memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una pachina in memoriam"
+        promote_user_html: "%{name} promoción a l'usuario %{target}"
+        reject_appeal_html: "%{name} refusó la solicitut de moderación de %{target}"
+        reject_user_html: "%{name} refusó lo rechistro de %{target}"
+        remove_avatar_user_html: "%{name} eliminó lo avatar de %{target}"
+        reopen_report_html: "%{name} reubrió l'informe %{target}"
+        resend_user_html: "%{name} ha reninviau lo correu de confirmación pa %{target}"
+        reset_password_user_html: "%{name} reinició la clau de l'usuario %{target}"
+        resolve_report_html: "%{name} resolvió l'informe %{target}"
+        sensitive_account_html: "%{name} marcó los fichers multimedia de %{target} como sensibles"
+        silence_account_html: "%{name} silenció la cuenta de %{target}"
+        suspend_account_html: "%{name} suspendió la cuenta de %{target}"
+        unassigned_report_html: "%{name} des-asignó l'informe %{target}"
+        unblock_email_account_html: "%{name} ha desblocau l'adreza de correu de %{target}"
+        unsensitive_account_html: "%{name} desmarcó los fichers multimedia de %{target} como sensibles"
+        unsilence_account_html: "%{name} desilenció la cuenta de %{target}"
+        unsuspend_account_html: "%{name} reactivó la cuenta de %{target}"
+        update_announcement_html: "%{name} actualizó l'anuncio %{target}"
+        update_custom_emoji_html: "%{name} actualizó lo emoji %{target}"
+        update_domain_block_html: "%{name} actualizó lo bloqueyo de dominio pa %{target}"
+        update_ip_block_html: "%{name} cambió la regla pa la IP %{target}"
+        update_status_html: "%{name} actualizó lo estau de %{target}"
+        update_user_role_html: "%{name} cambió lo rol %{target}"
+      deleted_account: cuenta eliminada
+      empty: No se troboron rechistros.
+      filter_by_action: Filtrar per acción
+      filter_by_user: Filtrar per usuario
+      title: Log de auditoría
+    announcements:
+      destroyed_msg: Anuncio eliminau con exito!
+      edit:
+        title: Editar anuncio
+      empty: No se troboron anuncios.
+      live: En vivo
+      new:
+        create: Creyar anuncio
+        title: Nuevo anuncio
+      publish: Publicar
+      published_msg: Anuncio publicau con exito!
+      scheduled_for: Programado atura %{time}
+      scheduled_msg: Anuncio programado pa la suya publicación!
+      title: Anuncios
+      unpublish: Retirar publicación
+      unpublished_msg: Anuncio despublicado con exito!
+      updated_msg: Anuncio actualizau con exito!
+    custom_emojis:
+      assign_category: Asignar categoría
+      by_domain: Dominio
+      copied_msg: Copia local d'o emoji creyada con exito
+      copy: Copiar
+      copy_failed_msg: No se podió realizar una copia local d'ixe emoji
+      create_new_category: Creyar una nueva categoría
+      created_msg: Emoji creyau con exito!
+      delete: Borrar
+      destroyed_msg: Emojo destruyiu con exito!
+      disable: Deshabilitar
+      disabled: Desactivau
+      disabled_msg: Se deshabilitó con exito ixe emoji
+      emoji: Emoji
+      enable: Habilitar
+      enabled: Activau
+      enabled_msg: S'habilitó con exito ixe emoji
+      image_hint: PNG u GIF dica %{size}
+      list: Lista
+      listed: Listaus
+      new:
+        title: Anyadir nuevo emoji personalizau
+      no_emoji_selected: No se cambió garra emoji ya que no se trió garra
+      not_permitted: No tiens permiso pa realizar esta acción
+      overwrite: Sobrescribir
+      shortcode: Codigo d'alcorce
+      shortcode_hint: A lo menos 2 caracters, solo caracters alfanumericos y guións baixos
+      title: Emojis personalizaus
+      uncategorized: Sin clasificar
+      unlist: No listau
+      unlisted: Sin listar
+      update_failed_msg: No se podió actualizar ixe emoji
+      updated_msg: Emoji actualizau con exito!
+      upload: Puyar
+    dashboard:
+      active_users: usuarios activos
+      interactions: interaccions
+      media_storage: Almagazenamiento multimedia
+      new_users: nuevos usuarios
+      opened_reports: informes ubiertos
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelación pendient"
+        other: "<strong>%{count}</strong> apelacions pendients"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> informe pendient"
+        other: "<strong>%{count}</strong> informes pendients"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> etiqueta pendient"
+        other: "<strong>%{count}</strong> etiquetas pendients"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usuario pendient"
+        other: "<strong>%{count}</strong> usuarios pendients"
+      resolved_reports: informes resueltos
+      software: Software
+      sources: Fuents de rechistro
+      space: Uso d'almagazenamiento
+      title: Tablero
+      top_languages: Idiomas mas activos
+      top_servers: Servidors mas activos
+      website: Puesto web
+    disputes:
+      appeals:
+        empty: No se troboron apelacions.
+        title: Apelacions
+    domain_allows:
+      add_new: Anyadir dominio a la lista blanca
+      created_msg: Dominio anyadiu a la lista blanca con exito
+      destroyed_msg: Dominio sacau d'a lista blanca con exito
+      export: Exportar
+      import: Importar
+      undo: Sacar d'a lista blanca
+    domain_blocks:
+      add_new: Anyadir nuevo
+      created_msg: Lo bloqueyo d'o dominio ye estando procesau
+      destroyed_msg: Lo bloqueyo d'o dominio se desfació
+      domain: Dominio
+      edit: Editar bloqueyo de dominio
+      existing_domain_block: Ya imposés limites mas estrictos a %{name}.
+      existing_domain_block_html: Ya ha imposau limites mas estrictos a %{name}, cal <a href="%{unblock_url}">desblocar-lo primero</a>.
+      export: Exportar
+      import: Importar
+      new:
+        create: Creyar bloqueyo
+        hint: Lo bloqueyo de dominio no aprevendrá la creyación de dentradas de cuenta en a base de datos, pero aplicará retroactiva y automaticament metodos de moderación especifica en ditas cuentas.
+        severity:
+          desc_html: "<strong>Limitar</strong> ferá que las publicacions d'as cuentas d'ixe dominio sían invisibles pa qualsequiera que no las sía seguindo. <strong>Suspender</strong> eliminará tot lo conteniu, fichers multimedia, y datos d'o perfil. Usa <strong>Garra</strong> si nomás quiers refusar fichers multimedia."
+          noop: Garra
+          silence: Limitar
+          suspend: Suspender
+        title: Nuevo bloqueyo de dominio
+      no_domain_block_selected: No se cambió garra bloqueyo de dominio ya que garra estió triau
+      not_permitted: No tiens permiso pa realizar esta acción
+      obfuscate: Amagar nombre de dominio
+      obfuscate_hint: Amagada parcialment lo nombre de dominio en a lista si amostrar la lista de limitacions de dominio ye habilitau
+      private_comment: Comentario privau
+      private_comment_hint: Comentario sobre esta limitación de dominio pa l'uso interno per parte d'os moderadors.
+      public_comment: Comentario publico
+      public_comment_hint: Comentario sobre esta limitación de dominio pa lo publico en cheneral, si la publicidat d'a lista de limitacions de dominio ye habilitada.
+      reject_media: Refusar fichers multimedia
+      reject_media_hint: Remueve localment fichers multimedia almagazenaus pa descargar qualsequiera en o futuro. Irrelevant pa suspensions
+      reject_reports: Refusar informes
+      reject_reports_hint: Ignore totz los reportes d'este dominio. Irrelevant pa suspensions
+      undo: Desfer
+      view: Veyer dominio blocau
+    email_domain_blocks:
+      add_new: Anyadir nuevo
+      attempts_over_week:
+        one: "%{count} intento entre la zaguera semana"
+        other: "%{count} intentos de rechistro entre la zaguera semana"
+      created_msg: Dominio de correu anyadiu a la lista negra con exito
+      delete: Borrar
+      dns:
+        types:
+          mx: Rechistro MX
+      domain: Dominio
+      new:
+        create: Anyadir dominio
+        resolve: Resolver dominio
+        title: Nueva dentrada en a lista negra de correu
+      no_email_domain_block_selected: No s'ha cambiau bloqueyos de dominio ya que garra ha estau triau
+      resolved_dns_records_hint_html: Lo nombre de dominio resuelte los siguients dominios MX, los quals son responsables en zaguera instancia d'acceptar lo correu electronico. Blocar un dominio MX blocará los rechistros de qualsequier adreza de correu electronico que utilice lo mesmo dominio MX, mesmo si lo nombre de dominio visible ye diferent. <strong>Tienga cudiau de no blocar los prencipals furnidors de correu electronico.</strong>
+      resolved_through_html: Resuelto a traviés de %{domain}
+      title: Lista negra de correu
+    export_domain_allows:
+      new:
+        title: Importar dominios permitius
+      no_file: Garra fichero triau
+    export_domain_blocks:
+      import:
+        description_html: Yes a punto d'importar una lista de bloqueyos de dominio. Per favor, revisa esta lista con muito cudiau, especialment si no has creyau esta lista tu mesmo.
+        existing_relationships_warning: Relacions de seguimiento existents
+        private_comment_description_html: 'Pa aduyar-le a rastriar d''án proceden los bloqueyos importaus, los bloqueyos importaus se creyarán con o siguient comentario privau: <q>%{comment}</q>'
+        private_comment_template: Importau dende %{source} lo %{date}
+        title: Importar bloqueyos de dominio
+      new:
+        title: Importar bloqueyos de dominio
+      no_file: Garra fichero triau
+    follow_recommendations:
+      description_html: "<strong>Las recomendacions de cuentas aduyan a los nuevos usuarios a trobar rapidament conteniu interesant</strong>. Quan un usuario no ha interactuado con atros pro como pa suscitar recomendacions personalizadas de cuentas a las qualas seguir, en o suyo puesto se le recomiendan estas cuentas. Se recalculan diariament a partir d'una mescla de cuentas con o mayor numero d'interaccions recients y con o mayor numero de seguidores locals con un idioma determinau."
+      language: Pa l'idioma
+      status: Estau
+      suppress: Suprimir recomendación de cuentas
+      suppressed: Suprimida
+      title: Recomendacions de cuentas
+      unsuppress: Restaurar recomendacions de cuentas
+    instances:
+      availability:
+        description_html:
+          one: Si lo ninvio a lo dominio falla <strong>%{count} día</strong> sin exito, no se ferán mas intentos d'entrega de no estar que se reciba un ninvio <em>dende</em> lo dominio.
+          other: Si lo ninvio a lo dominio falla <strong>%{count} días diferents</strong> sin exito, no se ferán mas intentos d'entrega de no estar que se reciba un ninvio <em>dende</em> lo dominio.
+        failure_threshold_reached: Limite de fallo aconseguiu lo %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días diferents.
+        no_failures_recorded: No i hai fallos en o rechistro.
+        title: Disponibilidat
+        warning: Lo zaguer intento de connexión a este servidor no ha teniu exito
+      back_to_all: Totz
+      back_to_limited: Limitaus
+      back_to_warning: Alvertencia
+      by_domain: Dominio
+      confirm_purge: Seguro que quiers eliminar permanentment los datos d'este dominio?
+      content_policies:
+        comment: Nota interna
+        description_html: Puetz definir politicas de conteniu que s'aplicarán a totas las cuentas d'este dominio y a qualsequiera d'os suyos subdominios.
+        policies:
+          reject_media: Refusar multimedia
+          reject_reports: Refusar informes
+          silence: Limite
+          suspend: Suspender
+        policy: Politica
+        reason: Razón publica
+        title: Politicas de conteniu
+      dashboard:
+        instance_accounts_dimension: Cuentas mas seguidas
+        instance_accounts_measure: cuentas almagazenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: los suyos seguidores aquí
+        instance_languages_dimension: Idiomas prencipals
+        instance_media_attachments_measure: fichers adjuntos alzaus
+        instance_reports_measure: informes sobre ells
+        instance_statuses_measure: mensaches almagazenaus
+      delivery:
+        all: Totz
+        clear: Limpiar errors d'entrega
+        failing: Fallando
+        restart: Reiniciar entrega
+        stop: Aturar entrega
+        unavailable: No disponible
+      delivery_available: Entrega disponible
+      delivery_error_days: Días d'error d'entrega
+      delivery_error_hint: Si la entrega no ye posible a lo largo de %{count} días, se marcará automaticament como no entregable.
+      destroyed_msg: Los datos de %{domain} son agora en coda pa la suya imminent eliminación.
+      empty: No se troboron dominios.
+      known_accounts:
+        one: "%{count} cuenta conoixida"
+        other: "%{count} cuentas conoixidas"
+      moderation:
+        all: Totz
+        limited: Limitau
+        title: Moderación
+      private_comment: Comentario privau
+      public_comment: Comentario publico
+      purge: Purgar
+      purge_description_html: Si creyes que este dominio ye desconnectau, puetz borrar totz los rechistros de cuentas y los datos asociaus d'este dominio d'o tuyo almagazenamiento. Esto puede levar un tiempo.
+      title: Instancias conoixidas
+      total_blocked_by_us: Blocau per nusatros
+      total_followed_by_them: Seguius per ells
+      total_followed_by_us: Seguiu per nusatros
+      total_reported: Informes sobre ellas
+      total_storage: Fichers multimedia
+      totals_time_period_hint_html: Los totals amostraus contino incluyen datos pa tot lo tiempo.
+    invites:
+      deactivate_all: Desactivar totz
+      filter:
+        all: Totas
+        available: Disponibles
+        expired: Expiradas
+        title: Filtrar
+      title: Invitacions
+    ip_blocks:
+      add_new: Creyar regla
+      created_msg: Nueva regla IP anyadida con exito
+      delete: Eliminar
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 anyo
+        '86400': 1 día
+        '94670856': 3 anyos
+      new:
+        title: Creyar nueva regla IP
+      no_ip_block_selected: No s'ha cambiau reglas IP ya que no s'ha triau garra
+      title: Reglas IP
+    relationships:
+      title: Relacions de %{acct}
+    relays:
+      add_new: Anyadir un nuevo relés
+      delete: Borrar
+      description_html: Un <strong>relé de federación</strong> ye un servidor intermedio que intercambia grans volumens de publicacions publicas entre servidors que se suscriben y publican en ell. <strong>Puede aduyar a servidors chicotz y medianos a descubrir conteniu d'o fediverso</strong>, que d'unatra traza requeriría que los usuarios locals seguisen manualment a personas de servidors remotos.
+      disable: Deshabilitar
+      disabled: Deshabilitau
+      enable: Hablitar
+      enable_hint: Una vegada connectau, lo tuyo servidor se suscribirá a totz las publicacions publicas d'este relé, y prencipiará a ninviar las publicacions publicas d'este servidor enta ell.
+      enabled: Habilitau
+      inbox_url: URL d'o relés
+      pending: Asperando l'aprebación d'o relés
+      save_and_enable: Alzar y connectar
+      setup: Preparar una connexión de relés
+      signatures_not_enabled: Los relés no funcionarán correctament mientres lo modo seguro u lo modo de lista blanca sían habilitaus
+      status: Estau
+      title: Releses
+    report_notes:
+      created_msg: Lo rechistro d'a denuncia s'ha creyau correctament!
+      destroyed_msg: Lo rechistro d'a denuncia s'ha borrau correctament!
+    reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+      action_log: Rechistro de auditoría
+      action_taken_by: Acción presa per
+      actions:
+        delete_description_html: Los mensaches denunciaus serán eliminaus y se rechistrará una amonestación pa aduyar-te a escalar en futuras infraccions per la mesma cuenta.
+        mark_as_sensitive_description_html: Los fichers multimedia en os mensaches informaus se marcarán como sensibles y s'aplicará una amonestación pa aduyar-te a escalar las futuras infraccions d'a mesma cuenta.
+        other_description_html: Veyer mas opcions pa controlar lo comportamiento d'a cuenta y personalizar la comunicación d'a cuenta denunciada.
+        resolve_description_html: No se prendrán medidas contra la cuenta denunciada, no se rechistrará l'amonestación, y se zarrará l'informe.
+        silence_description_html: Lo perfil será visible solo pa aquells que ya lo sigan u lo busquen manualment, limitando seriosament lo suyo aconsiga. Siempre puede estar revertiu.
+        suspend_description_html: Lo perfil y totz los suyos contenius serán inaccesibles dica que sían finalment eliminaus. La interacción con a cuenta será imposible. Reversible entre un plazo de 30 días.
+      actions_description_html: Decide qué medidas prener pa resolver esta denuncia. Si prenes una acción punitiva contra la cuenta denunciada, se le ninviará a dita cuenta una notificación per correu electronico, fueras de quan se tríe la categoría <strong>Spam</strong>.
+      add_to_report: Anyadir mas a lo reporte
+      are_you_sure: Yes seguro?
+      assign_to_self: Asignar-me-la
+      assigned: Moderador asignau
+      by_target_domain: Dominio d'a cuenta denunciada
+      category: Categoría
+      category_description_html: La razón per la quala se reportó esta cuenta u conteniu será citada en as comunicacions con a cuenta denunciada
+      comment:
+        none: Garra
+      comment_description_html: 'Pa proporcionar mas información, %{name} escribió:'
+      created_at: Denunciau
+      delete_and_resolve: Eliminar publicacions
+      forwarded: Reninviau
+      forwarded_to: Reninviau a %{domain}
+      mark_as_resolved: Marcar como resuelto
+      mark_as_sensitive: Marcar como sensible
+      mark_as_unresolved: Marcar como no resuelto
+      no_one_assigned: Dengún
+      notes:
+        create: Anyadir una nota
+        create_and_resolve: Resolver con una nota
+        create_and_unresolve: Reubrir con una nota
+        delete: Eliminar
+        placeholder: Especificar qué accions s'han preso u qualsequier atra novedat respective a esta denuncia...
+        title: Notas
+      notes_description_html: Veyer y deixar notas a atros moderadors y a lo tuyo yo futuro
+      quick_actions_description_html: 'Prene una acción rapida u desplaza-te enta baixo pa veyer lo conteniu denunciau:'
+      remote_user_placeholder: l'usuario remoto de %{instance}
+      reopen: Reubrir denuncia
+      report: 'Denunciar #%{id}'
+      reported_account: Cuenta denunciada
+      reported_by: Denunciau per
+      resolved: Resuelto
+      resolved_msg: La denuncia s'ha resuelto correctament!
+      skip_to_actions: Ir dreitament a las accions
+      status: Estau
+      statuses: Conteniu denunciau
+      statuses_description_html: Lo conteniu ofensivo se citará en a comunicación con a cuenta denunciada
+      target_origin: Orichen d'a cuenta denunciada
+      title: Reportes
+      unassign: Desasignar
+      unresolved: No resuelto
+      updated_at: Actualizau
+      view_profile: Veyer perfil
+    roles:
+      add_new: Anyadir rol
+      assigned_users:
+        one: "%{count} usuario"
+        other: "%{count} usuarios"
+      categories:
+        administration: Administración
+        devops: DevOps
+        invites: Invitacions
+        moderation: Moderación
+        special: Especial
+      delete: Eliminar
+      description_html: Con <strong>rols d'usuario</strong>, puede personalizar las funcions y arias de Mastodon a las qualas pueden acceder los suyos usuarios.
+      edit: Editar rol '%{name}'
+      everyone: Permisos per defecto
+      everyone_full_description_html: Este ye lo <strong>rol base</strong> que afecta a <strong>totz los usuarios</strong>, mesmo aquells sin un rol asignau. Totz los atros rols heredan permisos d'ell.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Los usuarios con este permiso blincarán totz los permisos
+        delete_user_data: Borrar Datos d'Usuario
+        delete_user_data_description: Permite a los usuarios eliminar los datos d'atros usuarios sin demora
+        invite_users: Convidar usuarios
+        invite_users_description: Permite a los usuarios convidar a nuevas personas a lo servidor
+        manage_announcements: Administrar Anuncios
+        manage_announcements_description: Permite a los usuarios chestionar anuncios en o servidor
+        manage_appeals: Administrar Apelacions
+        manage_appeals_description: Permite a los usuarios revisar apelacions contra accions de moderación
+        manage_blocks: Administrar Bloqueyos
+        manage_blocks_description: Permite a los usuarios blocar los furnidors de e-mail y las adrezas IP
+        manage_custom_emojis: Administrar Emojis Personalizaus
+        manage_custom_emojis_description: Permite a los usuarios chestionar emojis personalizaus en o servidor
+        manage_federation: Administrar Federación
+        manage_federation_description: Permite a los usuarios blocar u permitir la federación con atros dominios, y controlar la entregabilidad
+        manage_invites: Administrar Invitacions
+        manage_invites_description: Permite a los usuarios navegar y desactivar los vinclos d'invitación
+        manage_reports: Administrar Informes
+        manage_reports_description: Permite a los usuarios revisar informes y realizar accions de moderación basadas en ells
+        manage_roles: Administrar Rols
+        manage_roles_description: Permite a los usuarios administrar y asignar rols per debaixo d'os suyos
+        manage_rules: Chestionar Reglas
+        manage_rules_description: Permite a los usuarios cambiar las reglas d'o servidor
+        manage_settings: Administrar Achustes
+        manage_settings_description: Permite a los usuarios cambiar la configuración d'o puesto
+        manage_taxonomies: Administrar Taxonomías
+        manage_taxonomies_description: Permite a los usuarios revisar lo conteniu en tendencia y actualizar la configuración d'as etiquetas
+        manage_user_access: Administrar Acceso d'Usuarios
+        manage_user_access_description: Permite a los usuarios desactivar l'autenticación de dos factors d'atros usuarios, cambiar la suya adreza de correu electronico y restablir la suya clau
+        manage_users: Administrar Usuarios
+        manage_users_description: Permite a los usuarios veyer los detalles d'atros usuarios y realizar accions de moderación contra ells
+        manage_webhooks: Administrar Webhooks
+        manage_webhooks_description: Permite a los usuarios configurar webhooks pa eventos administrativos
+        view_audit_log: Veyer Rechistro de Auditoría
+        view_audit_log_description: Permite a los usuarios veyer un historial d'accions administrativas en o servidor
+        view_dashboard: Veyer Panel de Control
+        view_dashboard_description: Permite a los usuarios acceder ta lo panel de control y quantas metricas
+        view_devops: DevOps
+        view_devops_description: Permite a los usuarios acceder ta los panels de control Sidekiq y pgHero
+      title: Rols
+    rules:
+      add_new: Anyadir norma
+      delete: Eliminar
+      description_html: Encara que la mayoría afirma haber leyiu y estar d'acuerdo con os termins de servicio, la chent normalment no los leye dica dimpués de que surta bell problema. <strong>Fe que sía mas facil veyer las normas d'o tuyo servidor d'un vistazo estipulándolas en una lista de puntos.</strong> Intenta que cada norma sía curta y sencilla, pero sin estar divididas en muitos puntos.
+      edit: Editar norma
+      empty: Encara no s'han definiu las normas d'o servidor.
+      title: Normas d'o servidor
+    settings:
+      about:
+        manage_rules: Administrar reglas d'o servidor
+        preamble: Proporciona información detallada sobre cómo lo servidor ye operau, moderau y financiau.
+        rules_hint: I hai una aria dedicada pa las reglas a las qualas s'aspera que los tuyos usuarios se adhieran.
+        title: Sobre
+      appearance:
+        preamble: Personalizar la interficie web de Mastodon.
+        title: Apariencia
+      branding:
+        preamble: La marca d'o tuyo servidor lo diferencia d'atros servidors d'o ret. Esta información puede amostrar-se a traviés d'una variedat d'entornos, como en a interficie web de Mastodon, en aplicacions nativas, en previsualizacions de vinclos en atros puestos web y en aplicacions de mensachería, etc. Per esta razón, ye millor mantener esta información clara, breu y concisa.
+        title: Marca
+      content_retention:
+        preamble: Controlar cómo lo conteniu chenerau per l'usuario s'almagazena en Mastodon.
+        title: Retención de conteniu
+      discovery:
+        follow_recommendations: Recomendacions de cuentas
+        preamble: Exposar conteniu interesant a la superficie ye fundamental pa incorporar nuevos usuarios que pueden no conoixer a dengún Mastodon. Controla cómo funcionan quantas opcions d'escubrimiento en o tuyo servidor.
+        profile_directory: Directorio de perfils
+        public_timelines: Linias de tiempo publicas
+        title: Escubrimiento
+        trends: Tendencias
+      domain_blocks:
+        all: A totz
+        disabled: A dengún
+        users: Pa los usuarios locals que han iniciau sesión
+      registrations:
+        preamble: Controla quí puede creyar una cuenta en o tuyo servidor.
+        title: Rechistros
+      registrations_mode:
+        modes:
+          approved: Se requiere aprebación pa rechistrar-se
+          none: Dengún puede rechistrar-se
+          open: Qualsequiera puede rechistrar-se
+      title: Achustes d'o Servidor
+    site_uploads:
+      delete: Eliminar fichero puyau
+      destroyed_msg: Carga d'o puesto eliminada con exito!
+    statuses:
+      account: Autor
+      application: Aplicación
+      back_to_account: Tornar ta la cuenta
+      back_to_report: Tornar ta la pachina d'o reporte
+      batch:
+        remove_from_report: Eliminar d'o reporte
+        report: Reporte
+      deleted: Eliminau
+      favourites: Favoritos
+      history: Historial de versions
+      in_reply_to: En respuesta a
+      language: Idioma
+      media:
+        title: Multimedia
+      metadata: Metadatos
+      no_status_selected: No se cambió garra estau a lo no triar garra
+      open: Ubrir publicación
+      original_status: Publicación orichinal
+      reblogs: Impulsos
+      status_changed: Publicación cambiada
+      title: Estau d'as cuentas
+      trending: En tendencia
+      visibility: Visibilidat
+      with_media: Con multimedia
+    strikes:
+      actions:
+        delete_statuses: "%{name} eliminó las publicacions de %{target}"
+        disable: "%{name} concheló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcau las publicacions de %{target} como sensibles"
+        none: "%{name} ninvió una alvertencia a %{target}"
+        sensitive: "%{name} marcó la cuenta de %{target} como sensible"
+        silence: "%{name} limitó la cuenta de %{target}"
+        suspend: "%{name} suspendió la cuenta de %{target}"
+      appeal_approved: Apelado
+      appeal_pending: Apelación pendient
+    system_checks:
+      database_schema_check:
+        message_html: I hai migracions pendients d'a base de datos. Per favor, executa-las pa asegurar-te que l'aplicación funciona como debería
+      elasticsearch_running_check:
+        message_html: No se podió connectar a Elasticsearch. Per favor, compreba que ye executando-se, u desactiva la busqueda de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versión incompatible de Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} se ye executando pero s'ameneste Elasticsearch %{required_version}
+      rules_check:
+        action: Administrar reglas d'o servidor
+        message_html: No ha definiu garra regla d'o servidor.
+      sidekiq_process_check:
+        message_html: No i hai garra proceso Sidekiq en execución pa la coda (u codas) de %{value}. Per favor, revise la suya configuración de Sidekiq
+    tags:
+      review: Estau de revisión
+      updated_msg: Hashtags actualizaus exitosament
+    title: Administración
+    trends:
+      allow: Permitir
+      approved: Aprebadas
+      disallow: No permitir
+      links:
+        allow: Permitir vinclo
+        allow_provider: Permitir meyo
+        description_html: Estes son vinclos que actualment son estando compartius muito per las cuentas dende las qualas lo tuyo servidor veye los mensaches. Pueden aduyar a los tuyos usuarios a averiguar qué ye pasando en o mundo. Garra vinclo s'amuestren publicament dica que autorice a lo dominio. Tamién puede permitir u refusar vinclos individuals.
+        disallow: Refusar vinclo
+        disallow_provider: Refusar meyo
+        no_link_selected: No se cambió garra vinclo ya que no se trió garra
+        publishers:
+          no_publisher_selected: No se cambió garra editor ya que no se trió garra
+        shared_by_over_week:
+          one: Compartiu per una persona entre la zaguera semana
+          other: Compartiu per %{count} personas entre la zaguera semana
+        title: Vinclos en tendencia
+        usage_comparison: Compartiu %{today} vegadas hue, comparau con %{yesterday} ahiere
+      only_allowed: Nomás las permitidas
+      pending_review: Revisión pendient
+      preview_card_providers:
+        allowed: Los vinclos d'este meyo pueden estar tendencia
+        description_html: Estes son dominios dende los quals los vinclos a ormino se comparten en o suyo servidor. Los vinclos no serán tendencia publicament de no estar que s'aprebe lo dominio d'o vinclo. La suya aprebación (u refuso) s'extiende a los subdominios.
+        rejected: Los vinclos d'este meyo no pueden estar tendencia
+        title: Medios
+      rejected: Refusadas
+      statuses:
+        allow: Permitir publicación
+        allow_account: Permitir autor
+        description_html: Estes son publicacions que lo suyo servidor conoixe que son estando compartidas y marcadas como favoritas muito en este momento. Pueden aduyar a los tuyos usuarios nuevos y retornantes a trobar mas chent a la quala seguir. No i hai mensaches que s'amuestren publicament dica que aprebes l'autor y l'autor permita que la suya cuenta sía sucherida a atros. Tamién puetz permitir u refusar mensaches individuals.
+        disallow: No permitir publicación
+        disallow_account: No permitir autor
+        no_status_selected: No se cambió garra publicación en tendencia ya que no se trió garra
+        not_discoverable: L'autor no ha optado per estar detectable
+        shared_by:
+          one: Compartiu u marcau como favorito una vegada
+          other: Compatido u marcau como favorito %{friendly_count} vegadas
+        title: Publicacions destacadas
+      tags:
+        current_score: Puntuación actual %{score}
+        dashboard:
+          tag_accounts_measure: usos solos
+          tag_languages_dimension: Idiomas prencipals
+          tag_servers_dimension: Servidors prencipals
+          tag_servers_measure: diferents servidors
+          tag_uses_measure: usos totals
+        description_html: Estes son etiquetas que son amaneixendo en muitos posts que lo tuyo servidor veye. Pueden aduyar a los tuyos usuarios a averiguar de qué fabla mas chent en estes momentos. No i hai hashtags que s'amuestren publicament dica que los aprebes.
+        listable: Pueden estar recomendadas
+        no_tag_selected: No se cambió garra etiqueta ya que no se trió garra
+        not_listable: No serán recomendadas
+        not_trendable: No amaneixerán en tendencias
+        not_usable: No pueden estar usadas
+        peaked_on_and_decaying: Aconsiguió lo pico en %{date}, agora decreixendo
+        title: Etiquetas en tendencia
+        trendable: Pueden amaneixer en tendencias
+        trending_rank: 'Tendencia #%{rank}'
+        usable: Pueden usar-se
+        usage_comparison: Usada %{today} vegadas hue, comparau con %{yesterday} ahiere
+        used_by_over_week:
+          one: Usada per una persona entre la zaguera semana
+          other: Usada per %{count} personas entre la zaguera semana
+      title: Tendencias
+      trending: En tendencia
+    warning_presets:
+      add_new: Anyadir nuevo
+      delete: Borrar
+      edit_preset: Editar aviso predeterminau
+      empty: Encara no has definiu garra preajuste d'alvertencia.
+      title: Editar configuración predeterminada d'avisos
+    webhooks:
+      add_new: Anyadir endpoint
+      delete: Eliminar
+      description_html: Un <strong>webhook</strong> permite a Mastodon ninviar <strong>notificacions en tiempo real</strong> sobre los eventos triaus a la tuya propia aplicación, pa que la tuya aplicación pueda <strong>lanzar reaccions automaticament</strong>.
+      disable: Deshabilitar
+      disabled: Deshabilitau
+      edit: Editar endpoint
+      empty: Encara no tiens garra endpoint de webhook configurau.
+      enable: Habilitar
+      enabled: Activo
+      enabled_events:
+        one: 1 evento habilitau
+        other: "%{count} eventos habilitaus"
+      events: Eventos
+      new: Nuevo webhook
+      rotate_secret: Rotar secreto
+      secret: Sinyando secreto
+      status: Estau
+      title: Webhooks
+      webhook: Webhook
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: pa eliminar los suyos mensaches
+        disable: pa conchelar la suya cuenta
+        mark_statuses_as_sensitive: pa marcar los suyos mensaches como sensibles
+        none: una alvertencia
+        sensitive: pa marcar la suya cuenta como sensible
+        silence: pa limitar la suya cuenta
+        suspend: suspender la suya cuenta
+      body: "%{target} ye apelando a una solicitut de moderación de %{action_taken_by} lo %{date}, d'o tipo %{type}. Ells escribioron:"
+      next_steps: Puetz aprebar l'apelación pa desfer la decisión de moderación, u ignorar-la.
+      subject: "%{username} ye apelando a una decisión de moderación en %{instance}"
+    new_pending_account:
+      body: Los detalles d'a nueva cuenta son abajos. Puetz aprebar u refusar esta aplicación.
+      subject: Nueva cuenta pa revisión en %{instance} (%{username})
+    new_report:
+      body: "%{reporter} ha denunciau a %{target}"
+      body_remote: Belún de %{domain} a denunciau a %{target}
+      subject: Nuevo reporte pa la %{instance} (#%{id})
+    new_trends:
+      body: 'Los siguients elementos amenesten una revisión antes que se puedan amostrar publicament:'
+      new_trending_links:
+        title: Vinclos en tendencia
+      new_trending_statuses:
+        title: Publicacions en tendencia
+      new_trending_tags:
+        no_approved_tags: Actualment no i hai garra etiqueta en tendencia aprebada.
+        requirements: 'Qualsequiera d''estes candidatos podría superar lo hashtag en tendencia aprebau per #%{rank}, que actualment ye #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
+        title: Etiquetas en tendencia
+      subject: Nuevas tendencias asperando estar revisadas en %{instance}
+  aliases:
+    add_new: Creyar alias
+    created_msg: Lo nuevo alias s'ha creyau correctament. Agora puetz empecipiar lo treslado dende la cuenta antiga.
+    deleted_msg: Elimina l'alias correctament. Lo treslado d'ixa cuenta a esta ya no será posible.
+    empty: No tiens garra alias.
+    hint_html: Si quiers migrar d'unatra cuenta a esta, aquí puetz creyar un alias, que ye necesario antes de que puedas empecipiar a mover seguidors d'a cuenta anterior ta esta. Esta acción per ella mesma ye <strong>inofensiva y reversible</strong>. <strong>La migración d'a cuenta s'inicia dende la cuenta antiga</strong>.
+    remove: Desvincular alias
+  appearance:
+    advanced_web_interface: Interficie web abanzada
+    advanced_web_interface_hint: 'Si deseya utilizar tot l''amplo de pantalla, la interficie web abanzada le permite configurar quantas columnas diferents pa veyer tanta información a lo mesmo tiempo como quiera: Inicio, notificacions, linia de tiempo federada, qualsequier numero de listas y etiquetas.'
+    animations_and_accessibility: Animacions y accesibilidat
+    confirmation_dialogs: Dialogos de confirmación
+    discovery: Descubrir
+    localization:
+      body: Mastodon ye traduciu con la aduya de voluntarios.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Totz pueden contribuyir.
+    sensitive_content: Conteniu sensible
+    toot_layout: Disenyo d'as publicacions
+  application_mailer:
+    notification_preferences: Cambiar preferencias de correu electronico
+    salutation: "%{name}:"
+    settings: 'Cambiar preferencias de correu: %{link}'
+    view: 'Vista:'
+    view_profile: Veyer perfil
+    view_status: Veyer estau
+  applications:
+    created: Aplicación creyada exitosament
+    destroyed: Apicación eliminada exitosament
+    regenerate_token: Regenerar token d'acceso
+    token_regenerated: Token d'acceso regenerado exitosament
+    warning: Tiene muito cudiau con estes datos. No los compartas con dengún!
+    your_token: Lo tuyo token d'acceso
+  auth:
+    apply_for_account: Solicitar una cuenta
+    change_password: Clau
+    delete_account: Borrar cuenta
+    delete_account_html: Si deseya eliminar la suya cuenta, puede <a href="%{path}">proceder aquí</a>. Será pediu d'una confirmación.
+    description:
+      prefix_invited_by_user: "@%{name} te convida a unir-te a este servidor de Mastodon!"
+      prefix_sign_up: Une-te a Mastodon hue!
+      suffix: Con una cuenta podrás seguir a chent, publicar novedatz y intercambiar mensaches con usuarios de qualsequier servidor de Mastodon y mas!
+    didnt_get_confirmation: No recibió lo correu de confirmación?
+    dont_have_your_security_key: No tiens la tuya clau de seguranza?
+    forgot_password: Ixuplidés la tuya clau?
+    invalid_reset_password_token: Lo token de reinicio de clau ye invalido u expiró. Per favor pide un nuevo.
+    link_to_otp: Escribe un codigo de dos factors dende lo tuyo telefono u un codigo de recuperación
+    link_to_webauth: Utilice lo suyo dispositivo de clau de seguranza
+    log_in_with: Iniciar sesión con
+    login: Iniciar sesión
+    logout: Zarrar sesión
+    migrate_account: Mudar-se a unatra cuenta
+    migrate_account_html: Si deseyas reendrezar esta cuenta a unatra distinta, puetz <a href="%{path}">configurar-lo aquí</a>.
+    or_log_in_with: U inicia sesión con
+    privacy_policy_agreement_html: He leyiu y accepto la <a href="%{privacy_policy_path}" target="_blank">politica de privacidat</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Rechistrar-se
+    registration_closed: "%{instance} no ye acceptando nuevos miembros"
+    resend_confirmation: Tornar a ninviar lo correu de confirmación
+    reset_password: Restablir clau
+    rules:
+      preamble: Estas son establidas y aplicadas per los moderadors de %{domain}.
+      title: Qualques reglas basicas.
+    security: Cambiar clau
+    set_new_password: Establir nueva clau
+    setup:
+      email_below_hint_html: Si l'adreza de correu electronico que amaneixe contino ye incorrecta, se puede cambiar-la aquí y recibir un nuevo correu electronico de confirmación.
+      email_settings_hint_html: Lo correu electronico de confirmación estió ninviau a %{email}. Si ixa adreza de correu electronico no sía correcta, se puede cambiar-la en a configuración d'a cuenta.
+      title: Configuración
+    sign_up:
+      preamble: Con una cuenta en este servidor de Mastodon, podrás seguir a qualsequier atra persona en o ret, independientment d'o servidor en o qual se trobe.
+      title: Creyar cuenta de Mastodon en %{domain}.
+    status:
+      account_status: Estau d'a cuenta
+      confirming: Asperando confirmación de correu electronico.
+      functional: La tuya cuenta ye completament operativa.
+      pending: La suya solicitut ye pendient de revisión per los nuestros administradors. Ixo puede tardar bell tiempo. Vusté recibirá un correu electronico si lo solicitut sía aprebada.
+      redirecting_to: La tuya cuenta se troba inactiva perque ye estando reendrezada a %{acct}.
+      view_strikes: Veyer amonestacions pasadas contra la tuya cuenta
+    too_fast: Formulario ninviau masiau rapido, lo intente de nuevo.
+    use_security_key: Usar la clau de seguranza
+  authorize_follow:
+    already_following: Ya yes seguindo a esta cuenta
+    already_requested: Ya has ninviau una solicitut de seguimiento a ixa cuenta
+    error: Desafortunadament, ha ocurriu una error buscando la cuenta remota
+    follow: Seguir
+    follow_request: 'Tiens una solicitut de seguimiento de:'
+    following: 'Exito! Agora yes seguindo a:'
+    post_follow:
+      close: U, puetz simplament zarrar esta finestra.
+      return: Tornar ta lo perfil de l'usuario
+      web: Ir ta lo puesto web
+    title: Seguir a %{acct}
+  challenge:
+    confirm: Continar
+    hint_html: "<strong>Tip:</strong> No tornaremos a preguntar-te per la clau entre la siguient hora."
+    invalid_password: Clau incorrecta
+    prompt: Confirmar clau pa seguir
+  crypto:
+    errors:
+      invalid_key: no ye una clau Ed25519 u Curve25519 valida
+      invalid_signature: no ye una sinyatura Ed25519 valida
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} h"
+      about_x_months: "%{count}m"
+      about_x_years: "%{count}a"
+      almost_x_years: "%{count}a"
+      half_a_minute: Chusto agora
+      less_than_x_minutes: "%{count} m"
+      less_than_x_seconds: Chusto agora
+      over_x_years: "%{count}a"
+      x_days: "%{count} d"
+      x_minutes: "%{count} m"
+      x_months: "%{count}m"
+      x_seconds: "%{count} s"
+  deletes:
+    challenge_not_passed: Los datos escritos son incorrectos
+    confirm_password: Ingresa la tuya clau actual pa contrimostrar la tuya identidat
+    confirm_username: Escribe lo tuyo nombre d'usuario pa confirmar
+    proceed: Eliminar cuenta
+    success_msg: La tuya cuenta s'eliminó con exito
+    warning:
+      before: 'Antes de continar, per favor leye con atención las siguients notas:'
+      caches: Lo conteniu que ha estau almagazenau en caché per atros servidors puede persistir
+      data_removal: Las tuyas publicacions y la resta de datos s'eliminarán definitivament
+      email_change_html: Puetz <a href="%{path}"> cambiar la tuya adreza de correu electronico</a> sin eliminar la tuya cuenta
+      email_contact_html: Si encara no t'ha plegau, puetz escribir a <a href="mailto:%{email}">%{email}</a> pa pedir aduya
+      email_reconfirmation_html: Si no t'ha plegau lo correu de confirmación, puetz <a href="%{path}"> tornar a demandar-lo</a>
+      irreversible: No podrás restaurar ni reactivar la tuya cuenta
+      more_details_html: Pa mas detalles, veyer <a href="%{terms_path}"> la politica de privacidat</a>.
+      username_available: Lo tuyo nombre d'usuario tornará a estar disponible
+      username_unavailable: Lo tuyo nombre d'usuario no será disponible
+  disputes:
+    strikes:
+      action_taken: Acción realizada
+      appeal: Apelar
+      appeal_approved: Esta amonestación estió apelada exitosament y ya no ye valida
+      appeal_rejected: Se refusó l'apelación
+      appeal_submitted_at: Apelación ninviada
+      appealed_msg: La tuya apelación estió ninviada. Si s'apreba, se te notificará.
+      appeals:
+        submit: Ninviar apelación
+      approve_appeal: Aprebar apelación
+      associated_report: Informe asociau
+      created_at: Con calendata
+      description_html: Estas son las accions emprendidas contra la tuya cuenta y las alvertencias que t'han estau ninviadas per lo personal de %{instance}.
+      recipient: Endrezada a
+      reject_appeal: Refusar apelación
+      status: 'Publicación #%{id}'
+      status_removed: Publicación ya eliminada d'o sistema
+      title: "%{action} d'o %{date}"
+      title_actions:
+        delete_statuses: Eliminación de publicación
+        disable: Conchelación d'a cuenta
+        mark_statuses_as_sensitive: Marcando los mensaches como sensibles
+        none: Alvertencia
+        sensitive: Marcando la cuenta como sensible
+        silence: Limitación de cuenta
+        suspend: Suspensión de cuenta
+      your_appeal_approved: S'aprebó la tuya apelación
+      your_appeal_pending: Has ninviau una apelación
+      your_appeal_rejected: La tuya apelación ha estau refusada
+  domain_validator:
+    invalid_domain: no ye un nombre de dominio valido
+  errors:
+    '400': La solicitut que has ninviau no ye valida u yera malformada.
+    '403': No tiens permiso pa acceder ta esta pachina.
+    '404': La pachina que yeras buscando no existe.
+    '406': Esta pachina no ye disponible en o formato solicitau.
+    '410': La pachina que yeras buscando no existe mas.
+    '422':
+      content: Verificación de seguranza fallida. Yes blocando qualques cookies?
+      title: Verificación de seguranza fallida
+    '429': Asfixiado
+    '500':
+      content: Lo sentimos, bella cosa ha funcionau malament per la nuestra parte.
+      title: Esta pachina no ye correcta
+    '503': La pachina no s'ha puesto cargar a causa d'un fallo temporal d'o servidor.
+    noscript_html: Pa usar l'aplicación web de Mastodon, per favor activa Javascript. Alternativament, preba bella d'as <a href="%{apps_path}">aplicacions nativas</a> pa Mastodon pa la tuya plataforma.
+  existing_username_validator:
+    not_found: no podió trobar un usuario local con ixe nombre d'usuario
+    not_found_multiple: no podió trobar %{usernames}
+  exports:
+    archive_takeout:
+      date: Calendata
+      download: Descargar lo tuyo fichero
+      hint_html: Puetz solicitar un fichero d'os tuyos <strong>publicacions y fichers multimedia puyaus</strong>. Los datos exportaus serán en formato ActivityPub, leyibles per qualsequier software compatible. Puetz demandar un archivo cada 7 días.
+      in_progress: Recopilando lo tuyo fichero...
+      request: Solicitar lo tuyo fichero
+      size: Grandaria
+    blocks: Personas que has blocau
+    bookmarks: Marcadors
+    csv: CSV
+    domain_blocks: Bloqueyos de dominios
+    lists: Listas
+    mutes: Tiens en silencio
+    storage: Almagazenamiento
+  featured_tags:
+    add_new: Anyadir nuevo
+    errors:
+      limit: Ya has aconseguiu la cantidat maxima de hashtags
+    hint_html: "<strong>Qué son las etiquetas destacadas?</strong> S'amuestran de forma prominent en o tuyo perfil publico y permiten a los usuarios navegar per las tuyas publicacions publicas especificament baixo ixas etiquetas. Son una gran ferramienta pa fer un seguimiento de treballos creativos u prochectos a largo plazo."
+  filters:
+    contexts:
+      account: Perfils
+      home: Inicio y listas
+      notifications: Notificacions
+      public: Linias de tiempo publicas
+      thread: Conversacions
+    edit:
+      add_keyword: Anyadir parola clau
+      keywords: Parolas clau
+      statuses: Publicacions individuals
+      statuses_hint_html: Este filtro s'aplica a la selección de publicacions individuals independientment de si coinciden con as parolas clau contino. <a href="%{path}">Revise u elimine publicacions d'o filtro</a>.
+      title: Editar filtro
+    errors:
+      deprecated_api_multiple_keywords: Estes parametros no se pueden cambiar dende esta aplicación perque s'aplican a mas d'una parola clau de filtro. Utilice una aplicación mas recient u la interficie web.
+      invalid_context: Se suminstró un contexto invalido u vuedo
+    index:
+      contexts: Filtros en %{contexts}
+      delete: Borrar
+      empty: No tiens filtros.
+      expires_in: Caduca en %{distance}
+      expires_on: Expira lo %{date}
+      keywords:
+        one: "%{count} parola clau"
+        other: "%{count} parolas clau"
+      statuses:
+        one: "%{count} publicación"
+        other: "%{count} publicacions"
+      statuses_long:
+        one: "%{count} publicación individual amagada"
+        other: "%{count} publicacions individuals amagadas"
+      title: Filtros
+    new:
+      save: Alzar nuevo filtro
+      title: Anyadir nuevo filtro
+    statuses:
+      back_to_filter: Tornar a filtrar
+      batch:
+        remove: Eliminar d'o filtro
+      index:
+        hint: Este filtro s'aplica a la selección de publicacions individuals independientment d'atros criterios. Puede anyadir mas publicacions a este filtro dende la interficie web.
+        title: Publicacions filtradas
+  footer:
+    trending_now: Tendencia agora
+  generic:
+    all: Totz
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta pachina ye triau."
+      other: Totz los <strong>%{count}</strong> elementos en esta pachina son triaus.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento que coincide con a suya busqueda ye triau."
+      other: Totz los <strong>%{count}</strong> elementos que coinciden con a suya busqueda son triaus.
+    changes_saved_msg: Cambios alzaus con exito!
+    copy: Copiar
+    delete: Eliminar
+    deselect: Deseleccionar tot
+    none: Cosa
+    order_by: Ordenar per
+    save_changes: Alzar cambios
+    select_all_matching_items:
+      one: Triar %{count} elemento que coincide con a tuya busqueda.
+      other: Triar totz los %{count} elementos que coinciden con a tuya busqueda.
+    today: hue
+    validation_errors:
+      one: Bella cosa no ye bien! Per favor, revisa la error
+      other: Bella cosa no ye bien! Per favor, revise %{count} errors mas abaixo
+  html_validator:
+    invalid_markup: 'contiene codigo HTML no valido: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Fichero CSV no valido. Error: %{error}'
+      over_rows_processing_limit: contiene mas de %{count} ringleras
+    modes:
+      merge: Unir
+      merge_long: Mantener rechistros existents y anyadir nuevos
+      overwrite: Sobrescribir
+      overwrite_long: Reemplazar rechistros actuals con os nuevos
+    preface: Puetz importar bells datos, como totas las personas que yes seguindo u blocando en a tuya cuenta en esta instancia, dende fichers exportaus d'unatra instancia.
+    success: Los suyos datos s'han cargau correctament y serán procesaus en brevedad
+    types:
+      blocking: Lista de blocaus
+      bookmarks: Marcadors
+      domain_blocking: Lista de dominios blocaus
+      following: Lista de seguius
+      muting: Lista de silenciaus
+    upload: Cargar
+  invites:
+    delete: Desactivar
+    expired: Expiradas
+    expires_in:
+      '1800': 30 menutos
+      '21600': 6 horas
+      '3600': 1 hora
+      '43200': 12 horas
+      '604800': 1 semana
+      '86400': 1 día
+    expires_in_prompt: Nunca
+    generate: Chenerar
+    invited_by: 'Estiés convidau per:'
+    max_uses:
+      one: 1 uso
+      other: "%{count} usos"
+    max_uses_prompt: Sin limite
+    prompt: Chenerar y compartir vinclos con atros pa conceder acceso a este nodo
+    table:
+      expires_at: Expira
+      uses: Usos
+    title: Convidar a chent
+  lists:
+    errors:
+      limit: Has aconseguiu la cantidat maxima de listas
+  login_activities:
+    authentication_methods:
+      otp: aplicación d'autenticación en dos pasos
+      password: clau
+      sign_in_token: codigo de seguranza per correu electronico
+      webauthn: claus de seguranza
+    description_html: Si veye una actividat que no reconoixe, considere cambiar la suya clau y habilitar l'autenticación de dos factors.
+    empty: No i hai historial d'autenticación disponible
+    failed_sign_in_html: Intento d'inicio de sesión fallido con %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Inicio de sesión exitoso con %{method} dende %{ip} (%{browser})
+    title: Historial d'autenticación
+  media_attachments:
+    validations:
+      images_and_video: No se puede adchuntar un video a un estau que ya contienga imachens
+      not_ready: No se pueden adchuntar fichers que no s'han rematau de procesar. Intenta-lo de nuevo en un momento!
+      too_many: No se pueden adchuntar mas de 4 fichers
+  migrations:
+    acct: Moviu ta
+    cancel: Cancelar redireccionamiento
+    cancel_explanation: En cancelar lo redireccionamiento se reactivará la tuya cuenta actual, pero no recuperarás los seguidores que haigan estau tresladaus a l'atra cuenta.
+    cancelled_msg: Lo redireccionamiento s'ha cancelau correctament.
+    errors:
+      already_moved: ye la mesma cuenta a la quala ya has migrado
+      missing_also_known_as: no ye fendo referencia a esta cuenta
+      move_to_self: no puede estar la cuenta actual
+      not_found: no se podió trobar
+      on_cooldown: Yes en tiempo de reutilización
+    followers_count: Seguidores a lo momento de migrar
+    incoming_migrations: Migrar d'una cuenta diferent
+    incoming_migrations_html: Pa migrar d'unatra cuenta a esta, primero amenestes <a href="%{path}">creyar un alias d'a cuenta</a>.
+    moved_msg: La tuya cuenta agora se ye reendrezando a %{acct} y las tuyas seguidores se son migrando.
+    not_redirecting: La tuya cuenta no se ye reendrezando a garra atra cuenta actualment.
+    on_cooldown: Has migrado la tuya cuenta recientment. Esta función será disponible de nuevo en %{count} días.
+    past_migrations: Migracions pasadas
+    proceed_with_move: Migrar seguidores
+    redirected_msg: La tuya cuenta agora reendreza a %{acct}.
+    redirecting_to: La tuya cuenta se ye reendrezando a %{acct}.
+    set_redirect: Establir redirección
+    warning:
+      backreference_required: La nueva cuenta ha d'estar configurada primero pa fer referencia a esta
+      before: 'Antes de continar, per favor leye con atención las siguients notas:'
+      cooldown: Dimpués de migrar i hai un periodo d'aspera entre lo qual no podrás tornar a migrar
+      disabled_account: La tuya cuenta actual no será completament utilizable dimpués. Manimenos, tendrás acceso a la exportación de datos asinas como a la reactivación.
+      followers: Esta acción migrará a totz los seguidores d'a cuenta actual a la nueva cuenta
+      only_redirect_html: Alternativament, nomás puetz <a href="%{path}">meter una redirección en o tuyo perfil</a>.
+      other_data: No se moverán atros datos automaticament
+      redirect: Lo perfil d'a tuya cuenta actual s'actualizará con un aviso de redirección y será excluyiu d'as busquedas
+  moderation:
+    title: Moderación
+  move_handler:
+    carry_blocks_over_text: Este usuario se mudó dende %{acct}, que hebas blocau.
+    carry_mutes_over_text: Este usuario se mudó dende %{acct}, que hebas silenciau.
+    copy_account_note_text: 'Este usuario se mudó dende %{acct}, aquí yeran los tuyos notas anteriors sobre ell:'
+  navigation:
+    toggle_menu: Alternar menú
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} ninvió un informe"
+      sign_up:
+        subject: "%{name} se rechistró"
+    favourite:
+      body: 'Lo tuyo estau estió marcau como favorito per %{name}:'
+      subject: "%{name} marcó como favorito lo tuyo estau"
+      title: Nuevo favorito
+    follow:
+      body: "%{name} te ye seguindo!"
+      subject: "%{name} te ye seguindo"
+      title: Nuevo seguidor
+    follow_request:
+      action: Administrar solicitutz pa seguir
+      body: "%{name} ha solicitau seguir-te"
+      subject: 'Seguidor pendient: %{name}'
+      title: Nueva solicitut pa seguir
+    mention:
+      action: Responder
+      body: 'Estiés mencionau per %{name} en:'
+      subject: Estiés mencionau per %{name}
+      title: Nueva mención
+    poll:
+      subject: Una enqüesta de %{name} ha rematau
+    reblog:
+      body: "%{name} ha retutau la tuya publicación:"
+      subject: "%{name} ha retutau la tuya publicación"
+      title: Nueva difusión
+    status:
+      subject: "%{name} acaba de publicar"
+    update:
+      subject: "%{name} editó una publicación"
+  notifications:
+    email_events: Eventos pa notificacions per correu electronico
+    email_events_hint: 'Tría los eventos pa los quals deseyas recibir notificacions:'
+    other_settings: Atros achustes de notificacions
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: MM
+          million: M
+          quadrillion: MB
+          thousand: m
+          trillion: B
+  otp_authentication:
+    code_hint: Escribe lo codigo chenerau per la tuya aplicación d'autentificación pa confirmar
+    description_html: Si habilitas <strong>autenticación de dos factors</strong> a traviés d'una aplicación d'autenticación, l'ingreso requerirá que sías en posesión d'o tuyo telefono, que chenerará codigos pa que ingreses.
+    enable: Activar
+    instructions_html: "<strong>Escaneya este codigo QR dende Google Authenticator u una aplicación TOPT semellant en o tuyo telefono</strong>. A partir d'agora, esta aplicación chenerará codigos que habrás d'ingresar quan quieras iniciar sesión."
+    manual_instructions: 'Si no puetz escaniar lo codigo QR y amenestes escrebir-lo manualment, este ye lo secreto en texto plano:'
+    setup: Configurar
+    wrong_code: Lo codigo ingresau ye invalido! Ye correcta la hora d'o dispositivo y lo servidor?
+  pagination:
+    newer: Mas nuevo
+    next: Proximo
+    older: Mas antigo
+    prev: Anterior
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Ya has votau en esta enqüesta
+      duplicate_options: contiene elementos duplicaus
+      duration_too_long: ye masiau luen en o futuro
+      duration_too_short: ye masiau luego
+      expired: La enqüesta ya ha rematau
+      invalid_choice: La opción de voto triada no existe
+      over_character_limit: no puede exceder %{max} caracters cadagún
+      too_few_options: ha de tener mas d'un elemento
+      too_many_options: no puede contener mas de %{max} elementos
+  preferences:
+    other: Atros
+    posting_defaults: Configuración per defecto de publicacions
+    public_timelines: Linias de tiempo publicas
+  privacy_policy:
+    title: Politica de Privacidat
+  reactions:
+    errors:
+      limit_reached: Limite de reaccions diferents aconseguiu
+      unrecognized_emoji: no ye un emoji conoixiu
+  relationships:
+    activity: Actividat d'a cuenta
+    dormant: Inactivo
+    follow_selected_followers: Seguir a los seguidores triaus
+    followers: Seguidores
+    following: Seguindo
+    invited: Convidau
+    last_active: Zaguera actividat
+    most_recent: Mas recient
+    moved: Moviu
+    mutual: Mutuo
+    primary: Prencipal
+    relationship: Relación
+    remove_selected_domains: Eliminar totz los seguidores d'os dominios triaus
+    remove_selected_followers: Eliminar los seguidores triaus
+    remove_selected_follows: Deixar de seguir a los usuarios triaus
+    status: Estau d'a cuenta
+  remote_follow:
+    missing_resource: No se podió trobar la URL de redirección requerida pa la tuya cuenta
+  reports:
+    errors:
+      invalid_rules: no fa referencia a reglas validas
+  rss:
+    content_warning: 'Alvertencia de conteniu:'
+    descriptions:
+      account: Publicacions publicas de @%{acct}
+      tag: 'Publicacions publicas etiquetadas con #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Ha superau lo limite de %{limit} publicacions programadas pa ixe día
+    over_total_limit: Ha superau lo limite de %{limit} publicacions programadas
+    too_soon: La calendata programada ha d'estar en o futuro
+  sessions:
+    activity: Zaguera actividat
+    browser: Navegador
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Desconoixiu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Navegador de Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: Navegador QQ
+      safari: Safari
+      uc_browser: Navegador UC
+      weibo: Weibo
+    current_session: Sesión actual
+    description: "%{browser} en %{platform}"
+    explanation: Estes son los navegadors web connectaus actualment en a tuya cuenta de Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: plataforma desconoixida
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Revocar
+    revoke_success: Sesión revocada exitosament
+    title: Sesions
+    view_authentication_history: Veyer historial d'autenticación d'a tuya cuenta
+  settings:
+    account: Cuenta
+    account_settings: Achustes d'a cuenta
+    aliases: Alias d'a cuenta
+    appearance: Apariencia
+    authorized_apps: Aplicacions autorizadas
+    back: Tornar ta l'inicio
+    delete: Borrar cuenta
+    development: Desembolique
+    edit_profile: Editar perfil
+    export: Exportar información
+    featured_tags: Hashtags destacaus
+    import: Importar
+    import_and_export: Importar y exportar
+    migrate: Migración de cuenta
+    notifications: Notificacions
+    preferences: Preferencias
+    profile: Perfil
+    relationships: Seguindo y seguidores
+    statuses_cleanup: Eliminación automatica de publicacions
+    strikes: Amonestacions de moderación
+    two_factor_authentication: Autenticación de dos factors
+    webauthn_authentication: Claus de seguranza
+  statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audios"
+      description: 'Adchunto: %{attached}'
+      image:
+        one: "%{count} imachen"
+        other: "%{count} imachens"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    boosted_from_html: Empentau dende %{acct_link}
+    content_warning: 'Alerta de conteniu: %{warning}'
+    default_language: Igual que l'idioma d'a interficie
+    disallowed_hashtags:
+      one: 'conteneba un hashtag no permitiu: %{tags}'
+      other: 'conteneba los hashtags no permitius: %{tags}'
+    edited_at_html: Editau %{date}
+    errors:
+      in_reply_not_found: Lo estau a lo qual intentas responder no existe.
+    open_in_web: Ubrir en web
+    over_character_limit: Limite de caracters de %{max} superau
+    pin_errors:
+      direct: Las publicacions que son visibles solo pa los usuarios mencionaus no pueden fixar-se
+      limit: Ya has fixau lo numero maximo de publicacions
+      ownership: La publicación d'unatra persona no puede fixar-se
+      reblog: Un boost no puede fixar-se
+    poll:
+      total_people:
+        one: "%{count} persona"
+        other: "%{count} chent"
+      total_votes:
+        one: "%{count} voto"
+        other: "%{count} votos"
+      vote: Vota
+    show_more: Amostrar mas
+    show_newer: Amostrar mas recients
+    show_older: Amostrar mas antigos
+    show_thread: Amostrar discusión
+    sign_in_to_participate: Rechistra-te pa participar en a conversación
+    title: "%{name}: «%{quote}»"
+    visibilities:
+      direct: Directa
+      private: Nomás amostrar a seguidores
+      private_long: Nomás amostrar a las tuyas seguidores
+      public: Publico
+      public_long: Totz pueden veyer
+      unlisted: Publico, pero no amostrar en a historia federada
+      unlisted_long: Totz pueden veyer, pero no ye listau en as linias de tiempo publicas
+  statuses_cleanup:
+    enabled: Borrar automaticament publicacions antigas
+    enabled_hint: Elimina automaticament las tuyas publicacions una vegada que aconsigan un branquil de tiempo especificau, de no estar que coincidan con bella d'as excepcions detalladas debaixo
+    exceptions: Excepcions
+    explanation: A causa que la eliminación de mensaches ye una operación costosa, esto se fa lentament, a lo largo d'un tiempo, quan lo servidor no ye ocupau. Per este motivo, puede que las tuyas publicacions sían borradas bella cosa dimpués que aconsigan lo branquil de tiempo especificau.
+    ignore_favs: Ignorar favoritos
+    ignore_reblogs: Ignorar reblogueos
+    interaction_exceptions: Excepcions basadas en interaccions
+    interaction_exceptions_explanation: Tiene en cuenta que no i hai guarencia que s'eliminen las publicacions que son per debaixo d'os branquils de favoritos u de reblogueos si los han superau en bell momento.
+    keep_direct: Mantener mensaches directos
+    keep_direct_hint: No elimina garra d'os tuyos mensaches directos
+    keep_media: Mantener publicacions con multimedia adchunto
+    keep_media_hint: No borra garra d'as tuyas publicacions con multimedia adchunto
+    keep_pinned: Mantener publicacions fixadas
+    keep_pinned_hint: No borra garra d'as tuyas publicacions fixadas
+    keep_polls: Mantener enqüestas
+    keep_polls_hint: No borra garra d'as tuyas enqüestas
+    keep_self_bookmark: Mantener publicacions a las qualas has anyadiu un marcador
+    keep_self_bookmark_hint: No borra las tuyas propias publicacions si les has anyadiu un marcador
+    keep_self_fav: Mantener publicacions que marqués como favoritas
+    keep_self_fav_hint: No borra publicacions tuyas que haigas marcau como favoritas
+    min_age:
+      '1209600': 2 semanas
+      '15778476': 6 meses
+      '2629746': 1 mes
+      '31556952': 1 anyo
+      '5259492': 2 meses
+      '604800': 1 semana
+      '63113904': 2 anyos
+      '7889238': 3 meses
+    min_age_label: Branquil de tiempo
+    min_favs: Mantener mensaches con un numero de favoritos mayor que
+    min_favs_hint: No borra garra d'as publicacions que haigan recibiu mas d'esta cantidat de favoritos. Deixa en blanco pa eliminar publicacions sin importar lo numero de favoritos
+    min_reblogs: Mantener publicacions reblogueadas mas de
+    min_reblogs_hint: No borra garra d'as publicacions que haigan estau reblogueadas mas d'este numero de vegadas. Deixa en blanco pa eliminar publicacions sin importar lo numero de reblogueos
+  stream_entries:
+    pinned: Publicación fixada
+    reblogged: retutau
+    sensitive_content: Conteniu sensible
+  strikes:
+    errors:
+      too_late: Ye masiau tarde pa apelar esta amonestación
+  tags:
+    does_not_match_previous_name: no coincide con o nombre anterior
+  themes:
+    contrast: Mastodon (Alto contraste)
+    default: Mastodon (Fosco)
+    mastodon-light: Mastodon (claro)
+  time:
+    formats:
+      default: "%d de %b de %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Anyadir
+    disable: Deshabilitar
+    disabled_success: Autenticación de dople factor desactivada correctament
+    edit: Editar
+    enabled: L'autenticación de dos factors ye activada
+    enabled_success: Verificación de dos factors activada exitosament
+    generate_recovery_codes: Chenerar codigos de recuperación
+    lost_recovery_codes: Los codigos de recuperación te permiten obtener acceso a la tuya cuenta si pierdes lo tuyo telefono. Si has perdiu los tuyos codigos de recuperación, puetz regenerarlos aquí. Los tuyos viellos codigos de recuperación se ferán invalidos.
+    methods: Metodos d'autenticación de dople factor
+    otp: Aplicación d'autenticación
+    recovery_codes: Fer copias de seguranza d'os tuyos codigos de recuperación
+    recovery_codes_regenerated: Codigos de recuperación regenerados con exito
+    recovery_instructions_html: Si pierdes acceso a lo tuyo telefono, puetz usar un d'os siguients codigos de recuperación pa obtener acceso a la tuya cuenta. <strong>Mantenlos a fueras de</strong>. Per eixemplo, puetz imprentar-los y alzar-los con atros documentos importants.
+    webauthn: Claus de seguranza
+  user_mailer:
+    appeal_approved:
+      action: Ir ta la tuya cuenta
+      explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió aprebada. La tuya cuenta se troba de nuevo en buen estau.
+      subject: La tuya apelación d'o %{date} ha estau aprebada
+      title: Apelación aprebada
+    appeal_rejected:
+      explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió refusada.
+      subject: La tuya apelación d'o %{date} ha estau refusada
+      title: Apelación refusada
+    backup_ready:
+      explanation: Has solicitau una copia completa d'a tuya cuenta de Mastodon. Ya ye preparada pa descargar!
+      subject: Lo tuyo fichero ye preparau pa descargar
+      title: Descargar fichero
+    suspicious_sign_in:
+      change_password: cambies la tuya clau
+      details: 'Aquí son los detalles de l''inicio de sesión:'
+      explanation: Hemos detectau un inicio de sesión en a tuya cuenta dende una nueva adreza IP.
+      further_actions_html: Si no estiés tu, te recomendamos que %{action} immediatament y habilites l'autenticación de dos factors pa mantener la tuya cuenta segura.
+      subject: La tuya cuenta ha estau accedida dende una nueva adreza IP
+      title: Un nuevo inicio de sesión
+    warning:
+      appeal: Ninviar una apelación
+      appeal_description: Si creyes que esto ye una error, puetz ninviar una apelación a l'equipo de %{instance}.
+      categories:
+        spam: Spam
+        violation: Lo conteniu viola las siguients directrices d'a comunidat
+      explanation:
+        delete_statuses: S'ha determinau que beluns d'os tuyos mensaches violan una u mas directrices d'a comunidat y han estau per tanto eliminaus per los moderadors de %{instance}.
+        disable: Ya no puetz usar la tuya cuenta, pero lo tuyo perfil y la resta de datos remaneixen intactos. Puetz solicitar una copia de seguranza d'os tuyos datos, cambiar la configuración d'a tuya cuenta u eliminar-la.
+        mark_statuses_as_sensitive: Beluns d'os tuyos mensaches han estau marcaus como sensibles per los moderadors de %{instance}. Esto significa que la chent habrá de pretar los fichers multimedia en as publicacions antes que s'amuestre una vista previa. Puetz marcar los fichers multimedia como sensibles tu mesmo quan publiques en o futuro.
+        sensitive: A partir d'agora totz los fichers multimedia que puyes serán marcaus como sensibles y amagaus dimpués d'una alvertencia que caldrá clicar.
+        silence: Encara puetz usar la tuya cuenta, pero nomás las personas que te son seguindo veyerán las tuyas publicacions en este servidor, y puetz estar excluyiu de quantas funcionalidatz d'escubrimiento. Manimenos, atras cuentas podrán empecipiar a seguir-te manualment.
+        suspend: Ya no puetz utilizar la tuya cuenta, y lo tuyo perfil y la resta de datos ya no son accesibles. Encara puetz iniciar sesión pa solicitar una copia de seguranza d'os tuyos datos, dica que estes sían eliminaus per completo en uns 30 días, encara que conservaremos qualques datos basicos pa impedir que enguileyes la suspensión.
+      reason: 'Razón:'
+      statuses: 'Publicacions citadas:'
+      subject:
+        delete_statuses: Las tuyas publicacions en %{acct} han estau eliminadas
+        disable: La suya cuenta %{acct} ha estau conchelada
+        mark_statuses_as_sensitive: Las tuyas publicacions en %{acct} han estau marcadas como sensibles
+        none: Alvertencia pa %{acct}
+        sensitive: Las tuyas publicacions en %{acct} se marcarán como sensibles a partir d'agora
+        silence: La suya cuenta %{acct} ha estau limitada
+        suspend: La suya cuenta %{acct} ha estau suspendida
+      title:
+        delete_statuses: Publicacions eliminadas
+        disable: Cuenta conchelada
+        mark_statuses_as_sensitive: Publicacions marcadas como sensibles
+        none: Alvertencia
+        sensitive: Cuenta marcada como sensible
+        silence: Cuenta limitada
+        suspend: Cuenta suspendida
+    welcome:
+      edit_profile_action: Configurar lo perfil
+      edit_profile_step: Puetz personalizar lo tuyo perfil puyando una foto de perfil, cambiando lo tuyo nombre d'usuario y muito mas. Puetz optar per revisar a los nuevos seguidores antes que puedan seguir-te.
+      explanation: Aquí i hai qualques consellos pa empecipiar
+      final_action: Empecipiar a publicar
+      final_step: 'Empecipia a publicar! Mesmo sin seguidores, las tuyas publicacions publicas pueden estar vistas per atros, per eixemplo en a linia de tiempo local u en etiquetas. Tal vegada quieras presentar-te con a etiqueta de #presentacions.'
+      full_handle: Lo suyo sobrenombre completo
+      full_handle_hint: Esto ye lo que le dirías a los tuyos amigos pa que ells puedan ninviar-te mensaches u seguir-te dende unatra instancia.
+      subject: Bienveniu a Mastodon
+      title: Te damos la bienvenida a bordo, %{name}!
+  users:
+    follow_limit_reached: No puetz seguir a mas de %{limit} personas
+    invalid_otp_token: Codigo de dos factors incorrecto
+    otp_lost_help_html: Si perdiés a l'acceso a totz dos, puetz meter-te en contancto con %{email}
+    seamless_external_login: Has iniciau sesión dende un servicio externo, asinas que los achustes de clau y correu no son disponibles.
+    signed_in_as: 'Sesión iniciada como:'
+  verification:
+    explanation_html: 'Puetz <strong> verificar-te a tu mesmo como lo duenyo d''os links en os metadatos d''o tuyo perfil </strong>. Pa ixo, lo puesto vinculau ha de contener un vinclo a lo tuyo perfil de Mastodon. Lo vinclo en o tuyo puesto <strong> debe </strong> tener un atributo <code> rel="me"</code>. Lo texto d''o vinclo no importa. Aquí un eixemplo:'
+    verification: Verificación
+  webauthn_credentials:
+    add: Adhibir nueva clau de seguranza
+    create:
+      error: I habió un problema en anyadir la suya clau de seguranza. Per favor, intenta-lo de nuevo.
+      success: La suya clau de seguranza s'ha anyadiu correctament.
+    delete: Eliminar
+    delete_confirmation: Yes seguro que quiers eliminar esta clau de seguranza?
+    description_html: Si habilita la <strong>autenticación de clau de seguranza</strong>, iniciar sesión requerirá que utilice una d'as suyas claus de seguranza.
+    destroy:
+      error: I habió un problema en anyadir la suya clau de seguranza. Per favor, intenta-lo de nuevo.
+      success: La suya clau de seguranza s'ha eliminau correctament.
+    invalid_credential: Clau de seguranza no valida
+    nickname_hint: Escriba la embotada d'a suya nueva clau de seguranza
+    not_enabled: Encara no has activau WebAuthn
+    not_supported: Este navegador no suporta claus de seguranza
+    otp_required: Pa usar claus de seguranza, per favor habilite primero l'autenticación de dople factor.
+    registered_on: Rechistrau lo %{date}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 38da35c5a..044e20e5f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1,70 +1,12 @@
 ---
 ar:
   about:
-    about_hashtag_html: هذه تبويقات متاحة للجمهور تحتوي على الكلمات الدلالية <strong>#%{hashtag}</strong>. يمكنك التفاعل معها إن كان لديك حساب في أي مكان على الفديفرس.
     about_mastodon_html: 'شبكة التواصل الإجتماعية المستقبَليّة: مِن دون إعلانات ، غير خاضعة لرقابة الشركات ، تصميم أخلاقي ولامركزية! بياناتكم مِلك لكم مع ماستدون!'
-    about_this: عن مثيل الخادم هذا
-    active_count_after: نشط
-    active_footnote: مستخدم نشيط شهريا (MAU)
-    administered_by: 'يُديره:'
-    api: واجهة برمجة التطبيقات
-    apps: تطبيقات الأجهزة المحمولة
-    apps_platforms: استخدم ماستدون على iOS وأندرويد وأنظمة أخرى
-    browse_directory: تصفح دليل الصفحات التعريفية وصفّي بحسب الإهتمام
-    browse_local_posts: تصفح تيارًا مباشرًا مِن منشورات للعامة على هذا الخادم
-    browse_public_posts: تصفح تيارًا مباشرًا مِن منشورات عامة على ماستدون
-    contact: للتواصل معنا
     contact_missing: لم يتم تعيينه
     contact_unavailable: غير متوفر
-    discover_users: اكتشف مستخدِمين
-    documentation: الدليل
-    federation_hint_html: بواسطة حساب في %{instance} ستتمكن من تتبع أناس في أي خادم ماستدون وأكثر.
-    get_apps: جرّب تطبيقا على الموبايل
     hosted_on: ماستدون مُستضاف على %{domain}
-    instance_actor_flash: |
-      هذا الحساب هو ممثل افتراضي يستخدم لتمثيل الخادم نفسه وليس أي مستخدم فردي.
-      يستخدم لأغراض الاتحاد ولا ينبغي حظره إلا إذا كنت ترغب في حظر مثيل الخادم بأكمله، في هذه الحالة يجب عليك استخدام أداة حظر النطاق.
-    learn_more: تعلم المزيد
-    privacy_policy: سياسة الخصوصية
-    rules: قوانين الخادم
-    rules_html: 'فيما يلي ملخص للقوانين التي تحتاج إلى اتباعها إذا كنت تريد أن يكون لديك حساب على هذا الخادم من ماستدون:'
-    see_whats_happening: اطّلع على ما يجري
-    server_stats: 'إحصائيات الخادم:'
-    source_code: الشفرة المصدرية
-    status_count_after:
-      few: منشورات
-      many: منشورات
-      one: منشور
-      other: منشورات
-      two: منشورات
-      zero: منشورات
-    status_count_before: نشروا
-    tagline: اتبع أصدقائك وصديقاتك واكتشف آخرين وأخريات
-    terms: شروط الخدمة
-    unavailable_content: محتوى غير متوفر
-    unavailable_content_description:
-      domain: الخادم
-      reason: السبب
-      rejecting_media: 'لن يتم معالجة أو تخزين ملفات الوسائط القادمة من هذه الخوادم، ولن يتم عرض أي صور مصغرة، مما يتطلب النقر اليدوي على الملف الأصلي:'
-      rejecting_media_title: وسائط مصفّاة
-      silenced: 'سيتم إخفاء المنشورات القادمة من هذه الخوادم في الخيوط الزمنية والمحادثات العامة، ولن يتم إنشاء أي إخطارات من جراء تفاعلات مستخدميها، ما لم تُتَابعهم:'
-      silenced_title: الخوادم المكتومة
-      suspended: 'لن يتم معالجة أي بيانات قادمة من هذه الخوادم أو تخزينها أو تبادلها، مما سيجعل أي تفاعل أو اتصال مع المستخدمين والمستخدمات المنتمين إلى هذه الخوادم مستحيلة:'
-      suspended_title: الخوادم المعلَّقة
-    unavailable_content_html: يسمح لك ماستدون عموماً بعرض محتوى المستخدمين القادم من أي خادم آخر في الفديفرس والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم بالذات.
-    user_count_after:
-      few: مستخدمين
-      many: مستخدمين
-      one: مستخدم
-      other: مستخدمين
-      two: مستخدمين
-      zero: مستخدمين
-    user_count_before: يستضيف
-    what_is_mastodon: ما هو ماستدون ؟
+    title: عن
   accounts:
-    choices_html: 'توصيات %{name}:'
-    endorsements_hint: يمكنك التوصية بالأشخاص الذين تتابعهم من واجهة الويب، وسيظهرون هنا.
-    featured_tags_hint: يمكنك عرض وسوم محددة سيتم عرضها هنا.
     follow: اتبع
     followers:
       few: متابِعون
@@ -75,34 +17,19 @@ ar:
       zero: متابِعون
     following: مُتابَع
     instance_actor_flash: هذا الحساب هو ممثل افتراضي يُستخدم لتمثيل الخادم نفسه ولا يمثل أي مستخدم فردي، يُستخدم لأغراض الاتحاد ولا ينبغي حظره.
-    joined: انضم·ت في %{date}
     last_active: آخر نشاط
     link_verified_on: تم التحقق مِن مالك هذا الرابط بتاريخ %{date}
-    media: الوسائط
-    moved_html: "%{name} إنتقلَ إلى %{new_profile_link}:"
-    network_hidden: إنّ المعطيات غير متوفرة
-    never_active: أبدا
     nothing_here: لا يوجد أي شيء هنا!
-    people_followed_by: الأشخاص الذين يتبعهم %{name}
-    people_who_follow: الأشخاص الذين يتبعون %{name}
     pin_errors:
       following: يجب أن تكون مِن متابعي حساب الشخص الذي تريد إبرازه
     posts:
-      few: تبويقات
-      many: تبويقات
-      one: تبويق
-      other: تبويقات
-      two: تبويقات
-      zero: تبويقات
-    posts_tab_heading: تبويقات
-    posts_with_replies: التبويقات و الردود
-    roles:
-      admin: المدير
-      bot: روبوت
-      group: فريق
-      moderator: مُشرِف
-    unavailable: الصفحة التعريفية غير متوفرة
-    unfollow: إلغاء المتابعة
+      few: منشورات
+      many: منشورات
+      one: منشور واحد
+      other: منشور
+      two: منشورَيْن
+      zero: منشور
+    posts_tab_heading: المنشورات
   admin:
     account_actions:
       action: تنفيذ الإجراء
@@ -110,26 +37,30 @@ ar:
     account_moderation_notes:
       create: اترك ملاحظة
       created_msg: تم إنشاء ملاحظة الإشراف بنجاح!
-      delete: حذف
       destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح!
     accounts:
       add_email_domain_block: حظر نطاق بريد إلكتروني
       approve: صادِق عليه
-      approve_all: الموافقة على الكل
       approved_msg: تمت الموافقة على تسجيل %{username}
       are_you_sure: متأكد ؟
       avatar: الصورة الرمزية
       by_domain: النطاق
       change_email:
-        changed_msg: تم تعديل عنوان البريد الإلكتروني الخاص بالحساب بنجاح!
+        changed_msg: تم تغيير البريد بنجاح!
         current_email: عنوان البريد الإلكتروني الحالي
         label: تعديل عنوان البريد الإلكتروني
         new_email: عنوان البريد الإلكتروني الجديد
         submit: تعديل عنوان البريد الإلكتروني
         title: تعديل عنوان البريد الإلكتروني الخاص بـ %{username}
+      change_role:
+        changed_msg: تم تغيير بنجاح!
+        label: تغيير الدور
+        no_role: لا رتب
+        title: تم تغيير الرتب ل %{username}
       confirm: تأكيد
       confirmed: مؤكَّد
       confirming: التأكد
+      custom: مخصص
       delete: حذف البيانات
       deleted: تمت إزالته
       demote: إنزال الرُتبة الوظيفية
@@ -169,7 +100,7 @@ ar:
         active: نشِط
         all: الكل
         pending: قيد المراجعة
-        silenced: تم كتمه
+        silenced: محدود
         suspended: مُجَمَّد
         title: الإشراف
       moderation_notes: ملاحظات الإشراف
@@ -177,9 +108,11 @@ ar:
       most_recent_ip: أحدث عنوان إيبي
       no_account_selected: لم يطرأ أي تغيير على أي حساب بما أنه لم يتم اختيار أي واحد
       no_limits_imposed: مِن دون حدود مشروطة
+      no_role_assigned: "'لم يتم تعيين أدوار`"
       not_subscribed: غير مشترك
       pending: في انتظار المراجعة
       perform_full_suspension: تعليق الحساب
+      previous_strikes: العقوبات السابقة
       promote: ترقية
       protocol: البروتوكول
       public: عمومي
@@ -187,7 +120,6 @@ ar:
       redownload: انعش الصفحة التعريفية
       redownloaded_msg: تم تحديث ملف %{username} التعريفي من الأصل
       reject: ارفض
-      reject_all: ارفض الكل
       rejected_msg: تم رفض تطبيق تسجيل %{username} بنجاح
       remove_avatar: حذف الصورة الرمزية
       remove_header: حذف الرأسية
@@ -200,19 +132,13 @@ ar:
       reset: إعادة التعيين
       reset_password: إعادة ضبط كلمة السر
       resubscribe: إعادة الاشتراك
-      role: الصلاحيات
-      roles:
-        admin: مدير
-        moderator: مشرف
-        staff: الفريق
-        user: مستخدِم
+      role: الدور
       search: البحث
       search_same_email_domain: مستخدمون آخرون لديهم نفس نطاق البريد الإلكتروني
       search_same_ip: مستخدِمون آخرون بنفس الـ IP
       security_measures:
         only_password: كلمة المرور فقط
         password_and_2fa: كلمة المرور و 2FA
-        password_and_sign_in_token: كلمة المرور ورمز البريد الإلكتروني
       sensitive: حساس
       sensitized: مُعَين كمنشور حساس
       shared_inbox_url: رابط الصندوق المُشترَك للبريد الوارد
@@ -222,12 +148,15 @@ ar:
       silence: كتم
       silenced: تم كتمه
       statuses: المنشورات
+      strikes: العقوبات السابقة
       subscribe: اشترك
+      suspend: علّق الحساب
       suspended: تم تعليقه
       suspension_irreversible: تم حذف بيانات هذا الحساب بشكل لا رجعة فيه، يمكنك إلغاء تعليق الحساب لجعله قابلا للاستخدام، ولكنه لن يسترد أي بيانات كانت لديه سابقاً.
       suspension_reversible_hint_html: تم تعليق الحساب، وسيتم إزالة البيانات بالكامل في %{date}، حتى ذلك الحين، يمكن استعادة الحساب دون أي آثار سلبية أي كما أنه لم يحدث أي شيء، إذا كنت ترغب في حذف جميع بيانات الحساب الآن، فيمكنك فعل ذلك أدناه.
-      time_in_queue: في قائمة الانتظار %{time}
       title: الحسابات
+      unblock_email: إلغاء حظر عنوان البريد الإلكتروني
+      unblocked_email_msg: تم إلغاء حظر عنوان البريد الإلكتروني لـ %{username} بنجاح
       unconfirmed_email: البريد الإلكتروني غير مؤكد
       undo_sensitized: التراجع عن حساسية
       undo_silenced: رفع الصمت
@@ -242,26 +171,34 @@ ar:
       whitelisted: في القائمة البيضاء
     action_logs:
       action_types:
+        approve_appeal: الموافقة على الطعن
+        approve_user: الموافقة على المستخدم
         assigned_to_self_report: أسند التقرير
         change_email_user: تغيير عنوان البريد الإلكتروني الخاص بالمستخدم
+        change_role_user: تم تغيير الرتبه للمستخدم
         confirm_user: تأكيد المستخدم
         create_account_warning: إنشاء تحذير
         create_announcement: إنشاء إعلان
+        create_canonical_email_block: إنشاء نطاق للبريد
         create_custom_emoji: إنشاء إيموجي مخصص
         create_domain_allow: إنشاء نطاق المسموح به
         create_domain_block: إنشاء كتلة نطاق
         create_email_domain_block: إنشاء كتلة نطاق بريد إلكتروني
         create_ip_block: إنشاء قاعدة IP جديدة
         create_unavailable_domain: إنشاء نطاق غير متوفر
+        create_user_role: انشاء رتبه
         demote_user: إنزال رتبة المستخدم
         destroy_announcement: احذف الإعلان
+        destroy_canonical_email_block: حذف نطاق للبريد
         destroy_custom_emoji: احذف الإيموجي المخصص
         destroy_domain_allow: حذف النطاق المسموح به
         destroy_domain_block: حذف كتلة النطاق
         destroy_email_domain_block: حذف نطاق بريد إلكتروني
+        destroy_instance: تنظيف النطاق
         destroy_ip_block: حذف قانون IP
         destroy_status: حذف المنشور
         destroy_unavailable_domain: حذف نطاق غير متوفر
+        destroy_user_role: حذف الدور
         disable_2fa_user: تعطيل 2FA
         disable_custom_emoji: تعطيل الإيموجي المخصص
         disable_sign_in_token_auth_user: تعطيل مصادقة رمز البريد الإلكتروني للمستخدم
@@ -271,42 +208,56 @@ ar:
         enable_user: تفعيل المستخدم
         memorialize_account: جعل الحساب تذكاريا
         promote_user: ترقية المستخدم
+        reject_appeal: رفض الطعن
+        reject_user: ارفض المستخدم
         remove_avatar_user: احذف الصورة الرمزية
         reopen_report: إعادة فتح التقرير
+        resend_user: إعادة إرسال بريد التأكيد
         reset_password_user: إعادة تعيين كلمة المرور
         resolve_report: حل الشكوى
         sensitive_account: وضع علامة على الوسائط في حسابك على أنها حساسة
         silence_account: كتم الحساب
         suspend_account: تعليق الحساب
         unassigned_report: إلغاء إسناد الشكوى
+        unblock_email_account: إلغاء حظر عنوان البريد الإلكتروني
         unsensitive_account: إلغاء تحديد الوسائط في حسابك على أنها حساسة
         unsilence_account: إلغاء كتم الحساب
         unsuspend_account: إلغاء تعليق الحساب
         update_announcement: تحديث الإعلان
         update_custom_emoji: تحديث الإيموجي المخصص
         update_domain_block: تحديث كتلة النطاق
+        update_ip_block: تحديث قاعدة IP
         update_status: تحديث الحالة
+        update_user_role: تحديث الدور
       actions:
+        approve_appeal_html: وافق %{name} على استئناف قرار الاعتدال من %{target}
+        approve_user_html: قبل %{name} تسجيل %{target}
         assigned_to_self_report_html: قام %{name} بتعيين التقرير %{target} لأنفسهم
         change_email_user_html: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
+        change_role_user_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         confirm_user_html: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
         create_account_warning_html: قام %{name} بإرسال تحذير إلى %{target}
         create_announcement_html: قام %{name} بإنشاء إعلان جديد %{target}
+        create_canonical_email_block_html: قام %{name} بحظر نطاق البريد الإلكتروني %{target}
         create_custom_emoji_html: "%{name} قام برفع إيموجي جديد %{target}"
         create_domain_allow_html: قام %{name} بإضافة النطاق %{target} إلى القائمة البيضاء
         create_domain_block_html: "%{name} قام بحجب نطاق %{target}"
         create_email_domain_block_html: قام %{name} بحظر نطاق البريد الإلكتروني %{target}
         create_ip_block_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         create_unavailable_domain_html: قام %{name} بتوقيف التوصيل للنطاق %{target}
+        create_user_role_html: "%{name} أنشأ رتبه %{target}"
         demote_user_html: قام %{name} بخفض الرتبة الوظيفية لـ%{target}
         destroy_announcement_html: قام %{name} بحذف الإعلان %{target}
-        destroy_custom_emoji_html: قام %{name} بحذف الإيموجي %{target}
+        destroy_canonical_email_block_html: قام %{name} برفع الحظر عن نطاق البريد الإلكتروني %{target}
+        destroy_custom_emoji_html: قام %{name} بتحديث الإيموجي %{target}
         destroy_domain_allow_html: قام %{name} بمنع الاتحاد مع النطاق %{target}
         destroy_domain_block_html: قام %{name} برفع الحظر عن النطاق %{target}
         destroy_email_domain_block_html: قام %{name} برفع الحظر عن نطاق البريد الإلكتروني %{target}
+        destroy_instance_html: "%{name} قام بحجب نطاق %{target}"
         destroy_ip_block_html: قام %{name} بحذف قاعدة للـIP %{target}
         destroy_status_html: قام %{name} بحذف منشور من %{target}
         destroy_unavailable_domain_html: قام %{name} باستئناف التوصيل للنطاق %{target}
+        destroy_user_role_html: "%{name} أنشأ رتبه %{target}"
         disable_2fa_user_html: قام %{name} بتعطيل المصادقة بخطوتين للمستخدم %{target}
         disable_custom_emoji_html: قام %{name} بتعطيل الإيموجي %{target}
         disable_sign_in_token_auth_user_html: "%{name} تعطيل مصادقة رمز البريد الإلكتروني لـ %{target}"
@@ -316,22 +267,28 @@ ar:
         enable_user_html: قام %{name} بتنشيط تسجيل الدخول للمستخدم %{target}
         memorialize_account_html: قام %{name} بتحويل حساب %{target} إلى صفحة تذكارية
         promote_user_html: قام %{name} بترويج المستخدم %{target}
+        reject_appeal_html: وافق %{name} على استئناف قرار الاعتدال من %{target}
+        reject_user_html: رفض %{name} تسجيل %{target}
         remove_avatar_user_html: قام %{name} بإزالة صورة %{target} الرمزية
         reopen_report_html: قام %{name} بإعادة فتح الشكوى %{target}
+        resend_user_html: "%{name} إعادة إرسال البريد الإلكتروني للتأكيد لـ %{target}"
         reset_password_user_html: قام %{name} بإعادة تعيين كلمة مرور المستخدم %{target}
         resolve_report_html: قام %{name} بحل الشكوى %{target}
         sensitive_account_html: قام %{name} بوضع علامة حساس على محتوى %{target}
         silence_account_html: قام %{name} بكتم حساب %{target}
         suspend_account_html: قام %{name} بتعليق حساب %{target}
         unassigned_report_html: قام %{name} بإلغاء تعيين الشكوى %{target}
+        unblock_email_account_html: "%{name} إلغاء حظر %{target} عنوان البريد الإلكتروني"
         unsensitive_account_html: قام %{name} بإزالة علامة حساس على محتوى %{target}
         unsilence_account_html: قام %{name} بإلغاء كتم المستخدم %{target}
         unsuspend_account_html: قام %{name} بإلغاء تعليق حساب %{target}
         update_announcement_html: قام %{name} بتحديث الإعلان %{target}
         update_custom_emoji_html: قام %{name} بتحديث الإيموجي %{target}
         update_domain_block_html: قام %{name} بتحديث كتلة النطاق %{target}
+        update_ip_block_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         update_status_html: قام %{name} بتحديث منشور من %{target}
-      deleted_status: "(منشور محذوف)"
+        update_user_role_html: "%{name} تغيير رتبه %{target}"
+      deleted_account: احذف الحساب
       empty: لم يتم العثور على سجلات.
       filter_by_action: تصفية بحسب الإجراء
       filter_by_user: تصفية حسب المستخدم
@@ -370,11 +327,12 @@ ar:
       enable: تفعيل
       enabled: مُشغَّل
       enabled_msg: تم تنشيط ذاك الإيموجي بنجاح
-      image_hint: ملف PNG إلى غاية حجم 50 ك.ب
+      image_hint: ملف PNG أو GIF لا يتعدى %{size}
       list: القائمة
       listed: مُدرَج
       new:
         title: إضافة إيموجي خاص جديد
+      no_emoji_selected: لم يطرأ أي تغيير على أي حساب بما أنه لم يتم اختيار أي واحد
       not_permitted: غير مسموح لك بتنفيذ هذا الإجراء
       overwrite: إعادة الكتابة
       shortcode: الترميز المُصَغّر
@@ -387,13 +345,36 @@ ar:
       updated_msg: تم تحديث الإيموجي بنجاح!
       upload: رفع
     dashboard:
+      active_users: مستخدمين نشطين
+      interactions: تفاعلات
+      media_storage: تخزين الوسائط
+      new_users: مستخدمون جدد
+      opened_reports: تقارير مفتوحة
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> مستخدمين معلقين"
+        many: "<strong>%{count}</strong> مستخدمين معلقين"
+        one: "<strong>%{count}</strong> مستخدمين معلقين"
+        other: "<strong>%{count}</strong> تقارير معلقة"
+        two: "<strong>%{count}</strong> مستخدمين معلقين"
+        zero: "<strong>%{count}</strong> وسماً معلقاً"
+      resolved_reports: تقارير تم حلها
       software: البرنامج
+      sources: مصادر التسجيل
       space: المساحة المستخدَمة
       title: لوح المراقبة
+      top_languages: اللغات الأكثر نشاطا
+      top_servers: الخوادم الأكثر نشاطا
+      website: موقع الويب
+    disputes:
+      appeals:
+        empty: ليست هناك أية طعون.
+        title: الطعون
     domain_allows:
       add_new: إضافة النطاق إلى القائمة البيضاء
       created_msg: تمت إضافة النطاق إلى القائمة البيضاء بنجاح
       destroyed_msg: تمت إزالة النطاق مِن القائمة البيضاء
+      export: تصدير
+      import: استيراد
       undo: إزالة من القائمة البيضاء
     domain_blocks:
       add_new: إضافة حجب جديد لنطاق
@@ -401,16 +382,21 @@ ar:
       destroyed_msg: تم إلغاء الحجب المفروض على النطاق
       domain: النطاق
       edit: تحرير النطاق المحظور
+      existing_domain_block: لقم قمت بالفعل بفرض حدود صارمة على %{name}.
       existing_domain_block_html: لقد فرضت بالفعل سابقاً حدوداً أكثر صرامة على %{name}، تحتاج إلى <a href="%{unblock_url}">إلغاء حظره</a> أولاً.
+      export: تصدير
+      import: استيراد
       new:
         create: إنشاء حظر
         hint: لن تمنع كتلة المجال إنشاء إدخالات حساب في قاعدة البيانات ، ولكنها ستطبق طرق الإشراف المحددة بأثر رجعي وتلقائي على هذه الحسابات.
         severity:
-          desc_html: "<strong>Silence</strong> سيجعل مشاركات الحساب غير مرئية لأي شخص لا يتبعها. <strong>Suspend</strong> سيزيل كل محتوى الحساب ووسائطه وبيانات ملفه التعريفي. Use <strong>None</strong> إذا كنت تريد فقط رفض ملفات الوسائط."
+          desc_html: "<strong>الكتم</strong> سوف يتسبب بإخفاء جميع المنشورات للحسابات للذين لا يتابعون هذه الحسابات بالفعل. <strong>التعليق</strong> سوف يتسبب بحذف المحتوى، الوسائط، ومعلومات الحسابات الخاصة بهذا النطاق من الخادم الخاص بك. استخدم <strong>بدون</strong> في حال أردت فقط رفض الوسائط فقط."
           noop: لا شيء
           silence: كتم
           suspend: تعليق
         title: حجب نطاق جديد
+      no_domain_block_selected: لم يطرأ أي تغيير على أي نطاق بما أنه لم يتم اختيار أي نطاق
+      not_permitted: غير مسموح لك بتنفيذ هذا الإجراء
       obfuscate: تشويش اسم النطاق
       obfuscate_hint: تشويش اسم النطاق جزئيا في القائمة إذا كان الإعلان عن قائمة قيود النطاق مفعلاً
       private_comment: تعليق خاص
@@ -421,38 +407,38 @@ ar:
       reject_media_hint: يزيل ملفات الوسائط المخزنة محليًا ويرفض تنزيل أي ملفات في المستقبل. غير ذي صلة للتعليق
       reject_reports: رفض التقارير
       reject_reports_hint: تجاهل جميع تقارير الإبلاغ القادمة من هذا النطاق. هذا يستثي التعليقات
-      rejecting_media: جار رفض ملفات الوسائط
-      rejecting_reports: جار رفض التقارير
-      severity:
-        silence: تم كتمه
-        suspend: تم تعليقه
-      show:
-        affected_accounts:
-          few: "%{count} حسابات معنية في قاعدة البيانات"
-          many: "%{count} حسابات معنية في قاعدة البيانات"
-          one: حساب واحد %{count} معني في قاعدة البيانات
-          other: "%{count} حسابات معنية في قاعدة البيانات"
-          two: حسابين %{count} معنيين في قاعدة البيانات
-          zero: "%{count} حسابات معنية في قاعدة البيانات"
-        retroactive:
-          silence: إلغاء الكتم عن كافة الحسابات المتواجدة على هذا النطاق
-          suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
-        title: رفع حظر النطاق عن %{domain}
-        undo: إلغاء
       undo: إلغاء حجب النطاق
       view: عرض كتلة النطاق
     email_domain_blocks:
       add_new: إضافة
       created_msg: لقد دخل حظر نطاق البريد الإلكتروني حيّز الخدمة
       delete: حذف
-      destroyed_msg: تم حذف نطاق البريد الإلكتروني من اللائحة السوداء بنجاح
+      dns:
+        types:
+          mx: سجل MX
       domain: النطاق
-      empty: ليس هناك أية نطاقات للبريد الإلكتروني مُدرَجة في القائمة السوداء.
-      from_html: مِن %{domain}
       new:
         create: إضافة نطاق
+        resolve: العثور على عنوان النطاق
         title: إضافة نطاق بريد جديد إلى اللائحة السوداء
+      no_email_domain_block_selected: لم يطرأ أي تغيير على أي نطاق بريد بما أنه لم يتم اختيار أي نطاق
+      resolved_dns_records_hint_html: عنوان النطاق يعود لخوادم البريد (MX) التالية وهو ما يسمح للنطاق باستقبال البريد. حظر خوادم البريد هذه سوف يتسبب في منع أي تسجيل خلال أي نطاق يستخدم هذه الخوادم حتى لو كان اسم النطاق مختلف عن اسماء خوادم البريد.<strong>احذر من حظر مزودي البريد العالميين.</strong>
+      resolved_through_html: الحصول على العنوان من خلال %{domain}
       title: القائمة السوداء للبريد الإلكتروني
+    export_domain_allows:
+      new:
+        title: استيراد قامة النطاقات المسموحة
+      no_file: لم يتم تحديد أيّ ملف
+    export_domain_blocks:
+      import:
+        description_html: أنت على وشك استيراد قائمة نطاقات محظورة. يرجى مراجعة هذه القائمة بعناية شديدة، خاصة إذا لم تقم بكتابة هذه القائمة بنفسك.
+        existing_relationships_warning: تم العثور على متابعات مستركة
+        private_comment_description_html: 'لمساعدتك على تتبع سبب حظر النطاقات المستوردة، سيتم إنشاء الحظر مع التعليق الخاص التالي: <q>%{comment}</q>'
+        private_comment_template: تم الاستيراد من %{source} بتاريخ %{date}
+        title: استيراد قامة النطاقات المحظورة
+      new:
+        title: استيراد قامة النطاقات المحظورة
+      no_file: لم يتم تحديد أيّ ملف
     follow_recommendations:
       description_html: "<strong>تساعد اقتراحات المتابعة المستخدمين في العثور بسرعة على محتوى مثير للاهتمام</strong>. عندما لا يتفاعل المستخدم مع الآخرين بشكل كافي لتشكيل اقتراحات متابعة مخصصة له، تظهر هذه الاقتراحات بدلاً من ذلك. يُعاد حسابهم بشكل يومي من مزيج حسابات لديها أكثر التفاعلات وأكثر عدد من المتابعين المحليين للغة معينة."
       language: للغة
@@ -462,49 +448,70 @@ ar:
       title: اقتراحات المتابعة
       unsuppress: إستعادة إقتراحات المتابعة
     instances:
+      availability:
+        failure_threshold_reached: تم الوصول إلى أقصى حد للفشل بتاريخ %{date}.
+        no_failures_recorded: لم يتم العثور على أي فشل.
+        title: التوفر
+        warning: فشلت المحاولة الأخيرة للاتصال بهذا النطاق
       back_to_all: الكل
       back_to_limited: محدود
       back_to_warning: تحذير
       by_domain: النطاق
+      confirm_purge: هل أنت متأكد من أنك تريد حذف البيانات من هذا النطاق بشكل دائم؟
+      content_policies:
+        comment: ملاحظة داخلية
+        description_html: يمكنك تحديد سياسات المحتوى التي سيتم تطبيقها على جميع حسابات هذا النطاق وأي من نطاقاته الفرعية.
+        policies:
+          reject_media: رفض الوسائط
+          reject_reports: رفض الشكاوى
+          silence: كتم
+          suspend: علّق الحساب
+        policy: القواعد
+        reason: السبب العلني
+        title: سياسات المحتوى
+      dashboard:
+        instance_accounts_dimension: الحسابات الأكثر متابعة
+        instance_accounts_measure: حسابات مخزنة
+        instance_followers_measure: متابعينا هناك
+        instance_follows_measure: متابِعوهم هنا
+        instance_languages_dimension: اللغات الأكثر استخدامًا
+        instance_media_attachments_measure: مرفقات الوسائط المخزَّنة
+        instance_reports_measure: تبليغات بخصوصهم
+        instance_statuses_measure: المنشورات المخزنة
       delivery:
         all: الكل
         clear: مسح أخطاء التسليم
+        failing: فشلت
         restart: إعادة تشغيل التوصيل
         stop: إيقاف التوصيل
-        title: التوصيل
         unavailable: غير متوفر
-        unavailable_message: التوصيل غير متوفر
-        warning: تحذير
-        warning_message:
-          few: فشل التوصيل لـ%{count} أيام
-          many: فشل التوصيل لـ%{count} يوم
-          one: فشل التوصيل لـ%{count} يوم
-          other: فشل التوصيل لـ%{count} يوم
-          two: فشل التوصيل لـ%{count} يوم
-          zero: فشل التوصيل لـ%{count} يوم
       delivery_available: التسليم متوفر
       delivery_error_days: أيام أخطاء التوصيل
       delivery_error_hint: إذا كان التوصيل غير ممكناً لـ%{count} يوم، فستوضع عليها علامة {غير قابلة للتسليم} تلقائياً.
+      destroyed_msg: تم جدولة حذف بيانات النطاق %{domain}.
       empty: لم يتم العثور على نطاقات.
       known_accounts:
         few: "%{count} حسابات معروفة"
-        many: "%{count} حسابات معروفة"
-        one: حساب معروف %{count}
-        other: "%{count} حسابات معروفة"
-        two: "%{count} حسابات معروفة"
-        zero: "%{count} حسابات معروفة"
+        many: "%{count} حسابًا معروفًا"
+        one: حساب %{count} معروف
+        other: "%{count} حساب معروف"
+        two: حسابان %{count} معروفان
+        zero: "%{count} حسابًا معروفًا"
       moderation:
         all: كافتها
         limited: محدود
         title: الإشراف
       private_comment: تعليق خاص
       public_comment: تعليق للعلن
+      purge: تطهير
+      purge_description_html: في حال رأيت أن هذا النطاق لن يعود، يمكنك حذف جميع الحسابات والبيانات المرتبطة به من التخزين الخاص بك. هذا قد يحتاج إلى بعض الوقت للانتهاء.
       title: الفديرالية
       total_blocked_by_us: المحجوبة مِن طرفنا
       total_followed_by_them: يُتابِعونها
       total_followed_by_us: التي نُتابِعها
       total_reported: تقارير عنهم
       total_storage: الوسائط المُرفَقة
+      totals_time_period_hint_html: المجموع المعروض في الأسفل يشمل بيانات منذ البداية.
     invites:
       deactivate_all: تعطيلها كافة
       filter:
@@ -528,8 +535,6 @@ ar:
         title: إنشاء قاعدة IP جديدة
       no_ip_block_selected: لم يطرأ أي تغيير على أي قاعدة IP بما أنه لم يتم اختيار أي واحد
       title: قواعد الـIP
-    pending_accounts:
-      title: الحسابات المعلقة (%{count})
     relationships:
       title: علاقات %{acct}
     relays:
@@ -539,7 +544,7 @@ ar:
       disable: تعطيل
       disabled: مُعطَّل
       enable: تشغيل
-      enable_hint: عندما تقوم بتنشيط هذه الميزة، سوف يشترك خادومكم في جميع التبويقات القادمة مِن هذا المُرحِّل و سيشرع كذلك بإرسال كافة التبويقات العمومية إليه.
+      enable_hint: عندما تقوم بتنشيط هذه الميزة، سوف يشترك هذا الخادم في جميع المنشورات القادمة مِن هذا المُرحِّل و سيشرع كذلك بإرسال كافة المنشورات العمومية إليه.
       enabled: مُشغَّل
       inbox_url: رابط المُرحّل
       pending: في انتظار تسريح المُرحِّل
@@ -560,43 +565,116 @@ ar:
           other: "%{count} ملاحظات"
           two: "%{count} ملاحظتَيْن"
           zero: "%{count} ملاحظات"
-        reports:
-          few: "%{count} تقارير"
-          many: "%{count} تقارير"
-          one: "%{count} تقرير واحد"
-          other: "%{count} تقارير"
-          two: "%{count} تقريرَيْن"
-          zero: "%{count} تقارير"
+      action_log: سجل المراجعة
       action_taken_by: تم اتخاذ الإجراء مِن طرف
+      actions:
+        delete_description_html: سيتم حذف المناشير المبلّغ عنها وسيتم تسجيل إنذار لمساعدتك في التعامل المستقبلي مع أي مخالفة جديدة من نفس الحساب.
+        mark_as_sensitive_description_html: سيتم تحديد الوسائط في المناشير المبلّغ عنها على أنها محتوى حساس وسيتم تسجيل إنذار لمساعدتك في التعامل المستقبلي مع أي مخالفة جديدة من نفس الحساب.
+        other_description_html: عرض المزيد من الخيارات للتحكم في االحسابات وتخصيص التواصل مع الحسابات المُبلّغ عنها.
+        resolve_description_html: ولن يُتخذ أي إجراء ضد الحساب المبلّغ عنه، ولن تسلَّط عليه أية عقوبة، وسوف يُغلق التقرير.
+        silence_description_html: الحساب سيكون ظاهر فقط لمن يتابعه بالفعل أو قام بالبحث عنه بشكل مباشر مما يتسبب في تخفيض إمكانية رؤيته بشكل شبه كامل. يمكنك دائما التراجع عن هذا القرار.
+        suspend_description_html: سيتم قفل الحساب ومنع الوصول إلى محتوياته إلى أن يتم حذفه. سيكون من غير الممكن التفاعل مع الحساب. يمكن التراجع عن هذا خلال 30 يوم.
+      actions_description_html: تحديد الإجراءات التي يتعين اتخاذها لحل هذا التبليغ. إذا اتخذت إجراء عقابيا ضد الحساب المبلغ عنه، فسيتم إرسال إشعار بالبريد الإلكتروني إليهم، إلا عندما يتم تحديد فئة <strong>البريد المزعج.</strong>
+      add_to_report: أضف المزيد إلى التقرير
       are_you_sure: هل أنت متأكد ؟
       assign_to_self: عين لي
       assigned: تعين رئيس
+      by_target_domain: نطاق الحساب المبلّغ عنه
+      category: الفئة
+      category_description_html: سيشار إلى سبب الإبلاغ عن هذا الحساب و/أو المحتوى في الاتصال بالحساب المبلغ عنه
       comment:
         none: لا شيء
+      comment_description_html: 'لتوفير المزيد من المعلومات، كتب %{name}:'
       created_at: ذكرت
+      delete_and_resolve: احذف المنشورات
       forwarded: أُعيد توجيهه
       forwarded_to: أُعيد توجيهه إلى %{domain}
       mark_as_resolved: اعتبار الشكوى كمحلولة
+      mark_as_sensitive: تعيينه كمنشور حساس
       mark_as_unresolved: علم كغير محلولة
+      no_one_assigned: لا أحد
       notes:
         create: اضف ملاحظة
         create_and_resolve: الحل مع ملاحظة
         create_and_unresolve: إعادة فتح مع ملاحظة
         delete: حذف
         placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة...
+        title: الملاحظات
+      notes_description_html: عرض الملاحظات وتركها للمشرفين الآخرين ولنفسك في المستقبل
+      quick_actions_description_html: 'قم بإجراء سريع أو التمرير للأسفل لرؤية المحتوى المبلغ عنه:'
+      remote_user_placeholder: المستخدم البعيد من %{instance}
       reopen: إعادة فتح الشكوى
       report: 'الشكوى #%{id}'
       reported_account: حساب مُبلّغ عنه
       reported_by: أبلغ عنه من طرف
       resolved: معالجة
       resolved_msg: تم حل تقرير بنجاح!
+      skip_to_actions: تخطي إلى الإجراءات
       status: الحالة
-      target_domain: نطاق الحساب المبلّغ عنه
+      statuses: المحتوى المبلغ عنه
+      statuses_description_html: سيشار إلى المحتوى المخالف في الاتصال بالحساب المبلغ عنه
       target_origin: مصدر الحساب المبلغ عنه
       title: الشكاوى
       unassign: إلغاء تعيين
       unresolved: غير معالجة
       updated_at: محدث
+      view_profile: اعرض الصفحة التعريفية
+    roles:
+      add_new: إضافة دور
+      assigned_users:
+        few: "%{count} مستخدمًا"
+        many: "%{count} مستخدمين"
+        one: مستخدم واحد %{count}
+        other: "%{count} مستخدم"
+        two: مستخدمان %{count}
+        zero: "%{count} لا مستخدم"
+      categories:
+        administration: الإدارة
+        devops: DevOps
+        invites: الدعوات
+        moderation: الإشراف
+        special: مميز
+      delete: حذف
+      description_html: مع <strong>أدوار المستخدم</strong>، يمكنك تخصيص أي الوظائف ومجالات ماستدون التي يمكن للمستخدمين الوصول إليها.
+      edit: تعديل رتبة '%{name}' '
+      everyone: الصلاحيات الافتراضية
+      everyone_full_description_html: هذا هو <strong>الدور الأساسي</strong> الذي يحمله <strong>جميع المستخدمين</strong>، حتى أولئك الذين ليس لديهم دور معين. جميع الأدوار الأخرى ترث الأذونات منه.
+      privileges:
+        administrator: مدير
+        administrator_description: المستخدمين الذين لديهم هذا التصريح سيتجاوزون جميع التصاريح
+        delete_user_data: احذف بيانات المستخدم
+        delete_user_data_description: يسمح للمستخدمين بحذف بيانات المستخدمين الآخرين دون تأخير
+        invite_users: دعوة مستخدمين
+        invite_users_description: يسمح للمستخدمين بدعوة أشخاص جدد إلى الخادم
+        manage_announcements: ادارة الاعلانات
+        manage_announcements_description: يسمح للمستخدمين بإدارة الإعلانات على الخادم
+        manage_appeals: إدارة الاستئنافات
+        manage_appeals_description: يسمح للمستخدمين بمراجعة الطعن ضد إجراءات الإشراف
+        manage_blocks: إدارة الحظر
+        manage_blocks_description: يسمح للمستخدمين بحظر مزودي خدمات البريد الإلكتروني وعناوين IP
+        manage_custom_emojis: إدارة الرموز التعبيريّة المخصصة
+        manage_custom_emojis_description: السماح للمستخدمين بإدارة الرموز التعبيريّة المخصصة على الخادم
+        manage_federation: إدارة الفديرالية
+        manage_federation_description: يسمح للمستخدمين بحظر أو السماح للاتحاد مع النطاقات الأخرى، والتحكم في إمكانية التسليم
+        manage_invites: إدارة الدعوات
+        manage_invites_description: السماح للمستخدمين بالتصفح و تعطيل روابط الدعوة
+        manage_reports: إدارة التقارير
+        manage_reports_description: يسمح للمستخدمين بمراجعة التباليغ وتنفيذ إجراءات الإشراف ضدهم
+        manage_roles: إدارة الأدوار
+        manage_roles_description: يسمح للمستخدمين بإدارة وتعيين الأدوار الأقل رتبه منهم
+        manage_rules: إدارة القواعد
+        manage_rules_description: يسمح للمستخدمين بتغيير قوانين الخادم
+        manage_settings: إدارة الإعدادات
+        manage_settings_description: يسمح للمستخدمين بتغيير إعدادات الموقع
+        manage_taxonomies: إدارة التصنيفات
+        manage_taxonomies_description: السماح للمستخدمين بمراجعة المحتوى المتداول وتحديث إعدادات الوسم
+        manage_user_access: إدارة وصول المستخدم
+        manage_user_access_description: يسمح للمستخدمين بتعطيل المصادقة الثنائية المستخدمين الآخرين، تغيير عنوان البريد الإلكتروني الخاص بهم، وإعادة تعيين كلمة المرور الخاصة بهم
+        manage_users: إدارة المستخدمين
+        manage_users_description: يسمح للمستخدمين بعرض تفاصيل المستخدمين الآخرين وتنفيذ إجراءات الإشراف ضدهم
+        view_dashboard: عرض لوحة التحكم
+        view_devops_description: السماح للمستخدمين بالوصول إلى لوحة Sidekiq و pgHero
+      title: الأدوار
     rules:
       add_new: إضافة قاعدة
       delete: حذف
@@ -605,111 +683,73 @@ ar:
       empty: لم يتم تحديد قواعد الخادم بعد.
       title: قوانين الخادم
     settings:
-      activity_api_enabled:
-        desc_html: عدد المنشورات المحلية و المستخدمين الناشطين و التسجيلات الأسبوعية الجديدة
-        title: نشر مُجمل الإحصائيات عن نشاط المستخدمين
-      bootstrap_timeline_accounts:
-        desc_html: افصل بين أسماء المستخدمين المتعددة بواسطة الفاصلة. استعمل الحسابات المحلية والمفتوحة فقط. الافتراضي عندما تكون فارغة كل المسؤولين المحليين.
-        title: الاشتراكات الافتراضية للمستخدمين الجدد
-      contact_information:
-        email: البريد الإلكتروني المهني
-        username: الاتصال بالمستخدِم
-      custom_css:
-        desc_html: يقوم بتغيير المظهر بواسطة سي أس أس يُحمَّل على كافة الصفحات
-        title: سي أس أس مخصص
+      about:
+        manage_rules: إدارة قواعد الخادم
+        title: عن
+      appearance:
+        preamble: تخصيص واجهة الويب لماستدون.
+        title: المظهر
+      branding:
+        title: العلامة
+      content_retention:
+        title: الاحتفاظ بالمحتوى
       default_noindex:
         desc_html: يؤثر على جميع المستخدمين الذين لم يغيروا هذا الإعداد بأنفسهم
         title: عدم السماح مبدئيا لمحركات البحث بفهرسة الملفات التعريفية للمستخدمين
+      discovery:
+        follow_recommendations: اتبع التوصيات
+        profile_directory: دليل الصفحات التعريفية
+        public_timelines: الخيوط الزمنية العامة
+        title: الاستكشاف
+        trends: المتداوَلة
       domain_blocks:
         all: للجميع
         disabled: لا أحد
-        title: اظهر خاصية حجب النطاقات
         users: للمستخدمين المتصلين محليا
-      domain_blocks_rationale:
-        title: اظهر السبب
-      hero:
-        desc_html: معروض على الصفحة الأولى. لا يقل عن 600 × 100 بكسل. عند عدم التعيين ، تعود الصورة إلى النسخة المصغرة على سبيل المثال
-        title: الصورة الرأسية
-      mascot:
-        desc_html: معروض على عدة صفحات، يوصى بِعلى الأقل 293x205 بكسل، عند عدم التعيين، تعود الصورة إلى التميمة الافتراضية
-        title: صورة الماسكوت
-      peers_api_enabled:
-        desc_html: أسماء النطاقات التي التقى بها مثيل الخادوم على البيئة الموحَّدة فديفرس
-        title: نشر عدد مثيلات الخوادم التي تم مصادفتها
-      preview_sensitive_media:
-        desc_html: روابط المُعَاينة على مواقع الويب الأخرى ستقوم بعرض صُوَر مصغّرة حتى و إن كانت الوسائط حساسة
-        title: إظهار الصور الحساسة في مُعاينات أوبن غراف
-      profile_directory:
-        desc_html: السماح للمستخدمين الكشف عن حساباتهم
-        title: تفعيل دليل الصفحات التعريفية
       registrations:
-        closed_message:
-          desc_html: يتم عرضه على الصفحة الرئيسية عندما يتم غلق تسجيل الحسابات الجديدة. يمكنكم إستخدام علامات الأيتش تي أم أل HTML
-          title: رسالة التسجيلات المقفلة
-        deletion:
-          desc_html: السماح لأي مستخدم إغلاق حسابه
-          title: السماح بحذف الحسابات
-        min_invite_role:
-          disabled: لا أحد
-          title: المستخدِمون المصرح لهم لإرسال الدعوات
-        require_invite_text:
-          desc_html: عندما تتطلب التسجيلات الموافقة اليدوية، جعل إدخال نص لسؤال "لماذا تريد أن تنضم؟" إلزاميا بدلاً من اختياري
-          title: الطلب من المستخدمين الجدد إدخال سبب للتسجيل
+        preamble: تحكّم في مَن الذي يمكنه إنشاء حساب على خادمك الخاص.
+        title: التسجيلات
       registrations_mode:
         modes:
           approved: طلب الموافقة لازم عند إنشاء حساب
           none: لا أحد يمكنه إنشاء حساب
           open: يمكن للجميع إنشاء حساب
-        title: طريقة إنشاء الحسابات
-      show_known_fediverse_at_about_page:
-        desc_html: عند التعطيل، يُقيّد الخط الزمني العام المرتبط من صفحة الهبوط لعرض المحتوى المحلي فقط
-        title: إظهار الفديفرس الموحَّد في خيط المُعايَنة
-      show_staff_badge:
-        desc_html: عرض شارة الموظفين على صفحة المستخدم
-        title: إظهار شارة الموظفين
-      site_description:
-        desc_html: فقرة تمهيدية على الصفحة الأولى. صف ميزات خادوم ماستدون هذا و ما يميّزه عن الآخرين. يمكنك استخدام علامات HTML ، ولا سيما <code>&lt;a&gt;</code> و <code>&lt;em&gt;</code>.
-        title: وصف مثيل الخادوم
-      site_description_extended:
-        desc_html: مكان جيد لمدونة قواعد السلوك والقواعد والإرشادات وغيرها من الأمور التي تحدد حالتك. يمكنك استخدام علامات HTML
-        title: الوصف المُفصّل للموقع
-      site_short_description:
-        desc_html: يتم عرضه في لوحة جانبية و في البيانات الوصفية. قم بوصف ماستدون و ما يميز هذا السيرفر عن الآخرين في فقرة موجزة. إن تركت الحقل فارغا فسوف يتم عرض الوصف الافتراضي لمثيل الخادوم.
-        title: مقدمة وصفية قصيرة عن مثيل الخادوم
-      site_terms:
-        desc_html: يمكنك كتابة سياسة الخصوصية الخاصة بك ، شروط الخدمة أو غيرها من القوانين. يمكنك استخدام علامات HTML
-        title: شروط الخدمة المخصصة
-      site_title: اسم مثيل الخادم
-      thumbnail:
-        desc_html: يستخدم للعروض السابقة عبر Open Graph و API. 1200x630px موصى به
-        title: الصورة الرمزية المصغرة لمثيل الخادوم
-      timeline_preview:
-        desc_html: عرض الخيط العمومي على صفحة الاستقبال
-        title: مُعاينة الخيط العام
-      title: إعدادات الموقع
-      trendable_by_default:
-        desc_html: يؤثر على علامات الوسوم التي لم يكن مسموح بها مسبقاً
-        title: السماح للوسوم بالظهور على المتداوَلة بدون مراجعة مسبقة
-      trends:
-        desc_html: عرض علني للوسوم المستعرضة سابقاً التي هي رائجة الآن
-        title: الوسوم المتداولة
+      title: إعدادات الخادم
     site_uploads:
       delete: احذف الملف الذي تم تحميله
       destroyed_msg: تم حذف التحميل مِن الموقع بنجاح!
     statuses:
+      account: المؤلف
+      application: التطبيق
       back_to_account: العودة إلى صفحة الحساب
+      back_to_report: العودة إلى صفحة التقرير
       batch:
-        delete: حذف
-        nsfw_off: تعيينه كمنشور غير حساس
-        nsfw_on: تعيينه كمنشور حساس
+        remove_from_report: إزالة من التقرير
+        report: إبلاغ
       deleted: محذوف
-      failed_to_execute: خطأ في التفعيل
+      favourites: المفضلة
+      history: تاريخ التعديلات
+      in_reply_to: رَدًا على
+      language: اللغة
       media:
         title: الوسائط
-      no_media: لا تحتوي على وسائط
+      metadata: البيانات الوصفية
       no_status_selected: لم يطرأ أي تغيير على أي منشور بما أنه لم يتم اختيار أي واحد
+      open: افتح المنشور
+      original_status: المنشور الأصلي
+      reblogs: المعاد تدوينها
+      status_changed: عُدّل المنشور
       title: منشورات الحساب
+      trending: المتداولة
+      visibility: مدى الظهور
       with_media: تحتوي على وسائط
+    strikes:
+      actions:
+        delete_statuses: حَذَفَ %{name} رسائل %{target}
+        disable: جَمّدَ %{name} حساب %{target}
+        suspend: قام %{name} بتعليق حساب %{target}
+      appeal_approved: طُعِن فيه
+      appeal_pending: طعن قيد المراجعة
     system_checks:
       database_schema_check:
         message_html: هناك عمليات هجرة معلقة لقواعد البيانات. يرجى تشغيلها لضمان تصرف التطبيق كما هو متوقع
@@ -719,28 +759,83 @@ ar:
       sidekiq_process_check:
         message_html: لا توجد عملية Sidekiq قيد التشغيل لقائمة الانتظار %{value}. يرجى مراجعة إعدادات Sidekiq الخاصة بك
     tags:
-      accounts_today: استخدامات هذا اليوم
-      accounts_week: استخدامات هذا الأسبوع
-      breakdown: توزيع استخدام اليوم حسب المصدر
-      last_active: آخر نشاط
-      most_popular: الأكثر شعبية
-      most_recent: الأحدث
-      name: الوسم
       review: حالة المراجعة
-      reviewed: مُراجَع
-      title: الوسوم
-      trending_right_now: متداول اللحظة
-      unique_uses_today: "%{count} منشورات اليوم"
-      unreviewed: غير مُراجَع
       updated_msg: تم تحديث إعدادات الوسوم بنجاح
     title: الإدارة
+    trends:
+      allow: السماح
+      approved: مصادق عليه
+      disallow: رفض
+      links:
+        allow: السماح بالرابط
+        allow_provider: السماح للناشر
+        disallow: رفض الرابط
+        disallow_provider: عدم السماح للناشر
+        title: الروابط المتداولة
+        usage_comparison: تمت مشاركته %{today} مرات اليوم، مقارنة بـ %{yesterday} بالأمس
+      only_allowed: من سُمِحَ لهم فقط
+      pending_review: في انتظار المراجعة
+      preview_card_providers:
+        title: الناشرون
+      rejected: مرفوض
+      statuses:
+        allow: السماح بالمنشور
+        allow_account: السماح للناشر
+        disallow: رفض المنشور
+        disallow_account: رفض الناشر
+        title: المنشورات المتداولة
+      tags:
+        current_score: التقييم الحالي %{score}
+        dashboard:
+          tag_accounts_measure: استخدامات فريدة
+          tag_languages_dimension: أفضل اللغات
+          tag_servers_dimension: الخوادم الأكثر نشاطا
+          tag_servers_measure: خوادم أخرى
+          tag_uses_measure: إجمالي الاستخدامات
+        listable: يمكن اقتراحه
+        not_listable: لن يتم اقتراحه
+        not_trendable: لن يظهر في المتداولة
+        not_usable: لا يمكن استخدامه
+        peaked_on_and_decaying: بلغ ذروته في %{date}، في تراجع الآن
+        title: الوسوم المتداولة
+        trendable: السماح بالظهور تحت المتداولة
+        trending_rank: 'المتداولة #%{rank}'
+        usable: يمكن استخدامه
+        usage_comparison: تم استخدامه %{today} مرات اليوم، مقارنة بـ %{yesterday} بالأمس
+      title: المتداوَلة
+      trending: المتداولة
     warning_presets:
       add_new: إضافة واحد جديد
       delete: حذف
       edit_preset: تعديل نموذج التحذير
       empty: لم تحدد أي إعدادات تحذير مسبقة بعد.
       title: إدارة نماذج التحذير
+    webhooks:
+      add_new: إضافة نقطة نهاية
+      delete: حذف
+      disable: تعطيل
+      disabled: معطَّل
+      edit: تعديل نقطة النهاية
+      enable: تشغيل
+      enabled: نشِط
+      new: رابط ويب جديد
+      rotate_secret: تغيير الرمز
+      secret: رمز تسجيل الدخول
+      status: الحالة
+      webhook: رابط ويب
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: لحذف منشوراتهم
+        disable: لتجميد حسابهم
+        mark_statuses_as_sensitive: لوضع علامة حساس على منشوراتهم
+        none: لتحذيرهم
+        sensitive: لجعل حسابهم كحساس
+        silence: للحد من حسابهم
+        suspend: لتعليق حسابهم
+      body: 'قام %{target} بالطعن في قرار %{action_taken_by} بتاريخ %{date} وهو كان %{type}. نص الطعن:'
+      next_steps: يمكنك الموافقة على الطعن وبالتالي التراجع عن قرار المشرف، أو يمكنك تجاهل الطعن.
+      subject: قام %{username} بالطعن بقرار المشرفين بخصوص %{instance}
     new_pending_account:
       body: تفاصيل الحساب الجديد أدناه. يمكنك الموافقة على هذا الطلب أو رفضه.
       subject: حساب جديد في انتظار مراجعة على %{instance} (%{username})
@@ -748,9 +843,15 @@ ar:
       body: قام %{reporter} بالإبلاغ عن %{target}
       body_remote: أبلغ شخص ما من %{domain} عن %{target}
       subject: تقرير جديد ل%{instance} (#%{id})
-    new_trending_tag:
-      body: 'الوسم #%{name} متداوَل اليوم، ولكن لم يتم مراجعته من قبل. لن يتم عرضه علنا إلا إذا سمحت بذلك، أو قم بحفظ هذه الإستمارة كما هي حتى تتجاهله مستقبَلًا.'
-      subject: وسم جديد في انتظار المراجعة على %{instance} (#%{name})
+    new_trends:
+      body: 'تحتاج العناصر التالية إلى مراجعة قبل أن يمكن عرضها علناً:'
+      new_trending_links:
+        title: الروابط المتداولة
+      new_trending_statuses:
+        title: المنشورات الشائعة
+      new_trending_tags:
+        no_approved_tags: لا توجد حاليًا هاشات شائعة موافق عليها.
+        title: الوسوم المتداولة
   aliases:
     add_new: أنشئ كُنية
     created_msg: تم إنشاء الكُنية الجديدة بنجاح. يمكنكم الآن الشروع في الإنتقال مِن حسابكم القديم.
@@ -760,7 +861,7 @@ ar:
     remove: إلغاء ربط الكنية
   appearance:
     advanced_web_interface: واجهة الويب المتقدمة
-    advanced_web_interface_hint: 'إذا كنت ترغب في استخدام عرض شاشتك بأكمله، فواجهة الويب المتقدمة تسمح لك بضبط العديد من الأعمدة المختلفة لرؤية أكبر قدر من المعلومات التي ترغب فيها في آن واحد: الخيط الرئيسي والإخطارات والخيط الزمني الفدرالي وأي عدد من القوائم والوسوم.'
+    advanced_web_interface_hint: 'إذا كنت ترغب في استخدام عرض شاشتك بأكمله، فواجهة الويب المتقدمة تسمح لك بضبط العديد من الأعمدة المختلفة لرؤية أكبر قدر من المعلومات التي ترغب فيها في آن واحد: الخيط الرئيسي والإشعارات والخيط الزمني الفدرالي وأي عدد من القوائم والوسوم.'
     animations_and_accessibility: الإتاحة والحركة
     confirmation_dialogs: نوافذ التأكيد
     discovery: الاستكشاف
@@ -769,9 +870,9 @@ ar:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: يمكن للجميع المساهمة.
     sensitive_content: المحتوى الحساس
-    toot_layout: تصميم التبويق
+    toot_layout: شكل المنشور
   application_mailer:
-    notification_preferences: تعديل خيارات البريد الإلكتروني
+    notification_preferences: تعديل تفضيلات البريد الإلكتروني
     salutation: "%{name}،"
     settings: 'تغيير تفضيلات البريد الإلكتروني: %{link}'
     view: 'اعرض:'
@@ -780,16 +881,13 @@ ar:
   applications:
     created: تم إنشاء التطبيق بنجاح
     destroyed: تم حذف التطبيق بنجاح
-    invalid_url: إن الرابط المقدم غير صالح
     regenerate_token: إعادة توليد رمز النفاذ
     token_regenerated: تم إعادة إنشاء الرمز الوصول بنجاح
     warning: كن حذرا مع هذه البيانات. لا تقم أبدا بمشاركتها مع الآخَرين!
     your_token: رمز نفاذك
   auth:
-    apply_for_account: اطلب دعوة
+    apply_for_account: اطلُب حسابًا
     change_password: الكلمة السرية
-    checkbox_agreement_html: أوافق على <a href="%{rules_path}" target="_blank">قواعد الخادم</a> و <a href="%{terms_path}" target="_blank">شروط الخدمة</a>
-    checkbox_agreement_without_rules_html: أوافق على <a href="%{terms_path}" target="_blank">شروط الخدمة</a>
     delete_account: حذف الحساب
     delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك <a href="%{path}">المواصلة هنا</a>. سوف يُطلَبُ منك التأكيد قبل الحذف.
     description:
@@ -802,11 +900,13 @@ ar:
     invalid_reset_password_token: رمز إعادة تعيين كلمة المرور غير صالح أو منتهي الصلاحية. يرجى طلب واحد جديد.
     link_to_otp: أدخل رمز ذو عامِلين من هاتفك أو رمز الاسترجاع
     link_to_webauth: استخدم جهاز مفتاح الأمان الخاص بك
+    log_in_with: الولوج عبر
     login: تسجيل الدخول
     logout: خروج
     migrate_account: الانتقال إلى حساب آخر
     migrate_account_html: إن كنت ترغب في تحويل هذا الحساب نحو حساب آخَر، يُمكِنُك <a href="%{path}">إعداده هنا</a>.
     or_log_in_with: أو قم بتسجيل الدخول بواسطة
+    privacy_policy_agreement_html: لقد قرأتُ وأوافق على سياسة الخصوصية <a href="%{privacy_policy_path}" target="_blank"></a>
     providers:
       cas: CAS
       saml: SAML
@@ -814,20 +914,23 @@ ar:
     registration_closed: لا يقبل %{instance} استقبال أعضاء جدد
     resend_confirmation: إعادة إرسال تعليمات التأكيد
     reset_password: إعادة تعيين كلمة المرور
+    rules:
+      title: بعض القواعد الأساسية.
     security: الأمان
     set_new_password: إدخال كلمة مرور جديدة
     setup:
       email_below_hint_html: إذا كان عنوان البريد الإلكتروني التالي غير صحيح، فيمكنك تغييره هنا واستلام بريد إلكتروني جديد للتأكيد.
       email_settings_hint_html: لقد تم إرسال رسالة بريد إلكترونية للتأكيد إلى %{email}. إن كان عنوان البريد الإلكتروني غير صحيح ، يمكنك تغييره في إعدادات حسابك.
       title: الضبط
+    sign_up:
+      title: دعنا نجهّز %{domain}.
     status:
       account_status: حالة الحساب
       confirming: في انتظار اكتمال تأكيد البريد الإلكتروني.
-      functional: حسابك جاهز.
+      functional: حسابك يعمل بشكل كامل.
       pending: إن طلبك قيد المراجعة من قبل فريقنا. قد يستغرق هذا بعض الوقت. سوف تتلقى بريدا إلكترونيا إذا تمت الموافقة على طلبك.
       redirecting_to: حسابك غير نشط لأنه تم تحويله حاليا إلى %{acct}.
     too_fast: تم إرسال النموذج بسرعة كبيرة، حاول مرة أخرى.
-    trouble_logging_in: هل صادفتكم مشكلة في الولوج؟
     use_security_key: استخدام مفتاح الأمان
   authorize_follow:
     already_following: أنت تتابع بالفعل هذا الحساب
@@ -885,10 +988,31 @@ ar:
       more_details_html: للمزيد مِن التفاصيل ، يرجى الإطلاع على <a href="%{terms_path}">سياسة الخصوصية</a>.
       username_available: سيصبح اسم مستخدمك متوفرا ثانية
       username_unavailable: سيبقى اسم المستخدم الخاص بك غير متوفر
-  directories:
-    directory: سِجلّ الصفحات التعريفية
-    explanation: استكشف مستخدِمين آخرين حسب المواضيع التي تهمهم
-    explore_mastodon: استكشف %{title}
+  disputes:
+    strikes:
+      action_taken: الإجراء المتخذ
+      appeal: طعن
+      appeal_rejected: رُفِض الطعن
+      appeal_submitted_at: طعن أرسِل في
+      appealed_msg: تم تقديم طعنك. إذا تمت الموافقة عليه، سيتم إبلاغك.
+      appeals:
+        submit: تقديم طعن
+      approve_appeal: الموافقة على الطعن
+      associated_report: التقرير المتربط
+      created_at: بتاريخ
+      recipient: موجّه إلى
+      reject_appeal: رفض الطعن
+      status: 'المنشور #%{id}'
+      title: "%{action} في %{date}"
+      title_actions:
+        delete_statuses: إزالة منشور
+        disable: تجميد للحساب
+        none: تحذير
+        silence: الحد من الحساب
+        suspend: تعليق للحساب
+      your_appeal_approved: تمت الموافقة على طعنك
+      your_appeal_pending: لقد قمت بتقديم طعن
+      your_appeal_rejected: تم رفض طعنك
   domain_validator:
     invalid_domain: ليس بإسم نطاق صالح
   errors:
@@ -913,7 +1037,7 @@ ar:
     archive_takeout:
       date: التاريخ
       download: تنزيل نسخة لحسابك
-      hint_html: بإمكانك طلب نسخة كاملة لـ <strong>كافة تبويقاتك و الوسائط التي قمت بنشرها</strong>. البيانات المُصدَّرة ستكون محفوظة على شكل نسق ActivityPub و باستطاعتك قراءتها بأي برنامج يدعم هذا النسق. يُمكنك طلب نسخة كل 7 أيام.
+      hint_html: بإمكانك طلب نسخة كاملة لـ <strong>كافة منشوراتك والوسائط التي قمت بنشرها</strong>. البيانات المُصدَّرة ستكون محفوظة على شكل نسق ActivityPub و باستطاعتك قراءتها بأي برنامج يدعم هذا النسق. يُمكنك طلب نسخة كل 7 أيام.
       in_progress: جارٍ انشاء نسخة لبيانات حسابك…
       request: اطلب نسخة مِن حسابك
       size: الحجم
@@ -933,33 +1057,40 @@ ar:
     contexts:
       account: الملفات التعريفية
       home: الخيط الزمني الرئيسي
-      notifications: الإخطارات
+      notifications: الإشعارات
       public: الخيوط الزمنية العامة
       thread: المحادثات
     edit:
+      add_keyword: إضافة كلمة مفتاحية
+      keywords: الكلمات المفتاحية
+      statuses: المنشورات الفردية
       title: تعديل عامل التصفية
     errors:
       invalid_context: لم تقم بتحديد أي مجال أو أنّ المجال غير صالح
-      invalid_irreversible: إلّا مجالات الإشعارات و الخيط الرئيسي معنية بالتصفية اللارجعية
     index:
       delete: إزالة
       empty: ليست لديك أية عوامل تصفية.
+      expires_in: تنتهي مدة صلاحيتها في غضون %{distance}
+      expires_on: تنتهي مدة صلاحيتها في %{date}
       title: عوامل التصفية
     new:
+      save: حفظ عامل التصفية الجديد
       title: إضافة عامل تصفية جديد
+    statuses:
+      back_to_filter: العودة إلى عامل التصفية
+      index:
+        title: الرسائل المصفّاة
   footer:
-    developers: المطورون
-    more: المزيد…
-    resources: الموارد
     trending_now: المتداولة الآن
   generic:
     all: الكل
     changes_saved_msg: تم حفظ التعديلات بنجاح!
     copy: نسخ
     delete: احذف
-    no_batch_actions_available: ليس هناك أية إجراءات بالجملة على هذه الصفحة
+    none: لا شيء
     order_by: ترتيب بحسب
     save_changes: حفظ التغييرات
+    today: اليوم
     validation_errors:
       few: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
       many: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
@@ -969,26 +1100,6 @@ ar:
       zero: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
   html_validator:
     invalid_markup: 'يحتوي على علامة HTML غير صالحة: %{error}'
-  identity_proofs:
-    active: نشط
-    authorize: نعم ، قم بترخيصه
-    authorize_connection_prompt: هل تريد ترخيص هذا الاتصال المشفّر؟
-    errors:
-      failed: فشل اتصال التشفير. الرجاء المحاولة مرة أخرى من %{provider}.
-      keybase:
-        invalid_token: رموز Keybase هي تجزئة من التوقيعات ويجب أن تكون 66 حرف hex
-        verification_failed: Keybase لا يستطيع التعرف على هذا الرمز كتوقيع لمستخدم Keybase %{kb_username}، الرجاء إعادة المحاولة من Keybase.
-      wrong_user: لا يمكن إنشاء دليل لـ%{proving} أثناء تسجيل الدخول كـ%{current}. قم بتسجيل الدخول كـ%{proving} ثم حاول مرة أخرى.
-    explanation_html: هنا يمكنك أن تربط بشكل مُشفر هوياتك الأُخريات من منصات أخرى مثل Keybase. هذا يتيح للأشخاص الآخرين إرسال رسائل مشفرة إليك على تلك المنصات ويسمح لهم بالثقة في أن المحتوى الذي ترسله لهم يأتي منك أنت.
-    i_am_html: أنا %{username} على %{service}.
-    identity: الهوية
-    inactive: ليس نشطا
-    publicize_checkbox: 'وقم بتبويق هذا:'
-    publicize_toot: 'متحقق منه! أنا %{username} على %{service}: %{url}'
-    remove: احذف الدليل مِن الحساب
-    removed: تم حذف الدليل مِن الحساب بنجاح
-    status: حالة التحقق
-    view_proof: عرض الدليل
   imports:
     errors:
       over_rows_processing_limit: يحتوي على أكثر من %{count} صف
@@ -997,7 +1108,7 @@ ar:
       merge_long: الإبقاء علي التسجيلات الحالية وإضافة الجديدة
       overwrite: إعادة الكتابة
       overwrite_long: استبدال التسجيلات الحالية بالجديدة
-    preface: بإمكانك استيراد بيانات قد قُمتَ بتصديرها مِن مثيل خادوم آخَر، كقوائم المستخدِمين الذين كنتَ تتابِعهم أو قُمتَ بحظرهم.
+    preface: بإمكانك استيراد بيانات قد قُمتَ بتصديرها مِن مثيل خادم آخَر، كقوائم المستخدِمين الذين كنتَ تتابِعهم أو قُمتَ بحظرهم.
     success: تم تحميل بياناتك بنجاح وسيتم معالجتها في الوقت المناسب
     types:
       blocking: قائمة المحظورين
@@ -1006,7 +1117,6 @@ ar:
       following: قائمة المستخدمين المتبوعين
       muting: قائمة الكتم
     upload: تحميل
-  in_memoriam_html: في ذكرى.
   invites:
     delete: تعطيل
     expired: انتهت صلاحيتها
@@ -1028,7 +1138,7 @@ ar:
       two: "%{count} استخدامات"
       zero: "%{count} استخدامات"
     max_uses_prompt: بلا حدود
-    prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادوم هذا
+    prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادم هذا
     table:
       expires_at: تنتهي مدة صلاحيتها في
       uses: عدد الاستخدامات
@@ -1090,25 +1200,9 @@ ar:
     carry_mutes_over_text: انتقل هذا المستخدم من %{acct}، الذي كتَمتَه أنت.
     copy_account_note_text: 'انتقل هذا المستخدم من %{acct}، إليك ملاحظاتك السابقة عنه:'
   notification_mailer:
-    digest:
-      action: معاينة كافة الإشعارات
-      body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في %{since}
-      mention: "%{name} أشار إليك في:"
-      new_followers_summary:
-        few: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
-        many: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
-        one: و لقد تحصّلتَ كذلك على مُتابِع آخَر بينما كنتَ غائبًا! هذا شيء رائع!
-        other: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
-        two: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
-        zero: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
-      subject:
-        few: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-        many: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-        one: "إشعار واحد 1 منذ آخر زيارة لك لـ \U0001F418"
-        other: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-        two: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-        zero: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-      title: أثناء فترة غيابك...
+    admin:
+      sign_up:
+        subject: أنشأ %{name} حسابًا
     favourite:
       body: 'أُعجب %{name} بمنشورك:'
       subject: أُعجِب %{name} بمنشورك
@@ -1135,6 +1229,8 @@ ar:
       title: ترقية جديدة
     status:
       subject: "%{name} نشر للتو"
+    update:
+      subject: قام %{name} بتحرير منشور
   notifications:
     email_events: الأحداث للإشعارات عبر البريد الإلكتروني
     email_events_hint: 'اختر الأحداث التي تريد أن تصِلَك اشعارات عنها:'
@@ -1176,8 +1272,10 @@ ar:
       too_many_options: لا يمكنه أن يحتوي أكثر مِن %{max} عناصر
   preferences:
     other: إعدادات أخرى
-    posting_defaults: التفضيلات الافتراضية لنشر التبويقات
+    posting_defaults: التفضيلات الافتراضية للنشر
     public_timelines: الخيوط الزمنية العامة
+  privacy_policy:
+    title: سياسة الخصوصية
   reactions:
     errors:
       limit_reached: تم بلوغ الحد الأقصى لردود الفعل المختلفة
@@ -1200,25 +1298,14 @@ ar:
     remove_selected_follows: الغي متابعة المستخدمين الذين اخترتهم
     status: حالة الحساب
   remote_follow:
-    acct: قم بإدخال عنوان حسابك username@domain الذي من خلاله تود النشاط
     missing_resource: تعذر العثور على رابط التحويل المطلوب الخاص بحسابك
-    no_account_html: أليس عندك حساب بعدُ ؟ يُمْكنك <a href='%{sign_up_path}' target='_blank'>التسجيل مِن هنا</a>
-    proceed: أكمل المتابعة
-    prompt: 'إنك بصدد متابعة:'
-    reason_html: "<strong>لماذا هذه الخطوة ضرورية؟</strong> <code>%{instance}</code> قد لا يكون هذا الخادم هو الذي سجلت فيه حيابك، لذا نحن بحاجة إلى إعادة توجيهك إلى خادمك الرئيسي أولاً."
-  remote_interaction:
-    favourite:
-      proceed: المواصلة إلى المفضلة
-      prompt: 'ترغب في إضافة هذا التبويق إلى مفضلتك:'
-    reblog:
-      proceed: المواصلة إلى الترقية
-      prompt: 'ترغب في ترقية هذا التبويق:'
-    reply:
-      proceed: المواصلة إلى الرد
-      prompt: 'ترغب في الرد على هذا التبويق:'
+  rss:
+    content_warning: 'تحذير عن المحتوى:'
+    descriptions:
+      account: منشورات للعلن مِن @%{acct}
   scheduled_statuses:
-    over_daily_limit: لقد تجاوزتَ حد الـ %{limit} تبويقات مُبَرمَجة المسموح بها لذلك اليوم
-    over_total_limit: لقد بلغت حد الـ %{limit} مِن التبويقات المبرمَجة
+    over_daily_limit: لقد تجاوزتَ حد الـ %{limit} منشورات مُبَرمَجة مسموح بها اليوم
+    over_total_limit: لقد بلغت حد الـ %{limit} مِن المنشورات المبرمَجة
     too_soon: يجب أن يكون تاريخ البرمجة في المستقبَل
   sessions:
     activity: آخر نشاط
@@ -1239,7 +1326,7 @@ ar:
       phantom_js: فانتوم جي آس
       qq: متصفح كيوكيو
       safari: سفاري
-      uc_browser: متصفح يوسي براوزر
+      uc_browser: متصفح UC Browser
       weibo: وايبو
     current_session: الجلسة الحالية
     description: "%{browser} على %{platform}"
@@ -1248,7 +1335,6 @@ ar:
     platforms:
       adobe_air: أدوبي إيير
       android: أندرويد
-      blackberry: بلاك بيري
       chrome_os: نظام كروم أواس
       firefox_os: نظام فايرفكس أواس
       ios: نظام آي أواس
@@ -1274,7 +1360,6 @@ ar:
     edit_profile: عدّل الصفحة التعريفية
     export: تصدير البيانات
     featured_tags: الوسوم الشائعة
-    identity_proofs: دلائل الهوية
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
@@ -1282,7 +1367,8 @@ ar:
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
-    statuses_cleanup: حذف المنشور الآلي
+    statuses_cleanup: الحذف الآلي للمنشورات
+    strikes: عقوبات الإشراف
     two_factor_authentication: المُصادقة بخُطوَتَيْن
     webauthn_authentication: مفاتيح الأمان
   statuses:
@@ -1311,6 +1397,7 @@ ar:
         zero: "%{count} فيديوهات"
     boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
     content_warning: 'تحذير عن المحتوى: %{warning}'
+    default_language: نفس لغة الواجهة
     disallowed_hashtags:
       few: 'يحتوي على وسوم غير مسموح بها: %{tags}'
       many: 'يحتوي على وسوم غير مسموح بها: %{tags}'
@@ -1318,15 +1405,15 @@ ar:
       other: 'يحتوي على وسوم غير مسموح بها: %{tags}'
       two: 'يحتوي على وسوم غير مسموح بها: %{tags}'
       zero: 'يحتوي على وسوم غير مسموح بها: %{tags}'
+    edited_at_html: عُدّل في %{date}
     errors:
       in_reply_not_found: إنّ المنشور الذي تحاول الرد عليه غير موجود على ما يبدو.
-    language_detection: اكتشاف اللغة تلقائيا
     open_in_web: افتح في الويب
     over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
     pin_errors:
-      limit: لقد بلغت الحد الأقصى للتبويقات المدبسة
-      ownership: لا يمكن تدبيس تبويق نشره شخص آخر
-      private: لا يمكن تدبيس تبويق لم يُنشر للعامة
+      direct: لا يمكن تثبيت المنشورات التي يراها فقط المتسخدمون المشار إليهم
+      limit: لقد بلغت الحد الأقصى للمنشورات المثبتة
+      ownership: لا يمكن تثبيت منشور نشره شخص آخر
       reblog: لا يمكن تثبيت ترقية
     poll:
       total_people:
@@ -1364,7 +1451,7 @@ ar:
     exceptions: الاستثناءات
     explanation: لأن حذف المشاركات عملية مكلفة، يتم ذلك ببطء مع مرور الوقت عندما يكون الخادم غير مشغول. لهذا السبب، يمكن حذف مشاركاتك بعد فترة من بلوغها عتبة السن.
     ignore_favs: تجاهل المفضلة
-    ignore_reblogs: تجاهل التعزيزات
+    ignore_reblogs: تجاهل المشاركات
     interaction_exceptions: الاستثناءات المبنية على التفاعلات
     interaction_exceptions_explanation: لاحظ أنه لا يوجد ضمان لحذف الوظائف إذا كانت أقل من عتبة التعزيز المفضلة بعد أن تكون قد ذهبت إليها.
     keep_direct: الاحتفاظ بالرسائل المباشرة
@@ -1385,103 +1472,23 @@ ar:
       '2629746': شهر واحد
       '31556952': سنة واحدة
       '5259492': شهران
-      '63113904': أسبوعان
+      '604800': أسبوع
+      '63113904': سنتان
       '7889238': 3 أشهر
     min_age_label: عتبة العمر
     min_favs: إبقاء المشاركات المفضلة أكثر من
     min_favs_hint: لم تقوم بحذف أي من المشاركات الخاصة بك التي حصلت على أكثر من هذه الكمية من المفضلة. اتركه فارغاً لحذف المشاركات بغض النظر عن عدد المفضلات لديها
     min_reblogs: إبقاء المشاركات المعززة أكثر من
-    min_reblogs_hint: لم تقم بحذف أي من مشاركاتك التي تم تعزيزها أكثر من هذا العدد من المرات. اتركه فارغاً لحذف المشاركات بغض النظر عن عدد تعزيزاتها
+    min_reblogs_hint: لن تُحذف أي من منشوراتك التي أعيد مشاركتها أكثر من هذا العدد من المرات. اتركه فارغاً لحذف المنشورات بغض النظر عن عدد إعادات المشاركة
   stream_entries:
-    pinned: تبويق مثبّت
-    reblogged: رقّاه
+    pinned: منشور مثبّت
+    reblogged: شارَكَه
     sensitive_content: محتوى حساس
+  strikes:
+    errors:
+      too_late: فات الأوان للطعن في هذه العقوبة
   tags:
     does_not_match_previous_name: لا يطابق الإسم السابق
-  terms:
-    body_html: |
-      <h2>سياسة الخصوصية</h2>
-      <h3 id="collect">ما هي المعلومات التي نجمعها؟</h3>
-      <ul>
-      <li><em>معلومات الحساب الأساسية</em>: إذا سجلت على هذا الخادم، فسيُطلب منك أن تُدخل اسم المستخدم، عنوان بريد إلكتروني، وكلمة سر، وتستطيع أن تُدخل معلومات تعريفية إضافية مثل اسم معروض، وسيرة ذاتية، وصورة رمزية، وصورة رأسية. اسم المستخدم، والاسم المعروض، والسيرة الذاتية، والصورة الرمزية، والصورة الرأسية سيكونون ظاهرين بشكل علني للجميع دائماً.</li>
-      <li><em>المنشورات، المتابَعون، ومعلومات علنية أخرى</em>: قائمة الأشخاص الذين تُتابِعُهم علنية للجميع، نفس الشيء مع قائمة متابِعيك. عندما تُرسل رسالة، يتم تخزين التاريخ والوقت واسم البرنامج المنَشور منه. يُمكن للرسائل أن تحتوي على وسائط مُرفقة مثل الصور ومقاطع الفيديو. المنشورات العامة والغير مُدرجة متوفرات بشكل علني. عندما تُميّز منشور على ملفك الشخصي، فهذه أيضاً معلومات متوفرة بشكل علني. يتم تسليم منشوراتك إلى متابِعيك، في بعض الأحيان، يتم تسليمهم إلى خوادم مختلفة ويتم نسخهم وحفظهم هناك. عندما تحذف منشور معيّن، يتم تسليم هذه المعلومة على نفس المنوال إلى متابِعيك أيضاً، إعادة النشر والإعجاب بمنشور معيّن هما أضاً تصرفات علنية دائماً.</li>
-      <li><em>المنشورات المباشرة ومنشورات المتابِعين فقط</em>: تُخزّن وتُعالج كل المنشورات على الخادم. يتم تسليم "منشورات المتابعين فقط" إلى متابِعيك والأشخاص المذكورين في المنشور، ويتم تسليم المنشورات المباشرة إلى الأشخاص المذكورين في المنشور فقط لا غير. في بعض الأحيان يتم تسليمهم إلى خوادم مختلفة ويتم حفظ نُسخ منهم هناك. نحن نبذل جهداً حسن النية للحد من إمكانية وصول المنشورات إلى الأشخاص المُصرّح لهم فقط، ولكن قد تفشل الخوادم الأخرى في القيام بذلك، لذلك من المهم أن تُراجِع الخوادم التي ينتمي إليها متابِعوك. تستطيع أن تُصحّح في الإعدادات على خيار "الموافقة أو الرفض اليدوي" للمتابِعين الجدد. <em>ضع في الحسبان أنه من الممكن أن يقرأ أيُّ أحد من الخوادم هذه الرسائل أو المنشورات</em>، ومن الممكن أن يلتقط المُستقبِلون لقطات شاشة أو أن ينسخوا أو يعيدوا مشاركتهم بطريقة أخرى، لذلك <em>لا تنشر أي معلومات خطرة على ماستدون.</em></li>
-
-      <li><em>عناوين الـIP وبيانات وصفية أخرى</em>: عندما تُسجل دخولك، نقوم بتسجيل عنوان الـIP الذي دخلت منه، وأيضاً اسم المتصفح الذي دخلت منه، كل عناوين الـIP لتسجيلات الدخول متاحة لك للمراجعة وللإبطال في الإعدادات. يبقى آخر عنوان IP مُسجل لما يصل إلى 12 شهراً. ومن الممكن أن نحتفظ بسجلات الخادم التي تحتوي على عنوان الـIP من كل طلب وصول إلى خادمنا.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">بماذا نستعمل معلوماتك؟</h3>
-
-      <p>أي معلومات نجمعها عنك قَد تُستخدم بالطرق التالية:</p>
-
-      <ul>
-      <li>لتوفير الوظائف الأساسية لماستدون، تستطيع أن تتفاعل مع محتوى الآخرين وأن تنشر محتواك الخاص عندما تُسجل دخولك. كمثال، تستطيع أن تُتابِع حسابات أشخاص آخرين لعرض منشوراتهم المُجمّعة في خطك الزمني الشخصي الرئيسي.</li>
-      <li>للمساعدة في اعتدال المجتمع. كمثال، مقارنة عنوان الـIP الخاص بك بعناوين IP أخرى معروفة لمعرفة ما إذا ثمة هناك أي تهرب من الحظر أو انتهاكات أخرى.</li>
-      <li>يمكن أن يُستعمل عنوان بريدك الإلكتروني الذي أدخلته لإرسال معلومات إليك، أو إشعارات عن تفاعل أشخاص آخرين مع محتواك أو إرسالهم راسائل إليك، أو للرد على استفسارات، و/أو طلبات أو أسئلة أخرى.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">كيف نحمي معلوماتك؟</h3>
-
-      <p>نقوم بتنفيذ مجموعة متنوعة من التدابير الأمنية للحفاظ على سلامة معلوماتك الشخصية عندما تدخلها، أو ترسلها، أو تقوم بالوصول إليها. بجاني أشياء أخرى، تؤَمن جلسة المتصفح الخاص بك، وحركة المرور بين تطبيقاتك والـAPI (واجهة برمجة التطبيقات) باستخدام SSL (بروتوكول طبقة المقابس الآمنة)، وتُهَش أو بالأحرى تُجَزأ كلمة السر الخاصة بك باستخدام خوارزمية أحادية الاتجاه، يمكنك تفعيل خاصّية "الاستيثاق بخطوتين" لتؤَمن وتُصعب إمكانية الوصول إلى حسابك أكثر.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">ما هي سياسة الاحتفاظ بالبيانات لدينا؟</h3>
-
-      <p>سنبذل جهداً حسن النية لـ:</p>
-
-      <ul>
-      <li>حفظ سجلّات بيانات الخوادم التي تحتوي على عنوان الـIP من كل طلب وصول إلى خادمنا، بقدر ما يتم الاحتفاظ بهذه السجلات، لا تزيد عن 90 يومًا.</li>
-      <li>الاحتفاظ بعناوين الـIP المربوطة بالمُستخدمين المُسجلين دخولهم لمدة لا تزيد عن 12 شهراً.</li>
-      </ul>
-
-      <p>تستطيع أن تطلب وتُنزل أرشيف لمحتواك، الذي يحتوي على منشوراتك، ووسائطك المُرفقة، وصورك الرمزية، وصورك الرأسية.</p>
-
-      <p>تستطيع أن تحذف حسابك بشكل لا رجعة فيه في أي وقت تريد.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">هل نستخدم الـCookies (ملفات تعريف الارتباط)؟</h3>
-
-      <p>نعم، الـcookies هي عبارة عن قطعة نصية صغيرة مخزنة على قرص حاسوبك من قبل متصفحك (إذا سمحت له). تسمح هذه الـcookies للموقع بأن يتعرف على متصفحك، وإذا كنت قد سجلت دخولك إلى حسابك، فسيربطه بحسابك المسجل.</p>
-
-      <p>نستعمل الـcookies لفهم ولحفظ تفضيلاتك للزيارات المستقبلية</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">هل نُفصح عن أي معلومات لأطراف خارجية؟</h3>
-
-      <p>نحن لا نبيع، أو نتاجر، أو بأي طريقة أخرى نُحول بياناتك التعريفية الشخصية إلى جهات خارجية. طبعاً هذا الكلام لا ينطبق على الجهات الموثوقة التي تساعدنا في تشغيل موقعنا، أو في إجراء أعمالنا، أو في خدمتك طالما أنهم يوافقون على الحفاظ على سرّيتها. ومن الممكن أن نُطلق أو أن نُصرّح بمعلوماتك عندما نؤمِن بأن هذا هو التصرّف الصحيح للامتثال للقانون، أو لتطبيق سياسة موقعنا، أو لحفظ الحقوق، أو الأملاك، أو الأمان الخاص بنا أو بغيرنا.</p>
-
-      <p>من الممكن أن يُنزل محتواك من قبل خوادم أخرى في الشبكة، يتم تسليم منشوراتك "العامة" ومنشورات "المتابعين فقط" إلى الخوادم التي يقيم فيها متابِعوك، وتُسلم الرسائل المباشرة إلى خوادم التي يُقيم فيها المُستقبلون، طالما أن هؤلاء المتابِعين أو المُستلمين يقيمون في خوادم مختلفة عن هذا الخادم.</p>
-
-      <p>عندما تخوّل تطبيق معين لاستخدام حسابك، وطبعاً على حسب نطاق الأذونات التي سمحت له بها، فيستطيع هذا التطبيق الوصول إلى معلومات ملفك التعريفي العامة، قائمة المتابَعون منك، قائمة المتابِعون لك، كل منشوراتك، وكل إعجاباتك. لا يمكن للتطبيقات الوصول إلى عنوان بريدك الإلكتروني أو إلى كلمة مرورك.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">استخدام الأطفال للموقع</h3>
-
-      <p>إذا كان هذا الخادم في الـEU (الإتحاد الأوروبي) أو في الـEEA (المنطقة الاقتصادية الأوروبية): فموقعنا، ومنتجاتنا وخدماتنا كلها موجهة للأشخاص الذين لا تقل أعمارهم عن الـ16 سنة، إذا كنت تحت هذا السن، حسب متطلبات الـ<a href="https://ar.wikipedia.org/wiki/%D8%A7%D9%84%D9%86%D8%B8%D8%A7%D9%85_%D8%A7%D9%84%D8%A3%D9%88%D8%B1%D9%88%D8%A8%D9%8A_%D8%A7%D9%84%D8%B9%D8%A7%D9%85_%D9%84%D8%AD%D9%85%D8%A7%D9%8A%D8%A9_%D8%A7%D9%84%D8%A8%D9%8A%D8%A7%D9%86%D8%A7%D8%AA">GDPR</a> (النظام الأوروبي العام لحماية البيانات) فلا تستخدم هذا الموقع.</p>
-
-
-      <p>إذا كان هذا السيرفر في الـUS (الولايات المتحدة الأمريكية): فموقعنا، ومنتجاتنا وخدماتنا كلها موجهة للأشخاص الذين لا تقل أعمارهم عن الـ13 سنة، إذا كنت تحت هذا السن، حسب متطلبات الـ<a href="https://ar.wikipedia.org/wiki/%D9%82%D8%A7%D9%86%D9%88%D9%86_%D8%AD%D9%85%D8%A7%D9%8A%D8%A9_%D8%AE%D8%B5%D9%88%D8%B5%D9%8A%D8%A9_%D8%A7%D9%84%D8%A3%D8%B7%D9%81%D8%A7%D9%84_%D8%B9%D9%84%D9%89_%D8%A7%D9%84%D8%A5%D9%86%D8%AA%D8%B1%D9%86%D8%AA">COPPA</a> (قانون حماية خصوصية الأطفال على الإنترنت) فلا تستخدم هذا الموقع.</p>
-
-      <p>من الممكن أن تكون المتطلبات القانونية مختلفة إذا كان هذا الخادم في ولاية قضائية أخرى.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">تغييرات لسياستنا للخصوصية</h3>
-
-      <p>إذا قررنا أن نغير سياستنا للخصوصية، فسنَنشر هذه التغييرات على هذه الصفحة.</p>
-
-      <p>هذه الوثيقة هي CC-BY-SA (النسبة-الترخيص بالمثل)، تم آخر تحديث لها في 7 مارس، 2018.</p>
-
-      <p>مقتبسة في الأصل من <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: شروط الخدمة وسياسة الخصوصية على %{instance}
   themes:
     contrast: ماستدون (تباين عالٍ)
     default: ماستدون (داكن)
@@ -1490,6 +1497,7 @@ ar:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: إضافة
     disable: تعطيل
@@ -1506,65 +1514,63 @@ ar:
     recovery_instructions_html: إن فقدت الوصول إلى هاتفك، يمكنك استخدام أحد رموز الاسترداد أدناه لاستعادة الوصول إلى حسابك. <strong>حافظ على رموز الاسترداد بأمان</strong>. يمكنك ، على سبيل المثال ، طباعتها وتخزينها مع مستندات أخرى هامة.
     webauthn: مفاتيح الأمان
   user_mailer:
+    appeal_approved:
+      action: انتقل إلى حسابك
+      subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
+      title: تم قبول طعنك
+    appeal_rejected:
+      subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
+      title: رُفض الاستئناف
     backup_ready:
       explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
       subject: نسخة بيانات حسابك جاهزة للتنزيل
       title: المغادرة بأرشيف الحساب
-    sign_in_token:
-      details: 'وفيما يلي تفاصيل المحاولة:'
-      explanation: 'اكتشفنا محاولة لتسجيل الدخول إلى حسابك من عنوان IP غير معروف. إذا كان هذا أنت ، يرجى إدخال رمز الأمان أدناه في صفحة تحدي تسجيل الدخول:'
-      further_actions: 'إذا لم يكن ذلك صادر منك، يرجى تغيير كلمتك السرية وتنشيط المصادقة الثنائية في حسابك. يمكنك القيام بذلك هنا:'
-      subject: الرجاء تأكيد محاولة الولوج
-      title: محاولة الولوج
+    suspicious_sign_in:
+      change_password: غيّر كلمتك السرية
+      details: 'فيما يلي تفاصيل تسجيل الدخول:'
+      explanation: لقد اكتشفنا تسجيل دخول إلى حسابك من عنوان IP جديد.
+      subject: تم النفاذ عبر حسابك من خلال عنوان إيبي جديد
+      title: تسجيل دخول جديد
     warning:
+      appeal: تقديم طعن
+      appeal_description: إذا كنت تعتقد أن هذا خطأ، يمكنك تقديم طعن إلى فريق %{instance}.
+      categories:
+        spam: مزعج
+        violation: ينتهك المحتوى المبادئ التوجيهية التالية للمجتمع
       explanation:
-        disable: عندما يتم تجميد حسابك، تظل بيانات حسابك سليمة، ولكن لا يمكنك تنفيذ أي إجراءات حتى يتم فتحه.
-        sensitive: سيتم التعامل مع ملفات الوسائط المحملة والوسائط المرتبطة لديك على أنها حساسة.
-        silence: في حين أن حسابك محدود، فإن الأشخاص الذين يتبعونك بالفعل سيشاهدون تبويقاتك على هذا الخادم، وقد يتم استثناؤك من قوائم عامة مختلفة. ومع ذلك، قد يمكن للآخرين متابعتك يدويا.
-        suspend: تم إيقاف حسابك بشكل دائم، وتم إزالة كافة تبويقاتك وملفات الوسائط التي تم تحميلها بشكل لا رجعة فيه من هذا الخادم، و كذا على الخوادم حيث كان لديك فيها متابِعون.
-      get_in_touch: يمكنك الرد على هذا البريد الإلكتروني للاتصال بفريق %{instance}.
-      review_server_policies: مراجعة شروط السيرفر
-      statuses: 'خصيصا لـ:'
+        delete_statuses: لوحظ أنّ بعض منشوراتك تخالف واحدة أو أكثر من المبادئ التوجيهية للمجتمع وقد تم إزالتها إثر ذلك من قِبل مشرفي %{instance}.
+        disable: تم إيقاف حسابك، لكن ملفك الشخصي وكافة بياناتك لا زالت سليمة. يمكنك طلب نسخة احتياطية من بياناتك وتغيير إعدادات حسابك أو حذفه.
+        sensitive: من الآن فصاعدا، سيتم وضع علامة على جميع ملفات الوسائط التي يتم تحميلها على أنها حساسة وستكون مخفية خلف تحذير يُنقر.
+        silence: لا يزال بإمكانك استخدام حسابك ولكن فقط الأشخاص الذين يتابعونك فقط يمكنهم رؤية منشوراتك على هذا الخادم، وقد يتم استبعادك من ميزات الاكتشاف المختلفة. قد يتبعك آخرون على كل حال يدوياً.
+        suspend: لم يعد بإمكانك استخدام حسابك، والوصول إلى ملفك الشخصي والبيانات الأخرى. لا يزال بإمكانك تسجيل الدخول لطلب نسخة احتياطية من بياناتك حتى تتم إزالة البيانات بالكامل في غضون 30 يوما. ولكننا سنحتفظ ببعض البيانات الأساسية لمنعك من التهرب من عقوبة تعليق الحساب.
+      reason: 'السبب:'
+      statuses: 'المنشورات المذكورة:'
       subject:
+        delete_statuses: تم إزالة منشوراتك على %{acct}
         disable: تم تجميد حسابك %{acct}
         none: تحذير إلى %{acct}
-        sensitive: تم وضع علامة حساسة على وسائط منشورات حسابك %{acct}
         silence: إنّ حسابك %{acct} محدود
         suspend: لقد تم تعليق حسابك %{acct}
       title:
+        delete_statuses: منشورات محذوفة
         disable: الحساب مُجمَّد
         none: تحذير
-        sensitive: تم وضع علامة حساسة على الوسائط الخاصة بك
         silence: الحساب محدود
         suspend: الحساب مُعلَّق
     welcome:
       edit_profile_action: تهيئة الملف التعريفي
-      edit_profile_step: يُمكنك·كي تخصيص صفحتك التعريفية عن طريق تحميل صورة رمزية ورأسية و بتعديل اسمك·كي العلني وأكثر. و إن أردت·تي معاينة المتابِعين و المتابعات الجُدد قبيل السماح لهم·ن بمتابَعتك فيمكنك·كي تأمين حسابك·كي.
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
       final_action: اشرَع في النشر
-      final_step: |-
-        يمكنك الشروع في النشر في الحين! حتى و إن لم كنت لا تمتلك متابِعين بعدُ، يمكن للآخرين الإطلاع على منشوراتك الموجهة للجمهور على الخيط العام المحلي أو إن قمت باستخدام وسوم.
-        ابدأ بتقديم نفسك باستعمال وسم #introductions.
       full_handle: عنوانك الكامل
       full_handle_hint: هذا هو ما يجب تقديمه لأصدقائك قصد أن يكون بإمكانهم متابَعتك أو مُراسَلتك حتى و إن كانت حساباتهم على خوادم أخرى.
-      review_preferences_action: تعديل التفضيلات
-      review_preferences_step: تأكد من ضبط تفضيلاتك ، مثلًا أية رسائل بريد إلكترونية ترغب في تلقيها أو أي مستوى للخصوصية ترغب في اسناده افتراضيًا لمنشوراتك. إن كانت الحركة لا تُعكّر مزاجك فيمكنك إختيار تفعيل التشغيل التلقائي لوسائط GIF المتحركة.
       subject: أهلًا بك على ماستدون
-      tip_federated_timeline: الخيط الزمني الفديرالي هو بمثابة شبه نظرة شاملة على شبكة ماستدون. غير أنه لا يشمل إلا على الأشخاص المتابَعين مِن طرف جيرانك و جاراتك، لذا فهذا الخيط لا يعكس كافة الشبكة برُمّتها.
-      tip_following: أنت تتبع تلقائيا مديري و مديرات الخادم. للعثور على أشخاص مميزين أو قد تهمك حساباتهم بإمكانك الإطلاع على الخيوط العامة المحلية و كذا الفدرالية.
-      tip_local_timeline: الخيط العام المحلي هو بمثابة نظرة سريعة على الأشخاص المتواجدين على %{instance} يمكن اعتبارهم كجيرانك وجاراتك الأقرب إليك!
-      tip_mobile_webapp: إن كان متصفحك على جهازك المحمول يُتيح ميزة إضافة Mastodon على شاشتك الرئيسية ، فيمكنك تلقي الإشعارات المدفوعة. إنه يعمل كتطبيق أصلي بحت!
-      tips: نصائح
       title: أهلاً بك، %{name}!
   users:
     follow_limit_reached: لا يمكنك متابعة أكثر مِن %{limit} أشخاص
-    generic_access_help_html: صادفت مشكلة في الوصول إلى حسابك؟ اتصل بـ %{email} للحصول على المساعدة
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
-    invalid_sign_in_token: رمز الآمان غير صحيح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
-    suspicious_sign_in_confirmation: يبدو أنك لم تقم بتسجيل الدخول عبر هذا الجهاز من قبل، ولم تقم بتسجيل الدخول لفترة منذ مدة، لذلك نقوم بإرسال رمز الأمان إلى عنوان بريدك الإلكتروني للتأكد من أنه أنت من قام بالطلب.
   verification:
     explanation_html: 'يمكنك <strong>التحقق من نفسك كمالك لروابط البيانات التعريفية على صفحتك الشخصية</strong>. لذلك، يجب أن يحتوي الموقع المقترِن على رابط إلى صفحتك التعريفية الشخصية على ماستدون. الرابط الخلفي <strong>يجب أن</strong> يحتوي على رمز <code>rel="me"</code>. محتوى النص في الرابط غير مهم. على سبيل المثال:'
     verification: التحقق
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d0a8b3d34..53e806b60 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1,261 +1,529 @@
 ---
 ast:
   about:
-    about_hashtag_html: Estos son los barritos públicos etiquetaos con <strong>#%{hashtag}</strong>. Pues interactuar con ellos si tienes una cuenta en cualesquier parte del fediversu.
-    about_mastodon_html: 'La rede social del futuru: ¡ensin anuncios nin vixilancia, con un diseñu éticu y descentralizáu! Controla los tos datos con Mastodon.'
-    about_this: Tocante a
-    administered_by: 'Alministráu por:'
-    apps: Aplicaciones pa móviles
-    apps_platforms: Usa Mastodon dende Android, iOS y otres plataformes
-    contact: Contautu
-    contact_missing: Nun s'afitó
+    about_mastodon_html: 'La rede social del futuru: ¡ensin anuncios nin vixilancia, con un diseñu éticu ya descentralizáu! Controla los tos datos con Mastodon.'
     contact_unavailable: N/D
-    discover_users: Usuarios nuevos
-    documentation: Documentación
-    federation_hint_html: Con una cuenta en %{instance} vas ser a siguir a persones de cualesquier sirvidor de Mastodon y más.
-    get_apps: En preseos móviles
-    hosted_on: Mastodon ta agospiáu en %{domain}
-    learn_more: Deprender más
-    privacy_policy: Política de privacidá
-    server_stats: 'Estadístiques del sirvidor:'
-    source_code: Códigu fonte
-    status_count_after:
-      one: estáu
-      other: estaos
-    status_count_before: Que crearon
-    tagline: Sigui a persones y conoz a más
-    terms: Términos del serviciu
-    unavailable_content_description:
-      domain: Sirvidor
-      reason: Razón
-    user_count_after:
-      one: usuariu
-      other: usuarios
-    user_count_before: Ye'l llar de
-    what_is_mastodon: "¿Qué ye Mastodon?"
+    hosted_on: 'Mastodon ta agospiáu en: %{domain}'
+    title: Tocante a
   accounts:
-    featured_tags_hint: Pues destacar etiquetes específiques que van amosase equí.
-    followers:
-      one: Siguidor
-      other: Siguidores
-    joined: Xunióse en %{date}
-    moved_html: "%{name} mudóse a %{new_profile_link}:"
-    network_hidden: Esta información nun ta disponible
-    never_active: Enxamás
+    last_active: Última actividá
     nothing_here: "¡Equí nun hai nada!"
-    people_followed_by: Persones a les que sigue %{name}
-    people_who_follow: Persones que siguen a %{name}
     posts:
-      one: Barritu
-      other: Barritos
-    posts_tab_heading: Barritos
-    posts_with_replies: Barritos y rempuestes
-    roles:
-      bot: Robó
+      one: Artículu
+      other: Artículos
+    posts_tab_heading: Artículos
   admin:
+    account_actions:
+      action: Facer l'aición
+    account_moderation_notes:
+      create: Dexar la nota
     accounts:
-      approve_all: Aprobar too
-      are_you_sure: "¿De xuru?"
+      avatar: Avatar
       by_domain: Dominiu
+      disabled: Conxelóse
+      display_name: Nome visible
       domain: Dominiu
-      email: Corréu
+      email: Direición de corréu electrónicu
       followers: Siguidores
+      header: Testera
+      ip: IP
+      joined: Data de xunión
       location:
         local: Llocal
-        title: Allugamientu
+        remote: Remotu
+        title: Llugar
+      moderation:
+        pending: Pendiente
+      most_recent_activity: L'actividá más recién
+      most_recent_ip: La IP más recién
+      perform_full_suspension: Suspender
       protocol: Protocolu
-      reject: Refugar
-      reject_all: Refugar too
       resend_confirmation:
-        already_confirmed: Esti usuariu yá ta confirmáu
-        send: Reunviar les instrucciones
-      role: Permisos
-      roles:
-        admin: Alministrador
-        moderator: Llendador
-        user: Usuariu
-      statuses: Estaos
-      time_in_queue: Esperando na cola %{time}
+        already_confirmed: Esti perfil xá ta confirmáu
+        send: Volver unviar el mensaxe de confirmación
+      role: Rol
+      search: Buscar
+      search_same_email_domain: Otros perfiles col mesmu dominiu de corréu electrónicu
+      search_same_ip: Otros perfiles cola mesma IP
+      show:
+        created_reports: Informes fechos
+      statuses: Artículos
+      suspend: Suspender
       title: Cuentes
       username: Nome d'usuariu
+      web: Web
+    action_logs:
+      actions:
+        approve_user_html: "%{name} aprobó'l rexistru de: %{target}"
+        change_email_user_html: "%{name} camudó la direición de corréu electrónicu del perfil %{target}"
+        change_role_user_html: "%{name} camudó'l rol de: %{target}"
+        confirm_user_html: "%{name} confirmó la direición de corréu electrónicu del perfil %{target}"
+        create_account_warning_html: "%{name} unvió una alvertencia a %{target}"
+        create_announcement_html: "%{name} creó l'anunciu «%{target}»"
+        create_domain_allow_html: "%{name} permitió la federación col dominiu %{target}"
+        create_domain_block_html: "%{name} bloquió'l dominiu %{target}"
+        create_user_role_html: "%{name} creó'l rol «%{target}»"
+        destroy_announcement_html: "%{name} desanició l'anunciu «%{target}»"
+        destroy_custom_emoji_html: "%{name} desanició'l fustaxe %{target}"
+        destroy_domain_block_html: "%{name} desbloquió'l dominiu %{target}"
+        destroy_status_html: "%{name} quitó l'artículu de: %{target}"
+        destroy_user_role_html: "%{name} desanició'l rol %{target}"
+        disable_custom_emoji_html: "%{name} desactivó'l fustaxe «%{target}»"
+        enable_custom_emoji_html: "%{name} activó'l fustaxe «%{target}»"
+        reject_user_html: "%{name} refugó'l rexistru de: %{target}"
+        remove_avatar_user_html: "%{name} quitó l'avatar de: %{target}"
+        update_announcement_html: "%{name} anovó l'anunciu «%{target}»"
+        update_custom_emoji_html: "%{name} anovó'l fustaxe «%{target}»"
+        update_status_html: "%{name} anovó l'artículu de: %{target}"
+        update_user_role_html: "%{name} camudó'l rol %{target}"
+      empty: Nun s'atopó nengún rexistru.
     announcements:
-      destroyed_msg: "¡L'anunciu desanicióse con ésitu!"
+      destroyed_msg: "¡L'anunciu desanicióse correutamente!"
+      edit:
+        title: Edición d'un anunciu
+      empty: Nun s'atopó nengún anunciu.
+      live: En direuto
       new:
+        create: Crear l'anunciu
         title: Anunciu nuevu
-      published_msg: "¡L'anunciu espublizóse con ésitu!"
+      publish: Espublizar
+      published_msg: "¡L'anunciu espublizóse correutamente!"
+      scheduled_msg: "¡Programóse l'espublizamientu del anunciu!"
       title: Anuncios
+      unpublish: Dexar d'espublizar
+      unpublished_msg: "¡L'anunciu dexó d'espublizase correutamente!"
+      updated_msg: "¡L'anunciu anovóse correutamente!"
     custom_emojis:
       by_domain: Dominiu
-      copy_failed_msg: Nun pudo facese una copia llocal d'esi fustaxe
+      copy: Copiar
+      copy_failed_msg: Nun se pudo facer una copia llocal d'esi fustaxe
+      created_msg: "¡El fustaxe creóse correutamente!"
+      delete: Desaniciar
+      disable: Desactivar
+      disabled: Desactivóse
       emoji: Fustaxe
-      update_failed_msg: Nun pudo anovase esi fustaxe
+      enable: Activar
+      enabled: Activóse
+      list: Llistar
+      no_emoji_selected: Nun camudó nengún fustaxe darréu que nun se seleicionó nengún
+      not_permitted: Nun tienes permisu pa facer esta aición
+      shortcode: Códigu curtiu
+      shortcode_hint: De 2 caráuteres como muncho, namás caráuteres alfanumbéricos ya guiones baxos
+      title: Fustaxes personalizaos
+      uncategorized: Ensin categoría
+      update_failed_msg: Nun se pudo anovar esi fustaxe
+      updated_msg: "¡El fustaxe anovóse correutamente!"
+      upload: Xubir
+    dashboard:
+      active_users: perfiles n'activo
+      interactions: interaiciones
+      media_storage: Almacenamientu multimedia
+      new_users: perfiles nuevos
+      opened_reports: informes abiertos
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apellación pendiente"
+        other: "<strong>%{count}</strong> apellaciones pendientes"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> informe pendiente"
+        other: "<strong>%{count}</strong> informes pendientes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> etiqueta pendiente"
+        other: "<strong>%{count}</strong> etiquetes pendientes"
+      pending_users_html:
+        one: "<strong>%{count}</strong> perfil pendiente"
+        other: "<strong>%{count}</strong> perfiles pendientes"
+      resolved_reports: informes resueltos
+      software: Software
+      space: Usu del espaciu
+      title: Panel
+      top_languages: Les llingües más actives
+      website: Sitiu web
+    disputes:
+      appeals:
+        empty: Nun s'atopó nenguna apellación.
+        title: Apellaciones
     domain_blocks:
       domain: Dominiu
+      new:
+        severity:
+          suspend: Suspender
+      not_permitted: Nun tienes permisu pa facer esta aición
+      private_comment: Comentariu priváu
+      public_comment: Comentariu públicu
     email_domain_blocks:
+      dns:
+        types:
+          mx: Rexistru MX
       domain: Dominiu
+    export_domain_allows:
+      no_file: Nun se seleicionó nengún ficheru
+    follow_recommendations:
+      language: Pa la llingua
     instances:
+      availability:
+        no_failures_recorded: Nun se rexistró nengún fallu.
+        title: Disponibilidá
       by_domain: Dominiu
+      content_policies:
+        comment: Nota interna
+        policies:
+          suspend: Suspender
+        policy: Política
+        reason: Motivu públicu
+      empty: Nun s'atopó nengún dominiu.
+      known_accounts:
+        one: "%{count} cuenta conocida"
+        other: "%{count} cuentes conocíes"
+      private_comment: Comentariu priváu
+      public_comment: Comentariu públicu
       title: Federación
-    invites:
-      filter:
-        available: Disponible
-        expired: Caducó
-      title: Invitaciones
-    pending_accounts:
-      title: Cuentes pendientes (%{count})
+    ip_blocks:
+      expires_in:
+        '1209600': 2 selmanes
+        '15778476': 6 meses
+        '2629746': 1 mes
+        '31556952': 1 añu
+        '86400': 1 día
+        '94670856': 3 años
+    relationships:
+      title: 'Rellaciones de: %{acct}'
     relays:
-      save_and_enable: Guardar y activar
       status: Estáu
     reports:
       account:
-        reports:
-          one: "%{count} informe"
-          other: "%{count} informes"
-      are_you_sure: "¿De xuru?"
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notes"
+      actions_description_html: Decidi qué aición tomar pa resolver esti informe. Si tomes una aición punitiva escontra la cuenta de la que s'informó, va unviase un avisu per corréu electrónicu a esa cuenta, esceuto cuando se seleiciona la categoría <strong>Puxarra</strong>.
+      add_to_report: Amestar más al informe
+      category: Categoría
+      category_description_html: El motivu pol que s'informó d'esta cuenta y/o conteníu cítase na comunicación cola cuenta de la que s'informó
+      comment_description_html: 'Pa fornir más información, %{name} escribió:'
+      created_at: Data del informe
+      delete_and_resolve: Desaniciar los artículos
+      mark_as_resolved: Marcar como resueltu
+      mark_as_sensitive: Marcar como sensible
+      mark_as_unresolved: Marcar como ensin resolver
+      no_one_assigned: Naide
+      notes:
+        create: Amestar la nota
+        create_and_resolve: Resolver con una nota
+        title: Notes
+      quick_actions_description_html: 'Toma una aición rápida o baxa pa ver el conteníu del que s''informó:'
+      report: 'Informe #%{id}'
+      reported_by: Perfil qu'informó
+      resolved_msg: "¡L'informe resolvióse correutamente!"
+      skip_to_actions: Saltar a les aiciones
       status: Estáu
+      statuses: Conteníu del que s'informó
+      statuses_description_html: El conteníu ofensivu cítase na comunicación cola cuenta de la que s'informó
+      target_origin: Orixe de la cuenta de la que s'infomó
       title: Informes
+      unresolved: Ensin resolver
+      view_profile: Ver el perfil
+    roles:
+      add_new: Amestar un rol
+      assigned_users:
+        one: "%{count} perfil"
+        other: "%{count} perfiles"
+      categories:
+        administration: Alministración
+        devops: DevOps
+        invites: Invitaciones
+      edit: Edición del rol «%{name}»
+      everyone: Permisos predeterminaos
+      permissions_count:
+        one: "%{count} permisu"
+        other: "%{count} permisos"
+      privileges:
+        manage_announcements: Xestionar los anuncios
+        manage_appeals: Xestionar les apellaciones
+        manage_custom_emojis: Xestionar los fustaxes personalizaos
+        manage_federation: Xestionar la federación
+        manage_invites: Xestionar les invitaciones
+        manage_reports: Xestionar los informes
+        manage_roles: Xestionar los roles
+        manage_rules: Xestionar les regles
+        manage_settings: Xestionar la configuración
+        manage_taxonomies: Xestionar les taxonomíes
+        manage_users: Xestionar los perfiles
+        manage_webhooks: Xestionar los webhooks
+        view_dashboard: Ver el panel
+        view_devops: DevOps
+      title: Roles
+    rules:
+      add_new: Amestar la regla
+      title: Regles del sirvidor
     settings:
+      about:
+        manage_rules: Xestionar les regles del sirvidor
+        title: Tocante a
+      appearance:
+        preamble: Personaliza la interfaz web de Mastodon.
+        title: Aspeutu
+      branding:
+        preamble: La marca del to sirvidor estrémalu d'otros sirvidores de la rede. Ye posible qu'esta información apaeza nuna variedá d'entornos, como la interfaz web de Mastodon, les aplicaciones natives, nes previsualizaciones de los enllaces d'otros sitios web, dientro de les aplicaciones de mensaxería, etc. Por esti motivu, lo meyor ye qu'esta información seya clara, curtia ya concisa.
+        title: Marca
+      content_retention:
+        preamble: Controla cómo s'atroxa'l conteníu xeneráu polos perfiles en Mastodon.
+        title: Retención del conteníu
+      discovery:
+        public_timelines: Llinies de tiempu públiques
+        title: Descubrimientu
+        trends: Tendencies
+      domain_blocks:
+        all: A tol mundu
+        disabled: A naide
+        users: A los perfiles llocales
       registrations:
-        min_invite_role:
-          disabled: Naide
-      site_description:
-        title: Descripción del sirvidor
-      site_title: Nome del sirvidor
-      title: Axustes del sitiu
+        preamble: Controla quién pue crear una cuenta nel sirvidor.
+        title: Rexistros
+      registrations_mode:
+        modes:
+          approved: Tol mundu pente una aprobación
+          none: Naide
+          open: Tol mundu
+      title: Configuración del sirvidor
+    site_uploads:
+      delete: Desaniciar el ficheru xubíu
     statuses:
-      failed_to_execute: Fallu al executar
-    tags:
-      most_recent: Lo más recién
-      name: Etiqueta
-      title: Etiquetes
+      language: Llingua
+      metadata: Metadatos
+      original_status: Artículu orixinal
+      visibility: Visibilidá
+    strikes:
+      actions:
+        delete_statuses: "%{name} desanició l'artículu de: %{target}"
+        mark_statuses_as_sensitive: "%{name} marcó l'artículu de %{target} como sensible"
+        none: "%{name} unvió una alvertencia a %{target}"
+        sensitive: "%{name} marcó la cuenta de %{target} como sensible"
+        suspend: "%{name} suspendió la cuenta de: %{target}"
+      appeal_approved: Apellóse
+    system_checks:
+      elasticsearch_running_check:
+        message_html: Nun se pudo conectar con Elasticsearch. Revisa que tea n'execución o desactiva la busca de testos completos
     title: Alministración
+    trends:
+      links:
+        title: Enllaces en tendencia
+      only_allowed: Namás lo permitío
+      pending_review: Revisión pendiente
+      statuses:
+        title: Artículos en tendencia
+      tags:
+        dashboard:
+          tag_accounts_measure: usos únicos
+        listable: Pue suxerise
+        no_tag_selected: Nun camudó nenguna etiqueta darréu que nun se seleicionó nenguna
+        not_usable: Nun se pue usar
+        title: Etiquetes en tendencia
+        usable: Pue usase
+      title: Tendencies
+      trending: En tendencia
+    webhooks:
+      add_new: Amestar un estremu
+      delete: Desaniciar
+      description_html: Un <strong>webhook</strong> permite a Mastodon unviar <strong>avisos en tiempu real</strong> de los eventos escoyíos sobre la to aplicación pa qu'esta pueda <strong>executar aiciones automáticamente</strong>.
+      disable: Desactivar
+      disabled: Desactivóse
+      edit: Editar l'estremu
+      empty: Entá nun tienes nengún estremu de webhooks configuráu.
+      enable: Activar
+      enabled: N'activo
+      enabled_events:
+        one: 1 eventu activu
+        other: "%{count} eventos activos"
+      events: Eventos
+      new: Webhook nuevu
+      rotate_secret: Cambiar el secretu
+      secret: Secretu de la firma
+      status: Estáu
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
     new_pending_account:
-      body: Los detalles de la cuenta nueva tán embaxo. Pues aprobar o refugar esta aplicación.
+      body: Los detalles de la cuenta nueva tán abaxo. Pues aprobar o refugar esta solicitú.
     new_report:
-      body: "%{reporter} informó de %{target}"
-      body_remote: Daquién dende %{domain} informó de %{target}
-    new_trending_tag:
-      body: 'Güei la etiqueta #%{name} ye tendencia pero nun se revisó anteriormente. Nun va amosase públicamente a nun ser que lo permitas o guardes el formulariu como ta pa nun saber más d''ello.'
+      body: "%{reporter} informó de: %{target}"
+      body_remote: 'Daquién dende %{domain} informó de: %{target}'
+    new_trends:
+      body: 'Los elementos siguientes precisen una revisión enantes de que puedan apaecer públicamente:'
+      new_trending_links:
+        title: Enllaces en tendencia
+      new_trending_statuses:
+        title: Artículos en tendencia
+      new_trending_tags:
+        title: Etiquetes en tendencia
   aliases:
-    empty: Nun tienes nomatos.
+    empty: Nun tienes nengún nomatu.
   appearance:
     advanced_web_interface: Interfaz web avanzada
-    advanced_web_interface_hint: 'Si quies asegúrate de que s''use tol anchor de la pantalla, la interfaz web avanzada permítete configurar munches columnes estremaes pa ver tanta información al empar como quieras: Aniciu, avisos, llinia temporal federada, cualesquier cantidá de llistes y etiquetes...'
-    animations_and_accessibility: Animaciones y accesibilidá
+    advanced_web_interface_hint: 'Si quies asegúrate de que s''use tol llargor de la pantalla, la interfaz web avanzada permítete configurar columnes estremaes pa ver muncha más información al empar: Aniciu, avisos, llinia de tiempu federada ya cualesquier cantidá de llistes ya etiquetes.'
+    animations_and_accessibility: Animaciones ya accesibilidá
     confirmation_dialogs: Diálogos de confirmación
-    discovery: Descubrición
+    discovery: Descubrimientu
     localization:
       body: Mastodon tradúcenlu voluntarios,
       guide_link_text: tol mundu pue collaborar.
     sensitive_content: Conteníu sensible
-    toot_layout: Distribución de los barritos
+    toot_layout: Distribución de los artículos
   applications:
-    invalid_url: La URL apurrida nun ye válida
+    created: L'aplicación creóse correutamente
+    regenerate_token: Volver xenerar el pase d'accesu
+    token_regenerated: El pase d'accesu volvió xenerase correutamente
     warning: Ten munchu curiáu con estos datos, ¡enxamás nun los compartas con naide!
+    your_token: El pase d'accesu
   auth:
     change_password: Contraseña
-    checkbox_agreement_html: Aceuto les <a href="%{rules_path}" target="_blank">regles del sirvidor</a> y los <a href="%{terms_path}" target="_blank">términos del serviciu</a>
-    checkbox_agreement_without_rules_html: Aceuto los <a href="%{terms_path}" target="_blank"> términos del serviciu</a>
-    delete_account: Desaniciu de la cuenta
-    delete_account_html: Si deseyes desaniciar la to cuenta, pues <a href="%{path}">siguir equí</a>. Va pidísete la confirmación.
-    description:
-      suffix: "¡Con una cuenta, vas ser a siguir a persones, espublizar anovamientos ya intercambiar mensaxes con usuarios de cualesquier sirvidor de Mastodon y más!"
+    delete_account_html: Si quies desaniciar la cuenta, pues facelo <a href="%{path}">equí</a>. Va pidísete que confirmes l'aición.
     didnt_get_confirmation: "¿Nun recibiesti les instrucciones de confirmación?"
-    dont_have_your_security_key: "¿Nun tienes una clave de seguranza?"
+    dont_have_your_security_key: "¿Nun tienes una llave de seguranza?"
     forgot_password: "¿Escaeciesti la contraseña?"
-    login: Aniciar sesión
-    migrate_account: Mudase a otra cuenta
-    migrate_account_html: Si deseyes redirixir esta cuenta a otra, pues <a href="%{path}">configuralo equí</a>.
+    login: Aniciar la sesión
+    logout: Zarrar la sesión
+    privacy_policy_agreement_html: Lleí ya acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidá</a>
+    providers:
+      cas: CAS
+      saml: SAML
     register: Rexistrase
     security: Seguranza
-    trouble_logging_in: "¿Problemes col aniciu de sesión?"
+    setup:
+      email_settings_hint_html: Unvióse'l mensaxe de confirmación a %{email}. Si la direición de corréu electrónicu nun ye correuta, pues camudala na configuración de la cuenta.
+    sign_up:
+      preamble: Con una cuenta nesti sirvidor de Mastodon vas ser a siguir a cualesquier perfil de la rede, independientemente del sirvidor onde s'agospie la so cuenta.
+      title: 'Creación d''una cuenta en: %{domain}.'
+    status:
+      account_status: Estáu de la cuenta
+      functional: La cuenta ta completamente operativa.
+      pending: La to solicitú ta pendiente de que la revise'l nuesu personal ya ye posible que tarde tiempu. Vas recibir un mensaxe si s'aprueba.
+    too_fast: El formulariu xubióse mui rápido, volvi tentalo.
   authorize_follow:
-    already_following: Yá tas siguiendo a esta cuenta
+    already_following: Xá tas siguiendo a esta cuenta
     already_requested: Yá unviesti una solicitú de siguimientu a esa cuenta
-    error: Desafortunadamente, hebo un fallu guetando la cuenta remota
+    error: Desafortunadamente, hebo un error al buscar la cuenta remota
     follow_request: 'Unviesti una solicitú de siguimientu a:'
     post_follow:
       close: O pues zarrar esta ventana.
-      return: Amosar el perfil del usuariu
+      return: Amosar el perfil de la cuenta
       web: Dir a la web
+  challenge:
+    hint_html: "<strong>Conseyu:</strong> nun vamos volver pidite la contraseña hasta dientro d'una hora."
+  crypto:
+    errors:
+      invalid_key: nun ye una clave ed25519 o curve25519 válida
+      invalid_signature: nun ye una clave ed25519 válida
   datetime:
     distance_in_words:
-      half_a_minute: Púramente agora
-      less_than_x_seconds: Púramente agora
+      about_x_hours: "%{count} h"
+      about_x_years: "%{count} a"
+      almost_x_years: "%{count} a"
+      half_a_minute: Puramente agora
+      less_than_x_minutes: "%{count} m"
+      less_than_x_seconds: Puramente agora
+      over_x_years: "%{count} a"
+      x_days: "%{count} d"
+      x_minutes: "%{count} m"
+      x_seconds: "%{count} s"
   deletes:
     challenge_not_passed: La información qu'introduxesti nun yera correuta
     confirm_password: Introduz la contraseña pa verificar la to identidá
     warning:
-      email_contact_html: Si entá nun aportó, pues unviar un corréu a<a href="mailto:%{email}">%{email}</a> pa más ayuda
-      more_details_html: Pa más detalles, mira la <a href="%{terms_path}">política de privacidá</a>.
-  directories:
-    directory: Direutoriu de perfiles
-    explanation: y descubri a usuarios según los sos intereses
-    explore_mastodon: Esplora %{title}
+      email_contact_html: Si entá nun aportó, pues unviar un mensaxe a <a href="mailto:%{email}">%{email}</a> pa consiguir más ayuda
+      email_reconfirmation_html: Si nun recibiesti'l mensaxe de confirmación, pues <a href="%{path}">volver solicitalu</a>
+      more_details_html: Pa consiguir más detalles, mira la <a href="%{terms_path}">política de privacidá</a>.
+  disputes:
+    strikes:
+      action_taken: Aición tomada
+      appeal: Apellación
+      appeal_rejected: Refugóse l'apellación
+      appeals:
+        submit: Unviu d'una apellación
+      approve_appeal: Aprobar l'apellación
+      created_at: Data
+      reject_appeal: Refugar l'apellación
+      status: 'Artículu #%{id}'
+      status_removed: L'artículu xá se quitó del sistema
+      your_appeal_pending: Unviesti una apellación
+      your_appeal_rejected: Refugóse la to apellación
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': La solicitú qu'unviesti nun yera válida o yera incorreuta.
     '403': Nun tienes permisu pa ver esta páxina.
-    '404': La páxina que tabes guetando nun ta equí.
+    '404': La páxina que busques nun ta equí.
     '406': Esta páxina nun ta disponible nel formatu solicitáu.
-    '410': La páxina que tabes guetando yá nun esiste.
+    '410': La páxina que busques xá nun esiste.
     '422':
-      content: Falló la verificación de seguranza. ¿Tas bloquiando les cookies?
-      title: Falló la verificación de seguranza
+      content: La verificación de seguranza falló. ¿Tas bloquiando les cookies?
+      title: La verificación de seguranza falló
     '429': Ficiéronse milenta solicitúes
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '500':
+      content: Sentímoslo, mas prodúxose dalgún error nel sirvidor.
+      title: La páxina nun ye correuta
+    '503': Nun se pudo sirvir la páxina pola mor d'un fallu temporal del sirvidor.
+    noscript_html: Pa usar l'aplicación web de Mastodon, activa JavaScript. Tamién pues probar una de les <a href="%{apps_path}">aplicaciones natives</a> de Mastodon pa la to plataforma.
   exports:
     archive_takeout:
       date: Data
-      download: Baxar l'archivu
-      hint_html: Pues solicitar un archivu colos tos <strong>barritos y ficheros xubíos</strong>. Los datos esportaos van tar nel formatu ActivityPub, llexible pa cualesquier software que seya compatible. Pues solicitar un archivu cada 7 díes.
+      hint_html: Pues solicitar un archivu colos tos <strong>artículos ya ficheros xubíos</strong>. Los datos esportaos van tar nel formatu ActivityPub, llexible pa cualesquier software que seya compatible. Pues solicitar un archivu cada 7 díes.
       in_progress: Compilando l'archivu...
       request: Solicitar l'archivu
       size: Tamañu
-    blocks: Xente que bloquiesti
+    blocks: Perfiles que bloquiesti
+    bookmarks: Marcadores
+    csv: CSV
+    domain_blocks: Dominios bloquiaos
     lists: Llistes
-    mutes: Xente que silenciesti
+    storage: Almacenamientu multimedia
   featured_tags:
-    add_new: Amestar
+    hint_html: "<strong>¿Qué son les etiquetes destacaes?</strong> Apaecen de forma bien visible nel perfil públicu ya permite que les persones restolen los tos artículos públicos per duana d'eses etiquetes. Son una gran ferramienta pa tener un rexistru de trabayos creativos o de proyeutos a plazu llongu."
   filters:
     contexts:
+      account: Perfiles
       notifications: Avisos
-      public: Llinies temporales públiques
+      public: Llinies de tiempu públiques
       thread: Conversaciones
+    edit:
+      keywords: Pallabres clave
+      statuses: Artículos individuales
+    errors:
+      deprecated_api_multiple_keywords: Estos parámetros nun se puen camudar dende esta aplicación porque s'apliquen a más d'una pallabra clave de la peñera. Usa una aplicación más recién o la interfaz web.
     index:
-      empty: Nun tienes peñeres.
+      empty: Nun tienes nenguna peñera.
+      keywords:
+        one: "%{count} pallabra clave"
+        other: "%{count} pallabres claves"
+      statuses:
+        one: "%{count} artículu"
+        other: "%{count} artículos"
       title: Peñeres
-    new:
-      title: Amestar una peñera nueva
   footer:
-    developers: Desendolcadores
-    more: Más…
-    resources: Recursos
+    trending_now: En tendencia
   generic:
     all: Too
-    changes_saved_msg: "¡Los cambeos guardáronse con ésitu!"
+    all_items_on_page_selected_html:
+      one: Seleicionóse <strong>%{count}</strong> elementu d'esta páxina.
+      other: Seleicionáronse <strong>%{count}</strong> elementos d'esta páxina.
+    all_matching_items_selected_html:
+      one: Seleicionóse <strong>%{count}</strong> elementu que concasa cola busca.
+      other: Seleicionáronse <strong>%{count}</strong> elementos que concasen cola busca.
+    copy: Copiar
+    delete: Desaniciar
+    deselect: Deseleicionar too
     order_by: Clasificación
-    save_changes: Guardar cambeos
-  identity_proofs:
-    authorize: Sí, autorizar
-    i_am_html: Soi %{username} de %{service}.
-    identity: Identidá
+    save_changes: Guardar los cambeos
+    today: güei
   imports:
     modes:
       merge: Mecíu
-      merge_long: Caltién los rexistros esistentes y amesta otros nuevos
+      merge_long: Caltién los rexistros esistentes ya amiesta otros nuevos
       overwrite: Sobrescritura
       overwrite_long: Troca los rexistros actuales por otros nuevos
-    preface: Pues importar los datos qu'esportares dende otra instancia, como por exemplu la llista de persones que bloquiares o tuvieres siguiendo.
+    preface: Pues importar los datos qu'esportares dende otru sirvidor, como la llista de perfiles bloquiaos o que sigas.
     types:
-      blocking: Llista de xente bloquiao
+      blocking: Llista de perfiles bloquiaos
       domain_blocking: Llista de dominios bloquiaos
       following: Llista de siguidores
-      muting: Llista de xente silenciao
     upload: Xubir
   invites:
-    delete: Desactivar
     expired: Caducó
     expires_in:
       '1800': 30 minutos
@@ -270,108 +538,141 @@ ast:
     max_uses:
       one: 1 usu
       other: "%{count} usos"
-    max_uses_prompt: Nun hai llende
-    prompt: Xenera y comparti enllaces con otros pa da-yos accesu a esti sirividor
     table:
       expires_at: Data de caducidá
-      uses: Usos
-    title: Convidar a persones
   lists:
     errors:
       limit: Algamesti la cantidá máxima de llistes
+  login_activities:
+    authentication_methods:
+      password: contraseña
+      webauthn: llaves de seguranza
   media_attachments:
     validations:
-      images_and_video: Nun pue axuntase un videu a un estáu que yá contién imáxenes
-      too_many: Nun puen axuntase más de 4 ficheros
+      images_and_video: Nun se pue axuntar nengún videu a un artículu que xá contién imáxenes
+      too_many: Nun se puen axuntar más de 4 ficheros
   migrations:
-    acct: nome_usuariu@dominiu de la cuenta nueva
-    incoming_migrations: Mudase dende otra cuenta
+    errors:
+      missing_also_known_as: nun ye un nomatu d'esta cuenta
+      move_to_self: nun pue ser la cuenta actual
     warning:
       followers: Esta aición va mover tolos siguidores de la cuenta actual a la nueva
   notification_mailer:
-    digest:
-      body: Equí hai un resume de los mensaxes que nun viesti dende la última visita'l %{since}
-      mention: "%{name} mentóte en:"
+    admin:
+      sign_up:
+        subject: "%{name} rexistróse"
     favourite:
-      title: Favoritu nuevu
+      body: "%{name} marcó como favoritu'l to artículu:"
+      subject: "%{name} marcó'l to artículu como favoritu"
     follow:
-      body: "¡Agora %{name} ta siguiéndote!"
-      title: Siguidor nuevu
+      body: "¡Agora %{name} siguete!"
     follow_request:
       body: "%{name} solicitó siguite"
-      title: Petición nueva de siguimientu
+      title: Solicitú de siguimientu nueva
     mention:
       body: "%{name} mentóte en:"
       subject: "%{name} mentóte"
       title: Mención nueva
     reblog:
-      body: "%{name} compartió'l to estáu:"
-      subject: "%{name} compartió'l to estáu"
-      title: Compartición nueva de barritu
+      body: "%{name} compartió'l to artículu:"
+      subject: "%{name} compartió'l to artículu"
+    update:
+      subject: "%{name} editó un artículu"
   notifications:
-    email_events_hint: 'Esbilla los eventos de los que quies recibir avisos:'
-    other_settings: Otros axustes
+    email_events_hint: 'Seleiciona los eventos de los que quies recibir avisos:'
+    other_settings: Configuración d'otros avisos
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: MM
+          million: M
+          quadrillion: mil B
+          thousand: mil
+          trillion: B
+  otp_authentication:
+    description_html: Si actives l'<strong>autenticación en dos pasos</strong> con una aplicación autenticadora, al aniciar la sesión va ser obligatorio que tengas el teléfonu a mano, preséu que xenera los pases que tienes d'introducir.
+    manual_instructions: 'Si nun pues escaniar el códigu QR ya tienes d''introducilu manualmente, equí tienes el secretu en testu ensin formatu:'
+    setup: Configurar
   pagination:
     next: Siguiente
+    truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Yá votesti nesta encuesta
-      expired: La encuesta yá finó
+      already_voted: Xá votesti nesta encuesta
+      expired: La encuesta xá finó
       invalid_choice: La opción de votu escoyida nun esiste
+      too_many_options: nun pue contener más de %{max} elementos
   preferences:
-    public_timelines: Llinies temporales públiques
+    public_timelines: Llinies de tiempu públiques
+  privacy_policy:
+    title: Política de privacidá
   relationships:
     activity: Actividá
     followers: Siguidores
+    last_active: Última actividá
     most_recent: Lo más recién
     relationship: Rellación
-    remove_selected_follows: Dexar de siguir a los usuarios esbillaos
-    status: Estáu
-  remote_follow:
-    acct: Introduz el nome_usuariu@dominiu dende'l que lo quies facer
-    no_account_html: "¿Nun tienes una cuenta? Pues <a href='%{sign_up_path}' target='_blank'>rexistrate equí</a>"
-    proceed: Siguir
-    prompt: 'Vas siguir a:'
-    reason_html: "<strong>¿Por qué esti pasu ye precisu?</strong> <code>%{instance}</code> seique nun seya'l sirvidor onde tas rexistráu, polo que precisamos redirixite primero al de to."
-  remote_interaction:
-    favourite:
-      proceed: Siguir
-      prompt: 'Quies marcar esti barritu como favoritu:'
-    reblog:
-      proceed: Siguir
-      prompt: 'Quies compartir esti barritu:'
-    reply:
-      proceed: Siguir
-      prompt: 'Quies responder a esti barritu:'
+    remove_selected_follows: Dexar de siguir a los perfiles seleicionaos
+  scheduled_statuses:
+    over_daily_limit: Superesti la llende de %{limit} artículos programaos pa güei
+    over_total_limit: Superesti la llende de %{limit} artículos programaos
   sessions:
     browser: Restolador
     browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Restolador desconocíu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Restolador Ovi pa S40 de Nokia
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
     current_session: Sesión actual
-    description: "%{browser} en %{platform}"
+    ip: IP
     platforms:
-      mac: Mac
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: GNU/Linux
+      mac: macOS
       other: plataforma desconocida
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Revocar
-    revoke_success: La sesión revocóse con esitu
+    revoke_success: La sesión revocóse correutamente
     title: Sesiones
   settings:
     account: Cuenta
-    account_settings: Axustes de la cuenta
+    account_settings: Configuración de la cuenta
     appearance: Aspeutu
     authorized_apps: Aplicaciones autorizaes
     back: Volver a Mastodon
     development: Desendolcu
-    edit_profile: Editar el perfil
     export: Esportación de datos
     featured_tags: Etiquetes destacaes
     import: Importación
-    import_and_export: Importación y esportación
+    import_and_export: Importación ya esportación
+    migrate: Migración de la cuenta
     notifications: Avisos
     preferences: Preferencies
     profile: Perfil
+    statuses_cleanup: Desaniciu automáticu d'artículos
     two_factor_authentication: Autenticación en dos pasos
-    webauthn_authentication: Claves d'autenticación
+    webauthn_authentication: Llaves de seguranza
   statuses:
     attached:
       audio:
@@ -383,13 +684,15 @@ ast:
       video:
         one: "%{count} videu"
         other: "%{count} vídeos"
-    boosted_from_html: Compartióse'l barritu dende %{acct_link}
-    language_detection: Deteutala automáticamente
+    default_language: La mesma que la de la interfaz
+    errors:
+      in_reply_not_found: L'artículu al que tentes de responder paez que nun esiste.
+    open_in_web: Abrir na web
     pin_errors:
-      limit: Yá fixesti'l númberu máximu de barritos
-      ownership: Nun pue fixase'l barritu d'otra persona
-      private: Nun puen fixase los barritos que nun seyan públicos
-      reblog: Nun pue fixase un barritu compartíu
+      direct: Nun se puen fixar los artículos que son visibles namás pa los usuarios mentaos
+      limit: Xá fixesti'l númberu máximu d'artículos
+      ownership: Nun se pue fixar l'artículu d'otru perfil
+      reblog: Nun se pue fixar un artículu compartíu
     poll:
       total_people:
         one: "%{count} persona"
@@ -400,46 +703,70 @@ ast:
     show_more: Amosar más
     title: "%{name}: «%{quote}»"
     visibilities:
-      private: Namái siguidores
-      private_long: Namái s'amuesen a los siguidores
-      public_long: Tol mundu puen velos
-      unlisted: Nun llistar
-      unlisted_long: Tol mundu puen velos pero nun se llisten nes llinies temporales públiques
+      direct: Mensaxe direutu
+      public_long: Tol mundu pue velos
+      unlisted_long: Tol mundu pue velos, mas nun apaecen nes llinies de tiempu públiques
+  statuses_cleanup:
+    exceptions: Esceiciones
+    min_age:
+      '1209600': 2 selmanes
+      '15778476': 6 meses
+      '2629746': 1 mes
+      '31556952': 1 añu
+      '5259492': 2 meses
+      '604800': 1 selmana
+      '63113904': 2 años
+      '7889238': 3 meses
   stream_entries:
-    pinned: Barritu fixáu
-    reblogged: compartió
     sensitive_content: Conteníu sensible
   tags:
     does_not_match_previous_name: nun concasa col nome anterior
   themes:
-    contrast: Contraste altu
-    default: Mastodon
-    mastodon-light: Claridá
+    contrast: Mastodon (contraste altu)
+    default: Mastodon (escuridá)
+    mastodon-light: Mastodon (claridá)
   two_factor_authentication:
-    disable: Desactivar
     enabled: L'autenticación en dos pasos ta activada
-    enabled_success: L'autenticación en dos pasos activóse con ésitu
-    generate_recovery_codes: Xenerar códigos de recuperación
-    lost_recovery_codes: Los códigos de recuperación permítente recuperar l'accesu a la cuenta si pierdes el teléfonu. Si tamién pierdes estos códigos, pues rexeneralos equí. Los códigos de recuperación vieyos van invalidase.
-    recovery_codes: Códigos de recuperación
-    recovery_codes_regenerated: Los códigos de recuperación rexeneráronse con ésitu
-    webauthn: Claves d'autenticación
+    enabled_success: L'autenticación en dos pasos activóse correutamente
+    lost_recovery_codes: Los códigos de recuperación permítente recuperar l'accesu a la cuenta si pierdes el teléfonu. Si tamién pierdes estos códigos, pues volver xeneralos equí. Los códigos de recuperación antiguos van anulase.
+    recovery_codes_regenerated: Los códigos de recuperación volvieron xenerase correutamente
+    webauthn: Llaves de seguranza
   user_mailer:
+    suspicious_sign_in:
+      explanation: Detectemos un aniciu de sesión a la to cuenta dende una direición IP nueva.
+      subject: Accedióse a la to cuenta dende una direición IP nueva
     warning:
+      appeal: Unviar una apellación
+      appeal_description: Si te paez que ye un error, pues unviar una apellación al personal de %{instance}.
       explanation:
-        suspend: La to cuenta suspendióse y tolos espublizamientos qu'espublizares desaniciáronse de mou irreversible d'esti sirvidor y sirvidores onde teníes siguidores.
+        disable: Xá nun pues usar la cuenta mas el perfil ya otros datos siguen intautos. Pues solicitar una copia de seguranza de los datos, camudar la configuración de la cuenta o desaniciar la cuenta.
+      reason: 'Motivu:'
+      statuses: 'Artículos citaos:'
       subject:
+        disable: Conxelóse la to cuenta %{acct}
         suspend: Suspendióse la cuenta %{acct}
       title:
+        disable: Cuenta conxelada
         none: Alvertencia
         suspend: Cuenta suspendida
     welcome:
-      full_handle_hint: Esto ye lo que-yos diríes a los collacios pa que puean unviate mensaxes o siguite dende otra instancia.
+      edit_profile_action: Configurar el perfil
+      explanation: Equí tienes dalgunos conseyos pa que comiences
+      final_action: Comenzar a espublizar
       subject: Afáyate en Mastodon
-      tips: Conseyos
+      title: "¡Afáyate, %{name}!"
   users:
-    invalid_otp_token: El códigu nun ye válidu
-    otp_lost_help_html: Si pierdes l'accesu, contauta con %{email}
-    seamless_external_login: Aniciesti sesión pente un serviciu esternu, polo que los axustes de la contraseña y corréu nun tán disponibles.
+    follow_limit_reached: Nun pues siguir a más de %{limit} persones
+    invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
+    seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña ya de la direición de corréu electrónicu nun tán disponibles.
+    signed_in_as: 'Aniciesti la sesión como:'
   verification:
+    explanation_html: 'Pues <strong>verificate como la persona propietaria de los enllaces nos metadatos del to perfil</strong>. Pa ello, el sitiu web enllaciáu ha contener un enllaz al to perfil de Mastodon. Esti enllaz <strong>ha</strong> tener l''atributu <code>rel="me"</code>. El testu del enllaz nun importa. Equí tienes un exemplu:'
     verification: Verificación
+  webauthn_credentials:
+    create:
+      error: Hebo un problema al amestar la llave de seguranza. Volvi tentalo.
+    invalid_credential: La llave de seguranza nun ye válida
+    not_enabled: Entá nun activesti la función WebAuthn
+    not_supported: Esti restolador nun ye compatible coles llaves de seguranza
+    otp_required: Pa usar les llaves de seguranza, activa primero l'autenticación en dos pasos.
diff --git a/config/locales/be.yml b/config/locales/be.yml
new file mode 100644
index 000000000..de6ac186d
--- /dev/null
+++ b/config/locales/be.yml
@@ -0,0 +1,1733 @@
+---
+be:
+  about:
+    about_mastodon_html: 'Сацыяльная сетка будучыні: без рэкламы, без карпаратыўнага назірання, этычны дызайн і дэцэнтралізацыя! Валодайце сваімі данымі з Mastodon!'
+    contact_missing: Не зададзены
+    contact_unavailable: Недаступна
+    hosted_on: Mastodon месціцца на %{domain}
+    title: Пра нас
+  accounts:
+    follow: Падпісацца
+    followers:
+      few: Падпісчыка
+      many: Падпісчыкаў
+      one: Падпісчык
+      other: Падпісчыкі
+    following: Падпісаны
+    instance_actor_flash: Гэты ўліковы запіс - лічбавы аватар, неабходны для рэпрэзентацыі самога сервера, а не якой-небудзь асобы. Ён выкарыстоўваецца для федэралізацыі і не можа быць замарожаны.
+    last_active: апошняя актыўнасць
+    link_verified_on: Права ўласнасці на гэтую спасылку праверана %{date}
+    nothing_here: Тут нічога няма!
+    pin_errors:
+      following: Вы павінны быць падпісаны на чалавека, якога жадаеце рэкамендаваць
+    posts:
+      few: Допісы
+      many: Допісаў
+      one: Допіс
+      other: Допісы
+    posts_tab_heading: Допісы
+  admin:
+    account_actions:
+      action: Выканаць дзеянне
+      title: Мадэраваць %{acct}
+    account_moderation_notes:
+      create: Пакінуць нататку
+      created_msg: Нататка мадэратара паспяхова створана!
+      destroyed_msg: Нататка мадэратара паспяхова выдалена!
+    accounts:
+      add_email_domain_block: Заблакіраваць дамен эл. пошты
+      approve: Пацвердзіць
+      approved_msg: Заяўка на рэгістрацыю %{username} ухваленая
+      are_you_sure: Вы ўпэўнены?
+      avatar: Аватар
+      by_domain: Дамен
+      change_email:
+        changed_msg: Пошта паспяхова зменена!
+        current_email: Бягучая эл. пошта
+        label: Змяніць адрас эл. пошты
+        new_email: Новая эл. пошта
+        submit: Змяніць адрас эл. пошты
+        title: Змяніць адрас эл. пошты для %{username}
+      change_role:
+        changed_msg: Роля паспяхова зменена!
+        label: Змяніць ролю
+        no_role: Няма ролі
+        title: Змяніць ролю для %{username}
+      confirm: Пацвердзіць
+      confirmed: Пацверджаны
+      confirming: Ідзе пацвярджэнне
+      custom: Уласнае
+      delete: Выдаліць даныя
+      deleted: Выдалены
+      demote: Панізіць у правах
+      destroyed_msg: Даныя %{username} цяпер у чарзе на прымусовае выдаленне
+      disable: Замарозіць
+      disable_sign_in_token_auth: Выключыць аўтэнтыфікацыю па e-mail токену
+      disable_two_factor_authentication: Адключыць 2FA
+      disabled: Замарожаны
+      display_name: Бачнае імя
+      domain: Дамен
+      edit: Рэдагаваць
+      email: Электронная пошта
+      email_status: Статус электроннай пошты
+      enable: Размарозіць
+      enable_sign_in_token_auth: Уключыць аўтэнтыфікацыю па e-mail токену
+      enabled: Уключана
+      enabled_msg: Уліковы запіс %{username} размарожаны
+      followers: Падпісчыкі
+      follows: Падпіскі
+      header: Загаловак
+      inbox_url: URL уваходных
+      invite_request_text: Прычына далучэння
+      invited_by: Запрошаны
+      ip: IP
+      joined: Далучыўся
+      location:
+        all: Усе
+        local: Лакальны
+        remote: Адлеглы
+        title: Месцазнаходжанне
+      login_status: Стан уваходу
+      media_attachments: Медыя дадаткі
+      memorialize: Даданае да памяці
+      memorialized: Запомненае
+      memorialized_msg: Уліковы запіс %{username} ператвораны ў мемарыяльны
+      moderation:
+        active: Актыўны
+        all: Усе
+        pending: Чакаюць
+        silenced: Абмежаваны
+        suspended: Прыпынены
+        title: Мадэрацыя
+      moderation_notes: Нататкі мадэратару
+      most_recent_activity: Апошняя актыўнасць
+      most_recent_ip: Нядаўнія IP
+      no_account_selected: Ніякіх уліковых запісаў не было зменена таму што ні адзін не быў выбраны
+      no_limits_imposed: Без абмежаванняў
+      no_role_assigned: Роля не прызначана
+      not_subscribed: Не падпісаны
+      pending: Чакае праверкі
+      perform_full_suspension: Выключыць
+      previous_strikes: Ранейшыя скаргі
+      previous_strikes_description_html:
+        few: Гэты ўліковы запіс мае <strong>%{count}</strong> скаргі.
+        many: Гэты ўліковы запіс мае <strong>%{count}</strong> скарг.
+        one: Гэты ўліковы запіс мае <strong>адну</strong> скаргу.
+        other: Гэты ўліковы запіс мае <strong>%{count}</strong> скаргаў.
+      promote: Павысіць
+      protocol: Пратакол
+      public: Публічны
+      push_subscription_expires: Падпіска PuSH канчаецца
+      redownload: Абнавіць профіль
+      redownloaded_msg: Профіль %{username} паспяхова абноўлены за арыгіналу
+      reject: Адхіліць
+      rejected_msg: Заяўка на рэгістрацыю %{username} адхіленая
+      remote_suspension_irreversible: Даныя гэтага уліковага запісу былі незваротна выдалены.
+      remote_suspension_reversible_hint_html: Уліковы запіс быў прыпынены на сваім серверы і даныя будуць цалкам выдалены ад %{date}. Да гэтага аддалёны сервер можа аднавіць гэты уліковы запіс без якіх-небудзь шкодных наступстваў. Калі вы хочаце выдаліць усе даныя ўліковага запісу зараз, вы можаце зрабіць гэта ніжэй.
+      remove_avatar: Выдаліць аватар
+      remove_header: Выдаліць шапку
+      removed_avatar_msg: Аватар %{username} выдалены
+      removed_header_msg: Выява загалоўку %{username} выдаленая
+      resend_confirmation:
+        already_confirmed: Гэты карыстальнік ужо пацверджаны
+        send: Даслаць пацвярджальны ліст зноў
+        success: Ліст з пацвярджэннем паспяхова дасланы!
+      reset: Скінуць
+      reset_password: Скід паролю
+      resubscribe: Аднавіць падпіску
+      role: Роля
+      search: Пошук
+      search_same_email_domain: Іншыя карыстальнікі з такім жа даменам эл. пошты
+      search_same_ip: Іншыя карыстальнікі з гэтым IP
+      security_measures:
+        only_password: Толькі пароль
+        password_and_2fa: Пароль і 2FA
+      sensitive: Прымусова пазначыць як далікатны
+      sensitized: Пазначаны як далікатны
+      shared_inbox_url: URL супольных уваходных
+      show:
+        created_reports: Створана скарг
+        targeted_reports: Атрымана скарг
+      silence: Абмежаваць
+      silenced: Абмежаванае
+      statuses: Допісы
+      strikes: Ранейшыя скаргі
+      subscribe: Падпіска
+      suspend: Прыпыніць
+      suspended: Прыпынена
+      suspension_irreversible: Даныя гэтага ўліковага запісу былі канчаткова выдалены. Вы можаце аднавіць уліковы запіс, каб зрабіць яго зноў працоўным, але гэта не адновіць даныя якія былі змешчаны на ім раней.
+      suspension_reversible_hint_html: Уліковы запіс быў прыпынены і даныя будуць цалкам выдалены ад %{date}. Да гэтага ўліковы запіс можа быць адноўлены без якіх-небудзь шкодных наступстваў. Калі вы хочаце выдаліць усе даныя ўліковага запісу зараз, вы можаце зрабіць гэта ніжэй.
+      title: Уліковыя запісы
+      unblock_email: Разблакіраваць адрас эл. пошты
+      unblocked_email_msg: Электронная пошта %{username} паспяхова разблакіраваная
+      unconfirmed_email: Непацверджаны адрас эл. пошты
+      undo_sensitized: Прыбраць прымусовую пазнаку далікатнасці
+      undo_silenced: Адмяніць ліміт
+      undo_suspension: Разблакаваць карыстальніка
+      unsilenced_msg: З уліковага запісу %{username} зняты абмежаванні
+      unsubscribe: Адпісацца
+      unsuspended_msg: Уліковы запіс %{username} адноўлены
+      username: Імя карыстальніка
+      view_domain: Паглядзець падсумаванне дамену
+      warn: Папярэдзіць
+      web: Інтэрнэт
+      whitelisted: Дазволена для федэрацыі
+    action_logs:
+      action_types:
+        approve_appeal: Ухваліць абскарджанне
+        approve_user: Зацвердзіць карыстальніка
+        assigned_to_self_report: Прызначыць скаргу
+        change_email_user: Змяніць E-mail карыстальніка
+        change_role_user: Змяніць ролю карыстальніка
+        confirm_user: Пацвердзіць карыстальніка
+        create_account_warning: Стварыць папярэджанне
+        create_announcement: Стварыць аб'яву
+        create_canonical_email_block: Стварыць блакіроўку электроннай пошты
+        create_custom_emoji: Стварыць адвольны эмодзі
+        create_domain_allow: Стварыць даменны дазвол
+        create_domain_block: Стварыць даменны блок
+        create_email_domain_block: Стварыць даменны блок электроннай пошты
+        create_ip_block: Стварыць IP правіла
+        create_unavailable_domain: Стварыць недаступны Дамен
+        create_user_role: Стварыць ролю
+        demote_user: Панізіць карыстальніка
+        destroy_announcement: Выдаліць аб'яву
+        destroy_canonical_email_block: Выдаліць блакіроўку электроннай пошты
+        destroy_custom_emoji: Выдаліць адвольны эмодзі
+        destroy_domain_allow: Выдаліць дамены дазвол
+        destroy_domain_block: Выдаліць даменны блок
+        destroy_email_domain_block: Выдаліць даменны блок электроннай пошты
+        destroy_instance: Вычысціць дамен
+        destroy_ip_block: Выдаліць IP правіла
+        destroy_status: Выдаліць допіс
+        destroy_unavailable_domain: Выдаліць недаступны дамен
+        destroy_user_role: Выдаліць ролю
+        disable_2fa_user: Адключыць двухэтапнае спраўджанне
+        disable_custom_emoji: Адключыць адвольныя эмодзі
+        disable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для Карыстальніка
+        disable_user: Адключыць карыстальніка
+        enable_custom_emoji: Уключыць адвольныя эмодзі
+        enable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для Карыстальніка
+        enable_user: Уключыць карыстальніка
+        memorialize_account: Запомніць уліковы запіс
+        promote_user: Павысіць правы Карыстальніка
+        reject_appeal: Адхіліць абскарджанне
+        reject_user: Адмовіць карыстальніку
+        remove_avatar_user: Выдаліць аватар
+        reopen_report: Пераадкрыць скаргу
+        resend_user: Даслаць пацвярджальны ліст зноў
+        reset_password_user: Скінуць пароль
+        resolve_report: Вырашыць скаргу
+        sensitive_account: Уліковы запіс прымусова пазначаны як далікатны
+        silence_account: Абмежаваць уліковы запіс
+        suspend_account: Выключыць уліковы запіс
+        unassigned_report: Прыбраць прызначэнне скаргі
+        unblock_email_account: Разблакіраваць электронны адрас
+        unsensitive_account: Прымусовая пазнака далікатнасці прыбраная
+        unsilence_account: Уліковы запіс больш не абмежаваны
+        unsuspend_account: Аднавіць уліковы запіс
+        update_announcement: Абнавіць аб'яву
+        update_custom_emoji: Абнавіць адвольныя эмодзі
+        update_domain_block: Актуалізаваць блакіроўку дамена
+        update_ip_block: Абнавіць IP правіла
+        update_status: Абнавіць допіс
+        update_user_role: Абнавіць ролю
+      actions:
+        approve_appeal_html: Карыстальнік %{name} ухваліў запыт на мадэрацыю %{target}
+        approve_user_html: "%{name} пацвердзіў рэгістрацыю ад %{target}"
+        assigned_to_self_report_html: "%{name} прызначыў справаздачу %{target} на сябе\n"
+        change_email_user_html: "%{name} змяніў паштовы адрас карыстальніка %{target}"
+        change_role_user_html: "%{name} змяніў ролю %{target}"
+        confirm_user_html: "%{name} пацвердзіў паштовы адрас %{target}"
+        create_account_warning_html: "%{name} накіраваў папярэджанне %{target}"
+        create_announcement_html: "%{name} зрабіў новую аб'яву %{target}"
+        create_canonical_email_block_html: "%{name} заблакаваў імэйл з хэшам %{target}"
+        create_custom_emoji_html: "%{name} загрузіў новы смайлік %{target}\n\n"
+        create_domain_allow_html: "%{name} дазволіў федэрацыю з даменам %{target}"
+        create_domain_block_html: "%{name} заблакіраваў дамен %{target}"
+        create_email_domain_block_html: "%{name} заблакіраваў дамен эл. пошты %{target}"
+        create_ip_block_html: "%{name} стварыў правіла для IP %{target}"
+        create_unavailable_domain_html: "%{name} прыпыніў дастаўку да дамена %{target}"
+        create_user_role_html: "%{name} зрабіў ролю %{target}"
+        demote_user_html: "%{name} прыбраў карыстальніка %{target}"
+        destroy_announcement_html: "%{name} выдаліў аб'яву %{target}"
+        destroy_canonical_email_block_html: "%{name} разблакаваў імэйл з хэшам %{target}"
+        destroy_custom_emoji_html: "%{name} выдаліў(а) эмоджі %{target}"
+        destroy_domain_allow_html: "%{name} зняў дазвол на аб'яднанне з даменам %{target}\n"
+        destroy_domain_block_html: "%{name} разблакаваў дамен %{target}"
+        destroy_email_domain_block_html: "%{name} зняў блакіроўку імэйла дамена %{target}\n"
+        destroy_instance_html: "%{name} цалкам прыбраў дамен %{target}"
+        destroy_ip_block_html: "%{name} выдаліў правіла для IP %{target}"
+        destroy_status_html: "%{name} выдаліў допіс %{target}"
+        destroy_unavailable_domain_html: "%{name} дазволіў працягнуць адпраўку на дамен %{target}"
+        destroy_user_role_html: "%{name} выдаліў ролю %{target}"
+        disable_2fa_user_html: "%{name} амяніў абавязковую двухфактарную верыфікацыю для карыстальніка %{target}"
+        disable_custom_emoji_html: "%{name} заблакіраваў эмодзі %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} выключыў токен аўэнтыфікацыі e-mail для %{target}"
+        disable_user_html: "%{name} адключыў уваход для карыстальніка %{target}"
+        enable_custom_emoji_html: "%{name} уключыў эмодзі %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} уключыў(ла) такенную e-mail праверку для %{target}"
+        enable_user_html: "%{name} уключыў уваход для карыстальніка %{target}"
+        memorialize_account_html: Карыстальнік %{name} пераключыў уліковы запіс %{target} у старонку памяці
+        promote_user_html: "%{name} павысіў карыстальніка %{target}"
+        reject_appeal_html: "%{name} адхіліў запыт на абскарджанне %{target}"
+        reject_user_html: "%{name} адхіліў рэгістрацыю з %{target}"
+        remove_avatar_user_html: "%{name} выдаліў аватар %{target}"
+        reopen_report_html: "%{name} зноў адкрыў скаргу %{target}"
+        resend_user_html: "%{name} зноў адправіў ліст з пацвярджэннем для %{target}"
+        reset_password_user_html: "%{name} скінул(а) пароль для %{target}"
+        resolve_report_html: "%{name} вырашыў скаргу %{target}"
+        sensitive_account_html: "%{name} адзначыў медыя %{target} як далікатнае"
+        silence_account_html: "%{name} абмежаваў уліковы запіс %{target}"
+        suspend_account_html: Уліковы запіс %{target} выключаны %{name}
+        unassigned_report_html: "%{name} знял(а) прызначэнне скаргі %{target}"
+        unblock_email_account_html: "%{name} разблакіраваў эл. пошту %{target}"
+        unsensitive_account_html: "%{name} зняў адзнаку далікатнае з медыя %{target}"
+        unsilence_account_html: "%{name} зняў ліміт з уліковага запісу %{target}"
+        unsuspend_account_html: Уліковы запіс %{target} адноўлены %{name}
+        update_announcement_html: "%{name} абнавіў аб'яву %{target}"
+        update_custom_emoji_html: "%{name} абнавіў эмодзі %{target}"
+        update_domain_block_html: "%{name} абнавіў блакіроўку дамена для %{target}"
+        update_ip_block_html: "%{name} змяніў правіла для IP %{target}"
+        update_status_html: "%{name} абнавіў допіс %{target}"
+        update_user_role_html: "%{name} змяніў ролю %{target}"
+      deleted_account: выдалены ўліковы запіс
+      empty: Логі не знойдзены.
+      filter_by_action: Фільтраваць па дзеянню
+      filter_by_user: Адфільтраваць па карыстальніку
+      title: Правер логі
+    announcements:
+      destroyed_msg: Аб'ява паспяхова выдалена!
+      edit:
+        title: Рэдагаваць абвестку
+      empty: Не знайдзена ніводнай абвесткі
+      live: Ужывую
+      new:
+        create: Стварыць аб'яву
+        title: Новая аб'ява
+      publish: Апублікаваць
+      published_msg: Аб'ява паспяхова апублікавана!
+      scheduled_for: Запланавана на %{time}
+      scheduled_msg: Аб'ява запланавана да публікацыі!
+      title: Аб'явы
+      unpublish: Зняць з публікацыі
+      unpublished_msg: Аб'ява паспяхова схована!
+      updated_msg: Аб'ява паспяхова адноўлена!
+    custom_emojis:
+      assign_category: Прызначыць катэгорыю
+      by_domain: Дамен
+      copied_msg: Лакальная копія эмодзі паспяхова створана
+      copy: Скапіраваць
+      copy_failed_msg: Немагчыма зрабіць лакальную копію гэтага эмодзі
+      create_new_category: Стварыць новую катэгорыю
+      created_msg: Эмодзі паспяхова створана!
+      delete: Выдаліць
+      destroyed_msg: Смайлік паспяхова прыбраны!
+      disable: Адключыць
+      disabled: Адключана
+      disabled_msg: Смайлік паспяхова адключаны
+      emoji: Эмодзі
+      enable: Уключыць
+      enabled: Уключана
+      enabled_msg: Смайлік паспяхова ўключаны
+      image_hint: PNG або GIF да %{size}
+      list: Паказваць
+      listed: Паказваецца
+      new:
+        title: Дадаць новы адвольны эмодзі
+      no_emoji_selected: Не атрымалася змяніць ніводзін смайлік, бо ніводзін смайлік не быў абраны.
+      not_permitted: Вам не дазволена выконваць гэта дзеянне
+      overwrite: Перазапісаць
+      shortcode: Кароткі код
+      shortcode_hint: Як менш 2 сімвалы, толькі лічбы, лацінскія літары ці падкрэсліванне
+      title: Адвольныя эмодзі
+      uncategorized: Без катэгорыі
+      unlist: Прыбраць
+      unlisted: Не ў стужках
+      update_failed_msg: Немагчыма абнавіць гэта эмодзі
+      updated_msg: Смайлік паспяхова абноўлены!
+      upload: Запампаваць
+    dashboard:
+      active_users: актыўныя карыстальнікі
+      interactions: узаемадзеянні
+      media_storage: Медыясховішча
+      new_users: новыя карыстальнікі
+      opened_reports: скарг прынята
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> апеляцыі ў чарзе"
+        many: "<strong>%{count}</strong> апеляцый у чарзе"
+        one: "<strong>%{count}</strong> апеляцыя ў чарзе"
+        other: "<strong>%{count}</strong> апеляцыі ў чарзе"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> справаздачы ў апрацоўцы"
+        many: "<strong>%{count}</strong> справаздач у апрацоўцы"
+        one: "<strong>%{count}</strong> справаздача ў апрацоўцы"
+        other: "<strong>%{count}</strong>  справаздачы ў апрацоўцы"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> хэштэгі ў чарзе"
+        many: "<strong>%{count}</strong> хэштэгаў у чарзе"
+        one: "<strong>%{count}</strong> хэштэг у чарзе"
+        other: "<strong>%{count}</strong> хэштэга ў чарзе"
+      pending_users_html:
+        few: "<strong>%{count}</strong> карыстальнікі ў чарзе"
+        many: "<strong>%{count}</strong> карыстальнікаў у чарзе"
+        one: "<strong>%{count}</strong> карыстальнік у чарзе"
+        other: "<strong>%{count}</strong> карыстальніка ў чарзе"
+      resolved_reports: скарг разгледжана
+      software: Праграмнае забеспячэнне
+      sources: Крыніцы рэгістрацыі
+      space: Выкарыстанне дыскавай прасторы
+      title: Панэль кіравання
+      top_languages: Найбольш актыўныя мовы
+      top_servers: Найбольш актыўныя серверы
+      website: Вэб-сайт
+    disputes:
+      appeals:
+        empty: Апеляцыі не знойдзены.
+        title: Апеляцыі
+    domain_allows:
+      add_new: Дазволіць федэрацыю з даменам
+      created_msg: Дамен быў паспяхова дабаўлены да федэрацыі
+      destroyed_msg: Дамен быў выключаны з федэрацыі
+      export: Экспарт
+      import: Імпарт
+      undo: Забараніць федэрацыю з даменам
+    domain_blocks:
+      add_new: Дадаць новы блок дамену
+      created_msg: Даменны блок быў апрацаваны
+      destroyed_msg: Даменны блок быў адменены
+      domain: Дамен
+      edit: Рэдагаваць блакіраванне дамену
+      existing_domain_block: Вы ўжо налажылі стражэйшыя абмежаванні на %{name}.
+      existing_domain_block_html: Вы ўжо налажылі стражэйшыя абмежаванні на %{name}, спачатку вам неабходна <a href="%{unblock_url}">разблакаваць гэты акаўнт</a>.
+      export: Экспарт
+      import: Імпарт
+      new:
+        create: Стварыць блакіроўку
+        hint: Блакіроўка дамена не будзе перашкаджаць стварэнню запісаў уліковых запісаў у базе даных, але будзе заднім лікам і аўтаматычна прымяняць да гэтых уліковых запісаў пэўныя метады мадэрацыі.
+        severity:
+          desc_html: "<strong>Абмежаванне</strong> зробіць допісы людзей з гэтага дамену нябачнымі для тых, хто на іх не падпісаны. <strong>Выключэнне</strong> выдаліць усё змесціва, медыя і даныя профіляў дамену з вашага серверу. <strong>«Нічога»</strong> проста адхіліць медыя файлы."
+          noop: Пуста
+          silence: Абмежаваць
+          suspend: Выключыць
+        title: Новы блок дамену
+      no_domain_block_selected: Блакіроўкі даменаў не былі змененыя, таму што ні адзін з іх не быў выбраны
+      not_permitted: Вам забаронена выконваць гэта дзеянне
+      obfuscate: Схаваць назву дамена
+      obfuscate_hint: Часткова замаскіраваць даменнае імя ў спісе, калі прапанова спісу абмежаванняў дамена ўключана
+      private_comment: Прыватны каментарый
+      private_comment_hint: Пракаментуйце абмежаванне гэтага дамена для ўнутранага выкарыстання мадэратарамі.
+      public_comment: Публічны каментарый
+      public_comment_hint: Пракаментуйце гэтае абмежаванне дамена для агульнага выкарыстання, калі рэклама спісу абмежаванняў дамена ўключана.
+      reject_media: Забараніць медыя файлы
+      reject_media_hint: Выдаляе лакальна захаваныя мультымедыйныя файлы і адмаўляе спампоўваць іх у будучыні. Не мае значэння для часавага прыпынення
+      reject_reports: Адхіляе справаздачы
+      reject_reports_hint: Ігнараваць усе справаздачы з гэтага дамена. Не мае значэння для часовага прыпынення
+      undo: Скасаваць блакіраванне дамену
+      view: Праглядзець новы блок дамену
+    email_domain_blocks:
+      add_new: Дадаць
+      attempts_over_week:
+        few: "%{count} спробы рэгіістрацыі за апошні тыдзень"
+        many: "%{count} спроб рэгіістрацыі за апошні тыдзень"
+        one: "%{count} спроба рэгістрацыі за апошні тыдзень"
+        other: "%{count} спроб рэгіістрацыі за апошні тыдзень"
+      created_msg: Дамен эл. пошты паспяхова заблакіраваны
+      delete: Выдаліць
+      dns:
+        types:
+          mx: MX запіс
+      domain: Дамен
+      new:
+        create: Дадаць дамен
+        resolve: Вызначыць дамен
+        title: Заблакіраваць новы дамен эл. пошты
+      no_email_domain_block_selected: Блакіроўкі даменаў эл. пошты не былі змененыя, таму што ні адзін з іх не быў выбраны
+      resolved_dns_records_hint_html: Даменнае імя ператвараецца ў наступныя дамены MX, якія ў канчатковым выніку адказваюць за прыём электроннай пошты. Блакаванне дамена MX заблакуе рэгістрацыю з любога адраса электроннай пошты, які выкарыстоўвае той жа дамен MX, нават калі бачнае імя дамена адрозніваецца. <strong>Будзьце асцярожныя, каб не заблакіраваць асноўных пастаўшчыкоў электроннай пошты.</strong>
+      resolved_through_html: Вызначына каля %{domain}
+      title: Заблакаваныя паштовыя дамены
+    export_domain_allows:
+      new:
+        title: Імпарт дазволаў дамена
+      no_file: Файл не выбраны
+    export_domain_blocks:
+      import:
+        description_html: Вы збіраецеся імпартаваць спіс даменных блокаў. Калі ласка, праглядзіце гэты спіс вельмі ўважліва, асабліва калі вы асабіста не з'яўляецеся аўтарам гэтага спісу.
+        existing_relationships_warning: Наяўныя зносіны
+        private_comment_description_html: 'Каб дапамагчы вам адсочваць, адкуль паходзяць імпартаваныя блокі, імпартаваныя блокі будуць створаны з наступным прыватным каментарыем: <q>%{comment}</q>'
+        private_comment_template: Імпартавана з %{source} %{date}
+        title: Імпарт блакіровак дамену
+      new:
+        title: Імпарт блакіровак дамену
+      no_file: Файл не выбраны
+    follow_recommendations:
+      description_html: "<strong>Рэкамендацыі падпісак, дапамогаюць новым карыстальнікам хутка знайсці цікавы кантэнт</strong>. Калі карыстальнік недастаткова ўзаемадзейнічаў з іншымі, каб сфарміраваць персанальныя рэкамендацыі прытрымлівацца, замест гэтага рэкамендуюцца гэтыя ўліковыя запісы. Яны штодзённа пераразлічваюцца з сумесі ўліковых запісаў з самымі апошнімі ўзаемадзеяннямі і найбольшай колькасцю мясцовых падпісчыкаў для дадзенай мовы."
+      language: Для мовы
+      status: Статус
+      suppress: Схаваць рэкамендацыі падпісак
+      suppressed: Схаваныя
+      title: Рэкамендацыі падпісак
+      unsuppress: Аднавіць рэкамендацыі падпісак
+    instances:
+      availability:
+        description_html:
+          few: Калі дастаўка на дамен не атрымоўваецца праз <strong>%{count} іншыя дні</strong>, далейшыя спробы дастаўкі не будуць зроблены, пакуль не будзе атрымана дастаўка <em>з</em> дамена.
+          many: Калі дастаўка на дамен не атрымоўваецца праз <strong>%{count} іншых дзён</strong>, далейшыя спробы дастаўкі не будуць зроблены, пакуль не будзе атрымана дастаўка <em>з</em> дамена.
+          one: Калі дастаўка на дамен не атрымоўваецца праз <strong>%{count} дзень</strong>, далейшыя спробы дастаўкі не будуць зроблены, пакуль не будзе атрымана дастаўка <em>з</em> дамена.
+          other: Калі дастаўка на дамен не атрымоўваецца праз <strong>%{count} іншага дня</strong>, далейшыя спробы дастаўкі не будуць зроблены, пакуль не будзе атрымана дастаўка <em>з</em> дамена.
+        failure_threshold_reached: Парог памылак дасягнуты %{date}.
+        failures_recorded:
+          few: Памылковых спроб за %{count} розныя дні.
+          many: Памылковых спроб за %{count} розных дзён.
+          one: Памылковых спроб за %{count} дзень.
+          other: Памылковых спроб за %{count} розныя дні.
+        no_failures_recorded: Памылак не зарэгістравана.
+        title: Дасяжнасць
+        warning: Апошняя спроба падключэння да гэтага серверу была няўдалай
+      back_to_all: Усе
+      back_to_limited: Абмежаваныя
+      back_to_warning: Папярэджанне
+      by_domain: Дамен
+      confirm_purge: Вы ўпэўненыя, што хочаце незваротна выдаліць даныя з гэтага дамена?
+      content_policies:
+        comment: Унутраная нататка
+        description_html: Вы можаце вызначыць палітыку кантэнту, якая будзе прымяняцца да ўсіх уліковых запісаў гэтага дамена і любога з яго субдаменаў.
+        policies:
+          reject_media: Адхіліць мультымедыя
+          reject_reports: Адхіліць справаздачы
+          silence: Ліміт
+          suspend: Выключыць
+        policy: Палітыка
+        reason: Публічная прычына
+        title: Палітыкі кантэнту
+      dashboard:
+        instance_accounts_dimension: Уліковыя запісы з найбольшай колькасцю падпісак
+        instance_accounts_measure: захаваныя ўліковыя запісы
+        instance_followers_measure: нашых падпісчыкаў там
+        instance_follows_measure: іх падпісчыкаў тут
+        instance_languages_dimension: Папулярныя мовы
+        instance_media_attachments_measure: захаваныя медыя-ўкладанні
+        instance_reports_measure: справаздач пра іх
+        instance_statuses_measure: захаваных паведамленняў
+      delivery:
+        all: Усе
+        clear: Выдаліць памылкі дастаўкі
+        failing: Збой
+        restart: Перазапусціць дастаўку
+        stop: Спыніць дастаўку
+        unavailable: Недаступна
+      delivery_available: Дастаўка даступна
+      delivery_error_days: Дзён памылак дастаўкі
+      delivery_error_hint: Калі дастаўка немагчымая на працягу %{count} дзён, яна будзе аўтаматычна пазначана як недастаўленая.
+      destroyed_msg: Даныя з %{domain} цяпер стаяць у чарзе на неадкладнае выдаленне.
+      empty: Даменаў не знойдзена.
+      known_accounts:
+        few: "%{count} вядомых уліковых запісы"
+        many: "%{count} вядомых уліковых запісаў"
+        one: "%{count} вядомых уліковых запісаў"
+        other: "%{count} вядомых уліковых запісаў"
+      moderation:
+        all: Усе
+        limited: Абмежаваныя
+        title: Мадэрацыя
+      private_comment: Прыватны каментарый
+      public_comment: Публічны каментарый
+      purge: Ачысціць
+      purge_description_html: Калі вам здаецца, што гэты дамен больш не будзе працаваць, вы можаце выдаліць усе даныя ўліковых запісаў і звязаныя з даменам даныя з вашага сховішча. Гэта можа заняць нейкі час.
+      title: Федэрацыя
+      total_blocked_by_us: Заблакіравана намі
+      total_followed_by_them: Іхнія падпіскі
+      total_followed_by_us: Нашыя падпіскі
+      total_reported: Скаргі на іх
+      total_storage: Медыя дадаткі
+      totals_time_period_hint_html: Паказаныя агульныя значэнні ніжэй уключаюць даныя за ўвесь час.
+    invites:
+      deactivate_all: Дэактываваць усё
+      filter:
+        all: Усе
+        available: Даступна
+        expired: Пратэрмінавана
+        title: Фільтр
+      title: Запрашэнні
+    ip_blocks:
+      add_new: Стварыць правіла
+      created_msg: Новае IP правіла паспяхова дададзена
+      delete: Выдаліць
+      expires_in:
+        '1209600': 2 тыдні
+        '15778476': 6 месяцаў
+        '2629746': 1 месяц
+        '31556952': 1 год
+        '86400': 1 дзень
+        '94670856': 3 гады
+      new:
+        title: Стварыць новае IP правіла
+      no_ip_block_selected: Ніякія правілы IP не былі змененыя, таму што ні адно з іх не было выбрана
+      title: IP правілы
+    relationships:
+      title: Зносіны %{acct}
+    relays:
+      add_new: Дадаць новы рэтранслятар
+      delete: Выдаліць
+      description_html: "<strong>Федэрацыйны рэтранслятар</strong> - гэта прамежкавы сервер, які абменьваецца вялікімі аб'ёмамі публічных паведамленняў паміж серверамі, якія падпісваюцца і публікуюць на ім. <strong>Гэта можа дапамагчы малым і сярэднім серверам выяўляць кантэнт з fediverse</strong>, для чаго лакальным карыстальнікам у адваротным выпадку трэба было б уручную сачыць за іншымі людзьмі на аддаленых серверах."
+      disable: Адключыць
+      disabled: Адключана
+      enable: Уключыць
+      enable_hint: Пасля ўключэння ваш сервер падпішацца на ўсе публічныя паведамленні з гэтага рэтранслятара і пачне адпраўляць на яго агульнадаступныя паведамленні бягучага серверу.
+      enabled: Уключана
+      inbox_url: URL рэтранслятара
+      pending: Чаканне зацвярджэння рэтранслятара
+      save_and_enable: Захаваць і ўключыць
+      setup: Наладзіць злучэнне з рэтранслятарам
+      signatures_not_enabled: Рэтранслятары не будуць працаваць належным чынам, калі ўключаны бяспечны рэжым або рэжым абмежаванай федэрацыі
+      status: Стан
+      title: Рэтранслятары
+    report_notes:
+      created_msg: Скарга паспяхова створана!
+      destroyed_msg: Скарга паспяхова выдалена!
+    reports:
+      account:
+        notes:
+          few: "%{count} нататкі"
+          many: "%{count} нататак"
+          one: "%{count} нататка"
+          other: "%{count} нататкі"
+      action_log: Журнал аўдыту
+      action_taken_by: Дзеянне выканана
+      actions:
+        delete_description_html: Публікацыі, пра якія паведамляецца, будуць выдалены, а папярэджанне будзе запісана, каб дапамагчы вам эскаліраваць наступныя парушэнні з боку таго ж уліковага запісу.
+        mark_as_sensitive_description_html: Медыя кантэнт у паведамленнях, пра якія паведамляецца, будуць пазначаны як канфідэнцыяльныя, і будзе запісана папярэджанне, каб дапамагчы вам эскаліраваць наступныя парушэнні з боку таго ж уліковага запісу.
+        other_description_html: Глядзіце дадатковыя параметры для кіравання паводзінамі ўліковага запісу і настройкі сувязі з уліковым запісам, пра які паведамляецца.
+        resolve_description_html: Ніякіх дзеянняў супраць уліковага запісу, пра які паведамляецца, не будзе, папярэджэнне не зафіксавана, і скарга будзе закрыта.
+        silence_description_html: Профіль будзе бачны толькі тым, хто ўжо сочыць за ім або шукае яго ўручную, што значна абмяжоўвае яго ахоп. Заўсёды можна вярнуць.
+        suspend_description_html: Профіль і яго змесціва стане недаступным да моманту канчатковага выдалення. Камунікацыя з уліковым запісам будзе немагчымай. Можна скасаваць на працягу 30 дзён.
+      actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
+      add_to_report: Дадаць яшчэ дэталяў да скаргі
+      are_you_sure: Вы ўпэўнены?
+      assign_to_self: Прызначыць мне
+      assigned: Прызначаны мадэратар
+      by_target_domain: Дамен уліковага запісу, на які падаецца скарга
+      category: Катэгорыя
+      category_description_html: Прычына паведамлення аб гэтым уліковым запісе і/або кантэнце будзе згадана ў сувязі з уліковым запісам, на які пададзена скарга
+      comment:
+        none: Пуста
+      comment_description_html: 'Каб даць больш інфармацыі, %{name} напісаў:'
+      created_at: Створана
+      delete_and_resolve: Выдаліць допісы
+      forwarded: Пераслана
+      forwarded_to: Пераслана на %{domain}
+      mark_as_resolved: Пазначыць як вырашаную
+      mark_as_sensitive: Пазначыць як далікатны
+      mark_as_unresolved: Пазначыць як нявырашаную
+      no_one_assigned: Ніводны
+      notes:
+        create: Дадаць нататку
+        create_and_resolve: Вырашыць з нататкай
+        create_and_unresolve: Паўторна адкрыць з нататкай
+        delete: Выдаліць
+        placeholder: Апішыце, якія дзеянні былі зроблены, або любыя іншыя звязаныя абнаўленні...
+        title: Нататкі
+      notes_description_html: Праглядвайце і пакідайце нататкі іншым мадэратарам і сабе ў будучыні
+      quick_actions_description_html: 'Выканайце хуткае дзеянне або пракруціце ўніз, каб убачыць змесціва, на якое пададзена скарга:'
+      remote_user_placeholder: аддалены карыстальнік з %{instance}
+      reopen: Пераадкрыць скаргу
+      report: 'Скарга #%{id}'
+      reported_account: Уліковы запіс парушальніка
+      reported_by: Адпраўнік скаргі
+      resolved: Вырашана
+      resolved_msg: Скарга была паспяхова вырашана!
+      skip_to_actions: Прапусціць дзеянні
+      status: Стан
+      statuses: Змесціва, на якое паскардзіліся
+      statuses_description_html: Крыўднае змесціва будзе згадвацца ў зносінах з уліковым запісам, на які пададзена скарга
+      target_origin: Крыніца уліковага запісу на які пададзена скарга
+      title: Скаргі
+      unassign: Скінуць
+      unresolved: Нявырашаныя
+      updated_at: Абноўлена
+      view_profile: Паглядзець профіль
+    roles:
+      add_new: Дадаць ролю
+      assigned_users:
+        few: "%{count} карыстальнікі"
+        many: "%{count} карыстальнікаў"
+        one: "%{count} карыстальнік"
+        other: "%{count} карыстальніка"
+      categories:
+        administration: Адміністрацыя
+        devops: DevOps
+        invites: Запрашэнні
+        moderation: Мадэрацыя
+        special: Спецыяльны
+      delete: Выдаліць
+      description_html: З дапамогай <strong>роляў карыстальнікаў</strong> вы можаце наладзіць, да якіх функцый і абласцей Mastodon будуць мець доступ вашы карыстальнікі.
+      edit: Рэдагаваць ролю "%{name}"
+      everyone: Дазволы па змаўчанні
+      everyone_full_description_html: Гэта <strong>базавая роля</strong>, якая ўплывае на <strong>ўсіх карыстальнікаў</strong>, нават без прызначанай ролі. Усе астатнія ролі ўспадкоўваюць ад яго дазволы.
+      permissions_count:
+        few: "%{count} дазволы"
+        many: "%{count} дазволаў"
+        one: "%{count} дазвол"
+        other: "%{count} дазволу"
+      privileges:
+        administrator: Адміністратар
+        administrator_description: Карыстальнікі з гэтым дазволам будуць абыходзіць усе абмежаванні
+        delete_user_data: Выдаленне даных карыстальнікаў
+        delete_user_data_description: Дазваляе карыстальнікам без затрымкі выдаляць даныя іншых карыстальнікаў
+        invite_users: Запрашэнне карыстальнікаў
+        invite_users_description: Дазваляе запрашаць новых людзей на сервер
+        manage_announcements: Кіраванне аб'явамі
+        manage_announcements_description: Дазваляе кіраваць аб'явамі на серверы
+        manage_appeals: Кіраванне апеляцыямі
+        manage_appeals_description: Дазваляе карыстальнікам разглядаць апеляцыі на дзеянні мадэратара
+        manage_blocks: Кіраванне блакіроўкамі
+        manage_blocks_description: Дазваляе блакаваць пэўныя паштовыя правайдэры і IP адрасы
+        manage_custom_emojis: Кіраванне адвольнымі эмодзі
+        manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы
+        manage_federation: Кіраваць федэрацыяй
+        manage_federation_description: Дазваляе карыстальнікам блакіраваць або дазваляць аб'яднанне з іншымі даменамі і кантраляваць магчымасць дастаўкі
+        manage_invites: Кіраванне запрашэннямі
+        manage_invites_description: Дазваляе праглядаць і дэактывоўваць запрашальныя спасылкі
+        manage_reports: Кіраванне скаргамі
+        manage_reports_description: Дазваляе разглядаць скаргі і прымаць захады мадэрацыі
+        manage_roles: Кіраванне ролямі
+        manage_roles_description: Дазваляе карыстальнікам кіраваць і прызначаць ролі, ніжэйшыя за іх
+        manage_rules: Кіраванне правіламі
+        manage_rules_description: Дазваляе змяняць правілы сервера
+        manage_settings: Кіраванне наладамі
+        manage_settings_description: Дазваляе змяняць налады сервера
+        manage_taxonomies: Кіраванне катэгорыямі
+        manage_taxonomies_description: Дазваляе карыстальнікам праглядаць папулярны кантэнт і абнаўляць налады хэштэгаў
+        manage_user_access: Кіраванне наладамі доступу карыстальнікаў
+        manage_user_access_description: Дазваляе адключаць двухфактарную аўтэнтыфікацыю іншым карыстальнікам, змяняць іх паштовы адрас і скідваць пароль
+        manage_users: Кіраванне карыстальнікамі
+        manage_users_description: Дазваляе праглядаць звесткі іншых карыстальнікаў і іх мадэрацыю
+        manage_webhooks: Кіраванне вэбхукамі
+        manage_webhooks_description: Дазваляе карыстальнікам наладжваць вэб-хукі для адміністрацыйных аперацый
+        view_audit_log: Кіраванне журналам аўдыту
+        view_audit_log_description: Дазваляе карыстальнікам бачыць гісторыю адміністрацыйных аперацый на серверы
+        view_dashboard: Прагляд панэлі кіравання
+        view_dashboard_description: Дазваляе праглядаць панэль кіравання і розныя метрыкі
+        view_devops: DevOps
+        view_devops_description: Дае доступ да панэляў кіравання Sidekiq і pgHero
+      title: Ролі
+    rules:
+      add_new: Дадаць правіла
+      delete: Выдаліць
+      description_html: Большасць сцвярджаюць, што прачыталі ўмовы абслугоўвання і згаджаюцца з імі, але звычайна людзі не чытаюць іх да канца, пакуль не ўзнікне праблема. <strong>Таму зрабіце правілы вашага сервера простымі з першага погляду, прадставіўшы іх у выглядзе маркіраванага спісу.</strong> Старайцеся рабіць правілы кароткімі і простымі, але не разбіваць іх на шмат асобных пунктаў.
+      edit: Рэдагаваць правіла
+      empty: Правілы сервера яшчэ не вызначаны.
+      title: Правілы сервера
+    settings:
+      about:
+        manage_rules: Кіраваць правіламі сервера
+        preamble: Дайце падрабязную інфармацыю аб тым, як сервер працуе, мадэруецца, фінансуецца.
+        rules_hint: Існуе спецыяльная вобласць для правілаў, якіх вашы карыстальнікі павінны прытрымлівацца.
+        title: Пра нас
+      appearance:
+        preamble: Наладзьце вэб-інтэрфейс Mastodon.
+        title: Выгляд
+      branding:
+        preamble: Брэндынг вашага сервера адрознівае яго ад іншых сервераў у сетцы. Гэтая інфармацыя можа адлюстроўвацца ў розных асяроддзях, напрыклад, у вэб-інтэрфейсе Mastodon, уласных праграмах, у папярэднім праглядзе спасылак на іншых вэб-сайтах і ў праграмах абмену паведамленнямі і гэтак далей. Па гэтай прычыне лепш трымаць гэтую інфармацыю яснай, кароткай і сціслай.
+        title: Брэндынг
+      content_retention:
+        preamble: Кантралюйце, як створаны карыстальнікамі кантэнт захоўваецца ў Mastodon.
+        title: Утрыманне кантэнту
+      default_noindex:
+        desc_html: Уплывае на ўсіх карыстальнікаў, якія не змянілі гэтую наладу самастойна
+        title: Перадвызначана выключыць карыстальнікаў з індэксацыі пашуковымі рухавікамі
+      discovery:
+        follow_recommendations: Выконвайце рэкамендацыі
+        preamble: Прадстаўленне цікавага кантэнту дапамагае прыцягнуць новых карыстальнікаў, якія могуць не ведаць нікога на Mastodon. Кантралюйце працу розных функцый выяўлення на вашым серверы.
+        profile_directory: Дырэкторыя профіляў
+        public_timelines: Публічная паслядоўнасць публікацый
+        title: Выяўленне
+        trends: Актуальныя
+      domain_blocks:
+        all: Для ўсіх
+        disabled: Нікому
+        users: Лакальным карыстальнікам, якія ўвайшлі
+      registrations:
+        preamble: Кантралюйце, хто можа ствараць уліковы запіс на вашым серверы.
+        title: Рэгістрацыя
+      registrations_mode:
+        modes:
+          approved: Для рэгістрацыі патрабуецца пацвярджэнне
+          none: Нікому не магчыма зарэгістравацца
+          open: Любому магчыма зарэгістравацца
+      title: Налады сервера
+    site_uploads:
+      delete: Выдаліць запампаваны файл
+      destroyed_msg: Загрузка сайту паспяхова выдалена!
+    statuses:
+      account: Аўтар
+      application: Праграма
+      back_to_account: Назад да старонкі ўліковага запісу
+      back_to_report: Назад да старонкі справаздачы
+      batch:
+        remove_from_report: Выдаліць са справаздачы
+        report: Справаздача
+      deleted: Выдалены
+      favourites: Упадабаныя
+      history: Гісторыя версій
+      in_reply_to: Адказваючы на
+      language: Мова
+      media:
+        title: Медыя
+      metadata: Метаданыя
+      no_status_selected: Ніводная публікацыя не была зменена, бо ніводная не была выбрана
+      open: Адкрыць допіс
+      original_status: Зыходны допіс
+      reblogs: Рэпосты
+      status_changed: Допіс зменены
+      title: Допісы уліковага запісу
+      trending: Папулярныя
+      visibility: Бачнасць
+      with_media: З медыя
+    strikes:
+      actions:
+        delete_statuses: "%{name} выдаліў запісы %{target}"
+        disable: "%{name} замарозіў уліковы запіс %{target}"
+        mark_statuses_as_sensitive: "%{name} пазначыў запісы %{target} як уразлівыя"
+        none: "%{name} даслаў папярэджанне %{target}"
+        sensitive: "%{name} пазначыў уліковы запіс %{target} як уразлівы"
+        silence: "%{name} абмежаваў уліковы запіс %{target}"
+        suspend: Уліковы запіс %{target} выключаны %{name}
+      appeal_approved: Абскарджана
+      appeal_pending: Апеляцыя разглядаецца
+    system_checks:
+      database_schema_check:
+        message_html: Ёсць незавершаныя міграцыі базы дадзеных. Калі ласка, запусціце іх, каб пераканацца, што дадатак паводзіць сябе належным чынам
+      elasticsearch_running_check:
+        message_html: Немагчыма падключыцца да Elasticsearch. Калі ласка, праверце, што ён запушчаны, або адключыце паўнатэкставы пошук
+      elasticsearch_version_check:
+        message_html: 'Несумяшчальная версія Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} выяўлены, але патрабуецца %{required_version}
+      rules_check:
+        action: Кіраваць правіламі сервера
+        message_html: Вы не вызначылі ніякіх правілаў сервера.
+      sidekiq_process_check:
+        message_html: Не працуе працэс Sidekiq для %{value} чаргі. Калі ласка праверце вашу канфігурацыю Sidekiq
+    tags:
+      review: Стан праверкі
+      updated_msg: Налады хэштэгаў паспяхова змененыя
+    title: Адміністрацыя
+    trends:
+      allow: Дазволіць
+      approved: Пацверджаны
+      disallow: Забараніць
+      links:
+        allow: Дазволіць спасылка
+        allow_provider: Дазволіць выдаўца
+        description_html: Гэта спасылкі, якія зараз часта распаўсюджваюцца ўліковымі запісамі, з якіх ваш сервер бачыць паведамленні. Гэта можа дапамагчы вашым карыстальнікам даведацца, што адбываецца ў свеце. Ніякія спасылкі не будуць паказвацца публічна, пакуль вы не зацвердзіце аўтара. Вы таксама можаце дазволіць або адхіліць асобныя спасылкі.
+        disallow: Забараніць спасылку
+        disallow_provider: Дазволіць выдаўца
+        no_link_selected: Ніводная спасылка не была зменена, бо ніводная не была выбрана
+        publishers:
+          no_publisher_selected: Выдаўцы не былі зменены, таму што ніводзін не быў абраны
+        shared_by_over_week:
+          few: Абагулілі %{count} чалавекі за апошні тыдзень
+          many: Абагулілі %{count} чалавек за апошні тыдзень
+          one: Абагуліў адзін чалавек за апошні тыдзень
+          other: Абагулілі %{count} чалавек за апошні тыдзень
+        title: Актуальныя спасылкі
+        usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
+      only_allowed: Толькі дазволенае
+      pending_review: Чакае праверкі
+      preview_card_providers:
+        allowed: Спасылкі ад гэтага выдаўца не будуць у трэндзе
+        description_html: Спасылкі з гэтых даменаў часта абагульняюцца на вашым серверы. Спасылкі не трапяць у публічныя трэнды, калі дамен спасылкі не ўхвалены. Вашае ўхваленне (ці адхіленне) распаўсюдзіцца на субдамены.
+        rejected: Спасылкі ад гэтага выдаўца не будуць у трэнде
+        title: Выдаўцы
+      rejected: Адхілена
+      statuses:
+        allow: Дазволіць допіс
+        allow_account: Дазволіць аўтара
+        description_html: Гэта допісы, пра якія ведае ваш сервер, што на дадзены момант часта абагульваюцца і падабаюцца людзям. Гэта можа дапамагчы вашым новым і пастаянным карыстальнікам знайсці больш людзей, на якіх можна падпісацца. Ніякія допісы не будуць паказвацца публічна, пакуль вы не зацвердзіце аўтара, а аўтар не дазволіць прапанаваць свой уліковы запіс іншым. Вы таксама можаце дазволіць або адхіліць асобныя допісы.
+        disallow: Забараніць допіс
+        disallow_account: Забараніць аўтара
+        no_status_selected: Ніводны папулярны допіс не быў зменены, бо ніводны не быў выбраны
+        not_discoverable: Аўтар вырашыў быць нябачным
+        shared_by:
+          few: Пашыраны або ўпадабаны %{friendly_count} разы
+          many: Пашыраны або ўпадабаны %{friendly_count} разоў
+          one: Пашыраны або ўпадабаны %{friendly_count} раз
+          other: Пашыраны або ўпадабаны %{friendly_count} разоў
+        title: Актуальныя допісы
+      tags:
+        current_score: Бягучы рэзультат %{score}
+        dashboard:
+          tag_accounts_measure: унікальнае выкарыстанне
+          tag_languages_dimension: Папулярныя мовы
+          tag_servers_dimension: Папулярныя серверы
+          tag_servers_measure: розныя серверы
+          tag_uses_measure: усяго выкарыстанняў
+        description_html: Гэтыя хэштэгі зараз з'яўляюцца у мностве допісаў, якія бачыць ваш сервер. Гэта дапаможа вашым карыстальнікам даведацца аб чым зараз больш за ўсё размаўляюць людзі. Ніякі хэштэг не з'явіцца публічна пакуль вы яго не пацвердзіце.
+        listable: Можа быць прапанавана
+        no_tag_selected: Ніводны тэг не быў зменены, бо ніводны не быў выбраны
+        not_listable: Не будзе прапанавана
+        not_trendable: Не з'явіцца ў трэндах
+        not_usable: Немагчыма выкарыстаць
+        peaked_on_and_decaying: На піку %{date}, зараз спадае
+        title: Актуальныя хэштэгі
+        trendable: Можа з'явіцца сярод трэндаў
+        trending_rank: 'Папулярнае #%{rank}'
+        usable: Магчыма выкарыстаць
+        usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
+        used_by_over_week:
+          few: Выкарысталі %{count} чалавекі за апошні тыдзень
+          many: Выкарысталі %{count} чалавек за апошні тыдзень
+          one: Выкарыстаў адзін чалавек за апошні тыдзень
+          other: Выкарысталі %{count} чалавек за апошні тыдзень
+      title: Актуальныя
+      trending: Папулярныя
+    warning_presets:
+      add_new: Дадаць новы
+      delete: Выдаліць
+      edit_preset: Рэдагаваць шаблон папярэджання
+      empty: Вы яшчэ не вызначылі ніякіх шаблонаў папярэджанняў.
+      title: Кіраванне шаблонамі папярэджанняў
+    webhooks:
+      add_new: Дадаць канцавую кропку
+      delete: Выдаліць
+      description_html: "<strong>Вэбхук</strong> дазваляе Mastodon адпраўляць <strong>апавяшчэнні ў рэальным часе</strong> аб выбраных падзеях у вашай уласнай праграме, каб яна магла <strong>аўтаматычна рэагаваць на іх</strong>."
+      disable: Адключыць
+      disabled: Адключана
+      edit: Рэдагаваць канцавую кропку
+      empty: У вас яшчэ няма сканфігураваных канчатковых кропак вэбхука.
+      enable: Уключыць
+      enabled: Уключана
+      enabled_events:
+        few: "%{count} актыўныя падзеі"
+        many: "%{count} актыўных падзей"
+        one: 1 актыўная падзея
+        other: "%{count} актыўнай падзеі"
+      events: Падзеі
+      new: Новая вэбхука
+      rotate_secret: Павярнуць сакрэт
+      secret: Падпісанне сакрэту
+      status: Стан
+      title: Вэбхукі
+      webhook: Вэбхук
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: выдаліць іх допісы
+        disable: замарозіць уліковы запіс
+        mark_statuses_as_sensitive: пазначыць іх допісы як далікатныя
+        none: папярэджанне
+        sensitive: пазначыць уліковы запіс як далікатны
+        silence: абмежаваць уліковы запіс
+        suspend: выключыць уліковы запіс
+      body: "%{target} абскарджвае рашэнне мадэратара %{action_taken_by} ад %{date}, якая была %{type}. Яны напісалі:"
+      next_steps: Вы можаце ўхваліць апеляцыю каб адмяніць рашэнне мадэратараў ці ігнараваць яе.
+      subject: "%{username} абскарджвае рашэнне мадэратараў на %{instance}"
+    new_pending_account:
+      body: Падрабязнасці новага ўліковага запісу прыведзены ніжэй. Вы можаце зацвердзіць або адхіліць гэтую заяўку.
+      subject: Новы ўліковы запіс для разгляду ў %{instance} (%{username})
+    new_report:
+      body: "%{reporter} паскардзіўся на %{target}"
+      body_remote: Нехта з %{domain} паскардзіўся на %{target}
+      subject: Новая скарга на %{instance} (#%{id})
+    new_trends:
+      body: 'Гэтыя элементы трэба праверыць, перш чым публікаваць:'
+      new_trending_links:
+        title: Папулярныя спасылкі
+      new_trending_statuses:
+        title: Папулярныя допісы
+      new_trending_tags:
+        no_approved_tags: Зараз няма зацверджаных папулярных хэштэгаў.
+        requirements: 'Кожны з гэтых кандыдатаў можа перавысіць #%{rank} зацверджаных папулярных хэштэгаў. Зараз гэта #%{lowest_tag_name} з лікам %{lowest_tag_score}.'
+        title: Папулярныя хэштэгі
+      subject: Новае ў папулярным для разгляду %{instance}
+  aliases:
+    add_new: Стварыць псеўданім
+    created_msg: Створаны новы псеўданім. Цяпер вы можаце пачаць пераход са старога ўліковага запісу.
+    deleted_msg: Псеўданім выдалены. Пераход з таго ўліковага запісу на гэты больш немагчымы.
+    empty: У вас няма псеўданімаў.
+    hint_html: Калі вы хочаце перайсці з іншага ўліковага запісу ў гэты, то тут вы можаце стварыць псеўданім, каб перамясціць падпісчыкаў са старога ўліковага запісу ў гэты. Гэта дзеянне з'яўляецца <strong>бясшкодным і зварачальным</strong>. <strong>Перанос уліковага запісу пачынаецца са старога ўліковага запісу</strong>.
+    remove: Адмацаваць псеўданім
+  appearance:
+    advanced_web_interface: Пашыраны вэб-інтэрфейс
+    advanced_web_interface_hint: 'Калі вы хочаце выкарыстоўваць усю шырыню экрана, пашыраны вэб-інтэрфейс дазваляе вам наладзіць мноства розных слупкоў, каб бачыць столькі інфармацыі, колькі вам трэба: галоўная, апавяшчэнні, глабальная стужка, любая колькасць спісаў і хэштэгаў.'
+    animations_and_accessibility: Анімацыі і даступнасць
+    confirmation_dialogs: Дыялогавыя вокны пацвярджэння
+    discovery: Адкрыцці
+    localization:
+      body: Mastodon перакладаецца добраахвотнікамі.
+      guide_link: https://be.crowdin.com/project/mastodon/be
+      guide_link_text: Кожны можа зрабіць унёсак.
+    sensitive_content: Далікатны змест
+    toot_layout: Макет допісу
+  application_mailer:
+    notification_preferences: Змяніць налады эл. пошты
+    salutation: "%{name},"
+    settings: 'Змяніць налады эл. пошты: %{link}'
+    view: 'Паглядзець:'
+    view_profile: Паглядзець профіль
+    view_status: Паглядзець допіс
+  applications:
+    created: Праграма паспяхова створана
+    destroyed: Праграма паспяхова выдалена
+    regenerate_token: Стварыць новы токен доступу
+    token_regenerated: Новы токен доступу паспяхова створаны
+    warning: Будзьце вельмі асцярожныя з гэтымі данымі. Ніколі нікому не паведамляйце іх!
+    your_token: Ваш токен доступу
+  auth:
+    apply_for_account: Пакінуць заяўку
+    change_password: Пароль
+    delete_account: Выдаліць уліковы запіс
+    delete_account_html: Калі вы жадаеце выдаліць ваш уліковы запіс, можаце <a href="%{path}">працягнуць тут</a>. Ад вас будзе запатрабавана пацвярджэнне.
+    description:
+      prefix_invited_by_user: "@%{name} запрашае вас далучыцца да гэтага сервера ў Mastodon!"
+      prefix_sign_up: Зарэгістравацца ў Mastodon сёння!
+      suffix: Маючы ўліковы запіс, вы зможаце падпісвацца на іншых людзей, дзяліцца навінамі і абменьвацца паведамленнямі з карыстальнікамі з любога сервера Mastodon і шмат што яшчэ!
+    didnt_get_confirmation: Не атрымалі інструкцыю пацвярджэння?
+    dont_have_your_security_key: Не маеце ключа бяспекі?
+    forgot_password: Забылі свой пароль?
+    invalid_reset_password_token: Токен для скідвання пароля несапраўдны або састарэў. Зрабіце запыт на новы.
+    link_to_otp: Увядзіце код двухфактарнай аўтэнтыфікацыі з вашага тэлефона або код аднаўлення
+    link_to_webauth: Скарыстайцеся вашай прыладай з ключом бяспекі
+    log_in_with: Увайсці праз
+    login: Увайсці
+    logout: Выйсці
+    migrate_account: Пераехаць на іншы ўліковы запіс
+    migrate_account_html: Калі вы хочаце перанакіраваць гэты ўліковы запіс на іншы, то можаце <a href="%{path}">наладзіць яго тут</a>.
+    or_log_in_with: Або ўвайсці з дапамогай
+    privacy_policy_agreement_html: Я азнаёміўся і пагаджаюся з <a href="%{privacy_policy_path}" target="_blank">палітыкай канфідэнцыйнасці</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Зарэгістравацца
+    registration_closed: "%{instance} больш не прымае новых удзельнікаў"
+    resend_confirmation: Адправіць інструкцыю пацвярджэння зноў
+    reset_password: Скінуць пароль
+    rules:
+      preamble: Правілы вызначаныя мадэратарамі дамена %{domain}.
+      title: Некалькі базавых правілаў.
+    security: Бяспека
+    set_new_password: Прызначыць новы пароль
+    setup:
+      email_below_hint_html: Калі прыведзены ніжэй адрас эл. пошты няправільны, вы можаце змяніць яго тут і атрымаць новае пацвярджэнне па эл. пошце.
+      email_settings_hint_html: Ліст з пацвярджэннем быў адпраўлены на %{email}. Калі гэты адрас эл. пошты няправільны, вы можаце змяніць яго ў наладах уліковага запісу.
+      title: Налады
+    sign_in:
+      preamble_html: Уваход з уліковымі дадзенымі <strong>%{domain}</strong>. Калі ваш уліковы запіс знаходзіцца на іншым серверы, у вас не атрымаецца ўвайсці тут.
+      title: Уваход у %{domain}
+    sign_up:
+      preamble: Маючы ўліковы запіс на гэтым серверы Mastodon, вы будзеце мець магчымасць падпісацца на кожнага чалавека ў сетцы, незалежна ад таго, на якім серверы размешчаны ягоны ўліковы запіс.
+      title: Наладзьма вас на %{domain}.
+    status:
+      account_status: Стан уліковага запісу
+      confirming: Чакаецца пацвярджэнне з электроннай пошты.
+      functional: Ваш уліковы запіс поўнасцю працуе.
+      pending: Ваша заяўка разглядаецца нашым супрацоўнікам. Гэта можа заняць некаторы час. Вы атрымаеце электронны ліст, калі заяўка будзе ўхвалена.
+      redirecting_to: Ваш уліковы запіс неактыўны, бо ў цяперашні час ён перанакіроўваецца на %{acct}.
+      view_strikes: Праглядзець мінулыя папярэджанні для вашага ўліковага запісу
+    too_fast: Форма адпраўлена занадта хутка, паспрабуйце яшчэ раз.
+    use_security_key: Выкарыстаеце ключ бяспекі
+  authorize_follow:
+    already_following: Вы ўжо падпісаныя на гэты ўліковы запіс
+    already_requested: Вы ўжо адправілі запыт на гэты ўліковы запіс
+    error: На жаль, падчас пошуку аддаленага ўліковага запісу здарылася памылка
+    follow: Падпісацца
+    follow_request: 'Вы адправілі запыт на падпіску:'
+    following: 'Поспех! Цяпер вы падпісаны на:'
+    post_follow:
+      close: Або, вы можаце проста закрыць гэтае акно.
+      return: Паказаць профіль карыстальніка
+      web: Перайсці ў вэб-версію
+    title: Падпісацца на %{acct}
+  challenge:
+    confirm: Працягнуць
+    hint_html: "<strong>Парада:</strong> Мы не будзем запытваць ваш пароль зноўку на працягу наступнай гадзіны."
+    invalid_password: Няправільны пароль
+    prompt: Пацвердзіць пароль, каб працягнуць
+  crypto:
+    errors:
+      invalid_key: гэта не сапраўдны Ed25519 або Curve25519 ключ
+      invalid_signature: гэта не сапраўдная Ed25519 сігнатура
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      with_month_name: "%e %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}гадз"
+      about_x_months: "%{count}мес"
+      about_x_years: "%{count}г"
+      almost_x_years: "%{count}г"
+      half_a_minute: Толькі што
+      less_than_x_minutes: "%{count}хв"
+      less_than_x_seconds: Толькі што
+      over_x_years: "%{count}г."
+      x_days: "%{count}д"
+      x_minutes: "%{count}хв"
+      x_months: "%{count}мес"
+      x_seconds: "%{count}с"
+  deletes:
+    challenge_not_passed: Уведзеная інфармацыя няправільная
+    confirm_password: Увядзіце свой бягучы пароль, каб пацвердзіць сваю асобу
+    confirm_username: Увядзіце сваё імя карыстальніка для пацвярджэння працэдуры
+    proceed: Выдаліць уліковы запіс
+    success_msg: Ваш уліковы запіс быў паспяхова выдалены
+    warning:
+      before: 'Перш чым працягнуць, уважліва прачытайце гэтыя заўвагі:'
+      caches: Змесціва, кэшаванае іншымі серверамі, можа захавацца
+      data_removal: Вашы допісы і іншыя даныя будуць выдалены назаўсёды
+      email_change_html: Вы можаце <a href="%{path}">змяніць свой адрас электроннай пошты</a>, не выдаляючы ўліковы запіс
+      email_contact_html: Калі ліст усё яшчэ не дайшоў, вы можаце звярнуцца па дапамогу на эл. пошту <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Калі вы не атрымалі пацвярджэнне па электроннай пошце, вы можаце <a href="%{path}">запытаць яго зноў</a>
+      irreversible: Вы не зможаце аднавіць або паўторна актываваць свой уліковы запіс
+      more_details_html: Падрабязнасці глядзіце ў <a href="%{terms_path}">палітыцы прыватнасці</a>.
+      username_available: Ваша імя карыстальніка зноў стане даступным
+      username_unavailable: Ваша імя карыстальніка застанецца недаступным
+  disputes:
+    strikes:
+      action_taken: Выкананае дзеянне
+      appeal: Апеляцыя
+      appeal_approved: Гэтае папярэджанне паспяхова абскарджана і больш не дзейнічае
+      appeal_rejected: Апеляцыя была адхілена
+      appeal_submitted_at: Апеляцыя пададзена
+      appealed_msg: Ваша апеляцыя пададзена. У выпадку, калі яе зацвердзяць, вам паведамяць.
+      appeals:
+        submit: Падаць апеляцыю
+      approve_appeal: Зацвердзіць апеляцыю
+      associated_report: Звязаная скарга
+      created_at: Датаваны
+      description_html: Гэта дзеянні, выкананыя супраць вашага ўліковага запісу, і папярэджанні, якія адпраўлены вам супрацоўнікамі %{instance}.
+      recipient: Адрасавана
+      reject_appeal: Адхіліць апеляцыю
+      status: 'Допіс #%{id}'
+      status_removed: Допіс ужо выдалены з сістэмы
+      title: "%{action} ад %{date}"
+      title_actions:
+        delete_statuses: Выдаленне допісу
+        disable: Замарозка уліковага запісу
+        mark_statuses_as_sensitive: Пазначыць допісы як далікатныя
+        none: Папярэджанне
+        sensitive: Пазначэнне ўліковага запісу як далікатнага
+        silence: Абмежаванне ўліковага запісу
+        suspend: Выключэнне ўліковага запісу
+      your_appeal_approved: Ваша абскарджанне было ўхвалена
+      your_appeal_pending: Вы адправілі апеляцыю
+      your_appeal_rejected: Ваша абскарджанне было адхілена
+  domain_validator:
+    invalid_domain: не з'яўляецца сапраўдным даменным імем
+  errors:
+    '400': Запыт, які вы адправілі, памылковы або няправільны.
+    '403': У вас няма дазволу на прагляд гэтай старонкі.
+    '404': Няма старонкі, якую вы шукаеце.
+    '406': Старонка недасяжная ў запатрабаваным фармаце.
+    '410': Старонка, якую вы шукаеце, больш не існуе.
+    '422':
+      content: Памылка праверкі бяспекі. Вы заблакіравалі cookies?
+      title: Памылка праверкі бяспекі
+    '429': Зашмат запытаў
+    '500':
+      content: Выбачце! Нешта пайшло не так на нашым баку.
+      title: Старонка няспраўная
+    '503': Старонку немагчыма адлюстраваць з-за часовага збою сервера.
+    noscript_html: Каб выкарыстоўваць вэб-праграму Mastodon, уключыце JavaScript. Акрамя таго, паспрабуйце адну з <a href="%{apps_path}">арыгінальных праграм</a> Mastodon для вашай платформы.
+  existing_username_validator:
+    not_found: не атрымалася знайсці лакальны ўліковы запіс з такім імем карыстальніка
+    not_found_multiple: не атрымалася знайсці %{usernames}
+  exports:
+    archive_takeout:
+      date: Дата
+      download: Спампаваць ваш архіў
+      hint_html: Вы можаце зрабіць запыт архіва сваіх <strong>допісаў і запампаваных медыя</strong>. Экспартаваныя даныя будуць мець фармат ActivityPub, які можна прачытаць любым сумяшчальным праграмным забеспячэннем. Запыт архіва можна рабіць кожныя 7 дзён.
+      in_progress: Збіраем ваш архіў...
+      request: Запатрабаваць ваш архіў
+      size: Памер
+    blocks: Спіс блакіроўкі
+    bookmarks: Закладкі
+    csv: CSV
+    domain_blocks: Блакіроўкі дамена
+    lists: Спісы
+    mutes: Уліковыя запісы, якія вы ігнаруеце
+    storage: Медыясховішча
+  featured_tags:
+    add_new: Дадаць новы
+    errors:
+      limit: Вы ўжо дадалі максімальную колькасць хэштэгаў
+    hint_html: "<strong>Што такое выбраныя хэштэгі?</strong> Яны паказваюцца на бачным месцы вашага профілю і дазваляюць людзям праглядаць вашыя публічныя пасты з гэтымі хэштэгамі. З іхняй дапамогай вельмі зручна сачыць за творчымі ці даўгатэрміновымі праектамі."
+  filters:
+    contexts:
+      account: Профілі
+      home: Стужка і спісы
+      notifications: Апавяшчэнні
+      public: Публічныя стужкі
+      thread: Размовы
+    edit:
+      add_keyword: Дадаць ключавое слова
+      keywords: Ключавыя словы
+      statuses: Асобныя допісы
+      statuses_hint_html: Гэты фільтр ужываецца каб абраць асобныя запісы незалежна ад таго, ці ўтрымліваюць яны ключавыя словы са спісу ніжэй.<a href="%{path}">Праверце ці выдаліце допісы з фільтру</a>.
+      title: Рэдагаваць фільтр
+    errors:
+      deprecated_api_multiple_keywords: Гэтыя параметры нельга памяняць з бягучай праграмы таму што яны ўжываюцца для больш чым аднаго ключавога слова. Скарыстайцеся навейшай версіяй праграмы ці вэб-інтэрфейсам.
+      invalid_context: Дадзены кантэкст недастатковы альбо памылковы
+    index:
+      contexts: Фільтры ў %{contexts}
+      delete: Выдаліць
+      empty: У вас няма фільтраў.
+      expires_in: Сканчаецца праз %{distance}
+      expires_on: Сканчаецца %{date}
+      keywords:
+        few: "%{count} ключавыя словы"
+        many: "%{count} ключавых слоў"
+        one: "%{count} ключавое слова"
+        other: "%{count} ключавога слова"
+      statuses:
+        few: "%{count} допісы"
+        many: "%{count} допісаў"
+        one: "%{count} допіс"
+        other: "%{count} допісу"
+      statuses_long:
+        few: "%{count} допісы схаваны"
+        many: "%{count} допісаў схавана"
+        one: "%{count} допіс схаваны"
+        other: "%{count} допісу схавана"
+      title: Фільтры
+    new:
+      save: Захаваць новы фільтр
+      title: Дадаць новы фільтр
+    statuses:
+      back_to_filter: Вярнуцца да фільтра
+      batch:
+        remove: Выдаліць з фільтра
+      index:
+        hint: Гэты фільтр прымяняецца для выбару асобных допісаў незалежна ад іншых крытэрыяў. Вы можаце дадаць больш допісаў у гэты фільтр з вэб-інтэрфейсу.
+        title: Адфільтраваныя допісы
+  footer:
+    trending_now: Актуальнае
+  generic:
+    all: Усе
+    all_items_on_page_selected_html:
+      few: На гэтай старонцы абраныя ўсе <strong>%{count}</strong> элементы.
+      many: На гэтай старонцы абраныя ўсе <strong>%{count}</strong> элементаў.
+      one: На гэтай старонцы абраны <strong>%{count}</strong> элемент.
+      other: На гэтай старонцы абраныя усі <strong>%{count}</strong> элементаў.
+    all_matching_items_selected_html:
+      few: Абраныя ўсе <strong>%{count}</strong> элементы, якія адпавядаюць вашаму пошуку.
+      many: Абраныя ўсе <strong>%{count}</strong> элементаў, якія адпавядаюць вашаму пошуку.
+      one: Абраны <strong>%{count}</strong> элемент, які адпавядае вашаму пошуку.
+      other: Абраныя <strong>%{count}</strong> элементаў, якія адпавядаюць вашаму пошуку.
+    changes_saved_msg: Змены паспяхова захаваны!
+    copy: Скапіяваць
+    delete: Выдаліць
+    deselect: Зняць вылучэнне з усіх
+    none: Нічога
+    order_by: Парадак
+    save_changes: Захаваць змены
+    select_all_matching_items:
+      few: Выберыце ўсе %{count} элементы, якія адпавядаюць вашаму пошуку.
+      many: Выберыце ўсе %{count} элементаў, якія адпавядаюць вашаму пошуку.
+      one: Выберыце %{count} элемент, які адпавядае вашаму пошуку.
+      other: Выберыце %{count} элементаў, якія адпавядаюць вашаму пошуку.
+    today: сёння
+    validation_errors:
+      few: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылкі ніжэй
+      many: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
+      one: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце памылку ніжэй
+      other: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
+  html_validator:
+    invalid_markup: 'змяшчае несапраўдную разметку HTML: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Несапраўдны файл CSV. Памылка: %{error}'
+      over_rows_processing_limit: колькасць радкоў большая за %{count}
+    modes:
+      merge: Аб'яднаць
+      merge_long: Захаваць існуючыя запісы і дадаць новыя
+      overwrite: Перазапісаць
+      overwrite_long: Замяніць бягучыя запісы на новыя
+    preface: Вы можаце імпартаваць даныя, экспартаваныя вамі з іншага сервера, напрыклад, спіс людзей, на якіх вы падпісаны або якіх блакуеце.
+    success: Вашы даныя паспяхова запампаваныя і будуць неўзабаве апрацаваны
+    types:
+      blocking: Спіс заблакіраваных
+      bookmarks: Закладкі
+      domain_blocking: Спіс заблакіраваных даменаў
+      following: Падпіскі
+      muting: Спіс ігнаравання
+    upload: Запампаваць
+  invites:
+    delete: Дэактываваць
+    expired: Пратэрмінавана
+    expires_in:
+      '1800': 30 хвілін
+      '21600': 6 гадзін
+      '3600': 1 гадзіна
+      '43200': 12 гадзін
+      '604800': 1 тыдзень
+      '86400': 1 дзень
+    expires_in_prompt: Ніколі
+    generate: Стварыць запрашальную спасылку
+    invited_by: 'Вас запрасіў(-ла):'
+    max_uses:
+      few: "%{count} выкарыстанні"
+      many: "%{count} выкарыстанняў"
+      one: 1 выкарыстанне
+      other: "%{count} выкарыстанняў"
+    max_uses_prompt: Неабмежавана
+    prompt: Генерыруйце і абагульвайце паміж іншымі спасылкі для доступу да гэтага сервера
+    table:
+      expires_at: Дзее да
+      uses: Выкарыстанні
+    title: Запрасіць людзей
+  lists:
+    errors:
+      limit: Вы дасягнулі макс. колькасці спісаў
+  login_activities:
+    authentication_methods:
+      otp: праграма двухфактарнай аўтэнтыфікацыі
+      password: пароль
+      sign_in_token: код з электроннай пошты
+      webauthn: ключы бяспекі
+    description_html: Калі вы бачыце невядомую вам актыўнасць, падумайце пра змену пароля і ўключэнне двухфактарнай аўтэнтыфікацыі.
+    empty: Няма гісторыі ўваходаў
+    failed_sign_in_html: Няўдалая спроба ўваходу праз %{method} з %{ip} (%{browser})
+    successful_sign_in_html: Паспяховы ўваход праз %{method} з %{ip} (%{browser})
+    title: Гісторыя ўваходаў
+  media_attachments:
+    validations:
+      images_and_video: Немагчыма прымацаваць відэа да допісу, які ўжо змяшчае выявы
+      not_ready: Няможна дадаць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
+      too_many: Няможна дадаць больш за 4 файлы
+  migrations:
+    acct: Перамешчана ў
+    cancel: Скасаваць перанакіраванне
+    cancel_explanation: Скасаванне перанакіравання паўторна актывуе ваш бягучы ўліковы запіс, але не верне падпісчыкаў, якія былі перамешчаны на той уліковы запіс.
+    cancelled_msg: Перанакіраванне паспяхова скасавана.
+    errors:
+      already_moved: ёсць тым жа ўліковым запісам, на які вы ўжо пераехалі
+      missing_also_known_as: гэта не псеўданім уліковага запісу
+      move_to_self: не можа быць бягучым уліковым запісам
+      not_found: не знойдзена
+      on_cooldown: Вас часова замарозілі
+    followers_count: Падпісчыкі на момант перамяшчэння
+    incoming_migrations: Пераязджаем з іншага ўліковага запісу
+    incoming_migrations_html: Каб перайсці з іншага ўліковага запісу ў гэты, спачатку трэба <a href="%{path}">стварыць псеўданім уліковага запісу</a>.
+    moved_msg: Ваш уліковы запіс перанакіроўваецца на %{acct}. Туды-ж будуць перамешчаны вашы падпісчыкі.
+    not_redirecting: Ваш уліковы запіс не перанакіроўваецца на іншы ўліковы запіс.
+    on_cooldown: Вы нядаўна перамяшчалі свой уліковы запіс. Гэтая мажлівасць зноў стане даступнай праз %{count} дзн.
+    past_migrations: Колішнія перамяшчэнні
+    proceed_with_move: Перамясціць падпісчыкаў
+    redirected_msg: Ваш уліковы запіс цяпер перанакіроўваецца на %{acct}.
+    redirecting_to: Ваш уліковы запіс перанакіроўваецца на %{acct}.
+    set_redirect: Задаць перанакіраванне
+    warning:
+      backreference_required: Спачатку трэба наладзіць зваротнае спасыланне новага ўліковага запісу на бягучы
+      before: 'Перш чым працягнуць, калі ласка, уважліва прачытайце гэтыя заўвагі:'
+      cooldown: Пасля «пераезду» будзе перыяд чакання, на працягу якога вы не зможаце зноў «пераехаць»
+      disabled_account: Пасля гэтага ваш бягучы ўліковы запіс не будзе цалкам даступны. Аднак у вас будзе доступ да экспарту даных, а таксама да паўторнай актывацыі.
+      followers: Гэтае дзеянне будзе «пераносіць» усіх падпісчыкаў з бягучага ўліковага запісу на новы
+      only_redirect_html: Альбо вы можаце <a href="%{path}"> толькі наладзіць перанакіраванне на ваш профіль</a>.
+      other_data: Ніякія іншыя даныя не будуць перамешчаны аўтаматычна
+      redirect: Профіль вашага бягучага ўліковага запісу будзе абноўлены з паведамленнем аб перанакіраванні і выключаны з пошуку
+  moderation:
+    title: Мадэрацыя
+  move_handler:
+    carry_blocks_over_text: Гэты карыстальнік «перанесены» з уліковага запісу %{acct}, які вы заблакавалі.
+    carry_mutes_over_text: Гэты карыстальнік «перанесены» з уліковага запісу %{acct}, які вы ігнаруеце.
+    copy_account_note_text: 'Гэты карыстальнік «перанесены» з %{acct}, вось вашы папярэднія заўвагі пра яго:'
+  navigation:
+    toggle_menu: Уключыць меню
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} падаў скаргу"
+      sign_up:
+        subject: "%{name} зарэгістраваўся"
+    favourite:
+      body: "%{name} упадабаў ваш пост:"
+      subject: "%{name} упадабаў ваш допіс"
+      title: Новае ўпадабанае
+    follow:
+      body: "%{name} цяпер падпісаны на вас!"
+      subject: "%{name} цяпер падпісаны на вас"
+      title: Новы падпісчык
+    follow_request:
+      action: Кіраванне запытамі на падпіску
+      body: "%{name} хоча падпісацца на вас"
+      subject: 'Падпісчык у чарзе: %{name}'
+      title: Новы запыт на падпіску
+    mention:
+      action: Адказаць
+      body: 'Вас згадаў %{name} у:'
+      subject: Вас згадаў %{name}
+      title: Новае згадванне
+    poll:
+      subject: Апытанне ад %{name} скончылася
+    reblog:
+      body: "%{name} пашырыў ваш пост:"
+      subject: "%{name} пашырыў ваш допіс"
+      title: Новае пашырэнне
+    status:
+      subject: Новы допіс ад %{name}
+    update:
+      subject: "%{name} адрэдагаваў допіс"
+  notifications:
+    email_events: Падзеі для апавяшчэнняў эл. пошты
+    email_events_hint: 'Выберыце падзеі, аб якіх вы хочаце атрымліваць апавяшчэнні:'
+    other_settings: Іншыя налады апавяшчэнняў
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: млрд
+          million: млн
+          quadrillion: Q
+          thousand: тыс.
+          trillion: трлн
+  otp_authentication:
+    code_hint: Каб пацвердзіць, увядзіце код, згенераваны праграмай-аўтэнтыфікатарам
+    description_html: Калі вы ўключыце <strong>двухфактарную аўтэнтыфікацыю</strong> праз праграму-аўтэнтыфікатар, то каб увайсці ва ўліковы запіс, вам трэба мець тэлефон, які будзе генераваць токены для ўводу.
+    enable: Уключыць
+    instructions_html: "<strong>Скануйце гэты QR-код у Google Authenticator або ў аналагічнай TOTP-праграме на вашым тэлефоне</strong>. З гэтага моманту праграма будзе генераваць токены, якія вам трэба будзе ўводзіць пры ўваходзе ва ўліковы запіс."
+    manual_instructions: 'Калі вы не можаце сканаваць QR-код і трэба ўвесці яго ўручную, вось ключ у форме тэксту:'
+    setup: Наладзіць
+    wrong_code: Уведзены несапраўдны код! Час на прыладзе адпавядае часу на серверы?
+  pagination:
+    newer: Навейшае
+    next: Далей
+    older: Старэйшае
+    prev: Папярэдні
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Вы ўжо прагаласавалі ў апытанні
+      duplicate_options: змяшчае аднолькавыя варыянты
+      duration_too_long: гэта занадта далёка ў будучыні
+      duration_too_short: гэта занадта хутка
+      expired: Апытанне ўжо скончана
+      invalid_choice: Абраны варыянт апытання не існуе
+      over_character_limit: не можа быць даўжэй за %{max} сімвалаў кожны
+      too_few_options: павінна быць болей за адзін варыянт
+      too_many_options: колькасць варыянтаў не можа перавышаць %{max}
+  preferences:
+    other: Іншае
+    posting_defaults: Публікаваць па змаўчанні
+    public_timelines: Публічныя стужкі
+  privacy_policy:
+    title: Палітыка канфідэнцыйнасці
+  reactions:
+    errors:
+      limit_reached: Дасягнуты ліміт розных рэакцый
+      unrecognized_emoji: невядомае эмодзі
+  relationships:
+    activity: Актыўнасць ул. запісу
+    dormant: Занядбаны
+    follow_selected_followers: Падпісацца на выбраных падпісчыкаў
+    followers: Падпісчыкі
+    following: Падпісаны
+    invited: Запрошаны
+    last_active: Апошняя актыўнасць
+    most_recent: Даўнасць
+    moved: Перанесены
+    mutual: Узаемныя
+    primary: Асноўны
+    relationship: Зносіны
+    remove_selected_domains: Выдаліць усіх падпісчыкаў з выбраных даменаў
+    remove_selected_followers: Выдаліць выбраных падпісчыкаў
+    remove_selected_follows: Адпісацца ад выбраных карыстальнікаў
+    status: Стан уліковага запісу
+  remote_follow:
+    missing_resource: Не ўдалося знайсці патрэбны URL перанакіравання для вашага ўліковага запісу
+  reports:
+    errors:
+      invalid_rules: не спасылаецца на дзеючыя правілы
+  rss:
+    content_warning: 'Папярэджанне аб змесціве:'
+    descriptions:
+      account: Публічныя допісы ад @%{acct}
+      tag: 'Публічныя допісы з хэштэгам #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Вы перавысілі ліміт ў %{limit} запланаваных на сёння допісаў
+    over_total_limit: Вы перавысілі ліміт ў %{limit} запланаваных допісаў
+    too_soon: Запланаваная дата мусіць быць у будучыні
+  sessions:
+    activity: Апошняя актыўнасць
+    browser: Браўзер
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Невядомы браўзер
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Бягучая сесія
+    description: "%{browser} на %{platform}"
+    explanation: Гэта вэб-браўзэры, з якіх выкананы ўваход у ваш уліковы запіс Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe AIR
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: невядомай платформе
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Адклікаць
+    revoke_success: Сеанс паспяхова адкліканы
+    title: Сесіі
+    view_authentication_history: Праглядзець гісторыю ўваходаў у мой уліковы запіс
+  settings:
+    account: Уліковы запіс
+    account_settings: Налады ўліковага запісу
+    aliases: Псеўданімы ўліковага запісу
+    appearance: Выгляд
+    authorized_apps: Аўтарызаваныя праграмы
+    back: Назад да Mastodon
+    delete: Выдаленне ўліковага запісу
+    development: Распрацоўка
+    edit_profile: Рэдагаваць профіль
+    export: Экспарт даных
+    featured_tags: Выбраныя хэштэгі
+    import: Імпарт
+    import_and_export: Імпарт і экспарт
+    migrate: Перамяшчэнне ўліковага запісу
+    notifications: Апавяшчэнні
+    preferences: Налады
+    profile: Профіль
+    relationships: Падпіскі і падпісчыкі
+    statuses_cleanup: Аўтаматычнае выдаленне допісаў
+    strikes: Папярэджанні мадэратараў
+    two_factor_authentication: Двухфактарная аўтэнтыфікацыя
+    webauthn_authentication: Ключы бяспекі
+  statuses:
+    attached:
+      audio:
+        few: "%{count} аўдыяфайлы"
+        many: "%{count} аўдыяфайлаў"
+        one: "%{count} аўдыяфайл"
+        other: "%{count} аўдыяфайла"
+      description: 'Дадаткі: %{attached}'
+      image:
+        few: "%{count} выявы"
+        many: "%{count} выяваў"
+        one: "%{count} выява"
+        other: "%{count} выявы"
+      video:
+        few: "%{count} відэафайлы"
+        many: "%{count} відэафайлаў"
+        one: "%{count} відэафайл"
+        other: "%{count} відэафайла"
+    boosted_from_html: Пашырыў уліковы запіс %{acct_link}
+    content_warning: 'Папярэджанне аб змесціве: %{warning}'
+    default_language: Такая, што і мова інтэрфэйсу
+    disallowed_hashtags:
+      few: 'змяшчае недазволеныя хэштэгі: %{tags}'
+      many: 'змяшчае недазволеныя хэштэгі: %{tags}'
+      one: 'змяшчае недазволены хэштэг: %{tags}'
+      other: 'утрымлівае недазволеныя хэштэгі: %{tags}'
+    edited_at_html: Адрэдагавана %{date}
+    errors:
+      in_reply_not_found: Здаецца, допіс, на які вы спрабуеце адказаць, не існуе.
+    open_in_web: Адчыніць у вэб-версіі
+    over_character_limit: перавышаная колькасць сімвалаў у %{max}
+    pin_errors:
+      direct: Допісы, бачныя толькі згаданым карыстальнікам, не могуць быць замацаваныя
+      limit: Вы ўжо замацавалі максімальную колькасць допісаў
+      ownership: Немагчыма замацаваць чужы допіс
+      reblog: Немагчыма замацаваць пашырэнне
+    poll:
+      total_people:
+        few: "%{count} чалавекі"
+        many: "%{count} чалавек"
+        one: "%{count} чалавек"
+        other: "%{count} чалавека"
+      total_votes:
+        few: "%{count} галасы"
+        many: "%{count} галасоў"
+        one: "%{count} голас"
+        other: "%{count} голасу"
+      vote: Прагаласаваць
+    show_more: Паказаць больш
+    show_newer: Паказаць навейшыя
+    show_older: Паказаць старэйшыя
+    show_thread: Паказаць ланцуг
+    sign_in_to_participate: Зарэгіструйцеся каб удзельнічаць у абмеркаванні
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      direct: Асабіста
+      private: Для падпісчыкаў
+      private_long: Паказваць толькі падпісчыкам
+      public: Публічны
+      public_long: Усе могуць бачыць
+      unlisted: Не ў спісе
+      unlisted_long: Кожны можа ўбачыць гэты допіс, але ён не паказваецца ў публічных стужках
+  statuses_cleanup:
+    enabled: Аўтаматычна выдаляць старыя допісы
+    enabled_hint: Аўтаматычна выдаляць вашыя допісы, калі яны дасягаюць вызначанага тэрміну, акрамя наступных выпадкаў
+    exceptions: Выключэнні
+    explanation: Выдаленне допісаў — гэта цяжкая аперацыя. Яна павольна выконваецца ў часы, калі сервер не загружаны іншай працай. Праз гэта вашыя допісы могуць быць выдаленыя праз пэўны час пасля вызначанага тэрміну.
+    ignore_favs: Ігнараваць упадабаныя
+    ignore_reblogs: Ігнараваць пашырэнні
+    interaction_exceptions: Выключэнні, заснаваныя на ўзаемадзеянні
+    interaction_exceptions_explanation: Звярніце ўвагу, што няма гарантыі выдалення пастоў, калі колькасць іх упадабанняў ці пашырэннняў упадзе ніжэй за ліміт, хаця некалі гэтая колькасць перавышала яго.
+    keep_direct: Захаваць асабістыя паведамленні
+    keep_direct_hint: Не выдаляць асабістыя паведамленні
+    keep_media: Захоўваць допісы з медыя дадаткамі
+    keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя
+    keep_pinned: Захаваць замацаваныя допісы
+    keep_pinned_hint: Не выдаляць вашыя замацаваныя допісы
+    keep_polls: Працягнуць апытанне
+    keep_polls_hint: Не выдаляць вашыя апытанні
+    keep_self_bookmark: Захаваць допісы, якія вы дадалі ў закладкі
+    keep_self_bookmark_hint: Не выдаляе вашыя допісы, якія вы дадалі ў закладкі
+    keep_self_fav: Пакідаць упадабаныя вамі допісы
+    keep_self_fav_hint: Не выдаляе вашыя допісы, якія вы ўпадабалі
+    min_age:
+      '1209600': 2 тыдні
+      '15778476': 6 месяцаў
+      '2629746': 1 месяц
+      '31556952': 1 год
+      '5259492': 2 месяцы
+      '604800': 1 тыдзень
+      '63113904': 2 гады
+      '7889238': 3 месяцы
+    min_age_label: Тэрмін даўнасці
+    min_favs: Захаваць допісы, якія ўпадабалі хаця б
+    min_favs_hint: Не выдаляе вашыя допісы, якія спадабаліся прынамсі вызначанай колькасці людзей. Пакіньце гэтае поле пустым, каб допісы выдаляліся незалежна ад гэтай колькасці
+    min_reblogs: Захаваць допісы, якія пашырылі хаця б
+    min_reblogs_hint: Не выдаляе вашыя допісы, якія пашырыла прынамсі вызначаная колькасць людзей. Пакіньце гэтае поле пустым, каб допісы выдаляліся незалежна ад гэтай колькасці
+  stream_entries:
+    pinned: Замацаваны допіс
+    reblogged: пашыраны
+    sensitive_content: Далікатны змест
+  strikes:
+    errors:
+      too_late: Запозна абскарджваць гэтае папярэджанне
+  tags:
+    does_not_match_previous_name: не супадае з папярэднім імям
+  themes:
+    contrast: Mastodon (высокі кантраст)
+    default: Mastodon (цёмная)
+    mastodon-light: Mastodon (светлая)
+  time:
+    formats:
+      default: "%d.%m.%Y %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Дадаць
+    disable: Адключыць 2FA
+    disabled_success: Двухфактарная аўтэнтыфікацыя адключана
+    edit: Рэдагаваць
+    enabled: Двухфактарная аўтэнтыфікацыя ўключана
+    enabled_success: Двухфактарная аўтэнтыфікацыя ўключана
+    generate_recovery_codes: Стварыць коды аднаўлення
+    lost_recovery_codes: Коды аднаўлення дазволяць вам аднавіць доступ да вашага ўліковага запісу ў выпадку страты тэлефона. Калі вы згубілі вашыя коды, вы можаце стварыць новыя тут. Старыя коды аднаўлення будуць ануляваныя.
+    methods: Двухфактарныя метады
+    otp: Праграма аўтэнтыфікацыі
+    recovery_codes: Абнавіць коды аднаўлення
+    recovery_codes_regenerated: Новыя коды аднаўлення паспяхова створаныя
+    recovery_instructions_html: Калі раптам вы страціце доступ да вашага тэлефона, вы можаце скарыстацца адным з кодаў аднаўлення ніжэй каб аднавіць доступ да вашага ўліковага запісу. <strong>Захоўвайце іх у бяспечным месцы</strong>. Напрыклад, вы можаце раздрукаваць іх і захоўваць разам з іншымі важнымі дакументамі.
+    webauthn: Ключы бяспекі
+  user_mailer:
+    appeal_approved:
+      action: Перайсці ў свой уліковы запіс
+      explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
+      subject: Вашая апеляцыя ад %{date} была ўхваленая
+      title: Абскарджанне ўхвалена
+    appeal_rejected:
+      explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была адхілена.
+      subject: Вашая апеляцыя ад %{date} была адхіленая
+      title: Абскарджанне адхілена
+    backup_ready:
+      explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
+      subject: Ваш архіў гатовы да спампавання
+      title: Ваш архіў можна спампаваць
+    suspicious_sign_in:
+      change_password: змяніць свой пароль
+      details: 'Вось падрабязнасці ўваходу:'
+      explanation: Мы заўважылі ўваход у ваш уліковы запіс з новага IP-адрасу.
+      further_actions_html: Калі гэта былі не вы, раім вам неадкладна %{action}, а таксама ўключыць двухфактарную аўтэнтыфікацыю, каб захаваць бяспеку вашага ўліковага запісу.
+      subject: У вас уліковы запіс зайшлі з новага IP-адрасу
+      title: Новы ўваход
+    warning:
+      appeal: Падаць апеляцыю
+      appeal_description: "Калі вы лічыце гэта памылкай, вы можаце падаць апеляцыю \nсупрацоўнікам %{instance}."
+      categories:
+        spam: Спам
+        violation: Кантэнт парушае наступныя правілы супольнасці
+      explanation:
+        delete_statuses: Было выяўлена, што некаторыя з вашых допісаў парушалі адно або больш правілаў супольнасці і былі выдаленыя мадэратарамі суполкі %{instance}.
+        disable: Вы больш не можаце выкарыстоўваць свой уліковы запіс, але ваш профіль і іншыя даныя застаюцца некранутымі. Вы можаце запытаць рэзервовае капіраванне вашых даных, змяніць налады ўліковага запісу або выдаліць свой уліковы запіс.
+        mark_statuses_as_sensitive: Некаторыя вашыя допісы былі пазначаныя як далікатныя мадэратарамі суполкі %{instance}. Гэта значыць, што іншым людзям давядзецца спачатку націснуць на медыя допісу каб праглядзець яго. Вы можаце ўласнаручна пазначыць медыя як далікатныя перад тым, як апублікаваць іх у будучым.
+        sensitive: Адгэтуль усе вашыя запампаваныя медыя файлы будуць пазначаны як далікатныя і будуць схаваныя па-за папярэджаннем.
+        silence: Вы ўсё яшчэ можаце карыстаецца вашым уліковым запісам, але толькі ўжо падпісаныя на вас людзі змогуць бачыць вашыя публікацыі на серверы. Вы таксама можаце быць адхілены ад удзелу ў розных пошукавых функцыях, аднак іншыя ўсё роўна могуць уласнаручна падпісацца на вас.
+        suspend: Вы больш не можаце выкарыстоўваць свой уліковы запіс, а профіль і іншыя даныя сталі недаступнымі. Вы ўсё яшчэ можаце ўвайсці, каб запытаць архіў сваіх даных да моманту іх выдалення праз 30 дзён, але мы захаваем вашы базавыя даныя, каб не даць вам абысці выключэнне.
+      reason: 'Прычына:'
+      statuses: 'Прычынныя допісы:'
+      subject:
+        delete_statuses: Вашыя допісы на %{acct} былі выдалены
+        disable: Ваш уліковы запіс %{acct} быў замарожаны
+        mark_statuses_as_sensitive: Вашыя допісы на %{acct} былі пазначаныя як далікатныя
+        none: Папярэджанне для %{acct}
+        sensitive: З гэтага моманту вашыя допісы на %{acct} будуць пазначаныя як далікатныя
+        silence: Ваш уліковы запіс %{acct} быў абмежаваны
+        suspend: Ваш уліковы запіс %{acct} быў выключаны
+      title:
+        delete_statuses: Выдаленыя допісы
+        disable: Уліковы запіс замарожаны
+        mark_statuses_as_sensitive: Допісы, пазначыная як далікатныя
+        none: Папярэджанне
+        sensitive: Уліковыя запісы, пазначаныя як далікатныя
+        silence: Уліковы запіс абмежаваны
+        suspend: Уліковы запіс выключаны
+    welcome:
+      edit_profile_action: Наладзіць профіль
+      edit_profile_step: Вы можаце наладзіць свой профіль, запампаваўшы выяву профілю, змяніўшы адлюстраванае імя і іншае. Вы можаце праглядаць новых падпісчыкаў, перш чым ім будзе дазволена падпісацца на вас.
+      explanation: Вось некаторыя парады каб пачаць
+      final_action: Пачаць пісаць
+      final_step: 'Пачынайце пісаць! Нават, калі ў вас няма падпісчыкаў, іншыя людзі змогуць пабачыць вашыя допісы, напрыклад, у лакальнай стужцы, або праз хэштэгі. Калі хочаце, вы можаце прадставіцца праз хэштэг #introductions.'
+      full_handle: Ваш поўны маркер
+      full_handle_hint: Гэта тое, што вы дасце сваім сябрам, каб яны маглі адпраўляць паведамленні або падпісацца на вас з іншага сервера.
+      subject: Вітаем у Mastodon
+      title: Рады вітаць вас, %{name}!
+  users:
+    follow_limit_reached: Вы не можаце падпісацца на большую колькасць людзей чым %{limit}
+    invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
+    otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
+    seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
+    signed_in_as: 'Увайшлі як:'
+  verification:
+    explanation_html: 'Вы можаце <strong>пацвердзіць сябе як уладальніка спасылак у метададзеных вашага профілю</strong>. Для гэтага спасылка на вэб-сайт павінна ўтрымліваць спасылку на ваш профіль Mastodon. Зваротная спасылка <strong>павінна</strong> мець атрыбут <code>rel="me"</code>. Тэкставы змест спасылкі не мае значэння. Вось прыклад:'
+    verification: Верыфікацыя
+  webauthn_credentials:
+    add: Дадаць новы ключ бяспекі
+    create:
+      error: Узнікла праблема з даданнем ключа бяспекі. Паспрабуйце яшчэ раз.
+      success: Ваш ключ бяспекі быў паспяхова дададзены.
+    delete: Выдаліць
+    delete_confirmation: Сапраўды выдаліць гэты ключ бяспекі?
+    description_html: Калі вы ўключыце <strong>аўтэнтыфікацыю ключа бяспекі</strong>, для ўваходу вам спатрэбіцца выкарыстоўваць адзін з вашых ключоў бяспекі.
+    destroy:
+      error: Узнікла праблема з выдаленнем ключа бяспекі. Паспрабуйце яшчэ раз.
+      success: Ваш ключ бяспекі быў паспяхова выдалены.
+    invalid_credential: Няправільны ключ бяспекі
+    nickname_hint: Увядзіце псеўданім вашага новага ключа бяспекі
+    not_enabled: Вы яшчэ не ўключылі WebAuthn
+    not_supported: Гэты браўзер не падтрымлівае ключы бяспекі
+    otp_required: Каб выкарыстоўваць ключы бяспекі, спачатку ўключыце двухфактарную аўтэнтыфікацыю.
+    registered_on: Зарэгістраваны %{date}
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ffa78b386..c37c0bcbf 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1,204 +1,873 @@
 ---
 bg:
   about:
-    about_mastodon_html: Mastodon е <em>безплатен</em> сървър с <em>отворен код</em> за социални мрежи. Като <em>децентрализирана</em> алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в <em>социалната мрежа</em>.
-    about_this: За тази инстанция
-    active_count_after: активно
-    active_footnote: Месечни активни потребители (МАП)
-    administered_by: 'Администрирано от:'
-    api: API
-    apps: Мобилни приложения
-    apps_platforms: Използвайте Mastodon от iOS, Android и други платформи
-    browse_directory: Разгледайте профилна директория и филтрирайте по интереси
-    browse_local_posts: Разгледайте поток от публични публикации на живо от този сървър
-    browse_public_posts: Разгледайте поток от публични публикации на живо в Mastodon
-    contact: За контакти
+    about_mastodon_html: 'Социалната мрежа на бъдещето: Без реклами, без корпоративно наблюдение, с нравствено оформление и децентрализиране! Притежавайте данните си с Mastodon!'
     contact_missing: Не е зададено
     contact_unavailable: Не е приложимо
-    discover_users: Открийте потребители
-    documentation: Документация
-    federation_hint_html: С акаунт в %{instance} ще можете да последвате хората от всеки сървър на Mastodon и отвъд.
-    get_apps: Опитайте мобилно приложение
-    hosted_on: Mastodon е хостван на %{domain}
-    learn_more: Още информация
-    privacy_policy: Политика за поверителност
-    see_whats_happening: Вижте какво се случва
-    server_stats: 'Сървърна статистика:'
-    source_code: Програмен код
-    status_count_after:
-      one: състояние
-      other: състояния
-    status_count_before: Написали
-    tagline: Следвайте приятели и открийте нови
-    terms: Условия за ползване
-    unavailable_content: Модерирани сървъри
-    unavailable_content_description:
-      domain: Сървър
-      reason: Причина
-      rejecting_media: 'Мултимедийните файлове от тези сървъри няма да бъдат обработени или съхранени и няма да бъдат показани миниатюри, което ще изисква ръчно щракване върху оригиналния файл:'
-      rejecting_media_title: Филтрирана мултимедия
-      silenced: 'Публикациите от тези сървъри ще бъдат скрити в обществени емисии и разговори и няма да се генерират известия от взаимодействията на потребителите им, освен ако не ги следвате:'
-      silenced_title: Заглушени сървъри
-      suspended: 'Никакви данни от тези сървъри няма да бъдат обработвани, съхранявани или обменяни, което прави невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри:'
-      suspended_title: Спрени сървъри
-    user_count_after:
-      one: потребител
-      other: потребители
-    user_count_before: Дом на
-    what_is_mastodon: Какво е Mastodon?
+    hosted_on: Mastodon е разположен на хост %{domain}
+    title: Относно
   accounts:
-    choices_html: 'Избори на %{name}:'
-    endorsements_hint: Можете да подкрепите хората, които следите, от уеб интерфейса и те ще се покажат тук.
-    featured_tags_hint: Можете да представите конкретни хаштагове, които ще се показват тук.
     follow: Последвай
     followers:
       one: Последовател
       other: Последователи
     following: Следва
-    joined: Присъединил се на %{date}
+    instance_actor_flash: Акаунтът е виртуално действащо лице, представляващо сървъра, а не отделен потребител. Използва се за федерацията и не бива да се спира.
     last_active: последна дейност
     link_verified_on: Собствеността върху тази връзка е проверена на %{date}
-    media: Мултимедия
-    moved_html: "%{name} се премести в %{new_profile_link}:"
-    network_hidden: Тази информация не е налична
-    never_active: Никога
-    nothing_here: Тук няма никого!
-    people_followed_by: Хора, които %{name} следва
-    people_who_follow: Хора, които следват %{name}
+    nothing_here: Тук няма нищо!
     pin_errors:
       following: Трябва вече да следвате човека, когото искате да подкрепите
     posts:
       one: Публикация
       other: Публикации
     posts_tab_heading: Публикации
-    posts_with_replies: Публикации и отговори
-    roles:
-      admin: Админ
-      bot: Бот
-      group: Група
-      moderator: Мод
-    unavailable: Профилът не е наличен
-    unfollow: Не следвай
   admin:
     account_actions:
       action: Изпълняване на действие
+      title: Извършване на модериращо действие за %{acct}
     account_moderation_notes:
       create: Оставяне на бележка
       created_msg: Бележката за модерация е създадена успешно!
-      delete: Изтриване
+      destroyed_msg: Бележката за модерация е успешно унищожена!
     accounts:
-      add_email_domain_block: Блокиране на имейл домейн
+      add_email_domain_block: Блокиране на домейн на имейл
       approve: Одобряване
-      approve_all: Одобряване на всички
+      approved_msg: Успешно одобрена заявка за регистриране на %{username}
       are_you_sure: Сигурни ли сте?
       avatar: Аватар
       by_domain: Домейн
       change_email:
-        changed_msg: Имейлът на акаунта беше успешно променен!
+        changed_msg: Успешно променен имейл!
         current_email: Текущ имейл
         label: Промяна на имейл
         new_email: Нов имейл
         submit: Промяна на имейл
         title: Промяна на имейл за %{username}
+      change_role:
+        changed_msg: Успешно променена роля!
+        label: Промяна на ролята
+        no_role: Няма роля
+        title: Промяна на ролята за %{username}
       confirm: Потвърждаване
       confirmed: Потвърдено
       confirming: Потвърждаване
+      custom: Потребителско
       delete: Изтриване на данни
       deleted: Изтрито
       demote: Понижаване
       destroyed_msg: Данните на %{username} вече са на опашка за незабавно изтриване
       disable: Замразяване
-      disable_two_factor_authentication: Изключване на 2FA
+      disable_sign_in_token_auth: Изключване на удостоверяването с маркер по имейл
+      disable_two_factor_authentication: Изключване на 2факт. удостов.
       disabled: Замразено
       display_name: Показвано име
       domain: Домейн
-      edit: Редакция
+      edit: Редактиране
       email: Имейл
       email_status: Състояние на имейл
       enable: Размразяване
+      enable_sign_in_token_auth: Включване на удостоверяването с маркер по имейл
       enabled: Включено
+      enabled_msg: Успешно размразяване на акаунта на %{username}
+      followers: Последователи
       follows: Последвания
-      header: Заглавна част
+      header: Заглавка
       inbox_url: Входящ URL
       invite_request_text: Причини за присъединяване
       invited_by: Покана от
-      ip: IP
+      ip: IP адрес
       joined: Присъединено
       location:
         all: Всичко
         local: Локално
-        remote: Дистанционно
+        remote: Отдалечено
         title: Местоположение
       login_status: Състояние на вход
       media_attachments: Прикачена мултимедия
+      memorialize: Възпоминание
+      memorialized: Възпоминато
+      memorialized_msg: Успещно превръщане на %{username} във възпоминателен профил
       moderation:
-        active: Активно
+        active: Дейно
         all: Всичко
-        pending: Чакащо
-        silenced: Заглушено
+        pending: Чака
+        silenced: Ограничено
         suspended: Спряно
-        title: Модерация
-      moderation_notes: Модераторни бележки
+        title: Модериране
+      moderation_notes: Бележки за модериране
       most_recent_activity: Последна дейност
       most_recent_ip: Последен IP
       no_account_selected: Нито един акаунт не е променен, тъй като нито един не е избран
       no_limits_imposed: Няма наложени ограничения
+      no_role_assigned: Няма поставена роля
       not_subscribed: Без абонамент
       pending: Изчаква преглед
       perform_full_suspension: Спиране
+      previous_strikes: Предишни провинения
+      previous_strikes_description_html:
+        one: Този акаунт има <strong>едно</strong> провинение.
+        other: Този акунт има <strong>%{count}</strong> провинения.
       promote: Повишаване
       protocol: Протокол
       public: Публично
       push_subscription_expires: PuSH абонаментът изтича
       redownload: Опресняване на профил
+      redownloaded_msg: Успешно опреснен профил на %{username} от източника
       reject: Отхвърляне
-      reject_all: Отхвърляне на всичко
       rejected_msg: Успешно отхвърлена заявка за регистрация на %{username}
+      remote_suspension_irreversible: Данните за този акаунт са изтрити безвъзвратно.
+      remote_suspension_reversible_hint_html: Акаунтът е бил преустановен на своя сървър и данните ще бъдат напълно премахнати на %{date}. Дотогава отдалеченият сървър може да възстанови този акаунт без щети. Ако желаете да премахнете всички данни за акаунта незабавно, можете да го сторите по-долу.
       remove_avatar: Премахване на аватар
-      remove_header: Премахване на заглавна част
-      unsubscribe: Отписване
+      remove_header: Премахване на заглавката
+      removed_avatar_msg: Успешно премахнат образ на аватара на %{username}
+      removed_header_msg: Успешно премахнат образ на заглавката на %{username}
+      resend_confirmation:
+        already_confirmed: Този потребител вече е потвърден
+        send: Изпращане пак на е-писмо за потвърждаване
+        success: Успешно изпращане на имейла за потвърждение!
+      reset: Нулиране
+      reset_password: Нулиране на паролата
+      resubscribe: Абониране пак
+      role: Роля
+      search: Търсене
+      search_same_email_domain: Други потребители със същия домейн за имейл
+      search_same_ip: Други потребители със същия IP
+      security_measures:
+        only_password: Само парола
+        password_and_2fa: Парола и двуфакторно удостоверяване
+      sensitive: Деликатен
+      sensitized: Отбелязано като деликатно съдържание
+      shared_inbox_url: URL адрес на споделена входяща кутия
+      show:
+        created_reports: Докладвания
+        targeted_reports: Докладвано от други
+      silence: Ограничение
+      silenced: Ограничено
+      statuses: Публикации
+      strikes: Предишни провинения
+      subscribe: Абониране
+      suspend: Спиране
+      suspended: Спряно
+      suspension_irreversible: Данните на този акаунт са безвъзвратно изтрити. Може да възстановите достъпа до акаунта, за да може да се използва пак, но предишните данни няма да се възстановят.
+      suspension_reversible_hint_html: Акаунтът е спрян и данните от него ще бъдат напълно премахнати на %{date}. До тогава акаунтът може да се възстанови без лоши ефекти. Ако желаете, по-долу може да премахнете всички данни от акаунта незабавно.
+      title: Акаунти
+      unblock_email: Отблокиране на адреса на имейла
+      unblocked_email_msg: Успешно разблокиране на имейл адреса на %{username}
+      unconfirmed_email: Непотвърден имейл
+      undo_sensitized: Нeчувствителен
+      undo_silenced: Отмяна на ограничението
+      undo_suspension: Отмяна на спирането
+      unsilenced_msg: Успешна отмяна на ограниченията върху акаунта на %{username}
+      unsubscribe: Без абонамент
+      unsuspended_msg: Успешно връщане на достъпа до акаунта на %{username}
       username: Потребителско име
+      view_domain: Преглед на обобщение за домейна
       warn: Предупреждение
       web: Уеб
+      whitelisted: Позволено за федерацията
     action_logs:
       action_types:
+        approve_appeal: Одобри иска
+        approve_user: Одобряване на потребител
+        assigned_to_self_report: Назначи отчет
+        change_email_user: Промяна на имейл за потребител
+        change_role_user: Промяна на роля за потребител
         confirm_user: Потвърждаване на потребител
         create_account_warning: Създаване на предупреждение
         create_announcement: Създаване на оповестяване
+        create_canonical_email_block: Създаване на имейл блокировка
         create_custom_emoji: Създаване на персонализирано емоджи
-        create_ip_block: Създаване на IP правило
+        create_domain_allow: Създаване на позволение за домейна
+        create_domain_block: Създаване на блокиране за домейна
+        create_email_domain_block: Създаване за блокиране на имейл домейна
+        create_ip_block: Създаване на правило за IP
+        create_unavailable_domain: Създаване на недостъпен домейн
+        create_user_role: Създаване на роля
         demote_user: Понижаване на потребител
         destroy_announcement: Изтриване на оповестяване
+        destroy_canonical_email_block: Изтриване на имейл блокировка
         destroy_custom_emoji: Изтриване на персонализирано емоджи
-        destroy_status: Изтриване на статус
-        disable_2fa_user: Деактивиране на 2FA
+        destroy_domain_allow: Изтриване на позволението за домейн
+        destroy_domain_block: Изтриване на блокирането за домейна
+        destroy_email_domain_block: Изтриване на блокирането за имейл домейна
+        destroy_instance: Прочистване на домейна
+        destroy_ip_block: Изтриване на правило за IP
+        destroy_status: Изтриване на публикация
+        destroy_unavailable_domain: Изтриване на неналичен домейн
+        destroy_user_role: Унищожаване на роля
+        disable_2fa_user: Изкл. на 2факт.удостов.
         disable_custom_emoji: Деактивиране на персонализирано емоджи
-        disable_user: Деактивиране на потребител
+        disable_sign_in_token_auth_user: Изключване на удостоверяването с код по имейл за потребителя
+        disable_user: Изключване на потребител
         enable_custom_emoji: Активиране на персонализирано емоджи
+        enable_sign_in_token_auth_user: Включване на удостоверяването с код по имейл за потребителя
         enable_user: Активиране на потребител
+        memorialize_account: Възпоменаване на акаунта
         promote_user: Повишаване на потребител
+        reject_appeal: Отхвърляне на молбата
+        reject_user: Отхвърляне на потребителя
         remove_avatar_user: Премахване на аватар
         reopen_report: Повторно отваряне на доклад
+        resend_user: Повторно изпращане на имейла за потвърждение
         reset_password_user: Нулиране на парола
+        resolve_report: Отстраняване на доклада
+        sensitive_account: Деликатен акаунт
+        silence_account: Ограничаване на акаунта
+        suspend_account: Преустановяване на акаунта
+        unassigned_report: Освобождаване на доклада
+        unblock_email_account: Разблокирай Email адреса
+        unsensitive_account: Не е деликатен акаунт
+        unsilence_account: Отмяна на ограничението за акаунта
+        unsuspend_account: Връщане на акаунта
+        update_announcement: Актуализиране на обявлението
+        update_custom_emoji: Обновяване на емоджитата по избор
+        update_domain_block: Обновяване на блокирането за домейна
+        update_ip_block: Обновяване на правило за IP
+        update_status: Обновяване на публикация
+        update_user_role: Обновяване на роля
+      actions:
+        approve_appeal_html: "%{name} одобри молбата за решение за модериране от %{target}"
+        approve_user_html: "%{name} одобри записването от %{target}"
+        assigned_to_self_report_html: "%{name} възложи доклада %{target} на себе си"
+        change_email_user_html: "%{name} промени имейл адреса на потребителя %{target}"
+        change_role_user_html: "%{name} промени ролята на %{target}"
+        confirm_user_html: "%{name} потвърди имейл адреса на потребителя %{target}"
+        create_account_warning_html: "%{name} изпрати предупреждение до %{target}"
+        create_announcement_html: "%{name} създаде ново обявление %{target}"
+        create_canonical_email_block_html: "%{name} блокира имейл с хеш %{target}"
+        create_custom_emoji_html: "%{name} качи ново емоджи %{target}"
+        create_domain_allow_html: "%{name} позволи федерирането с домейн %{target}"
+        create_domain_block_html: "%{name} блокира домейн %{target}"
+        create_email_domain_block_html: "%{name} блокира имейл домейн %{target}"
+        create_ip_block_html: "%{name} създаде правило за IP %{target}"
+        create_unavailable_domain_html: "%{name} спря доставянето до домейн %{target}"
+        create_user_role_html: "%{name} създаде %{target} роля"
+        demote_user_html: "%{name} понижи потребителя %{target}"
+        destroy_announcement_html: "%{name} изтри обявлението %{target}"
+        destroy_canonical_email_block_html: "%{name} разблокира имейла с хеш %{target}"
+        destroy_custom_emoji_html: "%{name} изтри емоджито %{target}"
+        destroy_domain_allow_html: "%{name} отмени федерирането с домейн %{target}"
+        destroy_domain_block_html: "%{name} отмени блокирането на домейн %{target}"
+        destroy_email_domain_block_html: "%{name} отмени блокирането на имейл домейн %{target}"
+        destroy_instance_html: "%{name} прочисти домейн %{target}"
+        destroy_ip_block_html: "%{name} изтри правилото за IP %{target}"
+        destroy_status_html: "%{name} премахна публикацията от %{target}"
+        destroy_unavailable_domain_html: "%{name} възстанови доставянето до домейн %{target}"
+        destroy_user_role_html: "%{name} изтри %{target} роля"
+        disable_2fa_user_html: "%{name} деактивира двустепенното удостоверяване за потребител %{target}"
+        disable_custom_emoji_html: "%{name} деактивира емоджито %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} деактивира удостоверението с код по имейл за %{target}"
+        disable_user_html: "%{name} деактивира влизането за потребител %{target}"
+        enable_custom_emoji_html: "%{name} активира емоджито %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} активира удостоверението с код по имейл за %{target}"
+        enable_user_html: "%{name} активира влизането за потребител %{target}"
+        memorialize_account_html: "%{name} превърна акаунта на %{target} във възпоменателна страница"
+        promote_user_html: "%{name} повиши потребителя %{target}"
+        reject_appeal_html: "%{name} отхвърли молбата за модераторско решение от %{target}"
+        reject_user_html: "%{name} отхвърли записването на %{target}"
+        remove_avatar_user_html: "%{name} премахна аватар на %{target}"
+        reopen_report_html: "%{name} отвори пак доклада на %{target}"
+        resend_user_html: "%{name} изпрати отново имейл за потвърждение за %{target}"
+        reset_password_user_html: "%{name} нулира паролата на потребител %{target}"
+        resolve_report_html: "%{name} разреши случая с доклада от %{target}"
+        sensitive_account_html: "%{name} означи мултимедия на %{target} като деликатна"
+        silence_account_html: "%{name} сложи ограничения на акаунта на %{target}"
+        suspend_account_html: "%{name} преустанови акаунта на %{target}"
+        unassigned_report_html: "%{name} отмени възложения доклад %{target}"
+        unblock_email_account_html: "%{name} разблокира адреса на имейла на %{target}"
+        unsensitive_account_html: "%{name} размаркира мултимедия на %{target} като деликатна"
+        unsilence_account_html: "%{name} отмени ограничения на акаунта на %{target}"
+        unsuspend_account_html: "%{name} върна обратно акаунта на %{target}"
+        update_announcement_html: "%{name} обнови оповестяването на %{target}"
+        update_custom_emoji_html: "%{name} обнови емоджито на %{target}"
+        update_domain_block_html: "%{name} обнови блокирането на домейна за %{target}"
+        update_ip_block_html: "%{name} промени правило за IP на %{target}"
+        update_status_html: "%{name} обнови публикация от %{target}"
+        update_user_role_html: "%{name} промени ролята на %{target}"
+      deleted_account: изтрит акаунт
+      empty: Няма намерени дневници.
+      filter_by_action: Филтриране по действие
+      filter_by_user: Филтриране по потребител
+      title: Одитен дневник
+    announcements:
+      destroyed_msg: Успешно изтрито оповестяване!
+      edit:
+        title: Редактиране на оповестянето
+      empty: Няма намерени оповестявания.
+      live: На живо
+      new:
+        create: Създаване на оповестяване
+        title: Ново оповестяване
+      publish: Публикуване
+      published_msg: Успешно публикувано оповестяване!
+      scheduled_for: Планирано за %{time}
+      scheduled_msg: Обявлението е планирано за публикуване!
+      title: Оповестявания
+      unpublish: Без публикуване
+      unpublished_msg: Успешно скрито оповестяване!
+      updated_msg: Успешно осъвременено оповестяване!
+    custom_emojis:
+      assign_category: Категоризиране
+      by_domain: Домейн
+      copied_msg: Успешно създадено локално копие на емоджито
+      copy: Копиране
+      copy_failed_msg: Не можа да се направи локално копие на това емоджи
+      create_new_category: Създаване на нова категория
+      created_msg: Успешно сътворено емоджи!
+      delete: Изтриване
+      destroyed_msg: Успешно унищожено емоджи!
+      disable: Изключване
+      disabled: Изключено
+      disabled_msg: Успешно изключване на това емоджи
+      emoji: Емоджи
+      enable: Включване
+      enabled: Включено
+      enabled_msg: Успешно включване на това емоджи
+      image_hint: PNG или GIF до %{size}
+      list: Списък
+      listed: В списъка
+      new:
+        title: Добавяне на ново потребителско емоджи
+      no_emoji_selected: Нито едно емоджи не е променено, тъй като нито едно не е избрано
+      not_permitted: Нямате право да извършвате това действие
+      overwrite: Презаписване
+      shortcode: Кратък код
+      shortcode_hint: Поне 2 символа, само азбучно-цифрови символи и долни черти
+      title: Потребителски емоджита
+      uncategorized: Некатегоризирано
+      unlist: Скриване от списъка
+      unlisted: Скрито от списъка
+      update_failed_msg: Не може да се обнови това емоджи
+      updated_msg: Успешно осъвременено емоджи!
+      upload: Качване
+    dashboard:
+      active_users: дейни потребители
+      interactions: взаимодействия
+      media_storage: Мултимедийно хранилище
+      new_users: нови потребители
+      opened_reports: отворени доклади
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> чакаща молба"
+        other: "<strong>%{count}</strong> чакащи молби"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> чакащ доклад"
+        other: "<strong>%{count}</strong> чакащи доклади"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> чакащ хаштаг"
+        other: "<strong>%{count}</strong> чакащи хаштагове"
+      pending_users_html:
+        one: "<strong>%{count}</strong> чакащ потребител"
+        other: "<strong>%{count}</strong> чакащи потребители"
+      resolved_reports: разрешени доклади
+      software: Софтуер
+      sources: Източници на регистрации
+      space: Използвано пространство
+      title: Табло за управление
+      top_languages: Водещи дейни езици
+      top_servers: Водещи дейни сървъри
+      website: Уебсайт
+    disputes:
+      appeals:
+        empty: Няма намерени обжалвания.
+        title: Жалби
+    domain_allows:
+      add_new: Позволявам федерацията с домейна
+      created_msg: Домейнът е успешно позволен за федерацията
+      destroyed_msg: Домейнът не е позволен за федерацията
+      export: Експортиране
+      import: Импортиране
+      undo: Не позволявам федерацията с домейна
+    domain_blocks:
+      add_new: Добавяне на ново блокиране за домейна
+      created_msg: Блокирането на домейна се обработва
+      destroyed_msg: Блокирането на домейна е спряно
+      domain: Домейн
+      edit: Редакция на блокирането на домейна
+      existing_domain_block: Вече сте наложили строги ограничения на %{name}.
+      existing_domain_block_html: Вече сте наложили строги ограничения за %{name} и трябва първо да <a href="%{unblock_url}">премахнете блокирането</a>.
+      export: Експортиране
+      import: Импортиране
+      new:
+        create: Блокиране
+        hint: Блокирането на домейн няма да предотврати създаването на записи в базата данни за нови акаунти, но автоматично и с обратно действие ще приложи определени методи за модерация на тези акаунти.
+        severity:
+          desc_html: "<strong>Ограничаване</strong> ще скрие публикациите от акаунти в този домейн за всеки, който не ги следва. <strong>Преустановяване</strong> ще премахне всякакво съдържание, мултимедия и профилни данни за акаунтите в този домейн от вашия сървър. Използвайте <strong>Без</strong>, ако искате просто да забраните мултимедийни файлове."
+          noop: Без
+          silence: Ограничаване
+          suspend: Преустановяване
+        title: Ново блокиране на домейн
+      no_domain_block_selected: Нищо не беше проемено, защото нямаше избрано блокиране на домейн
+      not_permitted: Нямате право да извършвате това действие
+      obfuscate: Скриване на името на домейна
+      obfuscate_hint: Частично скриване на името на домейна в списъка, ако е включена опцията за рекламиране на списъка с ограничения на домейни
+      private_comment: Личен коментар
+      private_comment_hint: Коментирането за това ограничение на домейна за вътрешна употреба от модераторите.
+      public_comment: Публичен коментар
+      public_comment_hint: Оставяне на коментар за ограничението на домейна за широката публика, ако рекламирането на списъка с ограниченията на домейни е включено.
+      reject_media: Забрана на мултимедийни файлове
+      reject_media_hint: Премахва локално запазени мултимедийни файлове и отказва да сваля такива в бъдеще. Ирелевантно в случай на преустановяване
+      reject_reports: Отхвърляне на докладите
+      reject_reports_hint: Пренебрегване на всички доклади, идващи от този домейн. Неуместни за прекратяване
+      undo: Отмяна на блокиране на домейн
+      view: Преглед на блокиране на домейн
+    email_domain_blocks:
+      add_new: Добавяне на ново
+      attempts_over_week:
+        one: "%{count} опит за изминалата седмица"
+        other: "%{count} опити за записване през изминалата седмица"
+      created_msg: Успешно блокиран домейн на е-поща
+      delete: Изтриване
+      dns:
+        types:
+          mx: Запис MX
+      domain: Домейн
+      new:
+        create: Добавяне на домейн
+        title: Блокиране на нов домейн на имейл
+      title: Блокирани домейни на имейл
+    export_domain_allows:
+      no_file: Няма избран файл
+    export_domain_blocks:
+      import:
+        existing_relationships_warning: Съществуващи последвания
+        private_comment_template: Внесено от %{source} на %{date}
+        title: Импортиране на блокиранията на домейни
+      new:
+        title: Импортиране на блокиранията на домейни
+      no_file: Няма избран файл
+    follow_recommendations:
+      description_html: "<strong>Препоръките за следване помагат на новите потребители бързо да намерят ново съдържание</strong>. Когато един потребител не е създавал достатъчно връзки, за да формира свои собствени препоръки за следване, тези акаунти ще бъдат препоръчани. Акаунтите ще бъдат генерирани всеки ден на базата на най-голяма скорошна ангажираност и най-голям брой местни последователи за даден език."
+      language: За език
+      status: Състояние
+      suppress: Забрана на препоръките за следване
+      suppressed: Забранени
+      title: Препоръки за следване
+      unsuppress: Възстановяване на препоръките за следване
+    instances:
+      availability:
+        description_html:
+          one: Ако доставянето до домейна не е успешно за <strong>%{count} ден</strong>, няма да има последващи опити, докато не се получи доставка <em>от</em> домейна.
+          other: Ако доставянето до домейна не е успешно за <strong>%{count} дни</strong>, няма да има последващи опити, докато не се получи доставка <em>от</em> домейна.
+        failure_threshold_reached: Прага за общ брой грешки е достигнат на %{date}.
+        failures_recorded:
+          one: Неуспешен опит в %{count} ден.
+          other: Неуспешни опити в %{count} различни дни.
+        no_failures_recorded: Няма записани неуспешни опити.
+        title: Наличност
+        warning: Последният опит за свързване с този сървър беше неуспешен
+      back_to_all: Всичко
+      back_to_limited: Ограничено
+      back_to_warning: Предупреждение
+      by_domain: Домейн
+      confirm_purge: Сигурни ли сте, че желаете да окончателно да изтриете данните от този домейн?
+      content_policies:
+        comment: Вътрешна бележка
+        description_html: Можете да дефинирате политики за съдържание, които ще бъдат приложени към всички акаунти от този домейн и всеки от под-домейните му.
+        policies:
+          reject_media: Отхвърляне на мултимедия
+          reject_reports: Отхвърляне на докладите
+          silence: Ограничение
+          suspend: Преустановяване
+        policy: Политика
+        reason: Обществена причина
+        title: Политика на съдържанието
+      dashboard:
+        instance_accounts_dimension: Най-следвани акаунти
+        instance_accounts_measure: запазени акаунти
+        instance_followers_measure: наши последователи там
+        instance_follows_measure: техни последователи тук
+        instance_languages_dimension: Водещи езици
+        instance_media_attachments_measure: запазена прикачена мултимедия
+        instance_reports_measure: доклади за тях
+        instance_statuses_measure: запазени публикации
+      delivery:
+        all: Всичко
+        clear: Изчистване на грешките за доставка
+        failing: Неуспех
+        restart: Рестартиране на доставката
+        stop: Спиране на доставката
+        unavailable: Неналично
+      delivery_available: Доставката е налична
+      delivery_error_days: Грешни дни на доставяне
+      delivery_error_hint: Ако доставката не е възможна за %{count} дни, автоматично ще бъде маркирана като невъзможно за доставка.
+      destroyed_msg: Данните от %{domain} бяха поставени на опашка за незабавно изтриване.
+      empty: Няма намерени домейни.
+      known_accounts:
+        one: "%{count} известен акаунт"
+        other: "%{count} известни акаунти"
+      moderation:
+        all: Всичко
+        limited: Ограничено
+        title: Mодериране
+      private_comment: Личен коментар
+      public_comment: Публичен коментар
+      purge: Чистка
+      purge_description_html: Ако считате, че този домейн е офлайн завинаги, можете да изтриете всички записи за акаунти и прилежащи данни за този домейн от вашата памет. Това може да отнеме известно време.
+      title: Федерация
+      total_blocked_by_us: Блокирано от нас
+      total_followed_by_them: Последвани от тях
+      total_followed_by_us: Последвано от нас
+      total_reported: Доклади за тях
+      total_storage: Прикачена мултимедия
+      totals_time_period_hint_html: Общите стойности, показани по-долу, включват всички данни.
+    invites:
+      deactivate_all: Деактивиране на всички
+      filter:
+        all: Всичко
+        available: Налично
+        expired: Изтекло
+        title: Филтър
+      title: Покани
+    ip_blocks:
+      add_new: Създаване на правило
+      created_msg: Успешно добавено ново правило за IP
+      delete: Изтриване
+      expires_in:
+        '1209600': 2 седмици
+        '15778476': 6 месеца
+        '2629746': 1 месец
+        '31556952': 1 година
+        '86400': 1 ден
+        '94670856': 3 години
+      new:
+        title: Създаване на ново правило за IP
+      no_ip_block_selected: Няма променени IP правила, тъй като нито едно не беше избрано
+      title: IP правила
+    relationships:
+      title: Отношения на %{acct}
+    relays:
+      add_new: Добавяне на нов предаващ сървър
+      delete: Изтриване
+      description_html: "<strong>Федериращ предаващ сървър</strong> е междинен сървър, който обменя огромни количества публични публикации между сървъри, които са записани и публикуват на него. <strong>Може да помогне на малки и средно-големи сървъри да открият съдържание от федивселената</strong>, който процес иначе би изискал от локалните потребители да следват хора от отдалечени сървъри."
+      disable: Изключване
+      disabled: Изключено
+      enable: Включване
+      enable_hint: Щом бъде включена настройката, вашият сървър ще се запише за всички публични публикации от този предаващ сървър и ще започне да изпраща към него публичните публикации от вашия сървър.
+      enabled: Включено
+      inbox_url: URL на предаващия сървър
+      pending: Изчакване на одобрение от предаващия сървър
+      save_and_enable: Запазване и включване
+      setup: Настройка на връзка с предаващия сървър
+      signatures_not_enabled: Предаващите сървъри може да не работят коректно, докато са включени режима за сигурност или режима за ограничено федериране
+      status: Състояние
+      title: Предаващи сървъри
+    report_notes:
+      created_msg: Успешно създаване на бележка за доклад!
+      destroyed_msg: Успешно изтриване на бележка за доклад!
+    reports:
+      account:
+        notes:
+          one: "%{count} бележка"
+          other: "%{count} бележки"
+      action_log: Одитен дневник
+      action_taken_by: Действие, предприето от
+      are_you_sure: Сигурни ли сте?
+      category: Категория
+      comment:
+        none: Нищо
+      created_at: Докладвано
+      delete_and_resolve: Изтриване на публикациите
+      forwarded: Препратено
+      forwarded_to: Препратено до %{domain}
+      mark_as_resolved: Маркиране като решено
+      mark_as_sensitive: Означаване като деликатно
+      mark_as_unresolved: Отбелязване като нерешено
+      notes:
+        create: Добавяне на бележка
+        create_and_resolve: Разрешаване с бележка
+        create_and_unresolve: Отваряне пак с бележка
+        delete: Изтриване
+        title: Бележки
+      reopen: Отваряне пак на доклад
+      reported_account: Докладван акаунт
+      reported_by: Докладвано от
+      resolved: Разрешено
+      skip_to_actions: Прескок към действия
+      status: Състояние
+      statuses: Докладвано съдържание
+      target_origin: Произход на докладвания акаунт
+      title: Доклади
+      updated_at: Обновено
+      view_profile: Преглед на профила
+    roles:
+      add_new: Добавяне на роля
+      assigned_users:
+        one: "%{count} потребител"
+        other: "%{count} потребители"
+      categories:
+        administration: Администрация
+        devops: Развитие и операции
+        invites: Покани
+        moderation: Mодериране
+        special: Специални
+      delete: Изтриване
+      edit: Промяна на ролята на „%{name}“
+      everyone: Разрешения по подразбиране
+      permissions_count:
+        one: "%{count} разрешение"
+        other: "%{count} разрешения"
+      privileges:
+        administrator: Администратор
+        administrator_description: Потребители с това разрешение ще заобиколят всички разрешения
+        delete_user_data: Изтриване на потребителските данни
+        invite_users: Поканване на потребители
+        invite_users_description: Позволява на потребителите да канят нови хора в сървъра
+        manage_announcements: Управляване на оповестяванията
+        manage_announcements_description: Позволява на потребителите да управляват оповестяванията в сървъра
+        manage_appeals: Управление на обжалванията
+        manage_appeals_description: Позволява на потребителите да разглеждат обжалвания срещу модераторски действия
+        manage_blocks: Управляване на блокиранията
+        manage_blocks_description: Позволява на потребителите да блокират доставчици на е-поща и IP адреси
+        manage_custom_emojis: Управляване на персонализирани емоджита
+        manage_custom_emojis_description: Позволява на потребителите да управляват персонализирани емоджита в сървъра
+        manage_federation: Управление на Федерацията
+        manage_federation_description: Позволява на потребители да блокират или позволяват федерация с други домейни, а и управление на доставаемостта
+        manage_invites: Управление на поканите
+        manage_invites_description: Позволява на потребители да разглеждат и деактивират връзки за покана
+        manage_reports: Управление на докладите
+        manage_reports_description: Позволява на потребители да преглеждат доклади и да извършват модериращи действия срещу тях
+        manage_roles: Управление на ролите
+        manage_roles_description: Позволява на потребителите да управляват и разпределят роли под техните
+        manage_rules: Управление на правилата
+        manage_rules_description: Позволява на потребителите да променят правилата на сървъра
+        manage_settings: Управление на настройките
+        manage_settings_description: Позволява на потребителите да променят настройки на сайта
+        manage_user_access: Управление на потребителския достъп
+        manage_users: Управление на потребителите
+        manage_webhooks: Управление на уебкуките
+        manage_webhooks_description: Позволява на потребителите да настройват уебкуки за административни събития
+        view_audit_log: Преглед на одитния дневник
+        view_audit_log_description: Позволява на потребителите да виждат историята на административни действия в сървъра
+        view_devops: Развитие и операции
+        view_devops_description: Позволява на потребителите да имат достъп до таблото за управл. на Sidekiq и pgHero
+      title: Роли
+    rules:
+      add_new: Добавяне на правило
+      delete: Изтриване
+      edit: Промяна на правило
+      empty: Още няма определени правила на сървъра.
+      title: Правила на сървъра
+    settings:
+      about:
+        manage_rules: Управление на правилата на сървъра
+        title: Относно
+      appearance:
+        preamble: Настройване на мрежовия интерфейс на Mastodon.
+        title: Външен вид
+      branding:
+        title: Брандиране
+      default_noindex:
+        desc_html: Влияе на всички потребители, които не са променили тази настройка за себе си
+      discovery:
+        profile_directory: Директория на профила
+        public_timelines: Публични инфопотоци
+        title: Откриване
+        trends: Актуални
+      domain_blocks:
+        all: До всеки
+        disabled: До никого
+        users: До влезнали локални потребители
+      registrations:
+        preamble: Управлява кой може да създава акаунт на сървъра ви.
+        title: Регистрации
+      title: Настройки на сървъра
+    site_uploads:
+      delete: Изтриване на качения файл
+    statuses:
+      account: Автор
+      application: Приложение
+      back_to_account: Назад към страницата на акаунта
+      back_to_report: Назад към страницата на доклада
+      batch:
+        remove_from_report: Премахване от доклада
+        report: Докладване
+      deleted: Изтрито
+      favourites: Любими
+      history: История на версиите
+      language: Език
+      media:
+        title: Мултимедия
+      metadata: Метаданни
+      open: Отваряне на публикация
+      original_status: Първообразна публикация
+      reblogs: Блогване пак
+      status_changed: Публикацията променена
+      title: Публикации на акаунта
+      trending: Изгряващи
+      visibility: Видимост
+      with_media: С мултимедия
+    strikes:
+      actions:
+        delete_statuses: "%{name} изтри публикации на %{target}"
+        disable: "%{name} замрази акаунта на %{target}"
+        mark_statuses_as_sensitive: "%{name} означи публикациите на %{target} като деликатни"
+        none: "%{name} изпрати предупреждение до %{target}"
+        sensitive: "%{name} означи акаунта на %{target} като деликатен"
+        silence: "%{name} сложи ограничения на акаунта на %{target}"
+        suspend: "%{name} преустанови акаунта на %{target}"
+      appeal_approved: Обжалвано
+      appeal_pending: Чака се обжалването
+    system_checks:
+      elasticsearch_running_check:
+        message_html: Не можа да се свърже с Elasticsearch. Проверете дали работи или изключете пълнотекстовото търсене
+      elasticsearch_version_check:
+        message_html: 'Несъвместима версия на Elasticsearch: %{value}'
+        version_comparison: Работи Elasticsearch на %{running_version}, докато се изисква %{required_version}
+      rules_check:
+        action: Управление на правилата на сървъра
+        message_html: Не сте определили никакви правила на сървъра.
+    tags:
+      review: Преглед на състояние
+      updated_msg: Успешно осъвременени настройки на хаштага
+    title: Администрация
+    trends:
+      allow: Позволяване
+      approved: Одобрено
+      disallow: Забранявам
+      links:
+        allow: Позволяване на връзка
+        allow_provider: Позволяване на публикуващия
+        description_html: Това са линкове, които в момента са често споделяни от акаунти, чиито публикации вашият сървър вижда. Може да помогне на вашите потребители да разберат какво се случва по света. Никой линк няма да се покаже публично, докато не одобрите автора. Можете също и да одобрявате или забранявате отделни линкове.
+        disallow: Забранявам връзката
+        disallow_provider: Забраняване на публикуващия
+        shared_by_over_week:
+          one: Споделено от един човек през последната седмица
+          other: Споделено от %{count} хора през последната седмица
+        usage_comparison: Споделено %{today} пъти днес, в сравнение с %{yesterday} пъти вчера
+      only_allowed: Само позволените
+      pending_review: В очакване на преглед
+      preview_card_providers:
+        description_html: Това са домейни, линковете от които са често споделяни на вашия сървър. Линковете няма да се показват в нашумели, докато домейнът на линка не бъде одобрен. Вашите одобрения (забрани) влияят и на поддомейни.
+        title: Публикуващи
+      rejected: Отхвърлено
+      statuses:
+        allow: Позволяване на публикацията
+        allow_account: Позволяване на автора
+        description_html: Това са публикациите, за които вашият сървър знае, че в момента са често споделяни или харесвани. Би помогнало на вашите нови и завръщащи се потребители да открият повече хора, които да последват. Никоя от публикациите няма да бъде показан публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предложен. Можете също да позволявате и забранявате отделни публикации.
+        disallow: Забраняване на публикацията
+        disallow_account: Забрана на автора
+        shared_by:
+          one: Споделено или харесано един път
+          other: Споделено или харесано %{friendly_count} пъти
+      tags:
+        dashboard:
+          tag_accounts_measure: неповторими употреби
+          tag_languages_dimension: Водещи езици
+          tag_servers_dimension: Водещи сървъри
+          tag_servers_measure: различни сървъри
+          tag_uses_measure: обща употреба
+        not_usable: Не може да се използва
+        usable: Може да се употребява
+    warning_presets:
+      add_new: Добавяне на ново
+      delete: Изтриване
+    webhooks:
+      add_new: Добавяне на крайна точка
+      delete: Изтриване
+      events: Събития
+      status: Състояние
+      title: Уебкуки
+      webhook: Уебкука
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: за изтриване на публикациите им
+        mark_statuses_as_sensitive: за означаване на публикациите им като деликатни
+        none: предупреждение
+        sensitive: за означаване на акаунтите като деликатни
+        silence: за слагане на органичение на акаунтите им
+        suspend: за спиране на акаунтите им
+    new_report:
+      body: "%{reporter} докладва %{target}"
+      body_remote: Някого от %{domain} докладва %{target}
+    new_trends:
+      new_trending_links:
+        title: Налагащи се връзки
+      new_trending_statuses:
+        title: Налагащи се публикации
+      new_trending_tags:
+        title: Нашумели хаштагове
+      subject: Нови нашумели, готови за преглед в %{instance}
+  aliases:
+    add_new: Създайте псевдоним
+    empty: Нямате псевдоними.
+  appearance:
+    advanced_web_interface: Разширен уеб интерфейс
+    advanced_web_interface_hint: 'Ако желаете да се възползвате от пълната ширина на своя екран, разширеният уеб интерфейс ще ви позволи да настроите най-различни колони, за да виждате едновременно множество информация: Начало, известия, федериран инфопоток, множество списъци и хаштагове.'
+    animations_and_accessibility: Анимация и достъпност
+    confirmation_dialogs: Диалогов прозорец за потвърждение
+    discovery: Откриване
+    localization:
+      body: Mastodon е преведено от доброволци.
+      guide_link: https://ru.crowdin.com/project/mastodon
+      guide_link_text: Всеки може да участва.
+    sensitive_content: Деликатно съдържание
+    toot_layout: Оформление на публикацията
   application_mailer:
+    notification_preferences: Промяна на предпочитанията за имейл
+    salutation: "%{name},"
     settings: 'Промяна на предпочитанията за e-mail: %{link}'
     view: 'Преглед:'
+    view_profile: Преглед на профила
+    view_status: Преглед на публикацията
   applications:
-    invalid_url: Предоставеният URL е невалиден
+    warning: Бъдете внимателни с тези данни. Никога не ги споделяйте с никого!
+    your_token: Вашият код за достъп
   auth:
+    change_password: Парола
+    delete_account: Изтриване на акаунта
+    delete_account_html: Ако желаете да изтриете акаунта си, можете <a href="%{path}">да сторите това тук</a>. Ще ви бъде поискано потвърждение.
+    description:
+      prefix_invited_by_user: "@%{name} ви покани да се присъедините към този сървър на Mastodon!"
+      prefix_sign_up: Регистрирайте се днес в Mastodon!
     didnt_get_confirmation: Не получих инструкции за потвърждение
+    dont_have_your_security_key: Нямате ли си ключ за сигурност?
     forgot_password: Забравих си паролата
+    link_to_otp: Въведете двуфакторния код от телефона си или кода за възстановяване
+    link_to_webauth: Използвайте ключа си за сигурност на устройството
+    log_in_with: Влизане с
     login: Влизане
     logout: Излизане
+    migrate_account: Преместване в различен акаунт
+    migrate_account_html: Ако желаете да пренасочите този акаунт към друг, можете да <a href="%{path}">настроите това тук</a>.
+    or_log_in_with: Или влизане с помощта на
+    privacy_policy_agreement_html: Прочетох и има съгласието ми за <a href="%{privacy_policy_path}" target="_blank">политиката за поверителност</a>
     register: Регистрация
+    registration_closed: "%{instance} не приема нови членуващи"
     resend_confirmation: Изпрати отново инструкции за потвърждение
     reset_password: Подновяване на паролата
-    security: Идентификационни данни
-    set_new_password: Задай нова парола
+    rules:
+      title: Някои основни правила.
+    security: Сигурност
+    set_new_password: Задаване на нова парола
+    setup:
+      title: Настройка
+    status:
+      account_status: Състояние на акаунта
+      confirming: Чакане завършването на потвърждение на имейла.
+      functional: Вашият акаунт е в изправност.
+    use_security_key: Употреба на ключ за сигурност
   authorize_follow:
-    error: Възникна грешка в откриването на потребителя
+    already_following: Вече следвате този акаунт
+    error: Възникна грешка, търсейки отдалечения акаунт
     follow: Последвай
+    follow_request: 'Изпратихте следната заявка до:'
+    following: 'Успешно! Сега сте последвали:'
+    post_follow:
+      close: Или просто затворете този прозорец.
+      return: Показване на профила на потребителя
+      web: Към мрежата
     title: Последвай %{acct}
+  challenge:
+    confirm: Продължаване
+    hint_html: "<strong>Съвет</strong>: няма да ви питаме пак за паролата през следващия час."
+    invalid_password: Невалидна парола
+    prompt: Потвърдете паролата, за да продължите
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} ч."
@@ -213,89 +882,545 @@ bg:
       x_minutes: "%{count} мин"
       x_months: "%{count} м"
       x_seconds: "%{count} сек"
+  deletes:
+    challenge_not_passed: Въвели сте неправилна информация
+    confirm_password: Въведете текущата си парола, за да потвърдите самоличността си
+    confirm_username: Въведете потребителското си име, за да потвърдите процедурата
+    proceed: Изтриване на акаунта
+    success_msg: Вашият акаунт е успешно изтрит
+    warning:
+      before: 'Прочетете внимателно тези бележки преди да продължите:'
+      data_removal: Ваши публикации и други данни ще бъдат завинаги премахнати
+      username_available: Вашето потребителско име ще стане налично отново
+      username_unavailable: Вашето потребителско име ще остане неналично
+  disputes:
+    strikes:
+      created_at: Остаряло
+      status: 'Публикация #%{id}'
+      title: "%{action} от %{date}"
+      title_actions:
+        mark_statuses_as_sensitive: Означаване на публикациите като деликатни
+        none: Предупреждение
+        sensitive: Означаване на акаунта като деликатен
+        suspend: Преустановяване на акаунта
+      your_appeal_approved: Вашето обжалване е одобрено
+      your_appeal_rejected: Вашето обжалване е отхвърлено
+  domain_validator:
+    invalid_domain: не е валидно име на домейн
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '422': 
-    '429': Too many requests
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '400': Подадохте невалидна или деформирана заявка.
+    '403': Нямате позволение да разгледате тази страница.
+    '404': Търсената от вас страница не е тук.
+    '406': Страницата не е налична в искания формат.
+    '410': Страницата, която търсехте, вече не съществува тук.
+    '422':
+      content: Провали се проверката за сигурността. Блокирате ли бисквитките?
+      title: Неуспешна проверка за сигурност
+    '429': Премного заявки
+    '500':
+      content: Съжаляваме, но нещо се обърка в нашия край.
+      title: Страницата не е правилна
+    '503': Страницата не може да се обслужва заради временен провал на сървъра.
+    noscript_html: Включете JavaScript, за да използвате уеб приложението Mastodon. Като алтернатива опитайте някое от <a href="%{apps_path}">естествените приложения</a> за Mastodon за платформата ви.
+  existing_username_validator:
+    not_found: не можа да се намери местен потребител с това потребителско име
+    not_found_multiple: не можа да намери %{usernames}
   exports:
+    archive_takeout:
+      date: Дата
+      download: Изтегляне на архива ви
+      hint_html: Можете да поръчате архив с вашите <strong>публикации и качена мултимедия</strong>. Експортираните данни ще бъдат във формат ActivityPub, който е четим от всеки съвместим софтуер. Можете да поръчате такъв архив на всеки 7 дни.
+      in_progress: Съставяне на архива ви...
+      request: Искане на архива ви
+      size: Размер
     blocks: Вашите блокирания
+    bookmarks: Отметки
+    csv: CSV
+    domain_blocks: Блокирания на домейна
+    lists: Списъци
+    mutes: Заглушавания
     storage: Съхранение на мултимедия
+  featured_tags:
+    add_new: Добавяне на нов
+    errors:
+      limit: Вече достигнахте максималния брой хаштагове
+    hint_html: "<strong>Какво представляват актуалните хаштагове?</strong> Те се показват ясно на вашия публичен профил и позволяват на хората да преглеждат публичните ви публикации с тези хаштагове. Те са чудесен инструмент, с който може да се следи творческа работа или дългосрочни проекти."
+  filters:
+    contexts:
+      account: Профили
+      home: Начало и списъци
+      notifications: Известия
+      public: Публични инфопотоци
+      thread: Разговори
+    edit:
+      add_keyword: Добавяне на ключова дума
+      keywords: Ключови думи
+      statuses: Отделни публикации
+      title: Редактиране на филтър
+    index:
+      contexts: Филтри в %{contexts}
+      delete: Изтриване
+      empty: Нямате филтри.
+      expires_on: Изтича на %{date}
+      keywords:
+        one: "%{count} ключова дума"
+        other: "%{count} ключови думи"
+      statuses:
+        one: "%{count} публикация"
+        other: "%{count} публикации"
+      statuses_long:
+        one: "%{count} скрита отделна публикация"
+        other: "%{count} скрити отделни публикации"
+      title: Филтри
+    new:
+      save: Запазване на нов филтър
+      title: Добавяне на нов филтър
+    statuses:
+      back_to_filter: Обратно към филтъра
+      batch:
+        remove: Премахване от филтъра
+      index:
+        title: Филтрирани публикации
   generic:
+    all: Всичко
     changes_saved_msg: Успешно запазване на промените!
+    copy: Копиране
+    delete: Изтриване
+    deselect: Размаркиране на всичко
+    none: Нищо
+    order_by: Подреждане по
     save_changes: Запази промените
+    today: днес
+    validation_errors:
+      one: Нещо още не е напълно наред! Прегледайте грешката долу
+      other: Нещо още не е напълно наред! Прегледайте %{count} грешки долу
+  html_validator:
+    invalid_markup: 'съдържа невалидно HTML маркиране: %{error}'
   imports:
+    modes:
+      merge: Сливане
+      merge_long: Пази текущите записи и добавя нови
+      overwrite: Презаписване
+      overwrite_long: Заменя текущите записи с новите
     preface: Можеш да импортираш някои данни, като например всички хора, които следваш или блокираш в акаунта си на тази инстанция, от файлове, създадени чрез експорт в друга инстанция.
     success: Твоите данни бяха успешно качени и ще бъдат обработени впоследствие
     types:
       blocking: Списък на блокираните
+      bookmarks: Отметки
       following: Списък на последователите
+      muting: Списък заглушавания
     upload: Качване
+  invites:
+    delete: Деактивиране
+    expired: Изтекло
+    expires_in:
+      '1800': 30 минути
+      '21600': 6 часа
+      '3600': 1 час
+      '43200': 12 часа
+      '604800': 1 седмица
+      '86400': 1 ден
+    expires_in_prompt: Никога
+    generate: Генериране на линк за покана
+    invited_by: 'Бяхте поканени от:'
+    max_uses:
+      one: 1 използване
+      other: "%{count} използвания"
+    max_uses_prompt: Без ограничение
+    prompt: Генериране на линкове, които можете да споделите, за да предоставите достъп до този сървър
+    table:
+      expires_at: Изтича на
+      uses: Използвания
+    title: Поканете хора
+  lists:
+    errors:
+      limit: Достигнахте максималния брой списъци
+  login_activities:
+    authentication_methods:
+      otp: приложение за двуфакторно удостоверяване
+      password: парола
+      sign_in_token: код за сигурност на имейла
+      webauthn: ключове за сигурност
+    description_html: Ако забележите неузнаваема дейност, то обмислете смяна на паролата си и включване на двуфакторното удостоверяване.
+    empty: Няма налична история на удостоверяване
+    title: Историята на удостоверяване
   media_attachments:
     validations:
       images_and_video: Не мога да прикача видеоклип към публикация, която вече съдържа изображения
       too_many: Не мога да прикача повече от 4 файла
+  migrations:
+    acct: Преместено в
+    cancel: Отмяна на пренасочването
+    cancelled_msg: Успешно отменено пренасочване.
+    errors:
+      move_to_self: не може да е текущия акаунт
+      not_found: не може да се намери
+    followers_count: Последователи по време на преместването
+    incoming_migrations: Преместване от различен акаунт
+    incoming_migrations_html: За да се преместите от друг акаунт към този, първо трябва да<a href="%{path}">създадете псевдоним за акаунта</a>.
+    past_migrations: Минали миграции
+    proceed_with_move: Още последователи
+    redirected_msg: Вашият акаунт сега се пренасочва към %{acct}.
+    redirecting_to: Вашият акаунт е пренасочен към %{acct}.
+    set_redirect: Задаване на пренасочване
+  moderation:
+    title: Mодериране
   notification_mailer:
-    digest:
-      body: Ето кратко резюме на нещата, които се случиха от последното ти посещение на %{since}
-      mention: "%{name} те спомена в:"
-      new_followers_summary:
-        one: Имаш един нов последовател! Ура!
-        other: Имаш %{count} нови последователи! Изумително!
-      subject:
-        one: "1 ново известие от последното ти посещение \U0001F418"
-        other: "%{count} нови известия от последното ти посещение \U0001F418"
+    admin:
+      report:
+        subject: "%{name} подаде доклад"
+      sign_up:
+        subject: "%{name} се регистрира"
     favourite:
       body: 'Публикацията ти беше харесана от %{name}:'
       subject: "%{name} хареса твоята публикация"
+      title: Ново любимо
     follow:
       body: "%{name} те последва!"
       subject: "%{name} те последва"
+      title: Нов последовател
     follow_request:
+      action: Управляване на следните заявки
       body: "%{name} помоли за разрешение да те последва"
       subject: 'Чакащ последовател: %{name}'
     mention:
+      action: Отговор
       body: "%{name} те спомена в:"
       subject: "%{name} те спомена"
+      title: Ново споменаване
+    poll:
+      subject: Анкетата от %{name} приключи
     reblog:
       body: 'Твоята публикация беше споделена от %{name}:'
       subject: "%{name} сподели публикацията ти"
+    status:
+      subject: "%{name} току-що публикува"
+    update:
+      subject: "%{name} промени публикация"
+  notifications:
+    email_events: Събития за известия по имейл
+    email_events_hint: 'Изберете събития, за които искате да получавате известия:'
+    other_settings: Настройки за други известия
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: млрд
+          million: млн
+          quadrillion: квдрлн
+          thousand: хил
+          trillion: трлн
+  otp_authentication:
+    code_hint: Въведете кода, генериран от вашето приложение за удостоверяване, за да потвърдите
+    description_html: Ако включите <strong>двустепенното удостоверяване</strong> с помощта на приложение за удостоверяване, всеки път, когато влизате, ще трябва да разполагате с телефона си, който ще генерира код за влизане.
+    enable: Включване
+    instructions_html: "<strong>Сканирайте този QR код с Google Authenticator или подобно приложение от своя телефон</strong>. Oтсега нататък, това приложение ще генерира код, който ще трябва да въвеждате при всяко влизане."
+    manual_instructions: 'Ако не може да сканирате QR-кода и трябва да го въведете ръчно, то ето го:'
+    setup: Настройване
+    wrong_code: Въведеният код е невалиден! Времето на сървъра и времето на устройството правилни ли са?
   pagination:
+    newer: По-ново
     next: Напред
+    older: По-старо
     prev: Назад
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Вече сте гласували в тази анкета
+      duplicate_options: съдържа повтарящи се елементи
+      duration_too_long: е твърде далеч в бъдещето
+      duration_too_short: е твърде скоро
+      expired: Анкетата вече е приключила
+      invalid_choice: Избраната възможност за гласуване не съществува
+      over_character_limit: не може по-дълго от %{max} символа всяко
+      too_few_options: трябва да има повече от един елемент
+      too_many_options: не може да съдържа повече от %{max} елемента
+  preferences:
+    other: Друго
+    posting_defaults: По подразбиране за публикации
+    public_timelines: Публични инфопотоци
+  privacy_policy:
+    title: Политика за поверителност
+  reactions:
+    errors:
+      limit_reached: Ограничението на различни реакции е достигнат
+      unrecognized_emoji: не е разпознато емоджи
+  relationships:
+    activity: Дейност на акаунта
+    dormant: Неактивен
+    follow_selected_followers: Последване на избраните последователи
+    followers: Последователи
+    following: Последвани
+    invited: С покана
+    last_active: Последна дейност
+    most_recent: Най-наскоро
+    moved: Преместен
+    mutual: Взаимни
+    primary: Основен
+    relationship: Отношение
+    remove_selected_domains: Премахване на всички последователи от избраните домейни
+    remove_selected_followers: Премахване на избраните последователи
+    remove_selected_follows: Стоп на следването на избраните потребители
+    status: Състояние на акаунта
   remote_follow:
-    acct: Въведи потребителско_име@домейн, от които искаш да следваш
-    missing_resource: Неуспешно търсене на нужния URL за пренасочване за твоя акаунт
-    proceed: Започни следване
-    prompt: 'Ще последваш:'
+    missing_resource: Не можа да се намери искания URL за пренасочване за акаунта ви
+  rss:
+    content_warning: 'Предупреждение за съдържанието:'
+    descriptions:
+      account: Публични публикации от @%{acct}
+      tag: 'Публични публикации с таг #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Завишили сте ограничението от %{limit} планирани публикации за днес
+    over_total_limit: Завишили сте ограничението от %{limit} планирани публикации
+    too_soon: Заплануваната дата трябва да е в бъдеще
+  sessions:
+    activity: Последна активност
+    browser: Браузър
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Edge на Майкрософт
+      electron: Electron
+      firefox: Firefox
+      generic: Неизвестен браузър
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Браузър Nokia S40 Ovi
+      opera: Опера
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: Браузър QQ
+      safari: Safari
+      uc_browser: Браузър UC
+      weibo: Weibo
+    current_session: Текуща сесия
+    description: "%{browser} на %{platform}"
+    explanation: Това са уеб браузърите, от които в момента сте влезли с вашия Mastodon акаунт.
+    ip: IP адрес
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Оп. сист. Firefox
+      ios: iOS
+      linux: Линукс
+      mac: macOS
+      other: неизвестна платформа
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Анулирaне
+    revoke_success: Успешно анулирана сесия
+    title: Сесии
+    view_authentication_history: Преглед на историята на удостоверяване на акаунта ви
   settings:
+    account: Акаунт
+    account_settings: Настройки на акаунта
+    appearance: Външен вид
     authorized_apps: Упълномощени приложения
     back: Обратно към Mastodon
+    delete: Изтриване на акаунта
+    development: Разработка
     edit_profile: Редактирай профила си
     export: Експортиране на данни
+    featured_tags: Актуални хаштагове
     import: Импортиране
+    import_and_export: Импортиране и експортиране
+    migrate: Миграция на акаунта
+    notifications: Известия
     preferences: Предпочитания
+    profile: Профил
+    relationships: Последвания и последователи
+    statuses_cleanup: Автоматично изтриване на публикации
     two_factor_authentication: Двустепенно удостоверяване
+    webauthn_authentication: Ключове за сигурност
   statuses:
+    attached:
+      audio:
+        one: "%{count} звукозапис"
+        other: "%{count} звукозаписа"
+      description: 'Прикачено: %{attached}'
+      image:
+        one: "%{count} образ"
+        other: "%{count} образа"
+      video:
+        one: "%{count} видео"
+        other: "%{count} видеозаписа"
+    content_warning: 'Предупреждение за съдържание: %{warning}'
+    default_language: Същият като езика на интерфейса
+    disallowed_hashtags:
+      one: 'съдържа непозволен хаштаг: %{tags}'
+      other: 'съдържа непозволени хаштагове: %{tags}'
+    edited_at_html: Редактирано на %{date}
+    errors:
+      in_reply_not_found: Изглежда, че публикацията, на която се опитвате да отговорите, не съществува.
     open_in_web: Отвори в уеб
     over_character_limit: прехвърлен лимит от %{max} символа
+    pin_errors:
+      direct: Публикациите, които са видими само за споменати потребители не може да се закачат
+      limit: Вече сте закачили максималния брой публикации
+      ownership: Публикация на някого другиго не може да се закачи
+    poll:
+      total_people:
+        one: "%{count} човек"
+        other: "%{count} души"
+      vote: Гласуване
     show_more: Покажи повече
+    show_newer: Показване на по-нови
+    show_older: Показване на по-стари
+    show_thread: Показване на нишката
+    sign_in_to_participate: Влезте, за да участвате в разговора
+    title: "%{name}: „%{quote}“"
     visibilities:
+      direct: Директно
       private: Покажи само на последователите си
+      private_long: Видими само за последователи
       public: Публично
+      public_long: Всеки ги вижда
       unlisted: Публично, но не показвай в публичния канал
+      unlisted_long: Всеки ги вижда, но са скрити от публичните инфопотоци
+  statuses_cleanup:
+    enabled: Автоматично изтриване на стари публикации
+    enabled_hint: Автоматично изтрива публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу
+    exceptions: Изключения
+    explanation: Тъй като изтриването на публикации е скъпа операция, това се прави бавно във времето, когато сървърът иначе не е зает. Поради тази причина публикациите ви може да се изтрият известно време след като достигнат възрастовия праг.
+    ignore_favs: Игнориране на харесвания
+    ignore_reblogs: Игнориране на споделяния
+    interaction_exceptions: Изключения въз основа на взаимодействия
+    interaction_exceptions_explanation: Забележете, че няма гаранция, че публикации ще бъдат изтрити, ако паднат под прага на брой харесвания/споделяния, след като са го надвишили.
+    keep_direct: Запазване на директните съобщения
+    keep_direct_hint: Директните ви съобщения не се изтриват
+    keep_media: Задържане на публикации с прикачена мултимедия
+    keep_pinned: Запазване на закачените публикации
+    keep_self_bookmark: Запазване на публикации, добавени в отметки
+    keep_self_bookmark_hint: Не се изтриват ваши публикации, ако сте ги добавили към отметки
+    keep_self_fav: Запазване на харесаните публикации
+    keep_self_fav_hint: Не се изтриват публикации, които сте харесали
+    min_age:
+      '1209600': 2 седмици
+      '15778476': 6 месеца
+      '2629746': 1 месец
+      '31556952': 1 година
+      '5259492': 2 месеца
+      '604800': 1 седмица
+      '63113904': 2 години
+      '7889238': 3 месеца
+    min_age_label: Възрастов праг
+    min_favs: Запазване на публикации с поне толкова харесвания
+    min_favs_hint: Не се изтриват ваши публикации, харесани поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от техния брой харесвания
+    min_reblogs: Запазване на публикации с поне толкова споделяния
+    min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от техния брой споделяния
   stream_entries:
+    pinned: Закачена публикация
     reblogged: споделено
     sensitive_content: Деликатно съдържание
+  tags:
+    does_not_match_previous_name: не съвпада с предишното име
+  themes:
+    contrast: Mastodon (висок контраст)
+    default: Mastodon (тъмно)
+    mastodon-light: Mastodon (светло)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
+    add: Добавяне
     disable: Деактивирай
+    disabled_success: Двуфакторното удостоверяване е успешно изключено
+    edit: Редактиране
+    enabled: Двуфакторното удостоверяване е включено
+    enabled_success: Двуфакторното удостоверяване е успешно включено
+    generate_recovery_codes: Генериране на кодове за възстановяване
+    lost_recovery_codes: Кодовете за възстановяване ви позволяват да възвърнете достъпа до акаунта си, ако загубите телефона си. Ако загубите кодовете си за възстановяване, то може да ги породите тук. Старите ви кодове за възстановяване ще станат невалидни.
+    methods: Двуфакторни начини
+    otp: Приложение за удостоверяване
+    recovery_codes: Резервни кодове за възстановяване
+    recovery_codes_regenerated: Успешно генериране на кодовете за възстановяване
+    recovery_instructions_html: Ако изгубите достъп до телефона си, може да използвате долните кодовете за възстановяване, за да достъп до акаунта си. <strong>Запазете тези кодове на сигурно място</strong>. Например, можете да ги отпечатате и да ги складирате заедно с други важни документи.
+    webauthn: Ключове за сигурност
+  user_mailer:
+    appeal_approved:
+      action: Към акаунта ви
+      subject: Вашето обжалване от %{date} е било одобрено
+      title: Одобрено обжалване
+    appeal_rejected:
+      subject: Вашето обжалване от %{date} е било отхвърлено
+      title: Отхвърлено обжалване
+    backup_ready:
+      explanation: Изискахте пълно резервно копиране на акаунта си в Mastodon. Вече е готово за изтегляне!
+      subject: Вашият архив е готов за изтегляне
+    suspicious_sign_in:
+      change_password: промяна на паролата ви
+      details: 'Ето подробности при вход:'
+      explanation: Засякохме влизане в акаунта ви от нов IP адрес.
+      subject: Вашият акаунт е използвал достъп от нов IP адрес
+      title: Нов вход
+    warning:
+      appeal: Подаване на обжалване
+      appeal_description: Ако вярвате, че това е грешка, то може да подадете обжалване до щаба на %{instance}.
+      categories:
+        spam: Спам
+        violation: Съдържанието нарушава следните ръководни линии
+      explanation:
+        delete_statuses: Някои от публикациите ви са нарушили една или повече от ръководните линии на общността и впоследствие бяха премахнати от модераторите на %{instance}.
+        mark_statuses_as_sensitive: Някои от публикациите ви са отбелязани като деликатни от модераторите на %{instance}. Това означава, че хората трябва да почукнат на мултимедията в публикацията преди да се показва нагледно. Може сами да отбелязвате мултимедия като деликатна, публикувайки в бъдеще.
+        sensitive: От сега нататък, всички качени мултимедийни файлове ще се означават като деликатни и скрити зад предупреждение за щракване.
+        silence: Още може да употребявате акаунта си, но само хора, които вече са ви последвали ще виждат публикациите ви на този сървър, а и може да бъдете изключени от различни функции за откриване. Въпреки това, други все още могат да ви последват ръчно.
+      reason: 'Причина:'
+      statuses: 'Цитирани публ.:'
+      subject:
+        delete_statuses: Ваши публикации в %{acct} са били премахнати
+        disable: Вашият акаунт %{acct} е бил замразен
+        mark_statuses_as_sensitive: Вашите публикации в %{acct} са означени като деликатни
+        none: Предупреждение за %{acct}
+        sensitive: Вашите публикации в %{acct} ще се означават като деликатни от сега нататък
+        silence: Вашият акаунт %{acct} е бил ограничен
+        suspend: Вашият акаунт %{acct} е бил преустановен
+      title:
+        delete_statuses: Публикацията е премахната
+        disable: Акаунтът е замразен
+        mark_statuses_as_sensitive: Публикацията отбелязана като деликатна
+        none: Предупреждение
+        sensitive: Акаунтът е означен като деликатен
+        silence: Акаунтът има ограничение
+        suspend: Акаунтът е спрян
+    welcome:
+      edit_profile_action: Настройване на профила
+      edit_profile_step: Може да настроите профила си, качвайки снимката на профила, променяйки показваното си име и други неща. Може да се включите за преглед на нови последователи преди да бъдат позволени да ви последват.
+      explanation: Ето няколко стъпки за начало
+      final_action: Начало на публикуване
+      final_step: 'Публикувайте! Дори без последователи, вашите публични публикации ще бъдат видени от други, например в местния инфопоток или под хаштагове. Не забравяйте да се представите с хаштаг #introductions.'
+      full_handle_hint: Ето какво бихте казали на приятелите си, за да могат да ви изпращат съобщения или да ви последват от друг сървър.
+      subject: Добре дошли в Mastodon
+      title: Добре дошли на борда, %{name}!
   users:
+    follow_limit_reached: Не може да последвате повече от %{limit} души
     invalid_otp_token: Невалиден код
+    otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
+    seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
+    signed_in_as: 'Влезли като:'
+  verification:
+    explanation_html: 'Можете да <strong>удостоверите самоличността си като собственик на линковете в метаданните на своя профил</strong>. За целта сайтът, към който води линк от метаданните, трябва да съдържа линк обратно към вашия профил в Mastodon. Линкът от сайта <strong>трябва</strong> да съдържа атрибут <code>rel="me"</code>. Текстовото съдържание на линка няма значение. Ето пример:'
+    verification: Проверка
+  webauthn_credentials:
+    add: Добавяне на нов ключ за сигурност
+    create:
+      error: Възникна проблем, добавяйки ключ за сигурност. Опитайте пак.
+      success: Вашият ключ за сигурност беше добавен успешно.
+    delete: Изтриване
+    delete_confirmation: Наистина ли искате да изтриете този ключ за сигурност?
+    description_html: Ако включите <strong>ключ за сигурност при удостоверяване</strong>, то влизането ще изисква да употребите един от ключовете ви за сигурност.
+    destroy:
+      error: Възникна проблем, изтривайки ключа си за сигурност. Опитайте пак.
+      success: Вашият ключ за сигурност беше изтрит успешно.
+    invalid_credential: Невалиден ключ за сигурност
+    nickname_hint: Въведете прякор на новия си ключ за сигурност
+    not_enabled: Още не сте включили WebAuthn
+    not_supported: Този браузър не поддържа ключове за сигурност
+    otp_required: Първо включете двуфакторното удостоверяване, за да използвате ключовете за сигурност.
+    registered_on: Регистрирано на %{date}
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 7e6fee889..5a40fad8f 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1,87 +1,25 @@
 ---
 bn:
   about:
-    about_hashtag_html: এগুলো প্রকাশ্য লেখা যার হ্যাশট্যাগ <strong>#%{hashtag}</strong>। আপনি এগুলোর ব্যবহার বা সাথে যুক্ত হতে পারবেন যদি আপনার যুক্তবিশ্বের কোথাও নিবন্ধন থেকে থাকে।
     about_mastodon_html: মাস্টাডন উন্মুক্ত ইন্টারনেটজালের নিয়ম এবং স্বাধীন ও মুক্ত উৎসের সফটওয়্যারের ভিত্তিতে তৈরী একটি সামাজিক যোগাযোগ মাধ্যম। এটি ইমেইলের মত বিকেন্দ্রীভূত।
-    about_this: কি
-    active_count_after: চালু
-    active_footnote: মাসিক সক্রিয় ব্যবহারকারী
-    administered_by: 'পরিচালনা করছেন:'
-    api: সফটওয়্যার তৈরীর নিয়ম (API)
-    apps: মোবাইল অ্যাপ
-    apps_platforms: মাস্টাডন আইওএস, এন্ড্রোইড বা অন্য মাধ্যমে ব্যবহার করুন
-    browse_directory: একটি ব্যবহারকারীদের তালিকা দেখুন এবং পছন্দ অনুসারে খুজুন
-    browse_local_posts: এই সার্ভার থেকে সর্বজনীন পোস্টগুলির একটি লাইভ স্ট্রিম ব্রাউজ করুন
-    browse_public_posts: মাস্টাডনে নতুন প্রকাশ্য লেখাগুলো সরাসরি দেখুন
-    contact: যোগাযোগ
     contact_missing: নেই
     contact_unavailable: প্রযোজ্য নয়
-    discover_users: ব্যবহারকারীদের দেখুন
-    documentation: ব্যবহারবিলি
-    federation_hint_html: "%{instance}তে একটা নিবন্ধন থাকলে আপনি যেকোনো মাস্টাডন বা এধরণের অন্যান্য সার্ভারের মানুষের সাথে যুক্ত হতে পারবেন ।"
-    get_apps: মোবাইল এপ্প একটা ব্যবহার করতে পারেন
     hosted_on: এই মাস্টাডনটি আছে %{domain} এ
-    instance_actor_flash: "এই অ্যাকাউন্টটি ভার্চুয়াল এক্টর যা নিজে কোনও সার্ভারের প্রতিনিধিত্ব করতে ব্যবহৃত হয় এবং কোনও পৃথক ব্যবহারকারী নয়। এটি ফেডারেশনের উদ্দেশ্যে ব্যবহৃত হয় এবং আপনি যদি পুরো ইনস্ট্যান্স ব্লক করতে না চান তবে অবরুদ্ধ করা উচিত নয়, সেক্ষেত্রে আপনার ডোমেন ব্লক ব্যবহার করা উচিত। \n"
-    learn_more: বিস্তারিত জানুন
-    privacy_policy: গোপনীয়তা নীতি
-    see_whats_happening: কী কী হচ্ছে দেখুন
-    server_stats: 'সার্ভারের অবস্থা:'
-    source_code: আসল তৈরীপত্র
-    status_count_after:
-      one: অবস্থা
-      other: স্থিতিগুলি
-    status_count_before: কে লিখেছে
-    tagline: পরিচিতজনদের সাথে যুক্ত হন এবং নতুনদের সাথে পরিচিত হন
-    terms: ব্যবহারের শর্তাবলী
-    unavailable_content: অনুপলব্ধ সামগ্রী
-    unavailable_content_description:
-      domain: সার্ভার
-      reason: কারণ
-      rejecting_media: 'এই সার্ভারগুলি থেকে মিডিয়া ফাইলগুলি প্রক্রিয়া করা বা সংরক্ষণ করা হবে না এবং কোনও থাম্বনেইল প্রদর্শিত হবে না, মূল ফাইলটিতে ম্যানুয়াল ক্লিক-মাধ্যমে প্রয়োজন:'
-      rejecting_media_title: ফিল্টার করা মিডিয়া
-      silenced: 'এই সার্ভারগুলির পোস্টগুলি জনসাধারণের টাইমলাইন এবং কথোপকথনে লুকানো থাকবে এবং আপনি যদি তাদের অনুসরণ না করেন তবে তাদের ব্যবহারকারীর ইন্টারঅ্যাকশন থেকে কোনও বিজ্ঞপ্তি উত্পন্ন হবে না:'
-      silenced_title: নীরব করা সার্ভার
-      suspended: 'এই সার্ভারগুলি থেকে কোনও ডেটা প্রক্রিয়াজাতকরণ, সংরক্ষণ বা আদান-প্রদান করা হবে না, এই সার্ভারগুলির ব্যবহারকারীদের সাথে কোনও মিথস্ক্রিয়া বা যোগাযোগকে অসম্ভব করে তুলেছে:'
-      suspended_title: স্থগিত করা সার্ভার
-    unavailable_content_html: ম্যাস্টোডন সাধারণত আপনাকে ফেদিভার্স এ অন্য কোনও সার্ভারের ব্যবহারকারীদের থেকে সামগ্রী দেখতে এবং তাদের সাথে আলাপচারিতা করার অনুমতি দেয়। এই ব্যতিক্রম যে এই বিশেষ সার্ভারে তৈরি করা হয়েছে।
-    user_count_after:
-      one: ব্যবহারকারী
-      other: জনের
-    user_count_before: বাসা
-    what_is_mastodon: মাস্টাডনটি কি ?
   accounts:
-    choices_html: "%{name} বাছাই:"
-    endorsements_hint: আপনি ওয়েব ইন্টারফেস থেকে অনুসরণ করা লোকেদের প্রচার করতে পারেন এবং তারা এখানে প্রদর্শিত হবে।
-    featured_tags_hint: আপনি এখানে নির্দিষ্ট হ্যাশট্যাগগুলি বৈশিষ্ট্যযুক্ত করতে পারেন যেটা এখানে প্রদর্শিত হবে।
     follow: যুক্ত
     followers:
       one: যুক্ত আছে
       other: যারা যুক্ত হয়েছে
     following: যুক্ত করা
-    joined: যোগদান হয় %{date}
     last_active: শেষ সক্রিয় ছিল
     link_verified_on: এই লিংকের মালিকানা শেষ চেক করা হয়  %{date} তারিখে
-    media: ছবি বা ভিডিও
-    moved_html: "%{name} চলে গেছে %{new_profile_link} তে:"
-    network_hidden: এই তথ্যটি নেই
-    never_active: কখনও না
     nothing_here: এখানে কিছুই নেই!
-    people_followed_by: "%{name} যাদেরকে অনুসরণ করে"
-    people_who_follow: যারা %{name} কে অনুসরণ করে
     pin_errors:
       following: সমর্থন করতে অনুসরণ থাকা লাগবে
     posts:
       one: লেখা
       other: লেখাগুলো
     posts_tab_heading: লেখাগুলো
-    posts_with_replies: লেখা এবং মতামত
-    roles:
-      admin: পরিচালক
-      bot: রোবট
-      group: গোষ্ঠী
-      moderator: পরিচালক
-    unavailable: প্রোফাইল অনুপলব্ধ
-    unfollow: অনুসরণ বাদ
   admin:
     account_actions:
       action: করা
@@ -89,17 +27,14 @@ bn:
     account_moderation_notes:
       create: কিছু লিখুন
       created_msg: প্রশাসনবস্তুত লেখাটি সঠিকভাবে তৈরী হয়েছে!
-      delete: মুছে ফেলা
       destroyed_msg: প্রশাসনবস্তুত লেখাটি সঠিকভাবে মুছে ফেলা হয়েছে!
     accounts:
       add_email_domain_block: নিষিদ্ধ করা ই-মেইল ডোমেইন
       approve: অনুমোদন দিন
-      approve_all: প্রত্যেক কে অনুমতি দিন
       are_you_sure: আপনি কি নিশ্চিত ?
       avatar: অবতার
       by_domain: ওয়েবসাইট/কার্যক্ষেত্র
       change_email:
-        changed_msg: নিবন্ধনের ইমেইল সঠিকভাবে পরিবর্তন হয়েছে!
         current_email: এখনকার ইমেইল
         label: ইমেইল পরিবর্তন
         new_email: নতুন ইমেইল
@@ -139,7 +74,6 @@ bn:
         active: চালু
         all: সব
         pending: অপেক্ষিত আছে
-        silenced: নীরব করা হয়েছে
         suspended: স্থগিত করা হয়েছে
         title: প্রশাসনা
       moderation_notes: প্রশাসনের কিছু লেখা
@@ -156,7 +90,6 @@ bn:
       push_subscription_expires: PuSH সাবস্ক্রিপশনের মেয়াদ শেষ হয়ে গেছে
       redownload: প্রোফাইল সতেজ করুন
       reject: প্রত্যাখ্যান করুন
-      reject_all: সব প্রত্যাখ্যান করুন
       remove_avatar: অবতার অপসারণ করুন
       remove_header: হেডার এর ছবি অপসারণ করুন
       resend_confirmation:
@@ -166,12 +99,6 @@ bn:
       reset: পুনরায় সেট করুন
       reset_password: পাসওয়ার্ড পুনঃস্থাপন করুন
       resubscribe: পুনরায় সদস্যতা নিন
-      role: অনুমতিসমূহ
-      roles:
-        admin: পরিচালক
-        moderator: নিয়ামক
-        staff: কর্মী
-        user: ব্যবহারকারী
       search: অনুসন্ধান
       search_same_email_domain: একই ইমেল ডোমেন সহ অন্যান্য ব্যবহারকারীরা
       search_same_ip: একই IP সহ অন্যান্য ব্যবহারকারীরা
@@ -184,7 +111,6 @@ bn:
       statuses: স্থিতিগুলি
       subscribe: সদস্যতা
       suspended: স্থগিত করা হয়েছে
-      time_in_queue: কাতারে অপেক্ষা করছে %{time}
       title: একাউন্ট সমূহ
       unconfirmed_email: অনিশ্চিত ইমেল
       undo_silenced: নীরবতা পূর্বাবস্থা
@@ -240,7 +166,6 @@ bn:
       enable: সক্রিয়
       enabled: সক্রিয়
       enabled_msg: সফলভাবে সেই ইমোজি সক্ষম করা হয়েছে
-      image_hint: ৫০কেবি অবধি পিএনজি
       list: তালিকা
       listed: তালিকাভুক্ত
       new:
@@ -280,8 +205,6 @@ bn:
         expired: মেয়াদোত্তীর্ণ
         title: ফিল্টার
       title: আমন্ত্রণগুলি
-    pending_accounts:
-      title: মুলতুবি থাকা অ্যাকাউন্টগুলি (%{count})
     relationships:
       title: "%{acct} এর সম্পর্কগুলি"
     relays:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d4320859f..c53fac24f 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1,31 +1,9 @@
 ---
 br:
   about:
-    about_this: Diàr-benn
-    active_count_after: oberiant
-    apps: Arloadoù pellgomz
-    apps_platforms: Ober get Mastodoñ àr iOS, Android ha savennoù arall
-    contact: Darempred
-    discover_users: Dizoleiñ implijer·ien·ezed
-    learn_more: Gouzout hiroc'h
-    privacy_policy: Reolennoù prevezded
-    source_code: Boneg tarzh
-    status_count_after:
-      few: toud
-      many: toud
-      one: toud
-      other: toud
-      two: toud
-    terms: Divizoù gwerzhañ hollek
-    unavailable_content_description:
-      domain: Dafariad
-    user_count_after:
-      few: implijer·ez
-      many: implijer·ez
-      one: implijer·ez
-      other: implijer·ez
-      two: implijer·ez
-    what_is_mastodon: Petra eo Mastodon?
+    contact_missing: Andermenet
+    contact_unavailable: N'eus ket
+    title: Diwar-benn
   accounts:
     follow: Heuliañ
     followers:
@@ -34,71 +12,98 @@ br:
       one: Heulier·ez
       other: Heulier·ez
       two: Heulier·ez
-    following: O heuliañ
-    never_active: Birviken
+    following: Koumanantoù
+    last_active: oberiantiz ziwezhañ
+    nothing_here: N'eus netra amañ !
     posts:
-      few: Toud
-      many: Toud
+      few: Toudoù
+      many: Toudoù
       one: Toud
       other: Toud
-      two: Toud
+      two: Toudoù
     posts_tab_heading: Toudoù
-    posts_with_replies: Toudoù ha respontoù
-    roles:
-      admin: Merour
-      bot: Robot
-      group: Strollad
-    unavailable: Profil dihegerz
-    unfollow: Diheuliañ
   admin:
     account_moderation_notes:
-      delete: Dilemel
+      create: Leuskel un notenn
     accounts:
+      add_email_domain_block: Stankañ an domani postel
+      approve: Aprouiñ
+      are_you_sure: Ha sur oc'h?
+      avatar: Avatar
       by_domain: Domani
       change_email:
-        current_email: Postel bremanel
-        label: Kemm ar postel
+        changed_msg: Chomlec'h postel kemmet !
+        current_email: Postel a vremañ
+        label: Kemmañ ar postel
         new_email: Postel nevez
-        submit: Kemm ar postel
+        submit: Kemmañ ar postel
+      change_role:
+        no_role: Roll ebet
+      confirm: Kadarnaat
+      confirming: O kadarnaat
+      custom: Personelaet
       deleted: Dilamet
+      demote: Argilañ
+      disable: Skornañ
+      disabled: Skornet
       domain: Domani
+      edit: Kemmañ
       email: Postel
       enable: Gweredekaat
       enabled: Gweredekaet
       followers: Heulier·ezed·ien
+      follows: Koumanantoù
       header: Talbenn
+      invited_by: Pedet gant
+      ip: IP
+      joined: Amañ abaoe
       location:
+        all: Pep tra
         local: Lec'hel
         remote: A-bell
       moderation:
         active: Oberiant
-        silenced: Mudet
+        all: Pep tra
+        pending: War ober
+        silenced: Bevennet
         suspended: Astalet
+        title: Habaskadur
       perform_full_suspension: Astalañ
+      promote: Brudañ
       protocol: Komenad
       public: Publik
       reject: Nac'hañ
-      reject_all: Nac'hañ pep hini
       remove_header: Dilemel an talbenn
       reset: Adderaouekaat
       reset_password: Adderaouekaat ar ger-tremen
-      roles:
-        admin: Merour
-        moderator: Habaskaer·ez
-        user: Implijer·ez
+      role: Roll
       search: Klask
+      silence: Bevenniñ
+      silenced: Bevennet
+      statuses: Toudoù
+      suspend: Astalañ
       suspended: Astalet
       title: Kontoù
+      undo_silenced: Dizober ar bevennañ
       username: Anv
+      warn: Diwall
+      web: Web
     action_logs:
       action_types:
-        destroy_status: Dilemel ar statud
-      deleted_status: "(statud dilemet)"
+        destroy_status: Dilemel ar c'hannad
+        update_status: Hizivaat ar c'hannad
+      actions:
+        destroy_status_html: Dilamet eo bet toud %{target} gant %{name}
+        update_status_html: Hizivaet eo bet toud %{target} gant %{name}
+      title: Renabl aodit
     announcements:
+      live: War-eeun
       new:
         create: Sevel ur gemenn
         title: Kemenn nevez
+      publish: Embann
       title: Kemennoù
+      unpublish: Diembann
     custom_emojis:
       by_domain: Domani
       copy: Eilañ
@@ -109,36 +114,75 @@ br:
       enable: Gweredekaat
       enabled: Gweredekaet
       list: Listenn
+      listed: Listennet
+      overwrite: Flastrañ
+      shortcode: Berradenn
+      unlist: Dilistennañ
+      upload: Ezkargañ
     dashboard:
+      new_users: implijerien·ezed nevez
       software: Meziant
       title: Taolenn labour
+      website: Lec'hienn
+    disputes:
+      appeals:
+        title: Galvoù
     domain_blocks:
       domain: Domani
       new:
         create: Sevel ur stanker
         severity:
           noop: Hini ebet
-          silence: Mudañ
           suspend: Astalañ
-      severity:
-        silence: mudet
-        suspend: astalet
-      show:
-        undo: Dizober
     email_domain_blocks:
       add_new: Ouzhpenniñ unan nevez
       delete: Dilemel
+      dns:
+        types:
+          mx: Enrolladenn MX
       domain: Domani
-      from_html: eus %{domain}
       new:
         create: Ouzhpenniñ un domani
+    follow_recommendations:
+      status: Statud
+      suppressed: Dilamet
     instances:
+      back_to_all: Pep tra
+      back_to_limited: Bevennet
+      back_to_warning: Diwall
       by_domain: Domani
+      content_policies:
+        policies:
+          silence: Bevenniñ
+          suspend: Astalañ
+        policy: Reolennoù
+      dashboard:
+        instance_statuses_measure: toudoù stoket
+      delivery:
+        all: Pep tra
+        failing: O faziañ
       moderation:
         all: Pep tra
+        limited: Bevennet
+        title: Habaskadur
+      purge: Spurjañ
+      title: Kevread
     invites:
       filter:
+        all: Pep tra
         available: Hegerzh
+        expired: Deuet d'an termen
+        title: Sil
+      title: Pedadennoù
+    ip_blocks:
+      delete: Dilemel
+      expires_in:
+        '1209600': 2 sizhunvezh
+        '15778476': 6 months
+        '2629746': 1 mizvezh
+        '31556952': 1 bloavezh
+        '86400': 1 devezh
+        '94670856': 3 bloavezh
     relays:
       delete: Dilemel
       disable: Diweredekaat
@@ -155,32 +199,103 @@ br:
           one: "%{count} a notennoù"
           other: "%{count} a notennoù"
           two: "%{count} a notennoù"
+      action_log: Renabl aodit
       are_you_sure: Ha sur oc'h?
+      comment:
+        none: Hini ebet
+      delete_and_resolve: Dilemel ar c'hannadoù
+      forwarded: Treuzkaset
+      no_one_assigned: Den ebet
       notes:
         delete: Dilemel
+        title: Notennoù
       status: Statud
+      title: Disklêriadennoù
+      unresolved: Andiskoulmet
       updated_at: Nevesaet
+    roles:
+      categories:
+        devops: DevOps
+        invites: Pedadennoù
+        moderation: Habaskadur
+        special: Ispisial
+      delete: Dilemel
+      privileges:
+        view_devops: DevOps
+      title: Rolloù
+    rules:
+      delete: Dilemel
+      edit: Kemmañ ar reolenn
     settings:
+      about:
+        title: Diwar-benn
+      appearance:
+        title: Neuz
+      discovery:
+        title: Dizoloadur
+        trends: Luskadoù
       domain_blocks:
         all: D'an holl dud
-      site_title: Anv ar servijer
-      title: Arventennoù al lec'hienn
+        disabled: Da zen ebet
     statuses:
+      account: Aozer·ez
       batch:
-        delete: Dilemel
+        report: Disklêriañ
       deleted: Dilamet
-      no_media: Media ebet
-    tags:
-      name: Ger-klik
-      title: Gerioù-klik
+      favourites: Re vuiañ-karet
+      media:
+        title: Media
+      open: Digeriñ ar c'hannad
+      original_status: Toud orin
+      reblogs: Skignadennoù
+      status_changed: Toud kemmet
+      title: Toudoù ar gont
+      visibility: Gwelusted
+      with_media: Gant mediaoù
+    strikes:
+      actions:
+        delete_statuses: Dilamet eo bet toudoù %{target} gant %{name}
+    trends:
+      allow: Aotren
+      links:
+        allow: Aotren al liamm
+      preview_card_providers:
+        title: Embannerien·ezed
+      statuses:
+        allow: Aotren ar c'hannad
+      tags:
+        dashboard:
+          tag_uses_measure: implijoù hollek
+      title: Luskadoù
     warning_presets:
       add_new: Ouzhpenniñ unan nevez
       delete: Dilemel
+    webhooks:
+      delete: Dilemel
+      disable: Diweredekaat
+      enable: Bevaat
+      enabled: Bev
+      events: Darvoudoù
+      status: Statud
+      webhook: Webhook
+  admin_mailer:
+    new_appeal:
+      actions:
+        none: ur c'hemenn diwall
+  appearance:
+    discovery: Dizoloadur
+  application_mailer:
+    view: 'Sellet :'
+    view_status: Gwelet ar c'hannad
   auth:
     change_password: Ger-tremen
     delete_account: Dilemel ar gont
     login: Mont tre
     logout: Digennaskañ
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Lakaat ho anv
     reset_password: Adderaouekaat ar ger-tremen
     security: Diogelroez
     setup:
@@ -189,13 +304,15 @@ br:
       account_status: Statud ar gont
   authorize_follow:
     follow: Heuliañ
+    post_follow:
+      web: Distreiñ d'an etrefas web
     title: Heuliañ %{acct}
   challenge:
     confirm: Kenderc' hel
     invalid_password: Ger-tremen diwiriek
   date:
     formats:
-      default: "%d %b %Y"
+      default: "%d a viz %b %Y"
       with_month_name: "%d a viz %B %Y"
   datetime:
     distance_in_words:
@@ -204,14 +321,21 @@ br:
       about_x_years: "%{count}b"
       almost_x_years: "%{count}b"
       half_a_minute: Diouzhtu
+      less_than_x_minutes: "%{count}mun"
       less_than_x_seconds: Diouzhtu
       over_x_years: "%{count}b"
+      x_days: "%{count}d"
+      x_minutes: "%{count}mun"
       x_months: "%{count}miz"
       x_seconds: "%{count}eil"
   deletes:
     proceed: Dilemel ar gont
-  directories:
-    directory: Roll ar profiloù
+  disputes:
+    strikes:
+      appeal: Ober engalv
+      created_at: Deiziad
+      title_actions:
+        none: Diwall
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -226,6 +350,9 @@ br:
     archive_takeout:
       date: Deiziad
       size: Ment
+    blocks: Stankañ a rit
+    bookmarks: Sinedoù
+    csv: CSV
     lists: Listennoù
   featured_tags:
     add_new: Ouzhpenniñ unan nevez
@@ -235,18 +362,33 @@ br:
       notifications: Kemennoù
     index:
       delete: Dilemel
+      statuses:
+        few: "%{count} a gannadoù"
+        many: "%{count} a gannadoù"
+        one: "%{count} c'hannad"
+        other: "%{count} a gannadoù"
+        two: "%{count} gannad"
       title: Siloù
-  footer:
-    developers: Diorroerien
-    more: Muioc'h…
+    statuses:
+      index:
+        title: Toudoù silet
   generic:
     all: Pep tra
     copy: Eilañ
     delete: Dilemel
+    none: Hini ebet
     order_by: Urzhiañ dre
-  identity_proofs:
-    identity: Identelezh
+    today: hiziv
+  imports:
+    modes:
+      merge: Teuziñ
+      overwrite: Flastrañ
+    types:
+      bookmarks: Sinedoù
+    upload: Ezkargañ
   invites:
+    delete: Diweredekaat
+    expired: Deuet d'an termen
     expires_in:
       '1800': 30 munutenn
       '21600': 6 eur
@@ -255,23 +397,57 @@ br:
       '604800': 1 sizhun
       '86400': 1 deiz
     expires_in_prompt: Birviken
+    table:
+      uses: Implijoù
     title: Pediñ tud
+  moderation:
+    title: Habaskadur
   notification_mailer:
     follow:
       title: Heulier nevez
     mention:
       action: Respont
+    reblog:
+      subject: 'Gant %{name} eo bet skignet ho toud '
+      title: Skignadenn nevez
+    status:
+      subject: Embannet ez eus bet traoù gant %{name}
+    update:
+      subject: Kemmet eo bet ur c'hannad gant %{name}
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: G
+          million: M
+          quadrillion: P
+          thousand: K
+          trillion: T
   otp_authentication:
     enable: Gweredekaat
     setup: Kefluniañ
+  pagination:
+    newer: Nevesoc'h
+    next: Da-heul
+    older: Koshoc'h
+    prev: A-raok
+  preferences:
+    other: All
+    posting_defaults: Arventennoù embann dre ziouer
   relationships:
+    dormant: O kousket
     followers: Heulier·ezed·ien
     following: O heuliañ
+    invited: Pedet
+    moved: Dilojet
+    mutual: Kenetre
+    primary: Kentañ
   sessions:
     browser: Merdeer
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -285,16 +461,24 @@ br:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     description: "%{browser} war %{platform}"
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      ios: iOS
+      linux: Linux
+      mac: macOS
       other: savenn dianav
+      windows: Windows
+    revoke: Dizober
   settings:
     account: Kont
     account_settings: Arventennoù ar gont
     development: Diorren
-    edit_profile: Aozañ ar profil
+    edit_profile: Kemmañ ar profil
     import: Enporzhiañ
     import_and_export: Enporzhiañ hag ezporzhiañ
     preferences: Gwellvezioù
@@ -307,27 +491,69 @@ br:
         one: "%{count} skeudenn"
         other: "%{count} skeudenn"
         two: "%{count} skeudenn"
+    poll:
+      vote: Mouezhiañ
     show_more: Diskouez muioc'h
     visibilities:
+      direct: War-eeun
       public: Publik
+  statuses_cleanup:
+    keep_direct: Mirout ar c'hannadoù eeun
+    min_age:
+      '1209600': 2 sizhunvezh
+      '15778476': 6 months
+      '2629746': 1 mizvezh
+      '31556952': 1 bloavezh
+      '5259492': 2 months
+      '604800': 1 sizhunvezh
+      '63113904': 2 vloavezh
+      '7889238': 3 months
   stream_entries:
     pinned: Toud spilhennet
+    reblogged: en·he deus skignet
   themes:
     default: Mastodoñ (Teñval)
     mastodon-light: Mastodoñ (Sklaer)
   time:
     formats:
-      default: "%He%M, %d %b %Y"
+      default: "%d a viz %b %Y, %H:%M"
+      month: Miz %b %Y
+      time: "%H:%M"
   two_factor_authentication:
     add: Ouzhpennañ
     disable: Diweredekaat
-    edit: Aozañ
+    edit: Kemmañ
   user_mailer:
     warning:
+      categories:
+        spam: Spam
+      reason: 'Abeg :'
+      statuses: 'Toudoù meneget :'
       title:
         none: Diwall
     welcome:
       edit_profile_action: Kefluniañ ar profil
       subject: Donemat e Mastodoñ
+      title: Degemer mat e bourzh, %{name}!
+  users:
+    signed_in_as: 'Aet-tre evel:'
+  verification:
+    explanation_html: 'Gallout a rit <strong>gwiriañ c''hwi a zo perc''henn. ez liammoù metadata ho profil</strong>. Ret eo d''al lec''hienn web staget enderc''hel ul liamm evit mont d''ho profil Mastodon. <strong>Ret eo<strong> d''al liamm-se enderc''hel un doarenn <code>rel="me"</code>. Ne ra forzh an destenn a zo e-barzh al liamm. Setu ur skouer:'
+    verification: Amprouadur
   webauthn_credentials:
+    add: Ouzphennañ un alc'hwez surentez nevez
+    create:
+      error: Ur guden a oa en ur ouzphennañ hoc'h alc'hwez surentez. Mar plij, klaskit c'hoazh.
+      success: Hoc'h alc'hwez surentez a zo bet ouzphennet gant berzh.
     delete: Dilemel
+    delete_confirmation: Sur oc'h e fell deoc'h dilemel an alc'hwez surentez-se ?
+    description_html: Ma'z eo aotreet <strong>dilesadur dre alc'hwez surentez</strong>, ret e vo deoc'h implijout unan eus hoc'h alc'hwezioù surentez evit mont-tre.
+    destroy:
+      error: Ur gudenn a oa en ur zilemel hoc'h alc'hwez surentez. Mar plij, klaskit c'hoazh.
+      success: Hoc'h alc'hwez surentez a zo bet dilamet gant berzh.
+    invalid_credential: Alc'hwez surentez direizh
+    nickname_hint: Skrivit lesanv hoc'h alc'hwez surentez nevez
+    not_enabled: WebAuthn n'eo ket aotreet ganeoc'h c'hoazh
+    not_supported: Alc'hwezioù surentez a zo diembreg gant ar merdeer-se
+    otp_required: Evit implijout alc'hwezioù surentez, aotrit dilesadur dre eil-elfenn da gentañ.
+    registered_on: Enrollet d'ar %{date}
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
new file mode 100644
index 000000000..adb1ccc2a
--- /dev/null
+++ b/config/locales/bs.yml
@@ -0,0 +1,12 @@
+---
+bs:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 704f3cb0d..747b07312 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1,105 +1,38 @@
 ---
 ca:
   about:
-    about_hashtag_html: Aquests són tuts públics etiquetats amb <strong>#%{hashtag}</strong>. Pots interactuar amb elles si tens un compte a qualsevol lloc del fedivers.
-    about_mastodon_html: 'La xarxa social del futur: sense anuncis, sense vigilància corporativa, disseny ètic i descentralització. Posseeix les teves dades amb Mastodon!'
-    about_this: Quant a
-    active_count_after: actiu
-    active_footnote: Usuaris actius mensuals (UAM)
-    administered_by: 'Administrat per:'
-    api: API
-    apps: Apps mòbils
-    apps_platforms: Utilitza Mastodon des de iOS, Android i altres plataformes
-    browse_directory: Navega per el directori de perfils i filtra segons interessos
-    browse_local_posts: Navega un flux en directe de publicacions públiques d’aquest servidor
-    browse_public_posts: Navega per una transmissió en directe de publicacions públiques a Mastodon
-    contact: Contacte
+    about_mastodon_html: 'La xarxa social del futur: sense anuncis, sense vigilància corporativa, disseny ètic i descentralització. Tingues el control de les teves dades amb Mastodon!'
     contact_missing: No configurat
     contact_unavailable: N/D
-    discover_users: Descobreix usuaris
-    documentation: Documentació
-    federation_hint_html: Amb un compte de %{instance} podràs seguir persones de qualsevol servidor Mastodon i altres.
-    get_apps: Prova una aplicació mòbil
     hosted_on: Mastodon allotjat a %{domain}
-    instance_actor_flash: |
-      Aquest compte és un actor virtual utilitzat per a representar al propi servidor i no cap usuari individual.
-      S'utilitza per a propòsits de federació i no ha de ser bloquejat si no voleu bloquejar tota la instància, en aquest cas hauríeu d'utilitzar un bloqueig de domini.
-    learn_more: Més informació
-    privacy_policy: Política de privadesa
-    rules: Normes del servidor
-    rules_html: 'El de sota és un resum de les normes que has de seguir si vols tenir un compte en aquest servidor de Mastodon:'
-    see_whats_happening: Mira què està passant
-    server_stats: 'Estadístiques del servidor:'
-    source_code: Codi font
-    status_count_after:
-      one: estat
-      other: tuts
-    status_count_before: Que han escrit
-    tagline: Segueix els teus amics i descobreix-ne de nous
-    terms: Termes del servei
-    unavailable_content: Contingut no disponible
-    unavailable_content_description:
-      domain: Servidor
-      reason: Raó
-      rejecting_media: 'Els arxius multimèdia d''aquests servidors no seran processats o emmagatzemats i cap miniatura serà mostrada, requerint clic manual a través de l''arxiu original:'
-      rejecting_media_title: Mèdia filtrat
-      silenced: 'Les publicacions d''aquests servidors seran amagades en les línies de temps públiques i en les converses, i cap notificació serà generada de les interaccions dels seus usuaris, llevat que estiguis seguint-los:'
-      silenced_title: Servidors silenciats
-      suspended: 'Cap dada d''aquests servidors serà processada, emmagatzemada o intercanviada, fent impossible qualsevol interacció o comunicació amb els usuaris d''aquests servidors:'
-      suspended_title: Servidors suspesos
-    unavailable_content_html: Mastodon generalment et permet veure el contingut i interaccionar amb els usuaris de qualsevol altre servidor en el fedivers. Aquestes són les excepcions que s'han fet en aquest servidor particular.
-    user_count_after:
-      one: usuari
-      other: usuaris
-    user_count_before: Tenim
-    what_is_mastodon: Què és Mastodon?
+    title: Quant a
   accounts:
-    choices_html: 'Eleccions de %{name}:'
-    endorsements_hint: Pots recomanar persones que segueixes a l'interfície de web, que apareixeran aquí.
-    featured_tags_hint: Pots presentar etiquetes específiques que seràn mostrades aquí.
     follow: Segueix
     followers:
       one: Seguidor
       other: Seguidors
     following: Seguint
     instance_actor_flash: Aquest compte és un actor virtual usat per a representar el mateix servidor i no cap usuari individual. Es fa servir per a federar i no s'hauria d'esborrar.
-    joined: Unit des de %{date}
-    last_active: darrer actiu
+    last_active: última activitat
     link_verified_on: La propietat d'aquest enllaç s'ha verificat el %{date}
-    media: Mèdia
-    moved_html: "%{name} s'ha mogut a %{new_profile_link}:"
-    network_hidden: Aquesta informació no està disponible
-    never_active: Mai
     nothing_here: No hi ha res aquí!
-    people_followed_by: Usuaris seguits per %{name}
-    people_who_follow: Usuaris que segueixen %{name}
     pin_errors:
       following: Has d'estar seguint la persona que vulguis avalar
     posts:
-      one: Tut
-      other: Tuts
-    posts_tab_heading: Tuts
-    posts_with_replies: Tuts i respostes
-    roles:
-      admin: Administrador
-      bot: Bot
-      group: Grup
-      moderator: Moderador
-    unavailable: Perfil inaccessible
-    unfollow: Deixa de seguir
+      one: Publicació
+      other: Publicacions
+    posts_tab_heading: Publicacions
   admin:
     account_actions:
-      action: Realitzar acció
+      action: Realitza l'acció
       title: Fer l'acció de moderació a %{acct}
     account_moderation_notes:
       create: Crea nota
       created_msg: La nota de moderació s'ha creat correctament!
-      delete: Suprimeix
       destroyed_msg: Nota de moderació destruïda amb èxit!
     accounts:
-      add_email_domain_block: Afegir el domini de correu a la llista negra
+      add_email_domain_block: Bloquejar el domini de l'adreça de correu electrònic
       approve: Aprova
-      approve_all: Aprova'ls tots
       approved_msg: L’aplicació del registre de %{username} s’ha aprovat amb èxit
       are_you_sure: N'estàs segur?
       avatar: Avatar
@@ -111,11 +44,17 @@ ca:
         new_email: Adreça electrònica nova
         submit: Canvia l'adreça electrònica
         title: Canvia l'adreça electrònica de %{username}
+      change_role:
+        changed_msg: Els privilegis del compte s'han canviat correctament!
+        label: Canvia rol
+        no_role: Sense rol
+        title: Canvia el rol per a %{username}
       confirm: Confirma
       confirmed: Confirmat
       confirming: Confirmant
+      custom: Personalitzat
       delete: Esborra les dades
-      deleted: Esborrats
+      deleted: Eliminat
       demote: Degrada
       destroyed_msg: Les dades de %{username} son a la cua per a ser esborrades en breu
       disable: Inhabilita
@@ -132,7 +71,7 @@ ca:
       enabled: Habilitat
       enabled_msg: El compte de %{username} s’ha descongelat amb èxit
       followers: Seguidors
-      follows: Segueix
+      follows: Seguits
       header: Capçalera
       inbox_url: URL de la safata d'entrada
       invite_request_text: Motiu del registre
@@ -153,7 +92,7 @@ ca:
         active: Actiu
         all: Tot
         pending: Pendent
-        silenced: Silenciat
+        silenced: Limitat
         suspended: Suspès
         title: Moderació
       moderation_notes: Notes de moderació
@@ -161,9 +100,14 @@ ca:
       most_recent_ip: IP més recent
       no_account_selected: No s'han canviat els comptes perquè no s'han seleccionat
       no_limits_imposed: Sense límits imposats
+      no_role_assigned: Cap rol assignat
       not_subscribed: No subscrit
       pending: Revisió pendent
       perform_full_suspension: Suspèn
+      previous_strikes: Accions anteriors
+      previous_strikes_description_html:
+        one: Aquest compte té <strong>una</strong> acció.
+        other: Aquest compte té <strong>%{count}</strong> accions.
       promote: Promociona
       protocol: Protocol
       public: Públic
@@ -171,8 +115,9 @@ ca:
       redownload: Actualitza el perfil
       redownloaded_msg: El perfil de %{username} s’ha refrescat des de l’origen amb èxit
       reject: Rebutja
-      reject_all: Rebutja'ls tots
       rejected_msg: L’aplicació de registre de %{username} s’ha rebutjat amb èxit
+      remote_suspension_irreversible: Les dades d'aquest compte s'han esborrat irreversiblement.
+      remote_suspension_reversible_hint_html: El compte ha estat suspès en el seu servidor i les dades seran totalment suprimides el %{date}. Fins llavors, el servidor remot pot restaurar aquest compte sense efectes negatius. Si vols suprimir immediatament totes les dades del compte, ho pots fer a continuació.
       remove_avatar: Eliminar avatar
       remove_header: Treu la capçalera
       removed_avatar_msg: S’ha suprimit amb èxit l’imatge d’acabar de %{username}
@@ -184,19 +129,13 @@ ca:
       reset: Reinicialitza
       reset_password: Restableix la contrasenya
       resubscribe: Torna a subscriure
-      role: Permisos
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Personal
-        user: Usuari
+      role: Rol
       search: Cerca
       search_same_email_domain: Altres usuaris amb el mateix domini de correu
       search_same_ip: Altres usuaris amb la mateixa IP
       security_measures:
         only_password: Només contrasenya
         password_and_2fa: Contrasenya i 2FA
-        password_and_sign_in_token: Contrasenya i token per correu
       sensitive: Sensible
       sensitized: marcar com a sensible
       shared_inbox_url: URL de la safata d'entrada compartida
@@ -205,13 +144,16 @@ ca:
         targeted_reports: Informes realitzats per altres
       silence: Silenci
       silenced: Silenciat
-      statuses: Tuts
+      statuses: Publicacions
+      strikes: Accions anteriors
       subscribe: Subscriu
+      suspend: Suspèn
       suspended: Suspès
       suspension_irreversible: Les dades d’aquest compte s’han suprimit irreversiblament. Pots desfer la suspensió del compte per a fer-lo usable però això no recuperarà les dades si és que en tenia.
       suspension_reversible_hint_html: El compte ha estat suspès i les dades seran totalment suprimides el %{date}. Fins llavors, el compte pot ser restaurat sense problemes. Si vols suprimir immediatament totes les dades del compte, ho pots fer a continuació.
-      time_in_queue: Esperant en la cua %{time}
       title: Comptes
+      unblock_email: Desbloqueja l'adreça de correu
+      unblocked_email_msg: Adreça de correu de %{username} desbloquejada amb èxit
       unconfirmed_email: Correu electrònic sense confirmar
       undo_sensitized: Desmarcar com a sensible
       undo_silenced: Deixa de silenciar
@@ -226,26 +168,34 @@ ca:
       whitelisted: Llista blanca
     action_logs:
       action_types:
+        approve_appeal: Aprova l'apel·lació
+        approve_user: Aprova l'usuari
         assigned_to_self_report: Assigna l'informe
         change_email_user: Canvia l'adreça electrònica per l'usuari
+        change_role_user: Canvia el Rol del Usuari
         confirm_user: Confirma l'usuari
         create_account_warning: Crea un avís
         create_announcement: Crea un anunci
+        create_canonical_email_block: Crea un bloqueig de correu electrònic
         create_custom_emoji: Crea un emoji personalitzat
         create_domain_allow: Crea un domini permès
         create_domain_block: Crea un bloqueig de domini
         create_email_domain_block: Crea un bloqueig de domini d'adreça de correu
         create_ip_block: Crear regla IP
         create_unavailable_domain: Crea un domini no disponible
+        create_user_role: Crea Rol
         demote_user: Degrada l'usuari
         destroy_announcement: Esborra l'anunci
+        destroy_canonical_email_block: Esborra el bloqueig de correu electrònic
         destroy_custom_emoji: Esborra l'emoji personalitzat
         destroy_domain_allow: Esborra el domini permès
         destroy_domain_block: Esborra el bloqueig de domini
         destroy_email_domain_block: Esborra el bloqueig de domini de l'adreça de correu
+        destroy_instance: Purga Domini
         destroy_ip_block: Eliminar regla IP
-        destroy_status: Esborra el tut
+        destroy_status: Elimina la publicació
         destroy_unavailable_domain: Esborra domini no disponible
+        destroy_user_role: Destrueix Rol
         disable_2fa_user: Desactiva 2FA
         disable_custom_emoji: Desactiva l'emoji personalitzat
         disable_sign_in_token_auth_user: Desactivar l'autenticació de token per correu per l'usuari
@@ -255,42 +205,56 @@ ca:
         enable_user: Activa l'usuari
         memorialize_account: Memoritza el compte
         promote_user: Promou l'usuari
+        reject_appeal: Rebutja l'apel·lació
+        reject_user: Rebutja l'usuari
         remove_avatar_user: Eliminar avatar
         reopen_report: Reobre l'informe
+        resend_user: Torna a enviar el correu de confirmació
         reset_password_user: Restableix la contrasenya
         resolve_report: Resolt l'informe
         sensitive_account: Marcar els mèdia en el teu compte com a sensibles
         silence_account: Silencia el compte
         suspend_account: Suspèn el compte
         unassigned_report: Des-assigna l'informe
+        unblock_email_account: Desbloqueja l'adreça de correu
         unsensitive_account: Desmarcar els mèdia en el teu compte com a sensibles
         unsilence_account: Desfés el silenci del compte
         unsuspend_account: Desfés la suspensió del compte
         update_announcement: Actualitza l'anunci
         update_custom_emoji: Actualitza l'emoji personalitzat
         update_domain_block: Actualitza el Bloqueig de Domini
+        update_ip_block: Actualitza norma IP
         update_status: Actualitza l'estat
+        update_user_role: Actualitza Rol
       actions:
+        approve_appeal_html: "%{name} ha aprovat l'apel·lació a la decisió de moderació de %{target}"
+        approve_user_html: "%{name} ha aprovat el registre de %{target}"
         assigned_to_self_report_html: "%{name} han assignat l'informe %{target} a ells mateixos"
         change_email_user_html: "%{name} ha canviat l'adreça de correu electrònic del usuari %{target}"
+        change_role_user_html: "%{name} ha canviat el rol de %{target}"
         confirm_user_html: "%{name} ha confirmat l'adreça de correu electrònic de l'usuari %{target}"
         create_account_warning_html: "%{name} ha enviat un avís a %{target}"
         create_announcement_html: "%{name} ha creat un nou anunci %{target}"
+        create_canonical_email_block_html: "%{name} ha bloquejat l'adreça de correu electrònic amb el hash %{target}"
         create_custom_emoji_html: "%{name} ha pujat un emoji nou %{target}"
         create_domain_allow_html: "%{name} ha permès la federació amb el domini %{target}"
         create_domain_block_html: "%{name} ha bloquejat el domini %{target}"
         create_email_domain_block_html: "%{name} ha bloquejat el domini de correu electrònic %{target}"
         create_ip_block_html: "%{name} ha creat una regla per a l'IP %{target}"
         create_unavailable_domain_html: "%{name} ha aturat el lliurament al domini %{target}"
+        create_user_role_html: "%{name} ha creat el rol %{target}"
         demote_user_html: "%{name} ha degradat l'usuari %{target}"
         destroy_announcement_html: "%{name} ha eliminat l'anunci %{target}"
-        destroy_custom_emoji_html: "%{name} ha destruït l'emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} ha desbloquejat el correu electrònic amb el hash %{target}"
+        destroy_custom_emoji_html: "%{name} ha esborrat l'emoji %{target}"
         destroy_domain_allow_html: "%{name} no permet la federació amb el domini %{target}"
         destroy_domain_block_html: "%{name} ha desbloquejat el domini %{target}"
         destroy_email_domain_block_html: "%{name} ha desbloquejat el domini de correu electrònic %{target}"
+        destroy_instance_html: "%{name} ha purgat el domini %{target}"
         destroy_ip_block_html: "%{name} ha esborrat la regla per a l'IP %{target}"
         destroy_status_html: "%{name} ha eliminat el tut de %{target}"
         destroy_unavailable_domain_html: "%{name} ha représ el lliurament delivery al domini %{target}"
+        destroy_user_role_html: "%{name} ha esborrat el rol %{target}"
         disable_2fa_user_html: "%{name} ha desactivat el requisit de dos factors per a l'usuari %{target}"
         disable_custom_emoji_html: "%{name} ha desactivat l'emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} ha desactivat l'autenticació de token per correu per a %{target}"
@@ -300,22 +264,28 @@ ca:
         enable_user_html: "%{name} ha activat l'accés del usuari %{target}"
         memorialize_account_html: "%{name} ha convertit el compte %{target} en una pàgina de memorial"
         promote_user_html: "%{name} ha promogut l'usuari %{target}"
+        reject_appeal_html: "%{name} ha rebutjat l'apel·lació a la decisió de moderació de %{target}"
+        reject_user_html: "%{name} ha rebutjat el registre de %{target}"
         remove_avatar_user_html: "%{name} ha eliminat l'avatar de %{target}"
         reopen_report_html: "%{name} ha reobert l'informe %{target}"
+        resend_user_html: "%{name} ha renviat el correu de confirmació per %{target}"
         reset_password_user_html: "%{name} ha restablert la contrasenya de l'usuari %{target}"
         resolve_report_html: "%{name} ha resolt l'informe %{target}"
         sensitive_account_html: "%{name} ha marcat els mèdia de %{target} com a sensibles"
         silence_account_html: "%{name} ha silenciat el compte de %{target}"
         suspend_account_html: "%{name} ha suspès el compte de %{target}"
         unassigned_report_html: "%{name} ha des-assignat l'informe %{target}"
+        unblock_email_account_html: "%{name} ha desbloquejat l'adreça de correu de %{target}"
         unsensitive_account_html: "%{name} ha desmarcat com sensibles els mèdia de %{target}"
         unsilence_account_html: "%{name} ha llevat el silenci del compte %{target}"
         unsuspend_account_html: "%{name} ha llevat la suspensió del compte de %{target}"
         update_announcement_html: "%{name} ha actualitzat l'anunci %{target}"
         update_custom_emoji_html: "%{name} ha actualitzat l'emoji %{target}"
         update_domain_block_html: "%{name} ha actualitzat el bloqueig de domini per a %{target}"
+        update_ip_block_html: "%{name} ha canviat la norma per la IP %{target}"
         update_status_html: "%{name} ha actualitzat l'estat de %{target}"
-      deleted_status: "(tut esborrat)"
+        update_user_role_html: "%{name} ha canviat el rol %{target}"
+      deleted_account: compte eliminat
       empty: No s’han trobat registres.
       filter_by_action: Filtra per acció
       filter_by_user: Filtra per usuari
@@ -329,7 +299,7 @@ ca:
       new:
         create: Crea un anunci
         title: Nou anunci
-      publish: Publica-ho
+      publish: Publica
       published_msg: L’anunci s’ha publicat amb èxit!
       scheduled_for: Programat per a %{time}
       scheduled_msg: Anunci programat per a ser publicat!
@@ -341,11 +311,11 @@ ca:
       assign_category: Assigna una categoria
       by_domain: Domini
       copied_msg: S'ha creat correctament la còpia local de l'emoji
-      copy: Copia
+      copy: Copiar
       copy_failed_msg: No s'ha pogut fer una còpia local d'aquest emoji
       create_new_category: Crea una categoria nova
       created_msg: Emoji creat amb èxit!
-      delete: Suprimeix
+      delete: Elimina
       destroyed_msg: Emojo s'ha destruït amb èxit!
       disable: Inhabilita
       disabled: Desactivat
@@ -354,11 +324,12 @@ ca:
       enable: Habilita
       enabled: Activat
       enabled_msg: S'ha habilitat amb èxit emoji
-      image_hint: PNG de fins a 50 KB
+      image_hint: PNG o GIF fins a %{size}
       list: Llista
       listed: Enumerat
       new:
         title: Afegeix emoji personalitzat nou
+      no_emoji_selected: No s'ha canviat cap emoji perquè cap ha estat seleccionat
       not_permitted: No tens permís per a realitzar aquesta acció
       overwrite: Sobreescriure
       shortcode: Codi curt
@@ -376,14 +347,17 @@ ca:
       media_storage: Mèdia
       new_users: usuaris nous
       opened_reports: informes oberts
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apel·lació pendent"
+        other: "<strong>%{count}</strong> apel·lacions pendents"
       pending_reports_html:
-        one: "<strong>1</strong> informe pendent"
+        one: "<strong>%{count}</strong> informe pendent"
         other: "<strong>%{count}</strong> informes pendents"
       pending_tags_html:
-        one: "<strong>1</strong> etiqueta pendent"
+        one: "<strong>%{count}</strong> etiqueta pendent"
         other: "<strong>%{count}</strong> etiquetes pendents"
       pending_users_html:
-        one: "<strong>1</strong> usuari pendent"
+        one: "<strong>%{count}</strong> usuari pendent"
         other: "<strong>%{count}</strong> usuaris pendents"
       resolved_reports: informes resolts
       software: Programari
@@ -393,10 +367,16 @@ ca:
       top_languages: Idiomes més actius
       top_servers: Servidors més actius
       website: Lloc web
+    disputes:
+      appeals:
+        empty: No s'ha trobat cap apel·lació.
+        title: Apel·lacions
     domain_allows:
       add_new: Dominis autoritzats
       created_msg: El domini ha estat correctament autoritzat
       destroyed_msg: S'ha esborrat el domini de la llista blanca
+      export: Exporta
+      import: Importa
       undo: Treure de la llista blanca
     domain_blocks:
       add_new: Afegir nou bloqueig de domini
@@ -404,82 +384,122 @@ ca:
       destroyed_msg: El bloqueig de domini s'ha desfet
       domain: Domini
       edit: Editar el bloqueig del domini
+      existing_domain_block: Ja s'han imposat mesures més estrictes a %{name}.
       existing_domain_block_html: Ja has imposat uns límits més estrictes a %{name}, l'hauries de <a href="%{unblock_url}">desbloquejar-lo</a> primer.
+      export: Exporta
+      import: Importa
       new:
         create: Crea un bloqueig
         hint: El bloqueig de domini no impedirà la creació de nous comptes en la base de dades, però s'aplicaran de manera retroactiva mètodes de moderació específics sobre aquests comptes.
         severity:
-          desc_html: "<strong>Silenci</strong> farà les publicacions del compte invisibles a tothom que no l'estigui seguint. <strong>La suspensió</strong> eliminarà tots els continguts, multimèdia i les dades del perfil del compte. Usa <strong>Cap</strong> si només vols rebutjar el fitxers multimèdia."
+          desc_html: "<strong>Limitar</strong> farà que les publicacions dels comptes d'aquest domini siguin invisibles per a qualsevol persona que no les segueixi. <strong>Suspendre</strong> eliminarà del vostre servidor tot el contingut, multimèdia i perfil dels comptes d'aquest domini. Utilitza <strong>Cap</strong> si només vols rebutjar fitxers multimèdia."
           noop: Cap
-          silence: Silenci
+          silence: Limitar
           suspend: Suspensió
         title: Bloqueig de domini nou
+      no_domain_block_selected: No s'ha canviat cap bloqueig de domini perquè no se n'ha seleccionat cap
+      not_permitted: No tens permís per a realitzar aquesta acció
       obfuscate: Oculta el nom del domini
-      obfuscate_hint: Oculta parcialment el nom del domini si està activat mostrar la llista de dominis limitats
+      obfuscate_hint: Oculta parcialment el nom del domini si està activat "mostra la llista de dominis limitats"
       private_comment: Comentari privat
       private_comment_hint: Comentari sobre aquesta limitació del domini per a ús intern dels moderadors.
       public_comment: Comentari públic
-      public_comment_hint: Comentari pel públic general sobre aquesta limitació del domini, si la publicació de la llista de limitacions de domini està habilitada.
+      public_comment_hint: Comentari sobre la limitació de domini per al públic en general, si la visibilitat de la llista de limitacions de domini està activada.
       reject_media: Rebutja els fitxers multimèdia
       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
-      rejecting_media: rebutjant els fitxers multimèdia
-      rejecting_reports: rebutjant els informes
-      severity:
-        silence: silenciat
-        suspend: suspès
-      show:
-        affected_accounts:
-          one: Un compte afectat en la base de dades
-          other: "%{count} comptes afectats en la base de dades"
-        retroactive:
-          silence: Desfés el silenci a tots els comptes existents d'aquest domini
-          suspend: Desfés la suspensió de tots els comptes d'aquest domini
-        title: Desfés el bloqueig de domini de %{domain}
-        undo: Desfés
       undo: Desfés el bloqueig del domini
       view: Veure el bloqueig del domini
     email_domain_blocks:
       add_new: Afegir nou
+      attempts_over_week:
+        one: "%{count} intent en la darrera setmana"
+        other: "%{count} intents de registre en la darrera setmana"
       created_msg: S'ha creat el bloc de domini de correu electrònic
-      delete: Suprimeix
-      destroyed_msg: S'ha eliminat correctament el bloc del domini de correu
+      delete: Elimina
+      dns:
+        types:
+          mx: Registre MX
       domain: Domini
-      empty: Cap domini de correu a la llista negre.
-      from_html: des de %{domain}
       new:
-        create: Afegeix un domini
+        create: Afegir un domini
+        resolve: Resol domini
         title: Nova adreça de correu en la llista negra
+      no_email_domain_block_selected: No s'han canviat els bloquejos de domini perquè cap s'ha seleccionat
+      resolved_dns_records_hint_html: El nom del domini resol als següents dominis MX, els quals son els responsables finals per a acceptar els correus. Bloquejar un domini MX bloquejarà els registres des de qualsevol adreça de correu que utilitzi el mateix domini MX, encara que el nom visible del domini sigui diferent. <strong>Ves amb compte no bloquegis els grans proveïdors de correu electrònic.</strong>
+      resolved_through_html: Resolt mitjançant %{domain}
       title: Llista negra de correus electrònics
+    export_domain_allows:
+      new:
+        title: Importa dominis permesos
+      no_file: No s'ha seleccionat cap fitxer
+    export_domain_blocks:
+      import:
+        description_html: Estàs a punt d'importar una llista de dominis blocats. Si us plau, revisa aquesta llista amb molta cura, especialment si no l'has creada tu mateix.
+        existing_relationships_warning: Relacions de seguiment existents
+        private_comment_description_html: 'Per a ajudar-te a fer un seguiment d''on provenen els bloquejos importats, es crearan amb el següent comentari privat: <q>%{comment}</q>'
+        private_comment_template: Importar des de %{source} el %{date}
+        title: Importa dominis bloquejats
+      new:
+        title: Importa dominis bloquejats
+      no_file: No s'ha seleccionat cap fitxer
     follow_recommendations:
       description_html: "<strong>Seguir les recomanacions ajuda als nous usuaris a trobar ràpidament contingut interessant</strong>. Quan un usuari no ha interactuat prou amb d'altres com per a formar a qui seguir personalment, aquests comptes li seran recomanats. Es recalculen a diari a partir d'una barreja de comptes amb els compromisos recents més alts i el nombre més alt de seguidors locals per a un idioma determinat."
-      language: Per llenguatge
+      language: Per idioma
       status: Estat
       suppress: Suprimeix les recomanacions de seguiment
       suppressed: Suprimit
       title: Seguir les recomanacions
       unsuppress: Restaurar les recomanacions de seguiment
     instances:
+      availability:
+        description_html:
+          one: Si la tramesa cap el domini falla <strong>%{count} dia</strong> sense èxit, no es faran més intents d'entrega a no ser que es rebi una tramesa <em>des de</em> el domini.
+          other: Si la tramesa cap el domini falla durant <strong>%{count} diferents dies</strong> sense èxit, no es faran més intents a no se que es rebi una tramesa <em>des de</em> el domini.
+        failure_threshold_reached: Llindar de fallada assolit el %{date}.
+        failures_recorded:
+          one: Inten fallit en %{count} dia.
+          other: Intents fallits en %{count} diferents dies.
+        no_failures_recorded: Sense errors registrats.
+        title: Disponibilitat
+        warning: El darrer intent de connexió a aquest servidor no ha tingut èxit
       back_to_all: Totes
       back_to_limited: Limitades
       back_to_warning: Avís
       by_domain: Domini
+      confirm_purge: Estàs segur que vols eliminar permanentment les dades d'aquest domini?
+      content_policies:
+        comment: Nota interna
+        description_html: Pots definir polítiques de contingut que seran aplicades a tots els comptes d'aquest domini i a qualsevol dels seus subdominis.
+        policies:
+          reject_media: Rebutja mèdia
+          reject_reports: Rebutja informes
+          silence: Límit
+          suspend: Suspèn
+        policy: Política
+        reason: Motiu públic
+        title: Polítiques de contingut
+      dashboard:
+        instance_accounts_dimension: Comptes més seguits
+        instance_accounts_measure: comptes desats
+        instance_followers_measure: els nostres seguidors d'allà
+        instance_follows_measure: els seus seguidors d'aquí
+        instance_languages_dimension: Idiomes principals
+        instance_media_attachments_measure: adjunts multimèdia desats
+        instance_reports_measure: informes sobre ells
+        instance_statuses_measure: publicacions desades
       delivery:
         all: Totes
         clear: Neteja els errors de lliurament
+        failing: Fallant
         restart: Reinicia el lliurament
         stop: Atura el lliurament
-        title: Lliurament
         unavailable: No disponible
-        unavailable_message: El lliurament no està disponible
-        warning: Avís
-        warning_message:
-          one: Fallada de lliurament %{count} dia
-          other: Fallada de lliurament %{count} dies
       delivery_available: El lliurament està disponible
       delivery_error_days: Dies de fallades de lliurament
       delivery_error_hint: Si el lliurament no és possible per %{count} dies, serà automàticament marcat com a no lliurable.
+      destroyed_msg: Les dades de %{domain} ara son en la cua per a esborrat imminent.
       empty: No s'han trobat dominis.
       known_accounts:
         one: "%{count} compte conegut"
@@ -490,12 +510,15 @@ ca:
         title: Moderació
       private_comment: Comentari privat
       public_comment: Comentari públic
+      purge: Purga
+      purge_description_html: Si creus que aquest domini està fora de línia per sempre, pots esborrar tots els seus comptes i dades relacionades del teu emmagatzematge. Això pot trigar una estona.
       title: Federació
       total_blocked_by_us: Bloquejats per nosaltres
       total_followed_by_them: Seguits per ells
       total_followed_by_us: Seguits per nosaltres
       total_reported: Informes sobre ells
       total_storage: Adjunts multimèdia
+      totals_time_period_hint_html: Els totals mostrats a sota incloeixen dades de tots els temps.
     invites:
       deactivate_all: Desactiva-ho tot
       filter:
@@ -503,11 +526,11 @@ ca:
         available: Disponible
         expired: Caducat
         title: Filtre
-      title: Convida
+      title: Invitacions
     ip_blocks:
       add_new: Crear regla
       created_msg: S’ha afegit amb èxit la nova regla IP
-      delete: Suprimeix
+      delete: Elimina
       expires_in:
         '1209600': 2 setmanes
         '15778476': 6 mesos
@@ -519,18 +542,16 @@ ca:
         title: Crea nova regla IP
       no_ip_block_selected: No s’ha canviat cap regla IP perquè no s’han seleccionat
       title: Regles IP
-    pending_accounts:
-      title: Comptes pendents (%{count})
     relationships:
       title: relacions del %{acct}
     relays:
       add_new: Afegiu un nou relay
-      delete: Esborra
-      description_html: Un <strong>relay de federació</strong> és un servidor intermediari que intercanvia grans volums de tuts públics entre servidors que es subscriuen i publiquen en ell. <strong>Pot ajudar a servidors petits i mitjans a descobrir contingut del fedivers</strong>, no fent necessari que els usuaris locals manualment segueixin altres persones de servidors remots.
+      delete: Elimina
+      description_html: Un <strong>relay de federació</strong> és un servidor intermediari que intercanvia grans volums de publicacions públiques entre servidors que se subscriuen i publiquen en ell. <strong>Pot ajudar a servidors petits i mitjans a descobrir contingut del fedivers</strong>, no fent necessari que els usuaris locals manualment segueixin altres persones de servidors remots.
       disable: Inhabilita
       disabled: Desactivat
       enable: Activat
-      enable_hint: Una vegada habilitat, el teu servidor es subscriurà a tots els tuts públics d'aquest relay i començarà a enviar-hi tots els tuts públics d'aquest servidor.
+      enable_hint: Una vegada habilitat, el teu servidor se subscriurà a totes les publicacions públiques d'aquest relay i començarà a enviar-hi totes les publicacions públiques d'aquest servidor.
       enabled: Activat
       inbox_url: URL del Relay
       pending: S'està esperant l'aprovació del relay
@@ -547,183 +568,324 @@ ca:
         notes:
           one: "%{count} nota"
           other: "%{count} notes"
-        reports:
-          one: "%{count} informe"
-          other: "%{count} informes"
+      action_log: Registre d'auditoria
       action_taken_by: Mesures adoptades per
+      actions:
+        delete_description_html: Les publicacions reportades seran eliminades i un cop serà gravat per a ajudar-te a escalar en futures infraccions des del mateix compte.
+        mark_as_sensitive_description_html: Els mèdia de les publicacions reportades seran marcats com a sensibles i una acció serà gravada per ajudar a escalar en futures infraccions del mateix compte.
+        other_description_html: Veu més opcions controlant el comportament del compte i personalitza la comunicació al compte reportat.
+        resolve_description_html: No serà presa cap acció contra el compte reportat, cap cop serà gravat i l'informe es tancarà.
+        silence_description_html: El perfil serà visible només per aquells que ja el seguien o en cerca manual, limitant severament el seu alcanç. Sempre pot ser revertit.
+        suspend_description_html: El perfil i tot el seu contingut esdevindrà inaccessible fins que sigui eventualment esborrat. Interactuar amb el compte serà impossible. Reversible dins de 30 dies.
+      actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte reportat, se li enviarà una notificació per correu electrònic, excepte quan la categoria <strong>Spam</strong> és seleccionada.
+      add_to_report: Afegir més al informe
       are_you_sure: N'estàs segur?
       assign_to_self: Assignar-me
       assigned: Moderador assignat
+      by_target_domain: Domini del compte reportat
+      category: Categoria
+      category_description_html: El motiu pel qual aquest compte o contingut ha estat reportat serà citat en la comunicació amb el compte reportat
       comment:
         none: Cap
+      comment_description_html: 'Per a donar més informació, %{name} ha escrit:'
       created_at: Reportat
+      delete_and_resolve: Elimina les publicacions
       forwarded: Reenviat
       forwarded_to: Reenviat a %{domain}
       mark_as_resolved: Marca com a resolt
+      mark_as_sensitive: Marca com a sensible
       mark_as_unresolved: Marcar com a sense resoldre
+      no_one_assigned: Ningú
       notes:
-        create: Afegeix una nota
+        create: Afegir una nota
         create_and_resolve: Resol amb una nota
         create_and_unresolve: Reobre amb una nota
-        delete: Esborra
+        delete: Elimina
         placeholder: Descriu les accions que s'han pres o qualsevol altra actualització relacionada…
+        title: Notes
+      notes_description_html: Veu i deixa notes als altres moderadors i a tu mateix
+      quick_actions_description_html: 'Pren una acció ràpida o desplaça''t avall per a veure el contingut reportat:'
+      remote_user_placeholder: l'usuari remot des de %{instance}
       reopen: Reobre l'informe
       report: 'Informe #%{id}'
       reported_account: Compte reportat
       reported_by: Reportat per
       resolved: Resolt
       resolved_msg: Informe resolt amb èxit!
+      skip_to_actions: Salta a les accions
       status: Estat
-      target_domain: Domini del compte reportat
+      statuses: Contingut reportat
+      statuses_description_html: El contingut ofensiu serà citat en comunicació amb el compte reportat
       target_origin: Origen del compte reportat
       title: Informes
       unassign: Treu l'assignació
       unresolved: No resolt
       updated_at: Actualitzat
+      view_profile: Veure perfil
+    roles:
+      add_new: Afegir rol
+      assigned_users:
+        one: "%{count} usuari"
+        other: "%{count} usuaris"
+      categories:
+        administration: Administració
+        devops: Operadors de desenvolupament
+        invites: Invitacions
+        moderation: Moderació
+        special: Especial
+      delete: Elimina
+      description_html: Amb <strong>rols d'usuari</strong>, pots personalitzar quines funcions i àrees de Mastodon els teus usuaris poden accedir.
+      edit: Editar el rol %{name}
+      everyone: Permisos per defecte
+      everyone_full_description_html: Aquest és el <strong>rol base</strong> que afecta <strong>tots els usuaris</strong>, fins i tot els que no en tenen cap d'assignat. Tots els altres rols n'hereten els permisos.
+      permissions_count:
+        one: "%{count} permís"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Els usuaris amb aquest permís passaran per alt tots els permisos
+        delete_user_data: Esborra dades d'usuari
+        delete_user_data_description: Permet als usuaris suprimir les dades d'altres usuaris sense demora
+        invite_users: Convida usuaris
+        invite_users_description: Permet als usuaris convidar persones noves al servidor
+        manage_announcements: Gestiona els anuncis
+        manage_announcements_description: Permet als usuaris gestionar els anuncis al servidor
+        manage_appeals: Gestiona apel·lacions
+        manage_appeals_description: Permet als usuaris revisar les apel·lacions contra les accions de moderació
+        manage_blocks: Gestiona blocs
+        manage_blocks_description: Permet als usuaris bloquejar proveïdors de correu electrònic i adreces IP
+        manage_custom_emojis: Gestiona emojis personalitzats
+        manage_custom_emojis_description: Permet als usuaris gestionar emojis personalitzats al servidor
+        manage_federation: Gestiona federació
+        manage_federation_description: Permet als usuaris bloquejar o permetre la federació amb altres dominis i controlar la capacitat de lliurament
+        manage_invites: Gestiona invitacions
+        manage_invites_description: Permet als usuaris veure i desactivar els enllaços d'invitació
+        manage_reports: Gestiona informes
+        manage_reports_description: Permet als usuaris revisar informes i realitzar accions de moderació contra ells
+        manage_roles: Gestionar rols
+        manage_roles_description: Permet als usuaris gestionar i assignar rols per sota dels seus
+        manage_rules: Gestiona normes
+        manage_rules_description: Permet als usuaris canviar les normes del servidor
+        manage_settings: Gestiona configuració
+        manage_settings_description: Permet als usuaris canviar la configuració del lloc
+        manage_taxonomies: Gestionar taxonomies
+        manage_taxonomies_description: Permet als usuaris revisar el contingut actual i actualitzar la configuració de l'etiqueta
+        manage_user_access: Gestionar l'accés dels usuaris
+        manage_user_access_description: Permet als usuaris desactivar l'autenticació de dos factors d'altres usuaris, canviar la seva adreça de correu electrònic i restablir la seva contrasenya
+        manage_users: Gestionar usuaris
+        manage_users_description: Permet als usuaris veure els detalls d'altres usuaris i realitzar accions de moderació contra ells
+        manage_webhooks: Gestionar Webhooks
+        manage_webhooks_description: Permet als usuaris configurar webhooks per a esdeveniments administratius
+        view_audit_log: Veure el registre d'auditoria
+        view_audit_log_description: Permet als usuaris veure un historial d'accions administratives al servidor
+        view_dashboard: Veure panell
+        view_dashboard_description: Permet als usuaris accedir al tauler i a diverses mètriques
+        view_devops: Operadors de desenvolupament
+        view_devops_description: Permet als usuaris accedir als taulers de control de Sidekiq i pgHero
+      title: Rols
     rules:
       add_new: Afegir norma
-      delete: Suprimeix
+      delete: Elimina
       description_html: Tot i que molts diuen que han llegit les normes i estan d'acord amb els termes del servei, normalment no les llegeixen fins que surgeix un problema. <strong>Fes que sigui més fàcil veure les normes del teu servidor d'una ullada proporcionant-les en una llista de punts.</strong> Intenta mantenir les normes individuals curtes i senzilles però sense dividir-les en massa parts separades.
       edit: Edita la norma
       empty: Encara no s'han definit les normes del servidor.
       title: Normes del servidor
     settings:
-      activity_api_enabled:
-        desc_html: Nombre de tuts publicats localment, usuaris actius i registres nous en períodes setmanals
-        title: Publica estadístiques agregades sobre l'activitat de l'usuari
-      bootstrap_timeline_accounts:
-        desc_html: Separa diversos noms d'usuari amb comes. Només funcionaran els comptes locals i desblocats. El valor predeterminat quan està buit és tots els administradors locals.
-        title: El seguiment per defecte per als usuaris nous
-      contact_information:
-        email: Adreça electrònica d'empresa
-        username: Nom d'usuari del contacte
-      custom_css:
-        desc_html: Modifica l'aspecte amb CSS carregat a cada pàgina
-        title: CSS personalitzat
+      about:
+        manage_rules: Gestiona les normes del servidor
+        preamble: Proporciona informació detallada sobre com funciona, com es modera i com es financia el servidor.
+        rules_hint: Hi ha un àrea dedicada a les normes a les que s'espera que els teus usuaris s'hi adhereixin.
+        title: Quant a
+      appearance:
+        preamble: Personalitza l'interfície web de Mastodon.
+        title: Aparença
+      branding:
+        preamble: La marca del teu servidor el diferencia dels altres servidors de la xarxa. Aquesta informació es pot mostrar en diversos entorns com ara en la interfície web, en les aplicacions natives, en les previsualitzacions dels enllaços en altres webs, dins les aplicacions de missatgeria i d'altres. Per aquesta raó, val més mantenir aquesta informació clara, breu i precisa.
+        title: Marca
+      content_retention:
+        preamble: Controla com es desa a Mastodon el contingut generat per l'usuari.
+        title: Retenció de contingut
       default_noindex:
-        desc_html: Afecta a tots els usuaris que no han canviat aquest ajustament ells mateixos
-        title: Configura per defecte als usuaris fora de la indexació del motor de cerca
+        desc_html: Afecta tothom qui no ha canviat per si mateix aquest paràmetre
+        title: Exclou per defecte els usuaris de la indexació dels motors de cerca
+      discovery:
+        follow_recommendations: Seguir les recomanacions
+        preamble: L'aparició de contingut interessant és fonamental per atraure els nous usuaris que podrien no saber res de Mastodon. Controla com funcionen diverses opcions de descobriment en el teu servidor.
+        profile_directory: Directori de perfils
+        public_timelines: Línies de temps públiques
+        title: Descobriment
+        trends: Tendències
       domain_blocks:
         all: Per a tothom
         disabled: Per a ningú
-        title: Mostra els bloquejos de domini
         users: Per als usuaris locals en línia
-      domain_blocks_rationale:
-        title: Mostra el raonament
-      hero:
-        desc_html: Es mostra en pàgina frontal. Recomanat al menys 600x100px. Si no es configura es mostrarà el del servidor
-        title: Imatge d’heroi
-      mascot:
-        desc_html: Es mostra a diverses pàgines. Es recomana com a mínim 293 × 205px. Si no està configurat, torna a la mascota predeterminada
-        title: Imatge de la mascota
-      peers_api_enabled:
-        desc_html: Els noms de domini que aquest servidor ha trobat al fedivers
-        title: Publica la llista de servidors descoberts
-      preview_sensitive_media:
-        desc_html: Les visualitzacions prèvies d'enllaços d'altres llocs web mostraran una miniatura encara que els mitjans de comunicació estiguin marcats com a sensibles
-        title: Mostra els mitjans sensibles a les previsualitzacions d'OpenGraph
-      profile_directory:
-        desc_html: Permet als usuaris ser descoberts
-        title: Habilita el directori de perfils
       registrations:
-        closed_message:
-          desc_html: Apareix en la primera pàgina quan es tanquen els registres. Pots utilitzar etiquetes HTML
-          title: Missatge de registre tancat
-        deletion:
-          desc_html: Permet a qualsevol usuari d'esborrar el seu compte
-          title: Obre la supressió del compte
-        min_invite_role:
-          disabled: Ningú
-          title: Permet les invitacions de
-        require_invite_text:
-          desc_html: Quan el registre requereix aprovació manual, fer que sigui obligatori enlloc d'opcions l escriure el text de la solicitud d'invitació "Perquè vols unirte?"
-          title: Requerir als nous usuaris omplir el text de la solicitud d'invitació
+        preamble: Controla qui pot crear un compte en el teu servidor.
+        title: Registres
       registrations_mode:
         modes:
           approved: Es requereix l’aprovació per registrar-se
           none: Ningú no pot registrar-se
           open: Qualsevol pot registrar-se
-        title: Mode de registres
-      show_known_fediverse_at_about_page:
-        desc_html: Quan està desactivat, restringeix la línia de temps pública enllaçada des de la pàgina inicial a mostrar només contingut local
-        title: Inclou el contingut federat a la pàgina no autenticada de la línia de temps pública
-      show_staff_badge:
-        desc_html: Mostra una insígnia de personal en la pàgina d'usuari
-        title: Mostra insígnia de personal
-      site_description:
-        desc_html: Paràgraf introductori a la pàgina principal i en etiquetes meta. Pots utilitzar etiquetes HTML, en particular <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
-        title: Descripció del servidor
-      site_description_extended:
-        desc_html: Un bon lloc per al codi de conducta, regles, directrius i altres coses que distingeixen el teu servidor. Pots utilitzar etiquetes HTML
-        title: Descripció ampliada del lloc
-      site_short_description:
-        desc_html: Es mostra a la barra lateral i a metaetiquetes. Descriu en un únic paràgraf què és Mastodon i què fa que aquest servidor sigui especial.
-        title: Descripció curta del servidor
-      site_terms:
-        desc_html: Pots escriure la teva pròpia política de privadesa, els termes del servei o d'altres normes legals. Pots utilitzar etiquetes HTML
-        title: Termes del servei personalitzats
-      site_title: Nom del servidor
-      thumbnail:
-        desc_html: S'utilitza per obtenir visualitzacions prèvies a través d'OpenGraph i API. Es recomana 1200x630px
-        title: Miniatura del servidor
-      timeline_preview:
-        desc_html: Mostra l'enllaç a la línia de temps pública a la pàgina inicial i permet l'accés a l'API a la línia de temps pública sense autenticació
-        title: Permet l'accés no autenticat a la línia de temps pública
-      title: Configuració del lloc
-      trendable_by_default:
-        desc_html: Afecta a les etiquetes que no s'havien rebutjat prèviament
-        title: Permet que les etiquetes passin a la tendència sense revisió prèvia
-      trends:
-        desc_html: Mostra públicament les etiquetes revisades anteriorment que actualment estan en tendència
-        title: Etiquetes tendència
+      title: Paràmetres del servidor
     site_uploads:
       delete: Esborra el fitxer pujat
       destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
     statuses:
+      account: Autor
+      application: Aplicació
       back_to_account: Torna a la pàgina del compte
+      back_to_report: Torna a la pàgina del informe
       batch:
-        delete: Suprimeix
-        nsfw_off: Marcar com a no sensible
-        nsfw_on: Marcar com a sensible
-      deleted: Esborrats
-      failed_to_execute: No s'ha pogut executar
+        remove_from_report: Treu del informe
+        report: Informe
+      deleted: Eliminada
+      favourites: Favorits
+      history: Històric de versions
+      in_reply_to: Responent a
+      language: Llengua
       media:
         title: Contingut multimèdia
-      no_media: Sense contingut multimèdia
+      metadata: Metadada
       no_status_selected: No s’han canviat els estatus perquè cap no ha estat seleccionat
+      open: Obre la publicació
+      original_status: Publicació original
+      reblogs: Impulsos
+      status_changed: Publicació canviada
       title: Estats del compte
+      trending: Tendència
+      visibility: Visibilitat
       with_media: Amb contingut multimèdia
+    strikes:
+      actions:
+        delete_statuses: "%{name} ha eliminat les publicacions de %{target}"
+        disable: "%{name} ha congelat el compte de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcat les publicacions de %{target} com a sensibles"
+        none: "%{name} ha enviat un avís a %{target}"
+        sensitive: "%{name} ha marcat el compte de %{target} com a sensible"
+        silence: "%{name} ha limitat el compte de %{target}"
+        suspend: "%{name} ha suspès el compte de %{target}"
+      appeal_approved: Apel·lat
+      appeal_pending: Apel·lació pendent
     system_checks:
       database_schema_check:
         message_html: Hi ha pendents migracions de la base de dades. Si us plau executa-les per a assegurar que l'aplicació es comporta com s'espera
+      elasticsearch_running_check:
+        message_html: No s'ha pogut connectar a Elasticsearch. Si us plau verifica que estigui funcionant o desactiva la cerca de text complet
+      elasticsearch_version_check:
+        message_html: 'Versió incompatible de Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} està funcionant mentre %{required_version} és requerida
       rules_check:
         action: Gestiona les normes del servidor
         message_html: No has definit cap norma del servidor.
       sidekiq_process_check:
         message_html: No hi ha cap procés de Sidekiq executant-se per a la cua (o cues) de %{value}. Si us plau revisa la teva configuració de Sidekiq
     tags:
-      accounts_today: Usos únics actuals
-      accounts_week: Usos únics d'aquesta setmana
-      breakdown: Desglossament de l’ús actual per origen
-      last_active: Darrer actiu
-      most_popular: Més populars
-      most_recent: Més recent
-      name: Etiqueta
       review: Revisar l'estat
-      reviewed: Revisades
-      title: Etiquetes
-      trending_right_now: Actualment en tendència
-      unique_uses_today: "%{count} publicacions d'avui"
-      unreviewed: Sense revisar
       updated_msg: Ajustaments d'etiquetes actualitzats amb èxit
     title: Administració
+    trends:
+      allow: Permet
+      approved: Aprovat
+      disallow: No permès
+      links:
+        allow: Permet enllaç
+        allow_provider: Permet mitjà
+        description_html: Aquests són enllaços que ara mateix estan compartint molt els comptes dels quals el teu servidor veu les publicacions. Poden ajudar els teus usuaris a trobar què està passant en el món. Cap dels enllaços es mostra públicament fins que no aprovis el mitjà. També pots acceptar o rebutjar enllaços individuals.
+        disallow: No permetre l'enllaç
+        disallow_provider: No permetre el mitjà
+        no_link_selected: No s'ha canviat cap enllaç perquè cap ha estat seleccionat
+        publishers:
+          no_publisher_selected: No s'ha canviat cap editor perquè cap ha estat seleccionat
+        shared_by_over_week:
+          one: Compartit per una persona en la darrera setmana
+          other: Compartit per %{count} persones en la darrera setmana
+        title: Enllaços en tendència
+        usage_comparison: Compartit %{today} vegades avui, comparat amb %{yesterday} d'ahir
+      only_allowed: Només permesos
+      pending_review: Revisió pendent
+      preview_card_providers:
+        allowed: Els enllaços d'aquest mitjà poden estar en tendència
+        description_html: Aquest son els dominis des d´els quals es comparteixen sovint enllaços en el teu servidor. Els enllaços no seran tendència pública fins que el domini del enllaç s'aprovi. La teva aprovació (o rebuig) es fa extensible als subdominis.
+        rejected: Els enllaços d'aquest mitjà no poden estar en tendència
+        title: Mitjans
+      rejected: Rebutjat
+      statuses:
+        allow: Permet publicació
+        allow_account: Permet autor
+        description_html: Aquests són tuts que el teu servidor veu i que ara mateix s'estan compartint i afavorint molt. Poden ajudar als teus nous usuaris i als que retornen a trobar més gent a qui seguir. Cap tut es mostra públicament fins que no aprovis l'autor i l'autor permeti que el seu compte sigui suggerit a altres. També pots acceptar o rebutjar tuts individualment.
+        disallow: Rebutja tut
+        disallow_account: Rebutja autor
+        no_status_selected: No s'han canviat les publicacions en tendència perquè cap ha estat seleccionada
+        not_discoverable: L'autor no ha activat poder ser detectable
+        shared_by:
+          one: Compartit o afavorit una vegada
+          other: Compartit i afavorit %{friendly_count} vegades
+        title: Publicacions en tendència
+      tags:
+        current_score: Puntuació actual %{score}
+        dashboard:
+          tag_accounts_measure: usos únics
+          tag_languages_dimension: Els millors idiomes
+          tag_servers_dimension: Els millors servidors
+          tag_servers_measure: diferents servidors
+          tag_uses_measure: total usos
+        description_html: Aquestes són les etiquetes que ara mateix estan apareixent en moltes publicacions que el teu servidor veu. Poden ajudar els teus usuaris a trobar de què està parlant majoritàriament la gent en aquest moment. Cap etiqueta es mostra públicament fins que no l'aprovis.
+        listable: Es pot suggerir
+        no_tag_selected: No s'ha canviat cap etiqueta perquè cap ha estat seleccionada
+        not_listable: No es pot suggerir
+        not_trendable: No apareixeran en les tendències
+        not_usable: No pot ser emprat
+        peaked_on_and_decaying: Punt màxim el dia %{date}, ara decaient
+        title: Etiquetes en tendència
+        trendable: Pot aparèixer en les tendències
+        trending_rank: 'Tendència #%{rank}'
+        usable: Pot ser emprat
+        usage_comparison: Usat %{today} vegades avui, comparat amb %{yesterday} d'ahir
+        used_by_over_week:
+          one: Emprat per una persona en la darrera setmana
+          other: Emprat per %{count} persones en la darrera setmana
+      title: Tendència
+      trending: Tendència
     warning_presets:
-      add_new: Afegeix-ne un de nou
-      delete: Esborra
+      add_new: Afegir-ne un de nou
+      delete: Elimina
       edit_preset: Edita l'avís predeterminat
       empty: Encara no has definit cap preavís.
       title: Gestiona les configuracions predefinides dels avisos
+    webhooks:
+      add_new: Afegir extrem
+      delete: Elimina
+      description_html: Un <strong>webhook</strong> habilita Mastodon per a empènyer <strong>notificacions en temps real</strong> sobre els esdeveniments escollits de la teva pròpia aplicació, per tant la teva aplicació pot <strong>activar reaccions automaticament</strong>.
+      disable: Desactiva
+      disabled: Desactivat
+      edit: Editar extrem
+      empty: Encara no tens cap extrem de webhook configurat.
+      enable: Activa
+      enabled: Actiu
+      enabled_events:
+        one: 1 esdeveniment activat
+        other: "%{count} esdeveniments activats"
+      events: Esdeveniments
+      new: Nou webhook
+      rotate_secret: Rota el secret
+      secret: Signant el secret
+      status: Estat
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: eliminar les seves publicacions
+        disable: congelar els seus comptes
+        mark_statuses_as_sensitive: marcar les seves publicacions com a sensibles
+        none: un avís
+        sensitive: marcar els seus comptes com a sensibles
+        silence: limitar els seus comptes
+        suspend: suspendre els seus comptes
+      body: "%{target} està apel·lant una decisió de moderació de %{action_taken_by} el %{date}, del tipus %{type}. Han escrit:"
+      next_steps: Pots aprovar l'apel·lació per a desfer la decisió de moderació o ignorar-la.
+      subject: "%{username} està apel·lant una decisió de moderació a %{instance}"
     new_pending_account:
       body: A continuació trobaràs els detalls del compte nou. Pots aprovar o rebutjar aquest registre.
       subject: Nou compte per a revisar a %{instance} (%{username})
@@ -731,9 +893,17 @@ ca:
       body: "%{reporter} ha informat de %{target}"
       body_remote: Algú des de el domini %{domain} ha informat sobre %{target}
       subject: Informe nou per a %{instance} (#%{id})
-    new_trending_tag:
-      body: 'La etiqueta #%{name} està actualment en tendència però no s''ha revisat prèviament. No es mostrarà públicament tret que ho permetis o guardis el formulari tal com està per a no tornar a escoltar res al respecte.'
-      subject: Nova etiqueta pendent de revisió a %{instance} (#%{name})
+    new_trends:
+      body: 'Els següents elements necessiten una revisió abans de que puguin ser mostrats públicament:'
+      new_trending_links:
+        title: Enllaços en tendència
+      new_trending_statuses:
+        title: Publicacions en tendència
+      new_trending_tags:
+        no_approved_tags: Actualment no hi ha etiquetes en tendència aprovades.
+        requirements: 'Qualsevol d''aquests candidats podria superar el #%{rank} de la etiqueta en tendència aprovada, que actualment és "%{lowest_tag_name}" amb una puntuació de %{lowest_tag_score}.'
+        title: Etiquetes en tendència
+      subject: Noves tendències pendents de revisar a %{instance}
   aliases:
     add_new: Crea un àlies
     created_msg: Nou àlies creat amb èxit. Ara pots iniciar el moviment des de'l compte vell.
@@ -743,7 +913,7 @@ ca:
     remove: Desvincula l'àlies
   appearance:
     advanced_web_interface: Interfície web avançada
-    advanced_web_interface_hint: 'Si vols fer ús de tota l''amplada de la teva pantalla, l''interfície web avançada et permet configurar diverses columnes per a veure molta més informació al mateix temps: Inici, notificacions, línia de temps federada i qualsevol número de llistes i etiquetes.'
+    advanced_web_interface_hint: 'Si vols fer ús de tota l''amplada de la teva pantalla, la interfície web avançada et permet configurar diverses columnes per a veure molta més informació al mateix temps: Inici, notificacions, línia de temps federada i qualsevol quantitat de llistes i etiquetes.'
     animations_and_accessibility: Animacions i accessibilitat
     confirmation_dialogs: Diàlegs de confirmació
     discovery: Descobriment
@@ -752,28 +922,25 @@ ca:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Tothom hi pot contribuir.
     sensitive_content: Contingut sensible
-    toot_layout: Disseny del tut
+    toot_layout: Disseny de les publicacions
   application_mailer:
     notification_preferences: Canvia les preferències de correu
     salutation: "%{name},"
     settings: 'Canvia les preferències de correu: %{link}'
     view: 'Visualització:'
     view_profile: Mostra el perfil
-    view_status: Mostra l'estat
+    view_status: Mostra el tut
   applications:
     created: L'aplicació s'ha creat correctament
     destroyed: L'aplicació s'ha suprimit correctament
-    invalid_url: L'URL proporcionat no és correcte
     regenerate_token: Torna a generar l'identificador d'accés
     token_regenerated: L'identificador d'accés s'ha generat correctament
     warning: Aneu amb compte amb aquestes dades. No les compartiu mai amb ningú!
     your_token: El teu identificador d'accés
   auth:
-    apply_for_account: Demana una invitació
+    apply_for_account: Sol·licitar un compte
     change_password: Contrasenya
-    checkbox_agreement_html: Estic d'acord amb les <a href="%{rules_path}" target="_blank">normes del servidor</a> i <a href="%{terms_path}" target="_blank"> els termes del servei</a>
-    checkbox_agreement_without_rules_html: Acepto els <a href="%{terms_path}" target="_blank">termes del servei</a>
-    delete_account: Suprimeix el compte
+    delete_account: Elimina el compte
     delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació.
     description:
       prefix_invited_by_user: "@%{name} t'ha invitat a unir-te a aquest servidor de Mastodon!"
@@ -785,32 +952,43 @@ ca:
     invalid_reset_password_token: L'enllaç de restabliment de la contrasenya no és vàlid o ha caducat. Torna-ho a provar.
     link_to_otp: Introdueix el teu codi de doble factor des d’el teu mòbil o un codi de recuperació
     link_to_webauth: Usa el teu dispositiu de clau de seguretat
-    login: Inicia sessió
+    log_in_with: Inicia sessió amb
+    login: Inicia la sessió
     logout: Surt
     migrate_account: Mou a un compte diferent
     migrate_account_html: Si vols redirigir aquest compte a un altre diferent, el pots <a href="%{path}">configurar aquí</a>.
     or_log_in_with: O inicia sessió amb
+    privacy_policy_agreement_html: He llegit i estic d'acord amb la <a href="%{privacy_policy_path}" target="_blank">política de privacitat</a>
     providers:
       cas: CAS
       saml: SAML
-    register: Registre
+    register: Registrar-se
     registration_closed: "%{instance} no accepta nous membres"
     resend_confirmation: Torna a enviar el correu de confirmació
     reset_password: Restableix la contrasenya
+    rules:
+      preamble: Aquestes regles estan establertes i aplicades per els moderadors de %{domain}.
+      title: Algunes regles bàsiques.
     security: Seguretat
     set_new_password: Estableix una contrasenya nova
     setup:
       email_below_hint_html: Si l’adreça de correu electrònic següent és incorrecta, podeu canviar-la aquí i rebre un nou correu electrònic de confirmació.
       email_settings_hint_html: El correu electrònic de confirmació es va enviar a %{email}. Si aquesta adreça de correu electrònic no és correcta, la podeu canviar a la configuració del compte.
       title: Configuració
+    sign_in:
+      preamble_html: Inicia sessió amb les teves credencials <strong>%{domain}</strong>. Si el teu compte es troba a un servidor diferent, no podràs iniciar una sessió aquí.
+      title: Inicia sessió a %{domain}
+    sign_up:
+      preamble: Amb un compte en aquest servidor Mastodon, podràs seguir qualsevol altre persona de la xarxa, independentment d'on tingui el seu compte.
+      title: Anem a configurar-te a %{domain}.
     status:
       account_status: Estat del compte
       confirming: Esperant que es completi la confirmació del correu electrònic.
-      functional: El teu compte és plenament operatiu.
+      functional: El teu compte està completament operatiu.
       pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
       redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
+      view_strikes: Veure accions del passat contra el teu compte
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
-    trouble_logging_in: Problemes per iniciar la sessió?
     use_security_key: Usa clau de seguretat
   authorize_follow:
     already_following: Ja estàs seguint aquest compte
@@ -852,10 +1030,10 @@ ca:
       x_months: "%{count} mesos"
       x_seconds: "%{count} s"
   deletes:
-    challenge_not_passed: L'informació que has entrat no és correcte
+    challenge_not_passed: La informació que has introduït no és correcta
     confirm_password: Introdueix la contrasenya actual per a verificar la identitat
     confirm_username: Escriu el teu nom d'usuari per a confirmar el procediment
-    proceed: Suprimeix el compte
+    proceed: Elimina el compte
     success_msg: El compte s'ha eliminat correctament
     warning:
       before: 'Abans de procedir si us plau llegeix amb cura aquestes notes:'
@@ -868,10 +1046,36 @@ ca:
       more_details_html: Per a més detalls, llegeix la <a href="%{terms_path}">política de privadesa</a>.
       username_available: El teu nom d'usuari esdevindrà altre cop disponible
       username_unavailable: El teu nom d'usuari quedarà inutilitzable
-  directories:
-    directory: Directori de perfils
-    explanation: Descobreix usuaris segons els teus interessos
-    explore_mastodon: Explora %{title}
+  disputes:
+    strikes:
+      action_taken: Acció presa
+      appeal: Apel·lació
+      appeal_approved: L'acció ha estat apel·lada amb èxit i ja no és vàlida
+      appeal_rejected: S'ha rebutjat l'apel·lació
+      appeal_submitted_at: Apel·lació enviada
+      appealed_msg: La teva apel·lació s'ha enviat. Et notificarem si s'aprova.
+      appeals:
+        submit: Envia l'apel·lació
+      approve_appeal: Aprova l'apel·lació
+      associated_report: Informe associat
+      created_at: Datada
+      description_html: Aquestes son accions preses contra el teu compte i avisos que se t'han enviat per l'equip de %{instance}.
+      recipient: Dirigida a
+      reject_appeal: Rebutja l'apel·lació
+      status: 'Publicació #%{id}'
+      status_removed: Tut ja esborrat del sistema
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Eliminació de publicació
+        disable: Congelació del compte
+        mark_statuses_as_sensitive: Marcatge de les publicacions com a sensibles
+        none: Avís
+        sensitive: Marcatge del compte com a sensible
+        silence: Limitació del compte
+        suspend: Suspensió del compte
+      your_appeal_approved: La teva apel·lació s'ha aprovat
+      your_appeal_pending: Has enviat una apel·lació
+      your_appeal_rejected: La teva apel·lació ha estat rebutjada
   domain_validator:
     invalid_domain: no es un nom de domini vàlid
   errors:
@@ -888,7 +1092,7 @@ ca:
       content: Ho sentim, però alguna cosa ha fallat a la nostra banda.
       title: Aquesta pàgina no es correcta
     '503': La pàgina no podria ser servida a causa d'un error temporal del servidor.
-    noscript_html: Per a utilitzar Mastodon, activa el JavaScript. També pots provar una de les <a href="%{apps_path}"> aplicacions natives</a> de Mastodon per a la teva plataforma.
+    noscript_html: Per a usar Mastodon, activa el JavaScript. També pots provar una de les <a href="%{apps_path}"> aplicacions natives</a> de Mastodon per a la teva plataforma.
   existing_username_validator:
     not_found: no s'ha pogut trobar cap usuari local amb aquest nom d'usuari
     not_found_multiple: no s'ha pogut trobar %{usernames}
@@ -896,9 +1100,9 @@ ca:
     archive_takeout:
       date: Data
       download: Baixa l’arxiu
-      hint_html: Pots sol·licitar un arxiu dels teus <strong>tuts i dels fitxers multimèdia pujats</strong>. Les dades exportades tindran el format ActivityPub, llegible per qualsevol programari compatible. Pots sol·licitar un arxiu cada 7 dies.
+      hint_html: Pots sol·licitar un arxiu de les teves <strong>publicacions i dels fitxers multimèdia pujats</strong>. Les dades exportades tindran el format ActivityPub, llegible per qualsevol programari compatible. Pots sol·licitar un arxiu cada 7 dies.
       in_progress: S'està compilant el teu arxiu...
-      request: Sol·licita el teu arxiu
+      request: Sol·licitar el teu arxiu
       size: Mida
     blocks: Persones que has blocat
     bookmarks: Marcadors
@@ -908,7 +1112,7 @@ ca:
     mutes: Persones silenciades
     storage: Emmagatzematge
   featured_tags:
-    add_new: Afegir nova
+    add_new: Afegir nova etiqueta
     errors:
       limit: Ja has mostrat la quantitat màxima d'etiquetes
     hint_html: "<strong>Què son les etiquetes destacades?</strong> Es mostren de manera destacada en el teu perfil públic i permeten a les persones navegar per les teves publicacions gràcies a aquestes etiquetes. Són una gran eina per fer un seguiment de treballs creatius o de projectes a llarg termini."
@@ -920,56 +1124,69 @@ ca:
       public: Línies de temps públiques
       thread: Converses
     edit:
+      add_keyword: Afegeix una paraula clau
+      keywords: Paraules clau
+      statuses: Publicacions individuals
+      statuses_hint_html: Aquest filtre s'aplica a la selecció de publicacions individuals, independentment de si coincideixen amb les paraules clau següents. <a href="%{path}">Revisa o elimina publicacions del filtre</a>.
       title: Editar filtre
     errors:
+      deprecated_api_multiple_keywords: Aquests paràmetres no poden ser canviats des d'aquesta aplicació perquè apliquen a més d'un filtre per paraula clau. Utilitza una aplicació més recent o la interfície web.
       invalid_context: Cap o el context proporcionat no és vàlid
-      invalid_irreversible: El filtratge irreversible només funciona amb el contextos inici o notificacions
     index:
-      delete: Esborra
+      contexts: Filtres en %{contexts}
+      delete: Elimina
       empty: No hi tens cap filtre.
+      expires_in: Expira en %{distance}
+      expires_on: Expira el %{date}
+      keywords:
+        one: "%{count} paraula clau"
+        other: "%{count} paraules clau"
+      statuses:
+        one: "%{count} publicació"
+        other: "%{count} publicacions"
+      statuses_long:
+        one: "%{count} publicació individual ocultada"
+        other: "%{count} publicacions individuals ocultades"
       title: Filtres
     new:
-      title: Afegeix un nou filtre
+      save: Desa el filtre nou
+      title: Afegir un nou filtre
+    statuses:
+      back_to_filter: Tornar al filtre
+      batch:
+        remove: Eliminar del filtre
+      index:
+        hint: Aquest filtre aplica als apunts seleccionats independentment d'altres criteris. Pots afegir més publicacions a aquest filtre des de la interfície Web.
+        title: Publicacions filtrades
   footer:
-    developers: Desenvolupadors
-    more: Més…
-    resources: Recursos
     trending_now: En tendència
   generic:
     all: Tot
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> article d'aquesta s'ha seleccionat."
+      other: Tots <strong>%{count}</strong> articles d'aquesta pàgina estan seleccionats.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> article coincident amb la teva cerca està seleccionat."
+      other: Tots <strong>%{count}</strong> articles coincidents amb la teva cerca estan seleccionats.
     changes_saved_msg: Els canvis s'han desat correctament!
-    copy: Copia
-    delete: Esborra
-    no_batch_actions_available: Cap accions de lot disponibles en aquesta pàgina
+    copy: Copiar
+    delete: Elimina
+    deselect: Desfer selecció
+    none: Cap
     order_by: Ordena per
     save_changes: Desa els canvis
+    select_all_matching_items:
+      one: Selecciona %{count} article coincident amb la teva cerca.
+      other: Selecciona tots %{count} articles coincidents amb la teva cerca.
+    today: avui
     validation_errors:
       one: Alguna cosa no va bé! Si us plau, revisa l'error
       other: Alguna cosa no va bé! Si us plau, revisa %{count} errors més a baix
   html_validator:
     invalid_markup: 'conté HTML markup no vàlid: %{error}'
-  identity_proofs:
-    active: Actiu
-    authorize: Sí, autoritza
-    authorize_connection_prompt: Autoritzar aquesta connexió criptogràfica?
-    errors:
-      failed: Ha fallat la connexió criptogràfica. Torna-ho a provar des de %{provider}.
-      keybase:
-        invalid_token: Els tokens de Keybase són hashs de signatures i han de tenir 66 caràcters hexadecimals
-        verification_failed: Keybase no reconeix aquest token com a signatura del usuari de Keybase %{kb_username}. Si us plau prova des de Keybase.
-      wrong_user: No es pot crear una prova per a %{proving} mentre es connectava com a %{current}. Inicia sessió com a %{proving} i prova de nou.
-    explanation_html: Aquí pots connectar criptogràficament les teves altres identitats com ara el teu perfil de Keybase. Això permet que altres persones t'enviïn missatges xifrats i confiar en el contingut que els hi envies.
-    i_am_html: Sóc %{username} a %{service}.
-    identity: Identitat
-    inactive: Inactiu
-    publicize_checkbox: 'I envia un tut d''això:'
-    publicize_toot: 'Està provat! Sóc %{username} a %{service}: %{url}'
-    remove: Elimina prova d’identitat del compte
-    removed: Prova d’identitat del compte eliminada amb èxit
-    status: Estat de verificació
-    view_proof: Veure la prova
   imports:
     errors:
+      invalid_csv_file: 'Fitxer CSV invàlid. Error: %{error}'
       over_rows_processing_limit: conté més de %{count} files
     modes:
       merge: Fusionar
@@ -985,9 +1202,8 @@ ca:
       following: Llista de seguits
       muting: Llista de silenciats
     upload: Carrega
-  in_memoriam_html: En Memòria.
   invites:
-    delete: Desactivar
+    delete: Desactiva
     expired: Caducat
     expires_in:
       '1800': 30 minuts
@@ -1007,7 +1223,7 @@ ca:
     table:
       expires_at: Caduca
       uses: Usos
-    title: Convida persones
+    title: Convidar persones
   lists:
     errors:
       limit: Has assolit la quantitat màxima de llistes
@@ -1064,18 +1280,14 @@ ca:
     carry_blocks_over_text: Aquest usuari s’ha mogut des de %{acct}, que havies bloquejat.
     carry_mutes_over_text: Aquest usuari s’ha mogut des de %{acct}, que havies silenciat.
     copy_account_note_text: 'Aquest usuari s’ha mogut des de %{acct}, aquí estaven les teves notes prèvies sobre ell:'
+  navigation:
+    toggle_menu: Alternar menú
   notification_mailer:
-    digest:
-      action: Mostra totes les notificacions
-      body: Un resum del que et vas perdre des de la darrera visita el %{since}
-      mention: "%{name} t'ha mencionat en:"
-      new_followers_summary:
-        one: A més, has adquirit un nou seguidor durant la teva absència! Visca!
-        other: A més, has adquirit %{count} nous seguidors mentre estaves fora! Increïble!
-      subject:
-        one: "1 notificació nova des de la darrera visita \U0001F418"
-        other: "%{count} notificacions noves des de la darrera visita \U0001F418"
-      title: Durant la teva absència…
+    admin:
+      report:
+        subject: "%{name} ha presentat un informe"
+      sign_up:
+        subject: "%{name} s'ha registrat"
     favourite:
       body: "%{name} ha marcat com a favorit el teu estat:"
       subject: "%{name} ha marcat com a favorit el teu estat"
@@ -1102,8 +1314,10 @@ ca:
       title: Nou impuls
     status:
       subject: "%{name} ha publicat"
+    update:
+      subject: "%{name} ha editat una publicació"
   notifications:
-    email_events: Esdeveniments per a notificacions per correu electrònic
+    email_events: Esdeveniments per a notificacions de correu electrònic
     email_events_hint: 'Selecciona els esdeveniments per als quals vols rebre notificacions:'
     other_settings: Altres opcions de notificació
   number:
@@ -1143,8 +1357,10 @@ ca:
       too_many_options: no pot contenir més de %{max} opcions
   preferences:
     other: Altre
-    posting_defaults: Valors predeterminats de publicació
+    posting_defaults: Valors per defecte de publicació
     public_timelines: Línies de temps públiques
+  privacy_policy:
+    title: Política de Privacitat
   reactions:
     errors:
       limit_reached: Límit de diferents reaccions assolit
@@ -1156,7 +1372,7 @@ ca:
     followers: Seguidors
     following: Seguint
     invited: Convidat
-    last_active: Darrer actiu
+    last_active: Última activitat
     most_recent: Més recent
     moved: Mogut
     mutual: Mútua
@@ -1167,25 +1383,18 @@ ca:
     remove_selected_follows: Deixa de seguir als usuaris seleccionats
     status: Estat del compte
   remote_follow:
-    acct: Escriu el teu usuari@domini des del qual vols seguir
-    missing_resource: No s'ha pogut trobar la URL de redirecció necessària per al compte
-    no_account_html: No tens cap compte? Pots <a href='%{sign_up_path}' target='_blank'>registrar-te aquí</a>
-    proceed: Comença a seguir
-    prompt: 'Seguiràs a:'
-    reason_html: "<strong>Per què és necessari aquest pas?</strong> <code>%{instance}</code> pot ser que no sigui el servidor on estàs registrat per tant primer hem de redirigir-te al teu servidor."
-  remote_interaction:
-    favourite:
-      proceed: Procedir a afavorir
-      prompt: 'Vols marcar com a favorit aquest tut:'
-    reblog:
-      proceed: Procedir a impulsar
-      prompt: 'Vols impulsar aquest tut:'
-    reply:
-      proceed: Procedir a respondre
-      prompt: 'Vols respondre a aquest tut:'
+    missing_resource: No s'ha pogut trobar l'URL de redirecció necessària per al compte
+  reports:
+    errors:
+      invalid_rules: no fa referència a normes vàlides
+  rss:
+    content_warning: 'Avís de contingut:'
+    descriptions:
+      account: Publicacions des de @%{acct}
+      tag: 'Publicacions etiquetades #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Has superat el límit de %{limit} tuts programats per a aquell dia
-    over_total_limit: Has superat el limit de %{limit} tuts programats
+    over_daily_limit: Has superat el límit de %{limit} publicacions programades per a avui
+    over_total_limit: Has superat el límit de %{limit} publicacions programades
     too_soon: La data programada ha de ser futura
   sessions:
     activity: Última activitat
@@ -1206,7 +1415,7 @@ ca:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Navegador UC
       weibo: Weibo
     current_session: Sessió actual
     description: "%{browser} de %{platform}"
@@ -1228,10 +1437,10 @@ ca:
     revoke: Revoca
     revoke_success: S'ha revocat la sessió amb èxit
     title: Sessions
-    view_authentication_history: Veure l'historial d'autenticació del teu compte
+    view_authentication_history: Mostra l'historial d'autenticació del compte
   settings:
     account: Compte
-    account_settings: Ajustos del compte
+    account_settings: Configuració del compte
     aliases: Àlies de compte
     appearance: Aparença
     authorized_apps: Aplicacions autoritzades
@@ -1241,7 +1450,6 @@ ca:
     edit_profile: Edita el perfil
     export: Exportació de dades
     featured_tags: Etiquetes destacades
-    identity_proofs: Proves d'identitat
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
@@ -1249,7 +1457,8 @@ ca:
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
-    statuses_cleanup: Borrat automàtic de publicacions
+    statuses_cleanup: Esborrat automàtic de publicacions
+    strikes: Accions de mediació
     two_factor_authentication: Autenticació de dos factors
     webauthn_authentication: Claus de seguretat
   statuses:
@@ -1266,18 +1475,19 @@ ca:
         other: "%{count} vídeos"
     boosted_from_html: Impulsat des de %{acct_link}
     content_warning: 'Avís de contingut: %{warning}'
+    default_language: El mateix que a la llengua de la interfície
     disallowed_hashtags:
       one: 'conté una etiqueta no permesa: %{tags}'
       other: 'conté les etiquetes no permeses: %{tags}'
+    edited_at_html: Editat %{date}
     errors:
       in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
-    language_detection: Detecta automàticament el llenguatge
     open_in_web: Obre en la web
     over_character_limit: Límit de caràcters de %{max} superat
     pin_errors:
-      limit: Ja has fixat el màxim nombre de tuts
+      direct: Les publicacions que només són visibles per als usuaris mencionats no poden ser fixades
+      limit: Ja has fixat el màxim nombre de publicacions
       ownership: No es pot fixar el tut d'algú altre
-      private: No es pot fixar un tut no públic
       reblog: No es pot fixar un impuls
     poll:
       total_people:
@@ -1302,25 +1512,25 @@ ca:
       unlisted: No llistat
       unlisted_long: Tothom ho pot veure, però no es mostra en les línies de temps públiques
   statuses_cleanup:
-    enabled: Esborra automàtic publicacions velles
+    enabled: Esborra automàticament publicacions antigues
     enabled_hint: Suprimeix automàticament les teves publicacions quan arribin a un llindar d’edat especificat, tret que coincideixin amb una de les excepcions següents
     exceptions: Excepcions
-    explanation: Com que suprimir publicacions és una operació cara, es fa lentament amb el pas del temps quan el servidor no està ocupat. Per aquest motiu, és possible que les teves publicacions se suprimeixin un temps després d’assolir el llindar d’edat.
+    explanation: Com que suprimir publicacions és una operació cara, es fa lentament amb el pas del temps i quan el servidor no està ocupat. Per aquest motiu, és possible que les teves publicacions se suprimeixin un temps després d’assolir el llindar d’edat.
     ignore_favs: Ignora favorits
     ignore_reblogs: Ignora impulsos
     interaction_exceptions: Excepcions basades en interaccions
-    interaction_exceptions_explanation: Tingues en compte que no es garanteix que es suprimeixen les publicacions si passen per sota del llindar de favorit o impuls després d'haver-lo superat.
-    keep_direct: Manté missatges directes
+    interaction_exceptions_explanation: Has de tenir en compte que no es garanteix que es suprimeixen les publicacions si passen per sota del llindar de favorit o impuls després d'haver-lo superat.
+    keep_direct: Mantenir missatges directes
     keep_direct_hint: No esborra cap dels teus missatges directes
-    keep_media: Manté les publicacions amb adjunts multimèdia
+    keep_media: Mantenir les publicacions amb contingut gràfic
     keep_media_hint: No esborra cap de les teves publicacions que tinguin adjunts multimèdia
-    keep_pinned: Manté les publicacions fixades
+    keep_pinned: Mantenir les publicacions fixades
     keep_pinned_hint: No esborra cap de les teves publicacions fixades
-    keep_polls: Manté enquestes
+    keep_polls: Mantenir enquestes
     keep_polls_hint: No esborra cap de les teves enquestes
-    keep_self_bookmark: Manté les publicacions que has desat a les adreces d'interès
+    keep_self_bookmark: Mantenir les publicacions que has desat a les adreces d'interès
     keep_self_bookmark_hint: No esborra les teves pròpies publicacions si les has desat en les adreces d'interès
-    keep_self_fav: Manté les publicacions que has afavorit
+    keep_self_fav: Mantenir les publicacions que has afavorit
     keep_self_fav_hint: No esborra les teves pròpies publicacions si les has afavorit
     min_age:
       '1209600': 2 setmanes
@@ -1328,102 +1538,23 @@ ca:
       '2629746': 1 mes
       '31556952': 1 any
       '5259492': 2 mesos
+      '604800': 1 setmana
       '63113904': 2 anys
       '7889238': 3 mesos
-    min_age_label: Llindar d'edat
-    min_favs: Manté les publicacions afavorides més de
+    min_age_label: Antiguitat
+    min_favs: Mantenir les publicacions afavorides més de
     min_favs_hint: No suprimeix cap de les teves publicacions que hagin rebut més d'aquesta quantitat de favorits. Deixa-ho en blanc per suprimir publicacions independentment del nombre de favorits que tinguin
-    min_reblogs: Manté les publicacions impulsades més de
-    min_reblogs_hint: No suprimeix cap de les teves publicacions que s'hagin impulsat més que aquest número de vegades. Deixa-ho en blanc per suprimir les publicacions independentment del nombre d'impulsos que tinguin
+    min_reblogs: Mantenir les publicacions impulsades més de
+    min_reblogs_hint: No suprimeix cap de les teves publicacions que s'hagin impulsat més que aquest nombre de vegades. Deixa-ho en blanc per a suprimir les publicacions independentment del nombre d'impulsos que tinguin.
   stream_entries:
-    pinned: Tut fixat
+    pinned: Publicació fixada
     reblogged: ha impulsat
     sensitive_content: Contingut sensible
+  strikes:
+    errors:
+      too_late: És massa tard per a apel·lar aquesta acció
   tags:
     does_not_match_previous_name: no coincideix amb el nom anterior
-  terms:
-    body_html: |
-      <h2>Política de Privacitat</h2>
-      <h3 id="collect">Quina informació recollim?</h3>
-
-      <ul>
-      <li><em>Informació bàsica del compte</em>: Si et registres en aquest servidor, se´t pot demanar que introdueixis un nom d'usuari, una adreça de correu electrònic i una contrasenya. També pots introduir informació de perfil addicional, com ara un nom de visualització i una biografia, i carregar una imatge de perfil i de capçalera. El nom d'usuari, el nom de visualització, la biografia, la imatge de perfil i la imatge de capçalera sempre apareixen públicament.</li>
-      <li><em>Publicacions, seguiment i altra informació pública</em>: La llista de persones que segueixes s'enumeren públicament i el mateix passa amb els teus seguidors. Quan envies un missatge, la data i l'hora s'emmagatzemen, així com l'aplicació que va enviar el missatge. Els missatges poden contenir multimèdia, com ara imatges i vídeos. Els toots públics i no llistats estan disponibles públicament. En quan tinguis un toot en el teu perfil, aquest també és informació pública. Les teves entrades es lliuren als teus seguidors que en alguns casos significa que es lliuren a diferents servidors en els quals s'hi emmagatzemen còpies. Quan suprimeixes publicacions, també es lliuraran als teus seguidors. L'acció d'impulsar o marcar com a favorit una publicació sempre és pública.</li>
-      <li><em>Toots directes i per a només seguidors</em>: Totes les publicacions s'emmagatzemen i processen al servidor. Els toots per a només seguidors només es lliuren als teus seguidors i als usuaris que s'esmenten en ells i els toots directes només es lliuren als usuaris esmentats. En alguns casos, significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Fem un esforç de bona fe per limitar l'accés a aquestes publicacions només a les persones autoritzades, però és possible que altres servidors no ho facin. Per tant, és important revisar els servidors als quals pertanyen els teus seguidors. Pots canviar la opció de aprovar o rebutjar els nous seguidors manualment a la configuració. <em>Tingues en compte que els operadors del servidor i qualsevol servidor receptor poden visualitzar aquests missatges</em> i els destinataris poden fer una captura de pantalla, copiar-los o tornar-los a compartir. <em>No comparteixis cap informació perillosa a Mastodon.</em></li>
-      <li><em>IPs i altres metadades</em>: Quan inicies sessió registrem l'adreça IP en que l'has iniciat, així com el nom de l'aplicació o navegador. Totes les sessions registrades estan disponibles per a la teva revisió i revocació a la configuració. L'última adreça IP utilitzada s'emmagatzema durant un màxim de 12 mesos. També podrem conservar els registres que inclouen l'adreça IP de cada sol·licitud al nostre servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Per a què utilitzem la teva informació?</h3>
-
-      <p>Qualsevol de la informació que recopilem de tu es pot utilitzar de la manera següent:</p>
-
-      <ul>
-      <li>Per proporcionar la funcionalitat bàsica de Mastodon. Només pots interactuar amb el contingut d'altres persones i publicar el teu propi contingut quan hàgis iniciat la sessió. Per exemple, pots seguir altres persones per veure les publicacions combinades a la teva pròpia línia de temps personalitzada.</li>
-      <li>Per ajudar a la moderació de la comunitat, per exemple comparar la teva adreça IP amb altres conegudes per determinar l'evasió de prohibicions o altres infraccions.</li>
-      <li>L'adreça electrònica que ens proporciones pot utilitzar-se per enviar-te informació, notificacions sobre altres persones que interactuen amb el teu contingut o t'envien missatges, i per respondre a les consultes i / o altres sol·licituds o preguntes.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Com protegim la teva informació</h3>
-
-      <p>Implementem diverses mesures per mantenir la seguretat quan introdueixes, envies o accedeixes a la teva informació personal. Entre altres mesures, la sessió del teu navegador així com el trànsit entre les teves aplicacions i l'API estan protegides amb SSL i la teva contrasenya es codifica utilitzant un algoritme de direcció única. Pots habilitar l'autenticació de dos factors per a garantir l'accés segur al teu compte.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Quina és la nostra política de retenció de dades?</h3>
-
-      <p>Farem un esforç de bona fe per:</p>
-
-      <ul>
-      <li>Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds que rebi, tenint em compte que aquests registres es mantenen no més de 90 dies.</li>
-      <li>Conservar les adreces IP associades als usuaris registrats no més de 12 mesos.</li>
-      </ul>
-
-      <p>Pots sol·licitar i descarregar un arxiu del teu contingut incloses les publicacions, els fitxers adjunts multimèdia, la imatge de perfil i la imatge de capçalera.</p>
-
-      <p>Pots eliminar el teu compte de forma irreversible en qualsevol moment.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Utilitzem cookies?</h3>
-
-      <p>Sí. Les cookies són petits fitxers que un lloc o el proveïdor de serveis transfereix al disc dur del teu ordinador a través del navegador web (si ho permet). Aquestes galetes permeten al lloc reconèixer el teu navegador i, si tens un compte registrat, associar-lo al teu compte registrat.</p>
-
-      <p>Utilitzem cookies per entendre i guardar les teves preferències per a futures visites.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Revelem informació a terceres parts?</h3>
-
-      <p>No venem, comercialitzem ni transmetem a tercers la teva informació d'identificació personal. Això no inclou tercers de confiança que ens ajuden a operar el nostre lloc, a dur a terme el nostre servei o a servir-te, sempre que aquestes parts acceptin mantenir confidencial aquesta informació. També podem publicar la teva informació quan creiem que l'alliberament és apropiat per complir amb la llei, fer complir les polítiques del nostre lloc o protegir els nostres drets o altres drets, propietat o seguretat.</p>
-
-      <p>Els altres servidors de la teva xarxa poden descarregar contingut públic. Els teus toots públics i per a només seguidors es lliuren als servidors on resideixen els teus seguidors i els missatges directes s'envien als servidors dels destinataris, sempre que aquests seguidors o destinataris resideixin en un servidor diferent d'aquest.</p>
-
-      <p>Quan autoritzes una aplicació a utilitzar el teu compte, segons l'abast dels permisos que aprovis, pot accedir a la teva informació de perfil pública, a la teva llista de seguits, als teus seguidors, a les teves llistes, a totes les teves publicacions i als teus favorits. Les aplicacions mai no poden accedir a la teva adreça de correu electrònic o contrasenya.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Ús del lloc dels nens</h3>
-
-      <p>Si el servidor és a EU o EEA: el nostre lloc, productes i serveis estan dirigits a persones que tenen almenys 16 anys. Si tens menys de 16 anys, seguint els requisits del GDPR (<a href="https://ca.wikipedia.org/wiki/Reglament_General_de_Protecció_de_Dades">Reglament General de Protecció de Dades</a>) no utilitzis aquest lloc.</p>
-
-      <p>Si aquest servidor es troba als EUA: el nostre lloc, productes i serveis estan dirigits a persones que tenen almenys 13 anys. Si tens menys de 13 anys, segons els requisits de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no utilitzis aquest lloc.</p>
-
-      <p>Els requisits legals poden ser diferents si aquest servidor està en una altra jurisdicció.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Canvis a la nostra política de privacitat</h3>
-
-      <p>Si decidim canviar la nostra política de privadesa, publicarem aquests canvis en aquesta pàgina.</p>
-
-      <p>Aquest document és CC-BY-SA. Actualitzat per darrera vegada el 7 de Març del 2018.</p>
-
-      <p>Originalment adaptat des del <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Condicions del servei i política de privadesa"
   themes:
     contrast: Mastodon (alt contrast)
     default: Mastodon (fosc)
@@ -1432,6 +1563,7 @@ ca:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Afegeix
     disable: Desactiva
@@ -1445,66 +1577,76 @@ ca:
     otp: Aplicació autenticadora
     recovery_codes: Codis de recuperació de còpia de seguretat
     recovery_codes_regenerated: Codis de recuperació regenerats amb èxit
-    recovery_instructions_html: Si mai perds l'accés al teu telèfon pots utilitzar un dels codis de recuperació a continuació per a recuperar l'accés al teu compte. <strong>Cal mantenir els codis de recuperació en lloc segur</strong>. Per exemple, imprimint-los i guardar-los amb altres documents importants.
+    recovery_instructions_html: Si mai perds l'accés al teu telèfon, pots fer servir un dels codis de recuperació a continuació per a recuperar l'accés al teu compte. <strong>Cal mantenir els codis de recuperació en lloc segur</strong>. Per exemple, imprimint-los i guardar-los amb altres documents importants.
     webauthn: Claus de seguretat
   user_mailer:
+    appeal_approved:
+      action: Ves al teu compte
+      explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat aprovada. El teu compte torna a estar en bon estat.
+      subject: La teva apel·lació del %{date} ha estat aprovada
+      title: Apel·lació aprovada
+    appeal_rejected:
+      explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat rebutjada.
+      subject: La teva apel·lació del %{date} ha estat rebutjada
+      title: Apel·lació rebutjada
     backup_ready:
       explanation: Has sol·licitat una copia completa del teu compte Mastodon. Ara ja està a punt per a descàrrega!
-      subject: El teu arxiu està preparat per a descàrrega
-      title: Recollida del arxiu
-    sign_in_token:
-      details: 'Aquí es mostren els detalls del intent:'
-      explanation: 'Hem detectat un intent d’inici de sessió al teu compte des d’una IP desconeguda. Si ets tu, si us plau introdueix el codi de seguretat a sota, en la pàgina de desafiament d’inici de sessió:'
-      further_actions: 'Si no has estat tu, si us plau canvia la contrasenya i activa l’autenticació de dos factors del teu compte. Pots fer-ho aquí:'
-      subject: Si us plau confirma l’intent d’inici de sessió
-      title: Intent d’inici de sessió
+      subject: L'arxiu està preparat per a descàrrega
+      title: Recollida de l'arxiu
+    suspicious_sign_in:
+      change_password: canvia la teva contrasenya
+      details: 'Aquí estan els detalls del inici de sessió:'
+      explanation: Hem detectat un inici de sessió del teu compte des d'una nova adreça IP.
+      further_actions_html: Si no has estat tu, et recomanem %{action} immediatament i activis l'autenticació de dos-factors per a mantenir el teu compte segur.
+      subject: S'ha accedit al teu compte des d'una adreça IP nova
+      title: Un nou inici de sessió
     warning:
+      appeal: Envia una apel·lació
+      appeal_description: Si creus que això és un error, pots enviar una apel·lació a l'equip de %{instance}.
+      categories:
+        spam: Contingut brossa
+        violation: El contingut viola les següents guies de la comunitat
       explanation:
-        disable: Mentre el teu compte estigui congelat les dades romandran intactes però no pots dur a terme cap acció fins que no estigui desbloquejat.
-        sensitive: Els fitxers multimèdia pujats i els enllaçats seran tractas com a sensibles.
-        silence: Mentre el teu compte estigui limitat només les persones que ja et segueixen veuen les teves dades en aquest servidor i pots ser exclòs de diverses llistes públiques. No obstant això, d'altres encara poden seguir-te manualment.
-        suspend: El teu compte s'ha suspès i tots els teus tuts i fitxers multimèdia penjats s'han eliminat de manera irreversible d'aquest servidor i dels servidors on tenies seguidors.
-      get_in_touch: Pots respondre a aquest correu electrònic per a contactar amb el personal de %{instance}.
-      review_server_policies: Revisa les polítiques del servidor
-      statuses: 'Concretament, per:'
+        delete_statuses: S'ha trobat que algunes de les teves publicacions violen una o més directrius de la comunitat i, per tant, han estat eliminades pels moderadors de %{instance}.
+        disable: Ja no pots utilitzar el teu compte, però el teu perfil i altres dades encara són intactes. Pots demanar una còpia de les teves dades, canviar els ajustaments del teu compte o esborrar-lo.
+        mark_statuses_as_sensitive: Algunes de les teves publicacions han estat marcades com a sensibles pels moderadors de %{instance}. Això significa que la gent necessitarà tocar els mèdia en les publicacions perquè la previsualització es mostri. Tu mateix pots marcar els teus mèdia com a sensibles quan publiquis en el futur.
+        sensitive: A partir d'ara, tots els mèdia pujats seran marcats com a sensibles i ocultats darrere d'un avís.
+        silence: Encara pots fer servir el teu compte però només la gent que ja t'està seguint veuran les teves publicacions en aquest servidor i tu podries ser exclòs de les diverses opcions de descobriment. De totes maneres altres podrien encara seguir-te manualment.
+        suspend: Ja no pots usar el teu compte i el teu perfil i altres dades ja no són accessibles. Encara pots iniciar sessió per a demanar una còpia de les teves dades fins que siguin totalment eliminades al cap de 30 dies, però es mantindran les dades bàsiques per a evitar que esquivis la suspensió.
+      reason: 'Motiu:'
+      statuses: 'Publicacions citades:'
       subject:
+        delete_statuses: Les teves publicacions de %{acct} han estat esborrades
         disable: S'ha congelat el teu compte %{acct}
+        mark_statuses_as_sensitive: Les teves publicacions de %{acct} han estat marcades com a sensibles
         none: Avís per a %{acct}
-        sensitive: El teu compte %{acct} de publicació de mèdia ha estat marcat com a sensible
+        sensitive: Els teus mèdia de %{acct} seran marcades com a sensibles a partir d'ara
         silence: El teu compte %{acct} ha estat limitat
         suspend: S'ha suspès el teu compte %{acct}
       title:
+        delete_statuses: Publicacions esborrades
         disable: Compte congelat
+        mark_statuses_as_sensitive: Publicacions marcades com a sensibles
         none: Avís
-        sensitive: Els teus mèdia han estat marcats com a sensibles
+        sensitive: Compte marcat com a sensible
         silence: Compte limitat
         suspend: Compte suspès
     welcome:
       edit_profile_action: Configura el perfil
-      edit_profile_step: Pots personalitzar el teu perfil penjant un avatar, un encapçalament, canviant el teu nom de visualització i molt més. Si prefereixes revisar els seguidors nous abans de que et puguin seguir, pots blocar el teu compte.
+      edit_profile_step: Pots personalitzar el teu perfil pujant-hi un avatar, canviant el teu nom de visualització i molt més. Si ho prefereixes, pots revisar els seguidors nous abans de que et puguin seguir.
       explanation: Aquests són alguns consells per a començar
       final_action: Comença a publicar
-      final_step: 'Comença a publicar! Fins i tot sense seguidors, els altres poden veure els teus missatges públics, per exemple, a la línia de temps local i a les etiquetes ("hashtags"). És possible que vulguis presentar-te amb l''etiqueta #introductions.'
+      final_step: 'Comença a publicar! Fins i tot sense seguidors, els altres poden veure els teus missatges públics, per exemple, a la línia de temps local i a les etiquetes. És possible que vulguis presentar-te amb l''etiqueta #introductions.'
       full_handle: El teu nom d'usuari sencer
       full_handle_hint: Això és el que has de dir als teus amics perquè puguin enviar-te missatges o seguir-te des d'un altre servidor.
-      review_preferences_action: Canviar preferències
-      review_preferences_step: Assegura't d'establir les teves preferències, com ara els correus electrònics que vols rebre o el nivell de privadesa per defecte que t'agradaria que tinguin les teves entrades. Si no tens malaltia de moviment, pots optar per habilitar la reproducció automàtica de GIF.
       subject: Et donem la benvinguda a Mastodon
-      tip_federated_timeline: La línia de temps federada és el cabal principal de la xarxa Mastodon. Però només inclou les persones a les quals els teus veïns estan subscrits, de manera que no està completa.
-      tip_following: Per defecte segueixes als administradors del servidor. Per trobar més persones interessants, consulta les línies de temps local i federada.
-      tip_local_timeline: La línia de temps local és la vista del flux de publicacions dels usuaris de %{instance}. Aquests usuaris són els teus veïns més propers!
-      tip_mobile_webapp: Si el teu navegador del mòbil t'ofereix afegir Mastodon a la teva pantalla d'inici, podràs rebre notificacions "push". Es comporta com una aplicació nativa en molts aspectes!
-      tips: Consells
       title: Benvingut a bord, %{name}!
   users:
     follow_limit_reached: No pots seguir més de %{limit} persones
-    generic_access_help_html: Problemes accedint al teu compte? Pots contactar amb %{email} per a demanar assistència
     invalid_otp_token: El codi de dos factors no és correcte
-    invalid_sign_in_token: Codi de seguretat invàlid
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
     seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
-    suspicious_sign_in_confirmation: Aparentment no has iniciat sessió des d’aquest dispositiu abans i no ho has fet des de fa cert temps per tant t’enviarem un codi de seguretat al teu correu electrònic per a confirmar que ets tu.
   verification:
     explanation_html: 'Pots <strong>verificar-te com a propietari dels enllaços a les metadades del teu perfil</strong>. Per això, el lloc web enllaçat ha de contenir un enllaç al teu perfil de Mastodon. El vincle <strong>ha de</strong> tenir l''atribut <code>rel="me"</code>. El contingut del text de l''enllaç no importa. Aquí tens un exemple:'
     verification: Verificació
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
new file mode 100644
index 000000000..0c29bb437
--- /dev/null
+++ b/config/locales/ckb.yml
@@ -0,0 +1,1103 @@
+---
+ckb:
+  about:
+    about_mastodon_html: 'تۆڕی کۆمەڵایەتی داهاتوو: هیچ ڕیکلامێک، هیچ چاودێرییەکی کۆمپانیا، دیزاینی ئەخلاقی و لامەرکەزی! خاوەنی داتاکانت بە لە ماستۆدۆن!'
+    contact_missing: سازنەکراوە
+    contact_unavailable: بوونی نییە
+    hosted_on: مەستودۆن میوانداری کراوە لە %{domain}
+    title: دەربارە
+  accounts:
+    follow: شوێن کەوە
+    followers:
+      one: شوێنکەوتوو
+      other: شوێن‌کەوتووان
+    following: شوێن‌کەوتووی
+    instance_actor_flash: ئەم ئەکاونتە ئەکتەرێکی مەجازییە کە بەکاردێت بۆ نوێنەرایەتیکردنی خودی سێرڤەرەکە نەک هیچ بەکارهێنەرێکی تاکەکەسی. بۆ مەبەستی فیدراسیۆن بەکاردێت و نابێت ڕابگیرێت.
+    last_active: دوا چالاکی
+    link_verified_on: خاوەنداریەتی ئەم لینکە لە %{date} چێک کراوە
+    nothing_here: لێرە هیچ نییە!
+    pin_errors:
+      following: تۆ دەبێت هەر ئێستا بە دوای ئەو کەسەدا بیت کە دەتەوێت پەسەندی بکەیت
+    posts:
+      one: توت
+      other: تووتەکان
+    posts_tab_heading: تووتەکان
+  admin:
+    account_actions:
+      action: ئەنجامدانی کردار
+      title: ئەنجامدانی کاری بەڕێوەبردن لە %{acct}
+    account_moderation_notes:
+      create: جێهێشتنی تێبینی
+      created_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی دروست کرا!
+      destroyed_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی لەناوچوو!
+    accounts:
+      add_email_domain_block: بلۆککردنی هەموو دۆمەینەکە
+      approve: پەسەند کردن
+      approved_msg: بەرنامەی تۆمارکردنی %{username} بۆ چوونەناوی پەسەند کرا
+      are_you_sure: دڵنیای?
+      avatar: وێنۆچکە
+      by_domain: دۆمەین
+      change_email:
+        changed_msg: ئیمەیڵ بەسەرکەوتوویی گۆڕدرا!
+        current_email: ئیمەیلی ئێستا
+        label: گۆڕینی ئیمێڵ
+        new_email: ئیمەیڵی نوێ
+        submit: گۆڕینی ئیمێڵ
+        title: گۆڕینی ئیمەیڵ بۆ %{username}
+      change_role:
+        changed_msg: ڕۆڵ بەسەرکەوتوویی گۆڕدرا!
+        label: گۆڕینی ڕۆڵ
+        no_role: ڕۆڵ نیە
+        title: ڕۆڵی %{username} بگۆڕە
+      confirm: پشتڕاستی بکەوە
+      confirmed: پشتڕاست کرا
+      confirming: پشتڕاستکردنەوە
+      custom: ڕاسپێراو
+      delete: سڕینەوەی داتا
+      deleted: سڕینەوە
+      demote: پلە نزمکرایەوە
+      destroyed_msg: دراوەکانی %{username} لە ڕیزی سڕینەوەن
+      disable: بەستن
+      disable_sign_in_token_auth: ڕەسەنایەتی نیشانەی ئیمەیڵ لەکاربخە
+      disable_two_factor_authentication: لەکارخستنی 2FA
+      disabled: بەستوو
+      display_name: ناوی پیشاندان
+      domain: دۆمەین
+      edit: دەستکاری
+      email: پۆستی ئەلکترۆنی
+      email_status: دۆخی ئیمەیڵ
+      enable: چالاک کردن
+      enable_sign_in_token_auth: ڕەسەنایەتی نیشانەی ئیمەیڵ چالاک بکە
+      enabled: چالاککراوە
+      enabled_msg: هەژمارە %{username} بە سەرکەوتوویی سنووردار کرا
+      followers: شوێنکەوتوان
+      follows: شوێنکەوتوان
+      header: سەرپەڕە
+      inbox_url: نیشانی هاتنەژوور
+      invite_request_text: هۆکارەکانی بەشداریکردن
+      invited_by: بانگهێشتکراو لە لایەن
+      ip: ئای‌پی
+      joined: ئەندام بوو لە
+      location:
+        all: هەموو
+        local: ناوخۆیی
+        remote: دوور
+        title: شوێن
+      login_status: دۆخی چوونەژوورەوە
+      media_attachments: هاوپێچی میدیا
+      memorialize: گۆڕان بە یادەوەری
+      memorialized: بیرکەوتنەوە
+      memorialized_msg: بە سەرکەوتوویی %{username} بۆ هەژمارێکی بیرەوەری گۆڕا
+      moderation:
+        active: چالاک
+        all: هەموو
+        pending: چاوەڕوان
+        silenced: سنووردار
+        suspended: ڕاگرتن
+        title: بەڕێوەبردن
+      moderation_notes: بەڕێوەبردنی تێبینیەکان
+      most_recent_activity: نوێترین چالاکی
+      most_recent_ip: نوێترین ئای پی
+      no_account_selected: هیچ هەژمارەیەک نەگۆڕاوە وەک ئەوەی هیچ یەکێک دیاری نەکراوە
+      no_limits_imposed: هیچ سنوورێک نەسەپێنرا
+      no_role_assigned: ڕۆڵ دیاری نەکراوە
+      not_subscribed: بەشدار نەبوو
+      pending: پێداچوونەوەی چاوەڕوان
+      perform_full_suspension: ڕاگرتن
+      previous_strikes: مانگرتنەکانی پێشوو
+      promote: بەرزکردنەوە
+      protocol: پرۆتۆکۆل
+      public: گشتی
+      push_subscription_expires: بەشداری PuSH بەسەر دەچێت
+      redownload: نوێکردنەوەی پرۆفایل
+      redownloaded_msg: پرۆفایلی %{username} لە بنەڕەتەوە بە سەرکەوتوویی نوێکرایەوە
+      reject: ڕەتکردنەوە
+      rejected_msg: بەرنامەی تۆمارکردنی %{username} بە سەرکەوتوویی ڕەتکرایەوە
+      remove_avatar: لابردنی وێنۆجکە
+      remove_header: سەرپەڕ لابدە
+      removed_avatar_msg: وێنەی ئەڤاتار %{username} بە سەرکەوتوویی لابرا
+      removed_header_msg: بە سەرکەوتوویی وێنەی سەرپەڕەی %{username} لابرا
+      resend_confirmation:
+        already_confirmed: ئەم بەکارهێنەرە پێشتر پشتڕاستکراوەتەوە
+        send: دووبارە ناردنی ئیمەیڵی دووپاتکردنەوە
+        success: ئیمەیڵی پشتڕاستکردنەوە بە سەرکەوتوویی نێردرا!
+      reset: ڕێکخستنەوە
+      reset_password: گەڕانەوەی تێپەڕوشە
+      resubscribe: دووبارە ئابونەبوون
+      role: ڕۆڵ
+      search: گەڕان
+      search_same_email_domain: بەکارهێنەرانی دیکە بە ئیمەیلی یەکسان
+      search_same_ip: بەکارهێنەرانی تر بەهەمان ئای پی
+      security_measures:
+        only_password: تەنها وشەی نهێنی
+        password_and_2fa: وشەی نهێنی و 2FA
+      sensitive: هەستیار
+      sensitized: وەک هەستیار نیشان کراوە
+      shared_inbox_url: بەستەری سندوقی هاوبەشکراو
+      show:
+        created_reports: گوزارشتی تۆمارکراوە
+        targeted_reports: گوزارشتکراوە لەلایەن کەسانی ترەوە
+      silence: سنوور
+      silenced: سنوورکرا
+      statuses: دۆخەکان
+      subscribe: ئابوونە
+      suspend: ڕاگرتن
+      suspended: ڕاگرتن
+      suspension_irreversible: داتای ئەم هەژمارەیە بە شێوەیەکی نائاسایی سڕاوەتەوە. دەتوانیت هەژمارەکەت ڕابخەیت بۆ ئەوەی بەکاربێت بەڵام هیچ داتایەک ناگەڕگەڕێتەوە کە پێشتر بوونی بوو.
+      suspension_reversible_hint_html: هەژمارە ڕاگیرا ، و داتاکە بەتەواوی لە %{date} لادەبرێت. تا ئەو کاتە هەژمارەکە دەتوانرێت بە بێ هیچ کاریگەریەکی خراپ بژمێردرێتەوە. ئەگەر دەتەوێت هەموو داتاکانی هەژمارەکە بسڕەوە، دەتوانیت لە خوارەوە ئەمە بکەیت.
+      title: هەژمارەکان
+      unblock_email: کردنەوەی ئیمەیڵ
+      unblocked_email_msg: بەسەرکەوتوویی ئیمەیڵی %{username} کرایەوە
+      unconfirmed_email: ئیمەیڵی پشتڕاستنەکراو
+      undo_sensitized: " هەستیار نەکردن"
+      undo_silenced: بێدەنگ ببە
+      undo_suspension: دووبارە ڕاگرتن
+      unsilenced_msg: هەژماری %{username} بە سەرکەوتوویی بێسنوور کرا
+      unsubscribe: بەتاڵکردنی ئابوونە
+      unsuspended_msg: هەژمارە %{username} بە سەرکەوتوویی ئابوونەی بەتاڵکرا
+      username: ناوی بەکارهێنەر
+      view_domain: پیشاندانی کورتەبۆ دۆمەین
+      warn: وریاکردنەوە
+      web: ماڵپەڕ
+      whitelisted: پێرستی ڕێپێدراو
+    action_logs:
+      action_types:
+        approve_appeal: پەسەندکردنی تانەدان
+        approve_user: پەسەندکردنی بەکارهێنەر
+        assigned_to_self_report: تەرخانکردنی گوزارشت
+        change_email_user: گۆڕینی ئیمەیڵ بۆ بەکارهێنەر
+        change_role_user: گۆڕینی ڕۆڵی بەکارهێنەر
+        confirm_user: دڵنیابوون لە بەکارهێنەر
+        create_account_warning: دروستکردنی ئاگاداری
+        create_announcement: دروستکردنی راگەیەندراو
+        create_canonical_email_block: دروستکردنی بلۆککردنی ئیمەیڵ
+        create_custom_emoji: دروستکردنی ئێمۆمۆجی دڵخواز
+        create_domain_allow: دروستکردنی ڕێپێدان بە دۆمەین
+        create_domain_block: دروستکردنی بلۆکی دۆمەین
+        create_email_domain_block: دروستکردنی بلۆکی دۆمەینی ئیمەیڵ
+        create_ip_block: دروستکردنی یاسای IP
+        create_unavailable_domain: دروستکردنی دۆمەینی بەردەست نییە
+        create_user_role: دروستکردنی پلە
+        demote_user: دابەزاندنی ئاستی بەکارهێنەر
+        destroy_announcement: سڕینەوەی راگەیەندراو
+        destroy_canonical_email_block: سڕینەوەی بلۆکی ئیمەیڵ
+        destroy_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
+        destroy_domain_allow: سڕینەوەی ڕێپێدان بە دۆمەین
+        destroy_domain_block: سڕینەوەی بلۆکی دۆمەین
+        destroy_email_domain_block: سڕینەوەی بلۆکی دۆمەینی ئیمەیڵ
+        destroy_instance: پاککردنەوەی دۆمەین
+        destroy_ip_block: سڕینەوەی یاسای IP
+        destroy_status: دۆخ بسڕەوە
+        destroy_unavailable_domain: دۆمەینی بەردەست نییە بسڕەوە
+        destroy_user_role: لەناوبردنی پلە
+        disable_2fa_user: لەکارخستنی 2FA
+        disable_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
+        disable_sign_in_token_auth_user: ڕەسەنایەتی نیشانەی ئیمەیڵ بۆ بەکارهێنەر لەکاربخە
+        disable_user: بەکارهێنەر لە کاربخە
+        enable_custom_emoji: ئیمۆمۆجی تایبەتمەند چالاک بکە
+        enable_sign_in_token_auth_user: ڕەسەنایەتی نیشانەی ئیمەیڵ بۆ بەکارهێنەر چالاک بکە
+        enable_user: چالاککردنی بەکارهێنەر
+        memorialize_account: هەژماری بیرکەوتنەوە
+        promote_user: بەرزکردنەوەی بەکارهێنەر
+        reject_appeal: تانەدان ڕەتبکەرەوە
+        reject_user: بەکارهێنەر ڕەت بکەرەوە
+        remove_avatar_user: لابردنی وێنۆجکە
+        reopen_report: دووبارە کردنەوەی گوزارشت
+        resend_user: دووبارە ناردنی ئیمەیڵی پشتڕاستکردنەوە
+        reset_password_user: گەڕانەوەی تێپەڕوشە
+        resolve_report: گوزارشت چارەسەربکە
+        sensitive_account: میدیاکە لە هەژمارەکەت وەک هەستیار نیشانە بکە
+        silence_account: هەژماری بێدەنگی
+        suspend_account: ڕاگرتنی هەژمارە
+        unassigned_report: گوزارشتی دیارینەکراو
+        unblock_email_account: ناونیشانی ئیمەیڵەکە بلۆک بکەرەوە
+        unsensitive_account: میدیاکە لە هەژمارەکەت وەک هەستیار نیشانە مەکە
+        unsilence_account: هەژماری بێ دەنگ
+        unsuspend_account: هەژماری هەڵنەوەستێنراو
+        update_announcement: بەڕۆژکردنەوەی راگەیەندراو
+        update_custom_emoji: بەڕۆژکردنی ئێمۆمۆجی دڵخواز
+        update_domain_block: نوێکردنەوەی بلۆکی دۆمەین
+        update_ip_block: نوێکردنەوەی یاسای IP
+        update_status: بەڕۆژکردنی دۆخ
+        update_user_role: نوێکردنەوەی پلە
+      actions:
+        update_status_html: "%{name} پۆستی نوێکراوە لەلایەن %{target}"
+      empty: هیچ لاگی کارنەدۆزرایەوە.
+      filter_by_action: فلتەر کردن بە کردار
+      filter_by_user: فلتەر کردن بە کردار
+      title: تۆماری وردبینی
+    announcements:
+      destroyed_msg: بانگەوازەکە بە سەرکەوتوویی سڕاوەتەوە!
+      edit:
+        title: بڵاوکردنەوەی راگەیەندراو
+      empty: هیچ راگەیەندراوێک نەدۆزرایەوە.
+      live: زیندوو
+      new:
+        create: دروستکردنی راگەیەندراو
+        title: ڕاگەیاندنی نوێ
+      publish: بڵاوی بکەوە
+      published_msg: بانگەوازەکە بە سەرکەوتوویی بڵاو کرایەوە!
+      scheduled_for: خشتەکراوە بۆ %{time}
+      scheduled_msg: ڕاگەیاندنی خشتەی بۆ بڵاوکردنەوە!
+      title: ڕاگه یه نراوەکان
+      unpublish: بڵاونەکردنەوە
+      unpublished_msg: بانگەواز بە سەرکەوتوویی بڵاونەکرایەوە!
+      updated_msg: بانگەوازەکە بە سەرکەوتوویی نوێکرایەوە!
+    custom_emojis:
+      assign_category: دانانی پۆلێن
+      by_domain: دۆمەین
+      copied_msg: کۆپیەکی ناوخۆیی ئیمۆجیبەکە بە سەرکەوتوویی دروست کرد
+      copy: کۆپی
+      copy_failed_msg: نهیتوانی کۆپیهکی ناوخۆیی ئهو ئیمۆجییە دروست بکات
+      create_new_category: دروستکردنی هاوپۆلی نوێ
+      created_msg: ئیمۆجی بە سەرکەوتوویی دروستکرا!
+      delete: سڕینەوە
+      destroyed_msg: ئیمۆجی بە سەرکەوتوویی بەتاڵکرا!
+      disable: لەکارخستن
+      disabled: ناچالاککراوە
+      disabled_msg: بە سەرکەوتوویی ئەو ئیمۆجییە لە کارخراوە
+      emoji: ئیمۆجی
+      enable: چالاککردن
+      enabled: چالاککراوە
+      enabled_msg: ئەو ئیمۆجییە بە سەرکەوتووانە چالاک کرا
+      image_hint: PNG یا GIF بۆ %{size}
+      list: پێرست
+      listed: پێرستکراوە
+      new:
+        title: ئیمۆجی نوێی دڵخواز زیاد بکە
+      not_permitted: تۆ ڕێگەپێدراو نین بۆ ئەنجامدانی ئەم کارە
+      overwrite: نووسینەوە
+      shortcode: کورتەکلیل
+      shortcode_hint: بەلایەنی کەمەوە ٢نووسە، تەنها نووسەکانی ئەلف و بێ و ژێرهێڵەکان
+      title: ئیمۆجی دڵخواز
+      uncategorized: هاوپۆل نەکراوە
+      unlist: بێ پێرست
+      unlisted: پێرست نەبووە
+      update_failed_msg: نه یتوانی ئه و ئیمۆجییه نوێ بکاتەوە
+      updated_msg: ئیمۆجی بە سەرکەوتوویی نوێکرایەوە!
+      upload: بارکردن
+    dashboard:
+      active_users: بەکارهێنەرانی چالاک
+      interactions: پیکداچوونەوەکان
+      media_storage: هەمارگەی میدیا
+      new_users: ئەندامی نوێ
+      opened_reports: ڕاپۆرتەکان کرانەوە
+      resolved_reports: ڕاپۆرتەکان چارەسەر کران
+      software: نەرمەکالا
+      sources: سەرچاوەی ناو تۆمارکردن
+      space: بەکارهێنانی بۆشایی
+      title: داشبۆرد
+      top_languages: زمانە چالاکەکانی سەرەوە
+      top_servers: سەرەکیترین سێرڤەرە چالاکەکان
+      website: ماڵپەڕ
+    disputes:
+      appeals:
+        empty: هیچ تانەیەک نەدۆزراوەتەوە.
+        title: تانەدان
+    domain_allows:
+      add_new: ڕێگە بە فیدراسیۆن بدە لەگەڵ دۆمەین
+      created_msg: دۆمەین بە سەرکەوتوویی رێگەی پێدرا
+      destroyed_msg: دۆمەین لە پێرستی رێگەی پێدرا لابرا
+      undo: لابردن لە پێرستی ڕێپێدراو
+    domain_blocks:
+      add_new: زیادکردنی بلۆکی دۆمەینی نوێ
+      created_msg: بلۆککردنی دۆمەین لە حاڵێ جێبەجێکردنە
+      destroyed_msg: بلۆکی دۆمەین هەڵوەشاوەتەوە
+      domain: دۆمەین
+      edit: دەستکاری بلۆکی دۆمەینی نوێ
+      existing_domain_block_html: ئێوە پێشتر سنووری دژوارتنا لە سەر%{name} جێبەجێکردووە، سەرەتا دەبێ <a href="%{unblock_url}">بلۆک هەڵوەشێنەوە</a>.
+      new:
+        create: دروستکردنی بلۆک
+        hint: بلۆکی دۆمەین رێگری لە دروستکردنی هەژمارەی چوونەژوورەوە لە بنکەی زانیارێکان ناکات ، بەڵکو بە شێوەیەکی دووبارە و خۆکارانە رێوشێوازی پێشکەوتوو تایبەت لەسەر ئەو هەژمارانە جێبەجێ دەکات.
+        severity:
+          noop: هیچ
+          suspend: ڕاگرتن
+        title: بلۆکی دۆمەینی نوێ
+      obfuscate: ناوی دۆمەینەکە تەمومژاوی بکە
+      obfuscate_hint: ناوی دۆمەینەکە لە لیستی ریکلامەکاندا بەشێکی تەمومژاوی بکە لیستی سنووردارکردنی دۆمەینەکە چالاک کراوە
+      private_comment: لێدوانی تایبەت
+      private_comment_hint: لێدوان دەربارەی سنوورداری ئەم دۆمەینە بۆ بەکارهێنانی ناوخۆیی لەلایەن مۆدەرەکان.
+      public_comment: سەرنجی گشتی
+      public_comment_hint: لێدوان دەربارەی سنوورداری ئەم دۆمەینە بۆ گشتی، ئەگەر بڵاوکردنەوەی لیستی سنوورداری دۆمەینەکە چالاک بکرێت.
+      reject_media: ڕەتکردنەوەی فایلەکانی میدیا
+      reject_media_hint: پەڕگە میدیای پاشکەوتکراو بە شێوەێکی ناوخۆیی لابدە و دابەزین لە داهاتوو ڕەتدەکاتەوە. ناپەیوەندیدار ە بۆ ڕاگرتن
+      reject_reports: گوزارشتەکان ڕەت بکەوە
+      reject_reports_hint: پشتگوێ خستنی هەموو گوزارشتەکان کە دێن لەم دۆمەینە. ناپەیوەندیدارە بۆ ڕاگرتن
+      undo: گەڕانەوەی بلۆکی دۆمەینی
+      view: دیتنی بلۆکی دۆمەینی
+    email_domain_blocks:
+      add_new: زیادکردنی نوێ
+      created_msg: بە سەرکەوتوویی دۆمەینی ئیمەیڵ بلۆک کرا
+      delete: سڕینەوە
+      dns:
+        types:
+          mx: تۆماری MX
+      domain: دۆمەین
+      new:
+        create: زیادکردنی دۆمەین
+        resolve: چارەسەرکردنی دۆمەین
+        title: بلۆککردنی دۆمەینی ئیمەیڵی نوێ
+      no_email_domain_block_selected: هیچ بلۆکێکی دۆمەینی ئیمەیڵ نەگۆڕدرا چونکە هیچیان هەڵنەبژێردرابوون
+      resolved_dns_records_hint_html: ناوی دۆمەینەکە چارەسەر دەبێت بۆ ئەم دۆمەینانەی خوارەوەی MX، کە لە کۆتاییدا بەرپرسیارن لە وەرگرتنی ئیمەیڵ. ڕێگریکردن لە دۆمەینی MX ڕێگری دەکات لە ناو تۆمارکردن لە هەر ناونیشانێکی ئیمەیڵەوە کە هەمان دۆمەینی MX بەکاردەهێنێت، تەنانەت ئەگەر ناوی دۆمەینی بینراو جیاواز بێت. <strong>ئاگاداربە کە دابینکەرانی ئیمەیڵی سەرەکی بلۆک نەکەیت.</strong>
+      resolved_through_html: لە ڕێگەی %{domain} چارەسەر دەکرێت
+      title: دۆمەینە بلۆککراوەکانی ئیمەیڵ
+    follow_recommendations:
+      description_html: "<strong>پەیڕەوکردنی پێشنیارەکان یارمەتی بەکارهێنەرانی نوێ دەدەن بە خێرایی ناوەڕۆکی سەرنجڕاکێش بدۆزنەوە</strong>. کاتێک بەکارهێنەرێک ئەوەندە کارلێکی لەگەڵ کەسانی دیکە نەکردووە کە پێشنیاری بەدواداچوونی کەسی پێکبهێنێت، لەبری ئەوە ئەم ئەکاونتانە پێشنیار دەکرێن. ئەوان ڕۆژانە لە تێکەڵەیەک لە ئەکاونتەکانەوە دووبارە حیساب دەکرێنەوە کە بەرزترین پەیوەندییەکانی ئەم دواییە و بەرزترین ژمارەی فۆڵۆوەری ناوخۆیی بۆ زمانێکی دیاریکراویان هەیە."
+      language: بۆ زمان
+      status: دۆخ
+      suppress: سەرکوتکردنی پێشنیاری شوێنکەوتن
+      suppressed: سەرکوت کراوە
+      title: پێشنیارەکان جێبەجێ بکە
+      unsuppress: گەڕاندنەوە بەدواداچوون بۆ پێشنیارەکان
+    instances:
+      availability:
+        failure_threshold_reached: ئاستی شکست گەیشتە %{date}.
+        no_failures_recorded: هیچ شکستێک لە تۆماردا نییە.
+        title: بەردەست بوونی
+        warning: دوایین هەوڵ بۆ پەیوەندیکردن بەم سێرڤەرە سەرکەوتوو نەبوو
+      back_to_all: هەمووی
+      back_to_limited: سنووردار
+      back_to_warning: ئاگاداری
+      by_domain: دۆمەین
+      confirm_purge: ئایا دڵنیای کە دەتەوێت بۆ هەمیشە زانیارییەکان لەم دۆمەینە بسڕیتەوە?
+      content_policies:
+        comment: تێبینی ناوخۆیی
+        description_html: دەتوانیت سیاسەتی ناوەڕۆک پێناسە بکەیت کە بۆ هەموو ئەکاونتەکان لەم دۆمەین و هەر یەکێک لە دۆمەینەکانی لاوەکییەوە جێبەجێ دەکرێن.
+        policies:
+          reject_media: میدیا ڕەت بکەرەوە
+          reject_reports: گوزارشتەکان ڕەت بکەوە
+          silence: سنوور
+          suspend: ڕاگرتن
+        policy: سیاسەت
+        reason: هۆکاری گشتی
+        title: سیاسەتەکانی ناوەڕۆک
+      dashboard:
+        instance_accounts_dimension: زۆرترین هەژمارەی بەدواداچوو
+        instance_accounts_measure: هەژمارەی هەڵگیراوەکان
+        instance_followers_measure: شوێنکەوتووانمان لەوێ
+        instance_follows_measure: شوێنکەوتووانمان لێرە
+        instance_languages_dimension: زمانە سەرەکییەکان
+        instance_media_attachments_measure: هاوپێچەکانی میدیای هەڵگیراو
+        instance_reports_measure: گوزارشت له باره یان
+        instance_statuses_measure: پۆستە هەڵگیراوەکان
+      delivery:
+        all: هەمووی
+        clear: هەڵەکانی گەیاندن پاک بکەرەوە
+        failing: شکستهێنان
+        restart: دووبارە دەستپێکردنەوەی گەیاندن
+        stop: گەیاندن بوەستێنە
+        unavailable: بەردەست نییە
+      delivery_available: گەیاندن بەردەستە
+      delivery_error_days: ڕۆژانی هەڵەی گەیاندن
+      delivery_error_hint: ئەگەر گەیاندن بۆ %{count} ڕۆژەکان نەتوانرێت، بە شێوەیەکی ئۆتۆماتیکی وەک ناگەیاندن نیشان دەدرێت.
+      destroyed_msg: ئێستا داتا لە %{domain} لە ڕیزدا دانراوە بۆ سڕینەوەی نزیک.
+      empty: هیچ دۆمەینێک نەدۆزرایەوە.
+      known_accounts:
+        one: "%{count} ئەژمێری ناسراو"
+        other: "%{count} ئەژمێری ناسراو"
+      moderation:
+        all: هەموو
+        limited: سنووردار
+        title: بەڕێوەبردن
+      private_comment: لێدوانی تایبەت
+      public_comment: سەرنجی گشتی
+      purge: پاککردنەوە
+      purge_description_html: ئەگەر پێت وایە ئەم دۆمەینە بۆ هەمیشە ئۆفلاینە، دەتوانیت هەموو تۆمارەکانی ئەکاونت و زانیارییە پەیوەندیدارەکانی ئەم دۆمەینە لە هەڵگرتنەکەت بسڕیتەوە. لەوانەیە ئەمە ماوەیەکی پێ بچێت.
+      title: پەیوەندی نێوان ڕاژە
+      total_blocked_by_us: لەلایەن ئێمە بەربەست کراوە
+      total_followed_by_them: شوێنمان دەکەون
+      total_followed_by_us: شوێنیان کەوتین
+      total_reported: گوزارشت له باره یان
+      total_storage: هاوپێچی میدیا
+      totals_time_period_hint_html: ئەو کۆی گشتیانەی لە خوارەوە پیشان دراون داتای هەموو کاتەکان لەخۆدەگرن.
+    invites:
+      deactivate_all: هەموو لەکارخستنی
+      filter:
+        all: هەموو
+        available: بەردەستە
+        expired: بەسەرچووە
+        title: پاڵاوتن
+      title: بانگهێشتەکان
+    ip_blocks:
+      add_new: دروستکردنی یاسا
+      created_msg: سەرکەوتووانە یاسای نوێی IP زیادکرا
+      delete: سڕینەوە
+      expires_in:
+        '1209600': ٢ هەفتە
+        '15778476': ٦ مانگ
+        '2629746': ١ مانگ
+        '31556952': ١ ساڵ
+        '86400': ١ ڕۆژ
+        '94670856': ٣ ساڵ
+      new:
+        title: دروستکردنی یاسای نوێی IP
+      no_ip_block_selected: هیچ ڕێسایەکی IP نەگۆڕدرا وەک ئەوەی هیچ کامیان دەستنیشان نەکران
+      title: یاساکانی IP
+    relationships:
+      title: پەیوەنیەکان %{acct}
+    relays:
+      add_new: زیادکردنی گواستنەوەی نوێ
+      delete: سڕینەوە
+      description_html: دانەیەکی <strong>ڕێڵەی نێو ڕاژەییە(federation relay) کە قەبارەیەکی فرەی لە تووتە گشتییەکان لە نێو ڕاژە هاوبەشەکان و ئابوونەکان دەگوازێتەوە <strong>رێڵە یارمەتی بە ڕاژە بچکۆلەو مامناوە ندییەکان دەدا کە بابەتی فرەتر پەیدا بکەن</strong> گەر ڕێڵە نەبێت، ئەم بابەتە گشتییانە تەنها کاتێک پەیدا دەبن کە بە کارهێنەرانی ناوخۆیی خۆیان شوێنکەوتووی بەکارهێنەران لە سەر ڕاژەکانی دیکە بن.
+      disable: لەکارخستن
+      disabled: ناچالاککراوە
+      enable: چالاککراوە
+      enable_hint: کاتێک چالاک کرا، ڕاژەکارەکەت بەشداری دەکات لە هەموو توتەکانی گشتی لەم گواستنەوەیە، و دەست دەکات بە ناردنی توتی گشتی ئەم ڕاژەیە.
+      enabled: چالاککراوە
+      inbox_url: نیشانەی URL
+      pending: چاوەڕێی پەسەندکردنی ڕێلەی
+      save_and_enable: پاشکەوتکردن و چالاککردن
+      setup: دامەزراندنی ڕێڵەی پەیوەندی
+      signatures_not_enabled: ڕیلەکان بە دروستی کارناکات لە کاتێکدا دۆخی پارێزراو یان دۆخی سنوورداری گشتی چالاک کراوە
+      status: دۆخ
+      title: ڕێڵەکان
+    report_notes:
+      created_msg: تێبینی ڕاپۆرت کردن بە سەرکەوتوویی دروست کرا!
+      destroyed_msg: تێبینی گوزارشت بە سەرکەوتوویی سڕاوەتەوە!
+    reports:
+      account:
+        notes:
+          one: "%{count} یاداشت"
+          other: "%{count} تێبینی"
+      action_log: لۆگی وردبینی
+      action_taken_by: کردەوە لە لایەن
+      actions:
+        delete_description_html: ئەو پۆستانەی کە ڕاپۆرت کراون دەسڕدرێنەوە و مانگرتنێک تۆمار دەکرێت بۆ ئەوەی یارمەتیت بدات لەسەر پێشێلکارییەکانی داهاتوو لەلایەن هەمان ئەکاونتەوە زیاد بکەیت.
+        mark_as_sensitive_description_html: میدیاکان لە پۆستە ڕاپۆرتکراوەکاندا وەک هەستیار نیشانە دەکرێن و مانگرتنێک تۆمار دەکرێت بۆ ئەوەی یارمەتیت بدات لەسەر پێشێلکارییەکانی داهاتوو لەلایەن هەمان ئەکاونتەوە زیاد بکەیت.
+        other_description_html: بژاردەی زیاتر ببینە بۆ کۆنترۆڵکردنی هەڵسوکەوتی ئەکاونتەکە و خۆکارکردنی پەیوەندی بۆ ئەژمێری ڕاپۆرتکراو.
+        resolve_description_html: هیچ ئیجرائاتێک لە دژی ئەو حسابە ڕاپۆرت کراوە ناگیرێتەبەر، هیچ مانگرتنێک تۆمار ناکرێت، ڕاپۆرتەکەش دادەخرێت.
+        silence_description_html: پرۆفایلەکە تەنها بۆ ئەو کەسانە دیار دەبێت کە پێشتر فۆڵۆوی دەکەن یان بە دەست سەیری دەکەن، ئەمەش گەیشتنەکەی بە توندی سنووردار دەکات. هەمیشە دەتوانرێت بگەڕێندرێتەوە.
+        suspend_description_html: پرۆفایلەکە و هەموو ناوەڕۆکەکانی دەستڕاگەیشتنیان پێناگات تا لە کۆتاییدا دەسڕدرێتەوە. کارلێککردن لەگەڵ ئەکاونتەکەدا مەحاڵ دەبێت. لە ماوەی ٣٠ ڕۆژدا دەگەڕێتەوە.
+      actions_description_html: بڕیار بدە کام رێوشوێن بگیرێتەبەر بۆ چارەسەرکردنی ئەم راپۆرتە. ئەگەر تۆ ڕێوشوێنی سزادان لە دژی ئەژمێری ڕاپۆرتکراو بگریتەبەر، ئاگادارکردنەوەیەکی ئیمەیڵیان بۆ دەنێردرێت، تەنها کاتێک نەبێت کە پۆلی <strong>سپام</strong> هەڵبژێردرابێت.
+      add_to_report: زیاتر زیاد بکە بۆ ڕاپۆرت
+      are_you_sure: دڵنیای?
+      assign_to_self: دیاریکردن بۆ من
+      assigned: بەڕێوەبەری بەرپرس
+      by_target_domain: دۆمەینی هەژمارەی گوزارشتدراو
+      category: جۆر
+      category_description_html: هۆکاری ڕاپۆرتکردنی ئەم ئەکاونتە و/یان ناوەڕۆکە لە پەیوەندی لەگەڵ ئەکاونتی ڕاپۆرتکراودا ئاماژەی پێدەکرێت
+      comment:
+        none: هیچ
+      comment_description_html: 'بۆ پێدانی زانیاری زیاتر %{name} نووسیویەتی:'
+      created_at: گوزارشتکرا
+      delete_and_resolve: پۆستەکان بسڕەوە
+      forwarded: پێشکەش دەکرێت
+      forwarded_to: پێشکەش دەکرێت بۆ %{domain}
+      mark_as_resolved: نیشانەی بکە وەک چارەسەرکراو
+      mark_as_sensitive: نیشانەکردن وەک هەستیار
+      mark_as_unresolved: نیشانەکردن وەک چارەسەرنەکراوە
+      no_one_assigned: هیچکەس
+      notes:
+        create: زیادکردنی تێبینی
+        create_and_resolve: چارەسەر کردن لەگەڵ تێبینی
+        create_and_unresolve: دووبارە کردنەوەی بە تێبینی
+        delete: سڕینەوە
+        placeholder: باسی ئەو کردارانە بکە کە ئەنجام دراون، یان هەر نوێکردنەوەیەکی پەیوەندیداری ت...
+        title: تێبینی
+      notes_description_html: بینین و تێبینی بۆ بەڕێوەبەرانی تر و خودی داهاتووتان بەجێبهێڵە
+      quick_actions_description_html: 'کارێکی خێرا ئەنجام بدە یان بچۆرە خوارەوە بۆ بینینی ناوەڕۆکی ڕاپۆرتکراو:'
+      remote_user_placeholder: بەکارهێنەری دوور لە %{instance}
+      reopen: دووبارە کردنەوەی گوزارشت
+      report: 'گوزارشت #%{id}'
+      reported_account: گوزارشتی هەژمارە
+      reported_by: گوزارشت لە لایەن
+      resolved: چارەسەرکرا
+      resolved_msg: گوزارشتکردن بە سەرکەوتوویی چارەسەر کرا!
+      skip_to_actions: باز بدە بۆ کردارەکان
+      status: دۆخ
+      statuses: ناوەڕۆکی ڕاپۆرتکراو
+      statuses_description_html: ناوەڕۆکی توڕەکەر لە پەیوەندی لەگەڵ ئەکاونتی ڕاپۆرتکراودا ئاماژەی پێدەکرێت
+      target_origin: سەرچاوەی ئەکاونتی ڕاپۆرتکراو
+      title: گوزارشتکرا
+      unassign: دیارینەکراوە
+      unresolved: چارەسەر نەکراوە
+      updated_at: نوێکرایەوە
+      view_profile: نیشاندانی پڕۆفایل
+    rules:
+      add_new: یاسا زیاد بکە
+      delete: سڕینەوە
+      description_html: لە کاتێکدا زۆربەیان بانگەشەی ئەوە دەکەن کە مەرجەکانی خزمەتگوزارییان خوێندووەتەوە و ڕازین، بەزۆری خەڵک تا دوای سەرهەڵدانی کێشەیەک ناخوێننەوە. <strong>ئاسانتر بکە بۆ بینینی یاساکانی سێرڤەرەکەت بە چاوێک بە دابینکردنی لە لیستی خاڵە فیشەکییە تەختەکاندا.</strong> هەوڵبدە یاسا تاکەکەسییەکان کورت و سادە بن، بەڵام هەوڵبدە دابەشیان نەکەیت بۆ چەندین بابەتی جیاواز.
+      edit: یاسای دەستکاریکردن
+      empty: هێشتا هیچ یاسایەکی سێرڤەر پێناسە نەکراوە.
+      title: یاساکانی سێرڤەر
+    settings:
+      domain_blocks:
+        all: بۆ هەموو کەسێک
+        disabled: بۆ هیچ کەسێک
+        users: بۆ چوونە ژوورەوەی بەکارهێنەرانی ناوخۆ
+      registrations_mode:
+        modes:
+          approved: پەسەندکردنی داواکراو بۆ ناوتۆمارکردن
+          none: کەس ناتوانێت خۆی تۆمار بکات
+          open: هەر کەسێک دەتوانێت خۆی تۆمار بکات
+    site_uploads:
+      delete: سڕینەوەی فایلی بارکراو
+      destroyed_msg: بارکردنی ماڵپەڕ بە سەرکەوتوویی سڕدراوەتەوە!
+    statuses:
+      back_to_account: گەڕانەوە بۆ لاپەڕەی هەژمارە
+      deleted: سڕینەوە
+      media:
+        title: میدیا
+      no_status_selected: هیچ دۆخیک نەگۆڕاوە وەک ئەوەی هیچ بارێک دەستنیشان نەکراوە
+      title: دۆخی ئەژمێر
+      with_media: بە میدیا
+    tags:
+      review: پێداچوونەوەی دۆخ
+      updated_msg: ڕێکخستنی هاشتاگ بە سەرکەوتوویی نوێکرایەوە
+    title: بەڕێوەبەر
+    warning_presets:
+      add_new: زیادکردنی نوێ
+      delete: سڕینەوە
+      edit_preset: دەستکاریکردنی ئاگاداری پێشگریمان
+      title: بەڕێوەبردنی ئاگادارکردنەوە پێش‌سازدان
+  admin_mailer:
+    new_pending_account:
+      body: وردەکاریهەژمارە نوێیەکە لە خوارەوەیە. دەتوانیت ئەم نەرمەکالا پەسەند بکەیت یان ڕەت بکەیتەوە.
+      subject: هەژمارەیەک نوێ بۆ پێداچوونەوە لەسەر %{instance} (%{username})
+    new_report:
+      body: بەکارهێنەری %{reporter} گوزارشی لە بەکارهینەری%{target} دا
+      body_remote: کەسێک لە %{domain} گوزارشتی %{target} ناردووە
+      subject: گوزارشتێکی نوی لە %{instance} (#%{id})
+  aliases:
+    add_new: دروستکردنی ناوی ساختە
+    created_msg: نازناوێکی نوێیان سەرکەوتووانە دروستکرد. ئێستا دەتوانیت دەست بە گواستنەوە کەیت لە هەژمێرە کۆنەکەت.
+    deleted_msg: سەرکەوتووانە نازناوەکان لابدە. گواستنەوە لەو هەژمارەوە بۆ ئەم کەسە چیتر نابێت.
+    empty: هیچ نازناوێکت نیە.
+    hint_html: ئەگەر دەتەوێت لە هەژمارەیەکی ترەوە بگوێزریتەوە بۆ ئەم هەژمارە، لێرەدا دەتوانیت نازناوێک دروست بکەیت، پێش ئەوەی ئەوە بەردەوام بیت لە گواستنەوەی لە هەژمارە کۆنەکە بۆ ئەم هەژمارە پێویستە. ئەم کردەوەیە خۆی لە خۆیدا <strong>بێ زەرە و ناگەڕێتەوە</strong><strong>گواستنەوەی لە هەژمارەی کۆنە بۆ هەژمارەی نوێ دەستی پێکردووە</strong>.
+    remove: سڕینەوەی پەیوەندی ناز ناو
+  appearance:
+    advanced_web_interface: روخساری پێشکەوتوو
+    advanced_web_interface_hint: 'ئەگەر دەتەوێت پانی شاشەکە بەکاربێنیت، دەتوانی بە یارمەتی ڕووکاری پێشکەوتوو چەندین ستوونی جیاواز ڕێکبخەیت بۆ بینینی زانیاری زیاتر لە هەمان کات کە دەتەوێت بیبینیت: نووسراوەکانی نووسەرانی دیکە، ئاگانامەکان، پێرستی نووسراوەکانی هەموو شوێنێک، وە هەر ژمارەیەک لە لیستەکان و هاشتاگەکان.'
+    animations_and_accessibility: ئەنیمەیشن و توانایی دەستپێگەیشتن
+    confirmation_dialogs: پەیامەکانی پەسەندکراو
+    discovery: دۆزینەوە
+    localization:
+      body: ماستۆدۆن لەلایەن خۆبەخشەوە وەردەگێڕێت.
+      guide_link_text: هەموو کەسێک دەتوانێت بەشداری بکات.
+    sensitive_content: ناوەڕۆکی هەستیار
+    toot_layout: لۆی توت
+  application_mailer:
+    notification_preferences: گۆڕینی پەسەندکراوەکانی ئیمەیڵ
+    salutation: "%{name},"
+    settings: 'گۆڕینی پەسەندکراوەکانی ئیمەیڵ: %{link}'
+    view: 'نیشاندان:'
+    view_profile: پرۆفایل نیشان بدە
+    view_status: پیشاندانی دۆخ
+  applications:
+    created: بەرنامە بە سەرکەوتوویی دروست کرا
+    destroyed: بەرنامە بە سەرکەوتوویی سڕدراوەتەوە
+    regenerate_token: دووبارە دروستکردنەوەی نیشانەی چوونە ژوورەوە
+    token_regenerated: کۆدی دەستپێگەیشتن بە سەرکەوتوویی دروستکرا
+    warning: زۆر ئاگاداربە لەم داتایە. هەرگیز لەگەڵ کەس دا هاوبەشی مەکە!
+    your_token: کۆدی دەستپێگەیشتنی ئێوە
+  auth:
+    change_password: تێپەڕوشە
+    delete_account: سڕینەوەی هەژمارە
+    delete_account_html: گەر هەرەکتە هەژمارەکەت بسڕیتەوە، لە <a href="%{path}">لەم قوناغانە</a> بڕۆیتە پێشەوە. داوای پەسەند کردنتان لێدەگیرێت.
+    description:
+      prefix_invited_by_user: "@%{name} بانگت دەکات بۆ پەیوەندیکردن بەم ڕاژەی ماستۆدۆن!"
+      prefix_sign_up: ئەمڕۆ خۆت تۆمار بکە لە ماستۆدۆن!
+      suffix: بە هەژمارەیەک، دەتوانیت شوێن هەژمارەکانی دیکە بکەویت، نوێکردنەوەکان بڵاوبکەوە و نامە لەگەڵ بەکارهێنەران لە هەر ڕاژەیەکی ماستۆدۆن و زیاتر بگۆڕیتەوە!
+    didnt_get_confirmation: ڕێنماییەکانی دڵنیاکردنەوەت پێنەدرا?
+    dont_have_your_security_key: کلیلی ئاسایشت نیە?
+    forgot_password: تێپەڕوشەکەت لەبیر چووە?
+    invalid_reset_password_token: وشەی نهێنی دووبارە ڕێکبخەوە دروست نیە یان بەسەرچووە. تکایە داوایەکی نوێ بکە.
+    link_to_otp: کۆدی دوو فاکتەر لە تەلەفۆنەکەت یان کۆدی چاککردنەوە تێبنووسە
+    link_to_webauth: بەکارهێنانی ئامێری کلیلی پاراستن
+    log_in_with: بڕۆ ژوورەوە ڵەگەڵ
+    login: چوونەژوورەوە
+    logout: چوونەدەرەوە
+    migrate_account: گواستنەوە بۆ ئەژمێرێکی تر
+    migrate_account_html: ئەگەر دەتەوێت ئەم هەژمارە دووبارە ئاڕاستە بکەیت بۆ ئەژمێرێکی تر، دەتوانیت <href="%{path}"> کرتەیەک لێرە بکەی </a>.
+    or_log_in_with: یان چوونە ژوورەوە بە
+    providers:
+      cas: CAS
+      saml: SAML
+    register: خۆ تۆمارکردن
+    registration_closed: "%{instance} ئەندامانی نوێ قبووڵ ناکات"
+    resend_confirmation: دووبارە ناردنی ڕێنماییەکانی دووپاتکردنەوە
+    reset_password: گەڕانەوەی تێپەڕوشە
+    security: ئاسایش
+    set_new_password: سازدانی تێپەڕوشەی نوێ
+    setup:
+      email_below_hint_html: ئەگەر ناونیشانی ئیمەیڵی خوارەوە نادروستە، دەتوانیت لێرە بیگۆڕیت و ئیمەیڵێکی پشتڕاستکردنەوەی نوێ وەربگۆڕیت.
+      email_settings_hint_html: ئیمەیڵی پشتڕاستکردنەوە کە نێردرا بۆ %{email}. ئەگەر ناونیشانی ئیمەیڵ ڕاست نەبوو، دەتوانیت لە ڕێکبەندەکانی هەژمارەکەت بیگۆڕیت.
+      title: دامەزراندن
+    status:
+      account_status: دۆخی هەژمارە
+      confirming: چاوەڕوانی دڵنیاکردنەوەی ئیمەیڵ بۆ تەواوکردن.
+      functional: هەژمارەکەت بەتەواوی کاردەکات.
+      pending: ئەپلیکەیشەنەکەت چاوەڕوانی پێداچوونەوەیە لەلایەن ستافەکەمانەوە. لەوانەیە ئەمە هەندێک کاتی بخایەنێت ئەگەر ئەۆپەکەت پەسەند کرا، ئیمەیڵت پێدەگات.
+      redirecting_to: هەژمارەکەت ناچالاکە لەبەرئەوەی ئێستا دووبارە ئاڕاستەدەکرێتەوە بۆ %{acct}.
+      view_strikes: بینینی لێدانەکانی ڕابردوو لە دژی ئەکاونتەکەت
+    too_fast: فۆڕم زۆر خێرا پێشکەش کراوە، دووبارە هەوڵبدەرەوە.
+    use_security_key: کلیلی ئاسایش بەکاربهێنە
+  authorize_follow:
+    already_following: ئێوە ئێستا شوێن کەوتووی ئەم هەژمارەیەی
+    already_requested: تۆ پێشتر داواکاری بەدواداچوت ناردوە بۆ ئەو هەژمارە
+    error: بەداخەوە هەڵەیەک هەبوو لە کاتی گەڕان بەدوای ئەو هەژمارەیە
+    follow: شوێن کەوە
+    follow_request: 'تۆ داواکاری شوێنکەوتنت ناردووە بۆ:'
+    following: 'ئەنجام بوو! تۆ ئێستا بەدوای ئەم بەکارهێنەرە دەکەویت:'
+    post_follow:
+      close: یان، دەتوانیت ئەم پەنجەرەیە دابخەیت.
+      return: پرۆفایلی بەکارهێنەر نیشان بدە
+      web: بڕۆ بۆ وێب
+    title: دوای %{acct} بکەوە
+  challenge:
+    confirm: بەردەوام بە
+    hint_html: "<strong>خاڵ:</strong> ئیمە لە کاتژمێری داهاتوو تێپەروشەت لێداوا ناکەین."
+    invalid_password: تێپەروشە دروست نیە
+    prompt: دڵنیابوون لە نهێنوشە بۆ بەردەوامبوون
+  crypto:
+    errors:
+      invalid_key: کلیلی باوڕپێکراو Ed25519 یان Curve25519 دروست نییە
+      invalid_signature: واژووی Ed25519 بڕوادار نییە
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}ک"
+      about_x_months: "%{count}ما"
+      about_x_years: "%{count}س"
+      almost_x_years: "%{count}س"
+      half_a_minute: ئێستا
+      less_than_x_minutes: "%{count}م"
+      less_than_x_seconds: ئێستا
+      over_x_years: "%{count}س"
+      x_days: "%{count}ڕ"
+      x_minutes: "%{count}خ"
+      x_months: "%{count}ما"
+      x_seconds: "%{count}چ"
+  deletes:
+    challenge_not_passed: ئەو زانیاریانەی تێنووست کردووە ڕاست نەبوو
+    confirm_password: تێپەڕوشەی ئێستات تێبنووسە بۆ سەلماندنی ناسنامەکەت
+    confirm_username: ناوی بەکارهێنەرت تێبنووسە بۆ دڵنیابوون لە کردارەکە
+    proceed: سڕینەوەی هەژمارە
+    success_msg: هەژمارەکەت بە سەرکەوتوویی سڕرایەوە
+    warning:
+      before: 'پێش بەردەوام بوون، تکایە ئەم تێبینیانە بە وردی بخوێننەوە:'
+      caches: وادیارە ئەو ناوەرۆکە کە ڕاژەکانی دیکە پاشکەوتیان کردووە بمینێتەوە
+      data_removal: بابەتەکانت و داتاکانی تر بە هەمیشەیی لادەبرێن
+      email_change_html: دەتوانی <a href="%{path}"> ناونیشانی ئیمەیڵەکەت بگۆڕیت</a> بەبێ سڕینەوەی هەژمارەکەت
+      email_contact_html: گەر ئیمەیل نەگەیشتووە بۆ داوای یارمەتی پەیامێک بنێرە بۆ <a href="mailto:%{email}">%{email}</a> پیغام دهید
+      email_reconfirmation_html: ئەگەر ئیمەیڵی پشتڕاستکردنەوەت پێنەگەشتووە، دەتوانیت <a href="%{path}"> دووبارە داوای لێبکە</a>
+      irreversible: ناتوانیت هەژمارەکەت بگەڕێنیتەوە یان کارا بکەیتەوە
+      more_details_html: بۆ زانیاری زیاتر، <a href="%{terms_path}"> پاراستنی نهێنیەکان</a> ببینە.
+      username_available: ناوی تێپەڕبوونت دووبارە بەردەست دەبێت
+      username_unavailable: ناوی تێپەڕبوونت بەردەست نییە
+  disputes:
+    strikes:
+      title_actions:
+        none: ئاگاداری
+  domain_validator:
+    invalid_domain: ناوی دۆمەین بڕوادار نییە
+  errors:
+    '400': داواکاریەکەی کە پێشکەشت کردووە نادروستە یان نەیپێکا.
+    '403': تۆ مۆڵەتت نیە بۆ بینینی ئەم لاپەڕەیە.
+    '404': ئەو لاپەڕەیەی بەدوای دەگەڕێی لێرە نیە.
+    '406': ئەم پەڕەیە لە فۆرماتی داواکراودا بەردەست نییە.
+    '410': ئەو لاپەڕەیەی بەدوای دا دەگەڕایت چیتر لێرە بوونی نیە.
+    '422':
+      content: سەلماندنەکەی ئاسایش سەرکەوتوو نەبوو. تۆ بلۆکی کۆکیز دەکەیت?
+      title: سەلماندنەکەی ئاسایش سەرکەوتوو نەبوو
+    '429': داواکاری زۆر
+    '500':
+      content: داوای لێبوردن دەکەین، بەڵام لە کۆتاییەکەماندا. شتێک هەڵە ڕویداوە.
+      title: ئەم لاپەڕەیە ڕاست نییە
+    '503': ناتوانرێت پەڕەکە خزمەت بکرێت بەهۆی شکستی ڕاژەیەکی کاتی.
+    noscript_html: بۆ بەکارهێنانی بەرنامەی وێبی ماستۆدۆن، تکایە جاڤاسکریپت بەتوانا بکە. لە جیاتی ئەوە، یەکێک لە < href="%{apps_path}">ئەپێکی ماستۆدۆن</a>بەکارببە.
+  existing_username_validator:
+    not_found: بەکارهێنەرێک بەم هەژمارەی بەکارهێنەرە لەم ڕاژە پەیدا نەبوو
+    not_found_multiple: نەیتوانی %{usernames} بدۆزێتەوە
+  exports:
+    archive_takeout:
+      date: بەروار
+      download: داگرتنی ئەرشیفەکەت
+      hint_html: دەتوانیت داوای ئەرشیفی <strong> نووسراوە و میدیای بارکراوەی خۆت </strong> بکەی. داتای هەناردەکراو لە فۆرماتی ActivityPub دەبێت، دەخوێنرێتەوە لەلایەن هەر نەرمەکالایەکی گونجاو. دەتوانیت هەموو ٧ ڕۆژ جارێک داوای ئەرشیفێکەت بکەیت.
+      in_progress: خەریکی کۆ کردنەوەی ئەرشیڤەکەت...
+      request: داوای ئەرشیفەکەت بکە
+      size: قەبارە
+    blocks: تۆ بلۆک دەکەیت
+    bookmarks: نیشانکراوەکان
+    domain_blocks: دۆمەین قەپاتکرا
+    lists: لیستەکان
+    mutes: هەژمارە بێدەنگ کراوە
+    storage: هەمارگەی میدیا
+  featured_tags:
+    add_new: زیادکردنی نوێ
+    errors:
+      limit: ئێوە ژمارەی بڕی ڕێگەپێدراوەی هاشتاگت هەیە
+    hint_html: "<strong> هاشتاگی تایبەت چییە؟</strong> بە شێوەیەکی دیار نیشان دەدرێت لەسەر پرۆفایلی گشتی و ڕێگە بە خەڵک دەدات بۆ گەڕان لە نووسراوە گشتیەکانت بە تایبەتی لەژێر ئەو هاشتاگە. ئامرازێکی زۆر باشن بۆ پاراستنی کاری داهێنەرانە یان پڕۆژەی درێژخایەنی ئێوە."
+  filters:
+    contexts:
+      account: پرۆفایلەکان
+      home: ماڵەوە
+      notifications: ئاگادارییەکان
+      public: پێرستی گشتی نووسراوەکان
+      thread: گفتوگۆکان
+    edit:
+      title: دەستکاری فلتەر
+    errors:
+      invalid_context: هیچ دەقێکی نادروست نییە یان بێ بڕوایە
+    index:
+      delete: سڕینەوە
+      empty: هیچ پالێوەرێکت نیە.
+      title: فلتەرەکان
+    new:
+      title: زیادکردنی فلتەری نوێ
+  footer:
+    trending_now: هەوادارانی ئێستا
+  generic:
+    all: هەموو
+    changes_saved_msg: گۆڕانکاریەکان بە سەرکەوتوویی هەڵگیرا!
+    copy: ڕوونووس
+    delete: سڕینەوە
+    order_by: ڕێکخستن بەپێی
+    save_changes: گۆڕانکاریەکان بپارێزە
+    validation_errors:
+      one: شتێک هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەکەی خوارەوە بخشێنەوە
+      other: هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەی %{count} خوارەوە بخشێنەوە
+  html_validator:
+    invalid_markup: 'نیشانەی HTML نادروستی تێدایە: %{error}'
+  imports:
+    modes:
+      merge: یەکخستن
+      merge_long: هێشتنەوەی تۆمارەکانی بەردەست و زیادکردنی دانەنوێکان
+      overwrite: نووسینەوە
+      overwrite_long: دراوەکانی ئێستا بسڕەوە و دراوی نوێ زیاد بکە
+    preface: دەتوانیت زانیاری هاوردە بکەیت کە ناردوتە تە لە ڕاژەیەکی ترەوە، وەک لیستی ئەو کەسانەی کە تۆ بەدوای دادەکەویت یان بەربەستت دەکەن.
+    success: داتاکەت بە سەرکەوتوویی بارکرا و ئێستا لە کاتی خۆیدا پرۆسێس دەکرێت
+    types:
+      blocking: لیستی بلۆککردن
+      bookmarks: نیشانەکان
+      domain_blocking: لیستی بلۆککردنی دۆمەین
+      following: لیستی خوارەوە
+      muting: لیستی کپکردنەوە
+    upload: بارکردن
+  invites:
+    delete: لەکارخستن
+    expired: بەسەرچووە
+    expires_in:
+      '1800': ٣٠ خولەک
+      '21600': ٦ کاتژمێر
+      '3600': ١ کاتژمێر
+      '43200': ١٢ کاتژمێر
+      '604800': ١ هەفتە
+      '86400': ١ ڕۆژ
+    expires_in_prompt: هەرگیز
+    generate: دروستکردنی لینکی بانگهێشت
+    invited_by: 'بانگهێشت کراویت لەلایەن:'
+    max_uses:
+      one: ١ بار
+      other: "%{count} بار"
+    max_uses_prompt: بێ سنوور
+    prompt: دروست کردن و هاوبەش کردنی لینکەکان لەگەڵ ئەوانی تر بۆ پێدانی چوونە ژوورەوە بۆ ئەم ڕاژە
+    table:
+      expires_at: بەسەرچووە
+      uses: بەکارهاوردنەکان
+    title: بانگهێشتکردنی خەڵک
+  lists:
+    errors:
+      limit: تۆ گەیشتوویتە زۆرترین ڕێژەی لیستەکان
+  media_attachments:
+    validations:
+      images_and_video: ناتوانرێت لەگەڵ ئەو نووسراوانە کە وێنەی لەگەڵە ،ڤیدیۆ بار بکەی
+      not_ready: ناتوانێت فایلەکان هاوپێچ بکات کە پرۆسەکەیان تەواو نەکردووە. دووبارە هەوڵ بدە!
+      too_many: ناتوانێت زیاتر لە ٤ فایل هاوپێچ بکات
+  migrations:
+    acct: گوێزرایەوە بۆ
+    cancel: پاشگەزبوونەوە لە دووبارە ئاڕاستەکردنەوە
+    cancel_explanation: هەڵوەشاندنەوەی دووبارە ئاڕاستەکردنەوە هەژمارەی ئێستات چالاک دەکات، بەڵام ئەو شوێنکەوتوانی ناهێنە وه کە گواستراوەتەوە بۆ ئەو هەژمارە.
+    cancelled_msg: سەرکەوتووانە دووبارە ئاڕاستەکردنەوەکەی بەتاڵ کردەوە.
+    errors:
+      already_moved: هەمان ئەژمێرە کە تۆ پێشتر گواستووتە بۆ
+      missing_also_known_as: نازناوێکی ئەم هەژمارە نییە
+      move_to_self: ناتوانێت هەژمارەی ئێستا بێت
+      not_found: نادۆزرێتەوە
+      on_cooldown: تۆ دەبێت چاوەڕوان بیت
+    followers_count: شوێنکەوتوانی کاتی لە حاڵی گواستنەوە
+    incoming_migrations: گواستنەوە لە هەژمارەی جیاواز
+    incoming_migrations_html: بۆ گواستنەوە لە هەژمارەیەکی ترەوە بۆ ئەم هەژمارە، سەرەتا پێویستە <href="%{path}"> ئەژمێرێک دروست </a> بکەی.
+    moved_msg: هەژمارەکەت ئێستا دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct} و شوێنکەوتوانی تۆ گواستراوەتەوە بۆ ئەوێ.
+    not_redirecting: هەژمارەکەت لە ئێستادا دووبارە ئاڕاستە ناکرێتەوە بۆ هیچ هەژمارەیەکی دیکە.
+    on_cooldown: تۆ بەم دواییە هەژمارەکەت کۆچ کردووە. ئەم کارە لە رۆژەکانی %{count} دا جارێکی تر بەردەست دەبێت.
+    past_migrations: گەواستنەوەکانی ڕابردوو
+    proceed_with_move: شوێنکەوتوان بگوازەوە
+    redirected_msg: ئەژمێرەکەت ئێستا دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct}.
+    redirecting_to: ئەژمێرەکەت دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct}.
+    set_redirect: دووبارە ئاڕاستەکردن ڕێک بخە
+    warning:
+      backreference_required: پێویستە سەرەتا هەژمارە نوێیەکە بۆ گەڕانەوەی سەرچاوەی ئەم هەژمارە رێکوپێک بکرێت
+      before: 'پێش بەردەوام بوون، تکایە ئەم تێبینیانە بە وردی بخوێننەوە:'
+      cooldown: دوای گواستنەوە ماوەیەکی چاوەڕوان دەبێ کە لە ماوەی ئەو دا نابێت جارێکی تر بگوازیتەوە
+      disabled_account: هەژمارەی ئێستات دوای ئەوە بە تەواوی بەکارناهیێت. هەرچۆنێک بێت، تۆ دەستگەیشتنت دەبێت بۆ ناردنەدەرەوەی داتا و هەروەها دووبارە کاراکردنەوە.
+      followers: ئەم کردارە هەموو شوێنکەوتوانی هەژمارەی ئێستا دەگوازێتەوە بۆ هەژمارەی نوێ
+      only_redirect_html: ئێوە دەتانن هەژمارەکەی خۆتان <a href="%{path}">بیخەنە سەر هەژمارەیەکی دیکە</a>.
+      other_data: هیچ داتایەکی تر بە خۆکارانە ناگوێزرێتەوە
+      redirect: پرۆفایلی هەژمارەی ئێستات بە ئاگادارییەکی ئاراستەکەراوە نوێ دەکرێتەوە و دووردەکەویت لە گەڕانەکان
+  moderation:
+    title: بەڕێوەبردن
+  move_handler:
+    carry_blocks_over_text: ئەم بەکارهێنەرە گواسترایەوە بۆ %{acct}، تۆ بلۆکت کردووە.
+    carry_mutes_over_text: ئەم بەکارهێنەرە گواسترایەوە بۆ %{acct}، تۆ بێدەنگت کردووە.
+    copy_account_note_text: 'ئەم بەکارهێنەرە لە %{acct} ەوە گواستیەوە، تێبینیەکانی پێشووت دەربارەیان بوون:'
+  notification_mailer:
+    favourite:
+      body: 'دۆخت پەسەندکراوە لەلایەن %{name}:'
+      subject: "%{name} دۆخی تۆی پەسەند کرد"
+      title: دڵخوازکردنی نوێ
+    follow:
+      body: "%{name} ئێستا شوێنکەوتوو ئێوەیە!"
+      subject: "%{name} ئێستا شوێنکەوتوو ئێوەیە"
+      title: شوێنکەوتوانی نوێ
+    follow_request:
+      action: بەڕێوەبردنی داوای شوێنکەوتن
+      body: "%{name} داوای کردووە کە شوێنت بکەوێت"
+      subject: 'چاوەڕوانی شوێنکەوتووە: %{name}'
+      title: داواکاری شوینکەوتنی نوێ
+    mention:
+      action: وەڵام
+      body: "%{name} لێرە ناوی ئێووەی بردووە:"
+      subject: "%{name} لێرە ناوی ئێووەی بردووە"
+      title: ناوبراوەی نوێ
+    reblog:
+      body: "%{name} نووسیسراوەکەی ئێوەی توتاندەوە:"
+      subject: "%{name} نووسراوەکەتی دووبارە توتاند"
+      title: توتاندنەوەی نوێ
+  notifications:
+    email_events: رووداوەکان بۆ ئاگاداری ئیمەیلی
+    email_events_hint: 'ئەو ڕووداوانە دیاریبکە کە دەتەوێت ئاگانامەکان وەربگری بۆ:'
+    other_settings: ڕێکبەندەکانی ئاگانامەکانی تر
+  otp_authentication:
+    code_hint: کۆدێک داخڵ بکە کە دروست کراوە لەلایەن ئەپی ڕەسەنایەتیەوە بۆ دڵنیابوون
+    description_html: ئەگەر تۆ <strong> هاتنەژوورەوەی دوو قۆناغی</strong> بە یارمەتی ئەپێکی پەسەندکردن چالاک بکەن، پێویستە بۆ چوونەژوورەوە ، بە تەلەفۆنەکەتان کە کۆدیکتان بۆ دروستدەکات دەستپێگەیشتنتان هەبێت.
+    enable: چالاککردن
+    instructions_html: "<strong> QR بدۆزەوە بۆ ناو ڕەسەنایەتی گووگڵ یان کاربەرنامەی TOTP هاوشێوە لەسەر تەلەفۆنەکەت </strong>. لە ئێستاوە، ئەو کاربەرنامەیە نیشانە دروست دەکات کە دەبێت داخڵیان بکەیت لەکاتی چوونە ژوورەوە."
+    manual_instructions: 'ئەگەر ناتوانیت کۆدی QR سکان بکەیت و پێویستە بە دەستی تێبنووسە، ئەمە نهێنیی دەقی سادەیە:'
+    setup: ئامادەکردن
+    wrong_code: کۆدی داخڵکراو نادروستە! ئایا کاتی ڕاژە و کاتی ئامێر راستن?
+  pagination:
+    newer: نوێتر
+    next: داهاتوو
+    older: کۆنتر
+    prev: پێشوو
+  polls:
+    errors:
+      already_voted: تۆ پێشتر دەنگت داوە لەسەر ئەم ڕاپرسییە
+      duplicate_options: خاوەنی ئایەمی دووبارە
+      duration_too_long: لە داهاتوو زۆر دوورە
+      duration_too_short: لە داهاتوو زۆر نزیکە
+      expired: ڕاپرسیەکە پێشتر کۆتایی هاتووە
+      invalid_choice: بژاردەی دەنگدانی هەڵبژێردراو بوونی نییە
+      over_character_limit: ناتوانێت هەر کامێکی درێژتر بێت لە %{max} نووسە
+      too_few_options: پێویستە زیاتر لە یەک بڕگەی هەبێت
+      too_many_options: ناتوانێت زیاتر لە %{max} بەندی تێدا بێت
+  preferences:
+    other: هی تر
+    posting_defaults: بڵاوکردنی بنەڕەتەکان
+    public_timelines: هێڵی کاتی گشتی
+  reactions:
+    errors:
+      limit_reached: سنووری کاردانه وه ی جیاواز گه یشت
+      unrecognized_emoji: ئیمۆجییەکی ناسراو نییە
+  relationships:
+    activity: چالاکی هەژمارە
+    dormant: ناچالاک
+    follow_selected_followers: شوێنکەوتوان دیاریکراو بکە
+    followers: شوێنکەوتوان
+    following: شوێن‌کەوتووی
+    invited: بانگهێشتەکان
+    last_active: دوایین چالاکی
+    most_recent: تازەترین
+    moved: گوێزرایەوە
+    mutual: دوولایەنە
+    primary: سەرەتایی
+    relationship: پەیوەندی
+    remove_selected_domains: لابردنی هەموو شوێنکەوتوانی دۆمەینە دیاریکراوەکان
+    remove_selected_followers: شوێنکەوتوانی دیاریکراو لابدە
+    remove_selected_follows: کۆتایی بە بەدوادانەچوی بەکارهێنەرە دیاریکراوەکان بدە
+    status: دۆخی هەژمارە
+  remote_follow:
+    missing_resource: نەیتوانی URLی ئاراستەکردنەوەی پێویست بدۆزێتەوە بۆ ئەژمێرەکەت
+  scheduled_statuses:
+    over_daily_limit: ئێوە لە سنووری ڕیپێدراوی %{limit} توتی ئەو رۆژە،خۆرتر ڕۆیشتوویت
+    over_total_limit: تۆ سنووری خشتەکراوی %{limit} ت بەزاندووە
+    too_soon: پێویستە بەرواری خشتەکراو لە داهاتوودا بێت
+  sessions:
+    activity: دوایین چالاکی
+    browser: وێبگەڕ
+    browsers:
+      chrome: کرۆم
+      edge: مایکرۆسۆفت ئیچ
+      electron: ئەلکترۆن
+      firefox: فایەرفۆکس
+      generic: وێبگەڕی نەناسراو
+      ie: ئینتێرنێت ئێکسپلۆرەر
+      micro_messenger: مایکرۆمێسنجەر
+      nokia: وێبگەڕی نۆکیا ئێس ٤٠ ئۆڤی
+      opera: ئۆپێرا
+      otter: ئۆتەر
+      phantom_js: فانتۆم جەی ئێس
+      qq: وێبگەڕی QQ
+      safari: سافری
+    current_session: دانیشتنی ئێستا
+    description: "%{browser} لەسەر %{platform}"
+    explanation: ئەمانە وێبگەڕەکەن کە ئێستا چووەتە ژوورەوە بۆ ئەژمێری ماستۆدۆنی خۆت.
+    ip: ئای‌پی
+    platforms:
+      android: ئەندرۆید
+      firefox_os: سیستەمی کارگێڕی فایەرفۆکس
+      linux: لینۆکس
+      mac: ماک
+      other: سیستەمیکارگێڕی نەناسراو
+      windows: ویندۆز
+      windows_mobile: ویندۆزموبایل
+      windows_phone: ویندۆزفۆن
+    revoke: بەتاڵکردن
+    revoke_success: دانیشتن بەسەرکەوتوویی بەتاڵکرا
+    title: کۆبوونەوەکان
+  settings:
+    account: هەژمارە
+    account_settings: ڕێکخستنەکانی هەژمارە
+    aliases: نازناوەی هەژمارە
+    appearance: ڕووخسار
+    authorized_apps: ئەپەکانی ڕێگەپێدراو
+    back: گەڕانەوە بۆ ماستۆدۆن
+    delete: سڕینەوەی هەژمارە
+    development: گەشەپێدان
+    edit_profile: دەستکاری پرۆفایل
+    export: ناردن زانیاری
+    featured_tags: هاشتاگی تایبەت
+    import: هاوردن
+    import_and_export: هاوردەکردن و ناردن
+    migrate: گواستنەوەی هەژمارە
+    notifications: ئاگادارییەکان
+    preferences: پەسەندەکان
+    profile: پرۆفایل
+    relationships: شوێنکەوتوو و شوێنکەوتوان
+    two_factor_authentication: کۆدی دووقۆناغی هاتنەژوور
+    webauthn_authentication: کلیلەکانی پاراستن
+  statuses:
+    attached:
+      audio:
+        one: "%{count} دەنگ"
+        other: "%{count} دەنگ"
+      description: 'هاوپێچ: %{attached}'
+      image:
+        one: "%{count} وێنە"
+        other: "%{count} وێنەکان"
+      video:
+        one: "%{count} ڤیدیۆ"
+        other: "%{count} ڤیدیۆکان"
+    boosted_from_html: توکراوەتەوە لەلایەن %{acct_link}
+    content_warning: 'ئاگاداری ناوەڕۆک: %{warning}'
+    disallowed_hashtags:
+      one: 'هاشتاگی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
+      other: 'هاشتاگەکانی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
+    errors:
+      in_reply_not_found: ئەو دۆخەی کە تۆ هەوڵی وەڵامدانەوەی دەدەیت وادەرناکەوێت کە هەبێت.
+    open_in_web: کردنەوە لە وێب
+    over_character_limit: سنووری نووسەی %{max} تێپەڕێنرا
+    pin_errors:
+      limit: تۆ پێشتر زۆرترین ژمارەی توتتی چەسپیوەت هەیە
+      ownership: نووسراوەکانی تر ناتوانرێ بسەلمێت
+      reblog: بەهێزکردن ناتوانرێت بچەسپێ
+    poll:
+      total_people:
+        one: "%{count} کەس"
+        other: "%{count} خەڵک"
+      total_votes:
+        one: "%{count} دەنگ"
+        other: "%{count} دەنگەکان"
+      vote: دەنگ
+    show_more: زیاتر پیشان بدە
+    show_newer: نوێتر پیشان بدە
+    show_older: پیشاندانی کۆنتر
+    show_thread: نیشاندانی ڕشتە
+    sign_in_to_participate: بچۆ ژوورەوە بۆ بەشداریکردن لە گفتوگۆکەدا
+    visibilities:
+      private: شوێنکەوتوانی تەنها
+      private_long: تەنها بۆ شوێنکەوتوانی پیشان بدە
+      public: گشتی
+      public_long: هەموو کەس دەتوانێت ببینێت
+      unlisted: پێرست نەبووە
+      unlisted_long: هەموو کەس دەتوانێت بیبینێت، بەڵام لە هێڵی کاتی گشتی دا نەریزراوە
+  stream_entries:
+    pinned: توتی چەسپکراو
+    reblogged: بەهێزکردن
+    sensitive_content: ناوەڕۆکی هەستیار
+  tags:
+    does_not_match_previous_name: لەگەڵ ناوی پێشوو یەک ناگرێتەوە
+  themes:
+    contrast: ماستۆدۆن (کۆنتراستی بەرز)
+    default: ماستۆدۆن (ڕەش)
+    mastodon-light: ماستۆدۆن (کاڵ)
+  two_factor_authentication:
+    add: زیادکردن
+    disable: لەکارخستنی 2FA
+    disabled_success: سەلماندنی سەلماندنی دوو-فاکتەر بە سەرکەوتوویی لەکارخراوە
+    edit: دەستکاری
+    enabled: سەلماندنی دوو-فاکتەر چالاک کراوە
+    enabled_success: سەلماندنی دوو-فاکتەر بە سەرکەوتوویی چالاک کرا
+    generate_recovery_codes: دروست کردنی کۆدی چاککردنەوە
+    lost_recovery_codes: کۆدی گەڕاندنەوە ڕێگەت پێ دەدات کە دەستگەیشتنت بۆ هەژمارەکەت بەدەست بهێنێ ئەگەر تەلەفۆنەکەت لەدەست بدەیت. ئەگەر کۆدەکانی چاکبوونەوەت لەدەست داوە، دەتوانیت لێرە دووبارە دروستیان کەی. کۆدی چاککردنەوەی کۆنت هەڵدەوەشێنێتەوە.
+    methods: دوو - میتۆدی فاکتەر
+    otp: ئەپی ڕاستەوە
+    recovery_codes: پاڵپشتکردن لە کۆدی هێنانەوەی
+    recovery_codes_regenerated: کۆدی گەڕاندنەوە بە سەرکەوتوویی دووبارە دروست بوویەوە
+    recovery_instructions_html: گەر تەلەفۆنەکەت بزر کرد دەتوانی بە یەکێک لە کۆدەکانی خوارەوە چاودێری هەژمارەکەت لە دەست بگریت.<strong>ائەم کۆدانە لە شوێنێکی پاراو هەڵبگرە</strong> بۆ نموونە چاپی بکەن یان لەگەڵ بەڵگەنامە گرینگەکانت دایبنێ.
+    webauthn: کلیلەکانی پاراستن
+  user_mailer:
+    backup_ready:
+      explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
+      subject: ئارشیڤی ئێوە ئامادەی داگرتنە
+      title: وەرگرتنی ئارشیڤ
+    warning:
+      subject:
+        disable: هەژمارەکەت %{acct} بەستراوە
+        none: ئاگاداری بۆ %{acct}
+        silence: هەژمارەکەی %{acct} سنووردار کراوە
+        suspend: هەژمارەکەی %{acct} ڕاگیرا
+      title:
+        disable: هەژمارە بەستراوە
+        none: ئاگاداری
+        sensitive: هەژمارە وەک هەستیار نیشان کراوە
+        silence: هەژماری سنووردار
+        suspend: هەژمار ڕاگیرا
+    welcome:
+      edit_profile_action: پرۆفایلی جێگیرکردن
+      explanation: ئەمە چەند ئامۆژگارییەکن بۆ دەست پێکردنت
+      final_action: دەست بکە بە بڵاوکردنەوە
+      full_handle: ناوی بەکارهێنەری تەواوی ئێوە
+      full_handle_hint: ئەمە ئەو شتەیە کە بە هاوڕێکانت دەلێی بۆ ئەوەی پەیام یان لە ڕاژەیەکی دیکەی ترەوە بەدوات بکەون.
+      subject: بەخێربیت بۆ ماستۆدۆن
+      title: بەخێربێیت، بەکارهێنەر %{name}!
+  users:
+    follow_limit_reached: ناتوانیت زیاتر لە %{limit} خەڵک پەیڕەو کەیت
+    invalid_otp_token: کۆدی دوو-فاکتەر نادروستە
+    otp_lost_help_html: گەر بەو دووڕێگا نەتوانی بچیتە ژوورەوە، لەوانەیە پەیوەندی بگری بە %{email} بۆ یارمەتی
+    seamless_external_login: تۆ لە ڕێگەی خزمەتگوزاری دەرەکیەوە داخڵ بووی، بۆیە ڕێکبەندەکانی نهێنوشە و ئیمەیل بەردەست نین.
+    signed_in_as: 'چوونە ژوورەوە وەک:'
+  verification:
+    explanation_html: 'دەتوانیت <strong> خۆت بسەلمێنیت وەک خاوەنی لینکەکان لە مێتاداتای پرۆفایلەکەت</strong>. بۆ ئەمە، ماڵپەڕە لینککراوەکە پێویستە لینکێکی تێدا بێت بۆ پرۆفایلی ماستۆدۆنەکەت. بەستەری <strong> دەبێت </strong> هەبێت <code>="me"</code>. ناوەڕۆکی دەقی لینکەکە گرنگ نییە. ئەمە نموونەیەکە:'
+    verification: ساغ کردنەوە
+  webauthn_credentials:
+    add: زیادکردنی کلیلی ئاسایشی نوێ
+    create:
+      error: کێشەیەک هەبوو لە زیادکردنی کلیلی پاراستنەکەت. تکایە دووبارە هەوڵ دەوەشنەوە.
+      success: کلیلی ئاسایشت بە سەرکەوتوویی زیادکرا.
+    delete: سڕینەوە
+    delete_confirmation: ئایا دڵنیایت لەوەی دەتەوێت ئەم کلیلی پاراستنە بسڕیتەوە?
+    description_html: ئەگەر تۆ <strong> کلیلی سەلماندنت</strong> چالاک دەکەی، بۆ چوونە ژوورەوە پێویستت پێ دەبێ، یەکێک لە کلیلە کانی ئاسایشت بەکاربێنیت.
+    destroy:
+      error: کێشەیەک هەبوو لە سڕینەوەی کلیلی پاراستنەکەت. تکایە دووبارە هەوڵ بدەرەوە.
+      success: کلیلی ئاسایشت بە سەرکەوتوویی سڕایەوە.
+    invalid_credential: کۆدی پاراستن دروست نیە
+    nickname_hint: نازناوی کلیلی ئاسایشی نوێت تێبنووسە
+    not_enabled: تۆ هێشتا WebAuthnت چالاک نەکردووە
+    not_supported: ئەم وێبگەڕە پشتگیری کلیلەکانی پاراستن ناکات
+    otp_required: بۆ بەکارهێنانی کلیلەکانی پاراستن تکایە سەرەتا سەلماندنی دوو-فاکتەر چالاک بکە.
+    registered_on: تۆمارکراو لە %{date}
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 878cdb533..2ab6c63f9 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -1,92 +1,26 @@
 ---
 co:
   about:
-    about_hashtag_html: Quessi sò statuti pubblichi taggati cù <strong>#%{hashtag}</strong>. Pudete interagisce cù elli sì voi avete un contu in qualche parte di u fediversu.
     about_mastodon_html: 'A rete suciale di u futuru: micca pubblicità, micca surveglianza, cuncezzione etica, è dicentralizazione! Firmate in cuntrollu di i vostri dati cù Mastodon!'
-    about_this: À prupositu
-    active_count_after: attivi
-    active_footnote: Utilizatori Attivi Mensili (UAM)
-    administered_by: 'Amministratu da:'
-    api: API
-    apps: Applicazione per u telefuninu
-    apps_platforms: Utilizà Mastodon dapoi à iOS, Android è altre piattaforme
-    browse_directory: Navigà un'annuariu di i prufili è filtra per interessi
-    browse_local_posts: Navigà un flussu di statuti pubblichi da stu servore
-    browse_public_posts: Navigà un flussu di i statuti pubblichi nant'à Mastodon
-    contact: Cuntattu
     contact_missing: Mancante
     contact_unavailable: Micca dispunibule
-    discover_users: Scopre utilizatori
-    documentation: Ducumentazione
-    federation_hint_html: Cù un contu nant'à %{instance} puderete siguità ghjente da tutti i servori Mastodon è ancu più d'altri.
-    get_apps: Pruvà un'applicazione di telefuninu
     hosted_on: Mastodon allughjatu nant’à %{domain}
-    instance_actor_flash: |
-      Stu contu ghjè un'attore virtuale chì ghjove à riprisentà u servore sanu è micca un veru utilizatore.
-      Hè utilizatu da a federazione è ùn deve micca esse bluccatu eccettu s'e voi vulete bluccà tuttu u servore, in quellu casu duvereste utilizà un blucchime di duminiu.
-    learn_more: Amparà di più
-    privacy_policy: Pulitica di vita privata
-    rules: Regule di u servore
-    rules_html: 'Eccu un riassuntu di e regule da siguità s''e voi vulete creà un contu nant''à quessu servore di Mastodon:'
-    see_whats_happening: Vede cio chì si passa
-    server_stats: 'Statistiche di u servore:'
-    source_code: Codice di fonte
-    status_count_after:
-      one: statutu
-      other: statuti
-    status_count_before: Chì anu pubblicatu
-    tagline: Siguità amichi è scopre ancu di più altri
-    terms: Cundizione di u serviziu
-    unavailable_content: Cuntinutu micca dispunibule
-    unavailable_content_description:
-      domain: Servore
-      reason: Ragione
-      rejecting_media: 'I fugliali media da stu servore ùn saranu micca arregistrati è e vignette ùn saranu micca affissate, duverete cliccà manualmente per accede à l''altru servore è vedeli:'
-      rejecting_media_title: Media filtrati
-      silenced: 'I statuti da stu servore ùn saranu mai visti tranne nant''a vostra pagina d''accolta s''e voi siguitate l''autore:'
-      silenced_title: Servori silenzati
-      suspended: 'Ùn puderete micca siguità qualsiasi nant''à stu servore, i dati versu o da quallà ùn saranu mai accessi, scambiati o arregistrati:'
-      suspended_title: Servori suspesi
-    unavailable_content_html: Mastodon vi parmette in generale di vede u cuntinutu è interagisce cù l'utilizatori di tutti l'altri servori di u fediversu. Quessi sò l'eccezzione fatte nant'à stu servore in particulare.
-    user_count_after:
-      one: utilizatore
-      other: utilizatori
-    user_count_before: Ci sò
-    what_is_mastodon: Quale hè Mastodon?
   accounts:
-    choices_html: "%{name} ricumanda:"
-    endorsements_hint: Pudete appughjà i conti chì siguitate dapoi l'interfaccia web, è saranu mustrati quì.
-    featured_tags_hint: Pudete mette in mostra qualchì hashtag chì saranu affissati quì.
     follow: Siguità
     followers:
       one: Abbunatu·a
       other: Abbunati
     following: Abbunamenti
     instance_actor_flash: Stu contu virtuale riprisenta u servore stessu, micca un'utilizatore individuale. Hè utilizatu per scopi di federazione è ùn duveria mai esse suspesu.
-    joined: Quì dapoi %{date}
     last_active: ultima attività
     link_verified_on: A pruprietà d'issu ligame hè stata verificata u %{date}
-    media: Media
-    moved_html: "%{name} hà cambiatu di contu, avà hè nant’à %{new_profile_link}:"
-    network_hidden: St'infurmazione ùn hè micca dispunibule
-    never_active: Mai
     nothing_here: Ùn c’hè nunda quì!
-    people_followed_by: Seguitati da %{name}
-    people_who_follow: Seguitanu %{name}
     pin_errors:
       following: Duvete digià siguità a persona che vulete ricumandà
     posts:
       one: Statutu
       other: Statuti
     posts_tab_heading: Statuti
-    posts_with_replies: Statuti è risposte
-    roles:
-      admin: Amministratore
-      bot: Bot
-      group: Gruppu
-      moderator: Muderatore
-    unavailable: Prufile micca dispunibule
-    unfollow: Ùn siguità più
   admin:
     account_actions:
       action: Realizà un'azzione
@@ -94,18 +28,15 @@ co:
     account_moderation_notes:
       create: Creà una nota
       created_msg: Nota di muderazione creata!
-      delete: Toglie
       destroyed_msg: Nota di muderazione sguassata!
     accounts:
       add_email_domain_block: Mette u duminiu e-mail in lista nera
       approve: Appruvà
-      approve_all: Appruvà tuttu
       approved_msg: A dumanda d'arregistramente di %{username} hè stata appruvata
       are_you_sure: Site sicuru·a?
       avatar: Ritrattu di prufile
       by_domain: Duminiu
       change_email:
-        changed_msg: Email di u contu cambiatu!
         current_email: E-mail attuale
         label: Mudificà l’e-mail
         new_email: Novu e-mail
@@ -153,7 +84,6 @@ co:
         active: Attivu
         all: Tutti
         pending: In attesa
-        silenced: Silenzati
         suspended: Suspesi
         title: Muderazione
       moderation_notes: Note di muderazione
@@ -171,7 +101,6 @@ co:
       redownload: Mette à ghjornu u prufile
       redownloaded_msg: U prufile di %{username} hè statu attualizatu da l'urighjine
       reject: Righjittà
-      reject_all: Righjittà tutti
       rejected_msg: A dumanda d'arregistramente di %{username} hè stata righjittata
       remove_avatar: Toglie l’avatar
       remove_header: Toglie a cuprendula
@@ -184,19 +113,12 @@ co:
       reset: Riinizializà
       reset_password: Riinizializà a chjave d’accessu
       resubscribe: Riabbunassi
-      role: Auturizazione
-      roles:
-        admin: Amministratore
-        moderator: Muderatore
-        staff: Squadra
-        user: Utilizatore
       search: Cercà
       search_same_email_domain: Altri utilizatori cù listessu duminiu d'e-mail
       search_same_ip: Altri utilizatori cù listessa IP
       security_measures:
         only_password: Solu a chjave d'accessu
         password_and_2fa: Chjave d’accessu è A2F
-        password_and_sign_in_token: Chjave d’accessu è codice da l'e-mail
       sensitive: Sensibile
       sensitized: indicatu cum’è sensibile
       shared_inbox_url: URL di l’inbox spartuta
@@ -210,7 +132,6 @@ co:
       suspended: Suspesu
       suspension_irreversible: I dati di stu contu sò stati irreversibilamente sguassati. Pudete annullà a suspensione di u contu per u rende utilizabile ma ùn pudete micca ricuperà i dati pricedenti.
       suspension_reversible_hint_html: U contu hè statu suspesu, è i so dati saranu sguassati u %{date}. Da quì à là, u contu pò esse ricuperatu senza prublemu. S'e voi vulete toglie tutti i dati di u contu avà, pudete fallu quì sottu.
-      time_in_queue: 'Attesa in fila: %{time}'
       title: Conti
       unconfirmed_email: E-mail micca cunfirmatu
       undo_sensitized: Annullà sensibile
@@ -226,6 +147,7 @@ co:
       whitelisted: In a lista bianca
     action_logs:
       action_types:
+        approve_user: Appruvà l'utilizatore
         assigned_to_self_report: Assignà signalamentu
         change_email_user: Mudificà l'E-mail di l'Utilizatore
         confirm_user: Cunfirmà Utilizatore
@@ -255,6 +177,7 @@ co:
         enable_user: Attivà utilizatore
         memorialize_account: Trasfurmà contu in mimuriale
         promote_user: Prumove Utilizatore
+        reject_user: Righjittà l'utilizatore
         remove_avatar_user: Toglie Avatar
         reopen_report: Riapre Signalamentu
         reset_password_user: Riinizializà Chjave d'Accessu
@@ -284,7 +207,6 @@ co:
         create_unavailable_domain_html: "%{name} hà firmatu a distribuzione à u duminiu %{target}"
         demote_user_html: "%{name} hà ritrugradatu l’utilizatore %{target}"
         destroy_announcement_html: "%{name} hà sguassatu u novu annunziu %{target}"
-        destroy_custom_emoji_html: "%{name} hà sguassatu l'emoji %{target}"
         destroy_domain_allow_html: "%{name} hà sguassatu u duminiu %{target} da a lista bianca"
         destroy_domain_block_html: "%{name} hà sbluccatu u duminiu %{target}"
         destroy_email_domain_block_html: "%{name} hà messu u duminiu e-mail %{target} nant’a lista bianca"
@@ -313,7 +235,6 @@ co:
         update_custom_emoji_html: "%{name} hà messu à ghjornu l’emoji %{target}"
         update_domain_block_html: "%{name} hà messu à ghjornu u blucchime di duminiu per %{target}"
         update_status_html: "%{name} hà cambiatu u statutu di %{target}"
-      deleted_status: "(statutu sguassatu)"
       empty: Nunda trovu.
       filter_by_action: Filtrà da azzione
       filter_by_user: Filtrà da utilizatore
@@ -352,7 +273,6 @@ co:
       enable: Attivà
       enabled: Attivate
       enabled_msg: L’emoji hè stata attivata
-      image_hint: PNG di 50Ko o menu
       list: Listà
       listed: Listata
       new:
@@ -369,9 +289,18 @@ co:
       updated_msg: L’emoji hè stata messa à ghjornu!
       upload: Caricà
     dashboard:
+      active_users: utilizatori attivi
+      interactions: interazzione
+      media_storage: Spaziu di i media
+      new_users: novi utilizatori
+      opened_reports: signalamenti aperti
+      resolved_reports: signalamenti risolti
       software: Lugiziale
       space: Usu di u spaziu
       title: Quatru di strumenti
+      top_languages: Lingue e più attive
+      top_servers: Servori i più attivi
+      website: Situ web
     domain_allows:
       add_new: Aghjunghje à a lista bianca
       created_msg: U duminiu hè statu aghjuntu à a lista bianca
@@ -388,9 +317,7 @@ co:
         create: Creà un blucchime
         hint: U blucchime di duminiu ùn impedirà micca a creazione di conti indè a database, mà metudi di muderazione specifiche saranu applicati.
         severity:
-          desc_html: Cù <strong>Silenzà</strong>, solu l’abbunati di u contu viderenu i so missaghji. <strong>Suspende</strong> sguassarà tutti i cuntenuti è dati di u contu. Utilizate <strong>Nisuna</strong> s’è voi vulete solu righjittà fugliali media.
           noop: Nisuna
-          silence: Silenzà
           suspend: Suspende
         title: Novu blucchime di duminiu
       obfuscate: Uscurà u nome di duminiu
@@ -403,30 +330,13 @@ co:
       reject_media_hint: Sguassa tutti i media caricati è ricusa caricamenti futuri. Inutile per una suspensione
       reject_reports: Righjittà i riporti
       reject_reports_hint: Ignurà tutti i signalamenti chì venenu d'issu duminiu. Senz'oghjettu pè e suspensione
-      rejecting_media: righjettu di i fugliali media
-      rejecting_reports: righjettu di i signalamenti
-      severity:
-        silence: silenzatu
-        suspend: suspesu
-      show:
-        affected_accounts:
-          one: Un contu tuccatu indè a database
-          other: "%{count} conti tuccati indè a database"
-        retroactive:
-          silence: Ùn silenzà più i conti affettati di stu duminiu
-          suspend: Ùn suspende più i conti affettati di stu duminiu
-        title: Ùn bluccà più u duminiu %{domain}
-        undo: Annullà
       undo: Annullà u blucchime di duminiu
       view: Vede blucchime di duminiu
     email_domain_blocks:
       add_new: Aghjunghje
       created_msg: U blucchime di u duminiu d’e-mail hè attivu
       delete: Toglie
-      destroyed_msg: U blucchime di u duminiu d’e-mail ùn hè più attivu
       domain: Duminiu
-      empty: Ùn c'hè manc'un duminiu d'email in lista nera.
-      from_html: da %{domain}
       new:
         create: Creà un blucchime
         title: Nova iscrizzione nant’a lista nera e-mail
@@ -448,20 +358,11 @@ co:
         clear: Sguassà l'errori di distribuzione
         restart: Riprincipià a distribuzione
         stop: Firmà a distribuzione
-        title: Distribuzione
         unavailable: Indispunibule
-        unavailable_message: Distribuzione micca dispunibule
-        warning: Avertimentu
-        warning_message:
-          one: Errore di distribuzione per %{count} ghjornu
-          other: Errore di distribuzione per %{count} ghjorni
       delivery_available: Distribuzione dispunibule
       delivery_error_days: Ghjorni d'errori di a distribuzione
       delivery_error_hint: S'ellu ùn si pò distribuì à u duminiu per %{count} ghjorni, sarà autumaticamente marcatu cum'è indistribuibile.
       empty: Mancun duminiu trovu.
-      known_accounts:
-        one: "%{count} contu cunnisciutu"
-        other: "%{count} conti cunnisciuti"
       moderation:
         all: Tuttu
         limited: Limitatu
@@ -497,8 +398,6 @@ co:
         title: Creà una nova regula IP
       no_ip_block_selected: E regule ùn sò micca state mudificate perchè manc'un'era selezziunata
       title: Regule IP
-    pending_accounts:
-      title: Conti in attesa (%{count})
     relationships:
       title: Rilazione di %{acct}
     relays:
@@ -525,13 +424,11 @@ co:
         notes:
           one: "%{count} nota"
           other: "%{count} note"
-        reports:
-          one: "%{count} riportu"
-          other: "%{count} riporti"
       action_taken_by: Intervenzione di
       are_you_sure: Site sicuru·a?
       assign_to_self: Assignallu à mè
       assigned: Muderatore assignatu
+      by_target_domain: Duminiu di u contu signalatu
       comment:
         none: Nisunu
       created_at: Palisatu
@@ -552,7 +449,7 @@ co:
       resolved: Scioltu è chjosu
       resolved_msg: Signalamentu scioltu!
       status: Statutu
-      target_domain: Duminiu di u contu signalatu
+      target_origin: Urighjine di u contu signalatu
       title: Signalamenti
       unassign: Disassignà
       unresolved: Micca sciolti
@@ -563,108 +460,23 @@ co:
       edit: Mudificà regula
       title: Regule di u servore
     settings:
-      activity_api_enabled:
-        desc_html: Numeri di statuti creati quì, utilizatori attivi, è arregistramenti novi tutte e settimane
-        title: Pubblicà statistiche nant’à l’attività di l’utilizatori
-      bootstrap_timeline_accounts:
-        desc_html: Cugnomi separati cù virgule. Solu pussibule cù conti lucali è pubblichi. Quandu a lista hè viota, tutti l’amministratori lucali saranu selezziunati.
-        title: Abbunamenti predefiniti per l’utilizatori novi
-      contact_information:
-        email: E-mail prufissiunale
-        username: Identificatore di cuntattu
-      custom_css:
-        desc_html: Mudificà l'apparenza cù CSS caricatu nant'à ogni pagina
-        title: CSS persunalizatu
-      default_noindex:
-        desc_html: Tocca tutti quelli ch'ùn anu micca cambiatu stu parametru
-        title: Ritirà l'utilizatori di l'indicazione nant'à i mutori di ricerca
       domain_blocks:
         all: À tutti
         disabled: À nimu
-        title: Mustrà blucchime di duminiu
         users: À l'utilizatori lucali cunnettati
-      domain_blocks_rationale:
-        title: Vede ragiò
-      hero:
-        desc_html: Affissatu nant’a pagina d’accolta. Ricumandemu almenu 600x100px. S’ellu ùn hè micca definiti, a vignetta di u servore sarà usata
-        title: Ritrattu di cuprendula
-      mascot:
-        desc_html: Affissata nant'à parechje pagine. Almenu 293x205px ricumandatu. S'ella hè lasciata viota, a mascotta predefinita sarà utilizata
-        title: Ritrattu di a mascotta
-      peers_api_enabled:
-        desc_html: Indirizzi web stu servore hà vistu indè u fediversu
-        title: Pubblicà a lista di servori cunnisciuti
-      preview_sensitive_media:
-        desc_html: E priviste di i ligami nant'à l'altri siti mustreranu una vignetta ancu s'ellu hè marcatu cum'è sensibile u media
-        title: Vede media sensibili in e viste OpenGraph
-      profile_directory:
-        desc_html: Auturizà a scuperta di l'utilizatori
-        title: Attivà l'annuariu di i prufili
-      registrations:
-        closed_message:
-          desc_html: Affissatu nant’a pagina d’accolta quandu l’arregistramenti sò chjosi. Pudete fà usu di u furmattu HTML
-          title: Missaghju per l’arregistramenti chjosi
-        deletion:
-          desc_html: Auturizà tuttu u mondu à sguassà u so propiu contu
-          title: Auturizà à sguassà i conti
-        min_invite_role:
-          disabled: Nimu
-          title: Auturizà l’invitazione da
-        require_invite_text:
-          desc_html: Quandu l'arregistramenti necessitanu un'apprubazione manuale, fà chì u testu "Perchè vulete ghjunghje?" sia ubligatoriu invece d'esse facultativu
-          title: Richiede chì i novi utilizatori empiinu una dumanda d'invitazione
       registrations_mode:
         modes:
           approved: Apprubazione necessaria per arregistrassi
           none: Nimu ùn pò arregistrassi
           open: Tutt'ognunu pò arregistrassi
-        title: Modu d'arregistramenti
-      show_known_fediverse_at_about_page:
-        desc_html: Quandu ghjè selezziunatu, statuti di tuttu l’istanze cunnisciute saranu affissati indè a vista di e linee. Altrimente soli i statuti lucali saranu mustrati
-        title: Vedde tuttu u fediverse cunnisciutu nant’a vista di e linee
-      show_staff_badge:
-        desc_html: Mustrerà un badge Squadra nant’à un prufile d’utilizatore
-        title: Mustrà un badge staff
-      site_description:
-        desc_html: Paragrafu di prisentazione nant’a pagina d’accolta. Parlate di cio chì rende stu servore speziale, o d'altre cose impurtante. Pudete fà usu di marchi HTML, in particulare <code>&lt;a&gt;</code> è <code>&lt;em&gt;</code>.
-        title: Discrizzione di u servore
-      site_description_extended:
-        desc_html: Una bona piazza per e regule, infurmazione è altre cose chì l’utilizatori duverìanu sapè. Pudete fà usu di marchi HTML
-        title: Discrizzione stesa di u situ
-      site_short_description:
-        desc_html: Mustratu indè a barra laterala è i tag meta. Spiegate quale hè Mastodon è ciò chì rende u vostru servore speciale in un paragrafu. S'ella hè lasciata viota, a discrizzione di u servore sarà utilizata.
-        title: Descrizzione corta di u servore
-      site_terms:
-        desc_html: Quì pudete scrive e vostre regule di cunfidenzialità, cundizione d’usu o altre menzione legale. Pudete fà usu di marchi HTML
-        title: Termini persunalizati
-      site_title: Nome di u servore
-      thumbnail:
-        desc_html: Utilizatu per viste cù OpenGraph è l’API. Ricumandemu 1200x630px
-        title: Vignetta di u servore
-      timeline_preview:
-        desc_html: Vede a linea pubblica nant’a pagina d’accolta
-        title: Vista di e linee
-      title: Parametri di u situ
-      trendable_by_default:
-        desc_html: Ùn affetta micca quelli chì sò digià stati ricusati
-        title: Auturizà l'hashtag à esse in tindenze senza verificazione
-      trends:
-        desc_html: Mustrà à u pubblicu i hashtag chì sò stati digià verificati è chì sò in e tendenze avà
-        title: Tendenze di hashtag
     site_uploads:
       delete: Sguassà u fugliale caricatu
       destroyed_msg: Fugliale sguassatu da u situ!
     statuses:
       back_to_account: Ritornu à a pagina di u contu
-      batch:
-        delete: Toglie
-        nsfw_off: Indicà cum’è micca sensibile
-        nsfw_on: Indicà cum’è sensibile
       deleted: Sguassatu
-      failed_to_execute: Esecuzione impussibule
       media:
         title: Media
-      no_media: Nisun media
       no_status_selected: I statuti ùn sò micca stati mudificati perchè manc'unu era selezziunatu
       title: Statuti di u contu
       with_media: Cù media
@@ -673,21 +485,29 @@ co:
         action: Amministrà e regule di u servore
         message_html: Ùn avete micca ancu difinitu di regula per u servore.
     tags:
-      accounts_today: Usi unichi oghji
-      accounts_week: Usi unichi sta settimana
-      breakdown: Ditagli di l'usu d'oghji per origine
-      last_active: Ultima attività
-      most_popular: Più pupulari
-      most_recent: Più ricente
-      name: Hashtag
       review: Statutu di verificazione
-      reviewed: Verificatu
-      title: Hashtag
-      trending_right_now: Tendenze avà
-      unique_uses_today: "%{count} pustendu oghji"
-      unreviewed: Micca verificatu
       updated_msg: Parametri di i hashtag messi à ghjornu
     title: Amministrazione
+    trends:
+      allow: Auturizà
+      approved: Appruvatu
+      disallow: Difende
+      links:
+        allow: Auturizà u ligame
+      pending_review: In attesa di rivista
+      preview_card_providers:
+        title: Pubblicatori
+      rejected: Righittate
+      tags:
+        current_score: Score attuale %{score}
+        dashboard:
+          tag_accounts_measure: usi unichi
+          tag_languages_dimension: Lingue principale
+          tag_servers_measure: servori sfarenti
+          tag_uses_measure: usi tutali
+        not_usable: Ùn pò esse usatu
+        title: Tendenze di hashtag
+        usable: Pò esse usatu
     warning_presets:
       add_new: Aghjunghje
       delete: Sguassà
@@ -701,9 +521,6 @@ co:
       body: "%{reporter} hà palisatu %{target}"
       body_remote: Qualch’unu da %{domain} hà palisatu %{target}
       subject: Novu signalamentu nant’à %{instance} (#%{id})
-    new_trending_tag:
-      body: 'U hashtag #%{name} hè in e tendenze oghji, mà ùn hè micca verificatu. Ùn sarà micca mustratu à u pubblicu eccettu s''ellu hè auturizatu, o pudete ancu salvà u furmulariu cusì per ùn mai più avè à ne sente parlà.'
-      subject: Novu hashtag in attesa di rivista nant'à %{instance} (#%{name})
   aliases:
     add_new: Creà un pseudonimu
     created_msg: Novu pseudonimu creatu. Pudete avà inizià u trasferimentu da u vechju contu.
@@ -733,16 +550,12 @@ co:
   applications:
     created: Applicazione creata
     destroyed: Applicazione sguassata
-    invalid_url: L’URL ch’è stata pruvista ùn hè valida
     regenerate_token: Creà un’altra fiscia d’accessu
     token_regenerated: A fiscia d’accessu hè stata rigenerata
     warning: Abbadate à quessi dati. Ùn i date à nisunu!
     your_token: Rigenerà a fiscia d’accessu
   auth:
-    apply_for_account: Dumandà un'invitazione
     change_password: Chjave d’accessu
-    checkbox_agreement_html: Sò d'accunsentu cù e <a href="%{rules_path}" target="_blank">regule di u servore</a> è i <a href="%{terms_path}" target="_blank">termini di u serviziu</a>
-    checkbox_agreement_without_rules_html: Accettu i <a href="%{terms_path}" target="_blank">termini di u serviziu</a>
     delete_account: Sguassà u contu
     delete_account_html: S’è voi vulete toglie u vostru contu <a href="%{path}">ghjè quì</a>. Duverete cunfirmà a vostra scelta.
     description:
@@ -776,11 +589,9 @@ co:
     status:
       account_status: Statutu di u contu
       confirming: In attesa di a cumplezzione di a cunfirmazione di l'e-mail.
-      functional: U vostru contu hè uperaziunale.
       pending: A vostra dumanda hè in attesa di rivista da a squadra di muderazione. Quessa pò piglià un certu tempu. Avete da riceve un'e-mail s'ella hè appruvata.
       redirecting_to: U vostru contu hè inattivu perchè riindirizza versu %{acct}.
     too_fast: Furmulariu mandatu troppu prestu, ripruvate.
-    trouble_logging_in: Difficultà per cunnettavi?
     use_security_key: Utilizà a chjave di sicurità
   authorize_follow:
     already_following: Site digià abbunatu·a à stu contu
@@ -838,10 +649,6 @@ co:
       more_details_html: Per più di ditagli, videte a <a href="%{terms_path}">pulitica di vita privata</a>.
       username_available: U vostru cugnome riduvinterà dispunibule
       username_unavailable: U vostru cugnome ùn sarà sempre micca dispunibule
-  directories:
-    directory: Annuariu di i prufili
-    explanation: Scopre utilizatori à partesi di i so centri d'interessu
-    explore_mastodon: Scopre à %{title}
   domain_validator:
     invalid_domain: ùn hè micca un nome di duminiu currettu
   errors:
@@ -893,7 +700,6 @@ co:
       title: Mudificà u filtru
     errors:
       invalid_context: Micca abbastanza cuntestu
-      invalid_irreversible: A filtrazione irreversibile marchja solu per l'accolta è e nutificazione
     index:
       delete: Toglie
       empty: Ùn avete manc'un filtru.
@@ -901,16 +707,12 @@ co:
     new:
       title: Aghjunghje un novu filtru
   footer:
-    developers: Sviluppatori
-    more: Di più…
-    resources: Risorse
     trending_now: Tindenze d'avà
   generic:
     all: Tuttu
     changes_saved_msg: Cambiamenti salvati!
     copy: Cupià
     delete: Sguassà
-    no_batch_actions_available: Alcun'azzione di gruppu nant'à sta pagina
     order_by: Urdinà da
     save_changes: Salvà e mudificazione
     validation_errors:
@@ -918,26 +720,6 @@ co:
       other: Qualcosa ùn và bè! Verificate %{count} prublemi quì sottu
   html_validator:
     invalid_markup: 'cuntene codice HTML invalidu: %{error}'
-  identity_proofs:
-    active: Attiva
-    authorize: Ié, auturizà
-    authorize_connection_prompt: Auturizà sta cunnessione crittograffica?
-    errors:
-      failed: A cunnessione crittograffica s'hè fiascata. Ripruvate da %{provider}.
-      keybase:
-        invalid_token: E fiscie Keybase sò hash di firme è duvenu fà 66 caratteri esadecimali (0-9 A-F)
-        verification_failed: Keybase ùn ricunosce micca sta fiscia cum'una firma di l'utilizatore Keybase %{kb_username}. Ripruvate da Keybase.
-      wrong_user: Ùn si pò micca creà una prova per %{proving} mentre chì site cunnettatu·a cum'è %{current}. Cunnettatevi cum'è %{proving} è ripruvate.
-    explanation_html: Quì pudete cunnettà crittografficamente e vostre altre identità, cum'è per esempiu un prufile Keybase. Quessu permette à d'altre persone di mandà vi missaghji crittati, è d'affiducià i cuntinuti chì mandate.
-    i_am_html: Sò %{username} nant'à %{service}.
-    identity: Identità
-    inactive: Inattiva
-    publicize_checkbox: 'È mandà stu statutu:'
-    publicize_toot: 'Hè pruvata! Sò %{username} nant’à %{service}: %{url}'
-    remove: Sguassà a prova da u contu
-    removed: Prova sguassata da u contu
-    status: Statutu di a verificazione
-    view_proof: Vede a prova
   imports:
     errors:
       over_rows_processing_limit: cuntene più di %{count} filari
@@ -955,7 +737,6 @@ co:
       following: Persone chì seguitate
       muting: Persone chì piattate
     upload: Impurtà
-  in_memoriam_html: In mimoria.
   invites:
     delete: Disattivà
     expired: Spirata
@@ -1030,17 +811,6 @@ co:
     carry_mutes_over_text: St'utilizatore hà traslucatu dapoi %{acct}, ch'aviate piattatu.
     copy_account_note_text: 'St''utilizatore hà traslucatu dapoi %{acct}, eccu e vostr''anziane note nant''à ellu:'
   notification_mailer:
-    digest:
-      action: Vede tutte e nutificazione
-      body: Eccu cio ch’avete mancatu dapoi à a vostr’ultima visita u %{since}
-      mention: "%{name} v’hà mintuvatu·a in:"
-      new_followers_summary:
-        one: Avete ancu un’abbunatu novu!
-        other: Avete ancu %{count} abbunati novi!
-      subject:
-        one: "Una nutificazione nova dapoi à a vostr’ultima visita \U0001F418"
-        other: "%{count} nutificazione nove dapoi à a vostr’ultima visita \U0001F418"
-      title: Dapoi l’ultima volta…
     favourite:
       body: "%{name} hà aghjuntu u vostru statutu à i so favuriti :"
       subject: "%{name} hà messu u vostru post in i so favuriti"
@@ -1132,22 +902,7 @@ co:
     remove_selected_follows: Ùn siguità più l'utilizatori selezziunati
     status: Statutu di u contu
   remote_follow:
-    acct: Entrate u vostru cugnome@istanza da induve vulete siguità stu contu
     missing_resource: Ùn avemu pussutu à truvà l’indirizzu di ridirezzione
-    no_account_html: Ùn avete micca un contu? Pudete <a href='%{sign_up_path}' target='_blank'>arregistravi quì</a>
-    proceed: Cuntinuà per siguità
-    prompt: 'Avete da siguità:'
-    reason_html: "<strong>Perchè hè necessaria sta tappa?</strong> <code>%{instance}</code> ùn hè forse micca u servore induve site arregistratu·a, allora primu duvemu riindirizzavi à u vostru servore."
-  remote_interaction:
-    favourite:
-      proceed: Cuntinuà per favurisce
-      prompt: 'Vulete aghjunghje stu statutu à i vostri favuriti:'
-    reblog:
-      proceed: Cuntinuà per sparte
-      prompt: 'Vulete sparte stu statutu:'
-    reply:
-      proceed: Cuntinuà per risponde
-      prompt: 'Vulete risponde à stu statutu:'
   scheduled_statuses:
     over_daily_limit: Avete trapassatu a limita di %{limit} statuti pianificati per stu ghjornu
     over_total_limit: Avete trapassatu a limita di %{limit} statuti pianificati
@@ -1157,7 +912,6 @@ co:
     browser: Navigatore
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1171,7 +925,6 @@ co:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
       weibo: Weibo
     current_session: Sessione attuale
     description: "%{browser} nant’à %{platform}"
@@ -1180,8 +933,6 @@ co:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1205,7 +956,6 @@ co:
     edit_profile: Mudificà u prufile
     export: Spurtazione d’infurmazione
     featured_tags: Hashtag in vista
-    identity_proofs: Prove d'identità
     import: Impurtazione
     import_and_export: Impurtazione è spurtazione
     migrate: Migrazione di u contu
@@ -1234,13 +984,11 @@ co:
       other: 'cuntene l’hashtag disattivati: %{tags}'
     errors:
       in_reply_not_found: U statutu à quellu avete pruvatu di risponde ùn sembra micca esiste.
-    language_detection: Truvà a lingua autumaticamente
     open_in_web: Apre nant’à u web
     over_character_limit: site sopr’à a limita di %{max} caratteri
     pin_errors:
       limit: Avete digià puntarulatu u numeru massimale di statuti
       ownership: Pudete puntarulà solu unu di i vostri propii statuti
-      private: Ùn pudete micca puntarulà un statutu ch’ùn hè micca pubblicu
       reblog: Ùn pudete micca puntarulà una spartera
     poll:
       total_people:
@@ -1284,6 +1032,7 @@ co:
       '2629746': 1 mese
       '31556952': 1 annu
       '5259492': 2 mesi
+      '604800': 1 week
       '63113904': 2 anni
       '7889238': 3 mesi
     min_age_label: Età minima
@@ -1297,89 +1046,6 @@ co:
     sensitive_content: Cuntenutu sensibile
   tags:
     does_not_match_previous_name: ùn currisponde micca à l'anzianu nome
-  terms:
-    body_html: |
-      <h2>Politique de confidentialité</h2>
-      <h3 id="collect">Quelles informations collectons-nous ?</h3>
-
-      <ul>
-      <li><em>Informations de base sur votre compte</em> : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.</li>
-      <li><em>Posts, liste d’abonnements et autres informations publiques</em> : La liste de vos abonnements ainsi que la liste de vos abonné·e·s sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistré·e·s. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonné·e·s, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimer un post, il est probable que vos abonné·e·s en soient informé·e·s. Partager un message ou le marquer comme favori est toujours une action publique.</li>
-      <li><em>Posts directs et abonné·e·s uniquement</em> : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. <em>Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partager aucune information sensible à l’aide de Mastodon.</em></li>
-      <li><em>IP et autres métadonnées</em> : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Que faisons-nous des informations que nous collectons ?</h3>
-
-      <p>Toutes les informations que nous collectons sur vous peuvent être utilisées d’une des manières suivantes :</p>
-
-      <ul>
-      <li>Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.</li>
-      <li>Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.</li>
-      <li>L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Comment protégeons-nous vos informations ?</h3>
-
-      <p>Nous mettons en œuvre une variété de mesures de sécurité afin de garantir la sécurité de vos informations personnelles quand vous les saisissez, les soumettez et les consultez. Entre autres choses, votre session de navigation ainsi que le trafic entre votre application et l’API sont sécurisés à l’aide de TLS tandis que votre mot de passe est haché en utilisant un puissant algorithme à sens unique. Vous pouvez également activer l’authentification à deux facteurs pour sécuriser encore plus l’accès à votre compte.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Quelle est notre politique de conservation des données ?</h3>
-
-      <p>Nous ferons un effort de bonne foi :</p>
-
-      <ul>
-      <li>Pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.</li>
-      <li>Pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateur·ice·s enregistré·e·s.</li>
-      </ul>
-
-      <p>Vous pouvez demander une archive de votre contenu, incluant vos posts, vos médias joints, votre image de profil et votre image d’en-tête.</p>
-
-      <p>Vous pouvez, à n’importe quel moment, supprimer votre compte de manière définitive.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Utilisons-nous des témoins de connexion ?</h3>
-
-      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transféres sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et de, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
-
-      <p>Nous utilisons les témoins de connexion comme un moyen de comprendre et de nous souvenir de vos préférences pour vos prochaines visites.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Divulguons-nous des informations à des tierces parties ?</h3>
-
-      <p>Nous ne vendons, n’échangeons ou ne transférons d’une quelque manière que soit des informations permettant de vous identifier personnellement. Cela n’inclut pas les tierces parties de confiance qui nous aident à opérer ce site, à conduire nos activités commerciales ou à vous servir, tant qu’elles acceptent de garder ces informations confidentielles. Nous sommes également susceptibles de partager vos informations quand nous pensons que c’est nécessaire pour nous conformer à la loi, pour appliquer les politiques de notre site ainsi que pour défendre nos droits, notre propriété, notre sécurité et celles et ceux d’autres personnes.</p>
-
-      <p>Votre contenu public peut être téléchargé par d’autres serveurs du réseau. Dans le cas où vos abonné·e·s et vos destinataires résideraient sur des serveurs différents du vôtre, vos posts publics et abonné·e·s uniquement peuvent être délivrés vers les serveurs de vos abonné·e·s tandis que vos messages directs sont délivrés aux serveurs de vos destinataires.</p>
-
-      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, votre liste d’abonnements, votre liste d’abonné·e·s, vos listes, tout vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Utilisation de ce site par les enfants</h3>
-
-      <p>Si ce serveur est situé dans dans l’UE ou l’EEE : Notre site, produits et services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
-
-      <p>Si ce serveur est situé dans aux États-Unis d’Amérique : Notre site, produits et services sont tous destinés à des personnes âgées de 13 ans ou plus. Si vous avez moins de 13 ans, en application du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), merci de ne pas utiliser ce site.</p>
-
-      <p>Les exigences légales peuvent être différentes si ce serveur se trouve dans une autre juridiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Modifications de notre politique de confidentialité</h3>
-
-      <p>Dans le cas où nous déciderions de changer notre politique de confidentialité, nous posterons les modifications sur cette page.</p>
-
-      <p>Ce document est publié sous lincence CC-BY-SA. Il a été mis à jours pour la dernière fois le 7 mars 2018.</p>
-
-      <p>Originellement adapté de la <a href="https://github.com/discourse/discourse">politique de confidentialité de Discourse</a>.</p>
-    title: Termini d’usu è di cunfidenzialità per %{instance}
   themes:
     contrast: Mastodon (Cuntrastu altu)
     default: Mastodon (Scuru)
@@ -1408,59 +1074,31 @@ co:
       explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
       subject: U vostru archiviu hè prontu à scaricà
       title: Archiviu prontu
-    sign_in_token:
-      details: 'Ditagli di u tentativu quì sottu:'
-      explanation: 'Avemu ditettatu un tentativu di cunnessione nant''à u vostru contu da un''indirizzu IP ch''ùn avemu micca ricunisciutu. S''ellu era voi, vi pricuremu d''entrà u codice di sicurità quì sottu nant''à a pagina di cunfirmazione di cunnessione:'
-      further_actions: 'S''ellu ùn era micca voi, duvete cambià a vostra chjave d''accessu è attivà l''identificazione à dui fattori nant''à u vostru contu. Pudete fà quessi quì:'
-      subject: Cunfirmate u tentativu di cunnessione
-      title: Tentativu di cunnessione
     warning:
-      explanation:
-        disable: Quandu u vostru contu hè ghjacciatu, i vostri dati stannu intatti, mà ùn pudete fà nunda fin'à ch'ellu sia sbluccatu.
-        sensitive: I vostri media caricati è in ligami saranu trattati cum'è sensibili.
-        silence: Quandu u vostru contu hè limitatu, solu quelli chì sò digià abbunati à u vostru contu viderenu i vostri statuti nant'à quessu servore, è puderete esse esclusu·a di parechje liste pubbliche. Però, altri conti puderenu sempre seguitavi.
-        suspend: U vostru contu hè statu suspesu, è tutti i vo statuti è fugliali media caricati sò stati sguassati di manera irreversibile di stu servore, è di i servori induve aviate abbunati.
-      get_in_touch: Pudete risponde à quest'e-mail per cuntattà a squadra di muderazione di %{instance}.
-      review_server_policies: Leghje e pulitiche di u servore
-      statuses: 'Più pricisamente, per:'
       subject:
         disable: U vostru contu %{acct} hè statu ghjacciatu
         none: Avertimentu pè %{acct}
-        sensitive: I media di u vostru contu %{acct} sò stati marcati cum'è sensibili
         silence: U vostru contu %{acct} hè statu limitatu
         suspend: U vostru contu %{acct} hè statu suspesu
       title:
         disable: Contu ghjacciatu
         none: Avertimentu
-        sensitive: U vostru media hè statu marcatu cum'è sensibile
         silence: Contu limitatu
         suspend: Contu suspesu
     welcome:
       edit_profile_action: Cunfigurazione di u prufile
-      edit_profile_step: Pudete persunalizà u vostru prufile cù un ritrattu di prufile o di cuprendula, un nome pubblicu persunalizatu, etc. Pudete ancu rende u contu privatu per duvè cunfirmà ogni dumanda d’abbunamentu.
       explanation: Eccu alcune idee per principià
       final_action: Principià à pustà
-      final_step: 'Andemu! Ancu senza abbunati i vostri missaghji pubblichi puderanu esse visti da altre persone, per esempiu nant’a linea lucale è l’hashtag. Pudete ancu prisintavi nant’à u hashtag #introductions.'
       full_handle: U vostru identificatore cumplettu
       full_handle_hint: Quessu ghjè cio chì direte à i vostri amichi per circavi, abbunassi à u vostru contu da altrò, o mandà missaghji.
-      review_preferences_action: Mudificà e priferenze
-      review_preferences_step: Quì pudete adattà u cumpurtamentu di Mastodon à e vostre priferenze, cum’è l’email che vulete riceve, u nivellu di cunfidenzialità predefinitu di i vostri statuti, o u cumpurtamentu di i GIF animati.
       subject: Benvenutu·a nant’à Mastodon
-      tip_federated_timeline: A linea pubblica glubale mostra i statuti da altre istanze nant’a rete Mastodon, mà ùn hè micca cumpleta perchè ci sò soli i conti à quelli sò abbunati membri di a vostr’istanza.
-      tip_following: Site digià abbunatu·a à l’amministratori di u vostru servore. Per truvà d’altre parsone da siguità, pudete pruvà e linee pubbliche.
-      tip_local_timeline: A linea pubblica lucale ghjè una vista crunulogica di i statuti di a ghjente nant’à %{instance}. Quessi sò i vostri cunvicini!
-      tip_mobile_webapp: Pudete aghjunghje Mastodon à a pagina d’accolta di u vostru navigatore di telefuninu per riceve nutificazione, cum’un applicazione!
-      tips: Cunsiglii
       title: Benvenutu·a, %{name}!
   users:
     follow_limit_reached: Ùn pidete seguità più di %{limit} conti
-    generic_access_help_html: Prublemi d'accessu à u vostru contu? Pudete cuntattà %{email} per ottene aiutu
     invalid_otp_token: U codice d’identificazione ùn hè currettu
-    invalid_sign_in_token: Codice di sicurità micca validu
     otp_lost_help_html: S’è voi avete persu i dui, pudete cuntattà %{email}
     seamless_external_login: Site cunnettatu·a dapoi un serviziu esternu, allora i parametri di chjave d’accessu è d’indirizzu e-mail ùn so micca dispunibili.
     signed_in_as: 'Cunnettatu·a cum’è:'
-    suspicious_sign_in_confirmation: Ci pare ch'ùn vi site mai cunnettatu·a da quess'apparechju, è ùn vi site micca cunnettatu·a dapoi una stonda, allora vi mandemu un codice di sicurità à u vostr'indirizzu e-mail per cunfirmà chì site voi.
   verification:
     explanation_html: 'Pudete <strong>verificavi cum''è u pruprietariu di i ligami in i metadati di u vostru prufile</strong>. Per quessa, u vostru situ deve avè un ligame versu a vostra pagina Mastodon. U ligame <strong>deve</strong> avè un''attributu <code>rel="me"</code>. U cuntenutu di u testu di u ligame ùn hè micca impurtante. Eccu un''esempiu:'
     verification: Verificazione
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 704f703c6..21ba100ea 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1,66 +1,12 @@
 ---
 cs:
   about:
-    about_hashtag_html: Tohle jsou veřejné příspěvky označené hashtagem <strong>#%{hashtag}</strong>. Pokud máte účet kdekoliv ve fedivesmíru, můžete s nimi interagovat.
     about_mastodon_html: 'Sociální síť budoucnosti: žádné reklamy, žádné korporátní sledování, etický design a decentralizace! S Mastodonem vlastníte svoje data!'
-    about_this: O tomto serveru
-    active_count_after: aktivních
-    active_footnote: Měsíční aktivní uživatelé (MAU)
-    administered_by: 'Server spravuje:'
-    api: API
-    apps: Mobilní aplikace
-    apps_platforms: Používejte Mastodon na iOS, Androidu a dalších platformách
-    browse_directory: Prozkoumejte adresář profilů a filtrujte dle zájmů
-    browse_local_posts: Prozkoumejte živý proud veřejných příspěvků z tohoto serveru
-    browse_public_posts: Prozkoumejte živý proud veřejných příspěvků na Mastodonu
-    contact: Kontakt
     contact_missing: Nenastaveno
     contact_unavailable: Neuvedeno
-    discover_users: Objevujte uživatele
-    documentation: Dokumentace
-    federation_hint_html: S účtem na serveru %{instance} můžete sledovat lidi na jakémkoliv ze serverů Mastodon a dalších službách.
-    get_apps: Vyzkoušejte mobilní aplikaci
     hosted_on: Mastodon na doméně %{domain}
-    instance_actor_flash: |
-      Tento účet je virtuální aktér, který představuje server samotný, nikoliv účet jednotlivého uživatele.
-      Používá se pro účely federace a nesmí být blokován, pokud nechcete blokovat celý server. V takovém případě použijte blokaci domény.
-    learn_more: Zjistit více
-    privacy_policy: Zásady ochrany osobních údajů
-    rules: Pravidla serveru
-    rules_html: 'Níže je shrnutí pravidel, která musíte dodržovat, pokud chcete mít účet na tomto Mastodon serveru:'
-    see_whats_happening: Podívejte se, co se děje
-    server_stats: 'Statistika serveru:'
-    source_code: Zdrojový kód
-    status_count_after:
-      few: příspěvky
-      many: příspěvků
-      one: příspěvek
-      other: příspěvků
-    status_count_before: Kteří napsali
-    tagline: Sledujte své přátele a objevujte nové
-    terms: Podmínky používání
-    unavailable_content: Moderované servery
-    unavailable_content_description:
-      domain: Server
-      reason: Důvod
-      rejecting_media: 'Mediální soubory z tohoto serveru nebudou zpracovány a nebudou zobrazeny žádné náhledy. Pro prohlédnutí médií bude třeba manuálně přejít na druhý server:'
-      rejecting_media_title: Filtrovaná média
-      silenced: 'Příspěvky z těchto serverů nebudou zobrazeny ve veřejných časových osách a konverzacích a nebudou generována oznámení o interakcích uživatelů z toho serveru, pokud je nesledujete:'
-      silenced_title: Omezené servery
-      suspended: 'Žádná data z těchto serverů nebudou zpracována, ukládána ani vyměňována, čímž bude znemožněna jakákoliv interakce či komunikace s uživateli z těchto serverů:'
-      suspended_title: Pozastavené servery
-    unavailable_content_html: Mastodon vám obvykle dovoluje prohlížet si obsah a komunikovat s uživateli z jakéhokoliv dalšího serveru ve fedivesmíru. Tohle jsou výjimky, které byly zavedeny na tomto konkrétním serveru.
-    user_count_after:
-      few: uživatelé
-      many: uživatelů
-      one: uživatel
-      other: uživatelů
-    user_count_before: Domov
-    what_is_mastodon: Co je Mastodon?
+    title: O aplikaci
   accounts:
-    choices_html: 'Volby %{name}:'
-    endorsements_hint: Z webového rozhraní můžete podpořit lidi, které sledujete. Ti se poté zobrazí zde.
-    featured_tags_hint: Můžete vybrat konkrétní hashtagy, které se zobrazí zde.
     follow: Sledovat
     followers:
       few: Sledující
@@ -69,16 +15,9 @@ cs:
       other: Sledujících
     following: Sledovaných
     instance_actor_flash: Tento účet je virtuální aktér, který představuje server samotný, nikoliv jednotlivého uživatele. Používá se pro účely federace a neměl by být pozastaven.
-    joined: Uživatelem od %{date}
     last_active: naposledy aktivní
     link_verified_on: Vlastnictví tohoto odkazu bylo zkontrolováno %{date}
-    media: Média
-    moved_html: "%{name} se přesunul a na %{new_profile_link}:"
-    network_hidden: Tato informace není k dispozici
-    never_active: Nikdy
     nothing_here: Nic tu není!
-    people_followed_by: Lidé, které sleduje %{name}
-    people_who_follow: Lidé, kteří sledují %{name}
     pin_errors:
       following: Osobu, kterou chcete podpořit, už musíte sledovat
     posts:
@@ -87,14 +26,6 @@ cs:
       one: Příspěvek
       other: Příspěvků
     posts_tab_heading: Příspěvky
-    posts_with_replies: Příspěvky a odpovědi
-    roles:
-      admin: Administrátor
-      bot: Robot
-      group: Skupina
-      moderator: Moderátor
-    unavailable: Profil není dostupný
-    unfollow: Přestat sledovat
   admin:
     account_actions:
       action: Vykonat akci
@@ -102,26 +33,30 @@ cs:
     account_moderation_notes:
       create: Zanechat poznámku
       created_msg: Moderátorská poznámka byla úspěšně vytvořena!
-      delete: Smazat
       destroyed_msg: Moderátorská poznámka byla úspěšně zničena!
     accounts:
       add_email_domain_block: Blokovat e-mailovou doménu
       approve: Schválit
-      approve_all: Schválit vše
       approved_msg: Žádost o registraci uživatele %{username} úspěšně schválena
       are_you_sure: Opravdu?
       avatar: Avatar
       by_domain: Doména
       change_email:
-        changed_msg: E-mail k tomuto účtu byl úspěšně změněn!
+        changed_msg: E-mail úspěšně změněn!
         current_email: Současný e-mail
         label: Změnit e-mail
         new_email: Nový e-mail
         submit: Změnit e-mail
         title: Změnit e-mail uživateli %{username}
+      change_role:
+        changed_msg: Role úspěšně změněna!
+        label: Změnit roli
+        no_role: Žádná role
+        title: Změnit roli pro %{username}
       confirm: Potvrdit
       confirmed: Potvrzeno
       confirming: Potvrzuji
+      custom: Vlastní
       delete: Smazat data
       deleted: Smazáno
       demote: Degradovat
@@ -140,7 +75,7 @@ cs:
       enabled: Povoleno
       enabled_msg: Účet %{username} byl úspěšně rozmrazen
       followers: Sledující
-      follows: Sleduje
+      follows: Sledované
       header: Záhlaví
       inbox_url: URL příchozí schránky
       invite_request_text: Důvody založení
@@ -161,7 +96,7 @@ cs:
         active: Aktivní
         all: Vše
         pending: Čekající
-        silenced: Omezené
+        silenced: Omezeno
         suspended: Pozastavené
         title: Moderování
       moderation_notes: Moderátorské poznámky
@@ -169,9 +104,16 @@ cs:
       most_recent_ip: Nejnovější IP adresa
       no_account_selected: Nebyl změněn žádný účet, neboť žádný nebyl zvolen
       no_limits_imposed: Nejsou nastavena žádná omezení
+      no_role_assigned: Nebyla přiřazena žádná role
       not_subscribed: Neodebírá
       pending: Čeká na posouzení
       perform_full_suspension: Pozastavit
+      previous_strikes: Předchozí prohřešky
+      previous_strikes_description_html:
+        few: Tento účet má <strong>%{count}</strong> prohřešky.
+        many: Tento účet má <strong>%{count}</strong> prohřešků.
+        one: Tento účet má <strong>jeden</strong> prohřešek.
+        other: Tento účet má <strong>%{count}</strong> prohřešků.
       promote: Povýšit
       protocol: Protokol
       public: Veřejný
@@ -179,8 +121,9 @@ cs:
       redownload: Obnovit profil
       redownloaded_msg: Profil účtu %{username} byl úspěšně obnoven ze zdroje
       reject: Zamítnout
-      reject_all: Zamítnout vše
       rejected_msg: Žádost o registraci uživatele %{username} úspěšně zamítnuta
+      remote_suspension_irreversible: Data tohoto účtu byla nevratně smazána.
+      remote_suspension_reversible_hint_html: Účet byl pozastaven na svém serveru a data budou plně odstraněna dne %{date}. Do té doby může vzdálený server obnovit tento účet bez jakýchkoliv špatných efektů. Pokud chcete okamžitě odstranit všechna data účtu, můžete tak učinit níže.
       remove_avatar: Odstranit avatar
       remove_header: Odstranit záhlaví
       removed_avatar_msg: Úspěšně odstraněn avatar uživatele %{username}
@@ -192,21 +135,15 @@ cs:
       reset: Obnovit
       reset_password: Obnovit heslo
       resubscribe: Znovu odebírat
-      role: Oprávnění
-      roles:
-        admin: Administrátor
-        moderator: Moderátor
-        staff: Člen personálu
-        user: Uživatel
+      role: Role
       search: Hledat
       search_same_email_domain: Ostatní uživatelé se stejnou e-mailovou doménou
       search_same_ip: Další uživatelé se stejnou IP adresou
       security_measures:
         only_password: Pouze heslo
         password_and_2fa: Heslo a 2FA
-        password_and_sign_in_token: Heslo a e-mailový token
-      sensitive: Citlivý
-      sensitized: označen jako citlivý
+      sensitive: Vynutit citlivost
+      sensitized: Označen jako citlivý
       shared_inbox_url: URL sdílené příchozí schránky
       show:
         created_reports: Vytvořená hlášení
@@ -214,17 +151,20 @@ cs:
       silence: Omezit
       silenced: Omezen
       statuses: Příspěvky
+      strikes: Předchozí prohřešky
       subscribe: Odebírat
+      suspend: Pozastavit
       suspended: Uživatel pozastaven
       suspension_irreversible: Data tohoto účtu byla nevratně smazána. Účet můžete obnovit, aby byl použitelný, ale nebudou obnovena žádná jeho dřívější data.
       suspension_reversible_hint_html: Účet byl pozastaven a jeho data budou kompletně smazána %{date}. Do té doby může být tento účet kompletně obnoven do původního stavu. Chcete-li smazat všechna data účtu ihned, můžete tak učinit níže.
-      time_in_queue: Čeká ve frontě %{time}
       title: Účty
+      unblock_email: Odblokovat e-mailovou adresu
+      unblocked_email_msg: E-mailová adresa %{username} byla úspěšně odblokována
       unconfirmed_email: Nepotvrzený e-mail
-      undo_sensitized: Vrátit zpět citlivost
+      undo_sensitized: Zrušit vynucení citlivosti
       undo_silenced: Zrušit omezení
       undo_suspension: Zrušit pozastavení
-      unsilenced_msg: Omezení účtu %{username} úspěšně odstraněno
+      unsilenced_msg: Omezení účtu %{username} úspěšně zrušeno
       unsubscribe: Přestat odebírat
       unsuspended_msg: Úspěšně obnoven účet %{username}
       username: Uživatelské jméno
@@ -234,26 +174,34 @@ cs:
       whitelisted: Povoleno federovat
     action_logs:
       action_types:
+        approve_appeal: Schválit odvolání
+        approve_user: Schválit uživatele
         assigned_to_self_report: Přiřadit hlášení
         change_email_user: Změnit uživateli e-mailovou adresu
+        change_role_user: Změnit roli uživatele
         confirm_user: Potvrdit uživatele
         create_account_warning: Vytvořit varování
         create_announcement: Nové oznámení
+        create_canonical_email_block: Zablokovat email
         create_custom_emoji: Vytvořit vlastní emoji
-        create_domain_allow: Povolit doménu
-        create_domain_block: Zablokovat doménu
+        create_domain_allow: Vytvořit povolení domény
+        create_domain_block: Vytvořit blokaci domény
         create_email_domain_block: Zablokovat e-mailovou doménu
         create_ip_block: Vytvořit IP pravidlo
         create_unavailable_domain: Vytvořit nedostupnou doménu
+        create_user_role: Vytvořit roli
         demote_user: Snížit roli uživatele
         destroy_announcement: Odstranit oznámení
+        destroy_canonical_email_block: Odblokovat email
         destroy_custom_emoji: Odstranit vlastní emoji
-        destroy_domain_allow: Odstranit povolenou doménu
-        destroy_domain_block: Odstranit blokování domény
+        destroy_domain_allow: Odstranit povolení domény
+        destroy_domain_block: Odstranit blokaci domény
         destroy_email_domain_block: Smazat blokaci e-mailové domény
+        destroy_instance: Odmazat doménu
         destroy_ip_block: Smazat IP pravidlo
         destroy_status: Odstranit Příspěvek
         destroy_unavailable_domain: Smazat nedostupnou doménu
+        destroy_user_role: Zničit roli
         disable_2fa_user: Vypnout 2FA
         disable_custom_emoji: Zakázat vlastní emoji
         disable_sign_in_token_auth_user: Zrušit uživatelovo ověřování e-mailovým tokenem
@@ -263,42 +211,56 @@ cs:
         enable_user: Povolit uživatele
         memorialize_account: Změna na „in memoriam“
         promote_user: Povýšit uživatele
+        reject_appeal: Zamítnout odvolání
+        reject_user: Odmítnout uživatele
         remove_avatar_user: Odstranit avatar
         reopen_report: Znovu otevřít hlášení
+        resend_user: Znovu odeslat potvrzovací e-mail
         reset_password_user: Obnovit heslo
         resolve_report: Označit hlášení jako vyřešené
-        sensitive_account: Označit média ve vašem účtu jako citlivá
+        sensitive_account: Vynucení citlivosti účtu
         silence_account: Omezit účet
         suspend_account: Pozastavit účet
         unassigned_report: Zrušit přiřazení hlášení
-        unsensitive_account: Zrušit označení médií ve vašem účtu jako citlivých
+        unblock_email_account: Odblokovat e-mailovou adresu
+        unsensitive_account: Zrušit vynucení citlivosti účtu
         unsilence_account: Zrušit omezení účtu
         unsuspend_account: Zrušit pozastavení účtu
         update_announcement: Aktualizovat oznámení
         update_custom_emoji: Aktualizovat vlastní emoji
         update_domain_block: Změnit blokaci domény
+        update_ip_block: Aktualizovat pravidlo IP
         update_status: Aktualizovat Příspěvek
+        update_user_role: Aktualizovat roli
       actions:
+        approve_appeal_html: Uživatel %{name} schválil odvolání proti rozhodnutí moderátora %{target}
+        approve_user_html: "%{name} schválil registraci od %{target}"
         assigned_to_self_report_html: Uživatel %{name} si přidělil hlášení %{target}
         change_email_user_html: Uživatel %{name} změnil e-mailovou adresu uživatele %{target}
+        change_role_user_html: "%{name} změnil roli %{target}"
         confirm_user_html: Uživatel %{name} potvrdil e-mailovou adresu uživatele %{target}
-        create_account_warning_html: Uživatel %{name} poslal varování uživateli %{target}
+        create_account_warning_html: Uživatel %{name} poslal %{target} varování
         create_announcement_html: Uživatel %{name} vytvořil nové oznámení %{target}
+        create_canonical_email_block_html: "%{name} zablokoval e-mail s hash %{target}"
         create_custom_emoji_html: Uživatel %{name} nahrál nové emoji %{target}
         create_domain_allow_html: Uživatel %{name} povolil federaci s doménou %{target}
         create_domain_block_html: Uživatel %{name} zablokoval doménu %{target}
         create_email_domain_block_html: Uživatel %{name} zablokoval e-mailovou doménu %{target}
-        create_ip_block_html: "%{name} vytvořil pravidlo pro IP %{target}"
+        create_ip_block_html: Uživatel %{name} vytvořil pravidlo pro IP %{target}
         create_unavailable_domain_html: "%{name} zastavil doručování na doménu %{target}"
+        create_user_role_html: "%{name} vytvořil %{target} roli"
         demote_user_html: Uživatel %{name} degradoval uživatele %{target}
         destroy_announcement_html: Uživatel %{name} odstranil oznámení %{target}
-        destroy_custom_emoji_html: Uživatel %{name} zničil emoji %{target}
+        destroy_canonical_email_block_html: "%{name} odblokoval e-mail s hashem %{target}"
+        destroy_custom_emoji_html: "%{name} odstranil emoji %{target}"
         destroy_domain_allow_html: Uživatel %{name} zakázal federaci s doménou %{target}
         destroy_domain_block_html: Uživatel %{name} odblokoval doménu %{target}
         destroy_email_domain_block_html: Uživatel %{name} odblokoval e-mailovou doménu %{target}
-        destroy_ip_block_html: "%{name} odstranil pravidlo pro IP %{target}"
+        destroy_instance_html: Uživatel %{name} odmazal doménu %{target}
+        destroy_ip_block_html: Uživatel %{name} odstranil pravidlo pro IP %{target}
         destroy_status_html: Uživatel %{name} odstranil příspěvek uživatele %{target}
         destroy_unavailable_domain_html: "%{name} obnovil doručování na doménu %{target}"
+        destroy_user_role_html: "%{name} odstranil %{target} roli"
         disable_2fa_user_html: Uživatel %{name} vypnul dvoufázové ověřování pro uživatele %{target}
         disable_custom_emoji_html: Uživatel %{name} zakázal emoji %{target}
         disable_sign_in_token_auth_user_html: Uživatel %{name} zrušil ověřování e-mailovým tokenem pro %{target}
@@ -308,26 +270,32 @@ cs:
         enable_user_html: Uživatel %{name} povolil přihlašování pro uživatele %{target}
         memorialize_account_html: Uživatel %{name} změnil účet %{target} na „in memoriam“ stránku
         promote_user_html: Uživatel %{name} povýšil uživatele %{target}
+        reject_appeal_html: Uživatel %{name} zamítl odvolání proti rozhodnutí moderátora %{target}
+        reject_user_html: "%{name} odmítl registraci od %{target}"
         remove_avatar_user_html: Uživatel %{name} odstranil avatar uživatele %{target}
         reopen_report_html: Uživatel %{name} znovu otevřel hlášení %{target}
+        resend_user_html: "%{name} znovu odeslal potvrzovací e-mail pro %{target}"
         reset_password_user_html: Uživatel %{name} obnovil heslo uživatele %{target}
         resolve_report_html: Uživatel %{name} vyřešil hlášení %{target}
         sensitive_account_html: "%{name} označil média účtu %{target} jako citlivá"
-        silence_account_html: Uživatel %{name} ztišil uživatele %{target}
+        silence_account_html: Uživatel %{name} omezil účet %{target}
         suspend_account_html: Uživatel %{name} pozastavil účet uživatele %{target}
         unassigned_report_html: Uživatel %{name} odebral hlášení %{target}
+        unblock_email_account_html: Uživatel %{name} odblokoval e-mailovou adresu %{target}
         unsensitive_account_html: "%{name} zrušil označení médií účtu %{target} jako citlivých"
-        unsilence_account_html: Uživatel %{name} zrušil ztišení uživatele %{target}
+        unsilence_account_html: Uživatel %{name} zrušil omezení účtu %{target}
         unsuspend_account_html: Uživatel %{name} zrušil pozastavení účtu uživatele %{target}
         update_announcement_html: Uživatel %{name} aktualizoval oznámení %{target}
         update_custom_emoji_html: Uživatel %{name} aktualizoval emoji %{target}
         update_domain_block_html: "%{name} aktualizoval blokaci domény %{target}"
+        update_ip_block_html: "%{name} změnil pravidlo pro IP %{target}"
         update_status_html: Uživatel %{name} aktualizoval příspěvek uživatele %{target}
-      deleted_status: "(smazaný příspěvek)"
+        update_user_role_html: "%{name} změnil %{target} roli"
+      deleted_account: smazaný účet
       empty: Nebyly nalezeny žádné záznamy.
       filter_by_action: Filtrovat podle akce
       filter_by_user: Filtrovat podle uživatele
-      title: Auditovací protokol
+      title: Protokol auditu
     announcements:
       destroyed_msg: Oznámení bylo úspěšně odstraněno!
       edit:
@@ -362,11 +330,12 @@ cs:
       enable: Povolit
       enabled: Povoleno
       enabled_msg: Emoji bylo úspěšně povoleno
-      image_hint: PNG až do 50 KB
+      image_hint: PNG nebo GIF do %{size}
       list: Uvést
       listed: Uvedeno
       new:
         title: Přidat nové vlastní emoji
+      no_emoji_selected: Žádné emoji nebyly změněny, protože nikdo nebyl vybrán
       not_permitted: K provedené této akce nemáte dostatečná oprávnění
       overwrite: Přepsat
       shortcode: Zkratka
@@ -384,21 +353,26 @@ cs:
       media_storage: Úložiště médií
       new_users: noví uživatelé
       opened_reports: podáno hlášení
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> čekající odvolání"
+        many: "<strong>%{count}</strong> čekajících odvolání"
+        one: "<strong>%{count}</strong> čekající odvolání"
+        other: "<strong>%{count}</strong> čekajících odvolání"
       pending_reports_html:
         few: "<strong>%{count}</strong> čekající hlášení"
         many: "<strong>%{count}</strong> čekajících hlášení"
-        one: "<strong>1</strong> čekající hlášení"
-        other: "<strong>%{count}</strong> čekající hlášení"
+        one: "<strong>%{count}</strong> čekající hlášení"
+        other: "<strong>%{count}</strong> čekajících hlášení"
       pending_tags_html:
         few: "<strong>%{count}</strong> čekající hashtagy"
         many: "<strong>%{count}</strong> čekajících hashtagů"
-        one: "<strong>1</strong> čekající hashtag"
-        other: "<strong>%{count}</strong> čekající hashtagy"
+        one: "<strong>%{count}</strong> čekající hashtag"
+        other: "<strong>%{count}</strong> čekajících hashtagů"
       pending_users_html:
         few: "<strong>%{count}</strong> čekající uživatelé"
         many: "<strong>%{count}</strong> čekajících uživatelů"
-        one: "<strong>1</strong> čekající uživatel"
-        other: "<strong>%{count}</strong> čekající uživatel"
+        one: "<strong>%{count}</strong> čekající uživatel"
+        other: "<strong>%{count}</strong> čekajících uživatelů"
       resolved_reports: vyřešeno hlášení
       software: Software
       sources: Zdroje registrací
@@ -407,27 +381,38 @@ cs:
       top_languages: Nejaktivnější jazyky
       top_servers: Nejaktivnější servery
       website: Webová stránka
+    disputes:
+      appeals:
+        empty: Nenalazena žádná odvolání.
+        title: Odvolání
     domain_allows:
       add_new: Povolit federaci s doménou
       created_msg: S doménou byla úspěšně povolena federace
       destroyed_msg: S doménou byla zakázána federace
+      export: Export
+      import: Import
       undo: Zakázat federaci s doménou
     domain_blocks:
       add_new: Přidat novou blokaci domény
       created_msg: Blokace domény se právě vyřizuje
-      destroyed_msg: Blokace domény byla zrušena
+      destroyed_msg: Blokace domény byla odvolána
       domain: Doména
-      edit: Upravit doménovou blokaci
-      existing_domain_block_html: Pro účet %{name} jste už nastavili přísnější omezení, nejprve jej <a href="%{unblock_url}">odblokujte</a>.
+      edit: Upravit blokaci domény
+      existing_domain_block: Pro %{name} už jste nastavili přísnější omezení.
+      existing_domain_block_html: Pro %{name} už jste nastavili přísnější omezení, nejprve ji <a href="%{unblock_url}">odblokujte</a>.
+      export: Export
+      import: Import
       new:
         create: Vytvořit blokaci
         hint: Blokace domény nezakáže vytváření záznamů účtů v databázi, ale bude na tyto účty zpětně a automaticky aplikovat specifické metody moderování.
         severity:
-          desc_html: "<strong>Ztišení</strong> skryje příspěvky z účtu komukoliv, kdo jej nesleduje. <strong>Pozastavení</strong> odstraní všechen obsah, média a profilová data účtu. Pro pouhé odmítnutí mediálních souborů použijte funkci <strong>Žádné</strong>."
+          desc_html: "<strong>Omezit</strong> zneviditelní příspěvky účtů z této domény všem, kdo je nesledují. <strong>Pozastavit</strong> odstraní z vašeho serveru všechna data obsahu, médií a profilu účtů z této domény. Pokud chcete pouze odmítnout mediální soubory, použijte <strong>Nic</strong>."
           noop: Žádné
-          silence: Ztišit
+          silence: Omezit
           suspend: Pozastavit
         title: Nová blokace domény
+      no_domain_block_selected: Nebyly změněny žádné blokované domény, protože nebyla žádná vybrána
+      not_permitted: K provedení této akce nemáte oprávnění
       obfuscate: Obfuskovat doménu
       obfuscate_hint: Částečně zkreslit název domény v seznamu, pokud je povoleno zveřejnění seznamu omezených domén
       private_comment: Soukromý komentář
@@ -438,36 +423,43 @@ cs:
       reject_media_hint: Odstraní lokálně uložené mediální soubory a odmítne jejich stahování v budoucnosti. Nepodstatné pro pozastavení
       reject_reports: Odmítat hlášení
       reject_reports_hint: Ignorovat všechna hlášení pocházející z této domény. Nepodstatné pro pozastavení
-      rejecting_media: odmítají se mediální soubory
-      rejecting_reports: odmítají se hlášení
-      severity:
-        silence: omezena
-        suspend: pozastaveno
-      show:
-        affected_accounts:
-          few: "%{count} účty v databázi byly ovlivněny"
-          many: "%{count} účtů v databázi bylo ovlivněno"
-          one: Jeden účet v databázi byl ovlivněn
-          other: "%{count} účtů v databázi bylo ovlivněno"
-        retroactive:
-          silence: Vzít zpět omezení existujících dotčených účtů z této domény
-          suspend: Zrušit pozastavení existujících ovlivněných účtů z této domény
-        title: Zrušit blokaci domény %{domain}
-        undo: Odvolat
       undo: Odvolat blokaci domény
       view: Zobrazit blokaci domény
     email_domain_blocks:
       add_new: Přidat
+      attempts_over_week:
+        few: "%{count} pokusy o registraci za poslední týden"
+        many: "%{count} pokusů o registraci za poslední týden"
+        one: "%{count} pokus o registraci za poslední týden"
+        other: "%{count} pokusů o registraci za poslední týden"
       created_msg: E-mailová doména úspěšně zablokována
       delete: Smazat
-      destroyed_msg: E-mailová doména úspěšně odblokována
+      dns:
+        types:
+          mx: MX záznam
       domain: Doména
-      empty: Žádné e-mailové domény nejsou aktuálně blokovány.
-      from_html: z domény %{domain}
       new:
         create: Přidat doménu
+        resolve: Přeložit doménu
         title: Blokovat novou e-mailovou doménu
+      no_email_domain_block_selected: Žádné blokace e-mailové domény nebyly změněny, protože nebyly žádné vybrány
+      resolved_dns_records_hint_html: Doménové jméno vede na následující MX domény, které mají nakonec na starost přijímání e-mailů. Blokování MX domény zablokuje registrace z jakékoliv e-mailové adresy, která používá stejnou MX doménu, i když je viditelné doménové jméno jiné. <strong>Dejte si pozor, abyste nezablokovali velké e-mailové poskytovatele.</strong>
+      resolved_through_html: Přeložena přes %{domain}
       title: Blokované e-mailové domény
+    export_domain_allows:
+      new:
+        title: Importovat povolené domény
+      no_file: Nebyl vybrán žádný soubor
+    export_domain_blocks:
+      import:
+        description_html: Chystáte se importovat seznam blokovaných domén. Zkontrolujte prosím tento seznam velmi opatrně, zejména pokud jste tento seznam nenapsali vy sami.
+        existing_relationships_warning: Existující vztahy sledování
+        private_comment_description_html: 'Abychom vám pomohli sledovat, odkud pochází importované bloky, budou tyto importované bloky vytvořeny s následující soukromou poznámkou: <q>%{comment}</q>'
+        private_comment_template: Importováno z %{source} dne %{date}
+        title: Importovat blokované domény
+      new:
+        title: Importovat blokované domény
+      no_file: Nebyl vybrán žádný soubor
     follow_recommendations:
       description_html: "<strong>Doporučená sledování pomáhají novým uživatelům rychle najít zajímavý obsah</strong>. Pokud uživatel neinteragoval s ostatními natolik, aby mu byla vytvořena doporučená sledování na míru, jsou použity tyto účty. Jsou přepočítávány na denní bázi ze směsi účtů s největším nedávným zapojením a nejvyšším počtem místních sledovatelů pro daný jazyk."
       language: Pro jazyk
@@ -477,27 +469,57 @@ cs:
       title: Doporučená sledování
       unsuppress: Obnovit doporučení sledování
     instances:
+      availability:
+        description_html:
+          few: Pokud doručování na doménu selže ve <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          many: Pokud doručování na doménu selže v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          one: Pokud doručování na doménu selže <strong>%{count} den</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          other: Pokud doručování na doménu selže v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+        failure_threshold_reached: Prahu selhání dosaženo %{date}.
+        failures_recorded:
+          few: Neúspěšné pokusy ve %{count} různých dnech.
+          many: Neúspěšné pokusy ve %{count} různých dnech.
+          one: Neúspěšný pokus v %{count} dni.
+          other: Neúspěšné pokusy ve %{count} různých dnech.
+        no_failures_recorded: Žádné zaznamenané selhání.
+        title: Dostupnost
+        warning: Poslední pokus o připojení k tomuto serveru byl neúspěšný
       back_to_all: Vše
-      back_to_limited: Omezený
+      back_to_limited: Omezená
       back_to_warning: Varování
       by_domain: Doména
+      confirm_purge: Jste si jisti, že chcete nevratně smazat data z této domény?
+      content_policies:
+        comment: Interní poznámka
+        description_html: Můžete definovat politiky obsahu, které budou aplikovány na všechny účty z této domény i jakoukoliv z jejích subdomén.
+        policies:
+          reject_media: Odmítat média
+          reject_reports: Odmítat hlášení
+          silence: Omezit
+          suspend: Pozastavit
+        policy: Politika
+        reason: Veřejný důvod
+        title: Politiky obsahu
+      dashboard:
+        instance_accounts_dimension: Nejsledovanější účty
+        instance_accounts_measure: uložené účty
+        instance_followers_measure: sledujících nás tam
+        instance_follows_measure: sledujících je tady
+        instance_languages_dimension: Nejčastější jazyky
+        instance_media_attachments_measure: uložené mediální přílohy
+        instance_reports_measure: hlášení o nich
+        instance_statuses_measure: uložené příspěvky
       delivery:
         all: Vše
         clear: Vymazat chyby doručení
+        failing: Selhává
         restart: Restartovat doručování
         stop: Zastavit doručování
-        title: Doručování
-        unavailable: Nedostupný
-        unavailable_message: Doručování nedostupné
-        warning: Varování
-        warning_message:
-          few: Doručení selhává %{count} dny
-          many: Doručení selhává %{count} dnů
-          one: Doručení selhává %{count} den
-          other: Doručení selhává %{count} dnů
+        unavailable: Nedostupná
       delivery_available: Doručení je k dispozici
       delivery_error_days: Dny chybného doručování
       delivery_error_hint: Není-li možné doručení po dobu %{count} dnů, bude automaticky označen za nedoručitelný.
+      destroyed_msg: Data z %{domain} nyní čekají na smazání.
       empty: Nebyly nalezeny žádné domény.
       known_accounts:
         few: "%{count} známé účty"
@@ -510,12 +532,15 @@ cs:
         title: Moderování
       private_comment: Soukromý komentář
       public_comment: Veřejný komentář
+      purge: Odmazat
+      purge_description_html: Pokud se domníváte, že tato doména je offline už navždy, můžete ze svého úložiště smazat všechny záznamy účtů a přidružená data z této domény. To může chvíli trvat.
       title: Federace
       total_blocked_by_us: Blokované námi
       total_followed_by_them: Sledované jimi
       total_followed_by_us: Sledované námi
       total_reported: Hlášení o nich
       total_storage: Mediální přílohy
+      totals_time_period_hint_html: Níže zobrazené součty zahrnují data za celou dobu.
     invites:
       deactivate_all: Deaktivovat vše
       filter:
@@ -539,8 +564,6 @@ cs:
         title: Vytvořit nové IP pravidlo
       no_ip_block_selected: Nebyla změněna žádná IP pravidla, protože nebylo žádné zaškrtnuto
       title: IP pravidla
-    pending_accounts:
-      title: Čekající účty (%{count})
     relationships:
       title: Vztahy uživatele %{acct}
     relays:
@@ -569,41 +592,125 @@ cs:
           many: "%{count} poznámek"
           one: "%{count} poznámka"
           other: "%{count} poznámek"
-        reports:
-          few: "%{count} hlášení"
-          many: "%{count} hlášení"
-          one: "%{count} hlášení"
-          other: "%{count} hlášení"
+      action_log: Protokol auditu
       action_taken_by: Akci vykonal uživatel
-      are_you_sure: Opravu?
+      actions:
+        delete_description_html: Nahlášené příspěvky budou smazány a prohřešek zaznamenán pro pomoc s eskalací v případě budoucích porušení stejným účtem.
+        mark_as_sensitive_description_html: Média v nahlášených příspěvcích budou označena jako citlivá a bude zaznamenán prohřešek pro pomoc s eskalací v případě budoucích porušení stejným účtem.
+        other_description_html: Podívejte se na další možnosti kontroly chování účtu a přizpůsobte komunikaci k nahlášenému účtu.
+        resolve_description_html: Nebudou učiněny žádné kroky proti nahlášenému účtu, žádný prohřešek zaznamenán a hlášení bude uzavřeno.
+        silence_description_html: Profil bude viditelný pouze těm, kdo ho již sledují nebo jej ručně vyhledají, což značně omezí jeho dosah. Lze vždy vrátit zpět.
+        suspend_description_html: Profil a veškerý jeho obsah se stane nedostupným, dokud nebude časem smazán. Interakce s účtem nebude možná. Vratné do 30 dnů.
+      actions_description_html: Rozhodněte, který krok učinit pro vyřešení tohoto hlášení. Pokud podniknete kárný krok proti nahlášenému účtu, bude mu zasláno e-mailové oznámení, s výjimkou případu, kdy je zvolena kategorie <strong>Spam</strong>.
+      add_to_report: Přidat do hlášení další
+      are_you_sure: Jste si jisti?
       assign_to_self: Přidělit ke mně
       assigned: Přiřazený moderátor
+      by_target_domain: Doména nahlášeného účtu
+      category: Kategorie
+      category_description_html: Důvod nahlášení tohoto účtu a/nebo obsahu bude uveden v komunikaci s nahlášeným účtem
       comment:
         none: Žádné
+      comment_description_html: 'Pro upřesnění uživatel %{name} napsal:'
       created_at: Nahlášené
+      delete_and_resolve: Smazat příspěvky
       forwarded: Přeposláno
       forwarded_to: Přeposláno na %{domain}
       mark_as_resolved: Označit jako vyřešené
+      mark_as_sensitive: Označit jako citlivé
       mark_as_unresolved: Označit jako nevyřešené
+      no_one_assigned: Nikdo
       notes:
         create: Přidat poznámku
         create_and_resolve: Vyřešit s poznámkou
         create_and_unresolve: Znovu otevřít s poznámkou
         delete: Smazat
         placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality…
+        title: Poznámky
+      notes_description_html: Zobrazit a zanechat poznámky pro ostatní moderátory i sebe v budoucnu
+      quick_actions_description_html: 'Proveďte rychlou akci nebo skrolujte dolů pro nahlášený obsah:'
+      remote_user_placeholder: vzdálený uživatel z %{instance}
       reopen: Znovu otevřít hlášení
-      report: 'Nahlásit #%{id}'
+      report: 'Hlášení #%{id}'
       reported_account: Nahlášený účet
       reported_by: Nahlášeno uživatelem
       resolved: Vyřešeno
       resolved_msg: Hlášení úspěšně vyřešeno!
+      skip_to_actions: Přeskočit k akcím
       status: Stav
-      target_domain: Doména nahlášeného účtu
+      statuses: Nahlášený obsah
+      statuses_description_html: Obsah porušující pravidla bude uveden v komunikaci s nahlášeným účtem
       target_origin: Původ nahlášeného účtu
       title: Hlášení
       unassign: Odebrat
       unresolved: Nevyřešeno
       updated_at: Aktualizováno
+      view_profile: Zobrazit profil
+    roles:
+      add_new: Přidat roli
+      assigned_users:
+        few: "%{count} uživatelé"
+        many: "%{count} uživatelů"
+        one: "%{count} uživatel"
+        other: "%{count} uživatelů"
+      categories:
+        administration: Administrace
+        devops: DevOps
+        invites: Pozvánky
+        moderation: Moderování
+        special: Speciální
+      delete: Smazat
+      description_html: Pomocí <strong>uživatelských rolí</strong>můžete upravit, ke kterým funkcím a oblastem mají přístup uživatelé Mastodon.
+      edit: Upravit roli „%{name}“
+      everyone: Výchozí oprávnění
+      everyone_full_description_html: Toto je <strong>základní role</strong> ovlivňující <strong>všechny uživatele</strong>, a to i bez přiřazené role. Všechny ostatní role od ní dědí oprávnění.
+      permissions_count:
+        few: "%{count} oprávnění"
+        many: "%{count} oprávnění"
+        one: "%{count} oprávnění"
+        other: "%{count} oprávnění"
+      privileges:
+        administrator: Správce
+        administrator_description: Uživatelé s tímto oprávněním obejdou všechna oprávnění
+        delete_user_data: Mazat uživatelská data
+        delete_user_data_description: Umožňuje uživatelům bezodkladně mazat data jiných uživatelů
+        invite_users: Zvát uživatele
+        invite_users_description: Umožňuje uživatelům zvát na server nové lidi
+        manage_announcements: Spravovat oznámení
+        manage_announcements_description: Umožňuje uživatelům spravovat oznámení na serveru
+        manage_appeals: Spravovat odvolání
+        manage_appeals_description: Umožňuje uživatelům posuzovat odvolání proti moderátorským zásahům
+        manage_blocks: Spravovat blokace
+        manage_blocks_description: Umožňuje uživatelům blokovat poskytovatele e-mailů a IP adresy
+        manage_custom_emojis: Spravovat vlastní emoji
+        manage_custom_emojis_description: Umožňuje uživatelům spravovat vlastní emoji na serveru
+        manage_federation: Spravovat federaci
+        manage_federation_description: Umožňuje uživatelům blokovat nebo povolit federaci s jinými doménami a ovládat doručování
+        manage_invites: Spravovat pozvánky
+        manage_invites_description: Umožňuje uživatelům procházet a deaktivovat pozvánky
+        manage_reports: Spravovat hlášení
+        manage_reports_description: Umožňuje uživatelům kontrolovat přehledy a provádět moderovací akce proti nim
+        manage_roles: Spravovat role
+        manage_roles_description: Umožňuje uživatelům spravovat a přiřazovat role pod nimi
+        manage_rules: Spravovat pravidla
+        manage_rules_description: Umožňuje uživatelům změnit pravidla serveru
+        manage_settings: Spravovat nastavení
+        manage_settings_description: Umožňuje uživatelům změnit nastavení webu
+        manage_taxonomies: Správa taxonomií
+        manage_taxonomies_description: Umožňuje uživatelům zkontrolovat populární obsah a aktualizovat nastavení hashtag
+        manage_user_access: Spravovat uživatelské přístupy
+        manage_user_access_description: Umožňuje uživatelům rušit jiným uživatelům dvoufázové ověřování, měnit jejich e-mailovou adresu a obnovovat jim hesla
+        manage_users: Spravovat uživatele
+        manage_users_description: Umožňuje uživatelům zobrazit podrobnosti ostatních uživatelů a provádět moderování proti nim
+        manage_webhooks: Spravovat webhooky
+        manage_webhooks_description: Umožňuje uživatelům nastavit webhooky pro administrativní události
+        view_audit_log: Zobrazovat protokol auditu
+        view_audit_log_description: Umožňuje uživatelům vidět historii administrativních akcí na serveru
+        view_dashboard: Zobrazit ovládací panel
+        view_dashboard_description: Umožňuje uživatelům přístup k ovládacímu panelu a různým metrikám
+        view_devops: DevOps
+        view_devops_description: Umožňuje uživatelům přístup k ovládacím panelům Sidekiq a pgHero
+      title: Role
     rules:
       add_new: Přidat pravidlo
       delete: Smazat
@@ -612,142 +719,209 @@ cs:
       empty: Zatím nebyla definována žádná pravidla serveru.
       title: Pravidla serveru
     settings:
-      activity_api_enabled:
-        desc_html: Počty lokálně publikovaných příspěvků, aktivních uživatelů a nových registrací, v týdenních intervalech
-        title: Publikovat hromadné statistiky o uživatelské aktivitě v API
-      bootstrap_timeline_accounts:
-        desc_html: Více uživatelských jmen oddělte čárkou. U těchto účtů bude zaručeno, že budou vždy zobrazeny mezi doporučenými sledováními
-        title: Doporučit tyto účty novým uživatelům
-      contact_information:
-        email: Pracovní e-mail
-        username: Uživatelské jméno pro kontaktování
-      custom_css:
-        desc_html: Pozměnit vzhled pomocí CSS šablony načítané na každé stránce
-        title: Vlastní CSS
+      about:
+        manage_rules: Spravovat pravidla serveru
+        preamble: Uveďte podrobné informace o tom, jak je server provozován, moderován, financován.
+        rules_hint: Existuje vyhrazená oblast pro pravidla, u nichž se očekává, že je budou uživatelé dodržovat.
+        title: O aplikaci
+      appearance:
+        preamble: Přizpůsobte si webové rozhraní Mastodon.
+        title: Vzhled
+      branding:
+        preamble: Značka vašeho serveru jej odlišuje od ostatních serverů v síti. Tyto informace se mohou zobrazovat v různých prostředích, například ve webovém rozhraní Mastodonu, v nativních aplikacích, v náhledech odkazů na jiných webových stránkách a v aplikacích pro zasílání zpráv atd. Z tohoto důvodu je nejlepší, aby tyto informace byly jasné, krátké a stručné.
+        title: Značka
+      content_retention:
+        preamble: Určuje, jak je obsah generovaný uživatelem uložen v Mastodonu.
+        title: Uchovávání obsahu
       default_noindex:
         desc_html: Ovlivňuje všechny uživatele, kteří toto nastavení sami nezměnili
-        title: Ve výchozím stavu odhlásit uživatele z indexování vyhledávači
+        title: Odhlásit uživatele ze standardního indexování vyhledávačů
+      discovery:
+        follow_recommendations: Doporučená sledování
+        preamble: Povrchový zajímavý obsah je užitečný pro zapojení nových uživatelů, kteří možná neznají žádného Mastodona. Mějte pod kontrolou, jak různé objevovací funkce fungují na vašem serveru.
+        profile_directory: Adresář profilů
+        public_timelines: Veřejné časové osy
+        title: Objevujte
+        trends: Trendy
       domain_blocks:
         all: Všem
         disabled: Nikomu
-        title: Zobrazit blokované domény
         users: Přihlášeným místním uživatelům
-      domain_blocks_rationale:
-        title: Zobrazit odůvodnění
-      hero:
-        desc_html: Zobrazuje se na hlavní stránce. Doporučujeme rozlišení alespoň 600x100 px. Pokud toto není nastaveno, bude zobrazena miniatura serveru
-        title: Hlavní obrázek
-      mascot:
-        desc_html: Zobrazuje se na několika stránkách. Doporučujeme rozlišení alespoň 293x205 px. Pokud toto není nastaveno, bude zobrazen výchozí maskot
-        title: Obrázek maskota
-      peers_api_enabled:
-        desc_html: Domény, na které tento server narazil ve fedivesmíru
-        title: Zveřejnit seznam objevených serverů v API
-      preview_sensitive_media:
-        desc_html: Náhledy odkazů na jiných stránkách budou zobrazeny i pokud jsou media označena jako citlivá
-        title: Zobrazovat v náhledech OpenGraph i citlivá média
-      profile_directory:
-        desc_html: Dovolit uživatelům být objevitelní
-        title: Povolit adresář profilů
       registrations:
-        closed_message:
-          desc_html: Zobrazí se na hlavní stránce, jsou-li registrace uzavřeny. Můžete použít i HTML značky
-          title: Zpráva o uzavřených registracích
-        deletion:
-          desc_html: Povolit komukoliv smazat svůj účet
-          title: Zpřístupnit smazání účtu
-        min_invite_role:
-          disabled: Nikdo
-          title: Povolit pozvánky od
-        require_invite_text:
-          desc_html: Když jsou registrace schvalovány ručně, udělat odpověď na otázku "Proč se chcete připojit?" povinnou
-          title: Požadovat od nových uživatelů zdůvodnění založení
+        preamble: Mějte pod kontrolou, kdo může vytvořit účet na vašem serveru.
+        title: Registrace
       registrations_mode:
         modes:
           approved: Pro registraci je vyžadováno schválení
           none: Nikdo se nemůže registrovat
           open: Kdokoliv se může registrovat
-        title: Režim registrací
-      show_known_fediverse_at_about_page:
-        desc_html: Je-li vypnuto, bude veřejná časová osa, na kterou odkazuje hlavní stránka serveru, omezena pouze na místní obsah
-        title: Zahrnout federovaný obsah na neautentizované stránce veřejné časové osy
-      show_staff_badge:
-        desc_html: Zobrazit na stránce uživatele odznak člena personálu
-        title: Zobrazit odznak personálu
-      site_description:
-        desc_html: Úvodní odstavec v API. Popište, čím se tento server Mastodon odlišuje od ostatních, a cokoliv jiného, co je důležité. Můžete zde používat HTML značky, hlavně <code>&lt;a&gt;</code> a <code>&lt;em&gt;</code>.
-        title: Popis serveru
-      site_description_extended:
-        desc_html: Dobré místo pro vaše pravidla, pokyny a jiné věci, které váš server odlišují od ostatních. Lze použít HTML značky
-        title: Vlastní rozšířené informace
-      site_short_description:
-        desc_html: Zobrazeno v postranním panelu a meta značkách. V jednom odstavci popište, co je Mastodon a čím se tento server odlišuje od ostatních.
-        title: Krátký popis serveru
-      site_terms:
-        desc_html: Můžete si napsat vlastní zásady ochrany osobních údajů, podmínky používání či jiné právní dokumenty. Můžete použít HTML značky
-        title: Vlastní podmínky používání
-      site_title: Název serveru
-      thumbnail:
-        desc_html: Používáno pro náhledy přes OpenGraph a API. Doporučujeme rozlišení 1200x630px
-        title: Miniatura serveru
-      timeline_preview:
-        desc_html: Zobrazit na hlavní stránce odkaz na veřejnou časovou osu a povolit přístup na veřejnou časovou osu pomocí API bez autentizace
-        title: Povolit neautentizovaný přístup k časové ose
-      title: Nastavení stránky
-      trendable_by_default:
-        desc_html: Ovlivňuje hashtagy, které nebyly dříve zakázány
-        title: Povolit zobrazení hashtagů mezi populárními i bez předchozího posouzení
-      trends:
-        desc_html: Veřejně zobrazit dříve schválené hashtagy, které jsou zrovna populární
-        title: Populární hashtagy
+      title: Nastavení serveru
     site_uploads:
       delete: Odstranit nahraný soubor
       destroyed_msg: Upload stránky byl úspěšně smazán!
     statuses:
+      account: Autor
+      application: Aplikace
       back_to_account: Zpět na stránku účtu
+      back_to_report: Zpět na stránku hlášení
       batch:
-        delete: Smazat
-        nsfw_off: Označit, že není citlivý
-        nsfw_on: Označit jako citlivý
+        remove_from_report: Odebrat z hlášení
+        report: Nahlásit
       deleted: Smazáno
-      failed_to_execute: Nepodařilo se vykonat
+      favourites: Oblíbené
+      history: Historie verzí
+      in_reply_to: Odpověď na
+      language: Jazyk
       media:
         title: Média
-      no_media: Žádná média
+      metadata: Metadata
       no_status_selected: Nebyly změněny žádné příspěvky, neboť žádné nebyly vybrány
+      open: Otevřít příspěvek
+      original_status: Původní příspěvek
+      reblogs: Boosty
+      status_changed: Příspěvek změněn
       title: Příspěvky účtu
+      trending: Populární
+      visibility: Viditelnost
       with_media: S médii
+    strikes:
+      actions:
+        delete_statuses: Uživatel %{name} smazal příspěvky %{target}
+        disable: Uživatel %{name} zmrazil účet %{target}
+        mark_statuses_as_sensitive: Uživatel %{name} označil příspěvky %{target} jako citlivé
+        none: Uživatel %{name} poslal %{target} varování
+        sensitive: Uživatel %{name} označil účet %{target} jako citlivý
+        silence: Uživatel %{name} omezil účet %{target}
+        suspend: Uživatel %{name} pozastavil účet %{target}
+      appeal_approved: Podáno odvolání
+      appeal_pending: Čekající odvolání
     system_checks:
       database_schema_check:
         message_html: Na spuštění čekají databázové migrace. Nechte je prosím proběhnout pro zajištění očekávaného chování aplikace
+      elasticsearch_running_check:
+        message_html: Nelze se připojit k Elasticsearch. Prosím zkontrolujte, že běží, nebo vypněte fulltextové vyhledávání
+      elasticsearch_version_check:
+        message_html: 'Nekompatibilní verze Elasticsearch: %{value}'
+        version_comparison: Je spuštěn Elasticsearch %{running_version} místo vyžadovaného %{required_version}
       rules_check:
         action: Spravovat pravidla serveru
         message_html: Nedefinovali jste žádná pravidla serveru.
       sidekiq_process_check:
         message_html: Pro %{value} frontu/fronty neběží žádný Sidekiq proces. Zkontrolujte prosím svou Sidekiq konfiguraci
     tags:
-      accounts_today: Dnešní jedinečná použití
-      accounts_week: Jedinečná použití tento týden
-      breakdown: Přehled dnešního používání podle zdroje
-      last_active: Nedávno použité
-      most_popular: Nejpopulárnější
-      most_recent: Nedávno vytvořené
-      name: Hashtag
-      review: Stav schválení
-      reviewed: Schválen
-      title: Hashtagy
-      trending_right_now: Populární právě teď
-      unique_uses_today: Dnes použilo %{count} uživatelů
-      unreviewed: Nezkontrolováno
+      review: Stav posouzení
       updated_msg: Nastavení hashtagů bylo úspěšně aktualizováno
     title: Administrace
+    trends:
+      allow: Povolit
+      approved: Schválené
+      disallow: Zakázat
+      links:
+        allow: Povolit odkaz
+        allow_provider: Povolit vydavatele
+        description_html: Toto jsou odkazy, které jsou momentálně hojně sdíleny účty, jejichž příspěvky váš server vidí. To může pomoct vašim uživatelům zjistit, co se děje ve světě. Žádné odkazy se nezobrazují veřejně, dokud neschválíte vydavatele. Můžete také povolit nebo zamítnout jednotlivé odkazy.
+        disallow: Zakázat odkaz
+        disallow_provider: Zakázat vydavatele
+        no_link_selected: Nebyly změněny žádné odkazy, protože nebyl vybrán žádný
+        publishers:
+          no_publisher_selected: Nebyly změněny žádní publikující, protože nikdo nebyl vybrán
+        shared_by_over_week:
+          few: Sdílený %{count} lidmi za poslední týden
+          many: Sdílený %{count} lidmi za poslední týden
+          one: Sdílený jedním člověkem za poslední týden
+          other: Sdílený %{count} lidmi za poslední týden
+        title: Populární odkazy
+        usage_comparison: Za dnešek %{today} sdílení, oproti %{yesterday} včera
+      only_allowed: Jen povolené
+      pending_review: Čeká na posouzení
+      preview_card_providers:
+        allowed: Odkazy z tohoto vydavatele se smí objevovat mezi populárními
+        description_html: Toto jsou domény, na které vedou odkazy často sdílené na vašem serveru. Odkazy se nezobrazí veřejně mezi populárními, pokud příslušné domény nebudou schváleny. Vaše schválení (nebo zamítnutí) se vztahuje i na subdomény.
+        rejected: Odkazy z tohoto vydavatele se neobjeví mezi populárními
+        title: Vydavatelé
+      rejected: Zamítnuté
+      statuses:
+        allow: Povolit příspěvek
+        allow_account: Povolit autora
+        description_html: Toto jsou příspěvky, o kterých váš server ví, že jsou momentálně hodně sdíleny a oblibovány. To může pomoci vašim novým i vracejícím se uživatelům najít další lidi ke sledování. Žádné příspěvky se nezobrazují veřejně, dokud neschválíte autora a tento autor nepovolí navrhování svého účtu ostatním. Můžete také povolit či zamítnout jednotlivé příspěvky.
+        disallow: Zakázat příspěvek
+        disallow_account: Zakázat autora
+        no_status_selected: Nebyly změněny žádné populární příspěvky, protože nikdo nebyl vybrán
+        not_discoverable: Autor nepovolil navrhování svého účtu ostatním
+        shared_by:
+          few: "%{friendly_count} sdílení nebo oblíbení"
+          many: "%{friendly_count} sdílení nebo oblíbení"
+          one: Jednou sdílen nebo oblíben
+          other: "%{friendly_count} sdílení nebo oblíbení"
+        title: Populární příspěvky
+      tags:
+        current_score: Aktuální skóre %{score}
+        dashboard:
+          tag_accounts_measure: unikátních použití
+          tag_languages_dimension: Nejčastější jazyky
+          tag_servers_dimension: Nejčastější servery
+          tag_servers_measure: různých serverů
+          tag_uses_measure: použití celkem
+        description_html: Toto jsou hashtagy, které se momentálně objevují v mnoha příspěvcích, které váš server vidí. To může pomoci vašim uživatelům zjistit, o čem lidé zrovna nejvíce mluví. Žádné hashtagy se nezobrazují veřejně, dokud je neschválíte.
+        listable: Může být navrhován
+        no_tag_selected: Nebyly změněny žádné štítky, protože nikdo nebyl vybrán
+        not_listable: Nebude navrhován
+        not_trendable: Neobjeví se mezi populárními
+        not_usable: Nemůže být používán
+        peaked_on_and_decaying: Vrcholil %{date}, nyní skomírá
+        title: Populární hashtagy
+        trendable: Může se objevovat mezi populárními
+        trending_rank: 'Populární #%{rank}'
+        usable: Může být používán
+        usage_comparison: Za dnešek %{today} použití, oproti %{yesterday} včera
+        used_by_over_week:
+          few: Použit %{count} lidmi za poslední týden
+          many: Použit %{count} lidmi za poslední týden
+          one: Použit jedním člověkem za poslední týden
+          other: Použit %{count} lidmi za poslední týden
+      title: Trendy
+      trending: Populární
     warning_presets:
       add_new: Přidat nové
       delete: Smazat
       edit_preset: Upravit předlohu pro varování
       empty: Zatím jste nedefinovali žádné předlohy varování.
       title: Spravovat předlohy pro varování
+    webhooks:
+      add_new: Přidat koncový bod
+      delete: Smazat
+      description_html: "<strong>Webhook</strong> umožňuje Mastodonu o vybraných událostech <strong>notifikovat v reálném čase</strong> vaši vlastní aplikaci, aby mohla <strong>automaticky spouštět reakce</strong>."
+      disable: Vypnout
+      disabled: Vypnuto
+      edit: Upravit koncový bod
+      empty: Nemáte ještě nastavené žádné koncové body webhooků.
+      enable: Zapnout
+      enabled: Aktivní
+      enabled_events:
+        few: "%{count} zapnuté události"
+        many: "%{count} zapnutých událostí"
+        one: 1 zapnutá událost
+        other: "%{count} zapnutých událostí"
+      events: Události
+      new: Nový webhook
+      rotate_secret: Obnovit klíč
+      secret: Podpisový klíč
+      status: Stav
+      title: Webhooky
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: smazání jeho příspěvků
+        disable: zmrazení jeho účtu
+        mark_statuses_as_sensitive: označení jeho příspěvků jako citlivých
+        none: varování
+        sensitive: označení jeho účtu jako citlivého
+        silence: omezení jeho účtu
+        suspend: pozastavení jeho účtu
+      body: 'Uživatel %{target} se odvolává proti rozhodnutí moderátora %{action_taken_by} z %{date}, kterým bylo %{type}. Napsal:'
+      next_steps: Můžete schválit odvolání pro vrácení rozhodnutí moderátora, nebo to ignorovat.
+      subject: Uživatel %{username} se odvolává proti rozhodnutí moderátora na %{instance}
     new_pending_account:
       body: Detaily nového účtu jsou uvedeny níže. Tuto žádost můžete schválit nebo zamítnout.
       subject: Nový účet na serveru %{instance} čekající na posouzení (%{username})
@@ -755,9 +929,17 @@ cs:
       body: Uživatel %{reporter} nahlásil uživatele %{target}
       body_remote: Někdo z domény %{domain} nahlásil uživatele %{target}
       subject: Nové hlášení pro %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Hashtag #%{name} je dnes populární, ale nebyl dříve schválen. Pokud to nedovolíte, nebude veřejně zobrazen. Nebo pouze uložte formulář tak, jak je, a už o něm neuslyšíte.'
-      subject: Nový hashtag ke schválení na %{instance} (#%{name})
+    new_trends:
+      body: 'Následující položky vyžadují posouzení, než mohou být zobrazeny veřejně:'
+      new_trending_links:
+        title: Populární odkazy
+      new_trending_statuses:
+        title: Populární příspěvky
+      new_trending_tags:
+        no_approved_tags: Momentálně nejsou žádné schválené populární hashtagy.
+        requirements: 'Kterýkoliv z těchto kandidátů by mohl předehnat schválený populární hashtag #%{rank}, kterým je momentálně #%{lowest_tag_name} se skóre %{lowest_tag_score}.'
+        title: Populární hashtagy
+      subject: Nové trendy k posouzení na %{instance}
   aliases:
     add_new: Vytvořit alias
     created_msg: Nový alias byl úspěšně vytvořen. Nyní můžete zahájit přesun ze starého účtu.
@@ -772,9 +954,9 @@ cs:
     confirmation_dialogs: Potvrzovací dialogy
     discovery: Objevování
     localization:
-      body: Mastodon je přeložen do češtiny díky dobrovolníkům.
+      body: Mastodon je překládán dobrovolníky.
       guide_link: https://cs.crowdin.com/project/mastodon
-      guide_link_text: Každý může pomoci.
+      guide_link_text: Zapojit se může každý.
     sensitive_content: Citlivý obsah
     toot_layout: Rozložení příspěvků
   application_mailer:
@@ -787,16 +969,13 @@ cs:
   applications:
     created: Aplikace úspěšně vytvořena
     destroyed: Aplikace úspěšně smazána
-    invalid_url: Zadaná URL adresa je neplatná
     regenerate_token: Znovu vygenerovat přístupový token
     token_regenerated: Přístupový token byl úspěšně vygenerován
     warning: Zacházejte s těmito daty opatrně. Nikdy je s nikým nesdílejte!
     your_token: Váš přístupový token
   auth:
-    apply_for_account: Požádat o pozvánku
+    apply_for_account: Požádat o účet
     change_password: Heslo
-    checkbox_agreement_html: Souhlasím s <a href="%{rules_path}" target="_blank">pravidly serveru</a> a <a href="%{terms_path}" target="_blank">podmínkami používání</a>
-    checkbox_agreement_without_rules_html: Souhlasím s <a href="%{terms_path}" target="_blank">podmínkami používání</a>
     delete_account: Odstranit účet
     delete_account_html: Chcete-li odstranit svůj účet, <a href="%{path}">pokračujte zde</a>. Budete požádáni o potvrzení.
     description:
@@ -809,11 +988,13 @@ cs:
     invalid_reset_password_token: Token pro obnovení hesla je buď neplatný, nebo vypršel. Vyžádejte si prosím nový.
     link_to_otp: Zadat kód dvoufázového ověření z mobilu nebo záložní kód
     link_to_webauth: Použít svůj bezpečnostní klíč
+    log_in_with: Přihlásit přes
     login: Přihlásit
     logout: Odhlásit
     migrate_account: Přesunout se na jiný účet
     migrate_account_html: Zde můžete <a href="%{path}">nastavit přesměrování tohoto účtu na jiný</a>.
     or_log_in_with: Nebo se přihlaste pomocí
+    privacy_policy_agreement_html: Četl jsem a souhlasím se zásadami <a href="%{privacy_policy_path}" target="_blank">ochrany osobních údajů</a>
     providers:
       cas: CAS
       saml: SAML
@@ -821,20 +1002,29 @@ cs:
     registration_closed: "%{instance} nepřijímá nové členy"
     resend_confirmation: Znovu odeslat pokyny pro potvrzení
     reset_password: Obnovit heslo
+    rules:
+      preamble: Tohle nastavují a prosazují moderátoři %{domain}.
+      title: Některá základní pravidla.
     security: Zabezpečení
     set_new_password: Nastavit nové heslo
     setup:
       email_below_hint_html: Pokud je níže uvedená e-mailová adresa nesprávná, můžete ji změnit zde a nechat si poslat nový potvrzovací e-mail.
       email_settings_hint_html: Potvrzovací e-mail byl odeslán na %{email}. Pokud je tato adresa nesprávná, můžete ji změnit v nastavení účtu.
       title: Nastavení
+    sign_in:
+      preamble_html: Přihlaste se se svýma <strong>%{domain}</strong> údajema. Pokud je váš účet hostován na jiném serveru, nemůžete se zde přihlásit.
+      title: Přihlásit se k %{domain}
+    sign_up:
+      preamble: S účtem na tomto serveru Mastodon budete moci sledovat jakoukoliv jinou osobu v síti bez ohledu na to, kde je jejich účet hostován.
+      title: Pojďme vás nastavit na %{domain}.
     status:
       account_status: Stav účtu
       confirming: Čeká na dokončení potvrzení e-mailu.
-      functional: Váš účet je zcela funkční.
-      pending: Vaše žádost čeká na schválení naším personálem. To může nějakou dobu trvat. Pokud bude váš požadavek schválen, obdržíte e-mail.
+      functional: Váš účet je plně funkční.
+      pending: Vaše žádost čeká na posouzení naším personálem. To může nějakou dobu trvat. Pokud bude váš požadavek schválen, obdržíte e-mail.
       redirecting_to: Váš účet je neaktivní, protože je právě přesměrován na účet %{acct}.
+      view_strikes: Zobrazit minulé prohřešky vašeho účtu
     too_fast: Formulář byl odeslán příliš rychle, zkuste to znovu.
-    trouble_logging_in: Problémy s přihlášením?
     use_security_key: Použít bezpečnostní klíč
   authorize_follow:
     already_following: Tento účet již sledujete
@@ -892,15 +1082,41 @@ cs:
       more_details_html: Podrobnosti najdete v <a href="%{terms_path}">zásadách ochrany osobních údajů</a>.
       username_available: Vaše uživatelské jméno bude opět dostupné
       username_unavailable: Vaše uživatelské jméno zůstane nedostupné
-  directories:
-    directory: Adresář profilů
-    explanation: Objevujte uživatele podle jejich zájmů
-    explore_mastodon: Prozkoumejte %{title}
+  disputes:
+    strikes:
+      action_taken: Přijaté opatření
+      appeal: Odvolání
+      appeal_approved: Odvolání proti tomuto prohřešku bylo úspěšné a není tak už platný
+      appeal_rejected: Odvolání bylo zamítnuto
+      appeal_submitted_at: Odvolání podáno
+      appealed_msg: Vaše odvolání bylo podáno. Pokud bude schváleno, budete informováni.
+      appeals:
+        submit: Podat odvolání
+      approve_appeal: Schválit odvolání
+      associated_report: Přidružené hlášení
+      created_at: Datováno
+      description_html: Toto jsou kroky podniknuté proti vašemu účtu a varování, která vám byla poslána personálem %{instance}.
+      recipient: Adresováno
+      reject_appeal: Zamítnout odvolání
+      status: 'Příspěvek #%{id}'
+      status_removed: Příspěvek už byl ze systému odstraněn
+      title: "%{action} ze dne %{date}"
+      title_actions:
+        delete_statuses: Odstranění příspěvku
+        disable: Zmrazení účtu
+        mark_statuses_as_sensitive: Označení příspěvků jako citlivých
+        none: Varování
+        sensitive: Označení účtu jako citlivého
+        silence: Omezení účtu
+        suspend: Pozastavení účtu
+      your_appeal_approved: Vaše odvolání bylo schváleno
+      your_appeal_pending: Podali jste odvolání
+      your_appeal_rejected: Vaše odvolání bylo zamítnuto
   domain_validator:
     invalid_domain: není platné doménové jméno
   errors:
     '400': Žádost, kterou jste odeslali, byla neplatná nebo poškozená.
-    '403': Nemáte povolení zobrazit tuto stránku.
+    '403': Nejste oprávněni tuto stránku zobrazit.
     '404': Stránka, kterou hledáte, tu není.
     '406': Tato stránka není v požadovaném formátu dostupná.
     '410': Stránka, kterou hledáte, tu již není.
@@ -927,10 +1143,10 @@ cs:
     blocks: Blokujete
     bookmarks: Záložky
     csv: CSV
-    domain_blocks: Blokování domén
+    domain_blocks: Doménové blokace
     lists: Seznamy
     mutes: Skrýváte
-    storage: Paměť médií
+    storage: Úložiště médií
   featured_tags:
     add_new: Přidat nový
     errors:
@@ -944,29 +1160,73 @@ cs:
       public: Veřejné časové osy
       thread: Konverzace
     edit:
+      add_keyword: Přidat klíčové slovo
+      keywords: Klíčová slova
+      statuses: Individuální příspěvky
+      statuses_hint_html: Tento filtr platí pro výběr jednotlivých příspěvků bez ohledu na to, zda odpovídají klíčovým slovům níže. <a href="%{path}">Zkontrolujte nebo odeberte příspěvky z filtru</a>.
       title: Upravit filtr
     errors:
+      deprecated_api_multiple_keywords: Tyto parametry nelze změnit z této aplikace, protože se vztahují na více než jedno klíčové slovo filtru. Použijte novější aplikaci nebo webové rozhraní.
       invalid_context: Nebyl poskytnut žádný nebo jen neplatný kontext
-      invalid_irreversible: Nezvratné filtrování funguje pouze v souvislosti s domovskou osou či oznámeními
     index:
+      contexts: Filtruje %{contexts}
       delete: Smazat
       empty: Nemáte žádný filtr.
+      expires_in: Vyprší za %{distance}
+      expires_on: Vyprší %{date}
+      keywords:
+        few: "%{count} klíčová slova"
+        many: "%{count} klíčových slov"
+        one: "%{count} klíčové slovo"
+        other: "%{count} klíčových slov"
+      statuses:
+        few: "%{count} příspěvků"
+        many: "%{count} příspěvků"
+        one: "%{count} příspěvek"
+        other: "%{count} příspěvků"
+      statuses_long:
+        few: "%{count} skryté příspěvky"
+        many: "%{count} skrytých příspěvků"
+        one: "%{count} skrytý příspěvek"
+        other: "%{count} skrytých příspěvků"
       title: Filtry
     new:
+      save: Uložit nový filtr
       title: Přidat nový filtr
+    statuses:
+      back_to_filter: Zpět na filtr
+      batch:
+        remove: Odstranit z filtru
+      index:
+        hint: Tento filtr se vztahuje na výběr jednotlivých příspěvků bez ohledu na jiná kritéria. Do tohoto filtru můžete přidat více příspěvků z webového rozhraní.
+        title: Filtrované příspěvky
   footer:
-    developers: Vývojáři
-    more: Více…
-    resources: Zdroje
     trending_now: Právě populární
   generic:
     all: Všechny
+    all_items_on_page_selected_html:
+      few: "<strong>%{count}</strong> položky na této stránce jsou vybrány."
+      many: "<strong>%{count}</strong> položek na této stránce je vybráno."
+      one: "<strong>%{count}</strong> položka na této stránce vybrána."
+      other: Všech <strong>%{count}</strong> položek na této stránce vybráno.
+    all_matching_items_selected_html:
+      few: "<strong>%{count}</strong> položky odpovídající vašemu hledání jsou vybrány."
+      many: "<strong>%{count}</strong> položek odpovídající vašemu hledání je vybráno."
+      one: "<strong>%{count}</strong> položka odpovídající vašemu hledání je vybrána."
+      other: Všech <strong>%{count}</strong> položek odpovídající vašemu hledání je vybráno.
     changes_saved_msg: Změny byly úspěšně uloženy!
     copy: Kopírovat
     delete: Smazat
-    no_batch_actions_available: Pro tuto stránku nejsou dostupné žádné souhrnné akce
+    deselect: Zrušit výběr všeho
+    none: Žádné
     order_by: Seřadit podle
     save_changes: Uložit změny
+    select_all_matching_items:
+      few: Vybrat %{count} položky odpovídající vašemu hledání.
+      many: Vybrat všech %{count} položek odpovídajících vašemu hledání.
+      one: Vybrat %{count} položku odpovídající vašemu hledání.
+      other: Vybrat všech %{count} položek odpovídajících vašemu hledání.
+    today: dnes
     validation_errors:
       few: Něco ještě není úplně v pořádku! Zkontrolujte prosím %{count} chyby uvedené níže
       many: Něco ještě není úplně v pořádku! Zkontrolujte prosím %{count} chyb uvedených níže
@@ -974,28 +1234,9 @@ cs:
       other: Něco ještě není úplně v pořádku! Zkontrolujte prosím %{count} chyb uvedených níže
   html_validator:
     invalid_markup: 'obsahuje neplatný HTML kód: %{error}'
-  identity_proofs:
-    active: Aktivní
-    authorize: Ano, autorizovat
-    authorize_connection_prompt: Autorizovat toto kryptografické spojení?
-    errors:
-      failed: Kryptografické spojení selhalo. Zkuste to prosím znovu z %{provider}.
-      keybase:
-        invalid_token: Keybase tokeny jsou hashe podpisů a musí být dlouhé 66 hexadecimálních znaků
-        verification_failed: Keybase nerozpoznává tento token jako podpis uživatele %{kb_username} na Keybase. Zkuste to prosím znovu z Keybase.
-      wrong_user: Nelze vytvořit důkaz pro %{proving}, zatímco jste přihlášeni jako %{current}. Přihlaste se jako %{proving} a zkuste to znovu.
-    explanation_html: Zde můžete kryptograficky propojit další své identity z jiných platforem, jako například Keybase. To umožňuje jiným lidem poslat vám šifrované zprávy na těchto platformách a důvěřovat, že obsah, který jim posíláte, pochází od vás.
-    i_am_html: Na %{service} jsem %{username}.
-    identity: Identita
-    inactive: Neaktivní
-    publicize_checkbox: 'A odeslat tohle:'
-    publicize_toot: 'Je to dokázáno! Na %{service} jsem %{username}: %{url}'
-    remove: Odstranit důkaz z účtu
-    removed: Úspěšně odstraněn důkaz z účtu
-    status: Stav ověření
-    view_proof: Zobrazit důkaz
   imports:
     errors:
+      invalid_csv_file: 'Neplatný soubor CSV. Chyba: %{error}'
       over_rows_processing_limit: obsahuje více než %{count} řádků
     modes:
       merge: Sloučit
@@ -1011,7 +1252,6 @@ cs:
       following: Seznam sledovaných
       muting: Seznam ignorovaných
     upload: Nahrát
-  in_memoriam_html: In Memoriam.
   invites:
     delete: Deaktivovat
     expired: Expirováno
@@ -1092,22 +1332,14 @@ cs:
     carry_blocks_over_text: Tento účet se přesunul z %{acct}, který jste blokovali.
     carry_mutes_over_text: Tento účet se přesunul z %{acct}, který jste skryli.
     copy_account_note_text: 'Tento účet se přesunul z %{acct}, zde byly Vaše předchozí poznámky o něm:'
+  navigation:
+    toggle_menu: Přepnout menu
   notification_mailer:
-    digest:
-      action: Zobrazit všechna oznámení
-      body: Zde najdete stručný souhrn zpráv, které jste zmeškali od vaší poslední návštěvy %{since}
-      mention: 'Uživatel %{name} vás zmínil v:'
-      new_followers_summary:
-        few: Zatímco jste byli pryč jste navíc získali %{count} nové sledující! Skvělé!
-        many: Zatímco jste byli pryč jste navíc získali %{count} nových sledujících! Úžasné!
-        one: Zatímco jste byli pryč jste navíc získali jednoho nového sledujícího! Hurá!
-        other: Zatímco jste byli pryč jste navíc získali %{count} nových sledujících! Úžasné!
-      subject:
-        few: "%{count} nová oznámení od vaší poslední návštěvy \U0001F418"
-        many: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
-        one: "1 nové oznámení od vaší poslední návštěvy \U0001F418"
-        other: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
-      title: Ve vaší nepřítomnosti…
+    admin:
+      report:
+        subject: Uživatel %{name} podal hlášení
+      sign_up:
+        subject: Uživatel %{name} se zaregistroval
     favourite:
       body: 'Váš příspěvek si oblíbil uživatel %{name}:'
       subject: Uživatel %{name} si oblíbil váš příspěvek
@@ -1134,6 +1366,8 @@ cs:
       title: Nový boost
     status:
       subject: Nový příspěvek od %{name}
+    update:
+      subject: Uživatel %{name} upravil příspěvek
   notifications:
     email_events: Události pro e-mailová oznámení
     email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
@@ -1152,8 +1386,8 @@ cs:
     code_hint: Pro potvrzení zadejte kód vygenerovaný Vaší ověřovací aplikací
     description_html: Zapnete-li <strong>dvoufázové ověřování</strong> pomocí ověřovací aplikace, k přihlášení budete u sebe muset mít svůj mobil, který pro Vás bude generovat kódy k opsání.
     enable: Zapnout
-    instructions_html: "<strong>Naskenujte tento QR kód do Google Authenticator nebo podobné TOTP aplikace na Vašem telefonu</strong>. Následně bude tato aplikace generovat kódy, které budete zadávat při přihlašování."
-    manual_instructions: 'Nemůžete-li načíst QR kód a potřebujete ho zadat ručně, zde je tajemství v textové podobě:'
+    instructions_html: "<strong>Naskenujte tento QR kód do Google Authenticator nebo podobné TOTP aplikace na svém telefonu</strong>. Následně bude tato aplikace generovat kódy, které budete zadávat při přihlašování."
+    manual_instructions: 'Nemůžete-li načíst QR kód a potřebujete ho zadat ručně, zde je klíč v textové podobě:'
     setup: Nastavit
     wrong_code: Zadaný kód je neplatný! Je čas na serveru i zařízení generujícím kód správný?
   pagination:
@@ -1177,6 +1411,8 @@ cs:
     other: Ostatní
     posting_defaults: Výchozí možnosti psaní
     public_timelines: Veřejné časové osy
+  privacy_policy:
+    title: Zásady ochrany osobních údajů
   reactions:
     errors:
       limit_reached: Dosažen limit různých reakcí
@@ -1199,24 +1435,17 @@ cs:
     remove_selected_follows: Přestat sledovat vybrané uživatele
     status: Stav účtu
   remote_follow:
-    acct: Napište svou přezdívku@doménu, ze které chcete jednat
     missing_resource: Nemůžeme najít požadovanou přesměrovávací URL adresu pro váš účet
-    no_account_html: Ještě nemáte účet? Tady se můžete <a href='%{sign_up_path}' target='_blank'>zaregistrovat</a>
-    proceed: Pokračovat ke sledování
-    prompt: 'Budete sledovat:'
-    reason_html: "<strong>Proč je tento krok nutný?</strong> <code>%{instance}</code> nemusí být serverem, na kterém jste registrováni, a proto vás musíme nejdříve přesměrovat na váš domovský server."
-  remote_interaction:
-    favourite:
-      proceed: Pokračovat k oblíbení
-      prompt: 'Chcete si oblíbit tento příspěvek:'
-    reblog:
-      proceed: Pokračovat k boostnutí
-      prompt: 'Chcete boostnout tento příspěvek:'
-    reply:
-      proceed: Pokračovat k odpovědi
-      prompt: 'Chcete odpovědět na tento příspěvek:'
+  reports:
+    errors:
+      invalid_rules: neodkazuje na platná pravidla
+  rss:
+    content_warning: 'Varování o obsahu:'
+    descriptions:
+      account: Veřejné příspěvky od @%{acct}
+      tag: 'Veřejné příspěvky s hashtagem #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Překročili jste limit %{limit} příspěvků naplánovaných na tento den
+    over_daily_limit: Pro dnešek jste překročili limit %{limit} naplánovaných příspěvků
     over_total_limit: Překročili jste limit %{limit} naplánovaných příspěvků
     too_soon: Plánované datum musí být v budoucnosti
   sessions:
@@ -1238,7 +1467,7 @@ cs:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Aktuální relace
     description: "%{browser} na systému %{platform}"
@@ -1247,8 +1476,8 @@ cs:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1257,8 +1486,8 @@ cs:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
-    revoke: Zrušit
-    revoke_success: Relace úspěšně zrušena
+    revoke: Odvolat
+    revoke_success: Relace úspěšně odvolána
     title: Relace
     view_authentication_history: Zobrazit historii přihlášení do vašeho účtu
   settings:
@@ -1273,7 +1502,6 @@ cs:
     edit_profile: Upravit profil
     export: Export dat
     featured_tags: Zvýrazněné hashtagy
-    identity_proofs: Důkazy identity
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
@@ -1282,6 +1510,7 @@ cs:
     profile: Profil
     relationships: Sledovaní a sledující
     statuses_cleanup: Automatické mazání příspěvků
+    strikes: Moderační prohřešky
     two_factor_authentication: Dvoufázové ověřování
     webauthn_authentication: Bezpečnostní klíče
   statuses:
@@ -1304,20 +1533,21 @@ cs:
         other: "%{count} videí"
     boosted_from_html: Boostnuto z %{acct_link}
     content_warning: 'Varování o obsahu: %{warning}'
+    default_language: Stejný jako jazyk rozhraní
     disallowed_hashtags:
-      few: 'obsahoval nepovolené hashtagy: %{tags}'
-      many: 'obsahoval nepovolené hashtagy: %{tags}'
-      one: 'obsahoval nepovolený hashtag: %{tags}'
-      other: 'obsahoval nepovolené hashtagy: %{tags}'
+      few: 'obsahoval zakázané hashtagy: %{tags}'
+      many: 'obsahoval zakázané hashtagy: %{tags}'
+      one: 'obsahoval zakázaný hashtag: %{tags}'
+      other: 'obsahoval zakázané hashtagy: %{tags}'
+    edited_at_html: Upraven %{date}
     errors:
       in_reply_not_found: Příspěvek, na který se pokoušíte odpovědět, neexistuje.
-    language_detection: Zjistit jazyk automaticky
     open_in_web: Otevřít na webu
     over_character_limit: byl překročen limit %{max} znaků
     pin_errors:
+      direct: Příspěvky viditelné pouze zmíněným uživatelům nelze připnout
       limit: Už jste si připnuli maximální počet příspěvků
       ownership: Nelze připnout příspěvek někoho jiného
-      private: Neveřejné příspěvky nelze připnout
       reblog: Boosty nelze připnout
     poll:
       total_people:
@@ -1372,6 +1602,7 @@ cs:
       '2629746': 1 měsíc
       '31556952': 1 rok
       '5259492': 2 měsíce
+      '604800': 1 týden
       '63113904': 2 roky
       '7889238': 3 měsíce
     min_age_label: Hranice stáří
@@ -1383,91 +1614,11 @@ cs:
     pinned: Připnutý příspěvek
     reblogged: boostnul
     sensitive_content: Citlivý obsah
+  strikes:
+    errors:
+      too_late: Na odvolání proti tomuto prohřešku už je pozdě
   tags:
     does_not_match_previous_name: se neshoduje s předchozím názvem
-  terms:
-    body_html: |
-      <h2>Zásady ochrany osobních údajů</h2>
-      <h3 id="collect">Jaké informace sbíráme?</h3>
-
-      <ul>
-      <li><em>Základní informace o účtu</em>: Pokud se na tomto serveru zaregistrujete, můžeme vás požádat o zadání uživatelského jména, e-mailové adresy a hesla. Můžete také zadat dodatečné profilové informace, jako například zobrazované jméno, krátký životopis, nebo si nahrát profilovou fotografii a obrázek záhlaví. Uživatelské i zobrazované jméno, životopis, profilová fotografie a obrázek záhlaví jsou vždy veřejně dostupné.</li>
-      <li><em>Příspěvky, sledující a další veřejné informace</em>: Seznam lidí, které sledujete, je uveden veřejně, totéž platí i pro uživatele sledující vás. Pro každou vámi napsanou zprávu, bude uloženo datum a čas a informace o aplikaci, ze které jste zprávu odeslali. Zprávy mohou obsahovat mediální přílohy, jako jsou obrázky a videa. Veřejné a neuvedené příspěvky jsou dostupné veřejně. Pokud na vašem profilu uvedete příspěvek, bude také dostupný veřejně. Vaše příspěvky jsou doručeny uživatelům, kteří vás sledují, což v některých případech znamená, že budou příspěvky doručeny na různé servery, na kterých budou ukládány jejich kopie. Pokud příspěvky smažete, bude tato akce taktéž doručeno vašim sledujícím. Akce opětovného sdílení nebo oblíbení jiného příspěvku je vždy veřejná.</li>
-      <li><em>Příspěvky přímé a pouze pro sledující</em>: Všechny příspěvky jsou na serveru uloženy a zpracovány. Příspěvky pouze pro sledující jsou doručeny uživatelům, kteří vás sledují, a uživatelům v příspěvcích zmíněným. Přímé příspěvky jsou doručeny pouze uživatelům v nich zmíněným. V některých případech to znamená, že budou příspěvky doručeny na různé servery, na kterých budou ukládány jejich kopie. Upřímně se snažíme omezit přístup k těmto příspěvkům pouze na autorizované uživatele, ovšem ostatní servery tak činit nemusí. Proto je důležité posoudit servery, ke kterým uživatelé, kteří vás sledují patří. V nastavení si můžete zapnout volbu pro manuální schvalování či odmítnutí nových sledujících. <em>Mějte prosím na paměti, že správci tohoto serveru a kteréhokoliv přijímacího serveru mohou tyto zprávy vidět</em> a příjemci mohou vytvořit jejich snímek, zkopírovat je, nebo je jinak sdílet. <em>Nesdílejte přes Mastodon žádné nebezpečné informace.</em></li>
-      <li><em>IP adresy a další metadata</em>: Při vašem přihlášení zaznamenáváme IP adresu, ze které se přihlašujete, a název vašeho webového prohlížeče. Všechny vaše webové relace jsou v nastavení přístupné k vašemu posouzení a odvolání. Poslední použitá IP adresa je uložena maximálně po dobu 12 měsíců. Můžeme také uchovávat serverové záznamy, které obsahují IP adresy každého požadavku odeslaného na náš server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Na co vaše údaje používáme?</h3>
-
-      <p>Všechna data, která sbíráme, mohou být použita následujícími způsoby:</p>
-
-      <ul>
-      <li>K poskytnutí základních funkcí Mastodonu. K interakci s obsahem od jiných lidí a přispívat svým vlastním obsahem můžete pouze, pokud jste přihlášeni. Můžete například sledovat jiné lidi a zobrazit si jejich kombinované příspěvky ve vaší vlastní personalizované časové ose.</li>
-      <li>Pro pomoc moderování komunity, například porovnáním vaší IP adresy s dalšími známými adresami pro detekci obcházení zákazů či jiných přestupků.</li>
-      <li>E-mailová adresa, kterou nám poskytnete, může být použita pro zasílání informací, oznámení o interakcích jiných uživatelů s vaším obsahem nebo přijatých zprávách, a k odpovědím na dotazy a/nebo další požadavky či otázky.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Jak vaše data chráníme?</h3>
-
-      <p>Když zadáváte, odesíláte, či přistupujete k vašim osobním datům, implementujeme různá bezpečnostní opatření pro udržování bezpečnosti vašich osobních dat. Mimo jiné je vaše relace v prohlížeči, jakož i provoz mezi vašimi aplikacemi a API, zabezpečena pomocí SSL, a vaše heslo je hashováno pomocí silného jednosměrného algoritmu. Pro větší zabezpečení vašeho účtu můžete povolit dvoufázové ověřování.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Jaké jsou naše zásady o uchovávání údajů?</h3>
-
-      <p>Budeme se upřímně snažit:</p>
-
-      <ul>
-      <li>Uchovávat serverové záznamy obsahující IP adresy všech požadavků na tento server, pokud se takové záznamy uchovávají, maximálně 90 dní.</li>
-      <li>Uchovávat IP adresy související s registrovanými uživateli maximálně 12 měsíců.</li>
-      </ul>
-
-      <p>Kdykoliv si můžete vyžádat a stáhnout archiv svého obsahu, včetně příspěvků, mediálních příloh, profilové fotografie a obrázku záhlaví.</p>
-
-      <p>Kdykoliv můžete nenávratně smazat svůj účet.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Používáme cookies?</h3>
-
-      <p>Ano. Cookies jsou malé soubory, které stránka nebo její poskytovatel uloží do vašeho počítače (pokud to dovolíte). Tyto cookies umožňují stránce rozpoznat váš prohlížeč, a pokud máte registrovaný účet, přidružit ho s vaším registrovaným účtem.</p>
-
-      <p>Používáme cookies pro pochopení a ukládání vašich předvoleb pro budoucí návštěvy.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Zveřejňujeme jakékoliv informace třetím stranám?</h3>
-
-      <p>Vaše osobně identifikovatelné informace neprodáváme, neobchodujeme s nimi, ani je nijak nepřenášíme vnějším stranám. Nepočítáme do toho důvěryhodné třetí strany, které nám pomáhají provozovat naši stránku, podnikat, nebo vás obsluhovat, pokud tyto strany souhlasí se zachováním důvěrnosti těchto informací. Vaše informace můžete uvolnit, pokud věříme, že je to nutné pro soulad se zákonem, prosazování našich zásad, nebo ochranu práv, majetku, či bezpečnost nás či ostatních.</p>
-
-      <p>Váš veřejný obsah může být stažen jinými servery na síti. Vaše příspěvky veřejné a pouze pro sledující budou doručeny na servery uživatelů, kteří vás sledují, a přímé zprávy budou doručeny na servery příjemců, pokud jsou tito sledující nebo příjemci zaregistrováni na jiném serveru, než je tento.</p>
-
-      <p>Při autorizaci aplikace k používání vašeho účtu může, v závislosti na rozsahu udělených oprávnění, přistupovat k vašim veřejným profilovým informacím, seznamu lidí, které sledujete, vašim sledujícím, vašim seznamům, všem vašim příspěvkům a příspěvkům, které jste si oblíbili. Aplikace nikdy nemohou získat vaši e-mailovou adresu ani heslo.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Používání stránky dětmi</h3>
-
-      <p>Pokud se tento server nachází v EU nebo EHP: Naše stránka, produkty a služby jsou určeny lidem, kterým je alespoň 16 let. Pokud je vám méně než 16 let, dle požadavků nařízení GDPR (<a href="https://cs.wikipedia.org/wiki/Obecn%C3%A9_na%C5%99%C3%ADzen%C3%AD_o_ochran%C4%9B_osobn%C3%ADch_%C3%BAdaj%C5%AF">Obecné nařízení o ochraně osobních údajů</a>) tuto stránku nepoužívejte.</p>
-
-      <p>Pokud se tento server nachází v USA: Naše stránka, produkty a služby jsou učeny lidem, kterým je alespoň 13 let. Pokud je vám méně než 13 let, dle požadavků zákona COPPA (<a href="https://cs.wikipedia.org/wiki/Children%27s_online_privacy_protection_act">Children's Online Privacy Protection Act</a>) tuto stránku nepoužívejte.</p>
-
-      <p>Právní požadavky mohou být jiné, pokud se tento server nachází v jiné jurisdikci.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Změny v našich zásadách ochrany osobních údajů</h3>
-
-      <p>Rozhodneme-li se naše zásady ochrany osobních údajů změnit, zveřejníme tyto změny na této stránce.</p>
-
-      <p>Tento dokument je dostupný pod licencí CC-BY-SA. Byl naposledy aktualizován 7. března 2018.</p>
-
-      <p>Původně adaptováno ze <a href="https://github.com/discourse/discourse">zásad ochrna osobních údajů projektem Discourse</a>.</p>
-    title: Podmínky používání a zásady ochrany osobních údajů na serveru %{instance}
   themes:
     contrast: Mastodon (vysoký kontrast)
     default: Mastodon (tmavý)
@@ -1476,6 +1627,7 @@ cs:
     formats:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Přidat
     disable: Vypnout 2FA
@@ -1492,63 +1644,73 @@ cs:
     recovery_instructions_html: Ztratíte-li někdy přístup ke svému telefonu, můžete k získání přístupu k účtu použít jeden ze záložních kódů. <strong>Uchovejte tyto kódy v bezpečí</strong>. Můžete si je například vytisknout a uložit je mezi jiné důležité dokumenty.
     webauthn: Bezpečnostní klíče
   user_mailer:
+    appeal_approved:
+      action: Přejít do vašeho účtu
+      explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
+      subject: Vaše odvolání ze dne %{date} bylo schváleno
+      title: Odvolání schváleno
+    appeal_rejected:
+      explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo zamítnuto.
+      subject: Vaše odvolání z %{date} bylo zamítnuto
+      title: Odvolání zamítnuto
     backup_ready:
       explanation: Vyžádali jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení!
       subject: Váš archiv je připraven ke stažení
       title: Stažení archivu
-    sign_in_token:
-      details: 'Zde jsou podrobnosti pokusu:'
-      explanation: 'Zjistili jsme, že se někdo pokusil k vašemu přihlásit z neznámé IP adresy. Pokud jste to vy, zadejte níže uvedený kód na přihlašovací stránce s výzvou:'
-      further_actions: 'Pokud jste to nebyli vy, změňte prosím své heslo a zapněte si dvoufázově ověřování svého účtu. Můžete tak učinit hned tady:'
-      subject: Potvrďte prosím pokus o přihlášení
-      title: Pokus o přihlášení
+    suspicious_sign_in:
+      change_password: změnit vaše heslo
+      details: 'Tady jsou detaily přihášení:'
+      explanation: Detekovali jsme přihlášení do vašeho účtu z nové IP adresy.
+      further_actions_html: Pokud jste to nebyli vy, doporučujeme pro zabezpečení vašeho účtu okamžitě %{action} a zapnout dvoufázové ověřování.
+      subject: Váš účet byl použit z nové IP adresy
+      title: Nové přihlášení
     warning:
+      appeal: Podat odvolání
+      appeal_description: Pokud se domníváte, že se jedná o chybu, můžete podat odvolání personálu %{instance}.
+      categories:
+        spam: Spam
+        violation: Obsah porušuje následující zásady komunity
       explanation:
-        disable: Nemůžete se přihlásit do svého účtu nebo ho jakkoliv jinak používat, ale váš profil a ostatní data zůstávají nedotčeny.
-        sensitive: Vámi nahrané a odkazované mediální soubory budou považovány za citlivé.
-        silence: Nadále můžete používat svůj účet, ale pouze lidé, kteří vás již sledovali, uvidí vaše příspěvky na tomto serveru a můžete být vyjmuti z různých veřejných seznamů. Ostatní vás však stále mohou ručně začít sledovat.
-        suspend: Nemůžete už používat svůj účet a váš profil a ostatní data již nejsou dostupná. Stále se můžete přihlásit pro vyžádání zálohy svých dat, dokud nebudou zcela smazána, ale ponecháme si některé údaje, abychom vám zabránili ve vyhýbání se pozastavení.
-      get_in_touch: Můžete odpovědět na tento e-mail a spojit se s personálem serveru %{instance}.
-      review_server_policies: Zkontrolujte pravidla serveru
-      statuses: 'Konkrétně kvůli:'
+        delete_statuses: Bylo shledáno, že některé vaše příspěvky porušují jednu nebo více zásad komunity a následně byly odstraněny moderátory %{instance}.
+        disable: Nemůžete už používat svůj účet, ale váš profil a další data zůstávají nedotčeny. Můžete si vyžádat zálohu svých dat, měnit nastavení účtu nebo ho smazat.
+        mark_statuses_as_sensitive: Některé vaše příspěvky byly označeny jako citlivé moderátory %{instance}. To znamená, že pro zobrazení náhledu médií v příspěvcích na ně budou muset lidé nejprve kliknout. Média můžete při psaní budoucích příspěvků označit jako citlivá sami.
+        sensitive: Odteď budou všechny vámi nahrané mediální soubory označeny jako citlivé a skryté za proklikávacím varováním.
+        silence: Můžete nadále používat svůj účet, ale pouze lidé, kteří vás již sledovali, uvidí vaše příspěvky na tomto serveru a můžete být vynecháni z různých doporučovacích funkcí. Ostatní vás však stále mohou začít ručně sledovat.
+        suspend: Nemůžete už používat svůj účet a váš profil a ostatní data již nejsou dostupná. Stále se můžete přihlásit pro vyžádání zálohy svých dat, dokud nebudou za přibližně 30 dnů zcela smazána, ale ponecháme si některé základní údaje, abychom vám zabránili v obcházení pozastavení.
+      reason: 'Důvod:'
+      statuses: 'Předmětné příspěvky:'
       subject:
+        delete_statuses: Vaše příspěvky na %{acct} byly odstraněny
         disable: Váš účet %{acct} byl zmrazen
+        mark_statuses_as_sensitive: Vaše příspěvky pod %{acct} byly označeny jako citlivé
         none: Varování pro %{acct}
-        sensitive: Média z Vašeho účtu %{acct} byla označena za citlivá
+        sensitive: Vaše příspěvky pod %{acct} budou od nynějška označeny jako citlivé
         silence: Váš účet %{acct} byl omezen
         suspend: Váš účet %{acct} byl pozastaven
       title:
+        delete_statuses: Příspěvky odstraněny
         disable: Účet zmrazen
+        mark_statuses_as_sensitive: Příspěvky označeny jako citlivé
         none: Varování
-        sensitive: Vaše média byla označena jako citlivá
+        sensitive: Účet označen jako citlivý
         silence: Účet omezen
         suspend: Účet pozastaven
     welcome:
       edit_profile_action: Nastavit profil
-      edit_profile_step: Svůj profil si můžete přizpůsobit nahráním avataru a obrázku záhlaví, změnou zobrazovaného jména a další. Chcete-li posoudit nové sledující předtím, než vás mohou sledovat, můžete svůj účet uzamknout.
+      edit_profile_step: Váš profil si můžete přizpůsobit nahráním profilového obrázku, změnou zobrazovaného jména a dalším. Můžete se přihlásit k přezkoumání nových následovatelů, než vás budou moci následovat.
       explanation: Zde je pár tipů do začátku
       final_action: Začít psát
-      final_step: 'Začněte psát! I když nemáte sledující, mohou vaše veřejné příspěvky vidět jiní lidé, například na místní časové ose a v hashtazích. Můžete se ostatním představit pomocí hashtagu #introductions.'
+      final_step: 'Začněte psát příspěvky! I bez sledujících mohou vaše veřejné příspěvky vidět ostatní, například na místní časové ose nebo v hashtagu. Možná se budete chtít představit na hashtagu #představení.'
       full_handle: Vaše celá adresa profilu
       full_handle_hint: Tohle je, co byste řekli svým přátelům, aby vám mohli posílat zprávy nebo vás sledovat z jiného serveru.
-      review_preferences_action: Změnit předvolby
-      review_preferences_step: Nezapomeňte si nastavit například jaké e-maily chcete přijímat či jak soukromé mají ve výchozím stavu být vaše příspěvky. Nemáte-li epilepsii, můžete si nastavit automatické přehrávání obrázků GIF.
       subject: Vítejte na Mastodonu
-      tip_federated_timeline: Federovaná časová osa je náhled celé sítě Mastodon. Zahrnuje ovšem pouze lidi, které sledují vaši sousedé, takže není úplná.
-      tip_following: Administrátory serveru sledujete automaticky. Chcete-li najít další zajímavé lidi, podívejte se do místní a federované časové osy.
-      tip_local_timeline: Místní časová osa je náhled lidí na serveru %{instance}. Jsou to vaši nejbližší sousedé!
-      tip_mobile_webapp: Pokud vám váš mobilní prohlížeč nabídne přidat si Mastodon na vaši domovskou obrazovku, můžete dostávat oznámení. V mnoha ohledech to funguje jako nativní aplikace!
-      tips: Tipy
       title: Vítejte na palubě, %{name}!
   users:
     follow_limit_reached: Nemůžete sledovat více než %{limit} lidí
-    generic_access_help_html: Máte potíže s přístupem ke svému účtu? Můžete nás kontaktovat pro pomoc na %{email}
     invalid_otp_token: Neplatný kód pro dvoufázové ověřování
-    invalid_sign_in_token: Neplatný bezpečnostní kód
     otp_lost_help_html: Pokud jste ztratili přístup k oběma, spojte se s %{email}
     seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
     signed_in_as: 'Přihlášeni jako:'
-    suspicious_sign_in_confirmation: Zdá se, že se z tohoto zařízení přihlašujete poprvé, proto pro ověření přihlášení na vaši e-mailovou adresu posíláme bezpečnostní kód.
   verification:
     explanation_html: 'Můžete se <strong>ověřit jako vlastník odkazů v metadatech profilu</strong>. Pro tento účel musí stránka v odkazu obsahovat odkaz zpět na váš profil na Mastodonu. Odkaz zpět <strong>musí</strong> mít atribut <code>rel="me"</code>. Na textu odkazu nezáleží. Zde je příklad:'
     verification: Ověření
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 005643e03..130a8b121 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1,68 +1,13 @@
 ---
 cy:
   about:
-    about_hashtag_html: Dyma dŵtiau cyhoeddus wedi eu tagio gyda <strong>#%{hashtag}</strong>. Gallwch ryngweithio gyda nhw os oes gennych gyfrif yn unrhyw le yn y ffeddysawd.
-    about_mastodon_html: Mae Mastodon yn rwydwaith cymdeithasol sy'n seiliedig ar brotocolau gwe a meddalwedd cod agored rhad ac am ddim. Yn debyg i e-bost mae'n ddatganoledig.
-    about_this: Ynghylch
-    active_count_after: yn weithredol
-    active_footnote: Defnyddwyr Gweithredol Misol (DGM)
-    administered_by: 'Gweinyddir gan:'
-    apps: Apiau symudol
-    apps_platforms: Defnyddio Mastodon o iOS, Android a phlatfformau eraill
-    browse_directory: Pori cyfeiriadur proffil a hidlo wrth diddordebau
-    browse_local_posts: Pori ffrwd byw o byst cyhoeddus o'r gweinydd hyn
-    browse_public_posts: Pori ffrwd byw o byst cyhoeddus ar Fastodon
-    contact: Cyswllt
+    about_mastodon_html: 'Rhwydwaith cymdeithasol y dyfodol: Dim hysbysebion, dim gwyliadwriaeth gorfforaethol, dylunio moesegol, a datganoli! Chi sy berchen eich data gyda Mastodon!'
     contact_missing: Heb ei osod
     contact_unavailable: Ddim yn berthnasol
-    discover_users: Darganfod defnyddwyr
-    documentation: Dogfennaeth
-    federation_hint_html: Gyda cyfrif ar %{instance}, gallwch dilyn pobl ar unrhyw gweinydd Mastodon, a thu hwnt.
-    get_apps: Rhowch gynnig ar ap dyfeis symudol
     hosted_on: Mastodon wedi ei weinyddu ar %{domain}
-    instance_actor_flash: |
-      Mae'r cyfrif hwn yn actor rhithwir a ddefnyddir i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol.
-      Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei rwystro oni bai eich bod am rwystro'r achos cyfan, ac os felly dylech ddefnyddio bloc parth.
-    learn_more: Dysu mwy
-    privacy_policy: Polisi preifatrwydd
-    see_whats_happening: Gweld beth sy'n digwydd
-    server_stats: 'Ystadegau gweinydd:'
-    source_code: Cod ffynhonnell
-    status_count_after:
-      few: statwsau
-      many: statwsau
-      one: statws
-      other: statwsau
-      two: statwsau
-      zero: statwsau
-    status_count_before: Ysgriffennwyd gan
-    tagline: Dilyn ffrindiau a darganfod rhai newydd
-    terms: Telerau gwasanaeth
-    unavailable_content: Cynnwys nad yw ar gael
-    unavailable_content_description:
-      domain: Gweinydd
-      reason: 'Rheswm:'
-      rejecting_media: Ni fydd ffeiliau cyfryngau o'r gweinydd hwn yn cael eu prosesu ac ni fydd unrhyw fawd yn cael eu harddangos, sy'n gofyn am glicio â llaw i'r gweinydd arall.
-      rejecting_media_title: Cyfrwng hidliedig
-      silenced: Ni fydd swyddi o'r gweinydd hwn yn ymddangos yn unman heblaw eich porthiant cartref os dilynwch yr awdur.
-      silenced_title: Gweinyddion wedi'i tawelu
-      suspended: Ni fyddwch yn gallu dilyn unrhyw un o'r gweinydd hwn, ac ni fydd unrhyw ddata ohono'n cael ei brosesu na'i storio, ac ni chyfnewidir unrhyw ddata.
-      suspended_title: Gweinyddion wedi'i gwahardd
-    unavailable_content_html: Yn gyffredinol, mae Mastodon yn caniatáu ichi weld cynnwys gan unrhyw weinyddwr arall yn y ffederasiwn a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.
-    user_count_after:
-      few: defnyddwyr
-      many: defnyddwyr
-      one: defnyddiwr
-      other: defnyddwyr
-      two: defnyddwyr
-      zero: defnyddwyr
-    user_count_before: Cartref i
-    what_is_mastodon: Beth yw Mastodon?
+    title: Ynghylch
   accounts:
-    choices_html: 'Dewisiadau %{name}:'
-    endorsements_hint: Gallwch gymeradwyo pobl rydych chi'n eu dilyn o'r rhyngwyneb gwe, a byddan nhw'n ymddangos yma.
-    featured_tags_hint: Gallwch ychwanegu hashnodau penodol a fydd yn cael eu harddangos yma.
-    follow: Dilynwch
+    follow: Dilyn
     followers:
       few: Dilynwyr
       many: Dilynwyr
@@ -71,817 +16,1355 @@ cy:
       two: Dilynwyr
       zero: Dilynwyr
     following: Yn dilyn
-    joined: Ymunodd %{date}
+    instance_actor_flash: Mae'r cyfrif hwn yn actor rhithwir sy'n cael ei ddefnyddio i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol. Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei atal.
     last_active: diweddaraf
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
-    media: Cyfryngau
-    moved_html: 'Mae %{name} wedi symud i %{new_profile_link}:'
-    network_hidden: Nid yw'r wybodaeth hyn ar gael
-    never_active: Peidiwch byth
     nothing_here: Does dim byd yma!
-    people_followed_by: Pobl y mae %{name} yn ei ddilyn
-    people_who_follow: Pobl sy'n dilyn %{name}
     pin_errors:
-      following: Rhaid i ti fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
+      following: Rhaid i chi fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
     posts:
-      few: Tŵtiau
-      many: Tŵtiau
-      one: Tŵt
-      other: Tŵtiau
-      two: Tŵtiau
-      zero: Tŵtiau
-    posts_tab_heading: Tŵtiau
-    posts_with_replies: Tŵtiau ac atebion
-    roles:
-      admin: Gweinyddwr
-      group: Grŵp
-      moderator: Safonwr
-    unavailable: Proffil ddim ar gael
-    unfollow: Dad-ddilyn
+      few: Postiadau
+      many: Postiadau
+      one: Postiad
+      other: Postiadau
+      two: Postiadau
+      zero: Postiadau
+    posts_tab_heading: Postiadau
   admin:
     account_actions:
       action: Cyflawni gweithred
-      title: Perfformio gweithrediad goruwchwylio ar %{acct}
+      title: Cyflawni gweithred cymedroli ar %{acct}
     account_moderation_notes:
       create: Gadael nodyn
-      created_msg: Crewyd nodyn goruwchwylio yn llwyddiannus!
-      delete: Dileu
-      destroyed_msg: Dinistrwyd nodyn goruwchwylio yn llwyddiannus!
+      created_msg: Crëwyd nodyn cymedroli'n llwyddiannus!
+      destroyed_msg: Dinistriwyd nodyn cymedroli yn llwyddiannus!
     accounts:
-      add_email_domain_block: Cosbrestru parth e-bost
+      add_email_domain_block: Rhwystro parth e-bost
       approve: Cymeradwyo
-      approve_all: Cymeradwyo pob un
+      approved_msg: Wedi llwyddo i gymeradwyo cais cofrestru %{username}
       are_you_sure: Ydych chi'n siŵr?
       avatar: Afatar
       by_domain: Parth
       change_email:
-        changed_msg: E-bost cyfrif wedi ei newid yn llwyddiannus!
-        current_email: E-bost Cyfredol
-        label: Newid E-bost
-        new_email: E-bost Newydd
-        submit: Newid E-bost
-        title: Newid E-bost i %{username}
+        changed_msg: E-bost wedi newid yn llwyddiannus!
+        current_email: E-bost cyfredol
+        label: Newid e-bost
+        new_email: E-bost newydd
+        submit: Newid e-bost
+        title: Newid e-bost i %{username}
+      change_role:
+        changed_msg: Rôl wedi ei newid yn llwyddiannus!
+        label: Newid rôl
+        no_role: Dim rôl
+        title: Newid rôl %{username}
       confirm: Cadarnhau
       confirmed: Cadarnhawyd
-      confirming: Cadarnhau
+      confirming: Yn cadarnhau
+      custom: Cyfaddas
       delete: Dileu data
       deleted: Wedi dileu
       demote: Diraddio
-      disable: Diffodd
+      destroyed_msg: Mae data %{username} bellach mewn ciw i gael ei ddileu yn fuan
+      disable: Rhewi
+      disable_sign_in_token_auth: Analluogi dilysu tocynnau e-bost
       disable_two_factor_authentication: Diffodd 2FA
-      disabled: Wedi ei ddiffodd
-      display_name: Enw arddangos
+      disabled: Wedi rhewi
+      display_name: Enw sgrin
       domain: Parth
       edit: Golygu
       email: E-bost
-      email_status: Statws E-bost
-      enable: Galluogi
+      email_status: Statws e-bost
+      enable: Dad rewi
+      enable_sign_in_token_auth: Galluogi dilysu tocynnau e-bost
       enabled: Wedi ei alluogi
+      enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
       followers: Dilynwyr
       follows: Yn dilyn
-      header: Pennawd
-      inbox_url: URL Mewnflwch
+      header: Pennyn
+      inbox_url: URL blwch derbyn
+      invite_request_text: Rhesymau dros ymuno
       invited_by: Gwahoddwyd gan
-      joined: Ymunodd
+      ip: IP
+      joined: Ymunwyd
       location:
         all: Popeth
         local: Lleol
         remote: Pell
         title: Lleoliad
       login_status: Statws mewngofnodi
-      media_attachments: Atodiadau
-      memorialize: Troi yn gofeb
+      media_attachments: Atodiadau cyfryngau
+      memorialize: Creu cyfrif coffa
+      memorialized: Wedi troi'n gyfrif coffa
+      memorialized_msg: Llwyddodd i droi %{username} yn gyfrif coffa
       moderation:
         active: Yn weithredol
         all: Popeth
         pending: Yn aros
-        silenced: Wedi ei dawelu
+        silenced: Cyfyngedig
         suspended: Wedi ei atal
-        title: Goruwchwyliad
-      moderation_notes: Nodiadau goruwchwylio
+        title: Cymedroli
+      moderation_notes: Nodiadau cymedroli
       most_recent_activity: Gweithgarwch diweddaraf
       most_recent_ip: IP diweddaraf
-      no_account_selected: Ni newidwyd dim cyfrif achos ni ddewiswyd dim un
+      no_account_selected: Heb newid unrhyw gyfrif gan na ddewiswyd un
       no_limits_imposed: Dim terfynau wedi'i gosod
+      no_role_assigned: Dim rôl wedi'i neilltuo
       not_subscribed: Heb danysgrifio
       pending: Yn aros am adolygiad
       perform_full_suspension: Atal
+      previous_strikes: Rhybuddion blaenorol
+      previous_strikes_description_html:
+        few: Mae gan y cyfrif hwn <strong>%{count}</strong> rybudd.
+        many: Mae gan y cyfrif hwn <strong>%{count}</strong> rybudd.
+        one: Mae gan y cyfrif hwn <strong>un</strong> rhybudd.
+        other: Mae gan y cyfrif hwn <strong>%{count}</strong> rhybudd.
+        two: Mae gan y cyfrif hwn <strong>%{count}</strong> rybudd.
+        zero: Mae gan y cyfrif hwn <strong>%{count}</strong> rybudd.
       promote: Hyrwyddo
       protocol: Protocol
       public: Cyhoeddus
       push_subscription_expires: Tanysgrifiad gwthiadwy yn dod i ben
       redownload: Adnewyddu proffil
+      redownloaded_msg: Adnewyddwyd proffil %{username} o'r gweinydd gwreiddiol
       reject: Gwrthod
-      reject_all: Gwrthod pob un
+      rejected_msg: Wedi gwrthod cais cofrestru %{username}
+      remote_suspension_irreversible: Mae data'r cyfrif hwn wedi'i ddileu'n ddiwrthdro.
+      remote_suspension_reversible_hint_html: Mae'r cyfrif wedi'i atal dros dro ar eu gweinydd, a bydd y data'n cael ei ddileu yn llawn ar %{date}. Tan hynny, gall y gweinydd pell adfer y cyfrif hwn heb unrhyw effeithiau gwael. Os dymunwch gael gwared ar holl ddata'r cyfrif ar unwaith, gallwch wneud hynny isod.
       remove_avatar: Dileu afatar
-      remove_header: Dileu pennawd
+      remove_header: Dileu pennyn
+      removed_avatar_msg: Llwyddwyd i ddileu delwedd afatar %{username}
+      removed_header_msg: Llwyddwyd i ddileu delwedd pennyn %{username}
       resend_confirmation:
         already_confirmed: Mae'r defnyddiwr hwn wedi ei gadarnhau yn barod
-        send: Ailanfonwch e-bost cadarnhad
+        send: Ail anfon e-bost cadarnhad
         success: E-bost cadarnhau wedi ei anfon yn llwyddiannus!
       reset: Ailosod
       reset_password: Ailosod cyfrinair
-      resubscribe: Aildanysgrifio
-      role: Caniatâd
-      roles:
-        admin: Gweinyddwr
-        moderator: Aroglygydd
-        user: Defnyddiwr
+      resubscribe: Ail danysgrifio
+      role: Rôl
       search: Chwilio
-      search_same_email_domain: Defnyddwyr eraill gyda'r un parth ebost
+      search_same_email_domain: Defnyddwyr eraill gyda'r un parth e-bost
       search_same_ip: Defnyddwyr eraill gyda'r un IP
-      shared_inbox_url: URL Mewnflwch wedi ei rannu
+      security_measures:
+        only_password: Cyfrinair yn unig
+        password_and_2fa: Cyfrinair a 2FA
+      sensitive: Grym-sensitif
+      sensitized: Wedi'i farcio fel sensitif
+      shared_inbox_url: URL blwch derbyn wedi ei rannu
       show:
         created_reports: Adroddiadau a wnaed
         targeted_reports: Adroddwyd gan eraill
-      silence: Tawelu
-      silenced: Tawelwyd
-      statuses: Statysau
+      silence: Cyfyngu
+      silenced: Cyfyngwyd
+      statuses: Postiadau
+      strikes: Rhybuddion blaenorol
       subscribe: Tanysgrifio
+      suspend: Atal
       suspended: Ataliwyd
-      time_in_queue: Yn aros yn y rhestr am %{time}
+      suspension_irreversible: Mae data'r cyfrif hwn wedi'i ddileu'n ddiwrthdro. Gallwch ddad-atal y cyfrif i'w wneud yn ddefnyddiadwy ond ni fydd yn adennill unrhyw ddata a oedd ganddo o'r blaen.
+      suspension_reversible_hint_html: Mae'r cyfrif wedi'i atal, a bydd y data'n cael ei ddileu yn llawn ar %{date}. Tan hynny, mae modd adfer y cyfrif heb unrhyw effeithiau gwael. Os dymunwch gael gwared ar holl ddata'r cyfrif ar unwaith, gallwch wneud hynny isod.
       title: Cyfrifon
+      unblock_email: Dadflocio cyfeiriad e-bost
+      unblocked_email_msg: Llwyddwyd i ddadflocio cyfeiriad e-bost %{username}
       unconfirmed_email: E-bost heb ei gadarnhau
-      undo_silenced: Dadwneud tawelu
+      undo_sensitized: Dadwneud grym-sensitif
+      undo_silenced: Dadwneud cyfyngu
       undo_suspension: Dadwneud ataliad
+      unsilenced_msg: Wedi llwyddo i ddadwneud cyfyngiad cyfrif %{username}
       unsubscribe: Dad-danysgrifio
+      unsuspended_msg: Llwyddwyd i ddad-atal cyfrif %{username}
       username: Enw defnyddiwr
+      view_domain: Gweld crynodeb ar gyfer parth
       warn: Rhybuddio
       web: Gwe
-      whitelisted: Rhestredig wen
+      whitelisted: Caniatáu ar gyfer ffedereiddio
     action_logs:
       action_types:
+        approve_appeal: Cymeradwyo'r Apêl
+        approve_user: Cymeradwyo Defnyddiwr
         assigned_to_self_report: Neilltuo Adroddiad
-        change_email_user: Newid Ebost ar gyfer Defnyddiwr
+        change_email_user: Newid E-bost ar gyfer Defnyddiwr
+        change_role_user: Newid Rôl y Defnyddiwr
         confirm_user: Cadarnhau Defnyddiwr
         create_account_warning: Creu Rhybydd
         create_announcement: Creu Cyhoeddiad
-        create_custom_emoji: Creu Emoji Addasiedig
-        create_domain_allow: Creu Alluogiad Parth
+        create_canonical_email_block: Creu Bloc E-bost
+        create_custom_emoji: Creu Emoji Cyfaddas
+        create_domain_allow: Creu Caniatáu Parth
         create_domain_block: Creu Gwaharddiad Parth
-        create_email_domain_block: Creu Gwaharddiad Parth Ebost
+        create_email_domain_block: Creu Gwaharddiad Parth E-bost
+        create_ip_block: Creu rheol IP
+        create_unavailable_domain: Creu Parth Ddim ar Gael
+        create_user_role: Creu Rôl
         demote_user: Diraddio Defnyddiwr
         destroy_announcement: Dileu Cyhoeddiad
-        destroy_custom_emoji: Dileu Emoji Addasiedig
-        destroy_domain_allow: Dileu Alluogiad Parth
+        destroy_canonical_email_block: Dileu Bloc E-bost
+        destroy_custom_emoji: Dileu Emoji Cyfaddas
+        destroy_domain_allow: Dileu Caniatáu Parth
         destroy_domain_block: Dileu Gwaharddiad Parth
-        destroy_email_domain_block: Dileu gwaharddiad parth ebost
-        destroy_status: Dileu Statws
+        destroy_email_domain_block: Dileu gwaharddiad parth e-bost
+        destroy_instance: Clirio Parth
+        destroy_ip_block: Dileu rheol IP
+        destroy_status: Dileu Postiad
+        destroy_unavailable_domain: Dileu Parth Ddim ar Gael
+        destroy_user_role: Dinistrio Rôl
         disable_2fa_user: Diffodd 2FA
-        disable_custom_emoji: Analluogi Emoji Addasiedig
+        disable_custom_emoji: Analluogi Emoji Cyfaddas
+        disable_sign_in_token_auth_user: Analluogi Dilysu Tocyn E-bost ar gyfer Defnyddiwr
         disable_user: Analluogi Defnyddiwr
-        enable_custom_emoji: Alluogi Emoji Addasiedig
-        enable_user: Alluogi Defnyddiwr
+        enable_custom_emoji: Alluogi Emoji Cyfaddas
+        enable_sign_in_token_auth_user: Galluogi Dilysu Tocyn E-bost ar gyfer Defnyddiwr
+        enable_user: Galluogi Defnyddiwr
         memorialize_account: Cofadeilio Cyfrif
         promote_user: Dyrchafu Defnyddiwr
+        reject_appeal: Gwrthod Apêl
+        reject_user: Gwrthod Defnyddiwr
         remove_avatar_user: Tynnu Afatar
         reopen_report: Ailagor Adroddiad
+        resend_user: Ail-anfon E-bost Cadarnhad
         reset_password_user: Ailosod Cyfrinair
         resolve_report: Datrus Adroddiad
-        silence_account: Tawelu Cyfrif
-        suspend_account: Gwahardd Cyfrif Dros Dro
+        sensitive_account: Cyfrif Grym-Sensitif
+        silence_account: Cyfyngu Cyfrif
+        suspend_account: Atal Cyfrif Dros Dro
         unassigned_report: Dadneilltuo Adroddiad
-        unsilence_account: Dadawelu Cyfrif
-        unsuspend_account: Tynnu Gwahardd Cyfrif Dros Dro
+        unblock_email_account: Dadflocio cyfeiriad e-bost
+        unsensitive_account: Dadwneud Cyfrif Grym-Sensitif
+        unsilence_account: Dad-gyfyngu Cyfrif
+        unsuspend_account: Tynnu Ataliad Cyfrif Dros Dro
         update_announcement: Diweddaru Cyhoeddiad
-        update_custom_emoji: Diweddaru Emoji Addasiedig
-        update_status: Diweddaru Statws
-      deleted_status: "(statws wedi ei ddileu)"
+        update_custom_emoji: Diweddaru Emoji Cyfaddas
+        update_domain_block: Diweddaru'r Blocio Parth
+        update_ip_block: Diweddaru rheol IP
+        update_status: Diweddaru Postiad
+        update_user_role: Diweddaru Rôl
+      actions:
+        approve_appeal_html: Mae %{name} wedi cymeradwyo penderfyniad cymedroli gan %{target}
+        approve_user_html: Mae %{name} wedi cymeradwyo cofrestru gan %{target}
+        assigned_to_self_report_html: Mae %{name} wedi neilltuo adroddiad %{target} iddyn nhw eu hunain
+        change_email_user_html: Mae %{name} wedi newid cyfeiriad e-bost defnyddiwr %{target}
+        change_role_user_html: Mae %{name} wedi newid rôl %{target}
+        confirm_user_html: Mae %{name}  wedi cadarnhau cyfeiriad e-bost defnyddiwr %{target}
+        create_account_warning_html: Mae %{name} wedi anfon rhybudd at %{target}
+        create_announcement_html: Mae %{name} wedi creu cyhoeddiad newydd %{target}
+        create_canonical_email_block_html: Mae %{name} wedi rhwystro e-bost gyda'r hash %{target}
+        create_custom_emoji_html: Mae %{name} wedi llwytho emoji newydd %{target}
+        create_domain_allow_html: Mae %{name} wedi caniatáu ffedereiddio â pharth %{target}
+        create_domain_block_html: Mae %{name} wedi rhwystro parth %{target}
+        create_email_domain_block_html: Mae %{name}  wedi rhwystro parth e-bost %{target}
+        create_ip_block_html: Mae %{name} wedi creu rheol ar gyfer IP %{target}
+        create_unavailable_domain_html: Mae %{name} wedi stopio danfon i barth %{target}
+        create_user_role_html: Mae %{name} wedi creu rôl %{target}
+        demote_user_html: Mae %{name} wedi israddio defnyddiwr %{target}
+        destroy_announcement_html: Mae %{name} wedi dileu cyhoeddiad %{target}
+        destroy_canonical_email_block_html: Mae %{name} wedi dadrwystro e-bost gyda'r hash %{target}
+        destroy_custom_emoji_html: Mae %{name} wedi dileu emoji %{target}
+        destroy_domain_allow_html: Mae %{name} wedi gwrthod ffederasiwn gyda pharth %{target}
+        destroy_domain_block_html: Mae %{name} wedi dad rwystro parth %{target}
+        destroy_email_domain_block_html: Mae %{name} wedi dad rwystro parth e-bost %{target}
+        destroy_instance_html: Mae %{name} wedi dileu parth %{target}
+        destroy_ip_block_html: Mae %{name} dileu rheol ar gyfer IP %{target}
+        destroy_status_html: Mae %{name} wedi tynnu postiad gan %{target}
+        destroy_unavailable_domain_html: Mae %{name} wedi ailddechrau anfon i barth %{target}
+        destroy_user_role_html: Mae %{name} wedi dileu rôl %{target}
+        disable_2fa_user_html: Mae %{name} wedi analluogi gofyniad dau ffactor ar gyfer defnyddiwr %{target}
+        disable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
+        disable_sign_in_token_auth_user_html: Mae %{name} wedi analluogi dilysiad tocyn e-bost ar gyfer %{target}
+        disable_user_html: Mae %{name} wedi analluogi mewngofnodi defnyddiwr %{target}
+        enable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
+        enable_sign_in_token_auth_user_html: Mae %{name} wedi galluogi dilysu tocyn e-bost %{target}
+        enable_user_html: Mae %{name} wedi galluogi mewngofnodi defnyddiwr %{target}
+        memorialize_account_html: Newidiodd %{name} gyfrif %{target} i dudalen memoriam
+        promote_user_html: Mae %{name} wedi hyrwyddo defnyddiwr %{target}
+        reject_appeal_html: Mae %{name} wedi gwrthod apêl penderfyniad cymedroli %{target}
+        reject_user_html: Mae %{name} wedi gwrthod cofrestriad gan %{target}
+        remove_avatar_user_html: Mae %{name} wedi tynnu afatar %{target}
+        reopen_report_html: Mae %{name} wedi ailagor adroddiad %{target}
+        resend_user_html: Mae %{name} wedi ail anfon e-bost cadarnhau %{target}
+        reset_password_user_html: Mae %{name} wedi ailosod cyfrinair defnyddiwr %{target}
+        resolve_report_html: Mae %{name} wedi datrys adroddiad %{target}
+        sensitive_account_html: Mae %{name} wedi marcio cyfrwng %{target} fel un sensitif
+        silence_account_html: Mae %{name} wedi cyfyngu cyfrif %{target}
+        suspend_account_html: Mae %{name} wedi atal cyfrif %{target}
+        unassigned_report_html: Mae %{name} wedi dad neilltuo adroddiad %{target}
+        unblock_email_account_html: Mae %{name} wedi dad rwystro cyfeiriad e-bost %{target}
+        unsensitive_account_html: Mae %{name} wedi dad farcio cyfryngau %{target} fel rhai sensitif
+        unsilence_account_html: Mae %{name} wedi dadwneud terfyn cyfrif %{target}
+        unsuspend_account_html: Mae %{name} wedi dad atal cyfrif %{target}
+        update_announcement_html: Mae %{name} wedi diweddaru cyhoeddiad %{target}
+        update_custom_emoji_html: Mae %{name} wedi diweddaru emoji %{target}
+        update_domain_block_html: Mae %{name} wedi diweddaru bloc parth %{target}
+        update_ip_block_html: Mae %{name} wedi newid rheol IP %{target}
+        update_status_html: Mae %{name} wedi diweddaru postiad gan %{target}
+        update_user_role_html: Mae %{name} wedi newid rôl %{target}
+      deleted_account: cyfrif wedi'i ddileu
       empty: Dim logiau ar gael.
-      filter_by_action: Hidlo wrth weithred
-      filter_by_user: Hidlo wrth ddefnyddiwr
-      title: Log archwilio
+      filter_by_action: Hidlo yn ôl gweithred
+      filter_by_user: Hidlo yn ôl defnyddiwr
+      title: Cofnod archwilio
     announcements:
-      destroyed_msg: Cyhoeddiad wedi'i ddileu yn llwyddianus!
+      destroyed_msg: Cyhoeddiad wedi'i ddileu'n llwyddiannus!
       edit:
         title: Golygu cyhoeddiad
-      empty: Dim gyhoeddiad ar gael.
+      empty: Dim cyhoeddiad ar gael.
       live: Byw
       new:
         create: Creu cyhoeddiad
         title: Cyhoeddiad newydd
-      published_msg: Cyhoeddiad wedi'i gyhoeddi'n llwyddianus!
+      publish: Cyhoeddi
+      published_msg: Cyhoeddiad wedi'i gyhoeddi'n llwyddiannus!
       scheduled_for: Wedi'i amserlenni ar gyfer %{time}
-      scheduled_msg: Cyhoeddiad wedi'i amserlenni ar gyfer cyhoeddiad!
+      scheduled_msg: Cyhoeddiad wedi'i amserlenni ar gyfer ei ryddhau!
       title: Cyhoeddiadau
-      unpublished_msg: Cyhoeddiad wedi'i angyhoeddi'n llwyddianus!
-      updated_msg: Cyhoeddiad wedi'i ddiweddaru yn llwyddianus!
+      unpublish: Dadgyhoeddi
+      unpublished_msg: Cyhoeddiad wedi'i ddad gyhoeddi'n llwyddiannus!
+      updated_msg: Cyhoeddiad wedi'i ddiweddaru'n llwyddiannus!
     custom_emojis:
       assign_category: Neilltuo categori
       by_domain: Parth
       copied_msg: Llwyddwyd i greu copi lleol o'r emoji
       copy: Copïo
-      copy_failed_msg: Methwyd i greu copi lleol o'r emoji hwnnw
+      copy_failed_msg: Methwyd a chreu copi lleol o'r emoji hwnnw
+      create_new_category: Creu categori newydd
       created_msg: Llwyddwyd i greu emoji!
       delete: Dileu
       destroyed_msg: Llwyddwyd i ddinistrio emojo!
-      disable: Diffodd
-      disabled: Wedi'i ddiffodd
-      disabled_msg: Llwyddwyd i ddiffodd yr emoji hwnnw
+      disable: Analluogi
+      disabled: Wedi'i analluogi
+      disabled_msg: Llwyddwyd i analluogi'r emoji hwnnw
+      emoji: Emoji
       enable: Galluogi
       enabled: Wedi ei alluogi
-      enabled_msg: Llwyddwyd i alluogi yr emoji hwnnw
-      image_hint: PNG hyd at 50KB
+      enabled_msg: Llwyddwyd i alluogi'r emoji hwnnw
+      image_hint: PNG neu GIF hyd at %{size}
       list: Rhestr
       listed: Rhestredig
       new:
         title: Ychwanegu emoji personol newydd
+      no_emoji_selected: Heb newid unrhyw emojis gan na chafodd yr un ei ddewis
       not_permitted: Nid oes gennych caniatâd i gyflawni'r weithred hon
       overwrite: Trosysgrifio
-      shortcode: Byrgod
-      shortcode_hint: O leiaf 2 nodyn, dim ond nodau alffaniwmerig a tanlinellau
-      title: Emoji unigryw
+      shortcode: Cod byr
+      shortcode_hint: O leiaf 2 nod, dim ond nodau alffaniwmerig a thanlinellu
+      title: Emoji cyfaddas
       uncategorized: Heb gategori
       unlist: Dad-restru
       unlisted: Heb eu rhestru
       update_failed_msg: Methwyd a diweddaru'r emoji hwnnw
       updated_msg: Llwyddwyd i ddiweddaru'r emoji!
-      upload: Uwchlwytho
+      upload: Llwytho
     dashboard:
+      active_users: defnyddwyr gweithredol
+      interactions: rhyngweithiadau
+      media_storage: Storfa cyfryngau
+      new_users: defnyddwyr newydd
+      opened_reports: adroddiadau wedi'u hagor
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> apêl yn aros"
+        many: "<strong>%{count}</strong> apêl yn aros"
+        one: "<strong>%{count}</strong> apêl yn aros"
+        other: "<strong>%{count}</strong> apêl yn aros"
+        two: "<strong>%{count}</strong> apêl yn aros"
+        zero: "<strong>%{count}</strong> o apeliadau'n aros"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> adroddiad yn aros"
+        many: "<strong>%{count}</strong> adroddiad yn aros"
+        one: "<strong>%{count}</strong> adroddiad yn aros"
+        other: "<strong>%{count}</strong> adroddiad yn aros"
+        two: "<strong>%{count}</strong> adroddiad yn aros"
+        zero: "<strong>%{count}</strong> o adroddiadau'n aros"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> hashnod yn aros"
+        many: "<strong>%{count}</strong> hashnod yn aros"
+        one: "<strong>%{count}</strong> hashnod yn aros"
+        other: "<strong>%{count}</strong> hashnod yn aros"
+        two: "<strong>%{count}</strong> hashnod yn aros"
+        zero: "<strong>%{count}</strong> o hashnodau'n aros"
+      pending_users_html:
+        few: "<strong>%{count}</strong> defnyddiwr yn aros"
+        many: "<strong>%{count}</strong> defnyddiwr yn aros"
+        one: "<strong>%{count}</strong> defnyddiwr yn aros"
+        other: "<strong>%{count}</strong> defnyddiwr yn aros"
+        two: "<strong>%{count}</strong> defnyddiwr yn aros"
+        zero: "<strong>%{count}</strong> o ddefnyddwyr yn aros"
+      resolved_reports: adroddiadau wedi'u datrys
       software: Meddalwedd
+      sources: Ffynonellau cofrestru
       space: Defnydd o ofod
-      title: Dangosfwrdd
+      title: Bwrdd rheoli
+      top_languages: Prif ieithoedd gweithredol
+      top_servers: Prif weinyddion gweithredol
+      website: Gwefan
+    disputes:
+      appeals:
+        empty: Heb ganfod unrhyw apeliadau.
+        title: Apeliadau
     domain_allows:
-      add_new: Rhestrwch parth
-      created_msg: Rhestrwyd wen parth yn llwyddiannus
-      destroyed_msg: Mae parth wedi'i dynnu o'r rhestr wen
-      undo: Tynnwch o'r rhestr wen
+      add_new: Caniatáu ffedereiddio gyda pharth
+      created_msg: Mae parth wedi'i ganiatáu'n llwyddiannus ar gyfer ffedereiddio
+      destroyed_msg: Mae parth wedi'i wahardd rhag ffedereiddio
+      export: Allforio
+      import: Mewnforio
+      undo: Gwrthod ffedereiddio gyda pharth
     domain_blocks:
       add_new: Ychwanegu bloc parth newydd
       created_msg: Mae'r bloc parth nawr yn cael ei brosesu
       destroyed_msg: Mae'r bloc parth wedi ei ddadwneud
       domain: Parth
       edit: Golygu bloc parth
-      existing_domain_block_html: Rydych yn barod wedi gosod cyfyngau fwy llym ar %{name}, mae rhaid i chi ei <a href="%{unblock_url}">ddadblocio</a> yn gyntaf.
+      existing_domain_block: Rydych chi eisoes wedi gosod terfynau llymach ar %{name}.
+      existing_domain_block_html: Rydych eisoes wedi gosod cyfyngau mwy llym ar %{name}, mae rhaid i chi ei <a href="%{unblock_url}">ddadflocio</a> yn gyntaf.
+      export: Allforio
+      import: Mewnforio
       new:
         create: Creu bloc
-        hint: Ni fydd y bloc parth yn atal cread cofnodion cyfrif yn y bas data, ond mi fydd yn gosod dulliau goruwchwylio penodol ôl-weithredol ac awtomatig ar y cyfrifau hynny.
+        hint: Ni fydd y bloc parth yn atal cread cofnodion cyfrif yn y bas data, ond mi fydd yn gosod dulliau cymedroli penodol ôl-weithredol ac awtomatig ar y cyfrifau hynny.
         severity:
-          desc_html: Mae <strong>Tawelu</strong> yn gwneud twtiau y cyfrif yn anweledig i unrhyw un nad yw'n dilyn y cyfrif. Mae <strong>Atal</strong> yn cael gwared ar holl gynnwys, cyfryngau a data proffil y cyfrif. Defnyddiwch <strong>Dim</strong> os ydych chi ond am wrthod dogfennau cyfryngau.
+          desc_html: Bydd <strong>terfyn</strong> yn gwneud postiadau o gyfrifon yn y parth hwn yn anweledig i unrhyw un nad yw'n eu dilyn. Bydd <strong>Atal</strong> yn dileu'r holl gynnwys, cyfryngau a data proffil ar gyfer cyfrifon y parth hwn o'ch gweinydd. Defnyddiwch <strong>Dim</strong> os ydych am wrthod ffeiliau cyfryngau yn unig.
           noop: Dim
-          silence: Tawelwch
+          silence: Terfyn
           suspend: Atal
         title: Blocio parth newydd
+      no_domain_block_selected: Heb newid unrhyw flociau parth e-bost gan nad oes un wedi'i ddewis
+      not_permitted: Nid oes gennych caniatâd i gyflawni'r weithred hon
+      obfuscate: Cuddio enw parth
+      obfuscate_hint: Cuddio'r enw parth yn y rhestr yn rhannol os yw hysbysebu'r rhestr o gyfyngiadau parth wedi'i alluogi
       private_comment: Sylw preifat
       private_comment_hint: Sylw am gyfyngiadau y barth ar gyfer defnydd mewnol gan y cymedrolwyr.
       public_comment: Sylw cyhoeddus
       public_comment_hint: Sylw am gyfyngiadau y parth hon ar gyfer y cyhoedd, os mae hysbysu'r rhestr o gyfyngiadau parth wedi'i alluogi.
-      reject_media: Gwrthod dogfennau cyfryngau
-      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_media: Gwrthod ffeiliau cyfryngau
+      reject_media_hint: Yn dileu ffeiliau cyfryngau sydd wedi'u storio'n lleol ac yn gwrthod llwytho i lawr unrhyw rai yn y dyfodol. Amherthnasol ar gyfer ataliadau
       reject_reports: Gwrthod adroddiadau
       reject_reports_hint: Anwybyddu'r holl adroddiadau sy'n dod o'r parth hwn. Amherthnasol i ataliadau
-      rejecting_media: Yn gwrthod ffeiliau cyfryngau
-      rejecting_reports: Yn gwrthod adroddiadau
-      severity:
-        silence: tawelu
-        suspend: ataliedig
-      show:
-        affected_accounts:
-          few: Effeithiwyd ar %{count} gyfrifon
-          many: Effeithiwyd ar %{count} gyfrifon
-          one: Effeithiwyd ar un cyfrif
-          other: Effeithiwyd ar %{count} gyfrifon
-          two: Effeithiwyd ar %{count} gyfrifon
-          zero: Effeithiwyd ar %{count} gyfrifon
-        retroactive:
-          silence: Dad-dawelu pob cyfri presennol o'r parth hwn
-          suspend: Dad-atal pob cyfrif o'r parth hwn sy'n bodoli
-        title: Dadwneud blocio parth ar gyfer %{domain}
-        undo: Dadwneud
       undo: Dadwneud bloc parth
       view: Gweld bloc parth
     email_domain_blocks:
       add_new: Ychwanegu
-      created_msg: Llwyddwyd i ychwanegu parth e-bost i'r gosbrestr
+      attempts_over_week:
+        few: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
+        many: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
+        one: "%{count} ymgais dros yr wythnos ddiwethaf"
+        other: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
+        two: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
+        zero: "%{count} o ymgeisiadau i gofrestru dros yr wythnos ddiwethaf"
+      created_msg: Wedi blocio parth e-bost yn llwyddiannus
       delete: Dileu
-      destroyed_msg: Llwyddwyd i ddileu parth e-bost o'r gosbrestr
+      dns:
+        types:
+          mx: Cofnod MX
       domain: Parth
-      empty: Dim parthiau ebost ar y rhestr rhwystro.
-      from_html: o %{domain}
       new:
         create: Ychwanegu parth
-        title: Cofnod newydd yng nghosbrestr e-byst
-      title: Cosbrestr e-bost
+        resolve: Datrys parth
+        title: Rhwystro parth e-bost newydd
+      no_email_domain_block_selected: Heb newid unrhyw flociau parth e-bost gan nad oes un wedi'i ddewis
+      resolved_dns_records_hint_html: Mae'r enw parth yn cyd-fynd â'r parthau MX canlynol, sy'n gyfrifol yn y pen draw am dderbyn e-bost. Bydd rhwystro parth MX yn rhwystro cofrestriadau o unrhyw gyfeiriad e-bost sy'n defnyddio'r un parth MX, hyd yn oed os yw'r enw parth gweladwy yn wahanol. <strong>Byddwch yn ofalus i beidio â rhwystro darparwyr e-bost mawr.</strong>
+      resolved_through_html: Wedi'i ddatrys trwy %{domain}
+      title: Parthau e-bost wedi'u rhwystro
+    export_domain_allows:
+      new:
+        title: Mewnforio parth yn caniatáu
+      no_file: Heb ddewis ffeil
+    export_domain_blocks:
+      import:
+        description_html: Rydych ar fin mewnforio rhestr o flociau parth. Edrychwch dros y rhestr hon yn ofalus iawn, yn enwedig os nad ydych chi wedi ei hysgrifennu.
+        existing_relationships_warning: Perthynas ddilyn gyfredol
+        private_comment_description_html: 'Er mwyn eich helpu i olrhain o ble mae blociau a fewnforwyd yn dod, bydd blociau a fewnforwyd yn cael eu creu gyda''r sylw preifat canlynol: <q>%{comment}</q>'
+        private_comment_template: Mewnforiwyd o %{source} ar %{date}
+        title: Mewnforio blociau parth
+      new:
+        title: Mewnforio blociau parth
+      no_file: Heb ddewis ffeil
+    follow_recommendations:
+      description_html: "<strong>Mae dilyn yr argymhellion yn helpu i ddefnyddwyr newydd ddod o hyd i gynnwys diddorol yn gyflym</strong>. Pan nad yw defnyddiwr wedi rhyngweithio digon ag eraill i ffurfio argymhellion dilyn personol, argymhellir y cyfrifon hyn yn lle hynny. Cânt eu hailgyfrifo'n ddyddiol o gymysgedd o gyfrifon gyda'r ymgysylltiadau diweddar uchaf a'r cyfrif dilynwyr lleol uchaf ar gyfer iaith benodol."
+      language: Ar gyfer iaith
+      status: Statws
+      suppress: Atal dilyn argymhelliad
+      suppressed: Cyfyngwyd
+      title: Dilyn yr argymhellion
+      unsuppress: Adfer argymhelliad dilyn
     instances:
+      availability:
+        description_html:
+          few: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+          many: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+          one: Os bydd anfon i'r parth yn methu <strong>%{count} diwrnod</strong> heb lwyddo, ni fydd unrhyw ymdrechion danfon pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+          other: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+          two: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+          zero: Os bydd anfon i'r parth yn methu ar <strong>%{count} o ddiwrnodau gwahanol</strong> heb lwyddo, ni fydd unrhyw ymdrechion dosbarthu pellach yn cael eu gwneud oni bai y bydd danfoniad yn cael ei dderbyn <em>o'r</em> parth.
+        failure_threshold_reached: Trothwy methiant wedi'i gyrraedd ar %{date}.
+        failures_recorded:
+          few: Ymdrechion wedi methu ar %{count} diwrnod gwahanol.
+          many: Ymdrechion wedi methu ar %{count} diwrnod gwahanol.
+          one: Ymdrechion wedi methu ar %{count} diwrnod.
+          other: Ymdrechion wedi methu ar %{count} diwrnod gwahanol.
+          two: Ymdrechion wedi methu ar %{count} ddiwrnod gwahanol.
+          zero: Ymdrechion wedi methu ar %{count} o ddyddiau gwahanol.
+        no_failures_recorded: Dim methiannau wedi'u cofnodi
+        title: Argaeledd
+        warning: Bu'r ymgais olaf i gysylltu â'r gweinydd hwn yn aflwyddiannus
+      back_to_all: Popeth
+      back_to_limited: Cyfyngedig
+      back_to_warning: Rhybudd
       by_domain: Parth
-      delivery_available: Mae'r cyflenwad ar gael
+      confirm_purge: Ydych chi'n siŵr eich bod am ddileu data o'r parth hwn yn barhaol?
+      content_policies:
+        comment: Nodyn mewnol
+        description_html: Gallwch ddiffinio polisïau cynnwys a fydd yn cael eu cymhwyso i bob cyfrif o'r parth hwn ac unrhyw un o'i is-barthau.
+        policies:
+          reject_media: Gwrthod cyfryngau
+          reject_reports: Gwrthod adroddiadau
+          silence: Terfyn
+          suspend: Atal
+        policy: Polisi
+        reason: Rheswm cyhoeddus
+        title: Polisïau cynnwys
+      dashboard:
+        instance_accounts_dimension: Cyfrifon mwyaf poblogaidd
+        instance_accounts_measure: cyfrifon wedi'u storio
+        instance_followers_measure: ein dilynwyr yno
+        instance_follows_measure: eu dilynwyr yma
+        instance_languages_dimension: Prif ieithoedd
+        instance_media_attachments_measure: atodiadau cyfryngau wedi'u storio
+        instance_reports_measure: adroddiadau amdanyn nhw
+        instance_statuses_measure: postiadau wedi'u storio
+      delivery:
+        all: Popeth
+        clear: Clirio gwallau anfon
+        failing: Yn methu
+        restart: Ailgychwyn anfon
+        stop: Atal anfon
+        unavailable: Ddim ar gael
+      delivery_available: Mae'r anfon ar gael
+      delivery_error_days: Dyddiau gwall anfon
+      delivery_error_hint: Os nad yw'n bosibl anfon am %{count} o ddyddiau, caiff ei nodi'n awtomatig fel un nad oes modd ei anfon.
+      destroyed_msg: Mae data o %{domain} bellach mewn ciw i'w ddileu'n syth.
+      empty: Heb ganfod parthau.
       known_accounts:
-        few: "%{count} cyfrifon hysbys"
-        many: "%{count} cyfrifon hysbys"
+        few: "%{count} cyfrif hysbys"
+        many: "%{count} cyfrif hysbys"
         one: "%{count} cyfrif hysbys"
-        other: "%{count} cyfrifon hysbys"
-        two: "%{count} cyfrifon hysbys"
-        zero: "%{count} cyfrifon hysbys"
+        other: "%{count} cyfrif hysbys"
+        two: "%{count} gyfrif hysbys"
+        zero: "%{count} o gyfrifon hysbys"
       moderation:
-        all: Pob
-        limited: Gyfyngedig
-        title: Goruwchwyliad
+        all: Popeth
+        limited: Cyfyngedig
+        title: Cymedroli
       private_comment: Sylw preifat
       public_comment: Sylw cyhoeddus
+      purge: Clirio
+      purge_description_html: Os ydych chi'n credu bod y parth hwn all-lein am byth, gallwch ddileu'r holl gofnodion cyfrif a data cysylltiedig o'r parth hwn o'ch storfa. Gall hyn gymryd peth amser.
       title: Ffederasiwn
-      total_blocked_by_us: Wedi'i bloc gan ni
-      total_followed_by_them: Yn dilyn ganynt
-      total_followed_by_us: Yn dilyn ganom ni
-      total_reported: Adroddiadau amdanynt
+      total_blocked_by_us: Wedi'i flocio gennym ni
+      total_followed_by_them: Yn cael eu dilyn ganddyn nhw
+      total_followed_by_us: Yn cael eu dilyn gennym ni
+      total_reported: Adroddiadau amdanyn nhw
       total_storage: Atodiadau cyfryngau
+      totals_time_period_hint_html: Mae'r cyfansymiau sy'n cael eu dangos isod yn cynnwys data am y cyfnod cyfan.
     invites:
-      deactivate_all: Diffodd pob un
+      deactivate_all: Dadweithredu popeth
       filter:
-        all: Pob
+        all: Popeth
         available: Ar gael
         expired: Wedi dod i ben
         title: Hidlo
       title: Gwahoddiadau
-    pending_accounts:
-      title: Cyfrifau yn aros (%{count})
+    ip_blocks:
+      add_new: Creu rheol
+      created_msg: Wedi ychwanegu rheol IP newydd yn llwyddiannus
+      delete: Dileu
+      expires_in:
+        '1209600': 2 wythnos
+        '15778476': 6 mis
+        '2629746': 1 mis
+        '31556952': 1 flwyddyn
+        '86400': 1 diwrnod
+        '94670856': 3 blynedd
+      new:
+        title: Creu rheol IP newydd
+      no_ip_block_selected: Heb newid unrhyw reolau IP gan na ddewiswyd yr un ohonyn nhw
+      title: Rheolau IP
     relationships:
       title: Perthnasau %{acct}
     relays:
       add_new: Ychwanegau relái newydd
       delete: Dileu
-      description_html: Mae <strong>relái ffederasiwn</strong> yn weinydd ganol sy'n cyfnewid niferoedd ucheol o dŵtiau cyhoeddus rhwng gweinyddwyr sydd wedi tanysgrifio ac yn cyhoeddi iddo. <strong>Gall helpu weinyddwyr bach a cymhedrol eu maint i ddarganfod cynnwys o'r ffedysawd</strong>, fel arall bydd gofyn ara ddefnyddwyr lleol yn dilyn unigolion ar weinyddwyr eraill a llaw.
-      disable: Diffodd
-      disabled: Wedi'i ddiffodd
+      description_html: Mae <strong>relái ffederasiwn</strong> yn weinydd cyfryngol sy'n cyfnewid llawer iawn o bostiadau cyhoeddus rhwng gweinyddwyr sy'n tanysgrifio ac yn cyhoeddi iddo. <strong>Gall helpu gweinyddwyr bach a chanolig i ddarganfod cynnwys o'r llif</strong>, a fyddai fel arall yn ei gwneud yn ofynnol i ddefnyddwyr lleol ddilyn pobl eraill ar weinyddion anghysbell â llaw.
+      disable: Analluogi
+      disabled: Analluogwyd
       enable: Galluogi
-      enable_hint: Unwaith y bydd wedi ei alluogi, bydd eich gweinydd yn tanysgrifio i holl dŵtiau cyhoeddus o'r relai hwn, ac yn dechrau anfon tŵtiau y gweinydd hwn ato.
-      enabled: Wedi ei alluogi
+      enable_hint: Unwaith y bydd wedi ei alluogi, bydd eich gweinydd yn tanysgrifio i holl bostiadau cyhoeddus o'r relái hwn, ac yn dechrau anfon postiadau'r gweinydd hwn ato.
+      enabled: Galluogwyd
       inbox_url: URL relái
-      pending: Aros am gymeradywaeth i'r relái
+      pending: Yn aros am gymeradwyaeth i'r relái
       save_and_enable: Cadw a galluogi
-      setup: Sefydlu cysylltiad relái
-      signatures_not_enabled: Ni fydd cyfnewidau yn gweithio'n iawn pan mae modd diogel neu restr gwyn wedi'i alluogi
+      setup: Yn gosod cysylltiad relái
+      signatures_not_enabled: Ni fydd relaiau'n gweithio'n iawn pan mae modd diogel neu fodd ffederasiwn cyfyngedig wedi'i alluogi
       status: Statws
-      title: Cyfnewidwyr
+      title: Relaiau
     report_notes:
       created_msg: Llwyddwyd i greu nodyn adroddiad!
       destroyed_msg: Llwyddwyd i ddileu nodyn adroddiad!
     reports:
       account:
         notes:
-          few: "%{count} o nodiadau"
-          many: "%{count} o nodiadau"
-          one: "%{count} nodyn"
-          other: "%{count} o nodiadau"
-          two: "%{count} o nodiadau"
-          zero: "%{count} nodyn"
-        reports:
-          few: "%{count} o adroddiadau"
-          many: "%{count} o adroddiadau"
-          one: "%{count} adroddiad"
-          other: "%{count} o adroddiadau"
-          two: "%{count} o adroddiadau"
-          zero: "%{count} adroddiad"
-      action_taken_by: Gwnaethpwyd hyn gan
-      are_you_sure: Ydych chi'n sicr?
-      assign_to_self: Aseinio i mi
-      assigned: Arolygwr wedi'i aseinio
+          few: "%{count} nodyn"
+          many: "%{count} nodyn"
+          one: "%{count} un nodyn"
+          other: "%{count} nodyn"
+          two: "%{count} nodyn"
+          zero: "%{count} un nodyn"
+      action_log: Log archwilio
+      action_taken_by: Camau a gymerwyd gan
+      actions:
+        delete_description_html: Bydd y postiadau yr adroddwyd amdanyn nhw'n cael eu dileu a bydd rhybudd yn cael ei recordio i'ch helpu i gynyddu achosion o dordyletswydd yn y dyfodol gan yr un cyfrif.
+        mark_as_sensitive_description_html: Bydd y cyfryngau yn y postiadau sy'n cael eu hadrodd yn cael eu marcio'n sensitif a bydd rhybudd yn cael ei recordio i'ch helpu i gynyddu achosion o dorri rheolau yn y dyfodol gan yr un cyfrif.
+        other_description_html: Gweld rhagor o ddewisiadau rheoli ymddygiad y cyfrif a chyfaddasu cyfathrebiad i'r cyfrif a adroddwyd.
+        resolve_description_html: Ni fydd unrhyw gamau yn cael eu cymryd yn erbyn y cyfrif a adroddwyd, ni chofnodwyd rhybudd, a bydd yr adroddiad yn cael ei gau.
+        silence_description_html: Dim ond i'r rhai sydd eisoes yn ei ddilyn neu'n edrych arno â llaw y bydd y proffil yn weladwy, gan gyfyngu'n ddifrifol ar ei gyrhaeddiad. Mae modd ei ddychwelyd ar unrhyw adeg.
+        suspend_description_html: Bydd y proffil a'i holl gynnwys yn dod yn anhygyrch nes iddo gael ei ddileu yn y pen draw. Bydd rhyngweithio â'r cyfrif yn amhosibl. Mae modd ei adfer o fewn 30 diwrnod.
+      actions_description_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Os byddwch yn cymryd camau cosbol yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
+      add_to_report: Ychwanegu rhagor i adroddiad
+      are_you_sure: Ydych chi'n siŵr?
+      assign_to_self: Neilltuo i mi
+      assigned: Cymedrolwr wedi'i neilltuo
+      by_target_domain: Parth y cyfrif a adroddwyd
+      category: Categori
+      category_description_html: Bydd y rheswm dros adrodd am y cyfrif a/neu’r cynnwys hwn yn cael ei ddyfynnu wrth gyfathrebu â’r cyfrif a adroddwyd
       comment:
         none: Dim
+      comment_description_html: 'I ddarparu rhagor o wybodaeth, ysgrifennodd %{name}:'
       created_at: Adroddwyd
+      delete_and_resolve: Dileu postiadau
+      forwarded: Wedi'i anfon ymlaen
+      forwarded_to: Wedi'i anfon ymlaen i %{domain}
       mark_as_resolved: Nodi fel wedi'i ddatrys
+      mark_as_sensitive: Marcio fel sensitif
       mark_as_unresolved: Nodi fel heb ei ddatrys
+      no_one_assigned: Neb
       notes:
         create: Ychwanegu nodyn
         create_and_resolve: Datrys gyda nodyn
         create_and_unresolve: Ailagor gyda nodyn
         delete: Dileu
-        placeholder: Disgrifiwch pa weithredoedd sydd wedi eu cymryd, neu unrhyw ddiweddariadau eraill...
+        placeholder: Disgrifiwch pa weithredoedd sydd wedi eu cymryd, neu unrhyw ddiweddariadau perthnasol eraill...
+        title: Nodiadau
+      notes_description_html: Gweld a gadael nodiadau i gymedrolwyr eraill a chi eich hun yn y dyfodol
+      quick_actions_description_html: 'Cymerwch gamau cyflym neu sgroliwch i lawr i weld cynnwys yr adroddwyd amdano:'
+      remote_user_placeholder: y defnyddiwr pell o %{instance}
       reopen: Ailagor adroddiad
       report: 'Adroddiad #%{id}'
       reported_account: Cyfrif wedi ei adrodd
       reported_by: Adroddwyd gan
       resolved: Wedi ei ddatrys
       resolved_msg: Llwyddwyd i ddatrys yr adroddiad!
+      skip_to_actions: Mynd i gamau gweithredu
       status: Statws
-      target_domain: Parth cyfrif a adroddir
+      statuses: Cynnwys wedi'i adrodd
+      statuses_description_html: Bydd cynnwys tramgwyddus yn cael ei ddyfynnu wrth gyfathrebu â'r cyfrif a adroddwyd
+      target_origin: Tarddiad y cyfrif a adroddwyd
       title: Adroddiadau
       unassign: Dadneilltuo
       unresolved: Heb ei ddatrys
       updated_at: Diweddarwyd
+      view_profile: Gweld proffil
+    roles:
+      add_new: Ychwanegu rôl
+      assigned_users:
+        few: "%{count} defnyddiwr"
+        many: "%{count} defnyddiwr"
+        one: "%{count} defnyddiwr"
+        other: "%{count} defnyddiwr"
+        two: "%{count} ddefnyddiwr"
+        zero: "%{count} defnyddiwyr"
+      categories:
+        administration: Gweinyddiaeth
+        devops: DevOps
+        invites: Gwahoddiadau
+        moderation: Cymedroli
+        special: Arbennig
+      delete: 'Dileu:'
+      description_html: Gyda <strong>rolau defnyddwyr</strong>, gallwch chi gyfaddasu pa swyddogaethau a meysydd o Mastodon y gall eich defnyddwyr gael mynediad iddyn nhw.
+      edit: Golygu rôl '%{name}'
+      everyone: Caniatâd rhagosodedig
+      everyone_full_description_html: Dyma'r <strong>rôl sylfaenol</strong> sy'n effeithio ar <strong>bob defnyddiwr</strong>, hyd yn oed y rhai heb rôl benodol. Mae pob rôl arall yn etifeddu caniatâd ganddo.
+      permissions_count:
+        few: "%{count} caniatâd"
+        many: "%{count} caniatâd"
+        one: "%{count} caniatâd"
+        other: "%{count} caniatâd"
+        two: "%{count} ganiatâd"
+        zero: "%{count} caniatâd"
+      privileges:
+        administrator: Gweinyddwr
+        administrator_description: Bydd defnyddwyr sydd â'r caniatâd hwn yn osgoi pob caniatâd
+        delete_user_data: Dileu Data Defnyddiwr
+        delete_user_data_description: Yn caniatáu i ddefnyddwyr ddileu data defnyddwyr eraill yn ddi-oed
+        invite_users: Gwahodd Defnyddwyr
+        invite_users_description: Yn caniatáu i ddefnyddwyr wahodd pobl newydd i'r gweinydd
+        manage_announcements: Rheoli Cyhoeddiadau
+        manage_announcements_description: Yn caniatáu i ddefnyddwyr reoli cyhoeddiadau ar y gweinydd
+        manage_appeals: Rheoli Apeliadau
+        manage_appeals_description: Yn caniatáu i ddefnyddwyr adolygu apeliadau yn erbyn camau cymedroli
+        manage_blocks: Rheoli Blociau
+        manage_blocks_description: Yn caniatáu i ddefnyddwyr rwystro darparwyr e-bost a chyfeiriadau IP
+        manage_custom_emojis: Rheoli Emojis Cyfaddas
+        manage_custom_emojis_description: Yn caniatáu i ddefnyddwyr reoli emojis cyfaddas ar y gweinydd
+        manage_federation: Rheoli Ffederasiwn
+        manage_federation_description: Yn caniatáu i ddefnyddwyr rwystro neu ganiatáu ffedereiddio â pharthau eraill, a rheoli'r gallu i gyflawni
+        manage_invites: Rheoli Gwahoddiadau
+        manage_invites_description: Yn caniatáu i ddefnyddwyr bori a diffodd dolenni gwahodd
+        manage_reports: Rheoli Adroddiadau
+        manage_reports_description: Yn caniatáu i ddefnyddwyr adolygu adroddiadau a chyflawni camau cymedroli yn eu herbyn
+        manage_roles: Rheoli Rolau
+        manage_roles_description: Yn galluogi defnyddwyr i reoli a phennu rolau o dan eu rhai nhw
+        manage_rules: Rheoli Rheolau
+        manage_rules_description: Yn caniatáu i ddefnyddwyr newid rheolau gweinydd
+        manage_settings: Rheoli Gosodiadau
+        manage_settings_description: Yn caniatáu i ddefnyddwyr newid gosodiadau gwefan
+        manage_taxonomies: Rheoli Tacsonomeg
+        manage_taxonomies_description: Yn caniatáu i ddefnyddwyr adolygu cynnwys sy'n trendio a diweddaru gosodiadau hashnodau
+        manage_user_access: Rheoli Mynediad Defnyddwyr
+        manage_user_access_description: Yn caniatáu i ddefnyddwyr analluogi dilysu dau ffactor defnyddwyr eraill, newid eu cyfeiriad e-bost, ac ailosod eu cyfrinair
+        manage_users: Rheoli Defnyddwyr
+        manage_users_description: Yn caniatáu i ddefnyddwyr weld manylion defnyddwyr eraill a chyflawni camau cymedroli yn eu herbyn
+        manage_webhooks: Rheoli Bachau Gwe
+        manage_webhooks_description: Yn caniatáu i ddefnyddwyr osod bachau gwe ar gyfer digwyddiadau gweinyddol
+        view_audit_log: Gweld Cofnodion Archwilio
+        view_audit_log_description: Yn caniatáu i ddefnyddwyr weld hanes o weithredoedd gweinyddol ar y gweinydd
+        view_dashboard: Gweld Bwrdd Gwaith
+        view_dashboard_description: Yn galluogi defnyddwyr i gael mynediad i'r bwrdd gwaith a metrigau amrywiol
+        view_devops: DevOps
+        view_devops_description: Yn caniatáu i ddefnyddwyr gael mynediad i fyrddau gwaith Sidekiq a pgHero
+      title: Rolau
+    rules:
+      add_new: Ychwanegu rheol
+      delete: Dileu
+      description_html: Er bod y rhan fwyaf yn honni eu bod wedi darllen ac yn cytuno i'r telerau gwasanaeth, fel arfer nid yw pobl yn darllen y cyfan tan ar ôl i broblem godi. <strong>Gwnewch hi'n haws i bobl weld rheolau eich gweinydd yn fras trwy eu darparu mewn rhestr pwyntiau bwled fflat.</strong> Ceisiwch gadw'r rheolau unigol yn fyr ac yn syml, ond ceisiwch beidio â'u rhannu'n nifer o eitemau ar wahân chwaith.
+      edit: Golygu rheol
+      empty: Nid oes unrhyw reolau gweinydd wedi'u diffinio eto.
+      title: Rheolau'r gweinydd
     settings:
-      activity_api_enabled:
-        desc_html: Niferoedd o statysau wedi eu postio'n lleol, defnyddwyr gweithredol, a cofrestradau newydd mewn bwcedi wythnosol
-        title: Cyhoeddi ystatedgau cyfangronedig am weithgaredd defnyddwyr
-      bootstrap_timeline_accounts:
-        desc_html: Gwahanu sawl enw defnyddiwr a coma. Dim ond cyfrifoedd lleol a cyfrifoedd heb eu cloi fydd yn gweithio. Tra bod yn aros yn wag yr hyn sy'n rhagosodedig yw'r holl weinyddwyr lleol.
-        title: Dilyn diofyn i ddefnyddwyr newydd
-      contact_information:
-        email: E-bost busnes
-        username: Enw defnyddiwr cyswllt
-      custom_css:
-        desc_html: Addasu gwedd gyda CSS wedi lwytho ar bob tudalen
-        title: CSS wedi'i addasu
+      about:
+        manage_rules: Rheoli rheolau gweinydd
+        preamble: Darparu gwybodaeth fanwl am sut mae'r gweinydd yn cael ei weithredu, ei gymedroli a'i ariannu.
+        rules_hint: Mae maes penodol ar gyfer rheolau y disgwylir i'ch defnyddwyr gadw ato.
+        title: Ynghylch
+      appearance:
+        preamble: Cyfaddasu rhyngwyneb gwe Mastodon.
+        title: Golwg
+      branding:
+        preamble: Mae brandio eich gweinydd yn ei wahaniaethu oddi wrth weinyddion eraill yn y rhwydwaith. Gall y wybodaeth hon gael ei dangos ar draws amrywiaeth o amgylcheddau, megis rhyngwyneb gwe Mastodon, rhaglenni brodorol, mewn rhagolygon cyswllt ar wefannau eraill ac o fewn apiau negeseuon, ac ati. Am y rheswm hwn, mae'n well cadw'r wybodaeth hon yn glir, yn fyr ac yn gryno.
+        title: Brandio
+      content_retention:
+        preamble: Rheoli sut mae cynnwys sy'n cael ei gynhyrchu gan ddefnyddwyr yn cael ei storio yn Mastodon.
+        title: Cadw cynnwys
       default_noindex:
         desc_html: Yn effeithio pob defnyddwr sydd heb newid y gosodiad ei hun
-        title: Eithrio defnyddwyr o fynegai peiriannau chwilio yn rhagosodiedig
+        title: Eithrio defnyddwyr o fynegai peiriannau chwilio, fel rhagosodiad
+      discovery:
+        follow_recommendations: Dilyn yr argymhellion
+        preamble: Mae amlygu cynnwys diddorol yn allweddol ar gyfer derbyn defnyddwyr newydd nad ydynt efallai'n gyfarwydd ag unrhyw un Mastodon. Rheolwch sut mae nodweddion darganfod amrywiol yn gweithio ar eich gweinydd.
+        profile_directory: Cyfeiriadur proffiliau
+        public_timelines: Ffrydiau cyhoeddus
+        title: Darganfod
+        trends: Trendiau
       domain_blocks:
         all: I bawb
         disabled: I neb
-        title: Dangos rhwystriadau parth
-        users: I ddefnyddwyr lleol mewngofnodadwy
-      domain_blocks_rationale:
-        title: Dangos rhesymwaith
-      hero:
-        desc_html: Yn cael ei arddangos ar y dudadlen flaen. Awgrymir 600x100px oleia. Pan nad yw wedi ei osod, mae'n ymddangos fel mân-lun yr achos
-        title: Delwedd arwr
-      mascot:
-        desc_html: I'w arddangos ar nifer o dudalennau. Awgrymir 293x205px o leiaf. Pan nad yw wedi ei osod, cwympo nôl i'r mascot rhagosodedig
-        title: Llun mascot
-      peers_api_enabled:
-        desc_html: Enwau parth y mae'r achos hwn wedi dod ar ei draws yn y ffedysawd
-        title: Cyhoeddi rhestr o achosion dargynfyddiedig
-      preview_sensitive_media:
-        desc_html: Bydd rhagolygon ar wefannau eraill yn dangos ciplun hyd yn oed os oes na gyfryngau wedi eu marcio'n sensitif
-        title: Dangos cyfryngau sensitif mewn rhagolygon OpenGraph
-      profile_directory:
-        desc_html: Caniatáu i ddefnyddwyr gael eu gweld
-        title: Galluogi cyfeiriadur proffil
+        users: I ddefnyddwyr lleol wedi'u mewngofnodi
       registrations:
-        closed_message:
-          desc_html: I'w arddangos ar y dudalen flaen wedi i gofrestru cau. Mae modd defnyddio tagiau HTML
-          title: Neges gofrestru caeëdig
-        deletion:
-          desc_html: Caniatau i unrhywun i ddileu eu cyfrif
-          title: Agor dileu cyfrif
-        min_invite_role:
-          disabled: Neb
-          title: Caniatau gwahoddiadau gan
+        preamble: Rheoli pwy all greu cyfrif ar eich gweinydd.
+        title: Cofrestriadau
       registrations_mode:
         modes:
-          approved: Mae angen cymeradwyaeth ar gyfer cofrestru
-          none: Ni all unrhyw un cofrestru
+          approved: Mae angen cymeradwyaeth i gofrestru
+          none: Nid oes neb yn gallu cofrestru
           open: Gall unrhyw un cofrestru
-        title: Modd cofrestriadau
-      show_known_fediverse_at_about_page:
-        desc_html: Wedi'i ddewis, bydd yn dangos rhagolwg o dŵtiau o'r holl ffedysawd. Fel arall bydd ond yn dangos tŵtiau lleol.
-        title: Dangos ffedysawd hysbys ar ragolwg y ffrwd
-      show_staff_badge:
-        desc_html: Dangos bathodyn staff ar dudalen defnyddiwr
-        title: Dangos bathodyn staff
-      site_description:
-        desc_html: Paragraff agoriadol ar y dudalen flaen. Disgrifiwch yr hyn sy'n arbennig am y gweinydd Mastodon hwn ac unrhywbeth arall o bwys. Mae modd defnyddio tagiau HTML <code>&lt;a&gt;</code> a <code>&lt;em&gt;</code>.
-        title: Disgrifiad achos
-      site_description_extended:
-        desc_html: Lle da ar gyfer eich cod ymddygiad, rheolau, canllawiau a phethau eraill sy'n gwneud eich achos yn whanol. Mae modd i chi ddefnyddio tagiau HTML
-        title: Gwybodaeth bellach wedi ei addasu
-      site_short_description:
-        desc_html: Yn cael ei ddangos yn bar ar yr ochr a tagiau meto. Digrifiwch beth yw Mastodon a beth sy'n gwneud y gweinydd hwn mewn un paragraff. Os yn wag, wedi ei ragosod i ddangos i disgrifiad yr achos.
-        title: Disgrifiad byr o'r achos
-      site_terms:
-        desc_html: Mae modd i chi ysgrifennu polisi preifatrwydd, termau gwasanaeth a cyfreitheg arall eich hun. Mae modd defnyddio tagiau HTML
-        title: Termau gwasanaeth wedi eu haddasu
-      site_title: Enw'r achos
-      thumbnail:
-        desc_html: Ceith ei ddefnyddio ar gyfer rhagolygon drwy OpenGraph a'r API. Argymhellir 1200x630px
-        title: Mân-lun yr achos
-      timeline_preview:
-        desc_html: Dangos ffrwd gyhoeddus ar y dudalen lanio
-        title: Rhagolwg o'r ffrwd
-      title: Gosodiadau'r wefan
-      trendable_by_default:
-        desc_html: Yn ddylanwadu ar hashnodau sydd heb ei rhwystro yn y gorffenol
-        title: Gadael hashnodau i dueddu heb adolygiad cynt
-      trends:
-        desc_html: Arddangos hashnodau a adolygwyd yn gynt yn gyhoeddus sydd yn tueddu yn bresennol
-        title: Hashnodau tueddig
+      title: Gosodiadau Gweinydd
     site_uploads:
-      delete: Dileu ffeil sydd wedi'i uwchlwytho
-      destroyed_msg: Uwchlwythiad wefan wedi'i ddileu yn lwyddianus!
+      delete: Dileu ffeil sydd wedi'i llwytho
+      destroyed_msg: Llwytho i fyny i'r wefan wedi'i dileu yn llwyddiannus!
     statuses:
-      back_to_account: Yn ôl i dudalen y cyfrif
+      account: Awdur
+      application: Rhaglen
+      back_to_account: Nôl i dudalen y cyfrif
+      back_to_report: Nôl i dudalen yr adroddiad
       batch:
-        delete: Dileu
-        nsfw_off: Marcio fel nad yw'n sensitif
-        nsfw_on: Marcio'n sensitif
+        remove_from_report: Dileu o'r adroddiad
+        report: Adroddiad
       deleted: Dilëwyd
-      failed_to_execute: Methwyd a gweithredu
+      favourites: Ffefrynnau
+      history: Hanes fersiynau
+      in_reply_to: Ymateb i
+      language: Iaith
       media:
         title: Cyfryngau
-      no_media: Dim cyfryngau
-      no_status_selected: Ni newidwyd dim statws achos ni ddewiswyd dim un
-      title: Statysau cyfrif
-      with_media: A chyfryngau
+      metadata: Metaddata
+      no_status_selected: Heb newid postiad gan na ddewiswyd dim un
+      open: Agor postiad
+      original_status: Postiad gwreiddiol
+      reblogs: Ailflogiadau
+      status_changed: Postiad wedi'i newid
+      title: Postiadau cyfrif
+      trending: Yn trendio
+      visibility: Gwelededd
+      with_media: Gyda chyfryngau
+    strikes:
+      actions:
+        delete_statuses: Mae %{name} wedi dileu postiadau %{target}
+        disable: Mae %{name} wedi rhewi cyfrif %{target}
+        mark_statuses_as_sensitive: Mae %{name} wedi marcio postiadau %{target} fel rhai sensitif
+        none: Anfonodd %{name} rybudd at %{target}
+        sensitive: Mae %{name} wedi nodi bod cyfrif %{target} yn sensitif
+        silence: Mae %{name} wedi cyfyngu cyfrif %{target}
+        suspend: Mae %{name} wedi atal cyfrif %{target}
+      appeal_approved: Apeliwyd
+      appeal_pending: Apêl yn aros
+    system_checks:
+      database_schema_check:
+        message_html: Mae mudo cronfa ddata ar fin digwydd. Rhedwch nhw i sicrhau bod y rhaglen yn ymddwyn yn ôl y disgwyl
+      elasticsearch_running_check:
+        message_html: Methu cysylltu ag Elasticsearch. Gwiriwch ei fod yn rhedeg, neu analluogwch chwiliad testun llawn
+      elasticsearch_version_check:
+        message_html: 'Fersiwn Elasticsearch anghydnaws: %{value}'
+        version_comparison: Mae Elasticsearch %{running_version} yn rhedeg tra bod angen %{required_version}
+      rules_check:
+        action: Rheoli rheolau gweinydd
+        message_html: Nid ydych wedi diffinio unrhyw reolau gweinydd.
+      sidekiq_process_check:
+        message_html: Does dim proses Sidekiq yn rhedeg ar gyfer y ciw(iau) %{value}. Adolygwch eich ffurfweddiad Sidekiq
     tags:
-      accounts_today: Defyddau unigol heddiw
-      accounts_week: Defnyddau unigol yr wythnos hon
-      breakdown: Ymddatodiad o ddefnyddiaeth heddiw wrth ffynhonnell
-      last_active: Yn weithredol ddiwethaf
-      most_popular: Mwyaf poblogaidd
-      most_recent: Mwyaf diweddar
-      name: Hashnod
       review: Adolygu statws
-      reviewed: Wedi'i adolygu
-      title: Hashnodau
-      trending_right_now: Yn tueddu nawr
-      unique_uses_today: "%{count} yn postio heddiw"
-      unreviewed: Heb ei adolygu
       updated_msg: Gosodiadau hashnodau wedi'i diweddaru'n llwyddiannus
     title: Gweinyddiaeth
+    trends:
+      allow: Caniatáu
+      approved: Cymeradwywyd
+      disallow: Gwrthod
+      links:
+        allow: Caniatáu dolen
+        allow_provider: Caniatáu cyhoeddwr
+        description_html: Mae'r rhain yn ddolenni sy'n cael eu rhannu llawer ar hyn o bryd gan gyfrifon y mae eich gweinydd yn gweld postiadau ohonyn nhw. Gall helpu eich defnyddwyr i ddarganfod beth sy'n digwydd yn y byd. Ni chaiff unrhyw ddolenni eu dangos yn gyhoeddus nes i chi gymeradwyo'r cyhoeddwr. Gallwch hefyd ganiatáu neu wrthod dolenni unigol.
+        disallow: Gwrthod dolen
+        disallow_provider: Gwrthod y cyhoeddwr
+        no_link_selected: Heb newid unrhyw ddolen gan na chafodd yr un ohonyn nhw eu dewis
+        publishers:
+          no_publisher_selected: Heb newid unrhyw gyhoeddwr gan na ddewiswyd yr un ohonyn nhw
+        shared_by_over_week:
+          few: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
+          many: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
+          one: Wedi'i rannu gan un person dros yr wythnos ddiwethaf
+          other: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
+          two: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
+          zero: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
+        title: Dolenni sy'n trendio
+        usage_comparison: Wedi'i rannu %{today} gwaith heddiw, o'i gymharu â %{yesterday} ddoe
+      only_allowed: Derbyniwyd yn unig
+      pending_review: Yn aros am adolygiad
+      preview_card_providers:
+        allowed: Gall dolenni gan y cyhoeddwr hwn greu tuedd
+        description_html: Mae'r rhain yn barthau lle mae dolenni'n cael eu rhannu'n aml ar eich gweinydd. Ni fydd dolenni'n trendio'n gyhoeddus oni bai bod parth y ddolen yn cael ei gymeradwyo. Mae eich cymeradwyaeth (neu eich gwrthodiad) yn ymestyn i is-barthau.
+        rejected: Ni fydd dolenni gan y cyhoeddwr hwn yn creu tuedd
+        title: Cyhoeddwyr
+      rejected: Gwrthodwyd
+      statuses:
+        allow: Caniatáu postiad
+        allow_account: Caniatáu awdur
+        description_html: Mae'r rhain yn bostiadau y mae eich gweinydd yn gwybod amdanyn nhw sy'n cael eu rhannu a'u ffafrio llawer ar hyn o bryd. Gall helpu eich defnyddwyr newydd a'ch defnyddwyr sy'n dychwelyd i ddod o hyd i fwy o bobl i'w dilyn. Ni chaiff unrhyw bostiadau eu dangos yn gyhoeddus nes i chi gymeradwyo'r awdur, ac mae'r awdur yn caniatáu i'w cyfrif gael ei awgrymu i eraill. Gallwch hefyd ganiatáu neu wrthod postiadau unigol.
+        disallow: Gwrthod postiad
+        disallow_account: Gwrthod awdur
+        no_status_selected: Heb newid unrhyw bostiadau'n trendio gan na chafodd yr un ohonyn nhw eu dewis
+        not_discoverable: Nid yw'r awdur wedi dewis bod yn ddarganfyddadwy
+        shared_by:
+          few: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
+          many: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
+          one: Wedi'i rannu neu ei ffefrynnu unwaith
+          other: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
+          two: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
+          zero: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
+        title: Postiadau sy'n trendio
+      tags:
+        current_score: Sgôr cyfredol %{score}
+        dashboard:
+          tag_accounts_measure: defnyddiau unigryw
+          tag_languages_dimension: Prif ieithoedd
+          tag_servers_dimension: Prif weinyddion
+          tag_servers_measure: gweinyddion gwahanol
+          tag_uses_measure: cyfanswm defnydd
+        description_html: Mae'r rhain yn hashnodau sy'n ymddangos ar hyn o bryd mewn llawer o bostiadau y mae eich gweinydd yn eu gweld. Gall helpu eich defnyddwyr i ddarganfod beth mae pobl yn siarad fwyaf amdano ar hyn o bryd. Nid oes unrhyw hashnodau yn cael eu dangos yn gyhoeddus nes i chi eu cymeradwyo.
+        listable: Mae modd ei awgrymu
+        no_tag_selected: Heb newid unrhyw dagiau gan na chafodd yr un ohonyn nhw eu dewis
+        not_listable: Ni fydd yn cael ei awgrymu
+        not_trendable: Ni fydd yn ymddangos o dan trendiau
+        not_usable: Nid oes modd ei ddefnyddio
+        peaked_on_and_decaying: Ar ei anterth ar %{date}, bellach yn lleihau
+        title: Hashnodau trendiau
+        trendable: Gall ymddangos o dan trendiau
+        trending_rank: 'Yn trendio #%{rank}'
+        usable: Mae modd ei ddefnyddio
+        usage_comparison: Wedi'i ddefnyddio %{today} gwaith heddiw, o'i gymharu â %{yesterday} ddoe
+        used_by_over_week:
+          few: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+          many: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+          one: Wedi'i ddefnyddio gan un person dros yr wythnos ddiwethaf
+          other: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+          two: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+          zero: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
+      title: Trendiau
+      trending: Trendio
     warning_presets:
       add_new: Ychwanegu newydd
       delete: Dileu
       edit_preset: Golygu rhagosodiad rhybudd
+      empty: Nid ydych wedi diffinio unrhyw ragosodiadau rhybudd eto.
       title: Rheoli rhagosodiadau rhybudd
+    webhooks:
+      add_new: Ychwanegu diweddbwynt
+      delete: Dileu
+      description_html: Mae <strong>bachyn gwe</strong> yn galluogi Mastodon i wthio <strong>hysbysiadau amser real</strong> am ddigwyddiadau a ddewiswyd i'ch cais eich hun, fel y gall eich cais <strong>ysgogi ymatebion yn awtomatig</strong> .
+      disable: Analluogi
+      disabled: Wedi'i analluogi
+      edit: Golygu diweddbwynt
+      empty: Nid oes gennych unrhyw diweddbwyntiau bachau gwe wedi'u ffurfweddu eto.
+      enable: Galluogi
+      enabled: Gweithredol
+      enabled_events:
+        few: "%{count} digwyddiad wedi'u galluogi"
+        many: "%{count} digwyddiad wedi'u galluogi"
+        one: 1 digwyddiad wedi'i alluogi
+        other: "%{count} digwyddiad wedi'u galluogi"
+        two: "%{count} digwyddiad wedi'u galluogi"
+        zero: "%{count} digwyddiadau wedi'u galluogi"
+      events: Digwyddiadau
+      new: Bachyn gwe newydd
+      rotate_secret: Cylchdroi cyfrinach
+      secret: Cyfrinach arwyddo
+      status: Statws
+      title: Bachau Gwe
+      webhook: Bachyn Gwe
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: i ddileu eu postiadau
+        disable: i rewi eu cyfrif
+        mark_statuses_as_sensitive: i nodi eu postiadau fel rhai sensitif
+        none: rhybudd
+        sensitive: i nodi bod eu cyfrif yn sensitif
+        silence: i gyfyngu ar eu cyfrif
+        suspend: i atal eu cyfrif
+      body: 'Mae %{target} yn apelio yn erbyn penderfyniad cymedroli gan %{action_taken_by} ar %{date}, sef %{type}. Mae nhw''n dweud:'
+      next_steps: Gallwch gymeradwyo'r apêl i ddadwneud y penderfyniad cymedroli, neu ei anwybyddu.
+      subject: Mae %{username} yn apelio yn erbyn penderfyniad cymedroli ar %{instance}
     new_pending_account:
-      body: Mae manylion y cyfrif newydd yn isod. Gallwch cymeradwyo neu wrthod y ceisiad hon.
-      subject: Cyfrif newydd i fynu ar gyfer adolygiad ar %{instance} (%{username})
+      body: Mae manylion y cyfrif newydd yn isod. Gallwch gymeradwyo neu wrthod y cais hwn.
+      subject: Cyfrif newydd i'w adolygu ar %{instance} (%{username})
     new_report:
-      body: Mae %{reporter} wedi cwyno am %{target}
-      body_remote: Mae rhywun o %{domain} wedi cwyno am %{target}
-      subject: Cwyn newydd am %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Mae''r hashnod #%{name} yn tueddu heddiw, ond nid yw''r hashnod wedi''i adolygu''n gynt. Ni fydd o''n cael ei arddangos yn gyhoeddus oni bai bod chi''n ei ganiataú, neu arbedwch y ffurflen fel y mae i fyth clywed amdano eto.'
-      subject: Hashnod newydd i fynnu ar gyfer adolygiad ar %{instance} (%{name})
+      body: Mae %{reporter} wedi adrodd am %{target}
+      body_remote: Mae rhywun o %{domain} wedi adrodd am %{target}
+      subject: Adroddiad newydd am %{instance} (#%{id})
+    new_trends:
+      body: 'Mae angen adolygu''r eitemau canlynol cyn y mae modd eu dangos yn gyhoeddus:'
+      new_trending_links:
+        title: Dolenni sy'n trendio
+      new_trending_statuses:
+        title: Postiadau sy'n trendio
+      new_trending_tags:
+        no_approved_tags: Ar hyn o bryd nid oes unrhyw hashnodau trendio cymeradwy.
+        requirements: 'Gallai unrhyw un o''r ymgeiswyr hyn ragori ar yr hashnod trendio cymeradwy #%{rank}, sef #%{lowest_tag_name} gyda sgôr o %{lowest_tag_score} ar hyn o bryd.'
+        title: Hashnodau sy'n trendio
+      subject: Trendiau newydd i'w hadolygu ar %{instance}
   aliases:
     add_new: Creu enw arall
-    created_msg: Wedi creu enw arall yn llwyddianus. Gallwch nawr dechrau'r symudiad o'r hen gyfrif.
-    deleted_msg: Wedi tynnu enw arall yn llwyddianus. Ni fydd symud o'r cyfrif hynny i'r cyfrif hon yn bosib.
-    empty: Nid oes gennych chi enwau eraill.
-    hint_html: Os hoffech symyd o gyfrif arall i'r cyfrif hon, gallwch creu enw arall fama, sydd yn angenrheidiol cyn i chi dechrau symyd ddilynwyr o'r hen gyfrif i'r cyfrif hon. Mae'r gweithred hon yn <strong>ddiniwed ac yn gildroadwy</strong>. <strong>Caiff symudiad y cyfrif ei dechrau o'r hen gyfrif</strong>.
+    created_msg: Wedi creu enw arall yn llwyddiannus. Gallwch nawr ddechrau symud o'r hen gyfrif.
+    deleted_msg: Wedi tynnu enw arall yn llwyddiannus. Ni fydd symud o'r cyfrif hynny i'r cyfrif hon yn bosib.
+    empty: Nid oes gennych enwau eraill.
+    hint_html: Os ydych chi am symud o gyfrif arall i'r un hwn, gallwch greu enw arall yma, sy'n ofynnol cyn y gallwch symud ymlaen i symud dilynwyr o'r hen gyfrif i'r un hwn. Mae'r weithred hon ynddo'i hun yn <strong>ddiniwed ac yn wrthdroadwy</strong>. <strong>Mae'r mudo cyfrif yn cael ei wneud o'r hen gyfrif</strong> .
     remove: Dadgysylltu'r enw arall
   appearance:
     advanced_web_interface: Rhyngwyneb gwe uwch
-    advanced_web_interface_hint: 'Os hoffech gwneud defnydd o gyd o''ch lled sgrin, mae''r rhyngwyneb gwe uwch yn gadael i chi ffurfweddu sawl colofn wahanol i weld cymaint o wybodaeth â hoffech: Catref, hysbysiadau, ffrwd y ffedysawd, unrhyw nifer o rhestrau ac hashnodau.'
-    animations_and_accessibility: Animeiddiau ac hygyrchedd
-    confirmation_dialogs: Deialog cadarnhau
-    discovery: Darganfyddiad
+    advanced_web_interface_hint: 'Os ydych chi am ddefnyddio lled eich sgrin gyfan, mae''r rhyngwyneb gwe datblygedig yn caniatáu i chi ffurfweddu llawer o wahanol golofnau i weld faint bynnag o wybodaeth ar yr un pryd ag y dymunwch: Cartref, hysbysiadau, ffrydiau ffederaleiddiwyd, faint bynnag o restrau a hashnodau.'
+    animations_and_accessibility: Animeiddiadau a hygyrchedd
+    confirmation_dialogs: Deialogau cadarnhau
+    discovery: Darganfod
     localization:
-      body: Caiff Mastodon ei gyfieithu gan wirfoddolwyr.
+      body: Mae Mastodon yn cael ei gyfieithu gan wirfoddolwyr.
+      guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Gall pawb gyfrannu.
     sensitive_content: Cynnwys sensitif
-    toot_layout: Gosodiad tŵt
+    toot_layout: Cynllun postiad
   application_mailer:
     notification_preferences: Newid gosodiadau e-bost
+    salutation: "%{name},"
     settings: 'Newid gosodiadau e-bost: %{link}'
     view: 'Gweld:'
     view_profile: Gweld proffil
-    view_status: Gweld statws
+    view_status: Gweld postiad
   applications:
     created: Cais wedi ei greu'n llwyddiannus
     destroyed: Cais wedi ei ddileu'n llwyddiannus
-    invalid_url: Mae'r URL a ddarparwyd yn annilys
     regenerate_token: Adfywio tocyn mynediad
     token_regenerated: Adfywiwyd y tocyn mynediad yn llwyddiannus
-    warning: Byddwch yn ofalus a'r data hyn. Peidiwch a'i rannu byth!
+    warning: Byddwch yn ofalus iawn gyda'r data hwn. Peidiwch byth â'i rannu ag unrhyw un!
     your_token: Eich tocyn mynediad
   auth:
-    apply_for_account: Gofyn am wahoddiad
+    apply_for_account: Gofyn am gyfrif
     change_password: Cyfrinair
-    checkbox_agreement_html: Rydw i'n cytuno i'r <a href="%{rules_path}" target="_blank">rheolau'r gweinydd</a> a'r <a href="%{terms_path}" target="_blank">telerau gwasanaeth</a>
-    checkbox_agreement_without_rules_html: Rydw i'n cytuno i <a href="%{terms_path}" target="_blank">Delerau y Gwasanaeth</a>
     delete_account: Dileu cyfrif
     delete_account_html: Os hoffech chi ddileu eich cyfrif, mae modd <a href="%{path}">parhau yma</a>. Bydd gofyn i chi gadarnhau.
     description:
-      prefix_invited_by_user: Mae @%{name} yn eich wahodd i ymuno â'r gweinidd Mastodon hon!
-      prefix_sign_up: Cofrestru ar Fastodon heddiw!
-      suffix: Gyda cyfrif, byddwch yn gallu dilyn pobl, postio dilysiadau a chyfnewid negeseuon gyda defnyddwyr o unrhyw gweinydd Mastodon ac mwy!
+      prefix_invited_by_user: Mae @%{name} yn eich gwahodd i ymuno â'r gweinydd Mastodon hwn!
+      prefix_sign_up: Cofrestru ar Mastodon heddiw!
+      suffix: Gyda chyfrif, byddwch yn gallu dilyn pobl, postio diweddariadau a chyfnewid negeseuon gyda defnyddwyr o unrhyw weinydd Mastodon, a mwy!
     didnt_get_confirmation: Heb dderbyn cyfarwyddiadau cadarnhau?
+    dont_have_your_security_key: Nid oes gennych eich allwedd ddiogelwch?
     forgot_password: Wedi anghofio'ch cyfrinair?
-    invalid_reset_password_token: Tocyn ailosod cyfrinair yn annilys neu wedi dod i ben. Gwnewch gais am un newydd os gwelwch yn dda.
+    invalid_reset_password_token: Tocyn ailosod cyfrinair yn annilys neu wedi dod i ben. Gwnewch gais am un newydd, os gwelwch yn dda.
+    link_to_otp: Rhowch god dau ffactor o'ch ffôn neu god adfer
+    link_to_webauth: Defnyddiwch eich dyfais allwedd diogelwch
+    log_in_with: Mewngofnodi gyda
     login: Mewngofnodi
     logout: Allgofnodi
     migrate_account: Symud i gyfrif gwahanol
     migrate_account_html: Os hoffech chi ailgyfeirio'r cyfrif hwn at un gwahanol, mae modd <a href="%{path}">ei ffurfweddu yma</a>.
-    or_log_in_with: Neu logiwch mewn a
-    register: Cofrestru
+    or_log_in_with: Neu mewngofnodwch gyda
+    privacy_policy_agreement_html: Rwyf wedi darllen ac yn cytuno i'r <a href="%{privacy_policy_path}" target="_blank">polisi preifatrwydd</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Cofrestrwch
     registration_closed: Nid yw %{instance} yn derbyn aelodau newydd
     resend_confirmation: Ailanfon cyfarwyddiadau cadarnhau
     reset_password: Ailosod cyfrinair
+    rules:
+      preamble: Mae'r rhain yn cael eu gosod a'u gorfodi gan y %{domain} cymedrolwyr.
+      title: Rhai rheolau sylfaenol.
     security: Diogelwch
     set_new_password: Gosod cyfrinair newydd
     setup:
-      email_below_hint_html: Os mae'r ebost isod yn anghywir, gallwch ei newid fama a derbyn ebost cadarnhad newydd.
-      email_settings_hint_html: Caiff yr ebost cadarnhad ei anfon i %{email}. Os nad yw'r ebost hon yn gywir, gallwch ei newid yn ngosodiadau'r cyfrif.
+      email_below_hint_html: Os yw'r cyfeiriad e-bost isod yn anghywir, gallwch ei newid yma a derbyn e-bost cadarnhau newydd.
+      email_settings_hint_html: Anfonwyd yr e-bost cadarnhau at %{email}. Os nad yw'r cyfeiriad e-bost hwnnw'n gywir, gallwch ei newid yng ngosodiadau'r cyfrif.
       title: Gosodiad
+    sign_in:
+      preamble_html: Mewngofnodwch gyda'ch manylion <strong>%{domain}</strong>. Os yw eich cyfrif yn cael ei gynnal ar weinydd gwahanol, ni fydd modd i chi fewngofnodi yma.
+      title: Mewngofnodi i %{domain}
+    sign_up:
+      preamble: Gyda chyfrif ar y gweinydd Mastodon hwn, byddwch yn gallu dilyn unrhyw berson arall ar y rhwydwaith, lle bynnag mae eu cyfrif yn cael ei gynnal.
+      title: Gadewch i ni eich gosod ar %{domain}.
     status:
       account_status: Statws cyfrif
-      confirming: Aros i gadarnhad e-bost gael ei gwblhau.
-      functional: Mae eich cyfrif yn gwbl weithredol.
+      confirming: Yn aros i gadarnhad yr e-bost gael ei gwblhau.
+      functional: Mae eich cyfrif nawr yn weithredol.
       pending: Mae'ch cais yn aros i gael ei adolygu gan ein staff. Gall hyn gymryd cryn amser. Byddwch yn derbyn e-bost os caiff eich cais ei gymeradwyo.
-      redirecting_to: Mae eich cyfrif yn anactif oherwydd ei fod ar hyn o bryd yn ailgyfeirio i %{acct}.
-    trouble_logging_in: Trafferdd mewngofnodi?
+      redirecting_to: Mae eich cyfrif yn anweithredol oherwydd ei fod ar hyn o bryd yn ailgyfeirio i %{acct}.
+      view_strikes: Gweld rybuddion y gorffennol yn erbyn eich cyfrif
+    too_fast: Cafodd y ffurflen ei chyflwyno'n rhy gyflym, ceisiwch eto.
+    use_security_key: Defnyddiwch allwedd diogelwch
   authorize_follow:
-    already_following: Yr ydych yn dilyn y cyfrif hwn yn barod
-    already_requested: Rydych barod wedi anfon ceisiad dilyn i'r cyfrif hynny
-    error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif anghysbell
+    already_following: Rydych yn dilyn y cyfrif hwn yn barod
+    already_requested: Rydych chi eisoes wedi anfon cais i ddilyn y cyfrif hwnnw
+    error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif pell
     follow: Dilyn
-    follow_request: 'Yr ydych wedi anfon cais dilyn at:'
-    following: 'Llwyddiant! Yr ydych yn awr yn dilyn:'
+    follow_request: 'Rydych wedi anfon cais dilyn at:'
+    following: 'Llwyddiant! Rydych nawr yn dilyn:'
     post_follow:
       close: Neu, gallwch gau'r ffenest hon.
       return: Dangos proffil y defnyddiwr
-      web: I'r wê
+      web: Ewch i'r we
     title: Dilyn %{acct}
   challenge:
     confirm: Parhau
-    hint_html: "<strong>Awgrym:</strong> Ni fyddwn yn gofyn i chi am eich cyfrinair eto am yr awr nesaf."
+    hint_html: "<strong>Awgrym:</strong> Fyddwn ni ddim yn gofyn i chi am eich cyfrinair eto am yr awr nesaf."
     invalid_password: Cyfrinair annilys
     prompt: Cadarnhewch gyfrinair i barhau
   crypto:
     errors:
       invalid_key: ddim yn allwedd Ed25519 na Curve25519 dilys
       invalid_signature: ddim yn llofnod Ed25519 dilys
+  date:
+    formats:
+      default: "%b %d %Y"
+      with_month_name: "%b %d %Y"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}awr"
+      about_x_hours: "%{count}a"
       about_x_months: "%{count}mis"
-      about_x_years: "%{count}blwyddyn"
-      almost_x_years: "%{count}blwyddyn"
+      about_x_years: "%{count}b"
+      almost_x_years: "%{count}b"
       half_a_minute: Newydd fod
       less_than_x_minutes: "%{count}munud"
       less_than_x_seconds: Newydd fod
-      over_x_years: "%{count}blwyddyn"
+      over_x_years: "%{count}b"
       x_days: "%{count}dydd"
       x_minutes: "%{count}munud"
       x_months: "%{count}mis"
-      x_seconds: "%{count}eiliad"
+      x_seconds: "%{count}e"
   deletes:
-    challenge_not_passed: Nid oedd y wybodaeth a nodoch yn gywir
+    challenge_not_passed: Nid oedd y wybodaeth a roesoch yn gywir
     confirm_password: Mewnbynnwch eich cyfrinair presennol i gadarnhau mai chi sydd yno
     confirm_username: Rhowch eich enw defnyddiwr i gadarnhau'r weithdrefn
     proceed: Dileu cyfrif
     success_msg: Llwyddwyd i ddileu eich cyfrif
     warning:
       before: 'Cyn bwrw ymlaen, darllenwch y nodiadau hyn yn ofalus:'
-      caches: Efallai bydd cynnwys sydd wedi'i storio dros dro gan weinyddau eraill yn barhau
-      data_removal: Bydd eich pyst a'ch data arall yn cael ei ddileu am fyth
-      email_change_html: Gallwch <a href="%{path}">newid eich cyfeiriad ebost</a> heb ddileu eich cyfrif
-      email_contact_html: Os nad yw hi'n cyrraedd, gallwch ebostio <a href="mailto:%{email}">%{email}</a> am gymorth
-      email_reconfirmation_html: Os nad ydych yn derbyn yr ebost cadarnhad, gallwch <a href="%{path}">ceisio amdani eto</a>
-      irreversible: Ni fyddwch yn gallu adfer nac ail-greu eich cyfrif
-      more_details_html: Am fwy o fanylion, gwelwch y <a href="%{terms_path}">polisi preifatrwydd</a>.
+      caches: Efallai bydd cynnwys sydd wedi'i storio dros dro gan weinyddion eraill yn parhau
+      data_removal: Bydd eich postiadau a data arall yn cael eu dileu'n barhaol
+      email_change_html: Gallwch <a href="%{path}">newid eich cyfeiriad e-bost</a> heb ddileu eich cyfrif
+      email_contact_html: Os nad yw'n cyrraedd o hyd, gallwch anfon e-bost at <a href="mailto:%{email}">%{email}</a> am help
+      email_reconfirmation_html: Os nad ydych yn derbyn yr e-bost cadarnhau, gallwch <a href="%{path}">ofyn amdano eto</a>
+      irreversible: Fyddwch chi ddim yn gallu adfer nac ail-greu eich cyfrif
+      more_details_html: Am fwy o fanylion, darllenwch y <a href="%{terms_path}">polisi preifatrwydd</a>.
       username_available: Bydd eich enw defnyddiwr ar gael eto
       username_unavailable: Ni fydd eich enw defnyddiwr ar gael
-  directories:
-    directory: Cyfeiriadur proffil
-    explanation: Darganfod defnyddwyr yn seiliedig ar eu diddordebau
-    explore_mastodon: Archwilio %{title}
+  disputes:
+    strikes:
+      action_taken: Camau a gymerwyd
+      appeal: Apêl
+      appeal_approved: Apeliwyd yn llwyddiannus yn erbyn y rhybudd hwn ac nid yw'n ddilys bellach
+      appeal_rejected: Mae’r apêl wedi’i gwrthod
+      appeal_submitted_at: Apêl wedi'i chyflwyno
+      appealed_msg: Mae eich apêl wedi'i chyflwyno. Os caiff ei gymeradwyo, byddwch yn cael gwybod.
+      appeals:
+        submit: Cyflwyno apêl
+      approve_appeal: Cymeradwyo'r apêl
+      associated_report: Adroddiad cysylltiedig
+      created_at: Dyddiedig
+      description_html: Mae'r rhain yn gamau a gymerwyd yn erbyn eich cyfrif a rhybuddion sydd wedi'u hanfon atoch gan staff %{instance}.
+      recipient: Wedi'i gyfeirio at
+      reject_appeal: Gwrthod yr apêl
+      status: 'Postio #%{id}'
+      status_removed: Postiad sydd eisoes wedi'i dynnu o'r system
+      title: "%{action} gan %{date}"
+      title_actions:
+        delete_statuses: Dileu postiad
+        disable: Rhewi cyfrif
+        mark_statuses_as_sensitive: Marcio postiadau fel rhai sensitif
+        none: Rhybudd
+        sensitive: Marcio cyfrif fel un sensitif
+        silence: Cyfyngiad y cyfrif
+        suspend: Atal y cyfrif
+      your_appeal_approved: Mae eich apêl wedi'i chymeradwyo
+      your_appeal_pending: Rydych wedi cyflwyno apêl
+      your_appeal_rejected: Mae eich apêl wedi'i gwrthod
   domain_validator:
     invalid_domain: ddim yn enw parth dilys
   errors:
-    '400': Roedd y cais wnaethoch cyflwyno yn annilys neu'n gamffurfiedig.
-    '403': Nid oes gennych ganiatad i weld y dudalen hon.
-    '404': Nid yw'r dudalen yr oeddech yn chwilio amdani'n bodoli.
-    '406': Nid yw'r dudalen ar gael yn y fformat ceisiedig.
-    '410': Nid yw'r dudalen yr oeddech yn chwilio amdani'n bodoli mwyach.
+    '400': Roedd y cais a gyflwynwyd gennych yn annilys neu wedi'i gamffurfio.
+    '403': Nid oes gennych ganiatâd i weld y dudalen hon.
+    '404': Nid yw'r dudalen rydych yn chwilio amdani yma.
+    '406': Nid yw'r dudalen ar gael yn y fformat yna.
+    '410': Nid yw'r dudalen roeddech yn chwilio amdani yn bodoli yma bellach.
     '422':
-      content: Methwyd i ddilysu diogelwch. A ydych chi'n blocio cwcîs?
-      title: Methwyd i ddilysu diogelwch
-    '429': Wedi'i arafu
+      content: Methodd y dilysiad diogelwch. Ydych chi'n rhwystro cwcis?
+      title: Methodd y dilysiad diogelwch
+    '429': Gormod o geisiadau
     '500':
-      content: Mae'n ddrwg gennym ni, ond fe aeth rhywbeth o'i le ar ein rhan ni.
+      content: Ymddiheuriadau, ond fe aeth rhywbeth o'i le ar ein pen ni.
       title: Nid yw'r dudalen hon yn gywir
-    '503': Ni chaiff y dudalen ei weini oherwydd gwall gweinydd dros dro.
-    noscript_html: I ddefnyddio ap gwe Mastodon, galluogwch JavaScript os gwlwch yn dda. Fel arall, gallwch drio un o'r <a href="%{apps_path}">apiau cynhenid</a> ar gyfer Mastodon ar eich platfform.
+    '503': Ni fu modd gwasanaethu'r dudalen oherwydd methiant gweinydd dros dro.
+    noscript_html: I ddefnyddio ap gwe Mastodon, galluogwch JavaScript os gwelwch yn dda. Fel arall, gallwch drio un o'r <a href="%{apps_path}">apiau cynhenid</a> ar gyfer Mastodon ar eich platfform.
   existing_username_validator:
-    not_found: ni ddarganfwyd defnyddiwr lleol gyda'r enw cyfrif hynny
-    not_found_multiple: ni ddarganfwyd %{usernames}
+    not_found: methu dod o hyd i ddefnyddiwr lleol gyda'r enw defnyddiwr hwnnw
+    not_found_multiple: methu dod o hyd i %{usernames}
   exports:
     archive_takeout:
       date: Dyddiad
-      download: Lawrlwytho eich archif
-      hint_html: Mae modd gwneud cais am archif o'ch <strong>twtiau a'ch cyfryngau</strong>. Bydd y data sy'n cael ei allforio ar fformat ActivityPub, a ellir ei ddarllen gyda unrhyw feddalwaedd sy'n cydymffurfio. Mae modd gwneud cais am archif bob 7 diwrnod.
-      in_progress: Cyfansoddi eich archif...
-      request: Gwneud cais am eich archif
+      download: Llwythwch eich archif i lawr
+      hint_html: Gallwch ofyn am archif o'ch <strong>postiadau a'r cyfryngau a lwythwyd</strong>. Bydd y data a allforir yn y fformat ActivityPub, y mae modd ei ddarllen gan unrhyw feddalwedd sy'n cydymffurfio. Gallwch ofyn am archif bob 7 diwrnod.
+      in_progress: Wrthi'n llunio'ch archif...
+      request: Gofynn am eich archif
       size: Maint
-    blocks: Yr ydych yn blocio
+    blocks: Rydych chi'n blocio
+    bookmarks: Nodau Tudalen
+    csv: CSV
     domain_blocks: Blociau parth
     lists: Rhestrau
-    mutes: Yr ydych yn tawelu
-    storage: Storio cyfryngau
+    mutes: Rydych chi'n anwybyddu
+    storage: Storfa cyfryngau
   featured_tags:
     add_new: Ychwanegu
     errors:
-      limit: Yr ydych yn barod wedi cynnwys yr uchafswm o hashnodau
-    hint_html: "<strong>Beth yw hashnodau nodedig?</strong> Mae'r rhain yn cael ei arddangos yn amlwg ar eich proffil cyhoeddus ac yn gadael i bobl pori eich pyst cyhoeddus o dan y hashnodau rhain yn benodol. Rydynt yn declyn grêt ar gyfer tracio gweithiau creadigol neu brosiectau hir-dymor."
+      limit: Rydych chi eisoes wedi cynnwys yr uchafswm o hashnodau
+    hint_html: "<strong>Beth yw hashnodau dan sylw?</strong> Maen nhw'n cael eu dangos yn amlwg ar eich proffil cyhoeddus ac yn caniatáu i bobl bori'ch postiadau cyhoeddus yn benodol o dan yr hashnodau hynny. Maen nhw'n arf gwych ar gyfer cadw golwg ar weithiau creadigol neu brojectau tymor hir."
   filters:
     contexts:
       account: Proffilau
-      home: Ffrwd gartref
+      home: Cartref a rhestrau
       notifications: Hysbysiadau
-      public: Ffrwd gyhoeddus
+      public: Ffrydiau cyhoeddus
       thread: Sgyrsiau
     edit:
+      add_keyword: Ychwanegu allweddair
+      keywords: Allweddeiriau
+      statuses: Postiadau unigol
+      statuses_hint_html: Mae'r hidlydd hwn yn berthnasol i ddewis postiadau unigol pa un ai a ydynt yn cyfateb i'r allweddeiriau isod. <a href="%{path}">Adolygu neu ddileu postiadau o'r hidlydd</a> .
       title: Golygu hidlydd
     errors:
-      invalid_context: Dim cyd-destun neu cyd-destun annilys wedi ei ddarparu
-      invalid_irreversible: Mae hidlo anadferadwy ond yn gweithio yng nghyd-destun cartref neu hysbysiadau
+      deprecated_api_multiple_keywords: Nid oes modd newid y paramedrau hyn o'r cais hwn oherwydd eu bod yn berthnasol i fwy nag un allweddair hidlo. Defnyddiwch raglen fwy diweddar neu'r rhyngwyneb gwe.
+      invalid_context: Dim neu gyd-destun annilys wedi'i ddarparu
     index:
+      contexts: Hidlau yn %{contexts}
       delete: Dileu
-      empty: Nid oes gennych chi hidlyddion.
+      empty: Nid oes gennych unrhyw hidlyddion.
+      expires_in: Yn dod i ben ymhen %{distance}
+      expires_on: Yn dod i ben ar %{date}
+      keywords:
+        few: "%{count} allweddair"
+        many: "%{count} allweddair"
+        one: "%{count} allweddair"
+        other: "%{count} allweddair"
+        two: "%{count} allweddair"
+        zero: "%{count} allweddeiriau"
+      statuses:
+        few: "%{count} postiad"
+        many: "%{count} postiad"
+        one: "%{count} postiad"
+        other: "%{count} postiad"
+        two: "%{count} postiad"
+        zero: "%{count} postiadau"
+      statuses_long:
+        few: "%{count} postiad unigol wedi'u cuddio"
+        many: "%{count} postiad unigol wedi'u cuddio"
+        one: "%{count} postiad unigol wedi'u cuddio"
+        other: "%{count} postiad unigol wedi'u cuddio"
+        two: "%{count} bostiad unigol wedi'u cuddio"
+        zero: "%{count} postiadau unigol wedi'u cuddio"
       title: Hidlyddion
     new:
+      save: Cadw hidlydd newydd
       title: Ychwanegu hidlydd newydd
+    statuses:
+      back_to_filter: Nôl i'r hidlydd
+      batch:
+        remove: Tynnu o'r hidlydd
+      index:
+        hint: Mae'r hidlydd hwn yn berthnasol i ddethol postiadau unigol waeth beth fo'r meini prawf eraill. Gallwch ychwanegu mwy o bostiadau at yr hidlydd hwn o'r rhyngwyneb gwe.
+        title: Postiadau wedi'u hidlo
   footer:
-    developers: Datblygwyr
-    more: Mwy…
-    resources: Adnoddau
-    trending_now: Yn tueddu nawr
+    trending_now: Trendiau
   generic:
     all: Popeth
-    changes_saved_msg: Llwyddwyd i gadw y newidiadau!
+    all_items_on_page_selected_html:
+      few: Mae pob un o'r <strong>%{count}</strong> eitem ar y dudalen hon wedi'u dewis.
+      many: Mae pob un o'r <strong>%{count}</strong> eitem ar y dudalen hon wedi'u dewis.
+      one: Mae <strong>%{count}</strong> eitem wedi'i dewis ar y dudalen hon.
+      other: Mae pob un o'r <strong>%{count}</strong> eitem ar y dudalen hon wedi'u dewis.
+      two: Mae pob un o'r <strong>%{count}</strong> eitem ar y dudalen hon wedi'u dewis.
+      zero: Does <strong>%{count}</strong> o eitemau ar y dudalen hon wedi'u dewis.
+    all_matching_items_selected_html:
+      few: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
+      many: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
+      one: Mae <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'i dewis.
+      other: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
+      two: Mae pob un o'r <strong>%{count}</strong> eitem sy'n cyfateb i'ch chwiliad wedi'u dewis.
+      zero: Does <strong>%{count}</strong> o eitemau sy'n cyfateb i'ch chwiliad wedi'u dewis.
+    changes_saved_msg: Llwyddwyd i gadw'r newidiadau!
     copy: Copïo
     delete: Dileu
-    no_batch_actions_available: Dim gweithredau llwyth ar gael ar y dudalen hon
-    order_by: Trefnu wrth
+    deselect: Dad-ddewis y cwbl
+    none: Dim
+    order_by: Trefnu yn ôl
     save_changes: Cadw newidiadau
+    select_all_matching_items:
+      few: Dewiswch bob un o'r %{count} eitem sy'n cyfateb i'ch chwilio.
+      many: Dewiswch bob un o'r %{count} eitem sy'n cyfateb i'ch chwilio.
+      one: Dewiswch bob un o'r %{count} o eitemau sy'n cyfateb i'ch chwilio.
+      other: Dewiswch bob un o'r %{count} eitem sy'n cyfateb i'ch chwilio.
+      two: Dewiswch bob un o'r %{count} eitem sy'n cyfateb i'ch chwilio.
+      zero: Dewiswch bob un o'r %{count} eitemau sy'n cyfateb i'ch chwilio.
+    today: heddiw
     validation_errors:
-      few: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
-      many: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
-      one: Mae rhywbeth o'i le o hyd! Edrychwch ar y gwall isod os gwelwch yn dda
-      other: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
-      two: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
+      few: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod, os gwelwch yn dda
+      many: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod, os gwelwch yn dda
+      one: Mae rhywbeth o'i le o hyd! Edrychwch ar y gwall isod, os gwelwch yn dda
+      other: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod, os gwelwch yn dda
+      two: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} wall isod, os gwelwch yn dda
       zero: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
   html_validator:
-    invalid_markup: 'yn cynnwys marciad HTML annilys: %{error}'
-  identity_proofs:
-    active: Yn weithredol
-    authorize: Ie, awdurdodi
-    authorize_connection_prompt: Awdurdodi y cysylltiad cryptograffig hon?
-    errors:
-      failed: Methwyd y cysylltiad cryptograffig. Ceisiwch eto o %{provider}, os gwelwch yn dda.
-      keybase:
-        invalid_token: Mae tocynnau keybase yn hashiau o llofnodau ac mae rhaid iddynt bod yn 66 cymeriadau hecs
-        verification_failed: Nid yw Keybase yn adnabod y tocyn hyn fel llofnod defnyddiwr Keybase %{kb_username}. Cesiwch eto o Keybase, os gwelwch yn dda.
-      wrong_user: Ni all greu prawf ar gyfer %{proving} tra wedi mewngofnodi fel %{current}. Mewngofnodi fel %{proving} a cheisiwch eto.
-    explanation_html: Fama gallwch cysylltu i'ch hunanieithau arall yn cryptograffig, er enghraifft proffil Keybase. Mae hyn yn gadael pobl arall i anfon chi negeseuon amgryptiedig a ymddiried mewn cynnwys rydych yn eich anfon iddynt.
-    i_am_html: Rydw i'n %{username} ar %{service}.
-    identity: Hunaniaeth
-    inactive: Anweithgar
-    publicize_checkbox: 'A thŵtiwch hon:'
-    publicize_toot: 'Wedi profi! Rydw i''n %{username} ar %{service}: %{url}'
-    remove: Tynnu prawf o'r cyfrif
-    removed: Wedi tynnu prawf o'r cyfrif yn llwyddiannus
-    status: Statws gwirio
-    view_proof: Gweld prawf
+    invalid_markup: 'yn cynnwys markup HTML annilys: %{error}'
   imports:
+    errors:
+      invalid_csv_file: 'Ffeil CSV annilys. Gwall: %{error}'
+      over_rows_processing_limit: yn cynnwys mwy na %{count} o resi
     modes:
       merge: Cyfuno
-      merge_long: Cadw'r cofnodau presennol ac ychwanegu rhai newydd
+      merge_long: Cadw'r cofnodion presennol ac ychwanegu rhai newydd
       overwrite: Trosysgrifio
-      overwrite_long: Disodli cofnodau bresennol gyda'r cofnodau newydd
-    preface: Mae modd mewnforio data yr ydych wedi allforio o achos arall, megis rhestr o bobl yr ydych yn ei ddilyn neu yn blocio.
-    success: Uwchlwythwyd eich data yn llwyddiannus ac fe fydd yn cael ei brosesu mewn da bryd
+      overwrite_long: Amnewid y cofnodion cyfredol gyda'r rhai newydd
+    preface: Gallwch fewnforio data rydych chi wedi'i allforio o weinydd arall, fel rhestr o'r bobl rydych chi'n eu dilyn neu'n eu blocio.
+    success: Llwythwyd eich data yn llwyddiannus a bydd yn cael ei brosesu mewn da bryd
     types:
       blocking: Rhestr blocio
+      bookmarks: Nodau Tudalen
       domain_blocking: Rhestr rhwystro parth
-      following: Rhestr dilyn
-      muting: Rhestr tawelu
-    upload: Uwchlwytho
-  in_memoriam_html: Mewn Cofiad.
+      following: Rhestr ddilynion
+      muting: Rhestr tewi
+    upload: Llwytho
   invites:
-    delete: Dadactifadu
-    expired: Wedi darfod
+    delete: Dadweithredu
+    expired: Wedi dod i ben
     expires_in:
       '1800': 30 munud
       '21600': 6 awr
       '3600': 1 awr
       '43200': 12 awr
       '604800': 1 wythnos
-      '86400': 1 dydd
+      '86400': 1 diwrnod
     expires_in_prompt: Byth
-    generate: Cynhyrchu
+    generate: Cynhyrchu dolen wahoddiad
     invited_by: 'Cawsoch eich gwahodd gan:'
     max_uses:
       few: "%{count} defnydd"
       many: "%{count} defnydd"
-      one: 1 iws
+      one: 1 defnydd
       other: "%{count} defnydd"
       two: "%{count} defnydd"
       zero: "%{count} defnydd"
     max_uses_prompt: Dim terfyn
-    prompt: Cynhyrchwch a rhannwch ddolenni gyda eraill i ganiatau mynediad i'r achos hwn
+    prompt: Creu a rhannu dolenni â phobl eraill i roi mynediad iddyn nhw i'r gweinydd hwn
     table:
-      expires_at: Darfod ar
+      expires_at: Yn dod i ben ar
       uses: Defnyddiau
     title: Gwahodd pobl
   lists:
     errors:
-      limit: Yr ydych wedi cyrraedd uchafswm nifer y rhestrau posib
+      limit: Rydych wedi cyrraedd uchafswm y rhestrau
+  login_activities:
+    authentication_methods:
+      otp: ap dilysu dau ffactor
+      password: cyfrinair
+      sign_in_token: cod diogelwch e-bost
+      webauthn: allweddi diogelwch
+    description_html: Os ydych yn gweld gweithgaredd nad ydych yn ei adnabod, ystyriwch newid eich cyfrinair a galluogi dilysu dau ffactor.
+    empty: Dim hanes dilysu ar gael
+    failed_sign_in_html: Ymgais mewngofnodi wedi methu gyda %{method} gan %{ip} (%{browser})
+    successful_sign_in_html: Mewngofnodi llwyddiannus gyda %{method} o %{ip} (%{browser})
+    title: Hanes dilysu
   media_attachments:
     validations:
-      images_and_video: Ni ellir ychwanegu fideo at statws sy'n cynnwys delweddau'n barod
-      not_ready: Methu atodi ffeiliau sydd dal yn prosesu. Ceisiwch eto mewn foment!
-      too_many: Ni ellir ychwanegu mwy na 4 dogfen
+      images_and_video: Methu atodi fideo i bostiad sydd eisoes yn cynnwys delweddau
+      not_ready: Methu atodi ffeiliau nad ydynt wedi gorffen prosesu. Ceisiwch eto, cyn hir!
+      too_many: Methu atodi mwy na 4 ffeil
   migrations:
-    acct: enwdefnyddiwr@parth y cyfrif newydd
-    cancel: Canslo ailgyfeirio
-    cancel_explanation: Bydd diddymu'r ailgyfeiriad yn ail-actifadu eich cyfrif bresennol, ond ni fydd hi'n dychwelyd dilynwyr sydd wedi'i symud i'r cyfrif hynny.
+    acct: Symudwyd i
+    cancel: Diddymu ailgyfeirio
+    cancel_explanation: Bydd diddymu'r ailgyfeiriad yn ail agor eich cyfrif cyfredol, ond ni fydd yn dod â dilynwyr sydd wedi'u symud i'r cyfrif hwnnw yn ôl.
     cancelled_msg: Wedi diddymu'r ailgyfeiriad yn llwyddiannus.
     errors:
-      already_moved: yw'r un cyfrif rydych barod wedi symud i
-      missing_also_known_as: yn olgyfeirio at y gyfrif hon
+      already_moved: yw'r un cyfrif rydych chi wedi symud iddo eisoes
+      missing_also_known_as: nid yw'n arallenw o'r cyfrif hwn
       move_to_self: dim ym gallu bod y cyfrif presennol
-      not_found: ni ellid dod o hyd iddo
-      on_cooldown: Rydych ar oeriad
-    followers_count: Dilynwyr at amser y symudiad
+      not_found: yn methu ei ganfod
+      on_cooldown: Rydych ar amser allan
+    followers_count: Dilynwyr ar adeg y symud
     incoming_migrations: Symud o gyfrif wahanol
-    incoming_migrations_html: I symud o gyfrif arall i'r un hon, yn gyntaf mae'n rhaid i chi greu <a href="%{path}">enw arall ar gyfer y cyfrif</a>.
-    moved_msg: Mae eich cyfrif nawr yn ailgyfeirio at %{acct} ac mae eich dilynwyr yn cael ei symud ar draws.
-    not_redirecting: Nid yw eich cyfrif yn ailgyfeirio at gyfrif arall yn bresennol.
-    on_cooldown: Rydych wedi mudo eich cyfrif yn diweddar. Bydd y swyddogaeth hon ar gael eto mewn %{count} diwrnod.
-    past_migrations: Ymfudiadau yn y gorffennol
+    incoming_migrations_html: I symud o gyfrif arall i'r un hwn, yn gyntaf mae angen i chi <a href="%{path}">greu enwarall (alias) cyfrif</a> .
+    moved_msg: Mae eich cyfrif bellach yn ailgyfeirio i %{acct} ac mae eich dilynwyr yn cael eu symud drosodd.
+    not_redirecting: Nid yw eich cyfrif yn ailgyfeirio i unrhyw gyfrif arall ar hyn o bryd.
+    on_cooldown: Rydych chi wedi mudo'ch cyfrif yn ddiweddar. Bydd y swyddogaeth hon ar gael eto ymhen %{count} diwrnod.
+    past_migrations: Mudo'r gorffennol
     proceed_with_move: Symud dilynwyr
     redirected_msg: Mae eich cyfrif yn awr yn ailgyfeirio at %{acct}.
     redirecting_to: Mae eich cyfrif yn ailgyfeirio at %{acct}.
@@ -889,41 +1372,29 @@ cy:
     warning:
       backreference_required: Bydd rhaid i'r cyfrif newydd olgyfeirio at y cyfrif hon yn gyntaf
       before: 'Cyn bwrw ymlaen, darllenwch y nodiadau hyn yn ofalus:'
-      cooldown: Ar ôl symud, bydd yna cyfnod oeriad trwy pa ystod ni fyddwch yn gallu symud eto
-      disabled_account: Ni fydd eich cyfrif presennol yn gwbl ddefyddiedig ar ôl hyn. Er hynny, byddwch dal gyda fynediad at allforiad data ac hefyd ail-actifadu.
-      followers: Bydd y gweithred hon yn symud pob un o'ch dilynwyr o'r cyfrif presennol i'r cyfrif newydd
-      only_redirect_html: Fel arall, gallwch <a href="%{path}">dim ond ychwanegu ailgyfeiriad ar eich proffil</a>.
+      cooldown: Ar ôl symud, bydd yna cyfnod aros na fydd modd i chi symud eto
+      disabled_account: Ni fydd modd defnyddio'ch cyfrif cyfredol yn llawn wedyn. Fodd bynnag, bydd gennych fynediad i allforio data yn ogystal ag ail agor.
+      followers: Bydd y weithred hon yn symud yr holl ddilynwyr o'r cyfrif cyfredol i'r cyfrif newydd
+      only_redirect_html: Fel arall, <a href="%{path}">dim ond ailgyfeiriad y gallwch chi ei osod ar eich proffil</a> .
       other_data: Ni fydd unrhyw data arall yn cael ei symud yn awtomatig
       redirect: Bydd proffil eich cyfrif presennol yn cael ei diweddaru gyda hysbysiad ailgyfeirio ac yn cael ei eithrio o chwiliadau
   moderation:
-    title: Goruwchwyliad
+    title: Cymedroil
   move_handler:
-    carry_blocks_over_text: Wnaeth y defnyddiwr symud o %{acct}, a oeddech chi wedi'i flocio.
-    carry_mutes_over_text: Wnaeth y defnyddiwr symud o %{acct}, a oeddech chi wedi'i dawelu.
-    copy_account_note_text: 'Wnaeth y defnyddiwr symud o %{acct}, dyma oedd eich hen nodiadau amdanynt:'
+    carry_blocks_over_text: Symudodd y defnyddiwr hwn o %{acct}, yr oeddech wedi'i rwystro.
+    carry_mutes_over_text: Symudodd y defnyddiwr hwn o %{acct}, lle roeddech chi wedi'i dewi.
+    copy_account_note_text: 'Symudodd y defnyddiwr hwn o %{acct}, dyma oedd eich nodiadau blaenorol amdanynt:'
+  navigation:
+    toggle_menu: Toglo'r ddewislen
   notification_mailer:
-    digest:
-      action: Gweld holl hysbysiadau
-      body: Dyma grynodeb byr o'r holl negeseuon golloch chi ers eich ymweliad diwethaf ar %{since}
-      mention: 'Soniodd %{name} amdanoch chi:'
-      new_followers_summary:
-        few: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-        many: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-        one: Yr ydych wedi ennill dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-        other: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-        two: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-        zero: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! Hwrê!
-      subject:
-        few: "%{count} hysbysiad newydd ers eich ymweliad diwethaf"
-        many: "%{count} hysbysiad newydd ers eich ymweliad diwethaf"
-        one: 1 hysbysiad newydd ers eich ymweliad diwethaf
-        other: "%{count} hysbysiad newydd ers eich ymweliad diwethaf"
-        two: "%{count} hysbysiad newydd ers eich ymweliad diwethaf"
-        zero: "%{count} hysbysiad newydd ers eich ymweliad diwethaf"
-      title: Yn eich absenoldeb...
+    admin:
+      report:
+        subject: Mae %{name} wedi cyflwyno adroddiad
+      sign_up:
+        subject: Mae %{name} wedi cofrestru
     favourite:
-      body: 'Cafodd eich statws ei hoffi gan %{name}:'
-      subject: Hoffodd %{name} eich statws
+      body: 'Cafodd eich postiad ei hoffi gan %{name}:'
+      subject: Hoffodd %{name} eich postiad
       title: Ffefryn newydd
     follow:
       body: Mae %{name} bellach yn eich dilyn!
@@ -936,146 +1407,181 @@ cy:
       title: Cais dilynwr newydd
     mention:
       action: Ateb
-      body: 'Caswoch eich sôn amdano gan %{name} yn:'
-      subject: Cawsoch eich sôn amdano gan %{name}
+      body: 'Caswoch eich crybwyll gan %{name} yn:'
+      subject: Cawsoch eich crybwyll gan %{name}
       title: Crywbylliad newydd
+    poll:
+      subject: Mae arolwg gan %{name} wedi dod i ben
     reblog:
-      body: 'Cafodd eich statws ei fŵstio gan %{name}:'
-      subject: Bŵstiodd %{name} eich statws
+      body: 'Cafodd eich postiad ei hybu gan %{name}:'
+      subject: Rhoddodd %{name} hwb i'ch postiad
       title: Hwb newydd
+    status:
+      subject: "%{name} newydd ei bostio"
+    update:
+      subject: Golygodd %{name} bostiad
   notifications:
     email_events: Digwyddiadau ar gyfer hysbysiadau e-bost
-    email_events_hint: 'Dewis digwyddiadau hoffech derbyn hysbysiadau ar eu cyfer:'
+    email_events_hint: 'Dewiswch ddigwyddiadau yr ydych am dderbyn hysbysiadau ar eu cyfer:'
     other_settings: Gosodiadau hysbysiadau arall
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: Biliwn
           million: Miliwn
           quadrillion: Cwadriliwn
           thousand: Mil
           trillion: Triliwn
+  otp_authentication:
+    code_hint: Rhowch y cod a gynhyrchwyd gan eich ap dilysu i gadarnhau
+    description_html: Os ydych chi'n galluogi <strong>dilysu dau-ffactor</strong> gan ddefnyddio ap dilysu, bydd mewngofnodi yn ei gwneud yn ofynnol i chi fod â'ch ffôn yn eich meddiant, a fydd yn cynhyrchu tocynnau i chi fynd i mewn iddo.
+    enable: Galluogi
+    instructions_html: "<strong>Sganiwch y cod QR hwn i mewn i Google Authenticator neu ap TOTP tebyg ar eich ffôn</strong>. O hyn ymlaen, bydd yr ap hwnnw'n cynhyrchu tocynnau y bydd yn rhaid i chi eu rhoi wrth fewngofnodi."
+    manual_instructions: 'Os nad ydych yn gallu sganio''r cod QR a bod angen i chi ei roi â llaw, dyma''r gyfrinach testun plaen:'
+    setup: Gosod
+    wrong_code: Roedd y cod a roddwyd yn annilys! A yw amser gweinydd ac amser dyfais yn gywir?
   pagination:
     newer: Diweddarach
     next: Nesaf
     older: Hŷn
     prev: Blaenorol
+    truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Rydych chi barod wedi pleidleisio ar y pleidlais hon
+      already_voted: Rydych chi eisoes wedi pleidleisio ar yr arolwg hwn
       duplicate_options: yn cynnwys eitemau dyblyg
       duration_too_long: yn rhy bell yn y dyfodol
       duration_too_short: yn rhy fuan
-      expired: Mae'r pleidlais wedi gorffen yn barod
+      expired: Mae'r arolwg eisoes wedi dod i ben
       invalid_choice: Nid yw'r dewis pleidlais hyn yn bodoli
-      over_character_limit: ni all fod yn hirach na %{max} cymeriad yr un
-      too_few_options: rhaid cael fwy nag un eitem
-      too_many_options: ni all cynnwys fwy na %{max} o eitemau
+      over_character_limit: ni all fod yn hwy na %{max} nod yr un
+      too_few_options: rhaid cael mwy nag un eitem
+      too_many_options: ni all gynnwys mwy na %{max} eitem
   preferences:
     other: Arall
     posting_defaults: Rhagosodiadau postio
-    public_timelines: Ffrydau gyhoeddus
+    public_timelines: Ffrydiau cyhoeddus
+  privacy_policy:
+    title: Polisi preifatrwydd
   reactions:
     errors:
-      limit_reached: Cyfwng o ymatebion wahanol wedi'i cyrraedd
-      unrecognized_emoji: ddim yn emoji adnabyddwy
+      limit_reached: Cyrhaeddwyd terfyn y gwahanol adweithiau
+      unrecognized_emoji: nid yw'n emoji cydnabyddedig
   relationships:
     activity: Gweithgareddau cyfrif
     dormant: Segur
+    follow_selected_followers: Dilynwch y dilynwyr a ddewiswyd
     followers: Dilynwyr
     following: Yn dilyn
-    invited: Wedi gwahodd
-    last_active: Gweithred ddiwethaf
-    most_recent: Yn diweddaraf
+    invited: Gwahoddwyd
+    last_active: Yn weithgar ddiwethaf
+    most_recent: Y diweddaraf
     moved: Wedi symud
-    mutual: Cydfuddiannol
+    mutual: Cydfudd
     primary: Cynradd
     relationship: Perthynas
-    remove_selected_domains: Tynnu pob dilynydd o'r parthau dewisiedig
-    remove_selected_followers: Tynnu'r dilynydd dewisiedig
-    remove_selected_follows: Dad-ddilyn y defnyddwyr dewisiedig
+    remove_selected_domains: Tynnu'r holl ddilynwyr o'r parthau a ddewiswyd
+    remove_selected_followers: Dileu'r dilynwyr a ddewiswyd
+    remove_selected_follows: Dad-ddilyn y defnyddwyr a ddewiswyd
     status: Statws cyfrif
   remote_follow:
-    acct: Mewnbynnwch eich enwdefnyddiwr@parth yr ydych eisiau gweithredu ohonno
-    missing_resource: Ni ellir canfod yr URL ailgyferio angenrheidiol i'ch cyfrif
-    no_account_html: Heb gyfrif? Mae modd i chi <a href='%{sign_up_path}' target='_blank'>gofrestru yma</a>
-    proceed: Ymlaen i ddilyn
-    prompt: 'Yr ydych am ddilyn:'
-    reason_html: |-
-      <strong>Pam yw'r cam hyn yn angenrheidiol? </strong>
-      Efallai nid yw <code>%{instance}</code> yn gweinydd ble wnaethoch gofrestru, felly mae'n rhaid i ni ailarweinio chi at eich gweinydd catref yn gyntaf.
-  remote_interaction:
-    favourite:
-      proceed: Ymlaen i hoffi
-      prompt: 'Hoffech hoffi''r tŵt hon:'
-    reblog:
-      proceed: Ymlaen i fŵstio
-      prompt: 'Hoffech fŵstio''r tŵt hon:'
-    reply:
-      proceed: Ymlaen i ateb
-      prompt: 'Hoffech ateb y tŵt hon:'
+    missing_resource: Methu â dod o hyd i'r URL ailgyfeirio gofynnol ar gyfer eich cyfrif
+  reports:
+    errors:
+      invalid_rules: ddim yn cyfeirio at reolau dilys
+  rss:
+    content_warning: 'Rhybudd cynnwys:'
+    descriptions:
+      account: Postiadau cyhoeddus gan @%{acct}
+      tag: 'Postiadau cyhoeddus wedi''u tagio #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Rydych wedi rhagori'r cyfwng o %{limit} o dŵtiau rhestredig ar y dydd hynny
-    over_total_limit: Rydych wedi rhagori'r cyfwng o %{limit} o dŵtiau rhestredig
-    too_soon: Mae rhaid i'r dydd rhestredig fod yn y dyfodol
+    over_daily_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd ar gyfer heddiw
+    over_total_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd
+    too_soon: Rhaid i'r dyddiad a drefnwyd fod yn y dyfodol
   sessions:
     activity: Gweithgaredd ddiwethaf
     browser: Porwr
     browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Porwr anhysbys
+      ie: Nid yw'r rhaglen hon yn gydnaws ag Internet Explorer
+      micro_messenger: MicroMessenger
       nokia: Porwr Nokia S40 Ovi
+      opera: Opera
+      otter: dyfrgi
+      phantom_js: PhantomJS
       qq: Porwr QQ
-    current_session: Sesiwn cyfredol
+      safari: Agor yn Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Sesiwn gyfredol
     description: "%{browser} ar %{platform}"
-    explanation: Dyma'r porwyr gwê sydd wedi mewngofnodi i'ch cyfrif Mastododon ar hyn o bryd.
+    explanation: Dyma'r porwyr gwe sydd wedi mewngofnodi i'ch cyfrif Mastodon ar hyn o bryd.
+    ip: IP
     platforms:
-      chrome_os: OS Chrome
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: OS Firefox
+      ios: iOS
+      linux: Linux
       mac: Mac
       other: platfform anhysbys
+      windows: Windows
+      windows_mobile: Windows Mobile
       windows_phone: Ffôn Windows
-    revoke: Diddymu
-    revoke_success: Sesiwn wedi ei ddiddymu yn llwyddiannus
+    revoke: Dirymu
+    revoke_success: Diddymwyd y sesiwn yn llwyddiannus
     title: Sesiynau
+    view_authentication_history: Gweld hanes dilysu eich cyfrif
   settings:
     account: Cyfrif
     account_settings: Gosodiadau'r cyfrif
-    aliases: Aliasau cyfrif
-    appearance: Arddangosiad
+    aliases: Arallenwau cyfrif
+    appearance: Golwg
     authorized_apps: Apiau awdurdodedig
-    back: Yn ôl i Mastodon
+    back: Nôl i Mastodon
     delete: Dileu cyfrif
     development: Datblygu
     edit_profile: Golygu proffil
     export: Allforio data
-    featured_tags: Hashnodau Nodedig
-    identity_proofs: Profiadau Hunaniaeth
+    featured_tags: Prif hashnodau
     import: Mewnforio
-    import_and_export: Mewnfori ac allfori
+    import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
     notifications: Hysbysiadau
     preferences: Dewisiadau
     profile: Proffil
-    relationships: Dilynion a dilynwyr
-    two_factor_authentication: Awdurdodi dau-gam
+    relationships: Yn dilyn a dilynwyr
+    statuses_cleanup: Dileu postiadau'n awtomatig
+    strikes: Rhybuddion cymedroli
+    two_factor_authentication: Dilysu dau-ffactor
+    webauthn_authentication: Allweddi diogelwch
   statuses:
     attached:
       audio:
-        few: "%{count} ffeil clywedol"
-        many: "%{count} ffeil clywedol"
-        one: "%{count} ffeil clywedol"
-        other: "%{count} ffeil clywedol"
-        two: "%{count} ffeil clywedol"
-        zero: "%{count} ffeil clywedol"
+        few: "%{count} sain"
+        many: "%{count} sain"
+        one: "%{count} sain"
+        other: "%{count} sain"
+        two: "%{count} sain"
+        zero: "%{count} sain"
       description: 'Ynghlwm: %{attached}'
       image:
-        few: "%{count} o luniau"
-        many: "%{count} o luniau"
+        few: "%{count} llun"
+        many: "%{count} llun"
         one: "%{count} llun"
-        other: "%{count} o luniau"
-        two: "%{count} o luniau"
-        zero: "%{count} o luniau"
+        other: "%{count} llun"
+        two: "%{count} lun"
+        zero: "%{count} llun"
       video:
         few: "%{count} fideo"
         many: "%{count} fideo"
@@ -1083,8 +1589,9 @@ cy:
         other: "%{count} fideo"
         two: "%{count} fideo"
         zero: "%{count} fideo"
-    boosted_from_html: Wedi ei fŵstio %{acct_link}
+    boosted_from_html: Wedi'i hybu o %{acct_link}
     content_warning: 'Rhybudd cynnwys: %{warning}'
+    default_language: Yr un fath a'r iaith rhyngwyneb
     disallowed_hashtags:
       few: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
       many: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
@@ -1092,199 +1599,199 @@ cy:
       other: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
       two: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
       zero: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
+    edited_at_html: Wedi'i olygu %{date}
     errors:
-      in_reply_not_found: Nid yw'r statws rydych yn ceisio ymateb i yn edrych fel ei fod yn bodoli.
-    language_detection: Canfod iaith yn awtomataidd
-    open_in_web: Agor yn y wê
-    over_character_limit: wedi mynd heibio'r uchafswm nodyn o %{max}
+      in_reply_not_found: Nid yw'n ymddangos bod y postiad rydych chi'n ceisio ei ateb yn bodoli.
+    open_in_web: Agor yn y we
+    over_character_limit: wedi mynd y tu hwnt i'r terfyn nodau o %{max}
     pin_errors:
-      limit: Yr ydych wedi pinio yr uchafswm posib o dŵtiau
-      ownership: Ni ellir pinio tŵt rhywun arall
-      private: Ni ellir pinio tŵt nad yw'n gyhoeddus
-      reblog: Ni ellir pinio bŵstiau
+      direct: Nid oes modd pinio postiadau sy'n weladwy i ddefnyddwyr a grybwyllwyd yn unig
+      limit: Rydych chi eisoes wedi pinio uchafswm nifer y postiadau
+      ownership: Nid oes modd pinio postiad rhywun arall
+      reblog: Nid oes modd pinio hwb
     poll:
       total_people:
-        few: "%{count} o bobl"
-        many: "%{count} o bobl"
+        few: "%{count} person"
+        many: "%{count} person"
         one: "%{count} berson"
-        other: "%{count} o bobl"
-        two: "%{count} o bobl"
-        zero: "%{count} berson"
+        other: "%{count} person"
+        two: "%{count} person"
+        zero: "%{count} o bersonau"
       total_votes:
-        few: "%{count} o bleidleisiau"
-        many: "%{count} o bleidleisiau"
+        few: "%{count} pleidlais"
+        many: "%{count} pleidlais"
         one: "%{count} bleidlais"
-        other: "%{count} o bleidleisiau"
-        two: "%{count} o bleidleisiau"
-        zero: "%{count} pleidlais"
-      vote: Pleidleisio
+        other: "%{count} pleidlais"
+        two: "%{count} pleidlais"
+        zero: "%{count} o bleidleisiau"
+      vote: Pleidlais
     show_more: Dangos mwy
-    show_thread: Dangos edefyn
+    show_newer: Dangos y diweddaraf
+    show_older: Dangos pethau hŷn
+    show_thread: Dangos trywydd
     sign_in_to_participate: Mengofnodwch i gymryd rhan yn y sgwrs
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Uniongyrchol
       private: Dilynwyr yn unig
       private_long: Dangos i ddilynwyr yn unig
       public: Cyhoeddus
       public_long: Gall pawb weld
       unlisted: Heb ei restru
-      unlisted_long: Gall pawb weld, ond heb ei restru ar ffrydiau cyhoeddus
+      unlisted_long: Gall pawb weld, ond heb eu rhestru ar ffrydiau cyhoeddus
+  statuses_cleanup:
+    enabled: Dileu hen bostiadau'n awtomatig
+    enabled_hint: Yn dileu eich postiadau yn awtomatig ar ôl iddyn nhw gyrraedd trothwy oed penodedig, oni bai eu bod yn cyfateb i un o'r eithriadau isod
+    exceptions: Eithriadau
+    explanation: Oherwydd bod dileu postiadau yn weithrediad drud, mae hyn yn cael ei wneud yn araf dros amser pan nad yw'r gweinydd yn brysur fel arall. Am y rheswm hwn, efallai y bydd eich postiadau yn cael eu dileu ychydig ar ôl iddyn nhw gyrraedd y trothwy oed.
+    ignore_favs: Anwybyddu ffefrynnau
+    ignore_reblogs: Anwybyddu hybiau
+    interaction_exceptions: Eithriadau yn seiliedig ar ryngweithio
+    interaction_exceptions_explanation: Sylwch nad oes unrhyw sicrwydd y bydd postiadau'n cael eu dileu os ydyn nhw'n mynd o dan y trothwy ffefrynnau neu hybu ar ôl mynd drostyn nhw unwaith.
+    keep_direct: Cadw negeseuon uniongyrchol
+    keep_direct_hint: Nid yw'n dileu unrhyw un o'ch negeseuon uniongyrchol
+    keep_media: Cadw postiadau gydag atodiadau cyfryngau
+    keep_media_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd ag atodiadau cyfryngau
+    keep_pinned: Cadw postiadau wedi'u pinio
+    keep_pinned_hint: Nid yw'n dileu unrhyw un o'ch postiadau wedi'u pinio
+    keep_polls: Cadw arolygon
+    keep_polls_hint: Nid yw'n dileu unrhyw un o'ch arolygon
+    keep_self_bookmark: Cadw y postiadau wedi'u cadw fel nodau tudalen
+    keep_self_bookmark_hint: Nid yw'n dileu eich postiadau eich hun os ydych wedi rhoi nod tudalen arnyn nhw
+    keep_self_fav: Cadw'r postiadau yr oeddech yn eu ffefrynnu
+    keep_self_fav_hint: Nid yw'n dileu eich postiadau eich hun os ydych wedi eu ffefrynnu
+    min_age:
+      '1209600': 2 wythnos
+      '15778476': 6 mis
+      '2629746': 1 mis
+      '31556952': 1 flwyddyn
+      '5259492': 2 fis
+      '604800': 1 wythnos
+      '63113904': 2 flynedd
+      '7889238': 3 mis
+    min_age_label: Trothwy oedran
+    min_favs: Cadw postiadau ffafriwyd am o leiaf
+    min_favs_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd wedi derbyn o leiaf y swm hwn o ffefrynnau. Gadewch yn wag i ddileu postiadau waeth beth fo'u ffefrynnau
+    min_reblogs: Cadw postiadau wedi eu hybu o leiaf
+    min_reblogs_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd wedi cael eu hybu o leiaf y nifer hwn o weithiau. Gadewch yn wag i ddileu postiadau waeth beth fo'u nifer o hybiadau
   stream_entries:
-    pinned: Tŵt wedi'i binio
+    pinned: Postiad wedi'i binio
     reblogged: hybwyd
     sensitive_content: Cynnwys sensitif
+  strikes:
+    errors:
+      too_late: Mae'n rhy hwyr i apelio yn erbyn y rhybudd hwn
   tags:
     does_not_match_previous_name: ddim yn cyfateb i'r enw blaenorol
-  terms:
-    body_html: |
-      <h2>Polisi Preifatrwydd</h2>
-      <h3 id="collect">Pa wybodaeth ydyn ni'n ei gasglu?</h3>
-
-      <ul>
-      <li><em>Gwybodaeth cyfrif sylfaenol</em>: Os ydych yn cofrestru ar y gweinydd hwn, mae'n bosib y byddwch yn cael eich gofyn i fewnbynnu enw defnyddiwr, cyfeiriad e-bost a chyfrinair. Mae modd i chi hefyd fewnbynnu gwybodaeth ychwanegol megis enw arddangos a bywgraffiad ac uwchlwytho llun proffil a llun pennawd. Mae'r enw defnyddiwr, enw arddangos, bywgraffiad, llun proffil a'r llun pennawd wedi eu rhestru'n gyhoeddus bob tro.</li>
-      <li><em>Postio, dilyn a gwybodaeth gyhoeddus arall</em>: Mae'r rhestr o bobl yr ydych yn dilyn wedi ei restru'n gyhoeddus, mae'r un peth yn wir am eich dilynwyr. Pan yr ydych yn mewnosod neges, mae'r dyddiad a'r amser yn cael ei gofnodi ynghyd a'r rhaglen y wnaethoch anfon y neges ohonni. Gall negeseuon gynnwys atodiadau cyfryngau, megis lluniau neu fideo. Mae negeseuon cyhoeddus a negeseuon heb eu rhestru ar gael yn gyhoeddus. Pan yr ydych yn nodweddu neges ar eich proffil, mae hynny hefyd yn wybodaeth sydd ar gael yn gyhoeddus. Mae eich negeseuon yn cael eu hanfon i'ch dilynwyr, mewn rhai achosion mae hyn yn golygu eu bod yn cael eu hanfon i amryw o weinyddwyr ac fe fydd copiau yn cael eu cadw yno. Pan yr ydych yn dileu negeseuon, mae hyn hefyd yn cael ei hanfon i'ch dilynwyr. Mae'r weithred o rannu neu hoffi neges arall yn gyhoeddus bob tro.</li>
-      <li><em>Negeseuon uniongyrchol a dilynwyr yn unig</em>: Mae pob neges yn cael eu cadw a'u prosesu ar y gweinydd. Mae negeseuon dilynwyr yn unig yn cael eu hanfon i'ch dilynwyr a'r defnyddwyr sy'n cael eu crybwyll ynddynt tra bod negeseuon uniongyrchol yn cael eu hanfon at rheini sy'n cael crybwyll ynddynt yn unig. Mewn rhai achostion golyga hyn eu bod yn cael eu hanfon i weinyddwyr gwahanol a'u cadw yno. yr ydym yn gnweud ymgais ewyllys da i gyfyngu'r mynediad at y negeseuon yna i bobl ac awdurdod yn unig, ond mae'n bosib y bydd gweinyddwyr eraill yn methu a gwneud hyn. Mae'n bwysig felly i chi fod yn wyliadwrus o ba weinyddwyr y mae eich dilynwyr yn perthyn iddynt. Mae modd i chi osod y dewis i ganiatau a gwrthod dilynwyr newydd a llaw yn y gosodiadau. <em>Cofiwch gall gweithredwyr y gweinydd ac unrhyw weinydd derbyn weld unrhyw negeseuon o'r fath</em>, ac fe all y derbynwyr gymryd sgrinlin, copïo neu drwy ddulliau eraill rannu rhain. <em>Peidiwch a rhannu unrhyw wybodaeth beryglus dros Mastodon.</em></li>
-      <li><em>IPs a mathau eraill o metadata</em>: Pan yr ydych yn mewngofnodi, yr ydym yn cofnodi y cyfeiriad IP yr ydych yn mewngofnodi ohonno, ynghyd a enw eich rhaglen pori. Mae pob un sesiwn mewngofnodi ar gael i chi adolygu a gwrthod yn y gosodiadau. Mae'r cyfeiriad IP diweddaraf yn cael ei storio hyd at 12 mis. Mae'n bosib y byddwn hefyd yn cadw cofnodion gweinydd sy'n cynnwys y cyfeiriad IP am bob cais sy'n cael ei wneud i'n gweinydd.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Beth ydym yn defnyddio eich gywbodaeth ar ei gyfer?</h3>
-
-      <p>Gall unrhyw wybodaeth yr ydym yn ei gasglu oddi wrthych gael ei ddefnyddio yn y ffyrdd canlynol:</p>
-
-      <ul>
-      <li>I ddarparu prif weithgaredd Mastodon. Gallwch ond rhyngweithio a chynnwys pobl eraill pan yr ydych wedi'ch mewngofnodi. Er enghraifft, gallwch ddilyn pobl eraill i weld eu negeseuon wedi cyfuno ar ffrwd gartref bersonol.</li>
-      <li>I helpu gyda goruwchwylio'r gymuned, er enghraifft drwy gymharu eich cyfeiriad IP gyda rhai eraill hysbys er mwyn sefydlu ymgais i geisio hepgor gwaharddiad neu droseddau eraill.</li>
-      <li>Gall y cyfeiriad e-bost yr ydych yn ei ddarparu gael ei ddefnyddio i anfon gwybodaeth atoch, hsybysiadau am bobl eraill yn rhyngweithio a'ch cynnwys neu'n anfon negeseuon atoch a/neu geisiadau neu gwestiynnau eraill.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Sut ydym yn amddiffyn eich gwybodaeth?</h3>
-
-      <p>Mae gennym amryw o fesurau diogelwch er mwyn cynnal diogelwch eich gwybodaeth bersonol pan yr ydych yn mewnosod, cyflwyno neu'n cael mynediad at eich gwybodaeth bersonol. Ymysg pethau eraill, mae sesiwn eich porwr, ynghyd a'r traffig rhwng eich rhaglenni a'r API wedi eu diogelu gan SSL, ac mae'ch cyfrinair yn cael ei stwnshio drwy ddefnyddio algorithm cryf un-ffordd. Gallwch alluogi dilysu dau-gam er mwyn cryfhau diogelwch mynediad i'ch cyfrif ymhellach.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Beth yw ein polisi cadw data?</h3>
-
-      <p>Gwnawn ymdrech ewyllys da i:</p>
-
-      <ul>
-      <li>Gadw cofnod gweinydd yn cynnwys y cyfeiriad IP o bob cais i'r gweinydd hwn, i'r graddau y mae cofnodion o'r fath yn cael eu cadw, am ddim mwy na 90 diwrnod.</li>
-      <li>Gadw cyfeiriadau IP a chysylltiad i ddefnyddwyr cofrestredig am ddim mwy na 12 mis.</li>
-      </ul>
-
-      <p>Mae modd i chi wneud cais am, a lawrlwytho archif o'ch cynnwys, gan gynnwys eich tŵtiau, atodiadau cyfryngau, llun proffil a llun pennawd.</p>
-
-      <p>Mae modd i chi ddileu eich cyfrif heb ei adfer ar unrhyw bryd</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Ydyn ni'n defnyddio cwcis?</h3>
-
-      <p>Ydyn. Dogfennau bach sy'n cael eu trosglwyddo i ddisg galed eich cyfrifiadur drwy eich porwr gan wefan neu wasanaeth yw cwcis (os ydych yn eu caniatau). Galluoga'r cwcis hyn i'r wefan i adnabod eich porwr ac, os oes gennych gyfrif wedi ei gofrestru, ei gysylltu gyda'r cyfrif yr ydych wedi ei gofrestru.</p>
-
-      <p>Rydym yn defnyddio cwcis i ddeall a chadw eich dewisiadau ar gyfer ymweliadau yn y dyfodol.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Ydyn ni'n datgelu unrhyw wybodaeth i bartïoedd allanol?</h3>
-
-      <p>Nid ydym yn gwerthu, cyfnewid neu mewn unrhyw ddull yn trosglwyddo i bartïoedd allanol eich gwybodaeth bersonol. Nid yw hyn yn cynnwys trydydd partïon yr ydym yn ymddiried ynddynt sy'n ein cynorthwyo i weithredu ein gwefan, cynnal ein busnes neu'ch gwasanaethu chi, cyhyd a bod y partïoedd hynny yn cytuno i gadw'r wybodaeth yma'n gyfrinachol. Mae'n bosib i ni ryddhau eich gwybodaeth pan yr ydym yn credu fod ei ryddhau yn briodol er mwyn cydymffurfio a'r gyfraith, gorfodi ein polisiau, neu i amddiffyn hawliau, eiddo neu diogelwch eraill.</p>
-
-      <p>Gall eich cynnwys cyhoeddus gael ei lawrlwytho gan weinyddwyr eraill yn y rhwydwaith. Mae eich tŵtiau cyhoeddus a'r rhai dilynwyr yn unig yn cael eu hanfon i'r gweinyddwyr sy'n lletya eich dilynwyr, tra bod negeseuon uniongrychol yn cael eu hanfon at weinyddwyr y derbynwyr, cyn belled a fod y dilynwyr neu'r derbynwyr hynny yn bodoli ar weinydd gwahanol i'r un hwn.</p>
-
-      <p>Pan yr ydych yn caniatau y rhaglen hwn i ddefnyddio'ch cyfrif, yn dibynnu ar sgôp yr hyn yr ydych yn caniatau, gallai gael mynediad at eich gwybodaeth proffil cyhoeddus, eich rhestr dilynwyr, eich dilynwyr, eich rhestrau, eich holl dŵtiau a'ch ffefrynnau. Ni all rhaglenni byth gael mynediad at eich cyfeiriad e-bost na chwaith eich cyfrinair.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Defnydd o'r wefan gan blant</h3>
-
-      <p>Os yw'r gweinydd hwn yn yr UE neu'r EEA: Mae ein gwefan, ein nwyddau a'n gwasanaethau oll wedi eu cyfeirio at bobl sydd dros 16 mlwydd oed. Os ydych o dan 16, yn ôl gofyniad y GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) peidiwch a defnyddio'r wefan hon.</p>
-
-      <p>Os yw'r gweinydd hwn yn UDA: Mae ein gwefan, ein nwyddau a'n gwasanaethau oll wedi eu cyfeirio at bobl sydd dros 13 mlwydd oed oleiaf. Os ydych o dan 13 mlwydd oed, yn ôl gofyniad COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) peidiwch a defnyddio'r wefan hon.</p>
-
-      <p>Mae gofynion y gyfraith yn gallu bod yn wahanol os yw'r gweinydd hwn mewn awdurdodaeth wahanol.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Newidiadau i'n Polisi Preifatrwydd</h3>
-
-      <p>Os ydyn yn penderfynnu i newid ein polisi preifatrwydd, fe wnawn ni roi'r newidiadau hynny ar y dudalen hon.</p>
-
-      <p>Mae'r ddogfen hon yn CC-BY-SA. Cafodd ei ddiweddaru diwethaf ar y 7fed o Fawrth, 2018.</p>
-
-      <p>Cafodd ei addasu yn wreiddiol o'r<a href="https://github.com/discourse/discourse">Polisi preifatrwydd disgwrs</a>.</p>
-    title: "%{instance} Termau Gwasanaeth a Polisi Preifatrwydd"
   themes:
     contrast: Mastodon (Cyferbyniad uchel)
     default: Mastodon (Tywyll)
-    mastodon-light: Mastodon (golau)
+    mastodon-light: Mastodon (Golau)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
-    disable: Diffodd
-    enabled: Awdurdodi dau-gam wedi'i alluogi
-    enabled_success: Awdurdodi dau-gam wedi'i alluogi'n llwyddiannus
-    generate_recovery_codes: Cynhyrchu côdau adfer
-    lost_recovery_codes: Mae côdau adfer yn caniatau i chi gael mynediad i'ch cyfrif eto os ydych yn colli'ch ffôn. Os ydych wedi colli eich côdau adfer, mae modd i chi gynhyrchu nhw eto yma. Bydd eich hen gôdau wedyn yn annilys.
-    recovery_codes: Creu copi wrth gefn o gôdau adfywio
-    recovery_codes_regenerated: Llwyddwyd i ail greu côdau adfywio
-    recovery_instructions_html: Os ydych byth yn colli mynediad i'ch ffôn, mae modd i chi ddefnyddio un o'r côdau adfywio isod i ennill mynediad i'ch cyfrif eto. <strong>Cadwch y côdau adfywio yn saff</strong>. Er enghraifft, gallwch eu argraffu a'u cadw gyda dogfennau eraill pwysig.
+    add: Ychwanegu
+    disable: Analluogi 2FA
+    disabled_success: Llwyddwyd i analluogi dilysu dau ffactor yn llwydiannus
+    edit: Golygu
+    enabled: Wedi galluogi dilysu dau-ffactor
+    enabled_success: Wedi galluogi dilysu dau-ffactor yn llwyddiannus
+    generate_recovery_codes: Cynhyrchu codau adfer
+    lost_recovery_codes: Mae codau adfer yn caniatáu ichi adennill mynediad i'ch cyfrif os byddwch chi'n colli'ch ffôn. Os ydych chi wedi colli'ch codau adfer, gallwch chi eu hadfywio yma. Bydd eich hen godau adfer yn annilys.
+    methods: Dulliau dau ffactor
+    otp: Ap dilysu.
+    recovery_codes: Creu copi wrth gefn o godau adfer
+    recovery_codes_regenerated: Llwyddwyd i ail greu codau adfer
+    recovery_instructions_html: Os ydych chi'n colli mynediad i'ch ffôn, mae modd i chi ddefnyddio un o'r codau adfer isod i gael mynediad at eich cyfrif. <strong>Cadwch y codau adfer yn breifat</strong>. Er enghraifft, gallwch chi eu argraffu a'u cadw gyda dogfennau eraill pwysig.
+    webauthn: Allweddi diogelwch
   user_mailer:
+    appeal_approved:
+      action: Ewch i'ch cyfrif
+      explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i chymeradwyo. Mae eich cyfrif unwaith eto yn gadarnhaol.
+      subject: Mae eich apêl gan %{date} wedi'i chymeradwyo
+      title: Cymeradwywyd yr apêl
+    appeal_rejected:
+      explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
+      subject: Mae eich apêl ar %{date} wedi'i gwrthod
+      title: Mae'r apêl wedi'i gwrthod
     backup_ready:
       explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
       subject: Mae eich archif yn barod i'w lawrlwytho
       title: Allfudo archif
-    sign_in_token:
-      details: 'Dyma''r manylion o''r ceisiad:'
-      explanation: 'Wnaethom ni synhwyro ceisiad i fewngofnodi i''ch cyfrif o gyfeiriad IP anabyddiedig. Os mae hyn yn chi, mewnbynnwch y cod diogelwch isod i fewn i''r dudalen herio mewngofnodiad:'
-      further_actions: 'Os nad oedd hyn yn chi, newidwch eich cyfrinair ac alluogi awdurdodi dauffactor ar eich cyfrif. Gallwch gwneud hyn fama:'
-      subject: Cadarnhewch yr ymgais mewngofnodi
-      title: Ymgais mewngofnodi
+    suspicious_sign_in:
+      change_password: newidiwch eich cyfrinair
+      details: 'Dyma fanylion y mewngofnodi:'
+      explanation: Rydym wedi canfod mewngofnodi i'ch cyfrif o gyfeiriad IP newydd.
+      further_actions_html: Os nad chi oedd hwn, rydym yn argymell eich bod yn %{action} ar unwaith ac yn galluogi dilysu dau ffactor i gadw'ch cyfrif yn ddiogel.
+      subject: Mae eich cyfrif wedi'i gyrchu o gyfeiriad IP newydd
+      title: Mewngofnodiad newydd
     warning:
+      appeal: Cyflwyno apêl
+      appeal_description: Os credwch fod hwn yn gamgymeriad, gallwch gyflwyno apêl i staff %{instance}.
+      categories:
+        spam: Sbam
+        violation: Mae'r cynnwys yn torri'r canllawiau cymunedol canlynol
       explanation:
-        disable: Er bod eich cyfrif wedi'i rewi, mae eich data cyfrif yn parhau i fod yn gyfan, ond ni allwch chi berfformio unrhyw gamau nes ei ddatgloi.
-        silence: Pan mae eich cyfrif yn gyfyngiedig, dim ond pobl sydd yn barod yn eich dilyn yn gweld eich tŵtiau ar y gweinydd hon, a efallai byddwch yn cael eich tynnu o restrau cyhoeddus. Er hyn, gall eraill eich dilyn chi wrth law.
-        suspend: Mae eich cyfrif wedi cael ei wahardd, a mae gyd o'ch tŵtiau a'ch ffeiliau cyfrwng uwchlwythadwy wedi cael eu tynnu or gweinydd yn barhaol, ac o weinyddau ble yr oedd eich dilynwyr.
-      get_in_touch: Gallwch ymateb i'r e-bost hwn i gysylltu â staff %{instance}.
-      review_server_policies: Adolygu polisïau'r gweinydd
-      statuses: 'Yn benodol, ar gyfer:'
+        delete_statuses: Mae rhai o'ch postiadau wedi'u canfod i dorri un neu fwy o ganllawiau cymunedol ac wedi cael eu dileu wedyn gan gymedrolwyr %{instance}.
+        disable: Nid oes modd i chi ddefnyddio'ch cyfrif mwyach, ond mae'ch proffil a data arall yn parhau'n gyfan. Gallwch ofyn am gopi wrth gefn o'ch data, newid gosodiadau cyfrif neu ddileu eich cyfrif.
+        mark_statuses_as_sensitive: Mae rhai o'ch postiadau wedi'u marcio'n sensitif gan gymedrolwyr %{instance}. Mae hyn yn golygu y bydd angen i bobl dapio'r cyfryngau yn y postiadau cyn i ragolwg gael ei ddangos. Gallwch nodi bod y cyfryngau yn sensitif eich hun wrth bostio yn y dyfodol.
+        sensitive: O hyn ymlaen, bydd eich holl ffeiliau cyfryngau wedi'u llwytho i fyny yn cael eu marcio fel sensitif ac wedi'u cuddio y tu ôl i rybudd clicio drwodd.
+        silence: Gallwch barhau i ddefnyddio'ch cyfrif ond dim ond pobl sydd eisoes yn eich dilyn fydd yn gweld eich postiadau ar y gweinydd hwn, ac mae'n bosibl y cewch eich eithrio o wahanol nodweddion darganfod. Fodd bynnag, efallai y bydd eraill yn dal i'ch dilyn â llaw.
+        suspend: Nid oes modd i chi ddefnyddio'ch cyfrif mwyach, ac nid yw'ch proffil a data arall bellach yn hygyrch. Gallwch chi fewngofnodi o hyd i ofyn am gopi wrth gefn o'ch data nes bod y data wedi'i ddileu'n llawn mewn tua 30 diwrnod, ond byddwn yn cadw rhywfaint o ddata sylfaenol i'ch atal rhag osgoi'r ataliad.
+      reason: 'Rheswm:'
+      statuses: 'Postiadau a ddyfynnwyd:'
       subject:
+        delete_statuses: Mae eich postiadau ar %{acct} wedi'u dileu
         disable: Mae'ch cyfrif %{acct} wedi'i rewi
+        mark_statuses_as_sensitive: Mae eich postiadau ar %{acct} wedi'u marcio'n sensitif
         none: Rhybudd am %{acct}
+        sensitive: Bydd eich postiadau ar %{acct} yn cael eu marcio'n sensitif o hyn ymlaen
         silence: Mae'ch cyfrif %{acct} wedi bod yn gyfyngedig
         suspend: Mae'ch cyfrif %{acct} wedi'i atal
       title:
+        delete_statuses: Postiadau wedi'u dileu
         disable: Cyfrif wedi'i rewi
+        mark_statuses_as_sensitive: Postiadau wedi'u marcio'n sensitif
         none: Rhybudd
+        sensitive: Cyfrif wedi'i nodi'n sensitif
         silence: Cyfrif cyfyngedig
-        suspend: Cyfrif wedi'i rewi
+        suspend: Cyfrif wedi'i atal
     welcome:
       edit_profile_action: Sefydlu proffil
-      edit_profile_step: Mae modd i chi addasu eich proffil drwy uwchlwytho afatar, pennawd, drwy newid eich enw arddangos a mwy. Os hoffech chi adolygu dilynwyr newydd cyn iddynt gael caniatad i'ch dilyn, mae modd i chi gloi eich cyfrif.
+      edit_profile_step: Gallwch addasu'ch proffil trwy lwytho llun proffil, newid eich enw dangos a mwy. Gallwch ddewis i adolygu dilynwyr newydd cyn iddyn nhw gael caniatâd i'ch dilyn.
       explanation: Dyma ambell nodyn i'ch helpu i ddechrau
       final_action: Dechrau postio
-      final_step: 'Dechrau postio! Hyd yn oed heb ddilynwyr mae''n bosib i eraill weld eich negeseuon cyhoeddus, er enghraifft at y ffrwd leol ac mewn hashnodau. Mae''n bosib yr hoffech hi gyflwyno''ch hun ar yr hashnod #introductions.'
+      final_step: 'Dechreuwch bostio! Hyd yn oed heb ddilynwyr, efallai y bydd eraill yn gweld eich postiadau cyhoeddus, er enghraifft ar y ffrwd leol neu mewn hashnodau. Efallai y byddwch am gyflwyno eich hun ar yr hashnod #cyflwyniadau neu/a #introductions.'
       full_handle: Eich enw llawn
-      full_handle_hint: Dyma'r hyn y bysech yn dweud wrth eich ffrindiau er mwyn iddyn nhw gael anfon neges atoch o achos arall.
-      review_preferences_action: Newid dewisiadau
-      review_preferences_step: Gwnewch yn siŵr i chi osod eich dewisiadau, megis pa e-byst hoffech eu derbyn, neu ba lefel preifatrwydd hoffech eich tŵtiau ragosod i. Os nad oes gennych salwch symud, gallwch ddewis i ganiatau chwarae GIFs yn awtomatig.
+      full_handle_hint: Dyma beth fyddech chi'n ei ddweud wrth eich ffrindiau fel y gallant anfon neges neu eich dilyn o weinydd arall.
       subject: Croeso i Mastodon
-      tip_federated_timeline: Mae'r ffrwd ffederasiwn yn olwg firehose o'r rhwydwaith Mastodon. Ond mae ond yn cynnwys y bobl mae eich cymdogion wedi ymrestru iddynt, felly nid yw'n gyflawn.
-      tip_following: Rydych yn dilyn goruwchwyliwr eich gweinydd yn ddiofyn. I ganfod pobl mwy diddorol, edrychwch ar y ffrydiau lleol a'r rhai wedi ei ffedereiddio.
-      tip_local_timeline: Mae'r ffrwd leol yn olwg firehose o bobl ar %{instance}. Dyma eich cymdogion agosaf!
-      tip_mobile_webapp: Os yw eich porwr gwe yn cynnig i chi ychwanegu Mastodon i'ch sgrîn gartref, mae modd i chi dderbyn hysbysiadau gwthiadwy. Mewn sawl modd mae'n gweithio fel ap cynhenid!
-      tips: Awgrymiadau
       title: Croeso, %{name}!
   users:
     follow_limit_reached: Nid oes modd i chi ddilyn mwy na %{limit} o bobl
-    generic_access_help_html: Cael trafferth yn cyrchu eich cyfrif? Efallai hoffwch cysylltu â %{email} am gymorth
     invalid_otp_token: Côd dau-ffactor annilys
-    invalid_sign_in_token: Cod diogelwch annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
     seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
-    suspicious_sign_in_confirmation: Mae'n edrych fel nad ydych wedi mewngofnodi o'r dyfais hyn o'r blaen, a nid ydych wedi mewngofnodi am sbel, felly rydym yn anfon cod diogelwch i'ch cyfeiriad ebost i gadarnhau bod chi yw hi.
   verification:
-    explanation_html: 'Mae modd i chi <strong>ddilysu eich hun fel perchenog y dolenni yn metadata eich proffil</strong>. Rhaid i''r wefan a dolen iddi gynnwys dolen yn ôl i''ch proffil Mastodon. <strong>Rhaid</strong> i''r ddolen yn ôl gael nodwedd <code>rel="fi"</code>. Nid oes ots beth yw cynnwys testun y ddolen. Dyma enghraifft:'
+    explanation_html: 'Mae modd i chi <strong>ddilysu eich hun fel perchenog y dolenni yn metadata eich proffil</strong>. Rhaid i''r wefan â dolen iddi gynnwys dolen yn ôl i''ch proffil Mastodon. <strong>Rhaid</strong> i''r ddolen yn ôl cynnwys y nodwedd <code>rel="me"</code>. Does dim ots beth yw cynnwys testun y ddolen. Dyma enghraifft:'
     verification: Dilysu
+  webauthn_credentials:
+    add: Ychwanegu allwedd ddiogelwch newydd
+    create:
+      error: Bu anhawster wrth ychwanegu'ch allwedd ddiogelwch. Ceisiwch eto, os gwelwch yn dda.
+      success: Ychwanegwyd eich allwedd ddiogelwch yn llwyddiannus.
+    delete: Dileu
+    delete_confirmation: Ydych chi'n siŵr eich bod am ddileu'r allwedd ddiogelwch hon?
+    description_html: Os ydych yn galluogi <strong>dilysu allwedd diogelwch</strong>, bydd angen i chi ddefnyddio un o'ch allweddi diogelwch er mwyn mewngofnodi.
+    destroy:
+      error: Bu anhawster wrth ddileu eich allwedd ddiogelwch. Ceisiwch eto, os gwelwch yn dda.
+      success: Cafodd eich allwedd ddiogelwch ei dileu'n llwyddiannus.
+    invalid_credential: Allwedd ddiogelwch annilys
+    nickname_hint: Rhowch lysenw eich allwedd ddiogelwch newydd
+    not_enabled: Nid ydych wedi galluogi WebAuthn eto
+    not_supported: Nid yw'r porwr hwn yn cynnal allweddi diogelwch
+    otp_required: I ddefnyddio allweddi diogelwch, galluogwch ddilysu dau ffactor yn gyntaf.
+    registered_on: Cofrestrwyd ar %{date}
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 330069838..a66fdc5f2 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1,123 +1,62 @@
 ---
 da:
   about:
-    about_hashtag_html: Disse er offentlige trut tagget med <strong>#%{hashtag}</strong>. Du kan interagere med dem, hvis du har en konto hvor som helst i fediverset.
-    about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Ej dine data med Mastodon!'
-    about_this: Om
-    active_count_after: aktive
-    active_footnote: Månedlige aktive brugere (MAU)
-    administered_by: 'Administreres af:'
-    api: API
-    apps: Mobil-apps
-    apps_platforms: Benyt Mastodon på Android, iOS og andre platforme
-    browse_directory: Gennemse en profilindholdsfortegnelse og filtrér efter interesser
-    browse_local_posts: Gennemse en live stream af offentlige indlæg fra denne server
-    browse_public_posts: Gennemse en live stream af offentlige indlæg på Mastodon
-    contact: Kontakt
-    contact_missing: Ikke sat
+    about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Vær ejer af egne data med Mastodon!'
+    contact_missing: Ikke angivet
     contact_unavailable: Utilgængelig
-    discover_users: Find brugere
-    documentation: Dokumentation
-    federation_hint_html: Med en konto på %{instance} vil du kunne følge andre på en hvilken som helst Mastodon-server.
-    get_apps: Prøv en mobil-app
     hosted_on: Mostodon hostet på %{domain}
-    instance_actor_flash: |
-      Denne konto er en virtuel skuespiller, der bruges til at repræsentere selve serveren og ikke nogen individuel bruger.
-      Det bruges til føderationsformål og bør ikke blokeres, medmindre du vil blokere hele forekomsten og i så tilfælde bør bruge en domæneblokering.
-    learn_more: Få mere at vide
-    privacy_policy: Fortrolighedspolitik
-    rules: Serverregler
-    rules_html: 'Nedenfor ses en oversigt over regler, som skal følges, hvis du ønsker at have en konto på denne Mastodon-server:'
-    see_whats_happening: Se, hvad der sker
-    server_stats: 'Serverstatstik:'
-    source_code: Kildekode
-    status_count_after:
-      one: status
-      other: statusser
-    status_count_before: Som har skrevet
-    tagline: Følg venner og find nye
-    terms: Tjenestevilkår
-    unavailable_content: Modererede servere
-    unavailable_content_description:
-      domain: Server
-      reason: Årsag
-      rejecting_media: 'Mediefiler fra disse servere behandles eller gemmes ikke, og ingen miniaturebilleder vises, og kræver manuel klik-igennem til originalfilen:'
-      rejecting_media_title: Filtrerede medier
-      silenced: 'Indlæg fra disse servere er skjult i offentlige tidslinjer og konversationer, og der genereres ingen notifikationer fra deres brugerinteraktioner, medmindre du følger dem:'
-      silenced_title: Tavsgjorte servere
-      suspended: 'Ingen data fra disse servere behandles, gemmes eller udveksles, hvilket umuliggør interaktion eller kommunikation med brugere fra disse servere:'
-      suspended_title: Suspenderede servere
-    unavailable_content_html: Mastodon tillader dig generelt at se indhold og interagere med brugere fra enhver anden server i fediverset. Disse er undtagelserne, som er implementeret på netop denne servertype.
-    user_count_after:
-      one: bruger
-      other: brugere
-    user_count_before: Hjem til
-    what_is_mastodon: Hvad er Mastodon?
+    title: Om
   accounts:
-    choices_html: "%{name}s valg:"
-    endorsements_hint: Du kan støtte personer, du følger, fra webgrænsefladen, og de vil fremgå hér.
-    featured_tags_hint: Du kan fremhæve bestemte hashtags, som så vil fremgå hér.
     follow: Følg
     followers:
       one: Følger
-      other: Følgere
+      other: tilhængere
     following: Følger
-    instance_actor_flash: Denne konto er en virtuel aktør, der bruges til at repræsentere selve serveren og ikke nogen individuel bruger. Den anvendes til føderation og bør ikke suspenderes.
-    joined: Tilmeldt %{date}
+    instance_actor_flash: Denne konto er en virtuel aktør repræsenterende selve serveren og ikke en individuel bruger. Den anvendes til fællesformål og bør ikke suspenderes.
     last_active: senest aktiv
     link_verified_on: Ejerskab af dette link blev tjekket %{date}
-    media: Medier
-    moved_html: "%{name} er flyttet til %{new_profile_link}:"
-    network_hidden: Denne information er utilgængelig
-    never_active: Aldrig
     nothing_here: Der er intet hér!
-    people_followed_by: Personer, som %{name} følger
-    people_who_follow: Personer, som følger %{name}
     pin_errors:
-      following: Du skal allerede følge den person, du ønsker at støtte
+      following: Man skal allerede følge den person, man ønsker at støtte
     posts:
-      one: Trut
-      other: Trut
-    posts_tab_heading: Trut
-    posts_with_replies: Trut og svar
-    roles:
-      admin: Admin
-      bot: Bot
-      group: Gruppe
-      moderator: Moderator
-    unavailable: Profil utilgængelig
-    unfollow: Følg ikke længere
+      one: Indlæg
+      other: Indlæg
+    posts_tab_heading: Indlæg
   admin:
     account_actions:
       action: Udfør handling
       title: Udfør moderatorhandling på %{acct}
     account_moderation_notes:
-      create: Læg en note
+      create: Skriv notat
       created_msg: Moderatornotat oprettet!
-      delete: Slet
       destroyed_msg: Moderatornotat destrueret!
     accounts:
       add_email_domain_block: Blokér e-maildomæne
       approve: Godkend
-      approve_all: Godkend alle
-      approved_msg: Tilmeldingsansøgning for %{username} blev godkendt
+      approved_msg: Tilmeldingsansøgning for %{username} godkendt
       are_you_sure: Sikker?
       avatar: Profilbillede
       by_domain: Domæne
       change_email:
-        changed_msg: Kontoens e-mail er skiftet!
+        changed_msg: E-mail skiftet!
         current_email: Nuværende e-mail
         label: Skift e-mail
         new_email: Ny e-mail
         submit: Skift e-mail
         title: Skift e-mail for %{username}
+      change_role:
+        changed_msg: Rolle ændret!
+        label: Ændr rolle
+        no_role: Ingen rolle
+        title: Ændr rolle for %{username}
       confirm: Bekræft
       confirmed: Bekræftet
       confirming: Bekræfter
+      custom: Tilpasset
       delete: Slet data
       deleted: Slettet
       demote: Degradér
-      destroyed_msg: "%{username}s data er nu i kø til straks at blive slettet"
+      destroyed_msg: "%{username}s data er nu sat i kø mhp. snarlig sletning"
       disable: Frys
       disable_sign_in_token_auth: Deaktivér e-mailtokengodkendelse
       disable_two_factor_authentication: Deaktivér 2FA
@@ -128,7 +67,7 @@ da:
       email: E-mail
       email_status: E-mailstatus
       enable: Optø
-      enable_sign_in_token_auth: Aktivér e-mailtokengodkendelse
+      enable_sign_in_token_auth: Aktivér e-mailtoken godkendelse
       enabled: Aktiveret
       enabled_msg: "%{username}s konto er optøet"
       followers: Følgere
@@ -147,13 +86,13 @@ da:
       login_status: Indlogningsstatus
       media_attachments: Medievedhæftninger
       memorialize: Omdan til mindekonto
-      memorialized: Minde gjort
+      memorialized: Gjort til mindekonto
       memorialized_msg: "%{username} gjort til mindekonto"
       moderation:
         active: Aktiv
         all: Alle
         pending: Afventer
-        silenced: Tavsgjort
+        silenced: Begrænset
         suspended: Suspenderet
         title: Moderation
       moderation_notes: Moderationsnotater
@@ -161,22 +100,28 @@ da:
       most_recent_ip: Seneste IP
       no_account_selected: Ingen kontiændringer, da ingen var valgt
       no_limits_imposed: Ingen begrænsninger pålagt
+      no_role_assigned: Ingen rolle tildelt
       not_subscribed: Abonnerer ikke
       pending: Afventende vurdering
       perform_full_suspension: Suspendér
+      previous_strikes: Tidligere anmeldelser (strikes)
+      previous_strikes_description_html:
+        one: Denne konto har <strong>en</strong> anmeldelse.
+        other: Denne konto har <strong>%{count}</strong> anmeldelser.
       promote: Forfrem
       protocol: Protokol
       public: Offentlig
       push_subscription_expires: PuSH-abonnement udløber
       redownload: Opfrisk profil
-      redownloaded_msg: Profil for %{username} opfriske fra oprindelsesserver
+      redownloaded_msg: "%{username}s profil opfrisket fra oprindelsesserver"
       reject: Afvis
-      reject_all: Afvis alle
-      rejected_msg: Tilmeldingsansøgning fra %{username} afvist
+      rejected_msg: "%{username}s tilmeldingsansøgning afvist"
+      remote_suspension_irreversible: Denne kontos data er slettet permanent.
+      remote_suspension_reversible_hint_html: Kontoen er suspenderet på den pågældende server, og kontodata fjernes fuldstændig pr. %{date}. Indtil da vil fjernserveren kunne foretage en komplet reetablering af kontoen. Ønskes alle kontodata fjernet straks, kan dette gøres nedenfor.
       remove_avatar: Fjern profilbillede
       remove_header: Fjern overskrift
-      removed_avatar_msg: Profilbillede for %{username} fjernet
-      removed_header_msg: Overskriftsbillede for %{username} fjernet
+      removed_avatar_msg: "%{username}s profilbillede fjernet"
+      removed_header_msg: "%{username}s overskriftsbillede fjernet"
       resend_confirmation:
         already_confirmed: Denne bruger er allerede bekræftet
         send: Gensend bekræftelses e-mail
@@ -184,144 +129,169 @@ da:
       reset: Nulstil
       reset_password: Nulstil adgangskode
       resubscribe: Genabonnér
-      role: Tilladelser
-      roles:
-        admin: Administrator
-        moderator: Moderator
-        staff: Personale
-        user: Bruger
+      role: Rolle
       search: Søg
-      search_same_email_domain: Andre brugere med det samme e-maildomæne
-      search_same_ip: Andre brugere med den samme IP
+      search_same_email_domain: Øvrige brugere med samme e-maildomæne
+      search_same_ip: Øvrige brugere med identisk IP
       security_measures:
         only_password: Kun adgangskode
         password_and_2fa: Adgangskode og 2FA
-        password_and_sign_in_token: Adgangskode og e-mailtoken
-      sensitive: Sensitivt
-      sensitized: markeret som sensitivt
+      sensitive: Gennemtving sensitiv
+      sensitized: Markeret som sensitiv
       shared_inbox_url: Delt indbakke-URL
       show:
         created_reports: Indsendte anmeldelser
         targeted_reports: Anmeldt af andre
-      silence: Tavsgør
-      silenced: Tavsgjort
-      statuses: Statusser
+      silence: Brgræns
+      silenced: Begrænset
+      statuses: Indlæg
+      strikes: Tidligere anmeldelser
       subscribe: Abonnér
+      suspend: Suspendér
       suspended: Suspenderet
-      suspension_irreversible: Disse kontodata er blevet slettet permanent. Du kan afsuspendere kontoen for at gøre den brugbar, men dette gendanner ikke de tidligere kontodata.
+      suspension_irreversible: Denne kontos data er blevet slettet permanent. Kontoen kan genaktiveres for at gøre den brugbar, imidlertid gendanner dette ikke tidligere kontodata.
       suspension_reversible_hint_html: Kontoen er blevet suspenderet, og dens data fjernes helt d. %{date}. Indtil da kan kontoen genoprettes uden datatab mv. Ønsker alle kontodata fjernet straks, kan dette gøres nedenfor.
-      time_in_queue: Venter i køen %{time}
       title: Konti
-      unconfirmed_email: Ikke-bekræftet e-mail
-      undo_sensitized: Fortryd sensitiv
-      undo_silenced: Fortryd tavsgørelse
+      unblock_email: Afblokér e-mailadresse
+      unblocked_email_msg: "%{username}s e-mail-adresse afblokeret"
+      unconfirmed_email: Ubekræftet e-mail
+      undo_sensitized: Fortryd gennemtving sensitiv
+      undo_silenced: Fortryd begrænsning
       undo_suspension: Fortryd suspendering
-      unsilenced_msg: "%{username}s konto er optøet"
+      unsilenced_msg: "%{username}s kontobegrænsning er fjernet"
       unsubscribe: Opsig abonnement
       unsuspended_msg: "%{username}s konto er afsuspenderet"
       username: Brugernavn
-      view_domain: Vis resumé for domæne
+      view_domain: Vis domæneoversigt
       warn: Advar
       web: Web
       whitelisted: Tilladt for federering
     action_logs:
       action_types:
+        approve_appeal: Godkend appel
+        approve_user: Godkend bruger
         assigned_to_self_report: Tildel rapport
         change_email_user: Skift e-mail for bruger
+        change_role_user: Skift brugerrolle
         confirm_user: Bekræft bruger
         create_account_warning: Opret advarsel
         create_announcement: Opret bekendtgørelse
+        create_canonical_email_block: Opret e-mailblokering
         create_custom_emoji: Opret tilpasset emoji
         create_domain_allow: Opret domænetilladelse
         create_domain_block: Opret domæneblokering
         create_email_domain_block: Opret e-maildomæneblokering
         create_ip_block: Opret IP-regel
         create_unavailable_domain: Opret Utilgængeligt Domæne
-        demote_user: Degradere bruger
+        create_user_role: Opret rolle
+        demote_user: Degradér bruger
         destroy_announcement: Slet bekendtgørelse
+        destroy_canonical_email_block: Slet e-mailblokering
         destroy_custom_emoji: Slet tilpasset emoji
         destroy_domain_allow: Slet domænetilladelse
         destroy_domain_block: Slet domæneblokering
         destroy_email_domain_block: Slet e-maildomæneblokering
+        destroy_instance: Udrens domæne
         destroy_ip_block: Slet IP-regel
-        destroy_status: Slet status
+        destroy_status: Slet indlæg
         destroy_unavailable_domain: Slet Utilgængeligt Domæne
+        destroy_user_role: Ødelæg rolle
         disable_2fa_user: Deaktivér 2FA
         disable_custom_emoji: Deaktivér tilpasset emoji
-        disable_sign_in_token_auth_user: Deaktivér e-mailtokengodkendelse for bruger
+        disable_sign_in_token_auth_user: Deaktivér e-mailtoken godkendelse for bruger
         disable_user: Deaktivér bruger
         enable_custom_emoji: Aktivér tilpasset emoji
-        enable_sign_in_token_auth_user: Aktivér e-mailtokengodkendelse for bruger
-        enable_user: Aktivér brugeren
-        memorialize_account: Gør til mindekonto
-        promote_user: Promovér bruger
+        enable_sign_in_token_auth_user: Aktivér e-mailtoken godkendelse for bruger
+        enable_user: Aktivér bruger
+        memorialize_account: Memoralisér konto
+        promote_user: Forfrem bruger
+        reject_appeal: Afvis appel
+        reject_user: Afvis bruger
         remove_avatar_user: Fjern profilbillede
         reopen_report: Genåbn anmeldelse
+        resend_user: Gensend bekræftelsese-mail
         reset_password_user: Nulstil adgangskode
         resolve_report: Løs anmeldelse
-        sensitive_account: Markér medierne i din konto som sensitive
-        silence_account: Tavsgør konto
+        sensitive_account: Gennemtving sensitiv konto
+        silence_account: Begræns konto
         suspend_account: Suspendér konto
-        unassigned_report: Aftildel anmeldelse
-        unsensitive_account: Afmarkér medierne i din konto som sensitive
-        unsilence_account: Fjern kontotavsgørelse
+        unassigned_report: Fjer anmeldelsestildeling
+        unblock_email_account: Afblokér e-mailadresse
+        unsensitive_account: Fjern Gennemtving sensitiv konto
+        unsilence_account: Fjern kontobegrænselse
         unsuspend_account: Afsuspendér konto
         update_announcement: Opdatér bekendtgørelse
         update_custom_emoji: Opdatér tilpasset emoji
         update_domain_block: Opdatér domæneblokering
-        update_status: Opdatér status
+        update_ip_block: Opdatér IP-regel
+        update_status: Opdatér indlæg
+        update_user_role: Opdatér rolle
       actions:
+        approve_appeal_html: "%{name} godkendte moderationsafgørelsesappellen fra %{target}"
+        approve_user_html: "%{name} godkendte tilmeldingen fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte sig selv anmeldelsen %{target}"
         change_email_user_html: "%{name} ændrede e-mailadressen for bruger %{target}"
+        change_role_user_html: "%{name} ændrede rollen for %{target}"
         confirm_user_html: "%{name} bekræftede e-mailadressen for bruger %{target}"
         create_account_warning_html: "%{name} sendte en advarsel til %{target}"
         create_announcement_html: "%{name} oprettede den nye bekendtgørelse %{target}"
-        create_custom_emoji_html: "%{name} uploadede det nye emoji %{target}"
+        create_canonical_email_block_html: "%{name} blokerede e-mailen med hash'et %{target}"
+        create_custom_emoji_html: "%{name} uploadede den nye emoji %{target}"
         create_domain_allow_html: "%{name} tillod federering med domænet %{target}"
         create_domain_block_html: "%{name} blokerede domænet %{target}"
         create_email_domain_block_html: "%{name} blokerede e-maildomænet %{target}"
         create_ip_block_html: "%{name} oprettede en regel for IP %{target}"
         create_unavailable_domain_html: "%{name} stoppede levering til domænet %{target}"
-        demote_user_html: "%{name} degraderede bruger %{target}"
+        create_user_role_html: "%{name} oprettede %{target}-rolle"
+        demote_user_html: "%{name} degraderede brugeren %{target}"
         destroy_announcement_html: "%{name} slettede bekendtgørelsen %{target}"
-        destroy_custom_emoji_html: "%{name} fjernede emojien %{target}"
+        destroy_canonical_email_block_html: "%{name} afblokerede e-mailen med hash'et %{target}"
+        destroy_custom_emoji_html: "%{name} slettede emojien %{target}"
         destroy_domain_allow_html: "%{name} fjernede federeringstilladelsen med domænet %{target}"
         destroy_domain_block_html: "%{name} afblokerede domænet %{target}"
         destroy_email_domain_block_html: "%{name} afblokerede e-maildomænet %{target}"
+        destroy_instance_html: "%{name} udrensede domænet %{target}"
         destroy_ip_block_html: "%{name} slettede en regel for IP %{target}"
-        destroy_status_html: "%{name} fjernede statussen fra %{target}"
+        destroy_status_html: "%{name} fjernede indlægget fra %{target}"
         destroy_unavailable_domain_html: "%{name} genoptog levering til domænet %{target}"
+        destroy_user_role_html: "%{name} slettede %{target}-rolle"
         disable_2fa_user_html: "%{name} deaktiverede tofaktorkravet for brugeren %{target}"
-        disable_custom_emoji_html: "%{name} deaktiverede humørikonet %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} deaktiverede e-mailtokengodkendelse for %{target}"
+        disable_custom_emoji_html: "%{name} deaktiverede emojien %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} deaktiverede e-mailtoken godkendelsen for %{target}"
         disable_user_html: "%{name} deaktiverede indlogning for brugeren %{target}"
-        enable_custom_emoji_html: "%{name} aktiverede humørikonet %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverede e-mailtokengodkendelse for %{target}"
+        enable_custom_emoji_html: "%{name} aktiverede emojien %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverede e-mailtoken godkendelse for %{target}"
         enable_user_html: "%{name} aktiverede indlogning for brugeren %{target}"
         memorialize_account_html: "%{name} gjorde %{target}s konto til en mindeside"
         promote_user_html: "%{name} forfremmede brugeren %{target}"
+        reject_appeal_html: "%{name} afviste moderationsafgørelsesappellen fra %{target}"
+        reject_user_html: "%{name} afviste tilmelding fra %{target}"
         remove_avatar_user_html: "%{name} fjernede %{target}s profilbillede"
         reopen_report_html: "%{name} genåbnede anmeldelsen %{target}"
+        resend_user_html: "%{name} gensendte bekræftelses-e-mail for %{target}"
         reset_password_user_html: "%{name} nulstillede adgangskoden for brugeren %{target}"
         resolve_report_html: "%{name} løste anmeldelsen %{target}"
         sensitive_account_html: "%{name} markerede %{target}s medier som sensitive"
-        silence_account_html: "%{name} tavsgjorde %{target}s konto"
+        silence_account_html: "%{name} begrænsede %{target}s konto"
         suspend_account_html: "%{name} suspenderede %{target}s konto"
         unassigned_report_html: "%{name} fjernede tildelingen af rapporten %{target}"
-        unsensitive_account_html: "%{name} afmarkerede %{target}s medier som sensitive"
-        unsilence_account_html: "%{name} fjernede tavsgøring af %{target}s konto"
+        unblock_email_account_html: "%{name} afblokerede %{target}s e-mailadresse"
+        unsensitive_account_html: "%{name} fjernede sensitivmarkeringen af %{target}s medier"
+        unsilence_account_html: "%{name} fjernede begrænsningen af %{target}s konto"
         unsuspend_account_html: "%{name} fjernede suspenderingen af %{target}s konto"
         update_announcement_html: "%{name} opdaterede bekendtgørelsen %{target}"
         update_custom_emoji_html: "%{name} opdaterede emoji %{target}"
         update_domain_block_html: "%{name} opdaterede domæneblokeringen for %{target}"
-        update_status_html: "%{name} opdaterede status for %{target}"
-      deleted_status: "(slettet status)"
+        update_ip_block_html: "%{name} ændrede reglen for IP'en %{target}"
+        update_status_html: "%{name} opdaterede indlægget fra %{target}"
+        update_user_role_html: "%{name} ændrede %{target}-rolle"
+      deleted_account: slettet konto
       empty: Ingen logger fundet.
       filter_by_action: Filtrér efter handling
       filter_by_user: Filtrér efter bruger
       title: Revisionslog
     announcements:
-      destroyed_msg: Bekendtgørelsen blev slettet!
+      destroyed_msg: Bekendtgørelsen er slettet!
       edit:
         title: Redigér bekendtgørelse
       empty: Ingen bekendtgørelser fundet.
@@ -330,13 +300,13 @@ da:
         create: Opret bekendtgørelse
         title: Ny bekendtgørelse
       publish: Publicér
-      published_msg: Bekendtgørelsen blev publiceret!
+      published_msg: Bekendtgørelsen er publiceret!
       scheduled_for: Planlagt til %{time}
-      scheduled_msg: Bekendtgørelse planlagt til publicering!
+      scheduled_msg: Bekendtgørelse planlagt til udgivelse!
       title: Bekendtgørelser
       unpublish: Afpublicér
-      unpublished_msg: Bekendtgørelsen blev afpubliceret!
-      updated_msg: Bekendtgørelsen blev opdateret!
+      unpublished_msg: Bekendtgørelsen er afpubliceret!
+      updated_msg: Bekendtgørelsen er opdateret!
     custom_emojis:
       assign_category: Tildel kategori
       by_domain: Domæne
@@ -349,42 +319,47 @@ da:
       destroyed_msg: Emoji destrueret!
       disable: Deaktivér
       disabled: Deaktiveret
-      disabled_msg: Denne emoji blev deaktiveret
+      disabled_msg: Denne emoji er nu deaktiveret
       emoji: Emoji
       enable: Aktivér
       enabled: Aktiveret
-      enabled_msg: Denne emoji blev aktiveret
-      image_hint: PNG op til 50KB
+      enabled_msg: Denne emoji er nu aktiv
+      image_hint: PNG eller GIF op til %{size}
       list: Oplist
       listed: Oplistet
       new:
         title: Tilføj ny tilpasset emoji
-      not_permitted: Du har ikke tilladelse til at udføre denne handling
+      no_emoji_selected: Ingen emoji ændret (da ingen var valgt)
+      not_permitted: Ingen tilladelse til at udføre denne handling
       overwrite: Overskriv
       shortcode: Kortkode
-      shortcode_hint: Mindst 2 tegn, kun alfanumeriske tegn og understreger
+      shortcode_hint: Mindst 2 tegn, kun alfanumeriske og understregstegn
       title: Tilpassede emojier
       uncategorized: Ukategoriseret
       unlist: Fjern fra oplistning
       unlisted: Ikke oplistet
-      update_failed_msg: Kunne ikke opdatere den emoji
-      updated_msg: Emoji blev opdateret!
+      update_failed_msg: Kunne ikke opdatere denne emoji
+      updated_msg: Emoji er opdateret!
       upload: Upload
     dashboard:
       active_users: aktive brugere
       interactions: interaktioner
       media_storage: Medielagerplads
       new_users: nye brugere
+      opened_reports: indberettede anmeldelser
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> verserende anke"
+        other: "<strong>%{count}</strong> verserende anker"
       pending_reports_html:
-        one: "<strong>1</strong> afventende rapport"
-        other: "<strong>%{count}</strong> afventende rapporter"
+        one: "<strong>%{count}</strong> verserende anmeldelse"
+        other: "<strong>%{count}</strong> verserende anmeldelser"
       pending_tags_html:
-        one: "<strong>1</strong> afventende hashtag"
+        one: "<strong>%{count}</strong> afventende hashtag"
         other: "<strong>%{count}</strong> afventende hashtags"
       pending_users_html:
-        one: "<strong>1</strong> afventende bruger"
+        one: "<strong>%{count}</strong> afventende bruger"
         other: "<strong>%{count}</strong> afventende brugere"
-      resolved_reports: anmeldelser løst
+      resolved_reports: løste anmeldelser
       software: Software
       sources: Tilmeldingskilder
       space: Lagerpladsforbrug
@@ -392,10 +367,16 @@ da:
       top_languages: Mest aktive sprog
       top_servers: Mest aktive servere
       website: Websted
+    disputes:
+      appeals:
+        empty: Ingen anker fundet.
+        title: Anker
     domain_allows:
       add_new: Tillade federering med domæne
-      created_msg: Domæne er blevet tilladt federering
-      destroyed_msg: Domæne er blevet forbudt federering
+      created_msg: Domæne er blevet tilladt for federering
+      destroyed_msg: Domæne er blevet forbudt for federering
+      export: Eksportér
+      import: Importér
       undo: Forbyd federering med domæne
     domain_blocks:
       add_new: Tilføj ny domæneblokering
@@ -403,16 +384,21 @@ da:
       destroyed_msg: Domæneblokering er blevet fjernet
       domain: Domæne
       edit: Redigér domæneblokering
-      existing_domain_block_html: Du har allerede pålagt %{name} strengere grænser, du skal <a href="%{unblock_url}">afblokerere</a> det først.
+      existing_domain_block: "%{name} er allerede pålagt strengere restriktioner."
+      existing_domain_block_html: Der har allerede pålagt %{name} strengere begrænsninger, så dette kræver først en <a href="%{unblock_url}">afblokering</a>.
+      export: Eksportér
+      import: Importér
       new:
         create: Opret blokering
-        hint: Domæneblokeringen vil ikke forhindre oprettelse af kontoposter i databasen, men vil retroaktivt og automatisk benytte specifikke moderationsmetoder på disse konti.
+        hint: Domæneblokeringen vil ikke forhindre oprettelse af kontoposter i databasen, men vil retroaktivt og automatisk føje særlige moderationsmetoder til disse konti.
         severity:
-          desc_html: "<strong>Tavsgjort</strong> vil gøre kontoens indlæg usynlige for alle, som ikke følger dem. <strong>Suspendering</strong> vil fjerne alt kontoindhold, medier og profildata. Brug <strong>Ingen</strong>, hvis mediefiler blot ønskes afvist."
+          desc_html: "<strong>Begræns</strong> gør indlæg fra konti på dette domæne usynlige for alle ikke-følger. <strong>Suspendér</strong> fjerner alt indhold, medier og profildata for dette domænes konti fra serveren. Brug <strong>Ingen</strong>, hvis man blot vil afvise mediefiler."
           noop: Ingen
-          silence: Tavsgøre
+          silence: Begræns
           suspend: Suspendere
         title: Ny domæneblokering
+      no_domain_block_selected: Ingen domæneblokeringer ændret (ingen var valgt)
+      not_permitted: Ingen tilladelse til at udføre denne handling
       obfuscate: Slør domænenavn
       obfuscate_hint: Slør delvist domænenavnet på listen, hvis annoncering af listen over domænebegrænsninger er aktiveret
       private_comment: Privat kommentar
@@ -420,65 +406,100 @@ da:
       public_comment: Offentlig kommentar
       public_comment_hint: Kommentar om denne domænebegrænsning for den brede offentlighed, hvis annoncering af listen over domænebegrænsninger er aktiveret.
       reject_media: Afvis mediefiler
-      reject_media_hint: Fjerner lokalt lagrede mediefiler og afviser at download nogle fremadrettet. Irrelevant for suspenderinger
+      reject_media_hint: Fjerner lokalt lagrede mediefiler og afviser at download nogle fremadrettet. Irrelevant ifm. suspenderinger
       reject_reports: Afvis anmeldelser
-      reject_reports_hint: Ignorér alle anmeldelser fra dette domæne. Irrelevant for suspenderinger
-      rejecting_media: afviser mediefiler
-      rejecting_reports: afviser anmeldelser
-      severity:
-        silence: tavsgjort
-        suspend: suspenderet
-      show:
-        affected_accounts:
-          one: En konto i databasen påvirket
-          other: "%{count} konti i databasen påvirket"
-        retroactive:
-          silence: Fjern tavsgøring for eksisterende, berørte konti fra dette domæne
-          suspend: Fjern suspendering for eksisterende, berørte konti fra dette domæne
-        title: Annullér domæneblokering for domænet %{domain}
-        undo: Annullér
+      reject_reports_hint: Ignorér alle anmeldelser fra dette domæne. Irrelevant ifm. suspenderinger
       undo: Annullér domæneblokering
       view: Vis domæneblokering
     email_domain_blocks:
       add_new: Tilføj ny
+      attempts_over_week:
+        one: "%{count} tilmeldingsforsøg over den seneste uge"
+        other: "%{count} tilmeldingsforsøg over den seneste uge"
       created_msg: E-maildomæne blokeret
       delete: Slet
-      destroyed_msg: E-maildomæne afblokeret
+      dns:
+        types:
+          mx: MX-post
       domain: Domæne
-      empty: Ingen e-maildomæner er pt. blokeret.
-      from_html: fra %{domain}
       new:
         create: Tilføj domæne
-        title: Blokere nyt e-maildomæne
+        resolve: Opløs domæne
+        title: Blokér nyt e-maildomæne
+      no_email_domain_block_selected: Ingen e-mailblokeringer ændret (ingen var valgt)
+      resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke ikke at blokere større e-mailudbydere.</strong>
+      resolved_through_html: Opløst via %{domain}
       title: Blokerede e-maildomæner
+    export_domain_allows:
+      new:
+        title: Importeret domæne tillader
+      no_file: Ingen fil valgt
+    export_domain_blocks:
+      import:
+        description_html: En liste over domæneblokeringer er ved at blive importeret. Gennemgå listen meget nøje, især hvis man ikke selv har oprettet den.
+        existing_relationships_warning: Eksisterende følge-relationer
+        private_comment_description_html: 'For at man lettere kan holde styr på, hvorfra importerede blokeringer kommer, oprettes disse med flg. private kommentar: <q>%{comment}</q>'
+        private_comment_template: Importeret fra %{source} d. %{date}
+        title: Import af domæneblokeringer
+      new:
+        title: Import af domæneblokeringer
+      no_file: Ingen fill udvalgt
     follow_recommendations:
-      description_html: "<strong>Følg-anbefalinger hjælpe nye brugere til hurtigt at finde interessant indhold</strong>. Når en bruger ikke har interageret nok med andre til at danne personlige følg-anbefalinger, anbefales disse konti i stedet. De genberegnes dagligt baseret på en blanding af konti med de fleste nylige engagementer og fleste lokale følger-antal for et givet sprog."
+      description_html: "<strong>Følg-anbefalinger hjælpe nye brugere til hurtigt at finde interessant indhold</strong>. Når en bruger ikke har interageret nok med andre til at generere personlige følg-anbefalinger, anbefales disse konti i stedet. De revurderes dagligt baseret på en blanding af konti med de flest nylige engagementer og fleste lokale følger-antal for et givet sprog."
       language: For sprog
       status: Status
       suppress: Undertryk følg-anbefaling
       suppressed: Undertrykt
       title: Følg-anbefalinger
-      unsuppress: Genetablér følg-anbefaling
+      unsuppress: Genopret følg-anbefaling
     instances:
+      availability:
+        description_html:
+          one: Lykkes det ikke at levere til domænet i løbet af <strong>%{count} dag</strong>, foretages ingen yderligere leveringsforsøg, medmindre en levering <em>fra</em> domænet modtages.
+          other: Lykkes det ikke at levere til domænet i <strong>%{count} dage</strong>, foretages ingen yderligere leveringsforsøg, medmindre en levering <em>fra</em> domænet modtages.
+        failure_threshold_reached: Fejlgrænse nået pr. %{date}.
+        failures_recorded:
+          one: Mislykket forsøg %{count} dag.
+          other: Mislykkede forsøg på %{count} forskellige dage.
+        no_failures_recorded: Ingen fejl noteret.
+        title: Tilgængelighed
+        warning: Seneste forsøg på at oprette forbindelse til denne server mislykkedes
       back_to_all: Alle
       back_to_limited: Begrænset
       back_to_warning: Advarsel
       by_domain: Domæne
+      confirm_purge: Sikker på, at data skal slettes fra dette domæne permanent?
+      content_policies:
+        comment: Internt notat
+        description_html: Der kan defineres indholdspolitikker, som anvendes på alle konti fra dette domæne samt alle dets underdomæner.
+        policies:
+          reject_media: Afvis medier
+          reject_reports: Afvis anmeldelser
+          silence: Begræns
+          suspend: Suspendér
+        policy: Politik
+        reason: Offentlig årsag
+        title: Indholdspolitikker
+      dashboard:
+        instance_accounts_dimension: Mest fulgte konti
+        instance_accounts_measure: gemte konti
+        instance_followers_measure: vores følgere dér
+        instance_follows_measure: deres følgere dér
+        instance_languages_dimension: Topsprog
+        instance_media_attachments_measure: gemte medievedhæftninger
+        instance_reports_measure: anmeldelser af dem
+        instance_statuses_measure: gemte indlæg
       delivery:
         all: Alle
         clear: Ryd leveringsfejl
+        failing: Fejler
         restart: Genstart levering
         stop: Stop levering
-        title: Levering
         unavailable: Utilgængelig
-        unavailable_message: Levering utilgængelig
-        warning: Advarsel
-        warning_message:
-          one: Leveringsfejl %{count} dag
-          other: Leveringsfejl %{count} dage
       delivery_available: Levering er tilgængelig
       delivery_error_days: Leveringsfejldage
       delivery_error_hint: Er levering ikke mulig i %{count} dage, markeres den automatisk som ikke-leverbar.
+      destroyed_msg: Data fra %{domain} er nu sat i kø mhp. snarlig sletning.
       empty: Ingen domæner fundet.
       known_accounts:
         one: "%{count} kendt konto"
@@ -489,12 +510,15 @@ da:
         title: Moderation
       private_comment: Privat kommentar
       public_comment: Offentlig kommentar
-      title: Federation
+      purge: Udrens
+      purge_description_html: Antages dette domæne at være offline permanent, kan alle kontooptegnelser og tilknyttede data herfra slettes fra ens lagerplads. Dette kan tage et stykke tid.
+      title: Federering
       total_blocked_by_us: Blokeret af os
       total_followed_by_them: Følges af dem
       total_followed_by_us: Følges af os
       total_reported: Anmeldelser om dem
       total_storage: Medievedhæftninger
+      totals_time_period_hint_html: Nedenfor viste totaler omfatter data for alle tidsperioder.
     invites:
       deactivate_all: Deaktivér alle
       filter:
@@ -516,16 +540,14 @@ da:
         '94670856': 3 år
       new:
         title: Opret ny IP-regel
-      no_ip_block_selected: Ingen IP-regler blev ændret, da ingen blev valgt
+      no_ip_block_selected: Ingen IP-regler blev ændret (ingen var valgt)
       title: IP-regler
-    pending_accounts:
-      title: Afventende konti (%{count})
     relationships:
       title: "%{acct}-relationer"
     relays:
       add_new: Tilføj ny videreformidler
       delete: Slet
-      description_html: En <strong>federationsvidereformidler</strong> er en mellemliggende server, der udveksler store mængder af offentlige trut imellem servere, som abonnerer på og publicerer til den. <strong>Det kan hjælpe små og mellemstore servere opdage indhold fra fediverset</strong>, hvilket ellers ville kræve at lokale brugere manuelt følger andre personer på fjernservere.
+      description_html: En <strong>federationsvidereformidler</strong> er en mellemliggende server, der udveksler store mængder offentlige indlæg mellem servere, som abonnerer på og publicerer til den. <strong>Det kan hjælpe små og mellemstore servere med at opdage indhold fra fediverset</strong>, der ellers ville kræve at lokale brugere manuelt følger andre personer på fjernservere.
       disable: Deaktivér
       disabled: Deaktiveret
       enable: Aktivér
@@ -535,7 +557,7 @@ da:
       pending: Afventer videreformidlers godkendelse
       save_and_enable: Gem og aktivér
       setup: Opsæt en videreformidlerforbindelse
-      signatures_not_enabled: Videreformidlere fungerer ikke korrekt, mens sikker tilstand eller begrænset føderationstilstand er aktiveret
+      signatures_not_enabled: I sikker tilstand eller begrænset federeringstilstand fungerer videreformidlere muligvis ikke korrekt
       status: Status
       title: Videreformidlere
     report_notes:
@@ -546,183 +568,324 @@ da:
         notes:
           one: "%{count} notat"
           other: "%{count} notater"
-        reports:
-          one: "%{count} anmeldelse"
-          other: "%{count} anmeldelser"
-      action_taken_by: Handling udført af
+      action_log: Revisionslog
+      action_taken_by: Handling foretaget af
+      actions:
+        delete_description_html: De anmeldte indlæg slettes, og en advarsel (strike) registreres mhp. eskalering ved evt. fremtidige overtrædelser fra samme konto.
+        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 relateret til at adfærdshåndtering for, samt tilpasning af kommunikation 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: Profilen vil kun være synlig for dem, som allerede følger den eller manuelt slå den op, hvilket markant begrænser dens rækkevidde. Kan altid omgøres.
+        suspend_description_html: Profilen (inkl. alt indhold) gøres utilgængelig, indtil den til sidst slettes. Interaktion med kontoen vil være umulig. Kan fortrydes inden for 30 dage.
+      actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
+      add_to_report: Føj mere til anmeldelse
       are_you_sure: Sikker?
       assign_to_self: Tildel til mig
       assigned: Tildelt moderator
+      by_target_domain: Anmeldte kontos domæne
+      category: Kategori
+      category_description_html: Årsagen til anmeldelsen af denne konto og/eller indhold refereres i kommunikationen med den anmeldte konto
       comment:
         none: Ingen
+      comment_description_html: 'For at give mere information, skrev %{name}:'
       created_at: Anmeldt
+      delete_and_resolve: Slet indlæg
       forwarded: Videresendt
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Markér som løst
-      mark_as_unresolved: Markér som ikke-løst
+      mark_as_sensitive: Markér som sensitiv
+      mark_as_unresolved: Markér som uløst
+      no_one_assigned: Ingen
       notes:
         create: Tilføj notat
         create_and_resolve: Løs med notat
         create_and_unresolve: Genåbn med notat
         delete: Slet
-        placeholder: Beskriv de udførte handlinger eller andre relevante opdateringer...
+        placeholder: Beskriv udførte foranstaltninger eller andre relevante opdateringer...
+        title: Notater
+      notes_description_html: Se og skriv notater til andre moderatorer og dit fremtid selv
+      quick_actions_description_html: 'Træf en hurtig foranstaltning eller rul ned for at se anmeldt indhold:'
+      remote_user_placeholder: fjernbrugeren fra %{instance}
       reopen: Genåbn anmeldelse
       report: 'Anmeldelse #%{id}'
       reported_account: Anmeldt konto
       reported_by: Anmeldt af
       resolved: Løst
-      resolved_msg: Anmeldelse er nu løst!
+      resolved_msg: Anmeldelse løst!
+      skip_to_actions: Overspring til foranstaltninger
       status: Status
-      target_domain: Domæne for anmeldt konto
+      statuses: Anmeld indhold
+      statuses_description_html: Krænkende indhold citeres i kommunikationen med den anmeldte konto
       target_origin: Anmeldte kontos oprindelse
       title: Anmeldelser
-      unassign: Utildel
-      unresolved: Ikke-løst
+      unassign: Fjern tildeling
+      unresolved: Uløst
       updated_at: Opdateret
+      view_profile: Vis profil
+    roles:
+      add_new: Tilføj rolle
+      assigned_users:
+        one: "%{count} bruger"
+        other: "%{count} brugere"
+      categories:
+        administration: Håndtering
+        devops: DevOps
+        invites: Invitationer
+        moderation: Moderering
+        special: Speciel
+      delete: Slet
+      description_html: Med <strong>brugerroller</strong>kan man tilpasse sine brugeres adgang til Mastodon-funktioner og -områder.
+      edit: Redigér rolle for '%{name}
+      everyone: Standardtilladelser
+      everyone_full_description_html: Dette er <strong>basisrollen</strong> med indvirkning på <strong>alle brugere</strong>, selv dem uden rolletildeling. Alle øvrige rolletilladelser nedarves herfra.
+      permissions_count:
+        one: "%{count} tilladelse"
+        other: "%{count} tilladelser"
+      privileges:
+        administrator: Administrator
+        administrator_description: Brugere med denne rolle kan omgå alle tilladelser
+        delete_user_data: Slet brugerdata
+        delete_user_data_description: Tillader brugere at slette andre brugeres data straks
+        invite_users: Invitér brugere
+        invite_users_description: Tillader brugere at invitere nye personer til serveren
+        manage_announcements: Håndtere bekendtgørelser
+        manage_announcements_description: Tillader brugere at håndtere bekendtgørelser på serveren
+        manage_appeals: Håndtere appeller
+        manage_appeals_description: Tillader brugere at vurdere appeller af modereringshandlinger
+        manage_blocks: Håndtere blokeringer
+        manage_blocks_description: Tillader brugere at blokere e-mailudbydere og IP-adresser
+        manage_custom_emojis: Håndtere tilpassede emojier
+        manage_custom_emojis_description: Tillader brugere at håndtere tilpassede emojier på serveren
+        manage_federation: Håndtere federation
+        manage_federation_description: Tillader brugere at blokere eller tillade federation med andre domæner og styre leverbarhed
+        manage_invites: Administrér invitationer
+        manage_invites_description: Tillader brugere at gennemse og deaktivere invitationslinks
+        manage_reports: Håndtere rapporter
+        manage_reports_description: Tillader brugere at vurdere rapporter og, i overensstemmelse hermed, at udføre moderationshandlinger
+        manage_roles: Håndtere roller
+        manage_roles_description: Tillader brugere at håndtere og tildele roller under deres privilegiestatus
+        manage_rules: Håndtere regler
+        manage_rules_description: Tillad brugere at ændre serverregler
+        manage_settings: Håndtere indstillinger
+        manage_settings_description: Tillader brugere at ændre webstedsindstillinger
+        manage_taxonomies: Håndtere taksonomier
+        manage_taxonomies_description: Tillader brugere at gennemse tenderende indhold og opdatere hashtag-indstillinger
+        manage_user_access: Håndtere brugeradgang
+        manage_user_access_description: Tillader brugere at deaktivere andre brugeres tofaktorgodkendelse, skifte deres e-mailadresse og nulstille deres adgangskode
+        manage_users: Håndtere brugere
+        manage_users_description: Tillader brugere at se andre brugeres oplysninger og underkaste dem moderationshandlinger
+        manage_webhooks: Håndtere Webhooks
+        manage_webhooks_description: Tillader brugere at opsætte webhooks til administrative begivenheder
+        view_audit_log: Vis revisionslog
+        view_audit_log_description: Tillader brugere at se en historik over administrative handlinger på serveren
+        view_dashboard: Vis Dashboard
+        view_dashboard_description: Tillader brugere at tilgå Dashboard'et og forskellige målinger
+        view_devops: DevOps
+        view_devops_description: Tillader brugere at tilgå Sidekiq- og pgHero-dashboards
+      title: Roller
     rules:
       add_new: Tilføj regel
       delete: Slet
-      description_html: Mens de fleste hævder at have læst og accepteret tjenestevilkårene, så læser folk normalt ikke disse, før et problem er opstået. <strong>Gør det lettere med ét blik at se din servers regler ved at opliste disse på en punktsliste.</strong> Prøv at holde individuelle regler korte og enkle, men undgå også at opdele dem i mange separate underpunkter.
+      description_html: Mens de fleste hævder at have læst og accepteret tjenestevilkårene, så læser folk normalt ikke disse, før et problem er opstået. <strong>Gør det lettere med ét blik at se din servers regler ved at opliste disse på en punktliste.</strong> Forsøg at holde individuelle regler korte og enkle, men undgå også at opdele dem i mange separate underpunkter.
       edit: Redigér regel
       empty: Ingen serverregler defineret endnu.
       title: Serverregler
     settings:
-      activity_api_enabled:
-        desc_html: Antal af lokalt opslåede statusser, aktive brugere, og nye registreringer i ugentlige opdelinger
-        title: Offentliggør samlede statistikker vedr. brugeraktivitet i API'en
-      bootstrap_timeline_accounts:
-        desc_html: Adskil flere brugernavne med kommaer. Kun lokale og ulåste konti vil fungere. Standard, hvis tom, er alle lokale admins.
-        title: Standard følger for nye brugere
-      contact_information:
-        email: Forretningse-mail
-        username: Kontaktbrugernavn
-      custom_css:
-        desc_html: Ændre udseendet med CSS indlæst på hver side
-        title: Tilpasset CSS
+      about:
+        manage_rules: Håndtér serverregler
+        preamble: Giv dybdegående oplysninger om, hvordan serveren opereres, modereres, finansieres.
+        rules_hint: Der er et dedikeret område for regler, som forventes overholdt af brugerne.
+        title: Om
+      appearance:
+        preamble: Tilpas Mastodon-webgrænsefladen.
+        title: Udseende
+      branding:
+        preamble: Serverens branding adskiller den fra andres i netværket. Oplysningerne kan vises på tværs af div. miljøer, såsom Mastodon-webgrænsefladen, dedikerede applikationer, i-link forhåndsvisninger på andre websteder og i besked-apps mv. Oplysningerne bør derfor være klare og detaljerede, men samtidig kortfattede.
+        title: Branding
+      content_retention:
+        preamble: Styr, hvordan Mastodon gemmer brugergenereret indhold.
+        title: Indholdsopbevaring
       default_noindex:
         desc_html: Påvirker alle brugere, som ikke selv har ændret denne indstilling
-        title: Fravælge som standard søgemaskineindekseringer for brugere
+        title: Fravælg som standard søgemaskineindeksering for brugere
+      discovery:
+        follow_recommendations: Følg-anbefalinger
+        preamble: At vise interessant indhold er vitalt ifm. at få nye brugere om bord, som måske ikke kender nogen på Mastodon. Styr, hvordan forskellige opdagelsesfunktioner fungerer på serveren.
+        profile_directory: Profiloversigt
+        public_timelines: Offentlige tidslinjer
+        title: Opdagelse
+        trends: Trends
       domain_blocks:
         all: Til alle
         disabled: Til ingen
-        title: Vis domæneblokeringer
         users: Til indloggede lokale brugere
-      domain_blocks_rationale:
-        title: Vis begrundelse
-      hero:
-        desc_html: Vist på forsiden. Mindst 600x100px anbefales. Hvis ikke sat, benyttes serverminiaturebillede
-        title: Heltebillede
-      mascot:
-        desc_html: Vist på forsiden. Mindst 293x205px anbefales. Hvis ikke sat, benyttes standardmaskot
-        title: Maskotbillede
-      peers_api_enabled:
-        desc_html: Domænenavne, denne server er stødt på i fediverset
-        title: Udgiv liste over opdagede server i API'en
-      preview_sensitive_media:
-        desc_html: Linkforhåndsvisninger på andre websteder vil vise et miniaturebillede, selv hvis mediet er markeret som sensitivt
-        title: Vis følsomme medier i OpenGraph-forhåndsvisninger
-      profile_directory:
-        desc_html: Tillad at brugere kan findes
-        title: Aktivér profilmappe
       registrations:
-        closed_message:
-          desc_html: Vist på forside, når tilmeldingsmuligheder er lukket. HTML-tags kan bruges
-          title: Lukket tilmelding-meddelelse
-        deletion:
-          desc_html: Tillad enhver at slette sin konto
-          title: Åbn kontosletning
-        min_invite_role:
-          disabled: Ingen
-          title: Tillad invitationer fra
-        require_invite_text:
-          desc_html: Når tilmeldnger kræver manuel godkendelse, så gør “Hvorfor ønsker du at deltage?” tekstinput obligatorisk i stedet for valgfri
-          title: Nye brugere afkræves deltagelsesbegrundelse
+        preamble: Styr, hvem der kan oprette en konto på serveren.
+        title: Registreringer
       registrations_mode:
         modes:
-          approved: Godkendelse kræves for tilmelding
+          approved: Tilmeldingsgodkendelse kræves
           none: Ingen kan tilmelde sig
-          open: Enhver kan tilmelde sig
-        title: Tilmeldingstilstand
-      show_known_fediverse_at_about_page:
-        desc_html: Når deaktiveret, begrænses den offentlige tidslinje linket fra indgangssiden til kun at vise lokalt indhold
-        title: Medtag federeret indhold på ikke-godkendt, offentlig tidslinjeside
-      show_staff_badge:
-        desc_html: Vis et personaleemblem på en brugerside
-        title: Vis personaleemblem
-      site_description:
-        desc_html: Introduktionsafsnit på API'en. Beskriv, hvad der gør denne Mastodonserver speciel samt alt andet vigtigt. HTML tags kan bruges, især <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
-        title: Serverbeskrivelse
-      site_description_extended:
-        desc_html: Et god placering til dit adfærdskodes, regler, retningslinjer mv., som gør din server unik. HTML-tags kan bruges
-        title: Tilpasset udvidet information
-      site_short_description:
-        desc_html: Vises på sidebjælke og metatags. Beskriv i et enkelt afsnit, hvad Mastodon er, og hvad der gør denne server speciel.
-        title: Kort serverbeskrivelse
-      site_terms:
-        desc_html: Du kan skrive din egen fortrolighedspolitik, tjenestevilkår el.lign. HTML-tags kan bruges
-        title: Tilpasset tjenestevilkår
-      site_title: Servernavn
-      thumbnail:
-        desc_html: Bruges til forhåndsvisninger via OpenGraph og API. 1200x630px anbefales
-        title: Serverminiaturebillede
-      timeline_preview:
-        desc_html: Vis link til offentlig tidslinje på indgangssiden og lad API'en tilgå den offentlige tidslinje uden godkendelse
-        title: Tillad ikke-godkendt tilgang til offentlig tidslinje
-      title: Webstedsindstillinger
-      trendable_by_default:
-        desc_html: Påvirker hashtags, som ikke blevet nægtet tidligere
-        title: Tillad hashtags at forme tendens uden forudgående gennemsyn
-      trends:
-        desc_html: Vis tidligere gennemgåede hashtags, som pt. trender
-        title: Populære hashtags
+          open: Alle kan tilmelde sig
+      title: Serverindstillinger
     site_uploads:
       delete: Slet uploadet fil
       destroyed_msg: Websteds-upload blev slettet!
     statuses:
-      back_to_account: Tilbage til kontosiden
+      account: Forfatter
+      application: Applikation
+      back_to_account: Retur til kontoside
+      back_to_report: Retur til anmeldelsesside
       batch:
-        delete: Slet
-        nsfw_off: Markér som ikke-sensitivt
-        nsfw_on: Markér som sensitivt
+        remove_from_report: Fjern fra anmeldelse
+        report: Anmeldelse
       deleted: Slettet
-      failed_to_execute: Udførelse mislykkedes
+      favourites: Favoritter
+      history: Versionshistorik
+      in_reply_to: Svarer på
+      language: Sprog
       media:
         title: Medier
-      no_media: Ingen medier
-      no_status_selected: Ingen indlæg ændret, da ingen var valgt
+      metadata: Metadata
+      no_status_selected: Ingen indlæg ændret (ingen valgt)
+      open: Åbn indlæg
+      original_status: Oprindeligt indlæg
+      reblogs: Genblogninger
+      status_changed: Indlæg ændret
       title: Kontoindlæg
+      trending: Populære
+      visibility: Synlighed
       with_media: Med medier
+    strikes:
+      actions:
+        delete_statuses: "%{name} slettede %{target}s indlæg"
+        disable: "%{name} frøs %{target}s konto"
+        mark_statuses_as_sensitive: "%{name} markerede %{target}s indlæg som sensitive"
+        none: "%{name} sendte en advarsel til %{target}"
+        sensitive: "%{name} markerede %{target}s konto som sensitiv"
+        silence: "%{name} begrænsede %{target}s konto"
+        suspend: "%{name} suspenderede %{target}s konto"
+      appeal_approved: Appelleret
+      appeal_pending: Appel afventer
     system_checks:
       database_schema_check:
         message_html: Databasemigreringer afventer. Kør dem for at sikre den forventede adfærd fra applikationen
+      elasticsearch_running_check:
+        message_html: Kunne ikke oprette forbindelse til Elasticsearch. Tjek, at den kører, eller deaktivér fuldtekstsøgning
+      elasticsearch_version_check:
+        message_html: 'Inkompatibel Elasticsearch-version: %{value}'
+        version_comparison: Elasticsearch %{running_version} kører, men %{required_version} kræves
       rules_check:
         action: Håndtér serverregler
         message_html: Ingen serverregler defineret.
       sidekiq_process_check:
-        message_html: Ingen Sidekiq-proces kører for %{value}-kø(er). Gennemgå din Sidekiq-opsætning
+        message_html: Ingen Sidekiq-proces kører for %{value}-kø(er). Gennemgå Sidekiq-opsætningen
     tags:
-      accounts_today: Unikke anvendelser i dag
-      accounts_week: Unikke anvendelser denne uge
-      breakdown: Dagens anvendelse fordelt på kilde
-      last_active: Senest aktiv
-      most_popular: Mest populære
-      most_recent: Seneste
-      name: Hashtag
-      review: Gennemsynsstatus
-      reviewed: Gennemgået
-      title: Hashtags
-      trending_right_now: Populære lige nu
-      unique_uses_today: "%{count} indlæg i dag"
-      unreviewed: Ikke gennemgået
+      review: Revisionsstatus
       updated_msg: Hashtag-indstillinger opdateret
     title: Administration
+    trends:
+      allow: Tillad
+      approved: Godkendt
+      disallow: Tillad ikke
+      links:
+        allow: Tillad link
+        allow_provider: Tillad udgiver
+        description_html: Disse er links, som pt. deles meget af konti, som serveren ser indlæg fra. Det kan hjælpe ens brugere med at finde ud af, hvad der sker i verden. Ingen links vises offentligt, før man godkender udgiveren. Man kan også tillade/afvise individuelle links.
+        disallow: Tillad ikke link
+        disallow_provider: Tillad ikke udgiver
+        no_link_selected: Intet link ændret (da intet var valgt)
+        publishers:
+          no_publisher_selected: Ingen udgiver ændret (da ingen var valgt)
+        shared_by_over_week:
+          one: Delt af én person den seneste uge
+          other: Delt af %{count} personer den seneste uge
+        title: Populære links
+        usage_comparison: Delt %{today} gange i dag, sammenlignet med %{yesterday} i går
+      only_allowed: Kun tilladte
+      pending_review: Afventer revision
+      preview_card_providers:
+        allowed: Links fra denne udgiver kan trende
+        description_html: Disse er domæner, hvorfra links ofte deles på serveren. Links vil ikke trende offentligt, medmindre man har godkendt domænet for linket. Godkendelse/afvisning indbefatter underdomæner.
+        rejected: Links fra denne udgiver vil ikke trende
+        title: Udgivere
+      rejected: Afvist
+      statuses:
+        allow: Tillad indlæg
+        allow_account: Tillad forfatter
+        description_html: Disse er indlæg, serveren kender til, som pt. deles og favoritmarkeres meget. Det kan hjælpe nye og tilbagevendende brugere til at finde flere personer at følge. Ingen indlæg vises offentligt, før man godkender forfatteren, samt denne tillader sin konto at blive foreslået andre. Man kan også tillade/afvise individuelle indlæg.
+        disallow: Tillad ikke indlæg
+        disallow_account: Tillad ikke forfatter
+        no_status_selected: Intet tendensindlæg ændret (da intet var valgt)
+        not_discoverable: Forfatteren har ikke valgt at kunne findes
+        shared_by:
+          one: Delt eller favoritmarkeret én gang
+          other: Delt eller favoritmarkeret %{friendly_count} gange
+        title: Populære opslag
+      tags:
+        current_score: Aktuel score %{score}
+        dashboard:
+          tag_accounts_measure: unikke anvendelser
+          tag_languages_dimension: Topsprog
+          tag_servers_dimension: Topservere
+          tag_servers_measure: forskellige servere
+          tag_uses_measure: anvendelser i alt
+        description_html: Disse er hashtags, som pt. vises i en masse indlæg, som serveren ser. Det kan hjælpe brugerne til at finde ud af, hvad folk taler mest om pt. Ingen hashtags vises offentligt, før man godkender dem.
+        listable: Kan foreslås
+        no_tag_selected: Intet tag ændret (da intet var valgt)
+        not_listable: Foreslås ikke
+        not_trendable: Vises ikke under tendenser
+        not_usable: Kan ikke anvendes
+        peaked_on_and_decaying: Toppede pr. %{date}, nu for nedadgående
+        title: Populære hashtags
+        trendable: Kan vises under tendenser
+        trending_rank: 'Populær #%{rank}'
+        usable: Kan anvendes
+        usage_comparison: Anvendt %{today} gange i dag, sammenlignet med %{yesterday} i går
+        used_by_over_week:
+          one: Brugt af én person den seneste uge
+          other: Brugt af %{count} personer den seneste uge
+      title: Trends
+      trending: Populære
     warning_presets:
       add_new: Tilføj ny
       delete: Slet
       edit_preset: Redigér advarselsforvalg
       empty: Ingen advarselsforvalg defineret endnu.
       title: Håndtérr advarselsforvalg
+    webhooks:
+      add_new: Tilføj endepunkt
+      delete: Slet
+      description_html: En <strong>webhook</strong> lader Mastodon pushe <strong>notifikationer i realtid</strong> om valgte begivenheder til ens egen applikation, så denne <strong>automatisk kan udløse reaktioner</strong>.
+      disable: Deaktivér
+      disabled: Deaktiveret
+      edit: Redigér endepunkt
+      empty: Der er endnu ikke opsat nogen webhook-endepunkter.
+      enable: Aktivér
+      enabled: Aktiv
+      enabled_events:
+        one: 1 aktiv begivenhed
+        other: "%{count} aktive begivenheder"
+      events: Begivenheder
+      new: Ny webhook
+      rotate_secret: Rotér hemmelighed
+      secret: Signeringshemmelighed
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: for sletning af vedkommendes indlæg
+        disable: for frysning af vedkommendes konto
+        mark_statuses_as_sensitive: for at markere deres indlæg som følsomme
+        none: en advarsel
+        sensitive: for markering af vedkommendes konto som sensitiv
+        silence: for begrænsning af vedkommendes konto
+        suspend: for suspendering af vedkommendes konto
+      body: "%{target} appellerer en moderationsbeslutning fra %{action_taken_by} pr. %{date} om at %{type}. Vedkommende skrev:"
+      next_steps: Appellen kan godkendes for at fortryde moderationsbeslutningen eller den ignoreres.
+      subject: "%{username} appellerer en moderationsbeslutning for %{instance}"
     new_pending_account:
       body: Detaljerne for den nye konto fremgår nedenfor. Du kan godkende eller afvise denne ansøgning.
       subject: Ny konto til gennemgang på %{instance} (%{username})
@@ -730,9 +893,17 @@ da:
       body: "%{reporter} har anmeldt %{target}"
       body_remote: Nogen fra %{domain} har anmeldt %{target}
       subject: Ny anmeldelse for %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Hashtagget #%{name} teender i dag, men er ikke tidligere blevet gennemgået. Det vises ikke offentligt, medmindre du tillader det eller blot gemme formularen, som den er, for aldrig at høre om det igen.'
-      subject: Nyt hashtag til gennemsyn på %{instance} (#%{name})
+    new_trends:
+      body: 'Flg. emner kræver revision, inden de kan vises offentligt:'
+      new_trending_links:
+        title: Populære links
+      new_trending_statuses:
+        title: Populære opslag
+      new_trending_tags:
+        no_approved_tags: Der er pt. ingen godkendte populære hashtags.
+        requirements: 'Enhver af disse kandidater vil kunne overgå #%{rank} godkendte populære hastag, der med en score på #%{lowest_tag_score} pt. er %{lowest_tag_name}.'
+        title: Populære hashtags
+      subject: Nye tendenser klar til revision på %{instance}
   aliases:
     add_new: Opret alias
     created_msg: Nyt alias oprettet. Du kan nu påbegynde flytningen fra den gamle konto.
@@ -762,20 +933,17 @@ da:
   applications:
     created: Applikation oprettet
     destroyed: Applikation slettet
-    invalid_url: Den angivne URL er ugyldig
     regenerate_token: Regenerér adgangstoken
     token_regenerated: Adgangstoken regenereret
     warning: Vær meget påpasselig med disse data. Del dem aldrig med nogen!
     your_token: Dit adgangstoken
   auth:
-    apply_for_account: Anmod om en invitation
+    apply_for_account: Anmod om en konto
     change_password: Adgangskode
-    checkbox_agreement_html: Jeg accepterer <a href="%{rules_path}" target="_blank">serverreglerne</a> og <a href="%{terms_path}" target="_blank">tjenestevilkårene</a>
-    checkbox_agreement_without_rules_html: Jeg accepterer <a href="%{terms_path}" target="_blank">tjenestevilkårene</a>
     delete_account: Slet konto
     delete_account_html: Ønsker du at slette din konto, kan du <a href="%{path}">gøre dette hér</a>. Du vil blive bedt om bekræftelse.
     description:
-      prefix_invited_by_user: "@%{name} inviterer dig til at deltage på denne Mastodon-server!"
+      prefix_invited_by_user: "@%{name} inviterer dig ind på denne Mastodon-server!"
       prefix_sign_up: Tilmeld dig Mastodon i dag!
       suffix: Du vil med en konto kunne følge personer, indsende opdateringer og udveksle beskeder med brugere fra enhver Mastodon-server, og meget mere!
     didnt_get_confirmation: Ikke modtaget nogle bekræftelsesinstruktioner?
@@ -784,11 +952,13 @@ da:
     invalid_reset_password_token: Adgangskodenulstillingstoken ugyldigt eller udløbet. Anmod om et nyt.
     link_to_otp: Angiv en tofaktorkode fra din mobil, eller en gendannelseskode
     link_to_webauth: Brug din sikkerhedsnøgleenhed
+    log_in_with: Log ind med
     login: Log ind
     logout: Log ud
     migrate_account: Flyt til en anden konto
     migrate_account_html: Ønsker du at omdirigere denne konto til en anden, kan du <a href="%{path}">opsætte dette hér</a>.
     or_log_in_with: Eller log ind med
+    privacy_policy_agreement_html: Jeg accepterer <a href="%{privacy_policy_path}" target="_blank">Fortrolighedspolitikken</a>
     providers:
       cas: CAS
       saml: SAML
@@ -796,20 +966,29 @@ da:
     registration_closed: "%{instance} accepterer ikke nye medlemmer"
     resend_confirmation: Gensend bekræftelsesinstruktioner
     reset_password: Nulstil adgangskode
+    rules:
+      preamble: Disse er opsat og håndhæves af %{domain}-moderatorerne.
+      title: Nogle grundregler.
     security: Sikkerhed
     set_new_password: Opsæt ny adgangskode
     setup:
       email_below_hint_html: Er nedenstående e-mailadresse forkert, kan du rette den hér og modtage en ny bekræftelses-e-mail.
       email_settings_hint_html: Bekræftelsese-mailen er sendt til %{email}. Er denne e-mailadresse forkert, kan du rette den via kontoindstillingerne.
       title: Opsætning
+    sign_in:
+      preamble_html: Log ind med dine <strong>%{domain}</strong>-legitimationsoplysninger. Hostes kontoen på en anden server, vil der ikke kunne logges ind her.
+      title: Log ind på %{domain}
+    sign_up:
+      preamble: Med en konto på denne Mastodon-server vil man kunne følge enhver anden person på netværket, uanset hvor vedkommendes konto hostes.
+      title: Lad os få dig sat op på %{domain}.
     status:
       account_status: Kontostatus
       confirming: Afventer færdiggørelse af e-mailbekræftelse.
-      functional: Din konto er fuldt operationel.
+      functional: Din konto er fuldt funktionel.
       pending: Din ansøgning afventer gennemgang af vores medarbejdere. Dette kan tage noget tid. Du modtager en e-mail, hvis din ansøgning godkendes.
       redirecting_to: Din konto er inaktiv, da den pt. er omdirigerer til %{acct}.
+      view_strikes: Se tidligere anmeldelser af din konto
     too_fast: Formularen indsendt for hurtigt, forsøg igen.
-    trouble_logging_in: Indlogningsproblemer?
     use_security_key: Brug sikkerhedsnøgle
   authorize_follow:
     already_following: Du følger allerede denne konto
@@ -867,10 +1046,36 @@ da:
       more_details_html: For yderligere oplysningerer, tjek <a href="%{terms_path}">fortrolighedspolitikken</a>.
       username_available: Dit brugernavn vil blive tilgængeligt igen
       username_unavailable: Dit brugernavn vil forblive utilgængeligt
-  directories:
-    directory: Profilliste
-    explanation: Find brugere baseret på deres interesser
-    explore_mastodon: Uforsk %{title}
+  disputes:
+    strikes:
+      action_taken: Handling foretaget
+      appeal: Appel
+      appeal_approved: Kontoanmeldelsen er blevet appelleret og er ikke længere gyldig
+      appeal_rejected: Appellen er afvist
+      appeal_submitted_at: Appel indgivet
+      appealed_msg: Din appel er indgivet. Godkendes den, underrettes du.
+      appeals:
+        submit: Indgiv appel
+      approve_appeal: Godkend appel
+      associated_report: Tilknyttet anmeldelse
+      created_at: Dateret
+      description_html: Disse er implementerede handlinger for din konto, samt advarsler tilsendt dig af %{instance}-personalet.
+      recipient: Adresseret til
+      reject_appeal: Afvis appel
+      status: 'Indlæg #%{id}'
+      status_removed: Indlæg allerede fjernet fra system
+      title: "%{action} pr. %{date}"
+      title_actions:
+        delete_statuses: Indlægsfjernelse
+        disable: Kontofrysning
+        mark_statuses_as_sensitive: Markering af indlæg som følsomme
+        none: Advarsel
+        sensitive: Markering af konto som følsom
+        silence: Kontobegrænsning
+        suspend: Kontosuspendering
+      your_appeal_approved: Din appel er godkendt
+      your_appeal_pending: Du har indgivet en appel
+      your_appeal_rejected: Din appel er afvist
   domain_validator:
     invalid_domain: er ikke et gyldigt domænenavn
   errors:
@@ -919,56 +1124,69 @@ da:
       public: Offentlig tidslinje
       thread: Konversationer
     edit:
+      add_keyword: Tilføj nøgleord
+      keywords: Nøgleord
+      statuses: Individuelle indlæg
+      statuses_hint_html: Dette filter gælder for udvalgte, individuelle indlæg, uanset om de matcher nøgleordene nedenfor. <a href="%{path}">Gennemgå eller fjern indlæg fra filteret</a>.
       title: Redigere filter
     errors:
+      deprecated_api_multiple_keywords: Disse parametre kan ikke ændres fra denne applikation, da de gælder for flere end ét filternøgleord. Brug en nyere applikation eller webgrænsefladen.
       invalid_context: Ingen eller ugyldig kontekst angivet
-      invalid_irreversible: Uigenkaldelig filtrering virker kun med hjemme- eller notifikationskontekster
     index:
+      contexts: Filtre i %{contexts}
       delete: Slet
       empty: Du har ingen filtre.
+      expires_in: Udløber om %{distance}
+      expires_on: Udløber om %{date}
+      keywords:
+        one: "%{count} nøgleord"
+        other: "%{count} nøgleord"
+      statuses:
+        one: "%{count} indlæg"
+        other: "%{count} indlæg"
+      statuses_long:
+        one: "%{count} individuelt indlæg skjult"
+        other: "%{count} individuelle indlæg skjult"
       title: Filtre
     new:
+      save: Gem nye filter
       title: Tilføj nyt filter
+    statuses:
+      back_to_filter: Returnér til filter
+      batch:
+        remove: Fjern fra filter
+      index:
+        hint: Dette filter gælder for udvalgte, individuelle indlæg uanset andre kriterier. Flere indlæg kan føjes til filteret via webfladen.
+        title: Filtrerede indlæg
   footer:
-    developers: Udviklere
-    more: Mere…
-    resources: Ressourcer
     trending_now: Trender lige nu
   generic:
     all: Alle
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> emne på denne side er valgt."
+      other: Alle <strong>%{count}</strong> emner på denne side er valgt.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> emne, der matchede søgningen, er valgt."
+      other: Alle <strong>%{count}</strong> emner, som matchede søgningen, er valgt.
     changes_saved_msg: Ændringerne er gemt!
     copy: Kopier
     delete: Slet
-    no_batch_actions_available: Ingen multihandlinger tilgængelige på denne side
+    deselect: Afmarkér alle
+    none: Intet
     order_by: Sortér efter
     save_changes: Gem ændringer
+    select_all_matching_items:
+      one: Vælg %{count} emne, der matchede søgningen.
+      other: Vælg alle %{count} emner, som matchede søgningen.
+    today: i dag
     validation_errors:
       one: Noget er ikke er helt i vinkel! Tjek fejlen nedenfor
       other: Noget er ikke er helt i vinkel! Tjek de %{count} fejl nedenfor
   html_validator:
     invalid_markup: 'indeholder ugyldig HTML-markup: %{error}'
-  identity_proofs:
-    active: Aktiv
-    authorize: Ja, godkend
-    authorize_connection_prompt: Godkend denne kryptografiske forbindelse?
-    errors:
-      failed: Den kryptografiske forbindelse mislykkedes. Prøv igen fra %{provider}.
-      keybase:
-        invalid_token: Keybase-tokens er hashes af signaturer og skal udgøre 66 hex tegn
-        verification_failed: Keybase genkender ikke dette token som Keybasebruger %{kb_username}s signatur. Forsøg igen fra Keybase.
-      wrong_user: Kan ikke oprette et bevis til %{proving}, når indlogget %{current}. Log ind som %{proving} og forsøg igen.
-    explanation_html: Her kan du kryptografisk forbinde dine andre identiteter fra andre platforme, såsom Keybase. Dette lader andre personer sende dig krypterede beskeder på disse platforme og giver dem mulighed for at stole på, at det indhold, du sender dem, kommer fra dig.
-    i_am_html: Jeg er %{username} på %{service}.
-    identity: Identitet
-    inactive: Inaktiv
-    publicize_checkbox: 'Og toot dette:'
-    publicize_toot: 'Det er bevist! Jeg er %{username} på %{service}: %{url}'
-    remove: Fjern bevis fra konto
-    removed: Bevis fjernet fra kontoen
-    status: Verifikationsstatus
-    view_proof: Se bevis
   imports:
     errors:
+      invalid_csv_file: 'Ugyldig CSV-fil. Fejl: %{error}'
       over_rows_processing_limit: indeholder mere end %{count} rækker
     modes:
       merge: Sammenflet
@@ -984,7 +1202,6 @@ da:
       following: Følgningsliste
       muting: Tavsgørelsesliste
     upload: Upload
-  in_memoriam_html: Til minde om.
   invites:
     delete: Deaktivér
     expired: Udløbet
@@ -1058,26 +1275,22 @@ da:
       other_data: Ingen øvrige data flyttes automatisk
       redirect: Din nuværende kontoprofil opdateres med en omdirigeringsnotits og ekskluderes fra søgninger
   moderation:
-    title: Moderatering
+    title: Moderation
   move_handler:
     carry_blocks_over_text: Denne bruger er flyttet fra %{acct}, som du har haft blokeret.
     carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft tavsgjort.
-    copy_account_note_text: 'Denne bruger er flyttet fra %{acct}, her er dine tidligere noter om dem:'
+    copy_account_note_text: 'Denne bruger er flyttet fra %{acct}, hvor dine tidligere noter om dem var:'
+  navigation:
+    toggle_menu: Åbn/luk menu
   notification_mailer:
-    digest:
-      action: Se alle notifikationer
-      body: Her er et kort resumé af de beskeder, du er gået glip af siden dit seneste besøg d. %{since}
-      mention: "%{name} nævnte dig i:"
-      new_followers_summary:
-        one: Du har også fået en ny følger, mens du var væk! Sådan!
-        other: Du har også fået %{count} nye følgere, mens du var væk! Sådan!
-      subject:
-        one: "1 ny notifikation siden dit senest besøg \U0001F418"
-        other: "%{count} nye notifikationer siden dit senest besøg \U0001F418"
-      title: Mens du var væk...
+    admin:
+      report:
+        subject: "%{name} indsendte en anmeldelse"
+      sign_up:
+        subject: "%{name} tilmeldte sig"
     favourite:
-      body: 'Dit indlæg blev favoriseret af %{name}:'
-      subject: "%{name} favoriserede dit indlæg"
+      body: "%{name} favoritmarkerede dit indlæg:"
+      subject: "%{name} favoritmarkerede dit indlæg"
       title: Ny favorit
     follow:
       body: "%{name} følger dig nu!"
@@ -1101,9 +1314,11 @@ da:
       title: Nyt boost
     status:
       subject: "%{name} har netop postet"
+    update:
+      subject: "%{name} redigerede et indlæg"
   notifications:
     email_events: Begivenheder for e-mailnotifikationer
-    email_events_hint: 'Vælg begivenheder, som notifikationer skal modtages for:'
+    email_events_hint: 'Vælg begivenheder, for hvilke notifikationer skal modtages:'
     other_settings: Andre notifikationsindstillinger
   number:
     human:
@@ -1116,12 +1331,12 @@ da:
           thousand: T
           trillion: tri.
   otp_authentication:
-    code_hint: Angiv koden genereret af din godkendelses-app for at bekræfte
-    description_html: Aktiverer du <strong>tofaktorgodkendelse</strong> vha. af en godkendelses-app, vil du skulle benytte din mobil, der genererer det token, der skal angives ved indlogning.
+    code_hint: Angiv koden genereret af godkendelses-appen for at bekræfte
+    description_html: Aktiveres <strong>tofaktorgodkendelse</strong> vha. af en godkendelses-app, vil man skulle benytte sin mobil, der genererer det token, der skal angives ved indlogning.
     enable: Aktivér
-    instructions_html: "<strong>Skan denne QR-kode i Google Autehnticator eller en lign. TOTP-app på din mobil</strong>. Fra nu af, vil appen generere tokens, som vil skulle angives ifm. indlogning."
-    manual_instructions: 'Kan QR-koden ikke skannes, så du er nødt til manuelt at angive den, er her en simplel tekst-hemmelighed:'
-    setup: Sæt op
+    instructions_html: "<strong>Skan denne QR-kode i Google Autehnticator eller en lign. TOTP-app på mobilen</strong>. Fremadrettet vil appen generere de tokens, som vil skulle angives ifm. indlogning."
+    manual_instructions: 'Kan QR-koden ikke skannes, så man er nødt til manuelt at angive den, er her en simplel tekst-hemmelighed:'
+    setup: Opsæt
     wrong_code: Den angivne kode er ugyldig! Er server- og enhedsklokkeslæt korrekte?
   pagination:
     newer: Nyere
@@ -1132,18 +1347,20 @@ da:
   polls:
     errors:
       already_voted: Du har allerede stemt i denne afstemning
-      duplicate_options: indeholder dubletelementer
-      duration_too_long: er for langt ude i fremtiden
-      duration_too_short: er for tidligt
-      expired: Denne afstemning er allerede afsluttet
-      invalid_choice: Den valgte afstemningsmulighed findes ikke
+      duplicate_options: indeholder dubletvalg
+      duration_too_long: er for lang en varighed
+      duration_too_short: er for kort en varighed
+      expired: Afstemningen er allerede afsluttet
+      invalid_choice: Den valgte stemmemulighed findes ikke
       over_character_limit: må maks. udgøre %{max} tegn hver
-      too_few_options: skal have flere end ét element
-      too_many_options: må maks. indeholde %{max} elementer
+      too_few_options: skal have flere end ét valg
+      too_many_options: for mange svar (maks. %{max})
   preferences:
     other: Andet
-    posting_defaults: Indlægsstandarder
+    posting_defaults: Standarder for indlæg
     public_timelines: Offentlige tidslinjer
+  privacy_policy:
+    title: Fortrolighedspolitik
   reactions:
     errors:
       limit_reached: Grænse for forskellige reaktioner nået
@@ -1166,32 +1383,25 @@ da:
     remove_selected_follows: Følg ikke længere valgte brugere
     status: Kontostatus
   remote_follow:
-    acct: Angiv dit brugernavn@domæne du vil agere fra
-    missing_resource: Nødvendige omdirigerings-URL til din konto ikke fundet
-    no_account_html: Har ingen konto? Du kan <a href='%{sign_up_path}' target='_blank'>oprette en hér</a>
-    proceed: Fortsæt for at følge
-    prompt: 'Du er ved at følge:'
-    reason_html: "<strong>Hvorfor er dette skridt nødvendigt?</strong> <code>%{instance}</code> er måske ikke den server, hvor du er registreret, så du skal først omdirigeres til din hjemmeserver."
-  remote_interaction:
-    favourite:
-      proceed: Fortsæt for at føje til favorit
-      prompt: 'Gør dette indlæg til favorit:'
-    reblog:
-      proceed: Fortsæt for at booste
-      prompt: 'Du ønsker at booste dette indlæg:'
-    reply:
-      proceed: Fortsæt for at besvare
-      prompt: 'Du ønsker at besvare dette indlæg:'
+    missing_resource: Nødvendige omdirigerings-URL til kontoen ikke fundet
+  reports:
+    errors:
+      invalid_rules: refererer ikke til gyldige regler
+  rss:
+    content_warning: 'Indholdsadvarsel:'
+    descriptions:
+      account: Offentlige indlæg fra @%{acct}
+      tag: 'Offentlige indlæg tagget #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Du har nået dagsgrænsen på %{limit} planlagte indlæg
-    over_total_limit: Du har nået grænsen på %{limit} planlagte indlæg
+    over_daily_limit: Den daglige grænse på %{limit} planlagte indlæg er nået
+    over_total_limit: Grænsen på %{limit} planlagte indlæg er nået
     too_soon: Den planlagte dato skal være i fremtiden
   sessions:
     activity: Seneste aktivitet
     browser: Browser
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1202,19 +1412,19 @@ da:
       nokia: Nokia S40 Ovi Browser
       opera: Opera
       otter: Otter
-      phantom_js: FantomJS
+      phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCbrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Aktuelle session
     description: "%{browser} på %{platform}"
-    explanation: Disse er de webbrowsere, som pt. er pålogget din Mastodon-konto.
+    explanation: Disse webbrowsere er pt. logget ind på din Mastodon-konto.
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1227,28 +1437,28 @@ da:
     revoke: Tilbagekald
     revoke_success: Session tilbagekaldt
     title: Sessioner
-    view_authentication_history: Vis godkendelseshistorik for din konto
+    view_authentication_history: Vis godkendelseshistorik for kontoen
   settings:
     account: Konto
     account_settings: Kontoindstillinger
     aliases: Kontoaliaser
     appearance: Udseende
     authorized_apps: Godkendte apps
-    back: Tilbage til Mastodon
+    back: Retur til Mastodon
     delete: Kontosletning
     development: Udvikling
     edit_profile: Redigér profil
     export: Dataeksport
-    featured_tags: Fremhævede hashtags
-    identity_proofs: Identitetsbeviser
+    featured_tags: Udvalgte hashtags
     import: Import
-    import_and_export: Importér og eksportér
+    import_and_export: Import og eksport
     migrate: Kontomigrering
     notifications: Notifikationer
     preferences: Præferencer
     profile: Profil
     relationships: Følger og følgere
-    statuses_cleanup: Automatiseret indlægssletning
+    statuses_cleanup: Auto-indlægssletning
+    strikes: Moderationsadvarsler
     two_factor_authentication: Tofaktorgodkendelse
     webauthn_authentication: Sikkerhedsnøgler
   statuses:
@@ -1265,18 +1475,19 @@ da:
         other: "%{count} videoer"
     boosted_from_html: Boostet fra %{acct_link}
     content_warning: 'Indholdsadvarsel: %{warning}'
+    default_language: Samme som UI-sproget
     disallowed_hashtags:
       one: 'indeholdte et ikke tilladt hashtag: %{tags}'
       other: 'indeholdte de ikke tilladte hashtags: %{tags}'
+    edited_at_html: Redigeret %{date}
     errors:
-      in_reply_not_found: Indlægget, du forsøger at besvare, ser ikke ud til at findes.
-    language_detection: Detektér sprog automatisk
-    open_in_web: Åbn i browser
-    over_character_limit: grænsen på %{max} tegn er nået
+      in_reply_not_found: Indlægget, der forsøges besvaret, ser ikke ud til at eksistere.
+    open_in_web: Åbn i webbrowser
+    over_character_limit: grænsen på %{max} tegn overskredet
     pin_errors:
-      limit: Du har allerede fastgjort det maksimale antal indlæg
+      direct: Indlæg, som kun kan ses af nævnte brugere, kan ikke fastgøres
+      limit: Maksimalt antal indlæg allerede fastgjort
       ownership: Andres indlæg kan ikke fastgøres
-      private: Ikke-offentlige indlæg kan ikke fastgjøres
       reblog: Et boost kan ikke fastgøres
     poll:
       total_people:
@@ -1297,60 +1508,62 @@ da:
       private: Kun følgere
       private_long: Vis kun til følgere
       public: Offentlig
-      public_long: Alle kan se
+      public_long: Kan ses af alle
       unlisted: Ulistet
-      unlisted_long: Alle kan se, men er ikke listet på offentlige tidslinjer
+      unlisted_long: Kan ses af alle, men listes på offentlige tidslinjer
   statuses_cleanup:
     enabled: Slet automatisk gamle indlæg
     enabled_hint: Sletter automatisk dine indlæg, når disse når en bestemt alder, medmindre de matcher en af undtagelserne nedenfor
     exceptions: Undtagelser
-    explanation: Sletning af indlæg er en ressourcekrævende operation, hvorfor dette sker gradvist over tid, når serveren ellers ikke er optaget. Dine indlæg kan derfor blive slettet nogen tid efter, at de har passeret aldersgrænsen.
+    explanation: Sletning af indlæg er en ressourcekrævende operation, hvorfor dette sker gradvist over tid, når serveren ellers ikke er optaget. Indlæg kan derfor blive slettet efter, at de reelt har passeret aldersgrænsen.
     ignore_favs: Ignorér favoritter
     ignore_reblogs: Ignorér boosts
     interaction_exceptions: Undtagelser baseret på interaktioner
-    interaction_exceptions_explanation: Bemærk, at der ikke er nogen garanti for at indlæg slettes, hvis de går under favorit- eller boost-tærsklerne efter at have været gået over dem.
+    interaction_exceptions_explanation: Bemærk, at det ikke garanteres, at indlæg slettes, hvis de når under favorit- eller boost-tærsklerne efter én gang at været nået over dem.
     keep_direct: Behold direkte besked
-    keep_direct_hint: Slet ingen af dine direkte beskeder
+    keep_direct_hint: Sletter ingen af dine direkte beskeder
     keep_media: Behold indlæg med medievedhæftninger
     keep_media_hint: Sletter ingen af dine indlæg med medievedhæftninger
     keep_pinned: Behold fastgjorte indlæg
     keep_pinned_hint: Sletter ingen af dine fastgjorte indlæg
     keep_polls: Behold afstemninger
     keep_polls_hint: Sletter ingen af dine afstemninger
-    keep_self_bookmark: Behold dine bogmærker
+    keep_self_bookmark: Behold bogmærkede indlæg
     keep_self_bookmark_hint: Sletter ikke egne indlæg, såfremt de er bogmærket
-    keep_self_fav: Behold indlæg du har foretrukket
-    keep_self_fav_hint: Sletter ikke egne indlæg, såfremt de er foretrukket
+    keep_self_fav: Behold favoritmarkerede indlæg
+    keep_self_fav_hint: Sletter ikke egne indlæg, såfremt de er favoritmarkeret
     min_age:
       '1209600': 2 uger
       '15778476': 6 måneder
       '2629746': 1 måned
       '31556952': 1 år
       '5259492': 2 måneder
+      '604800': 1 uge
       '63113904': 2 år
       '7889238': 3 måneder
     min_age_label: Alderstærskel
-    min_favs: Behold indlæg foretrukket mere end
-    min_favs_hint: Sletter ingen af dine indlæg, som har modtaget flere end dette antal favoriseringer. Lad stå tomt for at slette indlæg uanset favoriseringsantal
-    min_reblogs: Behold indlæg boostet flere end
-    min_reblogs_hint: Sletter ingen af dine indlæg, som er blevet boostet flere end dette antal gange. Lad stå tomt for at slette indlæg uanset deres boosts-antal
+    min_favs: Behold indlæg favoritmarkeret mindst
+    min_favs_hint: Sletter ingen egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tomt for at ignorere denne tærskel under sletning
+    min_reblogs: Behold indlæg boostet mindst
+    min_reblogs_hint: Sletter ingen egne indlæg, som er boostet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
   stream_entries:
     pinned: Fastgjort indlæg
     reblogged: boostet
     sensitive_content: Sensitivt indhold
+  strikes:
+    errors:
+      too_late: Det er for sent at appellere denne advarsel
   tags:
     does_not_match_previous_name: matcher ikke det foregående navn
-  terms:
-    body_html: "<p><h2>Fortrolighedspolitik</h2> \n<h3 id=\"collect\">Hvilke oplysninger indsamler vi?</h3> \n\n<ul>\n  <li><em>Grundlæggende kontooplysninger</em>: Opretter du dig på denne server, kan du blive bedt om at angive brugernavn, e-mailadresse og adgangskode. Du kan også angive yderligere profiloplysninger, såsom visningsnavn og biografi, og uploade et profil- og overskriftsbillede. Brugernavn, visningsnavn, biografi, profil- og overskriftsbilleder vises altid offentligt.</li> \n  <li> <em>Indlæg, følgning og andre offentlige oplysninger</em>: Listen over personer, du følger, er offentligt tilgængelig, det samme gælder dine følgere. Når du sender en besked, gemmes dato og klokkeslæt såvel som det program, du sendte beskeden fra. Beskeder kan indeholde medievedhæftninger, såsom billeder og videoer. Offentlige og ulistede indlæg er offentligt tilgængelige. Når du fremhæver et indlæg på din profil, er det også offentligt tilgængelig information. Dine indlæg leveres til dine tilhængere, i nogle tilfælde betyder det, at de leveres til forskellige servere, hvor kopier gemmes. Når du sletter indlæg, leveres det også til dine følgere. Genbloggingshandlinger eller favorisering af et andet indlæg sker altid offentligt.</li>\n  <li><em>Direkte og kun følgere-indlæg</em>: Alle indlæg gemmes og behandles på serveren. Kun følgere-indlæg leveres til dine følgere og brugere, som er nævnt i disse, og direkte indlæg leveres kun til brugere nævnt heri. I visse tilfælde betyder dette, at de leveres til forskellige servere, hvor der gemmes kopier. Vi gør en bedste-evne indsats for at begrænse adgangen til disse indlæg til kun godkendte personer, men andre servere kan undlade dette tiltag. Det er derfor vigtigt at gennemgå de servere, dine følgere tilhører. Du kan skifte en valgmulighed for at godkende og afvise nye følgere manuelt i indstillingerne.<em>Husk dog på, at operatørerne af serveren og enhver modtagende server vil kunne se sådanne meddelelser</em>, og at modtagere vil kunne tage skærmfotos, kopiere eller på anden vis deler disse igen.<em> Del ingen sensitive mv. oplysninger over Mastodon.</em> </li>\n  <li> <em>IP'er og andre metadata</em>: Når du logger ind, registrerer vi den IP-adresse, du logger ind fra, samt navnet på din browser-applikation. Du vil have alle indloggede sessioner tilgængelige for gennemgang og tilbagekaldelse via indstillingerne. Den senest anvendte IP-adresse gemmes i op til 12 måneder. Vi kan også beholde serverlogfiler indeholdende IP-adressen for hver forespørgsel til vores server.</li>\n</ul>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"use\">Hvad bruger vi dine oplysninger til?</h3>\n\n<p>Enhver oplysning, vi indsamler fra dig, kan blive brugt på flg. måder: </p>\n\n<ul>\n  <li>Til at levere Mastodons kernfunktionalitet. Du kan kun interagere med andres indhold og indsende dit eget, når du er logget ind. Du kan f.eks. følge andre personer for at se deres kombinerede indlæg på din egen personlige tidslinje.</li>\n  <li>Som hjælp til moderering af fællesskabet, f.eks. sammenligning af din IP-adresse med andre kendte, for at bestemme udelukkelsesomgåelse eller andre overtrædelser.</li>\n  <li>Den af dig angivne e-mailadresse kan bruges til at sende dig oplysninger, notifikationer om andre personer, som interagerer med dit indhold eller sender dig beskeder samt til at svare på henvendelser og/eller andre forespørgsler eller spørgsmål. </li>\n</ul>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"protect\">Hvordan beskytter vi dine oplysninger?</h3>\n\n<p>Vi implementerer en række sikkerhedsforanstaltninger for at sikre dine personlige oplysninger, når du angiver, indsender eller tilgår dine personlige oplysninger. Bl.a. sikres din browsersession samt trafikken mellem dine applikationer og API'en med SSL, og din adgangskode er hashed vha. en stærk envejsalgoritme. Du kan aktivere tofaktorgodkendelse for yderligere at adgangssikre din konto.</p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"data-retention\">Hvad er vores datalagringspolitik?</h3>\n\n<p>Vi vil efter bedste oprigtige evne gøre en indsats for at: </p>\n\n<ul>\n  <li>Beholde/lagre serverlogfiler indeholdende IP-adressen på alle forespørgsler til denne server, for så vidt at sådanne logfiler ikke opbevares/lagres længere end 90 dage.</li>\n  <li>Beholde/lagre IP-adresser forbundet med registrerede brugere i maksimalt 12 måneder.</li>\n</ul>\n\n<p>Du kan anmode om og downloade et arkiv af dit indhold, herunder dine indlæg, medievedhæftninger samt profil- og headerbilleder </p>\n\n<p>Du kan til enhver tid slette din konto permanent.</p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"cookies\">Bruger vi cookies?</h3>\n\n<p>Ja. Cookies er små filer, som et websted eller dets tjenesteudbyder overfører til din computers lagerplads via din webbrowser (hvis du tillader det). Disse cookies gør det muligt for webstedet at genkende din browser og, hvis du har en registreret konto, associerer den med din registrerede konto.</p>\n\n<p>Vi bruger cookies til at forstå og gemme dine præferencer for fremtidige besøg.</p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"disclose\">Afslører vi nogle oplysninger til eksterne parter?</h3>\n\n<p>Vi hverken sælger, handler/bytter eller på anden måde overfører dine personlige identificerbare oplysninger til eksterne parter. Herfra undtaget er dog betroede tredjeparter, som hjælper os med at drive vores websted, drive vores forretning eller servicere dig, så længe parterne accepterer at holde disse oplysninger fortrolige. Vi kan også vælge at frigive dine oplysninger, såfremt vi mener, at frigivelsen er hensigtsmæssig ift. at overholde loven, håndhæve vores webstedspolitikker eller beskytte vores/andres rettigheder, ejendom eller sikkerhed.</p>\n\n<p>Dit offentlige indhold kan blive downloades af andre servere i netværket. Dine offentlige og kun-følgere indlæg leveres til de servere, hvor dine tilhængere er hjemhørende, og direkte beskeder leveres til modtagerens servere, for så vidt som disse følgere/modtagere ikke er hjemhørende på denne server.</p>\n\n<p>Når du godkender en applikation til at bruge din konto, afhængt af tilladelsesomfanget, godkender du, at det kan tilgå dine offentlige profiloplysninger, din liste over dem, du følger, dine følgere, dine lister, alle dine indlæg og dine favoritter. Applikationer kan aldrig tilgå din e-mailadresse eller adgangskode.</p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"children\">Børns brug af webstedet</h3>\n\n<p>Hvis denne server er i EU eller EØS: Vores websted, produkter og tjenester er alle er alle beregnet på personer, som er fyldt 16 år. Er du ike fyldt 16 år, så benyt ikke dette websted jf. kravene i GDPR, (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">Generel Databeskyttelsesforordning</a>).</p>\n\n<p>Hvis denne server er i USA: Vores websted, produkter og tjenester er alle rettet mod personer, som er fyldt 13 år. Er du ikke fyldt 13 år, så benyt ikke dette websted jf. kravene i COPPA, (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Børns online fortrolighedsbeskyttelsesslov</a>).</p>\n\n<p>Lovkrav kan afvige, hvis denne server befinder sig i et andet retsområde.</p>\n\n<hr class = \"spacer\" />\n\n<h3 id=\"changes\">Ændringer i vores fortrolighedspolitik</h3>\n\n<p>Beslutter vi os for at ændre vores fortrolighedspolitik, vil disse ændringer fremgå på denne side.</p>\n\n<p>Dette dokument er CC-BY-SA, og det blev senest opdateret 7. marts 2018.</p>\n\n<p> Oprindelig tilpasset fra <a href=\"https://github.com/discourse/discourse\"> Discourse' Fortrolighedspolitik</a>.</p>\n"
-    title: Tjenestevilkår og Fortrolighedspolitik for %{instance}
   themes:
     contrast: Mastodon (høj kontrast)
     default: Mastodont (mørkt)
     mastodon-light: Mastodon (lyst)
   time:
     formats:
-      default: "%b %d, %Y, %H:%M"
+      default: "%a %d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Tilføj
     disable: Deaktivér 2FA
@@ -1358,74 +1571,84 @@ da:
     edit: Redigér
     enabled: Tofaktorgodkendelse aktiveret
     enabled_success: Tofaktorgodkendelse aktiveret
-    generate_recovery_codes: Generér gendannelseskoder
-    lost_recovery_codes: Gendannelseskoder lader dig opnå adgang til din konto, hvis du mister din mobil. Har du mistet dine gendannelseskoder, kan du regenerere dem her. Dine gamle gendannelseskoder ugyldiggøres.
+    generate_recovery_codes: Generere gendannelseskoder
+    lost_recovery_codes: Gendannelseskoder muliggør adgang til din konto, hvis du mister din mobil. Ved mistet gendannelseskoder, kan disse regenerere her. Dine gamle gendannelseskoder ugyldiggøres.
     methods: Tofaktormetoder
     otp: Godkendelses-app
-    recovery_codes: Sikkerhedskopiér koder
+    recovery_codes: Sikkerhedskopieret gendannelseskoder
     recovery_codes_regenerated: Gendannelseskoder er regenereret
-    recovery_instructions_html: Mister du nogensinde adgang til din mobil, kan du bruge en af gendannelseskoderne nedenfor til at opnå adgang til din konto. <strong>Opbevar gendannelseskoderne et sikkert sted</strong>. Du kan f.eks. udskrive dem, og gemme dem sammen med andre vigtige dokumenter.
+    recovery_instructions_html: Mister du nogensinde adgang til din mobil, kan en af gendannelseskoderne nedenfor bruges til at opnå adgang til din konto. <strong>Opbevar disse et sikkert sted</strong>. De kan f.eks. udskrives og gemmes sammen med andre vigtige dokumenter.
     webauthn: Sikkerhedsnøgler
   user_mailer:
+    appeal_approved:
+      action: Gå til din konto
+      explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet godkendt. Din kontostatus er igen god.
+      subject: Din appel pr. %{date} er godkendt
+      title: Appel godkendt
+    appeal_rejected:
+      explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet afvist.
+      subject: Din appel pr. %{date} er afvist
+      title: Appel afvist
     backup_ready:
       explanation: Den anmodede fulde sikkerhedskopi af din Mastodon-konto er nu klar til download!
       subject: Dit arkiv er klar til download
-      title: Arkiv-takeout
-    sign_in_token:
-      details: 'Her er detaljer om forsøget:'
-      explanation: 'Der er registreret et forsøg på at logge ind på din konto fra en ukendt IP-adresse. Er dette er dig, så angiv nedenstående sikkerhedskode på siden med log ind-verifikationssiden:'
-      further_actions: 'Var dette ikke dig, så ændr din adgangskode og aktivér tofaktorgodkendelse på din konto. Du kan gøre dette hér:'
-      subject: Bekræft indlogningsforsøg
-      title: Indlogningsforsøg
+      title: Arkiv download
+    suspicious_sign_in:
+      change_password: skift din adgangskode
+      details: 'Her er nogle detaljer om login-forsøget:'
+      explanation: Indlogning på din konto fra en ny IP-adresse detekteret.
+      further_actions_html: Hvis dette ikke var dig, anbefaler vi, at du %{action} med det samme og aktiverer to-faktor godkendelse for at holde din konto sikker.
+      subject: Din konto er blevet tilgået fra en ny IP-adresse
+      title: Ny indlogning
     warning:
+      appeal: Indgiv appel
+      appeal_description: Mener du, at dette er en fejl, kan der indgives en appel til %{instance}-personalet.
+      categories:
+        spam: Spam
+        violation: Indhold overtræder flg. fællesskabsretningslinjer
       explanation:
-        disable: Du kan ikke længere logge ind på, eller på anden vis bruge, din konto, men din profil og øvrige data forbliver intakte.
-        sensitive: Dine uploadede mediefiler og linkede medier vil blive behandlet som sensitive.
-        silence: Du kan stadig bruge din konto, men kun personer, som allerede følger dig, vil se dine indlæg på denne server, og du kan blive udelukket fra forskellige offentlige lister. Personer vil stadig manuelt kunne følge dig.
-        suspend: Du kan ikke længere bruge din konto, og din profil samt øvrige data kan ikke længere tilgås. Du kan stadig logge ind for at anmode om en sikkerhedskopi af dine data, indtil dataene helt er fjernet. men visse data bevares mhp. at forhindre dig i at omgå udelukkelsen.
-      get_in_touch: Du kan besvare denne e-mail for at komme i kontakt med personalet på %{instance}.
-      review_server_policies: Gennemgå serverpolitikker
-      statuses: 'Specifikt til:'
+        delete_statuses: Nogle af dine indlæg har vist sig at være i strid med en eller flere fællesskabsretningslinjer og er efterfølgende fjernet af %{instance}-moderatorerne.
+        disable: Du kan ikke længere anvende din konto, men profilen og øvrige data er intakte. Du kan anmode om en sikkerhedskopi af dine data, ændre kontoindstillinger eller slette kontoen.
+        mark_statuses_as_sensitive: Nogle af dine indlæg er blevet markeret som sensitive af %{instance}-moderatorerne. Det betyder, at folk er nødt til at trykke på medierne i indlæggene, før en forhåndsvisning vises. Du kan selv markere medier som sensitive i fremtidige indlæg.
+        sensitive: Fra nu af vil alle dine uploadede mediefiler blive markeret som sensitive og skjult bag en klik-igennem advarsel.
+        silence: Din konto kan stadig anvendes, men dine indlæg vil kunne ses af personer, som allerede følger dig på denne server, og du udelukkes muligvis fra forskellige opdagelsesfunktioner. Personer vil stadig kunne følge dig manuelt.
+        suspend: Din konto kan ikke længere anvendes, og hverken profilen eller øvrige data kan tilgås. Du kan stadig logge ind for at anmode om en sikkerhedskopi af dine data, indtil disse om ca. 30 dage vil være slettet. Visse data bevares dog mhp. at forhindre dig i at omgå udelukkelsen.
+      reason: 'Årsag:'
+      statuses: 'Anmeldte indlæg:'
       subject:
+        delete_statuses: Dine indlæg på %{acct} er blevet fjernet
         disable: Din konto %{acct} er blevet frosset
-        none: Advarsel for %{acct}
-        sensitive: Din konto %{acct} opslagsmedie er blevet markeret som sensitivt
+        mark_statuses_as_sensitive: Dine indlæg på %{acct} er blevet markeret som sensitive
+        none: Advarsel til %{acct}
+        sensitive: Dine indlæg på %{acct} markeres fra nu af som sensitive
         silence: Din konto %{acct} er blevet begrænset
         suspend: Din konto %{acct} er blevet suspenderet
       title:
+        delete_statuses: Indlæg fjernet
         disable: Konto frosset
+        mark_statuses_as_sensitive: Indlæg markeret som sensitive
         none: Advarsel
-        sensitive: Dit medie er blevet markeret som sensitivt
+        sensitive: Konto markeret som sensitiv
         silence: Konto begrænset
         suspend: Konto suspenderet
     welcome:
       edit_profile_action: Opsæt profil
-      edit_profile_step: Du kan tilpasse din profil ved at uploade et profilbillede, overskrift, ændre dit visningsnavn mm. Ønsker du at vurdere nye følgere, før de må følge dig, kan du låse din konto.
-      explanation: Her er nogle råd for at få dig igang
+      edit_profile_step: Man kan tilpasse sin profil ved at uploade profilfoto, overskrift, ændre visningsnavn mv. Ønskes nye følgere vurderet, før de må følge dig, kan kontoen låses.
+      explanation: Her er nogle råd for at få dig i gang
       final_action: Begynd at poste
-      final_step: 'Begynd at poste! Selv uden følgere vil dine offentlige beskeder kunne ses af andre f.eks. på den lokale tidslinje og i hashtags. Måske kunne du tænke dig at introducere dig selv på #introductions-hashtagget.'
+      final_step: 'Begynd at poste! Selv uden følgere vil offentlige indlæg kunne ses af andre f.eks. på den lokale tidslinje og i hashtags. Man kan introducere sig selv via hastagget #introductions.'
       full_handle: Dit fulde brugernavn
-      full_handle_hint: Dette er, hvad du vil fortælle dine venner, så de kan sende dig beskeder eller følge dig fra andre server.
-      review_preferences_action: Ændre præferencer
-      review_preferences_step: Vær sikker på at opsætte dine præferencer, såsom hvilke e-mails du kunne tænke dig at modtage, eller hvilket fortrolighedsniveau, der skal være standard for dine opslag. Har du ikke let til køresyge, kan du vælge at aktivere auto-afspilning af GIF'er.
+      full_handle_hint: Dette er, hvad du oplyser til dine venner, så de kan sende dig beskeder eller følge dig fra andre server.
       subject: Velkommen til Mastodon
-      tip_federated_timeline: Den delte tidslinje giver det store overblik over Mastodon-netværket, men det inkluderer kun folk, dine naboer abonnerer på, så det er ikke komplet.
-      tip_following: Du følger som standard din servers admin(s). For at finde flere interessante folk, så tjek den lokale og fælles tidslinje.
-      tip_local_timeline: Den lokale tidslinje er det store overblik over folk på %{instance}. Disse er dine umiddelbare naboer!
-      tip_mobile_webapp: Tilbyder din mobilbrowser at føje Mastodon til din hjemmeskærm, kan du modtage push-notifikationer. Dette fungerer på mange måder ligesom en almindelig app!
-      tips: Tips
       title: Velkommen ombord, %{name}!
   users:
     follow_limit_reached: Du kan maks. følge %{limit} personer
-    generic_access_help_html: Problemer med at tilgå din konto? Du kan kontakte %{email} for hjælp
     invalid_otp_token: Ugyldig tofaktorkode
-    invalid_sign_in_token: Ugyldig sikkerhedskode
     otp_lost_help_html: Har du mistet adgang til begge, kan du kontakte %{email}
     seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
     signed_in_as: 'Logget ind som:'
-    suspicious_sign_in_confirmation: Du lader ikke at have logget ind fra denne enhed før, og du har ikke logget ind i et stykke tid, så der sendes en sikkerhedskode til din e-mailadresse mhp. at bekræfte din identitet.
   verification:
-    explanation_html: 'Du kan <strong>bekræfte dig selv som ejer af linkene i din profilmetadata</strong>. For at gøre det, skal det linkede websted indeholde et link pegende tilbage til din Mastodon-profil. Returlinket <strong>skal</strong> have en <code>rel="mig"</code>-attribut. Linkets tekstindhold betyder ikke noget. Her er et eksempel:'
+    explanation_html: 'Du kan <strong>bekræfte dig selv som ejer af linkene i din profilmetadata</strong>. For at gøre det, skal det linkede websted indeholde et link pegende tilbage til din Mastodon-profil. Returlinket <strong>skal</strong> have en <code>rel="me"</code>-attribut. Linkets tekstindhold betyder ikke noget. Her er et eksempel:'
     verification: Bekræftelse
   webauthn_credentials:
     add: Tilføj ny sikkerhedsnøgle
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 080e44fc0..8dd3e4978 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,154 +1,93 @@
 ---
 de:
   about:
-    about_hashtag_html: Das sind öffentliche Beiträge, die mit <strong>#%{hashtag}</strong> getaggt wurden. Wenn du irgendwo im Fediversum ein Konto besitzt, kannst du mit ihnen interagieren.
-    about_mastodon_html: Mastodon ist ein soziales Netzwerk. Es basiert auf offenen Web-Protokollen und freier, quelloffener Software. Es ist dezentral (so wie E-Mail!).
-    about_this: Über diesen Server
-    active_count_after: aktiv
-    active_footnote: Monatlich Aktive User (MAU)
-    administered_by: 'Betrieben von:'
-    api: API
-    apps: Mobile Apps
-    apps_platforms: Benutze Mastodon auf iOS, Android und anderen Plattformen
-    browse_directory: Durchsuche das Profilverzeichnis und filtere nach Interessen
-    browse_local_posts: Durchsuche einen Live-Stream von öffentlichen Beiträgen von diesem Server
-    browse_public_posts: Stöbere durch öffentliche Beiträge auf Mastodon
-    contact: Kontakt
-    contact_missing: Nicht angegeben
+    about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung, dafür dezentral und mit Anstand! Starte jetzt mit Mastodon!'
+    contact_missing: Nicht festgelegt
     contact_unavailable: Nicht verfügbar
-    discover_users: Benutzer entdecken
-    documentation: Dokumentation
-    federation_hint_html: Mit einem Account auf %{instance} wirst du in der Lage sein Nutzern auf irgendeinem Mastodon-Server und darüber hinaus zu folgen.
-    get_apps: Versuche eine mobile App
     hosted_on: Mastodon, gehostet auf %{domain}
-    instance_actor_flash: |
-      Dieses Konto ist ein virtueller Akteur, der den Server selbst und nicht einen einzelnen Benutzer repräsentiert.
-      Dieser wird für Föderationszwecke verwendet und sollte nicht blockiert werden, es sei denn du möchtest die gesamte Instanz blockieren.
-    learn_more: Mehr erfahren
-    privacy_policy: Datenschutzerklärung
-    rules: Server-Regeln
-    rules_html: 'Unten ist eine Zusammenfassung der Regeln, denen du folgen musst, wenn du ein Konto auf diesem Mastodon-Server haben möchtest:'
-    see_whats_happening: Finde heraus, was gerade in der Welt los ist
-    server_stats: 'Serverstatistiken:'
-    source_code: Quellcode
-    status_count_after:
-      one: Beitrag
-      other: Beiträge
-    status_count_before: mit
-    tagline: Finde deine Freunde und entdecke neue
-    terms: Nutzungsbedingungen
-    unavailable_content: Nicht verfügbarer Inhalt
-    unavailable_content_description:
-      domain: Server
-      reason: 'Grund:'
-      rejecting_media: Mediendateien dieses Servers werden nicht verarbeitet und keine Thumbnails werden angezeigt, was manuelles anklicken auf den anderen Server erfordert.
-      rejecting_media_title: Gefilterte Medien
-      silenced: Beiträge von diesem Server werden nirgends angezeigt, außer in deiner Startseite, wenn du der Person folgst, die den Beitrag verfasst hat.
-      silenced_title: Stummgeschaltete Server
-      suspended: Du kannst niemanden von diesem Server folgen, und keine Daten werden verarbeitet oder gespeichert und keine Daten ausgetauscht.
-      suspended_title: Gesperrte Server
-    unavailable_content_html: Mastodon erlaubt es dir generell, mit Inhalten zu interagieren, diese anzuzeigen und mit anderen Nutzern im Fediversum über Server hinweg zu interagieren. Dies sind die Ausnahmen, die auf diesem bestimmten Server gemacht wurden.
-    user_count_after:
-      one: Profil
-      other: Profile
-    user_count_before: Hostet
-    what_is_mastodon: Was ist Mastodon?
+    title: Über
   accounts:
-    choices_html: "%{name} empfiehlt:"
-    endorsements_hint: Du kannst Personen, denen du über die Weboberfläche folgst, auswählen, und sie werden hier angezeigt.
-    featured_tags_hint: Du kannst spezifische Hashtags, die hier angezeigt werden, angeben.
     follow: Folgen
     followers:
-      one: Folgender
+      one: Follower
       other: Folgende
-    following: Folgt
+    following: Folge ich
     instance_actor_flash: Dieses Konto ist ein virtueller Akteur, der den Server selbst repräsentiert und nicht ein einzelner Benutzer. Es wird für Föderationszwecke verwendet und sollte nicht gesperrt werden.
-    joined: Beigetreten am %{date}
     last_active: zuletzt aktiv
-    link_verified_on: Besitz des Links wurde überprüft am %{date}
-    media: Medien
-    moved_html: "%{name} ist auf %{new_profile_link} umgezogen:"
-    network_hidden: Diese Informationen sind nicht verfügbar
-    never_active: Nie
-    nothing_here: Hier gibt es nichts!
-    people_followed_by: Profile, denen %{name} folgt
-    people_who_follow: Profile, die %{name} folgen
+    link_verified_on: Das Profil mit dieser E-Mail-Adresse wurde bereits am %{date} bestätigt
+    nothing_here: Keine Treffer mit dieser Auswahl
     pin_errors:
       following: Du musst dieser Person bereits folgen, um sie empfehlen zu können
     posts:
       one: Beitrag
       other: Beiträge
     posts_tab_heading: Beiträge
-    posts_with_replies: Beiträge mit Antworten
-    roles:
-      admin: Administrator
-      bot: Bot
-      group: Gruppe
-      moderator: Moderator
-    unavailable: Profil nicht verfügbar
-    unfollow: Entfolgen
   admin:
     account_actions:
       action: Aktion ausführen
       title: Moderationsaktion auf %{acct} ausführen
     account_moderation_notes:
-      create: Notiz erstellen
-      created_msg: Moderationsnotiz erfolgreich erstellt!
-      delete: Löschen
+      create: Notiz abspeichern
+      created_msg: Moderationshinweis erfolgreich abgespeichert!
       destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
     accounts:
-      add_email_domain_block: E-Mail-Domain blacklisten
-      approve: Akzeptieren
-      approve_all: Alle akzeptieren
-      approved_msg: "%{username}'s Anmeldeantrag erfolgreich genehmigt"
-      are_you_sure: Bist du sicher?
+      add_email_domain_block: E-Mail-Domain sperren
+      approve: Genehmigen
+      approved_msg: Anmeldeantrag von %{username} erfolgreich genehmigt
+      are_you_sure: Bist du dir sicher?
       avatar: Profilbild
       by_domain: Domain
       change_email:
-        changed_msg: E-Mail-Adresse des Kontos erfolgreich geändert!
+        changed_msg: E-Mail-Adresse erfolgreich geändert!
         current_email: Aktuelle E-Mail-Adresse
         label: E-Mail-Adresse ändern
         new_email: Neue E-Mail-Adresse
         submit: E-Mail-Adresse ändern
         title: E-Mail-Adresse für %{username} ändern
+      change_role:
+        changed_msg: Rolle erfolgreich geändert!
+        label: Rolle ändern
+        no_role: Keine Rolle
+        title: Rolle für %{username} ändern
       confirm: Bestätigen
       confirmed: Bestätigt
       confirming: Bestätigung
+      custom: Angepasst
       delete: Daten löschen
       deleted: Gelöscht
-      demote: Degradieren
-      destroyed_msg: "%{username}'s Daten wurden zum Löschen in die Warteschlange eingereiht"
-      disable: Ausschalten
-      disable_sign_in_token_auth: Deaktiviere die Zwei-Faktor-Authentifizierung per E-Mail
-      disable_two_factor_authentication: 2FA abschalten
-      disabled: Ausgeschaltet
-      display_name: Anzeigename
+      demote: Zurückstufen
+      destroyed_msg: Daten von %{username} wurden zum Löschen in die Warteschlange eingereiht
+      disable: Einfrieren
+      disable_sign_in_token_auth: Deaktiviere die Zwei-Faktor-Authentisierung (2FA) per E-Mail
+      disable_two_factor_authentication: Zwei-Faktor-Authentisierung (2FA) deaktivieren
+      disabled: Eingefroren
+      display_name: Angezeigter Name
       domain: Domain
       edit: Bearbeiten
       email: E-Mail
       email_status: E-Mail-Status
       enable: Freischalten
-      enable_sign_in_token_auth: Aktiviere die Zwei-Faktor-Authentifizierung per E-Mail
+      enable_sign_in_token_auth: Aktiviere die Zwei-Faktor-Authentisierung (2FA) per E-Mail
       enabled: Freigegeben
-      enabled_msg: "%{username}'s Konto erfolgreich freigegeben"
-      followers: Folgende
-      follows: Folgt
+      enabled_msg: Konto von %{username} erfolgreich freigegeben
+      followers: Follower
+      follows: Folge ich
       header: Titelbild
-      inbox_url: Posteingangs-URL
-      invite_request_text: Begründung für das beitreten
+      inbox_url: Posteingangsadresse
+      invite_request_text: Begründung für das Beitreten
       invited_by: Eingeladen von
       ip: IP-Adresse
       joined: Beigetreten
       location:
         all: Alle
         local: Lokal
-        remote: Fern
-        title: Ursprung
-      login_status: Loginstatus
-      media_attachments: Dateien
-      memorialize: In Gedenkmal verwandeln
-      memorialized: Memorialisiert
-      memorialized_msg: "%{username} wurde erfolgreich in ein memorialisiertes Konto umgewandelt"
+        remote: Extern
+        title: Herkunft
+      login_status: Anmeldestatus
+      media_attachments: Medienanhänge
+      memorialize: In Gedenkseite umwandeln
+      memorialized: Gedenkseite
+      memorialized_msg: "%{username} wurde erfolgreich in ein Gedenkseiten-Konto umgewandelt"
       moderation:
         active: Aktiv
         all: Alle
@@ -161,44 +100,44 @@ de:
       most_recent_ip: Letzte IP-Adresse
       no_account_selected: Keine Konten wurden geändert, da keine ausgewählt wurden
       no_limits_imposed: Keine Beschränkungen
+      no_role_assigned: Keine Rolle zugewiesen
       not_subscribed: Nicht abonniert
-      pending: In Warteschlange
-      perform_full_suspension: Verbannen
+      pending: Überprüfung ausstehend
+      perform_full_suspension: Sperren
+      previous_strikes: Vorherige Verstöße
+      previous_strikes_description_html:
+        one: Dieses Konto hat <strong>einen</strong> Verstoß.
+        other: Dieses Konto hat <strong>%{count}</strong> Verstöße.
       promote: Befördern
       protocol: Protokoll
       public: Öffentlich
       push_subscription_expires: PuSH-Abonnement läuft aus
       redownload: Profil neu laden
-      redownloaded_msg: Profil von %{username} erfolgreich von Ursprung aktualisiert
+      redownloaded_msg: Das Profil %{username} wurde vom externen Server erfolgreich aktualisiert
       reject: Ablehnen
-      reject_all: Alle ablehnen
-      rejected_msg: "%{username}'s Anmeldeantrag erfolgreich abgelehnt"
+      rejected_msg: Antrag zur Registrierung von %{username} erfolgreich abgelehnt
+      remote_suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht.
+      remote_suspension_reversible_hint_html: Das Konto wurde auf dem Server gesperrt und sämtliche Daten werden am %{date} entfernt. Bis dahin kann der Server dieses Konto ohne negative Auswirkungen wiederherstellen. Wenn du schon jetzt alle Daten des Kontos unwiderruflich löschen möchtest, kannst du dies nachfolgend tun.
       remove_avatar: Profilbild entfernen
       remove_header: Titelbild entfernen
       removed_avatar_msg: Profilbild von %{username} erfolgreich entfernt
-      removed_header_msg: "%{username}'s Titelbild wurde erfolgreich entfernt"
+      removed_header_msg: Titelbild von %{username} wurde erfolgreich entfernt
       resend_confirmation:
-        already_confirmed: Diese_r Benutzer_in wurde bereits bestätigt
+        already_confirmed: Dieses Profil wurde bereits bestätigt
         send: Bestätigungs-E-Mail erneut senden
         success: Bestätigungs-E-Mail erfolgreich gesendet!
       reset: Zurücksetzen
       reset_password: Passwort zurücksetzen
       resubscribe: Wieder abonnieren
-      role: Berechtigungen
-      roles:
-        admin: Administrator
-        moderator: Moderator_in
-        staff: Mitarbeiter
-        user: Nutzer
-      search: Suche
-      search_same_email_domain: Andere Benutzer mit der gleichen E-Mail-Domain
-      search_same_ip: Andere Benutzer mit derselben IP
+      role: Rolle
+      search: Suchen
+      search_same_email_domain: Andere Benutzer*innen mit der gleichen E-Mail-Domain
+      search_same_ip: Andere Benutzer*innen mit derselben IP-Adresse
       security_measures:
         only_password: Nur Passwort
         password_and_2fa: Passwort und 2FA
-        password_and_sign_in_token: Passwort und E-Mail-Token
-      sensitive: NSFW
-      sensitized: Als NSFW markieren
+      sensitive: Inhaltswarnung
+      sensitized: Mit Inhaltswarnung versehen
       shared_inbox_url: Geteilte Posteingang-URL
       show:
         created_reports: Erstellte Meldungen
@@ -206,19 +145,22 @@ de:
       silence: Stummschalten
       silenced: Stummgeschaltet
       statuses: Beiträge
+      strikes: Vorherige Verstöße
       subscribe: Abonnieren
-      suspended: Verbannt
-      suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht. Du kannst das Konto aufheben, um es brauchbar zu machen, aber es wird keine Daten wiederherstellen, die es davor schon hatte.
-      suspension_reversible_hint_html: Das Konto wurde gesperrt und die Daten werden am %{date} vollständig gelöscht. Bis dahin kann das Konto ohne irgendwelche negativen Auswirkungen wiederhergestellt werden. Wenn du alle Daten des Kontos sofort entfernen möchtest, kannst du dies nachfolgend tun.
-      time_in_queue: "%{time} in der Warteschlange"
+      suspend: Sperren
+      suspended: Gesperrt
+      suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht. Du kannst das Konto entsperren, um es wieder nutzbar zu machen, aber es wird keine Daten wiederherstellen, die es davor hatte.
+      suspension_reversible_hint_html: Das Konto wurde gesperrt und die Daten werden am %{date} vollständig gelöscht. Bis dahin kann das Konto ohne irgendwelche negativen Auswirkungen wiederhergestellt werden. Wenn du alle Daten des Kontos sofort entfernen möchtest, kannst du das nachfolgend tun.
       title: Konten
+      unblock_email: E-Mail-Adresse entsperren
+      unblocked_email_msg: E-Mail-Adresse von %{username} erfolgreich entsperrt
       unconfirmed_email: Unbestätigte E-Mail-Adresse
-      undo_sensitized: Nicht mehr als NSFW markieren
+      undo_sensitized: Inhaltswarnung aufheben
       undo_silenced: Stummschaltung aufheben
-      undo_suspension: Verbannung aufheben
-      unsilenced_msg: "%{username}'s Konto erfolgreich freigegeben"
+      undo_suspension: Sperre aufheben
+      unsilenced_msg: Konto von %{username} erfolgreich freigegeben
       unsubscribe: Abbestellen
-      unsuspended_msg: "%{username}'s Konto erfolgreich freigegeben"
+      unsuspended_msg: Kontosperre von %{username} erfolgreich aufgehoben
       username: Profilname
       view_domain: Übersicht für Domain anzeigen
       warn: Warnen
@@ -226,106 +168,134 @@ de:
       whitelisted: Auf der Whitelist
     action_logs:
       action_types:
+        approve_appeal: Einspruch annehmen
+        approve_user: Benutzer*in genehmigen
         assigned_to_self_report: Bericht zuweisen
-        change_email_user: E-Mail des Benutzers ändern
-        confirm_user: Benutzer bestätigen
+        change_email_user: E-Mail des Profils ändern
+        change_role_user: Rolle des Profils ändern
+        confirm_user: Benutzer*in bestätigen
         create_account_warning: Warnung erstellen
         create_announcement: Ankündigung erstellen
-        create_custom_emoji: Eigene Emoji erstellen
+        create_canonical_email_block: E-Mail-Sperre erstellen
+        create_custom_emoji: Eigene Emojis erstellen
         create_domain_allow: Domain erlauben
-        create_domain_block: Domain blockieren
-        create_email_domain_block: E-Mail-Domain-Block erstellen
+        create_domain_block: Domain sperren
+        create_email_domain_block: E-Mail-Domain-Sperre erstellen
         create_ip_block: IP-Regel erstellen
         create_unavailable_domain: Nicht verfügbare Domain erstellen
-        demote_user: Benutzer degradieren
+        create_user_role: Rolle erstellen
+        demote_user: Benutzer*in herabstufen
         destroy_announcement: Ankündigung löschen
-        destroy_custom_emoji: Eigene Emoji löschen
+        destroy_canonical_email_block: E-Mail-Sperre entfernen
+        destroy_custom_emoji: Eigenes Emojis löschen
         destroy_domain_allow: Erlaube das Löschen von Domains
-        destroy_domain_block: Domain-Blockade löschen
-        destroy_email_domain_block: E-Mail-Domain-Blockade löschen
+        destroy_domain_block: Domain-Sperre entfernen
+        destroy_email_domain_block: E-Mail-Domain-Sperre löschen
+        destroy_instance: Domain-Daten entfernen
         destroy_ip_block: IP-Regel löschen
         destroy_status: Beitrag löschen
         destroy_unavailable_domain: Nicht verfügbare Domain löschen
+        destroy_user_role: Rolle entfernen
         disable_2fa_user: 2FA deaktivieren
-        disable_custom_emoji: Benutzerdefiniertes Emoji deaktivieren
-        disable_sign_in_token_auth_user: Zwei-Faktor-Authentifizierung per E-Mail für den Nutzer deaktiviert
-        disable_user: Benutzer deaktivieren
-        enable_custom_emoji: Benutzerdefiniertes Emoji aktivieren
-        enable_sign_in_token_auth_user: Zwei-Faktor-Authentifizierung per E-Mail für den Nutzer aktiviert
-        enable_user: Benutzer aktivieren
-        memorialize_account: Account deaktivieren
-        promote_user: Benutzer befördern
+        disable_custom_emoji: Eigenes Emoji deaktivieren
+        disable_sign_in_token_auth_user: Zwei-Faktor-Authentisierung (2FA) per E-Mail für diesen Account deaktivieren
+        disable_user: Benutzer*in deaktivieren
+        enable_custom_emoji: Eigenes Emoji aktivieren
+        enable_sign_in_token_auth_user: Zwei-Faktor-Authentisierung (2FA) per E-Mail für diesen Account aktivieren
+        enable_user: Benutzer*in aktivieren
+        memorialize_account: Gedenkkonto
+        promote_user: Benutzer*in hochstufen
+        reject_appeal: Einspruch ablehnen
+        reject_user: Benutzer*in ablehnen
         remove_avatar_user: Profilbild entfernen
         reopen_report: Meldung wieder eröffnen
+        resend_user: Bestätigungs-E-Mail erneut senden
         reset_password_user: Passwort zurücksetzen
         resolve_report: Bericht lösen
-        sensitive_account: Markiere die Medien in deinem Konto als NSFW
+        sensitive_account: Konto mit erzwungener Inhaltswarnung
         silence_account: Konto stummschalten
         suspend_account: Konto sperren
         unassigned_report: Meldung widerrufen
-        unsensitive_account: Markiere die Medien in deinem Konto nicht mehr als NSFW
+        unblock_email_account: E-Mail-Adresse entsperren
+        unsensitive_account: Konto mit erzwungener Inhaltswarnung rückgängig machen
         unsilence_account: Konto nicht mehr stummschalten
         unsuspend_account: Konto nicht mehr sperren
         update_announcement: Ankündigung aktualisieren
-        update_custom_emoji: Benutzerdefiniertes Emoji aktualisieren
-        update_domain_block: Domain Block aktualisieren
+        update_custom_emoji: Eigenes Emoji aktualisieren
+        update_domain_block: Domain-Sperre aktualisieren
+        update_ip_block: IP-Regel aktualisieren
         update_status: Beitrag aktualisieren
+        update_user_role: Rolle aktualisieren
       actions:
+        approve_appeal_html: "%{name} genehmigte die Moderationsbeschlüsse von %{target}"
+        approve_user_html: "%{name} genehmigte die Registrierung von %{target}"
         assigned_to_self_report_html: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
-        change_email_user_html: "%{name} hat die E-Mail-Adresse des Nutzers %{target} geändert"
+        change_email_user_html: "%{name} hat die E-Mail-Adresse von %{target} geändert"
+        change_role_user_html: "%{name} hat die Rolle von %{target} geändert"
         confirm_user_html: "%{name} hat die E-Mail-Adresse von %{target} bestätigt"
         create_account_warning_html: "%{name} hat eine Warnung an %{target} gesendet"
-        create_announcement_html: "%{name} hat die neue Ankündigung %{target} erstellt"
-        create_custom_emoji_html: "%{name} hat neues Emoji %{target} hochgeladen"
+        create_announcement_html: "%{name} hat die neue Ankündigung erstellt: %{target}"
+        create_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} gesperrt"
+        create_custom_emoji_html: "%{name} hat neues Emoji hochgeladen: %{target}"
         create_domain_allow_html: "%{name} hat die Domain %{target} gewhitelistet"
-        create_domain_block_html: "%{name} hat die Domain %{target} blockiert"
-        create_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} geblacklistet"
-        create_ip_block_html: "%{name} hat eine Regel für IP %{target} erstellt"
+        create_domain_block_html: "%{name} hat die Domain %{target} gesperrt"
+        create_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} gesperrt"
+        create_ip_block_html: "%{name} hat eine IP-Regel für %{target} erstellt"
         create_unavailable_domain_html: "%{name} hat die Lieferung an die Domain %{target} eingestellt"
-        demote_user_html: "%{name} stufte Benutzer_in %{target} herunter"
+        create_user_role_html: "%{name} hat die Rolle %{target} erstellt"
+        demote_user_html: "%{name} hat %{target} heruntergestuft"
         destroy_announcement_html: "%{name} hat die neue Ankündigung %{target} gelöscht"
-        destroy_custom_emoji_html: "%{name} zerstörte Emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} entsperrt"
+        destroy_custom_emoji_html: "%{name} hat das Emoji gelöscht: %{target}"
         destroy_domain_allow_html: "%{name} hat die Domain %{target} von der Whitelist entfernt"
-        destroy_domain_block_html: "%{name} hat die Domain %{target} entblockt"
-        destroy_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} gewhitelistet"
-        destroy_ip_block_html: "%{name} hat eine Regel für IP %{target} gelöscht"
+        destroy_domain_block_html: "%{name} hat die Domain %{target} entsperrt"
+        destroy_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} entsperrt"
+        destroy_instance_html: "%{name} hat die Daten der Domain %{target} entfernt"
+        destroy_ip_block_html: "%{name} hat eine IP-Regel für %{target} entfernt"
         destroy_status_html: "%{name} hat einen Beitrag von %{target} entfernt"
         destroy_unavailable_domain_html: "%{name} setzte die Lieferung an die Domain %{target} fort"
-        disable_2fa_user_html: "%{name} hat Zwei-Faktor-Anforderung für Benutzer_in %{target} deaktiviert"
-        disable_custom_emoji_html: "%{name} hat das %{target} Emoji deaktiviert"
-        disable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token Authentifizierung für %{target} deaktiviert"
-        disable_user_html: "%{name} hat Zugang von Benutzer_in %{target} deaktiviert"
-        enable_custom_emoji_html: "%{name} hat das %{target} Emoji aktiviert"
-        enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token Authentifizierung für %{target} aktiviert"
-        enable_user_html: "%{name} hat Zugang von Benutzer_in %{target} aktiviert"
+        destroy_user_role_html: "%{name} hat die Rolle %{target} gelöscht"
+        disable_2fa_user_html: "%{name} hat die Zwei-Faktor-Authentisierung für %{target} deaktiviert"
+        disable_custom_emoji_html: "%{name} hat das Emoji deaktiviert: %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentifizierung für %{target} deaktiviert"
+        disable_user_html: "%{name} hat den Zugang für %{target} deaktiviert"
+        enable_custom_emoji_html: "%{name} hat das Emoji aktiviert: %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentifizierung für %{target} aktiviert"
+        enable_user_html: "%{name} hat den Zugang für %{target} aktiviert"
         memorialize_account_html: "%{name} hat das Konto von %{target} in eine Gedenkseite umgewandelt"
         promote_user_html: "%{name} hat %{target} befördert"
+        reject_appeal_html: "%{name} hat die Moderationsbeschlüsse von %{target} abgelehnt"
+        reject_user_html: "%{name} hat die Registrierung von %{target} abgelehnt"
         remove_avatar_user_html: "%{name} hat das Profilbild von %{target} entfernt"
         reopen_report_html: "%{name} hat die Meldung %{target} wieder geöffnet"
+        resend_user_html: "%{name} hat erneut eine Bestätigungs-E-Mail für %{target} gesendet"
         reset_password_user_html: "%{name} hat das Passwort von %{target} zurückgesetzt"
         resolve_report_html: "%{name} hat die Meldung %{target} bearbeitet"
-        sensitive_account_html: "%{name} markierte %{target}'s Medien als NSFW"
+        sensitive_account_html: "%{name} hat die Medien von %{target} mit einer Inhaltswarnung versehen"
         silence_account_html: "%{name} hat das Konto von %{target} stummgeschaltet"
-        suspend_account_html: "%{name} hat das Konto von %{target} verbannt"
+        suspend_account_html: "%{name} hat das Konto von %{target} gesperrt"
         unassigned_report_html: "%{name} hat die Zuweisung der Meldung %{target} entfernt"
-        unsensitive_account_html: "%{name} markierte %{target}'s Medien nicht als NSFW"
+        unblock_email_account_html: "%{name} hat die E-Mail-Adresse von %{target} entsperrt"
+        unsensitive_account_html: "%{name} hat die Inhaltswarnung für Medien von %{target} aufgehoben"
         unsilence_account_html: "%{name} hat die Stummschaltung von %{target} aufgehoben"
-        unsuspend_account_html: "%{name} hat die Verbannung von %{target} aufgehoben"
+        unsuspend_account_html: "%{name} hat die Kontosperre von %{target} aufgehoben"
         update_announcement_html: "%{name} aktualisierte Ankündigung %{target}"
-        update_custom_emoji_html: "%{name} hat das %{target} Emoji geändert"
-        update_domain_block_html: "%{name} hat den Domain-Block für %{target} aktualisiert"
+        update_custom_emoji_html: "%{name} hat das Emoji geändert: %{target}"
+        update_domain_block_html: "%{name} hat die Domain-Sperre für %{target} aktualisiert"
+        update_ip_block_html: "%{name} hat die Regel für IP %{target} geändert"
         update_status_html: "%{name} hat einen Beitrag von %{target} aktualisiert"
-      deleted_status: "(gelöschter Beitrag)"
+        update_user_role_html: "%{name} hat die Rolle %{target} geändert"
+      deleted_account: gelöschtes Konto
       empty: Keine Protokolle gefunden.
       filter_by_action: Nach Aktion filtern
-      filter_by_user: Nach Benutzer filtern
-      title: Überprüfungsprotokoll
+      filter_by_user: Nach Benutzer*in filtern
+      title: Protokoll
     announcements:
       destroyed_msg: Ankündigung erfolgreich gelöscht!
       edit:
         title: Ankündigung bearbeiten
-      empty: Keine Ankündigungen gefunden.
-      live: Live
+      empty: Keine Ankündigungen vorhanden.
+      live: Aktuell gültig
       new:
         create: Ankündigung erstellen
         title: Neue Ankündigung
@@ -344,9 +314,9 @@ de:
       copy: Kopieren
       copy_failed_msg: Es konnte keine lokale Kopie des Emojis erstellt werden
       create_new_category: Neue Kategorie erstellen
-      created_msg: Emoji erstellt!
+      created_msg: Emoji erfolgreich erstellt!
       delete: Löschen
-      destroyed_msg: Emoji gelöscht!
+      destroyed_msg: Emoji erfolgreich gelöscht!
       disable: Deaktivieren
       disabled: Deaktiviert
       disabled_msg: Das Emoji wurde deaktiviert
@@ -354,87 +324,128 @@ de:
       enable: Aktivieren
       enabled: Aktiviert
       enabled_msg: Das Emoji wurde aktiviert
-      image_hint: PNG bis zu 50 kB
-      list: Liste
-      listed: Gelistet
+      image_hint: PNG oder GIF bis %{size}
+      list: Aufführen
+      listed: Angezeigt
       new:
         title: Eigenes Emoji hinzufügen
+      no_emoji_selected: Keine Emojis wurden geändert, da keine ausgewählt wurden
       not_permitted: Du bist für die Durchführung dieses Vorgangs nicht berechtigt
       overwrite: Überschreiben
-      shortcode: Kürzel
+      shortcode: Shortcode
       shortcode_hint: Mindestens 2 Zeichen, nur Buchstaben, Ziffern und Unterstriche
       title: Eigene Emojis
       uncategorized: Nicht kategorisiert
-      unlist: Nicht listen
-      unlisted: Ungelistet
+      unlist: Nicht Aufführen
+      unlisted: Nicht aufgeführt
       update_failed_msg: Konnte dieses Emoji nicht aktualisieren
       updated_msg: Emoji erfolgreich aktualisiert!
       upload: Hochladen
     dashboard:
+      active_users: aktive Benutzer*innen
+      interactions: Interaktionen
+      media_storage: Medien
+      new_users: neue Benutzer*innen
+      opened_reports: Erstellte Meldungen
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> ausstehender Einspruch"
+        other: "<strong>%{count}</strong> ausstehende Einsprüche"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> ausstehende Meldung"
+        other: "<strong>%{count}</strong> ausstehende Meldungen"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> ausstehender Hashtag"
+        other: "<strong>%{count}</strong> ausstehende Hashtags"
+      pending_users_html:
+        one: "<strong>%{count}</strong> unerledigte*r Benutzer*in"
+        other: "<strong>%{count}</strong> unerledigte Benutzer*innen"
+      resolved_reports: erledigte Meldungen
       software: Software
+      sources: Registrierungsort
       space: Speicherverbrauch
       title: Übersicht
+      top_languages: Häufigste Sprachen
+      top_servers: Aktivste Server
+      website: Website
+    disputes:
+      appeals:
+        empty: Keine Einsprüche gefunden.
+        title: Einsprüche
     domain_allows:
       add_new: Whitelist-Domain
       created_msg: Domain wurde erfolgreich zur Whitelist hinzugefügt
       destroyed_msg: Domain wurde von der Whitelist entfernt
+      export: Exportieren
+      import: Importieren
       undo: Von der Whitelist entfernen
     domain_blocks:
-      add_new: Neue Domainblockade hinzufügen
-      created_msg: Die Domain-Blockade wird nun durchgeführt
-      destroyed_msg: Die Domain-Blockade wurde rückgängig gemacht
+      add_new: Neue Domain-Sperre hinzufügen
+      created_msg: Die Domain ist jetzt gesperrt bzw. eingeschränkt
+      destroyed_msg: Die Domain-Sperre wurde aufgehoben
       domain: Domain
-      edit: Domainblockade bearbeiten
-      existing_domain_block_html: Es gibt schon eine Blockade für %{name}, diese muss erst <a href="%{unblock_url}">aufgehoben</a> werden.
+      edit: Domain-Sperre bearbeiten
+      existing_domain_block: Du hast %{name} bereits stärker eingeschränkt.
+      existing_domain_block_html: Du hast bereits strengere Beschränkungen für die Domain %{name} verhängt. Du musst diese erst <a href="%{unblock_url}">aufheben</a>.
+      export: Exportieren
+      import: Importieren
       new:
-        create: Blockade einrichten
-        hint: Die Domain-Blockade wird nicht verhindern, dass Konteneinträge in der Datenbank erstellt werden. Aber es werden rückwirkend und automatisch alle Moderationsmethoden auf diese Konten angewendet.
+        create: Sperre einrichten
+        hint: Die Domainsperre wird nicht verhindern, dass Konteneinträge in der Datenbank erstellt werden, sondern rückwirkend und automatisch alle Moderationsmethoden auf diese Konten anwenden.
         severity:
-          desc_html: "<strong>Stummschaltung</strong> wird die Beiträge dieses Kontos für alle, die ihm nicht folgen, unsichtbar machen. Eine <strong>Sperre</strong> wird alle Beiträge, Medien und Profildaten dieses Kontos entfernen. Verwende <strong>Kein,</strong> um nur Mediendateien abzulehnen."
+          desc_html: "<strong>Stummschaltung</strong> wird die Beiträge von Konten unter dieser Domain für alle unsichtbar machen, die den Konten nicht folgen. Eine <strong>Sperre</strong> wird alle Inhalte, Medien und Profildaten für Konten dieser Domain von deinem Server entfernen. Verwende <strong>keine,</strong> um nur Mediendateien abzulehnen."
           noop: Kein
           silence: Stummschaltung
-          suspend: Sperre
-        title: Neue Domain-Blockade
-      obfuscate: Domainname verschleiern
-      obfuscate_hint: Den Domainnamen in der Liste teilweise verschleiern, wenn die Liste der Domänenbeschränkungen aktiviert ist
-      private_comment: Privater Kommentar
-      private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderatoren.
-      public_comment: Öffentlicher Kommentar
-      public_comment_hint: Kommentar zu dieser Domain-Beschränkung für die allgemeine Öffentlichkeit, wenn das Veröffentlichen der Blockliste aktiviert ist.
+          suspend: Sperren
+        title: Neue Domain-Sperre
+      no_domain_block_selected: Keine Domains gesperrt, weil keine ausgewählt wurde(n)
+      not_permitted: Dir ist es nicht erlaubt, diese Handlung durchzuführen
+      obfuscate: Domain-Name verschleiern
+      obfuscate_hint: Den Domain-Namen öffentlich nur teilweise bekannt geben, sofern die Liste der Domain-Beschränkungen aktiviert ist
+      private_comment: Private bzw. nicht-öffentliche Notiz
+      private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderator*innen.
+      public_comment: Öffentliche Notiz
+      public_comment_hint: Öffentlicher Hinweis zu dieser Domain-Beschränkung, sofern das Veröffentlichen von Sperrlisten grundsätzlich aktiviert ist.
       reject_media: Mediendateien ablehnen
       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
-      rejecting_media: Mediendateien werden nicht gespeichert
-      rejecting_reports: Meldungen werden ignoriert
-      severity:
-        silence: stummgeschaltet
-        suspend: gesperrt
-      show:
-        affected_accounts:
-          one: Ein Konto in der Datenbank betroffen
-          other: "%{count} Konten in der Datenbank betroffen"
-        retroactive:
-          silence: Alle existierenden Konten dieser Domain nicht mehr stummschalten
-          suspend: Alle existierenden Konten dieser Domain entsperren
-        title: Domain-Blockade für %{domain} zurücknehmen
-        undo: Zurücknehmen
-      undo: Domainblockade zurücknehmen
-      view: Zeige Domain-Blockade
+      reject_reports_hint: Alle Meldungen von dieser Domain ignorieren. Irrelevant für Sperrungen.
+      undo: Domain-Sperre aufheben
+      view: Domain-Sperre ansehen
     email_domain_blocks:
       add_new: Neue hinzufügen
-      created_msg: E-Mail-Domain-Blockade erfolgreich erstellt
-      delete: Löschen
-      destroyed_msg: E-Mail-Domain-Blockade erfolgreich gelöscht
+      attempts_over_week:
+        one: "%{count} Registrierungsversuch in der vergangenen Woche"
+        other: "%{count} Registrierungsversuche in der vergangenen Woche"
+      created_msg: E-Mail-Domain erfolgreich gesperrt
+      delete: Entfernen
+      dns:
+        types:
+          mx: MX-RR-Eintrag
       domain: Domain
-      empty: Keine E-Mail-Domains sind momentan auf der Blacklist.
-      from_html: von %{domain}
       new:
-        create: Blockade erstellen
-        title: Neue E-Mail-Domain-Blockade
-      title: E-Mail-Domain-Blockade
+        create: E-Mail-Domain hinzufügen
+        resolve: Domain auflösen
+        title: Neue E-Mail-Domain sperren
+      no_email_domain_block_selected: Keine E-Mail-Domain-Sperren wurden geändert, da keine ausgewählt wurden
+      resolved_dns_records_hint_html: Der Domain-Name wird an die folgenden MX-Domains aufgelöst, die letztendlich für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. <strong>Achte daher darauf, große E-Mail-Anbieter versehentlich nicht auszusperren.</strong>
+      resolved_through_html: Durch %{domain} aufgelöst
+      title: Gesperrte E-Mail-Domains
+    export_domain_allows:
+      new:
+        title: Erlaubte Domains importieren
+      no_file: Keine Datei ausgewählt
+    export_domain_blocks:
+      import:
+        description_html: Du bist dabei, eine Liste von Domain-Sperren zu importieren. Bitte überprüfe diese Liste sehr sorgfältig, insbesondere dann, wenn du sie nicht selbst erstellt hast.
+        existing_relationships_warning: Bestehende Folgebeziehungen
+        private_comment_description_html: 'Damit du später nachvollziehen kannst, woher die importierten Sperren stammen, kannst du diesem Eintrag eine private Notiz hinzufügen: <q>%{comment}</q>'
+        private_comment_template: Importiert von %{source} am %{date}
+        title: Domain-Sperren importieren
+      new:
+        title: Domain-Sperren importieren
+      no_file: Keine Datei ausgewählt
     follow_recommendations:
-      description_html: "<strong>Folgeempfehlungen helfen neuen Nutzern dabei, schnell interessante Inhalte zu finden</strong>. Wenn ein Nutzer noch nicht genug mit anderen interagiert hat, um personalisierte Folgeempfehlungen zu erstellen, werden stattdessen diese Benutzerkonten verwendet. Sie werden täglich basiert auf einer Mischung aus am meisten interagierenden Benutzerkonten und solchen mit den meisten Folgenden für eine bestimmte Sprache neuberechnet."
+      description_html: "<strong>Folgeempfehlungen helfen neuen Nutzer*innen, interessante Inhalte schnell zu finden</strong>. Wenn ein*e Nutzer*in noch nicht genug mit anderen interagiert hat, um personalisierte Folgeempfehlungen zu erhalten, werden stattdessen diese Profile verwendet. Sie werden täglich, basierend auf einer Mischung aus am meisten interagierenden Konten und jenen mit den meisten Followern für eine bestimmte Sprache, neu berechnet."
       language: Für Sprache
       status: Status
       suppress: Folgeempfehlungen unterdrücken
@@ -442,53 +453,84 @@ de:
       title: Folgeempfehlungen
       unsuppress: Nicht mehr unterdrücken
     instances:
+      availability:
+        description_html:
+          one: Wenn die Zustellung an die Domain seit <strong>%{count} Tag</strong> erfolglos bleibt, werden keine weiteren Zustellungsversuche unternommen, es sei denn, eine Zustellung <em>von</em> dieser Domain wird empfangen.
+          other: Wenn die Zustellung an die Domain seit <strong>%{count} Tagen</strong> erfolglos bleibt, werden keine weiteren Zustellungsversuche unternommen, es sei denn, eine Zustellung <em>von</em> dieser Domain wird empfangen.
+        failure_threshold_reached: Fehlschlag-Schwelle am %{date} erreicht.
+        failures_recorded:
+          one: Fehlgeschlagener Versuch am %{count}. Tag.
+          other: Fehlgeschlagener Versuch am %{count}. Tag.
+        no_failures_recorded: Keine Fehler bei der Aufzeichnung.
+        title: Verfügbarkeit
+        warning: Der letzte Versuch, sich mit diesem Server zu verbinden, war nicht erfolgreich
       back_to_all: Alle
-      back_to_limited: Beschränkt
+      back_to_limited: Stummgeschaltet
       back_to_warning: Warnung
       by_domain: Domain
+      confirm_purge: Bist du dir sicher, dass du die Daten für diese Domain für immer löschen möchtest?
+      content_policies:
+        comment: Interne Notiz
+        description_html: Du kannst Inhaltsrichtlinien definieren, die auf alle Konten dieser Domain und einer ihrer Subdomains angewendet werden.
+        policies:
+          reject_media: Medien ablehnen
+          reject_reports: Meldungen ablehnen
+          silence: Stummschalten
+          suspend: Gesperrt
+        policy: Richtlinie
+        reason: Öffentlicher Grund
+        title: Inhaltsrichtlinien
+      dashboard:
+        instance_accounts_dimension: Meiste gefolgte Konten
+        instance_accounts_measure: gespeicherte Konten
+        instance_followers_measure: unsere Follower dort
+        instance_follows_measure: deren Follower hier
+        instance_languages_dimension: Top Sprachen
+        instance_media_attachments_measure: gespeicherte Medienanhänge
+        instance_reports_measure: Meldungen über deren Accounts
+        instance_statuses_measure: gespeicherte Beiträge
       delivery:
         all: Alle
         clear: Zustellfehler löschen
+        failing: Fehlerhaft
         restart: Lieferung neu starten
         stop: Lieferung stoppen
-        title: Zustellung
         unavailable: Nicht verfügbar
-        unavailable_message: Zustellung funktioniert nicht
-        warning: Warnung
-        warning_message:
-          one: Zustellfehler seit %{count} Tag
-          other: Zustellfehler seit %{count} Tagen
       delivery_available: Zustellung funktioniert
       delivery_error_days: Tage seitdem die Zustellung nicht funktioniert
       delivery_error_hint: Wenn eine Lieferung für %{count} Tage nicht möglich ist, wird sie automatisch als nicht lieferbar markiert.
+      destroyed_msg: Daten von %{domain} sind nun in der Warteschlange für die bevorstehende Löschung.
       empty: Keine Domains gefunden.
       known_accounts:
         one: "%{count} bekanntes Konto"
         other: "%{count} bekannte Konten"
       moderation:
         all: Alle
-        limited: Beschränkt
+        limited: Eingeschränkt
         title: Moderation
       private_comment: Privater Kommentar
       public_comment: Öffentlicher Kommentar
+      purge: Löschen
+      purge_description_html: Wenn du glaubst, dass diese Domain endgültig offline ist, kannst du alle Account-Datensätze und zugehörigen Daten aus dieser Domain löschen. Das kann eine Weile dauern.
       title: Föderation
-      total_blocked_by_us: Von uns blockiert
+      total_blocked_by_us: Von uns gesperrt
       total_followed_by_them: Gefolgt von denen
       total_followed_by_us: Gefolgt von uns
       total_reported: Beschwerden über sie
       total_storage: Medienanhänge
+      totals_time_period_hint_html: Die unten angezeigten Summen enthalten Daten für alle Zeiten.
     invites:
       deactivate_all: Alle deaktivieren
       filter:
         all: Alle
-        available: Verfügbar
-        expired: Ausgelaufen
+        available: Noch gültig
+        expired: Abgelaufen
         title: Filter
       title: Einladungen
     ip_blocks:
       add_new: Regel erstellen
       created_msg: Neue IP-Regel erfolgreich hinzugefügt
-      delete: Löschen
+      delete: Entfernen
       expires_in:
         '1209600': 2 Wochen
         '15778476': 6 Monate
@@ -498,10 +540,8 @@ de:
         '94670856': 3 Jahre
       new:
         title: Neue IP-Regel erstellen
-      no_ip_block_selected: Keine IP-Regeln wurden geändert, weil keine ausgewählt wurden
+      no_ip_block_selected: Keine IP-Regeln wurden geändert, weil keine ausgewählt wurde(n)
       title: IP-Regeln
-    pending_accounts:
-      title: Ausstehende Konten (%{count})
     relationships:
       title: Beziehungen von %{acct}
     relays:
@@ -511,14 +551,14 @@ de:
       disable: Ausschalten
       disabled: Ausgeschaltet
       enable: Einschalten
-      enable_hint: Sobald aktiviert wird dein Server alle öffentlichen Beiträge dieses Relays abonnieren und wird alle öffentlichen Beiträge dieses Servers an es senden.
+      enable_hint: Sobald aktiviert, wird dein Server alle öffentlichen Beiträge dieses Relays abonnieren und alle öffentlichen Beiträge dieses Servers an dieses senden.
       enabled: Eingeschaltet
       inbox_url: Relay-URL
       pending: Warte auf Zustimmung des Relays
       save_and_enable: Speichern und aktivieren
       setup: Relaisverbindung einrichten
       signatures_not_enabled: Relais funktionieren nicht korrekt, während der sichere Modus oder der Whitelist-Modus aktiviert ist
-      status: Zustand
+      status: Status
       title: Relais
     report_notes:
       created_msg: Meldungs-Kommentar erfolgreich erstellt!
@@ -528,183 +568,324 @@ de:
         notes:
           one: "%{count} Notiz"
           other: "%{count} Notizen"
-        reports:
-          one: "%{count} Bericht"
-          other: "%{count} Berichte"
+      action_log: Protokoll
       action_taken_by: Maßnahme ergriffen durch
+      actions:
+        delete_description_html: Der gemeldete Beitrag wird gelöscht und ein Strike wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Accounts zu helfen.
+        mark_as_sensitive_description_html: Die Medien in den gemeldeten Beiträgen werden mit einer Inhaltswarnung versehen und ein Verstoß wird vermerkt, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können.
+        other_description_html: Weitere Optionen zur Steuerung des Kontoverhaltens und zur Anpassung der Kommunikation mit dem gemeldeten Konto.
+        resolve_description_html: Es wird keine Maßnahme gegen das gemeldete Konto ergriffen, es wird kein Strike verzeichnet und die Meldung wird geschlossen.
+        silence_description_html: Das Profil wird nur für diejenigen sichtbar sein, die ihm bereits folgen oder es manuell nachschlagen, und die Reichweite wird stark begrenzt. Kann immer rückgängig gemacht werden.
+        suspend_description_html: Das Profil und alle seine Inhalte werden unzugänglich werden, bis es schließlich gelöscht wird. Interaktion mit dem Konto wird unmöglich sein. Reversibel innerhalb von 30 Tagen.
+      actions_description_html: Entscheide, welche Maßnahmen zur Lösung dieses Berichts zu ergreifen sind. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an diese gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
+      add_to_report: Mehr zur Meldung hinzufügen
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
-      assigned: Zugewiesener Moderator
+      assigned: Zugewiesene*r Moderator*in
+      by_target_domain: Domain des gemeldeten Kontos
+      category: Kategorie
+      category_description_html: Der Grund, warum dieses Konto und/oder der Inhalt gemeldet wurden, wird in der Kommunikation mit dem gemeldeten Konto zitiert
       comment:
         none: Kein
+      comment_description_html: 'Um weitere Informationen bereitzustellen, schrieb %{name} Folgendes:'
       created_at: Gemeldet
+      delete_and_resolve: Beiträge löschen
       forwarded: Weitergeleitet
       forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als gelöst markieren
+      mark_as_sensitive: Mit einer Inhaltswarnung versehen
       mark_as_unresolved: Als ungelöst markieren
+      no_one_assigned: Niemand
       notes:
         create: Kommentar hinzufügen
         create_and_resolve: Mit Kommentar lösen
         create_and_unresolve: Mit Kommentar wieder öffnen
         delete: Löschen
-        placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten…
+        placeholder: Bitte beschreibe, welche Maßnahmen ergriffen wurden oder andere damit verbundene Aktualisierungen …
+        title: Notizen
+      notes_description_html: Notiz an dich und andere Moderator*innen hinterlassen
+      quick_actions_description_html: 'Führe eine schnelle Aktion aus oder scrolle nach unten, um gemeldete Inhalte zu sehen:'
+      remote_user_placeholder: das externe Profil von %{instance}
       reopen: Meldung wieder eröffnen
       report: 'Meldung #%{id}'
       reported_account: Gemeldetes Konto
       reported_by: Gemeldet von
       resolved: Gelöst
       resolved_msg: Meldung erfolgreich gelöst!
-      status: Zustand
-      target_domain: Domain des gemeldeten Kontos
+      skip_to_actions: Zu Aktionen springen
+      status: Status
+      statuses: Gemeldeter Inhalt
+      statuses_description_html: Störende Inhalte werden in der Kommunikation mit dem gemeldeten Konto zitiert
       target_origin: Domain des gemeldeten Kontos
       title: Meldungen
       unassign: Zuweisung entfernen
       unresolved: Ungelöst
       updated_at: Aktualisiert
+      view_profile: Profil anzeigen
+    roles:
+      add_new: Rolle hinzufügen
+      assigned_users:
+        one: "%{count} Konto"
+        other: "%{count} Konten"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Einladungen
+        moderation: Moderation
+        special: Spezial
+      delete: Löschen
+      description_html: Mit <strong>Benutzer*inn-Rollen</strong> kannst du die Funktionen und Bereiche von Mastodon anpassen, auf die deine Benutzer*innen zugreifen können.
+      edit: Rolle „%{name}“ bearbeiten
+      everyone: Standardberechtigungen
+      everyone_full_description_html: Das ist die <strong>Basis-Rolle</strong>, die für <strong>alle Benutzer*innen</strong> gilt – auch für diejenigen ohne zugewiesene Rolle. Alle anderen Rollen erben Berechtigungen davon.
+      permissions_count:
+        one: "%{count} Berechtigung"
+        other: "%{count} Berechtigungen"
+      privileges:
+        administrator: Administrator*in
+        administrator_description: Benutzer*innen mit dieser Berechtigung werden alle Beschränkungen umgehen
+        delete_user_data: Profildaten löschen
+        delete_user_data_description: Erlaubt Benutzer*innen, die Daten anderer Benutzer*innen sofort zu löschen
+        invite_users: Benutzer*innen einladen
+        invite_users_description: Erlaubt bereits registrierten Benutzer*innen, neue Leute zum Server einzuladen
+        manage_announcements: Ankündigungen verwalten
+        manage_announcements_description: Erlaubt Benutzer*innen, Ankündigungen auf dem Server zu verwalten
+        manage_appeals: Einsprüche verwalten
+        manage_appeals_description: Erlaubt es Benutzer*innen, Entscheidungen der Moderator*innen zu widersprechen
+        manage_blocks: Sperrungen verwalten
+        manage_blocks_description: Erlaubt Benutzer*innen das Sperren von E-Mail-Providern und IP-Adressen
+        manage_custom_emojis: Eigene Emojis verwalten
+        manage_custom_emojis_description: Erlaubt es Benutzer*innen, eigene Emojis auf dem Server zu verwalten
+        manage_federation: Föderation verwalten
+        manage_federation_description: Erlaubt Nutzer*innen, Domains anderer Mastodon-Server zu sperren oder zuzulassen – und die Zustellbarkeit zu steuern
+        manage_invites: Einladungen verwalten
+        manage_invites_description: Erlaubt es Benutzer*innen, Einladungslinks zu durchsuchen und zu deaktivieren
+        manage_reports: Meldungen verwalten
+        manage_reports_description: Erlaubt es Benutzer*innen, Meldungen zu überprüfen und Vorfälle zu moderieren
+        manage_roles: Rollen verwalten
+        manage_roles_description: Erlaubt es Benutzer*innen, Rollen, die sich unterhalb der eigenen Rolle befinden, zu verwalten und zuzuweisen
+        manage_rules: Serverregeln verwalten
+        manage_rules_description: Erlaubt es Benutzer*innen, Serverregeln zu ändern
+        manage_settings: Einstellungen verwalten
+        manage_settings_description: Erlaubt Nutzer*innen, Einstellungen dieses Servers zu ändern
+        manage_taxonomies: Taxonomien verwalten
+        manage_taxonomies_description: Ermöglicht Benutzer*innen, die Trends zu überprüfen und die Hashtag-Einstellungen zu aktualisieren
+        manage_user_access: Benutzer*in-Zugriff verwalten
+        manage_user_access_description: Erlaubt es Benutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen
+        manage_users: Benutzer*innen verwalten
+        manage_users_description: Erlaubt es Benutzer*innen, die Details anderer Profile einzusehen und diese Accounts zu moderieren
+        manage_webhooks: Webhooks verwalten
+        manage_webhooks_description: Erlaubt es Benutzer*innen, Webhooks für administrative Vorkommnisse einzurichten
+        view_audit_log: Audit-Log anzeigen
+        view_audit_log_description: Erlaubt es Benutzer*innen, den Verlauf der administrativen Handlungen auf diesem Server einzusehen
+        view_dashboard: Dashboard anzeigen
+        view_dashboard_description: Gewährt Benutzer*innen den Zugriff auf das Dashboard und verschiedene Metriken
+        view_devops: DevOps
+        view_devops_description: Erlaubt es Benutzer*innen, auf die Sidekiq- und pgHero-Dashboards zuzugreifen
+      title: Rollen
     rules:
       add_new: Regel hinzufügen
       delete: Löschen
-      description_html: Während die meisten behaupten, die Nutzungsbedingungen gelesen und akzeptiert zu haben, lesen die Menschen sie in der Regel erst nach einem Problem. <strong>Vereinfache es, die Regeln deines Servers auf einen Blick zu sehen, indem du sie in einer einfachen Auflistung zur Verfügung stellst.</strong> Versuche die einzelnen Regeln kurz und einfach zu halten, aber versuche nicht, sie in viele verschiedene Elemente aufzuteilen.
+      description_html: Während die meisten behaupten, die Nutzungsbedingungen tatsächlich gelesen zu haben, bekommen viele sie erst nach einem Problem mit. <strong>Vereinfache und reduziere daher die Serverregeln mit Stichpunkten.</strong> Versuche dabei, die einzelnen Vorgaben kurz und einfach zu halten, aber vermeide, sie in viele verschiedene Elemente aufzuteilen.
       edit: Regel bearbeiten
-      empty: Es wurden bis jetzt keine Server-Regeln definiert.
-      title: Server-Regeln
+      empty: Es wurden bisher keine Serverregeln definiert.
+      title: Serverregeln
     settings:
-      activity_api_enabled:
-        desc_html: Anzahl der lokal geposteten Beiträge, aktiven Nutzern und neuen Registrierungen in wöchentlichen Zusammenfassungen
-        title: Veröffentliche gesamte Statistiken über Benutzeraktivitäten
-      bootstrap_timeline_accounts:
-        desc_html: Mehrere Profilnamen durch Kommata trennen. Funktioniert nur mit lokalen und nicht gesperrten Konten. Standardwert bei freigelassenem Feld sind alle lokalen Admins.
-        title: Konten, denen Neu-Angemeldete automatisch folgen
-      contact_information:
-        email: Öffentliche E-Mail-Adresse
-        username: Profilname für die Kontaktaufnahme
-      custom_css:
-        desc_html: Verändere das Aussehen mit CSS, dass auf jeder Seite geladen wird
-        title: Benutzerdefiniertes CSS
+      about:
+        manage_rules: Serverregeln verwalten
+        preamble: Schildere ausführlich, wie dein Server betrieben, moderiert und finanziert wird.
+        rules_hint: Es gibt einen eigenen Bereich für Regeln, die deine Benutzer*innen einhalten müssen.
+        title: Über
+      appearance:
+        preamble: Die Oberfläche von Mastodon anpassen.
+        title: Design
+      branding:
+        preamble: Das Branding deines Servers unterscheidet ihn von anderen Servern im Netzwerk. Diese Informationen können in einer Vielzahl von Umgebungen angezeigt werden, z. B. in der Weboberfläche von Mastodon, in nativen Anwendungen, in Linkvorschauen auf anderen Websites und in Messaging-Apps und so weiter. Aus diesem Grund ist es am besten, diese Informationen klar, kurz und prägnant zu halten.
+        title: Branding
+      content_retention:
+        preamble: Lege fest, wie lange nutzergenerierte Inhalte auf deiner Mastodon-Instanz gespeichert werden.
+        title: Cache & Archive
       default_noindex:
-        desc_html: Beeinflusst alle Benutzer, die diese Einstellung nicht selbst geändert haben
-        title: Benutzer aus Suchmaschinen-Indizierung standardmäßig herausnehmen
+        desc_html: Betrifft alle Benutzer, die diese Einstellung nicht selbst geändert haben
+        title: Benutzer standardmäßig von der Suchmaschinen-Indizierung ausnehmen
+      discovery:
+        follow_recommendations: Folgeempfehlungen
+        preamble: Das Auffinden interessanter Inhalte ist wichtig, um neue Nutzer einzubinden, die Mastodon noch nicht kennen. Bestimme, wie verschiedene Suchfunktionen auf deinem Server funktionieren.
+        profile_directory: Profilverzeichnis
+        public_timelines: Öffentliche Timeline
+        title: Entdecken
+        trends: Trends
       domain_blocks:
-        all: An alle
-        disabled: An niemanden
-        title: Zeige Domain-Blockaden
-        users: Für angemeldete lokale Benutzer
-      domain_blocks_rationale:
-        title: Rationale anzeigen
-      hero:
-        desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Server-Thumbnail dafür verwendet
-        title: Bild für Einstiegsseite
-      mascot:
-        desc_html: Angezeigt auf mehreren Seiten. Mehr als 293x205px empfohlen. Wenn es nicht gesetzt wurde wird es auf das Standard-Maskottchen zurückfallen
-        title: Maskottchen-Bild
-      peers_api_enabled:
-        desc_html: Domain-Namen, die der Server im Fediversum gefunden hat
-        title: Veröffentliche entdeckte Server durch die API
-      preview_sensitive_media:
-        desc_html: Linkvorschauen auf anderen Webseiten werden ein Vorschaubild anzeigen, obwohl die Medien als NSFW markiert sind
-        title: NSFW-Medien in OpenGraph-Vorschau anzeigen
-      profile_directory:
-        desc_html: Erlaube Benutzer auffindbar zu sein
-        title: Aktiviere Profilverzeichnis
+        all: Allen
+        disabled: Niemandem
+        users: Für angemeldete lokale Benutzer*innen
       registrations:
-        closed_message:
-          desc_html: Wird auf der Einstiegsseite gezeigt, wenn die Anmeldung geschlossen ist. Du kannst HTML-Tags nutzen
-          title: Nachricht über geschlossene Registrierung
-        deletion:
-          desc_html: Allen erlauben, ihr Konto eigenmächtig zu löschen
-          title: Kontolöschung erlauben
-        min_invite_role:
-          disabled: Niemand
-          title: Einladungen erlauben von
-        require_invite_text:
-          desc_html: Wenn eine Registrierung manuell genehmigt werden muss, mache den "Warum möchtest du beitreten?" Text eher obligatorisch als optional
-          title: Neue Benutzer müssen einen Einladungstext ausfüllen
+        preamble: Lege fest, wer auf Deinem Server ein Konto erstellen darf.
+        title: Registrierungen
       registrations_mode:
         modes:
-          approved: Zustimmung benötigt zur Registrierung
+          approved: Registrierung muss genehmigt werden
           none: Niemand kann sich registrieren
-          open: Jeder kann sich registrieren
-        title: Registrierungsmodus
-      show_known_fediverse_at_about_page:
-        desc_html: Wenn aktiviert, wird es alle Beiträge aus dem bereits bekannten Teil des Fediversums auf der Startseite anzeigen. Andernfalls werden lokale Beitrage des Servers angezeigt.
-        title: Zeige eine öffentliche Zeitleiste auf der Einstiegsseite
-      show_staff_badge:
-        desc_html: Zeige Mitarbeiter-Badge auf Benutzerseite
-        title: Zeige Mitarbeiter-Badge
-      site_description:
-        desc_html: Einleitungsabschnitt auf der Frontseite. Beschreibe, was diesen Mastodon-Server ausmacht. Du kannst HTML-Tags benutzen, insbesondere <code>&lt;a&gt;</code> und <code>&lt;em&gt;</code>.
-        title: Beschreibung des Servers
-      site_description_extended:
-        desc_html: Bietet sich für Verhaltenskodizes, Regeln, Richtlinien und weiteres an, was deinen Server auszeichnet. Du kannst HTML-Tags benutzen
-        title: Erweiterte Beschreibung des Servers
-      site_short_description:
-        desc_html: Wird angezeigt in der Seitenleiste und in Meta-Tags. Beschreibe in einem einzigen Abschnitt, was Mastodon ist und was diesen Server von anderen unterscheidet. Falls leer, wird die Server-Beschreibung verwendet.
-        title: Kurze Beschreibung des Servers
-      site_terms:
-        desc_html: Hier kannst du deine eigenen Geschäftsbedingungen, Datenschutzerklärung und anderes rechtlich Relevante eintragen. Du kannst HTML-Tags nutzen
-        title: Benutzerdefinierte Geschäftsbedingungen
-      site_title: Name des Servers
-      thumbnail:
-        desc_html: Wird für die Vorschau via OpenGraph und API verwendet. 1200×630 px wird empfohlen
-        title: Vorschaubild des Servers
-      timeline_preview:
-        desc_html: Auf der Einstiegsseite die öffentliche Zeitleiste anzeigen
-        title: Zeitleisten-Vorschau
+          open: Alle können sich registrieren
       title: Server-Einstellungen
-      trendable_by_default:
-        desc_html: Betroffene Hashtags, die bisher nicht gesperrt wurden
-        title: Hashtags ohne vorherige Überprüfung erlauben zu trenden
-      trends:
-        desc_html: Zuvor überprüfte Hashtags öffentlich anzeigen, die derzeit angesagt sind
-        title: Trendende Hashtags
     site_uploads:
       delete: Hochgeladene Datei löschen
       destroyed_msg: Upload erfolgreich gelöscht!
     statuses:
+      account: Autor*in
+      application: Anwendung
       back_to_account: Zurück zum Konto
+      back_to_report: Zurück zur Seite mit den Meldungen
       batch:
-        delete: Löschen
-        nsfw_off: Als nicht NSFW markieren
-        nsfw_on: Als NSFW markieren
+        remove_from_report: Von der Meldung entfernen
+        report: Meldung
       deleted: Gelöscht
-      failed_to_execute: Ausführen fehlgeschlagen
+      favourites: Favoriten
+      history: Versionsverlauf
+      in_reply_to: Antwortet auf
+      language: Sprache
       media:
         title: Medien
-      no_media: Keine Medien
+      metadata: Metadaten
       no_status_selected: Keine Beiträge wurden geändert, weil keine ausgewählt wurden
+      open: Beitrag öffnen
+      original_status: Ursprünglicher Beitrag
+      reblogs: Geteilte Beiträge
+      status_changed: Beitrag bearbeitet
       title: Beiträge des Kontos
+      trending: Trends
+      visibility: Sichtbarkeit
       with_media: Mit Medien
+    strikes:
+      actions:
+        delete_statuses: "%{name} hat die Beiträge von %{target} entfernt"
+        disable: "%{name} hat das Konto von %{target} eingefroren"
+        mark_statuses_as_sensitive: "%{name} hat die Beiträge von %{target} mit einer Inhaltswarnung versehen"
+        none: "%{name} hat eine Warnung an %{target} gesendet"
+        sensitive: "%{name} hat das Profil von %{target} mit einer Inhaltswarnung versehen"
+        silence: "%{name} hat das Konto von %{target} stummgeschaltet"
+        suspend: "%{name} hat das Konto von %{target} gesperrt"
+      appeal_approved: Einspruch angenommen
+      appeal_pending: Einspruch ausstehend
     system_checks:
       database_schema_check:
-        message_html: Es gibt ausstehende Datenbankmigrationen. Bitte führen Sie sie aus, um sicherzustellen, dass sich die Anwendung wie erwartet verhält
+        message_html: Es gibt ausstehende Datenbankmigrationen. Bitte führe sie aus, um sicherzustellen, dass sich die Anwendung wie erwartet verhält
+      elasticsearch_running_check:
+        message_html: Verbindung mit Elasticsearch konnte nicht hergestellt werden. Bitte prüfe, ob Elasticsearch läuft, oder deaktiviere die Volltextsuche
+      elasticsearch_version_check:
+        message_html: 'Inkompatible Elasticsearch-Version: %{value}'
+        version_comparison: Elasticsearch %{running_version} läuft, aber %{required_version} wird benötigt
       rules_check:
         action: Serverregeln verwalten
-        message_html: Sie haben keine Serverregeln definiert.
+        message_html: Du hast keine Serverregeln definiert.
       sidekiq_process_check:
-        message_html: Kein Sidekiq-Prozess läuft für die %{value} Warteschlange(n). Bitte überprüfen Sie Ihre Sidekiq-Konfiguration
+        message_html: Kein Sidekiq-Prozess läuft für die %{value} Warteschlange(n). Bitte überprüfe deine Sidekiq-Konfiguration
     tags:
-      accounts_today: Einzigartige Nutzungen heute
-      accounts_week: Einzigartige Nutzung dieser Woche
-      breakdown: Heruntergebrochene Statistiken der heutigen Nutzung nach Quelle
-      last_active: Zuletzt aktiv
-      most_popular: Am beliebtesten
-      most_recent: Neuste
-      name: Hashtag
       review: Prüfstatus
-      reviewed: Überprüft
-      title: Hashtags
-      trending_right_now: Aktuell in den Trends
-      unique_uses_today: "%{count} Beiträge heute"
-      unreviewed: Nicht überprüft
       updated_msg: Hashtageinstellungen wurden erfolgreich aktualisiert
     title: Administration
+    trends:
+      allow: Erlauben
+      approved: Freigegeben
+      disallow: Verbieten
+      links:
+        allow: Link erlauben
+        allow_provider: Herausgeber*in erlauben
+        description_html: Dies sind Links, die derzeit von zahlreichen Accounts geteilt werden und die deinem Server aufgefallen sind. Die Benutzer*innen können darüber herausfinden, was in der Welt vor sich geht. Die Links werden allerdings erst dann öffentlich vorgeschlagen, wenn du die Herausgeber*innen genehmigt hast. Du kannst alternativ aber auch nur einzelne URLs zulassen oder ablehnen.
+        disallow: Link verbieten
+        disallow_provider: Herausgeber*in verbieten
+        no_link_selected: Keine Links wurden geändert, da keine ausgewählt wurden
+        publishers:
+          no_publisher_selected: Keine Herausgeber wurden geändert, da keine ausgewählt wurden
+        shared_by_over_week:
+          one: In der letzten Woche von einer Person geteilt
+          other: In der letzten Woche von %{count} Personen geteilt
+        title: Angesagte Links
+        usage_comparison: Heute %{today} Mal geteilt, gestern %{yesterday} Mal
+      only_allowed: Nur Erlaubte
+      pending_review: Überprüfung ausstehend
+      preview_card_providers:
+        allowed: Links von diesem Herausgeber können angesagt sein
+        description_html: Dies sind Domains, von denen Links oft auf deinem Server geteilt werden. Links werden nicht öffentlich trenden, es sei denn, die Domain des Links wird genehmigt. Deine Zustimmung (oder Ablehnung) erstreckt sich auf Subdomains.
+        rejected: Links von diesem Herausgeber können nicht angesagt sein
+        title: Herausgeber
+      rejected: Abgelehnt
+      statuses:
+        allow: Beitrag erlauben
+        allow_account: Autor*in erlauben
+        description_html: Dies sind Beiträge, von denen dein Server weiß, dass sie derzeit viel geteilt und favorisiert werden. Dies kann neuen und wiederkehrenden Personen helfen, weitere Profile zu finden, denen sie folgen können. Die Beiträge werden erst dann öffentlich angezeigt, wenn du die Person genehmigst und sie es zulässt, dass ihr Profil anderen vorgeschlagen wird. Du kannst auch einzelne Beiträge zulassen oder ablehnen.
+        disallow: Beitrag verbieten
+        disallow_account: Autor*in verweigern
+        no_status_selected: Keine angesagten Beiträge wurden geändert, da keine ausgewählt wurden
+        not_discoverable: Autor*in hat sich dafür entschieden, nicht entdeckt zu werden
+        shared_by:
+          one: Einmal geteilt oder favorisiert
+          other: "%{friendly_count}-mal geteilt oder favorisiert"
+        title: Angesagte Beiträge
+      tags:
+        current_score: Aktuelle Punktzahl %{score}
+        dashboard:
+          tag_accounts_measure: eindeutige Verwendungen
+          tag_languages_dimension: Top Sprachen
+          tag_servers_dimension: Top Server
+          tag_servers_measure: verschiedene Server
+          tag_uses_measure: Gesamtnutzungen
+        description_html: Diese Hashtags werden derzeit in vielen Beiträgen verwendet, die dein Server sieht. Dies kann deinen Nutzer*innen helfen, herauszufinden, worüber die Leute im Moment am meisten schreiben. Hashtags werden erst dann öffentlich angezeigt, wenn du sie genehmigst.
+        listable: Kann vorgeschlagen werden
+        no_tag_selected: Keine Tags wurden geändert, da keine ausgewählt wurden
+        not_listable: Wird nicht vorgeschlagen
+        not_trendable: Wird nicht unter Trends angezeigt
+        not_usable: Kann nicht verwendet werden
+        peaked_on_and_decaying: In den Trends am %{date}, jetzt absteigend
+        title: Angesagte Hashtags
+        trendable: Darf unter Trends erscheinen
+        trending_rank: 'Trend #%{rank}'
+        usable: Kann verwendet werden
+        usage_comparison: Heute %{today} Mal genutzt, gestern %{yesterday} Mal
+        used_by_over_week:
+          one: In der letzten Woche von einer Person genutzt
+          other: In der letzten Woche von %{count} Personen genutzt
+      title: Trends
+      trending: Häufig diskutiert
     warning_presets:
       add_new: Neu hinzufügen
       delete: Löschen
       edit_preset: Warnungsvorlage bearbeiten
       empty: Du hast noch keine Warnungsvorlagen hinzugefügt.
       title: Warnungsvorlagen verwalten
+    webhooks:
+      add_new: Endpunkt hinzufügen
+      delete: Löschen
+      description_html: Ein <strong>Webhook</strong> ermöglicht Mastodon, <strong>Echtzeitbenachrichtigungen</strong> über ausgewählte Ereignisse an deine eigene Anwendung zu senden, damit deine Anwendung <strong>automatisch Reaktionen auslösen kann</strong>.
+      disable: Deaktivieren
+      disabled: Deaktiviert
+      edit: Endpunkt bearbeiten
+      empty: Du hast noch keine Webhook-Endpunkte konfiguriert.
+      enable: Aktivieren
+      enabled: Aktiv
+      enabled_events:
+        one: 1 aktiviertes Ereignis
+        other: "%{count} aktivierte Ereignisse"
+      events: Ereignisse
+      new: Neuer Webhook
+      rotate_secret: Geheimen Schlüssel rotieren
+      secret: Signaturgeheimnis
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: das Löschen der Beiträge
+        disable: das Einfrieren der Konten
+        mark_statuses_as_sensitive: das Markieren der Beiträge mit einer Inhaltswarnung
+        none: eine Warnung
+        sensitive: das Markieren des Profils mit einer Inhaltswarnung
+        silence: das Beschränken des Kontos
+        suspend: um deren Konto zu sperren
+      body: "%{target} hat etwas gegen eine Moderationsentscheidung von %{action_taken_by} vom %{date}, die %{type} war. Die Person schrieb:"
+      next_steps: Du kannst dem Einspruch zustimmen und die Moderationsentscheidung rückgängig machen oder ignorieren.
+      subject: "%{username} hat Einspruch gegen eine Moderationsentscheidung von %{instance} eingelegt"
     new_pending_account:
       body: Die Details von diesem neuem Konto sind unten. Du kannst die Anfrage akzeptieren oder ablehnen.
       subject: Neues Konto zur Überprüfung auf %{instance} verfügbar (%{username})
@@ -712,86 +893,102 @@ de:
       body: "%{reporter} hat %{target} gemeldet"
       body_remote: Jemand von %{domain} hat %{target} gemeldet
       subject: Neue Meldung auf %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Der Hashtag #%{name} ist heute am trenden, aber wurde vorher noch nicht überprüft. Er wird nicht öffentlich angezeigt, es sei denn du erlaubst es oder speicherst das Formular ab und vergisst es.'
-      subject: Neuer Hashtag zur Überprüfung auf %{instance} verfügbar (#%{name})
+    new_trends:
+      body: 'Die folgenden Einträge müssen überprüft werden, bevor sie öffentlich angezeigt werden können:'
+      new_trending_links:
+        title: Angesagte Links
+      new_trending_statuses:
+        title: Angesagte Beiträge
+      new_trending_tags:
+        no_approved_tags: Derzeit gibt es keine genehmigten trendenen Hashtags.
+        requirements: 'Jeder dieser Kandidaten könnte den #%{rank} genehmigten angesagten Hashtag übertreffen, der derzeit #%{lowest_tag_name} mit einer Punktzahl von %{lowest_tag_score} ist.'
+        title: Angesagte Hashtags
+      subject: Neue Trends zur Überprüfung auf %{instance}
   aliases:
     add_new: Alias erstellen
     created_msg: Ein neuer Alias wurde erfolgreich erstellt. Du kannst nun den Wechsel vom alten Konto starten.
-    deleted_msg: Der Alias wurde erfolgreich entfernt. Aus diesem Konto zu diesem zu verschieben ist nicht mehr möglich.
+    deleted_msg: Der Alias wurde erfolgreich entfernt. Aus jenem Konto zu diesem zu verschieben, ist nicht mehr möglich.
     empty: Du hast keine Aliase.
-    hint_html: Wenn du von einem Konto zu einem anderem Konto wechseln möchtest, dann kannst du einen Alias erstellen, welcher benötigt wird bevor du deine Folgenden vom altem Account zu diesen migrierst. Die Aktion alleine ist <strong>harmlos und wi­der­ruf­lich</strong>. <strong>Die Kontenmigration wird vom altem Konto aus eingeleitet</strong>.
+    hint_html: Wenn du von einem Konto zu einem anderen Konto wechseln möchtest, dann kannst du einen Alias erstellen, welcher benötigt wird, bevor du deine Follower vom alten Account zu diesen migrierst. Die Aktion allein ist <strong>harmlos und wi­der­ruf­lich</strong>. <strong>Die Kontenmigration wird vom alten Konto aus eingeleitet</strong>.
     remove: Alle Aliase aufheben
   appearance:
-    advanced_web_interface: Fortgeschrittene Benutzeroberfläche
-    advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, erlaubt dir die fortgeschrittene Benutzeroberfläche viele unterschiedliche Spalten auf einmal zu sehen, wie z.B. deine Startseite, Benachrichtigungen, das gesamte bekannte Netz, deine Listen und beliebige Hashtags.
+    advanced_web_interface: Erweitertes Webinterface
+    advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, kannst du mit dem erweiterten Webinterface weitere Spalten hinzufügen und dadurch mehr Informationen auf einmal sehen, z. B. deine Startseite, die Mitteilungen, die föderierte Timeline sowie beliebig viele deiner Listen und Hashtags.
     animations_and_accessibility: Animationen und Barrierefreiheit
-    confirmation_dialogs: Bestätigungsfenster
+    confirmation_dialogs: Bestätigungsdialoge
     discovery: Entdecken
     localization:
-      body: Mastodon wurde von Freiwilligen übersetzt.
+      body: Mastodon wird von Freiwilligen übersetzt.
       guide_link: https://de.crowdin.com/project/mastodon
-      guide_link_text: Jeder kann etwas dazu beitragen.
-    sensitive_content: NSFW
-    toot_layout: Beitragslayout
+      guide_link_text: Alle können mitmachen und etwas dazu beitragen.
+    sensitive_content: Inhaltswarnung
+    toot_layout: Timeline-Layout
   application_mailer:
-    notification_preferences: Ändere E-Mail-Einstellungen
+    notification_preferences: E-Mail-Einstellungen ändern
     salutation: "%{name},"
     settings: 'E-Mail-Einstellungen ändern: %{link}'
     view: 'Ansehen:'
-    view_profile: Zeige Profil
+    view_profile: Profil anzeigen
     view_status: Beitrag öffnen
   applications:
     created: Anwendung erfolgreich erstellt
     destroyed: Anwendung erfolgreich gelöscht
-    invalid_url: Die angegebene URL ist ungültig
     regenerate_token: Zugangs-Token neu erstellen
-    token_regenerated: Zugangs-Token neu erstellt
+    token_regenerated: Zugriffstoken erfolgreich neu erstellt
     warning: Sei mit diesen Daten sehr vorsichtig. Teile sie mit niemandem!
     your_token: Dein Zugangs-Token
   auth:
-    apply_for_account: Eine Einladung anfragen
+    apply_for_account: Konto beantragen
     change_password: Passwort
-    checkbox_agreement_html: Ich akzeptiere die <a href="%{rules_path}" target="_blank">Server-Regeln</a> und die <a href="%{terms_path}" target="_blank">Nutzungsbedingungen</a>
-    checkbox_agreement_without_rules_html: Ich stimme den <a href="%{terms_path}" target="_blank">Nutzungsbedingungen</a> zu
     delete_account: Konto löschen
-    delete_account_html: Falls du dein Konto löschen willst, kannst du <a href="%{path}">hier damit fortfahren</a>. Du wirst um Bestätigung gebeten werden.
+    delete_account_html: Falls du dein Konto endgültig löschen möchtest, kannst du das <a href="%{path}">hier vornehmen</a>. Du musst dies zusätzlich bestätigen.
     description:
       prefix_invited_by_user: "@%{name} lädt dich ein, diesem Server von Mastodon beizutreten!"
-      prefix_sign_up: Melde dich heute bei Mastodon an!
-      suffix: Mit einem Konto kannst du Leuten folgen, Updates veröffentlichen und Nachrichten mit Benutzern von jedem Mastodon-Server austauschen und mehr!
-    didnt_get_confirmation: Keine Bestätigungs-Mail erhalten?
+      prefix_sign_up: Registriere dich noch heute bei Mastodon!
+      suffix: Mit einem Konto kannst du Profilen folgen, neue Beiträge veröffentlichen, Nachrichten mit Personen von jedem Mastodon-Server austauschen und vieles mehr!
+    didnt_get_confirmation: Keine Bestätigungsanweisungen erhalten?
     dont_have_your_security_key: Hast du keinen Sicherheitsschlüssel?
     forgot_password: Passwort vergessen?
     invalid_reset_password_token: Das Token zum Zurücksetzen des Passworts ist ungültig oder abgelaufen. Bitte fordere ein neues an.
     link_to_otp: Gib einen Zwei-Faktor-Code von deinem Handy oder einen Wiederherstellungscode ein
-    link_to_webauth: Verwende deinen Sicherheitsschlüssel
+    link_to_webauth: Verwende dein Sicherheitsschlüsselgerät
+    log_in_with: Anmelden mit
     login: Anmelden
     logout: Abmelden
-    migrate_account: Ziehe zu einem anderen Konto um
-    migrate_account_html: Wenn du wünschst, dieses Konto zu einem anderen umzuziehen, kannst du <a href="%{path}">dies hier einstellen</a>.
+    migrate_account: Zu einem anderen Konto umziehen
+    migrate_account_html: Wenn du dieses Konto auf ein anderes umleiten möchtest, kannst du es <a href="%{path}">hier konfigurieren</a>.
     or_log_in_with: Oder anmelden mit
+    privacy_policy_agreement_html: Ich habe die <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> gelesen und stimme ihr zu
     providers:
       cas: CAS
       saml: SAML
     register: Registrieren
     registration_closed: "%{instance} akzeptiert keine neuen Mitglieder"
-    resend_confirmation: Bestätigungs-Mail erneut versenden
+    resend_confirmation: Bestätigungsanweisungen erneut senden
     reset_password: Passwort zurücksetzen
+    rules:
+      preamble: Diese werden von den %{domain}-Moderator*innen festgelegt und erzwungen.
+      title: Einige Grundregeln.
     security: Sicherheit
     set_new_password: Neues Passwort setzen
     setup:
       email_below_hint_html: Wenn die unten stehende E-Mail-Adresse falsch ist, kannst du sie hier ändern und eine neue Bestätigungs-E-Mail erhalten.
       email_settings_hint_html: Die Bestätigungs-E-Mail wurde an %{email} gesendet. Wenn diese E-Mail-Adresse nicht korrekt ist, kannst du sie in den Einstellungen ändern.
       title: Konfiguration
+    sign_in:
+      preamble_html: Melde dich mit deinen Zugangsdaten für <strong>%{domain}</strong> an. Solltest du dein Konto auf einem anderen Server registriert haben, ist eine Anmeldung hier nicht möglich.
+      title: Bei %{domain} anmelden
+    sign_up:
+      preamble: Mit einem Account auf diesem Mastodon-Server kannst du jeder anderen Person im Netzwerk folgen, unabhängig davon, wo ihr Account gehostet wird.
+      title: Okay, lass uns mit %{domain} anfangen.
     status:
       account_status: Kontostatus
-      confirming: Warte auf die Bestätigung der E-Mail.
+      confirming: Auf die Bestätigung deiner E-Mail-Adresse wird gewartet.
       functional: Dein Konto ist voll funktionsfähig.
-      pending: Deine Bewerbung wird von unseren Mitarbeitern noch überprüft. Dies kann einige Zeit dauern. Du erhältst eine E-Mail, wenn deine Bewerbung genehmigt wurde.
-      redirecting_to: Dein Konto ist inaktiv, da es derzeit zu %{acct} umgeleitet wird.
-    too_fast: Formular zu schnell gesendet, versuchen Sie es erneut.
-    trouble_logging_in: Schwierigkeiten beim Anmelden?
+      pending: Die Prüfung deiner Bewerbung steht noch aus. Dies kann einige Zeit in Anspruch nehmen. Sobald deine Bewerbung genehmigt wurde, erhältst du eine E-Mail.
+      redirecting_to: Dein Konto ist inaktiv, weil es zu %{acct} umgezogen ist.
+      view_strikes: Vorherige Verstöße deines Kontos ansehen
+    too_fast: Formular zu schnell gesendet, versuche es erneut.
     use_security_key: Sicherheitsschlüssel verwenden
   authorize_follow:
     already_following: Du folgst diesem Konto bereits
@@ -802,14 +999,14 @@ de:
     following: 'Erfolg! Du folgst nun:'
     post_follow:
       close: Oder du schließt einfach dieses Fenster.
-      return: Zeige das Profil
+      return: Benutzerprofil anzeigen
       web: In der Benutzeroberfläche öffnen
     title: "%{acct} folgen"
   challenge:
     confirm: Fortfahren
     hint_html: "<strong>Hinweis:</strong> Wir werden dich für die nächste Stunde nicht erneut nach deinem Passwort fragen."
     invalid_password: Ungültiges Passwort
-    prompt: Gib dein Passwort ein um fortzufahren
+    prompt: Gib dein Passwort ein, um fortzufahren
   crypto:
     errors:
       invalid_key: ist kein gültiger Ed25519- oder Curve25519-Schlüssel
@@ -835,138 +1032,176 @@ de:
   deletes:
     challenge_not_passed: Die eingegebenen Informationen waren nicht korrekt
     confirm_password: Gib dein derzeitiges Passwort ein, um deine Identität zu bestätigen
-    confirm_username: Gib deinen Benutzernamen ein, um das Verfahren zu bestätigen
+    confirm_username: Gib deinen Profilnamen ein, um den Vorgang zu bestätigen
     proceed: Konto löschen
     success_msg: Dein Konto wurde erfolgreich gelöscht
     warning:
-      before: 'Bevor du fortfährst, lese bitte diese Punkte sorgfältig durch:'
+      before: 'Bevor du fortfährst, lies bitte diese Punkte sorgfältig durch:'
       caches: Inhalte, die von anderen Servern zwischengespeichert wurden, können weiterhin bestehen
-      data_removal: Deine Beiträge und andere Daten werden dauerhaft entfernt
+      data_removal: Deine Beiträge und alle anderen Daten werden für immer entfernt
       email_change_html: Du kannst <a href="%{path}">deine E-Mail-Adresse ändern</a>, ohne dein Konto zu löschen
       email_contact_html: Wenn die Bestätigungs-E-Mail immer noch nicht ankam, kannst du eine E-Mail an <a href="mailto:%{email}">%{email}</a> senden, um weitere Hilfe zu erhalten
       email_reconfirmation_html: Wenn du die Bestätigungs-E-Mail nicht erhalten hast, kannst du sie <a href="%{path}">erneut anfordern</a>
-      irreversible: Du kannst dein Konto nicht reaktivieren
-      more_details_html: Weitere Details findest du in der <a href="%{terms_path}">Datenschutzrichtlinie</a>.
-      username_available: Dein Benutzername wird wieder verfügbar
-      username_unavailable: Dein Benutzername bleibt nicht verfügbar
-  directories:
-    directory: Profilverzeichnis
-    explanation: Entdecke Benutzer basierend auf deren Interessen
-    explore_mastodon: Entdecke %{title}
+      irreversible: Du kannst dein Konto nicht mehr wiederherstellen oder reaktivieren
+      more_details_html: Weitere Details findest du in der <a href="%{terms_path}">Datenschutzerklärung</a>.
+      username_available: Dein Profilname wird wieder verfügbar sein
+      username_unavailable: Dein Profilname wird auch nach dem Löschen für andere nicht zugänglich sein
+  disputes:
+    strikes:
+      action_taken: Maßnahme ergriffen
+      appeal: Einspruch
+      appeal_approved: Dieser Verstoß wurde erfolgreich angefochten und ist nicht mehr gültig
+      appeal_rejected: Der Einspruch wurde abgelehnt
+      appeal_submitted_at: Einspruch eingereicht
+      appealed_msg: Dein Einspruch wurde übermittelt. Wenn er angenommen wird, wirst du benachrichtigt.
+      appeals:
+        submit: Einspruch erheben
+      approve_appeal: Einspruch annehmen
+      associated_report: Zugehöriger Bericht
+      created_at: Datum
+      description_html: Dies sind Aktionen gegen dein Konto und Warnungen, die von den Mitarbeitern von %{instance} an dich gesendet wurden.
+      recipient: Adressiert an
+      reject_appeal: Einspruch ablehnen
+      status: 'Beitrag #%{id}'
+      status_removed: Beitrag bereits vom System entfernt
+      title: "%{action} vom %{date}"
+      title_actions:
+        delete_statuses: Beitragsentfernung
+        disable: Einfrieren des Kontos
+        mark_statuses_as_sensitive: Beiträge mit einer Inhaltswarnung versehen
+        none: Warnung
+        sensitive: Profil mit einer Inhaltswarnung versehen
+        silence: Kontobeschränkung
+        suspend: Kontosperre
+      your_appeal_approved: Dein Einspruch wurde angenommen
+      your_appeal_pending: Du hast Einspruch eingelegt
+      your_appeal_rejected: Dein Einspruch wurde abgelehnt
   domain_validator:
     invalid_domain: ist kein gültiger Domain-Name
   errors:
     '400': Die Anfrage, die du gesendet hast, war ungültig oder fehlerhaft.
     '403': Dir fehlt die Befugnis, diese Seite sehen zu können.
-    '404': Die Seite nach der du gesucht hast wurde nicht gefunden.
+    '404': Die Seite, nach der du gesucht hast, wurde nicht gefunden.
     '406': Diese Seite ist im gewünschten Format nicht verfügbar.
-    '410': Die Seite nach der du gesucht hast existiert hier nicht mehr.
+    '410': Die Seite, nach der du gesucht hast, existiert hier nicht mehr.
     '422':
-      content: Sicherheitsüberprüfung fehlgeschlagen. Blockierst du Cookies?
+      content: Sicherheitsüberprüfung fehlgeschlagen. Sperrst du Cookies aus?
       title: Sicherheitsüberprüfung fehlgeschlagen
     '429': Du wurdest gedrosselt
     '500':
-      content: Bitte verzeih, etwas ist bei uns schief gegangen.
+      content: Bitte verzeih', etwas ist bei uns schiefgegangen.
       title: Diese Seite ist kaputt
     '503': Die Seite konnte wegen eines temporären Serverfehlers nicht angezeigt werden.
     noscript_html: Bitte aktiviere JavaScript, um die Mastodon-Web-Anwendung zu verwenden. Alternativ kannst du auch eine der <a href="%{apps_path}">nativen Mastodon-Anwendungen</a> für deine Plattform probieren.
   existing_username_validator:
-    not_found: kann lokalen Benutzer nicht mit diesem Nuternamen finden
-    not_found_multiple: kann %{usernames} nicht finden
+    not_found: kann lokale*n Benutzer*in mit diesem Profilnamen nicht finden
+    not_found_multiple: "%{usernames} können nicht gefunden werden"
   exports:
     archive_takeout:
       date: Datum
       download: Dein Archiv herunterladen
-      hint_html: Du kannst ein Archiv deiner <strong>Beiträge und hochgeladenen Medien</strong> anfragen. Die exportierten Daten werden in dem ActivityPub-Format gespeichert, welches mit jeder Software lesbar ist die das Format unterstützt. Du kannst alle 7 Tage ein Archiv anfordern.
-      in_progress: Stelle dein Archiv zusammen...
-      request: Dein Archiv anfragen
+      hint_html: Du kannst ein Archiv deiner <strong>Beiträge, Listen, hochgeladenen Medien usw.</strong> anfordern. Die exportierten Daten werden im ActivityPub-Format gespeichert und können mit geeigneter Software ausgewertet und angezeigt werden. Du kannst alle 7 Tage ein Archiv erstellen lassen.
+      in_progress: Persönliches Archiv wird erstellt …
+      request: Dein Archiv anfordern
       size: Größe
-    blocks: Du hast blockiert
+    blocks: Gesperrte Accounts
     bookmarks: Lesezeichen
     csv: CSV
-    domain_blocks: Domainblockaden
+    domain_blocks: Gesperrte Domains
     lists: Listen
-    mutes: Du hast stummgeschaltet
+    mutes: Stummgeschaltete Accounts
     storage: Medienspeicher
   featured_tags:
     add_new: Neu hinzufügen
     errors:
       limit: Du hast bereits die maximale Anzahl an empfohlenen Hashtags erreicht
-    hint_html: "<strong>Was sind empfohlene Hashtags?</strong> Sie werden in deinem öffentlichen Profil deutlich angezeigt und ermöglichen es den Menschen, deine öffentlichen Beiträge speziell unter diesen Hashtags zu durchsuchen. Sie sind ein großartiges Werkzeug, um kreative Werke oder langfristige Projekte zu verfolgen."
+    hint_html: "<strong>Was sind empfohlene Hashtags?</strong> Sie werden in deinem öffentlichen Profil hervorgehoben und ermöglichen es den Menschen, deine öffentlichen Beiträge speziell unter diesen Hashtags zu durchsuchen. Sie sind ein großartiges Werkzeug, um kreative Werke oder langfristige Projekte zu verfolgen."
   filters:
     contexts:
       account: Profile
       home: Startseite
-      notifications: Benachrichtigungen
-      public: Öffentliche Zeitleisten
-      thread: Gespräche
+      notifications: Mitteilungen
+      public: Öffentliche Timelines
+      thread: Unterhaltungen
     edit:
+      add_keyword: Stichwort hinzufügen
+      keywords: Stichwörter
+      statuses: Individuelle Beiträge
+      statuses_hint_html: Dieser Filter gilt für die Auswahl einzelner Beiträge, unabhängig davon, ob sie mit den unten stehenden Schlüsselwörtern übereinstimmen. <a href="%{path}">Beiträge im Filter ansehen oder entfernen.</a>.
       title: Filter bearbeiten
     errors:
+      deprecated_api_multiple_keywords: Diese Parameter können von dieser Anwendung nicht geändert werden, da sie auf mehr als ein Filterschlüsselwort angewendet werden. Verwende eine neuere Anwendung oder das Webinterface.
       invalid_context: Ungültiger oder fehlender Kontext übergeben
-      invalid_irreversible: Unwiderrufliche Filterung funktioniert nur mit Heim- oder Benachrichtigungskontext
     index:
+      contexts: Filter in %{contexts}
       delete: Löschen
-      empty: Du hast keine Filter.
+      empty: Du hast noch keine Filter erstellt.
+      expires_in: Läuft ab in %{distance}
+      expires_on: Läuft am %{date} ab
+      keywords:
+        one: "%{count} Stichwort"
+        other: "%{count} Stichwörter"
+      statuses:
+        one: "%{count} Beitrag"
+        other: "%{count} Beiträge"
+      statuses_long:
+        one: "%{count} individueller Beitrag ausgeblendet"
+        other: "%{count} individuelle Beiträge ausgeblendet"
       title: Filter
     new:
+      save: Neuen Filter speichern
       title: Neuen Filter hinzufügen
+    statuses:
+      back_to_filter: Zurück zum Filter
+      batch:
+        remove: Filter entfernen
+      index:
+        hint: Dieser Filter wird verwendet, um einzelne Beiträge unabhängig von anderen Kriterien auszuwählen. Du kannst mehr Beiträge zu diesem Filter über das Webinterface hinzufügen.
+        title: Gefilterte Beiträge
   footer:
-    developers: Entwickler
-    more: Mehr…
-    resources: Ressourcen
     trending_now: In den Trends
   generic:
     all: Alle
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> Element auf dieser Seite ausgewählt."
+      other: Alle <strong>%{count}</strong> Elemente auf dieser Seite ausgewählt.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> Element trifft auf ihre Suche zu."
+      other: Alle <strong>%{count}</strong> Elemente, die Ihrer Suche entsprechen, werden ausgewählt.
     changes_saved_msg: Änderungen gespeichert!
     copy: Kopieren
     delete: Löschen
-    no_batch_actions_available: Keine Massenaktionen auf dieser Seite verfügbar
+    deselect: Auswahl für alle aufheben
+    none: Keine
     order_by: Sortieren nach
     save_changes: Änderungen speichern
+    select_all_matching_items:
+      one: Wähle %{count} Element, das deiner Suche entspricht.
+      other: Wählen Sie alle %{count} Elemente, die Ihrer Suche entsprechen.
+    today: heute
     validation_errors:
       one: Etwas ist noch nicht ganz richtig! Bitte korrigiere den Fehler
       other: Etwas ist noch nicht ganz richtig! Bitte korrigiere %{count} Fehler
   html_validator:
     invalid_markup: 'enthält ungültiges HTML-Markup: %{error}'
-  identity_proofs:
-    active: Aktiv
-    authorize: Ja, autorisieren
-    authorize_connection_prompt: Diese kryptographische Verbindung autorisieren?
-    errors:
-      failed: Die kryptographische Verbindung ist fehlgeschlagen. Bitte versuche es nochmal von %{provider}.
-      keybase:
-        invalid_token: Keybase-Tokens sind Hashsignaturen und müssen 66 Hexadezimalzeichen lang sein
-        verification_failed: Keybase nimmt dieses Token nicht als Signatur für Keybase-Benutzer %{kb_username} an. Bitte versuche es nochmal über Keybase.
-      wrong_user: Kann keinen Beweis für %{proving} erstellen während du als %{current} angemeldet bist. Melde dich als %{proving} an und versuche es noch einmal.
-    explanation_html: Hier kannst du kryptographisch deine anderen Identitäten wie dein Keybase-Profil verbinden. Dadurch können andere Leute dir verschlüsselte Nachrichten senden und dem Inhalt, den sie dir senden, vertrauen.
-    i_am_html: Ich bin %{username} auf %{service}.
-    identity: Identität
-    inactive: Inaktiv
-    publicize_checkbox: 'Und poste das:'
-    publicize_toot: 'Es ist offiziell! Ich bin %{username} auf %{service}: %{url}'
-    remove: Nachweis vom Konto entfernen
-    removed: Identitätsnachweis erfolgreich vom Konto entfernt
-    status: Verifizierungsstatus
-    view_proof: Zeige Nachweis
   imports:
     errors:
+      invalid_csv_file: 'Ungültige CSV-Datei. Fehler: %{error}'
       over_rows_processing_limit: enthält mehr als %{count} Zeilen
     modes:
       merge: Zusammenführen
       merge_long: Behalte existierende Datensätze und füge neue hinzu
       overwrite: Überschreiben
       overwrite_long: Ersetze aktuelle Datensätze mit neuen
-    preface: Daten, die du aus einem anderen Server exportiert hast, kannst du hier importieren. Beispielsweise die Liste derjenigen, denen du folgst oder die du blockiert hast.
+    preface: Daten, die du von einem anderen Server exportiert hast, kannst du hierher importieren. Das betrifft beispielsweise die Listen von Profilen, denen du folgst oder die du gesperrt hast.
     success: Deine Daten wurden erfolgreich hochgeladen und werden in Kürze verarbeitet
     types:
-      blocking: Blockierliste
+      blocking: Sperrliste
       bookmarks: Lesezeichen
-      domain_blocking: Domain-Blockliste
+      domain_blocking: Domain-Sperrliste
       following: Folgeliste
       muting: Stummschaltungsliste
-    upload: Hochladen
-  in_memoriam_html: In Gedenken.
+    upload: Liste importieren
   invites:
     delete: Deaktivieren
     expired: Abgelaufen
@@ -978,27 +1213,27 @@ de:
       '604800': 1 Woche
       '86400': 1 Tag
     expires_in_prompt: Nie
-    generate: Generieren
+    generate: Einladungslink erstellen
     invited_by: 'Du wurdest eingeladen von:'
     max_uses:
       one: 1 mal verwendet
       other: "%{count} mal verwendet"
-    max_uses_prompt: Kein Limit
-    prompt: Generiere und teile Links um Zugang zu diesem Server zu geben
+    max_uses_prompt: Keine Einschränkung
+    prompt: Erstelle Einladungen und teile die dazugehörigen Links, um anderen einen Zugang zu diesem Server zu gewähren
     table:
       expires_at: Läuft ab
-      uses: Verwendungen
+      uses: Verwendet
     title: Leute einladen
   lists:
     errors:
       limit: Du hast die maximale Anzahl an Listen erreicht
   login_activities:
     authentication_methods:
-      otp: Zwei-Faktor-Authentifizierung-App
+      otp: Zwei-Faktor-Authentisierungs-App
       password: Passwort
-      sign_in_token: E-Mail Sicherheitscode
+      sign_in_token: E-Mail-Sicherheitscode
       webauthn: Sicherheitsschlüssel
-    description_html: Wenn du Aktivitäten siehst, die du nicht erkennst, solltest du dein Passwort ändern und die Zwei-Faktor-Authentifizierung aktivieren.
+    description_html: Wenn du verdächtige Aktivitäten bemerkst, die du nicht verstehst oder zuordnen kannst, solltest du dringend dein Passwort ändern und ungeachtet dessen die Zwei-Faktor-Authentisierung (2FA) aktivieren.
     empty: Kein Authentifizierungsverlauf verfügbar
     failed_sign_in_html: Fehler beim Anmeldeversuch mit %{method} von %{ip} (%{browser})
     successful_sign_in_html: Erfolgreiche Anmeldung mit %{method} von %{ip} (%{browser})
@@ -1006,12 +1241,12 @@ de:
   media_attachments:
     validations:
       images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthält, angehängt werden
-      not_ready: Dateien die noch nicht bearbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
+      not_ready: Dateien, die noch nicht bearbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal!
       too_many: Es können nicht mehr als 4 Dateien angehängt werden
   migrations:
-    acct: benutzername@domain des neuen Kontos
+    acct: umgezogen nach
     cancel: Umleitung abbrechen
-    cancel_explanation: Das Abbrechen der Umleitung wird dein aktuelles Konto erneut aktivieren, aber keine Folgenden, die auf dieses Konto verschoben wurden, zurückholen.
+    cancel_explanation: Das Abbrechen der Umleitung wird dein aktuelles Konto erneut aktivieren, aber keine Follower, die auf dieses Konto verschoben wurden, zurückholen.
     cancelled_msg: Die Umleitung wurde erfolgreich abgebrochen.
     errors:
       already_moved: ist das gleiche Konto, zu dem du bereits umgezogen bist
@@ -1019,44 +1254,40 @@ de:
       move_to_self: darf nicht das aktuelles Konto sein
       not_found: kann nicht gefunden werden
       on_cooldown: Die Abklingzeit läuft gerade
-    followers_count: Folgende zur Zeit des Verschiebens
-    incoming_migrations: Ziehe von einem anderen Konto um
+    followers_count: Anzahl der Follower zum Zeitpunkt der Migration des Accounts
+    incoming_migrations: Von einem anderen Konto umziehen
     incoming_migrations_html: Um von einem anderen Konto zu diesem zu wechseln, musst du zuerst <a href="%{path}">einen Kontoalias</a> erstellen.
-    moved_msg: Dein Konto wird jetzt zu %{acct} weitergeleitet und deine Folgende werden verschoben.
+    moved_msg: Dein altes Profil wird jetzt zum neuen Account %{acct} weitergeleitet und deine Follower werden übertragen.
     not_redirecting: Dein Konto wird derzeit nicht auf ein anderes Konto weitergeleitet.
     on_cooldown: Du hast dein Konto vor kurzem migriert. Diese Funktion wird in %{count} Tagen wieder verfügbar sein.
     past_migrations: Vorherige Migrationen
-    proceed_with_move: Folgende verschieben
+    proceed_with_move: Follower übertragen
     redirected_msg: Dein Konto wird nun zu %{acct} weitergeleitet.
     redirecting_to: Dein Konto wird zu %{acct} weitergeleitet.
     set_redirect: Umleitung einrichten
     warning:
       backreference_required: Das neue Konto muss zuerst so konfiguriert werden, dass es auf das alte Konto referenziert
-      before: 'Bevor du fortfährst, lese bitte diese Hinweise sorgfältig durch:'
+      before: 'Bevor du fortfährst, lies bitte diese Hinweise sorgfältig durch:'
       cooldown: Nach dem Migrieren wird es eine Abklingzeit geben, in der du das Konto nicht noch einmal migrieren kannst
       disabled_account: Dein aktuelles Konto wird nachher nicht vollständig nutzbar sein. Du hast jedoch Zugriff auf den Datenexport sowie die Reaktivierung.
-      followers: Diese Aktion wird alle Folgende vom aktuellen Konto auf das neue Konto verschieben
+      followers: Alle Follower werden vom aktuellen zum neuen Konto übertragen
       only_redirect_html: Alternativ kannst du <a href="%{path}">nur eine Weiterleitung auf dein Profil</a> erstellen.
       other_data: Keine anderen Daten werden automatisch verschoben
       redirect: Das Profil deines aktuellen Kontos wird mit einer Weiterleitungsnachricht versehen und von Suchanfragen ausgeschlossen
   moderation:
     title: Moderation
   move_handler:
-    carry_blocks_over_text: Dieses Benutzerkonto ist von %{acct} umgezogen, welches du blockiert hast.
-    carry_mutes_over_text: Dieses Benutzerkonto ist von %{acct} umgezogen, welches du stummgeschaltet hast.
-    copy_account_note_text: 'Dieser Benutzer ist von %{acct} umgezogen, hier waren deine letzten Notizen zu diesem Benutzer:'
+    carry_blocks_over_text: Dieses Konto ist von %{acct}, das du gesperrt hast, umgezogen.
+    carry_mutes_over_text: Dieses Konto ist von %{acct}, das du stummgeschaltet hast, umgezogen.
+    copy_account_note_text: 'Dieses Konto ist von %{acct} umgezogen. Hier deine damals verfassten Notizen zum Profil:'
+  navigation:
+    toggle_menu: Menü ein-/ausblenden
   notification_mailer:
-    digest:
-      action: Zeige alle Benachrichtigungen
-      body: Hier ist eine kurze Zusammenfassung der Nachrichten, die du seit deinem letzten Besuch am %{since} verpasst hast
-      mention: "%{name} hat dich erwähnt:"
-      new_followers_summary:
-        one: Außerdem ist dir seit du weg warst ein weiteres Wesen gefolgt! Juhu!
-        other: Außerdem sind dir seit du weg warst %{count} weitere Wesen gefolgt! Großartig!
-      subject:
-        one: "1 neue Mitteilung seit deinem letzten Besuch \U0001F418"
-        other: "%{count} neue Mitteilungen seit deinem letzten Besuch \U0001F418"
-      title: In deiner Abwesenheit...
+    admin:
+      report:
+        subject: "%{name} hat eine Meldung eingereicht"
+      sign_up:
+        subject: "%{name} registrierte sich"
     favourite:
       body: 'Dein Beitrag wurde von %{name} favorisiert:'
       subject: "%{name} hat deinen Beitrag favorisiert"
@@ -1078,15 +1309,17 @@ de:
     poll:
       subject: Eine Umfrage von %{name} ist beendet
     reblog:
-      body: "%{name} hat deinen Beitrag geteilt:"
+      body: 'Deinen Beitrag hat %{name} geteilt:'
       subject: "%{name} hat deinen Beitrag geteilt"
       title: Dein Beitrag wurde geteilt
     status:
       subject: "%{name} hat gerade etwas gepostet"
+    update:
+      subject: "%{name} bearbeitete einen Beitrag"
   notifications:
-    email_events: Ereignisse für E-Mail-Benachrichtigungen
-    email_events_hint: 'Wähle Ereignisse, für die du Benachrichtigungen erhalten möchtest:'
-    other_settings: Weitere Benachrichtigungseinstellungen
+    email_events: Benachrichtigungen per E-Mail
+    email_events_hint: 'Bitte die Ereignisse auswählen, für die du Benachrichtigungen erhalten möchtest:'
+    other_settings: Weitere Einstellungen
   number:
     human:
       decimal_units:
@@ -1098,11 +1331,11 @@ de:
           thousand: K
           trillion: T
   otp_authentication:
-    code_hint: Gib den von deiner Authentifizierungs-App generierten Code ein, um deine Anmeldung zu bestätigen
-    description_html: Wenn du <strong>Zwei-Faktor-Authentifizierung</strong> mit einer Authentifizierungs-App aktivierst, musst du, um dich anzumelden, im Besitz deines Handys sein, dass Tokens für dein Konto generiert.
+    code_hint: Gib den Code ein, den deine 2FA- bzw. TOTP-App generiert hat, um den Vorgang zu bestätigen
+    description_html: Wenn du die <strong>Zwei-Faktor-Authentisierung</strong> (2FA) mit einer Authentifizierungs-App deines Smartphones aktivierst, benötigst du neben dem regulären Passwort zusätzlich auch den zeitbasierten Code der 2FA-App, um dich anmelden zu können.
     enable: Aktivieren
-    instructions_html: "<strong>Scanne diesen QR-Code in Google Authenticator oder einer ähnlichen TOTP-App auf deinem Handy</strong>. Von nun an generiert diese App Tokens, die du beim Anmelden eingeben musst."
-    manual_instructions: 'Wenn du den QR-Code nicht scannen kannst und ihn manuell eingeben musst, ist hier das Klartext-Geheimnis:'
+    instructions_html: "<strong>Scanne diesen QR-Code mit einer TOTP-App (wie dem Google Authenticator)</strong>. Die 2FA-App generiert dann zeitbasierte Codes, die du beim Login zusätzlich zum regulären Passwort eingeben musst."
+    manual_instructions: Wenn du den QR-Code nicht einscannen kannst, sondern die Zahlenfolge manuell eingeben musst, ist hier der geheime Token für deine 2FA-App.
     setup: Einrichten
     wrong_code: Der eingegebene Code war ungültig! Sind die Serverzeit und die Gerätezeit korrekt?
   pagination:
@@ -1118,14 +1351,16 @@ de:
       duration_too_long: ist zu weit in der Zukunft
       duration_too_short: ist zu früh
       expired: Die Umfrage ist bereits vorbei
-      invalid_choice: Die gewählte Stimmenoption existiert nicht
+      invalid_choice: Die gewählte Abstimmoption existiert nicht
       over_character_limit: kann nicht länger als jeweils %{max} Zeichen sein
       too_few_options: muss mindestens einen Eintrag haben
       too_many_options: kann nicht mehr als %{max} Einträge beinhalten
   preferences:
-    other: Weiteres
+    other: Erweitert
     posting_defaults: Standardeinstellungen für Beiträge
-    public_timelines: Öffentliche Zeitleisten
+    public_timelines: Öffentliche Timelines
+  privacy_policy:
+    title: Datenschutzerklärung
   reactions:
     errors:
       limit_reached: Limit für verschiedene Reaktionen erreicht
@@ -1133,47 +1368,40 @@ de:
   relationships:
     activity: Kontoaktivität
     dormant: Inaktiv
-    follow_selected_followers: Ausgewählte Follower folgen
-    followers: Folgende
-    following: Folgt
+    follow_selected_followers: Ausgewählten Followern folgen
+    followers: Follower
+    following: Folge ich
     invited: Eingeladen
     last_active: Zuletzt aktiv
     most_recent: Neuste
     moved: Umgezogen
-    mutual: Bekannt
+    mutual: Gegenseitig
     primary: Primär
     relationship: Beziehung
     remove_selected_domains: Entferne alle Follower von den ausgewählten Domains
     remove_selected_followers: Entferne ausgewählte Follower
-    remove_selected_follows: Entfolge ausgewählte Benutzer
+    remove_selected_follows: Ausgewählten Benutzer*innen entfolgen
     status: Kontostatus
   remote_follow:
-    acct: Profilname@Domain, von wo aus du dieser Person folgen möchtest
     missing_resource: Die erforderliche Weiterleitungs-URL für dein Konto konnte nicht gefunden werden
-    no_account_html: Noch kein Konto? Du kannst dich <a href='%{sign_up_path}' target='_blank'>hier anmelden</a>
-    proceed: Weiter
-    prompt: 'Du wirst dieser Person folgen:'
-    reason_html: "<strong>Warum ist dieser Schritt erforderlich?</strong><code>%{instance}</code> ist möglicherweise nicht der Server auf dem du registriert bist, also müssen wir dich erst auf deinen Heimserver weiterleiten."
-  remote_interaction:
-    favourite:
-      proceed: Fortfahren zum Favorisieren
-      prompt: 'Du möchtest diesen Beitrag favorisieren:'
-    reblog:
-      proceed: Fortfahren zum Teilen
-      prompt: 'Du möchtest diesen Beitrag teilen:'
-    reply:
-      proceed: Fortfahren zum Antworten
-      prompt: 'Du möchtest auf diesen Beitrag antworten:'
+  reports:
+    errors:
+      invalid_rules: verweist nicht auf gültige Regeln
+  rss:
+    content_warning: 'Inhaltswarnung:'
+    descriptions:
+      account: Öffentliche Beiträge von @%{acct}
+      tag: 'Öffentliche Beiträge mit dem Tag #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Du hast das Limit für geplante Beiträge, dass %{limit} beträgt, für heute erreicht
-    over_total_limit: Du hast das Limit für geplante Beiträge, dass %{limit} beträgt, erreicht
+    over_daily_limit: Du hast das Limit für geplante Beiträge, welches %{limit} beträgt, für heute erreicht
+    over_total_limit: Du hast das Limit für geplante Beiträge, welches %{limit} beträgt, erreicht
     too_soon: Das geplante Datum muss in der Zukunft liegen
   sessions:
     activity: Letzte Aktivität
     browser: Browser
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1187,51 +1415,51 @@ de:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Aktuelle Sitzung
     description: "%{browser} auf %{platform}"
-    explanation: Dies sind die Webbrowser, die derzeit in deinem Mastodon-Konto eingeloggt sind.
+    explanation: Dies sind die Webbrowser, die derzeit mit deinem Mastodon-Konto verbunden sind.
     ip: IP-Adresse
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
       mac: Mac
-      other: unbekannte Plattform
+      other: unbekanntes Betriebssystem
       windows: Windows
       windows_mobile: Windows Mobile
-      windows_phone: Windows Handy
-    revoke: Schließen
+      windows_phone: Windows Phone
+    revoke: Widerrufen
     revoke_success: Sitzung erfolgreich geschlossen
     title: Sitzungen
     view_authentication_history: Authentifizierungsverlauf deines Kontos anzeigen
   settings:
     account: Konto
-    account_settings: Konto & Sicherheit
+    account_settings: Kontoeinstellungen
     aliases: Kontoaliase
-    appearance: Aussehen
-    authorized_apps: Autorisierte Anwendungen
+    appearance: Design
+    authorized_apps: Genehmigte Apps
     back: Zurück zu Mastodon
     delete: Konto löschen
     development: Entwicklung
     edit_profile: Profil bearbeiten
-    export: Datenexport
+    export: Exportieren
     featured_tags: Empfohlene Hashtags
-    identity_proofs: Identitätsnachweise
-    import: Datenimport
-    import_and_export: Importieren und Exportieren
+    import: Importieren
+    import_and_export: Importieren und exportieren
     migrate: Konto-Umzug
     notifications: Benachrichtigungen
     preferences: Einstellungen
     profile: Profil
-    relationships: Folgende und Gefolgte
-    statuses_cleanup: Automatisches Beitraglöschen
-    two_factor_authentication: Zwei-Faktor-Auth
+    relationships: Folge ich und Follower
+    statuses_cleanup: Automatische Löschung
+    strikes: Moderieren von Verstößen
+    two_factor_authentication: Zwei-Faktor-Authentisierung (2FA)
     webauthn_authentication: Sicherheitsschlüssel
   statuses:
     attached:
@@ -1247,23 +1475,24 @@ de:
         other: "%{count} Videos"
     boosted_from_html: Geteilt von %{acct_link}
     content_warning: 'Inhaltswarnung: %{warning}'
+    default_language: Wie die Sprache des Webinterface
     disallowed_hashtags:
       one: 'enthält einen verbotenen Hashtag: %{tags}'
       other: 'enthält verbotene Hashtags: %{tags}'
+    edited_at_html: Bearbeitet %{date}
     errors:
       in_reply_not_found: Der Beitrag, auf den du antworten möchtest, scheint nicht zu existieren.
-    language_detection: Sprache automatisch erkennen
     open_in_web: Im Web öffnen
     over_character_limit: Zeichenlimit von %{max} überschritten
     pin_errors:
+      direct: Beiträge, die nur für erwähnte Profile sichtbar sind, können nicht angeheftet werden
       limit: Du hast bereits die maximale Anzahl an Beiträgen angeheftet
       ownership: Du kannst nur eigene Beiträge anheften
-      private: Du kannst nur öffentliche Beiträge anheften
       reblog: Du kannst keine geteilten Beiträge anheften
     poll:
       total_people:
-        one: "%{count} Person"
-        other: "%{count} Personen"
+        one: "%{count} Stimme"
+        other: "%{count} Stimmen"
       total_votes:
         one: "%{count} Stimme"
         other: "%{count} Stimmen"
@@ -1271,142 +1500,61 @@ de:
     show_more: Mehr anzeigen
     show_newer: Neuere anzeigen
     show_older: Ältere anzeigen
-    show_thread: Zeige Konversation
-    sign_in_to_participate: Melde dich an, um an der Konversation teilzuhaben
+    show_thread: Thread anzeigen
+    sign_in_to_participate: Melde dich an, um an der Unterhaltung teilzunehmen
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direktnachricht
-      private: Nur Folgende
-      private_long: Nur für Folgende sichtbar
+      private: Nur eigene Follower
+      private_long: Nur für deine eigenen Follower sichtbar
       public: Öffentlich
       public_long: Für alle sichtbar
       unlisted: Nicht gelistet
-      unlisted_long: Für alle sichtbar, aber nicht in öffentlichen Zeitleisten aufgelistet
+      unlisted_long: Für alle sichtbar, aber in öffentlichen Timelines nicht aufgelistet
   statuses_cleanup:
     enabled: Automatisch alte Beiträge löschen
-    enabled_hint: Löscht automatisch deine Beiträge, sobald sie einen bestimmten Altersgrenzwert erreicht haben, es sei denn, sie entsprechen einer der folgenden Ausnahmen
+    enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen
     exceptions: Ausnahmen
-    explanation: Da das Löschen von Beiträgen eine kostspielige Operation ist, geschieht dies langsam im Laufe der Zeit, wenn der Server sonst nicht beschäftigt ist. Aus diesem Grund können deine Beiträge gelöscht werden, eine Weile nachdem sie die Altersgrenze erreicht haben.
+    explanation: Damit Mastodon nicht durch das Löschen von Beiträgen ausgebremst wird, wartet der Server damit, bis wenig los ist. Aus diesem Grund werden deine Beiträge ggf. erst einige Zeit nach Erreichen der Altersgrenze gelöscht.
     ignore_favs: Favoriten ignorieren
-    ignore_reblogs: Boosts ignorieren
+    ignore_reblogs: Geteilte Beiträge ignorieren
     interaction_exceptions: Ausnahmen basierend auf Interaktionen
-    interaction_exceptions_explanation: Beachte, dass es keine Garantie für das Löschen von Beiträgen gibt, wenn sie nach einem Übertritt des Favoriten- oder Boost-Schwellenwert wieder unter diesen fallen.
+    interaction_exceptions_explanation: Beachte, dass Beiträge nicht gelöscht werden, sobald deine Grenzwerte für Favoriten oder geteilte Beiträge einmal überschritten worden sind – auch dann nicht, wenn diese Schwellenwerte mittlerweile nicht mehr erreicht werden.
     keep_direct: Direktnachrichten behalten
-    keep_direct_hint: Löscht keine deiner Direktnachrichten
-    keep_media: Beiträge mit Medienanhängen behalten
-    keep_media_hint: Löscht keine Ihrer Beiträge mit Medienanhängen
+    keep_direct_hint: Löscht keine deiner privaten Nachrichten
+    keep_media: Beiträge mit angehängten Medien-Dateien behalten
+    keep_media_hint: Löscht keinen deiner Beiträge mit angehängten Medien-Dateien
     keep_pinned: Angeheftete Beiträge behalten
-    keep_pinned_hint: Löscht keine deiner angehefteten Beiträge
+    keep_pinned_hint: Löscht keinen deiner angehefteten Beiträge im Profil
     keep_polls: Umfragen behalten
     keep_polls_hint: Löscht keine deiner Umfragen
     keep_self_bookmark: Als Lesezeichen markierte Beiträge behalten
-    keep_self_bookmark_hint: Löscht nicht deine eigenen Beiträge, wenn du sie als Lesezeichen markiert hast
-    keep_self_fav: Behalte die von dir favorisierten Beiträge
-    keep_self_fav_hint: Löscht nicht deine eigenen Beiträge, wenn du sie favorisiert hast
+    keep_self_bookmark_hint: Löscht keinen deiner Beiträge, die du als Lesezeichen gesetzt hast
+    keep_self_fav: Behalte favorisierte Beiträge
+    keep_self_fav_hint: Löscht keinen deiner Beiträge, die du favorisiert hast
     min_age:
       '1209600': 2 Wochen
       '15778476': 6 Monate
       '2629746': 1 Monat
       '31556952': 1 Jahr
       '5259492': 2 Monate
+      '604800': 1 Woche
       '63113904': 2 Jahre
       '7889238': 3 Monate
     min_age_label: Altersgrenze
-    min_favs: Behalte Beiträge, die öfter favorisiert wurden als
-    min_favs_hint: Löscht keine deiner Beiträge, die mehr als diese Anzahl an Favoriten erhalten haben. Leer lassen, um Beiträge zu löschen, unabhängig von ihrer Anzahl an Favoriten
+    min_favs: Behalte Beiträge, die häufiger favorisiert wurden als …
+    min_favs_hint: Löscht keine Beiträge, die mindestens so oft favorisiert worden sind. Lass das Feld leer, um alle Beiträge – unabhängig der Anzahl an Favoriten – zu löschen
     min_reblogs: Behalte Beiträge, die öfter geteilt wurden als
-    min_reblogs_hint: Löscht keine deiner Beiträge, die mehr als diese Anzahl geteilt wurden. Lasse leer, um Beiträge zu löschen, unabhängig von ihrer Anzahl an Boosts
+    min_reblogs_hint: Löscht keine Beiträge, die mindestens so oft geteilt worden sind. Lass das Feld leer, um alle Beiträge – unabhängig der Anzahl an geteilten Beiträgen – zu löschen
   stream_entries:
     pinned: Angehefteter Beitrag
     reblogged: teilte
-    sensitive_content: NSFW
+    sensitive_content: Inhaltswarnung
+  strikes:
+    errors:
+      too_late: Es ist zu spät, um gegen diesen Verstoß Einspruch zu erheben
   tags:
     does_not_match_previous_name: entspricht nicht dem vorherigen Namen
-  terms:
-    body_html: |
-      <h2>Datenschutzerklärung</h2>
-      <h3 id="collect">Welche Informationen sammeln wir?</h3>
-
-      <ul>
-      <li><em>Grundlegende Kontoinformationen</em>: Wenn du dich auf diesem Server registrierst, wirst du darum gebeten, einen Benutzernamen, eine E-Mail-Adresse und ein Passwort einzugeben. Du kannst auch zusätzliche Profilinformationen wie etwa einen Anzeigenamen oder eine Biografie eingeben und ein Profilbild oder ein Headerbild hochladen. Der Benutzername, der Anzeigename, die Biografie, das Profilbild und das Headerbild werden immer öffentlich angezeigt.</li>
-      <li><em>Beiträge, Folge- und andere öffentliche Informationen</em>: Die Liste der Leute, denen du folgst, wird öffentlich gezeigt, das gleiche gilt für deine Folgenden (Follower). Sobald du eine Nachricht übermittelst, wird das Datum und die Uhrzeit gemeinsam mit der Information, welche Anwendung du dafür verwendet hast, gespeichert. Nachricht können Medienanhänge enthalten, etwa Bilder und Videos. Öffentliche und ungelistete Beiträge sind öffentlich verfügbar. Sobald du einen Beitrag auf deinem Profil anpinnst, sind dies auch öffentlich verfügbare Informationen. Deine Beiträge werden an deine Folgenden ausgeliefert, was in manchen Fällen bedeutet, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Sobald du Beiträge löschst, wird dies ebenso an deine Follower ausgeliefert. Die Handlungen des Teilens und Favorisieren eines anderen Beitrages ist immer öffentlich.</li>
-      <li><em>Direkte und "Nur Folgende"-Beiträge</em>: Alle Beiträge werden auf dem Server gespeichert und verarbeitet. "Nur Folgende"-Beiträge werden an deine Folgenden und an Benutzer, die du in ihnen erwähnst, ausgeliefert, direkte Beiträge nur an in ihnen erwähnte Benutzer. In manchen Fällen bedeutet dass, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Wir bemühen uns nach bestem Wissen und Gewissen, den Zugriff auf diese Beiträge auf nur autorisierte Personen einzuschränken, jedoch könnten andere Server dabei scheitern. Deswegen ist es wichtig, die Server, zu denen deine Folgenden gehören, zu überprüfen. Du kannst eine Option in den Einstellungen umschalten, um neue Folgenden manuell anzunehmen oder abzuweisen. <em>Bitte beachte, dass die Betreiber des Server und jedes empfangenden Servers solche Nachrichten anschauen könnten</em> und dass Empfänger von diesen eine Bildschirmkopie erstellen könnten, sie kopieren oder anderweitig weiterverteilen könnten. <em>Teile nicht irgendwelche gefährlichen Informationen über Mastodon.</em></li>
-      <li><em>Internet Protocol-Adressen (IP-Adressen) und andere Metadaten</em>: Sobald du dich anmeldest, erfassen wir sowohl die IP-Adresse, von der aus du dich anmeldest, als auch den Namen deine Browseranwendung. Alle angemeldeten Sitzungen (Sessions) sind für deine Überprüfung und Widerruf in den Einstellungen verfügbar. Die letzte verwendete IP-Adresse wird bis zu 12 Monate lang gespeichert. Wir könnten auch Serverprotokoll behalten, welche die IP-Adresse von jeder Anfrage an unseren Server enthalten.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Für was verwenden wir deine Informationen?</h3>
-
-      <p>Jede der von dir gesammelten Information kann in den folgenden Weisen verwendet werden:</p>
-
-      <ul>
-      <li>Um die Kernfunktionalität von Mastodon bereitzustellen. Du kannst du mit dem Inhalt anderer Leute interagieren und deine eigenen Inhalte beitragen, wenn du angemeldet bist. Zum Beispiel kannst du anderen folgen, um deren kombinierten Beiträge in deine personalisierten Start-Timeline zu sehen.</li>
-      <li>Um Moderation der Community zu ermöglichen, zum Beispiel beim Vergleichen deiner IP-Adresse mit anderen bekannten, um Verbotsumgehung oder andere Vergehen festzustellen.</li>
-      <li>Die E-Mail-Adresse, die du bereitstellst, kann dazu verwendet werden, dir Informationen, Benachrichtigungen über andere Leute, die mit deinen Inhalten interagieren oder dir Nachrichten senden, und auf Anfragen, Wünsche und/oder Fragen zu antworten.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Wie beschützen wir deine Informationen?</h3>
-
-      <p>Wir implementieren eine Reihe von Sicherheitsmaßnahmen, um die Sicherheit deiner persönlichen Information sicherzustellen, wenn du persönliche Informationen eingibst, übermittelst oder auf sie zugreifst. Neben anderen Dingen, wird sowohl deine Browsersitzung, als auch der Datenverkehr zwischen deinen Anwendungen und der Programmierschnittstelle (API) mit SSL gesichert, dein Passwort wird mit einem starken Einwegalgorithmus gehasht. Du kannst Zwei-Faktor-Authentifizierung aktivieren, um den Zugriff auf dein Konto zusätzlich abzusichern.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Was ist unsere Datenspeicherungsrichtlinie?</h3>
-
-      <p>Wir werden mit bestem Wissen und Gewissen:</p>
-
-      <ul>
-      <li>Serverprotokolle, die IP-Adressen von allen deinen Anfragen an diesen Server, falls solche Protokolle behalten werden, für nicht mehr als 90 Tage behalten.</li>
-      <li>registrierten Benutzer zugeordnete IP-Adressen nicht länger als 12 Monate behalten.</li>
-      </ul>
-
-      <p>Du kannst ein Archiv deines Inhalts anfordern und herunterladen, inkludierend deiner Beiträge, Medienanhänge, Profilbilder und Headerbilder.</p>
-
-      <p>Es ist in den meisten Fällen möglich dein Konto jederzeit eigenmächtig unwiderruflich zu löschen.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Verwenden wir Cookies?</h3>
-
-      <p>Ja. Cookies sind kleine Dateien, die eine Webseite oder ihr Serviceanbieter über deinen Webbrowser (sofern er es erlaubt) auf die Festplatte deines Computers überträgt. Diese Cookies ermöglichen es der Seite deinen Browser wiederzuerkennen und, sofern du ein registriertes Konto hast, diesen mit deinem registrierten Konto zu verknüpfen.</p>
-
-      <p>Wir verwenden Cookies, um deine Einstellungen zu verstehen und für zukünftige Besuche zu speichern.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Offenbaren wir Informationen an Dritte?</h3>
-
-      <p>Wir verkaufen nicht, handeln nicht mit oder übertragen deine persönlich identifizierbaren Informationen nicht an Dritte. Dies beinhaltet nicht Dritte, die vertrauenswürdig sind und uns beim Betreiben unserer Seite, Leiten unseres Geschäftes oder dabei, die Dienste für dich bereitzustellen, unterstützen, sofern diese Dritte zustimmen, diese Informationen vertraulich zu halten. Wir können auch Informationen freigeben, wenn wir glauben, dass Freigabe angemessen ist, um dem Gesetz zu entsprechen, unsere Seitenrichtlinien durchzusetzen oder unsere Rechte, Eigentum und/oder Sicherheit oder die anderer zu beschützen.</p>
-
-      <p>Dein öffentlicher Inhalt kann durch andere Server im Netzwerk heruntergeladen werden. Deine öffentlichen und "Nur Folgende"-Beiträge werden an die Server ausgeliefert, bei denen sich deine Folgenden befinden und direkte Nachrichten werden an die Server des Empfängers ausgeliefert, falls diese Folgenden oder Empfänger sich auf einem anderen Server als diesen befinden.</p>
-
-      <p>Wenn du eine Anwendung autorisierst, dein Konto zu benutzen, kann diese – abhängig von den von dir genehmigten Befugnissen – auf deine öffentlichen Profilinformationen, deine Folgt- und Folgende-Liste, deine Listen, alle deine Beiträge und deine Favoriten zugreifen. Anwendungen können nie auf deine E-Mail-Adresse oder dein Passwort zugreifen</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Webseitenbenutzung durch Kinder</h3>
-
-      <p>Wenn sich dieser Server in der EU oder im Europäischen Wirtschaftsraum befindet: Unsere Website, Produkte und Dienstleistungen sind alle an Leute gerichtet, die mindestens 16 Jahre als sind. Wenn du unter 16 bist, darfst du nach den Bestimmungen der DSGVO (<a href="https://de.wikipedia.org/wiki/Datenschutz-Grundverordnung">Datenschutz-Grundverordnung</a>) diese Webseite nicht benutzen.</p>
-
-      <p>Wenn sich dieser Server in den USA befindet: Unsere Webseite, Produkte und Dienstleistungen sind alle an Leute gerichtet, die mindestens 13 Jahre alt sind. Wenn du unter 13 bist, darfst du nach den Bestimmungen des COPPA (<a href="https://de.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act, dt. "Gesetz zum Schutz der Privatsphäre von Kindern im Internet"</a>) diese Webseite nicht benutzen.</p>
-
-      <p>Gesetzesvorschriften können unterschiedlich sein, wenn sich dieser Server in anderer Gerichtsbarkeit befindet.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Änderung an unserer Datenschutzerklärung</h3>
-
-      <p>Wenn wir uns entscheiden, Änderungen an unserer Datenschutzerklärung vorzunehmen, werden wir diese Änderungen auf dieser Seite bekannt gegeben.</p>
-
-      <p>Dies ist eine Übersetzung, Irrtümer und Übersetzungsfehler vorbehalten. Im Zweifelsfall gilt die englische Originalversion.</p>
-
-      <p>Dieses Dokument ist CC-BY-SA. Es wurde zuletzt aktualisiert am 7. März 2018.</p>
-
-      <p>Ursprünglich übernommen von der <a href="https://github.com/discourse/discourse">Discourse-Datenschutzerklärung</a>.</p>
-    title: "%{instance} Nutzungsbedingungen und Datenschutzerklärung"
   themes:
     contrast: Mastodon (Hoher Kontrast)
     default: Mastodon (Dunkel)
@@ -1415,79 +1563,90 @@ de:
     formats:
       default: "%d.%m.%Y %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Hinzufügen
-    disable: Deaktivieren
-    disabled_success: Zwei-Faktor-Authentifizierung erfolgreich deaktiviert
+    disable: Zwei-Faktor-Authentisierung (2FA) deaktivieren
+    disabled_success: Zwei-Faktor-Authentisierung (2FA) erfolgreich deaktiviert
     edit: Bearbeiten
-    enabled: Zwei-Faktor-Authentisierung ist aktiviert
-    enabled_success: Zwei-Faktor-Authentisierung erfolgreich aktiviert
-    generate_recovery_codes: Wiederherstellungscodes generieren
-    lost_recovery_codes: Wiederherstellungscodes erlauben dir, wieder den Zugang zu deinem Konto zu erlangen, falls du dein Telefon verlieren solltest. Wenn du deine Wiederherstellungscodes verloren hast, kannst du sie hier neu generieren. Deine alten Wiederherstellungscodes werden damit ungültig gemacht.
-    methods: Zwei-Faktor-Methoden
+    enabled: Zwei-Faktor-Authentisierung (2FA) ist aktiviert
+    enabled_success: Zwei-Faktor-Authentisierung (2FA) erfolgreich aktiviert
+    generate_recovery_codes: Wiederherstellungscodes erstellen
+    lost_recovery_codes: Wiederherstellungscodes erlauben es dir, wieder Zugang zu deinem Konto zu erlangen, falls du keinen Zugriff mehr auf die Zwei-Faktor-Authentisierung (2FA) oder den Sicherheitsschlüssel hast. Solltest Du diese Wiederherstellungscodes verloren haben, kannst du sie hier neu generieren. Deine alten, bereits erstellten Wiederherstellungscodes werden dadurch ungültig.
+    methods: Methoden der Zwei-Faktor-Authentisierung (2FA)
     otp: Authentifizierungs-App
-    recovery_codes: Wiederherstellungs-Codes sichern
-    recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu generiert
+    recovery_codes: Wiederherstellungscodes sichern
+    recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu erstellt
     recovery_instructions_html: Wenn du den Zugang zu deinem Telefon verlieren solltest, kannst du einen untenstehenden Wiederherstellungscode benutzen, um wieder auf dein Konto zugreifen zu können. <strong>Bewahre die Wiederherstellungscodes gut auf.</strong> Du könntest sie beispielsweise ausdrucken und bei deinen restlichen wichtigen Dokumenten aufbewahren.
     webauthn: Sicherheitsschlüssel
   user_mailer:
+    appeal_approved:
+      action: Gehe zu deinem Konto
+      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in gutem Zustand.
+      subject: Dein Einspruch vom %{date} wurde angenommen
+      title: Einspruch angenommen
+    appeal_rejected:
+      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde abgelehnt.
+      subject: Dein Einspruch vom %{date} wurde abgelehnt
+      title: Einspruch abgelehnt
     backup_ready:
-      explanation: Du hast ein vollständiges Backup von deinem Mastodon-Konto angefragt. Es kann jetzt heruntergeladen werden!
-      subject: Dein Archiv ist bereit zum Download
-      title: Archiv-Download
-    sign_in_token:
+      explanation: Du hast eine vollständige Sicherung von deinem Mastodon-Konto angefragt. Es kann jetzt heruntergeladen werden!
+      subject: Dein persönliches Archiv ist bereit zum Herunterladen
+      title: Archivmitnahme
+    suspicious_sign_in:
+      change_password: dein Passwort zu ändern
       details: 'Hier sind die Details des Versuchs:'
-      explanation: 'Wir haben einen Versuch festgestellt, sich mit deinem Konto von einer nicht erkannten IP-Adresse anzumelden. Wenn du das bist, gib bitte den Sicherheitscode unten auf der Anmeldecode-Seite ein:'
-      further_actions: 'Wenn du das nicht warst, ändere bitte dein Passwort und aktiviere die Zwei-Faktor-Authentifizierung in deinem Konto. Du kannst das hier tun:'
-      subject: Bitte bestätige den Anmeldeversuch
-      title: Anmeldeversuch
+      explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
+      further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.
+      subject: Es wurde auf dein Konto von einer neuen IP-Adresse zugegriffen
+      title: Eine neue Anmeldung
     warning:
+      appeal: Einspruch einsenden
+      appeal_description: Wenn du glaubst, dass es sich um einen Fehler handelt, kannst du einen Einspruch an die Administration von %{instance} senden.
+      categories:
+        spam: Spam
+        violation: Inhalt verstößt gegen die folgenden Gemeinschaftsrichtlinien
       explanation:
-        disable: Solange dein Konto eingefroren ist, sind deine Benutzerdaten intakt; aber du kannst nichts tun, bis dein Konto entsperrt wurde.
-        sensitive: Deine hochgeladenen Mediendateien und verknüpften Medien werden als NSFW markiert.
-        silence: Solange dein Konto limitiert ist, können nur die Leute, die dir bereits folgen, deine Beiträge auf dem Server sehen und es könnte sein, dass du von verschiedenen öffentlichen Listungen ausgeschlossen wirst. Andererseits können andere dir manuell folgen.
-        suspend: Dein Konto wurde gesperrt und alle deine Beiträge und hochgeladenen Medien wurden unwiderruflich vom Server und anderen Servern, bei denen du Folgende hattest, gelöscht.
-      get_in_touch: Du kannst auf diese E-Mail antworten, um mit dem Personal von %{instance} in Kontakt zu treten.
-      review_server_policies: Serverrichtlinien ansehen
-      statuses: 'Besonders für:'
+        delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Gemeinschaftsrichtlinien erkannt und von den Moderator*innen von %{instance} entfernt.
+        disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und andere Daten bleiben unversehrt. Du kannst eine Sicherung deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen.
+        mark_statuses_as_sensitive: Ein oder mehrere deiner Beiträge wurden von den Moderator*innen von %{instance} mit einer Inhaltswarnung versehen. Das bedeutet, dass Besucher*innen diese Medien in den Beiträgen zunächst antippen müssen, um die Vorschau anzuzeigen. Beim Verfassen der nächsten Beiträge kannst du auch selbst eine Inhaltswarnung für hochgeladene Medien festlegen.
+        sensitive: Von nun an werden alle deine hochgeladenen Mediendateien mit einer Inhaltswarnung versehen und hinter einer Warnung versteckt.
+        silence: Solange dein Konto limitiert ist, können nur die Leute, die dir bereits folgen, deine Beiträge auf dem Server sehen, und es könnte sein, dass du von verschiedenen öffentlichen Listungen ausgeschlossen wirst. Andererseits können andere dir manuell folgen.
+        suspend: Du kannst dein Konto nicht mehr verwenden und dein Profil und andere Daten sind nicht mehr verfügbar. Du kannst dich immer noch anmelden, um eine Sicherung deiner Daten anzufordern, bis die Daten innerhalb von 30 Tagen vollständig gelöscht wurden. Allerdings werden wir einige Daten speichern, um zu verhindern, dass du die Sperrung umgehst.
+      reason: 'Grund:'
+      statuses: 'Zitierte Beiträge:'
       subject:
+        delete_statuses: Deine Beiträge auf %{acct} wurden entfernt
         disable: Dein Konto %{acct} wurde eingefroren
+        mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen
         none: Warnung für %{acct}
-        sensitive: Die Medien deines Konto %{acct} wurden als NSFW markiert
-        silence: Dein Konto %{acct} wurde limitiert
+        sensitive: Deine Beiträge von %{acct} werden künftig mit einer Inhaltswarnung versehen
+        silence: Dein Konto %{acct} wurde stummgeschaltet
         suspend: Dein Konto %{acct} wurde gesperrt
       title:
+        delete_statuses: Beiträge entfernt
         disable: Konto eingefroren
+        mark_statuses_as_sensitive: Mit einer Inhaltswarnung versehene Beiträge
         none: Warnung
-        sensitive: Deine Medien wurden als NSFW markiert
-        silence: Konto limitiert
+        sensitive: Konto mit einer Inhaltswarnung versehen
+        silence: Konto stummgeschaltet
         suspend: Konto gesperrt
     welcome:
-      edit_profile_action: Profil einstellen
-      edit_profile_step: Du kannst dein Profil anpassen, indem du einen Avatar oder ein Titelbild hochlädst oder deinen Anzeigenamen änderst und mehr. Wenn du deine Folgenden vorher überprüfen möchtest, bevor sie dir folgen können, dann kannst du dein Profil sperren.
+      edit_profile_action: Profil einrichten
+      edit_profile_step: Du kannst dein Profil anpassen, indem du ein Profilbild hochlädst, deinen Anzeigenamen änderst und vieles mehr. Du kannst dich dafür entscheiden, neue Follower zu überprüfen, bevor sie dir folgen dürfen.
       explanation: Hier sind ein paar Tipps, um loszulegen
       final_action: Fang an zu posten
-      final_step: 'Fang an zu posten! Selbst ohne Follower werden deine öffentlichen Beitrage von anderen gesehen, zum Beispiel auf der lokalen Zeitleiste oder in Hashtags. Vielleicht möchtest du dich vorstellen mit dem #introductions-Hashtag.'
-      full_handle: Dein vollständiger Benutzername
-      full_handle_hint: Dies ist was du deinen Freunden sagen kannst, damit sie dich anschreiben oder von einem anderen Server folgen können.
-      review_preferences_action: Einstellungen ändern
-      review_preferences_step: Stelle sicher, dass du deine Einstellungen einstellst, wie zum Beispiel welche E-Mails du gerne erhalten möchtest oder was für Privatsphäreneinstellungen voreingestellt werden sollten. Wenn dir beim Ansehen von GIFs nicht schwindelig wird, dann kannst du auch das automatische Abspielen dieser aktivieren.
+      final_step: 'Fang jetzt an zu posten! Selbst ohne Follower werden deine öffentlichen Beiträge von anderen gesehen, zum Beispiel in der lokalen Timeline oder über die Hashtags. Möglicherweise möchtest du dich allen mit dem Hashtag #neuhier vorstellen.'
+      full_handle: Dein vollständiger Profilname
+      full_handle_hint: Dies ist, was du deinen Freunden sagen kannst, damit sie dich anschreiben oder dir von einem anderen Server folgen können.
       subject: Willkommen bei Mastodon
-      tip_federated_timeline: Die föderierte Zeitleiste ist die sehr große Ansicht vom Mastodon-Netzwerk. Sie enthält aber auch nur Leute, denen du und deine Nachbarn folgen, sie ist also nicht komplett.
-      tip_following: Du folgst standardmäßig deinen Server-Admin(s). Um mehr interessante Leute zu finden, kannst du die lokale oder öffentliche Zeitleiste durchsuchen.
-      tip_local_timeline: Die lokale Zeitleiste ist eine Ansicht aller Leute auf %{instance}. Diese sind deine Nachbarn!
-      tip_mobile_webapp: Wenn dein mobiler Browser dir anbietet Mastodon zu deinem Startbildschirm hinzuzufügen, dann kannst du Benachrichtigungen erhalten. Es verhält sich wie eine native App in vielen Wegen!
-      tips: Tipps
       title: Willkommen an Bord, %{name}!
   users:
     follow_limit_reached: Du kannst nicht mehr als %{limit} Leuten folgen
-    generic_access_help_html: Probleme beim Zugriff auf dein Konto? Du kannst dich mit %{email} in Verbindung setzen, um Hilfe zu erhalten
-    invalid_otp_token: Ungültiger Zwei-Faktor-Authentisierungs-Code
-    invalid_sign_in_token: Ungültiger Sicherheitscode
-    otp_lost_help_html: Wenn Du beides nicht mehr weißt, melde Dich bei uns unter der E-Mailadresse %{email}
-    seamless_external_login: Du bist angemeldet über einen Drittanbieter-Dienst, weswegen Passwort- und E-Maileinstellungen nicht verfügbar sind.
+    invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung (2FA)
+    otp_lost_help_html: Wenn du beides nicht mehr weißt, melde dich bitte bei uns unter der E-Mail-Adresse %{email}
+    seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
     signed_in_as: 'Angemeldet als:'
-    suspicious_sign_in_confirmation: Du hast dich anscheinend seit einer ganzen Weile noch nicht von diesem Gerät eingeloggt, also senden wir einen Sicherheitscode an deine E-Mail-Adresse, um zu bestätigen, dass du es bist.
   verification:
     explanation_html: 'Du kannst <strong>bestätigen, dass die Links in deinen Profil-Metadaten dir gehören</strong>. Dafür muss die verlinkte Website einen Link zurück auf dein Mastodon-Profil enthalten. Dieser Link <strong>muss</strong> ein <code>rel="me"</code>-Attribut enthalten. Der Linktext ist dabei egal. Hier ist ein Beispiel:'
     verification: Verifizierung
@@ -1506,5 +1665,5 @@ de:
     nickname_hint: Gib den Spitznamen deines neuen Sicherheitsschlüssels ein
     not_enabled: Du hast WebAuthn noch nicht aktiviert
     not_supported: Dieser Browser unterstützt keine Sicherheitsschlüssel
-    otp_required: Um Sicherheitsschlüssel zu verwenden, aktiviere zuerst die Zwei-Faktor-Authentifizierung.
+    otp_required: Um Sicherheitsschlüssel zu verwenden, aktiviere zunächst die Zwei-Faktor-Authentisierung (2FA).
     registered_on: Registriert am %{date}
diff --git a/config/locales/devise.an.yml b/config/locales/devise.an.yml
new file mode 100644
index 000000000..f179f915d
--- /dev/null
+++ b/config/locales/devise.an.yml
@@ -0,0 +1,115 @@
+---
+an:
+  devise:
+    confirmations:
+      confirmed: La suya adreza de correu electronico ha estau confirmada correctament.
+      send_instructions: Recibirás un correu electronico con instruccions pa confirmar la tuya adreza de correu electronico en uns menutos. Per favor, compreba la tuya carpeta de spam si no recibiés este correu electronico.
+      send_paranoid_instructions: Si la suya adreza de correu electronico existe en a nuestra base de datos, recibirá un correu electronico con instruccions sobre cómo confirmar la suya adreza de correu en pocos menutos.
+    failure:
+      already_authenticated: Vusté ya ye rechistrau.
+      inactive: La suya cuenta no ha estau activada encara.
+      invalid: "%{authentication_keys} u clau invalida."
+      last_attempt: Tiene un intento mas antes que la tuya cuenta sía blocada.
+      locked: La tuya cuenta ye blocada.
+      not_found_in_database: Incorrecto %{authentication_keys} u clau.
+      pending: La suya cuenta encara se troba baixo revisión.
+      timeout: La suya sesión ha expirau. Per favor inicie sesión de nuevo pa continar.
+      unauthenticated: Ameneste iniciar sesión u rechistrar-se antes de continar.
+      unconfirmed: Ha de confirmar la suya adreza de correu electronico antes de continar.
+    mailer:
+      confirmation_instructions:
+        action: Verifica la tuya adreza de correu electronico
+        action_with_app: Confirmar y tornar ta %{app}
+        explanation: Has creyau una cuenta en %{host} con esta adreza de correu electronico. Yes a un solo clic d'activar-lo. Si no estiés tu, per favor ignora este correu electronico.
+        explanation_when_pending: Has solicitau una invitación a %{host} con esta adreza de correu electronico. Una vegada que confirmes la tuya adreza de correu electronico, revisaremos la tuya solicitut. Puetz iniciar sesión pa cambiar los tuyos datos u eliminar la tuya cuenta, pero no puetz acceder ta la mayoría d'as funcions dica que la tuya cuenta sía aprebada. Si la suya solicitut ye refusada, los suyos datos serán eliminaus, per lo que no será necesaria garra acción adicional per la suya parte. Si no estiés tu, per favor ignora este correu electronico.
+        extra_html: Per favor, revisa <a href="%{terms_path}">las reglas d'o servidor</a> y <a href="%{policy_path}">los nuestros termins de servicio</a>.
+        subject: 'Mastodon: Instruccions de confirmación pa %{instance}'
+        title: Verificar adreza de correu electronico
+      email_changed:
+        explanation: 'Lo correu electronico pa la suya cuenta esta estando cambiada a:'
+        extra: Si vusté no ha cambiau lo suyo correu electronico, ye probable que belún haiga aconseguiu acceso a la suya cuenta. Per favor cambie la suya clau immediatament u contacte a l'administrador d'a instancia si vusté no puede iniciar sesión.
+        subject: 'Mastodon: Correu electronico cambiau'
+        title: Nueva adreza de correu electronico
+      password_change:
+        explanation: La clau d'a suya cuenta a estau cambiada.
+        extra: Si vusté no a cambiau la suya clau. ye probable que belún a aconseguiu acceso a la suya cuenta. Per favor cambie la suya clau immediatament u contacte a l'administrador d'a instancia si vusté esta blocau d'a suya cuenta.
+        subject: 'Mastodon: Clau cambiada'
+        title: Clau cambiada
+      reconfirmation_instructions:
+        explanation: Confirme la nueva adreza pa cambiar la suya coreo electronico.
+        extra: Si no iniciés este cambio, per favor ignora este correu. Esta adreza de correu pa la cuenta de Mastodon no cambiará dica que accedas a lo vinculo alto.
+        subject: 'Mastodon: Confirme correu electronico pa %{instance}'
+        title: Verifique adreza de correu electronico
+      reset_password_instructions:
+        action: Cambiar clau
+        explanation: Solicités una nueva clau pa la tuya cuenta.
+        extra: Si no solicités esto, per favor ignora este correu. La tuya clau no cambiará dica que la tuya accedas a lo vinculo alto y creyes una nueva.
+        subject: 'Mastodon: Instruccions pa reiniciar clau'
+        title: Reiniciar clau
+      two_factor_disabled:
+        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau deshabilitada. Agora puetz connectar-te nomás usando l'adreza de correu electronico y la clau.
+        subject: 'Mastodon: L''autenticación de dos factors ye deshabilitada'
+        title: 2FA desactivada
+      two_factor_enabled:
+        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau habilitada. Se requiere un token chenerau per l'aplicación TOTP emparellada pa ingresar.
+        subject: 'Mastodon: L''autenticación de dos factors ye habilitada'
+        title: 2FA activada
+      two_factor_recovery_codes_changed:
+        explanation: Los codigos de recuperación previos han estau invalidaus y se cheneroron codigos nuevos.
+        subject: 'Mastodon: Los codigos de recuperación de dos factors estioron regenerados'
+        title: Codigos de recuperación 2FA cambiaus
+      unlock_instructions:
+        subject: 'Mastodon: Instruccions pa desblocar'
+      webauthn_credential:
+        added:
+          explanation: La siguient clau de seguranza ha estau anyadida a la suya cuenta
+          subject: 'Mastodon: Nueva clau de seguranza'
+          title: S'ha anyadiu una nueva clau de seguranza
+        deleted:
+          explanation: La siguient clau de seguranza ha estau eliminada d'a tuya cuenta
+          subject: 'Mastodon: Clau de seguranza eliminada'
+          title: Una d'as tuyas claus de seguranza ha estau eliminada
+      webauthn_disabled:
+        explanation: L'autenticación con claus de seguranza ha estau deshabilitada pa la tuya cuenta. Agora l'inicio de sesión nomás ye posible utilizando lo token chenerau per l'aplicación TOTP emparellada.
+        subject: 'Mastodon: Autenticación con claus de seguranza deshabilitada'
+        title: Claus de seguranza deshabilitadas
+      webauthn_enabled:
+        explanation: L'autenticación con clau de seguranza ha estau habilitada pa la tuya cuenta. Agora la tuya clau de seguranza puede estar utilizada pa iniciar sesión.
+        subject: 'Mastodon: Autenticación de clau de seguranza habilitada'
+        title: Claus de seguranza habilitadas
+    omniauth_callbacks:
+      failure: No se te podió autenticar dende %{kind} perque “%{reason}”.
+      success: Autenticau correctament dende la cuenta de %{kind}.
+    passwords:
+      no_token: No puetz acceder ta esta pachina si no viens dende un correu electronico de restablimiento de clau. Si viens dende un correu electronico de restablimiento de clau, per favor asegura-te d'utilizar la URL completa proporcionada.
+      send_instructions: Si la tuya adreza de correu electronico existe en a nuestra base de datos, recibirás un vinclo de recuperación de clau en a tuya adreza de correu electronico en pocos menutos. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      send_paranoid_instructions: Si la tuya adreza de correu electronico existe en a nuestra base de datos, recibirás un vinclo de recuperación de clau en a tuya adreza de correu electronico en pocos menutos. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      updated: La tuya clau ha estau cambiada con exito. Has iniciau sesión.
+      updated_not_active: La tuya clau s'ha cambiau con exito.
+    registrations:
+      destroyed: Dica unatra! La tuya cuenta ha estau cancelada con exito. Asperamos veyer-te de nuevo luego.
+      signed_up: Bienveniu! T'has rechistrau correctament.
+      signed_up_but_inactive: T'has rechistrau con exito. Manimenos, no s'ha puesto iniciar sesión perque la tuya cuenta encara no ye activada.
+      signed_up_but_locked: T'has rechistrau con exito. Manimenos, no s'ha puesto iniciar sesión perque la tuya cuenta ye blocada.
+      signed_up_but_pending: Un mensache con un vinclo de confirmación ha estau ninviau a la tuya adreza de correu electronico. Dimpués de fer clic en o vinclo, revisaremos la tuya solicitut. Serás notificau si s'apreba.
+      signed_up_but_unconfirmed: Un mensache con un vinclo de confirmación ha estau ninviau a la tuya adreza de correu electronico. Per favor, sigue lo vinclo pa activar la tuya cuenta. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      update_needs_confirmation: Has actualizau la tuya cuenta con exito, pero amenestemos verificar la tuya nueva adreza de correu electronico. Per favor, compreba lo tuyo correu electronico y sigue lo vinclo de confirmación pa confirmar la tuya nueva adreza de correu electronico. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      updated: La tuya cuenta s'ha actualizau con exito.
+    sessions:
+      already_signed_out: Sesión zarrada con exito.
+      signed_in: Sesión iniciada con exito.
+      signed_out: Sesión zarrada con exito.
+    unlocks:
+      send_instructions: En uns menutos recibirás un correu electronico con instruccions pa desblocar la tuya cuenta. Per favor, compreba la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      send_paranoid_instructions: Si la tuya cuenta existe, en uns menutos recibirás un correu electronico con instruccions pa desblocar-la. Per favor, revisa la tuya carpeta de correu no deseyau si no recibes dito correu electronico.
+      unlocked: La tuya cuenta ha estau desblocada con exito. Per favor, inicia sesión pa continar.
+  errors:
+    messages:
+      already_confirmed: ya yera confirmada, per favor intenta iniciar sesión
+      confirmation_period_expired: ameneste confirmar-se dentro de %{period}, per favor, solicita una nueva
+      expired: ha caducau, per favor solicita una nueva
+      not_found: no trobau
+      not_locked: no yera blocada
+      not_saved:
+        one: '1 error impidió que este %{resource} s''alzase:'
+        other: "%{count} errors impidioron que este %{resource} s'alzase:"
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index d8cfdbd42..7b8820771 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -22,17 +22,17 @@ ar:
         action_with_app: تأكيد ثم العودة إلى %{app}
         explanation: لقد قمت بإنشاء حساب على %{host} بواسطة عنوان البريد الإلكتروني الحالي. إنك على بعد خطوات قليلة من تفعليه. إن لم تكن من طلب ذلك، يرجى ألّا تولي اهتماما بهذه الرسالة.
         explanation_when_pending: لقد تقدمت بطلب دعوة إلى %{host} باستخدام عنوان البريد الإلكتروني هذا، بمجرد تأكيد عنوان البريد الإلكتروني الخاص بك، سنقوم بمراجعة تطبيقك. يمكنك تسجيل الدخول لتغيير التفاصيل الخاصة بك أو حذف حسابك، ولكن لا يمكنك الوصول إلى معظم الوظائف حتى تتم الموافقة على حسابك. إذا تم رفض طلبك، سيتم إزالة بياناتك، لذلك لن يكون هناك أي إجراء آخر مطلوب منك. إذا لم يكن هذا أنت، يرجى تجاهل هذا البريد الإلكتروني.
-        extra_html: ندعوك إلى الإطلاع على <a href="%{terms_path}">القواعد الخاصة بمثيل الخادوم هذا</a> and <a href="%{policy_path}">و شروط الخدمة الخاصة بنا</a>.
-        subject: 'ماستدون: تعليمات التأكيد لمثيل الخادوم %{instance}'
+        extra_html: ندعوك إلى الإطلاع على <a href="%{terms_path}">القواعد الخاصة</a> بمثيل الخادوم هذا و <a href="%{policy_path}">شروط الخدمة</a> الخاصة بنا.
+        subject: 'ماستدون: تعليمات التأكيد لمثيل الخادم %{instance}'
         title: للتحقق من عنوان البريد الإلكتروني
       email_changed:
         explanation: 'لقد تم تغيير عنوان البريد الإلكتروني الخاص بحسابك إلى:'
-        extra: إن لم تقم شخصيًا بتعديل عنوان بريدك الإلكتروني ، ذلك يعني أنّ شخصا آخر قد نَفِذَ إلى حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالإتصال بمدير مثيل الخادوم إن كنت غير قادر على استعمال حسابك.
+        extra: إن لم تقم شخصيًا بتعديل عنوان بريدك الإلكتروني ، ذلك يعني أنّ شخصا آخر قد نَفِذَ إلى حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالإتصال بمدير مثيل الخادم إن كنت غير قادر على استعمال حسابك.
         subject: 'ماستدون: تم استبدال عنوان بريدك الإلكتروني'
         title: عنوان البريد الإلكتروني الجديد
       password_change:
         explanation: تم تغيير كلمة السر الخاصة بحسابك.
-        extra: إن لم تقم شخصيًا بتعديل كلمتك السرية، ذلك يعني أنّ شخصا آخر قد سيطر على حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالاتصال بمدير مثيل الخادوم إن كنت غير قادر على استعمال حسابك.
+        extra: إن لم تقم شخصيًا بتعديل كلمتك السرية، ذلك يعني أنّ شخصا آخر قد سيطر على حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالاتصال بمدير مثيل الخادم إن كنت غير قادر على استعمال حسابك.
         subject: 'ماستدون: تم تغيير كلمة المرور'
         title: تم تغيير كلمة السر
       reconfirmation_instructions:
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index 29fde3941..f48c70e2d 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -2,56 +2,96 @@
 ast:
   devise:
     confirmations:
-      confirmed: La direición de corréu confirmóse con ésitu.
-      send_instructions: Nunos minutos, vas recibir un corréu coles instrucciones pa cómo confirmar la direición de corréu. Comprueba la carpeta Puxarra si nun lu recibiesti, por favor.
-      send_paranoid_instructions: Si la direición de corréu esiste na nuesa base de datos, nunos minutos vas recibir un corréu coles instrucciones pa cómo confirmala. Comprueba la carpeta Puxarra si nun lu recibiesti.
+      confirmed: La direición de corréu electrónicu confirmóse correutamente.
+      send_instructions: Nunos minutos vas recibir un mensaxe coles instrucciones pa saber cómo confirmar la direición de corréu electrónicu. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      send_paranoid_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un mensaxe coles instrucciones pa saber cómo confirmala. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
     failure:
-      already_authenticated: Yá aniciesti sesión.
-      inactive: Entá nun s'activó la cuenta.
-      last_attempt: Tienes un intentu más enantes de bloquiar la cuenta.
+      already_authenticated: Xá aniciesti la sesión.
+      last_attempt: Quédate un intentu más enantes de bloquiar la cuenta.
       locked: La cuenta ta bloquiada.
-      pending: La cuenta ta entá en revisión.
-      timeout: La sesión caducó. Volvi aniciar sesión pa siguir, por favor.
-      unauthenticated: Precises aniciar sesión o rexistrate enantes de siguir.
+      pending: La cuenta sigue en revisión.
+      timeout: La sesión caducó. Volvi aniciala pa siguir.
+      unauthenticated: Tienes d'aniciar la sesión o rexistrate enantes de siguir.
+      unconfirmed: Tienes de confirmar la direición de corréu electrónicu enantes de siguir.
     mailer:
       confirmation_instructions:
-        explanation: Creesti una cuenta en %{host} con esta direición de corréu. Tas a un calcu d'activala. Si nun fuisti tu, inora esti corréu.
+        explanation: Creesti una cuenta en %{host} con esta direición de corréu electrónicu ya tas a un calcu d'activala. Si nun fixesti esta aición, inora esti mensaxe.
+        explanation_when_pending: Solicitesti una invitación a %{host} con esta direición de corréu electrónicu. Namás que confirmes la direición de corréu electrónicu, vamos revisar la solicitú. Entrín ya non, pues aniciar la sesión pa camudar los detalles o desaniciar la cuenta, mas nun pues acceder a la mayoría de funciones hasta que la cuenta nun tea aprobada. Si se refuga la solicitú, nun ye necesario que faigas nada más o si, per otra parte, tu nun fixesti esta aición, inora esti mensaxe.
+        extra_html: Revisa tamién <a href="%{terms_path}">les regles del sirvidor</a> ya <a href="%{policy_path}">los nuesos términos del serviciu</a>.
+        subject: 'Mastodon: instrucciones de confirmación de «%{instance}»'
       email_changed:
-        explanation: 'La direición de corréu de la cuenta camudó a:'
-        subject: 'Mastodón: Camudó la direición de corréu'
-        title: Direición nueva de corréu
+        explanation: 'La direición de corréu electrónicu de la cuenta camudó a:'
+        extra: Si nun camudesti la direición de corréu electrónicu, ye probable que daquién accediere a la cuenta. Camuda la contraseña agora mesmo o ponte en contautu cola alministración del sirvidor si nun yes a acceder a la cuenta.
+        subject: 'Mastodón: la direición de corréu electrónicu camudó'
+        title: Direición de corréu electrónicu nueva
       password_change:
-        explanation: Camudó la contraseña de la cuenta.
-        subject: 'Mastodon: Camudó la contraseña'
+        explanation: La contraseña de la cuenta camudó.
+        extra: Si nun camudesti la contraseña, ye probable que daquién accediere a la cuenta. Camuda la contraseña agora mesmo o ponte en contautu cola alministración del sirvidor si nun yes a acceder a la cuenta.
+        subject: 'Mastodon: la contraseña camudó'
+      reconfirmation_instructions:
+        explanation: Confirma la direición nueva pa camudar la direición de corréu electrónicu.
+        extra: Si tu nun aniciesti esti cambéu, inora esti mensaxe. La direición de corréu electrónicu de la cuenta de Mastodon nun va camudar hasta que nun accedas al enllaz d'arriba.
+        subject: 'Mastodon: confirmación de la direición de corréu electrónicu de «%{instance}»'
+        title: Verificar la direición de corréu electrónicu
       reset_password_instructions:
-        explanation: Solicitesti una contraseña nueva pa la cuenta.
-        extra: Si nun solicitesti esto, inora esti corréu. La contraseña nun va camudar hasta que nun accedas al enllaz d'enriba y crees una nueva.
-        subject: 'Mastodon: Instrucciones pa reafitar la contraseña'
+        action: Camudar la contraseña
+        explanation: Solicitesti una contraseña nueva pa la to cuenta.
+        extra: Si nun solicitesti esta aición, inora esti mensaxe. La contraseña nun va camudar hasta que nun accedas al enllaz d'arriba ya crees una.
+        subject: 'Mastodon: instrucciones pa camudar la contraseña'
+        title: Cambéu de la contaseña
       two_factor_disabled:
-        subject: 'Mastodon: Desactivóse l''autenticación en dos pasos'
+        explanation: Desactivóse l'autenticación en dos pasos na cuenta. Agora ye posible aniciar la sesión cola direición de corréu electrónicu ya la contraseña.
+        subject: 'Mastodon: desactivóse l''autenticación en dos pasos'
+        title: Autenticación de dos pasos activada
       two_factor_enabled:
-        subject: 'Mastodon: Activóse l''autenticación en dos pasos'
+        explanation: Activóse l'autenticación en dos pasos na cuenta. Agora los pases que xenere l'aplicación TOTP empareyada son obligatorios p'aniciar la sesión.
+        subject: 'Mastodon: activóse l''autenticación en dos pasos'
+        title: Autenticación de dos pasos desactivada
       two_factor_recovery_codes_changed:
-        subject: 'Mastodon: Rexeneráronse los códigos de l''autenticación en dos pasos'
+        explanation: Invalidáronse los códigos de recuperación anteriores ya xeneráronse otros nuevos.
+        subject: 'Mastodon: volvieron xenerase los códigos de recuperación de l''autenticación en dos pasos'
       unlock_instructions:
-        subject: 'Mastodon: Instrucciones de desbloquéu'
+        subject: 'Mastodon: instrucciones de desbloquéu'
+      webauthn_credential:
+        added:
+          explanation: Amestóse la llave de seguranza siguiente a la cuenta
+          subject: 'Mastodon: llave de seguranza nueva'
+          title: Amestóse una llave de seguranza nueva
+        deleted:
+          title: Desanicióse una de les to llaves de seguranza
+      webauthn_disabled:
+        explanation: Desactivóse l'autenticación con llaves de seguranza na cuenta. Agora namás ye posible aniciar la sesión col pase xeneráu pola aplicación TOTP empareyada.
+        subject: 'Mastodon: desactivóse l''autenticación con llaves de seguranza'
+        title: Llaves de seguranza desactivaes
+      webauthn_enabled:
+        explanation: Activóse l'autenticación con llaves de seguranza na cuenta. Agora pues usar la llave p'aniciar la sesión.
+        subject: 'Mastodon: activóse l''autenticación con llaves de seguranza'
+        title: Llaves de seguranza activaes
     passwords:
-      send_instructions: Si la direición de corréu esiste na base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña a esi corréu. Comprueba la carpeta Puxarra si nun lu recibiesti.
-      send_paranoid_instructions: Si la direición de corréu esiste na base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña a esi corréu. Comprueba la carpeta Puxarra si nun lu recibiesti.
-      updated: La contraseña camudó con ésitu. Agora aniciesti sesión.
-      updated_not_active: La contraseña camudó con ésitu.
+      send_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      send_paranoid_instructions: Si la direición de corréu electrónicu esiste na nuesa base de datos, nunos minutos vas recibir un enllaz pa recuperar la contraseña. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      updated: La contraseña camudó correutamente. Xá aniciesti la sesión.
+      updated_not_active: La contraseña camudó correutamente.
     registrations:
-      signed_up: "¡Afáyate! Rexistréstite con ésitu."
-      signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la direición de corréu. Sigui l'enllaz p'activar la cuenta. Comprueba la carpeta Puxarra si nun recibiesti esti corréu, por favor.
-      updated: La cuenta anovóse con ésitu.
+      destroyed: "¡Ta llueu! La cuenta anulóse correutamente. Esperamos volver vete pronto."
+      signed_up: "¡Afáyate! Rexistréstite correutamente."
+      signed_up_but_inactive: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta entá nun s'activó.
+      signed_up_but_locked: Rexistréstite correutamente. Por embargu, nun se pudo aniciar la sesión porque la cuenta ta bloquiada.
+      signed_up_but_pending: Unvióse un mensaxe a la direición de corréu electrónicu que contién un enllaz de confirmación. Darréu de calcar nel enllaz, vamos revisar la solicitú ya si s'aprueba, avisámoste.
+      signed_up_but_unconfirmed: Unvióse un mensaxe de confirmación a la to direición de corréu electrónicu. Sigui l'enllaz p'activar la cuenta ya revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      update_needs_confirmation: Anovesti la cuenta correutamente, mas tenemos de verificar la direición de corréu electrónicu nueva. Revisa'l to corréu electrónicu ya sigui l'enllaz de confirmación pa confirmar esta direición. Si nun recibiesti'l mensaxe, revisa la carpeta Puxarra.
+      updated: La cuenta anovóse correutamente.
+    sessions:
+      already_signed_out: Zarresti la sesión correutamente.
+      signed_in: Aniciesti la sesión correutamente.
+      signed_out: Zarresti la sesión correutamente.
     unlocks:
-      send_instructions: Nunos minutos vas recibir un corréu coles instrucciones pa cómo desbloquiar la cuenta. Comprueba la carpeta Puxarra si nun lu recibiesti.
-      send_paranoid_instructions: Si esiste la cuenta, nun momentu vas recibir un corréu coles instrucciones pa cómo desbloquiala. Comprueba la carpeta Puxarra si nun recibiesti esti corréu.
-      unlocked: La cuenta desbloquióse con ésitu. Anicia sesión pa siguir, por favor.
+      send_instructions: Nunos minutos vas recibir un mensaxe coles instrucciones pa saber cómo desbloquiar la cuenta. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      send_paranoid_instructions: Si esiste la cuenta, nun momentu vas recibir un mensaxe coles instrucciones pa saber cómo desbloquiala. Revisa la carpeta Puxarra si nun recibiesti esti mensaxe.
+      unlocked: La cuenta desbloquióse correutamente. Anicia la sesión pa siguir.
   errors:
     messages:
-      already_confirmed: yá se confirmó, volvi aniciar sesión
-      not_found: nun s'alcontró
+      already_confirmed: xá se confirmó, prueba a aniciar la sesión
       not_saved:
-        one: '1 fallu torgó que %{resource} se guardare:'
-        other: "%{count} fallos torgó que %{resource} se guardaren:"
+        one: '1 error torgó que «%{resource}» se guardare:'
+        other: "%{count} errores torgaron que «%{resource}» se guardaren:"
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
new file mode 100644
index 000000000..3bf35daed
--- /dev/null
+++ b/config/locales/devise.be.yml
@@ -0,0 +1,117 @@
+---
+be:
+  devise:
+    confirmations:
+      confirmed: Адрас вашай электроннай пошты паспяхова пацверджаны.
+      send_instructions: Цягам некалькіх хвілін вы атрымаеце ліст з інструкцыямі, каб пацвердзіць вашую электронную пошту. Калі ласка, зазірніце ў папку са спамам, калі не знойдзеце ліст.
+      send_paranoid_instructions: Калі адрас вашай электроннай пошты існуе ў нашай базе дадзеных, цягам некалькіх хвілін вы атрымаеце ліст з інструкцыямі, каб пацвердзіць вашую электронную пошту. Калі ласка, зазірніце ў папку са спамам, калі не знойдзеце ліст.
+    failure:
+      already_authenticated: Вы ўжо ўвайшлі.
+      inactive: Ваш уліковы запіс яшчэ не актываваны.
+      invalid: Няправільны %{authentication_keys} або пароль.
+      last_attempt: У вас ёсць яшчэ адна спроба, перш чым ваш рахунак будзе заблакаваны
+      locked: Ваш уліковы запіс заблакіраваны.
+      not_found_in_database: Няправільны %{authentication_keys} або пароль.
+      pending: Ваш уліковы запіс яшчэ разглядаецца.
+      timeout: Ваш сеанс скончыўся. Каб працягнуць, увайдзіце яшчэ раз.
+      unauthenticated: Вам патрэбна зайсьці альбо зарэгістравацца, каб працягнуць
+      unconfirmed: Вы павінны пацвердзіць свой адрас электроннай пошты, перш чым працягнуць
+    mailer:
+      confirmation_instructions:
+        action: Пацвердзіце адрас электроннай пошты
+        action_with_app: Пацвердзіць і вярнуцца да %{app}
+        explanation: Вы стварылі ўліковы запіс на %{host} з гэтым адрасам электроннай пошты. Вам спатрэбіцца ўсяго адзін клік, каб пацвердзіць яго. Калі гэта былі не вы, то проста праігнаруйце гэты ліст.
+        explanation_when_pending: Вы падалі заяўку на запрашэнне на %{host} з гэтым адрасам электроннай пошты. Як толькі вы пацвердзіце свой адрас электроннай пошты, мы разгледзім вашу заяўку. Вы можаце ўвайсці, каб змяніць свае дадзеныя або выдаліць свой уліковы запіс, але вы не можаце атрымаць доступ да большасці функцый, пакуль ваш уліковы запіс не будзе зацверджаны. Калі ваша заяўка будзе адхілена, вашы даныя будуць выдалены, таму ад вас не спатрэбіцца ніякіх дадатковых дзеянняў. Калі гэта былі не вы, ігнаруйце гэты ліст
+        extra_html: Таксама азнаёмцеся з <a href="%{terms_path}">правіламі сервера</a> і <a href="%{policy_path}">нашымі ўмовамі абслугоўвання</a>.
+        subject: 'Mastodon: Інструкцыі па пацвярджэнні для %{instance}'
+        title: Праверце адрас электроннай пошты
+      email_changed:
+        explanation: Адрас электроннай пошты для вашага ўліковага запісу будзе зменены на
+        extra: Калі вы не змянялі сваю электронную пошту, хутчэй за ўсё, нехта атрымаў доступ да вашага ўліковага запісу. Калі ласка, неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі вы заблакаваны з вашага ўліковага запісу
+        subject: 'Mastodon: адрас электроннай пошты зменены'
+        title: Новы адрас электроннай пошты
+      password_change:
+        explanation: Пароль для вашага ўліковага запісу быў зменены
+        extra: Калі вы не змянялі свой пароль, верагодна, нехта атрымаў доступ да вашага ўліковага запісу. Калі ласка, неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі вы заблакаваны з вашага ўліковага запісу
+        subject: 'Mastodon: пароль зменены'
+        title: Пароль зменены
+      reconfirmation_instructions:
+        explanation: Пацвердзіце, каб змяніць адрас вашай электроннай пошты.
+        extra: Калі гэтыя змены не былі зроблены вамі, ігнаруйце гэты ліст. Адрас электроннай пошты для акаўнту Mastodon не будзе зменены, пакуль вы не пяройдзеце па спасылцы вышэй.
+        subject: 'Mastodon: пацвердзіце электронную пошту для %{instance}'
+        title: Пацвердзіце адрас электроннай пошты
+      reset_password_instructions:
+        action: Змяніць пароль
+        explanation: Вы запыталі новы пароль для свайго ўліковага запісу.
+        extra: Калі вы не рабілі такога запыту, калі ласка, ігнаруйце гэты ліст. Ваш пароль не будзе зменены, пакуль вы не пяройдзеце па спасылцы вышэй і не створыце новы.
+        subject: 'Mastodon: Інструкцыі па скіданню пароля'
+        title: Скіданне пароля
+      two_factor_disabled:
+        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была адключана. Цяпер для ўваходу патрэбны толькі электронная пошта і пароль.
+        subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
+        title: двухэтапнае спраўджанне адключана
+      two_factor_enabled:
+        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была ўключана. Цяпер для ўваходу ў сістэму патрэбны токен, згенераваны даданай TOTP праграмай.
+        subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
+        title: двухэтапнае спраўджанне уключана
+      two_factor_recovery_codes_changed:
+        explanation: Папярэднія коды аднаўлення былі ануляваны і створаны новыя.
+        subject: 'Mastodon: створаны новыя коды аднаўлення'
+        title: 2FA коды аднаўлення былі зменены
+      unlock_instructions:
+        subject: 'Mastodon: інструкцыя па разблакаванні'
+      webauthn_credential:
+        added:
+          explanation: Наступны ключ бяспекі быў дададзены ў ваш уліковы запіс
+          subject: 'Mastodon: новы ключ бяспекі'
+          title: Быў дададзены новы ключ бяспекі
+        deleted:
+          explanation: Наступны ключ бяспекі быў выдалены з вашага ўліковага запісу
+          subject: 'Mastodon: ключ бяспекі выдалены'
+          title: Адзін з вашых ключоў бяспекі быў выдалены
+      webauthn_disabled:
+        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключана для вашага ўліковага запісу. Уваход цяпер магчымы толькі з токенам, згенераваным спалучаным TOTP прыкладаннем.
+        subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
+        title: Ключы бяспекі адключаны
+      webauthn_enabled:
+        explanation: Аўтэнтыфікацыя праз ключ бяспекі была ўключана для вашага ўліковага запісу. Цяпер вы можаце выкарыстоўваць ваш ключ бяспекі для ўваходу.
+        subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
+        title: Ключы бяспекі ўключаны
+    omniauth_callbacks:
+      failure: Немагчыма аўтэнтыфікаваць вас з %{kind}, таму што “%{reason}”.
+      success: Паспяховая аўтэнтыфікацыя з %{kind} уліковага запісу.
+    passwords:
+      no_token: Вы не можаце атрымаць доступ да гэтай старонкі не з ліста аднаўлення пароля. Калі вы ўсе ж такі перайшлі па спасылцы ў лісце аднаўлення пароля, упэўніцеся, што яна поўная.
+      send_instructions: Калі ваш электроны адрас існуе ў нашай базе дадзеных, вы атрымаеце спасылку для аднаўлення пароля на свой электроны адрас праз пару хвілін. Калі ласка, праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
+      send_paranoid_instructions: Калі ваш электроны адрас існуе ў нашай базе дадзеных, вы атрымаеце спасылку для аднаўлення пароля на свой электроны адрас праз пару хвілін. Калі ласка, праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
+      updated: Ваш пароль быў паспяхова зменены. Вы ўвайшлі ў сістэму.
+      updated_not_active: Ваш пароль быў паспяхова зменены.
+    registrations:
+      destroyed: Пакуль! Ваш уліковы запіс быў паспяхова выдалены. Мы спадзяваемся хутка ўбачыць вас зноў.
+      signed_up: Вітаем! Вы былі паспяхова зарэгістраваны.
+      signed_up_but_inactive: Вы паспяхова зарэгістраваліся. Аднак, мы не змаглі вас аўтарызаваць, таму што ваш уліковы запіс пакуль што не актывізаваны.
+      signed_up_but_locked: Вы паспяхова зарэгістраваліся. Аднак, мы не змаглі вас аўтарызаваць, таму што ваш уліковы запіс заблакаваны.
+      signed_up_but_pending: Ліст са спасылкай для пацверджання быў высланы на вашу электронную пошту. Пасля таго, як вы націсніце на спасылку, мы разгледзім вашу заяўку. Калі яна будзе ўхвалена, вы будзеце праінфармаваны.
+      signed_up_but_unconfirmed: Ліст са спасылкай для пацверджання быў высланы на вашу электронную пошту. Калі ласка, перайдзіце па спасылцы для актывацыі вашага ўліковага запісу. Праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
+      update_needs_confirmation: Вы паспяхова абнавілі свой уліковы запіс, аднак, нам неабходна пацвердзіць ваш новы адрас электроннай пошты. Калі ласка, праверце вашу пошту і перайдзіце па спасылцы для пацверджання вашага новага адраса электроннай пошты. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
+      updated: Ваш уліковы запіс быў паспяхова абноўлены.
+    sessions:
+      already_signed_out: Выхад паспяховы.
+      signed_in: Уваход паспяховы.
+      signed_out: Выхад паспяховы.
+    unlocks:
+      send_instructions: Вы атрымаеце ліст з інструкцыямі па разблакаванні вашага ўліковага запісу цягам некалькіх хвілін. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
+      send_paranoid_instructions: Калі ваш уліковы запіс існуе, вы атрымаеце ліст з інструкцыямі па яго разблакаванні цягам некалькіх хвілін. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
+      unlocked: Ваш уліковы запіс быў паспяхова разблакаваны. Калі ласка, увайдзіце, каб працягнуць
+  errors:
+    messages:
+      already_confirmed: ужо пацверджана, паспрабуйце ўвайсці
+      confirmation_period_expired: трэба пацвердзіць на працягу %{period}, запытайце новы
+      expired: скончыўся, запытайце новы
+      not_found: Не знойдзена
+      not_locked: Не быў заблакаваны
+      not_saved:
+        few: "%{count} памылкі перашкаджаюць захаваць гэты %{resource}:"
+        many: "%{count} памылак не даюць захаваць гэты %{resource}:"
+        one: '1 памылка не дае захаваць гэты %{resource}:'
+        other: "%{count} памылак перашкаджаюць захаваць гэты %{resource}:"
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index c3773bcae..93e18742c 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -2,29 +2,29 @@
 bg:
   devise:
     confirmations:
-      confirmed: Твоят профил беше успешно потвърден. Влизането в профила е успешно.
-      send_instructions: Ще получиш писмо с инструкции как да потвърдиш своя профил до няколко минути.
-      send_paranoid_instructions: Ако твоят имейл адрес съществува в базата ни, ще получиш там инструкции как да потвърдиш своя профил.
+      confirmed: Вашият адрес на имейл беше успешно потвърден.
+      send_instructions: Ще получите е-писмо с указания как да потвърдите адреса на имейла си за няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако адресът на имейл ви съществува в базата ни данни, ще получите е-писмо с указания как да потвърдите адреса на имейла си за няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
     failure:
-      already_authenticated: Вече си вътре в профила си.
-      inactive: Профилът ти все още не е активиран.
-      invalid: Невалиден %{authentication_keys}.
-      last_attempt: Разполагаш с още един опит преди профилът ти да бъде заключен.
-      locked: Профилът ти е заключен.
-      not_found_in_database: Невалиден %{authentication_keys}.
+      already_authenticated: Вече сте влезли.
+      inactive: Акаунтът ви още не е задействан.
+      invalid: Невалиден %{authentication_keys} или парола.
+      last_attempt: Разполагате с още един опит преди акаунтът ви да се заключи.
+      locked: Вашият акаунт е заключен.
+      not_found_in_database: Невалиден %{authentication_keys} или парола.
       pending: Вашият акаунт все още е в процес на проверка.
-      timeout: Сесията ти изтече, моля влез отново, за да продължиш.
-      unauthenticated: Преди да продължиш, трябва да влезеш в профила си или да се регистрираш.
-      unconfirmed: Преди да продължиш, трябва да потвърдиш регистрацията си.
+      timeout: Сесията ви изтече. Влезте пак, за да продължите.
+      unauthenticated: Преди да продължите, трябва да влезете или да се регистрирате.
+      unconfirmed: Преди да продължите, трябва да потвърдиш адреса на имейла си.
     mailer:
       confirmation_instructions:
-        action: Потвърдете имейл адреса
+        action: Потвърдете адреса на имейла
         action_with_app: Потвърдете и се върнете към %{app}
         explanation: Създали сте акаунт на %{host} с този имейл адрес. Само на едно щракване разстояние сте от активирането му. Ако това не сте били вие, моля, игнорирайте този имейл.
         explanation_when_pending: Кандидатствахте за покана до %{host} с този имейл адрес. След като потвърдите своя имейл адрес, ние ще разгледаме вашето заявление. Можете да влезете, за да промените данните си или да изтриете акаунта си, но нямате достъп до повечето функции, докато акаунтът ви не бъде одобрен. Ако вашето заявление бъде отхвърлено, вашите данни ще бъдат премахнати, така че няма да се изискват допълнителни действия от вас. Ако това не сте били вие, моля, игнорирайте този имейл.
-        extra_html: Моля, проверете <a href="%{terms_path}">правилата на сървъра</a> и <a href="%{policy_path}">нашите условия за обслужване</a>.
-        subject: 'Mastodon: Инструкции за потвърждаване %{instance}'
-        title: Потвърдете имейл адреса
+        extra_html: Проверете <a href="%{terms_path}">правилата на сървъра</a> и <a href="%{policy_path}">условията ни за обслужване</a>.
+        subject: 'Mastodon: Указания за потвърждаване за %{instance}'
+        title: Потвърдете адреса на имейла
       email_changed:
         explanation: 'Имейл адресът на вашия акаунт се променя на:'
         extra: Ако не сте сменили имейла си, вероятно някой е получил достъп до вашия акаунт. Моля, сменете паролата си незабавно или се свържете с администратора на сървъра, ако сте блокирани от акаунта си.
@@ -37,29 +37,29 @@ bg:
         title: Паролата е променена
       reconfirmation_instructions:
         explanation: Потвърдете новия адрес, за да промените имейла си.
-        extra: Ако тази промяна не е инициирана от вас, моля, игнорирайте този имейл. Имейл адресът за акаунта на Mastodon няма да се промени, докато не влезете във връзката по-горе.
+        extra: Ако тази промяна не е инициирана от вас, то игнорирайте този имейл. Адресът на имейл за акаунта в Mastodon няма да се промени, докато не влезете в горната връзка.
         subject: 'Mastodon: Потвърдете имейла за %{instance}'
-        title: Потвърдете имейл адреса
+        title: Потвърдете своя имейл адрес
       reset_password_instructions:
         action: Промяна на парола
-        explanation: Поискахте нова парола за вашия акаунт.
-        extra: Ако не сте поискали това, моля, игнорирайте този имейл. Паролата ви няма да се промени, докато не влезете във връзката по-горе и не създадете нова.
-        subject: Инструкции за смяна на паролата
+        explanation: Поискахте нова парола за акаунта си.
+        extra: Ако не сте поискали това, моля, игнорирайте този имейл. Паролата ви няма да се промени, докато не влезете в линка по-горе и не създадете нова.
+        subject: 'Mastodon: Указания за задаване на нова парола'
         title: Нулиране на парола
       two_factor_disabled:
         explanation: Двуфакторното удостоверяване за вашия акаунт е деактивирано. Влизането вече е възможно, като се използват само имейл адрес и парола.
         subject: 'Mastodon: Двуфакторното удостоверяване е деактивирано'
-        title: 2FA деактивирано
+        title: Двуфакторното изключено
       two_factor_enabled:
-        explanation: За вашия акаунт е активирано двуфакторно удостоверяване. За влизане ще е необходим ключ, генериран от сдвоеното приложение TOTP.
+        explanation: За вашия акаунт е активирано двуфакторно удостоверяване. За влизане ще е необходим ключ, генериран от сдвоеното приложение за TOTP.
         subject: 'Mastodon: Двуфакторното удостоверяване е активирано'
         title: 2FA активирано
       two_factor_recovery_codes_changed:
-        explanation: Предишните кодове за възстановяване са обезсилени и се генерират нови.
-        subject: 'Mastodon: Възстановени са двуфакторни кодове за възстановяване'
-        title: 2FA кодове за възстановяване са променени
+        explanation: Предишните кодове за възстановяване са анулирани и се пораждат нови.
+        subject: 'Mastodon: Генерирани отново са двуфакторни кодове за възстановяване'
+        title: Кодове за 2 факт. удост. за възстановяване са променени
       unlock_instructions:
-        subject: Инструкции за отключване
+        subject: 'Mastodon: указания за отключване'
       webauthn_credential:
         added:
           explanation: Следният ключ за сигурност е добавен към вашия акаунт
@@ -68,9 +68,9 @@ bg:
         deleted:
           explanation: Следният ключ за сигурност е изтрит от вашия акаунт
           subject: 'Mastodon: Ключът за сигурност е изтрит'
-          title: Един от вашите ключове за сигурност е изтрит
+          title: Един от ключовете ви за сигурност е изтрит
       webauthn_disabled:
-        explanation: Удостоверяването с ключове за сигурност е деактивирано за вашия акаунт. Влизането вече е възможно, използвайки само ключа, генериран от сдвоеното приложение TOTP.
+        explanation: Удостоверяването с ключове за сигурност е изключено за акаунта ви. Влизането вече е възможно, използвайки само ключа, породен от сдвоеното приложение TOTP.
         subject: 'Mastodon: Удостоверяването с ключове за сигурност е деактивирано'
         title: Ключовете за сигурност са деактивирани
       webauthn_enabled:
@@ -79,30 +79,30 @@ bg:
         title: Ключовете за сигурност са активирани
     omniauth_callbacks:
       failure: Не успяхме да те упълномощим чрез %{kind}, защото "%{reason}".
-      success: Успешно упълномощаване чрез %{kind} профил.
+      success: Успешно упълномощаване от акаунт на %{kind}.
     passwords:
       no_token: Може да достъпваш тази страница само от имейл за промяна на паролата. Ако тази страница е отворена от такъв имейл, увери се, че използваш целия URL-адрес, който сме ти изпратили.
-      send_instructions: Ще получиш писмо с инструкции как да промениш паролата си до няколко минути.
-      send_paranoid_instructions: Ако твоят имейл адрес съществува в базата ни, ще получиш там инструкции за промяна на своята парола.
+      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
       updated: Паролата ти беше променена успешно. Влизането в профила е успешно.
-      updated_not_active: Паролата ти беше променена успешно.
+      updated_not_active: Паролата ви беше променена успешно.
     registrations:
-      destroyed: Довиждане! Твоят профил беше успешно изтрит. Надяваме се скоро да те видим отново.
-      signed_up: Привет! Регистрирацията ти е успешна.
-      signed_up_but_inactive: Регистрирацията ти е успешна. Въпреки това, не можеш да влезеш в профила си, защото той все още не е потвърден.
-      signed_up_but_locked: Регистрирацията ти е успешна. Въпреки това, не можеш да влезеш в профила си, защото той е заключен.
-      signed_up_but_pending: На вашия имейл адрес е изпратено съобщение с връзка за потвърждение. След като щракнете върху връзката, ние ще прегледаме вашето заявление. Ще бъдете уведомени, ако то е одобрено.
-      signed_up_but_unconfirmed: Писмо с връзка за потвърждаване на профила ти беше изпратено на твоя имейл адрес. Моля, отвори връзката, за да активираш своя профил.
-      update_needs_confirmation: Профилът ти е успешно променен, но ние трябва да проверим твоя нов имейл адрес. Моля, провери пощата си и отвори връзката за потвърждаване на новия адрес.
+      destroyed: Довиждане! Вашият акаунт беше успешно изтрит. Надяваме се скоро да ви видим пак.
+      signed_up: Добре дошли! Успешно се регистрирахте.
+      signed_up_but_inactive: Регистрирахте се успешно. Въпреки това, не можете да влезете, тъй като акаунтът ви все още не е активиран.
+      signed_up_but_locked: Регистрирахте се успешно. Въпреки това, не можете да влезете, тъй като акаунтът ви е заключен.
+      signed_up_but_pending: До адреса на имейла ви е изпратено съобщение с връзка за потвърждение. След като щракнете върху връзката, ние ще прегледаме вашето заявление. Ще бъдете известени, ако то е одобрено.
+      signed_up_but_unconfirmed: Е-писмо с връзка за потвърждаване беше изпратено до адреса на имейла ви. Последвайте връзката, за да задействате акаунта си. Проверете папката си за спам, ако не сте получили това е-писмо.
+      update_needs_confirmation: Успешно осъвременихте акаунта си, но трябва да потвърдим новия ви адрес на имейл. Проверете е-пощата си и отворете връзката за потвърждаване на новия адрес. Проверете папката си за спам, ако не сте получили това е-писмо.
       updated: Профилът ти е успешно променен.
     sessions:
       already_signed_out: Успешно излизане от профила.
       signed_in: Успешно влизане.
       signed_out: Успешно излизане.
     unlocks:
-      send_instructions: Ще получиш писмо с инструкции как да отключиш профила си до няколко минути.
-      send_paranoid_instructions: Ако твоят профил съществува в базата ни, на своя имейл адрес ще получиш инструкции за отключването му до няколко минути.
-      unlocked: Твоят профил беше отключен успешно. За да продължиш, влез в него.
+      send_instructions: Ще получите е-писмо с указания как да отключите акаунта си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако акаунта ви съществува в базата ни, то ще получите е-писмо с указания за отключването му до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+      unlocked: Акаунтът ви е успешно отключен. Влезте, за да продължите.
   errors:
     messages:
       already_confirmed: е вече потвърден, моля опитай да влезеш в профила си с него
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index dc4a650e4..4a16157f8 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -3,6 +3,8 @@ br:
   devise:
     confirmations:
       confirmed: Kadarnaet eo bet ho chomlec'h postel gant berzh.
+      send_instructions: Resev a rit ur postel evit displegañ penaos kadarnaat ho chomlec'h-postel tuchantig, Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      send_paranoid_instructions: Ma'z eo ho chomlec'h-postel er stlennvon dija, kaset a vo ur postel deoc'h evit displegañ penaos kadarnaat ho chomlec'h-postel tuchantig. Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
     failure:
       already_authenticated: Kennasket oc'h dija.
       inactive: N'eo ket gweredekaet ho kont c'hoazh.
@@ -11,47 +13,106 @@ br:
       locked: Prennet eo ho kont.
       not_found_in_database: "%{authentication_keys} pe ger-tremen diwiriek."
       pending: O vezañ asantet eo ho kont.
+      timeout: Ho talc'h a zo aet da dermen. Mar plij, kit-tre c'hoazh evit kenderc'hel.
+      unauthenticated: Ret eo deoc'h mont-tre pe e em enskrivañ araok kenderc'hel.
+      unconfirmed: Ret eo deoc'h kadarnaat ho chomlec'h-postel araok kenderc'hel.
     mailer:
       confirmation_instructions:
         action: Gwiriekaat ar chomlec'h postel
         action_with_app: Kadarnaat ha distroiñ da %{app}
+        explanation: Krouet ho peus ur c'hont war %{host} gant ar chomlec'h-postel-mañ. N'eus nemet ur c'hlik evit bevaat anezhañ. Ma ne oa ket krouet ganeoc'h, dianavezit ar postel-se.
+        explanation_when_pending: Enskrivañ ho peus d'ur c'hemennad da %{host} gant ar chomlec'h-postel-se. Pa vo kadarnaet ho chomlec'h-postel, hoc'h enskrivadur a vo asantet. Gallout a rit mont-tre evit kemmañ munudoù ho kont pe skarzhañ anezhañ, met ne c'hellit ket implijout ul lod eus an aezamantoù par ma n'eo ket asantet ho kont. Ma vefe hoc'h enskrivadur nac'het, ho keloù a vefe skarzhet, neuze ne vo ket ret deoc'h ober netra ken. Ma ne oa ket ac'hanoc'h, dianavezit ar postel-se.
+        extra_html: Mar plij, gwiriit ivez <a href="%{terms_path}"> reolennoù ar servijer</a> ha <a href="%{policy_path}"> hon divizoù-implij</a>.
+        subject: 'Mastodon: kemennoù kadarnadur evit %{instance}'
         title: Gwiriekaat ar chomlec'h postel
       email_changed:
+        explanation: 'Chomlec''h-postel ho kont a zo bet kemmet da:'
+        extra: Ma n'ho peus ket kemmet ho postel, e seblant un den bennak en deus gallet mont-tre d'ho kont. Mar plij, kemmit ho ker-tremen hep gortoz, pe kit e darempred gant merer ar servijer ma'z oc'h bac'het e-maez ho kont.
         subject: 'Mastodoñ : Postel kemmet'
         title: Chomlec'h postel nevez
       password_change:
         explanation: Kemmet eo bet ger-tremen ho kont.
+        extra: Ma n'ho peus ket kemmet ho ker-tremen, e seblant un den bennak en deus gallet mont-tre d'ho kont. Mar plij, kemmit ho ker-tremen hep gortoz, pe kit e darempred gant merer ar servijer ma'z oc'h bac'het e-maez ho kont.
         subject: 'Mastodoñ : Ger-tremen kemmet'
         title: Ger-tremen kemmet
       reconfirmation_instructions:
-        explanation: Kadarnait ar chomlec'h nevez evit cheñch ho postel.
+        explanation: Kadarnait ar chomlec'h nevez evit kemmañ ho postel.
+        extra: Ma ne oa ket lañset ar ch'emm-se ganeoc'h, dianavezit ar postel-mañ. Chomlec'h-postel ar c'hont Mastodon ne vo ket kemmet keit ha ma c'hlikit ar lec'hienn a-us.
         subject: 'Mastodoñ : Kadarnait ar postel evit %{instance}'
         title: Gwiriekaat ar chomlec'h postel
       reset_password_instructions:
-        action: Cheñch ar ger-tremen
+        action: Kemmañ ar ger-tremen
         explanation: Goulennet ho peus ur ger-tremen nevez evit ho kont.
+        extra: Ma n'ho peus ket goulennet an dra-se, dianavezit ar postel-mañ. Ho ker-tremen ne gemmo ket keit ha ma c'hlikit ar lec'hienn a-us ha krouiit unan all.
+        subject: 'Mastodon: Adkorañ kemennoù ar ger-tremen'
         title: Adderaouekaat ar ger-tremen
       two_factor_disabled:
+        explanation: Dilesadur dre eil-elfenn a zo bet nac'het. Gallout a reer mont-tre en ur implijout nemet ur chomlec'h-postel hag ur ger-tremen.
+        subject: 'Mastodon: dilesadur dre eil-elfenn nac''het'
         title: 2FA diweredekaet
       two_factor_enabled:
+        explanation: Dilesadur dre eil-elfenn a zo aotreet evit ho kont. Ret a vo implij ur jedouer krouet gant an app TOTP koublet evit mont-tre.
+        subject: 'Mastodon: dilesadur dre eil-elfenn aotreet'
         title: 2FA gweredekaet
+      two_factor_recovery_codes_changed:
+        explanation: Ar c'hodoù adtapout diaraok a zo bet skarzhet ha kodoù nevez krouet.
+        subject: 'Mastodon: kod adtapout dre eil-elfenn a zo adgrouet'
+        title: Kod adtapout 2FA a zo bet kemmet
+      unlock_instructions:
+        subject: 'Mastodon: Dikrouilhiñ kemennoù'
+      webauthn_credential:
+        added:
+          explanation: An alc'hwez surentez-se a zo bet ouzhpennet d'ho kont
+          subject: 'Mastodon: alc''hwez surentez nevez-flamm'
+          title: Un alc'hwez surentez nevez-flamm a zo bet ouzhpennet
+        deleted:
+          explanation: An alc'hwez surentez-se a zo bet dilamet eus ho kont
+          subject: 'Mastodon: alc''hwezioù surentez dilamet'
+          title: Unan eus hoc'h alc'hwezioù surentez a zo bet dilamet
+      webauthn_disabled:
+        explanation: Dilezadur dre alc'hwezioù surentel a zo bet nac'het evit ho kont. Gallout a reer mont-tre en ur implijout ar jedouer krouet gant app TOTP koublet.
+        subject: 'Mastodon: dilesadur dre alc''hwezioù surentez nac''het'
+        title: Alc'hwezioù surentez nac'het
+      webauthn_enabled:
+        explanation: Dilesadur dre alc'hwez surentez a zo bet aotreet evit ho kont. Hoc'h alc'hwez surentez a c'hell bezañ implijet evit mont-tre.
+        subject: 'Mastodon: dilesadur dre alc''hwezioù surentez aotreet'
+        title: Alc'hwezioù surentez aotreet
+    omniauth_callbacks:
+      failure: Ne c'haller ket bezañ gwiriekaet deus %{kind} abalamour da "%{reason}".
+      success: Gwiriekaet deus kont %{kind} gant berzh.
     passwords:
-      updated: Cheñchet eo bet ho ker-tremen gant berzh. Bremañ oc'h anavezadennet.
+      no_token: Ne c'hellit ket mont d'ar bajenn-mañ ma zeuit ket deus ur postel evit adkorañ ur ger-tremen. M'ho peus implijet ur postel evit adkorañ ur ger-tremen, gwiriit oc'h implijet an URL a-bezh.
+      send_instructions: Ma'z eo ho chomlec'h-postel er stlennvon dija, kaset a vo deoc'h ur lec'hienn evit adkorañ ho ker-tremen tuchantig. Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      send_paranoid_instructions: Ma'z eo ho chomlec'h-postel er stlennvon dija, kaset a vo deoc'h ur lec'hienn evit adkorañ ho ker-tremen tuchantig. Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      updated: Kemmet eo bet ho ker-tremen gant berzh. Bremañ oc'h anavezadennet.
       updated_not_active: Kemmet eo bet ho ker-tremen ent reizh.
     registrations:
       destroyed: Kenavo! Ho kont a zo bet nullet gant berzh. Emichañs e viot adwelet tuchant.
-      signed_up: Donemat ! Kevreet oc'h.
+      signed_up: Donemat ! Enskrivet oc'h.
       signed_up_but_inactive: Enskrivet oc'h bet gant berzh. N'omp ket evit anavezadenniñ ac'hanoc'h alatao, rak ho kont n'eo ket aotreet c'hoazh.
       signed_up_but_locked: Enskrivet oc'h bet gant berzh. N'omp ket evit anavezadenniñ ac'hanoc'h alatao, rak ho kont a zo prennet.
+      signed_up_but_pending: Ur c'hemennad gant ul lec'hienn kadarnaat a zo bet kaset d'ho chomlec'h-postel. Pa vo kliket al lec'hienn ganeoc'h e vo gwiriet hoc'h arload ganeomp. Ur gemennadenn a vo kaset deoc'h hag-eñ eo erbedet ho kont.
+      signed_up_but_unconfirmed: Ur ch'emennad gant ul lec'hienn kadarnaat a zo bet kaset d'ho chomlec'h-postel. Mar plij, heuliit al lec'hienn evit gweredekaat ho kont. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      update_needs_confirmation: Ho kont a zo bet hizivaet da benn, met ret eo deomp gwiriañ ho chomlec'h-postel nevez. Mar plij, gwiriit ho postelioù ha heuliit al lec'hienn evit kadarnaat ho chomlec'h-postel nevez. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      updated: Ho kont a zo bet hizivaet da benn.
     sessions:
       already_signed_out: Digennasket gant berzh.
       signed_in: Kennasket gant berzh.
       signed_out: Digennasket gant berzh.
     unlocks:
+      send_instructions: Kaset e vo ur postel deoc'h evit displegañ deoc'h penaos dikrouilhiñ anezhañ tuchantig. Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      send_paranoid_instructions: Ma'z eo ho kont krouet dija, kaset e vo ur postel deoc'h evit displegañ deoc'h penaos dikrouilhiñ anezhañ. Mar plij, gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
       unlocked: Ho kont a zo bet dibrennet gant berzh. Anavezadennit evit mont-tre.
   errors:
     messages:
       already_confirmed: a zo bet kadarnaet dija, klaskit d'en em anavezadenniñ
       confirmation_period_expired: eo ret bezañ kadarnaet a-raok %{period}, goulennit unan all mar plij
+      expired: a zo aet da dermen, goulennit unan nevez mar plij
       not_found: digavet
       not_locked: ne oa ket prennet
+      not_saved:
+        few: "%{count} faot en deus miret ouzh %{resource} da vezañ gwarezet:"
+        many: "%{count} faot en deus miret ouzh %{resource} da vezañ gwarezet:"
+        one: '1 faot en deus miret ouzh %{resource} da vezañ gwarezet:'
+        other: "%{count} faot en deus miret ouzh %{resource} da vezañ gwarezet:"
+        two: "%{count} faot en deus miret ouzh %{resource} da vezañ gwarezet:"
diff --git a/config/locales/devise.bs.yml b/config/locales/devise.bs.yml
new file mode 100644
index 000000000..e9e174462
--- /dev/null
+++ b/config/locales/devise.bs.yml
@@ -0,0 +1 @@
+bs:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index e1600bc6a..b19a04619 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -2,116 +2,116 @@
 ca:
   devise:
     confirmations:
-      confirmed: La teva adreça de correu electrònic s'ha confirmat correctament.
-      send_instructions: "En pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu. \nSi us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu."
+      confirmed: La teva adreça de correu-e s'ha confirmat correctament.
+      send_instructions: "En pocs minuts rebràs un correu-e amb instruccions sobre com confirmar l'adreça de correu. \nSi us plau, verifica la carpeta de la brossa si no l'has rebut."
       send_paranoid_instructions: |-
-        Si l'adreça de correu electrònic existeix en la nostra base de dades, en pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu.
-        Si us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu.
+        Si l'adreça de correu-e ja existeix a la nostra base de dades rebràs un correu amb instruccions sobre com confirmar-la.
+        Si us plau, verifica la carpeta de la brossa si no l'has rebut.
     failure:
       already_authenticated: Ja estàs registrat.
       inactive: El teu compte encara no s'ha activat.
       invalid: "%{authentication_keys} o contrasenya no són vàlids."
-      last_attempt: Tens un intent més, abans que es bloquegi el compte.
-      locked: El compte s'ha bloquejat.
+      last_attempt: Tens un intent més abans no es bloqui el teu compte.
+      locked: El teu compte s'ha blocat.
       not_found_in_database: "%{authentication_keys} o contrasenya no són vàlids."
       pending: El teu compte encara està en revisió.
-      timeout: La sessió ha expirat. Inicia sessió una altra vegada per a continuar.
+      timeout: La sessió ha expirat. Torna a iniciar-la per a continuar.
       unauthenticated: Cal iniciar sessió o registrar-se abans de continuar.
-      unconfirmed: Has de confirmar l'adreça de correu electrònic abans de continuar.
+      unconfirmed: Has de confirmar l'adreça-e abans de continuar.
     mailer:
       confirmation_instructions:
-        action: Verifica l'adreça de correu
+        action: Verifica l'adreça-e
         action_with_app: Confirma i torna a %{app}
-        explanation: Has creat un compte a %{host} amb aquesta adreça de correu electrònic. Estàs a un sol clic de l'activació. Si no fos així, ignora aquest correu electrònic.
-        explanation_when_pending: Has sol·licitat una invitació a %{host} amb aquesta adreça de correu electrònic. Un cop confirmis la teva adreça de correu electrònic revisarem la teva sol·licitud. No es pot iniciar la sessió fins llavors. Si la teva sol·licitud és rebutjada les teves dades s’eliminaran, de manera que no s’exigirà cap altra acció. Si no has estat tu qui ha fet aquest sol·licitud si us plau ignora aquest correu electrònic.
-        extra_html: Si us plau consulta també <a href="%{terms_path}"> les regles del servidor</a> i <a href="%{policy_path}"> les nostres condicions de servei</a>.
-        subject: 'Mastodon: Instruccions de confirmació %{instance}'
-        title: Verifica l'adreça de correu
+        explanation: Has creat un compte a %{host} amb aquesta adreça de correu electrònic. Estàs a un sol clic d'activar-lo. Si no ho has fet tu, ignora aquest correu electrònic.
+        explanation_when_pending: Has sol·licitat una invitació a %{host} amb aquesta adreça-e. Revisarem la sol·licitud quan la confirmis. Pots iniciar la sessió per canviar els detalls o eliminar el compte, però no pots accedir a la majoria de les funcions fins que s'hagi aprovat. Si es rebutja la sol·licitud, les teves dades s’eliminaran, de manera que no se t’exigirà cap acció més. Si tu no has fet aquesta sol·licitud, ignora aquest correu-e.
+        extra_html: Si us plau, consulta també a <a href="%{terms_path}"> les regles del servidor</a> i a <a href="%{policy_path}"> les nostres condicions de servei</a>.
+        subject: 'Mastodon: Instruccions de confirmació de %{instance}'
+        title: Verifica l'adreça-e
       email_changed:
-        explanation: 'L''adreça de correu del teu compte s''està canviant a:'
-        extra: Si no has canviat el teu correu electrònic és probable que algú hagi accedit al teu compte. Si us plau, canvia la contrasenya immediatament o posa't en contacte amb l'administrador del servidor si no pots accedir al teu compte.
-        subject: 'Mastodon: s''ha canviat l''adreça electrònica'
-        title: Adreça de correu electrònic nova
+        explanation: 'L''adreça-e del teu compte es canvia a:'
+        extra: Si no has canviat el teu correu-e és probable que algú hagi accedit al teu compte. Si us plau, canvia la contrasenya immediatament o posa't en contacte amb l'administrador del servidor si no pots accedir al teu compte.
+        subject: 'Mastodon: s''ha canviat l''adreça-e'
+        title: Nova adreça-e
       password_change:
         explanation: S'ha canviat la contrasenya del teu compte.
-        extra: Si no has canviat el teu correu electrònic, és probable que algú hagi accedit al teu compte. Si us plau, canvia la contrasenya immediatament o posa't en contacte amb l'administrador del servidor si no pots accedir al teu compte.
-        subject: 'Mastodon: Contrasenya canviada'
+        extra: Si no has canviat la teva contrasenya, és probable que algú hagi accedit al teu compte. Si us plau, canvia-la immediatament o posa't en contacte amb l'administrador del servidor si no pots accedir al teu compte.
+        subject: 'Mastodon: contrasenya canviada'
         title: Contrasenya canviada
       reconfirmation_instructions:
-        explanation: Confirma la nova adreça per canviar el teu correu electrònic.
-        extra: Si no has iniciat aquest canvi, ignora aquest correu electrònic. L'adreça electrònica del compte de Mastodon no canviarà fins que accedeixis a l'enllaç de dalt.
-        subject: 'Mastodon: confirma l''adreça electrònica per a %{instance}'
-        title: Verifica l'adreça de correu electrònic
+        explanation: Confirma la nova adreça per canviar el teu correu-e.
+        extra: Si no has iniciat aquest canvi, ignora aquest correu-e. L'adreça de correu-e del compte de Mastodon no canviarà fins que no accedeixis a l'enllaç que hi ha a dalt.
+        subject: 'Mastodon: confirma l''adreça-e per a %{instance}'
+        title: Verifica l'adreça de correu-e
       reset_password_instructions:
-        action: Canviar contrasenya
+        action: Canvia la contrasenya
         explanation: Has sol·licitat una contrasenya nova per al teu compte.
-        extra: Si no ho has sol·licitat, ignora aquest correu electrònic. La teva contrasenya no canviarà fins que accedeixis a l'enllaç de dalt i creis un de nou.
+        extra: Si no l'has sol·licitada, ignora aquest correu electrònic. La teva contrasenya no canviarà fins que no accedeixis a l'enllaç que hi ha a dalt i en creïs una de nova.
         subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
         title: Contrasenya restablerta
       two_factor_disabled:
-        explanation: L´autenticació de dos factors pel teu compte ha estat desactivat. L'inici de sessió és ara possible utilitzant només l'adreça de correu electrònic i la contrasenya.
-        subject: 'Mastodon: autenticació de dos factors desactivada'
-        title: 2FA desactivat
+        explanation: L'autenticació de doble factor per al teu compte s'ha desactivat. Ara només pots iniciar la sessió fent servir la teva adreça de correu-e i la contrasenya.
+        subject: 'Mastodon: Autenticació de doble factor desactivada'
+        title: A2F desactivada
       two_factor_enabled:
-        explanation: L'autenticació de dos factors ha estat habilitada pel teu compte. Un token generat per l'aplicació d'emparellat TOTP serà requerit per a iniciar sessió.
-        subject: 'Mastodon: autenticació de dos factors activada'
-        title: 2FA activat
+        explanation: L'autenticació de doble factor s'ha habilitat per al teu compte. Per a iniciar la sessió es requerirà un token generat per l'aplicació TOTP que hi hagis emparellat.
+        subject: 'Mastodon: Autenticació de doble factor activada'
+        title: A2F activada
       two_factor_recovery_codes_changed:
-        explanation: Els codis de recuperació anteriors han estat invalidats i s'han generat uns de nous.
-        subject: 'Mastodon: codis de recuperació de Dos factors regenerats'
-        title: 2FA codis de recuperació canviats
+        explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
+        subject: 'Mastodon: codis de recuperació de doble factor regenerats'
+        title: Codis de recuperació A2F canviats
       unlock_instructions:
-        subject: 'Mastodon: Instruccions per a desbloquejar'
+        subject: 'Mastodon: Instruccions per a desblocar'
       webauthn_credential:
         added:
           explanation: La següent clau de seguretat s'ha afegit al teu compte
-          subject: 'Mastodon: Nova clau de seguretat'
+          subject: 'Mastodon: nova clau de seguretat'
           title: S'ha afegit una nova clau de seguretat
         deleted:
           explanation: La següent clau de seguretat s'ha esborrat del teu compte
-          subject: 'Mastodon: clau de seguretat esborrada'
+          subject: 'Mastodon: Clau de seguretat esborrada'
           title: Una de les teves claus de seguretat ha estat esborrada
       webauthn_disabled:
-        explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. L'inici de sessió és ara possible emprant només el token generat per l'aplicació TOTP.
+        explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. Ara només pots iniciar la sessió usant el token generat per l'aplicació TOTP.
         subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
         title: Claus de seguretat desactivades
       webauthn_enabled:
-        explanation: S'ha activat l'autenticació amb claus de seguretat. La teva clau de seguretat por ser emprada per a iniciar sessió.
+        explanation: S'ha activat l'autenticació amb claus de seguretat. Ja pots usar la teva clau de seguretat per a iniciar sessió.
         subject: 'Mastodon: Autenticació amb clau de seguretat activada'
         title: Claus de seguretat activades
     omniauth_callbacks:
-      failure: No podem autenticar-te des de %{kind} degut a "%{reason}".
-      success: Autenticat amb èxit des del compte %{kind}.
+      failure: No s'ha pogut autenticar des de %{kind} degut a "%{reason}".
+      success: Autenticat correctament des del compte %{kind}.
     passwords:
-      no_token: No pots accedir a aquesta pàgina sense provenir des del correu de restabliment de la contrasenya. Si vens des del correu de restabliment de contrasenya, assegura't que estàs emprant l'adreça completa proporcionada.
-      send_instructions: Si el teu correu electrònic existeix en la nostra base de dades, rebràs en pocs minuts un enllaç de restabliment de contrasenya en l'adreça de correu. Si us plau verifica la teva carpeta de correu brossa if no rebut aquest correu.
-      send_paranoid_instructions: Si el seu correu electrònic existeix en la nostra base de dades, rebràs un enllaç de restabliment de contrasenya en l'adreça de correu en pocs minuts.
+      no_token: Només pots accedir a aquesta pàgina a través de l'enllaç de restabliment de la contrasenya. Si vens d'un correu electrònic com aquest, assegura't que has introduït l'adreça completa proporcionada.
+      send_instructions: Si el teu correu electrònic existeix en la nostra base de dades, rebràs en pocs minuts un enllaç de restabliment de contrasenya en l'adreça de correu. Si us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu.
+      send_paranoid_instructions: Si el teu correu electrònic existeix en la nostra base de dades, rebràs un enllaç de restabliment de contrasenya en l'adreça de correu en pocs minuts. Si us plau verifica la carpeta de correu brossa si no reps aquest correu.
       updated: La contrasenya s'ha canviat correctament. Ara ja estàs registrat.
       updated_not_active: La contrasenya s'ha canviat correctament.
     registrations:
-      destroyed: Adéu! el compte s'ha cancel·lat amb èxit. Desitgem veure't de nou aviat.
+      destroyed: Adéu! el compte s'ha cancel·lat amb èxit. Desitgem veure't de nou ben aviat.
       signed_up: Benvingut! T'has registrat amb èxit.
-      signed_up_but_inactive: T´has registrat amb èxit. No obstant, no podem identificar-te perquè el compte encara no s'ha activat.
-      signed_up_but_locked: T´has registrat amb èxit. No obstant, no podem identificar-te perquè el compte està blocat.
+      signed_up_but_inactive: T´has registrat amb èxit. No obstant, no podem iniciar la teva sessió perquè el teu compte encara no s'ha activat.
+      signed_up_but_locked: T'has registrat amb èxit. Això no obstant, no podem iniciar la sessió perquè el teu compte està blocat.
       signed_up_but_pending: S'ha enviat un missatge amb un enllaç de confirmació a la teva adreça de correu electrònic. Després que hagis fet clic a l'enllaç, revisarem la sol·licitud. Se't notificarà si s'aprova.
-      signed_up_but_unconfirmed: S'ha enviat per correu electrònic un missatge amb un enllaç de confirmació. Fes clic a l'enllaç per a activar el compte.
-      update_needs_confirmation: Ha actualitzat el seu compte amb èxit, però necessitem verificar la nova adreça de correu. Si us plau comprovi el correu i segueixi l'enllaç per confirmar la nova adreça de correu.
-      updated: El seu compte ha estat actualitzat amb èxit.
+      signed_up_but_unconfirmed: S'ha enviat per correu electrònic un missatge amb un enllaç de confirmació. Fes clic a l'enllaç per a activar el compte. Si us plau verifica la teva carpeta de correu brossa si no reps aquest correu.
+      update_needs_confirmation: Has actualitzat el teu compte amb èxit, però necessitem verificar la teva nova adreça de correu. Si us plau comprova el correu i segueixi l'enllaç per confirmar la nova adreça de correu. Si us plau verifica la teva carpeta de correu brossa si no reps aquest correu.
+      updated: El teu compte ha estat actualitzat amb èxit.
     sessions:
-      already_signed_out: Has tancat la sessió amb èxit.
-      signed_in: T'has registrat amb èxit.
-      signed_out: Has tancat la sessió amb èxit.
+      already_signed_out: Sessió finalitzada correctament.
+      signed_in: Sessió iniciada correctament.
+      signed_out: Sessió finalitzada correctament.
     unlocks:
       send_instructions: En pocs minuts rebràs un correu electrònic amb instruccions sobre com desbloquejar el teu compte. Si us plau verifica la teva carpeta de correu brossa si no has rebut aquest correu.
-      send_paranoid_instructions: Si el compte existeix, rebràs en pocs minuts un correu electrònic amb instruccions sobre com desbloquejar-lo. Verifica la carpeta de correu brossa si no has rebut aquest correu.
-      unlocked: El compte s'ha desblocat correctament. Inicia sessió per a continuar.
+      send_paranoid_instructions: Si el teu compte existeix, rebràs en pocs minuts un correu electrònic amb instruccions sobre com desbloquejar-lo. Verifica la carpeta de correu brossa si no has rebut aquest correu.
+      unlocked: El compte s'ha desbloquejat correctament. Inicia sessió per a continuar.
   errors:
     messages:
-      already_confirmed: ja està confirmat. Intenta d'iniciar sessió
-      confirmation_period_expired: calia fer la confirmació dins de %{period}, torna a sol·licitar-la
-      expired: ha expirat, demana'n una altra
+      already_confirmed: ja està confirmat. Intenta iniciar sessió
+      confirmation_period_expired: cal fer la confirmació dins de %{period}, si us plau sol·licita-ho de nou
+      expired: ha expirat, si us plau demana'n una altra
       not_found: no s'ha trobat
-      not_locked: no està bloquejada
+      not_locked: no està blocada
       not_saved:
         one: '1 error ha impedit desar aquest %{resource}:'
-        other: "%{count} errors hab impedit desar aquest %{resource}:"
+        other: "%{count} errors han impedit desar aquest %{resource}:"
diff --git a/config/locales/devise.ckb.yml b/config/locales/devise.ckb.yml
new file mode 100644
index 000000000..1261ebb64
--- /dev/null
+++ b/config/locales/devise.ckb.yml
@@ -0,0 +1,115 @@
+---
+ckb:
+  devise:
+    confirmations:
+      confirmed: ناونیشانی ئیمەیڵەکەت بە سەرکەوتوویی پشتڕاستکرایەوە.
+      send_instructions: ئیمەیڵێکت بۆ دەنێردرێت لەگەڵ ڕێنمایی بۆ چۆنیەتی دڵنیابوون لە ناونیشانی ئیمەیلەکەت لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت چاولێبکە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      send_paranoid_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، ئیمەیڵێکت پێدەگات لەگەڵ ڕێنماییەکانی چۆنیەتی دڵنیابوون لە ناونیشانی ئیمەیلەکەت لە چەند خولەکێکدا. تکایە بۆخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+    failure:
+      already_authenticated: تۆ پێشتر چوونە ژوورەوەت کردووە.
+      inactive: هەژمارەکەت هێشتا کارا نەکراوە.
+      invalid: "%{authentication_keys} یان نهێنوشە نادروستە."
+      last_attempt: تۆ یەک هەوڵیدیکەت ماوە پێش ئەوەی ئەژمێرەکەت قوفڵ بێت.
+      locked: هەژمارەکت داخراوە.
+      not_found_in_database: "%{authentication_keys} یان نهێنوشە نادروستە."
+      pending: هەژمێرەکەت هێشتا لەژێر پێداچوونەوەدایە.
+      timeout: کۆبوونەوەکەت بەسەرچووە. تکایە دووبارە بچۆ ژوورەوە بۆ بەردەوام بوون.
+      unauthenticated: پێویستە بچیتە ژوورەوە یان بچیتە ناو چوونە ناو پێش بەردەوام بوون.
+      unconfirmed: دەبێت ناونیشانی ئیمەیڵەکەت پشتڕاست بکەیتەوە پێش بەردەوام بوون.
+    mailer:
+      confirmation_instructions:
+        action: ناونیشانی ئیمەیڵ ساخ بکەرەوە
+        action_with_app: پشتڕاستی بکەوە و بگەڕێوە بۆ %{app}
+        explanation: ئەژمێرێکت دروست کردووە لەسەر %{host} بەم ناونیشانی ئیمەیڵە. تۆ یەک کرتە دووریت لە کاراکردنی. ئەگەر ئەمە تۆ نەبووی، تکایە ئەم ئیمەیڵە فەرامۆش بکە.
+        explanation_when_pending: تۆ داوای بانگهێشتت کرد بۆ %{host} بەم ناونیشانی ئیمەیڵە. هەر کە دڵنیایی لە ناونیشانی ئیمەیڵەکەت دەکەیت، ئێمە پێداچوونەوە دەکەین بە بەرنامەکەتدا. دەتوانیت بچیت بۆ چوونە ژوورەوە بۆ گۆڕینی ووردەکاریەکانت یان سڕینەوەی هەژمارەکەت، بەڵام ناتوانیت دەستگەیشتنت هەبێت بە زۆربەی ئەرکەکان تا ئەژمێرەکەت پەسەند ناکرێت. ئەگەر کاربەرنامەکەت ڕەتکرایەوە، داتاکەت لادەبرێت، بۆیە پێویست بە کاری زیاتر لە تۆ ناکرێت. ئەگەر ئەمە تۆ نەبووی، تکایە ئەم ئیمەیڵە فەرامۆش بکە.
+        extra_html: تکایە تێڕوانە لە <a href="%{terms_path}"> ڕێساکانی ڕاژەکار</a> و <a href="%{policy_path}"> مەرجەکانی خزمەتگوزاری</a>.
+        subject: 'ماستۆدۆن: ڕێنماییەکانی پشتڕاستکردنەوە بۆ %{instance}'
+        title: ناونیشانی ئیمەیڵ ساخ بکەرەوە
+      email_changed:
+        explanation: 'ناونیشانی ئیمەیڵەکەی ئەژمێرەکەت دەگۆڕدرێت بۆ:'
+        extra: ئەگەر ئیمەیلەکەت نەگۆڕیت، لەوانەیە کەسێک دەستگەیشتنی بۆ هەژمارەکەت بەدەست بێت. تکایە تێپەڕوشەکەت بگۆڕە دەستبەجێ یان پەیوەندی بکە بە بەڕێوەبەری ڕاژەوە ئەگەر تۆ لە هەژمارەکەت داخرایت.
+        subject: 'ماستۆدۆن: ئیمەیڵ گۆڕا'
+        title: ناونیشانی ئیمەیڵی نوێ
+      password_change:
+        explanation: تێپەڕوشە بۆ هەژمارەکەت گۆڕاوە.
+        extra: ئەگەر تێپەڕوشەکەت نەگۆڕی، وا دیارە کەسێک دەستگەیشتنی بۆ هەژمارەکەت بەدەست بێت. تکایە تێپەڕوسيکەت بگۆڕە دەستبەجێ یان پەیوەندی بکە بە بەڕێوەبەری ڕاژە ئەگەر تۆ لە هەژمارەکەت داخرایت.
+        subject: 'ماستۆدۆن: تێپەڕوشە گۆڕدرا'
+        title: تێپەڕوشە گۆڕدرا
+      reconfirmation_instructions:
+        explanation: دڵنیابوون لە ناونیشانی نوێ بۆ گۆڕینی ئیمەیڵەکەت.
+        extra: ئەگەر ئەم گۆڕانکاریە لەلایەن تۆوە دەست پێنەکراوە، تکایە ئەم ئیمەیڵە فەرامۆش بکە. ناونیشانی ئیمەیڵ بۆ هەژمێری ماستۆدۆن ناگۆڕێ هەتا ئەو کاتەی دەستپێگەیشتنی ئەم لینکەت لە سەرەوە نیە.
+        subject: 'ماستۆدۆن: دووپاتی ئیمەیل بۆ %{instance}'
+        title: ناونیشانی ئیمەیڵ ساخ بکەرەوە
+      reset_password_instructions:
+        action: گۆڕینی تێپەڕوشە
+        explanation: تۆ تیپەڕوشەی نوێت داوا کرد بۆ هەژمارەکەت.
+        extra: ئەگەر ئەم داواکاریەت نەکرد، تکایە ئەم ئیمەیڵە فەرامۆش بکە. تێپەڕوشەکەت ناگۆڕێ هەتا نەچیتە ناو لینکی سەرەوە و دانەیەکی نوێ دروست بکەیت.
+        subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
+        title: گەڕانەوەی تێپەڕوشە
+      two_factor_disabled:
+        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
+        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
+        title: 2FA ناچالاک کرا
+      two_factor_enabled:
+        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
+        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
+        title: 2FA چالاک کرا
+      two_factor_recovery_codes_changed:
+        explanation: کۆدەکانی چاککردنەوەی پێشوو هەڵوەشێنرانەوە و، نوێکان دروست بوون.
+        subject: 'ماستۆدۆن: کۆدەکانی گەڕانەوەی دوو فاکتەر، دووبارە دروست دەکرێتەوە'
+        title: 2FA کۆدی چاککردنەوە گۆڕا
+      unlock_instructions:
+        subject: 'ماستۆدۆن: رێنماییەکان بکەرەوە'
+      webauthn_credential:
+        added:
+          explanation: کلیلی ئاسایشی خوارەوە زیادکرا بۆ هەژمارەکەت
+          subject: 'ماستۆدۆن: کلیلی ئاسایشی نوێ'
+          title: کلیلی پاراستنی نوێ زیادکرا
+        deleted:
+          explanation: کلیلی ئاسایشی خوارەوە لە هەژمارەکەت سڕایەوە
+          subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
+          title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
+      webauthn_disabled:
+        explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
+        subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
+        title: کلیلە پارستنەکان ناچالاک کراون
+      webauthn_enabled:
+        explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
+        subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
+        title: کلیلە کانی پاراستن چالاک کرا
+    omniauth_callbacks:
+      failure: نەیتوانی ڕەسەنایە تی %{kind} بتەوبکات لەبەرئەوەی "%{reason}".
+      success: سەرکەوتووانە لە هەژماری %{kind} سەلمێنرا.
+    passwords:
+      no_token: ناتوانیت دەستگەیشتنت هەبێت بەم لاپەڕەیە بەبێ ئەوەی لە ئیمەیڵێکی گەڕانەوەی تێپەڕوشەت بێت. ئەگەر لە ئیمەیڵێکیگەڕانەوەی تێپەڕوشە هاتوویت، تکایە دڵنیابە لەوەی کە URLی تەواوت بەکارهێناوە کە دابینکراوە.
+      send_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، لە چەند خولەکێکی کەمدا لینکی هێنانەوەی تێپەڕوشە لە ناونیشانی ئیمەیلەکەت پێ دەگات. تکایە بوخچەی سپامەکەت بکەرەوە، ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      send_paranoid_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، لە چەند خولەکێکی کەمدا لینکی هێنانەوەی تێپەڕوشە لە ناونیشانی ئیمەیلەکەت پێ دەگات. تکایە بوخچەی سپامەکەت بکەرەوە، ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      updated: تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدرا. تۆ ئێستاچوویتە ژوورەوە.
+      updated_not_active: تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدرا.
+    registrations:
+      destroyed: خوات لەگەڵ! ئەژمێرەکەت بە سەرکەوتوویی هەڵوەشێنرایەوە. هیوادارین بەزوویی بتبینینەوە.
+      signed_up: بەخێربێیت! تۆ بە سەرکەوتوویی تۆمار کرای.
+      signed_up_but_inactive: تۆ بە سەرکەوتوویی تۆمارکرای. هەرچۆنێک بێت، نەمانتوانی چوونە ژوورەوەت بۆ بکەین لەبەرئەوەی هێشتا هەژمارەکەت کارا نەکراوە.
+      signed_up_but_locked: تۆ بە سەرکەوتوویی تۆمارکرای. هەرچۆنێک بێت، نەمانتوانی چوونە ژوورەوەت بۆ بکەین لەبەرئەوەی هێشتا هەژمارەکەت قوفڵ کراوە.
+      signed_up_but_pending: نامەیەک بە لینکی دووپاتکردنەوە نێردراوە بۆ ناونیشانی ئیمەیڵەکەت. دوای ئەوەی تۆ کرتە لەسەر لینکەکە دەکەیت، ئێمە پێداچوونەوە دەکەین بە بەرنامەکەتدا. ئاگادار دەکرێیت ئەگەر پەسەند کرا.
+      signed_up_but_unconfirmed: نامەیەک بە لینکی دووپاتکردنەوە نێردراوە بۆ ناونیشانی ئیمەیڵەکەت. تکایە دوای لینکەکە بکەوە بۆ کاراکردنی هەژمارەکەت. تکایە بوخچەی سپامەکەت بکەرەوە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      update_needs_confirmation: تۆ ئەژمێرەکەت بە سەرکەوتوویی نوێکردەوە، بەڵام پێویستە ئیمەیڵە نوێکەت بسەلمێنین. تکایە ئیمەیڵەکەت بپشکنە و دوای بەستەری دڵنیابوونەوە بکەوە بۆ دڵنیابوون لە ناونیشانی ئیمەیڵە نوێکەت. تکایە بوخچەی سپامەکەت بکەرەوە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      updated: هەژمارەکەت بە سەرکەوتوویی نوێکرایەوە.
+    sessions:
+      already_signed_out: چوونە دەرەوە بە سەرکەوتوویی ئەنجام بوو.
+      signed_in: بە سەرکەوتوویی چوونە ژوورەوە.
+      signed_out: چوونە دەرەوە بە سەرکەوتوویی ئەنجام بوو.
+    unlocks:
+      send_instructions: ئیمەیڵێکت بۆ دەنێردرێت لەگەڵ ڕێنمایی بۆ چۆنیەتی کردنەوەی هەژمارەکەت لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      send_paranoid_instructions: ئەگەر هەژمارەکەت بوونی هەبێت، ئیمەیڵێکت پێدەگات لەگەڵ ڕێنمایی چۆنیەتی کردنەوەی لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      unlocked: هەژمارەکەت بە سەرکەوتوویی لە قوفڵ لاچوو. تکایە بچۆ ژوورەوە بۆ بەردەوام بوون.
+  errors:
+    messages:
+      already_confirmed: پێشتر پشتڕاست کرایەوە، تکایە هەوڵ دەدە بچۆ ژوورەوە
+      confirmation_period_expired: پێویستە لە نێو %{period} دا پشتڕاست بکرێتەوە، تکایە داوای دانەیەکی نوێ بکە
+      expired: بەسەرچووە، تکایە داوایەکی نوێ بکە
+      not_found: نەدۆزرایەوە
+      not_locked: دانەخرابوو
+      not_saved:
+        one: '١ هەڵە قەدەغەکرا ئەم %{resource} لە تۆمارکردن:'
+        other: "%{count} هەڵەی قەدەغەکرد کە %{resource} لە پاشکەوتکردن:"
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index be39a8f17..32a1ed2c6 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -20,15 +20,15 @@ cs:
       confirmation_instructions:
         action: Potvrdit e-mailovou adresu
         action_with_app: Potvrdit a vrátit se do %{app}
-        explanation: S touto e-mailovou adresou jste si již účet na serveru %{host} vytvořili. K jeho aktivaci vám zbývá jedno kliknutí. Pokud jste to nebyli vy, považujte tento e-mail za bezpředmětný.
-        explanation_when_pending: Pro tuto e-mailovou adresu bylo požádáno o pozvánku na %{host}. Jakmile svou e-mailovou adresu potvrdíte, vaši žádost posoudíme. Můžete se přihlásit, změnit podrobnosti svého účtu nebo ho smazat, ale do schválení účtu nebudete mít k většině funkcí přístup. Pokud bude vaše žádost zamítnuta, vaše data budou odstraněna, a nebude od vás vyžadována žádná další akce. Pokud jste to nebyli vy, považujte tento e-mail za bezpředmětný.
-        extra_html: Přečtěte si prosím také <a href="%{terms_path}">pravidla tohoto serveru</a> a <a href="%{policy_path}">naše podmínky používání</a>.
+        explanation: S touto e-mailovou adresou jste si vytvořili účet na serveru %{host}. K jeho aktivaci vám zbývá jedno kliknutí. Pokud jste to nebyli vy, považujte tento e-mail za bezpředmětný.
+        explanation_when_pending: S touto e-mailovou adresu jste požádali o pozváku na %{host}. Jakmile svou e-mailovou adresu potvrdíte, vaši žádost posoudíme. Můžete se přihlásit ke změně podrobností svého účtu nebo jeho smazání, ale do schválení účtu nebudete mít k většině funkcí přístup. Pokud bude vaše žádost zamítnuta, vaše data budou odstraněna, a nebude od vás vyžadována žádná další akce. Pokud jste to nebyli vy, považujte tento e-mail za bezpředmětný.
+        extra_html: Přečtěte si prosím také <a href="%{terms_path}">pravidla tohoto serveru</a> a <a href="%{policy_path}">naše podmínky užití</a>.
         subject: 'Mastodon: Potvrzení účtu na serveru %{instance}'
         title: Potvrďte e-mailovou adresu
       email_changed:
         explanation: 'E-mailová adresa vašeho účtu byla změněna na:'
         extra: Pokud jste si e-mailovou adresu neměnili, je pravděpodobné, že někdo jiný získal přístup k vašemu účtu. Změňte si prosím okamžitě heslo, nebo, pokud se nemůžete na účet přihlásit, kontaktujte administrátora serveru.
-        subject: 'Mastodon: E-mailová adresa změněna'
+        subject: 'Mastodon: E-mailová adresa byla změněna'
         title: Nová e-mailová adresa
       password_change:
         explanation: Heslo k vašemu účtu bylo změněno.
@@ -36,7 +36,7 @@ cs:
         subject: 'Mastodon: Heslo bylo změněno'
         title: Heslo bylo změněno
       reconfirmation_instructions:
-        explanation: Potvrďte novou adresu pro změnu e-mailu.
+        explanation: Pro změnu e-mailu potvrďte novou adresu.
         extra: Pokud jste si tuto změnu nevyžádali vy, považujte tento e-mail za bezpředmětný. Pokud výše uvedenou adresu nenavštívíte, e-mailová adresa změněna nebude.
         subject: 'Mastodon: Potvrďte e-mail pro %{instance}'
         title: Ověřit e-mailovou adresu
@@ -47,43 +47,43 @@ cs:
         subject: 'Mastodon: Instrukce pro obnovení hesla'
         title: Obnovení hesla
       two_factor_disabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení je nyní stačí pouze e-mailová adresa a heslo.
-        subject: 'Mastodon: Dvoufázové ověřování vypnuto'
-        title: 2FA vypnuto
+        explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení vám nyní stačí pouze e-mailová adresa a heslo.
+        subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
+        title: 2FA bylo vypnuto
       two_factor_enabled:
         explanation: Dvoufázové ověřování bylo pro váš účet zapnuto. Pro přihlášení bude vyžadován token vygenerovaný spárovanou TOTP aplikací.
-        subject: 'Mastodon: Dvoufázové ověřování zapnuto'
-        title: 2FA zapnuto
+        subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
+        title: 2FA bylo zapnuto
       two_factor_recovery_codes_changed:
         explanation: Předchozí záložní kódy byly zrušeny a byly vygenerovány nové.
-        subject: 'Mastodon: Dvoufázové záložní kódy znovu vygenerovány'
-        title: Záložní kódy pro 2FA změněny
+        subject: 'Mastodon: Dvoufázové záložní kódy byly znovu vygenerovány'
+        title: Záložní kódy pro 2FA byly změněny
       unlock_instructions:
         subject: 'Mastodon: Instrukce pro odemčení účtu'
       webauthn_credential:
         added:
-          explanation: Následující bezpečnostní klíč byl přidán k vašemu účtu
+          explanation: K vašemu účtu byl přidán následující bezpečnostní klíč
           subject: 'Mastodon: Nový bezpečnostní klíč'
           title: Byl přidán nový bezpečnostní klíč
         deleted:
-          explanation: Následující bezpečnostní klíč byl odstraněn z vašeho účtu
+          explanation: Z vašeho účtu byl odstraněn následující bezpečnostní klíč
           subject: 'Mastodon: Bezpečnostní klíč byl smazán'
           title: Jeden z vašich bezpečnostních klíčů byl smazán
       webauthn_disabled:
         explanation: Pro váš účet bylo vypnuto ověření bezpečnostními klíči. Přihlášení je nyní možné pouze s tokenem vygenerovaným spárovanou TOTP aplikací.
-        subject: 'Mastodon: Přihlašování bezpečnostními klíči vypnuto'
-        title: Bezpečnostní klíče zakázány
+        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
+        title: Bezpečnostní klíče byly zakázány
       webauthn_enabled:
         explanation: Pro váš účet bylo povoleno ověření bezpečnostními klíči. Nyní můžete svůj bezpečnostní klíč použít pro přihlášení.
-        subject: 'Mastodon: Přihlašování bezpečnostními klíči povoleno'
-        title: Bezpečnostní klíče povoleny
+        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
+        title: Bezpečnostní klíče byly povoleny
     omniauth_callbacks:
       failure: Nelze vás ověřit z %{kind}, protože „%{reason}“.
       success: Úspěšně ověřeno z účtu %{kind}.
     passwords:
       no_token: Tuto stránku nemůžete navštívit, pokud nepřicházíte z e-mailu pro obnovení hesla. Pokud z něj přicházíte, ujistěte se, že jste použili celou URL adresu z e-mailu.
-      send_instructions: Pokud je vaše e-mailová adresa v naší databázi, obdržíte za několik minut e-mail s odkazem pro obnovení vašeho hesla. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
-      send_paranoid_instructions: Pokud je vaše e-mailová adresa v naší databázi, obdržíte za několik minut e-mail s odkazem pro obnovení vašeho hesla. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
+      send_instructions: Pokud je vaše e-mailová adresa v naší databázi, za několik minut obdržíte e-mail s odkazem pro obnovení vašeho hesla. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
+      send_paranoid_instructions: Pokud je vaše e-mailová adresa v naší databázi, za několik minut obdržíte e-mail s odkazem pro obnovení vašeho hesla. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
       updated: Vaše heslo bylo úspěšně změněno. Nyní jste přihlášeni.
       updated_not_active: Vaše heslo bylo úspěšně změněno.
     registrations:
@@ -101,7 +101,7 @@ cs:
       signed_out: Odhlášení proběhlo úspěšně.
     unlocks:
       send_instructions: Za několik minut obdržíte e-mail s instrukcemi pro odemčení vašeho účtu. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
-      send_paranoid_instructions: Pokud váš účet existuje, obdržíte za několik minut e-mail s instrukcemi pro odemčení vašeho účtu. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
+      send_paranoid_instructions: Pokud váš účet existuje, za několik minut obdržíte e-mail s instrukcemi pro odemčení vašeho účtu. Pokud tento e-mail neobdržíte, podívejte se prosím také do složky „spam“.
       unlocked: Váš účet byl úspěšně odemčen. Pro pokračování se prosím přihlaste.
   errors:
     messages:
@@ -113,5 +113,5 @@ cs:
       not_saved:
         few: "%{count} chyby zabránily uložení tohoto %{resource}:"
         many: "%{count} chyb zabránilo uložení tohoto %{resource}:"
-        one: 'Jedna chyba zabránila uložení tohoto %{resource}:'
+        one: '1 chyba zabránila uložení tohoto %{resource}:'
         other: "%{count} chyb zabránilo uložení tohoto %{resource}:"
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index e5366f8cd..44c09153f 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -2,11 +2,11 @@
 cy:
   devise:
     confirmations:
-      confirmed: Mae eich cyfeiriad e-bost wedi ei gadarnhau yn llwyddiannus.
-      send_instructions: Byddwch yn derbyn e-bost a chyfarwyddiadau am sut i gadarnhau eich cyfeiriad e-bost mewn rhai munudau. Os na dderbynioch chi'r e-bost hwn, edrychwch yn eich ffolder sbam os gwelwch yn dda.
-      send_paranoid_instructions: Os yw eich cyfeiriad e-bost yn bodoli yn ein bas data, byddwch yn derbyn e-bost a chyfarwyddiadau am sut i gadarnhau eich cyfeiriad ebost mewn rhai munudau. Os na dderbynioch chi'r e-bost hwn, edrychwch yn eich ffolder sbam os gwelwch yn dda.
+      confirmed: Mae eich cyfeiriad e-bost wedi'i gadarnhau'n llwyddiannus.
+      send_instructions: Byddwch yn derbyn e-bost a chyfarwyddiadau am sut i gadarnhau eich cyfeiriad e-bost mewn rhai munudau. Os nad ydych wedi derbyn yr e-bost hwn, edrychwch yn eich ffolder sbam, os gwelwch yn dda.
+      send_paranoid_instructions: Os yw eich cyfeiriad e-bost yn bodoli yn ein cronfa ddata, byddwch yn derbyn e-bost gyda chyfarwyddiadau ar sut i gadarnhau eich cyfeiriad e-bost mewn ychydig funudau. Gwiriwch eich ffolder sbam os na dderbynioch yr e-bost hwn.
     failure:
-      already_authenticated: Yr ydych wedi mewngofnodi yn barod.
+      already_authenticated: Rydych chi eisoes wedi mewngofnodi.
       inactive: Nid yw eich cyfrif yn weithredol eto.
       invalid: "%{authentication_keys} neu gyfrinair annilys."
       last_attempt: Mae gennych un cyfle arall cyn i'ch cyfrif gael ei gloi.
@@ -20,35 +20,35 @@ cy:
       confirmation_instructions:
         action: Gwiriwch eich cyfeiriad e-bost
         action_with_app: Cadarnhau a dychwelyd i %{app}
-        explanation: Yr ydych wedi creu cyfrif ar %{host} gyda'r cyfrif e-bost hwn. Dim ond un clic sydd angen i'w wneud yn weithredol. Os nad chi oedd hyn, anwybyddwch yr e-bost hwn os gwelwch yn dda.
-        explanation_when_pending: Rydych wedi gwneud cais am wahoddiad i %{host} gyda'r ebost hyn. Unwaith rydych wedi cadarnhau eich ebost, byddem yn adolygu eich cais. Ni fyddwch yn gallu mewngofnodi tan yr amser hono. Os caiff eich cais ei wrthod, felly nid oes angen unrhyw gweithred pellach o chi. Os nad oeddech wedi gwneud y cais hyn, anwybyddu'r ebost hon, os gwelwch yn dda.
-        extra_html: Gwnewch yn siŵr i edrych ar <a href="%{terms_path}">reolau'r achos</a> a <a href="%{policy_path}">ein telerau gwasanaeth</a>.
-        subject: 'Mastodon: Canllawiau cadarnhau i %{instance}'
+        explanation: Rydych chi wedi creu cyfrif ar %{host} gyda'r cyfeiriad e-bost hwn. Rydych chi un clic i ffwrdd o'i hagor. Os nad chi oedd hwn, anwybyddwch yr e-bost hwn.
+        explanation_when_pending: Gwnaethoch gais am wahoddiad i %{host} gyda'r cyfeiriad e-bost hwn. Unwaith y byddwch yn cadarnhau eich cyfeiriad e-bost, byddwn yn adolygu eich cais. Gallwch fewngofnodi i newid eich manylion neu ddileu eich cyfrif, ond ni allwch gael mynediad i'r rhan fwyaf o'r swyddogaethau nes bod eich cyfrif wedi'i gymeradwyo. Os caiff eich cais ei wrthod, bydd eich data yn cael ei ddileu, felly ni fydd angen unrhyw gamau pellach gennych. Os nad chi oedd hwn, anwybyddwch yr e-bost hwn.
+        extra_html: Edrychwch hefyd ar <a href="%{terms_path}">reolau'r gweinydd</a> <a href="%{policy_path}">a'n telerau gwasanaeth</a> .
+        subject: 'Mastodon: Cyfarwyddiadau cadarnhau ar gyfer %{instance}'
         title: Gwirio cyfeiriad e-bost
       email_changed:
         explanation: 'Mae''r cyfeiriad e-bost ar gyfer eich cyfrif yn cael ei newid i:'
-        extra: Os na wnaethoch chi newid eich e-bost, mae'n debygol fod rhywun wedi cael mynediad i'ch cyfrif. Newidwch eich cyfrinair yn syth os gwelwch yn dda neu cysylltwch a gweinydd yr achos os ydych wedi'ch cloi allan o'ch cyfrif.
-        subject: 'Mastodon: Newidwyd e-bost'
+        extra: Os nad ydych wedi newid eich e-bost, mae'n debygol fod rhywun wedi mewngofnodi i'ch cyfrif. Newidiwch eich cyfrinair cyn gynted â phosib neu gysylltwch â'r gweinyddwyr os ydych wedi cael eich cloi allan o'ch cyfrif.
+        subject: 'Mastodon: E-bost wedi''i newid'
         title: Cyfeiriad e-bost newydd
       password_change:
         explanation: Newidwyd cyfrinair eich cyfrif.
-        extra: Os na wnaethoch chi newid eich e-bost, mae'n debygol fod rhywun wedi cael mynediad i'ch cyfrif. Newidwch eich cyfrinair yn syth os gwelwch yn dda neu cysylltwch a gweinydd yr achos os ydych wedi'ch cloi allan o'ch cyfrif.
-        subject: 'Mastodon: Newidwyd Cyfrinair'
+        extra: Os nad ydych wedi newid eich cyfrinair, mae'n debygol fod rhywun wedi mewngofnodi i'ch cyfrif. Newidiwch eich cyfrinair cyn gynted â phosib neu gysylltwch â'r gweinyddwyr os ydych wedi cael eich cloi allan o'ch cyfrif.
+        subject: 'Mastodon: Cyfrinair wedi''i newid'
         title: Newidwyd cyfrinair
       reconfirmation_instructions:
-        explanation: Cadarnhewch y cyferiad newydd i newid eich e-bost.
-        extra: Os nad chi wnaeth y newid hwn, anwybyddwch yr e-bost hwn os gwelwch yn dda. Ni fydd y cyfeiriad e-bost ar gyfer y cyfrif Mastodon yn newid nes eich bod yn mynd at y ddolen uchod.
-        subject: 'Mastodon: Cadarnhewch e-bost i %{instance}'
+        explanation: Cadarnhewch y cyfeiriad newydd i newid eich e-bost.
+        extra: Os na chychwynnwyd y newid hwn gennych chi, anwybyddwch yr e-bost hwn. Ni fydd cyfeiriad e-bost y cyfrif Mastodon yn newid nes i chi gael mynediad i'r ddolen uchod.
+        subject: 'Mastodon: Cadarnhau e-bost ar gyfer %{instance}'
         title: Gwirio cyfeiriad e-bost
       reset_password_instructions:
         action: Newid cyfrinair
-        explanation: Gofynnoch am gyfrinair newydd i'ch cyfrif.
-        extra: Os na wnaethoch gais am hyn, anwybyddwch yr e-bost hwn os gwelwch yn dda. Ni fydd eich cyfrinair yn newid nes i chi fynd at y ddolen uchod a chreu un newydd.
+        explanation: Fe wnaethoch chi ofyn am gyfrinair newydd ar gyfer eich cyfrif.
+        extra: Os na wnaethoch ofyn am hyn, anwybyddwch yr e-bost hwn. Ni fydd eich cyfrinair yn newid nes i chi gyrchu'r ddolen uchod a chreu un newydd.
         subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
         title: Ailosod cyfrinair
       two_factor_disabled:
-        explanation: Mae dilysu dau ffactor ar gyfer eich cyfrif wedi'i anablu. Mae mewngofnodi bellach yn bosibl gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
-        subject: 'Mastodon: Dilysu dau ffactor yn anabl'
+        explanation: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi. Mae modd mewngofnodi nawr gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
+        subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
         title: Dilysu dau ffactor yn anabl
       two_factor_enabled:
         explanation: Mae dilysu dau ffactor wedi'i alluogi ar gyfer eich cyfrif. Bydd angen tocyn a gynhyrchir gan yr ap TOTP pâr i fewngofnodi.
@@ -60,22 +60,39 @@ cy:
         title: Newidiodd codau adfer 2FA
       unlock_instructions:
         subject: 'Mastodon: Cyfarwyddiadau datgloi'
+      webauthn_credential:
+        added:
+          explanation: Mae'r allwedd ddiogelwch ganlynol wedi'i hychwanegu at eich cyfrif
+          subject: 'Mastodon: Allwedd ddiogelwch newydd'
+          title: Mae allwedd ddiogelwch newydd wedi'i hychwanegu
+        deleted:
+          explanation: Mae'r allwedd ddiogelwch ganlynol wedi'i dileu o'ch cyfrif
+          subject: 'Mastodon: Allwedd ddiogelwch wedi''i dileu'
+          title: Mae un o'ch allweddi diogelwch wedi'i ddileu
+      webauthn_disabled:
+        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif. Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn a gynhyrchir gan yr ap TOTP pâr yn unig.
+        subject: 'Mastodon: Dilysiad gydag allweddi diogelwch wedi''i analluogi'
+        title: Allweddi diogelwch wedi'u hanalluogi
+      webauthn_enabled:
+        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif. Gellir defnyddio'ch allwedd ddiogelwch nawr ar gyfer mewngofnodi.
+        subject: 'Mastodon: Dilysiad allwedd diogelwch wedi''i alluogi'
+        title: Allweddi diogelwch wedi'u galluogi
     omniauth_callbacks:
       failure: Methu eich dilysu o %{kind} oherwydd "%{reason}".
       success: Dilyswyd yn llwyddiannus o gyfrif %{kind}.
     passwords:
       no_token: Nid oes modd cael mynediad i'r dudalen hon heb ddod drwy e-bost ailosod cyfrinair. Os ydych yn dod o e-bost ailosod cyfrinair, gwnewch yn siŵr y defnyddioch chi'r URL a ddarparwyd yn ei gyfanrwydd.
-      send_instructions: Os yw eich cyfeiriad e-bost yn bresennol yn ein bas data, mi fyddwch yn derbyn dolen yn eich blwch e-bost ymhen cwpl o funudau. Os nad ydych yn derbyn yr e-bost hwn, edrychwch yn eich ffolder spam os gwelwch yn dda.
-      send_paranoid_instructions: Os yw eich cyfeiriad e-bost yn bresennol yn ein bas data, mi fyddwch yn derbyn dolen yn eich blwch e-bost ymhen cwpl o funudau. Os nad ydych yn derbyn yr e-bost hwn, edrychwch yn eich ffolder spam os gwelwch yn dda.
-      updated: Mae eich cyfrinair wedi ei newid yn llwyddiannus. Yr ydych wedi mewngofnodi.
+      send_instructions: Os yw eich cyfeiriad e-bost yn bodoli yn ein cronfa ddata, byddwch yn derbyn dolen adfer cyfrinair yn eich cyfeiriad e-bost mewn ychydig funudau. Gwiriwch eich ffolder sbam os na dderbynioch yr e-bost hwn.
+      send_paranoid_instructions: Os yw eich cyfeiriad e-bost yn bodoli yn ein cronfa ddata, byddwch yn derbyn dolen adfer cyfrinair yn eich cyfeiriad e-bost mewn ychydig funudau. Gwiriwch eich ffolder sbam os na dderbynioch yr e-bost hwn.
+      updated: Mae eich cyfrinair wedi'i newid yn llwyddiannus. Rydych chi bellach wedi mewngofnodi.
       updated_not_active: Mae eich cyfrinair wedi ei newid yn llwyddiannus.
     registrations:
-      destroyed: Hwyl fawr! Mae eich cyfrif wedi ei ganslo'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
+      destroyed: Hwyl fawr! Mae eich cyfrif wedi ei ddiddymu'n llwyddiannus. Gobeithiwn eich gweld chi eto'n fuan.
       signed_up: Croeso! Rydych wedi cofrestru'n llwyddiannus.
-      signed_up_but_inactive: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos nid yw eich cyfrif wedi ei actifadu eto.
-      signed_up_but_locked: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos fod eich cyfrif wedi ei gloi.
-      signed_up_but_pending: Mae neges a'ch cysylltiad cadarnhau wedi cael ei hanfon i'ch ebost. Ar ôl i chi ei glicio, byddem yn adolygu eich cais. Byddwch yn derbyn hysbysiad os caiff ei gymeradwyo.
-      signed_up_but_unconfirmed: Mae neges gyda dolen cadarnhau wedi ei anfon i'ch cyfeiriad e-bost. Dilynwch y ddolen er mwyn actifadu eich cyfrif. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn os gwelwch yn dda.
+      signed_up_but_inactive: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos nid yw eich cyfrif wedi ei hagor eto.
+      signed_up_but_locked: Rydych chi wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allem eich mewngofnodi oherwydd bod eich cyfrif wedi'i gloi.
+      signed_up_but_pending: Mae neges gyda dolen cadarnhau wedi'i hanfon i'ch cyfeiriad e-bost. Ar ôl i chi glicio ar y ddolen, byddwn yn adolygu eich cais. Byddwch yn cael gwybod os caiff ei gymeradwyo.
+      signed_up_but_unconfirmed: Mae neges gyda dolen cadarnhau wedi ei anfon i'ch cyfeiriad e-bost. Dilynwch y ddolen er mwyn agor eich cyfrif. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn, os gwelwch yn dda.
       update_needs_confirmation: Rydych wedi diweddaru eich cyfrif yn llwyddiannus, ond mae angen i ni wirio'ch cyfeiriad e-bost newydd. Edrychwch ar eich e-byst a dilynwch y ddolen gadarnhau er mwyn cadarnhau eich cyfeiriad e-bost newydd. Edrychwch ar eich ffolder sbam os na dderbynioch chi yr e-bost hwn.
       updated: Mae eich cyfrif wedi ei ddiweddaru yn llwyddiannus.
     sessions:
@@ -84,19 +101,19 @@ cy:
       signed_out: Allgofnodwyd yn llwyddiannus.
     unlocks:
       send_instructions: Mi fyddwch yn derbyn e-bost a chyfarwyddiadau ynghylch sut i ddatgloi eich cyfrif ymhen cwpl o funudau. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn os gwelwch yn dda.
-      send_paranoid_instructions: Os yw eich cyfrif yn bodoli, mi fyddwch yn derbyn e-bost a cyfarwyddiadau o sut i ddatgloi eich cyfrif ymhen cwpl o funudau. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn os gwelwch yn dda.
+      send_paranoid_instructions: Os yw eich cyfrif yn bodoli, mi fyddwch yn derbyn e-bost a cyfarwyddiadau o sut i ddatgloi eich cyfrif ymhen cwpl o funudau. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn, os gwelwch yn dda.
       unlocked: Mae eich cyfrif wedi ei ddatgloi'n llwyddiannus. Mewngofnodwch i barhau.
   errors:
     messages:
-      already_confirmed: wedi ei gadarnhau yn barod, ymgeisiwch fewngofnodi
-      confirmation_period_expired: angen ei gadarnhau o fewn %{period}, gwnewch gais am un newydd os gwelwch yn dda
-      expired: wedi dod i ben, gwnewch gais am un newydd os gwelwch yn dda
+      already_confirmed: wedi'i gadarnhau eisoes, ceisiwch fewngofnodi
+      confirmation_period_expired: angen ei gadarnhau o fewn %{period}, gwnewch gais am un newydd, os gwelwch yn dda
+      expired: wedi dod i ben, gwnewch gais am un newydd, os gwelwch yn dda
       not_found: heb ei ganfod
       not_locked: heb ei gloi
       not_saved:
-        few: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
-        many: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
-        one: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd 1 gwall:'
-        other: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
-        two: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
-        zero: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
+        few: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd %{count} gwall:'
+        many: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd %{count} gwall:'
+        one: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd 1 gwall:'
+        other: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd %{count} gwall:'
+        two: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd %{count} gwall:'
+        zero: 'Gwaharddwyd yr %{resource} rhag cael ei gadw oherwydd %{count} o wallau:'
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 9f5ef3b14..18aa43162 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -3,8 +3,8 @@ da:
   devise:
     confirmations:
       confirmed: Din e-mail er nu bekræftet.
-      send_instructions: Du vil om få minutter modtage en e-mailvejledning til, hvordan du bekræfter din e-mailadresse. Tjek din spammappe, hvis du modtager denne e-mail.
-      send_paranoid_instructions: Findes din e-mailadresse allerede i vores database, vil du om få minutter modtage en e-mailvejledning til, hvordan du bekræfter din e-mailadresse. Tjek din spammappe, hvis du ikke modtager denne e-mail.
+      send_instructions: Du skulle om få minutter modtage en e-mailvejledning til, hvordan din e-mailadresse bekræftes. Tjek spammappen, hvis e-mailen ikke ser ud til at lande i indbakken.
+      send_paranoid_instructions: Findes din e-mailadresse allerede i vores database, skulle du om få minutter modtage en e-mailvejledning til, hvordan din e-mailadresse bekræftes. Tjek spammappen, hvis e-mailen ikke ser ud til at lande i indbakken.
     failure:
       already_authenticated: Du er allerede logget ind.
       inactive: Din konto er endnu ikke aktiveret.
@@ -12,46 +12,46 @@ da:
       last_attempt: Du har ét forsøg mere, før din konto bliver låst.
       locked: Din konto er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller adgangskode.
-      pending: Din konto er stadig under bedømmelse.
-      timeout: Din session udløb. Log ind igen for at fortsætte.
-      unauthenticated: Du skal logge ind eller tilmelde dig for at fortsætte.
-      unconfirmed: Du skal bekræfte din e-mailadresse for at fortsætte.
+      pending: Din konto er stadig under revision.
+      timeout: Session udløbet. Log ind igen for at fortsætte.
+      unauthenticated: Log ind eller tilmelde dig for at fortsætte.
+      unconfirmed: Bekræft din e-mailadresse for at fortsætte.
     mailer:
       confirmation_instructions:
         action: Bekræft e-mailadresse
         action_with_app: Bekræft og returnér til %{app}
-        explanation: Du har oprettet en konto på %{host} med denne e-mailadresse og er nu et klik fra at aktivere din konto. Har du ikke oprettet dig, så ignorér blot denne e-mail.
-        explanation_when_pending: Du ansøgte om en invitation til %{host} med denne e-mailadresse. Når du har bekræftet din e-mailadresse, gennemgår vi din ansøgning. Du kan logge ind for at ændre dine oplysninger eller slette din konto, men du kan ikke tilgå de fleste af funktionerne, før din konto er godkendt. Afvises din ansøgning, fjernes dine data, så ingen yderligere handling fra dig er nødvendig. Har du ikke ansøgt, så ignorér blot denne e-mail.
-        extra_html: Tjek også <a href="%{terms_path}">reglerne for serveren</a> samt <a href="%{policy_path}">vores tjenestevilkår</a>.
+        explanation: Du har oprettet en konto på %{host} med denne e-mailadresse og er nu ét klik fra at aktivere den. Har du ikke oprettet dig, så ignorér blot denne e-mail.
+        explanation_when_pending: Du har ansøgt om en invitation til %{host} med denne e-mailadresse. Når du har bekræftet adressen, gennemgås din ansøgning. Du kan logge ind for at ændre oplysninger eller slette kontoen, men hovedparten af funktionerne kan ikke tilgås, før kontoen er godkendt. Afvises ansøgningen, fjernes dine data, så ingen yderligere handling fra dig er nødvendig. Har du ikke ansøgt, så ignorér blot denne e-mail.
+        extra_html: Tjek også <a href="%{terms_path}">reglerne for serveren</a> samt <a href="%{policy_path}">gældende Tjenestevilkår</a>.
         subject: 'Mastodon: Bekræftelsesinstrukser for %{instance}'
         title: Bekræft e-mailadresse
       email_changed:
         explanation: 'Din kontos e-mailadressen ændres til:'
-        extra: Har du ikke selv skiftet din e-mailadresse, er det muligt, at nogen har fået adgang til din konto. Skift venligst din adgangskode med det samme eller kontakt serveradministratoren, hvis du er låst ude af din konto.
+        extra: Har du ikke selv skiftet din e-mailadresse, har nogen sandsynligvis opnået adgang til din konto. Skift derfor straks din adgangskode eller kontakt serveradministratoren, hvis du er låst ude af kontoen.
         subject: 'Mastodon: E-mail skiftet'
         title: Ny e-mailadresse
       password_change:
         explanation: Din kontoadgangskode er skiftet.
-        extra: Har du ikke selv ændret dim adgangskode, er det muligt, at nogen har fået adgang til din konto. Skift venligst din adgangskode med det samme eller kontakt serveradministratoren, hvis du er låst ude af din konto.
+        extra: Har du ikke selv skiftet din adgangskode, har nogen sandsynligvis opnået adgang til din konto. Skift derfor straks din adgangskode eller kontakt serveradministratoren, hvis du er låst ude af kontoen.
         subject: 'Mastodon: Adgangskode skiftet'
         title: Adgangskode skiftet
       reconfirmation_instructions:
         explanation: Bekræft den nye adresse for at skifte din e-mail.
-        extra: Er denne ændring ikke iværksat af dig, så ignorér denne e-mail. E-mailadressen til Mastodon-kontoen ændres ikke, før du tilgår linket ovenfor.
+        extra: Er denne ændring ikke foranlediget af dig, så ignorér denne e-mail. Mastodon-kontoens e-mailadresse kan kun skiftes vha. linket ovenfor.
         subject: 'Mastodon: Bekræft e-mail for %{instance}'
         title: Bekræft e-mailadresse
       reset_password_instructions:
         action: Skift adgangskode
         explanation: Du har anmodet om en ny kontoadgangskode.
-        extra: Har du ikke anmodet om dette, så ignorér denne e-mail. Din adgangskode skiftes først, når du via linket ovenfor har oprettet en ny.
-        subject: 'Mastodon: Nulstil adgangskode-instruktioner'
-        title: Adgangskode nulstillet
+        extra: Har du ikke anmodet om dette, så ignorér denne e-mail. Din adgangskode skiftes først, når en ny er oprettet vha. linket ovenfor.
+        subject: 'Mastodon: Instruktioner til adgangskodenulstilling'
+        title: Adgangskodenulstilling
       two_factor_disabled:
-        explanation: Tofaktorgodkendelse for din konto er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
+        explanation: Tofaktorgodkendelse for kontoen er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
         subject: 'Mastodon: Tofaktorgodkendelse deaktiveret'
         title: 2FA deaktiveret
       two_factor_enabled:
-        explanation: Tofaktorgodkendelse er blevet aktiveret for din konto. Et token genereret af den parrede TOTP-app vil være nødvendig for at logge ind.
+        explanation: Tofaktorgodkendelse er blevet aktiveret for kontoen. Indlogning vil kærve et token genereret af den parrede TOTP-app.
         subject: 'Mastodon: Tofaktorgodkendelse aktiveret'
         title: 2FA aktiveret
       two_factor_recovery_codes_changed:
@@ -66,42 +66,42 @@ da:
           subject: 'Mastodon: Ny sikkerhedsnøgle'
           title: En ny sikkerhedsnøgle er tilføjet
         deleted:
-          explanation: Flg. sikkerhedsnøgle er slettet din konto
+          explanation: Flg. sikkerhedsnøgle er slettet fra din konto
           subject: 'Mastodon: Sikkerhedsnøgle slettet'
           title: En af dine sikkerhedsnøgler er blevet slettet
       webauthn_disabled:
-        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for din konto. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
+        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
         subject: 'Mastodon: Godkendelse med sikkerhedsnøgler deaktiveret'
         title: Sikkerhedsnøgler deaktiveret
       webauthn_enabled:
-        explanation: Sikkerhedsnøglegodkendelse er aktiveret for din konto. Din sikkerhedsnøgle kan nu bruges til indlogning.
+        explanation: Sikkerhedsnøglegodkendelse er aktiveret for kontoen. Din sikkerhedsnøgle kan nu bruges til indlogning.
         subject: 'Mastodon: Sikkerhedsnøglegodkendelse aktiveret'
         title: Sikkerhedsnøgler aktiveret
     omniauth_callbacks:
       failure: Kunne ikke godkende dig fra %{kind} fordi "%{reason}".
       success: Godkendt fra %{kind}-konto.
     passwords:
-      no_token: Du kan kun tilgå denne side via linket fra en adgangskodenulstillings e-mail. Kommer du fra en sådan e-mail, så sørg for at benytte den angivne, komplette URL.
-      send_instructions: Er din e-mail-adresse allerede registreret, e-mailer vi dig et link til adgangskodenulstilling. Tjek din spammappe, hvis du ikke ser e-mailen i din indbakke indenfor få minutter.
-      send_paranoid_instructions: Er din e-mail-adresse allerede registreret, e-mailer vi dig et link til adgangskodegendannelse. Tjek din spammappe, hvis du ikke ser e-mailen i din indbakke indenfor få minutter.
+      no_token: Denne side er kun tilgængelig via linket fra en e-mail til adgangskodenulstillings. Husk i den forbindelse at benytte den fuldstændige URL fra e-mailen.
+      send_instructions: Er din e-mailadresse allerede registreret, e-mailes du et link til adgangskodenulstilling. Tjek spammappen, hvis e-mailen ikke ses i indbakken indenfor få minutter.
+      send_paranoid_instructions: Er din e-mailadresse allerede registreret, e-mailes du et link til adgangskodenulstilling. Tjek spammappen, hvis e-mailen ikke ses i indbakken indenfor få minutter.
       updated: Din adgangskode er skiftet, og du er nu logget ind.
       updated_not_active: Din adgangskode er skiftet.
     registrations:
       destroyed: Farvel! Din konto er nu annulleret. Vi håber snart at se dig igen.
-      signed_up: Velkommen! Du har nu tilmeldt dig.
-      signed_up_but_inactive: Du har nu oprettet dig. Da din konto endnu ikke er aktiveret, kan du dog pt. ikke logge ind.
-      signed_up_but_locked: Du har nu oprettet dig. Da din konto er låst, kan du pt. ikke logge ind.
-      signed_up_but_pending: En besked med et bekræftelseslink er e-mailet til dig. Når du har klikket på linket, gennemgår vi din ansøgning, og du får besked, hvis den godkendes.
-      signed_up_but_unconfirmed: En besked med et bekræftelseslink er e-mailet til dig. Følg linket for at aktivere din konto. Tjek din spammappe, hvis du ikke ser denne e-mail i din indbakke.
-      update_needs_confirmation: Du har opdateret din konto. Din nye e-mailadresse skal dog bekræftes. For at gøre dette, tjek din e-mail og følg bekræftelseslinket. Tjek din spammappe, hvis du ikke ser denne e-mail i din indbakke indenfor få minutter.
+      signed_up: Velkommen! Du er nu tilmeldt.
+      signed_up_but_inactive: Du har nu oprettet dig. Da din konto endnu ikke er aktiveret, kan du dog ikke logge ind med det samme.
+      signed_up_but_locked: Du har nu oprettet dig. Da din konto er låst, kan du ikke logge ind med det samme.
+      signed_up_but_pending: Et bekræftelseslink er e-mailet til dig. Når du har klikket på linket, gennemgår vi din ansøgning, og du får besked, hvis den godkendes.
+      signed_up_but_unconfirmed: Et bekræftelseslink er e-mailet til dig. Følg linket for at aktivere din konto. Tjek spammappen, hvis e-mailen ikke dukker op i indbakken.
+      update_needs_confirmation: Du har opdateret din konto. Din nye e-mailadresse skal nu bekræftes. Til dette formål er du blevet e-mailet et bekræftelseslink, så følg dette for at bekræfte den nye e-mailadresse. Ser du ikke e-mailen i din indbakke snarest, så tjek Spam-mappen.
       updated: Din konto er nu opdateret.
     sessions:
       already_signed_out: Du er nu logget ud.
       signed_in: Du er nu logget ind.
       signed_out: Du er nu logget ud.
     unlocks:
-      send_instructions: Instruktioner mailes til dig om, hvordan du oplåser din konto. Er denne e-mail ikke er i din indbakke inden for få minutter, så tjek spammappe.
-      send_paranoid_instructions: Findes din konto, mailes du instrukser om, hvordan du oplåser den. Ser du ikke denne e-mail i din indbakke undenfor få minutter, så tjek spammappen.
+      send_instructions: Instruktioner e-mailes til dig om, hvordan du oplåser din konto. Er e-mailen ikke er i din indbakke inden for få minutter, så tjek i Spam.
+      send_paranoid_instructions: Findes din konto, e-mailes du instrukser om, hvordan du oplåser den. Er e-mailen i din indbakke indenfor få minutter, så tjek i Spam.
       unlocked: Din konto er nu oplåst. Log ind for at fortsætte.
   errors:
     messages:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 0512ca129..894744af0 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -20,30 +20,30 @@ de:
       confirmation_instructions:
         action: E-Mail-Adresse verifizieren
         action_with_app: Bestätigen und zu %{app} zurückkehren
-        explanation: Du hast einen Account auf %{host} mit dieser E-Mail-Adresse erstellt. Du bist nur noch einen Klick weit von der Aktivierung entfernt. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
-        explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mailadresse beworben. Sobald du deine E-Mailadresse bestätigst werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt, also wird keine weitere Handlung benötigt. Wenn du das nicht warst kannst du diese E-Mail ignorieren.
+        explanation: Du hast auf %{host} mit dieser E-Mail-Adresse ein Konto erstellt. Du bist nur noch einen Klick von der Aktivierung entfernt. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
+        explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mailadresse beworben. Sobald du deine E-Mailadresse bestätigst hast, werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt, also wird keine weitere Handlung benötigt. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
         extra_html: Bitte lies auch die <a href="%{terms_path}">Regeln des Servers</a> und <a href="%{policy_path}">unsere Nutzungsbedingungen</a>.
         subject: 'Mastodon: Bestätigung deines Kontos bei %{instance}'
-        title: Verifiziere E-Mail-Adresse
+        title: E-Mail-Adresse verifizieren
       email_changed:
         explanation: 'Die E-Mail-Adresse deines Accounts wird geändert zu:'
-        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, dann kann es vermutlich sein, dass jemand Zugriff zu deinem Account erhalten hat. Bitte ändere sofort dein Passwort oder kontaktiere den Administrator des Servers, wenn du dich ausgesperrt hast.
+        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, dann wird es vermutlich so sein, dass jemand Zugriff zu deinem Account erhalten hat. Bitte ändere sofort dein Passwort oder kontaktiere den Administrator des Servers, wenn du dich ausgesperrt hast.
         subject: 'Mastodon: E-Mail-Adresse geändert'
         title: Neue E-Mail-Adresse
       password_change:
         explanation: Das Passwort für deinen Account wurde geändert.
-        extra: Wenn du dein Passwort nicht geändert hast, dann kann es vermutlich sein, dass jemand Zugriff zu deinem Account erhalten hat. Bitte ändere sofort dein Passwort oder kontaktiere den Administrator des Servers, wenn du dich ausgesperrt hast.
+        extra: Wenn du dein Passwort nicht geändert hast, dann wird es vermutlich so sein, dass jemand Zugriff auf deinem Account erlangt hat. Bitte ändere sofort dein Passwort oder kontaktiere den Administrator des Servers, wenn du dich ausgesperrt hast.
         subject: 'Mastodon: Passwort geändert'
         title: Passwort geändert
       reconfirmation_instructions:
         explanation: Bestätige deine neue E-Mail-Adresse, um sie zu ändern.
         extra: Wenn diese Änderung nicht von dir ausgeführt wurde, dann solltest du diese E-Mail ignorieren. Die E-Mail-Adresse für deinen Mastodon-Account wird sich nicht ändern, bis du den obigen Link anklickst.
         subject: 'Mastodon: Bestätige E-Mail-Adresse für %{instance}'
-        title: Verifiziere E-Mail-Adresse
+        title: E-Mail-Adresse verifizieren
       reset_password_instructions:
         action: Ändere Passwort
         explanation: Du hast ein neues Passwort für deinen Account angefragt.
-        extra: Wenn du diese Anfrage nicht gestellt hast, solltest du diese E-Mail ignorieren. Dein Passwort wird sich nicht ändern solange du den obigen Link anklickst und ein neues erstellst.
+        extra: Wenn du diese Anfrage nicht gestellt hast, solltest du diese E-Mail ignorieren. Dein Passwort wird sich nicht ändern, solange du den obigen Link anklickst und ein neues erstellst.
         subject: 'Mastodon: Passwort zurücksetzen'
         title: Passwort zurücksetzen
       two_factor_disabled:
@@ -51,13 +51,13 @@ de:
         subject: 'Mastodon: Zwei‐Faktor‐Authentifizierung deaktiviert'
         title: 2FA deaktiviert
       two_factor_enabled:
-        explanation: Zwei-Faktor-Authentifizierung wurde für dein Konto aktiviert. Ein Token, der von der gepaarten TOTP-App generiert wird, wird für den Login benötigt.
+        explanation: Zwei-Faktor-Authentifizierung wurde für dein Konto aktiviert. Ein Token, das von der verbundenen TOTP-App generiert wird, wird für den Login benötigt.
         subject: 'Mastodon: Zwei‐Faktor‐Authentifizierung aktiviert'
         title: 2FA aktiviert
       two_factor_recovery_codes_changed:
-        explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue generiert.
-        subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu generiert'
-        title: 2FA Wiederherstellungscodes geändert
+        explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
+        subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu erstellt'
+        title: 2FA-Wiederherstellungscodes geändert
       unlock_instructions:
         subject: 'Mastodon: Konto entsperren'
       webauthn_credential:
@@ -78,23 +78,23 @@ de:
         subject: 'Mastodon: Authentifizierung mit Sicherheitsschlüssel aktiviert'
         title: Sicherheitsschlüssel aktiviert
     omniauth_callbacks:
-      failure: Du konntest nicht mit deinem %{kind}-Konto angemeldet werden, weil »%{reason}«.
+      failure: Du konntest nicht mit deinem %{kind}-Konto angemeldet werden, weil „%{reason}“.
       success: Du hast dich erfolgreich mit deinem %{kind}-Konto angemeldet.
     passwords:
       no_token: Du kannst diese Seite nur über den Link aus der E-Mail zum Passwort-Zurücksetzen aufrufen. Wenn du einen solchen Link aufgerufen hast, stelle bitte sicher, dass du die vollständige Adresse aufrufst.
       send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Passwort zurücksetzen kannst.
       send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, erhältst du in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Passwort zurücksetzen kannst.
-      updated: Dein Passwort wurde geändert. Du bist jetzt angemeldet.
-      updated_not_active: Dein Passwort wurde geändert.
+      updated: Ihr Passwort wurde erfolgreich geändert. Du bist jetzt angemeldet.
+      updated_not_active: Dein Passwort wurde erfolgreich geändert.
     registrations:
       destroyed: Dein Konto wurde gelöscht.
       signed_up: Willkommen! Du hast dich erfolgreich registriert.
-      signed_up_but_inactive: Du hast dich erfolgreich registriert. Wir konnten dich noch nicht anmelden, da dein Konto inaktiv ist.
-      signed_up_but_locked: Du hast dich erfolgreich registriert. Wir konnten dich noch nicht anmelden, da dein Konto gesperrt ist.
-      signed_up_but_pending: Eine Nachricht mit einem Bestätigungslink wurde an dich per E-Mail geschickt. Nachdem du diesen Link angeklickt hast werden wir deine Anfrage überprüfen. Du wirst benachrichtigt falls die Anfrage angenommen wurde.
-      signed_up_but_unconfirmed: Du hast dich erfolgreich registriert. Wir konnten dich noch nicht anmelden, da dein Konto noch nicht bestätigt ist. Du erhältst in Kürze eine E-Mail. Darin ist erklärt, wie du dein Konto freischalten kannst.
+      signed_up_but_inactive: Du hast dich erfolgreich registriert. Allerdings ist dein Konto noch nicht aktiviert und du kannst dich daher noch nicht anmelden.
+      signed_up_but_locked: Du hast dich erfolgreich registriert. Allerdings ist dein Konto gesperrt und du kannst dich daher nicht anmelden.
+      signed_up_but_pending: Eine Nachricht mit einem Bestätigungslink wurde an dich per E-Mail geschickt. Nachdem du diesen Link angeklickt hast, werden wir deine Anfrage überprüfen. Du wirst benachrichtigt werden, falls die Anfrage angenommen wurde.
+      signed_up_but_unconfirmed: Du hast dich erfolgreich registriert. Wir konnten dich noch nicht anmelden, da dein Konto noch nicht bestätigt ist. Du erhältst in Kürze eine E-Mail. Darin wird erklärt, wie du dein Konto freischalten kannst.
       update_needs_confirmation: Deine Daten wurden aktualisiert, aber du musst deine neue E-Mail-Adresse bestätigen. Du erhältst in wenigen Minuten eine E-Mail. Darin ist erklärt, wie du die Änderung deiner E-Mail-Adresse abschließen kannst.
-      updated: Deine Daten wurden aktualisiert.
+      updated: Ihr Konto wurde erfolgreich aktualisiert.
     sessions:
       already_signed_out: Erfolgreich abgemeldet.
       signed_in: Erfolgreich angemeldet.
@@ -112,4 +112,4 @@ de:
       not_locked: ist nicht gesperrt
       not_saved:
         one: '1 Fehler hat verhindert, dass %{resource} gespeichert wurde:'
-        other: "%{count} Fehler verhinderten, dass %{resource} gespeichert wurde:"
+        other: "%{count} Fehler haben verhindert, dass %{resource} gespeichert wurde:"
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
new file mode 100644
index 000000000..9a51d0757
--- /dev/null
+++ b/config/locales/devise.en-GB.yml
@@ -0,0 +1,115 @@
+---
+en-GB:
+  devise:
+    confirmations:
+      confirmed: Your email address has been successfully confirmed.
+      send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+      send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+    failure:
+      already_authenticated: You are already signed in.
+      inactive: Your account is not activated yet.
+      invalid: Invalid %{authentication_keys} or password.
+      last_attempt: You have one more attempt before your account is locked.
+      locked: Your account is locked.
+      not_found_in_database: Invalid %{authentication_keys} or password.
+      pending: Your account is still under review.
+      timeout: Your session expired. Please sign in again to continue.
+      unauthenticated: You need to sign in or sign up before continuing.
+      unconfirmed: You have to confirm your email address before continuing.
+    mailer:
+      confirmation_instructions:
+        action: Verify email address
+        action_with_app: Confirm and return to %{app}
+        explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
+        explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
+        extra_html: Please also check out <a href="%{terms_path}">the rules of the server</a> and <a href="%{policy_path}">our terms of service</a>.
+        subject: 'Mastodon: Confirmation instructions for %{instance}'
+        title: Verify email address
+      email_changed:
+        explanation: 'The email address for your account is being changed to:'
+        extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
+        subject: 'Mastodon: Email changed'
+        title: New email address
+      password_change:
+        explanation: The password for your account has been changed.
+        extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
+        subject: 'Mastodon: Password changed'
+        title: Password changed
+      reconfirmation_instructions:
+        explanation: Confirm the new address to change your email.
+        extra: If this change wasn't initiated by you, please ignore this email. The email address for the Mastodon account won't change until you access the link above.
+        subject: 'Mastodon: Confirm email for %{instance}'
+        title: Verify email address
+      reset_password_instructions:
+        action: Change password
+        explanation: You requested a new password for your account.
+        extra: If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.
+        subject: 'Mastodon: Reset password instructions'
+        title: Password reset
+      two_factor_disabled:
+        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
+        subject: 'Mastodon: Two-factor authentication disabled'
+        title: 2FA disabled
+      two_factor_enabled:
+        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
+        subject: 'Mastodon: Two-factor authentication enabled'
+        title: 2FA enabled
+      two_factor_recovery_codes_changed:
+        explanation: The previous recovery codes have been invalidated and new ones generated.
+        subject: 'Mastodon: Two-factor recovery codes re-generated'
+        title: 2FA recovery codes changed
+      unlock_instructions:
+        subject: 'Mastodon: Unlock instructions'
+      webauthn_credential:
+        added:
+          explanation: The following security key has been added to your account
+          subject: 'Mastodon: New security key'
+          title: A new security key has been added
+        deleted:
+          explanation: The following security key has been deleted from your account
+          subject: 'Mastodon: Security key deleted'
+          title: One of your security keys has been deleted
+      webauthn_disabled:
+        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
+        subject: 'Mastodon: Authentication with security keys disabled'
+        title: Security keys disabled
+      webauthn_enabled:
+        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
+        subject: 'Mastodon: Security key authentication enabled'
+        title: Security keys enabled
+    omniauth_callbacks:
+      failure: Could not authenticate you from %{kind} because “%{reason}”.
+      success: Successfully authenticated from %{kind} account.
+    passwords:
+      no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
+      send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+      send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+      updated: Your password has been changed successfully. You are now signed in.
+      updated_not_active: Your password has been changed successfully.
+    registrations:
+      destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon.
+      signed_up: Welcome! You have signed up successfully.
+      signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
+      signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
+      signed_up_but_pending: A message with a confirmation link has been sent to your email address. After you click the link, we will review your application. You will be notified if it is approved.
+      signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. Please check your spam folder if you didn't receive this email.
+      update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address. Please check your spam folder if you didn't receive this email.
+      updated: Your account has been updated successfully.
+    sessions:
+      already_signed_out: Signed out successfully.
+      signed_in: Signed in successfully.
+      signed_out: Signed out successfully.
+    unlocks:
+      send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. Please check your spam folder if you didn't receive this email.
+      send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. Please check your spam folder if you didn't receive this email.
+      unlocked: Your account has been unlocked successfully. Please sign in to continue.
+  errors:
+    messages:
+      already_confirmed: was already confirmed, please try signing in
+      confirmation_period_expired: needs to be confirmed within %{period}, please request a new one
+      expired: has expired, please request a new one
+      not_found: not found
+      not_locked: was not locked
+      not_saved:
+        one: '1 error prohibited this %{resource} from being saved:'
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 7b6f6783b..68a90171c 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -12,7 +12,7 @@ eo:
       last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
       locked: Via konto estas ŝlosita.
       not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
-      pending: Via konto ankoraŭ estas kontrolanta.
+      pending: Via konto ankoraŭ estas kontrolata.
       timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
       unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
       unconfirmed: Vi devas konfirmi vian retadreson antaŭ ol daŭrigi.
@@ -24,22 +24,22 @@ eo:
         explanation_when_pending: Vi petis inviton al %{host} per ĉi tiu retpoŝta adreso. Kiam vi konfirmas vian retpoŝtan adreson, ni revizios vian kandidatiĝon. Vi ne povas ensaluti ĝis tiam. Se via kandidatiĝo estas rifuzita, viaj datumoj estos forigitaj, do neniu alia ago estos postulita de vi. Se tio ne estis vi, bonvolu ignori ĉi tiun retpoŝton.
         extra_html: Bonvolu rigardi <a href="%{terms_path}">la regulojn de la servilo</a> kaj <a href="%{policy_path}">niajn uzkondiĉojn</a>.
         subject: 'Mastodon: Konfirmaj instrukcioj por %{instance}'
-        title: Konfirmi retadreson
+        title: Konfirmi retpoŝton
       email_changed:
-        explanation: 'La retadreso de via konto ŝanĝiĝas al:'
+        explanation: 'La retpoŝtadreso de via konto ŝanĝiĝas al:'
         extra: Se vi ne volis ŝanĝi vian retadreson, iu verŝajne aliris al via konto. Bonvolu tuj ŝanĝi vian pasvorton aŭ kontakti la administranton de la servilo, se vi estas blokita ekster via konto.
-        subject: 'Mastodon: Retadreso ŝanĝita'
+        subject: 'Mastodon: Retpoŝton ŝanĝiĝis'
         title: Nova retadreso
       password_change:
         explanation: La pasvorto de via konto estis ŝanĝita.
         extra: Se vi ne ŝanĝis vian pasvorton, iu verŝajne aliris al via konto. Bonvolu ŝanĝi vian pasvorton tuj aŭ kontakti la administranton de la servilo, se vi estas blokita ekster via konto.
         subject: 'Mastodon: Pasvorto ŝanĝita'
-        title: Pasvorto ŝanĝita
+        title: Pasvorto estas ŝanĝita
       reconfirmation_instructions:
-        explanation: Retajpu la novan adreson por ŝanĝi vian retadreson.
+        explanation: Retajpu la novan adreson por ŝanĝi vian retpoŝtadreson.
         extra: Se ĉi tiu ŝanĝo ne estis komencita de vi, bonvolu ignori ĉi tiun retmesaĝon. La retadreso por la Mastodon-konto ne ŝanĝiĝos se vi ne aliras la supran ligilon.
-        subject: 'Mastodon: Konfirmi retadreson por %{instance}'
-        title: Kontrolu retadreson
+        subject: 'Mastodon: Konfirmi retpoŝton por %{instance}'
+        title: Kontrolu retpoŝtadreson
       reset_password_instructions:
         action: Ŝanĝi pasvorton
         explanation: Vi petis novan pasvorton por via konto.
@@ -49,11 +49,11 @@ eo:
       two_factor_disabled:
         explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
         subject: 'Mastodon: dufaktora aŭtentigo malebligita'
-        title: la du-etapa aŭtentigo estas malŝaltita
+        title: 2FA estas malŝaltita
       two_factor_enabled:
         explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
-        subject: 'Mastodon: dufaktora aŭtentigo ebligita'
-        title: la du-etapa aŭtentigo estas ŝaltita
+        subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
+        title: 2FA aktivigita
       two_factor_recovery_codes_changed:
         explanation: La antaŭaj reakiraj kodoj estis nuligitaj kaj novaj estis generitaj.
         subject: 'Mastodon: Reakiraj kodoj de dufaktora aŭtentigo rekreitaj'
@@ -105,7 +105,7 @@ eo:
       unlocked: Via konto estis sukcese malŝlosita. Bonvolu ensaluti por daŭrigi.
   errors:
     messages:
-      already_confirmed: jam estis konfirmita, bonvolu provi ensaluti
+      already_confirmed: jam estis konfirmita, bonvolu provi saluti
       confirmation_period_expired: devas esti konfirmita ene de %{period}, bonvolu peti denove
       expired: eksvalidiĝis, bonvolu peti denove
       not_found: ne estis trovita
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index 6772443b0..b49a9f05f 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -3,94 +3,111 @@ et:
   devise:
     confirmations:
       confirmed: Teie e-postiaadress on edukalt kinnitatud.
-      send_instructions: Te saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
-      send_paranoid_instructions: Kui Teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
+      send_instructions: Te saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
+      send_paranoid_instructions: Kui teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma e-posti aadressit kinnitada. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
     failure:
-      already_authenticated: Te olete juba sisse loginud.
+      already_authenticated: Oled juba sisse loginud.
       inactive: Teie konto pole veel aktiveeritud.
-      invalid: Valed %{authentication_keys} või parool.
+      invalid: Valed %{authentication_keys} või salasõna.
       last_attempt: Teil on veel üks katse kuni teie konto on lukustatud.
       locked: Teie konto on lukustatud.
-      not_found_in_database: Valed %{authentication_keys} või parool.
+      not_found_in_database: Valed %{authentication_keys} või salasõna.
       pending: Teie konto on siiani läbivaatlusel.
       timeout: Teie sessioon on aegunud. Jätkamiseks palun sisenege uuesti.
       unauthenticated: Te peate sisenema või looma konto enne jätkamist.
       unconfirmed: Te peate kinnitama oma e-postiaadressi enne jätkamist.
     mailer:
       confirmation_instructions:
-        action: Kinnita e-postiaadress
+        action: Kinnitage e-postiaadress
         action_with_app: Kinnita ja naase %{app}
-        explanation: Te olete loonud konto %{host}'il selle e-postiaadressiga. Te olete ühe kliki kaugusel selle aktiveerimisest. Kui see polnud Teie, palun eirake seda kirja.
-        explanation_when_pending: Te esitasite soovi liituda %{host}-iga selle e-postiaadressiga. Siis, kui Te kinnitate oma e-posti aadressi, vaatame me Teie soovi üle. Te ei saa siseneda kuni selleni. Kui teie soov on tagasi lükatud, Teie andmed kustutatakse ning Te ei pea rohkem midagi tegema. Kui see ei olnud Teie, palun eirake seda kirja.
-        extra_html: Palun tutvu <a href="%{terms_path}">meie serveri reeglitega</a> ning <a href="%{policy_path}">meie kasutustingimustega</a>.
-        subject: 'Mastodon: %{instance} Kinnitamisjuhised'
+        explanation: Oled loonud %{host} konto selle e-postiaadressiga. Oled ühe kliki kaugusel selle aktiveerimisest. Kui see polnud sina, palun eira seda kirja.
+        explanation_when_pending: "Esitasite taotluse liituda selle e-postiaadressiga %{host} kasutajaks. Palume kinnitada e-posti aadress. Pärast seda vaatame me teie taotluse üle. Võite logida sisse, et oma andmeid muuta või konto kustutada, aga te ei saa enamustele tegevustele ligi enne, kui teie konto on meie moderaatorite poolt kinnitatud. Kui konto on kinnitatud, saate selle kohta eraldi e-kirja.\nKui teie taotlus lükatakse aga tagasi, kustutatakse ka teie andmed ja mingit teiepoolset järeltegevust pole vaja. \nKui see polnud teie, siis palume seda kirja eirata."
+        extra_html: Palun tutvuge <a href="%{terms_path}">meie serveri reeglitega</a> ning <a href="%{policy_path}">meie kasutustingimustega</a>.
+        subject: 'Mastodon: %{instance} kinnitamisjuhised'
         title: Kinnita e-postiaadress
       email_changed:
         explanation: 'Teie konto e-postiaadress muudetakse:'
-        extra: Kui Te ei muutnud oma e-posti, on tõenäoline, et kellelgi on ligipääs Teie kontole. Palun muutke oma salasõna koheselt või võtke ühendust oma serveri administraatoriga, kui olete oma kontost välja lukustatud.
-        subject: 'Mastodon: E-post muudetud'
+        extra: Kui sa ei muutnud oma e-posti, on tõenäoline, et kellelgi on ligipääs su kontole. Palun muuda koheselt oma salasõna. Kui oled aga oma kontost välja lukustatud, võta ühendust oma serveri administraatoriga.
+        subject: 'Mastodon: e-post muudetud'
         title: Uus e-postiaadress
       password_change:
-        explanation: Teie konto parool on muudetud.
-        extra: Kui Te ei muutnud oma salasõna, on tõenäoline, et kellelgi on ligipääs Teie kontole. Palun muutke oma salasõna koheselt või võtke ühendust oma serveri administraatoriga, kui olete oma kontost välja lukustatud.
-        subject: 'Mastodon: Salasõna muudetud'
+        explanation: Konto salasõna on vahetatud.
+        extra: Kui sa ei muutnud oma salasõna, on tõenäoline, et keegi on su kontole ligi pääsenud. Palun muuda viivitamata oma salasõna. Kui sa oma kontole ligi ei pääse, võta ühendust serveri haldajaga.
+        subject: 'Mastodon: salasõna muudetud'
         title: Salasõna muudetud
       reconfirmation_instructions:
-        explanation: Kinnita oma uus aadress, et muuta oma e-posti.
-        extra: Kui see muudatus pole Teie poolt alustatud, palun eirake seda kirja. E-postiaadress sellele Mastodoni kontole ei muutu, kuni Te vajutate üleval asuvale lingile.
-        subject: 'Mastodon: Kinnitake e-post - %{instance}'
+        explanation: Kinnitage oma uus aadress, et muuta oma e-posti aadressi.
+        extra: Kui see muudatus pole teie poolt alustatud, palun eirake seda kirja. E-postiaadress sellele Mastodoni kontole ei muutu, kuni te vajutate üleval asuvale lingile.
+        subject: 'Mastodon: kinnitake e-postiaadress %{instance} jaoks'
         title: Kinnita e-postiaadress
       reset_password_instructions:
-        action: Muuda salasõna
-        explanation: Te taotlesite oma kontole uut salasõna.
-        extra: Kui Te ei soovinud seda, palun eirake seda kirja. Teie salasõna ei muutu, kuni Te vajutate üleval olevale lingile ning loote uue.
-        subject: 'Mastodon: Salasõna lähtestamisjuhendid'
+        action: Salasõna muutmine
+        explanation: Kontole on küsitud uut salasõna.
+        extra: Kui see tuleb üllatusena, võib seda kirja eirata. Salasõna ei muutu enne ülaoleva lingi külastamist ja uue salasõna määramist.
+        subject: 'Mastodon: salasõna lähtestamisjuhendid'
         title: Salasõna lähtestamine
       two_factor_disabled:
-        explanation: Kaheastmeline autentimine on teie konto jaoks välja lülitatud. Sisselogimine on nüüd ainult võimalik kasutades e-postiaadressit ja salasõna.
-        subject: 'Mastodon: Kaheastmeline autentimine välja lülitatud'
-        title: 2FA väljas
+        explanation: Kontol on kahe-etapine autentimine välja lülitatud. Sisenemine on võimalik ainult kasutades e-postiaadressi ja salasõna.
+        subject: 'Mastodon: Kahe-etapine autentimine välja lülitatud'
+        title: 2FA keelatud
       two_factor_enabled:
-        explanation: Kaheastmeline autentimine on Teie kontole sisse lülitatud. Teie TOTP rakenduse poolt loodud võtit läheb vaja igal sisselogimisel.
-        subject: 'Mastodon: Kaheastmeline autentimine sisse lülitatud'
-        title: 2FA sees
+        explanation: Kontol on sisse lülitatud kahe-etapine autentimine. Sisenemiseks on vajalik ühekordne aeguv võti TOTP-rakenduse poolt.
+        subject: 'Mastodon: Kahe-etapine autentimine sisse lülitatud'
+        title: 2FA lubatud
       two_factor_recovery_codes_changed:
-        explanation: Eelmised taastuskoodid on kehtetuks tehtud ning uued loodud.
-        subject: 'Mastodon: Kaheastmelise autentimise taastuskoodid taasloodud'
-        title: 2FA taastuskoodid muudetud
+        explanation: Eelmised taastekoodid on nüüd kehtetud ning loodud uued.
+        subject: 'Mastodon: Kahe-etapise autentimise taastuskoodid taasloodud'
+        title: 2FA taastekoodid muudetud
       unlock_instructions:
         subject: 'Mastodon: Lahti lukustamis juhendid'
+      webauthn_credential:
+        added:
+          explanation: Järgnev turvavõti on lisatud teie kontole
+          subject: 'Mastodon: uus turvavõti'
+          title: Uus turvavõti on lisatud
+        deleted:
+          explanation: Järgnev turvavõti on teie kontolt kustutatud
+          subject: 'Mastodon: turvavõti kustutatud'
+          title: Üks teie turvavõtmetest on kustutatud
+      webauthn_disabled:
+        explanation: Autentimine turvavõtmetega on teie kontol välja lülitatud. Sisse logimine on nüüd võimalik ainult kasutades TOTP rakenduse poolt tekitatud võtmega.
+        subject: 'Mastodon: autentimine turvavõtmega on välja lülitatud'
+        title: Turvavõtmed on välja lülitatud
+      webauthn_enabled:
+        explanation: Turvavõtme autentimine on teie kontol nüüd sisse lülitatud. Teie turvavõtit saab nüüd kasutada sisse logimiseks.
+        subject: 'Mastodon: turvavõtme autentimine sisse lülitatud'
+        title: Turvavõtmed on sisse lülitatud
     omniauth_callbacks:
-      failure: Ei saanud Teid tuvastada %{kind} kaudu, kuna "%{reason}".
+      failure: Ei saanud teid tuvastada %{kind} kaudu, kuna "%{reason}".
       success: Tuvastamine %{kind} konto järgi õnnestus.
     passwords:
-      no_token: Te ei saa sellele leheküljele ligi ilma tulemata salasõna lähtestamis e-kirjast. Kui Te tulete salasõna lähtestamis e-kirjast, palun olge kindel, et kasutasite tervet Teile antud URL-i.
-      send_instructions: Kui Teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma salasõna taastada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
-      send_paranoid_instructions: Kui Teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma salasõna taastada. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
-      updated: Teie salasõna muutmine õnnestus. Te olete nüüd sisse loginud.
+      no_token: Sellele leheküljele ei pääse tulemata salasõna lähtestamise e-kirjast. Kui tuled salasõna lähtestamise e-kirjast, palun veendu, et kasutasid tervet saadetud URLi.
+      send_instructions: Kui teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma salasõna taastada. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
+      send_paranoid_instructions: Kui teie e-postiaadress eksisteerib meie andmebaasis, saate paari minuti pärast e-kirja juhistega, kuidas oma salasõna taastada. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
+      updated: Salasõna muutmine õnnestus. Oled nüüd sisse logitud.
       updated_not_active: Teie salasõna muutmine õnnestus.
     registrations:
-      destroyed: Nägemist! Teie konto sulgemine õnnestus. Me loodame Teid varsti taas näha.
+      destroyed: Nägemist! Teie konto sulgemine õnnestus. Me loodame teid varsti taas näha.
       signed_up: Tere tulemast! Teie konto loomine õnnestus.
-      signed_up_but_inactive: Teie konto loodi edukalt, kuid me ei saanud Teid sisse logida, kuna teie konto pole veel aktiveeritud.
-      signed_up_but_locked: Teie konto loodi edukalt, kuid me ei saanud Teid sisse logida, kuna teie konto on lukustatud.
-      signed_up_but_pending: Kiri kinnituslingiga saadeti Teie e-postile. Pärast seda, kui te vajutate lingile, vaatame me Teie taotluse üle. Teid teavitatakse, kui see on vastu võetud.
-      signed_up_but_unconfirmed: Kiri kinnituslingiga saadeti Teie e-postile. Palun järgige linki, et aktiveerida oma konto. Palun kontrollige oma rämpsposti, kui Te ei saanud seda e-kirja.
-      update_needs_confirmation: Teie konto uuendamine õnnestus, kuid me peame Teie e-postiaadressit kinnitama. Palun kontrollige oma e-posti ning järgige linki, et kinnitada oma e-postiaadress. Palun kontrollige oma rämpsposti, kui Te ei saanud seda e-kirja.
+      signed_up_but_inactive: Teie konto loodi edukalt, kuid me ei saanud teid sisse logida, kuna teie konto pole veel aktiveeritud.
+      signed_up_but_locked: Teie konto loodi edukalt, kuid me ei saanud teid sisse logida, kuna teie konto on lukustatud.
+      signed_up_but_pending: Kiri kinnituslingiga saadeti teie e-postile. Pärast seda, kui te vajutate lingile, vaatame me teie taotluse üle. Teid teavitatakse, kui see on vastu võetud.
+      signed_up_but_unconfirmed: Kiri kinnituslingiga saadeti teie e-postile. Palun järgige linki, et aktiveerida oma konto. Palun kontrollige oma rämpsposti, kui te ei saanud seda e-kirja.
+      update_needs_confirmation: Teie konto uuendamine õnnestus, kuid e-postiaadress tuleb veel kinnitada. Palun kontrollige oma e-posti ning järgige kirjas olevat linki, et e-postiaadress kinnitada. Palun kontrollige rämpsposti, kui te sellist e-kirja ei saanud.
       updated: Teie konto uuendamine õnnestus.
     sessions:
       already_signed_out: Väljumine õnnestus.
       signed_in: Sisenemine õnnestus.
       signed_out: Väljumine õnnestus.
     unlocks:
-      send_instructions: Te saate paari minuti pärast e-kirja juhistega, kuidas oma konto lukust lahti teha. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
-      send_paranoid_instructions: Kui Teie konto eksisteerib, saate Te paari minuti pärast e-kirja juhistega, kuidas see lukust lahti teha. Palun kontrollige oma rämpsposti kausta juhul, kui Te ei saanud seda e-kirja.
-      unlocked: Teie konto lukust lahti võtmine õnnestus. Jätkamiseks, palun logige sisse.
+      send_instructions: Te saate paari minuti pärast e-kirja juhistega, kuidas oma konto lukust lahti teha. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
+      send_paranoid_instructions: Kui teie konto eksisteerib, saate te paari minuti pärast e-kirja juhistega, kuidas see lukust lahti teha. Palun kontrollige oma rämpsposti kausta juhul, kui te ei saanud seda e-kirja.
+      unlocked: Teie konto lukust lahti võtmine õnnestus. Jätkamiseks palun logige sisse.
   errors:
     messages:
       already_confirmed: oli juba kinnitatud, palun proovige sisse logida
-      confirmation_period_expired: peab olema kinnitatud ajavahemikus %{period} - palun taotlege uus
-      expired: on aegunud, palun taotlege uus
+      confirmation_period_expired: peab olema kinnitatud ajavahemikus %{period}, palun taotlege uuesti
+      expired: on aegunud, palun taotlege uuesti
       not_found: ei leitud
       not_locked: ei olnud lukustatud
       not_saved:
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index c13df9989..bb7134731 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -38,7 +38,7 @@ fa:
       reconfirmation_instructions:
         explanation: نشانی تازه را تأیید کنید تا ایمیل‌تان عوض شود.
         extra: اگر شما باعث این تغییر نبودید، لطفاً این ایمیل را نادیده بگیرید. تا زمانی که شما پیوند بالا را باز نکنید، نشانی ایمیل مربوط به حساب شما عوض نخواهد شد.
-        subject: 'ماستدون: تأیید ایمیل برای %{instance}'
+        subject: 'ماستودون: تأیید رایانامه برای %{instance}'
         title: تأیید نشانی ایمیل
       reset_password_instructions:
         action: تغییر رمز
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 7637ae3e1..ce5a35efd 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -23,7 +23,7 @@ fi:
         explanation: Olet luonut tilin palvelimelle %{host} käyttäen tätä sähköpostiosoitetta. Aktivoi tili yhdellä klikkauksella. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
         explanation_when_pending: Teit hakemuksen kutsusta palvelimelle %{host} tällä sähköpostiosoitteella. Kun olet vahvistanut sähköpostiosoitteesi, tarkistamme hakemuksesi. Voit kirjautua sisään muuttaaksesi hakemuksen sisältöä tai poistaaksesi tilin, mutta et voi käyttää suurinta osaa toiminnallisuudesta ennen kuin hakemuksesi on hyväksytty. Jos hakemuksesi hylätään, tietosi poistetaan eikä sinulta tarvita enempää toimia. Jos sinä et tehnyt hakemusta, voit jättää tämän viestin huomiotta.
         extra_html: Katso myös <a href="%{terms_path}">palvelimen säännöt</a> ja <a href="%{policy_path}">käyttöehdot</a>.
-        subject: 'Mastodon: Vahvistusohjeet palvelimelle %{instance}'
+        subject: 'Mastodon: Vahvistusohjeet instanssille %{instance}'
         title: Vahvista sähköpostiosoitteesi
       email_changed:
         explanation: 'Tilin sähköpostiosoitteeksi vaihdetaan:'
@@ -38,7 +38,7 @@ fi:
       reconfirmation_instructions:
         explanation: Vahvista uusi sähköpostiosoite, niin muutos astuu voimaan.
         extra: Jos et tehnyt muutosta itse, voit jättää tämän viestin huomiotta. Mastodon-tilin sähköpostiosoitetta ei vaihdeta, ennen kuin klikkaat yllä olevaa linkkiä.
-        subject: 'Mastodon: Vahvista sähköpostiosoite - %{instance}'
+        subject: 'Mastodon: Vahvista sähköpostiosoite instanssille %{instance}'
         title: Vahvista sähköpostiosoite
       reset_password_instructions:
         action: Vaihda salasana
diff --git a/config/locales/devise.fo.yml b/config/locales/devise.fo.yml
new file mode 100644
index 000000000..35fa0954f
--- /dev/null
+++ b/config/locales/devise.fo.yml
@@ -0,0 +1,115 @@
+---
+fo:
+  devise:
+    confirmations:
+      confirmed: Tín teldupostadressa er blivin vátta.
+      send_instructions: Innanfyri fáar minuttir fer tú at fáa ein teldupost við vegleiðing til hvussu tú staðfestir tína teldupostadressu. Vinarliga leita í tínum spamfaldara um tú ikki móttekur hendan teldupostin.
+      send_paranoid_instructions: Um tín teldupostaddresa longu er í dátugrunninum, fær tú er um fáa minuttir ein teldupost, við frágreiðing um, hvussu hendan kann váttast. Kanna tín Spam faldara, um tú ikki sær henda.
+    failure:
+      already_authenticated: Tú ert longu innskrivað/ur.
+      inactive: Kontan hjá tær er ikki virkin enn.
+      invalid: Skeivt %{authentication_keys} ella loyniorð.
+      last_attempt: Tú kanst royna einaferð afturat áðrenn kontan verður stongd.
+      locked: Kontan hjá tær er læst.
+      not_found_in_database: Ogyldigur %{authentication_keys} ella loyniorð.
+      pending: Kontan hjá tær verður kannað enn.
+      timeout: Tín innritan er útgingin. Innrita av nýggjum, fyri at hada fram.
+      unauthenticated: Tú mást skriva teg inn aftur fyri at halda fram.
+      unconfirmed: Tú skal staðfesta tína teldupostasressu fyri at halda áfram.
+    mailer:
+      confirmation_instructions:
+        action: Vátta teldupostadressuna
+        action_with_app: Staðfest og far aftur til %{app}
+        explanation: Tú hevur stovnað eina kontu hjá %{host} við hesari teldupostadressuni og tú ert eitt klikk frá at virkja hana. Um tað ikki vart tú, vinarliga sí burtur frá hesum teldupostinum.
+        explanation_when_pending: Tú hevur fingið innbjóðing tkl %{host}, við teldupostaddressu. Tá tú hevur vátta tín tína teldupostaddressu, verður umsóknin viðgjørd. Tú kann innrita og broyta ymsar stillingar, men flestu funkur kunnu ikki broytast, fyrr enn kontan er góðkend. Um kontan ikki verður góðkend, verða allar dátur um teg slettaðar. Um umsóknin ikki kom frá tær, skal tú síggja burtur frá teldupostinum.
+        extra_html: Kanna eisini <a href="%{terms_path}">reglurnar fyri henda ambætaran</a> og <a href="%{policy_path}">okkara nýtslu treytir</a>.
+        subject: 'Mastodon: Góðkenningartreytir fyri %{instance}'
+        title: Vátta teldupostadressuna
+      email_changed:
+        explanation: 'Telupostaddressan ryri kontina verður broytt til:'
+        extra: Um tú ikki hevur skift teldupostin, er sannlíkt at onkur annar hevur fingið atgongd til tína kontu. Vinarliga skift loyniorðið beinanvegin. Set teg í samband við fyrisitaran, um tú ikki sleppur inn á tína kontu.
+        subject: 'Mastodon: Teldupostur broyttur'
+        title: Nýggjur eldupostur
+      password_change:
+        explanation: Loyniorðið til kontoina hjá tær er broytt.
+        extra: Um tú ikki hevur skift loyniorðið, er sannlíkt at onkur annar hevur fingið atgongd til tína kontu. Vinarliga skift loyniorðið beinanvegin. Um tú ikki sleppur inn á tína kontu, hav samband við fyrisitarin.
+        subject: 'Mastodon: Loyniorð broytt'
+        title: Loyniorðið er broytt
+      reconfirmation_instructions:
+        explanation: Vátta nýggja bústaðin fyri at broyta teldupostin.
+        extra: Um henda broytingin ikki kemur frá tær, so skal tú ignorera hetta teldubrævið. Telduposturin til Mastodon kontuna verður ikki broytt, uttan so at tú fylgir leinkinum omanfyri.
+        subject: 'Mastodon: Vátta teldupost fyri %{instance}'
+        title: Vátta teldupostadressu
+      reset_password_instructions:
+        action: Broyt loyniorð
+        explanation: Tú hevur biðið um eitt nýtt loyniorð til kontoina.
+        extra: Um tú ikki hevur umbiðið hetta, so skalt tú ikki gera nakað. Loyniorðið verður bert broytt, um tú brúkar leinkið omanfyri og gert eitt nýtt.
+        subject: 'Mastodon: Vegleiðing at skifta loyniorð'
+        title: Skift loyniorð
+      two_factor_disabled:
+        explanation: Tvey-faktor samgildi (2FA) fyri tína kontu er gjørt óvirkið. Nú er møguligt at rita inn við einans at nýta teldupost og loyniorð.
+        subject: 'Mastodon: Váttan í tveimum stigum er gjørd óvirkin'
+        title: 2FA óvirkið
+      two_factor_enabled:
+        explanation: Váttan í tveimum stigum er gjørd virkin fyri tína kontu. Eitt merki framleitt av paraðu TOTP appini verður framyvir kravt fyri at rita inn.
+        subject: 'Mastodon: Váttan í tveimum stigum er virkin'
+        title: 2FA virkið
+      two_factor_recovery_codes_changed:
+        explanation: Undanfarnu endurskapanarkodurnar eru ógildaðar og nýggjar eru framleiddar.
+        subject: 'Mastodon: Endurskapanarkodurnar til váttan í tveimum stigum eru framleiddar umaftur'
+        title: 2FA endurskapanarkodur eru broyttar
+      unlock_instructions:
+        subject: 'Mastodon: Vegleiðing í at læsa upp'
+      webauthn_credential:
+        added:
+          explanation: Hesir trygdarlyklarnir eru lagdir afturat kontu tínari
+          subject: 'Mastodon: Nýggjur trygdarlykil'
+          title: Nýggjur trygdarlykil er gjørdur
+        deleted:
+          explanation: Hesin trygdarlyklin er strikaður av kontu tíni
+          subject: 'Mastodon: Trygdarlykilin strikaður'
+          title: Ein av trygdarlyklunum hjá tær er strikaður
+      webauthn_disabled:
+        explanation: Váttan við trygdarlyklum er gjørd óvirkin fyri tína kontu. Nú ber til at rita inn einans við teknum, sum eru framleidd av paraðu TOTP appini.
+        subject: 'Mastodon: Váttan við trygdarlyklum er gjørd óvirkin'
+        title: Trygdarlyklar óvirknir
+      webauthn_enabled:
+        explanation: Váttan við trygdarlyklum er gjørd virkin á tínari kontu. Nú kann tín trygdarlykil nýtast at rita inn við.
+        subject: 'Mastodon: Váttan við trygdarlykli gjørd virkin'
+        title: Trygdarlyklar gjørdir virknir
+    omniauth_callbacks:
+      failure: Tað bar ikki til at vátta teg frá %{kind} av tí at “%{reason}”.
+      success: Váttan eydnaðist frá %{kind} kontu.
+    passwords:
+      no_token: Tú hevur ikki atgongd til hesa síðuna, uttan so at tú kemur frá einum teldubrævi at nullstilla loyniorð. Kemur tú frá einum tílíkum teldubrævi, vinarliga eftirkanna, at tú brúkti allan URLin.
+      send_instructions: Finst telduposturin hjá tær í okkara dátugrunni, so fer tú at móttaka eitt teldubræv við einum leinki at endurvinna loyniorðið um nakrar minuttir. Vinarliga eftirkanna mappuna við ruskposti, um tú ikki móttók teldubrævið.
+      send_paranoid_instructions: Finst telduposturin hjá tær í okkara dátugrunni, so fer tú at móttaka eitt teldubræv við einum leinki at endurvinna loyniorðið um nakrar minuttir. Vinarliga eftirkanna mappuna við ruskposti, um tú ikki móttók teldubrævið.
+      updated: Loyniorðið er broytt og tú er innritað/ur.
+      updated_not_active: Loyniorðið er broytt.
+    registrations:
+      destroyed: Farvæl! Konta tín er gjørd óvirkin. Vit vóna at síggja teg aftur skjótt.
+      signed_up: Vælkomin! Tú er nú tilmeldað/ur.
+      signed_up_but_inactive: Tú er tilmeldað/ur. Vit kunnu tó ikki rita teg inn, tí konta tín er ikki gjørd virkin enn.
+      signed_up_but_locked: Tú er tilmeldað/ur. Vit kunnu tó ikki rita teg inn, tí konta tín er læst.
+      signed_up_but_pending: Eini boð við einum váttanarleinki er send til teldupoststaðin hjá tær. Tá tú hevur klikt á leinkið, so fara vit at eftirkanna umsókn tína. Tú fær boð, um hon verður játtað.
+      signed_up_but_unconfirmed: Eini boð við einum váttanarleinki eru send til teldupoststaðin hjá tær. Vinarliga fylg leinkinum fyri at gera kontu tína virkna. Vinarliga eftirkanna mappuna við ruskposti, um tú ikki móttók teldupostin.
+      update_needs_confirmation: Tað eydnaðist tær at dagføra kontuna, men tað er neyðugt at vátta nýggja teldupoststaðin hjá tær. Vinarliga kanna teldupostin hjá tær og fylg váttanarleinkinum at vátta nýggja teldupostin. Vinarliga kanna mappuna við ruskposti, um tú ikki móttók teldubrævið.
+      updated: Tað eydnaðist at dagføra kontu tína.
+    sessions:
+      already_signed_out: Útritan eydnaðist.
+      signed_in: Innritan eydnaðist.
+      signed_out: Útritan eydnaðist.
+    unlocks:
+      send_instructions: Um nakrar minuttir móttekur tú eitt teldubræv við vegleiðing í at læsa kontu tína upp. Vinarliga eftirkanna mappuna við ruskposti, um tú ikki móttók teldubrævið.
+      send_paranoid_instructions: Um konta tín finst, móttekur tú um nakrar minuttir eitt teldubræv við vegleiðing í at læsa kontu tína upp. Vinarliga eftirkanna mappuna við ruskposti, um tú ikki móttók teldubrævið.
+      unlocked: Tað eydnaðist at læsa kontu tína upp. Vinarliga rita inn fyri at halda fram.
+  errors:
+    messages:
+      already_confirmed: var longu váttað, vinarliga royn at innrita
+      confirmation_period_expired: má váttast innan %{period}, vinarliga bið um eina nýggja
+      expired: er útgingin, vinarliga bið um eina nýggja
+      not_found: ikki funnið
+      not_locked: var ikki læst
+      not_saved:
+        one: '1 feilur forðaði hesum %{resource} í at vera goymd:'
+        other: "%{count} feilir forðaðu hesum %{resource} í at vera goymd:"
diff --git a/config/locales/devise.fr-QC.yml b/config/locales/devise.fr-QC.yml
new file mode 100644
index 000000000..8c1a94dab
--- /dev/null
+++ b/config/locales/devise.fr-QC.yml
@@ -0,0 +1,115 @@
+---
+fr-QC:
+  devise:
+    confirmations:
+      confirmed: Votre adresse de courriel a été validée avec succès.
+      send_instructions: Vous allez recevoir un courriel avec des instructions nécessaires à la confirmation de votre adresse dans quelques minutes. Veuillez vérifier votre dossier de pourriels si vous n'avez pas reçu ce message.
+      send_paranoid_instructions: Si votre adresse courriel existe dans notre base de données, vous allez recevoir un courriel contenant les instructions de confirmation de votre adresse. Veuillez vérifier votre dossier de pourriels si vous n'avez pas reçu ce message.
+    failure:
+      already_authenticated: Vous êtes déjà connecté·e.
+      inactive: Votre compte n’est pas encore activé.
+      invalid: "%{authentication_keys} ou mot de passe invalide."
+      last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
+      locked: Votre compte est verrouillé.
+      not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
+      pending: Votre compte est toujours en cours d'approbation.
+      timeout: Votre session a expiré. Veuillez vous reconnecter pour continuer.
+      unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
+      unconfirmed: Vous devez valider votre adresse courriel pour continuer.
+    mailer:
+      confirmation_instructions:
+        action: Vérifier l’adresse courriel
+        action_with_app: Confirmer et retourner à %{app}
+        explanation: Vous avez créé un compte sur %{host} avec cette adresse courriel. Vous êtes à un clic de l’activer. Si ce n'était pas vous, veuiller ignorer ce courriel.
+        explanation_when_pending: Vous avez demandé à vous inscrire à %{host} avec cette adresse courriel. Une fois que vous aurez confirmé cette adresse, nous étudierons votre demande. Vous pouvez vous connecter pour changer vos détails ou supprimer votre compte, mais vous ne pouvez pas accéder à la plupart des fonctionalités du compte avant que votre compte ne soit approuvé. Si votre demande est rejetée, vos données seront supprimées, donc aucune action supplémentaire ne sera requise de votre part. Si ce n'était pas vous, veuiller ignorer ce courriel.
+        extra_html: Veuillez également consulter <a href="%{terms_path}">les règles du serveur</a> et <a href="%{policy_path}">nos conditions d’utilisation</a>.
+        subject: 'Mastodon: Instructions de confirmation pour %{instance}'
+        title: Vérifier l’adresse courriel
+      email_changed:
+        explanation: 'L’adresse courriel de votre compte est en cours de modification pour devenir:'
+        extra: Si vous n’avez pas changé votre adresse courriel, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur·rice du serveur si vous êtes bloqué hors de votre compte.
+        subject: 'Mastodon: Courriel modifié'
+        title: Nouvelle adresse courriel
+      password_change:
+        explanation: Le mot de passe de votre compte a été changé.
+        extra: Si vous n’avez pas changé votre mot de passe, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur·rice du serveur si vous êtes bloqué hors de votre compte.
+        subject: 'Mastodon: Mot de passe modifié'
+        title: Mot de passe modifié
+      reconfirmation_instructions:
+        explanation: Confirmez la nouvelle adresse pour changer votre courriel.
+        extra: Si ce changement n’a pas été initié par vous, veuillez ignorer ce courriel. L’adresse courriel du compte Mastodon ne changera pas tant que vous n’aurez pas cliqué sur le lien ci-dessus.
+        subject: 'Mastodon: Confirmer l’adresse courriel pour %{instance}'
+        title: Vérifier l’adresse courriel
+      reset_password_instructions:
+        action: Changer votre mot de passe
+        explanation: Vous avez demandé un nouveau mot de passe pour votre compte.
+        extra: Si vous ne avez pas demandé ceci, veuillez ignorer ce courriel. Votre mot de passe ne changera pas tant que vous n’aurez pas cliqué sur le lien ci-dessus et n’en aurez pas créé un nouveau.
+        subject: 'Mastodon: Instructions pour changer votre mot de passe'
+        title: Réinitialisation du mot de passe
+      two_factor_disabled:
+        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        subject: 'Mastodon: authentification à deux facteurs désactivée'
+        title: A2F désactivée
+      two_factor_enabled:
+        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        subject: 'Mastodon: authentification à deux facteurs activée'
+        title: A2F activée
+      two_factor_recovery_codes_changed:
+        explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
+        subject: 'Mastodon: codes de récupération à deux facteurs régénérés'
+        title: Codes de récupération A2F modifiés
+      unlock_instructions:
+        subject: 'Mastodon: Instructions pour déverrouiller votre compte'
+      webauthn_credential:
+        added:
+          explanation: La clé de sécurité suivante a été ajoutée à votre compte
+          subject: 'Mastodon: Nouvelle clé de sécurité'
+          title: Une nouvelle clé de sécurité a été ajoutée
+        deleted:
+          explanation: La clé de sécurité suivante a été supprimée de votre compte
+          subject: 'Mastodon: Clé de sécurité supprimée'
+          title: Une de vos clés de sécurité a été supprimée
+      webauthn_disabled:
+        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
+        subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
+        title: Clés de sécurité désactivées
+      webauthn_enabled:
+        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
+        subject: 'Mastodon: Authentification de la clé de sécurité activée'
+        title: Clés de sécurité activées
+    omniauth_callbacks:
+      failure: Nous n’avons pas pu vous authentifier via %{kind} car « %{reason} ».
+      success: Authentifié·e avec succès via %{kind}.
+    passwords:
+      no_token: Vous ne pouvez accéder à cette page sans venir d'un courriel de réinitialisation de mot de passe. Si vous êtes passé par un courriel de ce type, assurez-vous d’utiliser l’URL complet.
+      send_instructions: Si votre adresse courriel existe dans notre base de données, vous allez recevoir les instructions de réinitialisation du mot de passe à votre adresse dans quelques instants. Veuillez vérifier votre dossier de pourriel si vous n'avez reçu ce message.
+      send_paranoid_instructions: Si votre adresse courriel existe dans notre base de données, vous allez recevoir les instructions de réinitialisation du mot de passe à votre adresse dans quelques instants. Veuillez vérifier votre dossier de pourriel si vous n'avez reçu ce message.
+      updated: Votre mot de passe a été modifié avec succès. Vous êtes maintenant connecté·e.
+      updated_not_active: Votre mot de passe a été modifié avec succès.
+    registrations:
+      destroyed: Au revoir! Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt.
+      signed_up: Bienvenue! Vous êtes connecté·e.
+      signed_up_but_inactive: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
+      signed_up_but_locked: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
+      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous examinerons votre demande. Vous serez informé·e si elle a été approuvée.
+      signed_up_but_unconfirmed: Un message contenant un lien de confirmation a été envoyé à votre adresse courriel. Ouvrez ce lien pour activer votre compte. Veuillez vérifier votre dossier de pourriels si vous n'avez pas reçu le courriel.
+      update_needs_confirmation: Votre compte a été mis à jour avec succès, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour valider votre nouvelle adresse. Veuillez vérifier votre dossier de pourriels si vous ne recevez pas le courriel.
+      updated: Votre compte a été modifié avec succès.
+    sessions:
+      already_signed_out: Déconnexion réussie.
+      signed_in: Connexion réussie.
+      signed_out: Déconnexion réussie.
+    unlocks:
+      send_instructions: Vous allez recevoir un courriel avec des instructions nécessaires au déverrouillage de votre compte dans quelques minutes. Veuillez vérifier votre dossier de pourriels si vous ne recevez pas ce courriel.
+      send_paranoid_instructions: Si votre compte existe, vous allez recevoir un courriel avec les instructions pour le déverrouiller dans quelques minutes. Veuillez vérifier votre dossier d'indésirables si vous ne recevez pas ce courriel.
+      unlocked: Votre compte a été déverrouillé avec succès. Veuillez vous connecter pour continuer.
+  errors:
+    messages:
+      already_confirmed: a déjà été validée, veuillez essayer de vous connecter
+      confirmation_period_expired: à confirmer dans les %{period}, veuillez en faire une nouvelle demande
+      expired: a expiré, veuillez en faire une nouvelle demande
+      not_found: n’a pas été trouvé
+      not_locked: n’était pas verrouillé
+      not_saved:
+        one: '1 erreur a empêché ce·tte %{resource} d’être sauvegardé·e:'
+        other: "%{count} erreurs ont empêché %{resource} d’être sauvegardé⋅e :"
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 41ec75856..1047fae0b 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -2,11 +2,11 @@
 fr:
   devise:
     confirmations:
-      confirmed: Votre adresse courriel a été validée.
+      confirmed: Votre adresse de courriel a été validée.
       send_instructions: Vous allez recevoir par courriel les instructions nécessaires à la confirmation de votre compte dans quelques minutes. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre adresse électronique existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
     failure:
-      already_authenticated: Vous êtes déjà connecté.
+      already_authenticated: Vous êtes déjà connecté⋅e.
       inactive: Votre compte n’est pas encore activé.
       invalid: "%{authentication_keys} ou mot de passe invalide."
       last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
@@ -27,12 +27,12 @@ fr:
         title: Vérifiez l’adresse courriel
       email_changed:
         explanation: 'L’adresse courriel de votre compte est en cours de modification pour devenir :'
-        extra: Si vous n’avez pas changé votre adresse courriel, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur du serveur si vous êtes bloqué hors de votre compte.
+        extra: Si vous n’avez pas changé votre adresse courriel, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur·rice du serveur si vous êtes bloqué·e hors de votre compte.
         subject: 'Mastodon : Courriel modifié'
         title: Nouvelle adresse courriel
       password_change:
         explanation: Le mot de passe de votre compte a été changé.
-        extra: Si vous n’avez pas changé votre mot de passe, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur du serveur si vous êtes bloqué hors de votre compte.
+        extra: Si vous n’avez pas changé votre mot de passe, il est probable que quelqu’un ait eu accès à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l’administrateur·rice du serveur si vous êtes bloqué·e hors de votre compte.
         subject: 'Mastodon : Votre mot de passe a été modifié avec succès'
         title: Mot de passe modifié
       reconfirmation_instructions:
@@ -57,7 +57,7 @@ fr:
       two_factor_recovery_codes_changed:
         explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
         subject: 'Mastodon : codes de récupération à deux facteurs régénérés'
-        title: Codes de récupération 2FA modifiés
+        title: Codes de récupération A2F modifiés
       unlock_instructions:
         subject: 'Mastodon : Instructions pour déverrouiller votre compte'
       webauthn_credential:
@@ -89,16 +89,16 @@ fr:
     registrations:
       destroyed: Au revoir ! Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt.
       signed_up: Bienvenue ! Vous êtes connecté.
-      signed_up_but_inactive: Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
-      signed_up_but_locked: Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
-      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous examinerons votre demande. Vous serez informé si elle a été approuvée.
+      signed_up_but_inactive: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte n’est pas encore activé.
+      signed_up_but_locked: Vous êtes bien enregistré·e. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé.
+      signed_up_but_pending: Un message avec un lien de confirmation a été envoyé à votre adresse courriel. Après avoir cliqué sur le lien, nous examinerons votre demande. Vous serez informé·e si elle a été approuvée.
       signed_up_but_unconfirmed: Un message contenant un lien de confirmation a été envoyé à votre adresse courriel. Ouvrez ce lien pour activer votre compte. Veuillez vérifier votre dossier d'indésirables si vous ne recevez pas le courriel.
       update_needs_confirmation: Votre compte a bien été mis à jour, mais nous devons vérifier votre nouvelle adresse courriel. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse. Si vous n'avez pas reçu le courriel, vérifiez votre dossier de spams.
       updated: Votre compte a été modifié avec succès.
     sessions:
-      already_signed_out: Déconnecté·e.
-      signed_in: Connecté.
-      signed_out: Déconnecté.
+      already_signed_out: Déconnecté·e avec succès.
+      signed_in: Connecté·e.
+      signed_out: Déconnecté·e.
     unlocks:
       send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
       send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller. Veuillez, dans le cas où vous ne recevriez pas ce message, vérifier votre dossier d’indésirables.
@@ -111,5 +111,5 @@ fr:
       not_found: n’a pas été trouvé
       not_locked: n’était pas verrouillé
       not_saved:
-        one: 'Une erreur a empêché cette %{resource} d’être sauvegardé :'
-        other: "%{count} erreurs ont empêché %{resource} d’être sauvegardé :"
+        one: 'Une erreur a empêché ce·tte %{resource} d’être sauvegardé·e :'
+        other: "%{count} erreurs ont empêché %{resource} d’être sauvegardé⋅e :"
diff --git a/config/locales/devise.fy.yml b/config/locales/devise.fy.yml
new file mode 100644
index 000000000..3a7ead83e
--- /dev/null
+++ b/config/locales/devise.fy.yml
@@ -0,0 +1,117 @@
+---
+fy:
+  devise:
+    confirmations:
+      confirmed: Dyn account is befêstige.
+      send_instructions: Do ûntfangst fia in e-mailberjocht ynstruksjes hoe’tsto dyn account befêstigje kinst. Sjoch yn de map net-winske wannear’t neat ûntfongen waard.
+      send_paranoid_instructions: As dyn e-mailadres yn de database stiet, ûntfangsto fia in e-mailberjocht ynstruksjes hoe’tsto dyn account befêstigje kinst. Sjoch yn de map net-winske wannear’t neat ûntfongen waard.
+    failure:
+      already_authenticated: Do bist al oanmeld.
+      inactive: Jo account is noch net aktivearre.
+      invalid: "%{authentication_keys} of wachtwurd ûnjildich."
+      last_attempt: Do hast noch ien besykjen oer eardat dyn account blokkearre wurdt.
+      locked: Dyn account is blokkearre.
+      not_found_in_database: "%{authentication_keys} of wachtwurd ûnjildich."
+      pending: Dyn account moat noch hieltyd beoardiele wurde.
+      timeout: Dyn sesje is ferrûn, meld dy opnij oan.
+      unauthenticated: Jo moatte oanmelde of registrearje.
+      unconfirmed: Do moatst earst dyn account befêstigje.
+    mailer:
+      confirmation_instructions:
+        action: E-mailadres ferifiearje
+        action_with_app: Befêstigje en nei %{app} tebekgean
+        explanation: Do hast in account op %{host} oanmakke en mei ien klik kinsto dizze aktivearje. Wannear’tsto dit account net oanmakke hast, meisto dit e-mailberjocht negearje.
+        explanation_when_pending: Do fregest mei dit e-mailadres in útnûging oan foar %{host}. Neidatsto dyn e-mailadres befêstige hast, beoardielje wy dyn oanfraach. Do kinst oant dan noch net oanmelde. Wannear’t dyn oanfraach ôfwêzen wurdt, wurde dyn gegevens fuortsmiten en hoechsto dêrnei fierder neat mear te dwaan. Wannear’tsto dit net wiest, kinsto dit e-mailberjocht negearje.
+        extra_html: |-
+          128 / 5.000
+          Kontrolearje ek <a href="%{terms_path}">de regels fan de server</a> en <a href="%{policy_path}">ús tsjinstbetingsten</a>.
+        subject: 'Mastodon: Befêstigingsynstruksjes foar %{instance}'
+        title: E-mailadres ferifiearje
+      email_changed:
+        explanation: 'It e-mailadres foar jo account wurdt wizige yn:'
+        extra: As jo ​​jo e-mailadres net wizige hawwe, is it wierskynlik dat immen tagong hat ta jo account. Wizigje jo wachtwurd daliks of nim kontakt op mei de server-admin as jo útsletten binne fan jo account.
+        subject: 'Mastodon: E-mailadres is wizige'
+        title: Nij e-mailadres
+      password_change:
+        explanation: It wachtwurd fan dizze account is wizige.
+        extra: As jo ​​jo wachtwurd net wizige hawwe, is it wierskynlik dat immen tagong hat ta jo account. Wizigje jo wachtwurd daliks of nim kontakt op mei de serveradmin as jo útsletten binne fan jo account.
+        subject: 'Mastodon: Wachtwurd wizige'
+        title: Wachtwurd wizige
+      reconfirmation_instructions:
+        explanation: Befêstigje jo nije e-mailadres om dizze te wizigjen.
+        extra: Wannear’t jo dizze wiziging net útfierd hawwe, meie jo dit e-mailberjocht negearje. It e-mailadres fan jo Mastodon-account wurdt pas werklik wizige oant jo de keppeling hjirboppe oanklikke.
+        subject: 'Mastodon: Befêstigje it e-mailadres foar %{instance}'
+        title: E-mailadres ferifiearje
+      reset_password_instructions:
+        action: Wachtwurd wizigje
+        explanation: Jo hawwe in nij wachtwurd foar jo account oanfrege.
+        extra: Wannear’t jo dit net oanfrege hawwe, meie jo dit e-mailberjocht negearje. Jo wachtwurd wurdt pas wizige neidat jo de keppeling hjirboppe oanklikt hawwe en in nij wachtwurd oanmeitsje.
+        subject: 'Mastodon: Wachtwurd opnij ynstelle'
+        title: Wachtwurd opnij ynstelle
+      two_factor_disabled:
+        explanation: Twa-stapsferifikaasje foar jo account is útskeakele. Jo kinne no allinnich oanmelde mei in e-mailadres en wachtwurd.
+        subject: 'Mastodon: Twa-stapsferifikaasje útskeakele'
+        title: Twa-stapsferifikaasje útskeakele
+      two_factor_enabled:
+        explanation: Twa-stapsferifikaasje foar jo account is ynskeakele. Om oanmelde te kinnen is in troch in twa-stapsferifikaasje-app generearre tagongskoade nedich.
+        subject: 'Mastodon: Twa-stapsferifikaasje ynskeakele'
+        title: Twa-stapsferifikaasje ynskeakele
+      two_factor_recovery_codes_changed:
+        explanation: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
+        subject: 'Mastodon: Twa-staps-werstelkoaden binne opnij oanmakke'
+        title: Werstelkoaden twa-stapsferifikaasje wizige
+      unlock_instructions:
+        subject: 'Mastodon: Ynstruksjes foar ûntskoatteljen'
+      webauthn_credential:
+        added:
+          explanation: De folgjende befeiligingskaai is oan jo account tafoege
+          subject: 'Mastodon: Nije befeiligingskaai'
+          title: In nije befeiligingskaai is tafoege
+        deleted:
+          explanation: De folgjende befeiligingskaai is út jo account fuortsmiten
+          subject: 'Mastodon: Befeiligingskaai fuortsmiten'
+          title: Ien fan jo befeiligingskaaien is fuortsmiten
+      webauthn_disabled:
+        explanation: Ferifikaasje mei befeiligingskaaien is útskeakele foar jo account. Oanmelden is no allinnich mooglik mei it gebrûk fan in troch in keppele TOTP-app generearre kaai.
+        subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is útskeakele'
+        title: Befeiligingskaaien útskeakele
+      webauthn_enabled:
+        explanation: Ferifikaasje mei befeiligingskaaien is ynskeakele foar jo account. Jo befeiligingskaai kin no brûkt wurde om oan te melden.
+        subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is ynskeakele'
+        title: Befeiligingskaaien ynskeakele
+    omniauth_callbacks:
+      failure: Oanmelden mei jo %{kind}-account mislearre, omdat ‘%{reason}’.
+      success: Mei sukses mei jo %{kind}-account oanmeld.
+    passwords:
+      no_token: Jo kinne dizze side net benaderje sûnder dat jo in e-mailberjocht om jo wachtwurd opnij yn te stellen ûntfongen hawwe.
+      send_instructions: Jo ûntfange fia in e-mailberjocht ynstruksjes hoe’t jo jo wachtwurd opnij ynstelle moatte. Sjoch tusken jo net-winske wannear neat ûntfongen waard.
+      send_paranoid_instructions: Jo ûntfange fia in e-mailberjocht ynstruksjes hoe’t jo jo wachtwurd opnij ynstelle moatte. Sjoch tusken jo net-winske wannear neat ûntfongen waard.
+      updated: Jo wachtwurd is wizige. Jo binne no oanmeld.
+      updated_not_active: Jo wachtwurd is mei sukses wizige.
+    registrations:
+      destroyed: Jo account is mei sukses fuortsmiten. Miskien oant sjen.
+      signed_up: Jo binne registrearre.
+      signed_up_but_inactive: Jo binne registrearre. Jo koene allinnich net automatysk oanmeld wurde, omdat jo account noch net aktivearre is.
+      signed_up_but_locked: Jo binne registrearre. Jo koene allinnich net automatysk oanmeld wurde, omdat jo account beskoattele is.
+      signed_up_but_pending: Der is in berjocht mei in befêstigingskeppeling nei jo e-mailadres ferstjoerd. Neidat jo op dizze keppeling klikt hawwe nimme wy jo oanfraach yn behanneling. Jo wurde op de hichte steld wannear’t dizze goedkard wurdt.
+      signed_up_but_unconfirmed: Jo ûntfange fia in e-mailberjocht ynstruksjes hoe’t jo jo account aktivearje kinne. Sjoch tusken jo net-winske wannear’t neat ûntfongen waard.
+      update_needs_confirmation: Jo hawwe jo e-mailadres mei sukses wizige, mar wy moatte jo nije e-mailadres noch befêstigje. Kontrolearje jo Postfek YN en klik op de keppeling yn it e-mailberjocht om jo e-mailadres te befêstigjen. Sjoch tusken jo net-winske wannear’t neat ûntfongen waard.
+      updated: Jo accountgegevens binne bewarre.
+    sessions:
+      already_signed_out: Mei sukses ôfmeld.
+      signed_in: Mei sukses oanmeld.
+      signed_out: Mei sukses ôfmeld.
+    unlocks:
+      send_instructions: Jo ûntfange fia in e-mailberjocht ynstruksjes hoe’t jo jo account ûntskoattelje kinne. Sjoch yn de map net-winske wannear’t neat ûntfongen waard.
+      send_paranoid_instructions: As jo account bestiet, ûntfange jo fia in e-mailberjocht ynstruksjes hoe’t jo jo account ûntskoattelje kinne. Sjoch yn de map net-winske wannear’t neat ûntfongen waard.
+      unlocked: Jo account is net mear beskoattele. Jo kinne no wer oanmelde.
+  errors:
+    messages:
+      already_confirmed: is al befêstige
+      confirmation_period_expired: moat befêstige wurde binnen %{period}, probearje it nochris
+      expired: is ferrûn, freegje in nije oan
+      not_found: net fûn
+      not_locked: is net beskoattele
+      not_saved:
+        one: '1 flater ferhindere it bewarjen fan dizze %{resource}:'
+        other: "%{count} flaters ferhinderje it bewarjen fan dizze %{resource}:"
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
new file mode 100644
index 000000000..6a8e0ec75
--- /dev/null
+++ b/config/locales/devise.ga.yml
@@ -0,0 +1,9 @@
+---
+ga:
+  devise:
+    mailer:
+      reset_password_instructions:
+        action: Athraigh pasfhocal
+  errors:
+    messages:
+      not_found: níor aimsíodh é
diff --git a/config/locales/devise.gd.yml b/config/locales/devise.gd.yml
index 7b0f0a7bc..c8a34054c 100644
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@@ -92,8 +92,8 @@ gd:
       signed_up_but_inactive: Tha thu air clàradh leinn. Gidheadh, chan urrainn dhuinn do clàradh a-steach air sgàth ’s nach deach an cunntas agad a ghnìomhachadh fhathast.
       signed_up_but_locked: Tha thu air clàradh leinn. Gidheadh, chan urrainn dhuinn do clàradh a-steach air sgàth ’s gu bheil an cunntas agad glaiste.
       signed_up_but_pending: Chaidh teachdaireachd le ceangal dearbhaidh a chur dhan t-seòladh puist-d agad. Nuair a bhios tu air briogadh air a’ cheangal, nì sinn lèirmheas air d’ iarrtas. Leigidh sinn fios dhut ma thèid aontachadh ris.
-      signed_up_but_unconfirmed: Chaidh teachdaireachd le ceangal dearbhaidh a chur dhan t-seòladh puist-d agad. Lean ris a’ cheangal ud a ghnìomhachadh a’ chunntais agad. Thoir sùil air pasgan an spama agad mura faigh thu am post-d seo.
-      update_needs_confirmation: Chaidh an cunntas agad ùrachadh ach feumaidh sinn an seòladh puist-d ùr agad a dhearbhadh. Thoir sùil air a’ phost-d agad agus lean ris a’ cheangal dearbhaidh a dhearbhadh an t-seòlaidh puist-d ùir agad. Thoir sùil air pasgan an spama agad mura faigh thu am post-d seo.
+      signed_up_but_unconfirmed: Chaidh teachdaireachd le ceangal dearbhaidh a chur dhan t-seòladh puist-d agad. Lean air a’ cheangal ud a ghnìomhachadh a’ chunntais agad. Thoir sùil air pasgan an spama agad mura faigh thu am post-d seo.
+      update_needs_confirmation: Chaidh an cunntas agad ùrachadh ach feumaidh sinn an seòladh puist-d ùr agad a dhearbhadh. Thoir sùil air a’ phost-d agad agus lean air a’ cheangal dearbhaidh a dhearbhadh an t-seòlaidh puist-d ùir agad. Thoir sùil air pasgan an spama agad mura faigh thu am post-d seo.
       updated: Chaidh an cunntas agad ùrachadh.
     sessions:
       already_signed_out: Chaidh do chlàradh a-mach.
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index 6c8718f28..96ebb68c3 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -78,7 +78,7 @@ gl:
         subject: 'Mastodon: Autenticación con chave de seguridade activada'
         title: Chaves de seguridade activas
     omniauth_callbacks:
-      failure: Non foi posíbel autenticar %{kind} porque "%{reason}".
+      failure: Non foi posible autenticarte desde %{kind} debido a "%{reason}".
       success: Autenticado con éxito na conta %{kind}.
     passwords:
       no_token: Non podes acceder a esta páxina se non vés a través da ligazón enviada por email para o mudado do teu contrasinal. Se empregaches esa ligazón para chegar aquí, por favor verifica que o enderezo URL actual é o mesmo do que foi enviado no email.
@@ -91,8 +91,8 @@ gl:
       signed_up: Benvido! Rexistrácheste de xeito correcto.
       signed_up_but_inactive: A túa conta foi rexistada. Porén aínda non está activada.
       signed_up_but_locked: A túa conta foi rexistada. Porén está bloqueada.
-      signed_up_but_pending: Unha mensaxe cunha ligazón de confirmación foi enviada ó teu enderezo de email. Após premer na ligazón, revisaremos a túa aplicación. Serás notificado se a túa conta é aprobada.
-      signed_up_but_unconfirmed: Unha mensaxe cunha ligazón de confirmación foi enviada ó teu email. Por favor, segue esa ligazón para activar a túa conta. Comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
+      signed_up_but_pending: Acabamos de enviar unha mensaxe ao teu email cunha ligazón de confirmación. Após premer na ligazón, revisaremos a túa solicitude. Recibirás unha notificación se a túa conta é aprobada.
+      signed_up_but_unconfirmed: Enviouse unha mensaxe cunha ligazón de confirmación ao teu email. Por favor, preme nesa ligazón para activar a túa conta. Comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
       update_needs_confirmation: Actualizaches a túa conta de xeito correcto, pero precisamos verificar o teu novo enderezo de email. Por favor, revisa o teu email e segue a ligazón para confirmar o teu novo enderezo de email. Comproba o teu cartafol de correo lixo (spam) se ves que non recibiches o correo.
       updated: A túa conta foi actualizada de xeito correcto.
     sessions:
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index be8af6f9e..0f389bd38 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -2,8 +2,8 @@
 he:
   devise:
     confirmations:
-      confirmed: כתובת הדוא"ל אומתה בהצלחה.
-      send_instructions: נשלח אליך דוא"ל עם הוראות לאימות כתובת הדוא"ל שאמור להתקבל בדקות הקרובות. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
+      confirmed: כתובת הדוא"ל שלך אומתה בהצלחה.
+      send_instructions: נשלח אליך דוא"ל עם הוראות לאימות כתובת הדוא"ל שאמור להתקבל בדקות הקרובות. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה.
       send_paranoid_instructions: אם כתובת הדוא"ל שלך קיימת במסד הנתונים, יתקבל בדקות הקרובות דוא"ל עם הוראות לאימות כתובתך. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
     failure:
       already_authenticated: חשבון זה כבר מחובר.
@@ -12,18 +12,71 @@ he:
       last_attempt: יש לך עוד ניסיון אחד לפני נעילת החשבון.
       locked: חשבון זה נעול.
       not_found_in_database: "%{authentication_keys} או סיסמא לא נכונים."
+      pending: חשבונך נמצא עדיין בבדיקה.
       timeout: פג תוקף השהיה בחשבון. נא להכנס מחדש על מנת להמשיך.
       unauthenticated: יש להרשם או להכנס לחשבון על מנת להמשיך.
       unconfirmed: יש לאמת את כתובת הדוא"ל על מנת להמשיך.
     mailer:
       confirmation_instructions:
+        action: אימות כתובת דוא״ל
+        action_with_app: אישור וחזרה ל-%{app}
+        explanation: יצרת חשבון ב-%{host} עם כתובת דוא"ל זו. רק קליק יחיד נותר כדי להפעילו. אם לא את/ה יצרת את החשבון, בבקשה התעלם/י מהדוא"ל הזה.
+        explanation_when_pending: הוגשה בקשה להזמנה ל-%{host} עם כתובת דוא"ל זו. ברגע שתאשר/י את כתובת הדוא"ל נבחן את בקשתך. ניתן להכנס לאתר על מנת לשנות פרטים או למחוק את החשבון, אבל לא ניתן לגשת לרוב הפעילויות לפני שהחשבון יאושר. אם בקשתך תדחה, המידע שלך יימחק ולא יידרש ממך כל פעולה נוספת. אם בקשה זו לא הגיעה ממך, אנא התעלם/י מדוא"ל זה.
+        extra_html: בנוסף, אנא עיין/י ב<a href="%{terms_path}">חוקי השרת</a> וב<a href="%{policy_path}">תנאי השירות</a>.
         subject: 'מסטודון: הוראות אימות %{instance}'
+        title: אימות כתובת דוא״ל
+      email_changed:
+        explanation: 'כתובת הדוא"ל של חשבונך שונתה ל:'
+        extra: אם לא שינית את כתובת הדוא"ל שלך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
+        subject: 'מסטודון: כתובת הדוא"ל שונתה'
+        title: כתובת דוא״ל חדשה
       password_change:
+        explanation: הסיסמא לחשבונך שונתה.
+        extra: אם לא שינית את סיסמתך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
         subject: 'מסטודון: הסיסמא שונתה'
+        title: הסיסמא שונתה
+      reconfirmation_instructions:
+        explanation: נא לאמת את הכתובת הדוא"ל החדשה על מנת לשנותה.
+        extra: אם שינוי זה לא בוצע על ידך, נא להתעלם מדוא"ל זה. כתובת הדוא"ל של חשבון המסטודון שלך לא תשונה אלא אם תלחץ הקישורית לעיל.
+        subject: 'מסטודון: נא לאשר כתובת דוא"ל עבור %{instance}'
+        title: אימות כתובת דוא״ל
       reset_password_instructions:
+        action: שינוי סיסמא
+        explanation: ביקשת סיסמא חדשה לחשבון.
+        extra: אם לא ביקשת את זה, נא להתעלם מדוא"ל זה. סיסמתך לא תשתנה עוד שתלחץ הקישורית לעיל ותיוצר סיסמא חדשה.
         subject: 'מסטודון: הוראות לאיפוס סיסמא'
+        title: איפוס סיסמה
+      two_factor_disabled:
+        explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+        subject: 'מסטודון: אימות דו גורמי מושבת'
+        title: אימות דו-גורמי הושעה
+      two_factor_enabled:
+        explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+        subject: 'מסטודון: אימות דו גורמי הופעל'
+        title: אימות דו־גורמי הופעל
+      two_factor_recovery_codes_changed:
+        explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
+        subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+        title: צפני אחזור דו-גורמי השתנו
       unlock_instructions:
         subject: 'מסטודון: הוראות לביטול נעילה'
+      webauthn_credential:
+        added:
+          explanation: מפתח האבטחה הבא הוסף לחשבונך
+          subject: 'מסטודון: מפתח אבטחה חדש'
+          title: מפתח אבטחה חדש הוסף
+        deleted:
+          explanation: מפתח האבטחה הבא נמחק מחשבונך
+          subject: 'מסטודון: מפתח האבטחה נמחק'
+          title: אחד ממפתחות האבטחה שלך נמחק
+      webauthn_disabled:
+        explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+        subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
+        title: מפתחות אבטחה הושעו
+      webauthn_enabled:
+        explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+        subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
+        title: מפתחות אבטחה אופשרו
     omniauth_callbacks:
       failure: 'לא ניתן לאמת את חשבונך מ־%{kind} מהסיבה: "%{reason}".'
       success: נכשל אימות מחשבון %{kind}.
@@ -38,6 +91,7 @@ he:
       signed_up: ברוכים הבאים! נרשמת בהצלחה.
       signed_up_but_inactive: נרשמת בהצלחה. למרות זאת לא הצליחה הכניסה לחשבון מאחר וחשבונך עוד לא הופעל.
       signed_up_but_locked: נרשמת בהצלחה. למרות זאת לא הצליחה הכניסה לחשבון מאחר וחשבונך נעול.
+      signed_up_but_pending: מסר עם קישורית אישור נשלח לכתובת הדוא"ל שלך. אחרי לחיצה על הקישורית, נבחן את בקשתך. הודעה תמסר אם בקשתך תתקבל.
       signed_up_but_unconfirmed: דוא"ל עם קישורית לאימות נשלך לכתובתך. נא לעקוב אחר הקישורית על מנת להפעיל את החשבון. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       update_needs_confirmation: עדכת את חשבונך בהצלחה, אך יש צורך לאמת את כתובת הדוא"ל החדשה שלך. נא לבדוק בחשבון הדוא"ל לקבלת קישורית אימות על מנת לאמת את הכתובת החדשה. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       updated: חשבונך עודכן בהצלחה.
@@ -56,3 +110,8 @@ he:
       expired: פג תוקפו. נא לבקש חדש
       not_found: לא נמצא
       not_locked: לא היה נעול
+      not_saved:
+        many: "%{count} שגיאות מנעו מ%{resource} זה מלהשמר:"
+        one: 'שגיאה אחת מנעה מ%{resource} זה מלהשמר:'
+        other: "%{count} שגיאות מנעו מ%{resource} זה מלהשמר:"
+        two: " %{count} שגיאות מנעו מ%{resource} זה מלהשמר:"
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 24aa076ee..ddadd1789 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -12,7 +12,7 @@ hu:
       last_attempt: Már csak egy próbálkozásod maradt, mielőtt a fiókodat zároljuk.
       locked: A fiókodat zároltuk.
       not_found_in_database: Helytelen %{authentication_keys} vagy jelszó.
-      pending: A fiókod felülvizsgálat alatt áll, még mielőtt használhatnád.
+      pending: A fiókod még engedélyezésre vár.
       timeout: A munkameneted lejárt. Kérjük, a folytatáshoz jelentkezz be újra.
       unauthenticated: A folytatás előtt be kell jelentkezned vagy regisztrálnod kell.
       unconfirmed: A folytatás előtt meg kell erősítened az e-mail címed.
@@ -22,7 +22,7 @@ hu:
         action_with_app: Megerősítés majd vissza ide %{app}
         explanation: Ezzel az e-mail címmel kezdeményeztek regisztrációt a(z) %{host} oldalon. Csak egy kattintás, és a felhasználói fiókodat aktiváljuk. Ha a regisztrációt nem te kezdeményezted, kérjük tekintsd ezt az e-mailt tárgytalannak.
         explanation_when_pending: Ezzel az e-mail címmel meghívást kértél a(z) %{host} oldalon. Ahogy megerősíted az e-mail címed, átnézzük a jelentkezésedet. Ennek ideje alatt nem tudsz belépni. Ha a jelentkezésed elutasítjuk, az adataidat töröljük, más teendőd nincs. Ha a kérelmet nem te kezdeményezted, kérjük tekintsd ezt az e-mailt tárgytalannak.
-        extra_html: Kérjük tekintsd át a <a href="%{terms_path}">a szerver szabályzatát</a> és <a href="%{policy_path}">a felhasználási feltételeket</a>.
+        extra_html: Tekintsd át a <a href="%{terms_path}">a kiszolgáló szabályait</a> és <a href="%{policy_path}">a felhasználási feltételeket</a>.
         subject: 'Mastodon: Megerősítési lépések ehhez az instancehez: %{instance}'
         title: E-mail cím megerősítése
       email_changed:
@@ -32,7 +32,7 @@ hu:
         title: Új e-mail cím
       password_change:
         explanation: A fiókodhoz tartozó jelszót megváltoztattuk.
-        extra: Ha nem te kezdeményezted a fiókodhoz tartozó jelszó módosítását, valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot a szervered adminisztrátorával.
+        extra: Ha nem te kérted a fiókod jelszavának módosítását, akkor valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot a kiszolgálód adminisztrátorával.
         subject: 'Mastodon: Jelszavad megváltoztattuk'
         title: Sikeres jelszómódosítás
       reconfirmation_instructions:
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index 2a75385e9..2d235c0af 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -3,7 +3,7 @@ hy:
   devise:
     confirmations:
       confirmed: Ձեր էլ․ փոստի հասցէն յաջողութեամբ հաստատուեց։
-      send_instructions: Մի քանի րոպէից դու կը ստանաս իմակ՝ նկարագրութիւններով, թէ ինչպէս հաստատես էլ․ հասցէդ։ Խնդրում ենք, ստուգիր սպամ պանակդ, եթէ չստանաս իմակ։
+      send_instructions: Մի քանի րոպէից դու կը ստանաս էլ. նամակ՝ նկարագրութիւններով, թէ ինչպէս հաստատես էլ․ հասցէդ։ Եթե չստանաս, խնդրում ենք ստուգիր նաեւ սպամ պանակդ։
       send_paranoid_instructions: Եթե ձեր էլ․փոստի հասցեն արդեն կա մեր տվյալների բազայում, ապա մենք ուղարկել ենք Ձեզ էլ․նամակ՝ նկարագրությունով, թե ինչպես հաստատեք էլ․փոստը մի քանի վայրկյանում։ Ստուգե ձեր թափոն թղթապանակը, եթե նամակ չեք ստացել։
     failure:
       already_authenticated: Արդէն մուտք ես գործել
diff --git a/config/locales/devise.ig.yml b/config/locales/devise.ig.yml
new file mode 100644
index 000000000..7c264f0d7
--- /dev/null
+++ b/config/locales/devise.ig.yml
@@ -0,0 +1 @@
+ig:
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index fce061a65..7d5668c92 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -12,18 +12,71 @@ io:
       last_attempt: Tu ankore povas probar unfoye ante ke tua konto esos extingita.
       locked: Tua konto esas extingita.
       not_found_in_database: Nejusta %{authentication_keys}.
+      pending: Vua konti ankore kontrolesas.
       timeout: Tua kunsido expiris. Voluntez rienirar por durar.
       unauthenticated: Tu devas enirar o membreskar por durar.
       unconfirmed: Tu devas konfirmar tua konto por durar.
     mailer:
       confirmation_instructions:
+        action: Verifikez retpostadreso
+        action_with_app: Konfirmez e retrovenez a %{app}
+        explanation: Vu kreis konto che %{host} per ca retpostadreso. Vu povas facile aktivigar lu. Se vu ne agis lu, ignorez ca retposto.
+        explanation_when_pending: Vu aplikis por ganar invito a %{host} per ca retpostkonto. Pos vu konfirmas vua retpostkonto, ni kontrolos vua apliko. Vu povas enirar por chanjar vua detali o efacar vua konto, ma vu ne povas acesar maxim de funcioni til vua konto aprobesas. Se vua apliko refuzesas, vua informi efacesos, do plusa ago ne bezonesos de vu. Se vu ne agis lu, ignorez ca retposto.
+        extra_html: Anke videz <a href="%{terms_path}">reguli di la servilo</a> e <a href="%{policy_path}">nia servokondicioni</a>.
         subject: Instrucioni por konfirmar %{instance}
+        title: Verifikez retpostadreso
+      email_changed:
+        explanation: 'Retpostadreso di vua konto chanjesas a:'
+        extra: Se vu ne chanjesis vua retpostadreso, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
+        subject: 'Mastodon: Retpostadreso chanjesis'
+        title: Nova retpostadreso
       password_change:
+        explanation: La pasvorto di vua konto chanjesis.
+        extra: Se vu ne chanjesis vua pasvorto, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
         subject: Tua pasvorto chanjesis senprobleme.
+        title: Pasvorto chanjesis
+      reconfirmation_instructions:
+        explanation: Konfirmez la nova adreso por chanjar vua retpostadreso.
+        extra: Se ca chanjo ne komencesis da vu, ignorez ca retposto. La retpostadreso por konto di Mastodon ne chanjesos til vu acesas la supera ligilo.
+        subject: 'Mastodon: Konfirmez retpostadreso por %{instance}'
+        title: Verifikez retpostadreso
       reset_password_instructions:
+        action: Chanjez pasvorto
+        explanation: Vu demandis nova pasvorto por vua konto.
+        extra: Se vu ne demandas co, ignorez ca retposto. Vua pasvorto ne chanjesas til vu acesas la supera ligilo e kreas novo.
         subject: Instrucioni por chanjar la pasvorto
+        title: Richanjo di pasvorto
+      two_factor_disabled:
+        explanation: 2-faktorverifiko por vua konto deaktivigesis. Eniro esas nun posible per nur retpostadreso e pasvorto.
+        subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
+        title: 2FA deaktivigesis
+      two_factor_enabled:
+        explanation: 2-faktorverifiko aktivigesis por vua konto. Fisho quo facesis da parigita softwaro TOTP bezonesos por eniro.
+        subject: 'Mastodon: 2-faktorverifiko aktivigesis'
+        title: 2FA aktivigesis
+      two_factor_recovery_codes_changed:
+        explanation: Antea rigankodexi devalidesis e novo facesis.
+        subject: 'Mastodon: 2-faktorrigankodexi rifacesis'
+        title: 2FA-rigankodexi chanjesis
       unlock_instructions:
         subject: Instructioni por riacendar la konto
+      webauthn_credential:
+        added:
+          explanation: Ca sekurklefo insertesis a vua konto
+          subject: 'Mastodon: Nova sekurklefo'
+          title: Nova sekurklefo insertesis
+        deleted:
+          explanation: Ca sekurklefo efacesis de vua konto
+          subject: 'Mastodon: Sekurklefo efacesis'
+          title: 1 de vua sekurklefi efacesis
+      webauthn_disabled:
+        explanation: Verifiko per sekurklefi deaktivigesis por vua konto. Eniro nun esas posibla per nur ficho quo facesis da parita softwaro TOTP.
+        subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
+        title: Sekurklefi deaktivigesis
+      webauthn_enabled:
+        explanation: Sekurklefverifiko aktivigesis por vua konto. Vua sekurklefo nun povas uzesar por eniro.
+        subject: 'Mastodon: Sekurklefverifiko aktivigesis'
+        title: Sekurklefi aktivigesis
     omniauth_callbacks:
       failure: 'Ni ne povis autentikigar tu per %{kind}: ''%{reason}''.'
       success: Autentikigita senprobleme per %{kind}.
@@ -31,12 +84,14 @@ io:
       no_token: Tu ne povas irar a ta pagino per altra voyo kam retpost-mesajo por chanjar pasvorto. Se tu venas de tala retpost-mesajo, kontrolez ke tu uzis la tota URL.
       send_instructions: Tu recevos retpost-mesajo kun instrucioni por chanjar tua pasvorto pos kelka minuti.
       send_paranoid_instructions: Se tua retpost-adreso existas en nia datumbazo, tu recevos ligilo por chanjar tua pasvorto per retpost-mesajo.
+      updated: Vua konto sucese chanjesis. Vu nun eniras.
       updated_not_active: Tua pasvorto redaktesis senprobleme.
     registrations:
       destroyed: Til! Tua konto efacesis senprobleme. Ni esperas rividar tu balde.
       signed_up: Bonveno! Tu membreskis senprobleme.
       signed_up_but_inactive: Tu bone membreskis, ma tu ankore ne povas enirar pro ke tua konto ne konfirmesis.
       signed_up_but_locked: Tu bone membreskis, ma tu ne povas enirar pro ke tua konto extingesis.
+      signed_up_but_pending: Mesajo kun konfirmoligilo sendesis a vua retpostadreso. Pos vu kliktas la ligilo, ni kontrolos vua apliko. Vu notifikesos se ol aprobesas.
       signed_up_but_unconfirmed: Retpost-mesajo kun tua ligilo por konfirmar tua konto sendesis a tua retpost-adreso. Voluntez uzar ta ligilo por konfirmar tua konto.
       update_needs_confirmation: Tu vone aktualigis tua konto, ma ni bezonas kontrolar tua nova retpost-adreso. Voluntez kontrolar tua retpost-mesaji ed uzar la ligilo por konfirmar tua nova retpost-adreso.
       updated: Tua konto aktualigesis senprobleme.
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 53e8169e4..5ea3aeac4 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -3,113 +3,113 @@ it:
   devise:
     confirmations:
       confirmed: Il tuo indirizzo email è stato confermato con successo.
-      send_instructions: Riceverai in pochi minuti una email con istruzioni per confermare il tuo account al tuo indirizzo email.
-      send_paranoid_instructions: Se il tuo indirizzo email è presente nel nostro database, riceverai in pochi minuti una email con istruzioni per confermare il tuo account al tuo indirizzo email.
+      send_instructions: Riceverai un'email con le istruzioni per confermare il tuo indirizzo email in pochi minuti. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      send_paranoid_instructions: Se il tuo indirizzo email esiste nel nostro database, riceverai un'email con le istruzioni su come confermare il tuo indirizzo email in pochi minuti. Sei pregato di controllare la tua cartella dello spam se non hai ricevuto quest'email.
     failure:
-      already_authenticated: Hai già effettuato l'accesso.
-      inactive: Non hai ancora attivato il tuo account.
+      already_authenticated: Sei già connesso.
+      inactive: Il tuo profilo non è ancora attivo.
       invalid: "%{authentication_keys} o password non valida."
-      last_attempt: Hai un altro tentativo prima che il tuo account venga bloccato.
-      locked: Il tuo account è stato bloccato.
+      last_attempt: Hai un altro tentativo, prima che il tuo profilo venga bloccato.
+      locked: Il tuo profilo è bloccato.
       not_found_in_database: "%{authentication_keys} o password non valida."
-      pending: Il tuo account è ancora in fase di approvazione.
-      timeout: La tua sessione è terminata. Per favore, effettua l'accesso o registrati per continuare.
-      unauthenticated: Devi effettuare l'accesso o registrarti per continuare.
-      unconfirmed: Devi confermare il tuo indirizzo email per continuare.
+      pending: Il tuo profilo è ancora in revisione.
+      timeout: La tua sessione è scaduta. Sei pregato di accedere nuovamente per continuare.
+      unauthenticated: Devi accedere o registrarti, per continuare.
+      unconfirmed: Devi confermare il tuo indirizzo email prima di continuare.
     mailer:
       confirmation_instructions:
-        action: Verifica indirizzo email
+        action: Verifica l'indirizzo email
         action_with_app: Conferma e torna a %{app}
         explanation: Hai creato un account su %{host} con questo indirizzo email. Sei lontano solo un clic dall'attivarlo. Se non sei stato tu, per favore ignora questa email.
-        explanation_when_pending: Hai richiesto un invito a %{host} con questo indirizzo email. Una volta confermato il tuo indirizzo e-mail, analizzeremo la tua richiesta. Non potrai eseguire l'accesso fino a quel momento. Se la tua richiesta sarà rifiutata, i tuoi dati saranno rimossi, quindi nessun'altra azione ti sarà richiesta. Se non fossi stato tu, per favore ignora questa email.
-        extra_html: Per favore controlla<a href="%{terms_path}">le regole del server</a> e <a href="%{policy_path}">i nostri termini di servizio</a>.
+        explanation_when_pending: Hai richiesto un invito a %{host} con questo indirizzo email. Una volta confermato, revisioneremo la tua richiesta. Puoi accedere per modificare i tuoi dettagli o eliminare il tuo profilo, ma non puoi accedere a gran parte delle funzioni finché il tuo profilo non è approvato. Se la tua richiesta viene rifiutata, i tuoi dati saranno rimossi e non ti sarà richiesta alcuna ulteriore azione. Se non sei stato tu, sei pregato di ignorare quest'email.
+        extra_html: Sei anche pregato di dare un'occhiata <a href="%{terms_path}">alle regole del server</a> e <a href="%{policy_path}">ai nostri termini di servizio</a>.
         subject: 'Mastodon: Istruzioni di conferma per %{instance}'
-        title: Verifica indirizzo email
+        title: Verifica l'indirizzo email
       email_changed:
-        explanation: 'L''indirizzo email del tuo account sta per essere cambiato in:'
-        extra: Se non hai cambiato la tua email, è probabile che qualcuno abbia ottenuto l'accesso al tuo account. Cambia immediatamente la tua password e contatta l'amministratore del server se non puoi più accedere al tuo account.
+        explanation: 'L''indirizzo email per il tuo profilo sarà modificato in:'
+        extra: Se non hai cambiato la tua email, è probabile che qualcuno abbia ottenuto l'accesso al tuo profilo. Sei pregato di cambiare immediatamente la tua password o di contattare l'admin del server, se non riesci più ad accedere al tuo profilo.
         subject: 'Mastodon: Email cambiata'
         title: Nuovo indirizzo email
       password_change:
-        explanation: La password del tuo account è stata cambiata.
-        extra: Se non hai cambiato la password, è probabile che qualcuno abbia ottenuto l'accesso al tuo account. Cambia immediatamente la tua password e contatta l'amministratore del server se non puoi più accedere al tuo account.
-        subject: 'Mastodon: Password modificata'
+        explanation: La password del tuo profilo è stata cambiata.
+        extra: Se non hai cambiato la tua password, è probabile che qualcuno abbia ottenuto l'accesso al tuo profilo. Sei pregato di cambiarla immediatamente o di contattare l'admin del server, se non riesci più ad accedere al tuo profilo.
+        subject: 'Mastodon: Password cambiata'
         title: Password cambiata
       reconfirmation_instructions:
         explanation: Conferma il nuovo indirizzo per cambiare la tua email.
-        extra: Se questo cambiamento non è stato chiesto da te, ignora questa email. L'indirizzo email per l'account Mastodon non verrà cambiato finché non accedi dal link qui sopra.
+        extra: Se questa modifica non è stata avviata da te, sei pregato di ignorare quest'email. L'indirizzo email per il profilo di Mastodon non cambierà finché non accedrai al link sopra.
         subject: 'Mastodon: Email di conferma per %{instance}'
-        title: Verifica indirizzo email
+        title: Verifica l'indirizzo email
       reset_password_instructions:
-        action: Cambia password
-        explanation: Hai richiesto una nuova password per il tuo account.
-        extra: Se questo cambiamento non è stato chiesto da te, ignora questa email. La tua password non verrà cambiata finché non accedi tramite il link qui sopra e ne crei una nuova.
-        subject: 'Mastodon: Istruzioni per il reset della password'
-        title: Ripristino password
+        action: Modifica la password
+        explanation: Hai richiesto una nuova password per il tuo profilo.
+        extra: Se non lo hai richiesto, sei pregato di ignorare quest'email. La tua password non cambierà finché non accedrai al link riportato sopra e ne creerai una nuova.
+        subject: 'Mastodon: Istruzioni di ripristino della password'
+        title: Ripristino della password
       two_factor_disabled:
-        explanation: L'autenticazione a due fattori per il tuo account è stata disattivata. Il login è ora possibile utilizzando solo l'indirizzo e-mail e la password.
-        subject: 'Mastodon: Autenticazione a due fattori disattivata'
-        title: 2FA disabilitata
+        explanation: L'autenticazione a due fattori per il tuo profilo è stata disabilitata. L'accesso è ora possibile utilizzando solo l'indirizzo email e la password.
+        subject: 'Mastodon: Autenticazione a due fattori disabilitata'
+        title: A2F disabilitata
       two_factor_enabled:
-        explanation: L'autenticazione a due fattori è stata attivata per il tuo account. Un token generato dall'app TOTP collegata sarà richiesto per il login.
-        subject: 'Mastodon: Autenticazione a due fattori attivata'
-        title: 2FA abilitata
+        explanation: L'autenticazione a due fattori è stata abilitata per il tuo profilo. Un token, generato dall'app TOTP collegata, sarà richiesto per l'accesso.
+        subject: 'Mastodon: Autenticazione a due fattori abilitata'
+        title: A2F abilitata
       two_factor_recovery_codes_changed:
-        explanation: I precedenti codici di recupero sono stati annullati e ne sono stati generati di nuovi.
-        subject: 'Mastodon: codici di recupero a due fattori ri-generati'
-        title: Codici di recupero 2FA modificati
+        explanation: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
+        subject: 'Mastodon: Codici di recupero a due fattori rigenerati'
+        title: Codici di recupero A2F cambiati
       unlock_instructions:
         subject: 'Mastodon: Istruzioni di sblocco'
       webauthn_credential:
         added:
-          explanation: La seguente chiave di sicurezza è stata aggiunta al tuo account
+          explanation: La seguente chiave di sicurezza è stata aggiunta al tuo profilo
           subject: 'Mastodon: Nuova chiave di sicurezza'
-          title: È stata aggiunta una nuova chiave di sicurezza
+          title: Una nuova chiave di sicurezza è stata aggiunta
         deleted:
-          explanation: La seguente chiave di sicurezza è stata cancellata dal tuo account
-          subject: 'Mastodon: Chiave di sicurezza cancellata'
-          title: Una delle tue chiavi di sicurezza è stata cancellata
+          explanation: La seguente chiave di sicurezza è stata eliminata dal tuo profilo
+          subject: 'Mastodon: Chiave di sicurezza eliminata'
+          title: Una delle tue chiavi di sicurezza è stata eliminata
       webauthn_disabled:
-        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo account. L'accesso è ora possibile utilizzando solo il codice generato dall'app TOTP abbinata.
+        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo profilo. L'accesso è ora possibile utilizzando solo il token, generato dall'app TOTP associata.
         subject: 'Mastodon: Autenticazione con chiavi di sicurezza disabilitata'
-        title: Chiavi di sicurezza disattivate
+        title: Chiavi di sicurezza disabilitate
       webauthn_enabled:
-        explanation: L'autenticazione con chiave di sicurezza è stata attivata per il tuo account. La chiave di sicurezza può ora essere utilizzata per l'accesso.
-        subject: 'Mastodon: Autenticazione della chiave di sicurezza abilitata'
-        title: Chiave di sicurezza abilitata
+        explanation: L'autenticazione con chiavi di sicurezza è stata abilitata per il tuo profilo. La tua chiave di sicurezza è ora utilizzabile per l'accesso.
+        subject: 'Mastodon: Autenticazione con chiavi di sicurezza abilitata'
+        title: Chiavi di sicurezza abilitate
     omniauth_callbacks:
       failure: Impossibile autenticarti da %{kind} perché "%{reason}".
-      success: Autenticato con successo con account %{kind}.
+      success: Autenticato correttamente dal profilo %{kind}.
     passwords:
-      no_token: Non puoi accedere a questa pagina senza essere stato reindirizzato da una mail di reset password. Se arrivi da una mail di reset password, per favore controlla di aver copiato per intero l'URL fornito.
-      send_instructions: Se la tua mail è presente nel nostro database, riceverai in pochi minuti un link per recuperare la tua password al tuo indirizzo mail.
-      send_paranoid_instructions: Se la tua mail è presente nel nostro database, riceverai in pochi minuti un link per recuperare la tua password al tuo indirizzo mail.
-      updated: La tua password è stata modificata con successo. Abbiamo già effettuato l'accesso per te.
-      updated_not_active: La tua password è stata modificata con successo.
+      no_token: Non puoi accedere a questa pagina senza provenire da un'email di ripristino della password. Se provieni da un'email di ripristino della password, sei pregato di assicurarti di aver utilizzato l'URL completo fornito.
+      send_instructions: Se il tuo indirizzo email esiste nel nostro database, riceverai un link di recupero della password al tuo indirizzo email in pochi minuti. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      send_paranoid_instructions: Se il tuo indirizzo email esiste nel nostro database, riceverai un link di recupero della password al tuo indirizzo email, in pochi minuti. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      updated: La tua password è stata modificata correttamente. Sei ora connesso.
+      updated_not_active: La tua password è stata modificata correttamente.
     registrations:
-      destroyed: Addio! Il tuo account è stato cancellato. Speriamo di rivederti presto.
+      destroyed: Addio! Il tuo profilo è stato eliminato correttamente. Speriamo di rivederti presto.
       signed_up: Benvenuto! Ti sei registrato con successo.
-      signed_up_but_inactive: Ti sei registrato con successo. Purtroppo però non possiamo farti accedere perché non hai ancora attivato il tuo account.
-      signed_up_but_locked: Ti sei registrato con successo. Purtroppo però non possiamo farti accedere perché il tuo account è bloccato.
-      signed_up_but_pending: Un messaggio con un collegamento per la conferma è stato inviato al tuo indirizzo email. Dopo aver cliccato il collegamento, esamineremo la tua richiesta. Ti sarà notificato se verrà approvata.
-      signed_up_but_unconfirmed: Un messaggio con un link di conferma è stato inviato al tuo indirizzo email. Per favore, visita il link per attivare il tuo account.
-      update_needs_confirmation: Hai aggiornato correttamente il tuo account, ma abbiamo bisogno di verificare il tuo nuovo indirizzo email. Per favore, controlla la posta in arrivo e visita il link di conferma per verificare il tuo indirizzo email.
-      updated: Il tuo account è stato aggiornato con successo.
+      signed_up_but_inactive: Ti sei registrato con successo. Tuttavia, non siamo riusciti a farti accedere perché il tuo profilo non è ancora stato attivato.
+      signed_up_but_locked: Ti sei registrato con successo. Tuttavia, non siamo riusciti a farti accedere perché il tuo profilo è bloccato.
+      signed_up_but_pending: Un messaggio con un link di conferma è stato inviato al tuo indirizzo email. Una volta che avrai cliccato il link, revisioneremo la tua richiesta. Sarai notificato, se verrà approvata.
+      signed_up_but_unconfirmed: Un messaggio con un link di conferma è stato inviato al tuo indirizzo email. Sei pregato di seguire il link per attivare il tuo profilo. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      update_needs_confirmation: Hai aggiornato correttamente il tuo profilo, ma dobbiamo verificare il tuo nuovo indirizzo email. Sei pregato di controllare la tua email e di seguire il link di conferma, per confermare il tuo nuovo indirizzo email. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      updated: Il tuo profilo è stato aggiornato con successo.
     sessions:
-      already_signed_out: Sei uscito correttamente dal tuo account.
-      signed_in: Accesso eseguito correttamente.
-      signed_out: Sei uscito correttamente dal tuo account.
+      already_signed_out: Disconnesso correttamente.
+      signed_in: Connesso correttamente.
+      signed_out: Disconnesso correttamente.
     unlocks:
-      send_instructions: Riceverai in pochi minuti una email con istruzioni su come sbloccare il tuo account.
-      send_paranoid_instructions: Se il tuo account esiste, riceverai in pochi minuti una email con istruzioni su come sbloccarlo.
-      unlocked: Il tuo account è stato sbloccato con successo. Per favore, esegui l'accesso per continuare.
+      send_instructions: Riceverai un'email con le istruzioni su come sbloccare il tuo profilo in pochi minuti. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      send_paranoid_instructions: Se il tuo profilo esiste, riceverai un'email con le istruzioni su come sbloccarlo in pochi minuti. Sei pregato di controllare la tua cartella dello spam, se non hai ricevuto quest'email.
+      unlocked: Il tuo profilo è stato sbloccato correttamente. Sei pregato di accedere per continuare.
   errors:
     messages:
-      already_confirmed: era già stata confermata; per favore, prova ad eseguire l'accesso
-      confirmation_period_expired: deve essere confermata entro %{period}; per favore, richiedine una nuova
-      expired: è terminata; per favore, richiedine una nuova
+      already_confirmed: è già stata confermata, sei pregato di provare ad accedere
+      confirmation_period_expired: dev'essere confermata entro %{period}, sei pregato di richiederne una nuova
+      expired: è scaduta, sei pregato di richiederne una nuova
       not_found: non trovato
-      not_locked: non era stato bloccato
+      not_locked: non era bloccato
       not_saved:
-        one: '1 errore ha impedito che %{resource} venisse salvato:'
-        other: "%{count} errori hanno impedito che %{resource} venisse salvato:"
+        one: '1 errore ha impedito il salvataggio di questa %{resource}:'
+        other: "%{count} errori hanno impedito il salvataggio di %{resource}:"
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 73e79be23..ca8ac0584 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -19,10 +19,10 @@ ja:
     mailer:
       confirmation_instructions:
         action: メールアドレスの確認
-        action_with_app: 確認し %{app} に戻る
+        action_with_app: 確認し%{app}に戻る
         explanation: このメールアドレスで%{host}にアカウントを作成しました。アカウントの有効化まであと一歩です。なお、もし心当たりがない場合は、申し訳ありませんがこのメールを無視してください。
-        explanation_when_pending: このメールアドレスで %{host} への登録を申請しました。あなたがメールアドレスを確認したら、サーバー管理者が申請を審査します。ログインして一部設定を変更したりアカウントを削除できますが、ほとんどの機能は申請が承認されるまで利用できません。申請が却下された場合、あなたのデータは削除されますので以降の操作は必要ありません。もし心当たりがない場合、申し訳ありませんがこのメールを無視してください。
-        extra_html: あわせて、<a href="%{terms_path}">サーバーのルール</a> と <a href="%{policy_path}">利用規約</a> もお読みください。
+        explanation_when_pending: このメールアドレスで%{host}への登録を申請しました。あなたがメールアドレスを確認したら、サーバー管理者が申請を審査します。ログインして一部設定を変更したりアカウントを削除できますが、ほとんどの機能は申請が承認されるまで利用できません。申請が却下された場合、あなたのデータは削除されますので以降の操作は必要ありません。もし心当たりがない場合、申し訳ありませんがこのメールを無視してください。
+        extra_html: あわせて、<a href="%{terms_path}">サーバーのルール</a>と<a href="%{policy_path}">利用規約</a>もお読みください。
         subject: 'Mastodon: メールアドレスの確認 %{instance}'
         title: メールアドレスの確認
       email_changed:
@@ -47,17 +47,17 @@ ja:
         subject: 'Mastodon: パスワード再発行'
         title: パスワード再発行
       two_factor_disabled:
-        explanation: あなたのアカウントの二段階認証が無効化されました。メールとパスワードのみでログインできます。
-        subject: 'Mastodon: 二段階認証が無効になりました'
-        title: 二段階認証が無効化されました
+        explanation: あなたのアカウントの二要素認証が無効化されました。メールとパスワードのみでログインできます。
+        subject: 'Mastodon: 二要素認証が無効になりました'
+        title: 二要素認証が無効化されました
       two_factor_enabled:
-        explanation: あなたのアカウントの二段階認証が有効化されました。ログインするには TOTP アプリで生成されたコードが必要です。
-        subject: 'Mastodon: 二段階認証が有効になりました'
-        title: 二段階認証が有効化されました
+        explanation: あなたのアカウントの二要素認証が有効化されました。ログインするには TOTP アプリで生成されたコードが必要です。
+        subject: 'Mastodon: 二要素認証が有効になりました'
+        title: 二要素認証が有効化されました
       two_factor_recovery_codes_changed:
         explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
-        subject: 'Mastodon: 二段階認証のリカバリーコードが再生成されました'
-        title: 二段階認証のリカバリーコードが変更されました
+        subject: 'Mastodon: 二要素認証のリカバリーコードが再生成されました'
+        title: 二要素認証のリカバリーコードが変更されました
       unlock_instructions:
         subject: 'Mastodon: アカウントのロックの解除'
       webauthn_credential:
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index 79faaaa1b..eb599e55e 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -60,6 +60,10 @@ kab:
         title: Tangalt n tuɣalin 2FA tettwabeddel
       unlock_instructions:
         subject: 'Mastodon: iwelihhen n userreḥ'
+      webauthn_credential:
+        added:
+          subject: 'Maṣṭudun : Tasarutt tamaynutt n tɣellist'
+          title: Tasarut tamaynutt n tɣellist tamaynut tettwarna
     omniauth_callbacks:
       failure: Ur nezmir ara ad ak·akem-nsesṭeb seg %{kind} acku "%{reason}".
       success: Asesṭeb idda akken iwata seg umiḍan %{kind}.
diff --git a/config/locales/devise.kmr.yml b/config/locales/devise.kmr.yml
deleted file mode 100644
index 14528ff62..000000000
--- a/config/locales/devise.kmr.yml
+++ /dev/null
@@ -1,119 +0,0 @@
----
-kmr:
-  devise:
-    confirmations:
-      confirmed: Navnîşana te ya e-nameyê bi awayekî serkeftî hat piştrastkirin.
-      send_instructions: Çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-name yek hildî. Heke ev e-name yê hilnedî ji kerema xwe re peldanka nexwestî binêre.
-      send_paranoid_instructions: Heger navnîşana e-name ya te danegeha me de hebe çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-name yek hildî. Heke ev e-name yê hilnedî ji kerema xwe re peldanka nexwestî binêrin.
-    failure:
-      already_authenticated: Jixwe te berê têketin kiriye.
-      inactive: Ajimêra te hîn nehatiye çalakkirin.
-      invalid: Nederbasdar %{authentication_keys} an jî şîfre.
-      last_attempt: Peşiya kilît kirina ajimêra te carek din jî biceribîne.
-      locked: Ajimêra ye hat kilît kirin.
-      not_found_in_database: Nederbasdar %{authentication_keys} an jî şîfre.
-      pending: Ajimêra te hîn tê vekolandin.
-      timeout: Danişîna te qedîya. Ji kerema xwe ji bo berdewamiyê dîsa têkeve.
-      unauthenticated: Peşiya berdewamiya te têketina xwe bike an jî xwe tomar bike.
-      unconfirmed: Peşiya berdewamiyê, navnîşana e-name ya xwe bipejirîne.
-    mailer:
-      confirmation_instructions:
-        action: Navnîşana e-nameyê piştrast bike
-        action_with_app: Piştrast bike û vegere bo %{app}
-        explanation: Te li ser %{host} ajimêrek çê kiriye bi navnîşana vê e-nameyê re. Tu ji çalakkirina wê bi tikandinekê dûr î. Heke ev ne tu bûya, ji kerema xwe guh nede vê e-nameyê.
-        explanation_when_pending: |-
-          Te bi vê navnîşana e -nameyê serlêdana vexwendina %{host} kir. Gava ku tu navnîşana e-nameya xwe piştrast bikî, em ê serlêdana te binirxînin. Tu dikarî têkevî da ku hûrguliyên xwe biguherînî an ajimêra xwe jê bibî, lê heya ku ajimêra te neyê pejirandin tu nekarî piraniya fonksiyonan bi kar bînî
-           Heke serlêdana te werê red kirin, dê daneyên te werin jêbirin, ji ber vê yekê çalakîyek din ji te nayê xwestin. Heke ev ne tu bû, ji kerema xwe guh nede vê e-nameyê.
-        extra_html: Jkx vê jî kontrol bike <a href="%{terms_path}"> rêbazên rajekar</a> û <a href="%{policy_path}">mercên me yên karûbaran</a>.
-        subject: 'Mastodon: ji bo %{instance} pejirandinê rêwerzan'
-        title: Navnîşana e-nameyê piştrast bike
-      email_changed:
-        explanation: 'Navnîşana e-nameyê ajimêra te hate guhertin bo:'
-        extra: Heke te ajimêra xwe ne guhertiye. Ew tê wateya ku kesek ketiye ajimêrê te. Jkx pêborîna xwe zû biguherîne an jî bi rêveberiya rajekar re têkeve têkiliyê heke tu êdî nikare ajimêra xwe bi kar bînî.
-        subject: 'Mastodon: E-name hate guhertin'
-        title: Navnîşana e-nameya nû
-      password_change:
-        explanation: Pêborîna ajimêra te hate guhertin.
-        extra: Heke te ajimêra xwe ne guhertiye. Ew tê wateya ku kesek ketiye ajimêrê te. Jkx pêborîna xwe zû biguherîne an jî bi rêveberiya rajekar re têkeve têkiliyê heke tu êdî nikare ajimêra xwe bi kar bînî.
-        subject: 'Mastodon: pêborîn hate guhertin'
-        title: Pêborîn hate guhertin
-      reconfirmation_instructions:
-        explanation: Navnîşana nû piştrast bike da ku tu e-nameya xwe biguherînî.
-        extra: |-
-          Heke ev daxwaz ji aliyê te de nehate pêkanîn, jkx guh nede vê e-nameyê
-           Navnîşana e-nameyê bo ajimêra Mastodon wê tu guhertin pêk neyîne heya ku tu li girêdana Jêrin bitikînî.
-        subject: 'Mastodon: E-nameyê piştrast bike bo %{instance}'
-        title: Navnîşana e-nameyê piştrast bike
-      reset_password_instructions:
-        action: Pêborînê biguherîne
-        explanation: Te ji bo ajimêra xwe daxwaza pêborîneke nû kiriye.
-        extra: Heke te ev daxwaz nekir, jkx guh nede vê e-nameyê. Pêborîna te wê neyê guhertin heya ku tu li girêdana Jêrin bitikînî û yeka nû çê bikî.
-        subject: 'Mastodon: rêwerzên jê birina pêborîn'
-        title: Pêborîn ji nû ve saz bike
-      two_factor_disabled:
-        explanation: Ji bo ajimêrê te piştrastkirina du-faktorî hat asteng kirin. Niha tu tenê bi navnîşana e-name û şîfre ya xwe dikarî têketin bikî.
-        subject: 'Mastodon: piştrastkirina du- faktorî neçalak bike'
-        title: 2FA Neçalak e
-      two_factor_enabled:
-        explanation: Piştrastkirinê du-faktorî ya ajimêrê te hat çalak kirin. Ji bo têketinê ji alî sepanê cotkirî TOTP ve hewceyî nîşanderek heye.
-        subject: 'Mastodon: piştrastkirina du-faktorî hat çalak kirin'
-        title: 2FA Çalak e
-      two_factor_recovery_codes_changed:
-        explanation: Kodên paşve hatiye rizgarkirin betal bû û yên nû hat çêkirin.
-        subject: 'Mastodon: kodên rizgarkirî ên du-faktorî dîsa hat avakirin'
-        title: Kodê 2FA ya rizgarkirinê hatine guhertin
-      unlock_instructions:
-        subject: 'Mastodon: kilîdê rêwerzan veke'
-      webauthn_credential:
-        added:
-          explanation: Kilîta ewlehiyê jêrîn li ajimêra te hate tevlîkirin
-          subject: Kilîta ewlehiyê ya nû
-          title: Kilîta ewlehiyê ya nû hate tevlîkirin
-        deleted:
-          explanation: Kilîta ewlehiyê jêrîn li ajimêra te hate jêbirin
-          subject: 'Mastodon: Kilîta ewlehiyê hate jêbirin'
-          title: Yek ji kilîta ewlehiyê yên te hate jêbirin
-      webauthn_disabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn. Têketin niha gengaz e ku mirov tenê nîşana ku ji hêla sepana cotkirî ya TOTP ve hatî avakirin bi kar bîne.
-        subject: 'Mastodon: Rastandin bi kilîta ewlehiyê re nehate çalakirin'
-        title: Kilîta ewlehiyê neçalak e
-      webauthn_enabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn.
-        subject: 'Mastodon: Rastandina kilîta ewlehiyê hate çalakkirin'
-        title: Kilîta ewlehiyê çalak e
-    omniauth_callbacks:
-      failure: Nikare ji %{kind} rastandinê bikê ji bo " %{reason}".
-      success: Ji ajimêra %{kind} bi serkeftî hate rastandin.
-    passwords:
-      no_token: Tu nikarî xwe bigihînî vê rûpelê bêyî ku tu ji e-nameya ji nû ve sazkirina pêborînê wernegerî. Heke tu ji e-nameya ji nû ve sazkirina pêborînê tê, ji kerema xwe pê ewle be ku tu girêdanê ya tevahî bi kar tînî.
-      send_instructions: Heke navnîşana te ya e-nameyê di danegeha me da hebê, tu yê di navnîşana xwe ya e-nameyê da girêdana rizgarkirina pêborînê bistînî. Heke te ev e-name wernegirtibe, ji kerema xwe peldanka xwe ya spamê kontrol bike.
-      send_paranoid_instructions: Heke navnîşana te ya e-nameyê di danegeha me da hebê, tu yê di navnîşana xwe ya e-nameyê da girêdana rizgarkirina pêborînê bistînî di hundir çend xulkan de. Heke te ev e-name wernegirtibe, ji kerema xwe peldanka xwe ya spamê kontrol bike.
-      updated: Pêborîna te bi serkeftî hate guhertin. Niha tu têketî ye.
-      updated_not_active: Pêborîna te bi serkeftî hate guhertin.
-    registrations:
-      destroyed: Xatirê te! Ajimêra te bi serkeftî hate pûçkirin. Em hêvî dikin ku tu di nêzîk de te dîsa bibînin.
-      signed_up: Bi xêr hatî! Te bi serkeftî tomarkirin kir.
-      signed_up_but_inactive: Te bi serkeftî tomarkirin kir. lê piştî ku tu çalak bikî em dikarin ku tu têketinê bikî.
-      signed_up_but_locked: Te bi serkeftî tomarkirin kir. lê ajimêra te girtiye ber wê tu nikarî ku têketinê bikî.
-      signed_up_but_pending: Peyamek bi girêda pejirandinê ji navnîşana e-nameya te re hate şandin. Piştî ku tu girêdanê bitikînî, em ê serlêdana te binirxînin. Heke werê pejirandin tu yê bê agahdarkirin.
-      signed_up_but_unconfirmed: Peyamek bi girêda pejirandinê ji navnîşana e-nameya te re hate şandin. Ji kerema xwe girêdanê bişopîne da ku tu ajimêra xwe çalak bikî. Ji kerema xwe heke te ev e-name nestand peldanka spama xwe kontrol bike.
-      update_needs_confirmation: Te ajimêra xwe bi awayekî serkeftî rojane kir, lê pêdiviya me bi kontrolkirina navnîşana e -nameya te ya nû heye. Ji kerema xwe e -nameya xwe kontrol bike û girêdana piştrastkirinê bişopîne da ku navnîşana e -nameya xwe ya nû piştrast bikî. Ji kerema xwe heke te ev e -name nestand peldanka spama xwe kontrol bike.
-      updated: Ajimêra te bi awayekî serkeftî hate rojanekirin.
-    sessions:
-      already_signed_out: Derketina te serkeftî bû.
-      signed_in: Têketina te serkeftî bû.
-      signed_out: Derketina te serkeftî bû.
-    unlocks:
-      send_instructions: Çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-name yek hildî. Heke ev e-name yê hilnedî ji kerema xwe re peldanka nexwestî binêrin.
-      send_paranoid_instructions: Hek ajimêra te hebe, tu yê e-nameyeke bi zanyariyan bistînî ka mirov çawa di çend xulekan de ajimêr vedikê. Ji kerema xwe heke te ev e-name nestand peldanka spama xwe kontrol bike.
-      unlocked: Ajimêra te bi serkeftî vebû. Ji kerema xwe têkeve da ku tu bidomînî.
-  errors:
-    messages:
-      already_confirmed: jixwe hate pejirandin, ji kerema xwe têketinê biceribîne
-      confirmation_period_expired: pêdivî ye ku di nav %{period} de werê pejirandin, ji kerema xwe yeka nû bixwaze
-      expired: qediya ye, ji kerema xwe yeka nû bixwaze
-      not_found: nehate dîtin
-      not_locked: ne girtî bû
-      not_saved:
-        one: '1 çewtî nehişt ku %{resource} werê tomarkirin:'
-        other: "%{count} çewtî nehişt ku %{resource} werê tomarkirin:"
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 570377f8a..45e5e47f8 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -7,7 +7,7 @@ ko:
       send_paranoid_instructions: 당신의 이메일이 우리의 DB에 있을 경우 몇 분 이내로 확인 메일이 발송 됩니다. 이메일을 받지 못 한 경우, 스팸 폴더를 확인하세요.
     failure:
       already_authenticated: 이미 로그인 된 상태입니다.
-      inactive: 계정이 활성화 되지 않았습니다.
+      inactive: 계정이 아직 활성화 되지 않았습니다.
       invalid: 올바르지 않은 %{authentication_keys} 혹은 패스워드입니다.
       last_attempt: 계정이 잠기기까지 한 번의 시도가 남았습니다.
       locked: 계정이 잠겼습니다.
@@ -79,7 +79,7 @@ ko:
         title: 보안 키 활성화 됨
     omniauth_callbacks:
       failure: '"%{reason}" 때문에 당신을 %{kind}에서 인증할 수 없습니다.'
-      success: 성공적으로 %{kind} 계정을 인증 했습니다.
+      success: "%{kind} 계정을 성공적으로 인증했습니다."
     passwords:
       no_token: 패스워드 재설정 이메일을 거치지 않고는 여기에 올 수 없습니다. 만약 패스워드 재설정 메일에서 온 것이라면 URL이 맞는지 확인해 주세요.
       send_instructions: 당신의 이메일 주소가 우리의 DB에 있다면 패스워드 복구 링크가 몇 분 이내에 메일로 발송 됩니다. 만약 메일을 받지 못 하신 경우 스팸 폴더를 확인해 주세요.
@@ -89,11 +89,11 @@ ko:
     registrations:
       destroyed: 안녕히 가세요! 계정이 성공적으로 제거되었습니다. 다시 만나기를 희망합니다.
       signed_up: 안녕하세요! 성공적으로 가입했습니다.
-      signed_up_but_inactive: 성공적으로 가입 했습니다. 그러나, 계정이 활성화 되지 않았기 때문에 아직 로그인 할 수 없습니다.
-      signed_up_but_locked: 성공적으로 가입 했습니다. 그러나, 계정이 잠겨있기 때문에 아직 로그인 할 수 없습니다.
+      signed_up_but_inactive: 성공적으로 가입했습니다. 하지만 계정이 활성화되지 않았기 때문에 아직 로그인할 수 없습니다.
+      signed_up_but_locked: 성공적으로 가입했습니다. 하지만 계정이 잠겨있기 때문에 아직 로그인할 수 없습니다.
       signed_up_but_pending: 확인 링크를 포함한 메일이 발송 되었습니다. 링크를 클릭한 이후, 우리가 당신의 신청양식을 검토합니다. 승인이 되면 알림을 발송합니다.
       signed_up_but_unconfirmed: 확인 링크를 포함한 메일이 발송 되었습니다. 링크를 클릭해 계정을 활성화 하세요. 메일을 받지 못 하신 경우 스팸 폴더를 확인해 주세요.
-      update_needs_confirmation: 계정 정보를 업데이트 했습니다. 하지만 새 이메일 주소에 대한 확인이 필요합니다. 이메일을 확인 한 후 링크를 통해 새 이메일을 확인 하세요. 메일을 받지 못 하신 경우 스팸 폴더를 확인해 주세요.
+      update_needs_confirmation: 계정 정보를 성공적으로 업데이트했으며, 새 이메일 주소에 대한 확인이 필요합니다. 이메일로 전달된 링크를 따라 새 이메일을 확인하세요. 메일을 받지 못하셨다면 스팸 폴더를 확인해 주세요.
       updated: 계정 정보가 성공적으로 업데이트 되었습니다.
     sessions:
       already_signed_out: 성공적으로 로그아웃 되었습니다.
diff --git a/config/locales/devise.ku.yml b/config/locales/devise.ku.yml
index 64c305681..7ca89d773 100644
--- a/config/locales/devise.ku.yml
+++ b/config/locales/devise.ku.yml
@@ -2,114 +2,118 @@
 ku:
   devise:
     confirmations:
-      confirmed: ناونیشانی ئیمەیڵەکەت بە سەرکەوتوویی پشتڕاستکرایەوە.
-      send_instructions: ئیمەیڵێکت بۆ دەنێردرێت لەگەڵ ڕێنمایی بۆ چۆنیەتی دڵنیابوون لە ناونیشانی ئیمەیلەکەت لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت چاولێبکە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      send_paranoid_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، ئیمەیڵێکت پێدەگات لەگەڵ ڕێنماییەکانی چۆنیەتی دڵنیابوون لە ناونیشانی ئیمەیلەکەت لە چەند خولەکێکدا. تکایە بۆخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
+      confirmed: Navnîşana te ya e-nameyê bi awayekî serkeftî hat piştrastkirin.
+      send_instructions: Çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-name yek hildî. Heke ev e-name yê hilnedî ji kerema xwe re peldanka nexwestî binêre.
+      send_paranoid_instructions: Ku navnîşana e-name ya te danegeha me de hebe çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-nameyek ji te re bê şandin. Ku te ev e-name nestand ji kerema xwe re peldanka nexwestî (Spam) binêre.
     failure:
-      already_authenticated: تۆ پێشتر چوونە ژوورەوەت کردووە.
-      inactive: هەژمارەکەت هێشتا کارا نەکراوە.
-      invalid: "%{authentication_keys} یان نهێنوشە نادروستە."
-      last_attempt: تۆ یەک هەوڵیدیکەت ماوە پێش ئەوەی ئەژمێرەکەت قوفڵ بێت.
-      locked: هەژمارەکت داخراوە.
-      not_found_in_database: "%{authentication_keys} یان نهێنوشە نادروستە."
-      pending: هەژمێرەکەت هێشتا لەژێر پێداچوونەوەدایە.
-      timeout: کۆبوونەوەکەت بەسەرچووە. تکایە دووبارە بچۆ ژوورەوە بۆ بەردەوام بوون.
-      unauthenticated: پێویستە بچیتە ژوورەوە یان بچیتە ناو چوونە ناو پێش بەردەوام بوون.
-      unconfirmed: دەبێت ناونیشانی ئیمەیڵەکەت پشتڕاست بکەیتەوە پێش بەردەوام بوون.
+      already_authenticated: Jixwe te berê têketin kiriye.
+      inactive: Ajimêra te hîn nehatiye çalakkirin.
+      invalid: "%{authentication_keys} an jî borînpeyv nederbasdar e."
+      last_attempt: Peşiya kilît kirina ajimêra te carek din jî biceribîne.
+      locked: Ajimêra ye hat kilît kirin.
+      not_found_in_database: "%{authentication_keys} an jî borînpeyv nederbasdar e."
+      pending: Ajimêra te hîn tê vekolandin.
+      timeout: Danişîna te qedîya. Ji kerema xwe ji bo berdewamiyê dîsa têkeve.
+      unauthenticated: Peşiya berdewamiya te têketina xwe bike an jî xwe tomar bike.
+      unconfirmed: Peşiya berdewamiyê, navnîşana e-name ya xwe bipejirîne.
     mailer:
       confirmation_instructions:
-        action: ناونیشانی ئیمەیڵ ساخ بکەرەوە
-        action_with_app: پشتڕاستی بکەوە و بگەڕێوە بۆ %{app}
-        explanation: ئەژمێرێکت دروست کردووە لەسەر %{host} بەم ناونیشانی ئیمەیڵە. تۆ یەک کرتە دووریت لە کاراکردنی. ئەگەر ئەمە تۆ نەبووی، تکایە ئەم ئیمەیڵە فەرامۆش بکە.
-        explanation_when_pending: تۆ داوای بانگهێشتت کرد بۆ %{host} بەم ناونیشانی ئیمەیڵە. هەر کە دڵنیایی لە ناونیشانی ئیمەیڵەکەت دەکەیت، ئێمە پێداچوونەوە دەکەین بە بەرنامەکەتدا. دەتوانیت بچیت بۆ چوونە ژوورەوە بۆ گۆڕینی ووردەکاریەکانت یان سڕینەوەی هەژمارەکەت، بەڵام ناتوانیت دەستگەیشتنت هەبێت بە زۆربەی ئەرکەکان تا ئەژمێرەکەت پەسەند ناکرێت. ئەگەر کاربەرنامەکەت ڕەتکرایەوە، داتاکەت لادەبرێت، بۆیە پێویست بە کاری زیاتر لە تۆ ناکرێت. ئەگەر ئەمە تۆ نەبووی، تکایە ئەم ئیمەیڵە فەرامۆش بکە.
-        extra_html: تکایە تێڕوانە لە <a href="%{terms_path}"> ڕێساکانی ڕاژەکار</a> و <a href="%{policy_path}"> مەرجەکانی خزمەتگوزاری</a>.
-        subject: 'ماستۆدۆن: ڕێنماییەکانی پشتڕاستکردنەوە بۆ %{instance}'
-        title: ناونیشانی ئیمەیڵ ساخ بکەرەوە
+        action: Navnîşana e-nameyê piştrast bike
+        action_with_app: Piştrast bike û vegere bo %{app}
+        explanation: Te li ser %{host} ajimêrek çê kiriye bi navnîşana vê e-nameyê re. Tu ji çalakkirina wê bi tikandinekê dûr î. Heke ev ne tu bûya, ji kerema xwe guh nede vê e-nameyê.
+        explanation_when_pending: |-
+          Te bi vê navnîşana e -nameyê serlêdana vexwendina %{host} kir. Gava ku tu navnîşana e-nameya xwe piştrast bikî, em ê serlêdana te binirxînin. Tu dikarî têkevî da ku hûrguliyên xwe biguherînî an ajimêra xwe jê bibî, lê heya ku ajimêra te neyê pejirandin tu nekarî piraniya fonksiyonan bi kar bînî
+          Heke serlêdana te werê red kirin, dê daneyên te werin jêbirin, ji ber vê yekê çalakîyek din ji te nayê xwestin. Heke ev ne tu bû, ji kerema xwe guh nede vê e-nameyê.
+        extra_html: Jkx vê jî kontrol bike <a href="%{terms_path}"> rêbazên rajekar</a> û <a href="%{policy_path}">mercên me yên karûbaran</a>.
+        subject: 'Mastodon: ji bo %{instance} pejirandinê rêwerzan'
+        title: Navnîşana e-nameyê piştrast bike
       email_changed:
-        explanation: 'ناونیشانی ئیمەیڵەکەی ئەژمێرەکەت دەگۆڕدرێت بۆ:'
-        extra: ئەگەر ئیمەیلەکەت نەگۆڕیت، لەوانەیە کەسێک دەستگەیشتنی بۆ هەژمارەکەت بەدەست بێت. تکایە تێپەڕوشەکەت بگۆڕە دەستبەجێ یان پەیوەندی بکە بە بەڕێوەبەری ڕاژەوە ئەگەر تۆ لە هەژمارەکەت داخرایت.
-        subject: 'ماستۆدۆن: ئیمەیڵ گۆڕا'
-        title: ناونیشانی ئیمەیڵی نوێ
+        explanation: 'Navnîşana e-nameyê ajimêra te hate guhertin bo:'
+        extra: Ku te ajimêra xwe neguhertiye. Ew tê wateya ku kesek ketiye ajimêrê te. Jkx pêborîna xwe zû biguherîne an jî bi rêveberiya rajekar re têkeve têkiliyê heke tu êdî nikare ajimêra xwe bi kar bînî.
+        subject: 'Mastodon: E-name hate guhertin'
+        title: Navnîşana e-nameya nû
       password_change:
-        explanation: تێپەڕوشە بۆ هەژمارەکەت گۆڕاوە.
-        extra: ئەگەر تێپەڕوشەکەت نەگۆڕی، وا دیارە کەسێک دەستگەیشتنی بۆ هەژمارەکەت بەدەست بێت. تکایە تێپەڕوسيکەت بگۆڕە دەستبەجێ یان پەیوەندی بکە بە بەڕێوەبەری ڕاژە ئەگەر تۆ لە هەژمارەکەت داخرایت.
-        subject: 'ماستۆدۆن: تێپەڕوشە گۆڕدرا'
-        title: تێپەڕوشە گۆڕدرا
+        explanation: Borînpeyva ajimêra te hate guhertin.
+        extra: Ku te ajimêra xwe neguhertiye. Ew tê wateya ku kesek ketiye ajimêrê te. Jkx pêborîna xwe zû biguherîne an jî bi rêveberiya rajekar re têkeve têkiliyê heke tu êdî nikare ajimêra xwe bi kar bînî.
+        subject: 'Mastodon: Borînpeyv hate guhertin'
+        title: Borînpeyv hate guhertin
       reconfirmation_instructions:
-        explanation: دڵنیابوون لە ناونیشانی نوێ بۆ گۆڕینی ئیمەیڵەکەت.
-        extra: ئەگەر ئەم گۆڕانکاریە لەلایەن تۆوە دەست پێنەکراوە، تکایە ئەم ئیمەیڵە فەرامۆش بکە. ناونیشانی ئیمەیڵ بۆ هەژمێری ماستۆدۆن ناگۆڕێ هەتا ئەو کاتەی دەستپێگەیشتنی ئەم لینکەت لە سەرەوە نیە.
-        subject: 'ماستۆدۆن: دووپاتی ئیمەیل بۆ %{instance}'
-        title: ناونیشانی ئیمەیڵ ساخ بکەرەوە
+        explanation: Navnîşana nû piştrast bike da ku tu e-nameya xwe biguherînî.
+        extra: |-
+          Heke ev daxwaz ji aliyê te de nehate pêkanîn, jkx guh nede vê e-nameyê
+          Navnîşana e-nameyê bo ajimêra Mastodon wê tu guhertin pêk neyîne heya ku tu li girêdana Jêrin bitikînî.
+        subject: 'Mastodon: E-nameyê piştrast bike bo %{instance}'
+        title: Navnîşana e-nameyê piştrast bike
       reset_password_instructions:
-        action: گۆڕینی تێپەڕوشە
-        explanation: تۆ تیپەڕوشەی نوێت داوا کرد بۆ هەژمارەکەت.
-        extra: ئەگەر ئەم داواکاریەت نەکرد، تکایە ئەم ئیمەیڵە فەرامۆش بکە. تێپەڕوشەکەت ناگۆڕێ هەتا نەچیتە ناو لینکی سەرەوە و دانەیەکی نوێ دروست بکەیت.
-        subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
-        title: گەڕانەوەی تێپەڕوشە
+        action: Borînpeyvê biguherîne
+        explanation: Te ji bo ajimêra xwe daxwaza pêborîneke nû kiriye.
+        extra: Heke te ev daxwaz nekir, jkx guh nede vê e-nameyê. Borînpeyva te wê neyê guhertin heya ku tu li girêdana Jêrin bitikînî û yeka nû çê bikî.
+        subject: 'Mastodon: rêwerzên jê birina pêborîn'
+        title: Borînpeyv ji nû ve saz bike
       two_factor_disabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
-        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
-        title: 2FA ناچالاک کرا
+        explanation: Ji bo ajimêrê te piştrastkirina du-faktorî hat asteng kirin. Niha tu tenê bi navnîşana e-name û borînpeyva xwe dikarî têketinê bikî.
+        subject: 'Mastodon: piştrastkirina du- faktorî neçalak bike'
+        title: 2FA Neçalak e
       two_factor_enabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
-        subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
-        title: 2FA چالاک کرا
+        explanation: Piştrastkirinê du-faktorî ya ajimêrê te hat çalak kirin. Ji bo têketinê ji alî sepanê cotkirî TOTP ve hewceyî nîşanderek heye.
+        subject: 'Mastodon: piştrastkirina du-faktorî hat çalak kirin'
+        title: 2FA Çalak e
       two_factor_recovery_codes_changed:
-        explanation: کۆدەکانی چاککردنەوەی پێشوو هەڵوەشێنرانەوە و، نوێکان دروست بوون.
-        subject: 'ماستۆدۆن: کۆدەکانی گەڕانەوەی دوو فاکتەر، دووبارە دروست دەکرێتەوە'
-        title: 2FA کۆدی چاککردنەوە گۆڕا
+        explanation: Kodên paşve hatiye rizgarkirin betal bû û yên nû hat çêkirin.
+        subject: 'Mastodon: kodên rizgarkirî ên du-faktorî dîsa hat avakirin'
+        title: Kodê 2FA ya rizgarkirinê hatine guhertin
       unlock_instructions:
-        subject: 'ماستۆدۆن: رێنماییەکان بکەرەوە'
+        subject: 'Mastodon: kilîdê rêwerzan veke'
       webauthn_credential:
         added:
-          explanation: کلیلی ئاسایشی خوارەوە زیادکرا بۆ هەژمارەکەت
-          subject: 'ماستۆدۆن: کلیلی ئاسایشی نوێ'
-          title: کلیلی پاراستنی نوێ زیادکرا
+          explanation: Kilîta ewlehiyê jêrîn li ajimêra te hate tevlîkirin
+          subject: Kilîta ewlehiyê ya nû
+          title: Kilîta ewlehiyê ya nû hate tevlîkirin
         deleted:
-          explanation: کلیلی ئاسایشی خوارەوە لە هەژمارەکەت سڕایەوە
-          subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
-          title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
+          explanation: Kilîta ewlehiyê jêrîn li ajimêra te hate jêbirin
+          subject: 'Mastodon: Kilîta ewlehiyê hate jêbirin'
+          title: Yek ji kilîta ewlehiyê yên te hate jêbirin
       webauthn_disabled:
-        explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
-        subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
-        title: کلیلە پارستنەکان ناچالاک کراون
+        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn. Têketin niha gengaz e ku mirov tenê nîşana ku ji hêla sepana cotkirî ya TOTP ve hatî avakirin bi kar bîne.
+        subject: 'Mastodon: Rastandin bi kilîta ewlehiyê re nehate çalakirin'
+        title: Kilîta ewlehiyê neçalak e
       webauthn_enabled:
-        explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
-        subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
-        title: کلیلە کانی پاراستن چالاک کرا
+        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn.
+        subject: 'Mastodon: Rastandina kilîta ewlehiyê hate çalakkirin'
+        title: Kilîta ewlehiyê çalak e
     omniauth_callbacks:
-      failure: نەیتوانی ڕەسەنایە تی %{kind} بتەوبکات لەبەرئەوەی "%{reason}".
-      success: سەرکەوتووانە لە هەژماری %{kind} سەلمێنرا.
+      failure: Nikare ji %{kind} rastandinê bikê ji bo " %{reason}".
+      success: Ji ajimêra %{kind} bi serkeftî hate rastandin.
     passwords:
-      no_token: ناتوانیت دەستگەیشتنت هەبێت بەم لاپەڕەیە بەبێ ئەوەی لە ئیمەیڵێکی گەڕانەوەی تێپەڕوشەت بێت. ئەگەر لە ئیمەیڵێکیگەڕانەوەی تێپەڕوشە هاتوویت، تکایە دڵنیابە لەوەی کە URLی تەواوت بەکارهێناوە کە دابینکراوە.
-      send_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، لە چەند خولەکێکی کەمدا لینکی هێنانەوەی تێپەڕوشە لە ناونیشانی ئیمەیلەکەت پێ دەگات. تکایە بوخچەی سپامەکەت بکەرەوە، ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      send_paranoid_instructions: ئەگەر ناونیشانی ئیمەیڵەکەت لە بنکەی زانیارێکانماندا هەبێت، لە چەند خولەکێکی کەمدا لینکی هێنانەوەی تێپەڕوشە لە ناونیشانی ئیمەیلەکەت پێ دەگات. تکایە بوخچەی سپامەکەت بکەرەوە، ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      updated: تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدرا. تۆ ئێستاچوویتە ژوورەوە.
-      updated_not_active: تێپەڕوشەکەت بە سەرکەوتوویی گۆڕدرا.
+      no_token: Tu nikarî xwe bigihînî vê rûpelê bêyî ku tu ji e-nameya ji nû ve sazkirina borînpeyvê wernegerî. Heke tu ji e-nameya ji nû ve sazkirina borînpeyvê tê, ji kerema xwe pê ewle be ku tu girêdanê ya tevahî bi kar tînî.
+      send_instructions: Heke navnîşana te ya e-nameyê di danegeha me da hebê, tu yê di navnîşana xwe ya e-nameyê da girêdana rizgarkirina borînpeyvê bistînî. Heke te ev e-name wernegirtibe, ji kerema xwe peldanka xwe ya spamê kontrol bike.
+      send_paranoid_instructions: Heke navnîşana te ya e-nameyê di danegeha me da hebê, tu yê di navnîşana xwe ya e-nameyê da girêdana rizgarkirina borînpeyvê bistînî di hundir çend xulkan de. Heke te ev e-name wernegirtibe, ji kerema xwe peldanka xwe ya spamê kontrol bike.
+      updated: Borînpeyva te bi serkeftî hate guhertin. Niha tu têketî ye.
+      updated_not_active: Borînpeyva te bi serkeftî hate guhertin.
     registrations:
-      destroyed: خوات لەگەڵ! ئەژمێرەکەت بە سەرکەوتوویی هەڵوەشێنرایەوە. هیوادارین بەزوویی بتبینینەوە.
-      signed_up: بەخێربێیت! تۆ بە سەرکەوتوویی تۆمار کرای.
-      signed_up_but_inactive: تۆ بە سەرکەوتوویی تۆمارکرای. هەرچۆنێک بێت، نەمانتوانی چوونە ژوورەوەت بۆ بکەین لەبەرئەوەی هێشتا هەژمارەکەت کارا نەکراوە.
-      signed_up_but_locked: تۆ بە سەرکەوتوویی تۆمارکرای. هەرچۆنێک بێت، نەمانتوانی چوونە ژوورەوەت بۆ بکەین لەبەرئەوەی هێشتا هەژمارەکەت قوفڵ کراوە.
-      signed_up_but_pending: نامەیەک بە لینکی دووپاتکردنەوە نێردراوە بۆ ناونیشانی ئیمەیڵەکەت. دوای ئەوەی تۆ کرتە لەسەر لینکەکە دەکەیت، ئێمە پێداچوونەوە دەکەین بە بەرنامەکەتدا. ئاگادار دەکرێیت ئەگەر پەسەند کرا.
-      signed_up_but_unconfirmed: نامەیەک بە لینکی دووپاتکردنەوە نێردراوە بۆ ناونیشانی ئیمەیڵەکەت. تکایە دوای لینکەکە بکەوە بۆ کاراکردنی هەژمارەکەت. تکایە بوخچەی سپامەکەت بکەرەوە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      update_needs_confirmation: تۆ ئەژمێرەکەت بە سەرکەوتوویی نوێکردەوە، بەڵام پێویستە ئیمەیڵە نوێکەت بسەلمێنین. تکایە ئیمەیڵەکەت بپشکنە و دوای بەستەری دڵنیابوونەوە بکەوە بۆ دڵنیابوون لە ناونیشانی ئیمەیڵە نوێکەت. تکایە بوخچەی سپامەکەت بکەرەوە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      updated: هەژمارەکەت بە سەرکەوتوویی نوێکرایەوە.
+      destroyed: Xatirê te! Ajimêra te bi serkeftî hate pûçkirin. Em hêvî dikin ku tu di nêzîk de te dîsa bibînin.
+      signed_up: Bi xêr hatî! Te bi serkeftî tomarkirin kir.
+      signed_up_but_inactive: Te bi serkeftî tomarkirin kir. lê piştî ku tu çalak bikî em dikarin ku tu têketinê bikî.
+      signed_up_but_locked: Te bi serkeftî tomarkirin kir. lê ajimêra te girtiye ber wê tu nikarî ku têketinê bikî.
+      signed_up_but_pending: Peyamek bi girêda pejirandinê ji navnîşana e-nameya te re hate şandin. Piştî ku tu girêdanê bitikînî, em ê serlêdana te binirxînin. Heke werê pejirandin tu yê bê agahdarkirin.
+      signed_up_but_unconfirmed: Peyamek bi girêda pejirandinê ji navnîşana e-nameya te re hate şandin. Ji kerema xwe girêdanê bişopîne da ku tu ajimêra xwe çalak bikî. Ji kerema xwe heke te ev e-name nestand peldanka spama xwe kontrol bike.
+      update_needs_confirmation: Te ajimêra xwe bi awayekî serkeftî rojane kir, lê pêdiviya me bi kontrolkirina navnîşana e -nameya te ya nû heye. Ji kerema xwe e -nameya xwe kontrol bike û girêdana piştrastkirinê bişopîne da ku navnîşana e -nameya xwe ya nû piştrast bikî. Ji kerema xwe heke te ev e -name nestand peldanka spama xwe kontrol bike.
+      updated: Ajimêra te bi awayekî serkeftî hate rojanekirin.
     sessions:
-      already_signed_out: چوونە دەرەوە بە سەرکەوتوویی ئەنجام بوو.
-      signed_in: بە سەرکەوتوویی چوونە ژوورەوە.
-      signed_out: چوونە دەرەوە بە سەرکەوتوویی ئەنجام بوو.
+      already_signed_out: Derketina te serkeftî bû.
+      signed_in: Têketina te serkeftî bû.
+      signed_out: Derketina te serkeftî bû.
     unlocks:
-      send_instructions: ئیمەیڵێکت بۆ دەنێردرێت لەگەڵ ڕێنمایی بۆ چۆنیەتی کردنەوەی هەژمارەکەت لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      send_paranoid_instructions: ئەگەر هەژمارەکەت بوونی هەبێت، ئیمەیڵێکت پێدەگات لەگەڵ ڕێنمایی چۆنیەتی کردنەوەی لە چەند خولەکێکدا. تکایە بوخچەی سپامەکەت بپشکنە ئەگەر ئەم ئیمەیڵەت پێنەدرا.
-      unlocked: هەژمارەکەت بە سەرکەوتوویی لە قوفڵ لاچوو. تکایە بچۆ ژوورەوە بۆ بەردەوام بوون.
+      send_instructions: Çend xulek şûnde ji bo navnîşana e-name ya te çawa were pejirandinê, tu yê e-name yek hildî. Heke ev e-name yê hilnedî ji kerema xwe re peldanka nexwestî binêrin.
+      send_paranoid_instructions: Hek ajimêra te hebe, tu yê e-nameyeke bi zanyariyan bistînî ka mirov çawa di çend xulekan de ajimêr vedikê. Ji kerema xwe heke te ev e-name nestand peldanka spama xwe kontrol bike.
+      unlocked: Ajimêra te bi serkeftî vebû. Ji kerema xwe têkeve da ku tu bidomînî.
   errors:
     messages:
-      already_confirmed: پێشتر پشتڕاست کرایەوە، تکایە هەوڵ دەدە بچۆ ژوورەوە
-      confirmation_period_expired: پێویستە لە نێو %{period} دا پشتڕاست بکرێتەوە، تکایە داوای دانەیەکی نوێ بکە
-      expired: بەسەرچووە، تکایە داوایەکی نوێ بکە
-      not_found: نەدۆزرایەوە
-      not_locked: دانەخرابوو
+      already_confirmed: jixwe hate pejirandin, ji kerema xwe têketinê biceribîne
+      confirmation_period_expired: pêdivî ye ku di nav %{period} de werê pejirandin, ji kerema xwe yeka nû bixwaze
+      expired: qediya ye, ji kerema xwe yeka nû bixwaze
+      not_found: nehate dîtin
+      not_locked: ne girtî bû
       not_saved:
-        one: '١ هەڵە قەدەغەکرا ئەم %{resource} لە تۆمارکردن:'
-        other: "%{count} هەڵەی قەدەغەکرد کە %{resource} لە پاشکەوتکردن:"
+        one: '1 çewtî nehişt ku %{resource} werê tomarkirin:'
+        other: "%{count} çewtî nehişt ku %{resource} werê tomarkirin:"
diff --git a/config/locales/devise.la.yml b/config/locales/devise.la.yml
new file mode 100644
index 000000000..3a7ba0d44
--- /dev/null
+++ b/config/locales/devise.la.yml
@@ -0,0 +1 @@
+la:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index 365ecdabe..e61e1b7fd 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -3,8 +3,8 @@ lv:
   devise:
     confirmations:
       confirmed: Tava e-pasta adrese ir veiksmīgi apstiprināta.
-      send_instructions: Pēc dažām minūtēm jūs saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e -pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
     failure:
       already_authenticated: Jau esi pierakstījies.
       inactive: Tavs konts vēl nav aktivizēts.
@@ -19,10 +19,10 @@ lv:
     mailer:
       confirmation_instructions:
         action: Apstiprini savu e-pasta adresi
-        action_with_app: Apstiprini un atgriezies %{app}
+        action_with_app: Apstiprināt un atgriezties %{app}
         explanation: Ar šo e-pasta adresi esi izveidojis kontu vietnē %{host}. Tu esi viena klikšķa attālumā no tā aktivizēšanas. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pieteikties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        extra_html: Lūdzu, pārbaudi arī <a href="%{terms_path}">servera nosacījumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumi</a>.
+        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pierakstīties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
+        extra_html: Lūdzu, pārskati arī <a href="%{terms_path}">servera noteikumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumus</a>.
         subject: 'Mastodon: Apstiprināšanas norādījumi %{instance}'
         title: Apstiprini savu e-pasta adresi
       email_changed:
@@ -51,27 +51,27 @@ lv:
         subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
         title: 2FA atspējota
       two_factor_enabled:
-        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams marķieris, ko ģenerējusi pārī savienotā TOTP lietotne.
+        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams kods, ko ģenerējusi pārī savienotā TOTP lietotne.
         subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
         title: 2FA iespējota
       two_factor_recovery_codes_changed:
         explanation: Iepriekšējie atkopšanas kodi ir atzīti par nederīgiem un ģenerēti jauni.
-        subject: 'Mastodon: Divfaktoru autkopšanas kodi pārģenerēti'
+        subject: 'Mastodon: Divfaktoru atkopšanas kodi pārģenerēti'
         title: 2FA atkopšanas kodi mainīti
       unlock_instructions:
         subject: 'Mastodon: Norādījumi atbloķēšanai'
       webauthn_credential:
         added:
           explanation: Tavam kontam ir pievienota šāda drošības atslēga
-          subject: 'Mastodon: Jaunā drošības atslēga'
+          subject: 'Mastodon: Jauna drošības atslēga'
           title: Tika pievienota jauna drošības atslēga
         deleted:
           explanation: Tālāk norādītā drošības atslēga ir izdzēsta no tava konta
           subject: 'Mastodon: Drošības atslēga izdzēsta'
           title: Viena no tavām drošības atslēgām tika izdzēsta
       webauthn_disabled:
-        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai marķieri, ko ģenerējusi pārī savienotā TOTP lietotne.
-        subject: 'Mastodon: Atutentifikācija ar drošības atslēgām ir atspējota'
+        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai kodu, ko ģenerējusi pārī savienotā TOTP lietotne.
+        subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
         title: Drošības atslēgas atspējotas
       webauthn_enabled:
         explanation: Tavam kontam ir iespējota drošības atslēgas autentifikācija. Tavu drošības atslēgu tagad var izmantot, lai pieteiktos.
@@ -82,8 +82,8 @@ lv:
       success: Veiksmīgi autentificēts no %{kind} konta.
     passwords:
       no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL.
-      send_instructions: Ja tava e pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tava e pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       updated: Tava parole ir veiksmīgi nomainīta. Tagad tu esi pierakstījies.
       updated_not_active: Tava parole ir veiksmīgi nomainīta.
     registrations:
@@ -92,16 +92,16 @@ lv:
       signed_up_but_inactive: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts vēl nav aktivizēts.
       signed_up_but_locked: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts ir bloķēts.
       signed_up_but_pending: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Pēc noklikšķināšanas uz saites mēs izskatīsim tavu pieteikumu. Tu tiksi informēts, ja tas tiks apstiprināts.
-      signed_up_but_unconfirmed: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Lūdzu, seko saitei, lai aktivizētu savu kontu. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
-      update_needs_confirmation: Tu veiksmīgi atjaunināji savu kontu, taču mums ir jāverificē teva jaunā e-pasta adrese. Lūdzu, pārbaudi savu e-pastu un seko apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      signed_up_but_unconfirmed: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Lūdzu, seko saitei, lai aktivizētu savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
+      update_needs_confirmation: Tu veiksmīgi atjaunināji savu kontu, taču mums ir jāverificē teva jaunā e-pasta adrese. Lūdzu, pārbaudi savu e-pastu un seko apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       updated: Tavs konts ir veiksmīgi atjaunināts.
     sessions:
       already_signed_out: Veiksmīgi izrakstījies.
       signed_in: Veiksmīgi pierakstījies.
       signed_out: Veiksmīgi izrakstījies.
     unlocks:
-      send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       unlocked: Tavs konts ir veiksmīgi atbloķēts. Lūdzu, pieraksties, lai turpinātu.
   errors:
     messages:
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index 2925688a0..c1165e47d 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -1 +1,97 @@
+---
 ms:
+  devise:
+    confirmations:
+      confirmed: Alamat e-mel anda telah berjaya disahkan.
+      send_instructions: Anda akan menerima e-mel dengan arahan untuk mengesahkan alamat e-mel anda dalam beberapa minit lagi. Sila semak folder spam anda jika tidak menerima e-mel ini.
+      send_paranoid_instructions: Jika e-mel anda wujud dalam database kami, anda akan menerima e-mel dengan arahan untuk mengesahkan alamat e-mel anda dalam beberapa minit lagi. Sila semak folder spam anda jika tidak menerima e-mel ini.
+    failure:
+      already_authenticated: Anda sudah daftar masuk.
+      inactive: Akaun anda belum diaktifkan.
+      invalid: "%{authentication_keys} atau kata laluan tidak sah."
+      last_attempt: Anda mempunyai satu lagi percubaan sebelum akaun anda dikunci.
+      locked: Akaun anda dikunci.
+      not_found_in_database: "%{authentication_keys} atau kata laluan tidak sah."
+      pending: Akaun anda masih dalam semakan.
+      timeout: Sesi anda telah tamat. Sila daftar masuk semula.
+      unauthenticated: Anda perlu daftar masuk atau mendaftar sebelum meneruskan.
+      unconfirmed: Anda perlu menyesahkan alamat e-mel anda sebelum meneruskan.
+    mailer:
+      confirmation_instructions:
+        action: Sahkan alamat e-mel
+        action_with_app: Sahkan dan kembali ke %{app}
+        explanation: Anda telah mencipta akaun pada %{host} dengan alamat e-mel ini. Anda satu klik sahaja daripada mengaktifkannya. Jika anda tidak mencipta akaun tersebut, sila abaikan e-mel ini.
+        explanation_when_pending: Anda telah memohon untuk undangan ke %{host} dengan alamat e-mel ini. Setelah anda mengesahkan alamat e-mel anda, kami akan menyemak permohonan tersebut. Anda boleh melog masuk untuk mengubah butiran atau menghapuskan akaun anda, tetapi anda tidak boleh mencapai kebanyakan fungsi sehinggalah akaun anda diluluskan. Jika permohonan anda ditolak, data anda akan dibuang dan tiada tindakan lanjut diperlukan. Jika ini bukan anda, sila abaikan e-mel ini.
+        extra_html: Sila periksa <a href="%{terms_path}">peraturan pelayan</a> serta <a href="%{policy_path}">terma perkhidmatan kami juga</a>.
+        subject: 'Mastodon: Arahan pengesahan untuk %{instance}'
+        title: Sahkan alamat e-mel
+      email_changed:
+        explanation: 'Alamat e-mel untuk akaun anda sedang diubah kepada:'
+        extra: Jika anda tidak mengubah alamat e-mel anda, berkemungkinan seseorang telah memperoleh capaian kepada akaun anda. Sila ubah kata laluan anda dengan segera atau hubungi pentadbir pelayan jika anda dikunci daripada akaun anda.
+        subject: 'Mastodon: E-mel ditukar'
+        title: Alamat e-mel baru
+      password_change:
+        explanation: Kata laluan untuk akaun anda telah ditukar.
+        extra: Jika anda tidak mengubah kata laluan anda, berkemungkinan seseorang telah memperoleh capaian kepada akaun anda. Sila ubah kata laluan anda dengan segera atau hubungi pentadbir pelayan jika anda dikunci daripada akaun anda.
+        subject: 'Mastodon: Kata laluan diubah'
+        title: Kata laluan ditukar
+      reconfirmation_instructions:
+        explanation: Sahkan alamat baru untuk menukarkan e-mel anda.
+        extra: Jika perubahan ini tidak anda lakukan, sila abaikan e-mel ini. Alamat e-mel untuk akaun Mastodon tidak akan berubah sehinggalah anda mencapai pautan di atas.
+        subject: 'Mastodon: Sahkan e-mel untuk %{instance}'
+        title: Sahkan alamat e-mel
+      reset_password_instructions:
+        action: Tukar kata laluan
+        explanation: Anda meminta kata laluan baru untuk akaun anda.
+        extra: Jika anda tidak membuat permintaan ini, sila abaikan e-mel ini. Kata laluan anda tidak akan berubah sehinggalah anda mencapai pautan di atas dan membuat yang baharu.
+        subject: 'Mastodon: Arahan set semula kata laluan'
+        title: Set semula kata laluan
+      two_factor_disabled:
+        explanation: Pengesahan dwifaktor untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan alamat e-mel dan kata laluan.
+        subject: 'Mastodon: Pengesahan dwifaktor dilumpuhkan'
+        title: 2FA dinyahaktifkan
+      two_factor_enabled:
+        explanation: Pengesahan dwifaktor untuk akaun anda telah didayakan. Satu token yang dijanakan oleh aplikasi TOTP diperlukan untuk melog masuk.
+        subject: 'Mastodon: Pengesahan dwifaktor didayakan'
+        title: 2FA diaktifkan
+      two_factor_recovery_codes_changed:
+        explanation: Kod pemulihan lama tidak lagi sah dan kod baharu telah dijanakan.
+        subject: 'Mastodon: Kod pemulihan dwifaktor dijanakan semula'
+        title: Kod pemulihan 2FA diubah
+      unlock_instructions:
+        subject: 'Mastodon: Arahan membuka kunci'
+      webauthn_credential:
+        added:
+          explanation: Kunci keselamatan berikut telah ditambahkan kepada akaun anda
+          subject: 'Mastodon: Kunci keselamatan baharu'
+          title: Kunci keselamatan baharu telah ditambahkan
+        deleted:
+          explanation: Kunci keselamatan berikut telah dihapuskan daripada akaun anda
+          subject: 'Mastodon: Kunci keselamatan dihapuskan'
+          title: Salah satu daripada kunci keselamatan anda telah dihapuskan
+      webauthn_disabled:
+        explanation: Pengesahan dengan kunci keselamatan untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan token yang dijanakan oleh aplikasi TOTP.
+        subject: 'Mastodon: Pengesahan dengan kunci keselamatan dilumpuhkan'
+        title: Kunci keselamatan dilumpuhkan
+      webauthn_enabled:
+        explanation: Pengesahan kunci keselamatan untuk akaun anda kini didayakan. Kunci keselamatan anda kini boleh digunakan untuk melog masuk.
+        subject: 'Mastodon: Pengesahan kunci keselamatan didayakan'
+        title: Kunci keselamatan didayakan
+    omniauth_callbacks:
+      failure: Tidak dapat mengesahkan anda daripada %{kind} disebabkan oleh “%{reason}”.
+      success: Berjaya disahkan daripada akaun %{kind}.
+    passwords:
+      updated: Kata laluan anda telah berjaya ditukar. Anda telah didaftar masuk.
+      updated_not_active: Kata laluan anda telah berjaya ditukar.
+    registrations:
+      destroyed: Selamat tinggal! Akaun anda telah berjaya dibatalkan. Kami harap berjumpa lagi.
+      signed_up: Selamat datang! Anda telah berjaya mendaftar.
+      signed_up_but_inactive: Anda telah berjaya mendaftar. Namun, kami tidak dapat mendaftar masuk anda kerana akaun anda belum diaktifkan.
+    sessions:
+      already_signed_out: Daftar keluar berjaya.
+      signed_in: Daftar masuk berjaya.
+      signed_out: Daftar keluar berjaya.
+  errors:
+    messages:
+      already_confirmed: sudah disahkan, sila cuba mendaftar masuk
+      not_found: tidak dijumpai
diff --git a/config/locales/devise.my.yml b/config/locales/devise.my.yml
new file mode 100644
index 000000000..5e1fc6bee
--- /dev/null
+++ b/config/locales/devise.my.yml
@@ -0,0 +1 @@
+my:
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index bf3b02e3f..477c7d41f 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -21,7 +21,7 @@ nl:
         action: E-mailadres verifiëren
         action_with_app: Bevestigen en naar %{app} teruggaan
         explanation: Je hebt een account op %{host} aangemaakt en met één klik kun je deze activeren. Wanneer jij dit account niet hebt aangemaakt, mag je deze e-mail negeren.
-        explanation_when_pending: Je vroeg met dit e-mailadres een uitnodiging aan voor %{host}. Nadat je jouw e-mailadres hebt bevestigd, beoordelen we jouw aanvraag. Je kunt tot dan nog niet inloggen. Wanneer jouw aanvraag wordt afgekeurd, worden jouw gegevens verwijderd en hoef je daarna verder niets meer te doen. Wanneer jij dit niet was, kun je deze e-mail negeren.
+        explanation_when_pending: Je vroeg met dit e-mailadres een uitnodiging aan voor %{host}. Nadat je jouw e-mailadres hebt bevestigd, beoordelen we jouw aanvraag. Je kunt tot dan nog niet inloggen. Wanneer jouw aanvraag wordt afgewezen, worden jouw gegevens verwijderd en hoef je daarna verder niets meer te doen. Wanneer jij dit niet was, kun je deze e-mail negeren.
         extra_html: Bekijk ook de <a href="%{terms_path}">regels van de Mastodonserver</a> en <a href="%{policy_path}">onze gebruiksvoorwaarden</a>.
         subject: 'Mastodon: E-mail bevestigen voor %{instance}'
         title: E-mailadres verifiëren
@@ -51,7 +51,7 @@ nl:
         subject: 'Mastodon: Tweestapsverificatie uitgeschakeld'
         title: Tweestapsverificatie uitgeschakeld
       two_factor_enabled:
-        explanation: Tweestapsverificatie voor jouw account is ingeschakeld. Om te kunnen aanmelden is een door een tweestapsverificatie-app genereerde toegangscode nodig.
+        explanation: Tweestapsverificatie voor jouw account is ingeschakeld. Om te kunnen inloggen is een door een tweestapsverificatie-app genereerde toegangscode nodig.
         subject: 'Mastodon: Tweestapsverificatie ingeschakeld'
         title: Tweestapsverificatie ingeschakeld
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index 88d8458f7..eee992847 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -41,7 +41,7 @@ nn:
         subject: 'Mastodon: Stadfest e-post for %{instance}'
         title: Stadfest e-postadresse
       reset_password_instructions:
-        action: Endr passord
+        action: Endre passord
         explanation: Du har bedt om eit nytt passord til kontoen din.
         extra: Om du ikkje bad om dette, ignorer denne e-posten. Passordet ditt vert ikkje endra før du går inn på lenkja ovanfor og lagar eit nytt.
         subject: 'Mastodon: Instuksjonar for å endra passord'
@@ -63,51 +63,53 @@ nn:
       webauthn_credential:
         added:
           explanation: Følgende sikkerhetsnøkkel har blitt lagt til i kontoen din
-          subject: 'Mastodon: Ny sikkerhetsnøkkel'
-          title: En ny sikkerhetsnøkkel har blitt lagt til
+          subject: 'Mastodon: Ny sikkerheitsnøkkel'
+          title: Ein ny sikkerheitsnøkkel har blitt lagt til
         deleted:
-          explanation: Følgende sikkerhetsnøkkel har blitt slettet fra kontoen din
-          subject: 'Mastodon: Sikkerhetsnøkkel slettet'
-          title: En av sikkerhetsnøklene dine har blitt slettet
+          explanation: Den følgande sikkerheitsnøkkelen har blitt sletta frå kontoen din
+          subject: 'Mastodon: Sikkerheitsnøkkel sletta'
+          title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
-        subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
-        title: Sikkerhetsnøkler deaktivert
+        explanation: Du kan ikkje bruke tryggleiksnyklar til å logga inn på kontoen din. Du kan berre logga inn med koden frå tofaktor-appen som er kopla saman med brukarkontoen din.
+        subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
+        title: Sikkerheitsnøklar deaktivert
       webauthn_enabled:
-        subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
-        title: Sikkerhetsnøkler aktivert
+        explanation: Pålogging med tryggleiksnyklar er skrudd på. No kan du bruka nykelen din for å logga på.
+        subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
+        title: Sikkerheitsnøklar aktivert
     omniauth_callbacks:
-      failure: Du kunne ikkje verte autentisert frå %{kind} av di "%{reason}".
+      failure: Kunne ikkje autentisere deg frå %{kind} fordi "%{reason}".
       success: Autentisert frå %{kind}-konto.
     passwords:
-      no_token: Du har ikkje tilgang til denne sida utan ha gått via ein e-post som gjeld å nullstille passordet. Dersom det er kva du har gjort, dobbelsjekk at du har kopiert heile URLen.
-      send_instructions: Om vi har e-postadressa di i databasen vår, får du ein e-post med lenke til gjenopprette passordet om nokre få minutt. Sjekk søppelpostmappa di om du ikkje fekk denne e-posten.
-      send_paranoid_instructions: Om vi har e-postadressa di i databasen vår, får du ei lenkje til å endra passordet om nokre få minutt. Ver venleg og sjekk søppelpostmappa om du ikkje fekk denne e-posten.
+      no_token: Du har ikkje tilgang til denne sida utan ha gått via ein e-post som gjeld å nullstille passordet. Dersom det var det du gjorde, dobbelsjekk at du har kopiert heile URLen.
+      send_instructions: Om me har epostadressa di i databasen vår, får du ein epost med ei lenke til å gjenopprette passordet om nokre få minutt. Sjekk søppelpostmappa di om du ikkje fekk denne eposten.
+      send_paranoid_instructions: Om me har epostadressa di i databasen vår, får du ei lenke til å endra passordet om nokre få minutt. Ver venleg å sjekke søppelpostmappa om du ikkje fekk denne eposten.
       updated: Passordet ditt er endra. No er du logga inn.
       updated_not_active: Passordet ditt er endra.
     registrations:
-      destroyed: Ha det! Kontoen din er sletta. Vi vonar å sjå deg igjen snart.
+      destroyed: Ha det! Kontoen din er sletta. Me vonar å sjå deg igjen snart.
       signed_up: Velkomen! No er du registrert.
-      signed_up_but_inactive: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er ikkje aktivert enno.
-      signed_up_but_locked: Du har registrert deg inn, men vi kunne ikkje logga deg inn fordi kontoen din er låst.
-      signed_up_but_pending: Ei melding med ei stadfestingslenkje er vorten send til e-postadressa di. Når du klikkar på lenkja skal vi sjå gjennom søknaden din. Du får ei melding om han vert godkjend.
-      signed_up_but_unconfirmed: Ei melding med ei lenke for å stadfeste kontoen har vorte sendt e-postadressa di. Klikk på lenka for å aktivere kontoen. Sjekk søppelpostmappa dersom du ikkje har fått e-posten.
-      update_needs_confirmation: Du har oppdatert kontoen din, men vi må stadfeste den nye e-postadressa. Sjekk innboksen og følg lenka for å stadfeste adressa di. Sjekk søppelpostmappa dersom du ikkje har fått den e-posten.
+      signed_up_but_inactive: Du har registrert deg, men me kunne ikkje logga deg inn fordi kontoen din er ikkje aktivert enno.
+      signed_up_but_locked: Du har registrert deg, men me kunne ikkje logga deg inn fordi kontoen din er låst.
+      signed_up_but_pending: Ei melding med ei stadfestingslenke har vorte sendt til epostadressa di. Når du klikkar på lenka skal me sjå gjennom søknaden din. Du får ei melding om den vert godkjend.
+      signed_up_but_unconfirmed: Ei melding med ei lenke for å stadfeste kontoen har vorte sendt til epostadressa di. Klikk på lenka for å aktivere kontoen. Sjekk søppelpostmappa dersom du ikkje har fått eposten.
+      update_needs_confirmation: Du har oppdatert kontoen din, men me må stadfesta den nye epostadressa. Sjekk innboksen og fylg lenka for å stadfeste adressa di. Sjekk søppelpostmappa dersom du ikkje har fått denne eposten.
       updated: Kontoen har vorte oppdatert.
     sessions:
       already_signed_out: Logga ut.
       signed_in: Logga inn.
       signed_out: Logga ut.
     unlocks:
-      send_instructions: Om nokre minutt får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din. Sjekk søppelpostmappa om du ikkje finn den mailen.
-      send_paranoid_instructions: Dersom du har konto her, får du ein e-post med instruksjonar for korleis du kan låse opp kontoen din om nokre minutt. Sjekk søppelpostmappa om du ikkje finn den mailen.
+      send_instructions: Om nokre minutt får du ein epost med instruksjonar for korleis du kan låse opp kontoen din. Sjekk søppelpostmappa om du ikkje finn den eposten.
+      send_paranoid_instructions: Dersom du har konto her, får du ein epost med instruksjonar for korleis du kan låse opp kontoen din om nokre minutt. Sjekk søppelpostmappa om du ikkje finn den eposten.
       unlocked: Kontoen din har vorte låst opp. Logg inn for å halde fram.
   errors:
     messages:
-      already_confirmed: er allereie stadfesta, prøv logge inn
+      already_confirmed: er allereie stadfesta, prøv å logge inn
       confirmation_period_expired: må verte stadfesta innan %{period}, spør etter ein ny
-      expired: er utgått, ver venleg å beda om ein ny ein
+      expired: er utgått, ver venleg å be om ein ny ein
       not_found: ikkje funne
       not_locked: var ikkje låst
       not_saved:
         one: '1 feil hindra %{resource} frå verte lagra:'
-        other: "%{count} feil hindra %{resource} frå verte lagra:"
+        other: "%{count} feil hindra %{resource} frå å verte lagra:"
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index 4fdc1276b..a5d6cad7a 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -3,17 +3,17 @@
   devise:
     confirmations:
       confirmed: E-postaddressen din er blitt bekreftet.
-      send_instructions: Du vil motta en e-post med instruksjoner for bekreftelse om noen få minutter.
-      send_paranoid_instructions: Hvis din e-postaddresse finnes i vår database vil du motta en e-post med instruksjoner for bekreftelse om noen få minutter.
+      send_instructions: Du vil motta en e-post med instruksjoner for bekreftelse om noen få minutter. Sjekk spam-mappen hvis du ikke mottok e-posten.
+      send_paranoid_instructions: Hvis e-postadressen din finnes i databasen vår vil du om noen få minutter motta en e-post med instruksjoner for bekreftelse. Sjekk spam-mappen din hvis du ikke mottok e-posten.
     failure:
       already_authenticated: Du er allerede innlogget.
-      inactive: Din konto er ikke blitt aktivert ennå.
+      inactive: Kontoen din er ikke blitt aktivert ennå.
       invalid: Ugyldig %{authentication_keys} eller passord.
       last_attempt: Du har ett forsøk igjen før kontoen din låses.
-      locked: Din konto er låst.
+      locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
       pending: Kontoen din er fortsatt under gjennomgang.
-      timeout: Økten din løp ut på tid. Logg inn på nytt for å fortsette.
+      timeout: Økten din har utløpt. Logg inn igjen for å fortsette.
       unauthenticated: Du må logge inn eller registrere deg før du kan fortsette.
       unconfirmed: Du må bekrefte e-postadressen din før du kan fortsette.
     mailer:
@@ -22,41 +22,41 @@
         action_with_app: Bekreft og gå tilbake til %{app}
         explanation: Du har laget en konto på %{host} med denne e-postadressen. Du er ett klikk unna å aktivere den. Hvis dette ikke var deg, vennligst se bort fra denne e-posten.
         explanation_when_pending: Du søkte om en invitasjon til %{host} med denne E-postadressen. Når du har bekreftet E-postadressen din, vil vi gå gjennom søknaden din. Du kan logge på for å endre dine detaljer eller slette kontoen din, men du har ikke tilgang til de fleste funksjoner før kontoen din er akseptert. Dersom søknaden din blir avslått, vil dataene dine bli fjernet, så ingen ytterligere handlinger fra deg vil være nødvendige. Dersom dette ikke var deg, vennligst ignorer denne E-posten.
-        extra_html: Vennligst også sjekk ut <a href="%{terms_path}">instansens regler </a> og <a href="%{policy_path}">våre bruksvilkår</a>.
-        subject: 'Mastodon: Instruksjoner for å bekrefte e-postadresse %{instance}'
+        extra_html: Sjekk også ut <a href="%{terms_path}">instansens regler </a> og <a href="%{policy_path}">våre bruksvilkår</a>.
+        subject: 'Mastodon: Instruksjoner for bekreftelse for %{instance}'
         title: Bekreft e-postadresse
       email_changed:
         explanation: 'E-postadressen til din konto endres til:'
-        extra: Hvis du ikke endret din e-postadresse, er det sannsynlig at noen har fått tilgang til din konto. Vennligst endre ditt passord umiddelbart eller kontakt instansens administrator dersom du er utestengt fra kontoen din.
-        subject: 'Mastadon: E-postadresse endret'
+        extra: Hvis du ikke endret e-postadressen din, er det sannsynlig at noen har fått tilgang til kontoen din. Vennligst endre passordet ditt umiddelbart eller kontakt instansens administrator dersom du er låst ute fra kontoen din.
+        subject: 'Mastodon: E-postadresse endret'
         title: Ny e-postadresse
       password_change:
-        explanation: Passordet til din konto har blitt endret.
-        extra: Hvis du ikke endret ditt passord, er det sannsynlig at noen har fått tilgang til din konto. Vennligst endre ditt passord umiddelbart eller kontakt instansens administrator dersom du er utestengt fra kontoen din.
+        explanation: Passordet til kontoen din har blitt endret.
+        extra: Hvis du ikke endret passordet ditt, er det sannsynlig at noen har fått tilgang til kontoen din. Vennligst endre passordet ditt umiddelbart eller kontakt instansens administrator dersom du er utestengt fra kontoen din.
         subject: 'Mastodon: Passord endret'
         title: Passord endret
       reconfirmation_instructions:
-        explanation: Din nye e-postadresse må bekreftes for å bli endret.
-        extra: Se bort fra denne e-posten dersom du ikke gjorde denne endringen. E-postadressen for Mastadon-kontoen blir ikke endret før du trykker på lenken over.
+        explanation: Bekreft den nye e-postadressen for å endre e-post.
+        extra: Se bort fra denne e-posten dersom du ikke gjorde denne endringen. E-postadressen for Mastodon-kontoen blir ikke endret før du trykker på lenken over.
         subject: 'Mastodon: Bekreft e-postadresse for %{instance}'
         title: Bekreft e-postadresse
       reset_password_instructions:
         action: Endre passord
-        explanation: Du ba om et nytt passord for din konto.
-        extra: Se bort fra denne e-posten dersom du ikke ba om dette. Ditt passord blir ikke endret før du trykker på lenken over og lager et nytt.
+        explanation: Du ba om et nytt passord til kontoen din.
+        extra: Se bort fra denne e-posten dersom du ikke ba om dette. Passordet ditt blir ikke endret før du trykker på lenken over og lager et nytt.
         subject: 'Mastodon: Hvordan nullstille passord'
         title: Nullstill passord
       two_factor_disabled:
-        explanation: 2-trinnsinnlogging for kontoen din har blitt skrudd av. Pålogging er mulig gjennom kun E-postadresse og passord.
-        subject: 'Mastodon: To-faktor autentisering deaktivert'
+        explanation: Tofaktorautentisering for kontoen din har blitt skrudd av. Pålogging er nå mulig ved å bruke kun e-postadresse og passord.
+        subject: 'Mastodon: Tofaktorautentisering deaktivert'
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: To-faktor autentisering er aktivert for kontoen din. Et symbol som er generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
-        subject: 'Mastodon: To-faktor autentisering aktivert'
+        explanation: Tofaktorautentisering er aktivert for kontoen din. Et token som er generert av appen for tidsbasert engangspassord (TOTP) som er koblet til kontoen kreves for innlogging.
+        subject: 'Mastodon: Tofaktorautentisering aktivert'
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
-        explanation: De forrige gjenopprettingskodene er ugyldig og nye generert.
-        subject: 'Mastodon: 2-trinnsgjenopprettingskoder har blitt generert på nytt'
+        explanation: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
+        subject: 'Mastodon: Tofaktor-gjenopprettingskoder har blitt generert på nytt'
         title: 2FA-gjenopprettingskodene ble endret
       unlock_instructions:
         subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
@@ -70,37 +70,39 @@
           subject: 'Mastodon: Sikkerhetsnøkkel slettet'
           title: En av sikkerhetsnøklene dine har blitt slettet
       webauthn_disabled:
+        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din. Innlogging er nå mulig ved hjelp av kun et token som er generert av engangspassord-appen som er koblet til kontoen.
         subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
         title: Sikkerhetsnøkler deaktivert
       webauthn_enabled:
+        explanation: Sikkerhetsnøkkel-autentisering er aktivert for din konto. Din sikkerhetsnøkkel kan nå brukes til innlogging.
         subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
         title: Sikkerhetsnøkler aktivert
     omniauth_callbacks:
       failure: Kunne ikke autentisere deg fra %{kind} fordi "%{reason}".
-      success: Vellykket autentisering fra %{kind}.
+      success: Vellykket autentisering fra %{kind}-konto.
     passwords:
-      no_token: Du har ingen tilgang til denne siden hvis ikke klikket på en e-post om nullstilling av passord. Hvis du kommer fra en sådan bør du dobbelsjekke at du limte inn hele URLen.
-      send_instructions: Du vil motta en e-post med instruksjoner om nullstilling av passord om noen få minutter.
-      send_paranoid_instructions: Hvis e-postadressen din finnes i databasen vår vil du motta en e-post med instruksjoner om nullstilling av passord om noen få minutter.
+      no_token: Du har ikke tilgang til denne siden hvis du ikke kom hit etter å ha klikket på en e-post om nullstilling av passord. Hvis du kommer fra en sådan bør du dobbelsjekke at du limte inn hele URLen.
+      send_instructions: Hvis e-postadressen din finnes i databasen vår, vil du motta en e-post med instruksjoner om nullstilling av passord om noen få minutter. Sjekk spam-mappen din hvis du ikke mottok e-posten.
+      send_paranoid_instructions: Hvis e-postadressen din finnes i databasen vår vil du motta en e-post med instruksjoner om nullstilling av passord om noen få minutter. Sjekk spam-mappen din hvis du ikke mottok e-posten.
       updated: Passordet ditt er endret. Du er nå logget inn.
       updated_not_active: Passordet ditt er endret.
     registrations:
-      destroyed: Adjø! Kontoen din er slettet. På gjensyn.
+      destroyed: Ha det! Kontoen din er avsluttet. Vi håper å se deg igjen snart.
       signed_up: Velkommen! Registreringen var vellykket.
       signed_up_but_inactive: Registreringen var vellykket. Vi kunne dessverre ikke logge deg inn fordi kontoen din ennå ikke har blitt aktivert.
       signed_up_but_locked: Registreringen var vellykket. Vi kunne dessverre ikke logge deg inn fordi kontoen din har blitt låst.
-      signed_up_but_pending: En melding med en bekreftelseslink er sendt til din e-postadresse. Etter at du har klikket på koblingen, vil vi gjennomgå søknaden din. Du vil bli varslet hvis den er godkjent.
-      signed_up_but_unconfirmed: En e-post med en bekreftelseslenke har blitt sendt til din innboks. Klikk på lenken i e-posten for å aktivere kontoen din.
-      update_needs_confirmation: Du har oppdatert kontoen din, men vi må bekrefte din nye e-postadresse. Sjekk e-posten din og følg bekreftelseslenken for å bekrefte din nye e-postadresse.
+      signed_up_but_pending: En melding med en bekreftelseslenke er sendt til din e-postadresse. Etter at du har klikket på lenken, vil vi gjennomgå søknaden din. Du vil bli varslet hvis den blir godkjent.
+      signed_up_but_unconfirmed: En melding med en bekreftelseslenke har blitt sendt til din e-postadresse. Klikk på lenken i e-posten for å aktivere kontoen din. Sjekk spam-mappen din hvis du ikke mottok e-posten.
+      update_needs_confirmation: Du har oppdatert kontoen din, men vi må bekrefte din nye e-postadresse. Sjekk e-posten din og følg bekreftelseslenken for å bekrefte din nye e-postadresse. Sjekk spam-mappen din hvis du ikke mottok e-posten.
       updated: Kontoen din ble oppdatert.
     sessions:
       already_signed_out: Logget ut.
       signed_in: Logget inn.
       signed_out: Logget ut.
     unlocks:
-      send_instructions: Du vil motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      send_paranoid_instructions: Hvis kontoen din eksisterer vil du motta en e-post med instruksjoner for å åpne kontoen din om noen få minutter.
-      unlocked: Kontoen din ble åpnet uten problemer. Logg på for å fortsette.
+      send_instructions: Du vil motta en e-post med instruksjoner for å låse opp kontoen din om noen få minutter. Sjekk spam-mappen din hvis du ikke mottok e-posten.
+      send_paranoid_instructions: Hvis kontoen din eksisterer vil du motta en e-post med instruksjoner for å låse opp kontoen din om noen få minutter. Sjekk spam-katalogen din hvis du ikke mottok denne e-posten.
+      unlocked: Kontoen din er nå låst opp. Logg på for å fortsette.
   errors:
     messages:
       already_confirmed: har allerede blitt bekreftet, prøv å logge på istedet
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index cc1b670bb..ff086888f 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -3,7 +3,7 @@ pl:
   devise:
     confirmations:
       confirmed: Twój adres e-mail został poprawnie zweryfikowany.
-      send_instructions: W ciągu kilku minut otrzymasz wiadomosć e-mail z instrukcją jak potwierdzić Twój adres e-mail. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
+      send_instructions: W ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją jak potwierdzić Twój adres e-mail. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
       send_paranoid_instructions: Jeśli Twój adres e-mail już istnieje w naszej bazie danych, w ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją jak potwierdzić Twój adres e-mail. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
     failure:
       already_authenticated: Jesteś już zalogowany(-a).
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index 8579d2c64..d25d0f6b3 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -60,6 +60,23 @@ ro:
         title: Coduri de recuperare 2FA modificate
       unlock_instructions:
         subject: Instrucțiuni de deblocare
+      webauthn_credential:
+        added:
+          explanation: Următoarea cheie de securitate a fost adăugată în contul tău
+          subject: 'Mastodon: Noua cheie de securitate'
+          title: A fost adăugată o nouă cheie de securitate
+        deleted:
+          explanation: Următoarea cheie de securitate a fost ștearsă din contul tău
+          subject: 'Mastodon: Cheie de securitate ștearsă'
+          title: Una dintre cheile tale de securitate a fost ștearsă
+      webauthn_disabled:
+        explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul tău. Conectarea este posibilă acum folosind doar token-ul generat de aplicația TOTP.
+        subject: 'Mastodon: Autentificarea cu chei de securitate dezactivată'
+        title: Chei de securitate dezactivate
+      webauthn_enabled:
+        explanation: Autentificarea cheii de securitate a fost activată pentru contul tău. Cheia ta de securitate poate fi acum folosită pentru conectare.
+        subject: 'Mastodon: Autentificarea cheii de securitate activată'
+        title: Chei de securitate activate
     omniauth_callbacks:
       failure: Nu te-am putut autentifica de la %{kind} deoarece "%{reason}".
       success: Autentificat cu succes din contul %{kind}.
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index ada7867f2..d2903ce23 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -57,7 +57,7 @@ ru:
       two_factor_recovery_codes_changed:
         explanation: Предыдущие резервные коды были аннулированы и созданы новые.
         subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
-        title: Резервные коды 2ФА изменены
+        title: Коды восстановления 2FA изменены
       unlock_instructions:
         subject: 'Mastodon: Инструкция по разблокировке'
       webauthn_credential:
diff --git a/config/locales/devise.sco.yml b/config/locales/devise.sco.yml
new file mode 100644
index 000000000..8563b4ee2
--- /dev/null
+++ b/config/locales/devise.sco.yml
@@ -0,0 +1,115 @@
+---
+sco:
+  devise:
+    confirmations:
+      confirmed: Yer email address haes been successfully confirmt.
+      send_instructions: Ye'll get a email tellin ye hou tae confirm yer email address in a wee minute. Please tak a luik in yer mince folder if ye didnae get this email.
+      send_paranoid_instructions: Gin yer email address exists in wir database, ye'll get a email tellin ye hou tae mak siccar yer email address in a wee minute. Please check yer mince folder if ye didnae get this email.
+    failure:
+      already_authenticated: Ye'r signed in awriddy.
+      inactive: Yer accoont isnae activatit yit.
+      invalid: No a valid %{authentication_keys} or passwird.
+      last_attempt: Ye'v juist the ae mair attempt afore yer accoont is snibbed.
+      locked: Yer accoont is snibbed.
+      not_found_in_database: No a valid %{authentication_keys} or passwird.
+      pending: Yer accoont is stull gettin luiked at the noo.
+      timeout: Yer session is expirit. Please sign in again fit tae gae forret.
+      unauthenticated: Ye'r needin tae sign in or sign up afore gaein forret.
+      unconfirmed: Ye hae tae confirm yer email address afore gaun forret.
+    mailer:
+      confirmation_instructions:
+        action: Verify yer email address
+        action_with_app: Mak siccar an return tae %{app}
+        explanation: Ye'v makkit a accoont on %{host} wi this email address. Ye'r ae click awa fae activatin it. If this wisnae yersel, please dinnae bother aboot this email.
+        explanation_when_pending: Ye applied fir a invite tae %{host} wi this email address. Ance ye mak siccar yer email address, we wull luik ower yer application. Ye kin log in tae chynge yer details or fir tae delete yer accoont, but ye cannae uise maist o the functions tae yer accoont is appruived. Gin yer application isnae taen on yer data wull get deletit, sae nae mair action wull be needit fae ye. Gin this wisnae yersel, please dinnae bother aboot this email.
+        extra_html: Please tak a deek at <a href="%{terms_path}">the rules o the server tae</a> an <a href="%{policy_path}">oor terms o service</a>.
+        subject: 'Mastodon: Confirmation instructions fir %{instance}'
+        title: Verify yer email address
+      email_changed:
+        explanation: 'The email address fir yer accoont is gettin chynged tae:'
+        extra: Gin ye didnae chynge yer email, it's mibbie the case thit somebody haes got access tae yer accoont. Please chynge yer passwird richt noo or get in touch wi the server admin if ye'r snibbed oot yer accoont.
+        subject: 'Mastodon: Email chynged'
+        title: New email address
+      password_change:
+        explanation: The passwird fir yer accoont haes been chynged.
+        extra: Gin ye didnae chynge yer passwird, it's mibbie the case thit somebody haes got access tae yer accoont. Please chynge yer passwird richt noo or get in touch wi the server admin if ye'r snibbed oot yer accoont.
+        subject: 'Mastodon: Passwird chynged'
+        title: Passwird chynged
+      reconfirmation_instructions:
+        explanation: Mak siccar the new address fir tae chynge yer email.
+        extra: Gin this chynge wisnae stertit bi yersel, please dingie this email. The email address fir the Mastodon accoont wullnae chynge tae ye chap the link abuin.
+        subject: 'Mastodon: Mak siccar email fir %{instance}'
+        title: Mak siccar email address
+      reset_password_instructions:
+        action: Chynge passwird
+        explanation: Ye speirt fir a new passwird fir yer accoont.
+        extra: Gin ye didnae speir fir this, please dingie this email. Yer passwird wullnae chynge tae ye chap the link abuin an mak a new ane.
+        subject: 'Mastodon: Reset passwird instructions'
+        title: Passwird reset
+      two_factor_disabled:
+        explanation: Twa factor authentication fir yer accoont haes been turnt aff. Login is noo possible uisin ainly a email address an passwird.
+        subject: 'Mastodon: Twa-factor authentication turnt aff'
+        title: 2FA turnt aff
+      two_factor_enabled:
+        explanation: Twa-factor authentication haes been turnt on fir yer accoont. A token gien bi the pairt TOTP app wull be needit fir login.
+        subject: 'Mastodon: Twa-factor authentication turnt on'
+        title: 2FA turnt on
+      two_factor_recovery_codes_changed:
+        explanation: The last recovery codes haes been pit in the bucket an new anes makkit.
+        subject: 'Mastodon: Twa-factor recovery codes re-jigged'
+        title: 2FA recovery codes chynged
+      unlock_instructions:
+        subject: 'Mastodon: Unsnib instructions'
+      webauthn_credential:
+        added:
+          explanation: The follaein security key haes been addit tae yer accoont
+          subject: 'Mastodon: New security key'
+          title: A new security key haes been addit
+        deleted:
+          explanation: The follaein security key haes been deletit fae yer accoont
+          subject: 'Mastodon: Security key deletit'
+          title: Ane o yer security keys haes been deletit
+      webauthn_disabled:
+        explanation: Authentication wi security keys haes been turnt aff on yer accoont. Login is noo possible uisin ainly the token generatit bi the pairt TOTP app.
+        subject: 'Mastodon: Authentication wi security keys turnt aff'
+        title: Security keys turnt aff
+      webauthn_enabled:
+        explanation: Security key authentication haes been turnt on fir yer accoont. Yer security key kin noo be uised fir login.
+        subject: 'Mastodon: Security key authentication turnt on'
+        title: Security keys turnt on
+    omniauth_callbacks:
+      failure: Cuidnae authenticate ye fae %{kind} acause “%{reason}”.
+      success: Successfully authenticatit fae %{kind} accoont.
+    passwords:
+      no_token: Ye cannae access this page athoot comin in fae a passwird reset email. Gin ye dae come fae a passwird reset email, please mak siccar ye uised the hail URL sent ye.
+      send_instructions: Gin yer email address exists in wir database, ye'll get a passwird recovery link in yer email in a wee minute. Please check yer mince folder if ye didnae get this email.
+      send_paranoid_instructions: Gin yer email address exists in wir database, ye'll get a passwird recovery link in yer email in a wee minute. Please check yer mince folder if ye didnae get this email.
+      updated: Yer passwird haes been chynged successfully. Ye'r noo signed in.
+      updated_not_active: Yer passwird haes been chynged successfully.
+    registrations:
+      destroyed: Cheerio! Yer accoont haes been successfully shut doon. We howp fir tae see ye again suin.
+      signed_up: Hullo! Ye'v signed up successfully.
+      signed_up_but_inactive: Ye'v signed up successfully. Hou an iver, we cuidnae sign ye in acause yer accoont isnae activatit yit.
+      signed_up_but_locked: Ye'v signed up successfully. Hou an iver, we cuidnae sign ye in acause yer accoont is snibbed.
+      signed_up_but_pending: A email wi a confirmation link haes been sent tae yer email address. Efter ye chap on the link, we'll luik ower yer application. Ye'll be sent a note gin it's approved.
+      signed_up_but_unconfirmed: A message wi a confirmation link haes been sent tae yer email address. Please follae the link fir tae activate yer accoont. Please check yer mince folder if ye didnae get this email.
+      update_needs_confirmation: Ye updatit yer accoont successfully, but we need tae verify yer new email address. Please tak a deek at yer email an follae the confirm link fir tae confirm yer new email address. Please tak a deek at yer mince folder if ye didnae get this email.
+      updated: Yer accoont haes been updatit successfully.
+    sessions:
+      already_signed_out: Signed oot successfully.
+      signed_in: Signed in successfully.
+      signed_out: Signed oot successfully.
+    unlocks:
+      send_instructions: Ye'll get a email wi instructions fir hou tae unsnib yer accoont in a wee minute. Please tak a deek at yer mince folder if ye didnae get this email.
+      send_paranoid_instructions: Gin yer accoont exists, ye'll get a email wi instructions fir hou tae unsnib it in a wee minute. Please tak a deek at yer mince folder if ye didnae get this email.
+      unlocked: Yer accoont haes been unsnibbed successfully. Please sign in fir tae gae forret.
+  errors:
+    messages:
+      already_confirmed: wis awriddy confirmt, please try signing in
+      confirmation_period_expired: needs tae be confirmt athin %{period}, please request a new ane
+      expired: haes expirt, please request a new ane
+      not_found: no fun
+      not_locked: wisnae snibbed
+      not_saved:
+        one: '1 error prohibitit this %{resource} fae bein saved:'
+        other: "%{count} errors prohibitit this %{resource} fae bein saved:"
diff --git a/config/locales/devise.si.yml b/config/locales/devise.si.yml
index b9aa1527c..a20057cef 100644
--- a/config/locales/devise.si.yml
+++ b/config/locales/devise.si.yml
@@ -1,42 +1,115 @@
 ---
 si:
   devise:
+    confirmations:
+      confirmed: ඔබගේ විද්‍යුත් තැපැල් ලිපිනය සාර්ථකව තහවුරු කර ඇත.
+      send_instructions: මිනිත්තු කිහිපයකින් ඔබගේ විද්‍යුත් තැපැල් ලිපිනය තහවුරු කරන ආකාරය පිළිබඳ උපදෙස් සහිත විද්‍යුත් තැපෑලක් ඔබට ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      send_paranoid_instructions: ඔබගේ විද්‍යුත් තැපැල් ලිපිනය අපගේ දත්ත ගබඩාවේ තිබේ නම්, මිනිත්තු කිහිපයකින් ඔබගේ විද්‍යුත් තැපැල් ලිපිනය තහවුරු කරන ආකාරය පිළිබඳ උපදෙස් සහිත විද්‍යුත් තැපෑලක් ඔබට ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
     failure:
       already_authenticated: ඔබ දැනටමත් පිවිස ඇත.
+      inactive: ඔබගේ ගිණුම තවම සක්‍රිය කර නොමැත.
+      invalid: වලංගු නොවන %{authentication_keys} හෝ මුරපදය.
+      last_attempt: ඔබගේ ගිණුම අගුලු දැමීමට පෙර ඔබට තවත් එක් උත්සාහයක් ඇත.
       locked: ඔබගේ ගිණුම අගුළු දමා ඇත.
+      not_found_in_database: වලංගු නොවන %{authentication_keys} හෝ මුරපදය.
+      pending: ඔබගේ ගිණුම තවමත් සමාලෝචනය වෙමින් පවතී.
+      timeout: ඔබේ සැසිය කල් ඉකුත් විය. ඉදිරියට යාමට කරුණාකර නැවත පුරන්න.
+      unauthenticated: ඉදිරියට යාමට පෙර ඔබ පුරනය වීමට හෝ ලියාපදිංචි වීමට අවශ්‍ය වේ.
+      unconfirmed: දිගටම කරගෙන යාමට පෙර ඔබ ඔබේ ඊමේල් ලිපිනය තහවුරු කළ යුතුය.
     mailer:
       confirmation_instructions:
-        title: වි. තැපැල් ලිපිනය තහවුරු කරන්න
+        action: ඊමේල් ලිපිනය තහවුරු කරන්න
+        action_with_app: තහවුරු කර %{app}වෙත ආපසු යන්න
+        explanation: ඔබ මෙම ඊමේල් ලිපිනය සමඟ %{host} හි ගිණුමක් සාදා ඇත. ඔබ එය සක්‍රිය කිරීමට එක ක්ලික් කිරීමක් ඇත. මේ ඔබ නොවේ නම්, කරුණාකර මෙම විද්‍යුත් තැපෑල නොසලකා හරින්න.
+        explanation_when_pending: ඔබ මෙම විද්‍යුත් තැපැල් ලිපිනය සමඟ %{host} වෙත ආරාධනාවක් සඳහා ඉල්ලුම් කළා. ඔබ ඔබගේ විද්‍යුත් තැපැල් ලිපිනය තහවුරු කළ පසු, අපි ඔබගේ අයදුම්පත සමාලෝචනය කරන්නෙමු. ඔබගේ විස්තර වෙනස් කිරීමට හෝ ඔබගේ ගිණුම මකා දැමීමට ඔබට පුරනය විය හැක, නමුත් ඔබගේ ගිණුම අනුමත වන තුරු ඔබට බොහෝ කාර්යයන් වෙත ප්‍රවේශ විය නොහැක. ඔබගේ අයදුම්පත ප්‍රතික්ෂේප කළහොත්, ඔබගේ දත්ත ඉවත් කරනු ඇත, එබැවින් ඔබෙන් වැඩිදුර ක්‍රියාමාර්ග අවශ්‍ය නොවනු ඇත. මේ ඔබ නොවේ නම්, කරුණාකර මෙම විද්‍යුත් තැපෑල නොසලකා හරින්න.
+        extra_html: කරුණාකර <a href="%{terms_path}">සේවාදායකයේ නීති</a> සහ <a href="%{policy_path}">අපගේ සේවා කොන්දේසි</a>ද පරීක්ෂා කරන්න.
+        subject: 'Mastodon: %{instance}සඳහා තහවුරු කිරීමේ උපදෙස්'
+        title: වි. තැපෑල තහවුරු කරන්න
       email_changed:
+        explanation: 'ඔබගේ ගිණුම සඳහා ඊමේල් ලිපිනය වෙනස් වෙමින් පවතී:'
+        extra: ඔබ ඔබගේ විද්‍යුත් තැපෑල වෙනස් නොකළේ නම්, යම් අයෙකු ඔබගේ ගිණුමට ප්‍රවේශය ලබා ගෙන ඇති බව පෙනෙන්නට තිබේ. ඔබගේ ගිණුමෙන් අගුලු දමා ඇත්නම් කරුණාකර ඔබගේ මුරපදය වහාම වෙනස් කරන්න හෝ සේවාදායක පරිපාලක අමතන්න.
         subject: 'මාස්ටඩන්: වි-තැපෑල වෙනස් විය'
-        title: නව විද්‍යුත් තැපැල් ලිපිනය
+        title: නව වි-තැපැල් ලිපිනය
       password_change:
-        title: මුරපදය වෙනස් කරන ලදි
+        explanation: ඔබගේ ගිණුම සඳහා මුරපදය වෙනස් කර ඇත.
+        extra: ඔබ ඔබගේ මුරපදය වෙනස් නොකළේ නම්, යමෙකු ඔබගේ ගිණුමට ප්‍රවේශය ලබා ගෙන ඇති බව පෙනෙන්නට තිබේ. ඔබගේ ගිණුමෙන් අගුලු දමා ඇත්නම් කරුණාකර ඔබගේ මුරපදය වහාම වෙනස් කරන්න හෝ සේවාදායක පරිපාලක අමතන්න.
+        subject: 'Mastodon: මුරපදය වෙනස් විය'
+        title: මුරපදය වෙනස් විය
       reconfirmation_instructions:
-        title: වි. තැපැල් ලිපිනය තහවුරු කරන්න
+        explanation: ඔබගේ ඊමේල් වෙනස් කිරීමට නව ලිපිනය තහවුරු කරන්න.
+        extra: මෙම වෙනස ඔබ විසින් ආරම්භ කරන ලද්දක් නොවේ නම්, කරුණාකර මෙම විද්‍යුත් තැපෑල නොසලකා හරින්න. ඔබ ඉහත සබැඳියට ප්‍රවේශ වන තෙක් Mastodon ගිණුම සඳහා ඊමේල් ලිපිනය වෙනස් නොවේ.
+        subject: 'Mastodon: %{instance}සඳහා විද්‍යුත් තැපෑල තහවුරු කරන්න'
+        title: වි-තැපෑල තහවුරු කරන්න
       reset_password_instructions:
         action: මුරපදය වෙනස් කරන්න
-        title: මුරපදය නැවත සැකසීම
+        explanation: ඔබ ඔබගේ ගිණුම සඳහා නව මුරපදයක් ඉල්ලා ඇත.
+        extra: ඔබ මෙය ඉල්ලා නොසිටියේ නම්, කරුණාකර මෙම විද්‍යුත් තැපෑල නොසලකා හරින්න. ඔබ ඉහත සබැඳියට ප්‍රවේශ වී අලුත් එකක් සාදන තෙක් ඔබේ මුරපදය වෙනස් නොවනු ඇත.
+        subject: 'Mastodon: මුරපද උපදෙස් යළි පිහිටුවන්න'
+        title: මුරපදය යළි සැකසීම
       two_factor_disabled:
+        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය අබල කර ඇත. විද්‍යුත් තැපැල් ලිපිනය සහ මුරපදය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
+        subject: 'Mastodon: ද්වි සාධක සත්‍යාපනය අක්‍රීය කර ඇත'
         title: ද්විපියවර අබලයි
       two_factor_enabled:
+        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය සක්‍රීය කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනයක් පුරනය වීමට අවශ්‍ය වනු ඇත.
+        subject: 'Mastodon: ද්වි සාධක සත්‍යාපනය සක්‍රීය කර ඇත'
         title: ද්විපියවර සබලයි
       two_factor_recovery_codes_changed:
-        title: ද්විපියවර ප්‍රතිසාධන කේත වෙනස්විණි
+        explanation: පෙර ප්‍රතිසාධන කේත අවලංගු කර නව ඒවා උත්පාදනය කර ඇත.
+        subject: 'Mastodon: ද්වි-සාධක ප්‍රතිසාධන කේත නැවත උත්පාදනය කරන ලදී'
+        title: ද්විපියවර ප්‍රතිසාධන කේත වෙනස් විය
       unlock_instructions:
-        subject: 'මාස්ටඩන්: අගුලුහැරීමේ උපදේශ'
+        subject: 'මාස්ටඩන්: අගුළු හැරීමේ උපදේශ'
       webauthn_credential:
         added:
+          explanation: පහත ආරක්ෂක යතුර ඔබගේ ගිණුමට එක් කර ඇත
           subject: 'මාස්ටඩන්: නව ආරක්‍ෂණ යතුර'
           title: ආරක්‍ෂණ යතුරක් එකතු කර ඇත
+        deleted:
+          explanation: පහත ආරක්ෂක යතුර ඔබගේ ගිණුමෙන් මකා ඇත
+          subject: 'Mastodon: ආරක්ෂක යතුර මකා ඇත'
+          title: ඔබගේ ආරක්ෂක යතුරු වලින් එකක් මකා ඇත
       webauthn_disabled:
+        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සමඟ සත්‍යාපනය අබල කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
+        subject: 'Mastodon: ආරක්ෂක යතුරු සමඟ සත්‍යාපනය අක්‍රිය කර ඇත'
         title: ආරක්‍ෂණ යතුරු අබල කර ඇත
       webauthn_enabled:
+        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සත්‍යාපනය සක්‍රීය කර ඇත. ඔබගේ ආරක්ෂක යතුර දැන් පුරනය වීම සඳහා භාවිතා කළ හැක.
+        subject: 'Mastodon: ආරක්ෂක යතුරු සත්‍යාපනය සක්‍රීය කර ඇත'
         title: ආරක්‍ෂණ යතුරු සබල කර ඇත
+    omniauth_callbacks:
+      failure: '"%{reason}" නිසා %{kind} සිට ඔබව සත්‍යාපනය කළ නොහැක.'
+      success: "%{kind} ගිණුමෙන් සාර්ථකව සත්‍යාපනය කරන ලදී."
+    passwords:
+      no_token: මුරපද යළි පිහිටුවීමේ විද්‍යුත් තැපෑලකින් නොපැමිණ ඔබට මෙම පිටුවට ප්‍රවේශ විය නොහැක. ඔබ පැමිණෙන්නේ මුරපද යළි පිහිටුවීමේ විද්‍යුත් තැපෑලකින් නම්, කරුණාකර ඔබ සපයා ඇති සම්පූර්ණ URL භාවිතා කර ඇති බවට වග බලා ගන්න.
+      send_instructions: ඔබගේ විද්‍යුත් තැපැල් ලිපිනය අපගේ දත්ත ගබඩාවේ තිබේ නම්, මිනිත්තු කිහිපයකින් ඔබගේ විද්‍යුත් තැපැල් ලිපිනයට මුරපද ප්‍රතිසාධන සබැඳියක් ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      send_paranoid_instructions: ඔබගේ විද්‍යුත් තැපැල් ලිපිනය අපගේ දත්ත ගබඩාවේ තිබේ නම්, මිනිත්තු කිහිපයකින් ඔබගේ විද්‍යුත් තැපැල් ලිපිනයට මුරපද ප්‍රතිසාධන සබැඳියක් ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      updated: ඔබගේ මුරපදය සාර්ථකව වෙනස් කර ඇත. ඔබ දැන් පුරනය වී ඇත.
+      updated_not_active: ඔබගේ මුරපදය සාර්ථකව වෙනස් කර ඇත.
     registrations:
-      update_needs_confirmation: ඔබ ඔබගේ ගිණුම සාර්ථකව යාවත්කාලීන කළ නමුත් අපට ඔබගේ නව විද්‍යුත් තැපැල් ලිපිනය තහවුරු කළ යුතුය. කරුණාකර ඔබගේ විද්‍යුත් තැපෑල පරීක්ෂා කර තහවුරු කිරීමේ සබැඳිය අනුගමනය කර ඔබගේ නව විද්‍යුත් තැපැල් ලිපිනය තහවුරු කරන්න. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් බහාලුම පරීක්ෂා කරන්න.
+      destroyed: ආයුබෝවන්! ඔබගේ ගිණුම සාර්ථකව අවලංගු කර ඇත. ඉක්මනින්ම ඔබව නැවත හමුවීමට අපි බලාපොරොත්තු වෙමු.
+      signed_up: සාදරයෙන් පිළිගනිමු! ඔබ සාර්ථකව ලියාපදිංචි වී ඇත.
+      signed_up_but_inactive: ඔබ සාර්ථකව ලියාපදිංචි වී ඇත. කෙසේ වෙතත්, ඔබගේ ගිණුම තවමත් සක්‍රිය කර නොමැති නිසා අපට ඔබව පුරනය වීමට නොහැකි විය.
+      signed_up_but_locked: ඔබ සාර්ථකව ලියාපදිංචි වී ඇත. කෙසේ වෙතත්, ඔබගේ ගිණුම අගුලු දමා ඇති නිසා අපට ඔබව පුරනය කිරීමට නොහැකි විය.
+      signed_up_but_pending: තහවුරු කිරීමේ සබැඳියක් සහිත පණිවිඩයක් ඔබගේ විද්‍යුත් තැපැල් ලිපිනයට යවා ඇත. ඔබ සබැඳිය ක්ලික් කළ පසු, අපි ඔබගේ අයදුම්පත සමාලෝචනය කරන්නෙමු. එය අනුමත වුවහොත් ඔබට දැනුම් දෙනු ලැබේ.
+      signed_up_but_unconfirmed: තහවුරු කිරීමේ සබැඳියක් සහිත පණිවිඩයක් ඔබගේ විද්‍යුත් තැපැල් ලිපිනයට යවා ඇත. ඔබගේ ගිණුම සක්‍රිය කිරීමට කරුණාකර සබැඳිය අනුගමනය කරන්න. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      update_needs_confirmation: ඔබගේ ගිණුම සාර්ථකව යාවත්කාලීන වුවද අපට නව වි-තැපැල් ලිපිනය තහවුරු කර ගැනීමට වුවමනා කෙරේ. කරුණාකර ඔබගේ වි-තැපෑල පරීක්‍ෂා කර ඊට අදාළ සබැඳිය අනුගමනය කර ඔබගේ නව වි-තැපැල් ලිපිනය තහවුරු කරන්න. ඔබට මෙම වි-තැපෑල නොලැබුණේ නම් කරුණාකර අයාචිත තැපැල් බහාලුම බලන්න.
       updated: ඔබගේ ගිණුම සාර්ථකව යාවත්කාලීන කර ඇත.
     sessions:
-      already_signed_out: සාර්ථකව නික්මුනි.
-      signed_in: සාර්ථකව පිවිසුනි.
-      signed_out: සාර්ථකව නික්මුනි.
+      already_signed_out: සාර්ථකව නික්මිණි.
+      signed_in: සාර්ථකව පිවිසුණි.
+      signed_out: සාර්ථකව නික්මිණි.
+    unlocks:
+      send_instructions: මිනිත්තු කිහිපයකින් ඔබගේ ගිණුම අගුළු හරින ආකාරය පිළිබඳ උපදෙස් සහිත විද්‍යුත් තැපෑලක් ඔබට ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      send_paranoid_instructions: ඔබගේ ගිණුම තිබේ නම්, මිනිත්තු කිහිපයකින් එය අගුළු හරින ආකාරය පිළිබඳ උපදෙස් සහිත විද්‍යුත් තැපෑලක් ඔබට ලැබෙනු ඇත. ඔබට මෙම විද්‍යුත් තැපෑල නොලැබුනේ නම් කරුණාකර ඔබගේ අයාචිත තැපැල් ෆෝල්ඩරය පරීක්ෂා කරන්න.
+      unlocked: ඔබගේ ගිණුම සාර්ථකව අගුලු හැර ඇත. ඉදිරියට යාමට කරුණාකර පුරනය වන්න.
+  errors:
+    messages:
+      already_confirmed: දැනටමත් තහවුරු කර ඇත, කරුණාකර පුරනය වීමට උත්සාහ කරන්න
+      confirmation_period_expired: "%{period}තුළ තහවුරු කළ යුතුය, කරුණාකර අලුත් එකක් ඉල්ලන්න"
+      expired: කල් ඉකුත් වී ඇත, කරුණාකර අලුත් එකක් ඉල්ලන්න
+      not_found: හමු වුණේ නැහැ
+      not_locked: අගුලු දමා නොතිබුණි
+      not_saved:
+        one: '1 දෝෂයක් මෙම %{resource} සුරැකීම තහනම් කර ඇත:'
+        other: 'දෝෂ %{count} කින් මෙම %{resource} සුරැකීම තහනම් කර ඇත:'
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index be85887ce..e11c7f1db 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -21,6 +21,7 @@ sk:
         action: Potvrď emailovú adresu
         action_with_app: Potvrď a vráť sa na %{app}
         explanation: S touto emailovou adresou si si vytvoril/a účet na %{host}. Si iba jeden klik od jeho aktivácie. Pokiaľ si to ale nebol/a ty, prosím ignoruj tento email.
+        explanation_when_pending: S touto e-mailovou adresou ste požiadali o pozvánku na %{host}. Po potvrdení vašej e-mailovej adresy vašu žiadosť skontrolujeme. Môžete sa prihlásiť, aby ste zmenili svoje údaje alebo vymazali svoje konto, ale kým nebude vaše konto schválené, nebudete mať prístup k väčšine funkcií. Ak bude vaša žiadosť zamietnutá, vaše údaje budú odstránené, takže sa od vás nebudú vyžadovať žiadne ďalšie kroky. Ak ste to neboli vy, tento e-mail ignorujte.
         extra_html: Prosím, pozri sa aj na <a href="%{terms_path}"> pravidlá tohto servera,</a> a <a href="%{policy_path}"> naše užívaťeľské podiemky</a>.
         subject: 'Mastodon: Potvrdzovacie pokyny pre %{instance}'
         title: Potvrď emailovú adresu
@@ -59,6 +60,23 @@ sk:
         title: Obnovovacie kódy pre dvoj-faktorové overovanie zmenené
       unlock_instructions:
         subject: 'Mastodon: Pokyny na odomknutie účtu'
+      webauthn_credential:
+        added:
+          explanation: Do vášho konta bol pridaný nasledujúci bezpečnostný kľúč
+          subject: 'Mastodon: Nový bezpečnostný kľúč'
+          title: Bol pridaný nový bezpečnostný kľúč
+        deleted:
+          explanation: Z vášho účtu bol odstránený nasledujúci bezpečnostný kľúč
+          subject: 'Mastodon: Bezpečnostný kľúč odstránený'
+          title: Jeden z vašich bezpečnostných kľúčov bol odstránený
+      webauthn_disabled:
+        explanation: Overovanie pomocou bezpečnostných kľúčov bolo pre vaše konto vypnuté. Prihlásenie je teraz možné len pomocou tokenu vygenerovaného spárovanou aplikáciou TOTP.
+        subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
+        title: Bezpečnostné kľúče sú vypnuté
+      webauthn_enabled:
+        explanation: Pre vaše konto bolo povolené overovanie bezpečnostným kľúčom. Váš bezpečnostný kľúč teraz môžete použiť na prihlásenie.
+        subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
+        title: Povolené bezpečnostné kľúče
     omniauth_callbacks:
       failure: Nebolo možné ťa overiť z %{kind}, lebo "%{reason}".
       success: Úspešné overenie z účtu %{kind}.
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index dee1b9125..be0f98ae1 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -4,7 +4,7 @@ sl:
     confirmations:
       confirmed: Vaš e-poštni naslov je bil uspešno potrjen.
       send_instructions: V nekaj minutah boste prejeli e-poštno sporočilo z navodili za potrditev vašega e-poštnega naslova. Če niste prejeli e-poštnega sporočila, preverite mapo neželena pošta.
-      send_paranoid_instructions: Če vaš e-poštni naslov obstaja v naši podatkovni bazi, boste v nekaj minutah prejeli e-poštno sporočilo z navodili za potrditev vašega e-poštnega naslova. Če niste prejeli e-poštnega sporočila, preverite mapo neželena pošta.
+      send_paranoid_instructions: Če vaš e-poštni naslov obstaja v naši zbirki podatkov, boste v nekaj minutah prejeli e-poštno sporočilo z navodili za potrditev vašega e-poštnega naslova. Če niste prejeli e-poštnega sporočila, preverite mapo neželena pošta.
     failure:
       already_authenticated: Ste že prijavljeni.
       inactive: Vaš račun še ni aktiviran.
@@ -21,50 +21,79 @@ sl:
         action: Potrdi e-poštni naslov
         action_with_app: Potrdi in se vrni v %{app}
         explanation: S tem e-poštnim naslovom ste ustvarili račun na %{host}. Z enim samim klikom ga aktivirate. Če to niste bili vi, prosimo, prezrite to e-poštno sporočilo.
-        explanation_when_pending: S tem e-poštnim naslovom ste zaprosili za povabilo na %{host}. Ko potrdite svoj e-poštni naslov, bomo pregledali vašo prijavo. Do takrat se ne morete prijaviti. Če bo vaša prijava zavrnjena, bodo vaši podatki odstranjeni, zato ne bo potrebno nadaljnje ukrepanje. Če to niste bili vi, prezrite to e-poštno sporočilo.
-        extra_html: Preverite tudi <a href="%{terms_path}">pravila vozlišča</a> in <a href="%{policy_path}">naše pogoje storitve</a>.
+        explanation_when_pending: S tem e-poštnim naslovom ste zaprosili za povabilo na %{host}. Ko potrdite svoj e-poštni naslov, bomo pregledali vašo prijavo. Do takrat se ne morete prijaviti. Če bo vaša prijava zavrnjena, bodo vaši podatki odstranjeni, zato nadaljnje ukrepanje ne bo potrebno. Če to niste bili vi, prezrite to e-poštno sporočilo.
+        extra_html: Preverite tudi <a href="%{terms_path}">pravila strežnika</a> in <a href="%{policy_path}">naše pogoje storitve</a>.
         subject: 'Mastodon: Navodila za potrditev za %{instance}'
         title: Potrdi e-poštni naslov
       email_changed:
-        explanation: 'E-poštni naslov za vaš račun je spremenjen na:'
-        extra: Če niste spremenili e-pošte, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosim, zamenjajte geslo takoj. Če ste blokirani iz svojega računa  se obrnite na skrbnika vozlišča.
-        subject: 'Mastodon: E-pošta je spremenjena'
+        explanation: 'E-poštni naslov za vaš račun je spremenjen v:'
+        extra: Če niste spremenili e-pošte, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosimo, zamenjajte geslo takoj ali se obrnite na skbrnika, če ste izklopljeni iz svojega računa.
+        subject: 'Mastodon: e-poštni naslov je spremenjen'
         title: Novi e-poštni naslov
       password_change:
         explanation: Geslo za vaš račun je bilo spremenjeno.
-        extra: Če niste spremenili gesla, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosim, zamenjajte geslo takoj. Če ste blokirani iz svojega računa  se obrnite na skrbnika vozlišča.
-        subject: 'Mastodon: Geslo je spremenjeno'
+        extra: Če niste spremenili gesla, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosimo, zamenjajte geslo takoj. Če ste blokirani iz svojega računa, se obrnite na skrbnika strežnika.
+        subject: 'Mastodon: geslo je spremenjeno'
         title: Geslo je spremenjeno
       reconfirmation_instructions:
         explanation: Potrdite novi naslov, da spremenite svoj e-poštni naslov.
-        extra: Če te spremembe niste sprožili, prezrite to e-poštno sporočilo. E-poštni naslov za račun Mastodon se ne bo spremenil, dokler ne kliknete na zgornjo povezavo.
-        subject: 'Mastodon: Potrdite e-pošto za %{instance}'
+        extra: Če te spremembe niste sprožili, prezrite to e-poštno sporočilo. E-poštni naslov za račun Mastodon se ne bo spremenil, dokler ne kliknete zgornje povezave.
+        subject: 'Mastodon: potrdite e-pošto za %{instance}'
         title: Potrdi e-poštni naslov
       reset_password_instructions:
         action: Spremeni geslo
         explanation: Zahtevali ste novo geslo za svoj račun.
-        extra: Če tega niste zahtevali, prezrite to e-poštno sporočilo. Vaše geslo se ne bo spremenilo, dokler ne kliknete na zgornjo povezavo in ustvarite novega.
-        subject: 'Mastodon: Navodila za ponastavitev gesla'
-        title: Ponastavi geslo
+        extra: Če tega niste zahtevali, prezrite to e-poštno sporočilo. Vaše geslo se ne bo spremenilo, dokler ne kliknete zgornje povezave in ustvarite novega.
+        subject: 'Mastodon: navodila za ponastavitev gesla'
+        title: Ponastavitev gesla
+      two_factor_disabled:
+        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun onemogočeno. Prijava je zdaj možna le z e-poštnim naslovom in geslom.
+        subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
+        title: 2FA onemogočeno
+      two_factor_enabled:
+        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun omogočeno. Žeton, izdelan z aplikacijo TOTP, bo zahtevan zs prijavo.
+        subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
+        title: 2FA omogočeno
+      two_factor_recovery_codes_changed:
+        explanation: Prejšnje obnovitvene kode so postale neveljavne in ustvarjene so bile nove.
+        subject: 'Mastodon: varnostne obnovitvene kode za dvojno preverjanje pristnosti so ponovno izdelane'
+        title: obnovitvene kode 2FA spremenjene
       unlock_instructions:
-        subject: 'Mastodon: Odkleni navodila'
+        subject: 'Mastodon: navodila za odklepanje'
+      webauthn_credential:
+        added:
+          explanation: Naslednja varnostna koda je dodana vašemu računu
+          subject: 'Mastodon: nova varnostna koda'
+          title: Dodana je nova varnostna koda
+        deleted:
+          explanation: Naslednja varnostna koda je izbrisana iz vašega računa
+          subject: 'Mastodon: varnostna koda izbrisana'
+          title: Ena od vaših varnostnih kod je bila izbrisana
+      webauthn_disabled:
+        explanation: Overjanje pristnosti z varnostnimi kodami je za vaš račun onemogočeno. Prijava je zdaj možna le z uporabo žetona, ki ga izdela oparjena aplikacija TOTP.
+        subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
+        title: Varnostne kode onemogočene
+      webauthn_enabled:
+        explanation: Overjanje z varnostno kodo je za vaš račun omogočeno. Svojo varnostno kodo lahko zdaj uporabite za prijavo.
+        subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
+        title: Varnostne kode omogočene
     omniauth_callbacks:
       failure: Overitev iz %{kind} ni možna zaradi "%{reason}".
       success: Overitev iz računa %{kind} je bila uspešna.
     passwords:
-      no_token: Do te strani ne morete dostopati, ne da bi prišli iz e-poštne za ponastavitev gesla. Če prihajate iz e-poštne za ponastavitev gesla, se prepričajte, da ste uporabili celoten navedeni URL.
-      send_instructions: Če vaš e-poštni naslov obstaja v naši bazi podatkov, boste v nekaj minutah na vaš e-poštni naslov prejeli povezavo za obnovitev gesla. Če niste prejeli e-pošte, preverite mapo z neželeno pošto.
-      send_paranoid_instructions: Če vaš e-poštni naslov obstaja v naši bazi podatkov, boste v nekaj minutah na vaš e-poštni naslov prejeli povezavo za obnovitev gesla. Če niste prejeli e-pošte, preverite mapo z neželeno pošto.
+      no_token: Do te strani ne morete dostopati, ne da bi prišli iz e-pošte za ponastavitev gesla. Če prihajate iz e-pošte za ponastavitev gesla, se prepričajte, da ste uporabili celoten navedeni URL.
+      send_instructions: Če vaš e-poštni naslov obstaja v naši zbirki podatkov, boste v nekaj minutah na svoj e-poštni naslov prejeli povezavo za obnovitev gesla. Če niste prejeli e-pošte, preverite mapo z neželeno pošto.
+      send_paranoid_instructions: Če vaš e-poštni naslov obstaja v naši zbirki podatkov, boste v nekaj minutah na svoj e-poštni naslov prejeli povezavo za obnovitev gesla. Če niste prejeli e-pošte, preverite mapo z neželeno pošto.
       updated: Vaše geslo je bilo uspešno spremenjeno. Zdaj ste prijavljeni.
       updated_not_active: Vaše geslo je bilo uspešno spremenjeno.
     registrations:
-      destroyed: Adijo! Vaš račun je bil uspešno preklican. Upamo, da vas bomo kmalu spet videli.
+      destroyed: Srečno! Vaš račun je bil uspešno preklican. Upamo, da vas bomo kmalu spet videli.
       signed_up: Dobrodošli! Uspešno ste se vpisali.
       signed_up_but_inactive: Uspešno ste se vpisali. Vendar vas nismo mogli prijaviti, ker vaš račun še ni aktiviran.
       signed_up_but_locked: Uspešno ste se vpisali. Vendar vas nismo mogli prijaviti, ker je vaš račun zaklenjen.
-      signed_up_but_pending: Na vaš e-poštni naslov je bilo poslano sporočilo s povezavo za potrditev. Ko kliknete na povezavo, bomo pregledali vašo prijavo. Obveščeni boste, če bo odobren.
+      signed_up_but_pending: Na vaš e-poštni naslov je bilo poslano sporočilo s povezavo za potrditev. Ko kliknete povezavo, bomo pregledali vašo prijavo. Obveščeni boste, če bo odobrena.
       signed_up_but_unconfirmed: Na vaš e-poštni naslov je bilo poslano sporočilo s povezavo za potrditev. Sledite povezavi, da aktivirate svoj račun. Če niste prejeli te e-pošte, preverite mapo z neželeno pošto.
-      update_needs_confirmation: Uspešno ste posodobili račun, vendar moramo potrditi vaš novi e-poštni naslov. Preverite svojo e-pošto in sledite povezavi za potrditev, da potrdite nov e-poštni naslov. Če niste prejeli te e-poše, preverite mapo z neželeno pošto.
+      update_needs_confirmation: Uspešno ste posodobili račun, vendar moramo potrditi vaš novi e-poštni naslov. Preverite svojo e-pošto in sledite povezavi za potrditev, da potrdite nov e-poštni naslov. Če niste prejeli te e-pošte, preverite mapo z neželeno pošto.
       updated: Vaš račun je bil uspešno posodobljen.
     sessions:
       already_signed_out: Uspešno ste se odjavili.
@@ -82,7 +111,7 @@ sl:
       not_found: ni najdeno
       not_locked: ni bil zaklenjen
       not_saved:
-        few: "%{count} napake so preprečile shranjevanje %{resource}:"
+        few: "%{count} napake so preprečile shranjevanje vira %{resource}:"
         one: '1 napaka je preprečila shranjevanje %{resource}:'
-        other: "%{count} napak je preprečilo shranjevanje %{resource}:"
-        two: "%{count} napaki sta preprečili shranjevanje %{resource}:"
+        other: "%{count} napak je preprečilo shranjevanje vira %{resource}:"
+        two: "%{count} napaki sta preprečili shranjevanje vira %{resource}:"
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index c2c5f7c76..836f83a9a 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -11,19 +11,72 @@ sr-Latn:
       invalid: Neispravan %{authentication_keys} ili lozinka.
       last_attempt: Imate još jedan pokušaj pre nego što Vaš nalog bude zaključan.
       locked: Vaš nalog je zaključan.
-      not_found_in_database: Neispravan %{authentication_keys} ili lozinka.
+      not_found_in_database: Neispravna %{authentication_keys} ili lozinka.
+      pending: Vaš račun je još uvek u pregledu.
       timeout: Vreme trajanja Vaše sesije je isteklo. Za nastavak prijavite se ponovo.
       unauthenticated: Za nastavak se morate prijaviti ili registrovati.
       unconfirmed: Pre nastavka morate potvrditi svoj nalog.
     mailer:
       confirmation_instructions:
+        action: Potvrdite adresu e-pošte
+        action_with_app: Potvrdi i vrati se na %{app}
+        explanation: Napravili ste nalog na %{host} sa adresom ove e-pošte. Na jedan klik ste udaljeni od aktiviranja. Ako ovo niste vi, molimo ignorišite ovu e-poštu.
+        explanation_when_pending: Prijavili ste se za poziv %{host} sa ovim imejlom. Kada potvrdite svoj imejl, pregledaćemo vašu prijavu. Možete se prijaviti da biste promenili detalje ili izbrisali nalog, ali ne možete pristupiti većini funkcija dok vam nalog ne bude odobren. Ako vaša prijava bude odbijena, vaši podaci će biti uklonjeni, tako da od vas neće biti potrebne dalje radnje. Ako ovo niste bili vi, zanemarite ovaj imejl.
+        extra_html: Molimo da takođe proverite <a href="%{terms_path}"> pravila ove instance i <a href="%{policy_path}"> naše uslove korišćenja.
         subject: 'Mastodont: Uputstvo za potvrdu korisničkog naloga na instanci %{instance}'
+        title: Potvrdite adresu e-pošte
+      email_changed:
+        explanation: 'Adresa ove e-pošte za vaš nalog će biti promenjena u:'
+        extra: Ako niste promenili vašu e-poštu, sasvim je moguće da je neko drugi dobio pristup vašem nalogu. Molimo promenite lozinku odmah ili kontaktirajte administratora instance ako ste zaključani izvan vašeg naloga.
+        subject: 'Mastodon: E-pošta promenjena'
+        title: Nova adresa e-pošte
       password_change:
+        explanation: Lozinka vašeg naloga je promenjena.
+        extra: Ako niste promenili vašu e-poštu, sasvim je moguće da je neko drugi dobio pristup vašem nalogu. Molimo promenite lozinku odmah ili kontaktirajte administratora instance ako ste zaključani izvan vašeg naloga.
         subject: 'Mastodont: Lozinka promenjena'
+        title: Lozinka promenjena
+      reconfirmation_instructions:
+        explanation: Potvrdite novu adresu da biste promenili e-poštu.
+        extra: Ako ova promena nije inicirana sa vaše strane, molimo ignorišite ovu e-poštu. Adresa e-pošta za ovaj Mastodon nalog neće biti promenjena dok ne pristupite poveznici/linku iznad.
+        subject: 'Mastodon: Potvrdite e-poštu za %{instance}'
+        title: Potvrdite adresu e-pošte
       reset_password_instructions:
+        action: Lozinka promenjena
+        explanation: Zatražili ste novu lozinku za vaš nalog.
+        extra: Ako niste zatražili ovo, molimo ignorišite ovu e-poštu. Vaša lozinka neće biti promenjena dok ne pristupite poveznici/vezi iznad i ne napravite novu.
         subject: 'Mastodont: Uputstvo za resetovanje lozinke'
+        title: Lozinka resetovana
+      two_factor_disabled:
+        explanation: Dvofaktorska autentifikacija za vaš nalog je onemogućena. Prijava je sada moguća samo pomoću imejla i lozinke.
+        subject: 'Mastodon: Dvofaktorska autentifikacija je onemogućena'
+        title: 2FA isključena
+      two_factor_enabled:
+        explanation: Dvofaktorska autentifikacija je omogućena za vaš nalog. Za prijavu će biti potreban token koji generiše uparena TOTP aplikacija.
+        subject: 'Mastodon: Dvofaktorska autentifikacija je omogućena'
+        title: 2FA uključena
+      two_factor_recovery_codes_changed:
+        explanation: Prethodni kodovi za oporavak su poništeni i generisani su novi.
+        subject: 'Mastodon: Ponovo su generisani kodovi za oporavak'
+        title: 2FA kodovi oporavka promenjeni
       unlock_instructions:
         subject: 'Mastodont: Uputstvo za otključavanje korisničkog naloga'
+      webauthn_credential:
+        added:
+          explanation: Sledeći bezbednosni ključ je dodat na vaš nalog
+          subject: 'Mastodon: Novi sigurnosni ključ'
+          title: Dodan je novi bezbednosni ključ
+        deleted:
+          explanation: Sledeći bezbednosni ključ je uklonjen iz vašeg naloga
+          subject: 'Mastodon: Sigurnosni ključ je izbrisan'
+          title: Jedan od vaših bezbednosnih ključeva je izbrisan
+      webauthn_disabled:
+        explanation: Autentifikacija pomoću bezbednosnih ključeva je onemogućena za vaš nalog. Prijava je sada moguća samo pomoću tokena koji generiše uparena TOTP aplikacija.
+        subject: 'Mastodon: Autentifikacija sa sigurnosnim ključevima onemogućena'
+        title: Sigurnosni ključevi su onemogućeni
+      webauthn_enabled:
+        explanation: Autentifikacija sa bezbednosnim ključem je omogućena za vaš nalog. Vaš sigurnosni ključ se sada može koristiti za prijavljivanje.
+        subject: 'Mastodon: Omogućena autentifikacija sa bezbednim ključem'
+        title: Sigurnosni ključevi su omogućeni
     omniauth_callbacks:
       failure: Nismo u mogućnosti autorizovati Vas sa %{kind} nalogom zbog "%{reason}".
       success: Uspešna autorizacija sa %{kind} naloga.
@@ -38,6 +91,7 @@ sr-Latn:
       signed_up: Dobrodošli! Uspešno ste se registrovali.
       signed_up_but_inactive: Uspešno ste se registrovali. Nažalost ne možete se prijaviti zato što Vaš nalog još nije aktiviran.
       signed_up_but_locked: Uspešno ste se registrovali. Nažalost ne možete se prijaviti zato što je Vaš nalog zaključan.
+      signed_up_but_pending: Na vaš imejl poslata je poruka sa vezom za potvrdu. Nakon što kliknete na vezu, pregledaćemo vašu prijavu. Bićete obavešteni ako bude odobreno.
       signed_up_but_unconfirmed: Poruka za potvrdu Vašeg naloga je poslata na Vašu imejl adresu. Kliknite na vezu u imejlu da potvrdite svoj nalog. Molimo proverite i spam fasciklu ako niste primili poruku.
       update_needs_confirmation: Uspešno ste ažurirali svoj nalog, ali treba da potvrdimo novu adresu Vaše e-pošte. Molimo Vas da proverite e-poštu i pratite link za potvrdu nove adrese Vaše e-pošte.
       updated: Vaš nalog je uspešno ažuriran.
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index 9739ee21d..12c5869c6 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -11,7 +11,7 @@ sr:
       invalid: Неисправан %{authentication_keys} или лозинка.
       last_attempt: Имате још један покушај пре него што Ваш налог буде закључан.
       locked: Ваш налог је закључан.
-      not_found_in_database: Неисправан %{authentication_keys} или лозинка.
+      not_found_in_database: Неисправна %{authentication_keys} или лозинка.
       pending: Ваш рачун је још увек у прегледу.
       timeout: Време трајања Ваше сесије је истекло. За наставак пријавите се поново.
       unauthenticated: За наставак се морате пријавити или регистровати.
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index b16532606..e02983ad5 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -18,26 +18,26 @@ sv:
       unconfirmed: Du måste bekräfta din e-postadress innan du fortsätter.
     mailer:
       confirmation_instructions:
-        action: Verifiera e-post adressen
+        action: Verifiera e-postadress
         action_with_app: Bekräfta och återgå till %{app}
-        explanation: Du har skapat ett konto på %{host} med den här e-post adressen. Du är ett klick från att aktivera det. Om det inte var du, ignorera det här e-post meddelandet.
-        explanation_when_pending: Du ansökte om en inbjudan till %{host} med denna e-post adress. När du har bekräftat din e-post adress kommer vi att granska din ansökan. Du kan logga in för att ändra dina uppgifter eller ta bort ditt konto, men du kan inte komma åt de flesta funktionerna förrän ditt konto har godkänts. Om din ansökan avvisas kommer dina uppgifter att tas bort, så ingen ytterligare åtgärd kommer att krävas av dig. Om detta inte var du, vänligen ignorera detta mail.
+        explanation: Du har skapat ett konto på %{host} med den här e-postadressen. Du är ett klick bort från att aktivera det. Om det inte var du ignorerar det här e-postmeddelandet.
+        explanation_when_pending: Du ansökte om en inbjudan till %{host} med denna e-postadress. När du har bekräftat din e-postadress kommer vi att granska din ansökan. Du kan logga in för att ändra dina uppgifter eller ta bort ditt konto, men du kan inte komma åt de flesta funktionerna förrän ditt konto har godkänts. Om din ansökan avvisas kommer dina uppgifter att tas bort, så ingen ytterligare åtgärd kommer att krävas av dig. Om detta inte var du, vänligen ignorera detta mail.
         extra_html: Vänligen observera <a href="%{terms_path}"> systemets regler</a> och <a href="%{policy_path}">våra användarvillkor</a>.
         subject: 'Mastodon: Bekräftelse instruktioner för %{instance}'
-        title: Verifiera e-post adress
+        title: Verifiera e-postadress
       email_changed:
-        explanation: 'E-post adressen för ditt konto ändras till:'
-        extra: Om du inte ändrade din e-post är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta dataserver administratören om du är utelåst från ditt konto.
+        explanation: 'E-postadressen för ditt konto ändras till:'
+        extra: Om du inte ändrade din e-post är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta serveradministratören om du är utelåst från ditt konto.
         subject: 'Mastodon: e-post ändrad'
         title: Ny e-post adress
       password_change:
         explanation: Lösenordet för ditt konto har ändrats.
-        extra: Om du inte ändrade ditt lösenord är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta server administratören om du är utelåst från ditt konto.
+        extra: Om du inte ändrade ditt lösenord är det troligt att någon har fått tillgång till ditt konto. Vänligen ändra ditt lösenord omedelbart eller kontakta serveradministratören om du är utelåst från ditt konto.
         subject: 'Mastodon: Lösenordet har ändrats'
         title: Lösenordet har ändrats
       reconfirmation_instructions:
         explanation: Bekräfta den nya adressen för att ändra din e-post adress.
-        extra: Om den här ändringen inte initierades av dig kan du ignorerar det här e-postmeddelandet. E-postadressen för Mastodon-kontot ändras inte förrän du kommer åt länken ovan.
+        extra: Om den här ändringen inte initierades av dig kan du ignorera det här e-postmeddelandet. E-postadressen för Mastodon-kontot ändras inte förrän du klickar på länken ovan.
         subject: 'Mastodon: Bekräfta e-post för %{instance}'
         title: Verifiera e-postadress
       reset_password_instructions:
@@ -84,16 +84,16 @@ sv:
       no_token: Du kan inte komma åt den här sidan utan att komma från ett e-postmeddelande för lösenordsåterställning. Om du kommer från ett lösenordsåterställt e-postmeddelande, var vänlig och se till att du använde hela webbadressen.
       send_instructions: Om din e-postadress finns i vår databas, får du en länk för återställning av lösenord på din e-postadress om några minuter. Kontrollera din spammapp om du inte fick det här e-postmeddelandet.
       send_paranoid_instructions: Om din e-postadress finns i vår databas, får du en länk för återställning av lösenord på din e-postadress om några minuter. Kontrollera din spammapp om du inte fick det här e-postmeddelandet.
-      updated: Ditt lösenord har ändrats framgångsrikt. Du är nu inloggad.
+      updated: Ditt lösenord har ändrats. Du är nu inloggad.
       updated_not_active: Ditt lösenord har ändrats. Du är nu inloggad.
     registrations:
-      destroyed: Adjö! Ditt konto har blivit nerstängt. Vi hoppas att vi ses snart igen.
+      destroyed: Adjö! Ditt konto har blivit nedstängt. Vi hoppas att vi snart ses igen.
       signed_up: Välkommen! Du har nu registrerat dig.
       signed_up_but_inactive: Du har nu registrerat dig. Vi kunde dock inte logga in dig eftersom ditt konto ännu inte är aktiverat.
       signed_up_but_locked: Du har nu registrerat dig. Vi kunde dock inte logga in eftersom ditt konto är låst.
       signed_up_but_pending: Ett meddelande med en bekräftelselänk har skickats till din e-postadress. När du klickar på länken kommer vi att granska din ansökan. Du kommer att meddelas om den godkänns.
       signed_up_but_unconfirmed: Ett meddelande med en bekräftelselänk har skickats till din e-postadress. Vänligen följ länken för att aktivera ditt konto. Kontrollera din skräppostmapp om du inte fick det här e-postmeddelandet.
-      update_needs_confirmation: Du har uppdaterat ditt konto med framgång, men vi måste verifiera din nya e-postadress. Vänligen kolla din email och följ bekräfta länken för att bekräfta din nya e-postadress. Kontrollera din spammapp om du inte fick det här e-postmeddelandet.
+      update_needs_confirmation: Du har uppdaterat ditt konto, men vi måste verifiera din nya e-postadress. Vänligen kolla din e-post och följ bekräfta-länken för att bekräfta din nya e-postadress. Kontrollera din skräppost om du inte fick e-postmeddelandet.
       updated: Ditt konto har uppdaterats utan problem.
     sessions:
       already_signed_out: Utloggad.
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index 5970e8d26..6717019a0 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -12,7 +12,7 @@ th:
       last_attempt: คุณลองได้อีกหนึ่งครั้งก่อนที่บัญชีของคุณจะถูกล็อค
       locked: บัญชีของคุณถูกล็อค
       not_found_in_database: "%{authentication_keys} หรือรหัสผ่านไม่ถูกต้อง"
-      pending: บัญชีของคุณยังอยู่ระหว่างการตรวจทาน
+      pending: บัญชีของคุณยังคงอยู่ระหว่างการตรวจทาน
       timeout: เซสชันของคุณหมดอายุแล้ว โปรดลงชื่อเข้าอีกครั้งเพื่อดำเนินการต่อ
       unauthenticated: คุณจำเป็นต้องลงชื่อเข้าหรือลงทะเบียนก่อนดำเนินการต่อ
       unconfirmed: คุณต้องยืนยันที่อยู่อีเมลของคุณก่อนดำเนินการต่อ
@@ -21,7 +21,7 @@ th:
         action: ยืนยันที่อยู่อีเมล
         action_with_app: ยืนยันแล้วกลับไปยัง %{app}
         explanation: คุณได้สร้างบัญชีใน %{host} ด้วยที่อยู่อีเมลนี้ คุณเหลืออีกคลิกเดียวเพื่อเปิดใช้งานบัญชี หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
-        explanation_when_pending: คุณได้สมัครเพื่อขอคำเชิญสู่ %{host} ด้วยที่อยู่อีเมลนี้ เมื่อคุณยืนยันที่อยู่อีเมลของคุณ เราจะตรวจทานใบสมัครของคุณ คุณสามารถเข้าสู่ระบบเพื่อเปลี่ยนรายละเอียดของคุณหรือลบบัญชีของคุณ แต่คุณไม่สามารถเข้าถึงฟังก์ชันส่วนใหญ่ได้จนกว่าจะมีการอนุมัติบัญชีของคุณ หากมีการปฏิเสธใบสมัครของคุณ จะเอาข้อมูลของคุณออก ดังนั้นจึงไม่ต้องมีการกระทำเพิ่มเติมจากคุณ หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
+        explanation_when_pending: คุณได้สมัครเพื่อขอคำเชิญสู่ %{host} ด้วยที่อยู่อีเมลนี้ เมื่อคุณยืนยันที่อยู่อีเมลของคุณ เราจะตรวจทานใบสมัครของคุณ คุณสามารถเข้าสู่ระบบเพื่อเปลี่ยนรายละเอียดของคุณหรือลบบัญชีของคุณ แต่คุณไม่สามารถเข้าถึงฟังก์ชันส่วนใหญ่ได้จนกว่าจะมีการอนุมัติบัญชีของคุณ หากมีการปฏิเสธใบสมัครของคุณ จะเอาข้อมูลของคุณออก ดังนั้นจึงไม่ต้องการการกระทำเพิ่มเติมจากคุณ หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
         extra_html: นอกจากนี้โปรดตรวจสอบ <a href="%{terms_path}">กฎของเซิร์ฟเวอร์</a> และ <a href="%{policy_path}">เงื่อนไขการให้บริการของเรา</a>
         subject: 'Mastodon: คำแนะนำการยืนยันสำหรับ %{instance}'
         title: ยืนยันที่อยู่อีเมล
@@ -37,7 +37,7 @@ th:
         title: เปลี่ยนรหัสผ่านแล้ว
       reconfirmation_instructions:
         explanation: ยืนยันที่อยู่ใหม่เพื่อเปลี่ยนอีเมลของคุณ
-        extra: หากการเปลี่ยนแปลงนี้ไม่ได้ทำโดยคุณ โปรดเพิกเฉยต่ออีเมลนี้ ที่อยู่อีเมลสำหรับบัญชี Mastodon จะไม่เปลี่ยนแปลงจนกว่าคุณจะเข้าถึงลิงก์ด้านบน
+        extra: หากการเปลี่ยนแปลงนี้ไม่ได้เริ่มต้นโดยคุณ โปรดเพิกเฉยต่ออีเมลนี้ ที่อยู่อีเมลสำหรับบัญชี Mastodon จะไม่เปลี่ยนแปลงจนกว่าคุณจะเข้าถึงลิงก์ด้านบน
         subject: 'Mastodon: ยืนยันอีเมลสำหรับ %{instance}'
         title: ยืนยันที่อยู่อีเมล
       reset_password_instructions:
@@ -47,7 +47,7 @@ th:
         subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
         title: การตั้งรหัสผ่านใหม่
       two_factor_disabled:
-        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว การเข้าสู่ระบบสามารถทำได้โดยใช้ที่อยู่อีเมลและรหัสผ่านเท่านั้น
+        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้ที่อยู่อีเมลและรหัสผ่านเท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
         title: ปิดใช้งาน 2FA แล้ว
       two_factor_enabled:
@@ -55,7 +55,7 @@ th:
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
         title: เปิดใช้งาน 2FA แล้ว
       two_factor_recovery_codes_changed:
-        explanation: ยกเลิกรหัสกู้คืนก่อนหน้าและสร้างรหัสใหม่แล้ว
+        explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสใหม่แล้ว
         subject: 'Mastodon: สร้างรหัสกู้คืนสองปัจจัยใหม่แล้ว'
         title: เปลี่ยนรหัสกู้คืน 2FA แล้ว
       unlock_instructions:
@@ -70,9 +70,11 @@ th:
           subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
           title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
       webauthn_disabled:
+        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
       webauthn_enabled:
+        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
     omniauth_callbacks:
@@ -87,8 +89,8 @@ th:
     registrations:
       destroyed: ลาก่อน! ยกเลิกบัญชีของคุณสำเร็จ เราหวังว่าจะได้พบคุณอีกในเร็ว ๆ นี้
       signed_up: ยินดีต้อนรับ! คุณได้ลงทะเบียนสำเร็จ
-      signed_up_but_inactive: คุณได้ลงทะเบียนสำเร็จ อย่างไรก็ตามเราไม่สามารถลงชื่อคุณเข้าได้เนื่องจากยังไม่ได้เปิดใช้งานบัญชีของคุณ
-      signed_up_but_locked: คุณได้ลงทะเบียนสำเร็จ อย่างไรก็ตามเราไม่สามารถลงชื่อคุณเข้าได้เนื่องจากมีการล็อคบัญชีของคุณอยู่
+      signed_up_but_inactive: คุณได้ลงทะเบียนสำเร็จ อย่างไรก็ตาม เราไม่สามารถลงชื่อคุณเข้าได้เนื่องจากยังไม่ได้เปิดใช้งานบัญชีของคุณ
+      signed_up_but_locked: คุณได้ลงทะเบียนสำเร็จ อย่างไรก็ตาม เราไม่สามารถลงชื่อคุณเข้าได้เนื่องจากมีการล็อคบัญชีของคุณอยู่
       signed_up_but_pending: ส่งข้อความพร้อมลิงก์ยืนยันไปยังที่อยู่อีเมลของคุณแล้ว หลังจากคุณคลิกลิงก์ เราจะตรวจทานใบสมัครของคุณ คุณจะได้รับการแจ้งเตือนหากมีการอนุมัติใบสมัคร
       signed_up_but_unconfirmed: ส่งข้อความพร้อมลิงก์ยืนยันไปยังที่อยู่อีเมลของคุณแล้ว โปรดไปตามลิงก์เพื่อเปิดใช้งานบัญชีของคุณ โปรดตรวจสอบโฟลเดอร์สแปมของคุณหากคุณไม่ได้รับอีเมลนี้
       update_needs_confirmation: คุณได้อัปเดตบัญชีของคุณสำเร็จ แต่เราจำเป็นต้องยืนยันที่อยู่อีเมลใหม่ของคุณ โปรดตรวจสอบอีเมลของคุณแล้วไปตามลิงก์ยืนยันเพื่อยืนยันที่อยู่อีเมลใหม่ของคุณ โปรดตรวจสอบโฟลเดอร์สแปมของคุณหากคุณไม่ได้รับอีเมลนี้
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index a0bc7deae..86b1c951f 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -8,10 +8,10 @@ tr:
     failure:
       already_authenticated: Zaten oturum açtınız.
       inactive: Hesabınız henüz etkinleştirilmedi.
-      invalid: Geçersiz %{authentication_keys} ya da şifre.
+      invalid: Geçersiz %{authentication_keys} ya da parola.
       last_attempt: Hesabınız kilitlenmeden önce bir kez daha denemeniz gerekir.
       locked: Hesabınız kilitlendi.
-      not_found_in_database: Geçersiz %{authentication_keys} ya da şifre.
+      not_found_in_database: Geçersiz %{authentication_keys} ya da parola.
       pending: Hesabınız hala inceleniyor.
       timeout: Oturum süreniz sona erdi. Lütfen devam etmek için tekrar giriş yapınız.
       unauthenticated: Devam etmeden önce oturum açmanız veya kayıt olmanız gerek.
@@ -31,21 +31,21 @@ tr:
         subject: 'Mastodon: E-posta adresi değişti'
         title: Yeni e-posta adresi
       password_change:
-        explanation: Hesabınızın şifresi değiştirildi.
+        explanation: Hesabınızın parolası değiştirildi.
         extra: Parolanızı değiştirmediyseniz, büyük olasılıkla birileri hesabınıza erişmiş olabilir. Lütfen derhal parolanızı değiştirin veya hesabınız kilitlendiyse sunucu yöneticisine başvurun.
-        subject: 'Mastodon: Şifre değiştirildi'
-        title: Şifre değiştirildi
+        subject: 'Mastodon: Parola değiştirildi'
+        title: Parola değiştirildi
       reconfirmation_instructions:
         explanation: E-postanızı değiştirmek için yeni adresi onaylayın.
         extra: Bu değişiklik sizin tarafınızdan başlatılmadıysa, lütfen bu e-postayı dikkate almayın. Mastodon hesabının e-posta adresi, yukarıdaki bağlantıya erişene kadar değişmez.
         subject: 'Mastodon: %{instance} için e-postayı onayla'
         title: E-posta adresinizi doğrulayın
       reset_password_instructions:
-        action: Şifreyi değiştir
-        explanation: Hesabınız için yeni bir şifre istediniz.
+        action: Parolayı değiştir
+        explanation: Hesabınız için yeni bir parola istediniz.
         extra: Bunu siz yapmadıysanız, lütfen bu e-postayı dikkate almayın. Parolanız yukarıdaki bağlantıya erişene ve yeni bir tane oluşturuncaya kadar değişmez.
-        subject: 'Mastodon: Şifre sıfırlama talimatları'
-        title: Şifre sıfırlama
+        subject: 'Mastodon: Parola sıfırlama talimatları'
+        title: Parola sıfırlama
       two_factor_disabled:
         explanation: Hesabınız için iki-adımlı kimlik doğrulama devre dışı bırakıldı. Şimdi sadece e-posta adresi ve parola kullanarak giriş yapabilirsiniz.
         subject: 'Mastodon: İki-adımlı kimlik doğrulama devre dışı bırakıldı'
@@ -81,11 +81,11 @@ tr:
       failure: '%{kind}''den kimliğiniz doğrulanamadı çünkü "%{reason}".'
       success: "%{kind} hesabından başarıyla kimlik doğrulaması yapıldı."
     passwords:
-      no_token: Bu sayfaya şifre sıfırlama e-postasından gelmeden erişemezsiniz. Şifre sıfırlama e-postasından geliyorsanız lütfen sağlanan tam URL'yi kullandığınızdan emin olun.
+      no_token: Bu sayfaya parola sıfırlama e-postasından gelmeden erişemezsiniz. Parola sıfırlama e-postasından geliyorsanız lütfen sağlanan tam URL'yi kullandığınızdan emin olun.
       send_instructions: E-posta adresiniz veritabanımızda varsa, e-posta adresinize birkaç dakika içinde bir parola kurtarma bağlantısı gönderilir. Bu e-postayı almadıysanız, lütfen spam klasörünüzü kontrol edin.
       send_paranoid_instructions: E-posta adresiniz veritabanımızda varsa, e-posta adresinize birkaç dakika içinde bir parola kurtarma bağlantısı gönderilir. Bu e-postayı almadıysanız, lütfen spam klasörünüzü kontrol edin.
-      updated: Şifreniz başarılı bir şekilde değiştirildi. Şu an oturum açtınız.
-      updated_not_active: Şifreniz başarıyla değiştirildi.
+      updated: Parolanız başarılı bir şekilde değiştirildi. Şu an oturum açtınız.
+      updated_not_active: Parolanız başarıyla değiştirildi.
     registrations:
       destroyed: Görüşürüz! hesabın başarıyla iptal edildi. Umarız seni sonra tekrar görürüz.
       signed_up: Hoş geldiniz! Başarılı bir şekilde oturum açtınız.
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index afd83861c..50e592a96 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -20,19 +20,19 @@ uk:
       confirmation_instructions:
         action: Підтвердити адресу електронної пошти
         action_with_app: Підтвердити та повернутися до %{app}
-        explanation: Ви створили обліковий запис на %{host} з цією адресою електронної пошти, і зараз на відстані одного кліку від його активації. Якщо це були не ви, проігноруйте цього листа, будь ласка.
+        explanation: Ви створили обліковий запис на %{host} з цією адресою електронної пошти, і зараз на відстані одного натиску від його активації. Якщо це були не ви, проігноруйте цього листа.
         explanation_when_pending: Ви подали заявку на запрошення до %{host} з цією адресою електронної пошти. Після підтвердження адреси ми розглянемо вашу заявку. Ви можете увійти, щоб змінити ваші дані або видалити свій обліковий запис, але Ви не зможете отримати доступ до більшості функцій, поки Ваш обліковий запис не буде схвалено. Якщо вашу заявку буде відхилено, ваші дані будуть видалені, тож вам не потрібно буде нічого робити. Якщо це були не ви, просто проігноруйте цей лист.
-        extra_html: Також перегляньте <a href="%{terms_path}">правила серверу</a> та <a href="%{policy_path}">умови використання</a>.
+        extra_html: Також перегляньте <a href="%{terms_path}">правила сервера</a> та <a href="%{policy_path}">умови користування</a>.
         subject: 'Mastodon: Інструкції для підтвердження %{instance}'
         title: Підтвердити адресу електронної пошти
       email_changed:
         explanation: 'Адреса електронної пошти для вашого облікового запису змінюється на:'
-        extra: Якщо ви не змінювали свою адресу електронної пошти, то хтось вірогідно отримав доступ до вашого облікового запису. Будь ласка, негайно змініть свій пароль або зв'яжіться з адміністратором серверу, якщо ви не маєте доступу до свого облікового запису.
+        extra: Якщо ви не змінювали свою адресу електронної пошти, то хтось вірогідно отримав доступ до вашого облікового запису. Будь ласка, негайно змініть свій пароль або зв'яжіться з адміністратором сервера, якщо ви не маєте доступу до свого облікового запису.
         subject: 'Mastodon: адресу електронної пошти змінено'
         title: Нова адреса електронної пошти
       password_change:
         explanation: Пароль до вашого облікового запису був змінений.
-        extra: Якщо ви не змінювали свій пароль, то хтось вірогідно отримав доступ до вашого облікового запису. Будь ласка, негайно змініть свій пароль або зв'яжіться з адміністратором серверу, якщо ви не маєте доступу до свого облікового запису.
+        extra: Якщо ви не змінювали свій пароль, то хтось вірогідно отримав доступ до вашого облікового запису. Будь ласка, негайно змініть свій пароль або зв'яжіться з адміністратором сервера, якщо ви не маєте доступу до свого облікового запису.
         subject: 'Mastodon: Ваш пароль змінений'
         title: Пароль змінено
       reconfirmation_instructions:
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index b0a240bf8..348f347e6 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -2,9 +2,9 @@
 vi:
   devise:
     confirmations:
-      confirmed: Địa chỉ email của bạn đã được xác thực thành công.
-      send_instructions: Bạn sẽ nhận được một email hướng dẫn cách xác thực địa chỉ email trong vài phút tới. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
-      send_paranoid_instructions: Nếu địa chỉ email của bạn đã tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được một email hướng dẫn cách xác thực lại địa chỉ email. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
+      confirmed: Địa chỉ email của bạn đã được xác minh thành công.
+      send_instructions: Bạn sẽ nhận được một email hướng dẫn cách xác minh địa chỉ email trong vài phút tới. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
+      send_paranoid_instructions: Nếu địa chỉ email của bạn đã tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được một email hướng dẫn cách xác minh lại địa chỉ email. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
     failure:
       already_authenticated: Bạn đã đăng nhập rồi.
       inactive: Tài khoản của bạn chưa được kich hoạt.
@@ -15,16 +15,16 @@ vi:
       pending: Tài khoản của bạn vẫn đang được xem xét.
       timeout: Phiên của bạn đã hết hạn. Vui lòng đăng nhập lại để tiếp tục.
       unauthenticated: Bạn cần đăng nhập hoặc đăng ký trước khi tiếp tục.
-      unconfirmed: Bạn phải xác thực địa chỉ email trước khi tiếp tục.
+      unconfirmed: Bạn phải xác minh địa chỉ email trước khi tiếp tục.
     mailer:
       confirmation_instructions:
-        action: Xác thực địa chỉ email
+        action: Xác minh địa chỉ email
         action_with_app: Xác nhận và quay lại %{app}
         explanation: Bạn đã tạo một tài khoản trên %{host} với địa chỉ email này. Chỉ cần một cú nhấp chuột nữa để kích hoạt nó. Nếu đây không phải là bạn, xin vui lòng bỏ qua email này.
-        explanation_when_pending: Bạn vừa đăng ký %{host} với địa chỉ email này. Chúng tôi chỉ xem xét đơn đăng ký sau khi bạn xác thực địa chỉ email. Bạn có thể đăng nhập để thay đổi chi tiết hoặc xóa tài khoản của mình, nhưng bạn không thể sử dụng đầy đủ tính năng cho đến khi tài khoản được xác thực. Nếu bạn bị từ chối, dữ liệu của bạn sẽ bị xóa, do đó bạn sẽ không cần phải làm gì thêm nữa. Nếu không phải do bạn đăng ký, xin vui lòng bỏ qua email này.
+        explanation_when_pending: Bạn vừa đăng ký %{host} với địa chỉ email này. Chúng tôi chỉ xem xét đơn đăng ký sau khi bạn xác minh địa chỉ email. Bạn có thể đăng nhập để thay đổi chi tiết hoặc xóa tài khoản của mình, nhưng bạn không thể sử dụng đầy đủ tính năng cho đến khi tài khoản được xác minh. Nếu bạn bị từ chối, dữ liệu của bạn sẽ bị xóa, do đó bạn sẽ không cần phải làm gì thêm nữa. Nếu không phải do bạn đăng ký, xin vui lòng bỏ qua email này.
         extra_html: Xin đọc kỹ <a href="%{terms_path}">quy tắc máy chủ</a> và <a href="%{policy_path}">chính sách riêng tư</a> của chúng tôi.
-        subject: 'Mastodon: Xác thực email cho %{instance}'
-        title: Xác thực địa chỉ email
+        subject: 'Mastodon: Xác minh email cho %{instance}'
+        title: Xác minh địa chỉ email
       email_changed:
         explanation: 'Địa chỉ email cho tài khoản của bạn đang được thay đổi thành:'
         extra: Nếu bạn không thay đổi email của mình, có khả năng ai đó đã truy cập được vào tài khoản của bạn. Hãy thay đổi mật khẩu ngay lập tức hoặc liên hệ với quản trị viên.
@@ -38,8 +38,8 @@ vi:
       reconfirmation_instructions:
         explanation: Xác nhận địa chỉ email mới của bạn.
         extra: Nếu thay đổi này không phải do bạn thực hiện, vui lòng bỏ qua email này. Địa chỉ email cho tài khoản Mastodon sẽ giữ nguyên cho đến khi bạn truy cập vào liên kết ở trên.
-        subject: 'Mastodon: Xác thực email cho %{instance}'
-        title: Xác thực địa chỉ email
+        subject: 'Mastodon: Xác minh email cho %{instance}'
+        title: Xác minh địa chỉ email
       reset_password_instructions:
         action: Đổi mật khẩu
         explanation: Bạn đã yêu cầu mật khẩu mới cho tài khoản của bạn.
@@ -47,13 +47,13 @@ vi:
         subject: 'Mastodon: Hướng dẫn đổi lại mật khẩu'
         title: Đổi lại mật khẩu
       two_factor_disabled:
-        explanation: Đã vô hiệu hóa xác thực hai bước cho tài khoản của bạn. Bây giờ chỉ có thể đăng nhập bằng địa chỉ email và mật khẩu.
-        subject: 'Mastodon: Xác thực hai bước đã bị vô hiệu hóa'
-        title: Vô hiệu hóa xác thực hai bước
+        explanation: Đã vô hiệu hóa xác minh 2 bước cho tài khoản của bạn. Bây giờ chỉ có thể đăng nhập bằng địa chỉ email và mật khẩu.
+        subject: 'Mastodon: Xác minh 2 bước đã bị vô hiệu hóa'
+        title: Vô hiệu hóa xác minh 2 bước
       two_factor_enabled:
-        explanation: Tài khoản của bạn đã kích hoạt xác thực hai bước. Lần đăng nhập tới sẽ cần thêm mã đăng nhập được tạo bởi ứng dụng TOTP.
-        subject: 'Mastodon: Kích hoạt xác thực hai yếu tố'
-        title: Kích hoạt xác thực hai bước
+        explanation: Tài khoản của bạn đã kích hoạt xác minh 2 bước. Lần đăng nhập tới sẽ cần thêm mã đăng nhập được tạo bởi ứng dụng TOTP.
+        subject: 'Mastodon: Kích hoạt xác minh 2 bước'
+        title: Kích hoạt xác minh 2 bước
       two_factor_recovery_codes_changed:
         explanation: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         subject: 'Mastodon: Mã khôi phục xác thực hai yếu tố đã được tạo lại'
@@ -75,13 +75,13 @@ vi:
         title: Đã vô hiệu hóa khóa bảo mật
       webauthn_enabled:
         explanation: Bạn vừa kích hoạt xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, khóa bảo mật của bạn sẽ được dùng để đăng nhập.
-        subject: 'Mastodon: Kích hoạt xác thực bằng khóa bảo mật'
+        subject: 'Mastodon: Kích hoạt xác minh bằng khóa bảo mật'
         title: Đã kích hoạt khóa bảo mật
     omniauth_callbacks:
-      failure: Không thể xác thực bạn từ %{kind} bởi vì "%{reason}".
-      success: Xác thực tài khoản %{kind} thành công.
+      failure: Không thể xác minh bạn từ %{kind} bởi vì "%{reason}".
+      success: Xác minh tài khoản %{kind} thành công.
     passwords:
-      no_token: Bạn chỉ có thể truy cập trang này khi nhận được email phục hồi mật khẩu. Nếu vẫn không được, vui lòng chắc chắn rằng bạn đã dùng chính xác URL được cung cấp.
+      no_token: Bạn chỉ có thể truy cập trang này khi nhận được email khôi phục mật khẩu. Nếu vẫn không được, vui lòng chắc chắn rằng bạn đã dùng chính xác URL được cung cấp.
       send_instructions: Nếu địa chỉ email của bạn tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được liên kết khôi phục mật khẩu tại địa chỉ email của bạn sau vài phút. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
       send_paranoid_instructions: Nếu địa chỉ email của bạn tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được liên kết khôi phục mật khẩu tại địa chỉ email của bạn sau vài phút. Xin kiểm tra thư mục thư rác nếu như bạn không thấy email này.
       updated: Mật khẩu của bạn đã được thay đổi thành công. Hiện tại bạn đã đăng nhập.
@@ -91,9 +91,9 @@ vi:
       signed_up: Chúc mừng! Bạn đã đăng ký thành công.
       signed_up_but_inactive: Bạn đã đăng ký thành công. Tuy nhiên, bạn cần phải kích hoạt tài khoản mới có thể đăng nhập.
       signed_up_but_locked: Bạn đã đăng ký thành công. Tuy nhiên, chúng tôi không thể đăng nhập cho bạn vì tài khoản của bạn bị khóa.
-      signed_up_but_pending: Một email xác thực đã được gửi đến địa chỉ email của bạn. Sau khi bạn nhấp vào liên kết, chúng tôi sẽ xem xét đơn đăng ký của bạn và thông báo nếu đơn được chấp thuận.
-      signed_up_but_unconfirmed: Một email xác thực đã được gửi đến địa chỉ email của bạn. Hãy nhấp vào liên kết trong email để kích hoạt tài khoản của bạn. Nếu không thấy, hãy kiểm tra mục thư rác.
-      update_needs_confirmation: Bạn đã cập nhật tài khoản thành công, nhưng chúng tôi cần xác thực địa chỉ email mới của bạn. Vui lòng kiểm tra email và nhấp vào liên kết xác thực. Nếu bạn không thấy email, hãy kiểm tra trong thư rác.
+      signed_up_but_pending: Một email xác minh đã được gửi đến địa chỉ email của bạn. Sau khi bạn nhấp vào liên kết, chúng tôi sẽ xem xét đơn đăng ký của bạn và thông báo nếu đơn được chấp thuận.
+      signed_up_but_unconfirmed: Một email xác minh đã được gửi đến địa chỉ email của bạn. Hãy nhấp vào liên kết trong email để kích hoạt tài khoản của bạn. Nếu không thấy, hãy kiểm tra mục thư rác.
+      update_needs_confirmation: Bạn đã cập nhật tài khoản thành công, nhưng chúng tôi cần xác minh địa chỉ email mới của bạn. Vui lòng kiểm tra email và nhấp vào liên kết xác minh. Nếu bạn không thấy email, hãy kiểm tra trong thư rác.
       updated: Tài khoản của bạn đã được cập nhật thành công.
     sessions:
       already_signed_out: Đã đăng xuất.
@@ -105,8 +105,8 @@ vi:
       unlocked: Tài khoản của bạn đã được mở khóa thành công. Vui lòng đăng nhập để tiếp tục.
   errors:
     messages:
-      already_confirmed: đã được xác thực, vui lòng đăng nhập lại
-      confirmation_period_expired: cần phải xác thực trong vòng %{period}, vui lòng yêu cầu một cái mới
+      already_confirmed: đã được xác minh, vui lòng đăng nhập lại
+      confirmation_period_expired: cần phải xác minh trong vòng %{period}, vui lòng yêu cầu lại
       expired: đã hết hạn, vui lòng yêu cầu một cái mới
       not_found: không tìm thấy
       not_locked: không bị khóa
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index 0d8e487c9..c752ceed8 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -4,15 +4,15 @@ zh-CN:
     confirmations:
       confirmed: 已成功确认你的邮箱地址。
       send_instructions: 你将在几分钟内收到一封电子邮件，指导你如何验证电子邮箱地址。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
-      send_paranoid_instructions: 如果你的电子邮箱地址存在于我们的数据库中，你将在几分钟内收到一封邮件，知道你如何验证电子邮箱地址。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
+      send_paranoid_instructions: 如果你的电子邮箱地址存在于我们的数据库中，你将在几分钟内收到一封邮件，指导你如何验证电子邮箱地址。如果你没有收到这封邮件，请检查你的垃圾邮件文件夹。
     failure:
       already_authenticated: 你已登录。
-      inactive: 你还没有激活帐户。
+      inactive: 你还没有激活账户。
       invalid: "%{authentication_keys} 无效或密码错误。"
-      last_attempt: 你只有最后一次尝试机会，若未通过，帐号将被锁定。
-      locked: 你的帐户已被锁定。
+      last_attempt: 你只有最后一次尝试机会，若未通过，账号将被锁定。
+      locked: 你的账户已被锁定。
       not_found_in_database: "%{authentication_keys}或密码错误。"
-      pending: 你的帐号仍在审核中。
+      pending: 你的账号仍在审核中。
       timeout: 你的会话已过期。请重新登录再继续操作。
       unauthenticated: 继续操作前请注册或者登录。
       unconfirmed: 你必须先确认你的电子邮件地址才能继续。
@@ -20,34 +20,34 @@ zh-CN:
       confirmation_instructions:
         action: 验证电子邮件地址
         action_with_app: 确认并返回%{app}
-        explanation: 你在 %{host} 上使用此电子邮箱地址创建了一个帐号。点击下面的链接即可激活帐号。如果你没有创建帐号，请忽略此邮件。
+        explanation: 你在 %{host} 上使用此电子邮箱地址创建了一个账号。点击下面的链接即可激活账号。如果你没有创建账号，请忽略此邮件。
         explanation_when_pending: 你用这个电子邮件申请了在 %{host} 注册。在确认电子邮件地址之后，我们会审核你的申请。在此之前，你不能登录。如果你的申请被驳回，你的数据会被移除，因此你无需再采取任何行动。如果申请人不是你，请忽略这封邮件。
-        extra_html: 请记得阅读<a href="%{terms_path}">本服务器的相关规定</a>和<a href="%{policy_path}">我们的使用条款</a>。
+        extra_html: 请记得阅读<a href="%{terms_path}">本实例的相关规定</a>和<a href="%{policy_path}">我们的使用条款</a>。
         subject: Mastodon：来自 %{instance} 的确认指引
         title: 验证电子邮件地址
       email_changed:
         explanation: 你的账号的电子邮箱地址将变更为：
-        extra: 如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器管理员请求协助。
+        extra: 如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的账户。请立即更改你的密码，或者，如果你已经无法访问你的账户，请联系服务器管理员请求协助。
         subject: Mastodon：电子邮件地址已被更改
         title: 新电子邮件地址
       password_change:
-        explanation: 你的帐户密码已更改。
+        explanation: 你的账户密码已更改。
         extra: 如果你并没有申请更改密码，那似乎有人已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器的管理员获取帮助。
         subject: Mastodon：密码已被更改
         title: 密码已被重置
       reconfirmation_instructions:
         explanation: 点击下面的链接来确认你的新电子邮件地址。
-        extra: 如果你并没有请求本次变更，请忽略此邮件。Mastodon 帐户的电子邮件地址只有在你点击上面的链接后才会更改。
+        extra: 如果你并没有请求本次更改，请忽略此邮件。Mastodon 账户的电子邮件地址只有在你点击上面的链接后才会更改。
         subject: Mastodon：确认 %{instance} 电子邮件地址
         title: 验证电子邮件地址
       reset_password_instructions:
         action: 更改密码
-        explanation: 点击下面的链接来更改帐户的密码。
+        explanation: 点击下面的链接来更改账户的密码。
         extra: 如果你并没有请求本次变更，请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。
         subject: Mastodon：重置密码信息
         title: 重置密码
       two_factor_disabled:
-        explanation: 帐号的双重认证已禁用。现在仅使用邮箱和密码登录即可登录。
+        explanation: 账号的双重认证已禁用。现在仅使用邮箱和密码即可登录。
         subject: Mastodon：双重认证已禁用。
         title: 双重认证已禁用
       two_factor_enabled:
@@ -59,7 +59,7 @@ zh-CN:
         subject: Mastodon：重新生成双重认证的恢复码
         title: 双重认证的恢复码已更改
       unlock_instructions:
-        subject: Mastodon：帐户解锁信息
+        subject: Mastodon：账户解锁信息
       webauthn_credential:
         added:
           explanation: 以下安全密钥已添加到你的帐户
@@ -79,36 +79,36 @@ zh-CN:
         title: 已启用安全密钥
     omniauth_callbacks:
       failure: 由于%{reason}，无法从%{kind}获得授权。
-      success: 成功地从%{kind}获得授权。
+      success: 成功地从 %{kind} 获得授权。
     passwords:
-      no_token: 你必须通过密码重置邮件才能访问这个页面。如果你确实如此，请确保你输入的 URL 是完整的。
-      send_instructions: 几分钟后，你将收到重置密码的电子邮件。如果没有，请检查你的垃圾邮箱。
-      send_paranoid_instructions: 如果你的邮箱存在于我们的数据库中，你将收到一封找回密码的邮件。如果没有，请检查你的垃圾邮箱。
-      updated: 你的密码已修改成功，你现在已登录。
-      updated_not_active: 你的密码已修改成功。
+      no_token: 如果你不是来自于密码重置邮件，你就不能访问这个页面。如果你确实来自密码重置邮件，请确保你使用了所提供的完整 URL 。
+      send_instructions: 如果你的电子邮件地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
+      send_paranoid_instructions: 如果你的电子邮件地址存在于我们的数据库中，你将在几分钟后收到一个密码恢复链接。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
+      updated: 你的密码已成功修改，现在你已登录。
+      updated_not_active: 你的密码已成功修改。
     registrations:
-      destroyed: 再见！你的帐户已成功注销。我们希望很快可以再见到你。
-      signed_up: 欢迎！你已注册成功。
-      signed_up_but_inactive: 你已成功注册，但因尚未激活帐户所以无法登陆。
-      signed_up_but_locked: 你已成功注册，但因帐户被锁定所以无法登陆。
-      signed_up_but_pending: 一封带有确认链接的邮件已经发送到了你的邮箱。 在你点击确认链接后，我们将会审核你的申请。审核通过后，我们将会通知你。
-      signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱，请点击邮件中的链接以激活你的帐户。如果没有，请检查你的垃圾邮件。
-      update_needs_confirmation: 帐号信息更新成功，但我们需要验证你的新电子邮件地址，请点击邮件中的链接以确认。如果没有，请检查你的垃圾邮箱。
-      updated: 帐户资料更新成功。
+      destroyed: 再见！你的账户已成功注销。我们希望很快可以再见到你。
+      signed_up: 欢迎！你已成功注册。
+      signed_up_but_inactive: 你已成功注册，但我们无法让你登录，因为你的账户还没有激活。
+      signed_up_but_locked: 你已成功注册，但我们无法让你登录，因为你的账户已被锁定。
+      signed_up_but_pending: 一条带有确认链接的邮件已经发送到你的电子邮件地址。在你点击该链接后，我们将会审查你的申请。如果申请被批准，你将收到通知。
+      signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱，请点击邮件中的链接以激活你的账户。如果没有，请检查你的垃圾邮件。
+      update_needs_confirmation: 账号信息更新成功，但我们需要验证你的新电子邮件地址，请点击邮件中的链接以确认。如果没有收到邮件，请检查你的垃圾邮箱。
+      updated: 账户资料更新成功。
     sessions:
       already_signed_out: 已成功登出。
       signed_in: 已成功登录。
       signed_out: 已成功登出。
     unlocks:
-      send_instructions: 几分钟后，你将收到一封解锁帐户的邮件。如果没有，请检查你的垃圾邮箱。
-      send_paranoid_instructions: 如果你的帐号存在于数据库中，你将收到一封指引你解锁帐户的邮件。如果没有，请检查你的垃圾邮箱。
-      unlocked: 你的帐户已成功解锁。登录以继续。
+      send_instructions: 几分钟后，你将收到一封解锁账户的邮件。如果没有，请检查你的垃圾邮箱。
+      send_paranoid_instructions: 如果你的账号存在，你将会在几分钟内收到一封指引你如何解锁账号的邮件。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。
+      unlocked: 你的账户已成功解锁。登录以继续。
   errors:
     messages:
-      already_confirmed: 已经确认成功，请尝试登录
+      already_confirmed: 已经成功确认，请尝试登录
       confirmation_period_expired: 必须在 %{period} 以内确认。请重新发起请求
       expired: 已过期。请重新发起请求
       not_found: 未找到
       not_locked: 未被锁定
       not_saved:
-        other: 发生 %{count} 个错误，导致%{resource}保存失败：
+        other: 在保存 %{resource} 时发生了 %{count} 个错误：
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 910c77e8a..e500e1d9e 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -2,107 +2,107 @@
 zh-TW:
   devise:
     confirmations:
-      confirmed: 您的電子信箱地址已確認成功。
+      confirmed: 您的電子郵件地址已確認成功。
       send_instructions: 幾分鐘後您將收到確認信件。若未收到此信件，請檢查垃圾郵件資料夾。
-      send_paranoid_instructions: 如果您的電子信箱存在於我們的資料庫，您將會在幾分鐘內收到確認信。若未收到請檢查垃圾郵件資料夾。
+      send_paranoid_instructions: 如果您的電子郵件存在於我們的資料庫，您將會在幾分鐘內收到確認信。若未收到請檢查垃圾郵件資料夾。
     failure:
       already_authenticated: 您已登入。
-      inactive: 您的帳戶尚未啟用。
+      inactive: 您的帳號尚未啟用。
       invalid: 無效的 %{authentication_keys} 或密碼。
-      last_attempt: 在帳戶鎖定前，您還有最後一次嘗試機會。
-      locked: 已鎖定您的帳戶。
+      last_attempt: 在帳號鎖定前，您還有最後一次嘗試機會。
+      locked: 已鎖定您的帳號。
       not_found_in_database: 無效的 %{authentication_keys} 或密碼。
-      pending: 您的帳戶仍在審核中。
+      pending: 您的帳號仍在審核中。
       timeout: 登入階段逾時。請重新登入以繼續。
       unauthenticated: 您必須先登入或註冊才能繼續使用。
-      unconfirmed: 您必須先確認電子信箱才能繼續使用。
+      unconfirmed: 您必須先確認電子郵件才能繼續使用。
     mailer:
       confirmation_instructions:
-        action: 驗證電子信箱地址
+        action: 驗證電子郵件地址
         action_with_app: 確認並返回 %{app}
-        explanation: 您已經在 %{host} 上以此電子信箱地址建立了一支帳戶。您距離啟用它只剩一點之遙了。若這不是您，請忽略此信件。
-        explanation_when_pending: 您使用此電子信箱地址申請了 %{host} 的邀請。當您確認電子信箱後我們將審核您的申請。您可以登入以改變您的細節或刪除您的帳戶，但直到您的帳戶被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您，請忽略此信件。
+        explanation: 您已經在 %{host} 上以此電子郵件地址建立了一支帳號。您距離啟用它只剩一點之遙了。若這不是您，請忽略此信件。
+        explanation_when_pending: 您使用此電子郵件地址申請了 %{host} 的邀請。當您確認電子郵件信箱後我們將審核您的申請。您可以登入以改變您的細節或刪除您的帳號，但直到您的帳號被核准之前，您無法操作大部分的功能。若您的申請遭拒絕，您的資料將被移除而不必做後續動作。如果這不是您，請忽略此信件。
         extra_html: 同時也請看看<a href="%{terms_path}">伺服器規則</a>與<a href="%{policy_path}">服務條款</a>。
         subject: Mastodon：%{instance} 確認說明
-        title: 驗證電子信箱地址
+        title: 驗證電子郵件地址
       email_changed:
-        explanation: 您帳戶的電子信箱地址將變更為：
-        extra: 若您未變更電子信箱，那麼很有可能是某人取得了您帳戶的存取權限。請立刻變更密碼，或當帳戶被鎖定時，請聯絡伺服器的管理員。
-        subject: Mastodon：已變更電子信箱
-        title: 新電子信箱地址
+        explanation: 您帳號的電子郵件地址將變更為：
+        extra: 若您未變更電子郵件，那麼很有可能是某人取得了您帳號的存取權限。請立刻變更密碼，或當帳號被鎖定時，請聯絡伺服器的管理員。
+        subject: Mastodon：已變更電子郵件
+        title: 新電子郵件地址
       password_change:
-        explanation: 您帳戶的密碼已變更。
-        extra: 若您未變更密碼，那麼很有可能是某人取得了您帳戶的存取權限。請立刻變更密碼，或若帳戶被鎖定時，請聯絡伺服器的管理員。
+        explanation: 您帳號的密碼已變更。
+        extra: 若您未變更密碼，那麼很有可能是某人取得了您帳號的存取權限。請立刻變更密碼，或若帳號被鎖定時，請聯絡伺服器的管理員。
         subject: Mastodon：已變更密碼
         title: 密碼已變更
       reconfirmation_instructions:
-        explanation: 請確認新的電子信箱地址以變更。
-        extra: 若此次變更不是由您開啟的，請忽略此信件。Mastodon 帳戶的電子信箱地址在您存取上面的連結前不會變更。
-        subject: Mastodon：確認 %{instance} 的電子信箱地址
-        title: 驗證電子信箱地址
+        explanation: 請確認新的電子郵件地址以變更。
+        extra: 若此次變更不是由您起始的，請忽略此信件。Mastodon 帳號的電子郵件地址在您存取上面的連結前不會變更。
+        subject: Mastodon：確認 %{instance} 的電子郵件地址
+        title: 驗證電子郵件地址
       reset_password_instructions:
         action: 變更密碼
-        explanation: 您已請求帳戶的新密碼。
+        explanation: 您已請求帳號的新密碼。
         extra: 若您並未請求，請忽略此信件。您的密碼在存取上方連結並建立新密碼前不會變更。
         subject: Mastodon：重設密碼指引
         title: 重設密碼
       two_factor_disabled:
-        explanation: 您帳戶的兩步驟驗證已停用。現在只能使用電子信箱及密碼登入。
-        subject: Mastodon：已停用兩步驟驗證
+        explanation: 您帳號的兩階段驗證已停用。現在只使用電子郵件及密碼登入。
+        subject: Mastodon：已停用兩階段驗證
         title: 已停用 2FA
       two_factor_enabled:
-        explanation: 已對您的帳戶啟用兩步驟驗證。登入時將需要配對之 TOTP 應用程式所產生的 Token。
-        subject: Mastodon：已啟用兩步驟驗證
+        explanation: 已對您的帳號啟用兩階段驗證。登入時將需要已配對的 TOTP 應用程式所產生之 Token。
+        subject: Mastodon：已啟用兩階段驗證
         title: 已啟用 2FA
       two_factor_recovery_codes_changed:
-        explanation: 上一次的復原碼已經失效，且已產生新的。
-        subject: Mastodon：兩步驟驗證復原碼已經重新產生
-        title: 2FA 復原碼已變更
+        explanation: 之前的備用驗證碼已經失效，且已產生新的。
+        subject: Mastodon：兩階段驗證備用驗證碼已經重新產生
+        title: 2FA 備用驗證碼已變更
       unlock_instructions:
         subject: Mastodon：解鎖指引
       webauthn_credential:
         added:
-          explanation: 下面的安全密鑰已經新增至您的帳戶
+          explanation: 以下的安全密鑰已經新增至您的帳號
           subject: Mastodon：新安全密鑰
           title: 已新增新安全密鑰
         deleted:
-          explanation: 以下的安全密鑰已經從您的帳戶中移除
+          explanation: 以下的安全密鑰已經從您的帳號中移除
           subject: Mastodon：安全密鑰已移除
           title: 您的一支安全密鑰已經被移除
       webauthn_disabled:
-        explanation: 您的帳戶並沒有啟用安全密鑰認證方式。只能以 TOTP app 產生地成對 token 登入。
-        subject: Mastodon：安全密鑰認證方式已關閉
-        title: 已關閉安全密鑰
+        explanation: 您的帳號已停用安全密鑰認證。只能透過已配對的 TOTP 應用程式所產生之 Token 登入。
+        subject: Mastodon：安全密鑰認證方式已停用
+        title: 已停用安全密鑰
       webauthn_enabled:
-        explanation: 您的帳戶已啟用安全密鑰認證。您可以使用安全密鑰登入了。
+        explanation: 您的帳號已啟用安全密鑰認證。您可以使用安全密鑰登入了。
         subject: Mastodon：已啟用安全密鑰認證
         title: 已啟用安全密鑰
     omniauth_callbacks:
       failure: 無法透過 %{kind} 認證是否為您，因為「%{reason}」。
-      success: 成功透過 %{kind} 帳戶登入。
+      success: 成功透過 %{kind} 帳號登入。
     passwords:
       no_token: 您必須透過密碼重設信件才能存取此頁面。若確實如此，請確定輸入的網址是完整的。
-      send_instructions: 若電子信箱地址存在於我們的資料庫，幾分鐘後您將在信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
-      send_paranoid_instructions: 若電子信箱地址存在於我們的資料庫，幾分鐘後您將在信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
+      send_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將在信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
+      send_paranoid_instructions: 若電子郵件地址存在於我們的資料庫，幾分鐘後您將在信箱中收到密碼復原連結。若未收到請檢查垃圾郵件資料夾。
       updated: 您的密碼已成功變更，現在已經登入。
       updated_not_active: 您的密碼已成功變更。
     registrations:
-      destroyed: 再見！您的帳戶已成功取消，期待再相逢。
+      destroyed: 再見！您的帳號已成功取消，期待再相逢。
       signed_up: 歡迎！您已成功註冊。
-      signed_up_but_inactive: 您已註冊成功，但由於您的帳戶尚未啟用，我們暫時無法讓您登入。
-      signed_up_but_locked: 您已註冊成功，但由於您的帳戶已被鎖定，我們無法讓您登入。
-      signed_up_but_pending: 包含確認連結的訊息已寄到您的電子信箱。按下此連結後我們將審核您的申請。核准後將通知您。
-      signed_up_but_unconfirmed: 包含確認連結的訊息已寄到您的電子信箱。請前往連結以啟用帳戶。若未收到請檢查垃圾郵件資料夾。
-      update_needs_confirmation: 已成功更新您的帳戶，但仍需驗證您的新信箱。請檢查電子信箱並前往確認連結來確認新信箱地址。若未收到請檢查垃圾郵件資料夾。
-      updated: 您的帳戶已成功更新。
+      signed_up_but_inactive: 您已註冊成功，但由於您的帳號尚未啟用，我們暫時無法讓您登入。
+      signed_up_but_locked: 您已註冊成功，但由於您的帳號已被鎖定，我們無法讓您登入。
+      signed_up_but_pending: 包含確認連結的訊息已寄到您的電子郵件信箱。按下此連結後我們將審核您的申請。核准後將通知您。
+      signed_up_but_unconfirmed: 包含確認連結的訊息已寄到您的電子信箱。請前往連結以啟用帳號。若未收到請檢查垃圾郵件資料夾。
+      update_needs_confirmation: 已成功更新您的帳號，但仍需驗證您的新信箱。請檢查電子信箱並前往確認連結來確認新信箱位址。若未收到請檢查垃圾郵件資料夾。
+      updated: 您的帳號已成功更新。
     sessions:
       already_signed_out: 已成功登出。
       signed_in: 已成功登入。
       signed_out: 已成功登出。
     unlocks:
-      send_instructions: 幾分鐘後您將收到解鎖帳戶的指引信件。若未收到請檢查垃圾郵件資料夾。
-      send_paranoid_instructions: 若此帳戶存在，您將在幾分鐘後收到解鎖指引信件。若未收到請檢查垃圾郵件資料夾。
-      unlocked: 已解鎖您的帳戶，請登入繼續。
+      send_instructions: 幾分鐘後您將收到解鎖帳號的指引信件。若未收到請檢查垃圾郵件資料夾。
+      send_paranoid_instructions: 若此帳號存在，您將在幾分鐘後收到解鎖指引信件。若未收到請檢查垃圾郵件資料夾。
+      unlocked: 已解鎖您的帳號，請登入繼續。
   errors:
     messages:
       already_confirmed: 已經確認，請嘗試登入
diff --git a/config/locales/doorkeeper.af.yml b/config/locales/doorkeeper.af.yml
index 252f9fd5a..c2aab2646 100644
--- a/config/locales/doorkeeper.af.yml
+++ b/config/locales/doorkeeper.af.yml
@@ -1 +1,164 @@
+---
 af:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Toepassingnaam
+        redirect_uri: Herlei URI
+        scopes: Bestekke
+        website: Toepassingwebtuiste
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: kan nie ’n fragment bevat nie.
+              invalid_uri: moet ’n geldige URI wees.
+              relative_uri: moet ’n absolute URI wees.
+              secured_uri: moet ’n HTTPS/SSL URI wees.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Magtig
+        cancel: Kanselleer
+        destroy: Vernietig
+        edit: Redigeer
+        submit: Dien in
+      confirmations:
+        destroy: Is jy seker?
+      edit:
+        title: Redigeer toepassing
+      form:
+        error: Oeps! Hersien jou vorm vir moontlike foute
+      help:
+        native_redirect_uri: Gebruik %{native_redirect_uri} vir plaaslike toetse
+        redirect_uri: Gebruik een reël per URI
+        scopes: Verdeel omvanggrense met spasies. Laat dit leeg om verstekomvange te gebruik.
+      index:
+        application: Toepassing
+        callback_url: Terugroep-URL
+        delete: Wis uit
+        empty: Jy het geen toepassings nie.
+        name: Naam
+        new: Nuwe toepassing
+        scopes: Omvange
+        show: Vertoon
+        title: Jou toepassings
+      new:
+        title: Nuwe toepassing
+      show:
+        actions: Handelinge
+        application_id: Kliëntsleutel
+        callback_urls: Terugroep-URL'e
+        scopes: Omvange
+        secret: Kliëntgeheim
+        title: 'Toepassing: %{name}'
+    authorizations:
+      buttons:
+        authorize: Magtig
+        deny: Weier
+      error:
+        title: "’n Fout het ingesluip"
+      new:
+        prompt_html: "%{client_name} wil toegang hê tot jou rekening. Dit is ’n derdepartytoepassing. <strong>Moet dit nie toelaat as jy dit nie vertrou nie.</strong>"
+        review_permissions: Hersien toestemmings
+        title: Benodig magtiging
+      show:
+        title: Kopieer hierdie magtigingskode en plak dit in die toepassing.
+    authorized_applications:
+      buttons:
+        revoke: Herroep
+      confirmations:
+        revoke: Is jy seker?
+      index:
+        authorized_at: Bemagtig op %{date}
+        description_html: Hierdie toepassings kan deur middel van die API tot jou rekening toegang verkry. As jy van hierdie toepassings nie herken nie, of by ’n toepassing wangedrag bespeur, kan jy dit verdere toegang tot jou rekening weier.
+        last_used_at: Laas gebruik op %{date}
+        never_used: Nooit gebruik nie
+        scopes: Magtigings
+        superapp: Intern
+        title: Jou gemagtigde toepassings
+    errors:
+      messages:
+        access_denied: Die hulpbroneienaar of magtigingsbediener het die aansoek afgekeur.
+        credential_flow_not_configured: Magtigingsbewysvloei van die hulpbroneienaar het gefaal omdat Doorkeeper.configure.resource_owner_from_credentials nie opgestel is nie.
+    flash:
+      applications:
+        create:
+          notice: Toepassing geskep.
+        destroy:
+          notice: Toepassing uitgewis.
+        update:
+          notice: Toepassing bygewerk.
+      authorized_applications:
+        destroy:
+          notice: Toepassing herroep.
+    grouped_scopes:
+      access:
+        read: Slegs leestoegang
+        read/write: Lees-en-skryf-toegang
+        write: Slegs skryftoegang
+      title:
+        accounts: Rekeninge
+        admin/accounts: Administrasie van rekeninge
+        admin/all: Alle administratiewe funksies
+        admin/reports: Administrasie van rapporteringe
+        all: Alles
+        blocks: Blokkerings
+        bookmarks: Boekmerke
+        conversations: Gesprekke
+        crypto: End-tot-end-enkripsie
+        favourites: Gunstelinge
+        filters: Filters
+        follow: Verhoudings
+        lists: Lyste
+        media: Media-aanhegsels
+        mutes: Uitdowings
+        notifications: Kennisgewings
+        push: Stootkennisgewings
+        reports: Rapporteringe
+        search: Soek
+        statuses: Plasings
+    layouts:
+      admin:
+        nav:
+          applications: Toepassings
+          oauth2_provider: OAuth2-verskaffer
+      application:
+        title: Benodig OAuth-bemagtiging
+    scopes:
+      admin:read: lees alle data op die bediener
+      admin:read:accounts: lees sensitiewe inligting van alle rekeninge
+      admin:read:reports: lees sensitiewe inligting van alle verslae end aangeklaagde rekeninge
+      admin:write: verander alle data op die bediener
+      admin:write:accounts: modereer rekeninge
+      admin:write:reports: modereer verslae
+      crypto: gebruik end-tot-end-enkripsie
+      follow: verander rekeningverhoudings
+      push: ontvang jou stootkennisgewings
+      read: lees al jou rekeningdata
+      read:accounts: sien rekeninginligting
+      read:blocks: sien jou blokkerings
+      read:bookmarks: sien jou boekmerke
+      read:favourites: sien jou gunstelinge
+      read:filters: sien jou filters
+      read:lists: sien jou lyste
+      read:mutes: sien jou uitdowings
+      read:notifications: sien jou kennisgewinge
+      read:reports: sien jou rapporterings
+      read:search: soek namens jou
+      read:statuses: sien alle plasings
+      write: pas al jou rekeningdata aan
+      write:accounts: pas jou profiel aan
+      write:blocks: blokkeer rekeninge en domeine
+      write:bookmarks: laat ’n boekmerk by plasings
+      write:conversations: doof en wis gesprekke uit
+      write:favourites: merk gunstelingplasings
+      write:filters: skep filters
+      write:follows: volg mense
+      write:lists: skep lyste
+      write:media: laai medalêers op
+      write:mutes: doof mense en gesprekke uit
+      write:notifications: verwyder jou kennisgewings
+      write:reports: rapporteer ander mense
+      write:statuses: publiseer plasings
diff --git a/config/locales/doorkeeper.an.yml b/config/locales/doorkeeper.an.yml
new file mode 100644
index 000000000..d3dd67158
--- /dev/null
+++ b/config/locales/doorkeeper.an.yml
@@ -0,0 +1,185 @@
+---
+an:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nombre d'aplicación
+        redirect_uri: URI atura redirección
+        scopes: Ambitos
+        website: Puesto web
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: no puede contener un fragmento.
+              invalid_uri: ha d'estar un URI valido.
+              relative_uri: ha d'estar una URI absoluta.
+              secured_uri: ha d'estar un URI HTTPS/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autorizar
+        cancel: Cancelar
+        destroy: Destruyir
+        edit: Editar
+        submit: Ninviar
+      confirmations:
+        destroy: Ye seguro?
+      edit:
+        title: Editar aplicación
+      form:
+        error: Uuups! Comprebe lo suyo formulario
+      help:
+        native_redirect_uri: Utilice %{native_redirect_uri} pa prebas locals
+        redirect_uri: Utilice una linia per URI
+        scopes: Desepare los ambitos con espacios. Lo deixe en blanco pa fer servir los ambitos per defecto.
+      index:
+        application: Aplicación
+        callback_url: URL de callback
+        delete: Eliminar
+        empty: No tiens aplicacions.
+        name: Nombre
+        new: Nueva aplicación
+        scopes: Ambitos
+        show: Amostrar
+        title: Las suyas aplicacions
+      new:
+        title: Nueva aplicación
+      show:
+        actions: Accions
+        application_id: ID de l'aplicación
+        callback_urls: URLs de callback
+        scopes: Ambitos
+        secret: Secreto
+        title: 'Aplicación: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autorizar
+        deny: Desautorizar
+      error:
+        title: Ha ocurriu una error
+      new:
+        prompt_html: "%{client_name} deseya permiso pa acceder ta la tuya cuenta. Ye una aplicación de tercers. <strong>Si no confías en ella, no habrías d'autorizar-la.</strong>"
+        review_permissions: Revisar permisos
+        title: Se requiere autorización
+      show:
+        title: Copia este codigo d'autorización y apega-lo en l'aplicación.
+    authorized_applications:
+      buttons:
+        revoke: Revocar
+      confirmations:
+        revoke: Ye seguro?
+      index:
+        authorized_at: Autorizau lo %{date}
+        description_html: Estas son aplicacions que pueden acceder ta la tuya cuenta usando la API. Si i hai aplicacions que no se reconoixen aquí, u una aplicación no funciona correctament, puetz revocar lo suyo acceso.
+        last_used_at: Zaguer uso lo %{date}
+        never_used: Nunca usau
+        scopes: Permisos
+        superapp: Interno
+        title: Las suyas aplicacions autorizadas
+    errors:
+      messages:
+        access_denied: Lo propietario d'o recurso u servidor d'autorización denegó la petición.
+        credential_flow_not_configured: Las credencials de clau d'o propietario d'o recurso falló a causa que Doorkeeper.configure.resource_owner_from_credentials ye sin configurar.
+        invalid_client: L'autentificación d'o client falló debiu u a que ye un client desconoixiu u no ye incluyius l'autentificación d'o client u lo metodo d'autentificación no ye confirmau.
+        invalid_grant: La concesión d'autorización ofrida ye invalida, venció, se revocó, no coincide con a URI de redirección utilizada en a petición d'autorización, u estió emitida pa unatro client.
+        invalid_redirect_uri: La URI de redirección incluyida no ye valida.
+        invalid_request:
+          missing_param: 'Falta este parametro requeriu: %{value}.'
+          request_not_authorized: La solicitut ha d'estar autorizada. I hai un parametro requeriu pa autorizar la solicitut que falta u no ye valido.
+          unknown: Falta un parametro requeriu en a solicitut, u esta incluye una valor no admitida de parametro, u bien ye mal formulada.
+        invalid_resource_owner: Las credencials proporcionadas d'o propietario d'o recurso no son validas, u lo propietario d'o recurso no puede estar trobau
+        invalid_scope: L'ambito pediu ye invalido, desconoixiu u erronio.
+        invalid_token:
+          expired: Lo autentificador d'acceso expiró
+          revoked: Lo autentificador d'acceso estió revocado
+          unknown: Lo autentificador d'acceso ye invalido
+        resource_owner_authenticator_not_configured: Lo propietario d'o recurso falló a causa que Doorkeeper.configure.resource_owner_authenticator ye sin configurar.
+        server_error: Lo servidor de l'autorización entontró una condición inasperada que le impidió complir con a solicitut.
+        temporarily_unavailable: Lo servidor de l'autorización ye actualment incapaz de maniar la petición a causa d'una sobrecarga temporal u un treballo de mantenimiento d'o servidor.
+        unauthorized_client: Lo client no ye autorizau a realizar esta petición utilizando este metodo.
+        unsupported_grant_type: Lo tipo de concesión d'autorización no ye suportau per lo servidor d'autorización.
+        unsupported_response_type: Lo servidor d'autorización no suporta este tipo de respuesta.
+    flash:
+      applications:
+        create:
+          notice: Aplicación creyada.
+        destroy:
+          notice: Aplicación eliminada.
+        update:
+          notice: Aplicación actualizada.
+      authorized_applications:
+        destroy:
+          notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de solo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de nomás escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Totas las funcions administrativas
+        admin/reports: Administración d'informes
+        all: Tot
+        blocks: Bloqueyos
+        bookmarks: Marcadors
+        conversations: Conversacions
+        crypto: Zifrau de cabo a cabo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relacions
+        follows: Seguius
+        lists: Listas
+        media: Adjuntos multimedia
+        mutes: Silenciaus
+        notifications: Notificacions
+        push: Notificacions push
+        reports: Informes
+        search: Buscar
+        statuses: Publicacions
+    layouts:
+      admin:
+        nav:
+          applications: Aplicacions
+          oauth2_provider: Furnidor OAuth2
+      application:
+        title: OAuth autorización requerida
+    scopes:
+      admin:read: leyer totz los datos en o servidor
+      admin:read:accounts: leyer información sensible de totas las cuentas
+      admin:read:reports: leyer información sensible de totz los informes y cuentas denunciadas
+      admin:write: modificar totz los datos en o servidor
+      admin:write:accounts: realizar accions de moderación en cuentas
+      admin:write:reports: realizar accions de moderación en informes
+      crypto: usar zifrau de cabo a extremo
+      follow: seguir, blocar, desblocar y deixar de seguir cuentas
+      push: recibir las tuyas notificacions push
+      read: leyer los datos d'a tuya cuenta
+      read:accounts: veyer información de cuentas
+      read:blocks: veyer a quí has blocau
+      read:bookmarks: veyer los tuyos marcadors
+      read:favourites: veyer los tuyos favoritos
+      read:filters: veyer los tuyos filtros
+      read:follows: veyer a quí sigues
+      read:lists: veyer las tuyas listas
+      read:mutes: veyer a quí has silenciau
+      read:notifications: veyer las tuyas notificacions
+      read:reports: veyer las tuyas informes
+      read:search: buscar en o suyo nombre
+      read:statuses: veyer totz los estaus
+      write: publicar en o tuyo nombre
+      write:accounts: modifica lo tuyo perfil
+      write:blocks: blocar cuentas y dominios
+      write:bookmarks: alzar estaus como marcadors
+      write:conversations: silenciar y eliminar conversacions
+      write:favourites: publicacions favoritas
+      write:filters: creyar filtros
+      write:follows: seguir usuarios
+      write:lists: creyar listas
+      write:media: puyar fichers multimedia
+      write:mutes: silenciar usuarios y conversacions
+      write:notifications: limpia las tuyas notificacions
+      write:reports: denunciar a atras personas
+      write:statuses: publicar estaus
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 03863a338..137ee3eae 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -60,8 +60,8 @@ ar:
       error:
         title: حدث هناك خطأ
       new:
-        able_to: يُخوَّل لهذا التطبيق القيام بـ
-        prompt: طلبَ تطبيق %{client_name} تصريحا لاستعمال حسابك
+        prompt_html: يريد %{client_name} الإذن للوصول إلى حسابك. إنه تطبيق طرف ثالث. <strong>إذا كنت لا تثق فيه، فلا ينبغي أن تأذن له بذلك.</strong>
+        review_permissions: مراجعة الصلاحيات
         title: إذن بالتصريح
       show:
         title: قم بنسخ رمز المصادقة و إلصاقه على التطبيق.
@@ -71,10 +71,12 @@ ar:
       confirmations:
         revoke: متأكد ؟
       index:
-        application: التطبيق
-        created_at: صُرّح له في
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: المجالات
+        authorized_at: تاريخ التخويل %{date}
+        description_html: يمكن لهذه التطبيقات الوصول إلى حسابك من باستخدام الـ API. إذا وجدت تطبيقات لا تتعرف عليها أو لا تعمل بشكل طبيعي ، فيمكنك إبطال وصولها لحسابك.
+        last_used_at: آخر استخدام في %{date}
+        never_used: لم يُستخدَم قط
+        scopes: الصلاحيات
+        superapp: داخلي
         title: تطبيقاتك المرخص لها
     errors:
       messages:
@@ -94,7 +96,7 @@ ar:
           revoked: تم إبطال رمز المصادقة
           unknown: رمز المصادقة غير صالح
         resource_owner_authenticator_not_configured: لقد أخفقت عملية البحث عن صاحب المَورِد لغياب الضبط في Doorkeeper.configure.resource_owner_authenticator.
-        server_error: لقد صادفَ خادوم التصريحات ظروفا غير مواتية، الأمر الذي مَنَعه مِن مواصلة دراسة الطلب.
+        server_error: حدث خلل غير متوقع في الخادم مما تسبب في فشل معالجة الطلب.
         temporarily_unavailable: تعذر على خادم التفويض معالجة الطلب و ذلك بسبب زيادة مؤقتة في التحميل أو عملية صيانة مبرمجة على الخادم.
         unauthorized_client: لا يصرح للعميل بتنفيذ هذا الطلب باستخدام هذه الطريقة.
         unsupported_grant_type: هذا النوع من منح التصريح غير معتمد في خادم الترخيص.
@@ -110,6 +112,33 @@ ar:
       authorized_applications:
         destroy:
           notice: تم إبطال التصريح المخول للتطبيق.
+    grouped_scopes:
+      access:
+        read: وصول للقراءة فقط
+        read/write: وصول للقراءة والكتابة
+        write: وصول للكتابة فقط
+      title:
+        accounts: الحسابات
+        admin/accounts: إدارة الحسابات
+        admin/all: جميع المهام الإدارية
+        admin/reports: إدارة التقارير
+        all: كل شيء
+        blocks: تم حجبها
+        bookmarks: الفواصل المرجعية
+        conversations: المحادثات
+        crypto: التشفير من الطرف إلى نهاية الطرف
+        favourites: المفضلة
+        filters: عوامل التصفية
+        follow: العلاقات
+        follows: الإشتراكات
+        lists: القوائم
+        media: الوسائط المرفقة
+        mutes: تم كتمها
+        notifications: الإشعارات
+        push: الإشعارات
+        reports: الشكاوى
+        search: البحث
+        statuses: المنشورات
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ ar:
       admin:write: تعديل كافة البيانات على الخادم
       admin:write:accounts: اتخاذ إجراءات إشراف على الحسابات
       admin:write:reports: اتخاذ إجراءات إشراف على الإبلاغات
+      crypto: استخدم التشفير من الطرف إلى نهاية الطرف
       follow: تعديل علاقات الحساب
       push: تلقي إشعاراتك
       read: قراءة كافة بيانات حسابك
@@ -143,6 +173,7 @@ ar:
       write:accounts: تعديل صفحتك التعريفية
       write:blocks: حجب الحسابات و النطاقات
       write:bookmarks: الإحتفاظ بالمنشورات في الفواصل المرجعية
+      write:conversations: كتم وحذف المحادثات
       write:favourites: الإعجاب بمنشورات
       write:filters: إنشاء عوامل تصفية
       write:follows: متابَعة الأشخاص
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
index b9ab81618..445d1093c 100644
--- a/config/locales/doorkeeper.ast.yml
+++ b/config/locales/doorkeeper.ast.yml
@@ -4,32 +4,22 @@ ast:
     attributes:
       doorkeeper/application:
         name: Nome de l'aplicación
-        redirect_uri: URI de redireición
         scopes: Ámbitos
         website: Sitiu web de l'aplicación
-    errors:
-      models:
-        doorkeeper/application:
-          attributes:
-            redirect_uri:
-              invalid_uri: ha ser una URI válida.
-              relative_uri: ha ser una URI absoluta.
   doorkeeper:
     applications:
       buttons:
+        authorize: Autorizar
         cancel: Encaboxar
         destroy: Destruyir
         edit: Editar
         submit: Unviar
-      confirmations:
-        destroy: "¿De xuru?"
       form:
-        error: "¡Meca! Comprueba los fallos posibles del formulariu"
+        error: "¡Meca! Revisa los errores posibles del formulariu"
       help:
-        native_redirect_uri: Usa %{native_redirect_uri} pa pruebes llocales
         redirect_uri: Usa una llinia per URI
       index:
-        empty: Nun tienes aplicaciones.
+        empty: Nun tienes nenguna aplicación.
         name: Nome
         new: Aplicación nueva
         scopes: Ámbitos
@@ -37,70 +27,82 @@ ast:
         title: Aplicación nueva
       show:
         actions: Aiciones
+        application_id: Clave del veceru
         scopes: Ámbitos
+        secret: Secretu del veceru
         title: 'Aplicación: %{name}'
     authorizations:
+      buttons:
+        authorize: Autorizar
+        deny: Negar
       error:
-        title: Asocedió un fallu
+        title: Prodúxose un error
       new:
-        able_to: Va ser a
-        prompt: L'aplicación %{client_name} solicitó l'accesu a la to cuenta
+        prompt_html: "%{client_name}, que ye una aplicación de terceros, quier tener accesu a la cuenta. <strong>Si nun t'enfotes nella, nun habríes autorizala.</strong>"
+        review_permissions: Revisión de los permisos
       show:
-        title: Copia esti códigu d'autorización y apiégalu na aplicación.
+        title: Copia esti códigu d'autorización ya apiégalu na aplicación.
     authorized_applications:
       buttons:
         revoke: Revocar
-      confirmations:
-        revoke: "¿De xuru?"
       index:
-        application: Aplicación
-        created_at: Data d'autorización
-        date_format: "%H:%M:%S %d-%m-%Y"
-        scopes: Ámbitos
-        title: Les aplicaciones qu'autoricesti
+        description_html: Estes son les aplicaciones que puen acceder a la cuenta cola API. Si equí hai aplicaciones que nun conoces o hai dalguna aplicación que nun funciona correutamente, pues revocar el so accesu.
+        never_used: Enxamás s'usó
+        scopes: Permisos
     errors:
       messages:
-        access_denied: El dueñu del recursu o'l sirvidor d'autorización ñegó la solicitú.
+        access_denied: El propietariu del recursu o'l sirvidor d'autorización negó la solicitú.
         invalid_token:
-          expired: Caducó'l pase d'accesu
           revoked: Revocóse'l pase d'accesu
           unknown: El pase d'accesu nun ye válidu
-        server_error: El sirvidor d'autorizaciones alcontró una condición inesperada qu'evitó que cumpliera la solicitú.
-        temporarily_unavailable: Anguaño'l sirvidor d'autorizaciones nun ye a remanar la solicitú pola mor d'una sobrecarga temporal o caltenimientu del sirvidor.
-        unauthorized_client: El veceru nun ta autorizáu pa facer esta solicitú usando esti métodu.
-        unsupported_response_type: El sirvidor d'autorización nun sofita esta triba de rempuesta.
+        server_error: El sirvidor d'autorización atopó una condición inesperada qu'evitó que cumpliera la solicitú.
+        unauthorized_client: El veceru nun ta autorizáu pa facer esta solicitú con esti métodu.
+        unsupported_response_type: El sirvidor d'autorización nun ye compatible con esti tipu de respuesta.
+    grouped_scopes:
+      access:
+        read: Accesu de namás llectura
+        read/write: Accesu de llectura ya escritura
+        write: Accesu de namás escritura
+      title:
+        accounts: Cuentes
+        admin/all: Toles funciones alministratives
+        conversations: Conversaciones
+        crypto: Cifráu de puntu a puntu
+        filters: Peñeres
+        follow: Rellaciones
+        notifications: Avisos
     layouts:
       admin:
         nav:
           applications: Aplicaciones
           oauth2_provider: Fornidor d'OAuth2
     scopes:
-      admin:read: lleer tolos datos del sirvidor
-      admin:read:accounts: lleer la información sensible de toles cuentes
-      admin:read:reports: lleer la información sensible de tolos informes y cuentes informaes
-      admin:write: modificar tolos datos del sirvidor
-      read: lleer tolos datos de la to cuenta
-      read:accounts: ver información de cuentes
-      read:blocks: ver quién bloquies
-      read:bookmarks: ver los tos marcadores
-      read:favourites: ver los tos favoritos
-      read:filters: ver les tos peñeres
-      read:follows: ver quién sigues
-      read:lists: ver les tos llistes
-      read:mutes: ver quién silencies
-      read:notifications: ver los tos avisos
-      read:reports: ver los tos informes
-      read:statuses: ver tolos estaos
-      write: modificar los datos de la to cuenta
-      write:accounts: modificar el to perfil
-      write:blocks: bloquiar cuentes y dominios
-      write:bookmarks: amestar estaos a Marcadores
-      write:favourites: marcar estaos como favoritos
-      write:filters: crear peñeres
-      write:follows: siguir a xente
-      write:lists: crear llistes
-      write:media: xubir ficheros multimedia
-      write:mutes: silenciar xente y conversaciones
-      write:notifications: llimpiar los tos avisos
-      write:reports: informar d'otres persones
-      write:statuses: espublizar estaos
+      admin:read: llee tolos datos del sirvidor
+      admin:read:accounts: llee la información sensible de toles cuentes
+      admin:write: modifica tolos datos del sirvidor
+      crypto: usa'l cifráu de puntu a puntu
+      follow: modifica les rellaciones de les cuentes
+      push: receición d'avisos push
+      read: llee tolos datos de les cuentes
+      read:accounts: mira la información de les cuentes
+      read:blocks: mira les cuentes bloquiaes
+      read:bookmarks: mira los marcadores
+      read:filters: mira les peñeres
+      read:follows: mira quién sigues
+      read:lists: mira les llistes
+      read:notifications: mira los avisos
+      read:reports: mira los informes
+      read:search: busca nel to nome
+      read:statuses: mira tolos artículos
+      write: modifica los datos de les cuentes
+      write:accounts: modifica los perfiles
+      write:blocks: bloquia cuentes ya dominios
+      write:favourites: artículos favoritos
+      write:filters: crea peñeres
+      write:follows: sigue a perfiles
+      write:lists: crea llistes
+      write:media: xube ficheros multimedia
+      write:mutes: desactiva los avisos de perfiles ya de conversaciones
+      write:notifications: borra los avisos
+      write:reports: informa d'otres perfiles
+      write:statuses: espubliza artículos
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
new file mode 100644
index 000000000..921181842
--- /dev/null
+++ b/config/locales/doorkeeper.be.yml
@@ -0,0 +1,193 @@
+---
+be:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Назва праграмы
+        redirect_uri: URI перанакіравання
+        scopes: Дазволы
+        website: Вэб-сайт праграмы
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: не можа ўтрымліваць фрагмент
+              invalid_uri: павінен быць сапраўдным URI
+              relative_uri: павінен быць абсалютным URI.
+              secured_uri: павінен быць HTTPS/SSL URI.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Аўтарызавацца
+        cancel: Скасаваць
+        destroy: Знішчыць
+        edit: Рэдагаваць
+        submit: Адправіць
+      confirmations:
+        destroy: Вы ўпэўнены?
+      edit:
+        title: Рэдагаваць праграму
+      form:
+        error: Вой! Праверце вашу форму на магчымыя памылкі
+      help:
+        native_redirect_uri: Для лакальных тэстаў выкарыстоўвайце %{native_redirect_uri}
+        redirect_uri: Выкарыстоўвайце адзін радок для кожнай спасылкі
+        scopes: Падзяліце вобласці абмежаванняў прабеламі. Пакіньце поле пустым, каб выкарыстоўваць дыяпазоны па змаўчанні.
+      index:
+        application: Праграма
+        callback_url: URL зваротнага выкліку
+        delete: Выдаліць
+        empty: У вас няма праграм.
+        name: Назва
+        new: Новая праграма
+        scopes: Дазволы
+        show: Паказаць
+        title: Вашы праграмы
+      new:
+        title: Новая праграма
+      show:
+        actions: Дзеянні
+        application_id: Ключ кліента
+        callback_urls: URL зваротных выклікаў
+        scopes: Дазволы
+        secret: Кліенцкая таямніца
+        title: 'Праграма: %{name}'
+    authorizations:
+      buttons:
+        authorize: Аўтарызавацца
+        deny: Адмовіць
+      error:
+        title: Узнікла памылка
+      new:
+        prompt_html: "%{client_name} хацеў бы атрымаць дазвол для доступу да вашага акаунта. Гэта вонкавае прыкладанне. <strong> Не давайце дазволу на гэта, калі вы не давяраеце гэтаму прыкладанню. </strong>"
+        review_permissions: Прагледзець дазволы
+        title: Патрабуецца аўтарызацыя
+      show:
+        title: Скапіруйце гэты код аўтарызацыі і ўстаўце яго ў праграму.
+    authorized_applications:
+      buttons:
+        revoke: Адклікаць
+      confirmations:
+        revoke: Вы ўпэўнены?
+      index:
+        authorized_at: Аўтарызавана %{date}
+        description_html: Гэта прыкладанні якія могуць мець доступ да вашага акаунта з дапамогай API. Калі вы бачыце тут прыкладанні, якія вы не пазнаеце, або прыкладанне блага сябе паводзіць вы можаце прыбраць ягонны доступ.
+        last_used_at: Апошні раз скарыстана %{date}
+        never_used: Не выкарыстоўвалася
+        scopes: Дазволы
+        superapp: Унутраны
+        title: Вашы аўтарызаваныя праграмы
+    errors:
+      messages:
+        access_denied: Уласнік рэсурсу або сервер аўтарызацыі адхіліў ваш запыт.
+        credential_flow_not_configured: Resource Owner Password Credentials flow не прайшоў з-за таго, што ўласцівасць Doorkeeper.configure.resource_owner_from_credentials была не вызначана.
+        invalid_client: Збой аўтэнтыфікацыі кліента з-за невядомага кліента, адсутнасці аўтэнтыфікацыі кліента або метаду аўтэнтыфікацыі, які не падтрымліваецца.
+        invalid_grant: Прадастаўлены дазвол на аўтарызацыю несапраўдны, пратэрмінованы, быў адкліканы, не адпавядае URI перанакіравання, які выкарыстоўваецца ў запыце аўтарызацыі або быў выдадзены іншаму кліенту.
+        invalid_redirect_uri: Прадстаўлены URI перанакіравання не сапраўдны.
+        invalid_request:
+          missing_param: 'Адсутнічае абавязковы параметр: %{value}.'
+          request_not_authorized: Запыт павінен быць аўтарызаваны. Абавязковы параметр для запыту аўтарызацыі адсутнічае або несапраўдны.
+          unknown: У запыце адсутнічае абавязковы параметр, уключае значэнне параметра, якое не падтрымліваецца, альбо ён сфарміраваны іншым няправільным чынам.
+        invalid_resource_owner: Прадастаўленыя ўліковыя дадзеныя ўладальніка рэсурсу несапраўдныя або немагчыма знайсці ўладальніка рэсурсу
+        invalid_scope: Запытаная обласць абмежаванняў несапраўдная, невядомая альбо няправільная.
+        invalid_token:
+          expired: Тэрмін дзеяння токена доступу скончыўся
+          revoked: Токен доступу быў адкліканы
+          unknown: Токен доступу з'яўляецца несапраўдным
+        resource_owner_authenticator_not_configured: Пошук уладальніка рэсурсу не прайшоў з-за таго, што ўласцівасць Doorkeeper.configure.resource_owner_authenticator была не вызначына.
+        server_error: Сервер аўтарызацыі сутыкнуўся з непрадбачанай умоваю, якая не дазваляе выканаць запыт.
+        temporarily_unavailable: Сервер аўтарызацыі зараз не можа апрацаваць запыт з-за часовага перагрузу або прафілактычных работ на серверы.
+        unauthorized_client: Кліент не аўтарызаваны, каб выканаць такі запыт выкарыстоўваючы гэты метад.
+        unsupported_grant_type: Тып аўтарызацыі не падтрымліваецца серверам аўтарызацыі.
+        unsupported_response_type: Сервер аўтарызацыі не падтрымлівае такі тып адказу.
+    flash:
+      applications:
+        create:
+          notice: Праграма створана.
+        destroy:
+          notice: Праграма выдалена.
+        update:
+          notice: Праграма абноўлена.
+      authorized_applications:
+        destroy:
+          notice: Праграма адклікана.
+    grouped_scopes:
+      access:
+        read: Доступ толькі для чытання
+        read/write: Доступ для чытання і запісу
+        write: Доступ толькі для запісу
+      title:
+        accounts: Уліковыя запісы
+        admin/accounts: Кіраванне ўліковымі запісамі
+        admin/all: Усе адміністратыўныя функцыі
+        admin/reports: Кіраванне справаздачамі
+        all: Усе
+        blocks: Блакіроўкі
+        bookmarks: Закладкі
+        conversations: Размовы
+        crypto: Скразное шыфраванне
+        favourites: Упадабаныя
+        filters: Фільтры
+        follow: Зносіны
+        follows: Падпіскі
+        lists: Спісы
+        media: Мультымедыйныя ўкладанні
+        mutes: Ігнараваныя
+        notifications: Апавяшчэнні
+        push: Push-апавяшчэнні
+        reports: Скаргі
+        search: Пошук
+        statuses: Допісы
+    layouts:
+      admin:
+        nav:
+          applications: Праграмы
+          oauth2_provider: OAuth2 правайдар
+      application:
+        title: Неабходна OAuth аўтарызацыя
+    scopes:
+      admin:read: чытаць усе даныя на серверы
+      admin:read:accounts: бачыць канфідэнцыйную інфармацыю ўсіх акаўнтаў
+      admin:read:domain_allows: бачыць канфідэнцыяльную інфармацыю ўсіх дазволеных даменаў
+      admin:read:domain_blocks: бачыць канфідэнцыяльную інфармацыю ўсіх блакіраваных даменаў
+      admin:read:email_domain_blocks: бачыць канфідэнцыяльную інфармацыю ўсіх блакіраваных даменаў эл. пошты
+      admin:read:ip_blocks: бачыць канфідэнцыяльную інфармацыю ўсіх блакіраваных IP
+      admin:read:reports: чытаць далікатную інфармацыю са скарг і ўліковых запісаў, на якія пададзена скарга
+      admin:write: змяняць усе даныя на серверы
+      admin:write:accounts: мадэраваць уліковыя запісы
+      admin:write:domain_allows: мадэраваць дазволеныя дамены
+      admin:write:domain_blocks: мадэраваць блакіраваныя дамены
+      admin:write:email_domain_blocks: мадэраваць блакіраваныя дамены эл. пошты
+      admin:write:ip_blocks: мадэраваць блакіраваныя IP
+      admin:write:reports: мадэраваць скаргі
+      crypto: выкарыстоўваць скразное шыфраванне
+      follow: змяняць зносіны ўліковага запісу
+      push: атрымліваць push-апавяшчэнні
+      read: чытаць усе даныя вашага ўліковага запісу
+      read:accounts: бачыць інфармацыю аб уліковых запісах
+      read:blocks: бачыць вашы блакіроўкі
+      read:bookmarks: бачыць вашы закладкі
+      read:favourites: бачыць ваш спіс упадабанага
+      read:filters: бачыць вашы фільтры
+      read:follows: бачыць вашы падпіскі
+      read:lists: бачыць вашы спісы
+      read:mutes: бачыць ваш спіс ігнараваных
+      read:notifications: бачыць вашы апавяшчэнні
+      read:reports: бачыць вашы скаргі
+      read:search: шукаць ад вашага імя
+      read:statuses: бачыць усе допісы
+      write: змяняць усе даныя вашага ўліковага запісу
+      write:accounts: змяняць ваш профіль
+      write:blocks: блакіраваць уліковыя запісы і дамены
+      write:bookmarks: дадаваць допісы ў закладкі
+      write:conversations: ігнараваць і выдаляць размовы
+      write:favourites: дадаваць допісы ва ўпадабанае
+      write:filters: ствараць фільтры
+      write:follows: падпісвацца на людзей
+      write:lists: ствараць спiсы
+      write:media: запампоўваць медыяфайлы
+      write:mutes: ігнараваць людзей і размовы
+      write:notifications: выдаляць апавяшчэнні
+      write:reports: скардзіцца на іншых людзей
+      write:statuses: публікаваць допісы
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 083d19bb2..ba19ea313 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -3,10 +3,10 @@ bg:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Име
-        redirect_uri: URI за пренасочване
+        name: Име на приложението
+        redirect_uri: Пренасочващ URI
         scopes: Обхват
-        website: Уебсайт на приложение
+        website: Уебсайт на приложението
     errors:
       models:
         doorkeeper/application:
@@ -22,18 +22,18 @@ bg:
         authorize: Упълномощаване
         cancel: Отказ
         destroy: Унищожаване
-        edit: Редакция
-        submit: Изпращане
+        edit: Редактиране
+        submit: Подаване
       confirmations:
-        destroy: Потвърждаваш ли изтриването?
+        destroy: Сигурни ли сте?
       edit:
         title: Редактиране на приложението
       form:
-        error: О, не! Провери формата за възможни грешки
+        error: Опа! Проверете формуляра си за възможни грешки
       help:
-        native_redirect_uri: Изполвай %{native_redirect_uri} за локални тестове
-        redirect_uri: Използвай един ред за всяко URI
-        scopes: Разделяй диапазоните с интервал. Остави празно, за да използваш диапазона по подразбиране.
+        native_redirect_uri: Изполвайте %{native_redirect_uri} за локални тестове
+        redirect_uri: Използвайте един ред за всяко URI
+        scopes: Разделяйте обхватите с интервал. Оставете празно, за да употребявате стандартните обхвати.
       index:
         application: Приложение
         callback_url: URL за обратно повикване
@@ -43,15 +43,15 @@ bg:
         new: Ново приложение
         scopes: Обхват
         show: Показване
-        title: Твоите приложения
+        title: Вашите приложения
       new:
         title: Ново приложение
       show:
         actions: Действия
-        application_id: Идентификатор на приложението
+        application_id: Ключ на клиента
         callback_urls: URL-и за обратно повикване
-        scopes: Диапазони
-        secret: Тайна
+        scopes: Обхвати
+        secret: Тайна на клиента
         title: 'Приложение: %{name}'
     authorizations:
       buttons:
@@ -60,8 +60,8 @@ bg:
       error:
         title: Възникна грешка
       new:
-        able_to: Ще е възможно
-        prompt: Приложението %{client_name} заявява достъп до твоя акаунт
+        prompt_html: "%{client_name} иска разрешение да има достъп до акаунта ви. Приложение от трета страна е.<strong>Ако не му се доверявате, то може да не го упълномощявате.</strong>"
+        review_permissions: Преглед на разрешенията
         title: Изисква се упълномощаване
       show:
         title: Копирайте този код за удостоверяване и го поставете в приложението.
@@ -69,20 +69,22 @@ bg:
       buttons:
         revoke: Отмяна
       confirmations:
-        revoke: Потвърждаваш ли отмяната?
+        revoke: Сигурни ли сте?
       index:
-        application: Приложение
-        created_at: Създадено на
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Диапазони
-        title: Твоите упълномощени приложения
+        authorized_at: Упълномощено на %{date}
+        description_html: Има приложения, можещи да имат достъп до акаунта ви, използвайки API. Ако тук има приложения, които не знаете, или работещи неправилно, то може да им откажете достъпа.
+        last_used_at: Последно обновено на %{date}
+        never_used: Нивга ползвано
+        scopes: Разрешения
+        superapp: Вътрешно
+        title: Упълномощените ви приложения
     errors:
       messages:
         access_denied: Заявката беше отказана от собственика на ресурса или от сървъра за упълномощаване.
         credential_flow_not_configured: Resource Owner Password Credentials предизвика грешка, заради това, че настройките за Doorkeeper.configure.resource_owner_from_credentials липсват.
         invalid_client: Удостоверяването на клиента предизвика грешка, поради непознат клиент, липсващо клиентско удостоверяване, или заради това, че методът на удостоверяване не се поддържа.
         invalid_grant: Предоставеното удостоверение за достъп е невалидно, изтекло, отхвърлено, не съвпада с пренасочващото URI, използвано в заявката за удостоверение, или е бил издадено от друг клиент.
-        invalid_redirect_uri: Наличното пренасочващо URI е невалидно.
+        invalid_redirect_uri: Включеният пренасочващ URI адрес е невалиден.
         invalid_request:
           missing_param: 'Липсва задължителен параметър: %{value}.'
           request_not_authorized: Заявката трябва да бъде упълномощена. Необходимият параметър за разрешаване на заявка липсва или е невалиден.
@@ -93,12 +95,12 @@ bg:
           expired: Маркерът за достъп изтече
           revoked: Маркерът за достъп беше отхвърлен
           unknown: Маркерът за достъп е невалиден
-        resource_owner_authenticator_not_configured: Намирането на Resource Owner се провали поради липса на конфигурация на Doorkeeper.configure.resource_owner_authenticator.
+        resource_owner_authenticator_not_configured: Намирането на собственика на ресурса се провали поради липса на конфигуриране на Doorkeeper.configure.resource_owner_authenticator.
         server_error: Сървърът за удостоверяване попадна на неочаквано условие, което предотврати изпълнението на заявката.
         temporarily_unavailable: Сървърът за удостоверяване не може да се справи със заявката в момента поради временно претоварване или профилактика на сървъра.
-        unauthorized_client: Клиентът не е удостоверен да изпълни заявката по този начин.
-        unsupported_grant_type: Типът на удостоврението за достъп не се поддържа от сървъра за удостоверяване.
-        unsupported_response_type: Удостоверяващият сървър не поддържа този тип отговор.
+        unauthorized_client: Клиентът не е упълномощен да изпълни заявката по този начин.
+        unsupported_grant_type: Типът за даване на пълномощно не се поддържа от сървъра за упълномощаване.
+        unsupported_response_type: Упълномощаващият сървър не поддържа този тип отговор.
     flash:
       applications:
         create:
@@ -110,6 +112,33 @@ bg:
       authorized_applications:
         destroy:
           notice: Приложението е отказано.
+    grouped_scopes:
+      access:
+        read: Достъп само за четене
+        read/write: Достъп за четене и запис
+        write: Достъп само за запис
+      title:
+        accounts: Акаунти
+        admin/accounts: Администриране на акаунтите
+        admin/all: Всички административни функции
+        admin/reports: Администриране на докладите
+        all: Всичко
+        blocks: Блокирания
+        bookmarks: Отметки
+        conversations: Разговори
+        crypto: Криптиране от край до край
+        favourites: Любими
+        filters: Филтри
+        follow: Отношения
+        follows: Последвания
+        lists: Списъци
+        media: Прикачена мултимедия
+        mutes: Заглушения
+        notifications: Известия
+        push: Изскачащи известия
+        reports: Доклади
+        search: Търсене
+        statuses: Публикации
     layouts:
       admin:
         nav:
@@ -120,13 +149,24 @@ bg:
     scopes:
       admin:read: прочит на всички данни на сървъра
       admin:read:accounts: прочит на деликатна информация от всички акаунти
+      admin:read:canonical_email_blocks: четене на деликатна информация на всички канонични блокирания на е-поща
+      admin:read:domain_allows: четене на деликатна информация на всички домейни позволено
+      admin:read:domain_blocks: четене на деликатна информация на всички домейни блокирано
+      admin:read:email_domain_blocks: четене на деликатна информация на всички домейни на е-поща блокирано
+      admin:read:ip_blocks: четене на деликатна информация на всички IP адреси блокирано
       admin:read:reports: прочит на деликатна информация от всички докладвания и докладвани акаунти
       admin:write: промяна на всички данни на сървъра
       admin:write:accounts: извършване на действия за модериране на акаунти
+      admin:write:canonical_email_blocks: извършване на модериращи действия в канонични блокирания на е-поща
+      admin:write:domain_allows: извършване на действия за модериране на акаунти в домейна позволено
+      admin:write:domain_blocks: извършване на действия за модериране на акаунти в домейна блокирано
+      admin:write:email_domain_blocks: извършване на действия за модериране на акаунти в домейна на е-поща блокирано
+      admin:write:ip_blocks: извършване на действия за модериране на IP адреси блокирано
       admin:write:reports: извършване на действия за модериране на докладвания
-      follow: следването, блокирането, деблокирането и отмяната на следването на акаунтите
+      crypto: употреба на цялостно шифроване
+      follow: промяна на взаимоотношенията с други акаунти
       push: получаване на вашите изскачащи известия
-      read: четенето на данните от твоя акаунт
+      read: четене на всички данни от акаунта ви
       read:accounts: преглед на информация за акаунти
       read:blocks: преглед на вашите блокирания
       read:bookmarks: преглед на вашите отметки
@@ -138,12 +178,13 @@ bg:
       read:notifications: преглед на вашите известия
       read:reports: преглед на вашите докладвания
       read:search: търсене от ваше име
-      read:statuses: преглед на всички състояния
-      write: публикуването от твое име
+      read:statuses: преглед на всички публикации
+      write: промяна на всички данни на акаунта ви
       write:accounts: промяна на вашия профил
       write:blocks: блокиране на акаунти и домейни
-      write:bookmarks: отмятане на състояния
-      write:favourites: любими състояния
+      write:bookmarks: отмятане на публикации
+      write:conversations: заглушаване и изтриване на разговорите
+      write:favourites: харесани публикации
       write:filters: създаване на филтри
       write:follows: последване на хора
       write:lists: създаване на списъци
@@ -151,4 +192,4 @@ bg:
       write:mutes: заглушаване на хора и разговори
       write:notifications: изчистване на вашите известия
       write:reports: докладване на други хора
-      write:statuses: публикуване на състояния
+      write:statuses: публикуване на публикации
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index a9b8d5b90..0a81e03bb 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -4,36 +4,87 @@ br:
     attributes:
       doorkeeper/application:
         name: Anv an arload
+        redirect_uri: Dazkas URI
+        scopes: Dougoù
         website: Lec'hienn an arload
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              invalid_uri: eo ret bezañ un URI reizh.
+              secured_uri: eo ret bezañ un HTTPS/SSL URI.
   doorkeeper:
     applications:
       buttons:
         authorize: Aotren
         cancel: Nullañ
         destroy: Distrujañ
-        edit: Aozañ
+        edit: Kemmañ
+        submit: Kas
       confirmations:
         destroy: Ha sur oc'h ?
+      edit:
+        title: Kemmañ an arload
+      form:
+        error: Hopala! Gwiriit ho frammenn rak fazioù a c'hell bezañ enni
+      help:
+        native_redirect_uri: Implijit %{native_redirect_uri} evit amprouadennoù lec'hel
+        redirect_uri: Implijit ul linenn evit pep URI
       index:
         application: Arload
+        callback_url: URL adc'halv
         delete: Dilemel
+        empty: Arloadoù ebet ganeoc'h.
         name: Anv
         new: Arload nevez
+        scopes: Dougoù
         show: Diskouez
         title: Hoc'h arloadoù
       new:
         title: Arload nevez
       show:
+        actions: Obererezhioù
+        application_id: Alc'hwez an arval
+        callback_urls: URLoù adc'halv
+        scopes: Dougoù
         title: 'Arload : %{name}'
     authorizations:
       buttons:
         authorize: Aotren
+        deny: Nac'hañ
+      error:
+        title: Ur fazi a zo degouezhet
+      new:
+        title: Aotre rekis
+      show:
+        title: Eilennit kod aotre-se ha pegit en arload.
     authorized_applications:
+      buttons:
+        revoke: Skarzhañ
       confirmations:
         revoke: Ha sur oc'h ?
       index:
-        application: Arload
-        date_format: "%d-%m-%Y %H:%M:%S"
+        title: Hoc'h arloadoù aotreet
+    errors:
+      messages:
+        access_denied: Perc'henn an danvez pe ar servijer aotre nac'het ar reket.
+        invalid_grant: An aotre pourvezhet a zo direizh, aet da dermen, skarzhet, roet d'un arval all pe ne glot ket gant an URI dazkas implijet.
+        invalid_redirect_uri: An URI dazkas n'eo ket reizh.
+        invalid_request:
+          missing_param: 'Un arventenn a vank: %{value}.'
+          request_not_authorized: Ret eo d'ar reket bezañ aotreet. Arventenn rekis evit aotren ar reket a zo direizh pe diank.
+          unknown: Ar reket a vank un arventenn rekis, a enlaak un dalvoud arventenn dianavezet, pe a zo faziek en ur mod all.
+        invalid_resource_owner: Testenioù perc'henn an danvez pourvezet n'int ket reizh, pe perc'henn an danvez ne c'hell ket bezañ kavet
+        invalid_token:
+          expired: Ar jedouer moned a zo aet da dermen
+          revoked: Ar jedouer moned a zo skarzhet
+          unknown: Ar jedouer moned a zo direizh
+        server_error: Ur fazi digortozet a c'hoarveze hag a vire ar servijer aotre ouzh klokaat ar reket.
+        temporarily_unavailable: Ar servijer aotre ne c'hall ket seveniñ ar reket abalamour d'ur soulgarg pe d'ur gempenn.
+        unauthorized_client: An arval n'eo ket aotreet seveniñ ar reket-mañ er mod-se.
+        unsupported_grant_type: Diembreg eo seurt aotre gant ar servijer aotre.
+        unsupported_response_type: Diembreg eo seurt respontoù gant ar servijer aotre.
     flash:
       applications:
         create:
@@ -42,11 +93,56 @@ br:
           notice: Dilamet eo bet an arload.
         update:
           notice: Hizivaet eo bet an arload.
+      authorized_applications:
+        destroy:
+          notice: Skarzhet eo bet an arload.
+    grouped_scopes:
+      title:
+        blocks: Re stanket
+        bookmarks: Sinedoù
+        filters: Siloù
+        lists: Listennoù
+        mutes: Kuzhet
+        search: Klask
+        statuses: Toudoù
     layouts:
       admin:
         nav:
           applications: Arloadoù
+          oauth2_provider: OAuth2 Pourvezer
+      application:
+        title: OAuth aotre rekis
     scopes:
+      admin:read: lenn holl titouroù ar servijer
+      admin:read:accounts: lenn titouroù kizidik an holl kontoù
+      admin:read:reports: lenn titouroù kizidik an holl danevelloù hag an holl kontoù danevellet
+      admin:write: kemmañ holl titouroù ar servijer
+      admin:write:accounts: ober evezherezh war ar c'hontoù
+      admin:write:reports: ober evezherezh war an danevelloù
+      follow: kemmañ darempredoù ho kont
+      push: resev ho kemennoù push
+      read: lenn holl titouroù ho kont
+      read:accounts: gwelout titouroù ar c'hontoù
+      read:blocks: gwelout ar pezh a zo stanket ganeoc'h
+      read:bookmarks: gwelout ho sinedoù
+      read:favourites: gwelout ho muiañ-karet
+      read:filters: gwelout ho siloù
+      read:follows: gwelout ar pezh a zo heuliet ganeoc'h
       read:lists: gwelout ho listennoù
+      read:mutes: gwelout traoù pe kontoù kuzhet ganeoc'h
+      read:notifications: gwellout ho kemennoù
+      read:reports: gwelout ho tanevelloù
+      read:statuses: gwelout an holl toudoù
+      write: kemmañ holl titouroù ho kont
+      write:accounts: kemmañ ho profil
+      write:blocks: berzañ kontoù ha domanioù
+      write:bookmarks: toudoù enrollet evel sinedoù
+      write:favourites: merkañ toudoù evel muiañ-karet
+      write:filters: krouiñ siloù
+      write:follows: heuliañ an dud
       write:lists: krouiñ listennoù
+      write:media: pellgargañ restroù media
+      write:mutes: kuzhat tud ha kaozeadennoù
+      write:notifications: skarzhañ ho kemennoù
+      write:reports: danevellañ tud all
       write:statuses: embann toudoù
diff --git a/config/locales/doorkeeper.bs.yml b/config/locales/doorkeeper.bs.yml
new file mode 100644
index 000000000..e9e174462
--- /dev/null
+++ b/config/locales/doorkeeper.bs.yml
@@ -0,0 +1 @@
+bs:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index d85738ec2..1838db222 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -4,7 +4,7 @@ ca:
     attributes:
       doorkeeper/application:
         name: Nom de l'aplicació
-        redirect_uri: URI per a redirecció
+        redirect_uri: Redirigeix la URI
         scopes: Àmbits
         website: Lloc web de l'aplicació
     errors:
@@ -13,9 +13,9 @@ ca:
           attributes:
             redirect_uri:
               fragment_present: no pot contenir un fragment.
-              invalid_uri: ha de ser un URI válid.
-              relative_uri: ha de ser un URI absoluta.
-              secured_uri: ha de ser un URI HTTPS/SSL.
+              invalid_uri: ha de ser una URI vàlida.
+              relative_uri: ha de ser una URI absoluta.
+              secured_uri: ha de ser una URI HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
@@ -25,64 +25,66 @@ ca:
         edit: Edita
         submit: Envia
       confirmations:
-        destroy: Estàs segur?
+        destroy: Segur?
       edit:
         title: Edita l'aplicació
       form:
         error: Ep! Comprova el formulari per a possibles errors
       help:
-        native_redirect_uri: Utilitza %{native_redirect_uri} per a proves locals
-        redirect_uri: Utilitza una línia per URI
-        scopes: Separa els àmbits amb espais. Deixa-ho en blanc per a utilitzar els àmbits per defecte.
+        native_redirect_uri: Fes servir %{native_redirect_uri} per a proves locals
+        redirect_uri: Usa una línia per URI
+        scopes: Separa els àmbits amb espais. En blanc per als àmbits per defecte.
       index:
         application: Aplicació
         callback_url: URL de retorn
-        delete: Suprimeix
+        delete: Elimina
         empty: No tens cap aplicació.
         name: Nom
-        new: Aplicació nova
+        new: Nova aplicació
         scopes: Àmbits
         show: Mostra
         title: Les teves aplicacions
       new:
-        title: Aplicació nova
+        title: Nova aplicació
       show:
         actions: Accions
-        application_id: Id de l'aplicació
-        callback_urls: Callback URL
+        application_id: Clau de client
+        callback_urls: URL de retorn
         scopes: Àmbits
-        secret: Secret
+        secret: Clau secreta de client
         title: 'Aplicació: %{name}'
     authorizations:
       buttons:
         authorize: Autoritza
-        deny: Desautoritza
+        deny: Denega
       error:
-        title: S'a produit un error
+        title: S'ha produït un error
       new:
-        able_to: Serà capaç de
-        prompt: L'aplicació %{client_name} sol⋅licita tenir accés al teu compte
+        prompt_html: "%{client_name} vol permís per accedir el teu compte. És una aplicació de tercers. <strong>Si no hi confies, no hauries d'autoritzar-la.</strong>"
+        review_permissions: Revisa els permisos
         title: Cal autorizació
       show:
-        title: Copia aquest codi d'autorització i enganxa'l en l'aplicació.
+        title: Copia aquest codi d'autorització i enganxa'l a l'aplicació.
     authorized_applications:
       buttons:
         revoke: Revoca
       confirmations:
-        revoke: N'estàs segur?
+        revoke: Segur?
       index:
-        application: Aplicació
-        created_at: Creat el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Àmbits
-        title: Les aplicacions autoritzades
+        authorized_at: Autoritzada el %{date}
+        description_html: Aquestes són les aplicacions que poden accedir al teu compte usant l'API. Si hi ha aplicacions que no reconeixes o hi ha una aplicació que no funciona bé, pots revocar-ne l'accés.
+        last_used_at: Usada per última vegada el %{date}
+        never_used: No s'ha usat mai
+        scopes: Permisos
+        superapp: Interna
+        title: Les teves aplicacions autoritzades
     errors:
       messages:
         access_denied: El propietari del recurs o servidor d'autorizació ha denegat la petició.
         credential_flow_not_configured: Les credencials de contrasenya del propietari del recurs han fallat degut a que Doorkeeper.configure.resource_owner_from_credentials està sense configurar.
-        invalid_client: La autentificació del client ha fallat perquè és un client desconegut o no està inclòs l'autentificació del client o el mètode d'autenticació no està confirmat.
-        invalid_grant: La concessió d'autorizació oferida és invàlida, ha vençut, s'ha revocat, no coincideix amb l'URI de redirecció utilizada en la petició d'autorizació, o fou emesa per a un altre client.
-        invalid_redirect_uri: L'URI de redirecció inclòs no és vàlid.
+        invalid_client: La autentificació del client ha fallat perquè és un client desconegut o no està inclòsa l'autentificació del client o el mètode d'autenticació no està confirmat.
+        invalid_grant: La concessió d'autorizació oferta és invàlida, ha vençut, s'ha revocat, no coincideix amb l'URI de redirecció utilizada en la petició d'autorizació, o fou emesa per a un altre client.
+        invalid_redirect_uri: L'uri de redirecció inclòsa no és vàlida.
         invalid_request:
           missing_param: 'Falta paràmetre requerit: %{value}.'
           request_not_authorized: La petició ha de ser autoritzada. Falta o és invàlid un paràmetre requerit per l'autorització de la petició.
@@ -110,45 +112,84 @@ ca:
       authorized_applications:
         destroy:
           notice: Aplicació revocada.
+    grouped_scopes:
+      access:
+        read: Accés només de lectura
+        read/write: Accés de lectura i escriptura
+        write: Accés de només escriptura
+      title:
+        accounts: Comptes
+        admin/accounts: Administració dels comptes
+        admin/all: Totes les funcions administratives
+        admin/reports: Administració dels informes
+        all: Tot
+        blocks: Bloquejos
+        bookmarks: Marcadors
+        conversations: Converses
+        crypto: Xifrat d'extrem a extrem
+        favourites: Preferits
+        filters: Filtres
+        follow: Relacions
+        follows: Seguits
+        lists: Llistes
+        media: Adjunts multimèdia
+        mutes: Silenciats
+        notifications: Notificacions
+        push: Notificacions push
+        reports: Informes
+        search: Cerca
+        statuses: Publicacions
     layouts:
       admin:
         nav:
           applications: Aplicacions
           oauth2_provider: Proveïdor OAuth2
       application:
-        title: OAuth autorització requerida
+        title: Cal una autorització OAuth
     scopes:
-      admin:read: llegir totes les dades en el servidor
-      admin:read:accounts: llegir l'informació sensible de tots els comptes
-      admin:read:reports: llegir l'informació sensible de tots els informes i comptes reportats
+      admin:read: llegeix totes les dades en el servidor
+      admin:read:accounts: llegir informació confidencial de tots els comptes
+      admin:read:canonical_email_blocks: llegeix informació sensible de tots els blocs canònics de correu-e
+      admin:read:domain_allows: llegeix informació sensible de tots els dominis permesos
+      admin:read:domain_blocks: llegeix informació sensible de tots els blocs de domini
+      admin:read:email_domain_blocks: llegeix informació sensible de tots els blocs de domini de correu-e
+      admin:read:ip_blocks: llegeix informació sensible de tots els blocs d'IP
+      admin:read:reports: llegir informació confidencial de tots els informes i comptes reportats
       admin:write: modificar totes les dades en el servidor
       admin:write:accounts: fer l'acció de moderació en els comptes
+      admin:write:canonical_email_blocks: executa accions de moderació en blocs canònics de correu-e
+      admin:write:domain_allows: executa accions de moderació en permisos de domini
+      admin:write:domain_blocks: executa accions de moderació en blocs de domini
+      admin:write:email_domain_blocks: executa accions de moderació en blocs de domini de correu-e
+      admin:write:ip_blocks: executa accions de moderació en blocs d'IP
       admin:write:reports: fer l'acció de moderació en els informes
-      follow: seguir, blocar, desblocar i deixar de seguir comptes
+      crypto: usa xifrat d'extrem a extrem
+      follow: modificar relacions dels comptes
       push: rebre notificacions push del teu compte
       read: llegir les dades del teu compte
-      read:accounts: veure informació dels comptes
-      read:blocks: veure els teus bloqueigs
-      read:bookmarks: veure els teus marcadors
-      read:favourites: veure els teus favorits
-      read:filters: veure els teus filtres
-      read:follows: veure els teus seguiments
-      read:lists: veure les teves llistes
-      read:mutes: veure els teus silenciats
-      read:notifications: veure les teves notificacions
-      read:reports: veure els teus informes
+      read:accounts: mira informació dels comptes
+      read:blocks: mira els teus bloqueigs
+      read:bookmarks: mira els teus marcadors
+      read:favourites: mira els teus preferits
+      read:filters: mira els teus filtres
+      read:follows: mira els teus seguiments
+      read:lists: mira les teves llistes
+      read:mutes: mira els teus silenciats
+      read:notifications: mira les teves notificacions
+      read:reports: mira els teus informes
       read:search: cerca en nom teu
-      read:statuses: veure tots els tuts
-      write: publicar en el teu nom
+      read:statuses: mira tots les publicacions
+      write: modifica totes les dades del teu compte
       write:accounts: modifica el teu perfil
-      write:blocks: bloqueja comptes i dominis
-      write:bookmarks: publicacions a marcadors
-      write:favourites: afavoreix tuts
-      write:filters: crear filtres
-      write:follows: seguir usuaris
-      write:lists: crear llistes
-      write:media: pujar fitxers multimèdia
+      write:blocks: bloca comptes i dominis
+      write:bookmarks: marca publicacions
+      write:conversations: silencia i esborra converses
+      write:favourites: afavoreix publicacions
+      write:filters: crea filtres
+      write:follows: segueix gent
+      write:lists: crea llistes
+      write:media: puja fitxers multimèdia
       write:mutes: silencia usuaris i converses
       write:notifications: esborra les teves notificacions
-      write:reports: informe d’altres persones
-      write:statuses: publicar tuts
+      write:reports: informa sobre altres persones
+      write:statuses: fes publicacions
diff --git a/config/locales/doorkeeper.ckb.yml b/config/locales/doorkeeper.ckb.yml
new file mode 100644
index 000000000..3262cc17f
--- /dev/null
+++ b/config/locales/doorkeeper.ckb.yml
@@ -0,0 +1,185 @@
+---
+ckb:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: ناوی بەرنامە
+        redirect_uri: URI گۆڕانی شوێن
+        scopes: بوارەکان
+        website: نەرمەکالای ماڵپەڕ
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ناتوانێت پارچەیەک لەخۆوە بگری.
+              invalid_uri: پێویستە URI دروست بێت.
+              relative_uri: پێویستە URI ی ڕەها بێت.
+              secured_uri: پێویستە HTTPS/SSL URI بێت.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: ڕێگەپێدان
+        cancel: هەڵوەشاندنەوه
+        destroy: لەناوبردن
+        edit: دەستکاری
+        submit: ناردن
+      confirmations:
+        destroy: دڵنیای?
+      edit:
+        title: دەستکاری کردنی بەرنامە
+      form:
+        error: تەحح! بزانە شتێکت لە نێو فۆرمەکە بە هەڵە نەنووسیوە
+      help:
+        native_redirect_uri: بۆ تاقیکردنەوەی ناوخۆیی %{native_redirect_uri} بەکاربەرە،
+        redirect_uri: بەکارهێنانی یەک هێڵ بۆ هەر URI
+        scopes: دۆمەینەکان جیاببکەن بە بۆشاییەکان. بۆ بەکارهێنانی دۆمەینی گریمانەیی چۆڵی بەجێبهێڵە.
+      index:
+        application: نەرمەکال
+        callback_url: Callback نیشانی
+        delete: سڕینەوە
+        empty: هیچ بەرنامەیەکت نیە.
+        name: ناو
+        new: بەرنامەی نوێ
+        scopes: دۆمەینەکان
+        show: نیشاندان
+        title: بەرنامەی تۆ
+      new:
+        title: بەرنامەی نوێ
+      show:
+        actions: کارەکان
+        application_id: کلیلی ڕاژەخواز
+        callback_urls: Callback نیشانەکانی
+        scopes: دۆمەینەکان
+        secret: نهێنی ڕاژەخواز
+        title: 'بەرنامە: %{name}'
+    authorizations:
+      buttons:
+        authorize: ڕێپێدراو
+        deny: نکۆڵی لێبکە
+      error:
+        title: هەڵەیەک ڕوویدا
+      new:
+        prompt_html: "%{client_name} حەز دەکات مۆڵەت بدرێت بۆ چوونە ناو ئەکاونتەکەت. ئەپڵیکەیشنێکی لایەنی سێیەمە. <strong>ئەگەر متمانەت پێی نییە، ئەوا نابێت ڕێگەی پێبدەیت.</strong>"
+        review_permissions: پێداچوونەوە بە مۆڵەتەکاندا بکە
+        title: ڕێپێدان پێویستە
+      show:
+        title: کۆپیکردنی کۆدی ئەم رێپێدانە و لکاندنی بە بەرنامەکە.
+    authorized_applications:
+      buttons:
+        revoke: بەتاڵی بکە
+      confirmations:
+        revoke: ئایا دڵنیایت?
+      index:
+        authorized_at: ڕێگەپێدراوە لە %{date}
+        description_html: ئەمانە ئەو بەرنامانەن کە دەتوانن بە بەکارهێنانی API بچنە ناو ئەکاونتەکەتەوە. ئەگەر بەرنامەیەک هەبێت کە لێرەدا نایناسیتەوە، یان بەرنامەیەک هەڵسوکەوتی خراپ دەکات، دەتوانیت دەستڕاگەیشتنەکەی هەڵبوەشێنیتەوە.
+        last_used_at: دوایین جار لە %{date} بەکارهاتووە
+        never_used: هه‌رگیز به‌كارنه‌هاتووه‌
+        scopes: مۆڵەتەکان
+        superapp: ناوخۆیی
+        title: بەرنامە ڕێگەپێدراوەکانت
+    errors:
+      messages:
+        access_denied: خاوەنی سەرچاوە یان سێرڤەری ڕێپێدان داواکاریەکەی ڕەت کردەوە.
+        credential_flow_not_configured: لێشاوی بڕواپێدانی تێپەڕەوشەی خاوەن سەرچاوە شکستی هێنا بەهۆی Doorkeeper.configure.resource_owner_from_credentials شێوەبەندی نەکراو.
+        invalid_client: سەلماندنی کڕیار سەرکەوتوو نەبوو بەهۆی کڕیاری نەناسراوەوە، هیچ ڕەسەنایەتی سەلماندنێکی کلایەنت لەخۆوە نەدەگرێت، یان شێوازی سەلماندنی پەسەند نەکراو.
+        invalid_grant: بەخشین مۆڵەتی دابینکراو نایاساییە، بەسەرچووە، هەڵوەشاندنەوەیە، ناگونجێلەگەڵ ئاراستەی URI بەکارهاتوو لە داواکاری ڕێپێدان، یان دەرچووە بۆ کڕیارێکی تر.
+        invalid_redirect_uri: Uri دووبارە ئاڕاستەکردنەوەکە لەخۆدەگرێت دروست نیە.
+        invalid_request:
+          missing_param: 'پارامێتری پێویست نەماوە: %{value}.'
+          request_not_authorized: داواکاری پێویستە ڕێگەپێدراو بێت. پارامێتری پێویست بۆ ڕێگەدان بە داواکاری نەماوە یان نادروستە.
+          unknown: داواکارییەکە پارامێتەرێکی پێویستی تێدا نییە، بەهای پارامێتەرێکی پشتگیری نەکراو لەخۆدەگرێت، یان بە شێوەیەکی تر خراپە.
+        invalid_resource_owner: بڕواپێدانەکانی خاوەنی سەرچاوەی دابینکراو دروست نیە، یان ناتوانرێت خاوەنی سەرچاوە بدۆزرێتەوە
+        invalid_scope: بواری داواکراو نادروستە، نەناسراو، یان تێکچووە.
+        invalid_token:
+          expired: نیشانەی چوونەژورەوە بەسەرچووە
+          revoked: کۆدی دەستپێگەیشتن بەتاڵ بووەتەوە
+          unknown: دەستپێگەیشتن بە کۆدی چوونەژوور باوڕپێنەکراوە
+        resource_owner_authenticator_not_configured: خاوەنی سەرچاوە بەهۆی Doorkeeper.configure.resource_owner_authenticator کۆنفیگنەکردن سەرکەوتوو نەبوو.
+        server_error: ڕاژەکاری ڕێپێدان تووشی مەرجێکی چاوەڕوان نەکراو بوو کە رێگری دەکا لە جێبەجێ کردنی داواکاریەکە.
+        temporarily_unavailable: ڕاژەکاری ڕێپێدان لە ئێستادا ناتوانێت داواکاریەکە چارەسەر بکات لەبەر بارکردنی کاتی یان چاککردنەوەی سێرڤەرەکە.
+        unauthorized_client: ڕاژەخوازەکە دەسەڵاتی ئەوەی نییە ئەم داواکاریە بە بەکارهێنانی ئەم شێوازە بدات.
+        unsupported_grant_type: جۆری بەخشینە مۆڵەتپێدانەکە لەلایەن ڕاژەکاری مۆڵەتەوە پەسەند ناکرێت.
+        unsupported_response_type: ڕاژەکاری ڕێگەپێدان پشتگیری ئەم جۆرە وەڵامە ناکات.
+    flash:
+      applications:
+        create:
+          notice: بەرنامە دروستکرا.
+        destroy:
+          notice: بەرنامە سڕایەوە.
+        update:
+          notice: بەرنامە بەڕۆژکرا.
+      authorized_applications:
+        destroy:
+          notice: بەرنامە هەڵوەشێنڕا.
+    grouped_scopes:
+      access:
+        read: دەستڕاگەیشتن بە تەنها خوێندنەوە
+        read/write: دەستڕاگەیشتن بە خوێندنەوە و نووسین
+        write: دەستڕاگەیشتن بە تەنها نووسین
+      title:
+        accounts: هەژمارەکان
+        admin/accounts: بەڕێوەبردنی ژمێریارییەکان
+        admin/all: هەموو ئەرکە کارگێڕییەکان
+        admin/reports: بەڕێوەبردنی ڕاپۆرتەکان
+        all: هەمووی
+        blocks: بلۆک
+        bookmarks: نیشانەکان
+        conversations: گفتوگۆکان
+        crypto: کۆدکردنی کۆتایی بۆ کۆتایی
+        favourites: دڵخوازەکان
+        filters: پاڵێوراوەکان
+        follow: پەیوەندیەکان
+        follows: بەدواداچووان
+        lists: پێرستەکان
+        media: هاوپێچەکانی میدیا
+        mutes: بێ دەنگ
+        notifications: ئاگادارییەکان
+        push: پاڵ بە ئاگادارکردنەوەکانەوە بنێ
+        reports: ڕاپۆرتەکان
+        search: گەڕان
+        statuses: نووسراوەکان
+    layouts:
+      admin:
+        nav:
+          applications: بەرنامەکان
+          oauth2_provider: دابینکەری OAuth2
+      application:
+        title: داوای ڕێپێدانی OAuth
+    scopes:
+      admin:read: خوێندنەوەی هەموو داتاکان لەسەر ڕاژەکارەکە
+      admin:read:accounts: زانیاری هەستیاری هەموو هەژمارەکان بخوێنەوە
+      admin:read:reports: زانیاری هەستیاری هەموو گوزارشت و هەژمارە گوزارشتکراوەکان بخوێنەوە
+      admin:write: دەستکاری هەموو داتاکان بکە لەسەر ڕاژەکار
+      admin:write:accounts: ئەنجامدانی کاری میانڕەوی لەسەر هەژمارەکان
+      admin:write:reports: ئەنجامدانی کاری میانڕەوی لەسەر گوزارشتەکان
+      crypto: کۆدکردنی کۆتایی بۆ کۆتایی بەکاربهێنە
+      follow: دەستکاریکردنی پەیوەندییەکانی هەژمارەی بەکارهێنەر
+      push: وەرگرتنی ئاگانامەکانی پاڵنان
+      read: هەموو دراوەکانی هەژمارەکەت بخوێنەوە
+      read:accounts: بینینی زانیاری هەژمارەکان
+      read:blocks: بینینی بلۆکەکانت
+      read:bookmarks: نیشانەکان ببینە
+      read:favourites: بینینی دڵخوازەکانت
+      read:filters: بینینی پاڵافتنەکانت
+      read:follows: سەیری شوێنکەوتەکانت بکە
+      read:lists: بینینی لیستەکانت
+      read:mutes: بێدەنگەکانت ببینە
+      read:notifications: ئاگانامەکانت ببینە
+      read:reports: سەیری گوزارشەکانت بکە
+      read:search: گەڕان لە جیاتی تۆ
+      read:statuses: بینینی هەموو بارودۆخەکان
+      write: دەستکاری هەموو داتاکانی هەژمارەکەت بکە
+      write:accounts: دەستکاری پرۆفایلەکەت بکە
+      write:blocks: بلۆک کردنی هەژمارەکەی دۆمەینەکان
+      write:bookmarks: بارەکانی نیشانکەر
+      write:conversations: بێدەنگکردن و سڕینەوەی گفتوگۆکان
+      write:favourites: دۆخی دڵخوازەکان
+      write:filters: پاڵێوەر دروست بکە
+      write:follows: دوای خەڵک بکەوە
+      write:lists: دروستکردنی لیستەکان
+      write:media: پەڕگەی میدیا باربکە
+      write:mutes: بێدەنگکردنی خەڵک و گفتوگۆکان
+      write:notifications: ئاگانامەکانت بسڕیەوە
+      write:reports: گوزارشتکردنی کەسانی تر
+      write:statuses: بڵاوکردنەوەی بارودۆخەکان
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 6819d8fc6..78c86d0db 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -60,8 +60,6 @@ co:
       error:
         title: C’hè statu un prublemu
       new:
-        able_to: St’applicazione puderà
-        prompt: L’applicazione %{client_name} hà dumandatu d’avè accessu à u vostru contu
         title: Permessu richiestu
       show:
         title: Codice d’auturizazione da cupià indè l’applicazione.
@@ -71,10 +69,6 @@ co:
       confirmations:
         revoke: Site sicuru·a?
       index:
-        application: Applicazione
-        created_at: Auturizata u
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Scopi
         title: E vostre applicazione auturizate
     errors:
       messages:
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 120a21b65..c9f8777fa 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -60,28 +60,30 @@ cs:
       error:
         title: Vyskytla se chyba
       new:
-        able_to: Bude moci
-        prompt: Aplikace %{client_name} vyžaduje přístup k vašemu účtu
+        prompt_html: "%{client_name} si přeje oprávnění pro přístup k vašemu účtu. Je to aplikace třetí strany. <strong>Pokud jí nedůvěřujete, pak byste ji neměli autorizovat.</strong>"
+        review_permissions: Zkontrolujte oprávnění
         title: Je vyžadována autorizace
       show:
         title: Zkopírujte tento autorizační kód a vložte ho do aplikace.
     authorized_applications:
       buttons:
-        revoke: Zamítnout
+        revoke: Odvolat
       confirmations:
         revoke: Opravdu?
       index:
-        application: Aplikace
-        created_at: Autorizováno
-        date_format: "%d. %m. %Y %H:%M:%S"
-        scopes: Rozsahy
+        authorized_at: Autorizována %{date}
+        description_html: Toto jsou aplikace, které mohou přistupovat k vašemu účtu s použitím API. Pokud jsou zde aplikace, které nepoznáváte, nebo se aplikace nechová správně, můžete odvolat její přístup.
+        last_used_at: Naposledy použito %{date}
+        never_used: Nikdy nepoužito
+        scopes: Oprávnění
+        superapp: Interní
         title: Vaše autorizované aplikace
     errors:
       messages:
         access_denied: Vlastník zdroje či autorizační server žádost zamítl.
         credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno.
         invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě.
-        invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo zamítnuto, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
+        invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
         invalid_redirect_uri: URI pro přesměrování není platné.
         invalid_request:
           missing_param: 'Chybí potřebný parametr: %{value}.'
@@ -91,7 +93,7 @@ cs:
         invalid_scope: Požadovaný rozsah je neplatný, neznámý, nebo špatně formulovaný.
         invalid_token:
           expired: Přístupový token vypršel
-          revoked: Přístupový token byl zamítnut
+          revoked: Přístupový token byl odvolán
           unknown: Přístupový token je neplatný
         resource_owner_authenticator_not_configured: Nález Resource Owner selhal, protože Doorkeeper.configure.resource_owner_authenticator nebylo nakonfigurováno.
         server_error: Autorizační server se setkal s neočekávanou chybou, která mu zabránila ve vykonání požadavku.
@@ -109,7 +111,34 @@ cs:
           notice: Aplikace aktualizována.
       authorized_applications:
         destroy:
-          notice: Aplikace zamítnuta.
+          notice: Aplikace odvolána.
+    grouped_scopes:
+      access:
+        read: Přístup pouze pro čtení
+        read/write: Přístup ke čtení a zápisu
+        write: Přístup pouze pro zápis
+      title:
+        accounts: Účty
+        admin/accounts: Správa účtů
+        admin/all: Všechny správcovské funkce
+        admin/reports: Správa hlášení
+        all: Všechno
+        blocks: Blokace
+        bookmarks: Záložky
+        conversations: Konverzace
+        crypto: End-to-end šifrování
+        favourites: Oblíbení
+        filters: Filtry
+        follow: Vztahy
+        follows: Sledovaní
+        lists: Seznamy
+        media: Mediální přílohy
+        mutes: Skrytí
+        notifications: Oznámení
+        push: Push oznámení
+        reports: Hlášení
+        search: Hledání
+        statuses: Příspěvky
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ cs:
     scopes:
       admin:read: číst všechna data na serveru
       admin:read:accounts: číst citlivé informace všech účtů
+      admin:read:canonical_email_blocks: číst citlivé informace všech kanonických e-mailových bloků
+      admin:read:domain_allows: číst citlivé informace ze všech povolených domén
+      admin:read:domain_blocks: číst citlivé informace ze všech bloků domén
+      admin:read:email_domain_blocks: číst citlivé informace ze všech bloků emailových domén
+      admin:read:ip_blocks: číst citlivé informace ze všech bloků IP
       admin:read:reports: číst citlivé informace všech nahlášení a nahlášených účtů
       admin:write: měnit všechna data na serveru
       admin:write:accounts: provádět moderátorské akce s účty
+      admin:write:canonical_email_blocks: provést akce moderace na kanonických emailových blocích
+      admin:write:domain_allows: provést akce moderace na povolených doménách
+      admin:write:domain_blocks: provést akce moderace na doménových blocích
+      admin:write:email_domain_blocks: provést akce moderace na blocích emailových domén
+      admin:write:ip_blocks: provést akce moderace na blocích IP
       admin:write:reports: provádět moderátorské akce s hlášeními
+      crypto: používat end-to-end šifrování
       follow: upravovat vztahy mezi profily
       push: přijímat vaše push oznámení
       read: vidět všechna data vašeho účtu
@@ -143,6 +183,7 @@ cs:
       write:accounts: měnit váš profil
       write:blocks: blokovat účty a domény
       write:bookmarks: přidávat příspěvky do záložek
+      write:conversations: skrývat a mazat konverzace
       write:favourites: oblibovat si příspěvky
       write:filters: vytvářet filtry
       write:follows: sledovat lidi
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 93c618da9..609826f51 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -5,14 +5,14 @@ cy:
       doorkeeper/application:
         name: Enw rhaglen
         redirect_uri: Ailgyfeirio URI
-        scopes: Rhinweddau
-        website: Gwefan cais
+        scopes: Cwmpasau
+        website: Gwefan rhaglen
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: ni all gynnwys dernyn.
+              fragment_present: ni all gynnwys darn.
               invalid_uri: rhaid iddo fod yn URI cyfredol.
               relative_uri: rhaid iddo fod yn URI absoliwt.
               secured_uri: rhaid iddo fod yn URI HTTPS/SSL.
@@ -25,33 +25,33 @@ cy:
         edit: Golygu
         submit: Cyflwyno
       confirmations:
-        destroy: Ydych chi'n sicr?
+        destroy: Ydych chi'n siŵr?
       edit:
-        title: Golygwch y rhaglen
+        title: Golygu'r rhaglen
       form:
         error: Wps! Gwiriwch eich ffurflen am gamgymeriadau posib
       help:
         native_redirect_uri: Defnyddiwch %{native_redirect_uri} ar gyfer profion lleol
         redirect_uri: Defnyddiwch un llinell i bob URI
-        scopes: Gwahanwch rinweddau gyda gofodau. Gadewch yn wag i ddefnyddio y rhinweddau rhagosodiedig.
+        scopes: Gwahanwch gwmpasau gyda gofodau. Gadewch yn wag i ddefnyddio'r cwmpasau rhagosodedig.
       index:
         application: Rhaglen
         callback_url: URL galw-nôl
         delete: Dileu
-        empty: Nid oes gennych unrhyw ceisiadau.
+        empty: Nid oes gennych unrhyw raglenni.
         name: Enw
         new: Rhaglen newydd
-        scopes: Rhinweddau
-        show: Dangoswch
+        scopes: Cwmpasau
+        show: Dangos
         title: Eich rhaglenni
       new:
         title: Rhaglen newydd
       show:
         actions: Gweithredoedd
         application_id: Allwedd cleient
-        callback_urls: URLau galw-nôl
-        scopes: Rhinweddau
-        secret: Cyfrinach Cleient
+        callback_urls: URLau adalw
+        scopes: Cwmpasau
+        secret: Cyfrinach cleient
         title: 'Rhaglen: %{name}'
     authorizations:
       buttons:
@@ -60,31 +60,37 @@ cy:
       error:
         title: Mae rhywbeth wedi mynd o'i le
       new:
-        able_to: Mi fydd a'r gallu i
-        prompt: Mae'r ap %{client_name} yn gofyn caniatad i gal mynediad i'ch cyfrif
+        prompt_html: Hoffai %{client_name} gael caniatâd i gael mynediad i'ch cyfrif. Mae'n gais trydydd parti. <strong>Os nad ydych yn ymddiried ynddo, yna peidiwch a'i awdurdodi.</strong>
+        review_permissions: Adolygu caniatâd
         title: Angen awdurdodi
       show:
-        title: Copiwch y côd awdurdodi a gludiwch i'r rhaglen.
+        title: Copïwch y cod awdurdodi a'i ludio i'r rhaglen.
     authorized_applications:
       buttons:
-        revoke: Diddymu
+        revoke: Dirymu
       confirmations:
-        revoke: Ydych chi'n sicr?
+        revoke: Ydych chi'n siŵr?
       index:
-        application: Rhaglen
-        created_at: Awdurdodedig
-        date_format: "%Y-%m-%d% %H:%M:%S"
-        scopes: Rhinweddau
+        authorized_at: Wedi'i awdurdodi ar %{date}
+        description_html: Mae'r rhain yn raglenni sy'n gallu cael mynediad i'ch cyfrif gan ddefnyddio'r API. Os oes yna rhaglenni nad ydych chi'n eu hadnabod yma, neu os yw rhaglen yn camymddwyn, gallwch chi ddiddymu ei fynediad.
+        last_used_at: Defnyddiwyd ddiwethaf ar %{date}
+        never_used: Erioed wedi'i ddefnyddio
+        scopes: Caniatâd
+        superapp: Mewnol
         title: Eich rhaglenni awdurdodedig
     errors:
       messages:
         access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais.
         credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu.
-        invalid_client: Methwyd dilysu cleient oherwydd cleient anhysbys, methiant i gynnwys dilysu cleient, neu defnydd o ddull dilysu nid yw'n cael ei gefnodi.
-        invalid_grant: Mae'r grant dilysu a ddarparwyd yn annilys, wedi dod i ben, wedi'i wrthod, ddim yn cyfateb a'r URI ailgyferio a ddefnyddiwyd yn y cais dilysu, neu wedi ei ddarparu i gleient arall.
-        invalid_redirect_uri: Nid yw'r uri ailgyfeirio cynnwysiedig yn gyfredol.
+        invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi.
+        invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddiddymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
+        invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys.
+        invalid_request:
+          missing_param: 'Paramedr gofynnol ar goll: %{value}.'
+          request_not_authorized: Mae angen awdurdodi'r cais. Mae'r paramedr gofynnol ar gyfer awdurdodi cais ar goll neu'n annilys.
+          unknown: Mae'r cais yn brin o baramedr gofynnol, yn cynnwys gwerth paramedr heb ei gefnogi, neu wedi ei gamffurfio fel arall.
         invalid_resource_owner: Nid yw meini prawf perchennog yr adnodd yn ddilys, neu ni ellir canfod perchennog yr adnodd
-        invalid_scope: Mae'r sgôp a geisiwyd amdano yn annilys, anhysbys, neu'n gamffurfiedig.
+        invalid_scope: Mae'r cwmpas y gofynnwyd amdano yn annilys, yn anhysbys neu wedi'i gamffurfio.
         invalid_token:
           expired: Daeth y tocyn mynediad i ben
           revoked: Gwrthodwyd y tocyn mynediad
@@ -93,12 +99,12 @@ cy:
         server_error: Daeth y gweinydd awdurdodi ar draws gyflwr annisgwyl wnaeth ei atal rhag cyflawni'r cais.
         temporarily_unavailable: Nid yw'r gweinydd awdurdodi yn gallu gweithredu y cais hwn ar hyn o bryd oherwydd gorlwytho dros dro neu gwaith cynnal a chadw ar y gweinydd hwn.
         unauthorized_client: Nid yw'r cleient wedi ei awdurdodi i berfformio'r cais hwn yn defnyddio'r dull hwn.
-        unsupported_grant_type: Nid yw'r math o ganiatad awdurdodi yma'n cael ei gefnogi gan y gweinydd awdurdodi.
+        unsupported_grant_type: Nid yw'r math o ganiatâd awdurdodi yma'n cael ei gefnogi gan y gweinydd awdurdodi.
         unsupported_response_type: Nid yw'r gweinydd awdurdodi yn cefnogi y math yma o ymateb.
     flash:
       applications:
         create:
-          notice: Crewyd y rhaglen.
+          notice: Crëwyd y rhaglen.
         destroy:
           notice: Dilëwyd y rhaglen.
         update:
@@ -106,6 +112,33 @@ cy:
       authorized_applications:
         destroy:
           notice: Diddymwyd y cais.
+    grouped_scopes:
+      access:
+        read: Mynediad darllen yn unig
+        read/write: Mynediad darllen ac ysgrifennu
+        write: Mynediad ysgrifennu yn unig
+      title:
+        accounts: Cyfrifon
+        admin/accounts: Gweinyddu cyfrifon
+        admin/all: Pob swyddogaeth weinyddol
+        admin/reports: Gweinyddu adroddiadau
+        all: Popeth
+        blocks: Blociau
+        bookmarks: Nodau Tudalen
+        conversations: Sgyrsiau
+        crypto: Amgryptio o ben i ben
+        favourites: Ffefrynnau
+        filters: Hidlyddion
+        follow: Perthnasau
+        follows: Yn dilyn
+        lists: Rhestrau
+        media: Atodiadau cyfryngau
+        mutes: Anwybyddiadau
+        notifications: Hysbysiadau
+        push: Hysbysiadau gwthiadwy
+        reports: Adroddiadau
+        search: Chwilio
+        statuses: Postiadau
     layouts:
       admin:
         nav:
@@ -114,37 +147,39 @@ cy:
       application:
         title: Mae awdurdodiad OAuth yn ofynnol
     scopes:
-      admin:read: darllenwch yr holl ddata ar y serfiwr
-      admin:read:accounts: darllen gwybodaeth sensitif o'r holl gyfrifon
-      admin:read:reports: darllen gwybodaeth sensitif am bob adroddiad a chyfrifon yr adroddir amdanynt
-      admin:write: addasu pob data ar y serfiwr
+      admin:read: darllen yr holl ddata ar y gweinydd
+      admin:read:accounts: darllen gwybodaeth sensitif o bob cyfrif
+      admin:read:reports: darllen gwybodaeth sensitif o'r holl adroddiadau a'r cyfrifon a adroddwyd
+      admin:write: addasu'r holl ddata ar y gweinydd
       admin:write:accounts: cyflawni camau cymedroli ar gyfrifon
       admin:write:reports: cyflawni camau cymedroli ar adroddiadau
+      crypto: defnyddio amgryptio ben i ben
       follow: addasu perthnasau cyfrif
       push: derbyn eich hysbysiadau gwthiadwy
       read: darllen holl ddata eich cyfrif
       read:accounts: gweld gwybodaeth y cyfrif
       read:blocks: gweld eich blociau
-      read:bookmarks: gweld eich tudalnodau
+      read:bookmarks: gweld eich nodau tudalen
       read:favourites: gweld eich ffefrynnau
       read:filters: gweld eich hidlwyr
       read:follows: gweld eich dilynwyr
       read:lists: gweld eich rhestrau
-      read:mutes: gweld y rheini wedi'i tewi
+      read:mutes: gweld eich anwybyddiadau
       read:notifications: gweld eich hysbysiadau
       read:reports: gweld eich adroddiadau
-      read:search: edrych ar eich rhan
-      read:statuses: gweld pob statws
-      write: addasu holl ddata eich cyfri
+      read:search: chwilio ar eich rhan
+      read:statuses: gweld pob postiad
+      write: addasu holl ddata eich cyfrif
       write:accounts: addasu eich proffil
       write:blocks: blocio cyfrifon a parthau
-      write:bookmarks: statwsau tudalnod
-      write:favourites: hoff dŵtiau
+      write:bookmarks: gosod nod tudalen postiadau
+      write:conversations: anwybyddu a dileu sgyrsiau
+      write:favourites: hoff bostiadau
       write:filters: creu hidlwyr
       write:follows: dilyn pobl
       write:lists: creu rhestrau
-      write:media: uwchlwytho ffeiliau cyfryngau
-      write:mutes: tawelu pobl a sgyrsiau
+      write:media: llwytho ffeiliau cyfryngau
+      write:mutes: anwybyddu pobl a sgyrsiau
       write:notifications: clirio eich hysbysiadau
       write:reports: adrodd pobl eraill
-      write:statuses: cyhoeddi tŵt
+      write:statuses: cyhoeddi postiadau
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 05fac0036..43908f020 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -4,7 +4,7 @@ da:
     attributes:
       doorkeeper/application:
         name: Applikationsnavn
-        redirect_uri: Link
+        redirect_uri: Omdirigerings-URI
         scopes: Områder
         website: Applikationswebsted
     errors:
@@ -13,7 +13,7 @@ da:
           attributes:
             redirect_uri:
               fragment_present: kan ikke indeholde et fragment.
-              invalid_uri: skal være en gyldigt URI.
+              invalid_uri: skal være en gyldig URI.
               relative_uri: skal være en absolut URI.
               secured_uri: skal være en HTTPS-/SSL-URI.
   doorkeeper:
@@ -33,7 +33,7 @@ da:
       help:
         native_redirect_uri: Brug %{native_redirect_uri} til lokale tests
         redirect_uri: Brug én linje pr. URI
-        scopes: Adskil omfang med mellemrum. Lad være tomt for standardomfang.
+        scopes: Adskil omfang med mellemrum. Lad stå tomt for standardomfang.
       index:
         application: Applikation
         callback_url: Callback-URL
@@ -60,9 +60,9 @@ da:
       error:
         title: En fejl opstod
       new:
-        able_to: Den vil være i stand til
-        prompt: Applikationen %{client_name} anmoder om adgang til din konto
-        title: Godkendelse krævet
+        prompt_html: "%{client_name} ønsker tilladelse til at tilgå din konto. Den er en tredjepartsapplikation. <strong>Har du ikke tillid til den, bør den ikke godkendes.</strong>"
+        review_permissions: Gennemgå tilladelser
+        title: Godkendelse kræves
       show:
         title: Kopiér og indsæt denne godkendelseskode i applikationen.
     authorized_applications:
@@ -71,33 +71,35 @@ da:
       confirmations:
         revoke: Sikker?
       index:
-        application: Applikation
-        created_at: Godkendt
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfang
+        authorized_at: Godkendt pr. %{date}
+        description_html: Disse er applikationer, som kan tilgå din konto vha. API'en. Er her applikationer, som ikke genkendes eller udviser mærkværdig adfærd, kan deres adgangstilladelse ophæves.
+        last_used_at: Senest brugt pr. %{date}
+        never_used: Aldrig brugt
+        scopes: Tilladelser
+        superapp: Intern
         title: Dine godkendte applikationer
     errors:
       messages:
         access_denied: Ressourceejeren eller godkendelsesserveren afviste anmodningen.
-        credential_flow_not_configured: Ressourceejeradgangskodeakkreditiv flow mislykkedes grundet ikke-opsat Doorkeeper.configure.resource_owner_from_credentials.
-        invalid_client: Klientbekræftelse mislykkedes grundet en ukendt klient, ingen klientbekræftelse inkluderet, eller uunderstøttet bekræftelsesmetode.
-        invalid_grant: Den leverede godkendelse er ugyldig, udløbet, tilbagekaldt, matcher ikke omdirigerings-URI brugt i godkendelsesanmodningen, eller er udstedt til en anden klient.
+        credential_flow_not_configured: Ressourceejeradgangskodeakkreditiver-flow mislykkedes grundet ikke-opsat Doorkeeper.configure.resource_owner_from_credentials.
+        invalid_client: Klientgodkendelse mislykkedes grundet en ukendt klient, ingen inkluderet klientgodkendelse eller uunderstøttet godkendelsesmetode.
+        invalid_grant: Den leverede godkendelse er ugyldig, udløbet, ophævet, matcher ikke omdirigerings-URI'en brugt i godkendelsesanmodningen eller er udstedt til en anden klient.
         invalid_redirect_uri: Inkluderede ormdirigerings-URI er ugyldig.
         invalid_request:
-          missing_param: 'Mangler krævet parameter: %{value}.'
-          request_not_authorized: Anmodning skal godkendes. Krævet parameter til godkendelse af anmodning mangler eller er ugyldig.
-          unknown: Anmodningen mangler en krævet parametre, inkluderer en uunderstøttet parametre værdi eller er på anden vis fejlbehæftet.
-        invalid_resource_owner: De angivne ressourceejerakkreditiver er ugyldige, eller ressourceejer kunne ikke findes
-        invalid_scope: Det anmodede omfang er ugyldigt, ukendt eller fejlbehæftet.
+          missing_param: 'Mangler obligatoriske parameter: %{value}.'
+          request_not_authorized: Anmodning kræver godkendelse. Obligatorisk parameter til godkendelse af anmodning mangler eller er ugyldig.
+          unknown: Anmodningen mangler en obligatorisk parameter, indeholder en uunderstøttet parameterværdi eller er på anden vis fejlbehæftet.
+        invalid_resource_owner: De angivne ressourceejerakkreditiver er ugyldige, eller ressourceejer kan ikke findes
+        invalid_scope: Det anmodede omfang er ugyldigt, ukendt eller forkert udformet.
         invalid_token:
           expired: Adgangstoken er udløbet
-          revoked: Adgangstoken er tilbagekaldt
-          unknown: Adgangstoken er ugyldig
+          revoked: Adgangstoken er ophævet
+          unknown: Adgangstoken er ugyldigt
         resource_owner_authenticator_not_configured: Ressourceejer kunne ikke findes grundet ikke-opsat Doorkeeper.configure.resource_owner_authenticator.
         server_error: Godkejdelsesserveren stødte på en uventet betingelse, der forhindrede den i at imødekomme anmodningen.
         temporarily_unavailable: Godkendelsesserveren kan pt. ikke håndtere anmodningen grundet midlertidig overbelastning eller servervedligehold.
-        unauthorized_client: Klienten er ikke godkendt til at udføre denne anmodning via denne metode.
-        unsupported_grant_type: Godkendelsestypen understøttes ikke af godkendelsesserveren.
+        unauthorized_client: Klienten er ikke godkendt til at udføre denne anmodning vha. denne metode.
+        unsupported_grant_type: Godkendelsestildelingstypen understøttes ikke af godkendelsesserveren.
         unsupported_response_type: Godkendelsesserveren understøtter ikke denne svartype.
     flash:
       applications:
@@ -109,46 +111,85 @@ da:
           notice: Applikation opdateret.
       authorized_applications:
         destroy:
-          notice: Applikation tilbagekaldt.
+          notice: Applikation ophævet.
+    grouped_scopes:
+      access:
+        read: Skrivebeskyttet adgang
+        read/write: Læse- og skriveadgang
+        write: Kun skriveadgang
+      title:
+        accounts: Konti
+        admin/accounts: Kontihåndtering
+        admin/all: Alle håndteringsfunktioner
+        admin/reports: Rapporthåndteringer
+        all: Alt
+        blocks: Blokeringer
+        bookmarks: Bogmærker
+        conversations: Konversationer
+        crypto: Ende-til-ende kryptering
+        favourites: Favoritter
+        filters: Filtre
+        follow: Relationer
+        follows: Følger
+        lists: Lister
+        media: Medievedhæftninger
+        mutes: Tavsgørelser
+        notifications: Notifikationer
+        push: Push-notifikationer
+        reports: Anmeldelser
+        search: Søgning
+        statuses: Indlæg
     layouts:
       admin:
         nav:
           applications: Applikationer
-          oauth2_provider: OAuth-udbyder
+          oauth2_provider: OAuth2-leverandør
       application:
-        title: OAuth-godkendelse krævet
+        title: OAuth-godkendelse obligatorisk
     scopes:
-      admin:read: læs al data på serveren
+      admin:read: læs alle data på serveren
       admin:read:accounts: læs sensitiv information fra alle konti
+      admin:read:canonical_email_blocks: læs følsomme oplysninger fra alle kanoniske e-mailblokeringer
+      admin:read:domain_allows: læs følsomme informationer fra alle tilladte domæner
+      admin:read:domain_blocks: læs følsomme informationer fra alle domæneblokeringer
+      admin:read:email_domain_blocks: læs følsomme informationer fra alle e-maildomæneblokeringer
+      admin:read:ip_blocks: læs følsomme informationer fra alle IP-blokeringer
       admin:read:reports: læs sensitiv information fra alle anmeldelser og anmeldte konti
-      admin:write: redigér al data på serveren
+      admin:write: redigér alle data på serveren
       admin:write:accounts: udfør modereringshandlinger på konti
+      admin:write:canonical_email_blocks: udfør modereringshandlinger på kanoniske e-mailblokeringer
+      admin:write:domain_allows: udfør modereringshandlinger på tilladte domæner
+      admin:write:domain_blocks: udfør modereringshandlinger på domæneblokeringer
+      admin:write:email_domain_blocks: udfør modereringshandlinger på e-maildomæneblokeringer
+      admin:write:ip_blocks: udfør modereringshandlinger på IP-blokeringer
       admin:write:reports: udfør modereringshandlinger på anmeldelser
+      crypto: benyt ende-til-ende kryptering
       follow: ændre kontorelationer
-      push: modtage dine push-notifikationer
-      read: læse alle dine kontodata
+      push: modtag dine push-notifikationer
+      read: læs alle dine kontodata
       read:accounts: se kontooplysninger
       read:blocks: se dine blokeringer
       read:bookmarks: se dine bogmærker
       read:favourites: se dine favoritter
       read:filters: se dine filtre
-      read:follows: se, hvem du følger
+      read:follows: se dine følger
       read:lists: se dine lister
       read:mutes: se dine tavsgørelser
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
-      read:search: søge på dine vegne
-      read:statuses: se alle statusser
+      read:search: søg på dine vegne
+      read:statuses: se alle indlæg
       write: ændre alle dine kontodata
       write:accounts: ændre din profil
       write:blocks: blokere konti og domæner
-      write:bookmarks: bogmærke statusser
-      write:favourites: favorisere statusser
+      write:bookmarks: bogmærke indlæg
+      write:conversations: tavsgøre og slette konversationer
+      write:favourites: favoritmarkere indlæg
       write:filters: oprette filtre
       write:follows: følge personer
       write:lists: oprette lister
-      write:media: uploade multimediefiler
+      write:media: uploade mediefiler
       write:mutes: tavsgøre personer og konversationer
       write:notifications: rydde dine notifikationer
       write:reports: anmelde personer
-      write:statuses: udgive statusser
+      write:statuses: udgive indlæg
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 032a3dbce..c27e41979 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -60,8 +60,8 @@ de:
       error:
         title: Ein Fehler ist aufgetreten
       new:
-        able_to: 'Es wird folgende Befugnisse haben:'
-        prompt: Die Anwendung %{client_name} verlangt Zugriff auf dein Konto
+        prompt_html: "%{client_name} möchte auf dein Konto zugreifen. Es ist eine Anwendung von Drittanbietern. <strong>Wenn du ihr nicht vertraust, dann solltest du sie nicht autorisieren.</strong>"
+        review_permissions: Rechte überprüfen
         title: Autorisierung erforderlich
       show:
         title: Kopiere diesen Autorisierungs-Code und füge ihn in die Anwendung ein.
@@ -71,23 +71,25 @@ de:
       confirmations:
         revoke: Bist du sicher?
       index:
-        application: Anwendung
-        created_at: Autorisiert am
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Befugnisse
-        title: Deine autorisierten Anwendungen
+        authorized_at: Autorisiert am %{date}
+        description_html: Dies sind Anwendungen, die über die Programmierschnittstelle (API) auf dein Konto zugreifen können. Wenn es Anwendungen gibt, die du hier nicht zuordnen kannst oder wenn sich eine Anwendung verdächtig verhält, kannst du den Zugriff widerrufen.
+        last_used_at: Zuletzt verwendet am %{date}
+        never_used: Nie verwendet
+        scopes: Berechtigungen
+        superapp: Intern
+        title: Deine genehmigten Apps
     errors:
       messages:
         access_denied: Die Anfrage wurde durch Benutzer_in oder Autorisierungs-Server verweigert.
         credential_flow_not_configured: Das Konto konnte nicht gefunden werden, da Doorkeeper.configure.resource_owner_from_credentials nicht konfiguriert ist.
         invalid_client: 'Client-Authentifizierung ist fehlgeschlagen: Client unbekannt, keine Authentisierung mitgeliefert oder Authentisierungsmethode wird nicht unterstützt.'
-        invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen, einem anderen Client ausgestellt oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
+        invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen oder einem anderen Client ausgestellt, oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
         invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig.
         invalid_request:
           missing_param: 'Erforderlicher Parameter fehlt: %{value}.'
           request_not_authorized: Anfrage muss autorisiert werden. Benötigter Parameter für die Autorisierung der Anfrage fehlt oder ungültig.
           unknown: Der Anfrage fehlt ein benötigter Parameter, enthält einen nicht unterstützten Parameterwert oder ist anderweitig fehlerhaft.
-        invalid_resource_owner: Die angegebenen Zugangsdaten für das Konto sind ungültig oder das Konto kann nicht gefunden werden
+        invalid_resource_owner: Die angegebenen Zugangsdaten für das Konto sind ungültig, oder das Konto kann nicht gefunden werden
         invalid_scope: Die angeforderte Befugnis ist ungültig, unbekannt oder fehlerhaft.
         invalid_token:
           expired: Der Zugriffs-Token ist abgelaufen
@@ -110,6 +112,33 @@ de:
       authorized_applications:
         destroy:
           notice: Anwendung widerrufen.
+    grouped_scopes:
+      access:
+        read: Nur-Lese-Zugriff
+        read/write: Lese- und Schreibzugriff
+        write: Schreibzugriff
+      title:
+        accounts: Konten
+        admin/accounts: Verwaltung der Konten
+        admin/all: Alle administrativen Funktionen
+        admin/reports: Verwaltung der Berichte
+        all: Alles
+        blocks: Blocks
+        bookmarks: Lesezeichen
+        conversations: Unterhaltungen
+        crypto: Ende-zu-Ende-Verschlüsselung
+        favourites: Favoriten
+        filters: Filter
+        follow: Beziehungen
+        follows: Folge ich
+        lists: Listen
+        media: Medienanhänge
+        mutes: Stummschaltungen
+        notifications: Benachrichtigungen
+        push: Push-Benachrichtigungen
+        reports: Meldungen
+        search: Suche
+        statuses: Beiträge
     layouts:
       admin:
         nav:
@@ -119,11 +148,22 @@ de:
         title: OAuth-Autorisierung nötig
     scopes:
       admin:read: alle Daten auf dem Server lesen
-      admin:read:accounts: sensible Daten aller Konten lesen
-      admin:read:reports: sensible Daten aller Meldungen und gemeldeten Konten lesen
+      admin:read:accounts: sensible Informationen aller Konten lesen
+      admin:read:canonical_email_blocks: sensible Informationen aller kanonischen E-Mail-Sperren lesen
+      admin:read:domain_allows: sensible Informationen aller zugelassenen Domains lesen
+      admin:read:domain_blocks: sensible Informationen aller Domain-Sperren lesen
+      admin:read:email_domain_blocks: sensible Informationen aller E-Mail-Domainsperren lesen
+      admin:read:ip_blocks: sensible Informationen aller IP-Sperren lesen
+      admin:read:reports: sensible Informationen aller Meldungen und gemeldeten Konten lesen
       admin:write: alle Daten auf dem Server ändern
       admin:write:accounts: Moderationsaktionen auf Konten ausführen
+      admin:write:canonical_email_blocks: Moderationsaktionen auf kanonischen E-Mail-Sperren ausführen
+      admin:write:domain_allows: Moderationsaktionen auf zugelassende Domains ausführen
+      admin:write:domain_blocks: Moderationsaktionen auf Domainsperren ausführen
+      admin:write:email_domain_blocks: Moderationsaktionen auf E-Mail-Domainsperren ausführen
+      admin:write:ip_blocks: Moderationsaktionen auf IP-Sperren ausführen
       admin:write:reports: Moderationsaktionen auf Meldungen ausführen
+      crypto: Ende-zu-Ende-Verschlüsselung verwenden
       follow: Kontenbeziehungen verändern
       push: deine Push-Benachrichtigungen erhalten
       read: all deine Daten lesen
@@ -143,12 +183,13 @@ de:
       write:accounts: dein Profil bearbeiten
       write:blocks: Domains und Konten blockieren
       write:bookmarks: Lesezeichen hinzufügen
+      write:conversations: Unterhaltungen stummschalten und löschen
       write:favourites: Beiträge favorisieren
       write:filters: Filter erstellen
       write:follows: Leuten folgen
       write:lists: Listen erstellen
       write:media: Mediendateien hochladen
-      write:mutes: Leute und Konversationen stummschalten
+      write:mutes: Profile und Unterhaltungen stummschalten
       write:notifications: deine Benachrichtigungen leeren
       write:reports: andere Leute melden
       write:statuses: Beiträge veröffentlichen
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 29db6d883..31fe3a8aa 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -60,8 +60,6 @@ el:
       error:
         title: Εμφανίστηκε σφάλμα
       new:
-        able_to: Θα μπορεί να
-        prompt: Η εφαρμογή %{client_name} ζητάει πρόσβαση στο λογαριασμό σου
         title: Απαιτείται έγκριση
       show:
         title: Αντέγραψε αυτό τον κωδικό έγκρισης στην εφαρμογή.
@@ -71,10 +69,8 @@ el:
       confirmations:
         revoke: Σίγουρα;
       index:
-        application: Εφαρμογή
-        created_at: Εγκεκριμένη
-        date_format: "%H:%M:%S, %d/%m/%Y"
-        scopes: Εύρος εφαρμογής
+        never_used: Ποτέ σε χρήση
+        scopes: Δικαιώματα
         title: Οι εφαρμογές που έχεις εγκρίνει
     errors:
       messages:
@@ -110,6 +106,30 @@ el:
       authorized_applications:
         destroy:
           notice: Η εφαρμογή ανακλήθηκε.
+    grouped_scopes:
+      access:
+        read: Πρόσβαση μόνο για ανάγνωση
+        read/write: Πρόσβαση ανάγνωσης και εγγραφής
+        write: Πρόσβαση μόνο για εγγραφή
+      title:
+        accounts: Λογαριασμοί
+        admin/accounts: Διαχείριση λογαριασμών
+        admin/all: Όλες οι λειτουργίες διαχείρησης
+        admin/reports: Διαχείριση αναφορών
+        bookmarks: Σελιδοδείκτες
+        conversations: Συνομιλίες
+        crypto: Κρυπτογράφηση από άκρο σε άκρο
+        favourites: Αγαπημένα
+        filters: Φίλτρα
+        follow: Σχέσεις
+        lists: Λίστες
+        media: Συνημμένα πολυμέσα
+        mutes: Αποσιωπήσεις
+        notifications: Ειδοποιήσεις
+        push: Άμεσες ειδοποιήσεις
+        reports: Αναφορές
+        search: Αναζήτηση
+        statuses: Αναρτήσεις
     layouts:
       admin:
         nav:
@@ -124,6 +144,7 @@ el:
       admin:write: αλλαγή δεδομένων στον διακομιστή
       admin:write:accounts: εκτέλεση διαχειριστικών ενεργειών σε λογαριασμούς
       admin:write:reports: εκτέλεση διαχειριστικών ενεργειών σε καταγγελίες
+      crypto: χρήση κρυπτογράφησης από άκρο σε άκρο
       follow: να αλλάζει τις σχέσεις με λογαριασμούς
       push: να λαμβάνει τις ειδοποιήσεις σου
       read: να διαβάζει όλα τα στοιχεία του λογαριασμού σου
@@ -143,6 +164,7 @@ el:
       write:accounts: να αλλάζει το προφίλ σου
       write:blocks: να μπλοκάρει λογαριασμούς και τομείς
       write:bookmarks: προσθήκη σελιδοδεικτών
+      write:conversations: σίγαση και διαγραφή συνομιλιών
       write:favourites: να σημειώνει δημοσιεύσεις ως αγαπημένες
       write:filters: να δημιουργεί φίλτρα
       write:follows: να ακολουθεί ανθρώπους
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
new file mode 100644
index 000000000..1f13709be
--- /dev/null
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -0,0 +1,185 @@
+---
+en-GB:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Application name
+        redirect_uri: Redirect URI
+        scopes: Scopes
+        website: Application website
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: cannot contain a fragment.
+              invalid_uri: must be a valid URI.
+              relative_uri: must be an absolute URI.
+              secured_uri: must be an HTTPS/SSL URI.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Authorise
+        cancel: Cancel
+        destroy: Destroy
+        edit: Edit
+        submit: Submit
+      confirmations:
+        destroy: Are you sure?
+      edit:
+        title: Edit application
+      form:
+        error: Whoops! Check your form for possible errors
+      help:
+        native_redirect_uri: Use %{native_redirect_uri} for local tests
+        redirect_uri: Use one line per URI
+        scopes: Separate scopes with spaces. Leave blank to use the default scopes.
+      index:
+        application: Application
+        callback_url: Callback URL
+        delete: Delete
+        empty: You have no applications.
+        name: Name
+        new: New application
+        scopes: Scopes
+        show: Show
+        title: Your applications
+      new:
+        title: New application
+      show:
+        actions: Actions
+        application_id: Client key
+        callback_urls: Callback URLs
+        scopes: Scopes
+        secret: Client secret
+        title: 'Application: %{name}'
+    authorizations:
+      buttons:
+        authorize: Authorise
+        deny: Deny
+      error:
+        title: An error has occurred
+      new:
+        prompt_html: "%{client_name} would like permission to access your account. It is a third-party application. <strong>If you do not trust it, then you should not authorise it.</strong>"
+        review_permissions: Review permissions
+        title: Authorisation required
+      show:
+        title: Copy this authorisation code and paste it to the application.
+    authorized_applications:
+      buttons:
+        revoke: Revoke
+      confirmations:
+        revoke: Are you sure?
+      index:
+        authorized_at: Authorised on %{date}
+        description_html: These are applications that can access your account using the API. If there are applications you do not recognise here, or an application is misbehaving, you can revoke its access.
+        last_used_at: Last used on %{date}
+        never_used: Never used
+        scopes: Permissions
+        superapp: Internal
+        title: Your authorised applications
+    errors:
+      messages:
+        access_denied: The resource owner or authorisation server denied the request.
+        credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
+        invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
+        invalid_grant: The provided authorisation grant is invalid, expired, revoked, does not match the redirection URI used in the authorisation request, or was issued to another client.
+        invalid_redirect_uri: The redirect URI included is not valid.
+        invalid_request:
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: Request need to be authorised. Required parameter for authorising request is missing or invalid.
+          unknown: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
+        invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
+        invalid_scope: The requested scope is invalid, unknown, or malformed.
+        invalid_token:
+          expired: The access token expired
+          revoked: The access token was revoked
+          unknown: The access token is invalid
+        resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
+        server_error: The authorisation server encountered an unexpected condition which prevented it from fulfilling the request.
+        temporarily_unavailable: The authorisation server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
+        unauthorized_client: The client is not authorised to perform this request using this method.
+        unsupported_grant_type: The authorisation grant type is not supported by the authorisation server.
+        unsupported_response_type: The authorisation server does not support this response type.
+    flash:
+      applications:
+        create:
+          notice: Application created.
+        destroy:
+          notice: Application deleted.
+        update:
+          notice: Application updated.
+      authorized_applications:
+        destroy:
+          notice: Application revoked.
+    grouped_scopes:
+      access:
+        read: Read-only access
+        read/write: Read and write access
+        write: Write-only access
+      title:
+        accounts: Accounts
+        admin/accounts: Administration of accounts
+        admin/all: All administrative functions
+        admin/reports: Administration of reports
+        all: Everything
+        blocks: Blocks
+        bookmarks: Bookmarks
+        conversations: Conversations
+        crypto: End-to-end encryption
+        favourites: Favourites
+        filters: Filters
+        follow: Relationships
+        follows: Follows
+        lists: Lists
+        media: Media attachments
+        mutes: Mutes
+        notifications: Notifications
+        push: Push notifications
+        reports: Reports
+        search: Search
+        statuses: Posts
+    layouts:
+      admin:
+        nav:
+          applications: Applications
+          oauth2_provider: OAuth2 Provider
+      application:
+        title: OAuth authorisation required
+    scopes:
+      admin:read: read all data on the server
+      admin:read:accounts: read sensitive information of all accounts
+      admin:read:reports: read sensitive information of all reports and reported accounts
+      admin:write: modify all data on the server
+      admin:write:accounts: perform moderation actions on accounts
+      admin:write:reports: perform moderation actions on reports
+      crypto: use end-to-end encryption
+      follow: modify account relationships
+      push: receive your push notifications
+      read: read all your account's data
+      read:accounts: see accounts information
+      read:blocks: see your blocks
+      read:bookmarks: see your bookmarks
+      read:favourites: see your favourites
+      read:filters: see your filters
+      read:follows: see your follows
+      read:lists: see your lists
+      read:mutes: see your mutes
+      read:notifications: see your notifications
+      read:reports: see your reports
+      read:search: search on your behalf
+      read:statuses: see all posts
+      write: modify all your account's data
+      write:accounts: modify your profile
+      write:blocks: block accounts and domains
+      write:bookmarks: bookmark posts
+      write:conversations: mute and delete conversations
+      write:favourites: favourite posts
+      write:filters: create filters
+      write:follows: follow people
+      write:lists: create lists
+      write:media: upload media files
+      write:mutes: mute people and conversations
+      write:notifications: clear your notifications
+      write:reports: report other people
+      write:statuses: publish posts
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 8aa099284..2df0056c2 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -60,8 +60,8 @@ en:
       error:
         title: An error has occurred
       new:
-        able_to: It will be able to
-        prompt: Application %{client_name} requests access to your account
+        prompt_html: "%{client_name} would like permission to access your account. It is a third-party application. <strong>If you do not trust it, then you should not authorize it.</strong>"
+        review_permissions: Review permissions
         title: Authorization required
       show:
         title: Copy this authorization code and paste it to the application.
@@ -71,10 +71,12 @@ en:
       confirmations:
         revoke: Are you sure?
       index:
-        application: Application
-        created_at: Authorized
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Scopes
+        authorized_at: Authorized on %{date}
+        description_html: These are applications that can access your account using the API. If there are applications you do not recognize here, or an application is misbehaving, you can revoke its access.
+        last_used_at: Last used on %{date}
+        never_used: Never used
+        scopes: Permissions
+        superapp: Internal
         title: Your authorized applications
     errors:
       messages:
@@ -110,6 +112,33 @@ en:
       authorized_applications:
         destroy:
           notice: Application revoked.
+    grouped_scopes:
+      access:
+        read: Read-only access
+        read/write: Read and write access
+        write: Write-only access
+      title:
+        accounts: Accounts
+        admin/accounts: Administration of accounts
+        admin/all: All administrative functions
+        admin/reports: Administration of reports
+        all: Everything
+        blocks: Blocks
+        bookmarks: Bookmarks
+        conversations: Conversations
+        crypto: End-to-end encryption
+        favourites: Favourites
+        filters: Filters
+        follow: Relationships
+        follows: Follows
+        lists: Lists
+        media: Media attachments
+        mutes: Mutes
+        notifications: Notifications
+        push: Push notifications
+        reports: Reports
+        search: Search
+        statuses: Posts
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ en:
     scopes:
       admin:read: read all data on the server
       admin:read:accounts: read sensitive information of all accounts
+      admin:read:canonical_email_blocks: read sensitive information of all canonical email blocks
+      admin:read:domain_allows: read sensitive information of all domain allows
+      admin:read:domain_blocks: read sensitive information of all domain blocks
+      admin:read:email_domain_blocks: read sensitive information of all email domain blocks
+      admin:read:ip_blocks: read sensitive information of all IP blocks
       admin:read:reports: read sensitive information of all reports and reported accounts
       admin:write: modify all data on the server
       admin:write:accounts: perform moderation actions on accounts
+      admin:write:canonical_email_blocks: perform moderation actions on canonical email blocks
+      admin:write:domain_allows: perform moderation actions on domain allows
+      admin:write:domain_blocks: perform moderation actions on domain blocks
+      admin:write:email_domain_blocks: perform moderation actions on email domain blocks
+      admin:write:ip_blocks: perform moderation actions on IP blocks
       admin:write:reports: perform moderation actions on reports
+      crypto: use end-to-end encryption
       follow: modify account relationships
       push: receive your push notifications
       read: read all your account's data
@@ -143,6 +183,7 @@ en:
       write:accounts: modify your profile
       write:blocks: block accounts and domains
       write:bookmarks: bookmark posts
+      write:conversations: mute and delete conversations
       write:favourites: favourite posts
       write:filters: create filters
       write:follows: follow people
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index c590fbde0..b0bbeaec0 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -60,8 +60,8 @@ eo:
       error:
         title: Eraro okazis
       new:
-        able_to: Ĝi povos
-        prompt: La aplikaĵo %{client_name} petas aliron al via konto
+        prompt_html: "%{client_name} volas permeso por aliri vian konton. <strong>Se vi ne konfidu ĝin, ne rajtigu ĝin.</strong>"
+        review_permissions: Revizu permesojn
         title: Rajtigo bezonata
       show:
         title: Kopiu ĉi tiun rajtigan kodon kaj gluu ĝin al la aplikaĵo.
@@ -71,10 +71,12 @@ eo:
       confirmations:
         revoke: Ĉu vi certas?
       index:
-        application: Aplikaĵo
-        created_at: Rajtigita
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Ampleksoj
+        authorized_at: Rajtigitas je %{date}
+        description_html: Ĉi tioj estas programaroj kiu povas aliri vian konton per API.
+        last_used_at: Laste uzita je %{date}
+        never_used: Neniam uzata
+        scopes: Permesoj
+        superapp: Interna
         title: Viaj rajtigitaj aplikaĵoj
     errors:
       messages:
@@ -98,7 +100,7 @@ eo:
         temporarily_unavailable: La rajtiga servilo ne povas nun plenumi la peton pro dumtempa troŝarĝo aŭ servila prizorgado.
         unauthorized_client: Kliento ne rajtas fari ĉi tian peton per ĉi tiu metodo.
         unsupported_grant_type: La tipo de la rajtiga konsento ne estas subtenata de la rajtiga servilo.
-        unsupported_response_type: La rajtiga servilo ne subtenas ĉi tian respondon.
+        unsupported_response_type: La aŭtentiga servilo ne subtenas ĉi tian respondon.
     flash:
       applications:
         create:
@@ -110,6 +112,33 @@ eo:
       authorized_applications:
         destroy:
           notice: Aplikaĵo malrajtigita.
+    grouped_scopes:
+      access:
+        read: Legnura aliro
+        read/write: Lega kaj skriba aliro
+        write: Skribnura aliro
+      title:
+        accounts: Kontoj
+        admin/accounts: Administro de kontoj
+        admin/all: Ĉiuj administraj funkcioj
+        admin/reports: Administro de raportoj
+        all: Ĉio
+        blocks: Blokita
+        bookmarks: Legosignoj
+        conversations: Konversacioj
+        crypto: Fin-al-fina ĉifrado
+        favourites: Preferaĵoj
+        filters: Filtriloj
+        follow: Rilatoj
+        follows: Sekvas
+        lists: Listoj
+        media: Aŭdovidaj aldonaĵoj
+        mutes: Silentigitaj
+        notifications: Sciigoj
+        push: Puŝsciigoj
+        reports: Raportoj
+        search: Serĉi
+        statuses: Afiŝoj
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ eo:
       admin:write: modifi ĉiujn datumojn en la servilo
       admin:write:accounts: plenumi agojn de kontrolo sur kontoj
       admin:write:reports: plenumi agojn de kontrolo sur signaloj
+      crypto: uzi fin-al-finan ĉifradon
       follow: ŝanĝi rilatojn al aliaj kontoj
       push: ricevi viajn puŝ-sciigojn
       read: legi ĉiujn datumojn de via konto
@@ -143,6 +173,7 @@ eo:
       write:accounts: ŝanĝi vian profilon
       write:blocks: bloki kontojn kaj domajnojn
       write:bookmarks: aldoni mesaĝojn al la legosignoj
+      write:conversations: mallautigi kaj forigi babiladojn
       write:favourites: stelumi mesaĝojn
       write:filters: krei filtrilojn
       write:follows: sekvi homojn
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index f914a62ff..789e7ab1d 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -60,8 +60,8 @@ es-AR:
       error:
         title: Ocurrió un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita acceso a tu cuenta
+        prompt_html: "%{client_name} solicita permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confiás en ella, no deberías autorizarla.</strong>"
+        review_permissions: Revisar permisos
         title: Autorización requerida
       show:
         title: Copiá este código de autorización y pegalo en la aplicación.
@@ -71,10 +71,12 @@ es-AR:
       confirmations:
         revoke: "¿Estás seguro?"
       index:
-        application: Aplicación
-        created_at: Autorizada
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta usando la API. Si hay aplicaciones que no reconocés acá, o que funcionan de forma sospechosa, podés revocar su acceso.
+        last_used_at: Último uso el %{date}
+        never_used: Nunca usada
+        scopes: Permisos
+        superapp: Interno
         title: Tus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es-AR:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de sólo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de denuncias
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguimientos
+        lists: Listas
+        media: Adjuntos de medios
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Denuncias
+        search: Buscar
+        statuses: Mensajes
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ es-AR:
     scopes:
       admin:read: leer todos los datos en el servidor
       admin:read:accounts: leer información sensible de todas las cuentas
+      admin:read:canonical_email_blocks: leer información sensible de todos los bloques canónicos de correo electrónico
+      admin:read:domain_allows: leer información sensible de todos los dominios permitidos
+      admin:read:domain_blocks: leer información sensible de todos los bloques de dominio
+      admin:read:email_domain_blocks: leer información sensible de todos los bloques de dominio de correo electrónico
+      admin:read:ip_blocks: leer información sensible de todos los bloques de direcciones IP
       admin:read:reports: leer información sensible de todos los informes y cuentas denunciadas
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: ejecutar acciones de moderación en cuentas
+      admin:write:canonical_email_blocks: ejecutar acciones de moderación en bloques canónicos de correo electrónico
+      admin:write:domain_allows: realizar acciones de moderación en el dominio permitido
+      admin:write:domain_blocks: ejecutar acciones de moderación en bloques de dominio
+      admin:write:email_domain_blocks: ejecutar acciones de moderación en bloques de dominio de correo electrónico
+      admin:write:ip_blocks: ejecutar acciones de moderación en bloques de direcciones IP
       admin:write:reports: ejecutar acciones de moderación en denuncias
+      crypto: usar cifrado de extremo a extremo
       follow: modificar relaciones de cuenta
       push: recibir tus notificaciones push
       read: leer todos los datos de tu cuenta
@@ -143,6 +183,7 @@ es-AR:
       write:accounts: modificar tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: marcar mensajes
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: marcar mensajes como favoritos
       write:filters: crear filtros
       write:follows: seguir cuentas
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index df12ceb79..58017d83a 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -60,8 +60,8 @@ es-MX:
       error:
         title: Ha ocurrido un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita tener acceso a su cuenta
+        prompt_html: "%{client_name} Requiere permisos para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confías en ella, no deberías darle autorización.</strong>"
+        review_permissions: Revisar permisos
         title: Se requiere autorización
       show:
         title: Copia este código de autorización y pégalo en la aplicación.
@@ -71,10 +71,12 @@ es-MX:
       confirmations:
         revoke: "¿Está seguro?"
       index:
-        application: Aplicación
-        created_at: Creado el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta utilizando la API. Si hay alguna aplicación que no reconozcas aquí, o una aplicación esta teniendo comportamientos extraños, puedes revocar el acceso.
+        last_used_at: Usado por ultima vez el %{date}
+        never_used: Nunca usado
+        scopes: Permisos
+        superapp: Interno
         title: Sus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es-MX:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de solo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de reportes
+        all: Todo
+        blocks: Bloques
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguidos
+        lists: Listas
+        media: Archivos adjuntos
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Reportes
+        search: Busqueda
+        statuses: Publicaciones
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ es-MX:
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: realizar acciones de moderación en cuentas
       admin:write:reports: realizar acciones de moderación en informes
+      crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
@@ -143,6 +173,7 @@ es-MX:
       write:accounts: modifica tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar estados como marcadores
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: toots favoritos
       write:filters: crear filtros
       write:follows: seguir usuarios
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index e3bb4d91f..6e7ae458c 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -60,8 +60,8 @@ es:
       error:
         title: Ha ocurrido un error
       new:
-        able_to: Será capaz de
-        prompt: La aplicación %{client_name} solicita tener acceso a su cuenta
+        prompt_html: "%{client_name} desea permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confías en ella, no deberías autorizarla.</strong>"
+        review_permissions: Revisar permisos
         title: Se requiere autorización
       show:
         title: Copia este código de autorización y pégalo en la aplicación.
@@ -71,10 +71,12 @@ es:
       confirmations:
         revoke: "¿Está seguro?"
       index:
-        application: Aplicación
-        created_at: Creado el
-        date_format: "%A-%m-%d %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta usando la API. Si hay aplicaciones que no se reconocen aquí, o una aplicación no funciona correctamente, puedes revocar su acceso.
+        last_used_at: Último uso el %{date}
+        never_used: Nunca usado
+        scopes: Permisos
+        superapp: Interno
         title: Sus aplicaciones autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ es:
       authorized_applications:
         destroy:
           notice: Aplicación revocada.
+    grouped_scopes:
+      access:
+        read: Acceso de solo lectura
+        read/write: Acceso de lectura y escritura
+        write: Acceso de sólo escritura
+      title:
+        accounts: Cuentas
+        admin/accounts: Administración de cuentas
+        admin/all: Todas las funciones administrativas
+        admin/reports: Administración de informes
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversaciones
+        crypto: Cifrado de extremo a extremo
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relaciones
+        follows: Seguidos
+        lists: Listas
+        media: Adjuntos multimedia
+        mutes: Silenciados
+        notifications: Notificaciones
+        push: Notificaciones push
+        reports: Informes
+        search: Buscar
+        statuses: Publicaciones
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ es:
     scopes:
       admin:read: leer todos los datos en el servidor
       admin:read:accounts: leer información sensible de todas las cuentas
+      admin:read:canonical_email_blocks: leer información sensible de todos los bloques de correo canónico
+      admin:read:domain_allows: leer información sensible de todos los dominios permitidos
+      admin:read:domain_blocks: leer información sensible de todos los bloques de dominio
+      admin:read:email_domain_blocks: leer información sensible de todos los bloques de dominio de correo electrónico
+      admin:read:ip_blocks: leer información sensible de todos los bloques IP
       admin:read:reports: leer información sensible de todos los informes y cuentas reportadas
       admin:write: modificar todos los datos en el servidor
       admin:write:accounts: realizar acciones de moderación en cuentas
+      admin:write:canonical_email_blocks: realizar acciones de moderación en bloques de correo canónico
+      admin:write:domain_allows: realizar acciones de moderación en el dominio permitido
+      admin:write:domain_blocks: realizar acciones de moderación en bloques de dominio
+      admin:write:email_domain_blocks: realizar acciones de moderación en bloques de dominio de correo electrónico
+      admin:write:ip_blocks: realizar acciones de moderación en bloques IP
       admin:write:reports: realizar acciones de moderación en informes
+      crypto: usar cifrado de extremo a extremo
       follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
       push: recibir tus notificaciones push
       read: leer los datos de tu cuenta
@@ -143,6 +183,7 @@ es:
       write:accounts: modifica tu perfil
       write:blocks: bloquear cuentas y dominios
       write:bookmarks: guardar estados como marcadores
+      write:conversations: silenciar y eliminar conversaciones
       write:favourites: publicaciones favoritas
       write:filters: crear filtros
       write:follows: seguir usuarios
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index 6f038c365..74d16942c 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -22,12 +22,12 @@ et:
         authorize: Autoriseeri
         cancel: Katkesta
         destroy: Hävita
-        edit: Redigeeri
+        edit: Muuda
         submit: Saada
       confirmations:
-        destroy: Olete kindel?
+        destroy: Oled kindel?
       edit:
-        title: Redigeeri rakendust
+        title: Avalduse muutmine
       form:
         error: Oih! Kontrollige oma vormi võimalikest vigadest
       help:
@@ -60,8 +60,8 @@ et:
       error:
         title: Ilmnes viga
       new:
-        able_to: Sellel on võimalik
-        prompt: Rakendus %{client_name} soovib ligipääsu Teie kontole
+        prompt_html: "%{client_name} soovib luba kontole juurdepääsuks. See on kolmanda osapoole rakendus. <strong>Kui pole usaldusväärne, siis ei tohiks seda lubada.</strong>"
+        review_permissions: Lubade ülevaade
         title: Autoriseerimine vajalik
       show:
         title: Kopeeri see autoriseerimisvõti ja kleebi see rakendusse.
@@ -69,11 +69,14 @@ et:
       buttons:
         revoke: Tühista
       confirmations:
-        revoke: Olete kindel?
+        revoke: Oled kindel?
       index:
-        application: Rakendus
-        created_at: Autoriseeritud
-        scopes: Ulatused
+        authorized_at: Autoriseeritud %{date}
+        description_html: Need on rakendused, millel on API kaudu juurdepääs kontole. Kui on rakendusi, mis on tundmatud või rakendus käitub halvasti, saab selle juurdepääsu tühistada.
+        last_used_at: Viimati kasutatud %{date}
+        never_used: Pole kasutatud
+        scopes: Õigused
+        superapp: Sisemine
         title: Autoriseeritud rakendused
     errors:
       messages:
@@ -82,6 +85,10 @@ et:
         invalid_client: Kliendi autentimine ebaõnnestus, kuna tundmatu klient, puudulik autentimine või mitte toetatud autentimismeetod.
         invalid_grant: Antud autoriseerimisluba on vale, aegunud, tagasi võetud, ei kattu kasutatud ümbersuunamise URLid või oli antud teisele kliendile.
         invalid_redirect_uri: Antud ümbersuunamise URL ei ole õige.
+        invalid_request:
+          missing_param: 'Puudub nõutud parameeter: %{value}.'
+          request_not_authorized: Päring vajab autoriseerimist. Autoriseerimispäringuks vajalik parameeter puudub või on vigane.
+          unknown: Taotluses puudub nõutav parameeter, see sisaldab toetamata parameetri väärtust või on muul viisil valesti vormindatud.
         invalid_resource_owner: Antud ressursi omaniku andmed on valed või ressursi omanikku ei leitud
         invalid_scope: Soovitud ulatus on vale, tundmatu või vigane.
         invalid_token:
@@ -105,6 +112,33 @@ et:
       authorized_applications:
         destroy:
           notice: Rakendus tagasi lükatud.
+    grouped_scopes:
+      access:
+        read: Vaid lugemisõigus
+        read/write: Lugemis- ja kirjutusõigus
+        write: Vaid kirjutusõigus
+      title:
+        accounts: Kontod
+        admin/accounts: Kontode haldus
+        admin/all: Kõik haldusfunktsioonid
+        admin/reports: Raportite haldus
+        all: Kõik
+        blocks: Keelud
+        bookmarks: Järjehoidjad
+        conversations: Vestlused
+        crypto: Otspunktkrüpteerimine
+        favourites: Lemmikud
+        filters: Filtrid
+        follow: Seosed
+        follows: Jälgimised
+        lists: Nimistud
+        media: Lisatud meedia
+        mutes: Vaigistused
+        notifications: Teavitused
+        push: Tõuketeated
+        reports: Teavitused
+        search: Otsing
+        statuses: Postitused
     layouts:
       admin:
         nav:
@@ -115,10 +149,21 @@ et:
     scopes:
       admin:read: lugeda kõiki andmeid serveril
       admin:read:accounts: lugeda privaatset informatsiooni kõikidel kontodel
+      admin:read:canonical_email_blocks: loe kõigi kanooniliste e-posti blokeeringute tundlikku infot
+      admin:read:domain_allows: loe kõigi domeenide lubade tundliku infot
+      admin:read:domain_blocks: loe kõigi domeenide blokeeringute tundlikku infot
+      admin:read:email_domain_blocks: loe kõigi e-posti blokeeringute tundlikku infot
+      admin:read:ip_blocks: loe kõigi IP-blokeeringute tundlikku infot
       admin:read:reports: lugeda privaatset informatsiooni kõikide teavituste ja teavitatud kasutajate kohta
       admin:write: muuta kõiki andmeid serveril
       admin:write:accounts: teostada moderaatori tegevusi kontodel
+      admin:write:canonical_email_blocks: modereeri kanoonilisi e-posti blokeeringuid
+      admin:write:domain_allows: modereeri domeeni lubasid
+      admin:write:domain_blocks: modereeri domeeni blokeeringuid
+      admin:write:email_domain_blocks: modereeri e-postidomeenide blokeeringuid
+      admin:write:ip_blocks: modereeri IP-blokeeringuid
       admin:write:reports: teostada moderaatori tegevusi teavitustel
+      crypto: kasuta otspunktkrüpeerimist
       follow: muuta kontode suhteid
       push: saada Teie teateid
       read: lugeda kogu Teie konto andmeid
@@ -133,12 +178,13 @@ et:
       read:notifications: näha Teie teateid
       read:reports: näha Teie teavitusi
       read:search: otsida Teie nimel
-      read:statuses: näha kõiki staatuseid
-      write: redigeerida kogu Teie konto andmeid
-      write:accounts: redigeerida Teie profiili
+      read:statuses: näha kõiki postitusi
+      write: muuta kogu konto andmeid
+      write:accounts: muuta profiili
       write:blocks: blokeerida kontosid ja domeene
-      write:bookmarks: lisada staatusele järjehoidjaid
-      write:favourites: lisada staatuseid lemmikuks
+      write:bookmarks: lisada postitusele järjehoidja
+      write:conversations: vaigista ja kustuta vestlused
+      write:favourites: lisada postitusi lemmikuks
       write:filters: luua filtreid
       write:follows: jälgida inimesi
       write:lists: luua nimekirju
@@ -146,4 +192,4 @@ et:
       write:mutes: vaigista inimesi ja vestluseid
       write:notifications: puhasta Teie teateid
       write:reports: teavitada teistest inimestest
-      write:statuses: avaldada staatuseid
+      write:statuses: avaldada postitusi
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 576ece002..12f6aaee0 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -60,8 +60,8 @@ eu:
       error:
         title: Errore bat gertatu da
       new:
-        able_to: Egin ahal izango du
-        prompt: "%{client_name} aplikazioak zure kontua atzitzea eskatu du"
+        prompt_html: "%{client_name} bezeroak zure kontura sartzeko baimena nahi du. Hirugarrengoen aplikazio bat da. <strong>Ez bazara fidatzen, ez zenuke baimendu behar.</strong>"
+        review_permissions: Berrikusi baimenak
         title: Baimena behar da
       show:
         title: Kopiatu baimen kode hau eta itsatsi aplikazioan.
@@ -71,10 +71,12 @@ eu:
       confirmations:
         revoke: Ziur zaude?
       index:
-        application: Aplikazioa
-        created_at: Baimenduta
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Irismena
+        authorized_at: "%{date} datan baimendua"
+        description_html: Aplikazio hauek zure kontura sarbidea dute APIa erabiliz. Ezagutzen ez duzun aplikazioren bat badago, edo aplikazio batek portaera desegokia badu, baimena kendu diezaiokezu.
+        last_used_at: Azkena %{date} datan erabilia
+        never_used: Inoiz erabili gabea
+        scopes: Baimenak
+        superapp: Barnekoa
         title: Zuk baimendutako aplikazioak
     errors:
       messages:
@@ -110,6 +112,33 @@ eu:
       authorized_applications:
         destroy:
           notice: Aplikazioa indargabetuta.
+    grouped_scopes:
+      access:
+        read: Bakarrik irakurtzeko sarbidea
+        read/write: Irakurtzeko eta idazteko baimena
+        write: Bakarrik idazteko sarbidea
+      title:
+        accounts: Kontuak
+        admin/accounts: Kontuen administrazioa
+        admin/all: Funtzio administratibo guztiak
+        admin/reports: Salaketen administrazioa
+        all: Dena
+        blocks: Blokeoak
+        bookmarks: Laster-markak
+        conversations: Elkarrizketak
+        crypto: Muturretik-muturrerako zifraketa
+        favourites: Gogokoak
+        filters: Iragazkiak
+        follow: Erlazioak
+        follows: Jarraipenak
+        lists: Zerrendak
+        media: Multimedia eranskinak
+        mutes: Mututzeak
+        notifications: Jakinarazpenak
+        push: Push jakinarazpenak
+        reports: Salaketak
+        search: Bilaketak
+        statuses: Bidalketak
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ eu:
       admin:write: zerbitzariko datu guztiak aldatu
       admin:write:accounts: kontuetan moderazio ekintzak burutu
       admin:write:reports: salaketetan moderazio ekintzak burutu
+      crypto: erabili muturretik muturrerako zifraketa
       follow: aldatu kontuaren erlazioak
       push: jaso push jakinarazpenak
       read: irakurri zure kontuko datu guztiak
@@ -143,6 +173,7 @@ eu:
       write:accounts: zure profila aldatzea
       write:blocks: kontuak eta domeinuak blokeatzea
       write:bookmarks: mezuen laster-marka
+      write:conversations: mututu eta ezabatu elkarrizketak
       write:favourites: gogoko mezuak
       write:filters: sortu iragazkiak
       write:follows: jarraitu jendea
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index bc86a064c..799f46945 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -29,7 +29,7 @@ fa:
       edit:
         title: ویرایش برنامه
       form:
-        error: اوخ! ببینید چیزی را اشتباهی در فرم وارد نکرده‌اید؟
+        error: اوخ! ببینید چیزی را اشتباهی در فرم وارد نکرده‌اید
       help:
         native_redirect_uri: برای آزمایش‌های محلی %{native_redirect_uri} را به کار ببرید
         redirect_uri: هر URI را در یک سطر جدا بنویسید
@@ -60,8 +60,8 @@ fa:
       error:
         title: خطایی رخ داد
       new:
-        able_to: اجازه خواهد داشت
-        prompt: برنامهٔ %{client_name} می‌خواهد به حساب شما دسترسی داشته باشد
+        prompt_html: "%{client_name} خواهان اجازه دسترسی به حساب کاربری شماست. <strong>اگر به آن اعتماد ندارید، نباید تاییدش کنید.</strong>"
+        review_permissions: بازبینی اجازه‌ها
         title: نیاز به اجازه دادن
       show:
         title: این کد مجوز را کپی کرده و در برنامه وارد کنید.
@@ -71,10 +71,12 @@ fa:
       confirmations:
         revoke: آیا مطمئن هستید؟
       index:
-        application: برنامه
-        created_at: مجازشده از
-        date_format: "%Y-%m-%d%H:%M:%S"
+        authorized_at: تایید شده در %{date}
+        description_html: اینها نرم‌افزار هایی هستند که می‌توانند به حساب کاربری شما با استفاده از رابط نرم‌افزاری دسترسی پیدا کنند. اگر نرم‌افزار های در اینجا هستند که نمی‌شناسید، یا نرم‌افزاری که رفتار مشکوک دارد، می‌توانید دسترسی اش را باطل کنید.
+        last_used_at: آخرین استفاده در %{date}
+        never_used: هرگز استفاده نشده
         scopes: اجازه‌ها
+        superapp: داخلی
         title: برنامه‌های مجاز
     errors:
       messages:
@@ -110,6 +112,33 @@ fa:
       authorized_applications:
         destroy:
           notice: برنامه فسخ شد.
+    grouped_scopes:
+      access:
+        read: فقط دسترسی خواندن
+        read/write: دسترسی خواندن و نوشتن
+        write: فقط دسترسی نوشتن
+      title:
+        accounts: حساب‌ها
+        admin/accounts: مدیریت حساب های کاربری
+        admin/all: تمامی عملکرد های مدیریتی
+        admin/reports: مدیریت بازخورد ها
+        all: همه چیز
+        blocks: مسدودها
+        bookmarks: نشانک‌ها
+        conversations: گفت‌وگوها
+        crypto: رمزگذاری سرتاسری
+        favourites: پسندیده‌ها
+        filters: پالایه‌ها
+        follow: ارتباطات
+        follows: پی‌گرفتگان
+        lists: سیاهه‌ها
+        media: پیوست‌های رسانه‌ای
+        mutes: خموش‌ها
+        notifications: آگاهی‌ها
+        push: آگاهی‌های ارسالی
+        reports: گزارش‌ها
+        search: جست‌وجو
+        statuses: فرسته‌ها
     layouts:
       admin:
         nav:
@@ -124,16 +153,17 @@ fa:
       admin:write: تغییر تمام داده‌ها روی کارساز
       admin:write:accounts: انجام کنش مدیریتی روی حساب‌ها
       admin:write:reports: انجام کنش مدیریتی روی گزارش‌ها
+      crypto: از رمزگذاری سرتاسر استفاده کنید
       follow: پیگیری، مسدودسازی، لغو مسدودسازی، و لغو پیگیری حساب‌ها
-      push: برای حساب خود اعلان‌های لحظه‌ای دریافت کنید
+      push: دریافت آگاهی‌ای ارسالیتان
       read: خواندن اطلاعات حساب شما
       read:accounts: دیدن اطّلاعات حساب
-      read:blocks: دیدن انسدادهایتان
+      read:blocks: دیدن مسدودهایتان
       read:bookmarks: دیدن نشانک‌هایتان
       read:favourites: دیدن برگزیده‌هایتان
       read:filters: دیدن پالایه‌هایتان
       read:follows: دیدن پی‌گیری‌هایتان
-      read:lists: دیدن فهرست‌هایتان
+      read:lists: دیدن سیاهه‌هایتان
       read:mutes: دیدن خموشی‌هایتان
       read:notifications: دیدن آگاهی‌هایتان
       read:reports: دیدن گزارش‌هایتان
@@ -143,10 +173,11 @@ fa:
       write:accounts: تغییر نمایه‌تان
       write:blocks: انسداد حساب‌ها و دامنه‌ها
       write:bookmarks: نشانک‌گذاری وضعیت‌ها
+      write:conversations: مکالمات را بی‌صدا و حذف کنید
       write:favourites: برگزیدن وضعیت‌ها
       write:filters: ایحاد پالایش‌ها
       write:follows: پی‌گیری افراد
-      write:lists: ایجاد فهرست‌ها
+      write:lists: ایجاد سیاهه‌ها
       write:media: بارگذاری پرونده‌های رسانه
       write:mutes: خموش کردن افراد و گفت‌وگوها
       write:notifications: پام‌سازی آگاهی‌هایتان
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index d095b0f93..5efa63bc9 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -60,8 +60,8 @@ fi:
       error:
         title: Tapahtui virhe
       new:
-        able_to: Se voi
-        prompt: Sovellus %{client_name} pyytää lupaa käyttää tiliäsi
+        prompt_html: "%{client_name} pyytää lupaa käyttää tiliäsi. Se on kolmannen osapuolen sovellus. <strong>Jos et luota siihen, sinun ei pitäisi sallia sitä.</strong>"
+        review_permissions: Tarkista käyttöoikeudet
         title: Valtuutus vaaditaan
       show:
         title: Kopioi tämä valtuutuskoodi ja liitä se sovellukseen.
@@ -71,10 +71,12 @@ fi:
       confirmations:
         revoke: Oletko varma?
       index:
-        application: Sovellus
-        created_at: Valtuutettu
-        date_format: "%d/%m/%Y %H:%M:%S"
+        authorized_at: Valtuutettu %{date}
+        description_html: Nämä ovat sovelluksia, jotka voivat käyttää tiliäsi käyttäen API. Jos et tunnista sitä tai sovellus toimii väärin, voit peruuttaa sen käyttöoikeuden.
+        last_used_at: Viimeksi käytetty %{date}
+        never_used: Ei käytetty
         scopes: Oikeudet
+        superapp: Sisäinen
         title: Valtuutetut sovellukset
     errors:
       messages:
@@ -110,6 +112,33 @@ fi:
       authorized_applications:
         destroy:
           notice: Sovellus peruttu.
+    grouped_scopes:
+      access:
+        read: Vain luku
+        read/write: Luku- ja kirjoitusoikeudet
+        write: Vain kirjoitus
+      title:
+        accounts: Tilit
+        admin/accounts: Tilien hallinta
+        admin/all: Kaikki hallinnolliset toiminnot
+        admin/reports: Raporttien hallinta
+        all: Kaikki
+        blocks: Torjutut
+        bookmarks: Kirjanmerkit
+        conversations: Keskustelut
+        crypto: Päästä päähän -salaus
+        favourites: Suosikit
+        filters: Suodattimet
+        follow: Liitokset
+        follows: Seuraa
+        lists: Listat
+        media: Medialiitteet
+        mutes: Mykistykset
+        notifications: Ilmoitukset
+        push: Push-ilmoitukset
+        reports: Raportit
+        search: Hae
+        statuses: Viestit
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ fi:
       admin:write: muokata kaikkia tietoja palvelimella
       admin:write:accounts: suorita moderointitoiminnot tileillä
       admin:write:reports: suorita moderointitoiminnot raporteissa
+      crypto: käytä päästä päähän salausta
       follow: seurata, estää, perua eston ja lopettaa tilien seuraaminen
       push: vastaanottaa push-ilmoituksesi
       read: lukea tilin tietoja
@@ -143,6 +173,7 @@ fi:
       write:accounts: muokata profiiliasi
       write:blocks: estää tilit ja palvelimet
       write:bookmarks: kirjanmerkki viestit
+      write:conversations: mykistä ja poistaa keskustelut
       write:favourites: suosikki viestit
       write:filters: luoda suodattimia
       write:follows: seurata ihmisiä
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
new file mode 100644
index 000000000..71fa73a0f
--- /dev/null
+++ b/config/locales/doorkeeper.fo.yml
@@ -0,0 +1,195 @@
+---
+fo:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Navnið á forritinum
+        redirect_uri: URL víðarisending
+        scopes: Karmar
+        website: Netsíðan hjá forritinum
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: kann ikki innihalda eitt petti.
+              invalid_uri: má vera eiitt gildugt URL.
+              relative_uri: má vera eitt treytaleyst URL.
+              secured_uri: má vera eitt HTTPS/SSL URI.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Heimila
+        cancel: Angra
+        destroy: Oyðilegg
+        edit: Rætta
+        submit: Send avstað
+      confirmations:
+        destroy: Ert tú vís/ur?
+      edit:
+        title: Broyt forrit
+      form:
+        error: Ups! Kanna frymilin fyri møguligar feilir
+      help:
+        native_redirect_uri: Nýt %{native_redirect_uri} til lokalar nároyndir
+        redirect_uri: Nýt eina linju fyri hvørt URI
+        scopes: Atskil valmøguleikarnar við millumrúmum. Um standard vælmøguleikar verða valdir, lat so millumrúm verða í.
+      index:
+        application: Skipan
+        callback_url: Afturkallingar URL
+        delete: Strika
+        empty: T´´u hevur onga skipan.
+        name: Navn
+        new: Nýggj skipan
+        scopes: Møguleikar
+        show: Vís
+        title: Tínar skipanir
+      new:
+        title: Nýggj skipan
+      show:
+        actions: Skipan
+        application_id: Kunda lykil
+        callback_urls: Afturkallingar URL'ir
+        scopes: Møguleikar
+        secret: Kunda loyndir
+        title: 'Skipan: %{name}'
+    authorizations:
+      buttons:
+        authorize: Heimila
+        deny: Nokta
+      error:
+        title: Ein feilur er íkomin
+      new:
+        prompt_html: "%{client_name} kundi hugsa sær atgongd til tína kontu. Tað er ein triðjaparts-nýtsluskipan. <strong>Tú skal ikki geva henni hesa heimld, um tú ikki hevur álit á henni.</strong>"
+        review_permissions: Eftirkanna rættindi
+        title: Váttan kravd
+      show:
+        title: Kopiera hesa váttanarkodu og líma hana í nýtsluskipanini.
+    authorized_applications:
+      buttons:
+        revoke: Tak aftur
+      confirmations:
+        revoke: Ert tú vís/ur?
+      index:
+        authorized_at: Váttað tann %{date}
+        description_html: Hetta eru nýtsluskipaninar, sum hava atgongd til tína kontu umvegis API'ið. Tú kanst taka loyvið aftur, um tað eru nýtsluskipanir, ið tú ikki kennir aftur ella sum ikki skikka sær, sum tær eiga.
+        last_used_at: Seinast brúkt tann %{date}
+        never_used: Ongantíð brúkt/ur
+        scopes: Loyvi
+        superapp: Innanhýsis
+        title: Tínar váttaðu nýtsluskipanir
+    errors:
+      messages:
+        access_denied: Tilfarseigarin ella váttanarambætarin noktaðu umbønina.
+        credential_flow_not_configured: Resource Owner Password Credentials floymurin eydnaðist ikki. Orsøkin var, at Doorkeeper.configure.resource_owner_from_credentials var ikki sett upp.
+        invalid_client: Viðskiftaraváttan miseydnaðist. Orsøkin var ein ókendur viðskiftari, at eingin viðskiftaraváttan var við ella at váttanarmannagongdin er ókend.
+        invalid_grant: Veitta váttanarheimildin er antin ógildug, útgingin, tikin aftur, samsvarar ikki við endursendingar-URI'ið, sum bleiv brúkt í váttanarumbønini ella var flýggjað øðrum viðskiftara.
+        invalid_redirect_uri: Endursendingar-URI'ið, sum var viðheft, er ógyldugt.
+        invalid_request:
+          missing_param: 'Manglandi kravdur parametur: %{value}.'
+          request_not_authorized: Umbønin má váttast. Kravdi parameturin fyri váttanarumbønina manglar ella er ógyldugur.
+          unknown: Umbønin manglar ein kravdan parametur, inniheldur eitt óstuðlað parametur-virði ella hevur skeivt skap.
+        invalid_resource_owner: Veitta tilfarseigaraváttanin er ógyldug ella ber ikki til at finna tilfarseigaran
+        invalid_scope: Umbidna vavið er ógyldugt, ókent ella hevur skeivt skap.
+        invalid_token:
+          expired: Atgongdarfrámerkið er útgingið
+          revoked: Atgongdarfrámerkið varð tikið aftur
+          unknown: Atgongdarfrámerkið er ógyldugt
+        resource_owner_authenticator_not_configured: Av tí at Doorkeeper.configure.resource_owner_authenticator ikki var sett upp, bar ikki til at finna tilfarseigaran.
+        server_error: Váttnarambætarin rendi seg í eina óvæntaða støðu, sum forðaði honum í at fullføra umbønina.
+        temporarily_unavailable: Váttanarambætarain er í løtuni ikki førur fyri at handfara umbønina vegna bráðfeingis ovbyrjan ella ambætaraviðlíkahald.
+        unauthorized_client: Viðskiftarin hevur ikki rættindi at útføra hesa umbønina við hesi mannagongdini.
+        unsupported_grant_type: Váttanarloyvisslagið er ikki stuðlað av váttanarambætaranum.
+        unsupported_response_type: Váttanarambætarin stuðlar ikki hesum slagnum av svari.
+    flash:
+      applications:
+        create:
+          notice: Nýtsluskipan stovnað.
+        destroy:
+          notice: Nýtsluskipan strikað.
+        update:
+          notice: Nýtsluskipan dagførd.
+      authorized_applications:
+        destroy:
+          notice: Nýtsluskipan tikin aftur.
+    grouped_scopes:
+      access:
+        read: Lesi-rættindir
+        read/write: Lesi- og skrivi-rættindir
+        write: Skrivi-rættindir
+      title:
+        accounts: Kontur
+        admin/accounts: Umsiting av kontum
+        admin/all: Allar umsitingarligar funktiónir
+        admin/reports: Umsiting av meldingum
+        all: Alt
+        blocks: Blokeringar
+        bookmarks: Bókamerki
+        conversations: Samrøður
+        crypto: Enda-til-enda bronglan
+        favourites: Yndispostar
+        filters: Filtur
+        follow: Sambond
+        follows: Fylgir
+        lists: Listar
+        media: Viðfestir miðlar
+        mutes: Doyvir
+        notifications: Fráboðanir
+        push: Skumpifráboðanir
+        reports: Meldingar
+        search: Leita
+        statuses: Uppsløg
+    layouts:
+      admin:
+        nav:
+          applications: Nýtsluskipanir
+          oauth2_provider: OAuth2 veitari
+      application:
+        title: OAuth váttan kravd
+    scopes:
+      admin:read: les allar dátur á ambætaranum
+      admin:read:accounts: les viðkvæmar upplýsingar úr øllum kontum
+      admin:read:canonical_email_blocks: les viðkvæmar upplýsingar frá øllum fyrimyndarligum teldupostblokeringum
+      admin:read:domain_allows: les viðkvæmar upplýsingar frá øllum loyvdum navnaøkjum
+      admin:read:domain_blocks: les viðkvæmar upplýsingar frá øllum navnaøkjablokeringum
+      admin:read:email_domain_blocks: les viðkvæmar upplýsingar frá øllum telduposta-navnaøkjablokeringum
+      admin:read:ip_blocks: les viðkvæmar upplýsingar frá øllum IP blokeringum
+      admin:read:reports: les viðkvæmar upplýsingar um allar meldingar og meldaðar kontur
+      admin:write: broyta allar dátur á ambætaranum
+      admin:write:accounts: útinna kjakleiðsluatgerðir á kontum
+      admin:write:canonical_email_blocks: før umsjón við øllum fyrimyndarligum teldupostablokeringum
+      admin:write:domain_allows: før umsjón á loyvdum navnaøkjum
+      admin:write:domain_blocks: før umsjón á navnaøkjablokeringum
+      admin:write:email_domain_blocks: før umsjón á telduposta-navnaøkjablokeringum
+      admin:write:ip_blocks: før umsjón á IP blokeringum
+      admin:write:reports: útinna kjakleiðsluatgerðir á meldingum
+      crypto: brúka enda-til-enda bronglan
+      follow: broyta viðurskifti millum kontur
+      push: móttaka tínar skumpifráboðanir
+      read: lesa allar dátur í tíni kontu
+      read:accounts: vís kontuupplýsingar
+      read:blocks: síggja tínar blokeringar
+      read:bookmarks: síggja tíni bókamerki
+      read:favourites: síggja tínar yndispostar
+      read:filters: síggja tíni filtur
+      read:follows: síggja hvørji tú fylgir
+      read:lists: síggja tínar listar
+      read:mutes: síggja tínar doyvingar
+      read:notifications: síggja tínar fráboðanir
+      read:reports: síggja tínar meldingar
+      read:search: leita vegna teg
+      read:statuses: síggja allar postar
+      write: broyta allar dátur í tínari kontu
+      write:accounts: broyt vangamyndina
+      write:blocks: blokera kontur og domenir
+      write:bookmarks: bókamerkja postar
+      write:conversations: doyva og strika samrøður
+      write:favourites: yndismerkja postar
+      write:filters: gera filtur
+      write:follows: fylgja fólki
+      write:lists: gera listar
+      write:media: leggja miðlafílur upp
+      write:mutes: doyva fólk og samrøður
+      write:notifications: nullstilla tínar fráboðanir
+      write:reports: melda onnur fólk
+      write:statuses: útgeva postar
diff --git a/config/locales/doorkeeper.fr-QC.yml b/config/locales/doorkeeper.fr-QC.yml
new file mode 100644
index 000000000..073d5a0ee
--- /dev/null
+++ b/config/locales/doorkeeper.fr-QC.yml
@@ -0,0 +1,185 @@
+---
+fr-QC:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nom de l'application
+        redirect_uri: URI de redirection
+        scopes: Permissions
+        website: Site web de l’application
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ne peut pas contenir de fragment.
+              invalid_uri: doit être un URI valide.
+              relative_uri: doit être un URI absolue.
+              secured_uri: doit être un URI HTTP/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autoriser
+        cancel: Annuler
+        destroy: Détruire
+        edit: Modifier
+        submit: Envoyer
+      confirmations:
+        destroy: Êtes-vous sûr·e?
+      edit:
+        title: Modifier l’application
+      form:
+        error: Oups! Vérifiez votre formulaire pour des erreurs possibles
+      help:
+        native_redirect_uri: Utiliser %{native_redirect_uri} pour les tests locaux
+        redirect_uri: Utiliser une ligne par URI
+        scopes: Séparez les portées par des espaces. Laissez vide pour utiliser les portées par défaut.
+      index:
+        application: Application
+        callback_url: URL de retour d’appel
+        delete: Supprimer
+        empty: Vous n’avez pas d’application.
+        name: Nom
+        new: Nouvelle application
+        scopes: Permissions
+        show: Voir
+        title: Vos applications
+      new:
+        title: Nouvelle application
+      show:
+        actions: Actions
+        application_id: Clé du client
+        callback_urls: URL du retour d’appel
+        scopes: Permissions
+        secret: Secret du client
+        title: 'Application: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autoriser
+        deny: Refuser
+      error:
+        title: Une erreur est survenue
+      new:
+        prompt_html: "%{client_name} souhaite accéder à votre compte. Il s'agit d'une application tierce. <strong>Si vous ne lui faites pas confiance, vous ne devriez pas l'y autoriser.</strong>"
+        review_permissions: Examiner les autorisations
+        title: Autorisation requise
+      show:
+        title: Copiez ce code d’autorisation et collez-le dans l’application.
+    authorized_applications:
+      buttons:
+        revoke: Révoquer
+      confirmations:
+        revoke: Êtes-vous sûr·e?
+      index:
+        authorized_at: Autorisée le %{date}
+        description_html: Ces applications peuvent accéder à votre compte via l'API. Si vous voyez ici des applications que vous ne reconnaissez pas ou qui ne fonctionnent pas normalement, vous pouvez en révoquer les accès.
+        last_used_at: Dernière utilisation le %{date}
+        never_used: Jamais utilisée
+        scopes: Autorisations
+        superapp: Interne
+        title: Vos applications autorisées
+    errors:
+      messages:
+        access_denied: Le/la propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
+        credential_flow_not_configured: Le flux des identifiants du mot de passe du/de la propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
+        invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
+        invalid_grant: L’autorisation accordée est invalide, expirée, révoquée, ne concorde pas avec l’URI de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
+        invalid_redirect_uri: L’URI de redirection n’est pas valide.
+        invalid_request:
+          missing_param: 'Paramètre requis manquant: %{value}.'
+          request_not_authorized: La requête doit être autorisée. Le paramètre requis pour l'autorisation de la requête est manquant ou non valide.
+          unknown: La requête omet un paramètre requis, inclut une valeur de paramètre non prise en charge ou est autrement mal formée.
+        invalid_resource_owner: Les identifiants fournis par le propriétaire de la ressource ne sont pas valides ou le propriétaire de la ressource ne peut être trouvé
+        invalid_scope: La permission demandée est invalide, inconnue ou mal formée.
+        invalid_token:
+          expired: Le jeton d’accès a expiré
+          revoked: Le jeton d’accès a été révoqué
+          unknown: Le jeton d’accès n’est pas valide
+        resource_owner_authenticator_not_configured: La recherche du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_authenticator n’est pas configuré.
+        server_error: Le serveur d’autorisation a rencontré une condition inattendue l’empêchant de faire aboutir la requête.
+        temporarily_unavailable: Le serveur d’autorisation est actuellement incapable de traiter la requête à cause d’une surcharge ou d’une maintenance temporaire du serveur.
+        unauthorized_client: Le client n’est pas autorisé à effectuer cette requête à l’aide de cette méthode.
+        unsupported_grant_type: Le type de consentement d’autorisation n’est pas pris en charge par le serveur d’autorisation.
+        unsupported_response_type: Le serveur d’autorisation ne prend pas en charge ce type de réponse.
+    flash:
+      applications:
+        create:
+          notice: Application créée.
+        destroy:
+          notice: Application supprimée.
+        update:
+          notice: Application mise à jour.
+      authorized_applications:
+        destroy:
+          notice: Application révoquée.
+    grouped_scopes:
+      access:
+        read: Accès en lecture seule
+        read/write: Accès en lecture et écriture
+        write: Accès en écriture seule
+      title:
+        accounts: Comptes
+        admin/accounts: Gestion des comptes
+        admin/all: Toutes les fonctionnalités d'administration
+        admin/reports: Gestion des rapports
+        all: Tout
+        blocks: Bloqués
+        bookmarks: Marque-pages
+        conversations: Conversations
+        crypto: Chiffrement de bout-en-bout
+        favourites: Favoris
+        filters: Filtres
+        follow: Relations
+        follows: Abonnements
+        lists: Listes
+        media: Fichiers médias
+        mutes: Masqués
+        notifications: Notifications
+        push: Notifications push
+        reports: Signalements
+        search: Recherche
+        statuses: Messages
+    layouts:
+      admin:
+        nav:
+          applications: Applications
+          oauth2_provider: Fournisseur OAuth2
+      application:
+        title: Autorisation OAuth requise
+    scopes:
+      admin:read: lire toutes les données du serveur
+      admin:read:accounts: lire les informations sensibles de tous les comptes
+      admin:read:reports: lire les informations sensibles de tous les signalements et des comptes signalés
+      admin:write: modifier toutes les données sur le serveur
+      admin:write:accounts: effectuer des actions de modération sur les comptes
+      admin:write:reports: effectuer des actions de modération sur les signalements
+      crypto: utiliser le chiffrement de bout-en-bout
+      follow: modifier les relations du compte
+      push: recevoir vos notifications poussées
+      read: lire toutes les données de votre compte
+      read:accounts: voir les informations des comptes
+      read:blocks: voir vos blocages
+      read:bookmarks: voir vos marque-pages
+      read:favourites: voir vos favoris
+      read:filters: voir vos filtres
+      read:follows: voir vos abonnements
+      read:lists: voir vos listes
+      read:mutes: voir vos masquages
+      read:notifications: voir vos notifications
+      read:reports: voir vos signalements
+      read:search: rechercher en votre nom
+      read:statuses: voir tous les messages
+      write: modifier toutes les données de votre compte
+      write:accounts: modifier votre profil
+      write:blocks: bloquer des comptes et des domaines
+      write:bookmarks: mettre des messages en marque-pages
+      write:conversations: masquer et effacer les conversations
+      write:favourites: mettre des messages en favori
+      write:filters: créer des filtres
+      write:follows: suivre des personnes
+      write:lists: créer des listes
+      write:media: téléverser des fichiers média
+      write:mutes: masquer des comptes et des conversations
+      write:notifications: effacer vos notifications
+      write:reports: signaler d’autres personnes
+      write:statuses: publier des messages
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 6ebe93b9c..079842de3 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -3,8 +3,8 @@ fr:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Nom
-        redirect_uri: L’URL de redirection
+        name: Nom de l'application
+        redirect_uri: URI de redirection
         scopes: Étendues
         website: Site web de l’application
     errors:
@@ -60,8 +60,8 @@ fr:
       error:
         title: Une erreur est survenue
       new:
-        able_to: Cette application pourra
-        prompt: Autoriser %{client_name} à utiliser votre compte ?
+        prompt_html: "%{client_name} souhaite accéder à votre compte. Il s'agit d'une application tierce. <strong>Vous ne devriez pas l'y autoriser si vous ne lui faites pas confiance.</strong>"
+        review_permissions: Examiner les autorisations
         title: Autorisation requise
       show:
         title: Copiez ce code d’autorisation et collez-le dans l’application.
@@ -71,10 +71,12 @@ fr:
       confirmations:
         revoke: Voulez-vous vraiment faire ça ?
       index:
-        application: Application
-        created_at: Créé le
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Permissions
+        authorized_at: Autorisée le %{date}
+        description_html: Ces applications peuvent accéder à votre compte via l'API. Si vous voyez ici des applications que vous ne reconnaissez pas ou qui ne fonctionnent pas normalement, vous pouvez en révoquer les accès.
+        last_used_at: Dernière utilisation le %{date}
+        never_used: Jamais utilisée
+        scopes: Autorisations
+        superapp: Interne
         title: Vos applications autorisées
     errors:
       messages:
@@ -84,8 +86,8 @@ fr:
         invalid_grant: L’autorisation accordée est invalide, expirée, annulée, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
         invalid_redirect_uri: L’URL de redirection n’est pas valide.
         invalid_request:
-          missing_param: 'Parramètre requis manquant: %{value}.'
-          request_not_authorized: La requête doit être autorisée. Le paramètre requis pour la requête d'autorisation est manquant ou non valide.
+          missing_param: 'Paramètre requis manquant: %{value}.'
+          request_not_authorized: La requête doit être autorisée. Le paramètre requis pour l'autorisation de la requête est manquant ou non valide.
           unknown: La requête omet un paramètre requis, inclut une valeur de paramètre non prise en charge ou est autrement mal formée.
         invalid_resource_owner: Les identifiants fournis par le propriétaire de la ressource ne sont pas valides ou le propriétaire de la ressource ne peut être trouvé
         invalid_scope: La permission demandée est invalide, inconnue ou mal formée.
@@ -110,6 +112,33 @@ fr:
       authorized_applications:
         destroy:
           notice: Application révoquée.
+    grouped_scopes:
+      access:
+        read: Accès en lecture seule
+        read/write: Accès en lecture et écriture
+        write: Accès en écriture seule
+      title:
+        accounts: Comptes
+        admin/accounts: Gestion des comptes
+        admin/all: Toutes les fonctionnalités d'administration
+        admin/reports: Gestion des rapports
+        all: Tout
+        blocks: Bloqués
+        bookmarks: Marque-pages
+        conversations: Conversations
+        crypto: Chiffrement de bout-en-bout
+        favourites: Favoris
+        filters: Filtres
+        follow: Relations
+        follows: Abonnements
+        lists: Listes
+        media: Fichiers médias
+        mutes: Masqués
+        notifications: Notifications
+        push: Notifications push
+        reports: Signalements
+        search: Recherche
+        statuses: Messages
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ fr:
     scopes:
       admin:read: lire toutes les données du serveur
       admin:read:accounts: lire les informations sensibles de tous les comptes
+      admin:read:canonical_email_blocks: lire les informations sensibles de tous les bloqueurs d'e-mails canoniques
+      admin:read:domain_allows: lire les informations sensibles de tous les domaines autorisés
+      admin:read:domain_blocks: lire les informations sensibles de tous les blocqueurs de domaines
+      admin:read:email_domain_blocks: lire les informations sensibles de tous les blocqueurs d'e-mails de domaines
+      admin:read:ip_blocks: lire les informations sensibles de tous les blocqueurs d'IP
       admin:read:reports: lire les informations sensibles de tous les signalements et des comptes signalés
       admin:write: modifier toutes les données sur le serveur
       admin:write:accounts: effectuer des actions de modération sur les comptes
+      admin:write:canonical_email_blocks: effectuer des actions de modération sur les bloqueurs d'e-mails canoniques
+      admin:write:domain_allows: effectuer des actions de modération sur les autorisations de domaines
+      admin:write:domain_blocks: effectuer des actions de modération sur des bloqueurs de domaines
+      admin:write:email_domain_blocks: effectuer des actions de modération sur des bloqueurs d'e-mails de domaines
+      admin:write:ip_blocks: effectuer des actions de modération sur des bloqueurs d'IP
       admin:write:reports: effectuer des actions de modération sur les signalements
+      crypto: utiliser le chiffrement de bout-en-bout
       follow: modifier les relations du compte
       push: recevoir vos notifications poussées
       read: lire toutes les données de votre compte
@@ -138,12 +178,13 @@ fr:
       read:notifications: voir vos notifications
       read:reports: voir vos signalements
       read:search: rechercher en votre nom
-      read:statuses: voir tous les statuts
+      read:statuses: voir tous les messages
       write: modifier toutes les données de votre compte
       write:accounts: modifier votre profil
       write:blocks: bloquer des comptes et des domaines
-      write:bookmarks: statuts des marque-pages
-      write:favourites: mettre des statuts en favori
+      write:bookmarks: mettre des messages en marque-pages
+      write:conversations: masquer et effacer les conversations
+      write:favourites: mettre des messages en favori
       write:filters: créer des filtres
       write:follows: suivre des personnes
       write:lists: créer des listes
@@ -151,4 +192,4 @@ fr:
       write:mutes: masquer des comptes et des conversations
       write:notifications: effacer vos notifications
       write:reports: signaler d’autres personnes
-      write:statuses: publier des statuts
+      write:statuses: publier des messages
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
new file mode 100644
index 000000000..06f7e901f
--- /dev/null
+++ b/config/locales/doorkeeper.fy.yml
@@ -0,0 +1,185 @@
+---
+fy:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Tapassingsnamme
+        redirect_uri: Redirect-URI
+        scopes: Tastimmingen
+        website: Tapassingswebsite
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: mei gjin fragmint befetsje.
+              invalid_uri: moat in jildige URI wêze.
+              relative_uri: moat in absolute URI wêze.
+              secured_uri: moat in HTTPS/SSL-URI wêze.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autorisearje
+        cancel: Annulearje
+        destroy: Ferneatigje
+        edit: Bewurkje
+        submit: Yntsjinje
+      confirmations:
+        destroy: Bisto wis?
+      edit:
+        title: Tapassing bewurkje
+      form:
+        error: Oeps! Kontrolearje it formulier op flaters
+      help:
+        native_redirect_uri: Brûk %{native_redirect_uri} foar lokale tests
+        redirect_uri: Brûk ien rigel per URI
+        scopes: Tastimmingen mei spaasjes fan inoar skiede. Lit leech om de standerttastimmingen te brûken.
+      index:
+        application: Tapassing
+        callback_url: Callback-URL
+        delete: Fuortsmite
+        empty: Do hast gjin tapassingen konfigurearre.
+        name: Namme
+        new: Nije tapassing
+        scopes: Tastimmingen
+        show: Toane
+        title: Dyn tapassingen
+      new:
+        title: Nije tapassing
+      show:
+        actions: Aksjes
+        application_id: Client-kaai
+        callback_urls: Callback-URL’s
+        scopes: Tastimmingen
+        secret: Client-geheim
+        title: 'Tapassing: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autorisearje
+        deny: Wegerje
+      error:
+        title: Der is in flater bard
+      new:
+        prompt_html: "%{client_name} hat tastimming nedich om tagong te krijen ta dyn account. It giet om in tapassing fan in tredde partij.<strong>Asto dit net fertroust, moatsto gjin tastimming jaan.</strong>"
+        review_permissions: Tastimmingen beoardiele
+        title: Autorisaasje fereaske
+      show:
+        title: Kopiearje dizze autorisaasjekoade en plak it yn de tapassing.
+    authorized_applications:
+      buttons:
+        revoke: Ynlûke
+      confirmations:
+        revoke: Bisto wis?
+      index:
+        authorized_at: Autorisearre op %{date}
+        description_html: Dit binne tapassingen dy’t tagong hawwe ta dyn account fia de API. As der tapassingen tusken steane dy’tsto net werkenst of in tapassing harren misdraacht, kinsto de tagongsrjochten fan de tapassing ynlûke.
+        last_used_at: Lêst brûkt op %{date}
+        never_used: Nea brûkt
+        scopes: Tastimmingen
+        superapp: Yntern
+        title: Dyn autorisearre tapassingen
+    errors:
+      messages:
+        access_denied: De boarne-eigener of autorisaasjeserver hat it fersyk wegere.
+        credential_flow_not_configured: De wachtwurdgegevens-flow fan de boarne-eigener is mislearre, omdat Doorkeeper.configure.resource_owner_from_credentials net ynsteld is.
+        invalid_client: Clientferifikaasje is mislearre troch in ûnbekende client, ûntbrekkende client-autentikaasje of in net stipe autentikaasjemetoade.
+        invalid_grant: De opjûne autorisaasje is ûnjildich, ferrûn, ynlutsen, komt net oerien mei de redirect-URI dy’t opjûn is of útjûn waard oan in oere client.
+        invalid_redirect_uri: De opjûne redirect-URI is ûnjildich.
+        invalid_request:
+          missing_param: 'Untbrekkende fereaske parameter: %{value}.'
+          request_not_authorized: It fersyk moat autorisearre wurde. De fereaske parameter foar it autorisaasjefersyk ûntbrekt of is ûnjildich.
+          unknown: It fersyk mist in fereaske parameter, befettet in net-stipe parameterwearde of is op in oare manier net krekt.
+        invalid_resource_owner: De opjûne boarne-eigenersgegevens binne ûnjildich of de boarne-eigener kin net fûn wurde
+        invalid_scope: De opfrege tastimming is ûnjildich, ûnbekend of net krekt.
+        invalid_token:
+          expired: Tagongskoade ferrûn
+          revoked: Tagongskoade ynlutsen
+          unknown: Tagongskoade ûnjildich
+        resource_owner_authenticator_not_configured: It opsykjen fan de boarne-eigener is mislearre, omdat Doorkeeper.configure.resource_owner_authenticator net ynsteld is.
+        server_error: De autorisaasjeserver is in ûnferwachte situaasje tsjinkaam dy’t it fersyk behindere.
+        temporarily_unavailable: De autorisaasjeserver is op dit stuit net yn steat it fersyk te behanneljen as gefolch fan in tydlike oerbelêsting of ûnderhâld oan de server.
+        unauthorized_client: De client is net autorisearre om dit fersyk op dizze manier út te fieren.
+        unsupported_grant_type: It type autorisaasje wurdt net troch de autorisaasjeserver stipe.
+        unsupported_response_type: De autorisaasjeserver stipet dit antwurdtype net.
+    flash:
+      applications:
+        create:
+          notice: Tapassing oanmakke.
+        destroy:
+          notice: Tapassing fuortsmiten.
+        update:
+          notice: Tapassing bewurke.
+      authorized_applications:
+        destroy:
+          notice: Tapassing ynlutsen.
+    grouped_scopes:
+      access:
+        read: Allinnich-lêze-tagong
+        read/write: Lês- en skriuwtagong
+        write: Allinnich skriuwtagong
+      title:
+        accounts: Accounts
+        admin/accounts: Accountbehear
+        admin/all: Alle behearfunksjes
+        admin/reports: Rapportaazjebehear
+        all: Alles
+        blocks: Blokkearje
+        bookmarks: Blêdwizers
+        conversations: Petearen
+        crypto: End-to-end-fersifering
+        favourites: Favoriten
+        filters: Filters
+        follow: Relaasjes
+        follows: Folgjend
+        lists: Listen
+        media: Mediabylagen
+        mutes: Negearre
+        notifications: Meldingen
+        push: Pushmeldingen
+        reports: Rapportaazjes
+        search: Sykje
+        statuses: Berjochten
+    layouts:
+      admin:
+        nav:
+          applications: Tapassingen
+          oauth2_provider: OAuth2-provider
+      application:
+        title: OAuth-autorisaasje fereaske
+    scopes:
+      admin:read: alle gegevens op de server lêze
+      admin:read:accounts: gefoelige ynformaasje fan alle accounts lêze
+      admin:read:reports: gefoelige ynformaasje fan alle rapportaazjes en rapportearre accounts lêze
+      admin:write: wizigje alle gegevens op de server
+      admin:write:accounts: moderaasjemaatregelen tsjin accounts nimme
+      admin:write:reports: moderaasjemaatregelen nimme yn rapportaazjes
+      crypto: end-to-end-encryptie brûke
+      follow: relaasjes tusken accounts bewurkje
+      push: dyn pushmeldingen ûntfange
+      read: alle gegevens fan dyn account lêze
+      read:accounts: accountynformaasje besjen
+      read:blocks: dyn blokkearre brûkers besjen
+      read:bookmarks: dyn blêdwizers besjen
+      read:favourites: dyn favoriten besjen
+      read:filters: dyn filters besjen
+      read:follows: de accounts dy’tsto folgest besjen
+      read:lists: dyn listen besjen
+      read:mutes: dyn negearre brûkers besjen
+      read:notifications: dyn meldingen besjen
+      read:reports: dyn rapportearre berjochten besjen
+      read:search: út dyn namme sykje
+      read:statuses: alle berjochten besjen
+      write: alle gegevens fan dyn account bewurkje
+      write:accounts: dyn profyl bewurkje
+      write:blocks: accounts en domeinen blokkearje
+      write:bookmarks: berjochten oan blêdwizers tafoegje
+      write:conversations: petearen negearre en fuortsmite
+      write:favourites: berjochten as favoryt markearje
+      write:filters: filters oanmeitsje
+      write:follows: minsken folgje
+      write:lists: listen oanmeitsje
+      write:media: mediabestannen oplade
+      write:mutes: minsken en petearen dôvje
+      write:notifications: meldingen fuortsmite
+      write:reports: oare minsken rapportearje
+      write:statuses: berjochten pleatse
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
new file mode 100644
index 000000000..6245e14aa
--- /dev/null
+++ b/config/locales/doorkeeper.ga.yml
@@ -0,0 +1,44 @@
+---
+ga:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Ainm feidhmchláir
+        redirect_uri: Atreoraigh URI
+        website: Suíomh gréasáin feidhmchláir
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Ceadaigh
+        cancel: Cealaigh
+        destroy: Scrios
+        edit: Cuir in eagar
+        submit: Cuir isteach
+      confirmations:
+        destroy: An bhfuil tú cinnte?
+      index:
+        delete: Scrios
+        name: Ainm
+        show: Taispeáin
+      show:
+        application_id: Eochair chliaint
+        secret: Rún cliaint
+        title: 'Ainm feidhmchláir: %{name}'
+    authorizations:
+      buttons:
+        deny: Diúltaigh
+    authorized_applications:
+      confirmations:
+        revoke: An bhfuil tú cinnte?
+    grouped_scopes:
+      title:
+        accounts: Cuntais
+        all: Gach Rud
+        bookmarks: Leabharmharcanna
+        conversations: Comhráite
+        favourites: Toghanna
+        filters: Scagairí
+        follows: Cuntais leanta
+        lists: Liostaí
+        notifications: Fógraí
+        statuses: Postálacha
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml
index 0ca8dfa23..6d4cbecfe 100644
--- a/config/locales/doorkeeper.gd.yml
+++ b/config/locales/doorkeeper.gd.yml
@@ -60,8 +60,8 @@ gd:
       error:
         title: Thachair mearachd
       new:
-        able_to: 'Seo na comasan a bhios air:'
-        prompt: Tha aplacaid %{client_name} ag iarraidh inntrigeadh dhan chunntas agad
+        prompt_html: Bu mhiann le %{client_name} cead gus an cunntas agad inntrigeadh. Seo aplacaid threas-phàrtaidh. <strong>Mur eil earbsa agad ann, na ùghdarraich e.</strong>
+        review_permissions: Thoir sùil air na ceadan
         title: Tha feum air ùghdarrachadh
       show:
         title: Dèan lethbhreac dhen chòd ùghdarrachaidh seo ’s cuir san aplacaid e.
@@ -71,10 +71,12 @@ gd:
       confirmations:
         revoke: A bheil thu cinnteach?
       index:
-        application: Aplacaid
-        created_at: Ceadaichte
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Sgòpaichean
+        authorized_at: Air ùghdarrachadh %{date}
+        description_html: Seo na h-aplacaidean as urrainn dhaibh an cunntas agad inntrigeadh leis an API. Ma tha aplacaid an-seo nach aithne dhut no ma tha droch-ghiùlan air aplacaid, ’s urrainn dhut an t-inntrigeadh aice a chùl-ghairm.
+        last_used_at: Air a chleachdadh %{date} an turas mu dheireadh
+        never_used: Cha deach a chleachdadh a-riamh
+        scopes: Ceadan
+        superapp: Inntearnail
         title: Na h-aplacaidean ùghdarraichte agad
     errors:
       messages:
@@ -110,6 +112,33 @@ gd:
       authorized_applications:
         destroy:
           notice: Chaidh an t-iarrtas a chùl-ghairm.
+    grouped_scopes:
+      access:
+        read: Inntrigeadh leughaidh a-mhàin
+        read/write: Inntrigeadh leughaidh is sgrìobhaidh
+        write: Inntrigeadh sgrìobhaidh a-mhàin
+      title:
+        accounts: Cunntasan
+        admin/accounts: Rianachd nan cunntas
+        admin/all: Gach gleus na rianachd
+        admin/reports: Rianachd nan gearan
+        all: A h-uile rud
+        blocks: Bacaidhean
+        bookmarks: Comharran-lìn
+        conversations: Còmhraidhean
+        crypto: Crioptachadh o cheann gu ceann
+        favourites: Annsachdan
+        filters: Criathragan
+        follow: Dàimhean
+        follows: Leantainn
+        lists: Liostaichean
+        media: Ceanglachain mheadhanan
+        mutes: Mùchaidhean
+        notifications: Brathan
+        push: Brathan putaidh
+        reports: Gearanan
+        search: Lorg
+        statuses: Postaichean
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ gd:
       admin:write: dàta sam bith atharrachadh air an fhrithealaiche
       admin:write:accounts: gnìomhan na maorsainneachd a ghabhail air cunntasan
       admin:write:reports: gnìomhan na maorsainneachd a ghabhail air gearanan
+      crypto: crioptachadh o cheann gu ceann a chleachdadh
       follow: dàimhean chunntasan atharrachadh
       push: na brathan putaidh agad fhaighinn
       read: dàta sam bith a’ cunntais agad a leughadh
@@ -132,7 +162,7 @@ gd:
       read:bookmarks: na comharran-lìn agad fhaicinn
       read:favourites: na h-annsachdan agad fhaicinn
       read:filters: na criathragan agad fhaicinn
-      read:follows: faicinn cò air a tha thu a’ leantainn
+      read:follows: faicinn cò a tha thu a’ leantainn
       read:lists: na liostaichean agad fhaicinn
       read:mutes: na mùchaidhean agad fhaicinn
       read:notifications: na brathan agad faicinn
@@ -143,9 +173,10 @@ gd:
       write:accounts: a’ phròifil agad atharrachadh
       write:blocks: cunntasan is àrainnean a bhacadh
       write:bookmarks: comharran-lìn a dhèanamh de phostaichean
+      write:conversations: còmhraidhean a mhùchadh is a sguabadh às
       write:favourites: postaichean a chur ris na h-annsachdan
       write:filters: criathragan a chruthachadh
-      write:follows: leantainn air daoine
+      write:follows: leantainn dhaoine
       write:lists: liostaichean a chruthachadh
       write:media: faidhlichean meadhain a luchdadh suas
       write:mutes: daoine is còmhraidhean a mhùchadh
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index dd2071639..b71df1c77 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -60,8 +60,8 @@ gl:
       error:
         title: Algo fallou
       new:
-        able_to: Poderá
-        prompt: A aplicación %{client_name} solicita acceso a túa conta
+        prompt_html: "%{client_name} solicita permiso para acceder á túa conta. É unha aplicación de terceiros. <strong>Se non confías nela, non deberías autorizala.</strong>"
+        review_permissions: Revisar permisos
         title: Autorización necesaria
       show:
         title: Copia este código de autorización e pégao na aplicación.
@@ -71,10 +71,12 @@ gl:
       confirmations:
         revoke: Estás segura?
       index:
-        application: Aplicación
-        created_at: Autorizado
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Ámbitos
+        authorized_at: Autorizada o %{date}
+        description_html: Estas aplicacións poden acceder á túa conta usando a API. Se ves aplicacións que non recoñeces, ou hai comportamentos non consentidos dalgunha delas, podes revogar o acceso.
+        last_used_at: Último acceso o %{date}
+        never_used: Nunca usada
+        scopes: Permisos
+        superapp: Interno
         title: As túas aplicacións autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ gl:
       authorized_applications:
         destroy:
           notice: Aplicación revogada.
+    grouped_scopes:
+      access:
+        read: Acceso de só-lectura
+        read/write: Acceso de lectura e escritura
+        write: Acceso de só-escritura
+      title:
+        accounts: Contas
+        admin/accounts: Administración das contas
+        admin/all: Tódalas funcións administrativas
+        admin/reports: Administración das denuncias
+        all: Todo
+        blocks: Bloqueos
+        bookmarks: Marcadores
+        conversations: Conversas
+        crypto: Cifrado extremo-a-extremo
+        favourites: Favoritas
+        filters: Filtros
+        follow: Relacións
+        follows: Seguimentos
+        lists: Listas
+        media: Anexos multimedia
+        mutes: Acaladas
+        notifications: Notificacións
+        push: Notificacións Push
+        reports: Denuncias
+        search: Busca
+        statuses: Publicacións
     layouts:
       admin:
         nav:
@@ -120,17 +149,28 @@ gl:
     scopes:
       admin:read: ler todos os datos no servidor
       admin:read:accounts: ler información sensible de todas as contas
+      admin:read:canonical_email_blocks: ler a información sensible de tódolos bloqueos de email canónicos
+      admin:read:domain_allows: ler a información sensible de tódolos dominios permitidos
+      admin:read:domain_blocks: ler a información sensible de tódolos bloqueos de dominio
+      admin:read:email_domain_blocks: ler a información sensible de tódolos dominios de email
+      admin:read:ip_blocks: ler a información sensible de tódolos bloqueos de IP
       admin:read:reports: ler información sensible de todos os informes e contas denunciadas
       admin:write: modificar todos os datos no servidor
       admin:write:accounts: executar accións de moderación nas contas
+      admin:write:canonical_email_blocks: realizar accións de moderación en bloqueos de email canónicos
+      admin:write:domain_allows: realizar accións de moderación en dominios permitidos
+      admin:write:domain_blocks: realizar accións de moderación en bloqueos de dominio
+      admin:write:email_domain_blocks: realizar accións de moderación en bloqueos de dominio de email
+      admin:write:ip_blocks: realizar accións de moderación en bloqueos de IPs
       admin:write:reports: executar accións de moderación nas denuncias
+      crypto: usar cifrado extremo-a-extremo
       follow: modificar as relacións da conta
       push: recibir notificacións push
       read: ler todos os datos da tua conta
       read:accounts: ver información das contas
       read:blocks: ver a quen bloqueas
       read:bookmarks: ver os marcadores
-      read:favourites: ver os favoritos
+      read:favourites: ver as favoritas
       read:filters: ver os filtros
       read:follows: ver a quen segues
       read:lists: ver as tuas listaxes
@@ -138,12 +178,13 @@ gl:
       read:notifications: ver as notificacións
       read:reports: ver as túas denuncias
       read:search: buscar no teu nome
-      read:statuses: ver todos os estados
+      read:statuses: ver todas as publicacións
       write: modificar todos os datos da tua conta
       write:accounts: modificar o teu perfil
       write:blocks: bloquear contas e dominios
-      write:bookmarks: marcar os estados
-      write:favourites: estados favoritos
+      write:bookmarks: marcar publicacións
+      write:conversations: acalar e eliminar conversas
+      write:favourites: marcar como favorita
       write:filters: crear filtros
       write:follows: seguir usuarias
       write:lists: crear listaxes
@@ -151,4 +192,4 @@ gl:
       write:mutes: acalar usuarias e conversas
       write:notifications: eliminar as notificacións
       write:reports: denunciar usuarias
-      write:statuses: publicar estados
+      write:statuses: publicar
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 987ce2200..3e25e637f 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -3,7 +3,7 @@ he:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: שם
+        name: שם יישום
         redirect_uri: קישורית הפניה
         scopes: תחומים
         website: אתר יישום
@@ -38,6 +38,7 @@ he:
         application: יישום
         callback_url: כתובת גישה חוזרת (Callback URL)
         delete: למחוק
+        empty: אין לך אפליקציות.
         name: שם
         new: ישום חדש
         scopes: תחומים
@@ -48,7 +49,7 @@ he:
       show:
         actions: פעולות
         application_id: זהות ישום
-        callback_urls: כתובות לקריאה חוזרת (Callback URLs)
+        callback_urls: קישורית Callback
         scopes: תחומים
         secret: סוד
         title: 'ישום: %{name}'
@@ -59,8 +60,8 @@ he:
       error:
         title: התרחשה שגיאה
       new:
-        able_to: יוכל
-        prompt: ישום %{client_name} מבקש גישה לחשבונך
+        prompt_html: "%{client_name} מעוניין בהרשאה לגשת לחשבונך. זוהי אפליקציית צד-שלישי. <strong>אם יש סיבה לא לבטוח בה, נא לא לאשר.</strong>"
+        review_permissions: עיון בהרשאות
         title: נדרשת הרשאה
       show:
         title: יש להעתיק את קוד ההרשאה הזה ולהדביקו ביישום שביקש אותו.
@@ -70,9 +71,12 @@ he:
       confirmations:
         revoke: בטוח?
       index:
-        application: ישום
-        created_at: מאושר
-        scopes: תחומים
+        authorized_at: אושר ב-%{date}
+        description_html: אלה אפליקציות שיכולות לגשת לחשבונך בעזרת הממשק. אם ישנן כאן אפליקציות שאינך מזהה, או אפליקציה שאינה פועלת כראוי, ניתן להסיר את הגישה שלה.
+        last_used_at: נראה לאחרונה ב-%{date}
+        never_used: מעולם לא היה בשימוש
+        scopes: הרשאות
+        superapp: פנימי
         title: ישומיך המאושרים
     errors:
       messages:
@@ -81,6 +85,10 @@ he:
         invalid_client: הרשאת הלקוח נכשלה עקב לקוח שאינו ידוע, חוסר בהרשאת לקוח או שיטת הרשאה שאינה נתמכת.
         invalid_grant: חוזה ההרשאה המצורף אינו חוקי, אינו תקף, מבוטל, או שאינו מתאים לקישורית ההפניה שבשימוש על ידי בקשת ההרשאה, או שהופק על ידי לקוח אחר.
         invalid_redirect_uri: קישורית ההפניה המצורפת אינה חוקית.
+        invalid_request:
+          missing_param: 'חסר פרמטר נדרש: %{value}.'
+          request_not_authorized: יש לאשר את הבקשה. פרמטר הנדרש על מנת לאשר את הבקשה חסר או לקוי.
+          unknown: הבקשה חסרה פרמטר נדרש, כוללת ערך שלא נתמך או לקויה בדרך אחרת.
         invalid_resource_owner: הרשאות בעלי המשאב שהוזנו אינן חוקיות, או שלא ניתן למצוא את בעלי המשאב
         invalid_scope: התחום המבוקש אינו חוקי, אינו ידוע, או שתצורותו שגויה.
         invalid_token:
@@ -104,6 +112,33 @@ he:
       authorized_applications:
         destroy:
           notice: הישום בוטל.
+    grouped_scopes:
+      access:
+        read: גישה לקריאה בלבד
+        read/write: גישה לקריאה ולכתיבה
+        write: גישה לכתיבה בלבד
+      title:
+        accounts: חשבונות
+        admin/accounts: חשבונות ניהול
+        admin/all: כל פעולות האדמין
+        admin/reports: ניהול דיווחים
+        all: הכל
+        blocks: חסימות
+        bookmarks: סימניות
+        conversations: שיחות
+        crypto: הצפנה מקצה לקצה
+        favourites: חיבובים
+        filters: מסננים
+        follow: יחסים
+        follows: נעקבים
+        lists: רשימות
+        media: קבצי מדיה מצורפים
+        mutes: השתקות
+        notifications: התראות
+        push: התראות בדחיפה
+        reports: דיווחים
+        search: חיפוש
+        statuses: הודעות
     layouts:
       admin:
         nav:
@@ -112,6 +147,49 @@ he:
       application:
         title: נדרשת הרשאת OAuth
     scopes:
+      admin:read: לקרוא את כל המידע על השרת
+      admin:read:accounts: לקרוא מידע רגיש בכל החשבונות
+      admin:read:canonical_email_blocks: קריאת התכנים הרגישים של רשומות חסימות הדואל
+      admin:read:domain_allows: קריאת התכנים הרגישים של שמות המתחמים (דומיינים) הבלתי חסומים
+      admin:read:domain_blocks: קריאת התכנים הרגישים של שמות המתחמים (דומיינים) החסומים
+      admin:read:email_domain_blocks: קריאת התכנים הרגישים של שמות המתחמים (דומיינים) החסומים לדואל
+      admin:read:ip_blocks: קריאת התכנים הרגישים של חסימות כתובות IP
+      admin:read:reports: לקרוא מידע רגיש בכל הדוחות וכל החשבונות המדווחים
+      admin:write: לשנות את כל המידע על השרת
+      admin:write:accounts: ביצוע פעולות הנהלה על חשבונות
+      admin:write:canonical_email_blocks: ביצוע פעולות מנחה על חסימות דואל
+      admin:write:domain_allows: ביצוע פעולות מנחה על שמות מתחם מורשים
+      admin:write:domain_blocks: ביצוע פעולות מנחה על שמות מתחם חסומים
+      admin:write:email_domain_blocks: ביצוע פעולות מנחה על חסימות שמות מתחם דואל
+      admin:write:ip_blocks: ביצוע פעולות מנחה על חסימות כתובות IP
+      admin:write:reports: ביצוע פעולות הנהלה על חשבונות
+      crypto: שימוש בהצפנה מקצה לקצה
       follow: לעקוב, לחסום, להסיר חסימה ולהפסיק לעקוב אחרי חשבונות
+      push: קבלת התראות בדחיפה
       read: לקרוא את המידע שבחשבונך
+      read:accounts: צפיה במידע על חשבונות
+      read:blocks: צפייה בחסימות
+      read:bookmarks: צפייה בסימניות
+      read:favourites: צפייה בחיבובים
+      read:filters: צפייה במסננים
+      read:follows: צפייה בנעקבים
+      read:lists: צפיה ברשימותיך
+      read:mutes: צפיה במושתקיך
+      read:notifications: צפיה בהתראותיך
+      read:reports: צפיה בדוחותיך
+      read:search: חיפוש מטעם עצמך
+      read:statuses: צפיה בכל ההודעות
       write: להפיץ הודעות בשמך
+      write:accounts: שינוי הפרופיל שלך
+      write:blocks: חסימת חשבונות ודומיינים
+      write:bookmarks: סימון הודעות
+      write:conversations: השתקת ומחיקת שיחות
+      write:favourites: הודעות מחובבות
+      write:filters: יצירת מסננים
+      write:follows: עקיבה אחר אנשים
+      write:lists: יצירת רשימות
+      write:media: העלאת קבצי מדיה
+      write:mutes: השתקת אנשים ושיחות
+      write:notifications: ניקוי התראותיך
+      write:reports: דיווח על אנשים אחרים
+      write:statuses: פרסום הודעות
diff --git a/config/locales/doorkeeper.hr.yml b/config/locales/doorkeeper.hr.yml
index 915a16008..cb48de313 100644
--- a/config/locales/doorkeeper.hr.yml
+++ b/config/locales/doorkeeper.hr.yml
@@ -53,8 +53,6 @@ hr:
       error:
         title: Došlo je do greške
       new:
-        able_to: Moći će
-        prompt: Aplikacija %{client_name} zatražila je pristup Vašem računu
         title: Potrebna je autorizacija
     authorized_applications:
       buttons:
@@ -62,8 +60,6 @@ hr:
       confirmations:
         revoke: Jeste li sigurni?
       index:
-        application: Aplikacija
-        created_at: Ovlašeno
         title: Vaše autorizirane aplikacije
     errors:
       messages:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 644f71c57..1157d0ee3 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -60,8 +60,8 @@ hu:
       error:
         title: Hiba történt
       new:
-        able_to: Képes lesz
-        prompt: "%{client_name} nevű alkalmazás engedélyt kér a fiókodhoz való hozzáféréshez."
+        prompt_html: "%{client_name} szeretné elérni a fiókodat. Ez egy harmadik féltől származó alkalmazás. <strong>Ha nem bízol meg benne, ne addj felhatalmazást neki.</strong>"
+        review_permissions: Engedélyek áttekintése
         title: Engedély szükséges
       show:
         title: Másold le ezt az engedélyező kódot és írd be az alkalmazásba.
@@ -71,14 +71,16 @@ hu:
       confirmations:
         revoke: Biztos vagy benne?
       index:
-        application: Alkalmazás
-        created_at: Felhatalmazva
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Hatáskör
+        authorized_at: 'Felhatalmazva ekkor: %{date}'
+        description_html: Ezek olyan alkalmazások, melyek API-n keresztül érhetik el a fiókodat. Ha vannak itt olyanok, melyeket nem ismersz fel, vagy valamelyik alkalmazás rosszul működik, visszavonhatod az engedélyét.
+        last_used_at: 'Utoljára ekkor használva: %{date}'
+        never_used: Soha sem volt használva
+        scopes: Engedélyek
+        superapp: Belső
         title: Engedélyezett alkalmazásaid
     errors:
       messages:
-        access_denied: Az erőforrás tulajdonosa vagy hitelesítő kiszolgálója megtagadta a kérést.
+        access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést.
         credential_flow_not_configured: Az erőforrás tulajdonos jelszóadatainak átadása megszakadt, mert a Doorkeeper.configure.resource_owner_from_credentials beállítatlan.
         invalid_client: A kliens hitelesítése megszakadt, mert ismeretlen a kliens, a kliens nem küldött hitelesítést, vagy a hitelesítés módja nem támogatott.
         invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítési kérésben használt URI-val, vagy más kliensnek címezték.
@@ -94,11 +96,11 @@ hu:
           revoked: Hozzáférési kulcsot visszavonták
           unknown: Hozzáférési kulcs érvénytelen
         resource_owner_authenticator_not_configured: Erőforrás tulajdonos keresés megszakadt, ugyanis a Doorkeeper.configure.resource_owner_authenticator beállítatlan.
-        server_error: Hitelesítő szervert váratlan esemény érte, mely meggátolta a kérés teljesítését.
-        temporarily_unavailable: A hitelesítő szerver jelenleg nem tudja teljesíteni a kérést átmeneti túlterheltség vagy a kiszolgáló karbantartása miatt.
+        server_error: Az engedélyező kiszolgáló váratlan körülménybe ütközött, ami megakadályozta, hogy teljesítse a kérést.
+        temporarily_unavailable: Az engedélyezési kiszolgáló jelenleg nem tudja kezelni a kérelmet a kiszolgáló ideiglenes túlterhelése vagy karbantartása miatt.
         unauthorized_client: A kliens nincs feljogosítva erre a kérésre.
-        unsupported_grant_type: A hitelesítés módja nem támogatott a hitelesítő kiszolgálón.
-        unsupported_response_type: A hitelesítő kiszolgáló nem támogatja ezt a választ.
+        unsupported_grant_type: Az engedélyezés megadási típusát nem támogatja az engedélyezési kiszolgáló.
+        unsupported_response_type: Az engedélyezési kiszolgáló nem támogatja ezt a választípust.
     flash:
       applications:
         create:
@@ -110,6 +112,33 @@ hu:
       authorized_applications:
         destroy:
           notice: Alkalmazás visszavonva.
+    grouped_scopes:
+      access:
+        read: Csak olvasási elérés
+        read/write: Olvasási és írási elérés
+        write: Csak írási elérés
+      title:
+        accounts: Fiókok
+        admin/accounts: Fiókok adminisztrációja
+        admin/all: Minden adminisztratív funkció
+        admin/reports: Bejelentések adminisztrációja
+        all: Minden
+        blocks: Letiltások
+        bookmarks: Könyvjelzők
+        conversations: Beszélgetések
+        crypto: Végpontok közti titkosítás
+        favourites: Kedvencek
+        filters: Szűrők
+        follow: Kapcsolatok
+        follows: Követések
+        lists: Listák
+        media: Médiamellékletek
+        mutes: Némítások
+        notifications: Értesítések
+        push: Push értesítések
+        reports: Bejelentések
+        search: Keresés
+        statuses: Bejegyzések
     layouts:
       admin:
         nav:
@@ -118,12 +147,23 @@ hu:
       application:
         title: OAuth engedély szükséges
     scopes:
-      admin:read: szerver minden adatának olvasása
+      admin:read: a kiszolgáló összes adatának olvasása
       admin:read:accounts: minden kényes fiókadat olvasása
+      admin:read:canonical_email_blocks: kanonikus emailblokkok érzékeny információinak olvasása
+      admin:read:domain_allows: minden domainengedély érzékeny információinak olvasása
+      admin:read:domain_blocks: minden domaintiltás érzékeny információinak olvasása
+      admin:read:email_domain_blocks: minden email-domainblokk érzékeny információinak olvasása
+      admin:read:ip_blocks: minden IP-blokk érzékeny információinak olvasása
       admin:read:reports: minden bejelentés és bejelentett fiók kényes adatainak olvasása
-      admin:write: szerver minden adatának változtatása
+      admin:write: a kiszolgáló összes adatának módosítása
       admin:write:accounts: moderációs műveletek végzése fiókokon
+      admin:write:canonical_email_blocks: moderáció végrehajtása kanonikus emailblokkokon
+      admin:write:domain_allows: moderáció végrehajtása domainengedélyeken
+      admin:write:domain_blocks: moderáció végrehajtása domaintiltásokon
+      admin:write:email_domain_blocks: moderáció végrehajtása email-domainblokkokon
+      admin:write:ip_blocks: moderáció végrehajtása IP-blokkokon
       admin:write:reports: moderációs műveletek végzése bejelentéseken
+      crypto: végpontok közti titkosítás használata
       follow: fiókok követése, letiltása, tiltás feloldása és követés abbahagyása
       push: push értesítések fogadása
       read: fiókod adatainak olvasása
@@ -143,6 +183,7 @@ hu:
       write:accounts: profilod megváltoztatása
       write:blocks: fiókok és domainek letiltása
       write:bookmarks: bejegyzések könyvjelzőzése
+      write:conversations: beszélgetések némítása és törlése
       write:favourites: bejegyzések kedvencnek jelölése
       write:filters: szűrők létrehozása
       write:follows: mások követése
diff --git a/config/locales/doorkeeper.hy.yml b/config/locales/doorkeeper.hy.yml
index ec7b6e5f5..94ef091f3 100644
--- a/config/locales/doorkeeper.hy.yml
+++ b/config/locales/doorkeeper.hy.yml
@@ -60,8 +60,6 @@ hy:
       error:
         title: Առաջացել է սխալ։
       new:
-        able_to: Նա կարողանալու է
-        prompt: "%{client_name} յաւելուածը խնդրում է հասանելիութիւն քո հաշուին"
         title: Անհրաժեշտ է նոյնականացում
       show:
         title: Պատճէնիր այս նոյնականացման կոդը եւ փակցրու յաւելուածում։
@@ -71,10 +69,9 @@ hy:
       confirmations:
         revoke: Վստա՞հ ես
       index:
-        application: Յաւելուած
-        created_at: Նոյնականացրած
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Դաշտեր
+        never_used: Երբեք չի օգտագործուել
+        scopes: Թոյլտուութիւններ
+        superapp: Ներքին
         title: Քո նոյնականացրած ծրագրերը
     errors:
       messages:
@@ -110,6 +107,25 @@ hy:
       authorized_applications:
         destroy:
           notice: Յաւելուածը չեղարկուել է։
+    grouped_scopes:
+      access:
+        read: Միայն կարդալու հնարաւորութիւն
+        read/write: Կարդալու եւ գրելու հնարաւորութիւն
+        write: Միայն գրելու հնարաւորութիւն
+      title:
+        accounts: Հաշիւներ
+        all: Բոլորը
+        blocks: Արգելափակումներ
+        bookmarks: Էջանիշեր
+        conversations: Զրոյցներ
+        favourites: Հաւանածներ
+        filters: Զտիչներ
+        follow: Կապեր
+        lists: Ցանկեր
+        mutes: Լռեցուածներ
+        notifications: Ծանուցումներ
+        push: Հրելու ծանուցումներ
+        statuses: Գրառումներ
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml
index 066d85e73..9a3fed94d 100644
--- a/config/locales/doorkeeper.id.yml
+++ b/config/locales/doorkeeper.id.yml
@@ -60,8 +60,8 @@ id:
       error:
         title: Ada yang error
       new:
-        able_to: Mempunyai akses untuk
-        prompt: Aplikasi %{client_name} meminta akses pada akun anda
+        prompt_html: "%{client_name} meminta izin untuk mengakses akun Anda. Ini adalah aplikasi pihak ketiga. <strong>Jika Anda tidak mempercayainya, Anda boleh tidak mengizinkannya.</strong>"
+        review_permissions: Tinjau izin
         title: Izin diperlukan
       show:
         title: Salin kode autorisasi dan tempelkan pada aplikasi.
@@ -71,10 +71,12 @@ id:
       confirmations:
         revoke: Anda yakin?
       index:
-        application: Aplikasi
-        created_at: Diizinkan pada
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Scope
+        authorized_at: Diberi hak otorisasi pada %{date}
+        description_html: Ini adalah aplikasi yang dapat mengakses akun Anda menggunakan API. Jika ada aplikasi yang tidak Anda kenal di sini, atau aplikasi yang berperilaku aneh, Anda dapat mencabut hak aksesnya.
+        last_used_at: Terakhir dipakai pada %{date}
+        never_used: Tidak pernah dipakai
+        scopes: Hak akses
+        superapp: Internal
         title: Aplikasi yang anda izinkan
     errors:
       messages:
@@ -110,6 +112,33 @@ id:
       authorized_applications:
         destroy:
           notice: Aplikasi dicabut.
+    grouped_scopes:
+      access:
+        read: Akses baca-saja
+        read/write: Akses baca dan tulis
+        write: Akses tulis-saja
+      title:
+        accounts: Akun
+        admin/accounts: Administrasi akun
+        admin/all: Semua fungsi administratif
+        admin/reports: Administrasi laporan
+        all: Segalanya
+        blocks: Blokir
+        bookmarks: Markah
+        conversations: Percakapan
+        crypto: Enkripsi end-to-end
+        favourites: Favorit
+        filters: Saringan
+        follow: Hubungan
+        follows: Mengikuti
+        lists: Daftar
+        media: Lampiran media
+        mutes: Bisukan
+        notifications: Notifikasi
+        push: Notifikasi dorong
+        reports: Laporan
+        search: Pencarian
+        statuses: Kiriman
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ id:
       admin:write: ubah semua data di server
       admin:write:accounts: lakukan aksi moderasi akun
       admin:write:reports: lakukan aksi moderasi laporan
+      crypto: menggunakan enkripsi end-to-end
       follow: mengikuti, blokir, menghapus blokir, dan berhenti mengikuti akun
       push: terima notifikasi dorong
       read: membaca data pada akun anda
@@ -143,6 +173,7 @@ id:
       write:accounts: ubah profil Anda
       write:blocks: blokir akun dan domain
       write:bookmarks: status markah
+      write:conversations: bisukan dan hapus percakapan
       write:favourites: status favorit
       write:filters: buat saringan
       write:follows: ikuti orang
diff --git a/config/locales/doorkeeper.ig.yml b/config/locales/doorkeeper.ig.yml
new file mode 100644
index 000000000..7c264f0d7
--- /dev/null
+++ b/config/locales/doorkeeper.ig.yml
@@ -0,0 +1 @@
+ig:
diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml
index ff1fdf9c2..4d41f9e93 100644
--- a/config/locales/doorkeeper.io.yml
+++ b/config/locales/doorkeeper.io.yml
@@ -4,7 +4,9 @@ io:
     attributes:
       doorkeeper/application:
         name: Nomo
-        redirect_uri: URI di plussendo
+        redirect_uri: Ridirektoligilo
+        scopes: Skopi
+        website: Apliksito
     errors:
       models:
         doorkeeper/application:
@@ -31,15 +33,153 @@ io:
       help:
         native_redirect_uri: Uzez %{native_redirect_uri} por lokala probi
         redirect_uri: Uzez un lineo por singla URI
+        scopes: Separez skopi per spaci. Lasez quale vakua por uzar originala skopi.
       index:
-        new: New Application
+        application: Apliko
+        callback_url: Retrovokligilo
+        delete: Efacez
+        empty: Vu ne havas apliki.
+        name: Nomo
+        new: Nova apliko
+        scopes: Skopi
+        show: Montrez
+        title: Vua apliki
       new:
-        title: New Application
+        title: Nova apliko
       show:
-        application_id: Application Id
+        actions: Agi
+        application_id: Klientoklefo
         callback_urls: Callback urls
-        secret: Secret
+        scopes: Skopi
+        secret: Klientosekreto
+        title: 'Apliko: %{name}'
+    authorizations:
+      buttons:
+        authorize: Yurizar
+        deny: Despermisez
+      error:
+        title: Eroro eventis
+      new:
+        prompt_html: "%{client_name} volas permiso por acesar vua konti. Ol esas externa softwaro. <strong>Se vu ne fidas, lore vu debas ne yurizar.</strong>"
+        review_permissions: Kontrolez permisi
+        title: Yurizo bezonesas
+      show:
+        title: Kopiez ca yurizkodexo e glutinez a la apliko.
+    authorized_applications:
+      buttons:
+        revoke: Deaprobez
+      confirmations:
+        revoke: Ka vu esas certa?
+      index:
+        authorized_at: Yurizesis ye %{date}
+        description_html: Co esas softwari quo povas acesar vua konto per API. Se existas softwari quon vu ne rikonocas hike, o softwari misfuncionas, vu povas desaprobar ola aceso.
+        last_used_at: Antee uzesis ye %{date}
+        never_used: Nulaloke uzesas
+        scopes: Permisi
+        superapp: Interna
+        title: Vua yurizita softwari
+    errors:
+      messages:
+        access_denied: Moyenproprietanto o yurizservilo refuzis la demando.
+        credential_flow_not_configured: Moyenproprietantpasvortidentesesofluo faliis pro ke Doorkeeper.configure.resource_owner_from_credentials ne ajustesis.
+        invalid_client: Klientpermiso falias pro nesavita kliento, neinkluzita klientpermiso o nesuportita permismetodo.
+        invalid_grant: Provizita yurizo esis nevalida, expiris, deaprobesis, ne parigas uzita ridirektoligilo dum yurizdemando o facesis a altra kliento.
+        invalid_redirect_uri: La inkluzita ridirektoligilo esas nevalida.
+        invalid_request:
+          missing_param: 'Bezonita parametro: %{value}.'
+          request_not_authorized: Demando bezonas yurizesar. Bezonita parametro por yurizar demando ne existas o esas nevalida.
+          unknown: La demando ne havas bezonita parametro, inkluzas nesuportita parametro o malformesas.
+        invalid_resource_owner: Provizita Moyenproprietantidenteso esas nevalida o moyenproprietanto ne existas
+        invalid_scope: La demandita skopo esas nevalida, nesavata o malformata.
+        invalid_token:
+          expired: La acesficho expiris
+          revoked: Acesficho deaprobesis
+          unknown: Acesficho esas nevalida
+        resource_owner_authenticator_not_configured: Moyenproprietanto falias trovar pro ke Doorkeeper.configure.resource_owner_authenticator ne ajustesis.
+        server_error: Yurizservilo trovas neanticipata situeso quo preventas ol finar la demando.
+        temporarily_unavailable: Yurizservilo nu ne povas direktar la demando pro provizora eceso o servilmanteno.
+        unauthorized_client: La kliento ne yurizesis agar ca demando per ca metodo.
+        unsupported_grant_type: Yurizprovizontipo ne suportesas da yurizservilo.
+        unsupported_response_type: La yurizservilo ne suportas ca responstipo.
+    flash:
+      applications:
+        create:
+          notice: Apliko kreesis.
+        destroy:
+          notice: Apliko efacesis.
+        update:
+          notice: Apliko novigesis.
+      authorized_applications:
+        destroy:
+          notice: Apliko deaprobesis.
+    grouped_scopes:
+      access:
+        read: Lekto-nura aceso
+        read/write: Lekto e skrib-nura aceso
+        write: Skrib-nura aceso
+      title:
+        accounts: Konti
+        admin/accounts: Administrar di konti
+        admin/all: Omna administrofuncioni
+        admin/reports: Administro di raporti
+        all: Omno
+        blocks: Restriktita
+        bookmarks: Libromarki
+        conversations: Konversi
+        crypto: Intersequanta chifro
+        favourites: Favorati
+        filters: Filtrili
+        follow: Relataji
+        follows: Sequati
+        lists: Listi
+        media: Mediatachaji
+        mutes: Silencigati
+        notifications: Avizi
+        push: Pulsavizi
+        reports: Raporti
+        search: Trovez
+        statuses: Posti
+    layouts:
+      admin:
+        nav:
+          applications: Apliki
+          oauth2_provider: Provizanto di OAuth2
+      application:
+        title: Yurizo di OAuth bezonesas
     scopes:
+      admin:read: lektez omna informi di la servilo
+      admin:read:accounts: lektez privata informo di omna konti
+      admin:read:reports: lektez privata informo di omna raporti e raportizita konti
+      admin:write: modifikez omna informi di la servilo
+      admin:write:accounts: jerez konti
+      admin:write:reports: jerez raporti
+      crypto: uzas intersequanta chifro
       follow: follow, block, unblock and unfollow accounts
+      push: ganez vua pulsavizi
       read: read your account's data
+      read:accounts: videz kontinformo
+      read:blocks: videz restrikti
+      read:bookmarks: videz vua libromarki
+      read:favourites: videz vua favorati
+      read:filters: videz vua filtrili
+      read:follows: videz vua sequinti
+      read:lists: videz vua listi
+      read:mutes: videz vua silencigi
+      read:notifications: videz vua avizi
+      read:reports: videz vua rapotigi
+      read:search: trovez por vu
+      read:statuses: videz omna posti
       write: post on your behalf
+      write:accounts: modifikez vua porfilo
+      write:blocks: restriktez konti e domeni
+      write:bookmarks: libromarkez posti
+      write:conversations: silencigez e efacez konversi
+      write:favourites: favorata posti
+      write:filters: kreez filtrili
+      write:follows: sequez personi
+      write:lists: kreez listi
+      write:media: adchargez mediifaili
+      write:mutes: silencigez personi e konversi
+      write:notifications: efacez vua avizi
+      write:reports: raportizez altra omni
+      write:statuses: publikigez posti
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index 17ea34206..243b45c80 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -60,8 +60,8 @@ is:
       error:
         title: Villa kom upp
       new:
-        able_to: Það mun geta
-        prompt: Forritið %{client_name} biður um aðgang að notandaaðgangnum þínum
+        prompt_html: "%{client_name} biður um heimild til að fara inn á notandaaðganginn þinn. Þetta er utanaðkomandi hugbúnaður. <strong>Ef þú treystir ekki viðkomandi, þá ættir þú ekki að heimila þetta.</strong>"
+        review_permissions: Yfirfara heimildir
         title: Auðkenning er nauðsynleg
       show:
         title: Afritaðu þennan auðkenningarkóða og límdu hann inn hjá forritinu.
@@ -71,10 +71,12 @@ is:
       confirmations:
         revoke: Ertu viss?
       index:
-        application: Forrit
-        created_at: Heimilað
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Gildissvið
+        authorized_at: Heimilað þann %{date}
+        description_html: Þetta eru forrit sem hafa aðgang að notandaaðgangnum þínum í gegnum API-forritsviðmótið. Ef hér eru forrit sem þú kannast ekki við, eða ef eitthvað forrit er til vandræða, skaltu afturkalla himildir þess.
+        last_used_at: Síðast notað þann %{date}
+        never_used: Aldrei notað
+        scopes: Heimildir
+        superapp: Innri
         title: Heimiluðu forritin þín
     errors:
       messages:
@@ -110,6 +112,33 @@ is:
       authorized_applications:
         destroy:
           notice: Forrit afturkallað.
+    grouped_scopes:
+      access:
+        read: Einungis lesaðgangur
+        read/write: Heimilt að lesa og skrifa
+        write: Einungis skrifaðgangur
+      title:
+        accounts: Notandaaðgangar
+        admin/accounts: Stjórnun aðganga
+        admin/all: Allar stjórnunaraðgerðir
+        admin/reports: Stjórnun kæra
+        all: Allt
+        blocks: Útilokanir
+        bookmarks: Bókamerki
+        conversations: Samtöl
+        crypto: Enda-í-enda dulritun
+        favourites: Eftirlæti
+        filters: Síur
+        follow: Vensl
+        follows: Fylgist með
+        lists: Listar
+        media: Myndefnisviðhengi
+        mutes: Þagganir
+        notifications: Tilkynningar
+        push: Ýti-tilkynningar
+        reports: Kærur
+        search: Leita
+        statuses: Færslur
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ is:
     scopes:
       admin:read: lesa öll gögn á netþjóninum
       admin:read:accounts: lesa viðkvæmar upplýsingar á öllum notendaaðgöngum
+      admin:read:canonical_email_blocks: lesa viðkvæmar upplýsingar um allar stafréttar útilokanir tölvupósts
+      admin:read:domain_allows: lesa viðkvæmar upplýsingar um öll leyfð lén
+      admin:read:domain_blocks: lesa viðkvæmar upplýsingar um öll útilokuð lén
+      admin:read:email_domain_blocks: lesa viðkvæmar upplýsingar um öll útilokuð tölvupóstlén
+      admin:read:ip_blocks: lesa viðkvæmar upplýsingar um allar útilokanir IP-vistfanga
       admin:read:reports: lesa viðkvæmar upplýsingar í öllum skýrslum og kærðum notendaaðgöngum
       admin:write: breyta öllum gögnum á netþjóninum
       admin:write:accounts: framkvæma umsjónaraðgerðir á notendaaðganga
+      admin:write:canonical_email_blocks: framkvæma umsjónaraðgerðir á stafréttar útilokanir tölvupósts
+      admin:write:domain_allows: framkvæma umsjónaraðgerðir á leyfð lén
+      admin:write:domain_blocks: framkvæma umsjónaraðgerðir á útilokuð lén
+      admin:write:email_domain_blocks: framkvæma umsjónaraðgerðir á útilokuð tölvupóstlén
+      admin:write:ip_blocks: framkvæma umsjónaraðgerðir á útilokuð IP-vistföng
       admin:write:reports: framkvæma umsjónaraðgerðir á kærur
+      crypto: nota enda-í-enda dulritun
       follow: breyta venslum aðgangs
       push: taka á móti ýti-tilkynningum til þín
       read: lesa öll gögn á notandaaðgangnum þínum
@@ -138,12 +178,13 @@ is:
       read:notifications: sjá tilkynningarnar þínar
       read:reports: skoða skýrslurnar þína
       read:search: leita fyrir þína hönd
-      read:statuses: sjá allar stöðufærslur
+      read:statuses: sjá allar færslur
       write: breyta öllum gögnum á notandaaðgangnum þínum
       write:accounts: breyta notandasniðinu þínu
       write:blocks: útiloka notandaaðganga og lén
-      write:bookmarks: bókamerkja stöðufærslur
-      write:favourites: setja stöðufærslur í eftirlæti
+      write:bookmarks: bókamerkja færslur
+      write:conversations: þagga og eyða samtölum
+      write:favourites: setja færslur í eftirlæti
       write:filters: útbúa síur
       write:follows: fylgjast með fólki
       write:lists: búa til lista
@@ -151,4 +192,4 @@ is:
       write:mutes: þagga niður í fólki og samtölum
       write:notifications: hreinsa tilkynningarnar þínar
       write:reports: kæra annað fólk
-      write:statuses: gefa út stöður
+      write:statuses: gefa út færslur
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 6aea56e49..602c50fa9 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -3,19 +3,19 @@ it:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Nome applicazione
+        name: Nome dell'applicazione
         redirect_uri: URI di reindirizzamento
-        scopes: Scopi
-        website: Sito web applicazione
+        scopes: Ambiti
+        website: Sito web dell'applicazione
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
               fragment_present: non può contenere un frammento.
-              invalid_uri: deve essere un URI valido.
-              relative_uri: deve essere un URI assoluto.
-              secured_uri: deve essere un URI HTTPS/SSL.
+              invalid_uri: dev'essere un URI valido.
+              relative_uri: dev'essere un URI assoluto.
+              secured_uri: dev'essere un URI HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
@@ -25,33 +25,33 @@ it:
         edit: Modifica
         submit: Invia
       confirmations:
-        destroy: Sei sicur*?
+        destroy: Sei sicuro?
       edit:
-        title: Modifica applicazione
+        title: Modifica la richiesta
       form:
-        error: Ooops! Controlla nel modulo la presenza di errori
+        error: Oops! Controlla il tuo modulo per la presenza di errori
       help:
-        native_redirect_uri: Usa %{native_redirect_uri} per test locali
+        native_redirect_uri: Usa %{native_redirect_uri} per i test locali
         redirect_uri: Usa una riga per URI
-        scopes: Dividi gli scopes con spazi. Lascia vuoto per utilizzare gli scopes di default.
+        scopes: Separa gli ambiti con gli spazi. Lascia vuoto per usare quelli predefiniti.
       index:
         application: Applicazione
-        callback_url: URL di callback
+        callback_url: URL di richiamata
         delete: Elimina
         empty: Non hai applicazioni.
         name: Nome
         new: Nuova applicazione
-        scopes: Visibilità
+        scopes: Ambiti
         show: Mostra
         title: Le tue applicazioni
       new:
         title: Nuova applicazione
       show:
         actions: Azioni
-        application_id: Id applicazione
-        callback_urls: Callback urls
-        scopes: Scopi
-        secret: Secret
+        application_id: Chiave del client
+        callback_urls: URL di richiamata
+        scopes: Ambiti
+        secret: Codice segreto del client
         title: 'Applicazione: %{name}'
     authorizations:
       buttons:
@@ -60,95 +60,136 @@ it:
       error:
         title: Si è verificato un errore
       new:
-        able_to: Non sarà in grado di
-        prompt: L'applicazione %{client_name} richiede l'accesso al tuo account
-        title: Autorizzazione richiesta
+        prompt_html: "%{client_name} vorrebbe l'autorizzazione ad accedere al tuo profilo. È un'applicazione di terze parti. <strong>Se non ti fidi, non dovresti autorizzarla.</strong>"
+        review_permissions: Revisiona le autorizzazioni
+        title: Autorizzazione necessaria
       show:
-        title: Copia questo codice di autorizzazione e incollalo nell'applicazione.
+        title: Copia questo codice d'autorizzazione e incollalo all'applicazione.
     authorized_applications:
       buttons:
-        revoke: Disabilita
+        revoke: Revoca
       confirmations:
-        revoke: Sei sicur*?
+        revoke: Sei sicuro?
       index:
-        application: Applicazione
-        created_at: Autorizzato
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Scopi
-        title: Applicazioni autorizzate
+        authorized_at: Autorizzato il %{date}
+        description_html: Queste sono le applicazioni che possono accedere al tuo profilo utilizzando l'API. Se qui ci sono delle applicazioni che non riconosci o se un'applicazione si sta comportando in modo errato, puoi revocarne l'accesso.
+        last_used_at: Ultimo utilizzo il %{date}
+        never_used: Mai usata
+        scopes: Autorizzazioni
+        superapp: Interna
+        title: Le tue applicazioni autorizzate
     errors:
       messages:
-        access_denied: Il proprietario del servizio o il server di autorizzazione hanno rifiutato la richiesta.
-        credential_flow_not_configured: Il processo Resource Owner Password Credentials è fallito perché Doorkeeper.configure.resource_owner_from_credentials non è stato configurato.
-        invalid_client: Accesso al servizio fallito perché il servizio è sconosciuto, l'accesso al servizio non è stato incluso, o il metodo di accesso non è supportato.
-        invalid_grant: Il permesso d'autorizzazione è non valido, scaduto, disabilitato, non coincide con l'URI di reindirizzamento fornito nella richiesta di autorizzazione, o è stato rilasciato da un altro client.
-        invalid_redirect_uri: L'URI di reindirizzamento fornito non è valido.
+        access_denied: Il proprietario della risorsa o il server d'autorizzazione ha negato la richiesta.
+        credential_flow_not_configured: Il processo delle Credenziali Password del Proprietario della Risorsa è fallito a causa della mancata configurazione di Doorkeeper.configure.resource_owner_from_credentials.
+        invalid_client: Autenticazione del client fallita a causa di un client sconosciuto, di nessun'autenticazione del client inclusa o di un metodo d'autenticazione non supportato.
+        invalid_grant: L'autorizzazione fornita non è valida, è scaduta, è stata revocata, non corrisponde all'URI di reindirizzamento utilizzato nella richiesta d'autorizzazione o è stata emessa a un altro client.
+        invalid_redirect_uri: L'uri di reindirizzamento incluso non è valido.
         invalid_request:
-          missing_param: 'Manca il parametro obbligatorio: %{value}.'
-          request_not_authorized: La richiesta deve essere autorizzata. Il parametro richiesto per autorizzare la richiesta è mancante o non valido.
-          unknown: La richiesta manca di un parametro necessario, include un parametro non supportato, o è in qualche altro modo mal strutturata.
-        invalid_resource_owner: Le credenziali di accesso fornite per il proprietario non sono corrette, o il proprietario del servizio non è stato trovato
-        invalid_scope: Lo scope richiesto è invalido, sconosciuto, o malformulato.
+          missing_param: 'Parametro necessario mancante: %{value}.'
+          request_not_authorized: La richiesta dev'essere autorizzata. Il parametro necessario per autorizzare la richiesta è mancante o non valido.
+          unknown: La richiesta manca di un parametro necessario, include un valore del parametro non supportato o è altrimenti mal strutturata.
+        invalid_resource_owner: Le credenziali del proprietario della risorsa fornite non sono valide, o il proprietario della risorsa non è stato trovato
+        invalid_scope: L'ambito necessario non è valido, è sconosciuto o mal strutturato.
         invalid_token:
-          expired: Il token di accesso è scaduto
-          revoked: Il token di accesso è stato disabilitato
-          unknown: Il token di accesso non è valido
-        resource_owner_authenticator_not_configured: Impossibile trovare il proprietario del servizio perché Doorkeeper.configure.resource_owner_authenticator non è stato configurato.
-        server_error: Il server di autorizzazione ha riscontrato un errore imprevisto che non ha permesso di completare la tua richiesta.
-        temporarily_unavailable: Al momento il server di autorizzazione non può completare la tua richiesta a causa di un temporaneo sovraccarico o di manutenzione del server.
-        unauthorized_client: Il client non è autorizzato a eseguire questa operazione con questo metodo.
-        unsupported_grant_type: Questa modalità di trasmissione di autenticazione non è supportata da questo server.
-        unsupported_response_type: Il server autorizzatore non supporta questa modalità di risposta.
+          expired: Il token d'accesso è scaduto
+          revoked: Il token d'accesso è stato revocato
+          unknown: Il token d'accesso non è valido
+        resource_owner_authenticator_not_configured: Impossibile trovare il Proprietario della Risorsa a causa della mancata configurazione di Doorkeeper.configure.resource_owner_authenticator.
+        server_error: Il server d'autorizzazione ha riscontrato una condizione imprevista, che gli ha impedito di soddisfare la tua richiesta.
+        temporarily_unavailable: Il server d'autorizzazione non è correntemente capace di gestire la richiesta a causa di un sovraccarico temporaneo o di una manutenzione del server.
+        unauthorized_client: Il client non è autorizzato a eseguire questa richiesta utilizzando questo metodo.
+        unsupported_grant_type: Il tipo di autorizzazione concessa non è supportato dal server d'autorizzazione.
+        unsupported_response_type: Il server d'autorizzazione non supporta questo tipo di risposta.
     flash:
       applications:
         create:
           notice: Applicazione creata.
         destroy:
-          notice: Applicazione cancellata.
+          notice: Applicazione eliminata.
         update:
           notice: Applicazione aggiornata.
       authorized_applications:
         destroy:
-          notice: Applicazione disabilitata.
+          notice: Applicazione revocata.
+    grouped_scopes:
+      access:
+        read: Accesso di sola lettura
+        read/write: Accesso di lettura e scrittura
+        write: Accesso di sola scrittura
+      title:
+        accounts: Profili
+        admin/accounts: Amministrazione dei profili
+        admin/all: Tutte le funzioni amministrative
+        admin/reports: Amministrazione dei rapporti
+        all: Tutto
+        blocks: Blocchi
+        bookmarks: Segnalibri
+        conversations: Conversazioni
+        crypto: Crittografia end-to-end
+        favourites: Preferiti
+        filters: Filtri
+        follow: Relazioni
+        follows: Seguiti
+        lists: Elenchi
+        media: Allegati multimediali
+        mutes: Silenziati
+        notifications: Notifiche
+        push: Notifiche push
+        reports: Segnalazioni
+        search: Cerca
+        statuses: Post
     layouts:
       admin:
         nav:
           applications: Applicazioni
-          oauth2_provider: Provider OAuth2
+          oauth2_provider: Fornitore OAuth2
       application:
-        title: Autorizzazione OAuth richiesta
+        title: Autorizzazione OAuth necessaria
     scopes:
-      admin:read: leggere tutti i dati dal server
-      admin:read:accounts: leggere dati sensibili di tutti gli account
-      admin:read:reports: leggere dati sensibili di tutte le segnalazioni e gli account segnalati
+      admin:read: leggere tutti i dati sul server
+      admin:read:accounts: leggere le informazioni sensibili su tutti i profili
+      admin:read:canonical_email_blocks: leggere le informazioni sensibili di tutti i blocchi canonici di posta elettronica
+      admin:read:domain_allows: leggere le informazioni sensibili di tutti i domini consentiti
+      admin:read:domain_blocks: leggere le informazioni sensibili di tutti i blocchi di dominio
+      admin:read:email_domain_blocks: leggi le informazioni sensibili di tutti i blocchi di dominio email
+      admin:read:ip_blocks: leggere le informazioni sensibili di tutti i blocchi IP
+      admin:read:reports: leggere le informazioni sensibili di tutte le segnalazioni e tutti i profili segnalati
       admin:write: modificare tutti i dati sul server
-      admin:write:accounts: eseguire azioni di moderazione sugli account
+      admin:write:accounts: eseguire azioni di moderazione sui profili
+      admin:write:canonical_email_blocks: eseguire azioni di moderazione sui blocchi canonici di posta elettronica
+      admin:write:domain_allows: consente di eseguire azioni di moderazione sul dominio
+      admin:write:domain_blocks: eseguire azioni di moderazione sui blocchi di dominio
+      admin:write:email_domain_blocks: eseguire azioni di moderazione sui blocchi di dominio email
+      admin:write:ip_blocks: eseguire azioni di moderazione sui blocchi IP
       admin:write:reports: eseguire azioni di moderazione sulle segnalazioni
-      follow: modificare relazioni tra account
+      crypto: utilizzare la crittografia end-to-end
+      follow: modifica le relazioni tra profili
       push: ricevere le tue notifiche push
-      read: leggere tutte le informazioni del tuo account
-      read:accounts: vedere informazioni sull'account
-      read:blocks: vedere i tuoi blocchi
-      read:bookmarks: vedi i tuoi preferiti
-      read:favourites: vedere i tuoi preferiti
-      read:filters: vedere i tuoi filtri
-      read:follows: vedere i tuoi seguiti
-      read:lists: vedere le tue liste
-      read:mutes: vedere i tuoi silenziati
-      read:notifications: vedere le tue notifiche
-      read:reports: vedere i tuoi rapporti
-      read:search: fare ricerche per te
-      read:statuses: vedere tutti gli status
-      write: modificare tutti i dati del tuo account
+      read: leggere tutti i dati del tuo profilo
+      read:accounts: visualizzare le informazioni sui profili
+      read:blocks: visualizzare i tuoi blocchi
+      read:bookmarks: visualizzare i tuoi segnalibri
+      read:favourites: visualizzare i tuoi preferiti
+      read:filters: visualizzare i tuoi filtri
+      read:follows: visualizzare i tuoi seguiti
+      read:lists: visualizzare i tuoi elenchi
+      read:mutes: visualizzare i tuoi silenziamenti
+      read:notifications: visualizzare le tue notifiche
+      read:reports: visualizzare le tue segnalazioni
+      read:search: fare ricerche per conto tuo
+      read:statuses: visualizzare tutti i post
+      write: modificare tutti i dati del tuo profilo
       write:accounts: modificare il tuo profilo
-      write:blocks: bloccare account e domini
-      write:bookmarks: aggiungi post ai preferiti
-      write:favourites: segnare status come preferiti
+      write:blocks: bloccare profili e domini
+      write:bookmarks: aggiungere post tra i segnalibri
+      write:conversations: silenziare ed eliminare conversazioni
+      write:favourites: salvare post tra i preferiti
       write:filters: creare filtri
       write:follows: seguire persone
-      write:lists: creare liste
-      write:media: caricare media
+      write:lists: creare elenchi
+      write:media: caricare file multimediali
       write:mutes: silenziare persone e conversazioni
       write:notifications: cancellare le tue notifiche
-      write:reports: fare rapporto su altre persone
-      write:statuses: pubblicare status
+      write:reports: segnalare altre persone
+      write:statuses: pubblicare post
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 1bc8dc684..30c48f0dc 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -60,8 +60,8 @@ ja:
       error:
         title: エラーが発生しました
       new:
-        able_to: このアプリは以下のことができます
-        prompt: アプリ %{client_name} があなたのアカウントへのアクセスを要求しています
+        prompt_html: "%{client_name}があなたのアカウントにアクセスする許可を求めています。<strong>心当たりが無い場合はアクセス許可しないでください。</strong>"
+        review_permissions: アクセス許可を確認
         title: 認証が必要です
       show:
         title: 認証コードをコピーしてアプリに貼り付けて下さい。
@@ -71,10 +71,12 @@ ja:
       confirmations:
         revoke: 本当に取り消しますか？
       index:
-        application: アプリ名
-        created_at: 許可した日時
-        date_format: "%Y年%m月%d日 %H時%M分%S秒"
-        scopes: アクセス権
+        authorized_at: "%{date}に承認されました"
+        description_html: これらは、APIを使用してアカウントにアクセスできるアプリケーションです。ここに見覚えのないアプリケーションがある場合、またはアプリケーションの動作がおかしい場合、そのアクセスを取り消すことができます。
+        last_used_at: 最終使用日 %{date}
+        never_used: 使用されていない
+        scopes: 権限
+        superapp: 内部
         title: 認証済みアプリ
     errors:
       messages:
@@ -93,7 +95,7 @@ ja:
           expired: アクセストークンの有効期限が切れています
           revoked: アクセストークンは取り消されています
           unknown: アクセストークンが無効です
-        resource_owner_authenticator_not_configured: Doorkeeper.configure.resource_owner_authenticator が設定されていないため、リソース所有者の検索に失敗しました。
+        resource_owner_authenticator_not_configured: Doorkeeper.configure.resource_owner_authenticatorが設定されていないため、リソース所有者の検索に失敗しました。
         server_error: 認証サーバーに予期せぬ例外が発生したため、リクエストを実行できなくなりました。
         temporarily_unavailable: 現在、認証サーバーに一時的な過負荷が掛かっているか、またはメンテナンス中のため、リクエストを処理できません。
         unauthorized_client: クライアントはこのメゾットで要求を実行する権限がありません。
@@ -110,6 +112,33 @@ ja:
       authorized_applications:
         destroy:
           notice: アプリが取り消されました。
+    grouped_scopes:
+      access:
+        read: 読み取り専用アクセス
+        read/write: 読み取りおよび書き込みアクセス
+        write: 書き込み専用アクセス
+      title:
+        accounts: アカウント
+        admin/accounts: アカウント管理
+        admin/all: すべての管理機能
+        admin/reports: 通報の管理
+        all: すべて
+        blocks: ブロック
+        bookmarks: ブックマーク
+        conversations: 会話
+        crypto: エンドツーエンド暗号化
+        favourites: お気に入り
+        filters: フィルター
+        follow: フォロー・フォロワー
+        follows: フォロー
+        lists: リスト
+        media: メディアの添付
+        mutes: ミュート
+        notifications: 通知
+        push: プッシュ通知
+        reports: 通報
+        search: 検索
+        statuses: 投稿
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ ja:
       admin:write: サーバーのすべてのデータの変更
       admin:write:accounts: アカウントに対するアクションの実行
       admin:write:reports: 通報に対するアクションの実行
+      crypto: エンドツーエンド暗号化の使用
       follow: アカウントのつながりを変更
       push: プッシュ通知の受信
       read: アカウントのすべてのデータの読み取り
@@ -143,6 +173,7 @@ ja:
       write:accounts: プロフィールの変更
       write:blocks: ユーザーのブロックやドメインの非表示
       write:bookmarks: 投稿のブックマーク登録
+      write:conversations: 会話のミュートと削除
       write:favourites: 投稿のお気に入り登録
       write:filters: フィルターの変更
       write:follows: あなたの代わりにフォロー、アンフォロー
diff --git a/config/locales/doorkeeper.ka.yml b/config/locales/doorkeeper.ka.yml
index 5a9ec3610..36df811f1 100644
--- a/config/locales/doorkeeper.ka.yml
+++ b/config/locales/doorkeeper.ka.yml
@@ -59,8 +59,6 @@ ka:
       error:
         title: წარმოიშვა შეცდომა
       new:
-        able_to: ის შეძლებს
-        prompt: აპლიკაცია %{client_name} ითხოვს წვდომას თქვენს ანგარიშზე
         title: საჭიროა ავტორიზაცია
       show:
         title: დააკოპირეთ ეს ავტორიზაციის კოდი და ჩასვით აპლიკაციაში.
@@ -70,9 +68,6 @@ ka:
       confirmations:
         revoke: დარწმუნებული ხართ?
       index:
-        application: აპლიკაცია
-        created_at: ავტორიზებული
-        scopes: ფარგლები
         title: თქვენი ავტორიზებული აპლიკაციები
     errors:
       messages:
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index c8171fb83..ba1d7057a 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -55,8 +55,6 @@ kab:
       error:
         title: Tella-d tuccḍa
       new:
-        able_to: Asnas-agi yezmer ad
-        prompt: Yessutred wesnan n %{client_name} akečum γer umiḍan-ik
         title: Tlaq tsiregt
       show:
         title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
@@ -66,9 +64,6 @@ kab:
       confirmations:
         revoke: Tetḥeqqeḍ?
       index:
-        application: Asnas
-        created_at: Yettussireg
-        date_format: "%d-%m-%Y %H:%M:%S"
         title: Isnasen-ik·im yettusirgen
     errors:
       messages:
@@ -84,6 +79,19 @@ kab:
       authorized_applications:
         destroy:
           notice: Yettwaḥwi wesnas.
+    grouped_scopes:
+      title:
+        accounts: Imiḍanen
+        admin/accounts: Tadbelt n imiḍan
+        crypto: Awgelhen seg yixef ɣer yixef
+        favourites: Ismenyifen
+        filters: Imzizdigen
+        lists: Tibdarin
+        notifications: Tilɣa
+        push: Tilɣa yettudemmren
+        reports: Ineqqisen
+        search: Nadi
+        statuses: Tisuffaɣ
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.kk.yml b/config/locales/doorkeeper.kk.yml
index 15a1dbff7..daaa3a9eb 100644
--- a/config/locales/doorkeeper.kk.yml
+++ b/config/locales/doorkeeper.kk.yml
@@ -60,8 +60,6 @@ kk:
       error:
         title: Қате пайда болды
       new:
-        able_to: It will be аble to
-        prompt: Application %{client_name} rеquests access to your account
         title: Authorization rеquired
       show:
         title: Copy this authorization cоde and paste it to the application.
@@ -71,9 +69,6 @@ kk:
       confirmations:
         revoke: Шынымен бе?
       index:
-        application: Қосымша
-        created_at: Авторизацияланды
-        scopes: Scopеs
         title: Your authorized applicаtions
     errors:
       messages:
diff --git a/config/locales/doorkeeper.kmr.yml b/config/locales/doorkeeper.kmr.yml
deleted file mode 100644
index 6a8b65d91..000000000
--- a/config/locales/doorkeeper.kmr.yml
+++ /dev/null
@@ -1,154 +0,0 @@
----
-kmr:
-  activerecord:
-    attributes:
-      doorkeeper/application:
-        name: Navê sepanê
-        redirect_uri: Girêdana beralîkirî
-        scopes: Berfirehî
-        website: Malpera sepanê
-    errors:
-      models:
-        doorkeeper/application:
-          attributes:
-            redirect_uri:
-              fragment_present: perçe tê de tinne.
-              invalid_uri: ger ev URL derbasdar be.
-              relative_uri: teqez URl'yek hebe.
-              secured_uri: ger HTTPS/SSL URl hebe.
-  doorkeeper:
-    applications:
-      buttons:
-        authorize: Destûr bide
-        cancel: Dev jê berde
-        destroy: Tinne bike
-        edit: Serrast bike
-        submit: Bişîne
-      confirmations:
-        destroy: Ma tu bawerî?
-      edit:
-        title: Sepanê serrast bike
-      form:
-        error: Wey li min! kontrol bikeku form çewtî tê de tune
-      help:
-        native_redirect_uri: Bo testên herêmî %{native_redirect_uri} bikar bîne
-        redirect_uri: Serê URl de rêzek bikarbînin
-        scopes: Berfirehî bi valahîyan re veqetîne. Bo bikaranîna berfirehî ya standard vala bihêle.
-      index:
-        application: Sepan
-        callback_url: URl ya vegeriyayî
-        delete: Jê bibe
-        empty: Qet sepanê te tinne.
-        name: Nav
-        new: Sepanê nû
-        scopes: Berfirehî
-        show: Nîşan bike
-        title: Sepanê te
-      new:
-        title: Sepanê nû
-      show:
-        actions: Çalakî
-        application_id: Kilîdê rajegir
-        callback_urls: URlyên vegeriyayî
-        scopes: Berfirehî
-        secret: Rajegirî veşartî
-        title: 'Sepan: %{name}'
-    authorizations:
-      buttons:
-        authorize: Destûr bide
-        deny: Guh nedê
-      error:
-        title: Xeletîyek çêbû
-      new:
-        able_to: Ew ê bikaribe
-        prompt: Sepanê %{client_name} dixwaze bigihîje ajimêrê te
-        title: Destûr kirin pêwîst e
-      show:
-        title: Destûr hildana vê kodê jê bigire û ji sepanê re pêve bike.
-    authorized_applications:
-      buttons:
-        revoke: Betal bike
-      confirmations:
-        revoke: Ma tu bawerî?
-      index:
-        application: Sepan
-        created_at: Destûrmend
-        date_format: "%Y-%m-%d%H:%M:%S"
-        scopes: Berfirehî
-        title: Sepanên destûrmendê te
-    errors:
-      messages:
-        access_denied: Xwedîyê çavkanîyê an jî destûrmendê rajeker daxwazî red kirin.
-        credential_flow_not_configured: Herikîna pêborînê bawername ya xwediyê çavkaniyê, ji ber Doorkeeper.configure.resource_owner_from_credentials nehat pevsazkirin.
-        invalid_client: Erêkirina nasnameyê rajegir ji ber rajegirê nediyar têk çû, erêkirina nasnameyê rajegir di nav da tinne an jî rêbaza erêkirinê ne piştgirêdayî ye.
-        invalid_grant: Mafê ku hatiye peyda kirin ne derbasdar e, qediya ye, pûç e, girêdana ya ku di daxwaza mafê de tê bikaranîn li hev nagire an jî rajegirekî din hildaye.
-        invalid_redirect_uri: Girêdan beralîkirî ya di nav da ne derbasdar e.
-        invalid_request:
-          missing_param: 'Pîvana hewce dike kêm e: %{value}.'
-          request_not_authorized: Hewceye daxwazî rêdayî be. Ji bo daxwazî rêdayî be pîvana hewce dike kêm an jî betal e.
-          unknown: Di nav daxwazîyê de pîvanekî hewceyî kêm e. Nirxekî pîvanê bê piştgirêdayî tê de heye an jî wek din xelet e.
-        invalid_resource_owner: Bawernameyên xwediyê çavkanîyê yên hatine pêşkeş kirin ne derbasdar e an jî xwedîyê çavkanîyê nayê dîtin
-        invalid_scope: Berfirehiya tê xwestin nederbasdare, nenas e, an jî xelet e.
-        invalid_token:
-          expired: Dema nîşana gihîştinê qediya
-          revoked: Nîşana gihîştin hatibû pûçkirin
-          unknown: Nîşana gihîştinê derbasdar e
-        resource_owner_authenticator_not_configured: Xwedîyê çavkanîyê, ji ber ku nehatîye sazkirin bi ser neket di Doorkeeper.configure.resource_owner_authenticator de.
-        server_error: Rajekarê rastandinê bi şertek nediyar re rûbirû ma ku nehişt ku ew daxwazê ​​bicîh bîne.
-        temporarily_unavailable: Mafê rajekarê hetta demekî ji ber zêde barkirinê an jî lê nihêrîna rajekarê daxwaz bi cîh nay.
-        unauthorized_client: Rajegir nahêlê ku vê daxwazê bi vê awayê bicîh bîne.
-        unsupported_grant_type: Cureyê maf dayînê ji alîyê rajekara mafê va ne piştgirêdayî ye.
-        unsupported_response_type: Mafê rajekarê cûreya vê bersîvê piştgirêdayî nîne.
-    flash:
-      applications:
-        create:
-          notice: Sepan hate çêkirin.
-        destroy:
-          notice: Sepan hate jêbirin.
-        update:
-          notice: Sepan hate rojanekirin.
-      authorized_applications:
-        destroy:
-          notice: Sepan hate dûrxisitn.
-    layouts:
-      admin:
-        nav:
-          applications: Sepan
-          oauth2_provider: Peydakarê OAuth2
-      application:
-        title: Mafê dayînê OAuth pêwist e
-    scopes:
-      admin:read: hemû daneyên li ser rajekar bixwîne
-      admin:read:accounts: zanyariyên hestiyar yên hemû ajimêran li ser rajekar bixwîne
-      admin:read:reports: zanyariyên hestiyar yên hemû gilîyan û ajimêrên gilêkirî li ser rajekar bixwîne
-      admin:write: hemû daneyên li ser rajekar biguherîne
-      admin:write:accounts: di ajimêrê de çalakiyên li hev kirî pêk bîne
-      admin:write:reports: di ragihandinê de çalakiyên li hev kirî pêk bîne
-      follow: têkiliyên ajimêrê biguherîne
-      push: agahdariyên xwe bistîne
-      read: hemû daneyên ajimêra xwe bixwîne
-      read:accounts: zanyariyên ajimêran bibîne
-      read:blocks: ajimêran ku te astenkiriye bibîne
-      read:bookmarks: şûnpelên xwe bibîne
-      read:favourites: bijarteyên xwe bibîne
-      read:filters: parzûnûn xwe bibîne
-      read:follows: şopînerên xwe bibîne
-      read:lists: rêzoka xwe bibîne
-      read:mutes: ajimêrên bêdeng kirî bibîne
-      read:notifications: agahdariyên xwe bibîne
-      read:reports: ragihandinên xwe bibîne
-      read:search: li ser navê xwe lêgerîn bike
-      read:statuses: hemû şandiyan bibîne
-      write: hemû daneyên ajimêra xwe biguherîne
-      write:accounts: profîla xwe biguherîne
-      write:blocks: hemû ajimêr û navperan asteng bike
-      write:bookmarks: şandiyan di şûnpelê de tomar bike
-      write:favourites: şandiyên bijarte
-      write:filters: parzûnan çê bike
-      write:follows: kesan bişopîne
-      write:lists: rêzokan çê bike
-      write:media: pelên medya bar bike
-      write:mutes: mirovan û axaftinan bêdeng bike
-      write:notifications: agahdariyên xwe pak bike
-      write:reports: mirovên din gilî bike
-      write:statuses: şandiyekê biweşîne
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index edc89a3e2..214e2c9d8 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -4,7 +4,7 @@ ko:
     attributes:
       doorkeeper/application:
         name: 애플리케이션 이름
-        redirect_uri: 리디렉션 URI
+        redirect_uri: 리다이렉트 URI
         scopes: 범위
         website: 애플리케이션 웹사이트
     errors:
@@ -13,37 +13,37 @@ ko:
           attributes:
             redirect_uri:
               fragment_present: fragment를 포함할 수 없습니다
-              invalid_uri: 올바른 URI여야 합니다.
-              relative_uri: 절대경로 URI여야 합니다
-              secured_uri: HTTPS/SSL URI여야 합니다.
+              invalid_uri: 올바른 URI 이어야 합니다.
+              relative_uri: 절대경로 URI 이어야 합니다
+              secured_uri: " HTTPS/SSL URI 이어야 합니다."
   doorkeeper:
     applications:
       buttons:
         authorize: 승인
         cancel: 취소
         destroy: 제거
-        edit: 수정
+        edit: 편집
         submit: 제출
       confirmations:
-        destroy: 확실합니까?
+        destroy: 정말로 실행하시겠습니까?
       edit:
         title: 애플리케이션 수정
       form:
-        error: 이런! 에러를 확인하세요
+        error: 이런! 오류를 확인하세요
       help:
-        native_redirect_uri: "%{native_redirect_uri}를 이용해 로컬 테스트를 할 수 있습니다"
+        native_redirect_uri: "%{native_redirect_uri} 을/를 이용해 로컬 테스트를 할 수 있습니다"
         redirect_uri: 한 줄에 하나의 URI를 작성하세요
         scopes: 스페이스로 범위를 구분하세요. 빈 칸으로 놔두면 기본 범위를 사용합니다.
       index:
         application: 애플리케이션
         callback_url: 콜백 URL
         delete: 삭제
-        empty: 어플리케이션이 없습니다.
+        empty: 애플리케이션이 없습니다.
         name: 이름
         new: 새 애플리케이션
         scopes: 범위
         show: 표시
-        title: 당신의 애플리케이션들
+        title: 내 응용프로그램
       new:
         title: 새 애플리케이션
       show:
@@ -58,27 +58,29 @@ ko:
         authorize: 승인
         deny: 거부
       error:
-        title: 에러가 발생하였습니다
+        title: 오류가 발생하였습니다
       new:
-        able_to: 다음과 같은 행동들이 가능합니다
-        prompt: "%{client_name}이 당신의 계정에 접근 권한을 요청합니다"
+        prompt_html: "%{client_name}이 당신의 계정에 대한 접근 권한을 요청합니다. 이것은 제3자의 응용프로그램입니다. <strong>이것을 신뢰하지 않는다면, 권한을 승인하지 말아야 합니다.</strong>"
+        review_permissions: 권한 검토
         title: 승인 필요
       show:
         title: 이 승인 코드를 복사하여 애플리케이션에 붙여넣으세요
     authorized_applications:
       buttons:
-        revoke: 취소
+        revoke: 삭제
       confirmations:
         revoke: 확실합니까?
       index:
-        application: 애플리케이션
-        created_at: 승인 됨
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: 범위
-        title: 당신의 승인 된 애플리케이션들
+        authorized_at: "%{date}에 승인됨"
+        description_html: 당신의 계정에 API를 통해 접근 가능한 응용프로그램의 목록입니다. 알 수 없는 응용프로그램, 혹은 잘못된 행동을 하고 있는 응용프로그램이 있다면, 권한을 취소할 수 있습니다.
+        last_used_at: "%{date}에 마지막으로 사용됨"
+        never_used: 사용되지 않음
+        scopes: 권한
+        superapp: 내부
+        title: 승인된 응용프로그램
     errors:
       messages:
-        access_denied: 리소스 소유자 또는 권한 부여 서버가 요청을 거부했습니다.
+        access_denied: 리소스 소유자 또는 인증 서버가 요청을 거부했습니다.
         credential_flow_not_configured: Doorkeeper.configure.resource_owner_from_credentials의 설정이 되어있지 않아 리소스 소유자 패스워드 자격증명이 실패하였습니다.
         invalid_client: 알 수 없는 클라이언트이기 때문에 클라이언트 인증이 실패하였습니다, 클라이언트 자격증명이 포함되지 않았거나, 지원 되지 않는 메소드입니다.
         invalid_grant: 제공된 권한 부여가 잘못되거나, 만료되었거나, 취소되었거나, 권한 부여 요청에 사용된 리디렉션 URI가 일치하지 않거나, 다른 클라이언트에 지정되었습니다.
@@ -91,7 +93,7 @@ ko:
         invalid_scope: 요청한 범위가 올바르지 않거나, 알 수 없거나, 잘못 된 형식입니다.
         invalid_token:
           expired: 액세스 토큰이 만료되었습니다.
-          revoked: 액세스 토큰이 취소되었습니다.
+          revoked: 액세스 토큰이 삭제되었습니다.
           unknown: 액세스 토큰이 잘못되었습니다.
         resource_owner_authenticator_not_configured: Doorkeeper.configure.resource_owner_authenticator가 설정되지 않아 리소스 소유자 찾기가 실패하였습니다.
         server_error: 권한 부여 서버에 예기치 않은 상태가 발생하여, 요청을 수행할 수 없습니다.
@@ -109,7 +111,34 @@ ko:
           notice: 애플리케이션이 갱신 되었습니다.
       authorized_applications:
         destroy:
-          notice: 애플리케이션이 취소 되었습니다.
+          notice: 애플리케이션이 삭제되었습니다.
+    grouped_scopes:
+      access:
+        read: 읽기 전용 권한
+        read/write: 읽기/쓰기 권한
+        write: 쓰기 전용 권한
+      title:
+        accounts: 계정
+        admin/accounts: 계정 관리
+        admin/all: 모든 관리자 기능
+        admin/reports: 신고 관리
+        all: 전체
+        blocks: 차단
+        bookmarks: 북마크
+        conversations: 대화
+        crypto: 종단간 암호화
+        favourites: 좋아요
+        filters: 필터
+        follow: 관계
+        follows: 팔로우
+        lists: 리스트
+        media: 첨부된 미디어
+        mutes: 뮤트
+        notifications: 알림
+        push: 푸시 알림
+        reports: 신고
+        search: 검색
+        statuses: 게시물
     layouts:
       admin:
         nav:
@@ -120,16 +149,27 @@ ko:
     scopes:
       admin:read: 서버의 모든 데이터 읽기
       admin:read:accounts: 모든 계정의 민감한 정보 읽기
+      admin:read:canonical_email_blocks: 정규화된 이메일 차단 전부에 대한 민감한 정보를 읽습니다
+      admin:read:domain_allows: 도메인 허용에 대한 민감한 정보를 읽습니다
+      admin:read:domain_blocks: 도메인 차단에 대한 민감한 정보를 읽습니다
+      admin:read:email_domain_blocks: 이메일 도메인 차단에 대한 민감한 정보를 읽습니다
+      admin:read:ip_blocks: IP 차단에 대한 민감한 정보를 읽습니다
       admin:read:reports: 신고와 신고 된 계정의 민감한 정보 읽기
       admin:write: 서버의 모든 데이터 수정
       admin:write:accounts: 계정에 모더레이션 조치 취하기
+      admin:write:canonical_email_blocks: 정규화된 이메일 차단에 모더레이션 조치 취하기
+      admin:write:domain_allows: 도메인 허용에 모더레이션 조치 취하기
+      admin:write:domain_blocks: 도메인 차단에 모더레이션 조치 취하기
+      admin:write:email_domain_blocks: 이메일 도메인 차단에 모더레이션 조치 취하기
+      admin:write:ip_blocks: IP 차단에 모더레이션 조치 취하기
       admin:write:reports: 신고에 모더레이션 조치 취하기
+      crypto: 종단간 암호화 사용
       follow: 계정의 관계를 수정
       push: 푸시 알림을 받기
       read: 계정의 모든 데이터를 읽기
       read:accounts: 계정의 정보를 보기
       read:blocks: 차단을 보기
-      read:bookmarks: 내 보관함 보기
+      read:bookmarks: 내 북마크 보기
       read:favourites: 관심글을 보기
       read:filters: 필터를 보기
       read:follows: 팔로우를 보기
@@ -142,7 +182,8 @@ ko:
       write: 계정 정보 수정
       write:accounts: 프로필 수정
       write:blocks: 계정이나 도메인 차단
-      write:bookmarks: 게시글을 보관함에 넣기
+      write:bookmarks: 게시물을 북마크에 넣기
+      write:conversations: 뮤트와 대화 삭제
       write:favourites: 관심글 지정
       write:filters: 필터 만들기
       write:follows: 사람을 팔로우
diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml
index db2f0b713..b04e86d88 100644
--- a/config/locales/doorkeeper.ku.yml
+++ b/config/locales/doorkeeper.ku.yml
@@ -3,146 +3,183 @@ ku:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: ناوی بەرنامە
-        redirect_uri: URI گۆڕانی شوێن
-        scopes: بوارەکان
-        website: نەرمەکالای ماڵپەڕ
+        name: Navê sepanê
+        redirect_uri: Girêdana beralîkirî
+        scopes: Berfirehî
+        website: Malpera sepanê
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: ناتوانێت پارچەیەک لەخۆوە بگری.
-              invalid_uri: پێویستە URI دروست بێت.
-              relative_uri: پێویستە URI ی ڕەها بێت.
-              secured_uri: پێویستە HTTPS/SSL URI بێت.
+              fragment_present: perçe tê de tinne.
+              invalid_uri: divê girêdaneke derbasdar be.
+              relative_uri: divê girêdanake teqezî be.
+              secured_uri: divê girêdaneke HTTPS/SSL be.
   doorkeeper:
     applications:
       buttons:
-        authorize: ڕێگەپێدان
-        cancel: هەڵوەشاندنەوه
-        destroy: لەناوبردن
-        edit: دەستکاری
-        submit: ناردن
+        authorize: Destûr bide
+        cancel: Dev jê berde
+        destroy: Tinne bike
+        edit: Serrast bike
+        submit: Bişîne
       confirmations:
-        destroy: دڵنیای?
+        destroy: Ma tu bawerî?
       edit:
-        title: دەستکاری کردنی بەرنامە
+        title: Sepanê serrast bike
       form:
-        error: تەحح! بزانە شتێکت لە نێو فۆرمەکە بە هەڵە نەنووسیوە
+        error: Wey li min! kontrol bikeku form çewtî tê de tune
       help:
-        native_redirect_uri: بۆ تاقیکردنەوەی ناوخۆیی %{native_redirect_uri} بەکاربەرە،
-        redirect_uri: بەکارهێنانی یەک هێڵ بۆ هەر URI
-        scopes: دۆمەینەکان جیاببکەن بە بۆشاییەکان. بۆ بەکارهێنانی دۆمەینی گریمانەیی چۆڵی بەجێبهێڵە.
+        native_redirect_uri: Bo testên herêmî %{native_redirect_uri} bi kar bîne
+        redirect_uri: Yek rêz bi kar bîne bo her girêdan
+        scopes: Berfirehî bi valahîyan re veqetîne. Bo bikaranîna berfirehî ya standard vala bihêle.
       index:
-        application: نەرمەکال
-        callback_url: Callback نیشانی
-        delete: سڕینەوە
-        empty: هیچ بەرنامەیەکت نیە.
-        name: ناو
-        new: بەرنامەی نوێ
-        scopes: دۆمەینەکان
-        show: نیشاندان
-        title: بەرنامەی تۆ
+        application: Sepan
+        callback_url: Girêdana banga vegerê
+        delete: Jê bibe
+        empty: Qet sepanê te tinne.
+        name: Nav
+        new: Sepanê nû
+        scopes: Berfirehî
+        show: Nîşan bike
+        title: Sepanê te
       new:
-        title: بەرنامەی نوێ
+        title: Sepanê nû
       show:
-        actions: کارەکان
-        application_id: کلیلی ڕاژەخواز
-        callback_urls: Callback نیشانەکانی
-        scopes: دۆمەینەکان
-        secret: نهێنی ڕاژەخواز
-        title: 'بەرنامە: %{name}'
+        actions: Çalakî
+        application_id: Kilîdê rajegir
+        callback_urls: Girêdanên banga vegerê
+        scopes: Berfirehî
+        secret: Rajegirî veşartî
+        title: 'Sepan: %{name}'
     authorizations:
       buttons:
-        authorize: ڕێپێدراو
-        deny: نکۆڵی لێبکە
+        authorize: Destûr bide
+        deny: Guh nedê
       error:
-        title: هەڵەیەک ڕوویدا
+        title: Xeletîyek çêbû
       new:
-        able_to: دەتوانێت
-        prompt: بەکارهێنانی %{client_name} داوای چوونە ژوورەوە بۆ هەژمارەکەت دەکات
-        title: ڕێپێدان پێویستە
+        prompt_html: "%{client_name} mafê dixwaze ku bigihîje ajimêrê te. Ew sepanek aliyê sêyemîn e. <strong>Ku tu pê bawer nakî, wê demê divê tu mafê gihiştinê nedî. </strong>"
+        review_permissions: Gihiştinan binirxînin
+        title: Destûr kirin pêwîst e
       show:
-        title: کۆپیکردنی کۆدی ئەم رێپێدانە و لکاندنی بە بەرنامەکە.
+        title: Destûr hildana vê kodê jê bigire û ji sepanê re pêve bike.
     authorized_applications:
       buttons:
-        revoke: بەتاڵی بکە
+        revoke: Rake
       confirmations:
-        revoke: ئایا دڵنیایت?
+        revoke: Ma tu bawerî?
       index:
-        application: نەرمەکال
-        created_at: ده‌سه‌ڵاتپێدراو
-        scopes: بوارەکان
-        title: بەرنامە ڕێگەپێدراوەکانت
+        authorized_at: Maf hate dayîn di %{date} de
+        description_html: Ev sepan in ku dikarin bi riya karanîna API ve bigihîjin ajimêrê te. Ku sepanên tu li vir nas nakî hene, an sepanek çewt tevdigere, tu dikarî gihîştina wê têk bibî.
+        last_used_at: Herî dawî di %{date} de hate bikaranîn
+        never_used: Tu car nehatiye bikaranîn
+        scopes: Maf
+        superapp: Hundirin
+        title: Sepanên destûrmendê te
     errors:
       messages:
-        access_denied: خاوەنی سەرچاوە یان سێرڤەری ڕێپێدان داواکاریەکەی ڕەت کردەوە.
-        credential_flow_not_configured: لێشاوی بڕواپێدانی تێپەڕەوشەی خاوەن سەرچاوە شکستی هێنا بەهۆی Doorkeeper.configure.resource_owner_from_credentials شێوەبەندی نەکراو.
-        invalid_client: سەلماندنی کڕیار سەرکەوتوو نەبوو بەهۆی کڕیاری نەناسراوەوە، هیچ ڕەسەنایەتی سەلماندنێکی کلایەنت لەخۆوە نەدەگرێت، یان شێوازی سەلماندنی پەسەند نەکراو.
-        invalid_grant: بەخشین مۆڵەتی دابینکراو نایاساییە، بەسەرچووە، هەڵوەشاندنەوەیە، ناگونجێلەگەڵ ئاراستەی URI بەکارهاتوو لە داواکاری ڕێپێدان، یان دەرچووە بۆ کڕیارێکی تر.
-        invalid_redirect_uri: Uri دووبارە ئاڕاستەکردنەوەکە لەخۆدەگرێت دروست نیە.
-        invalid_resource_owner: بڕواپێدانەکانی خاوەنی سەرچاوەی دابینکراو دروست نیە، یان ناتوانرێت خاوەنی سەرچاوە بدۆزرێتەوە
-        invalid_scope: بواری داواکراو نادروستە، نەناسراو، یان تێکچووە.
+        access_denied: Xwedîyê çavkanîyê an jî destûrmendê rajeker daxwazî red kirin.
+        credential_flow_not_configured: Herikîna borînpeyvê bawername ya xwediyê çavkaniyê, ji ber Doorkeeper.configure.resource_owner_from_credentials nehat pevsazkirin.
+        invalid_client: Erêkirina nasnameyê rajegir ji ber rajegirê nediyar têk çû, erêkirina nasnameyê rajegir di nav da tinne an jî rêbaza erêkirinê ne piştgirêdayî ye.
+        invalid_grant: Mafê ku hatiye peyda kirin ne derbasdar e, qediya ye, pûç e, girêdana ya ku di daxwaza mafê de tê bikaranîn li hev nagire an jî rajegirekî din hildaye.
+        invalid_redirect_uri: Girêdan beralîkirî ya di nav da ne derbasdar e.
+        invalid_request:
+          missing_param: 'Pîvana hewce dike kêm e: %{value}.'
+          request_not_authorized: Hewceye daxwazî rêdayî be. Ji bo daxwazî rêdayî be pîvana hewce dike kêm an jî betal e.
+          unknown: Di nav daxwazîyê de pîvanekî hewceyî kêm e. Nirxekî pîvanê bê piştgirêdayî tê de heye an jî wek din xelet e.
+        invalid_resource_owner: Bawernameyên xwediyê çavkanîyê yên hatine pêşkeş kirin ne derbasdar e an jî xwedîyê çavkanîyê nayê dîtin
+        invalid_scope: Berfirehiya tê xwestin nederbasdare, nenas e, an jî xelet e.
         invalid_token:
-          expired: نیشانەی چوونەژورەوە بەسەرچووە
-          revoked: کۆدی دەستپێگەیشتن بەتاڵ بووەتەوە
-          unknown: دەستپێگەیشتن بە کۆدی چوونەژوور باوڕپێنەکراوە
-        resource_owner_authenticator_not_configured: خاوەنی سەرچاوە بەهۆی Doorkeeper.configure.resource_owner_authenticator کۆنفیگنەکردن سەرکەوتوو نەبوو.
-        server_error: ڕاژەکاری ڕێپێدان تووشی مەرجێکی چاوەڕوان نەکراو بوو کە رێگری دەکا لە جێبەجێ کردنی داواکاریەکە.
-        temporarily_unavailable: ڕاژەکاری ڕێپێدان لە ئێستادا ناتوانێت داواکاریەکە چارەسەر بکات لەبەر بارکردنی کاتی یان چاککردنەوەی سێرڤەرەکە.
-        unauthorized_client: ڕاژەخوازەکە دەسەڵاتی ئەوەی نییە ئەم داواکاریە بە بەکارهێنانی ئەم شێوازە بدات.
-        unsupported_grant_type: جۆری بەخشینە مۆڵەتپێدانەکە لەلایەن ڕاژەکاری مۆڵەتەوە پەسەند ناکرێت.
-        unsupported_response_type: ڕاژەکاری ڕێگەپێدان پشتگیری ئەم جۆرە وەڵامە ناکات.
+          expired: Dema nîşana gihîştinê qediya
+          revoked: Nîşana gihîştin hatibû têkbirin
+          unknown: Nîşana gihîştinê ne derbasdar e
+        resource_owner_authenticator_not_configured: Xwedîyê çavkanîyê, ji ber ku nehatîye sazkirin bi ser neket di Doorkeeper.configure.resource_owner_authenticator de.
+        server_error: Rajekarê rastandinê bi şertek nediyar re rûbirû ma ku nehişt ku ew daxwazê ​​bicîh bîne.
+        temporarily_unavailable: Mafê rajekarê hetta demekî ji ber zêde barkirinê an jî lê nihêrîna rajekarê daxwaz bi cîh nay.
+        unauthorized_client: Rajegir nahêlê ku vê daxwazê bi vê awayê bicîh bîne.
+        unsupported_grant_type: Cureyê maf dayînê ji alîyê rajekara mafê va ne piştgirêdayî ye.
+        unsupported_response_type: Mafê rajekarê cûreya vê bersîvê piştgirêdayî nîne.
     flash:
       applications:
         create:
-          notice: بەرنامە دروستکرا.
+          notice: Sepan hate çêkirin.
         destroy:
-          notice: بەرنامە سڕایەوە.
+          notice: Sepan hate jêbirin.
         update:
-          notice: بەرنامە بەڕۆژکرا.
+          notice: Sepan hate rojanekirin.
       authorized_applications:
         destroy:
-          notice: بەرنامە هەڵوەشێنڕا.
+          notice: Sepan hate dûrxisitn.
+    grouped_scopes:
+      access:
+        read: Gihîştina tenê xwendin
+        read/write: Gihîştina xwendin û nivîsandin
+        write: Gihîştina tenê nivîsandin
+      title:
+        accounts: Ajimêr
+        admin/accounts: Rêveberiya ajimêran
+        admin/all: Hemû fonksiyonên reveberî
+        admin/reports: Rêveberiya ragihandinan
+        all: Her tişt
+        blocks: Astengkirin
+        bookmarks: Şûnpel
+        conversations: Axaftin
+        crypto: Dawî bi dawî şifrekirî
+        favourites: Bijarte
+        filters: Parzûn
+        follow: Pêwendî
+        follows: Dişopîne
+        lists: Lîste
+        media: Pêvekên medya
+        mutes: Bêdengkirin
+        notifications: Agahdarî
+        push: Agahdariyên Push
+        reports: Ragihandin
+        search: Lêgerîn
+        statuses: Şandî
     layouts:
       admin:
         nav:
-          applications: بەرنامەکان
+          applications: Sepan
+          oauth2_provider: Peydakarê OAuth2
       application:
-        title: داوای ڕێپێدانی OAuth
+        title: Mafê dayînê OAuth pêwist e
     scopes:
-      admin:read: خوێندنەوەی هەموو داتاکان لەسەر ڕاژەکارەکە
-      admin:read:accounts: زانیاری هەستیاری هەموو هەژمارەکان بخوێنەوە
-      admin:read:reports: زانیاری هەستیاری هەموو گوزارشت و هەژمارە گوزارشتکراوەکان بخوێنەوە
-      admin:write: دەستکاری هەموو داتاکان بکە لەسەر ڕاژەکار
-      admin:write:accounts: ئەنجامدانی کاری میانڕەوی لەسەر هەژمارەکان
-      admin:write:reports: ئەنجامدانی کاری میانڕەوی لەسەر گوزارشتەکان
-      follow: دەستکاریکردنی پەیوەندییەکانی هەژمارەی بەکارهێنەر
-      push: وەرگرتنی ئاگانامەکانی پاڵنان
-      read: هەموو دراوەکانی هەژمارەکەت بخوێنەوە
-      read:accounts: بینینی زانیاری هەژمارەکان
-      read:blocks: بینینی بلۆکەکانت
-      read:bookmarks: نیشانەکان ببینە
-      read:favourites: بینینی دڵخوازەکانت
-      read:filters: بینینی پاڵافتنەکانت
-      read:follows: سەیری شوێنکەوتەکانت بکە
-      read:lists: بینینی لیستەکانت
-      read:mutes: بێدەنگەکانت ببینە
-      read:notifications: ئاگانامەکانت ببینە
-      read:reports: سەیری گوزارشەکانت بکە
-      read:search: گەڕان لە جیاتی تۆ
-      read:statuses: بینینی هەموو بارودۆخەکان
-      write: دەستکاری هەموو داتاکانی هەژمارەکەت بکە
-      write:accounts: دەستکاری پرۆفایلەکەت بکە
-      write:blocks: بلۆک کردنی هەژمارەکەی دۆمەینەکان
-      write:bookmarks: بارەکانی نیشانکەر
-      write:favourites: دۆخی دڵخوازەکان
-      write:filters: پاڵێوەر دروست بکە
-      write:follows: دوای خەڵک بکەوە
-      write:lists: دروستکردنی لیستەکان
-      write:media: پەڕگەی میدیا باربکە
-      write:mutes: بێدەنگکردنی خەڵک و گفتوگۆکان
-      write:notifications: ئاگانامەکانت بسڕیەوە
-      write:reports: گوزارشتکردنی کەسانی تر
-      write:statuses: بڵاوکردنەوەی بارودۆخەکان
+      admin:read: hemû daneyên li ser rajekar bixwîne
+      admin:read:accounts: zanyariyên hestiyar yên hemû ajimêran li ser rajekar bixwîne
+      admin:read:reports: zanyariyên hestiyar yên hemû ragihandinan û ajimêrên ragihandî li ser rajekar bixwîne
+      admin:write: hemû daneyên li ser rajekar biguherîne
+      admin:write:accounts: di ajimêrê de çalakiyên li hev kirî pêk bîne
+      admin:write:reports: di ragihandinê de çalakiyên li hev kirî pêk bîne
+      crypto: dawî bi dawî şifrekirî bi kar bîne
+      follow: têkiliyên ajimêrê biguherîne
+      push: agahdariyên xwe bistîne
+      read: hemû daneyên ajimêra xwe bixwîne
+      read:accounts: zanyariyên ajimêran bibîne
+      read:blocks: ajimêran ku te astenkiriye bibîne
+      read:bookmarks: şûnpelên xwe bibîne
+      read:favourites: bijarteyên xwe bibîne
+      read:filters: parzûnûn xwe bibîne
+      read:follows: ên tu dişopînî bibîne
+      read:lists: lîsteyên xwe bibîne
+      read:mutes: ajimêrên bêdeng kirî bibîne
+      read:notifications: agahdariyên xwe bibîne
+      read:reports: ragihandinên xwe bibîne
+      read:search: li ser navê xwe lêgerîn bike
+      read:statuses: hemû şandiyan bibîne
+      write: hemû daneyên ajimêra xwe biguherîne
+      write:accounts: profîla xwe biguherîne
+      write:blocks: ajimêr û navperan asteng bike
+      write:bookmarks: şandiyan di şûnpelê de tomar bike
+      write:conversations: bêdengkirin û jêbirina axaftinan
+      write:favourites: şandiyên bijarte
+      write:filters: parzûnan çê bike
+      write:follows: kesan bişopîne
+      write:lists: lîsteyan biafirîne
+      write:media: pelên medya bar bike
+      write:mutes: mirovan û axaftinan bêdeng bike
+      write:notifications: agahdariyên xwe pak bike
+      write:reports: mirovên din ragihîne
+      write:statuses: şandiyekê biweşîne
diff --git a/config/locales/doorkeeper.la.yml b/config/locales/doorkeeper.la.yml
new file mode 100644
index 000000000..3a7ba0d44
--- /dev/null
+++ b/config/locales/doorkeeper.la.yml
@@ -0,0 +1 @@
+la:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 547facc8e..a45b4822d 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -60,8 +60,8 @@ lv:
       error:
         title: Radās kļūda
       new:
-        able_to: Tā varēs
-        prompt: Lietotne %{client_name} prasa piekļuvi tavam kontam
+        prompt_html: "%{client_name} vēlas saņemt atļauju piekļūt tavam kontam. Tā ir trešās puses lietojumprogramma. <strong>Ja tu tam neuzticies, tad nevajadzētu to autorizēt.</strong>"
+        review_permissions: Pārskatīt atļaujas
         title: Nepieciešama autorizācija
       show:
         title: Nokopē šo autorizācijas kodu un ielīmē to lietotnē.
@@ -71,10 +71,12 @@ lv:
       confirmations:
         revoke: Vai esi pārliecināts?
       index:
-        application: Lietotne
-        created_at: Autorizēts
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Darbības sfēras
+        authorized_at: Autorizētas %{date}
+        description_html: Šīs ir lietojumprogrammas, kas var piekļūt tavam kontam, izmantojot API. Ja ir lietojumprogrammas, kuras šeit neatpazīsti, vai lietojumprogramma nedarbojas pareizi, vari atsaukt tām piekļuvi.
+        last_used_at: Pēdējo reizi lietotas %{date}
+        never_used: Nekad nav lietotas
+        scopes: Atļaujas
+        superapp: Iekšējs
         title: Tevis autorizētās lietotnes
     errors:
       messages:
@@ -110,6 +112,33 @@ lv:
       authorized_applications:
         destroy:
           notice: Lietotne atsaukta.
+    grouped_scopes:
+      access:
+        read: Tikai lasīšanas piekļuve
+        read/write: Lasīšanas un rakstīšanas piekļuve
+        write: Tikai rakstīšanas piekļuve
+      title:
+        accounts: Konti
+        admin/accounts: Kontu administrēšana
+        admin/all: Visas administrēšanas funkcijas
+        admin/reports: Ziņojumu administrēšana
+        all: Visi
+        blocks: Bloķētie
+        bookmarks: Grāmatzīmes
+        conversations: Sarunas
+        crypto: Pilnīga šifrēšana
+        favourites: Izlases
+        filters: Filtri
+        follow: Attiecības
+        follows: Seko
+        lists: Saraksti
+        media: Mediju pielikumi
+        mutes: Apklusinātie
+        notifications: Paziņojumi
+        push: Uznirstošie paziņojumi
+        reports: Ziņojumi
+        search: Meklēt
+        statuses: Ziņas
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ lv:
     scopes:
       admin:read: lasīt visus datus uz servera
       admin:read:accounts: lasīt sensitīvu informāciju no visiem kontiem
+      admin:read:canonical_email_blocks: lasīt sensitīvu informāciju par visiem kanoniskajiem e-pasta blokiem
+      admin:read:domain_allows: lasīt visu domēnu sensitīvo informāciju, ko atļauj
+      admin:read:domain_blocks: lasīt sensitīvu informāciju par visiem domēna blokiem
+      admin:read:email_domain_blocks: lasīt sensitīvu informāciju par visiem e-pasta domēna blokiem
+      admin:read:ip_blocks: lasīt sensitīvu informāciju par visiem IP blokiem
       admin:read:reports: lasīt sensitīvu informāciju no visiem pārskatiem un kontiem, par kuriem ziņots
       admin:write: modificēt visus datus uz servera
       admin:write:accounts: veikt moderācijas darbības kontos
+      admin:write:canonical_email_blocks: veikt regulēšanas darbības kanoniskajos e-pasta blokos
+      admin:write:domain_allows: veikt moderēšanas darbības domēna atļaujā
+      admin:write:domain_blocks: veikt moderēšanas darbības domēna blokos
+      admin:write:email_domain_blocks: veikt moderēšanas darbības e-pasta domēna blokos
+      admin:write:ip_blocks: veikt moderēšanas darbības IP blokos
       admin:write:reports: veikt moderācijas darbības pārskatos
+      crypto: lieto pilnīgu šifrēšanu
       follow: mainīt konta attiecības
       push: saņemt savus push paziņojumus
       read: lasīt visus sava konta datus
@@ -143,6 +183,7 @@ lv:
       write:accounts: labot manu profilu
       write:blocks: bloķēt kontus un domēnus
       write:bookmarks: pievienotās grāmatzīmes
+      write:conversations: apklusināt un dzēst sarunas
       write:favourites: iecienītākās ziņas
       write:filters: izveidot filtrus
       write:follows: seko cilvēkiem
diff --git a/config/locales/doorkeeper.ml.yml b/config/locales/doorkeeper.ml.yml
index 83a37b1cd..8d65fce7d 100644
--- a/config/locales/doorkeeper.ml.yml
+++ b/config/locales/doorkeeper.ml.yml
@@ -59,9 +59,6 @@ ml:
       confirmations:
         revoke: നിങ്ങൾക്ക് ഉറപ്പാണോ?
       index:
-        application: അപ്ലിക്കേഷന്‍
-        created_at: അംഗീകാരപ്പെടുത്തിയത്
-        date_format: "%Y-%m-%d %H:%M:%S"
         title: നിങ്ങളുടെ അംഗീകൃത അപ്ലിക്കേഷനുകൾ
     errors:
       messages:
diff --git a/config/locales/doorkeeper.ms.yml b/config/locales/doorkeeper.ms.yml
index 2925688a0..87c1078c1 100644
--- a/config/locales/doorkeeper.ms.yml
+++ b/config/locales/doorkeeper.ms.yml
@@ -1 +1,54 @@
+---
 ms:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nama aplikasi
+  doorkeeper:
+    applications:
+      buttons:
+        cancel: Batal
+        edit: Sunting
+        submit: Hantar
+      confirmations:
+        destroy: Anda pasti?
+      index:
+        delete: Padam
+        name: Nama
+        show: Paparkan
+    authorized_applications:
+      index:
+        superapp: Dalaman
+    flash:
+      applications:
+        create:
+          notice: Aplikasi dicipta.
+        destroy:
+          notice: Aplikasi dipadamkan.
+        update:
+          notice: Aplikasi dikemaskini.
+    grouped_scopes:
+      title:
+        accounts: Akaun
+        admin/accounts: Pengurusan akaun
+        admin/all: Semua fungsi pengurusan
+        admin/reports: Pengurusan laporan
+        all: Semua
+        conversations: Perbualan
+        follow: Hubungan
+        follows: Ikutan
+        media: Lampiran media
+        notifications: Pemberitahuan
+        push: Pemberitahuan segera
+        reports: Laporan
+        search: Cari
+        statuses: Hantaran
+    scopes:
+      admin:read: baca semua data pada pelayan
+      admin:read:accounts: baca maklumat sensitif untuk semua akaun
+      admin:read:reports: baca maklumat sensitif untuk semua laporan dan akaun-akaun yang dilaporkan
+      admin:write: mengubah semua data pada pelayan
+      read:statuses: lihat semua hantaran
+      write:bookmarks: menandabuku hantaran
+      write:favourites: hantaran kegemaran
+      write:statuses: terbitkan hantaran
diff --git a/config/locales/doorkeeper.my.yml b/config/locales/doorkeeper.my.yml
new file mode 100644
index 000000000..5e1fc6bee
--- /dev/null
+++ b/config/locales/doorkeeper.my.yml
@@ -0,0 +1 @@
+my:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 786a0fcb8..67ba5aa9d 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -60,8 +60,8 @@ nl:
       error:
         title: Er is een fout opgetreden
       new:
-        able_to: Deze toepassing zal in staat zijn om
-        prompt: "%{client_name} autoriseren om jouw account te gebruiken"
+        prompt_html: "%{client_name} heeft toestemming nodig om toegang te krijgen tot jouw account. Het betreft een third-party-toepassing.<strong>Als je dit niet vertrouwt, moet je geen toestemming verlenen.</strong>"
+        review_permissions: Toestemmingen beoordelen
         title: Autorisatie vereist
       show:
         title: Kopieer deze autorisatiecode en plak het in de toepassing.
@@ -71,10 +71,12 @@ nl:
       confirmations:
         revoke: Weet je het zeker?
       index:
-        application: Toepassing
-        created_at: Aangemaakt op
-        date_format: "%d-%m-%Y %H:%M:%S"
+        authorized_at: Toestemming verleent op %{date}
+        description_html: Dit zijn toepassingen die toegang hebben tot jouw account via de API. Als er toepassingen tussen staan die je niet herkent of een toepassing zich misdraagt, kun je de toegangsrechten van de toepassing intrekken.
+        last_used_at: Voor het laatst gebruikt op %{date}
+        never_used: Nooit gebruikt
         scopes: Toestemmingen
+        superapp: Intern
         title: Jouw geautoriseerde toepassingen
     errors:
       messages:
@@ -110,6 +112,33 @@ nl:
       authorized_applications:
         destroy:
           notice: Toepassing ingetrokken.
+    grouped_scopes:
+      access:
+        read: Alleen leestoegang
+        read/write: Lees- en schrijftoegang
+        write: Alleen schrijftoegang
+      title:
+        accounts: Accounts
+        admin/accounts: Accountbeheer
+        admin/all: Alle beheerfuncties
+        admin/reports: Rapportagebeheer
+        all: Alles
+        blocks: Blokkeren
+        bookmarks: Bladwijzers
+        conversations: Gesprekken
+        crypto: End-to-end-encryptie
+        favourites: Favorieten
+        filters: Filters
+        follow: Relaties
+        follows: Volgend
+        lists: Lijsten
+        media: Mediabijlagen
+        mutes: Negeren
+        notifications: Meldingen
+        push: Pushmeldingen
+        reports: Rapportages
+        search: Zoeken
+        statuses: Berichten
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ nl:
     scopes:
       admin:read: alle gegevens op de server lezen
       admin:read:accounts: gevoelige informatie van alle accounts lezen
+      admin:read:canonical_email_blocks: lees gevoelige informatie van alle canonieke e-mailblokken
+      admin:read:domain_allows: lees gevoelige informatie van alle domeinen
+      admin:read:domain_blocks: lees gevoelige informatie van alle domeinblokken
+      admin:read:email_domain_blocks: lees gevoelige informatie van alle e-maildomeinblokken
+      admin:read:ip_blocks: lees gevoelige informatie van alle IP-blokken
       admin:read:reports: gevoelige informatie van alle rapportages en gerapporteerde accounts lezen
       admin:write: wijzig alle gegevens op de server
-      admin:write:accounts: moderatieacties op accounts uitvoeren
-      admin:write:reports: moderatieacties op rapportages uitvoeren
+      admin:write:accounts: moderatiemaatregelen tegen accounts nemen
+      admin:write:canonical_email_blocks: voer moderatieacties uit op canonieke e-mailblokken
+      admin:write:domain_allows: voer moderatieacties uit op domeintoestemmingen
+      admin:write:domain_blocks: moderatiemaatregelen nemen op domeinblokkades
+      admin:write:email_domain_blocks: moderatiemaatregelen nemen op e-maildomeinen
+      admin:write:ip_blocks: moderatiemaatregelen nemen tegen IP-adresblokken
+      admin:write:reports: moderatiemaatregelen nemen in rapportages
+      crypto: end-to-end-encryptie gebruiken
       follow: relaties tussen accounts bewerken
       push: jouw pushmeldingen ontvangen
       read: alle gegevens van jouw account lezen
@@ -136,14 +176,15 @@ nl:
       read:lists: jouw lijsten bekijken
       read:mutes: jouw genegeerde gebruikers bekijken
       read:notifications: jouw meldingen bekijken
-      read:reports: jouw gerapporteerde toots bekijken
+      read:reports: jouw gerapporteerde berichten bekijken
       read:search: namens jou zoeken
-      read:statuses: alle toots bekijken
+      read:statuses: alle berichten bekijken
       write: alle gegevens van jouw account bewerken
       write:accounts: jouw profiel bewerken
       write:blocks: accounts en domeinen blokkeren
-      write:bookmarks: toots aan bladwijzers toevoegen
-      write:favourites: toots als favoriet markeren
+      write:bookmarks: berichten aan bladwijzers toevoegen
+      write:conversations: gespreken negeren en verwijderen
+      write:favourites: berichten als favoriet markeren
       write:filters: filters aanmaken
       write:follows: mensen volgen
       write:lists: lijsten aanmaken
@@ -151,4 +192,4 @@ nl:
       write:mutes: mensen en gesprekken negeren
       write:notifications: meldingen verwijderen
       write:reports: andere mensen rapporteren
-      write:statuses: toots publiceren
+      write:statuses: berichten plaatsen
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 419bc28a6..10e7fbc1d 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -5,7 +5,7 @@ nn:
       doorkeeper/application:
         name: Applikasjonsnamn
         redirect_uri: Omdirigerings-URI
-        scopes: Skop
+        scopes: Omfang
         website: Applikasjonsnettside
     errors:
       models:
@@ -33,15 +33,15 @@ nn:
       help:
         native_redirect_uri: Bruk %{native_redirect_uri} for lokale testar
         redirect_uri: Bruk ei linjer per URI
-        scopes: Skil skop med mellomrom. Ikkje fyll inn noko som helst for å bruke standardskop.
+        scopes: Skil omfang med mellomrom. La stå tomt for å bruka standardomfang.
       index:
         application: Applikasjon
         callback_url: Callback-URL
         delete: Slett
-        empty: Du har ikkje nokon applikasjonar.
+        empty: Du har ingen applikasjonar.
         name: Namn
         new: Ny applikasjon
-        scopes: Skop
+        scopes: Omfang
         show: Vis
         title: Dine applikasjonar
       new:
@@ -50,7 +50,7 @@ nn:
         actions: Handlingar
         application_id: Klientnøkkel
         callback_urls: Callback-URLar
-        scopes: Skop
+        scopes: Omfang
         secret: Klienthemmelegheit
         title: 'Applikasjon: %{name}'
     authorizations:
@@ -60,8 +60,8 @@ nn:
       error:
         title: Ein feil har oppstått
       new:
-        able_to: Applikasjonen vil kunne
-        prompt: Applikasjonen %{client_name} spør om tilgang til kontoen din
+        prompt_html: "%{client_name} ønsker tilgang til kontoen din. Det er ein tredjepartsapplikasjon. <strong>Dersom du ikkje stolar på den, bør du ikkje autorisere det.</strong>"
+        review_permissions: Sjå gjennom løyve
         title: Autorisasjon nødvendig
       show:
         title: Kopier denne autorisasjonskoden og lim den inn i applikasjonen.
@@ -71,29 +71,36 @@ nn:
       confirmations:
         revoke: Er du sikker?
       index:
-        application: Applikasjon
-        created_at: Autorisert
-        scopes: Skop
+        authorized_at: Autorisert den %{date}
+        description_html: Desse programma har tilgang til kontoen diin frå programgrensesnittet. Dersom du ser program her som du ikkje kjenner att, eller eit program oppfører seg feil, kan du trekkja tilbake tillgangen her.
+        last_used_at: Sist brukt den %{date}
+        never_used: Aldri brukt
+        scopes: Løyve
+        superapp: Intern
         title: Dine autoriserte applikasjonar
     errors:
       messages:
         access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden.
-        credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje verte fullført av di «Doorkeeper.configure.resource_owner_from_credentials» er ikkje konfigurert.
-        invalid_client: Klientautentisering feilet på grunn av ukjent klient, ingen autentisering inkludert, eller autentiseringsmetode er ikke støttet.
-        invalid_grant: Autoriseringen er ugyldig, utløpt, opphevet, stemmer ikke overens med omdirigerings-URIen eller var utstedt til en annen klient.
+        credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje fullførast sidan «Doorkeeper.configure.resource_owner_from_credentials» ikkje er konfigurert.
+        invalid_client: Klientautentisering feila på grunn av ukjent klient, ingen inkludert autentisering, eller ikkje støtta autentiseringsmetode.
+        invalid_grant: Autoriseringa er ugyldig, utløpt, oppheva, stemmer ikkje med omdirigerings-URIen eller var tildelt ein annan klient.
         invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig.
-        invalid_resource_owner: Ressurseierens detaljer er ikke gyldige, eller så er det ikke mulig å finne eieren
+        invalid_request:
+          missing_param: 'Manglar naudsynt parameter: %{value}.'
+          request_not_authorized: Førespurnaden må godkjennast. Naudsynt parameter for godkjenning manglar eller er ugyldig.
+          unknown: Førespurnaden manglar ein naudsynt parameter, inneheld ein parameter som ikkje er støtta, eller er misdanna.
+        invalid_resource_owner: Ressurseigardetaljane er ikkje gyldige, eller så er det ikkje mogleg å finna eigaren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
         invalid_token:
-          expired: Tilgangsbeviset har utløpt
-          revoked: Tilgangsbeviset har blitt opphevet
+          expired: Tilgangsbeviset har gått ut på dato
+          revoked: Tilgangsbeviset har blitt oppheva
           unknown: Tilgangsbeviset er ugyldig
-        resource_owner_authenticator_not_configured: Ressurseier kunne ikke finnes fordi Doorkeeper.configure.resource_owner_authenticator ikke er konfigurert.
-        server_error: Autoriseringstjeneren støtte på en uventet hendelse som hindret den i å svare på forespørslen.
-        temporarily_unavailable: Autoriseringstjeneren kan ikke håndtere forespørslen grunnet en midlertidig overbelastning eller tjenervedlikehold.
-        unauthorized_client: Klienten har ikke autorisasjon for å utføre denne forespørslen med denne metoden.
-        unsupported_grant_type: Autorisasjonstildelingstypen er ikke støttet av denne autoriseringstjeneren.
-        unsupported_response_type: Autorisasjonsserveren støtter ikke denne typen av forespørsler.
+        resource_owner_authenticator_not_configured: Ressurseigar kunne ikkje finnast fordi Doorkeeper.configure.resource_owner_authenticator ikkje er konfigurert.
+        server_error: Autoriseringstenaren støtte på ei uventa hending som hindra han i å svara på førespurnaden.
+        temporarily_unavailable: Autoriseringstenaren kan ikkje hansama førespurnaden grunna kortvarig overbelastning eller tenarvedlikehald.
+        unauthorized_client: Klienten har ikkje autorisasjon for å utføra førespurnaden med denne metoden.
+        unsupported_grant_type: Autorisasjonstildelingstypen er ikkje støtta av denne autoriseringstenaren.
+        unsupported_response_type: Autorisasjonstenaren støttar ikkje denne typen førespurnader.
     flash:
       applications:
         create:
@@ -105,25 +112,63 @@ nn:
       authorized_applications:
         destroy:
           notice: App avvist.
+    grouped_scopes:
+      access:
+        read: Berre lesetligang
+        read/write: Lese- og skrivetilgang
+        write: Berre skrivetilgang
+      title:
+        accounts: Kontoar
+        admin/accounts: Kontoadministrasjon
+        admin/all: Alle administrative funksjonar
+        admin/reports: Rapportadministrasjon
+        all: Alt
+        blocks: Blokkeringar
+        bookmarks: Bokmerke
+        conversations: Samtalar
+        crypto: Ende-til-ende-kryptering
+        favourites: Favorittar
+        filters: Filter
+        follow: Forhold
+        follows: Fylgjer
+        lists: Lister
+        media: Mediavedlegg
+        mutes: Målbindingar
+        notifications: Varsel
+        push: Pushvarsel
+        reports: Rapportar
+        search: Søk
+        statuses: Innlegg
     layouts:
       admin:
         nav:
           applications: Appar
-          oauth2_provider: OAuth2-tilbyder
+          oauth2_provider: OAuth2-tilbydar
       application:
-        title: OAuth-autorisering påkrevet
+        title: Krav om OAuth-autorisering
     scopes:
       admin:read: lese alle data på tjeneren
-      admin:read:accounts: lese sensitiv informasjon om alle kontoer
-      admin:read:reports: lese sensitiv informasjon om alle rapporter og rapporterte kontoer
-      admin:write: modifisere alle data på tjeneren
-      admin:write:accounts: utføre moderatorhandlinger på kontoer
-      admin:write:reports: utføre moderatorhandlinger på rapporter
-      follow: følg, blokkér, avblokkér, avfølg brukere
-      push: motta dine varsler
-      read: lese dine data
-      read:accounts: se informasjon om kontoer
-      read:blocks: se dine blokkeringer
+      admin:read:accounts: lese sensitiv informasjon om alle kontoar
+      admin:read:canonical_email_blocks: les ømtolig informasjon om alle kanoniske e-postblokkeringar
+      admin:read:domain_allows: les ømtolig informasjon om alle domeneløyve
+      admin:read:domain_blocks: les ømtolig informasjon om alle domeneblokkeringar
+      admin:read:email_domain_blocks: les ømtolig informasjon om alle e-postdomeneblokkeringar
+      admin:read:ip_blocks: les ømtolig informasjon om alle IP-blokkeringar
+      admin:read:reports: lese sensitiv informasjon om alle rapportar og rapporterte kontoar
+      admin:write: endre alle data på tenaren
+      admin:write:accounts: utføre moderatorhandlingar på kontoar
+      admin:write:canonical_email_blocks: utføre modereringshandlingar på kanoniske e-postblokkeringar
+      admin:write:domain_allows: utføre modereringshandlingar på domeneløyve
+      admin:write:domain_blocks: utføre modereringshandlingar på domeneblokkeringar
+      admin:write:email_domain_blocks: utføre modereringshandlingar på e-postdomeneblokkeringar
+      admin:write:ip_blocks: utføre modereringshandlingar på IP-blokkeringar
+      admin:write:reports: utføre moderatorhandlingar på rapportar
+      crypto: bruk ende-til-ende-kryptering
+      follow: fylg, blokkér, avblokkér, avfylg brukarar
+      push: motta pushvarsla dine
+      read: lese alle dine kontodata
+      read:accounts: sjå informasjon om kontoar
+      read:blocks: sjå dine blokkeringar
       read:bookmarks: sjå bokmerka dine
       read:favourites: sjå favorittane dine
       read:filters: sjå filtera dine
@@ -132,13 +177,14 @@ nn:
       read:mutes: sjå kven du har målbunde
       read:notifications: sjå varsla dine
       read:reports: sjå rapportane dine
-      read:search: søke på dine vegne
-      read:statuses: sjå alle statusar
-      write: poste på dine vegne
-      write:accounts: rediger profilen din
+      read:search: søke på dine vegner
+      read:statuses: sjå alle innlegg
+      write: endre alle dine kontodata
+      write:accounts: redigera profilen din
       write:blocks: blokker kontoar og domene
-      write:bookmarks: bokmerk statusar
-      write:favourites: merk statusar som favoritt
+      write:bookmarks: bokmerk innlegg
+      write:conversations: målbind og slett samtalar
+      write:favourites: merk innlegg som favoritt
       write:filters: lag filter
       write:follows: fylg folk
       write:lists: lag lister
@@ -146,4 +192,4 @@ nn:
       write:mutes: målbind folk og samtalar
       write:notifications: tøm varsla dine
       write:reports: rapporter andre folk
-      write:statuses: legg ut statusar
+      write:statuses: publiser innlegg
diff --git a/config/locales/doorkeeper.no.yml b/config/locales/doorkeeper.no.yml
index eeddcfa36..99faff5c7 100644
--- a/config/locales/doorkeeper.no.yml
+++ b/config/locales/doorkeeper.no.yml
@@ -3,7 +3,7 @@
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Navn
+        name: Applikasjonsnavn
         redirect_uri: Omdirigerings-URI
         scopes: Omfang
         website: Applikasjonsnettside
@@ -12,24 +12,24 @@
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: kan ikke inneholde ett fragment.
+              fragment_present: kan ikke inneholde et fragment.
               invalid_uri: må være en gyldig URI.
               relative_uri: må være en absolutt URI.
               secured_uri: må være en HTTPS/SSL URI.
   doorkeeper:
     applications:
       buttons:
-        authorize: Autoriser
+        authorize: Autorisér
         cancel: Avbryt
         destroy: Ødelegg
-        edit: Rediger
+        edit: Redigér
         submit: Send inn
       confirmations:
         destroy: Er du sikker?
       edit:
         title: Endre applikasjon
       form:
-        error: Oops! Sjekk skjemaet ditt for mulige feil
+        error: Oops! Sjekk om du har feil i skjemaet ditt
       help:
         native_redirect_uri: Bruk %{native_redirect_uri} for lokale tester
         redirect_uri: Bruk én linje per URI
@@ -60,8 +60,8 @@
       error:
         title: En feil oppstod
       new:
-        able_to: Den vil ha mulighet til
-        prompt: Applikasjon %{client_name} spør om tilgang til din konto
+        prompt_html: "%{client_name} ønsker tilgang til kontoen din. Det er en tredjeparts applikasjon. <strong>Hvis du ikke stoler på den, bør du ikke autorisere den.</strong>"
+        review_permissions: Gå gjennom tillatelser
         title: Autorisasjon påkrevd
       show:
         title: Kopier denne koden og lim den inn i programmet.
@@ -71,22 +71,24 @@
       confirmations:
         revoke: Opphev?
       index:
-        application: Applikasjon
-        created_at: Autorisert
-        date_format: "%d. %m %Y kl. %H.%M.%S"
-        scopes: Omfang
+        authorized_at: Autorisert %{date}
+        description_html: Dette er applikasjoner som kan få tilgang til kontoen din ved hjelp av API-et. Hvis det finnes applikasjoner du ikke gjenkjenner her, eller en applikasjon skaper problemer, kan du tilbakekalle tilgangen den har.
+        last_used_at: Sist brukt %{date}
+        never_used: Aldri brukt
+        scopes: Tillatelser
+        superapp: Internt
         title: Dine autoriserte applikasjoner
     errors:
       messages:
-        access_denied: Ressurseieren eller autoriseringstjeneren avviste forespørslen.
+        access_denied: Ressurseieren eller autoriseringsserveren avviste forespørselen.
         credential_flow_not_configured: Ressurseiers passordflyt feilet fordi Doorkeeper.configure.resource_owner_from_credentials ikke var konfigurert.
         invalid_client: Klientautentisering feilet på grunn av ukjent klient, ingen autentisering inkludert, eller autentiseringsmetode er ikke støttet.
-        invalid_grant: Autoriseringen er ugyldig, utløpt, opphevet, stemmer ikke overens med omdirigerings-URIen eller var utstedt til en annen klient.
+        invalid_grant: Autoriseringen er ugyldig, utløpt, opphevet, stemmer ikke overens med omdirigerings-URIen i autoriseringsforespørselen eller var utstedt til en annen klient.
         invalid_redirect_uri: Den inkluderte omdirigerings-URLen er ikke gyldig.
         invalid_request:
           missing_param: 'Mangler påkrevd parameter: %{value}.'
-          request_not_authorized: Forespørselen må godkjennes. Påkrevd parameter for godkjenningsforespørselen mangler eller er ugyldig.
-          unknown: Forespørselen mangler en påkrevd parameter, inkluderer en ukjent parameterverdi, eller er utformet for noe annet.
+          request_not_authorized: Forespørselen må autoriseres. Påkrevd parameter for autorisasjonsforespørselen mangler eller er ugyldig.
+          unknown: Forespørselen mangler en påkrevd parameter, inkluderer en parameterverdi som ikke støttes, eller har på annet vis feil struktur.
         invalid_resource_owner: Ressurseierens detaljer er ikke gyldige, eller så er det ikke mulig å finne eieren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
         invalid_token:
@@ -95,10 +97,10 @@
           unknown: Tilgangsbeviset er ugyldig
         resource_owner_authenticator_not_configured: Ressurseier kunne ikke finnes fordi Doorkeeper.configure.resource_owner_authenticator ikke er konfigurert.
         server_error: Autoriseringstjeneren støtte på en uventet hendelse som hindret den i å svare på forespørslen.
-        temporarily_unavailable: Autoriseringstjeneren kan ikke håndtere forespørslen grunnet en midlertidig overbelastning eller tjenervedlikehold.
+        temporarily_unavailable: Autoriseringsserveren kan ikke håndtere forespørselen grunnet en midlertidig overbelastning eller vedlikehold av serveren.
         unauthorized_client: Klienten har ikke autorisasjon for å utføre denne forespørslen med denne metoden.
         unsupported_grant_type: Autorisasjonstildelingstypen er ikke støttet av denne autoriseringstjeneren.
-        unsupported_response_type: Autorisasjonsserveren støtter ikke denne typen av forespørsler.
+        unsupported_response_type: Autorisasjonsserveren støtter ikke denne respons-typen.
     flash:
       applications:
         create:
@@ -110,45 +112,74 @@
       authorized_applications:
         destroy:
           notice: Applikasjon opphevet.
+    grouped_scopes:
+      access:
+        read: Kun lesetilgang
+        read/write: Lese- og skrivetilgang
+        write: Kun skrivetilgang
+      title:
+        accounts: Kontoer
+        admin/accounts: Administrasjon av kontoer
+        admin/all: All administrativ funksjonalitet
+        admin/reports: Administrasjon av rapporteringer
+        all: Alt
+        blocks: Blokkeringer
+        bookmarks: Bokmerker
+        conversations: Samtaler
+        crypto: Ende-til-ende-kryptering
+        favourites: Favoritter
+        filters: Filtre
+        follow: Relasjoner
+        follows: Følger
+        lists: Lister
+        media: Mediavedlegg
+        mutes: Dempinger
+        notifications: Varslinger
+        push: Push-varslinger
+        reports: Rapporteringer
+        search: Søk
+        statuses: Innlegg
     layouts:
       admin:
         nav:
           applications: Applikasjoner
-          oauth2_provider: OAuth2-tilbyder
+          oauth2_provider: OAuth2-leverandør
       application:
         title: OAuth-autorisering påkrevet
     scopes:
       admin:read: lese alle data på tjeneren
-      admin:read:accounts: lese sensitiv informasjon om alle kontoer
-      admin:read:reports: lese sensitiv informasjon om alle rapporter og rapporterte kontoer
+      admin:read:accounts: lese sensitive opplysninger for alle kontoer
+      admin:read:reports: lese sensitive opplysninger for alle rapporter og rapporterte kontoer
       admin:write: modifisere alle data på tjeneren
       admin:write:accounts: utføre moderatorhandlinger på kontoer
       admin:write:reports: utføre moderatorhandlinger på rapporter
-      follow: følg, blokkér, avblokkér, avfølg brukere
-      push: motta dine varsler
+      crypto: bruk ende-til-ende-kryptering
+      follow: endre konto-relasjoner
+      push: motta push-varslingene dine
       read: lese dine data
       read:accounts: se informasjon om kontoer
-      read:blocks: se dine blokkeringer
-      read:bookmarks: se dine bokmerker
-      read:favourites: se dine likinger
-      read:filters: se dine filtre
-      read:follows: se dine følginger
+      read:blocks: se blokkeringene dine
+      read:bookmarks: se bokmerkene dine
+      read:favourites: se favorittene dine
+      read:filters: se filtrene dine
+      read:follows: se hvem du følger
       read:lists: se listene dine
       read:mutes: se dine dempinger
-      read:notifications: se dine varslinger
-      read:reports: se dine rapporter
+      read:notifications: se varslingene dine
+      read:reports: se rapportene dine
       read:search: søke på dine vegne
-      read:statuses: se alle statuser
+      read:statuses: se alle innlegg
       write: poste på dine vegne
       write:accounts: endre på profilen din
       write:blocks: blokkere kontoer og domener
-      write:bookmarks: bokmerke statuser
-      write:favourites: like statuser
-      write:filters: opprett filtre
-      write:follows: følg personer
-      write:lists: opprett lister
-      write:media: last opp mediafiler
+      write:bookmarks: bokmerke innlegg
+      write:conversations: dempe og slette samtaler
+      write:favourites: favorittmarker innlegg
+      write:filters: opprette filtre
+      write:follows: følge personer
+      write:lists: opprette lister
+      write:media: laste opp mediafiler
       write:mutes: dempe folk og samtaler
-      write:notifications: tømme dine varsler
+      write:notifications: tømme varslingene dine
       write:reports: rapportere andre folk
-      write:statuses: legg ut statuser
+      write:statuses: legge ut innlegg
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index 471ed1c8c..d86fbe793 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -60,8 +60,8 @@ oc:
       error:
         title: I a agut un error
       new:
-        able_to: Aquesta aplicacion poirà
-        prompt: L’aplicacion %{client_name} demanda l’accès al vòstre compte
+        prompt_html: "%{client_name} volria l’autorizacion d’accedir a vòstre compte. Es una aplicacion tèrça.<strong>Se vos fisatz pas a ela, alara deuriatz pas l’autorizacion.</strong>"
+        review_permissions: Repassar las autorizacions
         title: Cal l’autorizacion
       show:
         title: Copiatz lo còdi d’autorizacion e pegatz-lo dins l’aplicacion.
@@ -71,10 +71,12 @@ oc:
       confirmations:
         revoke: Ne sètz segur ?
       index:
-        application: Aplicacion
-        created_at: Creacion
-        date_format: "%-d %b. de %Y %Ho%M %S"
-        scopes: Encastres
+        authorized_at: Autorizada lo %{date}
+        description_html: Aquestas aplicacions pòdon accedir a vòstre compte via l’API. S’i a d’aplicacions que coneissètz pas aicí o qu’una aplicacion se compòrta pas coma cal, podètz revocar son accès.
+        last_used_at: Darrièra utilizacion lo %{date}
+        never_used: Pas jamai utilizada
+        scopes: Autorizacions
+        superapp: Intèrna
         title: Las vòstras aplicacions autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ oc:
       authorized_applications:
         destroy:
           notice: Aplicacion revocada.
+    grouped_scopes:
+      access:
+        read: Accès lectura sola
+        read/write: Accès lectura e escritura
+        write: Accès escritura sola
+      title:
+        accounts: Comptes
+        admin/accounts: Administracion de comptes
+        admin/all: Totas las foncions administrativas
+        admin/reports: Administracion de senhalaments
+        all: Tot
+        blocks: Blocatges
+        bookmarks: Marcadors
+        conversations: Conversacions
+        crypto: Chiframent del cap a la fin
+        favourites: Favorits
+        filters: Filtres
+        follow: Relacions
+        follows: Abonaments
+        lists: Listas
+        media: Fichièrs junts
+        mutes: Resconduts
+        notifications: Notificacions
+        push: Notificacions Push
+        reports: Senhalament
+        search: Recercar
+        statuses: Publicacions
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ oc:
       admin:write: modificacion de las donadas del servidor
       admin:write:accounts: realizacion d’accions de moderacion suls comptes
       admin:write:reports: realizacion d’accions suls senhalaments
+      crypto: utilizar lo chiframent del cap a la fin
       follow: modificar las relacions del compte
       push: recebre vòstras notificacions push
       read: legir totas las donadas de vòstre compte
@@ -143,6 +173,7 @@ oc:
       write:accounts: modificar vòstre perfil
       write:blocks: blocar de comptes e de domenis
       write:bookmarks: ajustar als marcadors
+      write:conversations: amudir e suprimir las conversacions
       write:favourites: metre en favorit
       write:filters: crear de filtres
       write:follows: sègre de mond
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 2954fad8f..75af425de 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -60,8 +60,8 @@ pl:
       error:
         title: Wystapił błąd
       new:
-        able_to: Uzyska
-        prompt: Aplikacja %{client_name} prosi o dostęp do Twojego konta
+        prompt_html: "%{client_name} chciałby uzyskać pozwolenie na dostęp do Twojego konta. Jest to aplikacja zewnętrzna. <strong>Jeśli jej nie ufasz, nie powinno się jej autoryzować.</strong>"
+        review_permissions: Sprawdź uprawnienia
         title: Wymagana jest autoryzacja
       show:
         title: Skopiuj kod uwierzytelniający i wklej go w aplikacji.
@@ -71,10 +71,12 @@ pl:
       confirmations:
         revoke: Czy na pewno?
       index:
-        application: Aplikacja
-        created_at: Autoryzowana
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Zakresy
+        authorized_at: Autoryzowano %{date}
+        description_html: Są to aplikacje, które mogą uzyskać dostęp do Twojego konta za pomocą API. Jeśli są tu aplikacje, których nie rozpoznajesz lub aplikacja zachowuje się nieprawidłowo, możesz usunąć jej dostęp.
+        last_used_at: Ostatnio używane %{date}
+        never_used: Nigdy nieużywane
+        scopes: Uprawnienia
+        superapp: Wewnętrzne
         title: Twoje autoryzowane aplikacje
     errors:
       messages:
@@ -110,6 +112,33 @@ pl:
       authorized_applications:
         destroy:
           notice: Unieważniono aplikację.
+    grouped_scopes:
+      access:
+        read: Dostęp w trybie tylko do odczytu
+        read/write: Uprawnienia do odczytu i zapisu
+        write: Dostęp w trybie tylko do odczytu
+      title:
+        accounts: Konta
+        admin/accounts: Zarządzanie kontami użytkowników
+        admin/all: Wszystkie opcje administratora
+        admin/reports: Zarządzanie zgłoszeniami
+        all: Wszystko
+        blocks: Zablokowane
+        bookmarks: Zakładki
+        conversations: Konwersacje
+        crypto: Szyfrowanie End-to-End
+        favourites: Ulubione
+        filters: Filtry
+        follow: Relacje
+        follows: Obserwowani
+        lists: Listy
+        media: Załączniki multimedialne
+        mutes: Wyciszenia
+        notifications: Powiadomienia
+        push: Powiadomienia push
+        reports: Zgłoszenia
+        search: Szukaj
+        statuses: Wpisy
     layouts:
       admin:
         nav:
@@ -124,7 +153,8 @@ pl:
       admin:write: zmodyfikuj wszystkie dane na serwerze
       admin:write:accounts: wykonaj działania moderacyjne na kontach
       admin:write:reports: wykonaj działania moderacyjne na zgłoszeniach
-      follow: możliwość śledzenia kont
+      crypto: użyj szyfrowania end-to-end
+      follow: możliwość zarządzania relacjami kont
       push: otrzymywanie powiadomień push dla Twojego konta
       read: możliwość odczytu wszystkich danych konta
       read:accounts: dostęp do informacji o koncie
@@ -132,7 +162,7 @@ pl:
       read:bookmarks: dostęp do zakładek
       read:favourites: dostęp do listy ulubionych
       read:filters: dostęp do filtrów
-      read:follows: dostęp do listy śledzonych
+      read:follows: dostęp do listy obserwowanych
       read:lists: dostęp do Twoich list
       read:mutes: dostęp do listy wyciszonych
       read:notifications: możliwość odczytu powiadomień
@@ -143,9 +173,10 @@ pl:
       write:accounts: możliwość modyfikowania informacji o koncie
       write:blocks: możliwość blokowania domen i użytkowników
       write:bookmarks: możliwość dodawania wpisów do zakładek
+      write:conversations: wycisz i usuń konwersacje
       write:favourites: możliwość dodawnia wpisów do ulubionych
       write:filters: możliwość tworzenia filtrów
-      write:follows: możliwość śledzenia ludzi
+      write:follows: możliwość obserwowania ludzi
       write:lists: możliwość tworzenia list
       write:media: możliwość wysyłania zawartości multimedialnej
       write:mutes: możliwość wyciszania ludzi i konwersacji
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index 822159c10..d097b954d 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -60,8 +60,8 @@ pt-BR:
       error:
         title: Ocorreu um erro
       new:
-        able_to: Poderá
-        prompt: O aplicativo %{client_name} solicita acesso à sua conta
+        prompt_html: O %{client_name} gostaria de ter permissão para acessar sua conta. É uma aplicação de terceiros. <strong>Se você não confia, então você não deve autorizá-lo.</strong>
+        review_permissions: Revisar permissões
         title: Autorização necessária
       show:
         title: Copie este código de autorização e cole no aplicativo.
@@ -71,10 +71,12 @@ pt-BR:
       confirmations:
         revoke: Você tem certeza?
       index:
-        application: Aplicativos
-        created_at: Autorizados
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Autorizações
+        authorized_at: Autorizado em %{date}
+        description_html: Estas são as aplicações que podem acessar sua conta usando a API. Se houver aplicativos que você não reconhece ou com mau funcionamento, você pode revogar seu acesso.
+        last_used_at: Última vez usado em %{date}
+        never_used: Nunca usado
+        scopes: Permissões
+        superapp: Interno
         title: Aplicativos autorizados
     errors:
       messages:
@@ -110,6 +112,33 @@ pt-BR:
       authorized_applications:
         destroy:
           notice: Aplicativo revogado.
+    grouped_scopes:
+      access:
+        read: Acesso somente para leitura
+        read/write: Acesso de leitura e escrita
+        write: Acesso somente para escrita
+      title:
+        accounts: Contas
+        admin/accounts: Administração de contas
+        admin/all: Todas as funções administrativas
+        admin/reports: Controle de denúncias
+        all: Tudo
+        blocks: Bloqueios
+        bookmarks: Salvos
+        conversations: Conversas
+        crypto: Criptografia de ponta a ponta
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relacionamentos
+        follows: Seguidores
+        lists: Listas
+        media: Mídias anexadas
+        mutes: Silenciados
+        notifications: Notificações
+        push: Notificações push
+        reports: Denúncias
+        search: Buscar
+        statuses: Publicações
     layouts:
       admin:
         nav:
@@ -124,6 +153,7 @@ pt-BR:
       admin:write: alterar todos os dados no servidor
       admin:write:accounts: executar ações de moderação em contas
       admin:write:reports: executar ações de moderação em denúncias
+      crypto: usar criptografia de ponta-a-ponta
       follow: alterar o relacionamento das contas
       push: receber notificações push
       read: ler todos os dados da sua conta
@@ -143,6 +173,7 @@ pt-BR:
       write:accounts: alterar seu perfil
       write:blocks: bloquear contas e domínios
       write:bookmarks: salvar toots
+      write:conversations: silenciar e excluir conversas
       write:favourites: favoritar toots
       write:filters: criar filtros
       write:follows: seguir pessoas
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 4a5bb899a..2648118d8 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -60,8 +60,8 @@ pt-PT:
       error:
         title: Ocorreu um erro
       new:
-        able_to: Vai poder
-        prompt: Aplicação %{client_name} pede acesso à tua conta
+        prompt_html: "%{client_name} pretende ter permissão para aceder à sua conta. É uma aplicação de terceiros. <strong>Se não confia nesta aplicação, então não deve autorizá-la.</strong>"
+        review_permissions: Rever permissões
         title: Autorização é necessária
       show:
         title: Copiar o código desta autorização e colar na aplicação.
@@ -71,10 +71,12 @@ pt-PT:
       confirmations:
         revoke: Tens a certeza?
       index:
-        application: Aplicação
-        created_at: Criada em
-        date_format: "%d-%m-%Y %H:%M:%S"
-        scopes: Autorizações
+        authorized_at: Autorizado em %{date}
+        description_html: Estas são aplicações que podem aceder à sua conta utilizando a API. Se encontrar aqui aplicativos que não reconhece, ou um aplicativo está com mau funcionamento, pode revogar o seu acesso.
+        last_used_at: Última utilização em %{date}
+        never_used: Nunca utilizado
+        scopes: Permissões
+        superapp: Interna
         title: As tuas aplicações autorizadas
     errors:
       messages:
@@ -110,6 +112,33 @@ pt-PT:
       authorized_applications:
         destroy:
           notice: Aplicação revogada.
+    grouped_scopes:
+      access:
+        read: Acesso só de leitura
+        read/write: Acesso de leitura e escrita
+        write: Acesso só de escrita
+      title:
+        accounts: Contas
+        admin/accounts: Administração de contas
+        admin/all: Todas as funções administrativas
+        admin/reports: Administração de denúncias
+        all: Tudo
+        blocks: Bloqueios
+        bookmarks: Itens Salvos
+        conversations: Conversas
+        crypto: Encriptação ponta-a-ponta
+        favourites: Favoritos
+        filters: Filtros
+        follow: Relações
+        follows: Seguidores
+        lists: Listas
+        media: Anexos de media
+        mutes: Silenciados
+        notifications: Notificações
+        push: Notificações push
+        reports: Denúncias
+        search: Pesquisa
+        statuses: Publicações
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ pt-PT:
     scopes:
       admin:read: ler todos os dados no servidor
       admin:read:accounts: ler informações sensíveis de todas as contas
-      admin:read:reports: ler informações sensíveis de todos os relatórios e contas reportadas
+      admin:read:canonical_email_blocks: ler informações sensíveis de todos os bloqueios de endereços de e-mail canônicos
+      admin:read:domain_allows: ler informações sensíveis de todos os domínios permitios
+      admin:read:domain_blocks: ler informações sensíveis de todos os bloqueios de domínio
+      admin:read:email_domain_blocks: ler informações sensíveis de todos os bloqueios de domínio de e-mail
+      admin:read:ip_blocks: ler informações sensíveis de todos os bloqueios de IPs
+      admin:read:reports: ler informações sensíveis de todas as denúnicas e contas denunciadas
       admin:write: modificar todos os dados no servidor
       admin:write:accounts: executar ações de moderação em contas
-      admin:write:reports: executar ações de moderação em relatórios
+      admin:write:canonical_email_blocks: executar ações de moderação no bloqueio de endereços de e-mail canônicos
+      admin:write:domain_allows: executar ações de moderação na permissão de domínios
+      admin:write:domain_blocks: executar ações de moderação no bloqueio de domínios
+      admin:write:email_domain_blocks: executar ações de moderação no bloqueio de domínios de e-mail
+      admin:write:ip_blocks: executar ações de moderação no bloqueio de IPs
+      admin:write:reports: executar ações de moderação em denúncias
+      crypto: usa encriptação ponta-a-ponta
       follow: siga, bloqueie, desbloqueie, e deixa de seguir contas
       push: receber as suas notificações push
       read: tenha acesso aos dados da tua conta
@@ -143,6 +183,7 @@ pt-PT:
       write:accounts: modificar o seu perfil
       write:blocks: bloquear contas e domínios
       write:bookmarks: estado dos favoritos
+      write:conversations: silenciar e eliminar conversas
       write:favourites: estado dos favoritos
       write:filters: criar filtros
       write:follows: seguir pessoas
@@ -150,5 +191,5 @@ pt-PT:
       write:media: carregar arquivos de media
       write:mutes: silenciar pessoas e conversas
       write:notifications: limpar as suas notificações
-      write:reports: reportar outras pessoas
+      write:reports: denunciar outras pessoas
       write:statuses: publicar estado
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index fc4efdcc5..7ad11d13a 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -60,8 +60,8 @@ ro:
       error:
         title: A apărut o eroare
       new:
-        able_to: Acesta va putea să
-        prompt: Aplicația %{client_name} cere acces la contul dvs
+        prompt_html: "%{client_name} dorește să îți acceseze contul. Este o aplicație terță. <strong>Dacă nu aveți încredere în ea, atunci nu ar trebui să o autorizați.</strong>"
+        review_permissions: Revizuiește permisiunile
         title: Autorizare necesară
       show:
         title: Copiați acest cod de autorizare și lipiți-l în aplicație.
@@ -71,9 +71,12 @@ ro:
       confirmations:
         revoke: Ești sigur?
       index:
-        application: Aplicație
-        created_at: Autorizat
-        scopes: Domenii
+        authorized_at: Autorizat pe %{date}
+        description_html: Acestea sunt aplicațiile care vă pot accesa contul folosind API. Dacă există aplicații pe care nu le recunoașteți, sau o aplicație se comportă necorespunzător, puteți revoca accesul.
+        last_used_at: Utilizat ultima dată pe %{date}
+        never_used: Nu a fost folosit niciodată
+        scopes: Permisiuni
+        superapp: Intern
         title: Aplicațiile dvs autorizate
     errors:
       messages:
@@ -82,6 +85,10 @@ ro:
         invalid_client: Autentificarea clientului a eșuat din cauza unui client necunoscut, nici o autentificare client inclusă, sau metodă de autentificare nesuportată.
         invalid_grant: Acordarea autorizației furnizată este invalidă, expirată, revocată, nu corespunde URI-ului de redirecționare folosit în cererea de autorizare, sau a fost eliberat altui client.
         invalid_redirect_uri: Uri-ul de redirecționare inclus nu este valid.
+        invalid_request:
+          missing_param: 'Lipseste parametrul necesar: %{value}.'
+          request_not_authorized: Solicitarea trebuie să fie autorizată. Parametrul necesar pentru solicitarea de autorizare lipsește sau este invalid.
+          unknown: Solicitarea nu are un parametru necesar, include un parametru nesuportat sau este dealtfel formatat incorect.
         invalid_resource_owner: Acreditările proprietarului de resurse nu sunt valide sau proprietarul de resurse nu poate fi găsit
         invalid_scope: Domeniul de aplicare solicitat este invalid, necunoscut sau incorect.
         invalid_token:
@@ -105,6 +112,33 @@ ro:
       authorized_applications:
         destroy:
           notice: Aplicație revocată.
+    grouped_scopes:
+      access:
+        read: Acces numai în citire
+        read/write: Acces de citire și scriere
+        write: Acces doar pentru scriere
+      title:
+        accounts: Conturi
+        admin/accounts: Administrarea conturilor
+        admin/all: Toate funcțiile administrative
+        admin/reports: Administrarea rapoartelor
+        all: Tot
+        blocks: Blocuri
+        bookmarks: Marcaje
+        conversations: Conversații
+        crypto: Criptare în ambele părți
+        favourites: Favorite
+        filters: Filtre
+        follow: Relații
+        follows: Urmăriri
+        lists: Liste
+        media: Atașamente media
+        mutes: Pus pe silențios
+        notifications: Notificări
+        push: Notificări push
+        reports: Rapoarte
+        search: Caută
+        statuses: Postări
     layouts:
       admin:
         nav:
@@ -119,6 +153,7 @@ ro:
       admin:write: modifică toate datele de pe server
       admin:write:accounts: efectuează acțiuni de moderare pe conturi
       admin:write:reports: efectuează acțiuni de moderare pe rapoarte
+      crypto: utilizează criptare la ambele capete
       follow: modifică relațiile contului
       push: primește notificările tale push
       read: citește toate datele contului tău
@@ -138,6 +173,7 @@ ro:
       write:accounts: modifică profilul tău
       write:blocks: blochează conturile și domeniile
       write:bookmarks: marchează stările
+      write:conversations: dezactivează și șterge conversațiile
       write:favourites: favorizează stările
       write:filters: creează filtre
       write:follows: urmărește persoane
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index df36db865..97bf7fcc1 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -3,7 +3,7 @@ ru:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Название
+        name: Название приложения
         redirect_uri: URI перенаправления
         scopes: Разрешения
         website: Веб-сайт приложения
@@ -36,7 +36,7 @@ ru:
         scopes: Разделяйте список разрешений пробелами. Оставьте незаполненным для использования разрешений по умолчанию.
       index:
         application: Приложение
-        callback_url: URL обратной связи
+        callback_url: URL-адреса обратного вызова
         delete: Удалить
         empty: У вас нет созданных приложений.
         name: Название
@@ -48,8 +48,8 @@ ru:
         title: Создание приложения
       show:
         actions: Действия
-        application_id: Id приложения
-        callback_urls: Callback urls
+        application_id: Ключ клиента
+        callback_urls: URL-адреса обратного вызова
         scopes: Разрешения
         secret: Секрет
         title: 'Приложение: %{name}'
@@ -60,8 +60,8 @@ ru:
       error:
         title: Произошла ошибка
       new:
-        able_to: Оно сможет
-        prompt: Приложение %{client_name} запрашивает доступ к Вашей учётной записи
+        prompt_html: "%{client_name} хочет получить доступ к вашему аккаунту. Это стороннее приложение. <strong>Если вы ему не доверяете, не разрешайте доступ.</strong>"
+        review_permissions: Просмотр разрешений
         title: Требуется авторизация
       show:
         title: Скопируйте этот код авторизации и вставьте его в приложении.
@@ -71,10 +71,12 @@ ru:
       confirmations:
         revoke: Вы уверены?
       index:
-        application: Приложение
-        created_at: Авторизовано
-        date_format: "%d.%m.%Y %H:%M:%S"
+        authorized_at: Доступ получен %{date}
+        description_html: Это приложения, которые могут получить доступ к вашей учетной записи с помощью API. Если здесь есть приложения, которые вы не узнаете, или приложения, работающие неправильно, вы можете отозвать их доступ.
+        last_used_at: Последнее использование %{date}
+        never_used: Не использовалось
         scopes: Разрешения
+        superapp: Внутреннее
         title: Ваши авторизованные приложения
     errors:
       messages:
@@ -110,6 +112,33 @@ ru:
       authorized_applications:
         destroy:
           notice: Авторизация приложения отозвана.
+    grouped_scopes:
+      access:
+        read: Доступ только для чтения
+        read/write: Доступ на чтение и запись
+        write: Доступ только для записи
+      title:
+        accounts: Учётные записи
+        admin/accounts: Управление учётными записями
+        admin/all: Все административные функции
+        admin/reports: Управление отчётами
+        all: Все
+        blocks: Блокировки
+        bookmarks: Закладки
+        conversations: Диалоги
+        crypto: Сквозное шифрование
+        favourites: Избранное
+        filters: Фильтры
+        follow: Взаимосвязи
+        follows: Подписки
+        lists: Списки
+        media: Медиафайлы
+        mutes: Игнорирует
+        notifications: Уведомления
+        push: Push-уведомления
+        reports: Обращения
+        search: Поиск
+        statuses: Посты
     layouts:
       admin:
         nav:
@@ -120,10 +149,13 @@ ru:
     scopes:
       admin:read: читать все данные на сервере
       admin:read:accounts: читать конфиденциальную информацию всех учётных записей
+      admin:read:canonical_email_blocks: чтение конфиденциальной информации всех канонических блоков электронной почты
+      admin:read:domain_allows: чтение конфиденциальной информации для всего домена позволяет
       admin:read:reports: читать конфиденциальную информацию о всех жалобах и учётных записях с жалобами
       admin:write: модифицировать все данные на сервере
       admin:write:accounts: производить модерацию учётных записей
       admin:write:reports: производить модерацию жалоб
+      crypto: использ. сквозное шифрование
       follow: управлять подписками и списком блокировок
       push: получать push-уведомления
       read: просматривать данные вашей учётной записи
@@ -134,7 +166,7 @@ ru:
       read:filters: видеть ваши фильтры
       read:follows: видеть ваши подписки
       read:lists: видеть ваши списки
-      read:mutes: видеть список игнорируемых
+      read:mutes: смотреть список игнорируемых
       read:notifications: получать уведомления
       read:reports: видеть ваши жалобы
       read:search: использовать поиск
@@ -143,12 +175,13 @@ ru:
       write:accounts: редактировать ваш профиль
       write:blocks: блокировать учётные записи и домены
       write:bookmarks: добавлять посты в закладки
+      write:conversations: игнорировать и удалить разговоры
       write:favourites: отмечать посты как избранные
       write:filters: создавать фильтры
       write:follows: подписываться на людей
       write:lists: создавать списки
       write:media: загружать медиафайлы
-      write:mutes: добавлять в игнорируемое людей и обсуждения
+      write:mutes: игнорировать людей и обсуждения
       write:notifications: очищать список уведомлений
       write:reports: отправлять жалобы на других
       write:statuses: публиковать посты
diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml
index db857affd..7631d2cc1 100644
--- a/config/locales/doorkeeper.sc.yml
+++ b/config/locales/doorkeeper.sc.yml
@@ -60,8 +60,6 @@ sc:
       error:
         title: Faddina
       new:
-        able_to: At a pòdere
-        prompt: S'aplicatzione %{client_name} est preguntende atzessu a su contu tuo
         title: Autorizatzione rechesta
       show:
         title: Còpia custu còdighe de autorizatzione e incolla·ddu a s'aplicatzione.
@@ -71,10 +69,6 @@ sc:
       confirmations:
         revoke: Seguru?
       index:
-        application: Aplicatzione
-        created_at: Autorizada
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Àmbitos
         title: Is aplicatziones autorizadas tuas
     errors:
       messages:
diff --git a/config/locales/doorkeeper.sco.yml b/config/locales/doorkeeper.sco.yml
new file mode 100644
index 000000000..60453dc78
--- /dev/null
+++ b/config/locales/doorkeeper.sco.yml
@@ -0,0 +1,185 @@
+---
+sco:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Application nemm
+        redirect_uri: Redireck URI
+        scopes: Scopes
+        website: Application wabsteid
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: cannae contain a fragment.
+              invalid_uri: haes tae be a valid URI.
+              relative_uri: haes tae be an absolute URI.
+              secured_uri: haes tae be a HTTPS/SSL URI.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Alloo
+        cancel: Cancel
+        destroy: Destroy
+        edit: Edit
+        submit: Pit in
+      confirmations:
+        destroy: Ye shuir?
+      edit:
+        title: Edit application
+      form:
+        error: Ooft! Check yer form fir possible mistaks
+      help:
+        native_redirect_uri: Uise %{native_redirect_uri} fir local tests
+        redirect_uri: Uise ae line per URI
+        scopes: Separate scopes wi spaces. Lea blank fir tae uise the default scopes.
+      index:
+        application: Application
+        callback_url: Cawback URL
+        delete: Delete
+        empty: Ye'v nae applications.
+        name: Nemm
+        new: New application
+        scopes: Scopes
+        show: Shaw
+        title: Yer applications
+      new:
+        title: New application
+      show:
+        actions: Actions
+        application_id: Client key
+        callback_urls: Cawback URLs
+        scopes: Scopes
+        secret: Client secret
+        title: 'Application: %{name}'
+    authorizations:
+      buttons:
+        authorize: Authorize
+        deny: Deny
+      error:
+        title: A error haes occurrt
+      new:
+        prompt_html: "%{client_name} wad like permission fir tae access yer accoont. It is a third-party application. <strong>Gin ye dinnae trust it, then ye shuidnae authorize it.</strong>"
+        review_permissions: Luik ower permissions
+        title: Authorization requirt
+      show:
+        title: Copy this authorization code an paste it in tae the application.
+    authorized_applications:
+      buttons:
+        revoke: Tak awa
+      confirmations:
+        revoke: Ye shuir?
+      index:
+        authorized_at: Authorized on %{date}
+        description_html: This is the applications thit kin access yer accoont uisin the API. Gin there applications thit ye dinnae recognize here, or a application isnae behavin richt, ye kin tak awa its access.
+        last_used_at: Last uised on %{date}
+        never_used: Never uised
+        scopes: Permissions
+        superapp: Internal
+        title: Yer authorized applications
+    errors:
+      messages:
+        access_denied: The resoorce ainer or authorization server denied the request.
+        credential_flow_not_configured: Resoorce Ainer Passwird Credentials flow failed doon tae Doorkeeper.configure.resource_owner_from_credentials no bein configurt.
+        invalid_client: Client authentication failed doon tae unkent client, nae client authentication includit, or unsupportit authentication method.
+        invalid_grant: The provided authorization grant isnae valid, expirit, revokt, disnae match the redirection URI uised in the authorization request, or wis issued tae anither client.
+        invalid_redirect_uri: The redirect uri includit isnae valid.
+        invalid_request:
+          missing_param: 'Missing requirit parameter: %{value}.'
+          request_not_authorized: Request need fir tae be authorized. Requirit parameter fir authorizin request is missin or invalid.
+          unknown: The request is missin a requirit parameter, includes a unsupportit parameter value, or is itherwise malformt.
+        invalid_resource_owner: The providit resoorce ainer credentials urnae valid, or resoorce ainer cannae be fun
+        invalid_scope: The requestit scope isnae valid, unkent, or malformt.
+        invalid_token:
+          expired: The access token expirit
+          revoked: The access token wis revokt
+          unknown: The access token isnae valid
+        resource_owner_authenticator_not_configured: Resoorce Ainer fin failt doon tae Doorkeeper.configure.resource_owner_authenticator bein unconfigurt.
+        server_error: The authorization server encoontert a unexpectit condition thit preventit it fae fulfillin the request.
+        temporarily_unavailable: The authorization server currently isnae able tae haunnle the request doon tae a temporary owerloadin or maintenance o the server.
+        unauthorized_client: The client isnae authorized fir tae perform this request uisin this method.
+        unsupported_grant_type: The authorization grant type isnae supportit bi the authorization server.
+        unsupported_response_type: The authorization server disnae support this response type.
+    flash:
+      applications:
+        create:
+          notice: Application makkit.
+        destroy:
+          notice: Application deletit.
+        update:
+          notice: Application updatit.
+      authorized_applications:
+        destroy:
+          notice: Application revokit.
+    grouped_scopes:
+      access:
+        read: Read-ainly access
+        read/write: Read an write access
+        write: Write-ainly access
+      title:
+        accounts: Accoonts
+        admin/accounts: Administration o accoonts
+        admin/all: Aw administrative functions
+        admin/reports: Administration o clypes
+        all: Awthin
+        blocks: Dingies
+        bookmarks: Buikmairks
+        conversations: Conversations
+        crypto: En-tae-en encryption
+        favourites: Favourites
+        filters: Filters
+        follow: Relationships
+        follows: Follaes
+        lists: Lists
+        media: Media attachments
+        mutes: Wheeshts
+        notifications: Notes
+        push: Push notes
+        reports: Clypes
+        search: Seirch
+        statuses: Posts
+    layouts:
+      admin:
+        nav:
+          applications: Applications
+          oauth2_provider: OAuth2 Provider
+      application:
+        title: OAuth authorization requirit
+    scopes:
+      admin:read: read aw data on the server
+      admin:read:accounts: read sensitive information fae aw accoonts
+      admin:read:reports: read sensitive information fae aw clyped an clyped on accoonts
+      admin:write: modify aw data on the server
+      admin:write:accounts: perform moderation actions on accoonts
+      admin:write:reports: perform moderation actions on clypes
+      crypto: uise en-tae-en encryption
+      follow: modify accoont relationships
+      push: get yer push notifications
+      read: read aw yer accoont's data
+      read:accounts: see accoonts information
+      read:blocks: see yer dingies
+      read:bookmarks: see yer buikmairks
+      read:favourites: see yer favourites
+      read:filters: see yer filters
+      read:follows: see yer follaes
+      read:lists: see yer lists
+      read:mutes: see yet wheeshts
+      read:notifications: see yer notes
+      read:reports: see yer clypes
+      read:search: seirch on yer behauf
+      read:statuses: see aw posts
+      write: modify aw yer accoont's data
+      write:accounts: modify yer profile
+      write:blocks: dingie accoonts an domains
+      write:bookmarks: buikmairk posts
+      write:conversations: wheesht an delete conversations
+      write:favourites: favourite posts
+      write:filters: mak filters
+      write:follows: follae fowk
+      write:lists: mak lists
+      write:media: upload media files
+      write:mutes: wheesht fowk an conversations
+      write:notifications: claer yer notes
+      write:reports: clype on ither fowk
+      write:statuses: publish posts
diff --git a/config/locales/doorkeeper.si.yml b/config/locales/doorkeeper.si.yml
index 5a97eb41f..ebb7f474f 100644
--- a/config/locales/doorkeeper.si.yml
+++ b/config/locales/doorkeeper.si.yml
@@ -4,10 +4,22 @@ si:
     attributes:
       doorkeeper/application:
         name: යෙදුමේ නම
+        redirect_uri: URI යළි-යොමු කරන්න
+        scopes: විෂය පථයන්
         website: යෙදුමේ වියමන අඩවිය
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: කොටසක් අඩංගු විය නොහැක.
+              invalid_uri: වලංගු URI එකක් විය යුතුය.
+              relative_uri: නිරපේක්ෂ URI විය යුතුය.
+              secured_uri: HTTPS/SSL URI එකක් විය යුතුය.
   doorkeeper:
     applications:
       buttons:
+        authorize: අවසරලත්
         cancel: අවලංගු
         destroy: විනාශ කරන්න
         edit: සංස්කරණය
@@ -15,12 +27,21 @@ si:
       confirmations:
         destroy: ඔබට විශ්වාසද?
       edit:
-        title: යෙදුම සංස්කරණය කරන්න
+        title: යෙදුම සංස්කරණය
+      form:
+        error: අපොයි! විය හැකි දෝෂ සඳහා ඔබේ පෝරමය පරීක්ෂා කරන්න
+      help:
+        native_redirect_uri: දේශීය පරීක්ෂණ සඳහා %{native_redirect_uri} භාවිතා කරන්න
+        redirect_uri: URI එකකට එක පේළියක් භාවිතා කරන්න
+        scopes: අවකාශයන් සහිත විෂය පථයන් වෙන් කරන්න. පෙරනිමි විෂය පථ භාවිතා කිරීමට හිස්ව තබන්න.
       index:
         application: යෙදුම
+        callback_url: ආපසු ඇමතුම් URL
+        delete: මකන්න
         empty: ඔබට කිසිම යෙදුමක් නැත.
         name: නම
         new: නව යෙදුම
+        scopes: විෂය පථයන්
         show: පෙන්වන්න
         title: ඔබගේ යෙදුම්
       new:
@@ -28,36 +49,137 @@ si:
       show:
         actions: ක්‍රියාමාර්ග
         application_id: අනුග්‍රාහක යතුර
+        callback_urls: ආපසු ඇමතුම් URL
+        scopes: විෂය පථයන්
         secret: අනුග්‍රාහකයේ රහස
         title: 'යෙදුම: %{name}'
     authorizations:
       buttons:
         authorize: සත්‍යාපනය
+        deny: ප්‍රතික්ෂේප කරන්න
+      error:
+        title: දෝෂයක් සිදුවී ඇත
+      new:
+        prompt_html: "%{client_name} ඔබගේ ගිණුමට ප්‍රවේශ වීමට අවසර ලබා ගැනීමට කැමති වේ. එය තෙවන පාර්ශවීය යෙදුමකි. <strong>ඔබ එය විශ්වාස නොකරන්නේ නම්, ඔබ එයට අවසර නොදිය යුතුය.</strong>"
+        review_permissions: අවසර සමාලෝචනය කරන්න
+        title: බලය පැවරීමේ අවශ්ය
+      show:
+        title: මෙම අවසර කේතය පිටපත් කර එය යෙදුමට අලවන්න.
     authorized_applications:
+      buttons:
+        revoke: අවලංගු කරන්න
       confirmations:
         revoke: ඔබට විශ්වාසද?
       index:
-        application: යෙදුම
-        date_format: "%Y-%m-%d %H:%M:%S"
+        authorized_at: "%{date}මත අවසර දී ඇත"
+        description_html: මේවා API භාවිතයෙන් ඔබගේ ගිණුමට ප්‍රවේශ විය හැකි යෙදුම් වේ. ඔබ මෙහි හඳුනා නොගත් යෙදුම් තිබේ නම්, හෝ යෙදුමක් වැරදි ලෙස හැසිරෙන්නේ නම්, ඔබට එහි ප්‍රවේශය අවලංගු කළ හැක.
+        last_used_at: අවසන් වරට භාවිතා කළේ %{date}
+        never_used: කවදාවත් පාවිච්චි කළේ නැහැ
+        scopes: අවසර
+        superapp: අභ්යන්තර
+        title: ඔබගේ බලයලත් අයදුම්පත්
+    errors:
+      messages:
+        access_denied: සම්පත් හිමිකරු හෝ අවසර සේවාදායකය ඉල්ලීම ප්‍රතික්ෂේප කළේය.
+        credential_flow_not_configured: Doorkeeper.configure.resource_owner_from_credentials වින්‍යාස නොකිරීම හේතුවෙන් සම්පත් හිමිකරුගේ මුරපද අක්තපත්‍ර ප්‍රවාහය අසාර්ථක විය.
+        invalid_client: නොදන්නා සේවාලාභියා නිසා සේවාලාභී සත්‍යාපනය අසාර්ථක විය, සේවාලාභී සත්‍යාපනය ඇතුළත් කර නැත, හෝ සහය නොදක්වන සත්‍යාපන ක්‍රමයක්.
+        invalid_grant: සපයා ඇති අවසර දීමනාව වලංගු නැත, කල් ඉකුත් වී ඇත, අවලංගු කර ඇත, අවසර ඉල්ලීමේ භාවිතා කරන ලද යළි-යොමුවීම් URI සමඟ නොගැලපේ, නැතහොත් වෙනත් සේවාදායකයෙකුට නිකුත් කර ඇත.
+        invalid_redirect_uri: ඇතුළත් කර ඇති යළි-යොමුවීම් uri වලංගු නොවේ.
+        invalid_request:
+          missing_param: 'අවශ්‍ය පරාමිතිය අස්ථානගත වී ඇත: %{value}.'
+          request_not_authorized: ඉල්ලීම අනුමත කළ යුතුය. අවසර ඉල්ලීම සඳහා අවශ්‍ය පරාමිතිය අස්ථානගත වී හෝ වලංගු නොවේ.
+          unknown: ඉල්ලීමට අවශ්‍ය පරාමිතියක් අස්ථානගත වී ඇත, සහය නොදක්වන පරාමිති අගයක් ඇතුළත් වේ, නැතහොත් වෙනත් ආකාරයකින් විකෘති වී ඇත.
+        invalid_resource_owner: සපයන ලද සම්පත් හිමිකරු අක්තපත්‍ර වලංගු නැත, නැතහොත් සම්පත් හිමිකරු සොයාගත නොහැක
+        invalid_scope: ඉල්ලා සිටින විෂය පථය වලංගු නැත, නොදන්නා, හෝ විකෘති වී ඇත.
+        invalid_token:
+          expired: ප්‍රවේශ ටෝකනය කල් ඉකුත් විය
+          revoked: ප්‍රවේශ ටෝකනය අවලංගු කරන ලදී
+          unknown: ප්‍රවේශ ටෝකනය වලංගු නොවේ
+        resource_owner_authenticator_not_configured: Doorkeeper.configure.resource_owner_authenticator වින්‍යාසගත නොවීම හේතුවෙන් සම්පත් හිමිකරු සොයා ගැනීම අසාර්ථක විය.
+        server_error: අවසර සේවාදායකයට අනපේක්ෂිත කොන්දේසියක් ඇති වූ අතර එය ඉල්ලීම ඉටු කිරීම වළක්වයි.
+        temporarily_unavailable: තාවකාලික අධි බර පැටවීමක් හෝ සේවාදායකයේ නඩත්තුවක් හේතුවෙන් අවසර සේවාදායකයට ඉල්ලීම හැසිරවීමට දැනට නොහැක.
+        unauthorized_client: මෙම ක්‍රමය භාවිතයෙන් මෙම ඉල්ලීම ඉටු කිරීමට සේවාදායකයාට අවසර නැත.
+        unsupported_grant_type: අවසර ප්‍රදාන වර්ගයට බලය පැවරීමේ සේවාදායකය විසින් සහය නොදක්වයි.
+        unsupported_response_type: අවසර සේවාදායකය මෙම ප්‍රතිචාර වර්ගයට සහය නොදක්වයි.
+    flash:
+      applications:
+        create:
+          notice: යෙදුම නිර්මාණය කරන ලදී.
+        destroy:
+          notice: යෙදුම මකා ඇත.
+        update:
+          notice: යෙදුම යාවත්කාලීන කරන ලදී.
+      authorized_applications:
+        destroy:
+          notice: අයදුම්පත අවලංගු කරන ලදී.
+    grouped_scopes:
+      access:
+        read: කියවීමට පමණක් ප්‍රවේශය
+        read/write: කියවීමට සහ ලිවීමට ප්‍රවේශය
+        write: ලිවීමට පමණක් ප්‍රවේශය
+      title:
+        accounts: ගිණුම්
+        admin/accounts: ගිණුම් පරිපාලනය
+        admin/all: සියලුම පරිපාලන කාර්යයන්
+        admin/reports: වාර්තා පරිපාලනය
+        all: සියල්ල
+        blocks: කුට්ටි
+        bookmarks: පිටු සලකුණු
+        conversations: සංවාද
+        crypto: අන්ත සංකේතනය
+        favourites: ප්රියතම
+        filters: පෙරහන්
+        follow: සබඳතා
+        follows: පහත සඳහන්
+        lists: ලැයිස්තු
+        media: මාධ්ය ඇමුණුම්
+        mutes: නිහඬ කරයි
+        notifications: දැනුම්දීම්
+        push: තල්ලු දැනුම්දීම්
+        reports: වාර්තා
+        search: සොයන්න
+        statuses: ලිපි
     layouts:
       admin:
         nav:
           applications: යෙදුම්
           oauth2_provider: වි.සත්‍යා.2 (OAuth) සැපයුම්කරු
       application:
-        title: වි.සත්‍යා. (OAuth) අනුමැතිය අවශ්‍යයයි
+        title: වි.සත්යා. (OAuth) තොරතුරු අවශ්‍යයි
     scopes:
       admin:read: සේවාදායකයේ ඇති සියලුම දත්ත කියවන්න
       admin:read:accounts: සියලුම ගිණුම් වල සංවේදී තොරතුරු කියවන්න
       admin:read:reports: සියලුම වාර්තා සහ වාර්තා කළ ගිණුම් වල සංවේදී තොරතුරු කියවන්න
+      admin:write: සේවාදායකයේ සියලුම දත්ත වෙනස් කරන්න
+      admin:write:accounts: ගිණුම් මත මධ්‍යස්ථ ක්‍රියා සිදු කරන්න
+      admin:write:reports: වාර්තා මත මධ්‍යස්ථ ක්‍රියා සිදු කරන්න
+      crypto: end-to-end encryption භාවිතා කරන්න
+      follow: ගිණුම් සබඳතා වෙනස් කරන්න
+      push: ඔබගේ තල්ලු දැනුම්දීම් ලබා ගන්න
       read: ඔබගේ ගිණුමේ සියලුම දත්ත කියවන්න
+      read:accounts: ගිණුම් තොරතුරු බලන්න
+      read:blocks: ඔබගේ වාරණ බලන්න
+      read:bookmarks: ඔබගේ පිටු සලකුණු බලන්න
+      read:favourites: ඔබේ ප්රියතම බලන්න
       read:filters: ඔබගේ පෙරහන් බලන්න
+      read:follows: ඔබගේ පහත සඳහන් බලන්න
       read:lists: ඔබගේ ලැයිස්තු බලන්න
+      read:mutes: ඔබේ ගොළු බලන්න
       read:notifications: ඔබගේ දැනුම්දීම් බලන්න
-      read:search: ඔබ වෙනුවට සොයන්න
+      read:reports: ඔබගේ වාර්තා බලන්න
+      read:search: ඔබ වෙනුවෙන් සොයන්න
+      read:statuses: සියලුම පෝස්ට් බලන්න
+      write: ඔබගේ ගිණුමේ සියලුම දත්ත වෙනස් කරන්න
+      write:accounts: ඔබගේ පැතිකඩ වෙනස් කරන්න
       write:blocks: ගිණුම් සහ වසම් අවහිර කරන්න
-      write:filters: පෙරහන් සාදන්න
+      write:bookmarks: පිටු සලකුණු සටහන්
+      write:conversations: සංවාද නිහඬ කිරීම සහ මකා දැමීම
+      write:favourites: ප්‍රියතම ලිපි
+      write:filters: පෙරහන් කරන්න
+      write:follows: මිනිසුන් අනුගමනය කරන්න
+      write:lists: ලැයිස්තු සාදන්න
       write:media: මාධ්‍ය ගොනු උඩුගත කරන්න
-      write:mutes: මිනිසුන් සහ සංවාද නිහඬකරන්න
+      write:mutes: මිනිසුන් සහ සංවාද කරන්න
       write:notifications: ඔබගේ දැනුම්දීම් හිස්කරන්න
-      write:reports: වෙනත් මිනිසුන් වාර්තා කරන්න
+      write:reports: වෙනත් පුද්ගලයින් වාර්තා කරන්න
+      write:statuses: පළ කිරීම් පළ කරන්න
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index bd039024d..4260ad2ca 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -38,6 +38,7 @@ sk:
         application: Aplikácia
         callback_url: Návratová URL
         delete: Vymaž
+        empty: Nemáte žiadne aplikácie.
         name: Názov
         new: Nová aplikácia
         scopes: Oprávnenia
@@ -59,8 +60,8 @@ sk:
       error:
         title: Nastala chyba
       new:
-        able_to: Bude môcť
-        prompt: Aplikácia %{client_name} vyžaduje prístup k tvojmu účtu
+        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju autorizovať.</strong>"
+        review_permissions: Preskúmať povolenia
         title: Je potrebná autorizácia
       show:
         title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
@@ -70,9 +71,12 @@ sk:
       confirmations:
         revoke: Si si istý?
       index:
-        application: Aplikácia
-        created_at: Autorizované
+        authorized_at: Autorizované dňa %{date}
+        description_html: Ide o aplikácie, ktoré môžu pristupovať k vášmu účtu pomocou rozhrania API. Ak sa tu nachádzajú aplikácie, ktoré nepoznáte, alebo ak sa niektorá aplikácia správa nesprávne, môžete jej zrušiť prístup.
+        last_used_at: Posledne použitý dňa %{date}
+        never_used: Nikdy nepoužité
         scopes: Oprávnenia
+        superapp: Interný
         title: Tvoje povolené aplikácie
     errors:
       messages:
@@ -81,6 +85,10 @@ sk:
         invalid_client: Overenie klienta zlyhalo. Neznámy klient, chýbajú údaje o klientovi alebo nepodporovaná metóda overovania.
         invalid_grant: Dané oprávnenie je neplatné, vypršané, zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke, alebo bolo vydané pre iný klient.
         invalid_redirect_uri: Presmerovacia URI je neplatná.
+        invalid_request:
+          missing_param: 'Chýba požadovaný parameter: %{value}.'
+          request_not_authorized: Žiadosť je potrebné autorizovať. Chýba požadovaný parameter pre autorizáciu žiadosti alebo je neplatný.
+          unknown: V požiadavke chýba požadovaný parameter, obsahuje nepodporovanú hodnotu parametra alebo je inak chybne vytvorená.
         invalid_resource_owner: Uvedené prihlasovacie údaje sú neplatné alebo nenájdené
         invalid_scope: Požadovaný rozsah je neplatný, neznámy alebo poškodený.
         invalid_token:
@@ -104,6 +112,33 @@ sk:
       authorized_applications:
         destroy:
           notice: Oprávnenia aplikácie zrušené.
+    grouped_scopes:
+      access:
+        read: Prístup len na čítanie
+        read/write: Prístup na čítanie a zápis
+        write: Prístup len na zápis
+      title:
+        accounts: Účty
+        admin/accounts: Správa účtov
+        admin/all: Všetky administratívne funkcie
+        admin/reports: Správa reportov
+        all: Všetko
+        blocks: Blokovania
+        bookmarks: Záložky
+        conversations: Konverzácie
+        crypto: Šifrovanie End-to-end
+        favourites: Obľúbené
+        filters: Filtre
+        follow: Vzťahy
+        follows: Sledovania
+        lists: Zoznamy
+        media: Mediálne prílohy
+        mutes: Nevšímané
+        notifications: Oznámenia
+        push: Push notifikácie
+        reports: Reporty
+        search: Hľadať
+        statuses: Príspevky
     layouts:
       admin:
         nav:
@@ -118,6 +153,7 @@ sk:
       admin:write: uprav všetky dáta na serveri
       admin:write:accounts: urob moderovacie úkony na účtoch
       admin:write:reports: urob moderovacie úkony voči hláseniam
+      crypto: používať end-to-end šifrovanie
       follow: uprav vzťahy svojho účtu
       push: dostávaj oboznámenia ohľadom tvojho účtu na obrazovku
       read: prezri si všetky dáta ohľadom svojho účetu
@@ -137,6 +173,7 @@ sk:
       write:accounts: uprav svoj profil
       write:blocks: blokuj účty a domény
       write:bookmarks: pridaj si príspevky k záložkám
+      write:conversations: stíš a vymaž konverzácie
       write:favourites: obľúbené príspevky
       write:filters: vytvor roztriedenie
       write:follows: následuj ľudí
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index bb69d7519..ca689e8f1 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -15,7 +15,7 @@ sl:
               fragment_present: ne more vsebovati fragmenta.
               invalid_uri: mora biti veljaven URI.
               relative_uri: mora biti absolutni URI.
-              secured_uri: mora biti HTTPS/SSL URI.
+              secured_uri: mora biti URI HTTPS/SSL.
   doorkeeper:
     applications:
       buttons:
@@ -27,7 +27,7 @@ sl:
       confirmations:
         destroy: Ali ste prepričani?
       edit:
-        title: Uredi aplikacijo
+        title: Uredi program
       form:
         error: Ups! Preverite obrazec za morebitne napake
       help:
@@ -38,6 +38,7 @@ sl:
         application: Program
         callback_url: Povratni URL
         delete: Izbriši
+        empty: Nimate programov.
         name: Ime
         new: Nov program
         scopes: Obsegi
@@ -59,8 +60,8 @@ sl:
       error:
         title: Prišlo je do napake
       new:
-        able_to: To bo lahko
-        prompt: Program %{client_name} zahteva dostop do vašega računa
+        prompt_html: "%{client_name} želi dovoljenje za dostop do vašega računa. Gre za zunanji program. <strong>Če mu ne zaupate, mu ne dodelite teh pravic.</strong>"
+        review_permissions: Preglej pravice
         title: Potrebna je pooblastitev
       show:
         title: Kopirajte to pooblastilno kodo in jo prilepite v program.
@@ -70,17 +71,24 @@ sl:
       confirmations:
         revoke: Ali ste prepričani?
       index:
-        application: Program
-        created_at: Odobreno
-        scopes: Obsegi
+        authorized_at: Overjen(a) %{date}
+        description_html: To so programi, ki lahko dostopajo do vašega računa prek vmesnika API. Če so na seznamu programi, ki jih ne prepoznate ali pa se čudno vedejo, lahko prekličete njihovo pravico do dostopa.
+        last_used_at: Zadnjič uporabljeno %{date}
+        never_used: Nikoli uporabljeno
+        scopes: Dovoljenja
+        superapp: Interno
         title: Vaši odobreni programi
     errors:
       messages:
         access_denied: Lastnik virov ali strežnik pooblastil je zavrnil zahtevo.
         credential_flow_not_configured: Pretok geselskih pooblastil lastnika virov ni uspel, ker Doorkeeper.configure.resource_owner_from_credentials ni nastavljen.
-        invalid_client: Overitev odjemalca ni uspelo zaradi neznanega odjemalca, zaradi nevključitve overitve odjemalca ali zaradi nepodprte metode overitve.
+        invalid_client: Overitev odjemalca ni uspela zaradi neznanega odjemalca, zaradi nevključitve overitve odjemalca ali zaradi nepodprte metode overitve.
         invalid_grant: Predložena odobritev za pooblastilo je neveljavna, potekla, preklicana, se ne ujema z URI preusmeritvijo, ki je uporabljena v zahtevi za pooblastilo ali je bila izdana drugemu odjemalcu.
         invalid_redirect_uri: URI za preusmeritev ni veljaven.
+        invalid_request:
+          missing_param: 'Zahtevani parameter manjka: %{value}.'
+          request_not_authorized: Zahtevo je potrebno overiti. Zahtevani parameter za overjanje zahteve manjka ali ni veljaven.
+          unknown: Zahtevku manjka zahtevani parameter, vključuje nepodprto vrednost parametra ali je nepravilno oblikovan.
         invalid_resource_owner: Predložene poverilnice lastnika virov niso veljavne ali pa lastnika virov ni mogoče najti
         invalid_scope: Zahtevani obseg je neveljaven, neznan ali nepravilen.
         invalid_token:
@@ -104,25 +112,64 @@ sl:
       authorized_applications:
         destroy:
           notice: Program je preklican.
+    grouped_scopes:
+      access:
+        read: Dostop samo za branje
+        read/write: Dostop za branje in pisanje
+        write: Dostop samo za pisanje
+      title:
+        accounts: Računi
+        admin/accounts: Upravljanje računov
+        admin/all: Vse skrbniške funkcije
+        admin/reports: Upravljanje prijav
+        all: Vse
+        blocks: Blokira
+        bookmarks: Zaznamki
+        conversations: Pogovori
+        crypto: Šifriranje od konca do konca
+        favourites: Priljubljeni
+        filters: Filtri
+        follow: Razmerja
+        follows: Sledi
+        lists: Seznami
+        media: Predstavnostne priloge
+        mutes: Utišani
+        notifications: Obvestila
+        push: Potisna obvestila
+        reports: Prijave
+        search: Iskanje
+        statuses: Objave
     layouts:
       admin:
         nav:
           applications: Programi
           oauth2_provider: Ponudnik OAuth2
       application:
-        title: Potrebna je OAuth pooblastitev
+        title: Potrebna je pooblastitev OAuth
     scopes:
       admin:read: preberi vse podatke na strežniku
       admin:read:accounts: preberi občutljive informacije vseh računov
+      admin:read:canonical_email_blocks: preberi občutljive informacije vseh blokad kanoničnih e-računov
+      admin:read:domain_allows: preberi občutljive informacije vseh dovolil domene
+      admin:read:domain_blocks: preberi občutljive informacije vseh blokad domen
+      admin:read:email_domain_blocks: preberi občutljive informacije vseh blokad domen e-računov
+      admin:read:ip_blocks: preberi občutljive informacije vseh blokad IP
       admin:read:reports: preberi občutljive informacije vseh prijav in prijavljenih računov
       admin:write: spremeni vse podatke na strežniku
       admin:write:accounts: izvedi moderirana dejanja na računih
+      admin:write:canonical_email_blocks: izvedi moderirana dejanja na blokadah kanoničnih e-računov
+      admin:write:domain_allows: izvedi moderirana dejanja na dovolilih domen
+      admin:write:domain_blocks: izvedi moderirana dejanja na blokadah domen
+      admin:write:email_domain_blocks: izvedi moderirana dejanja na blokadah domen e-računov
+      admin:write:ip_blocks: izvedi moderirana dejanja na blokadah IP
       admin:write:reports: izvedi moderirana dejanja na prijavah
+      crypto: Uporabi šifriranje od konca do konca
       follow: spremeni razmerja med računi
       push: prejmi potisna obvestila
       read: preberi vse podatke svojega računa
       read:accounts: oglejte si podrobnosti računov
       read:blocks: oglejte si svoje blokirane
+      read:bookmarks: oglejte si svoje zaznamke
       read:favourites: oglejte si svoje priljubljene
       read:filters: oglejte si svoje filtre
       read:follows: oglejte si svoje sledilce
@@ -131,11 +178,13 @@ sl:
       read:notifications: oglejte si svoja obvestila
       read:reports: oglejte si svoje prijave
       read:search: iščite v svojem imenu
-      read:statuses: oglejte si vsa stanja
+      read:statuses: oglejte si vse objave
       write: spremenite vse podatke svojega računa
       write:accounts: spremenite svoj profil
       write:blocks: blokirajte račune in domene
-      write:favourites: priljubljena stanja
+      write:bookmarks: objave zaznamkov
+      write:conversations: utišaj in izbriši pogovore
+      write:favourites: priljubljene objave
       write:filters: ustvari filtre
       write:follows: sledi osebam
       write:lists: ustvarite sezname
@@ -143,4 +192,4 @@ sl:
       write:mutes: utišaj osebe in pogovore
       write:notifications: počisti svoja obvestila
       write:reports: prijavi druge osebe
-      write:statuses: objavi stanja
+      write:statuses: objavi objave
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index 1b83bbc7c..c6c173187 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -60,8 +60,8 @@ sq:
       error:
         title: Ndodhi një gabim
       new:
-        able_to: Do të jetë në gjendje të
-        prompt: Aplikacioni %{client_name} kërkon hyrje në llogarinë tuaj
+        prompt_html: "%{client_name} do të donte leje të hyjë në llogarinë tuaj. Është një aplikacion palësh të treta. <strong>Nëse s’i zini besë, atëherë s’duhet ta autorizoni.</strong>"
+        review_permissions: Shqyrtoni leje
         title: Lypset autorizim
       show:
         title: Kopjojeni këtë kod autorizimi dhe ngjiteni te aplikacioni.
@@ -71,10 +71,12 @@ sq:
       confirmations:
         revoke: A jeni i sigurt?
       index:
-        application: Aplikacion
-        created_at: I autorizuar
-        date_format: "%d.%m.%Y, %H:%M:%S"
-        scopes: Fushëveprime
+        authorized_at: Autorizuar më %{date}
+        description_html: Këto janë aplikacione që mund të hyjnë në llogarinë tuaj duke përdorur API-n. Nëse këtu ka aplikacione që nuk i njihni, ose një aplikacion po sillet ndryshe nga sa pritet, mund t’i shfuqiozoni hyrjen.
+        last_used_at: Përdorur së fundi më %{date}
+        never_used: I papërdorur ndonjëherë
+        scopes: Leje
+        superapp: I brendshëm
         title: Aplikacionet tuaja të autorizuar
     errors:
       messages:
@@ -110,6 +112,33 @@ sq:
       authorized_applications:
         destroy:
           notice: Aplikacioni u shfuqizua.
+    grouped_scopes:
+      access:
+        read: Hyrje vetëm për lexim
+        read/write: Hyrje për lexim dhe shkrim
+        write: Hyrje vetëm për shkrim
+      title:
+        accounts: Llogari
+        admin/accounts: Administrim llogarish
+        admin/all: Krejt funksionet administrative
+        admin/reports: Administrim i raporteve
+        all: Gjithçka
+        blocks: Blloqe
+        bookmarks: Faqerojtës
+        conversations: Biseda
+        crypto: Fshehtëzim skaj-më-skaj
+        favourites: Të parapëlqyer
+        filters: Filtra
+        follow: Marrëdhënie
+        follows: Ndjekje
+        lists: Lista
+        media: Bashkëngjitje media
+        mutes: Heshtime
+        notifications: Njoftime
+        push: Njoftime Push
+        reports: Raportime
+        search: Kërkim
+        statuses: Postime
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ sq:
     scopes:
       admin:read: të lexojë krejt të dhënat te shërbyesi
       admin:read:accounts: të lexojë krejt të dhënat rezervat të krejt llogarive
+      admin:read:canonical_email_blocks: të lexojë hollësi rezervat të krejt bllokimeve të zakonshëm të email-eve
+      admin:read:domain_allows: të lexojë hollësi rezervat të krejt lejimeve të përkatësive
+      admin:read:domain_blocks: të lexojë hollësi rezervat të krejt bllokimeve të përkatësive
+      admin:read:email_domain_blocks: të lexojë hollësi rezervat të krejt bllokimeve të përkatësive të email-eve
+      admin:read:ip_blocks: të lexojë hollësi rezervat të krejt bllokimeve të IP-eve
       admin:read:reports: të lexojë të dhëna rezervat të krejt raportimeve dhe të llogarive të raportuara
       admin:write: të përpunojë krejt të dhënat në shërbyes
       admin:write:accounts: të kryejë veprime moderimi në llogaritë
+      admin:write:canonical_email_blocks: të kryejë veprime moderimi në bllokime të zakonshëm të email-eve
+      admin:write:domain_allows: të kryejë veprime moderimi mbi lejime përkatësish
+      admin:write:domain_blocks: të kryejë veprime moderimi mbi bllokime përkatësish
+      admin:write:email_domain_blocks: të kryejë veprime moderimi mbi lejime përkatësish email
+      admin:write:ip_blocks: të kryejë veprime moderimi mbi bllokime IP-sh
       admin:write:reports: të kryejë veprime moderimi në raportime
+      crypto: përdor fshehtëzim skaj-më-skaj
       follow: të ndryshojë marrëdhënie llogarish
       push: të marrë njoftime push për ju
       read: të lexojë krejt të dhënat e llogarisë tuaj
@@ -143,6 +183,7 @@ sq:
       write:accounts: të ndryshojë profilin tuaj
       write:blocks: të bllokojë llogari dhe përkatësi
       write:bookmarks: të faqeruajë gjendje
+      write:conversations: heshtoni dhe fshini biseda
       write:favourites: të parapëlqejë gjendje
       write:filters: të krijojë filtra
       write:follows: të ndjekë persona
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index c1d7c6e5e..66ec102b1 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -38,6 +38,7 @@ sr-Latn:
         application: Aplikacija
         callback_url: Adresa za povratni poziv
         delete: Obriši
+        empty: Nemate aplikacija.
         name: Ime
         new: Nova aplikacija
         scopes: Opsezi važenja
@@ -59,8 +60,8 @@ sr-Latn:
       error:
         title: Dogodila se greška
       new:
-        able_to: Biće u mogućnosti da
-        prompt: Aplikacija %{client_name} zahteva pristup Vašem nalogu
+        prompt_html: "%{client_name} želi dozvolu za pristup tvom nalogu. U pitanju je aplikacija treće strane. <strong>Ako smatraš da nije pouzdana, ne bi trebalo da je ovlastiš.</strong>"
+        review_permissions: Pregledaj dozvole
         title: Potrebna autorizacija
       show:
         title: Kopirajte ovaj autorizacioni kod i nalepite ga u aplikaciju.
@@ -70,10 +71,12 @@ sr-Latn:
       confirmations:
         revoke: Da li ste sigurni?
       index:
-        application: Aplikacija
-        created_at: Autorizovana
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Opsezi važenja
+        authorized_at: Autorizovano dana %{date}
+        description_html: Ovo su aplikacije koje mogu da pristupe tvom nalogu pomoću API-ja. Ako ovde postoje aplikacije koje ne prepoznaješ ili se neka aplikacija ne ponaša dobro, možeš opozvati njeno pravo pristupa.
+        last_used_at: Poslednji put korišćeno dana %{date}
+        never_used: Nikada nije korišćeno
+        scopes: Dozvole
+        superapp: Interno
         title: Vaše autorizovane aplikacije
     errors:
       messages:
@@ -82,6 +85,10 @@ sr-Latn:
         invalid_client: Klijentska identifikacija nije uspela zbog nepoznatog klijenta, zato što klijent nije uključio identifikaciju ili zato što je iskorišćen nepodržani identifikacioni metod.
         invalid_grant: Zadata identifikaciona dozvola je neispravna, istekla, opozvana, ne poklapa se sa adresom preusmeravanja ili je izdata nekog drugom klijentu.
         invalid_redirect_uri: Uključena adresa preusmeravanja nije ispravna.
+        invalid_request:
+          missing_param: 'Nedostaje obavezni parametar: %{value}.'
+          request_not_authorized: Zahtev mora biti autorizovan. Obavezni parametar za autorizaciju zahteva nedostaje ili je nevažeći.
+          unknown: Obavezni parametar u zahtevu nedostaje, u zahtevu se nalazi nepodržana vrednost parametra ili je parametar na neki drugi način pogrešno formiran.
         invalid_resource_owner: Zadati kredencijali vlasnika resursa nisu ispravni ili vlasnik resursa ne može biti nađen
         invalid_scope: Zahtevani opseg važenja nije ispravan, nepoznat je ili je na neki drugi način pogrešan.
         invalid_token:
@@ -105,6 +112,33 @@ sr-Latn:
       authorized_applications:
         destroy:
           notice: Aplikacija opozvana.
+    grouped_scopes:
+      access:
+        read: Pristup samo za čitanje
+        read/write: Pristup za čitanje i pisanje
+        write: Pristup samo za pisanje
+      title:
+        accounts: Nalozi
+        admin/accounts: Administracija naloga
+        admin/all: Sve funkcije administracije
+        admin/reports: Administracija prijava
+        all: Sve
+        blocks: Blokirani
+        bookmarks: Obeleživači
+        conversations: Razgovori
+        crypto: End-to-end enkripcija
+        favourites: Omiljeni
+        filters: Filteri
+        follow: Veze
+        follows: Praćeni
+        lists: Liste
+        media: Multimedijalni prilozi
+        mutes: Utišani
+        notifications: Obaveštenja
+        push: Prosleđena obaveštenja
+        reports: Prijave
+        search: Pretraga
+        statuses: Objave
     layouts:
       admin:
         nav:
@@ -113,6 +147,44 @@ sr-Latn:
       application:
         title: OAuth autorizacija potrebna
     scopes:
+      admin:read: čitanje svih podataka na serveru
+      admin:read:accounts: čitanje osetljivih podataka za sve naloge
+      admin:read:domain_allows: pročitaj osetljive informacije za sve dozvole domena
+      admin:read:domain_blocks: pročitaj osetljive informacije za sve blokove domena
+      admin:read:ip_blocks: pročitaj osetljive informacije za sve IP blokove
+      admin:read:reports: čitanje osetljivih podataka svih izveštaja i prijavljenih naloga
+      admin:write: menjanje svih podataka na serveru
+      admin:write:accounts: vršenje moderatorskih aktivnosti nad nalozima
+      admin:write:domain_blocks: izvrši moderatorske aktivnosti na blokovima domena
+      admin:write:ip_blocks: izvrši moderatorske aktivnosti na IP blokovima
+      admin:write:reports: vršenje moderatorskih aktivnosti nad izveštajima
+      crypto: korišćenje end-to-end enkripcije
       follow: prati, blokira, odblokira i otprati naloge
+      push: primanje prosleđenih obaveštenja
       read: čita podatke Vašeg naloga
+      read:accounts: pogledaj informacije o nalozima
+      read:blocks: pogledaj svoje blokirane
+      read:bookmarks: pogledaj svoje obeleživače
+      read:favourites: pogledaj svoje omiljene
+      read:filters: pogledaj svoje filtere
+      read:follows: pogledaj koga pratiš
+      read:lists: pogledaj svoje liste
+      read:mutes: pogledaj svoje utišane
+      read:notifications: pogledaj svoja obaveštenja
+      read:reports: pogledaj svoje prijave
+      read:search: pretraži u svoje ime
+      read:statuses: pogledaj sve objave
       write: objavljuje statuse u Vaše ime
+      write:accounts: izmeni svoj profil
+      write:blocks: blokiraj naloge i domene
+      write:bookmarks: obeleži objave
+      write:conversations: utišaj i obriši razgovore
+      write:favourites: omiljene objave
+      write:filters: kreiraj filtere
+      write:follows: prati korisnike
+      write:lists: kreiraj liste
+      write:media: otpremi medijske datoteke
+      write:mutes: utišaj korinsike i razgovore
+      write:notifications: obriši svoja obaveštenja
+      write:reports: prijavi druge korisnike
+      write:statuses: objavi objave
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index 1d92cf2f0..20e39e1c0 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -38,6 +38,7 @@ sr:
         application: Апликација
         callback_url: Адреса за повратни позив
         delete: Обриши
+        empty: Немате апликација.
         name: Име
         new: Нова апликација
         scopes: Опсези важења
@@ -59,8 +60,8 @@ sr:
       error:
         title: Догодила се грешка
       new:
-        able_to: Биће у могућности да
-        prompt: Апликација %{client_name} захтева приступ Вашем налогу
+        prompt_html: "%{client_name} жели дозволу за приступ твом налогу. У питању је апликација треће стране. <strong>Ако сматраш да није поуздана, не би требало да је овластиш.</strong>"
+        review_permissions: Прегледај дозволе
         title: Потребна ауторизација
       show:
         title: Копирајте овај ауторизациони код и налепите га у апликацију.
@@ -70,10 +71,12 @@ sr:
       confirmations:
         revoke: Да ли сте сигурни?
       index:
-        application: Апликација
-        created_at: Ауторизована
-        date_format: "%d.%m.%Y %H:%M:%S"
-        scopes: Опсези важења
+        authorized_at: Ауторизовано дана %{date}
+        description_html: Ово су апликације које могу да приступе твом налогу помоћу АПИ-ја. Ако овде постоје апликације које не препознајеш или се нека апликација не понаша добро, можеш опозвати њено право приступа.
+        last_used_at: Последњи пут коришћено дана %{date}
+        never_used: Никада није коришћено
+        scopes: Дозволе
+        superapp: Интерно
         title: Ваше ауторизоване апликације
     errors:
       messages:
@@ -82,6 +85,10 @@ sr:
         invalid_client: Клијентска идентификација није успела због непознатог клијента, зато што клијент није укључио идентификацију или зато што је искоришћен неподржани идентификациони метод.
         invalid_grant: Задата идентификациона дозвола је неисправна, истекла, опозвана, не поклапа се са адресом преусмеравања или је издата неког другом клијенту.
         invalid_redirect_uri: Укључена адреса преусмеравања није исправна.
+        invalid_request:
+          missing_param: 'Недостаје обавезни параметар: %{value}.'
+          request_not_authorized: Захтев мора бити ауторизован. Обавезни параметар за ауторизацију захтева недостаје или је неважећи.
+          unknown: Обавезни параметар у захтеву недостаје, у захтеву се налази неподржана вредност параметра или је параметар на неки други начин погрешно формиран.
         invalid_resource_owner: Задати креденцијали власника ресурса нису исправни или власник ресурса не може бити нађен
         invalid_scope: Захтевани опсег важења није исправан, непознат је или је на неки други начин погрешан.
         invalid_token:
@@ -105,6 +112,33 @@ sr:
       authorized_applications:
         destroy:
           notice: Апликација опозвана.
+    grouped_scopes:
+      access:
+        read: Приступ само за читање
+        read/write: Приступ за читање и писање
+        write: Приступ само за писање
+      title:
+        accounts: Налози
+        admin/accounts: Администрација налога
+        admin/all: Све функције администрације
+        admin/reports: Администрација пријава
+        all: Све
+        blocks: Блокирани
+        bookmarks: Обележивачи
+        conversations: Разговори
+        crypto: End-to-end енкрипција
+        favourites: Омиљени
+        filters: Филтери
+        follow: Везе
+        follows: Праћени
+        lists: Листе
+        media: Мултимедијални прилози
+        mutes: Утишани
+        notifications: Обавештења
+        push: Прослеђена обавештења
+        reports: Пријаве
+        search: Претрага
+        statuses: Објаве
     layouts:
       admin:
         nav:
@@ -113,6 +147,44 @@ sr:
       application:
         title: OAuth ауторизација потребна
     scopes:
+      admin:read: читање свих података на серверу
+      admin:read:accounts: читање осетљивих података за све налоге
+      admin:read:domain_allows: прочитај осетљиве информације за све дозволе домена
+      admin:read:domain_blocks: прочитај осетљиве информације за све блокове домена
+      admin:read:ip_blocks: прочитај осетљиве информације за све IP блокове
+      admin:read:reports: читање осетљивих података свих извештаја и пријављених налога
+      admin:write: мењање свих података на серверу
+      admin:write:accounts: вршење модераторских активности над налозима
+      admin:write:domain_blocks: изврши модераторске активности на блоковима домена
+      admin:write:ip_blocks: изврши модераторске активности на IP блоковима
+      admin:write:reports: вршење модераторских активности над извештајима
+      crypto: коришћење end-to-end енкрипције
       follow: прати, блокира, одблокира и отпрати налоге
+      push: примање прослеђених обавештења
       read: чита податке Вашег налога
+      read:accounts: погледај информације о налозима
+      read:blocks: погледај своје блокиране
+      read:bookmarks: погледај своје обележиваче
+      read:favourites: погледај своје омиљене
+      read:filters: погледај своје филтере
+      read:follows: погледај кога пратиш
+      read:lists: погледај своје листе
+      read:mutes: погледај своје утишане
+      read:notifications: погледај своја обавештења
+      read:reports: погледај своје пријаве
+      read:search: претражи у своје име
+      read:statuses: погледај све објаве
       write: објављује статусе у Ваше име
+      write:accounts: измени свој профил
+      write:blocks: блокирај налоге и домене
+      write:bookmarks: обележи објаве
+      write:conversations: утишај и обриши разговоре
+      write:favourites: омиљене објаве
+      write:filters: креирај филтере
+      write:follows: прати кориснике
+      write:lists: креирај листе
+      write:media: отпреми медијске датотеке
+      write:mutes: утишај коринсике и разговоре
+      write:notifications: обриши своја обавештења
+      write:reports: пријави друге кориснике
+      write:statuses: објави објаве
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index d7d28bae0..9a7b53bcc 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -5,7 +5,7 @@ sv:
       doorkeeper/application:
         name: Applikationsnamn
         redirect_uri: Omdirigera URI
-        scopes: Omfattning
+        scopes: Omfattningar
         website: Applikationswebbplats
     errors:
       models:
@@ -15,13 +15,13 @@ sv:
               fragment_present: kan inte innehålla ett fragment.
               invalid_uri: måste vara en giltig URI.
               relative_uri: måste vara en absolut URI.
-              secured_uri: måste vara en HTTPS/SSL URI.
+              secured_uri: måste vara en HTTPS/SSL-URI.
   doorkeeper:
     applications:
       buttons:
-        authorize: Godkänna
+        authorize: Godkänn
         cancel: Ångra
-        destroy: Förstöra
+        destroy: Förstör
         edit: Redigera
         submit: Skicka
       confirmations:
@@ -29,52 +29,54 @@ sv:
       edit:
         title: Redigera applikation
       form:
-        error: Hoppsan! Kontrollera i formuläret efter eventuella fel
+        error: Hoppsan! Kolla ditt formulär efter eventuella fel
       help:
-        native_redirect_uri: Använd %{native_redirect_uri} för lokalt test
-        redirect_uri: Använd en per rad URI
-        scopes: Separera omfattningen med mellanslag. Lämna tomt för att använda standardomfattning.
+        native_redirect_uri: Använd %{native_redirect_uri} för lokala tester
+        redirect_uri: Använd en rad per URI
+        scopes: Separera omfattningar med mellanslag. Lämna tomt för att använda standardomfattningar.
       index:
         application: Applikation
-        callback_url: Återkalls URL
+        callback_url: URL för återanrop
         delete: Radera
-        empty: Du har inga program.
+        empty: Du har inga applikationer.
         name: Namn
         new: Ny applikation
-        scopes: Omfattning
+        scopes: Omfattningar
         show: Visa
         title: Dina applikationer
       new:
         title: Ny applikation
       show:
-        actions: Handlingar
+        actions: Åtgärder
         application_id: Klientnyckel
-        callback_urls: Återkalls URLs
-        scopes: Omfattning
-        secret: Kundhemlighet
-        title: 'Program: %{name}'
+        callback_urls: URL:er för återanrop
+        scopes: Omfattningar
+        secret: Klienthemlighet
+        title: 'Applikation: %{name}'
     authorizations:
       buttons:
-        authorize: Godkänna
+        authorize: Godkänn
         deny: Neka
       error:
         title: Ett fel har uppstått
       new:
-        able_to: Det kommer att kunna
-        prompt: Applikation %{client_name} begär tillgång till ditt konto
+        prompt_html: "%{client_name} vill ha behörighet att komma åt ditt konto. Det är en applikation från tredje part. <strong>Du bör endast godkänna den om du litar på den.</strong>"
+        review_permissions: Granska behörigheter
         title: Godkännande krävs
       show:
-        title: Kopiera denna behörighetskod och klistra in den i programmet.
+        title: Kopiera denna behörighetskod och klistra in den i applikationen.
     authorized_applications:
       buttons:
         revoke: Återkalla
       confirmations:
         revoke: Är du säker?
       index:
-        application: Applikation
-        created_at: Auktoriserad
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Omfattning
+        authorized_at: Godkändes den %{date}
+        description_html: Dessa applikationer har åtkomst till ditt konto genom API:et. Om det finns applikationer du inte känner igen här, eller om en applikation inte fungerar, kan du återkalla dess åtkomst.
+        last_used_at: Användes senast %{date}
+        never_used: Aldrig använd
+        scopes: Behörigheter
+        superapp: Intern
         title: Dina behöriga ansökningar
     errors:
       messages:
@@ -110,22 +112,60 @@ sv:
       authorized_applications:
         destroy:
           notice: Applikation återkallas.
+    grouped_scopes:
+      access:
+        read: Enbart rätt att läsa
+        read/write: Läs- och skrivbehörighet
+        write: Enbart rätt att skriva
+      title:
+        accounts: Konton
+        admin/accounts: Administrering av konton
+        admin/all: Alla administrativa funktioner
+        admin/reports: Administrering av rapporter
+        all: Allting
+        blocks: Blockeringar
+        bookmarks: Bokmärken
+        conversations: Konversationer
+        crypto: Ände-till-ände-kryptering
+        favourites: Favoriter
+        filters: Filter
+        follow: Relationer
+        follows: Följer
+        lists: Listor
+        media: Mediabilagor
+        mutes: Tystade användare
+        notifications: Aviseringar
+        push: Push-aviseringar
+        reports: Rapporter
+        search: Sök
+        statuses: Inlägg
     layouts:
       admin:
         nav:
           applications: Applikationer
-          oauth2_provider: OAuth2 leverantör
+          oauth2_provider: OAuth2-leverantör
       application:
-        title: OAuth-behörighet krävs
+        title: OAuth-godkännande krävs
     scopes:
-      admin:read: läs all data på servern
-      admin:read:accounts: läs känslig information från alla konton
-      admin:read:reports: läs känslig information från alla rapporter och rapporterade konton
+      admin:read: läsa all data på servern
+      admin:read:accounts: läsa känslig information om alla konton
+      admin:read:canonical_email_blocks: läsa känslig information om alla kanoniska e-postblockeringar
+      admin:read:domain_allows: läsa känslig information om alla tillåtna domäner
+      admin:read:domain_blocks: läsa känslig information om alla domänblockeringar
+      admin:read:email_domain_blocks: läsa känslig information om alla blockerade e-postdomäner
+      admin:read:ip_blocks: läsa känslig information om alla IP-adressblockeringar
+      admin:read:reports: läsa känslig information om alla rapporter och rapporterade konton
       admin:write: ändra all data på servern
-      admin:write:accounts: utför alla aktiviteter för moderering på konton
-      admin:write:reports: utför alla aktiviteter för moderering i rapporter
-      follow: följa, blockera, ta bort blockerade och sluta följa konton
-      push: ta emot push-aviseringar för ditt konto
+      admin:write:accounts: utföra modereringsåtgärder på konton
+      admin:write:canonical_email_blocks: utföra modereringsåtgärder på kanoniska e-postblockeringar
+      admin:write:domain_allows: utföra modereringsåtgärder på tillåtna domäner
+      admin:write:domain_blocks: utföra modereringsåtgärder på domänblockeringar
+      admin:write:email_domain_blocks: utföra modereringsåtgärder på e-postdomänblockeringar
+      admin:write:ip_blocks: utföra modereringsåtgärder på IP-adressblockeringar
+      admin:write:reports: utföra modereringsåtgärder på rapporter
+      crypto: använd obruten kryptering
+      follow: modifiera kontorelationer
+      push: ta emot dina push-notiser
       read: läsa dina kontodata
       read:accounts: se kontoinformation
       read:blocks: se dina blockeringar
@@ -135,20 +175,21 @@ sv:
       read:follows: se vem du följer
       read:lists: se dina listor
       read:mutes: se dina tystningar
-      read:notifications: se dina aviseringar
+      read:notifications: se dina notiser
       read:reports: se dina rapporter
       read:search: sök å dina vägnar
-      read:statuses: se alla statusar
-      write: posta åt dig
+      read:statuses: se alla inlägg
+      write: ändra all din kontodata
       write:accounts: ändra din profil
       write:blocks: blockera konton och domäner
-      write:bookmarks: bokmärkesstatusar
-      write:favourites: favoritmarkera statusar
+      write:bookmarks: bokmärka inlägg
+      write:conversations: tysta och radera konversationer
+      write:favourites: favoritmarkera inlägg
       write:filters: skapa filter
-      write:follows: följ människor
+      write:follows: följa folk
       write:lists: skapa listor
-      write:media: ladda upp mediafiler
-      write:mutes: tysta människor och konversationer
-      write:notifications: rensa dina aviseringar
-      write:reports: rapportera andra människor
-      write:statuses: publicera statusar
+      write:media: ladda upp mediefiler
+      write:mutes: tysta folk och konversationer
+      write:notifications: rensa dina notiser
+      write:reports: rapportera andra personer
+      write:statuses: publicera inlägg
diff --git a/config/locales/doorkeeper.ta.yml b/config/locales/doorkeeper.ta.yml
index 879b6ab21..3cba7d9d4 100644
--- a/config/locales/doorkeeper.ta.yml
+++ b/config/locales/doorkeeper.ta.yml
@@ -23,5 +23,4 @@ ta:
       confirmations:
         revoke: உறுதியாகவா?
       index:
-        application: பயன்பாடு
         title: அனுமதியளிக்கப்பட்டுள்ள பயன்பாடுகள்/செயலிகள்
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index f95276383..e4ca5b58f 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -60,9 +60,9 @@ th:
       error:
         title: เกิดข้อผิดพลาด
       new:
-        able_to: แอปจะสามารถ
-        prompt: แอปพลิเคชัน %{client_name} ขอเข้าถึงบัญชีของคุณ
-        title: ต้องมีการอนุญาต
+        prompt_html: "%{client_name} ต้องการสิทธิอนุญาตเพื่อเข้าถึงบัญชีของคุณ แอปพลิเคชันเป็นแอปพลิเคชันจากบุคคลที่สาม <strong>หากคุณไม่เชื่อถือแอปพลิเคชัน คุณไม่ควรอนุญาตแอปพลิเคชัน</strong>"
+        review_permissions: ตรวจทานสิทธิอนุญาต
+        title: ต้องการการอนุญาต
       show:
         title: คัดลอกรหัสการอนุญาตนี้แล้ววางลงในแอปพลิเคชัน
     authorized_applications:
@@ -71,23 +71,35 @@ th:
       confirmations:
         revoke: คุณแน่ใจหรือไม่?
       index:
-        application: แอปพลิเคชัน
-        created_at: อนุญาตเมื่อ
-        date_format: "%d/%m/%Y %H:%M:%S"
-        scopes: ขอบเขต
+        authorized_at: อนุญาตเมื่อ %{date}
+        description_html: นี่คือแอปพลิเคชันที่สามารถเข้าถึงบัญชีของคุณโดยใช้ API หากมีแอปพลิเคชันที่คุณไม่รู้จักที่นี่ หรือแอปพลิเคชันทำงานผิดปกติ คุณสามารถเพิกถอนการเข้าถึงของแอปพลิเคชัน
+        last_used_at: ใช้ล่าสุดเมื่อ %{date}
+        never_used: ไม่เคยใช้
+        scopes: สิทธิอนุญาต
+        superapp: ภายใน
         title: แอปพลิเคชันที่ได้รับอนุญาตของคุณ
     errors:
       messages:
         access_denied: เจ้าของทรัพยากรหรือเซิร์ฟเวอร์การอนุญาตปฏิเสธคำขอ
+        credential_flow_not_configured: โฟลว์ข้อมูลประจำตัวรหัสผ่านเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_from_credentials
+        invalid_client: การรับรองความถูกต้องไคลเอ็นต์ล้มเหลวเนื่องจากไคลเอ็นต์ที่ไม่รู้จัก ไม่มีการรับรองความถูกต้องไคลเอ็นต์ที่รวมอยู่ หรือวิธีการรับรองความถูกต้องที่ไม่รองรับ
+        invalid_grant: การให้การรับรองความถูกต้องที่ให้มาไม่ถูกต้อง หมดอายุแล้ว เพิกถอนแล้ว ไม่ตรงกับ URI การเปลี่ยนเส้นทางที่ใช้ในคำขอการรับรองความถูกต้อง หรือออกให้ไคลเอ็นต์อื่น
+        invalid_redirect_uri: URI การเปลี่ยนเส้นทางที่รวมอยู่ไม่ถูกต้อง
         invalid_request:
           missing_param: 'พารามิเตอร์ที่จำเป็นขาดหายไป: %{value}'
+          request_not_authorized: คำขอจำเป็นต้องได้รับอนุญาต พารามิเตอร์ที่จำเป็นสำหรับการอนุญาตคำขอขาดหายไปหรือไม่ถูกต้อง
+          unknown: คำขอไม่มีพารามิเตอร์ที่จำเป็น รวมค่าพารามิเตอร์ที่ไม่รองรับ หรือมิฉะนั้นผิดรูปแบบ
+        invalid_resource_owner: ข้อมูลประจำตัวเจ้าของทรัพยากรที่ให้มาไม่ถูกต้อง หรือไม่พบเจ้าของทรัพยากร
         invalid_scope: ขอบเขตที่ขอไม่ถูกต้อง ไม่รู้จัก หรือผิดรูปแบบ
         invalid_token:
           expired: โทเคนการเข้าถึงหมดอายุแล้ว
           revoked: เพิกถอนโทเคนการเข้าถึงแล้ว
           unknown: โทเคนการเข้าถึงไม่ถูกต้อง
         resource_owner_authenticator_not_configured: การค้นหาเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_authenticator
+        server_error: เซิร์ฟเวอร์การรับรองความถูกต้องพบเงื่อนไขที่ไม่คาดคิดซึ่งป้องกันไม่ให้เซิร์ฟเวอร์ดำเนินการตามคำขอ
+        temporarily_unavailable: เซิร์ฟเวอร์การรับรองความถูกต้องไม่สามารถจัดการคำขอได้ในปัจจุบันเนื่องจากการทำงานเกินพิกัดชั่วคราวหรือการบำรุงรักษาเซิร์ฟเวอร์
         unauthorized_client: ไคลเอ็นต์ไม่ได้รับอนุญาตให้ทำคำขอนี้โดยใช้วิธีการนี้
+        unsupported_grant_type: ชนิดการให้การรับรองความถูกต้องไม่รองรับโดยเซิร์ฟเวอร์การรับรองความถูกต้อง
         unsupported_response_type: เซิร์ฟเวอร์การอนุญาตไม่รองรับชนิดการตอบสนองนี้
     flash:
       applications:
@@ -100,20 +112,58 @@ th:
       authorized_applications:
         destroy:
           notice: เพิกถอนแอปพลิเคชันแล้ว
+    grouped_scopes:
+      access:
+        read: การเข้าถึงแบบอ่านเท่านั้น
+        read/write: การเข้าถึงแบบอ่านและเขียน
+        write: การเข้าถึงแบบเขียนเท่านั้น
+      title:
+        accounts: บัญชี
+        admin/accounts: การดูแลบัญชี
+        admin/all: ฟังก์ชันการดูแลทั้งหมด
+        admin/reports: การดูแลรายงาน
+        all: ทุกอย่าง
+        blocks: การปิดกั้น
+        bookmarks: ที่คั่นหน้า
+        conversations: การสนทนา
+        crypto: การเข้ารหัสแบบต้นทางถึงปลายทาง
+        favourites: รายการโปรด
+        filters: ตัวกรอง
+        follow: ความสัมพันธ์
+        follows: การติดตาม
+        lists: รายการ
+        media: ไฟล์แนบสื่อ
+        mutes: การซ่อน
+        notifications: การแจ้งเตือน
+        push: การแจ้งเตือนแบบผลัก
+        reports: การรายงาน
+        search: ค้นหา
+        statuses: โพสต์
     layouts:
       admin:
         nav:
           applications: แอปพลิเคชัน
           oauth2_provider: ผู้ให้บริการ OAuth2
       application:
-        title: ต้องมีการอนุญาต OAuth
+        title: ต้องการการอนุญาต OAuth
     scopes:
       admin:read: อ่านข้อมูลทั้งหมดในเซิร์ฟเวอร์
       admin:read:accounts: อ่านข้อมูลที่ละเอียดอ่อนของบัญชีทั้งหมด
+      admin:read:canonical_email_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้นอีเมลมาตรฐานทั้งหมด
+      admin:read:domain_allows: อ่านข้อมูลที่ละเอียดอ่อนของการอนุญาตโดเมนทั้งหมด
+      admin:read:domain_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้นโดเมนทั้งหมด
+      admin:read:email_domain_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้นโดเมนอีเมลทั้งหมด
+      admin:read:ip_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้น IP ทั้งหมด
       admin:read:reports: อ่านข้อมูลที่ละเอียดอ่อนของรายงานและบัญชีที่ได้รับการรายงานทั้งหมด
       admin:write: ปรับเปลี่ยนข้อมูลทั้งหมดในเซิร์ฟเวอร์
       admin:write:accounts: ทำการกระทำการควบคุมบัญชี
+      admin:write:canonical_email_blocks: ทำการกระทำการควบคุมการปิดกั้นอีเมลมาตรฐาน
+      admin:write:domain_allows: ทำการกระทำการควบคุมการอนุญาตโดเมน
+      admin:write:domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมน
+      admin:write:email_domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมนอีเมล
+      admin:write:ip_blocks: ทำการกระทำการควบคุมการปิดกั้น IP
       admin:write:reports: ทำการกระทำการควบคุมรายงาน
+      crypto: ใช้การเข้ารหัสแบบต้นทางถึงปลายทาง
       follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
       push: รับการแจ้งเตือนแบบผลักของคุณ
       read: อ่านข้อมูลบัญชีทั้งหมดของคุณ
@@ -133,6 +183,7 @@ th:
       write:accounts: ปรับเปลี่ยนโปรไฟล์ของคุณ
       write:blocks: ปิดกั้นบัญชีและโดเมน
       write:bookmarks: เพิ่มที่คั่นหน้าโพสต์
+      write:conversations: ซ่อนและลบการสนทนา
       write:favourites: ชื่นชอบโพสต์
       write:filters: สร้างตัวกรอง
       write:follows: ติดตามผู้คน
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 8019b421a..704a5af07 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -60,8 +60,8 @@ tr:
       error:
         title: Bir hata oluştu
       new:
-        able_to: 'Şunları yapabilecek:'
-        prompt: "%{client_name} uygulaması hesabınıza erişim istiyor"
+        prompt_html: "%{client_name} hesabınıza erişme izni istiyor. Bu üçüncü taraf bir uygulamadır. <strong>Eğer güvenmiyorsanız, izin vermemelisiniz.</strong>"
+        review_permissions: İzinleri incele
         title: İzin gerekli
       show:
         title: Bu yetkilendirme kodunu kopyalayın ve uygulamaya yapıştırın.
@@ -71,15 +71,17 @@ tr:
       confirmations:
         revoke: Emin misiniz?
       index:
-        application: Uygulama
-        created_at: Yetkili
-        date_format: "%m-%d-%Y %H:%M:%S"
-        scopes: Kapsamlar
+        authorized_at: "%{date} tarihinde onaylandı"
+        description_html: Bunlar, API aracılığıyla hesabınıza erişebilen uygulamalardır. Eğer burada tanımadığınız uygulamalar veya kötü davranan bir uygulama var, erişimini kaldırabilirsiniz.
+        last_used_at: En son %{date} tarihinde kullanıldı
+        never_used: Hiç kullanılmadı
+        scopes: İzinler
+        superapp: Dahili
         title: Yetkili uygulamalarınız
     errors:
       messages:
         access_denied: Kaynak sahibi veya yetkilendirme sunucusu isteği reddetti.
-        credential_flow_not_configured: Kaynak Sahibi Şifresi Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
+        credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
         invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
         invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş.
         invalid_redirect_uri: Dahil edilmiş yönlendirme URL'si geçersiz.
@@ -110,6 +112,33 @@ tr:
       authorized_applications:
         destroy:
           notice: Uygulama iptal edildi.
+    grouped_scopes:
+      access:
+        read: Sadece okuma erişimi
+        read/write: Okuma ve yazma erişimi
+        write: Sadece yazma erişimi
+      title:
+        accounts: Hesaplar
+        admin/accounts: Hesapların yönetimi
+        admin/all: Tüm yönetsel işlevler
+        admin/reports: Şikayetlerin yönetimi
+        all: Her şey
+        blocks: Engeller
+        bookmarks: Yer imleri
+        conversations: Sohbetler
+        crypto: Uçtan uca şifreleme
+        favourites: Beğeniler
+        filters: Filtreler
+        follow: İlişkiler
+        follows: Takip edilenler
+        lists: Listeler
+        media: Medya ekleri
+        mutes: Sessize alınanlar
+        notifications: Bildirimler
+        push: Anlık bildirimler
+        reports: Şikayetler
+        search: Arama
+        statuses: Gönderiler
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ tr:
     scopes:
       admin:read: sunucudaki tüm verileri okuma
       admin:read:accounts: tüm hesapların hassas bilgilerini okuma
+      admin:read:canonical_email_blocks: tüm kurallı e-posta engellerinin hassas bilgilerini okuma
+      admin:read:domain_allows: tüm alan adı izinlerinin hassas bilgilerini okuma
+      admin:read:domain_blocks: tüm alan adı engellerinin hassas bilgilerini okuma
+      admin:read:email_domain_blocks: tüm e-posta alan adı engellerinin hassas bilgilerini okuma
+      admin:read:ip_blocks: tüm IP engellerinin hassas bilgilerini okuma
       admin:read:reports: tüm raporların ve raporlanan hesapların hassas bilgilerini okuma
       admin:write: sunucudaki tüm verileri değiştirin
       admin:write:accounts: hesaplarda denetleme eylemleri gerçekleştirin
+      admin:write:canonical_email_blocks: kurallı e-posta engellemeleri için denetleme eylemleri gerçekleştirin
+      admin:write:domain_allows: alan adı izinleri için denetleme eylemleri gerçekleştirin
+      admin:write:domain_blocks: alan adı engellemeleri için denetleme eylemleri gerçekleştirin
+      admin:write:email_domain_blocks: e-posta alan adı engellemeleri için denetleme eylemleri gerçekleştirin
+      admin:write:ip_blocks: IP engellemeleri için denetleme eylemleri gerçekleştirin
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
+      crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
       push: anlık bildirimlerizi alın
       read: hesabınızın tüm verilerini okuyun
@@ -143,6 +183,7 @@ tr:
       write:accounts: profilinizi değiştirin
       write:blocks: hesapları ve alan adlarını engelleyin
       write:bookmarks: durumları yer imleyin
+      write:conversations: sessize al ve sohbetleri sil
       write:favourites: durumları beğenin
       write:filters: filtreler oluşturun
       write:follows: insanları takip edin
diff --git a/config/locales/doorkeeper.tt.yml b/config/locales/doorkeeper.tt.yml
index af6e8f180..41af088bf 100644
--- a/config/locales/doorkeeper.tt.yml
+++ b/config/locales/doorkeeper.tt.yml
@@ -10,6 +10,3 @@ tt:
         delete: Бетерү
         name: Исем
         show: Күрсәтү
-    authorized_applications:
-      index:
-        date_format: "%Y-%m-%d %H:%M:%S"
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 8d0d8e770..8cdecabbc 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -3,10 +3,10 @@ uk:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Назва додатку
+        name: Назва застосунку
         redirect_uri: URI перенаправлення
         scopes: Рамки
-        website: Веб-сайт додатку
+        website: Вебсайт застосунку
     errors:
       models:
         doorkeeper/application:
@@ -27,7 +27,7 @@ uk:
       confirmations:
         destroy: Ви впевнені?
       edit:
-        title: Редагувати додаток
+        title: Редагувати застосунок
       form:
         error: Отакої! Перевірте свою форму на помилки
       help:
@@ -35,46 +35,48 @@ uk:
         redirect_uri: Використовуйте одну стрічку на URI
         scopes: Відділяйте області видимості пробілами. Залишайте порожніми, щоб використовувати області видимості за промовчуванням.
       index:
-        application: Додаток
+        application: Застосунок
         callback_url: URL зворотнього виклику
         delete: Видалити
         empty: У вас немає створених додатків.
         name: Назва
-        new: Новий додаток
+        new: Новий застосунок
         scopes: Області видимості
         show: Показати
         title: Ваші додатки
       new:
-        title: Новий додаток
+        title: Новий застосунок
       show:
         actions: Дії
-        application_id: ID додатку
+        application_id: Ключ застосунку
         callback_urls: URL зворотніх викликів
         scopes: Дозволи
         secret: Таємниця
-        title: 'Додаток: %{name}'
+        title: 'Застосунок: %{name}'
     authorizations:
       buttons:
         authorize: Авторизувати
         deny: Відмовити
       error:
-        title: Сталася помилка
+        title: Трапилась помилка
       new:
-        able_to: Він зможе
-        prompt: Додаток %{client_name} запитує доступ до вашого облікового запису
+        prompt_html: "%{client_name} хоче отримати доступ до вашого облікового запису. Це сторонній застосунок. <strong>Якщо ви йому не довіряєте, не варто авторизувати його.</strong>"
+        review_permissions: Переглянути дозволи
         title: Необхідна авторизація
       show:
-        title: Скопіюйте цей код авторизації та вставте його у додаток.
+        title: Скопіюйте цей код авторизації та вставте його у застосунок.
     authorized_applications:
       buttons:
         revoke: Відкликати авторизацію
       confirmations:
         revoke: Ви впевнені?
       index:
-        application: Додаток
-        created_at: Авторизовано
-        date_format: "%d-%m-%Y %H:%M:%S"
+        authorized_at: Авторизовано %{date}
+        description_html: Це застосунки, які мають доступ до вашого облікового запису через API. Якщо тут є застосунки, які ви не розпізнаєте, або застосунок працює неправильно, ви можете відкликати їхній доступ.
+        last_used_at: Востаннє використано %{date}
+        never_used: Ніколи не використовувалися
         scopes: Дозволи
+        superapp: Внутрішній
         title: Ваші авторизовані додатки
     errors:
       messages:
@@ -82,7 +84,7 @@ uk:
         credential_flow_not_configured: Не вдалося перевірити парольні дані клієнту через неналаштований параметр Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Не вдалося аутентифікувати клієнта (клієнт невідомий, аутентифікацію клієнта не увімкнено, або непідтримуваний метод аутентифікації).
         invalid_grant: Наданий санкціонований дозвіл недійсний, прострочений, анульований, не відповідає URI перенаправлення, що використовується в запиті авторизації, або був виданий іншому клієнту.
-        invalid_redirect_uri: Включений URI перенаправлення не є дійсним.
+        invalid_redirect_uri: Включений uri перенаправлення не є дійсним.
         invalid_request:
           missing_param: 'Відсутній обов''язковий параметр: %{value}.'
           request_not_authorized: Запит повинен бути авторизований. Необхідний параметр запиту авторизації відсутній або хибний.
@@ -102,14 +104,41 @@ uk:
     flash:
       applications:
         create:
-          notice: Додаток створено.
+          notice: Застосунок створено.
         destroy:
-          notice: Додаток видалено.
+          notice: Застосунок видалено.
         update:
-          notice: Додаток оновлено.
+          notice: Застосунок оновлено.
       authorized_applications:
         destroy:
           notice: Авторизацію додатка відкликано.
+    grouped_scopes:
+      access:
+        read: Доступ без права внесення змін
+        read/write: Доступ до читання і запису
+        write: Доступ лише для запису
+      title:
+        accounts: Облікові записи
+        admin/accounts: Адміністрація облікових записів
+        admin/all: Усі адміністративні функції
+        admin/reports: Адміністрація звітів
+        all: Усе
+        blocks: Блокування
+        bookmarks: Закладки
+        conversations: Бесіди
+        crypto: Наскрізне шифрування
+        favourites: Вподобане
+        filters: Фільтри
+        follow: Взаємозв'язки
+        follows: Підписки
+        lists: Списки
+        media: Мультимедійні вкладення
+        mutes: Нехтувані
+        notifications: Сповіщення
+        push: Push-сповіщення
+        reports: Скарги
+        search: Пошук
+        statuses: Дописи
     layouts:
       admin:
         nav:
@@ -120,35 +149,39 @@ uk:
     scopes:
       admin:read: читати всі дані на сервері
       admin:read:accounts: читати конфіденційну інформацію усіх акаунтів
+      admin:read:domain_allows: читати конфіденційну інформацію всіх доменів дозволено
       admin:read:reports: читати дражливу інформацію усіх скарг та облікових записів зі скаргами
       admin:write: модифікувати всі дані на сервері
       admin:write:accounts: модерувати облікові записи
+      admin:write:domain_allows: модерувати домени дозволено
       admin:write:reports: модерувати скарги
+      crypto: використовувати наскрізне шифрування
       follow: змінювати стосунки облікового запису
       push: отримувати Ваші Push-повідомлення
       read: читати усі дані вашого облікового запису
       read:accounts: бачити інформацію про облікові записи
       read:blocks: бачити Ваші блокування
       read:bookmarks: бачити ваші закладки
-      read:favourites: бачити Ваші вподобані пости
+      read:favourites: бачити вподобані дописи
       read:filters: бачити Ваші фільтри
       read:follows: бачити Ваші підписки
       read:lists: бачити Ваші списки
-      read:mutes: бачити ваші заглушення
+      read:mutes: бачити ваші нехтування
       read:notifications: бачити Ваші сповіщення
       read:reports: бачити Ваші скарги
       read:search: шукати від вашого імені
-      read:statuses: бачити всі статуси
+      read:statuses: бачити всі дописи
       write: змінювати усі дані вашого облікового запису
       write:accounts: змінювати ваш профіль
       write:blocks: блокувати облікові записи і домени
-      write:bookmarks: додавати пости в закладки
-      write:favourites: вподобані статуси
+      write:bookmarks: додавати дописи до закладок
+      write:conversations: приховати й видалити бесіди
+      write:favourites: вподобані дописи
       write:filters: створювати фільтри
       write:follows: підписуйтесь на людей
       write:lists: створювайте списки
       write:media: завантажити медіафайли
-      write:mutes: заглушити людей або бесіди
+      write:mutes: приховувати людей або бесіди
       write:notifications: очищувати Ваші сповіщення
       write:reports: надіслати скаргу про людей
-      write:statuses: публікувати статуси
+      write:statuses: публікувати дописи
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 585d7ce07..d4808984f 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -60,8 +60,8 @@ vi:
       error:
         title: Một lỗi đã xảy ra
       new:
-        able_to: Nó sẽ có thể
-        prompt: Ứng dụng %{client_name} yêu cầu quyền truy cập vào tài khoản của bạn
+        prompt_html: "%{client_name} yêu cầu truy cập tài khoản của bạn. Đây là ứng dụng của bên thứ ba. <strong>Nếu không tin tưởng, đừng cho phép nó.</strong>"
+        review_permissions: Xem lại quyền cho phép
         title: Yêu cầu truy cập
       show:
         title: Sao chép mã này và dán nó vào ứng dụng.
@@ -71,23 +71,25 @@ vi:
       confirmations:
         revoke: Bạn có chắc không?
       index:
-        application: Ứng dụng
-        created_at: Đã cho phép
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: Quyền hạn
-        title: Các ứng dụng đang cho phép
+        authorized_at: Cho phép vào %{date}
+        description_html: Đây là những ứng dụng có thể truy cập tài khoản của bạn bằng API. Nếu có ứng dụng bạn không nhận ra ở đây hoặc ứng dụng hoạt động sai, bạn có thể thu hồi quyền truy cập của ứng dụng đó.
+        last_used_at: Dùng lần cuối %{date}
+        never_used: Chưa dùng
+        scopes: Quyền cho phép
+        superapp: Đang dùng
+        title: Các ứng dụng đã dùng
     errors:
       messages:
         access_denied: Chủ sở hữu tài nguyên hoặc máy chủ đã từ chối yêu cầu.
         credential_flow_not_configured: Resource Owner Password Credentials không thành công do Doorkeeper.configure.resource_owner_from_credentials không được định cấu hình.
-        invalid_client: Xác thực ứng dụng khách không thành công do máy khách mơ hồ, không bao gồm xác thực ứng dụng khách hoặc phương thức xác thực không được hỗ trợ.
+        invalid_client: Xác minh ứng dụng khách không thành công do máy khách mơ hồ, không bao gồm xác thực ứng dụng khách hoặc phương thức xác thực không được hỗ trợ.
         invalid_grant: Yêu cầu không hợp lệ, hết hạn, bị gỡ hoặc không khớp với tài khoản đã cấp phép. Hoặc xung đột với ứng dụng khác.
         invalid_redirect_uri: URL chuyển hướng không hợp lệ.
         invalid_request:
           missing_param: 'Thiếu tham số bắt buộc: %{value}.'
           request_not_authorized: Yêu cầu cần được cho phép trước. Tham số bắt buộc bị thiếu hoặc vô giá trị.
           unknown: Thiếu tham số bắt buộc. Có thể giá trị tham số không được hỗ trợ, hoặc không đúng định dạng.
-        invalid_resource_owner: Thông tin xác thực chủ sở hữu tài nguyên được cung cấp không hợp lệ hoặc không thể tìm thấy chủ sở hữu tài nguyên
+        invalid_resource_owner: Thông tin xác minh chủ sở hữu tài nguyên được cung cấp không hợp lệ hoặc không thể tìm thấy chủ sở hữu tài nguyên
         invalid_scope: Quyền yêu cầu không hợp lệ, không có thật hoặc sai định dạng.
         invalid_token:
           expired: Mã thông báo truy cập đã hết hạn
@@ -110,6 +112,33 @@ vi:
       authorized_applications:
         destroy:
           notice: Đã gỡ bỏ ứng dụng.
+    grouped_scopes:
+      access:
+        read: Chỉ đọc
+        read/write: Đọc và ghi
+        write: Chỉ ghi
+      title:
+        accounts: Tài khoản
+        admin/accounts: Quản trị tài khoản
+        admin/all: Mọi chức năng quản trị
+        admin/reports: Quản trị báo cáo
+        all: Tất cả
+        blocks: Chặn
+        bookmarks: Tút đã lưu
+        conversations: Thảo luận
+        crypto: Mã hóa đầu cuối
+        favourites: Lượt thích
+        filters: Bộ lọc
+        follow: Mối quan hệ
+        follows: Đang theo dõi
+        lists: Danh sách
+        media: Tập tin đính kèm
+        mutes: Đã ẩn
+        notifications: Thông báo
+        push: Thông báo đẩy
+        reports: Báo cáo
+        search: Tìm kiếm
+        statuses: Tút
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ vi:
     scopes:
       admin:read: đọc tất cả dữ liệu trên máy chủ
       admin:read:accounts: đọc thông tin nhạy cảm của tất cả các tài khoản
+      admin:read:canonical_email_blocks: đọc thông tin nhạy cảm của tất cả các khối email chuẩn
+      admin:read:domain_allows: đọc thông tin nhạy cảm của tất cả các tên miền cho phép
+      admin:read:domain_blocks: đọc thông tin nhạy cảm của tất cả các tên miền chặn
+      admin:read:email_domain_blocks: đọc thông tin nhạy cảm của tất cả các miền email chặn
+      admin:read:ip_blocks: đọc thông tin nhạy cảm của tất cả các IP chặn
       admin:read:reports: đọc thông tin của các báo cáo và các tài khoản bị báo cáo
       admin:write: sửa đổi tất cả dữ liệu trên máy chủ
       admin:write:accounts: áp đặt hành động kiểm duyệt trên tài khoản
+      admin:write:canonical_email_blocks: thực hiện các hành động kiểm duyệt đối với chặn email
+      admin:write:domain_allows: thực hiện các hành động kiểm duyệt đối với các email cho phép
+      admin:write:domain_blocks: thực hiện các hành động kiểm duyệt đối với các tên miền chặn
+      admin:write:email_domain_blocks: thực hiện các hành động kiểm duyệt đối với các tên miền email chặn
+      admin:write:ip_blocks: áp đặt kiểm duyệt với các IP chặn
       admin:write:reports: áp đặt kiểm duyệt với các báo cáo
+      crypto: dùng mã hóa đầu cuối
       follow: sửa đổi các mối quan hệ tài khoản
       push: nhận thông báo đẩy của bạn
       read: đọc tất cả dữ liệu tài khoản của bạn
@@ -140,15 +180,16 @@ vi:
       read:search: thay mặt bạn tìm kiếm
       read:statuses: xem toàn bộ tút
       write: sửa đổi mọi dữ liệu tài khoản của bạn
-      write:accounts: sửa đổi trang cá nhân của bạn
-      write:blocks: chặn người dùng và máy chủ
+      write:accounts: sửa đổi trang hồ sơ của bạn
+      write:blocks: chặn người và máy chủ
       write:bookmarks: sửa đổi những thứ bạn lưu
+      write:conversations: ẩn và xóa thảo luận
       write:favourites: lượt thích
       write:filters: tạo bộ lọc
       write:follows: theo dõi ai đó
       write:lists: tạo danh sách
       write:media: tải lên tập tin
-      write:mutes: ẩn người dùng và cuộc đối thoại
+      write:mutes: ẩn người và thảo luận
       write:notifications: xóa thông báo của bạn
       write:reports: báo cáo người khác
       write:statuses: đăng tút
diff --git a/config/locales/doorkeeper.zgh.yml b/config/locales/doorkeeper.zgh.yml
index d34b8109c..53c5181d4 100644
--- a/config/locales/doorkeeper.zgh.yml
+++ b/config/locales/doorkeeper.zgh.yml
@@ -37,15 +37,10 @@ zgh:
       buttons:
         authorize: ⵙⵙⵓⵔⴳ
         deny: ⴰⴳⵢ
-      new:
-        prompt: ⵜⵙⵙⵓⵜⵓⵔ ⵜⵙⵏⵙⵉ %{client_name} ⴰⵙⴰⴷⴼ ⵖⵔ ⵓⵎⵉⴹⴰⵏ ⵏⵏⴽ
     authorized_applications:
       confirmations:
         revoke: ⵉⵙ ⵏⵉⵜ?
       index:
-        application: ⵜⵉⵙⵏⵙⵉ
-        created_at: ⵜⴻⵜⵜⵓⵙⵓⵔⴳ
-        date_format: "%d-%m-%Y %H:%M:%S"
         title: ⵜⵉⵙⵏⵙⵉⵡⵉⵏ ⵏⵏⴽ ⵉⵜⵜⵓⵙⵓⵔⴷⵏ
     flash:
       applications:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 7fefaf951..e74f46ad5 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -4,7 +4,7 @@ zh-CN:
     attributes:
       doorkeeper/application:
         name: 应用名称
-        redirect_uri: 跳转 URI
+        redirect_uri: 重定向 URI
         scopes: 权限范围
         website: 应用网站
     errors:
@@ -12,9 +12,9 @@ zh-CN:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: 不能包含网址片段（#）
-              invalid_uri: 必须是有效的 URL 格式
-              relative_uri: 必须是绝对的 URL 地址
+              fragment_present: 不能包含网页书签（#）
+              invalid_uri: 必须是有效的 URL 地址。
+              relative_uri: 必须是绝对的 URL 地址。
               secured_uri: 必须是 HTTPS/SSL 的 URL 地址
   doorkeeper:
     applications:
@@ -60,8 +60,8 @@ zh-CN:
       error:
         title: 发生错误
       new:
-        able_to: 此应用将能够
-        prompt: 授权 %{client_name} 访问你的帐户？
+        prompt_html: "%{client_name} 希望得到访问你账号的许可。这是一个第三方应用。<strong>如果你不信任它，那么你不应该授权它。</strong>"
+        review_permissions: 检查权限
         title: 需要授权
       show:
         title: 接下来请复制此处的授权代码并粘贴到应用中。
@@ -71,14 +71,16 @@ zh-CN:
       confirmations:
         revoke: 确定要撤销对此应用的授权吗？
       index:
-        application: 应用
-        created_at: 授权时间
-        date_format: "%Y年%m月%d日 %H:%M:%S"
-        scopes: 权限范围
+        authorized_at: 授权于 %{date}
+        description_html: 这些是可以使用 API 访问你账号的应用程序。如果这里有你不认识的应用程序，或者某个应用程序行为异常，你可以撤销其访问权限。
+        last_used_at: 最后一次使用 %{date}
+        never_used: 从未使用
+        scopes: 权限
+        superapp: 内部
         title: 已授权的应用列表
     errors:
       messages:
-        access_denied: 资源所有者或服务器拒绝了请求
+        access_denied: 资源所有者或验证服务器拒绝了此请求
         credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，应用验证授权流程失败。
         invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败
         invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址
@@ -110,6 +112,33 @@ zh-CN:
       authorized_applications:
         destroy:
           notice: 已成功撤销对此应用的授权
+    grouped_scopes:
+      access:
+        read: 只读权限
+        read/write: 读写权限
+        write: 仅写入权限
+      title:
+        accounts: 账号
+        admin/accounts: 账号管理
+        admin/all: 所有管理功能
+        admin/reports: 举报管理
+        all: 所有
+        blocks: 屏蔽
+        bookmarks: 书签
+        conversations: 会话
+        crypto: 端到端加密
+        favourites: 喜欢
+        filters: 过滤器
+        follow: 关系
+        follows: 关注
+        lists: 列表
+        media: 媒体文件
+        mutes: 已被隐藏的
+        notifications: 通知
+        push: 推送通知
+        reports: 举报
+        search: 搜索
+        statuses: 嘟文
     layouts:
       admin:
         nav:
@@ -119,14 +148,25 @@ zh-CN:
         title: 需要 OAuth 认证
     scopes:
       admin:read: 读取服务器上的所有数据
-      admin:read:accounts: 读取所有帐号的敏感信息
-      admin:read:reports: 读取所有举报和被举报帐号的敏感信息
+      admin:read:accounts: 读取所有账号的敏感信息
+      admin:read:canonical_email_blocks: 读取所有标准电子邮件块的敏感信息
+      admin:read:domain_allows: 读取所有域的敏感信息
+      admin:read:domain_blocks: 读取所有域块的敏感信息
+      admin:read:email_domain_blocks: 读取所有电子邮件域块的敏感信息
+      admin:read:ip_blocks: 读取所有IP块的敏感信息
+      admin:read:reports: 读取所有举报和被举报账号的敏感信息
       admin:write: 修改服务器上的所有数据
-      admin:write:accounts: 对帐号执行管理操作
+      admin:write:accounts: 对账号执行管理操作
+      admin:write:canonical_email_blocks: 在标准电子邮件块上执行管理操作
+      admin:write:domain_allows: 在域上执行管理操作
+      admin:write:domain_blocks: 在域块上执行管理操作
+      admin:write:email_domain_blocks: 在电子邮件域块上执行管理操作
+      admin:write:ip_blocks: 在 IP 块上执行管理操作
       admin:write:reports: 对举报执行管理操作
+      crypto: 使用端到端加密
       follow: 关注或屏蔽用户
-      push: 接收你的帐户的推送通知
-      read: 读取你的帐户数据
+      push: 接收你的账户的推送通知
+      read: 读取你的账户数据
       read:accounts: 查看账号信息
       read:blocks: 查看你的屏蔽列表
       read:bookmarks: 查看你的书签
@@ -143,6 +183,7 @@ zh-CN:
       write:accounts: 修改你的个人资料
       write:blocks: 屏蔽账号和域名
       write:bookmarks: 为嘟文添加书签
+      write:conversations: 静音并删除会话
       write:favourites: 喜欢的嘟文
       write:filters: 创建过滤器
       write:follows: 关注其他人
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 60c64cc31..632d51183 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -60,8 +60,8 @@ zh-HK:
       error:
         title: 發生錯誤
       new:
-        able_to: 它將可以
-        prompt: 應用程式 %{client_name} 要求得到你用戶的部份權限
+        prompt_html: "%{client_name} 想得到存取你帳號的權限。這是一個第三方應用程式。<strong>如果你不信任它，請勿授權。</strong>"
+        review_permissions: 檢視權限
         title: 需要用戶授權
       show:
         title: 請把這個授權碼複製到應用程式中。
@@ -71,10 +71,12 @@ zh-HK:
       confirmations:
         revoke: 是否確定要取消授權？
       index:
-        application: 應用程式
-        created_at: 授權日期
-        date_format: "%Y年%m月%d日 %H:%M:%S"
-        scopes: 權限範圍 (Scopes)
+        authorized_at: 於 %{date} 授權
+        description_html: 這些應用程式能透過 API 存取你的帳號。如果有你不認識的應用程式，或程式行為不當，你可以在此撤銷其存取權限。
+        last_used_at: 最後使用於 %{date}
+        never_used: 從未使用
+        scopes: 權限
+        superapp: 內部
         title: 已獲你授權的程用程式
     errors:
       messages:
@@ -110,6 +112,33 @@ zh-HK:
       authorized_applications:
         destroy:
           notice: 已取消應用程式授權。
+    grouped_scopes:
+      access:
+        read: 唯讀存取
+        read/write: 讀寫存取
+        write: 唯寫存取
+      title:
+        accounts: 帳號
+        admin/accounts: 帳號管理
+        admin/all: 所有管理功能
+        admin/reports: 檢舉報告管理
+        all: 全部
+        blocks: 封鎖
+        bookmarks: 書籤
+        conversations: 對話
+        crypto: 端到端加密
+        favourites: 最愛
+        filters: 篩選器
+        follow: 關係
+        follows: 追蹤
+        lists: 名單
+        media: 媒體附件
+        mutes: 靜音
+        notifications: 通知
+        push: 推送通知
+        reports: 檢舉報告
+        search: 搜尋
+        statuses: 帖文
     layouts:
       admin:
         nav:
@@ -120,10 +149,21 @@ zh-HK:
     scopes:
       admin:read: 讀取伺服器的所有資料
       admin:read:accounts: 讀取所有帳戶的敏感資訊
+      admin:read:canonical_email_blocks: 讀取所有已封鎖標準電郵的敏感資訊
+      admin:read:domain_allows: 讀取所有允許網域的敏感資訊
+      admin:read:domain_blocks: 讀取所有已封鎖網域的敏感資訊
+      admin:read:email_domain_blocks: 讀取所有已封鎖電郵網域的敏感資訊
+      admin:read:ip_blocks: 讀取所有已封鎖 IP 的敏感資訊
       admin:read:reports: 讀取所有回報 / 被回報之帳戶的敏感資訊
       admin:write: 修改伺服器的所有資料
       admin:write:accounts: 對帳號進行仲裁管理動作
+      admin:write:canonical_email_blocks: 對已封鎖的標準電郵執行審核動作
+      admin:write:domain_allows: 對已允許的網域進行審核動作
+      admin:write:domain_blocks: 對已封鎖的網域進行審核動作
+      admin:write:email_domain_blocks: 對已封鎖的電郵網域執行審核動作
+      admin:write:ip_blocks: 對已封鎖的 IP 執行審核動作
       admin:write:reports: 對回報進行仲裁管理動作
+      crypto: 使用端到端加密
       follow: 修改帳號的對外聯繫
       push: 接收你的帳號的推送通知
       read: 閱讀你帳號的所有資料
@@ -143,6 +183,7 @@ zh-HK:
       write:accounts: 修改你的個人檔案
       write:blocks: 封鎖帳號及域名
       write:bookmarks: 把文章加入最愛
+      write:conversations: 靜音及刪除對話
       write:favourites: 喜歡的文章
       write:filters: 建立過濾條件
       write:follows: 關注其他人
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 912924787..edafecf72 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -31,27 +31,27 @@ zh-TW:
       form:
         error: 唉呦！請看看表單以排查錯誤
       help:
-        native_redirect_uri: 請使用 %{native_redirect_uri} 作本機測試
+        native_redirect_uri: 請使用 %{native_redirect_uri} 作本站測試
         redirect_uri: 每行輸入一個 URI
         scopes: 請用半形空格分開範圍。空白表示使用預設的範圍。
       index:
         application: 應用程式
         callback_url: 回傳網址
         delete: 刪除
-        empty: 您沒有安裝 App。
+        empty: 您沒有安裝應用程式。
         name: 名稱
         new: 新增應用程式
         scopes: 範圍
         show: 顯示
-        title: 你的應用程式
+        title: 您的應用程式
       new:
         title: 新增應用程式
       show:
         actions: 動作
-        application_id: 客戶端金鑰
+        application_id: 用戶端金鑰 (client key)
         callback_urls: 回傳網址
         scopes: 範圍
-        secret: 客戶端密碼
+        secret: 用戶端密碼 (client secret)
         title: 應用程式︰%{name}
     authorizations:
       buttons:
@@ -60,28 +60,30 @@ zh-TW:
       error:
         title: 發生錯誤
       new:
-        able_to: 這將允許其作：
-        prompt: 應用程式 %{client_name} 要求取得您帳戶的存取權限
+        prompt_html: "%{client_name} 欲請求存取您帳號之權限。這是一個第三方應用程式。<strong>若您不信任該應用程式，請不要授權。</strong>"
+        review_permissions: 檢視權限
         title: 需要授權
       show:
         title: 複製此授權碼並貼上到應用程式中。
     authorized_applications:
       buttons:
-        revoke: 撤銷
+        revoke: 註銷
       confirmations:
-        revoke: 確定撤銷？
+        revoke: 您確定嗎？
       index:
-        application: 應用程式
-        created_at: 授權於
-        date_format: "%Y-%m-%d %H:%M:%S"
-        scopes: 範圍
+        authorized_at: 於 %{date} 授權
+        description_html: 這些應用程式能透過 API 存取您的帳號。若有您不認得之應用程式，或應用程式行為異常，您可以於此註銷其存取權限。
+        last_used_at: 上次使用時間 %{date}
+        never_used: 從未使用
+        scopes: 權限
+        superapp: 內部
         title: 已授權的應用程式
     errors:
       messages:
         access_denied: 資源持有者或授權伺服器拒絕請求。
         credential_flow_not_configured: 因為 Doorkeeper.configure.resource_owner_from_credentials 未設定，所以資源持有者密碼認證程序失敗。
-        invalid_client: 客戶端驗證失敗，可能是因為未知的客戶端程式、未包含客戶端驗證、或使用了不支援的認證方法。
-        invalid_grant: 授權申請不正確、逾期、已被取消、與授權請求內的重新導向 URI 不符、或屬於別的客戶端程式。
+        invalid_client: 用戶端驗證失敗，可能是因為未知的用戶端程式、未包含用戶端驗證、或使用了不支援的認證方法。
+        invalid_grant: 授權申請不正確、逾期、已被註銷、與授權請求內的重新導向 URI 不符、或屬於別的用戶端程式。
         invalid_redirect_uri: 包含的重新導向 URI 是不正確的。
         invalid_request:
           missing_param: 缺少必要的參數：%{value}.
@@ -96,7 +98,7 @@ zh-TW:
         resource_owner_authenticator_not_configured: 因為未設定 Doorkeeper.configure.resource_owner_authenticator，所以資源持有者尋找失敗。
         server_error: 認證伺服器發生未知錯誤。
         temporarily_unavailable: 認證伺服器暫時無法使用。
-        unauthorized_client: 客戶端程式沒有權限使用此方法請求。
+        unauthorized_client: 用戶端程式沒有權限使用此方法請求。
         unsupported_grant_type: 認證伺服器不支援這個授權類型。
         unsupported_response_type: 認證伺服器不支援這個回應類型。
     flash:
@@ -109,7 +111,34 @@ zh-TW:
           notice: 已更新應用程式。
       authorized_applications:
         destroy:
-          notice: 已撤銷應用程式。
+          notice: 已註銷應用程式。
+    grouped_scopes:
+      access:
+        read: 唯讀權限
+        read/write: 讀寫權限
+        write: 唯寫權限
+      title:
+        accounts: 帳號
+        admin/accounts: 帳號管理
+        admin/all: 所有管理功能
+        admin/reports: 檢舉報告管理
+        all: 全部
+        blocks: 封鎖
+        bookmarks: 書籤
+        conversations: 對話
+        crypto: 端到端加密
+        favourites: 最愛
+        filters: 過濾器
+        follow: 關係
+        follows: 跟隨的使用者
+        lists: 名單
+        media: 多媒體附加檔案
+        mutes: 靜音
+        notifications: 通知
+        push: 推播通知
+        reports: 檢舉報告
+        search: 搜尋
+        statuses: 嘟文
     layouts:
       admin:
         nav:
@@ -119,34 +148,46 @@ zh-TW:
         title: 需要 OAuth 授權
     scopes:
       admin:read: 讀取伺服器的所有資料
-      admin:read:accounts: 讀取所有帳戶的敏感資訊
-      admin:read:reports: 讀取所有回報 / 被回報之帳戶的敏感資訊
+      admin:read:accounts: 讀取所有帳號的敏感內容
+      admin:read:canonical_email_blocks: 讀取所有電子郵件黑名單之敏感內容
+      admin:read:domain_allows: 讀取所有網域白名單之敏感內容
+      admin:read:domain_blocks: 讀取所有網域黑名單之敏感內容
+      admin:read:email_domain_blocks: 讀取所有電子郵件黑名單之敏感內容
+      admin:read:ip_blocks: 讀取所有 IP 黑名單之敏感內容
+      admin:read:reports: 讀取所有回報 / 被回報之帳號的敏感內容
       admin:write: 修改伺服器的所有資料
-      admin:write:accounts: 對帳戶進行仲裁管理動作
-      admin:write:reports: 對報告進行仲裁管理動作
-      follow: 修改帳戶關係
-      push: 接收帳戶的推播通知
-      read: 讀取您所有的帳戶資料
-      read:accounts: 檢視帳戶資訊
+      admin:write:accounts: 對帳號進行管理動作
+      admin:write:canonical_email_blocks: 對電子郵件黑名單進行管理動作
+      admin:write:domain_allows: 對網域白名單進行管理動作
+      admin:write:domain_blocks: 對網域黑名單進行管理動作
+      admin:write:email_domain_blocks: 對電子郵件黑名單進行管理動作
+      admin:write:ip_blocks: 對 IP 黑名單進行管理動作
+      admin:write:reports: 對報告進行管理動作
+      crypto: 使用端到端加密
+      follow: 修改帳號關係
+      push: 接收帳號的推播通知
+      read: 讀取您所有的帳號資料
+      read:accounts: 檢視帳號資訊
       read:blocks: 檢視您的封鎖名單
       read:bookmarks: 檢視您的書籤
-      read:favourites: 檢視您的收藏項目
+      read:favourites: 檢視您收藏的最愛
       read:filters: 檢視您的過濾條件
-      read:follows: 檢視您關注的人
+      read:follows: 檢視您跟隨的人
       read:lists: 檢視您的名單
       read:mutes: 檢視您靜音的人
       read:notifications: 檢視您的通知
       read:reports: 檢視您的檢舉
-      read:search: 以你的身份搜尋
+      read:search: 以您的身份搜尋
       read:statuses: 檢視所有嘟文
-      write: 修改您帳戶的所有資料
+      write: 修改您帳號的所有資料
       write:accounts: 修改您的個人檔案
-      write:blocks: 封鎖帳戶及站台
+      write:blocks: 封鎖帳號及站台
       write:bookmarks: 書籤狀態
-      write:favourites: 收藏嘟文
+      write:conversations: 靜音及刪除對話
+      write:favourites: 加到最愛
       write:filters: 建立過濾條件
-      write:follows: 關注其他人
-      write:lists: 建立名單
+      write:follows: 跟隨其他人
+      write:lists: 建立列表
       write:media: 上傳媒體檔案
       write:mutes: 靜音使用者及對話
       write:notifications: 清除您的通知
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2f888e62f..00bcdfd64 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1,91 +1,26 @@
 ---
 el:
   about:
-    about_hashtag_html: Αυτά είναι κάποια από τα δημόσια τουτ σημειωμένα με <strong>#%{hashtag}</strong>. Μπορείς να αλληλεπιδράσεις με αυτά αν έχεις λογαριασμό οπουδήποτε στο fediverse.
     about_mastodon_html: 'Το κοινωνικό δίκτυο του μέλλοντος: Χωρίς διαφημίσεις, χωρίς εταιρίες να σε κατασκοπεύουν, ηθικά σχεδιασμένο και αποκεντρωμένο! Με το Mastodon τα δεδομένα σου είναι πραγματικά δικά σου!'
-    about_this: Σχετικά
-    active_count_after: ενεργοί
-    active_footnote: Μηνιαίοι Ενεργοί Χρήστες (ΜΕΧ)
-    administered_by: 'Διαχειριστής:'
-    api: API
-    apps: Εφαρμογές κινητών
-    apps_platforms: Χρησιμοποίησε το Mastodon από το iOS, το Android και αλλού
-    browse_directory: Ξεφύλλισε τον κατάλογο χρηστών και ψάξε ανά ενδιαφέροντα
-    browse_local_posts: Ξεφύλλισε τη ζωντανή ροή αυτού του διακομιστή
-    browse_public_posts: Ξεφύλλισε τη ζωντανή ροή του Mastodon
-    contact: Επικοινωνία
     contact_missing: Δεν έχει οριστεί
     contact_unavailable: Μη διαθέσιμο
-    discover_users: Ανακάλυψε χρήστες
-    documentation: Τεκμηρίωση
-    federation_hint_html: Με ένα λογαριασμό στο %{instance} θα μπορείς να ακολουθείς ανθρώπους σε οποιοδήποτε κόμβο Mastodon αλλά και παραπέρα.
-    get_apps: Δοκίμασε μια εφαρμογή κινητού
     hosted_on: Το Mastodon φιλοξενείται στο %{domain}
-    instance_actor_flash: |
-      Αυτός ο λογαριασμός είναι εικονικός και απεικονίζει ολόκληρο τον κόμβο, όχι κάποιο συγκεκριμένο χρήστη.
-      Χρησιμεύει στη λειτουργία της ομοσπονδίας και δε θα πρέπει να αποκλειστεί, εκτός κι αν είναι επιθυμητός ο αποκλεισμός ολόκληρου του κόμβου. Σε αυτή την περίπτωση θα πρέπει να χρησιμοποιηθεί η λειτουργία αποκλεισμού τομέα.
-    learn_more: Μάθε περισσότερα
-    privacy_policy: Πολιτική απορρήτου
-    rules: Κανόνες διακομιστή
-    rules_html: 'Παρακάτω είναι μια σύνοψη των κανόνων που πρέπει να ακολουθήσετε αν θέλετε να έχετε ένα λογαριασμό σε αυτόν τον διακομιστή Mastodon:'
-    see_whats_happening: Μάθε τι συμβαίνει
-    server_stats: 'Στατιστικά κόμβου:'
-    source_code: Πηγαίος κώδικας
-    status_count_after:
-      one: δημοσίευση
-      other: δημοσιεύσεις
-    status_count_before: Που έγραψαν
-    tagline: Ακολούθησε τους γνωστούς σου και ανακάλυψε νέους ανθρώπους
-    terms: Όροι χρήσης
-    unavailable_content: Μη διαθέσιμο
-    unavailable_content_description:
-      domain: Διακομιστής
-      reason: 'Αιτία:'
-      rejecting_media: 'Τα αρχεία πολυμέσων αυτών των διακομιστών δεν θα επεξεργάζονται, δεν θα αποθηκεύονται και δεν θα εμφανίζεται η προεπισκόπησή τους, απαιτώντας χειροκίνητη επιλογή μέχρι το αρχικό αρχείο:'
-      rejecting_media_title: Φιλτραρισμένα πολυμέσα
-      silenced: 'Οι δημοσιεύσεις αυτών των διακομιστών θα είναι κρυμμένες από τις δημόσιες ροές και συζητήσεις, ενώ δεν θα δημιουργούνται ειδοποιήσεις για τις ενέργειες των χρηστών τους, εκτός κι αν τους ακολουθείς:'
-      silenced_title: Αποσιωπημένοι διακομιστές
-      suspended: 'Κανένα δεδομένο δε θα επεξεργάζεται, δε θα αποθηκεύεται και δε θα ανταλλάσσεται για αυτούς τους διακομιστές, καθιστώντας οποιαδήποτε αλληλεπίδραση ή επικοινωνία με χρήστες από αυτούς τους διακομιστές αδύνατη:'
-      suspended_title: Διακομιστές σε αναστολή
-    unavailable_content_html: Το Mastodon γενικά επιτρέπει να δεις περιεχόμενο και να αλληλεπιδράσεις με χρήστες από οποιονδήποτε διακομιστή στο fediverse. Εδώ είναι οι εξαιρέσεις που ισχύουν σε αυτόν τον συγκεκριμένο διακομιστή.
-    user_count_after:
-      one: χρήστης
-      other: χρήστες
-    user_count_before: Σπίτι για
-    what_is_mastodon: Τι είναι το Mastodon;
+    title: Σχετικά με
   accounts:
-    choices_html: 'Επιλογές από %{name}:'
-    endorsements_hint: Μπορεις να εγκρίνεις ανθρώπους που ακολουθείς μέσω της δικτυακής εφαρμογής και αυτοί θα εμφανίζονται εδώ.
-    featured_tags_hint: Μπορείς να επιλέξεις συγκεκριμένες ετικέτες που θα εμφανίζονται εδώ.
     follow: Ακολούθησε
     followers:
       one: Ακόλουθος
       other: Ακόλουθοι
     following: Ακολουθεί
-    joined: Εγγράφηκε στις %{date}
     last_active: τελευταία ενεργός/ή
     link_verified_on: Η κυριότητα αυτού του συνδέσμου ελέγχθηκε στις %{date}
-    media: Πολυμέσα
-    moved_html: 'Ο/Η %{name} μετακόμισε στο %{new_profile_link}:'
-    network_hidden: Αυτή η πληροφορία δεν είναι διαθέσιμη
-    never_active: Ποτέ
     nothing_here: Δεν υπάρχει τίποτα εδώ!
-    people_followed_by: Χρήστες που ακολουθεί ο/η %{name}
-    people_who_follow: Χρήστες που ακολουθούν τον/την %{name}
     pin_errors:
       following: Πρέπει ήδη να ακολουθείς το άτομο που θέλεις να επιδοκιμάσεις
     posts:
       one: Τουτ
       other: Τουτ
     posts_tab_heading: Τουτ
-    posts_with_replies: Τουτ και απαντήσεις
-    roles:
-      admin: Διαχειριστής
-      bot: Μποτ (αυτόματος λογαριασμός)
-      group: Ομάδα
-      moderator: Μεσολαβητής
-    unavailable: Το προφίλ δεν είναι διαθέσιμο
-    unfollow: Διακοπή παρακολούθησης
   admin:
     account_actions:
       action: Εκτέλεση ενέργειας
@@ -93,23 +28,24 @@ el:
     account_moderation_notes:
       create: Άφησε σημείωση
       created_msg: Επιτυχής δημιουργία σημειώματος μεσολάβησης!
-      delete: Διαγραφή
       destroyed_msg: Επιτυχής καταστροφή σημειώματος μεσολάβησης!
     accounts:
       add_email_domain_block: Εγγραφή τομέα email σε μαύρη λίστα
       approve: Έγκριση
-      approve_all: Έγκριση όλων
       approved_msg: Επιτυχής έγκριση αίτησης εγγραφής του/της %{username}
       are_you_sure: Σίγουρα;
       avatar: Αβατάρ
       by_domain: Τομέας
       change_email:
-        changed_msg: Επιτυχής αλλαγή email λογαριασμού!
         current_email: Τρέχον email
         label: Αλλαγή email
         new_email: Νέο email
         submit: Αλλαγή email
         title: Αλλαγή email για %{username}
+      change_role:
+        label: Αλλαγή ρόλου
+        no_role: Κανένας ρόλος
+        title: Αλλαγή ρόλου για %{username}
       confirm: Επιβεβαίωση
       confirmed: Επιβεβαιώθηκε
       confirming: Προς επιβεβαίωση
@@ -122,7 +58,7 @@ el:
       disabled: Απενεργοποιημένο
       display_name: Όνομα εμφάνισης
       domain: Τομέας
-      edit: Αλλαγή
+      edit: Επεξεργασία
       email: Email
       email_status: Κατάσταση email
       enable: Ενεργοποίηση
@@ -150,7 +86,7 @@ el:
         active: Ενεργός/ή
         all: Όλα
         pending: Εκκρεμούν
-        silenced: Αποσιωπημένα
+        silenced: Περιορισμένοι
         suspended: Σε αναστολή
         title: Μεσολάβηση
       moderation_notes: Σημειώσεις μεσολάβησης
@@ -158,6 +94,7 @@ el:
       most_recent_ip: Πιο πρόσφατη IP
       no_account_selected: Κανείς λογαριασμός δεν ενημερώθηκε αφού κανείς δεν ήταν επιλεγμένος
       no_limits_imposed: Χωρίς όρια
+      no_role_assigned: Δεν έχει ανατεθεί ρόλος
       not_subscribed: Άνευ συνδρομής
       pending: Εκκρεμεί έγκριση
       perform_full_suspension: Αναστολή
@@ -168,8 +105,9 @@ el:
       redownload: Ανανέωση αβατάρ
       redownloaded_msg: Επιτυχής ανανέωη προφίλ του/της %{username} από την πηγή
       reject: Απόρριψη
-      reject_all: Απόρριψη όλων
       rejected_msg: Επιτυχής απόρριψη αίτησης εγγραφής του/της %{username}
+      remote_suspension_irreversible: Τα δεδομένα αυτού του λογαριασμού έχουν διαγραφεί αμετάκλητα.
+      remote_suspension_reversible_hint_html: Ο λογαριασμός έχει ανασταλλεί στον server του και τα δεδομένα του θα διαγραφούν πλήρως στις %{date}. Μέχρι τότε, ο απομακρυσμένος server μπορεί να επαναφέρει τον λογαριασμό χωρίς επιπτώσεις. Αν θέλεις να διαγράψεις αμέσως όλα τα δεδομένα του λογαριασμού, μπορείς να το κάνεις παρακάτω.
       remove_avatar: Απομακρυσμένο αβατάρ
       remove_header: Αφαίρεση επικεφαλίδας
       removed_avatar_msg: Επιτυχής αφαίρεση εικόνας προφίλ του/της%{username}
@@ -181,12 +119,7 @@ el:
       reset: Επαναφορά
       reset_password: Επαναφορά συνθηματικού
       resubscribe: Επανεγγραφή
-      role: Δικαιώματα
-      roles:
-        admin: Διαχειριστής
-        moderator: Συντονιστής
-        staff: Προσωπικό
-        user: Χρήστης
+      role: Ρόλος
       search: Αναζήτηση
       search_same_email_domain: Άλλοι χρήστες με τον ίδιο τομέα e-mail
       search_same_ip: Υπόλοιποι χρήστες με την ίδια διεύθυνση IP
@@ -200,11 +133,13 @@ el:
       silenced: Αποσιωπημένοι
       statuses: Καταστάσεις
       subscribe: Εγγραφή
+      suspend: Αναστολή
       suspended: Σε αναστολή
       suspension_irreversible: Τα δεδομένα αυτού του λογαριασμού έχουν διαγραφεί οριστικά. Μπορείς να άρεις την αναστολή του λογαριασμού για να μπορέσει να χρησιμοποιηθεί αλλά αυτό δεν θα επαναφέρει όσα δεδομένα είχε προηγουμένως.
       suspension_reversible_hint_html: Ο λογαριασμός έχει ανασταλλεί και τα δεδομένα του θα διαγραφούν πλήρως στις %{date}. Μέχρι τότε ο λογαριασμός μπορεί να επανέλθει κανονικά. Αν θέλεις να διαγράψεις όλα τα δεδομένα του λογαριασμού, μπορείς να το κάνεις παρακάτω.
-      time_in_queue: Σε αναμονή για %{time}
       title: Λογαριασμοί
+      unblock_email: Ξεμπλοκάρισμα διεύθυνσης email
+      unblocked_email_msg: Επιτυχής κατάργηση αποκλεισμού διεύθυνσης ηλεκτρονικού ταχυδρομείου %{username}
       unconfirmed_email: Ανεπιβεβαίωτο email
       undo_sensitized: Αναίρεση ευαίσθητου
       undo_silenced: Αναίρεση αποσιώπησης
@@ -219,8 +154,11 @@ el:
       whitelisted: Εγκεκριμένοι
     action_logs:
       action_types:
+        approve_appeal: Έγκριση Έφεσης
+        approve_user: Έγκριση Χρήστη
         assigned_to_self_report: Ανάθεση Αναφοράς
         change_email_user: Αλλαγή email για χρήστη
+        change_role_user: Αλλαγή του ρόλου του χρήστη
         confirm_user: Επιβεβαίωση Χρήστη
         create_account_warning: Δημιουργία Προειδοποίησης
         create_announcement: Δημιουργία Ανακοίνωσης
@@ -229,12 +167,14 @@ el:
         create_domain_block: Δημιουργία Αποκλεισμένου Τομέα
         create_email_domain_block: Δημουργία Αποκλεισμένου Τομέα email
         create_ip_block: Δημιουργία κανόνα IP
+        create_user_role: Δημιουργία ρόλου
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
         destroy_custom_emoji: Διαγραφή Προσαρμοσμένου Emoji
         destroy_domain_allow: Διαγραφή Επιτρεπτού Τομέα
         destroy_domain_block: Διαγραφή Αποκλεισμού Τομέα
         destroy_email_domain_block: Διαγραφή Αποκλεισμένου Τομέα email
+        destroy_instance: Εκκαθάριση Τομέα
         destroy_ip_block: Διαγραφή κανόνα IP
         destroy_status: Διαγραφή Κατάστασης
         disable_2fa_user: Απενεργοποίηση 2FA
@@ -244,21 +184,45 @@ el:
         enable_user: Ενεργοποίηση Χρήστη
         memorialize_account: Μετατροπή Λογαριασμού σε Αναμνηστικό
         promote_user: Προαγωγή Χρήστη
+        reject_appeal: Απόρριψη Έφεσης
+        reject_user: Απόρριψη Χρήστη
         remove_avatar_user: Αφαίρεση Avatar
         reopen_report: Ξανάνοιγμα Καταγγελίας
+        resend_user: Επαναποστολή του email επιβεβαίωσης
         reset_password_user: Επαναφορά Συνθηματικού
         resolve_report: Επίλυση Καταγγελίας
         sensitive_account: Σήμανση των πολυμέσων στον λογαριασμό σας ως ευαίσθητων
         silence_account: Σίγαση Λογαριασμού
         suspend_account: Αναστολή Λογαριασμού
         unassigned_report: Αποδέσμευση Καταγγελίας
+        unblock_email_account: Ξεμπλοκάρισμα διεύθυνσης email
         unsensitive_account: Αφαίρεση σήμανσης των πολυμέσων στον λογαριασμό σας ως ευαίσθητων
         unsilence_account: Άρση Σίγασης Λογαριασμού
         unsuspend_account: Άρση Αναστολής Λογαριασμού
         update_announcement: Ενημέρωση Ανακοίνωσης
         update_custom_emoji: Ενημέρωση Προσαρμοσμένου Emoji
         update_status: Ενημέρωση Κατάστασης
-      deleted_status: "(διαγραμμένη δημοσίευση)"
+        update_user_role: Ενημέρωση ρόλου
+      actions:
+        approve_user_html: "%{name} εγκρίθηκε εγγραφή από %{target}"
+        destroy_email_domain_block_html: Ο/Η %{name} ξεμπλόκαρε το email domain %{target}
+        destroy_instance_html: Ο/Η %{name} εκκαθάρισε τον τομέα %{target}
+        destroy_ip_block_html: Ο/Η %{name} διέγραψε τον κανόνα για την IP %{target}
+        destroy_status_html: Ο/Η %{name} αφαίρεσε την ανάρτηση του/της %{target}
+        destroy_unavailable_domain_html: Ο/Η %{name} ξανάρχισε να τροφοδοτεί το domain %{target}
+        destroy_user_role_html: Ο/Η %{name} διέγραψε τον ρόλο του %{target}
+        disable_2fa_user_html: Ο/Η %{name} απενεργοποίησε το two factor requirement για τον χρήστη %{target}
+        disable_custom_emoji_html: Ο/Η %{name} απενεργοποίησε το emoji %{target}
+        disable_sign_in_token_auth_user_html: Ο/Η %{name} απενεργοποίησε την πιστοποίηση e-mail token του %{target}
+        disable_user_html: Ο/Η %{name} απενεργοποίησε τη σύνδεση για τον χρήστη %{target}
+        enable_custom_emoji_html: Ο/Η %{name} ενεργοποίησε το emoji %{target}
+        enable_sign_in_token_auth_user_html: Ο/Η %{name} ενεργοποίησε την πιστοποίηση e-mail token του %{target}
+        enable_user_html: Ο/Η %{name} ενεργοποίησε τη σύνδεση για τον χρήστη %{target}
+        memorialize_account_html: O/H %{name} μετέτρεψε τον λογαριασμό του %{target} σε σελίδα μνήμης
+        promote_user_html: Ο/Η %{name} προβίβασε το χρήστη %{target}
+        reject_user_html: "%{name} απορρίφθηκε εγγραφή από %{target}"
+        unblock_email_account_html: "%{name} ξεμπλόκαρε τη διεύθυνση ηλεκτρονικού ταχυδρομείου του %{target}"
+      deleted_account: διαγραμμένος λογαριασμός
       empty: Δεν βρέθηκαν αρχεία καταγραφής.
       filter_by_action: Φιλτράρισμα ανά ενέργεια
       filter_by_user: Φιλτράρισμα ανά χρήστη
@@ -297,7 +261,7 @@ el:
       enable: Ενεργοποίηση
       enabled: Ενεργοποιημένα
       enabled_msg: Επιτυχής ενεργοποίηση αυτού του emoji
-      image_hint: PNG έως 50KB
+      image_hint: PNG ή GIF έως %{size}
       list: Εμφάνιση
       listed: Αναφερθέντα
       new:
@@ -314,28 +278,37 @@ el:
       updated_msg: Επιτυχής ενημέρωση του emoji!
       upload: Ανέβασμα
     dashboard:
+      active_users: ενεργοί χρήστες
+      new_users: νέοι χρήστες
       software: Λογισμικό
       space: Κατανάλωση χώρου
       title: Ταμπλό
+    disputes:
+      appeals:
+        title: Εφέσεις
     domain_allows:
       add_new: Έγκριση τομέα
       created_msg: Ο τομέας εγκρίθηκε με επιτυχία
       destroyed_msg: Ο τομέας δεν είναι πια εγκεκριμένος
+      export: Εξαγωγή
+      import: Εισαγωγή
       undo: Αφαίρεση έγκρισης
     domain_blocks:
       add_new: Προσθήκη νέου
       created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
       destroyed_msg: Ο αποκλεισμός τομέα άρθηκε
       domain: Τομέας
-      edit: Διαχείρηση αποκλεισμένου τομέα
+      edit: Επεξεργασία αποκλεισμένου τομέα
+      existing_domain_block: Έχετε ήδη επιβάλει αυστηρότερα όρια στο %{name}.
       existing_domain_block_html: Έχεις ήδη επιβάλλει αυστηρότερους περιορισμούς στο %{name}, πρώτα θα πρέπει να τους <a href="%{unblock_url}">αναιρέσεις</a>.
+      export: Εξαγωγή
+      import: Εισαγωγή
       new:
         create: Δημιουργία αποκλεισμού
         hint: Ο αποκλεισμός τομέα δεν θα αποτρέψει νέες καταχωρίσεις λογαριασμών στην βάση δεδομένων, αλλά θα εφαρμόσει αναδρομικά και αυτόματα συγκεκριμένες πολιτικές μεσολάβησης σε αυτούς τους λογαριασμούς.
         severity:
-          desc_html: Η <strong>αποσιώπηση</strong> θα κάνει αόρατες τις δημοσιεύσεις ενός λογαριασμού σε όσους δεν τον ακολουθούν. Η <strong>αναστολή</strong> θα αφαιρέσει όλο το περιεχόμενο, τα πολυμέσα και τα στοιχεία προφίλ ενός λογαριασμού. Χρησιμοποίησε το <strong>κανένα</strong> αν θέλεις απλά να απορρίψεις τα αρχεία πολυμέσων.
           noop: Κανένα
-          silence: Σίγαση
+          silence: Περιορισμός
           suspend: Αναστολή
         title: Αποκλεισμός νέου τομέα
       private_comment: Ιδιωτικό σχόλιο
@@ -346,49 +319,47 @@ el:
       reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει τη λήψη άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές
       reject_reports: Απόρριψη καταγγελιών
       reject_reports_hint: Αγνόηση όσων καταγγελιών προέρχονται από αυτό τον τομέα. Δεν σχετίζεται με τις παύσεις
-      rejecting_media: απορρίπτουν αρχεία πολυμέσων
-      rejecting_reports: απορρίπτουν καταγγελίες
-      severity:
-        silence: αποσιωπημένοι
-        suspend: ανεσταλμένοι
-      show:
-        affected_accounts:
-          one: Επηρεάζεται ένας λογαριασμός στη βάση δεδομένων
-          other: Επηρεάζονται %{count} λογαριασμοί στη βάση δεδομένων
-        retroactive:
-          silence: Αναίρεση αποσιώπησης όλων των λογαριασμός του τομέα
-          suspend: Αναίρεση αναστολής όλων των λογαριασμών του τομέα
-        title: Αναίρεση αποκλεισμού για τον τομέα %{domain}
-        undo: Αναίρεση
       undo: Αναίρεση
       view: Εμφάνιση αποκλεισμού τομέα
     email_domain_blocks:
       add_new: Πρόσθεση νέου
+      attempts_over_week:
+        one: "%{count} προσπάθεια την τελευταία εβδομάδα"
+        other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
       created_msg: Επιτυχής πρόσθεση email τομέα σε μαύρη λίστα
       delete: Διαγραφή
-      destroyed_msg: Επιτυχής διαγραφή email τομέα από τη μαύρη λίστα
+      dns:
+        types:
+          mx: Εγγραφή MX
       domain: Τομέας
-      empty: Δεν έχουν οριστεί αποκλεισμένοι τομείς email.
-      from_html: από %{domain}
       new:
         create: Πρόσθεση τομέα
         title: Νέα εγγραφή email στη μαύρη λίστα
       title: Μαύρη λίστα email
+    export_domain_allows:
+      no_file: Δεν επιλέχθηκε αρχείο
+    export_domain_blocks:
+      no_file: Δεν επιλέχθηκε αρχείο
     follow_recommendations:
+      language: Για τη γλώσσα
       status: Κατάσταση
     instances:
       by_domain: Τομέας
+      confirm_purge: Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα τα δεδομένα από αυτόν τον τομέα;
+      dashboard:
+        instance_languages_dimension: Κορυφαίες γλώσσες
+      delivery:
+        failing: Αποτυγχάνει
       delivery_available: Διαθέσιμη παράδοση
+      destroyed_msg: Τα δεδομένα από το %{domain} βρίσκονται σε αναμονή για επικείμενη διαγραφή.
       empty: Δεν βρέθηκαν τομείς.
-      known_accounts:
-        one: "%{count} γνωστός λογαριασμός"
-        other: "%{count} γνωστοί λογαριασμοί"
       moderation:
         all: Όλα
         limited: Περιορισμένα
         title: Διαμεσολάβηση
       private_comment: Ιδιωτικό σχόλιο
       public_comment: Δημόσιο σχόλιο
+      purge: Εκκαθάριση
       title: Γνωστοί κόμβοι
       total_blocked_by_us: Μπλοκάρονται από εμάς
       total_followed_by_them: Ακολουθούνται από εκείνους
@@ -411,14 +382,12 @@ el:
         '1209600': 2 εβδομάδες
         '15778476': 6 μήνες
         '2629746': 1 μήνας
-        '31556952': 1 έτος
+        '31556952': 1 χρόνος
         '86400': 1 ημέρα
-        '94670856': 3 έτη
+        '94670856': 3 χρόνια
       new:
         title: Δημιουργία νέου κανόνα IP
       title: Κανόνες IP
-    pending_accounts:
-      title: Λογαριασμοί σε αναμονή (%{count})
     relationships:
       title: Σχέσεις %{acct}
     relays:
@@ -445,38 +414,74 @@ el:
         notes:
           one: "%{count} σημείωση"
           other: "%{count} σημειώσεις"
-        reports:
-          one: "%{count} αναφορά"
-          other: "%{count} αναφορές"
+      action_log: Αρχείο ελέγχου
       action_taken_by: Ενέργεια από τον/την
+      actions:
+        other_description_html: Δείτε περισσότερες επιλογές για τον έλεγχο της συμπεριφοράς του λογαριασμού και προσαρμόσετε την επικοινωνία στον αναφερόμενο λογαριασμό.
+        silence_description_html: Το προφίλ θα είναι ορατό μόνο σε όσους το ακολουθούν ή το αναζητούν με μη αυτόματο τρόπο, περιορίζοντας σημαντικά την εμβέλειά του. Μπορεί πάντα να επανέλθει.
+      add_to_report: Προσθέστε περισσότερα στην αναφορά
       are_you_sure: Σίγουρα;
       assign_to_self: Ανάθεση σε μένα
       assigned: Αρμόδιος συντονιστής
+      by_target_domain: Κόμβος του λογαριασμού υπό καταγγελία
+      category: Κατηγορία
       comment:
         none: Κανένα
       created_at: Καταγγέλθηκε
+      delete_and_resolve: Διαγραφή δημοσιεύσεων
       forwarded: Προωθημένα
       forwarded_to: Προώθημένα προς %{domain}
       mark_as_resolved: Σημειωμένο ως επιλυμένο
+      mark_as_sensitive: Σήμανση ως ευαίσθητο
       mark_as_unresolved: Σημειωμένο ως ανεπίλυτο
+      no_one_assigned: Κανένας
       notes:
         create: Πρόσθεσε σημείωση
         create_and_resolve: Επίλυσε με σημείωση
         create_and_unresolve: Ξανάνοιξε με σημείωση
         delete: Διαγραφή
         placeholder: Περιέγραψε τις ενέργειες που έγιναν, ή οποιαδήποτε άλλη ενημέρωση...
+        title: Σημειώσεις
+      quick_actions_description_html: 'Κάντε μια γρήγορη ενέργεια ή μετακινηθείτε προς τα κάτω για να δείτε το αναφερόμενο περιεχόμενο:'
+      remote_user_placeholder: ο απομακρυσμένος χρήστης από %{instance}
       reopen: Ξανάνοιξε την καταγγελία
       report: 'Καταγγελία #%{id}'
       reported_account: Αναφερόμενος λογαριασμός
       reported_by: Αναφέρθηκε από
       resolved: Επιλύθηκε
       resolved_msg: Η καταγγελία επιλύθηκε επιτυχώς!
+      skip_to_actions: Μετάβαση στις ενέργειες
       status: Κατάσταση
-      target_domain: Κόμβος του λογαριασμού υπό καταγγελία
+      statuses: Αναφερόμενο περιεχόμενο
       title: Αναφορές
       unassign: Αποσύνδεση
       unresolved: Άλυτη
       updated_at: Ενημερωμένη
+      view_profile: Προβολή προφίλ
+    roles:
+      add_new: Προσθήκη ρόλου
+      assigned_users:
+        one: "%{count} χρήστης"
+        other: "%{count} χρήστες"
+      categories:
+        administration: Διαχείριση
+        devops: Devops
+        invites: Προσκλήσεις
+      delete: Διαγραφή
+      edit: Επεξεργασία ρόλου '%{name}'
+      everyone: Προεπιλεγμένα δικαιώματα
+      permissions_count:
+        one: "%{count} δικαίωμα"
+        other: "%{count} δικαιώματα"
+      privileges:
+        administrator: Διαχειριστής
+        invite_users: Πρόσκληση χρηστών
+        manage_announcements: Διαχείριση ανακοινώσεων
+        manage_roles: Διαχείριση ρόλων
+        manage_settings: Διαχείριση ρυθμίσεων
+        manage_users: Διαχείριση χρηστών
+        view_devops: DevOps
+      title: Ρόλοι
     rules:
       add_new: Προσθήκη κανόνα
       delete: Διαγραφή
@@ -485,107 +490,57 @@ el:
       empty: Δεν έχουν οριστεί ακόμα κανόνες διακομιστή.
       title: Κανόνες διακομιστή
     settings:
-      activity_api_enabled:
-        desc_html: Καταμέτρηση τοπικών δημοσιεύσεων, ενεργών χρηστών και νέων εγγραφών σε εβδομαδιαίες ομαδοποιήσεις
-        title: Δημοσίευση συγκεντρωτικών στατιστικών για τη δραστηριότητα χρηστών
-      bootstrap_timeline_accounts:
-        desc_html: Διαχωρίστε πολλαπλά ονόματα χρηστών με κόμματα. Λειτουργεί μόνο με τοπικούς και ανοιχτούς λογαριασμούς. Αν είναι κενό, περιλαμβάνει όλους τους τοπικούς διαχειριστές.
-        title: Προεπιλεγμένοι λογαριασμοί για παρακολούθηση από τους νέους χρήστες
-      contact_information:
-        email: Επαγγελματικό email
-        username: Όνομα χρήστη επικοινωνίας
-      custom_css:
-        desc_html: Τροποποίηση της εμφάνισης μέσω CSS που φορτώνεται σε κάθε σελίδα
-        title: Προσαρμοσμένο CSS
+      about:
+        manage_rules: Διαχείριση κανόνων διακομιστή
+        title: Σχετικά με
+      appearance:
+        title: Εμφάνιση
+      content_retention:
+        title: Διατήρηση περιεχομένου
       default_noindex:
-        desc_html: Επηρεάζει όσους χρήστες δεν έχουν αλλάξει αυτή τη ρύθμιση
+        desc_html: Επηρεάζει όσους χρήστες δεν έχουν αλλάξει αυτή τη ρύθμιση οι ίδιοι
         title: Εξαίρεση χρηστών από τις μηχανές αναζήτησης
+      discovery:
+        profile_directory: Κατάλογος προφίλ
+        public_timelines: Δημόσιες ροές
+        trends: Τάσεις
       domain_blocks:
         all: Για όλους
         disabled: Για κανέναν
-        title: Εμφάνιση αποκλεισμένων τομέων
         users: Προς συνδεδεμένους τοπικούς χρήστες
-      domain_blocks_rationale:
-        title: Εμφάνιση σκεπτικού
-      hero:
-        desc_html: Εμφανίζεται στην μπροστινή σελίδα. Συνίσταται τουλάχιστον 600x100px. Όταν λείπει, χρησιμοποιείται η μικρογραφία του κόμβου
-        title: Εικόνα ήρωα
-      mascot:
-        desc_html: Εμφάνιση σε πολλαπλές σελίδες. Προτεινόμενο 293x205px τουλάχιστον. Αν δεν έχει οριστεί, χρησιμοποιεί την προεπιλεγμένη μασκότ
-        title: Εικόνα μασκότ
-      peers_api_enabled:
-        desc_html: Ονόματα τομέων που αυτός ο κόμβος έχει ήδη συναντήσει στο fediverse
-        title: Δημοσίευση λίστας κόμβων που έχουν ανακαλυφθεί
-      preview_sensitive_media:
-        desc_html: Οι προεπισκοπήσεις συνδέσμων σε τρίτους ιστότοπους θα είναι ορατές ακόμα κι όταν το πολυμέσο έχει σημειωθεί ως ευαίσθητο
-        title: Εμφάνιση ευαίσθητων πολυμέσων στις προεπισκοπήσεις OpenGraph
-      profile_directory:
-        desc_html: Να επιτρέπεται η ανακάλυψη χρηστών
-        title: Ενεργοποίηση του καταλόγου χρηστών
       registrations:
-        closed_message:
-          desc_html: Εμφανίζεται στην εισαγωγική σελίδα όταν οι εγγραφές είναι κλειστές. Μπορείς να χρησιμοποιήσεις HTML tags
-          title: Μήνυμα κλεισμένων εγγραφών
-        deletion:
-          desc_html: Επέτρεψε σε οποιονδήποτε να διαγράψει το λογαριασμό του/της
-          title: Άνοιξε τη διαγραφή λογαριασμού
-        min_invite_role:
-          disabled: Κανείς
-          title: Επέτρεψε προσκλήσεις από
+        title: Εγγραφές
       registrations_mode:
         modes:
           approved: Απαιτείται έγκριση για εγγραφή
           none: Δεν μπορεί να εγγραφεί κανείς
           open: Μπορεί να εγγραφεί ο οποιοσδήποτε
-        title: Μέθοδος εγγραφής
-      show_known_fediverse_at_about_page:
-        desc_html: Όταν αντιστραφεί, θα δείχνει τα τουτ από όλο το γνωστό fediverse στην προεπισκόπηση. Διαφορετικά θα δείχνει μόνο τοπικά τουτ.
-        title: Εμφάνιση του γνωστού fediverse στην προεπισκόπηση ροής
-      show_staff_badge:
-        desc_html: Δείξε ένα σήμα προσωπικού στη σελίδα ενός χρήστη
-        title: Δείξε διακριτικό προσωπικού
-      site_description:
-        desc_html: Εισαγωγική παράγραφος στην αρχική σελίδα. Περιέγραψε τι κάνει αυτό τον διακομιστή Mastodon διαφορετικό και ό,τι άλλο ενδιαφέρον. Μπορείς να χρησιμοποιήσεις HTML tags, συγκεκριμένα <code>&lt; a&gt;</code> και <code> &lt; em&gt;</code>.
-        title: Περιγραφή κόμβου
-      site_description_extended:
-        desc_html: Ένα καλό μέρος για τον κώδικα δεοντολογίας, τους κανόνες, τις οδηγίες και ό,τι άλλο διαφοροποιεί τον κόμβο σου. Μπορείς να χρησιμοποιήσεις και κώδικα HTML
-        title: Προσαρμοσμένες εκτεταμένες πληροφορίες
-      site_short_description:
-        desc_html: Εμφανίζεται στην πλαϊνή μπάρα και στα meta tags. Περιέγραψε τι είναι το Mastodon και τι κάνει αυτό τον διακομιστή ιδιαίτερο σε μια παράγραφο. Αν μείνει κενό, θα χρησιμοποιήσει την προκαθορισμένη περιγραφή του κόμβου.
-        title: Σύντομη περιγραφή του κόμβου
-      site_terms:
-        desc_html: Μπορείς να γράψεις τη δική σου πολιτική απορρήτου, όρους χρήσης ή άλλους νομικούς όρους. Μπορείς να χρησιμοποιήσεις HTML tags
-        title: Προσαρμοσμένοι όροι χρήσης της υπηρεσίας
-      site_title: Όνομα κόμβου
-      thumbnail:
-        desc_html: Χρησιμοποιείται για προεπισκοπήσεις μέσω του OpenGraph και του API. Συστήνεται 1200x630px
-        title: Μικρογραφία κόμβου
-      timeline_preview:
-        desc_html: Εμφάνισε τη δημόσια ροή στην αρχική σελίδα
-        title: Προεπισκόπιση ροής
-      title: Ρυθμίσεις ιστότοπου
-      trendable_by_default:
-        desc_html: Επηρεάζει όσες ετικέτες δεν είχαν απαγορευτεί νωρίτερα
-        title: Επέτρεψε στις ετικέτες να εμφανίζονται στις τάσεις χωρίς να χρειάζεται πρώτα έγκριση
-      trends:
-        desc_html: Δημόσια εμφάνιση ετικετών που έχουν ήδη εγκριθεί και είναι δημοφιλείς
-        title: Δημοφιλείς ετικέτες
+      title: Ρυθμίσεις διακομιστή
     site_uploads:
       delete: Διαγραφή μεταφορτωμένου αρχείου
       destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
     statuses:
+      account: Συντάκτης
+      application: Εφαρμογή
       back_to_account: Επιστροφή στη σελίδα λογαριασμού
       batch:
-        delete: Διαγραφή
-        nsfw_off: Σημείωσε ως μη ευαίσθητο
-        nsfw_on: Σημείωσε ως ευαίσθητο
+        remove_from_report: Αφαίρεση από την αναφορά
+        report: Αναφορά
       deleted: Διαγραμμένα
-      failed_to_execute: Αποτυχία εκτέλεσης
+      favourites: Αγαπημένα
+      history: Ιστορικό εκδόσεων
+      in_reply_to: Απάντηση σε
+      language: Γλώσσα
       media:
         title: Πολυμέσα
-      no_media: Χωρίς πολυμέσα
+      metadata: Μεταδεδομένα
       no_status_selected: Καμία δημοσίευση δεν άλλαξε αφού καμία δεν ήταν επιλεγμένη
+      open: Άνοιγμα δημοσίευσης
+      reblogs: Αναδημοσιεύσεις
+      status_changed: Η ανάρτηση άλλαξε
       title: Καταστάσεις λογαριασμού
+      trending: Δημοφιλή
+      visibility: Ορατότητα
       with_media: Με πολυμέσα
     system_checks:
       database_schema_check:
@@ -594,28 +549,33 @@ el:
         action: Διαχείριση κανόνων διακομιστή
         message_html: Δεν έχετε ορίσει κανέναν κανόνα διακομιστή.
     tags:
-      accounts_today: Μοναδικές χρήσεις ημέρας
-      accounts_week: Μοναδικές χρήσεις εβδομάδας
-      breakdown: Ανάλυση σημερινής χρήσης ανα πηγή
-      last_active: Τελευταία δραστηριότητα
-      most_popular: Δημοφιλέστερες
-      most_recent: Πιο πρόσφατες
-      name: Ετικέτα
       review: Κατάσταση έγκρισης
-      reviewed: Εγκεκριμένες
-      title: Ετικέτες
-      trending_right_now: Δημοφιλείς αυτή τη στιγμή
-      unique_uses_today: "%{count} σημερινές δημοσιεύσεις"
-      unreviewed: Εκκρεμεί έγκριση
       updated_msg: Οι ρυθμίσεις των ετικετών ενημερώθηκαν επιτυχώς
     title: Διαχείριση
+    trends:
+      only_allowed: Μόνο επιτρεπόμενα
+      tags:
+        dashboard:
+          tag_languages_dimension: Κορυφαίες γλώσσες
+          tag_servers_dimension: Κορυφαίοι διακομιστές
+          tag_servers_measure: διαφορετικοί διακομιστές
+      trending: Δημοφιλή
     warning_presets:
       add_new: Πρόσθεση νέου
       delete: Διαγραφή
       edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
       empty: Δεν έχετε ακόμη ορίσει κάποια προεπιλογή προειδοποίησης.
       title: Διαχείριση προκαθορισμένων προειδοποιήσεων
+    webhooks:
+      delete: Διαγραφή
+      disable: Απενεργοποίηση
+      disabled: Απενεργοποιημένα
+      enable: Ενεργοποίηση
+      status: Κατάσταση
   admin_mailer:
+    new_appeal:
+      actions:
+        none: μια προειδοποίηση
     new_pending_account:
       body: Τα στοιχεία του νέου λογαριασμού είναι παρακάτω. Μπορείς να εγκρίνεις ή να απορρίψεις αυτή την αίτηση.
       subject: Νέος λογαριασμός προς έγκριση στο %{instance} (%{username})
@@ -623,9 +583,6 @@ el:
       body: Ο/Η %{reporter} κατήγγειλε τον/την %{target}
       body_remote: Κάποιος/α από τον τομέα %{domain} κατήγγειλε τον/την %{target}
       subject: Νέα καταγγελία για %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Η ετικέτα #%{name} είναι δημοφιλής σήμερα, αλλά δεν έχει εγκριθεί μέχρι τώρα. Δεν θα εμφανίζεται δημοσίως μέχρι να δοθεί έγκριση, αλλιώς αποθήκευση τη φόρμα ως έχει για να μην την δεις ξανά.'
-      subject: Νέα ετικέτα προς έγκριση στο %{instance} (#%{name})
   aliases:
     add_new: Δημιουργία ψευδώνυμου
     created_msg: Δημιουργήθηκε νέο ψευδώνυμο. Τώρα μπορείς να ξεκινήσεις τη μεταφορά από τον παλιό λογαριασμό.
@@ -655,16 +612,13 @@ el:
   applications:
     created: Η εφαρμογή δημιουργήθηκε επιτυχώς
     destroyed: Η εφαρμογή διαγράφηκε επιτυχώς
-    invalid_url: Το URL δεν είναι έγκυρο
     regenerate_token: Αναδημιουργία του διακριτικού πρόσβασης (access token)
     token_regenerated: Το διακριτικό πρόσβασης (access token) αναδημιουργήθηκε επιτυχώς
     warning: Μεγάλη προσοχή με αυτά τα στοιχεία. Μην τα μοιραστείς ποτέ με κανέναν!
     your_token: Το διακριτικό πρόσβασής σου (access token)
   auth:
-    apply_for_account: Αίτηση πρόσκλησης
+    apply_for_account: Ζητήστε έναν λογαριασμό
     change_password: Συνθηματικό
-    checkbox_agreement_html: Συμφωνώ με τους <a href="%{rules_path}" target="_blank">κανονισμούς του κόμβου</a> και <a href="%{terms_path}" target="_blank">τους όρους χρήσης</a>
-    checkbox_agreement_without_rules_html: Συμφωνώ με τους <a href="%{terms_path}" target="_blank">όρους χρήσης</a>
     delete_account: Διαγραφή λογαριασμού
     delete_account_html: Αν θέλεις να διαγράψεις το λογαριασμό σου, μπορείς <a href="%{path}">να συνεχίσεις εδώ</a>. Θα σου ζητηθεί επιβεβαίωση.
     description:
@@ -677,6 +631,7 @@ el:
     invalid_reset_password_token: Το διακριτικό επαναφοράς συνθηματικού είναι άκυρο ή ληγμένο. Παρακαλώ αιτήσου νέο.
     link_to_otp: Γράψε τον κωδικό πιστοποίησης 2 παραγόντων (2FA) από το τηλέφωνό σου ή τον κωδικό επαναφοράς
     link_to_webauth: Χρήση συσκευής κλειδιού ασφαλείας
+    log_in_with: Σύνδεση με
     login: Σύνδεση
     logout: Αποσύνδεση
     migrate_account: Μετακόμιση σε διαφορετικό λογαριασμό
@@ -689,20 +644,24 @@ el:
     registration_closed: Το %{instance} δεν δέχεται νέα μέλη
     resend_confirmation: Στείλε ξανά τις οδηγίες επιβεβαίωσης
     reset_password: Επαναφορά συνθηματικού
+    rules:
+      title: Ορισμένοι βασικοί κανόνες.
     security: Ασφάλεια
     set_new_password: Ορισμός νέου συνθηματικού
     setup:
       email_below_hint_html: Αν η παρακάτω διεύθυνση email είναι λανθασμένη, μπορείτε να την ενημερώσετε και να λάβετε νέο email επιβεβαίωσης.
       email_settings_hint_html: Το email επιβεβαίωσης στάλθηκε στο %{email}. Αν η διεύθυνση αυτή δεν είναι σωστή, μπορείτε να την ενημερώσετε στις ρυθμίσεις λογαριασμού.
       title: Ρυθμίσεις
+    sign_in:
+      title: Συνδεθείτε στο %{domain}
+    sign_up:
+      title: Ας ξεκινήσουμε τις ρυθμίσεις στο %{domain}.
     status:
       account_status: Κατάσταση λογαριασμού
       confirming: Αναμονή για ολοκλήρωση επιβεβαίωσης του email.
-      functional: Ο λογαριασμός σου είναι πανέτοιμος.
       pending: Η εφαρμογή σας εκκρεμεί έγκρισης, πιθανόν θα διαρκέσει κάποιο χρόνο. Θα λάβετε email αν εγκριθεί.
       redirecting_to: Ο λογαριασμός σου είναι ανενεργός γιατί επί του παρόντος ανακατευθύνει στον %{acct}.
     too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
-    trouble_logging_in: Πρόβλημα σύνδεσης;
     use_security_key: Χρήση κλειδιού ασφαλείας
   authorize_follow:
     already_following: Ήδη ακολουθείς αυτό το λογαριασμό
@@ -756,10 +715,10 @@ el:
       more_details_html: Για περισσότερες πληροφορίες, δες την <a href="%{terms_path}">πολιτική απορρήτου</a>.
       username_available: Το όνομα χρήστη σου θα γίνει ξανά διαθέσιμο
       username_unavailable: Το όνομα χρήστη σου θα παραμείνει μη διαθέσιμο
-  directories:
-    directory: Κατάλογος λογαριασμών
-    explanation: Βρες χρήστες βάσει των ενδιαφερόντων τους
-    explore_mastodon: Εξερεύνησε το %{title}
+  disputes:
+    strikes:
+      approve_appeal: Έγκριση έφεσης
+      reject_appeal: Απόρριψη έφεσης
   domain_validator:
     invalid_domain: δεν είναι έγκυρο όνομα τομέα
   errors:
@@ -808,56 +767,39 @@ el:
       public: Δημόσιες ροές
       thread: Συζητήσεις
     edit:
+      add_keyword: Προσθήκη λέξης-κλειδιού
+      keywords: Λέξεις-κλειδιά
       title: Ενημέρωση φίλτρου
     errors:
       invalid_context: Έδωσες λάθος ή ανύπαρκτο πλαίσιο
-      invalid_irreversible: Τα μη αντιστρέψιμα φίλτρα δουλεύουν μόνο στα πλαίσια της αρχικής ροής και των ειδοποιήσεων
     index:
+      contexts: Φίλτρα σε %{contexts}
       delete: Διαγραφή
       empty: Δεν έχεις φίλτρα.
+      expires_in: Λήγει σε %{distance}
+      expires_on: Λήγει στις %{date}
       title: Φίλτρα
     new:
+      save: Αποθήκευση νέου φίλτρου
       title: Πρόσθεσε νέο φίλτρο
   footer:
-    developers: Ανάπτυξη
-    more: Περισσότερα…
-    resources: Πόροι
     trending_now: Τάσεις
   generic:
     all: Όλα
     changes_saved_msg: Οι αλλαγές αποθηκεύτηκαν!
     copy: Αντιγραφή
     delete: Διαγραφή
-    no_batch_actions_available: Δεν υπάρχουν ομαδικές ενέργειες σε αυτή τη σελίδα
     order_by: Ταξινόμηση κατά
     save_changes: Αποθήκευση αλλαγών
+    today: σήμερα
     validation_errors:
       one: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε το παρακάτω σφάλμα
       other: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε τα παρακάτω %{count} σφάλματα
   html_validator:
     invalid_markup: 'περιέχει λάθος μορφοποίηση HTML: %{error}'
-  identity_proofs:
-    active: Ενεργή
-    authorize: Ναι, εξουσιοδότησε
-    authorize_connection_prompt: Εξουσιοδότηση αυτής της κρυπτογραφικής σύνδεσης;
-    errors:
-      failed: Η κρυπτογραφική σύνδεση απέτυχε. Παρακαλώ ξανά δοκίμασε μέσω %{provider}.
-      keybase:
-        invalid_token: Τα κλειδιά Keybase είναι κατακερματισμένες υπογραφές και πρέπει να έχουν μήκος 66 δεκαεξαδικών χαρακτήρων
-        verification_failed: Το Keybase δεν δέχτηκε αυτό το κλειδί ως υπογραφή του χρήστη %{kb_username}. Παρακαλούμε δοκίμασε μέσω Keybase.
-      wrong_user: Δεν επιτρέπεται να δημιουργηθεί ένα αποδεικτικό για %{proving} υπό τη σύνδεση ως %{current}. Συνδέσου ως %{proving} και δοκίμασε ξανά.
-    explanation_html: Εδώ μπορείς να συνδέσεις κρυπτογραφικά τις υπόλοιπες ταυτοτητές σου, όπως για παράδειγμα ένα προφίλ στο Keybase. Αυτό επιτρέπει σε άλλους ανθρώπους να σου στέλνουν κρυπτογραφημένα μηνύματα και να μπορούν να εμπιστευτούν το περιεχόμενο που τους στέλνεις εσύ.
-    i_am_html: Είμαι ο/η %{username} στην υπηρεσία %{service}.
-    identity: Ταυτότητα
-    inactive: Ανενεργή
-    publicize_checkbox: 'Και κάνε τουτ αυτό:'
-    publicize_toot: 'Αποδείχτηκε! Λέγομαι %{username} στο %{service}: %{url}'
-    remove: Αφαίρεση απόδειξης από τον λογαριασμό
-    removed: Επιτυχής αφαίρεση απόδειξης από τον λογαριασμό
-    status: Κατάσταση επαλήθευσης
-    view_proof: Εμφάνιση απόδειξης
   imports:
     errors:
+      invalid_csv_file: 'Μη έγκυρο αρχείο CSV. Σφάλμα: %{error}'
       over_rows_processing_limit: περιέχει περισσότερες από %{count} γραμμές
     modes:
       merge: Συγχώνευση
@@ -873,7 +815,6 @@ el:
       following: Λίστα ακολούθων
       muting: Λίστα αποσιωπήσεων
     upload: Ανέβασμα
-  in_memoriam_html: Εις μνήμην.
   invites:
     delete: Απενεργοποίησε
     expired: Ληγμένη
@@ -941,18 +882,14 @@ el:
     carry_blocks_over_text: Ο/Η χρήστης μετακόμισε από το %{acct}, που είχες αποκλείσει.
     carry_mutes_over_text: Ο/Η χρήστης μετακόμισε από το %{acct}, που είχες αποσιωπήσει.
     copy_account_note_text: 'Ο/Η χρήστης μετακόμισε από το %{acct}, ορίστε οι προηγούμενες σημειώσεις σου:'
+  navigation:
+    toggle_menu: Εμφάνιση/Απόκρυψη μενού
   notification_mailer:
-    digest:
-      action: Δες όλες τις ειδοποιήσεις
-      body: Μια σύνοψη των μηνυμάτων που έχασες από την τελευταία επίσκεψή σου στις %{since}
-      mention: 'Ο/Η %{name} σε ανέφερε στις:'
-      new_followers_summary:
-        one: Επίσης, απέκτησες έναν νέο ακόλουθο ενώ ήσουν μακριά!
-        other: Επίσης, απέκτησες %{count} νέους ακόλουθους ενώ ήσουν μακριά! Εκπληκτικό!
-      subject:
-        one: "1 νέα ειδοποίηση από την τελευταία επίσκεψή σου \U0001F418"
-        other: "%{count} νέες ειδοποιήσεις από την τελευταία επίσκεψή σου \U0001F418"
-      title: Ενώ έλειπες...
+    admin:
+      report:
+        subject: "%{name} υπέβαλε μια αναφορά"
+      sign_up:
+        subject: "%{name} έχει εγγραφεί"
     favourite:
       body: 'Η κατάστασή σου αγαπήθηκε από τον/την %{name}:'
       subject: Ο/Η %{name} αγάπησε την κατάστασή σου
@@ -977,6 +914,8 @@ el:
       title: Νέα προώθηση
     status:
       subject: Ο/Η %{name} μόλις έγραψε κάτι
+    update:
+      subject: "%{name} επεξεργάστηκε μια δημοσίευση"
   notifications:
     email_events: Συμβάντα για ειδοποιήσεις μέσω email
     email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
@@ -1016,6 +955,8 @@ el:
     other: Άλλες
     posting_defaults: Προεπιλογές δημοσίευσης
     public_timelines: Δημόσιες ροές
+  privacy_policy:
+    title: Πολιτική Απορρήτου
   reactions:
     errors:
       limit_reached: Το όριο διαφορετικών αντιδράσεων ξεπεράστηκε
@@ -1037,22 +978,12 @@ el:
     remove_selected_follows: Διακοπή παρακολούθησης επιλεγμένων χρηστών
     status: Κατάσταση λογαριασμού
   remote_follow:
-    acct: Γράψε το ΌνομαΧρήστη@τομέα από όπου θέλεις να εκτελέσεις την ενέργεια αυτή
     missing_resource: Δεν βρέθηκε το απαιτούμενο URL ανακατεύθυνσης για το λογαριασμό σου
-    no_account_html: Δεν έχεις λογαριασμό; Μπορείς <a href='%{sign_up_path}' target='_blank'>να γραφτείς εδώ</a>
-    proceed: Συνέχισε για να ακολουθήσεις
-    prompt: 'Ετοιμάζεσαι να ακολουθήσεις:'
-    reason_html: "<strong>Γιατί χρειάζεται αυτό το βήμα;</strong> Το <code>%{instance}</code> μπορεί να μην είναι ο κόμβος που έχεις γραφτεί, έτσι πρέπει να σε ανακατευθύνουμε στο δικό σου."
-  remote_interaction:
-    favourite:
-      proceed: Συνέχισε για σημείωση ως αγαπημένου
-      prompt: 'Θέλεις να σημειώσεις ως αγαπημένο αυτό το τουτ:'
-    reblog:
-      proceed: Συνέχισε για προώθηση
-      prompt: 'Θέλεις να προωθήσεις αυτό το τουτ:'
-    reply:
-      proceed: Συνέχισε για να απαντήσεις
-      prompt: 'Θέλεις να απαντήσεις σε αυτό το τουτ:'
+  reports:
+    errors:
+      invalid_rules: δεν παραπέμπει σε έγκυρους κανόνες
+  rss:
+    content_warning: 'Προειδοποίηση περιεχομένου:'
   scheduled_statuses:
     over_daily_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων τουτ για εκείνη τη μέρα
     over_total_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων τουτ
@@ -1061,11 +992,28 @@ el:
     activity: Τελευταία δραστηριότητα
     browser: Φυλλομετρητής (Browser)
     browsers:
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
       generic: Άγνωστος φυλλομετρητής
+      ie: Internet Explorer
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
     current_session: Τρέχουσα σύνδεση
     description: "%{browser} σε %{platform}"
     explanation: Αυτοί είναι οι φυλλομετρητές (browsers) που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
     platforms:
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
       mac: Mac
       other: άγνωστη πλατφόρμα
     revoke: Ανακάλεσε
@@ -1083,7 +1031,6 @@ el:
     edit_profile: Επεξεργασία προφίλ
     export: Εξαγωγή δεδομένων
     featured_tags: Χαρακτηριστικές ετικέτες
-    identity_proofs: Αποδείξεις ταυτοτήτων
     import: Εισαγωγή
     import_and_export: Εισαγωγή & Εξαγωγή
     migrate: Μετακόμιση λογαριασμού
@@ -1106,18 +1053,19 @@ el:
         other: "%{count} βίντεο"
     boosted_from_html: Προωθήθηκε από %{acct_link}
     content_warning: 'Προειδοποίηση περιεχομένου: %{warning}'
+    default_language: Ίδια με γλώσσα διεπαφής
     disallowed_hashtags:
       one: 'περιέχει μη επιτρεπτή ετικέτα: %{tags}'
       other: περιέχει μη επιτρεπτές ετικέτες %{tags}
+    edited_at_html: Επεξεργάστηκε στις %{date}
     errors:
       in_reply_not_found: Η κατάσταση στην οποία προσπαθείτε να απαντήσετε δεν υπάρχει.
-    language_detection: Αυτόματη αναγνώριση γλώσσας
     open_in_web: Δες στο διαδίκτυο
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
     pin_errors:
+      direct: Αναρτήσεις που είναι ορατές μόνο στους αναφερόμενους χρήστες δεν μπορούν να καρφιτσωθούν
       limit: Έχεις ήδη καρφιτσώσει το μέγιστο αριθμό επιτρεπτών τουτ
       ownership: Δεν μπορείς να καρφιτσώσεις τουτ κάποιου άλλου
-      private: Τα μη δημόσια τουτ δεν καρφιτσώνονται
       reblog: Οι προωθήσεις δεν καρφιτσώνονται
     poll:
       total_people:
@@ -1139,99 +1087,29 @@ el:
       public_long: Βλέπει οποιοσδήποτε
       unlisted: Μη καταχωρημένο
       unlisted_long: Βλέπει οποιοσδήποτε, αλλά δεν καταχωρείται στις δημόσιες ροές
+  statuses_cleanup:
+    min_age:
+      '1209600': 2 εβδομάδες
+      '15778476': 6 μήνες
+      '2629746': 1 μήνας
+      '31556952': 1 χρόνος
+      '5259492': 2 μήνες
+      '604800': 1 εβδομάδα
+      '63113904': 2 χρόνια
+      '7889238': 3 μήνες
   stream_entries:
     pinned: Καρφιτσωμένο τουτ
     reblogged: προωθημένο
     sensitive_content: Ευαίσθητο περιεχόμενο
   tags:
     does_not_match_previous_name: δεν ταιριάζει με το προηγούμενο όνομα
-  terms:
-    body_html: |
-      <h2>Πολιτική Απορρήτου</h2>
-      <h3 id="collect">Ποιες πληροφορίες συλλέγουμε;</h3>
-
-      <ul>
-      <li><em>Βασικά στοιχεία λογαριασμού</em>: Όταν εγγραφείς σε αυτό τον διακομιστή, μπορεί να σου ζητηθεί όνομα χρήστη, διεύθυνση email και ένας κωδικός. Μπορεί επίσης να εισάγεις επιπλέον πληροφορίες λογαριασμού όπως ένα όνομα λογαριασμού και σύντομο βιογραφικό και να ανεβάσεις εικόνα προφίλ και επικεφαλίδας. Το όνομα χρήστη, το όνομα λογαριασμού, το βιογραφικό και οι εικόνες προφίλ και επικεφαλίδας είναι πάντα δημόσια εμφανείς.</li>
-      <li><em>Δημοσιεύσεις, ακόλουθοι και λοιπά δημόσια στοιχεία</em>: Η λίστα των ανθρώπων που ακολουθείς εμφανίζεται δημόσια, το ίδιο και οι ακόλουθοί σου. Όταν υποβάλλεις ένα μήνυμα, η ημερομηνία και ώρα αποθηκεύονται καθώς και η εφαρμογή που χρησιμοποίησες για την υποβολή του. Τα μηνύματα μπορεί να περιέχουν συνημμένα πολυμέσα όπως εικόνες και βίντεο. Τα δημόσια και τα μη καταχωρημένα μηνύματα είναι δημόσια διαθέσιμα. Όταν προβάλεις μια δημοσίευση στο προφίλ σου, είναι και αυτό δημόσια διαθέσιμο. Οι δημοσιεύσεις σου παραδίδονται στους ακολούθους σου, σε κάποιες περιπτώσεις αυτό σημαίνει ότι παραδίδονται σε διαφορετικούς διακομιστές (servers) και αντίγραφά τους αποθηκεύονται σε αυτούς. Παρομοίως, όταν διαγράψεις δημοσιεύσεις, αυτό μεταφέρεται στους ακόλουθους σου. Η αναδημοσίευση και η σημείωση ως αγαπημένης μιας δημοσίευσης είναι πάντα δημόσια.</li>
-      <li><em>Προσωπικές δημοσιεύσεις και προς ακόλουθους</em>: Όλες οι δημοσιεύσεις αποθηκεύονται και επεξεργάζονται στον διακομιστή. Οι δημοσιεύσεις προς τους ακόλουθους παραδίδονται στους ακόλουθους σου και σε όσους χρήστες αναφέρονται σε αυτές. Σε κάποιες περιπτώσεις αυτό σημαίνει πως παραδίδονται σε διαφορετικούς διακομιστές και αντίγραφά τους αποθηκεύονται σε αυτούς. Καταβάλουμε ειλικρινή προσπάθεια περιορισμού πρόσβασης σε αυτές τις δημοσιεύσεις μόνο σε εγκεκριμένα άτομα, όμως διαφορετικοί διακομιστές μπορεί να μην το πετυχαίνουν αυτό. Για αυτό, είναι σημαντικό να ελέγχεις τους διακομιστές στους οποίους ανήκουν οι ακόλουθοί σου. Μπορείς να ενεργοποιήσεις την επιλογή χειροκίνητης αποδοχής ή απόρριψης των νέων ακόλουθών σου στις ρυθμίσεις. <em>Παρακαλούμε έχε υπόψιν σου πως οι διαχειριστές του διακομιστή και των αποδεκτών διακομιστών πιθανόν να κοιτάνε αυτά τα μηνύματα</em>, και πως οι τελικοί αποδέκτες μπορούν να αποθηκεύσουν την οθόνη, το μήνυμα ή να το αναμεταδώσουν με άλλους τρόπους. <em>Μην μοιράζεσαι επικύνδυνες πληροφορίες μέσω του Mastodon.</em></li>
-      <li><em>Διευθύνσεις IP και άλλα metadata</em>: Όταν συνδέεσαι, καταγράφουμε την διεύθυνση IP σου, καθώς και το όνομα της εφαρμογής του φυλλομετρητή σου (browser). Όλες οι τρέχουσες συνδέσεις στον λογαριασμό σου είναι διαθέσιμες προς ανασκόπηση στις ρυθμίσεις. Η πιο πρόσφατη διεύθυνση IP αποθηκεύεται για μέχρι 12 μήνες. Επίσης μπορεί να διατηρήσουμε ιστορικό του διακομιστή (log files) που να περιέχει την διεύθυνση ΙΡ κάθε κλήσης προς τον διακομιστή μας.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Πως χρησιμοποιούμε τις πληροφορίες σου;</h3>
-
-      <p>Οι πληροφορίες σου που συλλέγουμε μπορεί να χρησιμοποιηθούν με τους ακόλουθους τρόπους:</p>
-
-      <ul>
-      <li>Για να παρέχουμε την βασική λειτουργικότητα του Mastodon. Μπορείς να αλληλεπιδράσεις με τις δημοσιεύσεις άλλων και να κάνεις τις δικές σου μόνο αφού συνδεθείς. Για παράδειγμα, μπορείς να ακολουθήσεις άλλους χρήστες για να βλέπεις τις συνολικές δημοσιεύσεις τους στη δική σου, προσωπική αρχική ροή.</li>
-      <li>Για να διευκολύνουμε τη διαχείριση της κοινότητας, για παράδειγμα συγκρίνοντας τη δική σου διεύθυνση IP με άλλες γνωστές διευθύνσεις για να καθορίσουμε περιπτώσεις αποφυγής αποκλεισμού ή άλλων παραβάσεων.</li>
-      <li>Η διεύθυνση email που δίνεις μπορεί να χρησιμοποιηθεί για να σου στείλουμε πληροφορίες, ειδοποιήσεις για αλληλεπιδράσεις άλλων χρηστών με τις δημοσιεύσεις σου και να ανταποκριθούμε σε ερωτήματά σου.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Πως προστατεύουμε τις πληροφορίες σου;</h3>
-
-      <p>Εφαρμόζουμε μια σειρά μεθόδων ασφαλείας για να διασφαλίσουμε τις προσωπικές πληροφορίες που εισάγεις, καταθέτεις ή κοιτάζεις. Μεταξύ άλλων, η σύνδεση του φυλλομετρητή σου καθώς και οι ανταλασσόμενες πληροφορίες μεταξύ των εφαρμογών σου και του API είναι κρυπτογραφημένες μέσω SSL και το συνθηματικό σου κωδικοποιείται με ισχυρό, μη αντιστρέψιμο αλγόριθμο. Μπορείς να ενεργοποιήσεις την ταυτοπόίηση 2 παραγόντων (2FA) για επιπλέον ασφαλή πρόσβαση στο λογαριασμό σου.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Ποια είναι η πολιτική διατήρησης πληροφοριών μας;</h3>
-
-      <p>Καταβάλουμε κάθε δυνατή προσπάθεια να:</p>
-
-      <ul>
-      <li>Διατηρήσουμε αρχεία ενεργειών των διακομιστών (servers) για όλα τα αιτήματα σε αυτόν τον διακομιστή, και αυτά τα αρχεία διατηρούνται για μέγιστο χρόνο 90 ημερών.</li>
-      <li>Διατηρήσουμε τις διευθύνσεις IP που σχετίζονται με εγγεγραμμένους χρήστες για μέγιστο χρόνο 12 μηνών.</li>
-      </ul>
-
-      <p>Μπορείς να αιτηθείς και να αποθηκεύσεις τοπικά ένα αρχείο του περιεχομένου σου που περιλαμβάνει τις δημοσιεύσεις, τα συνημμένα πολυμέσα, την εικόνα προφίλ και την εικόνα επικεφαλίδας.</p>
-
-      <p>Μπορείς ανά πάσα στιγμή να διαγράψεις οριστικά και αμετάκλητα το λογαριασμό σου.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Χρησιμοποιούμε cookies;</h3>
-
-      <p>Ναι. Τα cookies είναι μικρά αρχεία που ένας ιστοτοπος (site) ή πάροχος υπηρεσίας μεταφέρει στον σκληρό δίσκο του υπολογιστή μέσω του φυλλομετρητή (αν το επιτρέψεις). Τα cookies αυτά επιτρέπουν στον ιστότοπο να αναγνωρίζει τον φυλλομετρητή σου και, αν έχεις λογαριασμό, να τον συνδέσει με αυτόν.</p>
-
-      <p>Χρησιμοποιούμε τα cookies για να αναγνωρίσουμε και αποθηκεύσουμε τις προτιμήσεις σου για τις μελλοντικές σου επισκέψεις.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Αποκαλύπτουμε πληροφορίες σε τρίτους;</h3>
-
-      <p>Δεν πουλάμε, ανταλλάσσουμε ή με άλλο τρόπο μεταφέρουμε σε τρίτα μέρη πληροφορίες που σε προσωποποιούν. Αυτό δεν περιλαμβάνει αξιόπιστα τρίτα μέρη που μας βοηθούν να λειτουργούμε τον ιστότοπό μας, να διεξάγουμε τις εργασίες μας ή να σε εξυπηρετούμε, στο βαθμό που αυτά τα τρίτα μέρη συμφωνούν να διατηρούν αυτές τις πληροφορίες εμπιστευτικές. Επίσης μπορεί να μοιραστούμε τις πληροφορίες σου όταν θεωρήσουμε πως αυτό είναι σύμφωνο με τον νόμο, με την πολιτική του ιστότοπου μας ή διαφυλάσσει τα δικά μας δικαιώματα ή τρίτων, την ιδιοκτησία ή την ασφάλεια.</p>
-
-      <p>Το δημόσιο περιεχόμενο σου μπορεί να αποθηκευτεί από άλλους διακομιστές (servers) στο δίκτυο. Οι δημόσιες και οι προς ακόλουθους δημοσιεύσεις σου παραδίδονται στους διακομιστές των ακολούθων σου και τα προσωπικά μηνύματα στους διακομιστές των παραληπτών, όταν αυτοί βρίσκονται σε διαφορετικό διακομιστή.</p>
-
-      <p>Όταν επιτρέψεις σε μια εφαρμογή να χρησιμοποιήσει τον λογαριασμό σου, ανάλογα με το εύρος των δικαιωμάτων που εγκρίνεις, μπορεί να έχει πρόσβαση στις πληροφορίες του δημόσιου προφιλ σου, στη λίστα των ακολούθων σου, στους ακόλουθούς σου, στις λίστες σου, σε όλες τις δημοσιεύσεις σου και στα αγαπημένα σου. Οι εφαρμογές ποτέ δεν έχουν πρόσβαση στις διευθύνσεις email και στα συνθηματικά σου.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Χρήση από παιδιά</h3>
-
-      <p>Αν αυτός ο διακομιστής βρίσκεται στην ΕΕ (Ευρωπαϊκή Ένωση) ή στον ΕΟΧ (Ευρωπαϊκός Οικονομικός Χώρος): Ο ιστότοπός μας, τα προϊόντα και οι υπηρεσίες μας απευθύνονται σε άτομα ηλικίας άνω των 16. Αν είσαι κάτω των 16, σύμφωνα με τις απαιτήσεις του Γενικού Κανονισμού Προστασίας Δεδομένων "GDPR" (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) μην χρησιμοποιήσεις αυτόν τον ιστότοπο.</p>
-
-      <p>Αν αυτός ο διακομιστής βρίσκεται στις ΗΠΑ: Ο ιστότοπός μας, τα προϊόντα και οι υπηρεσίες μας απευθύνονται σε άτομα ηλικίας τουλάχιστον 13 ετών. Αν είσαι κάτω των 13, σύμφωνα με τις απαιτήσεις του COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) μην χρησιμοποιήσεις αυτόν τον ιστότοπο.</p>
-
-      <p>Οι νομικές απαιτήσεις μπορεί να είναι διαφορετικές αν ο διακομιστής αυτός βρίσκεται σε άλλη δικαιοδοσία.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Αλλαγές στην πολιτική απορρήτου μας</h3>
-
-      <p>Αν αποφασίσουμε να κάνουμε αλλαγές στην πολιτική απορρήτου μας, θα τις δηλώσουμε σε αυτήν εδώ τη σελίδα.</p>
-
-      <p>Η άδεια χρήσης αυτού του κειμένου είναι κατάCC-BY-SA. Ενημερώθηκε τελευταία φορά στις 7 Μαρτίου, 2018.</p>
-
-      <p>Οι παραπάνω όροι έχουν προσαρμοστεί από τους αντίστοιχους όρους του <a href="https://github.com/discourse/discourse">Discourse</a>.</p>
-    title: Όροι Χρήσης και Πολιτική Απορρήτου του κόμβου %{instance}
   themes:
     contrast: Mastodon (Υψηλή αντίθεση)
     default: Mastodon (Σκοτεινό)
     mastodon-light: Mastodon (Ανοιχτόχρωμο)
+  time:
+    formats:
+      time: "%H:%M"
   two_factor_authentication:
     add: Προσθήκη
     disable: Απενεργοποίησε
@@ -1249,20 +1127,12 @@ el:
       explanation: Είχες ζητήσει εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για κατέβασμα!
       subject: Το εφεδρικό αντίγραφό σου είναι έτοιμο για κατέβασμα
       title: Λήψη εφεδρικού αρχείου
-    sign_in_token:
-      details: 'Οι λεπτομέρειες της απόπειρας:'
-      explanation: 'Εντοπίσαμε απόπειρα εισόδου στο λογαριασμό σου από άγνωστη διεύθυνση IP. Άν έγινε από εσένα, παρακαλούμε αντέγραψε τον παρακάτω κωδικό ασφαλείας στη σελίδα εισόδου:'
-      further_actions: 'Αν δεν ήσουν εσύ, παρακαλούμε άλλαξε το κωδικό ασφαλείας σου και ενεργοποίησε τον έλεγχο δύο παραγόντων (2FA) στο λογαριασμό σου. Αυτό το κάνεις εδώ:'
-      subject: Παρακαλούμε επιβεβαίωσε την απόπειρα εισόδου
-      title: Απόπειρα εισόδου
+    suspicious_sign_in:
+      change_password: αλλάξτε τον κωδικό πρόσβασής σας
     warning:
-      explanation:
-        disable: Όσο ο λογαριασμός σου είναι παγωμένος, τα στοιχεία του παραμένουν άθικτα αλλά δεν μπορείς να κανείς καμία ενέργεια μέχρι να ξεκλειδωθείς.
-        silence: Όσο ο λογαριασμός σου είναι περιορισμένος, μόνο όσοι σε ακολουθούν ήδη θα βλέπουν τα τουτ σου σε αυτό τον κόμβο ενώ μπορεί να εξαιρεθείς από διάφορες δημόσιες απαριθμήσεις. Πάντως, θα μπορούν να σε ακολουθήσουν χειροκίνητα.
-        suspend: Ο λογαριασμός σου αναστάλθηκε μόνιμα, όλα τα τουτ και τα ανεβασμένα πολυμέσα σου διαγράφηκαν αμετάκλητα από αυτόν τον κόμβο και σε όσους άλλους είχες ακόλουθους.
-      get_in_touch: Μπορείς να απαντήσεις σε αυτό το email για να επικοινωνήσεις με το προσωπικό του %{instance}.
-      review_server_policies: Αναθεώρηση πολιτικής του κόμβου
-      statuses: 'Συγκεκριμένα, για:'
+      categories:
+        spam: Ανεπιθύμητο
+      reason: 'Αιτιολογία:'
       subject:
         disable: Ο λογαριασμός σου %{acct} έχει παγώσει
         none: Προειδοποίηση προς %{acct}
@@ -1271,35 +1141,22 @@ el:
       title:
         disable: Παγωμένος λογαριασμός
         none: Προειδοποίηση
-        sensitive: Το πολυμέσο σας έχει σημανθεί ως ευαίσθητο
         silence: Περιορισμένος λογαριασμός
         suspend: Λογαριασμός σε αναστολή
     welcome:
       edit_profile_action: Στήσιμο προφίλ
-      edit_profile_step: Μπορείς να προσαρμόσεις το προφίλ σου ανεβάζοντας μια εικόνα εμφάνισης & επικεφαλίδας, αλλάζοντας το εμφανιζόμενο όνομά σου και άλλα. Αν θες να ελέγχεις τους νέου σου ακόλουθους πριν αυτοί σε ακολουθήσουν, μπορείς να κλειδώσεις το λογαριασμό σου.
       explanation: Μερικές συμβουλές για να ξεκινήσεις
       final_action: Ξεκίνα τις δημοσιεύσεις
-      final_step: 'Ξεκίνα τις δημοσιεύσεις! Ακόμα και χωρίς ακόλουθους τα δημόσια μηνύματά σου μπορεί να τα δουν άλλοι, για παράδειγμα στην τοπική ροή και στις ετικέτες. Ίσως να θέλεις να κάνεις μια εισαγωγή του εαυτού σου με την ετικέτα #introductions.'
       full_handle: Το πλήρες όνομά σου
       full_handle_hint: Αυτό θα εδώ θα πεις στους φίλους σου για να σου μιλήσουν ή να σε ακολουθήσουν από άλλο κόμβο.
-      review_preferences_action: Αλλαγή προτιμήσεων
-      review_preferences_step: Σιγουρέψου πως έχεις ορίσει τις προτιμήσεις σου, όπως το ποια email θέλεις να λαμβάνεις, ή ποιο επίπεδο ιδιωτικότητας θέλεις να έχουν οι δημοσιεύσεις σου. Αν δεν σε πιάνει ναυτία, μπορείς να ενεργοποιήσεις την αυτόματη αναπαραγωγή των GIF.
       subject: Καλώς ήρθες στο Mastodon
-      tip_federated_timeline: Η ομοσπονδιακή ροή είναι μια όψη πραγματικού χρόνου στο δίκτυο του Mastodon. Παρόλα αυτά, περιλαμβάνει μόνο όσους ακολουθούν οι γείτονές σου, άρα δεν είναι πλήρης.
-      tip_following: Ακολουθείς το διαχειριστή του διακομιστή σου αυτόματα. Για να βρεις περισσότερους ενδιαφέροντες ανθρώπους, έλεγξε την τοπική και την ομοσπονδιακή ροή.
-      tip_local_timeline: Η τοπική ροή είναι η όψη πραγματικού χρόνου των ανθρώπων στον κόμβο %{instance}. Αυτοί είναι οι άμεσοι γείτονές σου!
-      tip_mobile_webapp: Αν ο φυλλομετρητής (browser) στο κινητό σού σου επιτρέπει να προσθέσεις το Mastodon στην αρχική οθόνη της συσκευής, θα λαμβάνεις και ειδοποιήσεις μέσω push. Σε πολλά πράγματα λειτουργεί σαν κανονική εφαρμογή!
-      tips: Συμβουλές
       title: Καλώς όρισες, %{name}!
   users:
     follow_limit_reached: Δεν μπορείς να ακολουθήσεις περισσότερα από %{limit} άτομα
-    generic_access_help_html: Δυσκολεύεσαι να μπεις στο λογαριασμό σου; Μπορείς να επικοινωνήσεις στο %{email} για βοήθεια
     invalid_otp_token: Άκυρος κωδικός πιστοποίησης 2 παραγόντων (2FA)
-    invalid_sign_in_token: Άκυρος κωδικός ασφάλειας
     otp_lost_help_html: Αν χάσεις και τα δύο, μπορείς να επικοινωνήσεις με τον/την %{email}
     seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες.
     signed_in_as: 'Έχεις συνδεθεί ως:'
-    suspicious_sign_in_confirmation: Φαίνεσαι να συνδέεσαι πρώτη φορά από αυτή τη συσκευή και δεν έχεις συνδεθεί εδώ και αρκετό καιρό. Για αυτό το λόγο σου στείλαμε έναν κωδικό ασφαλείας στο email σου για να σιγουρευτούμε πως είσαι όντως εσύ.
   verification:
     explanation_html: 'Μπορείς να <strong>πιστοποιήσεις τον εαυτό σου ως ιδιοκτήτη των συνδέσμων που εμφανίζεις στα μεταδεδομένα του προφίλ σου</strong>. Για να συμβεί αυτό, ο συνδεδεμένος ιστότοπος πρέπει να περιέχει ένα σύνδεσμο που να επιστρέφει προς το προφίλ σου στο Mastodon. Ο σύνδεσμος επιστροφής <strong>πρέπει</strong> περιέχει την ιδιότητα (attribute) <code>rel="me"</code>. Το περιεχόμενο του κειμένου δεν έχει σημασία. Για παράδειγμα:'
     verification: Πιστοποίηση
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
new file mode 100644
index 000000000..e67bb1fa7
--- /dev/null
+++ b/config/locales/en-GB.yml
@@ -0,0 +1,75 @@
+---
+en-GB:
+  about:
+    about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralisation! Own your data with Mastodon!'
+    contact_missing: Not set
+    contact_unavailable: N/A
+    hosted_on: Mastodon hosted on %{domain}
+    title: About
+  accounts:
+    follow: Follow
+    followers:
+      one: Follower
+      other: Followers
+    following: Following
+    instance_actor_flash: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be suspended.
+    last_active: last active
+    link_verified_on: Ownership of this link was checked on %{date}
+    nothing_here: There is nothing here!
+    pin_errors:
+      following: You must be already following the person you want to endorse
+    posts:
+      one: Post
+      other: Posts
+    posts_tab_heading: Posts
+  admin:
+    account_actions:
+      action: Perform action
+      title: Perform moderation action on %{acct}
+    account_moderation_notes:
+      create: Leave note
+      created_msg: Moderation note successfully created!
+      destroyed_msg: Moderation note successfully destroyed!
+    accounts:
+      add_email_domain_block: Block e-mail domain
+      approve: Approve
+      approved_msg: Successfully approved %{username}'s sign-up application
+      are_you_sure: Are you sure?
+      avatar: Avatar
+      by_domain: Domain
+      change_email:
+        changed_msg: Email successfully changed!
+        current_email: Current email
+        label: Change email
+        new_email: New email
+        submit: Change email
+        title: Change email for %{username}
+      change_role:
+        changed_msg: Role successfully changed!
+        label: Change role
+        no_role: No role
+        title: Change role for %{username}
+      confirm: Confirm
+      confirmed: Confirmed
+      confirming: Confirming
+      custom: Custom
+      delete: Delete data
+      deleted: Deleted
+      demote: Demote
+      destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
+      disable: Freeze
+      disable_sign_in_token_auth: Disable e-mail token authentication
+      disable_two_factor_authentication: Disable 2FA
+      disabled: Frozen
+      display_name: Display name
+      domain: Domain
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 73217ff0d..075ce2136 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,92 +1,27 @@
 ---
 en:
   about:
-    about_hashtag_html: These are public posts tagged with <strong>#%{hashtag}</strong>. You can interact with them if you have an account anywhere in the fediverse.
     about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!'
-    about_this: About
-    active_count_after: active
-    active_footnote: Monthly Active Users (MAU)
-    administered_by: 'Administered by:'
-    api: API
-    apps: Mobile apps
-    apps_platforms: Use Mastodon from iOS, Android and other platforms
-    browse_directory: Browse a profile directory and filter by interests
-    browse_local_posts: Browse a live stream of public posts from this server
-    browse_public_posts: Browse a live stream of public posts on Mastodon
-    contact: Contact
     contact_missing: Not set
     contact_unavailable: N/A
-    discover_users: Discover users
-    documentation: Documentation
-    federation_hint_html: With an account on %{instance} you'll be able to follow people on any Mastodon server and beyond.
-    get_apps: Try a mobile app
     hosted_on: Mastodon hosted on %{domain}
-    instance_actor_flash: |
-      This account is a virtual actor used to represent the server itself and not any individual user.
-      It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block.
-    learn_more: Learn more
-    privacy_policy: Privacy policy
-    rules: Server rules
-    rules_html: 'Below is a summary of rules you need to follow if you want to have an account on this server of Mastodon:'
-    see_whats_happening: See what's happening
-    server_stats: 'Server stats:'
-    source_code: Source code
-    status_count_after:
-      one: post
-      other: posts
-    status_count_before: Who published
-    tagline: Follow friends and discover new ones
-    terms: Terms of service
-    unavailable_content: Moderated servers
-    unavailable_content_description:
-      domain: Server
-      reason: Reason
-      rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:'
-      rejecting_media_title: Filtered media
-      silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users interactions, unless you are following them:'
-      silenced_title: Limited servers
-      suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:'
-      suspended_title: Suspended servers
-    unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
-    user_count_after:
-      one: user
-      other: users
-    user_count_before: Home to
-    what_is_mastodon: What is Mastodon?
+    title: About
   accounts:
-    choices_html: "%{name}'s choices:"
-    endorsements_hint: You can endorse people you follow from the web interface, and they will show up here.
-    featured_tags_hint: You can feature specific hashtags that will be displayed here.
     follow: Follow
     followers:
       one: Follower
       other: Followers
     following: Following
     instance_actor_flash: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be suspended.
-    joined: Joined %{date}
     last_active: last active
     link_verified_on: Ownership of this link was checked on %{date}
-    media: Media
-    moved_html: "%{name} has moved to %{new_profile_link}:"
-    network_hidden: This information is not available
-    never_active: Never
     nothing_here: There is nothing here!
-    people_followed_by: People whom %{name} follows
-    people_who_follow: People who follow %{name}
     pin_errors:
       following: You must be already following the person you want to endorse
     posts:
       one: Post
       other: Posts
     posts_tab_heading: Posts
-    posts_with_replies: Posts and replies
-    roles:
-      admin: Admin
-      bot: Bot
-      group: Group
-      moderator: Mod
-    unavailable: Profile unavailable
-    unfollow: Unfollow
   admin:
     account_actions:
       action: Perform action
@@ -94,7 +29,6 @@ en:
     account_moderation_notes:
       create: Leave note
       created_msg: Moderation note successfully created!
-      delete: Delete
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
       add_email_domain_block: Block e-mail domain
@@ -104,15 +38,21 @@ en:
       avatar: Avatar
       by_domain: Domain
       change_email:
-        changed_msg: Account email successfully changed!
+        changed_msg: Email successfully changed!
         current_email: Current email
         label: Change email
         new_email: New email
         submit: Change email
         title: Change email for %{username}
+      change_role:
+        changed_msg: Role successfully changed!
+        label: Change role
+        no_role: No role
+        title: Change role for %{username}
       confirm: Confirm
       confirmed: Confirmed
       confirming: Confirming
+      custom: Custom
       delete: Delete data
       deleted: Deleted
       demote: Demote
@@ -152,6 +92,7 @@ en:
         active: Active
         all: All
         pending: Pending
+        silenced: Limited
         suspended: Suspended
         title: Moderation
       moderation_notes: Moderation notes
@@ -159,9 +100,14 @@ en:
       most_recent_ip: Most recent IP
       no_account_selected: No accounts were changed as none were selected
       no_limits_imposed: No limits imposed
+      no_role_assigned: No role assigned
       not_subscribed: Not subscribed
       pending: Pending review
       perform_full_suspension: Suspend
+      previous_strikes: Previous strikes
+      previous_strikes_description_html:
+        one: This account has <strong>one</strong> strike.
+        other: This account has <strong>%{count}</strong> strikes.
       promote: Promote
       protocol: Protocol
       public: Public
@@ -170,6 +116,8 @@ en:
       redownloaded_msg: Successfully refreshed %{username}'s profile from origin
       reject: Reject
       rejected_msg: Successfully rejected %{username}'s sign-up application
+      remote_suspension_irreversible: The data of this account has been irreversibly deleted.
+      remote_suspension_reversible_hint_html: The account has been suspended on their server, and the data will be fully removed on %{date}. Until then, the remote server can restore this account without any ill effects. If you wish to remove all of the account's data immediately, you can do so below.
       remove_avatar: Remove avatar
       remove_header: Remove header
       removed_avatar_msg: Successfully removed %{username}'s avatar image
@@ -181,19 +129,13 @@ en:
       reset: Reset
       reset_password: Reset password
       resubscribe: Resubscribe
-      role: Permissions
-      roles:
-        admin: Administrator
-        moderator: Moderator
-        staff: Staff
-        user: User
+      role: Role
       search: Search
       search_same_email_domain: Other users with the same e-mail domain
       search_same_ip: Other users with the same IP
       security_measures:
         only_password: Only password
         password_and_2fa: Password and 2FA
-        password_and_sign_in_token: Password and e-mail token
       sensitive: Force-sensitive
       sensitized: Marked as sensitive
       shared_inbox_url: Shared inbox URL
@@ -203,7 +145,9 @@ en:
       silence: Limit
       silenced: Limited
       statuses: Posts
+      strikes: Previous strikes
       subscribe: Subscribe
+      suspend: Suspend
       suspended: Suspended
       suspension_irreversible: The data of this account has been irreversibly deleted. You can unsuspend the account to make it usable but it will not recover any data it previously had.
       suspension_reversible_hint_html: The account has been suspended, and the data will be fully removed on %{date}. Until then, the account can be restored without any ill effects. If you wish to remove all of the account's data immediately, you can do so below.
@@ -224,20 +168,25 @@ en:
       whitelisted: Allowed for federation
     action_logs:
       action_types:
+        approve_appeal: Approve Appeal
         approve_user: Approve User
         assigned_to_self_report: Assign Report
         change_email_user: Change E-mail for User
+        change_role_user: Change Role of User
         confirm_user: Confirm User
         create_account_warning: Create Warning
         create_announcement: Create Announcement
+        create_canonical_email_block: Create E-mail Block
         create_custom_emoji: Create Custom Emoji
         create_domain_allow: Create Domain Allow
         create_domain_block: Create Domain Block
         create_email_domain_block: Create E-mail Domain Block
         create_ip_block: Create IP rule
         create_unavailable_domain: Create Unavailable Domain
+        create_user_role: Create Role
         demote_user: Demote User
         destroy_announcement: Delete Announcement
+        destroy_canonical_email_block: Delete E-mail Block
         destroy_custom_emoji: Delete Custom Emoji
         destroy_domain_allow: Delete Domain Allow
         destroy_domain_block: Delete Domain Block
@@ -246,6 +195,7 @@ en:
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
         destroy_unavailable_domain: Delete Unavailable Domain
+        destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
         disable_sign_in_token_auth_user: Disable E-mail Token Authentication for User
@@ -255,9 +205,11 @@ en:
         enable_user: Enable User
         memorialize_account: Memorialize Account
         promote_user: Promote User
+        reject_appeal: Reject Appeal
         reject_user: Reject User
         remove_avatar_user: Remove Avatar
         reopen_report: Reopen Report
+        resend_user: Resend Confirmation Mail
         reset_password_user: Reset Password
         resolve_report: Resolve Report
         sensitive_account: Force-Sensitive Account
@@ -271,23 +223,30 @@ en:
         update_announcement: Update Announcement
         update_custom_emoji: Update Custom Emoji
         update_domain_block: Update Domain Block
+        update_ip_block: Update IP rule
         update_status: Update Post
+        update_user_role: Update Role
       actions:
+        approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
         change_email_user_html: "%{name} changed the e-mail address of user %{target}"
+        change_role_user_html: "%{name} changed role of %{target}"
         confirm_user_html: "%{name} confirmed e-mail address of user %{target}"
         create_account_warning_html: "%{name} sent a warning to %{target}"
         create_announcement_html: "%{name} created new announcement %{target}"
+        create_canonical_email_block_html: "%{name} blocked e-mail with the hash %{target}"
         create_custom_emoji_html: "%{name} uploaded new emoji %{target}"
         create_domain_allow_html: "%{name} allowed federation with domain %{target}"
         create_domain_block_html: "%{name} blocked domain %{target}"
         create_email_domain_block_html: "%{name} blocked e-mail domain %{target}"
         create_ip_block_html: "%{name} created rule for IP %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
+        create_user_role_html: "%{name} created %{target} role"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
-        destroy_custom_emoji_html: "%{name} destroyed emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} unblocked e-mail with the hash %{target}"
+        destroy_custom_emoji_html: "%{name} deleted emoji %{target}"
         destroy_domain_allow_html: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block_html: "%{name} unblocked domain %{target}"
         destroy_email_domain_block_html: "%{name} unblocked e-mail domain %{target}"
@@ -295,6 +254,7 @@ en:
         destroy_ip_block_html: "%{name} deleted rule for IP %{target}"
         destroy_status_html: "%{name} removed post by %{target}"
         destroy_unavailable_domain_html: "%{name} resumed delivery to domain %{target}"
+        destroy_user_role_html: "%{name} deleted %{target} role"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} disabled e-mail token authentication for %{target}"
@@ -304,9 +264,11 @@ en:
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
+        reject_appeal_html: "%{name} rejected moderation decision appeal from %{target}"
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
         reopen_report_html: "%{name} reopened report %{target}"
+        resend_user_html: "%{name} resent confirmation e-mail for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
         resolve_report_html: "%{name} resolved report %{target}"
         sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
@@ -320,8 +282,10 @@ en:
         update_announcement_html: "%{name} updated announcement %{target}"
         update_custom_emoji_html: "%{name} updated emoji %{target}"
         update_domain_block_html: "%{name} updated domain block for %{target}"
+        update_ip_block_html: "%{name} changed rule for IP %{target}"
         update_status_html: "%{name} updated post by %{target}"
-      deleted_status: "(deleted post)"
+        update_user_role_html: "%{name} changed %{target} role"
+      deleted_account: deleted account
       empty: No logs found.
       filter_by_action: Filter by action
       filter_by_user: Filter by user
@@ -360,11 +324,12 @@ en:
       enable: Enable
       enabled: Enabled
       enabled_msg: Successfully enabled that emoji
-      image_hint: PNG up to 50KB
+      image_hint: PNG or GIF up to %{size}
       list: List
       listed: Listed
       new:
         title: Add new custom emoji
+      no_emoji_selected: No emojis were changed as none were selected
       not_permitted: You are not permitted to perform this action
       overwrite: Overwrite
       shortcode: Shortcode
@@ -382,14 +347,17 @@ en:
       media_storage: Media storage
       new_users: new users
       opened_reports: reports opened
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> pending appeal"
+        other: "<strong>%{count}</strong> pending appeals"
       pending_reports_html:
-        one: "<strong>1</strong> pending report"
+        one: "<strong>%{count}</strong> pending report"
         other: "<strong>%{count}</strong> pending reports"
       pending_tags_html:
-        one: "<strong>1</strong> pending hashtag"
+        one: "<strong>%{count}</strong> pending hashtag"
         other: "<strong>%{count}</strong> pending hashtags"
       pending_users_html:
-        one: "<strong>1</strong> pending user"
+        one: "<strong>%{count}</strong> pending user"
         other: "<strong>%{count}</strong> pending users"
       resolved_reports: reports resolved
       software: Software
@@ -399,10 +367,16 @@ en:
       top_languages: Top active languages
       top_servers: Top active servers
       website: Website
+    disputes:
+      appeals:
+        empty: No appeals found.
+        title: Appeals
     domain_allows:
       add_new: Allow federation with domain
       created_msg: Domain has been successfully allowed for federation
       destroyed_msg: Domain has been disallowed from federation
+      export: Export
+      import: Import
       undo: Disallow federation with domain
     domain_blocks:
       add_new: Add new domain block
@@ -410,16 +384,21 @@ en:
       destroyed_msg: Domain block has been undone
       domain: Domain
       edit: Edit domain block
+      existing_domain_block: You have already imposed stricter limits on %{name}.
       existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
+      export: Export
+      import: Import
       new:
         create: Create block
         hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
         severity:
-          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media files."
+          desc_html: "<strong>Limit</strong> will make posts from accounts at this domain invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all content, media, and profile data for this domain's accounts from your server. Use <strong>None</strong> if you just want to reject media files."
           noop: None
-          silence: Silence
+          silence: Limit
           suspend: Suspend
         title: New domain block
+      no_domain_block_selected: No domain blocks were changed as none were selected
+      not_permitted: You are not permitted to perform this action
       obfuscate: Obfuscate domain name
       obfuscate_hint: Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled
       private_comment: Private comment
@@ -430,34 +409,41 @@ 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
-      rejecting_media: rejecting media files
-      rejecting_reports: rejecting reports
-      severity:
-        silence: limited
-        suspend: suspended
-      show:
-        affected_accounts:
-          one: One account in the database affected
-          other: "%{count} accounts in the database affected"
-        retroactive:
-          silence: Undo limit of existing affected accounts from this domain
-          suspend: Unsuspend existing affected accounts from this domain
-        title: Undo domain block for %{domain}
-        undo: Undo
       undo: Undo domain block
       view: View domain block
     email_domain_blocks:
       add_new: Add new
+      attempts_over_week:
+        one: "%{count} attempt over the last week"
+        other: "%{count} sign-up attempts over the last week"
       created_msg: Successfully blocked e-mail domain
       delete: Delete
-      destroyed_msg: Successfully unblocked e-mail domain
+      dns:
+        types:
+          mx: MX record
       domain: Domain
-      empty: No e-mail domains currently blocked.
-      from_html: from %{domain}
       new:
         create: Add domain
+        resolve: Resolve domain
         title: Block new e-mail domain
+      no_email_domain_block_selected: No e-mail domain blocks were changed as none were selected
+      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
+      resolved_through_html: Resolved through %{domain}
       title: Blocked e-mail domains
+    export_domain_allows:
+      new:
+        title: Import domain allows
+      no_file: No file selected
+    export_domain_blocks:
+      import:
+        description_html: You are about to import a list of domain blocks. Please review this list very carefully, especially if you have not authored this list yourself.
+        existing_relationships_warning: Existing follow relationships
+        private_comment_description_html: 'To help you track where imported blocks come from, imported blocks will be created with the following private comment: <q>%{comment}</q>'
+        private_comment_template: Imported from %{source} on %{date}
+        title: Import domain blocks
+      new:
+        title: Import domain blocks
+      no_file: No file selected
     follow_recommendations:
       description_html: "<strong>Follow recommendations help new users quickly find interesting content</strong>. When a user has not interacted with others enough to form personalized follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language."
       language: For language
@@ -467,23 +453,49 @@ en:
       title: Follow recommendations
       unsuppress: Restore follow recommendation
     instances:
+      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.
+          other: If delivering to the domain fails on <strong>%{count} different days</strong> without succeeding, no further delivery attempts will be made unless a delivery <em>from</em> the domain is received.
+        failure_threshold_reached: Failure threshold reached on %{date}.
+        failures_recorded:
+          one: Failed attempt on %{count} day.
+          other: Failed attempts on %{count} different days.
+        no_failures_recorded: No failures on record.
+        title: Availability
+        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.
+        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
+        instance_followers_measure: our followers there
+        instance_follows_measure: their followers here
+        instance_languages_dimension: Top languages
+        instance_media_attachments_measure: stored media attachments
+        instance_reports_measure: reports about them
+        instance_statuses_measure: stored posts
       delivery:
         all: All
         clear: Clear delivery errors
+        failing: Failing
         restart: Restart delivery
         stop: Stop delivery
-        title: Delivery
         unavailable: Unavailable
-        unavailable_message: Delivery unavailable
-        warning: Warning
-        warning_message:
-          one: Delivery failure %{count} day
-          other: Delivery failure %{count} days
       delivery_available: Delivery is available
       delivery_error_days: Delivery error days
       delivery_error_hint: If delivery is not possible for %{count} days, it will be automatically marked as undeliverable.
@@ -499,12 +511,14 @@ en:
       private_comment: Private comment
       public_comment: Public comment
       purge: Purge
+      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.
       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.
     invites:
       deactivate_all: Deactivate all
       filter:
@@ -543,7 +557,7 @@ en:
       pending: Waiting for relay's approval
       save_and_enable: Save and enable
       setup: Setup a relay connection
-      signatures_not_enabled: Relays will not work correctly while secure mode or limited federation mode is enabled
+      signatures_not_enabled: Relays may not work correctly while secure mode or limited federation mode is enabled
       status: Status
       title: Relays
     report_notes:
@@ -554,39 +568,121 @@ en:
         notes:
           one: "%{count} note"
           other: "%{count} notes"
-        reports:
-          one: "%{count} report"
-          other: "%{count} reports"
+      action_log: Audit log
       action_taken_by: Action taken by
+      actions:
+        delete_description_html: The reported posts will be deleted and a strike will be recorded to help you escalate on future infractions by the same account.
+        mark_as_sensitive_description_html: The media in the reported posts will be marked as sensitive and a strike will be recorded to help you escalate on future infractions by the same account.
+        other_description_html: See more options for controlling the account's behaviour and customize communication to the reported account.
+        resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
+        silence_description_html: The profile will be visible only to those who already follow it or manually look it up, severely limiting its reach. Can always be reverted.
+        suspend_description_html: The profile and all its contents will become inaccessible until it is eventually deleted. Interacting with the account will be impossible. Reversible within 30 days.
+      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
+      add_to_report: Add more to report
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       assigned: Assigned moderator
+      by_target_domain: Domain of reported account
+      category: Category
+      category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account
       comment:
         none: None
+      comment_description_html: 'To provide more information, %{name} wrote:'
       created_at: Reported
+      delete_and_resolve: Delete posts
       forwarded: Forwarded
       forwarded_to: Forwarded to %{domain}
       mark_as_resolved: Mark as resolved
+      mark_as_sensitive: Mark as sensitive
       mark_as_unresolved: Mark as unresolved
+      no_one_assigned: No one
       notes:
         create: Add note
         create_and_resolve: Resolve with note
         create_and_unresolve: Reopen with note
         delete: Delete
         placeholder: Describe what actions have been taken, or any other related updates...
+        title: Notes
+      notes_description_html: View and leave notes to other moderators and your future self
+      quick_actions_description_html: 'Take a quick action or scroll down to see reported content:'
+      remote_user_placeholder: the remote user from %{instance}
       reopen: Reopen report
       report: 'Report #%{id}'
       reported_account: Reported account
       reported_by: Reported by
       resolved: Resolved
       resolved_msg: Report successfully resolved!
+      skip_to_actions: Skip to actions
       status: Status
-      target_domain: Domain of reported account
+      statuses: Reported content
+      statuses_description_html: Offending content will be cited in communication with the reported account
       target_origin: Origin of reported account
       title: Reports
       unassign: Unassign
       unresolved: Unresolved
       updated_at: Updated
+      view_profile: View profile
+    roles:
+      add_new: Add role
+      assigned_users:
+        one: "%{count} user"
+        other: "%{count} users"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Invites
+        moderation: Moderation
+        special: Special
+      delete: Delete
+      description_html: With <strong>user roles</strong>, you can customize which functions and areas of Mastodon your users can access.
+      edit: Edit '%{name}' role
+      everyone: Default permissions
+      everyone_full_description_html: This is the <strong>base role</strong> affecting <strong>all users</strong>, even those without an assigned role. All other roles inherit permissions from it.
+      permissions_count:
+        one: "%{count} permission"
+        other: "%{count} permissions"
+      privileges:
+        administrator: Administrator
+        administrator_description: Users with this permission will bypass every permission
+        delete_user_data: Delete User Data
+        delete_user_data_description: Allows users to delete other users' data without delay
+        invite_users: Invite Users
+        invite_users_description: Allows users to invite new people to the server
+        manage_announcements: Manage Announcements
+        manage_announcements_description: Allows users to manage announcements on the server
+        manage_appeals: Manage Appeals
+        manage_appeals_description: Allows users to review appeals against moderation actions
+        manage_blocks: Manage Blocks
+        manage_blocks_description: Allows users to block e-mail providers and IP addresses
+        manage_custom_emojis: Manage Custom Emojis
+        manage_custom_emojis_description: Allows users to manage custom emojis on the server
+        manage_federation: Manage Federation
+        manage_federation_description: Allows users to block or allow federation with other domains, and control deliverability
+        manage_invites: Manage Invites
+        manage_invites_description: Allows users to browse and deactivate invite links
+        manage_reports: Manage Reports
+        manage_reports_description: Allows users to review reports and perform moderation actions against them
+        manage_roles: Manage Roles
+        manage_roles_description: Allows users to manage and assign roles below theirs
+        manage_rules: Manage Rules
+        manage_rules_description: Allows users to change server rules
+        manage_settings: Manage Settings
+        manage_settings_description: Allows users to change site settings
+        manage_taxonomies: Manage Taxonomies
+        manage_taxonomies_description: Allows users to review trending content and update hashtag settings
+        manage_user_access: Manage User Access
+        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their e-mail address, and reset their password
+        manage_users: Manage Users
+        manage_users_description: Allows users to view other users' details and perform moderation actions against them
+        manage_webhooks: Manage Webhooks
+        manage_webhooks_description: Allows users to set up webhooks for administrative events
+        view_audit_log: View Audit Log
+        view_audit_log_description: Allows users to see a history of administrative actions on the server
+        view_dashboard: View Dashboard
+        view_dashboard_description: Allows users to access the dashboard and various metrics
+        view_devops: DevOps
+        view_devops_description: Allows users to access Sidekiq and pgHero dashboards
+      title: Roles
     rules:
       add_new: Add rule
       delete: Delete
@@ -595,114 +691,90 @@ en:
       empty: No server rules have been defined yet.
       title: Server rules
     settings:
-      activity_api_enabled:
-        desc_html: Counts of locally published posts, active users, and new registrations in weekly buckets
-        title: Publish aggregate statistics about user activity in the API
-      bootstrap_timeline_accounts:
-        desc_html: Separate multiple usernames by comma. These accounts will be guaranteed to be shown in follow recommendations
-        title: Recommend these accounts to new users
-      contact_information:
-        email: Business e-mail
-        username: Contact username
-      custom_css:
-        desc_html: Modify the look with CSS loaded on every page
-        title: Custom CSS
+      about:
+        manage_rules: Manage server rules
+        preamble: Provide in-depth information about how the server is operated, moderated, funded.
+        rules_hint: There is a dedicated area for rules that your users are expected to adhere to.
+        title: About
+      appearance:
+        preamble: Customize Mastodon's web interface.
+        title: Appearance
+      branding:
+        preamble: Your server's branding differentiates it from other servers in the network. This information may be displayed across a variety of environments, such as Mastodon's web interface, native applications, in link previews on other websites and within messaging apps, and so on. For this reason, it is best to keep this information clear, short and concise.
+        title: Branding
+      content_retention:
+        preamble: Control how user-generated content is stored in Mastodon.
+        title: Content retention
       default_noindex:
         desc_html: Affects all users who have not changed this setting themselves
         title: Opt users out of search engine indexing by default
+      discovery:
+        follow_recommendations: Follow recommendations
+        preamble: Surfacing interesting content is instrumental in onboarding new users who may not know anyone Mastodon. Control how various discovery features work on your server.
+        profile_directory: Profile directory
+        public_timelines: Public timelines
+        title: Discovery
+        trends: Trends
       domain_blocks:
         all: To everyone
         disabled: To no one
-        title: Show domain blocks
         users: To logged-in local users
-      domain_blocks_rationale:
-        title: Show rationale
-      hero:
-        desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail
-        title: Hero image
-      mascot:
-        desc_html: Displayed on multiple pages. At least 293×205px recommended. When not set, falls back to default mascot
-        title: Mascot image
-      peers_api_enabled:
-        desc_html: Domain names this server has encountered in the fediverse
-        title: Publish list of discovered servers in the API
-      preview_sensitive_media:
-        desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive
-        title: Show sensitive media in OpenGraph previews
-      profile_directory:
-        desc_html: Allow users to be discoverable
-        title: Enable profile directory
       registrations:
-        closed_message:
-          desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
-          title: Closed registration message
-        deletion:
-          desc_html: Allow anyone to delete their account
-          title: Open account deletion
-        min_invite_role:
-          disabled: No one
-          title: Allow invitations by
-        require_invite_text:
-          desc_html: When registrations require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
-          title: Require new users to enter a reason to join
+        preamble: Control who can create an account on your server.
+        title: Registrations
       registrations_mode:
         modes:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
-        title: Registrations mode
-      show_known_fediverse_at_about_page:
-        desc_html: When disabled, restricts the public timeline linked from the landing page to showing only local content
-        title: Include federated content on unauthenticated public timeline page
-      show_staff_badge:
-        desc_html: Show a staff badge on a user page
-        title: Show staff badge
-      site_description:
-        desc_html: Introductory paragraph on the API. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
-        title: Server description
-      site_description_extended:
-        desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags
-        title: Custom extended information
-      site_short_description:
-        desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph.
-        title: Short server description
-      site_terms:
-        desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
-        title: Custom terms of service
-      site_title: Server name
-      thumbnail:
-        desc_html: Used for previews via OpenGraph and API. 1200x630px recommended
-        title: Server thumbnail
-      timeline_preview:
-        desc_html: Display link to public timeline on landing page and allow API access to the public timeline without authentication
-        title: Allow unauthenticated access to public timeline
-      title: Site settings
-      trendable_by_default:
-        desc_html: Affects hashtags that have not been previously disallowed
-        title: Allow hashtags to trend without prior review
-      trends:
-        desc_html: Publicly display previously reviewed content that is currently trending
-        title: Trends
+      title: Server Settings
     site_uploads:
       delete: Delete uploaded file
       destroyed_msg: Site upload successfully deleted!
     statuses:
+      account: Author
+      application: Application
       back_to_account: Back to account page
+      back_to_report: Back to report page
       batch:
-        delete: Delete
-        nsfw_off: Mark as not sensitive
-        nsfw_on: Mark as sensitive
+        remove_from_report: Remove from report
+        report: Report
       deleted: Deleted
-      failed_to_execute: Failed to execute
+      favourites: Favourites
+      history: Version history
+      in_reply_to: Replying to
+      language: Language
       media:
         title: Media
-      no_media: No media
+      metadata: Metadata
       no_status_selected: No posts were changed as none were selected
+      open: Open post
+      original_status: Original post
+      reblogs: Reblogs
+      status_changed: Post changed
       title: Account posts
+      trending: Trending
+      visibility: Visibility
       with_media: With media
+    strikes:
+      actions:
+        delete_statuses: "%{name} deleted %{target}'s posts"
+        disable: "%{name} froze %{target}'s account"
+        mark_statuses_as_sensitive: "%{name} marked %{target}'s posts as sensitive"
+        none: "%{name} sent a warning to %{target}"
+        sensitive: "%{name} marked %{target}'s account as sensitive"
+        silence: "%{name} limited %{target}'s account"
+        suspend: "%{name} suspended %{target}'s account"
+      appeal_approved: Appealed
+      appeal_pending: Appeal pending
     system_checks:
       database_schema_check:
         message_html: There are pending database migrations. Please run them to ensure the application behaves as expected
+      elasticsearch_running_check:
+        message_html: Could not connect to Elasticsearch. Please check that it is running, or disable full-text search
+      elasticsearch_version_check:
+        message_html: 'Incompatible Elasticsearch version: %{value}'
+        version_comparison: Elasticsearch %{running_version} is running while %{required_version} is required
       rules_check:
         action: Manage server rules
         message_html: You haven't defined any server rules.
@@ -719,19 +791,37 @@ en:
       links:
         allow: Allow link
         allow_provider: Allow publisher
+        description_html: These are links that are currently being shared a lot by accounts that your server sees posts from. It can help your users find out what's going on in the world. No links are displayed publicly until you approve the publisher. You can also allow or reject individual links.
         disallow: Disallow link
         disallow_provider: Disallow publisher
+        no_link_selected: No links were changed as none were selected
+        publishers:
+          no_publisher_selected: No publishers were changed as none were selected
         shared_by_over_week:
           one: Shared by one person over the last week
           other: Shared by %{count} people over the last week
         title: Trending links
         usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday
+      only_allowed: Only allowed
       pending_review: Pending review
       preview_card_providers:
         allowed: Links from this publisher can trend
+        description_html: These are domains from which links are often shared on your server. Links will not trend publicly unless the domain of the link is approved. Your approval (or rejection) extends to subdomains.
         rejected: Links from this publisher won't trend
         title: Publishers
       rejected: Rejected
+      statuses:
+        allow: Allow post
+        allow_account: Allow author
+        description_html: These are posts that your server knows about that are currently being shared and favourited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts.
+        disallow: Disallow post
+        disallow_account: Disallow author
+        no_status_selected: No trending posts were changed as none were selected
+        not_discoverable: Author has not opted-in to being discoverable
+        shared_by:
+          one: Shared or favourited one time
+          other: Shared and favourited %{friendly_count} times
+        title: Trending posts
       tags:
         current_score: Current score %{score}
         dashboard:
@@ -740,7 +830,9 @@ en:
           tag_servers_dimension: Top servers
           tag_servers_measure: different servers
           tag_uses_measure: total uses
+        description_html: These are hashtags that are currently appearing in a lot of posts that your server sees. It can help your users find out what people are talking the most about at the moment. No hashtags are displayed publicly until you approve them.
         listable: Can be suggested
+        no_tag_selected: No tags were changed as none were selected
         not_listable: Won't be suggested
         not_trendable: Won't appear under trends
         not_usable: Cannot be used
@@ -754,13 +846,46 @@ en:
           one: Used by one person over the last week
           other: Used by %{count} people over the last week
       title: Trends
+      trending: Trending
     warning_presets:
       add_new: Add new
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
       title: Manage warning presets
+    webhooks:
+      add_new: Add endpoint
+      delete: Delete
+      description_html: A <strong>webhook</strong> enables Mastodon to push <strong>real-time notifications</strong> about chosen events to your own application, so your application can <strong>automatically trigger reactions</strong>.
+      disable: Disable
+      disabled: Disabled
+      edit: Edit endpoint
+      empty: You don't have any webhook endpoints configured yet.
+      enable: Enable
+      enabled: Active
+      enabled_events:
+        one: 1 enabled event
+        other: "%{count} enabled events"
+      events: Events
+      new: New webhook
+      rotate_secret: Rotate secret
+      secret: Signing secret
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: to delete their posts
+        disable: to freeze their account
+        mark_statuses_as_sensitive: to mark their posts as sensitive
+        none: a warning
+        sensitive: to mark their account as sensitive
+        silence: to limit their account
+        suspend: to suspend their account
+      body: "%{target} is appealing a moderation decision by %{action_taken_by} from %{date}, which was %{type}. They wrote:"
+      next_steps: You can approve the appeal to undo the moderation decision, or ignore it.
+      subject: "%{username} is appealing a moderation decision on %{instance}"
     new_pending_account:
       body: The details of the new account are below. You can approve or reject this application.
       subject: New account up for review on %{instance} (%{username})
@@ -768,16 +893,17 @@ en:
       body: "%{reporter} has reported %{target}"
       body_remote: Someone from %{domain} has reported %{target}
       subject: New report for %{instance} (#%{id})
-    new_trending_links:
-      body: The following links are trending today, but their publishers have not been previously reviewed. They will not be displayed publicly unless you approve them. Further notifications from the same publishers will not be generated.
-      no_approved_links: There are currently no approved trending links.
-      requirements: The lowest approved trending link is currently "%{lowest_link_title}" with a score of %{lowest_link_score}.
-      subject: New trending links up for review on %{instance}
-    new_trending_tags:
-      body: 'The following hashtags are trending today, but they have not been previously reviewed. They will not be displayed publicly unless you approve them:'
-      no_approved_tags: There are currently no approved trending hashtags.
-      requirements: 'The lowest approved trending hashtag is currently #%{lowest_tag_name} with a score of %{lowest_tag_score}.'
-      subject: New trending hashtags up for review on %{instance}
+    new_trends:
+      body: 'The following items need a review before they can be displayed publicly:'
+      new_trending_links:
+        title: Trending links
+      new_trending_statuses:
+        title: Trending posts
+      new_trending_tags:
+        no_approved_tags: There are currently no approved trending hashtags.
+        requirements: 'Any of these candidates could surpass the #%{rank} approved trending hashtag, which is currently #%{lowest_tag_name} with a score of %{lowest_tag_score}.'
+        title: Trending hashtags
+      subject: New trends up for review on %{instance}
   aliases:
     add_new: Create alias
     created_msg: Successfully created a new alias. You can now initiate the move from the old account.
@@ -807,16 +933,13 @@ en:
   applications:
     created: Application successfully created
     destroyed: Application successfully deleted
-    invalid_url: The provided URL is invalid
     regenerate_token: Regenerate access token
     token_regenerated: Access token successfully regenerated
     warning: Be very careful with this data. Never share it with anyone!
     your_token: Your access token
   auth:
-    apply_for_account: Request an invite
+    apply_for_account: Request an account
     change_password: Password
-    checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a>
-    checkbox_agreement_without_rules_html: I agree to the <a href="%{terms_path}" target="_blank">terms of service</a>
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     description:
@@ -829,11 +952,13 @@ en:
     invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
     link_to_otp: Enter a two-factor code from your phone or a recovery code
     link_to_webauth: Use your security key device
+    log_in_with: Log in with
     login: Log in
     logout: Logout
     migrate_account: Move to a different account
     migrate_account_html: If you wish to redirect this account to a different one, you can <a href="%{path}">configure it here</a>.
     or_log_in_with: Or log in with
+    privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
     providers:
       cas: CAS
       saml: SAML
@@ -841,20 +966,29 @@ en:
     registration_closed: "%{instance} is not accepting new members"
     resend_confirmation: Resend confirmation instructions
     reset_password: Reset password
+    rules:
+      preamble: These are set and enforced by the %{domain} moderators.
+      title: Some ground rules.
     security: Security
     set_new_password: Set new password
     setup:
       email_below_hint_html: If the below e-mail address is incorrect, you can change it here and receive a new confirmation e-mail.
       email_settings_hint_html: The confirmation e-mail was sent to %{email}. If that e-mail address is not correct, you can change it in account settings.
       title: Setup
+    sign_in:
+      preamble_html: Sign in with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
+      title: Sign in to %{domain}
+    sign_up:
+      preamble: With an account on this Mastodon server, you'll be able to follow any other person on the network, regardless of where their account is hosted.
+      title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
       confirming: Waiting for e-mail confirmation to be completed.
       functional: Your account is fully operational.
       pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
+      view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
-    trouble_logging_in: Trouble logging in?
     use_security_key: Use security key
   authorize_follow:
     already_following: You are already following this account
@@ -912,10 +1046,36 @@ en:
       more_details_html: For more details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Your username will become available again
       username_unavailable: Your username will remain unavailable
-  directories:
-    directory: Profile directory
-    explanation: Discover users based on their interests
-    explore_mastodon: Explore %{title}
+  disputes:
+    strikes:
+      action_taken: Action taken
+      appeal: Appeal
+      appeal_approved: This strike has been successfully appealed and is no longer valid
+      appeal_rejected: The appeal has been rejected
+      appeal_submitted_at: Appeal submitted
+      appealed_msg: Your appeal has been submitted. If it is approved, you will be notified.
+      appeals:
+        submit: Submit appeal
+      approve_appeal: Approve appeal
+      associated_report: Associated report
+      created_at: Dated
+      description_html: These are actions taken against your account and warnings that have been sent to you by the staff of %{instance}.
+      recipient: Addressed to
+      reject_appeal: Reject appeal
+      status: 'Post #%{id}'
+      status_removed: Post already removed from system
+      title: "%{action} from %{date}"
+      title_actions:
+        delete_statuses: Post removal
+        disable: Freezing of account
+        mark_statuses_as_sensitive: Marking of posts as sensitive
+        none: Warning
+        sensitive: Marking of account as sensitive
+        silence: Limitation of account
+        suspend: Suspension of account
+      your_appeal_approved: Your appeal has been approved
+      your_appeal_pending: You have submitted an appeal
+      your_appeal_rejected: Your appeal has been rejected
   domain_validator:
     invalid_domain: is not a valid domain name
   errors:
@@ -964,29 +1124,60 @@ en:
       public: Public timelines
       thread: Conversations
     edit:
+      add_keyword: Add keyword
+      keywords: Keywords
+      statuses: Individual posts
+      statuses_hint_html: This filter applies to select individual posts regardless of whether they match the keywords below. <a href="%{path}">Review or remove posts from the filter</a>.
       title: Edit filter
     errors:
+      deprecated_api_multiple_keywords: These parameters cannot be changed from this application because they apply to more than one filter keyword. Use a more recent application or the web interface.
       invalid_context: None or invalid context supplied
-      invalid_irreversible: Irreversible filtering only works with home or notifications context
     index:
+      contexts: Filters in %{contexts}
       delete: Delete
       empty: You have no filters.
+      expires_in: Expires in %{distance}
+      expires_on: Expires on %{date}
+      keywords:
+        one: "%{count} keyword"
+        other: "%{count} keywords"
+      statuses:
+        one: "%{count} post"
+        other: "%{count} posts"
+      statuses_long:
+        one: "%{count} individual post hidden"
+        other: "%{count} individual posts hidden"
       title: Filters
     new:
+      save: Save new filter
       title: Add new filter
+    statuses:
+      back_to_filter: Back to filter
+      batch:
+        remove: Remove from filter
+      index:
+        hint: This filter applies to select individual posts regardless of other criteria. You can add more posts to this filter from the web interface.
+        title: Filtered posts
   footer:
-    developers: Developers
-    more: More…
-    resources: Resources
     trending_now: Trending now
   generic:
     all: All
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> item on this page is selected."
+      other: All <strong>%{count}</strong> items on this page are selected.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> item matching your search is selected."
+      other: All <strong>%{count}</strong> items matching your search are selected.
     changes_saved_msg: Changes successfully saved!
     copy: Copy
     delete: Delete
+    deselect: Deselect all
     none: None
     order_by: Order by
     save_changes: Save changes
+    select_all_matching_items:
+      one: Select %{count} item matching your search.
+      other: Select all %{count} items matching your search.
     today: today
     validation_errors:
       one: Something isn't quite right yet! Please review the error below
@@ -995,6 +1186,7 @@ en:
     invalid_markup: 'contains invalid HTML markup: %{error}'
   imports:
     errors:
+      invalid_csv_file: 'Invalid CSV file. Error: %{error}'
       over_rows_processing_limit: contains more than %{count} rows
     modes:
       merge: Merge
@@ -1010,7 +1202,6 @@ en:
       following: Following list
       muting: Muting list
     upload: Upload
-  in_memoriam_html: In Memoriam.
   invites:
     delete: Deactivate
     expired: Expired
@@ -1089,18 +1280,14 @@ en:
     carry_blocks_over_text: This user moved from %{acct}, which you had blocked.
     carry_mutes_over_text: This user moved from %{acct}, which you had muted.
     copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
+  navigation:
+    toggle_menu: Toggle menu
   notification_mailer:
-    digest:
-      action: View all notifications
-      body: Here is a brief summary of the messages you missed since your last visit on %{since}
-      mention: "%{name} mentioned you in:"
-      new_followers_summary:
-        one: Also, you have acquired one new follower while being away! Yay!
-        other: Also, you have acquired %{count} new followers while being away! Amazing!
-      subject:
-        one: "1 new notification since your last visit \U0001F418"
-        other: "%{count} new notifications since your last visit \U0001F418"
-      title: In your absence...
+    admin:
+      report:
+        subject: "%{name} submitted a report"
+      sign_up:
+        subject: "%{name} signed up"
     favourite:
       body: 'Your post was favourited by %{name}:'
       subject: "%{name} favourited your post"
@@ -1127,6 +1314,8 @@ en:
       title: New boost
     status:
       subject: "%{name} just posted"
+    update:
+      subject: "%{name} edited a post"
   notifications:
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
@@ -1171,6 +1360,8 @@ en:
     other: Other
     posting_defaults: Posting defaults
     public_timelines: Public timelines
+  privacy_policy:
+    title: Privacy Policy
   reactions:
     errors:
       limit_reached: Limit of different reactions reached
@@ -1193,22 +1384,15 @@ en:
     remove_selected_follows: Unfollow selected users
     status: Account status
   remote_follow:
-    acct: Enter your username@domain you want to act from
     missing_resource: Could not find the required redirect URL for your account
-    no_account_html: Don't have an account? You can <a href='%{sign_up_path}' target='_blank'>sign up here</a>
-    proceed: Proceed to follow
-    prompt: 'You are going to follow:'
-    reason_html: "<strong>Why is this step necessary?</strong> <code>%{instance}</code> might not be the server where you are registered, so we need to redirect you to your home server first."
-  remote_interaction:
-    favourite:
-      proceed: Proceed to favourite
-      prompt: 'You want to favourite this post:'
-    reblog:
-      proceed: Proceed to boost
-      prompt: 'You want to boost this post:'
-    reply:
-      proceed: Proceed to reply
-      prompt: 'You want to reply to this post:'
+  reports:
+    errors:
+      invalid_rules: does not reference valid rules
+  rss:
+    content_warning: 'Content warning:'
+    descriptions:
+      account: Public posts from @%{acct}
+      tag: 'Public posts tagged #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
     over_total_limit: You have exceeded the limit of %{limit} scheduled posts
@@ -1218,7 +1402,7 @@ en:
     browser: Browser
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1232,7 +1416,7 @@ en:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Current session
     description: "%{browser} on %{platform}"
@@ -1241,8 +1425,8 @@ en:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1275,6 +1459,7 @@ en:
     profile: Profile
     relationships: Follows and followers
     statuses_cleanup: Automated post deletion
+    strikes: Moderation strikes
     two_factor_authentication: Two-factor Auth
     webauthn_authentication: Security keys
   statuses:
@@ -1291,18 +1476,19 @@ en:
         other: "%{count} videos"
     boosted_from_html: Boosted from %{acct_link}
     content_warning: 'Content warning: %{warning}'
+    default_language: Same as interface language
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'
       other: 'contained the disallowed hashtags: %{tags}'
+    edited_at_html: Edited %{date}
     errors:
       in_reply_not_found: The post you are trying to reply to does not appear to exist.
-    language_detection: Automatically detect language
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors:
+      direct: Posts that are only visible to mentioned users cannot be pinned
       limit: You have already pinned the maximum number of posts
       ownership: Someone else's post cannot be pinned
-      private: Non-public posts cannot be pinned
       reblog: A boost cannot be pinned
     poll:
       total_people:
@@ -1353,6 +1539,7 @@ en:
       '2629746': 1 month
       '31556952': 1 year
       '5259492': 2 months
+      '604800': 1 week
       '63113904': 2 years
       '7889238': 3 months
     min_age_label: Age threshold
@@ -1364,91 +1551,11 @@ en:
     pinned: Pinned post
     reblogged: boosted
     sensitive_content: Sensitive content
+  strikes:
+    errors:
+      too_late: It is too late to appeal this strike
   tags:
     does_not_match_previous_name: does not match the previous name
-  terms:
-    body_html: |
-      <h2>Privacy Policy</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-        <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-        <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-        <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-        <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-        <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-        <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-        <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
@@ -1457,6 +1564,7 @@ en:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Add
     disable: Disable 2FA
@@ -1473,63 +1581,73 @@ en:
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
     webauthn: Security keys
   user_mailer:
+    appeal_approved:
+      action: Go to your account
+      explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
+      subject: Your appeal from %{date} has been approved
+      title: Appeal approved
+    appeal_rejected:
+      explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been rejected.
+      subject: Your appeal from %{date} has been rejected
+      title: Appeal rejected
     backup_ready:
       explanation: You requested a full backup of your Mastodon account. It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
-    sign_in_token:
-      details: 'Here are details of the attempt:'
-      explanation: 'We detected an attempt to sign in to your account from an unrecognized IP address. If this is you, please enter the security code below on the sign in challenge page:'
-      further_actions: 'If this wasn''t you, please change your password and enable two-factor authentication on your account. You can do so here:'
-      subject: Please confirm attempted sign in
-      title: Sign in attempt
+    suspicious_sign_in:
+      change_password: change your password
+      details: 'Here are details of the sign-in:'
+      explanation: We've detected a sign-in to your account from a new IP address.
+      further_actions_html: If this wasn't you, we recommend that you %{action} immediately and enable two-factor authentication to keep your account secure.
+      subject: Your account has been accessed from a new IP address
+      title: A new sign-in
     warning:
+      appeal: Submit an appeal
+      appeal_description: If you believe this is an error, you can submit an appeal to the staff of %{instance}.
+      categories:
+        spam: Spam
+        violation: Content violates the following community guidelines
       explanation:
-        disable: You can no longer login to your account or use it in any other way, but your profile and other data remains intact.
-        sensitive: Your uploaded media files and linked media will be treated as sensitive.
-        silence: You can still use your account but only people who are already following you will see your posts on this server, and you may be excluded from various public listings. However, others may still manually follow you.
-        suspend: You can no longer use your account, and your profile and other data are no longer accessible. You can still login to request a backup of your data until the data is fully removed, but we will retain some data to prevent you from evading the suspension.
-      get_in_touch: You can reply to this e-mail to get in touch with the staff of %{instance}.
-      review_server_policies: Review server policies
-      statuses: 'Specifically, for:'
+        delete_statuses: Some of your posts have been found to violate one or more community guidelines and have been subsequently removed by the moderators of %{instance}.
+        disable: You can no longer use your account, but your profile and other data remains intact. You can request a backup of your data, change account settings or delete your account.
+        mark_statuses_as_sensitive: Some of your posts have been marked as sensitive by the moderators of %{instance}. This means that people will need to tap the media in the posts before a preview is displayed. You can mark media as sensitive yourself when posting in the future.
+        sensitive: From now on, all your uploaded media files will be marked as sensitive and hidden behind a click-through warning.
+        silence: You can still use your account but only people who are already following you will see your posts on this server, and you may be excluded from various discovery features. However, others may still manually follow you.
+        suspend: You can no longer use your account, and your profile and other data are no longer accessible. You can still login to request a backup of your data until the data is fully removed in about 30 days, but we will retain some basic data to prevent you from evading the suspension.
+      reason: 'Reason:'
+      statuses: 'Posts cited:'
       subject:
+        delete_statuses: Your posts on %{acct} have been removed
         disable: Your account %{acct} has been frozen
+        mark_statuses_as_sensitive: Your posts on %{acct} have been marked as sensitive
         none: Warning for %{acct}
-        sensitive: Your account %{acct} posting media has been marked as sensitive
+        sensitive: Your posts on %{acct} will be marked as sensitive from now on
         silence: Your account %{acct} has been limited
         suspend: Your account %{acct} has been suspended
       title:
+        delete_statuses: Posts removed
         disable: Account frozen
+        mark_statuses_as_sensitive: Posts marked as sensitive
         none: Warning
-        sensitive: Your media has been marked as sensitive
+        sensitive: Account marked as sensitive
         silence: Account limited
         suspend: Account suspended
     welcome:
       edit_profile_action: Setup profile
-      edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
+      edit_profile_step: You can customize your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
       explanation: Here are some tips to get you started
       final_action: Start posting
-      final_step: 'Start posting! Even without followers your public posts may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.'
+      final_step: 'Start posting! Even without followers, your public posts may be seen by others, for example on the local timeline or in hashtags. You may want to introduce yourself on the #introductions hashtag.'
       full_handle: Your full handle
       full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
-      review_preferences_action: Change preferences
-      review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay.
       subject: Welcome to Mastodon
-      tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbours are subscribed to, so it's not complete.
-      tip_following: You follow your server's admin(s) by default. To find more interesting people, check the local and federated timelines.
-      tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!
-      tip_mobile_webapp: If your mobile browser offers you to add Mastodon to your homescreen, you can receive push notifications. It acts like a native app in many ways!
-      tips: Tips
       title: Welcome aboard, %{name}!
   users:
     follow_limit_reached: You cannot follow more than %{limit} people
-    generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance
     invalid_otp_token: Invalid two-factor code
-    invalid_sign_in_token: Invalid security code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
     seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Signed in as:'
-    suspicious_sign_in_confirmation: You appear to not have logged in from this device before, so we're sending a security code to your e-mail address to confirm that it's you.
   verification:
     explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
     verification: Verification
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index d3461474b..2cba40da0 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -220,7 +220,6 @@ en_GB:
       emoji: Emoji
       enable: Enable
       enabled_msg: Successfully enabled that emoji
-      image_hint: PNG up to 50KB
       listed: Listed
       new:
         title: Add new custom emoji
@@ -701,8 +700,8 @@ en_GB:
         one: Also, you have acquired one new follower while being away! Yay!
         other: Also, you have acquired %{count} new followers while being away! Amazing!
       subject:
-        one: "1 new notification since your last visit \U0001F418"
-        other: "%{count} new notifications since your last visit \U0001F418"
+        one: "1 new notification since your last visit 🐘"
+        other: "%{count} new notifications since your last visit 🐘"
       title: In your absence...
     favourite:
       body: 'Your status was favourited by %{name}:'
@@ -986,7 +985,7 @@ en_GB:
     enabled: Two-factor authentication is enabled
     enabled_success: Two-factor authentication successfully enabled
     generate_recovery_codes: Generate recovery codes
-    instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar TOTP app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
+    instructions_html: "<strong>Scan this QR code into Google Authenticator or a similar TOTP app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
     lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
     manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
     recovery_codes: Backup recovery codes
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 7e98f328c..3092c55e2 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1,123 +1,75 @@
 ---
 eo:
   about:
-    about_hashtag_html: Ĉi tiuj estas la publikaj mesaĝoj markitaj per <strong>#%{hashtag}</strong>. Vi povas interagi kun ili se vi havas konton ie ajn en la fediverse.
-    about_mastodon_html: Mastodon estas socia reto bazita sur malfermitaj retaj protokoloj kaj sur libera malfermitkoda programo. Ĝi estas sencentra kiel retmesaĝoj.
-    about_this: Pri
-    active_count_after: aktiva
-    active_footnote: Monate Aktivaj Uzantoj (MAU)
-    administered_by: 'Administrata de:'
-    api: API
-    apps: Poŝtelefonaj aplikaĵoj
-    apps_platforms: Uzu Mastodon ĉe iOS, Android kaj aliajn platformojn
-    browse_directory: Esplori profilujo kaj filtri per interesoj
-    browse_local_posts: Vidi vivantan fluon de publikaj mesaĝoj al Mastodon
-    browse_public_posts: Vidi vivantan fluon de publikaj mesaĝoj al Mastodon
-    contact: Kontakti
+    about_mastodon_html: 'La socia retejo de la estonteco: sen reklamo, sen kompania observado, etika desegno, kaj malcentrigo! Regu viajn datumojn per Mastodon!'
     contact_missing: Ne elektita
     contact_unavailable: Ne disponebla
-    discover_users: Malkovri uzantojn
-    documentation: Dokumentado
-    federation_hint_html: Per konto ĉe %{instance}, vi povos sekvi homojn ĉe iu ajn Mastodon nodo kaj preter.
-    get_apps: Provu telefonan aplikaĵon
     hosted_on: "%{domain} estas nodo de Mastodon"
-    instance_actor_flash: |
-      Ĉi tiu konto estas virtuala ulo uzata por reprezenti la servilon mem kaj ne iun apartan uzanton.
-      Ĝi estas uzata por frataraj celoj kaj ĝi ne devus esti blokita krom se vi volas bloki la tutan servilon, tiuokaze vi devus uzi domajnan blokadon.
-    learn_more: Lerni pli
-    privacy_policy: Privateca politiko
-    rules: Reguloj de la servilo
-    see_whats_happening: Vidi kio okazas
-    server_stats: Servo statuso
-    source_code: Fontkodo
-    status_count_after:
-      one: mesaĝo
-      other: mesaĝoj
-    status_count_before: Kie skribiĝis
-    tagline: Sekvi amikojn kaj trovi iujn novajn
-    terms: Uzkondiĉoj
-    unavailable_content: Kontrolitaj serviloj
-    unavailable_content_description:
-      domain: Servilo
-      reason: 'Kialo:'
-      rejecting_media_title: Filtritaj aŭdovidaĵoj
-      silenced_title: Silentigitaj serviloj
-      suspended_title: Haltigitaj serviloj
-    user_count_after:
-      one: uzanto
-      other: uzantoj
-    user_count_before: Hejmo de
-    what_is_mastodon: Kio estas Mastodon?
+    title: Pri
   accounts:
-    choices_html: 'Proponoj de %{name}:'
     follow: Sekvi
     followers:
       one: Sekvanto
       other: Sekvantoj
     following: Sekvatoj
-    joined: Aliĝis je %{date}
+    instance_actor_flash: Ĉi tiu konto estas virtuala agento uzata por reprezenti la servilon mem kaj neniun individuan uzanton. Ĝi estas uzata por federaciaj celoj kaj ĝi devas ne esti suspendita.
     last_active: laste aktiva
     link_verified_on: Proprieto de ĉi tiu ligilo estis kontrolita je %{date}
-    media: Aŭdovidaĵoj
-    moved_html: "%{name} moviĝis al %{new_profile_link}:"
-    network_hidden: Tiu informo ne estas disponebla
-    never_active: Neniam
     nothing_here: Estas nenio ĉi tie!
-    people_followed_by: Sekvatoj de %{name}
-    people_who_follow: Sekvantoj de %{name}
     pin_errors:
       following: Vi devas sekvi la homon, kiun vi volas proponi
     posts:
-      one: Mesaĝo
+      one: Afiŝo
       other: Mesaĝoj
-    posts_tab_heading: Mesaĝoj
-    posts_with_replies: Mesaĝoj kaj respondoj
-    roles:
-      admin: Administranto
-      bot: Roboto
-      group: Grupo
-      moderator: Kontrolanto
-    unavailable: Profilo ne disponebla
-    unfollow: Ne plu sekvi
+    posts_tab_heading: Afiŝoj
   admin:
     account_actions:
       action: Plenumi agon
       title: Plenumi kontrolan agon al %{acct}
     account_moderation_notes:
       create: Lasi noton
-      created_msg: Kontrola noto sukcese kreita!
-      delete: Forigi
-      destroyed_msg: Kontrola noto sukcese detruita!
+      created_msg: Noto de moderigado sukcese kreita!
+      destroyed_msg: Noto de moderigado sukcese detruita!
     accounts:
       add_email_domain_block: Bloki retadresan domajnon
       approve: Aprobi
-      approve_all: Aprobi ĉiujn
+      approved_msg: Sukcese aprobis aliĝ-peton de %{username}
       are_you_sure: Ĉu vi certas?
       avatar: Profilbildo
       by_domain: Domajno
       change_email:
-        changed_msg: Konta retadreso sukcese ŝanĝita!
+        changed_msg: Retpoŝta adreso estis sukcese ŝanĝita!
         current_email: Nuna retadreso
         label: Ŝanĝi retadreson
         new_email: Nova retadreso
         submit: Ŝanĝi retadreson
         title: Ŝanĝi retadreson por %{username}
+      change_role:
+        changed_msg: Rolo estis sukcese ŝanĝita!
+        label: Ŝanĝi rolon
+        no_role: Neniu rolo
+        title: Ŝanĝi rolon por %{username}
       confirm: Konfirmi
       confirmed: Konfirmita
       confirming: Konfirmante
+      custom: Aliaj agordoj
       delete: Forigi datumojn
       deleted: Forigita
       demote: Degradi
-      disable: Malebligi
-      disable_two_factor_authentication: Malebligi 2FA
-      disabled: Malebligita
+      destroyed_msg: Datumoj de %{username} nun enviciĝis por esti forigita baldaǔ
+      disable: Frostigi
+      disable_sign_in_token_auth: Malŝalti aŭtentigon de retpoŝta ĵetono
+      disable_two_factor_authentication: Malŝalti 2FA-n
+      disabled: Frostigita
       display_name: Montrata nomo
       domain: Domajno
       edit: Redakti
-      email: Retadreso
-      email_status: Retadreso Stato
-      enable: Ebligi
+      email: Retpoŝto
+      email_status: Stato de retpoŝto
+      enable: Malfrostigi
+      enable_sign_in_token_auth: Ŝalti aŭtentigon de retpoŝta ĵetono por uzanto
       enabled: Ebligita
+      enabled_msg: Sukcese malfrostigis konton de %{username}
       followers: Sekvantoj
       follows: Sekvatoj
       header: Kapa bildo
@@ -127,7 +79,7 @@ eo:
       ip: IP
       joined: Aliĝis
       location:
-        all: Ĉio
+        all: Ĉiuj
         local: Lokaj
         remote: Foraj
         title: Loko
@@ -135,148 +87,207 @@ eo:
       media_attachments: Ligitaj aŭdovidaĵoj
       memorialize: Ŝanĝi al memoro
       memorialized: Memorita
+      memorialized_msg: Sukcese ŝanĝis %{username} al memorkonto
       moderation:
-        active: Aktiva
+        active: Aktivaj
         all: Ĉio
         pending: Pritraktata
-        silenced: Silentigita
-        suspended: Haltigita
-        title: Kontrolado
-      moderation_notes: Kontrolaj notoj
-      most_recent_activity: Lasta ago
+        silenced: Limigita
+        suspended: Suspendita
+        title: Moderigado
+      moderation_notes: Notoj de moderigado
+      most_recent_activity: Lastaj afiŝoj
       most_recent_ip: Lasta IP
       no_account_selected: Neniu konto estis ŝanĝita ĉar neniu estis selektita
       no_limits_imposed: Neniu limito trudita
+      no_role_assigned: Sen rolo
       not_subscribed: Ne abonita
       pending: Pritraktata recenzo
-      perform_full_suspension: Haltigi
+      perform_full_suspension: Suspendi
+      previous_strikes: Antaǔaj admonoj
+      previous_strikes_description_html:
+        one: Ĉi tiu konto havas <strong>unu</strong> admonon.
+        other: Ĉi tiu konto havas <strong>%{count}</strong> admonojn.
       promote: Plirangigi
       protocol: Protokolo
       public: Publika
       push_subscription_expires: Eksvalidiĝo de la abono al PuSH
       redownload: Aktualigi profilon
+      redownloaded_msg: Sukcese refreŝis profilon de %{username} de origino
       reject: Malakcepti
-      reject_all: Malaprobi ĉiujn
+      rejected_msg: Sukcese malaprobis aliĝ-peton de %{username}
       remove_avatar: Forigi profilbildon
       remove_header: Forigi kapan bildon
+      removed_avatar_msg: La profilbildo de %{username} estas sukcese forigita
+      removed_header_msg: Sukcese forigis kapbildon de %{username}
       resend_confirmation:
         already_confirmed: Ĉi tiu uzanto jam estas konfirmita
-        send: Resendi konfirman retmesaĝon
-        success: Konfirma retmesaĝo sukcese sendita!
+        send: Resendi konfirman retpoŝton
+        success: Konfirma retpoŝto estis sukcese sendita!
       reset: Restarigi
       reset_password: Restarigi pasvorton
       resubscribe: Reaboni
-      role: Permesoj
-      roles:
-        admin: Administranto
-        moderator: Kontrolanto
-        staff: Teamo
-        user: Uzanto
+      role: Rolo
       search: Serĉi
       search_same_email_domain: Aliaj uzantoj kun la sama retpoŝta domajno
       search_same_ip: Aliaj uzantoj kun la sama IP
       security_measures:
         only_password: Nur pasvorto
         password_and_2fa: Pasvorto kaj 2FA
-        password_and_sign_in_token: Pasvorto kaj retpoŝta ĵetono
       sensitive: Tikla
       sensitized: markita tikla
       shared_inbox_url: URL de kunhavigita leterkesto
       show:
-        created_reports: Kreitaj signaloj
-        targeted_reports: Signalitaj de aliaj
-      silence: Kaŝi
+        created_reports: Faritaj raportoj
+        targeted_reports: Raporitaj de la aliaj
+      silence: Limigi
       silenced: Silentigita
-      statuses: Mesaĝoj
+      statuses: Afiŝoj
+      strikes: Antaǔaj admonoj
       subscribe: Aboni
-      suspended: Haltigita
-      time_in_queue: Atendado en atendovico %{time}
+      suspend: Haltigu
+      suspended: Suspendita
+      suspension_irreversible: La datumoj de ĉi tiu konto neinverseble forigitas.
+      suspension_reversible_hint_html: La konto estas suspendita, kaj la datumoj estos komplete forigitaj je %{date}. Ĝis tiam, la konto povas esti malsuspendita sen flankefiko. Se vi deziras tuj forigi ĉiujn datumojn de la konto, vi povas fari tion sube.
       title: Kontoj
-      unconfirmed_email: Nekonfirmita retadreso
+      unblock_email: Malbloki retpoŝtadresojn
+      unblocked_email_msg: Sukcese malblokis la retpoŝtadreson de %{username}
+      unconfirmed_email: Nekonfirmita retpoŝto
       undo_sensitized: Malfari sentema
       undo_silenced: Malfari kaŝon
       undo_suspension: Malfari haltigon
+      unsilenced_msg: Sukcese senlimigis la konton de %{username}
       unsubscribe: Malaboni
+      unsuspended_msg: La konto de %{username} estas sukcese malsuspendita
       username: Uzantnomo
       view_domain: Vidi la resumon de la domajno
       warn: Averti
       web: Reto
-      whitelisted: En la blanka listo
+      whitelisted: Permesita por federacio
     action_logs:
       action_types:
+        approve_appeal: Aprobis Apelacion
+        approve_user: Aprobi Uzanton
         assigned_to_self_report: Atribui Raporton
-        change_email_user: Ŝanĝi retadreson de uzanto
-        confirm_user: Konfermi uzanto
-        create_account_warning: Krei Averton
+        change_email_user: Ŝanĝi retpoŝton de uzanto
+        change_role_user: Ŝanĝi Rolon de Uzanton
+        confirm_user: Konfirmi uzanton
+        create_account_warning: Krei averton
         create_announcement: Krei Anoncon
-        create_custom_emoji: Krei Propran emoĝion
+        create_canonical_email_block: Krei Blokadon de Retpoŝto
+        create_custom_emoji: Krei Propran Emoĝion
         create_domain_allow: Krei Domajnan Permeson
-        create_domain_block: Krei blokadon de domajno
-        create_email_domain_block: Krei blokadon de retpoŝta domajno
+        create_domain_block: Krei Blokadon De Domajno
+        create_email_domain_block: Krei Blokadon De Retpoŝta Domajno
         create_ip_block: Krei IP-regulon
-        demote_user: Malpromocii uzanton
+        create_unavailable_domain: Krei nehaveblan domajnon
+        create_user_role: Krei Rolon
+        demote_user: Malpromocii Uzanton
         destroy_announcement: Forigi Anoncon
-        destroy_custom_emoji: Forigi Propran emoĝion
+        destroy_canonical_email_block: Forigi blokadon de retpoŝta adreso
+        destroy_custom_emoji: Forigi Propran Emoĝion
         destroy_domain_allow: Forigi Domajnan Permeson
         destroy_domain_block: Forigi blokadon de domajno
         destroy_email_domain_block: Forigi blokadon de retpoŝta domajno
+        destroy_instance: Forigi domajnon
         destroy_ip_block: Forigi IP-regulon
         destroy_status: Forigi mesaĝon
+        destroy_unavailable_domain: Forigi Nehaveblan Domajnon
+        destroy_user_role: Detrui Rolon
         disable_2fa_user: Malebligi 2FA
-        disable_custom_emoji: Malebligi Propran Emoĝion
-        disable_user: Malebligi uzanton
+        disable_custom_emoji: Malebligi proprajn emoĝiojn
+        disable_sign_in_token_auth_user: Malŝalti aŭtentigon de retpoŝta ĵetono por la uzanto
+        disable_user: Neebligi la uzanton
         enable_custom_emoji: Ebligi Propran Emoĝion
+        enable_sign_in_token_auth_user: Ŝalti aŭtentigon de retpoŝta ĵetono por la uzanto
         enable_user: Ebligi uzanton
         memorialize_account: Memorigu Konton
         promote_user: Promocii Uzanton
-        remove_avatar_user: Forigi profilbildon
+        reject_appeal: Malaprobi Apelacion
+        reject_user: Malakcepti Uzanton
+        remove_avatar_user: Forigi la profilbildon
         reopen_report: Remalfermi signalon
+        resend_user: Resendi konfirman retmesaĝon
         reset_password_user: Restarigi pasvorton
         resolve_report: Solvitaj reporto
         sensitive_account: Marki tikla la aŭdovidaĵojn de via konto
         silence_account: Silentigi konton
-        suspend_account: Haltigi konton
+        suspend_account: Suspendi la konton
         unassigned_report: Malatribui Raporton
+        unblock_email_account: Malbloki retpoŝtadreson
         unsensitive_account: Malmarku la amaskomunikilojn en via konto kiel sentemaj
         unsilence_account: Malsilentigi konton
-        unsuspend_account: Malhaltigi konton
+        unsuspend_account: Malsuspendi la konton
         update_announcement: Ĝisdatigi anoncon
         update_custom_emoji: Ĝisdatigi proprajn emoĝiojn
         update_domain_block: Ĝigdatigi domajnan blokadon
+        update_ip_block: Krei IP-regulon
         update_status: Ĝisdatigi staton
+        update_user_role: Ĝisdatigi Rolon
       actions:
+        approve_appeal_html: "%{name} aprobis kontroldecidapelacion de %{target}"
+        approve_user_html: "%{name} aprobis registriĝon de %{target}"
         assigned_to_self_report_html: "%{name} asignis signalon %{target} al si mem"
         change_email_user_html: "%{name} ŝanĝis retadreson de uzanto %{target}"
+        change_role_user_html: "%{name} ŝanĝis rolon de %{target}"
         confirm_user_html: "%{name} konfirmis retadreson de uzanto %{target}"
         create_account_warning_html: "%{name} sendis averton al %{target}"
         create_announcement_html: "%{name} kreis novan anoncon %{target}"
+        create_canonical_email_block_html: "%{name} blokis retpoŝtadreson per krado %{target}"
         create_custom_emoji_html: "%{name} alŝutis novan emoĝion %{target}"
         create_domain_allow_html: "%{name} aldonis domajnon %{target} al la blanka listo"
         create_domain_block_html: "%{name} blokis domajnon %{target}"
         create_email_domain_block_html: "%{name} blokis retpoŝtan domajnon %{target}"
         create_ip_block_html: "%{name} kreis regulon por IP %{target}"
+        create_unavailable_domain_html: "%{name} ĉesis sendon al domajno %{target}"
+        create_user_role_html: "%{name} kreis rolon de %{target}"
         demote_user_html: "%{name} degradis uzanton %{target}"
         destroy_announcement_html: "%{name} forigis anoncon %{target}"
-        destroy_custom_emoji_html: "%{name} neniigis la emoĝion %{target}"
+        destroy_canonical_email_block_html: "%{name} malblokis retpoŝtadreson per krado %{target}"
+        destroy_custom_emoji_html: "%{name} forigis emoĝion %{target}"
         destroy_domain_allow_html: "%{name} forigis domajnon %{target} el la blanka listo"
         destroy_domain_block_html: "%{name} malblokis domajnon %{target}"
         destroy_email_domain_block_html: "%{name} malblokis retpoŝtan domajnon %{target}"
+        destroy_instance_html: "%{name} forigis domajnon %{target}"
         destroy_ip_block_html: "%{name} forigis regulon por IP %{target}"
         destroy_status_html: "%{name} forigis mesaĝojn de %{target}"
+        destroy_unavailable_domain_html: "%{name} daurigis sendon al domajno %{target}"
+        destroy_user_role_html: "%{name} forigis rolon de %{target}"
         disable_2fa_user_html: "%{name} malebligis dufaktoran aŭtentigon por uzanto %{target}"
-        disable_custom_emoji_html: "%{name} malebligis emoĝion %{target}"
+        disable_custom_emoji_html: "%{name} malebligis la emoĝion %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} malŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         disable_user_html: "%{name} malebligis ensaluton por uzanto %{target}"
-        enable_custom_emoji_html: "%{name} ebligis emoĝion %{target}"
+        enable_custom_emoji_html: "%{name} ebligis la emoĝion %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         enable_user_html: "%{name} ebligis ensaluton por uzanto %{target}"
         memorialize_account_html: "%{name} ŝanĝis la konton de %{target} al memora paĝo"
         promote_user_html: "%{name} plirangigis uzanton %{target}"
+        reject_appeal_html: "%{name} malakceptis kontroldecidapelacion de %{target}"
+        reject_user_html: "%{name} malakceptis registriĝon de %{target}"
         remove_avatar_user_html: "%{name} forigis profilbildon de %{target}"
         reopen_report_html: "%{name} remalfermis signalon %{target}"
-      deleted_status: "(forigita mesaĝo)"
-      empty: Neniu protokolo trovita.
+        resend_user_html: "%{name} resendis konfirman retmesaĝon por %{target}"
+        reset_password_user_html: "%{name} restarigis la pasvorton de la uzanto %{target}"
+        resolve_report_html: "%{name} solvis raporton %{target}"
+        sensitive_account_html: "%{name} markis audovidaĵojn de %{target} kiel sentemaj"
+        silence_account_html: "%{name} limigis la konton de %{target}"
+        suspend_account_html: "%{name} suspendis la konton de %{target}"
+        unassigned_report_html: "%{name} malasignis raporton %{target}"
+        unblock_email_account_html: "%{name} malblokis retpoŝtoadreson de %{target}"
+        unsensitive_account_html: "%{name} malmarkis audovidaĵojn de %{target} kiel sentemaj"
+        unsilence_account_html: "%{name} malfaris limon de konto de %{target}"
+        unsuspend_account_html: "%{name} malsuspendis la konton de %{target}"
+        update_announcement_html: "%{name} ĝisdatigis anoncon %{target}"
+        update_custom_emoji_html: "%{name} ĝisdatigis emoĝion %{target}"
+        update_domain_block_html: "%{name} ĝisdatigis domajnblokon por %{target}"
+        update_ip_block_html: "%{name} ŝanĝis regulon por IP %{target}"
+        update_status_html: "%{name} ĝisdatigis mesaĝon de %{target}"
+        update_user_role_html: "%{name} ŝanĝis rolon %{target}"
+      deleted_account: forigita konto
+      empty: Neniu ĵurnalo trovita.
       filter_by_action: Filtri per ago
       filter_by_user: Filtri per uzanto
-      title: Kontrola protokolo
+      title: Ĵurnalo de revizo
     announcements:
       destroyed_msg: Anonco sukcese forigita!
       edit:
@@ -311,11 +322,12 @@ eo:
       enable: Ebligi
       enabled: Ebligita
       enabled_msg: Tiu emoĝio estis sukcese ebligita
-      image_hint: PNG ĝis 50KB
+      image_hint: PNG aŭ GIF malpli granda ol %{size}
       list: Listo
       listed: Listigita
       new:
         title: Aldoni novan propran emoĝion
+      no_emoji_selected: Neniuj emoĝioj ŝanĝitas ĉar nenio elektitas
       not_permitted: Vi ne rajtas plenumi ĉi tiun agon
       overwrite: Anstataŭigi
       shortcode: Mallonga kodo
@@ -328,13 +340,41 @@ eo:
       updated_msg: Emoĝio sukcese ĝisdatigita!
       upload: Alŝuti
     dashboard:
+      active_users: aktivaj uzantoj
+      interactions: interago
+      media_storage: Konservo de aŭdovidaĵoj
+      new_users: novaj uzantoj
+      opened_reports: raportoj malfermitaj
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> restanta apelacio"
+        other: "<strong>%{count}</strong> restantaj aplecioj"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> restanta raporto"
+        other: "<strong>%{count}</strong> restantaj raportoj"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> pritraktota kradvorto"
+        other: "<strong>%{count}</strong> pritraktotaj kradvortoj"
+      pending_users_html:
+        one: "<strong>%{count}</strong> restanta uzanto"
+        other: "<strong>%{count}</strong> restantaj uzantoj"
+      resolved_reports: raportoj solvitaj
       software: Programo
+      sources: Fontoj de konto-kreado
       space: Memorspaca uzado
-      title: Kontrolpanelo
+      title: Panelo
+      top_languages: Plej aktivaj lingvoj
+      top_servers: Plej aktivaj serviloj
+      website: Retejo
+    disputes:
+      appeals:
+        empty: Neniuj apelacioj estas trovitaj.
+        title: Apelacioj
     domain_allows:
       add_new: Aldoni domajnon al la blanka listo
       created_msg: Domajno estis sukcese aldonita al la blanka listo
       destroyed_msg: Domajno estis forigita el la blanka listo
+      export: Eksporti
+      import: Importi
       undo: Forigi el la blanka listo
     domain_blocks:
       add_new: Aldoni novan blokadon de domajno
@@ -342,66 +382,122 @@ eo:
       destroyed_msg: Domajna blokado malfarita
       domain: Domajno
       edit: Redakti domajna blokado
+      existing_domain_block: Vi jam metis pli striktajn limojn al %{name}.
       existing_domain_block_html: Vi jam trudis pli striktajn limojn al %{name}, vi devas <a href="%{unblock_url}">malbloki ĝin</a> unue.
+      export: Eksporti
+      import: Importi
       new:
         create: Krei blokadon
         hint: La domajna blokado ne evitigos kreadon de novaj kontoj en la datumbazo, sed aplikos specifajn kontrolajn agojn sur ĉi tiujn kontojn aŭtomate kaj retroaktive.
         severity:
-          desc_html: "<strong>Kaŝi</strong> igos la mesaĝojn de la konto nevideblaj al tiuj, kiuj ne sekvas tiun. <strong>Haltigi</strong> forigos ĉiujn enhavojn, aŭdovidaĵojn kaj datumojn de la konto. Uzu <strong>Nenio</strong> se vi simple volas malakcepti aŭdovidaĵojn."
+          desc_html: "<strong>Limigi</strong> kaŝos la afiŝojn de kontoj ĉe ĉi tiu domajno al tiuj, kiuj ne sekvas tiujn. <strong>Haltigi</strong> forigos ĉiujn enhavojn, aŭdovidaĵojn kaj datumojn de la konto. Uzu <strong>Nenio</strong> se vi simple volas malakcepti aŭdovidaĵojn."
           noop: Nenio
-          silence: Kaŝi
-          suspend: Haltigi
+          silence: Limigi
+          suspend: Suspendi
         title: Nova domajna blokado
+      no_domain_block_selected: Neniuj domajnblokoj ŝanĝitas ĉar nenio elektitas
+      not_permitted: Vi ne rajtas fari ĉi tiun agon
       obfuscate: Malklara domajna nomo
+      obfuscate_hint: Parte kaŝi la domajnnomo en la listo se ĝia reklamo ebligitas
       private_comment: Privata komento
+      private_comment_hint: Komento pri ĉi tiu domajnlimo por interna uzo de kontrolantoj.
       public_comment: Publika komento
+      public_comment_hint: Komento pri ĉi tiu domajnlimo por publiko, se ĝia reklamo ebligitas.
       reject_media: Malakcepti aŭdovidajn dosierojn
       reject_media_hint: Forigas aŭdovidaĵojn loke konservitajn kaj rifuzas alŝuti ajnan estonte. Ne koncernas haltigojn
       reject_reports: Malakcepti signalojn
       reject_reports_hint: Ignori ĉiujn signalojn el tiu domajno. Ne koncernas haltigojn
-      rejecting_media: aŭdovidaj dosieroj malakceptiĝas
-      rejecting_reports: malakceptas signalojn
-      severity:
-        silence: silentigita
-        suspend: haltigita
-      show:
-        affected_accounts:
-          one: Unu konto en la datumbazo esta influita
-          other: "%{count} kontoj en la datumbazo estas influitaj"
-        retroactive:
-          silence: Malkaŝi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
-          suspend: Malhaltigi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
-        title: Malfari blokadon de domajno %{domain}
-        undo: Malfari
       undo: Malfari
       view: Vidi domajna blokado
     email_domain_blocks:
       add_new: Aldoni novan
+      attempts_over_week:
+        one: "%{count} provo ekde lasta semajno"
+        other: "%{count} registroprovoj ekde lasta semajno"
       created_msg: Retadreso sukcese aldonita al la nigra listo
       delete: Forigi
-      destroyed_msg: Retadreso sukcese forigita de la nigra listo
+      dns:
+        types:
+          mx: MX-rekordo
       domain: Domajno
-      empty: Neniu retadresa domajno nune estas en la nigra listo.
-      from_html: de %{domain}
       new:
         create: Aldoni domajnon
+        resolve: Solvi domajnon
         title: Nova blokado de retadresa domajno
+      no_email_domain_block_selected: Neniuj retpoŝtoadresodomajnblokoj ŝanĝitas ĉar nenio elektitas
+      resolved_dns_records_hint_html: La domajnnomo referencas al la MX-domajnoj kiuj akceptas retpoŝton. <strong>Ne bloku grandajn retpoŝtoservilojn.</strong>
+      resolved_through_html: Solvis tra %{domain}
       title: Nigra listo de retadresaj domajnoj
+    export_domain_allows:
+      new:
+        title: Importi domajnpermesojn
+      no_file: Neniu dosiero elektita
+    export_domain_blocks:
+      import:
+        description_html: Vi importos liston de domajnblokoj.
+        existing_relationships_warning: Ekzistantaj sekvorilatoj
+        private_comment_description_html: 'Por helpi vin, importitaj blokoj kreitas kun la privata komento: <q>%{comment}</q>'
+        private_comment_template: Importita de %{source} je %{date}
+        title: Importi domajnblokojn
+      new:
+        title: Importi domajnblokojn
+      no_file: Neniu dosiero elektita
     follow_recommendations:
+      description_html: "<strong>Sekvorekomendoj helpi novajn uzantojn rapide trovi interesa enhavo</strong>. Ili rekalkulitas ĉiutage lau interagoj kaj sekvantokvantoj."
       language: Por la lingvo
       status: Stato
       suppress: Subpremita sekvu rekomendojn
       suppressed: Subpremita
       title: Rekomendoj de sekvado
+      unsuppress: Regajni sekvorekomendon
     instances:
+      availability:
+        description_html:
+          one: Se sendo la domajno malsukcesis por <strong>%{count} dio</strong>, ne estas sendprovo plu escepte <em>de</em> la dojmano.
+          other: Se sendo la domajno malsukcesis por <strong>%{count} dioj</strong>, ne estas sendprovo plu escepte <em>de</em> la dojmano.
+        failure_threshold_reached: Malsukceslimo atingitas je %{date}.
+        failures_recorded:
+          one: Malsukcesa provo dum %{count} tago.
+          other: Malsukcesa provo dum %{count} apartaj tagoj.
+        no_failures_recorded: Neniuj malsukcesoj en protokolo.
+        title: Disponebleco
+        warning: La lasta provo por konektiĝi al ĉi tiu servilo estis malsukcesa
       back_to_all: Ĉiuj
       back_to_limited: Limigita
       back_to_warning: Averta
       by_domain: Domajno
+      confirm_purge: Ĉu vi certas ke vi volas porĉiame forigi datumojn de ĉi tiun domajno?
+      content_policies:
+        comment: Interna noto
+        description_html: Vi povas difini enhavopolitikojn al la ĉiuj kontoj.
+        policies:
+          reject_media: Malakcepti aŭdovidaĵojn
+          reject_reports: Malakcepti raportojn
+          silence: Kaŝu
+          suspend: Suspendi
+        policy: Politiko
+        reason: Publika kialo
+        title: Regularo de enhavo
+      dashboard:
+        instance_accounts_dimension: Plej sekvataj kontoj
+        instance_accounts_measure: konservitaj kontoj
+        instance_followers_measure: niaj sekvantoj tie
+        instance_follows_measure: iliaj sekvantoj ĉi tie
+        instance_languages_dimension: Ĉefaj lingvoj
+        instance_media_attachments_measure: konservitaj ligitaj aŭdovidaĵoj
+        instance_reports_measure: raportoj pri ili
+        instance_statuses_measure: konservitaj afiŝoj
       delivery:
         all: Ĉiuj
-        warning: Averto
+        clear: Forviŝi liverajn erarojn
+        failing: Malsukcesas
+        restart: Restarti liveradon
+        stop: Halti liveradon
+        unavailable: Nedisponebla
       delivery_available: Liverado disponeblas
+      delivery_error_days: Sendoerardioj
+      delivery_error_hint: Se sendo ne estas ebla por %{count} dioj, ĝi automate markotas kiel nesendebla.
+      destroyed_msg: Datumo de %{domain} nun vicitas por baldaua forigo.
       empty: Neniuj domajnoj trovitaj.
       known_accounts:
         one: "%{count} konata konto"
@@ -409,15 +505,18 @@ eo:
       moderation:
         all: Ĉiuj
         limited: Limigita
-        title: Kontrolo
+        title: Moderigado
       private_comment: Privata komento
       public_comment: Publika komento
+      purge: Purigu
+      purge_description_html: Se vi kredas ke ĉi tiuj domajno estas malreta, vi povas forigi ĉiujn kontorekordojn.
       title: Federacio
       total_blocked_by_us: Blokitaj de ni
       total_followed_by_them: Sekvataj de ili
       total_followed_by_us: Sekvataj de ni
       total_reported: Signaloj pri ili
       total_storage: Aŭdovidaj kunsendaĵoj
+      totals_time_period_hint_html: Sumo montritas malsupre inkluzivas datumo ekde komenco.
     invites:
       deactivate_all: Malaktivigi ĉion
       filter:
@@ -441,8 +540,6 @@ eo:
         title: Krei novan IP-regulon
       no_ip_block_selected: Neniu IP-regulo estis ŝanĝita ĉar neniu estis elektita
       title: IP-reguloj
-    pending_accounts:
-      title: Pritraktataj kontoj (%{count})
     relationships:
       title: Rilatoj de %{acct}
     relays:
@@ -453,11 +550,12 @@ eo:
       disabled: Malebligita
       enable: Ebligi
       enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn mesaĝojn de la servilo al ĝi.
-      enabled: Malebligita
+      enabled: Ebligita
       inbox_url: URL de la ripetilo
       pending: Atendante aprobon de la ripetilo
       save_and_enable: Konservi kaj ebligi
       setup: Agordi konekton al ripetilo
+      signatures_not_enabled: Ripetiloj ne ĝuste funkcias dum sekura reĝimo au limigita federacio reĝimo ebligitas
       status: Stato
       title: Ripetiloj
     report_notes:
@@ -468,167 +566,324 @@ eo:
         notes:
           one: "%{count} noto"
           other: "%{count} notoj"
-        reports:
-          one: "%{count} signalo"
-          other: "%{count} signaloj"
+      action_log: Ĵurnalo de revizo
       action_taken_by: Ago farita de
+      actions:
+        delete_description_html: Raportitaj mesaĝoj forigotas kaj admono rekorditas.
+        mark_as_sensitive_description_html: La audovidaĵo en la raportita mesaĝo markotas kiel sentema kaj admono rekorditas.
+        other_description_html: Vidu pli da ebloj por regi la sintenon de la konto kaj por personigi la komunikadon kun la raportita konto.
+        resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
+        silence_description_html: La profilo estas videbla nur de persono kiu jam sekvis au serĉis.
+        suspend_description_html: La profilo kaj ĉiuj ĝiaj enhavoj fariĝos nealirebla kaj ĝi fine forigotas.
+      actions_description_html: Decidu kiu ago por solvi ĉi tiuj raporto. <strong>Spamo</strong> kategorio elektitas.
+      add_to_report: Aldoni pli al raporto
       are_you_sure: Ĉu vi certas?
       assign_to_self: Asigni al mi
       assigned: Asignita kontrolanto
+      by_target_domain: Domajno de la signalita konto
+      category: Kategorio
+      category_description_html: La kialo pri ĉi tiuj konto kaj enhavo raportitaj sendotas al la raportita konto
       comment:
         none: Nenio
+      comment_description_html: 'Por doni pli da informo, %{name} skribis:'
       created_at: Signalita
+      delete_and_resolve: Forigi afiŝojn
       forwarded: Plusendita
       forwarded_to: Plusendita al %{domain}
       mark_as_resolved: Marki solvita
+      mark_as_sensitive: Marki kiel tiklan
       mark_as_unresolved: Marki nesolvita
+      no_one_assigned: Neniu
       notes:
         create: Aldoni noton
         create_and_resolve: Solvi per noto
         create_and_unresolve: Remalfermi per noto
         delete: Forigi
         placeholder: Priskribu faritajn agojn, aŭ ajnan novan informon pri tiu signalo…
+        title: Notoj
+      notes_description_html: Vidi kaj lasi notojn por aliaj kontrolantoj kaj estonta vi
+      quick_actions_description_html: 'Agu au movu malsupre por vidi raportitajn enhavojn:'
+      remote_user_placeholder: la ekstera uzanto de %{instance}
       reopen: Remalfermi signalon
       report: 'Signalo #%{id}'
       reported_account: Signalita konto
       reported_by: Signalita de
       resolved: Solvitaj
       resolved_msg: Signalo sukcese solvita!
+      skip_to_actions: Salti al agoj
       status: Mesaĝoj
-      target_domain: Domajno de la signalita konto
+      statuses: Raportita enhavo
+      statuses_description_html: Sentema enhavo referencitas kun la raportita konto
+      target_origin: Origino de raportita konto
       title: Signaloj
       unassign: Malasigni
       unresolved: Nesolvitaj
       updated_at: Ĝisdatigita
+      view_profile: Vidi profilon
+    roles:
+      add_new: Aldoni rolon
+      assigned_users:
+        one: "%{count} uzanto"
+        other: "%{count} uzantoj"
+      categories:
+        administration: Administrado
+        devops: Programado kaj Operaciado
+        invites: Invitoj
+        moderation: Moderigado
+        special: Specialaj
+      delete: Forigi
+      description_html: Per <strong>uzantoroloj</strong>, vi povas personecigi funkciojn kaj areon de Mastodon.
+      edit: Redakti rolon de '%{name}'
+      everyone: Defaŭltaj permesoj
+      everyone_full_description_html: Jen la <strong>baza rolo</strong>, kiu afektas <strong>ĉiujn uzantojn</strong>, eĉ tiuj sen atribuata rolo. Ĉiuj aliaj roloj heredas permesojn de ĝi.
+      permissions_count:
+        one: "%{count} permeso"
+        other: "%{count} permesoj"
+      privileges:
+        administrator: Administranto
+        administrator_description: Uzantoj kun ĉi tiu permeso preterpasos ĉiun permeson
+        delete_user_data: Forigi la datumojn de la uzanto
+        delete_user_data_description: Permesi uzantojn forigi datumo de alia uzanto sen atendo
+        invite_users: Inviti Uzantojn
+        invite_users_description: Permesi uzantoj inviti novajn personojn al la servilo
+        manage_announcements: Administri Anoncojn
+        manage_announcements_description: Permesas uzantojn administri anoncojn ĉe la servilo
+        manage_appeals: Administri Apelaciojn
+        manage_appeals_description: Rajtigas al uzantoj kontroli apelaciojn kontraǔ kontrolaj agoj
+        manage_blocks: Administri Blokojn
+        manage_blocks_description: Permesi uzantojn bloki retpoŝtoservilojn kaj IP-adresojn
+        manage_custom_emojis: Administri propajn emoĝiojn
+        manage_custom_emojis_description: Permesi uzantojn administri propajn emoĝiojn ĉe la servilo
+        manage_federation: Administri Federacion
+        manage_federation_description: Permesas al uzantoj bloki aǔ permesi federacion kun aliaj domajnoj, kaj regi liveradon
+        manage_invites: Administri Invitojn
+        manage_invites_description: Permesi uzantojn vidi kaj malaktivigi invitligilojn
+        manage_reports: Administri raportojn
+        manage_reports_description: Permesi uzantojn kontroli raportojn kaj administri ilin
+        manage_roles: Administri Rolojn
+        manage_roles_description: Permesi uzantojn administri kaj asigni rolojn kiuj estas malaltaj ol ilia
+        manage_rules: Administri Regulojn
+        manage_rules_description: Permesi uzantojn ŝanĝi servilregulojn
+        manage_settings: Administri opciojn
+        manage_settings_description: Permesi uzantojn ŝanĝi retejoopciojn
+        manage_taxonomies: Administri kategoriarojn
+        manage_taxonomies_description: Permesi uzantojn kontroli popularan enhavon kaj ĝisdatigi kradvortopciojn
+        manage_user_access: Administri uzantoaliron
+        manage_user_access_description: Permesi uzantojn malebligi autentiko kaj retpoŝtodetalo de aliaj uzantoj
+        manage_users: Administri uzantojn
+        manage_users_description: Permesi uzantaojn vidi detalojn de aliaj uzantoj kaj administri ilin
+        manage_webhooks: Administri rethokojn
+        manage_webhooks_description: Permesi uzantojn komenci rethokojn por administraj eventoj
+        view_audit_log: Vidi protokolon
+        view_audit_log_description: Permesi uzantojn vidi historion de administraj agoj ĉe la servilo
+        view_dashboard: Vidi panelon
+        view_dashboard_description: Permesi uzantojn aliri la kontrolpanelon kaj diversajn mezurarojn
+        view_devops: Programado kaj Operaciado
+        view_devops_description: Permesi uzantojn aliri Sidekiq kaj pgHero-kontrolpanelojn
+      title: Roloj
     rules:
       add_new: Aldoni regulon
       delete: Forigi
+      description_html: Kvankam plej da personoj pretendas legi kaj asenti servkondiĉoj, personoj kutime ne komplete legi. <strong>Uzu mallonga kaj simpla listo.</strong>.
       edit: Redakti la regulon
+      empty: Neniuj servilregulojn definitas ĝis nun.
       title: Reguloj de la servilo
     settings:
-      activity_api_enabled:
-        desc_html: Sumo de lokaj mesaĝoj, aktivaj uzantoj, kaj novaj registriĝoj laŭsemajne
-        title: Publikigi kunmetitajn statistikojn pri la uzanta agado
-      bootstrap_timeline_accounts:
-        desc_html: Disigi plurajn uzantnomojn per komo. Funkcios nur por lokaj neŝlositaj kontoj. Kiam malplena, la dekomenca valoro estas ĉiuj lokaj administrantoj.
-        title: Dekomencaj sekvadoj por novaj uzantoj
-      contact_information:
-        email: Publika retadreso
-        username: Kontakta uzantnomo
-      custom_css:
-        desc_html: Ŝanĝi la aspekton per CSS ŝargita en ĉiu pago
-        title: Propra CSS
+      about:
+        manage_rules: Administri servilregulojn
+        preamble: Donu specifan informon pri kiel la servilo operaciitas, administras kaj financitas.
+        rules_hint: Havas apartan areon por regulojn kiujn via uzantoj devus sekvi.
+        title: Pri
+      appearance:
+        preamble: Personecigi retinterfaco de Mastodon.
+        title: Apero
+      branding:
+        preamble: Via markeco de servilo malsamigas ĝin de aliaj servilojn en la reto. Do, la informo devus esti simpla kaj mallonga.
+        title: Markeco
+      content_retention:
+        preamble: Regi kiel uzantogenerita enhavo konservitis en Mastodon.
+        title: Enhavkonservo
+      default_noindex:
+        desc_html: Efektiviĝas por ĉiuj uzantoj, kiuj mem ne agordis ĉi tion
+        title: Defaŭltigi, ke uzantoj ne estu aŭtomate aldonitaj al la serĉilo-indekso sen sia konsento
+      discovery:
+        follow_recommendations: Sekvorekomendoj
+        preamble: Interesa enhavo estas grava por novaj uzantoj kiuj eble ne konas ajn iun.
+        profile_directory: Profilujo
+        public_timelines: Publikaj templinioj
+        title: Eltrovado
+        trends: Tendencoj
       domain_blocks:
         all: Al ciuj
         disabled: Al neniu
-        title: Vidi domajna blokado
-        users: Al ensalutintaj lokaj uzantoj
-      domain_blocks_rationale:
-        title: Montri la kialon
-      hero:
-        desc_html: Montrata en la ĉefpaĝo. Almenaŭ 600x100px rekomendita. Kiam ne agordita, la bildeto de la servilo estos uzata
-        title: Kapbildo
-      mascot:
-        desc_html: Montrata en pluraj paĝoj. Rekomendataj estas almenaŭ 293x205px. Se ĉi tio ne estas agordita, la defaŭlta maskoto uziĝas
-        title: Maskota bildo
-      peers_api_enabled:
-        desc_html: Nomoj de domajnoj, kiujn ĉi tiu servilo renkontis en la federauniverso
-        title: Publikigi liston de malkovritaj serviloj
-      preview_sensitive_media:
-        desc_html: Antaŭvido de ligiloj en aliaj retejoj montros bildeton eĉ se la aŭdovidaĵo estas markita kiel tikla
-        title: Montri tiklajn aŭdovidaĵojn en la antaŭvidoj de OpenGraph
-      profile_directory:
-        desc_html: Permesi al uzantoj esti troveblaj
-        title: Ebligi la profilujon
+        users: Al salutintaj lokaj uzantoj
       registrations:
-        closed_message:
-          desc_html: Montrita sur la hejma paĝo kiam registriĝoj estas fermitaj. Vi povas uzi HTML-etikedojn
-          title: Mesaĝo pri fermitaj registriĝoj
-        deletion:
-          desc_html: Permesi al iu ajn forigi propran konton
-          title: Permesi forigi konton
-        min_invite_role:
-          disabled: Neniu
-          title: Permesi invitojn de
+        preamble: Regi kiu povas krei konton ĉe via servilo.
+        title: Registriĝoj
       registrations_mode:
         modes:
           approved: Bezonas aprobi por aliĝi
           none: Neniu povas aliĝi
           open: Iu povas aliĝi
-        title: Registrado modo
-      show_known_fediverse_at_about_page:
-        desc_html: Kiam ŝaltita, ĝi montros mesaĝojn de la tuta konata fediverse antaŭvide. Aliokaze, ĝi montros nur lokajn mesaĝojn.
-        title: Montri konatan fediverse en tempolinia antaŭvido
-      show_staff_badge:
-        desc_html: Montri teaman insignon en paĝo de uzanto
-        title: Montri teaman insignon
-      site_description:
-        desc_html: Enkonduka alineo en la ĉefpaĝo. Priskribu la unikaĵojn de ĉi tiu nodo de Mastodon, kaj ĉiujn aliajn gravaĵojn. Vi povas uzi HTML-etikedojn, kiel <code>&lt;a&gt;</code> kaj <code>&lt;em&gt;</code>.
-        title: Priskribo de la servilo
-      site_description_extended:
-        desc_html: Bona loko por viaj sintenaj reguloj, aliaj reguloj, gvidlinioj kaj aliaj aferoj, kiuj apartigas vian serilon. Vi povas uzi HTML-etikedojn
-        title: Propraj detalaj informoj
-      site_short_description:
-        desc_html: Afiŝita en la flankpanelo kaj metadatumaj etikedoj. Priskribu kio estas Mastodon, kaj kio specialas en ĉi tiu nodo, per unu alineo. Se malplena, la priskribo de la servilo estos uzata.
-        title: Mallonga priskribo de la servilo
-      site_terms:
-        desc_html: Vi povas skribi vian propran privatecan politikon, viajn uzkondiĉojn aŭ aliajn leĝaĵojn. Vi povas uzi HTML-etikedojn
-        title: Propraj uzkondiĉoj
-      site_title: Nomo de la servilo
-      thumbnail:
-        desc_html: Uzata por antaŭvidoj per OpenGraph kaj per API. 1200x630px rekomendita
-        title: Bildeto de la servilo
-      timeline_preview:
-        desc_html: Montri publikan templinion en komenca paĝo
-        title: Tempolinia antaŭvido
-      title: Retejaj agordoj
-      trends:
-        desc_html: Publike montri antaŭe kontrolitajn kradvortojn, kiuj nune furoras
-        title: Furoraj kradvortoj
+      title: Agordoj de la servilo
     site_uploads:
       delete: Forigi elŝutitan dosieron
+      destroyed_msg: Reteja alŝuto sukcese forigita!
     statuses:
+      account: Skribanto
+      application: Aplikaĵo
       back_to_account: Reveni al konta paĝo
+      back_to_report: Reveni al raportpaĝo
       batch:
-        delete: Forigi
-        nsfw_off: Marki netikla
-        nsfw_on: Marki tikla
+        remove_from_report: Forigi de raporto
+        report: Raporti
       deleted: Forigita
-      failed_to_execute: Ekigo malsukcesa
+      favourites: Stelumoj
+      history: Versia historio
+      in_reply_to: Respondas al
+      language: Lingvo
       media:
         title: Aŭdovidaĵoj
-      no_media: Neniu aŭdovidaĵo
+      metadata: Metadatumoj
       no_status_selected: Neniu mesaĝo estis ŝanĝita ĉar neniu estis elektita
+      open: Malfermi afiŝojn
+      original_status: Originala afiŝo
+      reblogs: Reblogaĵoj
+      status_changed: Afiŝo ŝanĝiĝis
       title: Mesaĝoj de la konto
+      trending: Popularaĵoj
+      visibility: Videbleco
       with_media: Kun aŭdovidaĵoj
+    strikes:
+      actions:
+        delete_statuses: "%{name} forigis afiŝojn de %{target}"
+        disable: "%{name} frostigis la konton de %{target}"
+        mark_statuses_as_sensitive: "%{name} markis mesaĝojn de %{target} kiel sentemaj"
+        none: "%{name} sendis averton al %{target}"
+        sensitive: "%{name} markis konton de %{target} kiel sentema"
+        silence: "%{name} limigis la konton de %{target}"
+        suspend: "%{name} suspendis la konton de %{target}"
+      appeal_approved: Apelaciita
+      appeal_pending: Apelacio pritraktiĝos
     system_checks:
       database_schema_check:
         message_html: Estas pritraktataj datumbazaj migradoj. Bonvolu ekzekuti ilin por certigi, ke la apliko kondutas kiel atendite
+      elasticsearch_running_check:
+        message_html: Ne eblas konekti Elasticsearch. Bonvolu kontroli ke ĝi funkcias, aǔ malŝaltu plentekstan serĉon
+      elasticsearch_version_check:
+        message_html: 'Nekongrua Elasticsearch-versio: %{value}'
+        version_comparison: Elasticsearch %{running_version} instalitas sed %{required_version} bezonitas
       rules_check:
         action: Administri servilajn regulojn
         message_html: Vi ne difinis iujn servilajn regulojn.
+      sidekiq_process_check:
+        message_html: Neniu Sidekiq-procezo por la %{value} vico
     tags:
-      accounts_today: Unikaj uzoj hodiaŭ
-      accounts_week: Unikaj uzoj je ĉi tiu semajno
-      breakdown: Disigo de la hodiaŭa uzo per fonto
-      last_active: Laste aktiva
-      most_popular: La plej populara
-      most_recent: Plej lasta
-      name: Kradvorto
       review: La statuso de la recenzo
-      reviewed: Recenzis
-      title: Kradvortoj
-      trending_right_now: Nunaj furoraĵoj
-      unique_uses_today: "%{count} uzas hodiaŭ"
-      unreviewed: Ne recenzis
       updated_msg: Kradvorto agordoj ĝisdatigis sukcese
     title: Administrado
+    trends:
+      allow: Permesi
+      approved: Aprobita
+      disallow: Malpermesi
+      links:
+        allow: Permesi ligilon
+        allow_provider: Permesi publikiganto
+        description_html: Ĉioj estas ligiloj kiuj nun diskonitajs multe de kontoj kiujn via servilo vidas. Ligiloj ne montritas publike se vi ne aprobis la publikiganton.
+        disallow: Malpermesi ligilon
+        disallow_provider: Malpermesi publikiganton
+        no_link_selected: Neniuj ligiloj ŝanĝitas ĉar nenio elektitas
+        publishers:
+          no_publisher_selected: Neniu publikigantoj estis ŝanĝita ĉar neniu estis elektita
+        shared_by_over_week:
+          one: Diskonita de 1 persono ekde lasta semajno
+          other: Diskonita de %{count} personoj ekde lasta semajno
+        title: Tendencantaj ligiloj
+        usage_comparison: Diskonita %{today}-foje hodiau, sed estas %{yesterday} hierau
+      only_allowed: Nur permesitas
+      pending_review: Atendante revizion
+      preview_card_providers:
+        allowed: Ligiloj de ĉi tiu publikiganto povas populariĝi
+        description_html: Ĉioj estas domajnoj kiuj havas ligiloj kiuj ofte diskonitas ĉe via servilo. Via aprobo inkluzivas subdomajnojn.
+        rejected: Ligiloj de ĉi tiu publikiganto ne populariĝos
+        title: Publikigantoj
+      rejected: Malakceptita
+      statuses:
+        allow: Permesi afiŝon
+        allow_account: Permesi aŭtoron
+        description_html: Oni multe diskonigas kaj stelumas ĉi tiujn mesaĝojn nuntempe laŭ via servilo. Tio povas helpi novajn kaj revenantajn uzantojn trovi pli da homoj por sekvi. Mesaĝo estas montrita publike nur se vi aprobis la aŭtoron kaj se la aŭtoro aprobis ke ties konto estu proponita al aliaj. Vi ankaŭ povas permesi aŭ malakcepti specifajn mesaĝojn.
+        disallow: Malpermesi afiŝon
+        disallow_account: Malpermesi aŭtoron
+        no_status_selected: Neniuj popularaj mesaĝoj ŝanĝitas ĉar nenio elektitas
+        not_discoverable: Autoro ne volonte estas malkovrebla
+        shared_by:
+          one: Kundividita kaj stelumita unufoje
+          other: Kundividita kaj stelumita %{friendly_count}-foje
+        title: Tendencantaj afiŝoj
+      tags:
+        current_score: Nuna puento %{score}
+        dashboard:
+          tag_accounts_measure: unikaj uzoj
+          tag_languages_dimension: Ĉefaj lingvoj
+          tag_servers_dimension: Ĉefaj serviloj
+          tag_servers_measure: malsamaj serviloj
+          tag_uses_measure: uzkvanto
+        description_html: Ĉioj estas kradvortoj kiuj nun aperas kun multe mesaĝoj kiujn via servilo vidas. Kradvortoj ne montritas publike se vi ne aprobis ilin.
+        listable: Povas sugestitis
+        no_tag_selected: Neniuj etikedoj ŝanĝitas ĉar nenio elektitas
+        not_listable: Ne sugestotas
+        not_trendable: Ne aperos en tendencoj
+        not_usable: Ne povas esti uzata
+        peaked_on_and_decaying: Maksimumo estas je %{date}, nun ĝi malpliiĝas
+        title: Tendencantaj kradvortoj
+        trendable: Povas aperi en tendencoj
+        trending_rank: 'Populara #%{rank}'
+        usable: Povas esti uzata
+        usage_comparison: Uzita %{today}-foje hodiau, sed estas %{yesterday} hierau
+        used_by_over_week:
+          one: Uzita de 1 persono ekde lasta semajno
+          other: Uzita de %{count} personoj ekde lasta semajno
+      title: Tendencoj
+      trending: Popularaĵoj
     warning_presets:
       add_new: Aldoni novan
       delete: Forigi
       edit_preset: Redakti avertan antaŭagordon
+      empty: Vi ankoraŭ ne difinis iun ajn antaŭagordon de averto.
       title: Administri avertajn antaŭagordojn
+    webhooks:
+      add_new: Aldoni finpunkton
+      delete: Forigi
+      description_html: "<strong>Rethoko</strong> ebligas Mastodon sendi <strong>realtempan sciigon</strong> pri kelkaj eventoj al la via sia programaro por <strong>automata ekigi</strong>."
+      disable: Neebligi
+      disabled: Neebligita
+      edit: Redakti finpunkton
+      empty: Vi ne havas ajn fiksitaj rethokfinpunktojn ĝis nun.
+      enable: Ŝalti
+      enabled: Aktiva
+      enabled_events:
+        one: 1 ŝaltita evento
+        other: "%{count} ŝaltitaj eventoj"
+      events: Eventoj
+      new: Nova rethoko
+      rotate_secret: Movi sekreton
+      secret: Signosekreto
+      status: Stato
+      title: Rethokoj
+      webhook: Rethoko
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: por forigi iliajn mesaĝojn
+        disable: por frostigi ties konton
+        mark_statuses_as_sensitive: por marki iliajn mesaĝojn kiel sentemaj
+        none: averto
+        sensitive: por marki ilian konton kiel sentema
+        silence: por limigi ilian konton
+        suspend: por suspendi ties konton
+      body: "%{target} apelacias kontroldecido de %{action_taken_by} de %{date}, kiu estas %{type}. Ĝi skribis:"
+      next_steps: Vi povas aprobi apelacion por malfari kontroldecidon au ignori.
+      subject: "%{username} apelacias kontroldecidon ĉe %{instance}"
     new_pending_account:
       body: La detaloj de la nova konto estas sube. Vi povas aprobi aŭ Malakcepti ĉi kandidatiĝo.
       subject: Nova konto atendas por recenzo en %{instance} (%{username})
@@ -636,14 +891,23 @@ eo:
       body: "%{reporter} signalis %{target}"
       body_remote: Iu de %{domain} signalis %{target}
       subject: Nova signalo por %{instance} (#%{id})
-    new_trending_tag:
-      body: 'La kradvorto #%{name} furoras hodiaŭ, sed ankoraŭ ne estis kontrolita. Ĝi ne aperos publike sen via aprobo. Se vi ne volas tion, simple konservu la formularon tiel kiel.'
-      subject: Nova kradvorto kontrolebla en %{instance} (#%{name})
+    new_trends:
+      body: 'La eroj bezonas kontrolon antau ol ili povas montritas publike:'
+      new_trending_links:
+        title: Tendencantaj ligiloj
+      new_trending_statuses:
+        title: Popularaĝaj mesaĝoj
+      new_trending_tags:
+        no_approved_tags: Nun ne havas aprobitajn popularajn kradvortojn.
+        requirements: Ajn ĉi tiu eroj povas superi la %{rank}an kradvorton kiu estas %{lowest_tag_name} kun %{lowest_tag_score} puentoj.
+        title: Tendencantaj kradvortoj
+      subject: Novaj popularaĵoj bezonas kontrolitis ĉe %{instance}
   aliases:
     add_new: Krei alinomon
     created_msg: Kreis novan alinomon sukcese. Vi povas inici la transloki el la malnovan konton nun.
     deleted_msg: Forigis la alinomon sukcese. Transloki el tiu konto al ĉi tiu ne plu eblos.
     empty: Vi havas neniun kaŝnomon.
+    hint_html: Se vi volas translokiĝi de alia konto al ĉi tie, kreu alinomon. Ĝi estas <strong>sekura kaj inversebla</strong>. <strong>Ĝi komencitas de malnova konto</strong>.
     remove: Malligili alinomon
   appearance:
     advanced_web_interface: Altnivela retpaĝa interfaco
@@ -652,7 +916,7 @@ eo:
     confirmation_dialogs: Konfirmaj fenestroj
     discovery: Eltrovo
     localization:
-      body: Mastodon estas tradukita per volontuloj.
+      body: Mastodon estas tradukita de volontuloj.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Ĉiu povas kontribui.
     sensitive_content: Tikla enhavo
@@ -667,47 +931,59 @@ eo:
   applications:
     created: Aplikaĵo sukcese kreita
     destroyed: Aplikaĵo sukcese forigita
-    invalid_url: La URL donita ne estas valida
     regenerate_token: Rekrei aliran ĵetonon
     token_regenerated: Alira ĵetono sukcese rekreita
     warning: Estu tre atenta kun ĉi tiu datumo. Neniam diskonigu ĝin al iu ajn!
     your_token: Via alira ĵetono
   auth:
-    apply_for_account: Peti inviton
+    apply_for_account: Peti konton
     change_password: Pasvorto
-    checkbox_agreement_html: Mi samopinii al la <a href="%{rules_path}" target="_blank">Servo reguloj</a> kaj <a href="%{terms_path}" target="_blank">kondiĉo al servadon</a>
-    checkbox_agreement_without_rules_html: Mi konsenti la <a href="%{terms_path}" target="_blank">reguloj de servado</a>
     delete_account: Forigi konton
     delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton.
     description:
       prefix_invited_by_user: "@%{name} invitigi vin aligiĝi ĉi tiu servilo de Mastodon!"
-      prefix_sign_up: Registriĝi ĉe Mastodon hodiaŭ!
+      prefix_sign_up: Registriĝu en Mastodon hodiaŭ!
+      suffix: Per konto, vi povos sekvi aliajn homojn, afiŝi kaj interŝanĝi mesaĝojn kun uzantoj de ajna Mastodona servilo kaj multe pli!
     didnt_get_confirmation: Ĉu vi ne ricevis la instrukciojn por konfirmi?
     dont_have_your_security_key: Ne havas vi vian sekurecan ŝlosilon?
     forgot_password: Pasvorto forgesita?
     invalid_reset_password_token: Ĵetono por restarigi pasvorton nevalida aŭ eksvalida. Bonvolu peti novan.
+    link_to_otp: Enigu 2-faktorkodo de via telefono au regajnkodo
     link_to_webauth: Uzi vian sekurecan ŝlosilon
-    login: Ensaluti
-    logout: Elsaluti
+    log_in_with: Ensaluti per
+    login: Saluti
+    logout: Adiaŭi
     migrate_account: Movi al alia konto
     migrate_account_html: Se vi deziras alidirekti ĉi tiun konton al alia, vi povas <a href="%{path}">agordi ĝin ĉi tie</a>.
     or_log_in_with: Aŭ ensaluti per
+    privacy_policy_agreement_html: Mi legis kaj konsentis pri <a href="%{privacy_policy_path}" target="_blank">privatpolitiko</a>
     providers:
       cas: CAS
       saml: SAML
-    register: Registriĝi
+    register: Krei konton
     registration_closed: "%{instance} ne estas akcepti nova uzantojn"
     resend_confirmation: Resendi la instrukciojn por konfirmi
-    reset_password: Ŝanĝi pasvorton
+    reset_password: Restarigi pasvorton
+    rules:
+      preamble: Ĉi tioj fiksitas kaj devigitas de kontrolantoj de %{domain}.
+      title: Bazaj reguloj.
     security: Sekureco
     set_new_password: Elekti novan pasvorton
     setup:
+      email_below_hint_html: Se malsupra retpoŝtoadreso estas neĝusta, vi povas ŝanĝi ĉi tie kaj ricevi novan konfirmretpoŝton.
+      email_settings_hint_html: La konfirmretpoŝto senditas al %{email}.
       title: Agordi
+    sign_up:
+      preamble: Per konto ĉe ĉi tiu Mastodon-servilo, vi povas sekvi ajn personojn en la reto.
+      title: Ni pretigu vin ĉe %{domain}.
     status:
       account_status: Statuso de la konto
-      functional: Via konto estas plene funkcianta.
+      confirming: Retpoŝtokonfirmo bezonas kompletigitis.
+      functional: Via konto estas tute funkcia.
+      pending: Via apliko ankarou bezonas kontrolon de nia teamo. Vi ricevos retpoŝto malantau ol aprobo.
+      redirecting_to: Via konto estas neaktiva ĉar ĝi nun alidirektas al %{acct}.
+      view_strikes: Vidi antauaj admonoj kontra via konto
     too_fast: Formularo sendita tro rapide, klopodu denove.
-    trouble_logging_in: Ĝeni ensaluti?
     use_security_key: Uzi sekurecan ŝlosilon
   authorize_follow:
     already_following: Vi jam sekvas tiun konton
@@ -723,6 +999,7 @@ eo:
     title: Sekvi %{acct}
   challenge:
     confirm: Daŭrigi
+    hint_html: "<strong>Konsileto:</strong> Ni ne demandos pri via pasvorto ĝis 1 horo."
     invalid_password: Nevalida pasvorto
     prompt: Konfirmi pasvorton por daŭrigi
   crypto:
@@ -731,7 +1008,7 @@ eo:
       invalid_signature: 올바른 Ed25519 시그니처가 아닙니다
   date:
     formats:
-      default: "%Y-%m-%d "
+      default: "%Y-%b-%d"
       with_month_name: "%e-a de %B %Y"
   datetime:
     distance_in_words:
@@ -754,21 +1031,53 @@ eo:
     proceed: Forigi konton
     success_msg: Via konto estis sukcese forigita
     warning:
+      before: 'Antau ol dauri, legu ĉi tiujn notojn zorgeme:'
+      caches: Enhavo kiu kaŝmemorigitas de aliaj serviloj eble restas
+      data_removal: Viaj mesaĝoj kaj aliaj datumoj permanente forigotas
       email_change_html: Vi povas <a href="%{path}">ŝanĝi vian retadreson</a> sen forigi vian konton
+      email_contact_html: Se ĝi ankorau ne venas, vi povas retpoŝti al <a href="mailto:%{email}">%{email}</a> por ricevi helpon
+      email_reconfirmation_html: Se vi ne ricevas la konfirmretpoŝton, vi povas <a href="%{path}">denove peti</a>
+      irreversible: Vi ne povas regajni au reaktivigi vian konton
       more_details_html: Por pli da detaloj, vidi la <a href="%{terms_path}">privatecan politikon</a>.
       username_available: Via uzantnomo iĝos denove disponebla
       username_unavailable: Via uzantnomo restos nedisponebla
-  directories:
-    directory: Profilujo
-    explanation: Malkovru uzantojn per iliaj interesoj
-    explore_mastodon: Esplori %{title}
+  disputes:
+    strikes:
+      action_taken: Agito
+      appeal: Apelacii
+      appeal_approved: Ĉi tiu admono sukcese apelaciitas kaj ne estas valida plu
+      appeal_rejected: La apelacio malakceptitas
+      appeal_submitted_at: Apelacio senditas
+      appealed_msg: Via apelacio senditas. Vi eble sciigitas.
+      appeals:
+        submit: Sendi apelacion
+      approve_appeal: Aprobi apelacion
+      associated_report: Rilata raporto
+      created_at: Datita
+      description_html: Ĉioj estas agoj kaj vartoj kontra via konto de %{instance}.
+      recipient: Senditas por
+      reject_appeal: Malakcepti apelacion
+      status: 'Afiŝo #%{id}'
+      status_removed: Mesaĝo jam forigitas de sistemo
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Forigo de afiŝo
+        disable: Frostigi konton
+        mark_statuses_as_sensitive: Marki mesaĝojn kiel sentemaj
+        none: Averto
+        sensitive: Marki konton kiel sentema
+        silence: Limo de konto
+        suspend: Suspendi konton
+      your_appeal_approved: Via apelacio aprobitas
+      your_appeal_pending: Vi sendis apelacion
+      your_appeal_rejected: Via apelacio malakceptitas
   domain_validator:
     invalid_domain: ne estas valida domajna nomo
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': La peto kiun vi sendis estas nevalida au malformas.
     '403': Vi ne havas la rajton por vidi ĉi tiun paĝon.
     '404': La paĝo ke kiun vi serĉas ne ekzistas ĉi tie.
-    '406': This page is not available in the requested format.
+    '406': Ĉi tiu paĝo ne estas disponebla kun petita formato.
     '410': La paĝo, kiun vi serĉas, ne plu ekzistas ĉi tie.
     '422':
       content: Sekureca konfirmo malsukcesa. Ĉu vi blokas kuketojn?
@@ -777,7 +1086,7 @@ eo:
     '500':
       content: Ni bedaŭras, io malsukcesis niaflanke.
       title: Ĉi tiu paĝo ne estas ĝusta
-    '503': The page could not be served due to a temporary server failure.
+    '503': La paĝo ne povas montritis pro malpermanenta servilmalfunkcio.
     noscript_html: |-
       Por uzi la retan aplikaĵon de Mastodon, bonvolu ebligi JavaScript. Alimaniere, provu unu el la
       <a href="%{apps_path}">operaciumaj aplikaĵoj</a> por Mastodon por via platformo.
@@ -812,52 +1121,70 @@ eo:
       public: Publika templinio
       thread: Konversacioj
     edit:
+      add_keyword: Aldoni ĉefvorton
+      keywords: Ĉefvortoj
+      statuses: Individuaj mesaĝoj
+      statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn mesaĝojn. <a href="%{path}">Kontrolu mesaĝojn de la filtrilo</a>.
       title: Ŝanĝi filtrilojn
     errors:
+      deprecated_api_multiple_keywords: Ĉi tiuj parametroj ne povas ŝanĝitis de ĉi tiu programaro. Uzu pli novan programaron.
       invalid_context: Neniu aŭ nevalida kunteksto donita
-      invalid_irreversible: Nemalfarebla filtrado funkcias nur por hejma aŭ sciiga kuntekstoj
     index:
+      contexts: Filtriloj en %{contexts}
       delete: Forigi
       empty: Vi havas neniun filtrilon.
+      expires_in: Eksvalidiĝas en %{distance}
+      expires_on: Eksvalidiĝi je %{date}
+      keywords:
+        one: "%{count} ĉefvorto"
+        other: "%{count} ĉefvortoj"
+      statuses:
+        one: "%{count} afiŝo"
+        other: "%{count} afiŝoj"
+      statuses_long:
+        one: "%{count} mesaĝo kaŝita"
+        other: "%{count} mesaĝoj kaŝita"
       title: Filtriloj
     new:
+      save: Konservi novan filtrilon
       title: Aldoni novan filtrilon
+    statuses:
+      back_to_filter: Reveni al filtrilo
+      batch:
+        remove: Forigi de filtrilo
+      index:
+        hint: Ĉi tiu filtrilo kongruas kelkaj mesaĝoj sendepende de aliaj kriterioj.
+        title: Filtritaj mesaĝoj
   footer:
-    developers: Programistoj
-    more: Pli…
-    resources: Rimedoj
     trending_now: Nunaj furoraĵoj
   generic:
     all: Ĉio
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> ero ĉe ĉi tiu paĝo elektitas."
+      other: "<strong>%{count}</strong> eroj ĉe ĉi tiu paĝo elektitas."
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> ero kiu kongruas vian serĉon elektitas."
+      other: "<strong>%{count}</strong> eroj kiuj kongruas vian serĉon elektitas."
     changes_saved_msg: Ŝanĝoj sukcese konservitaj!
     copy: Kopii
     delete: Forigi
+    deselect: Malelekti ĉiujn
+    none: Neniu
     order_by: Ordigi de
     save_changes: Konservi ŝanĝojn
+    select_all_matching_items:
+      one: Elekti %{count} ero kiu kongruas vian serĉon.
+      other: Elekti ĉiuj %{count} eroj kiu kongruas vian serĉon.
+    today: hodiaŭ
     validation_errors:
       one: Io mise okazis! Bonvolu konsulti la suban erar-raporton
       other: Io mise okazis! Bonvolu konsulti la subajn %{count} erar-raportojn
   html_validator:
     invalid_markup: 'havas nevalidan HTML-markadon: %{error}'
-  identity_proofs:
-    active: Aktiva
-    authorize: Jes, permesi
-    authorize_connection_prompt: Permesi ĉi tiu ĉifrikan conekton?
-    errors:
-      failed: La ĉifrika conekto nefaris. Peti provu denove el %{provider}.
-      keybase:
-        invalid_token: Keybase signo estas haŝoj de subskribo kaj devi 66 deksesuma leteroj
-        verification_failed: Keybase ne rekoni ĉi tiu signo kiel subskribo de Keybase uzanto %{kb_username}. Peti provu denove el Keybase.
-      wrong_user: Ne povas krei por %{proving} dum ensalutis kiel %{current}. Ensaluti kiel %{proving} kaj provu denove.
-    explanation_html: Ĉi tie vi povas ĉifrika konekti via alia identicoj, kiel Keybase profilon. ĉi tiu igi aliaj popoloj sendi al vi ĉifritaj mesaĝoj kaj fidi kontento vi sendi al ilin.
-    i_am_html: Mi estas %{username} en %{service}.
-    identity: Identeco
-    inactive: Malaktiva
-    publicize_checkbox: 'Kaj fajfi ĉi tio:'
-    publicize_toot: 'I estas pruvita! Mi estas %{username} sur %{service}: %{url}'
-    status: Confirmo statuso
-    view_proof: Vidi pruvo
   imports:
+    errors:
+      invalid_csv_file: Nevalida CSV-dosiero. %{error}
+      over_rows_processing_limit: enhavas pli ol %{count} vicoj
     modes:
       merge: Kunigi
       merge_long: Konservi ekzistajn registrojn kaj aldoni novajn
@@ -872,7 +1199,6 @@ eo:
       following: Listo de sekvatoj
       muting: Listo de silentigitoj
     upload: Alŝuti
-  in_memoriam_html: Memore
   invites:
     delete: Malaktivigi
     expired: Eksvalida
@@ -890,7 +1216,7 @@ eo:
       one: 1 uzo
       other: "%{count} uzoj"
     max_uses_prompt: Neniu limo
-    prompt: Krei kaj diskonigi ligilojn al aliaj por doni aliron al ĉi tiu servilo
+    prompt: Generi kaj kundividi ligilojn kun la aliaj por doni aliron al ĉi tiu servilo
     table:
       expires_at: Eksvalidiĝas je
       uses: Uzoj
@@ -900,17 +1226,24 @@ eo:
       limit: Vi atingis la maksimuman kvanton de listoj
   login_activities:
     authentication_methods:
+      otp: 2-faktora autentigprogramaro
       password: pasvorto
       sign_in_token: retpoŝta sekureca kodo
       webauthn: sekurecaj ŝlosiloj
+    description_html: Se vi vidas nerekonitan agon, eble ŝanĝu vian pasvorton.
+    empty: Neniu autentighistorio disponebla
+    failed_sign_in_html: Malsukcese ensalutprovo per %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Sukcese ensaluto per %{method} de %{ip} (%{browser})
     title: Aŭtentiga historio
   media_attachments:
     validations:
       images_and_video: Aldoni videon al mesaĝo, kiu jam havas bildojn ne eblas
+      not_ready: Ne povas aldoni dosieron kiu ne finas procezitis.
       too_many: Aldoni pli ol 4 dosierojn ne eblas
   migrations:
     acct: Movigita al
     cancel: Nuligi alidirekton
+    cancel_explanation: Nuligi la alidirekton reaktivigos vian nunan konton sed ne regajnas sekvantojn.
     cancelled_msg: Sukcese forigis la alidirekton.
     errors:
       already_moved: estas la saman konton vi jam translokiĝis al
@@ -921,27 +1254,37 @@ eo:
     followers_count: Sekvantoj en la momento de moviĝo
     incoming_migrations: Moviĝi el alia konto
     incoming_migrations_html: Por moviĝi el alia konto al ĉi tiu, vi unue devas <a href="%{path}">krei kromnomo de konto</a>.
+    moved_msg: Vua konto nun alidirektas al %{acct} kaj via sekvantoj translokigitas.
+    not_redirecting: Via konto ne alidirektas al ajn alia konto nun.
+    on_cooldown: Vi lastatempe translokigis vian konton. Ĝi estos disponebla malantau ol %{count} dioj.
     past_migrations: Pasintaj translokaj
     proceed_with_move: Translokigi sekvantoj
     redirected_msg: Via konto nun alidirektas al %{acct}.
     redirecting_to: Via konto alidirektas al %{acct}.
     set_redirect: Agordi alidirekton
     warning:
+      backreference_required: La nova konto devas unue fiksitis antaureferenci al ĉi tio
+      before: 'Antau ol dauri, legu ĉi tiujn notojn zorgeme:'
+      cooldown: Malantau ol translokigo, havas atenddauro kiam vi ne povas translokigi denove
+      disabled_account: Via nuna konto ne estos tute uzebla poste.
+      followers: Ĉi tiu ago translokigos ĉi tiujn sekvantojn de la nuna konto al la nova konto
       only_redirect_html: Alie, vi povas <a href="%{path}">nur aldoni alidirekton en via profilo</a>.
+      other_data: Neniu alia datumo estos movita aŭtomate
+      redirect: Via nuna profilo de konto ĝisdatigotas kun alidirektoavizo
   moderation:
-    title: Kontrolado
+    title: Moderigado
+  move_handler:
+    carry_blocks_over_text: Ĉi tiu uzanto translokis de %{acct} kiun vi blokis.
+    carry_mutes_over_text: Ĉi tiu uzanto translokis de %{acct} kiun vi silentigis.
+    copy_account_note_text: 'Ĉi tiu uzanto translokis de %{acct}, ĉi tio estas viaj antauaj notoj pri ĝi:'
+  navigation:
+    toggle_menu: Baskuli menuon
   notification_mailer:
-    digest:
-      action: Vidi ĉiujn sciigojn
-      body: Jen eta resumo de la mesaĝoj, kiujn vi mistrafis ekde via lasta vizito en %{since}
-      mention: "%{name} menciis vin en:"
-      new_followers_summary:
-        one: Ankaŭ, vi ekhavis novan sekvanton en via foresto! Jej!
-        other: Ankaŭ, vi ekhavis %{count} novajn sekvantojn en via foresto! Mirinde!
-      subject:
-        one: "1 nova sciigo ekde via lasta vizito \U0001F418"
-        other: "%{count} novaj sciigoj ekde via lasta vizito \U0001F418"
-      title: En via foresto…
+    admin:
+      report:
+        subject: "%{name} sendis raporton"
+      sign_up:
+        subject: "%{name} registriĝis"
     favourite:
       body: "%{name} stelumis vian mesaĝon:"
       subject: "%{name} stelumis vian mesaĝon"
@@ -960,12 +1303,16 @@ eo:
       body: "%{name} menciis vin en:"
       subject: "%{name} menciis vin"
       title: Nova mencio
+    poll:
+      subject: Enketo de %{name} finitas
     reblog:
-      body: "%{name} diskonigis vian mesaĝon:"
+      body: 'Via mesaĝo estis diskonigita de %{name}:'
       subject: "%{name} diskonigis vian mesaĝon"
       title: Nova diskonigo
     status:
       subject: "%{name} ĵus afiŝita"
+    update:
+      subject: "%{name} redaktis afiŝon"
   notifications:
     email_events: Eventoj por retpoŝtaj sciigoj
     email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
@@ -982,7 +1329,8 @@ eo:
           trillion: Dn
   otp_authentication:
     code_hint: Enmetu la kodon kreitan de via aŭtentiga aplikaĵo por konfirmi
-    enable: Ebligi
+    description_html: Se vi ŝaltas <strong>dufaktoran aŭtentigon</strong> per aŭtentiga programo, saluti postulos ke vi havas vian telefonon, kiu generos ĵetonon por enigi.
+    enable: Ŝalti
     instructions_html: "<strong>Skanu ĉi tiun QR-kodon per Google Authenticator aŭ per simila aplikaĵo en via poŝtelefono</strong>. De tiam, la aplikaĵo kreos nombrojn, kiujn vi devos enmeti."
     manual_instructions: 'Se vi ne povas skani la QR-kodon kaj bezonas enmeti ĝin mane, jen la tut-teksta sekreto:'
     setup: Agordi
@@ -1006,8 +1354,10 @@ eo:
       too_many_options: ne povas enhavi pli da %{max} proponoj
   preferences:
     other: Aliaj aferoj
-    posting_defaults: Afiŝadoj defaŭltoj
+    posting_defaults: Afiŝaj defaŭltoj
     public_timelines: Publikaj templinioj
+  privacy_policy:
+    title: Privateca politiko
   reactions:
     errors:
       limit_reached: Limito de malsamaj reagoj atinginta
@@ -1025,27 +1375,20 @@ eo:
     mutual: Reciproka
     primary: Primara
     relationship: Rilato
-    remove_selected_domains: Forigi ĉiuj sekvantojn el la selektitajn domajnojn
+    remove_selected_domains: Forigi ĉiujn sekvantojn el la selektitaj domajnoj
     remove_selected_followers: Forigi selektitajn sekvantojn
     remove_selected_follows: Ne plu sekvi elektitajn uzantojn
     status: Statuso de la konto
   remote_follow:
-    acct: Enmetu vian uzantnomo@domajno de kie vi volas agi
     missing_resource: La bezonata URL de plusendado por via konto ne estis trovita
-    no_account_html: Ĉu vi ne havas konton? Vi povas <a href='%{sign_up_path}' target='_blank'>registriĝi tie</a>
-    proceed: Daŭrigi por eksekvi
-    prompt: 'Vi eksekvos:'
-    reason_html: "<strong>Kial necesas ĉi tiu paŝo?</strong><code>%{instance}</code> povus ne esti la servilo, kie vi registriĝis, do ni unue bezonas alidirekti vin al via hejma servilo."
-  remote_interaction:
-    favourite:
-      proceed: Konfirmi la stelumon
-      prompt: 'Vi volas stelumi ĉi tiun mesaĝon:'
-    reblog:
-      proceed: Konfirmi la diskonigon
-      prompt: 'Vi volas diskonigi ĉi tiun mesaĝon:'
-    reply:
-      proceed: Konfirmi la respondon
-      prompt: 'Vi volas respondi al ĉi tiu mesaĝo:'
+  reports:
+    errors:
+      invalid_rules: ne referencas validajn regulojn
+  rss:
+    content_warning: 'Averto pri enhavo:'
+    descriptions:
+      account: Publikaj mesaĝoj de @%{acct}
+      tag: 'Publikaj afiŝoj pri #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Vi transpasis la limigon al %{limit} samtage planitaj mesaĝoj
     over_total_limit: Vi transpasis la limigon al %{limit} planitaj mesaĝoj
@@ -1069,7 +1412,7 @@ eo:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Nuna seanco
     description: "%{browser} en %{platform}"
@@ -1091,6 +1434,7 @@ eo:
     revoke: Malvalidigi
     revoke_success: Seanco sukcese malvalidigita
     title: Seancoj
+    view_authentication_history: Vidi autentighistorion de via konto
   settings:
     account: Konto
     account_settings: Agordoj de konto
@@ -1103,14 +1447,15 @@ eo:
     edit_profile: Redakti profilon
     export: Eksporti datumojn
     featured_tags: Elstarigitaj kradvortoj
-    identity_proofs: Pruvo de identeco
     import: Importi
-    import_and_export: Alporto kaj elporto
+    import_and_export: Importi kaj eksporti
     migrate: Konta migrado
     notifications: Sciigoj
     preferences: Preferoj
     profile: Profilo
     relationships: Sekvatoj kaj sekvantoj
+    statuses_cleanup: Automata mesaĝforigo
+    strikes: Kontroladmonoj
     two_factor_authentication: Dufaktora aŭtentigo
     webauthn_authentication: Sekurecaj ŝlosiloj
   statuses:
@@ -1126,17 +1471,20 @@ eo:
         one: "%{count} video"
         other: "%{count} videoj"
     boosted_from_html: Diskonigita de %{acct_link}
-    content_warning: 'Enhava averto: %{warning}'
+    content_warning: 'Averto pri enhavo: %{warning}'
+    default_language: Sama lingvo kiel tiu de la interfaco
     disallowed_hashtags:
       one: 'enhavas malpermesitan kradvorton: %{tags}'
       other: 'enhavis malpermesitan kradvorton: %{tags}'
-    language_detection: Aŭtomate detekti la lingvon
+    edited_at_html: Redaktis je %{date}
+    errors:
+      in_reply_not_found: Mesaĝo kiun vi provas respondi ŝajnas ne ekzisti.
     open_in_web: Malfermi retumile
     over_character_limit: limo de %{max} signoj transpasita
     pin_errors:
+      direct: Mesaĝoj kiu videbla nun al la uzantoj ne povas alpinglitis
       limit: Vi jam atingis la maksimuman nombron de alpinglitaj mesaĝoj
       ownership: Mesaĝo de iu alia ne povas esti alpinglita
-      private: Mesaĝo nepublika ne povas esti alpinglita
       reblog: Diskonigo ne povas esti alpinglita
     poll:
       total_people:
@@ -1146,11 +1494,11 @@ eo:
         one: "%{count} voĉdono"
         other: "%{count} voĉdonoj"
       vote: Voĉdoni
-    show_more: Malfoldi
+    show_more: Montri pli
     show_newer: Montri pli novajn
     show_older: Montri pli malnovajn
-    show_thread: Montri la fadenon
-    sign_in_to_participate: Ensaluti por partopreni en la konversacio
+    show_thread: Montri la mesaĝaron
+    sign_in_to_participate: Ensalutu por partopreni la konversacion
     title: "%{name}: “%{quote}”"
     visibilities:
       direct: Rekta
@@ -1158,40 +1506,64 @@ eo:
       private_long: Montri nur al sekvantoj
       public: Publika
       public_long: Ĉiuj povas vidi
-      unlisted: Nelistigita
+      unlisted: Ne enlistigita
       unlisted_long: Ĉiuj povas vidi, sed nelistigita en publikaj templinioj
   statuses_cleanup:
     enabled: Aŭtomate forigi malnovajn postojn
+    enabled_hint: Automate forigi viajn mesaĝojn kiam ili atingas la aĝlimon kaj havas escepton
     exceptions: Esceptoj
-    ignore_favs: Ignori ŝatatajn
-    ignore_reblogs: Ignori akcelojn
+    explanation: Forigi mesaĝojn estas rimeda ago, do ĉi tio malrapide sekve faratas kiam la servilo ne estas okupita.
+    ignore_favs: Ignori stelumojn
+    ignore_reblogs: Ignori diskonigojn
+    interaction_exceptions: Esceptoj lau interagoj
+    interaction_exceptions_explanation: Sciu ke estas neniu garantio ke mesaĝo estos forigita se ĝi iras sub la limo de diskonigoj aŭ stelumoj post atingi ĝin.
+    keep_direct: Konservi rektajn mesaĝojn
+    keep_direct_hint: Ne forigos viajn rektajn mesagôjn
+    keep_media: Konservi mesaĝojn kun aŭdovidaj aldonaĵoj
+    keep_media_hint: Ne forigi mesaĝojn kiuj enhavas aŭdovidajn aldonaĵojn
+    keep_pinned: Konservi alpinglitajn mesaĝojn
+    keep_pinned_hint: Ne forigi viajn ajn alpinglitajn mesaĝojn
+    keep_polls: Konservi enketojn
+    keep_polls_hint: Ne forigi viajn ajn enketojn
+    keep_self_bookmark: Konservi mesaĝojn kiun vi legsignis
+    keep_self_bookmark_hint: Ne forigi viajn siajn mesaĝojn se vi legsignis ilin
+    keep_self_fav: Konservi mesaĝojn kiujn vi stelumis
+    keep_self_fav_hint: Ne forigi proprajn mesaĝojn se vi stelumis ilin
     min_age:
       '1209600': 2 semajnoj
       '15778476': 6 monatoj
       '2629746': 1 monato
       '31556952': 1 jaro
       '5259492': 2 monatoj
+      '604800': 1 semajno
       '63113904': 2 jaroj
       '7889238': 3 monatoj
+    min_age_label: Aĝlimo
+    min_favs: Konservi mesaĝojn stelumitajn almenaŭ
+    min_favs_hint: Ne forigas mesaĝojn de vi kiuj ricevis almenaŭ tiom da stelumoj. Lasu malplena por forigi mesaĝojn sendepende de la nombro de stelumoj
+    min_reblogs: Konservi diskonitajn mesaĝojn almenau
+    min_reblogs_hint: Oni ne forigas viajn afiŝojn kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
   stream_entries:
     pinned: Alpinglita
     reblogged: diskonigita
     sensitive_content: Tikla enhavo
+  strikes:
+    errors:
+      too_late: Estas tro malfrua por apelacii ĉi tiun admonon
   tags:
     does_not_match_previous_name: ne kongruas kun la antaŭa nomo
-  terms:
-    title: Uzkondiĉoj kaj privateca politiko de %{instance}
   themes:
     contrast: Mastodon (Forta kontrasto)
-    default: Mastodon (Malluma)
-    mastodon-light: Mastodon (Luma)
+    default: Mastodon (Malhela)
+    mastodon-light: Mastodon (Hela)
   time:
     formats:
-      default: "%Y-%m-%d %H:%M"
+      default: "%Y.%b.%d, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Aldoni
-    disable: Malebligi
+    disable: Malebligi 2FA-n
     disabled_success: Dufaktora aŭtentigo sukcese malebligita
     edit: Redakti
     enabled: Dufaktora aŭtentigo ebligita
@@ -1199,66 +1571,96 @@ eo:
     generate_recovery_codes: Krei realirajn kodojn
     lost_recovery_codes: Realiraj kodoj permesas rehavi aliron al via konto se vi perdis vian telefonon. Se vi perdis viajn realirajn kodojn, vi povas rekrei ilin ĉi tie. Viaj malnovaj realiraj kodoj iĝos eksvalidaj.
     methods: Metodoj de dufaktora aŭtentigo
+    otp: Aŭtentigprogramaro
     recovery_codes: Realiraj kodoj
     recovery_codes_regenerated: Realiraj kodoj sukcese rekreitaj
     recovery_instructions_html: Se vi perdas aliron al via telefono, vi povas uzi unu el la subaj realiraj kodoj por rehavi aliron al via konto. <strong>Konservu realirajn kodojn sekure</strong>. Ekzemple, vi povas printi ilin kaj konservi ilin kun aliaj gravaj dokumentoj.
     webauthn: Sekurecaj ŝlosiloj
   user_mailer:
+    appeal_approved:
+      action: Iri al via konto
+      explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
+      subject: Via apelacio de %{date} aprobitas
+      title: Apelacio estis aprobita
+    appeal_rejected:
+      explanation: La apelacio je %{strike_date} pri dato %{appeal_date} malakceptitas.
+      subject: Via apelacio de %{date} estis malaprobita
+      title: Apelacio estis malaprobita
     backup_ready:
       explanation: Vi petis kompletan arkivon de via Mastodon-konto. Ĝi nun pretas por elŝutado!
       subject: Via arkivo estas preta por elŝutado
       title: Arkiva elŝuto
+    suspicious_sign_in:
+      change_password: ŝanĝi vian pasvorton
+      details: 'Detaloj pri ensaluto:'
+      explanation: Ni detektas ensaluton al via konto de nova IP-adreso.
+      further_actions_html: Se ne estas vi, ni rekomendas ke vi %{action} tuj por sekurigi vian konton.
+      subject: Via konto estas alirita de nova IP-adreso
+      title: Nova ensaluto
     warning:
+      appeal: Sendi apelacion
+      appeal_description: Se vi pensas ke ĉi tio estas eraro, vi povas sendi apelacion al la teamo de %{instance}.
+      categories:
+        spam: Spamo
+        violation: Enhavo malsekvas la komunumgvidilojn
       explanation:
-        disable: Dum via konto estas frostigita, via kontaj datumoj restas intaktaj, sed vi ne povas plenumi iujn agojn ĝis ĝi estas malhaltigita.
-        silence: Dum via konto estas limigita, nur tiuj, kiuj jam sekvas vin, vidos viajn mesaĝojn en ĉi tiu servilo, kaj vi povus esti ekskludita de diversaj publikaj listoj. Tamen, aliaj ankoraŭ povas mane sekvi vin.
-        suspend: Via konto estis haltigita, kaj ĉiuj el viaj mesaĝoj kaj alŝutitaj aŭdovidaj dosieroj estis nemalfareble forigitaj de ĉi tiu servilo, kaj de la serviloj, kie vi havis sekvantojn.
-      review_server_policies: Superrigardi servilajn politikojn
-      statuses: 'Specife, per:'
+        delete_statuses: Kelkaj viaj mesaĝoj trovitas malsekvi komunumgvidilojn kaj forigitas de kontrolantoj de %{instance}.
+        disable: Vi ne povas uzi vian konton plu sed via profilo kaj alia datumo restas bone.
+        mark_statuses_as_sensitive: Kelkaj viaj mesaĝoj markitas kiel sentemaj de kontrolantoj de %{instance}. Vi povas marki mem kiam mesaĝi dum la estonteco.
+        sensitive: Malantau ol nun, ĉiuj viaj alŝutitaj audovidaĵoj markitas kiel sentemaj kaj kaŝitas.
+        silence: Vi ankorau povas uzi vian konton sed nur personoj kiu jam sekvis vin vidos viaj mesaĝoj ĉe ĉi tiu servilo.
+        suspend: Vi ne povas uzi vian konton plu, kaj via profilo kaj aliaj datumoj ne estas disponeblaj plu.
+      reason: 'Kialo:'
+      statuses: 'Mesaĝoj ripetitaj:'
       subject:
+        delete_statuses: Viaj mesaĝoj ĉe %{acct} forigitas
         disable: Via konto %{acct} estas frostigita
+        mark_statuses_as_sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj
         none: Averto por %{acct}
-        silence: Via konto %{acct} estas limigita
-        suspend: Via konto %{acct} estas haltigita
+        sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj malantau ol nun
+        silence: Oni limigis vian konton %{acct}
+        suspend: Via konto %{acct} estas suspendita
       title:
+        delete_statuses: Afiŝoj forigitaj
         disable: Konto frostigita
+        mark_statuses_as_sensitive: Mesaĝoj markitaj kiel sentemaj
         none: Averto
+        sensitive: Konto markita kiel sentema
         silence: Konto limigita
-        suspend: Konto haltigita
+        suspend: Konto suspendita
     welcome:
       edit_profile_action: Agordi profilon
-      edit_profile_step: Vi povas proprigi vian profilon per alŝuto de profilbildo, fonbildo, ŝanĝo de via afiŝita nomo kaj pli. Se vi ŝatus kontroli novajn sekvantojn antaŭ ol ili rajtas sekvi vin, vi povas ŝlosi vian konton.
+      edit_profile_step: Vi povas personecigi vian profilon per alŝuti profilbildon, ŝangi vian montronomo kaj pli.
       explanation: Jen kelkaj konsiloj por helpi vin komenci
       final_action: Ekmesaĝi
-      final_step: 'Ekmesaĝu! Eĉ sen sekvantoj, viaj publikaj mesaĝoj povas esti vidataj de aliaj, ekzemple en la loka templinio kaj en la kradvortoj. Eble vi ŝatus prezenti vin per la kradvorto #introductions.'
+      final_step: 'Ekmesaĝu! Eĉ sen sekvantoj, viaj publikaj mesaĝoj povas esti vidataj de aliaj, ekzemple en la loka templinio aŭ per kradvortoj. Eble vi ŝatus prezenti vin per la kradvorto #introductions / #konigo.'
       full_handle: Via kompleta uzantnomo
       full_handle_hint: Jen kion vi dirus al viaj amikoj, por ke ili mesaĝu aŭ sekvu vin de alia servilo.
-      review_preferences_action: Ŝanĝi preferojn
-      review_preferences_step: Estu certa ke vi agordis viajn preferojn, kiel kiujn retmesaĝojn vi ŝatus ricevi, aŭ kiun dekomencan privatecan nivelon vi ŝatus ke viaj mesaĝoj havu. Se tio ne ĝenas vin, vi povas ebligi aŭtomatan ekigon de GIF-oj.
       subject: Bonvenon en Mastodon
-      tip_federated_timeline: La fratara templinio estas antaŭvido de la reto de Mastodon. Sed ĝi enhavas nur homojn, kiuj estas sekvataj de aliaj homoj de via nodo, do ĝi ne estas kompleta.
-      tip_following: Vi dekomence sekvas la administrantojn de via servilo. Por trovi pli da interesaj homoj, rigardu la lokan kaj frataran templiniojn.
-      tip_local_timeline: La loka templinio estas antaŭvido de la homoj en %{instance}. Ĉi tiuj estas viaj apudaj najbaroj!
-      tip_mobile_webapp: Se via telefona retumilo proponas al vi aldoni Mastodon al via hejma ekrano, vi povas ricevi puŝsciigojn. Tio multmaniere funkcias kiel operaciuma aplikaĵo!
-      tips: Konsiloj
       title: Bonvenon, %{name}!
   users:
     follow_limit_reached: Vi ne povas sekvi pli ol %{limit} homo(j)
     invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
-    invalid_sign_in_token: Nevalida sekureca kodo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
-    signed_in_as: 'Ensalutinta kiel:'
+    signed_in_as: 'Salutinta kiel:'
   verification:
     explanation_html: 'Vi povas <strong>pruvi, ke vi estas la posedanto de la ligiloj en viaj profilaj metadatumoj</strong>. Por fari tion, la alligita retejo devas enhavi ligilon reen al via Mastodon-profilo. La religilo <strong>devas</strong> havi la atributon <code>rel="me"</code>. Ne gravas la teksta enhavo de la religilo. Jen ekzemplo:'
     verification: Kontrolo
   webauthn_credentials:
     add: Aldoni novan sekurecan ŝlosilon
     create:
+      error: Havas problemon kiam aldoni vian sekurecŝlosilon.
       success: Via sekureca ŝlosilo estis sukcese aldonita.
     delete: Forigi
     delete_confirmation: Ĉu vi certas, ke vi volas forigi ĉi tiun sekurecan ŝlosilon?
+    description_html: Se vi ebligas <strong>sekurecŝlosilautentigo</strong>, ensaluto bezonas vin uzi tiojn.
     destroy:
+      error: Havas problemo kiam forigi vian sekurecŝlosilon.
       success: Via sekureca ŝlosilo estis sukcese forigita.
     invalid_credential: Nevalida sekureca ŝlosilo
+    nickname_hint: Enigu alinomon de via nova sekurecŝlosilo
+    not_enabled: Vu ne ebligas WebAuthn ĝis nun
+    not_supported: Ĉi tiu legilo ne povas uzi sekurecŝlosilojn
+    otp_required: Por uzi sekurecŝlosilojn, ebligu 2-faktoran autentigon unue.
     registered_on: Registrigita je %{date}
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 15a7cdb60..3f5ef4ede 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1,92 +1,27 @@
 ---
 es-AR:
   about:
-    about_hashtag_html: Estos son mensajes públicos etiquetados con <strong>#%{hashtag}</strong>. Si tenés una cuenta en cualquier parte del fediverso, podés interactuar con ellos.
     about_mastodon_html: 'La red social del futuro: ¡sin publicidad, sin vigilancia corporativa, con diseño ético y descentralización! ¡Con Mastodon vos sos el dueño de tus datos!'
-    about_this: Acerca de Mastodon
-    active_count_after: activo
-    active_footnote: Usuarios activos mensualmente (MAU)
-    administered_by: 'Administrado por:'
-    api: API
-    apps: Aplicaciones móviles
-    apps_platforms: Usá Mastodon desde iOS, Android y otras plataformas
-    browse_directory: Explorá el directorio de perfiles y filtrá por intereses
-    browse_local_posts: Explorá un flujo en tiempo real de mensajes públicos en este servidor
-    browse_public_posts: Explorá un flujo en tiempo real de mensajes públicos en Mastodon
-    contact: Contacto
     contact_missing: No establecido
     contact_unavailable: No disponible
-    discover_users: Descubrí usuarios
-    documentation: Documentación
-    federation_hint_html: Con una cuenta en %{instance} vas a poder seguir a cuentas de cualquier servidor de Mastodon y más allá.
-    get_apps: Probá una aplicación móvil
     hosted_on: Mastodon alojado en %{domain}
-    instance_actor_flash: |
-      Esta cuenta es un actor virtual usado para representar al propio servidor y no a ningún usuario individual.
-      Se usa para fines federativos y no debe ser bloqueado a menos que quieras bloquear toda la instancia, en cuyo caso deberías usar un bloqueo de dominio.
-    learn_more: Aprendé más
-    privacy_policy: Política de privacidad
-    rules: Reglas del servidor
-    rules_html: 'Abajo hay un resumen de las reglas que tenés que seguir si querés tener una cuenta en este servidor de Mastodon:'
-    see_whats_happening: Esto es lo que está pasando ahora
-    server_stats: 'Estadísticas del servidor:'
-    source_code: Código fuente
-    status_count_after:
-      one: mensaje
-      other: mensajes
-    status_count_before: Que enviaron
-    tagline: Seguí a tus amigos y descubrí nueva gente
-    terms: Términos del servicio
-    unavailable_content: Servidores moderados
-    unavailable_content_description:
-      domain: Servidor
-      reason: Motivo
-      rejecting_media: 'Los archivos de medios de este servidor no van a ser procesados y no se mostrarán miniaturas, lo que requiere un clic manual hacia el archivo original:'
-      rejecting_media_title: Medios filtrados
-      silenced: 'Los mensajes de estos servidores se ocultarán en las líneas temporales y conversaciones públicas, y no se generarán notificaciones de las interacciones de sus usuarios, a menos que los estés siguiendo:'
-      silenced_title: Servidores limitados
-      suspended: 'No se procesarán, almacenarán o intercambiarán datos de estos servidores, haciendo imposible cualquier interacción o comunicación con los usuarios de estos servidores:'
-      suspended_title: Servidores suspendidos
-    unavailable_content_html: Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se hicieron en este servidor en particular.
-    user_count_after:
-      one: usuario
-      other: usuarios
-    user_count_before: Hogar de
-    what_is_mastodon: "¿Qué es Mastodon?"
+    title: Información
   accounts:
-    choices_html: 'Recomendados de %{name}:'
-    endorsements_hint: Podés recomendar, desde la interface web, a cuentas que seguís, y van a aparecer acá.
-    featured_tags_hint: Podés destacar etiquetas específicas que se mostrarán acá.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: Siguiendo
     instance_actor_flash: Esta cuenta es un actor virtual usado para representar al servidor en sí mismo y no a ningún usuario individual. Se usa para propósitos de la federación y no debe ser suspendido.
-    joined: En este servidor desde %{date}
     last_active: última actividad
     link_verified_on: La propiedad de este enlace fue verificada el %{date}
-    media: Medios
-    moved_html: "%{name} se mudó a %{new_profile_link}:"
-    network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada acá!"
-    people_followed_by: "%{name} sigue a estas personas"
-    people_who_follow: Estas personas siguen a %{name}
     pin_errors:
       following: Ya tenés que estar siguiendo a la cuenta que querés recomendar
     posts:
       one: Mensaje
       other: Mensajes
     posts_tab_heading: Mensajes
-    posts_with_replies: Mensajes y respuestas
-    roles:
-      admin: Administrador
-      bot: Bot
-      group: Grupo
-      moderator: Moderador
-    unavailable: Perfil no disponible
-    unfollow: Dejar de seguir
   admin:
     account_actions:
       action: Ejecutar acción
@@ -94,26 +29,30 @@ es-AR:
     account_moderation_notes:
       create: Dejar nota
       created_msg: "¡Nota de moderación creada exitosamente!"
-      delete: Eliminar
       destroyed_msg: "¡Nota de moderación destruída exitosamente!"
     accounts:
       add_email_domain_block: Bloquear el dominio del correo electrónico
       approve: Aprobar
-      approve_all: Aprobar todas
       approved_msg: Se aprobó exitosamente la solicitud de registro de %{username}
       are_you_sure: "¿Estás seguro?"
       avatar: Avatar
       by_domain: Dominio
       change_email:
-        changed_msg: "¡Correo electrónico de cuenta cambiado exitosamente!"
+        changed_msg: "¡Correo electrónico cambiado exitosamente!"
         current_email: Correo electrónico actual
         label: Cambiar correo electrónico
         new_email: Nuevo correo electrónico
         submit: Cambiar correo electrónico
         title: Cambiar correo electrónico para %{username}
+      change_role:
+        changed_msg: "¡Rol cambiado exitosamente!"
+        label: Cambiar rol
+        no_role: Sin rol
+        title: Cambiar rol para %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmación
+      custom: Personalizar
       delete: Eliminar datos
       deleted: Eliminado
       demote: Bajar de nivel
@@ -153,7 +92,7 @@ es-AR:
         active: Activas
         all: Todas
         pending: Pendientes
-        silenced: Limitadas
+        silenced: Limitada
         suspended: Suspendidas
         title: Moderación
       moderation_notes: Notas de moderación
@@ -161,9 +100,14 @@ es-AR:
       most_recent_ip: Dirección IP más reciente
       no_account_selected: No se cambió ninguna cuenta ya que ninguna fue seleccionada
       no_limits_imposed: Sin límites impuestos
+      no_role_assigned: Sin rol asignado
       not_subscribed: No suscripto
       pending: Revisión pendiente
       perform_full_suspension: Suspender
+      previous_strikes: Incumplimientos previos
+      previous_strikes_description_html:
+        one: Esta cuenta tiene <strong>un</strong> incumplimiento.
+        other: Esta cuenta tiene <strong>%{count}</strong> incumplimientos.
       promote: Promover
       protocol: Protocolo
       public: Pública
@@ -171,8 +115,9 @@ es-AR:
       redownload: Refrescar perfil
       redownloaded_msg: Se refrescó exitosamente el perfil de %{username} desde el origen
       reject: Rechazar
-      reject_all: Rechazar todas
       rejected_msg: Se rechazó exitosamente la solicitud de registro de %{username}
+      remote_suspension_irreversible: Los datos de esta cuenta fueron eliminados irreversiblemente.
+      remote_suspension_reversible_hint_html: La cuenta fue suspendida en su servidor y los datos se eliminarán completamente el %{date}. Hasta entonces, el servidor remoto puede restaurar esta cuenta sin ningún efecto perjudicial. Si querés eliminar todos los datos de la cuenta inmediatamente, podés hacerlo abajo.
       remove_avatar: Quitar avatar
       remove_header: Quitar cabecera
       removed_avatar_msg: Se quitó exitosamente el avatar de %{username}
@@ -184,19 +129,13 @@ es-AR:
       reset: Restablecer
       reset_password: Cambiar contraseña
       resubscribe: Resuscribir
-      role: Permisos
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Administración
-        user: Usuario
+      role: Rol
       search: Buscar
       search_same_email_domain: Otros usuarios con el mismo dominio de correo electrónico
       search_same_ip: Otros usuarios con la misma dirección IP
       security_measures:
         only_password: Sólo contraseña
         password_and_2fa: Contraseña y 2FA
-        password_and_sign_in_token: Contraseña y token por correo electrónico
       sensitive: Forzar como sensible
       sensitized: Marcado como sensible
       shared_inbox_url: Dirección web de la bandeja de entrada compartida
@@ -206,12 +145,15 @@ es-AR:
       silence: Limitar
       silenced: Limitadas
       statuses: Mensajes
+      strikes: Sanciones previas
       subscribe: Suscribirse
+      suspend: Suspender
       suspended: Suspendidas
       suspension_irreversible: Se eliminaron irreversiblemente los datos de esta cuenta. Podés dejar de suspenderla para hacerla utilizable, pero no se recuperarán los datos que tenía anteriormente.
       suspension_reversible_hint_html: La cuenta fue suspendida y los datos se eliminarán completamente el %{date}. Hasta entonces, la cuenta puede ser restaurada sin ningún efecto perjudicial. Si querés eliminar todos los datos de la cuenta inmediatamente, podés hacerlo abajo.
-      time_in_queue: Esperando en cola %{time}
       title: Cuentas
+      unblock_email: Desbloquear dirección de correo electrónico
+      unblocked_email_msg: Se desbloqueó exitosamente la dirección de correo electrónico de %{username}
       unconfirmed_email: Correo electrónico sin confirmar
       undo_sensitized: Deshacer Forzar como sensible
       undo_silenced: Deshacer límite
@@ -226,26 +168,34 @@ es-AR:
       whitelisted: Permitidas para federación
     action_logs:
       action_types:
+        approve_appeal: Aprobar apelación
+        approve_user: Aprobar usuario
         assigned_to_self_report: Asignar denuncia
         change_email_user: Cambiar correo electrónico del usuario
+        change_role_user: Cambiar rol del usuario
         confirm_user: Confirmar usuario
         create_account_warning: Crear advertencia
         create_announcement: Crear anuncio
+        create_canonical_email_block: Crear bloqueo de correo electrónico
         create_custom_emoji: Crear emoji personalizado
         create_domain_allow: Crear permiso de dominio
         create_domain_block: Crear bloqueo de dominio
         create_email_domain_block: Crear bloqueo de dominio de correo electrónico
         create_ip_block: Crear regla de dirección IP
         create_unavailable_domain: Crear dominio no disponible
+        create_user_role: Crear rol
         demote_user: Descender usuario
         destroy_announcement: Eliminar anuncio
+        destroy_canonical_email_block: Eliminar bloqueo de correo electrónico
         destroy_custom_emoji: Eliminar emoji personalizado
         destroy_domain_allow: Eliminar permiso de dominio
         destroy_domain_block: Eliminar bloqueo de dominio
         destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
+        destroy_instance: Purgar dominio
         destroy_ip_block: Eliminar regla de dirección IP
         destroy_status: Eliminar mensaje
         destroy_unavailable_domain: Eliminar dominio no disponible
+        destroy_user_role: Destruir rol
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar emoji personalizado
         disable_sign_in_token_auth_user: Deshabilitar autenticación de token por correo electrónico para el usuario
@@ -255,42 +205,56 @@ es-AR:
         enable_user: Habilitar usuario
         memorialize_account: Convertir en cuenta conmemorativa
         promote_user: Promover usuario
+        reject_appeal: Rechazar apelación
+        reject_user: Rechazar usuario
         remove_avatar_user: Quitar avatar
         reopen_report: Reabrir denuncia
+        resend_user: Reenviar correo electrónico de confirmación
         reset_password_user: Cambiar contraseña
         resolve_report: Resolver denuncia
         sensitive_account: Forzar cuenta como sensible
         silence_account: Limitar cuenta
         suspend_account: Suspender cuenta
         unassigned_report: Desasignar denuncia
+        unblock_email_account: Desbloquear dirección de correo electrónico
         unsensitive_account: Desmarcar Forzar cuenta como sensible
         unsilence_account: Deshacer Limitar cuenta
         unsuspend_account: Dejar de suspender cuenta
         update_announcement: Actualizar anuncio
         update_custom_emoji: Actualizar emoji personalizado
         update_domain_block: Actualizar bloque de dominio
+        update_ip_block: Actualizar regla de dirección IP
         update_status: Actualizar mensaje
+        update_user_role: Actualizar rol
       actions:
+        approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
+        approve_user_html: "%{name} aprobó el registro de %{target}"
         assigned_to_self_report_html: "%{name} se asignó la denuncia %{target} a sí"
         change_email_user_html: "%{name} cambió la dirección de correo electrónico del usuario %{target}"
+        change_role_user_html: "%{name} cambió el rol de %{target}"
         confirm_user_html: "%{name} confirmó la dirección de correo del usuario %{target}"
         create_account_warning_html: "%{name} envió una advertencia a %{target}"
         create_announcement_html: "%{name} creó el nuevo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueó el correo electrónico con el hash %{target}"
         create_custom_emoji_html: "%{name} subió nuevo emoji %{target}"
         create_domain_allow_html: "%{name} permitió la federación con el dominio %{target}"
         create_domain_block_html: "%{name} bloqueó el dominio %{target}"
         create_email_domain_block_html: "%{name} bloqueó el dominio de correo electrónico %{target}"
         create_ip_block_html: "%{name} creó la regla para la dirección IP %{target}"
         create_unavailable_domain_html: "%{name} detuvo la entrega al dominio %{target}"
+        create_user_role_html: "%{name} creó el rol %{target}"
         demote_user_html: "%{name} bajó de nivel al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
-        destroy_custom_emoji_html: "%{name} destruyó el emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminó el emoji %{target}"
         destroy_domain_allow_html: "%{name} no permitió la federación con el dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueó el dominio %{target}"
         destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}"
+        destroy_instance_html: "%{name} purgó el dominio %{target}"
         destroy_ip_block_html: "%{name} eliminó la regla para la dirección IP %{target}"
         destroy_status_html: "%{name} eliminó el mensaje de %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó la entrega al dominio %{target}"
+        destroy_user_role_html: "%{name} eliminó el rol %{target}"
         disable_2fa_user_html: "%{name} deshabilitó el requerimiento de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} deshabilitó el emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} deshabilitó la autenticación de token por correo electrónico para %{target}"
@@ -300,22 +264,28 @@ es-AR:
         enable_user_html: "%{name} habilitó el inicio de sesión para el usuario %{target}"
         memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una cuenta conmemorativa"
         promote_user_html: "%{name} promovió al usuario %{target}"
+        reject_appeal_html: "%{name} rechazó la solicitud de moderación de %{target}"
+        reject_user_html: "%{name} rechazó el registro de %{target}"
         remove_avatar_user_html: "%{name} quitó el avatar de %{target}"
         reopen_report_html: "%{name} reabrió la denuncia %{target}"
+        resend_user_html: "%{name} reenvió el correo electrónico de confirmación para %{target}"
         reset_password_user_html: "%{name} cambió la contraseña del usuario %{target}"
         resolve_report_html: "%{name} resolvió la denuncia %{target}"
         sensitive_account_html: "%{name} marcó los medios de %{target} como sensibles"
         silence_account_html: "%{name} limitó la cuenta de %{target}"
         suspend_account_html: "%{name} suspendió la cuenta de %{target}"
         unassigned_report_html: "%{name} desasignó la denuncia %{target}"
+        unblock_email_account_html: "%{name} desbloqueó la dirección de correo electrónico de %{target}"
         unsensitive_account_html: "%{name} desmarcó los medios de %{target} como sensibles"
         unsilence_account_html: "%{name} quitó el límite de la cuenta de %{target}"
         unsuspend_account_html: "%{name} quitó la suspensión de la cuenta de %{target}"
         update_announcement_html: "%{name} actualizó el anuncio %{target}"
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
+        update_ip_block_html: "%{name} cambió la regla para la dirección IP %{target}"
         update_status_html: "%{name} actualizó el mensaje de %{target}"
-      deleted_status: "[mensaje eliminado]"
+        update_user_role_html: "%{name} cambió el rol %{target}"
+      deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
@@ -354,11 +324,12 @@ es-AR:
       enable: Habilitar
       enabled: Habilitado
       enabled_msg: Se habilitó ese emoji exitosamente
-      image_hint: PNG de hasta 50KB
+      image_hint: PNG o GIF, hasta %{size}
       list: Listar
       listed: Listados
       new:
         title: Agregar nuevo emoji personalizado
+      no_emoji_selected: No se cambió ningún emoji, ya que ninguno fue seleccionado
       not_permitted: No tenés permiso para realizar esta acción
       overwrite: Sobreescribir
       shortcode: Código corto
@@ -371,13 +342,41 @@ es-AR:
       updated_msg: "¡Emoji actualizado exitosamente!"
       upload: Subir
     dashboard:
+      active_users: usuarios activos
+      interactions: interacciones
+      media_storage: Almacenamiento de medios
+      new_users: nuevos usuarios
+      opened_reports: denuncias abiertas
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelación pendiente"
+        other: "<strong>%{count}</strong> apelaciones pendientes"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> denuncia pendiente"
+        other: "<strong>%{count}</strong> denuncias pendientes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> etiqueta pendiente"
+        other: "<strong>%{count}</strong> etiquetas pendientes"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usuario pendiente"
+        other: "<strong>%{count}</strong> usuarios pendientes"
+      resolved_reports: denuncias resueltas
       software: Software
+      sources: Fuentes de registro
       space: Uso de almacenamiento
       title: Panel
+      top_languages: Idiomas más activos
+      top_servers: Servidores más activos
+      website: Sitio web
+    disputes:
+      appeals:
+        empty: No se encontraron apelaciones.
+        title: Apelaciones
     domain_allows:
       add_new: Permitir federación con el dominio
       created_msg: El dominio fue exitosamente permitido para la federación
       destroyed_msg: El dominio no fue permitido para la federación
+      export: Exportar
+      import: Importar
       undo: No permitir federación con el dominio
     domain_blocks:
       add_new: Agregar nuevo bloqueo de dominio
@@ -385,16 +384,21 @@ es-AR:
       destroyed_msg: Se deshizo el bloqueo de dominio
       domain: Dominio
       edit: Editar bloqueo de dominio
+      existing_domain_block: Ya impusiste límites más estrictos a %{name}.
       existing_domain_block_html: Ya le aplicaste límites más estrictos a %{name}, por lo que primero necesitás <a href="%{unblock_url}">desbloquearlo</a>.
+      export: Exportar
+      import: Importar
       new:
         create: Crear bloqueo
         hint: El bloqueo de dominio no va a prevenir la creación de mensajes de cuenta en la base de datos, pero se aplicarán métodos específicos de moderación en esas cuentas, retroactiva y automáticamente.
         severity:
-          desc_html: "<strong>Silenciar</strong> hará que los mensajes de la cuenta sean invisibles a quienes no estén siguiendo esa cuenta. <strong>Suspender</strong> quitará todo el contenido, archivos de medio y datos de perfil de la cuenta. Usá <strong>Ninguno</strong> si simplemente querés rechazar archivos de medios."
+          desc_html: "<strong>Limitar</strong> hará que los mensajes de cuentas en este dominio sean invisibles a quienes no las estén siguiendo. <strong>Suspender</strong> quitará todo el contenido, archivos de medio y datos de perfil de cuentas en este dominio de tu servidor. Usá <strong>Ninguno</strong> si simplemente querés rechazar archivos de medios."
           noop: Ninguno
-          silence: Silenciar
+          silence: Limitar
           suspend: Suspender
         title: Nuevo bloqueo de dominio
+      no_domain_block_selected: No se cambiaron bloques de dominio, ya que ninguno fue seleccionado
+      not_permitted: No tenés permiso para realizar esta acción
       obfuscate: Obfuscar nombre de dominio
       obfuscate_hint: Obfusca parcialmente el nombre de dominio en la lista, si el anuncio de la lista de limitaciones de dominio está habilitado
       private_comment: Comentario privado
@@ -405,62 +409,97 @@ es-AR:
       reject_media_hint: Quita los archivos de medios almacenados e impide la descarga en el futuro. Irrelevante para suspensiones
       reject_reports: Rechazar denuncias
       reject_reports_hint: Ignora todas las denuncias que vengan de este dominio. Irrelevante para suspensiones
-      rejecting_media: rechazo de archivos de medios
-      rejecting_reports: rechazo de denuncias
-      severity:
-        silence: limitados
-        suspend: suspendidos
-      show:
-        affected_accounts:
-          one: Una cuenta afectada en la base de datos
-          other: "%{count} cuentas afectadas en la base de datos"
-        retroactive:
-          silence: Quitar límite de las cuentas existentes afectadas de este dominio
-          suspend: Quitar suspensión de las cuentas existentes afectadas de este dominio
-        title: Deshacer el bloqueo de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer bloqueo de dominio
       view: Ver bloqueo de dominio
     email_domain_blocks:
       add_new: Agregar nuevo
+      attempts_over_week:
+        one: "%{count} intento durante la última semana"
+        other: "%{count} intentos durante la última semana"
       created_msg: Se bloqueó el dominio de correo electrónico exitosamente
       delete: Eliminar
-      destroyed_msg: Se desbloqueó el dominio de correo electrónico exitosamente
+      dns:
+        types:
+          mx: Registro MX
       domain: Dominio
-      empty: Actualmente no hay dominios de correo electrónico bloqueados.
-      from_html: de %{domain}
       new:
         create: Agregar dominio
+        resolve: Resolver dominio
         title: Bloquear nuevo dominio de correo electrónico
+      no_email_domain_block_selected: No se cambiaron bloques de dominio ya que no se seleccionó ninguno
+      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tené cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
+      resolved_through_html: Resuelto a través de %{domain}
       title: Dominios bloqueados de correo electrónico
+    export_domain_allows:
+      new:
+        title: Importar permisos de dominio
+      no_file: No hay ningún archivo seleccionado
+    export_domain_blocks:
+      import:
+        description_html: Estás a punto de importar una lista de bloques de dominio. Por favor, revisá esta lista con mucho cuidado, especialmente si no creaste esta lista vos mismo.
+        existing_relationships_warning: Relaciones de seguimientos existentes
+        private_comment_description_html: 'Para ayudarte a rastrear de dónde vienen los bloques importados, se crearán los mismos con el siguiente comentario privado: <q>%{comment}</q>'
+        private_comment_template: Importado desde %{source} el %{date}
+        title: Importar bloques de dominio
+      new:
+        title: Importar bloques de dominio
+      no_file: No hay ningún archivo seleccionado
     follow_recommendations:
       description_html: "<strong>Las recomendaciones de cuentas para seguir ayudan a los nuevos usuarios a encontrar rápidamente contenido interesante</strong>. Cuando un usuario no ha interactuado con otros lo suficiente como para formar recomendaciones personalizadas de seguimiento, se recomiendan estas cuentas, en su lugar. Se recalculan diariamente a partir de una mezcla de cuentas con las interacciones más recientes y el mayor número de seguidores para un idioma determinado."
       language: Por idioma
       status: Estado
       suppress: Eliminar recomendación de cuentas para seguir
       suppressed: Eliminado
-      title: Recomendaciones de cuentas para seguir
+      title: Recom. de cuentas a seguir
       unsuppress: Restablecer recomendaciones de cuentas para seguir
     instances:
+      availability:
+        description_html:
+          one: Si el envío al dominio falla durante <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+          other: Si el envío al dominio falla durante <strong>%{count} días</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+        failure_threshold_reached: Umbral de límite de fallo alcanzado el %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días.
+        no_failures_recorded: No hay fallos en el registro.
+        title: Disponibilidad
+        warning: El último intento de conexión a este servidor no fue exitoso
       back_to_all: Todos
       back_to_limited: Limitados
       back_to_warning: Advertencia
       by_domain: Dominio
+      confirm_purge: "¿Estás seguro que querés eliminar permanentemente los datos de este dominio?"
+      content_policies:
+        comment: Nota interna
+        description_html: Podés definir políticas de contenido que se aplicarán a todas las cuentas de este dominio y a cualquiera de sus subdominios.
+        policies:
+          reject_media: Rechazar medios
+          reject_reports: Rechazar denuncias
+          silence: Limitar
+          suspend: Suspender
+        policy: Política
+        reason: Razón pública
+        title: Políticas de contenido
+      dashboard:
+        instance_accounts_dimension: Cuentas más seguidas
+        instance_accounts_measure: cuentas almacenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: sus seguidores aquí
+        instance_languages_dimension: Idiomas principales
+        instance_media_attachments_measure: archivos adjuntos almacenados
+        instance_reports_measure: denuncias sobre ellos
+        instance_statuses_measure: mensajes almacenados
       delivery:
         all: Todos
         clear: Limpiar errores de entrega
+        failing: Fallo
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Falla de entrega %{count} día
-          other: Falla de entrega %{count} días
       delivery_available: La entrega está disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible durante %{count} días, se marcará automáticamente como no entregable.
+      destroyed_msg: Los datos de %{domain} están ahora en cola para su eliminación inminente.
       empty: No se encontraron dominios.
       known_accounts:
         one: "%{count} cuenta conocida"
@@ -471,12 +510,15 @@ es-AR:
         title: Moderación
       private_comment: Comentario privado
       public_comment: Comentario público
+      purge: Purgar
+      purge_description_html: Si creés que este dominio está fuera de línea para siempre, podés eliminar de tu almacenamiento todos los registros de cuentas y los datos asociados a este dominio. Esto puede llevar un tiempo.
       title: Federación
       total_blocked_by_us: Bloqueada por nosotros
       total_followed_by_them: Seguidas por ellos
       total_followed_by_us: Seguidas por nosotros
       total_reported: Denuncias sobre ellas
       total_storage: Adjuntos
+      totals_time_period_hint_html: Los datos totales mostrados a continuación incluyen datos para todo el tiempo.
     invites:
       deactivate_all: Desactivar todas
       filter:
@@ -500,8 +542,6 @@ es-AR:
         title: Crear nueva regla de dirección IP
       no_ip_block_selected: No se cambió ninguna regla de dirección IP, ya que no se seleccionó ninguna
       title: Reglas de dirección IP
-    pending_accounts:
-      title: Cuentas pendientes (%{count})
     relationships:
       title: Relaciones de %{acct}
     relays:
@@ -517,7 +557,7 @@ es-AR:
       pending: Esperando aprobación del relé
       save_and_enable: Guardar y habilitar
       setup: Configurar una conexión de relé
-      signatures_not_enabled: Los relés no funcionarán correctamente mientras el modo seguro o el de federación limitada estén habilitados
+      signatures_not_enabled: Puede que los relés no funcionen correctamente mientras el modo seguro o el de federación limitada estén habilitados
       status: Estado
       title: Relés
     report_notes:
@@ -528,39 +568,121 @@ es-AR:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} denuncia"
-          other: "%{count} denuncias"
+      action_log: Registro de auditoría
       action_taken_by: Acción tomada por
+      actions:
+        delete_description_html: Los mensajes denunciados serán eliminados y se registrará un incumplimiento para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos de medios en los mensajes denunciados se marcarán como sensibles y se registrará un incumplimiento para ayudarte a escalar las futuras infracciones de la misma cuenta.
+        other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta denunciada.
+        resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará el incumplimiento, y se cerrará la denuncia.
+        silence_description_html: El perfil será visible sólo para aquellos que ya sigan esta cuenta o que la busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
+        suspend_description_html: El perfil y todos sus contenidos serán inaccesibles hasta que sean finalmente eliminados. No será posible interactuar con la cuenta. Reversible dentro de los 30 días.
+      actions_description_html: Decidí qué medidas tomar para resolver esta denuncia. Si tomás una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
+      add_to_report: Agregar más a la denuncia
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
+      by_target_domain: Dominio de la cuenta denunciada
+      category: Categoría
+      category_description_html: El motivo por el que se denunció esta cuenta o contenido será citado en las comunicaciones con la cuenta denunciada
       comment:
         none: Ninguno
+      comment_description_html: 'Para proporcionar más información, %{name} escribió:'
       created_at: Denunciado
+      delete_and_resolve: Eliminar mensajes
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelta
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelta
+      no_one_assigned: Nadie
       notes:
         create: Agregar nota
         create_and_resolve: Resolver con nota
         create_and_unresolve: Reabrir con nota
         delete: Eliminar
         placeholder: Describí qué acciones se tomaron, o cualquier otra actualización relacionada...
+        title: Notas
+      notes_description_html: Ver y dejar notas para otros moderadores y como referencia futura
+      quick_actions_description_html: 'Tomá una acción rápida o desplazate hacia abajo para ver el contenido denunciado:'
+      remote_user_placeholder: el usuario remoto de %{instance}
       reopen: Reabrir denuncia
       report: 'Denuncia #%{id}'
       reported_account: Cuenta denunciada
       reported_by: Denunciada por
       resolved: Resueltas
       resolved_msg: "¡Denuncia exitosamente resuelta!"
+      skip_to_actions: Ir directamente a las acciones
       status: Estado
-      target_domain: Dominio de la cuenta denunciada
+      statuses: Contenido denunciado
+      statuses_description_html: El contenido ofensivo se citará en la comunicación con la cuenta denunciada
       target_origin: Origen de la cuenta denunciada
       title: Denuncias
       unassign: Desasignar
       unresolved: No resueltas
       updated_at: Actualizadas
+      view_profile: Ver perfil
+    roles:
+      add_new: Agregar rol
+      assigned_users:
+        one: "%{count} usuario"
+        other: "%{count} usuarios"
+      categories:
+        administration: Administración
+        devops: Operadores de desarrollo
+        invites: Invitaciones
+        moderation: Moderación
+        special: Especial
+      delete: Eliminar
+      description_html: Con <strong>roles de usuario</strong>, podés personalizar las funciones y áreas de Mastodon a las que pueden acceder tus usuarios.
+      edit: Editar rol de «%{name}»
+      everyone: Permisos predeterminados
+      everyone_full_description_html: Este es el <strong>rol base</strong> que afecta a <strong>todos los usuarios</strong>, incluso aquellos sin un rol asignado. Todos los otros roles heredan permisos de él.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Los usuarios con este permiso saltarán todos los permisos
+        delete_user_data: Eliminar datos del usuario
+        delete_user_data_description: Permite a los usuarios eliminar los datos de otros usuarios sin demora
+        invite_users: Invitar usuarios
+        invite_users_description: Permite a los usuarios invitar a nuevas personas al servidor
+        manage_announcements: Administrar anuncios
+        manage_announcements_description: Permite a los usuarios administrar anuncios en el servidor
+        manage_appeals: Administrar apelaciones
+        manage_appeals_description: Permite a los usuarios revisar apelaciones contra acciones de moderación
+        manage_blocks: Administrar bloqueos
+        manage_blocks_description: Permite a los usuarios bloquear proveedores de correo electrónico y direcciones IP
+        manage_custom_emojis: Administrar emojis personalizados
+        manage_custom_emojis_description: Permite a los usuarios administrar emojis personalizados en el servidor
+        manage_federation: Administrar Federación
+        manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios y controlar las entregas
+        manage_invites: Administrar invitaciones
+        manage_invites_description: Permite a los usuarios navegar y desactivar los enlaces de invitación
+        manage_reports: Administrar denuncias
+        manage_reports_description: Permite a los usuarios revisar denuncias y realizar acciones de moderación contra ellas
+        manage_roles: Administrar roles
+        manage_roles_description: Permite a los usuarios administrar y asignar roles por debajo de los suyos
+        manage_rules: Administrar reglas
+        manage_rules_description: Permite a los usuarios cambiar las reglas del servidor
+        manage_settings: Administrar configuración
+        manage_settings_description: Permite a los usuarios cambiar la configuración del sitio
+        manage_taxonomies: Administrar taxonomías
+        manage_taxonomies_description: Permite a los usuarios revisar el contenido de tendencia y actualizar la configuración de las etiquetas
+        manage_user_access: Administrar acceso de usuario
+        manage_user_access_description: Permite a los usuarios deshabilitar la autenticación de dos factores de otros usuarios, cambiar su dirección de correo electrónico y restablecer su contraseña
+        manage_users: Administrar usuarios
+        manage_users_description: Permite a los usuarios ver los detalles de otros usuarios y realizar acciones de moderación contra ellos
+        manage_webhooks: Administrar Webhooks
+        manage_webhooks_description: Permite a los usuarios configurar webhooks para eventos administrativos
+        view_audit_log: Ver auditoría
+        view_audit_log_description: Permite a los usuarios ver un historial de acciones administrativas en el servidor
+        view_dashboard: Ver panel
+        view_dashboard_description: Permite a los usuarios acceder al panel de control y varias métricas
+        view_devops: Operadores de desarrollo
+        view_devops_description: Permite a los usuarios acceder a los paneles de Sidekiq y pgHero
+      title: Roles
     rules:
       add_new: Agregar regla
       delete: Eliminar
@@ -569,142 +691,201 @@ es-AR:
       empty: Aún no se han definido las reglas del servidor.
       title: Reglas del servidor
     settings:
-      activity_api_enabled:
-        desc_html: Conteos de mensajes publicados localmente, usuarios activos y nuevos registros en tandas semanales
-        title: Publicar estadísticas agregadas sobre la actividad del usuario en la API
-      bootstrap_timeline_accounts:
-        desc_html: Separar múltiples nombres de usuario con coma. Sólo funcionarán las cuentas locales y desbloqueadas. Predeterminadamente, cuando está vacío se trata de todos los administradores locales.
-        title: Recomendar estas cuentas a usuarios nuevos
-      contact_information:
-        email: Correo electrónico de negocios
-        username: Nombre de usuario de contacto
-      custom_css:
-        desc_html: Modificá la apariencia con CSS cargado en cada página
-        title: CSS personalizado
+      about:
+        manage_rules: Administrar reglas del servidor
+        preamble: Proveé información en profundidad sobre cómo el servidor es operado, moderado y financiado.
+        rules_hint: Hay un área dedicada para las reglas a las que se espera que tus usuarios se adhieran.
+        title: Información
+      appearance:
+        preamble: Personalizá la interface web de Mastodon.
+        title: Apariencia
+      branding:
+        preamble: La marca de tu servidor lo diferencia de otros servidores de la red. Esta información puede mostrarse a través de una variedad de entornos, como en la interface web de Mastodon, en aplicaciones nativas, en previsualizaciones de enlaces en otros sitios web y en aplicaciones de mensajería, etc. Por esta razón, es mejor mantener esta información clara, breve y concisa.
+        title: Marca
+      content_retention:
+        preamble: Controlá cómo el contenido generado por el usuario se almacena en Mastodon.
+        title: Retención de contenido
       default_noindex:
         desc_html: Afecta a todos los usuarios que no cambiaron esta configuración por sí mismos
         title: Quitar predeterminadamente a los usuarios de la indexación de los motores de búsqueda
+      discovery:
+        follow_recommendations: Recom. de cuentas a seguir
+        preamble: Exponer contenido interesante a la superficie es fundamental para incorporar nuevos usuarios que pueden no conocer a nadie Mastodon. Controlá cómo funcionan varias opciones de descubrimiento en tu servidor.
+        profile_directory: Directorio de perfiles
+        public_timelines: Líneas temporales públicas
+        title: Descubrí
+        trends: Tendencias
       domain_blocks:
         all: A todos
         disabled: A nadie
-        title: Mostrar dominios bloqueados
         users: A usuarios locales con sesiones abiertas
-      domain_blocks_rationale:
-        title: Mostrar razonamiento
-      hero:
-        desc_html: Mostrado en la página principal. Se recomienda un tamaño mínimo de 600x100 píxeles. Predeterminadamente se establece a la miniatura del servidor
-        title: Imagen de portada
-      mascot:
-        desc_html: Mostrado en múltiples páginas. Se recomienda un tamaño mínimo de 293x205 píxeles. Cuando no se especifica, se muestra la mascota predeterminada
-        title: Imagen de la mascota
-      peers_api_enabled:
-        desc_html: Nombres de dominio que este servidor encontró en el fediverso
-        title: Publicar lista de servidores descubiertos en la API
-      preview_sensitive_media:
-        desc_html: Las previsualizaciones de enlaces en otros sitios web mostrarán una miniatura incluso si el medio está marcado como contenido sensible
-        title: Mostrar medios sensibles en previsualizaciones de OpenGraph
-      profile_directory:
-        desc_html: Permitir que los usuarios puedan ser descubiertos
-        title: Habilitar directorio de perfiles
       registrations:
-        closed_message:
-          desc_html: Mostrado en la página principal cuando los registros de nuevas cuentas están cerrados. Podés usar etiquetas HTML
-          title: Mensaje de registro de nuevas cuentas cerrado
-        deletion:
-          desc_html: Permitir que cualquiera elimine su cuenta
-          title: Abrir eliminación de cuenta
-        min_invite_role:
-          disabled: Nadie
-          title: Permitir invitaciones de
-        require_invite_text:
-          desc_html: Cuando los registros requieran aprobación manual, hacé que la solicitud de invitación "¿Por qué querés unirte?" sea obligatoria, en vez de opcional
-          title: Requerir que los nuevos usuarios llenen un texto de solicitud de invitación
+        preamble: Controlá quién puede crear una cuenta en tu servidor.
+        title: Registros
       registrations_mode:
         modes:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
-        title: Modo de registros
-      show_known_fediverse_at_about_page:
-        desc_html: Cuando está deshabilitado, restringe la línea temporal pública enlazada desde la página de inicio para mostrar sólo contenido local
-        title: Incluir contenido federado en la página de línea temporal pública no autenticada
-      show_staff_badge:
-        desc_html: Mostrar una insignia de administración en la página de un usuario
-        title: Mostrar insignia de administración
-      site_description:
-        desc_html: Párrafo introductorio en la API. Describe qué hace especial a este servidor de Mastodon y todo lo demás que sea importante. Podés usar etiquetas HTML, en particular <code>&lt;a&gt;</code> y <code>&lt;em&gt;</code>.
-        title: Descripción del servidor
-      site_description_extended:
-        desc_html: Un buen lugar para tu código de conducta, reglas, guías y otras cosas que definen tu servidor. Podés usar etiquets HTML
-        title: Información extendida personalizada
-      site_short_description:
-        desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe qué es Mastodon y qué hace especial a este servidor en un solo párrafo.
-        title: Descripción corta del servidor
-      site_terms:
-        desc_html: Podés escribir tus propias políticas de privacidad, términos del servicio u otras cuestiones legales. Podés usar etiquetas HTML
-        title: Términos del servicio personalizados
-      site_title: Nombre del servidor
-      thumbnail:
-        desc_html: Usado para previsualizaciones vía OpenGraph y APIs. Se recomienda 1200x630 píxeles
-        title: Miniatura del servidor
-      timeline_preview:
-        desc_html: Mostrar enlace a la línea temporal pública en la página de inicio y permitir el acceso a la API a la línea temporal pública sin autenticación
-        title: Permitir acceso no autorizado a la línea temporal pública
-      title: Configuración del sitio
-      trendable_by_default:
-        desc_html: Afecta a etiquetas que no fueron rechazadas previamente
-        title: Permitir que las etiquetas sean tendencia sin revisión previa
-      trends:
-        desc_html: Mostrar públicamente etiquetas previamente revisadas que son tendencia actualmente
-        title: Etiquetas en tendencia
+      title: Configuraciones del servidor
     site_uploads:
       delete: Eliminar archivo subido
       destroyed_msg: "¡Subida al sitio eliminada exitosamente!"
     statuses:
+      account: Autor
+      application: Aplicación
       back_to_account: Volver a la página de la cuenta
+      back_to_report: Volver a la página de la denuncia
       batch:
-        delete: Eliminar
-        nsfw_off: Marcar contenido como no sensible
-        nsfw_on: Marcar contenido como sensible
+        remove_from_report: Quitar de la denuncia
+        report: Denunciar
       deleted: Eliminado
-      failed_to_execute: Falló al ejecutar
+      favourites: Favoritos
+      history: Historial de versiones
+      in_reply_to: Respondiendo a
+      language: Idioma
       media:
         title: Medios
-      no_media: Sin medios
+      metadata: Metadatos
       no_status_selected: No se cambió ningún mensaje, ya que ninguno fue seleccionado
+      open: Abrir mensaje
+      original_status: Mensaje original
+      reblogs: Adhesiones
+      status_changed: Mensaje cambiado
       title: Mensajes de la cuenta
+      trending: En tendencia
+      visibility: Visibilidad
       with_media: Con medios
+    strikes:
+      actions:
+        delete_statuses: "%{name} eliminó los mensajes de %{target}"
+        disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcó los mensajes de %{target} como sensibles"
+        none: "%{name} envió una advertencia a %{target}"
+        sensitive: "%{name} marcó los medios de %{target} como sensibles"
+        silence: "%{name} limitó la cuenta de %{target}"
+        suspend: "%{name} suspendió la cuenta de %{target}"
+      appeal_approved: Apelado
+      appeal_pending: Apelación pendiente
     system_checks:
       database_schema_check:
         message_html: Hay migraciones pendientes de la base de datos. Por favor, ejecutalas para asegurarte de que la aplicación funciona según lo esperado
+      elasticsearch_running_check:
+        message_html: No se pudo conectar a Elasticsearch. Por favor, revisá que se esté ejecutando, o deshabilitá la búsqueda de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versión incompatible de Elasticsearch: %{value}'
+        version_comparison: Se está ejecutando la versión %{running_version} de Elasticsearch, mientras que la versión requerida es la %{required_version}
       rules_check:
         action: Administrar reglas del servidor
         message_html: No definiste ninguna regla del servidor.
       sidekiq_process_check:
         message_html: No hay ningún proceso Sidekiq en ejecución para la/s cola/s %{value}. Por favor, revisá tu configuración de Sidekiq
     tags:
-      accounts_today: Usos únicos de hoy
-      accounts_week: Usos únicos esta semana
-      breakdown: Desglose del consumo de hoy por fuentes
-      last_active: Usadas recientemente
-      most_popular: Lo más popular
-      most_recent: Creadas recientemente
-      name: Etiqueta
       review: Estado de revisión
-      reviewed: Revisado
-      title: Etiquetas
-      trending_right_now: En tendencia ahora mismo
-      unique_uses_today: "%{count} mensajes hoy"
-      unreviewed: No revisada
       updated_msg: La configuración de la etiqueta se actualizó exitosamente
     title: Administración
+    trends:
+      allow: Permitir
+      approved: Aprobadas
+      disallow: Rechazar
+      links:
+        allow: Permitir enlace
+        allow_provider: Permitir medio
+        description_html: Estos son enlaces que actualmente están siendo muy compartidos por cuentas desde las que tu servidor ve los mensajes. Esto puede ayudar a tus usuarios a averiguar qué está pasando en el mundo. No hay enlaces que se muestren públicamente hasta que autoricés al publicador. También podés permitir o rechazar enlaces individuales.
+        disallow: Rechazar enlace
+        disallow_provider: Rechazar medio
+        no_link_selected: No se cambió ningún enlace, ya que ninguno fue seleccionado
+        publishers:
+          no_publisher_selected: No se cambió ningún medio, ya que ninguno fue seleccionado
+        shared_by_over_week:
+          one: Compartido por una persona durante la última semana
+          other: Compartido por %{count} personas durante la última semana
+        title: Enlaces en tendencia
+        usage_comparison: Compartido %{today} veces hoy, comparado con la/s %{yesterday} vez/veces de ayer
+      only_allowed: Sólo permitidas
+      pending_review: Revisión pendiente
+      preview_card_providers:
+        allowed: Los enlaces de este medio pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en tu servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Tu aprobación (o rechazo) se extiende a los subdominios.
+        rejected: Los enlaces de este medio no serán tendencia
+        title: Medios
+      rejected: Rechazadas
+      statuses:
+        allow: Permitir mensaje
+        allow_account: Permitir autor
+        description_html: Estos son mensajes que tu servidor detecta que están siendo compartidos y marcados como favoritos muchas veces en este momento. Esto puede ayudar a tus usuarios nuevos y retornantes a encontrar más cuentas para seguir. No hay mensajes que se muestren públicamente hasta que aprobés al autor, y el autor permita que su cuenta sea sugerida a otros. También podés permitir o rechazar mensajes individuales.
+        disallow: Rechazar mensaje
+        disallow_account: Rechazar autor
+        no_status_selected: No se cambió ningún mensaje en tendencia, ya que ninguno fue seleccionado
+        not_discoverable: El autor optó ser detectable
+        shared_by:
+          one: Compartido o marcado como favorito una vez
+          other: Compartido y marcado como favorito %{friendly_count} veces
+        title: Mensajes en tendencia
+      tags:
+        current_score: Puntuación actual %{score}
+        dashboard:
+          tag_accounts_measure: usos únicos
+          tag_languages_dimension: Idiomas principales
+          tag_servers_dimension: Servidores principales
+          tag_servers_measure: diferentes servidores
+          tag_uses_measure: usos totales
+        description_html: Estas son etiquetas que están apareciendo en muchos mensajes que tu servidor ve. Esto puede ayudar a tus usuarios a averiguar de qué habla la gente en estos momentos. No hay etiquetas que se muestren públicamente hasta que las aprobés.
+        listable: Pueden ser recomendadas
+        no_tag_selected: No se cambió ninguna etiqueta, ya que ninguna fue seleccionada
+        not_listable: No serán recomendadas
+        not_trendable: No aparecerán en tendencias
+        not_usable: No podrán ser usadas
+        peaked_on_and_decaying: Alcanzó el pico el %{date}, ahora decreciendo
+        title: Etiquetas en tendencia
+        trendable: Pueden aparecer en tendencias
+        trending_rank: Tendencia n.º %{rank}
+        usable: Pueden usarse
+        usage_comparison: Usadas %{today} veces hoy, comparado con la/s %{yesterday} vez/veces de ayer
+        used_by_over_week:
+          one: Usada por una persona durante la última semana
+          other: Usada por %{count} personas durante la última semana
+      title: Tendencias
+      trending: En tendencia
     warning_presets:
       add_new: Agregar nuevo
       delete: Eliminar
       edit_preset: Editar preajuste de advertencia
       empty: Aún no ha definido ningún preajuste de advertencia.
       title: Administrar preajustes de advertencia
+    webhooks:
+      add_new: Agregar punto final
+      delete: Eliminar
+      description_html: Un <strong>webhook</strong> habilita a Mastodon a enviar <strong>notificaciones en tiempo real</strong> sobre los eventos elegidos a tu propia aplicación, así la misma puede <strong>activar automáticamente las reacciones</strong>.
+      disable: Deshabilitar
+      disabled: Deshabilitada
+      edit: Editar punto final
+      empty: Todavía no tenés configurado ningún punto final de webhook.
+      enable: Habilitar
+      enabled: Activar
+      enabled_events:
+        one: 1 evento habilitado
+        other: "%{count} eventos habilitados"
+      events: Eventos
+      new: Nuevo webhook
+      rotate_secret: Rotar secreto
+      secret: Firma secreta
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para eliminar sus mensajes
+        disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
+        none: una advertencia
+        sensitive: para marcar su cuenta como sensible
+        silence: para limitar su cuenta
+        suspend: para suspender su cuenta
+      body: "%{target} está apelando a una solicitud de moderación de %{action_taken_by} de %{date}, del tipo %{type}. Ellos escribieron:"
+      next_steps: Podés aprobar la apelación para deshacer la solicitud de moderación, o ignorarla.
+      subject: "%{username} está apelando a una solicitud de moderación en %{instance}"
     new_pending_account:
       body: Abajo están los detalles de la nueva cuenta. Podés aprobar o rechazar esta solicitud.
       subject: Nueva cuenta para revisión en %{instance} (%{username})
@@ -712,9 +893,17 @@ es-AR:
       body: "%{reporter} denunció a %{target}"
       body_remote: Alguien de %{domain} denunció a %{target}
       subject: Nueva denuncia para %{instance} (#%{id})
-    new_trending_tag:
-      body: 'La etiqueta #%{name} está en tendencia hoy, pero no fue revisada previamente. No se mostrará públicamente a menos que lo permitas, o si no simplemente guardá el formulario como está para no volver a ver esto.'
-      subject: Nueva etiqueta para revisión en %{instance} (#%{name})
+    new_trends:
+      body: 'Los siguientes elementos necesitan una revisión antes de que se puedan mostrar públicamente:'
+      new_trending_links:
+        title: Enlaces en tendencia
+      new_trending_statuses:
+        title: Mensajes en tendencia
+      new_trending_tags:
+        no_approved_tags: Actualmente no hay etiquetas en tendencia aprobadas.
+        requirements: 'Cualquiera de estos candidatos podría superar la etiqueta en tendencia aprobada de #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
+        title: Etiquetas en tendencia
+      subject: Nuevas tendencias para revisar en %{instance}
   aliases:
     add_new: Crear alias
     created_msg: El nuevo alias se creó exitosamente. Ahora podés empezar la mudanza desde la cuenta vieja.
@@ -738,22 +927,19 @@ es-AR:
     notification_preferences: Cambiar configuración de correo electrónico
     salutation: "%{name}:"
     settings: 'Cambiar configuración de correo electrónico: %{link}'
-    view: 'Vista:'
+    view: 'Visitá:'
     view_profile: Ver perfil
     view_status: Ver mensaje
   applications:
     created: Aplicación creada exitosamente
     destroyed: Aplicación eliminada exitosamente
-    invalid_url: La dirección web ofrecida no es válida
     regenerate_token: Regenerar clave de acceso
     token_regenerated: Clave de acceso regenerada exitosamente
     warning: Ojo con estos datos. ¡Nunca los compartas con nadie!
     your_token: Tu clave de acceso
   auth:
-    apply_for_account: Solicitar una invitación
+    apply_for_account: Solicitar una cuenta
     change_password: Contraseña
-    checkbox_agreement_html: Acepto las <a href="%{rules_path}" target="_blank">reglas del servidor</a> y los <a href="%{terms_path}" target="_blank">términos del servicio</a>
-    checkbox_agreement_without_rules_html: Acepto los <a href="%{terms_path}" target="_blank">términos del servicio</a>
     delete_account: Eliminar cuenta
     delete_account_html: Si querés eliminar tu cuenta, podés <a href="%{path}">seguir por acá</a>. Se te va a pedir una confirmación.
     description:
@@ -766,11 +952,13 @@ es-AR:
     invalid_reset_password_token: La clave para cambiar la contraseña no es válida o venció. Por favor, solicitá una nueva.
     link_to_otp: Ingresá un código de dos factores desde tu dispositivo o un código de recuperación
     link_to_webauth: Usá tu dispositivo de llave de seguridad
+    log_in_with: Iniciar sesión con
     login: Iniciar sesión
     logout: Cerrar sesión
     migrate_account: Mudarse a otra cuenta
     migrate_account_html: Si querés redireccionar esta cuenta a otra distinta, podés <a href="%{path}">configurar eso acá</a>.
     or_log_in_with: O iniciar sesión con
+    privacy_policy_agreement_html: Leí y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
     providers:
       cas: CAS
       saml: SAML
@@ -778,20 +966,29 @@ es-AR:
     registration_closed: "%{instance} no está aceptando nuevos miembros"
     resend_confirmation: Reenviar correo electrónico de confirmación
     reset_password: Cambiar contraseña
+    rules:
+      preamble: Estas reglas son establecidas y aplicadas por los moderadores de %{domain}.
+      title: Algunas reglas básicas.
     security: Seguridad
     set_new_password: Establecer nueva contraseña
     setup:
       email_below_hint_html: Si la dirección de correo electrónico que aparece a continuación es incorrecta, podés cambiarla acá y recibir un nuevo correo electrónico de confirmación.
       email_settings_hint_html: Se envió el correo electrónico de confirmación a %{email}. Si esa dirección de correo electrónico no es correcta, podés cambiarla en la configuración de la cuenta.
       title: Configuración
+    sign_in:
+      preamble_html: Iniciá sesión con tus credenciales de <strong>%{domain}</strong>. Si tu cuenta está alojada en un servidor diferente, no vas a poder iniciar sesión acá.
+      title: Iniciar sesión en %{domain}
+    sign_up:
+      preamble: Con una cuenta en este servidor de Mastodon, podrás seguir a cualquier otra cuenta en la red, independientemente de en qué servidor esté alojada su cuenta.
+      title: Dejá que te preparemos en %{domain}.
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
       functional: Tu cuenta está totalmente operativa.
       pending: Tu solicitud está pendiente de revisión por nuestra administración. Eso puede tardar algún tiempo. Si se aprueba tu solicitud, vas a recibir un correo electrónico.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver incumplimientos pasados contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, probá de nuevo.
-    trouble_logging_in: "¿Tenés problemas para iniciar sesión?"
     use_security_key: Usar la llave de seguridad
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
@@ -849,10 +1046,36 @@ es-AR:
       more_details_html: Para más detalles, leé la <a href="%{terms_path}">política de privacidad</a>.
       username_available: Tu nombre de usuario volverá a estar disponible
       username_unavailable: Tu nombre de usuario no estará disponible
-  directories:
-    directory: Directorio de perfiles
-    explanation: Descubrí usuarios basados en sus intereses
-    explore_mastodon: Navegá %{title}
+  disputes:
+    strikes:
+      action_taken: Acción tomada
+      appeal: Apelar
+      appeal_approved: Este incumplimiento fue apelado exitosamente y ya no es válido
+      appeal_rejected: Se rechazó la apelación
+      appeal_submitted_at: Apelación enviada
+      appealed_msg: Tu apelación fue enviada. Si se aprueba, se te notificará.
+      appeals:
+        submit: Enviar apelación
+      approve_appeal: Aprobar apelación
+      associated_report: Denuncia asociada
+      created_at: Con fecha
+      description_html: Estas son acciones tomadas contra tu cuenta y las advertencias que te han sido enviadas por el equipo de %{instance}.
+      recipient: Dirigida a
+      reject_appeal: Rechazar apelación
+      status: 'Mensaje #%{id}'
+      status_removed: Mensaje ya eliminado del sistema
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Eliminación de mensaje
+        disable: Congelación de cuenta
+        mark_statuses_as_sensitive: Marcado de mensajes como sensibles
+        none: Advertencia
+        sensitive: Marcado de cuenta como sensible
+        silence: Limitación de cuenta
+        suspend: Suspensión de cuenta
+      your_appeal_approved: Se aprobó tu apelación
+      your_appeal_pending: Enviaste una apelación
+      your_appeal_rejected: Se rechazó tu apelación
   domain_validator:
     invalid_domain: no es un nombre de dominio válido
   errors:
@@ -901,56 +1124,69 @@ es-AR:
       public: Líneas temporales públicas
       thread: Conversaciones
     edit:
+      add_keyword: Agregar palabra clave
+      keywords: Palabras clave
+      statuses: Mensajes individuales
+      statuses_hint_html: Este filtro se aplica a la selección de mensajes individuales, independientemente de si coinciden con las palabras clave a continuación. <a href="%{path}">Revisar o quitar mensajes del filtro</a>.
       title: Editar filtro
     errors:
+      deprecated_api_multiple_keywords: Estos parámetros no se pueden cambiar de esta aplicación porque se aplican a más de una palabra clave de filtro. Usá una aplicación más reciente o la interface web.
       invalid_context: Se suministró un contexto no válido o vacío
-      invalid_irreversible: El filtrado irreversible sólo funciona con los contextos de "Principal" o de "Notificaciones"
     index:
+      contexts: Filtros en %{contexts}
       delete: Eliminar
       empty: No tenés filtros.
+      expires_in: Caduca en %{distance}
+      expires_on: Caduca en %{date}
+      keywords:
+        one: "%{count} palabra clave"
+        other: "%{count} palabras clave"
+      statuses:
+        one: "%{count} mensaje"
+        other: "%{count} mensajes"
+      statuses_long:
+        one: "%{count} mensaje individual oculto"
+        other: "%{count} mensajes individuales ocultos"
       title: Filtros
     new:
+      save: Guardar nuevo filtro
       title: Agregar nuevo filtro
+    statuses:
+      back_to_filter: Volver al filtro
+      batch:
+        remove: Quitar del filtro
+      index:
+        hint: Este filtro se aplica a la selección de mensajes individuales, independientemente de otros criterios. Podés agregar más mensajes a este filtro desde la interface web.
+        title: Mensajes filtrados
   footer:
-    developers: Desarrolladores
-    more: Más…
-    resources: Recursos
     trending_now: Tendencia ahora
   generic:
     all: Todas
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta página está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos en esta página están seleccionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento que coincide con tu búsqueda está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos que coinciden con tu búsqueda están seleccionados.
     changes_saved_msg: "¡Cambios guardados exitosamente!"
     copy: Copiar
     delete: Eliminar
-    no_batch_actions_available: No hay acciones por lotes disponibles en esta página
+    deselect: Deseleccionar todo
+    none: "[Ninguna]"
     order_by: Ordenar por
     save_changes: Guardar cambios
+    select_all_matching_items:
+      one: Seleccionar %{count} elemento que coincide con tu búsqueda.
+      other: Seleccionar todos los %{count} elementos que coinciden con tu búsqueda.
+    today: hoy
     validation_errors:
       one: "¡Falta algo! Por favor, revisá el error abajo"
       other: "¡Falta algo! Por favor, revisá los %{count} errores abajo"
   html_validator:
     invalid_markup: 'contiene markup HTML no válido: %{error}'
-  identity_proofs:
-    active: Activa
-    authorize: Sí, autorizar
-    authorize_connection_prompt: "¿Autorizar esta conexión criptográfica?"
-    errors:
-      failed: Falló la conexión criptográfica. Por favor, intentá de nuevo desde %{provider}.
-      keybase:
-        invalid_token: Las claves de Keybase son hashes de firmas y deben tener 66 caracteres hexadecimales
-        verification_failed: Keybase no reconoce esta clave como una firma del usuario de Keybase %{kb_username}. Por favor, intentá de nuevo desde Keybase.
-      wrong_user: No se puede crear una prueba para %{proving} mientras se haya iniciado sesión como %{current}. Iniciá sesión como %{proving} e intentá de nuevo.
-    explanation_html: Acá podés conectar criptográficamente tus otras identidades, como un perfil de Keybase. Esto permite a otras personas enviarte mensajes cifrados y confiar en el contenido que les envías.
-    i_am_html: Soy %{username} en %{service}.
-    identity: Identidad
-    inactive: Inactiva
-    publicize_checkbox: 'Y enviá esto:'
-    publicize_toot: "¡Comprobado! Soy %{username} en %{service}: %{url}"
-    remove: Quitar prueba de cuenta
-    removed: Se quitó la prueba de cuenta exitosamente
-    status: Estado de verificación
-    view_proof: Ver prueba
   imports:
     errors:
+      invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'
       over_rows_processing_limit: contiene más de %{count} filas
     modes:
       merge: Combinar
@@ -966,7 +1202,6 @@ es-AR:
       following: Lista de seguidos
       muting: Lista de silenciados
     upload: Subir
-  in_memoriam_html: Cuenta conmemorativa.
   invites:
     delete: Desactivar
     expired: Vencidas
@@ -1045,18 +1280,14 @@ es-AR:
     carry_blocks_over_text: Este usuario se mudó desde %{acct}, que habías bloqueado.
     carry_mutes_over_text: Este usuario se mudó desde %{acct}, que habías silenciado.
     copy_account_note_text: 'Este usuario se mudó desde %{acct}, acá están tus notas previas sobre él/ella:'
+  navigation:
+    toggle_menu: Cambiar menú
   notification_mailer:
-    digest:
-      action: Ver todas las notificaciones
-      body: Acá tenés un resumen de los mensajes que te perdiste desde tu última visita, el %{since}
-      mention: "%{name} te mencionó en:"
-      new_followers_summary:
-        one: Además, ¡ganaste un nuevo seguidor mientras estabas ausente! ¡Esa!
-        other: Además, ¡ganaste %{count} nuevos seguidores mientras estabas ausente! ¡Esssa!
-      subject:
-        one: "1 nueva notificación desde tu última visita \U0001F418"
-        other: "%{count} nuevas notificaciones desde tu última visita \U0001F418"
-      title: En tu ausencia...
+    admin:
+      report:
+        subject: "%{name} envió una denuncia"
+      sign_up:
+        subject: Se registró %{name}
     favourite:
       body: 'Tu mensaje fue marcado como favorito por %{name}:'
       subject: "%{name} marcó tu mensaje como favorito"
@@ -1083,6 +1314,8 @@ es-AR:
       title: Nueva adhesión
     status:
       subject: "%{name} acaba de enviar un mensaje"
+    update:
+      subject: "%{name} editó un mensaje"
   notifications:
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Seleccioná los eventos para los que querés recibir notificaciones:'
@@ -1126,6 +1359,8 @@ es-AR:
     other: Otras opciones
     posting_defaults: Configuración predeterminada de mensajes
     public_timelines: Líneas temporales públicas
+  privacy_policy:
+    title: Política de privacidad
   reactions:
     errors:
       limit_reached: Se alcanzó el límite de reacciones diferentes
@@ -1148,22 +1383,15 @@ es-AR:
     remove_selected_follows: Dejar de seguir a los usuarios seleccionados
     status: Estado de la cuenta
   remote_follow:
-    acct: Ingresá tu usuario@dominio desde el que querés continuar
     missing_resource: No se pudo encontrar la dirección web de redireccionamiento requerida para tu cuenta
-    no_account_html: "¿No tenés cuenta? Podés <a href='%{sign_up_path}' target='_blank'>registrarte acá</a>"
-    proceed: Proceder para seguir
-    prompt: 'Vas a seguir a:'
-    reason_html: "<strong>¿Por qué es necesario este paso?</strong> <code>%{instance}</code> puede que no sea el servidor donde estás registrado, así que necesitamos redirigirte primero a tu servidor de origen."
-  remote_interaction:
-    favourite:
-      proceed: Proceder para marcar como favorito
-      prompt: 'Vas a marcar este mensaje como favorito:'
-    reblog:
-      proceed: Proceder para adherir
-      prompt: 'Vas a adherir a este mensaje:'
-    reply:
-      proceed: Proceder para responder
-      prompt: 'Vas a responder a este mensaje:'
+  reports:
+    errors:
+      invalid_rules: no hace referencia a reglas válidas
+  rss:
+    content_warning: 'Advertencia de contenido:'
+    descriptions:
+      account: Mensajes públicos de @%{acct}
+      tag: 'Mensajes públicos etiquetados #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Superaste el límite de %{limit} mensajes programados para ese día
     over_total_limit: Superaste el límite de %{limit} mensajes programados
@@ -1197,7 +1425,7 @@ es-AR:
       adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: GNU/Linux
@@ -1209,7 +1437,7 @@ es-AR:
     revoke: Revocar
     revoke_success: Sesión revocada exitosamente
     title: Sesiones
-    view_authentication_history: Ver historial de autenticación de tu cuenta
+    view_authentication_history: Ver historial de autenticación de tu cuenta.
   settings:
     account: Cuenta
     account_settings: Config. de la cuenta
@@ -1222,7 +1450,6 @@ es-AR:
     edit_profile: Editar perfil
     export: Exportación de datos
     featured_tags: Etiquetas destacadas
-    identity_proofs: Pruebas de identidad
     import: Importar
     import_and_export: Importación y exportación
     migrate: Migración de la cuenta
@@ -1230,8 +1457,9 @@ es-AR:
     preferences: Configuración
     profile: Perfil
     relationships: Seguimientos
-    statuses_cleanup: Eliminación automática de mensajes
-    two_factor_authentication: Autenticación de dos factores
+    statuses_cleanup: Eliminación auto. de mensajes
+    strikes: Moderación de incumplimientos
+    two_factor_authentication: Aut. de dos factores
     webauthn_authentication: Llaves de seguridad
   statuses:
     attached:
@@ -1247,18 +1475,19 @@ es-AR:
         other: "%{count} videos"
     boosted_from_html: Adherido desde %{acct_link}
     content_warning: 'Advertencia de contenido: %{warning}'
+    default_language: Igual que el idioma de la interface
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
       other: 'contenía las etiquetas no permitidas: %{tags}'
+    edited_at_html: Editado el %{date}
     errors:
       in_reply_not_found: El mensaje al que intentás responder no existe.
-    language_detection: Detectar idioma automáticamente
     open_in_web: Abrir en la web
     over_character_limit: se excedió el límite de %{max} caracteres
     pin_errors:
+      direct: Los mensajes que sólo son visibles para los usuarios mencionados no pueden ser fijados
       limit: Ya fijaste el número máximo de mensajes
       ownership: No se puede fijar el mensaje de otra cuenta
-      private: Los mensajes que no son públicos no se pueden fijar
       reblog: No se puede fijar una adhesión
     poll:
       total_people:
@@ -1309,102 +1538,23 @@ es-AR:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de edad
-    min_favs: Conservar mensajes marcados como favoritos de hace más de
-    min_favs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de favoritos. Dejá en blanco para eliminar mensajes independientemente de su número de favoritos
-    min_reblogs: Conservar adhesiones de hace más de
-    min_reblogs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de adhesiones. Dejá en blanco para eliminar mensajes independientemente de su número de adhesiones
+    min_favs: Conservar mensajes marcados como favoritos de por lo menos
+    min_favs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de favoritos. Dejá en blanco para eliminar mensajes independientemente de su número de favoritos.
+    min_reblogs: Conservar adhesiones de por lo menos
+    min_reblogs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de adhesiones. Dejá en blanco para eliminar mensajes independientemente de su número de adhesiones.
   stream_entries:
     pinned: Mensaje fijado
     reblogged: adhirió a este mensaje
     sensitive_content: Contenido sensible
+  strikes:
+    errors:
+      too_late: Es demasiado tarde para apelar este incumplimiento
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
-  terms:
-    body_html: |
-      <h2>Política de privacidad</h2>
-      <h3 id="collect">¿Qué información recolectamos?</h3>
-
-      <ul>
-      <li><em>Información básica de la cuenta</em>: Si te registrás en este servidor, se te va a pedir un nombre de usuario, una dirección de correo electrónico y una contraseña. También podés ingresar información adicional de perfil como un nombre para mostrar y una biografía, y subir un avatar y una imagen de cabecera. El nombre de usuario, nombre para mostrar, biografía, avatar e imagen de cabecera siempre son visibles públicamente.</li>
-      <li><em>Mensajes, seguimiento y otra información pública</em>: La lista de cuentas a las que seguís es mostrada públicamente, al igual que la de tus seguidores. Cuando enviás un mensaje, se almacenan la fecha y hora, así como la aplicación desde la cual enviaste el mensaje. Los mensajes pueden contener archivos adjuntos de medios, como imágenes y videos. Los mensajes públicos y no listados están técnicamente disponibles para todos. Cuando destacás un mensaje en tu perfil, eso también se considera información disponible públicamente. Tus mensajes son entregados a tus seguidores; en algunos casos significa que son entregados a diferentes servidores y las copias son almacenadas allí. Cuando eliminás mensajes, esto también afecta a tus seguidores. La acción de adherir o marcar como favorito otro mensaje es siempre pública.</li>
-      <li><em>Mensajes directos y sólo para seguidores</em>: Todos los mensajes se almacenan y procesan en el servidor. Los mensajes sólo para seguidores se entregan a los seguidores y usuarios que se mencionan en ellos, y los mensajes directos se entregan sólo a los usuarios que se mencionan en ellos. En algunos casos significa que se entregan a diferentes servidores y que las copias se almacenan allí. Hacemos un esfuerzo de buena fe para limitar el acceso a esos mensajes sólo a las cuentas autorizadas, pero otros servidores pueden no hacerlo. Por lo tanto, es importante revisar los servidores a los que pertenecen tus seguidores. Podés cambiar una opción para aprobar y rechazar nuevos seguidores manualmente en la configuración. <em>Por favor, tené en cuenta que los operadores del servidor y de cualquier servidor receptor pueden ver dichos mensajes</em>, y que los destinatarios pueden tomar capturas de pantalla, copiarlos o volver a compartirlos de alguna otra manera. <em>No compartas ninguna información peligrosa en Mastodon.</em></li>
-      <li><em>Direcciones IP y otros metadatos</em>: Cuando iniciás sesión, registramos la dirección IP desde dónde lo estás haciendo, así como el nombre de tu navegador web. Todos los inicios de sesiones están disponibles para tu revisión y revocación en la configuración. La última dirección IP usada se almacena hasta por 12 meses. También podemos conservar los registros del servidor que incluyen la dirección IP de cada solicitud a nuestro servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">¿Para qué usamos tu información?</h3>
-
-      <p>Toda la información que recolectamos de vos puede ser usada de las siguientes maneras:</p>
-
-      <ul>
-      <li>Para proporcionar la funcionalidad principal de Mastodon. Sólo podés interactuar con el contenido de otras cuentas y publicar tu propio contenido cuando hayás iniciado sesión. Por ejemplo, podés seguir a otras cuentas para ver sus mensajes combinados en tu propia línea temporal personalizada.</li>
-      <li>Para ayudar a la moderación de la comunidad, por ejemplo, comparando tu dirección IP con otras conocidas para determinar la evasión de prohibiciones u otras violaciones.</li>
-      <li>La dirección de correo electrónico que nos proporcionés podría usarse para enviarte información, notificaciones sobre otras cuentas que interactúen con tu contenido o para enviarte mensajes, así como para responder a consultas y/u otras solicitudes o preguntas.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">¿Cómo protegemos tu información?</h3>
-
-      <p>Implementamos una variedad de medidas de seguridad para mantener la seguridad de tu información personal cuando ingresás, enviás o accedés a tu información personal. Entre otras cosas, la sesión de tu navegador web, así como el tráfico entre sus aplicaciones y la API, están protegidos con SSL; y tu contraseña está protegida mediante un algoritmo unidireccional fuerte. Podés habilitar la autenticación de dos factores para obtener un acceso más seguro a tu cuenta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">¿Cuál es nuestra política de retención de datos?</h3>
-
-      <p>Hacemos un esfuerzo de buena fe para:</p>
-
-      <ul>
-      <li>Conservar los registros del servidor que contengan la dirección IP de todas las solicitudes a este servidor, en la medida en que se mantengan dichos registros, por no más de 90 días.</li>
-      <li>Conservar las direcciones IP asociadas a los usuarios registrados, por no más de 12 meses.</li>
-      </ul>
-
-      <p>Podés solicitar y descargar un archivo historial de tu contenido, incluyendo tus mensajes, archivos adjuntos de medios, avatar e imagen de cabecera.</p>
-
-      <p>Podés eliminar tu cuenta de forma irreversible en cualquier momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">¿Usamos cookies?</h3>
-
-      <p>Sí. Las cookies son pequeños archivos que un sitio web o su proveedor de servicios transfiere a la unidad de almacenamiento de tu computadora a través de tu navegador web (si así lo permitís). Estas cookies permiten al sitio reconocer tu navegador web y, si tenés una cuenta registrada, asociarla con la misma.</p>
-
-      <p>Usamos cookies para entender y guardar tu configuración para futuras visitas.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">¿Revelamos alguna información a terceros?</h3>
-
-      <p>No vendemos, comercializamos ni transferimos de ninguna otra manera a terceros tu información personal identificable. Esto no incluye a los terceros de confianza que nos asisten en la operación de nuestro sitio, en la realización de nuestros negocios o en la prestación de servicios, siempre y cuando dichas partes acuerden mantener la confidencialidad de esta información. También podríamos liberar tu información cuando creamos que es apropiado para cumplir con la ley, hacer cumplir las políticas de nuestro sitio web, o proteger derechos, propiedad o seguridad, nuestros o de otros.</p>
-
-      <p>Tu contenido público puede ser descargado por otros servidores de la red. Tus mensajes públicos y tus mensajes sólo para seguidores se envían a los servidores donde residen tus seguidores, y los mensajes directos se envían a los servidores de los destinatarios, en la medida en que dichos seguidores o destinatarios residan en un servidor diferente.</p>
-
-      <p>Cuando autorizás a una aplicación a usar tu cuenta, dependiendo del alcance de los permisos que aprobés, puede acceder a la información de tu perfil público, tu lista de seguimiento, tus seguidores, tus listas, todos tus mensajes y tus favoritos. Las aplicaciones nunca podrán acceder a tu dirección de correo electrónico o contraseña.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uso del sitio web por parte de niños</h3>
-
-      <p>Si este servidor está en la UE o en el EEE: Nuestro sitio web, productos y servicios están dirigidos a personas mayores de 16 años. Si tenés menos de 16 años, según los requisitos de la GDPR (<a href="https://es.wikipedia.org/wiki/Reglamento_General_de_Protecci%C3%B3n_de_Datos">Reglamento General de Protección de Datos</a>) entonces, por favor, no usés este sitio web.</p>
-
-      <p>Si este servidor está en los EE.UU.: Nuestro sitio web, productos y servicios están dirigidos a personas que tienen al menos 13 años de edad. Si tenés menos de 13 años, según los requisitos de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Acta de Protección de la Privacidad en Línea de Niños [en inglés]</a>) entonces, por favor, no usés este sitio web.</p>
-
-      <p>Los requisitos legales pueden ser diferentes si este servidor está en otra jurisdicción.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Cambios a nuestra Política de privacidad</h3>
-
-      <p>Si decidimos cambiar nuestra política de privacidad, publicaremos dichos cambios en esta página.</p>
-
-      <p>Este documento es CC-BY-SA. Fue actualizado por última vez el 7 de marzo de 2018.</p>
-
-      <p>Adaptado originalmente desde <a href="https://github.com/discourse/discourse">la política de privacidad de Discourse</a>.</p>
-    title: Términos del servicio y Políticas de privacidad de %{instance}
   themes:
     contrast: Alto contraste
     default: Oscuro
@@ -1413,6 +1563,7 @@ es-AR:
     formats:
       default: "%Y.%b.%d, %H:%M"
       month: "%b de %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Agregar
     disable: Deshabilitar 2FA
@@ -1429,63 +1580,73 @@ es-AR:
     recovery_instructions_html: Si alguna vez perdés el acceso a tu aplicación de 2FA, podés usar uno de los siguientes códigos de recuperación para recuperar el acceso a tu cuenta. <strong>Mantenelos a salvo</strong>. Por ejemplo, podés imprimirlos y guardarlos con otros documentos importantes.
     webauthn: Llaves de seguridad
   user_mailer:
+    appeal_approved:
+      action: Ir a tu cuenta
+      explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
+      subject: Tu apelación del %{date} fue aprobada
+      title: Apelación aprobada
+    appeal_rejected:
+      explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
+      subject: Tu apelación del %{date} fue rechazada
+      title: Apelación rechazada
     backup_ready:
       explanation: Solicitaste un resguardo completo de tu cuenta de Mastodon. ¡Ya está listo para descargar!
       subject: Tu archivo historial está listo para descargar
       title: Descargar archivo historial
-    sign_in_token:
-      details: 'Acá están los detalles del intento:'
-      explanation: 'Detectamos un intento de inicio de sesión en tu cuenta desde una dirección IP no reconocida. Si fuiste vos, por favor, ingresá el código de seguridad de abajo en la página del desafío:'
-      further_actions: 'Si no eras vos, por favor, cambiá tu contraseña y habilitá la autenticación de dos factores en tu cuenta. Podés hacerlo acá:'
-      subject: Por favor, confirmá el intento de inicio de sesión
-      title: Intento de inicio de sesión
+    suspicious_sign_in:
+      change_password: cambiés tu contraseña
+      details: 'Acá están los detalles del inicio de sesión:'
+      explanation: Detectamos un inicio de sesión de tu cuenta desde una nueva dirección IP.
+      further_actions_html: Si no fuiste vos, te recomendamos que %{action} inmediatamente y habilités la autenticación de dos factores para mantener tu cuenta segura.
+      subject: Se accedió a tu cuenta desde una nueva dirección IP
+      title: Un nuevo inicio de sesión
     warning:
+      appeal: Enviar una apelación
+      appeal_description: Si creés que esto es un error, podés enviar una apelación al equipo de %{instance}.
+      categories:
+        spam: Spam
+        violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        disable: Ya no podés iniciar sesión en tu cuenta o usarla de alguna manera, pero tu perfil y otros datos permanecen intactos.
-        sensitive: Tus archivos de medios subidos y enlaces de medios serán tratados como sensibles.
-        silence: Todavía podés usar tu cuenta, pero sólo las cuentas que ya te estén siguiendo verán tus mensajes en este servidor, y puede que se te excluya de varios listados públicos. Sin embargo, otras cuentas pueden seguirte manualmente.
-        suspend: Ya no podés usar tu cuenta; tu perfil y otros datos ya no son accesibles. Todavía podés iniciar sesión para solicitar un resguardo de tus datos hasta que los mismos sean totalmente quitados, pero retendremos ciertos datos para prevenirte de evadir la suspensión.
-      get_in_touch: Podés responder a esta dirección de correo electrónico para ponerte en contacto con la administración de %{instance}.
-      review_server_policies: Revisar las políticas del servidor
-      statuses: 'Específicamente, para:'
+        delete_statuses: Algunos de tus mensajes se encontraron violando una o más directrices de la comunidad y fueron eliminados posteriormente por los moderadores de %{instance}.
+        disable: Ya no podés usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Podés solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta, o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes fueron marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que hacer clic o darle un toque a los medios en los mensajes antes de que se muestre una vista previa. Podés marcar los medios como sensibles vos mismo cuando publiqués en el futuro.
+        sensitive: A partir de ahora, todos tus archivos subidos serán marcados como sensibles y ocultos tras una advertencia en la que habrá que hacer clic.
+        silence: Todavía podés usar tu cuenta, pero sólo las personas que te están siguiendo verán tus publicaciones en este servidor, y podrías ser excluido de varias funciones de descubrimiento. Sin embargo, otras cuentas podrán seguirte manualmente.
+        suspend: Ya no podés usar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía podés iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquivés la suspensión.
+      reason: 'Motivo:'
+      statuses: 'Mensajes citados:'
       subject:
+        delete_statuses: Se eliminaron tus mensajes en %{acct}
         disable: Tu cuenta %{acct} fue congelada
+        mark_statuses_as_sensitive: Tus mensajes en %{acct} fueron marcados como sensibles
         none: Advertencia para %{acct}
-        sensitive: Los mensajes con medios de tu cuenta %{acct} fueron marcados como sensibles
+        sensitive: Tus mensajes en %{acct} se marcarán como sensibles a partir de ahora
         silence: Tu cuenta %{acct} fue limitada
         suspend: Tu cuenta %{acct} fue suspendida
       title:
+        delete_statuses: Mensajes eliminados
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Mensajes marcados como sensibles
         none: Advertencia
-        sensitive: Tus medios fueron marcados como sensibles
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: Podés personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre para mostrar y más cosas. Si querés revisar a tus nuevos seguidores antes de que se les permita seguirte, podés hacer tu cuenta privada.
+      edit_profile_step: Podés personalizar tu perfil subiendo un avatar (imagen de perfil), cambiando tu nombre a mostrar y más. Podés optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
       final_action: Empezá a enviar mensajes
-      final_step: ¡Empezá a enviar mensajes! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea temporal local, y con etiquetas. Capaz que quieras presentarte al mundo con la etiqueta "#presentación".
+      final_step: "¡Empezá a enviar mensajes! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea temporal local o al usar etiquetas. Capaz que quieras presentarte al mundo con la etiqueta «#presentación»."
       full_handle: Tu nombre de usuario completo
       full_handle_hint: Esto es lo que le dirás a tus contactos para que ellos puedan enviarte mensajes o seguirte desde otro servidor.
-      review_preferences_action: Cambiar configuración
-      review_preferences_step: Asegurate de establecer tu configuración, como qué tipo de correos electrónicos te gustaría recibir, o qué nivel de privacidad te gustaría que sea el predeterminado para tus mensajes. Si no sufrís de mareos, podrías elegir habilitar la reproducción automática de GIFs.
       subject: Bienvenido a Mastodon
-      tip_federated_timeline: La línea temporal federada es una línea contínua global de la red de Mastodon. Pero sólo incluye gente que tus vecinos están siguiendo, así que no es completa.
-      tip_following: Predeterminadamente seguís al / a los administrador/es de tu servidor. Para encontrar más gente interesante, revisá las lineas temporales local y federada.
-      tip_local_timeline: La línea temporal local es una línea contínua global de cuentas en %{instance}. ¡Estos son tus vecinos inmediatos!
-      tip_mobile_webapp: Si tu navegador web móvil te ofrece agregar Mastodon a tu página de inicio, podés recibir notificaciones push. ¡Actúa como una aplicación nativa de muchas maneras!
-      tips: Consejos
       title: "¡Bienvenido a bordo, %{name}!"
   users:
     follow_limit_reached: No podés seguir a más de %{limit} cuentas
-    generic_access_help_html: "¿Tenés problemas para acceder a tu cuenta? Podés ponerte en contacto con %{email} para obtener ayuda"
     invalid_otp_token: Código de dos factores no válido
-    invalid_sign_in_token: Código de seguridad no válido
     otp_lost_help_html: Si perdiste al acceso a ambos, podés ponerte en contacto con %{email}
     seamless_external_login: Iniciaste sesión desde un servicio externo, así que la configuración de contraseña y correo electrónico no están disponibles.
     signed_in_as: 'Iniciaste sesión como:'
-    suspicious_sign_in_confirmation: Parece que no iniciaste sesión desde este dispositivo antes, y no iniciaste sesión durante un tiempo, así que te estamos enviando un código de seguridad a tu dirección de correo electrónico para confirmar que sos vos.
   verification:
     explanation_html: 'Podés <strong>verificarte a vos mismo como el propietario de los enlaces en los metadatos de tu perfil</strong>. Para eso, el sitio web del enlace debe contener un enlace de vuelta a tu perfil de Mastodon. El enlace en tu sitio <strong>debe</strong> tener un atributo <code>rel="me"</code>. El contenido del texto del enlace no importa. Acá tenés un ejemplo:'
     verification: Verificación
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 668b43727..ae2d59336 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1,92 +1,27 @@
 ---
 es-MX:
   about:
-    about_hashtag_html: Estos son toots públicos etiquetados con <strong>#%{hashtag}</strong>. Puedes interactuar con ellos si tienes una cuenta en cualquier parte del fediverso.
     about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, diseño ético, y descentralización! ¡Sé dueño de tu información con Mastodon!'
-    about_this: Información
-    active_count_after: activo
-    active_footnote: Usuarios Activos Mensuales (UAM)
-    administered_by: 'Administrado por:'
-    api: API
-    apps: Aplicaciones móviles
-    apps_platforms: Utiliza Mastodon desde iOS, Android y otras plataformas
-    browse_directory: Navega por el directorio de perfiles y filtra por intereses
-    browse_local_posts: Explora en vivo los posts públicos de este servidor
-    browse_public_posts: Navega por un transmisión en vivo de publicaciones públicas en Mastodon
-    contact: Contacto
     contact_missing: No especificado
     contact_unavailable: No disponible
-    discover_users: Descubrir usuarios
-    documentation: Documentación
-    federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
-    get_apps: Probar una aplicación móvil
     hosted_on: Mastodon hosteado en %{domain}
-    instance_actor_flash: |
-      Esta cuenta es un actor virtual usado para representar al servidor y no a ningún usuario individual.
-      Se usa para fines federativos y no debe ser bloqueado a menos que usted quiera bloquear toda la instancia, en cuyo caso se debe utilizar un bloque de dominio.
-    learn_more: Aprende más
-    privacy_policy: Política de privacidad
-    rules: Normas del servidor
-    rules_html: 'A continuación hay un resumen de las normas que debes seguir si quieres tener una cuenta en este servidor de Mastodon:'
-    see_whats_happening: Ver lo que está pasando
-    server_stats: 'Datos del servidor:'
-    source_code: Código fuente
-    status_count_after:
-      one: estado
-      other: estados
-    status_count_before: Qué han escrito
-    tagline: Seguir a amigos existentes y descubre nuevos
-    terms: Condiciones de servicio
-    unavailable_content: Contenido no disponible
-    unavailable_content_description:
-      domain: Servidor
-      reason: 'Motivo:'
-      rejecting_media: Los archivos multimedia de este servidor no serán procesados y no se mostrarán miniaturas, lo que requiere un clic manual en el otro servidor.
-      rejecting_media_title: Medios filtrados
-      silenced: Las publicaciones de este servidor no se mostrarán en ningún lugar salvo en el Inicio si sigues al autor.
-      silenced_title: Servidores silenciados
-      suspended: No podrás seguir a nadie de este servidor, y ningún dato de este será procesado o almacenado, y no se intercambiarán datos.
-      suspended_title: Servidores suspendidos
-    unavailable_content_html: Mastodon generalmente le permite ver contenido e interactuar con usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.
-    user_count_after:
-      one: usuario
-      other: usuarios
-    user_count_before: Tenemos
-    what_is_mastodon: "¿Qué es Mastodon?"
+    title: Acerca de
   accounts:
-    choices_html: 'Elecciones de %{name}:'
-    endorsements_hint: Puedes recomendar a gente que sigues desde la interfaz web, y aparecerán allí.
-    featured_tags_hint: Puede presentar hashtags específicos que se mostrarán aquí.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: Siguiendo
     instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al servidor en sí mismo y no a ningún usuario individual. Se utiliza para propósitos de la federación y no se debe suspender.
-    joined: Se unió el %{date}
     last_active: última conexión
     link_verified_on: La propiedad de este vínculo fue verificada el %{date}
-    media: Multimedia
-    moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
-    network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada aquí!"
-    people_followed_by: Usuarios a quien %{name} sigue
-    people_who_follow: Usuarios que siguen a %{name}
     pin_errors:
       following: Debes estar siguiendo a la persona a la que quieres aprobar
     posts:
       one: Toot
       other: Toots
     posts_tab_heading: Toots
-    posts_with_replies: Toots con respuestas
-    roles:
-      admin: Administrador
-      bot: Bot
-      group: Grupo
-      moderator: Moderador
-    unavailable: Perfil no disponible
-    unfollow: Dejar de seguir
   admin:
     account_actions:
       action: Realizar acción
@@ -94,26 +29,30 @@ es-MX:
     account_moderation_notes:
       create: Crear
       created_msg: "¡Nota de moderación creada con éxito!"
-      delete: Borrar
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
       add_email_domain_block: Poner en lista negra el dominio del correo
       approve: Aprobar
-      approve_all: Aprobar todos
       approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "¿Estás seguro?"
       avatar: Foto de perfil
       by_domain: Dominio
       change_email:
-        changed_msg: "¡El correo electrónico se ha actualizado correctamente!"
+        changed_msg: Correo cambiado exitosamente!
         current_email: Correo electrónico actual
         label: Cambiar el correo electrónico
         new_email: Nuevo correo electrónico
         submit: Cambiar el correo electrónico
         title: Cambiar el correo electrónico de %{username}
+      change_role:
+        changed_msg: Rol cambiado exitosamente!
+        label: Cambiar de rol
+        no_role: Sin rol
+        title: Cambiar el rol para %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      custom: Personalizado
       delete: Eliminar datos
       deleted: Borrado
       demote: Degradar
@@ -128,7 +67,7 @@ es-MX:
       email: E-mail
       email_status: E-mail Status
       enable: Habilitar
-      enable_sign_in_token_auth: Habilitar la autenticación por token de correo electrónico
+      enable_sign_in_token_auth: Habilitar autenticación por token de correo electrónico
       enabled: Habilitada
       enabled_msg: Se ha descongelado correctamente la cuenta de %{username}
       followers: Seguidores
@@ -153,7 +92,7 @@ es-MX:
         active: Activo
         all: Todos
         pending: Pendiente
-        silenced: Silenciados
+        silenced: Limitado
         suspended: Suspendidos
         title: Moderación
       moderation_notes: Notas de moderación
@@ -161,9 +100,14 @@ es-MX:
       most_recent_ip: IP más reciente
       no_account_selected: Ninguna cuenta se cambió como ninguna fue seleccionada
       no_limits_imposed: Sin límites impuestos
+      no_role_assigned: Sin rol asignado
       not_subscribed: No se está suscrito
       pending: Revisión pendiente
       perform_full_suspension: Suspender
+      previous_strikes: Amonestaciones previas
+      previous_strikes_description_html:
+        one: Esta cuenta tiene <strong>una</strong> amonestación.
+        other: Esta cuenta tiene <strong>%{count}</strong> amonestaciones.
       promote: Promocionar
       protocol: Protocolo
       public: Público
@@ -171,7 +115,6 @@ es-MX:
       redownload: Refrescar avatar
       redownloaded_msg: Se actualizó correctamente el perfil de %{username} desde el origen
       reject: Rechazar
-      reject_all: Rechazar todos
       rejected_msg: La solicitud de registro de %{username} ha sido rechazada con éxito
       remove_avatar: Eliminar el avatar
       remove_header: Eliminar cabecera
@@ -184,19 +127,13 @@ es-MX:
       reset: Reiniciar
       reset_password: Reiniciar contraseña
       resubscribe: Re-suscribir
-      role: Permisos
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Personal
-        user: Usuario
+      role: Rol
       search: Buscar
       search_same_email_domain: Otros usuarios con el mismo dominio de correo
       search_same_ip: Otros usuarios con la misma IP
       security_measures:
         only_password: Sólo contraseña
         password_and_2fa: Contraseña y 2FA
-        password_and_sign_in_token: Contraseña y token de correo electrónico
       sensitive: Sensible
       sensitized: marcado como sensible
       shared_inbox_url: URL de bandeja compartida
@@ -206,12 +143,15 @@ es-MX:
       silence: Silenciar
       silenced: Silenciado
       statuses: Estados
+      strikes: Amonestaciones previas
       subscribe: Suscribir
+      suspend: Suspender
       suspended: Suspendido
       suspension_irreversible: Los datos de esta cuenta han sido irreversiblemente eliminados. Puedes deshacer la suspensión de la cuenta para hacerla utilizable, pero no recuperará los datos que tenías anteriormente.
       suspension_reversible_hint_html: La cuenta ha sido suspendida y los datos se eliminarán completamente el %{date}. Hasta entonces, la cuenta puede ser restaurada sin ningún efecto perjudicial. Si desea eliminar todos los datos de la cuenta inmediatamente, puede hacerlo a continuación.
-      time_in_queue: Esperando en cola %{time}
       title: Cuentas
+      unblock_email: Desbloquear dirección de correo
+      unblocked_email_msg: Desbloqueo exitoso de la dirección de correo de %{username}
       unconfirmed_email: Correo electrónico sin confirmar
       undo_sensitized: Desmarcar como sensible
       undo_silenced: Des-silenciar
@@ -221,76 +161,98 @@ es-MX:
       unsuspended_msg: Se quitó con éxito la suspensión de la cuenta de %{username}
       username: Nombre de usuario
       view_domain: Ver resumen del dominio
-      warn: Adevertir
+      warn: Advertir
       web: Web
       whitelisted: Añadido a la lista blanca
     action_logs:
       action_types:
+        approve_appeal: Aprobar apelación
+        approve_user: Aprobar Usuario
         assigned_to_self_report: Asignar Reporte
         change_email_user: Cambiar Correo Electrónico del Usuario
+        change_role_user: Cambiar rol del usuario
         confirm_user: Confirmar Usuario
         create_account_warning: Crear Advertencia
         create_announcement: Crear Anuncio
+        create_canonical_email_block: Crear Bloque de E-mail
         create_custom_emoji: Crear Emoji Personalizado
         create_domain_allow: Crear Permiso de Dominio
         create_domain_block: Crear Bloqueo de Dominio
         create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
         create_ip_block: Crear regla IP
         create_unavailable_domain: Crear Dominio No Disponible
+        create_user_role: Crear rol
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
+        destroy_canonical_email_block: Eliminar Bloque de E-mail
         destroy_custom_emoji: Eliminar Emoji Personalizado
         destroy_domain_allow: Eliminar Permiso de Dominio
         destroy_domain_block: Eliminar Bloqueo de Dominio
         destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+        destroy_instance: Purgar dominio
         destroy_ip_block: Eliminar regla IP
         destroy_status: Eliminar Estado
         destroy_unavailable_domain: Eliminar Dominio No Disponible
+        destroy_user_role: Destruir Rol
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
-        disable_sign_in_token_auth_user: Deshabilitar la Autenticación por Token de Correo Electrónico para el Usuario
+        disable_sign_in_token_auth_user: Desactivar la autenticación de token de correo electrónico para el usuario
         disable_user: Deshabilitar Usuario
         enable_custom_emoji: Habilitar Emoji Personalizado
         enable_sign_in_token_auth_user: Habilitar la Autenticación por Token de Correo Electrónico para el Usuario
         enable_user: Habilitar Usuario
         memorialize_account: Transformar en Cuenta Conmemorativa
         promote_user: Promover Usuario
+        reject_appeal: Rechazar apelación
+        reject_user: Rechazar Usuario
         remove_avatar_user: Eliminar Avatar
         reopen_report: Reabrir Reporte
+        resend_user: Reenviar Correo de Confirmación
         reset_password_user: Restablecer Contraseña
         resolve_report: Resolver Reporte
         sensitive_account: Marcar multimedia en tu cuenta como sensible
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
+        unblock_email_account: Desblqouear dirección de correo
         unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
         update_announcement: Actualizar Anuncio
         update_custom_emoji: Actualizar Emoji Personalizado
         update_domain_block: Actualizar el Bloqueo de Dominio
+        update_ip_block: Actualizar regla IP
         update_status: Actualizar Estado
+        update_user_role: Actualizar Rol
       actions:
+        approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
+        approve_user_html: "%{name} aprobó el registro de %{target}"
         assigned_to_self_report_html: "%{name} asignó el informe %{target} a sí mismo"
         change_email_user_html: "%{name} cambió la dirección de correo electrónico del usuario %{target}"
+        change_role_user_html: "%{name} cambió el rol de %{target}"
         confirm_user_html: "%{name} confirmó la dirección de correo electrónico del usuario %{target}"
         create_account_warning_html: "%{name} envió una advertencia a %{target}"
         create_announcement_html: "%{name} ha creado un nuevo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueó el correo electrónico con el hash %{target}"
         create_custom_emoji_html: "%{name} subió un nuevo emoji %{target}"
         create_domain_allow_html: "%{name} permitió la federación con el dominio %{target}"
         create_domain_block_html: "%{name} bloqueó el dominio %{target}"
         create_email_domain_block_html: "%{name} bloqueó el dominio de correo electrónico %{target}"
         create_ip_block_html: "%{name} creó una regla para la IP %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al dominio %{target}"
+        create_user_role_html: "%{name} creó el rol %{target}"
         demote_user_html: "%{name} degradó al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
-        destroy_custom_emoji_html: "%{name} destruyó emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminó el emoji %{target}"
         destroy_domain_allow_html: "%{name} bloqueó la federación con el dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueó el dominio %{target}"
         destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}"
+        destroy_instance_html: "%{name} purgó el dominio %{target}"
         destroy_ip_block_html: "%{name} eliminó una regla para la IP %{target}"
         destroy_status_html: "%{name} eliminó el estado por %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
+        destroy_user_role_html: "%{name} eliminó el rol %{target}"
         disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} ha deshabilitado la autenticación por token de correo electrónico para %{target}"
@@ -300,22 +262,28 @@ es-MX:
         enable_user_html: "%{name} habilitó el inicio de sesión para el usuario %{target}"
         memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una página in memoriam"
         promote_user_html: "%{name} promoción al usuario %{target}"
+        reject_appeal_html: "%{name} rechazó la solicitud de moderación de %{target}"
+        reject_user_html: "%{name} rechazó el registro de %{target}"
         remove_avatar_user_html: "%{name} eliminó el avatar de %{target}"
         reopen_report_html: "%{name} reabrió el informe %{target}"
+        resend_user_html: "%{name} ha reenviado el correo de confirmación para %{target}"
         reset_password_user_html: "%{name} reinició la contraseña del usuario %{target}"
         resolve_report_html: "%{name} resolvió el informe %{target}"
         sensitive_account_html: "%{name} marcó la multimedia de %{target} como sensible"
         silence_account_html: "%{name} silenció la cuenta de %{target}"
         suspend_account_html: "%{name} suspendió la cuenta de %{target}"
         unassigned_report_html: "%{name} des-asignó el informe %{target}"
+        unblock_email_account_html: "%{name} ha desbloqueado la dirección de correo de %{target}"
         unsensitive_account_html: "%{name} desmarcó la multimedia de %{target} como sensible"
         unsilence_account_html: "%{name} desilenció la cuenta de %{target}"
         unsuspend_account_html: "%{name} reactivó la cuenta de %{target}"
         update_announcement_html: "%{name} actualizó el anuncio %{target}"
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
+        update_ip_block_html: "%{name} cambió la regla para la IP %{target}"
         update_status_html: "%{name} actualizó el estado de %{target}"
-      deleted_status: "(estado borrado)"
+        update_user_role_html: "%{name} cambió el rol %{target}"
+      deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
@@ -354,11 +322,12 @@ es-MX:
       enable: Habilitar
       enabled: Activado
       enabled_msg: Se habilitó con éxito ese emoji
-      image_hint: PNG de hasta 50KB
+      image_hint: PNG o GIF hasta %{size}
       list: Lista
       listed: Listados
       new:
         title: Añadir nuevo emoji personalizado
+      no_emoji_selected: No se cambió ningún emoji ya que no se seleccionó ninguno
       not_permitted: No tienes permiso para realizar esta acción
       overwrite: Sobrescribir
       shortcode: Código de atajo
@@ -371,13 +340,41 @@ es-MX:
       updated_msg: "¡Emoji actualizado con éxito!"
       upload: Subir
     dashboard:
+      active_users: usuarios activos
+      interactions: interaccciones
+      media_storage: Almacenamiento
+      new_users: nuevos usuarios
+      opened_reports: informes abiertos
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelación pendiente"
+        other: "<strong>%{count}</strong> apelaciones pendientes"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> informe pendiente"
+        other: "<strong>%{count}</strong> informes pendientes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> etiqueta pendiente"
+        other: "<strong>%{count}</strong> etiquetas pendientes"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usuario pendiente"
+        other: "<strong>%{count}</strong> usuarios pendientes"
+      resolved_reports: informes resueltos
       software: Software
+      sources: Fuentes de registro
       space: Uso de almacenamiento
       title: Tablero
+      top_languages: Idiomas más activos
+      top_servers: Servidores más activos
+      website: Sitio web
+    disputes:
+      appeals:
+        empty: No se encontraron apelaciones.
+        title: Apelaciones
     domain_allows:
       add_new: Añadir dominio a la lista blanca
       created_msg: Dominio añadido a la lista blanca con éxito
       destroyed_msg: Dominio quitado de la lista blanca con éxito
+      export: Exportar
+      import: Importar
       undo: Quitar de la lista blanca
     domain_blocks:
       add_new: Añadir nuevo
@@ -385,16 +382,21 @@ es-MX:
       destroyed_msg: El bloque de dominio se deshizo
       domain: Dominio
       edit: Editar nuevo dominio bloqueado
+      existing_domain_block: Ya ha impuesto límites más estrictos a %{name}.
       existing_domain_block_html: Ya ha impuesto límites más estrictos a %{name}, necesita <a href="%{unblock_url}">desbloquearlo primero</a>.
+      export: Exportar
+      import: Importar
       new:
         create: Crear bloque
         hint: El bloque de dominio no prevendrá la creación de entradas de cuenta en la base de datos, pero aplicará retroactiva y automáticamente métodos de moderación específica en dichas cuentas.
         severity:
-          desc_html: "<strong>Silenciar</strong> hará los posts de la cuenta invisibles a cualquiera que no lo esté siguiendo. <strong>Suspender</strong> eliminará todo el contenido, media, y datos del perfil. Usa <strong>Ninguno</strong> si solo quieres rechazar archivos multimedia."
+          desc_html: "<strong>Limitar</strong> hará que las publicaciones de las cuentas de ese dominio sean invisibles para cualquiera que no las esté siguiendo. <strong>Suspender</strong> eliminará todo el contenido, archivos multimedia, y datos del perfil. Usa <strong>Ninguno</strong> si solo quieres rechazar archivos multimedia."
           noop: Ninguno
-          silence: Silenciar
+          silence: Limitar
           suspend: Suspender
         title: Nuevo bloque de dominio
+      no_domain_block_selected: No se cambió ningún bloqueo de dominio ya que ninguno fue seleccionado
+      not_permitted: No tienes permiso para realizar esta acción
       obfuscate: Ocultar nombre de dominio
       obfuscate_hint: Oculta parcialmente el nombre de dominio en la lista si mostrar la lista de limitaciones de dominio está habilitado
       private_comment: Comentario privado
@@ -405,34 +407,41 @@ es-MX:
       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
-      rejecting_media: rechazar archivos multimedia
-      rejecting_reports: rechazando informes
-      severity:
-        silence: silenciado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Una cuenta en la base de datos afectada
-          other: "%{count} cuentas en la base de datos afectadas"
-        retroactive:
-          silence: Des-silenciar todas las cuentas existentes de este dominio
-          suspend: Des-suspender todas las cuentas existentes de este dominio
-        title: Deshacer bloque de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer
       view: Ver dominio bloqueado
     email_domain_blocks:
       add_new: Añadir nuevo
+      attempts_over_week:
+        one: "%{count} intentos durante la última semana"
+        other: "%{count} intentos de registro en la última semana"
       created_msg: Dominio de correo añadido a la lista negra con éxito
       delete: Borrar
-      destroyed_msg: Dominio de correo borrado de la lista negra con éxito
+      dns:
+        types:
+          mx: Registro MX
       domain: Dominio
-      empty: Actualmente no hay dominios de correo electrónico en la lista negra.
-      from_html: de %{domain}
       new:
         create: Añadir dominio
+        resolve: Resolver dominio
         title: Nueva entrada en la lista negra de correo
+      no_email_domain_block_selected: No se han cambiado bloqueos de dominio ya que ninguno ha sido seleccionado
+      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tenga cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
+      resolved_through_html: Resuelto a través de %{domain}
       title: Lista negra de correo
+    export_domain_allows:
+      new:
+        title: Importar dominios permitidos
+      no_file: Ningún archivo seleccionado
+    export_domain_blocks:
+      import:
+        description_html: Estás a punto de importar una lista de bloqueos de dominio. Por favor, revisa esta lista con mucho cuidado, especialmente si no has creado esta lista tú mismo.
+        existing_relationships_warning: Relaciones de seguimiento existentes
+        private_comment_description_html: 'Para ayudarle a rastrear de dónde proceden los bloqueos importados, los bloqueos importados se crearán con el siguiente comentario privado: <q>%{comment}</q>'
+        private_comment_template: Importado desde %{source} el %{date}
+        title: Importar bloqueos de dominio
+      new:
+        title: Importar bloqueos de dominio
+      no_file: No hay archivo seleccionado
     follow_recommendations:
       description_html: "<strong>Las recomendaciones de cuentas ayudan a los nuevos usuarios a encontrar rápidamente contenido interesante</strong>. Cuando un usuario no ha interactuado con otros lo suficiente como para suscitar recomendaciones personalizadas de cuentas a las que seguir, en su lugar se le recomiendan estas cuentas. Se recalculan diariamente a partir de una mezcla de cuentas con el mayor número de interacciones recientes y con el mayor número de seguidores locales con un idioma determinado."
       language: Para el idioma
@@ -442,25 +451,53 @@ es-MX:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      availability:
+        description_html:
+          one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+          other: Si el envío al dominio falla <strong>%{count} días diferentes</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+        failure_threshold_reached: Límite de fallo alcanzado el %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días diferentes.
+        no_failures_recorded: No hay fallos en el registro.
+        title: Disponibilidad
+        warning: El último intento de conexión a este servidor no ha tenido éxito
       back_to_all: Todos
       back_to_limited: Limitados
       back_to_warning: Advertencia
       by_domain: Dominio
+      confirm_purge: "¿Seguro que quieres eliminar permanentemente los datos de este dominio?"
+      content_policies:
+        comment: Nota interna
+        description_html: Puedes definir políticas de contenido que se aplicarán a todas las cuentas de este dominio y a cualquiera de sus subdominios.
+        policies:
+          reject_media: Rechazar multimedia
+          reject_reports: Rechazar informes
+          silence: Limitar
+          suspend: Suspender
+        policy: Política
+        reason: Razón pública
+        title: Políticas de contenido
+      dashboard:
+        instance_accounts_dimension: Cuentas más seguidas
+        instance_accounts_measure: cuentas almacenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: sus seguidores aquí
+        instance_languages_dimension: Idiomas principales
+        instance_media_attachments_measure: archivos adjuntos guardados
+        instance_reports_measure: informes sobre ellos
+        instance_statuses_measure: publicaciones almacenadas
       delivery:
         all: Todos
         clear: Limpiar errores de entrega
+        failing: Fallando
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Fallo de entrega %{count} día
-          other: Fallo de entrega %{count} días
       delivery_available: Entrega disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible a lo largo de %{count} días, se marcará automáticamente como no entregable.
+      destroyed_msg: Los datos de %{domain} están ahora en cola para su inminente eliminación.
       empty: No se encontraron dominios.
       known_accounts:
         one: "%{count} cuenta conocida"
@@ -471,12 +508,15 @@ es-MX:
         title: Moderación
       private_comment: Comentario privado
       public_comment: Comentario público
+      purge: Purgar
+      purge_description_html: Si crees que este dominio está desconectado, puedes borrar todos los registros de cuentas y los datos asociados de este dominio de tu almacenamiento. Esto puede llevar un tiempo.
       title: Instancias conocidas
       total_blocked_by_us: Bloqueado por nosotros
       total_followed_by_them: Seguidos por ellos
       total_followed_by_us: Seguido por nosotros
       total_reported: Informes sobre ellas
       total_storage: Archivos multimedia
+      totals_time_period_hint_html: Los totales mostrados a continuación incluyen datos para todo el tiempo.
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -500,8 +540,6 @@ es-MX:
         title: Crear nueva regla IP
       no_ip_block_selected: No se han cambiado reglas IP ya que no se ha seleccionado ninguna
       title: Reglas IP
-    pending_accounts:
-      title: Cuentas pendientes (%{count})
     relationships:
       title: Relaciones de %{acct}
     relays:
@@ -528,39 +566,121 @@ es-MX:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} informe"
-          other: "%{count} informes"
+      action_log: Registro de auditoría
       action_taken_by: Acción tomada por
+      actions:
+        delete_description_html: Los mensajes denunciados serán eliminados y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos multimedia en los mensajes informados se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar las futuras infracciones de la misma cuenta.
+        other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada.
+        resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe.
+        silence_description_html: El perfil será visible solo para aquellos que ya lo sigan o lo busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
+        suspend_description_html: El perfil y todos sus contenidos serán inaccesibles hasta que sean finalmente eliminados. La interacción con la cuenta será imposible. Reversible durante un plazo de 30 días.
+      actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
+      add_to_report: Añadir más al reporte
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
+      by_target_domain: Dominio de la cuenta reportada
+      category: Categoría
+      category_description_html: La razón por la que se reportó esta cuenta o contenido será citada en las comunicaciones con la cuenta reportada
       comment:
         none: Ninguno
+      comment_description_html: 'Para proporcionar más información, %{name} escribió:'
       created_at: Denunciado
+      delete_and_resolve: Eliminar publicaciones
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelto
+      no_one_assigned: Nadie
       notes:
         create: Añadir una nota
         create_and_resolve: Resolver con una nota
         create_and_unresolve: Reabrir con una nota
         delete: Eliminar
         placeholder: Especificar qué acciones se han tomado o cualquier otra novedad respecto a esta denuncia…
+        title: Notas
+      notes_description_html: Ver y dejar notas a otros moderadores y a tu yo futuro
+      quick_actions_description_html: 'Toma una acción rápida o desplázate hacia abajo para ver el contenido denunciado:'
+      remote_user_placeholder: el usuario remoto de %{instance}
       reopen: Reabrir denuncia
       report: 'Reportar #%{id}'
       reported_account: Cuenta reportada
       reported_by: Reportado por
       resolved: Resuelto
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
+      skip_to_actions: Ir directamente a las acciones
       status: Estado
-      target_domain: Dominio de la cuenta reportada
+      statuses: Contenido reportado
+      statuses_description_html: El contenido ofensivo se citará en comunicación con la cuenta reportada
       target_origin: Origen de la cuenta reportada
       title: Reportes
       unassign: Desasignar
       unresolved: No resuelto
       updated_at: Actualizado
+      view_profile: Ver perfil
+    roles:
+      add_new: Añadir rol
+      assigned_users:
+        one: "%{count} usuario"
+        other: "%{count} usuarios"
+      categories:
+        administration: Administración
+        devops: DevOps
+        invites: Invitaciones
+        moderation: Moderación
+        special: Especial
+      delete: Eliminar
+      description_html: Con <strong>roles de usuario</strong>, puede personalizar las funciones y áreas de Mastodon a las que pueden acceder sus usuarios.
+      edit: Editar rol '%{name}'
+      everyone: Permisos por defecto
+      everyone_full_description_html: Este es el <strong>rol base</strong> que afecta a <strong>todos los usuarios</strong>, incluso aquellos sin un rol asignado. Todos los otros roles heredan permisos de él.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Los usuarios con este permiso saltarán todos los permisos
+        delete_user_data: Borrar Datos de Usuario
+        delete_user_data_description: Permite a los usuarios eliminar los datos de otros usuarios sin demora
+        invite_users: Invitar usuarios
+        invite_users_description: Permite a los usuarios invitar a nuevas personas al servidor
+        manage_announcements: Administrar Anuncios
+        manage_announcements_description: Permite a los usuarios gestionar anuncios en el servidor
+        manage_appeals: Administrar Apelaciones
+        manage_appeals_description: Permite a los usuarios revisar apelaciones contra acciones de moderación
+        manage_blocks: Administrar Bloqueos
+        manage_blocks_description: Permite a los usuarios bloquear los proveedores de e-mail y las direcciones IP
+        manage_custom_emojis: Administrar Emojis Personalizados
+        manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
+        manage_federation: Administrar Federación
+        manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad
+        manage_invites: Administrar Invitaciones
+        manage_invites_description: Permite a los usuarios navegar y desactivar los enlaces de invitación
+        manage_reports: Administrar Informes
+        manage_reports_description: Permite a los usuarios revisar informes y realizar acciones de moderación basadas en ellos
+        manage_roles: Administrar Roles
+        manage_roles_description: Permite a los usuarios administrar y asignar roles por debajo de los suyos
+        manage_rules: Gestionar Reglas
+        manage_rules_description: Permite a los usuarios cambiar las reglas del servidor
+        manage_settings: Administrar Ajustes
+        manage_settings_description: Permite a los usuarios cambiar la configuración del sitio
+        manage_taxonomies: Administrar Taxonomías
+        manage_taxonomies_description: Permite a los usuarios revisar el contenido en tendencia y actualizar la configuración de las etiquetas
+        manage_user_access: Administrar Acceso de Usuarios
+        manage_user_access_description: Permite a los usuarios desactivar la autenticación de dos factores de otros usuarios, cambiar su dirección de correo electrónico y restablecer su contraseña
+        manage_users: Administrar Usuarios
+        manage_users_description: Permite a los usuarios ver los detalles de otros usuarios y realizar acciones de moderación contra ellos
+        manage_webhooks: Administrar Webhooks
+        manage_webhooks_description: Permite a los usuarios configurar webhooks para eventos administrativos
+        view_audit_log: Ver Registro de Auditoría
+        view_audit_log_description: Permite a los usuarios ver un historial de acciones administrativas en el servidor
+        view_dashboard: Ver Panel de Control
+        view_dashboard_description: Permite a los usuarios acceder al panel de control y varias métricas
+        view_devops: DevOps
+        view_devops_description: Permite a los usuarios acceder a los paneles de control Sidekiq y pgHero
+      title: Roles
     rules:
       add_new: Añadir norma
       delete: Eliminar
@@ -569,142 +689,201 @@ es-MX:
       empty: Aún no se han definido las normas del servidor.
       title: Normas del servidor
     settings:
-      activity_api_enabled:
-        desc_html: Conteo de estados publicados localmente, usuarios activos, y nuevos registros en  periodos semanales
-        title: Publicar estadísticas locales acerca de actividad de usuario
-      bootstrap_timeline_accounts:
-        desc_html: Separa con comas los nombres de usuario. Solo funcionará para cuentas locales desbloqueadas. Si se deja vacío, se tomará como valor por defecto a todos los administradores locales.
-        title: Seguimientos predeterminados para usuarios nuevos
-      contact_information:
-        email: Correo de trabajo
-        username: Nombre de usuario
-      custom_css:
-        desc_html: Modificar el aspecto con CSS cargado en cada página
-        title: CSS personalizado
+      about:
+        manage_rules: Administrar reglas del servidor
+        preamble: Proporciona información detallada sobre cómo el servidor es operado, moderado y financiado.
+        rules_hint: Hay un área dedicada para las reglas a las que se espera que tus usuarios se adhieran.
+        title: Acerca de
+      appearance:
+        preamble: Personalizar la interfaz web de Mastodon.
+        title: Apariencia
+      branding:
+        preamble: La marca de tu servidor lo diferencia de otros servidores de la red. Esta información puede mostrarse a través de una variedad de entornos, como en la interfaz web de Mastodon, en aplicaciones nativas, en previsualizaciones de enlaces en otros sitios web y en aplicaciones de mensajería, etc. Por esta razón, es mejor mantener esta información clara, breve y concisa.
+        title: Marca
+      content_retention:
+        preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
+        title: Retención de contenido
       default_noindex:
         desc_html: Afecta a todos los usuarios que no han cambiado esta configuración por sí mismos
-        title: Optar por los usuarios fuera de la indexación en los motores de búsqueda por defecto
+        title: Excluir por defecto a los usuarios de la indexación del motor de búsqueda
+      discovery:
+        follow_recommendations: Recomendaciones de cuentas
+        preamble: Exponer contenido interesante a la superficie es fundamental para incorporar nuevos usuarios que pueden no conocer a nadie Mastodon. Controla cómo funcionan varias opciones de descubrimiento en tu servidor.
+        profile_directory: Directorio de perfiles
+        public_timelines: Lineas de tiempo públicas
+        title: Descubrimiento
+        trends: Tendencias
       domain_blocks:
         all: A todos
         disabled: A nadie
-        title: Mostrar dominios bloqueados
         users: Para los usuarios locales que han iniciado sesión
-      domain_blocks_rationale:
-        title: Mostrar la razón de ser
-      hero:
-        desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia
-        title: Imagen de portada
-      mascot:
-        desc_html: Mostrado en múltiples páginas. Se recomienda un tamaño mínimo de 293x205px. Cuando no se especifica, se muestra la mascota por defecto
-        title: Imagen de la mascota
-      peers_api_enabled:
-        desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso
-        title: Publicar lista de instancias descubiertas
-      preview_sensitive_media:
-        desc_html: Los enlaces de vistas previas en otras web mostrarán una miniatura incluso si el medio está marcado como contenido sensible
-        title: Mostrar contenido sensible en previews de OpenGraph
-      profile_directory:
-        desc_html: Permitir que los usuarios puedan ser descubiertos
-        title: Habilitar directorio de perfiles
       registrations:
-        closed_message:
-          desc_html: Se muestra en la portada cuando los registros están cerrados. Puedes usar tags HTML
-          title: Mensaje de registro cerrado
-        deletion:
-          desc_html: Permite a cualquiera a eliminar su cuenta
-          title: Eliminación de cuenta abierta
-        min_invite_role:
-          disabled: Nadie
-          title: Permitir invitaciones de
-        require_invite_text:
-          desc_html: Cuando los registros requieren aprobación manual, haga obligatorio en la invitaciones el campo "¿Por qué quieres unirte?" en lugar de opcional
-          title: Requiere a los nuevos usuarios rellenar un texto de solicitud de invitación
+        preamble: Controla quién puede crear una cuenta en tu servidor.
+        title: Registros
       registrations_mode:
         modes:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
-        title: Modo de registros
-      show_known_fediverse_at_about_page:
-        desc_html: Cuando esté activado, se mostrarán toots de todo el fediverso conocido en la vista previa. En otro caso, se mostrarán solamente toots locales.
-        title: Mostrar fediverso conocido en la vista previa de la historia
-      show_staff_badge:
-        desc_html: Mostrar un parche de staff en la página de un usuario
-        title: Mostrar parche de staff
-      site_description:
-        desc_html: Párrafo introductorio en la portada y en meta tags. Puedes usar tags HTML, en particular <code>&lt;a&gt;</code> y <code>&lt;em&gt;</code>.
-        title: Descripción de instancia
-      site_description_extended:
-        desc_html: Un buen lugar para tu código de conducta, reglas, guías y otras cosas que estén impuestas aparte en tu instancia. Puedes usar tags HTML
-        title: Información extendida personalizada
-      site_short_description:
-        desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe lo que es Mastodon y qué hace especial a este servidor en un solo párrafo. si está vacío, pone por defecto la descripción de la instancia.
-        title: Descripción corta de la instancia
-      site_terms:
-        desc_html: Puedes escribir tus propias políticas de privacidad, términos de servicio u otras legalidades. Puedes usar tags HTML
-        title: Términos de servicio personalizados
-      site_title: Nombre de instancia
-      thumbnail:
-        desc_html: Se usa para muestras con OpenGraph y APIs. Se recomienda 1200x630px
-        title: Portada de instancia
-      timeline_preview:
-        desc_html: Mostrar línea de tiempo pública en la portada
-        title: Previsualización
-      title: Ajustes del sitio
-      trendable_by_default:
-        desc_html: Afecta a etiquetas que no han sido previamente rechazadas
-        title: Permitir que las etiquetas sean tendencia sin revisión previa
-      trends:
-        desc_html: Mostrar públicamente hashtags previamente revisados que son tendencia
-        title: Hashtags de tendencia
+      title: Ajustes del Servidor
     site_uploads:
       delete: Eliminar archivo subido
       destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     statuses:
+      account: Autor
+      application: Aplicación
       back_to_account: Volver a la cuenta
+      back_to_report: Volver a la página de reporte
       batch:
-        delete: Eliminar
-        nsfw_off: Marcar contenido como no sensible
-        nsfw_on: Marcar contenido como sensible
+        remove_from_report: Eliminar del reporte
+        report: Reportar
       deleted: Eliminado
-      failed_to_execute: Falló al ejecutar
+      favourites: Favoritos
+      history: Historial de versiones
+      in_reply_to: En respuesta a
+      language: Idioma
       media:
         title: Multimedia
-      no_media: No hay multimedia
+      metadata: Metadatos
       no_status_selected: No se cambió ningún estado al no seleccionar ninguno
+      open: Abrir publicación
+      original_status: Publicación original
+      reblogs: Impulsos
+      status_changed: Publicación cambiada
       title: Estado de las cuentas
+      trending: En tendencia
+      visibility: Visibilidad
       with_media: Con multimedia
+    strikes:
+      actions:
+        delete_statuses: "%{name} ha eliminado las publicaciones de %{target}'s"
+        disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcó las publicaciones de %{target} como sensibles"
+        none: "%{name} envió una advertencia a %{target}"
+        sensitive: "%{name} ha marcado la cuenta de %{target}'s como sensible"
+        silence: "%{name} limito la cuenta de %{target}"
+        suspend: "%{name} suspendio la cuenta de %{target}"
+      appeal_approved: Apelado
+      appeal_pending: Apelación pendiente
     system_checks:
       database_schema_check:
         message_html: Hay migraciones pendientes de la base de datos. Por favor, ejecútalas para asegurarte de que la aplicación funciona como debería
+      elasticsearch_running_check:
+        message_html: No se pudo conectar a Elasticsearch. Por favor, comprueba que está ejecutándose, o desactiva la búsqueda de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versión incompatible de Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} se está ejecutando pero se necesita Elasticsearch %{required_version}
       rules_check:
         action: Administrar reglas del servidor
         message_html: No ha definido ninguna regla del servidor.
       sidekiq_process_check:
         message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
     tags:
-      accounts_today: Usos únicos de hoy
-      accounts_week: Usos únicos esta semana
-      breakdown: Desglose del consumo actual por fuentes
-      last_active: Última actividad
-      most_popular: Más popular
-      most_recent: Más reciente
-      name: Etiqueta
       review: Estado de revisión
-      reviewed: Revisado
-      title: Etiquetas
-      trending_right_now: En tendencia ahora mismo
-      unique_uses_today: "%{count} publicando hoy"
-      unreviewed: No revisado
       updated_msg: Hashtags actualizados exitosamente
     title: Administración
+    trends:
+      allow: Permitir
+      approved: Aprobado
+      disallow: Rechazar
+      links:
+        allow: Permitir enlace
+        allow_provider: Permitir editor
+        description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
+        disallow: Rechazar enlace
+        disallow_provider: Rechazar editor
+        no_link_selected: No se cambió ningún enlace ya que no se seleccionó ninguno
+        publishers:
+          no_publisher_selected: No se cambió ningún editor ya que no se seleccionó ninguno
+        shared_by_over_week:
+          one: Compartido por una persona durante la última semana
+          other: Compartido por %{count} personas durante la última semana
+        title: Enlaces en tendencia
+        usage_comparison: Compartido %{today} veces hoy, comparado a %{yesterday} ayer
+      only_allowed: Sólo las permitidas
+      pending_review: Revisión pendiente
+      preview_card_providers:
+        allowed: Los enlaces de este editor pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en su servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Su aprobación (o rechazo) se extiende a los subdominios.
+        rejected: Los enlaces del editor no pueden ser tendencia
+        title: Editores
+      rejected: Rechazado
+      statuses:
+        allow: Permitir publicación
+        allow_account: Permitir autor
+        description_html: Estos son publicaciones que su servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más gente a la que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
+        disallow: Rechazar publicación
+        disallow_account: No permitir autor
+        no_status_selected: No se cambió ninguna publicación en tendencia ya que no se seleccionó ninguna
+        not_discoverable: El autor no ha optado por ser detectable
+        shared_by:
+          one: Compartido o marcado como favorito una vez
+          other: Compartido o marcado como favorito %{friendly_count} veces
+        title: Publicaciones destacadas
+      tags:
+        current_score: Puntuación actual %{score}
+        dashboard:
+          tag_accounts_measure: usos únicos
+          tag_languages_dimension: Idiomas principales
+          tag_servers_dimension: Servidores principales
+          tag_servers_measure: diferentes servidores
+          tag_uses_measure: usuarios totales
+        description_html: Estos son etiquetas que están apareciendo en muchos posts que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay hashtags que se muestren públicamente hasta que los apruebes.
+        listable: Pueden ser recomendadas
+        no_tag_selected: No se cambió ninguna etiqueta ya que no se seleccionó ninguna
+        not_listable: No serán recomendadas
+        not_trendable: No aparecerán en tendencias
+        not_usable: No pueden ser usadas
+        peaked_on_and_decaying: Alcanzó el pico en %{date}, ahora decreciendo
+        title: Etiquetas en tendencia
+        trendable: Pueden aparecer en tendencias
+        trending_rank: Tendencia n.º %{rank}
+        usable: Pueden usarse
+        usage_comparison: Usada %{today} veces hoy, comparado con %{yesterday} ayer
+        used_by_over_week:
+          one: Usada por una persona durante la última semana
+          other: Usada por %{count} personas durante la última semana
+      title: Tendencias
+      trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
       edit_preset: Editar aviso predeterminado
       empty: Aún no has definido ningún preajuste de advertencia.
       title: Editar configuración predeterminada de avisos
+    webhooks:
+      add_new: Añadir endpoint
+      delete: Eliminar
+      description_html: Un <strong>webhook</strong> permite a Mastodon enviar <strong>notificaciones en tiempo real</strong> sobre los eventos elegidos a tu propia aplicación, para que tu aplicación pueda <strong>lanzar reacciones automáticamente</strong>.
+      disable: Deshabilitar
+      disabled: Deshabilitado
+      edit: Editar endpoint
+      empty: Aún no tienes ningún endpoint de webhook configurado.
+      enable: Habilitar
+      enabled: Activo
+      enabled_events:
+        one: 1 evento habilitado
+        other: "%{count} eventos habilitados"
+      events: Eventos
+      new: Nuevo webhook
+      rotate_secret: Rotar secreto
+      secret: Firmando secreto
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para eliminar sus mensajes
+        disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
+        none: una alvertencia
+        sensitive: para marcar su cuenta como sensible
+        silence: para limitar su cuenta
+        suspend: suspender su cuenta
+      body: "%{target} está apelando a una solicitud de moderación de %{action_taken_by} el %{date}, del tipo %{type}. Ellos escribieron:"
+      next_steps: Puedes aprobar la apelación para deshacer la decisión de moderación, o ignorarla.
+      subject: "%{username} está apelando a una decisión de moderación en %{instance}"
     new_pending_account:
       body: Los detalles de la nueva cuenta están abajos. Puedes aprobar o rechazar esta aplicación.
       subject: Nueva cuenta para revisión en %{instance} (%{username})
@@ -712,9 +891,17 @@ es-MX:
       body: "%{reporter} ha reportado a %{target}"
       body_remote: Alguien de %{domain} a reportado a %{target}
       subject: Nuevo reporte para la %{instance} (#%{id})
-    new_trending_tag:
-      body: 'El hashtag #%{name} está en tendencia hoy, pero no ha sido revisado previamente. No se mostrará públicamente a menos que lo permita, o simplemente guarde el formulario como para no volver a ver esto.'
-      subject: Nuevo hashtag para revisión en %{instance} (#%{name})
+    new_trends:
+      body: 'Los siguientes elementos necesitan una revisión antes de que se puedan mostrar públicamente:'
+      new_trending_links:
+        title: Enlaces en tendencia
+      new_trending_statuses:
+        title: Publicaciones en tendencia
+      new_trending_tags:
+        no_approved_tags: Actualmente no hay ninguna etiqueta en tendencia aprobada.
+        requirements: 'Cualquiera de estos candidatos podría superar el hashtag en tendencia aprobado por #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
+        title: Etiquetas en tendencia
+      subject: Nuevas tendencias esperando ser revisadas en %{instance}
   aliases:
     add_new: Crear alias
     created_msg: El nuevo alias se ha creado correctamente. Ahora puedes empezar el traslado desde la cuenta antigua.
@@ -744,16 +931,13 @@ es-MX:
   applications:
     created: Aplicación creada exitosamente
     destroyed: Apicación eliminada exitosamente
-    invalid_url: La URL proporcionada es incorrecta
     regenerate_token: Regenerar token de acceso
     token_regenerated: Token de acceso regenerado exitosamente
     warning: Ten mucho cuidado con estos datos. ¡No los compartas con nadie!
     your_token: Tu token de acceso
   auth:
-    apply_for_account: Solicitar una invitación
+    apply_for_account: Solicitar una cuenta
     change_password: Contraseña
-    checkbox_agreement_html: Acepto <a href="%{rules_path}" target="_blank">las reglas del servidor</a> y <a href="%{terms_path}" target="_blank">términos de servicio</a>
-    checkbox_agreement_without_rules_html: Acepto los <a href="%{terms_path}" target="_blank">términos de servicio</a>
     delete_account: Borrar cuenta
     delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
     description:
@@ -766,11 +950,13 @@ es-MX:
     invalid_reset_password_token: El token de reinicio de contraseña es inválido o expiró. Por favor pide uno nuevo.
     link_to_otp: Introduce un código de dos factores desde tu teléfono o un código de recuperación
     link_to_webauth: Utilice su dispositivo de clave de seguridad
+    log_in_with: Iniciar sesión con
     login: Iniciar sesión
     logout: Cerrar sesión
     migrate_account: Mudarse a otra cuenta
     migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes <a href="%{path}">configurarlo aquí</a>.
     or_log_in_with: O inicia sesión con
+    privacy_policy_agreement_html: He leído y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
     providers:
       cas: CAS
       saml: SAML
@@ -778,20 +964,26 @@ es-MX:
     registration_closed: "%{instance} no está aceptando nuevos miembros"
     resend_confirmation: Volver a enviar el correo de confirmación
     reset_password: Restablecer contraseña
+    rules:
+      preamble: Estas son establecidas y aplicadas por los moderadores de %{domain}.
+      title: Algunas reglas básicas.
     security: Cambiar contraseña
     set_new_password: Establecer nueva contraseña
     setup:
       email_below_hint_html: Si la dirección de correo electrónico que aparece a continuación es incorrecta, se puede cambiarla aquí y recibir un nuevo correo electrónico de confirmación.
       email_settings_hint_html: El correo electrónico de confirmación fue enviado a %{email}. Si esa dirección de correo electrónico no sea correcta, se puede cambiarla en la configuración de la cuenta.
       title: Configuración
+    sign_up:
+      preamble: Con una cuenta en este servidor de Mastodon, podrás seguir a cualquier otra persona en la red, independientemente del servidor en el que se encuentre.
+      title: Crear cuenta de Mastodon en %{domain}.
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
-      functional: Su cuenta está totalmente operativa.
+      functional: Tu cuenta está completamente operativa.
       pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
-    trouble_logging_in: "¿Problemas para iniciar sesión?"
     use_security_key: Usar la clave de seguridad
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
@@ -849,10 +1041,36 @@ es-MX:
       more_details_html: Para más detalles, ver <a href="%{terms_path}"> la política de privacidad</a>.
       username_available: Tu nombre de usuario volverá a estar disponible
       username_unavailable: Tu nombre de usuario no estará disponible
-  directories:
-    directory: Directorio de perfiles
-    explanation: Descubre usuarios según sus intereses
-    explore_mastodon: Explorar %{title}
+  disputes:
+    strikes:
+      action_taken: Acción realizada
+      appeal: Apelar
+      appeal_approved: Esta amonestación fue apelada exitosamente y ya no es válida
+      appeal_rejected: Se rechazó la apelación
+      appeal_submitted_at: Apelación enviada
+      appealed_msg: Tu apelación fue enviada. Si se aprueba, se te notificará.
+      appeals:
+        submit: Enviar apelación
+      approve_appeal: Aprobar apelación
+      associated_report: Informe asociado
+      created_at: Con fecha
+      description_html: Estas son las acciones emprendidas contra tu cuenta y las advertencias que te han sido enviadas por el personal de %{instance}.
+      recipient: Dirigida a
+      reject_appeal: Rechazar apelación
+      status: 'Publicación #%{id}'
+      status_removed: Publicación ya eliminada del sistema
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Eliminación de publicación
+        disable: Congelación de la cuenta
+        mark_statuses_as_sensitive: Marcando los mensajes como sensibles
+        none: Advertencia
+        sensitive: Marcando la cuenta como sensible
+        silence: Limitación de cuenta
+        suspend: Suspensión de cuenta
+      your_appeal_approved: Se aprobó tu apelación
+      your_appeal_pending: Has enviado una apelación
+      your_appeal_rejected: Tu apelación ha sido rechazada
   domain_validator:
     invalid_domain: no es un nombre de dominio válido
   errors:
@@ -901,56 +1119,69 @@ es-MX:
       public: Timeline público
       thread: Conversaciones
     edit:
+      add_keyword: Añadir palabra clave
+      keywords: Palabras clave
+      statuses: Publicaciones individuales
+      statuses_hint_html: Este filtro se aplica a la selección de publicaciones individuales independientemente de si coinciden con las palabras clave a continuación. <a href="%{path}">Revise o elimine publicaciones del filtro</a>.
       title: Editar filtro
     errors:
+      deprecated_api_multiple_keywords: Estos parámetros no se pueden cambiar desde esta aplicación porque se aplican a más de una palabra clave de filtro. Utilice una aplicación más reciente o la interfaz web.
       invalid_context: Se suminstró un contexto inválido o vacío
-      invalid_irreversible: El filtrado irreversible solo funciona con los contextos propios o de notificaciones
     index:
+      contexts: Filtros en %{contexts}
       delete: Borrar
       empty: No tienes filtros.
+      expires_in: Caduca en %{distance}
+      expires_on: Expira el %{date}
+      keywords:
+        one: "%{count} palabra clave"
+        other: "%{count} palabras clave"
+      statuses:
+        one: "%{count} publicación"
+        other: "%{count} publicaciones"
+      statuses_long:
+        one: "%{count} publicación individual oculta"
+        other: "%{count} publicaciones individuales ocultas"
       title: Filtros
     new:
+      save: Guardar nuevo filtro
       title: Añadir un nuevo filtro
+    statuses:
+      back_to_filter: Volver a filtrar
+      batch:
+        remove: Eliminar del filtro
+      index:
+        hint: Este filtro se aplica a la selección de publicaciones individuales independientemente de otros criterios. Puede añadir más publicaciones a este filtro desde la interfaz web.
+        title: Publicaciones filtradas
   footer:
-    developers: Desarrolladores
-    more: Mas…
-    resources: Recursos
     trending_now: Tendencia ahora
   generic:
     all: Todos
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta página está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos en esta página están seleccionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento que coincide con su búsqueda está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos que coinciden con su búsqueda están seleccionados.
     changes_saved_msg: "¡Cambios guardados con éxito!"
     copy: Copiar
     delete: Eliminar
-    no_batch_actions_available: No hay acciones por lotes disponibles en esta página
+    deselect: Deseleccionar todo
+    none: Nada
     order_by: Ordenar por
     save_changes: Guardar cambios
+    select_all_matching_items:
+      one: Seleccionar %{count} elemento que coincide con tu búsqueda.
+      other: Seleccionar todos los %{count} elementos que coinciden con tu búsqueda.
+    today: hoy
     validation_errors:
       one: "¡Algo no está bien! Por favor, revisa el error"
       other: "¡Algo no está bien! Por favor, revise %{count} errores más abajo"
   html_validator:
     invalid_markup: 'contiene código HTML no válido: %{error}'
-  identity_proofs:
-    active: Activo
-    authorize: Sí, autorizar
-    authorize_connection_prompt: "¿Autorizar esta conexión criptográfica?"
-    errors:
-      failed: La conexión criptográfica falló. Por favor, inténtalo de nuevo desde %{provider}.
-      keybase:
-        invalid_token: Los tokens de Keybase son hashes de firmas y deben tener 66 caracteres hex
-        verification_failed: Keybase no reconoce este token como una firma del usuario de Keybase %{kb_username}. Por favor, inténtelo de nuevo desde Keybase.
-      wrong_user: No se puede crear una prueba para %{proving} mientras se inicia sesión como %{current}. Inicia sesión como %{proving} e inténtalo de nuevo.
-    explanation_html: Aquí puedes conectar criptográficamente sus otras identidades, como un perfil de Keybase. Esto permite a otras personas enviarle mensajes encriptados y confiar en el contenido que les envías.
-    i_am_html: Soy %{username} en %{service}.
-    identity: Identidad
-    inactive: Inactivo
-    publicize_checkbox: 'Y tootee esto:'
-    publicize_toot: "¡Comprobado! Soy %{username} en %{service}: %{url}"
-    remove: Eliminar prueba de la cuenta
-    removed: Prueba eliminada con éxito de la cuenta
-    status: Estado de la verificación
-    view_proof: Ver prueba
   imports:
     errors:
+      invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'
       over_rows_processing_limit: contiene más de %{count} filas
     modes:
       merge: Unir
@@ -966,7 +1197,6 @@ es-MX:
       following: Lista de seguidos
       muting: Lista de silenciados
     upload: Cargar
-  in_memoriam_html: En memoria.
   invites:
     delete: Desactivar
     expired: Expiradas
@@ -1045,18 +1275,14 @@ es-MX:
     carry_blocks_over_text: Este usuario se mudó desde %{acct}, que habías bloqueado.
     carry_mutes_over_text: Este usuario se mudó desde %{acct}, que habías silenciado.
     copy_account_note_text: 'Este usuario se mudó desde %{acct}, aquí estaban tus notas anteriores sobre él:'
+  navigation:
+    toggle_menu: Alternar menú
   notification_mailer:
-    digest:
-      action: Ver todas las notificaciones
-      body: Un resumen de los mensajes que perdiste en desde tu última visita, el %{since}
-      mention: "%{name} te ha mencionado en:"
-      new_followers_summary:
-        one: "¡Ademas, has adquirido un nuevo seguidor mientras no estabas! ¡Hurra!"
-        other: "¡Ademas, has adquirido %{count} nuevos seguidores mientras no estabas! ¡Genial!"
-      subject:
-        one: "1 nueva notificación desde tu última visita \U0001F418"
-        other: "%{count} nuevas notificaciones desde tu última visita \U0001F418"
-      title: En tu ausencia…
+    admin:
+      report:
+        subject: "%{name} envió un informe"
+      sign_up:
+        subject: "%{name} se registró"
     favourite:
       body: 'Tu estado fue marcado como favorito por %{name}:'
       subject: "%{name} marcó como favorito tu estado"
@@ -1083,6 +1309,8 @@ es-MX:
       title: Nueva difusión
     status:
       subject: "%{name} acaba de publicar"
+    update:
+      subject: "%{name} editó una publicación"
   notifications:
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
@@ -1101,7 +1329,7 @@ es-MX:
     code_hint: Introduce el código generado por tu aplicación de autentificación para confirmar
     description_html: Si habilitas <strong>autenticación de dos factores</strong> a través de una aplicación de autenticación, el ingreso requerirá que estés en posesión de tu teléfono, que generará códigos para que ingreses.
     enable: Activar
-    instructions_html: "<strong>Escanea este código QR desde Google Authenticator o una aplicación similar en tu teléfono</strong>. A partir de ahora, esta aplicación generará códigos que tendrásque ingresar cuando quieras iniciar sesión."
+    instructions_html: "<strong>Escanea este código QR desde Google Authenticator o una aplicación similar en tu teléfono</strong>. A partir de ahora, esta aplicación generará códigos que tendrás que ingresar cuando quieras iniciar sesión."
     manual_instructions: 'Si no puedes escanear el código QR y necesitas introducirlo manualmente, este es el secreto en texto plano:'
     setup: Configurar
     wrong_code: "¡El código ingresado es inválido! ¿Es correcta la hora del dispositivo y el servidor?"
@@ -1126,6 +1354,8 @@ es-MX:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones
     public_timelines: Líneas de tiempo públicas
+  privacy_policy:
+    title: Política de Privacidad
   reactions:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
@@ -1148,22 +1378,15 @@ es-MX:
     remove_selected_follows: Dejar de seguir a los usuarios seleccionados
     status: Estado de la cuenta
   remote_follow:
-    acct: Ingresa tu usuario@dominio desde el que quieres seguir
     missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta
-    no_account_html: "¿No tienes una cuenta? Puedes <a href='%{sign_up_path}' target='_blank'>registrarte aqui</a>"
-    proceed: Proceder a seguir
-    prompt: 'Vas a seguir a:'
-    reason_html: "¿<strong>¿Por qué es necesario este paso?</strong> <code>%{instance}</code> puede que no sea el servidor donde estás registrado, así que necesitamos redirigirte primero a tu servidor de origen."
-  remote_interaction:
-    favourite:
-      proceed: Proceder a marcar como favorito
-      prompt: 'Quieres marcar como favorito este toot:'
-    reblog:
-      proceed: Proceder a retootear
-      prompt: 'Quieres retootear este toot:'
-    reply:
-      proceed: Proceder a responder
-      prompt: 'Quieres responder a este toot:'
+  reports:
+    errors:
+      invalid_rules: no hace referencia a reglas válidas
+  rss:
+    content_warning: 'Advertencia de contenido:'
+    descriptions:
+      account: Publicaciones públicas de @%{acct}
+      tag: 'Publicaciones públicas etiquetadas con #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Ha superado el límite de %{limit} toots programados para ese día
     over_total_limit: Ha superado el límite de %{limit} toots programados
@@ -1173,7 +1396,7 @@ es-MX:
     browser: Navegador
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1187,7 +1410,7 @@ es-MX:
       phantom_js: PhantomJS
       qq: Navegador QQ
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Navegador UC
       weibo: Weibo
     current_session: Sesión actual
     description: "%{browser} en %{platform}"
@@ -1196,7 +1419,7 @@ es-MX:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1222,7 +1445,6 @@ es-MX:
     edit_profile: Editar perfil
     export: Exportar información
     featured_tags: Hashtags destacados
-    identity_proofs: Pruebas de identidad
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
@@ -1231,6 +1453,7 @@ es-MX:
     profile: Perfil
     relationships: Siguiendo y seguidores
     statuses_cleanup: Eliminación automática de publicaciones
+    strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
   statuses:
@@ -1247,18 +1470,19 @@ es-MX:
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
     content_warning: 'Alerta de contenido: %{warning}'
+    default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía un hashtag no permitido: %{tags}'
       other: 'contenía los hashtags no permitidos: %{tags}'
+    edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: El estado al que intentas responder no existe.
-    language_detection: Detección automática de idioma
     open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
+      direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
       limit: Ya has fijado el número máximo de publicaciones
       ownership: El toot de alguien más no puede fijarse
-      private: Los toots no-públicos no pueden fijarse
       reblog: Un boost no puede fijarse
     poll:
       total_people:
@@ -1309,6 +1533,7 @@ es-MX:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de tiempo
@@ -1320,91 +1545,11 @@ es-MX:
     pinned: Toot fijado
     reblogged: retooteado
     sensitive_content: Contenido sensible
+  strikes:
+    errors:
+      too_late: Es demasiado tarde para apelar esta amonestación
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
-  terms:
-    body_html: |
-      <h2>Política de Privacidad</h2>
-      <h3 id="collect">¿Qué información recogemos?</h3>
-
-      <ul>
-      <li><em>Información básica sobre su cuenta</em>: Si se registra en este servidor, se le requerirá un nombre de usuario, una dirección de correo electrónico y una contraseña. Además puede incluir información adicional en el perfil como un nombre de perfil y una biografía, y subir una foto de perfil y una imagen de cabecera. El nombre de usuario, nombre de perfil, biografía, foto de perfil e imagen de cabecera siempre son visibles públicamente</li>
-      <li><em>Publicaciones, seguimiento y otra información pública</em>: La lista de gente a la que sigue es mostrada públicamente, al igual que sus seguidores. Cuando publica un mensaje, la fecha y hora es almacenada, así como la aplicación desde la cual publicó el mensaje. Los mensajes pueden contener archivos adjuntos multimedia, como imágenes y vídeos. Las publicaciones públicas y no listadas están disponibles públicamente. Cuando destaca una entrada en su perfil, también es información disponible públicamente. Sus publicaciones son entregadas a sus seguidores, en algunos casos significa que son entregadas a diferentes servidores y las copias son almacenadas allí. Cuando elimina publicaciones, esto también se transfiere a sus seguidores. La acción de rebloguear o marcar como favorito otra publicación es siempre pública.</li>
-      <li><em>Publicaciones directas y sólo para seguidores</em>: Todos los mensajes se almacenan y procesan en el servidor. Los mensajes sólo para seguidores se entregan a los seguidores y usuarios que se mencionan en ellos, y los mensajes directos se entregan sólo a los usuarios que se mencionan en ellos. En algunos casos significa que se entregan a diferentes servidores y que las copias se almacenan allí. Hacemos un esfuerzo de buena fe para limitar el acceso a esas publicaciones sólo a las personas autorizadas, pero otros servidores pueden no hacerlo. Por lo tanto, es importante revisar los servidores a los que pertenecen sus seguidores. Puede cambiar una opción para aprobar y rechazar nuevos seguidores manualmente en la configuración <em>Por favor, tenga en cuenta que los operadores del servidor y de cualquier servidor receptor pueden ver dichos mensajes</em>, y que los destinatarios pueden capturarlos, copiarlos o volver a compartirlos de alguna otra manera. <em>No comparta ninguna información peligrosa en Mastodon.</em></li>
-      <li><em>Direcciones IP y otros metadatos</em>: Al iniciar sesión, registramos la dirección IP desde la que se ha iniciado sesión, así como el nombre de la aplicación de su navegador. Todas las sesiones iniciadas están disponibles para su revisión y revocación en los ajustes. La última dirección IP utilizada se almacena hasta 12 meses. También podemos conservar los registros del servidor que incluyen la dirección IP de cada solicitud a nuestro servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">¿Para qué utilizamos su información?</h3>
-
-      <p>Toda la información que obtenemos de usted puede ser utilizada de las siguientes maneras:</p>
-
-      <ul>
-      <li>Para proporcionar la funcionalidad principal de Mastodon. Sólo puedes interactuar con el contenido de otras personas y publicar tu propio contenido cuando estés conectado. Por ejemplo, puedes seguir a otras personas para ver sus mensajes combinados en tu propia línea de tiempo personalizada.</li>
-      <li>Para ayudar a la moderación de la comunidad, por ejemplo, comparando su dirección IP con otras conocidas para determinar la evasión de prohibiciones u otras violaciones.</li>
-      <li>La dirección de correo electrónico que nos proporcione podrá utilizarse para enviarle información, notificaciones sobre otras personas que interactúen con su contenido o para enviarle mensajes, así como para responder a consultas y/u otras solicitudes o preguntas.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">¿Cómo protegemos su información?</h3>
-
-      <p>Implementamos una variedad de medidas de seguridad para mantener la seguridad de su información personal cuando usted ingresa, envía o accede a su información personal. Entre otras cosas, la sesión de su navegador, así como el tráfico entre sus aplicaciones y la API, están protegidos con SSL, y su contraseña está protegida mediante un algoritmo unidireccional fuerte. Puede habilitar la autenticación de dos factores para un acceso más seguro a su cuenta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">¿Cuál es nuestra política de retención de datos?</h3>
-
-      <p>Haremos un esfuerzo de buena fe para:</p>
-
-      <ul>
-      <li>Conservar los registros del servidor que contengan la dirección IP de todas las peticiones a este servidor, en la medida en que se mantengan dichos registros, no más de 90 días.</li>
-      <li>Conservar las direcciones IP asociadas a los usuarios registrados no más de 12 meses.</li>
-      </ul>
-
-      <p>Puede solicitar y descargar un archivo de su contenido, incluidos sus mensajes, archivos adjuntos multimedia, foto de perfil e imagen de cabecera.</p>
-
-      <p>Usted puede borrar su cuenta de forma irreversible en cualquier momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">¿Utilizamos cookies?</h3>
-
-      <p>Sí. Las cookies son pequeños archivos que un sitio o su proveedor de servicios transfiere al disco duro de su ordenador a través de su navegador web (si usted lo permite). Estas cookies permiten al sitio reconocer su navegador y, si tiene una cuenta registrada, asociarla con su cuenta registrada.</p>
-
-      <p>Utilizamos cookies para entender y guardar sus preferencias para futuras visitas.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">¿Revelamos alguna información a terceros?</h3>
-
-      <p>No vendemos, comerciamos ni transferimos a terceros su información personal identificable. Esto no incluye a los terceros de confianza que nos asisten en la operación de nuestro sitio, en la realización de nuestros negocios o en la prestación de servicios, siempre y cuando dichas partes acuerden mantener la confidencialidad de esta información. También podemos divulgar su información cuando creamos que es apropiado para cumplir con la ley, hacer cumplir las políticas de nuestro sitio, o proteger nuestros u otros derechos, propiedad o seguridad.</p>
-
-      <p>Su contenido público puede ser descargado por otros servidores de la red. Tus mensajes públicos y sólo para seguidores se envían a los servidores donde residen tus seguidores, y los mensajes directos se envían a los servidores de los destinatarios, en la medida en que dichos seguidores o destinatarios residan en un servidor diferente.</p>
-
-      <p>Cuando usted autoriza a una aplicación a usar su cuenta, dependiendo del alcance de los permisos que usted apruebe, puede acceder a la información de su perfil público, su lista de seguimiento, sus seguidores, sus listas, todos sus mensajes y sus favoritos. Las aplicaciones nunca podrán acceder a su dirección de correo electrónico o contraseña.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uso del sitio por parte de los niños</h3>
-
-      <p>Si este servidor está en la UE o en el EEE: Nuestro sitio, productos y servicios están dirigidos a personas mayores de 16 años. Si es menor de 16 años, según los requisitos de la GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation_Data_Protection_Regulation">General Data Protection Regulation</a>) no utilice este sitio.</p>
-
-      <p>Si este servidor está en los EE.UU.: Nuestro sitio, productos y servicios están todos dirigidos a personas que tienen al menos 13 años de edad. Si usted es menor de 13 años, según los requisitos de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no utilice este sitio.</p>
-
-      <p>Los requisitos legales pueden ser diferentes si este servidor está en otra jurisdicción.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Cambios en nuestra Política de Privacidad</h3>
-
-      <p>Si decidimos cambiar nuestra política de privacidad, publicaremos esos cambios en esta página.</p>
-
-      <p>Este documento es CC-BY-SA. Fue actualizado por última vez el 7 de marzo de 2018.</p>
-
-      <p>Adaptado originalmente desde <a href="https://github.com/discourse/discourse">la política de privacidad de Discourse</a>.</p>
-    title: Términos del Servicio y Políticas de Privacidad de %{instance}
   themes:
     contrast: Alto contraste
     default: Mastodon
@@ -1413,6 +1558,7 @@ es-MX:
     formats:
       default: "%d de %b del %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Añadir
     disable: Deshabilitar
@@ -1429,63 +1575,73 @@ es-MX:
     recovery_instructions_html: Si pierdes acceso a tu teléfono, puedes usar uno de los siguientes códigos de recuperación para obtener acceso a tu cuenta. <strong>Mantenlos a salvo</strong>. Por ejemplo, puedes imprimirlos y guardarlos con otros documentos importantes.
     webauthn: Claves de seguridad
   user_mailer:
+    appeal_approved:
+      action: Ir a tu cuenta
+      explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
+      subject: Tu apelación del %{date} ha sido aprobada
+      title: Apelación aprobada
+    appeal_rejected:
+      explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
+      subject: Tu apelación del %{date} ha sido rechazada
+      title: Apelación rechazada
     backup_ready:
       explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
-    sign_in_token:
-      details: 'Aquí están los detalles del intento:'
-      explanation: 'Hemos detectado un intento de inicio de sesión en tu cuenta desde una dirección IP no reconocida. Si has sido tú, por favor ingresa el siguiente código de seguridad en la página del desafío:'
-      further_actions: 'Si no has sido tú, por favor cambia tu contraseña y habilita la autenticación de dos factores en tu cuenta. Puedes hacerlo aquí:'
-      subject: Por favor, confirma el intento de inicio de sesión
-      title: Intento de inicio de sesión
+    suspicious_sign_in:
+      change_password: cambies tu contraseña
+      details: 'Aquí están los detalles del inicio de sesión:'
+      explanation: Hemos detectado un inicio de sesión en tu cuenta desde una nueva dirección IP.
+      further_actions_html: Si no fuiste tú, te recomendamos que %{action} inmediatamente y habilites la autenticación de dos factores para mantener tu cuenta segura.
+      subject: Tu cuenta ha sido accedida desde una nueva dirección IP
+      title: Un nuevo inicio de sesión
     warning:
+      appeal: Enviar una apelación
+      appeal_description: Si crees que esto es un error, puedes enviar una apelación al equipo de %{instance}.
+      categories:
+        spam: Spam
+        violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        disable: Mientras su cuenta esté congelada, la información de su cuenta permanecerá intacta, pero no puede realizar ninguna acción hasta que se desbloquee.
-        sensitive: Los archivos multimedia subidos y vinculados serán tratados como sensibles.
-        silence: Mientras su cuenta está limitada, sólo las personas que ya le están siguiendo verán sus toots en este servidor, y puede que se le excluya de varios listados públicos. Sin embargo, otros pueden seguirle manualmente.
-        suspend: Su cuenta ha sido suspendida, y todos tus toots y tus archivos multimedia subidos han sido irreversiblemente eliminados de este servidor, y de los servidores donde tenías seguidores.
-      get_in_touch: Puede responder a esta dirección de correo electrónico para ponerse en contacto con el personal de %{instance}.
-      review_server_policies: Revisar las políticas del servidor
-      statuses: 'Específicamente, para:'
+        delete_statuses: Se ha determinado que algunos de tus mensajes violan una o más directrices de la comunidad y han sido por tanto eliminados por los moderadores de %{instance}.
+        disable: Ya no puedes usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Puedes solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes han sido marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
+        sensitive: A partir de ahora, todos los archivos multimedia que subas serán marcados como sensibles y ocultos tras una advertencia que habrá que clicar.
+        silence: Aún puedes usar tu cuenta, pero solo las personas que te están siguiendo verán tus publicaciones en este servidor, y puedes ser excluido de varias funcionalidades de descubrimiento. Sin embargo, otras cuentas podrán empezar a seguirte manualmente.
+        suspend: Ya no puedes utilizar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía puedes iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquives la suspensión.
+      reason: 'Razón:'
+      statuses: 'Publicaciones citadas:'
       subject:
+        delete_statuses: Tus publicaciones en %{acct} han sido eliminadas
         disable: Su cuenta %{acct} ha sido congelada
+        mark_statuses_as_sensitive: Tus publicaciones en %{acct} han sido marcadas como sensibles
         none: Advertencia para %{acct}
-        sensitive: Tu cuenta %{acct} ha sido marcada como sensible
+        sensitive: Tus publicaciones en %{acct} se marcarán como sensibles a partir de ahora
         silence: Su cuenta %{acct} ha sido limitada
         suspend: Su cuenta %{acct} ha sido suspendida
       title:
+        delete_statuses: Publicaciones eliminadas
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Publicaciones marcadas como sensibles
         none: Advertencia
-        sensitive: Tu multimedia ha sido marcado como sensible
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
       edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre de usuario y más cosas. Si quieres revisar a tus nuevos seguidores antes de que se les permita seguirte, puedes bloquear tu cuenta.
+      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
       final_action: Empezar a publicar
-      final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.'
+      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
       full_handle: Su sobrenombre completo
       full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
-      review_preferences_action: Cambiar preferencias
-      review_preferences_step: Asegúrate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs".
       subject: Bienvenido a Mastodon
-      tip_federated_timeline: La línea de tiempo federada es una vista de la red de Mastodon. Pero solo incluye gente que tus vecinos están siguiendo, así que no está completa.
-      tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada.
-      tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos!
-      tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas!
-      tips: Consejos
       title: Te damos la bienvenida a bordo, %{name}!
   users:
     follow_limit_reached: No puedes seguir a más de %{limit} personas
-    generic_access_help_html: "¿Tienes problemas para acceder a tu cuenta? Puedes ponerte en contacto con %{email} para conseguir ayuda"
     invalid_otp_token: Código de dos factores incorrecto
-    invalid_sign_in_token: Código de seguridad no válido
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
-    suspicious_sign_in_confirmation: Parece que no has iniciado sesión desde este dispositivo antes, y no has iniciado sesión durante un tiempo, así que estamos enviando un código de seguridad a tu dirección de correo electrónico para confirmar que eres tú.
   verification:
     explanation_html: 'Puedes <strong> verificarte a ti mismo como el dueño de los links en los metadatos de tu perfil </strong>. Para eso, el sitio vinculado debe contener un vínculo a tu perfil de Mastodon. El vínculo en tu sitio <strong> debe </strong> tener un atributo <code> rel="me"</code>. El texto del vínculo no importa. Aquí un ejemplo:'
     verification: Verificación
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 29d19720f..ad836bd4e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,92 +1,27 @@
 ---
 es:
   about:
-    about_hashtag_html: Estos son publicaciones públicas etiquetadas con <strong>#%{hashtag}</strong>. Puedes interactuar con ellas si tienes una cuenta en cualquier parte del fediverso.
     about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, diseño ético, y descentralización! ¡Sé dueño de tu información con Mastodon!'
-    about_this: Información
-    active_count_after: activo
-    active_footnote: Usuarios Activos Mensuales (UAM)
-    administered_by: 'Administrado por:'
-    api: API
-    apps: Aplicaciones móviles
-    apps_platforms: Utiliza Mastodon desde iOS, Android y otras plataformas
-    browse_directory: Navega por el directorio de perfiles y filtra por intereses
-    browse_local_posts: Explora en vivo los posts públicos de este servidor
-    browse_public_posts: Navega por un transmisión en vivo de publicaciones públicas en Mastodon
-    contact: Contacto
     contact_missing: No especificado
     contact_unavailable: No disponible
-    discover_users: Descubrir usuarios
-    documentation: Documentación
-    federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
-    get_apps: Probar una aplicación móvil
-    hosted_on: Mastodon hosteado en %{domain}
-    instance_actor_flash: |
-      Esta cuenta es un actor virtual usado para representar al servidor y no a ningún usuario individual.
-      Se usa para fines federativos y no debe ser bloqueado a menos que usted quiera bloquear toda la instancia, en cuyo caso se debe utilizar un bloque de dominio.
-    learn_more: Aprende más
-    privacy_policy: Política de privacidad
-    rules: Normas del servidor
-    rules_html: 'A continuación hay un resumen de las normas que debes seguir si quieres tener una cuenta en este servidor de Mastodon:'
-    see_whats_happening: Ver lo que está pasando
-    server_stats: 'Datos del servidor:'
-    source_code: Código fuente
-    status_count_after:
-      one: estado
-      other: estados
-    status_count_before: Qué han escrito
-    tagline: Seguir a amigos existentes y descubre nuevos
-    terms: Condiciones de servicio
-    unavailable_content: Contenido no disponible
-    unavailable_content_description:
-      domain: Servidor
-      reason: 'Motivo:'
-      rejecting_media: Los archivos multimedia de este servidor no serán procesados y no se mostrarán miniaturas, lo que requiere un clic manual en el otro servidor.
-      rejecting_media_title: Medios filtrados
-      silenced: Las publicaciones de este servidor no se mostrarán en ningún lugar salvo en el Inicio si sigues al autor.
-      silenced_title: Servidores silenciados
-      suspended: No podrás seguir a nadie de este servidor, y ningún dato de este será procesado o almacenado, y no se intercambiarán datos.
-      suspended_title: Servidores suspendidos
-    unavailable_content_html: Mastodon generalmente le permite ver contenido e interactuar con usuarios de cualquier otro servidor en el fediverso. Estas son las excepciones que se han hecho en este servidor en particular.
-    user_count_after:
-      one: usuario
-      other: usuarios
-    user_count_before: Tenemos
-    what_is_mastodon: "¿Qué es Mastodon?"
+    hosted_on: Mastodon alojado en %{domain}
+    title: Acerca de
   accounts:
-    choices_html: 'Elecciones de %{name}:'
-    endorsements_hint: Puedes recomendar a gente que sigues desde la interfaz web, y aparecerán allí.
-    featured_tags_hint: Puede presentar hashtags específicos que se mostrarán aquí.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: Siguiendo
     instance_actor_flash: Esta cuenta es un actor virtual utilizado para representar al servidor en sí mismo y no a ningún usuario individual. Se utiliza para propósitos de la federación y no se debe suspender.
-    joined: Se unió el %{date}
     last_active: última conexión
     link_verified_on: La propiedad de este vínculo fue verificada el %{date}
-    media: Multimedia
-    moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
-    network_hidden: Esta información no está disponible
-    never_active: Nunca
     nothing_here: "¡No hay nada aquí!"
-    people_followed_by: Usuarios a quien %{name} sigue
-    people_who_follow: Usuarios que siguen a %{name}
     pin_errors:
       following: Debes estar siguiendo a la persona a la que quieres aprobar
     posts:
       one: Publicación
       other: Publicaciones
     posts_tab_heading: Publicaciones
-    posts_with_replies: Publicaciones y respuestas
-    roles:
-      admin: Administrador
-      bot: Bot
-      group: Grupo
-      moderator: Moderador
-    unavailable: Perfil no disponible
-    unfollow: Dejar de seguir
   admin:
     account_actions:
       action: Realizar acción
@@ -94,26 +29,30 @@ es:
     account_moderation_notes:
       create: Crear
       created_msg: "¡Nota de moderación creada con éxito!"
-      delete: Borrar
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
       add_email_domain_block: Poner en lista negra el dominio del correo
       approve: Aprobar
-      approve_all: Aprobar todos
       approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "¿Estás seguro?"
       avatar: Avatar
       by_domain: Dominio
       change_email:
-        changed_msg: "¡El correo electrónico se ha actualizado correctamente!"
+        changed_msg: "¡Email cambiado con éxito!"
         current_email: Correo electrónico actual
         label: Cambiar el correo electrónico
         new_email: Nuevo correo electrónico
         submit: Cambiar el correo electrónico
         title: Cambiar el correo electrónico de %{username}
+      change_role:
+        changed_msg: "¡Rol cambiado con éxito!"
+        label: Cambiar rol
+        no_role: Sin rol
+        title: Cambiar rol para %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      custom: Personalizado
       delete: Eliminar datos
       deleted: Borrado
       demote: Degradar
@@ -153,7 +92,7 @@ es:
         active: Activo
         all: Todos
         pending: Pendiente
-        silenced: Silenciados
+        silenced: Limitado
         suspended: Suspendidos
         title: Moderación
       moderation_notes: Notas de moderación
@@ -161,9 +100,14 @@ es:
       most_recent_ip: IP más reciente
       no_account_selected: Ninguna cuenta se cambió como ninguna fue seleccionada
       no_limits_imposed: Sin límites impuestos
+      no_role_assigned: Ningún rol asignado
       not_subscribed: No se está suscrito
       pending: Revisión pendiente
       perform_full_suspension: Suspender
+      previous_strikes: Amonestaciones anteriores
+      previous_strikes_description_html:
+        one: Esta cuenta tiene <strong>una</strong> amonestación.
+        other: Esta cuenta tiene <strong>%{count}</strong> amonestaciones.
       promote: Promocionar
       protocol: Protocolo
       public: Público
@@ -171,8 +115,9 @@ es:
       redownload: Refrescar avatar
       redownloaded_msg: Se actualizó correctamente el perfil de %{username} desde el origen
       reject: Rechazar
-      reject_all: Rechazar todos
       rejected_msg: La solicitud de registro de %{username} ha sido rechazada con éxito
+      remote_suspension_irreversible: Los datos de esta cuenta han sido irreversiblemente eliminados.
+      remote_suspension_reversible_hint_html: La cuenta ha sido suspendida en su servidor, y los datos serán eliminados completamente el %{date}. Hasta entonces, el servidor remoto puede restaurar esta cuenta sin ningún efecto perjudicial. Si desea eliminar todos los datos de la cuenta inmediatamente, puede hacerlo a continuación.
       remove_avatar: Eliminar el avatar
       remove_header: Eliminar cabecera
       removed_avatar_msg: Se ha eliminado exitosamente la imagen del avatar de %{username}
@@ -184,19 +129,13 @@ es:
       reset: Reiniciar
       reset_password: Reiniciar contraseña
       resubscribe: Re-suscribir
-      role: Permisos
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Personal
-        user: Usuario
+      role: Rol
       search: Buscar
       search_same_email_domain: Otros usuarios con el mismo dominio de correo
       search_same_ip: Otros usuarios con la misma IP
       security_measures:
         only_password: Sólo contraseña
         password_and_2fa: Contraseña y 2FA
-        password_and_sign_in_token: Contraseña y token de correo electrónico
       sensitive: Sensible
       sensitized: marcado como sensible
       shared_inbox_url: URL de bandeja compartida
@@ -206,12 +145,15 @@ es:
       silence: Silenciar
       silenced: Silenciado
       statuses: Estados
+      strikes: Amonestaciones previas
       subscribe: Suscribir
+      suspend: Suspender
       suspended: Suspendido
       suspension_irreversible: Los datos de esta cuenta han sido irreversiblemente eliminados. Puedes deshacer la suspensión de la cuenta para hacerla utilizable, pero no recuperará los datos que tenías anteriormente.
       suspension_reversible_hint_html: La cuenta ha sido suspendida y los datos se eliminarán completamente el %{date}. Hasta entonces, la cuenta puede ser restaurada sin ningún efecto perjudicial. Si desea eliminar todos los datos de la cuenta inmediatamente, puede hacerlo a continuación.
-      time_in_queue: Esperando en cola %{time}
       title: Cuentas
+      unblock_email: Desbloquear dirección de correo
+      unblocked_email_msg: Se ha desbloqueado correctamente la dirección de correo de %{username}
       unconfirmed_email: Correo electrónico sin confirmar
       undo_sensitized: Desmarcar como sensible
       undo_silenced: Des-silenciar
@@ -221,31 +163,39 @@ es:
       unsuspended_msg: Se quitó con éxito la suspensión de la cuenta de %{username}
       username: Nombre de usuario
       view_domain: Ver resumen del dominio
-      warn: Adevertir
+      warn: Advertir
       web: Web
       whitelisted: Añadido a la lista blanca
     action_logs:
       action_types:
+        approve_appeal: Aprobar Apelación
+        approve_user: Aprobar Usuario
         assigned_to_self_report: Asignar Reporte
         change_email_user: Cambiar Correo Electrónico del Usuario
+        change_role_user: Cambiar Rol de Usuario
         confirm_user: Confirmar Usuario
         create_account_warning: Crear Advertencia
         create_announcement: Crear Anuncio
+        create_canonical_email_block: Crear Bloqueo de Correo Electrónico
         create_custom_emoji: Crear Emoji Personalizado
         create_domain_allow: Crear Permiso de Dominio
         create_domain_block: Crear Bloqueo de Dominio
         create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
         create_ip_block: Crear regla IP
         create_unavailable_domain: Crear Dominio No Disponible
+        create_user_role: Crear Rol
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
+        destroy_canonical_email_block: Eliminar Bloqueo de Correo Electrónico
         destroy_custom_emoji: Eliminar Emoji Personalizado
         destroy_domain_allow: Eliminar Permiso de Dominio
         destroy_domain_block: Eliminar Bloqueo de Dominio
         destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+        destroy_instance: Purgar Dominio
         destroy_ip_block: Eliminar regla IP
         destroy_status: Eliminar Estado
         destroy_unavailable_domain: Eliminar Dominio No Disponible
+        destroy_user_role: Destruir Rol
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
         disable_sign_in_token_auth_user: Deshabilitar la Autenticación por Token de Correo Electrónico para el Usuario
@@ -255,42 +205,56 @@ es:
         enable_user: Habilitar Usuario
         memorialize_account: Transformar en Cuenta Conmemorativa
         promote_user: Promover Usuario
+        reject_appeal: Rechazar Apelación
+        reject_user: Rechazar Usuario
         remove_avatar_user: Eliminar Avatar
         reopen_report: Reabrir Reporte
+        resend_user: Reenviar Correo de Confirmación
         reset_password_user: Restablecer Contraseña
         resolve_report: Resolver Reporte
         sensitive_account: Marcar multimedia en tu cuenta como sensible
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
+        unblock_email_account: Desbloquear dirección de correo
         unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
         update_announcement: Actualizar Anuncio
         update_custom_emoji: Actualizar Emoji Personalizado
         update_domain_block: Actualizar el Bloqueo de Dominio
+        update_ip_block: Actualizar regla IP
         update_status: Actualizar Estado
+        update_user_role: Actualizar Rol
       actions:
+        approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
+        approve_user_html: "%{name} aprobó el registro de %{target}"
         assigned_to_self_report_html: "%{name} asignó el informe %{target} a sí mismo"
         change_email_user_html: "%{name} cambió la dirección de correo electrónico del usuario %{target}"
+        change_role_user_html: "%{name} cambió el rol de %{target}"
         confirm_user_html: "%{name} confirmó la dirección de correo electrónico del usuario %{target}"
         create_account_warning_html: "%{name} envió una advertencia a %{target}"
         create_announcement_html: "%{name} ha creado un nuevo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueó el correo electrónico con el hash %{target}"
         create_custom_emoji_html: "%{name} subió un nuevo emoji %{target}"
         create_domain_allow_html: "%{name} permitió la federación con el dominio %{target}"
         create_domain_block_html: "%{name} bloqueó el dominio %{target}"
         create_email_domain_block_html: "%{name} bloqueó el dominio de correo electrónico %{target}"
         create_ip_block_html: "%{name} creó una regla para la IP %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al dominio %{target}"
+        create_user_role_html: "%{name} creó el rol %{target}"
         demote_user_html: "%{name} degradó al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
-        destroy_custom_emoji_html: "%{name} destruyó emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminó el emoji %{target}"
         destroy_domain_allow_html: "%{name} bloqueó la federación con el dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueó el dominio %{target}"
         destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}"
+        destroy_instance_html: "%{name} purgó el dominio %{target}"
         destroy_ip_block_html: "%{name} eliminó una regla para la IP %{target}"
         destroy_status_html: "%{name} eliminó el estado por %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
+        destroy_user_role_html: "%{name} eliminó el rol %{target}"
         disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} ha deshabilitado la autenticación por token de correo electrónico para %{target}"
@@ -300,22 +264,28 @@ es:
         enable_user_html: "%{name} habilitó el inicio de sesión para el usuario %{target}"
         memorialize_account_html: "%{name} convirtió la cuenta de %{target} en una página in memoriam"
         promote_user_html: "%{name} promoción al usuario %{target}"
+        reject_appeal_html: "%{name} rechazó la solicitud de moderación de %{target}"
+        reject_user_html: "%{name} rechazó el registro de %{target}"
         remove_avatar_user_html: "%{name} eliminó el avatar de %{target}"
         reopen_report_html: "%{name} reabrió el informe %{target}"
+        resend_user_html: "%{name} ha reenviado el correo de confirmación para %{target}"
         reset_password_user_html: "%{name} reinició la contraseña del usuario %{target}"
         resolve_report_html: "%{name} resolvió el informe %{target}"
         sensitive_account_html: "%{name} marcó la multimedia de %{target} como sensible"
         silence_account_html: "%{name} silenció la cuenta de %{target}"
         suspend_account_html: "%{name} suspendió la cuenta de %{target}"
         unassigned_report_html: "%{name} des-asignó el informe %{target}"
+        unblock_email_account_html: "%{name} ha desbloqueado la dirección de correo de %{target}"
         unsensitive_account_html: "%{name} desmarcó la multimedia de %{target} como sensible"
         unsilence_account_html: "%{name} desilenció la cuenta de %{target}"
         unsuspend_account_html: "%{name} reactivó la cuenta de %{target}"
         update_announcement_html: "%{name} actualizó el anuncio %{target}"
         update_custom_emoji_html: "%{name} actualizó el emoji %{target}"
         update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}"
+        update_ip_block_html: "%{name} cambió la regla para la IP %{target}"
         update_status_html: "%{name} actualizó el estado de %{target}"
-      deleted_status: "(estado borrado)"
+        update_user_role_html: "%{name} cambió el rol %{target}"
+      deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuario
@@ -354,11 +324,12 @@ es:
       enable: Habilitar
       enabled: Activado
       enabled_msg: Se habilitó con éxito ese emoji
-      image_hint: PNG de hasta 50KB
+      image_hint: PNG o GIF hasta %{size}
       list: Lista
       listed: Listados
       new:
         title: Añadir nuevo emoji personalizado
+      no_emoji_selected: No se cambió ningún emoji ya que no se seleccionó ninguno
       not_permitted: No tienes permiso para realizar esta acción
       overwrite: Sobrescribir
       shortcode: Código de atajo
@@ -376,14 +347,17 @@ es:
       media_storage: Almacenamiento multimedia
       new_users: nuevos usuarios
       opened_reports: informes abiertos
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelación pendiente"
+        other: "<strong>%{count}</strong> apelaciones pendientes"
       pending_reports_html:
-        one: "<strong>1</strong> informe pendiente"
+        one: "<strong>%{count}</strong> informe pendiente"
         other: "<strong>%{count}</strong> informes pendientes"
       pending_tags_html:
-        one: "<strong>1</strong> etiqueta pendiente"
+        one: "<strong>%{count}</strong> etiqueta pendiente"
         other: "<strong>%{count}</strong> etiquetas pendientes"
       pending_users_html:
-        one: "<strong>1</strong> usuario pendiente"
+        one: "<strong>%{count}</strong> usuario pendiente"
         other: "<strong>%{count}</strong> usuarios pendientes"
       resolved_reports: informes resueltos
       software: Software
@@ -393,27 +367,38 @@ es:
       top_languages: Idiomas más activos
       top_servers: Servidores más activos
       website: Sitio web
+    disputes:
+      appeals:
+        empty: No se encontraron apelaciones.
+        title: Apelaciones
     domain_allows:
       add_new: Añadir dominio a la lista blanca
       created_msg: Dominio añadido a la lista blanca con éxito
       destroyed_msg: Dominio quitado de la lista blanca con éxito
+      export: Exportar
+      import: Importar
       undo: Quitar de la lista blanca
     domain_blocks:
       add_new: Añadir nuevo
-      created_msg: El bloque de dominio está siendo procesado
-      destroyed_msg: El bloque de dominio se deshizo
+      created_msg: El bloqueo del dominio está siendo procesado
+      destroyed_msg: El bloqueo del dominio se deshizo
       domain: Dominio
-      edit: Editar nuevo dominio bloqueado
+      edit: Editar bloqueo de dominio
+      existing_domain_block: Ya impusiste límites más estrictos a %{name}.
       existing_domain_block_html: Ya ha impuesto límites más estrictos a %{name}, necesita <a href="%{unblock_url}">desbloquearlo primero</a>.
+      export: Exportar
+      import: Importar
       new:
-        create: Crear bloque
-        hint: El bloque de dominio no prevendrá la creación de entradas de cuenta en la base de datos, pero aplicará retroactiva y automáticamente métodos de moderación específica en dichas cuentas.
+        create: Crear bloqueo
+        hint: El bloqueo de dominio no prevendrá la creación de entradas de cuenta en la base de datos, pero aplicará retroactiva y automáticamente métodos de moderación específica en dichas cuentas.
         severity:
-          desc_html: "<strong>Silenciar</strong> hará los posts de la cuenta invisibles a cualquiera que no lo esté siguiendo. <strong>Suspender</strong> eliminará todo el contenido, media, y datos del perfil. Usa <strong>Ninguno</strong> si solo quieres rechazar archivos multimedia."
+          desc_html: "<strong>Limitar</strong> hará que las publicaciones de las cuentas de ese dominio sean invisibles para cualquiera que no las esté siguiendo. <strong>Suspender</strong> eliminará todo el contenido, archivos multimedia, y datos del perfil. Usa <strong>Ninguno</strong> si solo quieres rechazar archivos multimedia."
           noop: Ninguno
-          silence: Silenciar
+          silence: Limitar
           suspend: Suspender
-        title: Nuevo bloque de dominio
+        title: Nuevo bloqueo de dominio
+      no_domain_block_selected: No se cambió ningún bloqueo de dominio ya que ninguno fue seleccionado
+      not_permitted: No tienes permiso para realizar esta acción
       obfuscate: Ocultar nombre de dominio
       obfuscate_hint: Oculta parcialmente el nombre de dominio en la lista si mostrar la lista de limitaciones de dominio está habilitado
       private_comment: Comentario privado
@@ -424,34 +409,41 @@ 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
-      rejecting_media: rechazar archivos multimedia
-      rejecting_reports: rechazando informes
-      severity:
-        silence: silenciado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Una cuenta en la base de datos afectada
-          other: "%{count} cuentas en la base de datos afectadas"
-        retroactive:
-          silence: Des-silenciar todas las cuentas existentes de este dominio
-          suspend: Des-suspender todas las cuentas existentes de este dominio
-        title: Deshacer bloque de dominio para %{domain}
-        undo: Deshacer
       undo: Deshacer
       view: Ver dominio bloqueado
     email_domain_blocks:
       add_new: Añadir nuevo
+      attempts_over_week:
+        one: "%{count} intento durante la última semana"
+        other: "%{count} intentos de registro durante la última semana"
       created_msg: Dominio de correo añadido a la lista negra con éxito
       delete: Borrar
-      destroyed_msg: Dominio de correo borrado de la lista negra con éxito
+      dns:
+        types:
+          mx: Registro MX
       domain: Dominio
-      empty: Actualmente no hay dominios de correo electrónico en la lista negra.
-      from_html: de %{domain}
       new:
         create: Añadir dominio
+        resolve: Resolver dominio
         title: Nueva entrada en la lista negra de correo
+      no_email_domain_block_selected: No se han cambiado bloqueos de dominio ya que ninguno ha sido seleccionado
+      resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tenga cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
+      resolved_through_html: Resuelto a través de %{domain}
       title: Lista negra de correo
+    export_domain_allows:
+      new:
+        title: Importar dominios permitidos
+      no_file: Ningún archivo seleccionado
+    export_domain_blocks:
+      import:
+        description_html: Estás a punto de importar una lista de bloqueos de dominio. Por favor, revisa esta lista con mucho cuidado, especialmente si no has creado esta lista tú mismo.
+        existing_relationships_warning: Relaciones de seguimiento existentes
+        private_comment_description_html: 'Para ayudarle a rastrear de dónde proceden los bloqueos importados, los bloqueos importados se crearán con el siguiente comentario privado: <q>%{comment}</q>'
+        private_comment_template: Importado desde %{source} el %{date}
+        title: Importar bloqueos de dominio
+      new:
+        title: Importar bloqueos de dominio
+      no_file: Ningún archivo seleccionado
     follow_recommendations:
       description_html: "<strong>Las recomendaciones de cuentas ayudan a los nuevos usuarios a encontrar rápidamente contenido interesante</strong>. Cuando un usuario no ha interactuado con otros lo suficiente como para suscitar recomendaciones personalizadas de cuentas a las que seguir, en su lugar se le recomiendan estas cuentas. Se recalculan diariamente a partir de una mezcla de cuentas con el mayor número de interacciones recientes y con el mayor número de seguidores locales con un idioma determinado."
       language: Para el idioma
@@ -461,25 +453,53 @@ es:
       title: Recomendaciones de cuentas
       unsuppress: Restaurar recomendaciones de cuentas
     instances:
+      availability:
+        description_html:
+          one: Si el envío al dominio falla <strong>%{count} día</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+          other: Si el envío al dominio falla <strong>%{count} días diferentes</strong> sin éxito, no se harán más intentos de entrega a menos que se reciba un envío <em>desde</em> el dominio.
+        failure_threshold_reached: Límite de fallo alcanzado el %{date}.
+        failures_recorded:
+          one: Intento fallido en %{count} día.
+          other: Intentos fallidos en %{count} días diferentes.
+        no_failures_recorded: No hay fallos en el registro.
+        title: Disponibilidad
+        warning: El último intento de conexión a este servidor no ha tenido éxito
       back_to_all: Todos
       back_to_limited: Limitados
       back_to_warning: Advertencia
       by_domain: Dominio
+      confirm_purge: "¿Seguro que quieres eliminar permanentemente los datos de este dominio?"
+      content_policies:
+        comment: Nota interna
+        description_html: Puedes definir políticas de contenido que se aplicarán a todas las cuentas de este dominio y a cualquiera de sus subdominios.
+        policies:
+          reject_media: Rechazar multimedia
+          reject_reports: Rechazar informes
+          silence: Límite
+          suspend: Suspender
+        policy: Política
+        reason: Razón pública
+        title: Políticas de contenido
+      dashboard:
+        instance_accounts_dimension: Cuentas más seguidas
+        instance_accounts_measure: cuentas almacenadas
+        instance_followers_measure: nuestros seguidores allí
+        instance_follows_measure: sus seguidores aquí
+        instance_languages_dimension: Idiomas principales
+        instance_media_attachments_measure: archivos adjuntos guardados
+        instance_reports_measure: informes sobre ellos
+        instance_statuses_measure: mensajes almacenados
       delivery:
         all: Todos
         clear: Limpiar errores de entrega
+        failing: Fallando
         restart: Reiniciar entrega
         stop: Detener entrega
-        title: Entrega
         unavailable: No disponible
-        unavailable_message: Entrega no disponible
-        warning: Advertencia
-        warning_message:
-          one: Fallo de entrega %{count} día
-          other: Fallo de entrega %{count} días
       delivery_available: Entrega disponible
       delivery_error_days: Días de error de entrega
       delivery_error_hint: Si la entrega no es posible a lo largo de %{count} días, se marcará automáticamente como no entregable.
+      destroyed_msg: Los datos de %{domain} están ahora en cola para su inminente eliminación.
       empty: No se encontraron dominios.
       known_accounts:
         one: "%{count} cuenta conocida"
@@ -490,12 +510,15 @@ es:
         title: Moderación
       private_comment: Comentario privado
       public_comment: Comentario público
+      purge: Purgar
+      purge_description_html: Si crees que este dominio está desconectado, puedes borrar todos los registros de cuentas y los datos asociados de este dominio de tu almacenamiento. Esto puede llevar un tiempo.
       title: Instancias conocidas
       total_blocked_by_us: Bloqueado por nosotros
       total_followed_by_them: Seguidos por ellos
       total_followed_by_us: Seguido por nosotros
       total_reported: Informes sobre ellas
       total_storage: Archivos multimedia
+      totals_time_period_hint_html: Los totales mostrados a continuación incluyen datos para todo el tiempo.
     invites:
       deactivate_all: Desactivar todos
       filter:
@@ -519,8 +542,6 @@ es:
         title: Crear nueva regla IP
       no_ip_block_selected: No se han cambiado reglas IP ya que no se ha seleccionado ninguna
       title: Reglas IP
-    pending_accounts:
-      title: Cuentas pendientes (%{count})
     relationships:
       title: Relaciones de %{acct}
     relays:
@@ -547,39 +568,121 @@ es:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} informe"
-          other: "%{count} informes"
+      action_log: Registro de auditoría
       action_taken_by: Acción tomada por
+      actions:
+        delete_description_html: Los mensajes denunciados serán eliminados y se registrará una amonestación para ayudarte a escalar en futuras infracciones por la misma cuenta.
+        mark_as_sensitive_description_html: Los archivos multimedia en los mensajes informados se marcarán como sensibles y se aplicará una amonestación para ayudarte a escalar las futuras infracciones de la misma cuenta.
+        other_description_html: Ver más opciones para controlar el comportamiento de la cuenta y personalizar la comunicación de la cuenta reportada.
+        resolve_description_html: No se tomarán medidas contra la cuenta denunciada, no se registrará la amonestación, y se cerrará el informe.
+        silence_description_html: El perfil será visible solo para aquellos que ya lo sigan o lo busquen manualmente, limitando seriamente su alcance. Siempre puede ser revertido.
+        suspend_description_html: El perfil y todos sus contenidos serán inaccesibles hasta que sean finalmente eliminados. La interacción con la cuenta será imposible. Reversible durante un plazo de 30 días.
+      actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
+      add_to_report: Añadir más al reporte
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
+      by_target_domain: Dominio de la cuenta reportada
+      category: Categoría
+      category_description_html: La razón por la que se reportó esta cuenta o contenido será citada en las comunicaciones con la cuenta reportada
       comment:
         none: Ninguno
+      comment_description_html: 'Para proporcionar más información, %{name} escribió:'
       created_at: Denunciado
+      delete_and_resolve: Eliminar publicaciones
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelto
+      no_one_assigned: Nadie
       notes:
         create: Añadir una nota
         create_and_resolve: Resolver con una nota
         create_and_unresolve: Reabrir con una nota
         delete: Eliminar
         placeholder: Especificar qué acciones se han tomado o cualquier otra novedad respecto a esta denuncia…
+        title: Notas
+      notes_description_html: Ver y dejar notas a otros moderadores y a tu yo futuro
+      quick_actions_description_html: 'Toma una acción rápida o desplázate hacia abajo para ver el contenido denunciado:'
+      remote_user_placeholder: el usuario remoto de %{instance}
       reopen: Reabrir denuncia
       report: 'Reportar #%{id}'
       reported_account: Cuenta reportada
       reported_by: Reportado por
       resolved: Resuelto
       resolved_msg: "¡La denuncia se ha resuelto correctamente!"
+      skip_to_actions: Ir directamente a las acciones
       status: Estado
-      target_domain: Dominio de la cuenta reportada
+      statuses: Contenido reportado
+      statuses_description_html: El contenido ofensivo se citará en la comunicación con la cuenta reportada
       target_origin: Origen de la cuenta reportada
       title: Reportes
       unassign: Desasignar
       unresolved: No resuelto
       updated_at: Actualizado
+      view_profile: Ver perfil
+    roles:
+      add_new: Añadir rol
+      assigned_users:
+        one: "%{count} usuario"
+        other: "%{count} usuarios"
+      categories:
+        administration: Administración
+        devops: DevOps
+        invites: Invitaciones
+        moderation: Moderación
+        special: Especial
+      delete: Eliminar
+      description_html: Con <strong>roles de usuario</strong>, puede personalizar las funciones y áreas de Mastodon a las que pueden acceder sus usuarios.
+      edit: Editar rol '%{name}'
+      everyone: Permisos por defecto
+      everyone_full_description_html: Este es el <strong>rol base</strong> que afecta a <strong>todos los usuarios</strong>, incluso aquellos sin un rol asignado. Todos los otros roles heredan permisos de él.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Los usuarios con este permiso saltarán todos los permisos
+        delete_user_data: Borrar Datos de Usuario
+        delete_user_data_description: Permite a los usuarios eliminar los datos de otros usuarios sin demora
+        invite_users: Invitar usuarios
+        invite_users_description: Permite a los usuarios invitar a nuevas personas al servidor
+        manage_announcements: Administrar Anuncios
+        manage_announcements_description: Permite a los usuarios gestionar anuncios en el servidor
+        manage_appeals: Administrar Apelaciones
+        manage_appeals_description: Permite a los usuarios revisar apelaciones contra acciones de moderación
+        manage_blocks: Administrar Bloqueos
+        manage_blocks_description: Permite a los usuarios bloquear los proveedores de e-mail y las direcciones IP
+        manage_custom_emojis: Administrar Emojis Personalizados
+        manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
+        manage_federation: Administrar Federación
+        manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad
+        manage_invites: Administrar Invitaciones
+        manage_invites_description: Permite a los usuarios navegar y desactivar los enlaces de invitación
+        manage_reports: Administrar Informes
+        manage_reports_description: Permite a los usuarios revisar informes y realizar acciones de moderación basadas en ellos
+        manage_roles: Administrar Roles
+        manage_roles_description: Permite a los usuarios administrar y asignar roles por debajo de los suyos
+        manage_rules: Gestionar Reglas
+        manage_rules_description: Permite a los usuarios cambiar las reglas del servidor
+        manage_settings: Administrar Ajustes
+        manage_settings_description: Permite a los usuarios cambiar la configuración del sitio
+        manage_taxonomies: Administrar Taxonomías
+        manage_taxonomies_description: Permite a los usuarios revisar el contenido en tendencia y actualizar la configuración de las etiquetas
+        manage_user_access: Administrar Acceso de Usuarios
+        manage_user_access_description: Permite a los usuarios desactivar la autenticación de dos factores de otros usuarios, cambiar su dirección de correo electrónico y restablecer su contraseña
+        manage_users: Administrar Usuarios
+        manage_users_description: Permite a los usuarios ver los detalles de otros usuarios y realizar acciones de moderación contra ellos
+        manage_webhooks: Administrar Webhooks
+        manage_webhooks_description: Permite a los usuarios configurar webhooks para eventos administrativos
+        view_audit_log: Ver Registro de Auditoría
+        view_audit_log_description: Permite a los usuarios ver un historial de acciones administrativas en el servidor
+        view_dashboard: Ver Panel de Control
+        view_dashboard_description: Permite a los usuarios acceder al panel de control y varias métricas
+        view_devops: DevOps
+        view_devops_description: Permite a los usuarios acceder a los paneles de control Sidekiq y pgHero
+      title: Roles
     rules:
       add_new: Añadir norma
       delete: Eliminar
@@ -588,142 +691,201 @@ es:
       empty: Aún no se han definido las normas del servidor.
       title: Normas del servidor
     settings:
-      activity_api_enabled:
-        desc_html: Conteo de estados publicados localmente, usuarios activos, y nuevos registros en  periodos semanales
-        title: Publicar estadísticas locales acerca de actividad de usuario
-      bootstrap_timeline_accounts:
-        desc_html: Separa con comas los nombres de usuario. Solo funcionará para cuentas locales desbloqueadas. Si se deja vacío, se tomará como valor por defecto a todos los administradores locales.
-        title: Seguimientos predeterminados para usuarios nuevos
-      contact_information:
-        email: Correo de trabajo
-        username: Nombre de usuario
-      custom_css:
-        desc_html: Modificar el aspecto con CSS cargado en cada página
-        title: CSS personalizado
+      about:
+        manage_rules: Administrar reglas del servidor
+        preamble: Proporciona información detallada sobre cómo el servidor es operado, moderado y financiado.
+        rules_hint: Hay un área dedicada para las reglas a las que se espera que tus usuarios se adhieran.
+        title: Acerca de
+      appearance:
+        preamble: Personalizar la interfaz web de Mastodon.
+        title: Apariencia
+      branding:
+        preamble: La marca de tu servidor lo diferencia de otros servidores de la red. Esta información puede mostrarse a través de una variedad de entornos, como en la interfaz web de Mastodon, en aplicaciones nativas, en previsualizaciones de enlaces en otros sitios web y en aplicaciones de mensajería, etc. Por esta razón, es mejor mantener esta información clara, breve y concisa.
+        title: Marca
+      content_retention:
+        preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
+        title: Retención de contenido
       default_noindex:
         desc_html: Afecta a todos los usuarios que no han cambiado esta configuración por sí mismos
-        title: Optar por los usuarios fuera de la indexación en los motores de búsqueda por defecto
+        title: Excluir por defecto a los usuarios de la indexación del motor de búsqueda
+      discovery:
+        follow_recommendations: Recomendaciones de cuentas
+        preamble: Exponer contenido interesante a la superficie es fundamental para incorporar nuevos usuarios que pueden no conocer a nadie Mastodon. Controla cómo funcionan varias opciones de descubrimiento en tu servidor.
+        profile_directory: Directorio de perfiles
+        public_timelines: Lineas de tiempo públicas
+        title: Descubrimiento
+        trends: Tendencias
       domain_blocks:
         all: A todos
         disabled: A nadie
-        title: Mostrar dominios bloqueados
         users: Para los usuarios locales que han iniciado sesión
-      domain_blocks_rationale:
-        title: Mostrar la razón de ser
-      hero:
-        desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia
-        title: Imagen de portada
-      mascot:
-        desc_html: Mostrado en múltiples páginas. Se recomienda un tamaño mínimo de 293x205px. Cuando no se especifica, se muestra la mascota por defecto
-        title: Imagen de la mascota
-      peers_api_enabled:
-        desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso
-        title: Publicar lista de instancias descubiertas
-      preview_sensitive_media:
-        desc_html: Los enlaces de vistas previas en otras web mostrarán una miniatura incluso si el medio está marcado como contenido sensible
-        title: Mostrar contenido sensible en previews de OpenGraph
-      profile_directory:
-        desc_html: Permitir que los usuarios puedan ser descubiertos
-        title: Habilitar directorio de perfiles
       registrations:
-        closed_message:
-          desc_html: Se muestra en la portada cuando los registros están cerrados. Puedes usar tags HTML
-          title: Mensaje de registro cerrado
-        deletion:
-          desc_html: Permite a cualquiera a eliminar su cuenta
-          title: Eliminación de cuenta abierta
-        min_invite_role:
-          disabled: Nadie
-          title: Permitir invitaciones de
-        require_invite_text:
-          desc_html: Cuando los registros requieren aprobación manual, haga obligatorio en la invitaciones el campo "¿Por qué quieres unirte?" en lugar de opcional
-          title: Requiere a los nuevos usuarios rellenar un texto de solicitud de invitación
+        preamble: Controla quién puede crear una cuenta en tu servidor.
+        title: Registros
       registrations_mode:
         modes:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
-        title: Modo de registros
-      show_known_fediverse_at_about_page:
-        desc_html: Cuando esté desactivado, se mostrarán solamente publicaciones locales en la línea temporal pública
-        title: Mostrar fediverso conocido en la vista previa de la historia
-      show_staff_badge:
-        desc_html: Mostrar un parche de staff en la página de un usuario
-        title: Mostrar parche de staff
-      site_description:
-        desc_html: Párrafo introductorio en la portada y en meta tags. Puedes usar tags HTML, en particular <code>&lt;a&gt;</code> y <code>&lt;em&gt;</code>.
-        title: Descripción de instancia
-      site_description_extended:
-        desc_html: Un buen lugar para tu código de conducta, reglas, guías y otras cosas que estén impuestas aparte en tu instancia. Puedes usar tags HTML
-        title: Información extendida personalizada
-      site_short_description:
-        desc_html: Mostrado en la barra lateral y las etiquetas de metadatos. Describe lo que es Mastodon y qué hace especial a este servidor en un solo párrafo. si está vacío, pone por defecto la descripción de la instancia.
-        title: Descripción corta de la instancia
-      site_terms:
-        desc_html: Puedes escribir tus propias políticas de privacidad, términos de servicio u otras legalidades. Puedes usar tags HTML
-        title: Términos de servicio personalizados
-      site_title: Nombre de instancia
-      thumbnail:
-        desc_html: Se usa para muestras con OpenGraph y APIs. Se recomienda 1200x630px
-        title: Portada de instancia
-      timeline_preview:
-        desc_html: Mostrar línea de tiempo pública en la portada
-        title: Previsualización
-      title: Ajustes del sitio
-      trendable_by_default:
-        desc_html: Afecta a etiquetas que no han sido previamente rechazadas
-        title: Permitir que las etiquetas sean tendencia sin revisión previa
-      trends:
-        desc_html: Mostrar públicamente hashtags previamente revisados que son tendencia
-        title: Hashtags de tendencia
+      title: Ajustes del Servidor
     site_uploads:
       delete: Eliminar archivo subido
       destroyed_msg: "¡Carga del sitio eliminada con éxito!"
     statuses:
+      account: Autor
+      application: Aplicación
       back_to_account: Volver a la cuenta
+      back_to_report: Volver a la página del reporte
       batch:
-        delete: Eliminar
-        nsfw_off: Marcar contenido como no sensible
-        nsfw_on: Marcar contenido como sensible
+        remove_from_report: Eliminar del reporte
+        report: Reporte
       deleted: Eliminado
-      failed_to_execute: Falló al ejecutar
+      favourites: Favoritos
+      history: Historial de versiones
+      in_reply_to: En respuesta a
+      language: Idioma
       media:
         title: Multimedia
-      no_media: No hay multimedia
+      metadata: Metadatos
       no_status_selected: No se cambió ningún estado al no seleccionar ninguno
+      open: Abrir publicación
+      original_status: Publicación original
+      reblogs: Impulsos
+      status_changed: Publicación cambiada
       title: Estado de las cuentas
+      trending: En tendencia
+      visibility: Visibilidad
       with_media: Con multimedia
+    strikes:
+      actions:
+        delete_statuses: "%{name} eliminó las publicaciones de %{target}"
+        disable: "%{name} congeló la cuenta de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcado las publicaciones de %{target} como sensibles"
+        none: "%{name} envió una advertencia a %{target}"
+        sensitive: "%{name} marcó la cuenta de %{target} como sensible"
+        silence: "%{name} limitó la cuenta de %{target}"
+        suspend: "%{name} suspendió la cuenta de %{target}"
+      appeal_approved: Apelado
+      appeal_pending: Apelación pendiente
     system_checks:
       database_schema_check:
         message_html: Hay migraciones pendientes de la base de datos. Por favor, ejecútalas para asegurarte de que la aplicación funciona como debería
+      elasticsearch_running_check:
+        message_html: No se pudo conectar a Elasticsearch. Por favor, comprueba que está ejecutándose, o desactiva la búsqueda de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versión incompatible de Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} se está ejecutando pero se necesita Elasticsearch %{required_version}
       rules_check:
         action: Administrar reglas del servidor
         message_html: No ha definido ninguna regla del servidor.
       sidekiq_process_check:
         message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
     tags:
-      accounts_today: Usos únicos de hoy
-      accounts_week: Usos únicos esta semana
-      breakdown: Desglose del consumo actual por fuentes
-      last_active: Última actividad
-      most_popular: Más popular
-      most_recent: Más reciente
-      name: Hashtag
       review: Estado de revisión
-      reviewed: Revisado
-      title: Etiquetas
-      trending_right_now: En tendencia ahora mismo
-      unique_uses_today: "%{count} publicando hoy"
-      unreviewed: No revisado
       updated_msg: Hashtags actualizados exitosamente
     title: Administración
+    trends:
+      allow: Permitir
+      approved: Aprobadas
+      disallow: No permitir
+      links:
+        allow: Permitir enlace
+        allow_provider: Permitir medio
+        description_html: Estos son enlaces que actualmente están siendo compartidos mucho por las cuentas desde las que tu servidor ve los mensajes. Pueden ayudar a tus usuarios a averiguar qué está pasando en el mundo. Ningún enlace se muestren públicamente hasta que autorice al dominio. También puede permitir o rechazar enlaces individuales.
+        disallow: Rechazar enlace
+        disallow_provider: Rechazar medio
+        no_link_selected: No se cambió ningún enlace ya que no se seleccionó ninguno
+        publishers:
+          no_publisher_selected: No se cambió ningún editor ya que no se seleccionó ninguno
+        shared_by_over_week:
+          one: Compartido por una persona durante la última semana
+          other: Compartido por %{count} personas durante la última semana
+        title: Enlaces en tendencia
+        usage_comparison: Compartido %{today} veces hoy, comparado con %{yesterday} ayer
+      only_allowed: Sólo las permitidas
+      pending_review: Revisión pendiente
+      preview_card_providers:
+        allowed: Los enlaces de este medio pueden ser tendencia
+        description_html: Estos son dominios desde los que los enlaces a menudo se comparten en su servidor. Los enlaces no serán tendencia públicamente a menos que se apruebe el dominio del enlace. Su aprobación (o rechazo) se extiende a los subdominios.
+        rejected: Los enlaces de este medio no pueden ser tendencia
+        title: Medios
+      rejected: Rechazadas
+      statuses:
+        allow: Permitir publicación
+        allow_account: Permitir autor
+        description_html: Estos son publicaciones que su servidor conoce que están siendo compartidas y marcadas como favoritas mucho en este momento. Pueden ayudar a tus usuarios nuevos y retornantes a encontrar más gente a la que seguir. No hay mensajes que se muestren públicamente hasta que apruebes el autor y el autor permita que su cuenta sea sugerida a otros. También puedes permitir o rechazar mensajes individuales.
+        disallow: No permitir publicación
+        disallow_account: No permitir autor
+        no_status_selected: No se cambió ninguna publicación en tendencia ya que no se seleccionó ninguna
+        not_discoverable: El autor no ha optado por ser detectable
+        shared_by:
+          one: Compartido o marcado como favorito una vez
+          other: Compatido o marcado como favorito %{friendly_count} veces
+        title: Publicaciones destacadas
+      tags:
+        current_score: Puntuación actual %{score}
+        dashboard:
+          tag_accounts_measure: usos únicos
+          tag_languages_dimension: Idiomas principales
+          tag_servers_dimension: Servidores principales
+          tag_servers_measure: diferentes servidores
+          tag_uses_measure: usos totales
+        description_html: Estos son etiquetas que están apareciendo en muchos posts que tu servidor ve. Pueden ayudar a tus usuarios a averiguar de qué habla más gente en estos momentos. No hay hashtags que se muestren públicamente hasta que los apruebes.
+        listable: Pueden ser recomendadas
+        no_tag_selected: No se cambió ninguna etiqueta ya que no se seleccionó ninguna
+        not_listable: No serán recomendadas
+        not_trendable: No aparecerán en tendencias
+        not_usable: No pueden ser usadas
+        peaked_on_and_decaying: Alcanzó el pico en %{date}, ahora decreciendo
+        title: Etiquetas en tendencia
+        trendable: Pueden aparecer en tendencias
+        trending_rank: Tendencia n.º %{rank}
+        usable: Pueden usarse
+        usage_comparison: Usada %{today} veces hoy, comparado con %{yesterday} ayer
+        used_by_over_week:
+          one: Usada por una persona durante la última semana
+          other: Usada por %{count} personas durante la última semana
+      title: Tendencias
+      trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
       edit_preset: Editar aviso predeterminado
       empty: Aún no has definido ningún preajuste de advertencia.
       title: Editar configuración predeterminada de avisos
+    webhooks:
+      add_new: Añadir endpoint
+      delete: Eliminar
+      description_html: Un <strong>webhook</strong> permite a Mastodon enviar <strong>notificaciones en tiempo real</strong> sobre los eventos elegidos a tu propia aplicación, para que tu aplicación pueda <strong>lanzar reacciones automáticamente</strong>.
+      disable: Deshabilitar
+      disabled: Deshabilitado
+      edit: Editar endpoint
+      empty: Aún no tienes ningún endpoint de webhook configurado.
+      enable: Habilitar
+      enabled: Activo
+      enabled_events:
+        one: 1 evento habilitado
+        other: "%{count} eventos habilitados"
+      events: Eventos
+      new: Nuevo webhook
+      rotate_secret: Rotar secreto
+      secret: Firmando secreto
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para eliminar sus mensajes
+        disable: para congelar su cuenta
+        mark_statuses_as_sensitive: para marcar sus mensajes como sensibles
+        none: una advertencia
+        sensitive: para marcar su cuenta como sensible
+        silence: para limitar su cuenta
+        suspend: suspender su cuenta
+      body: "%{target} está apelando a una solicitud de moderación de %{action_taken_by} el %{date}, del tipo %{type}. Ellos escribieron:"
+      next_steps: Puedes aprobar la apelación para deshacer la decisión de moderación, o ignorarla.
+      subject: "%{username} está apelando a una decisión de moderación en %{instance}"
     new_pending_account:
       body: Los detalles de la nueva cuenta están abajos. Puedes aprobar o rechazar esta aplicación.
       subject: Nueva cuenta para revisión en %{instance} (%{username})
@@ -731,9 +893,17 @@ es:
       body: "%{reporter} ha reportado a %{target}"
       body_remote: Alguien de %{domain} a reportado a %{target}
       subject: Nuevo reporte para la %{instance} (#%{id})
-    new_trending_tag:
-      body: 'El hashtag #%{name} está en tendencia hoy, pero no ha sido revisado previamente. No se mostrará públicamente a menos que lo permita, o simplemente guarde el formulario como para no volver a ver esto.'
-      subject: Nuevo hashtag para revisión en %{instance} (#%{name})
+    new_trends:
+      body: 'Los siguientes elementos necesitan una revisión antes de que se puedan mostrar públicamente:'
+      new_trending_links:
+        title: Enlaces en tendencia
+      new_trending_statuses:
+        title: Publicaciones en tendencia
+      new_trending_tags:
+        no_approved_tags: Actualmente no hay ninguna etiqueta en tendencia aprobada.
+        requirements: 'Cualquiera de estos candidatos podría superar el hashtag en tendencia aprobado por #%{rank}, que actualmente es #%{lowest_tag_name} con una puntuación de %{lowest_tag_score}.'
+        title: Etiquetas en tendencia
+      subject: Nuevas tendencias esperando ser revisadas en %{instance}
   aliases:
     add_new: Crear alias
     created_msg: El nuevo alias se ha creado correctamente. Ahora puedes empezar el traslado desde la cuenta antigua.
@@ -763,16 +933,13 @@ es:
   applications:
     created: Aplicación creada exitosamente
     destroyed: Apicación eliminada exitosamente
-    invalid_url: La URL proporcionada es incorrecta
     regenerate_token: Regenerar token de acceso
     token_regenerated: Token de acceso regenerado exitosamente
     warning: Ten mucho cuidado con estos datos. ¡No los compartas con nadie!
     your_token: Tu token de acceso
   auth:
-    apply_for_account: Solicitar una invitación
+    apply_for_account: Solicitar una cuenta
     change_password: Contraseña
-    checkbox_agreement_html: Acepto <a href="%{rules_path}" target="_blank">las reglas del servidor</a> y <a href="%{terms_path}" target="_blank">términos de servicio</a>
-    checkbox_agreement_without_rules_html: Acepto los <a href="%{terms_path}" target="_blank">términos de servicio</a>
     delete_account: Borrar cuenta
     delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
     description:
@@ -785,11 +952,13 @@ es:
     invalid_reset_password_token: El token de reinicio de contraseña es inválido o expiró. Por favor pide uno nuevo.
     link_to_otp: Introduce un código de dos factores desde tu teléfono o un código de recuperación
     link_to_webauth: Utilice su dispositivo de clave de seguridad
+    log_in_with: Iniciar sesión con
     login: Iniciar sesión
     logout: Cerrar sesión
     migrate_account: Mudarse a otra cuenta
     migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes <a href="%{path}">configurarlo aquí</a>.
     or_log_in_with: O inicia sesión con
+    privacy_policy_agreement_html: He leído y acepto la <a href="%{privacy_policy_path}" target="_blank">política de privacidad</a>
     providers:
       cas: CAS
       saml: SAML
@@ -797,20 +966,29 @@ es:
     registration_closed: "%{instance} no está aceptando nuevos miembros"
     resend_confirmation: Volver a enviar el correo de confirmación
     reset_password: Restablecer contraseña
+    rules:
+      preamble: Estas son establecidas y aplicadas por los moderadores de %{domain}.
+      title: Algunas reglas básicas.
     security: Cambiar contraseña
     set_new_password: Establecer nueva contraseña
     setup:
       email_below_hint_html: Si la dirección de correo electrónico que aparece a continuación es incorrecta, se puede cambiarla aquí y recibir un nuevo correo electrónico de confirmación.
       email_settings_hint_html: El correo electrónico de confirmación fue enviado a %{email}. Si esa dirección de correo electrónico no sea correcta, se puede cambiarla en la configuración de la cuenta.
       title: Configuración
+    sign_in:
+      preamble_html: Inicia sesión con tus credenciales de <strong>%{domain}</strong>. Si tu cuenta está alojada en un servidor diferente, no podrás iniciar sesión aquí.
+      title: Iniciar sesión en %{domain}
+    sign_up:
+      preamble: Con una cuenta en este servidor de Mastodon, podrás seguir a cualquier otra persona en la red, independientemente del servidor en el que se encuentre.
+      title: Crear cuenta de Mastodon en %{domain}.
     status:
       account_status: Estado de la cuenta
       confirming: Esperando confirmación de correo electrónico.
-      functional: Su cuenta está totalmente operativa.
+      functional: Tu cuenta está completamente operativa.
       pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
       redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
+      view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
-    trouble_logging_in: "¿Problemas para iniciar sesión?"
     use_security_key: Usar la clave de seguridad
   authorize_follow:
     already_following: Ya estás siguiendo a esta cuenta
@@ -868,10 +1046,36 @@ es:
       more_details_html: Para más detalles, ver <a href="%{terms_path}"> la política de privacidad</a>.
       username_available: Tu nombre de usuario volverá a estar disponible
       username_unavailable: Tu nombre de usuario no estará disponible
-  directories:
-    directory: Directorio de perfiles
-    explanation: Descubre usuarios según sus intereses
-    explore_mastodon: Explorar %{title}
+  disputes:
+    strikes:
+      action_taken: Acción realizada
+      appeal: Apelar
+      appeal_approved: Esta amonestación fue apelada exitosamente y ya no es válida
+      appeal_rejected: Se rechazó la apelación
+      appeal_submitted_at: Apelación enviada
+      appealed_msg: Tu apelación fue enviada. Si se aprueba, se te notificará.
+      appeals:
+        submit: Enviar apelación
+      approve_appeal: Aprobar apelación
+      associated_report: Informe asociado
+      created_at: Con fecha
+      description_html: Estas son las acciones emprendidas contra tu cuenta y las advertencias que te han sido enviadas por el personal de %{instance}.
+      recipient: Dirigida a
+      reject_appeal: Rechazar apelación
+      status: 'Publicación #%{id}'
+      status_removed: Publicación ya eliminada del sistema
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Eliminación de publicación
+        disable: Congelación de la cuenta
+        mark_statuses_as_sensitive: Marcando los mensajes como sensibles
+        none: Advertencia
+        sensitive: Marcando la cuenta como sensible
+        silence: Limitación de cuenta
+        suspend: Suspensión de cuenta
+      your_appeal_approved: Se aprobó tu apelación
+      your_appeal_pending: Has enviado una apelación
+      your_appeal_rejected: Tu apelación ha sido rechazada
   domain_validator:
     invalid_domain: no es un nombre de dominio válido
   errors:
@@ -915,61 +1119,74 @@ es:
   filters:
     contexts:
       account: Perfiles
-      home: Timeline propio
+      home: Inicio y listas
       notifications: Notificaciones
-      public: Timeline público
+      public: Líneas de tiempo públicas
       thread: Conversaciones
     edit:
+      add_keyword: Añadir palabra clave
+      keywords: Palabras clave
+      statuses: Publicaciones individuales
+      statuses_hint_html: Este filtro se aplica a la selección de publicaciones individuales independientemente de si coinciden con las palabras clave a continuación. <a href="%{path}">Revise o elimine publicaciones del filtro</a>.
       title: Editar filtro
     errors:
+      deprecated_api_multiple_keywords: Estos parámetros no se pueden cambiar desde esta aplicación porque se aplican a más de una palabra clave de filtro. Utilice una aplicación más reciente o la interfaz web.
       invalid_context: Se suminstró un contexto inválido o vacío
-      invalid_irreversible: El filtrado irreversible solo funciona con los contextos propios o de notificaciones
     index:
+      contexts: Filtros en %{contexts}
       delete: Borrar
       empty: No tienes filtros.
+      expires_in: Caduca en %{distance}
+      expires_on: Expira el %{date}
+      keywords:
+        one: "%{count} palabra clave"
+        other: "%{count} palabras clave"
+      statuses:
+        one: "%{count} publicación"
+        other: "%{count} publicaciones"
+      statuses_long:
+        one: "%{count} publicación individual oculta"
+        other: "%{count} publicaciones individuales ocultas"
       title: Filtros
     new:
-      title: Añadir un nuevo filtro
+      save: Guardar nuevo filtro
+      title: Añadir nuevo filtro
+    statuses:
+      back_to_filter: Volver a filtrar
+      batch:
+        remove: Eliminar del filtro
+      index:
+        hint: Este filtro se aplica a la selección de publicaciones individuales independientemente de otros criterios. Puede añadir más publicaciones a este filtro desde la interfaz web.
+        title: Publicaciones filtradas
   footer:
-    developers: Desarrolladores
-    more: Mas…
-    resources: Recursos
     trending_now: Tendencia ahora
   generic:
     all: Todos
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta página está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos en esta página están seleccionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento que coincide con su búsqueda está seleccionado."
+      other: Todos los <strong>%{count}</strong> elementos que coinciden con su búsqueda están seleccionados.
     changes_saved_msg: "¡Cambios guardados con éxito!"
     copy: Copiar
     delete: Eliminar
-    no_batch_actions_available: No hay acciones por lotes disponibles en esta página
+    deselect: Deseleccionar todo
+    none: Nada
     order_by: Ordenar por
     save_changes: Guardar cambios
+    select_all_matching_items:
+      one: Seleccionar %{count} elemento que coincide con tu búsqueda.
+      other: Seleccionar todos los %{count} elementos que coinciden con tu búsqueda.
+    today: hoy
     validation_errors:
       one: "¡Algo no está bien! Por favor, revisa el error"
       other: "¡Algo no está bien! Por favor, revise %{count} errores más abajo"
   html_validator:
     invalid_markup: 'contiene código HTML no válido: %{error}'
-  identity_proofs:
-    active: Activo
-    authorize: Sí, autorizar
-    authorize_connection_prompt: "¿Autorizar esta conexión criptográfica?"
-    errors:
-      failed: La conexión criptográfica falló. Por favor, inténtalo de nuevo desde %{provider}.
-      keybase:
-        invalid_token: Los tokens de Keybase son hashes de firmas y deben tener 66 caracteres hex
-        verification_failed: Keybase no reconoce este token como una firma del usuario de Keybase %{kb_username}. Por favor, inténtelo de nuevo desde Keybase.
-      wrong_user: No se puede crear una prueba para %{proving} mientras se inicia sesión como %{current}. Inicia sesión como %{proving} e inténtalo de nuevo.
-    explanation_html: Aquí puedes conectar criptográficamente sus otras identidades, como un perfil de Keybase. Esto permite a otras personas enviarle mensajes encriptados y confiar en el contenido que les envías.
-    i_am_html: Soy %{username} en %{service}.
-    identity: Identidad
-    inactive: Inactivo
-    publicize_checkbox: 'Y tootee esto:'
-    publicize_toot: "¡Comprobado! Soy %{username} en %{service}: %{url}"
-    remove: Eliminar prueba de la cuenta
-    removed: Prueba eliminada con éxito de la cuenta
-    status: Estado de la verificación
-    view_proof: Ver prueba
   imports:
     errors:
+      invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'
       over_rows_processing_limit: contiene más de %{count} filas
     modes:
       merge: Unir
@@ -985,7 +1202,6 @@ es:
       following: Lista de seguidos
       muting: Lista de silenciados
     upload: Cargar
-  in_memoriam_html: En memoria.
   invites:
     delete: Desactivar
     expired: Expiradas
@@ -1064,18 +1280,14 @@ es:
     carry_blocks_over_text: Este usuario se mudó desde %{acct}, que habías bloqueado.
     carry_mutes_over_text: Este usuario se mudó desde %{acct}, que habías silenciado.
     copy_account_note_text: 'Este usuario se mudó desde %{acct}, aquí estaban tus notas anteriores sobre él:'
+  navigation:
+    toggle_menu: Alternar menú
   notification_mailer:
-    digest:
-      action: Ver todas las notificaciones
-      body: Un resumen de los mensajes que perdiste en desde tu última visita, el %{since}
-      mention: "%{name} te ha mencionado en:"
-      new_followers_summary:
-        one: "¡Ademas, has adquirido un nuevo seguidor mientras no estabas! ¡Hurra!"
-        other: "¡Ademas, has adquirido %{count} nuevos seguidores mientras no estabas! ¡Genial!"
-      subject:
-        one: "1 nueva notificación desde tu última visita \U0001F418"
-        other: "%{count} nuevas notificaciones desde tu última visita \U0001F418"
-      title: En tu ausencia…
+    admin:
+      report:
+        subject: "%{name} envió un informe"
+      sign_up:
+        subject: "%{name} se registró"
     favourite:
       body: 'Tu estado fue marcado como favorito por %{name}:'
       subject: "%{name} marcó como favorito tu estado"
@@ -1102,6 +1314,8 @@ es:
       title: Nueva difusión
     status:
       subject: "%{name} acaba de publicar"
+    update:
+      subject: "%{name} editó una publicación"
   notifications:
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
@@ -1145,6 +1359,8 @@ es:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones
     public_timelines: Líneas de tiempo públicas
+  privacy_policy:
+    title: Política de Privacidad
   reactions:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
@@ -1167,22 +1383,15 @@ es:
     remove_selected_follows: Dejar de seguir a los usuarios seleccionados
     status: Estado de la cuenta
   remote_follow:
-    acct: Ingresa tu usuario@dominio desde el que quieres seguir
     missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta
-    no_account_html: "¿No tienes una cuenta? Puedes <a href='%{sign_up_path}' target='_blank'>registrarte aqui</a>"
-    proceed: Proceder a seguir
-    prompt: 'Vas a seguir a:'
-    reason_html: "¿<strong>¿Por qué es necesario este paso?</strong> <code>%{instance}</code> puede que no sea el servidor donde estás registrado, así que necesitamos redirigirte primero a tu servidor de origen."
-  remote_interaction:
-    favourite:
-      proceed: Proceder a marcar como favorito
-      prompt: 'Quieres marcar como favorita esta publicación:'
-    reblog:
-      proceed: Proceder a retootear
-      prompt: 'Quieres retootear esta publicación:'
-    reply:
-      proceed: Proceder a responder
-      prompt: 'Quieres responder a esta publicación:'
+  reports:
+    errors:
+      invalid_rules: no hace referencia a reglas válidas
+  rss:
+    content_warning: 'Advertencia de contenido:'
+    descriptions:
+      account: Publicaciones públicas de @%{acct}
+      tag: 'Publicaciones públicas etiquetadas con #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Ha superado el límite de %{limit} publicaciones programadas para ese día
     over_total_limit: Ha superado el límite de %{limit} publicaciones programadas
@@ -1192,7 +1401,7 @@ es:
     browser: Navegador
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1206,7 +1415,7 @@ es:
       phantom_js: PhantomJS
       qq: Navegador QQ
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Navegador UC
       weibo: Weibo
     current_session: Sesión actual
     description: "%{browser} en %{platform}"
@@ -1215,7 +1424,7 @@ es:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1241,7 +1450,6 @@ es:
     edit_profile: Editar perfil
     export: Exportar información
     featured_tags: Hashtags destacados
-    identity_proofs: Pruebas de identidad
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
@@ -1250,6 +1458,7 @@ es:
     profile: Perfil
     relationships: Siguiendo y seguidores
     statuses_cleanup: Eliminación automática de publicaciones
+    strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
   statuses:
@@ -1266,18 +1475,19 @@ es:
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
     content_warning: 'Alerta de contenido: %{warning}'
+    default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía un hashtag no permitido: %{tags}'
       other: 'contenía los hashtags no permitidos: %{tags}'
+    edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: El estado al que intentas responder no existe.
-    language_detection: Detección automática de idioma
     open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
+      direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
       limit: Ya has fijado el número máximo de publicaciones
       ownership: La publicación de otra persona no puede fijarse
-      private: Las publicaciones no públicas no pueden fijarse
       reblog: Un boost no puede fijarse
     poll:
       total_people:
@@ -1328,6 +1538,7 @@ es:
       '2629746': 1 mes
       '31556952': 1 año
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 años
       '7889238': 3 meses
     min_age_label: Umbral de tiempo
@@ -1339,91 +1550,11 @@ es:
     pinned: Publicación fijada
     reblogged: retooteado
     sensitive_content: Contenido sensible
+  strikes:
+    errors:
+      too_late: Es demasiado tarde para apelar esta amonestación
   tags:
     does_not_match_previous_name: no coincide con el nombre anterior
-  terms:
-    body_html: |
-      <h2>Política de Privacidad</h2>
-      <h3 id="collect">¿Qué información recogemos?</h3>
-
-      <ul>
-      <li><em>Información básica sobre su cuenta</em>: Si se registra en este servidor, se le requerirá un nombre de usuario, una dirección de correo electrónico y una contraseña. Además puede incluir información adicional en el perfil como un nombre de perfil y una biografía, y subir una foto de perfil y una imagen de cabecera. El nombre de usuario, nombre de perfil, biografía, foto de perfil e imagen de cabecera siempre son visibles públicamente</li>
-      <li><em>Publicaciones, seguimiento y otra información pública</em>: La lista de gente a la que sigue es mostrada públicamente, al igual que sus seguidores. Cuando publica un mensaje, la fecha y hora es almacenada, así como la aplicación desde la cual publicó el mensaje. Los mensajes pueden contener archivos adjuntos multimedia, como imágenes y vídeos. Las publicaciones públicas y no listadas están disponibles públicamente. Cuando destaca una entrada en su perfil, también es información disponible públicamente. Sus publicaciones son entregadas a sus seguidores, en algunos casos significa que son entregadas a diferentes servidores y las copias son almacenadas allí. Cuando elimina publicaciones, esto también se transfiere a sus seguidores. La acción de rebloguear o marcar como favorito otra publicación es siempre pública.</li>
-      <li><em>Publicaciones directas y sólo para seguidores</em>: Todos los mensajes se almacenan y procesan en el servidor. Los mensajes sólo para seguidores se entregan a los seguidores y usuarios que se mencionan en ellos, y los mensajes directos se entregan sólo a los usuarios que se mencionan en ellos. En algunos casos significa que se entregan a diferentes servidores y que las copias se almacenan allí. Hacemos un esfuerzo de buena fe para limitar el acceso a esas publicaciones sólo a las personas autorizadas, pero otros servidores pueden no hacerlo. Por lo tanto, es importante revisar los servidores a los que pertenecen sus seguidores. Puede cambiar una opción para aprobar y rechazar nuevos seguidores manualmente en la configuración <em>Por favor, tenga en cuenta que los operadores del servidor y de cualquier servidor receptor pueden ver dichos mensajes</em>, y que los destinatarios pueden capturarlos, copiarlos o volver a compartirlos de alguna otra manera. <em>No comparta ninguna información peligrosa en Mastodon.</em></li>
-      <li><em>Direcciones IP y otros metadatos</em>: Al iniciar sesión, registramos la dirección IP desde la que se ha iniciado sesión, así como el nombre de la aplicación de su navegador. Todas las sesiones iniciadas están disponibles para su revisión y revocación en los ajustes. La última dirección IP utilizada se almacena hasta 12 meses. También podemos conservar los registros del servidor que incluyen la dirección IP de cada solicitud a nuestro servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">¿Para qué utilizamos su información?</h3>
-
-      <p>Toda la información que obtenemos de usted puede ser utilizada de las siguientes maneras:</p>
-
-      <ul>
-      <li>Para proporcionar la funcionalidad principal de Mastodon. Sólo puedes interactuar con el contenido de otras personas y publicar tu propio contenido cuando estés conectado. Por ejemplo, puedes seguir a otras personas para ver sus mensajes combinados en tu propia línea de tiempo personalizada.</li>
-      <li>Para ayudar a la moderación de la comunidad, por ejemplo, comparando su dirección IP con otras conocidas para determinar la evasión de prohibiciones u otras violaciones.</li>
-      <li>La dirección de correo electrónico que nos proporcione podrá utilizarse para enviarle información, notificaciones sobre otras personas que interactúen con su contenido o para enviarle mensajes, así como para responder a consultas y/u otras solicitudes o preguntas.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">¿Cómo protegemos su información?</h3>
-
-      <p>Implementamos una variedad de medidas de seguridad para mantener la seguridad de su información personal cuando usted ingresa, envía o accede a su información personal. Entre otras cosas, la sesión de su navegador, así como el tráfico entre sus aplicaciones y la API, están protegidos con SSL, y su contraseña está protegida mediante un algoritmo unidireccional fuerte. Puede habilitar la autenticación de dos factores para un acceso más seguro a su cuenta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">¿Cuál es nuestra política de retención de datos?</h3>
-
-      <p>Haremos un esfuerzo de buena fe para:</p>
-
-      <ul>
-      <li>Conservar los registros del servidor que contengan la dirección IP de todas las peticiones a este servidor, en la medida en que se mantengan dichos registros, no más de 90 días.</li>
-      <li>Conservar las direcciones IP asociadas a los usuarios registrados no más de 12 meses.</li>
-      </ul>
-
-      <p>Puede solicitar y descargar un archivo de su contenido, incluidos sus mensajes, archivos adjuntos multimedia, foto de perfil e imagen de cabecera.</p>
-
-      <p>Usted puede borrar su cuenta de forma irreversible en cualquier momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">¿Utilizamos cookies?</h3>
-
-      <p>Sí. Las cookies son pequeños archivos que un sitio o su proveedor de servicios transfiere al disco duro de su ordenador a través de su navegador web (si usted lo permite). Estas cookies permiten al sitio reconocer su navegador y, si tiene una cuenta registrada, asociarla con su cuenta registrada.</p>
-
-      <p>Utilizamos cookies para entender y guardar sus preferencias para futuras visitas.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">¿Revelamos alguna información a terceros?</h3>
-
-      <p>No vendemos, comerciamos ni transferimos a terceros su información personal identificable. Esto no incluye a los terceros de confianza que nos asisten en la operación de nuestro sitio, en la realización de nuestros negocios o en la prestación de servicios, siempre y cuando dichas partes acuerden mantener la confidencialidad de esta información. También podemos divulgar su información cuando creamos que es apropiado para cumplir con la ley, hacer cumplir las políticas de nuestro sitio, o proteger nuestros u otros derechos, propiedad o seguridad.</p>
-
-      <p>Su contenido público puede ser descargado por otros servidores de la red. Tus mensajes públicos y sólo para seguidores se envían a los servidores donde residen tus seguidores, y los mensajes directos se envían a los servidores de los destinatarios, en la medida en que dichos seguidores o destinatarios residan en un servidor diferente.</p>
-
-      <p>Cuando usted autoriza a una aplicación a usar su cuenta, dependiendo del alcance de los permisos que usted apruebe, puede acceder a la información de su perfil público, su lista de seguimiento, sus seguidores, sus listas, todos sus mensajes y sus favoritos. Las aplicaciones nunca podrán acceder a su dirección de correo electrónico o contraseña.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uso del sitio por parte de los niños</h3>
-
-      <p>Si este servidor está en la UE o en el EEE: Nuestro sitio, productos y servicios están dirigidos a personas mayores de 16 años. Si es menor de 16 años, según los requisitos de la GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation_Data_Protection_Regulation">General Data Protection Regulation</a>) no utilice este sitio.</p>
-
-      <p>Si este servidor está en los EE.UU.: Nuestro sitio, productos y servicios están todos dirigidos a personas que tienen al menos 13 años de edad. Si usted es menor de 13 años, según los requisitos de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no utilice este sitio.</p>
-
-      <p>Los requisitos legales pueden ser diferentes si este servidor está en otra jurisdicción.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Cambios en nuestra Política de Privacidad</h3>
-
-      <p>Si decidimos cambiar nuestra política de privacidad, publicaremos esos cambios en esta página.</p>
-
-      <p>Este documento es CC-BY-SA. Fue actualizado por última vez el 7 de marzo de 2018.</p>
-
-      <p>Adaptado originalmente desde <a href="https://github.com/discourse/discourse">la política de privacidad de Discourse</a>.</p>
-    title: Términos del Servicio y Políticas de Privacidad de %{instance}
   themes:
     contrast: Alto contraste
     default: Mastodon
@@ -1432,6 +1563,7 @@ es:
     formats:
       default: "%d de %b del %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Añadir
     disable: Deshabilitar
@@ -1448,63 +1580,73 @@ es:
     recovery_instructions_html: Si pierdes acceso a tu teléfono, puedes usar uno de los siguientes códigos de recuperación para obtener acceso a tu cuenta. <strong>Mantenlos a salvo</strong>. Por ejemplo, puedes imprimirlos y guardarlos con otros documentos importantes.
     webauthn: Claves de seguridad
   user_mailer:
+    appeal_approved:
+      action: Ir a tu cuenta
+      explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
+      subject: Tu apelación del %{date} ha sido aprobada
+      title: Apelación aprobada
+    appeal_rejected:
+      explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
+      subject: Tu apelación del %{date} ha sido rechazada
+      title: Apelación rechazada
     backup_ready:
       explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
-    sign_in_token:
-      details: 'Aquí están los detalles del intento:'
-      explanation: 'Hemos detectado un intento de inicio de sesión en tu cuenta desde una dirección IP no reconocida. Si has sido tú, por favor ingresa el siguiente código de seguridad en la página del desafío:'
-      further_actions: 'Si no has sido tú, por favor cambia tu contraseña y habilita la autenticación de dos factores en tu cuenta. Puedes hacerlo aquí:'
-      subject: Por favor, confirma el intento de inicio de sesión
-      title: Intento de inicio de sesión
+    suspicious_sign_in:
+      change_password: cambies tu contraseña
+      details: 'Aquí están los detalles del inicio de sesión:'
+      explanation: Hemos detectado un inicio de sesión en tu cuenta desde una nueva dirección IP.
+      further_actions_html: Si no fuiste tú, te recomendamos que %{action} inmediatamente y habilites la autenticación de dos factores para mantener tu cuenta segura.
+      subject: Tu cuenta ha sido accedida desde una nueva dirección IP
+      title: Un nuevo inicio de sesión
     warning:
+      appeal: Enviar una apelación
+      appeal_description: Si crees que esto es un error, puedes enviar una apelación al equipo de %{instance}.
+      categories:
+        spam: Spam
+        violation: El contenido viola las siguientes directrices de la comunidad
       explanation:
-        disable: Mientras su cuenta esté congelada, la información de su cuenta permanecerá intacta, pero no puede realizar ninguna acción hasta que se desbloquee.
-        sensitive: Los archivos multimedia subidos y vinculados serán tratados como sensibles.
-        silence: Mientras su cuenta está limitada, sólo las personas que ya te están siguiendo verán tus publicaciones en este servidor, y puede que se te excluya de varios listados públicos. Sin embargo, otros pueden seguirte manualmente.
-        suspend: Su cuenta ha sido suspendida, y todas tus publicaciones y tus archivos multimedia subidos han sido irreversiblemente eliminados de este servidor, y de los servidores donde tenías seguidores.
-      get_in_touch: Puede responder a esta dirección de correo electrónico para ponerse en contacto con el personal de %{instance}.
-      review_server_policies: Revisar las políticas del servidor
-      statuses: 'Específicamente, para:'
+        delete_statuses: Se ha determinado que algunos de tus mensajes violan una o más directrices de la comunidad y han sido por tanto eliminados por los moderadores de %{instance}.
+        disable: Ya no puedes usar tu cuenta, pero tu perfil y el resto de datos permanecen intactos. Puedes solicitar una copia de seguridad de tus datos, cambiar la configuración de tu cuenta o eliminarla.
+        mark_statuses_as_sensitive: Algunos de tus mensajes han sido marcados como sensibles por los moderadores de %{instance}. Esto significa que la gente tendrá que pulsar los archivos multimedia en las publicaciones antes de que se muestre una vista previa. Puedes marcar los archivos multimedia como sensibles tú mismo cuando publiques en el futuro.
+        sensitive: A partir de ahora, todos los archivos multimedia que subas serán marcados como sensibles y ocultos tras una advertencia que habrá que clicar.
+        silence: Aún puedes usar tu cuenta, pero solo las personas que te están siguiendo verán tus publicaciones en este servidor, y puedes ser excluido de varias funcionalidades de descubrimiento. Sin embargo, otras cuentas podrán empezar a seguirte manualmente.
+        suspend: Ya no puedes utilizar tu cuenta, y tu perfil y el resto de datos ya no son accesibles. Todavía puedes iniciar sesión para solicitar una copia de seguridad de tus datos, hasta que estos sean eliminados por completo en unos 30 días, aunque conservaremos algunos datos básicos para impedir que esquives la suspensión.
+      reason: 'Razón:'
+      statuses: 'Publicaciones citadas:'
       subject:
+        delete_statuses: Tus publicaciones en %{acct} han sido eliminadas
         disable: Su cuenta %{acct} ha sido congelada
+        mark_statuses_as_sensitive: Tus publicaciones en %{acct} han sido marcadas como sensibles
         none: Advertencia para %{acct}
-        sensitive: Tu cuenta %{acct} ha sido marcada como sensible
+        sensitive: Tus publicaciones en %{acct} se marcarán como sensibles a partir de ahora
         silence: Su cuenta %{acct} ha sido limitada
         suspend: Su cuenta %{acct} ha sido suspendida
       title:
+        delete_statuses: Publicaciones eliminadas
         disable: Cuenta congelada
+        mark_statuses_as_sensitive: Publicaciones marcadas como sensibles
         none: Advertencia
-        sensitive: Tu multimedia ha sido marcado como sensible
+        sensitive: Cuenta marcada como sensible
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
       edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre de usuario y más cosas. Si quieres revisar a tus nuevos seguidores antes de que se les permita seguirte, puedes bloquear tu cuenta.
+      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
       explanation: Aquí hay algunos consejos para empezar
       final_action: Empezar a publicar
-      final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.'
+      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
       full_handle: Su sobrenombre completo
       full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
-      review_preferences_action: Cambiar preferencias
-      review_preferences_step: Asegúrate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs".
       subject: Bienvenido a Mastodon
-      tip_federated_timeline: La línea de tiempo federada es una vista de la red de Mastodon. Pero solo incluye gente que tus vecinos están siguiendo, así que no está completa.
-      tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada.
-      tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos!
-      tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas!
-      tips: Consejos
       title: Te damos la bienvenida a bordo, %{name}!
   users:
     follow_limit_reached: No puedes seguir a más de %{limit} personas
-    generic_access_help_html: "¿Tienes problemas para acceder a tu cuenta? Puedes ponerte en contacto con %{email} para conseguir ayuda"
     invalid_otp_token: Código de dos factores incorrecto
-    invalid_sign_in_token: Código de seguridad no válido
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
-    suspicious_sign_in_confirmation: Parece que no has iniciado sesión desde este dispositivo antes, y no has iniciado sesión durante un tiempo, así que estamos enviando un código de seguridad a tu dirección de correo electrónico para confirmar que eres tú.
   verification:
     explanation_html: 'Puedes <strong> verificarte a ti mismo como el dueño de los links en los metadatos de tu perfil </strong>. Para eso, el sitio vinculado debe contener un vínculo a tu perfil de Mastodon. El vínculo en tu sitio <strong> debe </strong> tener un atributo <code> rel="me"</code>. El texto del vínculo no importa. Aquí un ejemplo:'
     verification: Verificación
diff --git a/config/locales/et.yml b/config/locales/et.yml
index a5d196666..89ee5c092 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1,127 +1,82 @@
 ---
 et:
   about:
-    about_hashtag_html: Need on avalikud tuututused sildistatud sildiga <strong>#%{hashtag}</strong>. Te saate suhelda nendega, kui Teil on konto üks kõik kus terves fediversumis.
     about_mastodon_html: 'Tuleviku sotsiaalvõrgustik: Reklaamivaba, korporatiivse järelvalveta, eetiline kujundus ning detsentraliseeritus! Oma enda andmeid Mastodonis!'
-    about_this: Meist
-    active_count_after: aktiivne
-    active_footnote: Igakuiselt aktiivseid kasutajaid (MAU)
-    administered_by: 'Administraator:'
-    apps: Mobiilrakendused
-    apps_platforms: Kasuta Mastodoni iOS-is, Androidis ja teistel platvormidel
-    browse_directory: Sirvi profiilide kataloogi ja filtreeri huvide alusel
-    browse_local_posts: Sirvi reaalajas voogu avalikest postitustest sellest serverist
-    browse_public_posts: Sirvi reaalajas voogu avalikest postitustest Mastodonis
-    contact: Kontakt
     contact_missing: Määramata
     contact_unavailable: Pole saadaval
-    discover_users: Avasta kasutajaid
-    documentation: Dokumentatsioon
-    federation_hint_html: Kui Teil on kasutaja %{instance}-is, saate Te jälgida inimesi üks kõik millisel Mastodoni serveril ja kaugemalgi.
-    get_apps: Proovi mobiilirakendusi
     hosted_on: Mastodon majutatud %{domain}-is
-    instance_actor_flash: |
-      See konto on virtuaalne näitleja, mis esindab tervet serverit ning mitte ühtegi kindlat isikut.
-      Seda kasutatakse föderatiivsetel põhjustel ning seda ei tohiks blokeerida, välja arvatud juhul, kui soovite blokeerida tervet serverit, kuid sellel juhul soovitame hoopis kasutada domeeni blokeerimist.
-    learn_more: Lisateave
-    privacy_policy: Privaatsuspoliitika
-    see_whats_happening: Vaata, mis toimub
-    server_stats: 'Serveri statistika:'
-    source_code: Lähtekood
-    status_count_after:
-      one: staatust
-      other: staatuseid
-    status_count_before: Kes omavad
-    tagline: Jälgi sõpru ja leia uusi
-    terms: Kasutustingimused
-    unavailable_content: Sisu pole saadaval
-    unavailable_content_description:
-      reason: Põhjus
-      rejecting_media: 'Meedia failid sellelt serverilt ei töödelda ega salvestata ning mitte ühtegi eelvaadet ei kuvata, mis nõuab manuaalselt vajutust originaalfailile:'
-      silenced: 'Postitused nendelt serveritelt peidetakse avalikes ajajoontes ja vestlustes ning mitte ühtegi teavitust ei tehta nende kasutajate tegevustest, välja arvatud juhul, kui Te neid jälgite:'
-      suspended: 'Mitte mingeid andmeid nendelt serveritelt ei töödelda, salvestata ega vahetata, tehes igasuguse interaktsiooni või kirjavahetuse kasutajatega nendelt serveritelt võimatuks:'
-    unavailable_content_html: Mastodon tavaliselt lubab Teil vaadata sisu ning suhelda kasutajatega üks kõik millisest teisest serverist fediversumis. Need on erandid, mis on paika pandud sellel kindlal serveril.
-    user_count_after:
-      one: kasutajale
-      other: kasutajale
-    user_count_before: Koduks
-    what_is_mastodon: Mis on Mastodon?
+    title: Teave
   accounts:
-    choices_html: "%{name}-i valikud:"
-    endorsements_hint: Te saate heaks kiita inimesi, keda jälgite, veebiliidesest ning neid kuvatakse siin.
-    featured_tags_hint: Te saate valida kindlaid silte, mida kuvatakse siin.
     follow: Jälgi
     followers:
       one: Jälgija
       other: Jälgijaid
     following: Jälgib
-    joined: Liitus %{date}
+    instance_actor_flash: See on serveri enda virtuaalne konto. See ei esinda ühtegi kindlat kasutajat, vaid seda kasutatakse födereerumisel. Seda kontot ei tohi kustutada.
     last_active: viimati aktiivne
     link_verified_on: Selle lingi autorsust kontrolliti %{date}
-    media: Meedia
-    moved_html: "%{name} kolis %{new_profile_link}:"
-    network_hidden: Neid andmeid pole saadaval
-    never_active: Mitte kunagi
     nothing_here: Siin pole midagi!
-    people_followed_by: Inimesed, keda %{name} jälgib
-    people_who_follow: Inimesed, kes jälgivad kasutajat %{name}
     pin_errors:
-      following: Te peate juba olema selle kasutaja jälgija, keda te heaks kiidate
+      following: Te peate juba olema selle kasutaja jälgija, keda te soovitate
     posts:
-      one: Tuututus
-      other: Tuututused
-    posts_tab_heading: Tuututused
-    posts_with_replies: Tuututused ja vastused
-    roles:
-      admin: Administraator
-      bot: Robot
-      group: Grupp
-      moderator: Moderaator
-    unavailable: Profiil pole saadaval
-    unfollow: Lõpeta jälgimine
+      one: Postitus
+      other: Postitused
+    posts_tab_heading: Postitused
   admin:
     account_actions:
       action: Täida tegevus
       title: Rakenda moderaatori tegevus kasutajale %{acct}
     account_moderation_notes:
       create: Jäta teade
-      created_msg: Moderatsiooniteade edukalt koostatud!
-      delete: Kustuta
-      destroyed_msg: Moderatsiooniteade edukalt kustutatud!
+      created_msg: Modereerimisteade edukalt koostatud!
+      destroyed_msg: Modereerimisteade edukalt kustutatud!
     accounts:
       add_email_domain_block: Keela e-posti domeen
-      approve: Kinnita
-      approve_all: Kinnita kõik
-      are_you_sure: Olete kindel?
+      approve: Võta vastu
+      approved_msg: Kasutaja %{username} liitumisavaldus rahuldatud
+      are_you_sure: Oled kindel?
       avatar: Profiilipilt
       by_domain: Domeen
       change_email:
-        changed_msg: Konto e-postiaadress edukalt muudetud!
+        changed_msg: E-postiaadress vahetatud!
         current_email: Praegune e-postiaadress
         label: Muuda e-posti aadressi
         new_email: Uus е-posti aadress
         submit: Muuda e-posti aadressi
         title: Muuda e-postiaadressi kasutajale %{username}
+      change_role:
+        changed_msg: Roll on muudetud!
+        label: Muuda rolli
+        no_role: Roll puudub
+        title: "%{username} rolli muutmine"
       confirm: Kinnita
       confirmed: Kinnitatud
-      confirming: Kinnitamine
+      confirming: Kinnitamisel
+      custom: Kohandatud
+      delete: Kustuta andmed
       deleted: Kustutatud
       demote: Alanda
+      destroyed_msg: "%{username} andmed on nüüd lõpliku kustutamise ootel"
       disable: Keela
+      disable_sign_in_token_auth: Keela e-posti võtmetega autentimine
       disable_two_factor_authentication: Keela 2FA
       disabled: Keelatud
       display_name: Kuvanimi
       domain: Domeen
-      edit: Redigeeri
+      edit: Muuda
       email: E-post
-      email_status: E-posti staatus
+      email_status: E-posti olek
       enable: Luba
+      enable_sign_in_token_auth: Luba e-posti võtmetega autentimine
       enabled: Lubatud
+      enabled_msg: Kasutaja %{username} konto taastatud
       followers: Jälgijad
       follows: Jälgib
       header: Päis
       inbox_url: Sisendkausta URL
+      invite_request_text: Põhjendused liitumiseks
       invited_by: Kutsuja
+      ip: IP
       joined: Liitus
       location:
         all: Kõik
@@ -130,104 +85,207 @@ et:
         title: Asukoht
       login_status: Sisselogimise olek
       media_attachments: Lisatud meedia
-      memorialize: Tee memoriaaliks
+      memorialize: Igaveseks lahkunud
+      memorialized: Igaveselt lahkunuks märgitud
+      memorialized_msg: "%{username} on märgitud igavaselt lahkunuks"
       moderation:
         active: Aktiivne
         all: Kõik
         pending: Ootel
         silenced: Vaigistatud
-        suspended: Peatatud
-        title: Moderatsioon
-      moderation_notes: Moderatsiooniteated
+        suspended: Kustutatud
+        title: Modereerimine
+      moderation_notes: Modereerimisteated
       most_recent_activity: Kõige hiljutisem aktiivsus
       most_recent_ip: Kõige hiljutisem IP
       no_account_selected: Mitte ühtegi kontot muudeti sest midagi polnud valitud
       no_limits_imposed: Mitte ühtegi limiiti kehtestatud
+      no_role_assigned: Ühtegi rolli pole määratud
       not_subscribed: Ei ole tellitud
       pending: Ootab ülevaatamist
-      perform_full_suspension: Peata
+      perform_full_suspension: Kustuta
+      previous_strikes: Eelnevad juhtumid
+      previous_strikes_description_html:
+        one: Sel kontol on <strong>üks</strong> juhtum.
+        other: Sel kontol on <strong>%{count}</strong> juhtumit.
       promote: Edenda
       protocol: Protokoll
       public: Avalik
       push_subscription_expires: PuSH tellimus aegub
       redownload: Värskenda profiili
+      redownloaded_msg: "%{username} kasutajakonto algallikast värskendatud"
       reject: Hülga
-      reject_all: Hülga kõik
+      rejected_msg: "%{username} liitumisavaldus tagasi lükatud"
+      remote_suspension_irreversible: Selle konto andmed on pöördumatult kustutatud.
+      remote_suspension_reversible_hint_html: Konto on lukustatud ja andmed kustutatakse jäädavalt %{date}. Seni võib teine server konto probleemideta taastada. Kui soovid andmied kohe jäädavalt eemaldada, võid seda teha allpool.
       remove_avatar: Kustuta profiilipilt
       remove_header: Kustuta päis
+      removed_avatar_msg: "%{username} tunnuspilt eemaldatud"
+      removed_header_msg: "%{username} päisepilt eemaldatud"
       resend_confirmation:
         already_confirmed: See kasutaja on juba kinnitatud
         send: Saada kinnituskiri uuesti
         success: Kinnituskiri saadetud edukalt!
       reset: Lähtesta
-      reset_password: Lähtesta salasõna
+      reset_password: Salasõna lähtestamine
       resubscribe: Telli taas
-      role: Õigused
-      roles:
-        admin: Administraator
-        moderator: Moderaator
-        staff: Personal
-        user: Kasutaja
+      role: Roll
       search: Otsi
       search_same_email_domain: Muud kasutajad sama e-posti domeeniga
       search_same_ip: Teised kasutajad, kellel on sama IP
+      security_measures:
+        only_password: Ainult salasõna
+        password_and_2fa: Salasõna ja 2-etapine autentimine (2FA)
+      sensitive: Tundlik sisu
+      sensitized: Märgitud kui tundlik sisu
       shared_inbox_url: Jagatud sisendkausta URL
       show:
         created_reports: Loodud teated
-        targeted_reports: Teiste poolt teatatud
+        targeted_reports: Teavitusi teiste poolt
       silence: Vaigista
       silenced: Vaigistatud
-      statuses: Staatuseid
+      statuses: Postitused
+      strikes: Eelnevad juhtumid
       subscribe: Telli
-      suspended: Peatatud
-      time_in_queue: Ootab järjekorras %{time}
+      suspend: Kustuta
+      suspended: Kustuta
+      suspension_irreversible: Selle konto andmed on taastamatult kustutatud. Konto taastamisel on see taas kasutatav, aga eelmisi andmeid pole võimalik taastada.
+      suspension_reversible_hint_html: Konto on lukustatud ja andmed kustutatakse täielikult %{date}. Seni on võimalik kontot täielikult taastada. Soovi korral on võimalik allpool kõik konto andmed kustutada koheselt.
       title: Kontod
+      unblock_email: Luba e-postiaadress
+      unblocked_email_msg: Kasutaja %{username} e-postiaadress lubatud
       unconfirmed_email: Kinnitamata e-post
+      undo_sensitized: Eemalda tundliku sisu märge
       undo_silenced: Võta vaigistus tagasi
       undo_suspension: Võta peatamine tagasi
+      unsilenced_msg: Konto %{username} piirangud emaldatud
       unsubscribe: Tühista tellimus
+      unsuspended_msg: Kasutaja %{username} konto taastatud
       username: Kasutajanimi
+      view_domain: Vaata domeeni kokkuvõtet
       warn: Hoiata
       web: Veeb
       whitelisted: Lubatud
     action_logs:
       action_types:
+        approve_appeal: Rahulda vaidlustus
+        approve_user: Kinnita kasutaja
         assigned_to_self_report: Määras Teavituse
         change_email_user: Kasutaja muutis e-postiaadressit
+        change_role_user: Muuda kasutaja rolli
         confirm_user: Kasutaja kinnitatud
         create_account_warning: Lisas hoiatuse
         create_announcement: Lisas teadaande
+        create_canonical_email_block: E-posti blokeeringu lisamine
         create_custom_emoji: Lisas kohandatud emotikoni
         create_domain_allow: Lisas lubatud domeeni
         create_domain_block: Lisas domeeniblokeeringu
         create_email_domain_block: Lisas e-posti domeeni blokeeringu
+        create_ip_block: IP-reegli lisamine
+        create_unavailable_domain: Kättesaamatu domeeni lisamine
+        create_user_role: Loo roll
         demote_user: Alandas kasutaja
         destroy_announcement: Eemaldas teadaande
+        destroy_canonical_email_block: E-posti blokeeringu kustutamine
         destroy_custom_emoji: Eemaldas kohandatud emotikoni
         destroy_domain_allow: Eemaldas lubatud domeeni
         destroy_domain_block: Eemaldas domeeniblokeeringu
         destroy_email_domain_block: Eemaldas e-posti domeeni blokeeringu
-        destroy_status: Eemaldas staatuse
-        disable_2fa_user: Keelas 2FA
+        destroy_instance: Domeeni kustutamine
+        destroy_ip_block: IP-reegli kustutamine
+        destroy_status: Kustuta postitus
+        destroy_unavailable_domain: Kättesaamatu domeeni kustutamine
+        destroy_user_role: Rolli kustutamine
+        disable_2fa_user: Keela 2FA
         disable_custom_emoji: Keelas kohandatud emotikoni
+        disable_sign_in_token_auth_user: E-posti võtmega autentimise keelamine
         disable_user: Keelas kasutaja
         enable_custom_emoji: Lubas kohandatud emotikoni
+        enable_sign_in_token_auth_user: E-posti võtmega autentimise lubamine
         enable_user: Lubas kasutaja
-        memorialize_account: Tegi kontole memoriaali
+        memorialize_account: Igaveselt lahkunuks märkimine
         promote_user: Edendas kasutaja
+        reject_appeal: Lükka vaidlustus tagasi
+        reject_user: Kasutaja tagasilükkamine
         remove_avatar_user: Kustutas profiilipildi
         reopen_report: Taasavas teavituse
-        reset_password_user: Lähtestas salasõna
+        resend_user: Saada kinnituskiri uuesti
+        reset_password_user: Salasõna lähtestamine
         resolve_report: Lahendas teadaande
+        sensitive_account: Tundliku sisuga konto
         silence_account: Vaigistas konto
-        suspend_account: Peatas konto
+        suspend_account: Konto kustutamine
         unassigned_report: Määras teavituse maha
+        unblock_email_account: Luba e-postiaadress
+        unsensitive_account: Pole tundliku sisuga konto
         unsilence_account: Konto vaigistus eemaldati
-        unsuspend_account: Konto peatamine lõpetati
+        unsuspend_account: Konto taastamine
         update_announcement: Uuenda teadaannet
         update_custom_emoji: Uuendas kohandatud emotikoni
-        update_status: Uuendas staatust
-      deleted_status: "(kustutatud staatus)"
+        update_domain_block: Uuenda domeenipiirangut
+        update_ip_block: IP-reegli uuendamine
+        update_status: Uuenda postitust
+        update_user_role: Uuenda rolli
+      actions:
+        approve_appeal_html: "%{name} kiitis heaks modereerimise otsuse vaidlustuse %{target} poolt"
+        approve_user_html: "%{name} kiitis heaks registreerimise %{target} poolt"
+        assigned_to_self_report_html: "%{name} määras raporti %{target} endale"
+        change_email_user_html: "%{name} muutis %{target} e-postiaadressi"
+        change_role_user_html: "%{name} muutis %{target} rolli"
+        confirm_user_html: "%{name} on %{target} e-postiaadressi kinnitanud"
+        create_account_warning_html: "%{name} saatis %{target} hoiatuse"
+        create_announcement_html: "%{name} lõi uue teate %{target}"
+        create_canonical_email_block_html: "%{name} keelas e-postiaadressi räsiga %{target}"
+        create_custom_emoji_html: "%{name} laadis üles uue emotikoni %{target}"
+        create_domain_allow_html: "%{name} lubas föderatsiooni domeeniga %{target}"
+        create_domain_block_html: "%{name} keelas domeeni %{target}"
+        create_email_domain_block_html: "%{name} keelas e-posti domeeni %{target}"
+        create_ip_block_html: "%{name} lõi IP-aadressile %{target} reegli"
+        create_unavailable_domain_html: "%{name} lõpetas edastamise domeeni %{target}"
+        create_user_role_html: "%{name} lõi rolli %{target}"
+        demote_user_html: "%{name} alandas kasutajat %{target}"
+        destroy_announcement_html: "%{name} kustutas teadaande %{target}"
+        destroy_canonical_email_block_html: "%{name} lubas e-postiaaadressi räsiga %{target}"
+        destroy_custom_emoji_html: "%{name} kustutas emotikoni %{target}"
+        destroy_domain_allow_html: "%{name} keelas föderatsiooni domeeniga %{target}"
+        destroy_domain_block_html: "%{name} lubas domeeni %{target}"
+        destroy_email_domain_block_html: "%{name} lubas e-posti domeeni %{target}"
+        destroy_instance_html: "%{name} kustutas domeeni %{target}"
+        destroy_ip_block_html: "%{name} kustutas IP-aadressi %{target} reegli"
+        destroy_status_html: "%{name} kustutas %{target} postituse"
+        destroy_unavailable_domain_html: "%{name} taastas edastamise domeeni %{target}"
+        destroy_user_role_html: "%{name} kustutas %{target} rolli"
+        disable_2fa_user_html: "%{name} eemaldas kasutaja %{target} kahe etapise nõude"
+        disable_custom_emoji_html: "%{name} keelas emotikooni %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} keelas kasutajal %{target} e-posti võtmega autentida"
+        disable_user_html: "%{name} keelas %{target} sisenemise"
+        enable_custom_emoji_html: "%{name} lubas emotikooni %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} lubas kasutajal %{target} e-posti võtmega autentida"
+        enable_user_html: "%{name} lubas %{target} sisenemise"
+        memorialize_account_html: "%{name} märkis %{target} igaveselt lahkunuks"
+        promote_user_html: "%{name} ülendas kasutajat %{target}"
+        reject_appeal_html: "%{name} lükkas %{target} modereerimisotsuse kaebuse tagasi"
+        reject_user_html: "%{name} lükkas %{target} liitumissoovi tagasi"
+        remove_avatar_user_html: "%{name} eemaldas %{target} avatari"
+        reopen_report_html: "%{name} taasavas raporti %{target}"
+        resend_user_html: "%{name} saatis %{target} e-postiaadressi kinnituskirja"
+        reset_password_user_html: "%{name} lähtestas %{target} salasõna"
+        resolve_report_html: "%{name} lahendas raporti %{target}"
+        sensitive_account_html: "%{name} märkis %{target} meedia kui tundlik sisu"
+        silence_account_html: "%{name} piiras %{target} konto"
+        suspend_account_html: "%{name} kustutas %{target} konto"
+        unassigned_report_html: "%{name} tühistas raporti %{target} määrangu"
+        unblock_email_account_html: "%{name} lubas %{target} e-postiaadressi"
+        unsensitive_account_html: "%{name} eemaldas %{target} meedia tundliku sisu märke"
+        unsilence_account_html: "%{name} eemaldas %{target} konto piirangu"
+        unsuspend_account_html: "%{name} taastas %{target} konto"
+        update_announcement_html: "%{name} uuendas teadaannet %{target}"
+        update_custom_emoji_html: "%{name} uuendas emotikoni %{target}"
+        update_domain_block_html: "%{name} uuendas domeeni %{target} keeldu"
+        update_ip_block_html: "%{name} muutis IP-aadressi %{target} reeglit"
+        update_status_html: "%{name} muutis %{target} postitust"
+        update_user_role_html: "%{name} muutis %{target} rolli"
+      deleted_account: kustutatud konto
       empty: Logisi ei leitud.
       filter_by_action: Filtreeri tegevuse järgi
       filter_by_user: Filtreeri kasutaja järgi
@@ -235,16 +293,18 @@ et:
     announcements:
       destroyed_msg: Teadaande kustutamine õnnestus!
       edit:
-        title: Redigeeri teadaannet
+        title: Teate muutmine
       empty: Teadaandeid ei leitud.
       live: Avaldatud
       new:
         create: Loo teadaanne
         title: Uus teadaanne
+      publish: Postita
       published_msg: Teadaande avaldamine õnnestus!
       scheduled_for: Kavandatud ajaks %{time}
       scheduled_msg: Teadaanne kavandatud avaldamiseks!
       title: Teadaanded
+      unpublish: Tühista avaldamine
       unpublished_msg: Teadaande eemaldamine avalikkusest õnnestus!
       updated_msg: Teadaande uuendamine õnnestus!
     custom_emojis:
@@ -264,11 +324,12 @@ et:
       enable: Luba
       enabled: Lubatud
       enabled_msg: Selle emotikoni lubamine õnnestus
-      image_hint: PNG kuni 50KB
+      image_hint: PNG või GIF suurusega kuni %{size}
       list: Loend
       listed: Nimekirjastatud
       new:
         title: Lisa uus emotikon
+      no_emoji_selected: Emotikone ei muudetud, kuna ühtegi polnud valitud
       not_permitted: Teil puudub õigus selle tegevuse jaoks
       overwrite: Kirjuta üle
       shortcode: Lühikood
@@ -281,33 +342,65 @@ et:
       updated_msg: Emotikoni uuendamine õnnestus!
       upload: Lae üles
     dashboard:
+      active_users: aktiivsed kasutajad
+      interactions: interaktsioonid
+      media_storage: Meedia hoidla
+      new_users: uued kasutajad
+      opened_reports: avatud raportit
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> ootel vaidlustus"
+        other: "<strong>%{count}</strong> ootel vaidlustust"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> ootel raport"
+        other: "<strong>%{count}</strong> ootel raportit"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> ootel silt"
+        other: "<strong>%{count}</strong> ootel silti"
+      pending_users_html:
+        one: "<strong>%{count}</strong> ootel kasutaja"
+        other: "<strong>%{count}</strong> ootel kasutajat"
+      resolved_reports: lahendatud raportit
       software: Tarkvara
+      sources: Liitumise allikad
       space: Kettakasutus
       title: Töölaud
+      top_languages: Kasutatumad keeled
+      top_servers: Aktiivseimad serverid
+      website: Veebileht
+    disputes:
+      appeals:
+        empty: Vaidlustusi pole.
+        title: Vaidlustused
     domain_allows:
       add_new: Luba domeen
       created_msg: Domeeni lubamine õnnestus
       destroyed_msg: Domeen eemaldati lubatute nimekirjast
+      export: Eksport
+      import: Import
       undo: Eemalda lubatute nimekirjast
     domain_blocks:
       add_new: Lisa uus domeeniblokeering
       created_msg: Domeeni blokeeringut töödeldakse
       destroyed_msg: Domeeniblokeering on tagasi võetud
       domain: Domeen
-      edit: Redigeeri domeeniblokeeringut
+      edit: Muuda domeeniblokeeringut
+      existing_domain_block: Kasutajale %{name} on juba karmimad piirangud kehtestatud.
       existing_domain_block_html: Te olete juba lisanud domeenile %{name} piiranguid, palun <a href="%{unblock_url}">eemaldage blokeering</a> enne jätkamist.
+      export: Eksport
+      import: Import
       new:
         create: Loo blokeering
         hint: Domeeniblokeering ei takista kontode lisamist andmebaasi, aga lisab nendele kontodele tagasiulatuvalt ja automaatselt erinevaid moderatsioonimeetodeid.
         severity:
-          desc_html: |-
-            <strong>Vaigista</strong> teeb konto postitused nähtamatuks kõigile, kes teda ei jälgi.
-            <strong>Peata</strong> eemaldab kogu konto sisu, meedia ja profiiliandmed.
-            <strong>Ei midagi</strong> kui Te soovite lihtsalt keelata meediafailid.
+          desc_html: "<strong>Piira</strong> muudab domeeni kasutajate postitused mittejälgijatele nähtamatuks.<strong>Kustuta</strong> eemaldab serverist kõik selle domeeni kontode sisu, meedia ja kasutajaandmed. <strong>Ei midagi</strong> lihtsalt lükkab meediafailid tagasi."
           noop: Ei midagi
-          silence: Vaigista
-          suspend: Peata
+          silence: Piira
+          suspend: Kustuta
         title: Uus domeeniblokeering
+      no_domain_block_selected: Ühtegi domeeni keeldu ei muudetud, kuna midagi polnud valitud
+      not_permitted: Puudub õigus seda teha
+      obfuscate: Domeeninime varjamine
+      obfuscate_hint: Varja osaliselt domeeni nimi nimekirjas, kui domeenipiirangute nimistu avaldamine on sisse lülitatud
       private_comment: Privaatne kommentaar
       private_comment_hint: Kommenteeri selle domeeni limiteerimise kohta moderaatoritele.
       public_comment: Avalik kommentaar
@@ -316,78 +409,156 @@ et:
       reject_media_hint: Kustutab kohalikult salvestatud meediafailid ja keeldub tulevikus rohkem allalaadimast. Ei puuduta peatamisi
       reject_reports: Lükka teavitused tagasi
       reject_reports_hint: Eira kõik teavitused sellelt domeenilt. Ei puuduta peatamisi
-      rejecting_media: keelan meediafaile
-      rejecting_reports: keelan teavitusi
-      severity:
-        silence: vaigistatud
-        suspend: peatatud
-      show:
-        affected_accounts:
-          one: Üks kasutaja andmebaasis mõjutatud
-          other: "%{count} kasutajat andmebaasis mõjutatud"
-        retroactive:
-          silence: Eemalda vaigistus mõjutatud kasutajatelt sellel domeenil
-          suspend: Lõpeta mõjutatud kasutajate peatamine sellel domeenil
-        title: Eemalda domeeniblokeering %{domain}
-        undo: Võta tagasi
       undo: Võta tagasi domeeniblokeering
       view: Vaata domeeniblokeeringut
     email_domain_blocks:
       add_new: Lisa uus
+      attempts_over_week:
+        one: "%{count} katse viimase nädala kestel"
+        other: "%{count} liitumiskatset viimase nädala kestel"
       created_msg: E-posti aadressi keelunimekirja lisamine õnnestus
       delete: Kustuta
-      destroyed_msg: E-posti aadressi keelunimekirjast kustutamine õnnestus
+      dns:
+        types:
+          mx: MX-kirje
       domain: Domeen
-      empty: Ühtegi e-postidomeeni pole blokeeritud.
-      from_html: "%{domain}-ist"
       new:
         create: Lisa domeen
+        resolve: Domeeni lahendamine
         title: Uus e-posti keelunimekirja sisend
+      no_email_domain_block_selected: Ühtegi e-posti domeeni keeldu ei muudetud, kuna midagi polnud valitud
+      resolved_dns_records_hint_html: Domeeninimi lahendub järgnevateks MX-domeenideks, mis vastutavad e-kirjade vastuvõtmise eest. MX-domeeni blokeerimine blokeerib liitumistaotlused kõigilt e-postiaadressidelt, mis kasutavad sama MX-domeeni, kuigi kasutatav domeeninimi on erinev. <strong>Ole tähelepanelik, et mitte blokeerida suuremaid e-postiteenuse pakkujaid.</strong>
+      resolved_through_html: Lahendatud %{domain} kaudu
       title: E-posti keelunimekiri
+    export_domain_allows:
+      new:
+        title: Lubatud domeenide import
+      no_file: Faili pole valitud
+    export_domain_blocks:
+      import:
+        description_html: Oled importimas domeenide keelde. Vaata see nimekiri hoolega läbi, eriti, kui pole seda ise koostanud.
+        existing_relationships_warning: Olemasolevad jälgimissuhted
+        private_comment_description_html: 'Pidamaks järge, kust imporditud keelud pärinevad, luuakse need järneva privaatse kommentaariga: <q>%{comment}</q>'
+        private_comment_template: Imporditud allikast %{source} kuupäeval %{date}
+        title: Domeenikeeldude import
+      new:
+        title: Domeenikeeldude import
+      no_file: Faili pole valitud
+    follow_recommendations:
+      description_html: "<strong>Jälgimissoovitused aitavad uutel kasutajatel kiirelt leida huvipakkuvat sisu</strong>. Kui kasutaja pole teistega piisavalt läbi käinud, et kujuneks personaalsed soovitused, soovitatakse neid kontosid. Need arvutatakse ümber igapäevaselt populaarseimate postituste ja enim jälgitavate kontode seast antud keeles."
+      language: Keel
+      status: Olek
+      suppress: Eemalda jälgimissoovitus
+      suppressed: Eemaldatud
+      title: Jälgimissoovitused
+      unsuppress: Taasta jälgimissoovitused
     instances:
+      availability:
+        description_html:
+          one: Kui domeenile edastamine nurjub <strong>%{count} päeval</strong>, siis ei tehta enam edastamiskatseid, välja arvatud juhul, kui domeenilt <em>võetakse vastu</em> saadetis.
+          other: Kui domeenile edastamine nurjub <strong>%{count} erineval päeval</strong>, siis ei tehta enam edastamiskatseid, välja arvatud juhul, kui domeenilt <em>võetakse vastu</em> saadetis.
+        failure_threshold_reached: Nurjumispiir saavutatud %{date}.
+        failures_recorded:
+          one: Nurjunud katse %{count} päeval.
+          other: Nurjunud katsed %{count} päeval.
+        no_failures_recorded: Nurjumisi pole.
+        title: Saadavus
+        warning: Viimane ühenduskatse selle serveriga ebaõnnestus
+      back_to_all: Kõik
+      back_to_limited: Piiratud
+      back_to_warning: Hoiatus
       by_domain: Domeen
+      confirm_purge: Kindel, et selle domeeni andmed kustutada jäädavalt?
+      content_policies:
+        comment: Sisemine märge
+        description_html: On võimalik kirjeldada sisureeglid kõigile kontodele sellelt domeenilt ja alamdomeenidelt.
+        policies:
+          reject_media: Meedia hülgamine
+          reject_reports: Lükka raportid tagasi
+          silence: Vaigista
+          suspend: Kustuta
+        policy: Reegel
+        reason: Avalik põhjendus
+        title: Sisureeglid
+      dashboard:
+        instance_accounts_dimension: Enim jälgitud kontod
+        instance_accounts_measure: talletatud kontod
+        instance_followers_measure: meie jälgiad seal
+        instance_follows_measure: nende jälgijad siin
+        instance_languages_dimension: Top keeled
+        instance_media_attachments_measure: talletatud meedialisandid
+        instance_reports_measure: raportid nende kohta
+        instance_statuses_measure: salvestatud postitused
+      delivery:
+        all: Kõik
+        clear: Kustuta edastustõrked
+        failing: Nurjuv
+        restart: Taaskäivita edastus
+        stop: Peata edastus
+        unavailable: Pole saadaval
       delivery_available: Üleandmine on saadaval
+      delivery_error_days: Edastustõrgete päevad
+      delivery_error_hint: Kui edastus pole võimalik %{count} päeva, märgitakse automaatselt edastamatuks.
+      destroyed_msg: Domeeni %{domain} andmed on märgitud lõplikuks kustutamiseks.
+      empty: Domeene ei leidu.
       known_accounts:
-        one: "%{count} teadaolev kasutaja"
-        other: "%{count} teadaolevat kasutajat"
+        one: "%{count} teada konto"
+        other: "%{count} teada kontot"
       moderation:
         all: Kõik
         limited: Piiratud
-        title: Moderatsioon
+        title: Modereerimine
       private_comment: Privaatne kommentaar
       public_comment: Avalik kommentaar
-      title: Föderatsioon
+      purge: Kustuta
+      purge_description_html: Kui on arvata, et domeen on lõplikult kadunud, on võimalik kustutada kõik siin talletatud kontode kirjed ja seotud andmed. See võib aega võtta.
+      title: Födereerumine
       total_blocked_by_us: Meie poolt blokeeritud
       total_followed_by_them: Nende poolt jälgitud
       total_followed_by_us: Meie poolt jälgitud
       total_reported: Nende kohta teateid
       total_storage: Lisatud meedia
+      totals_time_period_hint_html: Allpool kuvatud summad sisaldavad andmed kogu aja kohta.
     invites:
       deactivate_all: Peata kõik
       filter:
         all: Kõik
         available: Saadaval
         expired: Aegunud
+        title: Filter
       title: Kutsed
-    pending_accounts:
-      title: Ootel olevad kasutajad (%{count})
+    ip_blocks:
+      add_new: Loo reegel
+      created_msg: IP-aadressi põhine reegel lisatud
+      delete: Kustuta
+      expires_in:
+        '1209600': 2 nädalat
+        '15778476': 6 kuud
+        '2629746': 1 kuu
+        '31556952': 1 aasta
+        '86400': 1 päev
+        '94670856': 3 aastat
+      new:
+        title: Uue IP-reegli lisamine
+      no_ip_block_selected: Ühtegi IP-reeglit ei muudetud, kuna midagi polnud valitud
+      title: IP-reeglid
     relationships:
       title: "%{acct}-i suhted"
     relays:
       add_new: Lisa uus relee
       delete: Kustuta
-      description_html: "<strong>Föderatsiooni relee</strong> on vahepealne server, mis vahetab suures koguses tuututusi serverite vahel, mis on selle tellijad ning mis sellele saadavad. <strong>See aitab väikestel ja keskmistel serveritel avastada sisu fediversumist</strong>, mis tavaliselt nõuab teisel serveril olevate inimeste jälgimist."
+      description_html: "<strong>Födereerumisrelee</strong> on vahendav server, mis kannab üle suures koguses avalikke postitusi nende serverite vahel, mis on sellega liitunud ja edastavad sellele oma postitusi. <strong>See aitab väikestel ja keskmistel serveritel avastada födiversumi sellist sisu</strong>, mis muidu eeldaks kohalikelt kasutajatelt nende serverite kasutajate jälgitavaks märkimist."
       disable: Keela
       disabled: Keelatud
       enable: Luba
-      enable_hint: Kui lubatud, siis Teie server tellib kõik avalikud tuututused sellelt releelt ning hakkab ka enda avalikke tuututusi sellele saatma.
+      enable_hint: Kui lubatud, siis server tellib kõik avalikud postitused sellelt releelt ning hakkab ka enda avalikke postitusi sellele saatma.
       enabled: Lubatud
       inbox_url: Relee URL
       pending: Ootab relee nõusolekut
       save_and_enable: Salvesta ja luba
       setup: Sea üles releeühendus
       signatures_not_enabled: Releed ei tööta korrektselt kuniks turvarežiim või lubatud nimekirja režiim on sisse lülitatud
-      status: Staatus
+      status: Olek
       title: Releed
     report_notes:
       created_msg: Teade edukalt koostatud!
@@ -397,161 +568,324 @@ et:
         notes:
           one: "%{count} märkus"
           other: "%{count} märkust"
-        reports:
-          one: "%{count} teavitus"
-          other: "%{count} teavitust"
+      action_log: Auditilogi
       action_taken_by: Meetmeid kasutanud
-      are_you_sure: Olete kindel?
+      actions:
+        delete_description_html: Raporteeritud postitused kustutatakse ja juhtum talletatakse hoiatusena tulevaste eksimuste ärahoidmiseks.
+        mark_as_sensitive_description_html: Raporteeritud meedia märgitakse kui tundlik sisu ja juhtum talletatakse hoiatusena tulevaste eksimuste ärahoidmiseks.
+        other_description_html: On rohkem valikuid konto käitumise juhtimiseks ja suhtluse kohandamiseks raporteeritud kontoga.
+        resolve_description_html: Raporteeritud konto suhtes ei võeta midagi ette, juhtumit ei registreerita ja raport suletakse.
+        silence_description_html: Profiil on nähtav ainult neile, kes seda juba jälgivad või otsivad seda käsitsi, piirates sellega tõsiselt selle leitavust. Saab alati tagasi võtta.
+        suspend_description_html: Konto ja kogu sisu muutub lõpliku kustutamiseni kättesaamatuks. Kontoga suhtlemine pole võimalik. Tagasivõetav 30 päeva jooksul.
+      actions_description_html: Otsustus, mida raporti lahendamiseks ette võtta. Karistava tegevuse korral saadetakse e-postiga teade, välja arvatud kategooria <strong>rämpspost</strong> puhul.
+      add_to_report: Lisa raportile juurde
+      are_you_sure: Oled kindel?
       assign_to_self: Määra mulle
       assigned: Määratud moderaator
+      by_target_domain: Teavitatud konto domeen
+      category: Kategooria
+      category_description_html: Põhjus, miks sellest kontost ja/või sisust teatati, kaasatakse raporteeritud kontoga suhtlemisel
       comment:
         none: Pole
+      comment_description_html: 'Täiendava infona kirjutas %{name}:'
       created_at: Teavitatud
+      delete_and_resolve: Kustuta postitused
+      forwarded: Edastatud
+      forwarded_to: Edastatud domeenile %{domain}
       mark_as_resolved: Märgi lahendatuks
+      mark_as_sensitive: Märgi kui tundlik sisu
       mark_as_unresolved: Märgi lahendamata
+      no_one_assigned: Eikeegi
       notes:
         create: Lisa märkus
         create_and_resolve: Lahenda märkusega
         create_and_unresolve: Taasava märkusega
         delete: Kustuta
         placeholder: Kirjelda, mis on ette võetud või muid seotud uuendusi...
+        title: Märkmed
+      notes_description_html: Märkmete vaatamine ja jätmine teistele moderaatoritele ja tulevikuks endale
+      quick_actions_description_html: 'Võimalus teha kiire otsus või näha raporteeritud sisu allpool:'
+      remote_user_placeholder: kaugkasutaja domeenist %{instance}
       reopen: Taasava teavitus
       report: 'Teavitus #%{id}'
       reported_account: Teavitatud kontost
-      reported_by: Teavitatud
+      reported_by: Teavitaja
       resolved: Lahendatud
       resolved_msg: Teavituse lahendamine õnnestus!
-      status: Staatus
-      target_domain: Teavitatud konto domeen
+      skip_to_actions: Otsuste juurde
+      status: Olek
+      statuses: Raporteeritud sisu
+      statuses_description_html: Sobimatu sisu kaasatakse suhtlusse raporteeritud kontoga
+      target_origin: Raporteeritud konto päritolu
       title: Teavitused
       unassign: Eemalda määramine
       unresolved: Lahendamata
       updated_at: Uuendatud
+      view_profile: Vaata profiili
+    roles:
+      add_new: Lisa roll
+      assigned_users:
+        one: "%{count} kasutaja"
+        other: "%{count} kasutajat"
+      categories:
+        administration: Haldamine
+        devops: DevOps
+        invites: Kutsed
+        moderation: Modereerimine
+        special: Eriline
+      delete: Kustuta
+      description_html: "<strong>Kasutajarollide</strong> abil saab kohandada, millistele Mastodoni funktsioonidele ja piirkondadele kasutajad ligi pääsevad."
+      edit: Muuda '%{name}' rolli
+      everyone: Vaikimisi load
+      everyone_full_description_html: See on <strong>baasroll</strong> mõjudes <strong>kõigile kasutajatele</strong>, ka määramata rolliga. Kõik teised rollid pärivad selle rolli õigused.
+      permissions_count:
+        one: "%{count} õigus"
+        other: "%{count} õigused"
+      privileges:
+        administrator: Administraator
+        administrator_description: Selle loaga kasutajad võivad mööda pääseda kõigist lubadest
+        delete_user_data: Kustuta kasutaja andmed
+        delete_user_data_description: Lubab kasutajatel kustutada teiste kasutajate andmeid viiteta
+        invite_users: Kutsu kasutajaid
+        invite_users_description: Lubab kasutajatel serverisse uusi inimesi kutsuda
+        manage_announcements: Halda teadaandeid
+        manage_announcements_description: Lubab kasutajatel hallata serveri teadaandeid
+        manage_appeals: Vaidlustuste haldamine
+        manage_appeals_description: Lubab kasutajail läbi vaadata modereerimisotsuste vaidlustusi
+        manage_blocks: Keeldude haldamine
+        manage_blocks_description: Lubab kasutajatel keelata e-postiteenuse pakkujaid ja IP-aadresse
+        manage_custom_emojis: Halda isetehtud emotikone
+        manage_custom_emojis_description: Lubab kasutajatel hallata serveris isetehtud emotikone
+        manage_federation: Halda födereerumist
+        manage_federation_description: Lubab kasutajail keelata või lubada föderatsioone teiste domeenidega ja hallata ühenduvust
+        manage_invites: Halda kutseid
+        manage_invites_description: Lubab kasutajatel kutseid lehitseda ja sulgeda
+        manage_reports: Halda raporteid
+        manage_reports_description: Lubab kasutajail läbi vaadata ja viia läbi modereerimisotsuseid
+        manage_roles: Rollide haldamine
+        manage_roles_description: Lubab kasutajatel hallata ja määrata endast madalamaid rolle
+        manage_rules: Reeglite haldamine
+        manage_rules_description: Lubab kasutajatel muuta serveri reegleid
+        manage_settings: Halda sätteid
+        manage_settings_description: Lubab kasutajatel muute lehekülje sätteid
+        manage_taxonomies: Halda taksonoomiaid
+        manage_taxonomies_description: Luba kasutajatel populaarset sisu üle vaadata ning uuendada siltide sätteid
+        manage_user_access: Halda kasutaja ligipääsu
+        manage_user_access_description: Lubab kasutajail eemaldada teiste kahe-etapise autentimise nõude, muuta nende e-postiaadresse ja lähtestada salasõnu
+        manage_users: Kasutajate haldamine
+        manage_users_description: Lubab kasutajail näha teiste kasutajate detailandmeid ja teha modereerimisotsuseid
+        manage_webhooks: Halda webhook'e
+        manage_webhooks_description: Lubab kasutajatel administratiivseteks sündmusteks webhook'e seadistada
+        view_audit_log: Auditilogi vaatamine
+        view_audit_log_description: Lubab kasutajail näha serveri administratiivsete otsuste ajalugu
+        view_dashboard: Vaata töölauda
+        view_dashboard_description: Lubab kasutajail pääseda ligi töölauale ja erinevale meetrikale
+        view_devops: DevOps
+        view_devops_description: Lubab kasutajail ligipääsu Sidekiq ja pgHero töölaudadele
+      title: Rollid
+    rules:
+      add_new: Lisa reegel
+      delete: Kustuta
+      description_html: Kuigi enamik väidab, et on teenusetingimused läbi lugenud ja nõustub nendega, loevad inimesed tavaliselt need läbi alles pärast probleemi tekkimist. <strong>Hõlbustage oma serveri reeglite ühe pilguga nägemist, esitades need lihtsa täpploendina.</strong> Püüdke hoida üksikud reeglid lühikesed ja lihtsad, kuid ärge jagage neid ka paljudeks eraldi üksusteks.
+      edit: Reegli muutmine
+      empty: Serveri reegleid pole veel defineeritud.
+      title: Serveri reeglid
     settings:
-      activity_api_enabled:
-        desc_html: Kohalike postituste, aktiivsete kasutajate ja uute registreerimiste numbrid iganädalaste "ämbritena"
-        title: Avalda koondstatistikat selle kasutaja aktiivsusest
-      bootstrap_timeline_accounts:
-        desc_html: Eralda mitut kasutajanime komadega. Ainult kohalikud ja lukustamata kasutajate nimed töötavad. Kui tühi, on vaikesätteks kõik kohalikud administraatorid.
-        title: Vaikimisi jälgimised uutele kasutajatele
-      contact_information:
-        email: Äri e-post
-        username: Kontakt kasutajanimi
-      custom_css:
-        desc_html: Muuda kujundust CSSi abil, mis laetakse igal lehel
-        title: Kohandatud CSS
+      about:
+        manage_rules: Halda serveri reegleid
+        preamble: Täpsem kirjeldus, kuidas serverit käitatakse, modereeritakse ja rahastatakse.
+        rules_hint: Reeglitele, millega kasutajad peavad nõustuma, on vastav piirkond.
+        title: Teave
+      appearance:
+        preamble: Kohanda Mastodoni veebiliidest.
+        title: Välimus
+      branding:
+        preamble: Serveri bränding eristab seda teistest serveritest võrgus. Seda teavet võidakse kuvada erinevates keskkondades, näiteks Mastodoni veebiliideses, rakendustes, viitade eelvaadetes teistel veebisaitidel, sõnumsiderakendustes jne. Sel põhjusel on kõige parem hoida see teave selge, lühike ja ülevaatlik.
+        title: Märgistus
+      content_retention:
+        preamble: Juhi kuidas kasutajate loodud sisu Mastodon'is talletatakse.
+        title: Sisu talletamine
       default_noindex:
-        desc_html: Mõjutab kõiki kasutajaid, kes pole seda sätet ise muutnud
-        title: Loobu kasutajate otsingumootoritesse indekseerimisest vaikimisi
+        desc_html: Mõjub kasutajatele, kes pole seda sätet ise muutnud
+        title: Otsimootorite indeksitesse kasutajaid vaikimisi ei lisata
+      discovery:
+        follow_recommendations: Jälgi soovitusi
+        preamble: Huvitava sisu esiletoomine on oluline uute kasutajate kaasamisel, kes ei pruugi Mastodonist kedagi tunda. Kontrolli, kuidas erinevad avastamisfunktsioonid serveris töötavad.
+        profile_directory: Kasutajate kataloog
+        public_timelines: Avalikud ajajooned
+        title: Avastamine
+        trends: Trendid
       domain_blocks:
         all: Kõigile
         disabled: Mitte kellelegi
-        title: Näita domeeniblokeeringuid
         users: Sisseloginud kohalikele kasutajatele
-      domain_blocks_rationale:
-        title: Näita põhjendust
-      hero:
-        desc_html: Kuvatud kodulehel. Vähemalt 600x100px soovitatud. Kui pole seadistatud, kuvatakse serveri pisililt
-        title: Maskotipilt
-      mascot:
-        desc_html: Kuvatakse mitmel lehel. Vähemalt 293x205px soovitatud. Kui pole seadistatud, kuvatakse vaikimisi maskott
-        title: Maskotipilt
-      peers_api_enabled:
-        desc_html: Domeenid, mida see server on kohanud fediversumis
-        title: Avalda nimekiri avastatud serveritest
-      preview_sensitive_media:
-        desc_html: Lingi eelvaated teistel veebisaitidel kuvab pisipilti, isegi kui meedia on märgitud tundlikuks
-        title: Kuva tundlikku meediat OpenGraphi eelvaadetes
-      profile_directory:
-        desc_html: Luba kasutajate avastamine
-        title: Luba profiilikataloog
       registrations:
-        closed_message:
-          desc_html: Kuvatud esilehel kui registreerimised on suletud. Te võite kasutada HTMLi silte
-          title: Suletud registreerimiste sõnum
-        deletion:
-          desc_html: Luba kasutajatel oma konto kustutada
-          title: Ava kontode kustutamine
-        min_invite_role:
-          disabled: Mitte keegi
-          title: Luba kutseid
+        preamble: Kes saab serveril konto luua.
+        title: Registreerimised
       registrations_mode:
         modes:
           approved: Kinnitus vajalik konto loomisel
           none: Keegi ei saa kontoid luua
           open: Kõik võivad kontoid luua
-        title: Registreerimisrežiim
-      show_known_fediverse_at_about_page:
-        desc_html: Kui lubatud, näitab kõiki teatud fediversumi tuututusi. Vastasel juhul näidatakse ainult kohalike tuututusi.
-        title: Näita teatud fediversumit ajajoone eelvaates
-      show_staff_badge:
-        desc_html: Näita personalimärki kasutaja profiilil
-        title: Näita personalimärki
-      site_description:
-        desc_html: Sissejuhatuslik lõik API kohta. Kirjelda, mis teeb selle Mastodoni serveri eriliseks ja ka muud tähtsat. Te saate kasutada HTMLi silte, peamiselt <code>&lt;a&gt;</code> ja <code>&lt;em&gt;</code>.
-        title: Serveri kirjeldus
-      site_description_extended:
-        desc_html: Hea koht käitumisreegliteks, reegliteks, suunisteks ja muuks, mis teevad Teie serveri eriliseks. Te saate kasutada HTML silte
-        title: Lisa informatsioon
-      site_short_description:
-        desc_html: Kuvatud küljeribal ja metasiltides. Kirjelda, mis on Mastodon ja mis on selles serveris erilist ühes lõigus.
-        title: Serveri lühikirjeldus
-      site_terms:
-        desc_html: Te saate kirjutada oma privaatsuspoliitika, kasutustingimused jm seaduslikku infot. Te saate kasutada HTMLi silte
-        title: Kasutustingimused
-      site_title: Serveri nimi
-      thumbnail:
-        desc_html: Kasutatud OpenGraph ja API eelvaadeteks. 1200x630px soovitatud
-        title: Serveri pisipilt
-      timeline_preview:
-        desc_html: Kuva avalikku ajajoont esilehel
-        title: Ajajoone eelvaade
-      title: Lehe seaded
-      trendable_by_default:
-        desc_html: Puudutab silte, mis pole varem keelatud
-        title: Luba siltide trendimine ilma eelneva ülevaatuseta
-      trends:
-        desc_html: Kuva avalikult eelnevalt üle vaadatud sildid, mis on praegu trendikad
-        title: Populaarsed sildid praegu
+      title: Serveri seadistused
     site_uploads:
       delete: Kustuta üleslaetud fail
       destroyed_msg: Üleslaetud fail edukalt kustutatud!
     statuses:
+      account: Autor
+      application: Rakendus
       back_to_account: Tagasi konto lehele
+      back_to_report: Tagasi raporti lehele
       batch:
-        delete: Kustuta
-        nsfw_off: Märgi kui mitte tundlik
-        nsfw_on: Märgi kui tundlik
+        remove_from_report: Eemalda raportist
+        report: Raport
       deleted: Kustutatud
-      failed_to_execute: Täitmine ebaõnnestus
+      favourites: Lemmikud
+      history: Versiooniajalugu
+      in_reply_to: Vastusena
+      language: Keel
       media:
         title: Meedia
-      no_media: Meedia puudub
-      no_status_selected: Mitte ühtegi staatust muudeti sest midagi polnud valitud
-      title: Konto staatused
+      metadata: Metaandmed
+      no_status_selected: Ühtegi postitust ei muudetud, sest ühtegi polnud valitud
+      open: Ava postitus
+      original_status: Algne postitus
+      reblogs: Jagamised
+      status_changed: Muudetud postitus
+      title: Konto postitused
+      trending: Populaarne
+      visibility: Nähtavus
       with_media: Meediaga
+    strikes:
+      actions:
+        delete_statuses: "%{name} kustutas %{target} postitused"
+        disable: "%{name} külmutas %{target} konto"
+        mark_statuses_as_sensitive: "%{name} märkis %{target} postitused tundlikena"
+        none: "%{name} saatis hoiatuse kasutajale %{target}"
+        sensitive: "%{name} märkis %{target} konto kui tundlik sisu"
+        silence: "%{name} piiras %{target} konto"
+        suspend: "%{name} kustutas %{target} konto"
+      appeal_approved: Vaidlustatud
+      appeal_pending: Vaidlustus on ootel
+    system_checks:
+      database_schema_check:
+        message_html: On ootel andmebaasi migreerimisi. Rakenduse ootuspäraseks toimimiseks palun käivita need
+      elasticsearch_running_check:
+        message_html: Elasticsearch ei vasta. Kontrolli, kas see töötab või keela täistekstiotsing
+      elasticsearch_version_check:
+        message_html: 'Elasticsearch versioon ei sobi: %{value}'
+        version_comparison: Elasticsearch %{running_version} töötab, aga nõutud on %{required_version}
+      rules_check:
+        action: Halda serveri reegleid
+        message_html: Serverireegleid pole defineeritud.
+      sidekiq_process_check:
+        message_html: Ühtegi Sidekiq protsessi pole %{value} järjekorra jaoks. Sidekiq seadistus vajab üle vaatamist
     tags:
-      accounts_today: Unikaalseid kasutusi täna
-      accounts_week: Unikaalseid kasutusi see nädal
-      breakdown: Tänane kasutus allikate kohta
-      last_active: Viimati aktiivne
-      most_popular: Kõige populaarsemad
-      most_recent: Viimased
-      name: Silt
-      review: Staatuse ülevaade
-      reviewed: Ülevaadatud
-      title: Sildid
-      trending_right_now: Praegu populaarsed
-      unique_uses_today: "%{count} inimest postitavad täna"
-      unreviewed: Üle vaatamata
+      review: Vaata olek üle
       updated_msg: Sildi sätted edukalt uuendatud
     title: Administreerimine
+    trends:
+      allow: Luba
+      approved: Kinnitatud
+      disallow: Keela
+      links:
+        allow: Luba viit
+        allow_provider: Luba autor
+        description_html: Need on lingid, mida jagavad praegu paljud kontod, mille postitusi server näeb. See võib aidata kasutajatel teada saada, mis maailmas toimub. Ühtegi linki ei kuvata avalikult enne, kui avaldaja on heakskiidetud. Samuti saab üksikuid linke lubada või tagasi lükata.
+        disallow: Keela viit
+        disallow_provider: Keela autor
+        no_link_selected: Viitasid ei muudetud, kuna ühtegi polnud valitud
+        publishers:
+          no_publisher_selected: Avaldajaid ei muudetud, kuna ühtegi polnud valitud
+        shared_by_over_week:
+          one: Jagatud ühe kasutaja pool viimase nädala jooksul
+          other: Jagatud %{count} kasutaja poolt viimase nädala jooksul
+        title: Trendikad viited
+        usage_comparison: Jagatud %{today} korda täna, eile %{yesterday} korda
+      only_allowed: Ainult lubatud
+      pending_review: Ootab ülevaatust
+      preview_card_providers:
+        allowed: Viited kasutajalt ilmuvad trendides
+        description_html: Need on domeenid, mille linke serveris sageli jagatakse. Lingid ei muutu trendides avalikuks, kuni lingi domeen pole heaks kiidetud. Heakskiit (või tagasilükkamine) laieneb alamdomeenidele.
+        rejected: Kasutaja viited ei ilmu trendides
+        title: Kasutajad
+      rejected: Tagasi lükatud
+      statuses:
+        allow: Luba postitada
+        allow_account: Luba autor
+        description_html: Need on postitused, millest server teab ja mida praegu jagatakse ja mis on hetkel paljude lemmikud. See võib aidata uutel ja naasvatel kasutajatel leida rohkem inimesi, keda jälgida. Ühtegi postitust ei kuvata avalikult enne, kui autor on heaks kiidetud ja autor lubab oma kontot teistele soovitada. Samuti saab üksikuid postitusi lubada või tagasi lükata.
+        disallow: Ära luba postitada
+        disallow_account: Keela autor
+        no_status_selected: Trendikaid postitusi ei muudetud, kuna ükski polnud valitud
+        not_discoverable: Autor pole lubanud enda avastamist
+        shared_by:
+          one: Jagatud või meeldinud üks kord
+          other: Jagatud ja meeldinud %{friendly_count} korda
+        title: Trendikad postitused
+      tags:
+        current_score: Skoor praegu %{score}
+        dashboard:
+          tag_accounts_measure: unikaalset kasutajat
+          tag_languages_dimension: Populaarseimad keeled
+          tag_servers_dimension: Populaarseimad serverid
+          tag_servers_measure: erinevat serverit
+          tag_uses_measure: kasutajaid kokku
+        description_html: Need sildid ilmuvad praegu paljudes postitutes mida su server näeb. See võib aidata su kasutajatel leida seda millest kõige rohkem parajasti räägitakse. Ühtegi silti ei näidata avalikult, enne nende heaks kiitmist.
+        listable: Võib olla soovitatud
+        no_tag_selected: Silte ei muudetud, kuna ühtegi polnud valitud
+        not_listable: Ei soovitata
+        not_trendable: Ei ilmu trendides
+        not_usable: Ei saa kasutada
+        peaked_on_and_decaying: Populaarseim %{date}, nüüd langemas
+        title: Trendikad sildid
+        trendable: Võib ilmuda trendides
+        trending_rank: 'Trendides #%{rank}'
+        usable: Kasutatav
+        usage_comparison: Kasutatud %{today} korda täna, eile %{yesterday} korda
+        used_by_over_week:
+          one: Kasutatud ühe kasutaja pool viimase nädala jooksul
+          other: Kasutatud %{count} kasutaja poolt viimase nädala jooksul
+      title: Trendid
+      trending: Trendid
     warning_presets:
       add_new: Lisa uus
       delete: Kustuta
-      edit_preset: Redigeeri hoiatuse eelseadistust
+      edit_preset: Hoiatuse eelseadistuse muutmine
+      empty: Hoiatuste eelseadeid pole defineeritud.
       title: Halda hoiatuste eelseadistusi
+    webhooks:
+      add_new: Lisa lõpp-punkt
+      delete: Kustuta
+      description_html: "<strong>Veebihaak</strong> võimaldab Mastodonil edastada valitud sündmuste kohta su rakendusele <strong>reaalajas märguandeid</strong>, et rakendus saaks <strong>automaatselt reaktsioone käivitada</strong>."
+      disable: Keela
+      disabled: Keelatud
+      edit: Muuda lõpp-punkti
+      empty: Ühtegi veebikonksu lõpp-punkti pole veel seadistatud.
+      enable: Luba
+      enabled: Aktiivne
+      enabled_events:
+        one: 1 lubatud sündmus
+        other: "%{count} lubatud sündmust"
+      events: Sündmused
+      new: Uus veebikonks
+      rotate_secret: Salavõtme rotatsioon
+      secret: Salavõti allkirjastamiseks
+      status: Olek
+      title: Veebikonksud
+      webhook: Veebikonks
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: kustutada postitused
+        disable: kustutada konto
+        mark_statuses_as_sensitive: et märkida postitused kui tundlik sisu
+        none: hoiatus
+        sensitive: et märkida konto kui tundlik sisu
+        silence: piirata konto
+        suspend: et konto kustutada
+      body: "%{target} vaidlustab %{action_taken_by} modereerimisotsuse kuupäevaga %{date}: %{type}. Põhjendus:"
+      next_steps: Võid modereeringu tagasi pööramiseks vaidlustuse rahuldada, või ka mitte.
+      subject: "%{username} on vaidlustanud %{instance} modereerimisotsuse"
     new_pending_account:
       body: Uue konto üksikasjad on allpool. Te saate vastu võtta või tagasi lükata seda taotlust.
       subject: Uus konto valmis ülevaatluseks serveril %{instance} (%{username})
@@ -559,83 +893,109 @@ et:
       body: "%{reporter} teavitas kasutajast %{target}"
       body_remote: Keegi domeenist %{domain} teavitas kasutajast %{target}
       subject: Uus teavitus %{instance}-ile (#%{id})
-    new_trending_tag:
-      body: Silt %{name} on täna trendikas, aga pole eelnevalt üle vaadatud. Seda ei näidata avalikult, välja arvatud juhul, kui Te ise seda lubate või lihtsalt salvestage vorm nagu see on ning Te ei kuule sellest enam kunagi.
-      subject: Uus silt valmis ülevaatluseks serveril %{instance} (#%{name})
+    new_trends:
+      body: 'Järgmised üksused vajavad enne avalikustamist ülevaatust:'
+      new_trending_links:
+        title: Trendikad viited
+      new_trending_statuses:
+        title: Trendikad postitused
+      new_trending_tags:
+        no_approved_tags: Hetkel ei ole ühtegi heaks kiidetud populaarset silti.
+        requirements: 'Need on siltide kandidaadid mille hulgast ükskõik milline võib järjekorras mööda jõuda #%{rank} kohal olevast heaks kiidetud sildist. See on hetkel #%{lowest_tag_name} mille seis on %{lowest_tag_score}.'
+        title: Trendikad sildid
+      subject: Uued %{instance} trendid ülevaatuseks
   aliases:
-    add_new: Loo teine nimi
-    created_msg: Teine nimi on edukalt loodud. Te saate nüüd alustada kolimist vanalt kontolt.
+    add_new: Pane kolimiseks valmis
+    created_msg: Konto on valmis vastu võtma jälgijaid. Logi sisse oma vanale kontole ja käivita kolimine sealt.
     deleted_msg: Edukalt kustutasime teise nime. Kolimine sellelt kontolt praegusele on nüüdsest võimatu.
     empty: Teil puuduvad teised nimed.
-    hint_html: Kui Te soovite kolida teiselt kontolt praegusele kontole, saate Te siin luua teise nime, mis on kohustuslik, enne kui saate kolida jälgijaid vanalt kontolt praegusele. See tegevus on iseenesest <strong>kahjutu ja taastatav</strong>. <strong>Konto ületoomine alustatakse vanalt kontolt</strong>.
-    remove: Eemalda teine nimi
+    hint_html: Kui soovid konto siia üle kolida, pead esmalt siin määrama kolitava konto aadressi. Seejärel on konto valmis võtma vastu jälgijaid vanalt kontolt. Kolitava konto aadressi määramine on iseenesest <strong>kahjutu ja tagasipööratav</strong>. <strong>Jälgijate tegelik kolimine käivitatakse vanalt kontolt</strong>.
+    remove: Loobu suunamise vastuvõtmisest
   appearance:
-    advanced_web_interface: Arenenud veebiliides
-    advanced_web_interface_hint: 'Kui soovite kasutada terve ekraani laiust, lubab arenenud veebiliides seadistada mitut erinevat veergu, et näha nii palju informatsiooni samal ajal kui võimalik: Kodu, teavitused, föderatsiooni ajajoon ning mis iganes arv nimekirju ja silte.'
+    advanced_web_interface: Kohandatud veebiliides
+    advanced_web_interface_hint: 'Kui soovid kasutada kogu ekraani laiust, saab kohandatud veebiliideses seadistada mitut veergu, nii et samal ajal oleks näha nii palju infot kui soovid: Kodu, teavitused, föderatsiooni ajajoon ning kuitahes palju nimekirju ja silte.'
     animations_and_accessibility: Animatsioonid ja ligipääs
     confirmation_dialogs: Kinnitusdialoogid
-    discovery: Avastus
+    discovery: Avastamine
     localization:
-      body: Mastodon on tõlgitud vabatahtlike poolt.
-      guide_link_text: Igaüks võib panustada.
+      body: Mastodoni tõlgivad vabatahtlikud.
+      guide_link: https://crowdin.com/project/mastodon/et
+      guide_link_text: Panustada võib igaüks!
     sensitive_content: Tundlik sisu
-    toot_layout: Tuututuse kujundus
+    toot_layout: Postituse väljanägemine
   application_mailer:
     notification_preferences: Muuda e-kirjade eelistusi
+    salutation: "%{name}!"
     settings: 'Muuda e-kirjade eelistusi: %{link}'
     view: 'Vaade:'
     view_profile: Vaata profiili
-    view_status: Vaata staatust
+    view_status: Vaata postitust
   applications:
     created: Rakenduse loomine õnnestus
     destroyed: Rakenduse kustutamine õnnestus
-    invalid_url: Antud URL on vale
     regenerate_token: Loo uus access token
     token_regenerated: Access tokeni loomine õnnestus
-    warning: Olge nende andmetega ettevaatlikud. Ärge jagage neid kellegagi!
-    your_token: Teie access token
+    warning: Ole nende andmetega ettevaatlikud. Ära jaga neid kellegagi!
+    your_token: Su juurdepääsutunnus
   auth:
-    apply_for_account: Taotle kutse
+    apply_for_account: Konto taotluse esitamine
     change_password: Salasõna
-    checkbox_agreement_html: Ma nõustun <a href="%{rules_path}" target="_blank">serveri reeglitega</a> ja <a href="%{terms_path}" target="_blank">kasutustingimustega</a>
-    checkbox_agreement_without_rules_html: Ma nõustun <a href="%{terms_path}" target="_blank">kasutustingimustega</a>
-    delete_account: Kustuta konto
-    delete_account_html: Kui Te soovite oma kontot kustutada, võite <a href="%{path}">jätkata siit</a>. Teilt küsitakse kinnitust.
+    delete_account: Konto kustutamine
+    delete_account_html: Kui soovid oma konto kustutada, siis <a href="%{path}">jätka siit</a>. Pead kustutamise eraldi kinnitama.
     description:
       prefix_invited_by_user: "@%{name} kutsub Teid liituma selle Mastodoni serveriga!"
       prefix_sign_up: Loo Mastodoni konto juba täna!
       suffix: Kasutajakontoga saate jälgida inimesi, postitada uudiseid ning teha kirjavahetust üks kõik millisest Mastodoni serverist kasutajatega ja muud!
     didnt_get_confirmation: Ei saanud kinnituse juhendeid?
-    forgot_password: Unustasid oma salasõna?
+    dont_have_your_security_key: Pole turvavõtit?
+    forgot_password: Salasõna ununenud?
     invalid_reset_password_token: Salasõna lähtestusvõti on vale või aegunud. Palun taotle uus.
+    link_to_otp: Kahe-etapine kood telefonist või taastekood
+    link_to_webauth: Turvavõtmete seadme kasutamine
+    log_in_with: Sisene kasutades
     login: Logi sisse
     logout: Logi välja
-    migrate_account: Koli teisele kasutajale
-    migrate_account_html: Kui Te soovite seda kontot ümber viia teisele, <a href="%{path}">saate teha seda siit</a>.
+    migrate_account: Teisele kontole ära kolimine
+    migrate_account_html: Kui soovid selle konto siit ära kolida, <a href="%{path}">saad seda teha siin</a>.
     or_log_in_with: Või logi sisse koos
+    privacy_policy_agreement_html: Olen tutvunud <a href="%{privacy_policy_path}" target="_blank">isikuandmete kaitse põhimõtetega</a> ja nõustun nendega
+    providers:
+      cas: CAS
+      saml: SAML
     register: Loo konto
     registration_closed: "%{instance} ei võta vastu uusi liikmeid"
     resend_confirmation: Saada kinnitusjuhendid uuesti
-    reset_password: Lähtesta salasõna
+    reset_password: Salasõna lähtestamine
+    rules:
+      preamble: Neist kinnipidamist jälgivad %{domain} moderaatorid.
+      title: Mõned põhireeglid.
     security: Turvalisus
-    set_new_password: Määra uus salasõna
+    set_new_password: Uue salasõna määramine
     setup:
       email_below_hint_html: Kui allolev e-posti aadress on vale, saate Te muuta seda siin ning Teile saadetakse uus kinnituskiri.
       email_settings_hint_html: Kinnituskiri saadeti e-posti aadressile %{email}. Kui see aadress pole õige, saate Te muuta seda oma konto sätetest.
       title: Seadistamine
+    sign_in:
+      preamble_html: Logige sisse oma <strong>%{domain}</strong> volitustega. Kui konto asub teises serveris, ei saa te siin sisse logida.
+      title: Logi sisse kohta %{domain}
+    sign_up:
+      preamble: Selle kontoga saad jälgida ja suhelda kõigi teiste kasutajatega erivevates Mastodoni serverites.
+      title: Loo konto serverisse  %{domain}.
     status:
       account_status: Konto olek
       confirming: Ootan e-posti kinnitust.
-      functional: Teie konto on täiesti töökorras.
-      pending: Teie taotlus ootab ülevaadet meie personali poolt. See võib võtta mõnda aega. Kui Teie taotlus on vastu võetud, saadetakse Teile e-kiri.
-      redirecting_to: Teie konto ei ole aktiivne, kuna hetkel suunatakse ümber kasutajale %{acct}.
-    trouble_logging_in: Probleeme sisselogimisega?
+      functional: Konto on täies mahus kasutatav.
+      pending: Taotlus ootab ülevaatamist meie personali poolt. See võib võtta mõnda aega. Kui taotlus on vastu võetud, saadetakse sulle e-kiri.
+      redirecting_to: See konto pole aktiivne, sest on suunatud aadressile %{acct}.
+      view_strikes: Vaata enda eelnevaid juhtumeid
+    too_fast: Vorm esitatud liiga kiirelt, proovi uuesti.
+    use_security_key: Kasuta turvavõtit
   authorize_follow:
     already_following: Te juba jälgite seda kontot
     already_requested: Te juba saatsite jälgimistaotluse sellele kontole
     error: Kahjuks ilmus viga kasutaja kaugserverist otsimisel
     follow: Jälgi
-    follow_request: 'Te olete saatnud jälgimistaotluse kasutajale:'
+    follow_request: 'Oled saatnud jälgimistaotluse kasutajale:'
     following: 'Õnnestus! Te nüüd jälgite kasutajat:'
     post_follow:
       close: Või Te saate lihtsalt sulgeda seda akent.
@@ -644,9 +1004,9 @@ et:
     title: Jälgi %{acct}
   challenge:
     confirm: Jätka
-    hint_html: "<strong>Nõuanne:</strong> Me ei küsi Teilt uuesti salasõna järgmise tunni jooksul."
+    hint_html: "<strong>Nõuanne:</strong> Me ei küsi salasõna uuesti järgmise tunni jooksul."
     invalid_password: Vigane salasõna
-    prompt: Jätkamiseks kinnitage salasõna
+    prompt: Jätkamiseks salasõna veelkord
   crypto:
     errors:
       invalid_key: ei ole õige Ed25519 ega Curve25519 võti
@@ -654,6 +1014,7 @@ et:
   date:
     formats:
       default: "%d. %b %Y"
+      with_month_name: "%d. %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}t"
@@ -661,35 +1022,64 @@ et:
       about_x_years: "%{count}a"
       almost_x_years: "%{count}a"
       half_a_minute: Just praegu
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Just praegu
       over_x_years: "%{count}a"
       x_days: "%{count}p"
+      x_minutes: "%{count}m"
       x_months: "%{count}k"
+      x_seconds: "%{count}s"
   deletes:
     challenge_not_passed: Informatsioon, mida sisestasite, oli vale
-    confirm_password: Sisesta oma praegune salasõna, et kinnitada oma identiteet
+    confirm_password: Praegune salasõna isikusamasuse kinnitamiseks
     confirm_username: Sisestage oma kasutajanimi protseduuri kinnitamiseks
     proceed: Kustuta konto
     success_msg: Konto kustutamine õnnestus
     warning:
-      before: 'Enne jätkamist palun lugege neid märkmeid hoolikalt:'
-      caches: Sisu, mis on salvestatud teiste serverite poolt, võib jääda alles
-      data_removal: Teie postitused ning muud andmed kustutatakse jäädavalt
+      before: 'Veendu, et saad aru, mida toob plaanitav muudatus kaasa:'
+      caches: Teiste serverite poolt talletatud sisu võib jääda kättesaadavaks
+      data_removal: Sinu postitused ning kontoandmed kustutatakse jäädavalt
       email_change_html: Te saate <a href="%{path}">muuta oma e-postiaadressi</a> kontot kustutamata
       email_contact_html: Kui see ikkagi ei saabu, saatke abi saamiseks kiri aadressile <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Kui Te ei saanud kinnituskirja, saate selle <a href="%{path}">uuesti küsida</a>
-      irreversible: Te ei saa taastada ega taasaktiveerida oma kontot
-      more_details_html: Rohkemate detailide jaoks palun lugege <a href="%{terms_path}">privaatsuspoliitikat</a>.
-      username_available: Teie kasutajanimi muutub uuesti kasutatavaks
-      username_unavailable: Teie kasutajanimi jääb mitte kasutatavaks
-  directories:
-    directory: Profiilikataloog
-    explanation: Avasta kasutajaid nende huvide põhjal
-    explore_mastodon: Avasta %{title}
+      irreversible: Kustutatud kontot ei saa taastada ega uuesti aktiveerida
+      more_details_html: Konto kustutamise kohta loe täpsemalt <a href="%{terms_path}">isikuandmete kaitse põhimõtetest</a>.
+      username_available: Su kasutajanimi muutub uuesti kasutatavaks
+      username_unavailable: Su kasutajanimi jääb mittekasutatavaks
+  disputes:
+    strikes:
+      action_taken: Tulemus
+      appeal: Vaidlustus
+      appeal_approved: Selle juhtumi vaidlustus on rahuldatud ja pole enam kehtiv
+      appeal_rejected: Vaidlustus on tagasi lükatud
+      appeal_submitted_at: Vaidlustus esitatud
+      appealed_msg: Vaidlustus esitatud. Selle rahuldamisel saabub teadaanne.
+      appeals:
+        submit: Esita vaidlustus
+      approve_appeal: Rahulda vaidlustus
+      associated_report: Seotud raport
+      created_at: Kuupäev
+      description_html: See on käesoleva konto hoiatuste ja tegevuste ajalugu, mis on %{instance} haldajate poolt ette võetud.
+      recipient: Adressaat
+      reject_appeal: Lükka vaidlustus tagasi
+      status: 'Postitus #%{id}'
+      status_removed: Postitus on süsteemist juba eemaldatud
+      title: "%{action} kuupäevaga %{date}"
+      title_actions:
+        delete_statuses: Postituste eemaldamine
+        disable: Konto külmutamine
+        mark_statuses_as_sensitive: Postituste tundlikena märkimine
+        none: Hoiatus
+        sensitive: Konto tundlikuna märkimine
+        silence: Konto piirang
+        suspend: Konto kustutamine
+      your_appeal_approved: Su vaidlustus on heakskiidetud
+      your_appeal_pending: Vaidlustus on esitatud
+      your_appeal_rejected: Vaidlustus on tagasi lükatud
   domain_validator:
     invalid_domain: ei ole sobiv domeeni nimi
   errors:
-    '400': Toiming oli vale või valesti vormindatud.
+    '400': Esitatud päring oli vigane või valesti vormindatud.
     '403': Sul puudub õigus seda lehte vaadata.
     '404': Soovitud lehte ei leitud.
     '406': See lehekülg ei ole soovitavas formaadis saadaval.
@@ -702,7 +1092,7 @@ et:
       content: Palume vabandust, midagi läks valesti meie pool.
       title: See lehekülg pole õige
     '503': Lehekülge ei saanud serveerida ajutise serveri vea tõttu.
-    noscript_html: Et kasutada Mastodoni veebirakendust, palun lubage JavaScript. Alternatiivselt, proovige mõnda <a href="%{apps_path}">rakendust</a> Teie platvormile.
+    noscript_html: Et kasutada Mastodoni veebirakendust, palun luba JavaScript. Teise võimalusena proovi mõnda <a href="%{apps_path}">rakendust</a> su platvormile.
   existing_username_validator:
     not_found: ei suutnud leida kohalikku kasutajat selle kasutajanimega
     not_found_multiple: ei suutnud leida %{usernames}
@@ -710,20 +1100,22 @@ et:
     archive_takeout:
       date: Kuupäev
       download: Lae alla oma arhiiv
-      hint_html: Te saate taotleda arhiivi oma <strong>tuututustest ja üleslaetud meediast</strong>. Eksporditud andmed on ActivityPub-i formaadis, loetav vastava tarkvara poolt. Te saate taotleda arhiivi iga 7 päeva tagant.
-      in_progress: Loome Teie arhiivi...
+      hint_html: "<strong>Postitustest ja üleslaetud meediast</strong> on võimalik saada koopia. Eksporditud andmed on ActivityPub-formaadis, loetav vastava tarkvara poolt. Koopia saamine on võimalik iga 7 päeva järel."
+      in_progress: Loome arhiivi...
       request: Taotle oma arhiivi
       size: Suurus
-    blocks: Teie blokeerite
+    blocks: Sa blokeerid
+    bookmarks: Järjehoidjad
+    csv: CSV
     domain_blocks: Domeeni blokeeringud
     lists: Nimistud
-    mutes: Teie vaigistate
+    mutes: Oled vaigistanud
     storage: Meedia hoidla
   featured_tags:
     add_new: Lisa uus
     errors:
-      limit: Olete jõudnud maksimum lubatud siltide arvuni
-    hint_html: "<strong>Mis on esile toodud sildid?</strong> Need sildid näidatakse nähtavalt Teie avalikul profiilil ning nad aitavad inimestel leida postitusi, millel on antud sildid. Nad on hea viis kuidas näiteks hoida järge loovtöödel või pikaajalistel projektidel."
+      limit: Oled jõudnud siltide lubatud maksimumarvuni
+    hint_html: "<strong>Mis on esiletõstetud sildid?</strong> Neid silte näidatakse su avalikul profiilil esiletõstetult ning need aitavad teistel leida postitusi, millel on selline silt. See on hea viis, kuidas hoida järge loovtöödel või pikaajalistel projektidel."
   filters:
     contexts:
       account: Profiilid
@@ -732,69 +1124,84 @@ et:
       public: Avalikud ajajooned
       thread: Vestlused
     edit:
+      add_keyword: Võtmesõna lisamine
+      keywords: Märksõnad
+      statuses: Üksikud postitused
+      statuses_hint_html: See filter rakendub üksikute postituste valimisel olenemata sellest, kas need vastavad allolevatele märksõnadele. <a href="%{path}">Filtri postituste ülevaatamine või kustutamine</a>.
       title: Muuda filtrit
     errors:
+      deprecated_api_multiple_keywords: Neid parameetreid ei saa selles rakenduses muuta, kuna need kehtivad rohkem kui ühele filtri märksõnale. Kasutage uuemat rakendust või veebiliidest.
       invalid_context: Puudulik või vale kontekst
-      invalid_irreversible: Taastamatu filter töötab ainult kodu või teavituste kontekstis
     index:
+      contexts: Filtrid %{contexts}
       delete: Kustuta
       empty: Teil pole filtreid.
-      title: Filterid
+      expires_in: Aegub %{distance}
+      expires_on: Aegub %{date}
+      keywords:
+        one: "%{count} võtmesõna"
+        other: "%{count} võtmesõna"
+      statuses:
+        one: "%{count} postitus"
+        other: "%{count} postitust"
+      statuses_long:
+        one: "%{count} postitus peidetud"
+        other: "%{count} postitust peidetud"
+      title: Filtrid
     new:
+      save: Salvesta uus filter
       title: Lisa uus filter
+    statuses:
+      back_to_filter: Tagasi filtri juurde
+      batch:
+        remove: Eemalda filtrist
+      index:
+        hint: See filter kehtib üksikute postituste valimisel, sõltumata muudest kriteeriumidest. Sellesse filtrisse saab veebiliidese kaudu rohkem postitusi lisada.
+        title: Filtreeritud postitused
   footer:
-    developers: Arendajad
-    more: Rohkem…
-    resources: Materjalid
     trending_now: Praegu trendikad
   generic:
     all: Kõik
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> üksus sel lehel valitud."
+      other: Kõik <strong>%{count}</strong> üksust sel lehel on valitud.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> otsinguvaste valitud."
+      other: Kõik <strong>%{count}</strong> otsinguvastet valitud.
     changes_saved_msg: Muudatuste salvestamine õnnestus!
     copy: Kopeeri
     delete: Kustuta
-    no_batch_actions_available: Komplekttegevused pole sellel lehel saadaval
+    deselect: Ära vali midagi
+    none: Puudub
     order_by: Järjesta
     save_changes: Salvesta muudatused
+    select_all_matching_items:
+      one: Vali %{count} otsinguvaste.
+      other: Vali kõik %{count} otsinguvastet.
+    today: täna
     validation_errors:
       one: Midagi pole ikka õigesti! Palun vaadake allolev veateade üle
       other: Midagi pole ikka õigesti! Palun vaadake all olevad %{count} veateadet üle
   html_validator:
     invalid_markup: 'sisaldab valet HTMLi süntaksi: %{error}'
-  identity_proofs:
-    active: Aktiivne
-    authorize: Jah, luba
-    authorize_connection_prompt: Luba see krüptograafiline ühendus?
-    errors:
-      failed: Krüptograafiline ühendus ebaõnnestus. Palun proovi uuesti %{provider}-ist.
-      keybase:
-        invalid_token: Keybase võtmed on allkirjade hashid ja peavad olema 66 hex tähemärki
-        verification_failed: Keybase ei tunnista seda võtit kui kasutaja %{kb_username} omand. Palun proovige uuesti Keybasest.
-      wrong_user: Ei saa luua tõendit kontole %{proving} kui olete sisseloginud kui %{current}. Logige sisse kui %{proving} ja proovige uuesti.
-    explanation_html: Siin saate luua krüptograafilisi ühendusi oma teiste identiteetidega, nagu näiteks Keybase profiiliga. See võimaldab teistel kasutajatel saata Teile krüptitud sõnumeid ja usaldada sisu, mis Teie saadate neile.
-    i_am_html: Ma olen %{username} teenusel %{service}.
-    identity: Identiteet
-    inactive: Passiivne
-    publicize_checkbox: 'Ja tuututa seda:'
-    publicize_toot: 'See on tõestatud! Ma olen %{username} teenusel %{service}: %{url}'
-    remove: Eemalda isikutõend kontolt
-    removed: Isikutõendi eemaldamine oli edukas
-    status: Kinnituse staatus
-    view_proof: Vaata tõendit
   imports:
+    errors:
+      invalid_csv_file: 'Vigane CSV-fail. Tõrge: %{error}'
+      over_rows_processing_limit: sisaldab rohkem, kui %{count} rida
     modes:
       merge: Lõimi
       merge_long: Hoia olemasolevad andmed ja lisa uusi
       overwrite: Kirjuta üle
       overwrite_long: Vaheta praegused andmed uute vastu
     preface: Te saate importida mis tahes andmeid, mis on eksporditud teisest serverist. Näiteks nimekiri inimestest, keda jälgid ja keda blokeerid.
-    success: Teie andmete üleslaadimine õnnestus ning neid töödeldakse
+    success: Andmete üleslaadimine õnnestus ning neid töödeldakse
     types:
       blocking: Blokeeringute nimekiri
+      bookmarks: Järjehoidjad
       domain_blocking: Domeeniblokeeringute nimekiri
       following: Jälgimiste nimekiri
       muting: Vaigistuse nimekiri
     upload: Lae üles
-  in_memoriam_html: Mälestamaks.
   invites:
     delete: Peata
     expired: Aegunud
@@ -819,64 +1226,75 @@ et:
     title: Kutsu inimesi
   lists:
     errors:
-      limit: Olete jõudnud maksimum lubatud nimekirjade arvuni
+      limit: Oled jõudnud loetelude lubatud maksimumarvuni
+  login_activities:
+    authentication_methods:
+      otp: kahe-etapise autentimise rakendus
+      password: salasõna
+      sign_in_token: e-posti turvakood
+      webauthn: turvavõtmed
+    description_html: Kui paistab tundmatauid tegevusi, tuleks vahetada salasõna ja aktiveerida kahe-etapine autentimine.
+    empty: Autentimisajalugu pole saadaval
+    failed_sign_in_html: Nurjunud sisenemine meetodiga %{method} aadressilt %{ip} (%{browser})
+    successful_sign_in_html: Edukas sisenemine meetodiga %{method} aadressilt %{ip} (%{browser})
+    title: Autentimise ajalugu
   media_attachments:
     validations:
-      images_and_video: Ei saa lisada video staatusele, millel on juba pildid
+      images_and_video: Ei saa lisada video postitusele, milles on juba pildid
       not_ready: Ei saa lisada faile, mida hetkel töödeldakse. Proovige uuesti mõne hetke pärast!
       too_many: Ei saa lisada rohkem, kui 4 faili
   migrations:
-    acct: uue konto kasutajanimi@domeen
+    acct: Kolitud aadressile
     cancel: Tühista ümbersuunamine
-    cancel_explanation: Ümbersuunamise tühistamine taasaktiveerib Teie praeguse konto, kuid ei too tagasi jälgijaid, mis on sellele kontole üle viidud.
+    cancel_explanation: Ümbersuunamise tühistamine aktiveerib siinse konto, kuid teisele kontole üle viidud jälgijaid tagasi ei too.
     cancelled_msg: Ümbersuunamise tühistamine õnnestus.
     errors:
-      already_moved: on sama konto, kuhu Te olete juba kolinud
+      already_moved: on sama konto, kuhu oled juba kolinud
       missing_also_known_as: ei viita tagasi sellele kontole
       move_to_self: ei saa olla praegune konto
       not_found: ei leitud
-      on_cooldown: Te olete hetkel ootel
+      on_cooldown: Oled hetkel ootel
     followers_count: Jälgijaid kolimise hetkel
-    incoming_migrations: Kolivad teiselt kontolt
-    incoming_migrations_html: Kui soovite kolida teiselt kontolt praegusele, peate Te esmalt looma <a href="%{path}">kontole teise nime</a>.
-    moved_msg: Teie konto on nüüd ümber suunamas kontole %{acct} ning Teie jälgijaid kolitakse üle.
-    not_redirecting: Teie kontot ei suunata hetkel ümber.
-    on_cooldown: Te olete hiljuti kolinud oma kontot. See funktsioon on jälle kättesaadav %{count} päeva pärast.
-    past_migrations: Eelmiseid kolimisi
-    proceed_with_move: Koli üle jälgijad
-    redirected_msg: Teie kontot suunatakse nüüd ümber kontole %{acct}.
-    redirecting_to: Teie konto suunatakse ümber kontole %{acct}.
-    set_redirect: Määra ümbersuunamine
+    incoming_migrations: Teise konto siia kolimine
+    incoming_migrations_html: Kui soovid kolida teise konto siia, pead esmalt määrama <a href="%{path}">kolitava konto aadressi</a>.
+    moved_msg: Su konto suunab nüüd ümber kontole %{acct}, jälgijaid kolitakse üle.
+    not_redirecting: See konto pole praegu kuhugi ümber suunatud.
+    on_cooldown: Oled oma kontot hiljuti kolinud. Uuesti saad seda teha %{count} päeva pärast.
+    past_migrations: Kolimisajalugu
+    proceed_with_move: Käivita kolimine
+    redirected_msg: Konto on suunatud ümber aadressile %{acct}.
+    redirecting_to: Konto on suunatud ümber aadressile %{acct}.
+    set_redirect: Suuna ümber
     warning:
-      backreference_required: Uus konto peab olema esmalt seadistatud tagasi viitama praegusele kontole
-      before: 'Enne jätkamist palun lugege neid märkmeid hoolikalt:'
-      cooldown: Pärast kolimist on ooteperiood, mille kestel ei saa Te uuesti kolida
-      disabled_account: Teie praegune konto ei ole täiesti kasutatav peale seda. Sellest hoolimata on Teil ligipääs andmete ekspordile ja taasaktiveerimisele.
-      followers: See tegevus kolib kõik jälgijad üle praeguselt kontolt uuele kontole
-      only_redirect_html: Alternatiivselt saate Te <a href="%{path}">seadistada ainult ümbersuunamise Teie profiilil</a>.
-      other_data: Muid andmeid ei liigutata automaatselt
-      redirect: Teie praegune konto eemaldatakse otsingutulemustest ning profiilile lisatakse ümbersuunamise märguanne
+      backreference_required: Uus konto peab olema esmalt seadistatud võtma vastu siinse konto jälgijaid
+      before: 'Veendu, et saad aru, mida toob plaanitav muudatus kaasa:'
+      cooldown: Kolimisele järgneb ooteaeg, mille vältel kontot mõnda aega ümber kolida ei saa
+      disabled_account: Pärast kolimist ei ole konto kasutamine täielikult võimalik. Säilib andmete eksportimise ja konto taasaktiveerimise võimalus.
+      followers: See käsklus kolib kõik siinse konto jälgijad üle sinu uue konto jälgijateks
+      only_redirect_html: Teine võimalus on <a href="%{path}">märkida konto ümbersuunatuks</a>.
+      other_data: Muid kontoandmeid, sh postitusi automaatselt üle ei kanta
+      redirect: Konto eemaldatakse avalikust kataloogist ja märgitakse profiilis ümbersuunatuks
   moderation:
-    title: Moderatsioon
+    title: Modereerimine
+  move_handler:
+    carry_blocks_over_text: See kasutaja kolis kontolt %{acct}, mis oli keelatud.
+    carry_mutes_over_text: Kasutaja kolis ümber kontolt %{acct}, mis oli vaigistatud.
+    copy_account_note_text: 'Kasutaja kolis kontolt %{acct}, kus olid eelnevad märkmed tema kohta:'
+  navigation:
+    toggle_menu: Menüü lülimine
   notification_mailer:
-    digest:
-      action: Vaata kõiki teateid
-      body: Siin on kiire ülevaade sellest, mis sõnumeid Te ei näinud pärast Teie viimast külastust %{since}
-      mention: "%{name} mainis Teid postituses:"
-      new_followers_summary:
-        one: Ja veel, Te saite ühe uue jälgija kui Te olite eemal! Jee!
-        other: Ja veel, Te saite %{count} uut jälgijat kui Te olite eemal! Hämmastav!
-      subject:
-        one: "1 uus teavitus peale Teie eelmist külastust \U0001F418"
-        other: "%{count} uut teavitust peale Teie eelmist külastust \U0001F418"
-      title: Teie puudumisel...
+    admin:
+      report:
+        subject: "%{name} esitas raporti"
+      sign_up:
+        subject: "%{name} liitus"
     favourite:
-      body: "%{name} lisas Teie staatuse lemmikutesse:"
-      subject: "%{name} märkis su staatuse lemmikuks"
+      body: "%{name} lisas su postituse lemmikutesse:"
+      subject: "%{name} märkis su postituse lemmikuks"
       title: Uus lemmik
     follow:
-      body: "%{name} nüüd jälgib teid!"
-      subject: "%{name} nüüd jälgib teid"
+      body: "%{name} alustas su jälgimist!"
+      subject: "%{name} alustas su jälgimist"
       title: Uus jälgija
     follow_request:
       action: Halda jälgimistaotlusi
@@ -888,10 +1306,16 @@ et:
       body: "%{name} mainis Teid:"
       subject: "%{name} mainis Teid"
       title: Uus mainimine
+    poll:
+      subject: "%{name} küsitlus lõppes"
     reblog:
-      body: "%{name} upitas Teie staatust:"
-      subject: "%{name} upitas su staatust"
-      title: Uus upitus
+      body: "%{name} jagas edasi postitust:"
+      subject: "%{name} jagas postitust"
+      title: Uus jagamine
+    status:
+      subject: "%{name} postitas äsja"
+    update:
+      subject: "%{name} muutis postitust"
   notifications:
     email_events: E-posti teadete sündmused
     email_events_hint: 'Valige sündmused, millest soovite teavitusi:'
@@ -899,17 +1323,30 @@ et:
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
-          thousand: T
-          trillion: Tr
+          billion: mld
+          million: mln
+          quadrillion: kdn
+          thousand: tuh
+          trillion: trn
+  otp_authentication:
+    code_hint: Kinnituseks autentimisrakenduse loodud kood
+    description_html: Kui aktiveerda <strong>kahe-etapine autentimine</strong> autentimisrakenduse abil, on sisselogimiseks tarvis telefoni, mis loob sisenemiseks võtmeid.
+    enable: Luba
+    instructions_html: "<strong>See QR-kood on võimalik skannida telefoni Google Authenticatori või sarnasesse ühekordsete aeguvate salasõnade (TOTP) rakendusse</strong>. Nüüdsest genereerib see rakendus koode, mille peab sisenemisel sisestama."
+    manual_instructions: 'Kui pole võimalik QR-koodi skaneerida, on salavõti võimalik sisestada tavatekstina:'
+    setup: Seadista
+    wrong_code: Sisestatud kood on vale! Kas serveri aeg ja seadme aeg on õiged?
   pagination:
     newer: Uuemad
     next: Järgmine
     older: Vanemad
     prev: Eelm
+    truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Olete siin juba hääletanud
+      already_voted: Oled siin hääletusel juba hääletanud
       duplicate_options: sisaldab samu asju mitu korda
       duration_too_long: kestab liiga kaua
       duration_too_short: on liiga vara
@@ -922,6 +1359,8 @@ et:
     other: Muu
     posting_defaults: Postitamise vaikesätted
     public_timelines: Avalikud ajajooned
+  privacy_policy:
+    title: Isikuandmete kaitse
   reactions:
     errors:
       limit_reached: Jõutud on erinevate reaktsioonide limiidini
@@ -929,6 +1368,7 @@ et:
   relationships:
     activity: Konto tegevus
     dormant: Seisev
+    follow_selected_followers: Valitud jälgijate jälgimine
     followers: Jälgijad
     following: Jälgib
     invited: Kutsutud
@@ -943,46 +1383,65 @@ et:
     remove_selected_follows: Lõpeta valitud kasutajate jälgimine
     status: Konto olek
   remote_follow:
-    acct: Sisestage oma kasutajanimi@domeen, kust te soovite jälgida
-    missing_resource: Ei suutnud leida vajalikku suunamise URLi Teie konto jaoks
-    no_account_html: Teil pole veel kontot? Saate <a href='%{sign_up_path}' target='_blank'>luua ühe siit</a>
-    proceed: Jätka jälgimiseks
-    prompt: 'Te hakkate jälgima:'
-    reason_html: |-
-      <strong>Miks on see samm vajalik?</strong>
-      <code>%{instance}</code> ei pruugi olla server, kus asub Teie konto, nii et me peame Teid suunama oma kodu serverile.
-  remote_interaction:
-    favourite:
-      proceed: Jätka lemmikuks lisamiseks
-      prompt: 'Te soovite lisada seda tuututust lemmikutesse:'
-    reblog:
-      proceed: Jätka upitamiseks
-      prompt: 'Te soovite seda tuututust upitada:'
-    reply:
-      proceed: Jätka vastamiseks
-      prompt: 'Te soovite vastata sellele tuututusele:'
+    missing_resource: Ei suutnud konto jaoks leida vajalikku suunamise URLi
+  reports:
+    errors:
+      invalid_rules: ei viita kehtivatele reeglitele
+  rss:
+    content_warning: 'Sisuhoiatus:'
+    descriptions:
+      account: "@%{acct} avalikud postitused"
+      tag: 'Avalikud postitused sildiga #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Te olete jõudnud maksimum lubatud ajastatud tuututuste arvuni %{limit} selle päeva kohta
-    over_total_limit: Te olete jõudnud maksimum lubatud ajastatud tuututuste arvuni %{limit}
-    too_soon: Ajastatud tuututuse kuupäev peab olema tukevikus
+    over_daily_limit: Lubatud ajastatud postituste arv %{limit} päevas on tänaseks ületatud
+    over_total_limit: Oled jõudnud ajastatud postituste lubatud maksimumarvuni %{limit}
+    too_soon: Ajastatud kuupäev peab olema tukevikus
   sessions:
     activity: Viimane aktiivsus
     browser: Veebilehitseja
     browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Tundmatu veebilehitseja
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
     current_session: Praegune seanss
     description: "%{browser} platvormil %{platform}"
-    explanation: Need on praegused veebilehitsejad, mis on sisse logitud Teie Mastodoni kontosse.
+    explanation: Need veebilehitsejad on praegu su Mastodoni kontole sisse loginud.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
       mac: Mac
       other: tundmatu platvorm
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Tühista
     revoke_success: Seanssi tühistamine õnnestus
-    title: Seanssid
+    title: Seansid
+    view_authentication_history: Konto autentimisajaloo vaatamine
   settings:
     account: Konto
     account_settings: Kontosätted
-    aliases: Konto teised nimed
+    aliases: Siia kolitavad kontod
     appearance: Välimus
     authorized_apps: Lubatud rakendused
     back: Tagasi Mastodoni
@@ -991,36 +1450,45 @@ et:
     edit_profile: Muuda profiili
     export: Andmete eksportimine
     featured_tags: Esile toodud sildid
-    identity_proofs: Isikutõendid
     import: Impordi
     import_and_export: Import / eksport
-    migrate: Konto migreerumine
+    migrate: Konto kolimine
     notifications: Teated
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
-    two_factor_authentication: Kahesammuline autentimine
+    statuses_cleanup: Automaatne kustutamine
+    strikes: Modereerimisjuhtumid
+    two_factor_authentication: Kahe-etapine autentimine
+    webauthn_authentication: Turvavõtmed
   statuses:
     attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audiot"
       description: 'Manused: %{attached}'
       image:
         one: "%{count} pilt"
         other: "%{count} pilti"
-    boosted_from_html: Upitatud %{acct_link}
+      video:
+        one: "%{count} video"
+        other: "%{count} videot"
+    boosted_from_html: "%{acct_link} jagamine"
     content_warning: 'Sisu hoiatus: %{warning}'
+    default_language: Kasutajaliidese keelega sama
     disallowed_hashtags:
       one: 'sisaldab ebasobivat silti: %{tags}'
       other: 'sisaldab ebasobivaid silte: %{tags}'
+    edited_at_html: Muudetud %{date}
     errors:
-      in_reply_not_found: Staatus, millele üritate vastata, ei näi enam eksisteerivat.
-    language_detection: Automaatselt tuvasta keel
+      in_reply_not_found: Postitus, millele üritad vastata, ei näi enam eksisteerivat.
     open_in_web: Ava veebis
     over_character_limit: tähtmärkide limiit %{max} ületatud
     pin_errors:
-      limit: Te olete juba maksimum arvu lubatud tuututusi kinnitanud
-      ownership: Kellegi teise tuututust ei saa kinnitada
-      private: Privaatset tuututust ei saa kinnitada
-      reblog: Upitust ei saa kinnitada
+      direct: Ei saa kinnitada postitusi, mis on nähtavad vaid mainitud kasutajatele
+      limit: Kinnitatud on juba maksimaalne arv postitusi
+      ownership: Kellegi teise postitust ei saa kinnitada
+      reblog: Jagamist ei saa kinnitada
     poll:
       total_people:
         one: "%{count} inimene"
@@ -1030,23 +1498,63 @@ et:
         other: "%{count} häält"
       vote: Hääleta
     show_more: Näita rohkem
+    show_newer: Uuemate kuvamine
+    show_older: Vanemate kuvamine
     show_thread: Kuva lõim
     sign_in_to_participate: Logi sisse, et liituda vestlusega
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Otsene
       private: Ainult jälgijatele
-      private_long: Näita ainult jälgijatele
+      private_long: Näevad ainult jälgijad
       public: Avalik
-      public_long: Kõik saavad näha
+      public_long: Postitused on kõigile näha
       unlisted: Kirjendamata
-      unlisted_long: Kõik saavad näha, aga ei ole saadaval avalikes ajajoontes
+      unlisted_long: Kõigile näha, kuid ei näidata avalikel ajajoontel
+  statuses_cleanup:
+    enabled: Vanade postituste automaatne kustutamine
+    enabled_hint: Kustutab automaatselt postitused, mis ületavad määratud ajalimiiti, välja arvatud allpool toodud erandite puhul
+    exceptions: Erandid
+    explanation: Kuna postituste kustutamine on kulukas toiming, tehakse seda aja jooksul aeglaselt, kui server pole muidu hõivatud. Sel põhjusel võidakse postitused kustutada alles mõne aja möödudes pärast vanusepiirini jõudmist.
+    ignore_favs: Eira lemmikuid
+    ignore_reblogs: Eira jagamisi
+    interaction_exceptions: Interaktsioonidel põhinevad erandid
+    interaction_exceptions_explanation: Postitused ei pruugi kustuda, kui meeldimiste või jagamiste arv langeb alla määratu, kui need on kord olnud sellest üle.
+    keep_direct: Säilita otsesõnumid
+    keep_direct_hint: Ei kustuta otsesõnumeid
+    keep_media: Meedialisanditega postituste säilitamine
+    keep_media_hint: Meedialisanditega postitusi ei kustutata
+    keep_pinned: Säilita kinnitatud postitused
+    keep_pinned_hint: Ei kustuta ühtegi kinnitatud postitust
+    keep_polls: Küsitluste säilitamine
+    keep_polls_hint: Ei kustuta ühtegi küsitlust
+    keep_self_bookmark: Säilita postitused järjehoidjates
+    keep_self_bookmark_hint: Ei kustuta oma postitusi, kui need on järjehoidjates
+    keep_self_fav: Säilita meeldinud postitused
+    keep_self_fav_hint: Ei kustuta oma postitusi, kui need on märgitud meeldivaks
+    min_age:
+      '1209600': 2 nädalat
+      '15778476': 6 kuud
+      '2629746': 1 kuu
+      '31556952': 1 aasta
+      '5259492': 2 kuud
+      '604800': 1 nädal
+      '63113904': 2 aastat
+      '7889238': 3 kuud
+    min_age_label: Ajalimiit
+    min_favs: Säilita postitused, meeldimistega vähemalt
+    min_favs_hint: Ei kustuta ühtegi postitust, mis on saanud vähemalt nii palju lemmikuid. Postituste kustutamiseks, olenemata nende lemmikute arvust, jätke tühjaks
+    min_reblogs: Säilita postitused jagatud vähemalt
+    min_reblogs_hint: Ei kustuta postitusi, kui need on jagatud vähemalt nii mitu korda. Tühjaks jättes kustuvad postitused olenemata jagamistest
   stream_entries:
-    pinned: Kinnitatud tuut
-    reblogged: upitatud
+    pinned: Kinnitatud postitus
+    reblogged: jagatud
     sensitive_content: Tundlik sisu
+  strikes:
+    errors:
+      too_late: On hilja seda juhtumit vaidlustada
   tags:
     does_not_match_previous_name: ei ühti eelmise nimega
-  terms:
-    title: "%{instance} Kasutustingimused ja Privaatsuspoliitika"
   themes:
     contrast: Mastodon (Kõrge kontrast)
     default: Mastodon (Tume)
@@ -1055,61 +1563,110 @@ et:
     formats:
       default: "%d. %B, %Y. aastal, kell %H:%M"
       month: "%B %Y"
+      time: "%H:%M"
   two_factor_authentication:
-    disable: Lülita välja
-    enabled: Kaheastmeline autentimine on sisse lülitatud
-    enabled_success: Kaheastmeline autentimine on edukalt sisse lülitatud
-    generate_recovery_codes: Loo taastuskoodid
-    lost_recovery_codes: Taastuskoodide abil on Teil võimalik sisse logida kontosse, kui Te kaotate oma telefoni. Kui Te kaotate oma taastuskoodid, saate need uuesti luua siin. Teie vanad taastuskoodid tehakse kehtetuks.
-    recovery_codes: Tagavara taastuskoodid
-    recovery_codes_regenerated: Taastuskoodid edukalt taasloodud
-    recovery_instructions_html: Kui Te juhtute kunagi kaotama oma telefoni, saate kasutada ühte allpool olevatest taastuskoodidest, et saada ligipääsu oma kontole. <strong>Hoidke taastuskoodid turvaliselt</strong>. Näiteks võite Te need välja printida ning hoida need koos teiste tähtsate dokumentidega.
+    add: Lisa
+    disable: Keela 2FA
+    disabled_success: Kahe-etapine autentimine keelatud
+    edit: Muuda
+    enabled: Kahe-etapine autentimine on lubatud
+    enabled_success: Kahe-etapine autentimine lubatud
+    generate_recovery_codes: Loo taastekoodid
+    lost_recovery_codes: Taastekoodide abil on võimalik telefoni kaotsimineku puhul kontole siseneda. Taastekoodide puudumisel saab need siin luua. Eelnevad taastekoodid kaotavad kehtivuse.
+    methods: Kahe-etapised meetodid
+    otp: Autentimisrakendus
+    recovery_codes: Taastekoodide varundamine
+    recovery_codes_regenerated: Taastekoodid edukalt taasloodud
+    recovery_instructions_html: Kui telefon peaks kaotsi minema, on võimalik kontole sisenemisel kasutada ühte järgnevatest taastekoodidest. <strong>Hoia taastekoode turvaliselt</strong>. Näiteks võib neid prindituna hoida koos teiste tähtsate dokumentidega.
+    webauthn: Turvavõtmed
   user_mailer:
+    appeal_approved:
+      action: Oma kontole
+      explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on rahuldatud. Konto on ennistatud."
+      subject: "%{date} esitatud vaidlustus on rahuldatud"
+      title: Vaidlustus rahuldatud
+    appeal_rejected:
+      explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on tagasi lükatud."
+      subject: "%{date} esitatud vaidlustus on tagasi lükatud"
+      title: Vaidlustus tagasi lükatud
     backup_ready:
       explanation: Te taotlesite varukoopia oma Mastodoni kontost. See on nüüd valmis allalaadimiseks!
       subject: Teie arhiiv on allalaadimiseks valmis
       title: Arhiivi väljavõte
+    suspicious_sign_in:
+      change_password: muuta oma salasõna
+      details: 'Sisenemise üksikasjad:'
+      explanation: Täheldasime kontole sisenemise uuelt IP-aadressilt.
+      further_actions_html: Kui see tuleb üllatusena, soovitame viivitamata %{action} ja lülitada konto turvamiseks sisse kahe-etapine autentimine.
+      subject: Kontole sisenemine uuelt IP-aadressilt
+      title: Uus sisenemine
     warning:
+      appeal: Vaidlustuse esitamine
+      appeal_description: Kui see võib olla eksitus, on võimalik %{instance} haldajatele esitada vaidlustus.
+      categories:
+        spam: Rämpspost
+        violation: Sisu eirab järgmisi kogukonnajuhiseid
       explanation:
-        disable: Kuniks Teie konto on lukus, ei saa Te teha sellega ühtegi tegevust kuni see on lukust lahti tehtud.
-        silence: Kuniks Teie konto on limiteeritud, ainult need inimesed, kes Teid juba jälgivad, näevad Teie tuututusi sellel serveril ning Teid jäetakse välja avalikest nimekirjadest. Sellest hoolimata võivad inimesed Teid siiski jälgida.
-        suspend: Teie konto on peatatud ning kõik Teie tuututused ja üleslaetud meediafailid on jäädavalt kustutatud sellelt serverilt ning serveritelt, kus Teil oli jälgijad.
-      get_in_touch: Te saate sellele e-kirjale vastata, et võtta ühendust %{instance}-i personaliga.
-      review_server_policies: Vaadake üle serveri eeskirju
-      statuses: 'Täpsemalt:'
+        delete_statuses: Mõned postitused eiravad ühte või mitmeid kogukonnajuhiseid ja on seetõttu %{instance} moderaatorite poolt eemaldatud.
+        disable: Konto kasutamine pole enam võimalik, kuid profiil ja muud andmed säilivad. Andmetest on võimalik saada varukoopiat, muuta konto seadeid või konto kustutada.
+        mark_statuses_as_sensitive: Mõned postitused märgiti %{instance} moderaatorite poolt kui tundlik sisu. See tähendab, et meedia eelvaadet vaikimisi ei kuvata. Edaspidi postitades on soovitatav seesugune meedia märkida kui tundlik sisu.
+        sensitive: Praegusest alates saab kogu Su üleslaetav meedia tundliku sisu märke ja selle eelvaadet ei kuvata enne hoiatust.
+        silence: Saad kontot kasutada, ent sel serveril näevad su postitusi ainult need, kes on juba jälgijad, ning võid välja jääda erinevatest avastamisvõimalustest. Käsitsi jälgima asumine on siiski võimalik.
+        suspend: Konto kasutamine pole enam võimalik ja profiil ja muud andmed pole enam kättesaadavad. Sisenemine on võimalik andmetest varukoopia saamiseks kuni nende lõpliku kustutamiseni 30 päeva pärast, ent säiltame mõned põhiandmed kustutamisest mööda hiilimise vältimiseks.
+      reason: 'Põhjus:'
+      statuses: 'Tsiteeritud postitused:'
       subject:
-        disable: Teie konto %{acct} on lukustatud
+        delete_statuses: Postitused kontol %{acct} on eemaldatud
+        disable: Su konto %{acct} on lukustatud
+        mark_statuses_as_sensitive: Konto %{acct} postitused on märgitud kui tundlik sisu
         none: Hoiatus kasutajale %{acct}
-        silence: Teie kontole %{acct} on kehtestatud limiidid
-        suspend: Teie konto %{acct} on peatatud
+        sensitive: Konto %{acct} postitused on nüüdsest märgitud kui tundlik sisu
+        silence: Su kontole %{acct} on kehtestatud piirangud
+        suspend: Su konto %{acct} on peatatud
       title:
+        delete_statuses: Postitused eemaldatud
         disable: Konto lukustatud
+        mark_statuses_as_sensitive: Postitused märgitud kui tundlik sisu
         none: Hoiatus
+        sensitive: Konto märgitud kui tundlik sisu
         silence: Konto limiteeritud
-        suspend: Konto peatatud
+        suspend: Konto kustutatud
     welcome:
-      edit_profile_action: Sea üles profiil
-      edit_profile_step: Te saate oma profiili isikupärastada näiteks lisades profiilipildi, päise, muutes oma kuvanime ja muud. Kui Te soovite üle vaadata inimesi, kes Teid jälgida soovivad, saate lukustada oma konto.
-      explanation: Siin on mõned nõuanded, mis aitavad sul alustada
-      final_action: Alusa postitamist
-      final_step: 'Alusta postitamist! Isegi ilma jälgijateta näevad teised Teie avalikke postitusi, näiteks kohalikul ajajoonel ning siltidest. Te võite ennast tutvustada kasutades silti #introductions.'
-      full_handle: Teie täisnimi
-      full_handle_hint: See on mida oma sõpradega jagada, et nad saaksid Teile sõnumeid saata ning Teid jälgida teiselt serverilt.
-      review_preferences_action: Muuda eelistusi
-      review_preferences_step: Kindlasti seadistage oma sätted Teie maitse järgi, näiteks e-kirju, mida soovite saada, või millist privaatsustaset Te soovite vaikimisi. Kui Teil pole merehaigust, võite Te näiteks lubada GIFide automaatse mängimise.
+      edit_profile_action: Seadista oma profiil
+      edit_profile_step: |-
+        Esmalt seadista oma profiil. Saad lisada profiilipildi, muuta ekraaninime, lisada lühikirjelduse ja teha paljut muud. Vaata üle oma konto seaded. Saad ise otsustada, kui nähtav on konto teiste jaoks, mis keeltes postitusi oma ajavoos näha soovid ning kui privaatne peaks konto olema.
+
+        Kui mõni asi arusaamatuks jääb, siis saate vaadata juhendvideot: https://youtu. be/J4ItbTOAw7Q.
+      explanation: Siin on mõned nõuanded, mis aitavad alustada
+      final_action: Alusta postitamist
+      final_step: 'Nüüd tee oma esimene postitus. Hea tava on uues kohas ennast tutvustada ning kindlasti kasuta selles postituses ka teemaviidet #tutvustus. Isegi kui sul ei ole veel jälgijaid, siis su postitusi näevad kohalikul ajajoonel ka kõik teised serveri kasutajad.'
+      full_handle: Su kasutajanimi Mastodon võrgustikus
+      full_handle_hint: Kui jagad kasutajanime väljaspool serverit, siis kasuta kindlasti pikka nime. Erinevates serverites võib olla sama kasutajanimega liikmeid.
       subject: Tere tulemast Mastodoni
-      tip_federated_timeline: Föderatiivne ajajoon on reaalajas voogvaade tervest Mastodoni võrgust. Aga see sisaldab ainult inimesi, keda su naabrid tellivad, niiet see pole täiuslik.
-      tip_following: Vaikimisi, Te jälgite ainult oma serveri administraator(eid). Et leida rohkem huvitavamaid inimesi, vaadake kohalikke ja föderatiivseid ajajooni.
-      tip_local_timeline: Kohalik ajajoon on reaalajas voogvaade inimestest, kes on serveris %{instance}. Need on Teie lähimad naabrid!
-      tip_mobile_webapp: Kui Teie mobiilne veebilehitseja pakub Teile lisada meid Teie avaekraanile, saate Te reaalajas teateid. See töötab nagu tavaline mobiilirakendus mitmel moel!
-      tips: Nõuanded
-      title: Tere tulemast pardale, %{name}!
+      title: Tere tulemast, %{name}!
   users:
     follow_limit_reached: Te ei saa jälgida rohkem kui %{limit} inimest
-    invalid_otp_token: Vale kaheastmelise autentimise kood
+    invalid_otp_token: Vale kahe-etapine võti
     otp_lost_help_html: Kui Te kaotasite ligipääsu mõlemale, saate võtta ühendust %{email}-iga
-    seamless_external_login: Te olete sisse loginud läbi väljaspool asuva teenusega, niiet salasõna ja e-posti sätted pole saadaval.
+    seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
     signed_in_as: 'Sisse logitud kasutajana:'
   verification:
-    explanation_html: 'Te saate <strong>kinnitada ennast oma linkide omanikena oma profiili metaandmetes</strong>. Et seda teha, peab Teie lingitud veebilehel olema link tagasi Teie Mastodoni profiilile. Tagasi saatval lingil <strong>peab</strong> olema <code>rel="me"</code> atribuut. Tekstisisu lingil ei loe. Siin on üks näide:'
+    explanation_html: 'Saad <strong>kinnitada ennast oma profiili veebiviidete omanikuna</strong>. Selleks peab viidatud veebilehel olema link tagasi su Mastodoni profiilile. Tagasi saatval lingil <strong>peab</strong> olema <code>rel="me"</code> atribuut. Lingi tekstiline sisu ei ole oluline. Siin on üks näide:'
     verification: Kinnitamine
+  webauthn_credentials:
+    add: Uue turvavõtme lisamine
+    create:
+      error: Turvavõtme lisamisel tekkis tõrge. Proovi palun uuesti.
+      success: Turvavõti edukalt lisatud.
+    delete: Kustuta
+    delete_confirmation: Kindel, et kustutada see turvavõti?
+    description_html: Lubades <strong>turvavõtmega autentimise</strong> on sisenemisel tarvis ühte turvavõtmetest.
+    destroy:
+      error: Turvavõtme kustutamisel tekkis tõrge. Palun proovi uuesti.
+      success: Turvavõtmed edukalt kustutatud.
+    invalid_credential: Vigane turvavõti
+    nickname_hint: Uue turvavõtme hüüdnimi
+    not_enabled: Veebiautentimine pole sisse lülitatud
+    not_supported: See veebilehitseja ei toeta turvavõtmeid
+    otp_required: Turvavõtmete kasutamiseks tuleb eelnevalt sisse lülitada kahe-etapine autentimine.
+    registered_on: Registreeritud %{date}
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e0fc86b48..b94f621dc 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1,90 +1,27 @@
 ---
 eu:
   about:
-    about_hashtag_html: Hauek <strong>#%{hashtag}</strong> traola duten bidalketa publikoak dira. Fedibertsoko edozein kontu baduzu harremanetan jarri zaitezke.
     about_mastodon_html: 'Etorkizuneko sare soziala: ez iragarkirik eta ez zelatatze korporatiborik, diseinu etikoa eta deszentralizazioa! Izan zure datuen jabea Mastodonekin!'
-    about_this: Honi buruz
-    active_count_after: aktibo
-    active_footnote: Hilabeteko erabiltzaile aktiboak (HEA)
-    administered_by: 'Administratzailea(k):'
-    api: APIa
-    apps: Aplikazio mugikorrak
-    apps_platforms: Erabili Mastodon, iOS, Android eta beste plataformetatik
-    browse_directory: Arakatu profilen direktorio bat eta iragazi interesen arabera
-    browse_local_posts: Arakatu zerbitzari honetako bidalketa publikoen zuzeneko jario bat
-    browse_public_posts: Arakatu Mastodoneko bidalketa publikoen zuzeneko jario bat
-    contact: Kontaktua
     contact_missing: Ezarri gabe
     contact_unavailable: E/E
-    discover_users: Aurkitu erabiltzaileak
-    documentation: Dokumentazioa
-    federation_hint_html: "%{instance} instantzian kontu bat izanda edozein Mastodon zerbitzariko jendea jarraitu ahal izango duzu, eta harago ere."
-    get_apps: Probatu mugikorrerako aplikazio bat
     hosted_on: Mastodon %{domain} domeinuan ostatatua
-    instance_actor_flash: "Kontu hau zerbitzaria bera adierazten duen aktore birtual bat da, ez norbanako bat. Federaziorako erabiltzen da eta ez zenuke blokeatu behar instantzia osoa blokeatu nahi ez baduzu, kasu horretan domeinua blokeatzea egokia litzateke. \n"
-    learn_more: Ikasi gehiago
-    privacy_policy: Pribatutasun politika
-    rules: Zerbitzariaren arauak
-    rules_html: 'Behean Mastodon zerbitzari honetan kontua eduki nahi baduzu jarraitu beharreko arauen laburpena daukazu:'
-    see_whats_happening: Ikusi zer gertatzen ari den
-    server_stats: 'Zerbitzariaren estatistikak:'
-    source_code: Iturburu kodea
-    status_count_after:
-      one: bidalketa
-      other: bidalketa
-    status_count_before: Hauek
-    tagline: Jarraitu lagunak eta egin berriak
-    terms: Erabilera baldintzak
-    unavailable_content: Eduki eskuraezina
-    unavailable_content_description:
-      domain: Zerbitzaria
-      reason: Arrazoia
-      rejecting_media: 'Zerbitzari hauetako multimedia fitxategiak ez dira prozesatuko ez gordeko, eta ez dira iruditxoak bistaratuko, jatorrizko irudira joan behar izango da klik eginez:'
-      rejecting_media_title: Iragazitako multimedia
-      silenced: 'Zerbitzari hauetako bidalketak denbora-lerro eta elkarrizketa publikoetan ezkutatuko dira, eta bere erabiltzaileen interakzioek ez dute jakinarazpenik sortuko ez badituzu jarraitzen:'
-      silenced_title: Isilarazitako zerbitzariak
-      suspended: 'Ez da zerbitzari hauetako daturik prozesatuko, gordeko, edo partekatuko, zerbitzari hauetako erabiltzaileekin komunikatzea ezinezkoa eginez:'
-      suspended_title: Kanporatutako zerbitzariak
-    unavailable_content_html: Mastodonek orokorrean fedibertsoko beste zerbitzarietako erabiltzaileen edukia ikustea eta beraiekin aritzea ahalbidetzen dizu. Salbuespena egin da zerbitzari zehatz honekin.
-    user_count_after:
-      one: erabiltzaile
-      other: erabiltzaile
-    user_count_before: Hemen
-    what_is_mastodon: Zer da Mastodon?
+    title: Honi buruz
   accounts:
-    choices_html: "%{name}(r)en aukerak:"
-    endorsements_hint: Jarraitzen duzun jendea sustatu dezakezu web interfazearen bidez, eta hemen agertuko da.
-    featured_tags_hint: Hemen agertuko diren traolak nabarmendu ditzakezu.
     follow: Jarraitu
     followers:
       one: Jarraitzaile
       other: jarraitzaile
     following: Jarraitzen
     instance_actor_flash: Kontu hau zerbitzaria adierazten duen aktore birtual bat da eta ez banako erabiltzaile bat. Federatzeko helburuarekin erabiltzen da eta ez da kanporatu behar.
-    joined: "%{date}(e)an elkartua"
     last_active: azkenekoz aktiboa
     link_verified_on: 'Esteka honen jabetzaren egiaztaketa data: %{date}'
-    media: Multimedia
-    moved_html: "%{name} hona migratu da %{new_profile_link}:"
-    network_hidden: Informazio hau ez dago eskuragarri
-    never_active: Inoiz ez
     nothing_here: Ez dago ezer hemen!
-    people_followed_by: "%{name}(e)k jarraitzen dituenak"
-    people_who_follow: "%{name} jarraitzen dutenak"
     pin_errors:
       following: Onetsi nahi duzun pertsona aurretik jarraitu behar duzu
     posts:
       one: Bidalketa
       other: Bidalketa
     posts_tab_heading: Bidalketa
-    posts_with_replies: Bidalketak eta erantzunak
-    roles:
-      admin: Administratzailea
-      bot: Bot-a
-      group: Taldea
-      moderator: Moderatzailea
-    unavailable: Profila ez dago eskuragarri
-    unfollow: Utzi jarraitzeari
   admin:
     account_actions:
       action: Burutu ekintza
@@ -92,31 +29,36 @@ eu:
     account_moderation_notes:
       create: Sortu oharra
       created_msg: Moderazio oharra ongi sortu da!
-      delete: Ezabatu
       destroyed_msg: Moderazio ohara ongi suntsitu da!
     accounts:
       add_email_domain_block: Sartu domeinua zerrenda beltzean
       approve: Onartu
-      approve_all: Onartu denak
       approved_msg: "%{username} erabiltzailearen erregistratzeko eskaera behar bezala onartu da"
       are_you_sure: Ziur zaude?
       avatar: Abatarra
       by_domain: Domeinua
       change_email:
-        changed_msg: e-mail kontua ongi aldatu da!
+        changed_msg: Eposta kontua ongi aldatu da!
         current_email: Uneko e-mail helbidea
         label: Aldatu e-mail helbidea
         new_email: E-mail berria
         submit: Aldatu e-mail helbidea
         title: Aldatu %{username}(r)en e-mail helbidea
+      change_role:
+        changed_msg: Rola ondo aldatu da!
+        label: Aldatu rola
+        no_role: Rolik ez
+        title: Aldatu %{username} erabiltzailearen rola
       confirm: Berretsi
       confirmed: Berretsita
       confirming: Berresten
+      custom: Pertsonalizatua
       delete: Ezabatu datuak
       deleted: Ezabatua
       demote: Jaitsi mailaz
       destroyed_msg: "%{username} erabiltzailearen datuak behin betiko ezabatzeko ilaran daude"
       disable: Desgaitu
+      disable_sign_in_token_auth: Desgaitu e-posta token autentifikazioa
       disable_two_factor_authentication: Desgaitu 2FA
       disabled: Desgaituta
       display_name: Pantaila-izena
@@ -125,6 +67,7 @@ eu:
       email: E-mail
       email_status: Posta elektronikoaren egoera
       enable: Gaitu
+      enable_sign_in_token_auth: Gaitu e-posta token autentifikazioa
       enabled: Gaituta
       enabled_msg: "%{username} kontua behar bezala desblokeatu da"
       followers: Jarraitzaileak
@@ -149,17 +92,22 @@ eu:
         active: Aktiboa
         all: Denak
         pending: Zain
-        silenced: Isilarazita
+        silenced: Mugatua
         suspended: Kanporatua
         title: Moderazioa
       moderation_notes: Moderazio oharrak
       most_recent_activity: Azken jarduera
       most_recent_ip: Azken IP-a
-      no_account_selected: Ez da konturik aldatu ez delako bata bera hautatu
+      no_account_selected: Ez da konturik aldatu ez delako bat ere hautatu
       no_limits_imposed: Ez da mugarik ezarri
+      no_role_assigned: Ez du rolik esleituta
       not_subscribed: Harpidetu gabe
       pending: Berrikusketa egiteke
       perform_full_suspension: Kanporatu
+      previous_strikes: Aurreko neurriak
+      previous_strikes_description_html:
+        one: Kontu honen aurka neurri <strong>bat</strong> hartu da.
+        other: Kontu honen aurka <strong>%{count}</strong> neurri hartu dira.
       promote: Sustatu
       protocol: Protokoloa
       public: Publikoa
@@ -167,7 +115,6 @@ eu:
       redownload: Freskatu profila
       redownloaded_msg: "%{username} erabiltzailearen profila behar bezala freskatu da jatorritik"
       reject: Ukatu
-      reject_all: Ukatu denak
       rejected_msg: "%{username} erabiltzailearen izen emate eskaera behar bezala ukatu da"
       remove_avatar: Kendu abatarra
       remove_header: Kendu goiburua
@@ -180,15 +127,13 @@ eu:
       reset: Berrezarri
       reset_password: Berrezarri pasahitza
       resubscribe: Berriro harpidetu
-      role: Baimenak
-      roles:
-        admin: Administratzailea
-        moderator: Moderatzailea
-        staff: Langilea
-        user: Erabiltzailea
+      role: Rola
       search: Bilatu
       search_same_email_domain: E-mail domeinu bera duten beste erabiltzailean
       search_same_ip: IP bera duten beste erabiltzaileak
+      security_measures:
+        only_password: Soilik pasahitza
+        password_and_2fa: Pasahitza eta 2FA
       sensitive: Hunkigarria
       sensitized: hunkigarri gisa markatua
       shared_inbox_url: Partekatutako sarrera ontziaren URL-a
@@ -198,12 +143,15 @@ eu:
       silence: Isilarazi
       silenced: Isilarazita
       statuses: Bidalketa
+      strikes: Aurreko neurriak
       subscribe: Harpidetu
+      suspend: Kanporatu
       suspended: Kanporatuta
       suspension_irreversible: Kontu honen datuak behin betiko ezabatu dira. Kontua kanporatzea atzera bota dezakezu, berriz erabilgarri izan dadin, baina datuak ezingo dira berreskuratu.
       suspension_reversible_hint_html: Kontu hau kanporatua izan da eta bere datuak %{date}(e)an behin betiko ezabatuko dira. Ordura arte kontua kalterik gabe leheneratu daiteke. Kontuaren datu guztiak oraintxe bertan ezabatu nahi badituzu, jarraian egin dezakezu.
-      time_in_queue: Kolan zain %{time}
       title: Kontuak
+      unblock_email: Desblokeatu eposta helbidea
+      unblocked_email_msg: Behar bezala desblokeatu da %{username} eposta helbidea
       unconfirmed_email: Baieztatu gabeko e-mail helbidea
       undo_sensitized: Desegin hunkigarria
       undo_silenced: Utzi isilarazteari
@@ -218,92 +166,124 @@ eu:
       whitelisted: Zerrenda zurian
     action_logs:
       action_types:
+        approve_appeal: Onartu apelazioa
+        approve_user: Onartu erabiltzailea
         assigned_to_self_report: Esleitu salaketa
         change_email_user: Aldatu erabiltzailearen e-maila
+        change_role_user: Aldatu erabiltzailearen rola
         confirm_user: Berretsi erabiltzailea
         create_account_warning: Sortu abisua
         create_announcement: Sortu iragarpena
+        create_canonical_email_block: Sortu eposta blokeoa
         create_custom_emoji: Sortu emoji pertsonalizatua
         create_domain_allow: Sortu domeinu baimena
         create_domain_block: Sortu domeinu blokeoa
         create_email_domain_block: Sortu e-mail domeinu blokeoa
         create_ip_block: Sortu IP araua
         create_unavailable_domain: Sortu eskuragarri ez dagoen domeinua
+        create_user_role: Sortu rola
         demote_user: Jaitsi erabiltzailearen maila
         destroy_announcement: Ezabatu iragarpena
+        destroy_canonical_email_block: Ezabatu eposta blokeoa
         destroy_custom_emoji: Ezabatu emoji pertsonalizatua
         destroy_domain_allow: Ezabatu domeinu baimena
         destroy_domain_block: Ezabatu domeinu blokeoa
         destroy_email_domain_block: Ezabatu e-mail domeinu blokeoa
+        destroy_instance: Ezabatu betiko domeinua
         destroy_ip_block: Ezabatu IP araua
         destroy_status: Ezabatu bidalketa
         destroy_unavailable_domain: Ezabatu eskuragarri ez dagoen domeinua
+        destroy_user_role: Ezabatu rola
         disable_2fa_user: Desgaitu 2FA
         disable_custom_emoji: Desgaitu emoji pertsonalizatua
+        disable_sign_in_token_auth_user: Desgaitu e-posta token autentifikazioa erabiltzailearentzat
         disable_user: Desgaitu erabiltzailea
         enable_custom_emoji: Gaitu emoji pertsonalizatua
+        enable_sign_in_token_auth_user: Gaitu e-posta token autentifikazioa erabiltzailearentzat
         enable_user: Gaitu erabiltzailea
         memorialize_account: Bihurtu kontua oroigarri
         promote_user: Igo erabiltzailea mailaz
+        reject_appeal: Baztertu apelazioa
+        reject_user: Baztertu erabiltzailea
         remove_avatar_user: Kendu abatarra
         reopen_report: Berrireki txostena
+        resend_user: Birbidali berrespen posta
         reset_password_user: Berrezarri pasahitza
         resolve_report: Konpondu txostena
         sensitive_account: Markatu zure kontuko multimedia hunkigarri bezala
         silence_account: Isilarazi kontua
         suspend_account: Kanporatu kontua
         unassigned_report: Kendu txostenaren esleipena
+        unblock_email_account: Desblokeatu eposta helbidea
         unsensitive_account: Utzi zure kontuko multimedia hunkigarri bezala markatzeari
         unsilence_account: Utzi kontua isilarazteari
         unsuspend_account: Atzera bota kontua kanporatzea
         update_announcement: Eguneratu iragarpena
         update_custom_emoji: Eguneratu emoji pertsonalizatua
         update_domain_block: Eguneratu domeinu-blokeoa
+        update_ip_block: Eguneratu IP araua
         update_status: Eguneratu bidalketa
+        update_user_role: Eguneratu rola
       actions:
+        approve_appeal_html: "%{name} erabiltzaileak %{target} erabiltzailearen moderazio erabakiaren apelazioa onartu du"
+        approve_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen izen-ematea onartu du"
         assigned_to_self_report_html: "%{name} erabiltzaileak %{target} salaketa bere buruari esleitu dio"
         change_email_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen e-posta helbidea aldatu du"
+        change_role_user_html: "%{name} erabiltzaileak %{target} kontuaren rola aldatu du"
         confirm_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen e-posta helbidea berretsi du"
         create_account_warning_html: "%{name} erabiltzaileak abisua bidali dio %{target} erabiltzaileari"
         create_announcement_html: "%{name} erabiltzaileak %{target} iragarpen berria sortu du"
+        create_canonical_email_block_html: "%{name} erabiltzaileak %{target} hash-a duen helbide elektronikoa blokeatu du"
         create_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji berria kargatu du"
         create_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federazioa onartu du"
         create_domain_block_html: "%{name} erabiltzaileak %{target} domeinua blokeatu du"
         create_email_domain_block_html: "%{name} erabiltzaileak %{target} e-posta helbideen domeinua blokeatu du"
         create_ip_block_html: "%{name} kontuak %{target} IParen araua sortu du"
         create_unavailable_domain_html: "%{name}(e)k %{target} domeinurako banaketa gelditu du"
+        create_user_role_html: "%{name} erabiltzaileak %{target} rola sortu du"
         demote_user_html: "%{name} erabiltzaileak %{target} erabiltzailea mailaz jaitsi du"
         destroy_announcement_html: "%{name} erabiltzaileak %{target} iragarpena ezabatu du"
-        destroy_custom_emoji_html: "%{name} erabiltzaileak %{target} emojia suntsitu du"
+        destroy_canonical_email_block_html: "%{name} erabiltzaileak %{target} hash-a duen helbide elektronikoa desblokeatu du"
+        destroy_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a ezabatu du"
         destroy_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federatzea debekatu du"
         destroy_domain_block_html: "%{name} erabiltzaileak %{target} domeinua desblokeatu du"
         destroy_email_domain_block_html: "%{name} erabiltzaileak %{target} e-posta helbideen domeinua desblokeatu du"
+        destroy_instance_html: "%{name} erabiltzaileak %{target} domeinua betiko ezabatu du"
         destroy_ip_block_html: "%{name} erabiltzaileak %{target} IParen araua ezabatu du"
         destroy_status_html: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketa kendu du"
         destroy_unavailable_domain_html: "%{name}(e)k %{target} domeinurako banaketari berrekin dio"
+        destroy_user_role_html: "%{name} erabiltzaileak %{target} rola ezabatu du"
         disable_2fa_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen bi faktoreko autentifikazioa desgaitu du"
         disable_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a desgaitu du"
+        disable_sign_in_token_auth_user_html: "%{name} erabiltzaileak e-posta token autentifikazioa desgaitu du %{target} helburuan"
         disable_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen saioa desgaitu du"
         enable_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a gaitu du"
+        enable_sign_in_token_auth_user_html: "%{name} erabiltzaileak e-posta token autentifikazioa gaitu du %{target} helburuan"
         enable_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen saioa gaitu du"
         memorialize_account_html: "%{name} erabiltzaileak %{target} kontua memoriala bihurtu du"
         promote_user_html: "%{name} erabiltzaileak %{target} erabiltzailea mailaz igo du"
+        reject_appeal_html: "%{name} erabiltzaileak %{target} erabiltzailearen moderazio erabakiaren apelazioa baztertu du"
+        reject_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen izen-ematea baztertu du"
         remove_avatar_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen abatarra kendu du"
         reopen_report_html: "%{name} erabiltzaileak %{target} txostena berrireki du"
+        resend_user_html: "%{name} kontuak berrespen eposta bidali du %{target} kontuarentzat"
         reset_password_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen pasahitza berrezarri du"
         resolve_report_html: "%{name} erabiltzaileak %{target} txostena konpondu du"
         sensitive_account_html: "%{name} erabiltzaileak %{target} erabiltzailearen multimedia hunkigarri bezala markatu du"
         silence_account_html: "%{name} erabiltzaileak %{target} kontua isilarazi du"
         suspend_account_html: "%{name} erabiltzaileak %{target} kontua kanporatu du"
         unassigned_report_html: "%{name} erabiltzaileak %{target} txostenaren esleipena atzera bota du"
+        unblock_email_account_html: "%{name} erabiltzaileak %{target} eposta helbidea desblokeatu du"
         unsensitive_account_html: "%{name} erabiltzaileak %{target} erabiltzailearen multimedia hunkigarri bezala markatzeari utzi dio"
         unsilence_account_html: "%{name} erabiltzaileak %{target} kontua isilarazteari utzi dio"
         unsuspend_account_html: "%{name} erabiltzaileak %{target} kontuaren kanporaketa atzera bota du"
         update_announcement_html: "%{name} erabiltzaileak %{target} iragarpena eguneratu du"
         update_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a eguneratu du"
         update_domain_block_html: "%{name} erabiltzaileak %{target} domeinu-blokeoa eguneratu du"
+        update_ip_block_html: "%{name} erabiltzaileak %{target} IParen araua aldatu du"
         update_status_html: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketa eguneratu du"
-      deleted_status: "(ezabatutako bidalketa)"
+        update_user_role_html: "%{name} erabiltzaileak %{target} rola aldatu du"
+      deleted_account: ezabatu kontua
       empty: Ez da egunkaririk aurkitu.
       filter_by_action: Iragazi ekintzen arabera
       filter_by_user: Iragazi erabiltzaileen arabera
@@ -342,11 +322,12 @@ eu:
       enable: Gaitu
       enabled: Gaituta
       enabled_msg: Emoji hori ongi gaitu da
-      image_hint: PNG gehienez 50KB
+      image_hint: "%{size} arteko PNG edo GIF"
       list: Zerrendatu
       listed: Zerrendatua
       new:
         title: Gehitu emoji pertsonal berria
+      no_emoji_selected: Ez da emojirik aldatu ez delako bat ere hautatu
       not_permitted: Ez daukazu ekintza hau burutzeko baimenik
       overwrite: Gainidatzi
       shortcode: Laster-kodea
@@ -359,13 +340,41 @@ eu:
       updated_msg: Emoji-a ongi eguneratu da!
       upload: Igo
     dashboard:
+      active_users: erabiltzaile aktibo
+      interactions: elkarrekintza
+      media_storage: Multimedia biltegiratzea
+      new_users: erabiltzaile berri
+      opened_reports: txosten irekita
+      pending_appeals_html:
+        one: Apelazio <strong>%{count}</strong> zain
+        other: "<strong>%{count}</strong> apelazio zain"
+      pending_reports_html:
+        one: Txosten <strong>%{count}</strong> zain
+        other: "<strong>%{count}</strong> txosten zain"
+      pending_tags_html:
+        one: Traola <strong>%{count}</strong> zain
+        other: "<strong>%{count}</strong> traola zain"
+      pending_users_html:
+        one: Erabiltzaile <strong>%{count}</strong> zain
+        other: "<strong>%{count}</strong> erabiltzaile zain"
+      resolved_reports: txosten konponduta
       software: Softwarea
+      sources: Izen emate jatorriak
       space: Espazio erabilera
       title: Kontrol panela
+      top_languages: Hizkuntza aktiboenak
+      top_servers: Zerbitzari aktiboenak
+      website: Webgunea
+    disputes:
+      appeals:
+        empty: Ez da apelaziorik aurkitu.
+        title: Apelazioak
     domain_allows:
       add_new: Sartu domeinua zerrenda zurian
       created_msg: Domeinua ongi sartu da zerrenda zurian
       destroyed_msg: Domeinua zerrenda zuritik kendu da
+      export: Esportatu
+      import: Inportatu
       undo: Kendu zerrenda zuritik
     domain_blocks:
       add_new: Gehitu domeinuaren blokeo berria
@@ -373,12 +382,14 @@ eu:
       destroyed_msg: Domeinuaren blokeoa desegin da
       domain: Domeinua
       edit: Editatu domeinu-blokeoa
+      existing_domain_block: Aurretik muga zorrotzagoak ezarriak dituzu %{name} domeinuan.
       existing_domain_block_html: '%{name} domeinuan muga zorrotzagoak ezarri dituzu jada, aurretik <a href="%{unblock_url}">desblokeatu</a> beharko duzu.'
+      export: Esportatu
+      import: Inportatu
       new:
         create: Sortu blokeoa
         hint: Domeinuaren blokeoak ez du eragotziko kontuen sarrerak sortzea datu-basean, baina automatikoki ezarriko zaizkie moderazio metodo bereziak iraganeko mezuetan ere.
         severity:
-          desc_html: "<strong>Isilarazi</strong>-k kontuko bidalketak jarraitzaileek besterik ez ikustea eragingo du. <strong>Kanporatu</strong>-k kontuaren edukia, multimedia eta profileko datuak ezabatuko ditu. <strong>Bat ere ez</strong> nahi duzun guztia multimedia fitxategiak ukatzea bada."
           noop: Bat ere ez
           silence: Isilarazi
           suspend: Kanporatu
@@ -393,34 +404,31 @@ 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
-      rejecting_media: errefusatu multimedia fitxategiak
-      rejecting_reports: txostenak errefusatzen
-      severity:
-        silence: isilarazia
-        suspend: kanporatua
-      show:
-        affected_accounts:
-          one: Datu-baseko kontu bati eragiten dio
-          other: Datu-baseko %{count} kontuei eragiten die
-        retroactive:
-          silence: Kendu isilarazteko agindua domeinu honetako kontu guztiei
-          suspend: Kendu kanporatzeko agindua domeinu honetako kontu guztiei
-        title: Desegin %{domain} domeinuko blokeoa
-        undo: Desegin
       undo: Desegin domeinuaren blokeoa
       view: Ikusi domeinuaren blokeoa
     email_domain_blocks:
       add_new: Gehitu berria
+      attempts_over_week:
+        one: Izen-emateko saiakera %{count} azken astean
+        other: Izen-emateko %{count} saiakera azken astean
       created_msg: Ongi gehitu da e-mail helbidea domeinuen zerrenda beltzera
       delete: Ezabatu
-      destroyed_msg: Ongi ezabatu da e-mail domeinua zerrenda beltzetik
+      dns:
+        types:
+          mx: MX erregistroa
       domain: Domeinua
-      empty: Ez dago e-mail domeinurik zerrenda beltzean.
-      from_html: "%{domain} domeinutik"
       new:
         create: Gehitu domeinua
+        resolve: Ebatzi domeinua
         title: Sarrera berria e-mail zerrenda beltzean
+      no_email_domain_block_selected: Ez da eposta domeinu blokeorik aldatu ez delako bat ere hautatu
+      resolved_dns_records_hint_html: Domeinu-izena ondorengo MX domeinuetara ebazten da, zeinek eposta onartzeko ardura duten. MX domeinu bat blokeatzeak MX domeinu hori erabiltzen duen edozein helbide elektronikotatik izena-ematea blokeatzen du, baita ikusgai dagoen domeinu-izena beste bat bada ere. <strong>Kontuz ibili eposta hornitzaile nagusiak blokeatu gabe.</strong>
+      resolved_through_html: "%{domain} domeinuaren bidez ebatzia"
       title: E-mail zerrenda beltza
+    export_domain_allows:
+      no_file: Ez da fitxategirik hautatu
+    export_domain_blocks:
+      no_file: Ez da fitxategirik hautatu
     follow_recommendations:
       description_html: "<strong>Jarraitzeko gomendioek erabiltzaile berriei eduki interesgarria azkar aurkitzen laguntzen diete</strong>. Erabiltzaile batek jarraitzeko gomendio pertsonalizatuak jasotzeko adina interakzio izan ez duenean, kontu hauek gomendatzen zaizkio. Egunero birkalkulatzen dira hizkuntza bakoitzerako, azken aldian parte-hartze handiena izan duten eta jarraitzaile lokal gehien dituzten kontuak nahasiz."
       language: Hizkuntza
@@ -430,25 +438,53 @@ eu:
       title: Jarraitzeko gomendioak
       unsuppress: Berrezarri jarraitzeko gomendioa
     instances:
+      availability:
+        description_html:
+          one: Domeinura entregatzeak arrakastarik gabe huts egiten badu <strong>egun %{count} </strong>igaro ondoren, ez da entregatzeko saiakera gehiago egingo, ez bada domeinu <em>horretatik</em> entregarik jasotzen.
+          other: Domeinura entregatzeak arrakastarik gabe huts egiten badu <strong>%{count} egun</strong> igaro ondoren, ez da entregatzeko saiakera gehiago egingo, ez bada domeinu <em>horretatik</em> entregarik jasotzen.
+        failure_threshold_reached: Hutsegite atalasera iritsi da %{date} datan.
+        failures_recorded:
+          one: Huts egindako saiakera egun %{count}ean.
+          other: Huts egindako saiakera %{count} egun desberdinetan.
+        no_failures_recorded: Ez dago hutsegiterik erregistroan.
+        title: Egoera
+        warning: Zerbitzari honetara konektatzeko azken saiakerak huts egin du
       back_to_all: Guztiak
       back_to_limited: Mugatua
       back_to_warning: Abisua
       by_domain: Domeinua
+      confirm_purge: Ziur zaude domeinu honen datuak behin betiko ezabatu nahi dituzula?
+      content_policies:
+        comment: Barne-oharra
+        description_html: Domeinu honetako eta bere azpi-domeinuetako kontu guztiei aplikatuko zaizkien eduki-politikak definitu ditzakezu.
+        policies:
+          reject_media: Errefusatu multimediak
+          reject_reports: Errefusatu salaketak
+          silence: Isilarazi
+          suspend: Kanporatu
+        policy: Politika
+        reason: Arrazoi publikoa
+        title: Eduki politikak
+      dashboard:
+        instance_accounts_dimension: Kontu jarraituenak
+        instance_accounts_measure: gordetako kontuak
+        instance_followers_measure: gure jarraitzaileak hemen
+        instance_follows_measure: beren jarraitzaileak hemen
+        instance_languages_dimension: Hizkuntza nagusiak
+        instance_media_attachments_measure: multimedia eranskin biltegiratuta
+        instance_reports_measure: txosten berari buruz
+        instance_statuses_measure: bidalketa gordeta
       delivery:
         all: Guztiak
         clear: Garbitu banaketa erroreak
+        failing: Huts egiten du
         restart: Berrabiarazi banaketa
         stop: Gelditu banaketa
-        title: Banaketa
         unavailable: Eskuraezina
-        unavailable_message: Banaketa ez dago eskuragarri
-        warning: Abisua
-        warning_message:
-          one: Banaketa hutsegitea egun %{count}
-          other: Banaketa hutsegitea %{count} egun
       delivery_available: Bidalketa eskuragarri dago
       delivery_error_days: Banaketa errore egunak
       delivery_error_hint: Banaketa ezin bada %{count} egunean egin, banaezin bezala markatuko da automatikoki.
+      destroyed_msg: "%{domain} domeinuko datuak berehala ezabatzeko ilaran daude orain."
       empty: Ez da domeinurik aurkitu.
       known_accounts:
         one: Kontu ezagun %{count}
@@ -459,12 +495,15 @@ eu:
         title: Moderazioa
       private_comment: Iruzkin pribatua
       public_comment: Iruzkin publikoa
+      purge: Ezabatu betiko
+      purge_description_html: Domeinu hau behin betiko lineaz kanpo dagoela uste baduzu, domeinuko kontu guztien erregistroak eta erlazionatutako datuak ezabatu ditzakezu biltegitik. Honek luze jo dezake.
       title: Federazioa
       total_blocked_by_us: Guk blokeatuta
       total_followed_by_them: Haiek jarraitua
       total_followed_by_us: Guk jarraitua
       total_reported: Heiei buruzko txostenak
       total_storage: Multimedia eranskinak
+      totals_time_period_hint_html: Behean bistaratutako guztizkoek datu guztiak hartzen dituzte barne.
     invites:
       deactivate_all: Desgaitu guztiak
       filter:
@@ -486,10 +525,8 @@ eu:
         '94670856': 3 urte
       new:
         title: Sortu IP arau berria
-      no_ip_block_selected: Ez da IP araurik aldatu, ez delako batere hautatu
+      no_ip_block_selected: Ez da IP araurik aldatu, ez delako bat ere hautatu
       title: IP arauak
-    pending_accounts:
-      title: Zain dauden kontuak (%{count})
     relationships:
       title: "%{acct}(e)ren erlazioak"
     relays:
@@ -516,38 +553,121 @@ eu:
         notes:
           one: Ohar %{count}
           other: "%{count} ohar"
-        reports:
-          one: Txosten %{count}
-          other: "%{count} txosten"
+      action_log: Auditoria-egunkaria
       action_taken_by: Neurrien hartzailea
+      actions:
+        delete_description_html: Salatutako bidalketak ezabatuko dira eta neurria gordeko da, etorkizunean kontu berarekin elkarrekintzarik baduzu kontuan izan dezazun.
+        mark_as_sensitive_description_html: Salatutako bidalketetako multimedia edukia hunkigarri bezala eta neurria gordeko da, etorkizunean kontu honek arau-hausterik egiten badu kontuan izan dezazun.
+        other_description_html: Ikusi kontuaren portaera kontrolatzeko eta salatutako kontuarekin komunikazioa pertsonalizatzeko aukera gehiago.
+        resolve_description_html: Ez da ekintzarik hartuko salatutako kontuaren aurka, ez da neurria gordeko eta salaketa itxiko da.
+        silence_description_html: Profila dagoeneko jarraitzen dutenei edo eskuz bilatzen dutenei bakarrik agertuko zaie, bere irismena asko mugatuz. Beti bota daiteke atzera.
+        suspend_description_html: Profila eta bere eduki guztiak iritsiezinak bihurtuko dira, ezabatzen den arte. Kontuarekin ezin da interakziorik eduki. Atzera bota daiteke 30 eguneko epean.
+      actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
+      add_to_report: Gehitu gehiago txostenera
       are_you_sure: Ziur zaude?
       assign_to_self: Esleitu niri
       assigned: Esleitutako moderatzailea
+      by_target_domain: Jakinarazitako kontuaren domeinua
+      category: Kategoria
+      category_description_html: Kontu edo/eta eduki hau salatu izanaren arrazoia salatutako kontuarekiko komunikazioan aipatuko da
       comment:
         none: Bat ere ez
+      comment_description_html: 'Informazio gehiago emateko, %{name} idatzi:'
       created_at: Salatua
+      delete_and_resolve: Ezabatu bidalketak
       forwarded: Birbidalia
       forwarded_to: 'Hona birbidalia: %{domain}'
       mark_as_resolved: Markatu konpondutako gisa
+      mark_as_sensitive: Markatu hunkigarri gisa
       mark_as_unresolved: Markatu konpondu gabeko gisa
+      no_one_assigned: Inor ez
       notes:
         create: Gehitu oharra
         create_and_resolve: Konpondu ohar batekin
         create_and_unresolve: Berrireki ohar batekin
         delete: Ezabatu
         placeholder: Azaldu hartutako neurriak, edo erlazioa duten bestelako berriak...
+        title: Oharrak
+      notes_description_html: Ikusi eta idatzi oharrak beste moderatzaileentzat eta zuretzat etorkizunerako
+      quick_actions_description_html: 'Hartu ekintza azkar bat edo korritu behera salatutako edukia ikusteko:'
+      remote_user_placeholder: "%{instance} instantziako urruneko erabiltzailea"
       reopen: Berrireki salaketa
       report: 'Salaketa #%{id}'
       reported_account: Salatutako kontua
       reported_by: Salatzailea
       resolved: Konponduta
       resolved_msg: Salaketa ongi konpondu da!
+      skip_to_actions: Salto ekintzetara
       status: Mezua
-      target_domain: Jakinarazitako kontuaren domeinua
+      statuses: Salatutako edukia
+      statuses_description_html: Salatutako edukia salatutako kontuarekiko komunikazioan aipatuko da
+      target_origin: Salatutako kontuaren jatorria
       title: Salaketak
       unassign: Kendu esleipena
       unresolved: Konpondu gabea
       updated_at: Eguneratua
+      view_profile: Ikusi profila
+    roles:
+      add_new: Gehitu rola
+      assigned_users:
+        one: Erabiltzaile %{count}
+        other: "%{count} erabiltzaile"
+      categories:
+        administration: Administrazioa
+        devops: DevOps
+        invites: Gonbidapenak
+        moderation: Moderazioa
+        special: Berezia
+      delete: Ezabatu
+      description_html: "<strong>Erabiltzaile rolak</strong> erabiliz erabiltzaileek Mastodonen ze funtzio eta lekutara sarbidea duten pertsonalizatu dezakezu."
+      edit: Editatu '%{name}' rola
+      everyone: Baimen lehenetsiak
+      everyone_full_description_html: Hau <strong>erabiltzaile guztiei</strong> eragiten dien <strong>oinarrizko rola</strong> da, rol bat esleitu gabekoei ere bai. Gainerako rolek honetatik heredatzen dituzte baimenak.
+      permissions_count:
+        one: Baimen %{count}
+        other: "%{count} baimen"
+      privileges:
+        administrator: Administratzailea
+        administrator_description: Baimen hau duten erabiltzaileak baimen guztien gainetik pasako dira
+        delete_user_data: Ezabatu erabiltzaileen datuak
+        delete_user_data_description: Baimendu erabiltzaileek beste erabiltzaileen datuak atzerapenik gabe ezabatzea
+        invite_users: Gonbidatu erabiltzaileak
+        invite_users_description: Baimendu erabiltzaileek zerbitzarira jende berria gonbidatzea
+        manage_announcements: Kudeatu iragarpenak
+        manage_announcements_description: Baimendu erabiltzaileek zerbitzariko iragarpenak kudeatzea
+        manage_appeals: Kudeatu apelazioak
+        manage_appeals_description: Baimendu erabiltzaileek moderazio ekintzen aurkako apelazioak berrikustea
+        manage_blocks: Kudeatu blokeatzeak
+        manage_blocks_description: Baimendu erabiltzaileek eposta hornitzaile eta IP helbideak blokeatzea
+        manage_custom_emojis: Kudeatu emoji pertsonalizatuak
+        manage_custom_emojis_description: Baimendu erabiltzaileek zerbitzariko emoji pertsonalizatuak kudeatzea
+        manage_federation: Kudeatu federazioa
+        manage_federation_description: Baimendu erabiltzaileek beste domeinuak blokeatu edo federazioa onartzea, eta banagarritasuna kontrolatzea
+        manage_invites: Kudeatu gonbidapenak
+        manage_invites_description: Baimendu erabiltzaileek gonbidapen estekak arakatu eta desaktibatzea
+        manage_reports: Kudeatu txostenak
+        manage_reports_description: Baimendu erabiltzaileek txostenak berrikusi eta moderazio ekintzak burutzea
+        manage_roles: Kudeatu rolak
+        manage_roles_description: Baimendu erabiltzaileek beren mailaren azpiko rolak kudeatu eta esleitzea
+        manage_rules: Kudeatu arauak
+        manage_rules_description: Baimendu erabiltzaileek zerbitzariaren arauak aldatzea
+        manage_settings: Kudeatu ezarpenak
+        manage_settings_description: Baimendu erabiltzaileek gunearen ezarpenak aldatzea
+        manage_taxonomies: Kudeatu taxonomiak
+        manage_taxonomies_description: Baimendu erabiltzaileek joerak berrikustea eta traolen ezarpenak eguneratzea
+        manage_user_access: Kudeatu erabiltzaileen sarbidea
+        manage_user_access_description: Baimendu erabiltzaileek beste erabiltzaileen bi faktoreko autentifikazioa desaktibatzea, eposta helbideak aldatzea eta pasahitzak berrezartzea
+        manage_users: Kudeatu erabiltzaileak
+        manage_users_description: Baimendu erabiltzaileek beste erabiltzaileen xehetasunak ikusi eta moderazio ekintzak burutzea
+        manage_webhooks: Kudeatu webhook-ak
+        manage_webhooks_description: Baimendu erabiltzaileek webhook-ak konfiguratzea gertaera administratiboentzat
+        view_audit_log: Ikusi auditoria-egunkaria
+        view_audit_log_description: Baimendu erabiltzaileek zerbitzariko administrazio-ekintzen historia ikustea
+        view_dashboard: Ikusi aginte-panela
+        view_dashboard_description: Baimendu erabiltzaileek aginte-panela eta hainbat estatistika ikustea
+        view_devops: DevOps
+        view_devops_description: Baimendu erabiltzaileek Sidekiq eta pgHero aginte-paneletara sarbidea izatea
+      title: Rolak
     rules:
       add_new: Gehitu araua
       delete: Ezabatu
@@ -556,142 +676,198 @@ eu:
       empty: Ez da zerbitzariko araurik definitu oraindik.
       title: Zerbitzariaren arauak
     settings:
-      activity_api_enabled:
-        desc_html: Lokalki argitaratutako bidalketa kopurua, erabiltzaile aktiboak, eta izen emate berriak asteko
-        title: Argitaratu erabiltzaile-jardueraren estatistikak
-      bootstrap_timeline_accounts:
-        desc_html: Banandu erabiltzaile-izenak koma bitartez. Giltzapetu gabeko kontu lokalekin dabil bakarrik. Hutsik dagoenean lehenetsitakoa admin lokal guztiak da.
-        title: Lehenetsitako jarraipena erabiltzaile berrientzat
-      contact_information:
-        email: Laneko e-mail helbidea
-        username: Kontaktuaren erabiltzaile-izena
-      custom_css:
-        desc_html: Aldatu itxura orri bakoitzean kargatutako CSS bidez
-        title: CSS pertsonala
-      default_noindex:
-        desc_html: Ezarpen hau berez aldatu ez duten erabiltzaile guztiei eragiten die
-        title: Utzi erabiltzaileak bilatzailearen indexaziotik kanpo lehenetsita
+      about:
+        manage_rules: Kudeatu zerbitzariaren arauak
+        preamble: Zerbitzaria nola gobernatzen, moderatzen eta finantzatzen den azaltzen duen informazio xehea eman.
+        rules_hint: Erabiltzaileek jarraitu behar dituzten arauei eskainitako atal bat dago.
+        title: Honi buruz
+      appearance:
+        preamble: Mastodonen web interfazea pertsonalizatu.
+        title: Itxura
+      branding:
+        preamble: 'Zure zerbitzariaren markak sareko beste zerbitzarietatik bereizten du. Informazio hau hainbat ingurunetan bistaratuko da: Mastodonen web interfazean, aplikazio natiboetan, esteken aurrebistak beste webguneetan eta mezularitza aplikazioetan eta abar. Horregatik, informazio hau garbia eta laburra izatea komeni da.'
+        title: Marka
+      content_retention:
+        preamble: Kontrolatu erabiltzaileek sortutako edukia nola biltegiratzen den Mastodonen.
+        title: Edukia atxikitzea
+      discovery:
+        follow_recommendations: Jarraitzeko gomendioak
+        preamble: Eduki interesgarria aurkitzea garrantzitsua da Mastodoneko erabiltzaile berrientzat, behar bada inor ez dutelako ezagutuko. Kontrolatu zure zerbitzariko aurkikuntza-ezaugarriek nola funtzionatzen duten.
+        profile_directory: Profil-direktorioa
+        public_timelines: Denbora-lerro publikoak
+        title: Aurkitzea
+        trends: Joerak
       domain_blocks:
         all: Guztiei
         disabled: Inori ez
-        title: Erakutsi domeinu-blokeoak
         users: Saioa hasita duten erabiltzaile lokalei
-      domain_blocks_rationale:
-        title: Erakutsi arrazoia
-      hero:
-        desc_html: Azaleko orrian bistaratua. Gutxienez 600x100px aholkatzen da. Ezartzen ez bada, zerbitzariaren irudia hartuko du
-        title: Azaleko irudia
-      mascot:
-        desc_html: Hainbat orritan bistaratua. Gutxienez 293x205px aholkatzen da. Ezarri ezean lehenetsitako maskota erakutsiko da
-        title: Maskotaren irudia
-      peers_api_enabled:
-        desc_html: Zerbitzari honek fedibertsoan aurkitutako domeinu-izenak
-        title: Argitaratu aurkitutako zerbitzarien zerrenda
-      preview_sensitive_media:
-        desc_html: Beste webguneetako esteken aurrebistak iruditxoa izango du multimedia hunkigarri gisa markatzen bada ere
-        title: Erakutsi multimedia hunkigarria OpenGraph aurrebistetan
-      profile_directory:
-        desc_html: Baimendu erabiltzaileak aurkigarriak izatea
-        title: Gaitu profil-direktorioa
       registrations:
-        closed_message:
-          desc_html: Azaleko orrian bistaratua izen ematea ixten denean. HTML etiketak erabili ditzakezu
-          title: Izen emate itxiaren mezua
-        deletion:
-          desc_html: Baimendu edonori bere kontua ezabatzea
-          title: Ireki kontu ezabaketa
-        min_invite_role:
-          disabled: Inor ez
-          title: Baimendu hauen gobidapenak
-        require_invite_text:
-          desc_html: Izen emateak eskuz onartu behar direnean, "Zergatik elkartu nahi duzu?" testu sarrera derrigorrezko bezala ezarri, ez hautazko
-          title: Eskatu erabiltzaile berriei bat egiteko arrazoia sartzeko
+        preamble: Kontrolatu nork sortu dezakeen kontua zerbitzarian.
+        title: Izen emateak
       registrations_mode:
         modes:
           approved: Izena emateko onarpena behar da
           none: Ezin du inork izena eman
           open: Edonork eman dezake izena
-        title: Erregistratzeko modua
-      show_known_fediverse_at_about_page:
-        desc_html: Txandakatzean, fedibertso ezagun osoko tootak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko
-        title: Erakutsi fedibertsu ezagun osoko denbora-lerroa aurrebistan
-      show_staff_badge:
-        desc_html: Erakutsi langile banda erabiltzailearen orrian
-        title: Erakutsi langile banda
-      site_description:
-        desc_html: Azaleko orrian agertuko den sarrera paragrafoa. Azaldu zerk egiten duen berezi Mastodon zerbitzari hau eta garrantzizko beste edozer. HTML etiketak erabili ditzakezu, zehazki <code>&lt;a&gt;</code> eta <code>&lt;em&gt;</code>.
-        title: Zerbitzariaren deskripzioa
-      site_description_extended:
-        desc_html: Zure jokabide-koderako  toki on bat, arauak, gidalerroak eta zure zerbitzari desberdin egiten duten bestelakoak. HTML etiketak erabili ditzakezu
-        title: Informazio hedatu pertsonalizatua
-      site_short_description:
-        desc_html: Albo-barra eta meta etiketetan bistaratua. Deskribatu zerk egiten duen Mastodon zerbitzari hau berezia paragrafo batean. Hutsik lagatzekotan lehenetsitako deskripzioa agertuko da.
-        title: Zerbitzariaren deskripzio laburra
-      site_terms:
-        desc_html: Zure pribatutasun politika, erabilera baldintzak eta bestelako testu legalak idatzi ditzakezu. HTML etiketak erabili ditzakezu
-        title: Erabilera baldintza pertsonalizatuak
-      site_title: Zerbitzariaren izena
-      thumbnail:
-        desc_html: Aurrebistetarako erabilia OpenGraph eta API bidez. 1200x630px aholkatzen da
-        title: Zerbitzariaren iruditxoa
-      timeline_preview:
-        desc_html: Bistaratu denbora-lerro publikoa hasiera orrian
-        title: Denbora-lerroaren aurrebista
-      title: Gunearen ezarpenak
-      trendable_by_default:
-        desc_html: Aurretik debekatu ez diren traola guztiei eragiten dio
-        title: Baimendu traolak joera bihurtzea aurretik errebisatu gabe
-      trends:
-        desc_html: Erakutsi publikoki orain joeran dauden aurretik errebisatutako traolak
-        title: Traolak joeran
+      title: Zerbitzariaren ezarpenak
     site_uploads:
       delete: Ezabatu igotako fitxategia
       destroyed_msg: Guneko igoera ongi ezabatu da!
     statuses:
+      account: Egilea
+      application: Aplikazioa
       back_to_account: Atzera kontuaren orrira
+      back_to_report: Atzera txostenaren orrira
       batch:
-        delete: Ezabatu
-        nsfw_off: Markatu ez hunkigarri gisa
-        nsfw_on: Markatu hunkigarri gisa
+        remove_from_report: Kendu txostenetik
+        report: Salatu
       deleted: Ezabatuta
-      failed_to_execute: Ezin izan da burutu
+      favourites: Gogokoak
+      history: Bertsio-historia
+      in_reply_to: Honi erantzuten
+      language: Hizkuntza
       media:
         title: Multimedia
-      no_media: Multimediarik ez
-      no_status_selected: Ez da bidalketarik aldatu ez delako bidalketarik aukeratu
+      metadata: Metadatuak
+      no_status_selected: Ez da bidalketarik aldatu ez delako bat ere hautatu
+      open: Ireki bidalketa
+      original_status: Jatorrizko bidalketa
+      reblogs: Bultzadak
+      status_changed: Bidalketa aldatuta
       title: Kontuaren bidalketak
+      trending: Joera
+      visibility: Ikusgaitasuna
       with_media: Multimediarekin
+    strikes:
+      actions:
+        delete_statuses: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketak ezabatu ditu"
+        disable: "%{name} erabiltzailea %{target} erabiltzailearen kontua izoztu du"
+        mark_statuses_as_sensitive: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketak hunkigarri bezala markatu ditu"
+        none: "%{name} erabiltzaileak abisua bidali dio %{target} erabiltzaileari"
+        sensitive: "%{name} erabiltzaileak %{target} erabiltzailearen kontua hunkigarri bezala markatu ditu"
+        silence: "%{name} erabiltzaileak %{target} kontua mugatu du"
+        suspend: "%{name} erabiltzaileak %{target} kontua kanporatu du"
+      appeal_approved: Apelatua
+      appeal_pending: Apelazioa zain
     system_checks:
       database_schema_check:
         message_html: Aplikatu gabeko datu-basearen migrazioak daude. Exekutatu aplikazioak esperotako portaera izan dezan
+      elasticsearch_running_check:
+        message_html: Ezin izan da Elasticsearch-era konektatu. Egiaztatu martxan dagoela edo desgaitu testu osoko bilaketa
+      elasticsearch_version_check:
+        message_html: 'Elasticsearch bertsio bateraezina: %{value}'
+        version_comparison: Elasticsearch %{running_version} exekutatzen ari da, baina %{required_version} behar da
       rules_check:
         action: Kudeatu zerbitzariaren arauak
         message_html: Ez duzu zerbitzariaren araurik definitu.
       sidekiq_process_check:
         message_html: Ez da ari Sidekiq prozesurik exekutatzen %{value} ilad(et)an. Egiaztatu Sidekiq konfigurazioa
     tags:
-      accounts_today: Erabilera bakanak gaur
-      accounts_week: Erabilera bakanak aste honetan
-      breakdown: Gaurko erabilera iturriaren arabera
-      last_active: Azkenekoz aktiboa
-      most_popular: Erabilienak
-      most_recent: Azkenak
-      name: Traola
       review: Berrikusketaren egoera
-      reviewed: Berrikusita
-      title: Traolak
-      trending_right_now: Joera orain
-      unique_uses_today: "%{count} bidalketa gaur"
-      unreviewed: Berrikusi gabe
       updated_msg: Traola-ezarpenak ongi eguneratu dira
     title: Administrazioa
+    trends:
+      allow: Onartu
+      approved: Onartua
+      disallow: Ukatu
+      links:
+        allow: Onartu esteka
+        allow_provider: Onartu argitaratzailea
+        description_html: Esteka hauek zure zerbitzariak ikusten dituen kontuek asko zabaltzen ari diren estekak dira. Zure erabiltzaileei munduan ze berri den jakiteko lagungarriak izan daitezke. Ez da estekarik bistaratzen argitaratzaileak onartu arte. Esteka bakoitza onartu edo baztertu dezakezu.
+        disallow: Ukatu esteka
+        disallow_provider: Ukatu argitaratzailea
+        no_link_selected: Ez da estekarik aldatu ez delako bat ere hautatu
+        publishers:
+          no_publisher_selected: Ez da argitaratzailerik aldatu ez delako bat ere hautatu
+        shared_by_over_week:
+          one: Pertsona batek partekatua azken astean
+          other: "%{count} pertsonak partekatua azken astean"
+        title: Esteken joerak
+        usage_comparison: "%{today} aldiz partekatua gaur, atzo %{yesterday} aldiz"
+      only_allowed: Soilik onartutakoak
+      pending_review: Berrikusketaren zain
+      preview_card_providers:
+        allowed: Argitaratzaile honen estekak joera izan daitezke
+        description_html: Hauek dira zure zerbitzarian maiz partekatzen diren esteken domeinuak. Estekak ez dira joeretan publikoki agertuko estekaren domeinua onartu arte. Onartzeak (edo baztertzeak) azpi-domeinuei ere eragiten die.
+        rejected: Argitaratzaile honen estekek ezin dute joera izan
+        title: Argitaratzaileak
+      rejected: Ukatua
+      statuses:
+        allow: Onartu bidalketa
+        allow_account: Onartu egilea
+        description_html: Hauek dira une honetan asko partekatu eta gogokoak diren bidalketak (zure zerbitzariak ezagutzen dituenak). Erabiltzaile berrientzat eta bueltan itzuli direnentzat lagungarriak izan daitezke nor jarraitu aurkitzeko. Bidalketak ez dira publikoki erakusten zuk egilea onartu arte eta egileak gomendatua izatea onartu arte. Bidalketak banan bana ere onartu edo baztertu ditzakezu.
+        disallow: Ez onartu bidalketa
+        disallow_account: Ez onartu egilea
+        no_status_selected: Ez da joerarik aldatu ez delako bat ere hautatu
+        not_discoverable: Egileak ez du aukeratu aurkikuntza ezaugarrietan agertzea
+        shared_by:
+          one: Behin partekatua edo gogoko egina
+          other: "%{friendly_count} aldiz partekatua edo gogoko egina"
+        title: Bidalketen joerak
+      tags:
+        current_score: Uneko emaitza%{score}
+        dashboard:
+          tag_accounts_measure: aldiz
+          tag_languages_dimension: Hizkuntza nagusiak
+          tag_servers_dimension: Zerbitzari nagusiak
+          tag_servers_measure: zerbitzari desberdin
+          tag_uses_measure: erabilera guztira
+        description_html: Traola hauek askotan agertzen dira zure zerbitzariak ikusten dituen bidalketetan. Jendea zertaz hitz egiten ari den aurkitzen lagun diezaieke erabiltzaileei. Traolak ez dira publiko egiten onartzen dituzun arte.
+        listable: Gomendatu daiteke
+        no_tag_selected: Ez da etiketarik aldatu ez delako bat ere hautatu
+        not_listable: Ez da gomendatuko
+        not_trendable: Ez da joeretan agertuko
+        not_usable: Ezin da erabili
+        peaked_on_and_decaying: "%{date} datan jo du goia, orain beherantz"
+        title: Traolak joeran
+        trendable: Joeretan agertuko da
+        trending_rank: "%{rank}. joera"
+        usable: Erabili daiteke
+        usage_comparison: "%{today} aldiz erabili da gaur, atzo %{yesterday} aldiz"
+        used_by_over_week:
+          one: Pertsona batek erabilia azken astean
+          other: "%{count} pertsonak erabilia azken astean"
+      title: Joerak
+      trending: Joerak
     warning_presets:
       add_new: Gehitu berria
       delete: Ezabatu
       edit_preset: Editatu abisu aurre-ezarpena
       empty: Ez duzu abisu aurrezarpenik definitu oraindik.
       title: Kudeatu abisu aurre-ezarpenak
+    webhooks:
+      add_new: Gehitu amaiera-puntua
+      delete: Ezabatu
+      description_html: "<strong>Webhook</strong> batek aukera ematen dio Mastodoni zure aplikazioari aukeratutako gertaeren <strong>jakinarazpenak denbora errealean</strong> bidaltzeko, zure aplikazioak <strong>automatikoki erantzunak abiarazi ditzan</strong>."
+      disable: Desgaitu
+      disabled: Desgaituta
+      edit: Editatu amaiera-puntua
+      empty: Ez duzu webhook amaiera-punturik konfiguratu oraindik.
+      enable: Gaitu
+      enabled: Aktiboa
+      enabled_events:
+        one: Gaitutako gertaera bat
+        other: Gaitutako %{count} gertaera
+      events: Gertaerak
+      new: Webhook berria
+      rotate_secret: Biratu sekretua
+      secret: Sinatze-sekretua
+      status: Egoera
+      title: Webhook-ak
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: bidalketak ezabatzea
+        disable: kontua blokeatzea
+        mark_statuses_as_sensitive: bidalketak hunkigarri gisa markatzea
+        none: abisu bat
+        sensitive: kontua hunkigarri gisa markatzea
+        silence: kontua mugatzea
+        suspend: kontua kanporatzea
+      body: "%{target} erabiltzaileak apelazioa jarri dio %{action_taken_by} erabiltzaileak %{date}(e)an hartutako %{type} motako erabakiari. Hau idatzi du:"
+      next_steps: Apelazioa onartu dezakezu moderazio erabakia desegiteko, edo ez ikusia egin.
+      subject: "%{username} erabiltzailea %{instance} instantziako moderazio erabaki bat apelatzen ari da"
     new_pending_account:
       body: Kontu berriaren xehetasunak azpian daude. Eskaera hau onartu edo ukatu dezakezu.
       subject: Kontu berria berrikusteko %{instance} instantzian (%{username})
@@ -699,9 +875,17 @@ eu:
       body: "%{reporter}(e)k %{target} salatu du"
       body_remote: "%{domain} domeinuko norbaitek %{target} salatu du"
       subject: Salaketa berria %{instance} instantzian (#%{id})
-    new_trending_tag:
-      body: "#%{name} traola joeran dago gaur, baina ez da oraindik errebisatu. Ez da publikoki agertuko baimentzen ez baduzu, edo gorde inprimakia dagoen moduan eta ez duzu berriro honi buruz entzungo."
-      subject: Traola berria errebisatzeko %{instance} instantzian (#%{name})
+    new_trends:
+      body: 'Ondorengo elementuak berrikusi behar dira publikoki bistaratu aurretik:'
+      new_trending_links:
+        title: Esteken joerak
+      new_trending_statuses:
+        title: Bidalketen joerak
+      new_trending_tags:
+        no_approved_tags: Ez dago onartutako traolen joerarik une honetan.
+        requirements: 'Hautagai hauek joeretan onartutako %{rank}. traola gainditu dezakete: une honetan #%{lowest_tag_name} da, %{lowest_tag_score} puntuazioarekin.'
+        title: Traolak joeran
+      subject: Joera berriak daude berrikusteko %{instance} instantzian
   aliases:
     add_new: Sortu ezizena
     created_msg: Ongi sortu da ezizena. Orain kontu zaharretik migratzen hasi zaitezke.
@@ -731,16 +915,12 @@ eu:
   applications:
     created: Aplikazioa ongi sortu da
     destroyed: Aplikazioa ongi ezabatu da
-    invalid_url: Emandako URL-a baliogabea da
     regenerate_token: Birsortu sarbide token-a
     token_regenerated: Sarbide token-a ongi birsortu da
     warning: Kontuz datu hauekin, ez partekatu inoiz inorekin!
     your_token: Zure sarbide token-a
   auth:
-    apply_for_account: Eskatu gonbidapen bat
     change_password: Pasahitza
-    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">Zerbitzariaren arauak</a> eta <a href="%{terms_path}" target="_blank">erabilera baldintzak</a> onartzen ditut
-    checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">Erabilera baldintzak</a> onartzen ditut
     delete_account: Ezabatu kontua
     delete_account_html: Kontua ezabatu nahi baduzu, <a href="%{path}">jarraitu hemen</a>. Berrestea eskatuko zaizu.
     description:
@@ -753,32 +933,40 @@ eu:
     invalid_reset_password_token: Pasahitza berrezartzeko token-a baliogabea da edo iraungitu du. Eskatu beste bat.
     link_to_otp: Erabili zure mugikorreko bi faktoreko kodea edo berreskuratze kode bat
     link_to_webauth: Erabili zure segurtasun gako gailua
+    log_in_with: 'Saioa hasi honekin:'
     login: Hasi saioa
     logout: Amaitu saioa
     migrate_account: Migratu beste kontu batera
     migrate_account_html: Kontu hau beste batera birbideratu nahi baduzu, <a href="%{path}">hemen konfiguratu</a> dezakezu.
     or_log_in_with: Edo hasi saioa honekin
+    privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Pribatutasun politika</a> irakurri dut eta ados nago
     providers:
       cas: CAS
       saml: SAML
     register: Eman izena
-    registration_closed: "%{instance} instantziak ez ditu kide berriak onartzen"
+    registration_closed: "%{instance} instantziak ez du kide berririk onartzen"
     resend_confirmation: Birbidali berresteko argibideak
     reset_password: Berrezarri pasahitza
+    rules:
+      preamble: Hauek %{domain} instantziako moderatzaileek ezarriak eta betearaziak dira.
+      title: Oinarrizko arau batzuk.
     security: Segurtasuna
     set_new_password: Ezarri pasahitza berria
     setup:
       email_below_hint_html: Beheko e-mail helbidea okerra bada, hemen aldatu dezakezu eta baieztapen e-mail berria jaso.
       email_settings_hint_html: Baieztamen e-maila %{email} helbidera bidali da. E-mail helbide hori zuzena ez bada, kontuaren ezarpenetan aldatu dezakezu.
       title: Ezarpena
+    sign_up:
+      preamble: Mastodon zerbitzari honetako kontu batekin, aukera izango duzu sareko edozein pertsona jarraitzeko, ez dio axola kontua non ostatatua dagoen.
+      title: "%{domain} zerbitzariko kontua prestatuko dizugu."
     status:
       account_status: Kontuaren egoera
       confirming: E-mail baieztapena osatu bitartean zain.
       functional: Zure kontua guztiz erabilgarri dago.
       pending: Zure eskaera gainbegiratzeko dago oraindik. Honek denbora behar lezake. Zure eskaera onartzen bada e-mail bat jasoko duzu.
       redirecting_to: Zure kontua ez dago aktibo orain %{acct} kontura birbideratzen duelako.
+      view_strikes: Ikusi zure kontuaren aurkako neurriak
     too_fast: Formularioa azkarregi bidali duzu, saiatu berriro.
-    trouble_logging_in: Arazoak saioa hasteko?
     use_security_key: Erabili segurtasun gakoa
   authorize_follow:
     already_following: Kontu hau aurretik jarraitzen duzu
@@ -836,10 +1024,36 @@ eu:
       more_details_html: Xehetasun gehiagorako, ikusi <a href="%{terms_path}">pribatutasun politika</a>.
       username_available: Zure erabiltzaile-izena berriro eskuragarri egongo da
       username_unavailable: Zure erabiltzaile-izena ez da eskuragarri egongo
-  directories:
-    directory: Profilen direktorioa
-    explanation: Deskubritu erabiltzaileak interesen arabera
-    explore_mastodon: Esploratu %{title}
+  disputes:
+    strikes:
+      action_taken: Ezarritako neurria
+      appeal: Apelazioa
+      appeal_approved: Neurria behar bezala apelatu da eta jada ez da baliozkoa
+      appeal_rejected: Apelazioa baztertu da
+      appeal_submitted_at: Apelazioa bidalita
+      appealed_msg: Zure apelazioa bidali da. Onartzen bada, jakinaraziko zaizu.
+      appeals:
+        submit: Bidali apelazioa
+      approve_appeal: Onartu apelazioa
+      associated_report: Erlazionatutako txostena
+      created_at: Data
+      description_html: Hauek dira %{instance} instantziako arduradunek zure kontuaren aurka hartutako ekintzak eta bidali dizkizuten abisuak.
+      recipient: Honi zuzendua
+      reject_appeal: Baztertu apelazioa
+      status: "%{id} bidalketa"
+      status_removed: Bidalketa dagoeneko ezabatu da sistematik
+      title: "%{date}(e)ko %{action}"
+      title_actions:
+        delete_statuses: Bidalketa ezabatzea
+        disable: Kontua blokeatzea
+        mark_statuses_as_sensitive: Bidalketak hunkigarri gisa markatzea
+        none: Abisua
+        sensitive: Kontua hunkigarri gisa markatzea
+        silence: Kontua mugatzea
+        suspend: Kontua kanporatzea
+      your_appeal_approved: Zure apelazioa onartu da
+      your_appeal_pending: Apelazio bat bidali duzu
+      your_appeal_rejected: Zure apelazioa baztertu da
   domain_validator:
     invalid_domain: ez da domeinu izen baliogarria
   errors:
@@ -888,56 +1102,69 @@ eu:
       public: Denbora-lerro publikoak
       thread: Elkarrizketak
     edit:
+      add_keyword: Gehitu gako-hitza
+      keywords: Gako-hitzak
+      statuses: Banako bidalketak
+      statuses_hint_html: Iragazki hau hautatutako banako bidalketei aplikatuko zaie, gako-hitzekin bat etorri ala ez. <a href="%{path}">Berrikusi edo kendu bidalketak iragazkitik</a>.
       title: Editatu iragazkia
     errors:
+      deprecated_api_multiple_keywords: Parametro hauek ezin dira aldatu aplikazio honetatik, iragazitako gako-hitz bat baino gehiagori eragiten diotelako. Erabili aplikazio berriago bat edo web interfazea.
       invalid_context: Testuinguru baliogabe edo hutsa eman da
-      invalid_irreversible: Behin betiko iragazketa hasiera edo jakinarazpenen testuinguruan besterik ez dabil
     index:
+      contexts: "%{contexts} testuinguruetako iragazkiak"
       delete: Ezabatu
       empty: Ez duzu iragazkirik.
+      expires_in: "%{distance}(a)n iraungitzen da"
+      expires_on: "%{date}(a)n iraungitzen da"
+      keywords:
+        one: Gako-hitz %{count}
+        other: "%{count} gako-hitz"
+      statuses:
+        one: Bidalketa %{count}
+        other: "%{count} bidalketa"
+      statuses_long:
+        one: Banako bidalketa %{count} ezkutatuta
+        other: Banako %{count} bidalketa ezkutatuta
       title: Iragazkiak
     new:
+      save: Gorde iragazki berria
       title: Gehitu iragazki berria
+    statuses:
+      back_to_filter: Itzuli iragazkira
+      batch:
+        remove: Kendu iragazkitik
+      index:
+        hint: Iragazki honek banako bidalketei eragiten die, beste kriterioak badaude ere. Bidalketa gehiago gehitu ditzakezu iragazkira web interfazetik.
+        title: Iragazitako bidalketak
   footer:
-    developers: Garatzaileak
-    more: Gehiago…
-    resources: Baliabideak
     trending_now: Joera orain
   generic:
     all: Denak
+    all_items_on_page_selected_html:
+      one: Orri honetako elementu <strong>%{count}</strong> hautatuta.
+      other: Orri honetako <strong>%{count}</strong> elementuak hautatuta.
+    all_matching_items_selected_html:
+      one: Zure bilaketarekin bat datorren elementu <strong>%{count}</strong> hautatuta.
+      other: Zure bilaketarekin bat datozen <strong>%{count}</strong> elementu hautatuta.
     changes_saved_msg: Aldaketak ongi gorde dira!
     copy: Kopiatu
     delete: Ezabatu
-    no_batch_actions_available: Ez dago ekintza masiborik orri honetan eskuragarri
+    deselect: Desautatu guztiak
+    none: Bat ere ez
     order_by: Ordenatze-irizpidea
     save_changes: Gorde aldaketak
+    select_all_matching_items:
+      one: Hautatu zure bilaketarekin bat datorren elementu %{count}.
+      other: Hautatu zure bilaketarekin bat datozen %{count} elementuak.
+    today: gaur
     validation_errors:
       one: Zerbait ez dabil ongi! Egiaztatu beheko errorea mesedez
       other: Zerbait ez dabil ongi! Egiaztatu beheko %{count}  erroreak mesedez
   html_validator:
     invalid_markup: 'HTML markaketa baliogabea du: %{error}'
-  identity_proofs:
-    active: Aktiboa
-    authorize: Bai, baimendu
-    authorize_connection_prompt: Baimendu zifratutako konexio hau?
-    errors:
-      failed: Zifratutako konexioak huts egin du. Saiatu berriro %{provider} hornitzailetik.
-      keybase:
-        invalid_token: Keybase-ko token-ak sinaduren hash-ak dira eta 66 hex karakterekoak izan beha dira
-        verification_failed: Keybase-k ez du token hau Keybase-ko %{kb_username} erabiltzailearen sinaduratzat onartzen. Saiatu berriro Keybase-tik.
-      wrong_user: Ezin izan da %{proving} erabiltzailearentzat froga sortu %{current} gisa saioa hasita. Hasi saioa %{proving} erabilita eta saiatu berriro.
-    explanation_html: Hemen modu zifratuan konektatu ditzakezu zure beste identitateak, esaterako Keybase profila. Honek beste jendeak zuri zifratutako mezuak bidaltzea ahalbidetzen du, eta zuk beraiei bidalitako edukia fidagarritzat jotzea.
-    i_am_html: "%{username} erabiltzailea naiz %{service} zerbitzuan."
-    identity: Identitatea
-    inactive: Ez aktiboa
-    publicize_checkbox: 'Eta argitaratu bidalketa hau:'
-    publicize_toot: 'Frogatua dago! %{username} erabiltzailea naiz %{service} zerbitzuan: %{url}'
-    remove: Kendu froga kontutik
-    removed: Ongi kendu da froga kontutik
-    status: Egiaztatze egoera
-    view_proof: Ikusi froga
   imports:
     errors:
+      invalid_csv_file: 'CSV fitxategi baliogabea. Errorea: %{error}'
       over_rows_processing_limit: "%{count} lerro baina gehiago ditu"
     modes:
       merge: Bateratu
@@ -953,7 +1180,6 @@ eu:
       following: Jarraitutakoen zerrenda
       muting: Mutututakoen zerrenda
     upload: Igo
-  in_memoriam_html: Memoriala.
   invites:
     delete: Desaktibatu
     expired: Iraungitua
@@ -1032,18 +1258,14 @@ eu:
     carry_blocks_over_text: Erabiltzaile hau %{acct} kontutik dator, zeina blokeatuta daukazun.
     carry_mutes_over_text: Erabiltzaile hau %{acct} kontutik dator, zeina isilarazita daukazun.
     copy_account_note_text: 'Erabiltzaile hau %{acct} kontutik dator, hemen berari buruzko zure aurreko oharrak:'
+  navigation:
+    toggle_menu: Txandakatu menua
   notification_mailer:
-    digest:
-      action: Ikusi jakinarazpen guztiak
-      body: Hona zure %{since}(e)ko azken bisitatik galdu dituzun mezuen laburpen bat
-      mention: "%{name}(e)k aipatu zaitu:"
-      new_followers_summary:
-        one: Kanpoan zeundela jarraitzaile berri bat gehitu zaizu!
-        other: Kanpoan zeundela %{count} jarraitzaile berri bat gehitu zaizkizu!
-      subject:
-        one: "Jakinarazpen berri bat azken bisitatik \U0001F418"
-        other: "%{count} jakinarazpen berri azken bisitatik \U0001F418"
-      title: Kanpoan zeundela...
+    admin:
+      report:
+        subject: "%{name} erabiltzaileak txosten bat bidali du"
+      sign_up:
+        subject: "%{name} erabiltzailea erregistratu da"
     favourite:
       body: "%{name}(e)k zure bidalketa gogoko du:"
       subject: "%{name}(e)k zure bidalketa gogoko du"
@@ -1070,6 +1292,8 @@ eu:
       title: Bultzada berria
     status:
       subject: "%{name} erabiltzaileak bidalketa egin berri du"
+    update:
+      subject: "%{name} erabiltzaileak bidalketa bat editatu du"
   notifications:
     email_events: E-mail jakinarazpenentzako gertaerak
     email_events_hint: 'Hautatu jaso nahi dituzun gertaeren jakinarazpenak:'
@@ -1113,6 +1337,8 @@ eu:
     other: Denetarik
     posting_defaults: Bidalketarako lehenetsitakoak
     public_timelines: Denbora-lerro publikoak
+  privacy_policy:
+    title: Pribatutasun politika
   reactions:
     errors:
       limit_reached: Erreakzio desberdinen muga gaindituta
@@ -1135,22 +1361,15 @@ eu:
     remove_selected_follows: Utzi hautatutako erabiltzaileak jarraitzeari
     status: Kontuaren egoera
   remote_follow:
-    acct: Sartu jarraitzeko erabili nahi duzun erabiltzaile@domeinua
     missing_resource: Ezin izan da zure konturako behar den birbideratze URL-a
-    no_account_html: Ez duzu konturik? <a href='%{sign_up_path}' target='_blank'>Izena eman</a> dezakezu
-    proceed: Ekin jarraitzeari
-    prompt: 'Hau jarraituko duzu:'
-    reason_html: "<strong>Zergaitik eman behar da urrats hau?</strong><code>%{instance}</code> agian ez da izena eman duzun zerbitzaria, eta zure hasiera-zerbitzarira eraman behar zaitugu aurretik."
-  remote_interaction:
-    favourite:
-      proceed: Bihurtu gogoko
-      prompt: 'Bidalketa hau gogoko bihurtu nahi duzu:'
-    reblog:
-      proceed: Eman bultzada
-      prompt: 'Bidalketa honi bultzada eman nahi diozu:'
-    reply:
-      proceed: Ekin erantzuteari
-      prompt: 'Bidalketa honi erantzun nahi diozu:'
+  reports:
+    errors:
+      invalid_rules: ez die erreferentzia egiten baliozko arauei
+  rss:
+    content_warning: 'Edukiaren abisua:'
+    descriptions:
+      account: "@%{acct} kontuaren bidalketa publikoak"
+      tag: "#%{hashtag} traola duten bidalketa publikoak"
   scheduled_statuses:
     over_daily_limit: 'Egun horretarako programatutako bidalketa kopuruaren muga gainditu duzu: %{limit}'
     over_total_limit: 'Programatutako bidalketa kopuruaren muga gainditu duzu: %{limit}'
@@ -1160,7 +1379,7 @@ eu:
     browser: Nabigatzailea
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1174,7 +1393,7 @@ eu:
       phantom_js: PhantomJS
       qq: QQ nabigatzailea
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC nabigatzailea
       weibo: Weibo
     current_session: Uneko saioa
     description: "%{browser} - %{platform}"
@@ -1183,7 +1402,7 @@ eu:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1209,7 +1428,6 @@ eu:
     edit_profile: Aldatu profila
     export: Datuen esportazioa
     featured_tags: Nabarmendutako traolak
-    identity_proofs: Identitate frogak
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
@@ -1217,6 +1435,8 @@ eu:
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
+    statuses_cleanup: Bidalketak automatikoki ezabatzea
+    strikes: Moderazio neurriak
     two_factor_authentication: Bi faktoreetako autentifikazioa
     webauthn_authentication: Segurtasun gakoak
   statuses:
@@ -1233,18 +1453,19 @@ eu:
         other: "%{count} bideo"
     boosted_from_html: "%{acct_link}(e)tik bultzatua"
     content_warning: 'Edukiaren abisua: %{warning}'
+    default_language: Interfazearen hizkuntzaren berdina
     disallowed_hashtags:
       one: 'debekatutako traola bat zuen: %{tags}'
       other: 'debekatutako traola hauek zituen: %{tags}'
+    edited_at_html: Editatua %{date}
     errors:
       in_reply_not_found: Erantzuten saiatu zaren bidalketa antza ez da existitzen.
-    language_detection: Antzeman hizkuntza automatikoki
     open_in_web: Ireki web-ean
     over_character_limit: "%{max}eko karaktere muga gaindituta"
     pin_errors:
+      direct: Aipatutako erabiltzaileentzat soilik ikusgai dauden bidalketak ezin dira finkatu
       limit: Gehienez finkatu daitekeen bidalketa kopurua finkatu duzu jada
       ownership: Ezin duzu beste norbaiten bidalketa bat finkatu
-      private: Ezin dira publikoak ez diren bidalketak finkatu
       reblog: Bultzada bat ezin da finkatu
     poll:
       total_people:
@@ -1268,95 +1489,50 @@ eu:
       public_long: Edonork ikusi dezake
       unlisted: Zerrendatu gabea
       unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
+  statuses_cleanup:
+    enabled: Ezabatu bidalketa zaharrak automatikoki
+    enabled_hint: Zure bidalketa zaharrak automatikoki ezabatzen ditu zehazturiko denbora mugara iristean, beheko baldintza bat betetzen ez bada
+    exceptions: Salbuespenak
+    explanation: Bidalketak ezabatzea eragiketa garestia denez, mantso egiten da, zerbitzaria lasai dagoenean. Horregatik, zure bidalketak denbora mugara iristen direnetik ezabatu arte tarte bat igaro daiteke.
+    ignore_favs: Ez ezabatu gogokoak
+    ignore_reblogs: Ez ezabatu bultzadak
+    interaction_exceptions: Elkarrekintzetan oinarritutako salbuespenak
+    interaction_exceptions_explanation: Kontuan izan ezin dela ziurtatu ez direnik ezabatuko gogoko edo bultzaden muga gainditzen duten bidalketak, ondoren mugatik behera gelditzen badira ere.
+    keep_direct: Mantendu mezu zuzenak
+    keep_direct_hint: Zure mezu zuzenak ez dira ezabatuko
+    keep_media: Mantendu multimediak dituzten bidalketak
+    keep_media_hint: Multimedia eranskinak dituzten zure bidalketak ez dira ezabatuko
+    keep_pinned: Mantendu finkatutako bidalketak
+    keep_pinned_hint: Zure finkatutako bidalketak ez dira ezabatuko
+    keep_polls: Mantendu inkestak
+    keep_polls_hint: Zure inkestak ez dira ezabatuko
+    keep_self_bookmark: Mantendu laster-marka duten bidalketak
+    keep_self_bookmark_hint: Laster-marka egin diezun zure bidalketak ez dira ezabatuko
+    keep_self_fav: Mantendu gogoko bidalketak
+    keep_self_fav_hint: Gogoko bezala markatu dituzun zure bidalketak ez ditu ezabatuko
+    min_age:
+      '1209600': 2 aste
+      '15778476': 6 hilabete
+      '2629746': Hilabete 1
+      '31556952': Urte 1
+      '5259492': 2 hilabete
+      '604800': Aste 1
+      '63113904': 2 urte
+      '7889238': 3 hilabete
+    min_age_label: Denbora muga
+    min_favs: Mantendu gogoko kopuru hau duten bidalketak
+    min_favs_hint: Gutxienez gogoko kopuru hau jaso duten zure bidalketak ez dira ezabatuko. Hutsik utziz gero gogoko kopurua ez da kontuan hartuko bidalketak ezabatzean
+    min_reblogs: Mantendu bultzada kopuru hau duten bidalketak
+    min_reblogs_hint: Gutxienez bultzada kopuru hau jaso duten zure bidalketak ez dira ezabatuko. Hutsik utziz gero bultzada kopurua ez da kontuan hartuko bidalketak ezabatzean
   stream_entries:
     pinned: Finkatutako bidalketa
     reblogged: "(r)en bultzada"
     sensitive_content: 'Kontuz: Eduki hunkigarria'
+  strikes:
+    errors:
+      too_late: Beranduegi da neurri hau apelatzeko
   tags:
     does_not_match_previous_name: ez dator aurreko izenarekin bat
-  terms:
-    body_html: |
-      <h2>Pribatutasun politika</h2>
-      <h3 id="collect">Zer informazio biltzen dugu?</h3>
-
-      <ul>
-      <li><em>Kontuaren oinarrizko informazioa</em>: Zerbitzari honetan izena ematen baduzu, erabiltzaile-izena, e-posta helbidea eta pasahitza sartzea galdetu dakizuke. Profilean bestelako informazioa sartu dezakezu esaterako pantaila-izena eta biografia, eta profileko eta goiburuko irudiak igo ditzakezu. Erabiltzaile-izena, pantaila-izena, biografia, profileko irudia eta goiburuko irudia beti dira publikoak.</li>
-      <li><em>Bidalketak, jarraitzea eta beste informazioa</em>: Jarraitzen duzun jendearen zerrenda publikoa da, baita zure jarraitzaileena ere. Bidalketa bat argitaratzean, data eta ordua eta mezua bidaltzeko erabilitako aplikazioa gordetzen dira. Bidalketek eranskinak izan ditzakete, esaterako irudiak eta bideoak. Bidalketa publikoak eta zerrendatu gabeak publikoki ikusi daitezke. Zure profilean bidalketa bat sustatzen duzunean, informazio hori ere publikoki eskuragarri dago. Zure bidalketak zure jarraitzaileei bidaltzen zaizkie, kasu batzuetan honek esan nahi du beste zerbitzari batzuetara bidaltzen dela eta han kopiak gordetzen dituztela. Bidalketak ezabatzen dituzunean, hori ere zure jarraitzaileei bidaltzen zaie. Beste bidalketa batzuk zabaltzea edo gogoko izatea beti da informazio publikoa.</li>
-      <li><em>Mezu zuzenak eta soilik jarraitzaileentzako bidalketak</em>: Bidalketa guztiak zerbitzarian gorde eta prozesatzen dira. Soilik jarraitzaileentzako diren bidalketak zure jarraitzaileei bidaltzen zaizkie eta bertan aipatutako erabiltzaileei. Mezu zuzenak soilik aipatutako erabiltzaileei bidaltzen zaizkie. Honek esan nahi du kasu batzuetan beste zerbitzari batzuetara bidaltzen dela mezua eta han kopiak gordetzen direla. Borondate oneko ahalegin bat egiten dugu mezuok soilik baimena duten pertsonek ikus ditzaten, baina beste zerbitzariek agian ez. Hortaz, zure jarraitzaileen zerbitzaria zein den egiaztatzea garrantzitsua da. Jarraitzaileak eskuz onartu eta ukatzeko aukera aldatu dezakezu. <em>Kontuan izan zerbitzariaren operadoreak eta mezua jasotzen duen edozein zerbitzariko operadoreek mezuok ikus ditzaketela</em> eta edonork atera dezakeela pantaila argazki bat, kopiatu edo beste modu batean partekatu.<em>Ez partekatu informazio arriskutsua Mastodon bidez.</em></li>
-      <li><em>IP-ak eta bestelako meta-datuak</em>: Saioa hasten duzunean, zure IP helbidea gordetzen dugu, eta erabiltzen duzun nabigatzaile edo aplikazioa. Hasitako saio guztiak zuk ikusteko moduan daude eta ezarpenetan indargabetu ditzakezu. Erabilitako azken IP helbidea 12 hilabetez gordetzen da. Gure zerbitzariak jasotako eskari guztiak eta IP-a duten zerbitzariko egunkariak gorde genitzake.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Zertarako erabiltzen dugu zure informazioa?</h3>
-
-      <p>Biltzen dugun informazio guztia honela erabiltzen da:</p>
-
-      <ul>
-      <li>Mastodon zerbitzuko funtzio nagusietarako. Beste pertsonen edukiarekin harremanetan sartzeko edo zure edukia argitaratzeko saioa hasi behar duzu. Adibidez, beste pertsona batzuk jarraitu ditzakezu zure denbora-lerro pertsonalizatu bat izateko.</li>
-      <li>Komunitatearen moderazioari laguntzeko, esaterako zure IP-a ezagutzen ditugun beste batzuekin alderatu dezakegu, debekuak ekiditea edo bestelako arau-urraketak eragozteko.</li>
-      <li>Emandako e-posta helbidea informazioa bidaltzeko erabili genezake, beste pertsonek zure edukiekin harremanetan jartzean jakinarazteko, edo mezu bat bidaltzen dizutenean, galderak erantzutean eta bestelako eskari eta galderetarako.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Nola babesten dugu zure informazioa?</h3>
-
-      <p>Hainbat segurtasun neurri hartzen ditugu zure informazio pertsonalaren segurtasuna babesteko, informazio pertsonala sartzen duzunean, bidaltzen duzunean edo atzitzen duzunean. Besteak beste zure nabigatzailearen saioa eta zure aplikazioen eta API-aren arteko trafikoa, SSL bidez babesten da, eta zure pasahitza alde bateko algoritmo sendo batekin hash-eatzen da. Bi faktoreetako autentifikazioa gaitu dezakezu zure kontuaren segurtasuna areagotzeko.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Zein da gure datuak biltzeko politika?</h3>
-
-      <p>Borondate oneko ahalegina egingo dugu honetarako:</p>
-
-      <ul>
-      <li>Zerbitzari honetara egindako eskari guztien egunkaria IP helbidearekin, 90 egunez gehienez.</li>
-      <li>Izena eman duten erabiltzaileen eskariekin lotutako IP helbideak, 12 hilabetez gehienez..</li>
-      </ul>
-
-      <p>Zure edukiaren kopia duen artxibo bat eskatu eta deskargatu dezakezu, bertan mezuak multimedia eranskinak, profileko irudia eta goiburuko irudia daude.</p>
-
-      <p>Zure kontua behin betirako ezabatu dezakezu nahi duzunean.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Cookie-ak erabiltzen ditugu?</h3>
-
-      <p>Bai. Cookie-ak gune edo zerbitzu hornitzaile baten zure ordenagailuko disko gogorrera bidaltzen dituen fitxategi txikiak dira (zuk baimentzen baduzu). Cookie hauek guneari zure nabigatzailea identifikatzea, konturik duzun jakin, eta erregistratutako kontuarekin erlazionatzea ahalbidetzen diote.</p>
-
-      <p>Cookie-ak erabiltzen ditugu zure hobespenak ulertu eta hurrengo saioetarako gordetzeko</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Informazioa kanpoko inorekin partekatzen dugu?</h3>
-
-      <p>Ez dugu identifikatu zaitzakeen informazio pertsonala saltzen, trukatzen edo kanpora bidaltzen. Salbuespena konfiantzako hirugarrengoak dira, gunea martxan izaten laguntzen digutenak, negozioa aurrera eramateko aholkua ematen digutenak edo zuri zerbitzua ematen laguntzen digutenak, hauek informazioaren konfidentzialtasuna errespetatzea onartzen dutenean. Agian legearekin betetzeko beharrezkoa den informazioa ere eman genezake, gunearen politika indarrean jartzeko behar dena, edo gure eskubideak, jabetzak, edo segurtasuna babesteko beharrezkoa dena.</p>
-
-      <p>Zure eduki publikoak sareko beste zerbitzariek deskargatu dezakete. Zure bidalketa publikoak eta soilik jarraitzaileentzat diren mezuak zure jarraitzaileen zerbitzarietara bidaltzen dira, jarraitzaile edo hartzaile horiek beste zerbitzari batean badute kontua.</p>
-
-      <p>Aplikazio bati zure kontua erabiltzeko baimena ematen diozunean, onartutako baimen esparruaren arabera, zure profileko informazio publikoa atzitu lezake, zuk jarraitutakoen zerrenda, zure jarraitzaileen zerrenda, zure bidalketa guztiak eta zure gogokoak. Aplikazioen ezin dute inoiz zure e-posta helbidea edo pasahitza atzitu.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Umeek gunea erabiltzea</h3>
-
-      <p>Zerbitzari hau Europar Batasunean edo Europako Ekonomia-Eremuan badago: Gure gunea, produktua eta zerbitzuak 16 urte edo gehiago dituztenei zuzenduta daude. 16 urte baino gazteagoa bazara, GDPR legearen arabera ezin duzu gune hau erabili (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) </p>
-
-      <p>Zerbitzari hau Amerikako Estatu Batuetan badago: Gure gunea, produktua eta zerbitzuak 13 urte edo gehiago dituztenei zuzenduta daude. 13 urte baino gazteagoa bazara, COPPA legearen arabera ezin duzu gune hau erabili (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>).</p>
-
-      <p>Zerbitzari hau beste eremu legal batean badago, legearen eskariak desberdinak izan daitezke.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Aldaketak gure pribatutasun politikan</h3>
-
-      <p>Gure pribatutasun politika aldatzea erabakitzen badugu, aldaketak orri honetan argitaratuko ditugu.</p>
-
-      <p>Dokumentu honek CC-BY-SA lizentzia du. Eta azkenekoz 2018ko martxoak 7an eguneratu zen</p>
-
-      <p>Jatorrian <a href="https://github.com/discourse/discourse">Discourse sarearen pribatutasun politikatik</a> moldatua.</p>
-    title: "%{instance} instantziaren erabilera baldintzak eta pribatutasun politika"
   themes:
     contrast: Mastodon (Kontraste altua)
     default: Mastodon (Iluna)
@@ -1365,6 +1541,7 @@ eu:
     formats:
       default: "%Y(e)ko %b %d, %H:%M"
       month: "%Y(e)ko %b"
+      time: "%H:%M"
   two_factor_authentication:
     add: Gehitu
     disable: Desgaitu
@@ -1381,63 +1558,73 @@ eu:
     recovery_instructions_html: Zure telefonora sarbidea galtzen baduzu, beheko berreskuratze kode bat erabili dezakezu kontura berriro sartu ahal izateko. <strong>Gore barreskuratze kodeak toki seguruan</strong>. Adibidez inprimatu eta dokumentu garrantzitsuekin batera gorde.
     webauthn: Segurtasun gakoak
   user_mailer:
+    appeal_approved:
+      action: Joan zure kontura
+      explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa onartu da. Zure kontua egoera onean dago berriro."
+      subject: "%{date}(e)ko zure apelazioa onartu da"
+      title: Apelazioa onartuta
+    appeal_rejected:
+      explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa baztertu da."
+      subject: "%{date}(e)ko zure apelazioa baztertu da"
+      title: Apelazioa baztertuta
     backup_ready:
       explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
       subject: Zure artxiboa deskargatzeko prest dago
       title: Artxiboa jasotzea
-    sign_in_token:
-      details: 'Hemen daude saiakeraren xehetasunak:'
-      explanation: 'IP helbide ezezagun batetik zure kontuan saioa hasteko saiakera bat detektatu dugu. Zu bazara, sartu beheko segurtasun kodea saioa hasteko erronkaren orrian:'
-      further_actions: 'Ez bazara zu, aldatu zure pasahitza eta gaitu bi faktoreko autentifikazioa zure kontuan. Hemen egin dezakezu:'
-      subject: Berretsi saioa hasteko saiakera
-      title: Saioa hasteko saiakera
+    suspicious_sign_in:
+      change_password: aldatu pasahitza
+      details: 'Hemen daude saio hasieraren xehetasunak:'
+      explanation: Zure kontuan IP helbide berri batetik saioa hasi dela detektatu dugu.
+      further_actions_html: Ez bazara zu izan, lehenbailehen %{action} gomendatzen dizugu eta bi faktoreko autentifikazioa gaitzea zure kontua seguru mantentzeko.
+      subject: Zure kontura sarbidea egon da IP helbide berri batetik
+      title: Saio hasiera berria
     warning:
+      appeal: Bidali apelazioa
+      appeal_description: Hau errore bat dela uste baduzu, apelazio bat bidali diezaiekezu %{instance} instantziako arduradunei.
+      categories:
+        spam: Spama
+        violation: Edukiak komunitatearen gidalerro hauek urratzen ditu
       explanation:
-        disable: Zure kontua izoztuta dagoen bitartean, zure kontua bere horretan dirau, baina ezin duzu ekintzarik burutu desblokeatzen den arte.
-        sensitive: Igotzen dituzun multimedia fitxategiak eta estekatutako edukiak hunkigarri bezala hartuko dira.
-        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure bidalketak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
-        suspend: Zure kontua kanporatua izan da, zure toot guztiak eta multimedia fitxategiak behin betiko ezabatu dira zerbitzari honetatik, eta zure jarraitzaileen zerbitzarietatik.
-      get_in_touch: "%{instance} instantziako jendearekin harremanetan jartzeko e-mail honi erantzun ahal diozu."
-      review_server_policies: Berrikusi zerbitzariko politikak
-      statuses: 'Zehazki, honentzat:'
+        delete_statuses: Zure bidalketetako batzuk komunitatearen gidalerro bat edo gehiago urratzen dituztela aurkitu da eta ondorioz %{instance} instantziako moderatzaileek ezabatu egin dituzte.
+        disable: Ezin duzu zure kontua erabili, baina zure profilak eta beste datuek hor diraute. Zure datuen babeskopia eskatu dezakezu, kontuaren ezarpenak aldatu edo kontua ezabatu.
+        mark_statuses_as_sensitive: Zure bidalketetako batzuk hunkigarri bezala markatu dituzte %{instance} instantziako moderatzaileek. Horrek esan nahi du jendeak klik egin beharko duela bidalketetako multimedia edukian aurrebista bistaratzeko. Etorkizunean zuk zeuk markatu ditzakezu multimediak hunkigarri bezala.
+        sensitive: Hemendik aurrera, igotzen dituzun multimedia fitxategi guztiak hunkigarri gisa markatuko dira eta abisuan klik egin beharko da ikusteko.
+        silence: Zure kontua erabili dezakezu oraindik, baina dagoeneko jarraitzen zaituen jendeak soilik ikusi ahal izango ditu zure bidalketak zerbitzari honetan, eta aurkikuntza-ezaugarrietatik baztertua izango zara. Hala ere, besteek eskuz jarrai zaitzakete oraindik.
+        suspend: Ezin duzu zure kontua erabili, eta zure profila eta beste datuak ez daude eskuragarri jada. Hala ere, saioa hasi dezakezu zure datuen babeskopia eskatzeko, 30 egun inguru barru behin betiko ezabatu aurretik. Zure oinarrizko informazioa gordeko da kanporatzea saihestea eragozteko.
+      reason: 'Arrazoia:'
+      statuses: 'Aipatutako bidalketak:'
       subject:
+        delete_statuses: "%{acct} zerbitzarian zure bidalketak ezabatu dira"
         disable: Zure  %{acct} kontua izoztu da
+        mark_statuses_as_sensitive: "%{acct} zerbitzarian zure bidalketak hunkigarri gisa markatu dira"
         none: "%{acct} konturako abisua"
-        sensitive: Zure %{acct} kontuaren multimedia bidalketak hunkigarri bezala markatu dira
+        sensitive: "%{acct} zerbitzarian zure bidalketak hunkigarri gisa markatuko dira hemendik aurrera"
         silence: Zure  %{acct} kontua murriztu da
         suspend: Zure %{acct} kontua kanporatua izan da
       title:
+        delete_statuses: Bidalketak ezabatuta
         disable: Kontu izoztua
+        mark_statuses_as_sensitive: Bidalketak hunkigarri gisa markatuta
         none: Abisua
-        sensitive: Zure multimedia edukiak hunkigarri bezala markatu dira
+        sensitive: Kontua hunkigarri gisa markatuta
         silence: Kontu murriztua
         suspend: Kontu kanporatua
     welcome:
       edit_profile_action: Ezarri profila
-      edit_profile_step: Pertsonalizatu profila abatar bat igoz, goiburu bat, zure pantaila-izena aldatuz eta gehiago. Jarraitzaile berriak onartu aurretik gainbegiratu nahi badituzu, kontua giltzaperatu dezakezu.
+      edit_profile_step: Pertsonalizatu profila abatar bat igoz, zure pantaila-izena aldatuz eta gehiago. Jarraitzaile berriak onartu aurretik berrikusi nahi badituzu, kontuari giltzarrapoa jarri diezaiokezu.
       explanation: Hona hasteko aholku batzuk
       final_action: Hasi bidalketak argitaratzen
       final_step: 'Hasi argitaratzen! Jarraitzailerik ez baduzu ere zure bidalketa publikoak besteek ikusi ditzakete, esaterako denbora-lerro lokalean eta traoletan. Zure burua aurkeztu nahi baduzu #aurkezpenak traola erabili zenezake.'
       full_handle: Zure erabiltzaile-izen osoa
       full_handle_hint: Hau da lagunei esango zeniekeena beste zerbitzari batetik zu jarraitzeko edo zuri mezuak bidaltzeko.
-      review_preferences_action: Aldatu hobespenak
-      review_preferences_step: Ziurtatu hobespenak ezartzen dituzula, hala nola, jaso nahi dituzu e-postak edo lehenetsitako pribatutasuna bidalketa berrietarako. Mareatzen ez bazaitu GIF-ak automatikoki abiatzea ere ezarri dezakezu.
       subject: Ongi etorri Mastodon-era
-      tip_federated_timeline: Federatutako denbora-lerroan Mastodon sarearen trafikoa ikusten da. Baina zure instantziako auzokideak jarraitutakoak besterik ez daude hor, ez da osoa.
-      tip_following: Lehenetsita zerbitzariko administratzailea jarraitzen duzu. Jende interesgarri gehiago aurkitzeko, egiaztatu denbora-lerro lokala eta federatua.
-      tip_local_timeline: Denbora-lerro lokalean %{instance} instantziako trafikoa ikusten da. Hauek zure instantziako auzokideak dira!
-      tip_mobile_webapp: Zure mugikorreko nabigatzaileak Mastodon hasiera pantailan gehitzea eskaintzen badizu, push jakinarazpenak jaso ditzakezu. Aplikazio natiboaren parekoa da zentzu askotan!
-      tips: Aholkuak
       title: Ongi etorri, %{name}!
   users:
     follow_limit_reached: Ezin dituzu %{limit} pertsona baino gehiago jarraitu
-    generic_access_help_html: Arazoak dituzu zure kontura sartzeko? Jarri harremanetan %{email} helbidearekin laguntzarako
     invalid_otp_token: Bi faktoreetako kode baliogabea
-    invalid_sign_in_token: Segurtasun kode baliogabea
     otp_lost_help_html: 'Bietara sarbidea galdu baduzu, jarri kontaktuan hemen: %{email}'
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
-    suspicious_sign_in_confirmation: Dirudienez inoiz ez duzu saioa hasi gailu honetatik eta aspaldian ez duzu saiorik hasi. Horregatik, segurtasun kode bat bidaliko dizugu zure e-posta helbidera zu zarela egiaztatzeko.
   verification:
     explanation_html: 'Ezin duzu <strong>zure burua zure profileko metadatuen esteken jabe gisa egiaztatu</strong>. Horretarako, estekatutako webgunean zure Mastodon profilera daraman esteka bat egon behar du. Mastodonera daraman esteka horrek<strong>derrigorrez</strong> <code>rel="me"</code> artibutua izan behar du . Estekaren testuak ez du axola. Hona adibide bat:'
     verification: Egiaztaketa
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0baad6e6a..0260e2e63 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1,94 +1,27 @@
 ---
 fa:
   about:
-    about_hashtag_html: این‌ها نوشته‌های عمومی هستند که برچسب (هشتگ) <strong>#%{hashtag}</strong> را دارند. اگر شما روی هر کارسازی حساب داشته باشید می‌توانید به این نوشته‌ها واکنش نشان دهید.
     about_mastodon_html: 'شبکهٔ اجتماعی آینده: بدون تبلیغات، بدون شنود از طرف شرکت‌ها، طراحی اخلاق‌مدار، و معماری غیرمتمرکز! با ماستودون صاحب داده‌های خودتان باشید!'
-    about_this: درباره
-    active_count_after: فعّال
-    active_footnote: کاربران فعّال ماهانه
-    administered_by: 'به مدیریت:'
-    api: رابط برنامه‌نویسی کاربردی
-    apps: اپ‌های موبایل
-    apps_platforms: ماستودون را در iOS، اندروید، و سایر سیستم‌ها داشته باشید
-    browse_directory: کاربران را بر اساس علاقه‌مندی‌هایشان از فهرست گزیده بیابید
-    browse_local_posts: جریانی زنده از فرسته‌های عمومی این کارساز را ببینید
-    browse_public_posts: جریانی زنده از فرسته‌های عمومی روی ماستودون را ببینید
-    contact: تماس
     contact_missing: تنظیم نشده
     contact_unavailable: موجود نیست
-    discover_users: یافتن کاربران
-    documentation: مستندات
-    federation_hint_html: با حسابی روی %{instance} می‌توانید افراد روی هر کارساز ماستودون و بیش از آن را پی بگیرید.
-    get_apps: یک اپ موبایل را بیازمایید
     hosted_on: ماستودون، میزبانی‌شده روی %{domain}
-    instance_actor_flash: |
-      این حساب، بازیگری مجازی به نمایندگی خود کارساز بوده و کاربری واقعی نیست.
-      این حساب برای مقاصد خودگردانی به کار می‌رفته و نباید مسدود شود؛ مگر این که بخواهید کل نمونه را مسدود کنید که در آن صورت نیز باید از انسداد دامنه استفاده کنید.
-    learn_more: بیشتر بدانید
-    privacy_policy: سیاست رازداری
-    rules: قوانین کارساز
-    rules_html: 'در زیر خلاصه‌ای از قوانینی که در صورت علاقه به داشتن حسابی روی این کارساز ماستودون، باید رعایت کنید آمده است:'
-    see_whats_happening: ببینید چه خبر است
-    server_stats: 'آمار کارساز:'
-    source_code: کدهای منبع
-    status_count_after:
-      one: چیز نوشته‌اند
-      other: چیز نوشته‌اند
-    status_count_before: که در کنار هم
-    tagline: با دوستان خود در ارتباط باشید و دوستان تازه پیدا کنید
-    terms: شرایط خدمت
-    unavailable_content: محتوای ناموجود
-    unavailable_content_description:
-      domain: کارساز
-      reason: دلیل
-      rejecting_media: 'پرونده‌های رسانه از این کارسازها پردازش یا ذخیره نخواهند شد و هیچ بندانگشتی‌ای نمایش نخواهد یافت. نیازمند کلیک دستی برای رسیدن به پروندهٔ اصلی:'
-      rejecting_media_title: رسانه‌های پالوده
-      silenced: |-
-        هیچ کدام از نوشته‌ها از طرف این کارساز این‌جا نمایش نخواهند یافت مگر در فهرست پیگیری‌ها شما، اگر نویسنده‌اش را پی بگیرید.
-        فرسته‌ها از این کارسازها در گفت‌وگوها و فهرست نوشته‌های عمومی نهفته خواهند بود و تا وقتی پیگیرشان نشوید، هیچ اعلانی از برهم‌کنش‌های کاربرانشان تولید نخواهد شد:
-      silenced_title: کارسازهای خموش
-      suspended: 'هیچ داده‌ای از این کارسازها پردازش، ذخیره یا مبادله نخواهد شد، که هرگونه برهم‌کنش یا ارتباط با کاربران این کارسازها را غیرممکن خواهد کرد:'
-      suspended_title: کارسازهای معلّق
-    unavailable_content_html: ماستودون عموماً می‌گذارد محتوا را از از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.
-    user_count_after:
-      one: کاربر
-      other: کاربر
-    user_count_before: میزبان
-    what_is_mastodon: ماستودون چیست؟
+    title: درباره
   accounts:
-    choices_html: 'انتخاب‌های %{name}:'
-    endorsements_hint: شما می‌توانید از محیط وب ماستودون، کسانی را که پی می‌گیرید به دیگران هم پیشنهاد دهید تا این‌جا نشان داده شوند.
-    featured_tags_hint: می‌توانید برچسب‌های خاصی را مشخّص کنید تا این‌جا دیده شوند.
     follow: پیگیری
     followers:
       one: پیگیر
       other: پیگیر
     following: پی می‌گیرد
     instance_actor_flash: این حساب یک عامل مجازی است که به نمایندگی از خود کارساز استفاده می‌شود و نه هیچ یکی از کاربران. این حساب به منظور اتصال به فدراسیون استفاده می‌شود و نباید معلق شود.
-    joined: پیوسته از %{date}
     last_active: آخرین فعالیت
     link_verified_on: مالکیت این پیوند در %{date} بررسی شد
-    media: عکس و ویدیو
-    moved_html: "%{name} حساب خود را به %{new_profile_link} منتقل کرده است:"
-    network_hidden: این اطلاعات در دسترس نیست
-    never_active: هرگز
     nothing_here: این‌جا چیزی نیست!
-    people_followed_by: کسانی که %{name} پی می‌گیرد
-    people_who_follow: کسانی که %{name} را پی می‌گیرند
     pin_errors:
       following: باید کاربری که می‌خواهید پیشنهاد دهید را دنبال کرده باشید
     posts:
-      one: بوق
-      other: بوق
-    posts_tab_heading: بوق‌ها
-    posts_with_replies: بوق‌ها و پاسخ‌ها
-    roles:
-      admin: مدیر
-      bot: ربات
-      group: گروه
-      moderator: ناظر
-    unavailable: نمایهٔ ناموجود
-    unfollow: پایان پیگیری
+      one: فرسته
+      other: فرسته‌ها
+    posts_tab_heading: فرسته‌ها
   admin:
     account_actions:
       action: انجامِ کنش
@@ -96,26 +29,30 @@ fa:
     account_moderation_notes:
       create: افزودن یادداشت
       created_msg: یادداشت مدیر با موفقیت ساخته شد!
-      delete: حذف
       destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
     accounts:
       add_email_domain_block: مسدود کردن دامنهٔ رایانامه
       approve: پذیرفتن
-      approve_all: پذیرفتن همه
       approved_msg: کارهٔ ثبت‌نام %{username} با موفقیت تأیید شد
       are_you_sure: مطمئنید؟
       avatar: تصویر نمایه
       by_domain: دامین
       change_email:
-        changed_msg: نشانی ایمیل این حساب با موفقیت تغییر کرد!
-        current_email: ایمیل کنونی
-        label: تغییر نشانی ایمیل
-        new_email: ایمیل تازه
-        submit: تغییر ایمیل
-        title: تغییر ایمیل برای %{username}
+        changed_msg: رایانامه با موفقیت تغییر کرد!
+        current_email: رایانامهٔ کنونی
+        label: تغییر رایانامه
+        new_email: رایانامهٔ جدید
+        submit: تغییر رایانامه
+        title: تغییر رایانامه برای %{username}
+      change_role:
+        changed_msg: نقش با موفقیت تغییر کرد!
+        label: تغییر نقش
+        no_role: بدون نقش
+        title: تغییر نقش برای %{username}
       confirm: تأیید
       confirmed: تأیید شد
       confirming: تأیید
+      custom: سفارشی
       delete: حذف داده‌ها
       deleted: حذف شده
       demote: تنزل‌دادن
@@ -127,8 +64,8 @@ fa:
       display_name: نام نمایشی
       domain: دامنه
       edit: ویرایش
-      email: ایمیل
-      email_status: وضعیت ایمیل
+      email: رایانامه
+      email_status: وضعیت رایانامه
       enable: به کار انداختن
       enable_sign_in_token_auth: به کار انداختن تأیید هویت ژتون رایانامه‌ای
       enabled: به کار افتاده
@@ -155,7 +92,7 @@ fa:
         active: فعّال
         all: همه
         pending: منتظر
-        silenced: خموشانده
+        silenced: محدود
         suspended: تعلیق شده
         title: مدیریت
       moderation_notes: یادداشت‌های مدیریتی
@@ -163,9 +100,11 @@ fa:
       most_recent_ip: آخرین IP
       no_account_selected: هیچ حسابی تغییر نکرد زیرا حسابی انتخاب نشده بود
       no_limits_imposed: بدون محدودیت
+      no_role_assigned: هیچ نقشی اعطا نشده
       not_subscribed: مشترک نیست
       pending: در انتظار بررسی
       perform_full_suspension: تعلیق
+      previous_strikes: اخطارهای پیشین
       promote: ترفیع‌دادن
       protocol: پروتکل
       public: عمومی
@@ -173,7 +112,6 @@ fa:
       redownload: نوسازی نمایه
       redownloaded_msg: حساب %{username} با موفقیت از ابتدا نوسازی شد
       reject: نپذیرفتن
-      reject_all: نپذیرفتن هیچکدام
       rejected_msg: کارهٔ ثبت‌نام %{username} با موفقیت رد شد
       remove_avatar: حذف تصویر نمایه
       remove_header: برداشتن تصویر زمینه
@@ -181,24 +119,18 @@ fa:
       removed_header_msg: تصویر سرایند %{username} با موفّقیت برداشته شد
       resend_confirmation:
         already_confirmed: این کاربر قبلا تایید شده است
-        send: ایمیل تایید را دوباره بفرستید
-        success: ایمیل تایید با موفقیت ارسال شد!
+        send: ارسال دوبارهٔ رایانامهٔ تأیید
+        success: رایانامه تأیید با موفقیت ارسال شد!
       reset: بازنشانی
       reset_password: بازنشانی رمز
       resubscribe: اشتراک دوباره
-      role: اجازه‌ها
-      roles:
-        admin: مدیر
-        moderator: ناظر
-        staff: کارمند
-        user: کاربر
+      role: نقش
       search: جستجو
       search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
       search_same_ip: دیگر کاربران با IP یکسان
       security_measures:
         only_password: فقط گذرواژه
         password_and_2fa: گذرواژه و ۲عاملی
-        password_and_sign_in_token: گذرواژه و ژتون رایانامه‌ای
       sensitive: حساس
       sensitized: علامت‌زده به عنوان حساس
       shared_inbox_url: نشانی صندوق ورودی مشترک
@@ -208,13 +140,16 @@ fa:
       silence: خموشاندن
       silenced: خموشانده
       statuses: نوشته‌ها
+      strikes: اخطارهای پیشین
       subscribe: اشتراک
+      suspend: تعلیق
       suspended: تعلیق‌شده
       suspension_irreversible: داده‌های این حساب به صورت بی‌بازگشت حذف شد. می‌توانید برای قابل استفاده کردنش، آن را نامعلّق کنید، ولی این کار هیچ داده‌ای را که از پیش داده، برنخواهد گرداند.
       suspension_reversible_hint_html: حساب معلّق شد و داده‌ها به صورت کامل در %{date} برداشته خواهند شد. تا آن زمان، حساب می‌تواند بی هیچ عوارضی بازگردانده شود. اگر می‌خواهید فوراً همهٔ داده‌های حساب را بردارید، می‌توانید در پایین این کار را بکنید.
-      time_in_queue: در حال انتظار %{time}
       title: حساب‌ها
-      unconfirmed_email: ایمیل تأییدنشده
+      unblock_email: رفع مسدودیت نشانی رایانامه
+      unblocked_email_msg: مسدودیت نشانی رایانامهٔ %{username} با موفقیت رفع شد
+      unconfirmed_email: رایانامهٔ تأیید نشده
       undo_sensitized: بازگردانی حساس
       undo_silenced: واگردانی بی‌صداکردن
       undo_suspension: واگردانی تعلیق
@@ -228,6 +163,8 @@ fa:
       whitelisted: فهرست مجاز
     action_logs:
       action_types:
+        approve_appeal: پذیرش درخواست تجدیدنظر
+        approve_user: تایید کاربر
         assigned_to_self_report: واگذاری گزارش
         change_email_user: تغییر رایانامه برای کاربر
         confirm_user: تأیید کاربر
@@ -239,12 +176,15 @@ fa:
         create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
         create_ip_block: ایجاد قاعدهٔ آی‌پی
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
+        create_user_role: ایجاد نقش
         demote_user: تنزل کاربر
         destroy_announcement: حذف اعلامیه
+        destroy_canonical_email_block: پاک کردن انسداد ایمیل
         destroy_custom_emoji: حذف اموجی سفارشی
         destroy_domain_allow: حذف اجازهٔ دامنه
         destroy_domain_block: حذف انسداد دامنه
         destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
+        destroy_instance: پاکسازی دامنه
         destroy_ip_block: حذف قاعدهٔ آی‌پی
         destroy_status: حذف وضعیت
         destroy_unavailable_domain: حذف دامنهٔ ناموجود
@@ -257,6 +197,8 @@ fa:
         enable_user: به کار انداختن کاربر
         memorialize_account: یادسپاری حساب
         promote_user: ترفیع کاربر
+        reject_appeal: رد کردن درخواست تجدیدنظر
+        reject_user: رد کاربر
         remove_avatar_user: برداشتن تصویر نمایه
         reopen_report: بازگشایی گزارش
         reset_password_user: بازنشانی گذرواژه
@@ -265,6 +207,7 @@ fa:
         silence_account: خموشی حساب
         suspend_account: تعلیق حساب
         unassigned_report: رفع واگذاری گزارش
+        unblock_email_account: رفع مسدودیت رایانامه
         unsensitive_account: برداشتن علامت رسانه در حسابتان به عنوان حساس
         unsilence_account: رفع خموشی حساب
         unsuspend_account: رفع تعلیق حساب
@@ -273,6 +216,8 @@ fa:
         update_domain_block: به‌روزرسانی مسدودسازی دامنه
         update_status: به‌روز رسانی وضعیت
       actions:
+        approve_appeal_html: "%{name} درخواست تجدیدنظر تصمیم مدیر را از %{target} پذیرفت"
+        approve_user_html: "%{name} ثبت نام %{target} را تایید کرد"
         assigned_to_self_report_html: "%{name} رسیدگی به گزارش %{target} را به عهده گرفت"
         change_email_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را عوض کرد"
         confirm_user_html: "%{name} نشانی رایانامهٔ کاربر %{target} را تأیید کرد"
@@ -286,10 +231,10 @@ fa:
         create_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را متوقف کرد"
         demote_user_html: "%{name} کاربر %{target} را تنزل داد"
         destroy_announcement_html: "%{name} اعلامیهٔ %{target} را حذف کرد"
-        destroy_custom_emoji_html: "%{name} اموجی %{target} را نابود کرد"
         destroy_domain_allow_html: "%{name} دامنهٔ %{target} را از فهرست مجاز برداشت"
         destroy_domain_block_html: "%{name} انسداد دامنهٔ %{target} را رفع کرد"
         destroy_email_domain_block_html: "%{name} انسداد دامنهٔ رایانامهٔ %{target} را برداشت"
+        destroy_instance_html: "%{name} دامنه %{target} را پاکسازی کرد"
         destroy_ip_block_html: "%{name} قاعدهٔ آی‌پی %{target} را حذف کرد"
         destroy_status_html: "%{name} وضعیت %{target} را برداشت"
         destroy_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را از سر گرفت"
@@ -302,6 +247,8 @@ fa:
         enable_user_html: "%{name} ورود را برای کاربر %{target} فعال کرد"
         memorialize_account_html: "%{name} حساب %{target} را تبدیل به صفحهٔ یادمان کرد"
         promote_user_html: "%{name} کاربر %{target} را ترفیع داد"
+        reject_appeal_html: "%{name} درخواست تجدیدنظر تصمیم مدیر را از %{target} رد کرد"
+        reject_user_html: "%{name} ثبت نام %{target} را رد کرد"
         remove_avatar_user_html: "%{name} تصویر نمایهٔ %{target} را حذف کرد"
         reopen_report_html: "%{name} گزارش %{target} را دوباره به جریان انداخت"
         reset_password_user_html: "%{name} گذرواژه کاربر %{target} را بازنشاند"
@@ -310,6 +257,7 @@ fa:
         silence_account_html: "%{name} حساب %{target} را محدود کرد"
         suspend_account_html: "%{name} حساب %{target} را تعلیق کرد"
         unassigned_report_html: "%{name} گزارش %{target} را از حالت محول شده خارج کرد"
+        unblock_email_account_html: "%{name} نشانی رایانامهٔ %{target} را رفع مسدودیت کرد"
         unsensitive_account_html: "%{name} علامت حساس رسانهٔ %{target} را برداشت"
         unsilence_account_html: "%{name} محدودیت حساب %{target} را برداشت"
         unsuspend_account_html: "%{name} حساب %{target} را از تعلیق خارج کرد"
@@ -317,7 +265,7 @@ fa:
         update_custom_emoji_html: "%{name} شکلک %{target} را به‌روز کرد"
         update_domain_block_html: "%{name} مسدودسازی دامنه را برای %{target} به‌روزرسانی کرد"
         update_status_html: "%{name} نوشتهٔ %{target} را به‌روز کرد"
-      deleted_status: "(نوشتهٔ پاک‌شده)"
+      deleted_account: حساب حذف شد
       empty: هیچ گزارشی پیدا نشد.
       filter_by_action: پالایش بر اساس کنش
       filter_by_user: پالایش بر اساس کاربر
@@ -356,9 +304,9 @@ fa:
       enable: به کار انداختن
       enabled: فعال
       enabled_msg: این شکلک با موفقیت فعال شد
-      image_hint: پروندهٔ PNG حداکثر 50KB
+      image_hint: پی‌ان‌چی یا جیف تا %{size}
       list: فهرست
-      listed: فهرست‌شده
+      listed: فهرست شده
       new:
         title: افزودن شکلک سفارشی
       not_permitted: مجاز به انجام این کنش نیستید
@@ -368,18 +316,46 @@ fa:
       title: شکلک‌های سفارشی
       uncategorized: دسته‌بندی نشده
       unlist: نافهرست
-      unlisted: فهرست‌نشده
+      unlisted: فهرست نشده
       update_failed_msg: این شکلک نتوانست به‌روز شود
       updated_msg: شکلک با موفقیت به‌روز شد!
       upload: بارگذاری
     dashboard:
+      active_users: کاربران فعّال
+      interactions: برهم‌کنش‌ها
+      media_storage: ذخیره‌ساز رسانه
+      new_users: کاربران جدید
+      opened_reports: گزارش باز شده
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> درخواست تجدیدنظر در انتظار"
+        other: "<strong>%{count}</strong> درخواست تجدیدنظر در انتظار"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> گزارش در انتظار"
+        other: "<strong>%{count}</strong> گزارش در انتظار"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> هشتگ در انتظار"
+        other: "<strong>%{count}</strong> هشتگ در انتظار"
+      pending_users_html:
+        one: "<strong>%{count}</strong> کاربر در انتظار"
+        other: "<strong>%{count}</strong> کاربر در انتظار"
+      resolved_reports: گزارش حل شده
       software: نرم‌افزار
+      sources: منابع ثبت‌نام
       space: فضای مصرف‌شده
       title: ابزارهای مدیریت
+      top_languages: زبان‌های فعّال‌تر
+      top_servers: کاربران فعّال‌تر
+      website: پایگاه وب
+    disputes:
+      appeals:
+        empty: هیچ درخواست تجدیدنظری یافت نشد
+        title: درخواست‌های تجدیدنظر
     domain_allows:
       add_new: مجاز کردن دامنه
       created_msg: دامنه با موفقیت مجاز شد
       destroyed_msg: دامنه از فهرست مجاز برداشته شد
+      export: برون‌ریزی
+      import: درون‌ریزی
       undo: برداشتن از فهرست مجاز
     domain_blocks:
       add_new: افزودن مسدودسازی دامین تازه
@@ -388,13 +364,14 @@ fa:
       domain: دامنه
       edit: ویرایش مسدودسازی دامنه
       existing_domain_block_html: شما پیش‌تر محدودیت‌های سخت‌تری روی %{name} اعمال کرده‌اید، و باید نخست <a href="%{unblock_url}">مسدودسازی را لغو کنید</a>.
+      export: برون‌ریزی
+      import: درون‌ریزی
       new:
         create: مسدودسازی
         hint: مسدودسازی دامنه جلوی ایجاد ورودی‌های حساب در پایگاه داده را نمی‌گیرد، بلکه به طور خودکار روش‌های مدیریتی را روی فعالیت‌های فعلی و گذشتهٔ آن حساب‌ها اعمال می‌کند.
         severity:
-          desc_html: "<strong>خموشاندن</strong> نوشته‌های حساب را برای هر فرد غیرپیگیر، نامرئی می‌کند.<strong>تعلیق</strong> همهٔ محتوا، رسانه‌ها، و داده‌های نمایهٔ حساب را پاک می‌کند. اگر فقط می‌خواهید جلوی رسانه‌ها را بگیرید <strong>هیچ</strong> را برگزینید."
           noop: هیچ
-          silence: خموشاندن
+          silence: محدود
           suspend: تعلیق
         title: مسدودسازی دامین تازه
       obfuscate: مبهم‌سازی نام دامنهٔ
@@ -407,34 +384,20 @@ fa:
       reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلّی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلق‌ها
       reject_reports: نپذیرفتن گزارش‌ها
       reject_reports_hint: گزارش‌هایی را که از این دامنه می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
-      rejecting_media: نپذیرفتن پرونده‌های رسانه‌ای
-      rejecting_reports: گزارش‌ها نادیده گرفته می‌شوند
-      severity:
-        silence: بی‌صداشده
-        suspend: معلق‌شده
-      show:
-        affected_accounts:
-          one: روی یک حساب در پایگاه داده تأثیر گذاشت
-          other: روی %{count} حساب در پایگاه داده تأثیر گذاشت
-        retroactive:
-          silence: بی‌صداشدن همهٔ حساب‌های این دامین را لغو کن
-          suspend: معلق‌شدن همهٔ حساب‌های این دامین را لغو کن
-        title: واگردانی مسدودسازی دامنه برای %{domain}
-        undo: واگردانی
       undo: واگردانی مسدودسازی دامین
       view: دیدن مسدودسازی دامنه
     email_domain_blocks:
       add_new: افزودن تازه
-      created_msg: مسدودسازی دامین ایمیل با موفقیت ساخته شد
+      created_msg: دامنهٔ رایانامه با موفقیت مسدود شد
       delete: پاک‌کردن
-      destroyed_msg: مسدودسازی دامین ایمیل با موفقیت پاک شد
+      dns:
+        types:
+          mx: رکورد MX
       domain: دامین
-      empty: هیچ دامنه ایمیلی در حال حاضر در لیست‌سیاه قرار نگرفته است.
-      from_html: از %{domain}
       new:
         create: ساختن مسدودسازی
-        title: مسدودسازی دامین ایمیل تازه
-      title: مسدودسازی دامین‌های ایمیل
+        title: مسدودسازی دامنهٔ رایانامهٔ جدید
+      title: دامنه‌های رایانامهٔ مسدود شده
     follow_recommendations:
       description_html: "<strong>پیشنهادات پیگیری به کاربران جدید کک می‌کند تا سریع‌تر محتوای جالب را پیدا کنند</strong>. زمانی که کاربری هنوز به اندازه کافی با دیگران تعامل نداشته است تا پیشنهادات پیگیری شخصی‌سازی‌شده دریافت کند، این حساب‌ها را به جای آن فهرست مشاهده خواهد کرد. این حساب‌ها به صورت روزانه و در ترکیب با بیشتری تعاملات و بالاترین دنبال‌کنندگان محلی برای یک زبان مشخص بازمحاسبه می‌شوند."
       language: برای زبان
@@ -444,32 +407,46 @@ fa:
       title: پیشنهادهای پی‌گیری
       unsuppress: بازگردانی پیشنهادهای پی‌گیری
     instances:
+      availability:
+        no_failures_recorded: هیچ شکستی در سابقه نیست.
+        title: موجود بودن
       back_to_all: همه
       back_to_limited: محدود
       back_to_warning: هشدار
       by_domain: دامین
+      confirm_purge: آیا مطمئن هستید می‌خواهید داده را از این دامنه برای همیشه پاک کنید؟
+      content_policies:
+        comment: یادداشت داخلی
+        policies:
+          silence: کران
+          suspend: تعلیق
+        policy: سیاست
+        reason: دلیل عمومی
+        title: سیاست‌های محتوا
+      dashboard:
+        instance_accounts_dimension: حساب‌های پیش‌تر پی‌گیری شده
+        instance_followers_measure: پی‌گیرندگانمان در آن‌جا
+        instance_follows_measure: پی‌گیرندگانشان در این‌جا
+        instance_languages_dimension: زبان‌های برتر
+        instance_reports_measure: گزارش‌ها درباره‌شان
       delivery:
         all: همه
         clear: پاک کردن خطاهای تحول محتوا
         restart: بازراه‌اندازی تحویل محتوا
         stop: متوقف‌کردن تحویل محتوا
-        title: تحویل محتوا
         unavailable: ناموجود
-        unavailable_message: تحویل محتوا در دسترس نیست
-        warning: هشدار
       delivery_available: پیام آماده است
       delivery_error_days: زورهای خطای تحویل محتوا
       delivery_error_hint: اگر تحویل محتوا به مدت %{count} روز ممکن نباشد، به طور خودکار به عنوان تحویل‌ناشونده علامت‌گذاری خواهد شد.
+      destroyed_msg: هم اکنون داده دامنه %{domain} در صف حذف حتمی است.
       empty: هیج دامنه‌ای پیدا نشد.
-      known_accounts:
-        one: "%{count} حساب شناخته‌شده"
-        other: "%{count} حساب شناخته‌شده"
       moderation:
         all: همه
         limited: محدود
         title: مدیریت
       private_comment: یادداشت خصوصی
       public_comment: یادداشت عمومی
+      purge: پاکسازی
       title: ارتباط میان‌سروری
       total_blocked_by_us: مسدودشده از طرف ما
       total_followed_by_them: ما را پی می‌گیرند
@@ -482,7 +459,7 @@ fa:
         all: همه
         available: در دسترس
         expired: منقضی‌شده
-        title: فیلتر
+        title: پالایه
       title: دعوت‌ها
     ip_blocks:
       add_new: ایجاد قانون
@@ -499,18 +476,16 @@ fa:
         title: ایجاد قانون جدید IP
       no_ip_block_selected: هیچ قاعدهٔ آی‌پی‌ای تغییری نکرد زیرا هیچ‌کدام گزیده نشده بودند
       title: قوانین IP
-    pending_accounts:
-      title: حساب‌های منتظر (%{count})
     relationships:
       title: روابط %{acct}
     relays:
       add_new: افزودن رلهٔ تازه
       delete: حذف
-      description_html: یک <strong>رلهٔ میان‌سروری</strong> (federation relay) یک سرور میانجی است که حجم زیادی از بوق‌های عمومی را بین سرورهای گوناگونی که عضوش می‌شوند جابه‌جا می‌کند. <strong>رله‌ها به سرورهای کوچک و متوسط کمک می‌کنند تا مطالب عمومی بیشتری را بیابند.</strong> اگر رله نباشد، این مطالب عمومی تنها وقتی پیدا می‌شوند که کاربران محلی خودشان پیگیر کاربران روی سرورهای دیگر شوند.
+      description_html: یک <strong>رلهٔ میان‌سروری</strong> (federation relay) یک سرور میانجی است که حجم زیادی از فرسته‌های عمومی را بین سرورهای گوناگونی که عضوش می‌شوند جابه‌جا می‌کند. <strong>رله‌ها به سرورهای کوچک و متوسط کمک می‌کنند تا مطالب عمومی بیشتری را بیابند.</strong> اگر رله نباشد، این مطالب عمومی تنها وقتی پیدا می‌شوند که کاربران محلی خودشان پیگیر کاربران روی سرورهای دیگر شوند.
       disable: از کار انداختن
       disabled: از کار افتاده
       enable: به کار انداختن
-      enable_hint: اگر فعال باشد، کارساز شما عضو همهٔ بوق‌های عمومی‌ای را که از این رله می‌آید می‌گیرد، و بوق‌های عمومی این کارساز را به آن می‌فرستند.
+      enable_hint: اگر فعال باشد، کارساز شما عضو همهٔ فرسته‌های عمومی‌ای را که از این رله می‌آید می‌گیرد، و فرسته‌های عمومی این کارساز را به آن می‌فرستند.
       enabled: فعال
       inbox_url: نشانی رله
       pending: در انتظار پذیرش رله
@@ -527,39 +502,71 @@ fa:
         notes:
           one: "%{count} یادداشت"
           other: "%{count} یادداشت"
-        reports:
-          one: "%{count} گزارش"
-          other: "%{count} گزارش"
+      action_log: گزارش حسابرسی
       action_taken_by: انجام‌دهنده
+      actions:
+        other_description_html: دیدن انتخاب های بیشتر برای کنترل رفتار حساب و سفارشی سازی ارتباط با حساب گزارش شده.
+      add_to_report: افزودن بیش‌تر به گزارش
       are_you_sure: مطمئنید؟
       assign_to_self: به عهدهٔ من بگذار
       assigned: مدیر عهده‌دار
+      by_target_domain: دامنهٔ حساب گزارش‌شده
+      category: دسته
       comment:
         none: هیچ
       created_at: گزارش‌شده
+      delete_and_resolve: حذف فرسته‌ها
       forwarded: هدایت شده
       forwarded_to: هدایت شده به %{domain}
       mark_as_resolved: علامت‌گذاری به عنوان حل‌شده
+      mark_as_sensitive: علامت به حساس
       mark_as_unresolved: علامت‌گذاری به عنوان حل‌نشده
+      no_one_assigned: هیچ‌کس
       notes:
         create: افزودن یادداشت
         create_and_resolve: حل کردن با یادداشت
         create_and_unresolve: دوباره گشودن با یادداشت
         delete: حذف
         placeholder: کارهایی را که در این باره انجام شده، یا هر به‌روزرسانی دیگری را بنویسید...
+        title: یادداشت‌ها
+      remote_user_placeholder: کاربر دوردست از %{instance}
       reopen: دوباره به جریان بیندازید
       report: 'گزارش #%{id}'
       reported_account: حساب گزارش‌شده
       reported_by: گزارش از طرف
       resolved: حل‌شده
       resolved_msg: گزارش با موفقیت حل شد!
+      skip_to_actions: پرش به کنش‌ها
       status: نوشته
-      target_domain: دامنهٔ حساب گزارش‌شده
+      statuses: محتوای گزارش شده
       target_origin: خاستگاه حساب گزارش‌شده
       title: گزارش‌ها
       unassign: پس‌گرفتن مسئولیت
       unresolved: حل‌نشده
       updated_at: به‌روز شد
+      view_profile: دیدن نمایه
+    roles:
+      add_new: افزودن نقش
+      categories:
+        administration: مدیریت
+        invites: دعوت‌ها
+        moderation: نظارت
+        special: ویژه
+      delete: حذف
+      edit: ویراش نقش %{name}
+      everyone: اجازه‌های پیش‌گزیده
+      privileges:
+        administrator: مدیر
+        delete_user_data: حذف داده‌های کاربر
+        invite_users: دعوت کاربران
+        manage_announcements: مدیریت اعلامیه‌ها
+        manage_blocks: مدیریت مسدودی‌ها
+        manage_custom_emojis: مدیریت ایموجی‌های سفارشی
+        manage_invites: مدیریت دعوت‌ها
+        manage_reports: مدیریت گزارش‌ها
+        manage_roles: مدیریت نقش‌ها
+        manage_rules: مدیریت قوانین
+        manage_settings: مدیریت تنظیمات
     rules:
       add_new: افزودن قانون
       delete: حذف
@@ -568,111 +575,57 @@ fa:
       empty: هنوز هیچ قانونی برای کارساز تعریف نشده.
       title: قوانین کارساز
     settings:
-      activity_api_enabled:
-        desc_html: تعداد بوق‌های محلی، کاربران فعال، و کاربران تازه در هر هفته
-        title: انتشار آمار تجمیعی دربارهٔ فعالیت کاربران
-      bootstrap_timeline_accounts:
-        desc_html: نام‌های کاربری را با ویرگول از هم جدا کنید. تنها حساب‌های محلی و قفل‌نشده کار می‌کنند. اگر این‌جا را خالی بگذارید، به طور پیش‌فرض همهٔ مدیرهای این سرور پی‌گرفته خواهند شد.
-        title: پیگیری‌های پیش‌فرض برای کاربران تازه
-      contact_information:
-        email: ایمیل کاری
-        username: نام کاربری
-      custom_css:
-        desc_html: ظاهر ماستودون را با CSS-ای که در همهٔ صفحه‌ها جاسازی می‌شود تغییر دهید
-        title: سبک CSS سفارشی
-      default_noindex:
-        desc_html: روی همهٔ کاربرانی که این تنظیم را خودشان تغییر نداده‌اند تأثیر می‌گذارد
-        title: درخواست پیش‌فرض از طرف کاربران برای ظاهر نشدن در نتایج موتورهای جستجوگر
+      discovery:
+        follow_recommendations: پیروی از پیشنهادها
+        profile_directory: شاخهٔ نمایه
+        public_timelines: خط زمانی‌های عمومی
+        title: کشف
+        trends: پرطرفدارها
       domain_blocks:
         all: برای همه
         disabled: برای هیچ‌کدام
-        title: نمایش دامین‌های مسدودشده
         users: برای کاربران محلی واردشده
-      domain_blocks_rationale:
-        title: دیدن دلیل
-      hero:
-        desc_html: در صفحهٔ آغازین نمایش می‌یابد. دست‌کم ۶۰۰×۱۰۰ پیکسل توصیه می‌شود. اگر تعیین نشود، با تصویر بندانگشتی سرور جایگزین خواهد شد
-        title: تصویر سربرگ
-      mascot:
-        desc_html: در صفحه‌های گوناگونی نمایش می‌یابد. دست‌کم ۲۹۳×۲۰۵ پیکسل. اگر تعیین نشود، با تصویر پیش‌فرض جایگزین خواهد شد
-        title: تصویر نماد
-      peers_api_enabled:
-        desc_html: دامین‌هایی که این سرور به آن‌ها برخورده است
-        title: انتشار فهرست سرورهای یافته‌شده
-      preview_sensitive_media:
-        desc_html: پیوند به سایت‌های دیگر پیش‌نمایشی خواهد داشت که یک تصویر کوچک را نشان می‌دهد، حتی اگر نوشته به عنوان حساس علامت‌گذاری شده باشد
-        title: نمایش تصاویر حساسیت‌برانگیز در پیش‌نمایش‌های OpenGraph
-      profile_directory:
-        desc_html: به کاربران اجازه دهید تا بتوانند خود را روی فهرست گزیدهٔ کاربران این سرور نمایش دهند
-        title: فعال‌سازی فهرست گزیدهٔ کاربران
       registrations:
-        closed_message:
-          desc_html: وقتی امکان ثبت نام روی سرور فعال نباشد در صفحهٔ اصلی نمایش می‌یابد<br>می‌توانید HTML بنویسید
-          title: پیغام برای فعال‌نبودن ثبت نام
-        deletion:
-          desc_html: هر کسی بتواند حساب خود را پاک کند
-          title: فعال‌سازی پاک‌کردن حساب
-        min_invite_role:
-          disabled: هیچ کس
-          title: اجازهٔ دعوت به
-        require_invite_text:
-          desc_html: زمانی که نام‌نویسی نیازمند تایید دستی است، متن «چرا می‌خواهید عضو شود؟» بخش درخواست دعوت را به جای اختیاری، اجباری کنید
-          title: نیازمند پر کردن متن درخواست دعوت توسط کاربران جدید
+        title: ثبت‌نام‌ها
       registrations_mode:
         modes:
           approved: ثبت نام نیازمند تأیید مدیران است
           none: کسی نمی‌تواند ثبت نام کند
           open: همه می‌توانند ثبت نام کنند
-        title: شرایط ثبت نام
-      show_known_fediverse_at_about_page:
-        desc_html: اگر انتخاب شود، بوق‌های همهٔ سرورهای دیگر نیز در پیش‌نمایش این سرور نمایش می‌یابد. وگرنه فقط بوق‌های محلی نشان داده می‌شوند.
-        title: نمایش سرورهای دیگر در پیش‌نمایش این سرور
-      show_staff_badge:
-        desc_html: نمایش علامت همکار روی صفحهٔ کاربر
-        title: نمایش علامت همکار
-      site_description:
-        desc_html: معرفی کوتاهی دربارهٔ رابط برنامه‌نویسی کاربردی. دربارهٔ این که چه چیزی دربارهٔ این سرور ماستدون ویژه است یا هر چیز مهم دیگری بنویسید. می‌توانید HTML بنویسید، به‌ویژه <code>&lt;a&gt;</code> و <code>&lt;em&gt;</code>.
-        title: دربارهٔ این سرور
-      site_description_extended:
-        desc_html: جای خوبی برای نوشتن سیاست‌های کاربری، قانون‌ها، راهنماها، و هر چیزی که ویژهٔ این سرور است. تگ‌های HTML هم مجاز است
-        title: اطلاعات تکمیلی سفارشی
-      site_short_description:
-        desc_html: روی نوار کناری و همچنین به عنوان فرادادهٔ صفحه‌ها نمایش می‌یابد. در یک بند توضیح دهید که ماستدون چیست و چرا این سرور با بقیه فرق دارد.
-        title: توضیح کوتاه دربارهٔ سرور
-      site_terms:
-        desc_html: می‌توانید سیاست رازداری، شرایط استفاده، یا سایر مسائل قانونی را به دلخواه خود بنویسید. تگ‌های HTML هم مجاز است
-        title: شرایط استفادهٔ سفارشی
-      site_title: نام سرور
-      thumbnail:
-        desc_html: برای دیدن با OpenGraph و رابط برنامه‌نویسی. وضوح پیشنهادی ۱۲۰۰×۶۳۰ پیکسل
-        title: تصویر کوچک سرور
-      timeline_preview:
-        desc_html: نوشته‌های عمومی این سرور را در صفحهٔ آغازین نشان دهید
-        title: پیش‌نمایش نوشته‌ها
-      title: تنظیمات سایت
-      trendable_by_default:
-        desc_html: روی برچسب‌هایی که پیش از این ممنوع نشده‌اند تأثیر می‌گذارد
-        title: بگذارید که برچسب‌های پرطرفدار بدون بازبینی قبلی نمایش داده شوند
-      trends:
-        desc_html: برچسب‌های عمومی که پیش‌تر بازبینی شده‌اند و هم‌اینک پرطرفدارند
-        title: برچسب‌های پرطرفدار
+      title: تنظیمات کارساز
     site_uploads:
       delete: پرونده بارگذاری شده را پاک کنید
       destroyed_msg: بارگذاری پایگاه با موفقیت حذف شد!
     statuses:
+      account: نگارنده
+      application: برنامه
       back_to_account: بازگشت به صفحهٔ حساب
+      back_to_report: بازگشت به صفحهٔ گزارش
       batch:
-        delete: پاک‌کردن
-        nsfw_off: علامت‌زدن به عنوان غیرحساس
-        nsfw_on: علامت‌زدن به عنوان حساس
+        remove_from_report: برداشتن از گزارش
+        report: گزارش
       deleted: پاک‌شده
-      failed_to_execute: اجرا نشد
+      favourites: برگزیده‌ها
+      history: تاریخچهٔ نگارش
+      in_reply_to: در پاسخ به
+      language: زبان
       media:
         title: رسانه
-      no_media: بدون عکس یا ویدیو
-      no_status_selected: هیچ بوقی تغییری نکرد زیرا هیچ‌کدام از آن‌ها انتخاب نشده بودند
+      metadata: فراداده
+      no_status_selected: هیچ فرسته‌ای تغییری نکرد زیرا هیچ‌کدام از آن‌ها انتخاب نشده بودند
+      open: گشودن فرسته
+      original_status: فرستهٔ اصلی
+      reblogs: تقویت‌ها
+      status_changed: فرسته تغییر کرد
       title: نوشته‌های حساب
+      trending: پرطرفدار
+      visibility: نمایانی
       with_media: دارای عکس یا ویدیو
+    strikes:
+      actions:
+        delete_statuses: "%{name} فرستهٔ %{target} را حذف کرد"
+      appeal_approved: درخواست تجدیدنظر کرد
+      appeal_pending: درخواست تجدیدنظر در انتظار
     system_checks:
       database_schema_check:
         message_html: تعداد مهاجرت پایگاه داده در انتظار انجام هستند. لطفا آن‌ها را اجرا کنید تا اطمینان یابید که برنامه مطابق انتظار رفتار خواهد کرد
@@ -682,28 +635,53 @@ fa:
       sidekiq_process_check:
         message_html: صف(های) %{value} فاقد هیچونه فرایند Sidekiq هستند. لطفا تنظیمات Sidekiq خود را بازبینی کنید
     tags:
-      accounts_today: کاربرد یکتا در امروز
-      accounts_week: کاربرد یکتا در این هفته
-      breakdown: کاربردهای امروز به تفکیک منبع
-      last_active: آخرین فعالیت
-      most_popular: محبوب‌ترین
-      most_recent: تازه‌ترین
-      name: هشتگ
       review: وضعیت بازبینی
-      reviewed: بازبینی شده
-      title: هشتگ‌ها
-      trending_right_now: پرطرفدارهای کنونی
-      unique_uses_today: "%{count} امروز منتشر شده"
-      unreviewed: بازبینی نشده
       updated_msg: تنظیمات برچسب‌ها با موفقیت به‌روز شد
     title: مدیریت
+    trends:
+      allow: اجازه
+      approved: تأیید شده
+      disallow: اجازه ندادن
+      links:
+        allow: اجازه به پیوند
+        allow_provider: اجازه به ناشر
+        disallow: اجازه ندادن به پیوند
+        disallow_provider: اجازه ندادن به ناشر
+        title: پیوندهای داغ
+      pending_review: بازبینی منتظر
+      preview_card_providers:
+        title: ناشران
+      rejected: رد شده
+      statuses:
+        title: فرسته‌های داغ
+      tags:
+        current_score: امتیاز کنونی %{score}
+        dashboard:
+          tag_accounts_measure: استفادهٔ یکتا
+          tag_languages_dimension: زبان‌های برتر
+          tag_servers_dimension: کارسازهای برتر
+          tag_servers_measure: کارسازهای گوناگون
+          tag_uses_measure: کل استفاده‌ّا
+        listable: می‌تواند پیشنهاد شود
+        not_listable: پیشنهاد نخواهد شد
+        not_usable: غیر قابل استفاده
+        title: برچسب‌های پرطرفدار
+        trending_rank: 'پرطرفدار #%{rank}'
+        usable: قابل استفاده
+      title: پرطرفدار
     warning_presets:
       add_new: افزودن تازه
       delete: زدودن
       edit_preset: ویرایش هشدار پیش‌فرض
       empty: هنز هیچ پیش‌تنظیم هشداری را تعریف نکرده‌اید.
       title: مدیریت هشدارهای پیش‌فرض
+    webhooks:
+      new: قلاب وب جدید
   admin_mailer:
+    new_appeal:
+      actions:
+        none: یک هشدار
+        silence: برای محدود کردن حساب آنها
     new_pending_account:
       body: جزئیات حساب تازه این‌جاست. شما می‌توانید آن را تأیید یا رد کنید.
       subject: حساب تازه‌ای در %{instance} نیازمند بررسی است (%{username})
@@ -711,9 +689,11 @@ fa:
       body: کاربر %{reporter} کاربر %{target} را گزارش داد
       body_remote: کسی از %{domain} گزارش %{target} را فرستاده
       subject: گزارش تازه‌ای برای %{instance} (#%{id})
-    new_trending_tag:
-      body: 'برچسب #%{name} امروز پرطرفدار است، ولی تا حالا بازبینی نشده. تا وقتی که شما اجازه نداده‌اید، این برچسب به طور عمومی نمایش داده نخواهد شد. اگر فرم را به شکل فعلی ذخیره کنید، هیچ وقت چیزی دربارهٔ این برچسب نخواهید دید.'
-      subject: برچسب تازه‌ای در %{instance} نیازمند بررسی است (#%{name})
+    new_trends:
+      new_trending_links:
+        title: پیوندهای داغ
+      new_trending_statuses:
+        title: فرسته‌های داغ
   aliases:
     add_new: ساختن نام مستعار
     created_msg: نام مستعار تازه با موفقیت ساخته شد. الان می‌توانید انتقال از حساب قدیمی را آغاز کنید.
@@ -723,7 +703,7 @@ fa:
     remove: حذف ارتباط نام مستعار
   appearance:
     advanced_web_interface: رابط کاربری پیشرفته
-    advanced_web_interface_hint: 'اگر می‌خواهید همهٔ فضای نمایشگر خود را به کار ببرید، می‌توانید به کمک رابط کاربری پیشرفته ستون‌های گوناگونی داشته باشید تا در یک نگاه همهٔ اطلاعاتی را که می‌خواهید ببینید: نوشته‌های دیگران، اعلان‌ها، فهرست نوشته‌های همه‌جا، و هر تعداد فهرست و برچسب که بخواهید.'
+    advanced_web_interface_hint: اگر می‌خواهید از تمامی پهنای صفحه‌تان استفاده کنید، رابط پیش‌رفتهٔ وب می‌گذارد هر چند ستون را که می‌خواهید، برای دیدن اطّلاعات بیش‌تر در یک زمان، پیکربندی کنید:‌خانه، آگاهی‌ها، خط زمانی عمومی،‌ هرتعدادی از سیاهه‌ها و برچسب‌ها.
     animations_and_accessibility: پویانمایی‌های و دسترسی‌پذیری
     confirmation_dialogs: پیغام‌های تأیید
     discovery: کاوش
@@ -732,7 +712,7 @@ fa:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: همه می‌توانند کمک کنند.
     sensitive_content: محتوای حساس
-    toot_layout: آرایش بوق
+    toot_layout: آرایش فرسته
   application_mailer:
     notification_preferences: تغییر ترجیحات ایمیل
     salutation: "%{name}،"
@@ -743,16 +723,12 @@ fa:
   applications:
     created: برنامه با موفقیت ساخته شد
     destroyed: برنامه با موفقیت پاک شد
-    invalid_url: نشانی واردشده معتبر نیست
     regenerate_token: دوباره‌سازی کد دسترسی
     token_regenerated: کد دسترسی با موفقیت ساخته شد
     warning: خیلی مواظب این اطلاعات باشید و آن را به هیچ کس ندهید!
     your_token: کد دسترسی شما
   auth:
-    apply_for_account: درخواست دعوت‌نامه
     change_password: رمز
-    checkbox_agreement_html: با <a href="%{rules_path}" target="_blank">قانون‌های این کارساز</a> و <a href="%{terms_path}" target="_blank">شرایط خدماتش</a> موافقم
-    checkbox_agreement_without_rules_html: من با <a href="%{terms_path}" target="_blank">شرایط استفاده</a> موافقم
     delete_account: پاک‌کردن حساب
     delete_account_html: اگر می‌خواهید حساب خود را پاک کنید، از <a href="%{path}">این‌جا</a> پیش بروید. از شما درخواست تأیید خواهد شد.
     description:
@@ -765,6 +741,7 @@ fa:
     invalid_reset_password_token: کد بازنشانی رمز نامعتبر یا منقضی شده است. لطفاً کد دیگری درخواست کنید.
     link_to_otp: رمز بازگردانی یا رمز دوعاملی را از تلفنتان وارد کنید
     link_to_webauth: استفاده از افزارهٔ امنیتیتان
+    log_in_with: ورود با
     login: ورود
     logout: خروج
     migrate_account: نقل مکان به یک حساب دیگر
@@ -786,11 +763,9 @@ fa:
     status:
       account_status: وضعیت حساب
       confirming: در حال انتظار برای کامل شدن تأیید ایمیل.
-      functional: حساب شما قابل استفاده است.
       pending: درخواست شما منتظر تأیید مسئولان سایت است و این فرایند ممکن است کمی طول بکشد. اگر درخواست شما پذیرفته شود به شما ایمیلی فرستاده خواهد شد.
       redirecting_to: حساب شما غیرفعال است زیرا هم‌اکنون به %{acct} منتقل شده است.
     too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
-    trouble_logging_in: برای ورود مشکلی دارید؟
     use_security_key: استفاده از کلید امنیتی
   authorize_follow:
     already_following: شما همین الان هم این حساب را پی‌می‌گیرید
@@ -848,10 +823,18 @@ fa:
       more_details_html: برای اطلاعات بیشتر <a href="%{terms_path}">سیاست رازداری</a> را ببینید.
       username_available: نام کاربری شما دوباره در دسترس خواهد بود
       username_unavailable: نام کاربری شما برای دیگران غیرقابل دسترس خواهد ماند
-  directories:
-    directory: فهرست گزیدهٔ کاربران
-    explanation: کاربران را بر اساس علاقه‌مندی‌هایشان بیابید
-    explore_mastodon: گشت و گذار در %{title}
+  disputes:
+    strikes:
+      appeal: درخواست تجدیدنظر
+      appeal_rejected: درخواست تجدیدنظر رد شده است
+      appeal_submitted_at: درخواست تجدیدنظر فرستاده شد
+      appeals:
+        submit: فرستادن درخواست تجدیدنظر
+      title_actions:
+        none: هشدار
+      your_appeal_approved: درخواست تجدیدنظر شما پذیرفته شد
+      your_appeal_pending: شما یک درخواست تجدیدنظر فرستادید
+      your_appeal_rejected: درخواست تجدیدنظر شما رد شد
   domain_validator:
     invalid_domain: نام دامین معتبر نیست
   errors:
@@ -868,7 +851,7 @@ fa:
       content: شرمنده، یک چیزی از سمت ما اشتباه شده.
       title: این صفحه درست نیست
     '503': این صفحه به خاطر یک مشکل موقت در کارساز در دسترس نیست.
-    noscript_html: برای استفاده از نسخهٔ تحت وب ماستودون، لطفاً جاوااسکریپت را فعال کنید. یا به جایش می‌توانید <a href="%{apps_path}">یک اپ ماستدون</a> را به‌کار ببرید.
+    noscript_html: برای استفاده از نسخهٔ تحت وب ماستودون، لطفاً جاوااسکریپت را فعال کنید. یا به جایش می‌توانید <a href="%{apps_path}">یک کارهٔ ماستودون</a> را به کار ببرید.
   existing_username_validator:
     not_found: کاربری با این نام کاربری در این کارساز پیدا نشد
     not_found_multiple: "%{usernames} پیدا نشد"
@@ -883,8 +866,8 @@ fa:
     blocks: حساب‌های مسدودشده
     bookmarks: نشانک‌ها
     csv: CSV
-    domain_blocks: دامین‌های مسدودشده
-    lists: فهرست‌ها
+    domain_blocks: دامنه‌های مسدود شده
+    lists: سیاهه‌ها
     mutes: حساب‌های بی‌صداشده
     storage: تصویرهای ذخیره‌شده
   featured_tags:
@@ -896,14 +879,13 @@ fa:
     contexts:
       account: نمایه‌ها
       home: خانه
-      notifications: اعلان‌ها
-      public: فهرست عمومی
+      notifications: آگاهی‌ها
+      public: خط زمانی‌های عمومی
       thread: گفتگوها
     edit:
       title: ویرایش پالایه
     errors:
       invalid_context: زمینه‌ای موجود نیست یا نامعتبر است
-      invalid_irreversible: پالایش برگشت‌ناپذیر تنها در زمینهٔ خانه یا آگاهی‌ها کار می‌کنند
     index:
       delete: پاک‌کردن
       empty: هیچ پالایه‌ای ندارید.
@@ -911,43 +893,21 @@ fa:
     new:
       title: افزودن پالایهٔ جدید
   footer:
-    developers: برنامه‌نویسان
-    more: بیشتر…
-    resources: منابع
     trending_now: پرطرفدار
   generic:
     all: همه
     changes_saved_msg: تغییرات با موفقیت ذخیره شدند!
     copy: رونوشت
     delete: حذف
-    no_batch_actions_available: هیچ کار گروهی‌ای در این صفحه موجود نیست
+    none: هیچ‌کدام
     order_by: مرتب‌سازی
     save_changes: ذخیرهٔ تغییرات
+    today: امروز
     validation_errors:
       one: یک چیزی هنوز درست نیست! لطفاً خطاهای زیر را ببینید
       other: یک چیزی هنوز درست نیست! لطفاً %{count} خطای زیر را ببینید
   html_validator:
     invalid_markup: 'دارای نشانه‌گذاری نامعتبر HTML است: %{error}'
-  identity_proofs:
-    active: فعال
-    authorize: بله، اجازه بده
-    authorize_connection_prompt: آیا اجازهٔ این ارتباط رمزگذاری را می‌دهید؟
-    errors:
-      failed: برقراری ارتباط  رمزگذاری شکست خورد. لطفاً دوباره از %{provider} تلاش کنید.
-      keybase:
-        invalid_token: کدهای Keybase چکیده (هش) امضاهای دیجیتال هستند و دست‌کم ۶۶ نویسه در مبنای ۱۶ دارند
-        verification_failed: این کد را Keybase به عنوان امضای دیجیتال کاربر %{kb_username} تأیید نمی‌کند. لطفاً دوباره از Keybase تلاش کنید.
-      wrong_user: نمی‌توان تأییدی برای %{proving} در حالی که به عنوان %{current} وارد شده‌اید. به عنوان %{proving} وارد شوید و دوباره تلاش کنید.
-    explanation_html: این‌جا می‌توانید به شناسه‌های دیگر خود مانند نمایهٔ Keybase خودتان به طور رمزنگارانه متصل شوید. با این کار دیگران می‌توانند به شما پیغام‌های رمزشده بفرستند و به چیزی که شما به آن‌ها می‌فرستید اعتماد کنند.
-    i_am_html: من %{username} روی %{service} هستم.
-    identity: شناسه
-    inactive: غیرفعال
-    publicize_checkbox: 'این را ببوقید:'
-    publicize_toot: 'تأیید شد! من %{username} روی %{service} هستم: %{url}'
-    remove: برداشتن مدرک از حساب
-    removed: مدرک با موفّقیت از حساب برداشته شد
-    status: وضعیت تأیید
-    view_proof: دیدن مدرک
   imports:
     errors:
       over_rows_processing_limit: دارای بیش از %{count} ردیف
@@ -956,16 +916,15 @@ fa:
       merge_long: داده‌های فعلی را داشته باشید و داده‌های تازه‌ای بیفزایید
       overwrite: بازنویسی
       overwrite_long: داده‌های فعلی را پاک کنید و داده‌های تازه‌ای بیفزایید
-    preface: می‌توانید داده‌هایی مانند فهرست افرادی که دنبال یا مسدود کرده‌اید را که از کارسازی دیگر برون‌ریخته‌اید درون‌ریزی کنید.
+    preface: می‌توانید داده‌هایی را که از کارسازی دیگر برون‌ریخته‌اید، چون سیاهه‌ای از افرادی که پی گرفته یا مسدود می‌کنید را درون‌ریزی کنید.
     success: داده‌های شما با موفقیت بارگذاری شد و به زودی پردازش می‌شود
     types:
-      blocking: فهرست مسدودشده‌ها
+      blocking: سیاههٔ انسداد
       bookmarks: نشانک‌ها
-      domain_blocking: فهرست دامین‌های مسدودشده
-      following: فهرست پی‌گیری‌ها
-      muting: فهرست بی‌صداشده‌ها
+      domain_blocking: سیاههٔ انسداد دامنه
+      following: سیاههٔ پی‌گیری
+      muting: سیاههٔ خموشی
     upload: بارگذاری
-  in_memoriam_html: به یادبود.
   invites:
     delete: غیرفعال‌سازی
     expired: منقضی‌شده
@@ -990,7 +949,7 @@ fa:
     title: دعوت دیگران
   lists:
     errors:
-      limit: از این بیشتر نمی‌شود فهرست داشت
+      limit: به بیشینهٔ مقدار سیاهه‌ها رسیدید
   login_activities:
     authentication_methods:
       otp: کارهٔ تأیید هویت دوعاملی
@@ -1008,7 +967,7 @@ fa:
       not_ready: پرونده‌هایی که پردازش را تمام نکرده‌اند نمی‌توانند پیوست شوند. یکبار دیگر امتحان کنید!
       too_many: نمی‌توان بیشتر از ۴ تصویر بارگذاری کرد
   migrations:
-    acct: username@domain حساب تازه
+    acct: جابه‌جایی به
     cancel: لغو انتقال
     cancel_explanation: با لغو انتقال، حساب شما دوباره فعال می‌شود، ولی این کار پیگیران شما را که به حساب دیگر منتقل شده‌اند برنمی‌گرداند.
     cancelled_msg: انتقال حساب با موفقیت لغو شد.
@@ -1045,17 +1004,9 @@ fa:
     carry_mutes_over_text: این کاربر از %{acct} که خموشش کرده‌اید، جابه‌جا شد.
     copy_account_note_text: 'این کاربر از %{acct} جابه‌جا شده است. یادداشت‌های پیشینتان درباره‌اش این‌هاست:'
   notification_mailer:
-    digest:
-      action: دیدن همهٔ اعلان‌ها
-      body: خلاصه‌ای از پیغام‌هایی که از زمان آخرین بازدید شما در %{since} فرستاده شد
-      mention: "%{name} این‌جا از شما نام برد:"
-      new_followers_summary:
-        one: در ضمن، وقتی که نبودید یک پیگیر تازه پیدا کردید! ای ول!
-        other: در ضمن، وقتی که نبودید %{count} پیگیر تازه پیدا کردید! چه عالی!
-      subject:
-        one: "یک اعلان تازه از زمان آخرین بازدید شما \U0001F418"
-        other: "%{count} اعلان تازه از زمان آخرین بازدید شما \U0001F418"
-      title: در مدتی که نبودید...
+    admin:
+      sign_up:
+        subject: "%{name} ثبت نام کرد"
     favourite:
       body: "%{name} این نوشتهٔ شما را پسندید:"
       subject: "%{name} نوشتهٔ شما را پسندید"
@@ -1077,15 +1028,15 @@ fa:
     poll:
       subject: نظرسنجی‌ای از %{name} پایان یافت
     reblog:
-      body: "%{name} نوشتهٔ شما را بازبوقید:"
-      subject: "%{name} نوشتهٔ شما را بازبوقید"
-      title: بازبوق تازه
+      body: "%{name} فرستهٔ شما را تقویت کرد:"
+      subject: "%{name} فرستهٔ شما را تقویت کرد"
+      title: تقویت تازه
     status:
       subject: "%{name} چیزی فرستاد"
   notifications:
-    email_events: رویدادها برای اعلان‌های ایمیلی
-    email_events_hint: 'رویدادهایی که می‌خواهید برایشان اعلانی دریافت کنید را برگزینید:'
-    other_settings: سایر تنظیمات اعلان‌ها
+    email_events: رویدادها برای آگاهی‌های رایانامه‌ای
+    email_events_hint: 'گزینش رویدادهایی که می‌خواهید برایشان آگاهی دریافت کنید:'
+    other_settings: سایر تنظیمات آگاهی‌ها
   number:
     human:
       decimal_units:
@@ -1124,7 +1075,7 @@ fa:
   preferences:
     other: سایر تنظیمات
     posting_defaults: تنظیمات پیش‌فرض انتشار
-    public_timelines: فهرست عمومی نوشته‌ها
+    public_timelines: خط زمانی‌های عمومی
   reactions:
     errors:
       limit_reached: تجاوز از کران واکنش‌های مختلف
@@ -1147,32 +1098,16 @@ fa:
     remove_selected_follows: به پیگیری از کاربران انتخاب‌شده پایان بده
     status: وضعیت حساب
   remote_follow:
-    acct: نشانی حساب username@domain خود را این‌جا بنویسید
     missing_resource: نشانی اینترنتی برای رسیدن به حساب شما پیدا نشد
-    no_account_html: هنوز عضو نیستید؟ <a href='%{sign_up_path}' target='_blank'>این‌جا می‌توانید حساب باز کنید</a>
-    proceed: درخواست پیگیری
-    prompt: 'شما قرار است این حساب را پیگیری کنید:'
-    reason_html: "<strong>چرا این گام ضروریست؟</strong> ممکن است <code>%{instance}</code> کارسازی نباشد که شما رویش حساب دارید؛ پس لازم است پیش از هرچیز، به کارساز خودتان هدایتتان کنیم."
-  remote_interaction:
-    favourite:
-      proceed: به سمت پسندیدن این بوق
-      prompt: 'شما می‌خواهید این بوق را بپسندید:'
-    reblog:
-      proceed: به سمت بازبوقیدن
-      prompt: 'شما می‌خواهید این بوق را بازببوقید:'
-    reply:
-      proceed: به سمت پاسخ‌دادن
-      prompt: 'شما می‌خواهید به این بوق پاسخ دهید:'
   scheduled_statuses:
-    over_daily_limit: شما از حد مجاز %{limit} بوق زمان‌بندی‌شده در آن روز فراتر رفته‌اید
-    over_total_limit: شما از حد مجاز %{limit} بوق زمان‌بندی‌شده فراتر رفته‌اید
+    over_daily_limit: شما از حد مجاز %{limit} فرسته زمان‌بندی‌شده در آن روز فراتر رفته‌اید
+    over_total_limit: شما از حد مجاز %{limit} فرسته زمان‌بندی‌شده فراتر رفته‌اید
     too_soon: زمان تعیین‌شده باید در آینده باشد
   sessions:
     activity: آخرین فعالیت
     browser: مرورگر
     browsers:
       alipay: علی‌پی
-      blackberry: بلک‌بری
       chrome: کروم
       edge: مایکروسافت اج
       electron: الکترون
@@ -1186,7 +1121,6 @@ fa:
       phantom_js: فنتوم‌جی‌اس
       qq: مرورگر کیوکیو
       safari: سافاری
-      uc_browser: مرورگر یوسی
       weibo: وبیو
     current_session: نشست فعلی
     description: "%{browser} روی %{platform}"
@@ -1195,8 +1129,6 @@ fa:
     platforms:
       adobe_air: ایر ادوبی
       android: اندروید
-      blackberry: بلک‌بری
-      chrome_os: سیستم‌عامل کروم
       firefox_os: سیستم‌عامل فایرفاکس
       ios: آی‌اواس
       linux: لینوکس
@@ -1221,11 +1153,10 @@ fa:
     edit_profile: ویرایش نمایه
     export: برون‌سپاری داده‌ها
     featured_tags: برچسب‌های برگزیده
-    identity_proofs: مدرک شناسه‌ها
     import: درون‌ریزی
     import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
-    notifications: اعلان‌ها
+    notifications: آگاهی‌ها
     preferences: ترجیحات
     profile: نمایه
     relationships: پیگیری‌ها و پیگیران
@@ -1244,21 +1175,20 @@ fa:
       video:
         one: "%{count} ویدیو"
         other: "%{count} ویدیو"
-    boosted_from_html: بازبوقیده از طرف %{acct_link}
+    boosted_from_html: تقویت شده از طرف %{acct_link}
     content_warning: 'هشدا محتوا: %{warning}'
     disallowed_hashtags:
       one: 'دارای هشتگ غیرمجاز: %{tags}'
       other: 'دارای هشتگ‌های غیرمجاز: %{tags}'
     errors:
       in_reply_not_found: به نظر نمی‌رسد وضعیتی که می‌خواهید به آن پاسخ دهید، وجود داشته باشد.
-    language_detection: زبان نوشته خودبه‌خود شناخته شود
-    open_in_web: بازکردن در وب
+    open_in_web: گشودن در وب
     over_character_limit: از حد مجاز %{max} حرف فراتر رفتید
     pin_errors:
+      direct: فرسته‌هایی که فقط برای کاربران اشاره شده نمایانند نمی‌توانند سنجاق شوند
       limit: از این بیشتر نمی‌شود نوشته‌های ثابت داشت
       ownership: نوشته‌های دیگران را نمی‌توان ثابت کرد
-      private: نوشته‌های غیرعمومی را نمی‌توان ثابت کرد
-      reblog: بازبوق‌ها را نمی‌توان ثابت کرد
+      reblog: تقویت نمی‌تواند سنجاق شود
     poll:
       total_people:
         one: "%{count} نفر"
@@ -1279,7 +1209,7 @@ fa:
       private_long: تنها پیگیران شما می‌بینند
       public: عمومی
       public_long: همه می‌توانند ببینند
-      unlisted: فهرست‌نشده
+      unlisted: فهرست نشده
       unlisted_long: عمومی، ولی در فهرست نوشته‌ها نمایش نمی‌یابد
   statuses_cleanup:
     enabled: حذف خودکار فرسته‌های قدیمی
@@ -1308,102 +1238,20 @@ fa:
       '2629746': ۱ ماه
       '31556952': ۱ سال
       '5259492': ۲ ماه
+      '604800': ۱ هفته
       '63113904': ۲ سال
       '7889238': ۳ ماه
     min_age_label: کرانهٔ سن
     min_favs: نگه داشتن فرسته‌هایی با برگزینش بیش از
     min_favs_hint: هیچ یک از فرسته‌هایتان را که بیش از این تعداد برگزیده شده باشند، حذف نمی‌کند. برای حذف فرسته‌ها فارغ از تعداد برگزینش‌هایشان، خالی بگذارید
     min_reblogs: نگه داشتن فرسته‌هایی با تقویت بیش از
-    min_reblogs_hint: هیچ یک از فرسته‌هایتان را که بیش از این تعداد تق. یت شده باشند، حذف نمی‌کند. برای حذف فرسته‌ها فارغ از تعداد تقویت‌هایشان، خالی بگذارید
+    min_reblogs_hint: هیچ یک از فرسته‌هایتان را که بیش از این تعداد تقویت شده باشند، حذف نمی‌کند. برای حذف فرسته‌ها فارغ از تعداد تقویت‌هایشان، خالی بگذارید
   stream_entries:
     pinned: نوشته‌های ثابت
-    reblogged: بازبوقید
+    reblogged: تقویت شده
     sensitive_content: محتوای حساس
   tags:
     does_not_match_previous_name: با نام پیشین مطابق نیست
-  terms:
-    body_html: |
-      <h2>سیاست رازداری</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: شرایط استفاده و سیاست رازداری %{instance}
   themes:
     contrast: ماستودون (سایه‌روشن بالا)
     default: ماستودون (تیره)
@@ -1412,6 +1260,7 @@ fa:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%OH:%OM"
   two_factor_authentication:
     add: افزودن
     disable: غیرفعال‌کردن
@@ -1428,63 +1277,50 @@ fa:
     recovery_instructions_html: اگر تلفن خود را گم کردید، می‌توانید با یکی از کدهای بازیابی زیر کنترل حساب خود را به دست بگیرید. <strong>این کدها را در جای امنی نگه دارید.</strong> مثلاً آن‌ها را چاپ کنید و کنار سایر مدارک مهم خود قرار دهید.
     webauthn: کلیدهای امنیتی
   user_mailer:
+    appeal_approved:
+      action: به حساب خودتان بروید
+      explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کرده‌اید، پذیرفته شده است. حساب شما بار دیگر در وضعیت خوبی قرار دارد.
+      subject: درخواست تجدیدنظر شما در %{date} پذیرفته شد
+      title: درخواست تجدیدنظر پذیرفته شد
+    appeal_rejected:
+      explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کرده‌اید، رد شده است.
+      subject: درخواست تجدیدنظر شما در %{date} رد شده است
+      title: درخواست تجدیدنظر رد شد
     backup_ready:
       explanation: شما یک نسخهٔ پشتیبان کامل از حساب خود را درخواست کردید. این پشتیبان الان آمادهٔ بارگیری است!
       subject: بایگانی شما آمادهٔ دریافت است
       title: گرفتن بایگانی
-    sign_in_token:
-      details: 'جزییات تلاش‌ها:'
-      explanation: 'تلاشی برای ورود به حسابتان از یک نشانی آی‌پی ناشناخته کشف کردیم. اگر خودتان بودید، لطفاً رمز امنیتی زیر را در صفحهٔ چالش وارد کنید:'
-      further_actions: 'اگر خودتان نیودید، لطفاً گذرواژه‌تان را عوض کرده و از این‌جا تأیید هویت دو مرحله‌ای را روی حسابتان به کار بیندازید:'
-      subject: لطفاً تلاش برای ورود را تأیید کنید
-      title: تلاش برای ورود
     warning:
-      explanation:
-        disable: تا وقتی حساب شما متوقف باشد، داده‌های شما دست‌نخورده باقی می‌مانند، ولی تا وقتی که حسابتان باز نشده، نمی‌توانید هیچ کاری با آن بکنید.
-        sensitive: پرونده‌های رسانهٔ بارگذاری‌شده و رسانه‌های پیوسته به عنوان حساس در نظر گرفته خواهند شد.
-        silence: تا وقتی حساب شما محدود باشد، تنها کسانی که از قبل پیگیر شما بودند نوشته‌های شما در این کارساز را می‌بینند و شاید شما در برخی از فهرست‌های عمومی دیده نشوید. ولی دیگران همچنان می‌توانند به دلخواه خودشان پیگیر شما شوند.
-        suspend: حسابتان معلق شده و تمام بوق‌ها و رسانه‌های بارگذاشته‌تان، از روی این کارساز و کارسازهایی که پیگیرانی رویشان داشتید، به طور بازگشت‌ناپذیری برداشته شده‌اند.
-      get_in_touch: با پاسخ به این ایمیل می‌توانید با دست‌اندرکاران %{instance} در تماس باشید.
-      review_server_policies: مرور سیاست‌های کارساز
-      statuses: 'به طور خاص برای:'
+      appeal: فرستادن یک درخواست تجدیدنظر
+      appeal_description: اگر فکر می‌کنید این یک خطا است، می‌توانید یک درخواست تجدیدنظر به کارکنان %{instance} ارسال کنید.
+      categories:
+        spam: هرزنامه
+      reason: 'دلیل:'
       subject:
         disable: حساب %{acct} شما متوقف شده است
         none: هشدار برای %{acct}
-        sensitive: رسانه‌های فرستاده شده توسط حساب %{acct} شما برچسب حساس خورده‌اند
         silence: حساب %{acct} شما محدود شده است
         suspend: حساب %{acct}  شما معلق شده است
       title:
+        delete_statuses: فرسته‌ها برداشته شدند
         disable: حساب متوقف شده است
         none: هشدار
-        sensitive: رسانه‌تان به عنوان حساس در نظر گرفته شد
         silence: حساب محدود شده است
         suspend: حساب معلق شده است
     welcome:
       edit_profile_action: تنظیم نمایه
-      edit_profile_step: 'شما می‌توانید نمایهٔ خود را به دلخواه خود تغییر دهید: می‌توانید تصویر نمایه، تصویر پس‌زمینه، نام، و چیزهای دیگری را تعیین کنید. اگر بخواهید، می‌توانید حساب خود را خصوصی کنید تا فقط کسانی که شما اجازه می‌دهید بتوانند پیگیر حساب شما شوند.'
       explanation: نکته‌هایی که برای آغاز کار به شما کمک می‌کنند
       final_action: چیزی منتشر کنید
-      final_step: 'چیزی بنویسید! حتی اگر الان کسی پیگیر شما نباشد، دیگران نوشته‌های عمومی شما را می‌بینند، مثلاً در فهرست نوشته‌های محلی و در برچسب (هشتگ)ها. شاید بخواهید با برچسب #معرفی خودتان را معرفی کنید.'
       full_handle: نام کاربری کامل شما
       full_handle_hint: این چیزی است که باید به دوستانتان بگویید تا بتوانند از کارسازی دیگر به شما پیام داده یا پی‌گیرتان شوند.
-      review_preferences_action: تغییر ترجیحات
-      review_preferences_step: با رفتن به صفحهٔ ترجیحات می‌توانید چیزهای گوناگونی را تنظیم کنید. مثلاً این که چه ایمیل‌های آگاه‌سازی‌ای به شما فرستاده شود، یا حریم خصوصی پیش‌فرض نوشته‌هایتان چه باشد. اگر بیماری سفر (حالت تهوع بر اثر دیدن اجسام متحرک) ندارید، می‌توانید پخش خودکار ویدیوها را فعال کنید.
       subject: به ماستودون خوش آمدید
-      tip_federated_timeline: "«فهرست نوشته‌های همه‌جا» نمایی کلی از شبکهٔ ماستودون است. ولی فقط شامل افرادیست که همسایگانتان پیگیرشان هستند؛ پس کامل نیست."
-      tip_following: به طور پیش‌گزیده مدیر(ان) کارسازتان را پی می‌گیرید. برای یافتن افراد جالب دیگر، فهرست «نوشته‌های محلی» و «نوشته‌های همه‌جا» را ببینید.
-      tip_local_timeline: فهرست نوشته‌های محلی نمایی کلی از کاربران روی %{instance} را ارائه می‌دهد. این‌ها همسایه‌های شما هستند!
-      tip_mobile_webapp: اگر مرورگر موبایل شما امکان گذاشتن ماستودون روی صفحهٔ اصلی موبایل را به شما می‌دهد، این یعنی می‌توانید اعلان‌های خودکار ماستودون را دریافت کنید. با این کار ماستودون خیلی شبیه یک اپ معمولی موبایل می‌شود!
-      tips: نکته‌ها
       title: خوش آمدید، کاربر %{name}!
   users:
     follow_limit_reached: شما نمی‌توانید بیش از %{limit} نفر را پی بگیرید
-    generic_access_help_html: مشکل در دسترسی به حسابتان؟ می‌توانید برای کمک با %{email} تکاس بگیرید
     invalid_otp_token: کد ورود دومرحله‌ای نامعتبر است
-    invalid_sign_in_token: کد امنیتی نادرست
     otp_lost_help_html: اگر شما دسترسی به هیچ‌کدامشان ندارید، باید با ایمیل %{email} تماس بگیرید
     seamless_external_login: شما با یک سرویس خارج از مجموعه وارد شده‌اید، به همین دلیل تنظیمات ایمیل و رمز برای شما در دسترس نیست.
     signed_in_as: 'واردشده به نام:'
-    suspicious_sign_in_confirmation: به نظر می‌رسد پیش‌تر از این افزاره وارد نشده بودید و مدتی می‌شود که وارد نشده‌اید. داریم برای تأیید، یک رمز امنیتی به نشانی رایانامه‌تان می‌فرستیم.
   verification:
     explanation_html: 'شما می‌توانید <strong>خود را به عنوان مالک صفحه‌ای که در نمایه‌تان به آن پیوند داده‌اید تأیید کنید.</strong> برای این کار، صفحه‌ای که به آن پیوند داده‌اید، خودش باید پیوندی به نمایهٔ ماستودون شما داشته باشد. پیوند در آن صفحه <strong>باید</strong> عبارت <code>rel="me"‎</code> را به عنوان مشخّصهٔ (attribute) در خود داشته باشد. محتوای متن پیوند اهمتی ندارد. یک نمونه از چنین پیوندی:'
     verification: تأیید
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 86c6c955c..e08502ddb 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1,92 +1,27 @@
 ---
 fi:
   about:
-    about_hashtag_html: Nämä ovat hashtagilla <strong>#%{hashtag}</strong> merkittyjä julkisia tuuttauksia. Voit vastata niihin, jos sinulla on tili jossain päin fediversumia.
-    about_mastodon_html: Mastodon on sosiaalinen verkosto. Se on toteutettu avoimilla verkkoprotokollilla ja vapailla, avoimen lähdekoodin ohjelmistoilla, ja se toimii hajautetusti samaan tapaan kuin sähköposti.
-    about_this: Tietoja tästä palvelimesta
-    active_count_after: aktiivinen
-    active_footnote: Kuukausittaiset aktiiviset käyttäjät (MAU)
-    administered_by: 'Ylläpitäjä:'
-    api: Rajapinta
-    apps: Mobiili sovellukset
-    apps_platforms: Käytä Mastodonia iOS:llä, Androidilla tai muilla alustoilla
-    browse_directory: Selaa profiilihakemistoa ja suodata kiinnostuksen kohteiden mukaan
-    browse_local_posts: Selaa suoratoistoja julkisista viesteistä tältä palvelimelta
-    browse_public_posts: Selaa suoratoistoja julkisista viesteistä Mastodonissa
-    contact: Ota yhteyttä
+    about_mastodon_html: 'Tulevaisuuden sosiaalinen verkosto: Ei mainoksia, ei valvontaa, toteutettu avoimilla protokollilla ja hajautettu! Pidä tietosi ominasi Mastodonilla!'
     contact_missing: Ei asetettu
     contact_unavailable: Ei saatavilla
-    discover_users: Löydä käyttäjiä
-    documentation: Dokumentaatio
-    federation_hint_html: Tilillä %{instance}:ssa voit seurata ihmisiä millä tahansa Mastodon-palvelimella ja sen ulkopuolella.
-    get_apps: Kokeile mobiilisovellusta
     hosted_on: Mastodon palvelimella %{domain}
-    instance_actor_flash: |
-      Tämä on virtuaalitili, joka edustaa itse palvelinta eikä yksittäistä käyttäjää.
-      Sitä käytetään yhdistämistarkoituksiin, eikä sitä saa estää, ellet halua estää koko palvelinta, jolloin sinun on käytettävä verkkotunnuksen estoa.
-    learn_more: Lisätietoja
-    privacy_policy: Tietosuojaseloste
-    rules: Palvelimen säännöt
-    rules_html: 'Alla on yhteenveto säännöistä, joita sinun on noudatettava, jos haluat olla tili tällä Mastodonin palvelimella:'
-    see_whats_happening: Näe mitä tapahtuu
-    server_stats: 'Palvelimen tilastot:'
-    source_code: Lähdekoodi
-    status_count_after:
-      one: tila
-      other: tilanne
-    status_count_before: He ovat luoneet
-    tagline: Seuraa ja löydä uusia kavereita
-    terms: Käyttöehdot
-    unavailable_content: Moderoidut palvelimet
-    unavailable_content_description:
-      domain: Palvelin
-      reason: Syy
-      rejecting_media: 'Näiden palvelimien mediatiedostoja ei käsitellä tai tallenneta eikä pikkukuvia näytetä, mikä edellyttää manuaalista klikkausta alkuperäiseen tiedostoon:'
-      rejecting_media_title: Media suodatettu
-      silenced: 'Julkaisut näiltä palvelimilta piilotetaan julkisilta aikajanoilta ja keskusteluista, ilmoituksia ei luoda näiden käyttäjien tekemistä toiminnoista, jos et seuraa heitä:'
-      silenced_title: Hiljennetyt palvelimet
-      suspended: 'Dataa näiltä palvelimilta ei tulla käsittelemään, tallentamaan tai jakamaan. Tämä tekee kommunikoinnin näiden käyttäjien kanssa mahdottomaksi:'
-      suspended_title: Keskeytetyt palvelimet
-    unavailable_content_html: Mastodonin avulla voit yleensä tarkastella sisältöä ja olla vuorovaikutuksessa käyttäjien kanssa millä tahansa muulla palvelimella fediversessä. Nämä ovat poikkeuksia, jotka on tehty tälle palvelimelle.
-    user_count_after:
-      one: käyttäjä
-      other: käyttäjät
-    user_count_before: Koti
-    what_is_mastodon: Mikä on Mastodon?
+    title: Tietoja
   accounts:
-    choices_html: "%{name} valinnat:"
-    endorsements_hint: Voit suositella seuraamiasi henkilöitä web käyttöliittymän kautta, ne tulevat näkymään tähän.
-    featured_tags_hint: Voit käyttää tiettyjä aihesanoja, jotka näytetään täällä.
     follow: Seuraa
     followers:
       one: Seuraaja
       other: Seuraajat
-    following: Seuratut
+    following: Seuraaja
     instance_actor_flash: Tämä on virtuaalitili, jota käytetään edustamaan itse palvelinta eikä yksittäistä käyttäjää. Sitä käytetään yhdistämistarkoituksiin, eikä sitä tule keskeyttää.
-    joined: Liittynyt %{date}
     last_active: viimeksi aktiivinen
     link_verified_on: Tämän linkin omistus on tarkastettu %{date}
-    media: Media
-    moved_html: "%{name} on muuttanut osoitteeseen %{new_profile_link}:"
-    network_hidden: Nämä tiedot eivät ole käytettävissä
-    never_active: Ei koskaan
     nothing_here: Täällä ei ole mitään!
-    people_followed_by: Henkilöt, joita %{name} seuraa
-    people_who_follow: Käyttäjän %{name} seuraajat
     pin_errors:
       following: Sinun täytyy seurata henkilöä jota haluat tukea
     posts:
-      one: Tuuttaus
-      other: Tuuttaukset
-    posts_tab_heading: Tuuttaukset
-    posts_with_replies: Tuuttaukset ja vastaukset
-    roles:
-      admin: Ylläpitäjä
-      bot: Botti
-      group: Ryhmä
-      moderator: Moderaattori
-    unavailable: Profiili ei saatavilla
-    unfollow: Lopeta seuraaminen
+      one: Julkaisu
+      other: Julkaisut
+    posts_tab_heading: Julkaisut
   admin:
     account_actions:
       action: Suorita toimenpide
@@ -94,26 +29,30 @@ fi:
     account_moderation_notes:
       create: Jätä muistiinpano
       created_msg: Moderointimerkinnän luonti onnistui!
-      delete: Poista
       destroyed_msg: Moderointimerkinnän poisto onnistui!
     accounts:
       add_email_domain_block: Estä sähköpostidomain
       approve: Hyväksy
-      approve_all: Hyväksy kaikki
       approved_msg: Käyttäjän %{username} liittymishakemus hyväksyttiin
       are_you_sure: Oletko varma?
       avatar: Profiilikuva
       by_domain: Verkkotunnus
       change_email:
-        changed_msg: Tilin sähköposti vaihdettu onnistuneesti!
+        changed_msg: Sähköpostin vaihto onnistui!
         current_email: Nykyinen sähköposti
         label: Vaihda sähköposti
         new_email: Uusi sähköposti
         submit: Vaihda sähköposti
         title: Vaihda sähköposti käyttäjälle %{username}
+      change_role:
+        changed_msg: Rooli vaihdettu onnistuneesti!
+        label: Vaihda roolia
+        no_role: Ei roolia
+        title: Vaihda roolia käyttäjälle %{username}
       confirm: Vahvista
       confirmed: Vahvistettu
       confirming: Vahvistetaan
+      custom: Mukautettu
       delete: Poista tiedot
       deleted: Poistettu
       demote: Alenna
@@ -153,7 +92,7 @@ fi:
         active: Aktiivinen
         all: Kaikki
         pending: Odottavat
-        silenced: Hiljennetty
+        silenced: Rajoitettu
         suspended: Jäähyllä
         title: Moderointi
       moderation_notes: Moderointimerkinnät
@@ -161,9 +100,14 @@ fi:
       most_recent_ip: Viimeisin IP
       no_account_selected: Yhtään tiliä ei muutettu, koska mitään ei valittu
       no_limits_imposed: Rajoituksia ei ole asetettu
+      no_role_assigned: Roolia ei ole määritetty
       not_subscribed: Ei tilaaja
       pending: Odottaa tarkistusta
       perform_full_suspension: Siirrä kokonaan jäähylle
+      previous_strikes: Aiemmat varoitukset
+      previous_strikes_description_html:
+        one: Tällä tilillä on <strong>yksi</strong> varoitus.
+        other: Tällä tilillä on <strong>%{count}</strong> varoitusta.
       promote: Ylennä
       protocol: Protokolla
       public: Julkinen
@@ -171,8 +115,9 @@ fi:
       redownload: Päivitä profiilikuva
       redownloaded_msg: Käyttäjän %{username} profiilin päivittäminen alkuperästä onnistui
       reject: Hylkää
-      reject_all: Hylkää kaikki
       rejected_msg: Käyttäjän %{username} rekisteröitymishakemus hylättiin
+      remote_suspension_irreversible: Tilin tiedot on poistettu pysyvästi.
+      remote_suspension_reversible_hint_html: Tili on jäädytetty heidän palvelimellaan ja sen tiedot poistetaan pysyvästi %{date}. Ennen sitä tili etäpalvelimen ylläpito voi palauttaa tilin ilman haittavaikutuksia. Jos haluat poistaa kaikki tilin tiedot välittömästi, voit tehdä sen alta.
       remove_avatar: Poista profiilikuva
       remove_header: Poista otsakekuva
       removed_avatar_msg: Käyttäjän %{username} avatar-kuva poistettu onnistuneesti
@@ -184,19 +129,13 @@ fi:
       reset: Palauta
       reset_password: Palauta salasana
       resubscribe: Tilaa uudelleen
-      role: Oikeudet
-      roles:
-        admin: Ylläpitäjä
-        moderator: Moderaattori
-        staff: Henkilöstö
-        user: Käyttäjä
+      role: Rooli
       search: Hae
       search_same_email_domain: Muut käyttäjät, joilla on sama sähköpostiverkkotunnus
       search_same_ip: Muut käyttäjät samalla IP-osoitteella
       security_measures:
         only_password: Vain salasana
         password_and_2fa: Salasana ja kaksivaiheinen tunnistautuminen
-        password_and_sign_in_token: Salasana ja sähköpostitunnus
       sensitive: Pakotus arkaluontoiseksi
       sensitized: Merkitty arkaluontoiseksi
       shared_inbox_url: Jaetun saapuvan postilaatikon osoite
@@ -206,12 +145,15 @@ fi:
       silence: Hiljennä
       silenced: Mykistetty
       statuses: Tilat
+      strikes: Aiemmat varoitukset
       subscribe: Tilaa
+      suspend: Jäädytä
       suspended: Jäähyllä
       suspension_irreversible: Tämän tilin tiedot on poistettu peruuttamattomasti. Voit peruuttaa tilin jäädyttämisen, jolloin siitä tulee käyttökelpoinen, mutta toiminto ei palauta sillä aiemmin olleita tietoja.
       suspension_reversible_hint_html: Tili on jäädytetty, ja tiedot poistetaan kokonaan %{date}. Siihen asti tili voidaan palauttaa ilman haitallisia vaikutuksia. Jos haluat poistaa kaikki tilin tiedot välittömästi, voit tehdä sen alla.
-      time_in_queue: Odottaa jonossa %{time}
       title: Tilit
+      unblock_email: Poista sähköpostiosoitteen esto
+      unblocked_email_msg: Käyttäjän %{username} sähköpostiosoitteen esto kumottiin
       unconfirmed_email: Sähköpostia ei vahvistettu
       undo_sensitized: Kumoa pakotus arkaluontoiseksi tiliksi
       undo_silenced: Peru hiljennys
@@ -219,33 +161,41 @@ fi:
       unsilenced_msg: "%{username} -tilin rajoituksen kumoaminen onnistui"
       unsubscribe: Lopeta tilaus
       unsuspended_msg: "%{username} -tilin keskeytyksen kumoaminen onnistui"
-      username: Käyttäjänimi
+      username: Käyttäjätunnus
       view_domain: Näytä verkkotunnuksen yhteenveto
       warn: Varoita
       web: Verkko
       whitelisted: Sallittu liittämiselle
     action_logs:
       action_types:
+        approve_appeal: Hyväksy valitus
+        approve_user: Hyväksy käyttäjä
         assigned_to_self_report: Määritä raportti
         change_email_user: Vaihda sähköposti käyttäjälle
+        change_role_user: Muuta käyttäjän roolia
         confirm_user: Vahvista käyttäjä
         create_account_warning: Luo varoitus
         create_announcement: Luo ilmoitus
+        create_canonical_email_block: Luo sähköpostin esto
         create_custom_emoji: Luo mukautettu emoji
         create_domain_allow: Salli palvelin
         create_domain_block: Estä palvelin
         create_email_domain_block: Estä sähköpostipalvelin
         create_ip_block: Luo IP-sääntö
         create_unavailable_domain: Luo ei-saatavilla oleva verkkotunnus
+        create_user_role: Luo rooli
         demote_user: Alenna käyttäjä
         destroy_announcement: Poista ilmoitus
+        destroy_canonical_email_block: Poista sähköpostin esto
         destroy_custom_emoji: Poista mukautettu emoji
         destroy_domain_allow: Salli verkkotunnuksen poisto
         destroy_domain_block: Poista verkkotunnuksen esto
         destroy_email_domain_block: Poista sähköpostipalvelimen esto
+        destroy_instance: Tyhjennä verkkotunnus
         destroy_ip_block: Poista IP-sääntö
-        destroy_status: Poista tilapäivitys
+        destroy_status: Poista julkaisu
         destroy_unavailable_domain: Poista ei-saatavilla oleva verkkotunnus
+        destroy_user_role: Hävitä rooli
         disable_2fa_user: Poista kaksivaiheinen tunnistautuminen käytöstä
         disable_custom_emoji: Estä mukautettu emoji
         disable_sign_in_token_auth_user: Estä käyttäjältä sähköpostitunnuksen todennus
@@ -255,42 +205,56 @@ fi:
         enable_user: Tili otettu käyttöön
         memorialize_account: Muuta muistotiliksi
         promote_user: Käyttäjä ylennetty
+        reject_appeal: Hylkää valitus
+        reject_user: Hylkää käyttäjä
         remove_avatar_user: Profiilikuvan poisto
         reopen_report: Uudelleenavaa raportti
+        resend_user: Lähetä vahvistusviesti uudelleen
         reset_password_user: Nollaa salasana
         resolve_report: Selvitä raportti
         sensitive_account: Pakotus arkaluontoiseksi tiliksi
         silence_account: Hiljennä tili
         suspend_account: Jäädytä tili
         unassigned_report: Peruuta raportin määritys
+        unblock_email_account: Poista sähköpostiosoitteen esto
         unsensitive_account: Kumoa pakotus arkaluontoiseksi tiliksi
         unsilence_account: Peruuta tilin rajoitus
         unsuspend_account: Peruuta tilin jäädytys
         update_announcement: Päivitä ilmoitus
         update_custom_emoji: Päivitä muokattu emoji
         update_domain_block: Päivitä verkkotunnuksen esto
+        update_ip_block: Päivitä IP-sääntö
         update_status: Päivitä viesti
+        update_user_role: Päivitä rooli
       actions:
+        approve_appeal_html: "%{name} hyväksyi moderointipäätöksen muutoksenhaun lähettäjältä %{target}"
+        approve_user_html: "%{name} hyväksyi käyttäjän rekisteröitymisen kohteesta %{target}"
         assigned_to_self_report_html: "%{name} otti raportin %{target} tehtäväkseen"
         change_email_user_html: "%{name} vaihtoi käyttäjän %{target} sähköpostiosoitteen"
+        change_role_user_html: "%{name} muutti roolia %{target}"
         confirm_user_html: "%{name} vahvisti käyttäjän %{target} sähköpostiosoitteen"
         create_account_warning_html: "%{name} lähetti varoituksen henkilölle %{target}"
         create_announcement_html: "%{name} loi uuden ilmoituksen %{target}"
+        create_canonical_email_block_html: "%{name} esti sähköpostin hashilla %{target}"
         create_custom_emoji_html: "%{name} lähetti uuden emojin %{target}"
         create_domain_allow_html: "%{name} salli yhdistäminen verkkotunnuksella %{target}"
         create_domain_block_html: "%{name} esti verkkotunnuksen %{target}"
         create_email_domain_block_html: "%{name} esti sähköpostin %{target}"
         create_ip_block_html: "%{name} luonut IP-säännön %{target}"
         create_unavailable_domain_html: "%{name} pysäytti toimituksen verkkotunnukseen %{target}"
+        create_user_role_html: "%{name} luonut %{target} roolin"
         demote_user_html: "%{name} alensi käyttäjän %{target}"
         destroy_announcement_html: "%{name} poisti ilmoituksen %{target}"
+        destroy_canonical_email_block_html: "%{name} poisti sähköposti eston hashilla %{target}"
         destroy_custom_emoji_html: "%{name} poisti emojin %{target}"
         destroy_domain_allow_html: "%{name} esti yhdistämisen verkkotunnuksella %{target}"
         destroy_domain_block_html: "%{name} poisti verkkotunnuksen %{target} eston"
         destroy_email_domain_block_html: "%{name} poisti verkkotunnuksen %{target} eston"
+        destroy_instance_html: "%{name} tyhjensi verkkotunnuksen %{target}"
         destroy_ip_block_html: "%{name} poisti IP-säännön %{target}"
         destroy_status_html: "%{name} poisti viestin %{target}"
         destroy_unavailable_domain_html: "%{name} jatkoi toimitusta verkkotunnukseen %{target}"
+        destroy_user_role_html: "%{name} poisti %{target} roolin"
         disable_2fa_user_html: "%{name} poisti käyttäjältä %{target} vaatimuksen kaksivaiheisen todentamiseen"
         disable_custom_emoji_html: "%{name} poisti emojin %{target}"
         disable_sign_in_token_auth_user_html: "%{name} poisti sähköpostitunnuksen %{target} todennuksen käytöstä"
@@ -300,22 +264,28 @@ fi:
         enable_user_html: "%{name} salli kirjautumisen käyttäjälle %{target}"
         memorialize_account_html: "%{name} muutti käyttäjän %{target} tilin muistosivuksi"
         promote_user_html: "%{name} ylensi käyttäjän %{target}"
+        reject_appeal_html: "%{name} hylkäsi moderointipäätöksen muutoksenhaun %{target}"
+        reject_user_html: "%{name} hylkäsi käyttäjän rekisteröitymisen kohteesta %{target}"
         remove_avatar_user_html: "%{name} poisti käyttäjän %{target} profiilikuvan"
         reopen_report_html: "%{name} avasi uudelleen raportin %{target}"
+        resend_user_html: "%{name} lähetti vahvistusviestin sähköpostitse käyttäjälle %{target}"
         reset_password_user_html: "%{name} palautti käyttäjän %{target} salasanan"
         resolve_report_html: "%{name} ratkaisi raportin %{target}"
         sensitive_account_html: "%{name} merkitsi %{target} median arkaluonteiseksi"
         silence_account_html: "%{name} rajoitti %{target} tilin"
         suspend_account_html: "%{name} siirsi käyttäjän %{target} jäähylle"
         unassigned_report_html: "%{name} peruutti raportin määrityksen %{target}"
+        unblock_email_account_html: "%{name} poisti %{target} sähköpostiosoitteen eston"
         unsensitive_account_html: "%{name} poisti merkinnän %{target} arkaluonteinen media"
         unsilence_account_html: "%{name} ei tehnyt rajoitusta %{target} tilille"
         unsuspend_account_html: "%{name} perui käyttäjän %{target} jäähyn"
         update_announcement_html: "%{name} päivitti ilmoituksen %{target}"
         update_custom_emoji_html: "%{name} päivitti emojin %{target}"
         update_domain_block_html: "%{name} päivitti verkkotunnuksen %{target}"
+        update_ip_block_html: "%{name} muutti sääntöä IP-osoitteelle %{target}"
         update_status_html: "%{name} päivitti viestin %{target}"
-      deleted_status: "(poistettu tilapäivitys)"
+        update_user_role_html: "%{name} muutti roolia %{target}"
+      deleted_account: poisti tilin
       empty: Lokeja ei löytynyt.
       filter_by_action: Suodata tapahtuman mukaan
       filter_by_user: Suodata käyttäjän mukaan
@@ -354,11 +324,12 @@ fi:
       enable: Ota käyttöön
       enabled: Käytössä
       enabled_msg: Emojin käyttöönotto onnistui
-      image_hint: PNG enintään 50 kt
+      image_hint: PNG tai GIF enintään %{size}
       list: Listaa
       listed: Listassa
       new:
         title: Lisää uusi mukautettu emoji
+      no_emoji_selected: Hymiöitä ei muutettu, koska yhtään ei valittu
       not_permitted: Sinulla ei ole oikeutta suorittaa tätä toimintoa
       overwrite: Kirjoita yli
       shortcode: Lyhennekoodi
@@ -371,13 +342,41 @@ fi:
       updated_msg: Emojin päivitys onnistui!
       upload: Lähetä
     dashboard:
+      active_users: aktiiviset käyttäjät
+      interactions: vuorovaikutukset
+      media_storage: Median tallennustila
+      new_users: uudet käyttäjät
+      opened_reports: raportit avattu
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> vireillä oleva valitus"
+        other: "<strong>%{count}</strong> vireillä olevat valitukset"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> odottava raportti"
+        other: "<strong>%{count}</strong> odottavat raportit"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> odottava hashtagi"
+        other: "<strong>%{count}</strong> odottavat hashtagit"
+      pending_users_html:
+        one: "<strong>%{count}</strong> odottava käyttäjä"
+        other: "<strong>%{count}</strong> odottavat käyttäjät"
+      resolved_reports: raportit ratkaistu
       software: Ohjelmisto
+      sources: Rekisteröitymisen lähteet
       space: Tilankäyttö
       title: Hallintapaneeli
+      top_languages: Aktiiviset kielet
+      top_servers: Aktiiviset palvelimet
+      website: Sivusto
+    disputes:
+      appeals:
+        empty: Valituksia ei löytynyt.
+        title: Valitukset
     domain_allows:
       add_new: Salli liitto verkkotunnuksella
       created_msg: Verkkotunnus on onnistuneesti sallittu federaatiolle
       destroyed_msg: Verkkotunnus on estetty federaatiossa
+      export: Vie
+      import: Tuo
       undo: Estä liitto verkkotunnukselle
     domain_blocks:
       add_new: Lisää uusi
@@ -385,16 +384,21 @@ fi:
       destroyed_msg: Verkkotunnuksen esto on peruttu
       domain: Verkkotunnus
       edit: Muokkaa verkkotunnuksen estoa
+      existing_domain_block: Olet jo asettanut tiukemmat rajoitukset %{name}.
       existing_domain_block_html: Olet jo asettanut %{name} tiukemmat rajat ja sinun täytyy <a href="%{unblock_url}">poistaa se</a> ensin.
+      export: Vie
+      import: Tuo
       new:
         create: Luo esto
         hint: Verkkotunnuksen esto ei estä tilien luomista ja lisäämistä tietokantaan, mutta se soveltaa näihin tileihin automaattisesti määrättyjä moderointitoimia tilin luomisen jälkeen.
         severity:
-          desc_html: "<strong>Hiljennys</strong> estää tilin julkaisuja näkymästä muille kuin tilin seuraajille. <strong>Jäähy</strong> poistaa tilin kaiken sisällön, median ja profiilitiedot. Jos haluat vain hylätä mediatiedostot, valitse <strong>Ei mitään</strong>."
+          desc_html: "<strong>Rajoita</strong> -valinta piilottaa tämän verkkoalueen tilien julkaisut heiltä, jotka eivät seuraa kyseisiä tilejä. <strong>Lopeta</strong> poistaa kaiken sisällön, median ja profiilien tiedot tämän verkkotunnuksen tileiltä palvelimellasi. Käytä valintaa <strong>Ei mitään</strong>, jos haluat vain estää mediatiedostojen julkaisemisen."
           noop: Ei mitään
-          silence: Hiljennys
+          silence: Rajoita
           suspend: Jäähy
         title: Uusi verkkotunnuksen esto
+      no_domain_block_selected: Verkkoalue-estoihin ei tehty muutoksia, koska valintoja ei tehty
+      not_permitted: Nykyiset käyttöoikeutesi eivät kata tätä toimintoa
       obfuscate: Peitä verkkotunnuksen nimi
       obfuscate_hint: Peitä verkkotunnus osittain luettelossa, jos verkkotunnuksen rajoitusten luettelo on käytössä
       private_comment: Yksityinen kommentti
@@ -405,72 +409,116 @@ fi:
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
       reject_reports: Hylkää raportit
       reject_reports_hint: Ohita kaikki tästä verkkotunnuksesta tulevat raportit. Erottamisen kannalta ei merkitystä
-      rejecting_media: mediatiedostojen hylkääminen
-      rejecting_reports: raporttien hylkääminen
-      severity:
-        silence: hiljennetty
-        suspend: jäähyllä
-      show:
-        affected_accounts:
-          one: Vaikuttaa yhteen tiliin tietokannassa
-          other: Vaikuttaa %{count} tiliin tietokannassa
-        retroactive:
-          silence: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien hiljennys
-          suspend: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien jäähy
-        title: Peru verkkotunnuksen %{domain} esto
-        undo: Peru
       undo: Peru
       view: Näytä verkkotunnuksen esto
     email_domain_blocks:
       add_new: Lisää uusi
+      attempts_over_week:
+        one: "%{count} yritystä viimeisen viikon aikana"
+        other: "%{count} rekisteröitymisyritystä viimeisen viikon aikana"
       created_msg: Sähköpostiverkkotunnuksen lisäys estolistalle onnistui
       delete: Poista
-      destroyed_msg: Sähköpostiverkkotunnuksen poisto estolistalta onnistui
+      dns:
+        types:
+          mx: MX tietue
       domain: Verkkotunnus
-      empty: Sähköpostiosoitteita ei ole tällä hetkellä estetty.
-      from_html: käyttäjältä %{domain}
       new:
         create: Lisää verkkotunnus
+        resolve: Ratkaise verkkotunnus
         title: Uusi sähköpostiestolistan merkintä
+      no_email_domain_block_selected: Sähköpostin verkkotunnuksia ei muutettu, koska yhtään ei valittu
+      resolved_dns_records_hint_html: Verkkotunnuksen nimi määräytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää kirjautumisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostin palveluntarjoajia.</strong>
+      resolved_through_html: Ratkaistu %{domain} kautta
       title: Sähköpostiestolista
+    export_domain_allows:
+      new:
+        title: Tuo sallitut verkkoalueet
+      no_file: Yhtäkään tiedostoa ei ole valittu
+    export_domain_blocks:
+      import:
+        description_html: Olet tuomassa järjestelmään luetteloa verkkoalue-estoista. Tarkista luettelo huolella – etenkin, ellet ole itse tehnyt listausta.
+        existing_relationships_warning: Olemassa olevat seuraussuhteet
+        private_comment_description_html: 'Tuodun estolistan alkuperän selvillä pitämiseksi, lisätään tietojen yhteyteen seuraava yksityinen kommentti: <q>%{comment}</q>'
+        private_comment_template: Tuotu lähteestä %{source}, pvm %{date}
+        title: Tuo luettelo verkkoalue-estoista
+      new:
+        title: Tuo luettelo verkkoalue-estoista
+      no_file: Yhtäkään tiedostoa ei ole valittu
     follow_recommendations:
       description_html: "<strong>Suositusten noudattaminen auttaa uusia käyttäjiä löytämään nopeasti mielenkiintoista sisältöä.</strong>. Jos käyttäjä ei ole ollut vuorovaikutuksessa tarpeeksi muiden kanssa luodakseen henkilökohtaisia seuraajia, näitä muita tilejä suositellaan sen sijaan. Ne lasketaan uudelleen päivittäin yhdistelmästä tilejä, joilla on korkein viimeaikainen käyttö ja korkein paikallinen seuraajien määrä tietyllä kielellä."
       language: Kielelle
-      status: Tilanne
+      status: Tila
       suppress: Peitä noudata suosituksia
       suppressed: Rajoitettu
       title: Noudata suosituksia
       unsuppress: Palauta seuraa suositus
     instances:
+      availability:
+        description_html:
+          one: Jos toimitus verkkotunnukseen epäonnistuu <strong>%{count} päivä</strong> ilman onnistumista, uusia yrityksiä ei tehdä ennen kuin toimitus <em>alkaen</em> verkkotunnukselta on vastaanotettu.
+          other: Jos toimitus verkkotunnukselle, epäonnistuu <strong>%{count} eri päivänä</strong> ilman onnistumista, uusia yrityksiä ei tehdä ennen kuin toimitus <em>alkaen</em> verkkotunnuselta on vastaanotettu.
+        failure_threshold_reached: Epäonnistumisen kynnys saavutettu %{date}.
+        failures_recorded:
+          one: Epäonnistuneita yrityksiä %{count} päivässä.
+          other: Epäonnistuneita yrityksiä %{count} päivää.
+        no_failures_recorded: Ei epäonnistumisia kirjattu.
+        title: Saatavuus
+        warning: Viimeisin yritys yhdistää yhteys tähän palvelimeen on epäonnistunut
       back_to_all: Kaikki
       back_to_limited: Rajoitettu
       back_to_warning: Varoitus
       by_domain: Verkkotunnus
+      confirm_purge: Oletko varma, että haluat pysyvästi poistaa tiedot tältä verkkotunnukselta?
+      content_policies:
+        comment: Sisäinen huomautus
+        description_html: Voit määrittää sisältökäytännöt, joita sovelletaan kaikkiin tämän verkkotunnuksen ja sen aliverkkotunnuksien tileihin.
+        policies:
+          reject_media: Hylkää media
+          reject_reports: Hylkää raportit
+          silence: Rajoitus
+          suspend: Jäädytä
+        policy: Käytännöt
+        reason: Julkinen syy
+        title: Sisällön toimintatavat
+      dashboard:
+        instance_accounts_dimension: Seuratuimmat tilit
+        instance_accounts_measure: tallennetut tilit
+        instance_followers_measure: seuraajamme siellä
+        instance_follows_measure: heidän seuraajansa täällä
+        instance_languages_dimension: Suosituimmat kielet
+        instance_media_attachments_measure: tallennetut median liitteet
+        instance_reports_measure: niitä koskevat raportit
+        instance_statuses_measure: tallennetut viestit
       delivery:
         all: Kaikki
         clear: Tyhjennä toimitusvirheet
+        failing: Epäonnistuminen
         restart: Käynnistä toimitus uudelleen
         stop: Lopeta toimitus
-        title: Toimitus
         unavailable: Ei saatavilla
-        unavailable_message: Toimitus ei käytettävissä
-        warning: Varoitus
       delivery_available: Toimitus on saatavilla
       delivery_error_days: Toimitusvirheen päivät
       delivery_error_hint: Jos toimitus ei ole mahdollista %{count} päivän aikana, se merkitään automaattisesti toimittamattomaksi.
+      destroyed_msg: Tiedot %{domain} on nyt jonossa välitöntä poistoa varten.
       empty: Verkkotunnuksia ei löytynyt.
+      known_accounts:
+        one: "%{count} tunnettu tili"
+        other: "%{count} tunnettua tiliä"
       moderation:
         all: Kaikki
         limited: Rajoitettu
         title: Moderointi
       private_comment: Yksityinen kommentti
       public_comment: Julkinen kommentti
+      purge: Tyhjennä
+      purge_description_html: Jos uskot tämän verkkotunnuksen olevan offline-tilassa, voit poistaa kaikki tilitietueet ja niihin liittyvät tiedot sinun tallennustilasta. Tämä voi kestää jonkin aikaa.
       title: Tiedossa olevat instanssit
       total_blocked_by_us: Estetty meidän toimesta
       total_followed_by_them: Heidän seuraama
       total_followed_by_us: Meidän seuraama
       total_reported: Niitä koskevat raportit
       total_storage: Medialiitteet
+      totals_time_period_hint_html: Alla näkyvät yhteenlasketut tiedot sisältävät koko ajan.
     invites:
       deactivate_all: Poista kaikki käytöstä
       filter:
@@ -494,60 +542,147 @@ fi:
         title: Luo uusi IP-sääntö
       no_ip_block_selected: IP-sääntöjä ei muutettu, koska yhtään ei ole valittuna
       title: IP-säännöt
-    pending_accounts:
-      title: Vireillä olevat tilit (%{count})
     relationships:
       title: "%{acct}n suhteet"
     relays:
-      add_new: Lisää uusi rele
+      add_new: Lisää uusi välittäjä
       delete: Poista
-      description_html: "<strong>federation relay</strong> on välittäjä palvelin, joka vaihtaa suuria määriä julkisia viestejä palvelimien välillä, jotka tilaavat ja julkaisevat sitä. <strong>Tämä auttaa pieniä ja keskisuuria palvelimia löytämään monipuolista sisältöä</strong>, joka muuten vaatisi käyttäjiä seuraamaan manuaalisesti muita ihmisiä eri palvelimilla."
+      description_html: "<strong>federaatiovälittäjä</strong> on välityspalvelin, joka siirtää siihen liittyneiden palvelimien välillä suuria julksia viestimääriä. <strong>Tämä voi auttaa pieniä ja keskikokoisia palvelimia löytämään fediversen sisältöä</strong>, joka muutoin vaatisi paikallisia käyttäjiä seuraamaan etäpalvelimien käyttäjiä manuaalisesti."
       disable: Poista käytöstä
-      disabled: Poistettu käytöstä
+      disabled: Ei käytössä
       enable: Ota käyttöön
-      enable_hint: Kun käytössä, palvelimesi tilaa kaikki julkiset viestit tästä releestä ja alkaa lähettää tämän palvelimen julkisia viestejä siihen.
+      enable_hint: Kun tämä on otettu käyttöön, palvelimesi liittyy välittäjään ja vastaanottaa jatkossa kaikki sen jakelemat julkiset julkaisut sekä välittää omat julkiset julkaisunsa sille.
       enabled: Käytössä
-      inbox_url: Synkronoi URL
-      pending: Odotetaan releen hyväksyntää
+      inbox_url: Välittäjän URL
+      pending: Odotetaan välittäjän hyväksyntää
       save_and_enable: Tallenna ja ota käyttöön
-      setup: Määritä releyhteys
+      setup: Määritä yhteys välittäjään
       signatures_not_enabled: Releet eivät toimi oikein, kun turvallinen tila tai rajoitettu federaatio on käytössä
       status: Tila
-      title: Releet
+      title: Välittäjät
     report_notes:
       created_msg: Muistiinpano onnistuneesti lisätty raporttiin!
       destroyed_msg: Muistiinpano onnistuneesti poistettu raportista!
     reports:
+      account:
+        notes:
+          one: "%{count} ilmoitus"
+          other: "%{count} ilmoitusta"
+      action_log: Tarkastusloki
       action_taken_by: Toimenpiteen tekijä
+      actions:
+        delete_description_html: Ilmoitetut viestit poistetaan ja kirjataan varoitus, joka auttaa sinua saman tilin tulevista rikkomuksista.
+        mark_as_sensitive_description_html: Ilmoitettujen viestien media merkitään arkaluonteisiksi ja varoitus tallennetaan, jotta voit kärjistää saman tilin tulevia rikkomuksia.
+        other_description_html: Katso lisää vaihtoehtoja tilin käytöksen hallitsemiseksi ja ilmoitetun tilin viestinnän mukauttamiseksi.
+        resolve_description_html: Ilmoitettua tiliä vastaan ei ryhdytä toimenpiteisiin, varoitusta ei kirjata ja raportti suljetaan.
+        silence_description_html: Profiili näkyy vain niille, jotka jo seuraavat sitä tai etsivät sen manuaalisesti, mikä rajoittaa merkittävästi kattavuutta. Se voidaan aina palauttaa.
+        suspend_description_html: Profiili ja sen koko sisältö eivät ole käytettävissä, kunnes se lopulta poistetaan. Vuorovaikutus tilin kanssa on mahdotonta. Palautettavissa 30 päivän kuluessa.
+      actions_description_html: Päätä, mihin toimiin ryhdyt tämän ilmoituksen ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä vastaan, heille lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong> luokka on valittuna.
+      add_to_report: Lisää raporttiin
       are_you_sure: Oletko varma?
       assign_to_self: Ota tehtäväksi
       assigned: Määritetty valvoja
+      by_target_domain: Ilmoitetun tilin verkkotunnus
+      category: Kategoria
+      category_description_html: Syy, miksi tämä tili ja/tai sisältö ilmoitettiin, mainitaan yhteydenotossa ilmoitettuun tiliin
       comment:
         none: Ei mitään
+      comment_description_html: 'Antaakseen lisätietoja %{name} kirjoitti:'
       created_at: Raportoitu
+      delete_and_resolve: Poista viestejä
       forwarded: Välitetty
       forwarded_to: Välitetty %{domain}
       mark_as_resolved: Merkitse ratkaistuksi
+      mark_as_sensitive: Merkitse arkaluonteiseksi
       mark_as_unresolved: Merkitse ratkaisemattomaksi
+      no_one_assigned: Ei kukaan
       notes:
         create: Lisää muistiinpano
         create_and_resolve: Ratkaise ja lisää muistiinpano
         create_and_unresolve: Avaa uudelleen ja lisää muistiinpano
         delete: Poista
         placeholder: Kuvaile mitä toimia on tehty tai muita päivityksiä tähän raporttiin…
+        title: Merkinnät
+      notes_description_html: Tarkastele ja jätä merkintöjä muille valvojille ja itsellesi tulevaisuuteen
+      quick_actions_description_html: 'Suorita nopea toiminto tai vieritä alas nähdäksesi raportoitu sisältö:'
+      remote_user_placeholder: etäkäyttäjä instanssista %{instance}
       reopen: Avaa raportti uudestaan
       report: Raportti nro %{id}
       reported_account: Raportoitu tili
       reported_by: Raportoija
       resolved: Ratkaistut
       resolved_msg: Raportti onnistuneesti ratkaistu!
+      skip_to_actions: Siirry toimintoihin
       status: Tila
-      target_domain: Ilmoitetun tilin verkkotunnus
+      statuses: Raportoitu sisältö
+      statuses_description_html: Loukkaava sisältö mainitaan ilmoitetun tilin yhteydessä
       target_origin: Raportoidun tilin alkuperä
       title: Raportit
       unassign: Määrittämätön
       unresolved: Ratkaisemattomat
       updated_at: Päivitetty
+      view_profile: Näytä profiili
+    roles:
+      add_new: Lisää rooli
+      assigned_users:
+        one: "%{count} käyttäjä"
+        other: "%{count} käyttäjää"
+      categories:
+        administration: Ylläpito
+        devops: DevOps
+        invites: Kutsut
+        moderation: Moderointi
+        special: Erikois
+      delete: Poista
+      description_html: Käyttäjän <strong>roolit</strong>, voit muokata toimintoja ja alueita mitä sinun Mastodon käyttäjät voivat käyttää.
+      edit: Muokkaa "%{name}" roolia
+      everyone: Oletus käyttöoikeudet
+      everyone_full_description_html: Tämä on <strong>perusrooli</strong> joka vaikuttaa <strong>kaikkiin käyttäjiin</strong>, jopa ilman määrättyä roolia. Kaikki muut roolit perivät sen käyttöoikeudet.
+      permissions_count:
+        one: "%{count} käyttöoikeus"
+        other: "%{count} käyttöoikeutta"
+      privileges:
+        administrator: Ylläpitäjä
+        administrator_description: Käyttäjät, joilla on tämä käyttöoikeus, ohittavat jokaisen käyttöoikeuden
+        delete_user_data: Poista käyttäjän tiedot
+        delete_user_data_description: Salli käyttäjien poistaa muiden käyttäjien tiedot viipymättä
+        invite_users: Kutsu käyttäjiä
+        invite_users_description: Sallii käyttäjien kutsua uusia ihmisiä palvelimelle
+        manage_announcements: Hallitse Ilmoituksia
+        manage_announcements_description: Salli käyttäjien hallita ilmoituksia palvelimella
+        manage_appeals: Hallitse valituksia
+        manage_appeals_description: Antaa käyttäjien tarkastella valvontatoimia koskevia valituksia
+        manage_blocks: Hallitse lohkoja
+        manage_blocks_description: Sallii käyttäjien estää sähköpostipalvelujen ja IP-osoitteiden käytön
+        manage_custom_emojis: Hallita mukautettuja hymiöitä
+        manage_custom_emojis_description: Salli käyttäjien hallita mukautettuja hymiöitä palvelimella
+        manage_federation: Hallita liitoksia
+        manage_federation_description: Sallii käyttäjien estää tai sallia liitoksen muiden verkkotunnusten kanssa ja hallita toimitusta
+        manage_invites: Hallita kutsuja
+        manage_invites_description: Sallii käyttäjien selata ja poistaa kutsulinkkejä käytöstä
+        manage_reports: Hallita raportteja
+        manage_reports_description: Sallii käyttäjien tarkastella raportteja ja suorittaa valvontatoimia niitä vastaan
+        manage_roles: Hallita rooleja
+        manage_roles_description: Sallii käyttäjien hallita ja määrittää rooleja heidän alapuolellaan
+        manage_rules: Hallita sääntöjä
+        manage_rules_description: Sallii käyttäjien vaihtaa palvelinsääntöjä
+        manage_settings: Hallita asetuksia
+        manage_settings_description: Salli käyttäjien muuttaa sivuston asetuksia
+        manage_taxonomies: Hallita luokittelua
+        manage_taxonomies_description: Sallii käyttäjien tarkistaa trendillisen sisällön ja päivittää hashtag-asetuksia
+        manage_user_access: Hallita käyttäjän oikeuksia
+        manage_user_access_description: Sallii käyttäjien poistaa käytöstä muiden käyttäjien kaksivaiheisen todennuksen, muuttaa heidän sähköpostiosoitettaan ja nollata heidän salasanansa
+        manage_users: Hallita käyttäjiä
+        manage_users_description: Sallii käyttäjien tarkastella muiden käyttäjien tietoja ja suorittaa valvontatoimia heitä vastaan
+        manage_webhooks: Hallita Webhookit
+        manage_webhooks_description: Sallii käyttäjien luoda webhookit hallinnollisiin tapahtumiin
+        view_audit_log: Katsoa valvontalokia
+        view_audit_log_description: Sallii käyttäjien nähdä palvelimen hallinnollisten toimien historian
+        view_dashboard: Näytä koontinäyttö
+        view_dashboard_description: Sallii käyttäjien käyttää kojelautaa ja erilaisia mittareita
+        view_devops: DevOps
+        view_devops_description: Sallii käyttäjille oikeuden käyttää Sidekiq ja pgHero dashboardeja
+      title: Roolit
     rules:
       add_new: Lisää sääntö
       delete: Poista
@@ -556,152 +691,219 @@ fi:
       empty: Palvelimen sääntöjä ei ole vielä määritelty.
       title: Palvelimen säännöt
     settings:
-      activity_api_enabled:
-        desc_html: Paikallisesti julkaistujen tilojen, aktiivisten käyttäjien ja uusien rekisteröintien määrät viikoittain
-        title: Julkaise koostetilastoja käyttäjien aktiivisuudesta
-      bootstrap_timeline_accounts:
-        desc_html: Erota käyttäjänimet pilkulla. Vain paikalliset ja lukitsemattomat tilit toimivat. Jos kenttä jätetään tyhjäksi, oletusarvona ovat kaikki paikalliset ylläpitäjät.
-        title: Uudet käyttäjät seuraavat oletuksena seuraavia tilejä
-      contact_information:
-        email: Työsähköposti
-        username: Yhteyshenkilön käyttäjänimi
-      custom_css:
-        desc_html: Muokkaa ulkoasua CSS:llä, joka on ladattu jokaiselle sivulle
-        title: Mukautettu CSS
+      about:
+        manage_rules: Hallinnoi palvelimen sääntöjä
+        preamble: Anna perusteellista tietoa siitä, miten palvelinta käytetään, valvotaan, rahoitetaan.
+        rules_hint: On olemassa erityinen alue sääntöjä, joita käyttäjien odotetaan noudattavan.
+        title: Tietoja
+      appearance:
+        preamble: Muokkaa Mastodonin web-käyttöliittymää.
+        title: Ulkoasu
+      branding:
+        preamble: Palvelimesi brändäys erottaa sen muista verkon palvelimista. Nämä tiedot voidaan näyttää useissa eri ympäristöissä, kuten Mastodonin käyttöliittymässä, sovelluksissa, linkkien esikatselu muilla sivustoilla ja viestisovelluksien sisällä ja niin edelleen. Tästä syystä on parasta pitää nämä tiedot selkeinä, lyhyinä ja ytimekkäinä.
+        title: Brändäys
+      content_retention:
+        preamble: Määritä, miten käyttäjän luoma sisältö tallennetaan Mastodoniin.
+        title: Sisällön säilyttäminen
       default_noindex:
         desc_html: Vaikuttaa kaikkiin käyttäjiin, jotka eivät ole muuttaneet tätä asetusta itse
-        title: Valitse oletuksena käyttäjät hakukoneiden indeksoinnin ulkopuolelle
+        title: Jätä käyttäjät oletusarvoisesti hakukoneindeksoinnin ulkopuolelle
+      discovery:
+        follow_recommendations: Noudata suosituksia
+        preamble: Mielenkiintoisen sisällön esille tuominen auttaa saamaan uusia käyttäjiä, jotka eivät ehkä tunne ketään Mastodonista. Määrittele, kuinka erilaiset etsintäominaisuudet toimivat palvelimellasi.
+        profile_directory: Profiilihakemisto
+        public_timelines: Julkiset aikajanat
+        title: Löytäminen
+        trends: Trendit
       domain_blocks:
         all: Kaikille
         disabled: Ei kenellekkään
-        title: Näytä domainestot
         users: Kirjautuneille paikallisille käyttäjille
-      domain_blocks_rationale:
-        title: Näytä syy
-      hero:
-        desc_html: Näytetään etusivulla. Suosituskoko vähintään 600x100 pikseliä. Jos kuvaa ei aseteta, käytetään instanssin pikkukuvaa
-        title: Sankarin kuva
-      mascot:
-        desc_html: Näytetään useilla sivuilla. Suositus vähintään 293×205px. Kun ei ole asetettu, käytetään oletuskuvaa
-        title: Maskottikuva
-      peers_api_enabled:
-        desc_html: Verkkotunnukset, jotka tämä instanssi on kohdannut fediversumissa
-        title: Julkaise löydettyjen instanssien luettelo
-      preview_sensitive_media:
-        desc_html: Linkin esikatselu muilla sivustoilla näyttää pikkukuvan vaikka media on merkitty arkaluonteiseksi
-        title: Näytä arkaluontoiset mediat OpenGraph esikatselussa
-      profile_directory:
-        desc_html: Salli käyttäjien olla löydettävissä
-        title: Ota profiilihakemisto käyttöön
       registrations:
-        closed_message:
-          desc_html: Näytetään etusivulla, kun rekisteröinti on suljettu. HTML-tagit käytössä
-          title: Viesti, kun rekisteröinti on suljettu
-        deletion:
-          desc_html: Salli jokaisen poistaa oma tilinsä
-          title: Avoin tilin poisto
-        min_invite_role:
-          disabled: Ei kukaan
-          title: Salli kutsut käyttäjältä
-        require_invite_text:
-          desc_html: Kun rekisteröinnit edellyttävät manuaalista hyväksyntää, tee “Miksi haluat liittyä?” teksti pakolliseksi eikä valinnaiseksi
-          title: Vaadi uusia käyttäjiä antamaan liittymisen syy
+        preamble: Määritä, kuka voi luoda tilin palvelimellesi.
+        title: Rekisteröinnit
       registrations_mode:
         modes:
           approved: Rekisteröinti vaatii hyväksynnän
           none: Kukaan ei voi rekisteröityä
           open: Kaikki voivat rekisteröityä
-        title: Rekisteröintitapa
-      show_known_fediverse_at_about_page:
-        desc_html: Kun tämä on valittu, esikatselussa näytetään tuuttaukset kaikkialta tunnetusta fediversumista. Muutoin näytetään vain paikalliset tuuttaukset.
-        title: Näytä aikajanan esikatselussa koko tunnettu fediversumi
-      show_staff_badge:
-        desc_html: Näytä käyttäjäsivulla henkilöstömerkki
-        title: Näytä henkilöstömerkki
-      site_description:
-        desc_html: Esittelykappale etusivulla ja metatunnisteissa. HTML-tagit käytössä, tärkeimmät ovat <code>&lt;a&gt;</code> ja <code>&lt;em&gt;</code>.
-        title: Instanssin kuvaus
-      site_description_extended:
-        desc_html: Hyvä paikka käytösohjeille, säännöille, ohjeistuksille ja muille instanssin muista erottaville asioille. HTML-tagit käytössä
-        title: Omavalintaiset laajat tiedot
-      site_short_description:
-        desc_html: Näytetään sivupalkissa ja kuvauksessa. Kerro yhdessä kappaleessa, mitä Mastodon on ja mikä tekee palvelimesta erityisen.
-        title: Lyhyt instanssin kuvaus
-      site_terms:
-        desc_html: Tähän voi kirjoittaa instanssin tietosuojakäytännöstä, käyttöehdoista ja sen sellaisista asioista. HTML-tagit käytössä
-        title: Omavalintaiset käyttöehdot
-      site_title: Instanssin nimi
-      thumbnail:
-        desc_html: Käytetään esikatseluissa OpenGraphin ja API:n kautta. Suosituskoko 1200x630 pikseliä
-        title: Instanssin pikkukuva
-      timeline_preview:
-        desc_html: Näytä julkinen aikajana aloitussivulla
-        title: Aikajanan esikatselu
-      title: Sivuston asetukset
-      trendable_by_default:
-        desc_html: Vaikuttaa hashtageihin, joita ei ole aiemmin poistettu käytöstä
-        title: Salli hashtagit ilman tarkistusta ennakkoon
-      trends:
-        desc_html: Näytä julkisesti aiemmin tarkistetut hashtagit, jotka ovat tällä hetkellä saatavilla
-        title: Trendaavat aihetunnisteet
+      title: Palvelimen asetukset
     site_uploads:
       delete: Poista ladattu tiedosto
       destroyed_msg: Sivuston lataus onnistuneesti poistettu!
     statuses:
+      account: Tekijä
+      application: Sovellus
       back_to_account: Takaisin tilin sivulle
+      back_to_report: Takaisin raporttisivulle
       batch:
-        delete: Poista
-        nsfw_off: NSFW POIS
-        nsfw_on: NSFW PÄÄLLÄ
+        remove_from_report: Poista raportista
+        report: Raportti
       deleted: Poistettu
-      failed_to_execute: Suoritus epäonnistui
+      favourites: Suosikit
+      history: Versiohistoria
+      in_reply_to: Vastaa
+      language: Kieli
       media:
         title: Media
-      no_media: Ei mediaa
+      metadata: Metadata
       no_status_selected: Viestejä ei muutettu, koska yhtään ei ole valittuna
+      open: Avaa viesti
+      original_status: Alkuperäinen viesti
+      reblogs: Edelleen jako
+      status_changed: Viesti muutettu
       title: Tilin tilat
+      trending: Nousussa
+      visibility: Näkyvyys
       with_media: Sisältää mediaa
+    strikes:
+      actions:
+        delete_statuses: "%{name} poisti käyttäjän %{target} viestit"
+        disable: "%{name} jäädytti %{target} tilin"
+        mark_statuses_as_sensitive: "%{name} merkitsi %{target} viestiä arkaluonteiseksi"
+        none: "%{name} lähetti varoituksen henkilölle %{target}"
+        sensitive: "%{name} merkitsi käyttäjän %{target} tilin arkaluonteiseksi"
+        silence: "%{name} rajoitti käyttäjän %{target} tilin"
+        suspend: "%{name} keskeytti käyttäjän %{target} tilin"
+      appeal_approved: Valitti
+      appeal_pending: Valitus vireillä
     system_checks:
       database_schema_check:
         message_html: Tietokannan siirto on vireillä. Suorita ne varmistaaksesi, että sovellus toimii odotetulla tavalla
+      elasticsearch_running_check:
+        message_html: Ei saatu yhteyttä Elasticsearch. Tarkista, että se on käynnissä tai poista kokotekstihaku käytöstä
+      elasticsearch_version_check:
+        message_html: 'Yhteensopimaton Elasticsearch versio: %{value}'
+        version_comparison: Elasticsearch %{running_version} on käynnissä, kun %{required_version} vaaditaan
       rules_check:
         action: Hallinnoi palvelimen sääntöjä
         message_html: Et ole määrittänyt mitään palvelimen sääntöä.
       sidekiq_process_check:
         message_html: Ei ole Sidekiq-prosessia käynnissä jonossa %{value}. Tarkista Sidekiq-asetukset
     tags:
-      accounts_today: Tämän päivän käyttö
-      accounts_week: Tämän viikon käyttö
-      breakdown: Tämän päivän käyttö lähteen mukaan
-      last_active: Aktiivinen viimeksi
-      most_popular: Suosituimmat
-      most_recent: Viimeisimmät
-      name: Aihetunniste
       review: Tarkista tila
-      reviewed: Tarkistetut
-      title: Aihetunnisteet
-      trending_right_now: Trendaa juuri nyt
-      unique_uses_today: "%{count} postausta tänään"
-      unreviewed: Ei tarkistettu
       updated_msg: Hashtagin asetukset päivitetty onnistuneesti
     title: Ylläpito
+    trends:
+      allow: Salli
+      approved: Hyväksytty
+      disallow: Estä
+      links:
+        allow: Salli linkki
+        allow_provider: Salli julkaisija
+        description_html: Nämä ovat linkkejä, joita jaetaan tällä hetkellä paljon tileillä, joilta palvelimesi näkee viestejä. Se voi auttaa käyttäjiäsi saamaan selville, mitä maailmassa tapahtuu. Linkkejä ei näytetä julkisesti, ennen kuin hyväksyt julkaisijan. Voit myös sallia tai hylätä yksittäiset linkit.
+        disallow: Hylkää linkki
+        disallow_provider: Estä julkaisija
+        no_link_selected: Yhtään linkkiä ei muutettu, koska yhtään ei valittu
+        publishers:
+          no_publisher_selected: Julkaisijoita ei muutettu, koska yhtään ei valittu
+        shared_by_over_week:
+          one: Yksi henkilö jakanut viimeisen viikon aikana
+          other: Jakanut %{count} henkilöä viimeisen viikon aikana
+        title: Suositut linkit
+        usage_comparison: Jaettu %{today} kertaa tänään verrattuna eilen %{yesterday}
+      only_allowed: Vain sallittu
+      pending_review: Odottaa tarkistusta
+      preview_card_providers:
+        allowed: Tämän julkaisijan linkit voivat trendata
+        description_html: Nämä ovat verkkotunnuksia, joiden linkkejä jaetaan usein palvelimellasi. Linkit eivät trendaa julkisesti, ellei linkin verkkotunnusta ole hyväksytty. Hyväksyntäsi (tai hylkäys) ulottuu aliverkkotunnuksiin.
+        rejected: Tämän julkaisijan linkit eivät voi trendata
+        title: Julkaisijat
+      rejected: Hylätty
+      statuses:
+        allow: Salli viesti
+        allow_account: Salli tekijä
+        description_html: Nämä ovat viestejä, jotka palvelimesi tietää tällä hetkellä jaetuksi ja suosituksi. Tämä voi auttaa uusia ja palaavia ihmisiä löytämään lisää ihmisiä, joita seurata seurata. Julkaisuja ei näytetä julkisesti ennen kuin hyväksyt tekijän ja kirjoittaja sallii tilinsä ehdottamisen muille. Voit myös sallia tai hylätä yksittäiset viestit.
+        disallow: Estä viesti
+        disallow_account: Estä tekijä
+        no_status_selected: Suosittuja viestejä ei muutettu, koska yhtään ei valittu
+        not_discoverable: Tekijä ei ole ilmoittanut olevansa löydettävissä
+        shared_by:
+          one: Jaettu tai suosikki kerran
+          other: Jaettu ja lisätty suosikkeihin %{friendly_count} kertaa
+        title: Suositut viestit
+      tags:
+        current_score: Nykyinen tulos %{score}
+        dashboard:
+          tag_accounts_measure: uniikit käyttötarkoitukset
+          tag_languages_dimension: Suosituimmat kielet
+          tag_servers_dimension: Suosituimmat palvelimet
+          tag_servers_measure: eri palvelimet
+          tag_uses_measure: käyttökerrat
+        description_html: Nämä ovat hashtageja, jotka näkyvät tällä hetkellä monissa viesteissä, jotka palvelimesi näkee. Tämä voi auttaa käyttäjiäsi selvittämään, mistä ihmiset puhuvat eniten tällä hetkellä. Mitään hashtageja ei näytetä julkisesti ennen kuin hyväksyt ne.
+        listable: Voidaan ehdottaa
+        no_tag_selected: Yhtään tagia ei muutettu, koska yhtään ei valittu
+        not_listable: Ei tulla ehdottamaan
+        not_trendable: Ei näy trendien alla
+        not_usable: Ei voida käyttää
+        peaked_on_and_decaying: Saavutti huipun %{date}, nyt hiipuu
+        title: Suositut tunnisteet
+        trendable: Voi näkyä trendien alla
+        trending_rank: 'Nousussa #%{rank}'
+        usable: Voidaan käyttää
+        usage_comparison: Käytetty %{today} kertaa tänään, verrattuna %{yesterday} eiliseen
+        used_by_over_week:
+          one: Yhden henkilön käyttämä viime viikon aikana
+          other: Käyttänyt %{count} henkilöä viimeisen viikon aikana
+      title: Trendit
+      trending: Nousussa
     warning_presets:
       add_new: Lisää uusi
       delete: Poista
       edit_preset: Muokkaa varoituksen esiasetusta
       empty: Et ole vielä määrittänyt yhtään varoitusesiasetusta.
       title: Hallinnoi varoitusesiasetuksia
+    webhooks:
+      add_new: Lisää päätepiste
+      delete: Poista
+      description_html: A <strong>webhook</strong> mahdollistaa Mastodonin työntää <strong>reaaliaikaisia ilmoituksia</strong> valituista tapahtumista omaan sovellukseesi, joten sovelluksesi voi <strong>laukaista automaattisesti reaktioita</strong>.
+      disable: Poista käytöstä
+      disabled: Ei käytössä
+      edit: Muokkaa päätepistettä
+      empty: Sinulla ei ole vielä määritetty webhook-päätepisteitä.
+      enable: Ota käyttöön
+      enabled: Aktiivinen
+      enabled_events:
+        one: 1 aktivoitu tapahtuma
+        other: "%{count} aktivoitua tapahtumaa"
+      events: Tapahtumat
+      new: Uusi webhook
+      rotate_secret: Vaihda salaus
+      secret: Salainen tunnus
+      status: Tila
+      title: Webhookit
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: poistaa heidän viestit
+        disable: jäädyttää heidän tilinsä
+        mark_statuses_as_sensitive: merkitä heidän viestinsä arkaluonteisiksi
+        none: varoitus
+        sensitive: merkitä heidän tilinsä arkaluonteiseksi
+        silence: rajoittaa heidän tilinsä
+        suspend: keskeyttää heidän tilinsä
+      body: "%{target} on valittanut valvojan päätöksestä %{action_taken_by} aika %{date}, joka oli %{type}. He kirjoittivat:"
+      next_steps: Voit hyväksyä vetoomuksen ja kumota päätöksen tai jättää sen huomiotta.
+      subject: "%{username} valittaa valvojan päätöksestä, joka koskee instanssia %{instance}"
     new_pending_account:
       body: Uuden tilin tiedot ovat alla. Voit hyväksyä tai hylätä tämän hakemuksen.
-      subject: Uusi tili tarkastettavana %{instance} (%{username})
+      subject: Uusi tili tarkastettavana instanssissa %{instance} (%{username})
     new_report:
       body: "%{reporter} on raportoinut kohteen %{target}"
       body_remote: Joku osoitteesta %{domain} on raportoinut kohteen %{target}
       subject: Uusi raportti instanssista %{instance} (nro %{id})
-    new_trending_tag:
-      body: 'Aihetunniste #%{name} on nousussa tänään, mutta sitä ei ole aiemmin tarkistettu. Sitä ei näytetä julkisesti, ellet salli sitä. Siitä ei ilmoiteta uudelleen, jos pelkästään tallennat lomakkeen sellaisenaan.'
-      subject: Uusi aihetunniste tarkistettavaksi %{instance} (#%{name})
+    new_trends:
+      body: 'Seuraavat kohteet on tarkistettava ennen kuin ne voidaan näyttää julkisesti:'
+      new_trending_links:
+        title: Suositut linkit
+      new_trending_statuses:
+        title: Suositut viestit
+      new_trending_tags:
+        no_approved_tags: Tällä hetkellä ei ole hyväksyttyjä trendikkäitä hashtageja.
+        requirements: 'Mikä tahansa näistä ehdokkaista voisi ylittää #%{rank} hyväksytyn trendikkään hashtagin, joka on tällä hetkellä #%{lowest_tag_name} arvosanalla %{lowest_tag_score}.'
+        title: Suositut hashtagit
+      subject: Uusia trendejä tarkistettavaksi instanssissa %{instance}
   aliases:
     add_new: Luo alias
     created_msg: Uusi alias luotiin onnistuneesti. Voit nyt aloittaa siirron vanhasta tilistä.
@@ -710,11 +912,11 @@ fi:
     hint_html: Jos haluat siirtyä toisesta tilistä tähän tiliin, voit luoda aliasin, joka on pakollinen, ennen kuin voit siirtää seuraajia vanhasta tilistä tähän tiliin. Tämä toiminto on itsessään <strong>vaaraton ja palautuva</strong>. <strong>Tilin siirtyminen aloitetaan vanhalta tililtä</strong>.
     remove: Poista aliaksen linkitys
   appearance:
-    advanced_web_interface: Edistynyt web-käyttöliittymä
+    advanced_web_interface: Edistynyt selainkäyttöliittymä
     advanced_web_interface_hint: 'Jos haluat käyttää koko näytön leveyttä, edistyneen web-käyttöliittymän avulla voit määrittää useita eri sarakkeita näyttämään niin paljon tietoa samanaikaisesti kuin haluat: Koti, ilmoitukset, yhdistetty aikajana, mikä tahansa määrä luetteloita ja aihetunnisteita.'
     animations_and_accessibility: Animaatiot ja saavutettavuus
     confirmation_dialogs: Vahvistusvalinnat
-    discovery: Löytö
+    discovery: Löydöt
     localization:
       body: Mastodonin ovat kääntäneet vapaaehtoiset.
       guide_link: https://crowdin.com/project/mastodon
@@ -731,16 +933,13 @@ fi:
   applications:
     created: Sovelluksen luonti onnistui
     destroyed: Sovelluksen poisto onnistui
-    invalid_url: Annettu URL on virheellinen
     regenerate_token: Luo pääsytunnus uudelleen
     token_regenerated: Pääsytunnuksen uudelleenluonti onnistui
     warning: Säilytä tietoa hyvin. Älä milloinkaan jaa sitä muille!
     your_token: Pääsytunnus
   auth:
-    apply_for_account: Pyydä kutsu
+    apply_for_account: Pyydä tiliä
     change_password: Salasana
-    checkbox_agreement_html: Hyväksyn <a href="%{rules_path}" target="_blank">palvelinsäännöt</a> ja <a href="%{terms_path}" target="_blank">käyttöehdot</a>
-    checkbox_agreement_without_rules_html: Hyväksyn <a href="%{terms_path}" target="_blank">käyttöehdot</a>
     delete_account: Poista tili
     delete_account_html: Jos haluat poistaa tilisi, <a href="%{path}">paina tästä</a>. Poisto on vahvistettava.
     description:
@@ -753,11 +952,13 @@ fi:
     invalid_reset_password_token: Salasananpalautustunnus on virheellinen tai vanhentunut. Pyydä uusi.
     link_to_otp: Syötä puhelimesi kaksivaiheinen koodi tai palautuskoodi
     link_to_webauth: Käytä suojausavaintasi
+    log_in_with: Kirjaudu käyttäen
     login: Kirjaudu sisään
     logout: Kirjaudu ulos
     migrate_account: Muuta toiseen tiliin
     migrate_account_html: Jos haluat ohjata tämän tilin toiseen tiliin, voit <a href="%{path}">asettaa toisen tilin tästä</a>.
     or_log_in_with: Tai käytä kirjautumiseen
+    privacy_policy_agreement_html: Olen lukenut ja hyväksynyt <a href="%{privacy_policy_path}" target="_blank">tietosuojakäytännön</a>
     providers:
       cas: CAS
       saml: SAML
@@ -765,20 +966,29 @@ fi:
     registration_closed: "%{instance} ei hyväksy uusia jäseniä"
     resend_confirmation: Lähetä vahvistusohjeet uudestaan
     reset_password: Palauta salasana
+    rules:
+      preamble: "%{domain} valvojat määrittävät ja valvovat sääntöjä."
+      title: Joitakin perussääntöjä.
     security: Tunnukset
     set_new_password: Aseta uusi salasana
     setup:
       email_below_hint_html: Jos alla oleva sähköpostiosoite on virheellinen, voit muuttaa sitä täällä ja tilata uuden vahvistussähköpostiviestin.
       email_settings_hint_html: Vahvistussähköposti lähetettiin osoitteeseen %{email}. Jos sähköpostiosoite ei ole oikea, voit muuttaa sitä tiliasetuksissa.
       title: Asetukset
+    sign_in:
+      preamble_html: Kirjaudu <strong>%{domain}</strong>-tunnuksillasi. Jos tilisi sijaitsee eri palvelimella, et voi kirjautua täällä.
+      title: Kirjaudu palveluun %{domain}
+    sign_up:
+      preamble: Kun sinulla on tili tällä Mastodon-palvelimella, voit seurata kaikkia muita verkossa olevia henkilöitä riippumatta siitä, missä heidän tilinsä on.
+      title: Otetaan sinulle käyttöön %{domain}.
     status:
       account_status: Tilin tila
       confirming: Odotetaan sähköpostivahvistuksen valmistumista.
       functional: Tilisi on täysin toimiva.
       pending: Hakemuksesi odottaa henkilökuntamme tarkastusta. Tämä voi kestää jonkin aikaa. Saat sähköpostiviestin, jos hakemuksesi on hyväksytty.
       redirecting_to: Tilisi ei ole aktiivinen, koska se ohjaa tällä hetkellä kohteeseen %{acct}.
+      view_strikes: Näytä tiliäsi koskevia aiempia varoituksia
     too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
-    trouble_logging_in: Ongelmia kirjautumisessa?
     use_security_key: Käytä suojausavainta
   authorize_follow:
     already_following: Sinä seuraat jo tätä tiliä
@@ -836,10 +1046,36 @@ fi:
       more_details_html: Lisätietoja saat <a href="%{terms_path}">tietosuojakäytännöstämme</a>.
       username_available: Käyttäjänimesi tulee saataville uudestaan
       username_unavailable: Käyttäjänimesi ei tule saataville enää uudestaan
-  directories:
-    directory: Profiilihakemisto
-    explanation: Löydä käyttäjiä heidän kiinnostustensa mukaan
-    explore_mastodon: Tutki %{title}ia
+  disputes:
+    strikes:
+      action_taken: Toteutetut toimet
+      appeal: Vetoomus
+      appeal_approved: Tähän valitukseen on haettu muutosta, eikä se ole enää voimassa
+      appeal_rejected: Valitus on hylätty
+      appeal_submitted_at: Valitus lähetetty
+      appealed_msg: Valituksesi on lähetetty. Jos se hyväksytään, sinulle ilmoitetaan.
+      appeals:
+        submit: Lähetä valitus
+      approve_appeal: Hyväksy valitus
+      associated_report: Liittyvä raportti
+      created_at: Päivätty
+      description_html: Nämä ovat tiliäsi koskevia toimia ja varoituksia, jotka instanssin %{instance} henkilökunta on lähettänyt sinulle.
+      recipient: Osoitettu
+      reject_appeal: Hylkää valitus
+      status: 'Viesti #%{id}'
+      status_removed: Viesti on jo poistettu järjestelmästä
+      title: "%{action} alkaen %{date}"
+      title_actions:
+        delete_statuses: Viestin poisto
+        disable: Tilin jäädyttäminen
+        mark_statuses_as_sensitive: Viestien merkitseminen arkaluonteisiksi
+        none: Varoitus
+        sensitive: Tilin merkitseminen arkaluonteiseksi
+        silence: Tilin rajoittaminen
+        suspend: Tilin keskeyttäminen
+      your_appeal_approved: Valituksesi on hyväksytty
+      your_appeal_pending: Olet lähettänyt valituksen
+      your_appeal_rejected: Valituksesi on hylätty
   domain_validator:
     invalid_domain: ei ole kelvollinen toimialueen nimi
   errors:
@@ -856,7 +1092,7 @@ fi:
       content: Valitettavasti jokin meni pieleen meidän päässämme.
       title: Sivu ei ole oikein
     '503': Sivua ei voitu näyttää palvelimen väliaikaisen vian vuoksi.
-    noscript_html: Mastodon-selainsovelluksen käyttöön vaaditaan JavaScript. Voit vaihtoehtoisesti kokeilla jotakin omalle käyttöjärjestelmällesi tehtyä Mastodon<a href="%{apps_path}">sovellusta</a>.
+    noscript_html: Käyttääksesi Mastodon-verkkopalvelua, ota JavaScript käyttöön. Vaihtoehtoisesti voit kokeilla myös jotakin juuri käyttämällesi alustalle kehitettyä Mastodon-<a href="%{apps_path}">sovellusta</a>.
   existing_username_validator:
     not_found: paikallista käyttäjää ei löydy kyseisellä käyttäjänimellä
     not_found_multiple: "%{usernames} ei löytynyt"
@@ -888,56 +1124,69 @@ fi:
       public: Julkiset aikajanat
       thread: Keskustelut
     edit:
+      add_keyword: Lisää avainsana
+      keywords: Avainsanat
+      statuses: Yksittäiset postaukset
+      statuses_hint_html: Tämä suodatin koskee yksittäisten postausten valintaa riippumatta siitä, vastaavatko ne alla olevia avainsanoja. <a href="%{path}">Tarkista tai poista viestit suodattimesta</a>.
       title: Muokkaa suodatinta
     errors:
+      deprecated_api_multiple_keywords: Näitä parametreja ei voi muuttaa tästä sovelluksesta, koska ne koskevat useampaa kuin yhtä suodattimen avainsanaa. Käytä uudempaa sovellusta tai web-käyttöliittymää.
       invalid_context: Ei sisältöä tai se on virheellinen
-      invalid_irreversible: Sen sijaan suodatus toimii vain kodin tai ilmoitusten yhteydessä
     index:
+      contexts: Suodattimet %{contexts}
       delete: Poista
       empty: Sinulla ei ole suodattimia.
+      expires_in: Vanhenee %{distance}
+      expires_on: Vanhenee %{date}
+      keywords:
+        one: "%{count} avainsana"
+        other: "%{count} avainsanaa"
+      statuses:
+        one: "%{count} viesti"
+        other: "%{count} viestiä"
+      statuses_long:
+        one: "%{count} yksittäinen viesti piilotettu"
+        other: "%{count} yksittäistä viestiä piilotettu"
       title: Suodattimet
     new:
+      save: Tallenna uusi suodatin
       title: Lisää uusi suodatin
+    statuses:
+      back_to_filter: Takaisin suodattimeen
+      batch:
+        remove: Poista suodattimista
+      index:
+        hint: Tämä suodatin koskee yksittäisten viestien valintaa muista kriteereistä riippumatta. Voit lisätä lisää viestejä tähän suodattimeen web-käyttöliittymästä.
+        title: Suodatetut viestit
   footer:
-    developers: Kehittäjille
-    more: Lisää…
-    resources: Resurssit
     trending_now: Suosittua nyt
   generic:
     all: Kaikki
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> kohde tällä sivulla on valittu."
+      other: Kaikki <strong>%{count}</strong> kohdetta tällä sivulla on valittu.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> tuotetta, joka vastaa hakuasi."
+      other: Kaikki <strong>%{count}</strong> kohdetta, jotka vastaavat hakuasi.
     changes_saved_msg: Muutosten tallennus onnistui!
     copy: Kopioi
     delete: Poista
-    no_batch_actions_available: Tällä sivulla ei ole erätoimintoja
+    deselect: Poista kaikki valinnat
+    none: Ei mitään
     order_by: Järjestä
     save_changes: Tallenna muutokset
+    select_all_matching_items:
+      one: Valitse %{count} kohdetta, joka vastaa hakuasi.
+      other: Valitse kaikki %{count} kohdetta, jotka vastaavat hakuasi.
+    today: tänään
     validation_errors:
       one: Kaikki ei ole aivan oikein! Tarkasta alla oleva virhe
       other: Kaikki ei ole aivan oikein! Tarkasta alla olevat %{count} virhettä
   html_validator:
     invalid_markup: 'sisältää virheellisen HTML-merkinnän: %{error}'
-  identity_proofs:
-    active: Aktiivinen
-    authorize: Kyllä, valtuuta
-    authorize_connection_prompt: Sallitaanko tämä salausyhteys?
-    errors:
-      failed: Salausyhteys epäonnistui. Yritä uudelleen %{provider}.
-      keybase:
-        invalid_token: Keybase-tunnukset ovat allekirjoituksia ja niiden on oltava 66 hex-merkkiä
-        verification_failed: Keybase ei tunnista tätä tunnusta Keybase käyttäjän %{kb_username} allekirjoituksena. Yritä uudelleen Keybasesta.
-      wrong_user: Todistusta käyttäjälle %{proving} ei voida luoda kirjautuessa %{current}. Kirjaudu sisään käyttäjänä %{proving} ja yritä uudelleen.
-    explanation_html: Täällä voit salata muita identiteettejäsi muista alustoista, kuten Keybase. Näin muut ihmiset voivat lähettää sinulle salattuja viestejä kyseisillä alustoilla ja he voivat luottaa siihen, että lähettämäsi sisältö tulee sinulta.
-    i_am_html: Olen %{username} %{service}.
-    identity: Identiteetti
-    inactive: Passiivinen
-    publicize_checkbox: 'Ja toot tämä:'
-    publicize_toot: 'Se on todistettu! Olen %{username} %{service}: %{url}'
-    remove: Poista todiste tililtä
-    removed: Todisteen poistaminen tililtä onnistui
-    status: Vahvistuksen tila
-    view_proof: Näytä todiste
   imports:
     errors:
+      invalid_csv_file: 'Epäkelpo CSV-tiedosto. Virhe: %{error}'
       over_rows_processing_limit: sisältää yli %{count} riviä
     modes:
       merge: Yhdistä
@@ -953,7 +1202,6 @@ fi:
       following: Seurattujen lista
       muting: Mykistettyjen lista
     upload: Lähetä
-  in_memoriam_html: Muistoissamme.
   invites:
     delete: Poista käytöstä
     expired: Vanhentunut
@@ -1020,20 +1268,26 @@ fi:
     warning:
       backreference_required: Uusi tili on ensin määritettävä viittaamaan tähän tiliin
       before: 'Ennen jatkamista, lue nämä huomautukset huolellisesti:'
+      cooldown: Muuton jälkeen on odotusaika, jonka aikana et pysty enää liikkumaan
+      disabled_account: Nykyinen tilisi ei ole täysin käytettävissä jälkikäteen. Sinulla on kuitenkin pääsy tietojen vientiin ja uudelleenaktivointiin.
+      followers: Tämä toiminto siirtää kaikki seuraajat nykyisestä tilistä uudelle tilille
+      only_redirect_html: Vaihtoehtoisesti voit <a href="%{path}">asettaa vain uudelleenohjauksen profiiliisi</a>.
+      other_data: Muita tietoja ei siirretä automaattisesti
+      redirect: Nykyinen tilisi profiili päivitetään, ohjataan uudelleen ja jätetään pois hausta
   moderation:
     title: Moderointi
+  move_handler:
+    carry_blocks_over_text: Tämä käyttäjä siirtyi paikasta %{acct}, jonka olit estänyt.
+    carry_mutes_over_text: Tämä käyttäjä siirtyi paikasta %{acct}, jonka mykistit.
+    copy_account_note_text: 'Tämä käyttäjä siirtyi paikasta %{acct}, tässä olivat aiemmat muistiinpanosi niistä:'
+  navigation:
+    toggle_menu: Avaa/sulje valikko
   notification_mailer:
-    digest:
-      action: Näytä kaikki ilmoitukset
-      body: Tässä lyhyt yhteenveto viime käyntisi (%{since}) jälkeen tulleista viesteistä
-      mention: "%{name} mainitsi sinut:"
-      new_followers_summary:
-        one: Olet myös saanut yhden uuden seuraajan! Juhuu!
-        other: Olet myös saanut %{count} uutta seuraajaa! Aivan mahtavaa!
-      subject:
-        one: "1 uusi ilmoitus viime käyntisi jälkeen \U0001F418"
-        other: "%{count} uutta ilmoitusta viime käyntisi jälkeen \U0001F418"
-      title: Poissaollessasi…
+    admin:
+      report:
+        subject: "%{name} lähetti raportin"
+      sign_up:
+        subject: "%{name} kirjautunut"
     favourite:
       body: "%{name} tykkäsi tilastasi:"
       subject: "%{name} tykkäsi tilastasi"
@@ -1052,81 +1306,138 @@ fi:
       body: "%{name} mainitsi sinut:"
       subject: "%{name} mainitsi sinut"
       title: Uusi maininta
+    poll:
+      subject: Äänestys käyttäjältä %{name} on päättynyt
     reblog:
       body: "%{name} buustasi tilaasi:"
       subject: "%{name} boostasi tilaasi"
       title: Uusi buustaus
+    status:
+      subject: "%{name} julkaisi juuri"
+    update:
+      subject: "%{name} muokkasi viestiä"
+  notifications:
+    email_events: Sähköposti-ilmoitusten tapahtumat
+    email_events_hint: 'Valitse tapahtumat, joista haluat saada ilmoituksia:'
+    other_settings: Muut ilmoitusasetukset
   number:
     human:
       decimal_units:
         format: "%n %u"
         units:
           billion: Mrd
+          million: M
           quadrillion: Brd
           thousand: k
           trillion: B
+  otp_authentication:
+    code_hint: Anna todennussovelluksen luoma koodi vahvistaaksesi
+    description_html: Jos otat käyttöön <strong>kaksivaiheisen todentamisen</strong>, käyttämällä todennussovellusta, kirjautumiseen vaaditaan puhelin, jolla voidaan luoda kirjautumistunnuksia.
+    enable: Ota käyttöön
+    instructions_html: "<strong>Lue tämä QR-koodi puhelimen Google Authenticator- tai vastaavalla TOTP-sovelluksella</strong>. Sen jälkeen sovellus luo tunnuksia, joita tarvitset kun kirjaudut sisään."
+    manual_instructions: 'Jos et voi lukea QR-koodia ja haluat syöttää sen käsin, tässä on salainen koodi tekstinä:'
+    setup: Asetusten määritys
+    wrong_code: Annettu koodi oli virheellinen! Ovatko palvelimen aika ja laitteen aika oikein?
   pagination:
     newer: Uudemmat
     next: Seuraava
     older: Vanhemmat
     prev: Edellinen
+    truncate: "&hellip;"
   polls:
     errors:
+      already_voted: Olet jo äänestänyt tässä äänestyksessä
+      duplicate_options: sisältää kaksoiskappaleita
       duration_too_long: on liian kaukana tulevaisuudessa
       duration_too_short: on liian aikainen
       expired: Äänestys on jo loppunut
+      invalid_choice: Valittua äänestysvaihtoehtoa ei ole
+      over_character_limit: voi olla enintään %{max} merkkiä
+      too_few_options: on oltava useampi kuin yksi
+      too_many_options: ei voi sisältää enempää kuin %{max} kohdetta
   preferences:
     other: Muut
+    posting_defaults: Julkaisujen oletusasetukset
     public_timelines: Julkiset aikajanat
+  privacy_policy:
+    title: Tietosuojakäytäntö
   reactions:
     errors:
+      limit_reached: Erilaisten reaktioiden raja saavutettu
       unrecognized_emoji: ei ole tunnistettu emoji
   relationships:
-    activity: Tilin tapahtumat
+    activity: Tilin aktiivisuus
+    dormant: Horroksessa
+    follow_selected_followers: Seuraa valittuja seuraajia
     followers: Seuraajat
     following: Seuratut
-    invited: Kutsuttu
+    invited: Kutsutut
+    last_active: Viimeksi aktiivinen
+    most_recent: Viimeisin
+    moved: Muuttanut
+    mutual: Molemmat
+    primary: Ensisijainen
+    relationship: Suhde
+    remove_selected_domains: Poista kaikki seuraajat valituista verkkotunnuksista
+    remove_selected_followers: Poista valitut seuraajat
+    remove_selected_follows: Lopeta valittujen käyttäjien seuraaminen
+    status: Tilin tila
   remote_follow:
-    acct: Syötä se käyttäjätunnus@verkkotunnus, josta haluat seurata
     missing_resource: Vaadittavaa uudelleenohjaus-URL:ää tiliisi ei löytynyt
-    proceed: Siirry seuraamaan
-    prompt: 'Olet aikeissa seurata:'
+  reports:
+    errors:
+      invalid_rules: ei viittaa voimassa oleviin sääntöihin
+  rss:
+    content_warning: 'Sisällön varoitus:'
+    descriptions:
+      account: Julkiset viestit lähettäjältä @%{acct}
+      tag: 'Julkiset viestit merkitty #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Olet ylittänyt %{limit} ajoitetun viestin rajan tälle päivälle
+    over_total_limit: Olet ylittänyt %{limit} ajoitetun viestin rajan
+    too_soon: Ajoitetun päivämäärän on oltava tulevaisuudessa
   sessions:
     activity: Viimeisin toiminta
     browser: Selain
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
+      firefox: Firefox
       generic: Tuntematon selain
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
       nokia: Nokia S40 Ovi -selain
+      opera: Opera
+      otter: Otter
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Nykyinen istunto
-    description: "%{browser}, %{platform}"
+    description: "%{browser} alustalla %{platform}"
     explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneet Mastodon-tilillesi.
     ip: IP-osoite
     platforms:
-      adobe_air: Adobe Air
+      adobe_air: Adobe AIR
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
       mac: macOS
-      other: tuntematon järjestelmä
+      other: tuntematon alusta
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
     revoke: Hylkää
     revoke_success: Istunnon hylkäys onnistui
     title: Istunnot
+    view_authentication_history: Näytä tilisi todennushistoria
   settings:
     account: Tili
     account_settings: Tilin asetukset
@@ -1146,24 +1457,37 @@ fi:
     preferences: Ominaisuudet
     profile: Profiili
     relationships: Seurattavat ja seuraajat
+    statuses_cleanup: Automaattinen viestin poisto
+    strikes: Valvojan varoitukset
     two_factor_authentication: Kaksivaiheinen todentaminen
+    webauthn_authentication: Suojausavaimet
   statuses:
     attached:
+      audio:
+        one: "%{count} ääni"
+        other: "%{count} ääntä"
       description: 'Liitetty: %{attached}'
       image:
         one: "%{count} kuva"
         other: "%{count} kuvaa"
+      video:
+        one: "%{count} video"
+        other: "%{count} videota"
+    boosted_from_html: Tehostettu %{acct_link}
     content_warning: 'Sisältövaroitus: %{warning}'
+    default_language: Sama kuin käyttöliittymän kieli
     disallowed_hashtags:
       one: 'sisälsi aihetunnisteen jota ei sallita: %{tags}'
       other: 'sisälsi aihetunnisteet joita ei sallita: %{tags}'
-    language_detection: Tunnista kieli automaattisesti
+    edited_at_html: Muokattu %{date}
+    errors:
+      in_reply_not_found: Viesti, johon yrität vastata, ei näytä olevan olemassa.
     open_in_web: Avaa selaimessa
     over_character_limit: merkkimäärän rajoitus %{max} ylitetty
     pin_errors:
+      direct: Viestejä, jotka ovat näkyvissä vain mainituille käyttäjille, ei voi kiinnittää
       limit: Olet jo kiinnittänyt suurimman mahdollisen määrän tuuttauksia
       ownership: Muiden tuuttauksia ei voi kiinnittää
-      private: Piilotettua tuuttausta ei voi kiinnittää
       reblog: Buustausta ei voi kiinnittää
     poll:
       total_people:
@@ -1191,18 +1515,20 @@ fi:
     enabled: Poista vanhat viestit automaattisesti
     enabled_hint: Poistaa viestit automaattisesti, kun ne saavuttavat tietyn ikärajan, elleivät ne täsmää yhtä alla olevista poikkeuksista
     exceptions: Poikkeukset
-    explanation: Koska viestien poistaminen on kallista toimintaa. Tämä tehdään hitaasti ajan mittaan, kun palvelin ei ole muuten kiireinen. Tästä syystä viestejäsi voidaan poistaa jonkin aikaa myöhemmin, kun ne ovat saavuttaneet ikärajan.
+    explanation: Koska viestien poistaminen on kallista toimintaa, sitä tehdään hitaasti ajan mittaan, kun palvelin ei ole muutoin kiireinen. Viestejäsi voidaankin siis poistaa myös viiveellä verrattuna niille määrittämääsi aikarajaan.
     ignore_favs: Ohita suosikit
     ignore_reblogs: Ohita tehostukset
     interaction_exceptions: Poikkeukset, jotka perustuvat vuorovaikutukseen
-    keep_direct: Säilytä suorat viestit
+    interaction_exceptions_explanation: Huomaa, että ei ole takeita viestien poistamiselle, jos ne alittavat suosikki- tai tehostusrajan sen jälkeen, kun ne on kerran ylitetty.
+    keep_direct: Säilytä yksityisviestit
+    keep_direct_hint: Ei poista mitään sinun suoria viestejä
     keep_media: Säilytä viestit, joissa on liitetiedostoja
     keep_media_hint: Ei poista viestejä, joissa on liitteitä
     keep_pinned: Pidä kiinnitettyt viestit
     keep_pinned_hint: Ei poista mitään kiinnitettyä viestiä
     keep_polls: Säilytä äänestykset
     keep_polls_hint: Ei poista yhtäkään äänestystä
-    keep_self_bookmark: Säilytä lisäämäsi viestit kirjanmerkkeihin
+    keep_self_bookmark: Säilytä kirjanmerkkeihin lisäämäsi viestit
     keep_self_bookmark_hint: Ei poista viestejäsi, jos olet lisännyt ne kirjanmerkkeihin
     keep_self_fav: Säilyttää viestit suosikeissa
     keep_self_fav_hint: Ei poista omia viestejäsi, jos olet lisännyt ne suosikkeihin
@@ -1210,67 +1536,119 @@ fi:
       '1209600': 2 viikkoa
       '15778476': 6 kuukautta
       '2629746': 1 kuukausi
-      '31556952': 1 year
-      '5259492': 2 months
-      '63113904': 2 years
-      '7889238': 3 months
+      '31556952': 1 vuosi
+      '5259492': 2 kuukautta
+      '604800': 1 viikko
+      '63113904': 2 vuotta
+      '7889238': 3 kuukautta
+    min_age_label: Ikäraja
+    min_favs: Pidä viestit suosikeissa vähintään
+    min_favs_hint: Ei poista yhtään julkaisuasi, jotka ovat saaneet vähintään tämän määrän tykkäyksiä. Jätä tyhjäksi, jos haluat poistaa julkaisuja tykkäyksien määrästä riippumatta
+    min_reblogs: Pidä viestit tehostettuna vähintään
+    min_reblogs_hint: Ei poista yhtään viestiäsi, jota on tehostettu vähintään näin monta kertaa. Jätä tyhjäksi poistaaksesi viestejä riippumatta niiden tehosteiden määrästä
   stream_entries:
     pinned: Kiinnitetty tuuttaus
     reblogged: buustasi
     sensitive_content: Arkaluontoista sisältöä
-  terms:
-    title: "%{instance}, käyttöehdot ja tietosuojakäytäntö"
+  strikes:
+    errors:
+      too_late: On liian myöhäistä vedota tähän varoitukseen
+  tags:
+    does_not_match_previous_name: ei vastaa edellistä nimeä
   themes:
-    default: Mastodon
+    contrast: Mastodon (Korkea kontrasti)
+    default: Mastodon (Tumma)
+    mastodon-light: Mastodon (Vaalea)
   time:
     formats:
       default: "%d.%m.%Y klo %H.%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
+    add: Lisää
     disable: Poista käytöstä
+    disabled_success: Kaksivaiheinen todennus on poistettu käytöstä
+    edit: Muokkaa
     enabled: Kaksivaiheinen todentaminen käytössä
     enabled_success: Kaksivaiheisen todentamisen käyttöönotto onnistui
     generate_recovery_codes: Luo palautuskoodit
     lost_recovery_codes: Palautuskoodien avulla voit käyttää tiliä, jos menetät puhelimesi. Jos olet hukannut palautuskoodit, voit luoda uudet tästä. Vanhat palautuskoodit poistetaan käytöstä.
+    methods: Kaksivaiheisen tunnistautumisen menetelmät
+    otp: Todennussovellus
     recovery_codes: Varapalautuskoodit
     recovery_codes_regenerated: Uusien palautuskoodien luonti onnistui
     recovery_instructions_html: Jos menetät puhelimesi, voit kirjautua tilillesi jollakin alla olevista palautuskoodeista. <strong>Pidä palautuskoodit hyvässä tallessa</strong>. Voit esimerkiksi tulostaa ne ja säilyttää muiden tärkeiden papereiden joukossa.
+    webauthn: Suojausavaimet
   user_mailer:
+    appeal_approved:
+      action: Siirry tilillesi
+      explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
+      subject: Valituksesi %{date} on hyväksytty
+      title: Valitus hyväksytty
+    appeal_rejected:
+      explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hylätty.
+      subject: Valituksesi %{date} on hylätty
+      title: Valitus hylätty
     backup_ready:
       explanation: Pyysit täydellistä varmuuskopiota Mastodon-tilistäsi. Voit nyt ladata sen!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
+    suspicious_sign_in:
+      change_password: vaihda salasanasi
+      details: 'Tässä on tiedot kirjautumisesta:'
+      explanation: Olemme havainneet kirjautumisen tilillesi uudesta IP-osoitteesta.
+      further_actions_html: Jos et ollut sinä, suosittelemme, että %{action} teet välittömästi ja otat kaksivaiheisen todennuksen käyttöön tilisi turvallisuuden varmistamiseksi.
+      subject: Tiliäsi on käytetty uudesta IP-osoitteesta
+      title: Uusi kirjautuminen
     warning:
+      appeal: Lähetä valitus
+      appeal_description: Jos uskot, että tämä on virhe, voit hakea muutosta instanssin %{instance} henkilökunnalta.
+      categories:
+        spam: Roskaposti
+        violation: Sisältö rikkoo seuraavia yhteisön sääntöjä
+      explanation:
+        delete_statuses: Joitakin viesteistäsi on havaittu rikkovan yhtä tai useampaa yhteisön sääntöä ja instanssin %{instance} valvojat ovat poistaneet ne.
+        disable: Et voi enää käyttää tiliäsi, mutta profiilisi ja muut tiedot pysyvät muuttumattomina. Voit pyytää varmuuskopiota tiedoistasi, vaihtaa tilin asetuksia tai poistaa tilisi.
+        mark_statuses_as_sensitive: Instanssin %{instance} valvojat ovat merkinneet osan julkaisuistasi arkaluonteisiksi. Tämä tarkoittaa sitä, että ihmisten täytyy napauttaa viestiä ennen kuin esikatselu näytetään. Voit merkitä median itse arkaluonteiseksi kun julkaiset tulevaisuudessa.
+        sensitive: Tästä lähtien kaikki ladatut mediatiedostot merkitään arkaluonteisiksi ja piilotetaan napsautusvaroituksen taakse.
+        silence: Voit edelleen käyttää tiliäsi, mutta vain sinua jo seuraavat ihmiset näkevät viestisi tällä palvelimella ja sinut voidaan sulkea pois erilaisista hakuominaisuuksista. Toiset voivat kuitenkin edelleen seurata sinua manuaalisesti.
+        suspend: Et voi enää käyttää tiliäsi ja profiilisi ja muut tiedot eivät ole enää käytettävissä. Voit silti kirjautua sisään pyytääksesi varmuuskopiota tiedoistasi, kunnes tiedot on poistettu kokonaan noin 30 päivän kuluttua. Säilytämme joitakin perustietoja, jotka estävät sinua kiertämästä keskeyttämistä.
+      reason: 'Syy:'
+      statuses: 'Viestejä lainattu:'
+      subject:
+        delete_statuses: Viestisi %{acct} on poistettu
+        disable: Tilisi %{acct} on jäädytetty
+        mark_statuses_as_sensitive: Viestisi %{acct} on merkitty arkaluonteisiksi
+        none: Varoitus %{acct}
+        sensitive: Sinun viestisi %{acct} merkitään arkaluonteisiksi tästä lähtien
+        silence: Tilisi %{acct} on rajoitettu
+        suspend: Tilisi %{acct} on keskeytetty
       title:
+        delete_statuses: Viestit poistettu
+        disable: Tili jäädytetty
+        mark_statuses_as_sensitive: Viestit on merkitty arkaluonteisiksi
+        none: Varoitus
+        sensitive: Tili on merkitty arkaluonteiseksi
         silence: Rajoitettu tili
         suspend: Tilin käyttäminen keskeytetty
     welcome:
       edit_profile_action: Aseta profiili
-      edit_profile_step: Voit mukauttaa profiiliasi lataamalla profiilikuvan ja otsakekuvan, muuttamalla näyttönimeäsi ym. Jos haluat hyväksyä uudet seuraajat ennen kuin he voivat seurata sinua, voit lukita tilisi.
+      edit_profile_step: Voit muokata profiiliasi lataamalla profiilikuvan, vaihtamalla näyttönimeä ja paljon muuta. Voit halutessasi arvioida uudet seuraajat ennen kuin he saavat seurata sinua.
       explanation: Näillä vinkeillä pääset alkuun
       final_action: Ala julkaista
-      final_step: 'Ala julkaista! Vaikkei sinulla olisi seuraajia, monet voivat nähdä julkiset viestisi esimerkiksi paikallisella aikajanalla ja hashtagien avulla. Kannattaa esittäytyä! Käytä hashtagia #introductions. (Jos haluat esittäytyä myös suomeksi, se kannattaa tehdä erillisessä tuuttauksessa ja käyttää hashtagia #esittely.).'
+      final_step: 'Ala julkaista! Vaikkei sinulla olisi seuraajia, monet voivat nähdä julkiset viestisi esimerkiksi paikallisella aikajanalla ja hashtageilla. Kannattaa myös esittäytyä! Käytä hashtagia #esittely.'
       full_handle: Koko käyttäjätunnuksesi
       full_handle_hint: Kerro tämä ystävillesi, niin he voivat lähettää sinulle viestejä tai löytää sinut toisen instanssin kautta.
-      review_preferences_action: Muuta asetuksia
-      review_preferences_step: Käy tarkistamassa, että asetukset ovat haluamallasi tavalla. Voit valita, missä tilanteissa haluat saada sähköpostia, mikä on julkaisujesi oletusnäkyvyys jne. Jos et saa helposti pahoinvointia, voit valita, että GIF-animaatiot toistetaan automaattisesti.
       subject: Tervetuloa Mastodoniin
-      tip_federated_timeline: Yleinen aikajana näyttää sisältöä koko Mastodon-verkostosta. Siinä näkyvät kuitenkin vain ne henkilöt, joita oman instanssisi käyttäjät seuraavat. Siinä ei siis näytetä aivan kaikkea.
-      tip_following: Oletusarvoisesti seuraat oman palvelimesi ylläpitäjiä. Etsi lisää kiinnostavia ihmisiä paikalliselta ja yleiseltä aikajanalta.
-      tip_local_timeline: Paikallinen aikajana näyttää instanssin %{instance} käyttäjien julkaisut. He ovat naapureitasi!
-      tip_mobile_webapp: Jos voit lisätä Mastodonin mobiiliselaimen kautta aloitusnäytöllesi, voit vastaanottaa push-ilmoituksia. Toiminta vastaa monin tavoin tavanomaista sovellusta!
-      tips: Vinkkejä
       title: Tervetuloa mukaan, %{name}!
   users:
     follow_limit_reached: Et voi seurata yli %{limit} henkilöä
-    generic_access_help_html: Onko sinulla pääsy tiliisi? Voit ottaa yhteyttä %{email} saadaksesi apua
     invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
-    invalid_sign_in_token: Virheellinen turvakoodi
     otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyttä osoitteeseen %{email}
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
     signed_in_as: 'Kirjautunut henkilönä:'
-    suspicious_sign_in_confirmation: Et ilmeisesti ole kirjautunut sisään tältä laitteelta aikaisemmin, joten lähetämme sähköpostiisi turvakoodin vahvistaaksesi, että se olet sinä.
   verification:
-    explanation_html: 'Voit <strong>vahvistaa itsesi profiilisi metatietojen linkkien omistajaksi.</strong>. Tätä varten linkitetyn verkkosivuston on sisällettävä linkki takaisin Mastodon -profiiliisi. Palauttavalla linkillä <strong>täytyy</strong> olla <code>rel="minä"</code> tuntomerkki. Linkin tekstisisällöllä ei ole väliä. Tässä on esimerkki:'
+    explanation_html: 'Voit <strong>vahvistaa olevasi profiilisi metatiedoissa olevien linkkien omistaja.</strong>. Tätä varten linkitetyn verkkosivuston täytyy sisältää linkki takaisin Mastodon-profiiliisi. Palauttavalla linkillä <strong>täytyy</strong> olla <code>rel="me"</code>-arvo. Linkin tekstisisällöllä ei ole merkitystä. Tässä on esimerkki:'
     verification: Vahvistus
   webauthn_credentials:
     add: Lisää uusi suojausavain
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
new file mode 100644
index 000000000..5145be40c
--- /dev/null
+++ b/config/locales/fo.yml
@@ -0,0 +1,1669 @@
+---
+fo:
+  about:
+    about_mastodon_html: 'Framtíðar sosiali miðilin: ongar lýsingar, eingin stórfyritøku-yvirvøka, etiskt snið og desentralisering! Eig tínar dátur við Mastodon!'
+    contact_missing: Ikki sett
+    contact_unavailable: Ikki tøk/ur
+    hosted_on: Mastodon hýst á %{domain}
+    title: Um
+  accounts:
+    follow: Fylg
+    followers:
+      one: Fylgjari
+      other: Fylgjarar
+    following: Fylgir
+    instance_actor_flash: Hendan kontan er ein tykisligur aktørur, sum verður brúktur til at umboða ambætaran sjálvan og ikki nakran ávísan brúkara. Hon verður brúkt til sameind endamál og eigur ikki at vera tikin úr gildi.
+    last_active: virkin seinast
+    link_verified_on: Eigaraskapur av hesum leinki var eftirkannaður tann %{date}
+    nothing_here: Her er einki!
+    pin_errors:
+      following: Tú mást fylgja persóninum, sum tú ynskir at viðurkenna, framman undan
+    posts:
+      one: Uppslag
+      other: Uppsløg
+    posts_tab_heading: Uppsløg
+  admin:
+    account_actions:
+      action: Frem atgerð
+      title: Frem umsjónaratgerð á %{acct}
+    account_moderation_notes:
+      create: Skriva umsjónarviðmerking
+      created_msg: Umsjónarviðmerking stovnað!
+      destroyed_msg: Umsjónarviðmerking strikað!
+    accounts:
+      add_email_domain_block: Blokera teldupostanavnaøki
+      approve: Vátta
+      approved_msg: Góðkent tilmeldingarumbøn hjá %{username}
+      are_you_sure: Ert tú vís/ur?
+      avatar: Eftirgjørdur skapningur
+      by_domain: Økisnavn
+      change_email:
+        changed_msg: Teldupostur broyttur!
+        current_email: Núverandi teldupostur
+        label: Broyt teldupost
+        new_email: Nýggjur teldupostur
+        submit: Broyt teldupost
+        title: Broyt teldupostin hjá %{username}
+      change_role:
+        changed_msg: Leiklutur broyttur!
+        label: Broyt leiklut
+        no_role: Eingin leiklutur
+        title: Broyt leiklut hjá %{username}
+      confirm: Vátta
+      confirmed: Váttað
+      confirming: Váttar
+      custom: Tillaga
+      delete: Strika dátur
+      deleted: Strikað
+      demote: Lækka í tign
+      destroyed_msg: Dáturnar hjá %{username} eru nú settar í bíðirøð at blíva strikaðar sum skjótast
+      disable: Fryst
+      disable_sign_in_token_auth: Ger váttan við teldupostateknum óvirkna
+      disable_two_factor_authentication: Ger 2FA óvirkið
+      disabled: Fryst
+      display_name: Vís navn
+      domain: Økisnavn
+      edit: Rætta
+      email: Teldupostur
+      email_status: Teldupostastøða
+      enable: Tiðna
+      enable_sign_in_token_auth: Ger váttan við teldupostateknum virkna
+      enabled: Í gildi
+      enabled_msg: Tiðnaði kontuna hjá %{username}
+      followers: Fylgjarar
+      follows: Fylgir
+      header: Høvd
+      inbox_url: Innbakka-URL'ur
+      invite_request_text: Tilmeldingarorsakir
+      invited_by: Bjóðað av
+      ip: IP
+      joined: Tilmeldað/ur
+      location:
+        all: Alt
+        local: Lokalar
+        remote: Fjarar
+        title: Staður
+      login_status: Innritanarstøða
+      media_attachments: Viðfestir miðlar
+      memorialize: Broyt til minniskontu
+      memorialized: Gjørd til minniskontu
+      memorialized_msg: Gjørt %{username} til eina minniskontu
+      moderation:
+        active: Virkin
+        all: Allar
+        pending: Í bíðistøðu
+        silenced: Avmarkað
+        suspended: Avbrotin
+        title: Umsjón
+      moderation_notes: Umsjónarviðmerkingar
+      most_recent_activity: Feskasta virksemi
+      most_recent_ip: Feskasta IP
+      no_account_selected: Ongar kontur vóru broyttar, tí ongar vóru valdar
+      no_limits_imposed: Ongar avmarkingar álagdar
+      no_role_assigned: Eingin leiklutur tillutaður
+      not_subscribed: Ikki haldari
+      pending: Bíðar eftir viðgerð
+      perform_full_suspension: Ógilda
+      previous_strikes: Eldri meldingar
+      previous_strikes_description_html:
+        one: Hendan kontan hevur <strong>eina</strong> melding.
+        other: Hendan kontan hevur <strong>%{count}</strong> meldingar.
+      promote: Stimbra
+      protocol: Samskiftisháttur
+      public: Alment
+      push_subscription_expires: PuSH-hald gongur út
+      redownload: Endurnýggja vanga
+      redownloaded_msg: Tín vangamynd %{username}'s er nú endurnýggja
+      reject: Nokta
+      rejected_msg: Tað eydnaðist, at avvísa umsóknina frá %{username}'s um innskriving
+      remote_suspension_irreversible: Dáturnar hjá hesi kontuni eru strikaðar med alla.
+      remote_suspension_reversible_hint_html: Kontan er sett úr gildi á teirra ambætara og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann fjarambætarin endurskapa kontuna uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri.
+      remove_avatar: Sletta avatar
+      remove_header: Sletta headera
+      removed_avatar_msg: Slettaði avatar myndina hjá %{username}
+      removed_header_msg: Slettaði header myndina hjá %{username}
+      resend_confirmation:
+        already_confirmed: Hesi brúkarin er longu váttaður
+        send: Endursend váttanar teldupost
+        success: Váttanar teldupostur trygt sendur!
+      reset: Endurset
+      reset_password: Endurstilla loyniorð
+      resubscribe: Tegna teg umaftur
+      role: Leiklutur
+      search: Leita
+      search_same_email_domain: Aðrir brúkarir eru við sama teldupost domaini
+      search_same_ip: Aðrir brúkarar við somu IP
+      security_measures:
+        only_password: Bara loyniorð
+        password_and_2fa: Loyniorð og 2FA
+      sensitive: Tvinga-følsemi
+      sensitized: Frámerkt sum viðkvamt
+      shared_inbox_url: Deil postkassa URL
+      show:
+        created_reports: Frágreiðing gjørd
+        targeted_reports: Meldað av øðrum
+      silence: Mark
+      silenced: Avmarkað
+      statuses: Uppsløg
+      strikes: Eldri fráboðanir
+      subscribe: Tekna hald
+      suspend: Fyribils ikki í gildi
+      suspended: Ikki í gildi
+      suspension_irreversible: Dáturnar á hesu kontu er endaliga sletttaðar. Tú kann seta hana í gildi, men dáturnar fáast ikki aftur.
+      suspension_reversible_hint_html: Kontan er sett úr gildi og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann kontan endurskapast uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri.
+      title: Kontur
+      unblock_email: Strika blokering av telduposti
+      unblocked_email_msg: Blokeringin av teldupostinum hjá %{username} varð strikað
+      unconfirmed_email: Óváttaður teldupostur
+      undo_sensitized: Angra tvingað viðbrekni
+      undo_silenced: Strika markið
+      undo_suspension: Angra ógildi
+      unsilenced_msg: Avmarkingin av kontuni hjá %{username} var strikað
+      unsubscribe: Strika hald
+      unsuspended_msg: Kontan hjá %{username} varð sett aftur í gildi
+      username: Brúkaranavn
+      view_domain: Vís samandrátt fyri navnaøki
+      warn: Ávara
+      web: Vev
+      whitelisted: Loyvd at sameina
+    action_logs:
+      action_types:
+        approve_appeal: Góðkenn kæru
+        approve_user: Góðkenn brúkara
+        assigned_to_self_report: Tilluta melding
+        change_email_user: Broyt teldupost fyri brúkara
+        change_role_user: Broyt leiklut hjá brúkara
+        confirm_user: Vátta brúkara
+        create_account_warning: Stovna ávaring
+        create_announcement: Stovna kunngerð
+        create_canonical_email_block: Stovna teldupostblokering
+        create_custom_emoji: Stovna serligt kenslutekn
+        create_domain_allow: Stovna navnaøkjaloyvi
+        create_domain_block: Stovna navnaøkjablokering
+        create_email_domain_block: Stovna teldupostanavnaøkjablokering
+        create_ip_block: Stovna IP reglu
+        create_unavailable_domain: Stovna navnaøki, sum ikki er tøkt
+        create_user_role: Stovna leiklut
+        demote_user: Lækka brúkara í tign
+        destroy_announcement: Strika kunngerð
+        destroy_canonical_email_block: Strika teldupostblokering
+        destroy_custom_emoji: Strika serligt kenslutekn
+        destroy_domain_allow: Strika navnaøkjaloyvi
+        destroy_domain_block: Strika navnaøkjablokering
+        destroy_email_domain_block: Strika teldupostanavnaøkjablokering
+        destroy_instance: Reinsa navnaøki
+        destroy_ip_block: Strika IP reglu
+        destroy_status: Strika post
+        destroy_unavailable_domain: Strika navnaøki, sum ikki er tøkt
+        destroy_user_role: Bein burtur leiklut
+        disable_2fa_user: Ger 2FA óvirkið
+        disable_custom_emoji: Ger serligt kenslutekn óvirkið
+        disable_sign_in_token_auth_user: Ger váttan við teldupostateknum óvirkna fyri brúkara
+        disable_user: Ger brúkara óvirknan
+        enable_custom_emoji: Ger serligt kenslutekn virkið
+        enable_sign_in_token_auth_user: Ger váttan við teldupostateknum virkna fyri brúkara
+        enable_user: Ger brúkara virknan
+        memorialize_account: Minnst til Konto
+        promote_user: Vís fram Brúkara
+        reject_appeal: Avvís mótmali
+        reject_user: Avvís Brúkara
+        remove_avatar_user: Sletta Avatar
+        reopen_report: Lat upp aftur Frágreiðing
+        resend_user: Endursent Váttanar Teldupost
+        reset_password_user: Endurset Loyniorð
+        resolve_report: Loys trupulleikar í Frágreiðing
+        sensitive_account: Tvinga viðkvæmis Konto
+        silence_account: Avmarka Konto
+        suspend_account: Fyribils ógilda kontu
+        unassigned_report: Sletta tildeilda Frágreiðing
+        unblock_email_account: Sletta foring av telduposti
+        unsensitive_account: Ógilda Tvungna-Viðkvæmis kontu
+        unsilence_account: Ógilda Avmarkaða Kontu
+        unsuspend_account: Fyribils ógilda kontu
+        update_announcement: Dagfør Fráboðan
+        update_custom_emoji: Dagfør Sergjørt Kenslutekn
+        update_domain_block: Dagfør Domain forðing
+        update_ip_block: Dagfør IP reglur
+        update_status: Dagfør Uppslag
+        update_user_role: Dagfør Leiklut
+      actions:
+        approve_appeal_html: "%{name} góðkendi umsjónaráheitan frá %{target}"
+        approve_user_html: "%{name} góðtók umsókn frá %{target}"
+        assigned_to_self_report_html: "%{name} tillutaði frágreiðing %{target} til sín sjálvs"
+        change_email_user_html: "%{name} broytti teldupost addressuna hjá %{target}"
+        change_role_user_html: "%{name} broytti leiklutin hjá %{target}"
+        confirm_user_html: "%{name} góðtók teldupost addressuna hjá %{target}"
+        create_account_warning_html: "%{name} sendi eina ávarðing til %{target}"
+        create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
+        create_canonical_email_block_html: "%{name} forðaði telduposti við hash'inum %{target}"
+        create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
+        create_domain_allow_html: "%{name} loyv sameining við domainið %{target}"
+        create_domain_block_html: "%{name} blokeraði navnaøkið %{target}"
+        create_email_domain_block_html: "%{name} blokeraði teldupostanavnaøkið %{target}"
+        create_ip_block_html: "%{name} gjørdi reglu fyri IP %{target}"
+        create_unavailable_domain_html: "%{name} steðgaði veiting til navnaøkið %{target}"
+        create_user_role_html: "%{name} stovnaði %{target} leiklutin"
+        demote_user_html: "%{name} lækkaði tignina hjá brúkaranum %{target}"
+        destroy_announcement_html: "%{name} strikaðar fráboðanir %{target}"
+        destroy_canonical_email_block_html: "%{name} strikaði blokeringina av teldupostin við hashkodu %{target}"
+        destroy_custom_emoji_html: "%{name} strikaði kensluteknið %{target}"
+        destroy_domain_allow_html: "%{name} havnaði sameining við navnaøkið %{target}"
+        destroy_domain_block_html: "%{name} strikaði blokering av navnaøkinum %{target}"
+        destroy_email_domain_block_html: "%{name} leysgivi teldupostanavnaøkið %{target}"
+        destroy_instance_html: "%{name} reinsaði navnaøkið %{target}"
+        destroy_ip_block_html: "%{name} slettaðar reglur fyri IP %{target}"
+        destroy_status_html: "%{name} slettaði upplegg hjá %{target}"
+        destroy_unavailable_domain_html: "%{name} tók upp aftir veiting til navnaøkið %{target}"
+        destroy_user_role_html: "%{name} slettaði leiklutin hjá %{target}"
+        disable_2fa_user_html: "%{name} slepti kravið um váttan í tveimum stigum fyri brúkaran %{target}"
+        disable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} óvirkið"
+        disable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum óvirkna fyri %{target}"
+        disable_user_html: "%{name} gjørdi innritan hjá brúkaranum %{target} óvirkna"
+        enable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} virkið"
+        enable_sign_in_token_auth_user_html: "%{name} gjørdi váttan við teldupostteknum virkna fyri %{target}"
+        enable_user_html: "%{name} gjørdi innritan virkna fyri brúkaran %{target}"
+        memorialize_account_html: "%{name} broytti kontuna hjá %{target} til eina minnissíðu"
+        promote_user_html: "%{name} flutti brúkaran %{target} fram"
+        reject_appeal_html: "%{name} avvísti umsjónaráheitan frá %{target}"
+        reject_user_html: "%{name} avvísti skráseting hjá %{target}"
+        remove_avatar_user_html: "%{name} strikaði eftirgjørda skapningin hjá %{target}"
+        reopen_report_html: "%{name} lat uppaftur meldingina %{target}"
+        resend_user_html: "%{name} endursendi váttanarteldubrævið fyri %{target}"
+        reset_password_user_html: "%{name} setti loyniorðið hjá brúkaranum %{target} av nýggjum"
+        resolve_report_html: "%{name} avgreiddi meldingina %{target}"
+        sensitive_account_html: "%{name} hevur merkt media hjá %{target} sum viðkvæmt"
+        silence_account_html: "%{name} hevur avmarkað rættindini á kontuni %{target}"
+        suspend_account_html: "%{name} ógildaði kontuna hjá %{target}"
+        unassigned_report_html: "%{name} tók aftur tillutanina av meldingini %{target}"
+        unblock_email_account_html: "%{name} hevur læst teldubrævabústaðin hjá %{target} upp"
+        unsensitive_account_html: "%{name} strikaði viðkvæmis-merkingina av miðlafíluni %{target}"
+        unsilence_account_html: "%{name} strikaði avmarkingina av kontuni hjá %{target}"
+        unsuspend_account_html: "%{name} setti kontuna hjá %{target} í gildi aftur"
+        update_announcement_html: "%{name} dagførdi kunngerðina %{target}"
+        update_custom_emoji_html: "%{name} dagførdi kensluteknið %{target}"
+        update_domain_block_html: "%{name} dagførdi navnaøkisblokeringina hjá %{target}"
+        update_ip_block_html: "%{name} broytti IP-reglurnar %{target}"
+        update_status_html: "%{name} dagførdi postin hjá %{target}"
+        update_user_role_html: "%{name} broyttir %{target} leiklutir"
+      deleted_account: strikað konta
+      empty: Eingir loggar funnir.
+      filter_by_action: Filtrera eftir atgerð
+      filter_by_user: Filtrera eftir brúkara
+      title: Skoðanarloggur
+    announcements:
+      destroyed_msg: Kunngerð strikað!
+      edit:
+        title: Rætta kunngerð
+      empty: Ongar kunngerðir funnar.
+      live: Beinleiðis
+      new:
+        create: Stovna kunngerð
+        title: Nýggj kunngerð
+      publish: Legg út
+      published_msg: Kunngerð útgivin!
+      scheduled_for: Sett á skrá %{time}
+      scheduled_msg: Útgáva av kunngerð tíðarásett!
+      title: Kunngerðir
+      unpublish: Tak útgávu aftur
+      unpublished_msg: Kunngerð tikin aftur!
+      updated_msg: Kunngerð dagførd!
+    custom_emojis:
+      assign_category: Tilluta bólk
+      by_domain: Økisnavn
+      copied_msg: Havi gjørt lokalt avrit av kenslutekninum
+      copy: Avrita
+      copy_failed_msg: Tað bar ikki til at gera lokalt avrit av hasum kenslutekninum
+      create_new_category: Stovna nýggja flokking
+      created_msg: Kenslutekn stovnað!
+      delete: Strika
+      destroyed_msg: Kenslutekn strikað!
+      disable: Ógilda
+      disabled: Ógildað
+      disabled_msg: Kenslutekn gjørt óvirkið
+      emoji: Kenslutekn
+      enable: Set í gildi
+      enabled: Í gildi
+      enabled_msg: Kenslutekn gjørt virkið
+      image_hint: PNG ella GIF upp til %{size}
+      list: Listi
+      listed: Listað
+      new:
+        title: Legg sergjørt kenslutekn afturat
+      no_emoji_selected: Eingi kenslutekn vóru broytt, tí eingi vóru vald
+      not_permitted: Tú hevur ikki loyvi at gera hetta
+      overwrite: Skriva omaná
+      shortcode: Stuttkoda
+      shortcode_hint: Minst 2 tekn. Bara tøl, vanligir stavir og botnstrikur
+      title: Sergjørd kenslutekn
+      uncategorized: Ikki flokkað
+      unlist: Tak av listanum
+      unlisted: Ikki listað
+      update_failed_msg: Fekk ikki dagført hatta kensluteknið
+      updated_msg: Kenslutekn dagført!
+      upload: Legg upp
+    dashboard:
+      active_users: virknir brúkarar
+      interactions: sín ámillum ávirkanir
+      media_storage: Miðlagoymsla
+      new_users: nýggir brúkarar
+      opened_reports: meldingar latnar upp
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> kæra bíðar"
+        other: "<strong>%{count}</strong> kærur bíða"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> melding bíðar"
+        other: "<strong>%{count}</strong> meldingar bíða"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> frámerki bíðar"
+        other: "<strong>%{count}</strong> frámerki bíða"
+      pending_users_html:
+        one: "<strong>%{count}</strong> brúkari bíðar"
+        other: "<strong>%{count}</strong> brúkarar bíða"
+      resolved_reports: meldingar avgreiddar
+      software: Ritbúnaður
+      sources: Tilmeldingarkeldur
+      space: Goymsla brúkt
+      title: Kunningarbretti
+      top_languages: Mest virknu mál
+      top_servers: Mest virknu ambætarar
+      website: Vevstað
+    disputes:
+      appeals:
+        empty: Ongar kærur funnar.
+        title: Kærur
+    domain_allows:
+      add_new: Loyv sameining við navnaøki
+      created_msg: Sameining er nú loyvd fyri navnaøkið
+      destroyed_msg: Loyvi hjá navnaøki at sameinast er noktað
+      export: Flyt út
+      import: Flyt inn
+      undo: Nokta sameining við navnaøki
+    domain_blocks:
+      add_new: Legg nýggja navnaøkisblokering afturat
+      created_msg: Navnaøkisblokering verður nú viðgjørd
+      destroyed_msg: Navnaøkisblokering er nú gjørd óvirkin
+      domain: Økisnavn
+      edit: Rætta navnaøkisblokering
+      existing_domain_block: Tú hevur longu ásett stangari avmarkingar á %{name}.
+      existing_domain_block_html: Tú hevur longu ásett strangari avmarkingar á %{name}, tú mást <a href="%{unblock_url}">strika blokeringina</a> fyrst.
+      export: Flyt út
+      import: Flyt inn
+      new:
+        create: Stovna blokering
+        hint: Navnaøkjablokeringin forðar ikki stovnan av kontum í dátugrunninum, men fer afturlítandi og sjálvvirkandi at gera ávísar umsjónarmannagongdir á hesar kontur virknar.
+        severity:
+          desc_html: "<strong>Avvmarka</strong> ger soleiðis, at postar frá kontum í hesum navnaøki verða ósjónligur fyri øll, sum ikki fylgja kontunum beinleiðis.\n<strong>Ógilda</strong> strikar alt innihald, allar miðlar og allar vangadátur fyri kontur hjá hesum navnaøkinum frá tínum ambætara. Brúka \n<strong>Einki</strong> um tú einans vil avvísa miðlafílum."
+          noop: Ongar
+          silence: Mark
+          suspend: Ógilda
+        title: Nýggj navnaøkisblokering
+      no_domain_block_selected: Ongar navnaøkjablokeringar vóru broyttar, tí ongar vóru valdar
+      not_permitted: Tú hevur ikki rættindi at gera hetta
+      obfuscate: Grugga navnaøki
+      obfuscate_hint: Grugga navnaøkið lutvíst í listanum, um kunngerð av listum við navnaøkisavmarkingum er gjørd virkin
+      private_comment: Privat viðmerking
+      private_comment_hint: Viðmerking um hesa navnaøkjaavmarking til innanhýsis nýtslu hjá umsjónarfólkunum.
+      public_comment: Sjónlig viðmerking
+      public_comment_hint: Viðmerk hesa navnaøkisavmarkingina fyri almenninginum, um kunngerð av listum við navnaøkisavmarkingum er gjørd virkin.
+      reject_media: Avvís miðlafílur
+      reject_media_hint: Burturbeinir miðlafílur, sum eru goymdar lokalt, og noktar at taka niður fílur frameftir. Óviðkomandi fyri banningar
+      reject_reports: Avvís meldingar
+      reject_reports_hint: Ikki leggja lag í meldingar, sum koma frá hesum navnaøkinum. Óviðkomandi fyri banningar
+      undo: Strika navnaøkisblokering
+      view: Vís navnaøkisblokering
+    email_domain_blocks:
+      add_new: Stovna
+      attempts_over_week:
+        one: "%{count} roynd seinastu vikuna"
+        other: "%{count} tilmeldingarroyndir seinastu vikuna"
+      created_msg: Teldupostanavnaøkið blokerað
+      delete: Strika
+      dns:
+        types:
+          mx: MX postur
+      domain: Navnaøki
+      new:
+        create: Stovna nýtt økisnavn
+        resolve: Loys navnaøki
+        title: Blokera nýtt teldupostanavnaøki
+      no_email_domain_block_selected: Ongar teldupostanavnaøkisblokeringar vóru broyttar, tí ongar vóru valdar
+      resolved_dns_records_hint_html: Navnaøkið verður loyst til hesi MX navnaøki, sum í síðsta enda hava ábyrgdina av at móttaka teldupost. At blokera eitt MX navnaøki fer at blokera tilmeldingar frá einum og hvørjum teldupoststaði, sum brúkar sama MX navnaøki, sjálvt um sjónliga navnaøkið er eitt annað. <strong>Ansa eftir ikki at blokera stórar veitarar av telduposti</strong>
+      resolved_through_html: Loyst gjøgnum %{domain}
+      title: Blokeraði teldupostanavnaøki
+    export_domain_allows:
+      new:
+        title: Innflyt navnaøkjaloyvi
+      no_file: Eingin fíla vald
+    export_domain_blocks:
+      import:
+        description_html: Tú er í holt við at innflyta ein lista av navnaøkjablokeringum. Vinarliga eftirkanna listan gjølla, serliga um tú ikki hevur gjørt listan sjálv/ur.
+        existing_relationships_warning: Verandi fylgjarasambond
+        private_comment_description_html: Fyri at hjálpa tær at fylgja við í, hvaðani innfluttir blokkar koma, verða innfluttu blokkarnir stovnaðir við hesi privatu viðmerkingini:<q>%{comment}</q>
+        private_comment_template: Innflutt frá %{source} tann %{date}
+        title: Innflyt navnaøkjablokeringar
+      new:
+        title: Innflyt navnaøkjablokeringar
+      no_file: Eingin fíla vald
+    follow_recommendations:
+      description_html: "<strong>Viðmæli at fylgja hjálpa nýggjum brúkarum til skjótt at finna áhugavert innihald</strong>. Tá ein brúkari ikki hevur havt samband við aðrar brúkarar til at gera persónlig tilmæli, so verða hesar kontur viðmæltar í staðin. Konturnar verða roknaðar av nýggjum dagliga frá einari blanding av kontum við flestu hugbindingum og flestu lokalu fylgjarum fyri eitt givið mál."
+      language: Fyri mál
+      status: Status
+      suppress: Avmarka tilmæli at fylgja
+      suppressed: Steðgað
+      title: Tilmæli at fylgja
+      unsuppress: Endurskapa tilmæli at fylgja
+    instances:
+      availability:
+        description_html:
+          one: Um veiting til navnaøkið ikki riggar í <strong>%{count} dag</strong>, so verða ongar royndir at veita gjørdar, uttan so, at ein veiting <em>frá</em> navnaøkinum er móttikin.
+          other: Um veiting til navnaøkið ikki riggar <strong>%{count} ymiskar dagar</strong>, so verða ongar royndir at veita gjørdar, uttan so, at ein veiting <em>frá</em> navnaøkinum er móttikin.
+        failure_threshold_reached: Mesta tal av brekum nátt %{date}.
+        failures_recorded:
+          one: Miseydnaðar royndir í %{count} dag.
+          other: Miseydnaðar royndir í %{count} ymiskar dagar.
+        no_failures_recorded: Eingi brek skrásett.
+        title: Tøki
+        warning: Seinasta royndin at fáa samband við ambætaran eydnaðist ikki
+      back_to_all: Øll
+      back_to_limited: Avmarkaði
+      back_to_warning: Ávaring
+      by_domain: Økisnavn
+      confirm_purge: Er tað tilætlað, at dátur frá hesum navnaøkinum skulu strikast med alla?
+      content_policies:
+        comment: Innanhýsis viðmerking
+        description_html: Tú kanst áseta innihaldspolitikkir, sum verða áløgd øllum kontum frá hesum navnaøkinum og øllum tess undirnavnaøkjum.
+        policies:
+          reject_media: Vraka miðil
+          reject_reports: Vraka meldingar
+          silence: Mark
+          suspend: Ógilda
+        policy: Reglur
+        reason: Almenn grundgeving
+        title: Reglur fyri innihaldi
+      dashboard:
+        instance_accounts_dimension: Kontur við flestum fylgjarum
+        instance_accounts_measure: goymdar kontur
+        instance_followers_measure: okkara fylgjarar har
+        instance_follows_measure: teirra fylgjarar her
+        instance_languages_dimension: Mest nýtt mál
+        instance_media_attachments_measure: goymd miðlaviðfesti
+        instance_reports_measure: meldingar um tey
+        instance_statuses_measure: goymdir postar
+      delivery:
+        all: Øll
+        clear: Reinsa veitingarvillur
+        failing: Miseydnast
+        restart: Byrja veiting av nýggjum
+        stop: Støðga veiting
+        unavailable: Ikki tøkt
+      delivery_available: Levering er møgulig
+      delivery_error_days: Dagar við veitingarvillum
+      delivery_error_hint: Er veiting ikki møgulig í %{count} dagar, so verða tey sjálvvirkandi merkt sum ikki møgulig at veita.
+      destroyed_msg: Dátur frá %{domain} eru nú settar í bíðirøð til beinan vegin at blíva strikaðar.
+      empty: Eingi navnaøki funnin.
+      known_accounts:
+        one: "%{count} kend konta"
+        other: "%{count} kendar kontur"
+      moderation:
+        all: Allir
+        limited: Avmarkaðir
+        title: Umsjón
+      private_comment: Privat viðmerking
+      public_comment: Sjónlig viðmerking
+      purge: Reinsa
+      purge_description_html: Heldur tú, at hetta navnaøkið varandi hevur mist sambandið við netið, so kanst tú strika allar kontupostar og tilknýttar dátur frá hesum navnaøkinum frá tíni goymslu. Tað kann taka eina løtu.
+      title: Sameining
+      total_blocked_by_us: Blokerað av okkum
+      total_followed_by_them: Fylgt av teimum
+      total_followed_by_us: Fylgt av okkum
+      total_reported: Meldingar um tey
+      total_storage: Viðheftir miðlar
+      totals_time_period_hint_html: Við í samanteljingunum niðanfyri eru dátur frá byrjan av.
+    invites:
+      deactivate_all: Ger allar óvirknar
+      filter:
+        all: Alt
+        available: Tøk
+        expired: Útgingið
+        title: Filtur
+      title: Innbjóðingar
+    ip_blocks:
+      add_new: Stovna reglu
+      created_msg: Nýggj IP regla løgd afturat
+      delete: Strika
+      expires_in:
+        '1209600': 2 vikur
+        '15778476': 6 mánaðir
+        '2629746': 1 mánaði
+        '31556952': 1 ár
+        '86400': 1 dag
+        '94670856': 3 ár
+      new:
+        title: Stovna nýggja IP reglu
+      no_ip_block_selected: Ongar IP reglur vóru broyttar, tí ongar vóru valdar
+      title: IP reglur
+    relationships:
+      title: Sambond hjá %{acct}
+    relays:
+      add_new: Legg nýtt reiðlag afturat
+      delete: Strika
+      description_html: Eitt <strong>sameint reiðlag</strong> er ein millumambætari sum flytir stórar nøgdir av almennum postum millum ambætarar, sum eru atknýttir og geva út á ambætaranum. <strong>Tað kann gera tað møguligt hjá smáum og miðalstórum ambætarum at varnast tilfar frá sameinda alheiminum</strong>, sum annars hevði kravt, at lokalir brúkarar fylgdu einstøku brúkarunum á fjarum ambætarum.
+      disable: Ger óvirkið
+      disabled: Óvirkið
+      enable: Set í gildi
+      enable_hint: Tá tað er virkið, so teknar ambætarnir hjá tær seg fyri allar almennum postum frá hesum reiðlagi, og sendir almennar postar frá tínum ambætara til reiðlagið.
+      enabled: Virkið
+      inbox_url: URL hjá reiðlagi
+      pending: Bíðar eftir góðkenning frá reiðlagi
+      save_and_enable: Goym og ger virkið
+      setup: Set upp samband við reiðlag
+      signatures_not_enabled: Reiðlag virka ikki sum tey skulu, tá trygdarstøða ella avmarkað sameiningarstøða eru virknar
+      status: Støða
+      title: Reiðløg
+    report_notes:
+      created_msg: Viðmerking til melding stovnað!
+      destroyed_msg: Viðmerking til melding strikað!
+    reports:
+      account:
+        notes:
+          one: "%{count} viðmerking"
+          other: "%{count} viðmerkingar"
+      action_log: Skoðanarloggur
+      action_taken_by: Atgerð tikin av
+      actions:
+        delete_description_html: Meldaðu postarnir verða strikaðir og ein atsókn verður skrásett, soleiðis at tú veist, um onnur stig skulu takast, um sama konta ger fleiri brot í framtíðini.
+        mark_as_sensitive_description_html: Miðlarnir í meldaðu postunum verða merkir sum viðkvæmir, og ein atsókn verður skrásett, soleiðis at tú veist, um onnur stig skulu takast, um sama konta ger fleiri brot í framtíðini.
+        other_description_html: Sí fleiri valmøguleikar at stýra atferðini hjá kontuni og at tillagað samskiftið við meldaðu kontuni.
+        resolve_description_html: Eingin atgerð verður tikin móti meldaðu kontuni, eingin atsókn verður skrásett og meldingin verður lukkað.
+        silence_description_html: Vangin verður einans sjónligur hjá teimum, sum longu fylgja honum ella leita eftir honum við hond, og tað minkar nógv um, hvussu langt hann røkkur. Kann altíð angrast.
+        suspend_description_html: Vangin og alt tilfar hjá vanganum verður óatkomandi inntil hann at enda verður strikaður. Tað verður ómøguligt at samvirka við hesa kontuna. Vendast kann aftur innan 30 dagar.
+      actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
+      add_to_report: Legg meira afturat meldingini
+      are_you_sure: Er tú vís/ur?
+      assign_to_self: Tilluta mær
+      assigned: Tilnevnt umsjónarfólk
+      by_target_domain: Navnaøki hjá meldaðu kontuni
+      category: Bólkur
+      category_description_html: Orsøkin, at hendan kontan og/ella tilfarið var melda verður fráboðað í samskifti við meldaðu kontuni
+      comment:
+        none: Eingin
+      comment_description_html: 'Fyri at veita fleiri upplýsingar skrivaði %{name}:'
+      created_at: Meldað
+      delete_and_resolve: Strika postar
+      forwarded: Víðarisent
+      forwarded_to: Víðarisent til %{domain}
+      mark_as_resolved: Marka sum loyst
+      mark_as_sensitive: Merkt sum viðkvæmt
+      mark_as_unresolved: Marka sum óloyst
+      no_one_assigned: Eingin
+      notes:
+        create: Legg viðmerking afturat
+        create_and_resolve: Marka sum loyst og ger viðmerking
+        create_and_unresolve: Lat upp aftur við viðmerking
+        delete: Strika
+        placeholder: Greið frá, hvørjar atgerðir hava verið gjørdar ella aðrar viðkomandi dagføringar...
+        title: Viðmerkingar
+      notes_description_html: Vís ella skriva viðmerkingar til onnur umsjónarfólk ella teg sjálva/n í framtíðini
+      quick_actions_description_html: 'Tak eina skjóta avgerð ella skrulla niðureftir fyri at síggja meldaða innihaldið:'
+      remote_user_placeholder: fjarbrúkarin frá %{instance}
+      reopen: Lat melding uppaftur
+      report: 'Melding #%{id}'
+      reported_account: Meldað konta
+      reported_by: Meldað av
+      resolved: Loyst
+      resolved_msg: Melding avgreidd!
+      skip_to_actions: Leyp til atgerðir
+      status: Støða
+      statuses: Meldað innihald
+      statuses_description_html: Tilfarið, sum brotið viðvíkur, fer at vera siterað í samskifti við meldaðu kontuni
+      target_origin: Uppruni hjá meldaðu kontuni
+      title: Meldingar
+      unassign: Strika tillutan
+      unresolved: Óloyst
+      updated_at: Dagført
+      view_profile: Vís vangamynd
+    roles:
+      add_new: Legg leiklut afturat
+      assigned_users:
+        one: "%{count} brúkari"
+        other: "%{count} brúkarar"
+      categories:
+        administration: Umsiting
+        devops: DevOps
+        invites: Innbjóðingar
+        moderation: Umsjón
+        special: Serstakt
+      delete: Strika
+      description_html: Við <strong>brúkaraleiklutum</strong> kanst tú stýra, hvørjar funktiónir og hvørji Mastodon-øki tínir brúkarar kunnu fáa atgongd til.
+      edit: Broyt '%{name}' leiklutin
+      everyone: Sjálvsett loyvi
+      everyone_full_description_html: Hetta er <strong>støðisleikluturin</strong>, sum ávirkar <strong>allar brúkarar</strong>, sjálvt teir, sum ikki hava ein ásettan leiklut. Allir aðrir leiklutir arva loyvi frá honum.
+      permissions_count:
+        one: "%{count} loyvi"
+        other: "%{count} rættindi"
+      privileges:
+        administrator: Umsitari
+        administrator_description: Brúkarar við hesum rættindum skáka sær undan øllum loyvisavmarkingum
+        delete_user_data: Sletta brúkaraupplýsingar
+        delete_user_data_description: Loyvir brúkarum at strika dátur hjá øðrum brúkarum uttan seinkingar
+        invite_users: Bjóða brúkarum
+        invite_users_description: Loyvir brúkarum at bjóða nýggjum fólki til ambætaran
+        manage_announcements: Stýra kunngerðum
+        manage_announcements_description: Loyvir brúkarum at stýra kunngerðum á ambætaranum
+        manage_appeals: Umsit kærur
+        manage_appeals_description: Loyvir brúkarum at eftirkanna kærur um umsjónaratgerðir
+        manage_blocks: Stýra blokeringum
+        manage_blocks_description: Loyvir brúkarum at blokera teldupostveitarum og IP adressum
+        manage_custom_emojis: Stýra sergjørd kenslutekn
+        manage_custom_emojis_description: Loyvir brúkarum at stýra sergjørdum kensluteknum á ambætaranum
+        manage_federation: Stýra sameindum
+        manage_federation_description: Loyvir brúkarum at blokera ella loyva sameining við onnur navnaøki og at stýra, hvat kann veitast
+        manage_invites: Stýra innbjóðingum
+        manage_invites_description: Loyvir brúkarum at kaga ígjøgnum og at gera innbjóðingarleinki óvirkin
+        manage_reports: Stýra meldigum
+        manage_reports_description: Loyvir brúkarum at eftirkanna meldingar og at gjøgnumføra umsjónaratgerðir
+        manage_roles: Stýra leiklutir
+        manage_roles_description: Loyvir brúkarum at stýra og áseta leiklutir undir teirra leikluti
+        manage_rules: Stýra reglum
+        manage_rules_description: Loyvir brúkarum at broyta ambætarareglur
+        manage_settings: Stýra stillingum
+        manage_settings_description: Loyvir brúkarum at broyta heimasíðustillingar
+        manage_taxonomies: Stýra flokkingum
+        manage_taxonomies_description: Loyvir brúkarum at eftirkanna vælumtókt tilfar og at dagføra stillingar viðvíkjandi frámerkjum
+        manage_user_access: Stýr brúkaraatgongd
+        manage_user_access_description: Loyvir brúkarum at gera 'váttan í tveimum stigum' (2FA) hjá øðrum brúkarum óvirkna, at broyta teirra teldupost og at nullstilla teirra loyniorð
+        manage_users: Stýr brúkarum
+        manage_users_description: Loyvir brúkarum at vísa smálutir um aðrar brúkarar og at gjøgnumføra umsjónaratgerðir móti teimum
+        manage_webhooks: Stýr webhooks
+        manage_webhooks_description: Loyvir brúkarum at seta upp webhooks fyri umsitingarligar hendingar
+        view_audit_log: Vís skoðanarlogg
+        view_audit_log_description: Loyvir brúkarum at síggja, hvørjar umsitingarligar atgerðir hava verið gjørdar á ambætaranum
+        view_dashboard: Vís kunningarbretti
+        view_dashboard_description: Gevur brúkarum atgongd til kunningarbrettið og ymisk mát
+        view_devops: DevOps
+        view_devops_description: Gevur brúkarum atgongd til Sidekiq- og pgHero-kunningarbretti
+      title: Leiklutir
+    rules:
+      add_new: Ger nýggja reglu
+      delete: Strika
+      description_html: Sjálvt um tey flestu vilja vera við, at tey hava lisið og tikið undir við tænastutreytunum, so lesa tey flestu tær ikki fyrr enn eftir at ein trupulleiki stingur seg upp. <strong>Ger tað lættari at skimma ígjøgnum ambætarareglurnar við at veita tær í einum fløtum punkt-lista.</strong> Royn at gera einstøku reglurnar stuttar og einfaldar, samstundis sum at tær ikki blíva pettaðar ov nógv sundur.
+      edit: Broyt reglur
+      empty: Ongar ambætarareglur eru ásettar enn.
+      title: Ambætarareglur
+    settings:
+      about:
+        manage_rules: Stýr ambætarareglum
+        preamble: Gev útdýpandi upplýsingar um, hvussu ambætarin er rikin, umsýndur og fíggjaður.
+        rules_hint: Eitt øki er burturav fyri reglur, sum brúkararnir hjá tær skulu fylgja.
+        title: Um
+      appearance:
+        preamble: Tillaga brúkaramarkamótið hjá Mastodon.
+        title: Útsjónd
+      branding:
+        preamble: Brandingin av tínum ambætara skilir hann út frá øðrum ambætarum í netverkinum. Hesar upplýsingar kunnu vera vístar í nógvum ymiskum umhvørvum, so sum í vev-markamótinum hjá Mastodon, uppruna-appum, í undanvísingum av leinkjum á øðrum vevstøðum, í boðs-appum og so framvegis. Av hesi orsøk er tað best, um hesar upplýsingar eru klárar, stuttar og beinraknar.
+        title: Branding
+      content_retention:
+        preamble: Stýr hvussu brúkara-skapt tilfar er goymt í Mastodon.
+        title: Varðveitsla av tilfari
+      default_noindex:
+        desc_html: Hevur ávirkan á allar brúkarar, sum ikki hava broytt hesa stillingina sjálvi
+        title: Tekur brúkarar úr leitimaskinu-indeksering, um ikki annað er valt
+      discovery:
+        follow_recommendations: Tilmæli um at fylgja
+        preamble: At fáa áhugavert innihald í ljósmála er avgerandi fyri at nýggir brúkarar, sum kanska ongan kenna á Mastodon, kunnu koma væl umborð. Stýr, hvussu hentleikarnir at uppdaga ymiskt rigga á ambætaranum hjá tær.
+        profile_directory: Vangaskrá
+        public_timelines: Almennar tíðarlinjur
+        title: Uppdaging
+        trends: Rák
+      domain_blocks:
+        all: Til øll
+        disabled: Til ongan
+        users: Fyri lokalum brúkarum, sum eru ritaðir inn
+      registrations:
+        preamble: Stýr, hvør kann stovna eina kontu á tínum ambætara.
+        title: Skrásetingar
+      registrations_mode:
+        modes:
+          approved: Góðkenning kravd fyri tilmelding
+          none: Eingin kann tilmelda seg
+          open: Øll kunnu tilmelda seg
+      title: Ambætarastillingar
+    site_uploads:
+      delete: Strika fílu, sum er løgd upp
+      destroyed_msg: Vevstaðs-uppsending strikað!
+    statuses:
+      account: Høvundi
+      application: Nýtsluskipan
+      back_to_account: Aftur til kontusíðu
+      back_to_report: Aftur til meldingarsíðu
+      batch:
+        remove_from_report: Strika frá melding
+        report: Melding
+      deleted: Strikað
+      favourites: Yndispostar
+      history: Útgávusøga
+      in_reply_to: Svarar
+      language: Mál
+      media:
+        title: Miðlar
+      metadata: Metadátur
+      no_status_selected: Eingir postar vóru broyttir, tí eingir vóru valdir
+      open: Lat post upp
+      original_status: Upprunapostur
+      reblogs: Endurbloggar
+      status_changed: Postur broyttur
+      title: Postar hjá kontu
+      trending: Vælumtókt
+      visibility: Sýni
+      with_media: Við miðli
+    strikes:
+      actions:
+        delete_statuses: "%{name} strikaði postarnar hjá %{target}"
+        disable: "%{name} frysti kontuna hjá %{target}"
+        mark_statuses_as_sensitive: "%{name} merkti kontuna hjá %{target} sum viðkvæma"
+        none: "%{name} sendi eina ávaring til %{target}"
+        sensitive: "%{name} merkti kontuna hjá %{target} sum viðkvæma"
+        silence: "%{name} avmarkaði kontuna hjá %{target}"
+        suspend: "%{name} setti kontuna hjá %{target} úr gildi"
+      appeal_approved: Kært
+      appeal_pending: Kæra bíðar eftir avgerð
+    system_checks:
+      database_schema_check:
+        message_html: Dátugrunnaflytingar bíða. Vinarliga koyr flytingarnar fyri at tryggja at skipanin skikkar sær sum hon skal
+      elasticsearch_running_check:
+        message_html: Fekk ikki samband við Elasticsearch. Vinarliga kanna eftir, at tað koyrir, ella ger fulltekstaleiting óvirkna
+      elasticsearch_version_check:
+        message_html: 'Elasticsearch útgávan er ikki sambær: %{value}'
+        version_comparison: Elasticsearch %{running_version} koyrir, men %{required_version} er kravd
+      rules_check:
+        action: Stýr ambætarareglum
+        message_html: Tú hevur ikki ásett nakrar ambætarareglur.
+      sidekiq_process_check:
+        message_html: Eingin Sidekiq gongd koyrir fyri %{value} bíðirøðina(r). Vinarliga eftirkanna Sidekiq uppsetingina
+    tags:
+      review: Eftirkanna støðu
+      updated_msg: Frámerkjastillingar dagførdar
+    title: Umsiting
+    trends:
+      allow: Loyv
+      approved: Váttað
+      disallow: Tak loyvi aftur
+      links:
+        allow: Loyv leinki
+        allow_provider: Loyv útgevara
+        description_html: Hesi leinkini verða í løtuni deild nógv av kontum, sum ambætarin sær postar hjá. At síggja leinkini kann hjálpa brúkarum at finna útav, hvat hendir í verðini. Eingi leinki verða víst alment, áðrenn tú góðkennir útgevaran. Tú kanst eisini loyva ella vraka einstøk leinki.
+        disallow: Loyv ikki leinki
+        disallow_provider: Loyv ikki útgevara
+        no_link_selected: Eingi leinki vóru broytt, tí eingi vóru vald
+        publishers:
+          no_publisher_selected: Eingir útgevar vóru broyttir, tí eingir vóru valdir
+        shared_by_over_week:
+          one: Deilt av einum persóni seinastu vikuna
+          other: Deilt av %{count} persónum seinastu vikuna
+        title: Vælumtókt leinki
+        usage_comparison: Deilt %{today} ferð í dag, samanborið við %{yesterday} ferð í gjár
+      only_allowed: Einans loyvd
+      pending_review: Bíðar eftir eftirkannan
+      preview_card_providers:
+        allowed: Leinki frá hesum útgevaranum kann gerast vísast sum vælumtókt
+        description_html: Hesi eru navnaøkini haðani leinki ofta eru deild á tínum ambætara. Leinki verða ikki víst sum vælumtókt fyri almenninginum uttan so at navnaøkið hjá leinkinum er góðkent. Tín góðkenning (ella vraking) fevnir eisini um undirnavnaøki.
+        rejected: Leinki frá hesum útgevaranum kunnu ikki vísast sum vælumtókt
+        title: Útgevar
+      rejected: Vrakað
+      statuses:
+        allow: Loyv posti
+        allow_account: Loyv høvundi
+        description_html: Hetta eru postar, sum tín ambætari veit um og sum í løtuni vera deildir og dámaðir ofta. At vísa teir kann hjálpa nýggjum og afturvendandi brúkarum at finna fleiri fólk, sum tey vilja fylgja. Eingir postar verða vístir almenninginum, áðrenn tú góðkennir høvundin, og høvundurin loyvir teirra kontu at vera skotin upp fyri øðrum. Tú kanst eisini góðkenna ella vraka einstakar postar.
+        disallow: Vraka post
+        disallow_account: Vraka høvund
+        no_status_selected: Eingir vælumtóktir postar vóru broyttir, tí eingir vóru valdir
+        not_discoverable: Høvundurin hevur ikki valt at blíva funnin
+        shared_by:
+          one: Deildir ella dámaðir eina ferð
+          other: Deildir ella dámaðir %{friendly_count} ferð
+        title: Vælumtóktir postar
+      tags:
+        current_score: Verandi stigatal %{score}
+        dashboard:
+          tag_accounts_measure: ymisk brúk
+          tag_languages_dimension: Mest nýttu mál
+          tag_servers_dimension: Mest nýttu ambætarar
+          tag_servers_measure: aðrir ambætarar
+          tag_uses_measure: samanlagt brúkstal
+        description_html: Hesi eru frámerkini, sum í løtuni eru á eini rúgvu av postum, sum ambætarin hjá tær sær. Hetta kann hjálpa tínum brúkarum at finna útav, hvat fólk tosa mest um í løtuni. Eingi frámerki verða løgd alment út, fyrr enn tú hevur góðkent tey.
+        listable: Kann skjótast upp
+        no_tag_selected: Eingi frámerki vóru broytt, tí eingi vóru vald
+        not_listable: Fer ikki at vera skotið upp
+        not_trendable: Fer ikki at síggjast undir ráki
+        not_usable: Kann ikki brúkast
+        peaked_on_and_decaying: Kom í hæddina %{date}, men er í minking nú
+        title: Vælumtókt frámerki
+        trendable: Kann síggjast undir ráki
+        trending_rank: 'Rák #%{rank}'
+        usable: Kann verða brúkt
+        usage_comparison: Brúkt %{today} ferð í dag, samanborið við %{yesterday} ferð í gjár
+        used_by_over_week:
+          one: Brúkt av einum brúkara seinastu vikuna
+          other: Brúkt av %{count} brúkarum seinastu vikuna
+      title: Rák
+      trending: Vælumtókt
+    warning_presets:
+      add_new: Legg afturat
+      delete: Strika
+      edit_preset: Rætta ávaringar-undanstilling
+      empty: Tú hevur ikki ásett nakrar ávaringar-undanstillingar enn.
+      title: Stýr ávaringar-undanstillingar
+    webhooks:
+      add_new: Legg endapunkt afturat
+      delete: Strika
+      description_html: Ein <strong>webhook/vevkrókur</strong> ger tað møguligt hjá Mastodon at trýsta <strong>samtíðarfráboðanir</strong> um valdar hendingar til tína egnu nýtsluskipan, soleiðis at hon <strong>sjálvvirkandi kann birta í aftursvar</strong>.
+      disable: Ger óvirkið
+      disabled: Óvirkið
+      edit: Rætta endapunkt
+      empty: Tú hevur ikki uppsett nøkur webhook/vevhúka-endapunkt enn.
+      enable: Set í gildi
+      enabled: Virkin
+      enabled_events:
+        one: 1 virkin hending
+        other: "%{count} virknar hendingar"
+      events: Hendingar
+      new: Nýggjur webhook/vevhúkur
+      rotate_secret: Rotera loynidóm
+      secret: Undirskrivingarloynidómur
+      status: Støða
+      title: Webhooks/vevhúkar
+      webhook: Webhook/vevhúkur
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: at strika teirra postar
+        disable: at frysta teirra kontu
+        mark_statuses_as_sensitive: at merkja teirra postar sum viðkvæmar
+        none: ein ávaring
+        sensitive: at merkja teirra kontu sum viðkvom
+        silence: at avmarka teirra kontu
+        suspend: at ógilda teirra kontu
+      body: "%{target} kærir eina umsjónaravgerð hjá %{action_taken_by} frá %{date}, sum var %{type}. Tey skrivaðu:"
+      next_steps: Tú kanst góðtaka kæruna og soleiðis ógilda umsjónaravgerðina, ella ikki látast at síggja hana.
+      subject: "%{username} kærir eina umsjónaravgerð á %{instance}"
+    new_pending_account:
+      body: Smálutirnir hjá tí nýggju kontuni eru niðanfyri. Tú kanst góðkenna ella vraka hesa umsóknina.
+      subject: Nýggj konta klár til ummælis á %{instance} (%{username})
+    new_report:
+      body: "%{reporter} hevur meldað %{target}"
+      body_remote: Onkur frá %{domain} hevur meldað %{target}
+      subject: Nýggj melding fyri %{instance} (#%{id})
+    new_trends:
+      body: 'Niðanfyristandandi lutir mugu eftirhyggjast áðrenn teir kunnu verða vístir alment:'
+      new_trending_links:
+        title: Vælumtókt leinki
+      new_trending_statuses:
+        title: Vælumtóktir postar
+      new_trending_tags:
+        no_approved_tags: Í løtuni eru eingi góðkend vælumtókt frámerki.
+        requirements: 'Einhvør av hesum kandidatum kunnu fara framum #%{rank} góðkenda vælumtókta frámerki, sum í løtuni er #%{lowest_tag_name} við stigatali %{lowest_tag_score}.'
+        title: Vælumtókt frámerki
+      subject: Nýggj rák til gjøgnumgongd á %{instance}
+  aliases:
+    add_new: Stovna tøkuheiti
+    created_msg: Nýtt tøkuheiti stovnað. Tú kanst nú byrja flytingina frá gomlu kontuni.
+    deleted_msg: Tøkuheitið strikað. At flyta frá hasi kontuni til hesa er ikki longur gjørligt.
+    empty: Tú hevur eingi tøkuheiti.
+    hint_html: Ynskir tú at flyta frá eini aðrari kontu til hesa, so kanst tú stovna eitt tøkuheiti her. Tað er kravt, áðrenn tú kanst fara í gongd við at flyta fylgjarar frá gomlu kontuni til hesa. Hendan atgerðin er í sær sjálvum <strong>meinaleys og kann angrast</strong>. <strong>Flytingin av kontuni verður sett í gongd frá gomlu kontuni</strong>.
+    remove: Strika tilknýti til tøkuheiti
+  appearance:
+    advanced_web_interface: Framkomið vevmarkamót
+    advanced_web_interface_hint: 'Ynskir tú at brúka alla skermbreiddina, so loyvir framkomna vevmarkamóti tær at uppseta fleiri ymiskar teigar, soleiðis at tú kanst síggja so nógvar upplýsingar, sum tú ynskir, samstundis: Heima, fráboðanir, sameind tíðarlinja og óavmarkað tal av listum og frámerkjum.'
+    animations_and_accessibility: Teknimyndagerð og atkomuligheit
+    confirmation_dialogs: Váttanarskermmyndir
+    discovery: Uppdaging
+    localization:
+      body: Mastodon er umsett av sjálvbodnum.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Øll kunnu geva íkast.
+    sensitive_content: Viðkvæmt innihald
+    toot_layout: Uppseting av postum
+  application_mailer:
+    notification_preferences: Broyt teldupostastillingar
+    salutation: "%{name}"
+    settings: 'Broyt teldupostastillingar: %{link}'
+    view: 'Vís:'
+    view_profile: Vís vanga
+    view_status: Vís post
+  applications:
+    created: Umsókn stovnað
+    destroyed: Umsókn strikað
+    regenerate_token: Ger atgongdstekn av nýggjum
+    token_regenerated: Atgongdsteknið gjørt av nýggjum
+    warning: Ver varin við hesum dátum. Deil tað aldrin við nakran!
+    your_token: Títt atgongdstekn
+  auth:
+    apply_for_account: Bið um eina kontu
+    change_password: Loyniorð
+    delete_account: Strika kontu
+    delete_account_html: Ynskir tú at strika kontuna, so kanst tú <a href="%{path}">halda fram her</a>. Tú verður spurd/ur um váttan.
+    description:
+      prefix_invited_by_user: "@%{name} bjóðar tær at verða við í hesum Mastodon-ambætaranum!"
+      prefix_sign_up: Tilmelda teg á Mastodon í dag!
+      suffix: Við eini kontu, so er møguligt hjá tær at fylgja fólki, at posta dagføringar og at senda og móttaka boð til og frá brúkarum á øllum Mastodon ambætarum, umframt annað!
+    didnt_get_confirmation: Móttók tú ikki váttanarboðini?
+    dont_have_your_security_key: Hevur tú ikki trygdarlyklin hjá tær?
+    forgot_password: Hevur tú gloymt loyniorðið?
+    invalid_reset_password_token: Teknið til nullstilling av loyniorði er ógyldugt ella útgingið. Vinarliga bið um eitt nýtt.
+    link_to_otp: Skriva eina tvey-stigs kodu frá telefonini ella eina kodu til endurgerð
+    link_to_webauth: Brúka títt trygdarlyklatól
+    log_in_with: Innrita við
+    login: Innrita
+    logout: Rita út
+    migrate_account: Flyt til eina aðra kontu
+    migrate_account_html: Ynskir tú at víðaribeina hesa kontuna til eina aðra, so kanst tú <a href="%{path}">seta tað upp her</a>.
+    or_log_in_with: Ella innrita við
+    privacy_policy_agreement_html: Eg havi lisið og taki undir við <a href="%{privacy_policy_path}" target="_blank">privatlívspolitikkinum</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Tilmelda
+    registration_closed: "%{instance} tekur ikki ímóti nýggjum limum"
+    resend_confirmation: Send góðkenningarvegleiðing umaftur
+    reset_password: Endurstilla loyniorð
+    rules:
+      preamble: Hesi eru ásett og uppihildin av umsjónarfólkunum á %{domain}.
+      title: Nakrar grundreglur.
+    security: Trygd
+    set_new_password: Áset nýtt loyniorð
+    setup:
+      email_below_hint_html: Er telduposturin niðanfyri skeivur, so kanst tú broyta hann her og móttaka eitt nýtt váttanarteldubræv.
+      email_settings_hint_html: Váttanarteldubrævið varð sent til %{email}. Um telduposturin er skeivur, so kanst tú broyta hann í kontustillingunum.
+      title: Uppseting
+    sign_in:
+      preamble_html: Rita inn við tínum <strong>%{domain}</strong> heimildum. Er konta tín á einum øðrum ambætara, so er ikki gjørligt hjá tær at rita inn her.
+      title: Rita inn á %{domain}
+    sign_up:
+      preamble: Við eini kontu á hesum Mastodon ambætaranum ber til hjá tær at fylgja ein og hvønn annan persón á netverkinum, óansæð hvar teirra konta er hýst.
+      title: Latum okkum fáa teg settan upp á %{domain}.
+    status:
+      account_status: Kontustøða
+      confirming: Bíði eftir at teldupostváttanin er gjøgnumførd.
+      functional: Konta tín er fult virkin.
+      pending: Umsókn tín verður eftirkannað av okkara starvsfeløgum. Tað kann taka eina løtu. Tú móttekur eitt teldubræv, um umsóknin er góðkend.
+      redirecting_to: Konta tín er óvirkin, tí í løtuni verður hon víðaribeind til %{acct}.
+      view_strikes: Vís eldri atsóknir móti tíni kontu
+    too_fast: Oyðublaðið innsent ov skjótt, royn aftur.
+    use_security_key: Brúka trygdarlykil
+  authorize_follow:
+    already_following: Tú fylgir longu hesi kontuni
+    already_requested: Tú hevur longu sent eina fylgiumbøn til hasa kontuna
+    error: Tíverri kom ein feilur, tá vit royndu at finna fjarkontuna
+    follow: Fylg
+    follow_request: 'Tú hevur sent eina fylgjaraumbøn til:'
+    following: 'Góðkent! Tú fylgir nú:'
+    post_follow:
+      close: Ella kanst tú bara lata hetta vindeygað aftur.
+      return: Vís vangan hjá brúkaranum
+      web: Far á vevið
+    title: Fylg %{acct}
+  challenge:
+    confirm: Hald á
+    hint_html: "<strong>Góð ráð:</strong> vit spyrja teg ikki aftur um loyniorðið næsta tíman."
+    invalid_password: Skeivt loyniorð
+    prompt: Vátta loyniorð fyri at halda fram
+  crypto:
+    errors:
+      invalid_key: er ikki ein gildur Ed25519 ella Curve25519 lykil
+      invalid_signature: er ikki ein gildug Ed25519 undirskrift
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}t"
+      about_x_months: "%{count} mðr"
+      about_x_years: "%{count} ár"
+      almost_x_years: "%{count} ár"
+      half_a_minute: Júst nú
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Júst nú
+      over_x_years: "%{count} ár"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count} mðr"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: Upplýsingin, sum tú las inn, var ikki røtt
+    confirm_password: Skriva títt núverandi loyniorð fyri at vátta tín samleika
+    confirm_username: Skriva títt brúkranavn fyri at vátta mannagongdina
+    proceed: Strika kontu
+    success_msg: Konta tín var strikað
+    warning:
+      before: 'Áðrenn tú heldur fram, vinarliga les hesar notur nágreiniliga:'
+      caches: Innihald, sum er lagt í goymslu á øðrum ambætarum, kann vera varandi har
+      data_removal: Postar tínir og aðrar dátur verða burturbeind varandi
+      email_change_html: Tú kann <a href="%{path}">broyta tín teldupost</a> uttan at strika tína kontu
+      email_contact_html: Um tað framvegis ikki kemur vegin fram, so kanst tú senda teldubræv til <a href="mailto:%{email}">%{email}</a> og biðja um hjálp
+      email_reconfirmation_html: Móttekur tú ikki váttanarteldupostin, so kanst tú <a href="%{path}">biðja um hann aftur</a>
+      irreversible: Tað verður ikki møguligt hjá tær at endurskapa ella gera kontu tína virkna aftur
+      more_details_html: Fyri fleiri smálutir, sí <a href="%{terms_path}">privatlívpolitikkin</a>.
+      username_available: Brúkaranavnið hjá tær verður tøkt aftur
+      username_unavailable: Brúkaranavnið hjá tær verður framhaldandi ikki tøkt
+  disputes:
+    strikes:
+      action_taken: Tiknar atgerðir
+      appeal: Kæra
+      appeal_approved: Kæran móti atsóknini eydnaðist og atsóknin er tí ikki longur í gildi
+      appeal_rejected: Kæran er vrakað
+      appeal_submitted_at: Kæra send inn
+      appealed_msg: Kæran hjá tær er send inn. Verður hon góðkend, so fær tú boð.
+      appeals:
+        submit: Send kæru
+      approve_appeal: Góðkenn kæru
+      associated_report: Atknýtt melding
+      created_at: Dagfest
+      description_html: Hetta er atgerðirnar, sum eru tiknar móti kontu tíni og ávaringar, sum eru sendar tær av starvsfólkunum hjá %{instance}.
+      recipient: Adresserað
+      reject_appeal: Vraka kæru
+      status: 'Postur #%{id}'
+      status_removed: Postur longu strikaður í skipanini
+      title: "%{action} frá %{date}"
+      title_actions:
+        delete_statuses: Striking av posti
+        disable: Frysting av kontu
+        mark_statuses_as_sensitive: Merk postar sum viðkvæmar
+        none: Ávaring
+        sensitive: Merking av kontu sum viðkvom
+        silence: Avmarking av kontu
+        suspend: Seta kontu úr gildi
+      your_appeal_approved: Kæra tín er góðkend
+      your_appeal_pending: Tú hevur kært
+      your_appeal_rejected: Kæra tín er vrakað
+  domain_validator:
+    invalid_domain: er ikki eitt loyvt økisnavn
+  errors:
+    '400': Umbønin, sum tú sendi inn, var ógildug ella hevði skeivt skap.
+    '403': Tú hevur ikki loyvi at síggja hesa síðuna.
+    '404': Síðan, sum tú leitar eftir, er ikki her.
+    '406': Síðan er ikki tøk í umbidnu útgávuni.
+    '410': Síðan, sum tú leitaði eftir, finst ikki her longur.
+    '422':
+      content: Trygdarsannanin miseydnaðist. Blokerar tú farspor?
+      title: Trygdarsannanin miseydnaðist
+    '429': Ov nógvir fyrispurningar
+    '500':
+      content: Vit eru kedd av tí, men okkurt gekk galið hjá okkum.
+      title: Hendan síðan er ikki røtt
+    '503': Ikki var til at veita hesa síðuna vegna ein bráðfeingis feil á ambætaranum.
+    noscript_html: Fyri at brúka vevskipanina hjá Mastodon, vinarliga ger JavaScript virkið. Um ikki, royn so eina <a href="%{apps_path}">uppruna-app</a> til Mastodon á tínum tøkniliga palli.
+  existing_username_validator:
+    not_found: eydnaðist ikki at finna ein lokalan brúkara við hasum brúkaranavninum
+    not_found_multiple: fann ikki %{usernames}
+  exports:
+    archive_takeout:
+      date: Dagfesting
+      download: Takk títt savn niður
+      hint_html: Tú kanst umbiðja eitt savn við <strong>tínum postum og miðlafílum, sum tú hevur lagt upp</strong>. Útfluttu dáturnar eru í ActivityPub útsjónd og lesiligar av einum og hvørjum sambærum ritbúnaði. Tú kanst biðja um eitt savn sjeynda hvønn dag.
+      in_progress: Geri eina skrá við savni tínum...
+      request: Umbið títt savn
+      size: Stødd
+    blocks: Tú blokerar
+    bookmarks: Bókamerki
+    csv: CSV
+    domain_blocks: Navnaøkisblokeringar
+    lists: Listar
+    mutes: Tú doyvir
+    storage: Miðlagoymsla
+  featured_tags:
+    add_new: Legg afturat
+    errors:
+      limit: Tú hevur longu varpað loyvda talið av frámerkjum
+    hint_html: "<strong>Hvat eru varpaði frámerki?</strong> Tey verða víst sjónliga á almenna vanga tínum og loyva fólki at kaga gjøgnum tínar almennu postar, sum hava tey frámerkini. Tey eru serliga vælegnaði at fylgja við skapandi arbeiði ella langtíðarverkætlanum."
+  filters:
+    contexts:
+      account: Vangar
+      home: Heima og listar
+      notifications: Fráboðanir
+      public: Almennar tíðarlinjur
+      thread: Samrøður
+    edit:
+      add_keyword: Legg lyklaorð afturat
+      keywords: Lyklaorð
+      statuses: Stakir postar
+      statuses_hint_html: Filtrið verður brúkt til at velja stakar postar óansæð um postarnir sampakka við lyklaorðini niðanfyri. <a href="%{path}">Eftirhygg ella tak postar úr filtrinum</a>.
+      title: Rætta filtur
+    errors:
+      deprecated_api_multiple_keywords: Bundnatølini kunnu ikki broytast frá hesi nýtsluskipanini, tí tey viðvíkja meira enn einum filtur-lyklaorði. Brúka eina nýggjari nýtsluskipan ella vevmarkamótið.
+      invalid_context: Eingin ella ógildugur kontekstur veittur
+    index:
+      contexts: Filtur í %{contexts}
+      delete: Strika
+      empty: Tú hevur eingi filtur.
+      expires_in: Gongur út um %{distance}
+      expires_on: Gongur út %{date}
+      keywords:
+        one: "%{count} lyklaorð"
+        other: "%{count} lyklaorð"
+      statuses:
+        one: "%{count} postur"
+        other: "%{count} postar"
+      statuses_long:
+        one: "%{count} stakur postur fjaldur"
+        other: "%{count} stakir postar fjaldir"
+      title: Filtur
+    new:
+      save: Goym nýtt filtur
+      title: Legg nýtt filtur afturat
+    statuses:
+      back_to_filter: Aftur til filtur
+      batch:
+        remove: Strika úr filtri
+      index:
+        hint: Hetta filtrið er galdandi fyri útvaldar stakar postar óansæð aðrar treytir. Tú kanst leggja fleiri postar afturat hesum filtrinum frá vevmarkamótinum.
+        title: Filtreraðir postar
+  footer:
+    trending_now: Rák beint nú
+  generic:
+    all: Alt
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> lutur á hesi síðuni er valdur."
+      other: All <strong>%{count}</strong> lutir á hesi síðuni eru valdir.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> lutur, sum samsvarar við tína leiting, er valdur."
+      other: Allir <strong>%{count}</strong> lutir, sum samsvara við tína leiting, eru valdir.
+    changes_saved_msg: Broytingar goymdar!
+    copy: Avrita
+    delete: Strika
+    deselect: Frável alt
+    none: Einki
+    order_by: Sortera eftir
+    save_changes: Goym broytingar
+    select_all_matching_items:
+      one: Vel %{count} lut sum samsvarar við tína leiting.
+      other: Vel allar %{count} lutir, sum samsvara við tína leiting.
+    today: í dag
+    validation_errors:
+      one: Okkurt er ikki heilt rætt enn! Vinarliga eftirhygg feilin niðanfyri
+      other: Okkurt er ikki heilt rætt enn! Vinarliga eftirhygg teir %{count} feilirnar niðanfyri
+  html_validator:
+    invalid_markup: 'inniheldur ógyldugt HTML markup: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Ógildug CSV-fíla. Error: %{error}'
+      over_rows_processing_limit: hevur fleiri enn %{count} rekkjur
+    modes:
+      merge: Flætta
+      merge_long: Varðveit verandi teigarøð og legg nýggjar afturat
+      overwrite: Skriva omaná
+      overwrite_long: Legg nýggj teigarøð inn fyri tey verandi
+    preface: Tú kanst innlesa dátur, sum tú hevur útlisið frá einum øðrum ambætara, so sum listar av fólki, sum tú fylgir ella blokerar.
+    success: Dátur tínar vóru lagdar upp og verða viðgjørdar, tá tíð er
+    types:
+      blocking: Blokeringslisti
+      bookmarks: Bókamerki
+      domain_blocking: Navnaøkisblokeringslisti
+      following: Fylgjaralisti
+      muting: Doyvingarlisti
+    upload: Legg upp
+  invites:
+    delete: Ger óvirkið
+    expired: Útgingið
+    expires_in:
+      '1800': 30 minuttir
+      '21600': 6 tímar
+      '3600': 1 tími
+      '43200': 12 tímar
+      '604800': 1 vika
+      '86400': 1 dag
+    expires_in_prompt: Ongantíð
+    generate: Ger innbjóðingarleinki
+    invited_by: 'Tú var bjóðað/ur av:'
+    max_uses:
+      one: 1 brúk
+      other: "%{count} brúk"
+    max_uses_prompt: Eingin avmarking
+    prompt: Ger og deil leinki við onnur fyri at geva atgongd til hendan ambætaran
+    table:
+      expires_at: Rennir út
+      uses: Brúk
+    title: Bjóða fólki
+  lists:
+    errors:
+      limit: Tú hevur rokkið mesta talið av listum
+  login_activities:
+    authentication_methods:
+      otp: app til váttan í tveimum stigum
+      password: loyniorð
+      sign_in_token: teldupostatrygdarkoda
+      webauthn: trygdarlyklar
+    description_html: Sært tú virksemi, sum tú ikki kennir aftur, so eigur tú at umhugsa at broyta loyniorðið ella at gera váttan í tveimum stigum virkna.
+    empty: Eingin samgildissøga tøk
+    failed_sign_in_html: Miseydnað innritanarroynd við %{method} frá %{ip} (%{browser})
+    successful_sign_in_html: Eydnað innritan við %{method} frá %{ip} (%{browser})
+    title: Samgildissøga
+  media_attachments:
+    validations:
+      images_and_video: Kann ikki viðfesta sjónfílu til ein post, sum longu inniheldur myndir
+      not_ready: Kann ikki viðfesta fílur, sum ikki eru liðugt viðgjørdar. Roynd aftur um eina løtu!
+      too_many: Kann ikki viðfest fleiri enn 4 fílur
+  migrations:
+    acct: Flutt til
+    cancel: Strika víðaribeining
+    cancel_explanation: At strika víðaribeining ger núverandi kontu tína virkna aftur, men gevur tær ikki fylgjarar, ið eru fluttir til hina kontuna, aftur.
+    cancelled_msg: Strikaði víðaribeiningina.
+    errors:
+      already_moved: er tann sama kontan, sum tú longu er flutt/ur til
+      missing_also_known_as: er ikki eitt tøkuheiti fyri hesa kontuna
+      move_to_self: kann ikki vera núverandi kontan
+      not_found: bar ikki til at finna
+      on_cooldown: Tú verður køld/ur niður
+    followers_count: Fylgjarar tá flytingin fór fram
+    incoming_migrations: Flyti frá eini aðrari kontu
+    incoming_migrations_html: Fyri at flyta frá eini aðrari kontu til hesa, so er fyrst neyðugt at <a href="%{path}">stovna eitt tøkuheiti til kontuna</a>.
+    moved_msg: Konta tín verður nú víðaribeind til %{acct} og fylgjarar tínir verða fluttir yvir.
+    not_redirecting: Konta tín verður ikki víðaribeind til nakra aðra kontu í løtuni.
+    on_cooldown: Tú hevur nýliga flutt tína kontu. Hesin valmøguleikin verður tøkur aftur um %{count} dagar.
+    past_migrations: Eldri flytingar
+    proceed_with_move: Flyt fylgjarar
+    redirected_msg: Konta tín verður nú víðaribeind til %{acct}.
+    redirecting_to: Konta tín er víðaribeind til %{acct}.
+    set_redirect: Set víðaribeining
+    warning:
+      backreference_required: Fyrst má nýggja kontan vera sett til at vísa aftur til hesa
+      before: 'Áðrenn tú fer víðari, vinarliga les hetta gjølla:'
+      cooldown: Aftaná at tú hevur flutt, so er eitt tíðarskeið, har tú ikki sleppur at flyta aftur
+      disabled_account: Tín verandi konta verður ikki fult nýtilig aftaná. Tó so, tú hevur atgongd til at útlesa dátur og tú kanst gera kontuna virkna aftur.
+      followers: Hetta fer at flyta alla fylgjarar frá verandi kontuni til ta nýggju
+      only_redirect_html: Ein annar møguleiki er, at tú <a href="%{path}">setir eina víðaribeining upp á vanga tínum</a>.
+      other_data: Ongar aðrar dátur verða fluttar sjálvvirkandi
+      redirect: Vangin á tíni núverandi kontu verður dagførd við eini viðmerking um víðaribeining og tú verður ikki at finna í leitingum
+  moderation:
+    title: Umsjón
+  move_handler:
+    carry_blocks_over_text: Hesin brúkarin flutti frá %{acct}, sum tú hevði blokerað.
+    carry_mutes_over_text: Hesin brúkarin flutti frá %{acct}, sum tú hevði doyvt.
+    copy_account_note_text: 'Hesin brúkarin flutti frá %{acct}. Her eru tínar viðmerkingar um viðkomandi:'
+  navigation:
+    toggle_menu: Lat valmynd upp ella aftur
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} sendi eina melding"
+      sign_up:
+        subject: "%{name} meldaði seg til"
+    favourite:
+      body: "%{name} dámdi postin hjá tær:"
+      subject: "%{name} merkti postin hjá tær sum yndispost"
+      title: Nýggjur yndispostur
+    follow:
+      body: "%{name} fylgir tær nú!"
+      subject: "%{name} fylgir tær nú"
+      title: Nýggjur fylgjari
+    follow_request:
+      action: Stýr umbønum um at fylgja
+      body: "%{name} hevur biðið um at fylgja tær"
+      subject: 'Fylgjari, sum bíðar: %{name}'
+      title: Nýggj fylgjaraumbøn
+    mention:
+      action: Svar
+      body: 'Tú var umrødd/ur av %{name} í:'
+      subject: Tú var umrødd/ur av %{name}
+      title: Nýggj umrøða
+    poll:
+      subject: Ein spurnarkanning hjá %{name} er endað
+    reblog:
+      body: 'Postur tín var stimbraður av %{name}:'
+      subject: "%{name} stimbraði tín post"
+      title: Nýggj stimbran
+    status:
+      subject: "%{name} hevur júst postað"
+    update:
+      subject: "%{name} rættaði ein post"
+  notifications:
+    email_events: Hendingar fyri teldupostfráboðanir
+    email_events_hint: 'Vel hendingar, sum tú vil hava fráboðanir um:'
+    other_settings: Aðrar fráboðanarstillingar
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: mia
+          million: mió
+          quadrillion: kvd
+          thousand: tús
+          trillion: tri
+  otp_authentication:
+    code_hint: Innles koduna, sum var gjørd av samgildisappini, fyri at vátta
+    description_html: Ger tú <strong>váttan í tveimum stigum</strong> virkna við eini váttanar-app, so er neyðugt at hava telefonina tøka, tá tú skal rita inn, tí appin ger tekin til tín at lesa inn.
+    enable: Set í gildi
+    instructions_html: "<strong>Skanna hesa QR koduna inn í Google Authenticator ella eina líknandi TOTP-app á telefonini hjá tær</strong>. Frá nú av, so fer tann appin at gera tekn, sum tú mást skriva, tá tú ritar inn."
+    manual_instructions: 'Ber ikki til hjá tær at skanna QR koduna og tað er neyðugt hjá tær at lesa hana inn við hond, so er loynidómurin í klárteksti her:'
+    setup: Set upp
+    wrong_code: Innlisna kodan var ógildug! Samsvara tíðirnar á ambætaranum og á tínum tóli?
+  pagination:
+    newer: Nýggjari
+    next: Næsta
+    older: Eldri
+    prev: Fyrra
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tú hevur longu atkvøtt í hesi atkvøðugreiðsluni
+      duplicate_options: inniheldur dupult-lutir
+      duration_too_long: er ov langt inni í framtíðini
+      duration_too_short: er ov tíðliga
+      expired: Atkvøðugreiðslan er longu endað
+      invalid_choice: Valmøguleikin finst ikki
+      over_character_limit: kann ikki vera longri enn %{max} tekn hvør
+      too_few_options: má hava meiri enn ein valmøguleika
+      too_many_options: kann ikki innihalda fleiri enn %{max} valmøguleikar
+  preferences:
+    other: Annað
+    posting_defaults: Postingarstillingar
+    public_timelines: Almennar tíðarlinjur
+  privacy_policy:
+    title: Privatlívspolitikkur
+  reactions:
+    errors:
+      limit_reached: Mark fyri ymisk aftursvar rokkið
+      unrecognized_emoji: er ikki eitt kenslutekn, sum kennist aftur
+  relationships:
+    activity: Kontuvirksemi
+    dormant: Í dvala
+    follow_selected_followers: Fylg valdu fylgjarum
+    followers: Fylgjarar
+    following: Fylgi
+    invited: Bjóðað
+    last_active: Seinast virkin
+    most_recent: Feskasta
+    moved: Flutti
+    mutual: Sínamillum
+    primary: Fyrst/ur
+    relationship: Samband
+    remove_selected_domains: Strika allar fylgjarar frá valdu navnaøkjunum
+    remove_selected_followers: Strika valdu fylgjarar
+    remove_selected_follows: Gevst at fylgja valdu brúkarar
+    status: Kontustøða
+  remote_follow:
+    missing_resource: Fann ikki kravda víðaribeinings-URL'in fyri tína kontu
+  reports:
+    errors:
+      invalid_rules: vísir ikki til gyldugar reglur
+  rss:
+    content_warning: 'Innihaldsávaring:'
+    descriptions:
+      account: Almennir postar frá @%{acct}
+      tag: 'Almennir postar við frámerkinum #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tú er komin at markinum, sum er %{limit} skrálagdir postar, í dag
+    over_total_limit: Tú er komin at markinum, sum er %{limit} skrálagdir postar
+    too_soon: Ætlanardagfestingin má vera í framtíðini
+  sessions:
+    activity: Seinasta virksemi
+    browser: Kagi
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Ókendur kagi
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Verandi seta
+    description: "%{browser} á %{platform}"
+    explanation: Hetta eru vevkagarnir, sum í løtuni eru ritaðir inn á tína Mastodon kontu.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: ókendur pallur
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Tak aftur
+    revoke_success: Setan tikin aftur
+    title: Setur
+    view_authentication_history: Sí samgildissøgu fyri tína kontu
+  settings:
+    account: Konta
+    account_settings: Kontustillingar
+    aliases: Tøkuheiti hjá kontuni
+    appearance: Útsjónd
+    authorized_apps: Góðkendar appir
+    back: Aftur til Mastodon
+    delete: Striking av kontu
+    development: Menning
+    edit_profile: Rætta vanga
+    export: Útflyt dátur
+    featured_tags: Varpaði frámerki
+    import: Innflyt
+    import_and_export: Innflyt og útflyt
+    migrate: Flyting av kontu
+    notifications: Fráboðanir
+    preferences: Sertokki
+    profile: Vangi
+    relationships: Fylging og fylgjarar
+    statuses_cleanup: Sjálvvirkandi striking av postum
+    strikes: Umsjónaratsóknir
+    two_factor_authentication: Váttan í tveimum stigum
+    webauthn_authentication: Trygdarlyklar
+  statuses:
+    attached:
+      audio:
+        one: "%{count} ljóð"
+        other: "%{count} ljóð"
+      description: 'Viðfest: %{attached}'
+      image:
+        one: "%{count} mynd"
+        other: "%{count} myndir"
+      video:
+        one: "%{count} sjónfíla"
+        other: "%{count} sjónfílur"
+    boosted_from_html: Stimbrað frá %{acct_link}
+    content_warning: 'Innihaldsávaring: %{warning}'
+    default_language: Sama sum markamótsmál
+    disallowed_hashtags:
+      one: 'innihelt eitt vrakað frámerki: %{tags}'
+      other: 'innihelt vrakaðu frámerkini: %{tags}'
+    edited_at_html: Rættað %{date}
+    errors:
+      in_reply_not_found: Posturin, sum tú roynir at svara, sýnist ikki at finnast.
+    open_in_web: Lat upp á vevinum
+    over_character_limit: mesta tal av teknum, %{max}, rokkið
+    pin_errors:
+      direct: Postar, sum einans eru sjónligir hjá nevndum brúkarum, kunnu ikki festast
+      limit: Tú hevur longu fest loyvda talið av postum
+      ownership: Postar hjá øðrum kunnu ikki festast
+      reblog: Ein stimbran kann ikki festast
+    poll:
+      total_people:
+        one: "%{count} fólk"
+        other: "%{count} fólk"
+      total_votes:
+        one: "%{count} atkvøða"
+        other: "%{count} atkvøður"
+      vote: Atkvøð
+    show_more: Vís meira
+    show_newer: Vís nýggjari
+    show_older: Vís eldri
+    show_thread: Vís tráð
+    sign_in_to_participate: Rita inn fyri at luttaka í samrøðuni
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      direct: Beinleiðis
+      private: Einans fylgjarar
+      private_long: Vís einans fyri fylgjarum
+      public: Alment
+      public_long: Øll kunnu síggja
+      unlisted: Ólistað
+      unlisted_long: Øll kunnu síggja, men ikki listað á almennum tíðarlinjum
+  statuses_cleanup:
+    enabled: Strika gamlar postar sjálvvirkandi
+    enabled_hint: Strikar postar tínar sjálvvirkandi, tá teir verða eldri enn eitt vist, uttan so at teir samsvara við eitt av undantøkunum niðanfyri
+    exceptions: Undantøk
+    explanation: Av tí at striking av postum er dýrt virksemi, so verður tað gjørt spakuliga yvir tíð, tá ambætarin annars ikki er upptikin. Tí kunnu postarnir hjá tær verða strikaðir eina løtu aftaná, at tíðarfreistin er rokkin.
+    ignore_favs: Sí burtur frá yndispostum
+    ignore_reblogs: Sí burtur frá stimbranum
+    interaction_exceptions: Undantøk grundað á samvirkni
+    interaction_exceptions_explanation: Legg til merkis, at eingin trygd er fyri at postar verða strikaðir, um teir fara undir mørkini fyri yndispostar ella stimbranir eftir at teir einaferð eru farnir uppum.
+    keep_direct: Varðveit beinleiðis boð
+    keep_direct_hint: Strikar ikki beinleiðis boð hjá tær
+    keep_media: Varðveit postar, sum hava viðheftar miðlafílur
+    keep_media_hint: Strikar ikki postar hjá tær, sum hava miðlafílur viðheftar
+    keep_pinned: Varðveit festar postar
+    keep_pinned_hint: Strikar ikki tínar festu postar
+    keep_polls: Varðveit atkvøðugreiðslur
+    keep_polls_hint: Strikar ikki tínar atkvøðugreiðslur
+    keep_self_bookmark: Varðveit postar, sum tú hevur bókamerkt
+    keep_self_bookmark_hint: Strikar ikki tínar egnu postar, um tú hevur bókamerkt teir
+    keep_self_fav: Varðveit postar, sum tú hevur yndismerkt
+    keep_self_fav_hint: Strikar ikki tínar egnu postar, um tú hevur yndismerkt teir
+    min_age:
+      '1209600': 2 vikur
+      '15778476': 6 mánaðir
+      '2629746': 1 mánaði
+      '31556952': 1 ár
+      '5259492': 2 mánaðir
+      '604800': 1 vika
+      '63113904': 2 ár
+      '7889238': 3 mánaðir
+    min_age_label: Tíðarfreist
+    min_favs: Varðveit postar yndismerktar í minsta lagi
+    min_favs_hint: Strikar ikki postar hjá tær, sum hava móttikið í minsta lagi hetta talið av yndismerkjum. Lat vera blankt, um postar skulu strikast óansæð, hvussu ofta teir eru yndismerktir
+    min_reblogs: Varðveit postar, sum eru stimbraðir í minsta lagi
+    min_reblogs_hint: Strikar ikki postar hjá tær, sum eru stimbraðir í minsta lagi so ofta. Lat vera blankt, um postar skulu strikast óansæð, hvussu ofta teir eru stimbraðir
+  stream_entries:
+    pinned: Festir postar
+    reblogged: stimbraður
+    sensitive_content: Viðkvæmt innihald
+  strikes:
+    errors:
+      too_late: Tað er ov seint at kæra hesa atsókn
+  tags:
+    does_not_match_previous_name: samsvarar ikki við undanfarna navnið
+  themes:
+    contrast: Mastodon (høgur kontrastur)
+    default: Mastodon (myrkt)
+    mastodon-light: Mastodon (ljóst)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Legg afturat
+    disable: Ger 2FA óvirkið
+    disabled_success: Váttan í tveimum stigum gjørd óvirkin
+    edit: Rætta
+    enabled: Váttan í tveimum stigum gjørd virkin
+    enabled_success: Váttan í tveimum stigum gjørd virkin
+    generate_recovery_codes: Ger kodur til endurgerð
+    lost_recovery_codes: Kodur til endurgerð loyva tær at fáa atgongd aftur til kontu tína, um tú missir telefonina burtur. Hevur tú mist endurgerðskodurnar, so kanst tú gera tær her. Gomlu kodurnar vera gjørdar óvirknar.
+    methods: Mannagongdir fyri váttan í tveimum stigum
+    otp: Authenticator app
+    recovery_codes: Tak trygdaravrit av kodum til endurgerð
+    recovery_codes_regenerated: Kodur til endurgerð gjørdar av nýggjum
+    recovery_instructions_html: Missir tú atgongd til telefonina, so kanst tú brúka eina av kodunum til endurgerð niðanfyri at fáa atgongd aftur til kontu tína. <strong>Goym kodurnar til endurgerð trygt</strong>. Til dømis kanst tú prenta tær og goyma tær saman við øðrum týdningarmiklum skjølum.
+    webauthn: Trygdarlyklar
+  user_mailer:
+    appeal_approved:
+      action: Far til kontu tína
+      explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er góðkend. Konta tín er aftur tignarlig.
+      subject: Kæra tín frá %{date} er góðkend
+      title: Kæra góðkend
+    appeal_rejected:
+      explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er vrakað.
+      subject: Kæra tín frá %{date} er vrakað
+      title: Kæra vrakað
+    backup_ready:
+      explanation: Tú bað um eitt fult trygdaravrit av tíni Mastodon kontu. Tað er nú klárt at taka niður!
+      subject: Savnið hjá tær er tøkt at taka niður
+      title: Tak savn niður
+    suspicious_sign_in:
+      change_password: broyt loyniorðið hjá tær
+      details: 'Her eru smálutirnir í innritanini:'
+      explanation: Vit hava lagt merki til, at innritað er á tína kontu frá einari nýggjari IP adressu.
+      further_actions_html: Var hetta ikki tú, so mæla vit til, at tú %{action} beinan vegin og at tú ger váttan í tveimum stigum virkna fyri at konta tín kann vera trygg.
+      subject: Atgongd er fingin til kontu tína frá eini nýggjari IP adressu
+      title: Ein nýggj innritan
+    warning:
+      appeal: Innsend eina kæru
+      appeal_description: Trýrt tú, at hetta er ein feilur, so kanst tú senda eina kæru til starvsfólkini á %{instance}.
+      categories:
+        spam: Ruskpostur
+        violation: Tilfarið er í stríð við fylgjandi leiðreglur
+      explanation:
+        delete_statuses: Summir av postum tínum eru staðfestir at vera í stríði við eina ella fleiri av leiðreglunum og eru tí strikaðir av umsjónarfólkunum á %{instance}.
+        disable: Tú kanst ikki longur brúka tína kontu, men vangi tín og aðrar dátur eru óskalað. Tú kanst biðja um trygdaravrit av tínum dátum, broyta kontustillingar ella strika tína kontu.
+        mark_statuses_as_sensitive: Summir av postum tínum eru merktir sum viðkvæmir av umsjónarfólkunum á %{instance}. Hetta merkir, at fólk mugu trýsta á miðilin í postinum, áðrenn ein undanvísing verður víst. Tú kanst sjálv/ur merkja miðlar viðkvæmar, tá tú postar í framtíðini.
+        sensitive: Frá nú av, so verða allar miðlafílur, sum tú leggur upp, merktar sum viðkvæmar og fjaldar aftan fyri eina ávarðing.
+        silence: Tú kanst framvegis brúka kontu tína, men einans fólk, sum longu fylgja tær, fara at síggja tínar postar á hesum ambætaranum, og tú kanst vera hildin uttanfyri ymiskar leitihentleikar. Tó so, onnur kunnu framvegis fylgja tær beinleiðis.
+        suspend: Tú kanst ikki longur brúka kontu tína og vangin og aðrar dátur eru ikki longur atkomulig. Tú kanst enn rita inn fyri at biðja um eitt trygdaravrit av tínum dátum, inntil dáturnar eru heilt burturbeindar um umleið 30 dagar, men vit varðveita nakrar grundleggjandi dátur fyri at forða tær í at støkka undan ógildingini.
+      reason: 'Grund:'
+      statuses: 'Siteraðir postar:'
+      subject:
+        delete_statuses: Postar tíni á %{acct} eru strikaðir
+        disable: Konta tín %{acct} er fryst
+        mark_statuses_as_sensitive: Postar tíni á %{acct} eru merktir sum viðkvæmir
+        none: Ávaring fyri %{acct}
+        sensitive: Tínir postar á %{acct} verða merktir viðkvæmir framyvir
+        silence: Konta tín %{acct} er avmarkað
+        suspend: Konta tín %{acct} er ógildað
+      title:
+        delete_statuses: Strikaðir postar
+        disable: Konta fryst
+        mark_statuses_as_sensitive: Postar merktir sum viðkvæmir
+        none: Ávaring
+        sensitive: Konto frámerkt sum viðvkæmur
+        silence: Kontoin er avmarkað
+        suspend: Konta ógildað
+    welcome:
+      edit_profile_action: Set upp vanga
+      edit_profile_step: Tú kanst tillaga vanga tín við at leggja eina vangamynd inn, broyta vísta navnið hjá tær og meira. Tú kanst velja at eftirkanna nýggjar fylgjarar, áðrenn teir sleppa at fylgja tær.
+      explanation: Her eru nøkur ráð so tú kann koma gott ígongd
+      final_action: Byrja at posta
+      final_step: 'Byrja at posta! Sjálvt uttan fylgjarar, so kunnu tínir almennu postar vera sæddir av øðrum, til dømis á lokalu tíðarlinjuni ella í frámerkjum. Kanska vilt tú greiða frá um teg sjálva/n við frámerkinum #introductions.'
+      full_handle: Fulla brúkaranavn títt
+      full_handle_hint: Hetta er tað, sum tú fortelur vinum tínum, soleiðis at tey kunnu senda tær boð ella fylgja tær frá einum øðrum ambætara.
+      subject: Vælkomin til Mastodon
+      title: Vælkomin umborð, %{name}!
+  users:
+    follow_limit_reached: Tú kanst ikki fylgja fleiri enn %{limit} fólk
+    invalid_otp_token: Ógyldug tvey-stigs koda
+    otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
+    seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
+    signed_in_as: 'Ritað/ur inn sum:'
+  verification:
+    explanation_html: 'Tú kanst <strong>vátta teg sjálva/n sum eigara av leinkjunum í metadátunum á vanganum hjá tær</strong>. Til tess má leinkjaða vevstaðið innihalda eitt leinki aftur til Mastodon vangan hjá tær. Leinkið <strong>má</strong> hava eina <code>rel="me"</code> viðseting. Tekstinnihaldið í leikinum er óviðkomandi. Her er eitt dømi:'
+    verification: Váttan
+  webauthn_credentials:
+    add: Legg nýggjan trygdarlykil afturat
+    create:
+      error: Ein trupulleiki var í sambandi við at trygdarlykilin bleiv lagdur afturat. Vinarliga royn aftur.
+      success: Trygdarlykilin hjá tær varð lagdur afturat.
+    delete: Strika
+    delete_confirmation: Er tú vís/ur í, at tú vil strika hendan trygdarlykilin?
+    description_html: Um tú ger <strong>váttan við trygdarlykli</strong> virkna, so fer innritan at krevja, at tú brúkar ein av trygdarlyklunum hjá tær.
+    destroy:
+      error: Ein trupulleiki var við at strika trygdarlykilin hjá tær. Vinarliga royn aftur.
+      success: Trygdarlykilin hjá tær varð strikaður.
+    invalid_credential: Ógyldugur trygdarlykil
+    nickname_hint: Skriva eyknevni á tínum nýggja trygdarlykli
+    not_enabled: Tú hevur ikki gjørt WebAuthn virkið enn
+    not_supported: Hesin kagin stuðlar ikki uppundir trygdarlyklar
+    otp_required: Fyri at brúka trygdarlyklar er neyðugt at gera váttan í tveimum stigum virkna fyrst.
+    registered_on: Skrásett %{date}
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
new file mode 100644
index 000000000..f3a6e0b4c
--- /dev/null
+++ b/config/locales/fr-QC.yml
@@ -0,0 +1,1666 @@
+---
+fr-QC:
+  about:
+    about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !'
+    contact_missing: Non défini
+    contact_unavailable: Non disponible
+    hosted_on: Serveur Mastodon hébergé sur %{domain}
+    title: À propos
+  accounts:
+    follow: Suivre
+    followers:
+      one: Abonné·e
+      other: Abonné·e·s
+    following: Abonnements
+    instance_actor_flash: Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un utilisateur individuel. Il est utilisé à des fins de fédération et ne doit pas être suspendu.
+    last_active: dernière activité
+    link_verified_on: La propriété de ce lien a été vérifiée le %{date}
+    nothing_here: Rien à voir ici !
+    pin_errors:
+      following: Vous devez être déjà abonné·e à la personne que vous désirez recommander
+    posts:
+      one: Message
+      other: Messages
+    posts_tab_heading: Messages
+  admin:
+    account_actions:
+      action: Effectuer l'action
+      title: Effectuer une action de modération sur %{acct}
+    account_moderation_notes:
+      create: Laisser une remarque
+      created_msg: Note de modération créée avec succès !
+      destroyed_msg: Note de modération supprimée avec succès !
+    accounts:
+      add_email_domain_block: Bloquer ce domaine de courriel
+      approve: Approuver
+      approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
+      are_you_sure: Voulez-vous vraiment faire ça ?
+      avatar: Avatar
+      by_domain: Domaine
+      change_email:
+        changed_msg: Courriel modifié avec succès !
+        current_email: Courriel actuel
+        label: Modifier le courriel
+        new_email: Nouveau courriel
+        submit: Modifier le courriel
+        title: Modifier le courriel pour %{username}
+      change_role:
+        changed_msg: Rôle modifié avec succès !
+        label: Modifier le rôle
+        no_role: Aucun rôle
+        title: Modifier le rôle de %{username}
+      confirm: Confirmer
+      confirmed: Confirmé
+      confirming: Confirmation
+      custom: Personnalisé
+      delete: Supprimer les données
+      deleted: Supprimé
+      demote: Rétrograder
+      destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
+      disable: Geler
+      disable_sign_in_token_auth: Désactiver l'authentification basée sur les jetons envoyés par courriel
+      disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
+      disabled: Gelé
+      display_name: Nom affiché
+      domain: Domaine
+      edit: Éditer
+      email: Courriel
+      email_status: État du courriel
+      enable: Dégeler
+      enable_sign_in_token_auth: Activer l'authentification basée sur les jetons envoyés par courriel
+      enabled: Activé
+      enabled_msg: Le compte de %{username} a été dégelé avec succès
+      followers: Abonné·e·s
+      follows: Abonnements
+      header: Entête
+      inbox_url: URL d’entrée
+      invite_request_text: Raisons de l’adhésion
+      invited_by: Invité par
+      ip: Adresse IP
+      joined: Inscrit·e depuis
+      location:
+        all: Tous
+        local: Local
+        remote: Distant
+        title: Situation
+      login_status: Statut de connexion
+      media_attachments: Fichiers médias
+      memorialize: Ériger en mémorial
+      memorialized: Compte érigé en mémorial
+      memorialized_msg: Transformation réussie de %{username} en un compte mémorial
+      moderation:
+        active: Actifs
+        all: Tous
+        pending: En cours de traitement
+        silenced: Limité
+        suspended: Suspendus
+        title: Modération
+      moderation_notes: Notes de modération
+      most_recent_activity: Dernière activité
+      most_recent_ip: Adresse IP la plus récente
+      no_account_selected: Aucun compte n’a été modifié, car aucun n’a été sélectionné
+      no_limits_imposed: Aucune limite imposée
+      no_role_assigned: Aucun rôle assigné
+      not_subscribed: Non abonné
+      pending: En attente d’approbation
+      perform_full_suspension: Suspendre
+      previous_strikes: Sanctions précédentes
+      previous_strikes_description_html:
+        one: Ce compte a reçu <strong>%{count}</strong> sanction.
+        other: Ce compte a reçu <strong>%{count}</strong> sanctions.
+      promote: Promouvoir
+      protocol: Protocole
+      public: Publique
+      push_subscription_expires: Expiration de l’abonnement PuSH
+      redownload: Rafraîchir le profil
+      redownloaded_msg: Le profil de %{username} a été actualisé avec succès depuis l’origine
+      reject: Rejeter
+      rejected_msg: La demande d’inscription de %{username} a été rejetée avec succès
+      remote_suspension_irreversible: Les données de ce compte ont été supprimées définitivement.
+      remote_suspension_reversible_hint_html: Ce compte a été suspendu par son serveur d'accueil, et les données rattachées seront supprimées le %{date}. Jusqu'à cette date, il peut être restauré sans aucune perte par le serveur distant. Si vous souhaitez supprimer immédiatement toutes les données de ce compte, vous pouvez le faire ci-dessous.
+      remove_avatar: Supprimer l’avatar
+      remove_header: Supprimer l’entête
+      removed_avatar_msg: L’avatar de %{username} a été supprimé avec succès
+      removed_header_msg: L’image d’en-tête de %{username} a été supprimée avec succès
+      resend_confirmation:
+        already_confirmed: Cet·te utilisateur·rice est déjà confirmé·e
+        send: Renvoyer un courriel de confirmation
+        success: Courriel de confirmation envoyé avec succès !
+      reset: Réinitialiser
+      reset_password: Réinitialiser le mot de passe
+      resubscribe: Se réabonner
+      role: Rôle
+      search: Rechercher
+      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
+      search_same_ip: Autres utilisateur·rice·s avec la même IP
+      security_measures:
+        only_password: Mot de passe uniquement
+        password_and_2fa: Mot de passe et 2FA
+      sensitive: Sensible
+      sensitized: marqué comme sensible
+      shared_inbox_url: URL de la boite de réception partagée
+      show:
+        created_reports: Signalements faits
+        targeted_reports: Signalés par d’autres
+      silence: Limiter
+      silenced: Limité
+      statuses: Messages
+      strikes: Punitions précédentes
+      subscribe: S’abonner
+      suspend: Suspendre
+      suspended: Suspendu
+      suspension_irreversible: Les données de ce compte ont été irréversiblement supprimées. Vous pouvez annuler la suspension du compte pour le rendre utilisable, mais il ne récupérera aucune donnée qu’il avait auparavant.
+      suspension_reversible_hint_html: Le compte a été suspendu et les données seront complètement supprimées le %{date}. D’ici là, le compte peut être restauré sans aucun effet néfaste. Si vous souhaitez supprimer toutes les données du compte immédiatement, vous pouvez le faire ci-dessous.
+      title: Comptes
+      unblock_email: Débloquer l'adresse courriel
+      unblocked_email_msg: L'adresse courriel de %{username} a été débloquée avec succès
+      unconfirmed_email: Courriel non confirmé
+      undo_sensitized: Annuler sensible
+      undo_silenced: Annuler la limitation
+      undo_suspension: Annuler la suspension
+      unsilenced_msg: La limitation du compte de %{username} a été annulée avec succès
+      unsubscribe: Se désabonner
+      unsuspended_msg: Le compte de %{username} a été réactivé avec succès
+      username: Nom d’utilisateur·ice
+      view_domain: Voir le résumé du domaine
+      warn: Avertissement
+      web: Web
+      whitelisted: Sur liste blanche
+    action_logs:
+      action_types:
+        approve_appeal: Approuver l'appel
+        approve_user: Approuver l’utilisateur
+        assigned_to_self_report: Affecter le signalement
+        change_email_user: Modifier le courriel pour ce compte
+        change_role_user: Changer le rôle de l’utilisateur·rice
+        confirm_user: Confirmer l’utilisateur
+        create_account_warning: Créer une alerte
+        create_announcement: Créer une annonce
+        create_canonical_email_block: Créer un blocage de domaine de courriel
+        create_custom_emoji: Créer des émojis personnalisés
+        create_domain_allow: Créer un domaine autorisé
+        create_domain_block: Créer un blocage de domaine
+        create_email_domain_block: Créer un blocage de domaine de courriel
+        create_ip_block: Créer une règle IP
+        create_unavailable_domain: Créer un domaine indisponible
+        create_user_role: Créer le rôle
+        demote_user: Rétrograder l’utilisateur·ice
+        destroy_announcement: Supprimer l’annonce
+        destroy_canonical_email_block: Supprimer le blocage de domaine de courriel
+        destroy_custom_emoji: Supprimer des émojis personnalisés
+        destroy_domain_allow: Supprimer le domaine autorisé
+        destroy_domain_block: Supprimer le blocage de domaine
+        destroy_email_domain_block: Supprimer le blocage de domaine de courriel
+        destroy_instance: Purge du domaine
+        destroy_ip_block: Supprimer la règle IP
+        destroy_status: Supprimer le message
+        destroy_unavailable_domain: Supprimer le domaine indisponible
+        destroy_user_role: Détruire le rôle
+        disable_2fa_user: Désactiver l’A2F
+        disable_custom_emoji: Désactiver les émojis personnalisés
+        disable_sign_in_token_auth_user: Désactiver l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
+        disable_user: Désactiver le compte
+        enable_custom_emoji: Activer les émojis personnalisées
+        enable_sign_in_token_auth_user: Activer l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
+        enable_user: Activer l’utilisateur
+        memorialize_account: Ériger en mémorial
+        promote_user: Promouvoir l’utilisateur
+        reject_appeal: Rejeter l'appel
+        reject_user: Rejeter l’utilisateur
+        remove_avatar_user: Supprimer l’avatar
+        reopen_report: Rouvrir le signalement
+        resend_user: Renvoyer l'e-mail de confirmation
+        reset_password_user: Réinitialiser le mot de passe
+        resolve_report: Résoudre le signalement
+        sensitive_account: Marquer les médias de votre compte comme sensibles
+        silence_account: Limiter le compte
+        suspend_account: Suspendre le compte
+        unassigned_report: Ne plus assigner le signalement
+        unblock_email_account: Débloquer l'adresse courriel
+        unsensitive_account: Ne pas marquer les médias de votre compte comme sensibles
+        unsilence_account: Annuler la limitation du compte
+        unsuspend_account: Annuler la suspension du compte
+        update_announcement: Modifier l’annonce
+        update_custom_emoji: Mettre à jour les émojis personnalisés
+        update_domain_block: Mettre à jour le blocage de domaine
+        update_ip_block: Mettre à jour la règle IP
+        update_status: Mettre à jour le message
+        update_user_role: Mettre à jour le rôle
+      actions:
+        approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
+        approve_user_html: "%{name} a approuvé l’inscription de %{target}"
+        assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
+        change_email_user_html: "%{name} a modifié l'adresse de courriel de l'utilisateur·rice %{target}"
+        change_role_user_html: "%{name} a changé le rôle de %{target}"
+        confirm_user_html: "%{name} a confirmé l'adresse courriel de l'utilisateur %{target}"
+        create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
+        create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
+        create_canonical_email_block_html: "%{name} a bloqué l’e-mail avec le hachage %{target}"
+        create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
+        create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
+        create_domain_block_html: "%{name} a bloqué le domaine %{target}"
+        create_email_domain_block_html: "%{name} a bloqué de domaine de courriel %{target}"
+        create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
+        create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
+        create_user_role_html: "%{name} a créé le rôle %{target}"
+        demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
+        destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
+        destroy_canonical_email_block_html: "%{name} a débloqué l'email avec le hash %{target}"
+        destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
+        destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
+        destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
+        destroy_email_domain_block_html: "%{name} a débloqué le domaine de courriel %{target}"
+        destroy_instance_html: "%{name} a purgé le domaine %{target}"
+        destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
+        destroy_status_html: "%{name} a supprimé le message de %{target}"
+        destroy_unavailable_domain_html: "%{name} a repris la livraison au domaine %{target}"
+        destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
+        disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
+        disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
+        disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
+        enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
+        enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
+        memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
+        promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
+        reject_appeal_html: "%{name} a rejeté l'appel de la décision de modération émis par %{target}"
+        reject_user_html: "%{name} a rejeté l’inscription de %{target}"
+        remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
+        reopen_report_html: "%{name} a rouvert le signalement %{target}"
+        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
+        reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
+        resolve_report_html: "%{name} a résolu le signalement %{target}"
+        sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
+        silence_account_html: "%{name} a limité le compte de %{target}"
+        suspend_account_html: "%{name} a suspendu le compte de %{target}"
+        unassigned_report_html: "%{name} a désassigné le signalement %{target}"
+        unblock_email_account_html: "%{name} a débloqué l'adresse courriel de %{target}"
+        unsensitive_account_html: "%{name} a enlevé le marquage comme sensible du média de %{target}"
+        unsilence_account_html: "%{name} a annulé la limitation du compte de %{target}"
+        unsuspend_account_html: "%{name} a réactivé le compte de %{target}"
+        update_announcement_html: "%{name} a mis à jour l'annonce %{target}"
+        update_custom_emoji_html: "%{name} a mis à jour l'émoji %{target}"
+        update_domain_block_html: "%{name} a mis à jour le blocage de domaine pour %{target}"
+        update_ip_block_html: "%{name} a modifié la règle pour l'IP %{target}"
+        update_status_html: "%{name} a mis à jour le message de %{target}"
+        update_user_role_html: "%{name} a changé le rôle %{target}"
+      deleted_account: compte supprimé
+      empty: Aucun journal trouvé.
+      filter_by_action: Filtrer par action
+      filter_by_user: Filtrer par utilisateur·ice
+      title: Journal d’audit
+    announcements:
+      destroyed_msg: Annonce supprimée avec succès !
+      edit:
+        title: Modifier l’annonce
+      empty: Aucune annonce trouvée.
+      live: En direct
+      new:
+        create: Créer une annonce
+        title: Nouvelle annonce
+      publish: Publier
+      published_msg: Annonce publiée avec succès !
+      scheduled_for: Planifiée pour %{time}
+      scheduled_msg: Annonce planifiée pour publication !
+      title: Annonces
+      unpublish: Retirer l'annonce
+      unpublished_msg: L’annonce a été dépubliée avec succès !
+      updated_msg: L’annonce a été mise à jour avec succès !
+    custom_emojis:
+      assign_category: Attribuer une catégorie
+      by_domain: Domaine
+      copied_msg: Copie locale de l’émoji créée avec succès
+      copy: Copier
+      copy_failed_msg: Impossible de faire une copie locale de cet émoji
+      create_new_category: Créer une nouvelle catégorie
+      created_msg: Émoji créé avec succès !
+      delete: Supprimer
+      destroyed_msg: Émoji supprimé avec succès !
+      disable: Désactiver
+      disabled: Désactivé
+      disabled_msg: Émoji désactivé avec succès
+      emoji: Émoji
+      enable: Activer
+      enabled: Activé
+      enabled_msg: Émoji activé avec succès
+      image_hint: PNG ou GIF de moins de %{size}
+      list: Lister
+      listed: Listé
+      new:
+        title: Ajouter un nouvel émoji personnalisé
+      no_emoji_selected: Aucun émoji n’a été modifié, car aucun n’a été sélectionné
+      not_permitted: Vous n’êtes pas autorisé à effectuer cette action
+      overwrite: Écraser
+      shortcode: Raccourci
+      shortcode_hint: Au moins deux caractères, seulement des caractères alphanumériques ou des tirets bas
+      title: Émojis personnalisés
+      uncategorized: Non catégorisé
+      unlist: Délister
+      unlisted: Délisté
+      update_failed_msg: Cet émoji n'a pas pu être mis à jour
+      updated_msg: Émoji mis à jour avec succès !
+      upload: Téléverser
+    dashboard:
+      active_users: utilisateurs actifs
+      interactions: interactions
+      media_storage: Stockage des médias
+      new_users: nouveaux utilisateurs
+      opened_reports: rapports ouverts
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> appel en attente"
+        other: "<strong>%{count}</strong> appels en attente"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> rapport en attente"
+        other: "<strong>%{count}</strong> rapports en attente"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag en attente"
+        other: "<strong>%{count}</strong> hashtags en attente"
+      pending_users_html:
+        one: "<strong>%{count}</strong> utilisateur·rice en attente"
+        other: "<strong>%{count}</strong> utilisateur·rice·s en attente"
+      resolved_reports: rapports résolus
+      software: Logiciel
+      sources: Sources d'inscription
+      space: Espace utilisé
+      title: Tableau de bord
+      top_languages: Langues les plus actives
+      top_servers: Serveurs les plus actifs
+      website: Site Web
+    disputes:
+      appeals:
+        empty: Aucun appel trouvé.
+        title: Appels
+    domain_allows:
+      add_new: Mettre le domaine sur liste sur blanche
+      created_msg: Ce domaine a été ajouté à la liste blanche avec succès
+      destroyed_msg: Le domaine a été supprimé de la liste blanche
+      export: Exporter
+      import: Importer
+      undo: Supprimer de la liste blanche
+    domain_blocks:
+      add_new: Bloquer un nouveau domaine
+      created_msg: Le blocage de domaine est désormais activé
+      destroyed_msg: Le blocage de domaine a été désactivé
+      domain: Domaine
+      edit: Modifier le blocage de domaine
+      existing_domain_block: Vous avez déjà imposé des limites plus strictes à %{name}.
+      existing_domain_block_html: Vous avez déjà imposé des limites plus strictes à %{name}, vous devez d’abord le/la <a href="%{unblock_url}">débloquer</a>.
+      export: Exporter
+      import: Importer
+      new:
+        create: Créer le blocage
+        hint: Le blocage de domaine n’empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
+        severity:
+          desc_html: "<strong>Limiter</strong> rendra les messages des comptes de ce domaine invisibles à ceux qui ne les suivent pas. <strong>Suspendre</strong> supprimera tout le contenu, les médias, et données de profile pour les comptes de ce domaine de votre serveur. Utilisez <strong>Aucun</strong> si vous voulez simplement rejeter les fichiers multimédia."
+          noop: Aucune
+          silence: Limiter
+          suspend: Suspendre
+        title: Nouveau blocage de domaine
+      no_domain_block_selected: Aucun blocage de domaine n'a été modifié car aucun n'a été sélectionné
+      not_permitted: Vous n’êtes pas autorisé à effectuer cette action
+      obfuscate: Obfusquer le nom de domaine
+      obfuscate_hint: Obfusquer partiellement le nom de domaine dans la liste si la publication de la liste des limitations de domaine est activée
+      private_comment: Commentaire privé
+      private_comment_hint: Commentaire sur cette limitation de domaine pour informer en interne les modérateurs.
+      public_comment: Commentaire public
+      public_comment_hint: Commentaire sur cette limitation de domaine pour le grand public, si l'affichage public de la liste des limitations de domaine est activé.
+      reject_media: Rejeter les fichiers média
+      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: Rejeter les signalements
+      reject_reports_hint: Ignorez tous les signalements provenant de ce domaine. Ne concerne pas les suspensions
+      undo: Annuler le blocage de domaine
+      view: Afficher les blocages de domaines
+    email_domain_blocks:
+      add_new: Ajouter
+      attempts_over_week:
+        one: "%{count} tentative au cours de la dernière semaine"
+        other: "%{count} tentatives au cours de la dernière semaine"
+      created_msg: Le blocage de domaine de courriel est désormais activé
+      delete: Supprimer
+      dns:
+        types:
+          mx: Enregistrement MX
+      domain: Domaine
+      new:
+        create: Créer le blocage
+        resolve: Résoudre le domaine
+        title: Nouveau blocage de domaine de courriel
+      no_email_domain_block_selected: Aucun blocage de domaine de courriel n'a été modifié car aucun n'a été sélectionné
+      resolved_dns_records_hint_html: Le nom de domaine est relié aux domaines MX suivants, qui ont la responsabilité ultime d'accepter les courriels. Bloquer un domaine MX empêchera les inscriptions à partir de toute adresse courriel utilisant le même domaine MX, même si le nom de domaine affiché est différent. <strong> Veillez à ne pas bloquer les fournisseurs de messagerie d'envergure.</strong>
+      resolved_through_html: Résolu par %{domain}
+      title: Blocage de domaines de courriel
+    export_domain_allows:
+      new:
+        title: Autoriser l'importation de domaine
+      no_file: Aucun fichier sélectionné
+    export_domain_blocks:
+      import:
+        description_html: Vous êtes sur le point d'importer une liste de blocs de domaine. Veuillez examiner cette liste très attentivement, spécialement si vous n'êtes pas l'auteur de cette liste.
+        existing_relationships_warning: Relations de suivi existantes
+        private_comment_description_html: 'Pour vous aider à suivre d''où viennent les blocs importés, des blocs importés seront créés avec le commentaire privé suivant : <q>%{comment}</q>'
+        private_comment_template: Importé depuis %{source} le %{date}
+        title: Importer des blocs de domaine
+      new:
+        title: Importer des blocs de domaine
+      no_file: Aucun fichier sélectionné
+    follow_recommendations:
+      description_html: "<strong>Les recommandations d'abonnement aident les nouvelles personnes à trouver rapidement du contenu intéressant</strong>. Si un·e utilisateur·rice n'a pas assez interagi avec les autres pour avoir des recommandations personnalisées, ces comptes sont alors recommandés. La sélection est mise à jour quotidiennement depuis un mélange de comptes ayant le plus d'interactions récentes et le plus grand nombre d'abonné·e·s locaux pour une langue donnée."
+      language: Pour la langue
+      status: État
+      suppress: Supprimer les recommandations d'abonnement
+      suppressed: Supprimée
+      title: Recommandations d'abonnement
+      unsuppress: Rétablir les recommandations d'abonnement
+    instances:
+      availability:
+        description_html:
+          one: Si la livraison au domaine échoue pendant <strong>%{count} jour</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
+          other: Si la livraison au domaine échoue pendant <strong>%{count} jours différents</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
+        failure_threshold_reached: Le seuil de défaillance a été atteint le %{date}.
+        failures_recorded:
+          one: Tentative échouée pendant %{count} jour.
+          other: Tentatives échouées pendant %{count} jours différents.
+        no_failures_recorded: Pas d'échec enregistré.
+        title: Disponibilité
+        warning: La dernière tentative de connexion à ce serveur a échoué
+      back_to_all: Tout
+      back_to_limited: Limité
+      back_to_warning: Avertissement
+      by_domain: Domaine
+      confirm_purge: Êtes-vous sûr de vouloir supprimer définitivement les données de ce domaine ?
+      content_policies:
+        comment: Note interne
+        description_html: Vous pouvez définir des politiques de contenu qui seront appliquées à tous les comptes de ce domaine et à tous ses sous-domaines.
+        policies:
+          reject_media: Rejeter les médias
+          reject_reports: Rejeter les signalements
+          silence: Limiter
+          suspend: Suspendre
+        policy: Règlement
+        reason: Raison publique
+        title: Politiques de contenu
+      dashboard:
+        instance_accounts_dimension: Comptes les plus suivis
+        instance_accounts_measure: comptes stockés
+        instance_followers_measure: nos abonné⋅e⋅s là-bas
+        instance_follows_measure: leurs abonné⋅e⋅s ici
+        instance_languages_dimension: Langues les plus utilisées
+        instance_media_attachments_measure: fichiers médias stockés
+        instance_reports_measure: signalements mentionnant l'instance
+        instance_statuses_measure: messages stockés
+      delivery:
+        all: Tout
+        clear: Effacer les erreurs de livraison
+        failing: Échouant
+        restart: Redémarrer la livraison
+        stop: Arrêter la livraison
+        unavailable: Indisponible
+      delivery_available: Livraison disponible
+      delivery_error_days: Jours d'erreur de livraison
+      delivery_error_hint: Si la livraison n'est pas possible pendant %{count} jours, elle sera automatiquement marquée comme non livrable.
+      destroyed_msg: Les données de %{domain} sont maintenant en file d'attente pour une suppression imminente.
+      empty: Aucun domaine trouvé.
+      known_accounts:
+        one: "%{count} compte connu"
+        other: "%{count} comptes connus"
+      moderation:
+        all: Tout
+        limited: Limité
+        title: Modération
+      private_comment: Commentaire privé
+      public_comment: Commentaire public
+      purge: Purge
+      purge_description_html: Si vous pensez que ce domaine est définitivement hors service, vous pouvez supprimer de votre espace de stockage toutes les traces des comptes de ce domaine et les données associées. Cela peut prendre du temps.
+      title: Fédération
+      total_blocked_by_us: Bloqués par nous
+      total_followed_by_them: Suivi par eux
+      total_followed_by_us: Suivi par nous
+      total_reported: Signalements à leur sujet
+      total_storage: Attachements de média
+      totals_time_period_hint_html: Les totaux affichés ci-dessous incluent des données sans limite de temps.
+    invites:
+      deactivate_all: Tout désactiver
+      filter:
+        all: Tout
+        available: Disponible
+        expired: Expiré
+        title: Filtre
+      title: Invitations
+    ip_blocks:
+      add_new: Créer une règle
+      created_msg: Nouvelle règle IP ajoutée avec succès
+      delete: Supprimer
+      expires_in:
+        '1209600': 2 semaines
+        '15778476': 6 mois
+        '2629746': 1 mois
+        '31556952': 1 an
+        '86400': 1 jour
+        '94670856': 3 ans
+      new:
+        title: Créer une nouvelle règle IP
+      no_ip_block_selected: Aucune règle IP n’a été modifiée car aucune n’a été sélectionnée
+      title: Règles IP
+    relationships:
+      title: Relations de %{acct}
+    relays:
+      add_new: Ajouter un nouveau relais
+      delete: Supprimer
+      description_html: Un <strong>relai de fédération</strong> est un serveur intermédiaire qui échange de grandes quantités de messages publics entre les serveurs qui s’inscrivent et ceux qui publient dessus. <strong>Il peut aider les petits et moyens serveurs à découvrir du contenu sur le fediverse</strong>, ce qui normalement nécessiterait que leurs membres suivent des gens inscrits sur d’autres serveurs.
+      disable: Désactiver
+      disabled: Désactivé
+      enable: Activer
+      enable_hint: Une fois activé, votre serveur souscrira à tous les messages publics de ce relais et y enverra ses propres messages publics.
+      enabled: Activé
+      inbox_url: URL du relais
+      pending: En attente de l’approbation du relai
+      save_and_enable: Sauvegarder et activer
+      setup: Paramétrer une connexion de relais
+      signatures_not_enabled: Les relais ne fonctionneront pas correctement lorsque le mode sécurisé ou le mode liste blanche est activé
+      status: Statut
+      title: Relais
+    report_notes:
+      created_msg: Note de signalement créée avec succès !
+      destroyed_msg: Note de signalement effacée avec succès !
+    reports:
+      account:
+        notes:
+          one: "%{count} note"
+          other: "%{count} notes"
+      action_log: Journal d’audit
+      action_taken_by: Intervention de
+      actions:
+        delete_description_html: Les messages signalés seront supprimés et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
+        mark_as_sensitive_description_html: Les médias des messages signalés seront marqués comme sensibles et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
+        other_description_html: Voir plus d'options pour contrôler le comportement du compte et personnaliser la communication vers le compte signalé.
+        resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
+        silence_description_html: Le profil ne sera visible que pour ceux qui le suivent déjà ou le consultent manuellement, ce qui limite considérablement sa portée. Peut toujours être restauré.
+        suspend_description_html: Le profil et tout son contenu deviendront inaccessibles jusqu'à ce qu'il soit éventuellement supprimé. Interagir avec le compte sera impossible. Réversible dans les 30 jours.
+      actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
+      add_to_report: Ajouter davantage au rapport
+      are_you_sure: Voulez-vous vraiment faire ça ?
+      assign_to_self: Me l’assigner
+      assigned: Modérateur assigné
+      by_target_domain: Domaine du compte signalé
+      category: Catégorie
+      category_description_html: La raison pour laquelle ce compte et/ou ce contenu a été signalé sera citée dans la communication avec le compte signalé
+      comment:
+        none: Aucun
+      comment_description_html: 'Pour fournir plus d''informations, %{name} a écrit :'
+      created_at: Signalé
+      delete_and_resolve: Supprimer les messages
+      forwarded: Transféré
+      forwarded_to: Transféré à %{domain}
+      mark_as_resolved: Marquer comme résolu
+      mark_as_sensitive: Marquer comme sensible
+      mark_as_unresolved: Marquer comme non-résolu
+      no_one_assigned: Personne
+      notes:
+        create: Ajouter une note
+        create_and_resolve: Résoudre avec une note
+        create_and_unresolve: Ré-ouvrir avec une note
+        delete: Supprimer
+        placeholder: Décrivez quelles actions ont été prises, ou toute autre mise à jour…
+        title: Remarques
+      notes_description_html: Voir et laisser des notes aux autres modérateurs et à votre futur moi-même
+      quick_actions_description_html: 'Faites une action rapide ou faites défiler vers le bas pour voir le contenu signalé :'
+      remote_user_placeholder: l'utilisateur·rice distant·e de %{instance}
+      reopen: Ré-ouvrir le signalement
+      report: 'Signalement #%{id}'
+      reported_account: Compte signalé
+      reported_by: Signalé par
+      resolved: Résolus
+      resolved_msg: Signalement résolu avec succès !
+      skip_to_actions: Passer aux actions
+      status: Statut
+      statuses: Contenu signalé
+      statuses_description_html: Le contenu offensant sera cité dans la communication avec le compte signalé
+      target_origin: Origine du compte signalé
+      title: Signalements
+      unassign: Dés-assigner
+      unresolved: Non résolus
+      updated_at: Mis à jour
+      view_profile: Voir le profil
+    roles:
+      add_new: Ajouter un rôle
+      assigned_users:
+        one: "%{count} utilisateur·rice"
+        other: "%{count} utilisateur·rice·s"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Invitations
+        moderation: Modération
+        special: Spécial
+      delete: Supprimer
+      description_html: Les <strong>rôles utilisateur</strong> vous permettent de personnaliser les fonctions et les zones de Mastodon auxquelles vos utilisateur⋅rice⋅s peuvent accéder.
+      edit: Modifier le rôle '%{name}'
+      everyone: Autorisations par défaut
+      everyone_full_description_html: Ceci est le <strong>rôle de base</strong> qui impacte <strong>tou⋅te⋅s les utilisateur⋅rice⋅s</strong>, même celleux sans rôle assigné. Tous les autres rôles héritent des autorisations de celui-ci.
+      permissions_count:
+        one: "%{count} autorisation"
+        other: "%{count} autorisations"
+      privileges:
+        administrator: Administrateur·rice
+        administrator_description: Les utilisateur⋅rice⋅s ayant cette autorisation pourront contourner toutes les autorisations
+        delete_user_data: Supprimer les données de l'utilisateur⋅rice
+        delete_user_data_description: Permet aux utilisateur⋅rice⋅s de supprimer sans délai les données des autres utilisateur⋅rice⋅s
+        invite_users: Inviter des utilisateur⋅rice⋅s
+        invite_users_description: Permet aux utilisateur⋅rice⋅s d'inviter de nouvelles personnes sur le serveur
+        manage_announcements: Gérer les annonces
+        manage_announcements_description: Permet aux utilisateur⋅rice⋅s de gérer les annonces sur le serveur
+        manage_appeals: Gérer les contestations
+        manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
+        manage_blocks: Gérer les blocages
+        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
+        manage_custom_emojis: Gérer les émojis personnalisés
+        manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
+        manage_federation: Gérer de la féderation
+        manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison
+        manage_invites: Gérer les invitations
+        manage_invites_description: Permet aux utilisateur⋅rice⋅s de parcourir et de désactiver les liens d'invitation
+        manage_reports: Gérer les rapports
+        manage_reports_description: Permet aux utilisateur⋅rice⋅s d'examiner les signalements et d'effectuer des actions de modération en conséquence
+        manage_roles: Gérer les rôles
+        manage_roles_description: Permet aux utilisateur⋅rice⋅s de gérer et d'assigner des rôles inférieurs au leur
+        manage_rules: Gérer les règles
+        manage_rules_description: Permet aux utilisateur·rice·s de modifier les règles du serveur
+        manage_settings: Gérer les paramètres
+        manage_settings_description: Permet aux utilisateur·rice·s de modifier les paramètres du site
+        manage_taxonomies: Gérer les taxonomies
+        manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
+        manage_user_access: Gérer l'accès utilisateur
+        manage_user_access_description: Permet aux utilisateur⋅rice⋅s de désactiver l'authentification à deux facteurs, de modifier l'adresse courriel et de réinitialiser le mot de passe des autres utilisateur⋅rice⋅s
+        manage_users: Gérer les utilisateur·rice·s
+        manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
+        manage_webhooks: Gérer les points d’ancrage web
+        manage_webhooks_description: Permet aux utilisateur⋅rice⋅s de configurer des webhooks pour des événements d'administration
+        view_audit_log: Afficher le journal d'audit
+        view_audit_log_description: Permet aux utilisateur⋅rice⋅s de voir l'historique des opérations d'administration sur le serveur
+        view_dashboard: Voir le tableau de bord
+        view_dashboard_description: Permet aux utilisateur⋅rice⋅s d'accéder au tableau de bord et à diverses statistiques
+        view_devops: DevOps
+        view_devops_description: Permet aux utilisateur⋅rice⋅s d'accéder aux tableaux de bord Sidekiq et pgHero
+      title: Rôles
+    rules:
+      add_new: Ajouter une règle
+      delete: Supprimer
+      description_html: Bien que la plupart des gens prétende avoir lu les conditions d'utilisation avant de les accepter, généralement les utilisateur·rice·s ne les lisent vraiment que lorsque un problème apparaît. <strong>Pour faciliter la visualisation des règles de votre serveur en un seul coup d’œil, présentez-les sous la forme d'une liste à puces !</strong> Essayez de garder chacune des règles simple et concise, mais faites attention à ne pas non plus les diviser en de trop nombreux éléments distincts.
+      edit: Modifier la règle
+      empty: Aucune règle de serveur n'a été définie pour l'instant.
+      title: Règles du serveur
+    settings:
+      about:
+        manage_rules: Gérer les règles du serveur
+        preamble: Fournissez des informations détaillées sur le fonctionnement, la modération et le financement du serveur.
+        rules_hint: Il y a un espace dédié pour les règles auxquelles vos utilisateurs sont invités à adhérer.
+        title: À propos
+      appearance:
+        preamble: Personnaliser l'interface web de Mastodon.
+        title: Apparence
+      branding:
+        preamble: L'image de marque de votre serveur la différencie des autres serveurs du réseau. Ces informations peuvent être affichées dans nombre d'environnements, tels que l'interface web de Mastodon, les applications natives, dans les aperçus de liens sur d'autres sites Web et dans les applications de messagerie, etc. C'est pourquoi il est préférable de garder ces informations claires, courtes et concises.
+        title: Thème
+      content_retention:
+        preamble: Contrôle comment le contenu créé par les utilisateurs est enregistré et stocké dans Mastodon.
+        title: Rétention du contenu
+      default_noindex:
+        desc_html: Affecte tous les utilisateurs qui n'ont pas modifié ce paramètre eux-mêmes
+        title: Ne pas indexer par défaut les utilisateurs dans les moteurs de recherche
+      discovery:
+        follow_recommendations: Suivre les recommandations
+        preamble: Faire apparaître un contenu intéressant est essentiel pour interagir avec de nouveaux utilisateurs qui ne connaissent peut-être personne sur Mastodonte. Contrôlez le fonctionnement des différentes fonctionnalités de découverte sur votre serveur.
+        profile_directory: Annuaire des profils
+        public_timelines: Fils publics
+        title: Découverte
+        trends: Tendances
+      domain_blocks:
+        all: À tout le monde
+        disabled: À personne
+        users: Aux utilisateur·rice·s connecté·e·s localement
+      registrations:
+        preamble: Affecte qui peut créer un compte sur votre serveur.
+        title: Inscriptions
+      registrations_mode:
+        modes:
+          approved: Approbation requise pour s’inscrire
+          none: Personne ne peut s’inscrire
+          open: N’importe qui peut s’inscrire
+      title: Paramètres du serveur
+    site_uploads:
+      delete: Supprimer le fichier téléversé
+      destroyed_msg: Téléversement sur le site supprimé avec succès !
+    statuses:
+      account: Auteur·rice
+      application: Application
+      back_to_account: Retour à la page du compte
+      back_to_report: Retour à la page du rapport
+      batch:
+        remove_from_report: Retirer du rapport
+        report: Signalement
+      deleted: Supprimé
+      favourites: Favoris
+      history: Historique de version
+      in_reply_to: Répondre à
+      language: Langue
+      media:
+        title: Médias
+      metadata: Metadonnés
+      no_status_selected: Aucun message n’a été modifié car aucun n’a été sélectionné
+      open: Ouvrir le message
+      original_status: Message original
+      reblogs: Partages
+      status_changed: Publication modifiée
+      title: Messages du compte
+      trending: Tendances
+      visibility: Visibilité
+      with_media: Avec médias
+    strikes:
+      actions:
+        delete_statuses: "%{name} a supprimé les messages de %{target}"
+        disable: "%{name} a gelé le compte de %{target}"
+        mark_statuses_as_sensitive: "%{name} a marqué le message de %{target} comme sensible"
+        none: "%{name} a envoyé un avertissement à %{target}"
+        sensitive: "%{name} a marqué le compte de %{target} comme sensible"
+        silence: "%{name} a limité le compte de %{target}"
+        suspend: "%{name} a suspendu le compte de %{target}"
+      appeal_approved: Appel soumis
+      appeal_pending: Appel en attente
+    system_checks:
+      database_schema_check:
+        message_html: Vous avez des migrations de base de données en attente. Veuillez les exécuter pour vous assurer que l'application se comporte comme prévu
+      elasticsearch_running_check:
+        message_html: Impossible de se connecter à Elasticsearch. Veuillez vérifier qu’il est en cours d’exécution ou désactiver la recherche en plein texte
+      elasticsearch_version_check:
+        message_html: 'Version d’Elasticsearch incompatible : %{value}'
+        version_comparison: Elasticsearch %{running_version} est en cours d’exécution alors que %{required_version} est requise
+      rules_check:
+        action: Gérer les règles du serveur
+        message_html: Vous n'avez pas défini de règles pour le serveur.
+      sidekiq_process_check:
+        message_html: Aucun processus Sidekiq en cours d'exécution pour la/les file(s) d'attente %{value}. Veuillez vérifier votre configuration de Sidekiq
+    tags:
+      review: État du traitement
+      updated_msg: Paramètres du hashtag mis à jour avec succès
+    title: Administration
+    trends:
+      allow: Autoriser
+      approved: Approuvé
+      disallow: Interdire
+      links:
+        allow: Autoriser le lien
+        allow_provider: Autoriser l'éditeur
+        description_html: Ces liens sont actuellement énormément partagés par des comptes dont votre serveur voit les messages. Cela peut aider vos utilisateur⋅rice⋅s à découvrir ce qu'il se passe dans le monde. Aucun lien n'est publiquement affiché tant que vous n'avez pas approuvé le compte qui le publie. Vous pouvez également autoriser ou rejeter les liens individuellement.
+        disallow: Interdire le lien
+        disallow_provider: Interdire l'éditeur
+        no_link_selected: Aucun lien n'a été changé car aucun n'a été sélectionné
+        publishers:
+          no_publisher_selected: Aucun compte publicateur n'a été changé car aucun n'a été sélectionné
+        shared_by_over_week:
+          one: Partagé par %{count} personne au cours de la dernière semaine
+          other: Partagé par %{count} personnes au cours de la dernière semaine
+        title: Liens tendances
+        usage_comparison: Partagé %{today} fois aujourd'hui, comparé à %{yesterday} hier
+      only_allowed: Autorisées seulement
+      pending_review: En attente de révision
+      preview_card_providers:
+        allowed: Les liens de cet éditeur peuvent être tendance
+        description_html: Voici les domaines depuis lesquels des liens sont souvent partagés sur votre serveur. Les liens n'apparaîtront pas publiquement dans les tendances à moins que le domaine du lien ne soit approuvé. Votre approbation (ou votre rejet) s'étend aux sous-domaines.
+        rejected: Les liens de cet éditeur ne seront pas considérés tendance
+        title: Éditeurs
+      rejected: Rejeté
+      statuses:
+        allow: Autoriser le message
+        allow_account: Autoriser l'auteur·rice
+        description_html: Voici les messages dont votre serveur a connaissance qui sont beaucoup partagés et mis en favoris en ce moment. Cela peut aider vos utilisateur⋅rice⋅s, néophytes comme aguerri⋅e⋅s, à trouver plus de comptes à suivre. Aucun message n'est publiquement affiché tant que vous n'en avez pas approuvé l'auteur⋅rice, et seulement si icellui permet que son compte soit suggéré aux autres. Vous pouvez également autoriser ou rejeter les messages individuellement.
+        disallow: Proscrire le message
+        disallow_account: Proscrire l'auteur·rice
+        no_status_selected: Aucune publication en tendance n'a été changée car aucune n'a été sélectionnée
+        not_discoverable: L'auteur⋅rice n'a pas choisi de pouvoir être découvert⋅e
+        shared_by:
+          one: Partagé ou ajouté aux favoris une fois
+          other: Partagé et ajouté aux favoris %{friendly_count} fois
+        title: Messages tendance
+      tags:
+        current_score: Score actuel %{score}
+        dashboard:
+          tag_accounts_measure: utilisations uniques
+          tag_languages_dimension: Langues principales
+          tag_servers_dimension: Meilleurs serveurs
+          tag_servers_measure: différents serveurs
+          tag_uses_measure: utilisations totales
+        description_html: Ces hashtags apparaissent actuellement dans de nombreux messages que votre serveur voit. Cela peut aider vos utilisateur⋅rice⋅s à découvrir les sujets dont les gens parlent le plus en ce moment. Aucun hashtag n'est publiquement affiché tant que vous ne l'avez pas approuvé.
+        listable: Peut être suggéré
+        no_tag_selected: Aucun tag n'a été changé car aucun n'a été sélectionné
+        not_listable: Ne sera pas suggéré
+        not_trendable: N'apparaîtra pas sous les tendances
+        not_usable: Ne peut être utilisé
+        peaked_on_and_decaying: A atteint son maximum le %{date}, maintenant en déclin
+        title: Hashtags tendance
+        trendable: Peut apparaître sous les tendances
+        trending_rank: 'Tendance #%{rank}'
+        usable: Peut être utilisé
+        usage_comparison: Utilisé %{today} fois aujourd'hui, comparé à %{yesterday} hier
+        used_by_over_week:
+          one: Utilisé par %{count} personne au cours de la dernière semaine
+          other: Utilisé par %{count} personnes au cours de la dernière semaine
+      title: Tendances
+      trending: Tendances
+    warning_presets:
+      add_new: Ajouter un nouveau
+      delete: Supprimer
+      edit_preset: Éditer les avertissements prédéfinis
+      empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
+      title: Gérer les avertissements prédéfinis
+    webhooks:
+      add_new: Ajouter un point de terminaison
+      delete: Supprimer
+      description_html: Un <strong>point d'ancrage web</strong> permet à Mastodon d'envoyer des <strong>notifications en temps réel</strong> concernant des événements sélectionnés vers votre propre application, afin que celle-ci puisse <strong>déclencher automatiquement des réactions</strong>.
+      disable: Désactiver
+      disabled: Désactivé
+      edit: Modifier le point de terminaison
+      empty: Pour l'instant, vous n'avez configuré aucun lien d'ancrage web pour point de terminaison.
+      enable: Activer
+      enabled: Actif
+      enabled_events:
+        one: 1 événement activé
+        other: "%{count} événements activés"
+      events: Événements
+      new: Nouveau point d’ancrage web
+      rotate_secret: Effectuer une rotation du secret
+      secret: Jeton de connexion
+      status: État
+      title: Points d’ancrage web
+      webhook: Point d’ancrage web
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: effacer les messages
+        disable: geler le compte
+        mark_statuses_as_sensitive: marquer les messages comme sensibles
+        none: un avertissement
+        sensitive: marquer le compte comme sensible
+        silence: limiter le compte
+        suspend: suspendre le compte
+      body: "%{target} fait appel de la décision de modération émise par %{action_taken_by} le %{date} et qui était : %{type}. Cette personne a écrit :"
+      next_steps: Vous pouvez approuver l'appel pour annuler la décision de modération, ou l'ignorer.
+      subject: "%{username} fait appel d'une décision de modération sur %{instance}"
+    new_pending_account:
+      body: Les détails du nouveau compte se trouvent ci-dessous. Vous pouvez approuver ou rejeter cette demande.
+      subject: Nouveau compte à examiner sur %{instance} (%{username})
+    new_report:
+      body: "%{reporter} a signalé %{target}"
+      body_remote: Quelqu’un de %{domain} a signalé %{target}
+      subject: Nouveau signalement sur %{instance} (#%{id})
+    new_trends:
+      body: 'Les éléments suivants doivent être approuvés avant de pouvoir être affichés publiquement :'
+      new_trending_links:
+        title: Liens tendance
+      new_trending_statuses:
+        title: Messages tendance
+      new_trending_tags:
+        no_approved_tags: Il n'y a pas de hashtag tendance approuvé actuellement.
+        requirements: 'N''importe quel élément de la sélection pourrait surpasser le hashtag tendance approuvé n°%{rank}, qui est actuellement #%{lowest_tag_name} avec un résultat de %{lowest_tag_score}.'
+        title: Hashtags tendance
+      subject: Nouvelles tendances à examiner sur %{instance}
+  aliases:
+    add_new: Créer un alias
+    created_msg: Un nouvel alias a été créé avec succès. Vous pouvez maintenant déménager depuis l'ancien compte.
+    deleted_msg: Alias supprimé avec succès. Le déménagement de ce compte vers celui-ci ne sera plus possible.
+    empty: Vous n’avez pas d’alias.
+    hint_html: Si vous voulez déménager d’un autre compte vers celui-ci, vous pouvez créer ici un alias, qui est nécessaire avant de pouvoir migrer les abonné·e·s de l’ancien compte vers celui-ci. Cette action en soi est <strong>inoffensive et réversible</strong>. <strong>La migration du compte est initiée à partir de l’ancien compte</strong>.
+    remove: Détacher l'alias
+  appearance:
+    advanced_web_interface: Interface web avancée
+    advanced_web_interface_hint: 'Si vous voulez utiliser toute la largeur de votre écran, l’interface web avancée vous permet de configurer plusieurs colonnes différentes pour voir autant d’informations que vous le souhaitez en même temps : Accueil, notifications, fil public fédéré, un nombre illimité de listes et hashtags.'
+    animations_and_accessibility: Animations et accessibilité
+    confirmation_dialogs: Dialogues de confirmation
+    discovery: Découverte
+    localization:
+      body: Mastodon est traduit par des volontaires.
+      guide_link: https://fr.crowdin.com/project/mastodon
+      guide_link_text: Tout le monde peut y contribuer.
+    sensitive_content: Contenu sensible
+    toot_layout: Agencement des messages
+  application_mailer:
+    notification_preferences: Modifier les préférences de courriel
+    salutation: "%{name},"
+    settings: 'Changer les préférences courriel : %{link}'
+    view: 'Voir :'
+    view_profile: Voir le profil
+    view_status: Afficher le message
+  applications:
+    created: Application créée avec succès
+    destroyed: Application supprimée avec succès
+    regenerate_token: Régénérer le jeton d’accès
+    token_regenerated: Jeton d’accès régénéré avec succès
+    warning: Soyez prudent·e avec ces données. Ne les partagez pas !
+    your_token: Votre jeton d’accès
+  auth:
+    apply_for_account: Demander un compte
+    change_password: Mot de passe
+    delete_account: Supprimer le compte
+    delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
+    description:
+      prefix_invited_by_user: "@%{name} vous invite à rejoindre ce serveur Mastodon !"
+      prefix_sign_up: Inscrivez-vous aujourd’hui sur Mastodon !
+      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateur·rice·s de n'importe quel serveur Mastodon et bien plus !
+    didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
+    dont_have_your_security_key: Vous n'avez pas votre clé de sécurité?
+    forgot_password: Mot de passe oublié ?
+    invalid_reset_password_token: Le lien de réinitialisation du mot de passe est invalide ou a expiré. Merci de réessayer.
+    link_to_otp: Entrez un code à deux facteurs de votre téléphone ou un code de récupération
+    link_to_webauth: Utilisez votre appareil de clé de sécurité
+    log_in_with: Se connecter via
+    login: Se connecter
+    logout: Se déconnecter
+    migrate_account: Déménager vers un compte différent
+    migrate_account_html: Si vous voulez rediriger ce compte vers un autre, vous pouvez le <a href="%{path}">configurer ici</a>.
+    or_log_in_with: Ou authentifiez-vous avec
+    privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: S’inscrire
+    registration_closed: "%{instance} a désactivé les inscriptions"
+    resend_confirmation: Envoyer à nouveau les consignes de confirmation
+    reset_password: Réinitialiser le mot de passe
+    rules:
+      preamble: Celles-ci sont définies et appliqués par les modérateurs de %{domain}.
+      title: Quelques règles de base.
+    security: Sécurité
+    set_new_password: Définir le nouveau mot de passe
+    setup:
+      email_below_hint_html: Si l’adresse de courriel ci-dessous est incorrecte, vous pouvez la modifier ici et recevoir un nouveau courriel de confirmation.
+      email_settings_hint_html: Le courriel de confirmation a été envoyé à %{email}. Si cette adresse de courriel n’est pas correcte, vous pouvez la modifier dans les paramètres du compte.
+      title: Configuration
+    sign_up:
+      preamble: Avec un compte sur ce serveur Mastodon, vous serez en mesure de suivre toute autre personne sur le réseau, quel que soit l’endroit où son compte est hébergé.
+      title: Mettons les choses en place pour %{domain}.
+    status:
+      account_status: État du compte
+      confirming: En attente de la confirmation par courriel à compléter.
+      functional: Votre compte est entièrement opérationnel.
+      pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvée.
+      redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
+      view_strikes: Voir les sanctions précédemment appliquées à votre compte
+    too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
+    use_security_key: Utiliser la clé de sécurité
+  authorize_follow:
+    already_following: Vous suivez déjà ce compte
+    already_requested: Vous avez déjà envoyé une demande d’abonnement à ce compte
+    error: Malheureusement, une erreur s'est produite lors de la recherche du compte distant
+    follow: Suivre
+    follow_request: 'Vous avez demandé à suivre :'
+    following: 'Youpi ! Vous suivez maintenant  :'
+    post_follow:
+      close: Ou bien, vous pouvez fermer cette fenêtre.
+      return: Afficher le profil de l’utilisateur·ice
+      web: Retour à l’interface web
+    title: Suivre %{acct}
+  challenge:
+    confirm: Continuer
+    hint_html: "<strong>Astuce :</strong> Nous ne vous demanderons plus votre mot de passe pour la prochaine heure."
+    invalid_password: Mot de passe invalide
+    prompt: Confirmez votre mot de passe pour continuer
+  crypto:
+    errors:
+      invalid_key: n’est pas une clé Ed25519 ou Curve25519 valide
+      invalid_signature: n’est pas une signature Ed25519 valide
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} h"
+      about_x_months: "%{count} mois"
+      about_x_years: "%{count} an(s)"
+      almost_x_years: "%{count} an(s)"
+      half_a_minute: À l’instant
+      less_than_x_minutes: "%{count} min"
+      less_than_x_seconds: À l’instant
+      over_x_years: "%{count}an(s)"
+      x_days: "%{count} j"
+      x_minutes: "%{count} min"
+      x_months: "%{count} mois"
+      x_seconds: "%{count} s"
+  deletes:
+    challenge_not_passed: Les renseignements que vous avez entrés n'étaient pas exacts
+    confirm_password: Entrez votre mot de passe actuel pour vérifier votre identité
+    confirm_username: Entrez votre nom d'utilisateur pour confirmer la procédure
+    proceed: Supprimer le compte
+    success_msg: Votre compte a été supprimé avec succès
+    warning:
+      before: 'Veuillez lire attentivement ces notes avant de continuer :'
+      caches: Le contenu mis en cache par d'autres serveurs peut persister
+      data_removal: Vos messages et autres données seront définitivement supprimés
+      email_change_html: Vous pouvez <a href="%{path}">modifier votre adresse courriel</a> sans supprimer votre compte
+      email_contact_html: S'il n'arrive toujours pas, vous pouvez envoyer un courriel à <a href="mailto:%{email}">%{email}</a> pour demander de l'aide
+      email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
+      irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
+      more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
+      username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
+      username_unavailable: Votre nom d’utilisateur·rice restera indisponible
+  disputes:
+    strikes:
+      action_taken: Mesure prise
+      appeal: Faire appel
+      appeal_approved: Cette sanction a été annulée en appel et n'est plus valide
+      appeal_rejected: L'appel a été rejeté
+      appeal_submitted_at: Appel soumis le
+      appealed_msg: Votre demande d'appel a été soumise. Si elle est approuvée, vous en serez informé·e.
+      appeals:
+        submit: Faire appel
+      approve_appeal: Approuver l’appel
+      associated_report: Rapport associé
+      created_at: En date du
+      description_html: Ce sont les mesures prises contre votre compte et les avertissements qui vous ont été envoyés par les responsables de %{instance}.
+      recipient: Adressé à
+      reject_appeal: Rejeter l’appel
+      status: 'Message #%{id}'
+      status_removed: Message déjà supprimé du système
+      title: "%{action} du %{date}"
+      title_actions:
+        delete_statuses: Suppression de message
+        disable: Gel du compte
+        mark_statuses_as_sensitive: Marquage des messages comme sensibles
+        none: Avertissement
+        sensitive: Marquage du compte comme sensible
+        silence: Limitation du compte
+        suspend: Suspension de compte
+      your_appeal_approved: Votre appel a été approuvé
+      your_appeal_pending: Vous avez soumis un appel
+      your_appeal_rejected: Votre appel a été rejeté
+  domain_validator:
+    invalid_domain: n’est pas un nom de domaine valide
+  errors:
+    '400': La demande que vous avez soumise est invalide ou mal formée.
+    '403': Vous n’avez pas accès à cette page.
+    '404': La page que vous recherchez n’existe pas.
+    '406': Cette page n'est pas disponible au format demandé.
+    '410': La page que vous recherchez n’existe plus.
+    '422':
+      content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
+      title: Vérification de sécurité échouée
+    '429': Trop de requêtes émises dans un délai donné
+    '500':
+      content: Nous sommes désolé·e·s, mais quelque chose s’est mal passé de notre côté.
+      title: Cette page n’est pas correcte
+    '503': La page n'a pas pu être servie en raison d'une défaillance temporaire du serveur.
+    noscript_html: Pour utiliser Mastodon, veuillez activer JavaScript. Sinon, essayez l’une des <a href="%{apps_path}">applications natives</a> pour Mastodon pour votre plate-forme.
+  existing_username_validator:
+    not_found: impossible de trouver un·e utilisateur·ice local·e de ce nom
+    not_found_multiple: n’a pas trouvé %{usernames}
+  exports:
+    archive_takeout:
+      date: Date
+      download: Télécharger votre archive
+      hint_html: Vous pouvez demander une archive de vos <strong>messages et médias téléversés</strong>. Les données exportées seront au format ActivityPub, lisible par tout logiciel compatible. Vous pouvez demander une archive tous les 7 jours.
+      in_progress: Création de votre archive…
+      request: Demandez vos archives
+      size: Taille
+    blocks: Vous bloquez
+    bookmarks: Marque-pages
+    csv: CSV
+    domain_blocks: Blocages de domaine
+    lists: Listes
+    mutes: Vous masquez
+    storage: Médias stockés
+  featured_tags:
+    add_new: Ajouter un nouveau hashtag
+    errors:
+      limit: Vous avez déjà mis en avant le nombre maximum de hashtags
+    hint_html: "<strong>Que sont les hashtags mis en avant ?</strong> Ils sont affichés en évidence sur votre profil public et permettent aux gens de parcourir vos messages publics qui utilisent ces hashtags. Ils sont un excellent outil pour garder la trace d’activités créatrices ou de projets de long terme."
+  filters:
+    contexts:
+      account: Profils
+      home: Accueil et listes
+      notifications: Notifications
+      public: Fils publics
+      thread: Discussions
+    edit:
+      add_keyword: Ajouter un mot-clé
+      keywords: Mots-clés
+      statuses: Publications individuelles
+      statuses_hint_html: Ce filtre s'applique à la sélection de messages individuels, qu'ils correspondent ou non aux mots-clés ci-dessous. <a href="%{path}">Revoir ou supprimer des messages du filtre</a>.
+      title: Éditer le filtre
+    errors:
+      deprecated_api_multiple_keywords: Ces paramètres ne peuvent pas être modifiés depuis cette application, car ils s'appliquent à plus d'un filtre de mot-clé. Utilisez une application plus récente ou l'interface web.
+      invalid_context: Contexte invalide ou insuffisant
+    index:
+      contexts: Filtres dans %{contexts}
+      delete: Supprimer
+      empty: Vous n'avez aucun filtre.
+      expires_in: Expire dans %{distance}
+      expires_on: Expire le %{date}
+      keywords:
+        one: "%{count} mot-clé"
+        other: "%{count} mots-clés"
+      statuses:
+        one: "%{count} message"
+        other: "%{count} messages"
+      statuses_long:
+        one: "%{count} publication individuelle cachée"
+        other: "%{count} publications individuelles cachées"
+      title: Filtres
+    new:
+      save: Enregistrer le nouveau filtre
+      title: Ajouter un nouveau filtre
+    statuses:
+      back_to_filter: Retour au filtre
+      batch:
+        remove: Retirer du filtre
+      index:
+        hint: Ce filtre s'applique à la sélection de messages individuels, indépendamment d'autres critères. Vous pouvez ajouter plus de messages à ce filtre à partir de l'interface Web.
+        title: Messages filtrés
+  footer:
+    trending_now: Tendance en ce moment
+  generic:
+    all: Tous
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> élément de cette page est sélectionné."
+      other: L'ensemble des <strong>%{count}</strong> éléments de cette page est sélectionné.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> élément correspondant à votre recherche est sélectionné."
+      other: L'ensemble des <strong>%{count}</strong> éléments correspondant à votre recherche est sélectionné.
+    changes_saved_msg: Les modifications ont été enregistrées avec succès !
+    copy: Copier
+    delete: Supprimer
+    deselect: Tout déselectionner
+    none: Aucun
+    order_by: Classer par
+    save_changes: Enregistrer les modifications
+    select_all_matching_items:
+      one: Sélectionnez %{count} élément correspondant à votre recherche.
+      other: Sélectionnez tous l'ensemble des %{count} éléments correspondant à votre recherche.
+    today: aujourd’hui
+    validation_errors:
+      one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
+      other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
+  html_validator:
+    invalid_markup: 'contient un balisage HTML invalide: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'
+      over_rows_processing_limit: contient plus de %{count} lignes
+    modes:
+      merge: Fusionner
+      merge_long: Garder les enregistrements existants et ajouter les nouveaux
+      overwrite: Écraser
+      overwrite_long: Remplacer les enregistrements actuels par les nouveaux
+    preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
+    success: Vos données ont été importées avec succès et seront traitées en temps et en heure
+    types:
+      blocking: Liste de comptes bloqués
+      bookmarks: Marque-pages
+      domain_blocking: Liste des serveurs bloqués
+      following: Liste d’utilisateur·rice·s suivi·e·s
+      muting: Liste d’utilisateur·rice·s que vous masquez
+    upload: Importer
+  invites:
+    delete: Désactiver
+    expired: Expiré
+    expires_in:
+      '1800': 30 minutes
+      '21600': 6 heures
+      '3600': 1 heure
+      '43200': 12 heures
+      '604800': 1 semaine
+      '86400': 1 jour
+    expires_in_prompt: Jamais
+    generate: Générer un lien d'invitation
+    invited_by: 'Vous avez été invité·e par :'
+    max_uses:
+      one: 1 utilisation
+      other: "%{count} utilisations"
+    max_uses_prompt: Pas de limite
+    prompt: Générer des liens et les partager avec d'autres personnes pour leur donner accès à ce serveur
+    table:
+      expires_at: Expire
+      uses: Utilisations
+    title: Inviter des gens
+  lists:
+    errors:
+      limit: Vous avez atteint le nombre maximum de listes
+  login_activities:
+    authentication_methods:
+      otp: application d'authentification à deux facteurs
+      password: mot de passe
+      sign_in_token: code de sécurité par courriel
+      webauthn: clés de sécurité
+    description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
+    empty: Aucun historique d'authentification disponible
+    failed_sign_in_html: Tentative de connexion échouée avec %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Connexion réussie avec %{method} de %{ip} (%{browser})
+    title: Historique d'authentification
+  media_attachments:
+    validations:
+      images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images
+      not_ready: Impossible de joindre les fichiers en cours de traitement. Réessayez dans un instant !
+      too_many: Impossible de joindre plus de 4 fichiers
+  migrations:
+    acct: A déménagé vers
+    cancel: Annuler la redirection
+    cancel_explanation: Annuler la redirection réactivera votre compte actuel, mais ne rapportera pas les abonné·e·s qui ont été déplacé·e·s sur ce compte.
+    cancelled_msg: Suppression de la redirection réussie.
+    errors:
+      already_moved: est le même compte que vous avez déjà déplacé vers
+      missing_also_known_as: ne référence pas ce compte en retour
+      move_to_self: ne peut pas être le compte actuel
+      not_found: n'a pas été trouvé
+      on_cooldown: Vous êtes soumis·e à un temps de rechargement
+    followers_count: Abonné·e·s au moment du déménagement
+    incoming_migrations: Déplacement depuis un compte différent
+    incoming_migrations_html: Pour déménager d'un autre compte à celui-ci, vous devez d'abord <a href="%{path}">créer un alias de compte</a>.
+    moved_msg: Votre compte est maintenant redirigé vers %{acct} et vos abonné·e·s sont en train d'être déplacé·e·s.
+    not_redirecting: Votre compte n'est pas redirigé vers un autre compte actuellement.
+    on_cooldown: Vous avez récemment migré votre compte. Cette fonction sera à nouveau disponible dans %{count} jours.
+    past_migrations: Migrations passées
+    proceed_with_move: Migrer les abonné·e·s
+    redirected_msg: Votre compte est maintenant redirigé vers %{acct}.
+    redirecting_to: Votre compte est redirigé vers %{acct}.
+    set_redirect: Définir la redirection
+    warning:
+      backreference_required: Le nouveau compte doit d'abord être configuré pour faire référence à celui-ci en définissant un alias
+      before: 'Avant de procéder, veuillez lire attentivement ces notes :'
+      cooldown: Après le déménagement, il y a une période d’attente pendant laquelle vous ne pourrez pas redéménager
+      disabled_account: Votre compte actuel ne sera pas entièrement utilisable par la suite. Cependant, vous aurez accès à l'exportation de données et à la réactivation.
+      followers: Cette action va déménager tou·te·s les abonné·e·s du compte actuel vers le nouveau compte
+      only_redirect_html: Alternativement, vous pouvez <a href="%{path}">seulement appliquer une redirection sur votre profil</a>.
+      other_data: Aucune autre donnée ne sera déplacée automatiquement
+      redirect: Le profil de votre compte actuel sera mis à jour avec un avis de redirection et sera exclu des recherches
+  moderation:
+    title: Modération
+  move_handler:
+    carry_blocks_over_text: Cet utilisateur que vous aviez bloqué est parti de %{acct}.
+    carry_mutes_over_text: Cet utilisateur que vous aviez masqué est parti de %{acct}.
+    copy_account_note_text: 'Cet·te utilisateur·rice est parti·e de %{acct}, voici vos notes précédentes à son sujet :'
+  navigation:
+    toggle_menu: Basculer l'affichage du menu
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} a soumis un signalement"
+      sign_up:
+        subject: "%{name} s'est inscrit·e"
+    favourite:
+      body: "%{name} a ajouté votre message à ses favoris :"
+      subject: "%{name} a ajouté votre message à ses favoris"
+      title: Nouveau favori
+    follow:
+      body: "%{name} vous suit !"
+      subject: "%{name} vous suit"
+      title: Nouvel·le abonné·e
+    follow_request:
+      action: Gérer les demandes d’abonnement
+      body: "%{name} a demandé à vous suivre"
+      subject: 'Abonné·e en attente : %{name}'
+      title: Nouvelle demande d’abonnement
+    mention:
+      action: Répondre
+      body: "%{name} vous a mentionné⋅e dans :"
+      subject: "%{name} vous a mentionné·e"
+      title: Nouvelle mention
+    poll:
+      subject: Un sondage de %{name} est terminé
+    reblog:
+      body: 'Votre message été partagé par %{name} :'
+      subject: "%{name} a partagé votre message"
+      title: Nouveau partage
+    status:
+      subject: "%{name} vient de publier"
+    update:
+      subject: "%{name} a modifié un message"
+  notifications:
+    email_events: Événements pour les notifications par courriel
+    email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
+    other_settings: Autres paramètres de notifications
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: G
+          million: M
+          quadrillion: P
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Entrez le code généré par votre application d'authentification pour confirmer
+    description_html: Si vous activez <strong>l’authentification à deux facteurs</strong> en utilisant une application d'authentification, votre connexion vous imposera d'être en possession de votre téléphone, ce qui génèrera des jetons que vous devrez saisir.
+    enable: Activer
+    instructions_html: "<strong>Scannez ce code QR dans Google Authenticator ou une application TOTP similaire sur votre téléphone</strong>. À partir de maintenant, cette application générera des jetons que vous devrez entrer lorsque vous vous connecterez."
+    manual_instructions: 'Si vous ne pouvez pas scanner le QR code et que vous devez le saisir manuellement, voici le texte secret en brut :'
+    setup: Mise en place
+    wrong_code: Le code saisi est invalide. L'heure du serveur et l'heure de l'appareil sont-ils corrects ?
+  pagination:
+    newer: Plus récent
+    next: Suivant
+    older: Plus ancien
+    prev: Précédent
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Vous avez déjà voté sur ce sondage
+      duplicate_options: contient des doublons
+      duration_too_long: est trop loin dans le futur
+      duration_too_short: est trop tôt
+      expired: Ce sondage est déjà terminé
+      invalid_choice: L'option de vote choisie n'existe pas
+      over_character_limit: ne peuvent être plus long que %{max} caractères chacun
+      too_few_options: doit avoir plus qu’une proposition
+      too_many_options: ne peut contenir plus de %{max} propositions
+  preferences:
+    other: Autre
+    posting_defaults: Paramètres de publication par défaut
+    public_timelines: Fils publics
+  privacy_policy:
+    title: Politique de confidentialité
+  reactions:
+    errors:
+      limit_reached: Limite de réactions différentes atteinte
+      unrecognized_emoji: n’est pas un émoji reconnu
+  relationships:
+    activity: Activité du compte
+    dormant: Dormant
+    follow_selected_followers: Suivre les abonné·e·s sélectionné·e·s
+    followers: Abonné·e
+    following: Abonnement
+    invited: Invité·e
+    last_active: Dernière activité
+    most_recent: Plus récent
+    moved: Déménagé
+    mutual: Mutuel
+    primary: Primaire
+    relationship: Relation
+    remove_selected_domains: Supprimer tou·te·s les abonné·e·s des domaines sélectionnés
+    remove_selected_followers: Supprimer les abonné·e·s sélectionné·e·s
+    remove_selected_follows: Ne plus suivre les comptes sélectionnés
+    status: État du compte
+  remote_follow:
+    missing_resource: L’URL de redirection requise pour votre compte n’a pas pu être trouvée
+  reports:
+    errors:
+      invalid_rules: ne fait pas référence à des règles valides
+  rss:
+    content_warning: 'Avertissement de contenu :'
+    descriptions:
+      account: Messages publics de @%{acct}
+      tag: 'Messages publics taggés #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Vous avez dépassé la limite de %{limit} messages planifiés par jour
+    over_total_limit: Vous avez dépassé la limite de %{limit} messages planifiés
+    too_soon: La date planifiée doit être dans le futur
+  sessions:
+    activity: Dernière activité
+    browser: Navigateur
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Navigateur inconnu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Session courante
+    description: "%{browser} sur %{platform}"
+    explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
+    ip: Adresse IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: système inconnu
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Révoquer
+    revoke_success: Session révoquée avec succès
+    title: Sessions
+    view_authentication_history: Voir l'historique d'authentification de votre compte
+  settings:
+    account: Compte
+    account_settings: Paramètres du compte
+    aliases: Alias du compte
+    appearance: Apparence
+    authorized_apps: Applications autorisées
+    back: Retour vers Mastodon
+    delete: Suppression du compte
+    development: Développement
+    edit_profile: Modifier le profil
+    export: Export de données
+    featured_tags: Hashtags mis en avant
+    import: Import de données
+    import_and_export: Import et export
+    migrate: Migration de compte
+    notifications: Notifications
+    preferences: Préférences
+    profile: Profil
+    relationships: Abonnements et abonné·e·s
+    statuses_cleanup: Suppression automatique de messages
+    strikes: Sanctions de modération
+    two_factor_authentication: Identification à deux facteurs
+    webauthn_authentication: Clés de sécurité
+  statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audio"
+      description: 'Attaché : %{attached}'
+      image:
+        one: "%{count} image"
+        other: "%{count} images"
+      video:
+        one: "%{count} vidéo"
+        other: "%{count} vidéos"
+    boosted_from_html: Partagé depuis %{acct_link}
+    content_warning: 'Avertissement sur le contenu : %{warning}'
+    default_language: Même langue que celle de l’interface
+    disallowed_hashtags:
+      one: 'contient un hashtag désactivé : %{tags}'
+      other: 'contient les hashtags désactivés : %{tags}'
+    edited_at_html: Édité le %{date}
+    errors:
+      in_reply_not_found: Le message auquel vous essayez de répondre ne semble pas exister.
+    open_in_web: Ouvrir sur le web
+    over_character_limit: limite de %{max} caractères dépassée
+    pin_errors:
+      direct: Les messages qui ne sont visibles que pour les utilisateur·rice·s mentionné·e·s ne peuvent pas être épinglés
+      limit: Vous avez déjà épinglé le nombre maximum de messages
+      ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
+      reblog: Un partage ne peut pas être épinglé
+    poll:
+      total_people:
+        one: "%{count} personne"
+        other: "%{count} personnes"
+      total_votes:
+        one: "%{count} vote"
+        other: "%{count} votes"
+      vote: Voter
+    show_more: Déplier
+    show_newer: Plus récents
+    show_older: Plus anciens
+    show_thread: Afficher le fil de discussion
+    sign_in_to_participate: Inscrivez-vous pour prendre part à la conversation
+    title: "%{name} : « %{quote} »"
+    visibilities:
+      direct: Direct
+      private: Abonné⋅e⋅s uniquement
+      private_long: Afficher seulement à vos vos abonné·e·s
+      public: Publique
+      public_long: Tout le monde peut voir vos messages
+      unlisted: Public sans être affiché sur le fil public
+      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
+  statuses_cleanup:
+    enabled: Supprimer automatiquement vos anciens messages
+    enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous
+    exceptions: Exceptions
+    explanation: Parce que la suppression de messages est une opération lourde, cela se fait lentement au fil du temps lorsque le serveur n'est pas autrement occupé. Pour cette raison, vos messages peuvent être supprimés un peu plus tard que le seuil d'ancienneté défini.
+    ignore_favs: Ignorer les favoris
+    ignore_reblogs: Ignorer les partages
+    interaction_exceptions: Exceptions basées sur les interactions
+    interaction_exceptions_explanation: Notez qu'il n'est pas garanti que les messages soient supprimés s'ils passent sous le seuil des favoris ou des partages une fois qu'ils les ont dépassés.
+    keep_direct: Conserver les messages directs
+    keep_direct_hint: Ne supprime aucun de vos messages directs
+    keep_media: Conserver les messages avec des fichiers médias joints
+    keep_media_hint: Ne supprime pas les messages contenant des fichiers médias joints
+    keep_pinned: Conserver les messages épinglés
+    keep_pinned_hint: Ne supprime aucun de vos messages épinglés
+    keep_polls: Conserver les sondages
+    keep_polls_hint: Ne supprime aucun de vos sondages
+    keep_self_bookmark: Conserver les messages que vous avez mis en marque-page
+    keep_self_bookmark_hint: Ne supprime pas vos propres messages si vous les avez ajoutés aux marque-pages
+    keep_self_fav: Conserver les messages que vous avez mis dans vos favoris
+    keep_self_fav_hint: Ne supprime pas vos propres messages si vous les avez ajoutés à vos favoris
+    min_age:
+      '1209600': 2 semaines
+      '15778476': 6 mois
+      '2629746': 1 mois
+      '31556952': 1 an
+      '5259492': 2 mois
+      '604800': 1 semaine
+      '63113904': 2 ans
+      '7889238': 3 mois
+    min_age_label: Seuil d'ancienneté
+    min_favs: Conserver les messages mis en favoris au moins
+    min_favs_hint: Ne supprime aucun de vos messages qui ont reçu au moins ce nombre de favoris. Laisser vide pour supprimer les messages quel que soit leur nombre de favoris
+    min_reblogs: Conserver les messages partagés au moins
+    min_reblogs_hint: Ne supprime aucun de vos messages qui ont été partagés au moins ce nombre de fois. Laisser vide pour supprimer les messages indépendamment de leur nombre de partages
+  stream_entries:
+    pinned: Message épinglé
+    reblogged: a partagé
+    sensitive_content: Contenu sensible
+  strikes:
+    errors:
+      too_late: Il est trop tard pour faire appel à cette sanction
+  tags:
+    does_not_match_previous_name: ne correspond pas au nom précédent
+  themes:
+    contrast: Mastodon (Contraste élevé)
+    default: Mastodon (Sombre)
+    mastodon-light: Mastodon (Clair)
+  time:
+    formats:
+      default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Ajouter
+    disable: Désactiver
+    disabled_success: L'authentification à deux facteurs a été désactivée avec succès
+    edit: Modifier
+    enabled: L’authentification à deux facteurs est activée
+    enabled_success: Identification à deux facteurs activée avec succès
+    generate_recovery_codes: Générer les codes de récupération
+    lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre compte si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés.
+    methods: Méthodes à deux facteurs
+    otp: Application d'authentification
+    recovery_codes: Codes de récupération
+    recovery_codes_regenerated: Codes de récupération régénérés avec succès
+    recovery_instructions_html: Si vous perdez l’accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour retrouver l’accès à votre compte. <strong>Conservez les codes de récupération en sécurité</strong>. Par exemple, en les imprimant et en les stockant avec vos autres documents importants.
+    webauthn: Clés de sécurité
+  user_mailer:
+    appeal_approved:
+      action: Aller à votre compte
+      explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
+      subject: Votre appel du %{date} a été approuvé
+      title: Appel approuvé
+    appeal_rejected:
+      explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
+      subject: Votre appel du %{date} a été rejeté
+      title: Appel rejeté
+    backup_ready:
+      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+      subject: Votre archive est prête à être téléchargée
+      title: Récupération de l’archive
+    suspicious_sign_in:
+      change_password: changer votre mot de passe
+      details: 'Voici les détails de la connexion :'
+      explanation: Nous avons détecté une connexion à votre compte à partir d’une nouvelle adresse IP.
+      further_actions_html: Si ce n’était pas vous, nous vous recommandons de %{action} immédiatement et d’activer l’authentification à deux facteurs afin de garder votre compte sécurisé.
+      subject: Votre compte a été accédé à partir d'une nouvelle adresse IP
+      title: Une nouvelle connexion
+    warning:
+      appeal: Faire appel
+      appeal_description: Si vous pensez qu'il s'agit d'une erreur, vous pouvez faire appel auprès de l'équipe de %{instance}.
+      categories:
+        spam: Indésirable
+        violation: Le contenu enfreint les directives de la communauté suivantes
+      explanation:
+        delete_statuses: Il a été constaté que certains de vos messages enfreignent une ou plusieurs directives de la communauté. Par conséquent, ils ont été supprimés par l'équipe de modération de %{instance}.
+        disable: Vous ne pouvez plus utiliser votre compte, mais votre profil et d'autres données restent intacts. Vous pouvez demander une sauvegarde de vos données, modifier les paramètres de votre compte ou supprimer votre compte.
+        mark_statuses_as_sensitive: Certains de vos messages ont été marqués comme sensibles par l'équipe de modération de %{instance}. Cela signifie qu'il faudra cliquer sur le média pour pouvoir en afficher un aperçu. Vous pouvez marquer les médias comme sensibles vous-même lorsque vous posterez à l'avenir.
+        sensitive: Désormais, tous vos fichiers multimédias téléchargés seront marqués comme sensibles et cachés derrière un avertissement à cliquer.
+        silence: Vous pouvez toujours utiliser votre compte, mais seules les personnes qui vous suivent déjà verront vos messages sur ce serveur, et vous pourriez être exclu de diverses fonctions de découverte. Cependant, d'autres personnes peuvent toujours vous suivre manuellement.
+        suspend: Vous ne pouvez plus utiliser votre compte, votre profil et vos autres données ne sont plus accessibles. Vous pouvez toujours vous connecter pour demander une sauvegarde de vos données jusqu'à leur suppression complète dans environ 30 jours, mais nous conserverons certaines données de base pour vous empêcher d'échapper à la suspension.
+      reason: 'Motif :'
+      statuses: 'Messages cités :'
+      subject:
+        delete_statuses: Vos messages sur %{acct} ont été supprimés
+        disable: Votre compte %{acct} a été gelé
+        mark_statuses_as_sensitive: Vos messages sur %{acct} ont été marqués comme sensibles
+        none: Avertissement pour %{acct}
+        sensitive: Vos messages sur %{acct} seront désormais marqués comme sensibles
+        silence: Votre compte %{acct} a été limité
+        suspend: Votre compte %{acct} a été suspendu
+      title:
+        delete_statuses: Messages supprimés
+        disable: Compte gelé
+        mark_statuses_as_sensitive: Messages marqués comme sensibles
+        none: Avertissement
+        sensitive: Compte marqué comme sensible
+        silence: Compte limité
+        suspend: Compte suspendu
+    welcome:
+      edit_profile_action: Configuration du profil
+      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
+      explanation: Voici quelques conseils pour vous aider à démarrer
+      final_action: Commencez à publier
+      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
+      full_handle: Votre identifiant complet
+      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
+      subject: Bienvenue sur Mastodon
+      title: Bienvenue à bord, %{name} !
+  users:
+    follow_limit_reached: Vous ne pouvez pas suivre plus de %{limit} personnes
+    invalid_otp_token: Le code d’authentification à deux facteurs est invalide
+    otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+    seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
+    signed_in_as: 'Connecté·e en tant que :'
+  verification:
+    explanation_html: 'Vous pouvez <strong>vous vérifier en tant que propriétaire des liens dans les métadonnées de votre profil</strong>. Pour cela, le site web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour <strong>doit</strong> avoir un attribut <code>rel="me"</code> . Le texte du lien n’a pas d’importance. Voici un exemple :'
+    verification: Vérification
+  webauthn_credentials:
+    add: Ajouter une nouvelle clé de sécurité
+    create:
+      error: Il y a eu un problème en ajoutant votre clé de sécurité. Veuillez réessayer.
+      success: Votre clé de sécurité a été ajoutée avec succès.
+    delete: Supprimer
+    delete_confirmation: Êtes-vous sûr de vouloir supprimer cette clé de sécurité ?
+    description_html: Si vous activez l' <strong>authentification de la clé de sécurité</strong>, la connexion vous demandera d'utiliser l'une de vos clés de sécurité.
+    destroy:
+      error: Il y a eu un problème en supprimant votre clé de sécurité. Veuillez réessayer.
+      success: Votre clé de sécurité a été supprimée avec succès.
+    invalid_credential: Clé de sécurité invalide
+    nickname_hint: Entrez le surnom de votre nouvelle clé de sécurité
+    not_enabled: Vous n'avez pas encore activé WebAuthn
+    not_supported: Ce navigateur ne prend pas en charge les clés de sécurité
+    otp_required: Pour utiliser les clés de sécurité, veuillez d'abord activer l'authentification à deux facteurs.
+    registered_on: Inscrit le %{date}
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1e4892d82..14dd73b85 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,144 +1,83 @@
 ---
 fr:
   about:
-    about_hashtag_html: Voici des messages publics tagués avec <strong>#%{hashtag}</strong>. Vous pouvez interagir avec si vous avez un compte n’importe où dans le fédiverse.
     about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !'
-    about_this: À propos
-    active_count_after: actif·ve·s
-    active_footnote: Nombre mensuel d'utilisateur·rice·s actif·ve·s (NMUA)
-    administered_by: 'Administré par :'
-    api: API
-    apps: Applications mobiles
-    apps_platforms: Utilisez Mastodon depuis iOS, Android et d’autres plates-formes
-    browse_directory: Parcourir l’annuaire des profils et filtrer par centres d’intérêts
-    browse_local_posts: Parcourir un flux en direct de messages publics depuis ce serveur
-    browse_public_posts: Parcourir un flux en direct de messages publics sur Mastodon
-    contact: Contact
     contact_missing: Non défini
     contact_unavailable: Non disponible
-    discover_users: Découvrez des utilisateur·rice·s
-    documentation: Documentation
-    federation_hint_html: Avec un compte sur %{instance}, vous pourrez suivre les gens sur n’importe quel serveur Mastodon et au-delà.
-    get_apps: Essayez une application mobile
-    hosted_on: Serveur Mastodon hébergé par %{domain}
-    instance_actor_flash: |
-      Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un utilisateur individuel.
-      Il est utilisé à des fins de fédération et ne doit pas être bloqué à moins que vous ne vouliez bloquer l’instance entière, auquel cas vous devriez utiliser un bloqueur de domaine.
-    learn_more: En savoir plus
-    privacy_policy: Politique de confidentialité
-    rules: Règles du serveur
-    rules_html: 'Voici un résumé des règles que vous devez suivre si vous voulez avoir un compte sur ce serveur de Mastodon :'
-    see_whats_happening: Voir ce qui se passe
-    server_stats: 'Statistiques du serveur :'
-    source_code: Code source
-    status_count_after:
-      one: statut
-      other: statuts
-    status_count_before: Ayant publié
-    tagline: Suivez vos amis et découvrez-en de nouveaux
-    terms: Conditions d’utilisation
-    unavailable_content: Serveurs modérés
-    unavailable_content_description:
-      domain: Serveur
-      reason: Motif
-      rejecting_media: 'Les fichiers média de ces serveurs ne seront ni traités ni stockés, et aucune miniature ne sera affichée, rendant nécessaire de cliquer vers le fichier d’origine :'
-      rejecting_media_title: Médias filtrés
-      silenced: 'Les messages de ces serveurs seront cachés des flux publics et conversations, et les interactions de leurs utilisateurs ne donneront lieu à aucune notification, à moins que vous ne les suiviez :'
-      silenced_title: Serveurs masqués
-      suspended: 'Aucune donnée venant de ces serveurs ne sera traitée, stockée ou échangée, rendant impossible toute interaction ou communication avec les utilisateurs de ces serveurs :'
-      suspended_title: Serveurs suspendus
-    unavailable_content_html: Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur·rice·s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.
-    user_count_after:
-      one: utilisateur
-      other: utilisateurs
-    user_count_before: Abrite
-    what_is_mastodon: Qu’est-ce que Mastodon ?
+    hosted_on: Serveur Mastodon hébergé sur %{domain}
+    title: À propos
   accounts:
-    choices_html: "%{name} recommande :"
-    endorsements_hint: Vous pouvez recommander des personnes que vous suivez depuis l’interface web, et elles apparaîtront ici.
-    featured_tags_hint: Vous pouvez mettre en avant certains hashtags qui seront affichés ici.
     follow: Suivre
     followers:
-      one: Abonné
+      one: Abonné·e
       other: Abonné·e·s
     following: Abonnements
     instance_actor_flash: Ce compte est un acteur virtuel utilisé pour représenter le serveur lui-même et non un utilisateur individuel. Il est utilisé à des fins de fédération et ne doit pas être suspendu.
-    joined: Inscrit en %{date}
     last_active: dernière activité
     link_verified_on: La propriété de ce lien a été vérifiée le %{date}
-    media: Médias
-    moved_html: "%{name} a changé de compte pour %{new_profile_link} :"
-    network_hidden: Cette information n’est pas disponible
-    never_active: Jamais
     nothing_here: Rien à voir ici !
-    people_followed_by: Personnes suivies par %{name}
-    people_who_follow: Personnes qui suivent %{name}
     pin_errors:
-      following: Vous devez être déjà abonné à la personne que vous désirez recommander
+      following: Vous devez être déjà abonné·e à la personne que vous désirez recommander
     posts:
       one: Message
       other: Messages
     posts_tab_heading: Messages
-    posts_with_replies: Messages et réponses
-    roles:
-      admin: Admin
-      bot: Robot
-      group: Groupe
-      moderator: Modérateur
-    unavailable: Profil non disponible
-    unfollow: Ne plus suivre
   admin:
     account_actions:
-      action: Effectuer une action
+      action: Effectuer l'action
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
       create: Laisser une remarque
       created_msg: Note de modération créée avec succès !
-      delete: Supprimer
       destroyed_msg: Note de modération supprimée avec succès !
     accounts:
-      add_email_domain_block: Mettre le domaine du courriel sur liste noire
+      add_email_domain_block: Bloquer ce domaine de courriel
       approve: Approuver
-      approve_all: Tout approuver
       approved_msg: La demande d’inscription de %{username} a été approuvée avec succès
       are_you_sure: Voulez-vous vraiment faire ça ?
       avatar: Avatar
       by_domain: Domaine
       change_email:
-        changed_msg: Courriel du compte modifié avec succès !
+        changed_msg: Courriel modifié avec succès !
         current_email: Courriel actuel
         label: Modifier le courriel
         new_email: Nouveau courriel
         submit: Modifier le courriel
         title: Modifier le courriel pour %{username}
+      change_role:
+        changed_msg: Rôle modifié avec succès !
+        label: Modifier le rôle
+        no_role: Aucun rôle
+        title: Modifier le rôle de %{username}
       confirm: Confirmer
       confirmed: Confirmé
       confirming: Confirmation
+      custom: Personnalisé
       delete: Supprimer les données
       deleted: Supprimé
       demote: Rétrograder
       destroyed_msg: Les données de %{username} sont maintenant en file d’attente pour être supprimées imminemment
-      disable: Désactiver
+      disable: Geler
       disable_sign_in_token_auth: Désactiver l'authentification basée sur les jetons envoyés par courriel
       disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
-      disabled: Désactivé
+      disabled: Gelé
       display_name: Nom affiché
       domain: Domaine
       edit: Éditer
       email: Courriel
       email_status: État du courriel
-      enable: Activer
+      enable: Dégeler
       enable_sign_in_token_auth: Activer l'authentification basée sur les jetons envoyés par courriel
       enabled: Activé
-      enabled_msg: Le compte de %{username} a été débloqué avec succès
-      followers: Abonnés
+      enabled_msg: Le compte de %{username} a été dégelé avec succès
+      followers: Abonné·e·s
       follows: Abonnements
       header: Entête
       inbox_url: URL d’entrée
       invite_request_text: Raisons de l’adhésion
       invited_by: Invité par
       ip: Adresse IP
-      joined: Inscrit depuis
+      joined: Inscrit·e depuis
       location:
         all: Tous
         local: Local
@@ -146,14 +85,14 @@ fr:
         title: Situation
       login_status: Statut de connexion
       media_attachments: Fichiers médias
-      memorialize: Convertir en mémorial
-      memorialized: Mis en mémoire
+      memorialize: Ériger en mémorial
+      memorialized: Compte érigé en mémorial
       memorialized_msg: Transformation réussie de %{username} en un compte mémorial
       moderation:
         active: Actifs
         all: Tous
         pending: En cours de traitement
-        silenced: Masqués
+        silenced: Limité
         suspended: Suspendus
         title: Modération
       moderation_notes: Notes de modération
@@ -161,9 +100,14 @@ fr:
       most_recent_ip: Adresse IP la plus récente
       no_account_selected: Aucun compte n’a été modifié, car aucun n’a été sélectionné
       no_limits_imposed: Aucune limite imposée
+      no_role_assigned: Aucun rôle assigné
       not_subscribed: Non abonné
       pending: En attente d’approbation
       perform_full_suspension: Suspendre
+      previous_strikes: Sanctions précédentes
+      previous_strikes_description_html:
+        one: Ce compte a reçu <strong>%{count}</strong> sanction.
+        other: Ce compte a reçu <strong>%{count}</strong> sanctions.
       promote: Promouvoir
       protocol: Protocole
       public: Publique
@@ -171,154 +115,180 @@ fr:
       redownload: Rafraîchir le profil
       redownloaded_msg: Le profil de %{username} a été actualisé avec succès depuis l’origine
       reject: Rejeter
-      reject_all: Tout rejeter
       rejected_msg: La demande d’inscription de %{username} a été rejetée avec succès
+      remote_suspension_irreversible: Les données de ce compte ont été supprimées définitivement.
+      remote_suspension_reversible_hint_html: Ce compte a été suspendu par son serveur d'accueil, et les données rattachées seront supprimées le %{date}. Jusqu'à cette date, il peut être restauré sans aucune perte par le serveur distant. Si vous souhaitez supprimer immédiatement toutes les données de ce compte, vous pouvez le faire ci-dessous.
       remove_avatar: Supprimer l’avatar
       remove_header: Supprimer l’entête
       removed_avatar_msg: L’avatar de %{username} a été supprimé avec succès
       removed_header_msg: L’image d’en-tête de %{username} a été supprimée avec succès
       resend_confirmation:
-        already_confirmed: Cet utilisateur est déjà confirmé
+        already_confirmed: Cet·te utilisateur·rice est déjà confirmé·e
         send: Renvoyer un courriel de confirmation
         success: Courriel de confirmation envoyé avec succès !
       reset: Réinitialiser
       reset_password: Réinitialiser le mot de passe
       resubscribe: Se réabonner
-      role: Permissions
-      roles:
-        admin: Administrateur
-        moderator: Modérateur
-        staff: Équipe
-        user: Utilisateur
+      role: Rôle
       search: Rechercher
-      search_same_email_domain: Autres utilisateurs avec le même domaine de courriel
-      search_same_ip: Autres utilisateurs avec la même IP
+      search_same_email_domain: Autres utilisateurs·trices avec le même domaine de courriel
+      search_same_ip: Autres utilisateur·rice·s avec la même IP
       security_measures:
         only_password: Mot de passe uniquement
-        password_and_2fa: Mot de passe et 2FA
-        password_and_sign_in_token: Mot de passe et jeton par courriel
+        password_and_2fa: Mot de passe et A2F
       sensitive: Sensible
       sensitized: marqué comme sensible
       shared_inbox_url: URL de la boite de réception partagée
       show:
         created_reports: Signalements faits
         targeted_reports: Signalés par d’autres
-      silence: Masquer
-      silenced: Masqué
-      statuses: Statuts
+      silence: Limiter
+      silenced: Limité
+      statuses: Messages
+      strikes: Punitions précédentes
       subscribe: S’abonner
+      suspend: Suspendre
       suspended: Suspendu
       suspension_irreversible: Les données de ce compte ont été irréversiblement supprimées. Vous pouvez annuler la suspension du compte pour le rendre utilisable, mais il ne récupérera aucune donnée qu’il avait auparavant.
       suspension_reversible_hint_html: Le compte a été suspendu et les données seront complètement supprimées le %{date}. D’ici là, le compte peut être restauré sans aucun effet néfaste. Si vous souhaitez supprimer toutes les données du compte immédiatement, vous pouvez le faire ci-dessous.
-      time_in_queue: En file d’attente %{time}
       title: Comptes
+      unblock_email: Débloquer l'adresse courriel
+      unblocked_email_msg: L'adresse courriel de %{username} a été débloquée avec succès
       unconfirmed_email: Courriel non confirmé
       undo_sensitized: Annuler sensible
-      undo_silenced: Ne plus masquer
+      undo_silenced: Annuler la limitation
       undo_suspension: Annuler la suspension
-      unsilenced_msg: Le compte de %{username} a été illimité avec succès
+      unsilenced_msg: La limitation du compte de %{username} a été annulée avec succès
       unsubscribe: Se désabonner
       unsuspended_msg: Le compte de %{username} a été réactivé avec succès
-      username: Nom d’utilisateur
+      username: Nom d’utilisateur·ice
       view_domain: Voir le résumé du domaine
       warn: Avertissement
       web: Web
       whitelisted: Sur liste blanche
     action_logs:
       action_types:
+        approve_appeal: Approuver l'appel
+        approve_user: Approuver l’utilisateur
         assigned_to_self_report: Affecter le signalement
-        change_email_user: Modifier le courriel pour
+        change_email_user: Modifier le courriel pour ce compte
+        change_role_user: Changer le rôle de l’utilisateur·rice
         confirm_user: Confirmer l’utilisateur
         create_account_warning: Créer une alerte
         create_announcement: Créer une annonce
+        create_canonical_email_block: Créer un blocage de domaine de courriel
         create_custom_emoji: Créer des émojis personnalisés
         create_domain_allow: Créer un domaine autorisé
         create_domain_block: Créer un blocage de domaine
         create_email_domain_block: Créer un blocage de domaine de courriel
         create_ip_block: Créer une règle IP
         create_unavailable_domain: Créer un domaine indisponible
-        demote_user: Rétrograder l’utilisateur
+        create_user_role: Créer le rôle
+        demote_user: Rétrograder l’utilisateur·ice
         destroy_announcement: Supprimer l’annonce
+        destroy_canonical_email_block: Supprimer le blocage de domaine de courriel
         destroy_custom_emoji: Supprimer des émojis personnalisés
         destroy_domain_allow: Supprimer le domaine autorisé
         destroy_domain_block: Supprimer le blocage de domaine
         destroy_email_domain_block: Supprimer le blocage de domaine de courriel
+        destroy_instance: Purge du domaine
         destroy_ip_block: Supprimer la règle IP
-        destroy_status: Supprimer le statut
+        destroy_status: Supprimer le message
         destroy_unavailable_domain: Supprimer le domaine indisponible
+        destroy_user_role: Détruire le rôle
         disable_2fa_user: Désactiver l’A2F
         disable_custom_emoji: Désactiver les émojis personnalisés
-        disable_sign_in_token_auth_user: Désactiver l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur
-        disable_user: Désactiver l’utilisateur
+        disable_sign_in_token_auth_user: Désactiver l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
+        disable_user: Désactiver le compte
         enable_custom_emoji: Activer les émojis personnalisées
-        enable_sign_in_token_auth_user: Activer l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur
+        enable_sign_in_token_auth_user: Activer l'authentification basée sur les jetons envoyés par courriel pour l'utilisateur·rice
         enable_user: Activer l’utilisateur
-        memorialize_account: Se souvenir du compte
+        memorialize_account: Ériger en mémorial
         promote_user: Promouvoir l’utilisateur
+        reject_appeal: Rejeter l'appel
+        reject_user: Rejeter l’utilisateur
         remove_avatar_user: Supprimer l’avatar
         reopen_report: Rouvrir le signalement
+        resend_user: Renvoyer l'e-mail de confirmation
         reset_password_user: Réinitialiser le mot de passe
         resolve_report: Résoudre le signalement
         sensitive_account: Marquer les médias de votre compte comme sensibles
-        silence_account: Masque le compte
+        silence_account: Limiter le compte
         suspend_account: Suspendre le compte
         unassigned_report: Ne plus assigner le signalement
+        unblock_email_account: Débloquer l'adresse courriel
         unsensitive_account: Ne pas marquer les médias de votre compte comme sensibles
-        unsilence_account: Ne plus masquer le compte
+        unsilence_account: Annuler la limitation du compte
         unsuspend_account: Annuler la suspension du compte
         update_announcement: Modifier l’annonce
         update_custom_emoji: Mettre à jour les émojis personnalisés
         update_domain_block: Mettre à jour le blocage de domaine
-        update_status: Mettre à jour le statut
+        update_ip_block: Mettre à jour la règle IP
+        update_status: Mettre à jour le message
+        update_user_role: Mettre à jour le rôle
       actions:
-        assigned_to_self_report_html: "%{name} s’est assigné le signalement de %{target}"
-        change_email_user_html: "%{name} a modifié l'adresse de courriel de l'utilisateur %{target}"
-        confirm_user_html: "%{name} a confirmé l'adresse courriel de l'utilisateur·rice %{target}"
+        approve_appeal_html: "%{name} a approuvé l'appel de la décision de modération émis par %{target}"
+        approve_user_html: "%{name} a approuvé l’inscription de %{target}"
+        assigned_to_self_report_html: "%{name} s’est assigné·e le signalement de %{target}"
+        change_email_user_html: "%{name} a modifié l'adresse de courriel de l'utilisateur·rice %{target}"
+        change_role_user_html: "%{name} a changé le rôle de %{target}"
+        confirm_user_html: "%{name} a confirmé l'adresse courriel de l'utilisateur %{target}"
         create_account_warning_html: "%{name} a envoyé un avertissement à %{target}"
         create_announcement_html: "%{name} a créé une nouvelle annonce %{target}"
+        create_canonical_email_block_html: "%{name} a bloqué l’e-mail avec le hachage %{target}"
         create_custom_emoji_html: "%{name} a téléversé un nouvel émoji %{target}"
         create_domain_allow_html: "%{name} a autorisé la fédération avec le domaine %{target}"
         create_domain_block_html: "%{name} a bloqué le domaine %{target}"
         create_email_domain_block_html: "%{name} a bloqué de domaine de courriel %{target}"
         create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
         create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
-        demote_user_html: "%{name} a rétrogradé l'utilisateur %{target}"
+        create_user_role_html: "%{name} a créé le rôle %{target}"
+        demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
         destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
-        destroy_custom_emoji_html: "%{name} a détruit l'émoji %{target}"
+        destroy_canonical_email_block_html: "%{name} a débloqué l'email avec le hash %{target}"
+        destroy_custom_emoji_html: "%{name} a supprimé l'émoji %{target}"
         destroy_domain_allow_html: "%{name} a rejeté la fédération avec le domaine %{target}"
         destroy_domain_block_html: "%{name} a débloqué le domaine %{target}"
         destroy_email_domain_block_html: "%{name} a débloqué le domaine de courriel %{target}"
+        destroy_instance_html: "%{name} a purgé le domaine %{target}"
         destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
-        destroy_status_html: "%{name} a supprimé le statut de %{target}"
+        destroy_status_html: "%{name} a supprimé le message de %{target}"
         destroy_unavailable_domain_html: "%{name} a repris la livraison au domaine %{target}"
-        disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur %{target}"
+        destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
+        disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
         disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
-        disable_user_html: "%{name} a désactivé la connexion de l'utilisateur %{target}"
+        disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
         enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
         enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification basée sur les jetons envoyés par courriel pour %{target}"
-        enable_user_html: "%{name} a activé la connexion de l'utilisateur %{target}"
+        enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
         memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
-        promote_user_html: "%{name} a promu l'utilisateur %{target}"
+        promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
+        reject_appeal_html: "%{name} a rejeté l'appel de la décision de modération émis par %{target}"
+        reject_user_html: "%{name} a rejeté l’inscription de %{target}"
         remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
         reopen_report_html: "%{name} a rouvert le signalement %{target}"
-        reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur %{target}"
+        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
+        reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
         resolve_report_html: "%{name} a résolu le signalement %{target}"
         sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
-        silence_account_html: "%{name} a masqué le compte de %{target}"
+        silence_account_html: "%{name} a limité le compte de %{target}"
         suspend_account_html: "%{name} a suspendu le compte de %{target}"
         unassigned_report_html: "%{name} a désassigné le signalement %{target}"
+        unblock_email_account_html: "%{name} a débloqué l'adresse courriel de %{target}"
         unsensitive_account_html: "%{name} a enlevé le marquage comme sensible du média de %{target}"
-        unsilence_account_html: "%{name} a enlevé le masquage du compte de %{target}"
+        unsilence_account_html: "%{name} a annulé la limitation du compte de %{target}"
         unsuspend_account_html: "%{name} a réactivé le compte de %{target}"
         update_announcement_html: "%{name} a mis à jour l'annonce %{target}"
         update_custom_emoji_html: "%{name} a mis à jour l'émoji %{target}"
         update_domain_block_html: "%{name} a mis à jour le blocage de domaine pour %{target}"
-        update_status_html: "%{name} a mis à jour le statut de %{target}"
-      deleted_status: "(statut supprimé)"
+        update_ip_block_html: "%{name} a modifié la règle pour l'IP %{target}"
+        update_status_html: "%{name} a mis à jour le message de %{target}"
+        update_user_role_html: "%{name} a changé le rôle %{target}"
+      deleted_account: compte supprimé
       empty: Aucun journal trouvé.
       filter_by_action: Filtrer par action
-      filter_by_user: Filtrer par utilisateur
+      filter_by_user: Filtrer par utilisateur·ice
       title: Journal d’audit
     announcements:
       destroyed_msg: Annonce supprimée avec succès !
@@ -334,7 +304,7 @@ fr:
       scheduled_for: Planifiée pour %{time}
       scheduled_msg: Annonce planifiée pour publication !
       title: Annonces
-      unpublish: Supprimer la publication
+      unpublish: Retirer l'annonce
       unpublished_msg: L’annonce a été dépubliée avec succès !
       updated_msg: L’annonce a été mise à jour avec succès !
     custom_emojis:
@@ -346,7 +316,7 @@ fr:
       create_new_category: Créer une nouvelle catégorie
       created_msg: Émoji créé avec succès !
       delete: Supprimer
-      destroyed_msg: Émoji supprimé avec succès!
+      destroyed_msg: Émoji supprimé avec succès !
       disable: Désactiver
       disabled: Désactivé
       disabled_msg: Émoji désactivé avec succès
@@ -354,11 +324,12 @@ fr:
       enable: Activer
       enabled: Activé
       enabled_msg: Émoji activé avec succès
-      image_hint: PNG de moins de 50 Ko
+      image_hint: PNG ou GIF de moins de %{size}
       list: Lister
       listed: Listé
       new:
         title: Ajouter un nouvel émoji personnalisé
+      no_emoji_selected: Aucun émoji n’a été modifié, car aucun n’a été sélectionné
       not_permitted: Vous n’êtes pas autorisé à effectuer cette action
       overwrite: Écraser
       shortcode: Raccourci
@@ -368,7 +339,7 @@ fr:
       unlist: Délister
       unlisted: Délisté
       update_failed_msg: Cet émoji n'a pas pu être mis à jour
-      updated_msg: Émoji mis à jour avec succès!
+      updated_msg: Émoji mis à jour avec succès !
       upload: Téléverser
     dashboard:
       active_users: utilisateurs actifs
@@ -376,15 +347,18 @@ fr:
       media_storage: Stockage des médias
       new_users: nouveaux utilisateurs
       opened_reports: rapports ouverts
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> appel en attente"
+        other: "<strong>%{count}</strong> appels en attente"
       pending_reports_html:
-        one: "<strong>1</strong> rapport en attente"
+        one: "<strong>%{count}</strong> rapport en attente"
         other: "<strong>%{count}</strong> rapports en attente"
       pending_tags_html:
-        one: "<strong>1</strong> hashtag en attente"
+        one: "<strong>%{count}</strong> hashtag en attente"
         other: "<strong>%{count}</strong> hashtags en attente"
       pending_users_html:
-        one: "<strong>1</strong> utilisateur en attente"
-        other: "<strong>%{count}</strong> utilisateurs en attente"
+        one: "<strong>%{count}</strong> utilisateur·rice en attente"
+        other: "<strong>%{count}</strong> utilisateur·rice·s en attente"
       resolved_reports: rapports résolus
       software: Logiciel
       sources: Sources d'inscription
@@ -393,29 +367,40 @@ fr:
       top_languages: Langues les plus actives
       top_servers: Serveurs les plus actifs
       website: Site Web
+    disputes:
+      appeals:
+        empty: Aucun appel trouvé.
+        title: Appels
     domain_allows:
       add_new: Mettre le domaine sur liste sur blanche
       created_msg: Ce domaine a été ajouté à la liste blanche avec succès
       destroyed_msg: Le domaine a été supprimé de la liste blanche
+      export: Exporter
+      import: Importer
       undo: Supprimer de la liste blanche
     domain_blocks:
       add_new: Bloquer un nouveau domaine
       created_msg: Le blocage de domaine est désormais activé
       destroyed_msg: Le blocage de domaine a été désactivé
       domain: Domaine
-      edit: Modifier le bloqueur de domaine
-      existing_domain_block_html: Vous avez déjà imposé des limites plus strictes à %{name}, vous devez d’abord le <a href="%{unblock_url}">débloquer</a>.
+      edit: Modifier le blocage de domaine
+      existing_domain_block: Vous avez déjà imposé des limites plus strictes à %{name}.
+      existing_domain_block_html: Vous avez déjà imposé des limites plus strictes à %{name}, vous devez d’abord le/la <a href="%{unblock_url}">débloquer</a>.
+      export: Exporter
+      import: Importer
       new:
         create: Créer le blocage
         hint: Le blocage de domaine n’empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
         severity:
-          desc_html: "<strong>Masquer</strong> rendra les messages des comptes concernés invisibles à ceux qui ne les suivent pas. <strong>Suspendre</strong> supprimera tout le contenu des comptes concernés, les médias, et les données du profil. Utilisez <strong>Aucune</strong> si vous voulez simplement rejeter les fichiers multimédia."
+          desc_html: "<strong>Limiter</strong> rendra les messages des comptes de ce domaine invisibles à ceux qui ne les suivent pas. <strong>Suspendre</strong> supprimera tout le contenu, les médias, et données de profile pour les comptes de ce domaine de votre serveur. Utilisez <strong>Aucun</strong> si vous voulez simplement rejeter les fichiers multimédia."
           noop: Aucune
-          silence: Masqué
+          silence: Limiter
           suspend: Suspendre
         title: Nouveau blocage de domaine
+      no_domain_block_selected: Aucun blocage de domaine n'a été modifié car aucun n'a été sélectionné
+      not_permitted: Vous n’êtes pas autorisé à effectuer cette action
       obfuscate: Obfusquer le nom de domaine
-      obfuscate_hint: Obfusquer partiellement le nom de domaine dans la liste si la liste des limitations de domaine est activée
+      obfuscate_hint: Obfusquer partiellement le nom de domaine dans la liste si la publication de la liste des limitations de domaine est activée
       private_comment: Commentaire privé
       private_comment_hint: Commentaire sur cette limitation de domaine pour informer en interne les modérateurs.
       public_comment: Commentaire public
@@ -424,36 +409,43 @@ 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: Rejeter les signalements
       reject_reports_hint: Ignorez tous les signalements provenant de ce domaine. Ne concerne pas les suspensions
-      rejecting_media: rejet des fichiers multimédia
-      rejecting_reports: rejet des signalements
-      severity:
-        silence: masqué
-        suspend: suspendu
-      show:
-        affected_accounts:
-          one: Un compte affecté dans la base de données
-          other: "%{count} comptes affectés dans la base de données"
-        retroactive:
-          silence: Ne plus masquer les comptes existants affectés de ce domaine
-          suspend: Annuler la suspension des comptes existants affectés pour ce domaine
-        title: Annuler le blocage du domaine %{domain}
-        undo: Annuler
-      undo: Annuler le bloqueur de domaine
-      view: Afficher les bloqueurs de domaines
+      undo: Annuler le blocage de domaine
+      view: Afficher les blocages de domaines
     email_domain_blocks:
       add_new: Ajouter
+      attempts_over_week:
+        one: "%{count} tentative au cours de la dernière semaine"
+        other: "%{count} tentatives au cours de la dernière semaine"
       created_msg: Le blocage de domaine de courriel est désormais activé
       delete: Supprimer
-      destroyed_msg: Le blocage de domaine de courriel a été désactivé
+      dns:
+        types:
+          mx: Enregistrement MX
       domain: Domaine
-      empty: Aucun domaine de courriel n’est actuellement sur liste noire.
-      from_html: de %{domain}
       new:
         create: Créer le blocage
+        resolve: Résoudre le domaine
         title: Nouveau blocage de domaine de courriel
+      no_email_domain_block_selected: Aucun blocage de domaine de courriel n'a été modifié car aucun n'a été sélectionné
+      resolved_dns_records_hint_html: Le nom de domaine est relié aux domaines MX suivants, qui ont la responsabilité ultime d'accepter les courriels. Bloquer un domaine MX empêchera les inscriptions à partir de toute adresse courriel utilisant le même domaine MX, même si le nom de domaine affiché est différent. <strong> Veillez à ne pas bloquer les fournisseurs de messagerie d'envergure.</strong>
+      resolved_through_html: Résolu par %{domain}
       title: Blocage de domaines de courriel
+    export_domain_allows:
+      new:
+        title: Autoriser l'importation de domaine
+      no_file: Aucun fichier sélectionné
+    export_domain_blocks:
+      import:
+        description_html: Vous êtes sur le point d'importer une liste de blocs de domaine. Veuillez examiner cette liste très attentivement, spécialement si vous n'êtes pas l'auteur de cette liste.
+        existing_relationships_warning: Relations de suivi existantes
+        private_comment_description_html: 'Pour vous aider à suivre d''où viennent les blocs importés, des blocs importés seront créés avec le commentaire privé suivant : <q>%{comment}</q>'
+        private_comment_template: Importé depuis %{source} le %{date}
+        title: Importer des blocs de domaine
+      new:
+        title: Importer des blocs de domaine
+      no_file: Aucun fichier sélectionné
     follow_recommendations:
-      description_html: "<strong>Les recommandations d'abonnement aident les nouvelles personnes à trouver rapidement du contenu intéressant</strong>. Si un utilisateur n'a pas assez interagi avec les autres pour avoir des recommandations personnalisées, ces comptes sont alors recommandés. La sélection est mise à jour quotidiennement depuis un mélange de comptes ayant le plus d'interactions récentes et le plus grand nombre d'abonnés locaux pour une langue donnée."
+      description_html: "<strong>Les recommandations d'abonnement aident les nouvelles personnes à trouver rapidement du contenu intéressant</strong>. Si un·e utilisateur·rice n'a pas assez interagi avec les autres pour avoir des recommandations personnalisées, ces comptes sont alors recommandés. La sélection est mise à jour quotidiennement depuis un mélange de comptes ayant le plus d'interactions récentes et le plus grand nombre d'abonné·e·s locaux pour une langue donnée."
       language: Pour la langue
       status: État
       suppress: Supprimer les recommandations d'abonnement
@@ -461,25 +453,53 @@ fr:
       title: Recommandations d'abonnement
       unsuppress: Rétablir les recommandations d'abonnement
     instances:
+      availability:
+        description_html:
+          one: Si la livraison au domaine échoue pendant <strong>%{count} jour</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
+          other: Si la livraison au domaine échoue pendant <strong>%{count} jours différents</strong>, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine ne soit reçue.
+        failure_threshold_reached: Le seuil de défaillance a été atteint le %{date}.
+        failures_recorded:
+          one: Tentative échouée pendant %{count} jour.
+          other: Tentatives échouées pendant %{count} jours différents.
+        no_failures_recorded: Pas d'échec enregistré.
+        title: Disponibilité
+        warning: La dernière tentative de connexion à ce serveur a échoué
       back_to_all: Tout
       back_to_limited: Limité
       back_to_warning: Avertissement
       by_domain: Domaine
+      confirm_purge: Êtes-vous sûr de vouloir supprimer définitivement les données de ce domaine ?
+      content_policies:
+        comment: Note interne
+        description_html: Vous pouvez définir des politiques de contenu qui seront appliquées à tous les comptes de ce domaine et à tous ses sous-domaines.
+        policies:
+          reject_media: Rejeter les médias
+          reject_reports: Rejeter les signalements
+          silence: Limiter
+          suspend: Suspendre
+        policy: Règlement
+        reason: Raison publique
+        title: Politiques de contenu
+      dashboard:
+        instance_accounts_dimension: Comptes les plus suivis
+        instance_accounts_measure: comptes stockés
+        instance_followers_measure: nos abonné⋅e⋅s là-bas
+        instance_follows_measure: leurs abonné⋅e⋅s ici
+        instance_languages_dimension: Langues les plus utilisées
+        instance_media_attachments_measure: fichiers médias stockés
+        instance_reports_measure: signalements mentionnant l'instance
+        instance_statuses_measure: messages stockés
       delivery:
         all: Tout
         clear: Effacer les erreurs de livraison
+        failing: Échouant
         restart: Redémarrer la livraison
         stop: Arrêter la livraison
-        title: Livraison
         unavailable: Indisponible
-        unavailable_message: Livraison indisponible
-        warning: Avertissement
-        warning_message:
-          one: Échec de livraison %{count} jour
-          other: Échec de livraison %{count} jours
       delivery_available: Livraison disponible
       delivery_error_days: Jours d'erreur de livraison
       delivery_error_hint: Si la livraison n'est pas possible pendant %{count} jours, elle sera automatiquement marquée comme non livrable.
+      destroyed_msg: Les données de %{domain} sont maintenant en file d'attente pour une suppression imminente.
       empty: Aucun domaine trouvé.
       known_accounts:
         one: "%{count} compte connu"
@@ -490,12 +510,15 @@ fr:
         title: Modération
       private_comment: Commentaire privé
       public_comment: Commentaire public
+      purge: Purge
+      purge_description_html: Si vous pensez que ce domaine est définitivement hors service, vous pouvez supprimer de votre espace de stockage toutes les traces des comptes de ce domaine et les données associées. Cela peut prendre du temps.
       title: Fédération
       total_blocked_by_us: Bloqués par nous
       total_followed_by_them: Suivi par eux
       total_followed_by_us: Suivi par nous
       total_reported: Signalements à leur sujet
       total_storage: Attachements de média
+      totals_time_period_hint_html: Les totaux affichés ci-dessous incluent des données sans limite de temps.
     invites:
       deactivate_all: Tout désactiver
       filter:
@@ -519,8 +542,6 @@ fr:
         title: Créer une nouvelle règle IP
       no_ip_block_selected: Aucune règle IP n’a été modifiée car aucune n’a été sélectionnée
       title: Règles IP
-    pending_accounts:
-      title: Comptes en attente (%{count})
     relationships:
       title: Relations de %{acct}
     relays:
@@ -547,183 +568,324 @@ fr:
         notes:
           one: "%{count} note"
           other: "%{count} notes"
-        reports:
-          one: "%{count} signalement"
-          other: "%{count} signalements"
+      action_log: Journal d’audit
       action_taken_by: Intervention de
+      actions:
+        delete_description_html: Les messages signalés seront supprimés et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
+        mark_as_sensitive_description_html: Les médias des messages signalés seront marqués comme sensibles et une sanction sera enregistrée pour vous aider à prendre les mesures appropriées en cas d'infractions futures par le même compte.
+        other_description_html: Voir plus d'options pour contrôler le comportement du compte et personnaliser la communication vers le compte signalé.
+        resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
+        silence_description_html: Le profil ne sera visible que pour ceux qui le suivent déjà ou le consultent manuellement, ce qui limite considérablement sa portée. Peut toujours être restauré.
+        suspend_description_html: Le profil et tout son contenu deviendront inaccessibles jusqu'à ce qu'il soit éventuellement supprimé. Interagir avec le compte sera impossible. Réversible dans les 30 jours.
+      actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
+      add_to_report: Ajouter davantage au rapport
       are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
+      by_target_domain: Domaine du compte signalé
+      category: Catégorie
+      category_description_html: La raison pour laquelle ce compte et/ou ce contenu a été signalé sera citée dans la communication avec le compte signalé
       comment:
         none: Aucun
+      comment_description_html: 'Pour fournir plus d''informations, %{name} a écrit :'
       created_at: Signalé
+      delete_and_resolve: Supprimer les messages
       forwarded: Transféré
       forwarded_to: Transféré à %{domain}
       mark_as_resolved: Marquer comme résolu
+      mark_as_sensitive: Marquer comme sensible
       mark_as_unresolved: Marquer comme non-résolu
+      no_one_assigned: Personne
       notes:
         create: Ajouter une note
         create_and_resolve: Résoudre avec une note
         create_and_unresolve: Ré-ouvrir avec une note
         delete: Supprimer
         placeholder: Décrivez quelles actions ont été prises, ou toute autre mise à jour…
+        title: Remarques
+      notes_description_html: Voir et laisser des notes aux autres modérateurs et à votre futur moi-même
+      quick_actions_description_html: 'Faites une action rapide ou faites défiler vers le bas pour voir le contenu signalé :'
+      remote_user_placeholder: l'utilisateur·rice distant·e de %{instance}
       reopen: Ré-ouvrir le signalement
       report: 'Signalement #%{id}'
       reported_account: Compte signalé
       reported_by: Signalé par
       resolved: Résolus
       resolved_msg: Signalement résolu avec succès !
+      skip_to_actions: Passer aux actions
       status: Statut
-      target_domain: Domaine du compte signalé
+      statuses: Contenu signalé
+      statuses_description_html: Le contenu offensant sera cité dans la communication avec le compte signalé
       target_origin: Origine du compte signalé
       title: Signalements
       unassign: Dés-assigner
       unresolved: Non résolus
       updated_at: Mis à jour
+      view_profile: Voir le profil
+    roles:
+      add_new: Ajouter un rôle
+      assigned_users:
+        one: "%{count} utilisateur·rice"
+        other: "%{count} utilisateur·rice·s"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Invitations
+        moderation: Modération
+        special: Spécial
+      delete: Supprimer
+      description_html: Les <strong>rôles utilisateur</strong> vous permettent de personnaliser les fonctions et les zones de Mastodon auxquelles vos utilisateur⋅rice⋅s peuvent accéder.
+      edit: Modifier le rôle '%{name}'
+      everyone: Autorisations par défaut
+      everyone_full_description_html: Ceci est le <strong>rôle de base</strong> qui impacte <strong>tou⋅te⋅s les utilisateur⋅rice⋅s</strong>, même celleux sans rôle assigné. Tous les autres rôles héritent des autorisations de celui-ci.
+      permissions_count:
+        one: "%{count} autorisation"
+        other: "%{count} autorisations"
+      privileges:
+        administrator: Administrateur·rice
+        administrator_description: Les utilisateur⋅rice⋅s ayant cette autorisation pourront contourner toutes les autorisations
+        delete_user_data: Supprimer les données de l'utilisateur⋅rice
+        delete_user_data_description: Permet aux utilisateur⋅rice⋅s de supprimer sans délai les données des autres utilisateur⋅rice⋅s
+        invite_users: Inviter des utilisateur⋅rice⋅s
+        invite_users_description: Permet aux utilisateur⋅rice⋅s d'inviter de nouvelles personnes sur le serveur
+        manage_announcements: Gérer les annonces
+        manage_announcements_description: Permet aux utilisateur⋅rice⋅s de gérer les annonces sur le serveur
+        manage_appeals: Gérer les contestations
+        manage_appeals_description: Permet aux utilisateur⋅rice⋅s d'examiner les appels contre les actions de modération
+        manage_blocks: Gérer les blocages
+        manage_blocks_description: Permet aux utilisateur⋅rice⋅s de bloquer des fournisseurs de courriel et des adresses IP
+        manage_custom_emojis: Gérer les émojis personnalisés
+        manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
+        manage_federation: Gérer de la féderation
+        manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison
+        manage_invites: Gérer les invitations
+        manage_invites_description: Permet aux utilisateur⋅rice⋅s de parcourir et de désactiver les liens d'invitation
+        manage_reports: Gérer les rapports
+        manage_reports_description: Permet aux utilisateur⋅rice⋅s d'examiner les signalements et d'effectuer des actions de modération en conséquence
+        manage_roles: Gérer les rôles
+        manage_roles_description: Permet aux utilisateur⋅rice⋅s de gérer et d'assigner des rôles inférieurs au leur
+        manage_rules: Gérer les règles
+        manage_rules_description: Permet aux utilisateur·rice·s de modifier les règles du serveur
+        manage_settings: Gérer les paramètres
+        manage_settings_description: Permet aux utilisateur·rice·s de modifier les paramètres du site
+        manage_taxonomies: Gérer les taxonomies
+        manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
+        manage_user_access: Gérer l'accès utilisateur
+        manage_user_access_description: Permet aux utilisateur⋅rice⋅s de désactiver l'authentification à deux facteurs, de modifier l'adresse courriel et de réinitialiser le mot de passe des autres utilisateur⋅rice⋅s
+        manage_users: Gérer les utilisateur·rice·s
+        manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
+        manage_webhooks: Gérer les points d’ancrage web
+        manage_webhooks_description: Permet aux utilisateur⋅rice⋅s de configurer des webhooks pour des événements d'administration
+        view_audit_log: Afficher le journal d'audit
+        view_audit_log_description: Permet aux utilisateur⋅rice⋅s de voir l'historique des opérations d'administration sur le serveur
+        view_dashboard: Voir le tableau de bord
+        view_dashboard_description: Permet aux utilisateur⋅rice⋅s d'accéder au tableau de bord et à diverses statistiques
+        view_devops: DevOps
+        view_devops_description: Permet aux utilisateur⋅rice⋅s d'accéder aux tableaux de bord Sidekiq et pgHero
+      title: Rôles
     rules:
       add_new: Ajouter une règle
       delete: Supprimer
-      description_html: Bien que la plupart des gens prétende avoir lu les conditions d'utilisation avant de les accepter, généralement les utilisateurs ne les lisent vraiment que lorsque un problème apparaît. <strong>Pour faciliter la visualisation des règles de votre serveur en un seul coup d’œil, présentez-les sous la forme d'une liste à puces !</strong> Essayez de garder chacune des règles simple et concise, mais faites attention à ne pas non plus les diviser en de trop nombreux éléments distincts.
+      description_html: Bien que la plupart des gens prétende avoir lu les conditions d'utilisation avant de les accepter, généralement les utilisateur·rice·s ne les lisent vraiment que lorsque un problème apparaît. <strong>Pour faciliter la visualisation des règles de votre serveur en un seul coup d’œil, présentez-les sous la forme d'une liste à puces !</strong> Essayez de garder chacune des règles simple et concise, mais faites attention à ne pas non plus les diviser en de trop nombreux éléments distincts.
       edit: Modifier la règle
       empty: Aucune règle de serveur n'a été définie pour l'instant.
       title: Règles du serveur
     settings:
-      activity_api_enabled:
-        desc_html: Nombre de statuts affichés localement, de comptes actifs et de nouvelles inscriptions regroupés par semaine
-        title: Publier des statistiques agrégées sur l’activité des utilisateurs
-      bootstrap_timeline_accounts:
-        desc_html: Séparez les noms d’utilisateurs par des virgules. Ne fonctionne qu’avec des comptes locaux et non verrouillés. Si laissé vide, tous les administrateurs locaux sont sélectionnés
-        title: Abonnements par défaut pour les nouveaux utilisateurs
-      contact_information:
-        email: Entrez une adresse courriel publique
-        username: Entrez un nom d’utilisateur·ice
-      custom_css:
-        desc_html: Modifier l’apparence avec une CSS chargée sur chaque page
-        title: CSS personnalisé
+      about:
+        manage_rules: Gérer les règles du serveur
+        preamble: Fournissez des informations détaillées sur le fonctionnement, la modération et le financement du serveur.
+        rules_hint: Il y a un espace dédié pour les règles auxquelles vos utilisateurs sont invités à adhérer.
+        title: À propos
+      appearance:
+        preamble: Personnaliser l'interface web de Mastodon.
+        title: Apparence
+      branding:
+        preamble: L'image de marque de votre serveur la différencie des autres serveurs du réseau. Ces informations peuvent être affichées dans nombre d'environnements, tels que l'interface web de Mastodon, les applications natives, dans les aperçus de liens sur d'autres sites Web et dans les applications de messagerie, etc. C'est pourquoi il est préférable de garder ces informations claires, courtes et concises.
+        title: Thème
+      content_retention:
+        preamble: Contrôle comment le contenu créé par les utilisateurs est enregistré et stocké dans Mastodon.
+        title: Rétention du contenu
       default_noindex:
-        desc_html: Affecte tous les utilisateurs qui n'ont pas changé eux-mêmes ce paramètre
-        title: Opter pour le retrait de l'indexation des moteurs de recherche par défaut
+        desc_html: Affecte tous les utilisateurs qui n'ont pas modifié ce paramètre eux-mêmes
+        title: Ne pas indexer par défaut les utilisateurs dans les moteurs de recherche
+      discovery:
+        follow_recommendations: Suivre les recommandations
+        preamble: Faire apparaître un contenu intéressant est essentiel pour interagir avec de nouveaux utilisateurs qui ne connaissent peut-être personne sur Mastodonte. Contrôlez le fonctionnement des différentes fonctionnalités de découverte sur votre serveur.
+        profile_directory: Annuaire des profils
+        public_timelines: Fils publics
+        title: Découverte
+        trends: Tendances
       domain_blocks:
         all: À tout le monde
         disabled: À personne
-        title: Afficher les bloqueurs de domaines
-        users: Aux utilisateurs connectés localement
-      domain_blocks_rationale:
-        title: Montrer la raison
-      hero:
-        desc_html: Affichée sur la page d’accueil. Au moins 600x100px recommandé. Lorsqu’elle n’est pas définie, se rabat sur la vignette du serveur
-        title: Image d’en-tête
-      mascot:
-        desc_html: Affiché sur plusieurs pages. Au moins 293×205px recommandé. Lorsqu’il n’est pas défini, retombe à la mascotte par défaut
-        title: Image de la mascotte
-      peers_api_enabled:
-        desc_html: Noms des domaines que ce serveur a découvert dans le fédiverse
-        title: Publier la liste des serveurs découverts
-      preview_sensitive_media:
-        desc_html: Les aperçus de lien sur les autres sites web afficheront une vignette même si les médias sont marqués comme sensibles
-        title: Montrer les médias sensibles dans les prévisualisations OpenGraph
-      profile_directory:
-        desc_html: Permettre aux utilisateurs d’être découverts
-        title: Activer l’annuaire des profils
+        users: Aux utilisateur·rice·s connecté·e·s localement
       registrations:
-        closed_message:
-          desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées. Vous pouvez utiliser des balises HTML
-          title: Message de fermeture des inscriptions
-        deletion:
-          desc_html: Permettre à tous les utilisateurs de supprimer leur compte
-          title: Autoriser les suppressions de compte
-        min_invite_role:
-          disabled: Personne
-          title: Autoriser les invitations par
-        require_invite_text:
-          desc_html: Lorsque les enregistrements nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
-          title: Exiger que les nouveaux utilisateurs remplissent un texte de demande d’invitation
+        preamble: Affecte qui peut créer un compte sur votre serveur.
+        title: Inscriptions
       registrations_mode:
         modes:
           approved: Approbation requise pour s’inscrire
           none: Personne ne peut s’inscrire
           open: N’importe qui peut s’inscrire
-        title: Mode d’enregistrement
-      show_known_fediverse_at_about_page:
-        desc_html: Lorsque désactivée, restreint le fil public accessible via la page d’accueil de l’instance pour ne montrer que le contenu local
-        title: Inclure le contenu fédéré sur la page de fil public sans authentification
-      show_staff_badge:
-        desc_html: Montrer un badge de responsable sur une page utilisateur
-        title: Montrer un badge de responsable
-      site_description:
-        desc_html: Paragraphe introductif sur la page d’accueil. Décrivez ce qui rend spécifique ce serveur Mastodon et toute autre chose importante. Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
-        title: Description du serveur
-      site_description_extended:
-        desc_html: L’endroit idéal pour afficher votre code de conduite, les règles, les guides et autres choses qui rendent votre serveur différent. Vous pouvez utiliser des balises HTML
-        title: Description étendue du serveur
-      site_short_description:
-        desc_html: Affichée dans la barre latérale et dans les méta-tags. Décrivez ce qui rend spécifique ce serveur Mastodon en un seul paragraphe. Si laissée vide, la description du serveur sera affiché par défaut.
-        title: Description courte du serveur
-      site_terms:
-        desc_html: Vous pouvez écrire votre propre politique de confidentialité, conditions d’utilisation ou autre jargon juridique. Vous pouvez utiliser des balises HTML
-        title: Politique de confidentialité
-      site_title: Nom du serveur
-      thumbnail:
-        desc_html: Utilisée pour les prévisualisations via OpenGraph et l’API. 1200x630px recommandé
-        title: Vignette du serveur
-      timeline_preview:
-        desc_html: Afficher un lien vers le fil public sur la page d’accueil et autoriser l'accès anonyme au fil public via l'API
-        title: Autoriser la prévisualisation anonyme du fil global
       title: Paramètres du serveur
-      trendable_by_default:
-        desc_html: Affecte les hashtags qui n'ont pas été précédemment non autorisés
-        title: Autoriser les hashtags à apparaître dans les tendances sans approbation préalable
-      trends:
-        desc_html: Afficher publiquement les hashtags approuvés qui sont populaires en ce moment
-        title: Hashtags populaires
     site_uploads:
       delete: Supprimer le fichier téléversé
       destroyed_msg: Téléversement sur le site supprimé avec succès !
     statuses:
+      account: Auteur·rice
+      application: Application
       back_to_account: Retour à la page du compte
+      back_to_report: Retour à la page du rapport
       batch:
-        delete: Supprimer
-        nsfw_off: Marquer comme non-sensible
-        nsfw_on: Marquer comme sensible
+        remove_from_report: Retirer du rapport
+        report: Signalement
       deleted: Supprimé
-      failed_to_execute: Erreur d’exécution
+      favourites: Favoris
+      history: Historique de version
+      in_reply_to: Répondre à
+      language: Langue
       media:
         title: Médias
-      no_media: Aucun média
-      no_status_selected: Aucun statut n’a été modifié car aucun n’a été sélectionné
-      title: Statuts du compte
+      metadata: Metadonnés
+      no_status_selected: Aucun message n’a été modifié car aucun n’a été sélectionné
+      open: Ouvrir le message
+      original_status: Message original
+      reblogs: Partages
+      status_changed: Publication modifiée
+      title: Messages du compte
+      trending: Tendances
+      visibility: Visibilité
       with_media: Avec médias
+    strikes:
+      actions:
+        delete_statuses: "%{name} a supprimé les messages de %{target}"
+        disable: "%{name} a gelé le compte de %{target}"
+        mark_statuses_as_sensitive: "%{name} a marqué le message de %{target} comme sensible"
+        none: "%{name} a envoyé un avertissement à %{target}"
+        sensitive: "%{name} a marqué le compte de %{target} comme sensible"
+        silence: "%{name} a limité le compte de %{target}"
+        suspend: "%{name} a suspendu le compte de %{target}"
+      appeal_approved: Appel soumis
+      appeal_pending: Appel en attente
     system_checks:
       database_schema_check:
         message_html: Vous avez des migrations de base de données en attente. Veuillez les exécuter pour vous assurer que l'application se comporte comme prévu
+      elasticsearch_running_check:
+        message_html: Impossible de se connecter à Elasticsearch. Veuillez vérifier qu’il est en cours d’exécution ou désactiver la recherche en plein texte
+      elasticsearch_version_check:
+        message_html: 'Version d’Elasticsearch incompatible : %{value}'
+        version_comparison: Elasticsearch %{running_version} est en cours d’exécution alors que %{required_version} est requise
       rules_check:
         action: Gérer les règles du serveur
         message_html: Vous n'avez pas défini de règles pour le serveur.
       sidekiq_process_check:
         message_html: Aucun processus Sidekiq en cours d'exécution pour la/les file(s) d'attente %{value}. Veuillez vérifier votre configuration de Sidekiq
     tags:
-      accounts_today: Utilisations uniques aujourd'hui
-      accounts_week: Utilisation unique cette semaine
-      breakdown: Répartition de l’utilisation actuelle par source
-      last_active: Dernière activité
-      most_popular: Plus populaire
-      most_recent: Plus récent
-      name: Hashtag
       review: État du traitement
-      reviewed: Traité
-      title: Hashtags
-      trending_right_now: Populaire en ce moment
-      unique_uses_today: "%{count} publications aujourd'hui"
-      unreviewed: Non traité
       updated_msg: Paramètres du hashtag mis à jour avec succès
     title: Administration
+    trends:
+      allow: Autoriser
+      approved: Approuvé
+      disallow: Interdire
+      links:
+        allow: Autoriser le lien
+        allow_provider: Autoriser l'éditeur
+        description_html: Ces liens sont actuellement énormément partagés par des comptes dont votre serveur voit les messages. Cela peut aider vos utilisateur⋅rice⋅s à découvrir ce qu'il se passe dans le monde. Aucun lien n'est publiquement affiché tant que vous n'avez pas approuvé le compte qui le publie. Vous pouvez également autoriser ou rejeter les liens individuellement.
+        disallow: Interdire le lien
+        disallow_provider: Interdire l'éditeur
+        no_link_selected: Aucun lien n'a été changé car aucun n'a été sélectionné
+        publishers:
+          no_publisher_selected: Aucun compte publicateur n'a été changé car aucun n'a été sélectionné
+        shared_by_over_week:
+          one: Partagé par %{count} personne au cours de la dernière semaine
+          other: Partagé par %{count} personnes au cours de la dernière semaine
+        title: Liens tendances
+        usage_comparison: Partagé %{today} fois aujourd'hui, comparé à %{yesterday} hier
+      only_allowed: Autorisées seulement
+      pending_review: En attente de révision
+      preview_card_providers:
+        allowed: Les liens de cet éditeur peuvent être tendance
+        description_html: Voici les domaines depuis lesquels des liens sont souvent partagés sur votre serveur. Les liens n'apparaîtront pas publiquement dans les tendances à moins que le domaine du lien ne soit approuvé. Votre approbation (ou votre rejet) s'étend aux sous-domaines.
+        rejected: Les liens de cet éditeur ne seront pas considérés tendance
+        title: Éditeurs
+      rejected: Rejeté
+      statuses:
+        allow: Autoriser le message
+        allow_account: Autoriser l'auteur·rice
+        description_html: Voici les messages dont votre serveur a connaissance qui sont beaucoup partagés et mis en favoris en ce moment. Cela peut aider vos utilisateur⋅rice⋅s, néophytes comme aguerri⋅e⋅s, à trouver plus de comptes à suivre. Aucun message n'est publiquement affiché tant que vous n'en avez pas approuvé l'auteur⋅rice, et seulement si icellui permet que son compte soit suggéré aux autres. Vous pouvez également autoriser ou rejeter les messages individuellement.
+        disallow: Proscrire le message
+        disallow_account: Proscrire l'auteur·rice
+        no_status_selected: Aucune publication en tendance n'a été changée car aucune n'a été sélectionnée
+        not_discoverable: L'auteur⋅rice n'a pas choisi de pouvoir être découvert⋅e
+        shared_by:
+          one: Partagé ou ajouté aux favoris une fois
+          other: Partagé et ajouté aux favoris %{friendly_count} fois
+        title: Messages tendance
+      tags:
+        current_score: Score actuel %{score}
+        dashboard:
+          tag_accounts_measure: utilisations uniques
+          tag_languages_dimension: Langues principales
+          tag_servers_dimension: Meilleurs serveurs
+          tag_servers_measure: différents serveurs
+          tag_uses_measure: utilisations totales
+        description_html: Ces hashtags apparaissent actuellement dans de nombreux messages que votre serveur voit. Cela peut aider vos utilisateur⋅rice⋅s à découvrir les sujets dont les gens parlent le plus en ce moment. Aucun hashtag n'est publiquement affiché tant que vous ne l'avez pas approuvé.
+        listable: Peut être suggéré
+        no_tag_selected: Aucun tag n'a été changé car aucun n'a été sélectionné
+        not_listable: Ne sera pas suggéré
+        not_trendable: N'apparaîtra pas sous les tendances
+        not_usable: Ne peut être utilisé
+        peaked_on_and_decaying: A atteint son maximum le %{date}, maintenant en déclin
+        title: Hashtags tendance
+        trendable: Peut apparaître sous les tendances
+        trending_rank: 'Tendance #%{rank}'
+        usable: Peut être utilisé
+        usage_comparison: Utilisé %{today} fois aujourd'hui, comparé à %{yesterday} hier
+        used_by_over_week:
+          one: Utilisé par %{count} personne au cours de la dernière semaine
+          other: Utilisé par %{count} personnes au cours de la dernière semaine
+      title: Tendances
+      trending: Tendances
     warning_presets:
       add_new: Ajouter un nouveau
       delete: Supprimer
       edit_preset: Éditer les avertissements prédéfinis
       empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
       title: Gérer les avertissements prédéfinis
+    webhooks:
+      add_new: Ajouter un point de terminaison
+      delete: Supprimer
+      description_html: Un <strong>point d'ancrage web</strong> permet à Mastodon d'envoyer des <strong>notifications en temps réel</strong> concernant des événements sélectionnés vers votre propre application, afin que celle-ci puisse <strong>déclencher automatiquement des réactions</strong>.
+      disable: Désactiver
+      disabled: Désactivé
+      edit: Modifier le point de terminaison
+      empty: Pour l'instant, vous n'avez configuré aucun lien d'ancrage web pour point de terminaison.
+      enable: Activer
+      enabled: Actif
+      enabled_events:
+        one: 1 événement activé
+        other: "%{count} événements activés"
+      events: Événements
+      new: Nouveau point d’ancrage web
+      rotate_secret: Effectuer une rotation du secret
+      secret: Jeton de connexion
+      status: État
+      title: Points d’ancrage web
+      webhook: Point d’ancrage web
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: effacer les messages
+        disable: geler le compte
+        mark_statuses_as_sensitive: marquer les messages comme sensibles
+        none: un avertissement
+        sensitive: marquer le compte comme sensible
+        silence: limiter le compte
+        suspend: suspendre le compte
+      body: "%{target} fait appel de la décision de modération émise par %{action_taken_by} le %{date} et qui était : %{type}. Cette personne a écrit :"
+      next_steps: Vous pouvez approuver l'appel pour annuler la décision de modération, ou l'ignorer.
+      subject: "%{username} fait appel d'une décision de modération sur %{instance}"
     new_pending_account:
       body: Les détails du nouveau compte se trouvent ci-dessous. Vous pouvez approuver ou rejeter cette demande.
       subject: Nouveau compte à examiner sur %{instance} (%{username})
@@ -731,9 +893,17 @@ fr:
       body: "%{reporter} a signalé %{target}"
       body_remote: Quelqu’un de %{domain} a signalé %{target}
       subject: Nouveau signalement sur %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Le hashtag #%{name} est dans les tendances aujourd’hui, mais il n’a pas encore été approuvé. Il ne sera pas affiché publiquement à moins que vous l’autorisiez. Sauvegardez simplement ce formulaire tel quel pour ne plus jamais en entendre parler.'
-      subject: Nouveau hashtag en attente d’approbation sur %{instance} (#%{name})
+    new_trends:
+      body: 'Les éléments suivants doivent être approuvés avant de pouvoir être affichés publiquement :'
+      new_trending_links:
+        title: Liens tendance
+      new_trending_statuses:
+        title: Messages tendance
+      new_trending_tags:
+        no_approved_tags: Il n'y a pas de hashtag tendance approuvé actuellement.
+        requirements: 'N''importe quel élément de la sélection pourrait surpasser le hashtag tendance approuvé n°%{rank}, qui est actuellement #%{lowest_tag_name} avec un résultat de %{lowest_tag_score}.'
+        title: Hashtags tendance
+      subject: Nouvelles tendances à examiner sur %{instance}
   aliases:
     add_new: Créer un alias
     created_msg: Un nouvel alias a été créé avec succès. Vous pouvez maintenant déménager depuis l'ancien compte.
@@ -759,37 +929,36 @@ fr:
     settings: 'Changer les préférences courriel : %{link}'
     view: 'Voir :'
     view_profile: Voir le profil
-    view_status: Afficher le statut
+    view_status: Afficher le message
   applications:
     created: Application créée avec succès
     destroyed: Application supprimée avec succès
-    invalid_url: L’URL fournie est invalide
     regenerate_token: Régénérer le jeton d’accès
     token_regenerated: Jeton d’accès régénéré avec succès
     warning: Soyez prudent·e avec ces données. Ne les partagez pas !
     your_token: Votre jeton d’accès
   auth:
-    apply_for_account: Demander une invitation
+    apply_for_account: Demander un compte
     change_password: Mot de passe
-    checkbox_agreement_html: J’accepte les <a href="%{rules_path}" target="_blank">règles du serveur</a> et les <a href="%{terms_path}" target="_blank">conditions de service</a>
-    checkbox_agreement_without_rules_html: J’accepte les <a href="%{terms_path}" target="_blank">conditions d’utilisation</a>
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
     description:
       prefix_invited_by_user: "@%{name} vous invite à rejoindre ce serveur Mastodon !"
       prefix_sign_up: Inscrivez-vous aujourd’hui sur Mastodon !
-      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateurs de n'importe quel serveur Mastodon et bien plus !
+      suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateur·rice·s de n'importe quel serveur Mastodon et bien plus !
     didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
     dont_have_your_security_key: Vous n'avez pas votre clé de sécurité?
     forgot_password: Mot de passe oublié ?
     invalid_reset_password_token: Le lien de réinitialisation du mot de passe est invalide ou a expiré. Merci de réessayer.
     link_to_otp: Entrez un code à deux facteurs de votre téléphone ou un code de récupération
     link_to_webauth: Utilisez votre appareil de clé de sécurité
+    log_in_with: Se connecter via
     login: Se connecter
     logout: Se déconnecter
     migrate_account: Déménager vers un compte différent
     migrate_account_html: Si vous voulez rediriger ce compte vers un autre, vous pouvez le <a href="%{path}">configurer ici</a>.
     or_log_in_with: Ou authentifiez-vous avec
+    privacy_policy_agreement_html: J’ai lu et j’accepte la <a href="%{privacy_policy_path}" target="_blank">politique de confidentialité</a>
     providers:
       cas: CAS
       saml: SAML
@@ -797,31 +966,40 @@ fr:
     registration_closed: "%{instance} a désactivé les inscriptions"
     resend_confirmation: Envoyer à nouveau les consignes de confirmation
     reset_password: Réinitialiser le mot de passe
+    rules:
+      preamble: Celles-ci sont définies et appliqués par les modérateurs de %{domain}.
+      title: Quelques règles de base.
     security: Sécurité
     set_new_password: Définir le nouveau mot de passe
     setup:
       email_below_hint_html: Si l’adresse de courriel ci-dessous est incorrecte, vous pouvez la modifier ici et recevoir un nouveau courriel de confirmation.
       email_settings_hint_html: Le courriel de confirmation a été envoyé à %{email}. Si cette adresse de courriel n’est pas correcte, vous pouvez la modifier dans les paramètres du compte.
       title: Configuration
+    sign_in:
+      preamble_html: Connectez-vous avec vos identifiants <strong>%{domain}</strong> . Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
+      title: Se connecter à %{domain}
+    sign_up:
+      preamble: Avec un compte sur ce serveur Mastodon, vous serez en mesure de suivre toute autre personne sur le réseau, quel que soit l’endroit où son compte est hébergé.
+      title: Mettons les choses en place pour %{domain}.
     status:
       account_status: État du compte
       confirming: En attente de la confirmation par courriel à compléter.
       functional: Votre compte est entièrement opérationnel.
       pending: Votre demande est en attente d'examen par notre personnel. Cela peut prendre un certain temps. Vous recevrez un courriel si votre demande est approuvée.
       redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
+      view_strikes: Voir les sanctions précédemment appliquées à votre compte
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
-    trouble_logging_in: Vous avez un problème pour vous connecter ?
     use_security_key: Utiliser la clé de sécurité
   authorize_follow:
     already_following: Vous suivez déjà ce compte
     already_requested: Vous avez déjà envoyé une demande d’abonnement à ce compte
-    error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
+    error: Malheureusement, une erreur s'est produite lors de la recherche du compte distant
     follow: Suivre
     follow_request: 'Vous avez demandé à suivre :'
     following: 'Youpi ! Vous suivez maintenant  :'
     post_follow:
       close: Ou bien, vous pouvez fermer cette fenêtre.
-      return: Afficher le profil de l’utilisateur
+      return: Afficher le profil de l’utilisateur·ice
       web: Retour à l’interface web
     title: Suivre %{acct}
   challenge:
@@ -866,12 +1044,38 @@ fr:
       email_reconfirmation_html: Si vous ne recevez pas le courriel de confirmation, vous pouvez le <a href="%{path}">demander à nouveau</a>
       irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
       more_details_html: Pour plus de détails, voir la <a href="%{terms_path}">politique de confidentialité</a>.
-      username_available: Votre nom d’utilisateur sera à nouveau disponible
-      username_unavailable: Votre nom d’utilisateur restera indisponible
-  directories:
-    directory: Annuaire des profils
-    explanation: Découvrir des utilisateurs en selon leurs centres d’intérêt
-    explore_mastodon: Explorer %{title}
+      username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
+      username_unavailable: Votre nom d’utilisateur·rice restera indisponible
+  disputes:
+    strikes:
+      action_taken: Mesure prise
+      appeal: Faire appel
+      appeal_approved: Cette sanction a été annulée en appel et n'est plus valide
+      appeal_rejected: L'appel a été rejeté
+      appeal_submitted_at: Appel soumis le
+      appealed_msg: Votre demande d'appel a été soumise. Si elle est approuvée, vous en serez informé·e.
+      appeals:
+        submit: Faire appel
+      approve_appeal: Approuver l’appel
+      associated_report: Rapport associé
+      created_at: En date du
+      description_html: Ce sont les mesures prises contre votre compte et les avertissements qui vous ont été envoyés par les responsables de %{instance}.
+      recipient: Adressé à
+      reject_appeal: Rejeter l’appel
+      status: 'Message #%{id}'
+      status_removed: Message déjà supprimé du système
+      title: "%{action} du %{date}"
+      title_actions:
+        delete_statuses: Suppression de message
+        disable: Gel du compte
+        mark_statuses_as_sensitive: Marquage des messages comme sensibles
+        none: Avertissement
+        sensitive: Marquage du compte comme sensible
+        silence: Limitation du compte
+        suspend: Suspension de compte
+      your_appeal_approved: Votre appel a été approuvé
+      your_appeal_pending: Vous avez soumis un appel
+      your_appeal_rejected: Votre appel a été rejeté
   domain_validator:
     invalid_domain: n’est pas un nom de domaine valide
   errors:
@@ -885,12 +1089,12 @@ fr:
       title: Vérification de sécurité échouée
     '429': Trop de requêtes émises dans un délai donné
     '500':
-      content: Nous sommes désolés, mais quelque chose s’est mal passé de notre côté.
+      content: Nous sommes désolé·e·s, mais quelque chose s’est mal passé de notre côté.
       title: Cette page n’est pas correcte
     '503': La page n'a pas pu être servie en raison d'une défaillance temporaire du serveur.
     noscript_html: Pour utiliser Mastodon, veuillez activer JavaScript. Sinon, essayez l’une des <a href="%{apps_path}">applications natives</a> pour Mastodon pour votre plate-forme.
   existing_username_validator:
-    not_found: n’a pas trouvé d’utilisateur local avec ce nom
+    not_found: impossible de trouver un·e utilisateur·ice local·e de ce nom
     not_found_multiple: n’a pas trouvé %{usernames}
   exports:
     archive_takeout:
@@ -901,9 +1105,9 @@ fr:
       request: Demandez vos archives
       size: Taille
     blocks: Vous bloquez
-    bookmarks: Signets
+    bookmarks: Marque-pages
     csv: CSV
-    domain_blocks: Bloqueurs de domaine
+    domain_blocks: Blocages de domaine
     lists: Listes
     mutes: Vous masquez
     storage: Médias stockés
@@ -920,56 +1124,69 @@ fr:
       public: Fils publics
       thread: Discussions
     edit:
+      add_keyword: Ajouter un mot-clé
+      keywords: Mots-clés
+      statuses: Publications individuelles
+      statuses_hint_html: Ce filtre s'applique à la sélection de messages individuels, qu'ils correspondent ou non aux mots-clés ci-dessous. <a href="%{path}">Revoir ou supprimer des messages du filtre</a>.
       title: Éditer le filtre
     errors:
+      deprecated_api_multiple_keywords: Ces paramètres ne peuvent pas être modifiés depuis cette application, car ils s'appliquent à plus d'un filtre de mot-clé. Utilisez une application plus récente ou l'interface web.
       invalid_context: Contexte invalide ou insuffisant
-      invalid_irreversible: Le filtrage irréversible ne fonctionne que pour l’accueil et les notifications
     index:
+      contexts: Filtres dans %{contexts}
       delete: Supprimer
       empty: Vous n'avez aucun filtre.
+      expires_in: Expire dans %{distance}
+      expires_on: Expire le %{date}
+      keywords:
+        one: "%{count} mot-clé"
+        other: "%{count} mots-clés"
+      statuses:
+        one: "%{count} message"
+        other: "%{count} messages"
+      statuses_long:
+        one: "%{count} publication individuelle cachée"
+        other: "%{count} publications individuelles cachées"
       title: Filtres
     new:
+      save: Enregistrer le nouveau filtre
       title: Ajouter un nouveau filtre
+    statuses:
+      back_to_filter: Retour au filtre
+      batch:
+        remove: Retirer du filtre
+      index:
+        hint: Ce filtre s'applique à la sélection de messages individuels, indépendamment d'autres critères. Vous pouvez ajouter plus de messages à ce filtre à partir de l'interface Web.
+        title: Messages filtrés
   footer:
-    developers: Développeurs
-    more: Davantage…
-    resources: Ressources
     trending_now: Tendance en ce moment
   generic:
     all: Tous
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> élément de cette page est sélectionné."
+      other: L'ensemble des <strong>%{count}</strong> éléments de cette page est sélectionné.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> élément correspondant à votre recherche est sélectionné."
+      other: L'ensemble des <strong>%{count}</strong> éléments correspondant à votre recherche est sélectionné.
     changes_saved_msg: Les modifications ont été enregistrées avec succès !
     copy: Copier
     delete: Supprimer
-    no_batch_actions_available: Aucune action par lots disponible sur cette page
+    deselect: Tout déselectionner
+    none: Aucun
     order_by: Classer par
     save_changes: Enregistrer les modifications
+    select_all_matching_items:
+      one: Sélectionnez %{count} élément correspondant à votre recherche.
+      other: Sélectionnez tous l'ensemble des %{count} éléments correspondant à votre recherche.
+    today: aujourd’hui
     validation_errors:
       one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
-      other: Certaines choses ne vont pas ! Veuillez vérifiez les %{count} erreurs ci-dessous
+      other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
   html_validator:
     invalid_markup: 'contient un balisage HTML invalide: %{error}'
-  identity_proofs:
-    active: Active
-    authorize: Oui, autoriser
-    authorize_connection_prompt: Autoriser cette connexion chiffrée ?
-    errors:
-      failed: La connexion chiffrée a échoué. Veuillez réessayer à partir de %{provider}.
-      keybase:
-        invalid_token: Les jetons Keybase sont des hachages de signatures et doivent comporter 66 caractères hexadécimaux
-        verification_failed: Keybase ne reconnaît pas ce jeton comme une signature de l’utilisateur Keybase %{kb_username}. Veuillez réessayer à partir de Keybase.
-      wrong_user: Impossible de créer une preuve pour %{proving} lorsque vous êtes connecté en tant que %{current}. Connectez-vous en tant que %{proving} et réessayez.
-    explanation_html: Ici, vous pouvez connecter de manière chiffrée vos autres identités, par exemple un profil Keybase. Cela permet à d’autres personnes de vous envoyer des messages chiffrés et de faire confiance au contenu que vous leur envoyez.
-    i_am_html: Je suis %{username} sur %{service}.
-    identity: Identité
-    inactive: Inactive
-    publicize_checkbox: 'Et publier ceci :'
-    publicize_toot: 'C’est prouvé ! Je suis %{username} sur %{service}: %{url}'
-    remove: Retirer la preuve du compte
-    removed: Preuve retirée du compte avec succès
-    status: État de la vérification
-    view_proof: Voir la preuve
   imports:
     errors:
+      invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'
       over_rows_processing_limit: contient plus de %{count} lignes
     modes:
       merge: Fusionner
@@ -980,12 +1197,11 @@ fr:
     success: Vos données ont été importées avec succès et seront traitées en temps et en heure
     types:
       blocking: Liste de comptes bloqués
-      bookmarks: Signets
+      bookmarks: Marque-pages
       domain_blocking: Liste des serveurs bloqués
-      following: Liste d’utilisateur·rice·s suivi·e·s
-      muting: Liste d’utilisateur·rice·s que vous masquez
+      following: Liste de comptes suivis
+      muting: Liste de comptes que vous masquez
     upload: Importer
-  in_memoriam_html: En mémoire de.
   invites:
     delete: Désactiver
     expired: Expiré
@@ -998,7 +1214,7 @@ fr:
       '86400': 1 jour
     expires_in_prompt: Jamais
     generate: Générer un lien d'invitation
-    invited_by: 'Vous avez été invité par :'
+    invited_by: 'Vous avez été invité·e par :'
     max_uses:
       one: 1 utilisation
       other: "%{count} utilisations"
@@ -1024,37 +1240,37 @@ fr:
     title: Historique d'authentification
   media_attachments:
     validations:
-      images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
-      not_ready: Impossible de joindre les fichiers en traitements. Réessayez dans un instant !
+      images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images
+      not_ready: Impossible de joindre les fichiers en cours de traitement. Réessayez dans un instant !
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
     acct: A déménagé vers
     cancel: Annuler la redirection
-    cancel_explanation: Annuler la redirection réactivera votre compte actuel, mais ne rapportera pas les abonnés qui ont été déplacés sur ce compte.
+    cancel_explanation: Annuler la redirection réactivera votre compte actuel, mais ne rapportera pas les abonné·e·s qui ont été déplacé·e·s sur ce compte.
     cancelled_msg: Suppression de la redirection réussie.
     errors:
       already_moved: est le même compte que vous avez déjà déplacé vers
       missing_also_known_as: ne référence pas ce compte en retour
       move_to_self: ne peut pas être le compte actuel
       not_found: n'a pas été trouvé
-      on_cooldown: Vous êtes soumis à un temps de rechargement
-    followers_count: Abonnés au moment du déménagement
+      on_cooldown: Vous êtes soumis·e à un temps de rechargement
+    followers_count: Abonné·e·s au moment du déménagement
     incoming_migrations: Déplacement depuis un compte différent
     incoming_migrations_html: Pour déménager d'un autre compte à celui-ci, vous devez d'abord <a href="%{path}">créer un alias de compte</a>.
-    moved_msg: Votre compte est maintenant redirigé vers %{acct} et vos abonnés sont en train d'être déplacés.
+    moved_msg: Votre compte est maintenant redirigé vers %{acct} et vos abonné·e·s sont en train d'être déplacé·e·s.
     not_redirecting: Votre compte n'est pas redirigé vers un autre compte actuellement.
     on_cooldown: Vous avez récemment migré votre compte. Cette fonction sera à nouveau disponible dans %{count} jours.
     past_migrations: Migrations passées
-    proceed_with_move: Migrer les abonnés
+    proceed_with_move: Migrer les abonné·e·s
     redirected_msg: Votre compte est maintenant redirigé vers %{acct}.
     redirecting_to: Votre compte est redirigé vers %{acct}.
     set_redirect: Définir la redirection
     warning:
       backreference_required: Le nouveau compte doit d'abord être configuré pour faire référence à celui-ci en définissant un alias
       before: 'Avant de procéder, veuillez lire attentivement ces notes :'
-      cooldown: Après le déménagement, il y a une période d’attente pendant laquelle vous ne pourrez pas re-déménager
+      cooldown: Après le déménagement, il y a une période d’attente pendant laquelle vous ne pourrez pas redéménager
       disabled_account: Votre compte actuel ne sera pas entièrement utilisable par la suite. Cependant, vous aurez accès à l'exportation de données et à la réactivation.
-      followers: Cette action va déménager tous les abonnés du compte actuel vers le nouveau compte
+      followers: Cette action va déménager tou·te·s les abonné·e·s du compte actuel vers le nouveau compte
       only_redirect_html: Alternativement, vous pouvez <a href="%{path}">seulement appliquer une redirection sur votre profil</a>.
       other_data: Aucune autre donnée ne sera déplacée automatiquement
       redirect: Le profil de votre compte actuel sera mis à jour avec un avis de redirection et sera exclu des recherches
@@ -1063,19 +1279,15 @@ fr:
   move_handler:
     carry_blocks_over_text: Cet utilisateur que vous aviez bloqué est parti de %{acct}.
     carry_mutes_over_text: Cet utilisateur que vous aviez masqué est parti de %{acct}.
-    copy_account_note_text: 'Cet utilisateur est parti de %{acct}, voici vos notes précédentes à son sujet :'
+    copy_account_note_text: 'Cet·te utilisateur·rice est parti·e de %{acct}, voici vos notes précédentes à son sujet :'
+  navigation:
+    toggle_menu: Basculer l'affichage du menu
   notification_mailer:
-    digest:
-      action: Voir toutes les notifications
-      body: Voici un bref résumé des messages que vous avez raté depuis votre dernière visite le %{since}
-      mention: "%{name} vous a mentionné dans :"
-      new_followers_summary:
-        one: Vous avez un nouvel abonné ! Youpi !
-        other: Vous avez %{count} nouveaux abonnés ! Incroyable !
-      subject:
-        one: "Une nouvelle notification depuis votre dernière visite \U0001F418"
-        other: "%{count} nouvelles notifications depuis votre dernière visite \U0001F418"
-      title: Pendant votre absence…
+    admin:
+      report:
+        subject: "%{name} a soumis un signalement"
+      sign_up:
+        subject: "%{name} s'est inscrit·e"
     favourite:
       body: "%{name} a ajouté votre message à ses favoris :"
       subject: "%{name} a ajouté votre message à ses favoris"
@@ -1083,16 +1295,16 @@ fr:
     follow:
       body: "%{name} vous suit !"
       subject: "%{name} vous suit"
-      title: Nouvel abonné
+      title: Nouvel·le abonné·e
     follow_request:
       action: Gérer les demandes d’abonnement
       body: "%{name} a demandé à vous suivre"
-      subject: 'Abonnés en attente : %{name}'
+      subject: 'Abonné·e en attente : %{name}'
       title: Nouvelle demande d’abonnement
     mention:
       action: Répondre
-      body: "%{name} vous a mentionné dans :"
-      subject: "%{name} vous a mentionné"
+      body: "%{name} vous a mentionné⋅e dans :"
+      subject: "%{name} vous a mentionné·e"
       title: Nouvelle mention
     poll:
       subject: Un sondage de %{name} est terminé
@@ -1102,6 +1314,8 @@ fr:
       title: Nouveau partage
     status:
       subject: "%{name} vient de publier"
+    update:
+      subject: "%{name} a modifié un message"
   notifications:
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
@@ -1145,6 +1359,8 @@ fr:
     other: Autre
     posting_defaults: Paramètres de publication par défaut
     public_timelines: Fils publics
+  privacy_policy:
+    title: Politique de confidentialité
   reactions:
     errors:
       limit_reached: Limite de réactions différentes atteinte
@@ -1152,37 +1368,30 @@ fr:
   relationships:
     activity: Activité du compte
     dormant: Dormant
-    follow_selected_followers: Suivre les abonnés sélectionnés
-    followers: Abonnés
-    following: Abonnements
-    invited: Invité
+    follow_selected_followers: Suivre les abonné·e·s sélectionné·e·s
+    followers: Abonné·e
+    following: Abonnement
+    invited: Invité·e
     last_active: Dernière activité
     most_recent: Plus récent
     moved: Déménagé
     mutual: Mutuel
     primary: Primaire
     relationship: Relation
-    remove_selected_domains: Supprimer tous les abonnés des domaines sélectionnés
-    remove_selected_followers: Supprimer les abonnés sélectionnés
-    remove_selected_follows: Cesser de suivre les comptes sélectionnés
+    remove_selected_domains: Supprimer tou·te·s les abonné·e·s des domaines sélectionnés
+    remove_selected_followers: Supprimer les abonné·e·s sélectionné·e·s
+    remove_selected_follows: Ne plus suivre les comptes sélectionnés
     status: État du compte
   remote_follow:
-    acct: Entrez l’adresse profil@serveur depuis laquelle vous voulez effectuer cette action
     missing_resource: L’URL de redirection requise pour votre compte n’a pas pu être trouvée
-    no_account_html: Vous n’avez pas de compte ? Vous pouvez <a href='%{sign_up_path}' target='_blank'>vous inscrire ici</a>
-    proceed: Confirmer l’abonnement
-    prompt: 'Vous allez suivre :'
-    reason_html: "<strong>Pourquoi cette étape est-elle nécessaire?</strong> <code>%{instance}</code> pourrait ne pas être le serveur sur lequel vous vous êtes inscrit, et nous devons donc vous rediriger vers votre serveur de base en premier."
-  remote_interaction:
-    favourite:
-      proceed: Confirmer l’ajout aux favoris
-      prompt: 'Vous souhaitez ajouter ce message à vos favoris :'
-    reblog:
-      proceed: Confirmer le partage
-      prompt: 'Vous souhaitez partager ce message :'
-    reply:
-      proceed: Confirmer la réponse
-      prompt: 'Vous souhaitez répondre à ce message :'
+  reports:
+    errors:
+      invalid_rules: ne fait pas référence à des règles valides
+  rss:
+    content_warning: 'Avertissement de contenu :'
+    descriptions:
+      account: Messages publics de @%{acct}
+      tag: 'Messages publics taggés #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Vous avez dépassé la limite de %{limit} messages planifiés par jour
     over_total_limit: Vous avez dépassé la limite de %{limit} messages planifiés
@@ -1216,7 +1425,7 @@ fr:
       adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1241,7 +1450,6 @@ fr:
     edit_profile: Modifier le profil
     export: Export de données
     featured_tags: Hashtags mis en avant
-    identity_proofs: Preuves d’identité
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
@@ -1249,8 +1457,9 @@ fr:
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
-    statuses_cleanup: Suppression automatique de la publication
-    two_factor_authentication: Identification à deux facteurs
+    statuses_cleanup: Suppression automatique de messages
+    strikes: Sanctions de modération
+    two_factor_authentication: Authentification à deux facteurs
     webauthn_authentication: Clés de sécurité
   statuses:
     attached:
@@ -1266,18 +1475,19 @@ fr:
         other: "%{count} vidéos"
     boosted_from_html: Partagé depuis %{acct_link}
     content_warning: 'Avertissement sur le contenu : %{warning}'
+    default_language: Même langue que celle de l’interface
     disallowed_hashtags:
       one: 'contient un hashtag désactivé : %{tags}'
       other: 'contient les hashtags désactivés : %{tags}'
+    edited_at_html: Édité le %{date}
     errors:
-      in_reply_not_found: Le statut auquel vous essayez de répondre ne semble pas exister.
-    language_detection: Détecter automatiquement la langue
+      in_reply_not_found: Le message auquel vous essayez de répondre ne semble pas exister.
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
     pin_errors:
-      limit: Vous avez déjà épinglé le nombre maximum de pouets
-      ownership: Vous ne pouvez pas épingler un statut ne vous appartenant pas
-      private: Les statuts non-publics ne peuvent pas être épinglés
+      direct: Les messages qui ne sont visibles que pour les utilisateur·rice·s mentionné·e·s ne peuvent pas être épinglés
+      limit: Vous avez déjà épinglé le nombre maximum de messages
+      ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
     poll:
       total_people:
@@ -1292,18 +1502,18 @@ fr:
     show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     sign_in_to_participate: Inscrivez-vous pour prendre part à la conversation
-    title: '%{name} : "%{quote}"'
+    title: "%{name} : « %{quote} »"
     visibilities:
       direct: Direct
-      private: Abonnés uniquement
-      private_long: Afficher seulement à vos vos abonnés
+      private: Abonné⋅e⋅s uniquement
+      private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos statuts
+      public_long: Tout le monde peut voir vos messages
       unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos statuts mais ils ne seront pas listés sur les fils publics
+      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
-    enabled: Supprimer automatiquement les anciennes publications
-    enabled_hint: Supprime automatiquement vos publications une fois qu'elles ont atteint un seuil d'ancienneté défini, à moins qu'elles ne correspondent à l'une des exceptions ci-dessous
+    enabled: Supprimer automatiquement vos anciens messages
+    enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous
     exceptions: Exceptions
     explanation: Parce que la suppression de messages est une opération lourde, cela se fait lentement au fil du temps lorsque le serveur n'est pas autrement occupé. Pour cette raison, vos messages peuvent être supprimés un peu plus tard que le seuil d'ancienneté défini.
     ignore_favs: Ignorer les favoris
@@ -1312,118 +1522,39 @@ fr:
     interaction_exceptions_explanation: Notez qu'il n'est pas garanti que les messages soient supprimés s'ils passent sous le seuil des favoris ou des partages une fois qu'ils les ont dépassés.
     keep_direct: Conserver les messages directs
     keep_direct_hint: Ne supprime aucun de vos messages directs
-    keep_media: Conserver les publications avec des fichiers médias joints
-    keep_media_hint: Ne supprime pas les publications contenant des fichiers médias joints
-    keep_pinned: Conserver les publications épinglées
-    keep_pinned_hint: Ne supprime aucune de vos publications épinglées
+    keep_media: Conserver les messages avec des fichiers médias joints
+    keep_media_hint: Ne supprime pas les messages contenant des fichiers médias joints
+    keep_pinned: Conserver les messages épinglés
+    keep_pinned_hint: Ne supprime aucun de vos messages épinglés
     keep_polls: Conserver les sondages
     keep_polls_hint: Ne supprime aucun de vos sondages
-    keep_self_bookmark: Conserver les publications que vous avez mises en marque-page
-    keep_self_bookmark_hint: Ne supprime pas vos propres publications si vous les avez ajoutées aux marque-pages
-    keep_self_fav: Conserver les publications que vous avez mises dans vos favoris
-    keep_self_fav_hint: Ne supprime pas vos propres publications si vous les avez mises dans vos favoris
+    keep_self_bookmark: Conserver les messages que vous avez mis en marque-page
+    keep_self_bookmark_hint: Ne supprime pas vos propres messages si vous les avez ajoutés aux marque-pages
+    keep_self_fav: Conserver les messages que vous avez mis dans vos favoris
+    keep_self_fav_hint: Ne supprime pas vos propres messages si vous les avez ajoutés à vos favoris
     min_age:
       '1209600': 2 semaines
       '15778476': 6 mois
       '2629746': 1 mois
       '31556952': 1 an
       '5259492': 2 mois
+      '604800': 1 semaine
       '63113904': 2 ans
       '7889238': 3 mois
     min_age_label: Seuil d'ancienneté
-    min_favs: Conserver les publications favorites plus de
-    min_favs_hint: Ne supprime aucune de vos publications qui ont reçu plus que ce nombre de favoris. Laisser vide pour supprimer les messages quel que soit leur nombre de favoris
-    min_reblogs: Conserver les publications partagées plus de
-    min_reblogs_hint: Ne supprime aucune de vos publications qui ont été partagées plus que ce nombre de fois. Laisser vide pour supprimer les publications indépendamment de leur nombre de partages
+    min_favs: Conserver les messages mis en favoris au moins
+    min_favs_hint: Ne supprime aucun de vos messages qui ont reçu au moins ce nombre de favoris. Laisser vide pour supprimer les messages quel que soit leur nombre de favoris
+    min_reblogs: Conserver les messages partagés au moins
+    min_reblogs_hint: Ne supprime aucun de vos messages qui ont été partagés au moins ce nombre de fois. Laisser vide pour supprimer les messages indépendamment de leur nombre de partages
   stream_entries:
     pinned: Message épinglé
     reblogged: a partagé
     sensitive_content: Contenu sensible
+  strikes:
+    errors:
+      too_late: Il est trop tard pour faire appel à cette sanction
   tags:
     does_not_match_previous_name: ne correspond pas au nom précédent
-  terms:
-    body_html: |
-      <h2>Politique de confidentialité</h2>
-      <h3 id="collect">Quelles informations collectons-nous ?</h3>
-
-      <ul>
-      <li><em>Informations de base sur votre compte</em> : si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.</li>
-      <li><em>Posts, liste d’abonnements et autres informations publiques</em> : la liste de vos abonnements ainsi que la liste de vos abonnés sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistrés. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonnés, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimez un post, il est probable que l'action soit aussi délivrée à vos abonnés. Partager un message ou le marquer comme favori est toujours une action publique.</li>
-      <li><em>Posts directs et abonnés uniquement</em> : tous les posts sont stockés et traités par le serveur. Les messages abonnés uniquement ne sont transmis qu’à vos abonnés et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne foi pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonnés. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux abonnés. <em>Gardez s’il vous plaît en mémoire que les opérateurs du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages</em> et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. <em>Ne partagez aucune information sensible à l’aide de Mastodon !</em></li>
-      <li><em>IP et autres métadonnées</em> : quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Que faisons-nous des informations que nous collectons ?</h3>
-
-      <p>Toutes les informations que nous collectons sur vous peuvent être utilisées des manières suivantes :</p>
-
-      <ul>
-      <li>pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.</li>
-      <li>pour aider à la modération de la communauté : par exemple, comparer votre adresse IP avec d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.</li>
-      <li>l’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyer des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour toutes autres requêtes ou questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Comment protégeons-nous vos informations ?</h3>
-
-      <p>Nous mettons en œuvre une variété de mesures de sécurité afin de garantir la sécurité de vos informations personnelles quand vous les saisissez, les soumettez et les consultez. Entre autres choses, votre session de navigation ainsi que le trafic entre votre application et l’API sont sécurisés à l’aide de TLS ; tandis que votre mot de passe est haché en utilisant un puissant algorithme à sens unique. Vous pouvez également activer l’authentification à deux facteurs pour sécuriser encore plus l’accès à votre compte.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Quelle est notre politique de conservation des données ?</h3>
-
-      <p>Nous ferons un effort de bonne foi :</p>
-
-      <ul>
-      <li>pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.</li>
-      <li>pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateurs enregistrés.</li>
-      </ul>
-
-      <p>Vous pouvez demander une archive de votre contenu, incluant vos posts, vos médias joints, votre image de profil et votre image d’en-tête.</p>
-
-      <p>Vous pouvez, à n’importe quel moment, supprimer votre compte de manière définitive.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Utilisons-nous des témoins de connexion ?</h3>
-
-      <p>Oui. Les témoins de connexion sont de petits fichiers qu’un site ou un service transfère sur le disque dur de votre ordinateur via votre navigateur web (si vous l’avez autorisé). Ces témoins permettent au site de reconnaître votre navigateur et, dans le cas où vous possédez un compte, de vous associer avec ce dernier.</p>
-
-      <p>Nous utilisons les témoins de connexion comme un moyen de comprendre et de nous souvenir de vos préférences pour vos prochaines visites.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Divulguons-nous des informations à des tiers ?</h3>
-
-      <p>Nous ne vendons, n’échangeons ou ne transférons d’une quelconque manière que ce soit des informations permettant de vous identifier personnellement. Cela n’inclut pas les tiers de confiance qui nous aident à faire fonctionner ce site, à conduire nos activités commerciales ou à vous servir, du moment qu’ils acceptent de garder ces informations confidentielles. Nous sommes également susceptibles de partager vos informations quand nous pensons que cela est nécessaire pour nous conformer à la loi, pour faire respecter les règles de notre site, ainsi que pour défendre nos droits, notre propriété, notre sécurité, ou ceux d’autres personnes.</p>
-
-      <p>Votre contenu public peut être téléchargé par d’autres serveurs du réseau. Dans le cas où vos abonnés et vos destinataires résideraient sur des serveurs différents du vôtre, vos posts publics et abonnés uniquement peuvent être délivrés vers les serveurs de vos abonnés tandis que vos messages directs sont délivrés aux serveurs de vos destinataires.</p>
-
-      <p>Quand vous autorisez une application à utiliser votre compte, en fonction de l’étendue des permissions que vous approuvez, il est possible qu’elle puisse accéder aux informations publiques de votre profil, à votre liste d’abonnements, votre liste d’abonnés, vos listes, tous vos posts et vos favoris. Les applications ne peuvent en aucun cas accéder à votre adresse électronique et à votre mot de passe.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Utilisation de ce site par les enfants</h3>
-
-      <p>Si ce serveur est situé dans l’UE ou l’EEE : notre site, nos produits et nos services sont tous destinés à des personnes âgées de 16 ans ou plus. Si vous avez moins de 16 ans, en application du RGPD (<a href="https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es">Règlement Général sur la Protection des Données</a>), merci de ne pas utiliser ce site.</p>
-
-      <p>Si ce serveur est situé aux États-Unis d’Amérique : notre site, nos produits et nos services sont tous destinés à des personnes âgées de 13 ans ou plus. Si vous avez moins de 13 ans, en application du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), merci de ne pas utiliser ce site.</p>
-
-      <p>Les exigences légales peuvent être différentes si ce serveur se trouve dans une autre juridiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Modifications de notre politique de confidentialité</h3>
-
-      <p>Dans le cas où nous déciderions de changer notre politique de confidentialité, nous posterons les modifications sur cette page.</p>
-
-      <p>Ce document est publié sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 7 mars 2018.</p>
-
-      <p>Originellement adapté de la <a href="https://github.com/discourse/discourse">politique de confidentialité de Discourse</a>.</p>
-    title: Conditions d’utilisation et politique de confidentialité de %{instance}
   themes:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
@@ -1432,9 +1563,10 @@ fr:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Ajouter
-    disable: Désactiver
+    disable: Désactiver l’A2F
     disabled_success: L'authentification à deux facteurs a été désactivée avec succès
     edit: Modifier
     enabled: L’authentification à deux facteurs est activée
@@ -1448,63 +1580,73 @@ fr:
     recovery_instructions_html: Si vous perdez l’accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour retrouver l’accès à votre compte. <strong>Conservez les codes de récupération en sécurité</strong>. Par exemple, en les imprimant et en les stockant avec vos autres documents importants.
     webauthn: Clés de sécurité
   user_mailer:
+    appeal_approved:
+      action: Aller à votre compte
+      explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
+      subject: Votre appel du %{date} a été approuvé
+      title: Appel approuvé
+    appeal_rejected:
+      explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
+      subject: Votre appel du %{date} a été rejeté
+      title: Appel rejeté
     backup_ready:
       explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
-    sign_in_token:
-      details: 'Voici les détails de la tentative :'
-      explanation: 'Nous avons détecté une tentative de connexion à votre compte à partir d’une adresse IP non reconnue. Si c’est vous, veuillez entrer le code de sécurité ci-dessous sur la page de négociation de connexion :'
-      further_actions: 'S’il ne s’agit pas de vous, veuillez changer votre mot de passe et activer l’authentification à deux facteurs sur votre compte. Vous pouvez le faire ici :'
-      subject: Veuillez confirmer la tentative de connexion
-      title: Tentative de connexion
+    suspicious_sign_in:
+      change_password: changer votre mot de passe
+      details: 'Voici les détails de la connexion :'
+      explanation: Nous avons détecté une connexion à votre compte à partir d’une nouvelle adresse IP.
+      further_actions_html: Si ce n’était pas vous, nous vous recommandons de %{action} immédiatement et d’activer l’authentification à deux facteurs afin de garder votre compte sécurisé.
+      subject: Votre compte a été accédé à partir d'une nouvelle adresse IP
+      title: Une nouvelle connexion
     warning:
+      appeal: Faire appel
+      appeal_description: Si vous pensez qu'il s'agit d'une erreur, vous pouvez faire appel auprès de l'équipe de %{instance}.
+      categories:
+        spam: Indésirable
+        violation: Le contenu enfreint les directives de la communauté suivantes
       explanation:
-        disable: Lorsque votre compte est gelé, les données de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusqu’à ce qu’il soit débloqué.
-        sensitive: Vos fichiers médias téléversés et vos médias liés seront traités comme sensibles.
-        silence: Vous pouvez encore utiliser votre compte, mais seuls les comptes qui vous suivent déjà verront vos messages sur ce serveur, et vous pouvez être exclu de plusieurs listes publiques. Néanmoins, il est encore possible de vous suivre manuellement.
-        suspend: Votre ne pouvez plus utiliser votre compte, et votre profil ainsi que d’autres données ne sont plus accessibles. Vous pouvez vous connecter pour demander une sauvegarde de vos données avant qu’elles ne soient complètement supprimées, mais nous gardons certaines données pour vous empêcher d’échapper à la suspension.
-      get_in_touch: Vous pouvez répondre à cette adresse pour entrer en contact avec l’équipe de %{instance}.
-      review_server_policies: Passer en revue les politiques du serveur
-      statuses: 'Spécialement, pour :'
+        delete_statuses: Il a été constaté que certains de vos messages enfreignent une ou plusieurs directives de la communauté. Par conséquent, ils ont été supprimés par l'équipe de modération de %{instance}.
+        disable: Vous ne pouvez plus utiliser votre compte, mais votre profil et d'autres données restent intacts. Vous pouvez demander une sauvegarde de vos données, modifier les paramètres de votre compte ou supprimer votre compte.
+        mark_statuses_as_sensitive: Certains de vos messages ont été marqués comme sensibles par l'équipe de modération de %{instance}. Cela signifie qu'il faudra cliquer sur le média pour pouvoir en afficher un aperçu. Vous pouvez marquer les médias comme sensibles vous-même lorsque vous posterez à l'avenir.
+        sensitive: Désormais, tous vos fichiers multimédias téléchargés seront marqués comme sensibles et cachés derrière un avertissement à cliquer.
+        silence: Vous pouvez toujours utiliser votre compte, mais seules les personnes qui vous suivent déjà verront vos messages sur ce serveur, et vous pourriez être exclu de diverses fonctions de découverte. Cependant, d'autres personnes peuvent toujours vous suivre manuellement.
+        suspend: Vous ne pouvez plus utiliser votre compte, votre profil et vos autres données ne sont plus accessibles. Vous pouvez toujours vous connecter pour demander une sauvegarde de vos données jusqu'à leur suppression complète dans environ 30 jours, mais nous conserverons certaines données de base pour vous empêcher d'échapper à la suspension.
+      reason: 'Motif :'
+      statuses: 'Messages cités :'
       subject:
+        delete_statuses: Vos messages sur %{acct} ont été supprimés
         disable: Votre compte %{acct} a été gelé
+        mark_statuses_as_sensitive: Vos messages sur %{acct} ont été marqués comme sensibles
         none: Avertissement pour %{acct}
-        sensitive: Les médias de votre compte %{acct} ont été marqués comme sensibles
+        sensitive: Vos messages sur %{acct} seront désormais marqués comme sensibles
         silence: Votre compte %{acct} a été limité
         suspend: Votre compte %{acct} a été suspendu
       title:
+        delete_statuses: Messages supprimés
         disable: Compte gelé
+        mark_statuses_as_sensitive: Messages marqués comme sensibles
         none: Avertissement
-        sensitive: Vos médias ont été marqués comme sensibles
+        sensitive: Compte marqué comme sensible
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
       edit_profile_action: Configuration du profil
-      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant un avatar, une image d’en-tête, en changeant votre pseudo et plus encore. Si vous souhaitez examiner les nouveaux abonnés avant qu’ils ne soient autorisés à vous suivre, vous pouvez verrouiller votre compte.
+      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
       explanation: Voici quelques conseils pour vous aider à démarrer
       final_action: Commencez à publier
-      final_step: 'Commencez à publier ! Même sans abonnés, vos messages publics peuvent être vus par d’autres, par exemple sur le fil public local et dans les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
+      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
       full_handle: Votre identifiant complet
-      full_handle_hint: C’est ce que vous diriez à vos amis pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
-      review_preferences_action: Modifier les préférences
-      review_preferences_step: Assurez-vous de définir vos préférences, telles que les courriels que vous aimeriez recevoir ou le niveau de confidentialité auquel vous publier vos messages par défaut. Si vous n’avez pas le mal des transports, vous pouvez choisir d’activer la lecture automatique des GIF.
+      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
       subject: Bienvenue sur Mastodon
-      tip_federated_timeline: La fil public global est une vue en direct du réseau Mastodon. Mais elle n’inclut que les personnes auxquelles vos voisins sont abonnés, donc elle n’est pas complète.
-      tip_following: Vous suivez les administrateur·rice·s de votre serveur par défaut. Pour trouver d’autres personnes intéressantes, consultez les fils publics local et global.
-      tip_local_timeline: Le fil public local est une vue des personnes sur %{instance}. Ce sont vos voisines et voisins immédiats !
-      tip_mobile_webapp: Si votre navigateur mobile vous propose d’ajouter Mastodon à votre écran d’accueil, vous pouvez recevoir des notifications. Il agit comme une application native de bien des façons !
-      tips: Astuces
       title: Bienvenue à bord, %{name} !
   users:
     follow_limit_reached: Vous ne pouvez pas suivre plus de %{limit} personnes
-    generic_access_help_html: Rencontrez-vous des difficultés d’accès à votre compte ? Vous pouvez contacter %{email} pour obtenir de l’aide
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
-    invalid_sign_in_token: Code de sécurité non valide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
     seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
-    signed_in_as: 'Connecté en tant que :'
-    suspicious_sign_in_confirmation: Il semblerait que vous ne vous êtes pas connecté depuis cet appareil auparavant et que vous ne vous êtes pas connecté depuis un moment, alors nous envoyons un code de sécurité à votre adresse courriel pour confirmer qu’il s’agit bien de vous.
+    signed_in_as: 'Connecté·e en tant que :'
   verification:
     explanation_html: 'Vous pouvez <strong>vous vérifier en tant que propriétaire des liens dans les métadonnées de votre profil</strong>. Pour cela, le site web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour <strong>doit</strong> avoir un attribut <code>rel="me"</code> . Le texte du lien n’a pas d’importance. Voici un exemple :'
     verification: Vérification
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
new file mode 100644
index 000000000..d178d2127
--- /dev/null
+++ b/config/locales/fy.yml
@@ -0,0 +1,229 @@
+---
+fy:
+  about:
+    about_mastodon_html: Mastodon is in sosjaal netwurk dat gebrûkt makket fan iepen webprotokollen en frije software. It is krekt lykas e-mail desintralisearre!
+    contact_missing: Net ynsteld
+    contact_unavailable: Net fan tapassing
+    hosted_on: Mastodon op %{domain}
+    title: Oer
+  accounts:
+    follow: Folgje
+    followers:
+      one: Folger
+      other: Folgers
+    following: Folgjend
+    instance_actor_flash: Dit account is in ‘virtual actor’ wêrmei’t de server himself fertsjinwurdiget en is dus gjin yndividuele brûker. It wurdt foar federaasjedoeleinen brûkt en moat net útsteld wurde.
+    last_active: lêst warber
+    link_verified_on: Eigendom fan dizze keppeling is kontrolearre op %{date}
+    nothing_here: Hjir is neat!
+    pin_errors:
+      following: Jo moatte dizze account wol al folgje, eardat jo it oanrekommandearje kinne
+    posts:
+      one: Toot
+      other: Berjochten
+    posts_tab_heading: Berjochten
+  admin:
+    account_actions:
+      action: Aksje útfiere
+      title: Moderaasjemaatregelen tsjin %{acct} nimme
+    account_moderation_notes:
+      create: Lit in opmerking efter
+      created_msg: Oanmeitsjen fan opmerking foar moderatoaren slagge!
+      destroyed_msg: Fuortsmiten fan opmerking foar moderatoaren slagge!
+    accounts:
+      add_email_domain_block: E-maildomein blokkearje
+      approve: Goedkarre
+      approved_msg: It goedkarren fan de account fan %{username} is slagge
+      are_you_sure: Binne jo wis?
+      avatar: Profylfoto
+      by_domain: Domein
+      change_email:
+        changed_msg: E-mailadres mei sukses wizige!
+        current_email: Aktuele e-mailadres
+        label: E-mailadres wizigje
+        new_email: Nij e-mailadres
+        submit: E-mailadres wizigje
+        title: E-mailadres foar %{username} wizigje
+      change_role:
+        changed_msg: Rol mei sukses wizige!
+        label: Rol wizigje
+        no_role: Gjin rol
+        title: Rol fan %{username} wizigje
+      confirm: Befêstigje
+      confirmed: Befêstige
+      confirming: Befêstiging
+      custom: Oanpast
+      delete: Gegevens fuortsmite
+      deleted: Fuortsmiten
+      demote: Degradearje
+      destroyed_msg: It fuortsmiten fan de gegevens fan %{username} stiet no yn de wachtrige
+      disable: Befrieze
+      disable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mailberjocht útskeakelje
+      disable_two_factor_authentication: 2FA útskeakelje
+      disabled: Beferzen
+      display_name: Werjeftenamme
+      domain: Domein
+      edit: Bewurkje
+      email: E-mailadres
+      email_status: E-mailsteat
+      enable: Untteie
+      enable_sign_in_token_auth: Ferifikaasje mei in tagongskoade fia e-mailberjocht ynskeakelje
+      enabled: Ynskeakele
+      enabled_msg: It ûntteie fan de account fan %{username} is slagge
+      followers: Folgers
+      follows: Folgjend
+      header: Omslachfoto
+      inbox_url: Ynboks-URL
+      invite_request_text: Redenen om te registrearjen
+      invited_by: Utnûge troch
+      ip: IP
+      joined: Registrearre
+      location:
+        all: Alle
+        local: Lokaal
+        remote: Ekstern
+        title: Lokaasje
+      login_status: Oanmeldsteat
+      media_attachments: Mediabylagen
+      memorialize: Nei in Yn memoriam wizigje
+      memorialized: Yn memoriam
+      memorialized_msg: It nei in Yn memoriam wizigje fan de account fan %{username} is slagge
+      moderation:
+        active: Aktyf
+        all: Alle
+        pending: Yn ôfwachting
+        silenced: Beheind
+        suspended: Utsteld
+        title: Moderaasje
+      moderation_notes: Opmerkingen foar moderatoaren
+      most_recent_activity: Lêst warber
+      most_recent_ip: Lêst brûkt IP-adres
+      no_account_selected: Der binne gjin accounts wizige, omdat der gjin ien selektearre waard
+      no_limits_imposed: Gjin limiten ynsteld
+      no_role_assigned: Gjin rol tawezen
+      not_subscribed: Net abonnearre
+      pending: Moat noch beoardiele wurde
+      perform_full_suspension: Utstelle
+      previous_strikes: Eardere skeiningen
+      promote: Promovearje
+      protocol: Protokol
+      public: Iepenbier
+      reject: Wegerje
+      security_measures:
+        only_password: Allinnich wachtwurd
+        password_and_2fa: Wachtwurd en 2FA
+      title: Accounts
+      unblock_email: E-mailadres deblokkearje
+      warn: Warskôgje
+      web: Web-app
+    action_logs:
+      action_types:
+        destroy_announcement: Meidieling fuortsmite
+      deleted_account: fuortsmiten account
+    custom_emojis:
+      copy: Kopiearje
+      delete: Fuortsmite
+      disable: Utskeakelje
+      disabled: Utskeakele
+      emoji: Emoji
+      enable: Ynskeakelje
+      enabled: Ynskeakele
+      image_hint: PNG of GIF net grutter as %{size}
+      list: Yn list
+      listed: Werjaan
+      upload: Oplade
+    dashboard:
+      active_users: warbere brûkers
+      interactions: ynteraksjes
+      title: Dashboerd
+      top_languages: Meast aktive talen
+      top_servers: Meast aktive tsjinners
+      website: Website
+    disputes:
+      appeals:
+        empty: Gjin beswieren fûn.
+        title: Beswieren
+    email_domain_blocks:
+      delete: Fuortsmite
+      domain: Domein
+      new:
+        create: Domain tafoegje
+        resolve: Domein opsykje
+    follow_recommendations:
+      status: Steat
+    instances:
+      back_to_all: Alle
+      back_to_limited: Beheind
+      back_to_warning: Warskôging
+      by_domain: Domein
+      confirm_purge: Wolle jo werklik alle gegevens fan dit domein foar ivich fuortsmite?
+      content_policies:
+        comment: Ynterne reden
+        policies:
+          silence: Beheind
+          suspend: Utsteld
+        policy: Belied
+      dashboard:
+        instance_accounts_measure: bewarre accounts
+    ip_blocks:
+      delete: Fuortsmite
+    relays:
+      delete: Fuortsmite
+    reports:
+      delete_and_resolve: Berjocht fuortsmite
+      notes:
+        delete: Fuortsmite
+    roles:
+      delete: Fuortsmite
+    rules:
+      delete: Fuortsmite
+    statuses:
+      deleted: Fuortsmiten
+    system_checks:
+      database_schema_check:
+        message_html: Der binne database migraasjes yn ôfwachting. Jo moatte dizze útfiere om der foar te soargjen dat de applikaasje wurkjen bliuwt sa as it heard
+    warning_presets:
+      delete: Fuortsmite
+    webhooks:
+      delete: Fuortsmite
+  auth:
+    delete_account: Account fuortsmite
+  deletes:
+    proceed: Account fuortsmite
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
+  filters:
+    contexts:
+      thread: Petearen
+    index:
+      delete: Fuortsmite
+  generic:
+    delete: Fuortsmite
+  invites:
+    delete: Deaktivearje
+  notification_mailer:
+    mention:
+      action: Beäntwurdzje
+      body: 'Jo binne fermeld troch %{name} yn:'
+      subject: Jo binne fermeld troch %{name}
+      title: Nije fermelding
+  relationships:
+    last_active: Letst warber
+  rss:
+    content_warning: 'Ynhâldswarskôging:'
+  settings:
+    delete: Account fuortsmite
+  statuses:
+    content_warning: 'Ynhâldswarskôging: %{warning}'
+    pin_errors:
+      direct: Berjochten dy’t allinnich sichtber binne foar fermelde brûkers kinne net fêstset wurde
+  webauthn_credentials:
+    delete: Fuortsmite
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 9f586aa37..c09238535 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1,4 +1,311 @@
 ---
 ga:
   about:
-    about_hashtag_html: Is toots phoiblí iad seo atá clibáilte le <strong>#%{hashtag}</strong>. Is féidir leat idirghníomhú leo má tá cuntas agat áit ar bith sa fediverse.
+    about_mastodon_html: 'Líonra sóisialta a sheasfaidh an aimsir: Gan fógraíocht, gan faire chorparáideach, le leagan amach eiticiúil agus dílárú. Bíodh do chuid sonraí agatsa féin le Mastodon!'
+    contact_missing: Gan socrú
+    contact_unavailable: N/B
+    hosted_on: Mastodon arna óstáil ar %{domain}
+    title: Maidir le
+  accounts:
+    follow: Lean
+    following: Ag leanúint
+    nothing_here: Níl rud ar bith anseo!
+    posts:
+      few: Postálacha
+      many: Postálacha
+      one: Postáil
+      other: Postálacha
+      two: Postálacha
+    posts_tab_heading: Postálacha
+  admin:
+    account_actions:
+      action: Déan gníomh
+      title: Dean gníomh modhnóireachta ar %{acct}
+    account_moderation_notes:
+      create: Fág nóta
+    accounts:
+      approve: Faomh
+      are_you_sure: An bhfuil tú cinnte?
+      avatar: Abhatár
+      by_domain: Fearann
+      change_email:
+        current_email: Ríomhphost reatha
+        label: Athraigh ríomhphost
+        new_email: Ríomhphost nua
+        submit: Athraigh ríomhphost
+        title: Athraigh ríomhphost do %{username}
+      change_role:
+        changed_msg: Athraíodh ról go rathúil!
+        label: Athraigh ról
+        no_role: Gan ról
+        title: Athraigh ról do %{username}
+      confirm: Deimhnigh
+      confirmed: Deimhnithe
+      confirming: Ag deimhniú
+      custom: Saincheaptha
+      delete: Scrios sonraí
+      deleted: Scriosta
+      demote: Ísligh
+      disable: Reoigh
+      disable_two_factor_authentication: Díchumasaigh 2FA
+      disabled: Reoite
+      display_name: Ainm taispeána
+      domain: Fearann
+      edit: Cuir in eagar
+      email: Ríomhphost
+      email_status: Stádas ríomhphoist
+      enable: Dí-reoigh
+      enabled: Ar chumas
+      followers: Leantóirí
+      follows: Ag leanúint
+      header: Ceanntásc
+      ip: IP
+      location:
+        all: Uile
+        local: Áitiúil
+        remote: Cian
+      memorialize: Déan cuntas chuimhneacháin de
+      memorialized: Cuntas chuimhneacháin
+      previous_strikes: Cionta roimhe seo
+      promote: Ardaigh
+      protocol: Prótacal
+      public: Poiblí
+      redownload: Athnuaigh próifíl
+      reject: Diúltaigh
+      remove_avatar: Bain abhatár
+      remove_header: Bain ceanntásc
+      resend_confirmation:
+        success: Seoladh go rathúil ríomhphost deimhnithe!
+      reset: Athshocraigh
+      reset_password: Athshocraigh pasfhocal
+      resubscribe: Athchláraigh
+      role: Ról
+      search: Cuardaigh
+      statuses: Postálacha
+      subscribe: Cláraigh
+      title: Cuntais
+      web: Gréasán
+    action_logs:
+      action_types:
+        assigned_to_self_report: Sann Tuairisc
+        create_account_warning: Cruthaigh Rabhadh
+        destroy_announcement: Scrios Fógra
+        destroy_ip_block: Scrios riail IP
+        destroy_status: Scrios Postáil
+        remove_avatar_user: Bain Abhatár
+        reopen_report: Athoscail tuairisc
+        reset_password_user: Athshocraigh Pasfhocal
+        resolve_report: Réitigh tuairisc
+        unassigned_report: Díshann Tuairisc
+        update_announcement: Nuashonraigh Fógra
+        update_status: Nuashonraigh Postáil
+        update_user_role: Nuashonraigh Ról
+      actions:
+        create_account_warning_html: Sheol %{name} rabhadh chuig %{target}
+      deleted_account: cuntas scriosta
+    announcements:
+      live: Beo
+      publish: Foilsigh
+    custom_emojis:
+      created_msg: Cruthaíodh emoji go rathúil!
+      delete: Scrios
+      destroyed_msg: Scriosadh emoji go rathúil!
+      disable: Díchumasaigh
+      disabled: Díchumasaithe
+      emoji: Emoji
+      enable: Cumasaigh
+      list: Liosta
+      upload: Uaslódáil
+    dashboard:
+      software: Bogearraí
+      title: Deais
+      website: Suíomh Gréasáin
+    domain_blocks:
+      domain: Fearann
+    email_domain_blocks:
+      delete: Scrios
+    follow_recommendations:
+      status: Stádas
+      title: Moltaí leanúna
+      unsuppress: Aischuir moladh leanúna
+    instances:
+      back_to_all: Uile
+      back_to_warning: Rabhadh
+      content_policies:
+        policy: Polasaí
+      delivery:
+        all: Uile
+        unavailable: Níl ar fáil
+      moderation:
+        all: Uile
+      purge: Glan
+      title: Cónascadh
+      total_followed_by_us: Á leanúint againn
+    invites:
+      filter:
+        all: Uile
+        available: Ar fáil
+    ip_blocks:
+      delete: Scrios
+      expires_in:
+        '1209600': Coicís
+        '15778476': 6 mhí
+        '2629746': Mí amháin
+        '31556952': Bliain amháin
+        '86400': Lá amháin
+        '94670856': 3 bhliain
+    relays:
+      delete: Scrios
+      disable: Díchumasaigh
+      disabled: Díchumasaithe
+      enable: Cumasaigh
+      enabled: Ar chumas
+      save_and_enable: Sábháil agus cumasaigh
+      status: Stádas
+    reports:
+      category: Catagóir
+      delete_and_resolve: Scrios postálacha
+      no_one_assigned: Duine ar bith
+      notes:
+        delete: Scrios
+        title: Nótaí
+      status: Stádas
+      title: Tuairiscí
+    roles:
+      delete: Scrios
+      privileges:
+        delete_user_data: Scrios Sonraí Úsáideora
+    rules:
+      delete: Scrios
+    settings:
+      appearance:
+        title: Cuma
+      default_noindex:
+        desc_html: I bhfeidhm do ghach úsáideoir nár athraigh an socrú seo iad féin
+        title: Diúltaigh d'innéacsú inneall cuardaigh mar réamhshocrú d'úsáideoirí
+    site_uploads:
+      delete: Scrios comhad uaslódáilte
+    statuses:
+      account: Údar
+      back_to_account: Ar ais go leathanach cuntais
+      deleted: Scriosta
+      favourites: Toghanna
+      language: Teanga
+      media:
+        title: Meáin
+      metadata: Meiteashonraí
+      open: Oscail postáil
+      original_status: Bunphostáil
+      reblogs: Athbhlaganna
+      status_changed: Athraíodh postáil
+      trending: Ag treochtáil
+      with_media: Le meáin
+    strikes:
+      actions:
+        delete_statuses: Scrios %{name} postálacha de chuid %{target}
+    tags:
+      review: Stádas athbhreithnithe
+    trends:
+      allow: Ceadaigh
+      disallow: Dícheadaigh
+      preview_card_providers:
+        title: Foilsitheoirí
+      statuses:
+        allow: Ceadaigh postáil
+        allow_account: Ceadaigh údar
+    warning_presets:
+      delete: Scrios
+    webhooks:
+      delete: Scrios
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: a gcuid postálacha a scrios
+        none: rabhadh
+  auth:
+    delete_account: Scrios cuntas
+    logout: Logáil Amach
+    too_fast: Cuireadh an fhoirm isteach róthapa, triail arís.
+  authorize_follow:
+    follow: Lean
+    post_follow:
+      return: Taispeáin próifíl an úsáideora
+    title: Lean %{acct}
+  deletes:
+    proceed: Scrios cuntas
+  disputes:
+    strikes:
+      appeal_submitted_at: Achomharc curtha isteach
+      appealed_msg: Cuireadh isteach d'achomharc. Má ceadófar é, cuirfear ar an eolas tú.
+      appeals:
+        submit: Cuir achomharc isteach
+      title_actions:
+        none: Rabhadh
+      your_appeal_pending: Chuir tú achomharc isteach
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
+  filters:
+    contexts:
+      thread: Comhráite
+    index:
+      delete: Scrios
+      title: Scagairí
+  generic:
+    delete: Scrios
+  notification_mailer:
+    admin:
+      report:
+        subject: Chuir %{name} tuairisc isteach
+    follow:
+      body: Tá %{name} do do leanúint anois!
+      subject: Tá %{name} do do leanúint anois
+      title: Leantóirí nua
+    reblog:
+      subject: Mhol %{name} do phostáil
+      title: Moladh nua
+  relationships:
+    follow_selected_followers: Lean leantóirí roghnaithe
+    followers: Leantóirí
+    following: Ag leanúint
+    remove_selected_followers: Bain leantóirí roghnaithe
+    remove_selected_follows: Dí-lean úsáideoirí roghnaithe
+  rss:
+    content_warning: 'Rabhadh ábhair:'
+  settings:
+    account: Cuntas
+    appearance: Cuma
+    back: Ar ais go Mastodon
+    development: Forbairt
+    edit_profile: Cuir an phróifíl in eagar
+    profile: Próifíl
+  statuses:
+    boosted_from_html: Molta ó %{acct_link}
+    content_warning: 'Rabhadh ábhair: %{warning}'
+    show_more: Taispeáin níos mó
+    show_newer: Taispeáin níos nuaí
+    show_thread: Taispeáin snáithe
+    visibilities:
+      private: Leantóirí amháin
+      private_long: Taispeáin do leantóirí amháin
+  statuses_cleanup:
+    ignore_favs: Tabhair neamhaird ar toghanna
+  user_mailer:
+    warning:
+      appeal: Cuir achomharc isteach
+      categories:
+        spam: Turscar
+      reason: 'Fáth:'
+      subject:
+        none: Rabhadh do %{acct}
+      title:
+        none: Rabhadh
+  webauthn_credentials:
+    delete: Scrios
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index cb1130635..22f87aa49 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1,67 +1,13 @@
 ---
 gd:
   about:
-    about_hashtag_html: Seo postaichean poblach le taga <strong>#%{hashtag}</strong> riutha. ’S urrainn dhut conaltradh leotha ma tha cunntas agad àite sam bith sa cho-shaoghal.
     about_mastodon_html: 'An lìonra sòisealta dhan àm ri teachd: Gun sanasachd, gun chaithris corporra, dealbhadh beusail agus dì-mheadhanachadh! Gabh sealbh air an dàta agad fhèin le Mastodon!'
-    about_this: Mu dhèidhinn
-    active_count_after: gnìomhach
-    active_footnote: Cleachdaichean gnìomhach gach mìos (MAU)
-    administered_by: 'Rianachd le:'
-    api: API
-    apps: Aplacaidean mobile
-    apps_platforms: Cleachd Mastodon o iOS, Android ’s ùrlaran eile
-    browse_directory: Rùraich eòlaire phròifilean ’s criathraich a-rèir ùidhean
-    browse_local_posts: Brabhsaich sruth beò de phostaichean poblach on fhrithealaiche seo
-    browse_public_posts: Brabhsaich sruth beò de phostaichean poblach air Mastodon
-    contact: Fios thugainn
     contact_missing: Cha deach a shuidheachadh
     contact_unavailable: Chan eil seo iomchaidh
-    discover_users: Lorg cleachdaichean
-    documentation: Docamaideadh
-    federation_hint_html: Le cunntas air %{instance}, ’s urrainn dhut leantainn air daoine air frithealaiche Mastodon sam bith is a bharrachd.
-    get_apps: Feuch aplacaid mobile
     hosted_on: Mastodon ’ga òstadh air %{domain}
-    instance_actor_flash: |
-      ’S e actar biortail a tha sa chunntas seo a riochdaicheas am frithealaiche fhèin seach cleachdaiche sònraichte.
-      Tha e ’ga chleachdadh a chùm co-nasgaidh agus cha bu chòir dhut a bhacadh ach ma tha thu airson an t-ionstans gu lèir a bhacadh agus b’ fheàirrde thu bacadh àrainne a chleachdadh an àite sin.
-    learn_more: Barrachd fiosrachaidh
-    privacy_policy: Poileasaidh prìobhaideachd
-    rules: Riaghailtean an fhrithealaiche
-    rules_html: 'Tha geàrr-chunntas air na riaghailtean a dh’fheumas tu gèilleadh riutha ma tha thu airson cunntas fhaighinn air an fhrithealaiche Mastodon seo gu h-ìosal:'
-    see_whats_happening: Faic dè tha dol
-    server_stats: 'Stadastaireachd an fhrithealaiche:'
-    source_code: Bun-tùs
-    status_count_after:
-      few: postaichean
-      one: phost
-      other: post
-      two: phost
-    status_count_before: A dh’fhoillsich
-    tagline: Lean air caraidean ’s lorg feadhainn ùra
-    terms: Teirmichean na seirbheise
-    unavailable_content: Frithealaichean fo mhaorsainneachd
-    unavailable_content_description:
-      domain: Frithealaiche
-      reason: Adhbhar
-      rejecting_media: 'Cha dèid faidhlichean meadhain o na frithealaichean seo a phròiseasadh no a stòradh agus cha dèid dealbhagan dhiubh a shealltainn. Feumar briogadh gus an ruigear am faidhle tùsail a làimh:'
-      rejecting_media_title: Meadhanan criathraichte
-      silenced: 'Thèid postaichean o na frithealaichean seo fhalach air loidhnichean-ama is còmhraidhean poblach agus cha dèid brathan a ghintinn à conaltraidhean nan cleachdaichean aca ach ma bhios tu fèin a’ leantainn orra:'
-      silenced_title: Frithealaichean mùchte
-      suspended: 'Cha dèid dàta sam bith o na frithealaichean seo a phròiseasadh, a stòradh no iomlaid agus chan urrainn do na cleachdaichean o na frithealaichean sin conaltradh an-seo:'
-      suspended_title: Frithealaichean à rèim
-    unavailable_content_html: San fharsaingeachd, leigidh Mastodon leat susbaint o fhrithealaiche sam bith sa cho-shaoghal a shealltainn agus conaltradh leis na cleachdaichean uapa-san. Seo na h-easgaidhean a tha an sàs air an fhrithealaiche shònraichte seo.
-    user_count_after:
-      few: cleachdaichean
-      one: chleachdaiche
-      other: cleachdaiche
-      two: chleachdaiche
-    user_count_before: "’Na dhachaigh do"
-    what_is_mastodon: Dè th’ ann am Mastodon?
+    title: Mu dhèidhinn
   accounts:
-    choices_html: 'Roghadh is taghadh %{name}:'
-    endorsements_hint: "’S urrainn dhut daoine air a leanas tu a bhrosnachadh on eadar-aghaidh-lìn agus nochdaidh iad an-seo."
-    featured_tags_hint: "’S urrainn dhut tagaichean hais sònraichte a bhrosnachadh a thèid a shealltainn an-seo."
-    follow: Lean air
+    follow: Lean
     followers:
       few: Luchd-leantainn
       one: Neach-leantainn
@@ -69,32 +15,17 @@ gd:
       two: Luchd-leantainn
     following: A’ leantainn
     instance_actor_flash: "’S e actar biortail a tha sa chunntas seo a riochdaicheas am frithealaiche fhèin seach cleachdaiche sònraichte. Tha e ’ga chleachdadh a chùm co-nasgaidh agus cha bu chòir dhut a chur à rèim."
-    joined: Air ballrachd fhaighinn %{date}
     last_active: an gnìomh mu dheireadh
     link_verified_on: Chaidh dearbhadh cò leis a tha an ceangal seo %{date}
-    media: Meadhanan
-    moved_html: 'Chaidh %{name} imrich gu %{new_profile_link}:'
-    network_hidden: Chan eil am fiosrachadh seo ri fhaighinn
-    never_active: Chan ann idir
     nothing_here: Chan eil dad an-seo!
-    people_followed_by: Daoine air a leanas %{name}
-    people_who_follow: Daoine a tha a’ leantainn air %{name}
     pin_errors:
-      following: Feumaidh tu leantainn air neach mus urrainn dhut a bhrosnachadh
+      following: Feumaidh tu neach a leantainn mus urrainn dhut a bhrosnachadh
     posts:
       few: Postaichean
       one: Post
       other: Postaichean
       two: Postaichean
     posts_tab_heading: Postaichean
-    posts_with_replies: Postaichean ’s freagairtean
-    roles:
-      admin: Rianaire
-      bot: Bot
-      group: Buidheann
-      moderator: Maor
-    unavailable: Chan eil a’ phròifil ri làimh
-    unfollow: Na lean tuilleadh
   admin:
     account_actions:
       action: Gabh an gnìomh
@@ -102,26 +33,30 @@ gd:
     account_moderation_notes:
       create: Fàg nòta
       created_msg: Chaidh nòta na maorsainneachd a chruthachadh!
-      delete: Sguab às
       destroyed_msg: Chaidh nòta na maorsainneachd a mhilleadh!
     accounts:
       add_email_domain_block: Bac àrainn a’ phuist-d
       approve: Aontaich ris
-      approve_all: Aontaich ris na h-uile
       approved_msg: Chaidh aontachadh ris an iarrtas clàraidh aig %{username}
       are_you_sure: A bheil thu cinnteach?
       avatar: Avatar
       by_domain: Àrainn
       change_email:
-        changed_msg: Chaidh post-d a’ chunntais atharrachadh!
+        changed_msg: Chaidh am post-d atharrachadh!
         current_email: Am post-d làithreach
         label: Atharraich am post-d
         new_email: Post-d ùr
         submit: Atharraich am post-d
         title: Atharraich am post-d airson %{username}
+      change_role:
+        changed_msg: Chaidh an dreuchd atharrachadh!
+        label: Atharraich an dreuchd
+        no_role: Gun dreuchd
+        title: Atharraich an dreuchd aig %{username}
       confirm: Dearbh
       confirmed: Chaidh a dhearbhachadh
       confirming: "’Ga dhearbhadh"
+      custom: Gnàthaichte
       delete: Sguab às an dàta
       deleted: Chaidh a sguabadh às
       demote: Ìslich
@@ -140,7 +75,7 @@ gd:
       enabled: An comas
       enabled_msg: Chaidh an cunntas aig %{username} a dhì-reòthadh
       followers: Luchd-leantainn
-      follows: A’ leantainn air
+      follows: A’ leantainn
       header: Bann-cinn
       inbox_url: URL a’ bhogsa a-steach
       invite_request_text: Adhbharan na ballrachd
@@ -161,7 +96,7 @@ gd:
         active: Gnìomhach
         all: Na h-uile
         pending: Ri dhèiligeadh
-        silenced: Mùchte
+        silenced: Cuingichte
         suspended: À rèim
         title: Maorsainneachd
       moderation_notes: Nòtaichean na maorsainneachd
@@ -169,9 +104,16 @@ gd:
       most_recent_ip: An IP as ùire
       no_account_selected: Cha deach cunntas sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       no_limits_imposed: Cha deach crìoch sam bith a sparradh
+      no_role_assigned: Cha deach dreuchd iomruineadh
       not_subscribed: Gun fho-sgrìobhadh
       pending: A’ feitheamh air lèirmheas
       perform_full_suspension: Cuir à rèim
+      previous_strikes: Rabhaidhean roimhe
+      previous_strikes_description_html:
+        few: Fhuair an cunntas seo <strong>%{count}</strong> rabhaidhean.
+        one: Fhuair an cunntas seo <strong>%{count}</strong> rabhadh.
+        other: Fhuair an cunntas seo <strong>%{count}</strong> rabhadh.
+        two: Fhuair an cunntas seo <strong>%{count}</strong> rabhadh.
       promote: Àrdaich
       protocol: Pròtacal
       public: Poblach
@@ -179,7 +121,6 @@ gd:
       redownload: Ath-nuadhaich a’ phròifil
       redownloaded_msg: Chaidh a’ phròifil aig %{username} on tùs
       reject: Diùlt
-      reject_all: Diùlt na h-uile
       rejected_msg: Chaidh an t-iarrtas clàraidh aig %{username} a dhiùltadh
       remove_avatar: Thoir air falbh an t-avatar
       remove_header: Thoir air falbh am bann-cinn
@@ -192,39 +133,36 @@ gd:
       reset: Ath-shuidhich
       reset_password: Ath-shuidhich am facal-faire
       resubscribe: Fo-sgrìobh a-rithist
-      role: Ceadan
-      roles:
-        admin: Rianaire
-        moderator: Maor
-        staff: Ball dhen sgioba
-        user: Cleachdaiche
+      role: Dreuchd
       search: Lorg
       search_same_email_domain: Cleachdaichean eile aig a bheil an aon àrainn puist-d
       search_same_ip: Cleachdaichean eile aig a bheil an t-aon IP
       security_measures:
         only_password: Facal-faire a-mhàin
         password_and_2fa: Facal-faire ’s dà-cheumnach
-        password_and_sign_in_token: Facal-faire ’s tòcan puist-d
-      sensitive: Frionasach
+      sensitive: Spàrr an fhrionasachd air
       sensitized: Chaidh comharradh gu bheil e frionasach
       shared_inbox_url: URL a’ bhogsa a-steach cho-roinnte
       show:
         created_reports: Gearanan a chaidh a dhèanamh
         targeted_reports: Gearanan le càch
-      silence: Crìoch
+      silence: Cuingich
       silenced: Cuingichte
       statuses: Postaichean
+      strikes: Rabhaidhean roimhe
       subscribe: Fo-sgrìobh
+      suspend: Cuir à rèim
       suspended: À rèim
       suspension_irreversible: Chaidh dàta a’ chunntais seo a sguabadh às gu buan. ’S urrainn an cunntas a chur ann an rèim a-rithist ach an gabh a chleachdadh ach chan fhaigh thu gin dhen dàta air ais a b’ àbhaist a bhith aige.
       suspension_reversible_hint_html: Chaidh an cunntas a chur à rèim agus thèid an dàta aige a sguabadh às gu buan %{date}. Gus an dig an t-àm ud, gabhaidh an cunntas aiseag fhathast gun droch bhuaidh sam bith air. Nam bu toigh leat gach dàta a’ chunntais a thoirt air falbh sa bhad, ’s urrainn dhut sin a dhèanamh gu h-ìosal.
-      time_in_queue: A’ feitheamh air a’ chiudha fad %{time}
       title: Cunntasan
+      unblock_email: Dì-bhac an seòladh puist-d
+      unblocked_email_msg: Chaidh am post-d aig %{username} a dhì-bhacadh
       unconfirmed_email: Post-d gun dearbhadh
-      undo_sensitized: Thoir air falbh a comharra gu bheil e frionasach
-      undo_silenced: Dì-mhùch
+      undo_sensitized: Na spàrr an fhrionasachd air tuilleadh
+      undo_silenced: Dì-chuingich
       undo_suspension: Cuir ann an rèim a-rithist
-      unsilenced_msg: Chaidh an cuingeachadh a thoirt air falbh on chunntas aig %{username}
+      unsilenced_msg: Chaidh an cunntas aig %{username} a dhì-chuingeachadh
       unsubscribe: Cuir crìoch air an fho-sgrìobhadh
       unsuspended_msg: Chaidh an cunntas aig %{username} a chur ann an rèim a-rithist
       username: Ainm-cleachdaiche
@@ -234,26 +172,34 @@ gd:
       whitelisted: Ceadaichte a chùm co-nasgaidh
     action_logs:
       action_types:
+        approve_appeal: Thoir aonta ris an ath-thagradh
+        approve_user: Aontaich ris a’ chleachdaiche
         assigned_to_self_report: Iomruin an gearan
         change_email_user: Atharraich post-d a’ chleachdaiche
+        change_role_user: Atharraich dreuchd a’ chleachdaiche
         confirm_user: Dearbh an cleachdaiche
         create_account_warning: Cruthaich rabhadh
         create_announcement: Cruthaich brath-fios
+        create_canonical_email_block: Cruthaich bacadh puist-d
         create_custom_emoji: Cruthaich Emoji gnàthaichte
         create_domain_allow: Cruthaich ceadachadh àrainne
         create_domain_block: Cruthaich bacadh àrainne
         create_email_domain_block: Cruthaich bacadh àrainne puist-d
         create_ip_block: Cruthaich riaghailt IP
         create_unavailable_domain: Cruthaich àrainn nach eil ri fhaighinn
+        create_user_role: Cruthaich dreuchd
         demote_user: Ìslich an cleachdaiche
         destroy_announcement: Sguab às am brath-fios
+        destroy_canonical_email_block: Sguab às dhan bhacadh puist-d
         destroy_custom_emoji: Sguab às an t-Emoji gnàthaichte
         destroy_domain_allow: Sguab às ceadachadh na h-àrainne
         destroy_domain_block: Sguab às bacadh na h-àrainne
         destroy_email_domain_block: Sguab às bacadh na h-àrainne puist-d
+        destroy_instance: Purgaidich an àrainn
         destroy_ip_block: Sguab às an riaghailt IP
         destroy_status: Sguab às am post
         destroy_unavailable_domain: Sguab às àrainn nach eil ri fhaighinn
+        destroy_user_role: Mill an dreuchd
         disable_2fa_user: Cuir an dearbhadh dà-cheumnach à comas
         disable_custom_emoji: Cuir an t-Emoji gnàthaichte à comas
         disable_sign_in_token_auth_user: Cuir à comas dearbhadh le tòcan puist-d dhan chleachdaiche
@@ -263,42 +209,56 @@ gd:
         enable_user: Cuir an cleachdaiche an comas
         memorialize_account: Dèan cuimhneachan dhen chunntas
         promote_user: Àrdaich an cleachdaiche
+        reject_appeal: Diùlt an t-ath-thagradh
+        reject_user: Diùlt an cleachdaiche
         remove_avatar_user: Thoir air falbh an t-avatar
         reopen_report: Fosgail an gearan a-rithist
+        resend_user: Cuir am post-d dearbhaidh a-rithist
         reset_password_user: Ath-shuidhich am facal-faire
         resolve_report: Fuasgail an gearan
-        sensitive_account: Comharraich gu bheil na meadhanan sa chunntas agad frionasach
-        silence_account: Mùch an cunntas
+        sensitive_account: Spàrr an fhrionasachd air a’ chunntas seo
+        silence_account: Cuingich an cunntas
         suspend_account: Cuir an cunntas à rèim
         unassigned_report: Dì-iomruin an gearan
-        unsensitive_account: Comharraich nach eil na meadhanan sa chunntas agad frionasach
-        unsilence_account: Dì-mhùch an cunntas
+        unblock_email_account: Dì-bhac an seòladh puist-d
+        unsensitive_account: Na spàrr an fhrionasachd air a’ chunntas seo tuilleadh
+        unsilence_account: Dì-chuingich an cunntas
         unsuspend_account: Cuir an cunntas ann an rèim a-rithist
         update_announcement: Ùraich am brath-fios
         update_custom_emoji: Ùraich an t-Emoji gnàthaichte
         update_domain_block: Ùraich bacadh na h-àrainne
+        update_ip_block: Ùraich an riaghailt IP
         update_status: Ùraich am post
+        update_user_role: Ùraich an dreuchd
       actions:
+        approve_appeal_html: Dh’aontaich %{name} ri ath-thagradh air co-dhùnadh na maorsainneachd o %{target}
+        approve_user_html: Dh’aontaich %{name} ri clàradh o %{target}
         assigned_to_self_report_html: Dh’iomruin %{name} an gearan %{target} dhaibh fhèin
         change_email_user_html: Dh’atharraich %{name} seòladh puist-d a’ chleachdaiche %{target}
+        change_role_user_html: Atharraich %{name} an dreuchd aig %{target}
         confirm_user_html: Dhearbh %{name} seòladh puist-d a’ chleachdaiche %{target}
         create_account_warning_html: Chuir %{name} rabhadh gu %{target}
         create_announcement_html: Chruthaich %{name} brath-fios %{target} ùr
+        create_canonical_email_block_html: Bhac %{name} am post-d air a bheil an hais %{target}
         create_custom_emoji_html: Luchdaich %{name} suas Emoji %{target} ùr
         create_domain_allow_html: Cheadaich %{name} co-nasgadh leis an àrainn %{target}
         create_domain_block_html: Bhac %{name} an àrainn %{target}
         create_email_domain_block_html: Bhac %{name} an àrainn puist-d %{target}
         create_ip_block_html: Chruthaich %{name} riaghailt dhan IP %{target}
         create_unavailable_domain_html: Sguir %{name} ris an lìbhrigeadh dhan àrainn %{target}
+        create_user_role_html: Chruthaich %{name} an dreuchd %{target}
         demote_user_html: Dh’ìslich %{name} an cleachdaiche %{target}
         destroy_announcement_html: Sguab %{name} às am brath-fios %{target}
-        destroy_custom_emoji_html: Mhill %{name} an Emoji %{target}
+        destroy_canonical_email_block_html: Dhì-bhac %{name} am post-d air a bheil an hais %{target}
+        destroy_custom_emoji_html: Sguab %{name} às an Emoji %{target}
         destroy_domain_allow_html: Dì-cheadaich %{name} co-nasgadh leis an àrainn %{target}
         destroy_domain_block_html: Dì-bhac %{name} an àrainn %{target}
         destroy_email_domain_block_html: Dì-bhac %{name} an àrainn puist-d %{target}
+        destroy_instance_html: Purgaidich %{name} an àrainn %{target}
         destroy_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
         destroy_status_html: Thug %{name} post aig %{target} air falbh
         destroy_unavailable_domain_html: Lean %{name} air adhart leis an lìbhrigeadh dhan àrainn %{target}
+        destroy_user_role_html: Sguab %{name} às an dreuchd %{target}
         disable_2fa_user_html: Chuir %{name} riatanas an dearbhaidh dà-cheumnaich à comas dhan chleachdaiche %{target}
         disable_custom_emoji_html: Chuir %{name} an Emoji %{target} à comas
         disable_sign_in_token_auth_user_html: Chuir %{name} à comas dearbhadh le tòcan puist-d dha %{target}
@@ -308,22 +268,28 @@ gd:
         enable_user_html: Chuir %{name} an clàradh a-steach an comas dhan chleachdaiche %{target}
         memorialize_account_html: Rinn %{name} duilleag cuimhneachain dhen chunntas aig %{target}
         promote_user_html: Dh’àrdaich %{name} an cleachdaiche %{target}
+        reject_appeal_html: Dhiùlt %{name} an t-ath-thagradh air co-dhùnadh na maorsainneachd o %{target}
+        reject_user_html: Dhiùlt %{name} an clàradh o %{target}
         remove_avatar_user_html: Thug %{name} avatar aig %{target} air falbh
         reopen_report_html: Dh’fhosgail %{name} an gearan %{target} a-rithist
+        resend_user_html: Chuir %{name} am post-d dearbhaidh airson %{target} a-rithist
         reset_password_user_html: Dh’ath-shuidhich %{name} am facal-faire aig a’ chleachdaiche %{target}
         resolve_report_html: Dh’fhuasgail %{name} an gearan %{target}
         sensitive_account_html: Chuir %{name} comharra gu bheil e frionasach ri meadhan aig %{target}
-        silence_account_html: Mhùch %{name} an cunntas aig %{target}
+        silence_account_html: Chuingich %{name} an cunntas aig %{target}
         suspend_account_html: Chuir %{name} an cunntas aig %{target} à rèim
         unassigned_report_html: Neo-iomruin %{name} an gearan %{target}
+        unblock_email_account_html: Dhì-bhac %{name} an seòladh puist-d aig %{target}
         unsensitive_account_html: Chuir %{name} comharra nach eil e frionasach ri meadhan aig %{target}
-        unsilence_account_html: Dì-mhùch %{name} an cunntas aig %{target}
+        unsilence_account_html: Dì-chuingich %{name} an cunntas aig %{target}
         unsuspend_account_html: Chuir %{name} an cunntas aig %{target} ann an rèim a-rithist
         update_announcement_html: Dh’ùraich %{name} am brath-fios %{target}
         update_custom_emoji_html: Dh’ùraich %{name} an Emoji %{target}
         update_domain_block_html: Dh’ùraich %{name} bacadh na h-àrainne %{target}
+        update_ip_block_html: Sguab %{name} às riaghailt dhan IP %{target}
         update_status_html: Dh’ùraich %{name} post le %{target}
-      deleted_status: "(post air a sguabadh às)"
+        update_user_role_html: Dh’atharraich %{name} an dreuchd %{target}
+      deleted_account: chaidh an cunntas a sguabadh às
       empty: Cha deach loga a lorg.
       filter_by_action: Criathraich a-rèir gnìomha
       filter_by_user: Criathraich a-rèir cleachdaiche
@@ -362,11 +328,12 @@ gd:
       enable: Cuir an comas
       enabled: Chaidh a chur an comas
       enabled_msg: Chaidh an t-Emoji sin a chur an comas
-      image_hint: PNG suas ri 50KB
+      image_hint: PNG no GIF suas ri %{size}
       list: Liosta
       listed: Liostaichte
       new:
         title: Cuir Emoji gnàthaichte ùr ris
+      no_emoji_selected: Cha deach Emoji sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       not_permitted: Chan fhaod thu seo a dhèanamh
       overwrite: Sgrìobh thairis air
       shortcode: Geàrr-chòd
@@ -379,13 +346,49 @@ gd:
       updated_msg: Chaidh an t-Emoji ùrachadh!
       upload: Luchdaich suas
     dashboard:
+      active_users: cleachdaichean gnìomhach
+      interactions: eadar-ghnìomhan
+      media_storage: Stòras mheadhanan
+      new_users: cleachdaichean ùra
+      opened_reports: gearanan air am fosgladh
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> ath-thagraidhean ri dhèiligeadh"
+        one: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
+        other: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
+        two: "<strong>%{count}</strong> ath-thagradh ri dhèiligeadh"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> gearanan ri dhèiligeadh"
+        one: "<strong>%{count}</strong> ghearan ri dhèiligeadh"
+        other: "<strong>%{count}</strong> gearan ri dhèiligeadh"
+        two: "<strong>%{count}</strong> ghearan ri dhèiligeadh"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> tagaichean hais ri dhèiligeadh"
+        one: "<strong>%{count}</strong> taga hais ri dhèiligeadh"
+        other: "<strong>%{count}</strong> taga hais ri dhèiligeadh"
+        two: "<strong>%{count}</strong> thaga hais ri dhèiligeadh"
+      pending_users_html:
+        few: "<strong>%{count}</strong> cleachdaichean ri dhèiligeadh"
+        one: "<strong>%{count}</strong> chleachdaiche ri dhèiligeadh"
+        other: "<strong>%{count}</strong> cleachdaiche ri dhèiligeadh"
+        two: "<strong>%{count}</strong> chleachdaiche ri dhèiligeadh"
+      resolved_reports: gearanan air am fuasgladh
       software: Bathar-bog
+      sources: Tùsan clàraidh
       space: Caitheamh àite
       title: Deas-bhòrd
+      top_languages: Brod nan cànan gnìomhach
+      top_servers: Brod nam frithealaichean gnìomhach
+      website: Làrach-lìn
+    disputes:
+      appeals:
+        empty: Cha deach ath-thagradh a lorg.
+        title: Ath-thagraidhean
     domain_allows:
       add_new: Ceadaich co-nasgadh le àrainn
       created_msg: Chaidh an àrainn a cheadachadh a chùm co-nasgaidh
       destroyed_msg: Chan eil co-nasgadh leis an àrainn seo ceadaichte tuilleadh
+      export: Às-phortadh
+      import: Ion-phortadh
       undo: Na ceadaich co-nasgadh leis an àrainn
     domain_blocks:
       add_new: Cuir bacadh àrainne ùr ris
@@ -393,19 +396,23 @@ gd:
       destroyed_msg: Chan eil an àrainn ’ga bacadh tuilleadh
       domain: Àrainn
       edit: Deasaich bacadh na h-àrainne
+      existing_domain_block: Chuir thu cuingeachaidhean nas teinne air %{name} mu thràth.
       existing_domain_block_html: Chuir thu cuingeachadh nas teinne air %{name} mu thràth, feumaidh tu a <a href="%{unblock_url}">dì-bhacadh</a> an toiseach.
+      export: Às-phortadh
+      import: Ion-phortadh
       new:
         create: Cruthaich bacadh
         hint: Cha chuir bacadh na h-àrainne crìoch air cruthachadh chunntasan san stòr-dàta ach cuiridh e dòighean maorsainneachd sònraichte an sàs gu fèin-obrachail air a h-uile dàta a tha aig na cunntasan ud.
         severity:
-          desc_html: Falaichidh am <strong>mùchadh</strong> postaichean a’ chunntais do dhuine sam bith nach ail a’ leantainn air. Bheir an <strong>cur à rèim</strong> air falbh gach susbaint, meadhan is dàta pròifil a’ chunntais. Tagh <strong>Chan eil gin</strong> mur eil thu ach airson faidhlichean meadhain a dhiùltadh.
           noop: Chan eil gin
-          silence: Mùch
+          silence: Cuingich
           suspend: Cuir à rèim
         title: Bacadh àrainne ùr
+      no_domain_block_selected: Cha deach bacadh àrainn sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+      not_permitted: Chan fhaod thu seo a dhèanamh
       obfuscate: Doilleirich ainm na h-àrainne
       obfuscate_hint: Doilleirich pàirt de dh’ainm na h-àrainne air an liosta ma tha foillseachadh liosta nan cuingeachaidhean àrainne an comas
-      private_comment: Beachd prìobhaideachd
+      private_comment: Beachd prìobhaideach
       private_comment_hint: Beachd mu chuingeachadh na h-àrainne seo nach cleachd ach na maoir.
       public_comment: Beachd poblach
       public_comment_hint: Beachd poblach mu chuingeachadh na h-àrainne seo ma tha foillseachadh liosta nan cuingeachaidhean àrainne an comas.
@@ -413,38 +420,43 @@ gd:
       reject_media_hint: Bheir seo air falbh na faidhlichean meadhain a chaidh a stòradh agus diùltaidh e luchdadh a-nuas sam bith dhiubh san àm ri teachd. Chan eil buaidh aig seo fo chur à rèim
       reject_reports: Diùlt gearanan
       reject_reports_hint: Leig seachad gearan sam bith a thig a-steach on àrainn seo. Chan eil buaidh aig seo fo chur à rèim
-      rejecting_media: a’ diùltadh faidhlichean meadhain
-      rejecting_reports: a’ diùltadh gearanan
-      severity:
-        silence: mùchte
-        suspend: à rèim
-      show:
-        affected_accounts:
-          few: Bheir seo buaidh air %{count} cunntasan san stòr-dàta
-          one: Bheir seo buaidh air %{count} chunntas san stòr-dàta
-          other: Bheir seo buaidh air %{count} cunntas san stòr-dàta
-          two: Bheir seo buaidh air %{count} chunntas san stòr-dàta
-        retroactive:
-          silence: Dì-mhùch na cunntasan a tha ann on àrainn seo ’s air a bheil buaidh
-          suspend: Cuir na cunntasan a tha ann on àrainn seo ’s air a bheil buaidh ann an rèim a-rithist
-        title: Neo-dhèan bacadh na h-àrainne %{domain}
-        undo: Neo-dhèan
       undo: Neo-dhèan bacadh na h-àrainne
       view: Seall bacadh na h-àrainne
     email_domain_blocks:
       add_new: Cuir tè ùr ris
+      attempts_over_week:
+        few: "%{count} oidhirpean clàraidh rè na seachdain seo chaidh"
+        one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
+        other: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
+        two: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
       created_msg: Chaidh àrainn a’ phuist-d a bhacadh
       delete: Sguab às
-      destroyed_msg: Chaidh àrainn a’ phuist-d a dhì-bhacadh
+      dns:
+        types:
+          mx: Clàr MX
       domain: Àrainn
-      empty: Chan eil àrainn puist-d sam bith ’ga bhacadh aig an àm seo.
-      from_html: o %{domain}
       new:
         create: Cuir àrainn ris
+        resolve: Fuasgail an àrainn
         title: Bac àrainn puist-d ùr
+      no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+      resolved_dns_records_hint_html: Thèid ainm na h-àrainne fhuasgladh nan àrainnean MX a leanas agus an urra riutha-san gun gabh iad ri post-d. Ma bhacas tu àrainn MX, bacaidh seo an clàradh o sheòladh puist-d sam bith a chleachdas an aon àrainn MX fiù ’s ma bhios ainm àrainne eadar-dhealaichte ’ga sealltainn. <strong>Thoir an aire nach bac thu solaraichean puist-d mòra.</strong>
+      resolved_through_html: Chaidh fuasgladh slighe %{domain}
       title: Àrainnean puist-d ’gam bacadh
+    export_domain_allows:
+      new:
+        title: Ion-phortaich àrainnean ceadaichte
+      no_file: Cha deach faidhle a thaghadh
+    export_domain_blocks:
+      import:
+        existing_relationships_warning: Dàimhean leantainn làithreach
+        private_comment_template: Chaidh ion-phortadh o %{source} %{date}
+        title: Ion-phortaich bacaidhean àrainne
+      new:
+        title: Ion-phortaich bacaidhean àrainne
+      no_file: Cha deach faidhle a thaghadh
     follow_recommendations:
-      description_html: "<strong>Cuidichidh molaidhean leantainn an luchd-cleachdaidh ùr ach an lorg iad susbaint inntinneach gu luath</strong>. Mur an do ghabh cleachdaiche conaltradh gu leòr le càch airson molaidhean leantainn gnàthaichte fhaighinn, mholamaid na cunntasan seo ’nan àite. Thèid an àireamhachadh às ùr gach latha stèidhichte air na cunntasan air an robh an conaltradh as trice ’s an luchd-leantainn ionadail as motha sa chànan."
+      description_html: "<strong>Cuidichidh molaidhean leantainn an luchd-cleachdaidh ùr ach an lorg iad susbaint inntinneach gu luath</strong>. Mur an do ghabh cleachdaiche conaltradh gu leòr le càch airson molaidhean leantainn gnàthaichte fhaighinn, mholamaid na cunntasan seo ’nan àite. Thèid an àireamhachadh às ùr gach latha, stèidhichte air na cunntasan air an robh an conaltradh as trice ’s an luchd-leantainn ionadail as motha sa chànan."
       language: Dhan chànan
       status: Staid
       suppress: Mùch na molaidhean leantainn
@@ -452,45 +464,78 @@ gd:
       title: Molaidhean leantainn
       unsuppress: Aisig am moladh leantainn
     instances:
+      availability:
+        description_html:
+          few: Ma dh’fhàilligeas an lìbhrigeadh dhan àrainn fad <strong>%{count} làithean</strong>, chan fheuch sinn a-rithist leis an lìbhrigeadh ach às dèidh lìbhrigeadh fhaighinn <em>on àrainn ud fhèin</em>.
+          one: Ma dh’fhàilligeas an lìbhrigeadh dhan àrainn fad <strong>%{count} latha</strong>, chan fheuch sinn a-rithist leis an lìbhrigeadh ach às dèidh lìbhrigeadh fhaighinn <em>on àrainn ud fhèin</em>.
+          other: Ma dh’fhàilligeas an lìbhrigeadh dhan àrainn fad <strong>%{count} latha</strong>, chan fheuch sinn a-rithist leis an lìbhrigeadh ach às dèidh lìbhrigeadh fhaighinn <em>on àrainn ud fhèin</em>.
+          two: Ma dh’fhàilligeas an lìbhrigeadh dhan àrainn fad <strong>%{count} latha</strong>, chan fheuch sinn a-rithist leis an lìbhrigeadh ach às dèidh lìbhrigeadh fhaighinn <em>on àrainn ud fhèin</em>.
+        failure_threshold_reached: Chaidh stairsneach an fhàilligidh a ruigsinn %{date}.
+        failures_recorded:
+          few: Oidhirp a dh’fhàillig rè %{count} làithean.
+          one: Oidhirp a dh’fhàillig rè %{count} latha.
+          other: Oidhirp a dh’fhàillig rè %{count} latha.
+          two: Oidhirp a dh’fhàillig rè %{count} latha.
+        no_failures_recorded: Cha deach fàilligeadh sam bith a chlàradh.
+        title: Faotainneachd
+        warning: Cha deach leis an oidhirp mu dheireadh air ceangal ris an fhrithealaiche seo
       back_to_all: Na h-uile
       back_to_limited: Cuingichte
       back_to_warning: Rabhadh
       by_domain: Àrainn
+      confirm_purge: A bheil thu cinnteach gu bheil thu airson an dàta on àrainn seo a sguabadh às gu buan?
+      content_policies:
+        comment: Nòta taobh a-staigh
+        description_html: "’S urrainn dhut poileasaidhean susbainte a mhìneachadh a thèid a chur an sàs air a h-uile cunntas on àrainn seo ’s a fo-àrainnean-se."
+        policies:
+          reject_media: Diùlt meadhanan
+          reject_reports: Diùlt gearanan
+          silence: Cuingich
+          suspend: Cuir à rèim
+        policy: Poileasaidh
+        reason: Adhbhar poblach
+        title: Poileasaidhean susbainte
+      dashboard:
+        instance_accounts_dimension: Cunntasan ’gan leantainn as trice
+        instance_accounts_measure: cunntasan ’gan stòradh
+        instance_followers_measure: an luchd-leantainn againne thall
+        instance_follows_measure: an luchd-leantainn acasan an-seo
+        instance_languages_dimension: Brod nan cànan
+        instance_media_attachments_measure: ceanglachain mheadhanan ’gan stòradh
+        instance_reports_measure: gearanan mun dèidhinn
+        instance_statuses_measure: postaichean ’gan stòradh
       delivery:
         all: Na h-uile
         clear: Falamhaich na mearachdan lìbhrigidh
+        failing: A’ fàilligeadh
         restart: Ath-thòisich air an lìbhrigeadh
         stop: Cuir stad air an lìbhrigeadh
-        title: Lìbhrigeadh
         unavailable: Chan eil e ri làimh
-        unavailable_message: Chan eil lìbhrigeadh ri fhaighinn
-        warning: Rabhadh
-        warning_message:
-          few: Dh’fhàillig leis an lìbhrigeadh fad %{count} làithean
-          one: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
-          other: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
-          two: Dh’fhàillig leis an lìbhrigeadh fad %{count} latha
       delivery_available: Tha lìbhrigeadh ri fhaighinn
       delivery_error_days: Làithean le mearachd lìbhrigidh
       delivery_error_hint: Mura gabh a lìbhrigeadh fad %{count} là(ithean), thèid comharra a chur ris gu fèin-obrachail a dh’innseas nach gabh a lìbhrigeadh.
+      destroyed_msg: Tha an dàta o %{domain} air ciutha an sguabaidh às aithghearr.
       empty: Cha deach àrainn a lorg.
       known_accounts:
         few: "%{count} cunntasan as aithne dhuinn"
-        one: "%{count} cunntas as aithne dhuinn"
+        one: "%{count} chunntas as aithne dhuinn"
         other: "%{count} cunntas as aithne dhuinn"
         two: "%{count} chunntas as aithne dhuinn"
       moderation:
         all: Na h-uile
         limited: Cuingichte
         title: Maorsainneachd
-      private_comment: Beachd prìobhaideachd
+      private_comment: Beachd prìobhaideach
       public_comment: Beachd poblach
+      purge: Purgaidich
+      purge_description_html: Ma tha thu dhen bheachd gu bheil an àrainn seo far loidhne gu buan, ’s urrainn dhut a h-uile clàr cunntais ’s an dàta co-cheangailte on àrainn ud a sguabadh às san stòras agad. Dh’fhaoidte gun doir sin greis mhath.
       title: Co-nasgadh
       total_blocked_by_us: "‘Ga bhacadh leinne"
       total_followed_by_them: "’Ga leantainn leotha-san"
       total_followed_by_us: "’Ga leantainn leinne"
       total_reported: Gearanan mun dèidhinn
       total_storage: Ceanglachain mheadhanan
+      totals_time_period_hint_html: Gabhaidh na h-iomlanan gu h-ìosal a-staigh an dàta o chian nan cian.
     invites:
       deactivate_all: Cuir na h-uile à gnìomh
       filter:
@@ -514,14 +559,12 @@ gd:
         title: Cruthaich riaghailt IP ùr
       no_ip_block_selected: Cha deach riaghailt IP sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       title: Riaghailtean IP
-    pending_accounts:
-      title: Cunntasan ri dhèiligeadh (%{count})
     relationships:
       title: Na dàimhean aig %{acct}
     relays:
       add_new: Cuir ath-sheachadan ùr ris
       delete: Sguab às
-      description_html: "’S e frithealaiche eadar-mheadhanach a th’ ann an <strong>ath-sheachadan co-nasgaidh</strong> a nì iomlaid air grunnan mòra de phostaichean poblach eadar na frithealaichean a dh’fho-sgrìobhas ’s a dh’fhoillsicheas dha. <strong>’S urrainn dha cuideachadh a thoirt do dh’fhrithealaichean beaga is meadhanach mòr ach an lorg iad susbaint sa cho-shaoghal</strong> agus às an aonais, bhiodh aig cleachdaichean ionadail leantainn air daoine eile air frithealaichean cèine a làimh."
+      description_html: "’S e frithealaiche eadar-mheadhanach a th’ ann an <strong>ath-sheachadan co-nasgaidh</strong> a nì iomlaid air grunnan mòra de phostaichean poblach eadar na frithealaichean a dh’fho-sgrìobhas ’s a dh’fhoillsicheas dha. <strong>’S urrainn dha cuideachadh a thoirt do dh’fhrithealaichean beaga is meadhanach mòr ach an rùraich iad susbaint sa cho-shaoghal</strong> agus às an aonais, bhiodh aig cleachdaichean ionadail daoine eile a leantainn air frithealaichean cèine a làimh."
       disable: Cuir à comas
       disabled: Chaidh a chur à comas
       enable: Cuir an comas
@@ -544,41 +587,125 @@ gd:
           one: "%{count} nòta"
           other: "%{count} nòta"
           two: "%{count} nòta"
-        reports:
-          few: "%{count} gearanan"
-          one: "%{count} ghearan"
-          other: "%{count} gearan"
-          two: "%{count} ghearan"
+      action_log: Sgrùd an loga
       action_taken_by: Chaidh an gnìomh a ghabhail le
+      actions:
+        delete_description_html: Thèid na postaichean le gearan orra a sguabadh às agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd.
+        mark_as_sensitive_description_html: Thèid comharra an fhrionasachd a chur ris na meadhanan sna postaichean le gearan orra agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd.
+        other_description_html: Seall barrachd roghainnean airson giùlan a’ chunntais a stiùireadh agus an conaltradh leis a’ chunntas a chaidh gearan a dhèanamh mu dhèidhinn a ghnàthachadh.
+        resolve_description_html: Cha dèid gnìomh sam bith a ghabhail an aghaidh a’ chunntais le gearan air agus thèid an gearan a dhùnadh gun rabhadh a chlàradh.
+        silence_description_html: Chan fhaic ach an fheadhainn a tha ’ga leantainn mu thràth no a lorgas a làimh i a’ phròifil seo agus cuingichidh seo uiread nan daoine a ruigeas i gu mòr. Gabhaidh seo a neo-dhèanamh uair sam bith.
+        suspend_description_html: Cha ghabh a’ phròifil seo agus an t-susbaint gu leòr aice inntrigeadh gus an dèid a sguabadh às air deireadh na sgeòil. Cha ghabh eadar-ghabhail a dhèanamh leis a’ chunntas. Gabhaidh seo a neo-dhèanamh am broinn 30 latha.
+      actions_description_html: Socraich dè a nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
+      add_to_report: Cuir barrachd ris a’ ghearan
       are_you_sure: A bheil thu cinnteach?
       assign_to_self: Iomruin dhomh-sa
       assigned: Maor iomruinte
+      by_target_domain: Àrainn cunntas a’ ghearain
+      category: Roinn-seòrsa
+      category_description_html: Thèid iomradh a thoirt air adhbhar a’ ghearain mun chunntas/susbaint seo sa chonaltradh leis a’ chunntas mun a chaidh an gearan a thogail
       comment:
         none: Chan eil gin
+      comment_description_html: 'Airson barrachd fiosrachaidh a sholar, sgrìobh %{name}:'
       created_at: Chaidh an gearan a dhèanamh
+      delete_and_resolve: Sguab às na postaichean
       forwarded: Chaidh a shìneadh air adhart
       forwarded_to: Chaidh a shìneadh air adhart gu %{domain}
       mark_as_resolved: Cuir comharra gun deach fhuasgladh
+      mark_as_sensitive: Cuir comharra gu bheil e frionasach
       mark_as_unresolved: Cuir comharra nach deach fhuasgladh
+      no_one_assigned: Gun iomruineadh
       notes:
         create: Cuir nòta ris
         create_and_resolve: Fuasgail le nòta
         create_and_unresolve: Ath-fhosgail le nòta
         delete: Sguab às
         placeholder: Mìnich dè na ghnìomhan a chaidh a ghabhail no naidheachd sam bith eile mu dhèidhinn…
+        title: Nòtaichean
+      notes_description_html: Seall is sgrìobh nòtaichean do mhaoir eile is dhut fhèin san àm ri teachd
+      quick_actions_description_html: 'Gabh gnìomh luath no sgrolaich sìos a dh’fhaicinn susbaint a’ ghearain:'
+      remote_user_placeholder: cleachdaiche cèin o %{instance}
       reopen: Fosgail an gearan a-rithist
       report: 'Gearan air #%{id}'
       reported_account: Cunntas mun a chaidh a ghearan
       reported_by: Chaidh gearan a dhèanamh le
       resolved: Air fhuasgladh
       resolved_msg: Chaidh an gearan fhuasgladh!
+      skip_to_actions: Geàrr leum dha na gnìomhan
       status: Staid
-      target_domain: Àrainn cunntas a’ ghearain
+      statuses: Susbaint le gearan
+      statuses_description_html: Thèid iomradh a thoirt air an t-susbaint oilbheumach sa chonaltradh leis a’ chunntas mun a chaidh an gearan a thogail
       target_origin: Tùs cunntas a’ ghearain
       title: Gearanan
       unassign: Dì-iomruin
       unresolved: Gun fhuasgladh
       updated_at: Air ùrachadh
+      view_profile: Seall a’ phròifil
+    roles:
+      add_new: Cuir dreuchd ris
+      assigned_users:
+        few: "%{count} cleachdaichean"
+        one: "%{count} chleachdaiche"
+        other: "%{count} cleachdaiche"
+        two: "%{count} chleachdaiche"
+      categories:
+        administration: Rianachd
+        devops: DevOps
+        invites: Cuiridhean
+        moderation: Maorsainneachd
+        special: Sònraichte
+      delete: Sguab às
+      description_html: Le <strong>dreuchdan chleachdaichean</strong>, ’s urrainn dhut gnàthachadh dè na gleusan is raointean de Mhastodon as urrainn dha na cleachdaichean agad inntrigeadh.
+      edit: Deasaich an dreuchd aig “%{name}“
+      everyone: Na ceadan bunaiteach
+      everyone_full_description_html: Seo an <strong>dreuchd bhunaiteach</strong> a bheir buaidh air <strong>gach cleachdaiche</strong>, fiù an fheadhainn nach deach dreuchd iomruineadh dhaibh. Gheibh a h-uile dreuch ceadan uaipe mar dhìleab.
+      permissions_count:
+        few: "%{count} ceadan"
+        one: "%{count} chead"
+        other: "%{count} cead"
+        two: "%{count} chead"
+      privileges:
+        administrator: Rianaire
+        administrator_description: Chan eil cuingeachadh sam bith air na cleachdaichean aig bheil an cead seo
+        delete_user_data: Sguabadh às dàta cleachdaiche
+        delete_user_data_description: Leigidh seo le cleachdaichean dàta chleachdaichean eile a sguabadh às gun dàil
+        invite_users: Thoir cuireadh do chleachdaichean
+        invite_users_description: Leigidh seo le cleachdaichean cuireadh dhan fhrithealaiche a chur gu daoine eile
+        manage_announcements: Stiùireadh nam brathan-fios
+        manage_announcements_description: Leigidh seo le cleachdaichean brathan-fios a stiùireadh air an fhrithealaiche
+        manage_appeals: Stiùireadh ath-thagraidhean
+        manage_appeals_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air ath-thagraidhean an aghaidh gnìomhan mhaor
+        manage_blocks: Stiùireadh nam bacaidhean
+        manage_blocks_description: Leigidh seo le cleachdaichean solaraichean puist-d is seòlaidhean IP a bhacadh
+        manage_custom_emojis: Stiùireadh nan Emojis gnàthaichte
+        manage_custom_emojis_description: Leigidh seo le cleachdaichean Emojis gnàthaichte a stiùireadh air an fhrithealaiche
+        manage_federation: Stiùireadh a’ cho-nasgaidh
+        manage_federation_description: Leigidh seo le cleachdaichean an co-nasgadh le àrainnean eile a bhacadh no a cheadachadh agus stiùireadh dè ghabhas lìbhrigeadh
+        manage_invites: Stiùireadh nan cuiridhean
+        manage_invites_description: Leigidh seo le cleachdaichean ceanglaichean cuiridh a rùrachadh ’s a chur à gnìomh
+        manage_reports: Stiùireadh ghearanan
+        manage_reports_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air gearanan agus gnìomhan maoir a ghabhail ’nan aghaidh
+        manage_roles: Stiùireadh dhreuchdan
+        manage_roles_description: Leigidh seo le cleachdaichean dreuchdan a stiùireadh is iomruineadh do dh’ìochdaran
+        manage_rules: Stiùireadh nan riaghailtean
+        manage_rules_description: Leigidh seo le cleachdaichean riaghailtean an fhrithealaiche atharrachadh
+        manage_settings: Stiùireadh nan roghainnean
+        manage_settings_description: Leigidh seo le cleachdaichean roghainnean na làraich atharrachadh
+        manage_taxonomies: Stiùireadh thacsonamaidhean
+        manage_taxonomies_description: Leigidh seo le cleachdaichean lèirmheas a dhèanamh air an t-susbaint a tha a’ treandadh agus roghainnean nan tagaichean hais ùrachadh
+        manage_user_access: Stiùireadh inntrigeadh chleachdaichean
+        manage_user_access_description: Leigidh seo le cleachdaichean gun cuir iad à comas dearbhadh dà-cheumnach càich, gun atharraich iad an seòladh puist-d aca is gun ath-shuidhich iad am facal-faire aca
+        manage_users: Stiùireadh chleachdaichean
+        manage_users_description: Leigidh seo le cleachdaichean mion-fhiosrachadh càich a shealltainn agus gnìomhan maoir a ghabhail ’nan aghaidh
+        manage_webhooks: Stiùireadh nan webhooks
+        manage_webhooks_description: Leigidh seo le cleachdaichean webhooks a shuidheachadh do thachartasan na rianachd
+        view_audit_log: Coimhead air an loga sgrùdaidh
+        view_audit_log_description: Leigidh seo le cleachdaichean coimhead air eachdraidh gnìomhan na rianachd air an fhrithealaiche
+        view_dashboard: Coimhead air an deas-bhòrd
+        view_dashboard_description: Leigidh seo le cleachdaichean an deas-bhòrd agus meatrachdan inntrigeadh
+        view_devops: DevOps
+        view_devops_description: Leigidh seo le cleachdaichean na deas-bhùird aig Sidekiq is pgHero inntrigeadh
+      title: Dreuchdan
     rules:
       add_new: Cuir riaghailt ris
       delete: Sguab às
@@ -587,142 +714,206 @@ gd:
       empty: Cha deach riaghailtean an fhrithealaiche a mhìneachadh fhathast.
       title: Riaghailtean an fhrithealaiche
     settings:
-      activity_api_enabled:
-        desc_html: Cunntasan nam postaichean a chaidh fhoillseachadh gu h-ionadail, nan cleachdaichean gnìomhach ’s nan clàraidhean ùra an am bucaidean seachdaineil
-        title: Foillsich agragaid dhen stadastaireachd mu ghnìomhachd nan cleachdaichean san API
-      bootstrap_timeline_accounts:
-        desc_html: Sgar iomadh ainm cleachdaiche le cromag. Cuiridh sinn geall gun nochd na cunntasan seo am measg nam molaidhean leantainn
-        title: Mol na cunntasan seo do chleachdaichean ùra
-      contact_information:
-        email: Post-d gnìomhachais
-        username: Ainm cleachdaiche a’ chonaltraidh
-      custom_css:
-        desc_html: Atharraich an coltas le CSS a thèid a luchdadh le gach duilleag
-        title: CSS gnàthaichte
-      default_noindex:
-        desc_html: Bidh buaidh air a h-uile cleachdaiche nach do dh’atharraich an roghainn seo dhaibh fhèin
-        title: Thoir air falbh ro-aonta nan cleachdaichean air inneacsadh le einnseanan-luirg mar a’ bhun-roghainn
+      about:
+        manage_rules: Stiùirich riaghailtean an fhrithealaiche
+        preamble: Solair fiosrachadh domhainn mu sholar, maorsainneachd is maoineachadh an fhrithealaiche seo.
+        rules_hint: Tha roinn sònraichte ann dha na riaghailtean air am bu chòir an luchd-cleachdaidh agad a leantainn.
+        title: Mu dhèidhinn
+      appearance:
+        preamble: Gnàthaich eadar-aghaidh-lìn Mhastodon.
+        title: Coltas
+      branding:
+        preamble: Tha branndadh an fhrithealaiche agad eadar-dhealaichte o fhrithealaichean eile san lìonra. Faodaidh gun nochd am fiosrachadh seo thar iomadh àrainneachd, can eadar-aghaidh-lìn Mhastodon, aplacaidean tùsail, ro-sheallaidhean air ceanglaichean air làraichean-lìn eile agus am broinn aplacaidean theachdaireachdan is mar sin air adhart. Air an adhbhar seo, mholamaid gun cùm thu am fiosrachadh seo soilleir is goirid.
+        title: Branndadh
+      content_retention:
+        preamble: Stiùirich mar a tha susbaint an luchd-cleachdaidh ’ga stòradh ann am Mastodon.
+        title: Glèidheadh na susbaint
+      discovery:
+        follow_recommendations: Molaidhean leantainn
+        preamble: Tha tighinn an uachdar susbainte inntinniche fìor-chudromach airson toiseach-tòiseachaidh an luchd-cleachdaidh ùr nach eil eòlach air duine sam bith air Mastodon, ma dh’fhaoidte. Stiùirich mar a dh’obraicheas gleusan an rannsachaidh air an fhrithealaiche agad.
+        profile_directory: Eòlaire nam pròifil
+        public_timelines: Loidhnichean-ama poblach
+        title: Rùrachadh
+        trends: Treandaichean
       domain_blocks:
         all: Dhan a h-uile duine
         disabled: Na seall idir
-        title: Seall bacaidhean àrainne
         users: Dhan luchd-chleachdaidh a clàraich a-steach gu h-ionadail
-      domain_blocks_rationale:
-        title: Seall an t-adhbhar
-      hero:
-        desc_html: Thèid seo a shealltainn air a’ phrìomh-dhuilleag. Mholamaid 600x100px air a char as lugha. Mura dèid seo a shuidheachadh, thèid dealbhag an fhrithealaiche a shealltainn ’na àite
-        title: Dealbh gaisgich
-      mascot:
-        desc_html: Thèid seo a shealltainn air iomadh duilleag. Mholamaid 293×205px air a char as lugha. Mura dèid seo a shuidheachadh, thèid an suaichnean a shealltainn ’na àite
-        title: Dealbh suaichnein
-      peers_api_enabled:
-        desc_html: Ainmean àrainne air an do thachair am frithealaiche seo sa cho-shaoghal
-        title: Foillsich liosta nam frithealaichean a chaidh a lorg san API
-      preview_sensitive_media:
-        desc_html: Ro-sheallaidh ceanglaichean dealbhag fhiù ’s ma chaidh comharradh gu bheil am meadhan frionasach
-        title: Seall meadhanan frionasach ann an ro-sheallaidhean OpenGraph
-      profile_directory:
-        desc_html: Suidhich gun gabh cleachdaichean a lorg
-        title: Cuir eòlaire nam pròifil an comas
       registrations:
-        closed_message:
-          desc_html: Thèid seo a shealltainn air an duilleag-dhachaigh nuair a bhios an clàradh dùinte. ’S urrainn dhut tagaichean HTML a chleachdadh
-          title: Teachdaireachd a’ chlàraidh dhùinte
-        deletion:
-          desc_html: Leig le neach sa bith an cunntas a sguabadh às
-          title: Fosgail sguabadh às chunntasan
-        min_invite_role:
-          disabled: Na ceadaich idir
-          title: Ceadaich cuiridhean le
-        require_invite_text:
-          desc_html: Nuair a bhios aontachadh a làimh riatanach dhan chlàradh, dèan an raon teacsa “Carson a bu mhiann leat ballrachd fhaighinn?” riatanach seach roghainneil
-          title: Iarr air cleachdaichean ùra gun innis iad carson a tha iad ag iarraidh ballrachd
+        preamble: Stiùirich cò dh’fhaodas cunntas a chruthachadh air an fhrithealaiche agad.
+        title: Clàraidhean
       registrations_mode:
         modes:
           approved: Tha aontachadh riatanach airson clàradh
           none: Chan fhaod neach sam bith clàradh
           open: "’S urrainn do neach sam bith clàradh"
-        title: Modh a’ chlàraidh
-      show_known_fediverse_at_about_page:
-        desc_html: Nuair a bhios seo à comas, cha sheall an loidhne-ama phoblach a thèid a cheangal rithe on duilleag-landaidh ach susbaint ionadail
-        title: Gabh a-staigh susbaint cho-naisgte air duilleag na loidhne-ama poblaich gun ùghdarrachadh
-      show_staff_badge:
-        desc_html: Seall bràist sgioba air duilleag cleachdaiche
-        title: Seall bràist sgioba
-      site_description:
-        desc_html: Earrann tuairisgeil air an API. Mìnich dè tha sònraichte mun fhrithealaiche Mastodon seo agus rud sa bith eile a tha cudromach. ’S urrainn dhut tagaichean HTML a chleachdadh agus <code>&lt;a&gt;</code> ’s <code>&lt;em&gt;</code> gu sònraichte.
-        title: Tuairisgeul an fhrithealaiche
-      site_description_extended:
-        desc_html: Seo deagh àite airson an còd-giùlain, na riaghailtean ’s na comharran-treòrachaidh agad agus do nithean eile a tha sònraichte mun fhrithealaiche agad. ‘S urrainn dhut tagaichean HTML a chleachdadh
-        title: Fiosrachadh leudaichte gnàthaichte
-      site_short_description:
-        desc_html: Nochdaidh seo air a’ bhàr-taoibh agus sna meata-thagaichean. Mìnich dè th’ ann am Mastodon agus dè tha sònraichte mun fhrithealaiche agad ann an aon earrann a-mhàin.
-        title: Tuairisgeul goirid an fhrithealaiche
-      site_terms:
-        desc_html: "’S urrainn dhut am poileasaidh prìobhaideachd no teirmichean na seirbheise agad fhèin no fiosrachadh laghail sa bith eile a sgrìobhadh. ‘S urrainn dhut tagaichean HTML a chleachdadh"
-        title: Teirmichean gnàthaichte na seirbheise
-      site_title: Ainm an fhrithealaiche
-      thumbnail:
-        desc_html: Thèid seo a chleachdadh airson ro-sheallaidhean slighe OpenGraph no API. Mholamaid 1200x630px
-        title: Dealbhag an fhrithealaiche
-      timeline_preview:
-        desc_html: Seall ceangal dhan loidhne-ama phoblach air an duilleag-landaidh is ceadaich inntrigeadh gun ùghdarrachadh leis an API air an loidhne-ama phoblach
-        title: Ceadaich inntrigeadh gun ùghdarrachadh air an loidhne-ama phoblach
-      title: Roghainnean na làraich
-      trendable_by_default:
-        desc_html: Bheir seo buaidh air na tagaichean hais nach deach a dhì-cheadachadh roimhe
-        title: Leig le tagaichean hais treandadh às aonais lèirmheis ro làimh
-      trends:
-        desc_html: Seall tagaichean hais gu poblach a chaidh lèirmheas a dhèanamh orra roimhe ’s a tha a’ treandadh aig a àm seo
-        title: Tagaichean hais a’ treandadh
+      title: Roghainnean an fhrithealaiche
     site_uploads:
       delete: Sguab às am faidhle a chaidh a luchdadh suas
       destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às!
     statuses:
+      account: Ùghdar
+      application: Aplacaid
       back_to_account: Till gu duilleag a’ chunntais
+      back_to_report: Till gu duilleag a’ ghearain
       batch:
-        delete: Sguab às
-        nsfw_off: Cuir comharra nach eil e frionasach
-        nsfw_on: Cuir comharra gu bheil e frionasach
+        remove_from_report: Thoir air falbh on ghearan
+        report: Gearan
       deleted: Chaidh a sguabadh às
-      failed_to_execute: Cha b’ urrainn dhuinn a ruith
+      favourites: Annsachdan
+      history: Eachdraidh nan tionndadh
+      in_reply_to: Air freagairt gu
+      language: Cànan
       media:
         title: Meadhanan
-      no_media: Chan eil meadhanan ann
+      metadata: Meata-dàta
       no_status_selected: Cha deach post sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+      open: Fosgail am post
+      original_status: Am post tùsail
+      reblogs: Brosnachaidhean
+      status_changed: Post air atharrachadh
       title: Postaichean a’ chunntais
+      trending: A’ treandadh
+      visibility: Faicsinneachd
       with_media: Le meadhanan riutha
+    strikes:
+      actions:
+        delete_statuses: Sguab %{name} às na postaichean aig %{target}
+        disable: Reòth %{name} an cunntas aig %{target}
+        mark_statuses_as_sensitive: Chuir %{name} comharra gu bheil na postaichean aig %{target} frionasach
+        none: Chuir %{name} rabhadh gu %{target}
+        sensitive: Chuir %{name} comharra gu bheil an cunntas aig %{target} frionasach
+        silence: Chuingich %{name} an cunntas aig %{target}
+        suspend: Chuir %{name} an cunntas aig %{target} à rèim
+      appeal_approved: Air ath-thagradh
+      appeal_pending: "’Ga ath-thagradh"
     system_checks:
       database_schema_check:
         message_html: Tha imrichean stòir-dhàta ri dhèiligeadh ann. Ruith iad a dhèanamh cinnteach gum bi giùlan na h-aplacaid mar a bhiodhte ’n dùil
+      elasticsearch_running_check:
+        message_html: Cha b’ urrainn dhuinn ceangal ri Elasticsearch. Dearbh thu bheil e a’ ruith no cuir an lorg làn-teacsa à comas
+      elasticsearch_version_check:
+        message_html: 'Tionndadh Elasticsearch nach eil co-chòrdail: %{value}'
+        version_comparison: Tha Elasticsearch %{running_version} a ruith ach tha feum air %{required_version}
       rules_check:
         action: Stiùirich riaghailtean an fhrithealaiche
         message_html: Cha do mhìnich thu riaghailtean an fhrithealaiche fhathast.
       sidekiq_process_check:
         message_html: Chan eil pròiseas Sidekiq sam bith a ruith dhan chiutha/dha na ciuthan %{value}. Thoir sùil air an rèiteachadh Sidekiq agad
     tags:
-      accounts_today: Cleachdaidhean fa leth an-diugh
-      accounts_week: Cleachdaidhean fa leth an t-seachdain seo
-      breakdown: Seall an cleachdadh an-diugh a-rèir tùis
-      last_active: Air a chleachdadh o chionn goirid
-      most_popular: Na tha fèill mhòr air
-      most_recent: Air a chruthachadh o chionn goirid
-      name: Taga hais
       review: Dèan lèirmheas air an staid
-      reviewed: Chaidh lèirmheas a dhèanamh air
-      title: Tagaichean hais
-      trending_right_now: A’ treandadh an-dràsta
-      unique_uses_today: "%{count} a’ postadh an-diugh"
-      unreviewed: Gun lèirmheas
       updated_msg: Chaidh roghainnean nan tagaichean hais ùrachadh
     title: Rianachd
+    trends:
+      allow: Ceadaich
+      approved: Aontaichte
+      disallow: Na ceadaich
+      links:
+        allow: Ceadaich an ceangal
+        allow_provider: Ceadaich am foillsichear
+        description_html: Seo na ceanglaichean a tha ’gan co-roinneadh le iomadh cunntas on a chì am frithealaiche agad na postaichean. Faodaidh iad a bhith ’nan cuideachadh dhan luchd-cleachdaidh ach am faigh iad a-mach dè tha tachairt air an t-saoghal. Cha dèid ceanglaichean a shealltainn gu poblach gus an aontaich thu ris an fhoillsichear. ’S urrainn dhut ceanglaichean àraidh a cheadachadh no a dhiùltadh cuideachd.
+        disallow: Na ceadaich an ceangal
+        disallow_provider: Na ceadaich am foillsichear
+        no_link_selected: Cha deach ceangal sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+        publishers:
+          no_publisher_selected: Cha deach foillsichear sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+        shared_by_over_week:
+          few: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
+          one: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
+          other: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
+          two: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
+        title: Ceanglaichean a’ treandadh
+        usage_comparison: Chaidh a cho-roinneadh %{today} tura(i)s an-diugh an coimeas ri %{yesterday} an-dè
+      only_allowed: An fheadhainn cheadaichte a-mhàin
+      pending_review: A’ feitheamh air lèirmheas
+      preview_card_providers:
+        allowed: Faodaidh ceanglaichean on fhoillsichear seo treandadh
+        description_html: Seo na h-àrainnean on a thèid ceanglaichean a cho-roinneadh air an fhrithealaiche agad gu tric. Cha bhi ceanglaichean a’ treandadh mura dh’aontaich thu ri àrainn a’ cheangail. Gabhaidh d’ aonta (no do dhiùltadh) a-staigh na fo-àrainnean.
+        rejected: Cha treandaich ceanglaichean on fhoillsichear seo
+        title: Foillsichearan
+      rejected: Air a dhiùltadh
+      statuses:
+        allow: Ceadaich am post
+        allow_account: Ceadaich an t-ùghdar
+        description_html: Seo na postaichean air a bheil am frithealaiche agad eòlach ’s a tha ’gan co-roinneadh is ’nan annsachd gu tric aig an àm seo. Faodaidh iad a bhith ’nan cuideachadh dhan luchd-cleachdaidh ùr no a thill ach an lorg iad daoine airson an leantainn. Cha dèid postaichean a shealltainn gu poblach gus an gabh thu ris an ùghdar agus gus an aontaich an t-ùghdar gun dèid an cunntas aca a mholadh do dhaoine eile. ’S urrainn dhut postaichean àraidh a cheadachadh no a dhiùltadh cuideachd.
+        disallow: Na ceadaich am post
+        disallow_account: Na ceadaich an t-ùghdar
+        no_status_selected: Cha deach post a’ treandadh sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+        not_discoverable: Cha do chuir an t-ùghdar roimhe gun gabh a rùrachadh
+        shared_by:
+          few: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} tursan
+          one: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
+          other: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} turas
+          two: Chaidh a cho-roinneadh no ’na annsachd %{friendly_count} thuras
+        title: Postaichean a’ treandadh
+      tags:
+        current_score: Sgòr làithreach de %{score}
+        dashboard:
+          tag_accounts_measure: cleachdaidhean àraidh
+          tag_languages_dimension: Brod nan cànan
+          tag_servers_dimension: Brod nam frithealaichean
+          tag_servers_measure: frithealaichean eadar-dhealaichte
+          tag_uses_measure: cleachdaidhean iomlan
+        description_html: Seo na tagaichean hais a nochdas ann an grunn phostaichean a chì am frithealaiche agad aig an àm seo. Faodaidh iad a bhith ’nan cuideachadh dhan luchd-cleachdaidh agad ach am faigh iad a-mach cò air a tha daoine a’ bruidhinn nas trice aig an àm seo. Cha dèid tagaichean hais a shealltainn gu poblach gus an aontaich thu riutha.
+        listable: Gabhaidh a mholadh
+        no_tag_selected: Cha deach taga sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+        not_listable: Cha dèid a mholadh
+        not_trendable: Cha nochd e am measg nan treandaichean
+        not_usable: Cha ghabh a chleachdadh
+        peaked_on_and_decaying: Air a’ bhàrr %{date}, a’ crìonadh an-dràsta
+        title: Tagaichean hais a’ treandadh
+        trendable: Faodaidh e nochdadh am measg nan treandaichean
+        trending_rank: 'A’ treandadh #%{rank}'
+        usable: Gabhaidh a chleachdadh
+        usage_comparison: Chaidh a chleachdadh %{today} tura(i)s an-diugh an coimeas ri %{yesterday} an-dè
+        used_by_over_week:
+          few: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+          one: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+          other: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+          two: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
+      title: Treandaichean
+      trending: A’ treandadh
     warning_presets:
       add_new: Cuir fear ùr ris
       delete: Sguab às
       edit_preset: Deasaich rabhadh ro-shuidhichte
       empty: Cha do mhìnich thu ro-sheataichean rabhaidhean fhathast.
       title: Stiùirich na rabhaidhean ro-shuidhichte
+    webhooks:
+      add_new: Cuir puing-dheiridh ris
+      delete: Sguab às
+      description_html: Bheir <strong>webhook</strong> comas do Mhastodon gus <strong>brathan fìor-ama</strong> a phutadh dhan aplacaid agad fhèin mu na tachartasan a thagh thu ach an adhbharaich an aplacaid agad <strong>freagairtean gu fèin-obrachail</strong>.
+      disable: Cuir à comas
+      disabled: À comas
+      edit: Deasaich a’ phuing-dheiridh
+      empty: Cha deach puing-deiridh webhook sam bith a rèiteachadh fhathast.
+      enable: Cuir an comas
+      enabled: Gnìomhach
+      enabled_events:
+        few: Tha %{count} tachartasan an comas
+        one: Tha %{count} tachartas an comas
+        other: Tha %{count} tachartas an comas
+        two: Tha %{count} thachartas an comas
+      events: Tachartasan
+      new: Webhook ùr
+      rotate_secret: Cuairtich an rùn
+      secret: Rùn soidhnich
+      status: Staid
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: sguabadh às nam postaichean aca
+        disable: reòthadh a’ chunntais aca
+        mark_statuses_as_sensitive: comharra gu bheil na postaichean aca frionasach
+        none: rabhadh
+        sensitive: comharra gu bheil an cunntas aca frionasach
+        silence: cuingeachadh a’ chunntais aca
+        suspend: cur à rèim a’ chunntais aca
+      body: 'Tha %{target} ag ath-thagradh co-dhùnadh na maorsainneachd a thug %{action_taken_by} %{date} agus ’s e %{type} a bh’ ann. Sgrìobh iad:'
+      next_steps: "’S urrainn dhut aontachadh ris an ath-thagradh air co-dhùnadh na maorsainneachd no a leigeil seachad."
+      subject: Tha %{username} ag ath-thagradh co-dhùnadh na maorsainneachd air %{instance}
     new_pending_account:
       body: Chì thu mion-fhiosrachadh a’ chunntais ùir gu h-ìosal. ’S urrainn dhut gabhail ris an iarrtas seo no a dhiùltadh.
       subject: Tha cunntas ùr air %{instance} a’ feitheamh air lèirmheas (%{username})
@@ -730,9 +921,17 @@ gd:
       body: Rinn %{reporter} gearan air %{target}
       body_remote: Rinn cuideigin o %{domain} gearan air %{target}
       subject: Tha gearan ùr aig %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Tha an taga hais #%{name} a’ treandadh an-diugh ach cha deach lèirmheas a dhèanamh air cheana. Cha nochd e gu poblach ach ma cheadaicheas tu e. Ma shàbhaileas tu am foirm seo mar a tha e, cha bhodraig e a-rithist thu.'
-      subject: Tha taga hais ùr air %{instance} a’ feitheamh air lèirmheas (#%{name})
+    new_trends:
+      body: 'Tha na nithean seo feumach air lèirmheas mus nochd iad gu poblach:'
+      new_trending_links:
+        title: Ceanglaichean a’ treandadh
+      new_trending_statuses:
+        title: Postaichean a’ treandadh
+      new_trending_tags:
+        no_approved_tags: Chan eil taga hais a’ treandadh le aontachadh ann.
+        requirements: "’S urrainn do ghin dhe na tagraichean seo dol thairis air #%{rank} a tha aig an taga hais #%{lowest_tag_name} a’ treandadh as ìsle le aontachadh agus sgòr de %{lowest_tag_score} air."
+        title: Tagaichean hais a’ treandadh
+      subject: Tha treandaichean ùra a’ feitheamh air lèirmheas air %{instance}
   aliases:
     add_new: Cruthaich alias
     created_msg: Chaidh an t-alias ùr a chruthachadh. ’S urrainn dhut tòiseachadh air imrich on seann-chunntas a-nis.
@@ -742,10 +941,10 @@ gd:
     remove: Dì-cheangail an t-alias
   appearance:
     advanced_web_interface: Eadar-aghaidh-lìn adhartach
-    advanced_web_interface_hint: 'Ma tha thu airson leud gu lèir na sgrìn agad a chleachdadh, leigidh an eadar-aghaidh-lìn adhartach leat gun rèitich thu mòran cholbhan eadar-dhealaichte ach am faic thu na thogras tu de dh’fhiosrachadh aig an aon àm: Dachaigh, brathan, loidhne-ama cho-naisgte, na thogras tu de liostaichean is tagaichean hais.'
+    advanced_web_interface_hint: 'Ma tha thu airson leud na sgrìn agad gu lèir a chleachdadh, leigidh an eadar-aghaidh-lìn adhartach leat mòran cholbhan eadar-dhealaichte a cho-rèiteachadh airson uiread de dh''fhiosrachadh ''s a thogras tu fhaicinn aig an aon àm: Dachaigh, brathan, loidhne-ama cho-naisgte, liostaichean is tagaichean hais a rèir do thoil.'
     animations_and_accessibility: Beòthachaidhean agus so-ruigsinneachd
     confirmation_dialogs: Còmhraidhean dearbhaidh
-    discovery: Lorg
+    discovery: Rùrachadh
     localization:
       body: Tha Mastodon ’ga eadar-theangachadh le saor-thoilich.
       guide_link: https://crowdin.com/project/mastodon
@@ -756,39 +955,38 @@ gd:
     notification_preferences: Atharraich roghainnean a’ phuist-d
     salutation: "%{name},"
     settings: 'Atharraich roghainnean a’ phuist-d: %{link}'
-    view: 'Seall:'
+    view: 'Faic:'
     view_profile: Seall a’ phròifil
     view_status: Seall am post
   applications:
     created: Chaidh an t-iarrtas a chruthachadh
     destroyed: Chaidh an t-iarrtas a sguabadh às
-    invalid_url: Tha an t-URL a thugadh seachad mì-dhligheach
     regenerate_token: Ath-ghin an tòcan inntrigidh
     token_regenerated: Chaidh an tòcan inntrigidh ath-ghintinn
     warning: Bi glè chùramach leis an dàta seo. Na co-roinn le duine sam bith e!
     your_token: An tòcan inntrigidh agad
   auth:
-    apply_for_account: Iarr cuireadh
+    apply_for_account: Iarr cunntas
     change_password: Facal-faire
-    checkbox_agreement_html: Gabhaidh mi ri <a href="%{rules_path}" target="_blank">riaghailtean an fhrithealaiche</a> ’s <a href="%{terms_path}" target="_blank">teirmichean a’ chleachdaidh</a>
-    checkbox_agreement_without_rules_html: Gabhaidh mi ri <a href="%{terms_path}" target="_blank">teirmichean a’ chleachdaidh</a>
     delete_account: Sguab às an cunntas
     delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, <a href="%{path}">nì thu an-seo e</a>. Thèid dearbhadh iarraidh ort.
     description:
       prefix_invited_by_user: Thug @%{name} cuireadh dhut ach am faigh thu ballrachd air an fhrithealaiche seo de Mhastodon!
       prefix_sign_up: Clàraich le Mastodon an-diugh!
-      suffix: Le cunntas, ’s urrainn dhut leantainn air daoine, naidheachdan a phostadh agus conaltradh leis an luchd-chleachdaidh air frithealaiche Mastodon sam bith is a bharrachd!
+      suffix: Le cunntas, ’s urrainn dhut daoine a leantainn, naidheachdan a phostadh agus conaltradh leis an luchd-chleachdaidh air frithealaiche Mastodon sam bith is a bharrachd!
     didnt_get_confirmation: Nach d’fhuair thu an stiùireadh mun dearbhadh?
     dont_have_your_security_key: Nach eil iuchair tèarainteachd agad?
     forgot_password: Na dhìochuimhnich thu am facal-faire agad?
     invalid_reset_password_token: Tha tòcan ath-shuidheachadh an fhacail-fhaire mì-dhligheach no dh’fhalbh an ùine air. Feuch an iarr thu fear ùr.
     link_to_otp: Cuir a-steach còd dà-cheumnach no còd aisig on fhòn agad
     link_to_webauth: Cleachd uidheam na h-iuchrach tèarainteachd agad
+    log_in_with: Clàraich a-steach le
     login: Clàraich a-steach
     logout: Clàraich a-mach
     migrate_account: Imrich gu cunntas eile
     migrate_account_html: Nam bu mhiann leat an cunntas seo ath-stiùireadh gu fear eile, ’s urrainn dhut <a href="%{path}">a rèiteachadh an-seo</a>.
     or_log_in_with: No clàraich a-steach le
+    privacy_policy_agreement_html: Leugh mi is tha mi ag aontachadh ris a’ <a href="%{privacy_policy_path}" target="_blank">phoileasaidh prìobhaideachd</a>
     providers:
       cas: CAS
       saml: SAML
@@ -796,33 +994,39 @@ gd:
     registration_closed: Cha ghabh %{instance} ri buill ùra
     resend_confirmation: Cuir an stiùireadh mun dearbhadh a-rithist
     reset_password: Ath-shuidhich am facal-faire
+    rules:
+      preamble: Tha iad ’gan stèidheachadh is a chur an gnìomh leis na maoir aig %{domain}.
+      title: Riaghailtean bunasach.
     security: Tèarainteachd
     set_new_password: Suidhich facal-faire ùr
     setup:
       email_below_hint_html: Mur eil am post-d gu h-ìosal mar bu chòir, ’s urrainn dhut atharrachadh an-seo agus gheibh thu post-d dearbhaidh ùr.
       email_settings_hint_html: Chaidh am post-d dearbhaidh a chur gu %{email}. Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
       title: Suidheachadh
+    sign_up:
+      preamble: Le cunntas air an fhrithealaiche Mastodon seo, ’s urrainn dhut neach sam bith a leantainn air an lìonra, ge b’ e càit a bheil an cunntas aca-san ’ga òstadh.
+      title: Suidhicheamaid %{domain} dhut.
     status:
       account_status: Staid a’ chunntais
       confirming: A’ feitheamh air coileanadh an dearbhaidh on phost-d.
       functional: Tha an cunntas agad ag obair gu slàn.
       pending: Feumaidh an sgioba againn lèirmheas a dhèanamh air d’ iarrtas. Dh’fhaoidte gun doir seo greis. Gheibh thu post-d nuair a bhios sinn air aontachadh ri d’ iarrtas.
       redirecting_to: Chan eil an cunntas gad gnìomhach on a tha e ’ga ath-stiùireadh gu %{acct}.
+      view_strikes: Seall na rabhaidhean a fhuair an cunntas agad roimhe
     too_fast: Chaidh am foirm a chur a-null ro luath, feuch ris a-rithist.
-    trouble_logging_in: A bheil duilgheadas agad leis a’ chlàradh a-steach?
     use_security_key: Cleachd iuchair tèarainteachd
   authorize_follow:
-    already_following: Tha thu a’ leantainn air a’ chunntas seo mu thràth
+    already_following: Tha thu a’ leantainn a’ chunntais seo mu thràth
     already_requested: Chuir thu iarrtas leantainn dhan chunntas seo mu thràth
     error: Gu mì-fhortanach, thachair mearachd le lorg a’ chunntais chèin
-    follow: Lean air
+    follow: Lean
     follow_request: 'Chuir thu iarrtas leantainn gu:'
-    following: 'Taghta! Chaidh leat a’ leantainn air:'
+    following: 'Taghta! Chaidh leat a’ leantainn:'
     post_follow:
       close: Air neo dùin an uinneag seo.
       return: Seall pròifil a’ chleachdaiche
-      web: Tadhail air an lìon
-    title: Lean air %{acct}
+      web: Tadhail air an duilleag-lìn
+    title: Lean %{acct}
   challenge:
     confirm: Lean air adhart
     hint_html: "<strong>Gliocas:</strong> Chan iarr sinn am facal-faire agad ort a-rithist fad uair a thìde."
@@ -867,10 +1071,36 @@ gd:
       more_details_html: Airson barrachd fiosrachaidh faic am <a href="%{terms_path}">poileasaidh prìobhaideachd</a>.
       username_available: Bidh an t-ainm-cleachdaiche agad ri fhaighinn a-rithist
       username_unavailable: Cha bhi an t-ainm-cleachdaiche agad ri fhaighinn fhathast
-  directories:
-    directory: Eòlaire nam pròifil
-    explanation: Lorg cleachdaichean stèidhichte air an ùidhean
-    explore_mastodon: Rùraich %{title}
+  disputes:
+    strikes:
+      action_taken: An gnìomh a ghabhadh
+      appeal: Ath-thagair
+      appeal_approved: Chaidh le ath-thagradh an rabhaidh is chan eil e dligheach tuilleadh
+      appeal_rejected: Chaidh an t-ath-thagradh a dhiùltadh
+      appeal_submitted_at: Chaidh an t-ath-thagradh a chur a-null
+      appealed_msg: Chaidh an t-ath-thagradh agad a chur a-null. Ma thèid aontachadh ris, gheibh thu brath mu dhèidhinn.
+      appeals:
+        submit: Cuir a-null an t-ath-thagradh
+      approve_appeal: Zatwierdź odwołanie
+      associated_report: An gearan co-cheangailte
+      created_at: Ceann-là
+      description_html: Seo na gnìomhan a chaidh a ghabhail an aghaidh a’ chunntais agad agus na rabhaidhean a chaidh a chur thugad le luchd-obrach %{instance}.
+      recipient: Faightear
+      reject_appeal: Diùlt an t-ath-thagradh
+      status: 'Post #%{id}'
+      status_removed: Chaidh am post a thoirt air falbh on t-siostam mu thràth
+      title: "%{action} o %{date}"
+      title_actions:
+        delete_statuses: Toirt air falbh puist
+        disable: Reòthadh cunntais
+        mark_statuses_as_sensitive: Comharra na frionasachd air postaichean
+        none: Rabhadh
+        sensitive: Comharra na frionasachd air cunntais
+        silence: Cuingeachadh cunntais
+        suspend: Cur à rèim cunntais
+      your_appeal_approved: Chaidh aontachadh ris an ath-thagradh agad
+      your_appeal_pending: Chuir thu ath-thagradh a-null
+      your_appeal_rejected: Chaidh an t-ath-thagradh agad a dhiùltadh
   domain_validator:
     invalid_domain: "– chan eil seo ’na ainm àrainne dligheach"
   errors:
@@ -919,29 +1149,73 @@ gd:
       public: Loidhnichean-ama poblach
       thread: Còmhraidhean
     edit:
+      add_keyword: Cuir facal-luirg ris
+      keywords: Faclan-luirg
+      statuses: Postaichean fa leth
+      statuses_hint_html: Bidh a’ chriathrag seo an sàs air taghadh de phostaichean fa leth ge b’ e am freagair iad ris na faclan-luirg gu h-ìosal gus nach freagair. <a href="%{path}">Dèan lèirmheas air na postaichean no thoir iad air falbh on chriathrag seo</a>.
       title: Deasaich a’ chriathrag
     errors:
+      deprecated_api_multiple_keywords: Cha ghabh na paramadairean seo atharrachadh on aplacaid seo on a bhios iad an sàs air iomadh facal-luirg na criathraige. Cleachd aplacaid nas ùire no an eadar-aghaidh-lìn.
       invalid_context: Cha deach co-theacs a sholar no tha e mì-dhligheach
-      invalid_irreversible: Chan obraich criathradh buan ach ann an co-theacsa na dachaigh no na brathan
     index:
+      contexts: Criathradh am broinn %{contexts}
       delete: Sguab às
       empty: Chan eil criathrag agad.
+      expires_in: Falbhaidh an ùine air an ceann %{distance}
+      expires_on: Falbhaidh an ùine air %{date}
+      keywords:
+        few: "%{count} faclan-luirg"
+        one: "%{count} fhacal-luirg"
+        other: "%{count} facal-luirg"
+        two: "%{count} fhacal-luirg"
+      statuses:
+        few: "%{count} postaichean"
+        one: "%{count} phost"
+        other: "%{count} post"
+        two: "%{count} phost"
+      statuses_long:
+        few: Chaidh %{count} postaichean fa leth fhalach
+        one: Chaidh %{count} phost fa leth fhalach
+        other: Chaidh %{count} post fa leth fhalach
+        two: Chaidh %{count} phost fa leth fhalach
       title: Criathragan
     new:
+      save: Sàbhail a’ chriathrag ùr
       title: Cuir criathrag ùr ris
+    statuses:
+      back_to_filter: Air ais dhan chriathrag
+      batch:
+        remove: Thoir air falbh on chriathrag
+      index:
+        hint: Bidh a’ chriathrag seo an sàs air postaichean fa leth ge b’ e dè na roghainnean eile. ’S urrainn dhut barrachd phostaichean a chur ris a’ chriathrag seo leis an eadar-aghaidh-lìn.
+        title: Postaichean criathraichte
   footer:
-    developers: Luchd-leasachaidh
-    more: Barrachd…
-    resources: Goireasan
     trending_now: A’ treandadh an-dràsta
   generic:
     all: Na h-uile
+    all_items_on_page_selected_html:
+      few: Chaidh na <strong>%{count}</strong> nithean uile a thaghadh air an duilleag seo.
+      one: Chaidh <strong>%{count}</strong> nì a thaghadh air an duilleag seo.
+      other: Chaidh an <strong>%{count}</strong> nì uile a thaghadh air an duilleag seo.
+      two: Chaidh an <strong>%{count}</strong> nì uile a thaghadh air an duilleag seo.
+    all_matching_items_selected_html:
+      few: Chaidh <strong>%{count}</strong> nithean a thaghadh a fhreagras dha na lorg thu.
+      one: Chaidh <strong>%{count}</strong> nì a thaghadh a fhreagras dha na lorg thu.
+      other: Chaidh <strong>%{count}</strong> nì a thaghadh a fhreagras dha na lorg thu.
+      two: Chaidh <strong>%{count}</strong> nì a thaghadh a fhreagras dha na lorg thu.
     changes_saved_msg: Chaidh na h-atharraichean a shàbhaladh!
     copy: Dèan lethbhreac
     delete: Sguab às
-    no_batch_actions_available: Chan eil gnìomh grunna ri fhaighinn air an duilleag seo
+    deselect: Dì-thagh na h-uile
+    none: Chan eil gin
     order_by: Seòrsaich a-rèir
     save_changes: Sàbhail na h-atharraichean
+    select_all_matching_items:
+      few: Tagh na %{count} nithean uile a fhreagras dha na lorg thu.
+      one: Tagh %{count} nì a fhreagras dha na lorg thu.
+      other: Tagh an %{count} nì uile a fhreagras dha na lorg thu.
+      two: Tagh an %{count} nì uile a fhreagras dha na lorg thu.
+    today: an-diugh
     validation_errors:
       few: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air na %{count} mhearachdan gu h-ìosal
       one: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air an %{count} mhearachd gu h-ìosal
@@ -949,44 +1223,24 @@ gd:
       two: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air an %{count} mhearachd gu h-ìosal
   html_validator:
     invalid_markup: 'tha HTML markup mì-dhligheach ann: %{error}'
-  identity_proofs:
-    active: Gnìomhach
-    authorize: Tha, ùghdarraich
-    authorize_connection_prompt: A bheil thu airson an ceangal crioptaichte seo ùghdarrachadh?
-    errors:
-      failed: Dh’fhàillig leis a’ cheangal chrioptaichte. Feuch ris a-rithist o %{provider}.
-      keybase:
-        invalid_token: "’S e haisichean de shoidhnidhean a th’ anns na tòcanan Keybase agus feumaidh 66 caractar sia-dheicheach a bhith annta"
-        verification_failed: Chan aithnich Keybase an tòcan seo ’na shoidhneadh aig cleachdaiche Keybase %{kb_username}. Feuch ris a-rithist o Keybase.
-      wrong_user: Chan urrainn dhuinn dearbhadh air %{proving} a chruthachadh fhad ’s a bhios tu clàraichte a-steach mar %{current}. Clàraich a-steach mar %{proving} is feuch ris a-rithist.
-    explanation_html: "’S urrainn dhut na dearbh-aithnean eile agad a cheangal le crioptachadh o ùrlaran eile, can Keybase. Leigidh seo le càch teachdaireachdan crioptaichte a chur thugad air na h-ùrlaran sin agus bheir seo comas dhaibh gun cuir iad earbsa san t-susbaint a chuireas tu thuca ’s iad cinnteach gur ann uat-sa fhèin a thàinig i."
-    i_am_html: Is mise %{username} air %{service}.
-    identity: Dearbh-aithne
-    inactive: Neo-ghnìomhach
-    publicize_checkbox: "’S postaich seo mar dhùd:"
-    publicize_toot: 'Chaidh a dhearbhadh! Is mise %{username} air %{service}: %{url}'
-    remove: Thoir an dearbhadh air falbh on chunntas
-    removed: Chaidh an dearbhadh a thoirt air falbh on chunntas
-    status: Staid an dearbhaidh
-    view_proof: Seall an dearbhadh
   imports:
     errors:
+      invalid_csv_file: 'Faidhle CSV mì-dhligheach. Mearachd: %{error}'
       over_rows_processing_limit: tha còrr is %{count} ràgh(an) ann
     modes:
       merge: Co-aonaich
       merge_long: Cùm na reacordan a tha ann is cuir feadhainn ùr ris
       overwrite: Sgrìobh thairis air
       overwrite_long: Cuir na reacordan ùra an àite na feadhna a tha ann
-    preface: "’S urrainn dhut dàta ion-phortadh a dh’às-phortaich thu o fhrithealaiche eile, can liosta nan daoine air a leanas tu no a tha thu a’ bacadh."
+    preface: "’S urrainn dhut dàta ion-phortadh a dh’às-phortaich thu o fhrithealaiche eile, can liosta nan daoine a leanas tu no a tha thu a’ bacadh."
     success: Chaidh an dàta agad a luchdadh suas is thèid a phròiseasadh a-nis
     types:
       blocking: Liosta-bhacaidh
       bookmarks: Comharran-lìn
       domain_blocking: Liosta-bhacaidh àrainnean
-      following: Liosta dhen fheadhainn air a leanas tu
+      following: Liosta dhen fheadhainn a leanas tu
       muting: Liosta a’ mhùchaidh
     upload: Luchdaich suas
-  in_memoriam_html: Mar chuimhneachan.
   invites:
     delete: Cuir à gnìomh
     expired: Dh’fhalbh an ùine air
@@ -1067,33 +1321,25 @@ gd:
     carry_blocks_over_text: Chaidh an cleachdaiche seo imrich o %{acct} a b’ àbhaist dhut a bhacadh.
     carry_mutes_over_text: Chaidh an cleachdaiche seo imrich o %{acct} a b’ àbhaist dhut a mhùchadh.
     copy_account_note_text: 'Da cleachdaiche air gluasad o %{acct}, seo na nòtaichean a bh’ agad mu dhèidhinn roimhe:'
+  navigation:
+    toggle_menu: Toglaich an clàr-taice
   notification_mailer:
-    digest:
-      action: Seall a h-uile brath
-      body: Seo geàrr-chunntas air na h-atharraichean nach fhaca thu on tadhal mu dheireadh agad %{since}
-      mention: 'Thug %{name} iomradh ort an-seo:'
-      new_followers_summary:
-        few: Cuideachd, bhuannaich thu %{count} luchd-leantainn ùr on àm a bha thu air falbh! Nach ma sin!
-        one: Cuideachd, bhuannaich thu %{count} neach-leantainn ùr on àm a bha thu air falbh! Nach ma sin!
-        other: Cuideachd, bhuannaich thu %{count} luchd-leantainn ùr on àm a bha thu air falbh! Nach ma sin!
-        two: Cuideachd, bhuannaich thu %{count} neach-leantainn ùr on àm a bha thu air falbh! Nach ma sin!
-      subject:
-        few: "%{count} brathan ùra on tadhal mu dheireadh agad \U0001F418"
-        one: "%{count} bhrath ùr on tadhal mu dheireadh agad \U0001F418"
-        other: "%{count} brath ùr on tadhal mu dheireadh agad \U0001F418"
-        two: "%{count} bhrath ùr on tadhal mu dheireadh agad \U0001F418"
-      title: Fhad ’s a bha thu air falbh…
+    admin:
+      report:
+        subject: Rinn %{name} gearan
+      sign_up:
+        subject: Chlàraich %{name}
     favourite:
       body: 'Is annsa le %{name} am post agad:'
       subject: Is annsa le %{name} am post agad
       title: Annsachd ùr
     follow:
-      body: Tha %{name} a’ leantainn ort a-nis!
-      subject: Tha %{name} a’ leantainn ort a-nis
+      body: Tha %{name} ’gad leantainn a-nis!
+      subject: Tha %{name} ’gad leantainn a-nis
       title: Neach-leantainn ùr
     follow_request:
       action: Stiùirich na h-iarrtasan leantainn
-      body: Dh’iarr %{name} leantainn ort
+      body: Dh’iarr %{name} leantainn
       subject: 'Neach-leantainn ri dhèiligeadh: %{name}'
       title: Iarrtas leantainn ùr
     mention:
@@ -1109,6 +1355,8 @@ gd:
       title: Brosnachadh ùr
     status:
       subject: Tha %{name} air post a sgrìobhadh
+    update:
+      subject: Dheasaich %{name} post
   notifications:
     email_events: Tachartasan nam brathan puist-d
     email_events_hint: 'Tagh na tachartasan dhan a bheil thu airson brathan fhaighinn:'
@@ -1140,7 +1388,7 @@ gd:
   polls:
     errors:
       already_voted: Chuir thu bhòt sa chunntas-bheachd seo mu thràth
-      duplicate_options: " – tha nithean dùblaichte ann"
+      duplicate_options: "– tha nithean dùblaichte ann"
       duration_too_long: "– tha seo ro fhad air falbh san àm ri teachd"
       duration_too_short: "– tha seo ro aithghearr"
       expired: Tha an cunntas-bheachd air a thighinn gu crìoch
@@ -1152,6 +1400,8 @@ gd:
     other: Eile
     posting_defaults: Bun-roghainnean a’ phostaidh
     public_timelines: Loidhnichean-ama poblach
+  privacy_policy:
+    title: Poileasaidh prìobhaideachd
   reactions:
     errors:
       limit_reached: Ràinig thu crìoch nam freagairtean eadar-dhealaichte
@@ -1159,7 +1409,7 @@ gd:
   relationships:
     activity: Gnìomhachd a’ chunntais
     dormant: Na thàmh
-    follow_selected_followers: Lean air an luchd-leantainn a thagh thu
+    follow_selected_followers: Lean an luchd-leantainn a thagh thu
     followers: Luchd-leantainn
     following: A’ leantainn
     invited: Air cuireadh fhaighinn
@@ -1171,25 +1421,18 @@ gd:
     relationship: Dàimh
     remove_selected_domains: Thoir air falbh a h-uile neach-leantainn o na h-àrainnean a thagh thu
     remove_selected_followers: Thoir air falbh a h-uile neach-leantainn a thagh thu
-    remove_selected_follows: Na lean air na cleachdaichean a thagh thu tuilleadh
+    remove_selected_follows: Na lean na cleachdaichean a thagh thu tuilleadh
     status: Staid a’ chunntais
   remote_follow:
-    acct: Cuir a-steach ainm-cleachdaiche@àrainn airson a chur ort
     missing_resource: Cha do lorg sinn URL ath-stiùiridh riatanach a’ chunntais agad
-    no_account_html: Nach eil cunntas agad? ’S urrainn dhut <a href='%{sign_up_path}' target='_blank'>clàradh leinn an-seo</a>
-    proceed: Lean air adhart gus leantainn air
-    prompt: 'Bidh thu a’ leantainn air:'
-    reason_html: "<strong>Carson a tha feum air a’ cheum seo?</strong> Dh’fhaoidte nach e <code>%{instance}</code> am frithealaiche far an do rinn thu clàradh agus feumaidh sinn d’ ath-stiùireadh dhan fhrithealaiche dachaigh agad an toiseach."
-  remote_interaction:
-    favourite:
-      proceed: Lean air adhart gus a chur ris na h-annsachdan
-      prompt: 'Tha thu airson am post seo a chur ris na h-annsachdan:'
-    reblog:
-      proceed: Lean air adhart gus a bhrosnachadh
-      prompt: 'Tha thu airson am post seo a bhrosnachadh:'
-    reply:
-      proceed: Lean air adhart gus freagairt
-      prompt: 'Tha thu airson freagairt dhan phost seo:'
+  reports:
+    errors:
+      invalid_rules: gun iomradh air riaghailtean dligheach
+  rss:
+    content_warning: 'Rabhadh susbainte:'
+    descriptions:
+      account: Postaichean poblach o @%{acct}
+      tag: 'Postaichean poblach le taga #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte an-diugh
     over_total_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte
@@ -1199,7 +1442,7 @@ gd:
     browser: Brabhsair
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1213,7 +1456,7 @@ gd:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: An seisean làithreach
     description: "%{browser} air %{platform}"
@@ -1222,7 +1465,7 @@ gd:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1248,7 +1491,6 @@ gd:
     edit_profile: Deasaich a’ phròifil
     export: Às-phortadh dàta
     featured_tags: Tagaichean hais brosnaichte
-    identity_proofs: Dearbhaidhean na dearbh-aithne
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
@@ -1257,6 +1499,7 @@ gd:
     profile: Pròifil
     relationships: Dàimhean leantainn
     statuses_cleanup: Sguabadh às fèin-obrachail phostaichean
+    strikes: Rabhaidhean na maorsainneachd
     two_factor_authentication: Dearbhadh dà-cheumnach
     webauthn_authentication: Iuchraichean tèarainteachd
   statuses:
@@ -1279,20 +1522,21 @@ gd:
         two: "%{count} video"
     boosted_from_html: Brosnachadh o %{acct_link}
     content_warning: 'Rabhadh susbainte: %{warning}'
+    default_language: Co-ionnan ri cànan na h-eadar-aghaidh
     disallowed_hashtags:
       few: "– bha na tagaichean hais toirmisgte seo ann: %{tags}"
       one: "– bha na tagaichean hais toirmisgte seo ann: %{tags}"
       other: "– bha na tagaichean hais toirmisgte seo ann: %{tags}"
       two: "– bha na tagaichean hais toirmisgte seo ann: %{tags}"
+    edited_at_html: Air a dheasachadh %{date}
     errors:
       in_reply_not_found: Tha coltas nach eil am post dhan a tha thu airson freagairt ann.
-    language_detection: Mothaich dhan chànan gu fèin-obrachail
     open_in_web: Fosgail air an lìon
     over_character_limit: chaidh thu thar crìoch charactaran de %{max}
     pin_errors:
+      direct: Chan urrainn dhut post a phrìneachadh nach fhaic ach na cleachdaichean le iomradh orra
       limit: Tha an àireamh as motha de phostaichean prìnichte agad a tha ceadaichte
       ownership: Chan urrainn dhut post càich a phrìneachadh
-      private: Chan urrainn dhut post neo-phoblach a phrìneachadh
       reblog: Chan urrainn dhut brosnachadh a phrìneachadh
     poll:
       total_people:
@@ -1315,7 +1559,7 @@ gd:
     visibilities:
       direct: Dìreach
       private: Luchd-leantainn a-mhàin
-      private_long: Na seall dhan luchd-leantainn
+      private_long: Na seall ach dhan luchd-leantainn
       public: Poblach
       public_long: Chì a h-uile duine seo
       unlisted: Falaichte o liostaichean
@@ -1347,22 +1591,23 @@ gd:
       '2629746': Mìos
       '31556952': Bliadhna
       '5259492': 2 mhìos
+      '604800': Seachdain
       '63113904': 2 bhliadhna
       '7889238': 3 mìosan
     min_age_label: Stairsneach aoise
-    min_favs: Cùm na tha ’na annsachd aig còrr is
-    min_favs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’nan annsachd aig barrachd daoine na an t-uiread seo. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud neach a chur ris na h-annsachdan iad
-    min_reblogs: Cùm na tha ’ga bhrosnachadh le còrr is
-    min_reblogs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’gam brosnachadh le barrachd daoine na an t-uiread seo. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud neach a tha ’gam brosnachadh
+    min_favs: Cùm na tha ’na annsachd aig co-dhiù
+    min_favs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’nan annsachd an àireamh de thursan seo air a char as lugha. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud turas a tha iad ’nan annsachd
+    min_reblogs: Cùm na tha ’ga bhrosnachadh le co-dhiù
+    min_reblogs_hint: Cha dèid gin dhe na postaichean agad a sguabadh às a tha ’gam brosnachadh an àireamh de thursan seo air a char as lugha. Fàg seo bàn airson postaichean a sguabadh às ge b’ e co mheud turas a tha iad ’gam brosnachadh
   stream_entries:
     pinned: Post prìnichte
     reblogged: "’ga bhrosnachadh"
     sensitive_content: Susbaint fhrionasach
+  strikes:
+    errors:
+      too_late: Tha e ro anmoch airson an rabhadh seo ath-thagradh
   tags:
     does_not_match_previous_name: "– chan eil seo a-rèir an ainm roimhe"
-  terms:
-    body_html: '<h2>Poileasaidh prìobhaideachd</h2> <h3 id="collect">Dè am fiosrachadh a chruinnicheas sinn?</h3> <ul> <li><em>Fiosrachadh bunasach a’ cunntais</em>: Ma chlàraicheas tu leis an fhrithealaiche seo, dh’fhaoidte gun dèid iarraidh ort gun cuir thu a-steach ainm-cleachdaiche, seòladh puist-d agus facal-faire. Faodaidh tu barrachd fiosrachaidh a chur ris a’ phròifil agad ma thogras tu, can ainm-taisbeanaidh agus teacsa mu do dhèidhinn agus dealbhan pròifile ’s banna-chinn a luchdadh suas. Thèid an t-ainm-cleachdaiche, an t-ainm-taisbeanaidh, an teacsa mu do dhèidhinn agus dealbhan na pròifile ’s a bhanna-chinn a shealltainn gu poblach an-còmhnaidh.</li> <li><em>Postaichean, luchd-leantainn agus fiosrachadh poblach eile</em>: Tha liosta nan daoine air a leanas tu poblach mar a tha i dhan luchd-leantainn agad. Nuair a chuireas tu a-null teachdaireachd, thèid an t-àm ’s an ceann-latha a stòradh cho math ris an aplacaid leis an do chuir thu am foirm a-null. Faodaidh ceanglachain meadhain a bhith am broinn teachdaireachdan, can dealbhan no videothan. Tha postaichean poblach agus postaichean falaichte o liostaichean ri ’m faighinn gu poblach. Nuair a bhrosnaicheas tu post air a’ phròifil agad, ’s e fiosrachadh poblach a tha sin cuideachd. Thèid na postaichean agad a lìbhrigeadh dhan luchd-leantainn agad agus is ciall dha seo gun dèid an lìbhrigeadh gu frithealaichean eile aig amannan is gun dèid lethbhreacan dhiubh a stòradh thall. Nuair a sguabas tu às post, thèid sin a lìbhrigeadh dhan luchd-leantainn agad cuideachd. Tha ath-bhlogachadh no dèanamh annsachd de phost eile poblach an-còmhnaidh.</li> <li><em>Postaichean dìreach is dhan luchd-leantainn a-mhàin</em>: Thèid a h-uile post a stòradh ’s a phròiseasadh air an fhrithealaiche. Thèid na postaichean dhan luchd-leantainn a-mhàin a lìbhrigeadh dhan luchd-leantainn agad agus dhan luchd-chleachdaidh a chaidh iomradh a dhèanamh orra sa phost. Thèid postaichean dìreach a lìbhrigeadh dhan luchd-chleachdaidh a chaidh iomradh a dhèanamh orra sa phost a-mhàin. Is ciall dha seo gun dèid an lìbhrigeadh gu frithealaichean eile aig amannan is gun dèid lethbhreacan dhiubh a stòradh thall. Nì sinn ar dìcheall gun cuingich sinn an t-inntrigeadh dha na postaichean air na daoine a fhuair ùghdarrachadh dhaibh ach dh’fhaoidte nach dèan frithealaichean eile seo. Mar sin dheth, tha e cudromach gun doir thu sùil air na frithealaichean dhan a bhuineas an luchd-leantainn agad. Faodaidh tu roghainn a chur air no dheth a leigeas leat aontachadh ri luchd-leantainn ùra no an diùltadh a làimh. <em>Thoir an aire gum faic rianairean an fhrithealaiche agus frithealaiche sam bith a gheibh am fiosrachadh na teachdaireachdan dhen leithid</em> agus gur urrainn dha na faightearan glacaidhean-sgrìn no lethbhreacan dhiubh a dhèanamh no an cho-roinneadh air dòighean eile. <em>Na co-roinn fiosrachadh cunnartach air Mastodon idir.</em></li> <li><em>IPan is meata-dàta eile</em>: Nuair a nì thu clàradh a-steach, clàraidh sinn an seòladh IP on a rinn thu clàradh a-steach cuide ri ainm aplacaid a’ bhrabhsair agad. Bidh a h-uile seisean clàraidh a-steach ri làimh dhut airson an lèirmheas agus an cùl-ghairm sna roghainnean. Thèid an seòladh IP as ùire a chleachd thu a stòradh suas ri 12 mhìos. Faodaidh sinn cuideachd logaichean an fhrithealaiche a chumail a ghabhas a-steach seòladh IP aig a h-uile iarrtas dhan fhrithealaiche againn.</li> </ul> <hr class="spacer" /> <h3 id="use">Dè na h-adhbharan air an cleachd sinn am fiosrachadh agad?</h3> <p>Seo na dòighean air an cleachd sinn fiosrachadh sam bith a chruinnich sinn uat ma dh’fhaoidte:</p> <ul> <li>Airson bun-ghleusan Mhastodon a lìbhrigeadh. Chan urrainn dhut conaltradh le susbaint càich no an t-susbaint agad fhèin a phostadh ach nuair a bhios tu air do chlàradh a-steach. Mar eisimpleir, faodaidh tu leantainn air càch ach am faic thu na postaichean aca còmhla air loidhne-ama pearsanaichte na dachaigh agad.</li> <li>Airson cuideachadh le maorsainneachd na coimhearsnachd, can airson coimeas a dhèanamh eadar an seòladh IP agad ri feadhainn eile feuch am mothaich sinn do sheachnadh toirmisg no briseadh eile nan riaghailtean.</li> <li>Faodaidh sinn an seòladh puist-d agad a chleachdadh airson fiosrachadh no brathan mu chonaltraidhean càich leis an t-susbaint agad no teachdaireachdan a chur thugad, airson freagairt ri ceasnachaidhean agus/no iarrtasan no ceistean eile.</li> </ul> <hr class="spacer" /> <h3 id="protect">Ciamar a dhìonas sinn am fiosrachadh agad?</h3> <p>Cuiridh sinn iomadh gleus tèarainteachd an sàs ach an glèidheadh sinn sàbhailteachd an fhiosrachaidh phearsanta agad nuair a chuireas tu gin a-steach, nuair a chuireas tu a-null e no nuair a nì thu inntrigeadh air. Am measg gleusan eile, thèid seisean a’ bhrabhsair agad cuide ris an trafaig eadar na h-aplacaidean agad ’s an API a dhìon le SSL agus thèid hais a dhèanamh dhen fhacal-fhaire agad le algairim aon-shligheach làidir. Faodaidh tu dearbhadh dà-cheumnach a chur an comas airson barrachd tèarainteachd a chur ris an inntrigeadh dhan chunntas agad.</p> <hr class="spacer" /> <h3 id="data-retention">Dè am poileasaidh cumail dàta againn?</h3> <p>Nì sinn ar dìcheall:</p> <ul> <li>Nach cùm sinn logaidhean an fhrithealaiche sa bheil seòlaidhean IP nan iarrtasan uile dhan fhrithealaiche seo nas fhaide na 90 latha ma chumas sinn logaichean dhen leithid idir.</li> <li>Nach cùm sinn na seòlaidhean IP a tha co-cheangailte ri cleachdaichean clàraichte nas fhaide na 12 mhìos.</li> </ul> <p>’S urrainn dhut tasg-lann iarraidh dhen t-susbaint agad ’s a luchdadh a-nuas is gabhaidh seo a-staigh na postaichean, na ceanglachain meadhain, dealbh na pròifil agus dealbh a’ bhanna-chinn agad.</p> <p>’S urrainn dhut an cunntas agad a sguabadh às gu buan uair sam bith.</p> <hr class="spacer"/> <h3 id="cookies">An cleachd sinn briosgaidhean?</h3> <p>Cleachdaidh. ’S e faidhlichean beaga a tha sna briosgaidean a thar-chuireas làrach no solaraiche seirbheise gu clàr-cruaidh a’ choimpiutair agad leis a’ bhrabhsair-lìn agad (ma cheadaicheas tu sin). Bheir na briosgaidean sin comas dhan làrach gun aithnich i am brabhsair agad agus ma tha cunntas clàraichte agad, gun co-cheangail i ris a’ chunntas chlàraichte agad e.</p> <p>Cleachdaidh sinn briosgaidean airson na roghainnean agad a thuigsinn ’s a ghlèidheadh gus an tadhail thu oirnn san àm ri teachd.</p> <hr class="spacer" /> <h3 id="disclose">Am foillsich sinn fiosrachadh sam bith gu pàrtaidhean air an taobh a-muigh?</h3> <p>Cha reic, malairt no tar-chuir sinn fiosrachadh air a dh’aithnichear thu fhèin gu pàrtaidh sam bith air an taobh a-muigh. Cha ghabh seo a-staigh treas-phàrtaidhean earbsach a chuidicheas leinn le ruith na làraich againn, le obrachadh a’ ghnìomhachais againn no gus an t-seirbheis a thoirt leat cho fada ’s a dh’aontaicheas na treas-phàrtaidhean sin gun cùm iad am fiosrachadh dìomhair. Faodaidh sinn am fiosrachadh agad fhoillseachadh cuideachd nuair a bhios sinn dhen bheachd gu bheil am foillseachadh sin iomchaidh airson gèilleadh dhan lagh, poileasaidhean na làraich againn èigneachadh no na còraichean, an sealbh no an t-sàbhailteachd againn fhèin no aig càch a dhìon.</p> <p>Dh’fhaoidte gun dèid an t-susbaint phoblach agad a luchdadh a-nuas le frithealaichean eile san lìonra. Thèid na postaichean poblach agad ’s an fheadhainn dhan luchd-leantainn a-mhàin a lìbhrigeadh dha na frithealaichean far a bheil an luchd-leantainn agad a’ còmhnaidh agus thèid na teachdaireachdan dìreach a lìbhrigeadh gu frithealaichean nam faightearan nuair a bhios iad a’ còmhnaidh air frithealaiche eile.</p> <p>Nuair a dh’ùghdarraicheas tu aplacaid gun cleachd i an cunntas agad, a-rèir sgòp nan ceadan a dh’aontaicheas tu riutha, faodaidh i fiosrachadh poblach na pròifil agad, liosta na feadhna air a bhios tu a’ leantainn, an luchd-leantainn agad, na liostaichean agad, na postaichean agad uile ’s na h-annsachdan agad inntrigeadh. Chan urrainn do dh’aplacaidean an seòladh puist-d no am facal-faire agad inntrigeadh idir.</p> <hr class="spacer" /> <h3 id="children">Cleachdadh na làraich leis a’ chloinn</h3> <p>Ma tha am frithealaiche seo san Aonadh Eòrpach (AE) no san Roinn Eaconomach na h-Eòrpa (EEA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 16 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) nach cleachd thu an làrach seo.</p> <p>Ma tha am frithealaiche seo sna Stàitean Aonaichte (SAA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 13 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children''s Online Privacy Protection Act</a>)ha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 16 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) nach cleachd thu an làrach seo.</p> <p>Ma tha am frithealaiche seo sna Stàitean Aonaichte (SAA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 13 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children''s Online Privacy Protection Act</a>) nach cleachd thu an làrach seo.</p> <p>Dh’fhaoidte gu bheil am frithealaiche seo fo riatanasan lagha eile ma tha e ann an uachdranas laghail eile.</p> <hr class="spacer" /> <h3 id="changes">Atharraichean air a’ phoileasaidh phrìobhaideachd againn</h3> <p>Ma chuireas sinn romhainn am poileasaidh prìobhaideachd againn atharrachadh, postaichidh sinn na h-atharraichean dhan duilleag seo.</p> <p>Tha an sgrìobhainn seo fo cheadachas CC-BY-SA. Chaidh ùrachadh an turas mu dheireadh an t-7mh dhen Mhart 2018.</p> <p>Chaidh a fhreagarrachadh o thùs o <a href="https://github.com/discourse/discourse">phoileasaidh prìobhaideachd Discourse</a>.</p> nach cleachd thu an làrach seo.</p> <p>Dh’fhaoidte gu bheil am frithealaiche seo fo riatanasan lagha eile ma tha e ann an uachdranas laghail eile.</p> <hr class="spacer" /> <h3 id="changes">Atharraichean air a’ phoileasaidh phrìobhaideachd againn</h3> <p>Ma chuireas sinn romhainn am poileasaidh prìobhaideachd againn atharrachadh, postaichidh sinn na h-atharraichean dhan duilleag seo.</p> <p>Tha an sgrìobhainn seo fo cheadachas CC-BY-SA. Chaidh ùrachadh an turas mu dheireadh an t-7mh dhen Mhart 2018.</p> <p>Chaidh a fhreagarrachadh o thùs o <a href="https://github.com/discourse/discourse">phoileasaidh prìobhaideachd Discourse</a>.</p>'
-    title: Teirmichean na seirbheise ⁊ poileasaidh prìobhaideachd %{instance}
   themes:
     contrast: Mastodon (iomsgaradh àrd)
     default: Mastodon (dorcha)
@@ -1371,6 +1616,7 @@ gd:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Cuir ris
     disable: Cuir an dearbhadh dà-cheumnach à comas
@@ -1387,63 +1633,73 @@ gd:
     recovery_instructions_html: Ma chailleas tu an t-inntrigeadh dhan fhòn agad, ’s urrainn dhut fear dhe na còdan aisig gu h-ìosal a chleachdadh airson faighinn a-steach dhan chunntas agad a-rithist. <strong>Cùm na còdan aisig sàbhailte</strong>. Mar eisimpleir, ’s urrainn dhut an clò-bhualadh ’s a chumail far a bheil thu a’ cumail na sgrìobhainnean cudromach eile agad.
     webauthn: Iuchraichean tèarainteachd
   user_mailer:
+    appeal_approved:
+      action: Tadhail air a’ chunntas agad
+      explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha deagh chliù air a’ chunntas agad a-rithist.
+      subject: Chaidh aontachadh ris an ath-thagradh agad o %{date}
+      title: Chaidh aontachadh ri ath-thagradh
+    appeal_rejected:
+      explanation: Chaidh an t-ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date} a dhiùltadh.
+      subject: Chaidh an t-ath-thagradh agad o %{date} a dhiùltadh
+      title: Chaidh ath-thagradh a dhiùltadh
     backup_ready:
       explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad. Tha e deis ri luchdadh a-nuas a-nis!
       subject: Tha an tasg-lann agad deis ri luchdadh a-nuas
       title: Tasg-lann dhut
-    sign_in_token:
-      details: 'Seo mion-fhiosrachadh mun oidhirp:'
-      explanation: 'Mhothaich sinn do dh’oidhirp clàraidh a-steach dhan chunntas agad o sheòladh IP nach aithne dhuinn. Mas e tusa a bh’ ann, cuir a-steach an còd tèarainteachd gu h-ìosal air duilleag dùbhlan a’ chlàraidh a-steach:'
-      further_actions: 'Mur e tusa a bh’ ann, atharraich am facal-faire agad agus cuir an comas an dearbhadh dà-cheumnach air a’ chunntas agad. ’S urrainn dhut sin a dhèanamh an-seo:'
-      subject: Dearbh an oidhirp air clàradh a-steach
-      title: Oidhirp clàraidh a-steach
+    suspicious_sign_in:
+      change_password: atharraich thu am facal-faire agad
+      details: 'Seo mion-fhiosrachadh mun chlàradh a-steach:'
+      explanation: Mhothaich sinn do chlàradh a-steach dhan chunntas agad o sheòladh IP ùr.
+      further_actions_html: Mur e thu fhèin a bh’ ann, mholamaid gun %{action} sa bhad agus gun cuir thu an dearbhadh dà-cheumnach an comas airson an cunntas agad a chumail tèarainte.
+      subject: Chaidh an cunntas agad inntrigeadh o sheòladh IP ùr
+      title: Clàradh a-steach ùr
     warning:
+      appeal: Cuir ath-thagradh a-null
+      appeal_description: Ma tha thu dhen bheachd gur e mearachd a th’ ann, ’s urrainn dhut ath-thagradh a chur a-null gun sgioba aig %{instance}.
+      categories:
+        spam: Spama
+        violation: Tha an t-susbaint a’ briseadh na riaghailtean giùlain a leanas
       explanation:
-        disable: Chan urrainn dhut clàradh a-steach dhan chunntas agad tuilleadh no a chleachdadh ann an dòigh sam bith eile ach mairidh a’ phròifil ’s an dàta eile agad.
-        sensitive: Thèid dèiligeadh ris na faidhlichean meadhain is na meadhanan ceangailte agad mar fheadhainn fhrionasach.
-        silence: "’S urrainn dhut an cunntas agad a chleachdadh fhathast ach chan fhaic ach na daoine a tha a’ leantainn ort mu thràth na postaichean agad air an fhrithealaiche seo agus dh’fhaoidte gun dèid d’ às-dhùnadh o iomadh liosta phoblach. Gidheadh, faodaidh càch leantainn ort a làimh fhathast."
-        suspend: Chan urrainn dhut an cunntas agad a chleachdadh tuilleadh agus chan fhaigh thu grèim air a’ phròifil no air an dàta eile agad. ’S urrainn dhut clàradh a-steach fhathast airson lethbhreac-glèidhidh dhen dàta agad iarraidh mur dèid an dàta a thoirt air falbh gu slàn ach cumaidh sinn cuid dhen dàta ach nach seachain thu an cur à rèim.
-      get_in_touch: "’S urrainn dhut freagairt dhan phost-d seo no conaltradh ris an sgioba aig %{instance}."
-      review_server_policies: Thoir sùil air riaghailtean an fhrithealaiche
-      statuses: 'Gu sònraichte, dha:'
+        delete_statuses: Thathar dhen bheachd gu bheil cuid dhe na postaichean agad a’ briseadh riaghailt no riaghailtean giùlain agus chaidh an toirt air falbh le maoir %{instance} an uairsin.
+        disable: Chan urrainn dhut an cunntas agad a chleachdadh tuilleadh ach mairidh a’ phròifil ’s an dàta eile agad. Faodaidh tu lethbhreac-glèidhidh dhen dàta agad iarraidh, roghainnean a’ chunntais atharrachadh no an cunntas agad a sguabadh às.
+        mark_statuses_as_sensitive: Chuir maoir %{instance} comharra na frionasachd ri cuid dhe na postaichean agad. Is ciall dha seo gum feumar gnogag a thoirt air na meadhanan sna postaichean mus faicear ro-shealladh. ’S urrainn dhut fhèin comharra a chur gu bheil meadhan frionasach nuair a sgrìobhas tu post san à ri teachd.
+        sensitive: O seo a-mach, thèid comharra na frionasachd a chur ri faidhle meadhain sam bith a luchdaicheas tu suas agus thèid am falach air cùlaibh rabhaidh a ghabhas briogadh air.
+        silence: "’S urrainn dhut an cunntas agad a chleachdadh fhathast ach chan fhaic ach na daoine a tha ’gad leantainn mu thràth na postaichean agad air an fhrithealaiche seo agus dh’fhaoidte gun dèid d’ às-dhùnadh o iomadh gleus rùrachaidh. Gidheadh, faodaidh càch ’gad leantainn a làimh fhathast."
+        suspend: Chan urrainn dhut an cunntas agad a chleachdadh tuilleadh agus chan fhaigh thu grèim air a’ phròifil no air an dàta eile agad. ’S urrainn dhut clàradh a-steach fhathast airson lethbhreac-glèidhidh dhen dàta agad iarraidh mur dèid an dàta a thoirt air falbh an ceann 30 latha gu slàn ach cumaidh sinn cuid dhen dàta bhunasach ach nach seachain thu an cur à rèim.
+      reason: 'Adhbhar:'
+      statuses: 'Iomradh air postaichean:'
       subject:
+        delete_statuses: Chaidh na postaichean agad air %{acct} a thoirt air falbh
         disable: Chaidh an cunntas %{acct} agad a reòthadh
+        mark_statuses_as_sensitive: Chaidh comharra na frionasachd a chur ris na postaichean agad air %{acct}
         none: Rabhadh dha %{acct}
-        sensitive: Chaidh comharra a chur ri meadhanan a’ chunntais %{acct} agad gu bheil iad frionasach
+        sensitive: Thèid comharra na frionasachd a chur ris na postaichean agad air %{acct} o seo a-mach
         silence: Chaidh an cunntas %{acct} agad a chuingeachadh
         suspend: Chaidh an cunntas %{acct} agad a chur à rèim
       title:
+        delete_statuses: Chaidh postaichean a thoirt air falbh
         disable: Cunntas reòite
+        mark_statuses_as_sensitive: Chaidh comharra na frionasachd a chur ri postaichean
         none: Rabhadh
-        sensitive: Chaidh comharra a chur ris na meadhanan agad gu bheil iad frionasach
+        sensitive: Chaidh comharra na frionasachd a chur ri cunntas
         silence: Cunntas cuingichte
         suspend: Cunntas à rèim
     welcome:
       edit_profile_action: Suidhich a’ phròifil agad
-      edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas avatar no bann-cinn, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. Nam bu mhiann leat lèirmheas a dhèanamh air daoine mus fhaod iad leantainn ort, ’s urrainn dhut an cunntas agad a ghlasadh."
+      edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas dealbh pròifil, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. ’S urrainn dhut lèirmheas a dhèanamh air daoine mus fhaod iad ’gad leantainn ma thogras tu."
       explanation: Seo gliocas no dhà gus tòiseachadh
       final_action: Tòisich air postadh
-      final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith a’ leantainn ort, chì cuid mhath na postaichean poblach agad, can air an loidhne-ama ionadail agus le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #introductions?'
+      final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith ’gad leantainn, chì cuid mhath na postaichean poblach agad, can air an loidhne-ama ionadail no le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #fàilte?'
       full_handle: D’ ainm-cleachdaiche slàn
-      full_handle_hint: Seo na bheir thu dha na caraidean agad ach an urrainn dhaibh teachdaireachd a chur thugad no leantainn ort o fhrithealaiche eile.
-      review_preferences_action: Atharraich na roghainnean
-      review_preferences_step: Dèan cinnteach gun suidhich thu na roghainnean agad, can dè na puist-d a bu mhiann leat fhaighinn no dè a’ bun-roghainn air ìre na prìobhaideachd a bu chòir a bhith aig na postaichean agad. Mura cuir gluasad an òrrais ort, b’ urrainn dhut cluich fèin-obrachail nan GIFs a chur an comas.
+      full_handle_hint: Seo na bheir thu dha na caraidean agad ach an urrainn dhaibh teachdaireachd a chur thugad no ’gad leantainn o fhrithealaiche eile.
       subject: Fàilte gu Mastodon
-      tip_federated_timeline: "’S e sealladh farsaing dhen lìonra Mastodon a tha san loidhne-ama cho-naisgte. Gidheadh, cha ghabh i a-staigh ach na daoine air an do rinn do nàbaidhean fo-sgrìobhadh, mar sin chan eil i coileanta."
-      tip_following: Leanaidh tu air rianaire(an) an fhrithealaiche agad a ghnàth. Airson daoine nas inntinniche a lorg, thoir sùil air na loidhnichean-ama ionadail is co-naisgte.
-      tip_local_timeline: "’S e sealladh farsaing air na daoine a th’ air %{instance} a tha san loidhne-ama ionadail agad. Seo na nàbaidhean a tha faisg ort!"
-      tip_mobile_webapp: Ma leigeas am brabhsair mobile agad leat Mastodon a chur ris an sgrìn-dhachaigh, ’s urrainn dhut brathan putaidh fhaighinn. Bidh e ’ga ghiùlan fhèin coltach ri aplacaid thùsail air iomadh dòigh!
-      tips: Gliocasan
       title: Fàilte air bòrd, %{name}!
   users:
-    follow_limit_reached: Chan urrainn dhut leantainn air còrr is %{limit} daoine
-    generic_access_help_html: A bheil trioblaid agad le inntrigeadh a’ chunntais agad? ’S urrainn dhut fios a chur gu %{email} airson taic
+    follow_limit_reached: Chan urrainn dhut còrr is %{limit} daoine a leantainn
     invalid_otp_token: Còd dà-cheumnach mì-dhligheach
-    invalid_sign_in_token: Còd tèarainteachd mì-dhligheach
     otp_lost_help_html: Ma chaill thu an t-inntrigeadh dhan dà chuid diubh, ’s urrainn dhut fios a chur gu %{email}
     seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
     signed_in_as: 'Chlàraich thu a-steach mar:'
-    suspicious_sign_in_confirmation: Tha coltas nach do rinn thu clàradh a-steach on uidheam seo cheana agus cha do clàraich thu a-steach greis mhath. Air an adhbhar sin, cuiridh sinn còd tèarainteachd dhan t-seòladh puist-d agad ach an dearbhamaid gur e tusa a th’ ann.
   verification:
     explanation_html: '’S urrainn dhut <strong>dearbhadh gur e seilbheadair nan ceanglaichean ann am meata-dàta na pròifil agad a th’ annad</strong>. Airson sin a dhèanamh, feumaidh ceangal air ais dhan phròifil Mastodon a bhith aig an làrach-lìn cheangailte. <strong>Feumaidh</strong> buadh <code>rel="me"</code> a bhith aig a’ cheangal air ais. Chan eil e gu diofar dè an t-susbaint a tha ann an teacsa a’ cheangail. Seo ball-eisimpleir dhut:'
     verification: Dearbhadh
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 6ffa1af15..d472296e8 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1,90 +1,27 @@
 ---
 gl:
   about:
-    about_hashtag_html: Estas son publicacións públicas etiquetadas con <strong>#%{hashtag}</strong>. Podes interactuar con elas se tes unha conta nalgures do fediverso.
     about_mastodon_html: 'A rede social do futuro: Sen publicidade, sen seguimento por empresas, deseño ético e descentralización! En Mastodon ti posúes os teus datos!'
-    about_this: Acerca de
-    active_count_after: activas
-    active_footnote: Usuarias Activas no Mes (UAM)
-    administered_by: 'Administrada por:'
-    api: API
-    apps: Aplicacións móbiles
-    apps_platforms: Emprega Mastodon dende iOS, Android e outras plataformas
-    browse_directory: Mira o directorio e filtra por intereses
-    browse_local_posts: Navega polas publicacións públicas deste servidor en tempo real
-    browse_public_posts: Navega polas publicacións públicas de Mastodon en tempo real
-    contact: Contacto
     contact_missing: Non establecido
     contact_unavailable: Non dispoñíbel
-    discover_users: Descubrir usuarias
-    documentation: Documentación
-    federation_hint_html: Cunha conta en %{instance} poderás seguir ás persoas en calquera servidor do Mastodon e alén.
-    get_apps: Probar unha aplicación móbil
     hosted_on: Mastodon aloxado en %{domain}
-    instance_actor_flash: Esta conta é un actor virtual utilizado para representar ao servidor e non a unha usuaria individual. Utilízase para propósitos de federación e non debería estar bloqueada a menos que queiras bloquear a toda a instancia, en tal caso deberías utilizar o bloqueo do dominio.
-    learn_more: Saber máis
-    privacy_policy: Política de privacidade
-    rules: Regras do servidor
-    rules_html: 'Aquí tes un resumo das regras que debes seguir se queres ter unha conta neste servidor de Mastodon:'
-    see_whats_happening: Ver o que está a acontecer
-    server_stats: 'Estatísticas do servidor:'
-    source_code: Código fonte
-    status_count_after:
-      one: publicación
-      other: publicacións
-    status_count_before: Que publicaron
-    tagline: Segue ás túas amizades e coñece novas
-    terms: Termos do servizo
-    unavailable_content: Contido non dispoñíbel
-    unavailable_content_description:
-      domain: Servidor
-      reason: Razón
-      rejecting_media: 'Os ficheiros multimedia deste servidor non serán procesados e non se amosarán miniaturas, o que require un clic manual no ficheiro orixinal:'
-      rejecting_media_title: Multimedia filtrado
-      silenced: 'As publicacións destes servidores non se amosarán en conversas e cronoloxías públicas, nin terás notificacións xeradas polas interaccións das usuarias, a menos que as estés a seguir:'
-      silenced_title: Servidores acalados
-      suspended: 'Non se procesarán, almacenarán nin intercambiarán datos destes servidores, o que fai imposíbel calquera interacción ou comunicación coas usuarias dende estes servidores:'
-      suspended_title: Servidores suspendidos
-    unavailable_content_html: O Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.
-    user_count_after:
-      one: usuaria
-      other: usuarias
-    user_count_before: Fogar de
-    what_is_mastodon: Qué é Mastodon?
+    title: Acerca de
   accounts:
-    choices_html: 'Escollas de %{name}:'
-    endorsements_hint: Podes suxerir a persoas que segues dende a interface web, e amosaranse aquí.
-    featured_tags_hint: Podes destacar determinados cancelos que se amosarán aquí.
     follow: Seguir
     followers:
       one: Seguidora
       other: Seguidoras
-    following: Seguindo
+    following: A Seguir
     instance_actor_flash: Esta conta é un actor virtual utilizado para representar ó servidor mesmo e non a unha usuaria individual. Utilízase por motivos de federación e non debería estar suspendida.
-    joined: Uniuse en %{date}
     last_active: última actividade
     link_verified_on: A propiedade desta ligazón foi verificada en %{date}
-    media: Multimedia
-    moved_html: "%{name} mudouse a %{new_profile_link}:"
-    network_hidden: Esta información non está dispoñíbel
-    never_active: Nunca
     nothing_here: Non hai nada aquí!
-    people_followed_by: Persoas que segue %{name}
-    people_who_follow: Persoas que seguen a %{name}
     pin_errors:
       following: Tes que seguir á persoa que queres engadir
     posts:
       one: Publicación
       other: Publicacións
     posts_tab_heading: Publicacións
-    posts_with_replies: Publicacións e respostas
-    roles:
-      admin: Administradora
-      bot: Bot
-      group: Grupo
-      moderator: Moderadora
-    unavailable: Perfil non dispoñíbel
-    unfollow: Deixar de seguir
   admin:
     account_actions:
       action: Executar acción
@@ -92,26 +29,30 @@ gl:
     account_moderation_notes:
       create: Deixar nota
       created_msg: Nota de moderación creada de xeito correcto!
-      delete: Eliminar
       destroyed_msg: Nota de moderación eliminada de xeito correcto!
     accounts:
       add_email_domain_block: Bloquear o dominio do email
       approve: Aprobar
-      approve_all: Aprobar todos
-      approved_msg: Aprobada a solicitude da aplicación de conexión de %{username}
+      approved_msg: Aprobada a solicitude de rexistro de %{username}
       are_you_sure: Está segura?
       avatar: Imaxe de perfil
       by_domain: Dominio
       change_email:
-        changed_msg: Email da conta mudado de xeito correcto!
+        changed_msg: Email mudado de xeito correcto!
         current_email: Email actual
         label: Mudar email
         new_email: Novo email
         submit: Mudar email
         title: Mudar email de %{username}
+      change_role:
+        changed_msg: Rol mudado correctamente!
+        label: Cambiar rol
+        no_role: Sen rol
+        title: Cambiar o rol de %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Estase a confirmar
+      custom: Personalizado
       delete: Eliminar datos
       deleted: Eliminado
       demote: Rebaixar
@@ -130,7 +71,7 @@ gl:
       enabled: Activado
       enabled_msg: Desbloqueada a conta de %{username}
       followers: Seguidoras
-      follows: Seguindo
+      follows: Segue
       header: Cabeceira
       inbox_url: URL da caixa de entrada
       invite_request_text: Razóns para unirte
@@ -151,7 +92,7 @@ gl:
         active: Activa
         all: Todo
         pending: Pendente
-        silenced: Acalada
+        silenced: Limitada
         suspended: Suspendidos
         title: Moderación
       moderation_notes: Notas de moderación
@@ -159,9 +100,14 @@ gl:
       most_recent_ip: IP máis recente
       no_account_selected: Ningunha conta mudou porque ningunha foi seleccionada
       no_limits_imposed: Sen límites impostos
+      no_role_assigned: Sen rol asignado
       not_subscribed: Non subscrita
       pending: Revisión pendente
       perform_full_suspension: Suspender
+      previous_strikes: Accións previas
+      previous_strikes_description_html:
+        one: Esta conta ten <strong>un</strong> aviso.
+        other: Esta conta ten <strong>%{count}</strong> avisos.
       promote: Promocionar
       protocol: Protocolo
       public: Público
@@ -169,8 +115,9 @@ gl:
       redownload: Actualizar perfil
       redownloaded_msg: Actualizado o perfil de %{username} desde a orixe
       reject: Rexeitar
-      reject_all: Rexeitar todo
-      rejected_msg: Rexeitada a solicitude da aplicación de conexión de %{username}
+      rejected_msg: Rexeitada a solicitude de rexistro de %{username}
+      remote_suspension_irreversible: Elimináronse de xeito irreversible os datos desta conta.
+      remote_suspension_reversible_hint_html: Esta conta foi suspendida no seu servidor, e os datos serán totalmente eliminados o %{date}. Ata entón, o servidor remoto pode restablecer a conta sen perder datos. Se desexas eliminar agora mesmo todos os datos da conta, podes facelo aquí embaixo.
       remove_avatar: Eliminar imaxe de perfil
       remove_header: Eliminar cabeceira
       removed_avatar_msg: Eliminado a imaxe de avatar de %{username}
@@ -182,21 +129,15 @@ gl:
       reset: Restabelecer
       reset_password: Restabelecer contrasinal
       resubscribe: Resubscribir
-      role: Permisos
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Persoal (staff)
-        user: Usuaria
+      role: Rol
       search: Procurar
       search_same_email_domain: Outras usuarias co mesmo dominio de email
       search_same_ip: Outras usuarias co mesmo IP
       security_measures:
         only_password: Só contrasinal
         password_and_2fa: Contrasinal e 2FA
-        password_and_sign_in_token: Contrasinal e token nun email
-      sensitive: Sensible
-      sensitized: marcado como sensible
+      sensitive: Forzar como sensible
+      sensitized: Marcado como sensible
       shared_inbox_url: URL da caixa de entrada compartida
       show:
         created_reports: Denuncias feitas
@@ -204,14 +145,17 @@ gl:
       silence: Silenciar
       silenced: Silenciado
       statuses: Publicacións
+      strikes: Accións previas
       subscribe: Subscribirse
+      suspend: Suspender
       suspended: Suspendida
       suspension_irreversible: Elimináronse de xeito irreversible os datos desta conta. Podes reactivar a conta para facela usable novamente pero non recuperará os datos eliminados.
       suspension_reversible_hint_html: Esta conta foi suspendida, e os datos serán totalmente eliminados o %{date}. Ata entón, a conta pode ser restaurada sen danos. Se desexas eliminar agora mesmo todos os datos da conta, podes facelo aquí embaixo.
-      time_in_queue: Agardando na cola %{time}
       title: Contas
+      unblock_email: Desbloquear enderezo de email
+      unblocked_email_msg: Enderezo de email de %{username} desbloqueado
       unconfirmed_email: Email non confirmado
-      undo_sensitized: Desmarcar sensible
+      undo_sensitized: Desmarcar como sensible
       undo_silenced: Desfacer acalar
       undo_suspension: Desfacer suspensión
       unsilenced_msg: Retirado o límite da conta %{username}
@@ -224,26 +168,34 @@ gl:
       whitelisted: Listaxe branca
     action_logs:
       action_types:
+        approve_appeal: Aprobar apelación
+        approve_user: Aprobar Usuaria
         assigned_to_self_report: Asignar denuncia
         change_email_user: Editar email da usuaria
+        change_role_user: Cambiar Rol da Usuaria
         confirm_user: Confirmar usuaria
         create_account_warning: Crear aviso
         create_announcement: Crear anuncio
+        create_canonical_email_block: Crear Bloqueo de email
         create_custom_emoji: Crear emoticonas personalizadas
-        create_domain_allow: Crear permiso de dominio
-        create_domain_block: Crear bloqueo de dominio
+        create_domain_allow: Crear Dominio Permitido
+        create_domain_block: Crear bloquedo do Dominio
         create_email_domain_block: Crear bloqueo de dominio de correo electrónico
         create_ip_block: Crear regra IP
         create_unavailable_domain: Crear dominio Non dispoñible
+        create_user_role: Crear Rol
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
+        destroy_canonical_email_block: Eliminar Bloqueo de email
         destroy_custom_emoji: Eliminar emoticona personalizada
-        destroy_domain_allow: Eliminar permiso de dominio
-        destroy_domain_block: Eliminar bloqueo de dominio
+        destroy_domain_allow: Eliminar Dominio permitido
+        destroy_domain_block: Eliminar bloqueo do Dominio
         destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
+        destroy_instance: Purgar Dominio
         destroy_ip_block: Eliminar regra IP
         destroy_status: Eliminar publicación
         destroy_unavailable_domain: Eliminar dominio Non dispoñible
+        destroy_user_role: Eliminar Rol
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
         disable_sign_in_token_auth_user: Desactivar Autenticación por token no email para Usuaria
@@ -253,67 +205,87 @@ gl:
         enable_user: Activar usuaria
         memorialize_account: Transformar en conta conmemorativa
         promote_user: Promover usuaria
+        reject_appeal: Rexeitar apelación
+        reject_user: Rexeitar Usuaria
         remove_avatar_user: Eliminar avatar
         reopen_report: Reabrir denuncia
+        resend_user: Reenviar o email de confirmación
         reset_password_user: Restabelecer contrasinal
         resolve_report: Resolver denuncia
         sensitive_account: Marca o multimedia da túa conta como sensible
         silence_account: Silenciar conta
         suspend_account: Suspender conta
         unassigned_report: Desasignar denuncia
+        unblock_email_account: Desbloquear enderezo de email
         unsensitive_account: Retira a marca de sensible do multimedia da conta
         unsilence_account: Deixar de silenciar conta
         unsuspend_account: Retirar suspensión de conta
         update_announcement: Actualizar anuncio
         update_custom_emoji: Actualizar emoticona personalizada
         update_domain_block: Actualizar bloqueo do dominio
+        update_ip_block: Actualizar regra IP
         update_status: Actualizar publicación
+        update_user_role: Actualizar Rol
       actions:
+        approve_appeal_html: "%{name} aprobou a apelación da decisión da moderación de %{target}"
+        approve_user_html: "%{name} aprobou o rexistro de %{target}"
         assigned_to_self_report_html: "%{name} asignou a denuncia %{target} para si mesma"
         change_email_user_html: "%{name} cambiou o enderezo de email da usuaria %{target}"
+        change_role_user_html: "%{name} cambiou o rol de %{target}"
         confirm_user_html: "%{name} confirmou o enderezo de email da usuaria %{target}"
         create_account_warning_html: "%{name} envioulle unha advertencia a %{target}"
         create_announcement_html: "%{name} creou un novo anuncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou o email con hash %{target}"
         create_custom_emoji_html: "%{name} subiu un novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu a federación co dominio %{target}"
         create_domain_block_html: "%{name} bloqueou o dominio %{target}"
         create_email_domain_block_html: "%{name} bloqueou o dominio de email %{target}"
         create_ip_block_html: "%{name} creou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} deixou de interactuar co dominio %{target}"
+        create_user_role_html: "%{name} creou o rol %{target}"
         demote_user_html: "%{name} degradou a usuaria %{target}"
         destroy_announcement_html: "%{name} eliminou o anuncio %{target}"
-        destroy_custom_emoji_html: "%{name} destruíu o emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o email con hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
         destroy_domain_allow_html: "%{name} retirou a federación co dominio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o dominio %{target}"
         destroy_email_domain_block_html: "%{name} desbloqueou o dominio de email %{target}"
+        destroy_instance_html: "%{name} purgou o dominio %{target}"
         destroy_ip_block_html: "%{name} eliminou a regra para o IP %{target}"
         destroy_status_html: "%{name} eliminou a publicación de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a interacción co dominio %{target}"
+        destroy_user_role_html: "%{name} eliminou o rol %{target}"
         disable_2fa_user_html: "%{name} desactivou o requerimento do segundo factor para a usuaria %{target}"
         disable_custom_emoji_html: "%{name} desactivou o emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} desactivou a autenticación por token no email para %{target}"
-        disable_user_html: "%{name} desactivou a conexión para a usuaria %{target}"
+        disable_user_html: "%{name} desactivou as credenciais para a usuaria %{target}"
         enable_custom_emoji_html: "%{name} activou o emoji %{target}"
         enable_sign_in_token_auth_user_html: "%{name} activou a autenticación con token no email para %{target}"
-        enable_user_html: "%{name} activou a conexión para a usuaria %{target}"
+        enable_user_html: "%{name} activou as credenciais para a usuaria %{target}"
         memorialize_account_html: "%{name} convertiu a conta de %{target} nunha páxina para o recordo"
         promote_user_html: "%{name} promocionou a usuaria %{target}"
+        reject_appeal_html: "%{name} rexeitou a apelación da decisión da moderación de %{target}"
+        reject_user_html: "%{name} rexeitou o rexistro de %{target}"
         remove_avatar_user_html: "%{name} eliminou o avatar de %{target}"
         reopen_report_html: "%{name} reabriu a denuncia %{target}"
+        resend_user_html: "%{name} reenviou o email de confirmación para %{target}"
         reset_password_user_html: "%{name} restableceu o contrasinal da usuaria %{target}"
         resolve_report_html: "%{name} resolveu a denuncia %{target}"
         sensitive_account_html: "%{name} marcou o multimedia de %{target} como sensible"
         silence_account_html: "%{name} acalou a conta de %{target}"
         suspend_account_html: "%{name} suspendeu a conta de %{target}"
         unassigned_report_html: "%{name} quitoulle a asignación á denuncia %{target}"
+        unblock_email_account_html: "%{name} desbloqueou o enderezo de email de %{target}"
         unsensitive_account_html: "%{name} desmarcou como sensible o multimedia de %{target}"
         unsilence_account_html: "%{name} reactivou a conta de %{target}"
         unsuspend_account_html: "%{name} retiroulle a suspensión á conta de %{target}"
         update_announcement_html: "%{name} actualizou o anuncio %{target}"
         update_custom_emoji_html: "%{name} actualizou o emoji %{target}"
         update_domain_block_html: "%{name} actualizou o bloqueo do dominio para %{target}"
+        update_ip_block_html: "%{name} cambiou a regra para IP %{target}"
         update_status_html: "%{name} actualizou a publicación de %{target}"
-      deleted_status: "(publicación eliminada)"
+        update_user_role_html: "%{name} cambiou o rol %{target}"
+      deleted_account: conta eliminada
       empty: Non se atoparon rexistros.
       filter_by_action: Filtrar por acción
       filter_by_user: Filtrar por usuaria
@@ -352,11 +324,12 @@ gl:
       enable: Activar
       enabled: Activado
       enabled_msg: Activouse a emoticona de xeito correcto
-      image_hint: PNG de até 50KB
+      image_hint: PNG ou GIF ata %{size}
       list: Listar
       listed: Listado
       new:
         title: Engadir nova emoticona personalizado
+      no_emoji_selected: Non se cambiou ningún emoji xa que ningún foi seleccionado
       not_permitted: Non podes realizar esta acción
       overwrite: Sobrescribir
       shortcode: Código curto
@@ -374,14 +347,17 @@ gl:
       media_storage: Almacenaxe multimedia
       new_users: novas usuarias
       opened_reports: denuncias abertas
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelación pendente"
+        other: "<strong>%{count}</strong> apelacións pendentes"
       pending_reports_html:
-        one: "<strong>1</strong> denuncia pendente"
+        one: "<strong>%{count}</strong> denuncia pendente"
         other: "<strong>%{count}</strong> denuncias pendentes"
       pending_tags_html:
-        one: "<strong>1</strong> cancelo pendente"
-        other: "<strong>%{count}</strong> cancelos pendentes"
+        one: "<strong>%{count}</strong> etiqueta pendente"
+        other: "<strong>%{count}</strong> etiquetas pendentes"
       pending_users_html:
-        one: "<strong>1</strong> usuaria pendente"
+        one: "<strong>%{count}</strong> usuaria pendente"
         other: "<strong>%{count}</strong> usuarias pendentes"
       resolved_reports: denuncias resoltas
       software: Software
@@ -391,10 +367,16 @@ gl:
       top_languages: Idiomas máis activos
       top_servers: Servidores máis activos
       website: Sitio web
+    disputes:
+      appeals:
+        empty: Non hai apelacións.
+        title: Apelacións
     domain_allows:
       add_new: Engadir dominio á listaxe branca
       created_msg: Engadeu o dominio a lista branca
       destroyed_msg: Quitou o dominio da lista branca
+      export: Exportar
+      import: Importar
       undo: Eliminar da listaxe branca
     domain_blocks:
       add_new: Engadir novo bloqueo de dominio
@@ -402,16 +384,21 @@ gl:
       destroyed_msg: Desfíxose o bloqueo de dominio
       domain: Dominio
       edit: Editar bloqueo de dominio
+      existing_domain_block: Xa tes establecidas restricións maiores para %{name}.
       existing_domain_block_html: Xa impuxeches límites máis estrictos a %{name}, precisas <a href="%{unblock_url}">desbloquealo</a> primeiro.
+      export: Exportar
+      import: Importar
       new:
         create: Crear bloqueo
         hint: O bloqueo do dominio non previrá a creación de entradas de contas na base de datos, pero aplicará de xeito retroactivo e automático regras específicas de moderación sobre esas contas.
         severity:
-          desc_html: "<strong>Silenciar</strong> fará invisíbeis as mensaxes das contas para calquera que non os siga. <strong>Suspender</strong> eliminará todo o contido das contas, ficheiros multimedia, e datos de perfil. Emprega a opción de <strong>Ningún</strong> se só queres rexeitar ficheiros multimedia."
+          desc_html: Ao <strong>Limitar</strong> farás que as publicacións de contas deste dominio sexan invisibles para calquera que non as siga. Ao <strong>Suspender</strong> eliminarás do teu servidor todo o contido, multimedia, e datos de perfil para as contas deste dominio. Utiliza <strong>Nada</strong> se simplemente queres rexeitar ficheiros multimedia.
           noop: Ningún
-          silence: Silenciar
+          silence: Limitar
           suspend: Suspender
         title: Novo bloqueo de dominio
+      no_domain_block_selected: Non se cambiou ningún bloqueo de dominio porque non se seleccionou ningún
+      not_permitted: Non podes realizar esta acción
       obfuscate: Ofuscar o nome de dominio
       obfuscate_hint: Ofuscar parcialmente o nome do dominio na lista se está activada a publicación da lista de limitacións de dominio
       private_comment: Comentario privado
@@ -422,34 +409,41 @@ gl:
       reject_media_hint: Eliminar ficheiros multimedia almacenados de xeito local e rexeita descargalos no futuro. Irrelevante para as suspensións
       reject_reports: Rexeitar denuncias
       reject_reports_hint: Ignorar todas as denuncias procedentes deste dominio. Irrelevante para as suspensións
-      rejecting_media: rexeitando ficheiros multimedia
-      rejecting_reports: rexeitando denuncias
-      severity:
-        silence: silenciado
-        suspend: suspendido
-      show:
-        affected_accounts:
-          one: Unha conta na base de datos afectada
-          other: "%{count} contas na base de datos afectadas"
-        retroactive:
-          silence: Deixar de silenciar todas as contas existentes deste dominio
-          suspend: Desbotar suspenso de todas as contas existentes deste dominio
-        title: Desfacer o bloqueo de dominio para %{domain}
-        undo: Desfacer
       undo: Desfacer bloqueo de dominio
       view: Ollar dominios bloqueados
     email_domain_blocks:
       add_new: Engadir novo
+      attempts_over_week:
+        one: "%{count} intento na última semana"
+        other: "%{count} intentos de conexión na última semana"
       created_msg: Engadiuse de xeito correcto o dominio de email á listaxe negra
       delete: Eliminar
-      destroyed_msg: Eliminouse de xeito correcto o dominio de email da listaxe negra
+      dns:
+        types:
+          mx: Rexistro MX
       domain: Dominio
-      empty: Actualmente non hai dominios de email na listaxe negra.
-      from_html: desde %{domain}
       new:
         create: Engadir dominio
+        resolve: Resolver dominio
         title: Nova entrada na listaxe negra de email
+      no_email_domain_block_selected: Non se cambiou ningún bloqueo de dominio de email porque non se seleccionou ningún
+      resolved_dns_records_hint_html: O nome de dominio resolve os seguintes rexistros MX, que son os últimos responsables da aceptación de emails. Bloqueando un dominio MX rexeitarás calquera enderezo de email que use este dominio MX, incluso se o nome de dominio visible é outro. <strong>Ten coidado de non bloquear os principais provedores.</strong>
+      resolved_through_html: Resolto a través de %{domain}
       title: Listaxe negra de email
+    export_domain_allows:
+      new:
+        title: Importar dominios permitidos
+      no_file: Ningún ficheiro seleccionado
+    export_domain_blocks:
+      import:
+        description_html: Vas importar unha lista de dominios a bloquear. Comproba a lista con atención, especialmente se non creaches ti mesma a lista.
+        existing_relationships_warning: Relacións de seguimento existentes
+        private_comment_description_html: 'Para axudarche a lembrar de onde veñen os bloqueos importados, imos crealos engadindo o seguinte comentario privado: <q>%{comment}</q>'
+        private_comment_template: Importada desde %{source} o %{date}
+        title: Importar bloqueos de dominio
+      new:
+        title: Importar bloqueos de dominio
+      no_file: Ningún ficheiro seleccionado
     follow_recommendations:
       description_html: "<strong>As recomendacións de seguimento son útiles para que as novas usuarias atopen contidos interesantes</strong>. Cando unha usuaria aínda non interactuou con outras para obter recomendacións de seguimento, estas contas serán recomendadas. Variarán a diario xa que se escollen en base ao maior número de interaccións e ao contador local de seguimentos para un idioma dado."
       language: Para o idioma
@@ -459,25 +453,53 @@ gl:
       title: Recomendacións de seguimento
       unsuppress: Restablecer recomendación de seguimento
     instances:
+      availability:
+        description_html:
+          one: Se fallan as entregas ao dominio por <strong>%{count} día</strong>, non se farán máis intentos a menos que se reciba unha solicitude <em>desde</em> ese dominio.
+          other: Se fallan as entregas ao dominio por <strong>%{count} días diferentes</strong>, non se farán máis intentos a menos que se reciba unha solicitude <em>desde</em> ese dominio.
+        failure_threshold_reached: Acadouse o límite de fallos o %{date}.
+        failures_recorded:
+          one: Intento fallido durante %{count} día.
+          other: Intentos fallidos durante %{count} días distintos.
+        no_failures_recorded: Non hai fallos rexistrados.
+        title: Dispoñibilidade
+        warning: Fallou o último intento de conectar con este servidor
       back_to_all: Todo
       back_to_limited: Limitado
       back_to_warning: Aviso
       by_domain: Dominio
+      confirm_purge: Tes a certeza de querer eliminar permanentemente os datos deste dominio?
+      content_policies:
+        comment: Nota interna
+        description_html: Podes definir políticas acerca do contido que serán aplicadas a tódalas contas deste dominio e tódolos seus subdominios.
+        policies:
+          reject_media: Rexeitar multimedia
+          reject_reports: Rexeitar denuncias
+          silence: Límitar
+          suspend: Suspender
+        policy: Criterios
+        reason: Razón pública
+        title: Políticas sobre o contido
+      dashboard:
+        instance_accounts_dimension: Contas máis seguidas
+        instance_accounts_measure: contas gardadas
+        instance_followers_measure: as nosas seguidoras alí
+        instance_follows_measure: as súas seguidoras aquí
+        instance_languages_dimension: Top de idiomas
+        instance_media_attachments_measure: anexos multimedia gardados
+        instance_reports_measure: denuncias acerca deles
+        instance_statuses_measure: publicacións gardadas
       delivery:
         all: Todo
         clear: Eliminar erros na entrega
+        failing: Con fallos
         restart: Restablecer a entrega
         stop: Deter a entrega
-        title: Entrega
         unavailable: Non dispoñible
-        unavailable_message: Entrega non dispoñible
-        warning: Aviso
-        warning_message:
-          one: Fallou a entrega %{count} día
-          other: Fallou a entrega %{count} días
       delivery_available: Entrega dispoñíbel
       delivery_error_days: Días de fallo na entrega
       delivery_error_hint: Se non é posible a entrega durante %{count} días, será automáticamente marcado como non entregable.
+      destroyed_msg: Os datos desde %{domain} están na cola para o borrado inminente.
       empty: Non se atopan dominios.
       known_accounts:
         one: "%{count} conta coñecida"
@@ -488,12 +510,15 @@ gl:
         title: Moderación
       private_comment: Comentario privado
       public_comment: Comentario público
+      purge: Purgar
+      purge_description_html: Se cres que este dominio está desconectado por unha boa razón, podes borrar tódolos rexistros e datos asociados a este dominio na túa almacenaxe. Vainos levar un anaco.
       title: Federación
       total_blocked_by_us: Bloqueado por nós
       total_followed_by_them: Seguidos por eles
       total_followed_by_us: Seguidos por nós
       total_reported: Denuncias sobre eles
       total_storage: Adxuntos multimedia
+      totals_time_period_hint_html: Os totais aquí mostrados inclúen todo o historial de datos.
     invites:
       deactivate_all: Desactivar todo
       filter:
@@ -517,14 +542,12 @@ gl:
         title: Crear nova regra IP
       no_ip_block_selected: Non se cambiou ningunha regra iP porque non seleccionaches ningunha
       title: Regras IP
-    pending_accounts:
-      title: Contas pendentes (%{count})
     relationships:
       title: Relacións de %{acct}
     relays:
       add_new: Engadir un novo repetidor
       delete: Eliminar
-      description_html: Un <strong>repetidor da federación</strong> é un servidor intermedio que intercambia grandes volumes de publicacións públicas entre servidores que se suscriban e publiquen nel. <strong>Pode axudar a servidores pequenos e medios a descubrir contido no fediverso</strong>, o que de outro xeito precisaría que as usuarias locais seguisen a outra xente en servidores remotos.
+      description_html: Un <strong>repetidor da federación</strong> é un servidor intermedio que intercambia grandes volumes de publicacións públicas entre servidores que se suscriban e publiquen nel. <strong>Pode axudar a servidores pequenos e medios a descubrir contido no fediverso</strong>, o que doutro xeito precisaría que as usuarias locais seguisen a outra xente en servidores remotos.
       disable: Desactivar
       disabled: Desactivado
       enable: Activar
@@ -545,39 +568,121 @@ gl:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} denuncia"
-          other: "%{count} denuncias"
+      action_log: Rexistro de auditoría
       action_taken_by: Acción tomada por
-      are_you_sure: Estás seguro?
+      actions:
+        delete_description_html: As publicacións denunciadas van ser eliminadas e gárdase un aviso para axudarche a xestionar futuras infraccións desta conta.
+        mark_as_sensitive_description_html: Os multimedia das publicacións denunciadas serán marcados como sensibles e engadirase un aviso para axudarche a xestionar futuras infraccións da mesma conta.
+        other_description_html: Mira máis opcións para controlar o comportamento da conta e personalizar as comunicacións coa conta denunciada.
+        resolve_description_html: Non se van tomar accións contra a conta denunciada, nin se gardarán avisos, e pecharase a denuncia.
+        silence_description_html: O perfil será visible só para quen xa o está a seguir ou quen o buscou manualmente, limitando moito o seu alcance. Pódese cambiar.
+        suspend_description_html: O perfil e tódolos seus contidos será inaccesbles e finalmente eliminados. A interacción coa conta non será posible. Reversible durante 30 días.
+      actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
+      add_to_report: Engadir máis á denuncia
+      are_you_sure: Tes certeza?
       assign_to_self: Asignarme
       assigned: Moderador asignado
+      by_target_domain: Dominio da conta denunciada
+      category: Categoría
+      category_description_html: A razón para denunciar esta conta ou contido será citada na comunicación coa conta denunciada
       comment:
         none: Ningún
+      comment_description_html: 'Como información engadida, %{name} escribiu:'
       created_at: Denunciado
+      delete_and_resolve: Eliminar publicacións
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como non resolto
+      no_one_assigned: Ninguén
       notes:
         create: Engadir nota
         create_and_resolve: Resolver cunha nota
         create_and_unresolve: Reabrir cunha nota
         delete: Eliminar
         placeholder: Describir que accións foron tomadas ou calquera outra novidade sobre esta denuncia...
+        title: Notas
+      notes_description_html: Ver e deixar unha nota para ti no futuro e outras moderadoras
+      quick_actions_description_html: 'Toma unha acción rápida ou desprázate abaixo para ver o contido denunciado:'
+      remote_user_placeholder: a usuaria remota desde %{instance}
       reopen: Reabrir denuncia
       report: 'Denuncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciado por
       resolved: Resolto
       resolved_msg: Resolveuse con éxito a denuncia!
+      skip_to_actions: Ir a accións
       status: Estado
-      target_domain: Dominio da conta denunciada
+      statuses: Contido denunciado
+      statuses_description_html: O contido ofensivo será citado na comunicación coa conta denunciada
       target_origin: Orixe da conta denunciada
       title: Denuncias
       unassign: Non asignar
       unresolved: Non resolto
       updated_at: Actualizado
+      view_profile: Ver perfil
+    roles:
+      add_new: Engadir rol
+      assigned_users:
+        one: "%{count} usuaria"
+        other: "%{count} usuarias"
+      categories:
+        administration: Administración
+        devops: DevOps
+        invites: Convites
+        moderation: Moderación
+        special: Especial
+      delete: Eliminar
+      description_html: Cos <strong>roles das usuarias</strong> podes personalizar as funcións e áreas de Mastodon ás que as usuarias poden acceder.
+      edit: Editar rol '%{name}'
+      everyone: Permisos por defecto
+      everyone_full_description_html: Este é o <strong>rol básico</strong> que afecta a <strong>tódalas usuarias</strong>, incluso aquelas sen un rol asignado. Tódolos outros roles herdan os seus permisos.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administradora
+        administrator_description: As usuarias con este permiso poderán superar calquera restrición
+        delete_user_data: Eliminar datos de usuarias
+        delete_user_data_description: Permite eliminar datos doutras usuarias sen demoras
+        invite_users: Convidar usuarias
+        invite_users_description: Permite que outras usuarias conviden a xente ao servidor
+        manage_announcements: Xestionar anuncios
+        manage_announcements_description: Permite que xestionen os anuncios publicados no servidor
+        manage_appeals: Xestionar recursos
+        manage_appeals_description: Permite revisar as apelacións contra as accións de moderación
+        manage_blocks: Xestionar bloqueos
+        manage_blocks_description: Permite bloquear provedores de email e enderezos IP
+        manage_custom_emojis: Xestionar Emojis personalizados
+        manage_custom_emojis_description: Permite xestionar os emojis personalizados do servidor
+        manage_federation: Xestionar a federación
+        manage_federation_description: Permite bloquear ou permitir a federación con outros dominios, e controlar as entregas
+        manage_invites: Xestionar Convites
+        manage_invites_description: Permite ver e desactivar ligazóns de convite
+        manage_reports: Xestionar Denuncias
+        manage_reports_description: Permite revisar as denuncias e realizar accións de moderación sobre elas
+        manage_roles: Xestionar Roles
+        manage_roles_description: Permite xestionar e asignar roles a niveis inferiores
+        manage_rules: Xestionar Regras
+        manage_rules_description: Permite cambiar as regras do servidor
+        manage_settings: Xestionar Axustes
+        manage_settings_description: Permite cambiar os axustes do sitio web
+        manage_taxonomies: Xestionar Taxonomías
+        manage_taxonomies_description: Permite revisar o contido en voga e actualizar os axustes dos cancelos
+        manage_user_access: Xestionar Acceso das usuarias
+        manage_user_access_description: Permite desactivar o segundo factor de autenticación doutras usuarias, cambiar o enderezo de email e restablecer o contrasinal
+        manage_users: Xestionar Usuarias
+        manage_users_description: Permite ver os detalles doutras usuarias e realizar accións de moderación sobre elas
+        manage_webhooks: Xestionar Webhooks
+        manage_webhooks_description: Permite establecer webhooks para eventos administrativos
+        view_audit_log: Ver Rexistro de auditoría
+        view_audit_log_description: Permite ver o historial de accións administrativas no servidor
+        view_dashboard: Ver Taboleiro
+        view_dashboard_description: Permite acceder ao taboleiro e varias métricas do servidor
+        view_devops: DevOps
+        view_devops_description: Permite acceder aos taboleiros Sidekiq e phHero
+      title: Roles
     rules:
       add_new: Engadir regra
       delete: Eliminar
@@ -586,152 +691,219 @@ gl:
       empty: Aínda non se definiron as regras do servidor.
       title: Regras do servidor
     settings:
-      activity_api_enabled:
-        desc_html: Conta de estados publicados de xeito local, usuarias activas, e novos rexistros en períodos semanais
-        title: Publicar na API estatísticas acumuladas sobre a actividade da usuaria
-      bootstrap_timeline_accounts:
-        desc_html: Separar os múltiples nomes de usuaria con vírgulas. Estas contas teñen garantido aparecer nas recomendacións de seguimento
-        title: Recoméndalle estas contas ás novas usuarias
-      contact_information:
-        email: Email de negocios
-        username: Nome de usuaria de contacto
-      custom_css:
-        desc_html: Modificar a aparencia con CSS cargado en cada páxina
-        title: CSS personalizado
+      about:
+        manage_rules: Xestionar regras do servidor
+        preamble: Proporciona información detallada acerca do xeito en que se xestiona, modera e financia o servidor.
+        rules_hint: Hai un espazo dedicado para as normas que é de agardar as usuarias acaten.
+        title: Acerca de
+      appearance:
+        preamble: Personalizar a interface web de Mastodon.
+        title: Aparencia
+      branding:
+        preamble: A personalización do teu servidor diferénciao doutros servidores da rede. A información podería mostrarse en diversos entornos, como a interface web de Mastodon, aplicacións nativas, vista previa das ligazóns noutras webs e apps de mensaxería, e similares. Debido a isto é recomendable que a información sexa clara, curta e concisa.
+        title: Personalización
+      content_retention:
+        preamble: Controla como se gardan en Mastodon os contidos creados polas usuarias.
+        title: Retención do contido
       default_noindex:
-        desc_html: Aféctalle a todas as usuarias que non cambiaron os axustes elas mesmas
+        desc_html: Aféctalle a tódalas usuarias que non cambiaron este axuste elas mesmas
         title: Por omisión exclúe as usuarias do indexado por servidores de busca
+      discovery:
+        follow_recommendations: Recomendacións de seguimento
+        preamble: Destacar contido interesante é importante para axudar a que as novas usuarias se sintan cómodas se non coñecen a ninguén en Mastodon. Xestiona os diferentes xeitos de promocionar contidos.
+        profile_directory: Directorio de perfís
+        public_timelines: Cronoloxías públicas
+        title: Descubrir
+        trends: Tendencias
       domain_blocks:
         all: Para todos
         disabled: Para ninguén
-        title: Amosar dominios bloqueados
         users: Para usuarias locais conectadas
-      domain_blocks_rationale:
-        title: Amosar motivo
-      hero:
-        desc_html: Amosado na páxina principal. Polo menos 600x100px recomendados. Se non está definido, estará por defecto a miniatura do servidor
-        title: Imaxe do heroe
-      mascot:
-        desc_html: Amosado en varias páxinas. Polo menos 293x205px recomendados. Se non está definido, estará a mascota por defecto
-        title: Imaxe da mascota
-      peers_api_enabled:
-        desc_html: Nomes de dominio que este servidor atopou no fediverso
-        title: Publicar na API listaxe de servidores descobertos
-      preview_sensitive_media:
-        desc_html: A vista previa de ligazóns de outros sitios web mostrará unha imaxe incluso si os medios están marcados como sensibles
-        title: Mostrar medios sensibles con vista previa OpenGraph
-      profile_directory:
-        desc_html: Permitir que as usuarias poidan ser descubertas
-        title: Activar o directorio de perfil
       registrations:
-        closed_message:
-          desc_html: Mostrado na páxina de portada cando o rexistro está pechado. Pode utilizar cancelos HTML
-          title: Mensaxe de rexistro pechado
-        deletion:
-          desc_html: Permitirlle a calquera que elimine a súa conta
-          title: Abrir o borrado da conta
-        min_invite_role:
-          disabled: Ninguén
-          title: Permitir convites por
-        require_invite_text:
-          desc_html: Cando os rexistros requiren aprobación manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
-          title: Require que as novas usuarias completen solicitude de texto do convite
+        preamble: Xestiona quen pode crear unha conta no teu servidor.
+        title: Rexistros
       registrations_mode:
         modes:
           approved: Precisa aprobación para rexistrarse
           none: Rexistro pechado
           open: Rexistro aberto
-        title: Estado do rexistro
-      show_known_fediverse_at_about_page:
-        desc_html: Si activado, mostraralle os toots de todo o fediverso coñecido nunha vista previa. Si non só mostrará os toots locais.
-        title: Incluír contido federado na páxina da cronoloxía pública sen autenticación
-      show_staff_badge:
-        desc_html: Mostrar unha insignia de membresía nunha páxina de usuaria
-        title: Mostrar insigna de membresía
-      site_description:
-        desc_html: Parágrafo de presentación na páxina principal. Describe o que fai especial a este servidor Mastodon e calquera outra ouca importante. Pode utilizar cancelos HTML, en particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descrición do servidor
-      site_description_extended:
-        desc_html: Un bo lugar para o teu código de conduta, regras, guías e outras cousas para diferenciar o teu servidor. Podes empregar cancelos HTML
-        title: Información extendida da personalización
-      site_short_description:
-        desc_html: Amosado na barra lateral e nos cancelos meta. Describe o que é Mastodon e que fai especial a este servidor nun só parágrafo. Se está baleiro, amosará a descrición do servidor.
-        title: Descrición curta do servidor
-      site_terms:
-        desc_html: Podes escribir a túa propia política de privacidade, termos de servizo ou aclaracións legais. Podes empregar cancelos HTML
-        title: Termos de servizo personalizados
-      site_title: Nome do servidor
-      thumbnail:
-        desc_html: Utilizado para vistas previsas vía OpenGraph e API. Recoméndase 1200x630px
-        title: Icona do servidor
-      timeline_preview:
-        desc_html: Mostrar ligazón á cronoloxía pública na páxina de benvida e permitir o acceso API á cronoloxía pública sen ter autenticación
-        title: Permitir acceso á cronoloxía pública sen autenticación
-      title: Axustes do sitio
-      trendable_by_default:
-        desc_html: Afecta ós cancelos que non foron rexeitados de xeito previo
-        title: Permite ós cancelos ser tendencia sen revisión previa
-      trends:
-        desc_html: Amosar de xeito público cancelos revisados previamente que actualmente son tendencia
-        title: Cancelos en tendencia
+      title: Axustes do servidor
     site_uploads:
       delete: Eliminar o ficheiro subido
       destroyed_msg: Eliminado correctamente o subido!
     statuses:
+      account: Autoría
+      application: Aplicación
       back_to_account: Volver a páxina da conta
+      back_to_report: Volver a denuncias
       batch:
-        delete: Eliminar
-        nsfw_off: Marcar como non sensible
-        nsfw_on: Marcar como sensible
+        remove_from_report: Eliminar da denuncia
+        report: Denuncia
       deleted: Eliminado
-      failed_to_execute: Fallou a execución
+      favourites: Favoritas
+      history: Historial de versións
+      in_reply_to: En resposta a
+      language: Idioma
       media:
         title: Medios
-      no_media: Sen medios
+      metadata: Metadatos
       no_status_selected: Non se cambiou ningunha publicación xa que ningunha foi seleccionada
+      open: Abrir publicación
+      original_status: Publicación orixinal
+      reblogs: Promocións
+      status_changed: Publicación editada
       title: Publicacións da conta
+      trending: Tendencia
+      visibility: Visibilidade
       with_media: con medios
+    strikes:
+      actions:
+        delete_statuses: "%{name} eliminou as publicacións de %{target}"
+        disable: "%{name} pausou a conta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcou as publicacións de %{target} como sensibles"
+        none: "%{name} envioulle un aviso a %{target}"
+        sensitive: "%{name} marcou a conta de %{target} como sensible"
+        silence: "%{name} limitou a conta de %{target}"
+        suspend: "%{name} suspendeu a conta de %{target}"
+      appeal_approved: Recurrida
+      appeal_pending: Apelación pendente
     system_checks:
       database_schema_check:
         message_html: Existen migracións pendentes na base de datos. Bota man desta tarefa para facer que a aplicación funcione como se agarda dela
+      elasticsearch_running_check:
+        message_html: Non se puido conectar con Elasticsearch. Comproba que está funcionando, ou desactiva a busca por texto completo
+      elasticsearch_version_check:
+        message_html: 'Versión incompatible de Elasticsearch: %{value}'
+        version_comparison: Está executándose Elasticsearch %{running_version} pero requírese a %{required_version}
       rules_check:
         action: Xestionar regras do servidor
         message_html: Non tes definidas regras para o servidor.
       sidekiq_process_check:
         message_html: Non hai procesos Sidekiq a funcionar para a cola(s) %{value}. Revisa a túa configuración para Sidekiq
     tags:
-      accounts_today: Usos únicos hoxe
-      accounts_week: Usos únicos esta semana
-      breakdown: Consumo do uso diario por fonte
-      last_active: Úlimo activo
-      most_popular: Máis popular
-      most_recent: Máis recente
-      name: Cancelo
       review: Estado de revisión
-      reviewed: Revisado
-      title: Cancelos
-      trending_right_now: Agora como Tendencia
-      unique_uses_today: "%{count} publicando hoxe"
-      unreviewed: Sen revisar
       updated_msg: Actualizaronse os axustes dos cancelos
     title: Administración
+    trends:
+      allow: Permitir
+      approved: Aprobadas
+      disallow: Denegar
+      links:
+        allow: Permitir ligazón
+        allow_provider: Permitir orixe
+        description_html: Estas son ligazóns que actualmente están sendo compartidas por moitas contas das que o teu servidor recibe publicación. Pode ser de utilidade para as túas usuarias para saber o que acontece polo mundo. Non se mostran ligazóns de xeito público a non ser que autorices a quen as publica. Tamén podes permitir ou rexeitar ligazóns de xeito individual.
+        disallow: Denegar ligazón
+        disallow_provider: Denegar orixe
+        no_link_selected: Non se cambiou ningunha ligazón xa que non había ningunha seleccionada
+        publishers:
+          no_publisher_selected: Non se cambiou ningún autor xa que ningún foi seleccionado
+        shared_by_over_week:
+          one: Compartido por unha persoa na última semana
+          other: Compartido por %{count} persoas na última semana
+        title: Ligazóns en voga
+        usage_comparison: Compartido %{today} veces hoxe, comparado con %{yesterday} onte
+      only_allowed: Só as permitidas
+      pending_review: Revisión pendente
+      preview_card_providers:
+        allowed: As ligazóns desta orixe poden estar en voga
+        description_html: Estes son dominios de onde proceden as ligazóns compartidas con frecuencia no teu servidor. As ligazóns non se mostran públicamente a non ser que o dominio da ligazón sexa aprobado. A aprobación (ou rexeitamento) exténdese aos subdominios.
+        rejected: As ligazóns desta orixe non poden estar en voga
+        title: Orixes
+      rejected: Rexeitado
+      statuses:
+        allow: Permitir publicación
+        allow_account: Permitir autora
+        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
+        disallow: Rexeitar publicación
+        disallow_account: Rexeitar autora
+        no_status_selected: Non se cambiou ningunha publicación en voga xa que non había ningunha seleccionada
+        not_discoverable: A autora non elexiu poder ser atopada
+        shared_by:
+          one: Compartida ou favorecida unha vez
+          other: Compartida ou favorecida %{friendly_count} veces
+        title: Publicacións en voga
+      tags:
+        current_score: Puntuación actual %{score}
+        dashboard:
+          tag_accounts_measure: usos únicos
+          tag_languages_dimension: Clasificiación idiomas
+          tag_servers_dimension: Clasificación Servidores
+          tag_servers_measure: diferentes servidores
+          tag_uses_measure: total de usos
+        description_html: Estes son cancelos que actualmente están presentes en moitas publicacións que o teu servidor recibe. Pode ser útil para que as túas usuarias atopen a outras persoas a través do máis comentado neste intre. Non se mostran cancelos públicamente que non fosen aprobados por ti.
+        listable: Pode ser suxerida
+        no_tag_selected: Non se cambiaron cancelos porque ningún foi seleccionado
+        not_listable: Non vai ser suxerida
+        not_trendable: Non aparecerá en tendencias
+        not_usable: Non pode ser usado
+        peaked_on_and_decaying: Máximo en %{date}, agora diminúe
+        title: Cancelos en voga
+        trendable: Pode aparecer nas tendencias
+        trending_rank: 'En voga #%{rank}'
+        usable: Pode ser usado
+        usage_comparison: Utilizado %{today} veces hoxe, comparado coas %{yesterday} de onte
+        used_by_over_week:
+          one: Utilizado por unha persoa na última semana
+          other: Utilizado por %{count} persoas na última semana
+      title: Tendencias
+      trending: Tendencias
     warning_presets:
       add_new: Engadir novo
       delete: Eliminar
       edit_preset: Editar aviso preestablecido
       empty: Non definiches os avisos prestablecidos.
       title: Xestionar avisos preestablecidos
+    webhooks:
+      add_new: Engadir punto de extremo
+      delete: Eliminar
+      description_html: Un <strong>webhook</strong> permítelle a Mastodon enviar <strong>notificacións en tempo real</strong> á túa aplicación acerca dos eventos elexidos e así, a aplicación <strong>activará automáticamente</strong> a súa programación.
+      disable: Desactivar
+      disabled: Desactivado
+      edit: Editar extremo
+      empty: Non tes configurado ningún punto extremo para o webhook.
+      enable: Activar
+      enabled: Activo
+      enabled_events:
+        one: 1 evento activado
+        other: "%{count} eventos activados"
+      events: Eventos
+      new: Novo webhook
+      rotate_secret: Rotar segredo
+      secret: Segredo de acceso
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: borrar as súas publicacións
+        disable: pausar a súa conta
+        mark_statuses_as_sensitive: marcar as súas publicacións como sensibles
+        none: un aviso
+        sensitive: marcar a conta como sensible
+        silence: limitar a súa conta
+        suspend: suspender a súa conta
+      body: "%{target} apelou a decisión de moderación de %{action_taken_by} o %{date}, de tipo %{type}. Escribiu:"
+      next_steps: Podes aprobar o recurso e desfacer a decisión de moderación, ou ignoralo.
+      subject: "%{username} fixo unha apelación á decisión de moderación en %{instance}"
     new_pending_account:
       body: Abaixo están os detalles da conta. Podes aprobar ou rexeitar esta solicitude.
       subject: Hai unha conta nova para revisar en %{instance} (%{username})
     new_report:
       body: "%{reporter} informou sobre %{target}"
       body_remote: Alguén desde %{domain} informou sobre %{target}
-      subject: Novo informe sobre %{instance} (#%{id})
-    new_trending_tag:
-      body: 'O cancelo #%{name} é tendencia hoxe, pero non foi previamente revisada. Non se amosará de xeito público a menos que ti o permitas, ou gardes o formulario para facer que non se che consulte de novo.'
-      subject: Un novo cancelo que revisar en %{instance} (#%{name})
+      subject: Nova denuncia sobre %{instance} (#%{id})
+    new_trends:
+      body: 'Os seguintes elementos precisan revisión antes de ser mostrados públicamente:'
+      new_trending_links:
+        title: Ligazóns en voga
+      new_trending_statuses:
+        title: Publicacións en voga
+      new_trending_tags:
+        no_approved_tags: Non hai etiquetas en voga aprobadas.
+        requirements: 'Calquera destos candidatos podería superar o #%{rank} dos cancelos en voga aprobados, que actualmente é #%{lowest_tag_name} cunha puntuación de %{lowest_tag_score}.'
+        title: Cancelos en voga
+      subject: Novas tendencias para revisar en %{instance}
   aliases:
     add_new: Crear alcume
     created_msg: Creou un novo alcume correctamente. Pode iniciar o movemento desde a conta antiga.
@@ -741,7 +913,7 @@ gl:
     remove: Desligar alcume
   appearance:
     advanced_web_interface: Interface web avanzada
-    advanced_web_interface_hint: Se queres empregar todo o ancho da túa pantalla, a interface web avanzada permíteche configurar diferentes columnas para ver tanta información como desexe. Inicio, notificacións, cronoloxía federada, calquera número de listaxes e cancelos.
+    advanced_web_interface_hint: Se queres empregar todo o ancho da pantalla, a interface web avanzada permíteche configurar diferentes columnas para ver tanta información como queiras. Inicio, notificacións, cronoloxía federada, varias listaxes e cancelos.
     animations_and_accessibility: Animacións e accesibilidade
     confirmation_dialogs: Diálogos de confirmación
     discovery: Descubrir
@@ -752,7 +924,7 @@ gl:
     sensitive_content: Contido sensible
     toot_layout: Disposición da publicación
   application_mailer:
-    notification_preferences: Cambiar os axustes de correo-e
+    notification_preferences: Cambiar os axustes de email
     salutation: "%{name},"
     settings: 'Mudar as preferencias de e-mail: %{link}'
     view: 'Vista:'
@@ -761,61 +933,69 @@ gl:
   applications:
     created: Creouse con éxito este aplicativo
     destroyed: Eliminouse con éxito o aplicativo
-    invalid_url: A URL proporcionada non é válida
     regenerate_token: Votar a xenerar o testemuño de acceso
     token_regenerated: Rexenerouse con éxito o testemuño de acceso
     warning: Ten moito tino con estos datos. Non os compartas nunca con ninguén!
     your_token: O seu testemuño de acceso
   auth:
-    apply_for_account: Solicite un convite
+    apply_for_account: Solicita unha conta
     change_password: Contrasinal
-    checkbox_agreement_html: Acepto as <a href="%{rules_path}" target="_blank">regras do servidor</a> e os <a href="%{terms_path}" target="_blank">termos do servizo</a>
-    checkbox_agreement_without_rules_html: Acepto os <a href="%{terms_path}" target="_blank">termos do servizo</a>
     delete_account: Eliminar conta
     delete_account_html: Se queres eliminar a túa conta, podes <a href="%{path}">facelo aquí</a>. Deberás confirmar a acción.
     description:
       prefix_invited_by_user: "@%{name} convídate a que te unas a este servidor Mastodon!"
       prefix_sign_up: Rexístrate agora en Mastodon!
       suffix: Ao abrir unha conta, poderás seguir a xente, actualizacións das publicacións e intercambiar mensaxes coas usuarias de calquera servidor de Mastodon e moito máis!
-    didnt_get_confirmation: Non recibeu as instruccións de confirmación?
+    didnt_get_confirmation: Non recibiches as instruccións de confirmación?
     dont_have_your_security_key: "¿Non tes a túa chave de seguridade?"
-    forgot_password: Esqueceu o contrasinal?
-    invalid_reset_password_token: O testemuño para restablecer o contrasinal non é válido ou caducou. Por favor solicite un novo.
+    forgot_password: Non lembras o contrasinal?
+    invalid_reset_password_token: O token para restablecer o contrasinal non é válido ou caducou. Por favor solicita un novo.
     link_to_otp: Escribe o código do segundo factor do móbil ou un código de recuperación
     link_to_webauth: Usa o teu dispositivo de chave de seguridade
-    login: Conectar
-    logout: Desconectar
+    log_in_with: Accede con
+    login: Acceder
+    logout: Pechar sesión
     migrate_account: Mover a unha conta diferente
-    migrate_account_html: Se queres redirixir esta conta hacia outra diferente, pode <a href="%{path}">configuralo aquí</a>.
-    or_log_in_with: ou conectar con
+    migrate_account_html: Se queres redirixir esta conta hacia outra diferente, podes <a href="%{path}">facelo aquí</a>.
+    or_log_in_with: Ou accede con
+    privacy_policy_agreement_html: Lin e acepto a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     providers:
       cas: CAS
       saml: SAML
-    register: Rexistro
+    register: Crear conta
     registration_closed: "%{instance} non está a aceptar novas usuarias"
     resend_confirmation: Reenviar as intruccións de confirmación
     reset_password: Restablecer contrasinal
+    rules:
+      preamble: Son establecidas e aplicadas pola moderación de %{domain}.
+      title: Algunhas regras básicas.
     security: Seguranza
     set_new_password: Estabelecer novo contrasinal
     setup:
-      email_below_hint_html: Se o enderezo inferior non é correcto, pode cambialo aquí e recibir un correo de confirmación.
-      email_settings_hint_html: Enviouse un correo de confirmación a %{email}. Se o enderezo non é correcto pode cambialo nos axustes da conta.
+      email_below_hint_html: Se o enderezo inferior non é correcto, podes cambialo aquí e recibir un correo de confirmación.
+      email_settings_hint_html: Enviouse un correo de confirmación a %{email}. Se o enderezo non é correcto podes cambialo nos axustes da conta.
       title: Axustes
+    sign_in:
+      preamble_html: Accede coas túas credenciais en <strong>%{domain}</strong>. Se a túa conta está nun servidor diferente, non podes acceder desde aquí.
+      title: Accede a %{domain}
+    sign_up:
+      preamble: Cunha conta neste servidor Mastodon poderás seguir a calquera outra persoa na rede, independentemente de onde estivese hospedada esa conta.
+      title: Imos crear a túa conta en %{domain}.
     status:
       account_status: Estado da conta
       confirming: Agardando a confirmación do correo enviado.
-      functional: A súa conta está totalmente operativa.
-      pending: A túa aplicación está pendente de revisión. Poderíanos levar algún tempo. Recibirás un correo se a aplicación está aprobada.
+      functional: A túa conta está completamente operativa.
+      pending: A túa solicitude está pendente de revisión. Poderíanos levar algún tempo. Recibirás un correo se a solicitude está aprobada.
       redirecting_to: A túa conta está inactiva porque está redirixida a %{acct}.
+      view_strikes: Ver avisos anteriores respecto da túa conta
     too_fast: Formulario enviado demasiado rápido, inténtao outra vez.
-    trouble_logging_in: Problemas para conectar?
     use_security_key: Usa chave de seguridade
   authorize_follow:
     already_following: Xa está a seguir esta conta
     already_requested: Xa tes enviada unha solicitude de seguimento a esa conta
     error: Desgraciadamente, algo fallou ao buscar a conta remota
     follow: Seguir
-    follow_request: 'Enviou unha petición de seguimento a:'
+    follow_request: 'Enviaches unha petición de seguimento a:'
     following: 'Parabéns! Está a seguir a:'
     post_follow:
       close: Ou, pode pechar esta ventá.
@@ -866,10 +1046,36 @@ gl:
       more_details_html: Para máis detalles, mira a <a href="%{terms_path}">política de intimidade</a>.
       username_available: O nome de usuaria estará dispoñible novamente
       username_unavailable: O nome de usuaria non estará dispoñible
-  directories:
-    directory: Directorio de perfís
-    explanation: Descubre usuarias según o teu interese
-    explore_mastodon: Explorar %{title}
+  disputes:
+    strikes:
+      action_taken: Acción tomada
+      appeal: Apelar
+      appeal_approved: Esta acción foi recurrida e xa non é válida
+      appeal_rejected: O recurso foi rexeitado
+      appeal_submitted_at: Enviouse a apelación
+      appealed_msg: A túa apelación foi enviada. Se é aprobada recibirás unha notificación.
+      appeals:
+        submit: Enviar apelación
+      approve_appeal: Aprobar apelación
+      associated_report: Denuncia asociada
+      created_at: Data
+      description_html: Estas son as accións tomadas contra a túa conta e os avisos que che enviou a administración de %{instance}.
+      recipient: Entregada a
+      reject_appeal: Rexeitar apelación
+      status: 'Publicación #%{id}'
+      status_removed: A publicación xa foi eliminada do sistema
+      title: "%{action} o %{date}"
+      title_actions:
+        delete_statuses: Eliminación da publicación
+        disable: Pausar conta
+        mark_statuses_as_sensitive: Marcar as publicacións como sensibles
+        none: Aviso
+        sensitive: Marcar a conta como sensible
+        silence: Limitar a conta
+        suspend: Suspender a conta
+      your_appeal_approved: A apelación foi aprobada
+      your_appeal_pending: Enviaches unha apelación
+      your_appeal_rejected: A apelación foi rexeitada
   domain_validator:
     invalid_domain: non é un nome de dominio válido
   errors:
@@ -886,7 +1092,7 @@ gl:
       content: Sentímolo, pero algo do noso lado falloou.
       title: Esta páxina non é correcta
     '503': A páxina non se puido servir debido a un fallo temporal no servidor.
-    noscript_html: Para utilizar a aplicación web de Mastodon debe habilitar JavaScript. De xeito alternativo, intente unha das <a href="%{apps_path}">apps nativas</a> para Mastodon da súa plataforma.
+    noscript_html: Para utilizar a aplicación web de Mastodon debes activar JavaScript. De xeito alternativo, proba cunha das <a href="%{apps_path}">apps nativas</a> para Mastodon na túa plataforma.
   existing_username_validator:
     not_found: non se atopou unha usuaria local con ese alcume
     not_found_multiple: non se atopou a %{usernames}
@@ -894,16 +1100,16 @@ gl:
     archive_takeout:
       date: Data
       download: Descargue o seu ficheiro
-      hint_html: Pode solicitar un ficheiro coas <strong>súas publicacións e ficheiros de medios</strong>. Os datos estarán en formato ActivityPub e son compatibles con calquera software que o siga. Podes solicitar un ficheiro cada 7 días.
+      hint_html: Podes solicitar un ficheiro coas <strong>túas publicacións e ficheiros multimedia</strong>. Os datos estarán en formato ActivityPub e son compatibles con calquera software que o siga. Podes solicitar un ficheiro cada 7 días.
       in_progress: Xerando o seu ficheiro...
-      request: Solicite o ficheiro
+      request: Solicita o ficheiro
       size: Tamaño
-    blocks: Bloqueos
+    blocks: Bloqueadas
     bookmarks: Marcadores
     csv: CSV
     domain_blocks: Bloqueos de dominio
     lists: Listaxes
-    mutes: Silenciados
+    mutes: Silenciadas
     storage: Almacenamento de multimedia
   featured_tags:
     add_new: Engadir novo
@@ -918,64 +1124,77 @@ gl:
       public: Cronoloxías públicas
       thread: Conversas
     edit:
+      add_keyword: Engadir palabra chave
+      keywords: Palabras chave
+      statuses: Publicacións individuais
+      statuses_hint_html: O filtro aplícase para seleccionar publicacións individuais independentemente de se concorda coas palabras chave indicadas. <a href="%{path}">Revisa ou elimina publicacións do filtro</a>.
       title: Editar filtro
     errors:
+      deprecated_api_multiple_keywords: Estes parámetros non se poden cambiar desde esta aplicación porque son de aplicación a máis dun filtro de palabras chave. Usa unha aplicación máis recente ou a interface web.
       invalid_context: Non se proporcionou un contexto válido
-      invalid_irreversible: O filtrado non reversible só funciona con contexto de avisos ou Inicio
     index:
+      contexts: Filtros para %{contexts}
       delete: Eliminar
       empty: Non tes filtros.
+      expires_in: Caduca en %{distance}
+      expires_on: Caduca o %{date}
+      keywords:
+        one: "%{count} palabra chave"
+        other: "%{count} palabras chave"
+      statuses:
+        one: "%{count} publicación"
+        other: "%{count} publicacións"
+      statuses_long:
+        one: "%{count} publicación individual agochada"
+        other: "%{count} publicacións individuais agochadas"
       title: Filtros
     new:
+      save: Gardar o novo filtro
       title: Engadir novo filtro
+    statuses:
+      back_to_filter: Volver ao filtro
+      batch:
+        remove: Eliminar do filtro
+      index:
+        hint: Este filtro aplícase para seleccionar publicacións individuais independentemente doutros criterios. Podes engadir máis publicacións a este filtro desde a interface web.
+        title: Publicacións filtradas
   footer:
-    developers: Desenvolvedoras
-    more: Máis…
-    resources: Recursos
     trending_now: Tendencia agora
   generic:
     all: Todo
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento seleccionado nesta páxina."
+      other: Tódolos <strong>%{count}</strong> elementos desta páxina están seleccionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento coincidente coa busca está seleccionado."
+      other: Tódolos <strong>%{count}</strong> elementos coincidentes coa busca están seleccionados.
     changes_saved_msg: Cambios gardados correctamente!!
     copy: Copiar
     delete: Eliminar
-    no_batch_actions_available: Non hai accións en pila dispoñibles nesta páxina
+    deselect: Desmarcar todo
+    none: Ningún
     order_by: Ordenar por
     save_changes: Gardar cambios
+    select_all_matching_items:
+      one: Seleccionar %{count} elemento coincidente coa busca.
+      other: Seleccionar tódolos %{count} elementos coincidentes coa busca.
+    today: hoxe
     validation_errors:
       one: Algo non está ben de todo! Por favor revise abaixo o erro
       other: Algo aínda non está ben! Por favor revise os %{count} erros abaixo
   html_validator:
     invalid_markup: 'contén cancelos HTML non válidas: %{error}'
-  identity_proofs:
-    active: Activo
-    authorize: Si, autorizar
-    authorize_connection_prompt: Autorizar esta conexión criptográfica?
-    errors:
-      failed: Fallou a conexión criptográfica. Por favor inténteo de novo desde %{provider}.
-      keybase:
-        invalid_token: Os testemuños Keybase son hashes de firma e deben ter 66 caracteres hexadecimais
-        verification_failed: Keybase non recoñece este testemuño como firma da usuaria de Keybase %{kb_username}. Por favor inténteo desde Keybase.
-      wrong_user: Non se puido crear a proba para %{proving} mentras está conectada como %{current}. Conéctate como %{proving} e inténtao de novo.
-    explanation_html: Aquí podes conectar criptográficamente as tuas outras identidades, como a un perfil Keybase. Esto permítelle a outras persoas enviarche mensaxes cifradas e confiar no contido que ti lles envías.
-    i_am_html: Eu son %{username} en %{service}.
-    identity: Identidade
-    inactive: Inactiva
-    publicize_checkbox: 'E tootee esto:'
-    publicize_toot: 'Comprobado! Eu son %{username} en %{service}: %{url}'
-    remove: Quitar a verificación da conta
-    removed: Quitaches correctamente a verificación da conta
-    status: Estado da validación
-    view_proof: Ver proba
   imports:
     errors:
+      invalid_csv_file: 'Ficheiro CSV non válido. Erro: %{error}'
       over_rows_processing_limit: contén máis de %{count} filas
     modes:
       merge: Fusionar
       merge_long: Manter os rexistros actuais e engadir novos
       overwrite: Sobreescribir
       overwrite_long: Sustituír rexistros actuais cos novos
-    preface: Pode importar os datos que exportou de outro servidor, tales como a lista de usuarias que está a seguir ou bloquear.
-    success: Os seus datos foron correctamente subidos e serán procesados ao momento
+    preface: Podes importar os datos que exportaches doutro servidor, tales como a lista de usuarias que estás a seguir ou bloquear.
+    success: Os teus datos foron correctamente subidos e serán procesados ao momento
     types:
       blocking: Lista de bloqueo
       bookmarks: Marcadores
@@ -983,7 +1202,6 @@ gl:
       following: Lista de seguimento
       muting: Lista de usuarias acaladas
     upload: Subir
-  in_memoriam_html: Lembranzas.
   invites:
     delete: Desactivar
     expired: Caducou
@@ -1016,9 +1234,9 @@ gl:
       sign_in_token: código de seguridade por email
       webauthn: chaves de seguridade
     description_html: Se ves actividade que non recoñeces, considera cambiar o contrasinal e activar o segundo factor de autenticación.
-    empty: Sen historial de autenticación dispoñible
-    failed_sign_in_html: Intento de conexión errado con %{method} desde %{ip} (%{browser})
-    successful_sign_in_html: Conexión correcta con %{method} desde %{ip} (%{browser})
+    empty: Non hai historial de autenticación
+    failed_sign_in_html: Intento de acceso errado con %{method} desde %{ip} (%{browser})
+    successful_sign_in_html: Acceso correcto con %{method} desde %{ip} (%{browser})
     title: Historial de autenticación
   media_attachments:
     validations:
@@ -1039,7 +1257,7 @@ gl:
     followers_count: Seguidoras no momento da migración
     incoming_migrations: Movendo desde unha conta diferente
     incoming_migrations_html: Para migrar doutra conta cara esta, primeiro debes <a href="%{path}">crear un alcume da conta</a>.
-    moved_msg: A túa conta está redirixindo agora a %{acct} e os teus seguidores movéronse alí.
+    moved_msg: A túa conta foi redirixida a %{acct} e os teus seguimentos movéronse alí.
     not_redirecting: Neste momento a túa conta non está redirixindo cara a ningunha outra.
     on_cooldown: Migraches recentemente a conta. Esta función estará dispoñible de novo en %{count} días.
     past_migrations: Migracións pasadas
@@ -1062,18 +1280,14 @@ gl:
     carry_blocks_over_text: Esta usuaria chegou desde %{acct}, que ti tes bloqueada.
     carry_mutes_over_text: Esta usuaria chegou desde %{acct}, que ti tes acalada.
     copy_account_note_text: 'Esta usuaria chegou desde %{acct}, aquí están as túas notas previas acerca dela:'
+  navigation:
+    toggle_menu: Activa o menú
   notification_mailer:
-    digest:
-      action: Ver todas as notificacións
-      body: Aquí ten un breve resumo das mensaxes publicadas desde a súa última visita en %{since}
-      mention: "%{name} mencionouna en:"
-      new_followers_summary:
-        one: Ademáis, ten unha nova seguidora desde entón! Ben!
-        other: Ademáis, obtivo %{count} novas seguidoras desde entón! Tremendo!
-      subject:
-        one: "1 nova notificación desde a súa última visita \U0001F418"
-        other: "%{count} novas notificacións desde a súa última visita \U0001F418"
-      title: Na súa ausencia...
+    admin:
+      report:
+        subject: "%{name} enviou unha denuncia"
+      sign_up:
+        subject: "%{name} rexistrouse"
     favourite:
       body: 'A túa publicación foi marcada como favorita por %{name}:'
       subject: "%{name} marcou como favorita a túa publicación"
@@ -1088,8 +1302,8 @@ gl:
       subject: 'Seguidora pendente: %{name}'
       title: Nova petición de seguimento
     mention:
-      action: Respostar
-      body: 'Foi mencionada por %{name} en:'
+      action: Responder
+      body: "%{name} mencionoute en:"
       subject: Foches mencionada por %{name}
       title: Nova mención
     poll:
@@ -1100,6 +1314,8 @@ gl:
       title: Nova promoción
     status:
       subject: "%{name} publicou"
+    update:
+      subject: "%{name} editou unha publicación"
   notifications:
     email_events: Eventos para os correos de notificación
     email_events_hint: 'Escolle os eventos sobre os que queres recibir notificacións:'
@@ -1116,9 +1332,9 @@ gl:
           trillion: T
   otp_authentication:
     code_hint: Escribe o código creado pola app de autenticación para confirmar
-    description_html: Se activas a <strong>autenticación con dous factores</strong> utilizando unha app de autenticación, ó conectarte pedirémosche que teñas o móbil á man, para crear o código que precisas para conectarte.
+    description_html: Se activas a <strong>autenticación con dous factores</strong> utilizando unha app de autenticación, ao conectarte pedirémosche que teñas o móbil á man, para crear o código que precisas para acceder.
     enable: Activar
-    instructions_html: "<strong>Escanea este código QR na túa app TOTP no móbil ou Google Authenticator</strong>. A partir de agora, a app creará códigos que terás que escribir cando te conectes."
+    instructions_html: "<strong>Escanea este código QR na túa app TOTP ou tipo Google Authenticator no móbil</strong>. A partir de agora, a app creará códigos que terás que escribir cando entres."
     manual_instructions: 'Se non podes escanear o código QR e tes que escribilo á man, aquí tes o código en texto plano:'
     setup: Configurar
     wrong_code: O código escrito non é válido! ¿é correcta a hora no dispositivo e no servidor?
@@ -1143,6 +1359,8 @@ gl:
     other: Outro
     posting_defaults: Valores por omisión
     public_timelines: Cronoloxías públicas
+  privacy_policy:
+    title: Política de Privacidade
   reactions:
     errors:
       limit_reached: Acadouse o límite das diferentes reaccións
@@ -1152,7 +1370,7 @@ gl:
     dormant: En repouso
     follow_selected_followers: Seguir seguidoras seleccionadas
     followers: Seguidoras
-    following: Seguindo
+    following: A Seguir
     invited: Convidado
     last_active: Último activo
     most_recent: Máis recente
@@ -1162,25 +1380,18 @@ gl:
     relationship: Relación
     remove_selected_domains: Eliminar todas as seguidoras dos dominios escollidos
     remove_selected_followers: Eliminar as seguidoras escollidas
-    remove_selected_follows: Deixar de seguir as usuarias escollidas
+    remove_selected_follows: Deixar de seguir as usuarias elexidas
     status: Estado da conta
   remote_follow:
-    acct: Introduza o seu usuaria@servidor desde onde quere interactuar
     missing_resource: Non se puido atopar o URL de redirecionamento requerido para a súa conta
-    no_account_html: Non ten unha conta? Pode <a href='%{sign_up_path}' target='_blank'>rexistrarse aquí</a>
-    proceed: Proceda para seguir
-    prompt: 'Vas seguir a:'
-    reason_html: "<strong>Por que é necesario este paso?</strong><code>%{instance}</code> podería non ser o servidor onde se rexistrou, así que precisamo redirixila primeiro ao seu servidor de orixe."
-  remote_interaction:
-    favourite:
-      proceed: Darlle a favorito
-      prompt: 'Vas marcar favorita esta publicación:'
-    reblog:
-      proceed: Darlle a promocionar
-      prompt: 'Vas promover esta publicación:'
-    reply:
-      proceed: Respostar
-      prompt: 'Vas responder a esta publicación:'
+  reports:
+    errors:
+      invalid_rules: non fai referencia a regras válidas
+  rss:
+    content_warning: 'Aviso sobre o contido:'
+    descriptions:
+      account: Publicacións públicas de @%{acct}
+      tag: 'Publicacións públicas con #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Excedeches o límite de %{limit} publicacións programadas para ese día
     over_total_limit: Excedeches o límite de %{limit} publicacións programadas
@@ -1204,11 +1415,11 @@ gl:
       phantom_js: PhantomJS
       qq: Navegador QQ
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Navegador QQ
       weibo: Weibo
     current_session: Sesión actual
     description: "%{browser} en %{platform}"
-    explanation: Estos son os navegadores web nos que actualmente ten sesión aberta.
+    explanation: Estos son os navegadores web nos que actualmente tes sesión iniciada.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1239,7 +1450,6 @@ gl:
     edit_profile: Editar perfil
     export: Exportar datos
     featured_tags: Cancelos destacados
-    identity_proofs: Probas de identidade
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
@@ -1248,6 +1458,7 @@ gl:
     profile: Perfil
     relationships: Seguindo e seguidoras
     statuses_cleanup: Borrado automático da publicación
+    strikes: Avisos da moderación
     two_factor_authentication: Validar Dobre Factor
     webauthn_authentication: Chaves de seguridade
   statuses:
@@ -1264,18 +1475,19 @@ gl:
         other: "%{count} vídeos"
     boosted_from_html: Promovida desde %{acct_link}
     content_warning: 'Aviso sobre o contido: %{warning}'
+    default_language: Igual que o idioma da interface
     disallowed_hashtags:
       one: 'contiña un cancelo non permitido: %{tags}'
       other: 'contiña uns cancelos non permitidos: %{tags}'
+    edited_at_html: Editado %{date}
     errors:
-      in_reply_not_found: A publicación á que tentas respostar semella que non existe.
-    language_detection: Detección automática do idioma
+      in_reply_not_found: A publicación á que tentas responder semella que non existe.
     open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
     pin_errors:
+      direct: As publicacións que só son visibles para as usuarias mencionadas non se poden fixar
       limit: Xa fixaches o número máximo permitido de publicacións
       ownership: Non podes fixar a publicación doutra usuaria
-      private: As publicacións non-públicas non poden ser fixadas
       reblog: Non se poden fixar as mensaxes promovidas
     poll:
       total_people:
@@ -1289,7 +1501,7 @@ gl:
     show_newer: Mostrar o máis novo
     show_older: Mostrar o máis vello
     show_thread: Amosar fío
-    sign_in_to_participate: Conéctese para participar na conversa
+    sign_in_to_participate: Accede e participa na conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Directa
@@ -1303,11 +1515,11 @@ gl:
     enabled: Borrar automáticamente publicacións antigas
     enabled_hint: Borra automáticamente as túas publicacións unha vez acadan certa lonxevidade, a menos que cumpran algunha destas excepcións
     exceptions: Excepcións
-    explanation: Como o borrado de publicacións consume moitos recursos, este faise lentamente cando o servidor non ten moita carga de traballo. Así, a eliminación das túas publicacións podería ser lixeiramente posterior a cando lle correspondería por idade.
+    explanation: Como o borrado de publicacións consume moitos recursos, esta faise aos poucos cando o servidor non ten moita carga de traballo. Así, a eliminación das túas publicacións podería ser lixeiramente posterior a cando lle correspondería por idade.
     ignore_favs: Ignorar favoritas
     ignore_reblogs: Ignorar promocións
     interaction_exceptions: Excepcións baseadas en interaccións
-    interaction_exceptions_explanation: Ten en conta de que non hai garantía de que se eliminen as túas publicacións se non superan o límite de promocións e favoritos aínd que algunha vez o tivesen superado.
+    interaction_exceptions_explanation: Ten en conta de que non hai garantía de que se eliminen as túas publicacións se non superan o límite de promocións e favorecementos aínda que algunha vez o tivesen superado.
     keep_direct: Manter mensaxes directas
     keep_direct_hint: Non borrar ningunha das túas mensaxes directas
     keep_media: Manter publicacións que conteñen multimedia
@@ -1326,6 +1538,7 @@ gl:
       '2629746': 1 mes
       '31556952': 1 ano
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Límite temporal
@@ -1335,93 +1548,13 @@ gl:
     min_reblogs_hint: Non elimina ningunha das túas publicacións se foron promovidas máis deste número de veces. Deixa en branco para eliminar publicacións independentemente do seu número de promocións
   stream_entries:
     pinned: Publicación fixada
-    reblogged: promovido
+    reblogged: promoveu
     sensitive_content: Contido sensible
+  strikes:
+    errors:
+      too_late: É demasiado tarde para recurrir este aviso
   tags:
     does_not_match_previous_name: non concorda co nome anterior
-  terms:
-    body_html: |
-      <h2>Privacidade</h2>
-      <h3 id="collect">Qué información recollemos?</h3>
-
-      <ul>
-      <li><em>Información básica da conta</em>: Se se rexistra en este servidor, pediráselle un nome de usuaria, un enderezo de correo electrónico e un contrasinal. De xeito adicional tamén poderá introducir información como un nome público e biografía, tamén subir unha fotografía de perfil e unha imaxe para a cabeceira. O nome de usuaria, o nome público, a biografía e as imaxes de perfil e cabeceira sempre se mostran publicamente.</li>
-      <li><em>Publicacións, seguimento e outra información pública</em>: O listado das persoas que segue é un listado público, o mesmo acontece coas súas seguidoras. Cando evía unha mensaxe, a data e hora gárdanse así como o aplicativo que utilizou para enviar a mensaxe. As publicacións poderían conter ficheiros de medios anexos, como fotografías e vídeos. As publicacións públicas e as non listadas están dispoñibles de xeito público. Cando destaca unha publicación no seu perfil tamén é pública. As publicacións son enviadas as súas seguidoras, en algúns casos pode acontecer que estén en diferentes servidores e gárdanse copias neles. Cando elemina unha publicación tamén se envía as súas seguidoras. A acción de volver a publicar ou marcar como favorita outra publicación sempre é pública.</li>
-      <li><em>Mensaxes directas e só para seguidoras</em>: Todas as mensaxes gárdanse e procésanse no servidor. As mensaxes só para seguidoras son entregadas as súas seguidoras e as usuarias que son mencionadas en elas, e as mensaxes directas entréganse só as usuarias mencionadas en elas. En algúns casos esto implica que son entregadas a diferentes servidores e gárdanse copias alí. Facemos un esforzo sincero para limitar o acceso a esas publicacións só as persoas autorizadas, pero outros servidores poderían non ser tan escrupulosos. Polo tanto, é importante revisar os servidores onde se hospedan as súas seguidoras. Nos axustes pode activar a opción de aprovar ou rexeitar novas seguidoras de xeito manual. <em>Teña en conta que a administración do servidor e todos os outros servidores implicados poden ver as mensaxes.</em>, e as destinatarias poderían facer capturas de pantalla, copiar e volver a compartir as mensaxes. <em>Non comparta información comprometida en Mastodon.</em></li>
-      <li><em>IPs e outros metadatos</em>: Cando se conecta, gravamos o IP desde onde se conecta, así como o nome do aplicativo desde onde o fai. Todas as sesións conectadas están dispoñibles para revisar e revogar nos axustes. O último enderezo IP utilizado gárdase ate por 12 meses. Tamén poderiamos gardar informes do servidor que inclúan o enderezo IP de cada petición ao servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">De qué xeito utilizamos os seus datos?</h3>
-
-      <p>Toda a información que recollemos podería ser utilizada dos seguintes xeitos:</p>
-
-      <ul>
-      <li>Para proporcionar a funcionabiliade básica de Mastodon. Só pode interactuar co contido de outra xente e publicar o seu propio contido se está conectada. Por exemplo, podería seguir outra xente e ver as súas publicacións combinadas nunha liña temporal inicial personalizada.</li>
-      <li>Para axudar a moderar a comunidade, por exemplo comparando o seu enderezo IP con outros coñecidos para evitar esquivar os rexeitamentos ou outras infraccións.</li>
-      <li>O endero de correo electrónico que nos proporciona podería ser utilizado para enviarlle información, notificacións sobre outra xente que interactúa cos seus contidos ou lle envía mensaxes, e para respostar a consultas, e/ou outras cuestións ou peticións.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Cómo proxetemos os seus datos?</h3>
-
-      <p>Implementamos varias medidas de seguridade para protexer os seus datos persoais cando introduce, envía ou accede a súa información persoal. Entre outras medidas, a súa sesión de navegación, así como o tráfico entre os seus aplicativos e o API están aseguradas mediante SSL, e o seu contrasinal está camuflado utilizando un algoritmo potente de unha sóa vía. Pode habilitar a autenticación de doble factor para protexer o acceso a súa conta aínda máis.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Cal é a nosa política de retención de datos?</h3>
-
-      <p>Faremos un sincero esforzo en:</p>
-
-      <ul>
-      <li>Protexer informes do servidor que conteñan direccións IP das peticións ao servidor, ate a data estos informes gárdanse por non máis de 90 días.</li>
-      <li>Reter os enderezos IP asociados con usuarias rexistradas non máis de 12 meses.</li>
-      </ul>
-
-      <p>Pode solicitar e descargar un ficheiro cos seus contidos, incluíndo publicacións, anexos de medios, imaxes de perfil e imaxe da cabeceira.</p>
-
-      <p>En calquer momento pode eliminar de xeito irreversible a súa conta.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Utilizamos testemuños?</h3>
-
-      <p>Si. Os testemuños son pequenos ficheiros que un sitio web ou o provedor de servizo transfiren ao disco duro da súa computadora a través do navegador web (se vostede o permite). Estos testemuños posibilitan ao sitio web recoñecer o seu navegador e, se ten unha conta rexistrada, asocialo con dita conta.</p>
-
-      <p>Utilizamos testemuños para comprender e gardar as súas preferencias para futuras visitas.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Entregamos algunha información a terceiras alleas?</h3>
-
-      <p>Non vendemos, negociamos ou transferimos de algún xeito a terceiras partes alleas a súa información identificativa persoal. Esto non inclúe terceiras partes de confianza que nos axudan a operar o sitio web, a xestionar a empresa, ou darlle servizo se esas partes aceptan manter esa información baixo confidencialidade. Poderiamos liberar esa información se cremos que eso da cumplimento axeitado a lei, reforza as políticas do noso sitio ou protexe os nosos, e de outros, dereitos, propiedade ou seguridade.</p>
-
-      <p>O seu contido público podería ser descargado por outros servidores na rede. As súas publicacións públicas e para só seguidoras son entregadas aos servidores onde residen as súas seguidoras na rede, e as mensaxes directas son entregadas aos servidores das destinatarias sempre que esas seguidoras ou destinatarios residan en servidores distintos de este.</p>
-
-      <p>Cado autoriza a este aplicativo a utilizar a súa conta, dependendo da amplitude dos permisos que autorice, podería acceder a información pública de perfil, ao listado de seguimento, as súas seguidoras, os seus listados, todas as súas publicacións, as publicacións favoritas. Os aplicativos non poden nunca acceder ao seu enderezo de correo nin ao seu contrasinal.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Utilización do sitio web por menores</h3>
-
-      <p>Se este servidor está na UE ou no EEE: a nosa web, productos e servizos están dirixidos a persoas de 16 ou máis anos. Se ten menos de 16 anos, a requerimento da GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) non utilice esta web.</p>
-
-      <p>Se este servidor está nos EEUU: a nosa web, productos e servizos están dirixidos a persoas de 13 ou máis anos. Se non ten 13 anos de idade, a requerimento de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) non utilice esta web.</p>
-
-      <p>Os requerimentos legais poden ser diferentes si este servidor está baixo outra xurisdición.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Cambios na nosa política de intimidade</h3>
-
-      <p>Se decidimos cambiar a nosa política de intimidade publicaremos os cambios en esta páxina.</p>
-
-      <p>Este documento ten licenza CC-BY-SA. Actualizouse o 7 de Marzo de 2018.</p>
-
-      <p>Adaptado do orixinal <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Termos do Servizo e Política de Intimidade"
   themes:
     contrast: Mastodon (Alto contraste)
     default: Mastodon (Escuro)
@@ -1430,6 +1563,7 @@ gl:
     formats:
       default: "%d %b, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Engadir
     disable: Deshabilitar
@@ -1446,63 +1580,73 @@ gl:
     recovery_instructions_html: Se perdeses o acceso ao teu teléfono, podes utilizar un dos códigos de recuperación inferiores para recuperar o acceso á conta. <strong>Garda os códigos nun lugar seguro</strong>. Por exemplo, podes imprimilos e gardalos xunto con outros documentos importantes.
     webauthn: Chaves de seguridade
   user_mailer:
+    appeal_approved:
+      action: Vai á túa conta
+      explanation: A apelación da acción contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi aprobada. A túa conta volve ao estado normal de uso.
+      subject: O recurso presentado o %{date} foi aprobado
+      title: Apelación aprobada
+    appeal_rejected:
+      explanation: A apelación contra a acción tomada contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi rexeitada.
+      subject: A túa apelación do %{date} foi rexeitada
+      title: Apelación rexeitada
     backup_ready:
       explanation: Solicitaches os datos completos da túa conta de Mastodon. Xa está preparados para descargar!
       subject: O teu ficheiro xa está preparado para descargar
       title: Leve o ficheiro
-    sign_in_token:
-      details: 'Detalles sobre o intento:'
-      explanation: 'Detectamos un intento de conectar coa túa conta desde un enderezo IP descoñecido. Se es ti, escribe o código de seguridade inferior na páxina de desafío de conexión:'
-      further_actions: 'Se non foches ti, cambia agora o contrasinal e activa o segundo factor de autenticación para a túa conta. Pódelo facer aquí:'
-      subject: Por favor confirma o intento de conexión
-      title: Intento de conexión
+    suspicious_sign_in:
+      change_password: cambia o teu contrasinal
+      details: 'Estos son os detalles do acceso:'
+      explanation: Detectamos que accedeches á conta desde un novo enderezo IP.
+      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente e activa o segundo factor de autenticación para manter conta segura.
+      subject: Accedeuse á túa conta desde novos enderezos IP
+      title: Novo acceso
     warning:
+      appeal: Enviar unha apelación
+      appeal_description: Se cres que esto é un erro, podes enviar un recurso á administración de %{instance}.
+      categories:
+        spam: Spam
+        violation: O contido viola as seguintes normas da comunidade
       explanation:
-        disable: Cando a súa conta está conxelada, os datos permanecen intactos, pero non pode levar a fin accións ate que se desbloquea.
-        sensitive: Os teus ficheiros e ligazóns a multimedia serán tratados como sensibles.
-        silence: Mentras a conta está limitada, só a xente que actualmente te segue verá as publicacións neste servidor, e poderías estar excluída de varias listaxes públicas. Porén, outras persoas poderíante seguir de xeito manual.
-        suspend: A súa conta foi suspendida, e todos os seus toots e medios subidos foron eliminados de este servidor de xeito irreversible, e dos servidores onde tivese seguidoras.
-      get_in_touch: Pode responder a este correo para contactar coa administración de %{instance}.
-      review_server_policies: Revisar políticas do servidor
-      statuses: 'En concreto, para:'
+        delete_statuses: Algunha das túas publicacións son consideradas contrarias ás normas da comunidade e foron por tanto eliminadas pola moderación de %{instance}.
+        disable: Xa non podes usar a túa conta, pero o teu perfil e outros datos permanecen intactos. Podes solicitar unha copia dos teus datos, cambiar os axustes da conta ou eliminar a túa conta.
+        mark_statuses_as_sensitive: Algunha das túas publicacións foron marcadas como sensible pola moderación de %{instance}. Esto significa que as persoas só poderan ver a vista previa se tocan nelas. Ti tamén podes marcar os medios como sensibles en futuras publicacións.
+        sensitive: A partir deste momento, tódolos ficheiros que subiches estarán marcados como sensibles e agochados tras un aviso de contido.
+        silence: Aínda podes usar a túa conta pero só as persoas que te siguen poden ver as túas publicacións neste servidor, e podes que foses excluída de varios xeitos de descubrimento. Porén, aínda te poden seguir de xeito manual.
+        suspend: Xa non podes usar a túa conta, o teu perfil e outros datos xa non son accesibles. Aínda podes acceder para solicitar unha copia dos teus datos no prazo de 30 días previos á eliminación da conta. Imos reter algúns datos básicos para evitar que poidas evitar a suspensión.
+      reason: 'Razón:'
+      statuses: 'Publicacións citadas:'
       subject:
+        delete_statuses: As túas publicacións en %{acct} foron eliminadas
         disable: A súa conta %{acct} foi conxelada
+        mark_statuses_as_sensitive: As túas publicacións en %{acct} foron marcadas como sensibles
         none: Aviso para %{acct}
-        sensitive: Ó publicar multimedia a túa conta %{acct} foi marcada como sensible
+        sensitive: A partir de agora as túas publicacións en %{acct} van ser marcadas como sensibles
         silence: A súa conta %{acct} foi limitada
         suspend: A súa conta %{acct} foi suspendida
       title:
+        delete_statuses: Publicacións eliminadas
         disable: Conta conxelada
+        mark_statuses_as_sensitive: Publicacións marcadas como sensibles
         none: Aviso
-        sensitive: O teu multimedia foi marcado como sensible
+        sensitive: Conta marcada como sensible
         silence: Conta limitada
         suspend: Conta suspendida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: Podes personalizar o teu perfil subindo un avatar, cabeceira, cambiar o nome público e aínda máis. Se restrinxes a túa conta podes revisar a conta das persoas que solicitan seguirte antes de permitirlles o acceso aos teus toots.
-      explanation: Aquí ten alunhas endereitas para ir aprendendo
-      final_action: Comece a publicar
-      final_step: 'Publica! Incluso sen seguidoras as túas mensaxes públicas serán vistas por outras, por exemplo na cronoloxía local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.'
-      full_handle: O seu alcume completo
-      full_handle_hint: Esto é o que lle dirá aos seus amigos para que poidan seguila ou enviarlle mensaxes desde outro servidor.
-      review_preferences_action: Cambiar preferencias
-      review_preferences_step: Lembre establecer as preferencias, tales como qué correos-e lle querería recibir, ou o nivel de intimidade por omisión para as súas mensaxes. Se non lle molestan as imaxes con movemento, pode escoller que os GIF se reproduzan automáticamente.
+      edit_profile_step: Podes personalizar o teu perfil subindo unha imaxe de perfil, cambiar o nome público e moito máis. Podes elexir revisar as solicitudes de seguimento recibidas antes de permitirlles que te sigan.
+      explanation: Aquí tes algunhas endereitas para ir aprendendo
+      final_action: Comeza a publicar
+      final_step: 'Publica! Incluso sen seguidoras, as túas mensaxes públicas serán vistas por outras persoas, por exemplo na cronoloxía local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.'
+      full_handle: O teu alcume completo
+      full_handle_hint: Compárteo coas túas amizades para que poidan seguirte ou enviarche mensaxes desde outros servidores.
       subject: Benvida a Mastodon
-      tip_federated_timeline: A cronoloxía federada é unha visión reducida da rede Mastodon. Inclúe xente a que segue xente que ti segues, así que non é completa.
-      tip_following: Por defecto segues a Admin(s) no teu servidor. Para atopar máis xente interesante, mira nas cronoloxías local e federada.
-      tip_local_timeline: A cronoloxía local é unha ollada xeral sobre a xente en %{instance}. Son as súas veciñas máis próximas!
-      tip_mobile_webapp: Si o navegador móbil lle ofrece engadir Mastodon a pantalla de inicio, pode recibir notificacións push. En moitos aspectos comportarase como un aplicativo nativo!
-      tips: Consellos
       title: Benvida, %{name}!
   users:
     follow_limit_reached: Non pode seguir a máis de %{limit} persoas
-    generic_access_help_html: Problemas para acceder a conta? Podes contactar con %{email} para obter axuda
     invalid_otp_token: O código do segundo factor non é válido
-    invalid_sign_in_token: Código de seguridade non válido
     otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
-    seamless_external_login: Está conectado a través de un servizo externo, polo que os axustes de contrasinal e correo-e non están dispoñibles.
+    seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
     signed_in_as: 'Rexistrada como:'
-    suspicious_sign_in_confirmation: Semella que non te conectaches antes desde este dispositivo, e hai tempo que non te conectas, así que ímosche enviar un código de seguridade ao teu enderezo de email para confirmar que es ti.
   verification:
     explanation_html: 'Podes <strong>validarte a ti mesma como a dona das ligazóns nos metadatos do teu perfil</strong>. Para esto, o sitio web ligado debe conter unha ligazón de retorno ao perfil de Mastodon. Esta ligazón de retorno <strong>ten que</strong> ter un atributo <code>rel="me"</code>. O texto da ligazón non importa. Aquí tes un exemplo:'
     verification: Validación
@@ -1513,7 +1657,7 @@ gl:
       success: Engadeuse correctamente a chave de seguridade.
     delete: Eliminar
     delete_confirmation: "¿Tes a certeza de que queres eliminar a chave de seguridade?"
-    description_html: Se activas a <strong>autenticación con chave de seguridade</strong>, ó conectarte pediráseche que uses unha das túas chaves.
+    description_html: Se activas a <strong>autenticación con chave de seguridade</strong>, pediráseche que uses unha das túas chaves para acceder.
     destroy:
       error: Houbo un problema ó eliminar a túa chave de seguridade, inténtao outra vez.
       success: Eliminouse correctamente a chave de seguridade.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 300d13d62..fb7f10fb3 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,60 +1,87 @@
 ---
 he:
   about:
-    about_hashtag_html: אלו סטטוסים פומביים המתוייגים בתור<strong>#%{hashtag}</strong>. ניתן להגיב, להדהד או לחבב אותם אם יש לך חשבון בכל מקום בפדרציה.
     about_mastodon_html: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
-    about_this: אודות שרת זה
-    apps: יישומונים לנייד
-    contact: יצירת קשר
     contact_missing: ללא הגדרה
     contact_unavailable: לא רלוונטי/חסר
-    documentation: תיעוד
     hosted_on: מסטודון שיושב בכתובת %{domain}
-    learn_more: מידע נוסף
-    source_code: קוד מקור
-    status_count_before: שכתבו
-    user_count_before: ביתם של
-    what_is_mastodon: מה זה מסטודון?
+    title: אודות
   accounts:
     follow: לעקוב
+    followers:
+      many: עוקבים
+      one: עוקב
+      other: עוקבים
+      two: עוקבים
     following: נעקבים
-    media: מדיה
-    moved_html: "%{name} עבר(ה) אל %{new_profile_link}:"
+    instance_actor_flash: חשבון זה הינו פועל וירטואלי המשמש לייצוג השרת עצמו ולא אף משתמש ספציפי. הוא משמש למטרות פדרציה ואין להשעותו.
+    last_active: פעילות אחרונה
+    link_verified_on: בעלות על קישורית זו נבדקה לאחרונה ב-%{date}
     nothing_here: אין פה שום דבר!
-    people_followed_by: הנעקבים של %{name}
-    people_who_follow: העוקבים של %{name}
-    posts_with_replies: חצרוצים ותגובות
-    roles:
-      admin: מנהל
-      moderator: מנחה
-    unfollow: הפסקת מעקב
+    pin_errors:
+      following: עליך לעקוב אחרי חשבון לפני שניתן יהיה להמליץ עליו
+    posts:
+      many: הודעות
+      one: הודעה
+      other: הודעות
+      two: הודעותיים
+    posts_tab_heading: הודעות
   admin:
+    account_actions:
+      action: בצע/י פעולה
+      title: ביצוע פעולות הנהלה על %{acct}
     account_moderation_notes:
       create: ליצור
       created_msg: הודעת מנחה נוצרה בהצלחה!
-      delete: למחוק
       destroyed_msg: הודעת מנחה נמחקה בהצלחה!
     accounts:
+      add_email_domain_block: חסמו לגמרי את שם המתחם (דומיין) של הדוא"ל
+      approve: אשר
+      approved_msg: בקשת %{username} להירשם אושרה בהצלחה
       are_you_sure: בטוח?
+      avatar: יַצְגָן
       by_domain: שם מתחם
+      change_email:
+        changed_msg: דוא"ל שונה בהצלחה
+        current_email: כתובת דוא"ל נוכחית
+        label: שינוי כתובת דוא"ל משוייכת לחשבון
+        new_email: כתובת דוא"ל חדשה
+        submit: שלחי בקשה לשינוי דוא"ל
+        title: שינוי כתובת דוא"ל עבור המשתמש.ת %{username}
+      change_role:
+        changed_msg: התפקיד שונה בהצלחה!
+        label: שינוי תפקיד
+        no_role: ללא תפקיד
+        title: שינוי תפקיד עבור %{username}
       confirm: אישור
       confirmed: אושר
-      confirming: המאשר
+      confirming: בתהליך אישור
+      custom: התאמה אישית
+      delete: מחיקת נתונים
+      deleted: מחוקים
       demote: הורדה בדרגה
-      disable: לחסום
-      disable_two_factor_authentication: ביטול הזדהות דו-שלבית
-      disabled: נחסם
-      display_name: שם לתצוגה
+      destroyed_msg: הנתונים של %{username} נכנסו לתור המחיקה וצפויים להימחק באופן מיידי
+      disable: הקפאה
+      disable_sign_in_token_auth: ביטול הזדהות באמצעות אסימון דוא״ל
+      disable_two_factor_authentication: ביטול הזדהות דו־שלבית
+      disabled: מוקפא
+      display_name: שם תצוגה
       domain: תחום
       edit: עריכה
-      email: דוא"ל
-      email_status: סטטוס דוא"ל
-      enable: לאפשר
-      enabled: מאופשר
+      email: דוא״ל
+      email_status: מצב דוא״ל
+      enable: ביטול הקפאה
+      enable_sign_in_token_auth: הפעלת אסימון הזדהות בדוא״ל
+      enabled: מופעל
+      enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
       follows: נעקבים
-      inbox_url: כתובת תיבה נכנסת
+      header: כותרת
+      inbox_url: כתובת תיבת דואר נכנס
+      invite_request_text: סיבות להצטרפות
+      invited_by: הוזמן על ידי
       ip: כתובת IP
+      joined: תאריך הצטרפות
       location:
         all: הכל
         local: מקומי
@@ -63,119 +90,967 @@ he:
       login_status: מצב חיבור
       media_attachments: תוספות מדיה
       memorialize: הפוך לדף זכרון
+      memorialized: מונצחים
+      memorialized_msg: החשבון %{username} הונצח בהצלחה
       moderation:
+        active: פעילים
         all: הכל
-        silenced: מושתקים
+        pending: בהמתנה
+        silenced: מוגבלים
         suspended: מושהים
         title: ניהול קהילה
       moderation_notes: הודעות מנחה
       most_recent_activity: פעילות עדכנית
       most_recent_ip: כתובות אחרונות
+      no_account_selected: לא בוצעו שינויים בחשבונות ל שכן לא נבחרו חשבונות
+      no_limits_imposed: לא הוטלו הגבלות
+      no_role_assigned: ללא תפקיד
       not_subscribed: לא רשום
+      pending: ממתינים לסקירה
       perform_full_suspension: ביצוע השעייה מלאה
+      previous_strikes: פסילות קודמות
+      previous_strikes_description_html:
+        many: לחשבון הזה יש <strong>%{count}</strong> פסילות.
+        one: לחשבון הזה פסילה <strong>אחת</strong>.
+        other: לחשבון הזה <strong>%{count}</strong> פסילות.
+        two: לחשבון הזה <strong>%{count}</strong> פסילות.
       promote: להעלות בדרגה
       protocol: פרטיכל
       public: פומבי
       push_subscription_expires: הרשמה להודעות בדחיפה פגה
       redownload: לקריאה מחדש של האווטאר
+      redownloaded_msg: הפרופיל של %{username} רוענן בהצלחה מהמקור
+      reject: דחויים
+      rejected_msg: בקשת ההרשמה של %{username} נדחתה בהצלחה
+      remote_suspension_irreversible: נתוני חשבון זה נמחקו באופן בלתי הפיך.
+      remote_suspension_reversible_hint_html: חשבון זה הושעה ע"י השרת שלו ונתוניו יוסרו במלואם בתאריך %{date}. עד אז יוכל השרת המרוחק לשחזר את החשבון ללא תופעות לוואי שליליות. אם ברצונך להסיר את כל נתוני החשבון באופן מיידי, ניתן לעשות זאת להלן.
+      remove_avatar: הסרת תמונת פרופיל
+      remove_header: הסרת כותרת
+      removed_avatar_msg: תמונת הפרופיל של %{username} הוסרה בהצלחה
+      removed_header_msg: תמונת הראשה של %{username} הוסרה בהצלחה
       resend_confirmation:
         already_confirmed: משתמש זה כבר אושר
         send: שלח מחדש דוא"ל אימות
         success: הודעת האימייל נשלחה בהצלחה!
       reset: איפוס
-      reset_password: אתחול סיסמא
+      reset_password: איפוס סיסמה
       resubscribe: להרשם מחדש
-      role: הרשאות
-      roles:
-        admin: מנהל מערכת
-        moderator: מנחה דיונים
-        user: משתמש(ת)
+      role: תפקיד
       search: חיפוש
+      search_same_email_domain: משתמשים אחרים מאותו דומיין דוא"ל
+      search_same_ip: משתמשים אחרים מאותה כתובת IP
+      security_measures:
+        only_password: סיסמה בלבד
+        password_and_2fa: סיסמה ואימות דו-שלבי
+      sensitive: מאולצים לרגישות
+      sensitized: מסומנים כרגישים
       shared_inbox_url: תיבה משותפת לדואר נכנס
       show:
         created_reports: דיווחים מאת חשבון זה
         targeted_reports: דיווחים נגד חשבון זה
       silence: השתקה
-      statuses: הודעות
+      silenced: מוגבלים
+      statuses: חצרוצים
+      strikes: עבירות קודמות
       subscribe: הרשמה
+      suspend: השעייה
+      suspended: מושעים
+      suspension_irreversible: המידע בחשבון זה נמחק באופן בלתי הפיך. ניתן להסיר את ההשעיה מהחשבון על מנת להחזיר אותו למצב שמיש, אבל שום מידע שהיה בבעלותו לא ישוחזר.
+      suspension_reversible_hint_html: חשבון זה הושעה, והמידע בו יוסר במלואו בתאריך %{date}. עד אז, ניתן לשחזר את החשבון ללא תופעות לוואי שליליות. אם ברצונך להסיר את כל המידע בחשבון באופן מידי, ניתן לעשות כן להלן.
       title: חשבונות
+      unblock_email: ביטול חסימת כתובת דוא"ל
+      unblocked_email_msg: הסרת חסימה מכתובת הדוא"ל של %{username} בוצעה בהצלחה
+      unconfirmed_email: כתובת דוא"ל לא מאומתת
+      undo_sensitized: בטל רגישות לכח
       undo_silenced: ביטול השתקה
       undo_suspension: ביטול השעייה
+      unsilenced_msg: ביטול הגבלה לחשבונו של %{username} בוצע בהצלחה
       unsubscribe: הפסקת הרשמה
+      unsuspended_msg: הסרת השעיה מהחשבון של %{username} בוצעה בהצלחה
       username: שם משתמש
+      view_domain: צפיה בסיכום שרת
+      warn: אזהרה
       web: רשת
+      whitelisted: מותר לפדרציה
+    action_logs:
+      action_types:
+        approve_appeal: אישור ערעור
+        approve_user: אישור משתמש
+        assigned_to_self_report: הקצאת דו"ח
+        change_email_user: שינוי כתובת דוא"ל למשתמש
+        change_role_user: שינוי תפקיד למשתמש
+        confirm_user: אשר משתמש
+        create_account_warning: יצירת אזהרה
+        create_announcement: יצירת הכרזה
+        create_canonical_email_block: יצירת חסימת דואל
+        create_custom_emoji: יצירת אמוג'י מיוחד
+        create_domain_allow: יצירת דומיין מותר
+        create_domain_block: יצירת דומיין חסום
+        create_email_domain_block: יצירת חסימת דומיין דוא"ל
+        create_ip_block: יצירת כלל IP
+        create_unavailable_domain: יצירת דומיין בלתי זמין
+        create_user_role: יצירת תפקיד
+        demote_user: הורדת משתמש בדרגה
+        destroy_announcement: מחיקת הכרזה
+        destroy_canonical_email_block: מחיקת חסימת דואל
+        destroy_custom_emoji: מחיקת אמוג'י יחודי
+        destroy_domain_allow: מחיקת דומיין מותר
+        destroy_domain_block: מחיקת דומיין חסום
+        destroy_email_domain_block: מחיקת חסימת דומיין דוא"ל
+        destroy_instance: טיהור דומיין
+        destroy_ip_block: מחיקת כלל IP
+        destroy_status: מחיקת הודעה
+        destroy_unavailable_domain: מחיקת דומיין בלתי זמין
+        destroy_user_role: מחיקת תפקיד
+        disable_2fa_user: השעיית זיהוי דו-גורמי
+        disable_custom_emoji: השעיית אמוג'י מיוחד
+        disable_sign_in_token_auth_user: השעיית אסימון הזדהות בדוא"ל של משתמש
+        disable_user: השעיית משתמש
+        enable_custom_emoji: הפעלת אמוג'י מיוחד
+        enable_sign_in_token_auth_user: הפעלת אסימון הזדהות בדוא"ל של משתמש
+        enable_user: אפשור משתמש
+        memorialize_account: הנצחת חשבון
+        promote_user: קידום משתמש
+        reject_appeal: דחיית ערעור
+        reject_user: דחיית משתמש
+        remove_avatar_user: הסרת תמונת פרופיל
+        reopen_report: פתיחת דו"ח מחדש
+        resend_user: שליחת דואל אישור שוב
+        reset_password_user: איפוס סיסמה
+        resolve_report: פתירת דו"ח
+        sensitive_account: חשבון רגיש לכח
+        silence_account: הגבלת חשבון
+        suspend_account: השעיית חשבון
+        unassigned_report: ביטול הקצאת דו"ח
+        unblock_email_account: ביטול חסימת כתובת דוא"ל
+        unsensitive_account: ביטול Force-Sensitive לחשבון
+        unsilence_account: ביטול השתקת חשבון
+        unsuspend_account: ביטול השעיית חשבון
+        update_announcement: עדכון הכרזה
+        update_custom_emoji: עדכון סמלון מותאם אישית
+        update_domain_block: עדכון חסימת שם מתחם
+        update_ip_block: עדכון כלל IP
+        update_status: סטטוס עדכון
+        update_user_role: עדכון תפקיד
+      actions:
+        approve_appeal_html: "%{name} אישר/ה ערעור על החלטת מנהלי הקהילה מ-%{target}"
+        approve_user_html: "%{name} אישר/ה הרשמה מ-%{target}"
+        assigned_to_self_report_html: '%{name} הקצה/תה דו"ח %{target} לעצמם'
+        change_email_user_html: '%{name} שינה/תה את כתובת הדוא"ל של המשתמש %{target}'
+        change_role_user_html: "%{name} שינה את התפקיד של %{target}"
+        confirm_user_html: '%{name} אישר/ה את כותבת הדו"אל של המשתמש %{target}'
+        create_account_warning_html: "%{name} שלח/ה אזהרה ל %{target}"
+        create_announcement_html: "%{name} יצר/ה הכרזה חדשה %{target}"
+        create_canonical_email_block_html: "%{name} חסם/ה את הדואל %{target}"
+        create_custom_emoji_html: "%{name} העלו אמוג'י חדש %{target}"
+        create_domain_allow_html: "%{name} אישר/ה פדרציה עם הדומיין %{target}"
+        create_domain_block_html: "%{name} חסם/ה את הדומיין %{target}"
+        create_email_domain_block_html: '%{name} חסם/ה את דומיין הדוא"ל %{target}'
+        create_ip_block_html: "%{name} יצר/ה כלל עבור IP %{target}"
+        create_unavailable_domain_html: "%{name} הפסיק/ה משלוח לדומיין %{target}"
+        create_user_role_html: "%{name} יצר את התפקיד של %{target}"
+        demote_user_html: "%{name} הוריד/ה בדרגה את המשתמש %{target}"
+        destroy_announcement_html: "%{name} מחק/ה את ההכרזה %{target}"
+        destroy_canonical_email_block_html: "%{name} הסיר/ה חסימה מדואל %{target}"
+        destroy_custom_emoji_html: "%{name} מחק אמוג'י של %{target}"
+        destroy_domain_allow_html: "%{name} לא התיר/ה פדרציה עם הדומיין %{target}"
+        destroy_domain_block_html: "%{name} הסיר/ה חסימה מהדומיין %{target}"
+        destroy_email_domain_block_html: '%{name} הסיר/ה חסימה מדומיין הדוא"ל %{target}'
+        destroy_instance_html: "%{name} טיהר/ה את הדומיין %{target}"
+        destroy_ip_block_html: "%{name} מחק/ה את הכלל עבור IP %{target}"
+        destroy_status_html: ההודעה של %{target} הוסרה ע"י %{name}
+        destroy_unavailable_domain_html: "%{name} התחיל/ה מחדש משלוח לדומיין %{target}"
+        destroy_user_role_html: "%{name} ביטל את התפקיד של %{target}"
+        disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
+        disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
+        disable_sign_in_token_auth_user_html: '%{name} השבית/ה את האימות בעזרת אסימון דוא"ל עבור %{target}'
+        disable_user_html: "%{name} חסם/ה כניסה מהמשתמש/ת %{target}"
+        enable_custom_emoji_html: "%{name} אפשר/ה את האמוג'י %{target}"
+        enable_sign_in_token_auth_user_html: '%{name} אפשר/ה אימות בעזרת אסימון דוא"ל עבור %{target}'
+        enable_user_html: "%{name} אפשר/ה כניסה עבור המשתמש %{target}"
+        memorialize_account_html: "%{name} הפך/ה את חשבונו של %{target} לדף הנצחה"
+        promote_user_html: "%{name} העלה בדרגה את המשתמש %{target}"
+        reject_appeal_html: "%{name} דחו ערעור על החלטת הנהלת הקהילה מ-%{target}"
+        reject_user_html: "%{name} דחו הרשמה מ-%{target}"
+        remove_avatar_user_html: "%{name} הסירו את תמונת הפרופיל של %{target}"
+        reopen_report_html: '%{name} פתח מחדש דו"ח %{target}'
+        resend_user_html: "%{name} הפעיל.ה שליחה מחדש של דואל אימות עבור %{target}"
+        reset_password_user_html: הסיסמה עבור המשתמש %{target} התאפסה על־ידי %{name}
+        resolve_report_html: '%{name} פתר/ה דו"ח %{target}'
+        sensitive_account_html: "%{name} סימן/ה את המדיה של %{target} כרגיש"
+        silence_account_html: "%{name} הגביל/ה את חשבונו של %{target}"
+        suspend_account_html: "%{name} השעו את חשבונו של %{target}"
+        unassigned_report_html: '%{name} דו"ח לא מוקצה %{target}'
+        unblock_email_account_html: '%{name} הסיר/ה חסימה מחשבון הדוא"ל של %{target}'
+        unsensitive_account_html: "%{name} ביטל/ה את סימון המדיה של %{target} כרגישה"
+        unsilence_account_html: "%{name} ביטל/ה ההגבלה מהחשבון של %{target}"
+        unsuspend_account_html: "%{name} ביטל/ה את ההשעיה של החשבון של %{target}"
+        update_announcement_html: "%{name} עדכן/ה הכרזה %{target}"
+        update_custom_emoji_html: "%{name} עדכן/ה אמוג'י %{target}"
+        update_domain_block_html: "%{name} עדכן/ה חסימת דומיין עבור %{target}"
+        update_ip_block_html: "%{name} שינה כלל עבור IP %{target}"
+        update_status_html: "%{name} עדכן/ה הודעה של %{target}"
+        update_user_role_html: "%{name} שינה את התפקיד של %{target}"
+      deleted_account: חשבון מחוק
+      empty: לא נמצאו יומנים.
+      filter_by_action: סינון לפי פעולה
+      filter_by_user: סינון לפי משתמש
+      title: ביקורת יומן
+    announcements:
+      destroyed_msg: הכרזה נמחקה בהצלחה!
+      edit:
+        title: עריכת הכרזה
+      empty: לא נמצאו הכרזות.
+      live: חי
+      new:
+        create: יצירת הכרזה
+        title: הכרזה חדשה
+      publish: פרסום
+      published_msg: ההכרזה פורסמה בהצלחה!
+      scheduled_for: מתוזמן ל-%{time}
+      scheduled_msg: ההכרזה תוזמנה לפרסום!
+      title: הכרזות
+      unpublish: ביטול פרסום
+      unpublished_msg: פרסום ההכרזה בוטל בהצלחה!
+      updated_msg: ההכרזה עודכנה בהצלחה!
+    custom_emojis:
+      assign_category: הקצאת קטגוריה
+      by_domain: לפי קהילה
+      copied_msg: עותק מקומי של האמוג'י נוצר בהצלחה
+      copy: להעתיק
+      copy_failed_msg: לא ניתן ליצור עותק מקומי של האמוג'י הזה
+      create_new_category: צור קטגוריה חדשה
+      created_msg: אמוג'י נוצר בהצלחה!
+      delete: למחוק
+      destroyed_msg: אמוג'י הושמד בהצלחה!
+      disable: השבתה
+      disabled: מושבת
+      disabled_msg: השבתת אמוג'י זה בוצעה בהצלחה
+      emoji: אמוג'י
+      enable: לאפשר
+      enabled: מאופשר
+      enabled_msg: אמוג'י זה אופשר בהצלחה
+      image_hint: PNG או GIF עד לגודל %{size}
+      list: רשימה
+      listed: ברשימה
+      new:
+        title: הוספת אמוג'י מיוחד חדש
+      no_emoji_selected: לא בוצעו שינויים ברגשונים שכן לא נבחרו כאלו
+      not_permitted: אין לך הרשאות לביצוע פעולה זו
+      overwrite: לדרוס
+      shortcode: קוד קצר
+      shortcode_hint: לפחות 2 תוים, אלפאנומריים או קו תחתי
+      title: אמוג'י שהעלינו
+      uncategorized: לא מסווגים
+      unlist: בטל רישום
+      unlisted: לא רשומים
+      update_failed_msg: לא ניתן היה לעדכן את היצגן הזה
+      updated_msg: יצגן עודכן בהצלחה!
+      upload: העלאה
+    dashboard:
+      active_users: משתמשים פעילים
+      interactions: אינטראקציות
+      media_storage: נפח אחסון מדיה
+      new_users: משתמשים חדשים
+      opened_reports: דו"חות פתוחים
+      pending_appeals_html:
+        many: "<strong>%{count}</strong> ערעורים ממתינים"
+        one: ערעור <strong>%{count}</strong> ממתין
+        other: "<strong>%{count}</strong> ערעורים ממתינים"
+        two: "<strong>%{count}</strong> ערעורים ממתינים"
+      pending_reports_html:
+        many: "<strong>%{count}</strong> דוחות ממתינים"
+        one: דו"ח <strong>%{count}</strong> ממתין
+        other: "<strong>%{count}</strong> דוחות ממתינים"
+        two: "<strong>%{count}</strong> דוחות ממתינים"
+      pending_tags_html:
+        many: "<strong>%{count}</strong> תגיות ממתינות"
+        one: תגית <strong>%{count}</strong> ממתינה
+        other: "<strong>%{count}</strong> תגיות ממתינות"
+        two: "<strong>%{count}</strong> תגיות ממתינות"
+      pending_users_html:
+        many: "<strong>%{count}</strong> משתמשים ממתינים"
+        one: "<strong>%{count}</strong> משתמש/ת ממתינ/ה"
+        other: "<strong>%{count}</strong> משתמשים ממתינים"
+        two: "<strong>%{count}</strong> משתמשים ממתינים"
+      resolved_reports: דו"חות נפתרו
+      software: תוכנה
+      sources: משאבי הרשמה
+      space: נפח בשימוש
+      title: לוח בקרה
+      top_languages: שפות פעילות מובילות
+      top_servers: שרתים פעילים מובילים
+      website: אתר
+    disputes:
+      appeals:
+        empty: לא נמצאו ערעורים.
+        title: ערעורים
+    domain_allows:
+      add_new: אפשר מַאֲחָד (פדרציה) עם שם המתחם
+      created_msg: הדומיין אופשר לפדרציה בהצלחה
+      destroyed_msg: הדומיין לא אופשר לפדרציה
+      export: ייצוא
+      import: ייבוא
+      undo: אסור מַאֲחָד (פדרציה) עם שם המתחם
     domain_blocks:
       add_new: הוספת חדש
       created_msg: חסימת שרת בתהליך
       destroyed_msg: חסימת שרת בוטלה
       domain: שרת
+      edit: עריכת חסימת שם מתחם
+      existing_domain_block: כבר החלת הגבלות מחמירות יותר על %{name}
+      existing_domain_block_html: כבר הפעלת הגבלות חמורות יותר על %{name}, עליך ראשית <a href="%{unblock_url}">להסיר מעליו/ה את החסימה</a>.
+      export: ייצוא
+      import: ייבוא
       new:
         create: יצירת חסימה
         hint: חסימת השרת לא תמנע יצירת רישומי חשבון במסד הנתונים, אבל תבצע פעולות ניהול קהילה מסוימות על חשבונות אלו אוטומטית ורטרואקטיבית.
         severity:
-          desc_html: "<strong>השתקה</strong> תחביא הודעות מחשבון זה לכל מי שלא עוקב אחריו. <strong>השעייה</strong> תסיר מהשרת את כל התוכן, מדיה ותכונות הפרופיל שמקושרות לחשבון זה. <strong>כלום</strong> כדי לחסום קבצי מדיה בלבד."
-          silence: השתקה
+          desc_html: "<strong>הגבלה</strong> תחביא חצרוצים מחשבון זה לכל מי שלא עוקב אחריו. <strong>השעייה</strong> תסיר מהשרת את כל התוכן, מדיה ותכונות הפרופיל שמקושרות לחשבון זה. <strong>כלום</strong> כדי לחסום קבצי מדיה בלבד."
+          noop: ללא
+          silence: הגבלה
           suspend: השעייה
         title: חסימת שרת חדשה
+      no_domain_block_selected: לא השתנה כלום ברשימת חסימות השרתים מכיוון שאף אחד מהם לא נבחר
+      not_permitted: איך לך הרשאה כדי לבצע פעולה זו
+      obfuscate: לערפל את שם הדומיין
+      obfuscate_hint: לערפל באופן חלקי את שם הדומיין ברשימה אם פרסום רשימת ההגבלות על דומיינים מאופשר
+      private_comment: הערה פרטית
+      private_comment_hint: הערה על הגבלות לדומיין זה לשימוש פנימי של מנהלי הקהילה.
+      public_comment: תגובה פומבית
+      public_comment_hint: הערה אודות הגבלת דומיין זה לציבור הכללי, אם פרסום רשימת הגבלות הדומיינים מאופשר.
       reject_media: חסימת קבצי מדיה
       reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
-      show:
-        retroactive:
-          silence: הסרת השתקה מכל החשבונות על שרת זה
-          suspend: הסרת השעייה מכל החשבונות על שרת זה
-        title: ביטול חסימת שרת עבור %{domain}
-        undo: ביטול
+      reject_reports: דחה דוחות
+      reject_reports_hint: התעלמות מכל הדיווחים הבאים מהדומיין הזה. לא רלוונטי עבור השעיות
       undo: ביטול
+      view: צפייה בחסימת דומיינים
+    email_domain_blocks:
+      add_new: הוספת חדש
+      attempts_over_week:
+        many: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+        one: "%{count} נסיון במשך השבוע שעבר"
+        other: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+        two: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+      created_msg: כתובת מייל נחסמה בהצלחה
+      delete: מחיקה
+      dns:
+        types:
+          mx: רשומת MX
+      domain: דומיין
+      new:
+        create: הוספת דומיין
+        resolve: פתור דומיין
+        title: חסימת דומיין דוא"ל
+      no_email_domain_block_selected: לא בוצעו שינויים לחסימת דומייני דוא"ל שכן לא נבחרו דומיינים
+      resolved_dns_records_hint_html: שם הדומיין מוביל לדומייניי ה-MX הבאים, שהם בסופו של דבר אחראיים לקבלת דוא"ל. חסימת דומיין MX תוביל לחסימת הרשמות מכל כתובת דוא"ל שעושה שימוש בדומיין MX זה, אפילו אם הדומיין הגלוי שונה. <strong>יש להמנע מלחסום ספקי דוא"ל מובילים.</strong>
+      resolved_through_html: נמצא דרך %{domain}
+      title: דומייניי דוא"ל חסומים
+    export_domain_allows:
+      new:
+        title: יבוא רשימת שרתים מאושרים
+      no_file: אף קובץ לא נבחר
+    export_domain_blocks:
+      import:
+        description_html: הנכם עומדים ליבא רשימת חסימות. אנא וודאו היטב שאתם יודעים מה הרשימה כוללת, במיוחד אם לא יצרתם אותה בעצמכם.
+        existing_relationships_warning: קשרי עקיבה קיימים
+        private_comment_description_html: 'כדי לסייע במעקב מאיכן הגיעו חסימות, חסימות מיובאות ילוו בהערה פרטית זו: <q>%{comment}</q>'
+        private_comment_template: יובא מתוך %{source} בתאריך %{date}
+        title: יבוא רשימת שרתים חסומים
+      new:
+        title: יבוא רשימת שרתים חסומים
+      no_file: לא נבחר קובץ
+    follow_recommendations:
+      description_html: "<strong>עקבו אחר ההמלצות על מנת לעזור למשתמשים חדשים למצוא תוכן מעניין</strong>. במידה ומשתמש לא תקשר מספיק עם משתמשים אחרים כדי ליצור המלצות מעקב, חשבונות אלה יומלצו במקום. הם מחושבים מחדש על בסיסי יומיומי מתערובת של החשבונות הפעילים ביותר עם החשבונות הנעקבים ביותר עבור שפה נתונה."
+      language: עבור שפה
+      status: מצב
+      suppress: דכא המלצות מעקב
+      suppressed: מדוכא
+      title: המלצות מעקב
+      unsuppress: שחזור המלצות מעקב
     instances:
+      availability:
+        description_html:
+          many: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          one: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          other: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          two: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+        failure_threshold_reached: סף כשלון הושג ב-%{date}.
+        failures_recorded:
+          many: נסיונות כושלים ב-%{count} ימים שונים.
+          one: נסיון כושל ביום %{count}.
+          other: נסיונות כושלים ב-%{count} ימים שונים.
+          two: נסיונות כושלים ב-%{count} ימים שונים.
+        no_failures_recorded: לא נמצאו כשלונות.
+        title: זמינות
+        warning: הנסיון האחרון להתחבר לשרת זה לא עלה בהצלחה
+      back_to_all: כל
+      back_to_limited: מוגבל
+      back_to_warning: אזהרה
+      by_domain: דומיין
+      confirm_purge: האם את/ה בטוח/ה שברצונך למחוק באופן סופי מידע מדומיין זה?
+      content_policies:
+        comment: הערה פנימית
+        description_html: ביכולתך להגדיר מדיניות תוכן שתופעל על כל החשבונות מדומיין זה ומתת-דומייניו.
+        policies:
+          reject_media: דחיית מדיה
+          reject_reports: דחיית דו"חות
+          silence: הגבלה
+          suspend: השעייה
+        policy: מדיניות
+        reason: סיבה פומבית
+        title: מדיניות תוכן
+      dashboard:
+        instance_accounts_dimension: חשבונות בעלי העוקבים הרבים ביותר
+        instance_accounts_measure: חשבונות מאופסנים
+        instance_followers_measure: עוקבינו שם
+        instance_follows_measure: עוקביהם כאן
+        instance_languages_dimension: שפות מובילות
+        instance_media_attachments_measure: קבצי מדיה מאופסנים
+        instance_reports_measure: דו"חות אודותיהם
+        instance_statuses_measure: הודעות מאופסנות
+      delivery:
+        all: הכל
+        clear: ניקוי שגיאות משלוח
+        failing: נכשל
+        restart: אתחול משלוח מחדש
+        stop: הפסקת משלוח
+        unavailable: לא זמין
+      delivery_available: משלוח זמין
+      delivery_error_days: ימי שגיאת משלוח
+      delivery_error_hint: אם לא התאפשר משלוח במשך %{count} ימים, הוא יסומן אוטומטית כבלתי ניתן למשלוח.
+      destroyed_msg: מידע מ-%{domain} נמצא עתה בתור למחיקה מיידית.
+      empty: לא נמצאו דומיינים.
+      known_accounts:
+        many: "%{count} חשבונות ידועים"
+        one: חשבון ידוע %{count}
+        other: "%{count} חשבונות ידועים"
+        two: "%{count} חשבונות ידועים"
+      moderation:
+        all: הכל
+        limited: מוגבלים
+        title: ניהול קהילה
+      private_comment: הערה פרטית
+      public_comment: תגובה פומבית
+      purge: טיהור
+      purge_description_html: אם יש יסוד להניח שדומיין זה מנותק לעד, ניתן למחוק את כל רשומות החשבונות והמידע המשוייך לדומיין זה משטח האפסון שלך. זה עשוי לקחת זמן מה.
       title: שרתים מוכרים
+      total_blocked_by_us: חסום על ידינו
+      total_followed_by_them: נעקב על ידם
+      total_followed_by_us: נעקב על ידינו
+      total_reported: דוחות אודותיהם
+      total_storage: קבצי מדיה מצורפים
+      totals_time_period_hint_html: הסכומים המוצגים להלן כוללים מידע מכל הזמנים.
+    invites:
+      deactivate_all: להשבית הכל
+      filter:
+        all: כל ההזמנות
+        available: זמין
+        expired: פג תוקף
+        title: מסנן
+      title: הזמנות
+    ip_blocks:
+      add_new: צור כלל
+      created_msg: כלל IP חדש הוסף בהצלחה
+      delete: למחוק
+      expires_in:
+        '1209600': שבועיים
+        '15778476': 6 חודשים
+        '2629746': חודש אחד
+        '31556952': שנה אחת
+        '86400': יום אחד
+        '94670856': 3 שנים
+      new:
+        title: יצירת כלל IP
+      no_ip_block_selected: שום כלל IP לא שונה כי שום כלל IP לא נבחר
+      title: כללי IP
+    relationships:
+      title: היחסים של %{acct}
+    relays:
+      add_new: הוספת ממסר חדש
+      delete: מחיקה
+      description_html: "<strong>ממסר פדרטיבי</strong> הוא שרת מתווך שמחליף כמויות גדולות של הודעות פומביות בין שרתים שרשומים ומפרסמים אליו. <strong>הוא יכול לעזור לשרתים קטנים ובינוניים לגלות תוכן מהפדרציה</strong>, מה שאחרת היה דורש ממשתמשים מקומיים לעקוב ידנית אחרי אנשים בשרתים מרוחקים."
+      disable: השבתה
+      disabled: מושבת
+      enable: לאפשר
+      enable_hint: מרגע שאופשר, השרת שלך יירשם לכל ההודעות הפומביות מהממסר הזה, ויתחיל לשלוח את הודעותיו הפומביות לממסר.
+      enabled: מאופשר
+      inbox_url: קישורית ממסר
+      pending: ממתין לאישור הממסר
+      save_and_enable: שמור והפעל
+      setup: הגדר חיבור לממסר
+      signatures_not_enabled: ממסרים לא עובדים נכון כשמאופשרים מצב מאובטח או מצב פדרציה מוגבל
+      status: מצב
+      title: ממסרים
+    report_notes:
+      created_msg: הערה על דו"ח נוצרה בהצלחה!
+      destroyed_msg: הערה על דו"ח נמחקה בהצלחה!
     reports:
+      account:
+        notes:
+          many: "%{count} הערות"
+          one: הערה %{count}
+          other: "%{count} הערות"
+          two: "%{count} הערות"
+      action_log: ביקורת יומן
+      action_taken_by: פעולה בוצעה ע"י
+      actions:
+        delete_description_html: ההודעות המדווחות יימחקו ותרשם עבירה על מנת להקל בהעלאה של דיווחים עתידיים על אותו החשבון.
+        mark_as_sensitive_description_html: המדיה בהודעות מדווחות תסומן כרגישה ועבירה תרשם כדי לעזור לך להסלים באינטראקציות עתידיות עם אותו החשבון.
+        other_description_html: ראו אפשרויות נוספות לשליטה בהתנהגות החשבון וכדי לבצע התאמות בתקשורת עם החשבון המדווח.
+        resolve_description_html: אף פעולה לא תבוצע נגד החשבון עליו דווח, לא תירשם עבירה, והדיווח ייסגר.
+        silence_description_html: הפרופיל יהיה גלוי אך ורק לאלה שכבר עוקבים אחריו או לאלה שיחפשו אותו ידנית, מה שיגביל מאד את תפוצתו. ניתן תמיד להחזיר את המצב לקדמותו.
+        suspend_description_html: הפרופיל וכל תכולתו יחסמו לכל גישה עד שבסופו של דבר ימחקו. כל תקשורת עם החשבון תהיה בלתי אפשרית. ניתן לביטול תוך 30 יום.
+      actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
+      add_to_report: הוספת פרטים לדיווח
       are_you_sure: 100% על בטוח?
+      assign_to_self: הקצה אלי
+      assigned: מנחה מוקצה
+      by_target_domain: דומיין החשבון המדווח
+      category: קטגוריה
+      category_description_html: הסיבה בגללה חשבון זה ו/או תוכנו דווחו תצוטט בתקשורת עם החשבון המדווח
       comment:
         none: ללא
+      comment_description_html: 'על מנת לספק עוד מידע, %{name} כתב\ה:'
+      created_at: מדווח
+      delete_and_resolve: מחיקת הודעות
+      forwarded: קודם
+      forwarded_to: קודם ל-%{domain}
       mark_as_resolved: סימון כפתור
+      mark_as_sensitive: סימון כרגיש
+      mark_as_unresolved: סימון כלא פתור
+      no_one_assigned: אף אחד
+      notes:
+        create: הוספת הערה
+        create_and_resolve: פתרון עם הערה
+        create_and_unresolve: פתיחה מחדש עם הערה
+        delete: מחיקה
+        placeholder: תאר/י אילו פעולות ננקטו, או עדכונים קשורים אחרים...
+        title: הערות
+      notes_description_html: צפייה והשארת הערות למנחים אחרים או לעצמך העתידי
+      quick_actions_description_html: 'נקוט/י פעולה מהירה או גלול/י למטה לצפייה בתוכן המדווח:'
+      remote_user_placeholder: המשתמש המרוחק מ-%{instance}
+      reopen: פתיחת דו"ח מחדש
       report: 'דווח על #%{id}'
       reported_account: חשבון מדווח
       reported_by: דווח על ידי
       resolved: פתור
-      status: הודעה
+      resolved_msg: הדו"ח נפתר בהצלחה!
+      skip_to_actions: דלג/י לפעולות
+      status: מצב
+      statuses: התוכן עליו דווח
+      statuses_description_html: התוכן הפוגע יצוטט בתקשורת עם החשבון המדווח
+      target_origin: מקור החשבון המדווח
       title: דיווחים
+      unassign: ביטול הקצאה
       unresolved: לא פתור
+      updated_at: עודכן
+      view_profile: צפה בפרופיל
+    roles:
+      add_new: הוספת תפקיד
+      assigned_users:
+        many: "%{count} משתמשים"
+        one: 'משתמש %{count} '
+        other: "%{count} משתמשים"
+        two: "%{count} שני משתמשים"
+      categories:
+        administration: ניהול מערכת
+        devops: DevOps
+        invites: הזמנות
+        moderation: פיקוח
+        special: מיוחדים
+      delete: מחיקה
+      description_html: באמצעות <strong>תפקידי משתמש</strong>, תוכלו להתאים אישית לאילו פונקציות ואזורים של מסטודון המשתמשים יוכלו לגשת
+      edit: עריכת התפקיד של %{name}
+      everyone: הרשאות ברירת מחדל
+      everyone_full_description_html: זהו <strong>התפקיד הבסיסי </strong> שמשפיע על <strong>כלל המשתשמשים</strong>, אפילו אלו ללא תפקיד. כל התפקידים האחרים יורשים את ההרשאות שלהם ממנו.
+      permissions_count:
+        many: "%{count} הרשאות"
+        one: הרשאה %{count}
+        other: "%{count} הרשאות"
+        two: "%{count} הרשאות"
+      privileges:
+        administrator: מנהל מערכת
+        administrator_description: משתמשים עם הרשאה זו יוכלו לעקוף כל הרשאה
+        delete_user_data: מחיקת כל נתוני המשתמש
+        delete_user_data_description: מאפשר למשתמשים למחוק נתוני משתמשים אחרים ללא דיחוי
+        invite_users: הזמנת משתמשים
+        invite_users_description: מאפשר למשתמשים להזמין אנשים חדשים לשרת
+        manage_announcements: ניהול הכרזות
+        manage_announcements_description: מאפשר למשתמשים לנהל הכרזות של השרת
+        manage_appeals: ניהול ערעורים
+        manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות מודרציה
+        manage_blocks: ניהול חסימות
+        manage_blocks_description: מאפשר למשתמשים לחסום ספקי דוא"ל וכתובות IP
+        manage_custom_emojis: ניהול סמלונים בהתאמה אישית
+        manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת
+        manage_federation: ניהול פדרציה
+        manage_federation_description: מאפשר למשתמשים לחסום או לאפשר התממשקות עם שמות מתחם אחרים
+        manage_invites: ניהול הזמנות
+        manage_invites_description: מאפשר למשתמשים לעלעל ב ולבטל קישורי הזמנה
+        manage_reports: ניהול דו"חות
+        manage_reports_description: מאפשר למשתמשים לסקור דו"חות ולבצע פעולות מודרציה בהתבסס עליהם
+        manage_roles: ניהול תפקידים
+        manage_roles_description: מאפשר למשתמשים לנהל ולמנות אחרים לתפקידים נמוכים יותר משלהם.
+        manage_rules: ניהול כללים
+        manage_rules_description: מאפשר למשתמשים לנהל את כללי השרת
+        manage_settings: נהל הגדרות
+        manage_settings_description: מאפשר למשתמשים לנהל את הגדרות השרת
+        manage_taxonomies: ניהול טקסונומיות
+        manage_taxonomies_description: מאפשר למשתמשים לסקור תוכן אופנתי (טרנדי) ולעדכן אפשרויות של תגיות.
+        manage_user_access: ניהול גישת משתמשים
+        manage_user_access_description: מאפשר למשתמשים לבטל אימות דו-שלבי של משתמשים אחרים, לשנות את כתובות הדוא"ל שלהם, ולאפס את סיסמתם
+        manage_users: ניהול משתמשים
+        manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות מודרציה לפיהם
+        manage_webhooks: ניהול Webhooks
+        manage_webhooks_description: מאפשר למשתמשים להגדיר Webhooks לאירועים מנהלתיים
+        view_audit_log: צפייה בלוג ביקורת
+        view_audit_log_description: מאפשר למשתשמשים לצפות בהיסטוריה של פעולות מנהלתיות על השרת
+        view_dashboard: הצג לוח מחוונים
+        view_dashboard_description: אפשר למשתמשים לגשת ללוח המחוונים
+        view_devops: DevOps
+        view_devops_description: מאפשר למשתמשים לגשת ללוחות המחוונים של Sidekiq ושל pgHero
+      title: תפקידים
+    rules:
+      add_new: הוספת כלל
+      delete: מחיקה
+      description_html: בעוד הרוב טוען שקרא והסכים לתנאי השימוש, אנשים לא נוטים לקרוא אותם עד הסוף עד שמתעוררת בעיה. <strong>כדי שיקל לראות את כללי השרת במבט, יש לספקם כרשימת נקודות.</strong> כדאי לשמור על הכללים קצרים ופשוטים, אבל מאידך גם לא לפצל אותם ליותר מדי נקודות נפרדות.
+      edit: עריכת כלל
+      empty: שום כללי שרת לא הוגדרו עדיין.
+      title: כללי שרת
     settings:
-      contact_information:
-        email: נא להקליד כתובת דוא"ל פומבית
-        username: נא להכניס שם משתמש
+      about:
+        manage_rules: ניהול כללי שרת
+        preamble: תיאור מעמיק על דרכי ניהול השרת, ניהול הדיונים, ומקורות המימון שלו.
+        rules_hint: קיים מקום ייעודי לחוקים שעל המשתמשים שלך לדבוק בהם.
+        title: אודות
+      appearance:
+        preamble: התאמה מיוחדת של מנשק המשתמש של מסטודון.
+        title: מראה
+      branding:
+        preamble: המיתוג של השרת שלך מבדל אותו משרתים אחרים ברשת. המידע יכול להיות מוצג בסביבות שונות כגון מנשק הווב של מסטודון, יישומים מקומיים, בצפיה מקדימה של קישור או בתוך יישומוני הודעות וכולי. מסיבה זו מומלץ לשמור על המידע ברור, קצר וממצה.
+        title: מיתוג
+      content_retention:
+        preamble: שליטה על דרך אחסון תוכן המשתמשים במסטודון.
+        title: תקופת השמירה של תכנים
+      default_noindex:
+        desc_html: משפיע על כל המשתמשים/ות שלא שינו את ההגדרה הזו בעצמם
+        title: הסתרת משתמשיםות ממנוע החיפוש כברירת המחדל
+      discovery:
+        follow_recommendations: המלצות מעקב
+        preamble: הצפה של תוכן מעניין בקבלת פני משתמשות חדשות שאולי אינן מכירות עדיין א.נשים במסטודון. ניתן לשלוט איך אפשרויות גילוי שונות עובדות על השרת שלך.
+        profile_directory: מדריך פרופילים
+        public_timelines: פידים פומביים
+        title: איתור
+        trends: נושאים חמים
+      domain_blocks:
+        all: לכולם
+        disabled: לאף אחד
+        users: למשתמשים מקומיים מחוברים
       registrations:
-        closed_message:
-          desc_html: מוצג על הדף הראשי כאשר ההרשמות סגורות<br>ניתן להשתמש בתגיות HTML
-          title: מסר סגירת הרשמות
-      site_description:
-        desc_html: מוצג כפסקה על הדף הראשי ומשמש כתגית מטא. ניתן להשתמש בתגיות HTML, ובמיוחד ב־<code> &lt; a&gt; </code> ו־<code> &lt; em&gt; </code> .
-        title: תיאור האתר
-      site_description_extended:
-        desc_html: מוצג על עמוד המידע הנוסף<br>ניתן להשתמש בתגיות HTML
-        title: תיאור אתר מורחב
-      site_title: כותרת האתר
-      title: הגדרות אתר
+        preamble: שליטה בהרשאות יצירת חשבון בשרת שלך.
+        title: הרשמות
+      registrations_mode:
+        modes:
+          approved: נדרש אישור הרשמה
+          none: אף אחד לא יכול להרשם
+          open: כל אחד יכול להרשם
+      title: הגדרות שרת
+    site_uploads:
+      delete: מחיקת קובץ שהועלה
+      destroyed_msg: העלאת אתר נמחקה בהצלחה!
+    statuses:
+      account: מחבר
+      application: יישום
+      back_to_account: חזרה לדף החשבון
+      back_to_report: חזרה לעמוד הדיווח
+      batch:
+        remove_from_report: הסרה מהדיווח
+        report: דווח
+      deleted: מחוקים
+      favourites: חיבובים
+      history: היסטורית גרסאות
+      in_reply_to: השיבו ל־
+      language: שפה
+      media:
+        title: מדיה
+      metadata: נתוני-מטא
+      no_status_selected: לא בוצעו שינויים בהודעות שכן לא נבחרו כאלו
+      open: פתח הודעה
+      original_status: הודעה מקורית
+      reblogs: שיתופים
+      status_changed: הודעה שונתה
+      title: הודעות החשבון
+      trending: נושאים חמים
+      visibility: נראות
+      with_media: עם מדיה
+    strikes:
+      actions:
+        delete_statuses: "%{name} מחק/ה את הודעותיו של %{target}"
+        disable: "%{name} הקפיא/ה את חשבונו של %{target}"
+        mark_statuses_as_sensitive: "%{name} סימנ/ה את הודעותיו של %{target} כרגישים"
+        none: "%{name} שלח/ה אזהרה ל-%{target}"
+        sensitive: "%{name} סימן/ה את חשבונו של %{target} כרגיש"
+        silence: "%{name} הגביל/ה את חשבונו/ה של %{target}"
+        suspend: "%{name} השעה/תה את חשבונו/ה של %{target}"
+      appeal_approved: עורער
+      appeal_pending: בהמתנה לערעור
+    system_checks:
+      database_schema_check:
+        message_html: נדרשות הגירות מבני נתונים. אנא הריצו אותן כדי להבטיח שהיישום מתנהג כצפוי
+      elasticsearch_running_check:
+        message_html: לא ניתן להתחבר לחיפוש אלסטיק. בדקו בבקשה הוא רץ, או בטלו את חיפוש הטקסט המלא
+      elasticsearch_version_check:
+        message_html: 'גרסת חיפוש אלסטיק לא מתאימה: %{value}'
+        version_comparison: גרסת חיפוש אלסטיק %{running_version} רצה בעוד גרסא %{required_version} נדרשת
+      rules_check:
+        action: ניהול כללי שרת
+        message_html: לא הוגדרו שום כללי שרת.
+      sidekiq_process_check:
+        message_html: שום הליכי Sidekiq לא רצים עבור %{value} תור(ות). בחנו בבקשה את הגדרות Sidekiq
+    tags:
+      review: סקירת מצב
+      updated_msg: הגדרות תגיות עודכנו בהצלחה
     title: ניהול
+    trends:
+      allow: לאפשר
+      approved: אישור
+      disallow: לא לאשר
+      links:
+        allow: אישור קישורית
+        allow_provider: אישור מפרסם
+        description_html: בקישוריות אלה נעשה כרגע שימוש על ידי חשבונות רבים שהשרת שלך רואה הודעות מהם. זה עשוי לסייע למשתמשיך לברר מה קורה בעולם. שום קישוריות לא יוצגו עד שתאשרו את המפרסם. ניתן גם לאפשר או לדחות קישוריות ספציפיות.
+        disallow: לא לאשר קישורית
+        disallow_provider: לא לאשר מפרסם
+        no_link_selected: לא בוצעו שינויים בקישורים שכן לא נבחרו כאלו
+        publishers:
+          no_publisher_selected: לא בוצעו שינויים במפרסמים שכן לא נבחרו כאלו
+        shared_by_over_week:
+          many: הופץ על ידי %{count} אנשים בשבוע האחרון
+          one: הופץ על ידי אדם אחד בשבוע האחרון
+          other: הופץ על ידי %{count} אנשים בשבוע האחרון
+          two: הופץ על ידי %{count} אנשים בשבוע האחרון
+        title: קישוריות חמות
+        usage_comparison: הופץ %{today} פעמים היום, לעומת %{yesterday} אתמול
+      only_allowed: רק כאלה שהותרו
+      pending_review: בהמתנה לבדיקה
+      preview_card_providers:
+        allowed: קישוריות ממפרסם זה יכולות להכלל בנושאים החמים
+        description_html: אלה הם דומיינים מהם קישוריות מופצות תדיר לשרת שלך. קישוריות לא יכללו בנושאים החמים אלא אם דומיין הקישורית יאושר. אישורך (או דחייתך) יכלול גם תת-דומיינים.
+        rejected: קישוריות ממפרסם זה לא תכללנה בנושאים החמים
+        title: מפרסמים
+      rejected: דחוי
+      statuses:
+        allow: הרשאת הודעה
+        allow_account: הרשאת מחבר/ת
+        description_html: אלו הן הודעות שהשרת שלך מכיר וזוכות להדהודים וחיבובים רבים כרגע. זה עשוי למשתמשיך החדשים והחוזרים למצוא עוד נעקבים. ההודעות לא מוצגות עד שיאושר המחבר/ת, והמחבר/ת יאשרו שחשבונים יומלץ לאחרים. ניתן לאשר או לדחות הודעות ספציפיות.
+        disallow: לדחות הודעה
+        disallow_account: לא לאשר מחבר/ת
+        no_status_selected: לא בוצעו שינויים בהודעות חמות שכן לא נבחרו כאלו
+        not_discoverable: המחבר/ת לא בחר/ה לאפשר את גילויים
+        shared_by:
+          many: הודהד וחובב %{friendly_count} פעמים
+          one: הודהד או חובב פעם אחת
+          other: הודהד וחובב %{friendly_count} פעמים
+          two: הודהד וחובב %{friendly_count} פעמים
+        title: הודעות חמות
+      tags:
+        current_score: ציון נוכחי %{score}
+        dashboard:
+          tag_accounts_measure: שימושים יחודיים
+          tag_languages_dimension: שפות מובילות
+          tag_servers_dimension: שרתים מובילים
+          tag_servers_measure: שרתים שונים
+          tag_uses_measure: כלל השימושים
+        description_html: אלו הן התגיות שמופיעות הרבה כרגע בהודעות המגיעות לשרת. זה עשוי לעזור למשתמשיך למצוא על מה אנשים מרבים לדבר כרגע. שום תגיות לא יוצגו בפומבי עד שתאושרנה.
+        listable: ניתנות להצעה
+        no_tag_selected: לא בוצעו שינויים בתגיות שכן לא נבחרו כאלו
+        not_listable: לא תוצענה
+        not_trendable: לא תופענה תחת נושאים חמים
+        not_usable: לא שמישות
+        peaked_on_and_decaying: הגיע לשיא ב-%{date}, ודועך עכשיו
+        title: תגיות חמות
+        trendable: עשויה להופיע תחת נושאים חמים
+        trending_rank: 'מדורגת #%{rank}'
+        usable: ניתנת לשימוש
+        usage_comparison: שומשה %{today} פעמים היום, לעומת %{yesterday} אתמול
+        used_by_over_week:
+          many: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+          one: הוצגה על ידי משתמש בודד במשך השבוע שעבר
+          other: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+          two: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+      title: נושאים חמים
+      trending: נושאים חמים
+    warning_presets:
+      add_new: הוספת חדש
+      delete: למחוק
+      edit_preset: ערוך/י טקסט מוכן מראש לאזהרה
+      empty: לא הגדרת עדיין שום טקסט מוכן מראש לאזהרה.
+      title: ניהול טקסטים מוכנים מראש לאזהרות
+    webhooks:
+      add_new: הוספת נקודת קצה
+      delete: מחיקה
+      description_html: כלי <strong>webhook</strong> מאפשר למסטודון לשגר <strong>התראות זמן-אמת</strong> לגבי אירועים נבחרים ליישומון שלך כדי שהוא יוכל <strong>להגיב אוטומטית</strong>.
+      disable: כיבוי
+      disabled: כבוי
+      edit: עריכת נקודת קצה
+      empty: לא הוגדו נקודות קצה להתליות רשת עדיין.
+      enable: אפשר
+      enabled: פעילים
+      enabled_events:
+        many: "%{count} אירועים אופשרו"
+        one: אירוע %{count} מאופשר
+        other: "%{count} אירועים אופשרו"
+        two: "%{count} אירועים אופשרו"
+      events: אירועים
+      new: Webhook חדש
+      rotate_secret: החלף מפתח
+      secret: מפתח הרשמה
+      status: סטטוס
+      title: התליות רשת
+      webhook: התליית רשת
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: כדי למחוק את הודעותיהם
+        disable: כדי להקפיא את חשבונם
+        mark_statuses_as_sensitive: כדי לסמן את הודעותיהם כרגישות
+        none: אזהרה
+        sensitive: כדי לסמן את חשבונם כרגיש
+        silence: כדי להגביל את חשבונם
+        suspend: כדי להשעות את חשבונם
+      body: "%{target} מערערים על החלטת מנהלי הקהילה ב-%{action_taken_by} מתאריך %{date}, שהיה %{type}. הם כתבו:"
+      next_steps: ניתן לאשר את הערער כדי להפוך את החלטת מנהלי הקהילה, או להתעלם ממנו.
+      subject: "%{username} מערערים על החלטת מנהלי הקהילה במופע %{instance}"
+    new_pending_account:
+      body: פרטי החשבון החדש מובאים להלן. ניתן לאשר או לדחות את הבקשה.
+      subject: חשבון חדש מובא לסקירה ב-%{instance} (%{username})
+    new_report:
+      body: "%{reporter} דיווחו על %{target}"
+      body_remote: מישהם מהמופע %{domain} דיווחו על %{target}
+      subject: דו"ח חדש מהמופע %{instance} (#%{id})
+    new_trends:
+      body: 'הפריטים הבאים זקוקים לסקירה לפני שניתן יהיה להציגם פומבית:'
+      new_trending_links:
+        title: נושאים חמים
+      new_trending_statuses:
+        title: הודעות חמות
+      new_trending_tags:
+        no_approved_tags: אין כרגע שום תגיות חמות מאושרות.
+        requirements: כל אחת מהמועמדות האלו עשויה לעבור את התגית החמה המאושרת מדרגה %{rank}, שהיא כרגע %{lowest_tag_name} עם ציון של %{lowest_tag_score}.
+        title: תגיות חמות
+      subject: נושאים חמים חדשים מוכנים לסקירה ב-%{instance}
+  aliases:
+    add_new: יצירת שם נרדף
+    created_msg: שם נרדף חדש נוצר בהצלחה. ניתן להתחיל עכשיו את המעבר מהחשבון הישן.
+    deleted_msg: שם נרדף הוסר בהצלחה. מעבר מהחשבון ההוא לזה לא אפשרי יותר.
+    empty: אין לך שמות נרדפים.
+    hint_html: אם ברצונך לעבור מחשבון אחר לחשבון הזה, כאן ניתן ליצור שם נרדף, הנדרש לפני שאפשר יהיה להמשיך עם העברת עוקבים מהחשבון הישן לזה. הפעולה עצמה <strong>הפיכה ובלתי מזיקה</strong>. <strong>הגירת החשבון מופעלת מהחשבון הישן</strong>.
+    remove: הסרת שם נרדף
+  appearance:
+    advanced_web_interface: ממשק ווב מתקדם
+    advanced_web_interface_hint: 'אם ברצונך לעשות שימוש במלוא רוחב המסך, ממשק הווב המתקדם מאפשר לך להגדיר עמודות רבות ושונות כדי לראות בו זמנית כמה מידע שתרצה/י: פיד הבית, התראות, פרהסיה ומספר כלשהו של רשימות ותגיות.'
+    animations_and_accessibility: הנפשות ונגישות
+    confirmation_dialogs: חלונות אישור
+    discovery: גילוי
+    localization:
+      body: מסטודון מתורגם על ידי מתנדבים.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: כולם יכולים לתרום.
+    sensitive_content: תוכן רגיש
+    toot_layout: פריסת הודעה
   application_mailer:
+    notification_preferences: שינוי העדפות דוא"ל
+    salutation: "%{name},"
     settings: 'שינוי הגדרות דוא"ל: %{link}'
     view: 'תצוגה:'
+    view_profile: צפיה בפרופיל
+    view_status: הצגת הודעה
   applications:
-    invalid_url: כתובת הקישורית אינה חוקית
+    created: ישום נוצר בהצלחה
+    destroyed: ישום נמחק בהצלחה
+    regenerate_token: יצירת אסימון גישה מחדש
+    token_regenerated: אסימון גישה יוצר מחדש בהצלחה
+    warning: זהירות רבה נדרשת עם מידע זה. אין לחלוק אותו אף פעם עם אף אחד!
+    your_token: אסימון הגישה שלך
   auth:
+    apply_for_account: הגשת בקשה לחשבון
+    change_password: סיסמה
+    delete_account: מחיקת חשבון
+    delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
+    description:
+      prefix_invited_by_user: "@%{name} רוצה שתצטרף לשרת זה במסטודון!"
+      prefix_sign_up: הרשם/י למסטודון היום!
+      suffix: כבעל/ת חשבון, תוכל/י לעקוב אחרי אנשים, לפרסם עדכונים ולהחליף חצרוצים עם משתמשים מכל שרת מסטודון ועוד!
     didnt_get_confirmation: לא התקבלו הוראות אימות?
+    dont_have_your_security_key: אין לך מפתח אבטחה?
     forgot_password: הנשתכחה סיסמתך?
+    invalid_reset_password_token: טוקן איפוס הסיסמה אינו תקין או שפג תוקף. נא לבקש אחד חדש.
+    link_to_otp: נא להכניס את קוד האימות הדו-גורמי מהטלפון או את קוד האחזור
+    link_to_webauth: נא להשתמש במכשיר מפתח האבטחה
+    log_in_with: התחבר באמצעות
     login: כניסה
     logout: יציאה
+    migrate_account: מעבר לחשבון אחר
+    migrate_account_html: אם ברצונך להכווין את החשבון לעבר חשבון אחר, ניתן <a href="%{path}">להגדיר זאת כאן</a>.
+    or_log_in_with: או התחבר באמצעות
+    privacy_policy_agreement_html: קראתי והסכמתי ל<a href="%{privacy_policy_path}" target="_blank">מדיניות הפרטיות</a>
+    providers:
+      cas: CAS
+      saml: SAML
     register: הרשמה
+    registration_closed: "%{instance} לא מקבל חברים חדשים"
     resend_confirmation: שלח הוראות אימות בשנית
-    reset_password: איפוס סיסמא
-    security: החלפת סיסמא
-    set_new_password: שינוי סיסמא
+    reset_password: איפוס סיסמה
+    rules:
+      preamble: אלו נקבעים ונאכפים ע"י המנחים של %{domain}.
+      title: כמה חוקים בסיסיים.
+    security: אבטחה
+    set_new_password: סיסמה חדשה
+    setup:
+      email_below_hint_html: אם כתובת הדוא"ל להלן לא נכונה, ניתן לשנותה כאן ולקבל דוא"ל אישור חדש.
+      email_settings_hint_html: דוא"ל האישור נשלח ל-%{email}. אם כתובת הדוא"ל הזו לא נכונה, ניתן לשנותה בהגדרות החשבון.
+      title: הגדרות
+    sign_in:
+      preamble_html: הכנס.י עם שם וסיסמא מאתר <strong>%{domain}</strong>. אם חשבונך מתארח בשרת אחר, לא ניתן להתחבר איתו פה.
+      title: התחבר אל %{domain}
+    sign_up:
+      preamble: כיוון שמסטודון מבוזרת, תוכל/י להשתמש בחשבון שלך משרתי מסטודון או רשתות תואמות אחרות אם אין לך חשבון על שרת זה.
+      title: הבה ניצור לך חשבון בשרת %{domain}.
+    status:
+      account_status: מצב חשבון
+      confirming: ממתין שדוא"ל האישור יושלם.
+      functional: החשבון שלכם פעיל לגמרי.
+      pending: בקשתך ממתינה לאישור על ידי הצוות שלנו. זה עשוי לקחת זמן מה. דוא"ל יישלח אליך אם בקשתך התקבלה.
+      redirecting_to: חשבונכם לא פעיל כעת מכיוון שמפנה ל%{acct}.
+      view_strikes: צפיה בעברות קודמות שנרשמו נגד חשבונך
+    too_fast: הטופס הוגש מהר מדי, נסה/י שוב.
+    use_security_key: שימוש במפתח אבטחה
   authorize_follow:
+    already_following: את/ה כבר עוקב/ת אחרי חשבון זה
+    already_requested: כבר נשלחה בקשת מעקב לחשבון זה
     error: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק
     follow: לעקוב
+    follow_request: 'שלחת בקשת מעקב ל:'
+    following: 'הצלחה! הינך עוקב עכשיו אחרי:'
+    post_follow:
+      close: או, פשוט לסגור חלון זה.
+      return: הצג את פרופיל המשתמש
+      web: מעבר לווב
     title: לעקוב אחרי %{acct}
+  challenge:
+    confirm: המשך
+    hint_html: "<strong>טיפ:</strong> לא נבקש את סיסמתך שוב בשעה הקרובה."
+    invalid_password: סיסמה שגויה
+    prompt: יש לאשר את הסיסמה כדי להמשיך
+  crypto:
+    errors:
+      invalid_key: זהו לא מפתח Ed25519 או Curve25519 קביל
+      invalid_signature: היא לא חתימת Ed25519 קבילה
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} שעות"
@@ -190,95 +1065,669 @@ he:
       x_minutes: "%{count} דקות"
       x_months: "%{count} חודשים"
       x_seconds: "%{count} שניות"
+  deletes:
+    challenge_not_passed: המידע שהכנסת לא היה נכון
+    confirm_password: נא להכניס את הסיסמה הנוכחית כדי לאמת את זהותך
+    confirm_username: נא להכניס את שם המשתמש כדאי לאשר את הפעולה
+    proceed: מחיקת חשבון
+    success_msg: חשבונך נמחק בהצלחה
+    warning:
+      before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
+      caches: מידע שהוטמן על ידי שרתים אחרים עשוי להתמיד
+      data_removal: הודעותיך וכל מידע אחר יוסרו לתמיד
+      email_change_html: ניתן <a href="%{path}">לשנות את כתובת הדוא"ל שלך</a> מבלי למחוק את החשבון
+      email_contact_html: אם הוא עדיין לא הגיע, ניתן לקבל עזרה על ידי משלוח דואל ל-<a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: אם לא מתקבל דוא"ל האישור, ניתן <a href="%{path}">לבקש אותו שוב</a>
+      irreversible: לא ניתן יהיה לשחזר או להפעיל מחדש את חשבונך
+      more_details_html: לפרטים נוספים, ראו את <a href="%{terms_path}">מדיניות הפרטיות</a>.
+      username_available: שם המשתמש שלך שוב יהיה זמין
+      username_unavailable: שם המשתמש שלך יישאר בלתי זמין
+  disputes:
+    strikes:
+      action_taken: הפעולה שבוצעה
+      appeal: ערער
+      appeal_approved: הערעור על פסילה זו התקבל
+      appeal_rejected: ערעור זה נדחה
+      appeal_submitted_at: ערעור הוגש
+      appealed_msg: הערעור שלך הוגש. במידה ויאושר, תיודע.
+      appeals:
+        submit: הגש ערעור
+      approve_appeal: קבלת ערעור
+      associated_report: הדו"ח המשויך
+      created_at: מתאריך
+      description_html: אלו הן הפעולות שננקטו כנגד חשבונך והאזהרות שנשלחו אליך על ידי צוות %{instance}.
+      recipient: הנמען
+      reject_appeal: דחיית ערעור
+      status: 'הודעה #%{id}'
+      status_removed: ההודעה כבר הוסרה מהמערכת
+      title: "%{action} מתאריך %{date}"
+      title_actions:
+        delete_statuses: הסרת הודעה
+        disable: הקפאת חשבון
+        mark_statuses_as_sensitive: סימון הודעות כרגישות
+        none: אזהרה
+        sensitive: סימו חשבון כרגיש
+        silence: הגבלת חשבון
+        suspend: השעית חשבון
+      your_appeal_approved: ערעורך התקבל
+      your_appeal_pending: הגשת ערעור
+      your_appeal_rejected: ערעורך נדחה
+  domain_validator:
+    invalid_domain: הוא לא שם דומיין קביל
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': הבקשה שהגשת לא תקינה.
     '403': חסרות לך הרשאות לצפיה בעמוד זה.
     '404': הדף המבוקש לא קיים.
-    '406': This page is not available in the requested format.
+    '406': הדף לא זמין בפורמט המבוקש.
     '410': הדף המבוקש כבר לא קיים.
     '422':
       content: בדיקת אבטחה נכשלה. החסמת עוגיותיך מפנינו?
       title: בדיקת בטיחות נכשלה
     '429': הוחנק
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '500':
+      content: אנו מצטערות, אבל משהו השתבש בצד שלנו.
+      title: דף זה אינו נכון
+    '503': לא ניתן להציג דף זה עקב תקלת שרת זמנית.
+    noscript_html: על מנת להשתמש ביישום הווב של מסטודון, נא לאפשר שימוש בג'אווהסקריפט. לחילופין אפשר לנסות את אחת ה<a href="%{apps_path}">אפליקציות הילידיות</a> שלנו המתאימה לסביבתך.
+  existing_username_validator:
+    not_found: לא נמצא משתמש מקומי בשם זה
+    not_found_multiple: לא נמצאו %{usernames}
   exports:
+    archive_takeout:
+      date: תאריך
+      download: הורדת הארכיון שלך
+      hint_html: ניתן לבקש ארכיון של <strong>הודעותיך וקבצי המדיה</strong> שלך. המידע המיוצא יהיה בפורמט אקטיביטיפאב, שיכול להיקרא על ידי כל תוכנה התומכת בו. ניתן לבקש ארכיון מדי 7 ימים.
+      in_progress: מייצר את הארכיון שלך...
+      request: לבקש את הארכיון שלך
+      size: גודל
     blocks: רשימת חסימות
+    bookmarks: סימניות
+    csv: CSV
+    domain_blocks: חסימות דומיינים
+    lists: רשימות
     mutes: רשימת השתקות
     storage: אחסון מדיה
+  featured_tags:
+    add_new: הוספת חדש
+    errors:
+      limit: המספר המירבי של התגיות כבר מוצג
+    hint_html: "<strong>מהן תגיות נבחרות?</strong> הן מוצגות במובלט בפרופיל הפומבי שלך ומאפשר לאנשים לעיין בהודעות הפומביות שלך המסומנות בתגיות אלה. הן כלי אדיר למעקב אחר עבודות יצירה ופרוייקטים לטווח ארוך."
+  filters:
+    contexts:
+      account: פרופילים
+      home: בית ורשימות
+      notifications: התראות
+      public: פידים פומביים
+      thread: שיחות
+    edit:
+      add_keyword: הוספת מילת מפתח
+      keywords: מילות מפתח
+      statuses: הודעות מסויימות
+      statuses_hint_html: הסנן פועל על בחירה ידנית של הודעות בין אם הן מתאימות למילות המפתח להלן ואם לאו. posts regardless of whether they match the keywords below. <a href="%{path}">בחינה או הסרה של ההודעות מהסנן</a>.
+      title: ערוך מסנן
+    errors:
+      deprecated_api_multiple_keywords: לא ניתן לשנות פרמטרים אלו מהיישומון הזה בגלל שהם חלים על יותר ממילת מפתח אחת. ניתן להשתמש ביישומון מעודכן יותר או בממשק הוובי.
+      invalid_context: לא סופק הקשר או הקשר לא תקין
+    index:
+      contexts: פילטרים ב %{contexts}
+      delete: למחוק
+      empty: אין לך מסננים.
+      expires_in: פג תוקף ב %{distance}
+      expires_on: פג תוקף ב %{date}
+      keywords:
+        many: "%{count} מילות מפתח"
+        one: מילת מפתח %{count}
+        other: "%{count} מילות מפתח"
+        two: "%{count} מילות מפתח"
+      statuses:
+        many: "%{count} הודעות"
+        one: הודעה %{count}
+        other: "%{count} הודעות"
+        two: "%{count} הודעותיים"
+      statuses_long:
+        many: "%{count} הודעות הוסתרו"
+        one: הודעה %{count} יחידה הוסתרה
+        other: "%{count} הודעות הוסתרו"
+        two: הודעותיים %{count} הוסתרו
+      title: מסננים
+    new:
+      save: שמירת מסנן חדש
+      title: הוספת מסנן חדש
+    statuses:
+      back_to_filter: חזרה לפילטר
+      batch:
+        remove: הסרה מפילטר
+      index:
+        hint: סנן זה חל באופן של בחירת הודעות בודדות ללא תלות בקריטריונים אחרים. תוכלו להוסיף עוד הודעות לסנן זה ממנשק הווב.
+        title: הודעות שסוננו
+  footer:
+    trending_now: נושאים חמים
   generic:
+    all: הכל
+    all_items_on_page_selected_html:
+      many: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
+      one: פריט <strong>%{count}</strong> נבחר בעמוד זה.
+      other: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
+      two: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
+    all_matching_items_selected_html:
+      many: נבחרו <strong>%{count}</strong> פריטים שתאמו לחיפוש בעמוד זה.
+      one: נבחר פריט <strong>%{count}</strong> שתאם לחיפוש בעמוד זה.
+      other: נבחרו <strong>%{count}</strong> פריטים שתאמו לחיפוש בעמוד זה.
+      two: נבחרו <strong>%{count}</strong> פריטים שתאמו לחיפוש בעמוד זה.
     changes_saved_msg: השינויים נשמרו בהצלחה!
+    copy: להעתיק
+    delete: למחוק
+    deselect: בטל בחירה של הכל
+    none: כלום
+    order_by: מיין לפי
     save_changes: שמור שינויים
+    select_all_matching_items:
+      many: בחר.י %{count} פריטים שתאמו לחיפוש שלך.
+      one: בחר.י פריט %{count} שתאם לחיפוש שלך.
+      other: בחר.י %{count} פריטים שתאמו לחיפוש שלך.
+      two: בחר. י %{count} פריטים שתאמו לחיפוש שלך.
+    today: היום
+    validation_errors:
+      many: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+      one: משהו עדיין לא בסדר! נא לעיין בשגיאה להלן
+      other: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+      two: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+  html_validator:
+    invalid_markup: 'מכיל קוד HTML לא תקין: %{error}'
   imports:
+    errors:
+      invalid_csv_file: 'קובץ CSV שבור. שגיאה: %{error}'
+      over_rows_processing_limit: מכיל יותר מ-%{count} עמודות
+    modes:
+      merge: מיזוג
+      merge_long: שמירת רשומות קיימות והוספת חדשות
+      overwrite: דריסה
+      overwrite_long: החלף רשומות נוכחיות בחדשות
     preface: ניתן ליבא מידע מסויים כגון כל הנעקבים או המשתמשים החסומים לתוך חשבונך על שרת זה, מתוך קבצים שנוצרו על ידי יצוא משרת אחר כגון רשימת הנעקבים והחסומים שלך.
     success: כל המידע יובא בהצלחה, ויעובד בזמן הקרוב
     types:
       blocking: רשימת חסימות
+      bookmarks: סימניות
+      domain_blocking: רשימת שמות מתחם חסומים
       following: רשימת נעקבים
       muting: רשימת השתקות
     upload: יבוא
+  invites:
+    delete: ביטול הפעלה
+    expired: פג תוקף
+    expires_in:
+      '1800': חצי שעה
+      '21600': 6 שעות
+      '3600': שעה
+      '43200': 12 שעות
+      '604800': שבוע
+      '86400': יום אחד
+    expires_in_prompt: לעולם לא
+    generate: צור קישור להזמנה
+    invited_by: הוזמנת ע"י
+    max_uses:
+      many: "%{count} שימושים"
+      one: שימוש אחד
+      other: "%{count} שימושים"
+      two: "%{count} שימושים"
+    max_uses_prompt: ללא הגבלה
+    prompt: צור ושתף קישורים לאחרים על מנת להעניק גישה לשרת זה
+    table:
+      expires_at: פוקעת ב
+      uses: שימושים
+    title: הזמנת אנשים
+  lists:
+    errors:
+      limit: הגעת למספר הרשימות המירבי.
+  login_activities:
+    authentication_methods:
+      otp: יישומון אימות דו-שלבי
+      password: סיסמה
+      sign_in_token: קוד אימות בדוא"ל
+      webauthn: מפתחות אבטחה
+    description_html: אם את/ה רואה פעילות שאינך מזהה, אנא שנה/י את סיסמתך והפעל/י אימות דו-גורמי.
+    empty: הסטוריית אימותים אינה זמינה
+    failed_sign_in_html: נסיון כניסה כושל בשיטת %{method} מכתובת %{ip} (%{browser})
+    successful_sign_in_html: נסיון כניסה מוצלח בשיטה %{method} מכתובת %{ip} (%{browser})
+    title: הסטוריית אימותים
   media_attachments:
     validations:
-      images_and_video: לא ניתן להוסיף וידאו לחצרוץ שכבר מכיל תמונות
+      images_and_video: לא ניתן להוסיף וידאו להודעה שכבר מכילה תמונות
+      not_ready: לא ניתן להצמיד קבצים שהעלאתם לא הסתיימה. נסה/י שוב בעוד רגע!
       too_many: לא ניתן להוסיף יותר מארבעה קבצים
+  migrations:
+    acct: עבר אל
+    cancel: ביטול הפניה
+    cancel_explanation: ביטול ההפניה יפעיל מחדש את החשבון הנוכחי, אבל לא יחזיר את העוקבים שהועברו לחשבון החדש.
+    cancelled_msg: ההפניה בוטלה בהצלחה.
+    errors:
+      already_moved: זה אותו החשבון שכבר עברת אליו
+      missing_also_known_as: לא שם נרדף של החשבון הזה
+      move_to_self: לא יכול להיות החשבון הנוכחי
+      not_found: לא נמצאו
+      on_cooldown: את/ה בתקופת צינון
+    followers_count: עוקבים בזמן המעבר
+    incoming_migrations: מעבר לחשבון אחר
+    incoming_migrations_html: כדי לעבור מחשבון אחר לחשבון זה, עליך ראשית <a href="%{path}">ליצור שם נרדף לחשבון</a>.
+    moved_msg: חשבונך מופנה עתה ל-%{acct} וכל עוקביך מועברים לשם.
+    not_redirecting: חשבונכם לא מפנה לשום חשבון אחר כעת.
+    on_cooldown: חשבונך היגר לאחרונה. אפשרות זו תאופשר מחדש בעוד %{count} ימים.
+    past_migrations: הגירות עבר
+    proceed_with_move: העברת עוקבים
+    redirected_msg: חשבונכם כעת מפנה ל%{acct}.
+    redirecting_to: חשבונכם מפנה ל%{acct}.
+    set_redirect: הגדר הפניה
+    warning:
+      backreference_required: ראשית יש להגדיר את החשבון החדש כך שיצביע לאחור לעבר חשבון זה
+      before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
+      cooldown: לאחר המעבר ישנה תקופת המתנה בה לא ניתן לעבור שוב
+      disabled_account: חשבונך הנוכחי לא יהיה שמיש לחלוטין לאחר מכן. עם זאת, ניתן יהיה לגשת ליצוא המידע, וכמו כן להפעילו מחדש.
+      followers: פעולה זו תעביר את כל העוקבים מהחשבון הנוכחי לחשבון החדש
+      only_redirect_html: לחילופין, ניתן להסתפק ב<a href="%{path}">הכוונה מחדש בפרופילך</a>.
+      other_data: שום מידע לא יועבר אוטומטית
+      redirect: פרופיל חשבונך הנוכחי יעודכן עם הודעת הכוונה מחדש ויוחרג מחיפושים
+  moderation:
+    title: ניהול קהילה
+  move_handler:
+    carry_blocks_over_text: חשבון זה עבר מ-%{acct}, אותו חסמת בעבר.
+    carry_mutes_over_text: חשבון זה עבר מ-%{acct}, אותו השתקת בעבר.
+    copy_account_note_text: 'חשבון זה הועבר מ-%{acct}, הנה הערותיך הקודמות לגביהם:'
+  navigation:
+    toggle_menu: הצגת\הסתרת תפריט
   notification_mailer:
-    digest:
-      body: להלן סיכום זריז של הדברים שקרו על מאז ביקורך האחרון ב-%{since}
-      mention: "%{name} פנה אליך ב:"
+    admin:
+      report:
+        subject: '%{name} שלח/ה דו"ח'
+      sign_up:
+        subject: "%{name} נרשמו"
     favourite:
-      body: 'חצרוצך חובב על ידי %{name}:'
-      subject: חצרוצך חובב על ידי %{name}
+      body: 'הודעתך חובבה על ידי %{name}:'
+      subject: הודעתך חובבה על ידי %{name}
+      title: חיבוב חדש
     follow:
       body: "%{name} עכשיו במעקב אחריך!"
       subject: "%{name} עכשיו במעקב אחריך"
+      title: עוקב/ת חדש/ה
     follow_request:
+      action: ניהול בקשות מעקב
       body: התקבלה בקשת מעקב מ־%{name}
       subject: 'בקשת מעקב בהמתנה: %{name}'
+      title: בקשת מעקב חדשה
     mention:
+      action: תגובה
       body: 'התקבלה פניה עבורך מאת %{name} ב:'
       subject: התקבלה פניה עבורך מאת %{name}
+      title: אזכור חדש
+    poll:
+      subject: סקר מאת %{name} הסתיים
     reblog:
-      body: 'חצרוצך הודהד על ידי %{name}:'
-      subject: חצרוצך הודהד על ידי%{name}
+      body: 'הודעתך הודהדה על ידי %{name}:'
+      subject: הודעתך הודהדה על ידי%{name}
+      title: הדהוד חדש
+    status:
+      subject: "%{name} בדיוק פרסם"
+    update:
+      subject: "%{name} ערכו הודעה"
+  notifications:
+    email_events: ארועים להתראות דוא"ל
+    email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
+    other_settings: הגדרות התראות אחרות
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: מליארד
+          million: מליון
+          quadrillion: קוואדריליון
+          thousand: אלף
+          trillion: טריליון
+  otp_authentication:
+    code_hint: על מנת לאשר, נא להכניס את הקוד שיוצר על ידי יישום האימות שלך
+    description_html: אם אופשר <strong>אימות דו-גורמי</strong> בעזרת אפליקציית אימות, כניסה לאתר תדרוש שימוש בטלפון ליצירת אסימוני כניסה עבורך.
+    enable: לאפשר
+    instructions_html: "<strong>נא לסרוק את קוד ה-QR בעזרת Google Authenticator או יישום TOTP דומה בטלפונך</strong>. מעתה ואילך, יישום זה ייצר אסימונים שיש להזין בזמן הכניסה לאתר."
+    manual_instructions: 'אם לא ניתן לסרוק את קוד ה-QR ויש להכניסו ידנית, הנה הסוד כטקסט:'
+    setup: הגדרה
+    wrong_code: הקוד שהוכנס אינו תקין! האם זמן השרת וזמן המכשיר נכונים?
   pagination:
+    newer: חדש יותר
     next: הבא
+    older: ישן יותר
     prev: הקודם
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: כבר הצבעת בסקר זה
+      duplicate_options: מכיל פריטים כפולים
+      duration_too_long: רחוק מדי בעתיד
+      duration_too_short: מוקדם מדי
+      expired: סקר זה כבר הסתיים
+      invalid_choice: ההצבעה שנבחרה אינה קיימת
+      over_character_limit: לא יכולים להיות יותר מ-%{max} תוים כל אחד
+      too_few_options: חייב להכיל יותר מפריט אחד
+      too_many_options: לא יכול להכיל יותר מ-%{max} פריטים
+  preferences:
+    other: שונות
+    posting_defaults: ברירות מחדל להודעות
+    public_timelines: פידים פומביים
+  privacy_policy:
+    title: מדיניות פרטיות
+  reactions:
+    errors:
+      limit_reached: גבול מספר התגובות השונות הושג
+      unrecognized_emoji: הוא לא אמוג'י מוכר
+  relationships:
+    activity: רמת פעילות
+    dormant: רדומים
+    follow_selected_followers: עקוב אחר הנעקבים שנבחרו
+    followers: עוקבים
+    following: נעקבים
+    invited: הוזמנו
+    last_active: פעילות אחרונה
+    most_recent: העדכניות ביותר
+    moved: הועברו
+    mutual: הדדיים
+    primary: עיקריים
+    relationship: יחסים
+    remove_selected_domains: הסר את כל העוקבים משמות המתחם שסומנו
+    remove_selected_followers: הסר את העוקבים שסומנו
+    remove_selected_follows: בטל מעקב אחר המשתמשים שסומנו
+    status: מצב חשבון
   remote_follow:
-    acct: נא להקליד שם_משתמש@קהילה מהם ברצונך לעקוב
     missing_resource: לא ניתן למצוא קישורית להפניה לחשבונך
-    proceed: להמשיך ולעקוב
-    prompt: 'לעקוב אחרי:'
+  reports:
+    errors:
+      invalid_rules: לא מתייחס לכללים קבילים
+  rss:
+    content_warning: 'אזהרת תוכן:'
+    descriptions:
+      account: הודעות ציבוריות מחשבון @%{acct}
+      tag: 'הודעות ציבוריות עם תיוג #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: חרגת מהמספר המקסימלי של הודעות מתוזמנות להיום, שהוא %{limit}
+    over_total_limit: חרגת מהמספר המקסימלי של הודעות מתוזמנות, שהוא %{limit}
+    too_soon: תאריך התזמון חייב להיות בעתיד
+  sessions:
+    activity: פעילות אחרונה
+    browser: דפדפן
+    browsers:
+      alipay: Alipay
+      blackberry: בלקברי
+      chrome: כרום
+      edge: מייקרוסופט אדג'
+      electron: אלקטרון
+      firefox: פיירפוקס
+      generic: דפדפן לא ידוע
+      ie: אינטרנט אקספלורר
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: אופרה
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: דפדפן QQ
+      safari: ספארי
+      uc_browser: דפדפן UC
+      weibo: Weibo
+    current_session: חיבור נוכחי
+    description: "%{browser} על %{platform}"
+    explanation: אלה הם הדפדפנים המחוברים כרגע לחשבון המסטודון שלך.
+    ip: IP
+    platforms:
+      adobe_air: אדובה אייר
+      android: אנדרואיד
+      blackberry: בלקברי
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: לינוקס
+      mac: macOS
+      other: סביבה לא ידועה
+      windows: חלונות
+      windows_mobile: חלונות מובייל
+      windows_phone: טלפון חלונות
+    revoke: שלילה
+    revoke_success: החיבור נשלל בהצלחה
+    title: מכשירים מחוברים
+    view_authentication_history: צפיה בהיסטוריית התחברויות לחשבונך
   settings:
+    account: חשבון
+    account_settings: הגדרות חשבון
+    aliases: שמות נרדפים לחשבון
+    appearance: תצוגה
     authorized_apps: ישומים מאושרים
     back: חזרה למסטודון
+    delete: מחיקת חשבון
+    development: פיתוח
     edit_profile: עריכת פרופיל
     export: יצוא מידע
+    featured_tags: תגיות נבחרות
     import: יבוא
+    import_and_export: יבוא ויצוא
+    migrate: הגירת חשבון
+    notifications: התראות
     preferences: העדפות
+    profile: פרופיל
+    relationships: נעקבים ועוקבים
+    statuses_cleanup: מחיקת הודעות אוטומטית
+    strikes: עבירות מנהלתיות
     two_factor_authentication: אימות דו-שלבי
+    webauthn_authentication: מפתחות אבטחה
   statuses:
+    attached:
+      audio:
+        many: "%{count} אודיו"
+        one: אודיו %{count}
+        other: "%{count} אודיו"
+        two: "%{count} אודיו"
+      description: 'מצורף: %{attached}'
+      image:
+        many: "%{count} תמונות"
+        one: תמונה %{count}
+        other: "%{count} תמונות"
+        two: "%{count} תמונותיים"
+      video:
+        many: "%{count} סרטונים"
+        one: סרטון %{count}
+        other: "%{count} סרטונים"
+        two: "%{count} סרטונים"
+    boosted_from_html: הודהד מ-%{acct_link}
+    content_warning: 'אזהרת תוכן: %{warning}'
+    default_language: זהה לשפת ממשק
+    disallowed_hashtags:
+      many: 'מכיל את התגיות האסורות: %{tags}'
+      one: 'מכיל את התגית האסורה: %{tags}'
+      other: 'מכיל את התגיות האסורות: %{tags}'
+      two: 'מכיל את התגיות האסורות: %{tags}'
+    edited_at_html: נערך ב-%{date}
+    errors:
+      in_reply_not_found: נראה שההודעה שאת/ה מנסה להגיב לה לא קיימת.
     open_in_web: פתח ברשת
     over_character_limit: חריגה מגבול התווים של %{max}
+    pin_errors:
+      direct: לא ניתן לקבע הודעות שנראותן מוגבלת למכותבים בלבד
+      limit: הגעת למספר המירבי של ההודעות המוצמדות
+      ownership: הודעות של אחרים לא יכולות להיות מוצמדות
+      reblog: אין אפשרות להצמיד הדהודים
+    poll:
+      total_people:
+        many: "%{count} אנשים"
+        one: איש/ה %{count}
+        other: "%{count} אנשים"
+        two: "%{count} אנשים"
+      total_votes:
+        many: "%{count} קולות"
+        one: קול %{count}
+        other: "%{count} קולות"
+        two: "%{count} קולות"
+      vote: הצבעה
     show_more: עוד
+    show_newer: הצג חדשים יותר
+    show_older: הצג ישנים יותר
+    show_thread: הצג שרשור
+    sign_in_to_participate: הכנס כדי להשתתף בשיחה
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: ישיר
       private: לעוקבים בלבד
       private_long: להצגה לעוקבים בלבד
       public: פומבי
       public_long: כולם יוכלו לקרוא
       unlisted: מוסתר
       unlisted_long: פומבי, אבל לא להצגה בפיד הציבורי
+  statuses_cleanup:
+    enabled: מחק הודעות ישנות אוטומטית
+    enabled_hint: מוחק אוטומטית את הודעותיך לכשהגיעו לסף גיל שנקבע מראש, אלא אם הן תואמות את אחת ההחרגות למטה
+    exceptions: החרגות
+    explanation: היות ומחיקת הודעות היא פעולה יקרה במשאבים, היא נעשית לאט לאורך זמן כאשר השרת לא עסוק במשימות אחרות. לכן, ייתכן שההודעות שלך ימחקו מעט אחרי שיגיעו לסף הגיל שהוגדר.
+    ignore_favs: התעלם ממחובבים
+    ignore_reblogs: התעלם מהדהודים
+    interaction_exceptions: החרגות מבוססות אינטראקציות
+    interaction_exceptions_explanation: כדאי לשים לב שאין ערובה למחיקת הודעות אם הן יורדות מתחת לסף החיבובים או ההדהודים לאחר הסריקה הראשונית.
+    keep_direct: שמירת הודעות ישירות
+    keep_direct_hint: לא מוחק אך אחת מההודעות הישירות שלך
+    keep_media: שמור הודעות עם מדיה
+    keep_media_hint: לא מוחק את הודעותיך שמצורפים אליהן קבצי מדיה
+    keep_pinned: שמור הודעות מוצמדות
+    keep_pinned_hint: לא מוחק אף אחד מההודעות המוצמדות שלך
+    keep_polls: שמור סקרים
+    keep_polls_hint: לא מוחר אף אחד מהסקרים שלך
+    keep_self_bookmark: שמור הודעות שסימנת
+    keep_self_bookmark_hint: לא מוחק הודעות שסימנת
+    keep_self_fav: שמור הודעות שחיבבת
+    keep_self_fav_hint: לא מוחק הודעות שלך אם חיבבת אותם
+    min_age:
+      '1209600': שבועיים
+      '15778476': חצי שנה
+      '2629746': חודש
+      '31556952': שנה
+      '5259492': חודשיים
+      '604800': שבוע
+      '63113904': שנתיים
+      '7889238': 3 חודשים
+    min_age_label: סף גיל
+    min_favs: השאר הודעות מחובבות לפחות
+    min_favs_hint: לא מוחק מי מהודעותיך שקיבלו לפחות את המספר הזה של חיבובים. להשאיר ריק כדי למחוק הודעות ללא קשר למספר החיבובים שקיבלו
+    min_reblogs: שמור הודעות מהודהדות לפחות
+    min_reblogs_hint: לא מוחק מי מהודעותיך שקיבלו לפחות את המספר הזה של הדהודים. להשאיר ריק כדי למחוק הודעות ללא קשר למספר ההדהודים שקיבלו
   stream_entries:
+    pinned: הודעה נעוצה
     reblogged: הודהד
     sensitive_content: תוכן רגיש
+  strikes:
+    errors:
+      too_late: מאוחר מדי להגיש ערעור
+  tags:
+    does_not_match_previous_name: לא תואם את השם האחרון
+  themes:
+    contrast: מסטודון (ניגודיות גבוהה)
+    default: מסטודון (כהה)
+    mastodon-light: מסטודון (בהיר)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
+    add: הוספה
     disable: כיבוי
+    disabled_success: אימות דו-גורמי בוטל בהצלחה
+    edit: עריכה
+    enabled: אימות דו-גורמי הופעל
     enabled_success: אימות דו-שלבי הופעל בהצלחה
     generate_recovery_codes: ייצור קודי אחזור
     lost_recovery_codes: קודי האחזור מאפשרים אחזור גישה לחשבון במידה ומכשירך אבד. במידה וקודי האחזור אבדו, ניתן לייצרם מחדש כאן. תוקף קודי האחזור הישנים יפוג.
+    methods: שיטות אימות דו-גורמי
+    otp: יישום אימות
+    recovery_codes: קודי אחזור
     recovery_codes_regenerated: קודי האחזור יוצרו בהצלחה
     recovery_instructions_html: במידה והגישה למכשירך תאבד, ניתן לייצר קודי אחזור למטה על מנת לאחזר גישה לחשבונך בכל עת. <strong>נא לשמור על קודי הגישה במקום בטוח</strong>. לדוגמא על ידי הדפסתם ושמירתם עם מסמכים חשובים אחרים, או שימוש בתוכנה ייעודית לניהול סיסמאות וסודות.
+    webauthn: מפתחות אבטחה
+  user_mailer:
+    appeal_approved:
+      action: מעבר לחשבונך
+      explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} התקבל. חשבונך חזר להיות נקי מכל רבב.
+      subject: ערעורך מתאריך %{date} התקבל
+      title: הערעור התקבל
+    appeal_rejected:
+      explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} נדחה.
+      subject: ערעורך מתאריך %{date} נדחה
+      title: הערעור נדחה
+    backup_ready:
+      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך. הוא מוכן להורדה!
+      subject: הארכיון שלך מוכן להורדה
+      title: הוצאת ארכיון
+    suspicious_sign_in:
+      change_password: שינוי הסיסמא שלך
+      details: 'הנה פרטי ההתחברות:'
+      explanation: זיהינו התחברות לחשבונך מכתובת IP חדשה.
+      further_actions_html: אם לא את/ה התחברת, אנו ממליצים שתבצע/י %{action} מיידית ותאפשר/י אימות דו גורמי על מנת לשמור על החשבון בטוח.
+      subject: נרשמה גישה לחשבונך מכתובת IP חדשה
+      title: התחברות חדשה
+    warning:
+      appeal: הגשת ערעור
+      appeal_description: אם את/ה מאמין/ה שזו טעות, ניתן להגיש ערעור לצוות של %{instance}.
+      categories:
+        spam: ספאם
+        violation: התוכן מפר את כללי הקהילה הבאים
+      explanation:
+        delete_statuses: כמה מהודעותיך מפרות אחד או יותר מכללי הקהילה וכתוצאה הוסרו על ידי מנחי הקהילה של %{instance}.
+        disable: אינך יכול/ה יותר להשתמש בחשבונך, אבל הפרופיל ושאר המידע נשארו על עומדם. ניתן לבקש גיבוי של המידע, לשנות את הגדרות החשבון או למחוק אותו.
+        mark_statuses_as_sensitive: כמה מהודעותיך סומנו כרגישות על ידי מנחי הקהילה של %{instance}. זה אומר שאנשים יצטרכו להקיש על המדיה בהודעות לפני שתופיע תצוגה מקדימה. ניתן לסמן את המידע כרגיש בעצמך בהודעותיך העתידיות.
+        sensitive: מעתה ואילך כל קבצי המדיה שיועלו על ידך יסומנו כרגישים ויוסתרו מאחורי אזהרה.
+        silence: ניתן עדיין להשתמש בחשבונך אבל רק אנשים שכבר עוקבים אחריך יראו את הודעותיך בשרת זה, וייתכן שתוחרג/י מאמצעי גילוי משתמשים. עם זאת, אחרים יוכלו עדיין לעקוב אחריך.
+        suspend: לא ניתן יותר להשתמש בחשבונך, ופרופילך וכל מידע אחר לא נגישים יותר. ניתן עדיין להתחבר על מנת לבקש גיבוי של המידע שלך עד שיוסר סופית בעוד כ-30 יום, אבל מידע מסויים ישמר על מנת לוודא שלא תחמוק/י מההשעיה.
+      reason: 'סיבה:'
+      statuses: 'הודעות מצוטטות:'
+      subject:
+        delete_statuses: ההודעות שלכם ב%{acct} הוסרו
+        disable: חשבונך %{acct} הוקפא
+        mark_statuses_as_sensitive: הודעותיך ב-%{acct} סומנו כרגישות
+        none: אזהרה עבור %{acct}
+        sensitive: הודעותיך ב-%{acct} יסומנו כרגישות מעתה ואילך
+        silence: חשבונך %{acct} הוגבל
+        suspend: חשבונך %{acct} הושעה
+      title:
+        delete_statuses: הודעות הוסרו
+        disable: חשבון קפוא
+        mark_statuses_as_sensitive: הודעות סומנו כרגישות
+        none: אזהרה
+        sensitive: החשבון סומן כרגיש
+        silence: חשבון מוגבל
+        suspend: חשבון מושעה
+    welcome:
+      edit_profile_action: הגדרת פרופיל
+      edit_profile_step: תוכל.י להתאים אישית את הפרופיל באמצעות העלאת יצגן (אוואטר), כותרת, שינוי כינוי ועוד. אם תרצה.י לסקור את עוקביך/ייך החדשים לפני שתרשה.י להם לעקוב אחריך/ייך.
+      explanation: הנה כמה טיפים לעזור לך להתחיל
+      final_action: התחל/ילי לחצרץ
+      final_step: 'התחל/ילי לחצצר! אפילו ללא עוקבים ייתכן שהחצרוצים הפומביים שלך יראו ע"י אחרים, למשל בציר הזמן המקומי או בתגיות הקבצה (האשתגים). כדאי להציג את עצמך תחת התגית #introductions או #היכרות'
+      full_handle: שם המשתמש המלא שלך
+      full_handle_hint: זה מה שתאמר.י לחברייך כדי שיוכלו לשלוח לך הודעה או לעקוב אחרייך ממופע אחר.
+      subject: ברוכים הבאים למסטודון
+      title: ברוך/ה הבא/ה, %{name} !
   users:
+    follow_limit_reached: לא תוכל לעקוב אחר יותר מ %{limit} אנשים
     invalid_otp_token: קוד דו-שלבי שגוי
+    otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
+    seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
+    signed_in_as: 'מחובר בתור:'
+  verification:
+    explanation_html: 'ניתן <strong>לאמת את עצמך כבעלים של הקישורית במטא-נתונים של פרופילך</strong>. כדי לעשות זאת, האתר המקושם חייב להכיל קישורית חוזרת לפרופיל המסטודון שלך. הקישורית החוזרת <strong>חייבת</strong> להכיל תכונת <code>rel="me"</code>. התוכן הטקסטואלי של הקישורית לא משנה. הנה דוגמא:'
+    verification: אימות
+  webauthn_credentials:
+    add: הוספת מפתח אבטחה חדש
+    create:
+      error: היתה בעיה בהוספת מפתח האבטחה. נסה שנית.
+      success: מפתח האבטחה הוסף בהצלחה.
+    delete: למחוק
+    delete_confirmation: האם אתה בטוח שברצונך למחוק מפתח אבטחה זה?
+    description_html: אם יאופשר <strong>אימות במפתח אבטחה</strong>, כניסה לאתר תדרוש שימוש באחד ממפתחות האבטחה שלך.
+    destroy:
+      error: היתה בעיה במחיקת מפתח האבטחה. נסה בשנית.
+      success: מפתח האבטחה נמחק בהצלחה.
+    invalid_credential: אסימון אבטחה לא תקין
+    nickname_hint: הכנס.י כינוי למפתח האבטחה החדש שלך
+    not_enabled: לא אפשרת את WebAuthn עדיין
+    not_supported: דפדפן זה לא תומך במפתחות אבטחה
+    otp_required: על מנת להשתמש במפתחות אבטחה אנא אפשר.י אימות דו-שלבי קודם.
+    registered_on: נרשם ב %{date}
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d0b1082fc..7678edc38 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -1,17 +1,5 @@
 ---
 hi:
-  about:
-    about_this: विवरण
-    active_count_after: सक्रिय
-    contact: संपर्क
-    learn_more: अधिक जानें
-    privacy_policy: गोपनीयता नीति
-    status_count_after:
-      one: स्थिति
-      other: स्थितियां
-    unavailable_content_description:
-      domain: सर्वर
-      reason: कारण
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 3380f7d42..7a9ee2dc3 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1,40 +1,14 @@
 ---
 hr:
   about:
-    about_hashtag_html: Ovo su javni tootovi označeni s <strong>#%{hashtag}</strong>. Možete biti u interakciji s njima, ako imate račun bilo gdje u fediverzumu.
     about_mastodon_html: 'Društvena mreža budućnosti: bez oglasa, bez korporativnog nadzora, etički dizajn i decentralizacija! Budite u vlasništvu svojih podataka pomoću Mastodona!'
-    about_this: Dodatne informacije
-    active_count_after: aktivnih
-    active_footnote: Mjesečno aktivnih korisnika (MAU)
-    apps: Mobilne aplikacije
-    apps_platforms: Koristite Mastodon na iOS-u, Androidu i drugim platformama
-    contact: Kontakt
     contact_missing: Nije postavljeno
-    discover_users: Otkrijte korisnike
-    documentation: Dokumentacija
-    get_apps: Isprobajte mobilnu aplikaciju
-    learn_more: Saznajte više
-    privacy_policy: Politika privatnosti
-    server_stats: 'Statistika poslužitelja:'
-    source_code: Izvorni kôd
-    status_count_before: Koji su objavili
-    terms: Uvjeti pružanja usluga
-    unavailable_content: Moderirani poslužitelji
   accounts:
     follow: Prati
     following: Praćenih
     last_active: posljednja aktivnost
-    media: Medijski sadržaj
-    never_active: Nikad
     nothing_here: Ovdje nema ničeg!
-    people_followed_by: Ljudi koje %{name} prati
-    people_who_follow: Ljudi koji prate %{name}
     posts_tab_heading: Tootovi
-    posts_with_replies: Tootovi i odgovori
-    roles:
-      group: Grupa
-    unavailable: Profil nije dostupan
-    unfollow: Prestani pratiti
   admin:
     account_actions:
       action: Izvrši radnju
@@ -42,11 +16,9 @@ hr:
       create: Ostavi bilješku
     accounts:
       approve: Odobri
-      approve_all: Odobri sve
       are_you_sure: Jeste li sigurni?
       by_domain: Domena
       change_email:
-        changed_msg: E-pošta računa uspješno je promijenjena!
         current_email: Trenutna e-pošta
         label: Promijeni e-poštu
         new_email: Nova e-pošta
@@ -74,15 +46,12 @@ hr:
       moderation:
         all: Sve
     action_logs:
-      deleted_status: "(izbrisani status)"
       empty: Nema pronađenih izvješća.
       filter_by_action: Filtriraj prema radnji
       filter_by_user: Filtriraj prema korisniku
   application_mailer:
     settings: 'Promijeni postavke e-pošte: %{link}'
     view: 'Vidi:'
-  applications:
-    invalid_url: Unesena poveznica nije valjana
   auth:
     didnt_get_confirmation: Niste primili upute za potvrđivanje?
     forgot_password: Zaboravljena lozinka?
@@ -133,9 +102,6 @@ hr:
     new:
       title: Dodaj novi filter
   footer:
-    developers: Razvijatelji
-    more: Više…
-    resources: Resursi
     trending_now: Popularno
   generic:
     all: Sve
@@ -143,9 +109,6 @@ hr:
     copy: Kopiraj
     delete: Obriši
     save_changes: Sačuvaj izmjene
-  identity_proofs:
-    authorize: Da, autoriziraj
-    identity: Identitet
   imports:
     preface: Možete uvesti podatke koje ste izveli s drugog poslužitelja, kao što su liste ljudi koje pratite ili blokirate.
     success: Vaši podatci uspješno su preneseni i bit će obrađeni u dogledno vrijeme
@@ -170,9 +133,6 @@ hr:
       one: 1 korištenje
       other: "%{count} korištenja"
   notification_mailer:
-    digest:
-      body: Ovo je kratak sažetak propuštenih poruka od Vašeg prošlog posjeta %{since}
-      mention: "%{name} Vas je spomenuo/la:"
     favourite:
       body: "%{name} je označio/la Vaš status favoritom:"
       subject: "%{name} je označio/la Vaš status favoritom"
@@ -207,10 +167,7 @@ hr:
     errors:
       already_voted: Već ste glasali u ovoj anketi
   remote_follow:
-    acct: Unesite Vaše KorisničkoIme@domena s kojim želite izvršiti radnju
     missing_resource: Nije moguće pronaći traženi URL preusmjeravanja za Vaš račun
-    proceed: Dalje
-    prompt: 'Pratit ćete:'
   sessions:
     platforms:
       other: nepoznata platforma
@@ -267,12 +224,9 @@ hr:
         suspend: Račun je suspendiran
     welcome:
       edit_profile_action: Postavi profil
-      review_preferences_action: Promijeni postavke
       subject: Dobro došli na Mastodon
-      tips: Savjeti
   users:
     invalid_otp_token: Nevažeći dvo-faktorski kôd
-    invalid_sign_in_token: Nevažeći sigurnosni kôd
     signed_in_as: 'Prijavljeni kao:'
   verification:
     verification: Verifikacija
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c3a0812b9..3cec6e979 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1,94 +1,27 @@
 ---
 hu:
   about:
-    about_hashtag_html: Ezek a <strong>#%{hashtag}</strong> hashtaggel ellátott nyilvános bejegyzések. Reagálhatsz rájuk, ha már van felhasználói fiókod valahol a föderációban.
     about_mastodon_html: 'A jövő közösségi hálózata: Hirdetések és céges megfigyelés nélkül, etikus dizájnnal és decentralizációval! Legyél a saját adataid ura a Mastodonnal!'
-    about_this: Névjegy
-    active_count_after: aktív
-    active_footnote: Havonta aktív felhasználók
-    administered_by: 'Adminisztrátor:'
-    api: API
-    apps: Mobil appok
-    apps_platforms: Használd a Mastodont iOS-ről, Androidról vagy más platformról
-    browse_directory: Böngészd a profilokat és szűrj érdeklődési körre
-    browse_local_posts: Nézz bele a szerver élő, nyilvános bejegyzéseibe
-    browse_public_posts: Nézz bele a Mastodon élő, nyilvános bejegyzéseibe
-    contact: Kapcsolat
     contact_missing: Nincs megadva
     contact_unavailable: N/A
-    discover_users: Találj meg másokat
-    documentation: Dokumentáció
-    federation_hint_html: Egy %{instance} fiókkal bármely más Mastodon szerveren vagy a föderációban lévő felhasználót követni tudsz.
-    get_apps: Próbálj ki egy mobil appot
     hosted_on: "%{domain} Mastodon szerver"
-    instance_actor_flash: |
-      Ez a fiók virtuális, magát a szervert reprezentálja, nem pedig konkrét
-      felhasználót. Föderációs célokra szolgál, nem szabad tehát felfüggeszteni, hacsak nem akarod a teljes szervert kitiltani, mely esetben a domain tiltásának használata javasolt.
-    learn_more: Tudj meg többet
-    privacy_policy: Adatvédelmi szabályzat
-    rules: Szerverünk szabályai
-    rules_html: 'Alább látod azon követendő szabályok összefoglalóját, melyet be kell tartanod, ha szeretnél fiókot ezen a szerveren:'
-    see_whats_happening: Nézd, mi történik
-    server_stats: 'Szerver statisztika:'
-    source_code: Forráskód
-    status_count_after:
-      one: bejegyzést írt
-      other: bejegyzést írt
-    status_count_before: Eddig
-    tagline: Kövess barátokat és találj újakat
-    terms: Felhasználási feltételek
-    unavailable_content: A tartalom nem elérhető
-    unavailable_content_description:
-      domain: Szerver
-      reason: 'Indok:'
-      rejecting_media: A szerverről származó médiafájlok nem kerülnek feldolgozásra, és nem jelennek meg miniatűrök, amelyek kézi átkattintást igényelnek a másik szerverre.
-      rejecting_media_title: Kiszűrt média
-      silenced: 'Az ezen szerverekről származó bejegyzéseket elrejtjük a nyilvános idővonalakról és beszélgetésekből, a rajtuk lévő felhasználók műveleteiről nem küldünk értesítéseket, hacsak nem követed őket:'
-      silenced_title: Elnémított szerverek
-      suspended: Nem fogsz tudni követni senkit ebből a szerverből, és nem kerül feldolgozásra vagy tárolásra a tőle származó adat, és nincs adatcsere.
-      suspended_title: Felfüggesztett szerverek
-    unavailable_content_html: A Mastodon általában mindenféle tartalomcserét és interakciót lehetővé tesz bármelyik szerverrel a fediverzumban. Ezek azok a kivételek, melyek a mi szerverünkön érvényben vannak.
-    user_count_after:
-      one: felhasználónk
-      other: felhasználónk
-    user_count_before: Összesen
-    what_is_mastodon: Mi a Mastodon?
+    title: Névjegy
   accounts:
-    choices_html: "%{name} választásai:"
-    endorsements_hint: A webes felületen promózhatsz általad követett embereket, akik itt fognak megjelenni.
-    featured_tags_hint: Szerepeltethetsz bizonyos hashtageket, melyek itt jelennek majd meg.
     follow: Követés
     followers:
       one: Követő
       other: Követő
     following: Követett
-    instance_actor_flash: |-
-      Ez a fiók virtuális, magát a szervert reprezentálja, nem pedig konkrét
-      felhasználót. Föderációs célokra szolgál, nem szabad tehát felfüggeszteni.
-    joined: Csatlakozott %{date}
+    instance_actor_flash: Ez a fiók virtuális, magát a kiszolgálót reprezentálja, nem pedig konkrét felhasználót. Föderációs célokra szolgál, nem szabad tehát felfüggeszteni.
     last_active: utoljára aktív
-    link_verified_on: A link tulajdonosát %{date} -n ellenőriztük
-    media: Média
-    moved_html: "%{name} ide költözött: %{new_profile_link}"
-    network_hidden: Ez az információ nem elérhető
-    never_active: Soha
+    link_verified_on: 'A hivatkozás tulajdonosa ekkor volt ellenőrizve: %{date}'
     nothing_here: Nincs itt semmi!
-    people_followed_by: "%{name} követettjei"
-    people_who_follow: "%{name} követői"
     pin_errors:
       following: Ehhez szükséges, hogy kövesd már a felhasználót
     posts:
       one: Bejegyzés
       other: Bejegyzés
     posts_tab_heading: Bejegyzés
-    posts_with_replies: Bejegyzés válaszokkal
-    roles:
-      admin: Adminisztrátor
-      bot: Bot
-      group: Csoport
-      moderator: Moderátor
-    unavailable: Nincs ilyen profil
-    unfollow: Követés vége
   admin:
     account_actions:
       action: Művelet végrehajtása
@@ -96,26 +29,30 @@ hu:
     account_moderation_notes:
       create: Új moderációs bejegyzés
       created_msg: Moderációs bejegyzés létrehozva!
-      delete: Törlés
       destroyed_msg: Moderációs bejegyzés törölve!
     accounts:
       add_email_domain_block: Email domain tiltólistára vétele
       approve: Jóváhagyás
-      approve_all: Mindet jóváhagy
       approved_msg: A %{username} fiók regisztrációs kérelmét sikeresen elfogadtuk
       are_you_sure: Biztos vagy benne?
       avatar: Profilkép
       by_domain: Domain
       change_email:
-        changed_msg: A fiókhoz tartozó e-mailt megváltoztattuk!
+        changed_msg: Az emailt sikeresen megváltoztattuk!
         current_email: Jelenlegi e-mail
         label: E-mail megváltoztatása
         new_email: Új e-mail
         submit: E-mail megváltoztatása
         title: "%{username} felhasználó e-mail változás"
+      change_role:
+        changed_msg: A szerepet sikeresen megváltoztattuk!
+        label: Szerep megváltoztatása
+        no_role: Nincs szerep
+        title: "%{username} szerepének megváltoztatása"
       confirm: Megerősítés
       confirmed: Megerősítve
       confirming: Megerősítés alatt
+      custom: Egyéni
       delete: Adatok törlése
       deleted: Törölve
       demote: Lefokozás
@@ -155,7 +92,7 @@ hu:
         active: Aktív
         all: Összes
         pending: Függőben
-        silenced: Némítva
+        silenced: Korlátozott
         suspended: Felfüggesztve
         title: Moderáció
       moderation_notes: Moderációs bejegyzés
@@ -163,9 +100,14 @@ hu:
       most_recent_ip: Legutóbbi IP-cím
       no_account_selected: Nem változott meg egy fiók sem, mert semmi sem volt kiválasztva
       no_limits_imposed: Nincs korlátozás
+      no_role_assigned: Nincs szerep hozzárendelve
       not_subscribed: Nincs feliratkozás
       pending: Engedélyezés alatt
       perform_full_suspension: Felfüggesztés
+      previous_strikes: Korábbi szankciók
+      previous_strikes_description_html:
+        one: Ezt a fiókot <strong>egyszer</strong> szankcionálták.
+        other: Ezt a fiókot <strong>%{count}</strong> esetben szankcionálták.
       promote: Előléptetés
       protocol: Protokoll
       public: Nyilvános
@@ -173,8 +115,9 @@ hu:
       redownload: Profilkép frissítése
       redownloaded_msg: "%{username} profilját sikeresen frissítettük az eredetiből"
       reject: Elutasítás
-      reject_all: Összes elutasítása
       rejected_msg: A %{username} fiók regisztrációs kérelmét sikeresen elutasítottuk
+      remote_suspension_irreversible: A fiók adatait véglegesen törölték.
+      remote_suspension_reversible_hint_html: 'A fiókot felfüggesztették a kiszolgálóján, az adatai ekkor lesznek teljesen eltávolítva: %{date}. Eddig az időpontig a távoli kiszolgáló probléma nélkül helyre tudja állítani a fiókot. Ha azonnal törölni szeretnéd a fiók adatait, alább megteheted.'
       remove_avatar: Profilkép eltávolítása
       remove_header: Fejléc törlése
       removed_avatar_msg: A %{username} fiók avatárját sikeresen töröltük
@@ -186,19 +129,13 @@ hu:
       reset: Visszaállítás
       reset_password: Jelszó visszaállítása
       resubscribe: Feliratkozás ismét
-      role: Engedélyek
-      roles:
-        admin: Adminisztrátor
-        moderator: Moderátor
-        staff: Stáb
-        user: Felhasználó
+      role: Szerep
       search: Keresés
       search_same_email_domain: Felhasználók ugyanezzel az email domainnel
       search_same_ip: Más felhasználók ugyanezzel az IP-vel
       security_measures:
         only_password: Csak jelszó
         password_and_2fa: Jelszó és kétlépcsős hitelesítés
-        password_and_sign_in_token: Jelszó és e-mail token
       sensitive: Kényes
       sensitized: kényesnek jelölve
       shared_inbox_url: Megosztott bejövő üzenetek URL
@@ -208,12 +145,15 @@ hu:
       silence: Némítás
       silenced: Némított
       statuses: Bejegyzés
+      strikes: Korábbi szankciók
       subscribe: Feliratkozás
+      suspend: Felfüggesztés
       suspended: Felfüggesztett
       suspension_irreversible: Ennek a fióknak az adatait visszaállíthatatlanul törölték. Visszavonhatod a fiók felfüggesztését, hogy újra használható legyen, de a régi adatok ettől még nem fognak visszatérni.
-      suspension_reversible_hint_html: A fiókot felfüggesztettük, az adatait %{date}-n teljesen eltávolítjuk. Eddig az időpontig a fiók probléma nélkül visszaállítható. Ha mégis azonnal törölni szeretnéd a fiókot, alább megteheted.
-      time_in_queue: Várakozás a sorban %{time}
+      suspension_reversible_hint_html: 'A fiókot felfüggesztettük, az adatai ekkor lesznek teljesen eltávolítva: %{date}. Eddig az időpontig a fiók probléma nélkül visszaállítható. Ha mégis azonnal törölni szeretnéd a fiókot, alább megteheted.'
       title: Fiókok
+      unblock_email: E-mail-cím tiltásának feloldása
+      unblocked_email_msg: A(z) %{username} e-mail-cím tiltása sikeresen feloldva
       unconfirmed_email: Nem megerősített e-mail
       undo_sensitized: Kényesnek jelölés visszavonása
       undo_silenced: Némítás visszavonása
@@ -228,26 +168,34 @@ hu:
       whitelisted: Engedélyező-listán
     action_logs:
       action_types:
+        approve_appeal: Fellebbezés jóváhagyása
+        approve_user: Felhasználó Jóváhagyása
         assigned_to_self_report: Jelentés hozzárendelése
         change_email_user: Felhasználó e-mail címének módosítása
+        change_role_user: Felhasználó szerepkörének módosítása
         confirm_user: Felhasználó megerősítése
         create_account_warning: Figyelmeztetés létrehozása
         create_announcement: Közlemény létrehozása
+        create_canonical_email_block: E-mail tiltás létrehozása
         create_custom_emoji: Egyéni emodzsi létrehozása
         create_domain_allow: Domain engedélyezés létrehozása
         create_domain_block: Domain tiltás létrehozása
         create_email_domain_block: E-mail domain tiltás létrehozása
         create_ip_block: IP szabály létrehozása
         create_unavailable_domain: Elérhetetlen domain létrehozása
+        create_user_role: Szerepkör létrehozása
         demote_user: Felhasználó lefokozása
         destroy_announcement: Közlemény törlése
+        destroy_canonical_email_block: E-mail tiltás törlése
         destroy_custom_emoji: Egyéni emodzsi törlése
         destroy_domain_allow: Domain engedélyezés törlése
         destroy_domain_block: Domain tiltás törlése
         destroy_email_domain_block: E-mail domain tiltás törlése
+        destroy_instance: Domain végleges törlése
         destroy_ip_block: IP szabály törlése
         destroy_status: Bejegyzés törlése
         destroy_unavailable_domain: Elérhetetlen domain törlése
+        destroy_user_role: Szerepkör eltávolítása
         disable_2fa_user: Kétlépcsős hitelesítés letiltása
         disable_custom_emoji: Egyéni emodzsi letiltása
         disable_sign_in_token_auth_user: A felhasználó tokenes e-mail hitelesítésének letiltása
@@ -257,67 +205,87 @@ hu:
         enable_user: Felhasználó engedélyezése
         memorialize_account: Fiók emlékké nyilvánítása
         promote_user: Felhasználó előléptetése
+        reject_appeal: Fellebbezés elutasítása
+        reject_user: Felhasználó Elutasítása
         remove_avatar_user: Profilkép eltávolítása
         reopen_report: Jelentés újranyitása
+        resend_user: Megerősítő e-mail újraküldése
         reset_password_user: Jelszó visszaállítása
         resolve_report: Jelentés megoldása
         sensitive_account: A fiókodban minden média kényesnek jelölése
         silence_account: Fiók némítása
         suspend_account: Fiók felfüggesztése
         unassigned_report: Jelentés hozzárendelésének megszüntetése
+        unblock_email_account: E-mail-cím tiltásának feloldása
         unsensitive_account: A fiókodban minden média kényesként jelölésének törlése
         unsilence_account: Fiók némításának feloldása
         unsuspend_account: Fiók felfüggesztésének feloldása
         update_announcement: Közlemény frissítése
         update_custom_emoji: Egyéni emodzsi frissítése
         update_domain_block: Domain tiltás frissítése
+        update_ip_block: IP-szabály frissítése
         update_status: Bejegyzés frissítése
+        update_user_role: Szerepkör frissítése
       actions:
+        approve_appeal_html: "%{name} jóváhagyott egy fellebbezést %{target} moderátori döntéséről"
+        approve_user_html: "%{name} jóváhagyta %{target} regisztrációját"
         assigned_to_self_report_html: "%{name} a %{target} bejelentést magához rendelte"
         change_email_user_html: "%{name} megváltoztatta %{target} felhasználó e-mail címét"
+        change_role_user_html: "%{name} módosította %{target} szerepkörét"
         confirm_user_html: "%{name} megerősítette %{target} e-mail-címét"
         create_account_warning_html: "%{name} figyelmeztetést küldött %{target} számára"
         create_announcement_html: "%{name} új közleményt hozott létre: %{target}"
+        create_canonical_email_block_html: "%{name} letiltotta a(z) %{target} hashű e-mailt"
         create_custom_emoji_html: "%{name} új emodzsit töltött fel: %{target}"
         create_domain_allow_html: "%{name} engedélyezte a föderációt %{target} domainnel"
         create_domain_block_html: "%{name} letiltotta a %{target} domaint"
         create_email_domain_block_html: "%{name} letiltotta a %{target} e-mail domaint"
-        create_ip_block_html: "%{name} létrehozott egy szabályt a %{target} IP-vel kapcsolatban"
+        create_ip_block_html: "%{name} létrehozta a(z) %{target} IP-címre vonatkozó szabályt"
         create_unavailable_domain_html: "%{name} leállította a kézbesítést a %{target} domainbe"
+        create_user_role_html: "%{name} létrehozta a(z) %{target} szerepkört"
         demote_user_html: "%{name} lefokozta %{target} felhasználót"
         destroy_announcement_html: "%{name} törölte a %{target} közleményt"
-        destroy_custom_emoji_html: "%{name} törölte a %{target} emodzsit"
+        destroy_canonical_email_block_html: "%{name} engedélyezte a(z) %{target} hashű e-mailt"
+        destroy_custom_emoji_html: "%{name} törölte a(z) %{target} emodzsit"
         destroy_domain_allow_html: "%{name} letiltotta a föderációt a %{target} domainnel"
         destroy_domain_block_html: "%{name} engedélyezte a %{target} domaint"
         destroy_email_domain_block_html: "%{name} engedélyezte a %{target} e-mail domaint"
-        destroy_ip_block_html: "%{name} törölt egy szabályt a %{target} IP-vel kapcsolatban"
+        destroy_instance_html: "%{name} véglegesen törölte a(z) %{target} domaint"
+        destroy_ip_block_html: "%{name} törölte a(z) %{target} IP-címre vonatkozó szabályt"
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
         destroy_unavailable_domain_html: "%{name} újraindította a kézbesítést a %{target} domainbe"
+        destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
         disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
-        disable_custom_emoji_html: "%{name} letiltotta a %{target} emodzsit"
+        disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
         disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail hitelesítést %{target} felhasználóra"
         disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését"
-        enable_custom_emoji_html: "%{name} engedélyezte a %{target} emodzsit"
+        enable_custom_emoji_html: "%{name} engedélyezte az emodzsit: %{target}"
         enable_sign_in_token_auth_user_html: "%{name} engedélyezte a tokenes e-mail hitelesítést %{target} felhasználóra"
         enable_user_html: "%{name} engedélyezte %{target} felhasználó bejelentkezését"
         memorialize_account_html: "%{name} emléket állított %{target} felhasználónak"
         promote_user_html: "%{name} előléptette %{target} felhasználót"
+        reject_appeal_html: "%{name} visszautasított egy fellebbezést %{target} moderátori döntéséről"
+        reject_user_html: "%{name} elutasította %{target} regisztrációját"
         remove_avatar_user_html: "%{name} törölte %{target} profilképét"
         reopen_report_html: "%{name} újranyitotta a %{target} bejelentést"
+        resend_user_html: "%{name} újraküldte %{target} megerősítő e-mailjét"
         reset_password_user_html: "%{name} visszaállította %{target} felhasználó jelszavát"
         resolve_report_html: "%{name} megoldotta a %{target} bejelentést"
         sensitive_account_html: "%{name} kényesnek jelölte %{target} médiatartalmát"
         silence_account_html: "%{name} lenémította %{target} felhasználói fiókját"
         suspend_account_html: "%{name} felfüggesztette %{target} felhasználói fiókját"
         unassigned_report_html: "%{name} törölte a %{target} bejelentés hozzárendelését"
+        unblock_email_account_html: "%{name} feloldotta a(z) %{target} e-mail-cím tiltását"
         unsensitive_account_html: "%{name} levette a kényesnek jelölést %{target} médiatartalmáról"
         unsilence_account_html: "%{name} feloldotta a némítást %{target} felhasználói fiókján"
         unsuspend_account_html: "%{name} feloldotta %{target} felhasználói fiókjának felfüggesztését"
         update_announcement_html: "%{name} frissítette a %{target} közleményt"
-        update_custom_emoji_html: "%{name} frissítette a %{target} emodzsit"
+        update_custom_emoji_html: "%{name} frissítette az emodzsit: %{target}"
         update_domain_block_html: "%{name} frissítette a %{target} domain tiltását"
+        update_ip_block_html: "%{name} módosította a(z) %{target} IP-címre vonatkozó szabályt"
         update_status_html: "%{name} frissítette %{target} felhasználó bejegyzését"
-      deleted_status: "(törölt bejegyzés)"
+        update_user_role_html: "%{name} módosította a(z) %{target} szerepkört"
+      deleted_account: törölt fiók
       empty: Nem található napló.
       filter_by_action: Szűrés művelet alapján
       filter_by_user: Szűrés felhasználó alapján
@@ -340,35 +308,36 @@ hu:
       unpublished_msg: A közlemény közzététele sikeresen visszavonva!
       updated_msg: A közlemény sikeresen frissítve!
     custom_emojis:
-      assign_category: Kategóriák
+      assign_category: Kategória hozzárendelése
       by_domain: Domain
-      copied_msg: Sikeresen létrehoztuk az emodzsi helyi másolatát
+      copied_msg: Sikeresen létrejött az emodzsi helyi másolata
       copy: Másolás
-      copy_failed_msg: Emodzsi helyi másolatának létrehozása sikertelen
+      copy_failed_msg: Az emodzsi helyi másolatának létrehozása sikertelen
       create_new_category: Új kategória létrehozása
-      created_msg: Emodzsi létrehozva!
+      created_msg: Emodzsi sikeresen létrehozva!
       delete: Törlés
-      destroyed_msg: Emodzsi törlése sikeres!
+      destroyed_msg: Az emodzsi törlése sikeres!
       disable: Letiltás
       disabled: Letiltva
-      disabled_msg: Emodzsi letiltva
+      disabled_msg: Emodzsi sikeresen letiltva
       emoji: Emodzsi
       enable: Engedélyezés
       enabled: Engedélyezve
-      enabled_msg: Emodzsji engedélyezve
-      image_hint: PNG (maximális méret 50KB)
-      list: Listázás
-      listed: Listázva
+      enabled_msg: Emodzsi sikeresen engedélyezve
+      image_hint: PNG vagy GIF, legfeljebb %{size}-os
+      list: Felsorolás
+      listed: Felsorolva
       new:
-        title: Új egyedi emodzsi hozzáadása
+        title: Új egyéni emodzsi hozzáadása
+      no_emoji_selected: Nem változott meg egy emodzsi sem, mert semmi sem volt kiválasztva
       not_permitted: Nem vagy jogosult a művelet végrehajtására
       overwrite: Felülírás
       shortcode: Rövidítés
       shortcode_hint: Legalább két karakter, csak betűk, számok és alsóvonás
-      title: Egyedi emodzsik
+      title: Egyéni emodzsik
       uncategorized: Nem kategorizált
       unlist: Elrejtés a listáról
-      unlisted: Nincs listázva
+      unlisted: Nem listázott
       update_failed_msg: Nem sikerült frissíteni az emodzsit
       updated_msg: Emodzsi sikeresen frissítve!
       upload: Feltöltés
@@ -378,27 +347,36 @@ hu:
       media_storage: Médiatároló
       new_users: új felhasználó
       opened_reports: megnyitott bejelentés
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> fellebbezés folyamatban"
+        other: "<strong>%{count}</strong> fellebbezés folyamatban"
       pending_reports_html:
-        one: "<strong>1</strong> függőben lévő bejelentés"
-        other: "<strong>%{count}</strong> függőben lévő bejelentés"
+        one: "<strong>%{count}</strong> bejelentés folyamatban"
+        other: "<strong>%{count}</strong> bejelentés folyamatban"
       pending_tags_html:
-        one: "<strong>1</strong> függőben lévő hashtag"
-        other: "<strong>%{count}</strong> függőben lévő hashtag"
+        one: "<strong>%{count}</strong> hashtag jóváhagyásra vár"
+        other: "<strong>%{count}</strong> hashtag jóváhagyásra vár"
       pending_users_html:
-        one: "<strong>1</strong> függőben lévő felhasználó"
-        other: "<strong>%{count}</strong> függőben lévő felhasználó"
+        one: "<strong>%{count}</strong> függő fiók"
+        other: "<strong>%{count}</strong> függő fiók"
       resolved_reports: megoldott bejelentés
       software: Szoftver
       sources: Regisztrációs források
       space: Tárhely használat
       title: Műszerfal
       top_languages: Legaktívabb nyelvek
-      top_servers: Legaktívabb szerverek
+      top_servers: Legaktívabb kiszolgálók
       website: Weboldal
+    disputes:
+      appeals:
+        empty: Nem található fellebbezés.
+        title: Fellebbezések
     domain_allows:
       add_new: Domain engedélyezése
       created_msg: A domain rákerült az engedélyező-listára
       destroyed_msg: A domain lekerült az engedélyező-listáról
+      export: Exportálás
+      import: Importálás
       undo: Eltávolítás az engedélyező-listáról
     domain_blocks:
       add_new: Új tiltott domain hozzáadása
@@ -406,16 +384,21 @@ hu:
       destroyed_msg: A domain tiltása feloldva
       domain: Domain
       edit: Domain tiltás szerkesztése
+      existing_domain_block: 'Már szigorúbb korlátozások vonatkoznak a következőre: %{name}.'
       existing_domain_block_html: A %{name} domainen már szorosabb korlátokat állítottál be, először <a href="%{unblock_url}">oldd fel a tiltást</a>.
+      export: Exportálás
+      import: Importálás
       new:
         create: Tiltás létrehozása
         hint: A domain tiltása nem gátolja meg az új fiókok hozzáadását az abatbázishoz, de visszamenőlegesen és automatikusan aktivál bizonyos moderációs szabályokat ezen fiókok esetében.
         severity:
-          desc_html: A <strong>Némítás</strong> elrejti az adott felhasználó bejegyzéseit mindenki elől, aki nem követi őt. A <strong>Felfüggesztés</strong> eltávolítja az adott felhasználó által létrehozott minden tartalmat, ide értve a médiafájlokat és a fiókadatokat is. Válaszd az <strong>Egyik sem</strong> opciót, ha csupán a médiafájlokat szeretnéd elutasítani.
+          desc_html: A <strong>Korlátozás</strong> elrejti a domain fiókjaitól származó bejegyzéseket azok elől, akik nem követik őket. A <strong>Felfüggesztés</strong> eltávolítja a domain fiókjaitól származó összes tartalmat, médiafájlt és profiladatot. Használd a <strong>Nincs </strong> lehetőséget, ha csak a médiafájlokat akarod elutasítani.
           noop: Egyik sem
-          silence: Némítás
+          silence: Korlátozás
           suspend: Felfüggesztés
         title: Új domain tiltása
+      no_domain_block_selected: Nem változott meg egy domain tiltás sem, mert semmi sem volt kiválasztva
+      not_permitted: Nem vagy jogosult a művelet végrehajtására
       obfuscate: Domain név álcázása
       obfuscate_hint: Részlegesen álcázza a domain nevet a listában, ha a domain korlátozások listájának közzététele engedélyezett
       private_comment: Privát megjegyzés
@@ -426,34 +409,41 @@ hu:
       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ó
       reject_reports: Bejelentések elutasítása
       reject_reports_hint: Erről a domainről származó minden bejelentés elutasítása. Felfüggesztett fiókok esetén irreleváns opció
-      rejecting_media: médiafájlok elutasítása
-      rejecting_reports: bejelentések elutasítása
-      severity:
-        silence: némítva
-        suspend: felfüggesztve
-      show:
-        affected_accounts:
-          one: Összesen egy fiók érintett az adatbázisban
-          other: Összesen %{count} fiók érintett az adatbázisban
-        retroactive:
-          silence: Minden felhasználó némításának feloldása ezen a domainen
-          suspend: Minden felhasználó felfüggesztésének feloldása ezen a domainen
-        title: "%{domain} domain tiltásának feloldása"
-        undo: Visszavonás
       undo: Domain tiltásának visszavonása
       view: Domain tiltásának megtekintése
     email_domain_blocks:
       add_new: Új hozzáadása
+      attempts_over_week:
+        one: "%{count} próbálkozás a múlt héten"
+        other: "%{count} próbálkozás feliratkozásra a múlt héten"
       created_msg: E-mail domain sikeresen letiltva
       delete: Törlés
-      destroyed_msg: E-mail domain sikeresen engedélyezve
+      dns:
+        types:
+          mx: MX rekord
       domain: Domain
-      empty: Nincs letiltott email domain.
-      from_html: "%{domain}-ról"
       new:
         create: Domain hozzáadása
+        resolve: Domain feloldása
         title: Új e-mail domain tiltása
+      no_email_domain_block_selected: Nem változott meg egy domain tiltás sem, mert semmi sem volt kiválasztva
+      resolved_dns_records_hint_html: A domain név a következő MX domain-ekre oldódik fel, melyek valójában fogadják az e-mailt. Az MX domain letiltása minden olyan feliratkozást tiltani fog, melyben az e-mailcím ugyanazt az MX domaint használja, még akkor is, ha a látható domain név más. <strong>Légy óvatos, hogy ne tilts le nagy e-mail szolgáltatókat.</strong>
+      resolved_through_html: Feloldva %{domain}-n keresztül
       title: Tiltott e-mail domainek
+    export_domain_allows:
+      new:
+        title: Domain engedélyezések importálása
+      no_file: Nincs fájl kiválasztva
+    export_domain_blocks:
+      import:
+        description_html: Domain tiltások listájának importálására készülsz. Nézd át alaposan, különösen ha nem te állítottad össze ezt a listát.
+        existing_relationships_warning: Létező követési kapcsolatok
+        private_comment_description_html: 'Az importált tiltások forrásának könnyebb követése érdekében, az importált tiltások a következő privát megjegyzéssel lesznek létrehozva: <q>%{comment}</q>'
+        private_comment_template: 'Innen importálva: %{source}, ekkor: %{date}'
+        title: Domain tiltások importálása
+      new:
+        title: Domain tiltások importálása
+      no_file: Nincs fájl kiválasztva
     follow_recommendations:
       description_html: "<strong>A követési ajánlatok segítik az új felhasználókat az érdekes tartalmak gyors megtalálásában</strong>. Ha egy felhasználó még nem érintkezett eleget másokkal ahhoz, hogy személyre szabott ajánlatokat kapjon, ezeket a fiókokat ajánljuk helyette. Ezeket naponta újraszámítjuk a nemrég legtöbb embert foglalkoztató, illetve legtöbb helyi követővel rendelkező fiókok alapján."
       language: Ezen a nyelven
@@ -463,25 +453,53 @@ hu:
       title: Követési ajánlatok
       unsuppress: Követési ajánlatok visszaállítása
     instances:
+      availability:
+        description_html:
+          one: Ha a domainre történő kézbesítés <strong>%{count} teljes nap</strong> sikertelen, további kézbesítéseket már nem kísérlünk meg, hacsak mi nem kapunk kézbesítést a <em>domaintől</em>.
+          other: Ha a domainre történő kézbesítés <strong>%{count} különböző nap</strong> sikertelen, további kézbesítéseket már nem kísérlünk meg, hacsak mi nem kapunk kézbesítést a <em>domaintől</em>.
+        failure_threshold_reached: 'Hibaküszöb elérve ekkor: %{date}.'
+        failures_recorded:
+          one: Sikertelen próbálkozás %{count} napon.
+          other: Sikertelen próbálkozás %{count} különböző napon.
+        no_failures_recorded: Nem rögzítettünk hibát.
+        title: Elérhetőség
+        warning: Az utolsó csatlakozási próbálkozás ehhez a kiszolgálóhoz sikertelen volt
       back_to_all: Mind
       back_to_limited: Korlátozott
       back_to_warning: Figyelmeztetés
       by_domain: Domain
+      confirm_purge: Biztos, hogy véglegesen törölni akarod az adatokat ebből a domainből?
+      content_policies:
+        comment: Belső megjegyzés
+        description_html: Definiálhatsz tartalmi szabályokat, melyek ezen domain és minden aldomain fiókjára vonatkozni fognak.
+        policies:
+          reject_media: Média elutasítása
+          reject_reports: Bejelentések elutasítása
+          silence: Korlátozás
+          suspend: Felfüggesztés
+        policy: Házirend
+        reason: Nyilvános indok
+        title: Tartalmi szabályok
+      dashboard:
+        instance_accounts_dimension: Legtöbbet követett fiókok
+        instance_accounts_measure: tárolt fiók
+        instance_followers_measure: követőnk náluk
+        instance_follows_measure: követőik nálunk
+        instance_languages_dimension: Legnépszerűbb nyelvek
+        instance_media_attachments_measure: tárolt médiatartalom
+        instance_reports_measure: bejelentés róluk
+        instance_statuses_measure: tárolt bejegyzés
       delivery:
         all: Mind
         clear: Kézbesítési hibák törlése
+        failing: Sikertelen
         restart: Kézbesítés újraindítása
         stop: Kézbesítés leállítása
-        title: Kézbesítés
         unavailable: Nem elérhető
-        unavailable_message: Kézbesítés nem elérhető
-        warning: Figyelmeztetés
-        warning_message:
-          one: Kézbesítés sikertelen %{count} napja
-          other: Kézbesítés sikertelen %{count} napja
       delivery_available: Kézbesítés elérhető
       delivery_error_days: Kézbesítési hiba időtartama
       delivery_error_hint: Ha a kézbesítés lehetetlen %{count} napig, automatikusan kézbesíthetetlennek lesz megjelölve.
+      destroyed_msg: A(z) %{domain} adatai sorba lettek állítva végleges törléshez.
       empty: Nem található domain.
       known_accounts:
         one: "%{count} ismert fiók"
@@ -492,12 +510,15 @@ hu:
         title: Moderáció
       private_comment: Privát megjegyzés
       public_comment: Nyilvános megjegyzés
+      purge: Végleges törlés
+      purge_description_html: Ha úgy véled, hogy ez a domain végleg offline marad, a tárhelyedről letörölhetsz minden fiókot és hozzá tartozó adatot. Ez eltarthat egy darabig.
       title: Föderáció
       total_blocked_by_us: Általunk letiltott
       total_followed_by_them: Általuk követett
       total_followed_by_us: Általunk követett
       total_reported: Bejelentés róluk
       total_storage: Média csatolmány
+      totals_time_period_hint_html: Az alább mutatott összesítések minden eddigi adatot tartalmaznak.
     invites:
       deactivate_all: Összes deaktiválása
       filter:
@@ -519,10 +540,8 @@ hu:
         '94670856': 3 év
       new:
         title: Új IP szabály létrehozása
-      no_ip_block_selected: Nem változtattunk egy IP szabályon sem, mivel egy sem volt kiválasztva
+      no_ip_block_selected: Nem változott meg egy IP-szabály sem, mert semmi sem volt kiválasztva
       title: IP szabály
-    pending_accounts:
-      title: Függőben lévő fiókok (%{count})
     relationships:
       title: "%{acct} kapcsolatai"
     relays:
@@ -538,7 +557,7 @@ hu:
       pending: Várakozás a relé jóváhagyására
       save_and_enable: Mentés és engedélyezés
       setup: Relé kapcsolat felállítása
-      signatures_not_enabled: A relék nem fognak jól működni, amíg a biztonságos mód vagy az engedélyező listás mód aktív
+      signatures_not_enabled: A relék nem fognak megfelelően működni, amíg a biztonságos mód vagy a korlátozott föderációs mód engedélyezett
       status: Állapot
       title: Relék
     report_notes:
@@ -549,183 +568,324 @@ hu:
         notes:
           one: "%{count} feljegyzés"
           other: "%{count} feljegyzés"
-        reports:
-          one: "%{count} bejelentés"
-          other: "%{count} bejelentés"
+      action_log: Audit napló
       action_taken_by: 'Kezelte:'
+      actions:
+        delete_description_html: A bejelentett bejegyzéseket törölni fogjuk és feljegyzünk egy szankciót, hogy segítsük az eszkalációt a fiók későbbi kihágásai esetén.
+        mark_as_sensitive_description_html: A bejelentett bejegyzések médaitartalmait érzékenynek jelöljük, és rögzítünk egy szankciót, hogy segítsük az eszkalációt a fiók későbbi kihágásai esetében.
+        other_description_html: További lehetőségek megjelenítése a fiók viselkedésének szabályozásához, és a jelentett fiók kommunikációjának testreszabásához.
+        resolve_description_html: Nem csinálunk semmit a bejelentett fiókkal, nem jegyzünk fel szankciót, és bezárjuk a bejelentést.
+        silence_description_html: A profil csak azok számára lesz látható, akik már követik, vagy kézileg megkeresik, rendkívül korlátozva az elérését. Ez mindig visszafordítható.
+        suspend_description_html: A profil és az összes tartalma elérhetetlen lesz, amíg végleg törlésre nem kerül. A fiókkal történő minden interakció lehetetlen lesz. 30 napon belül még visszaállítható.
+      actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
+      add_to_report: Továbbiak hozzáadása a bejelentéshez
       are_you_sure: Biztos vagy benne?
       assign_to_self: Magamhoz rendelés
       assigned: Hozzárendelt moderátor
+      by_target_domain: A bejelentett fiók domainje
+      category: Kategória
+      category_description_html: A fiók vagy tartalom bejelentésének oka a jelentett fiókkal kapcsolatos kommunikációban idézve lesz
       comment:
         none: Egyik sem
+      comment_description_html: 'Hogy további információkat adjon, %{name} ezt írta:'
       created_at: Jelentve
+      delete_and_resolve: Bejegyzések törlése
       forwarded: Továbbítva
       forwarded_to: 'Továbbítva ide: %{domain}'
       mark_as_resolved: Megjelölés megoldottként
+      mark_as_sensitive: Érzékenynek jelölés
       mark_as_unresolved: Megjelölés megoldatlanként
+      no_one_assigned: Senki
       notes:
         create: Feljegyzés hozzáadása
         create_and_resolve: Megoldás feljegyzéssel
         create_and_unresolve: Újranyitás feljegyzéssel
         delete: Törlés
         placeholder: Jegyezd le, mi tettünk az ügy érdekében, vagy bármilyen változást...
+        title: Megjegyzések
+      notes_description_html: Megtekintés, és megjegyzések hagyása más moderátoroknak
+      quick_actions_description_html: 'Hozz egy gyors intézkedést, vagy görgess le a bejelentett tartalomhoz:'
+      remote_user_placeholder: 'a távoli felhasználó innen: %{instance}'
       reopen: Bejelentés újranyitása
       report: "#%{id} számú jelentés"
       reported_account: Bejelentett fiók
       reported_by: 'Jelentette:'
       resolved: Megoldott
       resolved_msg: A bejelentést sikeresen megoldottuk!
+      skip_to_actions: Tovább az intézkedésekhez
       status: Állapot
-      target_domain: A bejelentett fiók domainje
+      statuses: Jelentett tartalom
+      statuses_description_html: A sértő tartalmat idézni fogjuk a bejelentett fiókkal való kommunikáció során
       target_origin: A jelentett fiók eredete
       title: Bejelentések
       unassign: Hozzárendelés törlése
       unresolved: Megoldatlan
       updated_at: Frissítve
+      view_profile: Profil megtekintése
+    roles:
+      add_new: Szerep hozzáadása
+      assigned_users:
+        one: "%{count} felhasználó"
+        other: "%{count} felhasználó"
+      categories:
+        administration: Adminisztráció
+        devops: DevOps
+        invites: Meghívások
+        moderation: Moderáció
+        special: Speciális
+      delete: Törlés
+      description_html: A <strong>felhasználói szerepekkel</strong> testreszabhatod, hogy a felhasználóid milyen Mastodon funkciókat és területeket érjenek el.
+      edit: "'%{name}' szerep szerkesztése"
+      everyone: Alapértelmezett engedélyek
+      everyone_full_description_html: Ez az <strong>alap szerep</strong>, mely <strong>minden felhasználóra</strong> kihat, azokra is, akiknek nincs hozzárendelt szerepük. Minden más szerep ebből örökli az engedélyeit.
+      permissions_count:
+        one: "%{count} engedély"
+        other: "%{count} engedély"
+      privileges:
+        administrator: Adminisztrátor
+        administrator_description: A felhasználók ezzel a szereppel minden jogosultsággal rendelkeznek
+        delete_user_data: Felhasználói adatok törlése
+        delete_user_data_description: Lehetővé teszi a felhasználónak, hogy azonnal törölhesse más felhasználó adatait
+        invite_users: Felhasználók meghívása
+        invite_users_description: Lehetővé teszi a felhasználónak, hogy új embereket hívjon meg a kiszolgálóra
+        manage_announcements: Hirdetmények kezelése
+        manage_announcements_description: Lehetővé teszi a felhasználónak, hogy a kiszolgáló hirdetményeit kezelje
+        manage_appeals: Fellebbezések kezelése
+        manage_appeals_description: Lehetővé teszi, hogy a felhasználó átnézze a moderációval kapcsolatos fellebbezéseket
+        manage_blocks: Letiltások kezelése
+        manage_blocks_description: Lehetővé teszi, hogy a felhasználó letiltson email szolgáltatókat és IP címeket
+        manage_custom_emojis: Egyedi emodzsik kezelése
+        manage_custom_emojis_description: Lehetővé teszi a felhasználó számára, hogy a kiszolgáló egyéni emodzsiait kezelje
+        manage_federation: Föderáció kezelése
+        manage_federation_description: Lehetővé teszi a felhasználó számára, hogy más domainnekkel való föderációt engedélyezzen vagy letiltson, illetve szabályozza a kézbesítést
+        manage_invites: Meghívások kezelése
+        manage_invites_description: Lehetővé teszi a felhasználó számára, hogy böngéssze és deaktiválja a meghívási hivatkozásokat
+        manage_reports: Bejelentések kezelése
+        manage_reports_description: Lehetővé teszi a felhasználó számára, hogy átnézze a bejelentéseket és moderáljon ezek alapján
+        manage_roles: Szerepek kezelése
+        manage_roles_description: Lehetővé teszi a felhasználó számára, hogy a sajátjánál alacsonyabb rangú szerepeket kezeljen és hozzárendeljen másokhoz
+        manage_rules: Szabályok kezelése
+        manage_rules_description: Lehetővé teszi a felhasználó számára, hogy megváltoztassa a kiszolgáló szabályait
+        manage_settings: Beállítások kezelése
+        manage_settings_description: Lehetővé teszi, hogy a felhasználó megváltoztassa az oldal beállításait
+        manage_taxonomies: Taxonómiák kezelése
+        manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait
+        manage_user_access: Felhasználói hozzáférések kezelése
+        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős azonosítását, megváltoztassa az email címüket, és alaphelyzetbe állítsa a jelszavukat
+        manage_users: Felhasználók kezelése
+        manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket
+        manage_webhooks: Webhookok kezelése
+        manage_webhooks_description: Lehetővé teszi, hogy a felhasználó webhookokat állítson be adminisztratív eseményekhez
+        view_audit_log: Audit napló megtekintése
+        view_audit_log_description: Lehetővé teszi, hogy a felhasználó megtekintse a kiszolgáló adminisztratív eseményeinek történetét
+        view_dashboard: Irányítópult megtekintése
+        view_dashboard_description: Lehetővé teszi, hogy a felhasználó elérje az irányítópultot és vele számos metrikát
+        view_devops: DevOps
+        view_devops_description: Lehetővé teszi, hogy a felhasználó elérje a Sidekiq és pgHero irányítópultjait
+      title: Szerepek
     rules:
       add_new: Szabály hozzáadása
       delete: Törlés
-      description_html: Bár a többség azt állítja, hogy elolvasták és egyetértenek a felhasználói feltételekkel, általában ez nem teljesül, amíg egy probléma elő nem jön. <strong>Tedd könnyebbé a szervered szabályainak áttekintését azzal, hogy pontokba foglalod azt egy listába.</strong> Próbáld meg a különálló szabályokat megtartani rövidnek, egyszerűnek. Próbáld meg azt is, hogy nem darabolod fel őket sok különálló kis pontra.
+      description_html: Bár a többség azt állítja, hogy elolvasták és egyetértenek a felhasználói feltételekkel, általában ez nem teljesül, amíg egy probléma elő nem jön. <strong>Tedd könnyebbé a kiszolgálód szabályainak áttekintését azzal, hogy pontokba foglalod azt egy listában.</strong> Az egyes szabályok legyenek rövidek és egyszerűek. Próbáld meg nem túl sok önálló pontra darabolni őket.
       edit: Szabály szerkesztése
-      empty: Nincsenek még szerver szabályok definiálva.
-      title: Szerverszabályzat
+      empty: Még nincsenek meghatározva a kiszolgáló szabályai.
+      title: Kiszolgáló szabályai
     settings:
-      activity_api_enabled:
-        desc_html: Helyi bejegyzések, aktív felhasználók és új regisztrációk száma heti bontásban
-        title: Felhasználói aktivitás összesített statisztikájának publikussá tétele
-      bootstrap_timeline_accounts:
-        desc_html: Az egyes felhasználóneveket vesszővel válaszd el! Csak helyi és aktivált fiókok esetében működik. Üresen (alapértelmezettként) minden helyi adminisztrátorra érvényes.
-        title: Alapértelmezett követések új felhasználók esetében
-      contact_information:
-        email: Kapcsolattartói e-mail cím
-        username: Kapcsolattartó felhasználóneve
-      custom_css:
-        desc_html: Változtasd meg a kinézetet ebben a CSS-ben, mely minden oldalon be fog töltődni
-        title: Egyedi CSS
+      about:
+        manage_rules: Kiszolgáló szabályainak kezelése
+        preamble: Adj meg részletes információkat arról, hogy a kiszolgáló hogyan működik, miként moderálják és finanszírozzák.
+        rules_hint: Van egy helyünk a szabályoknak, melyeket a felhasználóidnak be kellene tartani.
+        title: Névjegy
+      appearance:
+        preamble: A Mastodon webes felületének testreszabása.
+        title: Megjelenés
+      branding:
+        preamble: A kiszolgáló márkajelzése különbözteti meg a hálózat többi kiszolgálójától. Ez az információ számos környezetben megjelenhet, például a Mastodon webes felületén, natív alkalmazásokban, más weboldalakon és üzenetküldő alkalmazásokban megjelenő hivatkozások előnézetben stb. Ezért a legjobb, ha ez az információ világos, rövid és tömör.
+        title: Branding
+      content_retention:
+        preamble: Felhasználók által generált tartalom Mastodonon való tárolásának szabályozása.
+        title: Tartalom megtartása
       default_noindex:
-        desc_html: Olyan felhasználókat érinti, akik nem módosították ezt a beállítást
-        title: Alapértelmezésként ne indexeljék a keresők a felhasználóinkat
+        desc_html: Azokat a felhasználókat érinti, akik nem módosították ezt a beállítást
+        title: Alapértelmezetten ne indexeljék a keresők a felhasználókat
+      discovery:
+        follow_recommendations: Ajánlottak követése
+        preamble: Az érdekes tartalmak felszínre hozása fontos szerepet játszik az új felhasználók bevonásában, akik esetleg nem ismerik a Mastodont. Szabályozd, hogy a különböző felfedezési funkciók hogyan működjenek a kiszolgálón.
+        profile_directory: Profiladatbázis
+        public_timelines: Nyilvános idővonalak
+        title: Felfedezés
+        trends: Trendek
       domain_blocks:
         all: Mindenkinek
         disabled: Senkinek
-        title: Domain tiltások megjelenitése
         users: Bejelentkezett helyi felhasználóknak
-      domain_blocks_rationale:
-        title: Mutasd meg az indokolást
-      hero:
-        desc_html: A kezdőoldalon látszik. Legalább 600x100px méret javasolt. Ha nincs beállítva, a szerver bélyegképet használjuk
-        title: Hősi kép
-      mascot:
-        desc_html: Több oldalon is látszik. Legalább 293×205px méret javasolt. Ha nincs beállítva, az alapértelmezett kabalát használjuk
-        title: Kabala kép
-      peers_api_enabled:
-        desc_html: Domainek, amelyekkel ez a szerver kapcsolatban áll
-        title: Szerverek listájának közzététele, melyekkel ez a szerver kapcsolatban áll
-      preview_sensitive_media:
-        desc_html: Más weboldalakon linkelt tartalmaink előnézetében mindenképp benne lesz egy bélyegkép még akkor is, ha a médiát kényesnek jelölték meg
-        title: Kényes média mutatása OpenGraph előnézetben
-      profile_directory:
-        desc_html: Lehetővé teszi, hogy a felhasználóinkat megtalálják
-        title: Profil adatbázis engedélyezése
       registrations:
-        closed_message:
-          desc_html: Ez az üzenet jelenik meg a főoldalon, ha a regisztráció nem engedélyezett. HTML-tageket is használhatsz
-          title: Üzenet, ha a regisztráció nem engedélyezett
-        deletion:
-          desc_html: Engedélyezed a felhasználóknak, hogy töröljék fiókjukat
-          title: Fiók törlésének engedélyezése
-        min_invite_role:
-          disabled: Senki
-          title: Meghívások engedélyezése
-        require_invite_text:
-          desc_html: Ha a regisztrációhoz kézi jóváhagyásra van szükség, akkor a „Miért akarsz csatlakozni?” válasz kitöltése legyen kötelező, és ne opcionális
-          title: Az új felhasználóktól legyen megkövetelve a meghívási kérés szövegének kitöltése
+        preamble: Szabályozd, hogy ki hozhat létre fiókot a kiszolgálón.
+        title: Regisztrációk
       registrations_mode:
         modes:
           approved: A regisztráció engedélyhez kötött
           none: Senki sem regisztrálhat
           open: Bárki regisztrálhat
-        title: Regisztrációs mód
-      show_known_fediverse_at_about_page:
-        desc_html: Ha le van tiltva, a nyilvános, főoldalról elérhető idővonalon csak helyi tartalmak jelennek meg
-        title: Mutassuk az általunk ismert föderációt az idővonal előnézetben
-      show_staff_badge:
-        desc_html: Stáb-jelvény megjelenítése a felhasználó oldalán
-        title: Stáb-jelvény megjelenítése
-      site_description:
-        desc_html: Rövid bemutatkozás a főoldalon és a meta fejlécekben. Írd le, mi teszi ezt a szervert különlegessé! Használhatod a <code>&lt;a&gt;</code> és <code>&lt;em&gt;</code> HTML tageket.
-        title: A szerver bemutatása
-      site_description_extended:
-        desc_html: Ide teheted például a közösségi és egyéb szabályzatot, útmutatókat és mindent, ami egyedivé teszi szerveredet. HTML-tageket is használhatsz
-        title: További egyedi információ
-      site_short_description:
-        desc_html: Oldalsávban és meta tag-ekben jelenik meg. Írd le, mi teszi ezt a szervert különlegessé egyetlen bekezdésben.
-        title: Rövid leírás
-      site_terms:
-        desc_html: Megírhatod saját adatkezelési szabályzatodat, felhasználási feltételeidet vagy más hasonló jellegű dokumentumodat. HTML-tageket is használhatsz
-        title: Egyedi felhasználási feltételek
-      site_title: A szerver neve
-      thumbnail:
-        desc_html: OpenGraph-os és API-s előnézetekben használjuk. Ajánlott mérete 1200x630 pixel
-        title: A szerver bélyegképe
-      timeline_preview:
-        desc_html: Nyilvános idővonal megjelenítése a főoldalon
-        title: Idővonal előnézete
-      title: Webhely beállításai
-      trendable_by_default:
-        desc_html: Azokra a hashtagekere hat, melyet előzőleg nem tiltottak le
-        title: Hashtagek trendiségének engedélyezése előzetes ellenőrzés nélkül
-      trends:
-        desc_html: Előzetesen engedélyezett és most trendi hashtagek nyilvános mutatása
-        title: Trendi hashtagek
+      title: Kiszolgálóbeállítások
     site_uploads:
       delete: Feltöltött fájl törlése
       destroyed_msg: Sikeresen töröltük a site feltöltését!
     statuses:
+      account: Szerző
+      application: Alkalmazás
       back_to_account: Vissza a fiók oldalára
+      back_to_report: Vissza a bejelentés oldalra
       batch:
-        delete: Törlés
-        nsfw_off: Kényesnek jelölés törlése
-        nsfw_on: Megjelölés kényes tartalomként
+        remove_from_report: Eltávolítás a bejelentésből
+        report: Bejelentés
       deleted: Törölve
-      failed_to_execute: Végrehajtás sikertelen
+      favourites: Kedvencek
+      history: Verziótörténet
+      in_reply_to: 'Válasz címzettje:'
+      language: Nyelv
       media:
         title: Média
-      no_media: Nincs média
+      metadata: Metaadatok
       no_status_selected: Nem változtattunk meg egy bejegyzést sem, mert semmi sem volt kiválasztva
+      open: Bejegyzés megnyitása
+      original_status: Eredeti bejegyzés
+      reblogs: Megosztások
+      status_changed: A bejegyzés megváltozott
       title: Fiók bejegyzései
+      trending: Felkapott
+      visibility: Láthatóság
       with_media: Médiával
+    strikes:
+      actions:
+        delete_statuses: "%{name} törölte %{target} bejegyzését"
+        disable: "%{name} befagyasztotta %{target} fiókját"
+        mark_statuses_as_sensitive: "%{name} %{target} bejegyzését érzékenynek jelölte"
+        none: "%{name} figyelmeztetést küldött %{target} számára"
+        sensitive: "%{name} érzékenynek jelölte %{target} fiókját"
+        silence: "%{name} korlátozta %{target} fiókját"
+        suspend: "%{name} felfüggesztette %{target} fiókját"
+      appeal_approved: Megfellebbezve
+      appeal_pending: Fellebbezés folyamatban
     system_checks:
       database_schema_check:
         message_html: Vannak esedékes adatbázis migrációink. Kérlek, futtasd őket, hogy biztosítsd, hogy az alkalmazás megfelelően működjön
+      elasticsearch_running_check:
+        message_html: Nem sikerült az Elasticsearchhöz kapcsolódni. Ellenőrizze, hogy fut-e, vagy kapcsolja ki a teljes szöveges keresést.
+      elasticsearch_version_check:
+        message_html: 'Nem kompatibilis Elasticsearch verzió: %{value}'
+        version_comparison: Az Elasticsearch %{running_version} fut, de %{required_version} szükséges
       rules_check:
-        action: Szerver szabályok menedzselése
+        action: Kiszolgáló szabályainak kezelése
         message_html: Még nem definiáltál egy szerver szabályt sem.
       sidekiq_process_check:
         message_html: Nincs Sidekiq folyamat, mely a %{value} sorhoz van rendelve. Kérlek, nézd át a Sidekiq beállításait
     tags:
-      accounts_today: Egyedi használat a mai napon
-      accounts_week: Egyedi használat ezen a héten
-      breakdown: Mai használat bontása forrás szerint
-      last_active: Utoljára aktív
-      most_popular: Legnépszerűbb
-      most_recent: Legutóbbi
-      name: Címke
       review: Engedélyezés állapota
-      reviewed: Engedélyezett
-      title: Hashtagek
-      trending_right_now: Most trendi
-      unique_uses_today: "%{count} mai bejegyzés"
-      unreviewed: Még nem engedélyezett
       updated_msg: A hashtag beállításokat sikeresen frissítettük
     title: Karbantartás
+    trends:
+      allow: Engedélyezés
+      approved: Jóváhagyott
+      disallow: Letiltás
+      links:
+        allow: Hivatkozás engedélyezése
+        allow_provider: Közzétevő engedélyezése
+        description_html: Ezek olyan hivatkozások, melyeket a kiszolgálód által látott fiókok mostanában sokat osztanak meg. Ez segíthet a felhasználóidnak rátalálni arra, hogy mi történik a világban. Egy hivatkozást sem jelenik meg nyilvánosan, amíg a közzétevőt jóvá nem hagytad. A hivatkozásokat külön is engedélyezheted vagy elutasíthatod.
+        disallow: Hivatkozás letiltása
+        disallow_provider: Közzétevő letiltása
+        no_link_selected: Nem változott meg egy hivatkozás sem, mert semmi sem volt kiválasztva
+        publishers:
+          no_publisher_selected: Nem változott meg egy közzétevő sem, mert semmi sem volt kiválasztva
+        shared_by_over_week:
+          one: Egy ember osztotta meg a múlt héten
+          other: "%{count} ember osztotta meg a múlt héten"
+        title: Felkapott hivatkozások
+        usage_comparison: "%{today} alkalommal lett ma megosztva, a tegnapi %{yesterday} alkalomhoz képest"
+      only_allowed: Csak engedélyezett
+      pending_review: Áttekintésre vár
+      preview_card_providers:
+        allowed: A közzétevő hivatkozásai felkapottak lehetnek
+        description_html: Ezek olyan domainek, melyekre vonatkozó hivatkozásokat gyakran osztanak meg a kiszolgálódon. A hivatkozások nem lesznek nyilvánosan felkapottak, amíg a hivatkozás domainjét jóvá nem hagytad. A jóváhagyásod (vagy elutasításod) az aldomainekre is vonatkozik.
+        rejected: A közzétevő hivatkozásai nem lesznek felkapottak
+        title: Közzétévők
+      rejected: Elutasított
+      statuses:
+        allow: Bejegyzés engedélyezése
+        allow_account: Szerző engedélyezése
+        description_html: Ezek olyan, a szervered által ismert bejegyzések, melyeket mostanság gyakran osztanak meg vagy jelölnek kedvencnek. Ez segíthet az új vagy visszatérő felhasználóidnak, hogy több követhető személyt találjanak. Egyetlen bejegyzés sem jelenik meg nyilvánosan, amíg ennek szerzőjét nem hagytad jóvá és ő nem járult hozzá, hogy őt másoknak ajánlják. Bejegyzéseket egyenként is engedélyezhetsz vagy visszautasíthatsz.
+        disallow: Bejegyzés tiltása
+        disallow_account: Szerző tiltása
+        no_status_selected: Nem változott meg egy felkapott bejegyzés sem, mert semmi sem volt kiválasztva
+        not_discoverable: A szerző nem járult hozzá, hogy mások rátalálhassanak
+        shared_by:
+          one: Megosztva vagy kedvencnek jelölve egy alkalommal
+          other: Megosztva és kedvencnek jelölve %{friendly_count} alkalommal
+        title: Felkapott bejegyzések
+      tags:
+        current_score: 'Jelenlegi pontszám: %{score}'
+        dashboard:
+          tag_accounts_measure: egyedi használat
+          tag_languages_dimension: Legnépszerűbb nyelvek
+          tag_servers_dimension: Legnépszerűbb kiszolgálók
+          tag_servers_measure: különböző kiszolgáló
+          tag_uses_measure: összes használat
+        description_html: Ezek olyan hashtagek, melyek mostanság nagyon sok bejegyzésben jelennek meg, melyet a szervered lát. Ez segíthet a felhasználóidnak abban, hogy megtudják, miről beszélnek legtöbbet az emberek az adott pillanatban. Egyetlen hashtaget sem jelenik meg nyilvánosan, amíg azt nem hagytad jóvá.
+        listable: Javasolható
+        no_tag_selected: Nem változott meg egy címke sem, mert semmi sem volt kiválasztva
+        not_listable: Nem lesz javasolva
+        not_trendable: Nem fog megjelenni a trendek alatt
+        not_usable: Nem használható
+        peaked_on_and_decaying: 'Ekkor volt a csúcson: %{date}, most hanyatlik'
+        title: Felkapott hashtagek
+        trendable: Megjelenhet a trendek alatt
+        trending_rank: "%{rank}. felkapott"
+        usable: Használható
+        usage_comparison: "%{today} alkalommal lett ma használva, a tegnapi %{yesterday} alkalomhoz képest"
+        used_by_over_week:
+          one: Egy ember használta a múlt héten
+          other: "%{count} ember használta a múlt héten"
+      title: Trendek
+      trending: Felkapott
     warning_presets:
       add_new: Új hozzáadása
       delete: Törlés
       edit_preset: Figyelmeztetés szerkesztése
       empty: Nem definiáltál még egyetlen figyelmeztetést sem.
       title: Figyelmeztetések
+    webhooks:
+      add_new: Végpont hozzáadása
+      delete: Törlés
+      description_html: Egy <strong>webhook</strong> lehetővé teszi a Mastodon számára, hogy <strong>valósidejű értesítéseket</strong> küldjön le a kiválasztott eseményekről a te alkalmazásodnak, így az alkalmazásod <strong>automatikusan reagálhat</strong> ezekre.
+      disable: Letiltás
+      disabled: Letiltva
+      edit: Végpont szerkesztése
+      empty: Még nincs beállított webhook végpontod.
+      enable: Engedélyezés
+      enabled: Aktív
+      enabled_events:
+        one: 1 engedélyezett esemény
+        other: "%{count} engedélyezett esemény"
+      events: Események
+      new: Új webhook
+      rotate_secret: Titok forgatása
+      secret: Titok aláírása
+      status: Állapot
+      title: Webhookok
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: bejegyzések törléséről
+        disable: fiók befagyasztásáról
+        mark_statuses_as_sensitive: bejegyzések érzékenynek jelöléséről
+        none: figyelmeztetésről
+        sensitive: fiók érzékenynek jelöléséről
+        silence: fiók korlátozásáról
+        suspend: fiók felfüggesztéséről
+      body: "%{target} fellebbezi %{action_taken_by} moderátor %{date}-i, %{type} szóló döntését. Ezt írták:"
+      next_steps: Jóváhagyhatod a fellebbezést, hogy semmissé tedd a moderátori döntést, vagy figyelmen kívül hagyhatod.
+      subject: "%{username} fellebbez egy moderátori döntést a %{instance} szerveren"
     new_pending_account:
       body: Az új fiók részletesen alább látható. Ezt a jelentkezést engedélyezheted vagy elutasíthatod.
       subject: Új fiók (%{username}) engedélyezésre vár a %{instance} szerveren
@@ -733,9 +893,17 @@ hu:
       body: "%{reporter} jelentette: %{target}"
       body_remote: Valaki a %{domain} domainről jelentette %{target}
       subject: 'Új jelentés az alábbi szerveren: %{instance} (#%{id})'
-    new_trending_tag:
-      body: 'A #%{name} hashtag trendi a mai napon, de még nem engedélyeztük eddig. Nem mutatjuk meg nyilvánosan, hacsak nem engedélyezed. Csak simán mentsd az űrlapot, ha soha többé nem akarsz erről a hashtagről hallani.'
-      subject: Új hashtag (#%{name}) engedélyezésre vár a %{instance} szerveren
+    new_trends:
+      body: 'A következő elemeket ellenőrizni kell, mielőtt nyilvánosan megjelennének:'
+      new_trending_links:
+        title: Felkapott hivatkozások
+      new_trending_statuses:
+        title: Felkapott bejegyzések
+      new_trending_tags:
+        no_approved_tags: Jelenleg nincsenek jóváhagyott felkapott hashtagek.
+        requirements: 'Ezek közül bármelyik jelölt lehagyná a %{rank}. jóváhagyott felkapott hashtaget, amely jelenleg a(z) #%{lowest_tag_name} ezzel a pontszámmal: %{lowest_tag_score}.'
+        title: Felkapott hashtagek
+      subject: 'Új jóváhagyandó trendek ezen: %{instance}'
   aliases:
     add_new: Alias készítése
     created_msg: Elkészült az új aliasod. Most már elkezdheted a költöztetést a régi fiókból.
@@ -765,20 +933,17 @@ hu:
   applications:
     created: Alkalmazás sikeresen létrehozva
     destroyed: Alkalmazás sikeresen eltávolítva
-    invalid_url: A megadott URL nem megfelelő
     regenerate_token: Hozzáférési kulcs újragenerálása
     token_regenerated: Hozzáférési kulcs sikeresen újragenerálva
     warning: Ez érzékeny adat. Soha ne oszd meg másokkal!
     your_token: Hozzáférési kulcsod
   auth:
-    apply_for_account: Meghívó kérése
+    apply_for_account: Fiók kérése
     change_password: Jelszó
-    checkbox_agreement_html: Egyetértek a <a href="%{rules_path}" target="_blank">szerver szabályaival</a> és a <a href="%{terms_path}" target="_blank">felhasználási feltételekkel</a>
-    checkbox_agreement_without_rules_html: Egyetértek a <a href="%{terms_path}" target="_blank">felhasználási feltételekkel</a>
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
-      prefix_invited_by_user: "@%{name} meghív téged, hogy csatlakozz erre a Mastodon szerverre!"
+      prefix_invited_by_user: "@%{name} meghív téged, hogy csatlakozz ehhez a Mastodon kiszolgálóhoz."
       prefix_sign_up: Regisztrláj még ma a Mastodonra!
       suffix: Egy fiókkal követhetsz másokat, bejegyzéseket tehetsz közzé, eszmét cserélhetsz más Mastodon szerverek felhasználóival!
     didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
@@ -787,11 +952,13 @@ hu:
     invalid_reset_password_token: A jelszó-visszaállítási kulcs nem megfelelő vagy lejárt. Kérlek generálj egy újat.
     link_to_otp: Írj be egy kétlépcsős azonosító kódot a telefonodról vagy egy visszaállító kódot
     link_to_webauth: Használd a biztonsági kulcs eszközödet
+    log_in_with: Bejelentkezés, mint
     login: Bejelentkezés
     logout: Kijelentkezés
     migrate_account: Felhasználói fiók költöztetése
     migrate_account_html: Ha szeretnéd átirányítani ezt a fiókodat egy másikra, a beállításokat <a href="%{path}">itt találod meg</a>.
     or_log_in_with: Vagy jelentkezz be ezzel
+    privacy_policy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
     providers:
       cas: CAS
       saml: SAML
@@ -799,20 +966,29 @@ hu:
     registration_closed: "%{instance} nem fogad új tagokat"
     resend_confirmation: Megerősítési lépések újraküldése
     reset_password: Jelszó visszaállítása
+    rules:
+      preamble: Ezeket a(z) %{domain} moderátorai adjak meg és tartatják be.
+      title: Néhány alapszabály.
     security: Biztonság
     set_new_password: Új jelszó beállítása
     setup:
       email_below_hint_html: Ha az alábbi e-mail cím nem megfelelő, itt megváltoztathatod és kaphatsz egy új igazoló e-mailt.
       email_settings_hint_html: A visszaigazoló e-mailt elküldtük ide %{email}. Ha az e-mail cím nem megfelelő, megváltoztathatod a fiókod beállításainál.
       title: Beállítás
+    sign_in:
+      preamble_html: Jelentkezz be a <strong>%{domain}</strong> fiókoddal. Ha másik kiszolgálón található a fiókod, akkor itt nem fogsz tudni belépni.
+      title: Jelentkezz be a %{domain}-ra
+    sign_up:
+      preamble: Egy fiókkal ezen a Mastodon kiszolgálón követhetsz bárkit a hálózaton, függetlenül attól, hogy az illető fiókja melyik kiszolgálón található.
+      title: Állítsuk be a fiókod a %{domain} kiszolgálón.
     status:
       account_status: Fiók állapota
       confirming: Várakozás az e-mailes visszaigazolásra.
       functional: A fiókod teljesen működőképes.
       pending: A jelentkezésed engedélyezésre vár. Ez eltarthat egy ideig. Kapsz egy e-mailt, ha a kérelmedet jóváhagyták.
       redirecting_to: A fiókod inaktív, mert jelenleg ide %{acct} van átirányítva.
+      view_strikes: Fiókod elleni korábbi szankciók megtekintése
     too_fast: Túl gyorsan küldted el az űrlapot, próbáld később.
-    trouble_logging_in: Problémád van a bejelentkezéssel?
     use_security_key: Biztonsági kulcs használata
   authorize_follow:
     already_following: Már követed ezt a felhasználót
@@ -870,10 +1046,36 @@ hu:
       more_details_html: A részletekért nézd meg az <a href="%{terms_path}">adatvédelmi szabályzatot</a>.
       username_available: A fiókod ismét elérhetővé válik
       username_unavailable: A fiókod elérhetetlen marad
-  directories:
-    directory: Profilok
-    explanation: Találj másokra érdeklődésük alapján
-    explore_mastodon: "%{title} felfedezése"
+  disputes:
+    strikes:
+      action_taken: Intézkedés
+      appeal: Fellebbezés
+      appeal_approved: Ezt a szankciót eredményesen fellebbezték, így már nem érvényes
+      appeal_rejected: A fellebbezést visszautasították
+      appeal_submitted_at: Fellebbezés beküldve
+      appealed_msg: A fellebbezésedet beküldtük. Ha jóváhagyták, értesítünk.
+      appeals:
+        submit: Fellebbezés beküldése
+      approve_appeal: Fellebbezés jóváhagyása
+      associated_report: Társított bejelentés
+      created_at: Dátum
+      description_html: Ezek a fiókoddal szemben elvégzett műveletek és figyelmeztetések, melyeket a %{instance} szerver csapata küldött.
+      recipient: Címzett
+      reject_appeal: Fellebbezés elutasítása
+      status: 'Bejegyzés #%{id}'
+      status_removed: A bejegyzést már eltávolítottuk a rendszerből
+      title: "%{action} ekkor: %{date}"
+      title_actions:
+        delete_statuses: Bejegyzés eltávolítása
+        disable: Fiók befagyasztása
+        mark_statuses_as_sensitive: Bejegyzések érzékenynek jelölése
+        none: Figyelmeztetés
+        sensitive: Fiók érzékenynek jelölése
+        silence: Fiók korlátozása
+        suspend: Fiók felfüggesztése
+      your_appeal_approved: A fellebbezésedet jóváhagyták
+      your_appeal_pending: Beküldtél egy fellebbezést
+      your_appeal_rejected: A fellebbezésedet visszautasították
   domain_validator:
     invalid_domain: nem egy valódi domain név
   errors:
@@ -889,7 +1091,7 @@ hu:
     '500':
       content: Sajnáljuk, valami hiba történt a mi oldalunkon.
       title: Az oldal nem megfelelő
-    '503': Az oldalt nem tudjuk megmutatni átmeneti szerverprobléma miatt.
+    '503': Az oldalt átmeneti kiszolgálóprobléma miatt nem lehet kiszolgálni.
     noscript_html: A Mastodon webalkalmazás használatához engedélyezned kell a JavaScriptet. A másik megoldás, hogy kipróbálsz egy platformodnak megfelelő <a href="%{apps_path}">alkalmazást</a>.
   existing_username_validator:
     not_found: ezzel a névvel nem találtunk helyi felhasználót
@@ -922,63 +1124,76 @@ hu:
       public: Nyilvános idővonalak
       thread: Beszélgetések
     edit:
+      add_keyword: Kulcsszó hozzáadása
+      keywords: Kulcsszavak
+      statuses: Egyedi bejegyzések
+      statuses_hint_html: Ez a szűrő egyedi bejegyzések kiválasztására vonatkozik, függetlenül attól, hogy megfelelnek-e a lenti kulcsszavaknak. <a href="%{path}">Engedélyezze vagy távolítsa el a bejegyzéseket a szűrőből</a>.
       title: Szűrő szerkesztése
     errors:
+      deprecated_api_multiple_keywords: Ezek a paraméterek nem módosíthatóak az alkalmazásból, mert több mint egy szűrőkulcsszóra is hatással vannak. Használd az alkalmazás vagy a webes felület újabb verzióját.
       invalid_context: A megadott kontextus hamis vagy hiányzik
-      invalid_irreversible: Visszafordíthatatlan szűrést csak saját idővonalon vagy értesítéseken lehet végezni
     index:
+      contexts: 'Szűrés helye: %{contexts}'
       delete: Törlés
       empty: Nincs szűrés.
+      expires_in: 'Ennyi idő múlva jár le: %{distance}'
+      expires_on: 'Lejárat ideje: %{date}'
+      keywords:
+        one: "%{count} kulcsszó"
+        other: "%{count} kulcsszó"
+      statuses:
+        one: "%{count} bejegyzés"
+        other: "%{count} bejegyzés"
+      statuses_long:
+        one: "%{count} egyedi bejegyzés elrejtve"
+        other: "%{count} egyedi bejegyzés elrejtve"
       title: Szűrők
     new:
+      save: Új szűrő mentése
       title: Új szűrő hozzáadása
+    statuses:
+      back_to_filter: Vissza a szűrőhöz
+      batch:
+        remove: Eltávolítás a szűrőből
+      index:
+        hint: Ez a szűrő egyedi bejegyzések kiválasztására vonatkozik a megadott kritériumoktól függetlenül. Újabb bejegyzéseket adhatsz hozzá ehhez a szűrőhöz a webes felületen keresztül.
+        title: Megszűrt bejegyzések
   footer:
-    developers: Fejlesztőknek
-    more: Többet…
-    resources: Segédanyagok
-    trending_now: Most trendi
+    trending_now: Most felkapott
   generic:
     all: Mind
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elem kiválasztva ezen az oldalon."
+      other: Mind a(z) <strong>%{count}</strong> elem kiválasztva ezen az oldalon.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong>, a keresésnek megfelelő elem kiválasztva."
+      other: Mind a(z) <strong>%{count}</strong>, a keresésnek megfelelő elem kiválasztva.
     changes_saved_msg: A változásokat elmentettük!
     copy: Másolás
     delete: Törlés
-    no_batch_actions_available: Ezen az oldalon nem elérhetőek kötegelt műveletek
+    deselect: Összes kiválasztás megszüntetése
+    none: Nincs
     order_by: Rendezés
     save_changes: Változások mentése
+    select_all_matching_items:
+      one: "%{count}, a keresésnek megfelelő elem kiválasztása."
+      other: Mind a(z) %{count}, a keresésnek megfelelő elem kiválasztása.
+    today: ma
     validation_errors:
       one: Valami nincs rendjén! Tekintsd meg a hibát lent
       other: Valami nincs rendjén! Tekintsd meg a(z) %{count} hibát lent
   html_validator:
     invalid_markup: 'hibás HTML leíró: %{error}'
-  identity_proofs:
-    active: Aktív
-    authorize: Igen, engedélyezés
-    authorize_connection_prompt: Engedélyezed ezt a kriptografikus kapcsolatot?
-    errors:
-      failed: A kriptografikus kapcsolat sikertelen. Próbáld inkább innen %{provider}.
-      keybase:
-        invalid_token: A Keybase tokenek hashelt aláírások és pont 66 hexa karakterből állnak
-        verification_failed: A Keybase ezt a tokent nem ismerte fel a %{kb_username} Keybase felhasználó aláírásaként. Próbáld újra Keybase-ből.
-      wrong_user: Nem tudjuk tanúsítani %{proving} felhasználót amíg %{current} felhasználóként vagy bejelentkezve. Jelentkezz be %{proving} felhasználóként és próbáld újra.
-    explanation_html: Itt más személyazonosságaiddal tudsz kriptografikus kapcsolatot létesíteni, pl. Keybase profillal. Így mások titkosított üzenetet küldhetnek neked, valamint megbízhatnak az általad küldött tartalomban is.
-    i_am_html: "%{username} vagyok %{service} szerveren."
-    identity: Személyazonosság
-    inactive: Inaktív
-    publicize_checkbox: 'És ezt tülköld ki:'
-    publicize_toot: 'Tanúsítva! %{username} vagyok %{service}: %{url} szerveren'
-    remove: Tanúsítás eltávolítása a fiókról
-    removed: Leszedtük a tanúsítást a fiókról
-    status: Ellenőrzés állapota
-    view_proof: Tanúsítás megtekintése
   imports:
     errors:
+      invalid_csv_file: 'Érvénytelen CSV-fájl. Hiba: %{error}'
       over_rows_processing_limit: több mint %{count} sort tartalmaz
     modes:
       merge: Összefésülés
       merge_long: Megtartjuk a meglévő bejegyzéseket és hozzávesszük az újakat
       overwrite: Felülírás
       overwrite_long: Lecseréljük újakkal a jelenlegi bejegyzéseket
-    preface: Itt importálhatod egy másik szerverről lementett adataidat, például követettjeid és letiltott felhasználóid listáját.
+    preface: Itt importálhatod egy másik kiszolgálóról lementett adataidat, például követettjeid és letiltott felhasználóid listáját.
     success: Adataidat sikeresen feltöltöttük és feldolgozásukat megkezdtük
     types:
       blocking: Letiltottak listája
@@ -987,7 +1202,6 @@ hu:
       following: Követettjeid listája
       muting: Némított felhasználók listája
     upload: Feltöltés
-  in_memoriam_html: Emlékünkben.
   invites:
     delete: Visszavonás
     expired: Lejárt
@@ -1002,10 +1216,10 @@ hu:
     generate: Generálás
     invited_by: 'Téged meghívott:'
     max_uses:
-      one: 1 felhasználás
-      other: "%{count} felhasználás"
+      one: 1 használat
+      other: "%{count} használat"
     max_uses_prompt: Nincs korlát
-    prompt: Az itt generált linkek megosztásával hívhatod meg ismerőseidet erre a szerverre
+    prompt: Az itt előállított hivatkozások megosztásával hívhatod meg ismerőseidet erre a kiszolgálóra
     table:
       expires_at: Lejárat
       uses: Használat
@@ -1040,9 +1254,9 @@ hu:
       move_to_self: nem lehet az aktuális fiók
       not_found: nem található
       on_cooldown: Még tart a türelmi idő
-    followers_count: Követő a költözéskor
-    incoming_migrations: Más fiókból költöző
-    incoming_migrations_html: Ahhoz, hogy egy másik fiókból ebbe költözz, először <a href="%{path}">hozz létre egy fiók aliast</a>.
+    followers_count: Követők a költözéskor
+    incoming_migrations: Átköltözés egy másik fiókból
+    incoming_migrations_html: Ahhoz, hogy egy másik fiókból ebbe költözz, először <a href="%{path}">hozz létre egy fiókálnevet</a>.
     moved_msg: A fiókod mostantól ide %{acct} irányít át, a követőidet átköltöztetjük.
     not_redirecting: A fiókod nincs átirányítva jelenleg sehová sem.
     on_cooldown: Nemrég költöztetted a fiókod. Ez a funkció %{count} nap múlva lesz megint elérhető.
@@ -1066,18 +1280,14 @@ hu:
     carry_blocks_over_text: Ez a fiók elköltözött innen %{acct}, melyet letiltottatok.
     carry_mutes_over_text: Ez a fiók elköltözött innen %{acct}, melyet lenémítottatok.
     copy_account_note_text: 'Ez a fiók elköltözött innen %{acct}, itt vannak a bejegyzéseitek róla:'
+  navigation:
+    toggle_menu: Menü be/ki
   notification_mailer:
-    digest:
-      action: Összes értesítés megtekintése
-      body: Itt a legutóbbi látogatásod (%{since}) óta írott üzenetek rövid összefoglalása
-      mention: "%{name} megemlített itt:"
-      new_followers_summary:
-        one: Sőt, egy új követőd is lett, amióta nem jártál itt. Hurrá!
-        other: Sőt, %{count} új követőd is lett, amióta nem jártál itt. Hihetetlen!
-      subject:
-        one: "Egy új értesítésed érkezett legutóbbi látogatásod óta \U0001F418"
-        other: "%{count} új értesítésed érkezett legutóbbi látogatásod óta \U0001F418"
-      title: Amíg távol voltál…
+    admin:
+      report:
+        subject: "%{name} bejelentést küldött"
+      sign_up:
+        subject: "%{name} feliratkozott"
     favourite:
       body: 'A bejegyzésedet kedvencnek jelölte %{name}:'
       subject: "%{name} kedvencnek jelölte a bejegyzésedet"
@@ -1104,6 +1314,8 @@ hu:
       title: Új megtolás
     status:
       subject: "%{name} bejegyzést írt"
+    update:
+      subject: "%{name} szerkesztett egy bejegyzést"
   notifications:
     email_events: Események email értesítésekhez
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
@@ -1125,7 +1337,7 @@ hu:
     instructions_html: "<strong>Olvasd be ezt a QR-kódot a telefonodon futó Google Authenticator vagy egyéb TOTP alkalmazással</strong>. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez."
     manual_instructions: 'Ha nem sikerült a QR-kód beolvasása, itt a szöveges kulcs, amelyet manuálisan kell begépelned:'
     setup: Beállítás
-    wrong_code: A beírt kód nem érvényes! A szerver órája és az eszközöd órája szinkronban jár?
+    wrong_code: A beírt kód nem érvényes. A kiszolgáló órája és az eszközöd órája szinkronban jár?
   pagination:
     newer: Újabb
     next: Következő
@@ -1147,6 +1359,8 @@ hu:
     other: Egyéb
     posting_defaults: Bejegyzések alapértelmezései
     public_timelines: Nyilvános idővonalak
+  privacy_policy:
+    title: Adatvédelmi irányelvek
   reactions:
     errors:
       limit_reached: A különböző reakciók száma elérte a határértéket
@@ -1169,22 +1383,15 @@ hu:
     remove_selected_follows: Kiválasztottak követésének abbahagyása
     status: Fiók állapota
   remote_follow:
-    acct: Írd be a felhasználódat, amelyről követni szeretnéd felhasznalonev@domain formátumban
     missing_resource: A fiókodnál nem található a szükséges átirányítási URL
-    no_account_html: Nincs fiókod? <a href='%{sign_up_path}' target='_blank'>Regisztrálj itt</a>
-    proceed: Tovább a követéshez
-    prompt: 'Őt tervezed követni:'
-    reason_html: "<strong>Miért van erre szükség?</strong> <code>%{instance}</code> nem feltétlenül az a szerver, ahol regisztrálva vagy, ezért először a saját szerveredre irányítunk."
-  remote_interaction:
-    favourite:
-      proceed: Jelöljük kedvencnek
-      prompt: 'Ezt a bejegyzést szeretnéd kedvencnek jelölni:'
-    reblog:
-      proceed: Tovább a megtoláshoz
-      prompt: 'Ezt a bejegyzést szeretnéd megtolni:'
-    reply:
-      proceed: Válaszadás
-      prompt: 'Erre a bejegyzésre szeretnél válaszolni:'
+  reports:
+    errors:
+      invalid_rules: nem hivatkozik érvényes szabályra
+  rss:
+    content_warning: 'Tartalmi figyelmeztetés:'
+    descriptions:
+      account: Nyilvános bejegyzések a(z) @%{acct} fióktól
+      tag: 'Ezzel jelölt nyilvános bejegyzések: #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Túllépted az időzített bejegyzésekre vonatkozó %{limit} db-os napi limitet
     over_total_limit: Túllépted az időzített bejegyzésekre vonatkozó %{limit} db-os limitet
@@ -1194,7 +1401,7 @@ hu:
     browser: Böngésző
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1208,7 +1415,7 @@ hu:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Jelenlegi munkamenet
     description: "%{browser} az alábbi platformon: %{platform}"
@@ -1217,7 +1424,7 @@ hu:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1243,7 +1450,6 @@ hu:
     edit_profile: Profil szerkesztése
     export: Adatok exportálása
     featured_tags: Kiemelt hashtagek
-    identity_proofs: Személyazonosság tanúsítások
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
@@ -1252,6 +1458,7 @@ hu:
     profile: Profil
     relationships: Követések és követők
     statuses_cleanup: Bejegyzések automatikus törlése
+    strikes: Moderációs szankciók
     two_factor_authentication: Kétlépcsős hitelesítés
     webauthn_authentication: Biztonsági kulcsok
   statuses:
@@ -1267,19 +1474,20 @@ hu:
         one: "%{count} videó"
         other: "%{count} videó"
     boosted_from_html: Megtolva innen %{acct_link}
-    content_warning: 'Tartalom figyelmeztetés: %{warning}'
+    content_warning: 'Tartalmi figyelmeztetés: %{warning}'
+    default_language: Felhasználói felület nyelvével azonos
     disallowed_hashtags:
       one: 'tiltott hashtaget tartalmaz: %{tags}'
       other: 'tiltott hashtageket tartalmaz: %{tags}'
+    edited_at_html: 'Szerkesztve: %{date}'
     errors:
       in_reply_not_found: Már nem létezik az a bejegyzés, melyre válaszolni szeretnél.
-    language_detection: Nyelv automatikus felismerése
     open_in_web: Megnyitás a weben
     over_character_limit: túllépted a maximális %{max} karakteres keretet
     pin_errors:
+      direct: A csak a megemlített felhasználók számára látható bejegyzések nem tűzhetők ki
       limit: Elérted a kitűzhető bejegyzések maximális számát
       ownership: Nem tűzheted ki valaki más bejegyzését
-      private: Nem nyilvános bejegyzéseket nem tűzhetsz ki
       reblog: Megtolt bejegyzést nem tudsz kitűzni
     poll:
       total_people:
@@ -1307,7 +1515,7 @@ hu:
     enabled: Régi bejegyzések automatikus törlése
     enabled_hint: Automatikusan törli a bejegyzéseidet, ahogy azok elérik a megadott korhatárt, kivéve azokat, melyek illeszkednek valamely alábbi kivételre
     exceptions: Kivételek
-    explanation: Mivel a bejegyzések törlése drága művelet, ezt időben elnyújtva tesszük meg, amikor a szerver éppen nem elfoglalt. Ezért lehetséges, hogy a bejegyzéseidet valamivel később töröljük, mint ahogy azok elérik a korhatárukat.
+    explanation: Mivel a bejegyzések törlése drága művelet, ezért ez időben elnyújtva történik, amikor a kiszolgáló épp nem elfoglalt. Ezért lehetséges, hogy a bejegyzéseid valamivel később lesznek törölve, mint ahogy azok elérik a korhatárukat.
     ignore_favs: Kedvencek kihagyása
     ignore_reblogs: Megtolások kihagyása
     interaction_exceptions: Interakció alapú kivételek
@@ -1330,6 +1538,7 @@ hu:
       '2629746': 1 hónap
       '31556952': 1 év
       '5259492': 2 hónap
+      '604800': 1 hét
       '63113904': 2 év
       '7889238': 3 hónap
     min_age_label: Korhatár
@@ -1341,91 +1550,11 @@ hu:
     pinned: Kitűzött bejegyzés
     reblogged: megtolta
     sensitive_content: Kényes tartalom
+  strikes:
+    errors:
+      too_late: Túl késő, hogy fellebbezd ezt a szankciót
   tags:
     does_not_match_previous_name: nem illeszkedik az előző névvel
-  terms:
-    body_html: |
-      <h2>Adatvédelmi nyilatkozat</h2>
-      <h3 id="collect">Milyen adatokat gyűjtünk?</h3>
-
-      <ul>
-      <li><em>Alapvető fiókadatok</em>: Ha regisztrálsz ezen a szerveren, kérhetünk tőled felhasználói nevet, e-mail címet és jelszót is. Megadhatsz magadról egyéb profil információt, megjelenítendő nevet, bemutatkozást, feltölthetsz profilképet, háttérképet. A felhasználói neved, megjelenítendő neved, bemutatkozásod, profil képed és háttér képed mindig nyilvános mindenki számára.</li>
-      <li><em>Bejegyzések, követések, más nyilvános adatok</em>: Az általad követett emberek listája nyilvános. Ugyanez igaz a te követőidre is. Ha küldesz egy üzenetet, ennek az idejét eltároljuk azzal az alkalmazással együtt, melyből az üzenetet küldted. Az üzenetek tartalmazhatnak média csatolmányt, képeket, videókat. A nyilvános és nem listázott bejegyzések bárki számára elérhetőek. Ha egy bejegyzést kiemelsz a profilodon, az is nyilvánossá válik. Amikor a bejegyzéseidet a követőidnek továbbítjuk, a bejegyzés más szerverekre is átkerülhet, melyeken így másolatok keletkezhetnek. Ha törölsz egy bejegyzést, ez is továbbítódik a követőid felé. A megtolás (reblog) és kedvencnek jelölés művelete is mindig nyilvános.</li>
-      <li><em>Közvetlen és csak követőknek szánt bejegyzések</em>: Minden bejegyzés a szerveren tárolódik. A csak követőknek szánt bejegyzéseidet a követőidnek és az ezekben megemlítetteknek továbbítjuk, míg a közvetlen üzeneteket kizárólag az ebben megemlítettek kapják. Néhány esetben ez azt jelenti, hogy ezek más szerverekre is továbbítódnak, így ott másolatok keletkezhetnek. Jóhiszeműen feltételezzük, hogy más szerverek is hasonlóan járnak el, mikor ezeket az üzeneteket csak az arra jogosultaknak mutatják meg. Ugyanakkor ez nem feltétlenül igaz. Érdemes ezért megvizsgálni azokat a szervereket, melyeken követőid vannak. Be tudod állítani, hogy minden követési kérelmet jóvá kelljen hagynod. <em>Tartsd észben, hogy a ennek és más szervereknek az üzemeltetői láthatják az ilyen üzeneteket</em>, illetve a fogadók képernyőképet, másolatot készíthetnek belőlük, vagy újraoszthatják őket. <em>Ne ossz meg semmilyen veszélyes információt a Mastodon hálózaton!</em></li>
-      <li><em>IP címek és egyéb metaadatok</em>: Bejelentkezéskor eltároljuk a használt böngésződet és IP címedet. Minden rögzített munkamenet elérhető és visszavonható a beállítások között. Az utoljára rögzített IP címet maximum 12 hónapig tároljuk. Egyéb szerver logokat is megtarthatunk, melyek HTTP kérésenként is tárolhatják az IP címedet.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Mire használjuk az adataidat?</h3>
-
-      <p>Bármely tőled begyűjtött adatot a következő célokra használhatjuk fel:</p>
-
-      <ul>
-      <li>Mastodon alapfunkcióinak biztosítása: Csak akkor léphetsz kapcsolatba másokkal, ha be vagy jelentkezve. Pl. követhetsz másokat a saját, személyre szabott idővonaladon.</li>
-      <li>Közösségi moderáció elősegítése: Pl. IP címek összehasonlítása másokéval, hogy kiszűrjük a kitiltások megkerülését.</li>
-      <li>Kapcsolattartás veled: Az általad megadott e-mail címen infókat, értesítéseket küldünk mások interakcióiról, kérésekről, kérdésekről.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Hogyan védjük az adataidat?</h3>
-
-      <p>Üzemben tartunk néhány biztonsági rendszert, hogy megvédjük a személyes adataidat, amikor eléred vagy karbantartod ezeket. Többek között a böngésződ munkamenete, a szerver oldal, valamint a böngésző közötti teljes kommunikáció SSL-lel van titkosítva, a jelszavadat pedig erős, egyirányú algoritmussal hash-eljük. Kétlépcsős azonosítást is bekapcsolhatsz, hogy még biztonságosabbá tedd a fiókodhoz való hozzáférést.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Mik az adatmegőrzési szabályaink?</h3>
-
-      <p>Mindent megteszünk, hogy:</p>
-
-      <ul>
-      <li>A szerver logokat, melyek kérésenként tartalmazzák a felhasználó IP címét maximum 90 napig tartsuk meg.</li>
-      <li>A regisztrált felhasználókat IP címeikkel összekötő adatokat maximum 12 hónapig tartsuk meg.</li>
-      </ul>
-
-      <p>Kérhetsz mentést minden tárolt adatodról, bejegyzésedről, média fájlodról, profil- és háttér képedről.</p>
-
-      <p>Bármikor visszaállíthatatlanul le is törölheted a fiókodat.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Használunk sütiket?</h3>
-
-      <p>Igen. A sütik pici állományok, melyeket az oldalunk a böngésződön keresztül a háttértáradra rak, ha engedélyezed ezt. Ezek a sütik teszik lehetővé, hogy az oldalunk felismerje a böngésződet, és ha regisztráltál, hozzá tudjon kötni a fiókodhoz.</p>
-
-      <p>Arra is használjuk a sütiket, hogy elmenthessük a beállításaidat egy következő látogatás alkalmára.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Átadunk bármilyen adatot harmadik személynek?</h3>
-
-      <p>Az azonosításodra alkalmazható adatokat nem adjuk el, nem kereskedünk vele, nem adjuk át külső szereplőnek. Ez nem foglalja magában azon harmadik személyeket, aki az üzemeltetésben, felhasználók kiszolgálásban és a tevékenységünkben segítenek, de csak addig, amíg ők is elfogadják, hogy ezeket az adatokat bizalmasan kezelik. Akkor is átadhatjuk ezeket az adatokat, ha erre hitünk szerint törvény kötelez minket, ha betartatjuk az oldalunk szabályzatát vagy megvédjük a saját vagy mások személyiségi jogait, tulajdonát, biztonságát.</p>
-
-      <p>A nyilvános tartalmaidat más hálózatban lévő szerverek letölthetik. A nyilvános és csak követőknek szánt bejegyzéseid olyan szerverekre is elküldődnek, melyeken követőid vannak. A közvetlen üzenetek is átkerülnek a címzettek szervereire, ha ők más szerveren regisztráltak.</p>
-
-      <p>Ha felhatalmazol egy alkalmazást, hogy használja a fiókodat, a jóváhagyott hatásköröktől függően ez elérheti a nyilvános profiladataidat, a követettjeid listáját, a követőidet, listáidat, bejegyzéseidet és kedvenceidet is. Ezek az alkalmazások ugyanakkor sosem érhetik el a jelszavadat és e-mail címedet.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Az oldal gyerekek általi használata</h3>
-
-      <p>Ha ez a szerver az EU-ban vagy EEA-ban található: Az oldalunk, szolgáltatásaink és termékeink mind 16 éven felülieket céloznak. Ha 16 évnél fiatalabb vagy, a GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) értelmében kérlek ne használd ezt az oldalt!</p>
-
-      <p>Ha ez a szerver az USA-ban található: Az oldalunk, szolgáltatásaink és termékeink mind 13 éven felülieket céloznak. Ha 13 évnél fiatalabb vagy, a COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) értelmében kérlek ne használd ezt az oldalt!</p>
-
-      <p>A jogi előírások különbözhetnek ettől a világ egyéb tájain.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Adatvédelmi nyilatkozat változásai</h3>
-
-      <p>Ha úgy döntünk, hogy megváltoztatjuk az adatvédelmi nyilatkozatot, ezt ezen az oldalon közzé fogjuk tenni.</p>
-
-      <p>Ez a dokumentum CC-BY-SA. Utoljára 2018.03.07 frissült.</p>
-
-      <p>Eredetileg innen adaptálva <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Felhasználási feltételek és Adatkezelési nyilatkozat"
   themes:
     contrast: Mastodon (Nagy kontrasztú)
     default: Mastodon (Sötét)
@@ -1434,6 +1563,7 @@ hu:
     formats:
       default: "%Y. %b %d., %H:%M"
       month: "%Y %b"
+      time: "%H:%M"
   two_factor_authentication:
     add: Hozzáadás
     disable: Kikapcsolás
@@ -1450,63 +1580,73 @@ hu:
     recovery_instructions_html: A visszaállítási kódok egyikének segítségével tudsz majd belépni, ha elveszítenéd a telefonod. <strong>Tartsd biztos helyen a visszaállítási kódjaid</strong>! Például nyomtasd ki őket és tárold a többi fontos iratoddal együtt.
     webauthn: Biztonsági kulcsok
   user_mailer:
+    appeal_approved:
+      action: Ugrás a fiókodhoz
+      explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i szankcióval kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
+      subject: A %{date}-i fellebbezésedet jóváhagyták
+      title: Fellebbezés jóváhagyva
+    appeal_rejected:
+      explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i szankciójával kapcsolatos, elutasításra került.
+      subject: A %{date}-i fellebbezésedet visszautasították
+      title: Fellebbezés visszautasítva
     backup_ready:
       explanation: A Mastodon fiókod teljes mentését kérted. A mentés kész ás letölthető!
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
-    sign_in_token:
-      details: 'Itt vannak a kísérlet részletei:'
-      explanation: 'Fiókodba történő belépési kísérletet fogtunk ismeretlen IP címről. Ha te vagy az, kérlek az alábbi biztonsági kódot írd be a bejelentkező oldal ezt kérő részén:'
-      further_actions: 'Ha nem te voltál, változtasd meg a jelszavadat és engedélyezd a két-faktoros azonosítást a fiókodban. Itt megteheted:'
-      subject: Erősítsd meg a megkísérelt belépést
-      title: Belépési kísérlet
+    suspicious_sign_in:
+      change_password: módosítsd a jelszavad
+      details: 'Itt vannak a bejelentkezés részletei:'
+      explanation: Egy új IP-címről történő bejelentkezést észleltünk.
+      further_actions_html: Ha nem te voltál, akkor azt javasoljuk, hogy azonnal %{action} és engedélyezd a kétlépcsős hitelesítést, hogy biztonságban tudd a fiókodat.
+      subject: A fiókodat egy új IP-címről érték el
+      title: Új bejelentkezés
     warning:
+      appeal: Fellebbezés beküldése
+      appeal_description: Ha azt gondolod, hogy ez hibás, beküldhetsz egy fellebbezést a(z) %{instance} szerver csapatának.
+      categories:
+        spam: Kéretlen üzenet
+        violation: A tartalom megsérti a következő közösségi irányelveket
       explanation:
-        disable: A fiókod befagyasztott állapotban megtartja minden adatát, de feloldásig nem csinálhatsz vele semmit.
-        sensitive: A feltöltött és hivatkozott médiatartalmaidat kényesként kezeljük.
-        silence: A fiókodat így is használhatod, de csak a követőid láthatják a bejegyzéseidet ezen a szerveren, valamint kimaradhatsz a nyilvános idővonalakról is. Ugyanakkor ettől még mások manuálisan bekövethetnek.
-        suspend: Többé nem használhatod a fiókodat, a profilod és más adataid többé nem elérhetőek. Még be tudsz jelentkezni, hogy lementsd az adataidat addig, amíg azokat teljesen le nem töröljük, bár néhány adatot megtartunk, hogy a jövőben ne tudd elkerülni a felfüggesztést.
-      get_in_touch: Válaszolhatsz erre az emailre, hogy kapcsolatba lépj a %{instance} csapatával.
-      review_server_policies: Szerver szabályzat átnézése
-      statuses: 'Különösen hozzá:'
+        delete_statuses: Néhány bejegyzésedről úgy találták, hogy megsértenek egy vagy több közösségi irányelvet, így ezeket a %{instance} moderátorai eltávolították.
+        disable: Nem használhatod tovább a fiókodat, bár a profil- és egyéb adataid érintetlenül maradnak. Kérhetsz mentést az adataidról, megváltoztathatod a beállításaidat vagy törölheted a fiókodat.
+        mark_statuses_as_sensitive: Néhány bejegyzésedet a %{instance} moderátorai érzékenynek jelölték. Ez azt jelenti, hogy az embereknek először rá kell nyomni a bejegyzés médiatartalmára, mielőtt egy előnézet megjelenne. A jövőben te is megjelölheted bejegyzés írása közben a médiatartalmat érzékenyként.
+        sensitive: Mostantól minden feltöltött médiaállományodat érzékeny tartalomként jelölünk meg és kattintásos figyelmeztetés mögé rejtjük.
+        silence: A fiókodat most is használhatod, de ezen a kiszolgálón csak olyanok láthatják a bejegyzéseidet, akik már eddig is a követőid voltak, valamint kimaradhatsz a különböző felfedezési funkciókból. Viszont mások kézileg továbbra is be tudnak követni.
+        suspend: Többé nem használhatod a fiókodat, a profilod és más adataid többé nem elérhetőek. Még be tudsz jelentkezni, hogy mentést kérj az adataidról addig, amíg kb. 30 nap múlva teljesen le nem töröljük őket. Néhány alapadatot megtartunk, hogy el tudjuk kerülni, hogy megkerüld a felfüggesztést.
+      reason: 'Indok:'
+      statuses: 'Bejegyzések idézve:'
       subject:
+        delete_statuses: A(z) %{acct} fiók bejegyzései eltávolításra kerültek
         disable: A fiókodat %{acct} befagyasztották
+        mark_statuses_as_sensitive: Bejegyzéseidet a %{acct} szerveren érzékenyek jelölték
         none: Figyelmeztetés a %{acct} fióknak
-        sensitive: A %{acct} fiókod médiatartalmait kényesnek jelölték
+        sensitive: Bejegyzéseidet a %{acct} szerveren mostantól érzékenynek jelöljük
         silence: A fiókodat %{acct} korlátozták
         suspend: A fiókodat %{acct} felfüggesztették
       title:
+        delete_statuses: Bejegyzések törölve
         disable: Befagyasztott fiók
+        mark_statuses_as_sensitive: Bejegyzések érzékenynek jelölve
         none: Figyelem
-        sensitive: Médiatartalmadat kényesnek jelölték
+        sensitive: Fiók érzékenynek jelölve
         silence: Lekorlátozott fiók
         suspend: Felfüggesztett fiók
     welcome:
       edit_profile_action: Készítsd el profilod
-      edit_profile_step: 'Itt tudod egyedivé tenni a profilod: feltölthetsz profil- és borítóképet, megváltoztathatod a megjelenített neved és így tovább. Ha jóvá szeretnéd hagyni követőidet, mielőtt követhetnek, itt tudod a fiókodat zárttá tenni.'
+      edit_profile_step: Testreszabhatod a profilod egy profilkép feltöltésével, a megjelenített neved megváltoztatásával és így tovább. Bekapcsolhatod az új követőid jóváhagyását, mielőtt követhetnek.
       explanation: Néhány tipp a kezdeti lépésekhez
       final_action: Kezdj bejegyzéseket írni
-      final_step: 'Kezdj tülkölni! Nyilvános üzeneteid még követők híján is megjelennek másoknak, például a helyi idővonalon és a hashtageknél. Kezdd azzal, hogy bemutatkozol a #bemutatkozas vagy az #introductions hashtag használatával.'
+      final_step: 'Kezdj tülkölni! A nyilvános bejegyzéseid még követők híján is megjelennek másoknak, például a helyi idővonalon vagy a hashtageknél. Kezdd azzal, hogy bemutatkozol a #bemutatkozas vagy az #introductions hashtag használatával.'
       full_handle: Teljes felhasználóneved
       full_handle_hint: Ez az, amit megadhatsz másoknak, hogy üzenhessenek neked vagy követhessenek téged más szerverekről.
-      review_preferences_action: Beállítások módosítása
-      review_preferences_step: Tekintsd át a beállításaidat, például hogy milyen értesítéseket kérsz e-mailben, vagy hogy alapértelmezettként mi legyen a bejegyzéseid láthatósága. Ha nem vagy szédülős alkat, GIF-ek automatikus lejátszását is engedélyezheted.
       subject: Üdvözöl a Mastodon
-      tip_federated_timeline: A föderációs idővonal a Mastodon hálózat ütőere. Nem teljes, mivel csak azokat az embereket fogod látni, akiket a szervered többi felhasználója közül valaki már követ.
-      tip_following: Alapértelmezettként szervered adminisztrátorait követed. Látogasd meg a helyi és a nyilvános idővonalat, hogy más érdekes emberekre is rátalálj.
-      tip_local_timeline: A helyi idővonal a saját szervered (%{instance}) ütőere. Ezek a kedves emberek itt mind a szomszédaid!
-      tip_mobile_webapp: Ha a böngésződ lehetővé teszi, hogy a kezdőképernyődhöz add a Mastodont, még értesítéseket is fogsz kapni, akárcsak egy igazi alkalmazás esetében!
-      tips: Tippek
       title: Üdv a fedélzeten, %{name}!
   users:
     follow_limit_reached: Nem követhetsz több, mint %{limit} embert
-    generic_access_help_html: Nem tudod elérni a fiókodat? Segítségért lépj kapcsolatba velünk ezen %{email}
     invalid_otp_token: Érvénytelen ellenőrző kód
-    invalid_sign_in_token: Érvénytelen biztonsági kód
     otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
     seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
     signed_in_as: Bejelentkezve mint
-    suspicious_sign_in_confirmation: Úgy tűnik, erről az eszközről még sosem léptél be és egy ideje már nem láttunk, ezért egy biztonsági kódot küldünk az email címedre, hogy megerősítsd, tényleg te vagy az.
   verification:
     explanation_html: 'A profilodon <strong>hitelesítheted magad, mint az itt található linkek tulajdonosa</strong>. Ehhez a linkelt weboldalnak tartalmaznia kell egy linket vissza a Mastodon profilodra. Ennek <strong>tartalmaznia kell</strong> a <code>rel="me"</code> attribútumot. A link szövege bármi lehet. Itt egy példa:'
     verification: Hitelesítés
@@ -1526,4 +1666,4 @@ hu:
     not_enabled: Még nem engedélyezted a WebAuthn-t
     not_supported: Ez a böngésző nem támogatja a biztonsági kulcsokat
     otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős azonosítást.
-    registered_on: 'Regisztrált ekkor: %{date}'
+    registered_on: 'Regisztráció ekkor: %{date}'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index fb9df0156..5cd6d53a3 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -1,90 +1,26 @@
 ---
 hy:
   about:
-    about_hashtag_html: Սրանք <strong>#%{hashtag}</strong> հեշթեգով հանրային հրապարակումներն են։ Կարող էք փոխգործակցել դրանց հետ եթե ունէք որեւէ հաշիւ դաշտեզերքում։
     about_mastodon_html: Ապագայի սոցցանցը։ Ոչ մի գովազդ, ոչ մի կորպորատիվ վերահսկողութիւն, էթիկական դիզայն, եւ ապակենտրոնացում։ Մաստադոնում դու ես քո տուեալների տէրը։
-    about_this: Մեր մասին
-    active_count_after: ակտիվ
-    active_footnote: Ամսեկան ակտիւ օգտատէրեր (MAU)
-    administered_by: Ադմինիստրատոր՝
-    api: API
-    apps: Բջջային հավելվածներ
-    apps_platforms: Մաստադոնը հասանելի է iOS, Android եւ այլ տարբեր հենքերում
-    browse_directory: Պրպտիր օգտատէրերի շտեմարանը եւ գտիր հետաքրքիր մարդկանց
-    browse_local_posts: Տես այս հանգոյցի հանրային գրառումների հոսքը
-    browse_public_posts: Դիտիր Մաստադոնի հանրային գրառումների հոսքը
-    contact: Կոնտակտ
     contact_missing: Սահմանված չէ
     contact_unavailable: Ոչինչ չկա
-    discover_users: Գտնել օգտատերներ
-    documentation: Փաստաթղթեր
-    federation_hint_html: "«%{instance}»-ում հաշիւ բացելով դու կը կարողանաք հետեւել մարդկանց Մաստադոնի ցանկացած հանգոյցից և ոչ միայն։"
-    get_apps: Փորձեք բջջային հավելվածը
     hosted_on: Մաստոդոնը տեղակայուած է %{domain}ում
-    instance_actor_flash: "Այս հաշիւ վիրտուալ դերասան է, օգտագործուում է սպասարկիչը, այլ ոչ անհատ օգտատիրոջը ներկայացնելու, համար։ Օգտագործուում է ֆեդերացիայի նպատակով, ու չպէտք է արգելափակուի, եթէ չէք ցանկանում արգելափակել ողջ հանգոյցը, որի դէպքում պէտք է օգտագործէք տիրոյթի արգելափակումը։ \n"
-    learn_more: Իմանալ ավելին
-    privacy_policy: Գաղտնիության քաղաքականություն
-    rules: Սերուերի կանոնները
-    rules_html: Այս սերուերում հաշիւ ունենալու համար անհրաժեշտ է պահպանել ստորեւ նշուած կանոնները։
-    see_whats_happening: Տես ինչ կը կատարուի
-    server_stats: Սերվերի վիճակը․
-    source_code: Ելատեքստ
-    status_count_after:
-      one: ստատուս
-      other: ստատուս
-    status_count_before: Ովքեր գրել են՝
-    tagline: Հետեւիր ընկերներիդ եւ գտիր նորերին
-    terms: Ծառայութեան պայմանները
-    unavailable_content: Մոդերացուող սպասարկիչներ
-    unavailable_content_description:
-      domain: Սպասարկիչ
-      reason: Պատճառը՝
-      rejecting_media: Այս հանգոյցների նիւթերը չեն մշակուի կամ պահուի։ Չեն ցուցադրուի նաև մանրապատկերները, պահանջելով ինքնուրոյն անցում դէպի բնօրինակ նիւթը։
-      rejecting_media_title: Զտուած մեդիա
-      silenced: Այս սպասարկչի հրապարակումները թաքցուած են հանրային հոսքից եւ զրոյցներից, եւ ոչ մի ծանուցում չի գեներացուում նրանց օգտատէրերի գործողութիւններից, եթէ նրանց չէք հետեւում․
-      silenced_title: Լռեցուած սպասարկիչներ
-      suspended: Ոչ մի տուեալ այս սպասարկիչներից չի գործարկուում, պահուում կամ փոխանակուում, կատարել որեւէ գործողութիւն կամ հաղորդակցութիւն այս սպասարկիչի օգտատէրերի հետ անհնար է․
-      suspended_title: Կասեցուած սպասարկիչներ
-    unavailable_content_html: Մաստոդոնն ընդհանրապէս թոյլատրում է տեսնել բովանդակութիւնը եւ շփուել այլ դաշնեզերքի այլ հանգոյցների հետ։ Սրանք բացառութիւններն են, որոնք կիրառուել են հէնց այս հանգոյցի համար։
-    user_count_after:
-      one: օգտատեր
-      other: օգտատերեր
-    user_count_before: Այստեղ են
-    what_is_mastodon: Ի՞նչ է Մաստոդոնը
   accounts:
-    choices_html: "%{name}-ի ընտրանի՝"
-    endorsements_hint: Վէբ ինտերֆէյսից կարող ես ցուցադրել մարդկանց, որոնց հետեւում ես, եւ նրանք կը ցուցադրուեն այստեղ։
-    featured_tags_hint: Դու կարող ես ցուցադրել յատուկ պիտակներ, որոնք կը ցուցադրուեն այստեղ։
     follow: Հետևել
     followers:
-      one: Հետևորդ
+      one: Հետեւորդ
       other: Հետևորդներ
-    following: Հետևում եք
+    following: Հետեւած
     instance_actor_flash: Այս հաշիւը վիրտուալ դերասան է, որը ներկայացնում է հանգոյցը, եւ ոչ որեւէ անհատ օգտատիրոջ։ Այն օգտագործուում է ֆեդերացիայի նպատակներով եւ չպէտք է կասեցուի։
-    joined: Միացել են %{date}
     last_active: վերջին այցը
     link_verified_on: Սոյն յղման տիրապետումը ստուգուած է՝ %{date}֊ին
-    media: Մեդիա
-    moved_html: "%{name} տեղափոխուել է %{new_profile_link}"
-    network_hidden: Այս տուեալը հասանելի չէ
-    never_active: Երբեք
     nothing_here: Այստեղ բան չկայ
-    people_followed_by: Մարդիկ, որոնց %{name}ը հետեւում է
-    people_who_follow: Մարդիկ, որոնք հետեւում են %{name}ին
     pin_errors:
       following: Դու պէտք է հետեւես մարդուն, որին ցանկանում ես խրախուսել
     posts:
       one: Գրառում
       other: Գրառումներ
     posts_tab_heading: Գրառումներ
-    posts_with_replies: Գրառումներ եւ պատասխաններ
-    roles:
-      admin: Ադմինիստրատոր
-      bot: Բոտ
-      group: Խումբ
-      moderator: Մոդերատոր
-    unavailable: Պրոֆիլը հասանելի չի
-    unfollow: Չհետևել
   admin:
     account_actions:
       action: Կատարել գործողութիւն
@@ -92,18 +28,15 @@ hy:
     account_moderation_notes:
       create: Թողնել նշում
       created_msg: Մոդերացիոն նոթը բարեյաջող ստեղծուեց
-      delete: Ջնջել
       destroyed_msg: Մոդերացիոն նոթը բարեյաջող վերացուեց
     accounts:
       add_email_domain_block: Արգելափակել էլ․ փոստի տիրոյթը
       approve: Ընդունել
-      approve_all: Ընդունել բոլորը
       approved_msg: Յաջողութեամբ հաստատուեց %{username}֊ի գրանցման յայտը
       are_you_sure: Վստա՞հ ես
       avatar: Աւատար
       by_domain: Դոմէն
       change_email:
-        changed_msg: Հաշուի էլ․ հասցէն բարեյաջող փոփոխուեց
         current_email: Ներկայիս էլ․ հասցէ
         label: Փոխել էլ. հասցէն
         new_email: Նոր էլ․ փոստ
@@ -149,7 +82,6 @@ hy:
         active: Ակտիվ
         all: Բոլորը
         pending: Սպասում
-        silenced: Լռեցուած
         suspended: Կասեցուած
         title: Մոդերացիա
       moderation_notes: Մոդերացիայի նշումներ
@@ -167,7 +99,6 @@ hy:
       redownload: Թարմացնել հաշիւը
       redownloaded_msg: "%{username}֊ի հաշիւը սկզբնաղբիւրից բարեյաջող թարմացուեց"
       reject: Մերժել
-      reject_all: Մերժել բոլորը
       rejected_msg: Յաջողութեամբ մերժուեց %{username}֊ի գրանցման յայտը
       remove_avatar: Հեռացնել աւատարը
       remove_header: Հեռացնել գլխագիրը
@@ -180,19 +111,12 @@ hy:
       reset: Վերականգնել
       reset_password: Վերականգնել գաղտանաբառը
       resubscribe: Կրկին բաժանորդագրուել
-      role: Թոյլտուութիւններ
-      roles:
-        admin: Ադմինիստրատոր
-        moderator: Մոդերատոր
-        staff: Անձնակազմ
-        user: Oգտատէր
       search: Որոնել
       search_same_email_domain: Այլ օգտատէրեր նոյն էլ․ փոստի դոմէյնով
       search_same_ip: Այլ օգտատէրեր նոյն IP֊ով
       security_measures:
         only_password: Միայն ծածկագիր
         password_and_2fa: Ծածկագիր եւ 2FA
-        password_and_sign_in_token: ծածկագիր եւ էլ. նամակով բանալի
       sensitive: Զգայուն
       sensitized: նշուեց որպէս դիւրազգաց
       shared_inbox_url: Ընդհանուր մուտքային URL
@@ -206,7 +130,6 @@ hy:
       suspended: Կասեցուած
       suspension_irreversible: Հաշուի տուեալները անդարձ ջնջուեցին։ Դու կարող ես ապակասեցնել հաշիւը՝ դարձնելով այն կիրառելի, բայց այն չի վերականգնի նախկին տուեալները։
       suspension_reversible_hint_html: Հաշիւը կասեցուեց, եւ տուեալներն ամբողջապէս կը վերացուի %{date}ին։ Մինչեւ այդ, հաշիւը կարող է վերականգնուել՝ առանց կողմնակի ազդեցութիւնների։ Եթէ ցանկանում ես վերացնել հաշուի տուեալները միանգամից, կարող ես դա անել ներքեւում։
-      time_in_queue: Հերթում է %{time}
       title: Հաշիւներ
       unconfirmed_email: Չհաստատուած էլ․ հասցէ
       undo_sensitized: Ետարկել դիւրազգացութիւնը
@@ -262,7 +185,6 @@ hy:
         update_custom_emoji: Թարմացնել սեփական էմոջիները
         update_domain_block: Թարմացնել տիրոյթի արգելափակումը
         update_status: Թարմացնել գրառումը
-      deleted_status: "(ջնջուած գրառում)"
       empty: Ոչ մի գրառում չկայ։
       filter_by_action: Զտել ըստ գործողութեան
       filter_by_user: Զտել ըստ օգտատիրոջ
@@ -301,7 +223,6 @@ hy:
       enable: Միացնել
       enabled: Միացուած
       enabled_msg: Յաջողութեամբ միացուեց էմոջին
-      image_hint: PNG մինչեւ 50KB
       list: Ցանկ
       listed: Ցուցակագրուած
       new:
@@ -318,9 +239,12 @@ hy:
       updated_msg: Էմոջին թարմացուեց
       upload: Վերբեռնել
     dashboard:
+      active_users: ակտիւ օգտատէրեր
+      new_users: նոր օգտուողներ
       software: Ծրագրային ապահովում
       space: Տարածքի օգտագործում
       title: Գործիքների վահանակ
+      website: Կայք
     domain_allows:
       add_new: Թոյլատրել ֆեդերացիա տիրոյթի հետ
       created_msg: Տիրոյթը յաջողութեամբ թոյլատրուեց ֆեդերացուելու
@@ -335,31 +259,19 @@ hy:
         create: Ստեղծել արգելափակում
         severity:
           noop: Ոչ մի
-          silence: Լուռ
           suspend: Կասեցում
         title: Նոր տիրոյթի արգելափակում
       private_comment: Փակ մեկնաբանութիւն
       public_comment: Հրապարակային մեկնաբանութիւն
       reject_media: Մերժել մեդիա ֆայլերը
       reject_reports: Մերժել բողոքները
-      rejecting_media: մերժուում են մեդիա ֆայլեր
-      rejecting_reports: մերժուում են բողոքներ
-      severity:
-        silence: լռեցուած
-        suspend: կասեցուած
-      show:
-        title: Ետարկել տիրոյթի արգելափակումը %{domain}ի համար
-        undo: Ետարկել
       undo: Ետարկել տիրոյթի արգելափակումը
       view: Տեսնել տիրոյթի արգելափակումը
     email_domain_blocks:
       add_new: Ավելացնել նորը
       created_msg: Բարեյաջող արգելափակուեց էլ․ փոստի տիրոյթ
       delete: Ջնջել
-      destroyed_msg: Բարեյաջող ապաարգելափակուեց էլ․ փոստի տիրոյթ
       domain: Դոմեն
-      empty: Ոչ մի էլ․ փոստի տիրոյթ այժմ արգելափակուած չէ։
-      from_html: "%{domain}ից"
       new:
         create: Ավելացնել դոմեն
         title: Արգելափակել էլ․ փոստի նոր տիրոյթ
@@ -367,6 +279,7 @@ hy:
     follow_recommendations:
       language: Լեզուի համար
       status: Կարգավիճակ
+      title: Խորհուրդ ենք տալիս հետեւել
     instances:
       back_to_all: Բոլորը
       back_to_limited: Սահամանփակ
@@ -375,11 +288,7 @@ hy:
       delivery:
         all: Բոլորը
         unavailable: Անհասանելի է
-        warning: Զգուշացում
       empty: Դոմեյնները չեն գտնուել
-      known_accounts:
-        one: "%{count} յայտնի հաշիւ"
-        other: "%{count} յայտնի հաշիւներ"
       moderation:
         all: Բոլորը
         limited: Սահամանփակ
@@ -414,8 +323,6 @@ hy:
       new:
         title: Ստեղծել նոր IP կանոն
       title: IP կանոններ
-    pending_accounts:
-      title: Սպասող հաշիւներ (%{count})
     relationships:
       title: "%{acct}ի յարաբերութիւններ"
     relays:
@@ -433,9 +340,6 @@ hy:
         notes:
           one: "%{count} նոթ"
           other: "%{count} նոթեր"
-        reports:
-          one: "%{count} զեկոյց"
-          other: "%{count} զեկոյց"
       action_taken_by: Գործողութիւնը կատարել է
       are_you_sure: Վստա՞հ ես
       assign_to_self: Ինձ յանձնարարուած
@@ -443,8 +347,10 @@ hy:
       comment:
         none: Ոչ մի
       created_at: Բողոքարկուած
+      delete_and_resolve: Ջնջեք գրառումը
       mark_as_resolved: Նշել որպէս լուծուած
       mark_as_unresolved: Նշել որպէս չլուծուած
+      no_one_assigned: Ոչ ոք
       notes:
         create: Ավելացնել նշում
         delete: Ջնջել
@@ -458,6 +364,7 @@ hy:
       unassign: Չնշանակել
       unresolved: Չլուծուած
       updated_at: Թարմացուած
+      view_profile: Նայել անձնական էջը
     rules:
       add_new: Աւելացնել կանոն
       delete: Ջնջել
@@ -465,86 +372,56 @@ hy:
       empty: Սերուերի կանոնները դեռեւս սահմանուած չեն։
       title: Սերուերի կանոնները
     settings:
-      contact_information:
-        email: Գործնական էլփոստ
-        username: Կոնտակտի ծածկանուն
-      custom_css:
-        title: Սեփական CSS
       domain_blocks:
         all: Բոլորին
         disabled: Ոչ մէկին
-        title: Ցուցադրել տիրոյթը արգելափակումները
-      hero:
-        title: Հերոսի պատկեր
-      profile_directory:
-        desc_html: Թոյլատրել օգտատէրերին բացայայտուել
-        title: Միացնել հաշուի մատեանը
-      registrations:
-        closed_message:
-          desc_html: Ցուցադրուում է արտաքին էջում, երբ գրանցումները փակ են։ Կարող ես օգտագործել նաեւ HTML թէգեր
-          title: Փակ գրանցման հաղորդագրութիւն
-        deletion:
-          desc_html: Բոլորին թոյլատրել ջնջել իրենց հաշիւը
-          title: Բացել հաշուի ջնջումը
-        min_invite_role:
-          disabled: Ոչ ոք
-          title: Թոյլատրել հրաւէրներ
       registrations_mode:
         modes:
           approved: Գրանցման համար անհրաժեշտ է հաստատում
           none: Ոչ ոք չի կարող գրանցուել
           open: Բոլորը կարող են գրանցուել
-        title: Գրանցումային ռեժիմ
-      show_staff_badge:
-        desc_html: Ցուցադրել անձնակազմի անդամի նշանը օգտատիրոջ էջում
-        title: Ցուցադրել անձնակազմի անդամի նշանը
-      site_description:
-        title: Կայքի նկարագրութիւն
-      site_short_description:
-        title: Կայքի հակիրճ նկարագրութիւն
-      site_terms:
-        desc_html: Դու կարող ես գրել քո սեփական գաղտնիութեան քաղաքականութիւնը, օգտագործման պայմանները եւ այլ կանոններ։ Կարող ես օգտագործել HTML թեգեր
-        title: Սեփական օգտագործման կանոնները
-      site_title: Սպասարկչի անուն
-      thumbnail:
-        title: Հանգոյցի նկարը
-      title: Կայքի կարգաւորումներ
-      trends:
-        title: Թրենդային պիտակներ
     site_uploads:
       delete: Ջնջել վերբեռնուած ֆայլը
       destroyed_msg: Կայքի վերբեռնումը բարեյաջող ջնջուեց
     statuses:
       back_to_account: Վերադառնալ անձնական էջ
       batch:
-        delete: Ջնջել
-        nsfw_off: Նշել որպէս ոչ դիւրազգաց
-        nsfw_on: Նշել որպէս դիւրազգաց
+        report: Բողոքել
       deleted: Ջնջված է
-      failed_to_execute: Կատարումը ձախողուեց
       media:
         title: Մեդիա
-      no_media: Մեդիա չկայ
       title: Օգտատիրոջ գրառումները
       with_media: Մեդիայի հետ
     tags:
-      last_active: Վերջին ակտիւութիւնը
-      most_popular: Ամէնայայտնի
-      most_recent: Վերջին
-      name: Պիտակ
       review: Վերանայել գրառումը
-      reviewed: Վերանայուած
-      title: Պիտակներ
-      trending_right_now: Այժմ թրենդի մէջ է
-      unique_uses_today: "%{count} հրապարակուել է այսօր"
-      unreviewed: Վերանայուած չէ
     title: Ադմինիստարցիա
+    trends:
+      allow: Թոյլատրել
+      approved: Հաստատուած
+      disallow: Արգելուած
+      preview_card_providers:
+        title: Հրապարակողներ
+      rejected: Մերժուած
+      statuses:
+        disallow: Արգելել գրառումը
+        disallow_account: Արգելել հեղինակին
+        title: Թրենդային գրառումներ
+      tags:
+        listable: Կարող է առաջարկուել
+        not_listable: Չի կարող առաջարկուել
+        not_usable: Չի կարող օգտագործուել
+        title: Թրենդային պիտակներ
+        usable: Կարող է օգտագործուել
+      title: Թրենդներ
     warning_presets:
       add_new: Ավելացնել նորը
       delete: Ջնջել
   admin_mailer:
     new_report:
       subject: Նոր բողոք %{instance}ի համար(#%{id})
+    new_trends:
+      new_trending_statuses:
+        title: Թրենդային գրառումներ
   appearance:
     advanced_web_interface: Սյունակավոր ինտերֆեյս
     advanced_web_interface_hint: Եթէ ցանկանում ես օգտագործել էկրանիդ ամբողջ լայնքը, ապա ընդլայնուած վեբ ինտերֆեյսով հնարաւոր է էկրանը բաժանել սիւնակների՝ զուգահեռ տեսնելու տարբեր տիպի ինֆորմացիա՝ տեղական հոսքը, ծանուցումները, ֆեդերացված հոսքը, և ցանկացած թվի ցուցակ ու հեշթեգ։
@@ -562,14 +439,10 @@ hy:
     view_profile: Նայել անձնական էջը
     view_status: Նայել գրառումը
   applications:
-    invalid_url: Տրամադրուած URL անվաւեր է
     regenerate_token: Ստեղծել նոր հասանելիութեան կտրոն
     your_token: Քո մուտքի բանալին
   auth:
-    apply_for_account: Հրաւէրի հարցում
     change_password: Գաղտնաբառ
-    checkbox_agreement_html: Ես համաձայն եմ <a href="%{rules_path}" target="_blank">սպասարկիչի կանոններին</a> և <a href="%{terms_path}" target="_blank">ծառայութեան պայմաններին</a>
-    checkbox_agreement_without_rules_html: Ես համաձայն եմ <a href="%{terms_path}" target="_blank">ծառայությունների պայմաններին</a>
     delete_account: Ջնջել հաշիվը
     description:
       prefix_sign_up: Գրանցուի՛ր Մաստոդոնում հենց այսօր
@@ -590,7 +463,7 @@ hy:
     status:
       account_status: Հաշուի կարգավիճակ
       pending: Դիմումը պէտք է քննուի մեր անձնակազմի կողմից, ինչը կարող է մի փոքր ժամանակ խլել։ Դիմումի հաստատուելու դէպքում, կտեղեկացնենք նամակով։
-    trouble_logging_in: Մուտք գործելու խնդիրնե՞ր կան։
+    use_security_key: Օգտագործել անվտանգութեան բանալի
   authorize_follow:
     already_following: Դու արդէն հետեւում ես այս հաշուին
     already_requested: Դու արդէն ուղարկել ես հետեւմանն յայտ այս հաշուին
@@ -636,10 +509,6 @@ hy:
     success_msg: Հաշիւդ բարեյաջող ջնջուեց
     warning:
       username_available: Քո օգտանունը կրկին հասանելի կը դառնայ
-  directories:
-    directory: Հաշուի մատեան
-    explanation: Բացայայտիր մարդկանց ըստ նրանց հետաքրքրութիւնների
-    explore_mastodon: Ուսումնասիրիր «%{title}»-ը
   domain_validator:
     invalid_domain: անվաւէր տիրոյթի անուն
   errors:
@@ -686,30 +555,16 @@ hy:
     new:
       title: Ավելացնել ֆիլտր
   footer:
-    developers: Մշակողներ
-    more: Ավելին…
-    resources: Ռեսուրսներ
     trending_now: Այժմ արդիական
   generic:
     all: Բոլորը
     changes_saved_msg: Փոփոխութիւնները յաջող պահուած են
     copy: Պատճենել
     delete: Ջնջել
+    none: Ոչ մի
     order_by: Դասաւորել ըստ
     save_changes: Պահպանել փոփոխութիւնները
-  identity_proofs:
-    active: Ակտիվ
-    authorize: Այո, նոյնականացնել
-    authorize_connection_prompt: Հաւաստագրէ՞լ այս ծածկագրման կապակցումը
-    i_am_html: Ես %{username}ն եմ %{service}ում։
-    identity: Ինքնութիւն
-    inactive: Ոչ ակտիւ
-    publicize_checkbox: Հրապարակել սա՝
-    publicize_toot: 'Ապացուցուա՜ծ է․ Ես%{username} եմ %{service}ում․ %{url} '
-    remove: Հաշուից հեռացնել ապացոյցը
-    removed: Ապացոյցը բարեյաջող հեռացուեց հաշուից
-    status: Հաստատման կարգավիճակ
-    view_proof: Նայել ապացոյցը
+    today: այսօր
   imports:
     errors:
       over_rows_processing_limit: տողերի քանակը աւելին է քան %{count}-ը
@@ -760,6 +615,7 @@ hy:
     past_migrations: Նախոդ միգրացիաները
     proceed_with_move: Տեղափոխել հետեւորդներին
     redirecting_to: Քո հաշիւը վերահասցեաորում է %{acct}-ին
+    set_redirect: Կարգաւորել վերահասցէաւորումը
     warning:
       followers: Այս քայլով քո բոլոր հետեւորդներին այս հաշուից կը տեղափոխես դէպի նորը
       only_redirect_html: Որպէս այլընտրանք, կարող ես ուղղակի <a href="%{path}">վերահասցէաւորել քո հաշիւը</a>
@@ -767,9 +623,9 @@ hy:
   moderation:
     title: Մոդերացիա
   notification_mailer:
-    digest:
-      action: Դիտել բոլոր ծանուցումները
-      title: Երբ բացակայ էիր...
+    admin:
+      sign_up:
+        subject: "%{name}-ը գրանցուած է"
     favourite:
       body: Քո գրառումը հաւանել է %{name}-ը։
       subject: "%{name} հաւանեց գրառումդ"
@@ -793,6 +649,8 @@ hy:
       title: Նոր տարածում
     status:
       subject: "%{name}-ը հենց նոր գրառում արեց"
+    update:
+      subject: "%{name}-ը փոխել է գրառումը"
   notifications:
     email_events_hint: Ընտրիր իրադարձութիւնները, որոնց վերաբերեալ ցանկանում ես ստանալ ծանուցումներ․
     other_settings: Ծանուցումների այլ կարգաւորումներ
@@ -848,9 +706,6 @@ hy:
     remove_selected_followers: Հեռացնել նշուած հետեւորդներին
     remove_selected_follows: Ապահետեւել նշուած օգտատէրերին
     status: Հաշուի կարգավիճակ
-  remote_follow:
-    acct: Մուտքագրիր քո օգտանուն@տիրոյթ, որի անունից ցանկանում ես գործել
-    prompt: Դու պատրաստուում ես հետևել՝
   scheduled_statuses:
     too_soon: Նախադրուած ամսաթիւը պէտք է լինի ապագայում
   sessions:
@@ -858,7 +713,6 @@ hy:
     browser: Դիտարկիչ
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -872,7 +726,6 @@ hy:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
       weibo: Weibo
     current_session: Ընթացիկ սեսսիա
     description: "%{browser}, %{platform}"
@@ -880,8 +733,6 @@ hy:
     platforms:
       adobe_air: Adobe Air
       android: Անդրոիդ
-      blackberry: Blackberry
-      chrome_os: Chrome OS
       firefox_os: Firefox OS
       ios: iOS
       linux: Լինուքս
@@ -903,7 +754,6 @@ hy:
     edit_profile: Խմբագրել պրոֆիլը
     export: Տվյալների արտահանում
     featured_tags: Ընտրուած հէշթեգեր
-    identity_proofs: Անձի նոյնացումներ
     import: Ներմուծել
     import_and_export: Ներմուծել և արտահանել
     migrate: Հաշուի տեղափոխում
@@ -925,7 +775,7 @@ hy:
         one: "%{count} վիդեո"
         other: "%{count} վիդեո"
     content_warning: Նախազգուշացում։ %{warning}
-    language_detection: Ինքնուրոյն ճանաչել լեզուն
+    edited_at_html: Խմբագրուած՝ %{date}
     open_in_web: Բացել վէբում
     over_character_limit: "%{max} նիշի սահմանը գերազանցուած է"
     poll:
@@ -958,97 +808,13 @@ hy:
       '2629746': 1 ամիս
       '31556952': 1 տարի
       '5259492': 2 ամիս
+      '604800': 1 շաբաթ
       '63113904': 2 տարի
       '7889238': 3 ամիս
   stream_entries:
     pinned: Ամրացուած գրառում
     reblogged: տարածուած
     sensitive_content: Կասկածելի բովանդակութիւն
-  terms:
-    body_html: |
-      <h2>Գաղտնիութեան քաղաքականութիւն</h2>
-      <p><strong>Ոչ պաշտօնական, ոչ իրաւական թարգմանութիւն</strong></p>
-      <h3 id="collect">Ինչ անձնական տեղեկութիւններ ենք մենք հաւաքում</h3>
-
-      <ul>
-      <li><em>Առաջնային հաւաքուող տուեալներ</em>: Եթե դուք գրանցուէք էք այս սերուերում, ձեզանից կարող են պահանջել մուտքագրել օգտուողի անուն, էլ-փոստի հասցէ և գաղտնաբառ։ Դուք կարող էք նաև մուտքագրել յաւելեալ տուեալներ, ինչպիսիք են օրինակ՝ ցուցադրուող անունը եւ կենսագրութիւնը, նաև վերբեռնել գլխանկար և ետնանակար։ Օգտուողի անունը, կենսագրութիւնը, գլխանկարը և ետնանկարը համարվում են հանրային տեղեկատուութիւն։</li>
-      <li><em>Գրառումները, հետեւումները և այլ հանրային տեղեկատուութիւնը։ </em>Ձեր հետևած մարդկանց ցուցակը ներկայացուած է հանրայնօրէն, նոյնը ճշմարիտ է նաև հետևորդների համար։ Երբ դուք ուղարկում էք հաղորդագրութիւն, հաղորդագրութեան ուղարկման ամսաթիւը և ժամանակը, ինչպէս նաև յաւելուածը որից այն ուղարկուել է, պահւում է։ Հաղորդագրութիւնները կարող են պարունակել մեդիա կցումներ, ինչպիսիք են նկարները և տեսանիւթերը։ Հանրային և ծածուկ գրառումները հանրայնօրէն հասանելի են։ Անձնական էջում կցուած գրառումները նոյնպես հանրայնօրէն հասանելի տեղեկատուութիւն է։ Ձեր գրառումները ուղարկւում են ձեր հետևորդներին, ինչը նշանակում է, որ որոշ դէպքերում դրանք ուղարկւում են այլ սերուերներ և պատճէները պահւում են այնտեղ։ Երբ դուք ջնջում էք ձեր գրառումները, սա նոյնպէս ուղարկւում է ձեր հետևորդներին։ Մէկ այլ գրառման տարածումը կամ հաւանումը միշտ հանրային է։</li>
-      <li><em>Հասցէագրած և միայն հետևորդներին գրառումները</em>: Բոլոր գրառումները պահւում և մշակւում են սերուերի վրայ։ Միայն հետևորդներին գրառումները ուղարկւում են միայն ձեր հետևորդներին և այն օգտատէրերին ովքեր նշուած են գրառման մէջ, իսկ հասցէագրեցուած գրառումները ուղարկւում են միայն դրանում նշուած օգտատէրերին։ Որոշ դէպքերում դա նշանակում է, որ այդ գրառումները ուղարկւում են այլ սերուերներ և պատճէները պահւում այնտեղ։ Մենք բարեխիղճ ջանք են գործադրում սահմանափակելու այդ գրառումների մուտքը միայն լիազօրուած անձանց, բայց այլ սերուերներ կարող են ձախողել դրա կատարումը։ Այդ պատճառով կարևոր է վերանայել այն սերուերները որին ձեր հետևորդները պատկանում են։ Դուք կարող էք կարգաւորումներից միացնել նոր հետևորդներին ինքնուրոյն ընդունելու և մերժելու ընտրանքը։ <em>Խնդրում ենք յիշել, որ սերուերի գործարկուն և ցանկացած ստացող սերուեր կարող է դիտել այդ տեսակ հաղորդագրութիւնները</em>, իսկ ստացողները կարող են էկրանահանել, պատճէնել և այլ կերպ վերատարածել դրանք։<em>Մաստադոնով մի կիսուէք որևէ վտանգաւոր տեղեկատուութեամբ։ </em></li>
-      <li><em>IP հասցէներ և այլ մետատուեալներ</em>: Երբ դուք մուտք էք գործում, մենք պահում են ձեր մուտք գործելու IP հասցէն, ինչպէս նաև զննարկիչի տեսակը։ Կարգաւորումներում հասանելի է մուտքի բոլոր սեսիաների վերանայման և մարման հնարաւորութիւնը։ Վերջին օգտագործուած IP հասցէն պահւում է մինչև 12 ամիս ժամկէտով։ Մենք կարող ենք նաև պահել սերուերի մատեանի նիշքերը, որը պարունակում է սերուերին արուած իւրաքանչիւր հարցման IP հասցէն։</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use"> Ինչպէս ենք օգտագործում ձեր անձնական տեղեկութիւնները</h3>
-
-      <p>Ցանկացած տուեալ, որը մենք հաւաքում ենք ձեզնից կարող է օգտագործուել հետեւեալ նպատակներով՝</p>
-
-      <ul>
-      <li>Մատուցելու Մաստադոնի հիմնական գործառութիւնները։ Դուք կարող էք փոխգործակցել այլ մարդկանց բովանդակութեան հետ և տեղադրել ձեր սեփական բովանդակութիւնը միայն մուտք գործելուց յետոյ։ Օրինակ՝ դուք կարող էք հետեւել այլ մարդկանց նրանց համակցուած գրառումները ձեր անձնական հոսքում տեսնելու համար ։</li>
-      <li>Նպաստելու համայնքի մոդերացիային։ Օրինակ՝ համեմատելու ձեր IP հասցէն այլ արդեն յայտնի հասցէի հետ՝ բացայայտելու արգելափակումից խուսափելու կամ այլ խախտումների դէպքերը ։</li>
-      <li>Ձեր տրամադրած էլ-փոստի հասցէն կարող է օգտագործուել ձեզ տեղեկատուութիւն տրամադրելու, այլ մարդկանց՝ ձեր բովանդակութեան հետ փոխգործակցութեան կամ ձեզ հասցէագրած նամակի մասին ծանուցելու, ինչպէս նաև հայցումներին կամ այլ յայտերին ու հարցերին պատասխանելու համար։</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect"> Ինչպէս ենք պաշտպանում ձեր անձնական</h3>
-
-      <p>Մենք կիրառում ենք տարբեր անվտանգութեան միջոցների պահպանելու ձեր անձնական տուեալների անվտանգութիւնը, երբ դուք մուտքագրում, ուղարկում կամ դիտում էգ ձեր անձնական տեղեկութիւնները։ Ի թիւս մնացած բաների, ձեր դիտարկչի սեսիան, ինչպէս նաև ձեր յաւելուածի և API միջև տրաֆիկը պաշտպանուած են SSL-ով, իսկ ձեր գաղտնաբառը պատահականացուած է միակողմանի ալգորիթմով։ Դուք կարող էք միացնել երկաստիճան ինքնորոշումը, ձեր հաշուի մուտքը աւելի պաշտպանուած դարձնելու համար։</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Տվյալներ պահպանման քաղաքականութիւնը</h3>
-
-      <p>Մենք գործադրում ենք բարեխիղճ ջանք՝</p>
-
-      <ul>
-      <li>պահպանելու սերուերի մատեանի նիշքերը՝ այս սերուերին արուած բոլոր հարցումների IP հասցէներով, այնքանով որքանով նման նիշքերը պահւում են, ոչ աւել քան 90 օր ժամկէտով։</li>
-      <li>պահպանելու գրանցուած օգտատէրի հաշուի հետ կապակցուած IP հասցէները, ոչ աւել քան 12 ամիս ժամկէտով։</li>
-      </ul>
-
-      <p>Դուք կարող էք ուղարկել հայց ներբեռնելու ձեր բովանդակութեան պատճէն՝ ներառեալ ձեր գրառումները, մեդիա կցումները, գլխանկարը և ետնանկարը։</p>
-
-      <p>Դուք կարող էք ընդմիշտ ջնջել ձեր հաշիւը ցանկացած ժամանակ</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Օգտագործում էք արդեօ՞ք թխուկներ</h3>
-
-      <p>Այո։ Թխուկները փոքր ֆայլեր են որը կայքը կամ նրան ծառայութեան մատուցողը փոխանցում է ձեր համակարգչի կոշտ սկաւառակին դիտարկչի միջոցով (ձեր թոյլատուութիւն)։ Թխուկները հնարաւորութիւն են տալիս կայքին ճանաչելու ձեր դիտարկիչը, և գրանցուած հաշուի դէպքում՝ նոյնացնելու այն ձեր հաշուի հետ։
-
-      Մենք օգտագործում ենք թխուկները հասկանալու և պահպանելու ձեր նախընտրանքները ապագայ այցերի համար։</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose"> Բացայայտում երրորդ կողմերին </h3>
-
-      <p>Մենք չենք վաճառում, փոխանակում, կամ այլ կերպ փոխանցում անձնական նոյնացնող տեղեկատուութիւն երրորդ կողմերին։ Սա չի ներառում վստահելի երրորդ կողմերին որոնք օգնում են կայքի գործարկման, մեր գործունէութեան ծավալման, կամ ձեզ ծառայելու համար, այնքան ժամանակ որքան այդ երրորդ կողմերը համաձայն են գաղտնի պահել այդ տուեալները։ Մենք կարող ենք նաև հանրայնացնել ձեր տեղեկատուութիւնը երբ հաւատացած ենք որ դրա հանրայնացումը անհրաժեշտ է օրէնքի պահանջների կատարման, կամ կայքի քաղաքականութեան կիրառման համար, կամ պաշտպանելու մեր կամ այլոց իրաւունքները, սեփականութիւնը կամ անվտանգութիւնը։</p>
-
-      <p>Ձեր հանրային բովանդակութիւնը կարող է բեռնուել ցանցի միւս սերուերների կողմից։ Ձեր հանրային և միայն հետևորդներին գրառումները ուղարկւում են այն սերուերներին որտեղ գրանցած են ձեր հետևորդները, և հասցէական հաղորդագրութիւնները ուղարկւում են հասցէատէրերի սերուերներին, այն դէպքում երբ այդ հետևորդները կամ հասցէատէրերը գտնւում են այս սերուերից տարբեր սերուերի վրայ։</p>
-
-      <p>Երբ դուք թոյլատրում էք յաւելուածի օգտագործել ձեր հաշիւը, կախուած թոյլտւութիւնների շրջանակից, այն կարող է մուտք ունենալ ձեր հաշիւ հանրային տեղեկատւութեանը, ձեր հետևողների ցանկին, ձեր հետևորդներից ցանկին, ցանկերին, ձեր բոլոր գրառումներին, և ձեր հաւանումներին։ Յաւելուածները երբեք չենք կարող մուտք ունենալ ձեր էլ-փոստի հասցէին կամ գաղտնաբառին։</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Կայքի օգտագործումը երեխաների կողմից</h3>
-
-      <p>Եթէ այս սերուերը գտնում է ԵՄ-ում կամ ԵՏԳ-ում. Մեր կայքը, արտադրանքները և ծառայութիւնները նախատեսուած են 16 տարին լրացած անձանց համար: Եթէ ձեր 16 տարեկանը չի լրացել, ապա հետևելով GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) պահանջներին՝ մի օգտագործէք այս կայքը։</p>
-
-      <p>Եթէ այս սերուերը գտնւում է ԱՄՆ-ում. Մեր կայքը, արտադրանքները և ծառայութիւնները նախատեսուած են 13 տարին լրացած անձանց համար: Եթէ ձեր 16 տարեկանը չի լրացել, ապա հետևելով COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) պահանջներին՝ մի օգտագործէք այս կայքը։
-
-      <p>Այլ երկրների իրաւասութիւն շրջաններում օրէնքի պահանջները կարող են տարբերուել։</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Գաղտնիութեան քաղաքականութեան փոփոխութիւնները</h3>
-
-      <p>Եթէ մենք որոշենք փոփոխել մեր գաղտնիութեան քաղաքականութիւնը, ապա այդ փոփոխութիւնները կհրապարակենք այս էջում։ </p>
-
-      <p>Այս փաստաթուղթը լիազօրուած է CC-BY-SA լիցենզիայով։ Վերջին թարմացումը՝ 7-ը մարտի 2018</p>
-
-      <p>Փոխառնուած է <a href="https://github.com/discourse/discourse">Discourse-ի գաղտնիութեան քաղաքականութիւնից</a>.</p>
-
-      <p><strong>Ոչ պաշտօնական, ոչ իրաւական թարգմանութիւն</strong></p>
   themes:
     contrast: Mastodon (բարձր կոնտրաստով)
     default: Mastodon (Մուգ)
@@ -1057,6 +823,7 @@ hy:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Ավելացնել
     disable: Անջատել
@@ -1067,39 +834,33 @@ hy:
     generate_recovery_codes: Ստեղծել վերականգնման կոդեր
     lost_recovery_codes: Վերականգնման կոդերը հնարաւորութիւն են տալիս մուտք գործել հաշիւ՝ հեռախօսի կորստի դէպքում։ Եթէ կորցրել ես վերականգնման կոդերը, այստեղ կարող ես ստեղծել նորերը։ Նախկին վերականգման կոդերը կչեղարկվեն։
     methods: Երկքայլ նոյնականացում տարբերակներ
-    otp: Նոյնականացման հավելված
+    otp: Նոյնականացման յաւելուած
     recovery_codes: Վերականգնման կոդեր
     recovery_codes_regenerated: Վերականգման կոդերը հաջողութեամբ ստեղծուել են
     webauthn: Անվտանգութեան բանալիներ
   user_mailer:
-    sign_in_token:
-      title: Մուտքի փորձ
+    suspicious_sign_in:
+      title: Նոր մուտք
     warning:
-      get_in_touch: Կարող էք կապուել %{instance} հանգոյցի անձնակազմի հետ պատասխանելով այս նամակին։
-      statuses: Մասնաւորապէս, միայն՝
+      categories:
+        spam: Սպամ
+      reason: Պատճառ՝
       subject:
         disable: Քո %{acct} հաշիւը սառեցուել է
         none: Նախազգուշացուեմ %{acct}-ին
       title:
+        delete_statuses: Գրառումները ջնջուած են
         disable: Հաշիւը սառեցուած է
         none: Զգուշացում
-        sensitive: Մեդիաֆայլը պիտակուել է որպէս զգայուն։
         silence: Հաշիւը սահմանափակուած է
         suspend: Հաշիւը արգելափակուած է
     welcome:
       edit_profile_action: Կարգաւորել հաշիւը
       final_action: Սկսել գրել
-      final_step: 'Սկսիր գրել։ Անգամ առանց հետեւորդների քո հանրային գրառումներ կարող են երևալ ուրիշների մօտ, օրինակ՝ տեղական հոսում կամ հեշթեգերում։ Թէ ցանկանաս, կարող ես յայտնել քո մասին օգտագործելով #եսնորեկեմ հեշթեգը։'
-      review_preferences_action: Փոփոխել կարգաւորումները
       subject: Բարի գալուստ Մաստոդոն
-      tip_federated_timeline: Դաշնային հոսքում երևում է ամբողջ Մաստոդոնի ցանցը։ Բայց այն ներառում է միայն այն օգտատերերին որոնց բաժանորդագրուած են ձեր հարևաններ, այդ պատճառով այն կարող է լինել ոչ ամբողջական։
-      tip_following: Դու հետեւում էս քո հանգոյցի ադմին(ներ)ին լռելայն։ Այլ հետաքրքիր անձանց գտնելու համար՝ թերթիր տեղական և դաշնային հոսքերը։
-      tip_local_timeline: Տեղական հոսքում երևում են %{instance} հանգոյցի օգտատերի գրառումները։ Նրանք քո հանգոյցի հարևաններն են։
-      tips: Հուշումներ
       title: Բարի գալուստ նաւամատոյց, %{name}
   users:
     invalid_otp_token: Անվաւեր 2F կոդ
-    invalid_sign_in_token: Անվաւեր անվտանգութեան կոդ
     signed_in_as: Մոտք գործել որպէս․
   verification:
     explanation_html: Պիտակների յղումների հեղինակութիւնը կարելի է վաւերացնել։ Անհրաժեշտ է որ յղուած կայքը պարունակի յետադարձ յղում ձեր մաստադոնի էջին, որը <strong>պէտք է</strong> ունենայ <code>rel="me"</code> նիշքը։ Յղման բովանդակութիւնը կարևոր չէ։ Օրինակ՝
diff --git a/config/locales/id.yml b/config/locales/id.yml
index c8121c4bb..bfd87673d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1,86 +1,25 @@
 ---
 id:
   about:
-    about_hashtag_html: Ini adalah toot publik yang ditandai dengan <strong>#%{hashtag}</strong>. Anda bisa berinteraksi dengan mereka jika anda memiliki akun dimanapun di fediverse.
-    about_mastodon_html: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
-    about_this: Tentang server ini
-    active_count_after: aktif
-    active_footnote: Pengguna Aktif Bulanan (PAB)
-    administered_by: 'Dikelola oleh:'
-    api: API
-    apps: Aplikasi mobile
-    apps_platforms: Gunakan Mastodon dari iOS, Android, dan platform lain
-    browse_directory: Jelajahi direktori profil dan saring sesuai minat
-    browse_local_posts: Jelajahi siaran langsung dari pos publik server ini
-    browse_public_posts: Jelajahi siaran langsung pos publik di Mastodon
-    contact: Kontak
-    contact_missing: Belum diset
+    about_mastodon_html: 'Jaringan sosial masa depan: Tanpa iklan, tanpa pemantauan perusahaan, desain etis, dan terdesentralisasi! Miliki data Anda dengan Mastodon!'
+    contact_missing: Belum ditetapkan
     contact_unavailable: Tidak Tersedia
-    discover_users: Temukan pengguna
-    documentation: Dokumentasi
-    federation_hint_html: Dengan akun di %{instance} Anda dapat mengikuti orang di server Mastodon mana pun dan di luarnya.
-    get_apps: Coba aplikasi mobile
     hosted_on: Mastodon dihosting di %{domain}
-    instance_actor_flash: "Akun ini adalah aktor virtual yang dipakai untuk merepresentasikan server, bukan pengguna individu. Ini dipakai untuk tujuan federasi dan jangan diblokir kecuali Anda ingin memblokir seluruh instansi, yang seharusnya Anda pakai blokir domain. \n"
-    learn_more: Pelajari selengkapnya
-    privacy_policy: Kebijakan Privasi
-    rules: Aturan server
-    rules_html: 'Di bawah ini adalah ringkasan aturan yang perlu Anda ikuti jika Anda ingin memiliki akun di server Mastodon ini:'
-    see_whats_happening: Lihat apa yang sedang terjadi
-    server_stats: 'Statistik server:'
-    source_code: Kode sumber
-    status_count_after:
-      other: status
-    status_count_before: Yang telah menulis
-    tagline: Ikuti teman dan temukan yang baru
-    terms: Kebijakan layanan
-    unavailable_content: Konten tak tersedia
-    unavailable_content_description:
-      domain: Server
-      reason: Alasan
-      rejecting_media: 'Berkas media dari server ini tak akan diproses dan disimpan, dan tak akan ada gambar kecil yang ditampilkan, perlu klik manual utk menuju berkas asli:'
-      rejecting_media_title: Media yang disaring
-      silenced: 'Pos dari server ini akan disembunyikan dari linimasa publik dan percakapan, dan takkan ada notifikasi yang dibuat dari interaksi pengguna mereka, kecuali Anda mengikuti mereka:'
-      silenced_title: Server yang dibisukan
-      suspended: 'Takkan ada data yang diproses, disimpan, dan ditukarkan dari server ini, sehingga interaksi atau komunikasi dengan pengguna dari server ini tak mungkin dilakukan:'
-      suspended_title: Server yang ditangguhkan
-    unavailable_content_html: Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.
-    user_count_after:
-      other: pengguna
-    user_count_before: Tempat bernaung bagi
-    what_is_mastodon: Apa itu Mastodon?
+    title: Tentang
   accounts:
-    choices_html: 'Pilihan %{name}:'
-    endorsements_hint: Anda dapat mempromosikan orang yang Anda ikuti lewat antar muka web, dan mereka akan muncul di sini.
-    featured_tags_hint: Anda dapat mengunggulkan tagar tertentu yang akan ditampilkan di sini.
     follow: Ikuti
     followers:
       other: Pengikut
     following: Mengikuti
     instance_actor_flash: Akun ini adalah aktor virtual yang merepresentasikan server itu sendiri dan bukan pengguna individu. Ini dipakai untuk tujuan gabungan dan seharusnya tidak ditangguhkan.
-    joined: Bergabung pada %{date}
     last_active: terakhir aktif
     link_verified_on: Kepemilikan tautan ini telah dicek pada %{date}
-    media: Media
-    moved_html: "%{name} telah pindah ke %{new_profile_link}:"
-    network_hidden: Informasi ini tidak tersedia
-    never_active: Tak pernah
     nothing_here: Tidak ada apapun disini!
-    people_followed_by: Orang yang diikuti %{name}
-    people_who_follow: Orang-orang yang mengikuti %{name}
     pin_errors:
       following: Anda harus mengikuti orang yang ingin anda endorse
     posts:
-      other: Toot
-    posts_tab_heading: Toot
-    posts_with_replies: Toot dan balasan
-    roles:
-      admin: Admin
-      bot: Bot
-      group: Grup
-      moderator: Moderator
-    unavailable: Profil tidak tersedia
-    unfollow: Berhenti mengikuti
+      other: Kiriman
+    posts_tab_heading: Kiriman
   admin:
     account_actions:
       action: Lakukan aksi
@@ -88,26 +27,30 @@ id:
     account_moderation_notes:
       create: Beri catatan
       created_msg: Catatan moderasi berhasil dibuat!
-      delete: Hapus
       destroyed_msg: Catatan moderasi berhasil dihapus!
     accounts:
       add_email_domain_block: Masukkan domain email ke daftar hitam
       approve: Terima
-      approve_all: Terima semua
       approved_msg: Berhasil menerima pendaftaran %{username}
       are_you_sure: Anda yakin?
       avatar: Avatar
       by_domain: Domian
       change_email:
-        changed_msg: Email akun ini berhasil diubah!
+        changed_msg: Email berhasil diubah!
         current_email: Email saat ini
         label: Ganti email
         new_email: Email baru
         submit: Ganti email
         title: Ganti email untuk %{username}
+      change_role:
+        changed_msg: Peran berhasil diubah!
+        label: Ubah peran
+        no_role: Tidak ada peran
+        title: Ganti peran untuk %{username}
       confirm: Konfirmasi
       confirmed: Dikonfirmasi
       confirming: Mengkonfirmasi
+      custom: Kustom
       delete: Hapus data
       deleted: Terhapus
       demote: Turunkan
@@ -147,7 +90,7 @@ id:
         active: Aktif
         all: Semua
         pending: Tertunda
-        silenced: Didiamkan
+        silenced: Terbatas
         suspended: Disuspen
         title: Moderasi
       moderation_notes: Catatan moderasi
@@ -155,9 +98,13 @@ id:
       most_recent_ip: IP terbaru
       no_account_selected: Tak ada akun yang diubah sebab tak ada yang dipilih
       no_limits_imposed: Tidak ada batasan
+      no_role_assigned: Tidak ada peran yang diberikan
       not_subscribed: Tidak berlangganan
       pending: Tinjauan tertunda
       perform_full_suspension: Lakukan suspen penuh
+      previous_strikes: Peringatan sebelumnya
+      previous_strikes_description_html:
+        other: Akun ini mendapatkan <strong>%{count}</strong> hukuman.
       promote: Promosikan
       protocol: Protokol
       public: Publik
@@ -165,8 +112,8 @@ id:
       redownload: Muat ulang profil
       redownloaded_msg: Berhasil menyegarkan profil %{username} dari asal
       reject: Tolak
-      reject_all: Tolak semua
       rejected_msg: Berhasil menolak permintaan pendaftaran %{username}
+      remote_suspension_irreversible: Data akun ini telah dihapus permanen.
       remove_avatar: Hapus avatar
       remove_header: Hapus header
       removed_avatar_msg: Berhasil menghapus gambar avatar %{username}
@@ -178,19 +125,13 @@ id:
       reset: Atur ulang
       reset_password: Reset kata sandi
       resubscribe: Langganan ulang
-      role: Hak akses
-      roles:
-        admin: Administrator
-        moderator: Moderator
-        staff: Staf
-        user: Pengguna
+      role: Peran
       search: Cari
       search_same_email_domain: Pengguna lain dengan domain email yang sama
       search_same_ip: Pengguna lain dengan IP yang sama
       security_measures:
         only_password: Hanya kata sandi
         password_and_2fa: Kata sandi dan 2FA
-        password_and_sign_in_token: Kata sandi dan token email
       sensitive: Sensitif
       sensitized: ditandai sebagai sensitif
       shared_inbox_url: URL kotak masuk bersama
@@ -200,12 +141,15 @@ id:
       silence: Diam
       silenced: Didiamkan
       statuses: Status
+      strikes: Peringatan sebelumnya
       subscribe: Langganan
+      suspend: Tangguhkan
       suspended: Disuspen
       suspension_irreversible: Data akun ini telah dihapus secara permanen. Anda dapat mengaktifkan akun agar tetap bisa dipakai lagi tapi data sebelumnya tidak dapat dikembalikan.
       suspension_reversible_hint_html: Akun telah ditangguhkan, dan data akan dihapus total pada %{date}. Sebelum tanggal tersebut, akun dapat dikembalikan tanpa efek apapun. Jika Anda ingin menghapus segera semua data, Anda dapat melakukan sesuai keterangan di bawah.
-      time_in_queue: Menunggu dalam antrean %{time}
       title: Akun
+      unblock_email: Buka blokir alamat email
+      unblocked_email_msg: Berhasil membuka blokir alamat email %{username}
       unconfirmed_email: Email belum dikonfirmasi
       undo_sensitized: Batalkan sensitif
       undo_silenced: Undo mendiamkan
@@ -220,26 +164,34 @@ id:
       whitelisted: Masuk daftar putih
     action_logs:
       action_types:
+        approve_appeal: Setujui Banding
+        approve_user: Setujui Pengguna
         assigned_to_self_report: Berikan laporan
         change_email_user: Ubah Email untuk Pengguna
+        change_role_user: Ubah Peran Pengguna
         confirm_user: Konfirmasi Pengguna
         create_account_warning: Buat Peringatan
         create_announcement: Buat Pengumuman
+        create_canonical_email_block: Buat Pemblokiran Surel
         create_custom_emoji: Buat Emoji Khusus
         create_domain_allow: Buat Izin Domain
         create_domain_block: Buat Blokir Domain
         create_email_domain_block: Buat Email Blokir Domain
         create_ip_block: Buat aturan IP
         create_unavailable_domain: Buat Domain yang Tidak Tersedia
+        create_user_role: Buah Peran
         demote_user: Turunkan Pengguna
         destroy_announcement: Hapus Pengumuman
+        destroy_canonical_email_block: Hapus Pemblokiran Surel
         destroy_custom_emoji: Hapus Emoji Khusus
         destroy_domain_allow: Hapus Izin Domain
         destroy_domain_block: Hapus Blokir Domain
         destroy_email_domain_block: Hapus email blokir domain
+        destroy_instance: Hapus Domain
         destroy_ip_block: Hapus aturan IP
         destroy_status: Hapus Status
         destroy_unavailable_domain: Hapus Domain yang Tidak Tersedia
+        destroy_user_role: Hapus Peran
         disable_2fa_user: Nonaktifkan 2FA
         disable_custom_emoji: Nonaktifkan Emoji Khusus
         disable_sign_in_token_auth_user: Nonaktifkan Otentikasi Token Email untuk Pengguna
@@ -249,43 +201,57 @@ id:
         enable_user: Aktifkan Pengguna
         memorialize_account: Kenang Akun
         promote_user: Promosikan Pengguna
+        reject_appeal: Tolak Banding
+        reject_user: Tolak Pengguna
         remove_avatar_user: Hapus Avatar
         reopen_report: Buka Lagi Laporan
+        resend_user: Kirim Ulang Email Konfirmasi
         reset_password_user: Atur Ulang Kata sandi
         resolve_report: Selesaikan Laporan
         sensitive_account: Tandai media di akun Anda sebagai sensitif
         silence_account: Bisukan Akun
         suspend_account: Tangguhkan Akun
         unassigned_report: Batalkan Pemberian Laporan
+        unblock_email_account: Buka blokir alamat email
         unsensitive_account: Batalkan tanda media di akun Anda dari sensitif
         unsilence_account: Lepas Status Bisu Akun
         unsuspend_account: Lepas Status Tangguh Akun
         update_announcement: Perbarui Pengumuman
         update_custom_emoji: Perbarui Emoji Khusus
         update_domain_block: Perbarui Blokir Domain
+        update_ip_block: Perbarui peraturan IP
         update_status: Perbarui Status
+        update_user_role: Perbarui Peran
       actions:
+        approve_appeal_html: "%{name} menyetujui moderasi keputusan banding dari %{target}"
+        approve_user_html: "%{name} menyetujui pendaftaran dari %{target}"
         assigned_to_self_report_html: "%{name} menugaskan laporan %{target} ke dirinya sendiri"
         change_email_user_html: "%{name} mengubah alamat email pengguna %{target}"
+        change_role_user_html: "%{name} mengubah peran %{target}"
         confirm_user_html: "%{name} mengonfirmasi alamat email pengguna %{target}"
         create_account_warning_html: "%{name} mengirim peringatan untuk %{target}"
         create_announcement_html: "%{name} membuat pengumuman baru %{target}"
+        create_canonical_email_block_html: "%{name} memblokir surel dengan hash %{target}"
         create_custom_emoji_html: "%{name} mengunggah emoji baru %{target}"
         create_domain_allow_html: "%{name} mengizinkan penggabungan dengan domain %{target}"
         create_domain_block_html: "%{name} memblokir domain %{target}"
         create_email_domain_block_html: "%{name} memblokir domain email %{target}"
         create_ip_block_html: "%{name} membuat aturan untuk IP %{target}"
         create_unavailable_domain_html: "%{name} menghentikan pengiriman ke domain %{target}"
+        create_user_role_html: "%{name} membuat peran %{target}"
         demote_user_html: "%{name} menurunkan pengguna %{target}"
         destroy_announcement_html: "%{name} menghapus pengumuman %{target}"
+        destroy_canonical_email_block_html: "%{name} menghapus pemblokiran surel dengan hash %{target}"
         destroy_custom_emoji_html: "%{name} menghapus emoji %{target}"
         destroy_domain_allow_html: "%{name} membatalkan izin penggabungan dengan domain %{target}"
         destroy_domain_block_html: "%{name} membuka blokir domain %{target}"
         destroy_email_domain_block_html: "%{name} membuka blokir domain email %{target}"
+        destroy_instance_html: "%{name} menghapus domain %{target}"
         destroy_ip_block_html: "%{name} menghapus aturan untuk IP %{target}"
         destroy_status_html: "%{name} menghapus status %{target}"
         destroy_unavailable_domain_html: "%{name} melanjutkan pengiriman ke domain %{target}"
-        disable_2fa_user_html: "%{name} mematikan syarat dua faktor utk pengguna %{target}"
+        destroy_user_role_html: "%{name} menghapus peran %{target}"
+        disable_2fa_user_html: "%{name} mematikan syarat dua faktor untuk pengguna %{target}"
         disable_custom_emoji_html: "%{name} mematikan emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} menonaktifkan otentikasi token email untuk %{target}"
         disable_user_html: "%{name} mematikan login untuk pengguna %{target}"
@@ -294,22 +260,28 @@ id:
         enable_user_html: "%{name} mengaktifkan login untuk pengguna %{target}"
         memorialize_account_html: "%{name} mengubah akun %{target} jadi halaman memorial"
         promote_user_html: "%{name} mempromosikan pengguna %{target}"
+        reject_appeal_html: "%{name} menolak moderasi keputusan banding dari %{target}"
+        reject_user_html: "%{name} menolak pendaftaran dari %{target}"
         remove_avatar_user_html: "%{name} menghapus avatar %{target}"
         reopen_report_html: "%{name} membuka ulang laporan %{target}"
+        resend_user_html: "%{name} mengirim ulang konfirmasi email untuk %{target}"
         reset_password_user_html: "%{name} mereset kata sandi pengguna %{target}"
         resolve_report_html: "%{name} menyelesaikan laporan %{target}"
         sensitive_account_html: "%{name} menandai media %{target} sebagai sensitif"
         silence_account_html: "%{name} membisukan akun %{target}"
         suspend_account_html: "%{name} menangguhkan akun %{target}"
         unassigned_report_html: "%{name} membatalkan penugasan laporan %{target}"
+        unblock_email_account_html: "%{name} membuka blokir alamat email %{target}"
         unsensitive_account_html: "%{name} membatalkan tanda media %{target} sebagai sensitif"
         unsilence_account_html: "%{name} membunyikan akun %{target}"
         unsuspend_account_html: "%{name} membatalkan penangguhan akun %{target}"
         update_announcement_html: "%{name} memperbarui pengumuman %{target}"
         update_custom_emoji_html: "%{name} memperbarui emoji %{target}"
         update_domain_block_html: "%{name} memperbarui blokir domain untuk %{target}"
+        update_ip_block_html: "%{name} mengubah peraturan untuk IP %{target}"
         update_status_html: "%{name} memperbarui status %{target}"
-      deleted_status: "(status dihapus)"
+        update_user_role_html: "%{name} mengubah peran %{target}"
+      deleted_account: akun yang dihapus
       empty: Log tidak ditemukan.
       filter_by_action: Filter berdasarkan tindakan
       filter_by_user: Filter berdasarkan pengguna
@@ -348,11 +320,12 @@ id:
       enable: Aktifkan
       enabled: Diaktifkan
       enabled_msg: Emoji berhasil diaktifkan
-      image_hint: PNG hingga 50KB
+      image_hint: PNG atau GIF hingga %{size}
       list: Daftar
       listed: Terdaftar
       new:
         title: Tambah emoji kustom baru
+      no_emoji_selected: Tidak ada emoji yang diubah karena tidak ada yang dipilih
       not_permitted: Anda tidak diizinkan untuk melakukan tindakan ini
       overwrite: Timpa
       shortcode: Kode pendek
@@ -370,8 +343,10 @@ id:
       media_storage: Penyimpanan media
       new_users: pengguna baru
       opened_reports: laporan dibuka
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> banding ditunda"
       pending_reports_html:
-        other: "<strong>%{count}</strong> laporan ditunda"
+        other: "<strong>%{count}</strong> laporan banding"
       pending_tags_html:
         other: "<strong>%{count}</strong> tagar ditunda"
       pending_users_html:
@@ -384,10 +359,16 @@ id:
       top_languages: Bahasa aktif teratas
       top_servers: Server aktif teratas
       website: Situs web
+    disputes:
+      appeals:
+        empty: Tidak ada banding yang ditemukan.
+        title: Banding
     domain_allows:
       add_new: Daftar putihkan domain
       created_msg: Domain berhasil masuk daftar putih
       destroyed_msg: Domain dihapus dari daftar putih
+      export: Ekspor
+      import: Impor
       undo: Hapus dari daftar putih
     domain_blocks:
       add_new: Tambah
@@ -395,16 +376,21 @@ id:
       destroyed_msg: Pemblokiran domain telah dibatalkan
       domain: Domain
       edit: Edit blok domain
+      existing_domain_block: Anda sudah menerapkan batasan ketat terhadap %{name}.
       existing_domain_block_html: Anda telah menerapkan batasan yang lebih ketat pada %{name}, Anda harus <a href="%{unblock_url}">membuka blokirnya</a> lebih dulu.
+      export: Ekspor
+      import: Impor
       new:
         create: Buat pemblokiran
         hint: Pemblokiran domain tidak akan menghentikan pembuatan akun dalam database, tapi kami akan memberikan moderasi otomatis pada akun-akun tersebut.
         severity:
-          desc_html: "<strong>Pendiaman</strong> akan membuat semua postingan tidak dapat dilihat oleh semua orang yang tidak mengikutinya. <strong>Suspen</strong> akan menghapus semua konten, media, dan profil dari akun yang bersangkutan."
+          desc_html: "<strong>Batas</strong> akan membuat postingan dari akun yang ada di domain ini terlihat oleh siapa saja yang tidak mengikuti mereka. <strong>Tangguhkan</strong> akan menghapus semua konten, media, dan data profil dari akun domain server Anda. Gunakan <strong>Catatan</strong> jika Anda ingin menolak berkas media."
           noop: Tidak ada
-          silence: Pendiaman
+          silence: Batas
           suspend: Suspen
         title: Pemblokiran domain baru
+      no_domain_block_selected: Tidak ada blok domain yang diubah karena tidak ada yang dipilih
+      not_permitted: Anda tidak diperbolehkan untuk melakukan aksi ini
       obfuscate: Nama domain kabur
       obfuscate_hint: Mengaburkan nama domain sebagian di daftar jika pengiklanan batasan daftar domain diaktifkan
       private_comment: Komentar pribadi
@@ -415,33 +401,40 @@ id:
       reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
       reject_reports: Tolak laporan
       reject_reports_hint: Abaikan semua laporan dari domain ini. Tidak relevan untuk penangguhan
-      rejecting_media: tolak berkas media
-      rejecting_reports: laporan ditolak
-      severity:
-        silence: dibungkam
-        suspend: ditangguhkan
-      show:
-        affected_accounts:
-          other: "%{count} akun dalam database terpengaruh"
-        retroactive:
-          silence: Hapus pendiaman terhadap akun pada domain ini
-          suspend: Hapus suspen terhadap akun pada domain ini
-        title: Hapus pemblokiran domain %{domain}
-        undo: Urungkan
       undo: Urungkan blokir domain
       view: Lihat blokir domain
     email_domain_blocks:
       add_new: Tambah baru
+      attempts_over_week:
+        other: "%{count} upaya mendaftar selama seminggu terakhir"
       created_msg: Berhasil memblokir domain email
       delete: Hapus
-      destroyed_msg: Berhasil membuka blokiran domain email
+      dns:
+        types:
+          mx: Data MX
       domain: Domain
-      empty: Tidak ada domain email yang diblokir.
-      from_html: dari %{domain}
       new:
         create: Tambah domain
+        resolve: Pembaruan domain
         title: Blokir domain email baru
+      no_email_domain_block_selected: Tidak ada blokir domain email yang diubah sebab tidak ada yang dipilih
+      resolved_dns_records_hint_html: Pembaruan nama domain mengikuti domain MX, yang bertanggung jawab menerima email. Memblokir domain MX akan memblokir pendaftaran dari alamat email apapun yang menggunakan domain MX sama, meskipun nama domainnya beda. <strong>Hati-hati untuk tidak memblokir layanan email besar.</strong>
+      resolved_through_html: Diperbarui melalui %{domain}
       title: Domain email terblokir
+    export_domain_allows:
+      new:
+        title: Impor izin domain
+      no_file: Tidak ada file dipilih
+    export_domain_blocks:
+      import:
+        description_html: Anda akan mengimpor daftar blok domain. Harap tinjau daftar ini dengan sangat hati-hati, terutama jika Anda sendiri tidak menulis daftar ini.
+        existing_relationships_warning: Hubungan tindak lanjut yang ada
+        private_comment_description_html: 'Untuk membantu Anda melacak asal blok yang diimpor, blok yang diimpor akan dibuat dengan komentar pribadi berikut: <q>%{comment}</q>'
+        private_comment_template: Diimpor dari %{source} pada %{date}
+        title: Impor blok domain
+      new:
+        title: Impor blok domain
+      no_file: Tidak ada file dipilih
     follow_recommendations:
       description_html: <strong>"Rekomendasi untuk diikuti" membantu pengguna baru untuk secara cepat menemukan konten yang menarik</strong>. Ketika pengguna belum cukup berinteraksi dengan lainnya sehingga belum memunculkan rekomendasi, akun-akun ini akan direkomendasikan. Mereka dihitung ulang secara harian dari campuran akun-akun dengan keterlibatan tertinggi baru-baru ini dan jumlah pengikut lokal tertinggi untuk bahasa tertentu.
       language: Untuk bahasa
@@ -451,24 +444,51 @@ id:
       title: Rekomendasi untuk diikuti
       unsuppress: Kembalikan rekomendasi untuk diikuti
     instances:
+      availability:
+        description_html:
+          other: Jika pengiriman ke domain selama <strong>%{count} hari</strong> tidak berhasil, tidak akan ada upaya pengiriman kecuali bila kiriman <em>dari</em> domain tersebut berhasil diterima.
+        failure_threshold_reached: Batas kegagalan tercapai pada %{date}.
+        failures_recorded:
+          other: Upaya gagal dalam %{count} hari berbeda.
+        no_failures_recorded: Tidak ada kegagalan tercatat.
+        title: Ketersediaan
+        warning: Upaya terakhir untuk menyambung ke server ini tidak berhasil
       back_to_all: Semua
       back_to_limited: Terbatas
       back_to_warning: Peringatan
       by_domain: Domain
+      confirm_purge: Yakin ingin menghapus permanen data dari domain ini?
+      content_policies:
+        comment: Catatan internal
+        description_html: Anda dapat menentukan kebijakan konten yang akan diterapkan ke semua akun dari domain ini dan dari subdomainnya.
+        policies:
+          reject_media: Tolak media
+          reject_reports: Tolak laporan
+          silence: Batas
+          suspend: Tangguhkan
+        policy: Kebijakan
+        reason: Alasan publik
+        title: Kebijakan konten
+      dashboard:
+        instance_accounts_dimension: Akun yang paling banyak diikuti
+        instance_accounts_measure: akun tersimpan
+        instance_followers_measure: pengikut kami di sana
+        instance_follows_measure: pengikut mereka di sini
+        instance_languages_dimension: Bahasa terpopuler
+        instance_media_attachments_measure: lampiran media tersimpan
+        instance_reports_measure: laporan tentang mereka
+        instance_statuses_measure: kiriman tersimpan
       delivery:
         all: Semua
         clear: Hapus galat pengiriman
+        failing: Gagal
         restart: Mulai ulang pengiriman
         stop: Setop pengiriman
-        title: Pengiriman
         unavailable: Tidak tersedia
-        unavailable_message: Pengiriman tidak tersedia
-        warning: Peringatan
-        warning_message:
-          other: Kegagalan pengiriman %{count} hari
       delivery_available: Pengiriman tersedia
       delivery_error_days: Lama hari pengiriman galat
       delivery_error_hint: Jika pengiriman tidak terjadi selama %{count} hari, ia akan ditandai secara otomatis sebagai tidak terkirim.
+      destroyed_msg: Data dari %{domain} masuk antrean dihapus dalam waktu dekat.
       empty: Domain tidak ditemukan.
       known_accounts:
         other: "%{count} akun yang dikenal"
@@ -478,12 +498,15 @@ id:
         title: Moderasi
       private_comment: Komentar pribadi
       public_comment: Komentar publik
+      purge: Hapus
+      purge_description_html: Jika Anda meyakini bahwa domain ini lebih baik offline, Anda dapat menghapus semua rekaman akun dan data terkait dari domain ini dari ruang penyimpanan Anda. Ini perlu beberapa waktu.
       title: Server yang diketahui
       total_blocked_by_us: Yang kita blokir
       total_followed_by_them: Diikuti mereka
       total_followed_by_us: Diikuti kita
       total_reported: Laporan tentang mereka
       total_storage: Lampiran media
+      totals_time_period_hint_html: Total tampilan di bawah termasuk data seluruh waktu.
     invites:
       deactivate_all: Nonaktifkan semua
       filter:
@@ -507,18 +530,16 @@ id:
         title: Buat aturan IP baru
       no_ip_block_selected: Tak ada aturan IP yang berubah karena tak ada yang dipilih
       title: Aturan IP
-    pending_accounts:
-      title: Akun tertunda (%{count})
     relationships:
       title: Hubungan %{acct}
     relays:
       add_new: Tambah relai baru
       delete: Hapus
-      description_html: "<strong>Relai gabungan</strong> adalah server perantara yang menukarkan toot publik dalam jumlah besar antara server yang berlangganan dengan yang menerbitkannya. <strong>Ini akan membantu server kecil hingga medium menemukan konten dari fediverse</strong>, yang tentu saja mengharuskan pengguna lokal untuk mengikuti orang lain dari server remot."
+      description_html: "<strong>Relai gabungan</strong> adalah server perantara yang menukarkan kiriman publik dalam jumlah besar antara server yang berlangganan dengan yang menerbitkannya. <strong>Ini akan membantu server kecil hingga medium menemukan konten dari fediverse</strong>, yang tentu saja mengharuskan pengguna lokal untuk mengikuti orang lain dari server jarak jauh."
       disable: Matikan
       disabled: Dimatikan
       enable: Aktifkan
-      enable_hint: Saat diaktifkan, server Anda akan melanggan semua toot publik dari relai ini, dan akan mengirim toot publik server ini ke sana.
+      enable_hint: Saat diaktifkan, server Anda akan melanggan semua kiriman publik dari relai ini, dan akan mengirim toot publik server ini ke sana.
       enabled: Diaktifkan
       inbox_url: URL Relai
       pending: Menunggu persetujuan relai
@@ -534,38 +555,119 @@ id:
       account:
         notes:
           other: "%{count} catatan"
-        reports:
-          other: "%{count} laporan"
+      action_log: Log audit
       action_taken_by: Aksi dilakukan oleh
+      actions:
+        delete_description_html: Kiriman yang dilaporkan akan dihapus dan peringatan akan direkam untuk membantu Anda mengurus masalah oleh akun yang sama di masa mendatang.
+        mark_as_sensitive_description_html: Media di dalam kiriman terlapor akan ditandai sebagai sensitif dan hukuman akan direkam untuk membantu menangani pelanggaran dari akun yang sama di masa mendatang.
+        other_description_html: Lihat opsi lain untuk mengendalikan perilaku akun dan menyesuaikan komunikasi ke akun yang dilaporkan.
+        resolve_description_html: Tidak ada tindakan untuk akun yang dilaporkan, tidak ada peringatan yang direkam, dan laporan akan ditutup.
+        silence_description_html: Profil hanya dapat terlihat oleh pengguna yang telah mengikuti atau melihatnya secara manual, yang sangat membatasi jangkauannya. Selalu dapat dipulihkan kembali.
+        suspend_description_html: Profil dan semua kontennya tidak dapat diakses sampai ia terhapus. Interaksi dengan akun tersebut tidak dimungkinkan. Dapat dipulihkan dalam waktu 30 hari.
+      actions_description_html: Memutuskan tindakan yang tepat untuk menyelesaikan laporan ini. Jika Anda memutuskan tindakan hukuman kepada akun terlapor, notifikasi email akan dikirim ke mereka, kecuali saat kategori <strong>Spam</strong> dipilih.
+      add_to_report: Tambahkan lebih banyak untuk lapor
       are_you_sure: Apakah Anda yakin?
       assign_to_self: Tugaskan kpd saya
       assigned: Moderator tertugas
+      by_target_domain: Domain akun yang dilaporkan
+      category: Kategori
+      category_description_html: Alasan akun dan/atau konten ini dilaporkan akan disampaikan saat berkomunikasi dengan akun yang dilaporkan
       comment:
         none: Tidak ada
+      comment_description_html: 'Untuk menyediakan lebih banyak informasi, %{name} menulis:'
       created_at: Dilaporkan
+      delete_and_resolve: Hapus kiriman
       forwarded: Diteruskan
       forwarded_to: Diteruskan ke %{domain}
       mark_as_resolved: Tandai telah diseleseikan
+      mark_as_sensitive: Tandai sebagai sensitif
       mark_as_unresolved: Tandai belum terselesaikan
+      no_one_assigned: Tidak ada
       notes:
         create: Tambah catatan
         create_and_resolve: Diselesaikan dengan catatan
         create_and_unresolve: Dibuka kembali dengan catatan
         delete: Hapus
         placeholder: Jelaskan aksi yang telah dilakukan, atau pembaruan lain yang berhubungan...
+        title: Catatan
+      notes_description_html: Lihat dan tinggalkan catatan kepada moderator lain dan Anda di masa depan
+      quick_actions_description_html: 'Lakukan tindakan cepat atau gulir ke bawah untuk melihat konten yang dilaporkan:'
+      remote_user_placeholder: pengguna jarak jauh dari %{instance}
       reopen: Buka lagi laporan
       report: 'Laporkan #%{id}'
       reported_account: Akun yang dilaporkan
       reported_by: Dilaporkan oleh
       resolved: Terseleseikan
       resolved_msg: Laporan berhasil diselesaikan!
+      skip_to_actions: Langsung ke tindakan
       status: Status
-      target_domain: Domain akun yang dilaporkan
+      statuses: Konten yang dilaporkan
+      statuses_description_html: Konten menyinggung akan disampaikan saat komunikasi dengan akun yang dilaporkan
       target_origin: Akun asal yang dilaporkan
       title: Laporan
       unassign: Bebas Tugas
       unresolved: Belum Terseleseikan
       updated_at: Diperbarui
+      view_profile: Lihat profil
+    roles:
+      add_new: Tambahkan peran
+      assigned_users:
+        other: "%{count} pengguna"
+      categories:
+        administration: Administrasi
+        devops: DevOps
+        invites: Undangan
+        moderation: Moderasi
+        special: Khusus
+      delete: Hapus
+      description_html: Dengan <strong>peran pengguna</strong>, Anda dapat mengubah fungsi dan area Mastodon apa pengguna Anda dapat mengakses.
+      edit: ערכי את התפקיד של '%{name}'
+      everyone: Izin bawaan
+      everyone_full_description_html: Ini adalah <strong>peran dasaran</strong> yang memengaruhi <strong>semua pengguna</strong>, bahkan tanpa yang memiliki sebuah peran yang diberikan. Semua peran lainnya mendapatkan izin dari ini.
+      permissions_count:
+        other: "%{count} izin"
+      privileges:
+        administrator: Administrator
+        administrator_description: Pengguna dengan izin ini akan melewati setiap izin
+        delete_user_data: Hapus Data Pengguna
+        delete_user_data_description: Memungkinkan pengguna untuk menghapus data pengguna lain tanpa jeda
+        invite_users: Undang Pengguna
+        invite_users_description: Memungkinkan pengguna untuk mengundang orang baru ke server
+        manage_announcements: Kelola Pengumuman
+        manage_announcements_description: Memungkinkan pengguna untuk mengelola pengumuman di server
+        manage_appeals: Kelola Permintaan
+        manage_appeals_description: Memungkinkan pengguna untuk meninjau permintaan terhadap tindakan moderasi
+        manage_blocks: Kelola Pemblokiran
+        manage_blocks_description: Memungkinkan pengguna untuk memblokir penyedia surel dan alamat IP
+        manage_custom_emojis: Kelola Emoji Kustom
+        manage_custom_emojis_description: Memungkinkan pengguna untuk mengelola emoji kustom di server
+        manage_federation: Kelola Federasi
+        manage_federation_description: Memungkinkan pengguna untuk memblokir atau memperbolehkan federasi dengan domain lain, dan mengatur pengiriman
+        manage_invites: Kelola Undangan
+        manage_invites_description: Memungkinkan pengguna untuk menjelajah dan menonaktifkan tautan undangan
+        manage_reports: Kelola Laporan
+        manage_reports_description: Memungkinkan pengguna untuk meninjau laporan dan melakukan tindakan moderasi terhadap mereka
+        manage_roles: Kelola Peran
+        manage_roles_description: Memungkinkan pengguna untuk mengelola dan memberikan peran di bawah mereka
+        manage_rules: Kelola Aturan
+        manage_rules_description: Memungkinkan pengguna untuk mengubah aturan server
+        manage_settings: Kelola Pengaturan
+        manage_settings_description: Memungkinkan pengguna untuk mengubah pengaturan situs
+        manage_taxonomies: Kelola Taksonomi
+        manage_taxonomies_description: Memungkinkan pengguna untuk meninjau konten tren dan memperbarui pengaturan tagar
+        manage_user_access: Kelola Akses Pengguna
+        manage_user_access_description: Memungkinkan pengguna untuk menonaktifkan otentikasi dua faktor, mengubah alamat surel, dan mengatur ulang kata sandi pengguna lain
+        manage_users: Kelola Pengguna
+        manage_users_description: Memungkinkan pengguna untuk melihat detail pengguna lain dan melakukan tindakan moderasi terhadap mereka
+        manage_webhooks: Kelola Webhook
+        manage_webhooks_description: Memungkinkan pengguna untuk menyiapkan webhook untuk peristiwa administratif
+        view_audit_log: Lihat Catatan Audit
+        view_audit_log_description: Memungkinkan pengguna untuk melihat riwayat tindakan administratif di server
+        view_dashboard: Lihat Dasbor
+        view_dashboard_description: Memungkinkan pengguna untuk mengakses dasbor dan berbagai metrik
+        view_devops: DevOps
+        view_devops_description: Memungkinkan pengguna untuk mengakses dasbor Sidekiq dan pgHero
+      title: Peran
     rules:
       add_new: Tambah aturan
       delete: Hapus
@@ -574,142 +676,197 @@ id:
       empty: Belum ada aturan server yang didefinisikan.
       title: Aturan server
     settings:
-      activity_api_enabled:
-        desc_html: Hitung status yang dipos scr lokal, pengguna aktif, dan registrasi baru dlm keranjang bulanan
-        title: Terbitkan statistik keseluruhan tentang aktivitas pengguna
-      bootstrap_timeline_accounts:
-        desc_html: Pisahkan nama pengguna dengan koma. Hanya akun lokal dan tak terkunci yang akan bekerja. Isi bawaan jika kosong adalah semua admin lokal.
-        title: Ikuti scr bawaan untuk pengguna baru
-      contact_information:
-        email: Masukkan alamat email
-        username: Masukkan nama pengguna
-      custom_css:
-        desc_html: Ubah tampilan dengan CSS yang dimuat di setiap halaman
-        title: CSS Kustom
+      about:
+        manage_rules: Kelola aturan server
+        preamble: Menyediakan informasi lanjut tentang bagaimana server ini beroperasi, dimoderasi, dan didana.
+        rules_hint: Ada area yang khusus untuk peraturan yang pengguna Anda seharusnya tahu.
+        title: Tentang
+      appearance:
+        preamble: Ubah antarmuka web Mastodon.
+        title: Tampilan
+      branding:
+        preamble: Merek server Anda membedakannya dari server lain dalam jaringan. Informasi ini dapat ditampilkan dalam berbagai lingkungan, seperti antarmuka web Mastodon, aplikasi asli, dalam tampilan tautan di situs web lain dan dalam aplikasi perpesanan, dan lain-lain. Untuk alasan ini, buat informasi ini jelas, pendek, dan tidak bertele-tele.
+        title: Merek
+      content_retention:
+        preamble: Atur bagaimana konten yang dibuat oleh pengguna disimpan di Mastodon.
+        title: Retensi konten
       default_noindex:
-        desc_html: Memengaruhi semua pengguna yang tidak mengubah setelan ini sendiri
-        title: Singkirkan pengguna dari pengindeksan mesin pencari scr bawaan
+        desc_html: Memengaruhi semua pengguna yang belum mengubah pengaturan ini sendiri
+        title: Keluarkan pengguna dari pengindeksan mesin telusur secara bawaan
+      discovery:
+        follow_recommendations: Ikuti rekomendasi
+        preamble: Menampilkan konten menarik penting dalam memandu pengguna baru yang mungkin tidak tahu siapa pun di Mastodon. Atur bagaimana berbagai fitur penemuan bekerja di server Anda.
+        profile_directory: Direktori profil
+        public_timelines: Linimasa publik
+        title: Penemuan
+        trends: Tren
       domain_blocks:
         all: Kepada semua orang
         disabled: Tidak kepada siapa pun
-        title: Lihat blokir domain
         users: Ke pengguna lokal yang sudah login
-      domain_blocks_rationale:
-        title: Tampilkan alasan
-      hero:
-        desc_html: Ditampilkan di halaman depan. Direkomendasikan minimal 600x100px. Jika tidak diatur, kembali ke server gambar kecil
-        title: Gambar pertama
-      mascot:
-        desc_html: Ditampilkan di banyak halaman. Direkomendasikan minimal 293x205px. Jika tidak diatur, kembali ke maskot bawaan
-        title: Gambar maskot
-      peers_api_enabled:
-        desc_html: Nama domain server ini dijumpai di fediverse
-        title: Terbitkan daftar server yang ditemukan
-      preview_sensitive_media:
-        desc_html: Pratinjau tautan pada situsweb lain akan menampilkan gambar kecil meski media ditandai sebagai sensitif
-        title: Tampilkan media sensitif di pratinjau OpenGraph
-      profile_directory:
-        desc_html: Izinkan pengguna untuk ditemukan
-        title: Aktifkan direktori profil
       registrations:
-        closed_message:
-          desc_html: Ditampilkan pada halaman depan saat pendaftaran ditutup<br>Anda bisa menggunakan tag HTML
-          title: Pesan penutupan pendaftaran
-        deletion:
-          desc_html: Izinkan siapapun untuk menghapus akun miliknya
-          title: Buka penghapusan akun
-        min_invite_role:
-          disabled: Tidak ada satu pun
-          title: Izinkan undangan oleh
-        require_invite_text:
-          desc_html: Saat pendaftaran harus disetujui manual, buat input teks "Mengapa Anda ingin bergabung?" sebagai hal wajib bukan opsional
-          title: Pengguna baru harus memasukkan alasan bergabung
+        preamble: Atur siapa yang dapat membuat akun di server Anda.
+        title: Pendaftaran
       registrations_mode:
         modes:
           approved: Persetujuan diperlukan untuk mendaftar
           none: Tidak ada yang dapat mendaftar
           open: Siapa pun dapat mendaftar
-        title: Mode registrasi
-      show_known_fediverse_at_about_page:
-        desc_html: Ketika dimatikan, batasi linimasa publik yang ditautkan dari halaman landas untuk menampilkan konten lokal saja
-        title: Masukkan konten gabungan di halaman linimasa publik tanpa autentifikasi
-      show_staff_badge:
-        desc_html: Tampilkan lencana staf pada halaman pengguna
-        title: Tampilkan lencana staf
-      site_description:
-        desc_html: Ditampilkan sebagai sebuah paragraf di halaman depan dan digunakan sebagai tag meta.<br>Anda bisa menggunakan tag HTML, khususnya <code>&lt;a&gt;</code> dan <code>&lt;em&gt;</code>.
-        title: Deskripsi situs
-      site_description_extended:
-        desc_html: Ditampilkan pada halaman informasi tambahan<br>Anda bisa menggunakan tag HTML
-        title: Deskripsi situs tambahan
-      site_short_description:
-        desc_html: Ditampilkan pada bilah samping dan tag meta. Jelaskan apa itu Mastodon dan yang membuat server ini spesial dalam satu paragraf.
-        title: Deskripsi server pendek
-      site_terms:
-        desc_html: Anda dapat menulis kebijakan privasi, ketentuan layanan, atau hal legal lainnya sendiri. Anda dapat menggunakan tag HTML
-        title: Ketentuan layanan kustom
-      site_title: Judul Situs
-      thumbnail:
-        desc_html: Dipakai sebagai pratinjau via OpenGraph dan API. Direkomendasikan 1200x630px
-        title: Server gambar kecil
-      timeline_preview:
-        desc_html: Tampilkan tautan ke linimasa publik pada halaman landas dan izinkan API mengakses linimasa publik tanpa autentifikasi
-        title: Izinkan akses linimasa publik tanpa autentifikasi
-      title: Pengaturan situs
-      trendable_by_default:
-        desc_html: Memengaruhi tagar yang belum pernah diizinkan
-        title: Izinkan tagar masuk tren tanpa peninjauan
-      trends:
-        desc_html: Tampilkan secara publik tagar tertinjau yang kini sedang tren
-        title: Tagar sedang tren
+      title: Pengaturan Server
     site_uploads:
       delete: Hapus berkas yang diunggah
       destroyed_msg: Situs yang diunggah berhasil dihapus!
     statuses:
+      account: Penulis
+      application: Aplikasi
       back_to_account: Kembali ke halaman akun
+      back_to_report: Kembali ke halaman laporan
       batch:
-        delete: Hapus
-        nsfw_off: Tandai sebagai tak sensitif
-        nsfw_on: Tandai sebagai sensitif
+        remove_from_report: Hapus dari laporan
+        report: Laporan
       deleted: Dihapus
-      failed_to_execute: Gagal mengeksekusi
+      favourites: Favorit
+      history: Riwayat versi
+      in_reply_to: Membalas ke
+      language: Bahasa
       media:
         title: Media
-      no_media: Tanpa media
+      metadata: Metadata
       no_status_selected: Tak ada status yang berubah karena tak ada yang dipilih
+      open: Buka kiriman
+      original_status: Kiriman asli
+      reblogs: Reblog
+      status_changed: Kiriman diubah
       title: Status akun
+      trending: Sedang tren
+      visibility: Visibilitas
       with_media: Dengan media
+    strikes:
+      actions:
+        delete_statuses: "%{name} menghapus kiriman %{target}"
+        disable: "%{name} membekukan akun %{target}"
+        mark_statuses_as_sensitive: "%{name} menandai kiriman %{target} sebagai sensitif"
+        none: "%{name} mengirim peringatan ke %{target}"
+        sensitive: "%{name} menandai akun %{target} sebagai sensitif"
+        silence: "%{name} membatasi akun %{target}"
+        suspend: "%{name} menangguhkan akun %{target}"
+      appeal_approved: Banding disetujui
+      appeal_pending: Banding ditunda
     system_checks:
       database_schema_check:
         message_html: Ada proses migrasi basis data tertunda. Silakan jalankan untuk memastikan aplikasi bekerja seperti yang diharapkan
+      elasticsearch_running_check:
+        message_html: Tidak dapat tersambung ke Elasticsearch. Pastikan itu berjalan, atau nonaktifkan pencarian teks penuh
+      elasticsearch_version_check:
+        message_html: 'Versi Elasticsearch tidak kompatibel: %{value}'
+        version_comparison: Elasticsearch %{running_version} sedang berjalan, sementara yang diwajibkan adalah %{required_version}
       rules_check:
         action: Kelola aturan server
         message_html: Anda belum menentukan aturan server apapun.
       sidekiq_process_check:
         message_html: Tidak ada proses Sidekiq yang berjalan untuk %{value} antrian. Silakan tinjau konfigurasi Sidekiq Anda
     tags:
-      accounts_today: Penggunaan unik hari ini
-      accounts_week: Penggunaan unik minggu ini
-      breakdown: Rinci penggunaan hari ini berdasar sumber
-      last_active: Terakhir aktif
-      most_popular: Paling populer
-      most_recent: Terkini
-      name: Tagar
       review: Tinjau status
-      reviewed: Ditinjau
-      title: Tagar
-      trending_right_now: Sedang tren sekarang
-      unique_uses_today: "%{count} memposkan hari ini"
-      unreviewed: Tak tertinjau
       updated_msg: Pembaruan pengaturan tagar berhasil
     title: Administrasi
+    trends:
+      allow: Izinkan
+      approved: Disetujui
+      disallow: Batalkan izin
+      links:
+        allow: Izinkan tautan
+        allow_provider: Izinkan penerbit
+        description_html: Ini adalah tautan yang saat ini dibagikan oleh banyak akun yang dapat dilihat dari server Anda. Ini dapat membantu pengguna Anda menemukan apa yang sedang terjadi di dunia. Tidak ada tautan yang ditampilkan secara publik kecuali Anda sudah menyetujui pengirimnya. Anda juga dapat mengizinkan atau menolak tautan individu.
+        disallow: Batalkan izin tautan
+        disallow_provider: Batalkan izin penerbit
+        no_link_selected: Tidak ada tautan yang diubah karena tidak ada yang dipilih
+        publishers:
+          no_publisher_selected: Tidak ada penerbit yang diubah karena tidak ada yang dipilih
+        shared_by_over_week:
+          other: Dibagikan oleh %{count} orang selama seminggu terakhir
+        title: Tautan sedang tren
+        usage_comparison: Dibagikan %{today} kali hari ini, dibandingkan %{yesterday} kemarin
+      only_allowed: Yang diizinkan saja
+      pending_review: Tinjauan tertunda
+      preview_card_providers:
+        allowed: Tautan dari penerbit ini dapat menjadi tren
+        description_html: Ini adalah domain yang tautannya sering dibagikan di server Anda. Tautan tidak akan menjadi tren secara publik kecuali domain dari tautan tersebut disetujui. Persetujuan (atau penolakan) Anda mempengaruhi subdomain.
+        rejected: Tautan dari penerbit ini tidak dapat menjadi tren
+        title: Penerbit
+      rejected: Ditolak
+      statuses:
+        allow: Izinkan kiriman
+        allow_account: Izinkan penulis
+        description_html: Ini adalah kiriman yang diketahui server Anda yang kini sedang dibagikan dan difavoritkan banyak akun. Ini akan membantu pengguna baru dan lama Anda menemukan lebih banyak orang untuk diikuti. Tidak ada kiriman yang ditampilkan secara publik kecuali jika sudah disetujui pemilik akun, dan pemilik akun mengizinkan akun mereka disarankan untuk orang lain. Anda juga dapat mengizinkan atau menolak kiriman individu.
+        disallow: Jangan beri izin kiriman
+        disallow_account: Jangan beri izin penulis
+        no_status_selected: Tidak ada kiriman yang sedang tren karena tidak ada yang dipilih
+        not_discoverable: Pemilik akun memilih untuk tidak dapat ditemukan
+        shared_by:
+          other: Dibagikan dan difavoritkan %{friendly_count} kali
+        title: Kiriman yang sedang tren
+      tags:
+        current_score: Skor saat ini %{score}
+        dashboard:
+          tag_accounts_measure: kegunaan unik
+          tag_languages_dimension: Bahasa terpopuler
+          tag_servers_dimension: Server terpopuler
+          tag_servers_measure: server berbeda
+          tag_uses_measure: kegunaan total
+        description_html: Ini adalah tagar yang kini sedang muncul di banyak kiriman yang dapat dilihat server Anda. Ini dapat membantu pengguna Anda menemukan apa yang sedang dibicarakan banyak orang. Tagar tidak akan ditampilkan secara publik kecuali jika Anda mengizinkannya.
+        listable: Dapat disarankan
+        no_tag_selected: Tidak ada tag yang diubah karena tidak ada yang dipilih
+        not_listable: Tidak akan disarankan
+        not_trendable: Tidak akan muncul di bawah tren
+        not_usable: Tidak dapat digunakan
+        peaked_on_and_decaying: Populer pada %{date}, kini mulai turun
+        title: Tagar sedang tren
+        trendable: Dapat muncul di bawah tren
+        trending_rank: 'Sedang tren #%{rank}'
+        usable: Dapat digunakan
+        usage_comparison: Digunakan %{today} kali hari ini, dibandingkan %{yesterday} kemarin
+        used_by_over_week:
+          other: Digunakan oleh %{count} orang selama seminggu terakhir
+      title: Tren
+      trending: Sedang tren
     warning_presets:
       add_new: Tambah baru
       delete: Hapus
       edit_preset: Sunting preset peringatan
       empty: Anda belum mendefinisikan peringatan apapun.
       title: Kelola preset peringatan
+    webhooks:
+      add_new: Tambah titik akhir
+      delete: Hapus
+      description_html: Sebuah <strong>webhook</strong> memungkinkan Mastodon untuk mengirim <strong>notifikasi dalam waktu nyata</strong> tentang peristiwa yang dipilih ke aplikasi Anda sendiri, sehingga aplikasi Anda dapat <strong>memicu reaksi secara otomatis</strong>.
+      disable: Matikan
+      disabled: Nonaktif
+      edit: Edit titik akhir
+      empty: Anda belum memiliki titik akhir webhook yang diatur.
+      enable: Aktifkan
+      enabled: Aktif
+      enabled_events:
+        other: "%{count} acara aktif"
+      events: Acara
+      new: Webhook baru
+      rotate_secret: Buat ulang rahasia
+      secret: Rahasia penandatanganan
+      status: Status
+      title: Webhook
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: untuk menghapus kiriman mereka
+        disable: untuk membekukan akun mereka
+        mark_statuses_as_sensitive: untuk menandai kiriman sebagai sensitif
+        none: peringatan
+        sensitive: untuk menandai akun mereka sebagai sensitif
+        silence: untuk membatasi akun mereka
+        suspend: untuk menangguhkan akun mereka
+      body: "%{target} melakukan banding keputusan moderasi oleh %{action_taken_by} dari %{date}, yang %{type}. Mereka menulis:"
+      next_steps: Anda dapat menyetujui banding untuk mengurungkan keputusan moderasi atau mengabaikannya.
+      subject: "%{username} melakukan banding keputusan moderasi di %{instance}"
     new_pending_account:
       body: Detail akun baru di bawah. Anda dapat menyetujui atau menolak lamaran ini.
       subject: Akun baru muncul untuk ditinjau di %{instance} (%{username})
@@ -717,9 +874,17 @@ id:
       body: "%{reporter} telah melaporkan %{target}"
       body_remote: Seseorang dari %{domain} telah melaporkan %{target}
       subject: Laporan baru untuk %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Tagar #%{name} sedang tren hari ini, tetapi belum ditinjau. Itu tidak akan ditampilkan secara publik kecuali Anda mengizinkannya, atau simpan saja borang sebagaimana mestinya untuk tidak mendengarnya lagi.'
-      subject: Tagar baru muncul untuk ditinjau di %{instance} (#%{name})
+    new_trends:
+      body: 'Item berikut harus ditinjau sebelum ditampilkan secara publik:'
+      new_trending_links:
+        title: Tautan sedang tren
+      new_trending_statuses:
+        title: Kiriman yang sedang tren
+      new_trending_tags:
+        no_approved_tags: Saat ini tidak ada tagar tren yang disetujui.
+        requirements: 'Kandidat yang ada di sini bisa saja melewati peringkat #%{rank} tagar sedang tren yang disetujui, yang kini #%{lowest_tag_name} memiliki nilai %{lowest_tag_score}.'
+        title: Tagar sedang tren
+      subject: Tren baru yang perlu ditinjau di %{instance}
   aliases:
     add_new: Buat alias
     created_msg: Berhasil membuat alias baru. Sekarang Anda dapat memulai pindah dari akun lama.
@@ -728,8 +893,8 @@ id:
     hint_html: Jika Anda ingin pindah dari akun lain ke sini, Anda dapat membuat alias, yang dilakukan sebelum Anda setuju dengan memindah pengikut dari akun lama ke akun sini. Aksi ini <strong>tidak berbahaya dan tidak bisa dikembalikan</strong>. <strong>Pemindahan akun dimulai dari akun lama</strong>.
     remove: Hapus tautan alias
   appearance:
-    advanced_web_interface: Antar muka web tingkat lanjut
-    advanced_web_interface_hint: 'Jika Anda ingin memanfaatkan seluruh lebar layar Anda, antar muka web tingkat lanjut mengizinkan Anda mengonfigurasi beragam kolom untuk menampilkan informasi sebanyak yang Anda mau: Beranda, notifikasi, linimasa gabungan, daftar, dan tagar.'
+    advanced_web_interface: Antarmuka web tingkat lanjut
+    advanced_web_interface_hint: 'Jika Anda ingin memanfaatkan seluruh lebar layar Anda, antarmuka web tingkat lanjut memungkinkan Anda mengonfigurasi beragam kolom untuk menampilkan informasi sebanyak yang Anda inginkan: Beranda, notifikasi, linimasa gabungan, daftar, dan tagar.'
     animations_and_accessibility: Animasi dan aksesibilitas
     confirmation_dialogs: Dialog konfirmasi
     discovery: Jelajah
@@ -738,7 +903,7 @@ id:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Siapa saja bisa berkontribusi.
     sensitive_content: Konten sensitif
-    toot_layout: Tata letak toot
+    toot_layout: Tata letak kiriman
   application_mailer:
     notification_preferences: Ubah pilihan email
     salutation: "%{name},"
@@ -749,16 +914,13 @@ id:
   applications:
     created: Aplikasi berhasil dibuat
     destroyed: Aplikasi berhasil dihapus
-    invalid_url: URL tidak sesuai
     regenerate_token: Buat ulang token akses
     token_regenerated: Token akses berhasil dibuat ulang
     warning: Hati-hati dengan data ini. Jangan bagikan kepada siapapun!
     your_token: Token akses Anda
   auth:
-    apply_for_account: Meminta undangan
+    apply_for_account: Permintaan akun
     change_password: Kata sandi
-    checkbox_agreement_html: Saya setuju dengan <a href="%{rules_path}" target="_blank">peraturan server</a> dan <a href="%{terms_path}" target="_blank">ketentuan layanan</a>
-    checkbox_agreement_without_rules_html: Saya setuju dengan <a href="%{terms_path}" target="_blank">ketentuan layanan</a>
     delete_account: Hapus akun
     delete_account_html: Jika Anda ingin menghapus akun Anda, Anda dapat <a href="%{path}">memproses ini</a>. Anda akan dikonfirmasi.
     description:
@@ -771,11 +933,13 @@ id:
     invalid_reset_password_token: Token reset kata sandi tidak valid atau kedaluwarsa. Silakan minta yang baru.
     link_to_otp: Masukkan kode dua-faktor dari ponsel Anda atau dari kode pemulihan
     link_to_webauth: Gunakan perangkat kunci keamanan Anda
+    log_in_with: Masuk dengan
     login: Masuk
     logout: Keluar
     migrate_account: Pindah ke akun berbeda
     migrate_account_html: Jika Anda ingin mengalihkan akun ini ke akun lain, Anda dapat <a href="%{path}">mengaturnya di sini</a>.
     or_log_in_with: Atau masuk dengan
+    privacy_policy_agreement_html: Saya telah membaca dan menerima <a href="%{privacy_policy_path}" target="_blank">kebijakan privasi</a>
     providers:
       cas: CAS
       saml: SAML
@@ -783,20 +947,26 @@ id:
     registration_closed: "%{instance} tidak menerima anggota baru"
     resend_confirmation: Kirim ulang email konfirmasi
     reset_password: Reset kata sandi
+    rules:
+      preamble: Ini diatur dan ditetapkan oleh moderator %{domain}.
+      title: Beberapa aturan dasar.
     security: Identitas
     set_new_password: Tentukan kata sandi baru
     setup:
       email_below_hint_html: Jika alamat email di bawah tidak benar, Anda dapat menggantinya di sini dan menerima email konfirmasi baru.
       email_settings_hint_html: Email konfirmasi telah dikirim ke %{email}. Jika alamat email tidak benar, Anda dapat mengubahnya di pengaturan akun.
       title: Atur
+    sign_up:
+      preamble: Dengan sebuah akun di server Mastodon ini, Anda akan dapat mengikuti orang lain dalam jaringan, di mana pun akun mereka berada.
+      title: Mari kita siapkan Anda di %{domain}.
     status:
       account_status: Status akun
       confirming: Menunggu konfirmasi email diselesaikan.
       functional: Akun Anda kini beroperasi penuh.
       pending: Permintaan Anda sedang ditinjau oleh staf kami. Ini mungkin butuh beberapa waktu. Anda akan menerima email jika permintaan Anda diterima.
       redirecting_to: Akun Anda tidak aktif karena sekarang dialihkan ke %{acct}.
+      view_strikes: Lihat hukuman lalu yang pernah terjadi kepada akun Anda
     too_fast: Formulir dikirim terlalu cepat, coba lagi.
-    trouble_logging_in: Kesulitan masuk?
     use_security_key: Gunakan kunci keamanan
   authorize_follow:
     already_following: Anda sudah mengikuti akun ini
@@ -854,10 +1024,36 @@ id:
       more_details_html: Lebih detailnya, lihat <a href="%{terms_path}">kebijakan privasi</a>.
       username_available: Nama pengguna Anda akan tersedia lagi
       username_unavailable: Nama pengguna Anda tetap tidak akan tersedia
-  directories:
-    directory: Direktori profil
-    explanation: Temukan pengguna berdasarkan minatnya
-    explore_mastodon: Jelajahi %{title}
+  disputes:
+    strikes:
+      action_taken: Tindakan dilaksanakan
+      appeal: Banding
+      appeal_approved: Peringatan ini digagalkan dalam banding dan tidak lagi valid
+      appeal_rejected: Banding telah ditolak
+      appeal_submitted_at: Banding dikirimkan
+      appealed_msg: Banding Anda sudah dikirim. Jika disetujui, Anda akan diberi tahu.
+      appeals:
+        submit: Ajukan banding
+      approve_appeal: Setujui banding
+      associated_report: Laporan yang berkaitan
+      created_at: Tanggal
+      description_html: Ini adalah tindakan yang dilakukan terhadap akun Anda dan peringatan telah dikirim oleh staf %{instance}.
+      recipient: Dialamatkan untuk
+      reject_appeal: Tolak banding
+      status: 'Kiriman #%{id}'
+      status_removed: Kirim sudah dihapus dari sistem
+      title: "%{action} dari %{date}"
+      title_actions:
+        delete_statuses: Penghapusan kiriman
+        disable: Pembekuan akun
+        mark_statuses_as_sensitive: Tandai kiriman sebagai sensitif
+        none: Peringatan
+        sensitive: Tandai akun sebagai sensitif
+        silence: Pembatasan akun
+        suspend: Penangguhan akun
+      your_appeal_approved: Banding Anda disetujui
+      your_appeal_pending: Anda telah mengirim banding
+      your_appeal_rejected: Banding Anda ditolak
   domain_validator:
     invalid_domain: bukan nama domain yang valid
   errors:
@@ -882,7 +1078,7 @@ id:
     archive_takeout:
       date: Tanggal
       download: Unduh arsip Anda
-      hint_html: Anda dapat meminta arsip <strong>toot dan media yang Anda unggah</strong>. Data yang terekspor akan berformat ActivityPub, dapat dibaca dengan perangkat lunak yang mendukungnya. Anda dapat meminta arsip akun setiap 7 hari.
+      hint_html: Anda dapat meminta arsip <strong>kiriman dan media yang Anda unggah</strong>. Data yang terekspor akan berformat ActivityPub, yang dapat dibaca dengan perangkat lunak yang mendukungnya. Anda dapat meminta arsip akun setiap 7 hari.
       in_progress: Mengompilasi arsip Anda...
       request: Meminta arsip Anda
       size: Ukuran
@@ -906,55 +1102,62 @@ id:
       public: Linimasa publik
       thread: Percakapan
     edit:
+      add_keyword: Tambahkan kata kunci
+      keywords: Kata kunci
+      statuses: Kiriman individu
+      statuses_hint_html: Saringan ini diterapkan beberapa kiriman individu jika mereka cocok atau tidak dengan kata kunci di bawah. <a href="%{path}">Tinjau atau hapus kiriman dari saringan</a>.
       title: Ubah saringan
     errors:
+      deprecated_api_multiple_keywords: Parameter ini tidak dapat diubah dari aplikasi ini karena mereka diterapkan ke lebih dari satu kata kunci saringan. Gunakan aplikasi yang lebih baru atau antarmuka web.
       invalid_context: Konteks tidak ada atau invalid
-      invalid_irreversible: Penyaringan yang tidak dapat dipulihkan hanya bekerja di beranda atau konteks notifikasi
     index:
+      contexts: Saringan dalam %{contexts}
       delete: Hapus
       empty: Anda tidak memiliki filter.
+      expires_in: Kedaluwarsa dalam %{distance}
+      expires_on: Kedaluwarsa pada %{date}
+      keywords:
+        other: "%{count} kata kunci"
+      statuses:
+        other: "%{count} kiriman"
+      statuses_long:
+        other: "%{count} kiriman individu disembunyikan"
       title: Saringan
     new:
+      save: Simpan saringan baru
       title: Tambah saringan baru
+    statuses:
+      back_to_filter: Kembali ke saringan
+      batch:
+        remove: Hapus dari saringan
+      index:
+        hint: Saringan ini diterapkan ke beberapa kiriman individu tanpa memengaruhi oleh kriteria lain. Anda dapat menambahkan lebih banyak kiriman ke saringan ini dari antarmuka web.
+        title: Kiriman yang disaring
   footer:
-    developers: Pengembang
-    more: Lainnya…
-    resources: Sumber daya
     trending_now: Sedang tren
   generic:
     all: Semua
+    all_items_on_page_selected_html:
+      other: "<strong>%{count}</strong> item di laman ini dipilih."
+    all_matching_items_selected_html:
+      other: "<strong>%{count}</strong> item yang cocok dengan pencarian Anda dipilih."
     changes_saved_msg: Perubahan berhasil disimpan!
     copy: Salin
     delete: Hapus
-    no_batch_actions_available: Tindakan batch tidak tersedia di halaman ini
+    deselect: Batalkan semua pilihan
+    none: Tidak ada
     order_by: Urut berdasarkan
     save_changes: Simpan perubahan
+    select_all_matching_items:
+      other: Pilih %{count} item yang cocok dengan pencarian Anda.
+    today: hari ini
     validation_errors:
       other: Ada yang belum benar! Silakan tinjau %{count} kesalahan di bawah ini
   html_validator:
     invalid_markup: 'berisi markup HTML yang tidak valid: %{error}'
-  identity_proofs:
-    active: Aktif
-    authorize: Ya, izinkan
-    authorize_connection_prompt: Izinkan koneksi kriptografi ini?
-    errors:
-      failed: Koneksi kriptografi gagal. Silakan coba lagi dari %{provider}.
-      keybase:
-        invalid_token: Token Keybase adalah sandi tanda tangan dan harus berupa 66 karakter hex
-        verification_failed: Keybase tidak mengenali token ini sebagai tanda tangan pengguna Keybase %{kb_username}. Silakan ulangi lagi dari Keybase.
-      wrong_user: Tidak dapat membuat bukti untuk %{proving} saat masuk sebagai %{current}. Masuk sebagai %{proving} dan coba lagi.
-    explanation_html: Anda dapat mengoneksikan identitas lain secara kriptografi, seperti profil Keybase. Ini mengizinkan orang lain untuk mengirim pesan terenkripsi kepada Anda dan mempercayai konten yang Anda kirim.
-    i_am_html: Saya adalah %{username} di %{service}.
-    identity: Identitas
-    inactive: Tidak aktif
-    publicize_checkbox: 'Dan toot ini:'
-    publicize_toot: 'Terbukti! Saya adalah %{username} di %{service}: %{url}'
-    remove: Hapus bukti dari akun
-    removed: Berhasil menghapus bukti dari akun
-    status: Status verifikasi
-    view_proof: Lihat bukti
   imports:
     errors:
+      invalid_csv_file: 'Berkas CVS tidak sah. Kesalahan: %{error}'
       over_rows_processing_limit: berisi lebih dari %{count} baris
     modes:
       merge: Gabung
@@ -970,7 +1173,6 @@ id:
       following: Daftar diikuti
       muting: Daftar didiamkan
     upload: Unggah
-  in_memoriam_html: Dalam memori.
   invites:
     delete: Nonaktifkan
     expired: Kedaluwarsa
@@ -1048,16 +1250,14 @@ id:
     carry_blocks_over_text: Pengguna ini pindah dari %{acct}, yang telah Anda blokir sebelumnya.
     carry_mutes_over_text: Pengguna ini pindah dari %{acct}, yang telah Anda bisukan sebelumnya.
     copy_account_note_text: 'Pengguna ini pindah dari %{acct}, ini dia pesan Anda sebelumnya tentang mereka:'
+  navigation:
+    toggle_menu: Saklar menu
   notification_mailer:
-    digest:
-      action: Lihat semua notifikasi
-      body: Ini adalah ringkasan singkat yang anda lewatkan pada sejak kunjungan terakhir anda pada %{since}
-      mention: "%{name} menyebut anda di:"
-      new_followers_summary:
-        other: Anda mendapatkan %{count} pengikut baru! Luar biasa!
-      subject:
-        other: "%{count} notifikasi baru sejak kunjungan terakhir anda pada \U0001F418"
-      title: Saat Anda tidak muncul...
+    admin:
+      report:
+        subject: "%{name} mengirim sebuah laporan"
+      sign_up:
+        subject: "%{name} mendaftar"
     favourite:
       body: 'Status anda disukai oleh %{name}:'
       subject: "%{name} menyukai status anda"
@@ -1084,6 +1284,8 @@ id:
       title: Boost baru
     status:
       subject: "%{name} baru saja memposting"
+    update:
+      subject: "%{name} mengedit kiriman"
   notifications:
     email_events: Event untuk notifikasi email
     email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
@@ -1127,6 +1329,8 @@ id:
     other: Lainnya
     posting_defaults: Kiriman bawaan
     public_timelines: Linimasa publik
+  privacy_policy:
+    title: Kebijakan Privasi
   reactions:
     errors:
       limit_reached: Batas reaksi yang berbeda terpenuhi
@@ -1149,32 +1353,25 @@ id:
     remove_selected_follows: Batal ikuti pengguna terpilih
     status: Status akun
   remote_follow:
-    acct: Masukkan namapengguna@domain yang akan anda ikuti
     missing_resource: Tidak dapat menemukan URL redirect dari akun anda
-    no_account_html: Tidak memiliki akun? Anda dapat <a href='%{sign_up_path}' target='_blank'>mendaftar di sini</a>
-    proceed: Lanjutkan untuk mengikuti
-    prompt: 'Anda akan mengikuti:'
-    reason_html: "<strong>Mengapa langkah ini penting?</strong> <code>%{instance}</code> mungkin saja bukan tempat Anda mendaftar, sehingga kami perlu mengalihkan Anda ke server beranda lebih dahulu."
-  remote_interaction:
-    favourite:
-      proceed: Lanjutkan ke favorit
-      prompt: 'Anda ingin memfavoritkan toot ini:'
-    reblog:
-      proceed: Lanjutkan ke boost
-      prompt: 'Anda ingin mem-boost toot ini:'
-    reply:
-      proceed: Lanjutkan ke balasan
-      prompt: 'Anda ingin membalas toot ini:'
+  reports:
+    errors:
+      invalid_rules: tidak mereferensikan aturan yang valid
+  rss:
+    content_warning: 'Peringatan konten:'
+    descriptions:
+      account: Kiriman publik dari @%{acct}
+      tag: 'Kiriman publik ditagari #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Anda telah melampaui batas %{limit} toot terjadwal untuk sehari
-    over_total_limit: Anda telah melampaui batas %{limit} toot terjadwal
+    over_daily_limit: Anda telah melampaui batas %{limit} kiriman terjadwal untuk sehari
+    over_total_limit: Anda telah melampaui batas %{limit} kiriman terjadwal
     too_soon: Tanggal terjadwal haruslah pada hari yang akan datang
   sessions:
     activity: Aktivitas terakhir
     browser: Peramban
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1188,7 +1385,7 @@ id:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Sesi sekarang
     description: "%{browser} di %{platform}"
@@ -1197,7 +1394,7 @@ id:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1223,7 +1420,6 @@ id:
     edit_profile: Ubah profil
     export: Expor data
     featured_tags: Tagar unggulan
-    identity_proofs: Bukti identitas
     import: Impor
     import_and_export: Impor dan ekspor
     migrate: Pemindahan akun
@@ -1232,6 +1428,7 @@ id:
     profile: Profil
     relationships: Ikuti dan pengikut
     statuses_cleanup: Hapus kiriman otomatis
+    strikes: Moderasi hukuman
     two_factor_authentication: Autentikasi Two-factor
     webauthn_authentication: Kunci keamanan
   statuses:
@@ -1245,24 +1442,25 @@ id:
         other: "%{count} video"
     boosted_from_html: Boost dari %{acct_link}
     content_warning: 'Peringatan konten: %{warning}'
+    default_language: Sama seperti bahasa antarmuka
     disallowed_hashtags:
       other: 'berisi tagar yang tidak diizinkan: %{tags}'
+    edited_at_html: Diedit %{date}
     errors:
       in_reply_not_found: Status yang ingin Anda balas sudah tidak ada.
-    language_detection: Deteksi bahasa secara otomatis
     open_in_web: Buka di web
     over_character_limit: melebihi %{max} karakter
     pin_errors:
-      limit: Anda sudah mencapai jumlah maksimum toot yang dapat disematkan
-      ownership: Toot orang lain tidak bisa disematkan
-      private: Toot privat tidak bisa disematkan
+      direct: Kiriman yang hanya terlihat oleh pengguna yang disebutkan tidak dapat disematkan
+      limit: Anda sudah mencapai jumlah maksimum kiriman yang dapat disematkan
+      ownership: Kiriman orang lain tidak bisa disematkan
       reblog: Boost tidak bisa disematkan
     poll:
       total_people:
         other: "%{count} orang"
       total_votes:
         other: "%{count} memilih"
-      vote: Memilih
+      vote: Pilih
     show_more: Tampilkan selengkapnya
     show_newer: Tampilkan lebih baru
     show_older: Tampilkan lebih lama
@@ -1304,6 +1502,7 @@ id:
       '2629746': 1 bulan
       '31556952': 1 tahun
       '5259492': 2 bulan
+      '604800': 1 minggu
       '63113904': 2 tahun
       '7889238': 3 bulan
     min_age_label: Batas usia
@@ -1312,94 +1511,14 @@ id:
     min_reblogs: Simpan kiriman yang di-boost lebih dari
     min_reblogs_hint: Tidak menghapus kiriman Anda yang di-boost lebih dari sekian kali. Kosongkan bila ingin menghapus kiriman tanpa peduli jumlah boost-nya
   stream_entries:
-    pinned: Toot tersemat
+    pinned: Kiriman tersemat
     reblogged: di-boost-kan
     sensitive_content: Konten sensitif
+  strikes:
+    errors:
+      too_late: Terlambat untuk mengajukan banding hukuman ini
   tags:
     does_not_match_previous_name: tidak cocok dengan nama sebelumnya
-  terms:
-    body_html: |
-      <h2>Privacy Policy</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Ketentuan Layanan dan Kebijakan Privasi"
   themes:
     contrast: Mastodon (Kontras tinggi)
     default: Mastodon (Gelap)
@@ -1408,6 +1527,7 @@ id:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Tambah
     disable: Matikan
@@ -1424,63 +1544,73 @@ id:
     recovery_instructions_html: Jika anda kehilangan akses pada handphone anda, anda bisa menggunakan kode pemulihan dibawah ini untuk mendapatkan kembali akses pada akun anda. Simpan kode pemulihan anda baik-baik, misalnya dengan mencetaknya atau menyimpannya bersama dokumen penting lainnya.
     webauthn: Kunci keamanan
   user_mailer:
+    appeal_approved:
+      action: Ke akun Anda
+      explanation: Banding peringatan terhadap akun Anda pada %{strike_date} yang Anda kirim pada %{appeal_date} telah disetujui. Akun Anda akan kembali ditandai sebagai akun bagus.
+      subject: Banding Anda dari %{date} telah disetujui
+      title: Banding disetujui
+    appeal_rejected:
+      explanation: Banding terhadap akun Anda pada %{strike_date} yang Anda ajukan %{appeal_date} telah ditolak.
+      subject: Banding Anda dari %{date} telah ditolak
+      title: Banding ditolak
     backup_ready:
       explanation: Cadangan penuh akun Mastodon Anda sudah dapat diunduh!
       subject: Arsip Anda sudah siap diunduh
       title: Ambil arsip
-    sign_in_token:
-      details: 'Ini dia rincian usaha masuk akun:'
-      explanation: 'Kami mendeteksi usaha masuk ke akun Anda dari alamat IP tak dikenal. Jika ini Anda, mohon masukkan kode keamanan di bawah pada halaman masuk:'
-      further_actions: 'Jika ini bukan Anda, mohon ganti kata sandi dan aktifkan autentikasi dua-faktor pada akun Anda. Anda bisa melakukannya di sini:'
-      subject: Harap konfirmasi usaha masuk akun
-      title: Usaha masuk akun
+    suspicious_sign_in:
+      change_password: mengubah kata sandi Anda
+      details: 'Ini rincian masuk akun Anda:'
+      explanation: Kami mendeteksi masuk akun Anda dari alamat IP baru.
+      further_actions_html: Jika ini bukan Anda, kami menyarankan Anda untuk melakukan %{action} langsung dan mengaktifkan otentikasi dua-faktor untuk mengamankan akun Anda.
+      subject: Akun Anda telah diakses dari alamat IP baru
+      title: Masuk akun baru
     warning:
+      appeal: Ajukan banding
+      appeal_description: Jika Anda yakin ini galat, Anda dapat mengajukan banding ke staf %{instance}.
+      categories:
+        spam: Spam
+        violation: Konten melanggar panduan komunitas berikut
       explanation:
-        disable: Saat akun Anda beku, data Anda tetap utuh. Anda tidak akan dapat melakukan apa-apa sampai akun Anda tidak lagi dikunci.
-        sensitive: Berkas media dan media tertaut yang Anda unggah akan dianggap sebagai sensitif.
-        silence: Saat akun Anda dibatasi, hanya akun yang Anda ikuti yang dapat melihat toot Anda di server ini. Akun Anda mungkin akan dikecualikan dari daftar publik. Akun lain dapat mengikuti akun Anda secara manual.
-        suspend: Akun Anda telah ditangguhkan. Semua toot dan media yang Anda unggah dihapus secara permanen dari server ini, dan server tempat Anda memiliki pengikut.
-      get_in_touch: Anda dapat membalas email ini untuk menghubungi pengurus %{instance}.
-      review_server_policies: Tinjau kebijakan server
-      statuses: 'Khususnya untuk:'
+        delete_statuses: Beberapa kiriman Anda terdeteksi melanggar satu atau lebih panduan komunitas dan satu per satu telah dihapus moderator %{instance}.
+        disable: Anda tidak lagi dapat menggunakan akun, tapi profil dan data Anda lainnya masih tersimpan. Anda dapat minta cadangan data Anda, mengubah pengaturan akun, atau menghapus akun.
+        mark_statuses_as_sensitive: Beberapa kiriman Anda telah ditandai sebagai sensitif oleh moderator %{instance}. Artinya, orang-orang perlu mengetuk media pada kiriman sebelum pratinjau ditampilkan. Anda dapat menandai sendiri media Anda sebagai sensitif di kiriman pada masa mendatang.
+        sensitive: Mulai sekarang, semua berkas media yang telah Anda unggah akan ditandai sebagai sensitif dan disembunyikan di balik peringatan yang harus diklik.
+        silence: Anda masih tetap dapat menggunakan akun tetapi hanya orang yang mengikuti Anda yang dapat melihat kiriman Anda di server ini, dan Anda mungkin akan dikeluarkan dari fitur pencarian akun. Bagaimana pun, orang lain tetap dapat mengikuti Anda secara manual.
+        suspend: Anda tidak dapat menggunakan akun Anda, dan profil serta data lain Anda tidak lagi dapat diakses. Anda masih tetap bisa masuk akun untuk minta cadangan data sampai data Anda akan dihapus permanen 30 hari lagi, tapi kami akan menyimpan beberapa data dasar untuk mencegah Anda menghindari penangguhan.
+      reason: 'Alasan:'
+      statuses: 'Kiriman mengutip:'
       subject:
+        delete_statuses: Postingan anda pada %{acct} telah dihapus
         disable: Akun Anda %{acct} telah dibekukan
+        mark_statuses_as_sensitive: Kiriman Anda di %{acct} telah ditandai sebagai sensitif
         none: Peringatan untuk %{acct}
-        sensitive: Postingan media akun Anda %{acct} telah ditandai sebagai sensitif
+        sensitive: Kiriman Anda di %{acct} akan ditandai sebagai sensitif mulai sekarang
         silence: Akun Anda %{acct} telah dibatasi
         suspend: Akun Anda %{acct} telah ditangguhkan
       title:
+        delete_statuses: Postingan dihapus
         disable: Akun dibekukan
+        mark_statuses_as_sensitive: Kiriman ditandai sebagai sensitif
         none: Peringatan
-        sensitive: Media Anda telah ditandai sebagai sensitif
+        sensitive: Akun ditandai sebagai sensitif
         silence: Akun dibatasi
         suspend: Akun ditangguhkan
     welcome:
       edit_profile_action: Siapkan profil
-      edit_profile_step: Anda dapat menyesuaikan profil Anda dengan mengunggah avatar, kepala, mengubah tampilan nama dan lainnya. Jika Anda ingin meninjau pengikut baru sebelum Anda terima sebagai pengikut, Anda dapat mengunci akun Anda.
+      edit_profile_step: Anda dapat mengubah profil Anda dengan mengunggah sebuah foto profil, mengubah nama tampilan Anda dan lain-lain. Anda dapat memilih untuk meninjau pengikut baru sebelum mereka diperbolehkan untuk mengikuti Anda.
       explanation: Beberapa tips sebelum Anda memulai
       final_action: Mulai mengirim
-      final_step: 'Mulai mengirim! Tanpa pengikut, pesan publik Anda akan tetap dapat dilihat oleh akun lain, contohnya di linimasa lokal atau di tagar. Anda mungkin ingin memperkenalkan diri dengan tagar #introductions.'
+      final_step: 'Mulai mengirim! Bahkan tanpa pengikut, kiriman publik Anda dapat dilihat oleh orang lain, misalkan di linimasa lokal atau dalam tagar. Anda dapat memperkenalkan diri Anda dalam tagar #introductions.'
       full_handle: Penanganan penuh Anda
       full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
-      review_preferences_action: Ubah preferensi
-      review_preferences_step: Pastikan Anda telah mengatur preferensi Anda, seperti email untuk menerima pesan, atau tingkat privasi bawaan untuk postingan Anda. Jika Anda tidak alergi dengan gerakan gambar, Anda dapat mengaktifkan opsi mainkan otomatis GIF.
       subject: Selamat datang di Mastodon
-      tip_federated_timeline: Linimasa gabungan adalah ruang yang menampilkan jaringan Mastodon. Tapi ini hanya berisi tetangga orang-orang yang Anda ikuti, jadi tidak sepenuhnya komplet.
-      tip_following: Anda secara otomatis mengikuti admin server. Untuk mencari akun-akun yang menarik, silakan periksa linimasa lokal dan gabungan.
-      tip_local_timeline: Linimasa lokal adalah ruang yang menampilkan orang-orang di %{instance}. Mereka adalah tetangga dekat!
-      tip_mobile_webapp: Jika peramban mobile Anda ingin menambahkan Mastodon ke layar utama, Anda dapat menerima notifikasi dorong. Ia akan berjalan seperti aplikasi asli!
-      tips: Tips
       title: Selamat datang, %{name}!
   users:
     follow_limit_reached: Anda tidak dapat mengikuti lebih dari %{limit} orang
-    generic_access_help_html: Mengalami masalah saat akses akun? Anda mungkin perlu menghubungi %{email} untuk mencari bantuan
     invalid_otp_token: Kode dua faktor tidak cocok
-    invalid_sign_in_token: Kode keamanan tidak valid
     otp_lost_help_html: Jika Anda kehilangan akses keduanya, Anda dapat menghubungi %{email}
     seamless_external_login: Anda masuk via layanan eksternal, sehingga pengaturan kata sandi dan email tidak tersedia.
     signed_in_as: 'Masuk sebagai:'
-    suspicious_sign_in_confirmation: Anda terlihat belum pernah masuk dari perangkat ini, dan sudah lama Anda tidak masuk akun, sehingga kami mengirim kode keamanan ke alamat email Anda untuk mengonfirmasi bahwa ini adalah Anda.
   verification:
     explanation_html: 'Anda dapat <strong>memverifikasi diri Anda sebagai pemiliki tautan pada metadata profil</strong>. Situsweb yang ditautkan haruslah berisi tautan ke profil Mastodon Anda. Tautan tersebut <strong>harus</strong> memiliki atribut <code>rel="me"</code>. Isi teks tautan tidaklah penting. Ini contohnya:'
     verification: Verifikasi
diff --git a/config/locales/ig.yml b/config/locales/ig.yml
new file mode 100644
index 000000000..c32706518
--- /dev/null
+++ b/config/locales/ig.yml
@@ -0,0 +1,12 @@
+---
+ig:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/io.yml b/config/locales/io.yml
index ad9ac5be6..b05555e1b 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -2,157 +2,1612 @@
 io:
   about:
     about_mastodon_html: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate.
-    about_this: Pri ta instaluro
-    contact: Kontaktar
-    source_code: Fontkodexo
-    status_count_before: Qua publikigis
-    user_count_before: Hemo di
+    contact_missing: Ne fixigita
+    contact_unavailable: Nula
+    hosted_on: Mastodon hostigesas che %{domain}
+    title: Pri co
   accounts:
     follow: Sequar
+    followers:
+      one: Sequanto
+      other: Sequanti
     following: Sequati
+    instance_actor_flash: Ca konto esas virtuala aganto quo uzesas por reprezentar la servilo e ne irga individuala uzanto. Ol uzesas por federskopo e ne debas restriktesar.
+    last_active: lasta aktiva tempo
+    link_verified_on: Proprieteso di ca ligilo kontrolesis ye %{date}
     nothing_here: Esas nulo hike!
-    people_followed_by: Sequati da %{name}
-    people_who_follow: Sequanti di %{name}
-    unfollow: Dessequar
+    pin_errors:
+      following: Vu mustas ja sequar persono quon vu volas estalar
+    posts:
+      one: Posto
+      other: Posti
+    posts_tab_heading: Posti
   admin:
+    account_actions:
+      action: Agez
+      title: Agez jero a %{acct}
+    account_moderation_notes:
+      create: Pozez noto
+      created_msg: Jernoto sucesoze kreesis!
+      destroyed_msg: Jernoto sucesoze efacesis!
     accounts:
+      add_email_domain_block: Obstruktez retpostodomeno
+      approve: Aprobez
+      approved_msg: Sucesoze aprobis registroapliko di %{username}
       are_you_sure: Ka tu esas certa?
+      avatar: Profilimajo
+      by_domain: Domeno
+      change_email:
+        changed_msg: Kontoretposto sucesoze chanjesis!
+        current_email: Nuna retposto
+        label: Chanjez retposto
+        new_email: Nova retposto
+        submit: Chanjez retposto
+        title: Chanjez retposto por %{username}
+      change_role:
+        changed_msg: Rolo sucesoze chanjesis!
+        label: Chanjez rolo
+        no_role: Nula rolo
+        title: Chanjez rolo por %{username}
+      confirm: Konfirmez
+      confirmed: Konfirmita
+      confirming: Ankore konfirmesas
+      custom: Kustuma
+      delete: Efacez informi
+      deleted: Efacita
+      demote: Despromocez
+      destroyed_msg: Informi di %{username} nun aranjesis por efacesar aparante
+      disable: Frostigez
+      disable_sign_in_token_auth: Desaktivigez retpostofichyurizeso
+      disable_two_factor_authentication: Desaktivigez 2FA
+      disabled: Desinterdiktita
+      display_name: Profilnomo
+      domain: Domeno
+      edit: Modifikez
       email: E-mail
+      email_status: Retpostostando
+      enable: Defrostigez
+      enable_sign_in_token_auth: Aktivigez retpostofichyurizeso
+      enabled: Aktivigita
+      enabled_msg: Sucesoze desfrostigas konto di %{username}
+      followers: Uzanti
+      follows: Uzati
+      header: Kapimajo
+      inbox_url: URL di mesajbuxo
+      invite_request_text: Juntomotivo
+      invited_by: Invitesis da
+      ip: IP
+      joined: Juntita
+      location:
+        all: Omna
+        local: Lokala
+        remote: Nelokala
+        title: Loko
+      login_status: Enirstando
+      media_attachments: Mediiatachaji
+      memorialize: Memorializez
+      memorialized: Memorializita
+      memorialized_msg: Sucesoze chanjesis %{username} a memorialkonto
+      moderation:
+        active: Aktiva
+        all: Omna
+        pending: Vartanta
+        silenced: Limitizita
+        suspended: Restriktita
+        title: Jero
+      moderation_notes: Jernoti
+      most_recent_activity: Maxim recenta aktiveso
+      most_recent_ip: Maxim recenta IP
+      no_account_selected: Nula konti chanjesis pro ke nulo selektesis
+      no_limits_imposed: Limiti ne fixesis
+      no_role_assigned: Nula rolo
+      not_subscribed: Ne abonita
+      pending: Vartar kontrolo
       perform_full_suspension: Perform full suspension
+      previous_strikes: Antea streki
+      previous_strikes_description_html:
+        one: Ca konto havas <strong>1</strong> streko.
+        other: Ca konto havas <strong>%{count}</strong> streki.
+      promote: Promocez
+      protocol: Protokolo
+      public: Publika
+      push_subscription_expires: Abono PuSH expiras
+      redownload: Rifreshigez profilo
+      redownloaded_msg: Sucesoze rifreshis profilo di %{username} de origino
+      reject: Refuzez
+      rejected_msg: Sucesoze refuzis registroapliko di %{username}
+      remove_avatar: Efacez profilimajo
+      remove_header: Efacez kapimajo
+      removed_avatar_msg: Sucesoze efacis profilimajo di %{username}
+      removed_header_msg: Sucesoze efacis kapimajo di %{username}
+      resend_confirmation:
+        already_confirmed: Ca uzanto ja konfirmesis
+        send: Risendez konfirmretposto
+        success: Konfirmretposto sucesoze sendesas!
+      reset: Richanjez
+      reset_password: Richanjez pasvorto
+      resubscribe: Riabonez
+      role: Rolo
+      search: Trovez
+      search_same_email_domain: Altra uzanti kun sama retpostodomeno
+      search_same_ip: Altra uzanti kun sama IP
+      security_measures:
+        only_password: Nur pasvorto
+        password_and_2fa: Pasvorto e 2FA
+      sensitive: Forcsentoza
+      sensitized: Markizesis quale sentoza
+      shared_inbox_url: Partigita URL di mesajbuxo
       show:
         created_reports: Reports created by this account
         targeted_reports: Reports made about this account
+      silence: Limito
+      silenced: Limitizita
+      statuses: Posti
+      strikes: Antea streki
+      subscribe: Abonez
+      suspend: Restriktez
+      suspended: Restriktita
+      suspension_irreversible: Ca informi di ca konto neinversigeble efacesis. Vu povas derestriktar konto por uzebligar lu ma ol ne riganos irga dati quon ol antee havis.
+      suspension_reversible_hint_html: Ca konto restriktesis, e ca informi tota efacesos en %{date}. Ante ta tempo, konto povas riganesar sen irga mala efekti. Se vu volas efacar omna informi di konto quik, vu povas agar lu sube.
+      title: Konti
+      unblock_email: Deobstruktez retpostoadreso
+      unblocked_email_msg: Sucesoze deobstruktis retpostoadreso di %{username}
+      unconfirmed_email: Nekonfirmita retposto
+      undo_sensitized: Deagez forcsentoza
+      undo_silenced: Deagez limito
+      undo_suspension: Deagez restrikto
+      unsilenced_msg: Sucesoza inversigis limito di konto di %{username}
+      unsubscribe: Deabonez
+      unsuspended_msg: Sucesoze derestriktis konto di %{username}
+      username: Uzantonomo
+      view_domain: Videz rezumo di domeno
+      warn: Avertez
+      web: Interret
+      whitelisted: Permisesis por federato
+    action_logs:
+      action_types:
+        approve_appeal: Aprobez apelo
+        approve_user: Aprobez uzanto
+        assigned_to_self_report: Taskigez raporto
+        change_email_user: Chanjez retposto por uzanto
+        change_role_user: Chanjez rolo di uzanto
+        confirm_user: Konfirmez uzanto
+        create_account_warning: Kreez averto
+        create_announcement: Kreez anunco
+        create_canonical_email_block: Kreez domenobstrukto
+        create_custom_emoji: Kreez kustumizita emocimajo
+        create_domain_allow: Kreez domenpermiso
+        create_domain_block: Kreez domenobstrukto
+        create_email_domain_block: Kreez retpostodomenobstrukto
+        create_ip_block: Kreez IP-regulo
+        create_unavailable_domain: Kreez nedisponebla domeno
+        create_user_role: Kreez rolo
+        demote_user: Despromocez uzanto
+        destroy_announcement: Efacez anunco
+        destroy_canonical_email_block: Efacez domenobstrukto
+        destroy_custom_emoji: Efacez kustumizita emocimajo
+        destroy_domain_allow: Efacez domenpermiso
+        destroy_domain_block: Efacez domenobstrukto
+        destroy_email_domain_block: Efacez retpostodomenobstrukto
+        destroy_instance: Efacez domeno
+        destroy_ip_block: Efacez IP-regulo
+        destroy_status: Efacez posto
+        destroy_unavailable_domain: Efacez nedisponebla domeno
+        destroy_user_role: Destruktez rolo
+        disable_2fa_user: Desaktivigez 2FA
+        disable_custom_emoji: Desaktivigez kustumizita emocimajo
+        disable_sign_in_token_auth_user: Desaktivigez retpostofichyurizo por uzanto
+        disable_user: Desaktivigez uzanto
+        enable_custom_emoji: Aktivigez kustumizita emocimajo
+        enable_sign_in_token_auth_user: Aktivigez retpostofichyurizo por uzanto
+        enable_user: Aktivigez uzanto
+        memorialize_account: Memorializez konto
+        promote_user: Promocez uzanto
+        reject_appeal: Refuzez apelo
+        reject_user: Refuzez uzanto
+        remove_avatar_user: Efacez profilimajo
+        reopen_report: Riapertez raporto
+        reset_password_user: Richanjez pasvorto
+        resolve_report: Rezolvez raporto
+        sensitive_account: Forcsentoza konto
+        silence_account: Limitizez konto
+        suspend_account: Restriktez konto
+        unassigned_report: Destaskigez raporto
+        unblock_email_account: Deobstruktez retpostoadreso
+        unsensitive_account: Deagez forcsentoza konto
+        unsilence_account: Deagez limitkonto
+        unsuspend_account: Derestriktez konto
+        update_announcement: Novigez anunco
+        update_custom_emoji: Novigez kustumizita emocimajo
+        update_domain_block: Novigez domenobstrukto
+        update_ip_block: Kreez IP-regulo
+        update_status: Novigez posto
+        update_user_role: Novigez rolo
+      actions:
+        approve_appeal_html: "%{name} aprobis jerdecidapelo de %{target}"
+        approve_user_html: "%{name} aprobis registro de %{target}"
+        assigned_to_self_report_html: "%{name} taskigis raporto %{target} a su"
+        change_email_user_html: "%{name} chanjis retpostoadreso di uzanto %{target}"
+        change_role_user_html: "%{name} chanjis rolo di %{target}"
+        confirm_user_html: "%{name} konfirmis retpostoadreso di uzanto %{target}"
+        create_account_warning_html: "%{name} sendis averto a %{target}"
+        create_announcement_html: "%{name} kreis nova anunco %{target}"
+        create_canonical_email_block_html: "%{name} obstruktis retpostodomeno %{target}"
+        create_custom_emoji_html: "%{name} adchargis nova emocimajo %{target}"
+        create_domain_allow_html: "%{name} permisis federato kun domeno %{target}"
+        create_domain_block_html: "%{name} obstruktis domeno %{target}"
+        create_email_domain_block_html: "%{name} obstruktis retpostodomeno %{target}"
+        create_ip_block_html: "%{name} kreis regulo por IP %{target}"
+        create_unavailable_domain_html: "%{name} cesis sendo a domeno %{target}"
+        create_user_role_html: "%{name} kreis rolo di %{target}"
+        demote_user_html: "%{name} despromocis uzanto %{target}"
+        destroy_announcement_html: "%{name} efacis anunco %{target}"
+        destroy_canonical_email_block_html: "%{name} obstruktis retpostodomeno %{target}"
+        destroy_custom_emoji_html: "%{name} efacis emocimajo %{target}"
+        destroy_domain_allow_html: "%{name} despermisis federato kun domeno %{target}"
+        destroy_domain_block_html: "%{name} deobstruktis domeno %{target}"
+        destroy_email_domain_block_html: "%{name} deobstruktis retpostodomeno %{target}"
+        destroy_instance_html: "%{name} efacis domeno %{target}"
+        destroy_ip_block_html: "%{name} efacis regulo por IP %{target}"
+        destroy_status_html: "%{name} efacis posto da %{target}"
+        destroy_unavailable_domain_html: "%{name} durigis sendo a domeno %{target}"
+        destroy_user_role_html: "%{name} efacis rolo di %{target}"
+        disable_2fa_user_html: "%{name} desaktivigis 2-faktorbezono por uzanto %{target}"
+        disable_custom_emoji_html: "%{name} desaktivigis emocimajo %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desaktivigis retpostofichyurizo por %{target}"
+        disable_user_html: "%{name} desaktivigis eniro por uzanto %{target}"
+        enable_custom_emoji_html: "%{name} aktivigis emocimajo %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktivigis retpostofichyurizo por %{target}"
+        enable_user_html: "%{name} aktivigis eniro por uzanto %{target}"
+        memorialize_account_html: "%{name} kauzigis konto di %{target} divenar memorialpagino"
+        promote_user_html: "%{name} promocis uzanto %{target}"
+        reject_appeal_html: "%{name} refuzis jerdecidapelo de %{target}"
+        reject_user_html: "%{name} refuzis registro de %{target}"
+        remove_avatar_user_html: "%{name} efacis profilimajo de %{target}"
+        reopen_report_html: "%{name} riapertis raporto %{target}"
+        reset_password_user_html: "%{name} richanjis pasvorto de uzanto %{target}"
+        resolve_report_html: "%{name} rezolvis raporto %{target}"
+        sensitive_account_html: "%{name} markizis medii di %{target} quale sentoza"
+        silence_account_html: "%{name} limitizis konto di %{target}"
+        suspend_account_html: "%{name} restriktis konto di %{target}"
+        unassigned_report_html: "%{name} detaskigis raporto %{target}"
+        unblock_email_account_html: "%{name} deobstruktis retpostoadreso di %{target}"
+        unsensitive_account_html: "%{name} demarkizis medii di %{target} quale sentoza"
+        unsilence_account_html: "%{name} efacis limito di konto di %{target}"
+        unsuspend_account_html: "%{name} derestriktis konto di %{target}"
+        update_announcement_html: "%{name} novigis anunco %{target}"
+        update_custom_emoji_html: "%{name} novigis emocimajo %{target}"
+        update_domain_block_html: "%{name} novigis domenobstrukto por %{target}"
+        update_ip_block_html: "%{name} kreis regulo por IP %{target}"
+        update_status_html: "%{name} novigis posto da %{target}"
+        update_user_role_html: "%{name} chanjis rolo di %{target}"
+      empty: Nula logi.
+      filter_by_action: Filtrez segun ago
+      filter_by_user: Filtrez segun uzanto
+      title: Kontrollogo
+    announcements:
+      destroyed_msg: Anunco sucesoze efacesas!
+      edit:
+        title: Modifikez anunco
+      empty: Nula anunci.
+      live: Samtempe
+      new:
+        create: Kreez anunco
+        title: Nova anunco
+      publish: Publikigez
+      published_msg: Anunco sucesoze publikigesas!
+      scheduled_for: Projetita por eventas en %{time}
+      scheduled_msg: Anunco projetesis por publikigo!
+      title: Anunci
+      unpublish: Depublikigez
+      unpublished_msg: Anunco sucesoze depublikigesas!
+      updated_msg: Anunco sucesoza novigesas!
+    custom_emojis:
+      assign_category: Insertez kategorio
+      by_domain: Domeno
+      copied_msg: Sucesoze kreis lokala kopiuro di emocimajo
+      copy: Kopiez
+      copy_failed_msg: Ne povas igar lokala kopiur di ta emocimajo
+      create_new_category: Kreez nova kategorio
+      created_msg: Emocimajo sucesoze kreesas!
+      delete: Efacez
+      destroyed_msg: Kustumizita emocimajo sucesoza destruktesas!
+      disable: Desaktivigez
+      disabled: Desaktivigita
+      disabled_msg: Sucesoze desaktivigis ta emocimajo
+      emoji: Emocimajo
+      enable: Aktivigez
+      enabled: Aktivigita
+      enabled_msg: Sucesoze aktivigis ta emocimajo
+      image_hint: Maximo grandeso di PNG o GIF esas %{size}
+      list: Listo
+      listed: Listita
+      new:
+        title: Insertez nova kustumizita emocimajo
+      no_emoji_selected: Nula emocimaji chanjesis pro ke nulo selektesis
+      not_permitted: Vu ne permisesis agar co
+      overwrite: Remplasez
+      shortcode: Kurtkodexo
+      shortcode_hint: Minime 2 simboli, nur literi e nombri e sublinei
+      title: Kustumizita emocimaji
+      uncategorized: Nekategorigita
+      unlist: Delistigez
+      unlisted: Delistigita
+      update_failed_msg: Ne povas novigar ta emocimajo
+      updated_msg: Emocimajo sucesoze novigesis!
+      upload: Adchargez
+    dashboard:
+      active_users: aktiva uzanti
+      interactions: interagi
+      media_storage: Mediireteneso
+      new_users: nova uzanti
+      opened_reports: raporti apertesis
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> vartanta apelo"
+        other: "<strong>%{count}</strong> vartanta apeli"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> vartanta raporto"
+        other: "<strong>%{count}</strong> vartanta raporti"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> vartanta hashtago"
+        other: "<strong>%{count}</strong> vartanta hashtagi"
+      pending_users_html:
+        one: "<strong>%{count}</strong> vartanta uzanti"
+        other: "<strong>%{count}</strong> vartanta uzanti"
+      resolved_reports: raporti rezolvesis
+      software: Softwaro
+      sources: Registrofonti
+      space: Spacuzeso
+      title: Chefpanelo
+      top_languages: Maxim aktiva lingui
+      top_servers: Maxim aktiva servili
+      website: Retsito
+    disputes:
+      appeals:
+        empty: Nula apeli.
+        title: Apeli
+    domain_allows:
+      add_new: Permisez federato kun domeno
+      created_msg: Domeno sucesoza permisesas por federato
+      destroyed_msg: Domeno despermisesas de federato
+      undo: Despermisez federato kun domeno
     domain_blocks:
       add_new: Add new
+      created_msg: Domenobstrukto nun procedesas
+      destroyed_msg: Domenobstrukto desagesis
+      domain: Domeno
+      edit: Modifikez domenobstrukto
+      existing_domain_block: Vu ja exekutis plu rigoroza limiti a %{name}.
+      existing_domain_block_html: Vu ja povis plu rigoroza limiti a %{name}, vu bezonas <a href="%{unblock_url}">deobstruktar</a> unesme.
       new:
+        create: Kreez obstrukto
+        hint: Domenobstrukto ne preventos kreo di kontrekordaji en datumaturo, ma retroaktive e automate aplikos partikulara jermetodi a ta konti.
         severity:
-          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data."
-      show:
-        retroactive:
-          silence: Unsilence all existing accounts from this domain
-          suspend: Unsuspend all existing accounts from this domain
+          noop: Nulo
+          suspend: Restriktez
+        title: Nova domenobstrukto
+      obfuscate: Nedicernebligez domennomo
+      obfuscate_hint: Partala nedicernebligez domennomo en listo se reklamo di listo di domenlimito aktivigesas
+      private_comment: Privata komento
+      private_comment_hint: Komento pri ca domenlimito esas por interna uzo da jereri.
+      public_comment: Publika komento
+      public_comment_hint: Komentez pri ca domenlimito por la publiko, se reklamar listo di domenlimito aktivigesis.
+      reject_media: Refusez mediifaili
+      reject_media_hint: Efacas lokale retenita mediifaili e refuzas deschargar irgo en futuro. Nerelatata por restrikti
+      reject_reports: Refuzez raporti
+      reject_reports_hint: Ignorez omna raporti quo venas de ca domeno. Nerelatata por restrikti
       undo: Undo
+      view: Videz domenobstrukto
+    email_domain_blocks:
+      add_new: Insertez novo
+      attempts_over_week:
+        one: "%{count} probo de pos 1 week"
+        other: "%{count} registroprobi de pos 1 week"
+      created_msg: Sucesoze obstruktis retpostodomeno
+      delete: Efacez
+      dns:
+        types:
+          mx: Rekordo MX
+      domain: Domeno
+      new:
+        create: Insertez domeno
+        resolve: Rezolvez domeno
+        title: Obstruktez nova retpostodomeno
+      no_email_domain_block_selected: Retpostodomenobstrukti ne chanjesis por ke nulo selektesis
+      resolved_dns_records_hint_html: Ca domennomo rezolvesas a ca MX-domeni, quale esas ultime responsanta por ganar retposto. Obstruktar MX-domeno obstruktos registri de irga retpostoadreso quo uzas sama MX-domeni, mem se la videbla domennomo esas diferanta. <strong>Sorgemez e ne obstruktez majora retpostositi.</strong>
+      resolved_through_html: Rezolvesis tra %{domain}
+      title: Obstruktita retpostodomeni
+    follow_recommendations:
+      description_html: "<strong>Sequorekomendi helpas nova uzanti rapide trovar interesanta kontenajo</strong>. Se uzanto ne interagas kun altra personi sate por igar personaligita sequorekomendi, ca konti rekomendas. Oli rikalkulesas die de mixo di konti kun maxim alta recenta interagi e maxim altra lokala sequantoquanto segun selektita linguo."
+      language: Por linguo
+      status: Stando
+      suppress: Desfortigez sequorekomendo
+      suppressed: Desfortigita
+      title: Sequez rekomendi
+      unsuppress: Riganez sequorekomendo
     instances:
+      availability:
+        description_html:
+          one: Se sendar a domeno falias <strong>%{count} dio</strong> sen sucesar, plusa sendoprobi ne agesos se sendo <em>de</em> la domeno ne ganesas.
+          other: Se sendar a domeno falias en <strong>%{count} diferanta dii</strong> sen sucesar, plusa sendoprobi ne agesos se sendo <em>de</em> la domeno ne ganesas.
+        failure_threshold_reached: Faliolimito atingesis en %{date}.
+        failures_recorded:
+          one: Falita probo en %{count} dio.
+          other: Falita probi en %{count} dii.
+        no_failures_recorded: Nula falio en rekordo.
+        title: Disponebleso
+        warning: Antea probo di konekto a ca servilo esas nesucesoza
+      back_to_all: Omna
+      back_to_limited: Limitizita
+      back_to_warning: Averto
+      by_domain: Domeno
+      confirm_purge: Ka vu certe volas netempale efacar informi de ca domeno?
+      content_policies:
+        comment: Interna noto
+        description_html: Vu povas fixar kontenajguidili quo aplikesos a omna konti de ca domeno e irga oli subdomeni.
+        policies:
+          reject_media: Refusez medii
+          reject_reports: Refusez raporti
+          silence: Limito
+          suspend: Restriktez
+        policy: Guidilo
+        reason: Publika motivo
+        title: Kontenajguidili
+      dashboard:
+        instance_accounts_dimension: Maxim sequata konti
+        instance_accounts_measure: retenata konti
+        instance_followers_measure: nia sequanti ibe
+        instance_follows_measure: olia sequanti hike
+        instance_languages_dimension: Maxim uzata lingui
+        instance_media_attachments_measure: retenata mediiatachaji
+        instance_reports_measure: raporti pri oli
+        instance_statuses_measure: retenata posti
+      delivery:
+        all: Omna
+        clear: Efacez senderori
+        failing: Falias
+        restart: Rikomencez sendo
+        stop: Cesez sendo
+        unavailable: Nedisponebla
+      delivery_available: Sendo esas disponebla
+      delivery_error_days: Senderordii
+      delivery_error_hint: Se sendo ne esas posibla dum %{count} dii, ol automata markizesos quale ne sendebla.
+      destroyed_msg: Informi de %{domain} nun faskigesis por partikulara efaco.
+      empty: Nula domeni.
+      known_accounts:
+        one: "%{count} savata konto"
+        other: "%{count} savata konti"
+      moderation:
+        all: Omna
+        limited: Limitizita
+        title: Jero
+      private_comment: Privata komento
+      public_comment: Publika komento
+      purge: Efacez grande
+      purge_description_html: Se vu kredas ke ca domeno esas nekonektata netempale, vu povas efacar omna kontorekordi e relatata informi de ca domeno de vua reteneyo. Co forsan esas nekurta.
       title: Known Instances
+      total_blocked_by_us: Obstruktesis da ni
+      total_followed_by_them: Sequesis da oli
+      total_followed_by_us: Sequesis da ni
+      total_reported: Raporti pri oli
+      total_storage: Mediiatachaji
+      totals_time_period_hint_html: Sumi quo montresas sube inkluzas informi de pos la komenco.
+    invites:
+      deactivate_all: Deaktivigez omno
+      filter:
+        all: Omna
+        available: Disponebla
+        expired: Expirita
+        title: Filtrez
+      title: Inviti
+    ip_blocks:
+      add_new: Kreez regulo
+      created_msg: Sucesoze insertis nova regulo di IP
+      delete: Efacez
+      expires_in:
+        '1209600': 2 semani
+        '15778476': 6 monati
+        '2629746': 1 monato
+        '31556952': 1 yaro
+        '86400': 1 dio
+        '94670856': 3 yari
+      new:
+        title: Kreez nova regulo di IP
+      no_ip_block_selected: Reguli di IP nechanjesis por ke nulo selektesis
+      title: Reguli di IP
+    relationships:
+      title: "%{acct} relatesi"
+    relays:
+      add_new: Insertez nova relayo
+      delete: Efacez
+      description_html: "<strong>Federatrelayo</strong> esas mediatajservilo quo interchanjas multa publika posti inter servili quo abonas e publikigas ibe. <strong>Ol povas helpar mikra e mezgranda servili deskovrar kontenajo de fediverso</strong>, quale ne bezonas lokala uzanti manuale sequar altra personi en nelokala servili."
+      disable: Desaktivigez
+      disabled: Desaktivigita
+      enable: Aktivigez
+      enable_hint: Pos aktivigesar, vua servilo abonos omna publika posti de ca relayo, e komencos sendar publika posti di ca servilo a ol.
+      enabled: Aktivigita
+      inbox_url: URL di relayo
+      pending: Vartas aprobo di relayo
+      save_and_enable: Sparez e aktivigez
+      setup: Facez relayokonekto
+      signatures_not_enabled: Relayi ne korekta funcionos dum ke sekurmodo o limigita federatmodo aktivigesis
+      status: Stando
+      title: Relayi
+    report_notes:
+      created_msg: Raportnoto sucesoze kreesis!
+      destroyed_msg: Raportnoto sucesoze efacesis!
+    reports:
+      account:
+        notes:
+          one: "%{count} noto"
+          other: "%{count} noti"
+      action_log: Kontrollogo
+      action_taken_by: Agesis da
+      actions:
+        delete_description_html: Raportizita posti efacesos e streko rekordigesos por helpar vu intensigar en nexta malagi da la sama konto.
+        mark_as_sensitive_description_html: Medii en raportizita posti markizesos quale sentoza e streko rekordigesos por helpar vu intensigar en nexta malagi da la sama konto.
+        other_description_html: Videz plu multa opcioni por dominacar konduto di konto e kustumizar komuniko a raportizita konto.
+        resolve_description_html: Nulo agesos kontre raportizita konto, streko ne rekordizesos e raporto klozesos.
+        silence_description_html: Profilo esos videbla nur por personi quo ja sequis o manuale trovis, se severe limitizas ola porteo. Sempre povas inversigesar.
+        suspend_description_html: Ca profilo e omna ola kontenaji divenos neacesebla til ol eventuale efacesas. Interagar kun la konto divenos neposibla. Inversigebla til 30 dii.
+      actions_description_html: Decidez ago por rezolvar ca raporto. Se vu decidar puniso kontre raportizesis konto, retpostoavizo sendesos a ol, ecepte kande <strong>Spam</strong> kategorio selektesis.
+      add_to_report: Insertez pluse a raporto
+      are_you_sure: Ka vu esas certa?
+      assign_to_self: Taskigez me
+      assigned: Taskigita jerero
+      by_target_domain: Domeno di raportizita konto
+      category: Kategorio
+      category_description_html: La motivo ke ca konto e kontenajo raportizesis citesos por komuniko kun raportizita konto
+      comment:
+        none: Nulo
+      comment_description_html: 'Por donar plu multa informo, %{name} skribis:'
+      created_at: Raportizesis
+      delete_and_resolve: Efacez posti
+      forwarded: Sendesis
+      forwarded_to: Sendesis a %{domain}
+      mark_as_resolved: Markizez quale rezolvita
+      mark_as_sensitive: Markizez quale sentoza
+      mark_as_unresolved: Markizez quale nerezolvita
+      no_one_assigned: Nulu
+      notes:
+        create: Insertez noto
+        create_and_resolve: Rezolvez per noto
+        create_and_unresolve: Riapertez per noto
+        delete: Efacez
+        placeholder: Deskriptez quo agesis o irga relatita novaji...
+        title: Noti
+      notes_description_html: Videz e pozez noti a altra jereri e vua su en futuro
+      quick_actions_description_html: 'Agetez o volvez base por vidar raportizita kontenajo:'
+      remote_user_placeholder: nelokala uzanti de %{instance}
+      reopen: Riapertez raporto
+      report: 'Raporto #%{id}'
+      reported_account: Raportizita konto
+      reported_by: Raportizesis da
+      resolved: Rezolvesis
+      resolved_msg: Raporto sucesoze rezolvesis!
+      skip_to_actions: Saltez a agi
+      status: Stando
+      statuses: Raportizita kontenajo
+      statuses_description_html: Ofensanta kontenajo citesos en komuniko kun raportizita konto
+      target_origin: Fonto di raportizita konto
+      title: Raporti
+      unassign: Detaskigez
+      unresolved: Nerezolvita
+      updated_at: Novigesis
+      view_profile: Videz profilo
+    roles:
+      add_new: Insertez rolo
+      assigned_users:
+        one: "%{count} uzanto"
+        other: "%{count} uzanti"
+      categories:
+        administration: Administro
+        invites: Inviti
+        moderation: Jero
+        special: Specala
+      delete: Efacez
+      description_html: Per <strong>uzantoroli</strong>, vu povas kustumizar funciono e siti di Mastodon quon vua uzanti povas uzar.
+      edit: Modifikez rolo di '%{name}'
+      everyone: Originala permisi
+      everyone_full_description_html: Co esas <strong>bazrolo</strong> quo efektigas <strong>omna uzanti</strong>, mem personi sen rolo. Omna altra roli ganas sama permisi de ol.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisi"
+      privileges:
+        administrator: Administrero
+        administrator_description: Uzanti kun ca permiso ignoros singla permiso
+        delete_user_data: Efacez uzantinformi
+        delete_user_data_description: Permisez uzanti efacar informi di altra uzanti sen varto
+        invite_users: Invitez uzanti
+        invite_users_description: Permisez uzanti invitar nova personi a la servilo
+        manage_announcements: Jerez anunci
+        manage_announcements_description: Permisez uzanti jerar anunci en la servilo
+        manage_appeals: Jerez apeli
+        manage_appeals_description: Permisez uzanti kontrolar apeli kontra jero
+        manage_blocks: Jerez obstrukti
+        manage_blocks_description: Permisez uzanti obstruktar retpostoservilo e adresi di IP
+        manage_custom_emojis: Jerez kustumizita emocimaji
+        manage_custom_emojis_description: Permisez uzanti jerar kustumizita emocimaji en la servilo
+        manage_federation: Jerez federo
+        manage_federation_description: Permisez uzanti obstruktar o permisez federo kun altra domeni, e dominacar sendebleso
+        manage_invites: Jerez inviti
+        manage_invites_description: Permisez uzanti vidar e desaktivigar invitligili
+        manage_reports: Jerez raporti
+        manage_reports_description: Permisez uzanti kontrolar raporti e jerez kontra oli
+        manage_roles: Jerez roli
+        manage_roles_description: Permisez uzanti jerar e ajustar plu basa roli di olia
+        manage_rules: Jerez reguli
+        manage_rules_description: Permisez uzanti chanjar servilreguli
+        manage_settings: Jerez opcioni
+        manage_settings_description: Permisez uzanti chanjar sitopcioni
+        manage_taxonomies: Jerez nomkategorii
+        manage_taxonomies_description: Permisez uzanti kontrolar tendencoza kontenajo e novigar hashtagopcioni
+        manage_user_access: Jerez uzantoeniro
+        manage_user_access_description: Permisez uzanti desaktivigar 2-faktoryurizeso di altra uzanti, chanjar olia retpostoadreso e richanjar olia pasvorto
+        manage_users: Jerez uzanti
+        manage_users_description: Permisez uzanti vidar detali di altra uzanti e jerar kontra oli
+        manage_webhooks: Jerez interrethoki
+        manage_webhooks_description: Permisez uzanti igas interrethoki por administrala eventi
+        view_audit_log: Videz kontrollogo
+        view_audit_log_description: Permisez uzanti vidar historio di administrala agi en la servilo
+        view_dashboard: Videz chefpanelo
+        view_dashboard_description: Permisez uzanti uzar chefpanelo e diversa opcioni
+        view_devops_description: Permisez uzanti uzar chefpaneli Sidekiq e pgHero
+      title: Roli
+    rules:
+      add_new: Insertez regulo
+      delete: Efacez
+      description_html: Quankam maxim multa personi asertar ke lu ja lektis e konsentis serveskondicioni, frequente personi ne komplete lektas til problemo eventas. <strong>Faciligez on vidar vua reguli di servilo kurte per pozar puntostrukturlisto.</strong> Lasez singla reguli esar kurta e simpla, ma ne fendez a multa separata kozi anke.
+      edit: Modifikez regulo
+      empty: Nula servilreguli fixesis til nun.
+      title: Servilreguli
     settings:
-      contact_information:
-        email: Enter a public e-mail address
-        username: Enter a username
+      about:
+        manage_rules: Jerez servilreguli
+        preamble: Donez detaloza informi pri quale la servilo funcionar, jeresar e moyenigesar.
+        rules_hint: Havas partikulara areo por reguli quo uzanti expektesar sequar.
+        title: Pri co
+      appearance:
+        preamble: Kustumizitez retintervizajo di Mastodon.
+        title: Aspekto
+      branding:
+        preamble: Fabrikmarko di ca servilo diferentigas lu de altra servili en la reto. Ca informi forsan montresas che diversa loki. Do, ca informi debas esar klara.
+        title: Fabrikmarkeso
+      content_retention:
+        preamble: Dominacez quale uzantigita kontenajo retenesar en Mastodon.
+        title: Kontenajreteneso
+      discovery:
+        follow_recommendations: Sequez rekomendaji
+        preamble: Montrar interesanta kontenajo esas importanta ye voligar nova uzanti quo forsan ne savas irgu. Dominacez quale ca deskovrotraiti funcionar en ca servilo.
+        profile_directory: Profilcheflisto
+        public_timelines: Publika tempolinei
+        title: Deskovro
+        trends: Tendenci
+      domain_blocks:
+        all: A omnu
+        disabled: A nulu
+        users: A enirinta lokala uzanti
       registrations:
-        closed_message:
-          desc_html: Displayed on frontpage when registrations are closed<br>You can use HTML tags
-      site_description:
-        desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.<br>You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
-        title: Site description
-      site_description_extended:
-        desc_html: Displayed on extended information page<br>You can use HTML tags
-        title: Extended site description
-      site_title: Site title
-      title: Site Settings
+        preamble: Dominacez qua povas krear konto en ca servilo.
+        title: Registragi
+      registrations_mode:
+        modes:
+          approved: Aprobo bezonesas por registro
+          none: Nulu povas registrar
+          open: Irgu povas registrar
+      title: Servilopcioni
+    site_uploads:
+      delete: Efacez adchargita failo
+      destroyed_msg: Sitadchargito sucesoze efacesis!
+    statuses:
+      back_to_account: Retrovenez a kontopagino
+      back_to_report: Retrovenez a raportpagino
+      batch:
+        remove_from_report: Efacez de raporto
+        report: Raportizez
+      deleted: Efacesis
+      media:
+        title: Medii
+      no_status_selected: Nula posti chanjesis pro ke nulo selektesis
+      title: Kontoposti
+      with_media: Kun medii
+    strikes:
+      actions:
+        delete_statuses: "%{name} efacis posti di %{target}"
+        disable: "%{name} frostigis konto di %{target}"
+        mark_statuses_as_sensitive: "%{name} markizis posti di %{target} quale sentoza"
+        none: "%{name} sendis averto a %{target}"
+        sensitive: "%{name} markizis konto di %{target} quale sentoza"
+        silence: "%{name} limitizis konto di %{target}"
+        suspend: "%{name} restriktis konto di %{target}"
+      appeal_approved: Apelis
+      appeal_pending: Vartata apelo
+    system_checks:
+      database_schema_check:
+        message_html: Existas vartanta datamaturmigri. Startez por certigar ke la softwaro kondutar quale expektita
+      elasticsearch_running_check:
+        message_html: Ne povas konektas a Elasticsearch. Kontrolez ke ol functionas o desaktivigez textokompleta trovo
+      elasticsearch_version_check:
+        message_html: 'Nekonciliebla versiono di Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} funcionas ma %{required_version} bezonesas
+      rules_check:
+        action: Jerez servilreguli
+        message_html: Vu ne fixis irga servilreguli.
+      sidekiq_process_check:
+        message_html: Sidekiq procedo ne funcionas ye %{value} fask(o). Kontrolez vua opciono di Sidekiq
+    tags:
+      review: Kontrolez stando
+      updated_msg: Hashtagopcioni novigesis sucesoze
+    title: Administro
+    trends:
+      allow: Permisez
+      approved: Aprobesis
+      disallow: Despermisez
+      links:
+        allow: Permisez ligilo
+        allow_provider: Permisez publikiganto
+        description_html: Co esas ligili quo nun multe partigesas da konti kun posti quon vua servilo vidas. Ol povas helpar vua uzanti lernar quo eventas en mondo. Ligili ne publike montresas til vu aprobar publikiganto. Vu povas anke permisar o refuzar individuala ligili.
+        disallow: Despermisez ligilo
+        disallow_provider: Despermisez publikiganto
+        no_link_selected: Nula ligili chanjesis pro ke nulo selektesis
+        publishers:
+          no_publisher_selected: Nula publikiganti chanjesis pro ke nulo selektesis
+        shared_by_over_week:
+          one: Partigesis da 1 persono de pos antea semano
+          other: Partigesis da %{count} personi de pos antea semano
+        title: Tendencoza ligili
+        usage_comparison: Partigesis %{today} foyi hodie, la nombro esas %{yesterday} hiere
+      only_allowed: Nur permisato
+      pending_review: Vartas kontrolo
+      preview_card_providers:
+        allowed: Ligili de ca publikiganto povas divenar tendenco
+        description_html: Co esas domen quo havas ligili quo frequente partigesas en vua servilo. Ligili ne divenas tendenco publike se domeno di ligilo ne aprobesas. Vua aprobo (o refuzo) anke esas por subdomeni.
+        rejected: Ligili de ca publikiganto ne divenos tendenco
+        title: Publikiganti
+      rejected: Refuzesis
+      statuses:
+        allow: Permisez posto
+        allow_account: Permisez skribanto
+        description_html: Co esas posti quon vua servilo savas quale nun partigesas e favorizesas multe nun. Ol povas helpar vua nova e retrovenanta uzanti trovar plu multa personi por sequar. Posti ne publike montresas til vu aprobar la skribanto, e la skribanto permisas sua konto sugestesas a altra personi. Vu povas anke permisar o refuzar individuala posti.
+        disallow: Despermisez posto
+        disallow_account: Despermisez skribanto
+        no_status_selected: Nula tendencoza posti chanjesis pro ke nulo selektesis
+        not_discoverable: Skribanto ne konsentis pri esar deskovrebla
+        shared_by:
+          one: Partigesis o favorizesis 1 foye
+          other: Partigesis o favorizesis %{friendly_count} foye
+        title: Tendencoza posti
+      tags:
+        current_score: Nuna punto esas %{score}
+        dashboard:
+          tag_accounts_measure: specala uzeso
+          tag_languages_dimension: Maxim uzita lingui
+          tag_servers_dimension: Maxim uzita servili
+          tag_servers_measure: diferanta servili
+          tag_uses_measure: uzsumo
+        description_html: Co esas hashtagi quo nun aparas en multa posti quon vua servilo vidas. Ol povas helpar vua uzanti lernar quon personi parolas frequente nun. Hashtagi ne montresas publike til vu aprobar.
+        listable: Povas sugestesar
+        no_tag_selected: Nula tagi chanjesis pro ke nulo selektesis
+        not_listable: Ne sugestesar
+        not_trendable: Ne aparas che tendenci
+        not_usable: Ne povas uzesar
+        peaked_on_and_decaying: Maxim uzita ye %{date}, nun diminutesas
+        title: Tendencoza hashtagi
+        trendable: Povas aparar che tendenci
+        trending_rank: 'Tendencorango #%{rank}'
+        usable: Povas uzesar
+        usage_comparison: Uzesis %{today} foyi hodie, la nombro esas %{yesterday} hiere
+        used_by_over_week:
+          one: Uzesis da 1 persono de pos 1 semano
+          other: Uzesis da %{count} personi de pos 1 semano
+      title: Tendenci
+      trending: Tendenco
+    warning_presets:
+      add_new: Insertez novo
+      delete: Efacez
+      edit_preset: Modifikez avertfixito
+      empty: Vu ne fixis irga avertfixito til nun.
+      title: Jerez avertfixiti
+    webhooks:
+      add_new: Insertez finpunto
+      delete: Efacez
+      description_html: "<strong>Rethoko</strong> povigas Mastodon sendar <strong>samtempoavizi</strong> pri selektita eventi a vua sua apliko, por ke vua apliko povas <strong>automate kauzigar reakti</strong>."
+      disable: Desaktivigez
+      disabled: Desaktivigita
+      edit: Modifikez finpunto
+      empty: Vu ne havas irga ajustita finpunti ankore.
+      enable: Aktivigez
+      enabled: Aktiva
+      enabled_events:
+        one: 1 aktivigita evento
+        other: "%{count} aktivigita eventi"
+      events: Eventi
+      new: Nova rethoko
+      rotate_secret: Rotacigez sekreto
+      secret: Signosekreto
+      status: Stando
+      title: Rethoki
+      webhook: Rethok
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: efacos ola posti
+        disable: frostigar olia konto
+        mark_statuses_as_sensitive: markizos ola posti quale sentoza
+        none: averto
+        sensitive: markizos ola konto quale sentoza
+        silence: limitizos ola konto
+        suspend: restriktos ola konto
+      body: "%{target} apelas jerdecido da %{action_taken_by} de %{date}, quale esis %{type}. Oli skribis:"
+      next_steps: Vu povas aprobar apelo por deagar jerdecido o ignorar.
+      subject: "%{username} apela jerdecido che %{instance}"
+    new_pending_account:
+      body: Detali de nova konto esas la subo. Vu povas aprobar o refuzar ca apliko.
+      subject: Nova konto bezonas kontrolesar che %{instance} (%{username})
+    new_report:
+      body: "%{reporter} raportizis %{target}"
+      body_remote: Ulu de %{domain} raportizis %{target}
+      subject: Nova raporto por %{instance} (#%{id})
+    new_trends:
+      body: 'Ca kozi bezonas kontrol ante ol povas montresar publike:'
+      new_trending_links:
+        title: Tendencoza ligili
+      new_trending_statuses:
+        title: Tendencoza posti
+      new_trending_tags:
+        no_approved_tags: Nun ne existas aprobita tendencoza hashtagi.
+        requirements: 'Irga ca probanti povas ecesar la #%{rank} aprobita tendencoligilo, quale nun esas %{lowest_tag_name} kun punto %{lowest_tag_score}.'
+        title: Tendencoza hashtagi
+      subject: Nova tendenci bezonas kontrolesar che %{instance}
+  aliases:
+    add_new: Kreez alternativa nomo
+    created_msg: Sucesoze kreis nova alternativa nomo. Vu povas nun komencar transfero de la olda konto.
+    deleted_msg: Sucesoze efacis alternativa nomo. Transferar de ta konto a co ne esos posibla.
+    empty: Vu ne havas alternativa nomi.
+    hint_html: Se vu volas transferesar de altra konto a co, hike vu povas krear alternativnomo, quo bezonesas ante vu povas durigar transferar sequanti de la olda konto a co. Ca ago esas <strong>nedanjeroza e inversigebla</strong>. <strong>Kontomigro komencesas de la olda konto</strong>.
+    remove: Deligez alternative nomo
+  appearance:
+    advanced_web_interface: Avancata retintervizajo
+    advanced_web_interface_hint: 'Se vu volas uzar tota skrenlongeso, avancata retintervizajo povigas vu modifikar multa diferanta kolumni por vida multa informi en sama tempo quon vu volas: Hemo, avizi, federatata tempolineo, multa listi e hashtagi.'
+    animations_and_accessibility: Animacii e aceseso
+    confirmation_dialogs: Konfirmdialogi
+    discovery: Deskovro
+    localization:
+      body: Mastodon tradukesas da voluntarii.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Omnu povas kontributar.
+    sensitive_content: Sentoza kontenajo
+    toot_layout: Postostrukturo
   application_mailer:
+    notification_preferences: Chanjez retpostopreferaji
+    salutation: "%{name},"
     settings: 'Chanjar la retpost-mesajala preferi: %{link}'
     view: 'Vidar:'
+    view_profile: Videz profilo
+    view_status: Videz posto
   applications:
-    invalid_url: La URL donita ne esas valida
+    created: Apliko sucesoze kreesas
+    destroyed: Apliko sucesoze efacesas
+    regenerate_token: Rifacez acesficho
+    token_regenerated: Acesficho sucesoze riganesas
+    warning: Sorgemez per ca informi. Ne partigez kun irgu!
+    your_token: Vua acesficho
   auth:
+    change_password: Pasvorto
+    delete_account: Efacez konto
+    delete_account_html: Se vu volas efacar vua konto, vu povas <a href="%{path}">irar hike</a>. Vu demandesos konfirmar.
+    description:
+      prefix_invited_by_user: "@%{name} invitas vu juntar ca servilo di Mastodon!"
+      prefix_sign_up: Registrez che Mastodon hodie!
+      suffix: Per konto, vu povos sequar personi, postigar novaji e interchanjar mesaji kun uzanti de irga servilo di Mastodon e pluse!
     didnt_get_confirmation: Ka tu ne recevis la instrucioni por konfirmar?
+    dont_have_your_security_key: Ka vu ne havas sekuresklefo?
     forgot_password: Pasvorto obliviita?
+    invalid_reset_password_token: Pasvorto richanjoficho esas nevalida o expirita. Demandez novo.
+    link_to_otp: Insertez 2-faktorkodexo de vua fono o rigankodexo
+    link_to_webauth: Uzez vua sekuresklefaparato
+    log_in_with: Enirez per
     login: Enirar
     logout: Ekirar
+    migrate_account: Transferez a diferanta konto
+    migrate_account_html: Se vu volas ridirektar ca konto a diferanto, vu povas <a href="%{path}">ajustar hike</a>.
+    or_log_in_with: O eniras per
+    privacy_policy_agreement_html: Me lektis e konsentis <a href="%{privacy_policy_path}" target="_blank">privatesguidilo</a>
+    providers:
+      cas: CAS
+      saml: SAML
     register: Membreskar
+    registration_closed: "%{instance} ne aceptas nova membri"
     resend_confirmation: Risendar la instrucioni por konfirmar
     reset_password: Chanjar la pasvorto
+    rules:
+      preamble: Co igesas e exekutesas da jereri di %{domain}.
+      title: Kelka bazala reguli.
     security: Chanjar pasvorto
     set_new_password: Selektar nova pasvorto
+    setup:
+      email_below_hint_html: Se suba retpostoadreso esas nekorekta, vu povas chanjar hike e ganar nova konfirmretposto.
+      email_settings_hint_html: Konfirmretposto sendesis a %{email}. Se ta retpostoadreso ne esas korekta, vu povas chanjar en kontoopcioni.
+      title: Komencoprocedo
+    sign_up:
+      preamble: Per konto en ca servilo di Mastodon, on povas sequar irga persono en ca reto, ne ye ube ona konto hostagisas.
+      title: Ni komencigez vu en %{domain}.
+    status:
+      account_status: Kontostando
+      confirming: Vartas retpostokonfirmo finar.
+      functional: Vua konto esas tote funcionoza.
+      pending: Vua apliko bezonas kontrolo da nia laborero. Co forsan esas nekurta. Vu ganos retposto se vua apliko aprobesas.
+      redirecting_to: Vua konto esas neaktiva pro ke ol nun ridirektesos a %{acct}.
+      view_strikes: Videz antea streki kontre vua konto
+    too_fast: Formulario sendesis tro rapide, probez itere.
+    use_security_key: Uzes sekuresklefo
   authorize_follow:
+    already_following: Vu ja sequis ca konto
+    already_requested: Vu ja sendis sequodemando a ta konto
     error: Regretinde, eventis eraro probante konsultar la fora konto
     follow: Sequar
+    follow_request: 'Vu sendis sequodemando a:'
+    following: 'Suceso! Vu nun sequas:'
+    post_follow:
+      close: O, vu volas jus klozar ca panelo.
+      return: Montrez priflo de uzanti
+      web: Irez a interreto
     title: Sequar %{acct}
+  challenge:
+    confirm: Durez
+    hint_html: "<strong>Guidilo:</strong> Ni ne demandos vua pasvorto itere til 1 horo."
+    invalid_password: Nevalida pasvorto
+    prompt: Konfirmez pasvorto por durar
+  crypto:
+    errors:
+      invalid_key: ne esas valida klefo Ed25519 o Curve25519
+      invalid_signature: ne esas valida parafo Ed25519
+  date:
+    formats:
+      default: "%d %b, %Y"
+      with_month_name: "%d %B, %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_months: "%{count}mo"
+      about_x_years: "%{count}y"
+      almost_x_years: "%{count}y"
       half_a_minute: Jus
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Jus
+      over_x_years: "%{count}y"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mo"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: Informo quon vu insertis ne esas korekta
+    confirm_password: Insertez nuna pasvorto por verifikar vua identeso
+    confirm_username: Insertez vua uzantonomo por konfirmar procedo
+    proceed: Efacez konto
+    success_msg: Vua konto sucesoze efacesis
+    warning:
+      before: 'Ante durar, lektez ca noti sorgeme:'
+      caches: Kontenajo quo memoresis da altra servilo forsan restas
+      data_removal: Vua posti e altra informi netempale efacesis
+      email_change_html: Vu povas <a href="%{path}">chanjar vua retpostoadreso</a> sen efacar vua konto
+      email_contact_html: Se ol ankore ne venas, vu povas retpostigar a <a href="mailto:%{email}">%{email}</a> por ganar helpo
+      email_reconfirmation_html: Se vu ne ganas konfirmretposto, vu povas <a href="%{path}">demandar itere</a>
+      irreversible: Vu ne povos riganar o riaktivigar vua konto
+      more_details_html: Por plu multa detali, videz <a href="%{terms_path}">privatesguidilo</a>.
+      username_available: Vua uzantonomo divenos disponebla itere
+      username_unavailable: Vua uzantonomo restos nedisponebla
+  disputes:
+    strikes:
+      action_taken: Agesis
+      appeal: Apelo
+      appeal_approved: Ca streko sucesoza apelesis e nun ne esas valida
+      appeal_rejected: Apelo refuzesis
+      appeal_submitted_at: Apelo sendesis
+      appealed_msg: Vua apelo sendesis. Se ola aprobesis, vu notifikesos.
+      appeals:
+        submit: Sendez apelo
+      approve_appeal: Aprobez rikonsidero
+      associated_report: Relatata raporto
+      created_at: Dato
+      description_html: Co esas agi kontre vua konto e averti quo sendesis a vu da laborero di %{instance}.
+      recipient: Sendesas a
+      reject_appeal: Refusez rikonsidero
+      status: 'Posto #%{id}'
+      status_removed: Posto ja efacis de sistemo
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Postoefaco
+        disable: Frostigo di konto
+        mark_statuses_as_sensitive: Markizo di posti quale sentoza
+        none: Averto
+        sensitive: Markizo di konto quale sentoza
+        silence: Limitizo di konto
+        suspend: Restrikto de konto
+      your_appeal_approved: Vua konto aprobesis
+      your_appeal_pending: Vu sendis apelo
+      your_appeal_rejected: Vua apelo refuzesis
+  domain_validator:
+    invalid_domain: ne esas valida domennomo
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
+    '400': Demando quon vu sendis esas nevalida o malstrukturala.
+    '403': Vu ne havas permiso por vidar ca pagino.
     '404': La pagino quan tu serchas ne existas.
-    '406': This page is not available in the requested format.
+    '406': Ca pagino ne esas displonebla kun demandita formato.
     '410': La pagino quan tu serchas ne plus existas.
-    '422': 
-    '429': Too many requests
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '422':
+      content: Sekuresverifiko faliis. Ka vu obstruktas kukii?
+      title: Sekuresverifiko faliis
+    '429': Tro multa agi
+    '500':
+      content: Regreto, ma evas nefuncionas che nia latero.
+      title: Ca pagino ne esas korekta
+    '503': La pagino ne povas montresas pro tempala servilfalio.
+    noscript_html: Por uzar retsoftwaro di Mastodon, aktivigez JavaScript. Alternative, probez 1 de <a href="%{apps_path}">konciliebla softwari</a> por Mastodon por vua platformo.
+  existing_username_validator:
+    not_found: ne povas trovar lokala uzanti kun ta uzantonomo
+    not_found_multiple: ne povas trovar %{usernames}
   exports:
+    archive_takeout:
+      date: Dato
+      download: Deschargez vua arkivo
+      hint_html: Vu povas demandar arkivo di vua <strong>posti e adchargita medii</strong>. Exportacita informi esos kun ActivityPub format, e lektebla da irga konciliebla softwaro. Vu povas demandar arkivo pos singla 7 dii.
+      in_progress: Kompilar vua arkivo...
+      request: Demandez vua arkivo
+      size: Grandeso
     blocks: Tu blokusas
+    bookmarks: Libromarki
+    csv: CSV
+    domain_blocks: Domenobstrukti
+    lists: Listi
+    mutes: Vu silencigesas
     storage: Konservado di kontenajo
+  featured_tags:
+    add_new: Insertez novo
+    errors:
+      limit: Vu ja estelis maxima hashtagi
+    hint_html: "<strong>Quo esas estelita hashtagi?</strong> Ol montresas eminente che vua publika profilo e povigas personi vidar vua publika posti partikulare kun ta hashtagi. Oli esas bona utensilo por jeretar kreiva agaji e longa projetaji."
+  filters:
+    contexts:
+      account: Profili
+      home: Hemo e listi
+      notifications: Avizi
+      public: Publika tempolinei
+      thread: Konversi
+    edit:
+      add_keyword: Insertez klefvorto
+      keywords: Klefvorti
+      statuses: Individuala posti
+      statuses_hint_html: Ca filtrilo aplikesas a selektita posti ne segun kad oli parigesas kun basa klefvorti. <a href="%{path}">Kontrolez o efacez posti de la filtrilo</a>.
+      title: Modifikez filtrilo
+    errors:
+      deprecated_api_multiple_keywords: Ca parametri ne povas chanjesar per ca softwaro pro quo oli efektigas plu kam 1 filtrilklefvorto. Uzez plu recenta softwaro o interretintervizajo.
+      invalid_context: Nula o nevalida kuntexto donesis
+    index:
+      contexts: Filtrili kun %{contexts}
+      delete: Efacez
+      empty: Vu ne havas filtrili.
+      expires_in: Expiras ye %{distance}
+      expires_on: Expiras ye %{date}
+      keywords:
+        one: "%{count} klefvorto"
+        other: "%{count} klefvorti"
+      statuses:
+        one: "%{count} posto"
+        other: "%{count} posti"
+      statuses_long:
+        one: "%{count} posto celesas"
+        other: "%{count} posti celesas"
+      title: Filtrili
+    new:
+      save: Salvez nova filtrilo
+      title: Insertez nova filtrilo
+    statuses:
+      back_to_filter: Retrovenez a filtrilo
+      batch:
+        remove: Efacez de filtrilo
+      index:
+        hint: Ca filtrilo aplikesas a selektita posti ne segun altra kriterio. Vu povas pozar plu multa posti a ca filtrilo de retintervizajo.
+        title: Filtrita posti
+  footer:
+    trending_now: Nuna tendenco
   generic:
+    all: Omna
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> kozo sur ca sito selektesas."
+      other: Omna <strong>%{count}</strong> kozi sur ca sito selektesas.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> kozo quo parigesas kun vua trovato selektesas."
+      other: Omna <strong>%{count}</strong> kozi quo parigesas kun vua trovato selektesas.
     changes_saved_msg: Chanji senprobleme konservita!
+    copy: Kopiez
+    delete: Efacez
+    deselect: Deselektez omno
+    none: Nulo
+    order_by: Asortez quale
     save_changes: Konservar la chanji
+    select_all_matching_items:
+      one: Selektez %{count} kozo quo parigesas kun vua trovato.
+      other: Selektez omna %{count} kozi quo parigesas kun vua trovato.
+    today: hodie
     validation_errors:
       one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto
       other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti
+  html_validator:
+    invalid_markup: 'kontenas nevalida kompozuro di HTML: %{error}'
   imports:
+    errors:
+      over_rows_processing_limit: kontenas plu kam %{count} horizontala lineo
+    modes:
+      merge: Kombinez
+      merge_long: Retenez displonebla rekordi e insertez novi
+      overwrite: Remplasez
+      overwrite_long: Remplasez nuna rekordi per novi
     preface: Tu povas importacar kelka datumi, tal quala listi de omna homi quin tu sequas o blokusas, a tua konto di ca instaluro, per dosiero exportacita de altra instaluro.
     success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita
     types:
       blocking: Listo de blokusiti
+      bookmarks: Libromarki
+      domain_blocking: Domenobstruktolisto
       following: Listo de sequati
+      muting: Silenciglisto
     upload: Kargar
+  invites:
+    delete: Deaktivigez
+    expired: Expiris
+    expires_in:
+      '1800': 30 minuti
+      '21600': 6 hori
+      '3600': 1 horo
+      '43200': 12 hori
+      '604800': 1 semano
+      '86400': 1 dio
+    expires_in_prompt: Nulatempe
+    generate: Facez invitligilo
+    invited_by: 'Vu invitesis da:'
+    max_uses:
+      one: 1 uzo
+      other: "%{count} uzi"
+    max_uses_prompt: Nula limito
+    prompt: Facez e partigez ligili kun altra personi por donar aceso a ca servilo
+    table:
+      expires_at: Expiros
+      uses: Uzi
+    title: Invitez personi
+  lists:
+    errors:
+      limit: Vu astingas maxima listi
+  login_activities:
+    authentication_methods:
+      otp: 2-faktoryurizessoftwaro
+      password: pasvorto
+      sign_in_token: retpostosekureskodexo
+      webauthn: sekuresklefi
+    description_html: Se vu vidas aktiveso quon vu ne rikonocas, konsiderez chanjar vua pasvorto e aktivigez 2-faktoryurizo.
+    empty: Yurizeshistorio esas nedisponebla
+    failed_sign_in_html: Falita enirprob per %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Sucesoza eniro per %{method} de %{ip} (%{browser})
+    title: Yurizeshistorio
+  media_attachments:
+    validations:
+      images_and_video: Ne povas atachar video a posto quo ja kontenar imaji
+      not_ready: Ne povas faili quo ankore procedigesas. Probez itere pose!
+      too_many: Ne povas atachar plu kam 4 faili
+  migrations:
+    acct: Transferesis a
+    cancel: Anulez ridirekto
+    cancel_explanation: Anular ridirekto riaktivigos vua nuna konto, ma ne riganos sequanti quo transferesis a ta konto.
+    cancelled_msg: Sucesoze anulis ridirekto.
+    errors:
+      already_moved: esas sama transferkonto
+      missing_also_known_as: ne esas alternativa nomo di ca konto
+      move_to_self: ne povas esar nuna konto
+      not_found: ne povas trovesar
+      on_cooldown: Vu havas varttempo
+    followers_count: Sequanti en transfertempo
+    incoming_migrations: Transfero de diferanta konto
+    incoming_migrations_html: Por transferar de irga konto a to, unesme vu bezonas <a href="%{path}">krear kontoalternativnomo</a>.
+    moved_msg: Vua konto nun ridirektesas a %{acct} e vua sequanti transferesas.
+    not_redirecting: Vua konto ne ridirektesas a irga altra konto nun.
+    on_cooldown: Vu recente migrigis vua konto. Ca funciono divenos disponebla itere pos %{count} dii.
+    past_migrations: Antea migri
+    proceed_with_move: Transferez sequanti
+    redirected_msg: Vua konto nun ridirektesas a %{acct}.
+    redirecting_to: Vua konto ridirektesas a %{acct}.
+    set_redirect: Fixez ridirekto
+    warning:
+      backreference_required: Nova konto mustas unesme ajustesar por dopreferar co
+      before: 'Ante durar, lektez ca noti sorgeme:'
+      cooldown: Pos transferesar, existas varttempo kande vu ne povas transferesar itere
+      disabled_account: Vua nuna konto ne divenos tote uzebla pose. Tamen, vu povas acesar informexportaco e anke riaktivigo.
+      followers: Ca ago transferos omna sequanti de nuna konto a nova konto
+      only_redirect_html: Alternative, vu povas <a href="%{path}">nur pozar ridirekto che vua profilo</a>.
+      other_data: Altra informi ne transferesos automate
+      redirect: Vua nuna profilo di konto novigesos kun ridirektoavizo e neinkluzesos de trovi
+  moderation:
+    title: Jero
+  move_handler:
+    carry_blocks_over_text: Ca uzanti transferesis de %{acct} quon vu restriktis.
+    carry_mutes_over_text: Ca uzanti transferesis de %{acct} quon vu silencigis.
+    copy_account_note_text: 'Ca uzanti transferesis de %{acct}, co esas vua antea noti pri ol:'
   notification_mailer:
-    digest:
-      body: Yen mikra rezumo di to, depos ke tu laste vizitis en %{since}
-      mention: "%{name} mencionis tu en:"
-      new_followers_summary:
-        one: Tu obtenis nova sequanto! Yey!
-        other: Tu obtenis %{count} nova sequanti! Astonive!
-      subject:
-        one: "1 nova savigo depos tua lasta vizito \U0001F418"
-        other: "%{count} nova savigi depos tua lasta vizito \U0001F418"
+    admin:
+      report:
+        subject: "%{name} sendis raporto"
+      sign_up:
+        subject: "%{name} registris"
     favourite:
       body: "%{name} favoris tua mesajo:"
       subject: "%{name} favoris tua mesajo"
+      title: Nova favorato
     follow:
       body: "%{name} sequeskas tu!"
       subject: "%{name} sequeskas tu"
+      title: Nova sequanto
     follow_request:
+      action: Jerez sequodemandi
       body: "%{name} demandis sequar tu"
       subject: "%{name} demandis sequar tu"
+      title: Nova sequodemando
     mention:
+      action: Respondez
       body: "%{name} mencionis tu en:"
       subject: "%{name} mencionis tu"
+      title: Nova menciono
+    poll:
+      subject: Votposto di %{name} finis
     reblog:
       body: "%{name} diskonocigis tua mesajo:"
       subject: "%{name} diskonocigis tua mesajo"
+      title: Nova busto
+    status:
+      subject: "%{name} nove postigis"
+    update:
+      subject: "%{name} modifikis posto"
+  notifications:
+    email_events: Eventi por retpostoavizi
+    email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
+    other_settings: Altra avizopcioni
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: G
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Insertez kodexo quo facesis da vua yurizsoftwaro por konfirmar
+    description_html: Se vu aktivigas <strong>2-faktoryurizo</strong> per yurizsoftwaro, eniro bezonos vu havar vua smartfono, quale facas fichi por vu por enirar.
+    enable: Aktivigez
+    instructions_html: "<strong>Skanez ca QR-kodexo a Google Authenticator o simila TOTP-softwaro en vua smartfono</strong>. Pos co, ta softwaro facos fichi quon vu bezonos insertar kande enirar."
+    manual_instructions: 'Se vu ne povas skanar QR-kodexo e bezonas insertar manuala, subo esas textosekreto:'
+    setup: Facez
+    wrong_code: Insertita kodexo esas nevalida! Ka serviltempo e aparattempo esas korekta?
   pagination:
+    newer: Nova
     next: Sequanta
+    older: Olda
     prev: Preiranta
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Vu ja votis che ca votposto
+      duplicate_options: havas duplikatkozi
+      duration_too_long: esas tro distanta en futuro
+      duration_too_short: es tro balde
+      expired: Votposto ja finis
+      invalid_choice: Selektita votselektajo ne existas
+      over_character_limit: ne povas esar plu longa kam %{max} literi por sing
+      too_few_options: mustas havar kozi
+      too_many_options: ne povas havar plu kam %{max} kozi
+  preferences:
+    other: Altra
+    posting_defaults: Originala postoopcioni
+    public_timelines: Publika tempolinei
+  privacy_policy:
+    title: Privatesguidilo
+  reactions:
+    errors:
+      limit_reached: Limito di diferanta reakto atingesis
+      unrecognized_emoji: ne esas rikonocita emocimajo
+  relationships:
+    activity: Kontoaktiveso
+    dormant: Neaktiva
+    follow_selected_followers: Sequez kelka sequanti
+    followers: Sequanti
+    following: Sequati
+    invited: Invititi
+    last_active: Recente aktiva
+    most_recent: Maxim recenta
+    moved: Transferesis
+    mutual: Reciproka
+    primary: Primara
+    relationship: Relateso
+    remove_selected_domains: Efacez omna sequanti de selektita domeni
+    remove_selected_followers: Efacez selektita sequanti
+    remove_selected_follows: Desequez selektita uzanti
+    status: Kontostando
   remote_follow:
-    acct: Enpozez tua uzernomo@instaluro de ube tu volas sequar ta uzero
     missing_resource: La URL di plussendado ne povis esar trovita
-    proceed: Durar por plussendar
-    prompt: 'Tu sequeskos:'
+  reports:
+    errors:
+      invalid_rules: ne refera valida reguli
+  rss:
+    content_warning: 'Kontenajaverto:'
+    descriptions:
+      account: Publika posti de @%{acct}
+      tag: 'Publika posti kun tago #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Vu ecesas limito quale esas %{limit} projetita posti por hodio
+    over_total_limit: Vu ecesas limito quale esas %{limit} projetita posti
+    too_soon: Projetita dato mustas esar en futuro
+  sessions:
+    activity: Antea aktiveso
+    browser: Vidilo
+    browsers:
+      alipay: Alipay
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Nesavita vidilo
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Vidilo Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: Vidilo QQ
+      safari: Safari
+      weibo: Weibo
+    current_session: Nuna sesiono
+    description: "%{browser} che %{platform}"
+    explanation: Co esas retvidili quo nun konektesis a vua konto di Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: nesavata platformo
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Depermisez
+    revoke_success: Sesiono sucesoze deaprobesas
+    title: Sesioni
+    view_authentication_history: Videz yurizeshistorio di vua konto
   settings:
+    account: Konto
+    account_settings: Kontoopcioni
+    aliases: Kontoaltnomi
+    appearance: Aspekto
     authorized_apps: Yurizita apliki
     back: Retro a Mastodon
+    delete: Kontoefaco
+    development: Developo
     edit_profile: Redaktar la profilo
     export: Exportacar datumi
+    featured_tags: Estelata hashtagi
     import: Importacar
+    import_and_export: Importaco e exportaco
+    migrate: Kontomigro
+    notifications: Avizi
     preferences: Preferi
+    profile: Profilo
+    relationships: Sequati e sequanti
+    statuses_cleanup: Automata postoefaco
+    strikes: Jerstreki
     two_factor_authentication: Dufaktora autentikigo
+    webauthn_authentication: Sekuresklefi
   statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audii"
+      description: 'Atachajo: %{attached}'
+      image:
+        one: "%{count} imajo"
+        other: "%{count} imaji"
+      video:
+        one: "%{count} video"
+        other: "%{count} videi"
+    boosted_from_html: Bustesis de %{acct_link}
+    content_warning: 'Kontenajaverto: %{warning}'
+    default_language: Sama quale intervizajlinguo
+    disallowed_hashtags:
+      one: 'kontenas nepermisita hashtago: %{tags}'
+      other: 'kontenas nepermisita hashtagi: %{tags}'
+    edited_at_html: Modifikesis ye %{date}
+    errors:
+      in_reply_not_found: Posto quon vu probas respondar semblas ne existas.
     open_in_web: Apertar retnavigile
     over_character_limit: limito de %{max} signi ecesita
+    pin_errors:
+      direct: Posti quo povas videsar nur mencionita uzanti ne povas pinglagesar
+      limit: Vu ja pinglagis maxima posti
+      ownership: Posto di altra persono ne povas pinglagesar
+      reblog: Busto ne povas pinglagesar
+    poll:
+      total_people:
+        one: "%{count} persono"
+        other: "%{count} personi"
+      total_votes:
+        one: "%{count} voto"
+        other: "%{count} voti"
+      vote: Votez
     show_more: Montrar plue
+    show_newer: Montrez plu nova kozo
+    show_older: Montrez plu olda kozo
+    show_thread: Montrez postaro
+    sign_in_to_participate: Registrez por partoprenar en konverso
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Direta
       private: Montrar nur a sequanti
+      private_long: Nur montrez a sequanti
       public: Publika
+      public_long: Omnu povas vidar
       unlisted: Publika, ma ne aperos en publika tempolinei
+      unlisted_long: Omnu povas vidar ma ne listigesas che publika tempolinei
+  statuses_cleanup:
+    enabled: Automata efacez olda posti
+    enabled_hint: Automata efacez vua posti pos oli atingar fixita oldeslimito, se oli ne parigesas a 1 de suba ecepti
+    exceptions: Ecepti
+    explanation: Pro ke efacar posti esas nechipa procedo, co agas lente progresive kande servilo ne esas okupata. Do, vua posti forsan efacesos kurte pos oli atingas oldeslimito.
+    ignore_favs: Ignorez favorati
+    ignore_reblogs: Ignorez busti
+    interaction_exceptions: Ecepti segun interagi
+    interaction_exceptions_explanation: Notale, ne existas garantio ke posti efacesos se oli iras sub favorato o bustlimito pos iras super ol.
+    keep_direct: Retenez direta mesaji
+    keep_direct_hint: Ne efacas irga vua direta mesaji
+    keep_media: Retenez posti kun mediiatachaji
+    keep_media_hint: Ne efacas irga vua posti quo havas mediiatachaji
+    keep_pinned: Retenez pinglagita posti
+    keep_pinned_hint: Ne efacas irga vua pinglagita posti
+    keep_polls: Retenez votposti
+    keep_polls_hint: Ne efacas irga vua votposti
+    keep_self_bookmark: Retenez posti quon vu libromarkizis
+    keep_self_bookmark_hint: Ne efacas vua sua posti se vu libromarkizis li
+    keep_self_fav: Retenez posti quon vu favorizis
+    keep_self_fav_hint: Ne efacas vua sua posti se vu favorizis li
+    min_age:
+      '1209600': 2 semani
+      '15778476': 6 monati
+      '2629746': 1 monato
+      '31556952': 1 yaro
+      '5259492': 2 monati
+      '604800': 1 semano
+      '63113904': 2 yari
+      '7889238': 3 monati
+    min_age_label: Oldeslimito
+    min_favs: Retenez favorizita posti mine
+    min_favs_hint: Ne efacas irga vua posti quo ganis mine ca favorizquanto. Restez quale vakua por efacar posti sen suciar olia favorizquanto
+    min_reblogs: Retenez bustita posti mine
+    min_reblogs_hint: Ne efacas irga vua posti quo bustigesos mine ca foyoquanto. Restez quale vakua por efacar posti sen suciar olia foyoquanto
   stream_entries:
+    pinned: Pinglagita posto
     reblogged: diskonocigita
     sensitive_content: Titiliva kontenajo
+  strikes:
+    errors:
+      too_late: Ol esas tro tarda ye apelar ca strekizo
+  tags:
+    does_not_match_previous_name: ne parigesas a antea nomo
+  themes:
+    contrast: Mastodon (Alta kontrasteso)
+    default: Mastodon (Obskura)
+    mastodon-light: Mastodon (Brila)
+  time:
+    formats:
+      default: "%d %b, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
+    add: Insertez
     disable: Extingar
+    disabled_success: 2-faktoryurizeso sucesoze desaktivigesas
+    edit: Modifikez
+    enabled: 2-faktoryurizeso aktivigesas
+    enabled_success: 2-faktoryurizeso sucesoze aktivigesas
     generate_recovery_codes: Generate Recovery Codes
+    lost_recovery_codes: Rigankodexi povigas vu riganas aceso a vua konto se vu perdas vua smartfono. Se vu perdas vua rigankodexi, vu povas rifacar hike. Vua olda rigankodexi nevalidigesos.
+    methods: 2-faktormetodi
+    otp: Yurizsoftwaro
+    recovery_codes: Kopiez rigannumeri
+    recovery_codes_regenerated: Rigannumeri sucesoze rifacesas
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
+    webauthn: Sekuresklefi
+  user_mailer:
+    appeal_approved:
+      action: Irez a vua konto
+      explanation: Apelo di streko kontre vua konto en %{strike_date} quale vu sendis en %{appeal_date} aprobesis. Vua konto itere standas bone.
+      subject: Vua apelo de %{date} aprobesis
+      title: Apelo aprobesis
+    appeal_rejected:
+      explanation: Apelo di streko kontre vua konto en %{strike_date} quale vu sendis en %{appeal_date} refuzesis.
+      subject: Vua apelo de %{date} refuzesis
+      title: Apelo refuzesis
+    backup_ready:
+      explanation: Vu demandis kompleta kopiur di vua konto di Mastodon. Ol esas nun pronte deschargebla!
+      subject: Vua arkivo pronte deschargebla
+      title: Arkivekpreno
+    suspicious_sign_in:
+      change_password: chanjez vua pasvorto
+      details: 'Co esas detali di eniro:'
+      explanation: Ni deskovris eniro a vua konto de nova adreso IP.
+      further_actions_html: Se co ne agesis da vu, ni rekomendas ke vu %{action} quik e aktivigas 2-faktoryurizo por sekurigar vua konto.
+      subject: Vua konto acesesis de nova adreso IP
+      title: Nova eniro
+    warning:
+      appeal: Sendez apelo
+      appeal_description: Se vu kredas ke co esas eroro, vu povas sendar apelo a laboreri di %{instance}.
+      categories:
+        spam: Spamo
+        violation: Kontenajo nesequas ca komunitatguidili
+      explanation:
+        delete_statuses: Ol trovesis ke kelka vua posti nesequas komunitatguidilo e do efacesis da jereri di %{instance}.
+        disable: Vu ne povas uzar vua konto pluse, ma vua profilo e altra informi restas bone. Vu povas demandar kopiur di vua informi, chanjar kontoopcioni e efacar vua konto.
+        mark_statuses_as_sensitive: Kelka vua posti markizesis quale sentoza da jereri di %{instance}. Do, personi bezonos kliktar medii en posti ante prevido montresas. Vu povas markizar medii quale sentoza per su kande postar en futuro.
+        sensitive: Pos co, omna vua adchargita mediifaili markizesos quale sentoza e celesos dop kliktoaverto.
+        silence: Vu povas ankore uzar vua konto ma nur personi quo ja sequis vu vidos vua posti en ca servilo, e vu forsan neinkluzesas de diversa deskovrotraiti. Tamen, altra personi povas ankore manuala sequar vu.
+        suspend: Vu ne povas uzar vua konto pluse, e vua profilo e altra informi ne esas acesebla pluse. Vu povas ankore enirar por demandar kopiur di vua informi til informi komplete efacesas pos cirkum 30 dii, ma ni retenos kelka bazala informi por preventar vu evitar restrikto.
+      reason: 'Motivo:'
+      statuses: 'Citita posti:'
+      subject:
+        delete_statuses: Vua posti che %{acct} efacis
+        disable: Vua konto %{acct} frostigesis
+        mark_statuses_as_sensitive: Vua posti che %{acct} markizesis quale sentoza
+        none: Averto por %{acct}
+        sensitive: Vua posti che %{acct} markizesos quale sentoza pos nun
+        silence: Vua konto %{acct} limitizesis
+        suspend: Vua konto %{acct} restriktesis
+      title:
+        delete_statuses: Posti efacesis
+        disable: Konto frostigesis
+        mark_statuses_as_sensitive: Posti markizesis quale sentoza
+        none: Averto
+        sensitive: Konto markizesis quale sentoza
+        silence: Konto limitizesis
+        suspend: Konto restriktigesis
+    welcome:
+      edit_profile_action: Facez profilo
+      edit_profile_step: Vu povas kustumizar vua profilo per adchargar profilimajo, chanjesar vua montronomo e plue. Vu povas selektas kontrolar nova sequanti ante oli permisesas sequar vu.
+      explanation: Subo esas guidilo por helpar vu komencar
+      final_action: Komencez postigar
+      final_step: 'Jus postigez! Mem sen sequanti, vua publika posti povas videsar da altra personi, exemplo es en lokala tempolineo e en hashtagi. Vu povas anke introduktar su en #introductions hashtagi.'
+      full_handle: Vua kompleta profilnomo
+      full_handle_hint: Co esas quon vu dicos a amiki por ke oli povas mesajigar o sequar vu de altra servilo.
+      subject: Bonveno a Mastodon
+      title: Bonveno, %{name}!
   users:
+    follow_limit_reached: Vu ne povas sequar plu kam %{limit} personi
     invalid_otp_token: La dufaktora autentikigila kodexo ne esas valida
+    otp_lost_help_html: Se vu perdas aceso de 2 konto, vu povas kontaktar kun %{email}
+    seamless_external_login: Vu enirar tra externa serveso, do pasvorto e retpostoopcioni ne esas disponebla.
+    signed_in_as: 'Eniris quale:'
+  verification:
+    explanation_html: 'Vu povas <strong>verifikar su kom proprietero di ligili en vua profilmetainformi</strong>. En ta kazo, ligita retsito <strong>mustas</strong> havar <code>rel="me"</code> atributo. Textokontenajo di ligilo ne esas importanta. Co esas exemplo:'
+    verification: Verifikeso
+  webauthn_credentials:
+    add: Insertez nova sekuresklefo
+    create:
+      error: Existas problemo kande insertar vua sekuresklefo. Probez itere.
+      success: Vua sekuresklefo sucesoze insertesas.
+    delete: Efacez
+    delete_confirmation: Ka vu certe volas efacar ca sekuresklefo?
+    description_html: Se vu aktivigas <strong>sekuresklefyurizo</strong>, eniro bezonos vu uzar 1 de vua sekuresklefi.
+    destroy:
+      error: Existas problemo kande efacar vua sekuresklefo. Probez itere.
+      success: Vua sekuresklefo sucesoze efacesis.
+    invalid_credential: Nevalida sekuresklefo
+    nickname_hint: Insertez nometo di vua nova sekuresklefo
+    not_enabled: Vu ne aktivigesas WebAuthn til nun
+    not_supported: Ca vidilo ne suportas sekuresklefi
+    otp_required: Por uzar sekuresklefi, aktivigez 2-faktoryurizeso unesme.
+    registered_on: Registris ye %{date}
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 02a306553..d08d8c6a7 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1,92 +1,27 @@
 ---
 is:
   about:
-    about_hashtag_html: Þetta eru opinber tíst sem merkt eru með <strong>#%{hashtag}</strong>. Þú getur unnið með þau ef þú ert með skráðan aðgang einhversstaðar í skýjasambandinu.
     about_mastodon_html: 'Samfélagsnet framtíðarinnar: Engar auglýsingar, ekkert eftirlit stórfyrirtækja, siðleg hönnun og engin miðstýring! Þú átt þín eigin gögn í Mastodon!'
-    about_this: Um hugbúnaðinn
-    active_count_after: virkt
-    active_footnote: Mánaðarlega virkir notendur (MAU)
-    administered_by: 'Stýrt af:'
-    api: API-kerfisviðmót
-    apps: Farsímaforrit
-    apps_platforms: Notaðu Mastodon frá iOS, Android og öðrum stýrikerfum
-    browse_directory: Skoða notandasniðamöppu og sía eftir áhugamálum
-    browse_local_posts: Skoðaðu kvikt streymi af opinberum færslum á þessum vefþjóni
-    browse_public_posts: Skoðaðu kvikt streymi af opinberum færslum á Mastodon
-    contact: Hafa samband
     contact_missing: Ekki skilgreint
     contact_unavailable: Ekki til staðar
-    discover_users: Uppgötva notendur
-    documentation: Hjálparskjöl
-    federation_hint_html: Með notandaaðgangi á %{instance} geturðu fylgst með fólki á hvaða Mastodon-þjóni sem er og reyndar víðar.
-    get_apps: Prófaðu farsímaforrit
     hosted_on: Mastodon hýst á %{domain}
-    instance_actor_flash: |
-      Þessi aðgangur er sýndarnotandi sem er notaður til að tákna sjálfan vefþjóninn en ekki neinn einstakan notanda.
-      Tilgangur hans tengist virkni vefþjónasambandsins og ætti alls ekki að loka á hann nema að þú viljir útiloka allan viðkomandi vefþjón, en þá ætti frekar að útiloka sjálft lénið.
-    learn_more: Kanna nánar
-    privacy_policy: Persónuverndarstefna
-    rules: Reglur netþjónsins
-    rules_html: 'Hér fyrir neðan er yfirlit yfir þær reglur sem þú þarft að fara eftir ef þú ætlar að vera með notandaaðgang á þessum Mastodon-netþjóni:'
-    see_whats_happening: Sjáðu hvað er í gangi
-    server_stats: 'Tölfræði þjóns:'
-    source_code: Grunnkóði
-    status_count_after:
-      one: stöðufærsla
-      other: stöðufærslur
-    status_count_before: Sem stóðu fyrir
-    tagline: Fylgstu með vinum og uppgötvaðu nýja
-    terms: Þjónustuskilmálar
-    unavailable_content: Ekki tiltækt efni
-    unavailable_content_description:
-      domain: Vefþjónn
-      reason: Ástæða
-      rejecting_media: 'Myndefnisskrár frá þessum vefþjónum verða hvorki birtar né geymdar og engar smámyndir frá þeim birtar, sem krefst þess að smellt sé handvirkt til að nálgast upprunalegu skrárnar:'
-      rejecting_media_title: Síuð gögn
-      silenced: 'Færslur frá þessum vefþjónum verða faldar í opinberum tímalínum og samtölum, auk þess sem engar tilkynningar verða til þvið aðgerðir notendanna, nema ef þú fylgist með þeim:'
-      silenced_title: Þaggaðir netþjónar
-      suspended: 'Engin gögn frá þessum vefþjónum verða unnin, geymd eða skipst á, sem gerir samskipti við notendur frá þessum vefþjónum ómöguleg:'
-      suspended_title: Netþjónar í frysti
-    unavailable_content_html: Mastodon leyfir þér almennt að skoða og eiga við efni frá notendum frá hvaða vefþjóni sem er í vefþjónasambandinu. Þetta eru þær undantekningar sem hafa verið gerðar á þessum tiltekna vefþjóni.
-    user_count_after:
-      one: notanda
-      other: notendur
-    user_count_before: Hýsir
-    what_is_mastodon: Hvað er Mastodon?
+    title: Um hugbúnaðinn
   accounts:
-    choices_html: "%{name} hefur valið:"
-    endorsements_hint: Þú getur auglýst efni frá fólki sem þú fylgir í vefviðmótinu og mun það birtast hér.
-    featured_tags_hint: Þú getur gefið sérstökum myllumerkjum aukið vægi og birtast þau þá hér.
     follow: Fylgjast með
     followers:
       one: fylgjandi
       other: fylgjendur
     following: Fylgist með
-    instance_actor_flash: Þessi notandaaðgangur er sýndarnotandi sem stendur fyrir sjálfan netþjóninn en ekki neinn einstakling. Hann er notaður við skýjasambandsmiðlun og ætti ekki að setja hann í bið eða banna.
-    joined: Gerðist þátttakandi %{date}
+    instance_actor_flash: Þessi notandaaðgangur er sýndarnotandi sem stendur fyrir sjálfan netþjóninn en ekki neinn einstakling. Hann er notaður við skýjasambandsmiðlun og ætti ekki að setja hann í frysti eða banna.
     last_active: síðasta virkni
     link_verified_on: Eignarhald á þessum tengli var athugað þann %{date}
-    media: Myndefni
-    moved_html: "%{name} hefur verið færður í %{new_profile_link}:"
-    network_hidden: Þessar upplýsingar ekki tiltækar
-    never_active: Aldrei
     nothing_here: Það er ekkert hér!
-    people_followed_by: Fólk sem %{name} fylgist með
-    people_who_follow: Fólk sem fylgist með %{name}
     pin_errors:
       following: Þú þarft að vera þegar að fylgjast með þeim sem þú ætlar að mæla með
     posts:
-      one: Tíst
-      other: Tíst
-    posts_tab_heading: Tíst
-    posts_with_replies: Tíst og svör
-    roles:
-      admin: Stjóri
-      bot: Róbót
-      group: Hópur
-      moderator: Umsjón
-    unavailable: Notandasnið ekki tiltækt
-    unfollow: Hætta að fylgja
+      one: Færsla
+      other: Færslur
+    posts_tab_heading: Færslur
   admin:
     account_actions:
       action: Framkvæma aðgerð
@@ -94,26 +29,30 @@ is:
     account_moderation_notes:
       create: Skilja eftir minnispunkt
       created_msg: Tókst að útbúa minnispunkt umsjónarmanns!
-      delete: Eyða
       destroyed_msg: Tókst að eyða minnispunkti umsjónarmanns!
     accounts:
       add_email_domain_block: Útiloka tölvupóstlén
       approve: Samþykkja
-      approve_all: Samþykkja allt
       approved_msg: Tókst að samþykkja skráningu fyrir %{username}
       are_you_sure: Ertu viss?
       avatar: Auðkennismynd
       by_domain: Lén
       change_email:
-        changed_msg: Tölvupóstfangi notandaaðgangsins hefur verið breytt!
+        changed_msg: Tókst að breyta tölvupóstfangi!
         current_email: Núverandi tölvupóstfang
         label: Breyta tölvupóstfangi
         new_email: Nýr tölvupóstur
         submit: Breyta tölvupóstfangi
         title: Breyta tölvupóstfangi fyrir %{username}
+      change_role:
+        changed_msg: Tókst að breyta hlutverki!
+        label: Breyta hlutverki
+        no_role: Ekkert hlutverk
+        title: Breyta hlutverki fyrir %{username}
       confirm: Staðfesta
       confirmed: Staðfest
       confirming: Staðfesti
+      custom: Sérsniðið
       delete: Eyða gögnum
       deleted: Eytt
       demote: Lækka í tign
@@ -153,17 +92,22 @@ is:
         active: Virkur
         all: Allt
         pending: Í bið
-        silenced: Hulið
-        suspended: Í bið
+        silenced: Takmarkað
+        suspended: Í frysti
         title: Umsjón
       moderation_notes: Minnispunktar umsjónarmanna
       most_recent_activity: Allra nýjasta virkni
       most_recent_ip: Nýjasta IP-vistfang
       no_account_selected: Engum aðgöngum var breytt þar sem engir voru valdir
       no_limits_imposed: Engra takmarka krafist
+      no_role_assigned: Engu hlutverki úthlutað
       not_subscribed: Ekki í áskrift
       pending: Bíður eftir yfirlestri
-      perform_full_suspension: Setja í bið
+      perform_full_suspension: Frysta
+      previous_strikes: Fyrri refsingar
+      previous_strikes_description_html:
+        one: Þessi notandaaðgangur er með <strong>eina</strong> refsingu.
+        other: Þessi notandaaðgangur er með <strong>%{count}</strong> refsingar.
       promote: Hækka í tign
       protocol: Samskiptamáti
       public: Opinber
@@ -171,8 +115,9 @@ is:
       redownload: Endurlesa notandasnið
       redownloaded_msg: Tókst að endurlesa notandasnið %{username} úr upphaflegu sniði
       reject: Hafna
-      reject_all: Hafna öllu
       rejected_msg: Tókst að hafna skráningu fyrir %{username}
+      remote_suspension_irreversible: Gögnum þessa notandaaðgangs hefur verið eytt óafturkvæmt.
+      remote_suspension_reversible_hint_html: Notandaaðgangurinn hefur verið settur í frysti á hinum netþjóninum og gögnunum á honum verður eytt að fullu þann %{date}. Þangað til gæti hinn netþjóninn endurheimt aðganginn úr frysti án nokkurra breytinga. Ef þú vilt eyða öllum gögnum af honum strax, geturðu gert það hér fyrir neðan.
       remove_avatar: Fjarlægja auðkennismynd
       remove_header: Fjarlægja haus
       removed_avatar_msg: Tókst að fjarlægja auðkennismynd notandans %{username}
@@ -184,19 +129,13 @@ is:
       reset: Endurstilla
       reset_password: Endurstilla lykilorð
       resubscribe: Gerast áskrifandi aftur
-      role: Heimildir
-      roles:
-        admin: Stjórnandi
-        moderator: Umsjónarmaður
-        staff: Starfsmaður
-        user: Notandi
+      role: Hlutverk
       search: Leita
       search_same_email_domain: Aðra notendur með sama tölvupóstlén
       search_same_ip: Aðrir notendur með sama IP-vistfang
       security_measures:
         only_password: Aðeins lykilorð
         password_and_2fa: Lykilorð og 2-þátta auðkenning
-        password_and_sign_in_token: Lykilorð og teikn í tölvupósti
       sensitive: Viðkvæmt
       sensitized: merkt sem viðkvæmt
       shared_inbox_url: Slóð á sameiginlegt innhólf
@@ -205,20 +144,23 @@ is:
         targeted_reports: Kært af öðrum
       silence: Hylja
       silenced: Hulið
-      statuses: Stöðufærslur
+      statuses: Færslur
+      strikes: Fyrri refsingar
       subscribe: Gerast áskrifandi
-      suspended: Í bið
-      suspension_irreversible: Gögnunum á þessum notandaaðgangi hefur verið eytt óafturkræft. Þú getur tekið aðganginn úr bið svo hægt sé að nota hann, en það mun ekki endurheimta neitt af þeim gögnum sem á honum voru áður.
-      suspension_reversible_hint_html: Notandaaðgangurin hefur verið settur í biðstöðu og gögnunum á honum verður eytt að fullu þann %{date}. Þangað til væri hægt að endurheimta aðganginn úr bið án nokkurra breytinga. Ef þú vilt eyða öllum gögnum af honum strax, geturðu gert það hér fyrir neðan.
-      time_in_queue: Bíður í biðröð %{time}
+      suspend: Frysta
+      suspended: Í frysti
+      suspension_irreversible: Gögnunum á þessum notandaaðgangi hefur verið eytt óafturkræft. Þú getur tekið aðganginn úr frysti svo hægt sé að nota hann, en það mun ekki endurheimta neitt af þeim gögnum sem á honum voru áður.
+      suspension_reversible_hint_html: Notandaaðgangurinn hefur verið settur í frysti og gögnunum á honum verður eytt að fullu þann %{date}. Þangað til væri hægt að endurheimta aðganginn úr frysti án nokkurra breytinga. Ef þú vilt eyða öllum gögnum af honum strax, geturðu gert það hér fyrir neðan.
       title: Notandaaðgangar
+      unblock_email: Aflétta útilokun tölvupóstfangs
+      unblocked_email_msg: Tókst að afbanna tölvupóstfang notandans %{username}
       unconfirmed_email: Óstaðfestur tölvupóstur
       undo_sensitized: Afturkalla merkingu sem viðkvæmt
       undo_silenced: Hætta að hylja
       undo_suspension: Taka úr bið
       unsilenced_msg: Tókst að fjarlægja takmarkanir af notandaaðgangnum fyrir %{username}
       unsubscribe: Taka úr áskrift
-      unsuspended_msg: Tókst að taka notandaaðganginn fyrir %{username} úr bið
+      unsuspended_msg: Tókst að taka notandaaðganginn fyrir %{username} úr frysti
       username: Notandanafn
       view_domain: Skoða yfirlit fyrir lén
       warn: Aðvara
@@ -226,26 +168,34 @@ is:
       whitelisted: Á lista yfir leyft
     action_logs:
       action_types:
+        approve_appeal: Samþykkja áfrýjun
+        approve_user: Samþykkja notanda
         assigned_to_self_report: Úthluta kæru
         change_email_user: Skipta um tölvupóstfang notanda
+        change_role_user: Breyta hlutverki notanda
         confirm_user: Staðfesta notanda
         create_account_warning: Útbúa aðvörun
         create_announcement: Búa til tilkynningu
+        create_canonical_email_block: Búa til útilokunarblokk tölvupósts
         create_custom_emoji: Búa til sérsniðið tjáningartákn
         create_domain_allow: Búa til lén leyft
-        create_domain_block: Búa til lén bannað
-        create_email_domain_block: Búa til tölvupóstfang bannað
+        create_domain_block: Búa til útilokun léns
+        create_email_domain_block: Búa til útilokun tölvupóstléns
         create_ip_block: Búa til IP-reglu
         create_unavailable_domain: Útbúa lén sem ekki er tiltækt
+        create_user_role: Útbúa hlutverk
         demote_user: Lækka notanda í tign
         destroy_announcement: Eyða tilkynningu
+        destroy_canonical_email_block: Eyða útilokunarblokk tölvupósts
         destroy_custom_emoji: Eyða sérsniðnu tjáningartákni
         destroy_domain_allow: Eyða léni leyft
-        destroy_domain_block: Eyða léni bannað
-        destroy_email_domain_block: Eyða tölvupóstfangi bannað
+        destroy_domain_block: Eyða útilokun léns
+        destroy_email_domain_block: Eyða útilokun tölvupóstléns
+        destroy_instance: Henda léni
         destroy_ip_block: Eyða IP-reglu
-        destroy_status: Eyða stöðufærslu
+        destroy_status: Eyða færslu
         destroy_unavailable_domain: Eyða léni sem ekki er tiltækt
+        destroy_user_role: Eyða hlutverki
         disable_2fa_user: Gera tveggja-þátta auðkenningu óvirka
         disable_custom_emoji: Gera sérsniðið tjáningartákn óvirkt
         disable_sign_in_token_auth_user: Gera óvirka auðkenningu með teikni í tölvupósti fyrir notandann
@@ -255,42 +205,56 @@ is:
         enable_user: Virkja notanda
         memorialize_account: Gera aðgang að minningargrein
         promote_user: Hækka notanda í tign
+        reject_appeal: Hafna áfrýjun
+        reject_user: Hafna notanda
         remove_avatar_user: Fjarlægja auðkennismynd
         reopen_report: Enduropna kæru
+        resend_user: Endursenda staðfestingarpóst
         reset_password_user: Endurstilla lykilorð
         resolve_report: Leysa kæru
         sensitive_account: Merkja myndefni á aðgangnum þínum sem viðkvæmt
         silence_account: Hylja notandaaðgang
-        suspend_account: Setja notandaaðgang í bið
+        suspend_account: Frysta notandaaðgang
         unassigned_report: Aftengja úthlutun kæru
+        unblock_email_account: Leyfa tölvupóstfang
         unsensitive_account: Afmerkja myndefni á aðgangnum þínum sem viðkvæmt
         unsilence_account: Hætta að hylja notandaaðgang
-        unsuspend_account: Taka notandaaðgang úr bið
+        unsuspend_account: Taka notandaaðgang úr frysti
         update_announcement: Uppfæra tilkynningu
         update_custom_emoji: Uppfæra sérsniðið tjáningartákn
         update_domain_block: Uppfæra útilokun léns
-        update_status: Uppfæra stöðufærslu
+        update_ip_block: Uppfæra reglu IP-vistfangs
+        update_status: Uppfæra færslu
+        update_user_role: Uppfæra hlutverk
       actions:
+        approve_appeal_html: "%{name} samþykkti áfrýjun á ákvörðun umsjónarmanns frá %{target}"
+        approve_user_html: "%{name} samþykkti nýskráningu frá %{target}"
         assigned_to_self_report_html: "%{name} úthlutaði kæru %{target} til sín"
         change_email_user_html: "%{name} breytti tölvupóstfangi fyrir notandann %{target}"
+        change_role_user_html: "%{name} breytti hlutverki %{target}"
         confirm_user_html: "%{name} staðfesti tölvupóstfang fyrir notandann %{target}"
         create_account_warning_html: "%{name} sendi aðvörun til %{target}"
         create_announcement_html: "%{name} útbjó nýja tilkynningu %{target}"
+        create_canonical_email_block_html: "%{name} útilokaði tölvupóst með tætigildið %{target}"
         create_custom_emoji_html: "%{name} sendi inn nýtt tjáningartákn %{target}"
         create_domain_allow_html: "%{name} leyfði skýjasamband með léninu %{target}"
         create_domain_block_html: "%{name} útilokaði lénið %{target}"
         create_email_domain_block_html: "%{name} útilokaði póstlénið %{target}"
         create_ip_block_html: "%{name} útbjó reglu fyrir IP-vistfangið %{target}"
         create_unavailable_domain_html: "%{name} stöðvaði afhendingu til lénsins %{target}"
+        create_user_role_html: "%{name} útbjó %{target} hlutverk"
         demote_user_html: "%{name} lækkaði notandann %{target} í tign"
         destroy_announcement_html: "%{name} eyddi tilkynninguni %{target}"
-        destroy_custom_emoji_html: "%{name} henti út tjáningartákninu %{target}"
+        destroy_canonical_email_block_html: "%{name} tók af útilokun á tölvupósti með tætigildið %{target}"
+        destroy_custom_emoji_html: "%{name} eyddi emoji-tákni %{target}"
         destroy_domain_allow_html: "%{name} bannaði skýjasamband með léninu %{target}"
         destroy_domain_block_html: "%{name} aflétti útilokun af léninu %{target}"
         destroy_email_domain_block_html: "%{name} aflétti útilokun af póstléninu %{target}"
+        destroy_instance_html: "%{name} henti léninu %{target}"
         destroy_ip_block_html: "%{name} eyddi reglu fyrir IP-vistfangið %{target}"
-        destroy_status_html: "%{name} fjarlægði stöðufærslu frá %{target}"
+        destroy_status_html: "%{name} fjarlægði færslu frá %{target}"
         destroy_unavailable_domain_html: "%{name} hóf aftur afhendingu til lénsins %{target}"
+        destroy_user_role_html: "%{name} eyddi hlutverki %{target}"
         disable_2fa_user_html: "%{name} gerði kröfu um tveggja-þátta innskráningu óvirka fyrir notandann %{target}"
         disable_custom_emoji_html: "%{name} gerði tjáningartáknið %{target} óvirkt"
         disable_sign_in_token_auth_user_html: "%{name} gerði óvirka auðkenningu með teikni í tölvupósti fyrir %{target}"
@@ -300,22 +264,28 @@ is:
         enable_user_html: "%{name} gerði innskráningu virka fyrir notandann %{target}"
         memorialize_account_html: "%{name} breytti notandaaðgangnum %{target} í minningargreinarsíðu"
         promote_user_html: "%{name} hækkaði notandann %{target} í tign"
+        reject_appeal_html: "%{name} hafnaði áfrýjun á ákvörðun umsjónarmanns frá %{target}"
+        reject_user_html: "%{name} hafnaði nýskráningu frá %{target}"
         remove_avatar_user_html: "%{name} fjarlægði auðkennismynd af %{target}"
         reopen_report_html: "%{name} enduropnaði kæru %{target}"
+        resend_user_html: "%{name} endursendi staðfestingarpóst vegna %{target}"
         reset_password_user_html: "%{name} endurstillti lykilorð fyrir notandann %{target}"
         resolve_report_html: "%{name} leysti kæru %{target}"
         sensitive_account_html: "%{name} merkti myndefni frá %{target} sem viðkvæmt"
         silence_account_html: "%{name} þaggaði niður í aðgangnum %{target}"
-        suspend_account_html: "%{name} setti notandaaðganginn %{target} í bið"
+        suspend_account_html: "%{name} setti notandaaðganginn %{target} í frysti"
         unassigned_report_html: "%{name} fjarlægði úthlutun af kæru %{target}"
+        unblock_email_account_html: "%{name} opnaði á tölvupóstfangið %{target}"
         unsensitive_account_html: "%{name} tók merkinguna viðkvæmt af myndefni frá %{target}"
         unsilence_account_html: "%{name} hætti að hylja notandaaðganginn %{target}"
-        unsuspend_account_html: "%{name} tók notandaaðganginn %{target} úr bið"
+        unsuspend_account_html: "%{name} tók notandaaðganginn %{target} úr frysti"
         update_announcement_html: "%{name} uppfærði tilkynningu %{target}"
         update_custom_emoji_html: "%{name} uppfærði tjáningartáknið %{target}"
-        update_domain_block_html: "%{name} uppfærði lénalás fyrir %{target}"
-        update_status_html: "%{name} uppfærði stöðufærslu frá %{target}"
-      deleted_status: "(eydd stöðufærsla)"
+        update_domain_block_html: "%{name} uppfærði útilokun lénsins %{target}"
+        update_ip_block_html: "%{name} breytti reglu fyrir IP-vistfangið %{target}"
+        update_status_html: "%{name} uppfærði færslu frá %{target}"
+        update_user_role_html: "%{name} breytti hlutverki %{target}"
+      deleted_account: eyddur notandaaðgangur
       empty: Engar atvikaskrár fundust.
       filter_by_action: Sía eftir aðgerð
       filter_by_user: Sía eftir notanda
@@ -354,11 +324,12 @@ is:
       enable: Virkja
       enabled: Virkt
       enabled_msg: Tókst að gera þetta tjáningartákn virkt
-      image_hint: PNG allt að 50KB
+      image_hint: PNG eða GIF allt að %{size}
       list: Listi
       listed: Skráð
       new:
         title: Bæta við nýju sérsniðnu tjáningartákni
+      no_emoji_selected: Engum táknum var breytt þar sem engin voru valin
       not_permitted: Þú hefur ekki réttindi til að framkvæma þessa aðgerð
       overwrite: Skrifa yfir
       shortcode: Stuttkóði
@@ -371,13 +342,41 @@ is:
       updated_msg: Tókst að uppfæra tjáningartákn!
       upload: Senda inn
     dashboard:
+      active_users: virkir notendur
+      interactions: aðgerðir
+      media_storage: Geymsla myndefnis
+      new_users: nýir notendur
+      opened_reports: kærur opnaðar
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> áfrýjun í bið"
+        other: "<strong>%{count}</strong> áfrýjanir í bið"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> kæra í bið"
+        other: "<strong>%{count}</strong> kærur í bið"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> myllumerki í bið"
+        other: "<strong>%{count}</strong> myllumerki í bið"
+      pending_users_html:
+        one: "<strong>%{count}</strong> notandi í bið"
+        other: "<strong>%{count}</strong> notendur í bið"
+      resolved_reports: kærur leystar
       software: Hugbúnaður
+      sources: Uppruni nýskráninga
       space: Notkun geymslurýmis
       title: Stjórnborð
+      top_languages: Virkustu tungumál
+      top_servers: Virkustu netþjónar
+      website: Vefsvæði
+    disputes:
+      appeals:
+        empty: Engar áfrýjanir fundust.
+        title: Áfrýjanir
     domain_allows:
       add_new: Setja lén á lista yfir leyft
       created_msg: Það tókst að setja lénið á lista yfir leyft
       destroyed_msg: Lénið hefur verið fjarlægt af lista yfir leyft
+      export: Flytja út
+      import: Flytja inn
       undo: Fjarlægja af lista yfir leyft
     domain_blocks:
       add_new: Bæta við nýrri útilokun á léni
@@ -385,18 +384,23 @@ is:
       destroyed_msg: Útilokun léns hefur verið aflétt
       domain: Lén
       edit: Breyta útilokun léns
+      existing_domain_block: Þú hefur þegar gert kröfu um strangari takmörk fyrir %{name}.
       existing_domain_block_html: Þú ert þegar búin/n að setja strangari takmörk á %{name}, þú þarft fyrst að <a href="%{unblock_url}">aflétta útilokun</a> á því.
+      export: Flytja út
+      import: Flytja inn
       new:
         create: Búa til útilokun
         hint: Útilokun lénsins mun ekki koma í veg fyrir gerð aðgangsfærslna í gagnagrunninum, en mun afturvirkt og sjálfvirkt beita sérstökum umsjónaraðferðum á þessa aðganga.
         severity:
-          desc_html: "<strong>Hylja</strong> mun gera færslur á notandaaðgangnum ósýnilegar öllum þeim sem ekki eru að fylgjast með þeim. <strong>Setja í bið</strong> mun fjarlægja allt efni á notandaaðgangnum, myndgögn og gögn á notandasniði. Notaðu <strong>Ekkert</strong> ef þú ætlar bara að hafna margmiðlunarskrám."
+          desc_html: "<strong>Takmörk</strong> mun gera færslur frá aðgöngum á þessu léni ósýnilegar fyrir þeim sem ekki eru að fylgjast með viðkomandi. <strong>Frysta</strong> mun fjarlægja allt efni, myndgögn og gögn af notandasniði frá aðgöngum á þessu léni af netþjóninum þínum. Notaðu <strong>Ekkert</strong> ef þú vilt bara hafna gagnaskrám."
           noop: Ekkert
-          silence: Hylja
-          suspend: Setja í bið
+          silence: Takmörk
+          suspend: Frysta
         title: Ný útilokun á léni
+      no_domain_block_selected: Engum útilokunum léna var breytt þar sem ekkert var valið
+      not_permitted: Þú hefur ekki réttindi til að framkvæma þessa aðgerð
       obfuscate: Gera heiti léns ólæsilegt
-      obfuscate_hint: Gera heiti léns ólæsilegt að hluta í listanum ef auglýsing er virk fyrir lista yfir takmarkanir léna
+      obfuscate_hint: Gera heiti léns ólæsilegt að hluta í listanum ef auglýsing yfir takmarkanir léna er virk
       private_comment: Einkaathugasemd
       private_comment_hint: Athugasemd um þessa útilokun á léni til innanhússnotkunar fyrir umsjónarmenn.
       public_comment: Opinber athugasemd
@@ -405,34 +409,41 @@ is:
       reject_media_hint: Fjarlægir staðværar myndefnisskrár úr geymslu og neitar framvegis að sækja neinar slíkar. Skiptir ekki máli fyrir biðstöður
       reject_reports: Hafna kærum
       reject_reports_hint: Hunsa allar kærur frá þessu léni. Skiptir ekki máli fyrir biðstöður
-      rejecting_media: hafna myndskrám
-      rejecting_reports: hafna kærum
-      severity:
-        silence: hulið
-        suspend: í bið
-      show:
-        affected_accounts:
-          one: Einn notandaaðgangur í gagnagrunninum kemur við sögu
-          other: "%{count} notendaaðgangar í gagnagrunninum koma við sögu"
-        retroactive:
-          silence: Hætta að hylja viðkomandi notendaaðganga frá þessu léni
-          suspend: Taka úr bið viðkomandi notendaaðganga frá þessu léni
-        title: Afturkalla útilokun á léni fyrir %{domain}
-        undo: Afturkalla
       undo: Afturkalla útilokun á léni
       view: Skoða útilokun á léni
     email_domain_blocks:
       add_new: Bæta við nýju
-      created_msg: Tókst að bæta póstléni á lista yfir bannað
+      attempts_over_week:
+        one: "%{count} tilraun síðustu viku"
+        other: "%{count} tilraunir til nýskráningar í síðustu viku"
+      created_msg: Tókst að útiloka póstlén
       delete: Eyða
-      destroyed_msg: Tókst að eyða póstléni af lista yfir bannað
+      dns:
+        types:
+          mx: MX-færsla
       domain: Lén
-      empty: Engin tölvupóstlén eru á bannlista.
-      from_html: frá %{domain}
       new:
         create: Bæta við léni
-        title: Ný færsla á bannlista fyrir tölvupóstföng
-      title: Bannlisti yfir tölvupóstföng
+        resolve: Leysa lén
+        title: Útiloka nýtt tölvupóstlén
+      no_email_domain_block_selected: Engum útilokunum tölvupóstléna var breytt þar sem ekkert var valið
+      resolved_dns_records_hint_html: Heiti lénsins vísar til eftirfarandi MX-léna, sem bera endanlega ábyrgð á að tölvupóstur skili sér. Útilokun á MX-léni mun koma í veg fyrir nýskráningar með hverju því tölvupóstfangi sem notar sama MX-lén, jafnvel þótt sýnilega lénsheitið sé frábrugðið. <strong>Farðu varlega svo þú útilokir ekki algengar tölvupóstþjónustur.</strong>
+      resolved_through_html: Leyst í gegnum %{domain}
+      title: Útilokuð tölvupóstlén
+    export_domain_allows:
+      new:
+        title: Flytja inn leyfileg lén
+      no_file: Engin skrá valin
+    export_domain_blocks:
+      import:
+        description_html: Þú ert við það að flytja inn lista af lénum til lokunar. Vinsamlegeast farið vandlega yfir þennan lista, sérstaklega ef þú ert ekki höfundur hans.
+        existing_relationships_warning: Fyrirliggjandi fylgjendavensl
+        private_comment_description_html: 'Tið að aðstoða þig við að rekja hvaðan lokkanir koma, innfluttar lokanir verða búnar til með eftirfarndi athugasemd: <q>%{comment}</q>'
+        private_comment_template: Flutt inn frá %{source} þann %{date}
+        title: Flytja inn útilokanir léna
+      new:
+        title: Flytja inn útilokanir léna
+      no_file: Engin skrá valin
     follow_recommendations:
       description_html: "<strong>Að fylgja meðmælum hjálpar nýjum notendum að finna áhugavert efni á einfaldan máta</strong>. Þegar notandi hefur ekki átt í nægilegum samskiptum við aðra til að vera farinn að móta sér skoðanir á hverju hann vill fylgjast með, er mælt með að fylgjast með þessum aðgöngum. Þeir eru endurreiknaðir daglega út frá blöndu þeirra aðganga sem eru með hvað mestri þáttöku í umræðum og mesta fylgjendafjölda út frá hverju tungumáli."
       language: Fyrir tungumálið
@@ -442,25 +453,53 @@ is:
       title: Fylgja meðmælum
       unsuppress: Endurheimta að fylgja meðmælum
     instances:
+      availability:
+        description_html:
+          one: Ef afhending til lénsins mistekst í <strong>%{count} dag</strong>, verður ekki reynt aftur að afhenda til lénsins nema ef afhending <em>frá</em> léninu berst.
+          other: Ef afhending til lénsins mistekst í <strong>%{count} daga</strong>, verður ekki reynt aftur að afhenda til lénsins nema ef afhending <em>frá</em> léninu berst.
+        failure_threshold_reached: Hámarki misheppnaðra tilrauna náð þann %{date}.
+        failures_recorded:
+          one: Misheppnaðar tilraunir á %{count} degi.
+          other: Misheppnaðar tilraunir á %{count} mismunandi dögum.
+        no_failures_recorded: Engar misheppnaðar tilraunir á skrá.
+        title: Tiltækileiki
+        warning: Síðasta tilraun til að tengjast þessum netþjóni mistókst
       back_to_all: Allt
       back_to_limited: Takmarkað
       back_to_warning: Aðvörun
       by_domain: Lén
+      confirm_purge: Ertu viss um að þú viljir eyða gögnum endanlega frá þessu léni?
+      content_policies:
+        comment: Innri minnispunktur
+        description_html: Þú getur skilgreint stefnu varðandi efni sem verður beitt á alla aðganga frá þessu léni og öllum undirlénum þess.
+        policies:
+          reject_media: Hafna myndefni
+          reject_reports: Hafna kærum
+          silence: Takmörk
+          suspend: Frysta
+        policy: Stefna
+        reason: Opinber ástæða
+        title: Stefnur varðandi efni
+      dashboard:
+        instance_accounts_dimension: Aðgangar sem mest er fylgst með
+        instance_accounts_measure: geymdir aðgangar
+        instance_followers_measure: fylgjendur okkar þar
+        instance_follows_measure: fylgjendur þeirra hér
+        instance_languages_dimension: Vinsælustu tungumál
+        instance_media_attachments_measure: geymd myndefnisviðhengi
+        instance_reports_measure: kærur um þá
+        instance_statuses_measure: geymdar færslur
       delivery:
         all: Allt
         clear: Hreinsa afhendingarvillur
+        failing: Mistekst
         restart: Endurræsa afhendingu
         stop: Stöðva afhendingu
-        title: Afhending
         unavailable: Ekki tiltækt
-        unavailable_message: Afhending ekki möguleg
-        warning: Aðvörun
-        warning_message:
-          one: "%{count} dagur með villum í afhendingu"
-          other: "%{count} dagar með villum í afhendingu"
       delivery_available: Afhending er til taks
       delivery_error_days: Dagar með villum í afhendingu
       delivery_error_hint: Ef afhending er ekki möguleg í %{count} daga, verður það sjálfkrafa merkt sem óafhendanlegt.
+      destroyed_msg: Gögn frá %{domain} bíða núna eftir að vera eytt innan skamms.
       empty: Engin lén fundust.
       known_accounts:
         one: "%{count} þekktur notandaaðgangur"
@@ -471,12 +510,15 @@ is:
         title: Umsjón
       private_comment: Einkaathugasemd
       public_comment: Opinber athugasemd
-      title: Samband
-      total_blocked_by_us: Útilokaðir af okkur
+      purge: Henda
+      purge_description_html: Ef þú heldur að þetta lén sé farið endanlega af netinu, geturðu eytt öllum færslum aðganga og tengdum gögnum frá þessu léni úr gagnageymslum þínum. Þetta gæti tekið þó nokkra stund.
+      title: Netþjónasambönd
+      total_blocked_by_us: Útilokað af okkur
       total_followed_by_them: Fylgt af þeim
       total_followed_by_us: Fylgt af okkur
       total_reported: Kærur um þá
       total_storage: Myndaviðhengi
+      totals_time_period_hint_html: Samtölurnar sem birtar eru hér fyrir neðan innihalda gögn frá upphafi.
     invites:
       deactivate_all: Gera allt óvirkt
       filter:
@@ -500,18 +542,16 @@ is:
         title: Búa til nýja IP-reglu
       no_ip_block_selected: Engum IP-reglum var breytt því ekkert var valið
       title: IP-reglur
-    pending_accounts:
-      title: Notendaaðgangar í bið (%{count})
     relationships:
       title: Vensl %{acct}
     relays:
       add_new: Bæta við nýjum endurvarpa
       delete: Eyða
-      description_html: "<strong>Endurvarpi í skýjasambandi</strong> er milliþjónn sem skiptist á miklu magni opinberra tísta við aðra þjóna sem eru áskrifendur að honum og birta sín tíst á honum. <strong>Þetta getur hjálpað litlum og meðalstórum vefþjónum að uppgötva efni úr skýjasambandinu</strong>, sem annars myndi krefjast þess að staðværir notendur fylgist handvirkt með öðru fólki á fjartengdum vefþjónum."
+      description_html: "<strong>Endurvarpi í skýjasambandi</strong> er milliþjónn sem skiptist á miklu magni opinberra færslna við aðra þjóna sem eru áskrifendur að honum og birta sín tíst á honum. <strong>Þetta getur hjálpað litlum og meðalstórum vefþjónum að uppgötva efni úr skýjasambandinu</strong>, sem annars myndi krefjast þess að staðværir notendur fylgist handvirkt með öðru fólki á fjartengdum vefþjónum."
       disable: Gera óvirkt
       disabled: Óvirkt
       enable: Virkja
-      enable_hint: Ef þetta er einu sinni virkjað, mun vefþjónninn þinn gerast áskrifandi að öllum opinberum tístum frá þessum endurvarpa og byrja að senda sín eigin opinberu tíst til hans.
+      enable_hint: Ef þetta er einu sinni virkjað, mun vefþjónninn þinn gerast áskrifandi að öllum opinberum færslum frá þessum endurvarpa og byrja að senda sín eigin opinberu tíst til hans.
       enabled: Virkt
       inbox_url: Slóð endurvarpa
       pending: Bíð eftir samþykki endurvarpa
@@ -528,39 +568,121 @@ is:
         notes:
           one: "%{count} minnispunktur"
           other: "%{count} minnispunktar"
-        reports:
-          one: "%{count} skýrsla"
-          other: "%{count} skýrslur"
+      action_log: Atvikaskrá
       action_taken_by: Aðgerð framkvæmd af
+      actions:
+        delete_description_html: Kærðum færslum verður eytt og refsing skráð svo þú eigir auðveldara með að bregðast við í framtíðinni verði um fleiri brot að ræða frá sama notandaaðgangi.
+        mark_as_sensitive_description_html: Myndefnið í kærðu færslunum verður merkt sem viðkvæmt og refsing verður skráð til minnis fyrir viðbrögð gegn mögulegum framtíðarbrotum frá sama notandaaðgangi.
+        other_description_html: Skoðaðu fleir valkosti fyrir stjórnun á hegðun notandaaðgangsins og til að stýra samskiptum við kærðan notandaaðgang.
+        resolve_description_html: Til engra aðgerða verður tekið gagnvart kærðum færslum, engin refsing verður skráð og kærunni verður lokað.
+        silence_description_html: Notandaaðgangurinn verður einungis sýnilegur þeim sem þegar fylgjast með honum eða sem fletta honum upp handvirkt, sem takmarkar útbreiðslu efnis verulega. Er alltaf hægt að afturkalla.
+        suspend_description_html: Notandaaðgangurinn og allt efni á honum mun verða óaðgengilegt og á endanum eytt út. Samskipti við aðganginn verða ekki möguleg. Hægt að afturkalla innan 30 daga.
+      actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn <strong>Ruslpóstur</strong> sé valinn.
+      add_to_report: Bæta fleiru í kæru
       are_you_sure: Ertu viss?
       assign_to_self: Úthluta mér
       assigned: Úthlutaður umsjónarmaður
+      by_target_domain: Lén kærða notandaaðgangsins
+      category: Flokkur
+      category_description_html: Ástæðan fyrir því að þessi notandaaðgangur og/eða efni hans var kært mun verða tiltekin í samskiptum við kærðan notandaaðgang
       comment:
         none: Ekkert
+      comment_description_html: 'Til að gefa nánari upplýsingar skrifaði %{name}:'
       created_at: Tilkynnt
+      delete_and_resolve: Eyða færslum
       forwarded: Áframsent
       forwarded_to: Áframsent á %{domain}
       mark_as_resolved: Merkja sem leyst
+      mark_as_sensitive: Merkja sem viðkvæmt
       mark_as_unresolved: Merkja sem óleyst
+      no_one_assigned: Enginn
       notes:
         create: Bæta við minnispunkti
         create_and_resolve: Leysa með minnispunkti
         create_and_unresolve: Enduropna með minnispunkti
         delete: Eyða
         placeholder: Lýstu til hvaða aðgerða hefur verið gripið eða uppfærðu inn aðrar tengdar upplýsingar...
+        title: Minnispunktar
+      notes_description_html: Skoðaðu og skrifaðu minnispunkta til annarra stjórnenda og sjálfs þín
+      quick_actions_description_html: 'Beittu flýtiaðgerð eða skrunaðu niður til að skoða kært efni:'
+      remote_user_placeholder: fjartengda notandann frá %{instance}
       reopen: Enduropna kæru
       report: 'Kæra #%{id}'
       reported_account: Kærður notandaaðgangur
       reported_by: Kært af
       resolved: Leyst
       resolved_msg: Það tókst að leysa kæruna!
+      skip_to_actions: Sleppa og fara í aðgerðir
       status: Staða
-      target_domain: Lén kærða notandaaðgangsins
+      statuses: Kært efni
+      statuses_description_html: Óviðeigandi efni verður tiltekið í samskiptum við kærðan notandaaðgang
       target_origin: Uppruni kærða notandaaðgangsins
       title: Kærur
       unassign: Aftengja úthlutun
       unresolved: Óleyst
       updated_at: Uppfært
+      view_profile: Skoða notandasnið
+    roles:
+      add_new: Bæta við hlutverki
+      assigned_users:
+        one: "%{count} notandi"
+        other: "%{count} notendur"
+      categories:
+        administration: Stjórnun
+        devops: DevOps
+        invites: Boðsgestir
+        moderation: Umsjón
+        special: Sérstakt
+      delete: Eyða
+      description_html: Með <strong>hlutverkum notenda</strong> geturðu sérsniðið að hvaða aðgerðum og hvaða svæðum í Mastodon notendurnir þínir hafa aðgang.
+      edit: Breyta hlutverki fyrir '%{name}'
+      everyone: Sjálfgefnar heimildir
+      everyone_full_description_html: Þetta er <strong>grunnhlutverk</strong> sem <strong>allir notendur</strong> fá, líka þeir sem ekki hafa fengið neitt sérstakt hlutverk. Öll önnur hlutverk erfa heimildir frá þessu.
+      permissions_count:
+        one: "%{count} heimild"
+        other: "%{count} heimildir"
+      privileges:
+        administrator: Stjórnandi
+        administrator_description: Notendur með þessa heimild fara framhjá öllum öðrum heimildum
+        delete_user_data: Eyða gögnum notanda
+        delete_user_data_description: Leyfir notendum að eyða gögnum annarra notenda án tafar
+        invite_users: Bjóða notendum
+        invite_users_description: Leyfir notendum að bjóða nýju fólki inn á netþjóninn
+        manage_announcements: Sýsla með tilkynningar
+        manage_announcements_description: Leyfir notendum að sýsla með tilkynningar á netþjóninum
+        manage_appeals: Sýsla með áfrýanir
+        manage_appeals_description: Leyfir notendum að yfirfara áfrýjanir vegna aðgerða umsjónarfólks
+        manage_blocks: Sýsla með útilokanir
+        manage_blocks_description: Leyfir notendum að loka á tölvupóstþjónustur og IP-vistföng
+        manage_custom_emojis: Sýsla með sérsniðin tjáningartákn
+        manage_custom_emojis_description: Leyfir notendum að sýsla með sérsniðin tjáningartákn á netþjóninum
+        manage_federation: Sýsla með netþjónasambönd
+        manage_federation_description: Leyfir notendum að loka á eða leyfa samþættingu við önnur lén (federation) og stýra afhendingu skilaboða
+        manage_invites: Sýsla með boðsgesti
+        manage_invites_description: Leyfir notendum að vafra um og gera boðstengla óvirka
+        manage_reports: Sýsla með kærur
+        manage_reports_description: Leyfir notendum að yfirfara kærur og framkvæma umsýsluaðgerðir sem byggjast á þeim
+        manage_roles: Sýsla með hlutverk
+        manage_roles_description: Leyfir notendum að sýsla með hlutverk og úthluta hlutverkum sem eru réttminni en þeirra eigið
+        manage_rules: Sýsla með reglur
+        manage_rules_description: Leyfir notendum að breyta reglum á netþjóninum
+        manage_settings: Sýsla með stillingar
+        manage_settings_description: Leyfir notendum að breyta stillingum vefsvæðisins
+        manage_taxonomies: Sýsla með vægi efnis
+        manage_taxonomies_description: Leyfir notendum að yfirfara vinsælt efni og uppfæra stillingar myllumerkja
+        manage_user_access: Sýsla með notendaaðgang
+        manage_user_access_description: Leyfir notendum að gera tveggja-þátta auðkenningu annarra notenda óvirka, breyta tölvupóstfangi þeirra og endurstilla lykilorð
+        manage_users: Sýsla með notendur
+        manage_users_description: Leyfir notendum að sýsla með nánari upplýsingar um aðra notendur og framkvæma umsýsluaðgerðir gagnvart þeim
+        manage_webhooks: Sýsla með Webhook-vefkrækjur
+        manage_webhooks_description: Leyfir notendum að setja upp webhook-vefkrækjur vagna stjórnunartengdra atburða
+        view_audit_log: Skoða atvikaskráningu
+        view_audit_log_description: Leyfir notendum að skoða feril stjórnunaraðgerða á netþjóninum
+        view_dashboard: Skoða stjórnborð
+        view_dashboard_description: Leyfir notendum að skoða stjórnborðið og sjá ýmsar mælingar
+        view_devops: DevOps
+        view_devops_description: Leyfir notendum að skoða Sidekiq og pgHero stjórnborð
+      title: Hlutverk
     rules:
       add_new: Skrá reglu
       delete: Eyða
@@ -569,142 +691,201 @@ is:
       empty: Engar reglur fyrir netþjón hafa ennþá verið skilgreindar.
       title: Reglur netþjónsins
     settings:
-      activity_api_enabled:
-        desc_html: Fjöldi staðværra stöðufærslna, virkra notenda og nýskráninga í vikulegum skömmtum
-        title: Birta samantektartölfræði um virkni notanda
-      bootstrap_timeline_accounts:
-        desc_html: Aðskildu mörg notendanöfn með kommum. Einungis staðværir og ólæstir aðgangar virka. Þegar þetta er autt er sjálgefið miðað við alla staðværa stjórnendur.
-        title: Sjálfgefnar fylgnistillingar fyrir nýja notendur
-      contact_information:
-        email: Fyrirtækistölvupóstur
-        username: Notandanafn tengiliðar
-      custom_css:
-        desc_html: Breyttu útlitinu með CSS-skilgreiningum sem hlaðið er inn á hverri síðu
-        title: Sérsniðið CSS
+      about:
+        manage_rules: Sýsla með reglur netþjónsins
+        preamble: Gefðu nánari upplýsingar um hvernig þessi netþjónn er rekinn, hvernig umsjón fer fram með efni á honum eða hann fjármagnaður.
+        rules_hint: Það er sérstakt svæði með þeim reglum sem ætlast er til að notendur þínir fari eftir.
+        title: Um hugbúnaðinn
+      appearance:
+        preamble: Sérsníddu vefviðmót Mastodon.
+        title: Útlit
+      branding:
+        preamble: Útlitsleg einkenni aðgreina netþjóninn þinn frá öðrum netþjónum á netkerfinu. Þessar upplýsingar geta birst á margvíslegum stöðum, eins og til dæmis í vefviðmóti Mastodon, einstökum forritum, í forskoðun tengla á öðrum vefsvæðum og innan samskiptaforrita, svo eitthvað sé talið. Þess vegna er vest að þessar upplýsingar séu skýrar, stuttar og tæmandi.
+        title: Útlitsleg aðgreining
+      content_retention:
+        preamble: Stýrðu hvernig efni frá notendum sé geymt í Mastodon.
+        title: Geymsla efnis
       default_noindex:
         desc_html: Hefur áhrif á alla þá notendur sem ekki hafa breytt þessum stillingum sjálfir
         title: Sjálfgefið láta notendur afþakka atriðaskráningu í leitarvélum
+      discovery:
+        follow_recommendations: Meðmæli um að fylgjast með
+        preamble: Að láta áhugavert efni koma skýrt fram er sérstaklega mikilvægt til að nálgast nýja notendur sem ekki þekkja neinn sem er á Mastodon. Stýrðu því hvernig hinir ýmsu eiginleikar við uppgötvun efnis virka á netþjóninum þínum.
+        profile_directory: Notendamappa
+        public_timelines: Opinberar tímalínur
+        title: Uppgötvun
+        trends: Vinsælt
       domain_blocks:
         all: Til allra
         disabled: Til engra
-        title: Birta útilokanir á lénum
         users: Til innskráðra staðværra notenda
-      domain_blocks_rationale:
-        title: Birta röksemdafærslu
-      hero:
-        desc_html: Birt á forsíðunni. Mælt með að hún sé a.m.k. 600×100 mynddílar. Þegar þetta er ekki stillt, er notuð smámynd netþjónsins
-        title: Aðalmynd
-      mascot:
-        desc_html: Birt á ýmsum síðum. Mælt með að hún sé a.m.k. 293×205 mynddílar. Þegar þetta er ekki stillt, er notuð smámynd netþjónsins
-        title: Mynd af lukkudýri
-      peers_api_enabled:
-        desc_html: Lénaheiti sem þessi netþjónn hefur rekist á í skýjasambandinu (samtengdum vefþjónum - fediverse)
-        title: Birta lista yfir uppgötvaða netþjóna
-      preview_sensitive_media:
-        desc_html: Forskoðun tengla á önnur vefsvæði mun birta smámynd jafnvel þótt myndefnið sé merkt sem viðkvæmt
-        title: Birta viðkvæmt myndefni í OpenGraph-forskoðun
-      profile_directory:
-        desc_html: Leyfa að hægt sé að finna notendur
-        title: Virkja notandasniðamöppu
       registrations:
-        closed_message:
-          desc_html: Birt á forsíðu þegar lokað er fyrir nýskráningar. Þú getur notað HTML-einindi
-          title: Skilaboð vegna lokunar á nýskráningu
-        deletion:
-          desc_html: Leyfa öllum að eyða aðgangnum sínum
-          title: Opna eyðingu á notandaaðgangi
-        min_invite_role:
-          disabled: Enginn
-          title: Leyfa boð frá
-        require_invite_text:
-          desc_html: Þegar nýskráningar krefjast handvirks samþykkis, skal gera "Hvers vegna viltu taka þátt?" boðstexta að skyldu fremur en valkvæðan
-          title: Krefja nýja notendur um að fylla út boðstexta
+        preamble: Stýrðu því hverjir geta útbúið notandaaðgang á netþjóninum þínum.
+        title: Nýskráningar
       registrations_mode:
         modes:
           approved: Krafist er samþykkt nýskráningar
           none: Enginn getur nýskráð sig
           open: Allir geta nýskráð sig
-        title: Nýskráningarhamur
-      show_known_fediverse_at_about_page:
-        desc_html: Þegar þetta er óvirkt, takmarkast opinbera tímalínan sem tengt er í af upphafssíðunni við að birta einungis staðvært efni (af sama vefþjóni)
-        title: Hafa með efni úr skýjasambandi á síðu fyrir óauðkennda opinbera tímalínu
-      show_staff_badge:
-        desc_html: Sýna starfsmannamerki á síðu notandans
-        title: Sýna starfsmannamerki
-      site_description:
-        desc_html: Kynningarmálsgrein í API. Lýstu því hvað það er sem geri þennan Mastodon-þjón sérstakan, auk annarra mikilvægra upplýsinga. Þú getur notað HTML-einindi, sér í lagi <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
-        title: Lýsing á vefþjóni
-      site_description_extended:
-        desc_html: Góður staður fyrir siðareglur, almennt regluverk, leiðbeiningar og annað sem gerir netþjóninni þinn sérstakann. Þú getur notað HTML-einindi
-        title: Sérsniðnar ítarlegar upplýsingar
-      site_short_description:
-        desc_html: Birt á hliðarspjaldi og í lýsigögnum. Lýstu því hvað Mastodon gerir og hvað það er sem geri þennan vefþjón sérstakan, í einni málsgrein.
-        title: Stutt lýsing á netþjóninum
-      site_terms:
-        desc_html: Þú getur skrifað þína eigin persónuverndarstefnu, þjónustuskilmála eða annað lagatæknilegt. Þú getur notað HTML-einindi
-        title: Sérsniðnir þjónustuskilmálar
-      site_title: Heiti vefþjóns
-      thumbnail:
-        desc_html: Notað við forskoðun í gegnum OpenGraph og API-kerfisviðmót. Mælt með 1200×630 mynddílum
-        title: Smámynd vefþjóns
-      timeline_preview:
-        desc_html: Birta tengil í opinbera tímalínu á upphafssíðu og leyfa aðgang API-kerfisviðmóts að opinberri tímalínu án auðkenningar
-        title: Leyfa óauðkenndan aðgang að opinberri tímalínu
-      title: Stillingar vefsvæðis
-      trendable_by_default:
-        desc_html: Hefur áhrif á myllumerki sem ekki hafa áður verið gerð óleyfileg
-        title: Leyfa myllumerkjum að fara í umræðuna án þess að þau séu fyrst yfirfarin
-      trends:
-        desc_html: Birta opinberlega þau áður yfirförnu myllumerki sem eru núna í umræðunni
-        title: Myllumerki í umræðunni
+      title: Stillingar netþjóns
     site_uploads:
       delete: Eyða innsendri skrá
       destroyed_msg: Það tókst að eyða innsendingu á vefsvæði!
     statuses:
+      account: Höfundur
+      application: Forrit
       back_to_account: Fara aftur á síðu notandaaðgangsins
+      back_to_report: Til baka á kærusíðu
       batch:
-        delete: Eyða
-        nsfw_off: Merkja gögn sem ekki viðkvæm
-        nsfw_on: Merkja sem viðkvæmt
+        remove_from_report: Fjarlægja úr kæru
+        report: Kæra
       deleted: Eytt
-      failed_to_execute: Mistókst að keyra
+      favourites: Eftirlæti
+      history: Útgáfuferill
+      in_reply_to: Svarar til
+      language: Tungumál
       media:
         title: Myndefni
-      no_media: Ekkert myndefni
-      no_status_selected: Engum stöðufærslum var breytt þar sem engar voru valdar
-      title: Staða notendaaðganga
+      metadata: Lýsigögn
+      no_status_selected: Engum færslum var breytt þar sem engar voru valdar
+      open: Opna færslu
+      original_status: Upprunaleg færsla
+      reblogs: Endurbirtingar
+      status_changed: Færslu breytt
+      title: Færslur notandaaðgangs
+      trending: Vinsælt
+      visibility: Sýnileiki
       with_media: Með myndefni
+    strikes:
+      actions:
+        delete_statuses: "%{name} eyddi færslum frá %{target}"
+        disable: "%{name} frysti aðganginn %{target}"
+        mark_statuses_as_sensitive: "%{name} merkti færslur frá %{target} sem viðkvæmar"
+        none: "%{name} sendi aðvörun til %{target}"
+        sensitive: "%{name} merkti efni frá %{target} sem viðkvæmt"
+        silence: "%{name} takmarkaði aðganginn %{target}"
+        suspend: "%{name} setti notandaaðganginn %{target} í frysti"
+      appeal_approved: Áfrýjað
+      appeal_pending: Áfrýjun í bið
     system_checks:
       database_schema_check:
         message_html: Það eru fyrirliggjandi yfirfærslur á gagnagrunnum. Keyrðu þær til að tryggja að forritið hegði sér eins og skyldi
+      elasticsearch_running_check:
+        message_html: Gat ekki tengst við Elasticsearch-leitina. Gakktu úr skugga um að hún sé í gangi, eða gerðu leit í öllum texta óvirka
+      elasticsearch_version_check:
+        message_html: 'Ósamhæfð útgáfa Elasticsearch-leitar: %{value}'
+        version_comparison: Elasticsearch %{running_version} er í gangi á meðan útgáfa %{required_version} er nauðsynleg
       rules_check:
         action: Sýsla með reglur netþjónsins
         message_html: Þú hefur ekki skilgreint neinar reglur fyrir netþjón.
       sidekiq_process_check:
         message_html: Ekkert Sidekiq-ferli er í gangi fyrir %{value} biðröð/biðraðir. Endilega athugaðu Sidekiq-uppsetninguna þína
     tags:
-      accounts_today: Einstök afnot í dag
-      accounts_week: Einstök afnot í þessari viku
-      breakdown: Samantekt á notkun dagsins eftir uppruna
-      last_active: Síðasta virkni
-      most_popular: Vinsælast
-      most_recent: Nýjast
-      name: Myllumerki
       review: Yfirfara stöðufærslu
-      reviewed: Yfirfarið
-      title: Myllumerki
-      trending_right_now: Í umræðunni nákvæmlega núna
-      unique_uses_today: "%{count} færslur í dag"
-      unreviewed: Ekki yfirfarið
       updated_msg: Það tókst að uppfæra stillingar myllumerkja
     title: Stjórnendur
+    trends:
+      allow: Leyfa
+      approved: Samþykkt
+      disallow: Ekki leyfa
+      links:
+        allow: Leyfa tengil
+        allow_provider: Leyfa útgefanda
+        description_html: Þetta eru tenglar/slóðir sem mikið er deilt af notendum sem netþjónninn þinn sér færslur frá. Þeir geta hjálpað notendunum þínu við að finna út hvað sé í gangi í heiminum. Engir tenglar birtast opinberlega fyrr en þú hefur samþykkt útgefanda þeirra. Þú getur líka leyft eða hafnað eintökum tenglum.
+        disallow: Ekki leyfa tengil
+        disallow_provider: Ekki leyfa útgefanda
+        no_link_selected: Engum tenglum var breytt þar sem engir voru valdir
+        publishers:
+          no_publisher_selected: Engum útgefendum var breytt þar sem engir voru valdir
+        shared_by_over_week:
+          one: Deilt af einum aðila síðustu vikuna
+          other: Deilt af %{count} aðilum síðustu vikuna
+        title: Vinsælir tenglar
+        usage_comparison: Deilt %{today} sinnum í dag, samanborið við %{yesterday} í gær
+      only_allowed: Aðeins leyfð
+      pending_review: Bíður eftir yfirlestri
+      preview_card_providers:
+        allowed: Tenglar frá þessum útgefanda geta verið með í vinsældum
+        description_html: Þetta eru lén þaðan sem tenglum er oftast deilt á netþjóninum þínum. Vinsældir tengla munu ekki aukast opinberlega nema lén þeirra sé samþykkt. Samþykki þitt (eða höfnun) nær einnig yfir undirlén.
+        rejected: Tenglar frá þessum útgefanda verða ekki með í vinsældum
+        title: Útgefendur
+      rejected: Hafnað
+      statuses:
+        allow: Leyfa færslu
+        allow_account: Leyfa höfund
+        description_html: Þetta eru færslur sem netþjónninn þinn veit að er víða deilt eða eru mikið sett í eftirlæti þessa stundina. Þær geta hjálpað nýjum sem eldri notendum þínum við að finna fleira fólk til að fylgjast með. Engar færslur birtast opinberlega fyrr en þú hefur samþykkt höfund þeirra og að viðkomandi höfundur leyfi að efni frá þeim sé notað í tillögur til annarra. Þú getur líka leyft eða hafnað eintökum færslum.
+        disallow: Ekki leyfa færslu
+        disallow_account: Ekki leyfa höfund
+        no_status_selected: Engum vinsælum færslum var breytt þar sem engar voru valdar
+        not_discoverable: Höfundur hefur ekki beðið um að vera finnanlegur
+        shared_by:
+          one: ShaDeilt eða gert að eftirlæti einu sinni
+          other: Deilt eða gert að eftirlæti %{friendly_count} sinnum
+        title: Vinsælar færslur
+      tags:
+        current_score: Núverandi stig %{score}
+        dashboard:
+          tag_accounts_measure: einstök tilvik
+          tag_languages_dimension: Vinsælustu tungumál
+          tag_servers_dimension: Vinsælustu netþjónar
+          tag_servers_measure: mismunandi netþjónar
+          tag_uses_measure: tilvik alls
+        description_html: Þetta eru myllumerki sem birtast núna í mjög mörgum færslum sem netþjónninn þinn sér. Þau geta hjálpað notendunum þínu við að finna út hvað sé mest í umræðunni hjá öðru fólki. Engin myllumerki birtast opinberlega fyrr en þú hefur samþykkt þau.
+        listable: Má stinga uppá
+        no_tag_selected: Engum merkjum var breytt þar sem engin voru valin
+        not_listable: Mun ekki vera stungið uppá
+        not_trendable: Mun ekki birtast í vinsældum
+        not_usable: Má ekki nota
+        peaked_on_and_decaying: Toppaði þann %{date}, núna dalandi
+        title: Vinsæl myllumerki
+        trendable: Má vera með í vinsældum
+        trending_rank: 'Vinsæl #%{rank}'
+        usable: Má nota
+        usage_comparison: Notað %{today} sinnum í dag, samanborið við %{yesterday} í gær
+        used_by_over_week:
+          one: Notað af einum aðila síðustu vikuna
+          other: Notað af %{count} aðilum síðustu vikuna
+      title: Tilhneiging
+      trending: Vinsælt
     warning_presets:
       add_new: Bæta við nýju
       delete: Eyða
       edit_preset: Breyta forstilltri aðvörun
       empty: Þú hefur ekki enn skilgreint neinar aðvaranaforstillingar.
       title: Sýsla með forstilltar aðvaranir
+    webhooks:
+      add_new: Bæta við endapunkti
+      delete: Eyða
+      description_html: "<strong>webhook-vefkrækja</strong> gerir Mastodon kleift að ýta <strong>rauntíma-tilkynningum</strong> um valda atburði til þinna eigin forrita, þannig að þau forrit getir <strong>sett sjálfvirk viðbrögð í gang</strong>."
+      disable: Gera óvirkt
+      disabled: Óvirkt
+      edit: Breyta endapunkti
+      empty: Þú ert ekki enn búin/n að stilla neina endapunkta á webhook-vefkrækjum.
+      enable: Virkja
+      enabled: Virkt
+      enabled_events:
+        one: 1 virkjaður atburður
+        other: "%{count} virkjaðir atburðir"
+      events: Atburðir
+      new: Ný webhook-vefkrækja
+      rotate_secret: Skipta um leyniteikn
+      secret: Leyniteikn undirritunar
+      status: Staða
+      title: Webhook-vefkrækjur
+      webhook: Webhook-vefkrækja
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: að eyða færslum viðkomandi
+        disable: að frysta aðgang viðkomandi
+        mark_statuses_as_sensitive: að merkja færslur frá þeim sem viðkvæmar
+        none: aðvörun
+        sensitive: að merkja efni á aðgangnum sem viðkvæmt
+        silence: að takmarka aðgang viðkomandi
+        suspend: að setja aðgang viðkomandi í frysti
+      body: "%{target} er að áfrýja ákvörðun umsjónarmanns tekinni af %{action_taken_by} frá %{date}, sem var %{type}. Viðkomandi skrifaði:"
+      next_steps: Þú getur samþykkt áfrýjunina til að afturkalla ákvörðun umsjónarmanns, eða hunsað hana.
+      subject: "%{username} er að áfrýja ákvörðun umsjónarmanns tekinni á %{instance}"
     new_pending_account:
       body: Nákvæmari upplýsingar um nýja notandaaðganginn eru hér fyrir neðan. Þú getur samþykkt eða hafnað þessari umsókn.
       subject: Nýr notandaaðgangur er kominn til yfirferðar á %{instance} (%{username})
@@ -712,9 +893,17 @@ is:
       body: "%{reporter} hefur kært %{target}"
       body_remote: Einhver frá %{domain} hefur kært %{target}
       subject: Ný kæra vegna %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Myllumerkið #%{name} er í umræðunni í dag, en hefur ekki verið yfirfarið áður. Það mun ekki verða birt opinberlega nema að þú samþykkir það, annars geturðu vistað eyðublaðið óbreytt og aldrei heyrt á þetta minnst framar.'
-      subject: Nýtt myllumerki er komið til yfirferðar á %{instance} (#%{name})
+    new_trends:
+      body: 'Eftirfarandi atriði þarfnast yfirferðar áður en hægt er að birta þau opinberlega:'
+      new_trending_links:
+        title: Vinsælir tenglar
+      new_trending_statuses:
+        title: Vinsælar færslur
+      new_trending_tags:
+        no_approved_tags: Það eru í augnablikinu engin samþykkt vinsæl myllumerki.
+        requirements: 'Hver af þessum tillögum gætu farið yfir samþykkta vinsæla myllumerkið númer #%{rank}, sem í augnablikinu er %{lowest_tag_name} með %{lowest_tag_score} stig'
+        title: Vinsæl myllumerki
+      subject: Nýtt vinsælt til yfirferðar á %{instance}
   aliases:
     add_new: Búa til samnefni (alias)
     created_msg: Tókst að búa til samnefni. Þú getur núna byrjað að færa gögn af gamla aðgangnum.
@@ -733,44 +922,43 @@ is:
       guide_link: https://crowdin.com/project/mastodon/is
       guide_link_text: Allir geta tekið þátt.
     sensitive_content: Viðkvæmt efni
-    toot_layout: Framsetning tísta
+    toot_layout: Framsetning færslu
   application_mailer:
     notification_preferences: Breyta kjörstillingum tölvupósts
     salutation: "%{name},"
     settings: 'Breyta kjörstillingum tölvupósts: %{link}'
     view: 'Skoða:'
     view_profile: Skoða notandasnið
-    view_status: Skoða stöðufærslu
+    view_status: Skoða færslu
   applications:
     created: Það tókst að búa til forrit
     destroyed: Það tókst að eyða forriti
-    invalid_url: Slóðin sem þú gafst upp er ógild
     regenerate_token: Endurgera aðgangsteikn
     token_regenerated: Það tókst að endurgera aðgangsteiknið
     warning: Farðu mjög varlega með þessi gögn. Þú skalt aldrei deila þeim með neinum!
     your_token: Aðgangsteiknið þitt
   auth:
-    apply_for_account: Beiðni um boð
+    apply_for_account: Biðja um notandaaðgang
     change_password: Lykilorð
-    checkbox_agreement_html: Ég samþykki <a href="%{rules_path}" target="_blank">reglur vefþjónsins</a> og <a href="%{terms_path}" target="_blank">þjónustuskilmálana</a>
-    checkbox_agreement_without_rules_html: Ég samþykki <a href="%{terms_path}" target="_blank">þjónustuskilmálana</a>
     delete_account: Eyða notandaaðgangi
     delete_account_html: Ef þú vilt eyða notandaaðgangnum þínum, þá geturðu <a href="%{path}">farið í það hér</a>. Þú verður beðin/n um staðfestingu.
     description:
       prefix_invited_by_user: "@%{name} býður þér að taka þátt á þessum Mastodon-vefþjóni!"
       prefix_sign_up: Skráðu þig á Mastodon strax í dag!
-      suffix: Með notandaaðgangi geturðu fylgst með fólki, sent inn stöðufærslur og skipst á skilaboðum við notendur á hvaða Mastodon-vefþjóni sem er, auk margs fleira!
+      suffix: Með notandaaðgangi geturðu fylgst með fólki, sent inn færslur og skipst á skilaboðum við notendur á hvaða Mastodon-vefþjóni sem er, auk margs fleira!
     didnt_get_confirmation: Fékkstu ekki leiðbeiningar um hvernig eigi að staðfesta aðganginn?
     dont_have_your_security_key: Ertu ekki með öryggislykilinn þinn?
     forgot_password: Gleymdirðu lykilorðinu?
     invalid_reset_password_token: Teikn fyrir endurstillingu lykilorðs er ógilt eða útrunnið. Biddu um nýtt teikn.
     link_to_otp: Settu inn tveggja-þátta kóða úr farsímanum þínum eða endurheimtukóða
     link_to_webauth: Notaðu tæki með öryggislykli
+    log_in_with: Skrá inn með
     login: Skrá inn
     logout: Skrá út
     migrate_account: Færa á annan notandaaðgang
     migrate_account_html: Ef þú vilt endurbeina þessum aðgangi á einhvern annan, geturðu <a href="%{path}">stillt það hér</a>.
     or_log_in_with: Eða skráðu inn með
+    privacy_policy_agreement_html: Ég hef lesið og samþykkt <a href="%{privacy_policy_path}" target="_blank">persónuverndarstefnuna</a>
     providers:
       cas: CAS
       saml: SAML
@@ -778,20 +966,29 @@ is:
     registration_closed: "%{instance} samþykkir ekki nýja meðlimi"
     resend_confirmation: Senda leiðbeiningar vegna staðfestingar aftur
     reset_password: Endursetja lykilorð
+    rules:
+      preamble: Þær eru settar og þeim framfylgt af umsjónarmönnum %{domain}.
+      title: Nokkrar grunnreglur.
     security: Öryggi
     set_new_password: Stilla nýtt lykilorð
     setup:
       email_below_hint_html: Ef tölvupóstfangið hér fyrir neðan er rangt, skaltu breyta því hér og fá nýjan staðfestingarpóst.
       email_settings_hint_html: Staðfestingarpósturinn var sendur til %{email}. Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
       title: Uppsetning
+    sign_in:
+      preamble_html: Skráðu þig inn með auðkennum þínum fyrir <strong>%{domain}</strong>. Ef aðgangurinn þinn er hýstur á öðrum netþjóni, muntu ekki geta skráð þig inn hér.
+      title: Skrá inn á %{domain}
+    sign_up:
+      preamble: Með notandaaðgangi á þessum Mastodon-þjóni geturðu fylgst með hverjum sem er á netkerfinu, sama hvar notandaaðgangurinn þeirra er hýstur.
+      title: Förum núna að setja þig upp á %{domain}.
     status:
       account_status: Staða notandaaðgangs
       confirming: Bíð eftir að staðfestingu tölvupósts sé lokið.
       functional: Notandaaðgangurinn þinn er með fulla virkni.
       pending: Umsóknin þín bíður eftir að starfsfólkið okkar fari yfir hana. Það gæti tekið nokkurn tíma. Þú munt fá tölvupóst ef umsóknin er samþykkt.
       redirecting_to: Notandaaðgangurinn þinn er óvirkur vegna þess að hann endurbeinist á %{acct}.
+      view_strikes: Skoða fyrri bönn notandaaðgangsins þíns
     too_fast: Innfyllingarform sent inn of hratt, prófaðu aftur.
-    trouble_logging_in: Vandræði við að skrá inn?
     use_security_key: Nota öryggislykil
   authorize_follow:
     already_following: Þú ert að þegar fylgjast með þessum aðgangi
@@ -849,10 +1046,36 @@ is:
       more_details_html: Til að skoða þetta nánar, er gott að líta á <a href="%{terms_path}">persónuverndarstefnuna</a>.
       username_available: Notandanafnið þitt mun verða tiltækt aftur
       username_unavailable: Notandanafnið þitt mun verða áfram ótiltækt
-  directories:
-    directory: Notandasniðamappa
-    explanation: Leitaðu að notendum eftir áhugamálum þeirra
-    explore_mastodon: Kannaðu %{title}
+  disputes:
+    strikes:
+      action_taken: Framkvæmd aðgerð
+      appeal: Áfrýja
+      appeal_approved: Þessari refsingu hefur verið áfrýjað með góðum árangri og hún því ekki lengur í gildi
+      appeal_rejected: Áfrýjuninni hefur verið hafnað
+      appeal_submitted_at: Áfrýjun send inn
+      appealed_msg: Áfrýjun þín hefur verið sen dinn. Þú verður látin/n vita ef hún verður samþykkt.
+      appeals:
+        submit: Senda inn áfrýjun
+      approve_appeal: Samþykkja áfrýjun
+      associated_report: Tengd kæra
+      created_at: Dagsett
+      description_html: Þetta eru aðgerðir sem notaðar hafa verið gagnvart aðgangnum þínum og aðvaranir sem þér hafa verið sendar af umsjónarfólki á %{instance}.
+      recipient: Stílað til
+      reject_appeal: Hafna áfrýjun
+      status: 'Færsla #%{id}'
+      status_removed: Færsla þegar fjarlægð úr kerfinu
+      title: "%{action} frá %{date}"
+      title_actions:
+        delete_statuses: Fjarlæging færslu
+        disable: Frysting aðgangs
+        mark_statuses_as_sensitive: Merking færslna sem viðkvæmar
+        none: Aðvörun
+        sensitive: Merking notanda sem viðkvæms
+        silence: Takmörkun aðgangs
+        suspend: Setja aðgang í frysti
+      your_appeal_approved: Áfrýjun þín hefur verið samþykkt
+      your_appeal_pending: Þú hefur sent inn áfrýjun
+      your_appeal_rejected: Áfrýjun þinni hefur verið hafnað
   domain_validator:
     invalid_domain: er ekki leyfilegt nafn á léni
   errors:
@@ -877,7 +1100,7 @@ is:
     archive_takeout:
       date: Dagsetning
       download: Náðu í safnskrána þína
-      hint_html: Þú getur beðið um safnskrá með <strong>tístunum þínum og innsendu myndefni</strong>. Útfluttu gögnin verða á ActivityPub-sniði, sem allur samhæfður hugbúnaður á að geta lesið. Þú getur beðið um safnskrá á 7 daga fresti.
+      hint_html: Þú getur beðið um safnskrá með <strong>færslunum þínum og innsendu myndefni</strong>. Útfluttu gögnin verða á ActivityPub-sniði, sem allur samhæfður hugbúnaður á að geta lesið. Þú getur beðið um safnskrá á 7 daga fresti.
       in_progress: Set saman safnskrána þína...
       request: Biddu um safnskrána þína
       size: Stærð
@@ -901,56 +1124,69 @@ is:
       public: Opinberar tímalínur
       thread: Samtöl
     edit:
+      add_keyword: Bæta við stikkorði
+      keywords: Stikkorð
+      statuses: Einstakar færslur
+      statuses_hint_html: Þessi sía virkar til að velja stakar færslur án tillits til annarra skilyrða. <a href="%{path}">Yfirfarðu eða fjarlægðu færslur úr síunni</a>.
       title: Breyta síu
     errors:
+      deprecated_api_multiple_keywords: Þessum viðföngum er ekki hægt að breyta úr þessu forriti, þar sem þau eiga við fleiri en eitt stikkorð síu. Notaðu nýrra forrit eða farðu í vefviðmótið.
       invalid_context: Ekkert eða ógilt samhengi var gefið
-      invalid_irreversible: Óendurkræf síun virkar bara í sambandi við heimasvæði eða tilkynningar
     index:
+      contexts: Síur í %{contexts}
       delete: Eyða
       empty: Þú ert ekki með neinar síur.
+      expires_in: Rennur út %{distance}
+      expires_on: Rennur út þann %{date}
+      keywords:
+        one: "%{count} stikkorð"
+        other: "%{count} stikkorð"
+      statuses:
+        one: "%{count} færsla"
+        other: "%{count} færslur"
+      statuses_long:
+        one: "%{count} stök færsla falin"
+        other: "%{count} stakar færslur faldar"
       title: Síur
     new:
+      save: Vista nýja síu
       title: Bæta við nýrri síu
+    statuses:
+      back_to_filter: Til baka í síu
+      batch:
+        remove: Fjarlægja úr síu
+      index:
+        hint: Þessi sía virkar til að velja stakar færslur án tillits til annarra skilyrða. Þú getur bætt fleiri færslum í þessa síu í vefviðmótinu.
+        title: Síaðar færslur
   footer:
-    developers: Forritarar
-    more: Meira…
-    resources: Tilföng
     trending_now: Í umræðunni núna
   generic:
     all: Allt
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> atriði á þessari síðu er valið."
+      other: Öll <strong>%{count}</strong> atriðin á þessari síðu eru valin.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> atriði sem samsvarar leitinni þinni er valið."
+      other: Öll <strong>%{count}</strong> atriðin sem samsvara leitinni þinni eru valin.
     changes_saved_msg: Það tókst að vista breytingarnar!
     copy: Afrita
     delete: Eyða
-    no_batch_actions_available: Engar magnvinnsluaðgerðir tiltækar á þessari síðu
+    deselect: Afvelja allt
+    none: Ekkert
     order_by: Raða eftir
     save_changes: Vista breytingar
+    select_all_matching_items:
+      one: Veldu %{count} atriði sem samsvarar leitinni þinni.
+      other: Veldu öll %{count} atriðin sem samsvara leitinni þinni.
+    today: í dag
     validation_errors:
       one: Ennþá er ekk alvegi allt í lagi! Skoðaðu vel villuna hér fyrir neðan
       other: Ennþá er ekki alveg allt í lagi! Skoðaðu vel villurnar %{count} hér fyrir neðan
   html_validator:
     invalid_markup: 'inniheldur ógildar HTML-merkingar: %{error}'
-  identity_proofs:
-    active: Virkur
-    authorize: Já, heimila
-    authorize_connection_prompt: Auðkenna dulkóðaða tengingu?
-    errors:
-      failed: Dulrituð tenging mistókst, endilega reyndu aftur frá %{provider}.
-      keybase:
-        invalid_token: Keybase-teikn eru tætigildi undirritana og verða að vera 66 hex-stafir
-        verification_failed: Keybase skilur þetta teikn ekki sem undirritun Keybase-notandans %{kb_username}. Prófaðu aftur í Keybase.
-      wrong_user: Get ekki búið til sannvottun fyrir %{proving} á meðan skráð er inn sem %{current}. Skráðu inn sem %{proving} og prófaðu aftur.
-    explanation_html: Hér geturðu tengt dulritað önnur auðkenni þín, eins og t.d. Keybase-notandasnið. Þetta gerir öðru fólki kleift að senda þér dulrituð skilaboð og að treysta efni sem þú sendir þeim.
-    i_am_html: Ég er %{username} á %{service}.
-    identity: Auðkenni
-    inactive: Óvirkt
-    publicize_checkbox: 'Og tísti þetta:'
-    publicize_toot: 'Það er búið að sanna þetta! Ég er %{username} á %{service}: %{url}'
-    remove: Fjarlægja sönnun úr notandaaðgangi
-    removed: Tókst að fjarlægja sönnun úr notandaaðgangi
-    status: Staða sannvottunar
-    view_proof: Skoða sönnun
   imports:
     errors:
+      invalid_csv_file: 'Ógild CSV-skrá. Villa: %{error}'
       over_rows_processing_limit: inniheldur meira en %{count} raðir
     modes:
       merge: Sameina
@@ -966,7 +1202,6 @@ is:
       following: Listi yfir þá sem fylgst er með
       muting: Listi yfir þagganir
     upload: Senda inn
-  in_memoriam_html: Minning.
   invites:
     delete: Gera óvirkt
     expired: Útrunnið
@@ -1005,7 +1240,7 @@ is:
     title: Auðkenningarferill
   media_attachments:
     validations:
-      images_and_video: Ekki er hægt að hengja myndskeið við stöðufærslu sem þegar inniheldur myndir
+      images_and_video: Ekki er hægt að hengja myndskeið við færslu sem þegar inniheldur myndir
       not_ready: Ekki er hægt að hengja við skrár sem ekki er búið að vinna til fulls. Prófaðu aftur eftir augnablik!
       too_many: Ekki er hægt að hengja við fleiri en 4 skrár
   migrations:
@@ -1045,21 +1280,17 @@ is:
     carry_blocks_over_text: Þessi notandi fluttist frá %{acct}, sem þú hafðir útilokað.
     carry_mutes_over_text: Þessi notandi fluttist frá %{acct}, sem þú hafðir þaggað niður í.
     copy_account_note_text: 'Þessi notandi fluttist frá %{acct}, hér eru fyrri minnispunktar þínir um hann:'
+  navigation:
+    toggle_menu: Víxla valmynd af/á
   notification_mailer:
-    digest:
-      action: Skoða allar tilkynningar
-      body: Hér er stutt yfirlit yfir þau skilaboð sem þú gætir hafa misst af síðan þú leist inn síðast %{since}
-      mention: "%{name} minntist á þig í:"
-      new_followers_summary:
-        one: Að auki, þú hefur fengið einn nýjan fylgjanda á meðan þú varst fjarverandi! Húh!
-        other: Að auki, þú hefur fengið %{count} nýja fylgjendur á meðan þú varst fjarverandi! Frábært!
-      subject:
-        one: "1 ný tilkynning síðan þú leist inn síðast \U0001F418"
-        other: "%{count} nýjar tilkynningar síðan þú leist inn síðast \U0001F418"
-      title: Á meðan þú varst fjarverandi...
+    admin:
+      report:
+        subject: "%{name} sendi inn kæru"
+      sign_up:
+        subject: "%{name} nýskráði sig"
     favourite:
-      body: 'Stöðufærslan þín var sett í eftirlæti af %{name}:'
-      subject: "%{name} setti stöðufærslu þína í eftirlæti"
+      body: 'Færslan þín var sett í eftirlæti af %{name}:'
+      subject: "%{name} setti færsluna þína í eftirlæti"
       title: Nýtt eftirlæti
     follow:
       body: "%{name} er núna að fylgjast með þér!"
@@ -1078,11 +1309,13 @@ is:
     poll:
       subject: Könnun frá %{name} er lokið
     reblog:
-      body: "%{name} endurbirti stöðufærsluna þína:"
-      subject: "%{name} endurbirti stöðufærsluna þína"
+      body: "%{name} endurbirti færsluna þína:"
+      subject: "%{name} endurbirti færsluna þína"
       title: Ný endurbirting
     status:
       subject: "%{name} sendi inn rétt í þessu"
+    update:
+      subject: "%{name} breytti færslu"
   notifications:
     email_events: Atburðir fyrir tilkynningar í tölvupósti
     email_events_hint: 'Veldu þá atburði sem þú vilt fá tilkynningar í tölvupósti þegar þeir koma upp:'
@@ -1126,6 +1359,8 @@ is:
     other: Annað
     posting_defaults: Sjálfgefin gildi við gerð færslna
     public_timelines: Opinberar tímalínur
+  privacy_policy:
+    title: Persónuverndarstefna
   reactions:
     errors:
       limit_reached: Hámarki mismunandi viðbragða náð
@@ -1148,25 +1383,18 @@ is:
     remove_selected_follows: Hætta að fylgjast með völdum notendum
     status: Staða aðgangs
   remote_follow:
-    acct: Settu inn notandanafn@lén þaðan sem þú vilt vera virk/ur
     missing_resource: Gat ekki fundið endurbeiningarslóðina fyrir notandaaðganginn þinn
-    no_account_html: Ertu ekki með aðgang? Þú getur <a href='%{sign_up_path}' target='_blank'>nýskráð þig hér</a>
-    proceed: Halda áfram í að fylgjast með
-    prompt: 'Þú ætlar að fara að fylgjast með:'
-    reason_html: "<strong>Hvers vegna er þetta skref nauðsynlegt?</strong> <code>%{instance}</code> er ekki endilega netþjónninn þar sem þú ert skráð/ur, þannig að við verðum að endurbeina þér á heimaþjóninn þinn fyrst."
-  remote_interaction:
-    favourite:
-      proceed: Halda áfram í að setja í eftirlæti
-      prompt: 'Þú ætlar að setja þetta tíst í eftirlæti:'
-    reblog:
-      proceed: Halda áfram í endurbirtingu
-      prompt: 'Þú ætlar að endurbirta þetta tíst:'
-    reply:
-      proceed: Halda áfram í að svara
-      prompt: 'Þú ætlar að svara þessu tísti:'
+  reports:
+    errors:
+      invalid_rules: vísar ekki til gildra reglna
+  rss:
+    content_warning: 'Aðvörun vegna efnis:'
+    descriptions:
+      account: Opinberar færslur frá @%{acct}
+      tag: 'Opinberar færslur merktar #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætluð tíst fyrir þennan dag
-    over_total_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætluð tíst
+    over_daily_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætlaðar færslur fyrir þennan dag
+    over_total_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætlaðar færslur
     too_soon: Áætluð dagsetning verður að vera í framtíðinni
   sessions:
     activity: Síðasta virkni
@@ -1187,7 +1415,7 @@ is:
       phantom_js: PhantomJS
       qq: QQ vafri
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC-vafrinn
       weibo: Weibo
     current_session: Núverandi seta
     description: "%{browser} á %{platform}"
@@ -1222,7 +1450,6 @@ is:
     edit_profile: Breyta notandasniði
     export: Útflutningur gagna
     featured_tags: Myllumerki með aukið vægi
-    identity_proofs: Sannanir á auðkenni
     import: Flytja inn
     import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
@@ -1231,6 +1458,7 @@ is:
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur
     statuses_cleanup: Sjálfvirk eyðing færslna
+    strikes: Umsýsla refsinga
     two_factor_authentication: Tveggja-þátta auðkenning
     webauthn_authentication: Öryggislyklar
   statuses:
@@ -1247,18 +1475,19 @@ is:
         other: "%{count} myndskeið"
     boosted_from_html: Endurbirt frá %{acct_link}
     content_warning: 'Aðvörun vegna efnis (CW): %{warning}'
+    default_language: Sama og tungumál viðmóts
     disallowed_hashtags:
       one: 'innihélt óleyfilegt myllumerki: %{tags}'
       other: 'innihélt óleyfilegu myllumerkin: %{tags}'
+    edited_at_html: Breytt %{date}
     errors:
-      in_reply_not_found: Stöðufærslan sem þú ert að reyna að svara að er líklega ekki til.
-    language_detection: Greina tungumál sjálfvirkt
+      in_reply_not_found: Færslan sem þú ert að reyna að svara að er líklega ekki til.
     open_in_web: Opna í vafra
     over_character_limit: hámarksfjölda stafa (%{max}) náð
     pin_errors:
-      limit: Þú hefur þegar fest leyfilegan hámarksfjölda tísta
-      ownership: Tíst frá einhverjum öðrum er ekki hægt að festa
-      private: Óopinber tíst er ekki hægt að festa
+      direct: Ekki er hægt að festa færslur sem einungis eru sýnilegar þeim notendum sem minnst er á
+      limit: Þú hefur þegar fest leyfilegan hámarksfjölda færslna
+      ownership: Færslur frá einhverjum öðrum er ekki hægt að festa
       reblog: Ekki er hægt að festa endurbirtingu
     poll:
       total_people:
@@ -1309,6 +1538,7 @@ is:
       '2629746': 1 mánuður
       '31556952': 1 ár
       '5259492': 2 mánuðir
+      '604800': 1 vika
       '63113904': 2 ár
       '7889238': 3 mánuðir
     min_age_label: Aldursmörk
@@ -1317,94 +1547,14 @@ is:
     min_reblogs: Halda færslum sem eru endurbirtar oftar en
     min_reblogs_hint: Eyðir ekki þínum eigin færslum sem endurbirtar hafa verið þetta oft. Skildu þetta eftir autt til að eyða færslum burtséð frá fjölda endurbirtinga
   stream_entries:
-    pinned: Fest tíst
+    pinned: Fest færsla
     reblogged: endurbirt
     sensitive_content: Viðkvæmt efni
+  strikes:
+    errors:
+      too_late: Það er orðið of sint að áfrýja þessari refsingu
   tags:
     does_not_match_previous_name: samsvarar ekki fyrra nafni
-  terms:
-    body_html: |
-      <h2>Persónuverndarstefna </h2>
-      <h3 id="collect">Hvaða upplýsingum söfnum við?</h3>
-
-      <ul>
-      <li><em>Grunnupplýsingar um notandaaðgang</em>: Ef þú skráir þig á þessum netþjóni gætirðu verið beðinn um að slá inn notandanafn, tölvupóstfang og lykilorð. Þú getur einnig sett inn viðbótarupplýsingar eins og birtingarnafn og æviágrip auk þess að hlaða inn auðkennismynd eða mynd til að birta á síðuhaus. Notandanafn, birtingarnafn, æviágrip, auðkennismynd og hausmynd eru alltaf skráð opinberlega. </li>
-      <li><em>Skilaboð, fylgnigögn og aðrar opinberar upplýsingar</em>: Listinn yfir þá sem þú fylgist með er skráður opinberlega, það sama er að segja um þá sem fylgjast með þér. Þegar þú sendir skilaboð er dagsetning og tími vistaður sem og hvaða forrit þú sendir skilaboðin frá. Skilaboð geta innihaldið viðhengi, svo sem myndir og myndskeið. Opinberar og óskráðar færslur er aðgengilegar opinberlega. Þegar þú birtir færslu á notandasniðinu þínu (forsíðu) eru það einnig opinberar upplýsingar. Færslurnar þínar eru sendar þeim sem fylgjast með þér, í sumum tilvikum þýðir það að þær eru afhentar á aðra netþjóna og afrit geymd þar. Þegar þú eyðir færslum er það sömuleiðis birt fylgjendum þínum. Aðgerðir eins og að endurbirta eða setja færslu í eftirlæti eru ávallt opinberar.</li>
-      <li><em>Beinar færslur og eingöngu til fylgjenda</em>: Öll innlegg eru geymd og unnin á netþjóninum. Færslur sem eingöngu eru til fylgjenda berast til fylgjenda þinna og þeirra notenda sem minnst er á í þeim, beinar færslur berast aðeins til notenda sem getið er um í viðkomandi færslu. Í sumum tilvikum þýðir það að færslurnar eru afhentar á aðra netþjóna og afrit geymd þar. Við leggjum mikla áherslu á að takmarka aðgang að þessum færslum einungis við aðila sem til þess hafa heimild, en aðrir utanaðkomandi netþjónar gætu mögulega ekki gert það. Þess vegna er mikilvægt að skoða vel þá netþjóna sem fylgjendur þínir tilheyra. Þú getur valið að þurfa að samþykkja og hafna nýjum fylgjendum handvirkt í stillingunum.<em>Hafðu í huga að rekstraraðilar netþjónsins og allir viðtakendamiðlarar geta skoðað slík skilaboð</em> og að viðtakendur geta tekið skjámyndir, afritað eða á annan hátt deilt þessum gögnum. <em>Ekki deila hættulegum upplýsingum í gegnum Mastodon.</em></li>
-      <li><em>IP-vistföng og önnur lýsigögn</em>: Þegar þú skráir þig inn skráum við IP-töluna sem þú skráir þig inn af, sem og heiti vafraforritsins þíns. Allar innskráðar setur verða tiltækar til skoðunar og afturköllunar í stillingunum. Síðast notaða IP-talan er geymd í allt að 12 mánuði. Við gætum líka haldið eftir atvikaskrám netþjónsins sem gæti innihaldið IP-tölur allra beiðna til netþjónsins.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Til hvers notum við upplýsingarnar þínar?</h3>
-
-      <p>Hvað sem er af þeim upplýsingum sem við söfnum frá þér má nota á eftirfarandi vegu:</p>
-
-      <ul>
-      <li>Til að veita grunnvirkni Mastodon. Þú getur aðeins haft samskipti við efni annarra eða sent inn þitt eigið efni þegar þú ert skráð/ur inn. Til dæmis gætirðu fylgst með öðru fólki og skoðað safn færslna þeirra á þinni eigin persónulega sérsniðnu tímalínu.</li>
-      <li>Til að hjálpa til við umsjón og viðhald samfélags/hóps, til dæmis að bera saman IP-tölu þína við aðrar þekktar til að greina frávik frá bönnum eða öðrum brotum.</li>
-      <li>Tölvupóstfangið sem þú gefur upp má nota til að senda þér upplýsingar, tilkynningar um annað fólk sem átt hefur við efnið þitt eða til að senda þér skilaboð eða svara fyrirspurnum og/eða öðrum beiðnum eða spurningum.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Hvernig verndum við upplýsingarnar þínar? </h3>
-
-      <p>Við setjum upp margvíslegar öryggisráðstafanir til að viðhalda öryggi persónuupplýsinganna þinna þegar þú setur inn, sendir eða opnar persónulegar upplýsingar. Meðal annars er vafrasetan þín, svo og umferðin milli forritanna þinna og API-kerfisviðmótsins tryggð með SSL, og lykilorðið þitt er varið með tætigildi (hashed) með sterku einhliða reikniriti. Þú gætir virkjað tveggja-þátta auðkenningu til að tryggja enn frekar aðganginn að notandaaðgangnum þínum. </p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Hver er stefna okkar varðandi varðveislu gagna?</h3>
-
-      <p>Við munum leggja okkur fram um að:</p>
-
-      <ul>
-      <li>Halda eftir atvikaskrám netþjóns sem innihalda IP-tölu allra beiðna til þessa netþjóns, að svo miklu leyti sem slíkar skrár eru geymdar, ekki lengur en í en 90 daga.</li>
-      <li> Halda eftir IP-tölum sem tengjast skráðum notendum ekki lengur en 12 mánuði.</li>
-      </ul>
-
-      <p>Þú getur beðið um og ná í safnskrá með öllu þínu efni, þar með taldar færslur, margmiðlunarviðhengi, auðkennismynd og mynd á síðuhaus. </p>
-
-      <p>Þú getur eytt reikningi þínum óafturkræft hvenær sem er.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Notum við vefkökur?</h3>
-
-      <p>Já. Vefkökur eða fótspor eru litlar skrár sem vefsvæði eða þjónustuveitandi setur á harða diskinn í tölvunni þinni í gegnum vafrann þinn (ef þú leyfir það). Þessar vefkökur gera vefsvæðinu kleift að þekkja vafrann þinn og ef þú ert með skráðan notandaaðgang skaltu tengja vafrann við skráða notandaaðganginn þinn. </p>
-
-      <p>Við notum vafrakökur til að skilja og vista kjörstillingar þínar fyrir næstu heimsóknir.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Veitum við upplýsingar til utanaðkomandi aðila?</h3>
-
-      <p>Við seljum ekki, verslum eða flytjum á annan hátt persónulegar upplýsingar þínar til utanaðkomandi aðila. Þetta nær ekki til traustra þriðja aðila sem aðstoða okkur við að reka síðuna okkar, aðstoða við starfsemi okkar eða við að þjónusta þig, svo framarlega sem þessir aðilar eru sammála um að halda þessum gögnum sem trúnaðarupplýsingum. Við gætum einnig átt það til að gefa upp upplýsingar frá þér þegar við teljum að birting þeirra sé viðeigandi til að fara eftir lögum, framfylgja stefnu okkar á vefnum eða vernda réttindi okkar, eignir eða öryggi okkar eða annarra.</p>
-
-      <p>Opinberu efni þínu getur verið hlaðið inn af öðrum netþjónum á netinu. Opinberu skilaboðin þín ásamt færslum eingöngu til fylgjenda berast þeim netþjónum þar sem fylgjendur þínir eru skráðir og bein skilaboð eru send til netþjóna viðtakendanna, að svo miklu leyti sem þeir fylgjendur eða viðtakendur eru skráðir á öðrum netþjónum en þessum.</p>
-
-      <p>Þegar þú leyfir forriti að nota aðganginn þinn, fer það eftir umfangi heimildanna sem þú gefur hvort það getur það fengið aðgang að opinberum notandasniðsupplýsingum þínum, lista yfir þá sem þú fylgist með, lista yfir þá sem fylgjast með þér, öðrum listum þínum, öllum þínum færslum og eftirlætum. Forrit geta aldrei fengið tölvupóstfangið þitt eða lykilorð.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Notkun vefsvæðis fyrir börn</h3>
-
-      <p> Ef þessi netþjónn er innan ESB eða EES: Vefnum okkar, vörum og þjónustu er allri beint að fólki sem er að minnsta kosti 16 ára gamalt. Ef þú ert yngri en 16 ára, þá máttu samkvæmt kröfum GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation"> Almenn reglugerð um gagnavernd</a>) ekki nota þessa síðu.</p>
-
-      <p>Ef þessi netþjónn er í Bandaríkjunum: Vefnum okkar, vörum og þjónustu er allri beint að fólki sem er að minnsta kosti 13 ára gamalt. Ef þú ert yngri en 13 ára, þá máttu samkvæmt kröfum COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Lög um persónuvernd barna á netinu</a>) ekki nota þessa síðu. </p>
-
-      <p>Lagakröfur geta verið aðrar ef þessi netþjónn er í annarri lögsögu.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Breytingar á persónuverndarstefnu okkar</h3>
-
-      <p> Ef við ákveðum að breyta persónuverndarstefnu okkar munum við birta þær breytingar á þessari síðu. </p>
-
-      <p> Þetta skjal er með CC-BY-SA notkunarleyfi. Það var síðast uppfært 7. mars 2018.</p>
-
-      <p> Upprunalega aðlagað úr <a href="https://github.com/discourse/discourse">persónuverndarstefnu Discourse</a>.</p>
-    title: "%{instance} - Þjónustuskilmálar og persónuverndarstefna"
   themes:
     contrast: Mastodon (mikil birtuskil)
     default: Mastodon (dökkt)
@@ -1413,6 +1563,7 @@ is:
     formats:
       default: "%d. %b, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Bæta við
     disable: Gera óvirkt
@@ -1429,63 +1580,73 @@ is:
     recovery_instructions_html: Ef þú tapar símanum þínum geturðu notað einn af endurheimtukóðunum hér fyrir neðan til að fá aftur samband við notandaaðganginn þinn. <strong>Geymdu endurheimtukóðana á öruggum stað</strong>. Sem dæmi gætirðu prentað þá út og geymt með öðrum mikilvægum skjölum.
     webauthn: Öryggislyklar
   user_mailer:
+    appeal_approved:
+      action: Farðu inn á notandaaðganginn þinn
+      explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið samþykkt. Notandaaðgangurinn þinn er aftur í góðu lagi.
+      subject: Áfrýjun þín frá %{date} hefur verið samþykkt
+      title: Áfrýjun samþykkt
+    appeal_rejected:
+      explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið hafnað.
+      subject: Áfrýjun þinni frá %{date} hefur verið hafnað
+      title: Áfrýjun hafnað
     backup_ready:
       explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum. Það er núna tilbúið til niðurhals!
       subject: Safnskráin þín er tilbúin til niðurhals
       title: Taka út í safnskrá
-    sign_in_token:
-      details: 'Hér eru nánari upplýsingar um atvikið:'
-      explanation: 'Við sjáum að reynt hefur verið að skrá sig inn á aðganginn þinn frá óþekktu IP-vistfangi. Ef það varst þú, skaltu setja inn öryggiskóðann neðst á staðfestingarsíðu innskráningar:'
-      further_actions: 'Ef þetta varst ekki þú, skaltu endilega skipta um lykilorð og virkja tveggja-þrepa auðkenningu fyrir aðganginn þinn. Þú getur gert það hér:'
-      subject: Endilega staðfestu tilraun til innskráningar
-      title: Tilraun til innskráningar
+    suspicious_sign_in:
+      change_password: breytir lykilorðinu þínu
+      details: 'Hér eru nánari upplýsingar um innskráninguna:'
+      explanation: Við greindum innskráningu inn á aðganginn þinn frá nýju IP-vistfangi.
+      further_actions_html: Ef þetta varst ekki þú, þá mælum við með að þú %{action} strax og virkjir tveggja-þátta auðkenningu til að halda aðgangnum þínum öruggum.
+      subject: Skráð hefur verið inn á aðganginn þinn frá nýju IP-vistfangi
+      title: Ný innskráning
     warning:
+      appeal: Ssenda inn áfrýjun
+      appeal_description: Ef þú álítur að um mistök sé að ræða, geturðu sent áfrýjun til umsjónarmanna %{instance}.
+      categories:
+        spam: Ruslpóstur
+        violation: Efnið er á skjön við eftirfarandi leiðbeiningar til notenda
       explanation:
-        disable: Á meðan aðgangurinn þinn er frystur, eru gögn aðgangsins ósnert, en þú getur ekki framkvæmt neinar aðgerðir fyrr en honum hefur verið aflæst.
-        sensitive: Innsent myndefni sem þú sendir inn og tengt myndefni verður farið með sem viðkvæmt efni.
-        silence: Á meðan aðgangurinn þinn er takmarkaður, mun aðeins fólk sem þegar fylgist með þér sjá tístin þín á þessum vefþjóni, auk þess sem lokað gæti verið á þig á ýmsum opinberum listum. Aftur á móti geta aðrir gerst fylgjendur þínir handvirkt.
-        suspend: Aðgangurinn þinn hefur verið settur í biðstöðu, öll þín tíst og innsent myndefni hafa verið óafturkræft fjarlægð af þessum vefþjóni, sem og af þeim vefþjónum þar sem þú áttir þér fylgjendur.
-      get_in_touch: Þú getur svarað þessum tölvupósti til að setja þig í samband við umsjónarmenn %{instance}.
-      review_server_policies: Yfirfara reglur vefþjónsins
-      statuses: 'Sérstaklega fyrir:'
+        delete_statuses: Sumar færslur frá þér eru álitnar hafa gengið gegn samþykktum skilmálum vegna notkunar og hafa því verið fjarlægðar af stjórnendum á %{instance}.
+        disable: Þú getur ekki lengur notað aðganginn þinn, en notandasniðið þitt og önnur gögn eru óskemmd. Þú getur beðið um afrit af gögnunum þínum, getur breytt stillingum eða eytt aðgangnum þínum.
+        mark_statuses_as_sensitive: Sumar færslur frá þér hafa verið merktar sem viðkvæmt efni af stjórnendum á %{instance}. Þetta þýðir að fólk þarf að ýta á myndefnið til þess að forskoðunarmynd birtist. Þú getur framvegis sjálf/ur merkt myndefnið þitt sem viðkvæmt í færslunum þínum.
+        sensitive: Héðan í frá verður allt myndefni sem þú sendir inn meðhöndlað sem viðkvæmt efni og falið á bakvið aðvörun sem smella þarf á.
+        silence: Þú getur áfram notað aðganginn þinn en aðeins fólk sem þegar fylgist með þér mun sjá færslurnar þínar á þessum vefþjóni, auk þess sem lokað gæti verið á þig á ýmsum opinberum listum. Aftur á móti geta aðrir gerst fylgjendur þínir handvirkt.
+        suspend: Þú getur ekki lengur notað aðganginn þinn og notandasniðið þitt og önnur gögn eru ekki lengur aðgengileg. Þú getur enn skráð þig inn til að biðja um afrit af gögnunum þínum þar til þeim verður eytt að fullu eftir 30 daga, við munum hinsvegar halda eftir einstaka grunnupplýsingum til að koma í veg fyrir að þú komist framhjá þessu banni.
+      reason: 'Ástæða:'
+      statuses: 'Færslur sem vísað er í:'
       subject:
+        delete_statuses: Færslurnar þínar á %{acct} hafa verið fjarlægðar
         disable: Notandaaðgangurinn þinn %{acct} hefur verið frystur
+        mark_statuses_as_sensitive: Færslur þínar á %{acct} hafa verið merktar sem viðkvæmar
         none: Aðvörun fyrir %{acct}
-        sensitive: Myndefni sent frá %{acct} aðgangnum þínum hefur verið merkt sem viðkvæmt
+        sensitive: Færslur þínar á %{acct} verða héðan í frá merktar sem viðkvæmar
         silence: Notandaaðgangurinn þinn %{acct} hefur verið takmarkaður
-        suspend: Notandaaðgangurinn þinn %{acct} hefur verið settur í bið
+        suspend: Notandaaðgangurinn þinn %{acct} hefur verið settur í frysti
       title:
+        delete_statuses: Færslur fjarlægðar
         disable: Notandaaðgangur frystur
+        mark_statuses_as_sensitive: Færslur merktar sem viðkvæmar
         none: Aðvörun
-        sensitive: Myndefnið þitt hefur verið merkt sem viðkvæmt
+        sensitive: Notandaaðgangur merktur sem viðkvæmur
         silence: Notandaaðgangur takmarkaður
-        suspend: Notandaaðgangur í bið
+        suspend: Notandaaðgangur í frysti
     welcome:
       edit_profile_action: Setja upp notandasnið
-      edit_profile_step: Þú getur sérsniðið notandasniðið þitt með því að senda inn auðkennismynd, síðuhaus, breytt birtingarnafninu þínu og ýmislegt fleira. Ef þú vilt yfirfara nýja fylgjendur áður en þeim er leyft að fylgjast með þér geturðu læst aðgangnum þínum.
+      edit_profile_step: Þú getur sérsniðið notandasniðið þitt með því að setja inn auðkennismynd þína, breyta birtingarnafninu þínu og ýmislegt fleira. Þú getur valið að yfirfara nýja fylgjendur áður en þú leyfir þeim að fylgjast með þér.
       explanation: Hér eru nokkrar ábendingar til að koma þér í gang
       final_action: Byrjaðu að skrifa
-      final_step: 'Byrjaðu að tjá þig! Jafnvel án fylgjenda geta aðrir séð opinberar færslur frá þér, til dæmis á staðværu tímalínunni og í myllumerkjum. Þú gætir jafnvel viljað kynna þig með myllumerkinu #introductions.'
+      final_step: 'Byrjaðu að tjá þig! Jafnvel án fylgjenda geta aðrir séð opinberar færslur frá þér, til dæmis á staðværu tímalínunni eða í myllumerkjum. Þú gætir jafnvel viljað kynna þig á myllumerkinu #introductions.'
       full_handle: Fullt auðkenni þitt
       full_handle_hint: Þetta er það sem þú myndir gefa upp við vini þína svo þeir geti sent þér skilaboð eða fylgst með þér af öðrum netþjóni.
-      review_preferences_action: Breyta kjörstillingum
-      review_preferences_step: Gakktu úr skugga um að kjörstillingarnar séu eins og þú vilt hafa þær, eins og t.d. hvaða tölvupóst þú vilt fá, eða hvaða stig friðhelgi þú vilt að færslurnar þínar hafi sjálfgefið. Ef þú hefur ekkert á móti sjónrænu áreiti geturðu virkjað sjálvirka spilun GIF-hreyfimynda.
       subject: Velkomin í Mastodon
-      tip_federated_timeline: Sameiginlega tímalínan er færibandasýn á Mastodon netkerfið. En hún inniheldur bara fólk sem nágrannar þínir eru áskrifendur að, þannig að hún er ekki tæmandi.
-      tip_following: Sjálfgefið er að þú fylgist með stjórnanda eða stjórnendum vefþjónsins. Til að finna fleira áhugavert fólk ættirðu að kíkja á staðværu og sameiginlegu tímalínurnar.
-      tip_local_timeline: Staðværa tímalínan er færibandasýn á allt fólkið á %{instance}. Þetta eru þínir næstu nágrannar!
-      tip_mobile_webapp: Ef farsímavafrinn býður þér að bæta Mastodon á heimaskjáinn þinn, muntu geta tekið á móti ýti-tilkynningum. Það virkar á ýmsa vegu eins og um uppsett forrit sé að ræða!
-      tips: Ábendingar
       title: Velkomin/n um borð, %{name}!
   users:
     follow_limit_reached: Þú getur ekki fylgst með fleiri en %{limit} aðilum
-    generic_access_help_html: Vandamál við að tengjast aðgangnum þínum? Þú getur sett þig í samband við %{email} til að fá aðstoð
     invalid_otp_token: Ógildur tveggja-þátta kóði
-    invalid_sign_in_token: Ógildur öryggiskóði
     otp_lost_help_html: Ef þú hefur misst aðganginn að hvoru tveggja, geturðu sett þig í samband við %{email}
     seamless_external_login: Innskráning þín er í gegnum utanaðkomandi þjónustu, þannig að stillingar fyrir lykilorð og tölvupóst eru ekki aðgengilegar.
     signed_in_as: 'Skráð inn sem:'
-    suspicious_sign_in_confirmation: Það virðist sem þú hafir ekki skráð þig inn af þessu tæki áður og að nokkur tími sé liðinn frá því þú hefur skráð þig inn, þannig að við erum að senda þér öryggiskóða á tölvupóstfangið þitt til að staðfesta að þetta sért þú.
   verification:
     explanation_html: 'Þú getur <strong>vottað að þú sért eigandi og ábyrgur fyrir tenglunum í lýsigögnum notandasniðsins þíns</strong>. Til að það virki, þurfa vefsvæðin sem vísað er í að innihalda tengil til baka í Mastodon-notandasniðið. Tengillinn sem vísar til baka <strong>verður</strong> að vera með <code>rel="me"</code> eigindi. Textinn í tenglinum skiptir ekki máli. Hérna er dæmi:'
     verification: Sannprófun
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2a997d339..59d9f910a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1,321 +1,291 @@
 ---
 it:
   about:
-    about_hashtag_html: Questi sono i toot pubblici etichettati con <strong>#%{hashtag}</strong>. Puoi interagire con loro se hai un account nel fediverse.
-    about_mastodon_html: 'Il social network del futuro: niente pubblicità, niente controllo da parte di qualche azienda privata, design etico e decentralizzazione! Con Mastodon il proprietario dei tuoi dati sei tu!'
-    about_this: A proposito di questo server
-    active_count_after: attivo
-    active_footnote: Utenti Attivi Mensili (MAU)
-    administered_by: 'Amministrato da:'
-    api: API
-    apps: Applicazioni per dispositivi mobili
-    apps_platforms: Usa Mastodon da iOS, Android e altre piattaforme
-    browse_directory: Sfoglia la directory dei profili e filtra per interessi
-    browse_local_posts: Sfoglia il flusso in tempo reale di post pubblici su questo server
-    browse_public_posts: Sfoglia il flusso in tempo reale di post pubblici su Mastodon
-    contact: Contatti
+    about_mastodon_html: 'Il social network del futuro: Nessuna pubblicità, zero sorveglianza azienale, design etico e decentralizzazione! Sii il proprietario dei tuoi dati, con Mastodon!'
     contact_missing: Non impostato
     contact_unavailable: N/D
-    discover_users: Scopri utenti
-    documentation: Documentazione
-    federation_hint_html: Con un account su %{instance} sarai in grado di seguire persone su qualsiasi server Mastodon e oltre.
-    get_apps: Prova un'app per smartphone
     hosted_on: Mastodon ospitato su %{domain}
-    instance_actor_flash: |
-      Questo account è un attore virtuale utilizzato per rappresentare il server stesso e non un particolare utente.
-      È utilizzato per scopi di federazione e non dovrebbe essere bloccato a meno che non si voglia bloccare l'intera istanza: in questo caso si dovrebbe utilizzare un blocco di dominio.
-    learn_more: Scopri altro
-    privacy_policy: Politica della privacy
-    rules: Regole del server
-    rules_html: 'Di seguito è riportato un riassunto delle regole che devi seguire se vuoi avere un account su questo server di Mastodon:'
-    see_whats_happening: Guarda cosa succede
-    server_stats: 'Statistiche del server:'
-    source_code: Codice sorgente
-    status_count_after:
-      one: stato
-      other: stati
-    status_count_before: Che hanno pubblicato
-    tagline: Segui amici e trovane di nuovi
-    terms: Termini di Servizio
-    unavailable_content: Server moderati
-    unavailable_content_description:
-      domain: Server
-      reason: 'Motivo:'
-      rejecting_media: I file multimediali di questo server non saranno elaborati e non verranno visualizzate miniature, che richiedono clic manuale sull'altro server.
-      rejecting_media_title: Media filtrati
-      silenced: 'I messaggi da questi server saranno nascosti nelle timeline e nelle conversazioni pubbliche, e nessuna notifica verrà generata dalle interazioni dei loro utenti, a meno che non li stai seguendo:'
-      silenced_title: Server silenziati
-      suspended: 'Nessun dato da questi server sarà elaborato, memorizzato o scambiato, rendendo impossibile qualsiasi interazione o comunicazione con gli utenti di questi server:'
-      suspended_title: Server sospesi
-    unavailable_content_html: Mastodon generalmente permette di visualizzare i contenuti e interagire con gli utenti di qualsiasi altro server nel fediverse. Queste sono le eccezioni che sono state create su questo specifico server.
-    user_count_after:
-      one: utente
-      other: utenti
-    user_count_before: Home di
-    what_is_mastodon: Che cos'è Mastodon?
+    title: Info
   accounts:
-    choices_html: 'Suggerimenti da %{name}:'
-    endorsements_hint: 'Puoi segnalare persone che segui e che apprezzi dall''interfaccia web: saranno mostrate qui.'
-    featured_tags_hint: Puoi mettere in evidenza determinati hashtag che verranno visualizzati qui.
     follow: Segui
     followers:
       one: Seguace
       other: Seguaci
-    following: Segui
-    instance_actor_flash: Questo account è un attore virtuale usato per rappresentare il server stesso e non un singolo utente. Viene utilizzato per scopi federativi e non dovrebbe essere sospeso.
-    joined: Dal %{date}
+    following: Seguiti
+    instance_actor_flash: Questo profilo è un attore virtuale, utilizzato per rappresentare il server stesso e non un singolo utente. È utilizzato per scopi federativi e non dovrebbe esser sospeso.
     last_active: ultima attività
     link_verified_on: La proprietà di questo link è stata controllata il %{date}
-    media: Media
-    moved_html: "%{name} si è spostato su %{new_profile_link}:"
-    network_hidden: Questa informazione non e' disponibile
-    never_active: Mai
     nothing_here: Qui non c'è nulla!
-    people_followed_by: Persone seguite da %{name}
-    people_who_follow: Persone che seguono %{name}
     pin_errors:
-      following: Devi gia seguire la persona che vuoi promuovere
+      following: Devi già seguire la persona che desideri promuovere
     posts:
       one: Toot
       other: Toot
     posts_tab_heading: Toot
-    posts_with_replies: Toot e risposte
-    roles:
-      admin: Amministratore
-      bot: Bot
-      group: Gruppo
-      moderator: Moderatore
-    unavailable: Profilo non disponibile
-    unfollow: Non seguire più
   admin:
     account_actions:
       action: Esegui azione
-      title: Esegui azione di moderazione su %{acct}
+      title: Esegui l'azione di moderazione su %{acct}
     account_moderation_notes:
-      create: Lascia nota
-      created_msg: Nota di moderazione creata con successo!
-      delete: Elimina
-      destroyed_msg: Nota di moderazione distrutta con successo!
+      create: Lascia una nota
+      created_msg: Nota di moderazione creata correttamente!
+      destroyed_msg: Nota di moderazione distrutta correttamente!
     accounts:
-      add_email_domain_block: Inserisci il dominio email nella blacklist
+      add_email_domain_block: Blocca il dominio dell'email
       approve: Approva
-      approve_all: Approva tutto
-      approved_msg: Richiesta di registrazione di %{username} approvata
+      approved_msg: Richiesta d'iscrizione di %{username} approvata correttamente
       are_you_sure: Sei sicuro?
-      avatar: Immagine di profilo
+      avatar: Avatar
       by_domain: Dominio
       change_email:
-        changed_msg: Account email cambiato con successo!
-        current_email: Email attuale
-        label: Cambia email
+        changed_msg: Email modificata correttamente!
+        current_email: Email corrente
+        label: Cambia l'email
         new_email: Nuova email
-        submit: Cambia email
-        title: Cambia email per %{username}
+        submit: Cambia l'email
+        title: Cambia l'email per %{username}
+      change_role:
+        changed_msg: Ruolo modificato correttamente!
+        label: Cambia il ruolo
+        no_role: Nessun ruolo
+        title: Cambia il ruolo per %{username}
       confirm: Conferma
       confirmed: Confermato
       confirming: Confermando
-      delete: Elimina dati
-      deleted: Cancellato
-      demote: Declassa
-      destroyed_msg: I dati di %{username} sono ora in coda per essere eliminati tra poco
-      disable: Disabilita
-      disable_sign_in_token_auth: Disabilita autenticazione con token email
-      disable_two_factor_authentication: Disabilita l'autenticazione a due fattori
-      disabled: Disabilitato
-      display_name: Nome visualizzato
+      custom: Personalizzato
+      delete: Elimina i dati
+      deleted: Eliminato
+      demote: Retrocedi
+      destroyed_msg: I dati di %{username} sono ora accodati per l'imminente eliminazione
+      disable: Congela
+      disable_sign_in_token_auth: Disabilita l'autenticazione con token via email
+      disable_two_factor_authentication: Disabilita A2F
+      disabled: Congelato
+      display_name: Nome mostrato
       domain: Dominio
       edit: Modifica
       email: Email
-      email_status: Stato email
-      enable: Abilita
-      enable_sign_in_token_auth: Abilita autenticazione con token email
+      email_status: Stato dell'email
+      enable: Scongela
+      enable_sign_in_token_auth: Abilita l'autenticazione con token via email
       enabled: Abilitato
-      enabled_msg: L'account di %{username} è stato scongelato
-      followers: Follower
-      follows: Segue
+      enabled_msg: Il profilo di %{username} è stato scongelato correttamente
+      followers: Seguaci
+      follows: Seguiti
       header: Intestazione
-      inbox_url: URL inbox
-      invite_request_text: Motivi per l'iscrizione
+      inbox_url: URL casella
+      invite_request_text: Motivi d'iscrizione
       invited_by: Invitato da
       ip: IP
-      joined: Iscritto da
+      joined: Iscritto il
       location:
         all: Tutto
         local: Locale
         remote: Remoto
-        title: Luogo
-      login_status: Stato login
-      media_attachments: Media allegati
+        title: Posizione
+      login_status: Stato d'accesso
+      media_attachments: Allegati multimediali
       memorialize: Trasforma in memoriam
-      memorialized: Memorializzato
-      memorialized_msg: Hai trasformato %{username} in un account commemorativo
+      memorialized: Commemorato
+      memorialized_msg: "%{username} trasformato correttamente in un profilo commemorativo"
       moderation:
         active: Attivo
         all: Tutto
-        pending: In attesa
-        silenced: Silenziati
-        suspended: Sospesi
+        pending: In sospeso
+        silenced: Limitato
+        suspended: Sospeso
         title: Moderazione
       moderation_notes: Note di moderazione
-      most_recent_activity: Attività più recenti
+      most_recent_activity: Attività più recente
       most_recent_ip: IP più recente
-      no_account_selected: Nessun account è stato modificato visto che non ne è stato selezionato nessuno
+      no_account_selected: Nessun profilo è stato modificato, poiché non ne è stato selezionato nessuno
       no_limits_imposed: Nessun limite imposto
-      not_subscribed: Non sottoscritto
-      pending: Revisioni in attesa
+      no_role_assigned: Nessun ruolo assegnato
+      not_subscribed: Non iscritto
+      pending: Revisione in sospeso
       perform_full_suspension: Sospendi
+      previous_strikes: Provvedimenti precedenti
+      previous_strikes_description_html:
+        one: Questo profilo ha <strong>un</strong> provvedimento.
+        other: Questo profilo ha <strong>%{count}</strong> provvedimenti.
       promote: Promuovi
       protocol: Protocollo
       public: Pubblico
-      push_subscription_expires: Sottoscrizione PuSH scaduta
-      redownload: Aggiorna avatar
-      redownloaded_msg: Il profilo di %{username} è stato aggiornato dall'origine
+      push_subscription_expires: L'iscrizione PuSH scade il
+      redownload: Aggiorna profilo
+      redownloaded_msg: Il profilo di %{username} è stato aggiornato correttamente dall'origine
       reject: Rifiuta
-      reject_all: Rifiuta tutto
-      rejected_msg: Richiesta di registrazione di %{username} rifiutata
-      remove_avatar: Rimuovi avatar
-      remove_header: Rimuovi intestazione
-      removed_avatar_msg: Immagine dell'avatar di %{username} eliminata
-      removed_header_msg: Immagine di intestazione di %{username} eliminata
+      rejected_msg: Richiesta d'iscrizione di %{username} rifiutata correttamente
+      remote_suspension_irreversible: I dati di questo account sono stati cancellati in modo irreversibile.
+      remote_suspension_reversible_hint_html: L'account è stato sospeso sul loro server e i dati saranno completamente eliminati il %{date}. Fino ad allora, il server remoto può ripristinare questo account senza effetti negativi. Se si desidera eliminare immediatamente tutti i dati dell'account, è possibile farlo qui sotto.
+      remove_avatar: Rimuovi l'avatar
+      remove_header: Rimuovi l'intestazione
+      removed_avatar_msg: Immagine dell'avatar di %{username} rimossa correttamente
+      removed_header_msg: Immagine d'intestazione di %{username} rimossa correttamente
       resend_confirmation:
         already_confirmed: Questo utente è già confermato
-        send: Reinvia email di conferma
-        success: Email di conferma inviata con successo!
-      reset: Reimposta
-      reset_password: Reimposta password
-      resubscribe: Riscriversi
-      role: Permessi
-      roles:
-        admin: Amministratore
-        moderator: Moderatore
-        staff: Personale
-        user: Utente
+        send: Reinvia l'email di conferma
+        success: Email di conferma inviata correttamente!
+      reset: Ripristina
+      reset_password: Ripristina la password
+      resubscribe: Reiscriviti
+      role: Ruolo
       search: Cerca
-      search_same_email_domain: Altri utenti con lo stesso dominio e-mail
+      search_same_email_domain: Altri utenti con lo stesso dominio email
       search_same_ip: Altri utenti con lo stesso IP
       security_measures:
         only_password: Solo password
-        password_and_2fa: Password e autenticazione a due fattori
-        password_and_sign_in_token: Password e codice via email
+        password_and_2fa: Password e A2F
       sensitive: Sensibile
-      sensitized: contrassegnato come sensibile
-      shared_inbox_url: URL Inbox Condiviso
+      sensitized: Contrassegnato come sensibile
+      shared_inbox_url: URL casella condiviso
       show:
-        created_reports: Rapporti creati da questo account
-        targeted_reports: Rapporti che riguardano questo account
-      silence: Silenzia
-      silenced: Silenziato
-      statuses: Stati
-      subscribe: Sottoscrivi
+        created_reports: Rapporti creati
+        targeted_reports: Segnalato da altri
+      silence: Limita
+      silenced: Limitato
+      statuses: Toot
+      strikes: Provvedimenti precedenti
+      subscribe: Iscriviti
+      suspend: Sospendi
       suspended: Sospeso
-      suspension_irreversible: I dati di questo account sono stati cancellati in modo irreversibile. È possibile annullare la sospensione dell'account per renderlo utilizzabile, ma non recupererà alcuno dei dati precedenti.
-      suspension_reversible_hint_html: L'account è stato sospeso e i dati saranno completamente eliminati il %{date}. Fino ad allora, l'account può essere ripristinato senza effetti negativi. Se si desidera eliminare immediatamente tutti i dati dell'account, è possibile farlo qui sotto.
-      time_in_queue: Attesa in coda %{time}
-      title: Account
+      suspension_irreversible: I dati di questo profilo sono stati eliminati irreversibilmente. Puoi annullare la sospensione del profilo per renderlo utilizzabile, ma non recuperà alcun dato precedente.
+      suspension_reversible_hint_html: Il profilo è stato sospeso e i dati saranno rimossi completamente il %{date}. Fino ad allora, il profilo è ripristinabile senza alcun effetto negativo. Se desideri rimuovere immediatamente tutti i dati del profilo, puoi farlo di seguito.
+      title: Profili
+      unblock_email: Sblocca indirizzo email
+      unblocked_email_msg: Indirizzo email di %{username} sbloccato correttamente
       unconfirmed_email: Email non confermata
       undo_sensitized: Annulla sensibile
-      undo_silenced: Rimuovi silenzia
-      undo_suspension: Rimuovi sospensione
-      unsilenced_msg: Sono stati tolti i limiti dell'account di %{username}
-      unsubscribe: Annulla l'iscrizione
-      unsuspended_msg: È stata eliminata la sospensione dell'account di %{username}
+      undo_silenced: Annulla limitazione
+      undo_suspension: Annulla sospensione
+      unsilenced_msg: Limitazione del profilo di %{username} annullata correttamente
+      unsubscribe: Disiscriviti
+      unsuspended_msg: Sospensione del profilo di %{username} annullata correttamente
       username: Nome utente
-      view_domain: Visualizza riepilogo per dominio
-      warn: Avverti
+      view_domain: Visualizza il riepilogo per il dominio
+      warn: Avvisa
       web: Web
-      whitelisted: Nella whitelist
+      whitelisted: Consentito per la federazione
     action_logs:
       action_types:
-        assigned_to_self_report: Assegna report
-        change_email_user: Cambia l'e-mail per l'utente
-        confirm_user: Conferma utente
-        create_account_warning: Crea avviso
-        create_announcement: Crea un annuncio
-        create_custom_emoji: Crea emoji personalizzata
-        create_domain_allow: Crea permesso di dominio
-        create_domain_block: Crea blocco di dominio
-        create_email_domain_block: Crea blocco dominio e-mail
+        approve_appeal: Approva Ricorso
+        approve_user: Approva Utente
+        assigned_to_self_report: Assegna Segnalazione
+        change_email_user: Cambia l'Email per l'Utente
+        change_role_user: Cambia il Ruolo per l'Utente
+        confirm_user: Conferma l'Utente
+        create_account_warning: Crea Avviso
+        create_announcement: Crea Annuncio
+        create_canonical_email_block: Crea Blocco Email
+        create_custom_emoji: Crea Emoji Personalizzata
+        create_domain_allow: Crea Dominio Consentito
+        create_domain_block: Crea Blocco del Dominio
+        create_email_domain_block: Crea Blocco del Dominio Email
         create_ip_block: Crea regola IP
-        create_unavailable_domain: Crea dominio non disponibile
-        demote_user: Degrada l'utente
-        destroy_announcement: Cancella annuncio
-        destroy_custom_emoji: Cancella emoji personalizzata
-        destroy_domain_allow: Cancella permesso di dominio
-        destroy_domain_block: Cancella blocco di dominio
-        destroy_email_domain_block: Cancella blocco dominio e-mail
+        create_unavailable_domain: Crea Dominio Non Disponibile
+        create_user_role: Crea Ruolo
+        demote_user: Retrocedi Utente
+        destroy_announcement: Elimina Annuncio
+        destroy_canonical_email_block: Elimina Blocco Email
+        destroy_custom_emoji: Elimina Emoji Personalizzata
+        destroy_domain_allow: Elimina Dominio Consentito
+        destroy_domain_block: Elimina Blocco del Dominio
+        destroy_email_domain_block: Elimina Blocco del Dominio Email
+        destroy_instance: Elimina Dominio
         destroy_ip_block: Elimina regola IP
-        destroy_status: Cancella stato
-        destroy_unavailable_domain: Elimina dominio non disponibile
-        disable_2fa_user: Disabilita l'autenticazione a due fattori
-        disable_custom_emoji: Disabilita emoji personalizzata
-        disable_sign_in_token_auth_user: Disabilita autenticazione con codice via email per l'utente
-        disable_user: Disabilita utente
-        enable_custom_emoji: Abilita emoji personalizzata
-        enable_sign_in_token_auth_user: Abilita autenticazione con codice via email per l'utente
-        enable_user: Abilita utente
-        memorialize_account: Trasforma in account commemorativo
-        promote_user: Promuovi utente
-        remove_avatar_user: Elimina avatar
-        reopen_report: Riapri report
-        reset_password_user: Reimposta password
-        resolve_report: Risolvi report
-        sensitive_account: Contrassegna il media nel tuo profilo come sensibile
-        silence_account: Silenzia account
-        suspend_account: Sospendi account
-        unassigned_report: Disassegna report
-        unsensitive_account: Deseleziona il media nel tuo profilo come sensibile
-        unsilence_account: De-silenzia account
-        unsuspend_account: Annulla la sospensione dell'account
-        update_announcement: Aggiorna annuncio
-        update_custom_emoji: Aggiorna emoji personalizzata
-        update_domain_block: Aggiorna blocco di dominio
-        update_status: Aggiorna stato
+        destroy_status: Elimina Toot
+        destroy_unavailable_domain: Elimina Dominio Non Disponibile
+        destroy_user_role: Distruggi Ruolo
+        disable_2fa_user: Disabilita A2F
+        disable_custom_emoji: Disabilita Emoji Personalizzata
+        disable_sign_in_token_auth_user: Disabilita l'Autenticazione con Token via Email per l'Utente
+        disable_user: Disabilita l'Utente
+        enable_custom_emoji: Abilita Emoji Personalizzata
+        enable_sign_in_token_auth_user: Abilita l'Autenticazione con Token via Email per l'Utente
+        enable_user: Abilita l'Utente
+        memorialize_account: Commemora Profilo
+        promote_user: Promuovi Utente
+        reject_appeal: Rifiuta Ricorso
+        reject_user: Rifiuta Utente
+        remove_avatar_user: Rimuovi Avatar
+        reopen_report: Riapri Segnalazione
+        resend_user: Reinvia Email di Conferma
+        reset_password_user: Ripristina la Password
+        resolve_report: Risolvi Segnalazione
+        sensitive_account: Forza Profilo come Sensibile
+        silence_account: Limita Profilo
+        suspend_account: Sospendi Profilo
+        unassigned_report: Annulla Assegnazione Rapporto
+        unblock_email_account: Sblocca l'indirizzo email
+        unsensitive_account: Annulla Forza Profilo come Sensibile
+        unsilence_account: Annulla Limitazione Profilo
+        unsuspend_account: Annulla la Sospensione del Profilo
+        update_announcement: Aggiorna Annuncio
+        update_custom_emoji: Aggiorna Emoji Personalizzata
+        update_domain_block: Aggiorna Blocco del Dominio
+        update_ip_block: Aggiorna regola IP
+        update_status: Aggiorna Toot
+        update_user_role: Aggiorna Ruolo
       actions:
-        assigned_to_self_report_html: "%{name} ha assegnato il rapporto %{target} a se stesso"
-        change_email_user_html: "%{name} ha cambiato l'indirizzo e-mail dell'utente %{target}"
-        confirm_user_html: "%{name} ha confermato l'indirizzo e-mail dell'utente %{target}"
+        approve_appeal_html: "%{name} ha approvato il ricorso sulla decisione di moderazione da %{target}"
+        approve_user_html: "%{name} ha approvato l'iscrizione da %{target}"
+        assigned_to_self_report_html: "%{name} ha assegnato a se stesso la segnalazione %{target}"
+        change_email_user_html: "%{name} ha modificato l'indirizzo email dell'utente %{target}"
+        change_role_user_html: "%{name} ha cambiato il ruolo di %{target}"
+        confirm_user_html: "%{name} ha confermato l'indirizzo email dell'utente %{target}"
         create_account_warning_html: "%{name} ha inviato un avviso a %{target}"
         create_announcement_html: "%{name} ha creato un nuovo annuncio %{target}"
+        create_canonical_email_block_html: "%{name} ha bloccato l'email con l'hash %{target}"
         create_custom_emoji_html: "%{name} ha caricato una nuova emoji %{target}"
-        create_domain_allow_html: "%{name} ha consentito alla federazione col dominio %{target}"
-        create_domain_block_html: "%{name} ha bloccato dominio %{target}"
-        create_email_domain_block_html: "%{name} ha bloccato dominio e-mail %{target}"
+        create_domain_allow_html: "%{name} ha consentito la federazione con il dominio %{target}"
+        create_domain_block_html: "%{name} ha bloccato il dominio %{target}"
+        create_email_domain_block_html: "%{name} ha bloccato il dominio email %{target}"
         create_ip_block_html: "%{name} ha creato una regola per l'IP %{target}"
         create_unavailable_domain_html: "%{name} ha interrotto la consegna al dominio %{target}"
+        create_user_role_html: "%{name} ha creato il ruolo %{target}"
         demote_user_html: "%{name} ha retrocesso l'utente %{target}"
         destroy_announcement_html: "%{name} ha eliminato l'annuncio %{target}"
-        destroy_custom_emoji_html: "%{name} ha eliminato emoji %{target}"
-        destroy_domain_allow_html: "%{name} ha negato la federazione al dominio %{target}"
-        destroy_domain_block_html: "%{name} ha sbloccato dominio %{target}"
-        destroy_email_domain_block_html: "%{name} ha sbloccato il dominio e-mail %{target}"
+        destroy_canonical_email_block_html: "%{name} ha sbloccato l'email con l'hash %{target}"
+        destroy_custom_emoji_html: "%{name} ha eliminato l'emoji %{target}"
+        destroy_domain_allow_html: "%{name} non ha consentito la federazione con il dominio %{target}"
+        destroy_domain_block_html: "%{name} ha sbloccato il dominio %{target}"
+        destroy_email_domain_block_html: "%{name} ha sbloccato il dominio email %{target}"
+        destroy_instance_html: "%{name} ha eliminato il dominio %{target}"
         destroy_ip_block_html: "%{name} ha eliminato la regola per l'IP %{target}"
-        destroy_status_html: "%{name} ha eliminato lo status di %{target}"
+        destroy_status_html: "%{name} ha rimosso il toot di %{target}"
         destroy_unavailable_domain_html: "%{name} ha ripreso la consegna al dominio %{target}"
+        destroy_user_role_html: "%{name} ha eliminato il ruolo %{target}"
         disable_2fa_user_html: "%{name} ha disabilitato l'autenticazione a due fattori per l'utente %{target}"
         disable_custom_emoji_html: "%{name} ha disabilitato emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} ha disabilitato l'autenticazione con codice via email per %{target}"
-        disable_user_html: "%{name} ha disabilitato il login per l'utente %{target}"
-        enable_custom_emoji_html: "%{name} ha abilitato emoji %{target}"
+        disable_user_html: "%{name} ha disabilitato l'accesso per l'utente %{target}"
+        enable_custom_emoji_html: "%{name} ha abilitato l'emoji %{target}"
         enable_sign_in_token_auth_user_html: "%{name} ha abilitato l'autenticazione con codice via email per %{target}"
-        enable_user_html: "%{name} ha abilitato il login per l'utente %{target}"
-        memorialize_account_html: "%{name} ha trasformato l'account di %{target} in una pagina in memoriam"
+        enable_user_html: "%{name} ha abilitato l'accesso per l'utente %{target}"
+        memorialize_account_html: "%{name} ha trasformato il profilo di %{target} in una pagina commemorativa"
         promote_user_html: "%{name} ha promosso l'utente %{target}"
-        remove_avatar_user_html: "%{name} ha rimosso l'immagine profilo di %{target}"
-        reopen_report_html: "%{name} ha riaperto il rapporto %{target}"
-        reset_password_user_html: "%{name} ha reimpostato la password dell'utente %{target}"
-        resolve_report_html: "%{name} ha risolto il rapporto %{target}"
-        sensitive_account_html: "%{name} ha segnato il media di %{target} come sensibile"
+        reject_appeal_html: "%{name} ha rifiutato il ricorso alla decisione di moderazione da %{target}"
+        reject_user_html: "%{name} ha rifiutato l'iscrizione da %{target}"
+        remove_avatar_user_html: "%{name} ha rimosso l'avatar di %{target}"
+        reopen_report_html: "%{name} ha riaperto la segnalazione %{target}"
+        resend_user_html: "%{name} ha reinviato l'email di conferma per %{target}"
+        reset_password_user_html: "%{name} ha ripristinato la password dell'utente %{target}"
+        resolve_report_html: "%{name} ha risolto la segnalazione %{target}"
+        sensitive_account_html: "%{name} ha contrassegnato il media di %{target} come sensibile"
         silence_account_html: "%{name} ha silenziato l'account di %{target}"
         suspend_account_html: "%{name} ha sospeso l'account di %{target}"
         unassigned_report_html: "%{name} ha disassegnato il rapporto %{target}"
+        unblock_email_account_html: "%{name} ha sbloccato l'indirizzo email di %{target}"
         unsensitive_account_html: "%{name} ha annullato il segnare il media di %{target} come sensibile"
         unsilence_account_html: "%{name} ha riattivato l'account di %{target}"
         unsuspend_account_html: "%{name} ha annullato la sospensione dell'account di %{target}"
         update_announcement_html: "%{name} ha aggiornato l'annuncio %{target}"
         update_custom_emoji_html: "%{name} ha aggiornato emoji %{target}"
         update_domain_block_html: "%{name} ha aggiornato il blocco dominio per %{target}"
+        update_ip_block_html: "%{name} ha cambiato la regola per l'IP %{target}"
         update_status_html: "%{name} ha aggiornato lo status di %{target}"
-      deleted_status: "(stato cancellato)"
+        update_user_role_html: "%{name} ha modificato il ruolo %{target}"
+      deleted_account: account eliminato
       empty: Nessun log trovato.
       filter_by_action: Filtra per azione
       filter_by_user: Filtra per utente
@@ -354,11 +324,12 @@ it:
       enable: Abilita
       enabled: Abilitato
       enabled_msg: Questa emoji è stata abilitata con successo
-      image_hint: PNG fino a 50 KB
+      image_hint: PNG o GIF fino a %{size}
       list: Includi nell'elenco
       listed: Elencato
       new:
         title: Aggiungi nuovo emoji personalizzato
+      no_emoji_selected: Nessuna emoji è stata cambiata in quanto nessuna è stata selezionata
       not_permitted: Non hai il permesso di eseguire questa azione
       overwrite: Sovrascrivi
       shortcode: Scorciatoia
@@ -376,11 +347,17 @@ it:
       media_storage: Archiviazione media
       new_users: nuovi utenti
       opened_reports: rapporti aperti
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> appello in attesa"
+        other: "<strong>%{count}</strong> appelli in attesa"
       pending_reports_html:
-        one: "<strong>1</strong> rapporto in attesa"
-        other: "<strong>%{count}</strong> rapporti in attesa"
+        one: "<strong>%{count}</strong> segnalazione in attesa"
+        other: "<strong>%{count}</strong> segnalazioni in attesa"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag in attesa"
+        other: "<strong>%{count}</strong> hashtag in attesa"
       pending_users_html:
-        one: "<strong>1</strong> utente in attesa"
+        one: "<strong>%{count}</strong> utente in attesa"
         other: "<strong>%{count}</strong> utenti in attesa"
       resolved_reports: segnalazioni risolte
       software: Software
@@ -390,10 +367,16 @@ it:
       top_languages: Lingue più attive
       top_servers: Server più attivi
       website: Sito web
+    disputes:
+      appeals:
+        empty: Nessun appello trovato.
+        title: Appelli
     domain_allows:
       add_new: Dominio nella whitelist
       created_msg: Il dominio è stato inserito nella whitelist
       destroyed_msg: Il dominio è stato eliminato dalla whitelist
+      export: Esportare
+      import: Importare
       undo: Elimina dalla whitelist
     domain_blocks:
       add_new: Aggiungi nuovo
@@ -401,16 +384,21 @@ it:
       destroyed_msg: Il blocco del dominio è stato rimosso
       domain: Dominio
       edit: Modifica blocco di dominio
-      existing_domain_block_html: Hai già impostato limitazioni più stringenti su %{name}, dovresti <a href="%{unblock_url}">sbloccare</a> prima.
+      existing_domain_block: Hai già imposto limiti più severi a %{name}.
+      existing_domain_block_html: Hai già impostato limitazioni più stringenti su %{name}, dovresti <a href="%{unblock_url}">sbloccarlo</a> prima.
+      export: Esportare
+      import: Importare
       new:
         create: Crea blocco
         hint: Il blocco dominio non previene la creazione di utenti nel database, ma applicherà automaticamente e retroattivamente metodi di moderazione specifici su quegli account.
         severity:
-          desc_html: "<strong>Silenzia</strong> rende i post di questo account invisibili a chiunque non lo stia seguendo. <strong>Sospendi</strong> elimina tutti i contenuti, media e dati del profilo dell'account. Usa <strong>Nessuno</strong> se vuoi solo bloccare i file media."
+          desc_html: "<strong>Limita</strong> renderà invisibili i post degli account di questo dominio a chiunque non li stia seguendo. <strong>Sospendi</strong> rimuoverà tutti i contenuti, gli elementi multimediali e i dati del profilo per gli account di questo dominio dal tuo server. Utilizza <strong>Nessuno</strong> se desideri solo rifiutare i file multimediali."
           noop: Nessuno
-          silence: Silenzia
+          silence: Limita
           suspend: Sospendi
         title: Nuovo blocco dominio
+      no_domain_block_selected: Nessun blocco di dominio è stato modificato perché non ne è stato selezionato nessuno
+      not_permitted: Non hai il permesso di eseguire questa azione
       obfuscate: Nascondi nome di dominio
       obfuscate_hint: Nascondere parzialmente il nome di dominio, se è abilitata la visualizzazione pubblica dell'elenco delle limitazioni di dominio
       private_comment: Commento privato
@@ -421,34 +409,41 @@ 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
-      rejecting_media: rigetta file media
-      rejecting_reports: rigetta segnalazioni
-      severity:
-        silence: silenziato
-        suspend: sospeso
-      show:
-        affected_accounts:
-          one: Interessato un solo account nel database
-          other: Interessati %{count} account nel database
-        retroactive:
-          silence: De-silenzia tutti gli account esistenti da questo dominio
-          suspend: Annulla la sospensione di tutti gli account esistenti da questo dominio
-        title: Annulla il blocco del dominio per %{domain}
-        undo: Annulla
       undo: Annulla
       view: Visualizza blocco di dominio
     email_domain_blocks:
       add_new: Aggiungi nuovo
+      attempts_over_week:
+        one: "%{count} tentativo nell'ultima settimana"
+        other: "%{count} tentativi di registrazione nell'ultima settimana"
       created_msg: Dominio email aggiunto con successo alla lista nera
       delete: Elimina
-      destroyed_msg: Dominio email cancellato con successo dalla lista nera
+      dns:
+        types:
+          mx: Record MX
       domain: Dominio
-      empty: Nessun dominio di posta elettronica attualmente in blacklist.
-      from_html: da %{domain}
       new:
         create: Aggiungi dominio
+        resolve: Risolvi dominio
         title: Nuova voce della lista nera delle email
+      no_email_domain_block_selected: Nessun blocco di dominio di posta elettronica è stato modificato in quanto nessuno è stato selezionato
+      resolved_dns_records_hint_html: Il nome di dominio si risolve ai seguenti domini MX, che sono in ultima analisi responsabili per l'accettazione di e-mail. Il blocco di un dominio MX bloccherà le iscrizioni da qualsiasi indirizzo e-mail che utilizza lo stesso dominio MX, anche se il nome di dominio visibile è diverso. <strong>Fai attenzione a non bloccare i principali provider di posta elettronica.</strong>
+      resolved_through_html: Risolto attraverso %{domain}
       title: Lista nera email
+    export_domain_allows:
+      new:
+        title: Importare i permessi di dominio
+      no_file: Nessun file selezionato
+    export_domain_blocks:
+      import:
+        description_html: Stai per importare un elenco di blocchi di domini. Si prega di rivedere questo elenco con molta attenzione, soprattutto se non si è creato personalmente questo elenco.
+        existing_relationships_warning: Relazioni di connessioni esistenti
+        private_comment_description_html: 'Per aiutarti a tenere traccia della provenienza dei blocchi importati, i blocchi importati verranno creati con il seguente commento privato: <q>%{comment}</q>'
+        private_comment_template: Importato da %{source} il %{date}
+        title: Importare i blocchi di dominio
+      new:
+        title: Importare i blocchi di dominio
+      no_file: Nessun file selezionato
     follow_recommendations:
       description_html: "<strong>I consigli su chi seguire aiutano i nuovi utenti a trovare rapidamente dei contenuti interessanti</strong>. Quando un utente non ha interagito abbastanza con altri per avere dei consigli personalizzati, vengono consigliati questi account. Sono ricalcolati ogni giorno da un misto di account con le più alte interazioni recenti e con il maggior numero di seguaci locali per una data lingua."
       language: Per lingua
@@ -458,25 +453,53 @@ it:
       title: Consigli su chi seguire
       unsuppress: Ripristina consigli su chi seguire
     instances:
+      availability:
+        description_html:
+          one: Se la consegna al dominio fallisce <strong>%{count} giorno</strong>, non sarà effettuato alcun tentativo di consegna ulteriore a meno che la consegna <em>dal</em> dominio non sia ricevuta.
+          other: Se la consegna al dominio fallisce <strong>%{count} giorni differenti</strong>, non sarà effettuato alcun tentativo di consegna ulteriore a meno che la consegna <em>dal</em> dominio non sia ricevuta.
+        failure_threshold_reached: Soglia di fallimento raggiunta il %{date}.
+        failures_recorded:
+          one: Tentativo fallito %{count} giorno.
+          other: Tentativo fallito %{count} giorni differenti.
+        no_failures_recorded: Nessun fallimento registrato.
+        title: Disponibilità
+        warning: L'ultimo tentativo di connessione a questo server non è riuscito
       back_to_all: Tutto
       back_to_limited: Limitato
       back_to_warning: Avviso
       by_domain: Dominio
+      confirm_purge: Sei sicuro di voler cancellare definitivamente i dati di questo dominio?
+      content_policies:
+        comment: Nota interna
+        description_html: Puoi definire le politiche del contenuto che saranno applicate a tutti i profili da questo dominio e ognuno dei suoi sottodomini.
+        policies:
+          reject_media: Rifiuta multimedia
+          reject_reports: Rifiuta rapporti
+          silence: Limita
+          suspend: Sospendi
+        policy: Politica
+        reason: Motivo pubblico
+        title: Politiche sui contenuti
+      dashboard:
+        instance_accounts_dimension: Profili più seguiti
+        instance_accounts_measure: profili memorizzati
+        instance_followers_measure: i nostri seguaci lì
+        instance_follows_measure: i loro seguaci qui
+        instance_languages_dimension: Lingue preferite
+        instance_media_attachments_measure: allegati multimediali memorizzati
+        instance_reports_measure: segnalazioni su di loro
+        instance_statuses_measure: post memorizzati
       delivery:
         all: Tutto
         clear: Cancella errori di consegna
+        failing: Con errori
         restart: Riavvia la consegna
         stop: Interrompi consegna
-        title: Consegna
         unavailable: Non disponibile
-        unavailable_message: Consegna non disponibile
-        warning: Avviso
-        warning_message:
-          one: Errore di consegna %{count} giorno
-          other: Errori di consegna %{count} giorni
       delivery_available: Distribuzione disponibile
       delivery_error_days: Giorni con errori di consegna
       delivery_error_hint: Se la consegna non è possibile per %{count} giorni, sarà automaticamente contrassegnata come non consegnabile.
+      destroyed_msg: I dati da %{domain} sono in coda per l'eliminazione imminente.
       empty: Nessun dominio trovato.
       known_accounts:
         one: "%{count} account noto"
@@ -487,12 +510,15 @@ it:
         title: Moderazione
       private_comment: Commento privato
       public_comment: Commento pubblico
+      purge: Ripulisci
+      purge_description_html: Se credi che questo dominio sia offline per sempre, puoi eliminare tutti i registri del profilo e i dati associati da questo dominio dalla tua archiviazione. Questo potrebbe richiedere un po' di tempo.
       title: Istanze conosciute
       total_blocked_by_us: Bloccato da noi
       total_followed_by_them: Seguito da loro
       total_followed_by_us: Seguito da noi
       total_reported: Segnalazioni su di loro
       total_storage: Media allegati
+      totals_time_period_hint_html: I totali sotto visualizzati includono i dati per tutti i tempi.
     invites:
       deactivate_all: Disattiva tutto
       filter:
@@ -516,8 +542,6 @@ it:
         title: Crea una nuova regola IP
       no_ip_block_selected: Nessuna regola IP è stata modificata poiché nessuna è stata selezionata
       title: Regole IP
-    pending_accounts:
-      title: Account in attesa (%{count})
     relationships:
       title: Relazioni di %{acct}
     relays:
@@ -544,39 +568,121 @@ it:
         notes:
           one: "%{count} nota"
           other: "%{count} note"
-        reports:
-          one: "%{count} rapporto"
-          other: "%{count} rapporti"
+      action_log: Registro di controllo
       action_taken_by: Azione intrapresa da
+      actions:
+        delete_description_html: I post segnalati saranno eliminati e la sanzione sarà registrata per aiutarti a prendere ulteriori provvedimenti sulle future infrazioni dello stesso account.
+        mark_as_sensitive_description_html: I contenuti nei post segnalati saranno segnati come sensibili e verrà registrata una sanzione per aiutarti a prendere ulteriori provvedimenti sulle future infrazioni dello stesso account.
+        other_description_html: Vedi altre opzioni per controllare il comportamento dell'account e personalizzare la comunicazione all'account segnalato.
+        resolve_description_html: Nessuna azione sarà intrapresa contro l'account segnalato, nessuna sanzione registrata, e la segnalazione sarà chiusa.
+        silence_description_html: Il profilo sarà visibile solo a coloro che lo seguono o lo cercano manualmente, limitandone fortemente la raggiungibilità. Può sempre essere annullato.
+        suspend_description_html: Il profilo e tutti i suoi contenuti diventeranno inaccessibili fino a quando non sarà cancellato. L'interazione con l'account sarà impossibile. Annullabile entro 30 giorni.
+      actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
+      add_to_report: Aggiungi altro al report
       are_you_sure: Sei sicuro?
       assign_to_self: Assegna a me
       assigned: Moderatore assegnato
+      by_target_domain: Dominio dell'account segnalato
+      category: Categoria
+      category_description_html: Il motivo per cui questo account e/o contenuto è stato segnalato sarà citato nella comunicazione con l'account segnalato
       comment:
         none: Nessuno
+      comment_description_html: 'Per fornire ulteriori informazioni, %{name} ha scritto:'
       created_at: Segnalato
+      delete_and_resolve: Cancella post
       forwarded: Inoltrato
       forwarded_to: Inoltrato a %{domain}
       mark_as_resolved: Segna come risolto
+      mark_as_sensitive: Segna come sensibile
       mark_as_unresolved: Segna come non risolto
+      no_one_assigned: Nessuno
       notes:
         create: Aggiungi nota
         create_and_resolve: Risolvi con nota
         create_and_unresolve: Riapri con nota
         delete: Elimina
         placeholder: Descrivi quali azioni sono state intraprese, o ogni altro aggiornamento rilevante...
+        title: Note
+      notes_description_html: Visualizza e lascia note ad altri moderatori e al tuo futuro sé
+      quick_actions_description_html: 'Fai un''azione rapida o scorri verso il basso per vedere il contenuto segnalato:'
+      remote_user_placeholder: l'utente remoto da %{instance}
       reopen: Riapri rapporto
       report: 'Rapporto #%{id}'
       reported_account: Account segnalato
       reported_by: Inviato da
       resolved: Risolto
       resolved_msg: Rapporto risolto!
+      skip_to_actions: Passa alle azioni
       status: Stato
-      target_domain: Dominio dell'account segnalato
+      statuses: Contenuto segnalato
+      statuses_description_html: Il contenuto offensivo sarà citato nella comunicazione con l'account segnalato
       target_origin: Origine dell'account segnalato
       title: Rapporti
       unassign: Non assegnare
       unresolved: Non risolto
       updated_at: Aggiornato
+      view_profile: Visualizza profilo
+    roles:
+      add_new: Aggiungi ruolo
+      assigned_users:
+        one: "%{count} utente"
+        other: "%{count} utenti"
+      categories:
+        administration: Amministrazione
+        devops: DevOps
+        invites: Inviti
+        moderation: Moderazione
+        special: Speciale
+      delete: Cancella
+      description_html: Con i <strong>ruoli utente</strong>, puoi personalizzare a quali funzioni e aree di Mastodon i tuoi utenti possono accedere.
+      edit: Modifica il ruolo '%{name}'
+      everyone: Permessi predefiniti
+      everyone_full_description_html: Questo è il ruolo <strong>base</strong> che influenza <strong>tutti gli utenti</strong>, anche quelli senza un ruolo assegnato. Tutti gli altri ruoli ereditano i permessi da esso.
+      permissions_count:
+        one: "%{count} permesso"
+        other: "%{count} permessi"
+      privileges:
+        administrator: Amministratore
+        administrator_description: Gli utenti con questo permesso saranno esentati da ogni permesso
+        delete_user_data: Cancella dati utente
+        delete_user_data_description: Consente agli utenti di eliminare subito i dati degli altri utenti
+        invite_users: Invita Utenti
+        invite_users_description: Consente agli utenti di invitare nuove persone su questo server
+        manage_announcements: Gestisci Annunci
+        manage_announcements_description: Consente agli utenti di gestire gli annunci sul server
+        manage_appeals: Gestisci appelli
+        manage_appeals_description: Consente agli utenti di esaminare i ricorsi contro le azioni di moderazione
+        manage_blocks: Gestisci Blocchi
+        manage_blocks_description: Consente agli utenti di bloccare provider e-mail e indirizzi IP
+        manage_custom_emojis: Gestisci emoji personalizzate
+        manage_custom_emojis_description: Consente agli utenti di gestire emoji personalizzate sul server
+        manage_federation: Gestisci Federazione
+        manage_federation_description: Consente agli utenti di bloccare o consentire la federazione con altri domini e controllare la consegnabilità
+        manage_invites: Gestisci Inviti
+        manage_invites_description: Consente agli utenti di esaminare e disattivare i link di invito
+        manage_reports: Gestisci report
+        manage_reports_description: Consente agli utenti di esaminare i report ed eseguire azioni di moderazione su di essi
+        manage_roles: Gestisci Ruoli
+        manage_roles_description: Consente agli utenti di gestire e assegnare i ruoli inferiori al loro
+        manage_rules: Gestisci Regole
+        manage_rules_description: Consente agli utenti di modificare le regole del server
+        manage_settings: Gestisci impostazioni
+        manage_settings_description: Consente agli utenti di modificare le impostazioni del sito
+        manage_taxonomies: Gestisci Tassonomie
+        manage_taxonomies_description: Consente agli utenti di esaminare i contenuti di tendenza e aggiornare le impostazioni degli hashtag
+        manage_user_access: Gestisci accesso utenti
+        manage_user_access_description: Consente agli utenti di disabilitare l'autenticazione a due fattori degli altri utenti, modificare il loro indirizzo e-mail e reimpostare la password
+        manage_users: Gestisci utenti
+        manage_users_description: Consente agli utenti di visualizzare le informazioni sugli altri utenti ed eseguire azioni di moderazione contro di loro
+        manage_webhooks: Gestisci Webhook
+        manage_webhooks_description: Consente agli utenti di impostare webhook per eventi amministrativi
+        view_audit_log: Visualizza Registro Attività
+        view_audit_log_description: Consente agli utenti di vedere una cronologia delle azioni amministrative sul server
+        view_dashboard: Mostra dashboard
+        view_dashboard_description: Consente agli utenti di accedere alla dashboard e alle varie metriche
+        view_devops: DevOps
+        view_devops_description: Consente agli utenti di accedere alle dashboard Sidekiq e pgHero
+      title: Ruoli
     rules:
       add_new: Aggiungi regola
       delete: Cancella
@@ -585,142 +691,201 @@ it:
       empty: Non sono ancora state definite regole del server.
       title: Regole del server
     settings:
-      activity_api_enabled:
-        desc_html: Conteggi degli status pubblicati localmente, degli utenti attivi e delle nuove registrazioni in gruppi settimanali
-        title: Pubblica statistiche aggregate circa l'attività dell'utente
-      bootstrap_timeline_accounts:
-        desc_html: Separa i nomi utente con virgola. Funziona solo con account locali e non bloccati. Quando vuoto, valido per tutti gli amministratori locali.
-        title: Seguiti predefiniti per i nuovi utenti
-      contact_information:
-        email: E-mail di lavoro
-        username: Nome utente del contatto
-      custom_css:
-        desc_html: Modifica l'aspetto con il CSS caricato in ogni pagina
-        title: CSS personalizzato
+      about:
+        manage_rules: Gestisci le regole del server
+        preamble: Fornire informazioni approfondite su come, il server, venga gestito, moderato e finanziato.
+        rules_hint: C'è un'area dedicata per le regole che i tuoi utenti dovrebbero rispettare.
+        title: Info
+      appearance:
+        preamble: Personalizza l'interfaccia web di Mastodon.
+        title: Aspetto
+      branding:
+        preamble: 'Il marchio del tuo server lo differenzia dagli altri server nella rete. Queste informazioni possono essere visualizzate in una varietà di ambienti, come: l''interfaccia web di Mastodon, le applicazioni native, nelle anteprime dei collegamenti su altri siti Web e all''interno delle app di messaggistica e così via. Per questo motivo, è meglio mantenere queste informazioni chiare, brevi e concise.'
+        title: Marchio
+      content_retention:
+        preamble: Controlla come vengono memorizzati i contenuti generati dall'utente in Mastodon.
+        title: Conservazione dei contenuti
       default_noindex:
-        desc_html: Interessa tutti gli utenti che non hanno cambiato questa impostazione
+        desc_html: Interessa tutti gli utenti che non hanno modificato personalmente questa impostazione
         title: Esclude gli utenti dall'indicizzazione dei motori di ricerca per impostazione predefinita
+      discovery:
+        follow_recommendations: Segui le raccomandazioni
+        preamble: La comparsa di contenuti interessanti è determinante per l'arrivo di nuovi utenti che potrebbero non conoscere nessuno su Mastodon. Controlla in che modo varie funzionalità di scoperta funzionano sul tuo server.
+        profile_directory: Directory del profilo
+        public_timelines: Timeline pubbliche
+        title: Scopri
+        trends: Tendenze
       domain_blocks:
         all: A tutti
         disabled: A nessuno
-        title: Mostra blocchi di dominio
         users: Agli utenti locali connessi
-      domain_blocks_rationale:
-        title: Mostra motivazione
-      hero:
-        desc_html: Mostrata nella pagina iniziale. Almeno 600x100 px consigliati. Se non impostata, sarà usato il thumbnail del server
-        title: Immagine dell'eroe
-      mascot:
-        desc_html: Mostrata su più pagine. Almeno 293×205px consigliati. Se non impostata, sarò usata la mascotte predefinita
-        title: Immagine della mascotte
-      peers_api_enabled:
-        desc_html: Nomi di dominio che questo server ha incontrato nel fediverse
-        title: Pubblica elenco dei server scoperti
-      preview_sensitive_media:
-        desc_html: Le anteprime dei link su altri siti mostreranno un thumbnail anche se il media è segnato come sensibile
-        title: Mostra media sensibili nella anteprime OpenGraph
-      profile_directory:
-        desc_html: Permetti agli utenti di essere trovati
-        title: Attiva directory dei profili
       registrations:
-        closed_message:
-          desc_html: Mostrato nella pagina iniziale quando le registrazioni sono chiuse. Puoi usare tag HTML
-          title: Messaggio per registrazioni chiuse
-        deletion:
-          desc_html: Consenti a chiunque di cancellare il proprio account
-          title: Apri la cancellazione dell'account
-        min_invite_role:
-          disabled: Nessuno
-          title: Permetti inviti da
-        require_invite_text:
-          desc_html: Quando le iscrizioni richiedono l'approvazione manuale, rendere la richiesta “Perché si desidera iscriversi?” obbligatoria invece che opzionale
-          title: Richiedi ai nuovi utenti di rispondere alla richiesta di motivazione per l'iscrizione
+        preamble: Controlla chi può creare un account sul tuo server.
+        title: Registrazioni
       registrations_mode:
         modes:
           approved: Approvazione richiesta per le iscrizioni
           none: Nessuno può iscriversi
           open: Chiunque può iscriversi
-        title: Modalità di registrazione
-      show_known_fediverse_at_about_page:
-        desc_html: Quando attivato, mostra nell'anteprima i toot da tutte le istanze conosciute. Altrimenti mostra solo i toot locali.
-        title: Mostra la fediverse conosciuta nell'anteprima della timeline
-      show_staff_badge:
-        desc_html: Mostra un distintivo dello staff sulla pagina dell'utente
-        title: Mostra badge staff
-      site_description:
-        desc_html: Paragrafo introduttivo nella pagina iniziale. Descrive ciò che rende speciale questo server Mastodon e qualunque altra cosa sia importante dire. Potete usare marcatori HTML, in particolare <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descrizione del server
-      site_description_extended:
-        desc_html: Un posto adatto per pubblicare regole di comportamento, linee guida e altre cose specifiche del vostro server. Potete usare marcatori HTML
-        title: Informazioni estese personalizzate
-      site_short_description:
-        desc_html: Mostrato nella barra laterale e nei tag meta. Descrive in un paragrafo che cos'è Mastodon e che cosa rende questo server speciale. Se vuoto, sarà usata la descrizione predefinita del server.
-        title: Breve descrizione del server
-      site_terms:
-        desc_html: Potete scrivere la vostra politica sulla privacy, condizioni del servizio o altre informazioni legali. Potete usare tag HTML
-        title: Termini di servizio personalizzati
-      site_title: Nome del server
-      thumbnail:
-        desc_html: Usato per anteprime tramite OpenGraph e API. 1200x630px consigliati
-        title: Thumbnail del server
-      timeline_preview:
-        desc_html: Mostra la timeline pubblica sulla pagina iniziale
-        title: Anteprima timeline
-      title: Impostazioni sito
-      trendable_by_default:
-        desc_html: Interessa gli hashtag che non sono stati precedentemente disattivati
-        title: Permetti agli hashtag di comparire nei trend senza prima controllarli
-      trends:
-        desc_html: Visualizza pubblicamente gli hashtag precedentemente esaminati che sono attualmente in tendenza
-        title: Hashtag di tendenza
+      title: Impostazioni del server
     site_uploads:
       delete: Cancella il file caricato
       destroyed_msg: Caricamento sito eliminato!
     statuses:
+      account: Autore
+      application: Applicazione
       back_to_account: Torna alla pagina dell'account
+      back_to_report: Torna alla pagina del report
       batch:
-        delete: Elimina
-        nsfw_off: Segna come non sensibile
-        nsfw_on: Segna come sensibile
+        remove_from_report: Rimuovi dal report
+        report: Rapporto
       deleted: Cancellato
-      failed_to_execute: Impossibile eseguire
+      favourites: Preferiti
+      history: Cronologia delle versioni
+      in_reply_to: In risposta a
+      language: Lingua
       media:
         title: Media
-      no_media: Nessun media
+      metadata: Metadati
       no_status_selected: Nessun status è stato modificato perché nessuno era stato selezionato
+      open: Apri il post
+      original_status: Post originale
+      reblogs: Condivisioni
+      status_changed: Post modificato
       title: Gli status dell'account
+      trending: Di tendenza
+      visibility: Visibilità
       with_media: con media
+    strikes:
+      actions:
+        delete_statuses: "%{name} ha eliminato i post di %{target}"
+        disable: "%{name} ha congelato l'account di %{target}"
+        mark_statuses_as_sensitive: "%{name} ha segnato il media di %{target} come sensibile"
+        none: "%{name} ha inviato un avviso a %{target}"
+        sensitive: "%{name} ha contrassegnato l'account di %{target} come sensibile"
+        silence: "%{name} ha limitato l'account di %{target}"
+        suspend: "%{name} ha sospeso l'account di %{target}"
+      appeal_approved: Sottoposto ad appello
+      appeal_pending: Appello in attesa
     system_checks:
       database_schema_check:
         message_html: Ci sono migrazioni del database in attesa. Sei pregato di eseguirle per assicurarti che l'applicazione si comporti come previsto
+      elasticsearch_running_check:
+        message_html: Impossibile connettersi a Elasticsearch. Verificare che sia in esecuzione o disabilitare la ricerca full-text
+      elasticsearch_version_check:
+        message_html: 'Versione Elasticsearch incompatibile: %{value}'
+        version_comparison: È in esecuzione la versione %{running_version} di Elasticsearch, ma è richiesta la versione %{required_version}
       rules_check:
         action: Gestisci regole del server
         message_html: Non hai definito alcuna regola del server.
       sidekiq_process_check:
         message_html: Nessun processo di Sidekiq in esecuzione per le code di %{value}. Sei pregato di revisionare la tua configurazione di Sidekiq
     tags:
-      accounts_today: Usi unici oggi
-      accounts_week: Usi unici questa settimana
-      breakdown: Suddivisione dell'utilizzo di oggi per fonte
-      last_active: Ultima attività
-      most_popular: Più popolari
-      most_recent: Più recenti
-      name: Hashtag
       review: Esamina status
-      reviewed: Controllato
-      title: Hashtag
-      trending_right_now: Di tendenza ora
-      unique_uses_today: "%{count} post oggi"
-      unreviewed: Non controllato
-      updated_msg: Impostazioni degli hashtag aggiornate
+      updated_msg: Impostazioni hashtag aggiornate con successo
     title: Amministrazione
+    trends:
+      allow: Consenti
+      approved: Approvato
+      disallow: Non consentire
+      links:
+        allow: Consenti link
+        allow_provider: Consenti editore
+        description_html: Questi sono collegamenti che attualmente vengono molto condivisi dagli account di cui il server vede i post. Può aiutare i tuoi utenti a scoprire cosa sta succedendo nel mondo. Nessun link viene visualizzato pubblicamente finché non si approva chi lo pubblica. È anche possibile permettere o rifiutare i singoli collegamenti.
+        disallow: Non consentire link
+        disallow_provider: Non consentire editore
+        no_link_selected: Nessun collegamento è stato modificato in quanto nessuno è stato selezionato
+        publishers:
+          no_publisher_selected: Nessun editore è stato modificato in quanto nessuno è stato selezionato
+        shared_by_over_week:
+          one: Condiviso da una persona nell'ultima settimana
+          other: Condiviso da %{count} persone nell'ultima settimana
+        title: Link in tendenza
+        usage_comparison: Condiviso %{today} volte oggi, rispetto a %{yesterday} ieri
+      only_allowed: Solo consentiti
+      pending_review: Revisione in sospeso
+      preview_card_providers:
+        allowed: I link da questa fonte possono essere in tendenza
+        description_html: Questi sono domini da cui i link sono spesso condivisi sul tuo server. I link non appariranno di tendenza se il dominio del link non è approvato. La tua approvazione (o rifiuto) si estende ai sottodomini.
+        rejected: I link da questa fonte non possono essere in tendenza
+        title: Editori
+      rejected: Rifiutato
+      statuses:
+        allow: Consenti post
+        allow_account: Consenti autore
+        description_html: Questi sono post noti al tuo server che sono attualmente molto condivisi e preferiti. Può aiutare i tuoi utenti (nuovi e non) a trovare più persone da seguire. Nessun post viene visualizzato pubblicamente fino a quando si approva l'autore, e l'autore permette che il suo account sia suggerito ad altri. È anche possibile permettere o rifiutare singoli post.
+        disallow: Non consentire post
+        disallow_account: Non consentire autore
+        no_status_selected: Nessun post di tendenza è stato modificato in quanto nessuno è stato selezionato
+        not_discoverable: L'autore non ha optato di essere scopribile
+        shared_by:
+          one: Condiviso o preferito una volta
+          other: Condiviso e preferito %{friendly_count} volte
+        title: Post di tendenza
+      tags:
+        current_score: Punteggio corrente %{score}
+        dashboard:
+          tag_accounts_measure: usi unici
+          tag_languages_dimension: Lingue migliori
+          tag_servers_dimension: Server migliori
+          tag_servers_measure: server diversi
+          tag_uses_measure: usi totali
+        description_html: Questi sono hashtag che attualmente compaiono in molti post che il tuo server vede. Può aiutare i tuoi utenti a scoprire di cosa le persone stanno parlando di più al momento. Nessun hashtag viene visualizzato pubblicamente finché non lo approvi.
+        listable: Suggeribile
+        no_tag_selected: Nessun tag è stato modificato in quanto nessuno è stato selezionato
+        not_listable: Non sarà suggerito
+        not_trendable: Non apparirà nelle tendenze
+        not_usable: Inutilizzabile
+        peaked_on_and_decaying: Ha avuto un picco il %{date}, ora in caduta
+        title: Hashtag in tendenza
+        trendable: Può comparire nelle tendenze
+        trending_rank: 'In tendenza #%{rank}'
+        usable: Utilizzabile
+        usage_comparison: Usato %{today} volte oggi, rispetto a %{yesterday} ieri
+        used_by_over_week:
+          one: Usato da una persona nell'ultima settimana
+          other: Usato da %{count} persone nell'ultima settimana
+      title: Tendenze
+      trending: Di tendenza
     warning_presets:
       add_new: Aggiungi nuovo
       delete: Cancella
       edit_preset: Modifica avviso predefinito
       empty: Non hai ancora definito alcun avviso preimpostato.
       title: Gestisci avvisi predefiniti
+    webhooks:
+      add_new: Aggiungi endpoint
+      delete: Elimina
+      description_html: Un <strong>webhook</strong> consente a Mastodon di inviare <strong>notifiche in tempo reale</strong> su determinati eventi alla tua applicazione, così la tua applicazione può <strong>attivare automaticamente delle reazioni</strong>.
+      disable: Disabilita
+      disabled: Disabilitato
+      edit: Modifica endpoint
+      empty: Non hai ancora configurato alcun endpoint per webhook.
+      enable: Abilita
+      enabled: Attivo
+      enabled_events:
+        one: 1 evento abilitato
+        other: "%{count} eventi abilitati"
+      events: Eventi
+      new: Nuovo webhook
+      rotate_secret: Ruota segreto
+      secret: Segreto per firma
+      status: Stato
+      title: Webhook
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: per cancellare i loro post
+        disable: per congelare il loro account
+        mark_statuses_as_sensitive: per contrassegnare i loro post come sensibili
+        none: avviso
+        sensitive: per contrassegnare il loro account come sensibile
+        silence: per limitare il loro account
+        suspend: per sospendere il loro account
+      body: "%{target} sta facendo appello contro una decisione di moderazione di %{action_taken_by} da %{date}, che era %{type}. Ha scritto:"
+      next_steps: Puoi approvare l'appello per annullare la decisione di moderazione, oppure ignorarlo.
+      subject: "%{username} sta facendo appello contro una decisione di moderazione su %{instance}"
     new_pending_account:
       body: I dettagli del nuovo account sono qui sotto. Puoi approvare o rifiutare questa richiesta.
       subject: Nuovo account pronto per la revisione su %{instance} (%{username})
@@ -728,9 +893,17 @@ it:
       body: "%{reporter} ha segnalato %{target}"
       body_remote: Qualcuno da %{domain} ha segnalato %{target}
       subject: Nuova segnalazione per %{instance} (#%{id})
-    new_trending_tag:
-      body: 'L''hashtag #%{name} oggi è di tendenza, ma non è stato mai controllato. Non sarà visualizzato pubblicamente se non lo permetti; se salvi il form senza modifiche non lo vedrai mai più.'
-      subject: Nuovo hashtag pronto per essere controllato su %{instance} (#%{name})
+    new_trends:
+      body: 'I seguenti elementi necessitano di un controllo prima che possano essere visualizzati pubblicamente:'
+      new_trending_links:
+        title: Link di tendenza
+      new_trending_statuses:
+        title: Post di tendenza
+      new_trending_tags:
+        no_approved_tags: Attualmente non ci sono hashtag di tendenza approvati.
+        requirements: 'Ognuno di questi candidati potrebbe superare il #%{rank} hashtag di tendenza approvato, che è attualmente "%{lowest_tag_name}" con un punteggio di %{lowest_tag_score}.'
+        title: Hashtag di tendenza
+      subject: Nuove tendenze in attesa di controllo su %{instance}
   aliases:
     add_new: Crea alias
     created_msg: Hai creato un nuovo alias. Ora puoi iniziare lo spostamento dal vecchio account.
@@ -743,7 +916,7 @@ it:
     advanced_web_interface_hint: |-
       Se vuoi utilizzare l'intera larghezza dello schermo, l'interfaccia web avanzata ti consente di configurare varie colonne per mostrare più informazioni allo stesso tempo, secondo le tue preferenze:
       Home, notifiche, timeline federata, qualsiasi numero di liste e etichette.
-    animations_and_accessibility: Animazioni e accessibiiltà
+    animations_and_accessibility: Animazioni e accessibilità
     confirmation_dialogs: Dialoghi di conferma
     discovery: Scoperta
     localization:
@@ -758,20 +931,17 @@ it:
     settings: 'Cambia le impostazioni per le email: %{link}'
     view: 'Guarda:'
     view_profile: Mostra profilo
-    view_status: Mostra stati
+    view_status: Mostra post
   applications:
     created: Applicazione creata con successo
     destroyed: Applicazione eliminata con successo
-    invalid_url: L'URL fornito non è valido
     regenerate_token: Rigenera il token di accesso
     token_regenerated: Token di accesso rigenerato
     warning: Fa' molta attenzione con questi dati. Non fornirli mai a nessun altro!
     your_token: Il tuo token di accesso
   auth:
-    apply_for_account: Chiedi un invito
+    apply_for_account: Richiedi un account
     change_password: Password
-    checkbox_agreement_html: Sono d'accordo con le <a href="%{rules_path}" target="_blank">regole del server</a> ed i <a href="%{terms_path}" target="_blank">termini di servizio</a>
-    checkbox_agreement_without_rules_html: Accetto i <a href="%{terms_path}" target="_blank">termini di servizio</a>
     delete_account: Elimina account
     delete_account_html: Se desideri cancellare il tuo account, puoi <a href="%{path}">farlo qui</a>. Ti sarà chiesta conferma.
     description:
@@ -784,11 +954,13 @@ it:
     invalid_reset_password_token: Il token di reimpostazione della password non è valido o è scaduto. Per favore richiedine uno nuovo.
     link_to_otp: Inserisci un codice a due fattori dal tuo telefono o un codice di recupero
     link_to_webauth: Usa il tuo dispositivo chiave di sicurezza
+    log_in_with: Accedi con
     login: Entra
     logout: Esci da Mastodon
     migrate_account: Sposta ad un account differente
     migrate_account_html: Se vuoi che questo account sia reindirizzato a uno diverso, puoi <a href="%{path}">configurarlo qui</a>.
     or_log_in_with: Oppure accedi con
+    privacy_policy_agreement_html: Ho letto e accetto l'<a href="%{privacy_policy_path}" target="_blank">informativa sulla privacy</a>
     providers:
       cas: CAS
       saml: SAML
@@ -796,20 +968,29 @@ it:
     registration_closed: "%{instance} non accetta nuovi membri"
     resend_confirmation: Invia di nuovo le istruzioni di conferma
     reset_password: Resetta la password
+    rules:
+      preamble: Questi sono impostati e applicati dai moderatori di %{domain}.
+      title: Alcune regole di base.
     security: Credenziali
     set_new_password: Imposta una nuova password
     setup:
       email_below_hint_html: Se l'indirizzo e-mail sottostante non è corretto, puoi cambiarlo qui e ricevere una nuova e-mail di conferma.
       email_settings_hint_html: L'email di conferma è stata inviata a %{email}. Se l'indirizzo e-mail non è corretto, puoi modificarlo nelle impostazioni dell'account.
       title: Configurazione
+    sign_in:
+      preamble_html: Accedi con le tue credenziali <strong>%{domain}</strong>. Se il tuo account si trova su un server diverso, non potrai accedere qui.
+      title: Accedi a %{domain}
+    sign_up:
+      preamble: Con un account su questo server Mastodon, sarai in grado di seguire qualsiasi altra persona sulla rete, indipendentemente da dove sia ospitato il suo account.
+      title: Lascia che ti configuriamo su %{domain}.
     status:
       account_status: Stato dell'account
       confirming: In attesa che la conferma e-mail sia completata.
-      functional: Il tuo account è pienamente operativo.
+      functional: Il tuo profilo è completamente operativo.
       pending: La tua richiesta è in attesa di esame da parte del nostro staff. Potrebbe richiedere un po' di tempo. Riceverai una e-mail se la richiesta è approvata.
       redirecting_to: Il tuo account è inattivo perché attualmente reindirizza a %{acct}.
+      view_strikes: Visualizza le sanzioni precedenti prese nei confronti del tuo account
     too_fast: Modulo inviato troppo velocemente, riprova.
-    trouble_logging_in: Problemi di accesso?
     use_security_key: Usa la chiave di sicurezza
   authorize_follow:
     already_following: Stai già seguendo questo account
@@ -867,10 +1048,36 @@ it:
       more_details_html: Per maggiori dettagli, vedi la <a href="%{terms_path}">politica di privacy</a>.
       username_available: Il tuo nome utente sarà nuovamente disponibile
       username_unavailable: Il tuo nome utente rimarrà non disponibile
-  directories:
-    directory: Directory dei profili
-    explanation: Scopri utenti in base ai loro interessi
-    explore_mastodon: Esplora %{title}
+  disputes:
+    strikes:
+      action_taken: Azione intrapresa
+      appeal: Appello
+      appeal_approved: Questa sanzione è stata annullata in un appello e non è più valida
+      appeal_rejected: L'appello è stato respinto
+      appeal_submitted_at: Appello presentato
+      appealed_msg: Il tuo appello è stato presentato. Se sarà approvato, sarai informato.
+      appeals:
+        submit: Presenta un appello
+      approve_appeal: Approva ricorso
+      associated_report: Segnalazione associata
+      created_at: Data
+      description_html: Queste sono azioni intraprese contro il tuo profilo e avvisi inviati a te dallo staff di %{instance}.
+      recipient: Indirizzata a
+      reject_appeal: Respingi ricorso
+      status: 'Post #%{id}'
+      status_removed: Post già rimosso dal sistema
+      title: "%{action} da %{date}"
+      title_actions:
+        delete_statuses: Eliminazione del post
+        disable: Congelamento dell'account
+        mark_statuses_as_sensitive: Marcatura dei post come sensibili
+        none: Avviso
+        sensitive: Marcatura dell'account come sensibile
+        silence: Limitazione dell'account
+        suspend: Sospensione dell'account
+      your_appeal_approved: Il tuo appello è stato approvato
+      your_appeal_pending: Hai presentato un appello
+      your_appeal_rejected: Il tuo appello è stato respinto
   domain_validator:
     invalid_domain: non è un nome di dominio valido
   errors:
@@ -895,7 +1102,7 @@ it:
     archive_takeout:
       date: Data
       download: Scarica il tuo archivio
-      hint_html: Puoi richiedere un archivio dei tuoi <strong>toot e media caricati</strong>. I dati esportati sono in formato ActivityPub, leggibili da qualunque software che segue questo standard. Puoi richiedere un archivio ogni 7 giorni.
+      hint_html: Puoi richiedere un archivio dei tuoi <strong>post media caricati</strong>. I dati esportati sono in formato ActivityPub, leggibili da qualunque software che segue questo standard. Puoi richiedere un archivio ogni 7 giorni.
       in_progress: Creazione archivio...
       request: Chiedi il tuo archivio
       size: Dimensioni
@@ -919,56 +1126,69 @@ it:
       public: Timeline pubbliche
       thread: Conversazioni
     edit:
+      add_keyword: Aggiungi parola chiave
+      keywords: Parole chiave
+      statuses: Post singoli
+      statuses_hint_html: Questo filtro si applica a singoli post indipendentemente dal fatto che corrispondano alle parole chiave qui sotto. <a href="%{path}">Rivedi o rimuovi i post dal filtro</a>.
       title: Modifica filtro
     errors:
+      deprecated_api_multiple_keywords: Questi parametri non possono essere modificati da questa applicazione perché si applicano a più di una parola chiave che fa da filtro. Utilizzare un'applicazione più recente o l'interfaccia web.
       invalid_context: Contesto mancante o non valido
-      invalid_irreversible: Il filtraggio irreversibile funziona solo nei contesti di home o notifiche
     index:
+      contexts: Filtri in %{contexts}
       delete: Cancella
       empty: Non hai alcun filtro.
+      expires_in: Scade tra %{distance}
+      expires_on: Scade il %{date}
+      keywords:
+        one: "%{count} parola chiave"
+        other: "%{count} parole chiave"
+      statuses:
+        one: "%{count} post"
+        other: "%{count} post"
+      statuses_long:
+        one: "%{count} singolo post nascosto"
+        other: "%{count} singoli post nascosti"
       title: Filtri
     new:
+      save: Salva nuovo filtro
       title: Aggiungi filtro
+    statuses:
+      back_to_filter: Torna al filtro
+      batch:
+        remove: Togli dal filtro
+      index:
+        hint: Questo filtro si applica a singoli post indipendentemente da altri criteri. Puoi aggiungere più post a questo filtro dall'interfaccia Web.
+        title: Post filtrati
   footer:
-    developers: Sviluppatori
-    more: Altro…
-    resources: Risorse
     trending_now: Di tendenza ora
   generic:
     all: Tutto
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento su questa pagina è selezionato."
+      other: Tutti i <strong>%{count}</strong> elementi su questa pagina sono selezionati.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento corrispondente alla tua ricerca è selezionato."
+      other: Tutti i <strong>%{count}</strong> elementi corrispondenti alla tua ricerca sono selezionati.
     changes_saved_msg: Modifiche effettuate con successo!
     copy: Copia
     delete: Cancella
-    no_batch_actions_available: Nessuna azione batch disponibile su questa pagina
+    deselect: Deseleziona tutto
+    none: Nessuno
     order_by: Ordina per
     save_changes: Salva modifiche
+    select_all_matching_items:
+      one: Seleziona %{count} elemento corrispondente alla tua ricerca.
+      other: Seleziona tutti gli elementi %{count} corrispondenti alla tua ricerca.
+    today: oggi
     validation_errors:
       one: Qualcosa ancora non va bene! Per favore, controlla l'errore qui sotto
       other: Qualcosa ancora non va bene! Per favore, controlla i %{count} errori qui sotto
   html_validator:
     invalid_markup: 'contiene markup HTML non valido: %{error}'
-  identity_proofs:
-    active: Attive
-    authorize: Si, autorizza
-    authorize_connection_prompt: Autorizzare questa connessione crittografata?
-    errors:
-      failed: La connessione crittografata non è riuscita. Per favore riprova da %{provider}.
-      keybase:
-        invalid_token: I toked di Keybase sono hash di firme e devono essere lunghi 66 caratteri esadecimali
-        verification_failed: Keybase non riconosce questo token come firma dell'utente Keybase %{kb_username}. Per favore riprova da Keybase.
-      wrong_user: Impossibile creare una prova per %{proving} mentre si è effettuato l'accesso come %{current}. Accedi come %{proving} e riprova.
-    explanation_html: Qui puoi connettere crittograficamente le tue altre identità, come il profilo Keybase. Questo consente ad altre persone di inviarti messaggi criptati e fidarsi dei contenuto che tu invii a loro.
-    i_am_html: Io sono %{username} su %{service}.
-    identity: Identità
-    inactive: Inattiva
-    publicize_checkbox: 'E posta questo:'
-    publicize_toot: 'É provato! Io sono %{username} su %{service}: %{url}'
-    remove: Elimina prova dall'account
-    removed: Prova eliminata dall'account
-    status: Stato della verifica
-    view_proof: Vedi prova
   imports:
     errors:
+      invalid_csv_file: 'File CSV non valido. Errore: %{error}'
       over_rows_processing_limit: contiene più di %{count} righe
     modes:
       merge: Fondi
@@ -984,7 +1204,6 @@ it:
       following: Lista dei seguiti
       muting: Lista dei silenziati
     upload: Carica
-  in_memoriam_html: In Memoriam.
   invites:
     delete: Disattiva
     expired: Scaduto
@@ -1047,14 +1266,14 @@ it:
     proceed_with_move: Sposta seguaci
     redirected_msg: Il tuo account sta reindirizzando a %{acct}.
     redirecting_to: Il tuo account sta reindirizzando a %{acct}.
-    set_redirect: Imposta ridirezione
+    set_redirect: Imposta reindirizzamento
     warning:
       backreference_required: Il nuovo account deve essere prima configurato per collegarsi a questo
       before: 'Prima di procedere, leggi attentamente queste avvertenze:'
       cooldown: Dopo il trasferimento c'è un periodo di pausa durante il quale non potrai trasferirti di nuovo
       disabled_account: Il tuo account attuale non sarà più pienamente utilizzabile. Tuttavia, avrai accesso all'esportazione dei dati e alla riattivazione.
-      followers: Questa azione sposterà tutti i seguaci dall'account attuale al nuovo account
-      only_redirect_html: In alternativa, puoi solo <a href="%{path}">impostare un redirect sul tuo profilo</a>.
+      followers: Questa azione sposterà tutti i follower dall'account attuale al nuovo account
+      only_redirect_html: In alternativa, puoi solo <a href="%{path}">impostare un reindirizzamento sul tuo profilo</a>.
       other_data: Nessun altro dato verrà spostato automaticamente
       redirect: Il profilo del tuo account corrente sarà aggiornato con un avviso di ridirezione e sarà escluso dalle ricerche
   moderation:
@@ -1063,18 +1282,14 @@ it:
     carry_blocks_over_text: Questo utente si è spostato da %{acct} che hai bloccato.
     carry_mutes_over_text: Questo utente si è spostato da %{acct} che hai silenziato.
     copy_account_note_text: 'Questo utente si è spostato da %{acct}, ecco le tue note precedenti su di loro:'
+  navigation:
+    toggle_menu: Cambia menu
   notification_mailer:
-    digest:
-      action: Vedi tutte le notifiche
-      body: Ecco un breve riassunto di quello che ti sei perso dalla tua ultima visita del %{since}
-      mention: "%{name} ti ha menzionato:"
-      new_followers_summary:
-        one: E inoltre hai ricevuto un nuovo seguace mentre eri assente! Urrà!
-        other: Inoltre, hai acquisito %{count} nuovi seguaci mentre eri assente! Incredibile!
-      subject:
-        one: "1 nuova notifica dalla tua ultima visita \U0001F418"
-        other: "%{count} nuove notifiche dalla tua ultima visita \U0001F418"
-      title: In tua assenza…
+    admin:
+      report:
+        subject: "%{name} ha inviato una segnalazione"
+      sign_up:
+        subject: "%{name} si è iscritto"
     favourite:
       body: 'Il tuo status è stato apprezzato da %{name}:'
       subject: "%{name} ha apprezzato il tuo status"
@@ -1101,10 +1316,12 @@ it:
       title: Nuova condivisione
     status:
       subject: "%{name} ha appena pubblicato un post"
+    update:
+      subject: "%{name} ha modificato un post"
   notifications:
     email_events: Eventi per notifiche via email
     email_events_hint: 'Seleziona gli eventi per i quali vuoi ricevere le notifiche:'
-    other_settings: Altre impostazioni per le notifiche
+    other_settings: Altre impostazioni delle notifiche
   number:
     human:
       decimal_units:
@@ -1144,6 +1361,8 @@ it:
     other: Altro
     posting_defaults: Predefinite di pubblicazione
     public_timelines: Timeline pubbliche
+  privacy_policy:
+    title: Politica sulla privacy
   reactions:
     errors:
       limit_reached: Raggiunto il limite di reazioni diverse
@@ -1166,32 +1385,25 @@ it:
     remove_selected_follows: Smetti di seguire gli utenti selezionati
     status: Stato dell'account
   remote_follow:
-    acct: Inserisci il tuo username@dominio da cui vuoi seguire questo utente
     missing_resource: Impossibile trovare l'URL di reindirizzamento richiesto per il tuo account
-    no_account_html: Non hai un account? Puoi <a href='%{sign_up_path}' target='_blank'>iscriverti qui</a>
-    proceed: Conferma
-    prompt: 'Stai per seguire:'
-    reason_html: "<strong>Perchè questo passo è necessario?</strong> <code>%{instance}</code> potrebbe non essere il server nel quale tu sei registrato, quindi dobbiamo reindirizzarti prima al tuo server."
-  remote_interaction:
-    favourite:
-      proceed: Continua per segnare come apprezzato
-      prompt: 'Vuoi segnare questo toot come apprezzato:'
-    reblog:
-      proceed: Continua per condividere
-      prompt: 'Vuoi condividere questo toot:'
-    reply:
-      proceed: Continua per rispondere
-      prompt: 'Vuoi rispondere a questo toot:'
+  reports:
+    errors:
+      invalid_rules: non fa riferimento a regole valide
+  rss:
+    content_warning: 'Avviso sul contenuto:'
+    descriptions:
+      account: Post pubblici di @%{acct}
+      tag: 'Post pubblici taggati #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Hai superato il limite di %{limit} toot programmati per questo giorno
-    over_total_limit: Hai superato il limite di %{limit} toot programmati
+    over_daily_limit: Hai superato il limite di %{limit} post programmati per questo giorno
+    over_total_limit: Hai superato il limite di %{limit} post programmati
     too_soon: La data di pubblicazione deve essere nel futuro
   sessions:
     activity: Ultima attività
     browser: Browser
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1205,7 +1417,7 @@ it:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Sessione corrente
     description: "%{browser} su %{platform}"
@@ -1214,7 +1426,7 @@ it:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1238,9 +1450,8 @@ it:
     delete: Cancellazione account
     development: Sviluppo
     edit_profile: Modifica profilo
-    export: Esporta impostazioni
+    export: Esportazione dati
     featured_tags: Hashtag in evidenza
-    identity_proofs: Prove di identità
     import: Importa
     import_and_export: Importa ed esporta
     migrate: Migrazione dell'account
@@ -1249,6 +1460,7 @@ it:
     profile: Profilo
     relationships: Follows e followers
     statuses_cleanup: Cancellazione automatica dei post
+    strikes: Sanzioni di moderazione
     two_factor_authentication: Autenticazione a due fattori
     webauthn_authentication: Chiavi di sicurezza
   statuses:
@@ -1265,18 +1477,19 @@ it:
         other: "%{count} video"
     boosted_from_html: Condiviso da %{acct_link}
     content_warning: 'Avviso di contenuto: %{warning}'
+    default_language: Come la lingua dell'interfaccia
     disallowed_hashtags:
       one: 'contiene un hashtag non permesso: %{tags}'
       other: 'contiene gli hashtags non permessi: %{tags}'
+    edited_at_html: Modificato il %{date}
     errors:
-      in_reply_not_found: Lo stato a cui stai tentando di rispondere non sembra esistere.
-    language_detection: Individua lingua automaticamente
+      in_reply_not_found: Il post a cui stai tentando di rispondere non sembra esistere.
     open_in_web: Apri sul Web
     over_character_limit: Limite caratteri superato di %{max}
     pin_errors:
-      limit: Hai già fissato in cima il massimo numero di toot
-      ownership: Non puoi fissare in cima un toot di qualcun altro
-      private: Un toot non pubblico non può essere fissato in cima
+      direct: I messaggi visibili solo agli utenti citati non possono essere fissati in cima
+      limit: Hai già fissato in cima il massimo numero di post
+      ownership: Non puoi fissare in cima un post di qualcun altro
       reblog: Un toot condiviso non può essere fissato in cima
     poll:
       total_people:
@@ -1327,6 +1540,7 @@ it:
       '2629746': 1 mese
       '31556952': 1 anno
       '5259492': 2 mesi
+      '604800': 1 settimana
       '63113904': 2 anni
       '7889238': 3 mesi
     min_age_label: Soglia di età
@@ -1335,97 +1549,14 @@ it:
     min_reblogs: Conserva i post condivisi più di
     min_reblogs_hint: Non cancella nessuno dei tuoi post che è stato condiviso più di questo numero di volte. Lascia vuoto per cancellare i post indipendentemente dal loro numero di condivisioni
   stream_entries:
-    pinned: Toot fissato in cima
+    pinned: Post fissato in cima
     reblogged: condiviso
     sensitive_content: Materiale sensibile
+  strikes:
+    errors:
+      too_late: È troppo tardi per fare appello contro questa sanzione
   tags:
     does_not_match_previous_name: non corrisponde al nome precedente
-  terms:
-    body_html: |
-      <h2>Politica della Privacy</h2>
-      <h3 id="collect">Che informazioni raccogliamo?</h3>
-
-      <ul>
-      <li><em>Informazioni di base del profilo</em>: Se ti registri su questo server, ti potrebbe venir chiesto di inserire un nome utente, un indirizzo e-mail ed una password. Potresti anche inserire informazioni aggiuntive del profilo come un nome a schermo ed una biografia e caricare una foto profilo ed un'immagine di intestazione. Il nome utente, il nome a schermo, la biografia, la foto profilo e l'immagine di intestazione, sono sempre elencati pubblicamente.</li>
-      <li><em>I post, i seguiti ed altre informazioni pubbliche</em>: L'elenco di persone che segui viene elencata pubblicamente, la stessa cosa è vera per i tuoi seguaci. Quando invii un messaggio, la data e l'orario sono memorizzati così come l'applicazione da cui hai inviato il messaggio.
-      I messaggi potrebbero contenere allegati media, come immagini e video. I post pubblici e non elencati sono disponibili pubblicamente. Quando mostri un post sul tuo profilo, anche questo diventa disponibile pubblicamente. I tuoi post sono consegnati ai tuoi seguaci, in alcuni casi significa che sono consegnati a server differenti e che lì sono memorizzate delle copie. Quando elimini i post, anche questo viene notificato ai tuoi seguaci. L'azione di ripubblicare o preferire un altro post è sempre pubblica.</li>
-      <li><em>Post diretti e solo per i seguaci</em>: Tutti i post sono archiviati ed elaborati sul server. I post solo per seguaci sono consegnati ai tuoi seguaci ed agli utenti che vi hai menzionato, ed i post diretti sono consegnati solo agli utenti in essi menzionati. In alcuni casi significa che sono consegnati a server differenti e che lì sono memorizzate delle copie. Compiamo uno sforzo in buona fede per limitare l'accesso a questi post solo a persone autorizzate, ma gli altri server potrebbero non riuscire a fare ciò. Dunque, è importante rivedere i server a cui appartengono i tuoi seguaci. Potresti attivare/disattivare un'opzione per approvare e rifiutare i nuovi seguaci manualmente nelle impostazioni.
-      <em>Sei pregato di tenere a mente che gli operatori del server e di ogni server ricevente potrebbero visualizzare tali messaggi</em> e che i riceventi potrebbero fotografarli, copiarlo o altrimenti ricondividerli. <em>Non condividere alcuna informazione pericolosa su Mastodon.</em></li>
-      <li><em>IP ed altri metadati</em>: Quando accedi, registriamo l'indirizzo IP da cui accedi, così come il nome della tua applicazione browser. Tutte le sessioni accedute sono disponibili per la tua revisione e revoca nelle impostazioni. L'ultimo indirizzo IP usato è memorizzato anche fino a 12 mesi. Potremmo anche trattenere i registri del server che includono l'indirizzo IP di ogni richiesta al nostro server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Per cosa usiamo le tue informazioni</h3>
-
-      <p>Ogni informazioni che raccogliamo da te potrebbe essere usata nei modi seguenti:</p>
-
-      <ul>
-      <li>Per fornire la funzionalità principale di Mastodon. Puoi interagire solo con il contenuto di altre persone ed postare i tuoi contenuti quando sei acceduto. Per esempio, potresti seguire altre persone per vedere i loro post combinati nella timeline principale personalizzata e tua.</li>
-      <li>Per aiutare a moderare la comunità, per esempio comparando il tuo indirizzo IP con altri noti per determinare evasioni dei ban o altre violazioni.</li>
-      <li>L'indirizzo email che fornisci potrebbe essere usato per inviarti informazioni, notifiche sull'interazione di altre persone con i tuoi contenuti o inviarti messaggi e per rispondere a interrogativi e/o altre richieste o domande.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Come proteggiamo le tue informazioni</h3>
-
-      <p>Implementiamo una varietà di misure di sicurezza per mantenere la sicurezza delle tue informazioni personali quando inserisci, invii o accedi alle tue informazioni personali. Tra le altre cose, la tua sessione del browser, così come il tuo traffico tra le tue applicazioni e le API, sono assicurate con SSL e la tua password è in hash usando un forte algoritmo a singolo metodo. Puoi abilitare l'autenticazione a due fattori per assicurare ulteriormente il tuo profilo.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Qual è la nostra politica di ritenzione dei dati?</h3>
-
-      <p>Faremo un grande sforzo in buona fede per:</p>
-
-      <ul>
-      <li>Tratteniamo i registri del server contenenti l'indirizzo IP di tutte le richieste in questo server, in cui i registri sono mantenuti, per non più di 90 giorni.</li>
-      <li>Tratteniamo gli indirizzi IP associati con utenti registrati da non oltre 12 mesi.</li>
-      </ul>
-
-      <p>Puoi richiedere e scaricare un archivio del tuo contenuto, inclusi i tuoi post, allegati media, foto profilo ed immagine di intestazione.</p>
-
-      <p>Puoi eliminare irreversibilmente il tuo profilo in ogni momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Usiamo i cookie</h3>
-
-      <p>Sì. I cookie sono piccoli file che un sito o il suo fornitore dei servizi trasferisce all'hard drive del tuo computer tramite il tuo browser web (se acconsenti). Questi cookie abilitano il sito a riconoscere il tuo browser e, se hai un profilo registrato, lo associano con il tuo profilo registrato.</p>
-
-      <p>Usiamo i cookie per comprendere e salvare le vostre preferenze per visite future.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Diffondiamo alcuna informazione a terze parti?</h3>
-
-      <p>Non vendiamo, non scambiamo o trasferiamo altrimenti a terze parti le tue informazioni personalmente identificabili. Questo non include terze parti fidate che ci assistono nell'operare il nostro sito, nel condurre il nostro business o nel servirti, finché queste parti acconsentono a mantenere queste informazioni confidenziali. potremmo anche rilasciare le tue informazioni quando crediamo che il rilascio sia appropriato e soddisfi la legge, si applichi alle nostre politiche del sito o protegga noi o i diritti, la proprietà o la sicurezza di altri.</p>
-
-      <p>Il tuo contenuto pubblico potrebbe essere scaricato da altri server nella rete. I tuoi post pubblici e per soli seguaci sono consegnati ai server dove risiedono i seguaci ed i messaggi diretti sono consegnati ai server dei destinatari, finché questi seguaci o destinatari risiedono su un server differente da questo.</p>
-
-      <p>Quando autorizzi un'applicazione ad usare il tuo profilo, in base allo scopo dei permessi che approvi, potrebbe accedere alle tue informazioni del profilo pubbliche, l'elenco di chi segui, i tuoi seguaci, i tuoi elenchi, tutti i tuoi post ed i tuoi preferiti. Le applicazioni non possono mai accedere al tuo indirizzo e-mail o alla tua password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uso del sito da bambini</h3>
-
-      <p>Se questo server è in UE o nell'EEA: Il nostro sito, i prodotti ed i servizi sono tutti diretti a persone che abbiano almeno 16 anni. Se hai meno di 16 anni, per i requisiti del GDPR
-      (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) non usare questo sito.</p>
-
-      <p>Se questo server è negli USA: Il nostro sito, i prodotti ed i servizi sono tutti diretti a persone che abbiano almeno 13 anni. Se hai meno di 13 anni, per i requisiti del COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) non usare questo sito.</p>
-
-      <p>I requisiti di legge possono essere diversi se questo server è in un'altra giurisdizione.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Modifiche alla nostra Politica della Privacy</h3>
-
-      <p>Se decidiamo di modificare la nostra politica della privacy, posteremo queste modifiche su questa pagina.</p>
-
-      <p>Questo documento è CC-BY-SA. L'ultimo aggiornamento è del 7 Marzo, 2018.</p>
-
-      <p>Adattato originalmente dal <a href="https://github.com/discourse/discourse">Discorso Politica della Privacy</a>.</p>
-    title: "%{instance} Termini di servizio e politica della privacy"
   themes:
     contrast: Mastodon (contrasto elevato)
     default: Mastodon (scuro)
@@ -1434,6 +1565,7 @@ it:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Aggiungi
     disable: Disabilita
@@ -1450,63 +1582,73 @@ it:
     recovery_instructions_html: Se perdi il telefono, puoi usare uno dei codici di recupero qui sotto per riottenere l'accesso al tuo account. <strong>Conserva i codici di recupero in un posto sicuro</strong>. Ad esempio puoi stamparli e conservarli insieme ad altri documenti importanti.
     webauthn: Chiavi di sicurezza
   user_mailer:
+    appeal_approved:
+      action: Vai al tuo account
+      explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato approvato. Il tuo account ha riottenuto la buona reputazione.
+      subject: Il tuo appello del %{date} è stato approvato
+      title: Appello approvato
+    appeal_rejected:
+      explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato respinto.
+      subject: Il tuo appello del %{date} è stato respinto
+      title: Appello respinto
     backup_ready:
       explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato!
       subject: Il tuo archivio è pronto per essere scaricato
       title: Esportazione archivio
-    sign_in_token:
-      details: 'Questi sono i dettagli del tentativo:'
-      explanation: 'Abbiamo rilevato un tentativo di accedere al tuo account da un indirizzo IP non riconosciuto. Se sei tu, inserisci il codice di sicurezza qui sotto nella pagina di controllo dell''accesso:'
-      further_actions: 'Se non sei stato tu, cambia la password e abilita l''autenticazione a due fattori sul tuo account. Puoi farlo qui:'
-      subject: Conferma il tentativo di accesso
-      title: Tentativo di accesso
+    suspicious_sign_in:
+      change_password: cambiare la tua password
+      details: 'Questi sono i dettagli del tentativo di accesso:'
+      explanation: Abbiamo rilevato un accesso al tuo account da un nuovo indirizzo IP.
+      further_actions_html: Se non eri tu, ti consigliamo di %{action} subito e di abilitare l'autenticazione a due fattori per mantenere il tuo account al sicuro.
+      subject: C'è stato un accesso al tuo account da un nuovo indirizzo IP
+      title: Un nuovo accesso
     warning:
+      appeal: Presenta un appello
+      appeal_description: Se credi che si tratti di un errore, puoi presentare un appello allo staff di %{instance}.
+      categories:
+        spam: Spam
+        violation: Il contenuto viola le seguenti linee guida della comunità
       explanation:
-        disable: Mentre il tuo account è congelato, i tuoi dati dell'account rimangono intatti, ma non potrai eseguire nessuna azione fintanto che non viene sbloccato.
-        sensitive: I tuoi file multimediali caricati e multimedia collegati saranno trattati come sensibili.
-        silence: Mentre il tuo account è limitato, solo le persone che già ti seguono possono vedere i tuoi toot su questo server, e potresti essere escluso da vari elenchi pubblici. Comunque, altri possono manualmente seguirti.
-        suspend: Non puoi più utilizzare il tuo account, e il tuo profilo e altri dati non sono più accessibili. È ancora possibile effettuare il login per richiedere un backup dei dati fino a quando i dati non vengono completamente rimossi, ma conserveremo alcuni dati per impedirti di eludere la sospensione.
-      get_in_touch: Puoi rispondere a questa email per entrare in contatto con lo staff di %{instance}.
-      review_server_policies: Rivedi regole del server
-      statuses: 'Nello specifico, per:'
+        delete_statuses: Alcuni dei tuoi post sono stati riconosciuti in violazione di una o più linee guida della comunità e sono stati successivamente rimossi dai moderatori di %{instance}.
+        disable: Non puoi più utilizzare il tuo account, ma il tuo profilo e gli altri dati rimangono intatti. Puoi richiedere un backup dei tuoi dati, modificare le impostazioni dell'account o eliminare il tuo account.
+        mark_statuses_as_sensitive: Alcuni dei tuoi post sono stati contrassegnati come sensibili dai moderatori di %{instance}. Ciò significa che le persone dovranno toccare i media nei post prima che venga visualizzata un'anteprima. Puoi contrassegnare tu i media come sensibili quando ne pubblicherai in futuro.
+        sensitive: D'ora in poi, tutti i file multimediali che hai caricato saranno contrassegnati come sensibili e nascosti dietro un avviso click-through.
+        silence: Puoi ancora utilizzare il tuo account, ma solo le persone che già ti seguono possono vedere i tuoi post su questo server, e potresti essere escluso da varie funzionalità di ricerca. Gli altri utenti possono comunque seguirti manualmente.
+        suspend: Non puoi più utilizzare il tuo account, e il tuo profilo e gli altri dati non sono più accessibili. Puoi ancora effettuare il login per richiedere un backup dei dati fino a quando i dati non saranno completamente cancellati nei prossimi 30 giorni, ma conserveremo alcuni dati di base per impedirti di eludere la sospensione.
+      reason: 'Motivo:'
+      statuses: 'Post citati:'
       subject:
+        delete_statuses: I tuoi post su %{acct} sono stati eliminati
         disable: Il tuo account %{acct} è stato congelato
+        mark_statuses_as_sensitive: I tuoi post su %{acct} sono stati contrassegnati come sensibili
         none: Avviso per %{acct}
-        sensitive: Il multimedia in pubblicazione del tuo profilo %{acct} è stato contrassegnato come sensibile
+        sensitive: I tuoi post su %{acct} d'ora in poi saranno contrassegnati come sensibili
         silence: Il tuo account %{acct} è stato limitato
         suspend: Il tuo account %{acct} è stato sospeso
       title:
+        delete_statuses: Post eliminati
         disable: Account congelato
+        mark_statuses_as_sensitive: Post contrassegnati come sensibili
         none: Avviso
-        sensitive: Il tuo multimedia è stato contrassegnato come sensibile
+        sensitive: Account contrassegnato come sensibile
         silence: Account limitato
         suspend: Account sospeso
     welcome:
-      edit_profile_action: Imposta profilo
-      edit_profile_step: Puoi personalizzare il tuo profilo caricando un avatar, un'intestazione, modificando il tuo nome visualizzato e così via. Se vuoi controllare i tuoi nuovi seguaci prima di autorizzarli a seguirti, puoi bloccare il tuo account.
+      edit_profile_action: Configura profilo
+      edit_profile_step: Puoi personalizzare il tuo profilo caricando un'immagine del profilo, cambiare il tuo nome e altro ancora. Puoi scegliere di esaminare i nuovi seguaci prima che loro siano autorizzati a seguirti.
       explanation: Ecco alcuni suggerimenti per iniziare
-      final_action: Inizia a postare
-      final_step: 'Inizia a postare! Anche se non hai seguaci, i tuoi messaggi pubblici possono essere visti da altri, ad esempio nelle timeline locali e negli hashtag. Se vuoi puoi presentarti con l''hashtag #introductions.'
+      final_action: Inizia a pubblicare
+      final_step: 'Inizia a pubblicare! Anche senza seguaci, i tuoi post pubblici possono essere visti da altri, ad esempio sulla timeline locale o negli hashtag. Potresti presentarti con l''hashtag #presentazione.'
       full_handle: Il tuo nome utente completo
       full_handle_hint: Questo è ciò che diresti ai tuoi amici in modo che possano seguirti o contattarti da un altro server.
-      review_preferences_action: Cambia preferenze
-      review_preferences_step: Dovresti impostare le tue preferenze, ad esempio quali email vuoi ricevere oppure il livello predefinito di privacy per i tuoi post. Se le immagini in movimento non ti danno fastidio, puoi abilitare l'animazione automatica delle GIF.
       subject: Benvenuto/a su Mastodon
-      tip_federated_timeline: La timeline federata visualizza uno dopo l'altro i messaggi pubblicati su Mastodon. Ma comprende solo gli utenti seguiti dai tuoi vicini, quindi non è completa.
-      tip_following: Per impostazione predefinita, segui l'amministratore/i del tuo server. Per trovare utenti più interessanti, dà un'occhiata alle timeline locale e federata.
-      tip_local_timeline: La timeline locale visualizza uno dopo l'altro i messaggi degli utenti di %{instance}. Questi sono i tuoi vicini!
-      tip_mobile_webapp: Se il tuo browser mobile ti dà la possibilità di aggiungere Mastodon allo schermo, puoi ricevere le notifiche. Funziona un po' come un'app natova!
-      tips: Suggerimenti
       title: Benvenuto a bordo, %{name}!
   users:
     follow_limit_reached: Non puoi seguire più di %{limit} persone
-    generic_access_help_html: Problemi nell'accesso al tuo account? Puoi contattare %{email} per assistenza
     invalid_otp_token: Codice d'accesso non valido
-    invalid_sign_in_token: Codice di sicurezza non valido
     otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
-    seamless_external_login: Ti sei collegato per mezzo di un servizio esterno, quindi le impostazioni di email e password non sono disponibili.
+    seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
     signed_in_as: 'Hai effettuato l''accesso come:'
-    suspicious_sign_in_confirmation: Sembra che tu non abbia effettuato l'accesso da questo dispositivo prima d'ora, e non hai effettuato l'accesso per un po', quindi inviamo un codice di sicurezza al tuo indirizzo e-mail per confermare che sei proprio tu.
   verification:
     explanation_html: 'Puoi <strong>certificare te stesso come proprietario dei link nei metadati del tuo profilo</strong>. Per farlo, il sito a cui punta il link deve contenere un link che punta al tuo profilo Mastodon. Il link di ritorno <strong>deve</strong> avere l''attributo <code>rel="me"</code>. Il testo del link non ha importanza. Ecco un esempio:'
     verification: Verifica
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8d9b5ac1c..f0cafc49a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,86 +1,25 @@
 ---
 ja:
   about:
-    about_hashtag_html: ハッシュタグ <strong>#%{hashtag}</strong> の付いた公開投稿です。どこでもいいので、連合に参加しているSNS上にアカウントを作れば会話に参加することができます。
-    about_mastodon_html: Mastodon は、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。
-    about_this: 詳細情報
-    active_count_after: 人アクティブ
-    active_footnote: 月間アクティブユーザー数 (MAU)
-    administered_by: '管理者:'
-    api: API
-    apps: アプリ
-    apps_platforms: iOSやAndroidなど、各種環境から利用できます
-    browse_directory: ディレクトリから気になる人を探しましょう
-    browse_local_posts: このサーバーの公開タイムラインをご覧ください
-    browse_public_posts: Mastodonの公開ライブストリームをご覧ください
-    contact: 連絡先
+    about_mastodon_html: Mastodonは、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。
     contact_missing: 未設定
     contact_unavailable: N/A
-    discover_users: ユーザーを見つける
-    documentation: ドキュメント
-    federation_hint_html: "%{instance} のアカウントひとつでどんなMastodon互換サーバーのユーザーでもフォローできるでしょう。"
-    get_apps: モバイルアプリを試す
     hosted_on: Mastodon hosted on %{domain}
-    instance_actor_flash: "このアカウントはサーバーそのものを示す仮想的なもので、特定のユーザーを示すものではありません。これはサーバーの連合のために使用されます。サーバー全体をブロックするときは、このアカウントをブロックせずに、ドメインブロックを使用してください。 \n"
-    learn_more: もっと詳しく
-    privacy_policy: プライバシーポリシー
-    rules: サーバーのルール
-    rules_html: 'このMastodonサーバーには、アカウントの所持にあたって従うべきルールが設定されています。概要は以下の通りです:'
-    see_whats_happening: やりとりを見てみる
-    server_stats: 'サーバー統計:'
-    source_code: ソースコード
-    status_count_after:
-      other: 投稿
-    status_count_before: 投稿数
-    tagline: Follow friends and discover new ones
-    terms: 利用規約
-    unavailable_content: 制限中のサーバー
-    unavailable_content_description:
-      domain: サーバー
-      reason: 制限理由
-      rejecting_media: 'これらのサーバーからのメディアファイルは処理されず、保存や変換もされません。サムネイルも表示されません。表示するにはクリックしてそのサーバーに直接アクセスする必要があります:'
-      rejecting_media_title: メディアを拒否しているサーバー
-      silenced: 'これらのサーバーからの投稿は公開タイムラインと会話から隠されます。また該当するユーザーからの通知は相手をフォローしている場合を除き表示されません:'
-      silenced_title: サイレンス済みのサーバー
-      suspended: 'これらのサーバーからのデータは処理されず、保存や変換もされません。該当するユーザーとの交流もできません:'
-      suspended_title: 停止済みのサーバー
-    unavailable_content_html: 通常 Mastodon では連合先のどんなサーバーのユーザーとでもやりとりできます。ただし次のサーバーには例外が設定されています。
-    user_count_after:
-      other: 人
-    user_count_before: ユーザー数
-    what_is_mastodon: Mastodon とは？
+    title: このサーバーについて
   accounts:
-    choices_html: "%{name} によるおすすめ:"
-    endorsements_hint: あなたがフォローしている中でおすすめしたい人をここで紹介できます。
-    featured_tags_hint: 特定のハッシュタグをここに表示できます。
     follow: フォロー
     followers:
       other: フォロワー
     following: フォロー中
     instance_actor_flash: このアカウントは、個々のユーザーではなく、サーバー自体を表すために使用される仮想のユーザーです。 連合のために使用されるため、停止しないで下さい。
-    joined: "%{date} に登録"
     last_active: 最後の活動
-    link_verified_on: このリンクの所有権は %{date} に確認されました
-    media: メディア
-    moved_html: "%{name} さんは引っ越しました %{new_profile_link}:"
-    network_hidden: この情報は利用できません
-    never_active: 活動なし
+    link_verified_on: このリンクの所有権は%{date}に確認されました
     nothing_here: 何もありません！
-    people_followed_by: "%{name} さんがフォロー中のアカウント"
-    people_who_follow: "%{name} さんをフォロー中のアカウント"
     pin_errors:
       following: おすすめしたい人はあなたが既にフォローしている必要があります
     posts:
       other: 投稿
     posts_tab_heading: 投稿
-    posts_with_replies: 投稿と返信
-    roles:
-      admin: Admin
-      bot: Bot
-      group: Group
-      moderator: Mod
-    unavailable: プロフィールは利用できません
-    unfollow: フォロー解除
   admin:
     account_actions:
       action: アクションを実行
@@ -88,32 +27,37 @@ ja:
     account_moderation_notes:
       create: 書き込む
       created_msg: モデレーションメモを書き込みました！
-      delete: 削除
       destroyed_msg: モデレーションメモを削除しました！
     accounts:
       add_email_domain_block: メールドメインブロックに追加
       approve: 承認
-      approve_all: すべて承認
-      approved_msg: "%{username} の登録申請を承認しました"
+      approved_msg: "%{username}さんの登録申請を承認しました"
       are_you_sure: 本当に実行しますか？
       avatar: アイコン
       by_domain: ドメイン
       change_email:
-        changed_msg: メールアドレスの変更に成功しました！
+        changed_msg: メールアドレスを変更しました!
         current_email: 現在のメールアドレス
         label: メールアドレスを変更
         new_email: 新しいメールアドレス
         submit: メールアドレスの変更
-        title: "%{username} さんのメールアドレスを変更"
+        title: "%{username}さんのメールアドレスを変更"
+      change_role:
+        changed_msg: ロールを変更しました!
+        label: ロールを変更
+        no_role: ロールがありません
+        title: "%{username}さんのロールを変更"
       confirm: 確認
       confirmed: 確認済み
       confirming: 確認中
+      custom: カスタム
       delete: データを削除する
       deleted: 削除済み
       demote: 降格
-      destroyed_msg: "%{username} のデータは完全に削除されるよう登録されました"
+      destroyed_msg: "%{username}さんのデータは完全に削除されるよう登録されました"
       disable: 無効化
-      disable_two_factor_authentication: 二段階認証を無効にする
+      disable_sign_in_token_auth: メールトークン認証を無効にする
+      disable_two_factor_authentication: 二要素認証を無効にする
       disabled: 無効
       display_name: 表示名
       domain: ドメイン
@@ -121,8 +65,9 @@ ja:
       email: メールアドレス
       email_status: メールアドレスの状態
       enable: 有効化
+      enable_sign_in_token_auth: メールトークン認証を有効にする
       enabled: 有効
-      enabled_msg: "%{username} の無効化を解除しました"
+      enabled_msg: "%{username}の無効化を解除しました"
       followers: フォロワー数
       follows: フォロー数
       header: ヘッダー
@@ -145,7 +90,7 @@ ja:
         active: アクティブ
         all: すべて
         pending: 承認待ち
-        silenced: サイレンス済み
+        silenced: 制限
         suspended: 停止済み
         title: モデレーション
       moderation_notes: モデレーションメモ
@@ -153,22 +98,27 @@ ja:
       most_recent_ip: 直近のIP
       no_account_selected: 何も選択されていないため、変更されていません
       no_limits_imposed: 制限なし
+      no_role_assigned: ロールが割り当てられていません
       not_subscribed: 購読していない
       pending: 承認待ち
       perform_full_suspension: 活動を完全に停止させる
+      previous_strikes: 以前のストライク
+      previous_strikes_description_html:
+        other: "<strong>%{count}</strong> ストライクがあります。"
       promote: 昇格
       protocol: プロトコル
       public: パブリック
       push_subscription_expires: PuSH購読期限
       redownload: プロフィールを更新
-      redownloaded_msg: "%{username} のプロフィールを正常に更新しました"
+      redownloaded_msg: "%{username}のプロフィールを正常に更新しました"
       reject: 却下
-      reject_all: すべて却下
-      rejected_msg: "%{username} の登録申請を却下しました"
+      rejected_msg: "%{username}さんの登録申請を却下しました"
+      remote_suspension_irreversible: このアカウントのデータは不可逆的に削除されました。
+      remote_suspension_reversible_hint_html: このアカウントは停止されており、データは%{date} 日で完全に削除されます。それまでは悪影響なしにアカウントを復旧させることができます。アカウントを即座に削除したい場合は、以下から行うことができます。
       remove_avatar: アイコンを削除
       remove_header: ヘッダーを削除
-      removed_avatar_msg: "%{username} のアバター画像を削除しました"
-      removed_header_msg: "%{username} のヘッダー画像を削除しました"
+      removed_avatar_msg: "%{username}さんのアバター画像を削除しました"
+      removed_header_msg: "%{username}さんのヘッダー画像を削除しました"
       resend_confirmation:
         already_confirmed: メールアドレスは確認済みです
         send: 確認メールを再送
@@ -176,39 +126,38 @@ ja:
       reset: リセット
       reset_password: パスワード再設定
       resubscribe: 再講読
-      role: 役割
-      roles:
-        admin: 管理者
-        moderator: モデレーター
-        staff: スタッフ
-        user: ユーザー
+      role: ロール
       search: 検索
       search_same_email_domain: 同じドメインのメールアドレスを使用しているユーザー
-      search_same_ip: 同じ IP のユーザーを検索
+      search_same_ip: 同じIPのユーザーを検索
       security_measures:
-        password_and_2fa: パスワードと 2FA
+        only_password: パスワードのみ
+        password_and_2fa: パスワードと二要素認証
       sensitive: 閲覧注意
-      sensitized: 閲覧注意済み
+      sensitized: 閲覧注意としてマーク済み
       shared_inbox_url: Shared inbox URL
       show:
-        created_reports: このアカウントで作られた通報
+        created_reports: このアカウントからの通報
         targeted_reports: このアカウントについての通報
       silence: サイレンス
       silenced: サイレンス済み
       statuses: 投稿数
+      strikes: 前回のストライク
       subscribe: 購読する
+      suspend: サスペンド
       suspended: 停止済み
       suspension_irreversible: このアカウントのデータは削除され元に戻せなくなります。後日アカウントの凍結を解除することはできますがデータは元に戻せません。
-      suspension_reversible_hint_html: アカウントは停止されており、データは %{date} に完全に削除されます。それまではアカウントを元に戻すことができます。今すぐ完全に削除したい場合は以下から行うことができます。
-      time_in_queue: "%{time} 待ち"
+      suspension_reversible_hint_html: アカウントは停止されており、データは%{date}に完全に削除されます。それまではアカウントを元に戻すことができます。今すぐ完全に削除したい場合は以下から行うことができます。
       title: アカウント
+      unblock_email: メールアドレスのブロックを解除
+      unblocked_email_msg: "%{username}さんのメールアドレスのブロックを解除しました"
       unconfirmed_email: 確認待ちのメールアドレス
       undo_sensitized: 閲覧注意から戻す
       undo_silenced: サイレンスから戻す
       undo_suspension: 停止から戻す
-      unsilenced_msg: "%{username} のサイレンス解除に成功しました"
+      unsilenced_msg: "%{username}さんのサイレンス解除に成功しました"
       unsubscribe: 購読の解除
-      unsuspended_msg: "%{username} の無効化を解除しました"
+      unsuspended_msg: "%{username}さんの無効化を解除しました"
       username: ユーザー名
       view_domain: ドメインの概要を表示
       warn: 警告
@@ -216,92 +165,124 @@ ja:
       whitelisted: 連合許可済み
     action_logs:
       action_types:
+        approve_appeal: 抗議を承認
+        approve_user: ユーザーの承認
         assigned_to_self_report: 通報の担当者に設定
         change_email_user: ユーザーのメールアドレスを変更
+        change_role_user: ユーザーのロールを変更
         confirm_user: ユーザーの確認
         create_account_warning: 警告を作成
         create_announcement: お知らせを作成
+        create_canonical_email_block: メールブロックを作成
         create_custom_emoji: カスタム絵文字を作成
         create_domain_allow: 連合を許可
         create_domain_block: ドメインブロックを作成
         create_email_domain_block: メールドメインブロックを作成
         create_ip_block: IPルールを作成
         create_unavailable_domain: 配送できないドメインを作成
+        create_user_role: ロールを作成
         demote_user: ユーザーを降格
         destroy_announcement: お知らせを削除
+        destroy_canonical_email_block: メールブロックを削除
         destroy_custom_emoji: カスタム絵文字を削除
         destroy_domain_allow: 連合許可を外す
         destroy_domain_block: ドメインブロックを削除
         destroy_email_domain_block: メールドメインブロックを削除
+        destroy_instance: ドメインをブロックする
         destroy_ip_block: IPルールを削除
         destroy_status: 投稿を削除
         destroy_unavailable_domain: 配送できないドメインを削除
-        disable_2fa_user: 二段階認証を無効化
+        destroy_user_role: ロールを削除
+        disable_2fa_user: 二要素認証を無効化
         disable_custom_emoji: カスタム絵文字を無効化
+        disable_sign_in_token_auth_user: ユーザーのメールトークン認証を無効にする
         disable_user: ユーザーを無効化
         enable_custom_emoji: カスタム絵文字を有効化
+        enable_sign_in_token_auth_user: メールトークンのユーザー認証を有効にする
         enable_user: ユーザーを有効化
         memorialize_account: 追悼アカウント化
         promote_user: ユーザーを昇格
+        reject_appeal: 抗議を却下
+        reject_user: ユーザーを拒否
         remove_avatar_user: アイコンを削除
         reopen_report: 未解決に戻す
+        resend_user: 確認メールを再送信する
         reset_password_user: パスワードをリセット
         resolve_report: 通報を解決済みにする
         sensitive_account: アカウントのメディアを閲覧注意にマーク
         silence_account: アカウントをサイレンス
         suspend_account: アカウントを停止
         unassigned_report: 通報の担当を解除
+        unblock_email_account: メールアドレスのブロックを解除
         unsensitive_account: アカウントのメディアの閲覧注意マークを解除
         unsilence_account: アカウントのサイレンスを解除
         unsuspend_account: アカウントの停止を解除
         update_announcement: お知らせを更新
         update_custom_emoji: カスタム絵文字を更新
         update_domain_block: ドメインブロックを更新
+        update_ip_block: IPルールを更新
         update_status: 投稿を更新
+        update_user_role: ロールを更新
       actions:
-        assigned_to_self_report_html: "%{name} さんが通報 %{target} を自身の担当に割り当てました"
-        change_email_user_html: "%{name} さんが %{target} さんのメールアドレスを変更しました"
-        confirm_user_html: "%{name} さんが %{target} さんのメールアドレスを確認済みにしました"
-        create_account_warning_html: "%{name} さんが %{target} さんに警告メールを送信しました"
-        create_announcement_html: "%{name} さんが新しいお知らせ %{target} を作成しました"
-        create_custom_emoji_html: "%{name} さんがカスタム絵文字 %{target} を追加しました"
-        create_domain_allow_html: "%{name} さんが %{target} の連合を許可しました"
-        create_domain_block_html: "%{name} さんがドメイン %{target} をブロックしました"
-        create_email_domain_block_html: "%{name} さんが %{target} をメールドメインブロックに追加しました"
-        create_ip_block_html: "%{name} さんが IP %{target} のルールを作成しました"
-        create_unavailable_domain_html: "%{name} がドメイン %{target} への配送を停止しました"
-        demote_user_html: "%{name} さんが %{target} さんを降格しました"
-        destroy_announcement_html: "%{name} さんがお知らせ %{target} を削除しました"
-        destroy_custom_emoji_html: "%{name} さんがカスタム絵文字 %{target} を削除しました"
-        destroy_domain_allow_html: "%{name} さんが %{target} の連合許可を外しました"
-        destroy_domain_block_html: "%{name} さんがドメイン %{target} のブロックを外しました"
-        destroy_email_domain_block_html: "%{name} さんが %{target} をメールドメインブロックから外しました"
-        destroy_ip_block_html: "%{name} さんが IP %{target} のルールを削除しました"
-        destroy_status_html: "%{name} さんが %{target} さんの投稿を削除しました"
-        destroy_unavailable_domain_html: "%{name} がドメイン %{target} への配送を再開しました"
-        disable_2fa_user_html: "%{name} さんが %{target} さんの二段階認証を無効化しました"
-        disable_custom_emoji_html: "%{name} さんがカスタム絵文字 %{target} を無効化しました"
-        disable_user_html: "%{name} さんが %{target} さんのログインを無効化しました"
-        enable_custom_emoji_html: "%{name} さんがカスタム絵文字 %{target} を有効化しました"
-        enable_user_html: "%{name} さんが %{target} さんのログインを有効化しました"
-        memorialize_account_html: "%{name} さんが %{target} さんを追悼アカウントページに登録しました"
-        promote_user_html: "%{name} さんが %{target} さんを昇格しました"
-        remove_avatar_user_html: "%{name} さんが %{target} さんのアイコンを削除しました"
-        reopen_report_html: "%{name} さんが通報 %{target} を未解決に戻しました"
-        reset_password_user_html: "%{name} さんが %{target} さんのパスワードをリセットしました"
-        resolve_report_html: "%{name} さんが通報 %{target} を解決済みにしました"
-        sensitive_account_html: "%{name} さんが %{target} さんのメディアを閲覧注意にマークしました"
-        silence_account_html: "%{name} さんが %{target} さんをサイレンスにしました"
-        suspend_account_html: "%{name} さんが %{target} さんを停止しました"
-        unassigned_report_html: "%{name} さんが通報 %{target} の担当を外しました"
-        unsensitive_account_html: "%{name} さんが %{target} さんのメディアの閲覧注意を解除しました"
-        unsilence_account_html: "%{name} さんが %{target} さんのサイレンスを解除しました"
-        unsuspend_account_html: "%{name} さんが %{target} さんの停止を解除しました"
-        update_announcement_html: "%{name} さんがお知らせ %{target} を更新しました"
-        update_custom_emoji_html: "%{name} さんがカスタム絵文字 %{target} を更新しました"
-        update_domain_block_html: "%{name} が %{target} のドメインブロックを更新しました"
-        update_status_html: "%{name} さんが %{target} さんの投稿を更新しました"
-      deleted_status: "(削除済)"
+        approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました"
+        approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
+        assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
+        change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました"
+        change_role_user_html: "%{name}さんが%{target}さんのロールを変更しました"
+        confirm_user_html: "%{name}さんが%{target}さんのメールアドレスを確認済みにしました"
+        create_account_warning_html: "%{name}さんが%{target}さんに警告メールを送信しました"
+        create_announcement_html: "%{name}さんが新しいお知らせ %{target}を作成しました"
+        create_canonical_email_block_html: "%{name} さんがハッシュ %{target} を持つメールをブロックしました。"
+        create_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を追加しました"
+        create_domain_allow_html: "%{name}さんが%{target}の連合を許可しました"
+        create_domain_block_html: "%{name}さんがドメイン %{target}をブロックしました"
+        create_email_domain_block_html: "%{name}さんが%{target}をメールドメインブロックに追加しました"
+        create_ip_block_html: "%{name}さんがIP %{target}のルールを作成しました"
+        create_unavailable_domain_html: "%{name}がドメイン %{target}への配送を停止しました"
+        create_user_role_html: "%{name}さんがロール『%{target}』を作成しました"
+        demote_user_html: "%{name}さんが%{target}さんを降格しました"
+        destroy_announcement_html: "%{name}さんがお知らせ %{target}を削除しました"
+        destroy_canonical_email_block_html: "%{name} さんがハッシュ %{target} を持つメールのブロックを解除しました。"
+        destroy_custom_emoji_html: "%{name}さんがカスタム絵文字『%{target}』を削除しました"
+        destroy_domain_allow_html: "%{name}さんが%{target}の連合許可を外しました"
+        destroy_domain_block_html: "%{name}さんがドメイン %{target}のブロックを外しました"
+        destroy_email_domain_block_html: "%{name}さんが%{target}をメールドメインブロックから外しました"
+        destroy_instance_html: "%{name}さんがドメイン %{target}をブロックしました"
+        destroy_ip_block_html: "%{name}さんが IP %{target}のルールを削除しました"
+        destroy_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
+        destroy_unavailable_domain_html: "%{name}がドメイン %{target}への配送を再開しました"
+        destroy_user_role_html: "%{name}さんがロール『%{target}』を削除しました"
+        disable_2fa_user_html: "%{name}さんが%{target}さんの二要素認証を無効化しました"
+        disable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を無効化しました"
+        disable_sign_in_token_auth_user_html: "%{name}さんが%{target}さんのメールトークン認証を無効にしました"
+        disable_user_html: "%{name}さんが%{target}さんのログインを無効化しました"
+        enable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を有効化しました"
+        enable_sign_in_token_auth_user_html: "%{name}さんが%{target}さんのメールトークン認証を有効にしました"
+        enable_user_html: "%{name}さんが%{target}さんのログインを有効化しました"
+        memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました"
+        promote_user_html: "%{name}さんが%{target}さんを昇格しました"
+        reject_appeal_html: "%{name}さんが%{target}からの抗議を却下しました"
+        reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました"
+        remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました"
+        reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
+        resend_user_html: "%{name} が %{target} の確認メールを再送信しました"
+        reset_password_user_html: "%{name}さんが%{target}さんのパスワードをリセットしました"
+        resolve_report_html: "%{name}さんが通報 %{target}を解決済みにしました"
+        sensitive_account_html: "%{name}さんが%{target}さんのメディアを閲覧注意にマークしました"
+        silence_account_html: "%{name}さんが%{target}さんをサイレンスにしました"
+        suspend_account_html: "%{name}さんが%{target}さんを停止しました"
+        unassigned_report_html: "%{name}さんが通報 %{target}の担当を外しました"
+        unblock_email_account_html: "%{name}さんがドメイン %{target}のブロックを解除しました"
+        unsensitive_account_html: "%{name}さんが%{target}さんのメディアの閲覧注意を解除しました"
+        unsilence_account_html: "%{name}さんが%{target}さんのサイレンスを解除しました"
+        unsuspend_account_html: "%{name}さんが%{target}さんの停止を解除しました"
+        update_announcement_html: "%{name}さんがお知らせ %{target}を更新しました"
+        update_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を更新しました"
+        update_domain_block_html: "%{name}さんが%{target}のドメインブロックを更新しました"
+        update_ip_block_html: "%{name} さんがIP %{target} のルールを更新しました"
+        update_status_html: "%{name}さんが%{target}さんの投稿を更新しました"
+        update_user_role_html: "%{name}さんがロール『%{target}』を変更しました"
+      deleted_account: 削除されたアカウント
       empty: ログが見つかりませんでした
       filter_by_action: アクションでフィルター
       filter_by_user: ユーザーでフィルター
@@ -317,7 +298,7 @@ ja:
         title: お知らせを追加
       publish: 公開する
       published_msg: お知らせを掲載しました
-      scheduled_for: "%{time} に予約"
+      scheduled_for: "%{time}に予約"
       scheduled_msg: お知らせの掲載を予約しました
       title: お知らせ
       unpublish: 非公開にする
@@ -340,11 +321,12 @@ ja:
       enable: 有効化
       enabled: 有効
       enabled_msg: 絵文字を有効化しました
-      image_hint: 50KBまでのPNG画像を利用できます
+      image_hint: "%{size}までのPNGまたはGIF画像を利用できます"
       list: 表示
       listed: 表示
       new:
         title: 新規カスタム絵文字の追加
+      no_emoji_selected: 何も選択されていないため、変更されていません
       not_permitted: この操作を実行する権限がありません。
       overwrite: 上書き
       shortcode: ショートコード
@@ -357,13 +339,37 @@ ja:
       updated_msg: 絵文字の更新に成功しました！
       upload: アップロード
     dashboard:
+      active_users: アクティブユーザー
+      interactions: 交流
+      media_storage: メディアストレージ
+      new_users: 新規ユーザー
+      opened_reports: 新規通報
+      pending_appeals_html:
+        other: 保留中の抗議 <strong>%{count}</strong>件
+      pending_reports_html:
+        other: 保留中の通報 <strong>%{count}</strong>件
+      pending_tags_html:
+        other: 保留中のハッシュタグ <strong>%{count}</strong>件
+      pending_users_html:
+        other: 保留中のユーザー <strong>%{count}</strong>件
+      resolved_reports: 解決済みの通報
       software: ソフトウェア
+      sources: サインアップソース
       space: ディスク使用量
       title: ダッシュボード
+      top_languages: トップのアクティブ言語
+      top_servers: トップアクティブサーバー
+      website: ウェブサイト
+    disputes:
+      appeals:
+        empty: 抗議はありません。
+        title: 抗議
     domain_allows:
       add_new: 連合を許可
       created_msg: 連合を許可しました
       destroyed_msg: 連合許可を外しました
+      export: エクスポート
+      import: インポート
       undo: 連合許可を外す
     domain_blocks:
       add_new: ドメインブロックを追加
@@ -371,16 +377,21 @@ ja:
       destroyed_msg: ドメインブロックを外しました
       domain: ドメイン
       edit: ドメインブロックを編集
+      existing_domain_block: あなたは既に%{name}さんに厳しい制限を課しています。
       existing_domain_block_html: 既に%{name}に対して、より厳しい制限を課しています。先に<a href="%{unblock_url}">その制限を解除</a>する必要があります。
+      export: エクスポート
+      import: インポート
       new:
         create: ブロックを作成
         hint: ドメインブロックはデータベース中のアカウント項目の作成を妨げませんが、遡って自動的に指定されたモデレーションをそれらのアカウントに適用します。
         severity:
-          desc_html: "<strong>サイレンス</strong>はアカウントの投稿をフォローしていない人から隠します。<strong>停止</strong>はそのアカウントのコンテンツ、メディア、プロフィールデータをすべて削除します。メディアファイルを拒否したいだけの場合は<strong>なし</strong>を使います。"
+          desc_html: "<strong></strong>はこのドメインでのアカウントの投稿をフォローしていない人から隠します。<strong>停止</strong>はこのドメインでのアカウントのコンテンツ、メディア、プロフィールデータをサーバーから削除します。メディアファイルのみを拒否したい場合は<strong>なし</strong>を選択します。"
           noop: なし
-          silence: サイレンス
+          silence: 制限
           suspend: 停止
         title: 新規ドメインブロック
+      no_domain_block_selected: 何も選択されていないためドメインブロックを変更しませんでした
+      not_permitted: この操作を実行する権限がありません。
       obfuscate: ドメイン名を伏せ字にする
       obfuscate_hint: ドメインブロックのリストを公開している場合、ドメイン名の一部を伏せ字にします
       private_comment: コメント (非公開)
@@ -391,33 +402,40 @@ ja:
       reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
       reject_reports: 通報を拒否
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
-      rejecting_media: メディアファイルを拒否中
-      rejecting_reports: 通報を拒否中
-      severity:
-        silence: サイレンス中
-        suspend: 停止中
-      show:
-        affected_accounts:
-          other: データベース中の%{count}個のアカウントに影響します
-        retroactive:
-          silence: このドメインの既存の影響するアカウントのサイレンスを戻す
-          suspend: このドメインの既存の影響するアカウントの停止を戻す
-        title: "%{domain}のドメインブロックを戻す"
-        undo: 元に戻す
       undo: ドメインブロックを戻す
       view: ドメインブロックを表示
     email_domain_blocks:
       add_new: 新規追加
+      attempts_over_week:
+        other: 先週は%{count}回サインアップが試みられました
       created_msg: メールドメインブロックに追加しました
       delete: 消去
-      destroyed_msg: メールドメインブロックから外しました
+      dns:
+        types:
+          mx: MXレコード
       domain: ドメイン
-      empty: メールドメインブロックには現在何も登録されていません。
-      from_html: "%{domain} から"
       new:
         create: ドメインを追加
+        resolve: ドメイン解決
         title: 新規メールドメインブロック
+      no_email_domain_block_selected: 何も選択されていないためメールドメインブロックを変更しませんでした
+      resolved_dns_records_hint_html: ドメイン名はDNSでMXドメインに名前解決され、最終的にメールを受け付ける役割を担います。目に見えるドメイン名が異なっていても、同じMXドメインを使用するメールアドレスからのアカウント登録がブロックされます。<strong>主要なメールプロバイダーをブロックしないように注意して下さい。</strong>
+      resolved_through_html: "%{domain}を通して解決しました"
       title: メールドメインブロック
+    export_domain_allows:
+      new:
+        title: ドメイン許可をインポート
+      no_file: ファイルが選択されていません
+    export_domain_blocks:
+      import:
+        description_html: ドメインブロックのリストをインポートしようとしています。このリストを自分で作成していない場合は、慎重に確認してください。
+        existing_relationships_warning: 既存のフォロー関係
+        private_comment_description_html: インポートされたブロックがどこから来たのかを追跡するため、インポートされたブロックは次のプライベートコメントを追加して作成されます:<q>%{comment}</q>
+        private_comment_template: "%{source} から %{date} にインポートしました"
+        title: ドメインブロックをインポート
+      new:
+        title: ドメインブロックをインポート
+      no_file: ファイルが選択されていません
     follow_recommendations:
       description_html: "<strong>おすすめフォローは、新規ユーザーが興味のあるコンテンツをすばやく見つけるのに役立ちます。</strong>ユーザーが他のユーザーとの交流を十分にしていない場合、パーソナライズされたおすすめフォローを生成する代わりに、これらのアカウントが表示されます。最近のエンゲージメントが最も高いアカウントと、特定の言語のローカルフォロワー数が最も多いアカウントを組み合わせて､毎日再計算されます。"
       language: 言語
@@ -427,24 +445,51 @@ ja:
       title: おすすめフォロー
       unsuppress: おすすめフォローを復元
     instances:
+      availability:
+        description_html:
+          other: ドメインへの配信が <strong>%{count}</strong> 日失敗した場合、そのドメイン<em>からの</em>配信を受信しない限り、それ以上の配信を行いません。
+        failure_threshold_reached: "%{date}に失敗のしきい値に達しました。"
+        failures_recorded:
+          other: "%{count}日間試行に失敗しました。"
+        no_failures_recorded: 失敗は記録されていません。
+        title: 可用性
+        warning: このサーバーへの最後の接続試行に失敗しました
       back_to_all: すべて
       back_to_limited: 制限あり
       back_to_warning: 警告あり
       by_domain: ドメイン
+      confirm_purge: このドメインを完全にブロックしてもよろしいですか？
+      content_policies:
+        comment: 内部メモ
+        description_html: このドメインとそのサブドメインのすべてのアカウントに適用されるコンテンツポリシーを定義できます。
+        policies:
+          reject_media: メディアを拒否する
+          reject_reports: 通報を拒否
+          silence: 制限
+          suspend: サスペンド
+        policy: ポリシー
+        reason: 公開理由
+        title: コンテンツ ポリシー
+      dashboard:
+        instance_accounts_dimension: 最もフォローされているアカウント
+        instance_accounts_measure: 保存されたアカウント
+        instance_followers_measure: そこでの我々のフォロワー
+        instance_follows_measure: そのインスタンスのこのインスタンスでのフォロワー
+        instance_languages_dimension: 人気の言語
+        instance_media_attachments_measure: 保存されたメディア
+        instance_reports_measure: 通報
+        instance_statuses_measure: 保存された投稿
       delivery:
         all: すべて
         clear: 配送エラーをクリア
+        failing: 配送失敗
         restart: 配送を再開
         stop: 配送を停止
-        title: 配送
         unavailable: 配送不可
-        unavailable_message: 配送不可
-        warning: 警告あり
-        warning_message:
-          other: "%{count} 日配送失敗"
       delivery_available: 配送可能
       delivery_error_days: 配送エラー発生日
-      delivery_error_hint: "%{count} 日間配送ができない場合は、自動的に配送不可としてマークされます。"
+      delivery_error_hint: "%{count}日間配送ができない場合は、自動的に配送不可としてマークされます。"
+      destroyed_msg: "%{domain}からのデータは、すぐに削除されるように、キューに追加されました。"
       empty: ドメインが見つかりませんでした。
       known_accounts:
         other: 既知のアカウント数 %{count}
@@ -454,12 +499,15 @@ ja:
         title: モデレーション
       private_comment: コメント (非公開)
       public_comment: コメント (公開)
+      purge: パージ
+      purge_description_html: このドメインがオフラインであると思われる場合は、このドメインのすべてのアカウント記録と関連するデータをストレージから削除できます。 これは時間がかかることがあります。
       title: 既知のサーバー
       total_blocked_by_us: ブロック合計
       total_followed_by_them: 被フォロー合計
       total_followed_by_us: フォロー合計
       total_reported: 通報合計
       total_storage: 添付されたメディア
+      totals_time_period_hint_html: 以下に表示される合計には、すべての時間のデータが含まれています。
     invites:
       deactivate_all: すべて無効化
       filter:
@@ -474,7 +522,7 @@ ja:
       delete: 削除
       expires_in:
         '1209600': 2週間
-        '15778476': 6ヶ月
+        '15778476': 半年
         '2629746': 1ヶ月
         '31556952': 1年
         '86400': 1日
@@ -483,8 +531,6 @@ ja:
         title: 新規IPルール
       no_ip_block_selected: 何も選択されていないためIPルールを変更しませんでした
       title: IPルール
-    pending_accounts:
-      title: 承認待ちアカウント (%{count})
     relationships:
       title: "%{acct} さんのフォロー・フォロワー"
     relays:
@@ -509,38 +555,120 @@ ja:
     reports:
       account:
         notes:
-          other: "%{count} 件のメモ"
-        reports:
-          other: "%{count} 件の通報"
+          other: "%{count}件のメモ"
+      action_log: 監査ログ
       action_taken_by: 通報処理者
+      actions:
+        delete_description_html: 報告された投稿は削除され、ストライクが記録されます。同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
+        mark_as_sensitive_description_html: 報告された投稿のメディアは閲覧注意となり、ストライクが記録され、同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
+        other_description_html: アカウントの動作を制御するためのオプションや、報告されたアカウントへの通信をカスタマイズするためのオプションを確認してください。
+        resolve_description_html: 報告されたアカウントに対していかなる措置も取られず、ストライクも記録されず、報告は終了します。
+        silence_description_html: 既にフォローしている人、または自分で参照した人にのみ表示されるため、プロフィールが届く範囲が大きく制限されます。いつでも元に戻すことができます。
+        suspend_description_html: プロフィールとすべてのコンテンツは、最終的に削除されるまでアクセスできなくなります。アカウントとのやり取りは不可能です。30日以内に取り消し可能です。
+      actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されますが<strong>スパム</strong>カテゴリが選択されている場合を除きます。
+      add_to_report: 通報にさらに追加
       are_you_sure: 本当に実行しますか？
       assign_to_self: 担当になる
       assigned: 担当者
+      by_target_domain: ドメイン
+      category: カテゴリー
+      category_description_html: 選択した理由は通報されたアカウントへの連絡時に引用されます
       comment:
         none: なし
+      comment_description_html: "%{name}からの詳細情報:"
       created_at: 通報日時
+      delete_and_resolve: 投稿を削除
       forwarded: 転送済み
-      forwarded_to: "%{domain} に転送されました"
+      forwarded_to: "%{domain}に転送されました"
       mark_as_resolved: 解決済みとしてマーク
+      mark_as_sensitive: 閲覧注意にする
       mark_as_unresolved: 未解決に戻す
+      no_one_assigned: なし
       notes:
         create: 書き込む
         create_and_resolve: 書き込み、解決済みにする
         create_and_unresolve: 書き込み、未解決に戻す
         delete: 削除
         placeholder: どのような措置が取られたか、または関連する更新を記述してください…
+        title: メモ
+      notes_description_html: 他のモデレーターと将来の自分にメモを残してください
+      quick_actions_description_html: 'クイックアクションを実行するかスクロールして報告された通報を確認してください:'
+      remote_user_placeholder: "%{instance}からのリモートユーザー"
       reopen: 未解決に戻す
-      report: 通報#%{id}
+      report: '通報 #%{id}'
       reported_account: 報告対象アカウント
       reported_by: 報告者
       resolved: 解決済み
       resolved_msg: 通報を解決済みにしました！
+      skip_to_actions: アクションに移動
       status: ステータス
-      target_domain: ドメイン
+      statuses: 通報内容
+      statuses_description_html: 問題の投稿は通報されたアカウントへの連絡時に引用されます
+      target_origin: 報告されたアカウントの起源
       title: 通報
       unassign: 担当を外す
       unresolved: 未解決
       updated_at: 更新日時
+      view_profile: プロフィールを表示
+    roles:
+      add_new: ロールを追加
+      assigned_users:
+        other: "%{count}人"
+      categories:
+        administration: 管理
+        devops: 開発者
+        invites: 招待
+        moderation: モデレーション
+        special: スペシャル
+      delete: 削除
+      description_html: "<strong>ユーザー ロール</strong>を使用すると、ユーザーがアクセスできる Mastodon の機能や領域をカスタマイズできます。"
+      edit: "『%{name}』のロールを編集"
+      everyone: デフォルトの権限
+      everyone_full_description_html: これは、割り当てられたロールを持っていないものであっても、 <strong>すべてのユーザー</strong> に影響を与える <strong>基本ロール</strong>です。 他のすべてのロールは、そこから権限を継承します。
+      permissions_count:
+        other: "%{count}件の権限"
+      privileges:
+        administrator: 管理者
+        administrator_description: この権限を持つユーザーはすべての権限をバイパスします
+        delete_user_data: ユーザーデータの削除
+        delete_user_data_description: ユーザーは、遅滞なく他のユーザーのデータを削除することができます
+        invite_users: ユーザーを招待
+        invite_users_description: ユーザーが新しい人を招待できるようにします
+        manage_announcements: お知らせの管理
+        manage_announcements_description: ユーザーがアナウンスを管理できるようにします
+        manage_appeals: 抗議の管理
+        manage_appeals_description: ユーザーはモデレーションアクションに対する抗議を確認できます
+        manage_blocks: ブロックの管理
+        manage_blocks_description: ユーザーがメールプロバイダとIPアドレスをブロックできるようにします
+        manage_custom_emojis: カスタム絵文字を管理
+        manage_custom_emojis_description: ユーザーがサーバー上のカスタム絵文字を管理できるようにします
+        manage_federation: 連合の管理
+        manage_federation_description: ユーザーが他のドメインとの連合をブロックまたは許可したり、配信を制御したりできます。
+        manage_invites: 招待を管理
+        manage_invites_description: 招待リンクの閲覧・解除を可能にする。
+        manage_reports: レポートの管理
+        manage_reports_description: ユーザーがレポートを確認したり、モデレーションアクションを実行したりできます。
+        manage_roles: ロールの管理
+        manage_roles_description: ユーザーが自分より下の役割を管理し、割り当てることができます。
+        manage_rules: ルールの管理
+        manage_rules_description: ユーザーがサーバールールを変更できるようにします
+        manage_settings: 設定の管理
+        manage_settings_description: ユーザーがサイト設定を変更できるようにします
+        manage_taxonomies: 分類の管理
+        manage_taxonomies_description: トレンドコンテンツの確認とハッシュタグの設定の更新
+        manage_user_access: アクセス権を管理
+        manage_user_access_description: 他のユーザーの2段階認証を無効にしたり、メールアドレスを変更したり、パスワードをリセットしたりすることができます。
+        manage_users: ユーザーの管理
+        manage_users_description: 他のユーザーの詳細情報を閲覧し、モデレーションを行うことができます。
+        manage_webhooks: Webhookの管理
+        manage_webhooks_description: 管理者イベントのWebhookを設定できます。
+        view_audit_log: 監査ログの表示
+        view_audit_log_description: ユーザーがサーバー上で管理アクションの履歴を表示できるようにします
+        view_dashboard: ダッシュボードの表示
+        view_dashboard_description: ユーザーがダッシュボードやさまざまなメトリクスにアクセスできるようにします
+        view_devops: 開発者
+        view_devops_description: Sidekiq と pgHero ダッシュボードにアクセスできるようにします
+      title: ロール
     rules:
       add_new: ルールを追加
       delete: 削除
@@ -549,152 +677,215 @@ ja:
       empty: サーバーのルールが定義されていません。
       title: サーバーのルール
     settings:
-      activity_api_enabled:
-        desc_html: 週ごとのローカルに投稿された投稿数、アクティブなユーザー数、新規登録者数
-        title: ユーザーアクティビティに関する統計を公開する
-      bootstrap_timeline_accounts:
-        desc_html: 複数のユーザー名を指定する場合コンマで区切ります。おすすめに表示されます。
-        title: 新規ユーザーにおすすめするアカウント
-      contact_information:
-        email: ビジネスメールアドレス
-        username: 連絡先ユーザー名
-      custom_css:
-        desc_html: 全ページに適用されるCSSの編集
-        title: カスタムCSS
+      about:
+        manage_rules: サーバーのルールを管理
+        preamble: サーバーの運営、管理、資金調達の方法について、詳細な情報を提供します。
+        rules_hint: ユーザーが守るべきルールのための専用エリアがあります。
+        title: このサーバーについて
+      appearance:
+        preamble: ウェブインターフェースをカスタマイズします。
+        title: 外観
+      branding:
+        preamble: サーバーのブランディングは、ネットワーク上の他のサーバーと区別するためのものです。この情報は、Mastodon の Web インターフェース、ネイティブアプリケーション、他の Web サイトやメッセージングアプリのリンクプレビューなど、様々な所で表示される可能性があります。このため、明確で短く、簡潔に記載することをおすすめします。
+        title: ブランディング
+      content_retention:
+        preamble: ユーザーが生成したコンテンツがどのように Mastodon に保存されるかを管理します。
+        title: コンテンツの保持
       default_noindex:
-        desc_html: この設定を変更していない全ユーザーに影響します
+        desc_html: この設定を自分で変更していない全ユーザーに影響します
         title: デフォルトで検索エンジンによるインデックスを拒否する
+      discovery:
+        follow_recommendations: おすすめフォロー
+        preamble: Mastodon を知らないユーザーを取り込むには、興味深いコンテンツを浮上させることが重要です。サーバー上で様々なディスカバリー機能がどのように機能するかを制御します。
+        profile_directory: ディレクトリ
+        public_timelines: 公開タイムライン
+        title: 見つける
+        trends: トレンド
       domain_blocks:
         all: 誰にでも許可
         disabled: 誰にも許可しない
-        title: ドメインブロックを表示
         users: ログイン済みローカルユーザーのみ許可
-      domain_blocks_rationale:
-        title: コメントを表示
-      hero:
-        desc_html: フロントページに表示されます。サイズは600x100px以上推奨です。未設定の場合、標準のサムネイルが使用されます
-        title: ヒーローイメージ
-      mascot:
-        desc_html: 複数のページに表示されます。サイズは293x205px以上推奨です。未設定の場合、標準のマスコットが使用されます
-        title: マスコットイメージ
-      peers_api_enabled:
-        desc_html: 連合内でこのサーバーが遭遇したドメインの名前
-        title: 接続しているサーバーのリストを公開する
-      preview_sensitive_media:
-        desc_html: 他のウェブサイトにリンクを貼った際、メディアが閲覧注意としてマークされていてもサムネイルが表示されます
-        title: OpenGraphによるプレビューで閲覧注意のメディアも表示する
-      profile_directory:
-        desc_html: ユーザーが見つかりやすくできるようになります
-        title: ディレクトリを有効にする
       registrations:
-        closed_message:
-          desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます
-          title: 新規登録停止時のメッセージ
-        deletion:
-          desc_html: 誰でも自分のアカウントを削除できるようにします
-          title: アカウント削除を受け付ける
-        min_invite_role:
-          disabled: 誰にも許可しない
-          title: 招待の作成を許可
-        require_invite_text:
-          desc_html: アカウント登録が承認制の場合、「意気込みをお聞かせください」のテキストを必須入力にする
-          title: 新規ユーザー登録時の理由を必須入力にする
+        preamble: あなたのサーバー上でアカウントを作成できるユーザーを制御します。
+        title: アカウント作成
       registrations_mode:
         modes:
           approved: 登録には承認が必要
           none: 誰にも許可しない
           open: 誰でも登録可
-        title: 新規登録
-      show_known_fediverse_at_about_page:
-        desc_html: チェックを外すと、ランディングページからリンクされた公開タイムラインにローカルの公開投稿のみ表示します。
-        title: 公開タイムラインに連合先のコンテンツも表示する
-      show_staff_badge:
-        desc_html: ユーザーページにスタッフのバッジを表示します
-        title: スタッフバッジを表示する
-      site_description:
-        desc_html: フロントページへの表示に使用される紹介文です。このMastodonサーバーを特徴付けることやその他重要なことを記述してください。HTMLタグ、特に<code>&lt;a&gt;</code> と <code>&lt;em&gt;</code>が使えます。
-        title: サーバーの説明
-      site_description_extended:
-        desc_html: あなたのサーバーにおける行動規範やルール、ガイドライン、そのほかの記述をする際に最適な場所です。HTMLタグが使えます
-        title: カスタム詳細説明
-      site_short_description:
-        desc_html: サイドバーと meta タグに表示されます。Mastodon とは何か、そしてこのサーバーの特別な何かを1段落で記述してください。空欄の場合、サーバーの説明が使用されます。
-        title: 短いサーバーの説明
-      site_terms:
-        desc_html: 独自のプライバシーポリシーや利用規約、その他の法的根拠を記述できます。HTMLタグが使えます
-        title: カスタム利用規約
-      site_title: サーバーの名前
-      thumbnail:
-        desc_html: OpenGraphとAPIによるプレビューに使用されます。サイズは1200×630px推奨です
-        title: サーバーのサムネイル
-      timeline_preview:
-        desc_html: ランディングページに公開タイムラインへのリンクを表示し、認証なしでの公開タイムラインへの API アクセスを許可します
-        title: 公開タイムラインへの未認証のアクセスを許可する
-      title: サイト設定
-      trendable_by_default:
-        desc_html: 表示を拒否していないハッシュタグに影響します
-        title: 審査前のハッシュタグのトレンドへの表示を許可する
-      trends:
-        desc_html: 現在トレンドになっている承認済みのハッシュタグを公開します
-        title: トレンドタグを有効にする
+      title: サーバー設定
     site_uploads:
       delete: ファイルを削除
       destroyed_msg: ファイルを削除しました！
     statuses:
+      account: 作成者
+      application: アプリ
       back_to_account: アカウントページに戻る
+      back_to_report: 通報ページに戻る
       batch:
-        delete: 削除
-        nsfw_off: 閲覧注意をはずす
-        nsfw_on: 閲覧注意にする
+        remove_from_report: 通報から削除
+        report: 通報
       deleted: 削除済み
-      failed_to_execute: 実行に失敗しました
+      favourites: お気に入り
+      history: 更新履歴
+      in_reply_to: 返信先
+      language: 言語
       media:
         title: メディア
-      no_media: メディアなし
+      metadata: メタデータ
       no_status_selected: 何も選択されていないため、変更されていません
+      open: 投稿を開く
+      original_status: オリジナルの投稿
+      reblogs: ブースト
+      status_changed: 投稿を変更しました
       title: 投稿一覧
+      trending: トレンド
+      visibility: 公開範囲
       with_media: メディアあり
+    strikes:
+      actions:
+        delete_statuses: "%{name}さんが%{target}さんの投稿を削除しました"
+        disable: "%{name}さんが%{target}さんを凍結しました"
+        mark_statuses_as_sensitive: "%{name}さんが%{target}さんの投稿を閲覧注意としてマークしました"
+        none: "%{name}さんが%{target}さんに警告を送信しました"
+        sensitive: "%{name}さんが%{target}さんのアカウントを閲覧注意としてマークしました"
+        silence: "%{name}さんが%{target}さんを制限しました"
+        suspend: "%{name}さんが%{target}さんのアカウントを停止しました"
+      appeal_approved: 抗議済み
+      appeal_pending: 保留中の抗議
     system_checks:
       database_schema_check:
         message_html: 未実行のデータベースマイグレーションがあります。実行して正常に動作するようにしてください。
+      elasticsearch_running_check:
+        message_html: Elasticsearchに接続できませんでした。Elasticsearchが実行されていることを確認するか、全文検索を無効にしてください。
+      elasticsearch_version_check:
+        message_html: '互換性のない Elasticsearch バージョン: %{value}'
+        version_comparison: Elasticsearch %{running_version}が実行されていますが、%{required_version}が必要です
       rules_check:
         action: サーバーのルールを管理
         message_html: サーバーのルールを定義していません。
       sidekiq_process_check:
-        message_html: "%{value} キューに対応するSidekiq プロセスがありません。Sidekiq の設定を確認してください。"
+        message_html: "%{value}キューに対応するSidekiqプロセスがありません。Sidekiqの設定を確認してください。"
     tags:
-      accounts_today: 本日使用した人数
-      accounts_week: 今週使用した人数
-      breakdown: 直近のサーバー別使用状況
-      last_active: 最近使われた順
-      most_popular: 使用頻度順
-      most_recent: 新着順
-      name: ハッシュタグ
       review: 審査状況
-      reviewed: 審査済み
-      title: ハッシュタグ
-      trending_right_now: 現在のトレンド
-      unique_uses_today: 本日 %{count} 人が投稿に使用
-      unreviewed: 未審査
       updated_msg: ハッシュタグ設定が更新されました
     title: 管理
+    trends:
+      allow: 許可
+      approved: 承認
+      disallow: 拒否
+      links:
+        allow: リンクの許可
+        allow_provider: 発行者の承認
+        description_html: これらは、多くのユーザーに共有されているリンクです。あなたのユーザーが世の中の動きを知るのに役立ちます。あなたが公開者を承認するまで、リンクは一般に表示されません。また、個別のリンクの許可・拒否も可能です。
+        disallow: リンクの拒否
+        disallow_provider: 発行者の拒否
+        no_link_selected: 何も選択されていないため、変更されていません
+        publishers:
+          no_publisher_selected: 何も選択されていないため、変更されていません
+        shared_by_over_week:
+          other: 週間%{count}人に共有されました
+        title: トレンドリンク
+        usage_comparison: 今日は%{today}回、昨日は%{yesterday}回共有されました
+      only_allowed: 許可済み
+      pending_review: 保留中
+      preview_card_providers:
+        allowed: この発行者からのリンクを許可
+        description_html: これらは、よく共有されるリンク元のドメインです。リンク先のドメインが承認されない限り、リンクは公開されません。承認（または拒否）はサブドメインにも及びます。
+        rejected: この発行者からのリンクを拒否
+        title: 発行者
+      rejected: 拒否
+      statuses:
+        allow: 掲載を許可
+        allow_account: 投稿者を許可
+        description_html: これらは、このサーバーが知っている、たくさんシェアされ、お気に入り登録されている投稿です。新しいユーザーや久しぶりにアクセスするユーザーがフォローする人を探すのに役立ちます。あなたが投稿者を承認し、投稿者が許可するまで、表示されることはありません。また、個別の投稿を許可または拒否することもできます。
+        disallow: 掲載を拒否
+        disallow_account: 投稿者を拒否
+        no_status_selected: 何も選択されていないため、変更されていません
+        not_discoverable: 投稿者は発見可能であることに同意していません
+        shared_by:
+          other: "%{friendly_count} 回の共有、お気に入り"
+        title: トレンド投稿
+      tags:
+        current_score: 現在のスコア %{score}
+        dashboard:
+          tag_accounts_measure: 1回のみ使用
+          tag_languages_dimension: 人気の言語
+          tag_servers_dimension: 人気のサーバー
+          tag_servers_measure: その他のサーバー
+          tag_uses_measure: 合計利用数
+        description_html: これらは、多くの投稿に使用されているハッシュタグです。あなたのユーザーが、人々が今一番話題にしていることを知るのに役立ちます。あなたが承認するまで、ハッシュタグは一般に表示されません。
+        listable: おすすめに表示する
+        no_tag_selected: 何も選択されていないため、変更されていません
+        not_listable: おすすめに表示しない
+        not_trendable: トレンドに表示しない
+        not_usable: 使用を禁止
+        peaked_on_and_decaying: "%{date}以降、しばらく使われていません"
+        title: トレンドタグ
+        trendable: トレンドに表示する
+        trending_rank: '人気: %{rank}位'
+        usable: 使用を許可
+        usage_comparison: 今日は%{today}回、昨日は%{yesterday}回使用されました。
+        used_by_over_week:
+          other: 週間%{count}人に使用されました
+      title: トレンド
+      trending: トレンド
     warning_presets:
       add_new: 追加
       delete: 削除
       edit_preset: プリセット警告文を編集
       empty: まだプリセット警告文が作成されていません。
       title: プリセット警告文を管理
+    webhooks:
+      add_new: エンドポイントを追加
+      delete: 削除
+      description_html: "<strong>Webhook</strong> により、Mastodon は選択されたイベントの<strong>リアルタイム通知</strong>をアプリケーションにプッシュします。これにより、アプリケーションは<strong>自動的に処理を行うことができます</strong>。"
+      disable: 無効化
+      disabled: 無効
+      edit: エンドポイントを編集
+      empty: まだWebhookエンドポイントが設定されていません。
+      enable: 有効化
+      enabled: アクティブ
+      enabled_events:
+        other: "%{count}件の有効なイベント"
+      events: イベント
+      new: 新しいwebhook
+      rotate_secret: シークレットをローテートする
+      secret: シークレットに署名
+      status: 投稿
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: 投稿を削除する
+        disable: アカウントを無効にする
+        mark_statuses_as_sensitive: 閲覧注意としてマーク
+        none: 警告
+        sensitive: アカウントを閲覧注意にする
+        silence: アカウントを制限する
+        suspend: アカウントを停止する
+      body: "%{target} は %{date} に行われた %{action_taken_by} による %{type} のモデレーション判定に不服を申し立てています。内容は次の通りです:"
+      next_steps: モデレーションの決定を取り消すために申し立てを承認するか、無視することができます。
+      subject: "%{instance}で%{username}さんからモデレーションへの申し立てが届きました。"
     new_pending_account:
       body: 新しいアカウントの詳細は以下の通りです。この申請を承認または却下することができます。
-      subject: "%{instance} で新しいアカウント (%{username}) が承認待ちです"
+      subject: "%{instance}で新しいアカウント (%{username}) が承認待ちです"
     new_report:
-      body: "%{reporter} が %{target} を通報しました"
-      body_remote: "%{domain} の誰かが %{target} を通報しました"
-      subject: "%{instance} の新しい通報 (#%{id})"
-    new_trending_tag:
-      body: 'ハッシュタグ #%{name} が本日のトレンドになっていますが、審査がまだ行われていないためトレンドタグには表示されていません。一度許可すれば次回からこの操作は不要です。'
-      subject: "%{instance} で新しいハッシュタグ (#%{name}) が審査待ちです"
+      body: "%{reporter}さんが%{target}さんを通報しました"
+      body_remote: "%{domain}の誰かが%{target}さんを通報しました"
+      subject: "%{instance}の新しい通報 (#%{id})"
+    new_trends:
+      body: 以下の項目は、公開する前に審査が必要です。
+      new_trending_links:
+        title: トレンドリンク
+      new_trending_statuses:
+        title: トレンド投稿
+      new_trending_tags:
+        no_approved_tags: 承認されたトレンドハッシュタグはありません。
+        requirements: 'これらの候補はいずれも %{rank} 位の承認済みトレンドハッシュタグのスコアを上回ります。現在 #%{lowest_tag_name} のスコアは %{lowest_tag_score} です。'
+        title: トレンドハッシュタグ
+      subject: "%{instance}で新しいトレンドが審査待ちです"
   aliases:
     add_new: エイリアスを作成
     created_msg: エイリアスを作成しました。これで以前のアカウントから引っ越しを開始できます。
@@ -703,7 +894,7 @@ ja:
     hint_html: 他のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。エイリアス自体は<strong>無害で、取り消す</strong>ことができます。<strong>引っ越しは以前のアカウント側から開始する必要があります</strong>。
     remove: エイリアスを削除
   appearance:
-    advanced_web_interface: 上級者向け UI
+    advanced_web_interface: 上級者向けUI
     advanced_web_interface_hint: ディスプレイを幅いっぱいまで活用したい場合、上級者向け UI をおすすめします。ホーム、通知、連合タイムライン、更にはリストやハッシュタグなど、様々な異なるカラムから望む限りの情報を一度に受け取れるような設定が可能になります。
     animations_and_accessibility: アニメーションとアクセシビリティー
     confirmation_dialogs: 確認ダイアログ
@@ -716,7 +907,7 @@ ja:
     toot_layout: 投稿のレイアウト
   application_mailer:
     notification_preferences: メール設定の変更
-    salutation: "%{name} さん"
+    salutation: "%{name}さん"
     settings: 'メール設定の変更: %{link}'
     view: 'リンク:'
     view_profile: プロフィールを表示
@@ -724,54 +915,59 @@ ja:
   applications:
     created: アプリが作成されました
     destroyed: アプリが削除されました
-    invalid_url: URLが無効です
     regenerate_token: アクセストークンの再生成
     token_regenerated: アクセストークンが再生成されました
     warning: このデータは気をつけて取り扱ってください。他の人と共有しないでください！
     your_token: アクセストークン
   auth:
-    apply_for_account: 登録を申請する
+    apply_for_account: アカウントのリクエスト
     change_password: パスワード
-    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">サーバーのルール</a> と <a href="%{terms_path}" target="_blank">プライバシーポリシー</a> に同意します
-    checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">利用規約</a> に同意します
     delete_account: アカウントの削除
-    delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a> から手続きが行えます。削除する前に、確認画面があります。
+    delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a>から手続きが行えます。削除する前に、確認画面があります。
     description:
-      prefix_invited_by_user: "@%{name} があなたをこの Mastodon サーバーに招待しました"
-      prefix_sign_up: 今すぐ Mastodon を始めよう！
-      suffix: アカウントがあれば、どんな Mastodon 互換サーバーのユーザーでもフォローしたりメッセージをやり取りできるようになります！
+      prefix_invited_by_user: "@%{name}さんがあなたをこのMastodonサーバーに招待しました"
+      prefix_sign_up: 今すぐMastodonを始めよう！
+      suffix: アカウントがあれば、どんなMastodon互換サーバーのユーザーでもフォローしたりメッセージをやり取りできるようになります！
     didnt_get_confirmation: 確認メールを受信できませんか？
     dont_have_your_security_key: セキュリティキーを持っていませんか？
     forgot_password: パスワードをお忘れですか？
     invalid_reset_password_token: パスワードリセットトークンが正しくないか期限切れです。もう一度リクエストしてください。
-    link_to_otp: 携帯電話から二段階認証コードを入力するか、リカバリーコードを入力してください
+    link_to_otp: 携帯電話から二要素認証コードを入力するか、リカバリーコードを入力してください
     link_to_webauth: セキュリティキーを使用する
+    log_in_with: 次の方法でログイン
     login: ログイン
     logout: ログアウト
     migrate_account: 別のアカウントに引っ越す
     migrate_account_html: 引っ越し先を明記したい場合は<a href="%{path}">こちら</a>で設定できます。
     or_log_in_with: または次のサービスでログイン
+    privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">プライバシーポリシー</a>を読み、同意します
     providers:
       cas: CAS
       saml: SAML
     register: 登録する
-    registration_closed: "%{instance} は現在、新規登録停止中です"
+    registration_closed: "%{instance}は現在、新規登録停止中です"
     resend_confirmation: 確認メールを再送する
     reset_password: パスワードを再発行
+    rules:
+      preamble: これらは %{domain} モデレータによって設定され、実施されます。
+      title: いくつかのルールがあります。
     security: セキュリティ
     set_new_password: 新しいパスワード
     setup:
       email_below_hint_html: 下記のメールアドレスが間違っている場合、ここで変更することで新たに確認メールを受信できます。
-      email_settings_hint_html: 確認用のメールを %{email} に送信しました。メールアドレスが正しくない場合、以下より変更することができます。
+      email_settings_hint_html: 確認用のメールを%{email}に送信しました。メールアドレスが正しくない場合、以下より変更することができます。
       title: セットアップ
+    sign_up:
+      preamble: この Mastodon サーバーのアカウントがあれば、ネットワーク上の他の人のアカウントがどこでホストされているかに関係なく、その人をフォローすることができます。
+      title: さあ %{domain} でセットアップしましょう.
     status:
       account_status: アカウントの状態
       confirming: メールアドレスの確認が完了するのを待っています。
       functional: アカウントは完全に機能しています。
       pending: あなたの申請は現在サーバー管理者による審査待ちです。これにはしばらくかかります。申請が承認されるとメールが届きます。
-      redirecting_to: アカウントは %{acct} に引っ越し設定されているため非アクティブになっています。
+      redirecting_to: アカウントは%{acct}に引っ越し設定されているため非アクティブになっています。
+      view_strikes: 過去のストライクを表示
     too_fast: フォームの送信が速すぎます。もう一度やり直してください。
-    trouble_logging_in: ログインできませんか？
     use_security_key: セキュリティキーを使用
   authorize_follow:
     already_following: あなたは既にこのアカウントをフォローしています
@@ -783,17 +979,17 @@ ja:
     post_follow:
       close: またはこのウィンドウを閉じます。
       return: ユーザーのプロフィールを見る
-      web: Web を開く
-    title: "%{acct} をフォロー"
+      web: Webを開く
+    title: "%{acct}さんをフォロー"
   challenge:
     confirm: 続ける
-    hint_html: 以後 1 時間はパスワードの再入力を求めません
+    hint_html: 以後1時間はパスワードの再入力を求めません
     invalid_password: パスワードが間違っています
     prompt: 続行するにはパスワードを入力してください
   crypto:
     errors:
-      invalid_key: 有効な Ed25519 または Curve25519 キーではありません
-      invalid_signature: 有効な Ed25519 署名ではありません
+      invalid_key: 有効なEd25519またはCurve25519キーではありません
+      invalid_signature: 有効なEd25519署名ではありません
   date:
     formats:
       default: "%Y年%m月%d日"
@@ -823,16 +1019,42 @@ ja:
       caches: 他のサーバーにコンテンツのキャッシュがずっと残る場合があります
       data_removal: あなたの投稿やその他のデータはこのサーバーから完全に削除されます
       email_change_html: アカウントを削除しなくても<a href="%{path}">メールアドレスを変更</a>できます
-      email_contact_html: それでも届かない場合、<a href="mailto:%{email}">%{email}</a> までメールで問い合わせてください
+      email_contact_html: それでも届かない場合、<a href="mailto:%{email}">%{email}</a>までメールで問い合わせてください
       email_reconfirmation_html: 確認のメールが届かない場合、<a href="%{path}">もう一度申請</a>できます。
       irreversible: 削除操作の撤回やアカウントの復活はできません
       more_details_html: 詳しくは<a href="%{terms_path}">プライバシーポリシー</a>をご覧ください。
       username_available: あなたのユーザー名は再利用できるようになります
       username_unavailable: あなたのユーザー名は引き続き利用できません
-  directories:
-    directory: ディレクトリ
-    explanation: 関心を軸にユーザーを発見しよう
-    explore_mastodon: "%{title}を探索"
+  disputes:
+    strikes:
+      action_taken: 取られた措置
+      appeal: 抗議
+      appeal_approved: このストライクは申し立てが承認され、有効ではありません。
+      appeal_rejected: 申し立ては拒否されました
+      appeal_submitted_at: 抗議が送信されました
+      appealed_msg: 申し立てが送信されました。承認されると通知されます。
+      appeals:
+        submit: 抗議を送信
+      approve_appeal: 抗議を承認
+      associated_report: 関連する通報
+      created_at: 日時
+      description_html: これらは、%{instance}のスタッフがあなたのアカウントに対して行った措置や、あなたに送られた警告です。
+      recipient: 送信元
+      reject_appeal: 抗議を却下
+      status: '投稿 #%{id}'
+      status_removed: 既に削除されています
+      title: "%{date}に%{action}"
+      title_actions:
+        delete_statuses: 投稿の削除
+        disable: アカウント凍結
+        mark_statuses_as_sensitive: 投稿を閲覧注意としてマーク
+        none: 警告
+        sensitive: アカウントを閲覧注意としてマーク
+        silence: アカウントの制限
+        suspend: アカウントの一時停止
+      your_appeal_approved: 申し立てが承認されました
+      your_appeal_pending: 申し立てを送信しました
+      your_appeal_rejected: 申し立ては拒否されました
   domain_validator:
     invalid_domain: は無効なドメイン名です
   errors:
@@ -852,7 +1074,7 @@ ja:
     noscript_html: Mastodonのウェブアプリケーションを利用する場合はJavaScriptを有効にしてください。またはあなたのプラットフォーム向けの<a href="%{apps_path}">Mastodonネイティブアプリ</a>を探すことができます。
   existing_username_validator:
     not_found: そのようなユーザー名はローカルに見つかりませんでした
-    not_found_multiple: "%{usernames} は見つかりませんでした"
+    not_found_multiple: "%{usernames}さんは見つかりませんでした"
   exports:
     archive_takeout:
       date: 日時
@@ -872,7 +1094,7 @@ ja:
     add_new: 追加
     errors:
       limit: 注目のハッシュタグの上限に達しました
-    hint_html: "<strong>注目のハッシュタグとは？</strong>プロフィールページに目立つ形で表示され、そのハッシュタグのついたあなたの公開投稿だけを抽出して閲覧できるようにします。クリエイティブな仕事や長期的なプロジェクトを追うのに優れた機能です。"
+    hint_html: "<strong>注目のハッシュタグとは？</strong>　プロフィールページに目立つ形で表示され、そのハッシュタグのついたあなたの公開投稿だけを抽出して閲覧できるようにします。クリエイティブな仕事や長期的なプロジェクトを追うのに優れた機能です。"
   filters:
     contexts:
       account: プロフィール
@@ -881,56 +1103,63 @@ ja:
       public: 公開タイムライン
       thread: 会話
     edit:
+      add_keyword: キーワードを追加
+      keywords: キーワード
+      statuses: 個別の投稿
+      statuses_hint_html: このフィルタは、以下のキーワードにマッチするかどうかに関わらず、個々の投稿を選択して適用されます。 <a href="%{path}">フィルターを確認または投稿を削除</a>。
       title: フィルターを編集
     errors:
+      deprecated_api_multiple_keywords: これらのパラメータは複数のフィルタキーワードに適用されるため、このアプリケーションから変更できません。 最新のアプリケーションまたはWebインターフェースを使用してください。
       invalid_context: 対象がないか無効です
-      invalid_irreversible: この機能はホームタイムラインまたは通知と一緒に指定する場合のみ機能します
     index:
+      contexts: "%{contexts}のフィルター"
       delete: 削除
       empty: フィルターはありません。
+      expires_in: "%{distance}で期限切れ"
+      expires_on: 有効期限 %{date}
+      keywords:
+        other: "%{count}件のキーワード"
+      statuses:
+        other: "%{count}件の投稿"
+      statuses_long:
+        other: "%{count}件の投稿を非表示にしました"
       title: フィルター
     new:
+      save: 新規フィルターを保存
       title: 新規フィルターを追加
+    statuses:
+      back_to_filter: フィルタに戻る
+      batch:
+        remove: フィルターから削除する
+      index:
+        hint: このフィルターは、他の条件に関係なく個々の投稿を選択する場合に適用されます。Webインターフェースからこのフィルターにさらに投稿を追加できます。
+        title: フィルターされた投稿
   footer:
-    developers: 開発者向け
-    more: さらに…
-    resources: リソース
     trending_now: トレンドタグ
   generic:
     all: すべて
+    all_items_on_page_selected_html:
+      other: このページの <strong>%{count}</strong> 件すべてが選択されています。
+    all_matching_items_selected_html:
+      other: 検索条件に一致する <strong>%{count}</strong> 件すべてが選択されています。
     changes_saved_msg: 正常に変更されました！
     copy: コピー
     delete: 削除
-    no_batch_actions_available: このページに一括操作はありません
+    deselect: 選択解除
+    none: なし
     order_by: 並び順
     save_changes: 変更を保存
+    select_all_matching_items:
+      other: 検索条件に一致する %{count} 件をすべて選択
+    today: 今日
     validation_errors:
-      other: エラーが発生しました！ 以下の%{count}個のエラーを確認してください
+      other: エラーが発生しました！ 以下の%{count}件のエラーを確認してください
   html_validator:
     invalid_markup: '無効なHTMLマークアップが含まれています: %{error}'
-  identity_proofs:
-    active: アクティブ
-    authorize: 許可する
-    authorize_connection_prompt: この暗号化接続を許可しますか？
-    errors:
-      failed: 暗号化接続に失敗しました。%{provider}からもう一度やり直してください。
-      keybase:
-        invalid_token: Keybaseトークンは16進数で66文字のハッシュである必要があります
-        verification_failed: KeybaseはこのトークンをKeybaseユーザー%{kb_username}の署名として認識しませんでした。Keybaseから再試行してください。
-      wrong_user: "%{current}としてログインしている間%{proving}の証明を作成することはできません。%{proving}としてログインし、もう一度やり直してください。"
-    explanation_html: ここではKeybaseのような他のサービスのアカウントと暗号化し関連づけることができます。これによりそれらのサービス上で他の人が暗号化されたメッセージを送信したり、あなたの送信した内容があなたからのものであると信用できるようになります。
-    i_am_html: 私は %{service} の %{username} です。
-    identity: 所属
-    inactive: 非アクティブ
-    publicize_checkbox: 'そしてこれをトゥートします:'
-    publicize_toot: '証明されました！私は %{service} の %{username} です: %{url}'
-    remove: アカウントから証明書を削除
-    removed: アカウントから証明書を削除することに成功しました
-    status: 認証状態
-    view_proof: 証明を表示
   imports:
     errors:
-      over_rows_processing_limit: "%{count} 行以上"
+      invalid_csv_file: '無効なCSVファイルです。エラー: %{error}'
+      over_rows_processing_limit: "%{count}行以上"
     modes:
       merge: 統合
       merge_long: 現在のレコードを保持したまま新しいものを追加します
@@ -945,17 +1174,16 @@ ja:
       following: フォロー中のアカウントリスト
       muting: ミュートしたアカウントリスト
     upload: アップロード
-  in_memoriam_html: 故人を偲んで。
   invites:
     delete: 無効化
     expired: 期限切れ
     expires_in:
-      '1800': 30 分
-      '21600': 6 時間
-      '3600': 1 時間
-      '43200': 12 時間
-      '604800': 1 週間
-      '86400': 1 日
+      '1800': 30分
+      '21600': 6時間
+      '3600': 1時間
+      '43200': 12時間
+      '604800': 1週間
+      '86400': 1日
     expires_in_prompt: 無期限
     generate: 招待リンクを作成
     invited_by: '次の人に招待されました:'
@@ -972,9 +1200,15 @@ ja:
       limit: リストの上限に達しました
   login_activities:
     authentication_methods:
+      otp: 二要素認証アプリ
       password: パスワード
-      sign_in_token: 電子メールセキュリティコード
+      sign_in_token: メールセキュリティコード
       webauthn: セキュリティキー
+    description_html: 認識できないアクティビティが表示された場合は、パスワードの変更と二要素認証の有効化を検討してください。
+    empty: 利用可能な認証履歴がありません
+    failed_sign_in_html: "%{ip} (%{browser}) から%{method}を利用したサインインに失敗しました。"
+    successful_sign_in_html: "%{ip} (%{browser}) から%{method}を利用したサインインに成功しました"
+    title: 認証履歴
   media_attachments:
     validations:
       images_and_video: 既に画像が追加されているため、動画を追加することはできません
@@ -994,13 +1228,13 @@ ja:
     followers_count: 引き継がれるフォロワー
     incoming_migrations: 別のアカウントから引っ越す
     incoming_migrations_html: 別のアカウントからこのアカウントに引っ越すには、まず<a href="%{path}">アカウントエイリアスを作成</a>する必要があります。
-    moved_msg: アカウントは %{acct} に引っ越し設定されており、フォロワーは引っ越し先に引き継がれています。
+    moved_msg: アカウントは%{acct}に引っ越し設定されており、フォロワーは引っ越し先に引き継がれています。
     not_redirecting: アカウントは現在引っ越し設定されていません。
-    on_cooldown: あなたは最近アカウントを引っ越しました。この機能は %{count} 日後に再度利用できるようになります。
+    on_cooldown: あなたは最近アカウントを引っ越しました。この機能は%{count}日後に再度利用できるようになります。
     past_migrations: 過去の引っ越し
     proceed_with_move: フォロワーを引き継ぐ
-    redirected_msg: あなたのアカウントは現在 %{acct} にリダイレクトされています。
-    redirecting_to: アカウントは %{acct} に引っ越し設定されています。
+    redirected_msg: あなたのアカウントは現在%{acct}にリダイレクトされています。
+    redirecting_to: アカウントは%{acct}に引っ越し設定されています。
     set_redirect: 引っ越しを設定
     warning:
       backreference_required: まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成する必要があります
@@ -1014,45 +1248,45 @@ ja:
   moderation:
     title: モデレーション
   move_handler:
-    carry_blocks_over_text: このユーザーは、あなたがブロックしていた %{acct} から引っ越しました。
-    carry_mutes_over_text: このユーザーは、あなたがミュートしていた %{acct} から引っ越しました。
-    copy_account_note_text: このユーザーは %{acct} から引っ越しました。これは以前のメモです。
+    carry_blocks_over_text: このユーザーは、あなたがブロックしていた%{acct}から引っ越しました。
+    carry_mutes_over_text: このユーザーは、あなたがミュートしていた%{acct}から引っ越しました。
+    copy_account_note_text: このユーザーは%{acct}から引っ越しました。これは以前のメモです。
+  navigation:
+    toggle_menu: メニューを表示 / 非表示
   notification_mailer:
-    digest:
-      action: 全ての通知を表示
-      body: '最後のログイン（%{since}）からの出来事:'
-      mention: "%{name} さんがあなたに返信しました:"
-      new_followers_summary:
-        other: また、離れている間に%{count} 人の新たなフォロワーを獲得しました！
-      subject:
-        other: "新しい%{count}件の通知 \U0001F418"
-      title: 不在の間に…
+    admin:
+      report:
+        subject: "%{name}さんがレポートを送信しました"
+      sign_up:
+        subject: "%{name}さんがサインアップしました"
     favourite:
-      body: "%{name} さんにお気に入り登録された、あなたの投稿があります:"
-      subject: "%{name} さんにお気に入りに登録されました"
+      body: "%{name}さんにお気に入り登録された、あなたの投稿があります:"
+      subject: "%{name}さんにお気に入りに登録されました"
       title: 新たなお気に入り登録
     follow:
-      body: "%{name} さんにフォローされています！"
-      subject: "%{name} さんにフォローされています"
+      body: "%{name}さんにフォローされています！"
+      subject: "%{name}さんにフォローされています"
       title: 新たなフォロワー
     follow_request:
       action: フォローリクエストの管理
-      body: "%{name} さんがあなたにフォローをリクエストしました"
-      subject: "%{name} さんからのフォローリクエスト"
+      body: "%{name}さんがあなたにフォローをリクエストしました"
+      subject: "%{name}さんからのフォローリクエスト"
       title: 新たなフォローリクエスト
     mention:
       action: 返信
-      body: "%{name} さんから返信がありました:"
-      subject: "%{name} さんに返信されました"
+      body: "%{name}さんから返信がありました:"
+      subject: "%{name}さんに返信されました"
       title: 新たな返信
     poll:
-      subject: "%{name}  さんの投票が終了しました"
+      subject: "%{name} さんの投票が終了しました"
     reblog:
-      body: "%{name} さんにブーストされた、あなたの投稿があります:"
-      subject: "%{name} さんにブーストされました"
+      body: "%{name}さんにブーストされた、あなたの投稿があります:"
+      subject: "%{name}さんにブーストされました"
       title: 新たなブースト
     status:
-      subject: "%{name} さんが投稿しました"
+      subject: "%{name}さんが投稿しました"
+    update:
+      subject: "%{name}さんが投稿を更新しました"
   notifications:
     email_events: メールによる通知
     email_events_hint: '受信する通知を選択:'
@@ -1096,6 +1330,8 @@ ja:
     other: その他
     posting_defaults: デフォルトの投稿設定
     public_timelines: 公開タイムライン
+  privacy_policy:
+    title: プライバシーポリシー
   reactions:
     errors:
       limit_reached: リアクションの種類が上限に達しました
@@ -1118,32 +1354,25 @@ ja:
     remove_selected_follows: 選択したユーザーをフォロー解除
     status: 状態
   remote_follow:
-    acct: あなたの ユーザー名@ドメイン を入力してください
     missing_resource: リダイレクト先が見つかりませんでした
-    no_account_html: アカウントをお持ちではないですか？<a href='%{sign_up_path}' target='_blank'>こちら</a>からサインアップできます
-    proceed: フォローする
-    prompt: 'フォローしようとしています:'
-    reason_html: "<strong>なぜこの手順が必要でしょうか？</strong><code>%{instance}</code>はあなたが登録されているサーバーではないかもしれないので、まずあなたのサーバーに転送する必要があります。"
-  remote_interaction:
-    favourite:
-      proceed: お気に入り登録する
-      prompt: 'お気に入り登録しようとしています:'
-    reblog:
-      proceed: ブーストする
-      prompt: 'ブーストしようとしています:'
-    reply:
-      proceed: 返信する
-      prompt: '返信しようとしています:'
+  reports:
+    errors:
+      invalid_rules: 有効なルールを参照していません
+  rss:
+    content_warning: '閲覧注意:'
+    descriptions:
+      account: "@%{acct}からの公開投稿"
+      tag: "#%{hashtag}が付けられた公開投稿"
   scheduled_statuses:
-    over_daily_limit: その日予約できる投稿数 %{limit} を超えています
-    over_total_limit: 予約できる投稿数 %{limit} を超えています
+    over_daily_limit: その日予約できる投稿数 %{limit}を超えています
+    over_total_limit: 予約できる投稿数 %{limit}を超えています
     too_soon: より先の時間を指定してください
   sessions:
     activity: 最後のアクティビティ
     browser: ブラウザ
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1157,16 +1386,16 @@ ja:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: 現在のセッション
-    description: "%{platform} 上の %{browser}"
+    description: "%{platform}上の%{browser}"
     explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1179,19 +1408,19 @@ ja:
     revoke: 削除
     revoke_success: セッションを削除しました
     title: セッション
+    view_authentication_history: アカウントの認証履歴を表示
   settings:
     account: アカウント
     account_settings: アカウント設定
     aliases: アカウントエイリアス
     appearance: 外観
     authorized_apps: 認証済みアプリ
-    back: Mastodon に戻る
+    back: Mastodonに戻る
     delete: アカウントの削除
     development: 開発
     edit_profile: プロフィールを編集
     export: データのエクスポート
     featured_tags: 注目のハッシュタグ
-    identity_proofs: Identity proofs
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
@@ -1200,40 +1429,42 @@ ja:
     profile: プロフィール
     relationships: フォロー・フォロワー
     statuses_cleanup: 投稿の自動削除
-    two_factor_authentication: 二段階認証
+    strikes: モデレーションストライク
+    two_factor_authentication: 二要素認証
     webauthn_authentication: セキュリティキー
   statuses:
     attached:
       audio:
-        other: "%{count} 本のオーディオ"
+        other: "%{count}本のオーディオ"
       description: '添付: %{attached}'
       image:
-        other: "%{count} 枚の画像"
+        other: "%{count}枚の画像"
       video:
-        other: "%{count} 本の動画"
-    boosted_from_html: "%{acct_link} からブースト"
+        other: "%{count}本の動画"
+    boosted_from_html: "%{acct_link}からブースト"
     content_warning: '閲覧注意: %{warning}'
+    default_language: UIの表示言語
     disallowed_hashtags:
       other: '許可されていないハッシュタグが含まれています: %{tags}'
+    edited_at_html: "%{date} 編集済み"
     errors:
       in_reply_not_found: あなたが返信しようとしている投稿は存在しないようです。
-    language_detection: 自動検出
     open_in_web: Webで開く
-    over_character_limit: 上限は %{max}文字までです
+    over_character_limit: 上限は%{max}文字です
     pin_errors:
+      direct: 返信したユーザーのみに表示される投稿はピン留めできません
       limit: 固定できる投稿数の上限に達しました
       ownership: 他人の投稿を固定することはできません
-      private: 非公開の投稿を固定することはできません
       reblog: ブーストを固定することはできません
     poll:
       total_people:
-        other: "%{count} 人"
+        other: "%{count}人"
       total_votes:
         other: "%{count}票"
       vote: 投票
     show_more: もっと見る
-    show_newer: 新しいものから表示
-    show_older: 古いものから表示
+    show_newer: 新しいものを表示
+    show_older: 古いものを表示
     show_thread: スレッドを表示
     sign_in_to_participate: ログインして会話に参加
     title: '%{name}: "%{quote}"'
@@ -1250,8 +1481,8 @@ ja:
     enabled_hint: 設定した期間を過ぎた投稿は、以下の例外に該当しない限り、自動的に削除されます
     exceptions: 例外
     explanation: 投稿の削除はサーバーに負荷がかかるため、サーバーが混み合っていないときに時間をかけて行われます。
-    ignore_favs: お気に入りされた数を無視
-    ignore_reblogs: ブーストされた数を無視
+    ignore_favs: 設定しない
+    ignore_reblogs: 設定しない
     interaction_exceptions: インタラクションに基づく例外
     interaction_exceptions_explanation: お気に入りやブーストの基準値を一度超えてしまった投稿は、基準値を下回った後であっても、削除される保証はありません。
     keep_direct: ダイレクトメッセージを保持
@@ -1268,106 +1499,27 @@ ja:
     keep_self_fav_hint: 自分自身でお気に入りに登録した投稿を削除せずに残します
     min_age:
       '1209600': 2週間
-      '15778476': 6ヶ月
+      '15778476': 半年
       '2629746': 1ヶ月
       '31556952': 1年
       '5259492': 2ヶ月
+      '604800': 1週間
       '63113904': 2年
       '7889238': 3ヶ月
     min_age_label: 投稿を保持する期間
-    min_favs: これ以上お気に入りに登録された投稿を無視する
-    min_favs_hint: この数以上、お気に入りに登録された投稿を削除しません。空白にしておくと、お気に入りに登録された数に関わらず投稿を削除します。
-    min_reblogs: これ以上ブーストされた投稿を無視する
-    min_reblogs_hint: この数以上、ブーストされた投稿を削除しません。空白にしておくと、ブーストされた数に関わらず投稿を削除します。
+    min_favs: お気に入りの基準値
+    min_favs_hint: この数以上、お気に入りされた投稿を削除せずに残します。空白にしておくと、お気に入りに登録された数に関わらず投稿を削除します。
+    min_reblogs: ブーストの基準値
+    min_reblogs_hint: この数以上、ブーストされた投稿を削除せずに残します。空白にしておくと、ブーストされた数に関わらず投稿を削除します。
   stream_entries:
     pinned: 固定された投稿
     reblogged: さんがブースト
     sensitive_content: 閲覧注意
+  strikes:
+    errors:
+      too_late: このストライクに抗議するには遅すぎます
   tags:
     does_not_match_previous_name: 以前の名前と一致しません
-  terms:
-    body_html: |
-      <h2>プライバシーポリシー</h2>
-      <h3 id="collect">どのような情報を収集しますか？</h3>
-
-      <ul>
-      <li><em>基本的なアカウント情報</em>: 当サイトに登録すると、ユーザー名・メールアドレス・パスワードの入力を求められることがあります。また表示名や自己紹介・プロフィール画像・ヘッダー画像といった追加のプロフィールを登録できます。ユーザー名・表示名・自己紹介・プロフィール画像・ヘッダー画像は常に公開されます。</li>
-      <li><em>投稿・フォロー・その他公開情報</em>: フォローしているユーザーの一覧は一般公開されます。フォロワーも同様です。メッセージを投稿する際、日時だけでなく投稿に使用したアプリケーション名も記録されます。メッセージには写真や動画といった添付メディアを含むことがあります。「公開」や「未収載」の投稿は一般公開されます。プロフィールに投稿を載せるとそれもまた公開情報となります。投稿はフォロワーに配信されます。場合によっては他のサーバーに配信され、そこにコピーが保存されることを意味します。投稿を削除した場合も同様にフォロワーに配信されます。他の投稿をリブログやお気に入り登録する行動は常に公開されます。</li>
-      <li><em>「ダイレクト」と「フォロワー限定」投稿</em>: すべての投稿はサーバーに保存され、処理されます。「フォロワー限定」投稿はフォロワーと投稿に書かれたユーザーに配信されます。「ダイレクト」投稿は投稿に書かれたユーザーにのみ配信されます。場合によっては他のサーバーに配信され、そこにコピーが保存されることを意味します。私たちはこれらの閲覧を一部の許可された者に限定するよう誠意を持って努めます。しかし他のサーバーにおいても同様に扱われるとは限りません。したがって、相手の所属するサーバーを吟味することが重要です。設定で新しいフォロワーの承認または拒否を手動で行うよう切り替えることもできます。<em>サーバー管理者は「ダイレクト」や「フォロワー限定」投稿も閲覧する可能性があることを忘れないでください。</em>また受信者がスクリーンショットやコピー、もしくは共有する可能性があることを忘れないでください。<em>いかなる危険な情報もMastodon上で共有しないでください。</em></li>
-      <li><em>IPアドレスやその他メタデータ</em>: ログインする際IPアドレスだけでなくブラウザーアプリケーション名を記録します。ログインしたセッションはすべてユーザー設定で見直し、取り消すことができます。使用されている最新のIPアドレスは最大12ヵ月間保存されます。またサーバーへのIPアドレスを含むすべてのリクエストのログを保持することがあります。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">情報を何に使用しますか？</h3>
-
-      <p>収集した情報は次の用途に使用されることがあります:</p>
-
-      <ul>
-      <li>Mastodonのコア機能の提供: ログインしている間にかぎり他の人たちと投稿を通じて交流することができます。例えば自分専用のホームタイムラインで投稿をまとめて読むために他の人たちをフォローできます。</li>
-      <li>コミュニティ維持の補助: 例えばIPアドレスを既知のものと比較し、BAN回避目的の複数登録者やその他違反者を判別します。</li>
-      <li>提供されたメールアドレスはお知らせの送信・投稿に対するリアクションやメッセージ送信の通知・お問い合わせやその他要求や質問への返信に使用されることがあります。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">情報をどのように保護しますか？</h3>
-
-      <p>私たちはあなたが入力・送信する際や自身の情報にアクセスする際に個人情報を安全に保つため、さまざまなセキュリティ上の対策を実施します。特にブラウザーセッションだけでなくアプリケーションとAPI間の通信もSSLによって保護されます。またパスワードは強力な不可逆アルゴリズムでハッシュ化されます。二段階認証を有効にし、アカウントへのアクセスをさらに安全にすることができます。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">データ保持方針はどうなっていますか？</h3>
-
-      <p>私たちは次のように誠意を持って努めます:</p>
-
-      <ul>
-      <li>当サイトへのIPアドレスを含むすべての要求に対するサーバーログを90日以内のできるかぎりの間保持します。</li>
-      <li>登録されたユーザーに関連付けられたIPアドレスを12ヵ月以内の間保持します。</li>
-      </ul>
-
-      <p>あなたは投稿・添付メディア・プロフィール画像・ヘッダー画像を含む自身のデータのアーカイブを要求し、ダウンロードすることができます。</p>
-
-      <p>あなたはいつでもアカウントの削除を要求できます。削除は取り消すことができません。</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">クッキーを使用していますか？</h3>
-
-      <p>はい。クッキーは (あなたが許可した場合に) WebサイトやサービスがWebブラウザーを介してコンピューターに保存する小さなファイルです。使用することでWebサイトがブラウザーを識別し、登録済みのアカウントがある場合関連付けます。</p>
-
-      <p>私たちはクッキーを将来の訪問のために設定を保存し呼び出す用途に使用します。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">なんらかの情報を外部に提供していますか？</h3>
-
-      <p>私たちは個人を特定できる情報を外部へ販売・取引・その他方法で渡すことはありません。これには当サイトの運営・業務遂行・サービス提供を行ううえで補助する信頼できる第三者をこの機密情報の保護に同意するかぎり含みません。法令の遵守やサイトポリシーの施行、権利・財産・安全の保護に適切と判断した場合、あなたの情報を公開することがあります。</p>
-
-      <p>あなたの公開情報はネットワーク上の他のサーバーにダウンロードされることがあります。相手が異なるサーバーに所属する場合、「公開」と「フォロワー限定」投稿はフォロワーの所属するサーバーに配信され、「ダイレクト」投稿は受信者の所属するサーバーに配信されます。</p>
-
-      <p>あなたがアカウントの使用をアプリケーションに許可すると、承認した権限の範囲内で公開プロフィール情報・フォローリスト・フォロワー・リスト・すべての投稿・お気に入り登録にアクセスできます。アプリケーションはメールアドレスやパスワードに決してアクセスできません。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">児童によるサイト利用について</h3>
-
-      <p>サーバーがEUまたはEEA圏内にある場合: 当サイト・製品・サービスは16歳以上の人を対象としています。あなたが16歳未満の場合、GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a> - EU一般データ保護規則) により当サイトを使用できません。</p>
-
-      <p>サーバーが米国にある場合: 当サイト・製品・サービスは13歳以上の人を対象としています。あなたが13歳未満の場合、COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a> - 児童オンラインプライバシー保護法) により当サイトを使用できません。</p>
-
-      <p>サーバーが別の管轄区域にある場合、法的要件は異なることがあります。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">プライバシーポリシーの変更</h3>
-
-      <p>プライバシーポリシーの変更を決定した場合、このページに変更点を掲載します。</p>
-
-      <p>この文章のライセンスはCC-BY-SAです。最終更新日は2018年3月7日です。</p>
-
-      <p>オリジナルの出典: <a href="https://github.com/discourse/discourse">Discourse privacy policy</a></p>
-    title: "%{instance} 利用規約・プライバシーポリシー"
   themes:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
@@ -1376,13 +1528,14 @@ ja:
     formats:
       default: "%Y年%m月%d日 %H:%M"
       month: "%Y年 %b"
+      time: "%H:%M"
   two_factor_authentication:
     add: 追加
     disable: 無効化
-    disabled_success: 二段階認証が無効になりました
+    disabled_success: 二要素認証が無効になりました
     edit: 編集
-    enabled: 二段階認証は有効になっています
-    enabled_success: 二段階認証が有効になりました
+    enabled: 二要素認証は有効になっています
+    enabled_success: 二要素認証が有効になりました
     generate_recovery_codes: リカバリーコードを生成
     lost_recovery_codes: リカバリーコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリーコードは無効になります。
     methods: 方式
@@ -1392,63 +1545,75 @@ ja:
     recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。<strong>リカバリーコードは大切に保全してください。</strong>たとえば印刷してほかの重要な書類と一緒に保管することができます。
     webauthn: セキュリティキー
   user_mailer:
+    appeal_approved:
+      action: アカウントへ
+      explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては承認されました。アカウントは正常な状態に戻りました。"
+      subject: "%{date}の申し立てが承認されました"
+      title: 申し立てが承認されました。
+    appeal_rejected:
+      explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては却下されました。"
+      subject: "%{date}の申し立てが拒否されました"
+      title: 却下された抗議
     backup_ready:
       explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます！
       subject: アーカイブの準備ができました
       title: アーカイブの取り出し
-    sign_in_token:
-      details: '検出したログインの詳細は以下のとおりです:'
-      explanation: '認識できないIPアドレスから、あなたのアカウントへのログインを検出しました。あなたがログインしようとしている場合は、ログインページに以下のセキュリティコードを入力してください:'
-      further_actions: '心当たりがない場合、パスワードを変更し二段階認証を有効にしてください。こちらから設定できます:'
-      subject: ログイン試行を確認してください
-      title: ログインを検出しました
+    suspicious_sign_in:
+      change_password: パスワードを変更
+      details: 'ログインの詳細は以下のとおりです:'
+      explanation: 新しいIPアドレスからあなたのアカウントへのサインインが検出されました。
+      further_actions_html: あなたがログインしていない場合は、すぐに%{action}し、アカウントを安全に保つために二要素認証を有効にすることをお勧めします。
+      subject: 新しいIPアドレスからのアクセスがありました
+      title: 新しいサインイン
     warning:
+      appeal: 抗議を送信
+      appeal_description: これが間違いだと思われる場合は、%{instance}のスタッフに申し立てすることができます。
+      categories:
+        spam: スパム
+        violation: コンテンツは以下のコミュニティガイドラインに違反しています
       explanation:
-        disable: あなたのアカウントはログインが禁止され使用できなくなりました。しかしアカウントのデータはそのまま残っています。
-        sensitive: あなたのアップロードしたメディアファイルとリンク先のメディアは、閲覧注意として扱われます。
-        silence: あなたのアカウントは制限されましたがそのまま使用できます。ただし既にフォローしている人はあなたの投稿を見ることができますが、様々な公開タイムラインには表示されない場合があります。また他のユーザーは今後も手動であなたをフォローすることができます。
-        suspend: あなたのアカウントは使用できなくなりプロフィールやその他データにアクセスできなくなりました。アカウントが完全に削除されるまではログインしてデータのエクスポートをリクエストできます。証拠隠滅を防ぐため一部のデータは削除されず残ります。
-      get_in_touch: このメールに返信することで %{instance} のスタッフと連絡を取ることができます。
-      review_server_policies: サーバーのポリシーを確認
-      statuses: '特に次の投稿:'
+        delete_statuses: あなたの投稿のいくつかは、1つ以上のコミュニティガイドラインに違反していることが判明し、%{instance}のモデレータによって削除されました。
+        disable: アカウントは使用できませんが、プロフィールやその他のデータはそのまま残ります。 データのバックアップをリクエストしたり、アカウント設定を変更したり、アカウントを削除したりできます。
+        mark_statuses_as_sensitive: あなたのいくつかの投稿は、%{instance}のモデレータによって閲覧注意としてマークされています。これは、プレビューが表示される前にユーザが投稿内のメディアをタップする必要があることを意味します。あなたは将来投稿する際に自分自身でメディアを閲覧注意としてマークすることができます。
+        sensitive: 今後、アップロードされたすべてのメディアファイルは閲覧注意としてマークされ、クリック解除式の警告で覆われるようになります。
+        silence: アカウントが制限されています。このサーバーでは既にフォローしている人だけがあなたの投稿を見ることができます。 様々な発見機能から除外されるかもしれません。他の人があなたを手動でフォローすることは可能です。
+        suspend: アカウントは使用できなくなり、プロフィールなどのデータにもアクセスできなくなります。約30日後にデータが完全に削除されるまでは、ログインしてデータのバックアップを要求することができますが、アカウントの停止回避を防ぐために一部の基本データを保持します。
+      reason: '理由:'
+      statuses: '投稿:'
       subject:
-        disable: あなたのアカウント %{acct} は凍結されました
-        none: "%{acct} に対する警告"
-        sensitive: あなたのアカウント %{acct} の投稿メディアは閲覧注意とマークされました
-        silence: あなたのアカウント %{acct} はサイレンスにされました
-        suspend: あなたのアカウント %{acct} は停止されました
+        delete_statuses: "%{acct}さんの投稿が削除されました"
+        disable: あなたのアカウント %{acct}は凍結されました
+        mark_statuses_as_sensitive: あなたの%{acct}の投稿は閲覧注意としてマークされました
+        none: "%{acct}に対する警告"
+        sensitive: あなたの%{acct}の投稿はこれから閲覧注意としてマークされます
+        silence: あなたのアカウント %{acct}はサイレンスにされました
+        suspend: あなたのアカウント %{acct}は停止されました
       title:
+        delete_statuses: 投稿が削除されました
         disable: アカウントが凍結されました
+        mark_statuses_as_sensitive: 閲覧注意としてマークされた投稿
         none: 警告
-        sensitive: あなたのメディアが閲覧注意とマークされました
+        sensitive: 閲覧注意としてマークされたアカウント
         silence: アカウントがサイレンスにされました
         suspend: アカウントが停止されました
     welcome:
       edit_profile_action: プロフィールを設定
-      edit_profile_step: アイコンやヘッダーの画像をアップロードしたり、表示名を変更したりして、自分のプロフィールをカスタマイズすることができます。また、誰かからの新規フォローを許可する前にその人の様子を見ておきたい場合、アカウントを承認制にすることもできます。
+      edit_profile_step: |-
+        プロフィール画像をアップロードしたり、表示名を変更したりして、プロフィールをカスタマイズできます。
+        新しいフォロワーからフォローリクエストを承認する前に、オプトインで確認できます。
       explanation: 始めるにあたってのアドバイスです
       final_action: 始めましょう
       final_step: 'さあ、始めましょう！ たとえフォロワーがまだいなくても、あなたの公開した投稿はローカルタイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #introductions ハッシュタグが便利かもしれません。'
       full_handle: あなたの正式なユーザーID
       full_handle_hint: 別のサーバーの友達とフォローやメッセージをやり取りする際には、これを伝えることになります。
-      review_preferences_action: 設定の変更
-      review_preferences_step: 受け取りたいメールの種類や投稿のデフォルト公開範囲など、ユーザー設定を必ず済ませておきましょう。目が回らない自信があるなら、アニメーション GIF を自動再生する設定もご検討ください。
-      subject: Mastodon へようこそ
-      tip_federated_timeline: 連合タイムラインは Mastodon ネットワークの流れを見られるものです。ただしあなたと同じサーバーの人がフォローしている人だけが含まれるので、それが全てではありません。
-      tip_following: 最初は、サーバーの管理者をフォローした状態になっています。もっと興味のある人たちを見つけるには、ローカルタイムラインと連合タイムラインを確認してみましょう。
-      tip_local_timeline: ローカルタイムラインは %{instance} にいる人々の流れを見られるものです。彼らはあなたと同じサーバーにいる隣人のようなものです！
-      tip_mobile_webapp: お使いのモバイル端末で、ブラウザから Mastodon をホーム画面に追加できますか？ もし追加できる場合、プッシュ通知の受け取りなど、まるで「普通の」アプリのような機能が楽しめます！
-      tips: 豆知識
-      title: ようこそ、%{name}！
+      subject: Mastodonへようこそ
+      title: ようこそ、%{name}さん！
   users:
-    follow_limit_reached: あなたは現在 %{limit} 人以上フォローできません
-    generic_access_help_html: アクセスできませんか？ %{email} に問い合わせることができます。
-    invalid_otp_token: 二段階認証コードが間違っています
-    invalid_sign_in_token: 無効なセキュリティコードです
-    otp_lost_help_html: どちらも使用できない場合、%{email} に連絡を取ると解決できるかもしれません
+    follow_limit_reached: あなたは現在 %{limit}人以上フォローできません
+    invalid_otp_token: 二要素認証コードが間違っています
+    otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
     seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
     signed_in_as: '下記でログイン中:'
-    suspicious_sign_in_confirmation: おかえりなさい。このデバイスからのアクセスは初めてなので、セキュリティ確保のためにメールでセキュリティーコードを送信しました。
   verification:
     explanation_html: <strong>プロフィール内のリンクの所有者であることを認証することができます</strong>。そのためにはリンクされたウェブサイトにMastodonプロフィールへのリンクが含まれている必要があります。リンクには<code>rel="me"</code>属性を<strong>必ず</strong>与えなければなりません。リンクのテキストについては重要ではありません。以下は例です：
     verification: 認証
@@ -1467,5 +1632,5 @@ ja:
     nickname_hint: セキュリティキーの名前を入力してください
     not_enabled: まだセキュリティキーを有効にしていません
     not_supported: このブラウザはセキュリティキーに対応していないようです
-    otp_required: セキュリティキーを使用するには、まず二段階認証を有効にしてください。
-    registered_on: "%{date} に登録"
+    otp_required: セキュリティキーを使用するには、まず二要素認証を有効にしてください。
+    registered_on: "%{date}に登録"
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 02f0986f4..41a51a8b0 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1,55 +1,26 @@
 ---
 ka:
   about:
-    about_hashtag_html: ეს საჯარო ტუტებია, რომლებიც ატარებენ <strong>#%{hashtag}</strong> ტეგს. მათთან ინტერაქციას შეძლებთ, თუ ფედივერსში გაქვთ რაიმე ანგარიში.
     about_mastodon_html: მასტოდონი ღია ვებ პროტოკოლებზე და უფასო, ღია პროგრამებზე დაფუძნებული სოციალური ქსელია. ის ისეთი დეცენტრალიზებულია როგორც ელ-ფოსტა.
-    about_this: შესახებ
-    administered_by: 'ადმინისტრატორი:'
-    api: აპი
-    apps: მობილური აპლიკაციები
-    contact: კონტაქტი
     contact_missing: არაა დაყენებული
     contact_unavailable: მიუწ.
-    documentation: დოკუმენტაცია
     hosted_on: მასტოდონს მასპინძლობს %{domain}
-    learn_more: გაიგე მეტი
-    privacy_policy: კონფიდენციალურობის პოლიტიკა
-    source_code: კოდი
-    status_count_before: ვინც უავტორა
-    terms: მომსახურების პირობები
-    user_count_before: სახლი
-    what_is_mastodon: რა არის მასტოდონი?
   accounts:
-    choices_html: "%{name}-ის არჩევნები:"
     follow: გაყევი
     following: მიჰყვება
-    joined: გაწევრიანდა %{date}
-    media: მედია
-    moved_html: "%{name} გადავიდა %{new_profile_link}:"
-    network_hidden: ეს ინფორმაცია ხელმიუწვდომელია
     nothing_here: აქ არაფერია!
-    people_followed_by: ხალხი ვისაც %{name} მიჰყვება
-    people_who_follow: ხალხი ვინც მიჰყვება %{name}-ს
     pin_errors:
       following: იმ ადამიანს, ვინც მოგწონთ, უკვე უნდა მიჰყვებოდეთ
-    posts_with_replies: ტუტები და პასუხები
-    roles:
-      admin: ადმინისტრატორი
-      bot: ბოტი
-      moderator: მოდერატორი
-    unfollow: ნუღარ მიჰყვები
   admin:
     account_moderation_notes:
       create: დატოვეთ ჩანაწერი
       created_msg: მოდერაციის ჩანაწერი წარმატებით შეიქმნა!
-      delete: გაუქმება
       destroyed_msg: მოდერაციის ჩანაწერი წარმატებით გაუქმდა!
     accounts:
       are_you_sure: დარწმუნებული ხარ?
       avatar: ავატარი
       by_domain: დომენი
       change_email:
-        changed_msg: ანგარიშის ელ-ფოსტა წარმატებით შეიცვალა!
         current_email: მიმდინარე ელ-ფოსტა
         label: ელ-ფოსტის შეცვლა
         new_email: ახალი ელ-ფოსტა
@@ -83,7 +54,6 @@ ka:
       memorialize: აქციე მემორანდუმად
       moderation:
         all: ყველა
-        silenced: გაჩუმებული
         suspended: შეჩერებული
         title: მოდერაცია
       moderation_notes: მოდერაციის ჩანაწერები
@@ -104,12 +74,6 @@ ka:
       reset: გადატვირთვა
       reset_password: პაროლის გადატვირთვა
       resubscribe: ხელახალი გამოწერა
-      role: უფლებები
-      roles:
-        admin: ადმინისტრატორი
-        moderator: მოდერატორი
-        staff: სტაფი
-        user: მომხმარებელი
       search: ძებნა
       shared_inbox_url: გაზიარებული ინბოქსის ურლ
       show:
@@ -126,7 +90,6 @@ ka:
       username: მომხმარებლის სახელი
       web: ვები
     action_logs:
-      deleted_status: "(გაუქმებული სტატუსი)"
       title: აუდიტის ლოგი
     custom_emojis:
       by_domain: დომენი
@@ -141,7 +104,6 @@ ka:
       emoji: ემოჯი
       enable: ჩართვა
       enabled_msg: წარმატებით ჩაირთო ეს ემოჯი
-      image_hint: PNG 50კბმდე
       listed: ჩამოთვლილი
       new:
         title: ახალი პერსონალიზირებული ემოჯის დამატება
@@ -166,28 +128,16 @@ ka:
         create: ბლოკის შექმნა
         hint: დომენის ბლოკი არ შეაჩერებს ანგარიშების ჩაწერას მონაცემთა ბაზაში, მაგრამ ეს ამ ანგარიშებზე რეტროაქტიულად და ავტომატურად გაატარებს სპეციფიურ მოდერაციის მეთოდებს.
         severity:
-          desc_html: "<strong>გაჩუმება</strong> გახდის ანგარიშის პოსტებს უჩინარს ყველასთვის, ვინც მას არ მიჰყვება. <strong>შეჩერება</strong> გააუქმებს ანგარიშის მთელ კონტენტს, მედიას და პროფილის მონაცემს. გამოიყენეთ <strong>არც ერთი</strong> თუ გსურთ უბრალოდ უარყოთ ფაილები."
           noop: არც ერთი
-          silence: გაჩუმება
           suspend: შეჩერება
         title: ახალი დომენის ბლოკი
       reject_media: მედია ფაილების უარყოფა
       reject_media_hint: შლის ლოკალურად შენახულ მედია ფაილებს და უარყოფს სამომავლო გადმოტვირთებს. შეუსაბამო შეჩერებებისთვის
-      show:
-        affected_accounts:
-          one: გავლენა იქონია მონაცემთა ბაზაში ერთ ანგარიშზე
-          other: გავლენა იქონიო მონაცემთა ბაზაში %{count} ანგარიშზე
-        retroactive:
-          silence: ამ დომენში ყველა არსებულ ანგარიშზე გაჩუმების მოშორება
-          suspend: ამ დომენში ყველა არსებულ ანგარიშზე შეჩერების მოშორება
-        title: უკუაქციეთ დომენის ბლოკი %{domain} დომენზე
-        undo: უკუქცევა
       undo: უკუქცევა
     email_domain_blocks:
       add_new: ახლის დამატება
       created_msg: ელ-ფოსტის დომენი წარმატებით დაემატა შავ სიას
       delete: გაუქმება
-      destroyed_msg: ელ-ფოსტის დომენი წარმატებით ამოიშალა შავი სიიდან
       domain: დომენი
       new:
         create: დომენის დამატება
@@ -241,71 +191,10 @@ ka:
       unassign: გადაყენება
       unresolved: გადაუწყვეტელი
       updated_at: განახების დრო
-    settings:
-      activity_api_enabled:
-        desc_html: ლოკალურად გამოქვეყნებული სტატუსების, აქტიური მომხმარებლების და ყოველკვირეული რეგისტრაციების მთვლელი
-        title: გამოაქვეყნე აგრეგატი სტატისტიკები მომხმარებლის აქტივობაზე
-      bootstrap_timeline_accounts:
-        desc_html: გამოჰყავი მომხმარებლები მძიმით. იმუშავებს მხოლოდ ლოკალური და "ბლოკ-მოხსნილ" ანგარიშები. საწყისი როდესაც ცარიელია ყველა ლოკალური ადმინი.
-        title: საწყისი მიდევნებები ახლა მომხმარებლებზე
-      contact_information:
-        email: ბიზნეს ელ-ფოსტა
-        username: საკონტაქტო მომხმარებლის სახელი
-      hero:
-        desc_html: წინა გვერდზე გამოჩენილი. მინ. 600/100პიქს. რეკომენდირებული. როდესაც არაა დაყენებული, ჩნდება ინსტანციის პიქტოგრამა
-        title: გმირი სურათი
-      peers_api_enabled:
-        desc_html: დომენების სახელები რომლებსაც შეხვდა ეს ინსტანცია ფედივერსში
-        title: გამოაქვეყნე აღმოჩენილი ინსტანციების სია
-      preview_sensitive_media:
-        desc_html: ბმულის პრევიუები სხვა ვებ-საიტებზე გამოაჩენენ პიქტოგრამას, მაშინაც კი თუ მედია მონიშნულია მგრძნობიარედ
-        title: გამოაჩინე მგრძნობიარე მედია ოუფენ-გრეფ პრევიუებში
-      registrations:
-        closed_message:
-          desc_html: გამოჩნდება წინა გვერდზე, როდესაც რეგისტრაციები დახურულია. შეგიძლიათ გამოიყენოთ ჰტმლ ტეგები
-          title: დახურული რეგისტრაციის წერილი
-        deletion:
-          desc_html: უფლება მიეცით ყველას, გააუქმონ თავიანთი ანგარიში
-          title: ღია ანგარიშის გაუქმება
-        min_invite_role:
-          disabled: არავინ
-          title: ნება დაერთოს მოწვეევებს
-      show_known_fediverse_at_about_page:
-        desc_html: ჩართვისას, ეს გამოაჩენს ტუტებს ყველა ცნობილი ფედივერსისგან პრევიუზე. სხვა შემთხვევაში, გამოაჩენს მხოლოდ ლოკალურ ტუტებს.
-        title: გამოჩნდეს ცნობილი ვედივერსი თაიმლაინ პრევიუში
-      show_staff_badge:
-        desc_html: გამოჩნდეს სტაფის ნიშანი მომხმარებლის გვერდზე
-        title: სტაფის ნიშნის გამოჩენა
-      site_description:
-        desc_html: საშესავლო პარაგრაფი წინა გვერდზე. აღწერეთ თუ რა ხდის ამ მასტოდონის სერვერს განსაკუთრებულს და სხვა მნიშვნელოვანი. შეგიძლიათ გამოიყენოთ ჰტმლ ტეგები, კერძოდ <code>&lt;a&gt;</code> და <code>&lt;em&gt;</code>.
-        title: ინსტანციის აღწერილობა
-      site_description_extended:
-        desc_html: კარგი ადგილი მოქცევის კოდექსისთვის, წესები, სახელმძღვანელოები და სხვა რაც გამოარჩევს თქვენს ინსტანციას. შეგიძლიათ გამოიყენოთ ჰტმლ ტეგები
-        title: პერსონალიზირებული განვრცობილი ინფორმაცია
-      site_short_description:
-        desc_html: გამოჩნდება გვერდით ბარში და მეტა ტეგებში. აღწერეთ თუ რა არის მასტოდონი და რა ხდის ამ სერვერს უნიკალურს ერთ პარაგრაფში. თუ ცარიელია, გამოჩნდება ინსტანციის აღწერილობა.
-        title: აჩვენეთ ინსტანციის აღწერილობა
-      site_terms:
-        desc_html: შეგიძლიათ დაწეროთ საკუთარი კონფიდენციალურობის პოლიტიკა, მომსახურების პირობები ან სხვა იურიდიული დოკუმენტი. შეგიძლიათ გამოიყენოთ ჰტმლ ტეგები
-        title: პერსონალიზირებული მომსახურების პირობები
-      site_title: ინსტანციის სახელი
-      thumbnail:
-        desc_html: გამოიყენება პრევიუებისთვის ოუფენ-გრეფში და აპი-ში. 1200/630პიქს. რეკომენდირებული
-        title: ინსტანციის პიქტოგრამა
-      timeline_preview:
-        desc_html: აჩვენეთ საჯარო თაიმლაინი ლენდინგ გვერდზე
-        title: თაიმლაინ პრევიუ
-      title: საიტის პარამეტრები
     statuses:
       back_to_account: უკან ანგარიშის გვერდისკენ
-      batch:
-        delete: გაუქმება
-        nsfw_off: მონიშნე არა-მგრძნობიარედ
-        nsfw_on: მონიშნე მგრძნობიარედ
-      failed_to_execute: ვერ გაეშვა
       media:
         title: მედია
-      no_media: არაა მედია
       no_status_selected: სატუსები არ შეცვლილა, რადგან არცერთი არ მონიშნულა
       title: ანგარიშის სტატუსები
       with_media: მედიით
@@ -324,7 +213,6 @@ ka:
   applications:
     created: აპლიკაცია წარმატებით შეიქმნა
     destroyed: აპლიკაცია წარმატებით გაუქმდა
-    invalid_url: მოწოდებული ურლ არასწორია
     regenerate_token: წვდომის ტოკენის რეგენერაცია
     token_regenerated: წვდომის ტოკენის რეგენერაცია მოხერხდა
     warning: იყავით ძალიან ფრთხილად ამ მონაცემთან. არასდროს გააზიაროთ ეს!
@@ -415,16 +303,11 @@ ka:
       title: ფილტრის ცვლილება
     errors:
       invalid_context: მოწოდებულია არასწორი ან ცარიელი კონტექსტი
-      invalid_irreversible: დაუბრუნებელი ფილტრაცია მუშაობს მხოლოდ სახლის ან ნოტიფიკაციის კონტექსტში
     index:
       delete: გაუქმება
       title: ფილტრები
     new:
       title: ახალი ფილტრის დამატება
-  footer:
-    developers: დეველოპერები
-    more: მეტი…
-    resources: რესურსები
   generic:
     changes_saved_msg: ცვლილებები წარმატებით დამახსოვრდა!
     save_changes: ცვლილებების შენახვა
@@ -439,7 +322,6 @@ ka:
       following: დადევნების სია
       muting: გაჩუმების სია
     upload: ატვირთვა
-  in_memoriam_html: მემორანდუმში.
   invites:
     delete: დეაქტივაცია
     expired: ვადა გაუვიდა
@@ -474,17 +356,6 @@ ka:
   moderation:
     title: მოდერაცია
   notification_mailer:
-    digest:
-      action: ყველა შეტყობინების ჩვენება
-      body: 'აქ მოკლე შინაარსია წერილების, რომლებიც გამოგეპარათ წინა სტუმრობის შემდეგ: %{since}'
-      mention: "%{name}-მა დაგასახელათ:"
-      new_followers_summary:
-        one: ასევე, არყოფნისას შეგეძინათ ერთი ახალი მიმდევარი! იეი!
-        other: ასევე, არყოფნისას შეგეძინათ %{count} ახალი მიმდევარი! შესანიშნავია!
-      subject:
-        one: "1 ახალი შეტყობინება თქვენი ბოლო სტუმრობის შემდეგ \U0001F418"
-        other: "%{count} ახალი შეტყობინება თქვენი ბოლო სტუმრობის შემდეგ \U0001F418"
-      title: თქვენს არყოფნაში...
     favourite:
       body: 'თქვენი სტატუსი ფავორიტი გახადა %{name}-მა:'
       subject: "%{name}-მა თქვენი სტატუსი გახადა ფავორიტი"
@@ -524,17 +395,12 @@ ka:
   preferences:
     other: სხვა
   remote_follow:
-    acct: შეიყვანეთ თქვენი username@domain საიდანაც გსურთ გაჰყვეთ
     missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა
-    no_account_html: არ გაქვთ ანგარიში? შეგიძლიათ <a href='%{sign_up_path}' target='_blank'>დარეგისტრირდეთ აქ</a>
-    proceed: გააგრძელეთ გასაყოლად
-    prompt: 'თქვენ გაჰყვებით:'
   sessions:
     activity: ბოლო აქტივობა
     browser: ბრაუზერი
     browsers:
       alipay: ალიფეი
-      blackberry: ბლექბერი
       chrome: ქრომი
       edge: მაიკროსოფთ ედჯი
       electron: ელექტრონი
@@ -548,7 +414,6 @@ ka:
       phantom_js: ფანტომჯეიესი
       qq: ქქ ბრაუზერი
       safari: საფარი
-      uc_browser: იუსიბიბრაუზერი
       weibo: ვეიბო
     current_session: მიმდინარე სესია
     description: "%{browser} %{platform}-ზე"
@@ -557,8 +422,6 @@ ka:
     platforms:
       adobe_air: ედობ ეარი
       android: ანდროიდი
-      blackberry: ბლექბერი
-      chrome_os: ქრომო-ოსი
       firefox_os: ფაირფოქს-ოსი
       ios: აი-ოსი
       linux: ლინუქსი
@@ -596,13 +459,11 @@ ka:
     disallowed_hashtags:
       one: 'მოიცავდა აკრძალულ ჰეშტეგს: %{tags}'
       other: 'მოიცავს აკრძალულ ჰეშტეგს: %{tags}'
-    language_detection: ავტომატურად დადგინდეს ენა
     open_in_web: ვებში გახნსა
     over_character_limit: ნიშნების ლიმიტი გადასცდა %{max}-ს
     pin_errors:
       limit: ტუტების მაქსიმალური რაოდენობა უკვე აპინეთ
       ownership: სხვისი ტუტი ვერ აიპინება
-      private: არა-საჯარო ტუტი ვერ აიპინება
       reblog: ბუსტი ვერ აიპინება
     show_more: მეტის ჩვენება
     sign_in_to_participate: საუბარში მონაწილეობისთვის გაიარეთ ავტორიზაცია
@@ -617,89 +478,6 @@ ka:
     pinned: აპინული ტუტი
     reblogged: გაზრდილი
     sensitive_content: მგრძნობიარე კონტენტი
-  terms:
-    body_html: |
-      <h2>კონფიდენციალურობის პოლიტიკა</h2>
-      <h3 id="collect">რა ინფორმაციას ვაგროვებთ?</h3>
-
-      <ul>
-      <li><em>ძირითადი ანგარიშის ინფორმაცია</em>: თუ დარეგისტრირდებით ამ სერვერზე, შესაძლოა მოგთხოვოთ მომხმარებლის სახელი, ელ-ფოსტის მისამართი და პაროლი. შესაძლებელია, ასევე შეიყვანოთ დამატებითი პროფილის ინორმაცია, როგორიცაა დისპლეის სახელი და ბიოგრაფია, ასევე ატვირთოთ პროფილის და დასათაურების სურათი. მომხმარებლის სახელი, დისპლეის სახელი, ბიოგრაფია, პროფილის სურათი, დასათაურების სურათი ყოველთვის ღიადაა ჩამოთვლილი.</li>
-      <li><em>პოსტები, დადევნებები და სხვა საჯარო ინფორმაცია</em>: ადამიანების სია, რომლებსაც მიჰყვებით საჯაროდაა ჩამოთვლილი, იგივე ეხება თქვენს მიდევრებსაც. როდესაც აგზავნით წერილს, თარიღი, დრო და აპლიკაცია თუ საიდანაც განათავსეთ წერილი ინახება. წერილები შესაძლოა შეიცავდნენ მედია ფაილებს, როგორებიცაა სურათები და ვიდეოები. ღია და ჩამოუთვლელი პოსტები ხელმისაწვდომია საჯაროდ. როდესაც ათავსებთ პოსტს თქვენს პროფილზე, ის ასევე საჟაროდ წვდომადი ხდება. თქვენი პოსტები ეგზავნებათ თქვენს მიმდევრებს, ზოგიერთ შემთხვევაში ეს ნიშნავს, რომ ისინი იგზავნება სხვა სერვერებზე და მათი ასლები იქვე ინახება. როდესაც აუქმებთ პოსტს, ეს მოქმედება ეგზავნებათ თქვენს მიმდევრებს. რე-ბლოგირების ან ფავორიტად ქცევის ქმედებები ასევე საქვეყნოა.</li>
-      <li><em>პირდაპირი და პოსტები მხოლოდ-მიმდევრებისთვის</em>: ყველა პოსტი ინახება და მათი პროცესირება ხდება სერვერზე. პოსტები რომლებიც განეკუთვნება მხოლოდ მიმდევრებს მიეწოდებათ მათ, მომხმარებლები, რომლებიც დასახელებულია პოსტებში და პირდაპირი პოსტები ეგზავნებათ მხოლოდ ჩამოთვლილ მომხმარებლებს. ზოგიერთ შემთხვევაში, ეს ნიშნავს, რომ გადაგზავნა ხდება გარე სერვერებზე და ასლებიც იქ ინახება. ჩვენ დიდ ძალისხმევას ვუწევთ წვდომის ლიმიტს მხოლოდ აუტორიზირებული ადამიანებისთვის, თუმცა სხვა სერვერებმა შეიძლება ეს არ აწარმოონ. აქედან გამომდინარე, მნიშვნელოვანია განიხილოთ სერვერები, საიდანაც მოდიან თქვენი მიმდევრები. შეგიძლიათ ჩართოთ ან გამორთოთ პარამეტრი, დაადასტუროთ ან უარყოთ ახალი მიმდევარი. <em>გთხოვთ გაითვალისწინოთ, რომ სერვერის ოპერაციები და სხვა მიმღები სერვერები შესაძლოა კითხულობდნენ ამგვარ წერილებს</em>, მიმღებებს შეუძლიათ შექმნან სქრინშოთი, დააკოპირონ ან ხელახლა გააზიარონ ისინი. <em>არ გააზიაროთ საშიში ინფორმაცია მასტოდონით.</em></li>
-      <li><em>აი-პიები და სხვა მეტა-მონაცემები</em>: როდესაც გაივლით აუტენტიფიკაციას, ჩვენ ვინახავთ აი-პი მისამართს საიდანაც შემოხვედით, ასევე ბრაუზერის აპლიკაციას. ყველა ავტორიზირებული სესია თქვენთვის განსახილველად და გასაუქმებლად ხელმისაწვდომია პარამეტრებში. ბოლო შენახული აი-პი მისამართი ინახება მაქსიმუმ 12 თვით. ჩვენ ასევე შეიძლება გაგვაჩნდეს სერვერის ლოგი, რომელიც ინახავს თითოეული მოთხოვნის IP მისამართს.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">რაში ვიყენებთ ინფორმაციას?</h3>
-
-      <p>ნებისმიერი სხვა ინფორმაცია, რომელსაც ვაგროვებთ თქვენგან შესაძლოა გამოყენებულ იქნას შემდეგი გზებით:</p>
-
-      <ul>
-      <li>რომ უზრუნველვყოთ მასტოდონის მთავარი ფუნქციონალი. შეგიძლიათ ინტერაქცია გაუწიოთ მხოლოდ სხვის კონტენტს და შექმნათ პოსტები მაშინ როდესაც ავტორიზებული ხართ. მაგალითად, შესაძლოა გაჰყვეთ სხვა ადამიანებს, რათა იხილოთ მათი ჯამური პოსტები საკუთარ პერსონალიზებულ სახლის თაიმლაინზე.</li>
-      <li>რომ შევუწყვოთ ხელი საზოგადოების მოდერაციას, მაგალითად შევადაროთ თქვენი აი-პი მისამართი სხვა ცნობილ მისამართებს, რათა ამოვიცნოთ ბანის გადაუხდელობა ან სხვა დარღვევები.</li>
-      <li>ელ-ფოსტის მისამართი რომელსაც გვაწვდით, შესაძლოა გამოვიყენოთ თქვენთვის ინფორმაციის გამოსაგძავნად, შეგატყობინოთ სხვა ადამიანების ინტერაქციაზე თქვენს კონტენტთან ან თქვენთვის გამოგზავნილ წერილებზე, ასევე რომ გიპასუხოთ მოთხოვნებზე და/ან სხვა საკითხებზე.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">როგორ ვიცავთ თქვენს ინფორმაციას?</h3>
-
-      <p>მიღებული გვაქვს სხვადასხვა ზომა, შევინარჩუნოთ თქვენი პირადი ინფორმაციის უსაფრთხოება, რომელსაც აგზავნით, შეგყავთ ან კითხულობთ. ამ ყველაფერთან ერთად თქვენი ბრაუზერის სესია, ტრეფიკი თქვენს აპლიკაციასა და აპის შორის დაცულია სსლ-ით, თქვენი პაროლი იშიფრება ძლიერი ალგორითმით. შეგიძლიათ ჩართოთ მეორე-ფაქტორის აუტენტიფიკაცია, რათა გააღმაოთ თქვენი ანგარიშის თავდაცვა.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">რა არის ჩვენი მონაცემის უარყოფის პოლიტიკა?</h3>
-
-      <p>ჩვენ არ დავიშურებთ ძალისხმევას რომ:</p>
-
-      <ul>
-      <li>შევინარჩუნოთ სერვერის ლოგები, რომლებიც მოიცავენ ყველა მოთხოვნის აი-პი მისამართს, თუმცა ესეთი ლოგები არ ინახება 90 დღეზე მეტ ხანს.</li>
-      <li>შევინარჩუნოთ რეგისტრირებული მომხმარებლების აი-პი მისამართები მაქსიმუმ 12 თვით.</li>
-      </ul>
-
-      <p>შეგიძლიათ მოითხოვოთ და ჩამოტვირთოთ თქვენი კონტენტის არქივი, რომელიც მოიცავს თქვენს პოსტებს, მედია ფაილებს, პროფილის და დასათაურების სურათს.</p>
-
-      <p>შეგიძლიათ დაუბრუნებლად გააუქმოთ თქვენი ანგარიში ნებისმიერ დროს.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">ვიყენებთ თუ არა ქუქის?</h3>
-
-      <p>დიახ. ქუქიები წარმოადგენენ პატარა ფაილებს, რომელთაც, საიტი ან სერვის-პროვაიდერი, ათავსებს თქვენი კომპიუტერის მყარ დისკზე, ვებ-ბრაუზერის (თუ ნებას რთავთ) მეშვეობით. ქუქიები საშუალებას აძლევს საიტს ამოიცნონ თქვენი ბრაუზზერი და თუ გაქვთ რეგისტრირებული ანგარიში მისი ასოციაცია მოახდინონ თქვენს ანგარიშთან.</p>
-
-      <p>ჩვენ ვიყენებთ ქუქის, ვიცოდეთ და შევინახოთ თქვენი პრეფერენსიები სამომავლო სტუმრობებისთვის.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">ვამჟღავნებთ თუ არა ინფორმაციას გარე მხარეებისთვის?</h3>
-
-      <p>ჩვენ არ ვყიდით, ვვაჭრობთ ან გადაქვაქ თქვენთვის პირადად იდენტიფიცირებადი ინფორმაცია სხვა მხარეებისთვის. ეს არ მოიცავს სანდო მხარეებს, რომლებიც გვეხმარება საიტის ოპერირებაში, ჩვენი საქმიანობის ჩატარებაში, ან თქვენთვის მომსახურების გაწევაში, წინაპირობით კონფიდენციალურად შეინახონ თქვენი ინფორმაცია. ჩვენ შესაძლოა გამოვაქვეყნოთ თქვენი ინფორმაცია, რომელიც შესაბამისად შეიძლება ჩავთვალოთ კანონმდებლობასთან შეთავსებისთვის, აღვასრულოთ პოლიტიკა ან დავიცვათ ჩვენი ან სხვისი უფლებები, კუთვნილება ან უსაფრთხოება.</p>
-
-      <p>თქვენი საჯარო ინფორმაცია შესაძლოა ჩამოტვირთულ იქნას სხვა სერვერების მიერ ქსელში. თქვენი ღია და მიმდევრებზე გათვლილი პოსტები მიეწოდება სერვერებს სადაც თქვენი მიმდევრები მოღვაწეობენ, იმ შემთხვევაში თუ მიმღებები მომდინარეობენ სხვა სერვერიდან, პირდაპირი წერილები მიეწოდებათ მიმღებების სერვერებს.</p>
-
-      <p>როდესაც უფლებას მისცემთ აპლიკაციას გამოიყენოს თქვენი ანგარიში, უფლებებისგან გამომდინარე, მან შესაძლოა მოიპოვოს თქვენი საჯარო ინფორმაცია, თქვენი დადევნების სიები, თქვენი მიმდევრები, თქვენი სიები, ყველა პოსტი და თქვენი ფავორიტები. აპლიკაციები ვერასდროს იქონიებენ წვდომას თქვენი ელ-ფოსტის მისამართზე ან პაროლზე.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">საიტის მოხმარებს ბავშვების მიერ</h3>
-
-      <p>თუ ეს სერვერი მდებარეობს ეუ-ში ან ეეა-ში: ჩვენი საიტი, პროდუქტები და სერვისები მიმართულია ადამიანებისთვის, რომელთაც შეუსრულდათ 16 წელი. თუ თქვენი ასაკი 16 წელიწადზე ნაკლებია, ჯიდიფიარის (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">ზოგადი მონაცემების დაცვის რეგულაცია/a>) მოთხოვნის მიხედვით არ გამოიყენოთ ეს საიტი.</p>
-
-      <p>თუ ეს სერვერი მდებარეობს ა.შ.შ.-ში: ჩვენი საიტი პროდუქტი და სერვისები მიმართულია ადამიანებისთვის, რომელთაც შეუსრულდათ 13 წელი. თუ თქვენი ასაკი 13 წელიწადზე ნაკლებია, კოპპას (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">ბავშვთა ონლაინ კონფიდენციალურობის დაცვის აქტი</a>) მოთხოვნების მიხედვით არ გამოიყენოთ ეს საიტი.</p>
-
-      <p>იურიდიული მოთხოვნილებები შეიძლება განსხვავდებოდეს, თუ ეს სერვერი იმყოფება სხვა იურისდიქციის ქვეშ.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">ცვლილებები კონფიდენციალურობის პოლიტიკაში</h3>
-
-      <p>თუ გადავწყვეტთ შევცვალოთ კონფიდენციალურობის პოლიტიკა, გამოვაქვეყნებთ ამ გვერდზე.</p>
-
-      <p>ეს დოკუმენტი არის ცც-ბაი-სა. ეს ბოლოს განახლდა 2018 წლის, 17 აგვისტოს.</p>
-
-      <p>საწყისად ადაპტირებულია <a href="https://github.com/discourse/discourse">გამჟღავნების კონფიდენციალური პოლიტიკისგან</a>.</p>
-    title: "%{instance} მომსახურების პირობები და კონფიდენციალურობის პოლიტიკა"
   themes:
     contrast: მაღალი კონტრასტი
     default: მასტოდონი
@@ -720,20 +498,11 @@ ka:
       title: არქივის მიღება
     welcome:
       edit_profile_action: პროფილის მოწყობა
-      edit_profile_step: შეგიძლიათ მოაწყოთ თქვენი პროფილი ავატარის ატვირთვით, დასათაურების სურათით, თქვენი დისპლეი სახელის შეცვლით და სხვა. თუ გსურთ გაუწიოთ ახალ მიმდევრებს რევიუ, სანამ რეალურად გამოგყვებიან, შეგიძლიათ ჩაკეტოთ თქვენი ანგარიში.
       explanation: აქ რამდენიმე რჩევაა დასაწყისისთვის
       final_action: დაიწყე პოსტვა
-      final_step: 'დაიწყე პოსტვა! თქვენი ღია წერილები შესაძლოა ნახონ სხვებმა მიმდევრების გარეშეც კი, მაგალითად თქვენს ლოკალურ თაიმლაინზე ან ჰეშტეგებში. შეგიძლიათ წარადგინოთ თქვენი თავი #introductions ჰეშტეგით.'
       full_handle: თქვენი სრული სახელური
       full_handle_hint: ეს არის ის რასაც ეტყვით თქვენს მეგობრებს, რათა მოგწერონ ან გამოგყვნენ სხვა ინსტანციიდან.
-      review_preferences_action: შეცვალეთ პრეფერენსიები
-      review_preferences_step: დარწმუნდით რომ აყენებთ თქვენს პრეფერენსიებს, მაგალითად რა ელ-ფოსტის წერილების მიღება გსურთ, ან კონფიდენციალურობის რა დონე გსურთ ჰქონდეთ თქვენს პოსტებს საწყისად. თუ არ გაღიზიანებთ მოძრაობა, შეგიძლიათ ჩართოთ გიფის ავტო-დაკვრა.
       subject: კეთილი იყოს თქვენი მობრძანება მასტოდონში
-      tip_federated_timeline: ფედერალური თაიმლაინი მასტოდონის ქსელის ცეცხლოვანი ხედია. ის მოიცავს მხოლოდ იმ ადამიანებს, რომელთაგანაც გამოიწერეს თქვენმა მეზობლებმა, ასე რომ ეს არაა სრული.
-      tip_following: თქვენ საწყისად მიჰყვებით თქვენი სერვერის ადმინისტრატორ(ებ)ს. უფრო საინტერესო ადამიანების მოსაძებნად იხილეთ ლოკალური და ფედერალური თაიმლაინები.
-      tip_local_timeline: ლოკალური თაიმლაინი ცეცხლოვანი ხედია ადამიანებისთვის %{instance}-ზე. ისინი არიან თქვენი უსიტყვო მეზობლები!
-      tip_mobile_webapp: თუ თქვენი მობილური ბრაუზერი გთავაზობთ მასტოდონის სახლის-ეკრანზე დამატებას, შეძლებთ ფუშ შეტყობინებების მიღებას. ეს მრავალმხრივ მოქმედებს როგორც მშობლიური აპლიკაცია!
-      tips: რჩევები
       title: კეთილი იყოს თქვენი მობრძანება, %{name}!
   users:
     invalid_otp_token: არასწორი მეორე ფაქტორის კოდი
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 5f675127f..d2a96d41f 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1,91 +1,35 @@
 ---
 kab:
   about:
-    about_hashtag_html: Tigi d tijewwiqin tizuyaz, ɣur-sent <strong>#%{hashtag}</strong>. Tzemreḍ ad tesdemreḍ akked yid-sent ma tesɛiḍ amiḍan deg kra n umḍiq deg fedivers.
     about_mastodon_html: 'Azeṭṭa ametti n uzekka: Ulac deg-s asussen, ulac taɛessast n tsuddiwin fell-ak, yebna ɣef leqder d ttrebga, daɣen d akeslemmas! Akked Maṣṭudun, isefka-inek ad qimen inek!'
-    about_this: Γef
-    active_count_after: d urmid
-    active_footnote: Imseqdacen yekkren s wayyur (MAU)
-    administered_by: 'Yettwadbel sɣur:'
-    api: API
-    apps: Isnasen izirazen
-    apps_platforms: Seqdec Maṣṭudun deg iOS, Android d tɣeṛγṛin-nniḍen
-    browse_directory: Qelleb deg ukaram n imaɣnuten teǧǧeḍ-d gar-asen widak tebɣiḍ
-    contact: Anermis
     contact_missing: Ur yettusbadu ara
     contact_unavailable: Wlac
-    discover_users: Af-d imseqdacen
-    documentation: Amnir
-    federation_hint_html: S umiḍan deg %{instance} tzemreḍ ad tḍefṛeḍ imdanen deg yal aqeddac Maṣṭudun d wugar n waya.
-    get_apps: Ɛreḍ asnas aziraz
     hosted_on: Maṣṭudun yersen deg %{domain}
-    learn_more: Issin ugar
-    privacy_policy: Tasertit tabaḍnit
-    rules: Ilugan n uqeddac
-    see_whats_happening: Ẓer d acu i iḍerrun
-    server_stats: 'Tidaddanin n uqeddac:'
-    source_code: Tangalt Taɣbalut
-    status_count_after:
-      one: n tsuffeɣt
-      other: n tsuffiɣin
-    status_count_before: I d-yessuffɣen
-    tagline: Ḍfeṛ imddukkal-ik tissineḍ-d wiyaḍ
-    terms: Tiwetlin n useqdec
-    unavailable_content: Ulac agbur
-    unavailable_content_description:
-      domain: Aqeddac
-      reason: Taɣzent
-      silenced: 'Tisuffɣin ara d-yekken seg yiqeddacen-agi ad ttwaffrent deg tsuddmin tizuyaz d yidiwenniten, daɣen ur ttilin ara telɣa ɣef usedmer n yimseqdacen-nsen, skud ur ten-teḍfiṛeḍ ara:'
-      silenced_title: Imeẓla yeggugmen
-    unavailable_content_html: Maṣṭudun s umata yeḍmen-ak ad teẓreḍ agbur, ad tesdemreḍ akked yimseqdacen-nniḍen seg yal aqeddac deg fedivers. Ha-tent-an ɣur-k tsuraf i yellan deg uqeddac-agi.
-    user_count_after:
-      one: amseqdac
-      other: imseqdacen
-    user_count_before: Amagger n
-    what_is_mastodon: D acu-t Maṣṭudun?
+    title: Γef
   accounts:
-    choices_html: 'Afranen n %{name}:'
     follow: Ḍfeṛ
     followers:
       one: Umeḍfaṛ
       other: Imeḍfaṛen
     following: Yeṭafaṛ
-    joined: Ikcemed deg %{date}
     last_active: armud aneggaru
-    media: Taɣwalt
-    moved_html: 'ibeddel %{name} amiḍan ɣer %{new_profile_link}:'
-    network_hidden: Ulac isalli-agi
-    never_active: Werǧin
     nothing_here: Ulac kra da!
-    people_followed_by: Imdanen i yeṭṭafaṛ %{name}
-    people_who_follow: Imdanen yeṭṭafaṛen %{name}
     posts:
       one: Tajewwiqt
       other: Tijewwiqin
     posts_tab_heading: Tijewwiqin
-    posts_with_replies: Tijewwaqin akked tririyin
-    roles:
-      admin: Anedbal
-      bot: Aṛubut
-      group: Agraw
-      moderator: Atrar
-    unavailable: Ur nufi ara amaɣnu-a
-    unfollow: Ur ṭṭafaṛ ara
   admin:
     account_actions:
       action: Eg tigawt
     account_moderation_notes:
       create: Eǧǧ tazmilt
-      delete: Kkes
     accounts:
       add_email_domain_block: Sewḥel taɣult n yimayl
       approve: Qbel
-      approve_all: Qbel kullec
       are_you_sure: Tetḥeqqeḍ?
       avatar: Tugna n umaɣnu
       by_domain: Taɣult
       change_email:
-        changed_msg: Imayl n umiḍan yettwabeddel mebla ugur!
         current_email: Imayl n tura
         label: Beddel imayl
         new_email: Imayl amaynut
@@ -94,6 +38,7 @@ kab:
       confirm: Sentem
       confirmed: Yettwasentem
       confirming: Asentem
+      custom: Udmawan
       delete: Kkes isefka
       deleted: Yettwakkes
       demote: Sider s weswir
@@ -130,7 +75,6 @@ kab:
         active: Yermed
         all: Akk
         pending: Yettraǧu
-        silenced: Yettwasgugem
         suspended: Yeḥbes
         title: Aseɣyed
       moderation_notes: Tamawin n useɣyed
@@ -147,7 +91,6 @@ kab:
       push_subscription_expires: Ajerred PuSH ad ifakk
       redownload: Smiren amaɣnu
       reject: Aggi
-      reject_all: Aggi-ten akk
       remove_avatar: Kkes tugna n umaɣnu
       remove_header: Kkes tacacit
       resend_confirmation:
@@ -157,19 +100,12 @@ kab:
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
-      role: Tisirag
-      roles:
-        admin: Anedbal
-        moderator: Aseɣyad
-        staff: Tarbaɛt
-        user: Amseqdac
       search: Nadi
       search_same_email_domain: Iseqdacen-nniḍen s yiwet n taɣult n yimayl
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
       security_measures:
         only_password: Awal uffir kan
         password_and_2fa: Awal uffir d 2FA
-        password_and_sign_in_token: Ajiṭun n wawal uffir d yimayl
       shared_inbox_url: Bḍu URL n tbewwaḍt
       show:
         created_reports: Eg ineqqisen
@@ -179,7 +115,6 @@ kab:
       statuses: Tisuffɣin
       subscribe: Jerred
       suspended: Yeḥbes
-      time_in_queue: Deg tebdert n uraju %{time}
       title: Imiḍanen
       unconfirmed_email: Imayl ur yettwasentem ara
       undo_silenced: Kkes asgugem
@@ -239,7 +174,6 @@ kab:
         create_unavailable_domain_html: "%{name} iseḥbes asiweḍ ɣer taɣult %{target}"
         demote_user_html: "%{name} iṣubb-d deg usellun aseqdac %{target}"
         destroy_announcement_html: "%{name} yekkes taselɣut %{target}"
-        destroy_custom_emoji_html: "%{name} ihudd imuji %{target}"
         destroy_domain_allow_html: "%{name} yekkes taɣult %{target} seg tebdart tamellalt"
         destroy_domain_block_html: "%{name} yekkes aseḥbes n taɣult %{target}"
         destroy_email_domain_block_html: "%{name} yekkes asewḥel i taɣult n imayl %{target}"
@@ -263,7 +197,6 @@ kab:
         update_custom_emoji_html: "%{name} ileqqem imuji %{target}"
         update_domain_block_html: "%{name} ileqqem iḥder n taɣult i %{target}"
         update_status_html: "%{name} ileqqem tasufeɣt n %{target}"
-      deleted_status: "(tasuffeɣt tettwakkes)"
       empty: Ulac iɣmisen i yellan.
       filter_by_action: Fren s tigawt
       filter_by_user: Sizdeg s useqdac
@@ -297,7 +230,6 @@ kab:
       enable: Rmed
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
-      image_hint: PNG n ddaw n 50KT
       list: Umuγ
       new:
         title: Timerna n imuji udmawan amaynut
@@ -310,42 +242,37 @@ kab:
       update_failed_msg: Ur izmir ara ad-issali umuji-a
       upload: Sali
     dashboard:
+      new_users: iseqdacen imaynuten
       software: Aseɣẓan
       space: Tallunt yettwasqedcen
       title: Tafelwit
+      website: Asmel
     domain_allows:
       add_new: Timerna n taɣult ɣer tabdert tamellalt
       created_msg: Taγult-a tettwarna γer wumuγ amellal mebla ugur
       destroyed_msg: Taγult-a tettwakkes seg umuγ amellal
+      import: Kter
       undo: Kkes seg tebdart tamellalt
     domain_blocks:
       add_new: Rni iḥder amaynut n taɣult
       domain: Taγult
+      import: Kter
       new:
         create: Rnu-d iḥder
         severity:
           noop: Ula yiwen
-          silence: Sgugem
           suspend: Ḥbes di leεḍil
         title: Iḥder amaynut n taɣult
       private_comment: Awennit uslig
       public_comment: Awennit azayez
       reject_media: Agi ifuyla n umidya
       reject_reports: Agi ineqqisen
-      rejecting_media: agami n yifuyla n umidya
-      rejecting_reports: agami n yineqqisen
-      severity:
-        silence: yettwasgugem
-        suspend: yeḥbes
-      show:
-        undo: Sefsex
       undo: Sefsex iḥder n taɣult
       view: Sken-d iḥder n taɣult
     email_domain_blocks:
       add_new: Rnu amaynut
       delete: Kkes
       domain: Taγult
-      from_html: seg %{domain}
       new:
         create: Rnu taγult
         title: Timerna n taɣult tamaynut n imayl ɣer tebdart taberkant
@@ -358,21 +285,17 @@ kab:
       back_to_all: Akk
       back_to_limited: Ɣur-s talast
       by_domain: Taγult
+      content_policies:
+        policy: Tasertit
       delivery:
         all: Akk
         clear: Sfeḍ tuccḍiwin n usiweḍ
         restart: Ales asiweḍ
         stop: Seḥbes asiweḍ
-        title: Asiweḍ
         unavailable: Ur yelli ara
-        unavailable_message: Asiweḍ ur yelli ara
-        warning: Aneddeh
       delivery_available: Yella usiweḍ
       delivery_error_days: Ussan n tuccḍiwin n usiweḍ
       empty: Ulac taɣultin yettwafen.
-      known_accounts:
-        one: "%{count} n umiḍan i yettwasnen"
-        other: "%{count} n yimiḍanen i yettwassnen"
       moderation:
         all: Akk
         limited: Yettwasgugem
@@ -408,8 +331,6 @@ kab:
         title: Rnu alugen n IP amaynut
       no_ip_block_selected: Ula yiwen n ulugen n IP ur yettwabeddel acku ula yiwen ur yettwafren
       title: Ilugan n IP
-    pending_accounts:
-      title: Imiḍanen yettrajun (%{count})
     relationships:
       title: Assaɣen n %{acct}
     relays:
@@ -428,11 +349,9 @@ kab:
         notes:
           one: "%{count} n tamawt"
           other: "%{count} n timawin"
-        reports:
-          one: "%{count} uneqqis"
-          other: "%{count} n ineqqisen"
       action_taken_by: Tigawt yettwaṭṭfen sɣur
       are_you_sure: Tetḥaq-eḍ?
+      category: Taggayt
       comment:
         none: Ula yiwen
       mark_as_resolved: Creḍ-it yefra
@@ -442,6 +361,7 @@ kab:
         create_and_resolve: Fru s tamawt
         create_and_unresolve: Alew alday s tamawt
         delete: Kkes
+        title: Tizmilin
       reopen: Allus n ulday n uneqqis
       report: 'Aneqqis #%{id}'
       reported_account: Amiḍan yettumlen
@@ -450,6 +370,14 @@ kab:
       title: Ineqqisen
       unresolved: Ur yefra ara
       updated_at: Yettwaleqqem
+      view_profile: Wali amaɣnu
+    roles:
+      categories:
+        administration: Tadbelt
+        moderation: Aseɣyed
+      delete: Kkes
+      privileges:
+        administrator: Anedbal
     rules:
       add_new: Rnu alugen
       delete: Kkes
@@ -457,50 +385,44 @@ kab:
       empty: Mazal ur ttwasbadun ara yilugan n uqeddac.
       title: Ilugan n uqeddac
     settings:
-      custom_css:
-        desc_html: Beddel aγan s CSS ara d-yettwasalayen deg yal asebter
-        title: CSS udmawan
+      about:
+        title: Γef
+      appearance:
+        title: Udem
+      discovery:
+        profile_directory: Akaram n imaγnuten
+        trends: Ayen mucaɛen
       domain_blocks:
         all: I medden akk
         disabled: Γef ula yiwen
         users: Γef yimseqdacen idiganen i yeqqnen
-      profile_directory:
-        title: Rmed akaram n imaγnuten
       registrations:
-        min_invite_role:
-          disabled: Ula yiwen·t
+        title: Ajerred
       registrations_mode:
         modes:
           none: Yiwen·t ur yzmir ad izeddi
           open: Zemren akk ad jerden
-      site_description:
-        title: Aglam n uqeddac
-      site_title: Isem n uqeddac
-      title: Iγewwaṛen n usmel
+      title: Iɣewwaṛen n uqeddac
     site_uploads:
       delete: Kkes afaylu yulin
     statuses:
+      application: Asnas
       back_to_account: Tuγalin γer usebter n umiḍan
-      batch:
-        delete: Kkes
       deleted: Yettwakkes
+      language: Tutlayt
       media:
         title: Taγwalt
-      no_media: Mebla taγwalt
       title: Tisuffiγin n umiḍan
       with_media: S taγwalt
-    tags:
-      last_active: Armud aneggaru
-      most_popular: Ittwasnen aṭas
-      most_recent: Melmi kan
-      name: Ahacṭag
-      reviewed: Yettwacegger
-      title: Ihacṭagen
-      unique_uses_today: "%{count} i d-yeffen ass-a"
     title: Tadbelt
+    trends:
+      allow: Sireg
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
+    webhooks:
+      delete: Kkes
+      enable: Rmed
   admin_mailer:
     new_report:
       body: "%{reporter} yettwazen ɣef %{target}"
@@ -508,9 +430,11 @@ kab:
   appearance:
     discovery: Asnirem
     localization:
+      guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Yal yiwen·t y·tezmer a ttekki.
     sensitive_content: Agbur amḥulfu
   application_mailer:
+    salutation: "%{name},"
     view: 'Ẓaṛ:'
     view_profile: Ssken-d amaɣnu
     view_status: Ssken-d tasuffiɣt
@@ -518,19 +442,20 @@ kab:
     token_regenerated: Ajuṭu n unekcum yettusirew i tikkelt-nniḍen akken iwata
     your_token: Ajiṭun-ik·im n unekcum
   auth:
-    apply_for_account: Suter asnebgi
     change_password: Awal uffir
-    checkbox_agreement_html: Qebleγ <a href="%{rules_path}" target="_blank">ilugan n uqeddac-a</a> akked <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
-    checkbox_agreement_without_rules_html: Qebleγ <a href="%{terms_path}" target="_blank">tiwtilin n useqdec</a>
     delete_account: Kkes amiḍan
     description:
       prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
       prefix_sign_up: Zeddi di Maṣṭudun assa!
     forgot_password: Tettud awal-ik uffir?
+    log_in_with: Qqen s
     login: Qqen
     logout: Ffeγ
     migrate_account: Gujj γer umiḍan nniḍen
     or_log_in_with: Neγ eqqen s
+    providers:
+      cas: CAS
+      saml: SAML
     register: Jerred
     registration_closed: "%{instance} ur yeqbil ara imttekkiyen imaynuten"
     reset_password: Wennez awal uffir
@@ -540,8 +465,6 @@ kab:
       title: Sbadu
     status:
       account_status: Addad n umiḍan
-      functional: Amiḍan-inek·m yettwaheyya.
-    trouble_logging_in: Γur-k uguren n tuqqna?
     use_security_key: Seqdec tasarut n teɣlist
   authorize_follow:
     already_following: Teṭafareḍ ya kan amiḍan-a
@@ -558,6 +481,7 @@ kab:
   date:
     formats:
       default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}isr"
@@ -577,9 +501,6 @@ kab:
     warning:
       username_available: Isem-ik·im n useqdac ad yuɣal yella i tikkelt-nniḍen
       username_unavailable: Isem-ik·im n useqdac ad yeqqim ulac-it
-  directories:
-    directory: Akaram n imaγnuten
-    explore_mastodon: Snirem %{title}
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -597,6 +518,8 @@ kab:
     archive_takeout:
       date: Azemz
       size: Teγzi
+    bookmarks: Ticraḍ
+    csv: CSV
     lists: Tibdarin
     mutes: Wid tesgugmeḍ
   featured_tags:
@@ -613,11 +536,14 @@ kab:
       empty: Ur tesɛid ara imzizdigen.
       title: Imzizdigen
     new:
+      save: Sekles amsizdeg amaynut
       title: Rnu yiwen umzizdig amaynut
+    statuses:
+      back_to_filter: Tuɣalin ɣer umsizdeg
+      batch:
+        remove: Kkes seg umsizdeg
   footer:
-    developers: Ineflayen
-    more: Ugar…
-    resources: Iɣbula
+    trending_now: Ayen mucaɛen tura
   generic:
     all: Akk
     changes_saved_msg: Ttwaskelsen ibelliden-ik·im akken ilaq!
@@ -625,13 +551,7 @@ kab:
     delete: Kkes
     order_by: Sizwer s
     save_changes: Sekles ibeddilen
-  identity_proofs:
-    active: Yermed
-    authorize: Ih, ssireg
-    i_am_html: Nekki d %{username} deg %{service}.
-    identity: Tamagit
-    inactive: D arurmid
-    publicize_checkbox: 'Tjewqeḍ aya:'
+    today: ass-a
   imports:
     modes:
       merge: Smezdi
@@ -670,13 +590,9 @@ kab:
     acct: Ibeddel γer
     incoming_migrations: Tusiḍ-d seg umiḍan nniḍen
     proceed_with_move: Awid imeḍfaṛen-ik
+  moderation:
+    title: Aseɣyed
   notification_mailer:
-    digest:
-      action: Wali akk tilγa
-      mention: 'Yuder-ik-id %{name} deg:'
-      subject:
-        one: "1 wulɣu seg tirza-inek·inm taneqqarut ar tura \U0001F418"
-        other: "%{count} ilɣa imaynuten seg tirza-nek·inem taneggarut ar tura \U0001F418"
     favourite:
       subject: "%{name} yesmenyaf addad-ik·im"
     follow:
@@ -697,6 +613,7 @@ kab:
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: AṬ
           million: A
@@ -706,11 +623,13 @@ kab:
     setup: Sbadu
   pagination:
     newer: Amaynut
-    next: Wayed
+    next: Γer zdat
     older: Aqbuṛ
     prev: Win iɛeddan
   preferences:
     other: Wiyaḍ
+  privacy_policy:
+    title: Tasertit tabaḍnit
   relationships:
     activity: Armud n umiḍan
     followers: Imeḍfaṛen
@@ -722,22 +641,11 @@ kab:
     primary: Agejdan
     relationship: Assaɣ
     status: Addad n umiḍan
-  remote_follow:
-    no_account_html: Ur tesɛid ara amiḍan? Tzmreḍ <a href='%{sign_up_path}' target='_blank'>ad jerdeḍ da</a>
-    proceed: Kemmel taḍfart
-  remote_interaction:
-    favourite:
-      proceed: Kemmel asmenyef
-    reblog:
-      proceed: Sentem beṭṭu
-    reply:
-      proceed: Kemmel tiririt
   sessions:
     activity: Armud aneggaru
     browser: Iminig
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -751,7 +659,6 @@ kab:
       phantom_js: PhantomJS
       qq: Iminig QQ
       safari: Safari
-      uc_browser: UCBrowser
       weibo: Weibo
     current_session: Tiγimit tamirant
     description: "%{browser} s %{platform}"
@@ -759,8 +666,6 @@ kab:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -788,6 +693,7 @@ kab:
     preferences: Imenyafen
     profile: Ameγnu
     relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ
+    statuses_cleanup: Tukksa tawurmant n tsuffaɣ
     two_factor_authentication: Asesteb s snat n tarrayin
     webauthn_authentication: Tisura n teɣlist
   statuses:
@@ -801,7 +707,7 @@ kab:
       video:
         one: "%{count} n tbidyutt"
         other: "%{count} n tbidyutin"
-    language_detection: Asefru awurman n tutlayt
+    edited_at_html: Tettwaẓreg %{date}
     open_in_web: Ldi deg Web
     poll:
       total_people:
@@ -812,9 +718,12 @@ kab:
         other: "%{count} n yedɣaren"
       vote: Dɣeṛ
     show_more: Ssken-d ugar
+    show_newer: Ssken-d timaynutin
     show_thread: Ssken-d lxiḍ
     sign_in_to_participate: Qqen i waken ad tzeddiḍ deg udiwenni
+    title: '%{name} : "%{quote}"'
     visibilities:
+      direct: Usrid
       private: Imeḍfaṛen kan
       private_long: Ssken i ymeḍfaṛen kan
       public: Azayez
@@ -827,17 +736,20 @@ kab:
       '2629746': 1 n wayyur
       '31556952': 1 n useggas
       '5259492': 2 n wayyuren
+      '604800': 1 umalas
       '63113904': 2 n yiseggasen
       '7889238': 3 n wayyuren
   stream_entries:
     pinned: Tijewwiqt yettwasentḍen
     sensitive_content: Agbur amḥulfu
-  terms:
-    title: Tiwtilin n useqdec akked tsertit tabaḍnit n %{instance}
   themes:
     contrast: Maṣṭudun (agnil awriran)
     default: Maṣṭudun (Aberkan)
     mastodon-light: Maṣṭudun (Aceɛlal)
+  time:
+    formats:
+      default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     add: Rnu
     disable: Gdel
@@ -848,17 +760,20 @@ kab:
     otp: Asnas n usesteb
     webauthn: Tisura n teɣlist
   user_mailer:
+    appeal_approved:
+      action: Ddu ɣer umiḍan-ik·im
     warning:
+      categories:
+        spam: Aspam
       title:
         disable: Amiḍan i igersen
         none: Γur-wat
         silence: Amiḍan yesɛa talast
-        suspend: Amiḍan yettwaḥebsen
+        suspend: Amiḍan yettwaḥbas
     welcome:
+      final_action: Bdu asuffeɣ
       full_handle: Tansa umiḍan-ik takemmalit
-      review_preferences_action: Beddel imenyafen
       subject: Ansuf γer Maṣṭudun
-      tips: Tixbaluyin
       title: Ansuf yessek·em, %{name}!
   users:
     signed_in_as: 'Teqqneḍ amzun d:'
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 05fd2c72e..4c7189588 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -1,85 +1,25 @@
 ---
 kk:
   about:
-    about_hashtag_html: Бұл жерде <strong>#%{hashtag}</strong> хэштегімен жинақталған жазбалар. Желіге тіркеліп, сіз де қосыла аласыз бұл ортаға.
     about_mastodon_html: Mastodon - әлеуметтік желіге негізделген, тегін және веб протоколды, ашық кодты бағдарлама. Ол email сияқты орталығы жоқ құрылым.
-    about_this: Туралы
-    active_count_after: актив
-    active_footnote: Соңғы айдағы актив қолданушылар (MAU)
-    administered_by: 'Админ:'
-    apps: Мобиль қосымшалар
-    apps_platforms: iOS, Android және басқа платформалардағы Mastodon қолданыңыз
-    browse_directory: Профильдер каталогын қажет фильтрлер арқылы қараңыз
-    browse_local_posts: Осы желідегі ашық посттар стримын қараңыз
-    browse_public_posts: Mastodon-дағы ашық посттар стримын қараңыз
-    contact: Байланыс
     contact_missing: Бапталмаған
     contact_unavailable: Белгісіз
-    discover_users: Қолданушыларды іздеңіз
-    documentation: Құжаттама
-    federation_hint_html: "%{instance} платформасындағы аккаунтыңыз арқылы Mastodon желісіндегі кез келген сервердегі қолданушыларға жазыла аласыз."
-    get_apps: Мобиль қосымшаны қолданып көріңіз
     hosted_on: Mastodon орнатылған %{domain} доменінде
-    instance_actor_flash: |
-      Бұл аккаунт кез-келген жеке пайдаланушыны емес, сервердің өзін көрсету үшін қолданылатын виртуалды актер.
-      Ол федерация мақсаттарында қолданылады және сіз барлығын бұғаттағыңыз келмейінше, бұғатталмауы керек, бұл жағдайда сіз домен блогын қолданған жөн.
-    learn_more: Көбірек білу
-    privacy_policy: Құпиялылық саясаты
-    see_whats_happening: Не болып жатқанын қараңыз
-    server_stats: 'Сервер статистикасы:'
-    source_code: Ашық коды
-    status_count_after:
-      one: жазба
-      other: жазба
-    status_count_before: Барлығы
-    tagline: Достарыңызды оқыңыз және жаңа авторларды табыңыз
-    terms: Қолдану шарттары
-    unavailable_content: Қолжетімсіз контент
-    unavailable_content_description:
-      domain: Сервер
-      reason: Себеп
-      rejecting_media: 'Бұл серверлердегі медиа файлдар өңделмейді немесе сақталмайды және түпнұсқаға қолмен басуды қажет ететін нобайлар көрсетілмейді:'
-      silenced: 'Осы серверлердегі жазбалар жалпы уақыт кестесінде және сөйлесулерде жасырын болады және егер сіз оларды бақыламасаңыз, олардың пайдаланушыларының өзара әрекеттестігі туралы ешқандай хабарламалар жасалмайды:'
-      suspended: 'Бұл серверлерден ешқандай дерек өңделмейді, сақталмайды немесе алмаспайды, бұл серверлердегі пайдаланушылармен өзара әрекеттесуді немесе байланыс орнатуды мүмкін етпейді:'
-    unavailable_content_html: Мастодон, әдетте, мазмұнды көруге және кез-келген басқа сервердегі пайдаланушылармен қарым-қатынас жасауға мүмкіндік береді. Бұл нақты серверде жасалған ерекше жағдайлар.
-    user_count_after:
-      one: қолданушы
-      other: қолданушы
-    user_count_before: Желіде
-    what_is_mastodon: Mastodon деген не?
   accounts:
-    choices_html: "%{name} таңдаулары:"
-    endorsements_hint: Сіз веб-интерфейстен адамдарға қолдау көрсете аласыз және олар осында көрсетіледі.
-    featured_tags_hint: Мұнда көрсетілетін нақты хэштегтерді ұсына аласыз.
     follow: Жазылу
     followers:
       one: Оқырман
       other: Оқырман
     following: Жазылғандары
-    joined: Тіркелген күні %{date}
     last_active: соңғы әрекеті
     link_verified_on: Сілтеме меншігі расталған күн %{date}
-    media: Медиа
-    moved_html: "%{name} мына жерге көшті %{new_profile_link}:"
-    network_hidden: Бұл ақпарат қолжетімді емес
-    never_active: Ешқашан
     nothing_here: Бұл жерде ештеңе жоқ!
-    people_followed_by: "%{name} жазылған адамдар"
-    people_who_follow: "%{name} атты қолданушының оқырмандары"
     pin_errors:
       following: Оқығыңыз келген адамға жазылуыңыз керек
     posts:
       one: Жазба
       other: Жазба
     posts_tab_heading: Жазба
-    posts_with_replies: Жазбалар және жауаптар
-    roles:
-      admin: Админ
-      bot: Бот
-      group: Топ
-      moderator: Мод
-    unavailable: Профиль қолжетімді емес
-    unfollow: Оқымау
   admin:
     account_actions:
       action: Әрекетті орындаңыз
@@ -87,16 +27,13 @@ kk:
     account_moderation_notes:
       create: Жазба қалдырыңыз
       created_msg: Модерация жазбасы қалдырылды!
-      delete: Өшіру
       destroyed_msg: Модерация жазбасы өшірілді!
     accounts:
       approve: Құптау
-      approve_all: Бәрін құптау
       are_you_sure: Шынымен бе?
       avatar: Аватар
       by_domain: Домен
       change_email:
-        changed_msg: Аккаунт email-і сәтті өзгертілді!
         current_email: Қазіргі email
         label: email өзгерту
         new_email: Жаңа email
@@ -136,7 +73,6 @@ kk:
         active: Актив
         all: Барлығы
         pending: Күтуде
-        silenced: Үнсіз
         suspended: Тоқтатылды
         title: Модерация
       moderation_notes: Модерация жазбалары
@@ -153,7 +89,6 @@ kk:
       push_subscription_expires: PuSH жазылу мерзімі аяқталады
       redownload: Профиль жаңарт
       reject: Қабылдамау
-      reject_all: Бәрін қабылдамау
       remove_avatar: Аватар өшіру
       remove_header: Мұқаба суретін өшір
       resend_confirmation:
@@ -163,12 +98,6 @@ kk:
       reset: Қалпына келтіру
       reset_password: Құпиясөзді қалпына келтіру
       resubscribe: Resubscribе
-      role: Рұқсаттар
-      roles:
-        admin: Админ
-        moderator: Модератор
-        staff: Қызметкерлер
-        user: Қолданушы
       search: Іздеу
       search_same_ip: Осы ІРмен кірген басқа қолданушылар
       shared_inbox_url: Бөлісілген инбокс URL
@@ -180,7 +109,6 @@ kk:
       statuses: Статустар
       subscribe: Жазылу
       suspended: Тоқтатылды
-      time_in_queue: "%{time} күту"
       title: Аккаунттар
       unconfirmed_email: Құпталмаған email
       undo_silenced: Үнсіздікті қайтып алу
@@ -191,7 +119,6 @@ kk:
       web: Веб
       whitelisted: Рұқсат тізімі
     action_logs:
-      deleted_status: "(өшірілген жазба)"
       title: Аудит логы
     announcements:
       destroyed_msg: Анонс сәтті өшірілді!
@@ -217,7 +144,6 @@ kk:
       enable: Қосу
       enabled: Қосылды
       enabled_msg: Эмодзи сәтті қосылды
-      image_hint: PNG 50KB
       list: Тізім
       listed: Тізілді
       new:
@@ -252,9 +178,7 @@ kk:
         create: Блок құру
         hint: Домендік блок дерекқорда тіркелгі жазбаларын құруға кедергі жасамайды, бірақ сол есептік жазбаларда ретроактивті және автоматты түрде нақты модерация әдістерін қолданады.
         severity:
-          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media filеs."
           noop: Ештеңе
-          silence: Үнсіз
           suspend: Тоқтатылған
         title: Жаңа домен блокы
       private_comment: Құпия пікір
@@ -265,29 +189,13 @@ kk:
       reject_media_hint: Жергілікті сақталған мультимедиалық файлдарды жояды және болашақта кез келген жүктеуден бас тартады. Суспензияға байланысты емес
       reject_reports: Шағым қабылдамау
       reject_reports_hint: Бұл доменнен келген барлық есептерді елемеңіз. Суспензияға байланысты емес
-      rejecting_media: медиа файлдарды қабылдамау
-      rejecting_reports: шағымдарды қабылдамау
-      severity:
-        silence: үнсіз
-        suspend: тоқтатылған
-      show:
-        affected_accounts:
-          one: Дерекқорда бір тіркелгі қозғалды
-          other: дерекқордағы %{count} аккаунт қозғалған
-        retroactive:
-          silence: Осы домендегі бар тіркелгілерді жою
-          suspend: Осы домендегі бар барлық тіркелгілерді тоқтатыңыз
-        title: "%{domain} доменіндегі блокты алып таста"
-        undo: Қайтару
       undo: Домен блокын қайтып алу
       view: Домен блокын көрсету
     email_domain_blocks:
       add_new: Жаңасын қосу
       created_msg: Қаратізімге email домені қосылды
       delete: Өшіру
-      destroyed_msg: Successfully deletеd e-mail domain from blacklist
       domain: Домен
-      empty: Ешқандай e-mail домені қаратізімге алынбапты.
       new:
         create: Add dоmain
         title: New e-mail blаcklist entry
@@ -295,9 +203,6 @@ kk:
     instances:
       by_domain: Domаin
       delivery_available: Жеткізу қол жетімді
-      known_accounts:
-        one: "%{count} таныс аккаунт"
-        other: "%{count} таныс аккаунт"
       moderation:
         all: Барлығы
         limited: Лимит
@@ -318,8 +223,6 @@ kk:
         expired: Уақыты өткен
         title: Фильтр
       title: Шақырулар
-    pending_accounts:
-      title: Күтілген аккаунттар (%{count})
     relationships:
       title: "%{acct} байланыстары"
     relays:
@@ -346,6 +249,7 @@ kk:
       are_you_sure: Шынымен бе?
       assign_to_self: Мені тағайындау
       assigned: Модератор тағайындау
+      by_target_domain: Шағымдалған аккаунт домені
       comment:
         none: Ештеңе
       created_at: Шағым тасталды
@@ -364,128 +268,33 @@ kk:
       resolved: Қайта шешілді
       resolved_msg: Шағым қайтадан шешілді!
       status: Статус
-      target_domain: Шағымдалған аккаунт домені
       title: Шағымдар
       unassign: Қайтып алу
       unresolved: Шешілмеген
       updated_at: Жаңартылды
     settings:
-      activity_api_enabled:
-        desc_html: Соңғы аптада жазылған жазбалар, белсенді қолданушылар, жаңа тіркелімдер
-        title: Пайдаланушы әрекеті туралы жиынтық статистиканы жариялау
-      bootstrap_timeline_accounts:
-        desc_html: Бірнеше пайдаланушы атын үтірмен бөліңіз. Тек жергілікті және бұғатталмаған аккаунттар. Барлық жергілікті админдер бос болғанда.
-        title: Жаңа қолданушыларға жазылғандар
-      contact_information:
-        email: Бизнес e-mail
-        username: Қолданушымен байланыс
-      custom_css:
-        desc_html: Әр беттегі өзгерістерді CSS жаңаруымен қарау
-        title: Жеке CSS
-      default_noindex:
-        desc_html: Бұл параметрді өзгертпеген барлық пайдаланушыларға әсер етеді
-        title: Әдепкі бойынша іздеу жүйелерін индекстеуден бас тарту
       domain_blocks:
         all: Бәріне
         disabled: Ешкімге
-        title: Домен блоктарын көрсету
         users: Жергілікті қолданушыларға
-      domain_blocks_rationale:
-        title: Дәлелді көрсету
-      hero:
-        desc_html: Бастапқы бетінде көрсетіледі. Кем дегенде 600x100px ұсынылады. Орнатылмаған кезде, сервердің нобайына оралады
-        title: Қаһарман суреті
-      mascot:
-        desc_html: Displayed on multiple pages. Кем дегенде 293×205px рекоменделеді. When not set, falls back to default mascot
-        title: Маскот суреті
-      peers_api_enabled:
-        desc_html: Домен names this server has encountered in the fediverse
-        title: Publish list of discovered серверлер
-      preview_sensitive_media:
-        desc_html: Link previews on other websites will display a thumbnail even if the media is marked as сезімтал
-        title: Show sensitive media in OpenGraph превью
-      profile_directory:
-        desc_html: Рұқсат users to be discoverable
-        title: Enable профиль directory
-      registrations:
-        closed_message:
-          desc_html: Displayed on frontpage when registrations are closed. You can use HTML тег
-          title: Closed registration мессадж
-        deletion:
-          desc_html: Allow anyone to delete their аккаунт
-          title: Open аккаунт deletion
-        min_invite_role:
-          disabled: Ешкім
-          title: Allow шақырулар by
       registrations_mode:
         modes:
           approved: Тіркелу үшін мақұлдау қажет
           none: Ешкім тіркеле алмайды
           open: Бәрі тіркеле алады
-        title: Тіркелулер
-      show_known_fediverse_at_about_page:
-        desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show жергілікті toots.
-        title: Show known fediverse on timeline превью
-      show_staff_badge:
-        desc_html: Show a staff badge on a user бет
-        title: Көрсет staff badge
-      site_description:
-        desc_html: Introductory paragraph on the басты бет. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
-        title: Сервер туралы
-      site_description_extended:
-        desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML тег
-        title: Custom extended ақпарат
-      site_short_description:
-        desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to сервер description.
-        title: Short сервер description
-      site_terms:
-        desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML тег
-        title: Қолдану шарттары мен ережелер
-      site_title: Сервер аты
-      thumbnail:
-        desc_html: Used for previews via OpenGraph and API. 1200x630px рекоменделеді
-        title: Сервер суреті
-      timeline_preview:
-        desc_html: Display public timeline on лендинг пейдж
-        title: Таймлайн превьюі
-      title: Сайт баптаулары
-      trendable_by_default:
-        desc_html: Бұрын тыйым салынбаған хэштегтерге әсер етеді
-        title: Хэштегтерге алдын-ала шолусыз тренд беруге рұқсат етіңіз
-      trends:
-        desc_html: Бұрын қарастырылған хэштегтерді қазіргі уақытта трендте көпшілікке көрсету
-        title: Тренд хештегтер
     site_uploads:
       delete: Жүктелген файлды өшір
       destroyed_msg: Жүктелген файл сәтті өшірілді!
     statuses:
       back_to_account: Аккаунт бетіне оралы
-      batch:
-        delete: Delеte
-        nsfw_off: Сезімтал емес ретінде белгіле
-        nsfw_on: Сезімтал ретінде белгіле
       deleted: Өшірілді
-      failed_to_execute: Орындалмады
       media:
         title: Медиa
-      no_media: Медиасыз
       no_status_selected: Бірде-бір статус өзгерген жоқ, себебі ештеңе таңдалмады
       title: Аккаунт статустары
       with_media: Медиамен
     tags:
-      accounts_today: Бүгін қолданылғандар
-      accounts_week: Осы аптада қолданылғандар
-      breakdown: Бүгінгі пайдалану көздері бойынша бөлу
-      last_active: Соңғы белсенділік
-      most_popular: Ең танымал
-      most_recent: Ең соңғы
-      name: Хэштег
       review: Статусты көрсету
-      reviewed: Көрілген
-      title: Hashtаgs
-      trending_right_now: Бұгінгі трендте
-      unique_uses_today: "%{count} бүгін жазылған"
-      unreviewed: Қаралды
       updated_msg: Хэштег параметрлері сәтті жаңартылды
     title: Administrаtion
     warning_presets:
@@ -501,9 +310,6 @@ kk:
       body: "%{reporter} has rеported %{target}"
       body_remote: Someone from %{domain} has rеported %{target}
       subject: New rеport for %{instance} (#%{id})
-    new_trending_tag:
-      body: "#%{name} хэштегі бүгін тренд, бірақ бұрын қарастырылмаған. Егер сіз оған рұқсат бермесеңіз немесе ол туралы ешқашан естімейтін болсаңыз, ол көпшілікке көрсетілмейді."
-      subject: Жаңа хештег күтілуде %{instance} (#%{name})
   aliases:
     add_new: Алиас қосу
     created_msg: Жаңа алиас сәтті жасалды. Енді сіз ескі аккаунттан көшіруді бастай аласыз.
@@ -526,16 +332,12 @@ kk:
   applications:
     created: Application succеssfully created
     destroyed: Application succеssfully deleted
-    invalid_url: The providеd URL is invalid
     regenerate_token: Regenerate accеss token
     token_regenerated: Access token succеssfully regenerated
     warning: Be very carеful with this data. Never share it with anyone!
     your_token: Your access tokеn
   auth:
-    apply_for_account: Шақыруды сұрау
     change_password: Құпиясөз
-    checkbox_agreement_html: Мен <a href="%{rules_path}" target="_blank">ережелер</a> мен <a href="%{terms_path}" target="_blank">шарттарды</a> қабылдаймын
-    checkbox_agreement_without_rules_html: Мен <a href="%{terms_path}" target="_blank">шарттармен</a> келісемін
     delete_account: Аккаунт өшіру
     delete_account_html: Аккаунтыңызды жойғыңыз келсе, <a href="%{path}">мына жерді</a> басыңыз. Сізден растау сұралатын болады.
     description:
@@ -566,10 +368,8 @@ kk:
     status:
       account_status: Аккаунт статусы
       confirming: Электрондық поштаны растау аяқталуын күтуде.
-      functional: Сіздің есептік жазбаңыз толығымен жұмыс істейді.
       pending: Сіздің өтінішіңіз біздің қызметкерлеріміздің қарауында. Бұл біраз уақыт алуы мүмкін. Өтінішіңіз мақұлданса, сізге электрондық пошта хабарламасы келеді.
       redirecting_to: Сіздің есептік жазбаңыз белсенді емес, себебі ол %{acct} жүйесіне қайта бағытталуда.
-    trouble_logging_in: Кіру қиын ба?
   authorize_follow:
     already_following: Бұл аккаунтқа жазылғансыз
     error: Өкінішке орай, қашықтағы тіркелгіні іздеуде қате пайда болды
@@ -617,10 +417,6 @@ kk:
       more_details_html: Қосымша мәліметтер алу үшін <a href="%{terms_path}"> құпиялылық саясатын </a> қараңыз.
       username_available: Аккаунтыңыз қайтадан қолжетімді болады
       username_unavailable: Логиніңіз қолжетімді болмайды
-  directories:
-    directory: Профильдер каталогы
-    explanation: Қолданушыларды қызығушылықтарына қарай реттеу
-    explore_mastodon: "%{title} шарлау"
   domain_validator:
     invalid_domain: жарамды домен атауы емес
   errors:
@@ -670,7 +466,6 @@ kk:
       title: Фильтр өңдеу
     errors:
       invalid_context: Жоқ немесе жарамсыз контекст берілген
-      invalid_irreversible: Қайтарылмайтын сүзгі тек ішкі немесе ескертпелер контекстімен жұмыс істейді
     index:
       delete: Өшіру
       empty: Сізде ешқандай фильтр жоқ.
@@ -678,15 +473,11 @@ kk:
     new:
       title: Жаңа фильтр қосу
   footer:
-    developers: Жасаушылар
-    more: Тағы…
-    resources: Ресурстар
     trending_now: Бүгінгі трендтер
   generic:
     all: Барлығы
     changes_saved_msg: Өзгерістер сәтті сақталды!
     copy: Көшіру
-    no_batch_actions_available: Бұл бетте ешқандай әрекет жоқ
     order_by: Сұрыптау
     save_changes: Өзгерістерді сақтау
     validation_errors:
@@ -694,24 +485,6 @@ kk:
       other: Бір нәрсе дұрыс емес! Төмендегі %{count} қатені қараңыз
   html_validator:
     invalid_markup: 'жарамсыз HTML код: %{error}'
-  identity_proofs:
-    active: Актив
-    authorize: Иә, авторластырыңыз
-    authorize_connection_prompt: Осы криптографиялық қосылымға рұқсат бересіз бе?
-    errors:
-      failed: Криптографиялық байланыс сәтсіз аяқталды. %{provider} әрекетті қайталаңыз.
-      keybase:
-        invalid_token: Пернетақтаның таңбалауыштары қолтаңбалар болып табылады және олар 66 таңбадан тұруы керек
-        verification_failed: Keybase бұл белгіні Keybase пайдаланушысының %{kb_username} қолтаңбасы ретінде танымайды. Keybase-тен қайталап көріңіз.
-      wrong_user: "%{current} ретінде кірген кезде %{proving} үшін дәлелдер жасау мүмкін емес. %{proving} ретінде кіріп, әрекетті қайталаңыз."
-    explanation_html: Мұнда сіз өзіңіздің жеке басыңызды, мысалы, Keybase профилі сияқты криптографиялық түрде байланыстыра аласыз. Бұл сізге басқа адамдарға шифрланған хабарламаларды жіберуге және сіз жіберетін мазмұнға сенімді болуға мүмкіндік береді.
-    i_am_html: Мен %{username} атты қолданушымын - %{service}.
-    identity: Жеке бас куәлігі
-    inactive: Инактив
-    publicize_checkbox: 'Түрт мынаны:'
-    publicize_toot: 'Керемет! Мен енді %{username} болып тіркелдім %{service}: %{url}'
-    status: Тексеру күйі
-    view_proof: Пруф көрсету
   imports:
     modes:
       merge: Біріктіру
@@ -726,7 +499,6 @@ kk:
       following: Жазылғандар тізімі
       muting: Үнсіздер тізімі
     upload: Жүктеу
-  in_memoriam_html: Естеліктерде.
   invites:
     delete: Ажырату
     expired: Мерзімі өткен
@@ -772,17 +544,6 @@ kk:
   moderation:
     title: Модерация
   notification_mailer:
-    digest:
-      action: Барлық ескертпелер
-      body: Міне, соңғы кірген уақыттан кейін келген хаттардың қысқаша мазмұны %{since}
-      mention: "%{name} сізді атап өтіпті:"
-      new_followers_summary:
-        one: Сондай-ақ, сіз бір жаңа оқырман таптыңыз! Алақай!
-        other: Сондай-ақ, сіз %{count} жаңа оқырман таптыңыз! Керемет!
-      subject:
-        one: "Соңғы кіруіңізден кейін 1 ескертпе келіпті \U0001F418"
-        other: "Соңғы кіруіңізден кейін %{count} ескертпе келіпті \U0001F418"
-      title: Сіз жоқ кезде...
     favourite:
       body: 'Жазбаңызды ұнатып, таңдаулыға қосты %{name}:'
       subject: "%{name} жазбаңызды таңдаулыға қосты"
@@ -857,22 +618,7 @@ kk:
     remove_selected_follows: Таңдалған қолданушыларды оқымау
     status: Аккаунт статусы
   remote_follow:
-    acct: Өзіңіздің username@domain теріңіз
     missing_resource: Аккаунтыңызға байланған URL табылмады
-    no_account_html: Әлі тіркелмегенсіз бе? Мына жерден <a href='%{sign_up_path}' target='_blank'>тіркеліп алыңыз</a>
-    proceed: Жазылу
-    prompt: 'Жазылғыңыз келеді:'
-    reason_html: "<strong>Неліктен бұл қадам қажет?</strong> <code>%{instance}</code> тіркелгіңіз келген сервер болмауы мүмкін, сондықтан сізді алдымен ішкі серверіңізге қайта бағыттау қажет."
-  remote_interaction:
-    favourite:
-      proceed: Таңдаулыға қосу
-      prompt: 'Мына жазбаны таңдаулыға қосасыз:'
-    reblog:
-      proceed: Жазба бөлісу
-      prompt: 'Сіз мына жазбаны бөлісесіз:'
-    reply:
-      proceed: Жауап жазу
-      prompt: 'Сіз мына жазбаға жауап жазасыз:'
   scheduled_statuses:
     over_daily_limit: Сіз бір күндік %{limit} жазба лимитін тауыстыңыз
     over_total_limit: Сіз %{limit} жазба лимитін тауыстыңыз
@@ -882,7 +628,6 @@ kk:
     browser: Браузер
     browsers:
       alipay: Аlipay
-      blackberry: Blаckberry
       chrome: Chrоme
       edge: Microsоft Edge
       electron: Electrоn
@@ -896,7 +641,6 @@ kk:
       phantom_js: PhаntomJS
       qq: QQ Brоwser
       safari: Safаri
-      uc_browser: UCBrоwser
       weibo: Weibо
     current_session: Қазіргі сессия
     description: "%{browser} - %{platform}"
@@ -905,8 +649,6 @@ kk:
     platforms:
       adobe_air: Adobе Air
       android: Andrоid
-      blackberry: Blackbеrry
-      chrome_os: ChromеOS
       firefox_os: Firefоx OS
       ios: iОS
       linux: Lіnux
@@ -930,7 +672,6 @@ kk:
     edit_profile: Профиль өңдеу
     export: Экспорт уақыты
     featured_tags: Таңдаулы хэштегтер
-    identity_proofs: Жеке куәлік
     import: Импорт
     import_and_export: Импорт/экспорт
     migrate: Аккаунт көшіру
@@ -953,13 +694,11 @@ kk:
     disallowed_hashtags:
       one: 'рұқсат етілмеген хэштег: %{tags}'
       other: 'рұқсат етілмеген хэштегтер: %{tags}'
-    language_detection: Тілді өздігінен таңда
     open_in_web: Вебте ашу
     over_character_limit: "%{max} максимум таңбадан асып кетті"
     pin_errors:
       limit: Жабыстырылатын жазба саны максимумынан асты
       ownership: Біреудің жазбасы жабыстырылмайды
-      private: Жабық жазба жабыстырылмайды
       reblog: Бөлісілген жазба жабыстырылмайды
     poll:
       total_people:
@@ -985,89 +724,6 @@ kk:
     sensitive_content: Нәзік мазмұн
   tags:
     does_not_match_previous_name: алдыңғы атқа сәйкес келмейді
-  terms:
-    body_html: |
-      <h2>Құпиялылық шарттары</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Қызмет көрсету шарттары және Құпиялылық саясаты"
   themes:
     contrast: Mastodon (Жоғары контраст)
     default: Mastodon (Қою)
@@ -1087,13 +743,6 @@ kk:
       subject: Мұрағатыңыз түсіріп алуға дайын
       title: Мұрағатты алу
     warning:
-      explanation:
-        disable: Аккаунтыңыз қатып қалса, сіздің деректеріңіз өзгеріссіз қалады, бірақ ол құлыптан босатылғанша ешқандай әрекетті орындай алмайсыз.
-        silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follоw you.
-        suspend: Сіздің аккаунтыңыз уақытша тоқтатылды және сіздің барлық файлдарыңыз бен жүктеп салынған медиа файлдарыңыз осы серверлерден және оқырманы болған серверлерден қайтарылмайды.
-      get_in_touch: Сіз бұл электронды поштаға %{instance} қызметкерлерімен байланысу үшін жауап бере аласыз.
-      review_server_policies: Сервер саясатын қарап шығыңыз
-      statuses: 'Арнайы:'
       subject:
         disable: Аккаунтыңыз %{acct} уақытша тоқтатылды
         none: "%{acct} ескертуі"
@@ -1106,20 +755,11 @@ kk:
         suspend: Аккаунт тоқтатылды
     welcome:
       edit_profile_action: Профиль өңдеу
-      edit_profile_step: Профиліңізге аватар, мұқаба сурет жүктей аласыз, аты-жөніңізді көрсете аласыз. Оқырмандарыңызға сізбен танысуға рұқсат бермес бұрын аккаунтыңызды уақытша құлыптап қоюға болады.
       explanation: Мына кеңестерді шолып өтіңіз
       final_action: Жазба жазу
-      final_step: 'Жазуды бастаңыз! Тіпті оқырмандарыңыз болмаса да, сіздің жалпы жазбаларыңызды басқа адамдар көре алады, мысалы, жергілікті желіде және хэштегтерде. Жазбаларыңызға # протоколды хэштег қоссаңыз болады.'
       full_handle: Желі тұтқасы
       full_handle_hint: This is what you would tell your friends so they can message or follow you frоm another server.
-      review_preferences_action: Таңдауларды өзгерту
-      review_preferences_step: Қандай хат-хабарларын алуды қалайтыныңызды немесе сіздің хабарламаларыңыздың қандай құпиялылық деңгейін алғыңыз келетінін анықтаңыз. Сондай-ақ, сіз GIF автоматты түрде ойнату мүмкіндігін қосуды таңдай аласыз.
       subject: Mastodon Желісіне қош келдіңіз
-      tip_federated_timeline: Жаһандық желі - Mastodon желісінің негізгі құндылығы.
-      tip_following: Сіз бірден желі админіне жазылған болып саналасыз. Басқа адамдарға жазылу үшін жергілікті және жаһандық желіні шолып шығыңыз.
-      tip_local_timeline: Жерігілкті желіде маңайыздағы адамдардың белсенділігін көре аласыз %{instance}. Олар - негізгі көршілеріңіз!
-      tip_mobile_webapp: Мобиль браузеріңіз Mastodon желісін бастапқы бетке қосуды ұсынса, қабылдаңыз. Ескертпелер де шығатын болады. Арнайы қосымша сияқты бұл!
-      tips: Кеңестер
       title: Ортаға қош келдің, %{name}!
   users:
     follow_limit_reached: Сіз %{limit} лимитінен көп адамға жазыла алмайсыз
diff --git a/config/locales/kmr.yml b/config/locales/kmr.yml
deleted file mode 100644
index 981446d4b..000000000
--- a/config/locales/kmr.yml
+++ /dev/null
@@ -1,1527 +0,0 @@
----
-kmr:
-  about:
-    about_hashtag_html: Ev şandiyeke gelemperî ye bi <strong>#%{hashtag}</strong> re nîşankirî ye. Tu dikarî pê re çalak bibî heke ajimêreke te heye li ser fediverse.
-    about_mastodon_html: 'Tora civakî ya pêşerojê: Ne reklam, ne çavdêriya pargîdanî, sêwirana exlaqî, û desentralîzasyon! Bi Mastodon re bibe xwediyê daneyên xwe!'
-    about_this: Derbar
-    active_count_after: çalak
-    active_footnote: Mehane bikarhênerên çalak (MBÇ)
-    administered_by: 'Tê bi rêvebirin ji aliyê:'
-    api: API
-    apps: Sepana mobîl
-    apps_platforms: Mastodon ji iOS, Android û platformên din bi kar bîne
-    browse_directory: Li riya profîlê bigere û li gorî berjewendiyan parzûn bike
-    browse_local_posts: Ji vî rajekarê weşaneke zindî ya şandiyên giştî bigere
-    browse_public_posts: Weşaneke zindî ya şandiyên giştî bigere li ser Mastodon
-    contact: Têkilî
-    contact_missing: Nehate sazkirin
-    contact_unavailable: N/A
-    discover_users: Bikarhêneran keşf bike
-    documentation: Pelbend
-    federation_hint_html: Bi ajimêrê xwe %{instance} re tu dikarî kesên rajekar û li derveyî mastodonê bişopînî.
-    get_apps: Sepaneke mobîl bicerbîne
-    hosted_on: Mastodon li ser%{domain} tê hildanê
-    instance_actor_flash: Ev ajimêr aktorekî aşopî ye ji bo rajekar were temsîl kirin tê bikaranîn ne ajimêra kesî ye. Ji bo armanca federasyonê dixebite û divê ney asteng kirin heta ku te xwest hemû nimûneyan asteng bikî, di vir de ger tu blogek navper bikarbînî.
-    learn_more: Bêtir fêr bibe
-    privacy_policy: Polîtikaya nihêniyê
-    rules: Rêbazên rajekar
-    rules_html: 'Heger tu bixwazî ajimêrekî li ser rajekarê mastodon vebikî, li jêrê de kurtasî ya qaîdeyên ku tu guh bidî heye:'
-    see_whats_happening: Binêre ka çi diqewime
-    server_stats: 'Statîstîkên rajekar:'
-    source_code: Çavkaniya Kodî
-    status_count_after:
-      one: şandî
-      other: şandî
-    status_count_before: Hatin weşan
-    tagline: Hevalên xwe bişopîne û yên nû bibîne
-    terms: Peyama mercan
-    unavailable_content: Rajekarên li hev kirî
-    unavailable_content_description:
-      domain: Rajekar
-      reason: Sedem
-      rejecting_media: 'Pelên medyayê yên ji van rajekaran nayên pêvajoyî kirin an tomarkirin, û tu dîmenek nayên xuyakirin, ku pêdivî ye ku bi desta pêlêkirina pelika rasteqîn hebe:'
-      rejecting_media_title: Medyayên parzûnkirî
-      silenced: 'Şandiyên ji van rajekaran dê di demnameyên û axaftinên gelemperî de bêne veşartin, û heya ku tu wan neşopînî dê ji çalakiyên bikarhênerên wan agahdariyek çênebe:'
-      silenced_title: Rajekarên sînor kirî
-      suspended: 'Dê tu daneya ji van rajekaran neyê berhev kirin, tomarkirin an jî guhertin, ku têkilî an danûstendinek bi bikarhênerên van rajekaran re tune dike:'
-      suspended_title: Rajekarên rawestî
-    unavailable_content_html: Mastodon bi gelemperî dihêle ku tu naverokê bibînî û bi bikarhênerên ji rajekareke din a li fendiverse re têkilî dayne. Ev awaretyên ku li ser vê rajekara taybetî hatine çêkirin ev in.
-    user_count_after:
-      one: bikarhêner
-      other: bikarhêner
-    user_count_before: Serrûpel
-    what_is_mastodon: Mastodon çi ye?
-  accounts:
-    choices_html: 'Hilbijartina %{name}:'
-    endorsements_hint: Tu dikarî kesên ku di navrûyê wep de dişopînî bipejirînî û ew li vir were nîşan kirin.
-    featured_tags_hint: Tu dikarî hashtagên teybetî li vir tê nîşan kirin di pê de derxî.
-    follow: Bişopîne
-    followers:
-      one: Şopîner
-      other: Şopîner
-    following: Dişopîne
-    instance_actor_flash: Ev ajimêr listikvaneke rastkî ye ku ji bo wek nûnerê rajekar bixwe tê bikaranîn û ne bikarhênerek kesane. Ew ji bo mebestên yekbûyî tê bikaranîn û divê neyê rawestandin.
-    joined: Di %{date} de tevlî bû
-    last_active: çalakiya dawî
-    link_verified_on: Xwedaniya li vê girêdanê di %{date} de hatiye kontrolkirin
-    media: Medya
-    moved_html: "%{name} bar kire %{new_profile_link}:"
-    network_hidden: Ev zanyarî berdest nîne
-    never_active: Tu car
-    nothing_here: Li vir tiştek tune ye!
-    people_followed_by: Kesên ku%{name} wan dişopîne
-    people_who_follow: Kesên%{name} dişopîne
-    pin_errors:
-      following: Kesê ku tu dixwazî bipejirînî jixwe tu vê dişopînî
-    posts:
-      one: Şandî
-      other: Şandî
-    posts_tab_heading: Şandî
-    posts_with_replies: Şandî û bersiv
-    roles:
-      admin: Rêvebir
-      bot: Bot
-      group: Kom
-      moderator: Moderator
-    unavailable: Profîl nay bikaranîn
-    unfollow: Neşopîne
-  admin:
-    account_actions:
-      action: Çalakî yê bike
-      title: Li ser %{acct} çalakiyên li hev hatî pêk bîne
-    account_moderation_notes:
-      create: Nîşeyekê bihêle
-      created_msg: Nîşeyê moderator bi awayekî serkeftî hate afirandin!
-      delete: Jê bibe
-      destroyed_msg: Nîşeyê moderator bi awayekî serkeftî hate tinne kirin!
-    accounts:
-      add_email_domain_block: Navparê e-nameyê asteng bike
-      approve: Bipejirîne
-      approve_all: Hemûyan bipejirîne
-      approved_msg: Tomarkirina %{username} bi awayekî serkeftî hate pejirandin
-      are_you_sure: Ma tu bawerî?
-      avatar: Wêne
-      by_domain: Navper
-      change_email:
-        changed_msg: E-nameya ajimêr bi awayekî serkeftî hate guhertin!
-        current_email: E-nameya heyî
-        label: E-nameyê biguherîne
-        new_email: E-nameya nû
-        submit: E-nameyê biguherîne
-        title: E-nameyê biguherîne bo %{username}
-      confirm: Bipejirîne
-      confirmed: Hate pejirandin
-      confirming: Tê pejirandin
-      delete: Daneyan jê bibe
-      deleted: Hate jêbirin
-      demote: Ast daxistin
-      destroyed_msg: Daneyên %{username} niha ket rêzê da yê demek nêz da were jêbirin
-      disable: Qerisî ye
-      disable_sign_in_token_auth: E-name ya rastandina token neçalak bike
-      disable_two_factor_authentication: 2FA ne çalak bike
-      disabled: Qerisî ye
-      display_name: Navê xuyangê
-      domain: Navper
-      edit: Serrast bike
-      email: E-name
-      email_status: Rewşa E-nameyê
-      enable: Çalak bike
-      enable_sign_in_token_auth: E-name ya rastandina token çalak bike
-      enabled: Çalakkirî
-      enabled_msg: Ajimêra %{username} bi serkeftî hat çalak kirin
-      followers: Şopîner
-      follows: Dişopînê
-      header: Jormalper
-      inbox_url: Peyamên hatî URl
-      invite_request_text: Sedemên tevlêbûnê
-      invited_by: Bi vexwendinê
-      ip: IP
-      joined: Tevlî bû
-      location:
-        all: Hemû
-        local: Herêmî
-        remote: Ji dûr ve
-        title: Cih
-      login_status: Rewşa têketinê
-      media_attachments: Pêvekên medya
-      memorialize: Vegerîne bîranînê
-      memorialized: Bû bîranîn
-      memorialized_msg: "%{username} bi serkeftî veguherî ajimêra bîranînê"
-      moderation:
-        active: Çalak
-        all: Hemû
-        pending: Tê nirxandin
-        silenced: Sînorkirî
-        suspended: Sekinandî
-        title: Çavdêrî
-      moderation_notes: Nîşeyên Rêvebirinê
-      most_recent_activity: Çalakîyên dawî
-      most_recent_ip: IP' a dawî
-      no_account_selected: Tu ajimêr nehat hilbijartin ji ber vê tu ajimêr nehat guhertin
-      no_limits_imposed: Sînor nay danîn
-      not_subscribed: Beşdar nebû
-      pending: Li benda nirxandinê ye
-      perform_full_suspension: Sekinî
-      promote: Derbasê asteke bilind be
-      protocol: Protokol
-      public: Gelemperî
-      push_subscription_expires: Beşdarbûna PuSH diqede
-      redownload: Profîl nûve bike
-      redownloaded_msg: Bi serkeftî profîla %{username} ji kokê va hat nûve kirin
-      reject: Nepejirîne
-      reject_all: Hemûyan red bike
-      rejected_msg: Tomarkirina %{username} bi awayekî serkeftî nehate pejirandin
-      remove_avatar: Avatarê rake
-      remove_header: Sernavê rake
-      removed_avatar_msg: Wêneyê %{username} bi awayekî serkeftî hate rakirin
-      removed_header_msg: Wêneyê dîwar ê %{username} bi awayekî serkeftî hate rakirin
-      resend_confirmation:
-        already_confirmed: Ev bikarhêner jixwe hatiye pejirandin
-        send: E-nameya pejirandinê dîsa bişîne
-        success: E-nameya pejirandinê bi awayekî serkeftî hate şandin!
-      reset: Ji nû ve saz bike
-      reset_password: Pêborînê ji nû ve saz bike
-      resubscribe: Dîsa beşdar bibe
-      role: Maf
-      roles:
-        admin: Rêvebir
-        moderator: Çavdêr
-        staff: Xebatkar
-        user: Bikarhêner
-      search: Bigere
-      search_same_email_domain: Bikarhênerên din ên bi heman navpera e-nameyê
-      search_same_ip: Bikarhênerên din ên xwedî heman IP
-      security_measures:
-        only_password: Têne pêborîn
-        password_and_2fa: Pêborîn û 2FA
-        password_and_sign_in_token: Pêborîn û navnîşana e-nameyê
-      sensitive: Hêz-hestiyar
-      sensitized: Wek hestiyar hatiye nîşankirin
-      shared_inbox_url: URLya wergirtiyên parvekirî
-      show:
-        created_reports: Ragihandinên ku çêkiriye
-        targeted_reports: Ji aliyê kesên din ve hatiye ragihandin
-      silence: Sînor
-      silenced: Bêdeng kirî
-      statuses: Şandî
-      subscribe: Bibe kiryar
-      suspended: Hatiye rawestandin
-      suspension_irreversible: Daneyên vê ajimêrê bêveger hatine jêbirin. Tu dikarî ajimêra xwe ji rawestandinê vegerinî da ku ew bi kar bînî lê ew ê tu daneya ku berê hebû venegere.
-      suspension_reversible_hint_html: Ajimêr hat qerisandin, û daneyên di %{date} de hemû were rakirin. Hetta vê demê, ajimêr bê bandorên nebaş dikare dîsa vegere. Heke tu dixwazî hemû daneyan ajimêrê niha rakî, tu dikarî li jêrê bikî.
-      time_in_queue: Di dorê de sekinandin %{time}
-      title: Ajimêr
-      unconfirmed_email: E-nameya nepejirandî
-      undo_sensitized: Hestiyariyê vegerîne
-      undo_silenced: Sînorê vegerîne
-      undo_suspension: Dûrxistinê paşve vegerîne
-      unsilenced_msg: Ajimêra %{username} bi awayekî serkeftî bêsînor çêbû
-      unsubscribe: Dev ji beşdarbûnê berde
-      unsuspended_msg: Bi awayekî serkeftî beşdarbûna bi ajimêra %{username} hate berdan
-      username: Navê bikarhêneriyê
-      view_domain: Kurte ji bo navperê bide nîşan
-      warn: Hişyarî
-      web: Tevn
-      whitelisted: Ji bona yekbûyînê maf tê dayîn
-    action_logs:
-      action_types:
-        assigned_to_self_report: Ragihandinê diyar bike
-        change_email_user: E-nameya bikarhêner biguherîne
-        confirm_user: Bikarhêner bipejirîne
-        create_account_warning: Hişyariyekê çê bike
-        create_announcement: Daxûyaniyekê çê bike
-        create_custom_emoji: Emojiyên kesanekirî çê bike
-        create_domain_allow: Navpera ku destûr standiye peyda bike
-        create_domain_block: Navpera ku asteng bûye ava bike
-        create_email_domain_block: Navpera e-name yê de asteng kirinê peyda bike
-        create_ip_block: Rêziknameya IPyê saz bike
-        create_unavailable_domain: Navpera ku nayê bikaranîn pêk bîne
-        demote_user: Bikarhênerê kaşê jêr bike
-        destroy_announcement: Daxûyanîyê jê bibe
-        destroy_custom_emoji: Emojîya kesanekirî jê bibe
-        destroy_domain_allow: Navperên mafdayî jê bibe
-        destroy_domain_block: Navperên astengkirî jê bibe
-        destroy_email_domain_block: Navperên e-nameyê yên astengkirî jê bibe
-        destroy_ip_block: Tomara IPyê jêbibe
-        destroy_status: Şandiyê jê bibe
-        destroy_unavailable_domain: Navperên tuneyî jê bibe
-        disable_2fa_user: 2FA neçalak bike
-        disable_custom_emoji: Emojîya kesanekirî neçalak bike
-        disable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token neçalak bike
-        disable_user: Bikarhêner neçalak bike
-        enable_custom_emoji: Emojîya kesanekirî çalak bike
-        enable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token çalak bike
-        enable_user: Bikarhêner çalak bike
-        memorialize_account: Ajimêrê bike bîranînek
-        promote_user: Bikarhêner pêş bixe
-        remove_avatar_user: Avatarê rake
-        reopen_report: Ragihandina ji nû ve veke
-        reset_password_user: Pêborînê ji nû ve saz bike
-        resolve_report: Ragihandinê çareser bike
-        sensitive_account: Ajimêra hêz-hestiyar
-        silence_account: Ajimêrê bi sînor bike
-        suspend_account: Ajimêr rawestîne
-        unassigned_report: Ragihandinê diyar neke
-        unsensitive_account: Medyayên di ajimêrê te de wek hestyarî nepejirîne
-        unsilence_account: Ajimêra sînorkirî vegerîne
-        unsuspend_account: Ajimêrê xwe ji rewestandinê rake
-        update_announcement: Daxûyaniyê rojane bike
-        update_custom_emoji: Emojîya kesanekirî rojane bike
-        update_domain_block: Navperên astengkirî rojane bike
-        update_status: Şandiyê rojane bike
-      actions:
-        assigned_to_self_report_html: "%{name} ji xwe re ragihandinek %{target} hilda"
-        change_email_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} guherand"
-        confirm_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} piştrast kir"
-        create_account_warning_html: "%{name} ji bo %{target} hişyariyek şand"
-        create_announcement_html: "%{name} agahdarkirineke nû çêkir %{target}"
-        create_custom_emoji_html: "%{name} emojîyeke nû ya %{target} bar kir"
-        create_domain_allow_html: "%{name} bi navperê %{target} re maf da federeyê"
-        create_domain_block_html: "%{name} ji navperê %{target} asteng kir"
-        create_email_domain_block_html: "%{name} e-name ya navperê %{target} asteng kir"
-        create_ip_block_html: "%{name} ji bo IPya %{target} rêzikname saz kir"
-        create_unavailable_domain_html: "%{name} bi navperê %{target} re gihandinê rawestand"
-        demote_user_html: "%{name} bikarhênerê %{target} kaşê jêr kir"
-        destroy_announcement_html: "%{name} daxûyaniyeke %{target} jê bir"
-        destroy_custom_emoji_html: "%{name} emojiya %{target} tune kir"
-        destroy_domain_allow_html: "%{name} bi navperê %{target} re maf neda federeyê"
-        destroy_domain_block_html: "%{name} navpera astengkirî %{target}"
-        destroy_email_domain_block_html: "%{name} e-name yê navpera %{target} asteng kirinê rakir"
-        destroy_ip_block_html: "%{name}, ji bo IPya %{target} rêziknameyê jêbir"
-        destroy_status_html: "%{name} ji alîyê %{target} ve şandiyê rakir"
-        destroy_unavailable_domain_html: "%{name} bi navperê %{target} re gihandinê berdewam kir"
-        disable_2fa_user_html: "%{name} ji bo bikarhênerê %{target} du faktorî neçalak kir"
-        disable_custom_emoji_html: "%{name} emojiya %{target} neçalak kir"
-        disable_sign_in_token_auth_user_html: "%{name} ji bo %{target} biştraskirina e-name ya token ne çalak kir"
-        disable_user_html: "%{name}, ji bo bikarhênerê %{target} têketinê neçalak kir"
-        enable_custom_emoji_html: "%{name} emojiya %{target} çalak kir"
-        enable_sign_in_token_auth_user_html: "%{name} ji bo %{target} biştraskirina e-name ya token çalak kir"
-        enable_user_html: "%{name}, ji bo bikarhênerê %{target} têketinê çalak kir"
-        memorialize_account_html: "%{name} ajimêra %{target} veguherand rûpeleke bîranînê"
-        promote_user_html: "%{name}, bikarhêner %{target} bilind kir"
-        remove_avatar_user_html: "%{name} avatara bikarhêner %{target} rakir"
-        reopen_report_html: "%{name} gilîyê %{target} ji nû ve vekir"
-        reset_password_user_html: "%{name} şifre ya bikarhênerê %{target} ji nû ve saz kir"
-        resolve_report_html: "%{name} gilîya %{target} çareser kir"
-        sensitive_account_html: "%{name} medyayê %{target} ê wek hestiyarî nîşan kir"
-        silence_account_html: "%{name} ajimêrê %{target} ê sînor kir"
-        suspend_account_html: "%{name} ajimêrê %{target} ê hilda rawestandinê"
-        unassigned_report_html: "%{name} gilîkirina %{target} rakir"
-        unsensitive_account_html: "%{name} medyayê %{target} ê nîşandana hestiyarî rakir"
-        unsilence_account_html: "%{name} bêdengiya ajimêrê %{target} ê rakir"
-        unsuspend_account_html: "%{name} ajimêrê %{target} ê de rawestandinê rakir"
-        update_announcement_html: "%{name} agahdarî ya%{target} rojane kir"
-        update_custom_emoji_html: "%{name} emojiyê %{target} rojane kir"
-        update_domain_block_html: "%{name} ji bo navperê %{target} asteng kirinê rojane kir"
-        update_status_html: "%{name} şandiya bikarhêner %{target} rojanekir"
-      deleted_status: "(şandiyeke jêbirî)"
-      empty: Tomarkirin nehate dîtin.
-      filter_by_action: Li gorî çalakiyê biparzinîne
-      filter_by_user: Li gorî bikarhênerê biparzinîne
-      title: Tomarê çavdêriyê
-    announcements:
-      destroyed_msg: Daxûyanî bi awayekî serkeftî hate jêbirin!
-      edit:
-        title: Daxûyaniyê serrast bike
-      empty: Daxûyanî nehat dîtin.
-      live: Zindî
-      new:
-        create: Daxûyaniyekê çê bike
-        title: Daxûyaniya nû
-      publish: Biweşîne
-      published_msg: Daxûyanî bi awayekî serkeftî hate weşan!
-      scheduled_for: Bo %{time} hatiye demsazkirin
-      scheduled_msg: Daxûyanî hate demsazkirin bo weşanê!
-      title: Daxuyanî
-      unpublish: Neweşîne
-      unpublished_msg: Daxûyanî bi awayekî serkeftî weşan pûç kir!
-      updated_msg: Daxûyanî bi awayekî serkeftî hate rojanekirin!
-    custom_emojis:
-      assign_category: Diyarkirina beşê
-      by_domain: Navper
-      copied_msg: Jêgirtiyê emojî ya herêmî bi serkeftî hate afirandin
-      copy: Jê bigire
-      copy_failed_msg: Jêgirtiyêke emojî ya herêmî nehate afirandin
-      create_new_category: Beşêke nû biafirîne
-      created_msg: Hestok bi serkeftî hate çêkirin!
-      delete: Jê bibe
-      destroyed_msg: Hestok bi serkeftî hate rûxandin!
-      disable: Neçalak bike
-      disabled: Neçalakkirî
-      disabled_msg: Ev hestok bi serkeftî hate neçalak kirin
-      emoji: Emoji
-      enable: Çalak bike
-      enabled: Çalakkirî
-      enabled_msg: Ev hestok bi serkeftî hate çalak kirin
-      image_hint: Mezinahiya pelê PNG heya 50Kb te
-      list: Rêzok
-      listed: Rêzokkirî
-      new:
-        title: Hestokên kesane yên nû lê zêde bike
-      not_permitted: Mafê te tune ku tu vê çalakiyê bikî
-      overwrite: Bi ser de binivsîne
-      shortcode: Kurtekod
-      shortcode_hint: Herê kêm 2 tîp, tenê tîpên alfahejmarî û yên bin xêzkirî
-      title: Hestokên kesane
-      uncategorized: Bêbeş
-      unlist: Dervî rêzokê
-      unlisted: Nerêzokkirî
-      update_failed_msg: Ev hestok nehate rojanekirin
-      updated_msg: Emojî bi awayekî serkeftî hate rojanekirin!
-      upload: Bar bike
-    dashboard:
-      active_users: bikarhênerên çalak
-      interactions: têgerîn
-      media_storage: Bîrdanaka medyayê
-      new_users: bikarhênerên nû
-      opened_reports: ragihandin hatin vekirin
-      pending_reports_html:
-        one: "<strong>1</strong> ragihandin benda nirxandinê"
-        other: "<strong>%{count}</strong> ragihandin benda nirxandinê"
-      pending_tags_html:
-        one: "<strong>1</strong> hashtag benda nirxandinê"
-        other: "<strong>%{count}</strong> hashtag benda nirxandinê"
-      pending_users_html:
-        one: "<strong>1</strong> bikarhêner benda nirxandinê"
-        other: "<strong>%{count}</strong> bikarhêner benda nirxandinê"
-      resolved_reports: ragihandinên çareserkirî
-      software: Nermalav
-      sources: Çavkaniyên tomarkirî
-      space: Bikaranîna cîh
-      title: Destgeha venasînê
-      top_languages: Zimanên herî çalak
-      top_servers: Rajekarên herî çalak
-      website: Malpera tevnê
-    domain_allows:
-      add_new: Maf bide navpera federasyonê
-      created_msg: Ji bo federasyonê maf dayîna navperê bi serkeftî hate dayîn
-      destroyed_msg: Ji bo federasyonê maf dayîna navperê nehat dayîn
-      undo: Maf nede navpera federasyonê
-    domain_blocks:
-      add_new: Astengkirina navpera nû
-      created_msg: Navpera asteng kirinê nû hat şixulandin
-      destroyed_msg: Navpera asteng kirinê hat rakirin
-      domain: Navper
-      edit: Astengkirina navperê serrast bike
-      existing_domain_block_html: Te bi bandorê mezin sînor danî ser %{name}, Divê tu <a href="%{unblock_url}"> asteng kirinê rabikî, pêşî ya </a>.
-      new:
-        create: Astengkirinekê çê bike
-        hint: Navpera asteng kirî pêşî li çê kirina têketinên ajimêra ên di danegehê da negire, lê dê bi paş ve bizivirin û bi xweberî va ji ajimêran bi teybetî kontrola rêbazan bikin.
-        severity:
-          desc_html: |-
-            <strong>Bêdeng kirî</strong> ajimêrên wusa çêkirine xêncî şopînerên vê kes nikare şandîyên vê bibîne.
-            <strong>rawestî</strong> ajimêrên wusa çêkirine hemî naveroka, medya û daneyên profîlê jê bibe. Heke tu bixwazî pelên medyayê red bikî<strong>yek ji wan</strong>bi kar bîne.
-          noop: Ne yek
-          silence: Bêdengî
-          suspend: Dur bike
-        title: Astengkirina navpera nû
-      obfuscate: Navê navperê biveşêre
-      obfuscate_hint: Heke rêzoka sînorên navperê were çalakkirin navê navperê di rêzokê de bi qismî veşêre
-      private_comment: Şîroveya taybet
-      private_comment_hint: Derbarê sînorkirina vê navperê da ji bo bikaranîna hundirîn a moderatoran şîrove bikin.
-      public_comment: Şîroveya gelemperî
-      public_comment_hint: Heke reklamkirina rêzoka sînorên navperê çalak be, derbarê sînorkirina vê navperê da ji bo raya giştî şîrove bikin.
-      reject_media: Pelên medyayê red bike
-      reject_media_hint: Pelên medyayê herêmî hatine tomarkirin radike û di pêşerojê de daxistinê red dike. Ji bo rawstandinê ne girîng e
-      reject_reports: Ragihandinan red bike
-      reject_reports_hint: Ragihandinên ku ji vê navperê tê paşguh bike. Ji bo dûrbûnê re ne guncav e
-      rejecting_media: pelên medyayê red bike
-      rejecting_reports: ragihandinê red bike
-      severity:
-        silence: sînorkirî
-        suspend: hatiye rawestandin
-      show:
-        affected_accounts:
-          one: Yek ajimêr di danegehê de bandor kir
-          other: "%{count} ajimêr di danegehê de bandor kir"
-        retroactive:
-          silence: Vê navperê de sînorê li ser hemî ajimêran rabike
-          suspend: Vê navperê de rawestandinê li ser hemî ajimêran rabike
-        title: Ji bo navperê %{domain} asteng kirinê hilde
-        undo: Vegerîne
-      undo: Astengkirina navperê vegerîne
-      view: Astengkirina navperê nîşan bike
-    email_domain_blocks:
-      add_new: Nû tevlî bike
-      created_msg: Bi serkeftî navpera e-name hat asteng kirin
-      delete: Jê bibe
-      destroyed_msg: Bi serkeftî navpera e-name yê ji asteng kirinê derket
-      domain: Navper
-      empty: Tu navperên e-nameyê astengkirî bo niha tune ne.
-      from_html: ji %{domain}
-      new:
-        create: Navper tevlî bike
-        title: Navparê e-nameyê nû asteng bike
-      title: Navparên e-nameyê astengkirî
-    follow_recommendations:
-      description_html: "<strong>Şopandina pêşniyaran ji bo bikarhênerên nû re dibe alîkar ku zû naveroka balkêş bibînin</strong>. Gava ku bikarhênerek têra xwe bi kesên din re têkildar nebê da ku pêşnîyarên şopandina yên kesane bo xwe çêbike, li şûna van ajimêran têne pêşniyarkirin. Ew her roj ji tevliheviya ajimêrên bi tevlêbûnên herî dawîn ên herî bilind û jimara şopdarên herêmî yên herî pir ji bo zimaneke diyarkirî ji nû ve têne pêşniyarkirin."
-      language: Bo zimanê
-      status: Rewş
-      suppress: Bi bandorek mezin pêşniyara şopandinê bike
-      suppressed: Bandoreke mezin dibe
-      title: Pêşniyarên şopandinê
-      unsuppress: Pêşniyara şopandinê paşve vegerîne
-    instances:
-      back_to_all: Hemû
-      back_to_limited: Sînorkirî
-      back_to_warning: Hişyarî
-      by_domain: Navper
-      delivery:
-        all: Hemû
-        clear: Çewtiyên gihandinê paqij bike
-        restart: Gihandinê nû va bike
-        stop: Gehandinê rawestîne
-        title: Gihiştin
-        unavailable: Nederbasdar
-        unavailable_message: Gihandin berdest nîne
-        warning: Hişyarî
-        warning_message:
-          one: Sernekeftina radestkirinê %{count} roj
-          other: Sernekeftina radestkirinê %{count} roj
-      delivery_available: Gihandin berdest e
-      delivery_error_days: Rojên çewtiyên gehandinê
-      delivery_error_hint: Ger gehandin %{count} rojan ne pêkan be ewê wek bixweber wê nayê gehandin were nîşandan.
-      empty: Tu navper nehatine dîtin.
-      known_accounts:
-        one: "%{count} ajimêra naskirî"
-        other: "%{count} ajimêrên naskirî"
-      moderation:
-        all: Hemû
-        limited: Sînorkirî
-        title: Çavdêrî
-      private_comment: Şîroveya taybet
-      public_comment: Şîroveya ji hemû kesî re vekirî
-      title: Giştî
-      total_blocked_by_us: Ji aliyê me ve hatiye astengkirin
-      total_followed_by_them: Ji aliyê wan ve hatiye şopandin
-      total_followed_by_us: Ji aliyê ve me hate şopandin
-      total_reported: Giliyên derheqê wan de
-      total_storage: Pêvekên medyayê
-    invites:
-      deactivate_all: Hemûyan neçalak bike
-      filter:
-        all: Hemû
-        available: Heye
-        expired: Dema wê qediya
-        title: Parzûn
-      title: Vexwendin
-    ip_blocks:
-      add_new: Rêbaz çê bike
-      created_msg: Rêzika nû a IPyê bi awayekî serkeftî hat tevlêkirin
-      delete: Jê bibe
-      expires_in:
-        '1209600': 2 hefte
-        '15778476': 6 meh
-        '2629746': 1 meh
-        '31556952': 1 sal
-        '86400': 1 roj
-        '94670856': 3 sal
-      new:
-        title: Rêzika nû a IPyê çêbike
-      no_ip_block_selected: Ji ber ku tu ajimêr nehat hilbijartin tu rêzika IPyê nehate guhertin
-      title: Rêbazên IP
-    pending_accounts:
-      title: Ajimêrên di dorê de ne (%{count})
-    relationships:
-      title: Têkiliyên %{acct}
-    relays:
-      add_new: Guhêrkerê nû tevlê bike
-      delete: Jê bibe
-      description_html: "<strong>Guhêrkerê giştî</strong> rajekareke navberkar e ku hejmareke mezin ji şandiyan di navbera rajekaran ku jê re dibin endam û weşanê dikin diguherîne. <strong> Ew dikare ji rajekarên piçûk û navîn re bibe alîkar ku naveroka ji fendiverse </strong>ê bibîne, ku bi rengeke din pêdivî dike ku bikarhênerên herêmî bi desta li dû kesên din ên li rajekarên ji dûr be bişopînin."
-      disable: Neçalak bike
-      disabled: Neçalakkirî
-      enable: Çalak bike
-      enable_hint: Gava were çalakkirin, rajekara te dê ji hemî şandiyên giştî yên vê guhêrkerê re bibe endam, û dê dest bi şandina şandiyên giştî yên vê rajekarê bike.
-      enabled: Çalakkirî
-      inbox_url: URLa guhêrker
-      pending: Li benda pêjirandina guhêrker e
-      save_and_enable: Tomar û çalak bike
-      setup: Girêdanekê guhêrker saz bike
-      signatures_not_enabled: Dema ku moda ewle ya jî moda rêzoka spî çalak be guhêrker wê birêkûpêk nexebite
-      status: Rewş
-      title: Guhêrker
-    report_notes:
-      created_msg: Nîşeyê ragihandinê bi awayekî serkeftî pêk hat!
-      destroyed_msg: Nîşeyê ragihandinê bi awayekî serkeftî hate jêbirin!
-    reports:
-      account:
-        notes:
-          one: "%{count} nîşe"
-          other: "%{count} nîşe"
-        reports:
-          one: "%{count} gilî"
-          other: "%{count} gilî"
-      action_taken_by: Çalakî hate kirin ji aliyê
-      are_you_sure: Gelo tu bawerî?
-      assign_to_self: Bo min diyar bike
-      assigned: Çavdêrê diyarkirî
-      comment:
-        none: Ne yek
-      created_at: Hate ragihandin
-      forwarded: Beralîkirî
-      forwarded_to: Beralîkirî bo %{domain}
-      mark_as_resolved: Wekî çareserkirî nîşan bide
-      mark_as_unresolved: Wekî neçareserkirî nîşan bide
-      notes:
-        create: Nîşe tevlî bike
-        create_and_resolve: Bi nîşe re çareser bike
-        create_and_unresolve: Bi nîşe re dîsa veke
-        delete: Jê bibe
-        placeholder: Bide nasîn ka çi çalakî hatine kirin, an jî heman rojanekirinên din ên têkildar...
-      reopen: Ragihandina ji nû ve veke
-      report: "@%{id} Ragihîne"
-      reported_account: Ajimêra ragihandî
-      reported_by: Ragihandî ji aliyê
-      resolved: Çareserkirî
-      resolved_msg: Ragihandin bi awayekî serkeftî hate çareserkirin!
-      status: Rewş
-      target_domain: Navperê ya ajimêrê ragihandî
-      target_origin: Jêdera ajimêrê ragihandî
-      title: Ragihandinên
-      unassign: Diyar neke
-      unresolved: Neçareserkirî
-      updated_at: Rojanekirî
-    rules:
-      add_new: Rêbazekê tevlî bike
-      delete: Jê bibe
-      description_html: Dema ku piranîya dibêjin ku wan merçên karanînê xwendine û dipejirînin jî, bi gelemperî mirov heta ku pirsgirêkek dernekeve holê naxwîne. <strong> Bi peydakirina wan di navnîşek xala guleya rast de hêsantir bike ku tu rêbazên rajekera xwe li ser çavekî bibîne.</strong> Hewl bide ku rêbazênn yekkesî kurt û hêsan bihêlî, lê hewl bide ku wan tênexî gelek hêmanên cuda jî.
-      edit: Rêbazê serrast bike
-      empty: Tu rêbazên rajekar hê nehatine dîyarkirin.
-      title: Rêbazên rajekar
-    settings:
-      activity_api_enabled:
-        desc_html: Hejmara şandiyên weşandî yên herêmî, bikarhênerên çalak, û tomarkirin ên nû heftane
-        title: Tevahî amarên  ên di derbarê çalakiya bikarhêneran de biweşîne
-      bootstrap_timeline_accounts:
-        desc_html: Navên bikarhênerên pir bi xalîçê veqetîne. Dê van ajimêran di pêşnîyarên jêrîn de werin xuyakirin
-        title: Van ajimêran ji bikarhênerên nû re pêşniyar bike
-      contact_information:
-        email: E-nameya karsazî
-        username: Bi bikarhêner re têkeve têkiliyê
-      custom_css:
-        desc_html: Bi CSS a ku li her rûpelê hatiye barkirin, awayê dîmenê biguherîne
-        title: CSS a kesanekirî
-      default_noindex:
-        desc_html: Hemû bikarhênerên ku ev sazkarî bi xwe neguhertiye bandor dike
-        title: Pêlrêçkirna bikarhêneran ji motorê lêgerînê dûr bixe
-      domain_blocks:
-        all: Bo herkesî
-        disabled: Bo tu kesî
-        title: Astengkirinên navperê nîşan bide
-        users: Ji bo bikarhênerên herêmî yên xwe tomar kirine
-      domain_blocks_rationale:
-        title: Sedemê nîşan bike
-      hero:
-        desc_html: Li ser rûpela pêşîn tê xuyakirin. Bi kêmanî 600x100px tê pêşniyarkirin. Dema ku neyê sazkirin, vedigere ser dîmena wêneya piçûk a rajekar
-        title: Wêneya lehengê
-      mascot:
-        desc_html: Li ser rûpela pêşîn tê xuyakirin. Bi kêmanî 293×205px tê pêşniyarkirin. Dema ku neyê sazkirin, vedigere ser dîmena wêneya piçûk a maskot ya heyî
-        title: Wêneya maskot
-      peers_api_enabled:
-        desc_html: Navê navperên ku ev rajekar di fendiverse de rastî wan hatiye
-        title: Rêzoka rajekarên hatiye dîtin di API-yê de biweşîne
-      preview_sensitive_media:
-        desc_html: Pêşdîtinên girêdanê yên li ser malperên din tevlî ku medya wekî hestyar hatiye nîşandan wê wekî wêneyekî piçûk nîşan bide
-        title: Medyayê hestyar nîşan bide di pêşdîtinên OpenGraph de
-      profile_directory:
-        desc_html: Mafê bide bikarhêneran ku bêne vedîtin
-        title: Pelrêçên profilê çalak bike
-      registrations:
-        closed_message:
-          desc_html: Gava ku tomarkirin têne girtin li ser rûpelê pêşîn têne xuyang kirin. Tu dikarî nîşanên HTML-ê bi kar bîne
-          title: Tomarkirinê girtî ya peyaman
-        deletion:
-          desc_html: Maf bide ku herkes bikaribe ajimêrê te jê bibe
-          title: Jê birina ajimêrê vekek
-        min_invite_role:
-          disabled: Ne yek
-          title: Maf bide vexwendinên ji alîyê
-        require_invite_text:
-          desc_html: Gava ku tomarkirin pêdiviya pejirandina destan dike, Têketina nivîsê "Tu çima dixwazî beşdar bibî?" Bibe sereke ji devla vebijêrkî be
-          title: Ji bo bikarhênerên nû divê ku sedemek tevlêbûnê binivîsinin
-      registrations_mode:
-        modes:
-          approved: Ji bo têketinê erêkirin pêwîste
-          none: Kesek nikare tomar bibe
-          open: Herkes dikare tomar bibe
-        title: Awayê tomarkirinê
-      show_known_fediverse_at_about_page:
-        desc_html: Dema ku neçalak be, demnameya gerdûnî ya ku ji rûpela zeviyê ve hatî girêdan tenê bi nîşandana naveroka herêmî tên sînorkirin
-        title: Li ser rûpela demnameya ne naskirî naveroka giştî nîşan bide
-      show_staff_badge:
-        desc_html: Di rûpela bikarhêner da rozeta xebatkaran nîşan bike
-        title: Rozeta xebatkara nîşan bike
-      site_description:
-        desc_html: Paragrafa destpêkê li ser API. Dide nasîn ka çi ev rajekarê Mastodon taybet dike û tiştên din ên girîn. Tu dikarî hashtagên HTML-ê, bi kar bîne di <code>&lt;a&gt;</code> û <code>&lt;em&gt;</code> de.
-        title: Danasîna rajekar
-      site_description_extended:
-        desc_html: Ji bo kodê perwerdetî, rêzik, rêbername û tiştên din ên ku rajekara te ji hev cihê dike cîhekî baş e. Tu dikarî hashtagên HTML-ê bi kar bîne
-        title: Zanyarên berfirehkirî ya rajekar
-      site_short_description:
-        desc_html: Ew di alavdanka kêlekê û tagên meta de tên xuyakirin. Di yek paragrafê de rave bike ka Mastodon çi ye û ya ku ev rajekar taybetî dike.
-        title: Danasîna rajekarê kurt
-      site_terms:
-        desc_html: Tu dikarî polîtika nihêniyê xwe, mercên karûbar an nameyên din binvisîne. Tu dikarî nîşanên HTML-ê bi kar bîne
-        title: Mercên bikaranîn a kesanekirî
-      site_title: Navê rajekar
-      thumbnail:
-        desc_html: Ji bo pêşdîtinên bi riya OpenGraph û API-yê têne bikaranîn. 1200x630px tê pêşniyar kirin
-        title: Wêneya piçûk a rajekar
-      timeline_preview:
-        desc_html: Girêdana demnameya gelemperî li ser rûpela daxistinê nîşan bide û mafê bide ku API bêyî rastandinê bigihîje damnameya gelemperî
-        title: Mafê bide gihîştina ne naskirî bo demnameya gelemperî
-      title: Sazkariyên malperê
-      trendable_by_default:
-        desc_html: Hashtagên ku berê hatibûn qedexekirin bandor dike
-        title: Bihêle ku hashtag bêyî nirxandinek pêşîn bibe rojev
-      trends:
-        desc_html: Hashtagên ku berê hatibûn nirxandin ên ku niha rojev in bi gelemperî bide xuyakirin
-        title: Hashtagên rojevê
-    site_uploads:
-      delete: Pela barkirî jê bibe
-      destroyed_msg: Barkirina malperê bi serkeftî hate jêbirin!
-    statuses:
-      back_to_account: Vegere bo rûpela ajimêr
-      batch:
-        delete: Jê bibe
-        nsfw_off: Wekî ne hestiyar nîşan bide
-        nsfw_on: Wekî hestiyar nîşan bide
-      deleted: Hate jêbirin
-      failed_to_execute: Bi ser neket
-      media:
-        title: Medya
-      no_media: Medya nîne
-      no_status_selected: Tu şandî nehat hilbijartin ji ber vê tu şandî jî nehat guhertin
-      title: Şandiyên ajimêr
-      with_media: Bi medya yê re
-    system_checks:
-      database_schema_check:
-        message_html: Koçberiyên databasê yên li bendê hene. Ji kerema xwe wan bişopîne da ku bicîh bikî ku sepan wekî ku tê hêvî kirin tevbigere
-      rules_check:
-        action: Rêzikên rajekara bi rê ve bibe
-        message_html: Te qet rêzikên rajekara diyar nekiriye.
-      sidekiq_process_check:
-        message_html: Pêvajoyên Sidekiq ên heyî ji bo %{value} di rêz (an) de tune ne. Ji kerema xwe sazkariyên Sidekiq a xwe binirxîne
-    tags:
-      accounts_today: Bikaranînên bêhempa yên îro
-      accounts_week: Bikaranînên bêhempa yên vê heftê
-      breakdown: Dabeşkirina bikaranîn yên îro li gorî çavkaniyan ve
-      last_active: Çalakiyên dawî
-      most_popular: Herî navdar
-      most_recent: Çalakiyên herî nû
-      name: Hashtag
-      review: Binêre rewşê
-      reviewed: Hate vekolandin
-      title: Hashtag
-      trending_right_now: Niha di rojevê de
-      unique_uses_today: "%{count} şandiyên îro"
-      unreviewed: Nehatiye nirxandin
-      updated_msg: Sazkariyên hashtag bi awayekî serkeftî hate rojanekirin
-    title: Rêvebirî
-    warning_presets:
-      add_new: Yeka nû tevlî bike
-      delete: Jê bibe
-      edit_preset: Hişyariyên pêşsazkirî serrast bike
-      empty: Te hin tu hişyariyên pêşsazkirî destnîşan nekirine.
-      title: Hişyariyên pêşsazkirî bi rêve bibe
-  admin_mailer:
-    new_pending_account:
-      body: Zanyariyênn ajimêra nû li jêr in. Tu dikarî vê serîlêdanê bipejirîne an pûç bike.
-      subject: "(%{username}) ajimêrê nû ji bo vekolandina li ser %{instance}"
-    new_report:
-      body: "%{reporter} ji %{target} ê ragihand"
-      body_remote: Kesekî bi navê %{domain} ji %{target} ê ragihand
-      subject: Ragihandinek nû ji bo %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Hashtaga #%{name} îro rojev e, lê berê nehatibû nirxandin. Heya ku tu mafê nedît, ew ê bi gelemperî neyê xuyang kirin, an jî tenê formê tomar bike ku ew e ku tu careke din li ser wê tiştekî nebîne.'
-      subject: "(#%{name}) Hashtagek nû ji bo vekolandina li ser%{instance}"
-  aliases:
-    add_new: Naveke sexte çê bike
-    created_msg: Bi serkeftî nûçikê nû hat çêkirin. Tu niha dikarî di ajimêrê xwe kevn bar bikî.
-    deleted_msg: Nûçik bi serkeftî hat rakirin. Êdî nepêkan e vê ajimêrê de barkirina ajimêrek din.
-    empty: Nûçikên te tune ne.
-    hint_html: Heke tu dixwazî ji ajimêreke din bar bike bo yekî din, li vir tu dikarî bernavekê biafirîne, ku pêdivî ye berî ku tu bi şopandina şopînerên xwe ji ajimêra kevn ber bi vê yekê biçe. Ev çalakî bi serê xwe <strong>bê ziyan û vegere</strong>.<strong>Koçberiya ajimêr ji ajimêreke kevin dest pê dike</strong>.
-    remove: Girêdana nûçikê rake
-  appearance:
-    advanced_web_interface: Navrûya tevnê yê pêşketî
-    advanced_web_interface_hint: 'Heke tu bixwazin tevahiya ferehiya dîmendera xwe bi kar bînî, navrûya pêşketî ya tevnê dihêle ku tu gelek stûnên cihêreng saz bikî da ku di heman demê de bi qasî ku tu dixwazî zanyariyan bibînî: Serrûpel, agahdarî, demnameya giştî, her hejmarek ji rêzik û hashtagan.'
-    animations_and_accessibility: Anîmasyon û gihînî
-    confirmation_dialogs: Gotûbêjên piştrastkirî
-    discovery: Vedîtin
-    localization:
-      body: Mastodon ji aliyê xêrxwazan tê wergerandin.
-      guide_link: https://crowdin.com/project/mastodon
-      guide_link_text: Herkes dikare beşdar bibe.
-    sensitive_content: Naveroka hestiyarî
-    toot_layout: Xêzkirina şandîya
-  application_mailer:
-    notification_preferences: Hevyazên e-name yê biguherîne
-    salutation: "%{name},"
-    settings: 'Hevyazên e-name yê biguherîne: %{link}'
-    view: 'Nîşan bide:'
-    view_profile: Profîlê nîşan bide
-    view_status: Şandiyê nîşan bide
-  applications:
-    created: Sepan bi awayekî serkeftî hat çêkirin
-    destroyed: Sepan bi awayekî serkeftî hat jêbirin
-    invalid_url: URL ya hatiye dayîn ne derbasdar e
-    regenerate_token: Nîşandera gihandinê bi nûve çêbike
-    token_regenerated: Nîşandera gihandinê bi serkeftî nû ve hat çêkirin
-    warning: Bi van daneyan re pir baldar be. Tu caran bi kesî re parve neke!
-    your_token: Nîşana gihîştina te
-  auth:
-    apply_for_account: Daxwaza vexwendinekê bike
-    change_password: Pêborîn
-    checkbox_agreement_html: Ez <a href="%{rules_path}" target="_blank">rêbazên rajeker</a> û <a href="%{terms_path}" target="_blank">hêmanên karûbaran</a> dipejirînim
-    checkbox_agreement_without_rules_html: Ez <a href="%{terms_path}" target="_blank">hêmanên karûbaran</a> rêbazên rajeker dipejirînim
-    delete_account: Ajimêr jê bibe
-    delete_account_html: Heke tu dixwazî ajimêra xwe jê bibe, tu dikarî <a href="%{path}">li vir bidomîne</a>. Ji te tê xwestin ku were pejirandin.
-    description:
-      prefix_invited_by_user: "@%{name} te vedixwîne ku tu beşdarî vê rajekara Mastodon-ê bibî!"
-      prefix_sign_up: Îro li Mastodonê tomar bibe!
-      suffix: Bi ajimêrekê, tu yê karibî kesan bişopînî, rojanekirinan bişînî û bi bikarhênerên ji her rajekarê Mastodon re peyaman bişînî û bêhtir!
-    didnt_get_confirmation: Te rêwerzên pejirandinê wernegirt?
-    dont_have_your_security_key: Kilîda te ya ewlehiyê tune ye?
-    forgot_password: Te pêborîna xwe jibîrkir?
-    invalid_reset_password_token: Ji nû ve sazkirina pêborînê nederbasdar e an jî qediya ye. Jkx daxwaza yeka nû bike.
-    link_to_otp: Ji têlefona xwe an jî ji kodeke rizgarkirinê kodeke du-gavî binivîsine
-    link_to_webauth: Amûra kilîta ewlehiya xwe bi kar bîne
-    login: Têkeve
-    logout: Derkeve
-    migrate_account: Derbasî ajimêreke din bibe
-    migrate_account_html: Heke tu dixwazî ev ajimêr li ajimêreke cuda beralî bikî, tu dikarî <a href="%{path}">ji vir de saz bike</a>.
-    or_log_in_with: An têketinê bike bi riya
-    providers:
-      cas: CAS
-      saml: SAML
-    register: Tomar bibe
-    registration_closed: "%{instance} endamên nû napejirîne"
-    resend_confirmation: Rêwerên pejirandinê ji nû ve bişîne
-    reset_password: Pêborînê ji nû ve saz bike
-    security: Ewlehî
-    set_new_password: Pêborîneke nû ji nû ve saz bike
-    setup:
-      email_below_hint_html: Heke navnîşana e-nameya jêrîn ne rast be, tu dikarî wê li vir biguherîne û e-nameyeke pejirandinê ya nû bistîne.
-      email_settings_hint_html: E-nameya pejirandinê ji %{email} re hate şandin. Heke ew navnîşana e-nameyê ne rast be, tu dikarî wê di sazkariyên ajimêr de biguherîne.
-      title: Damezirandin
-    status:
-      account_status: Rewşa ajimêr
-      confirming: Li benda pejirandina e-nameyê ne da ku biqede.
-      functional: Ajimêra te êdî amade ye.
-      pending: Daxwaza te li benda vekolînê ji hêla xebatkarên me ye. Ev dibe ku hinek dem bigire. Heke daxwaza te were pejirandin tu yê e-nameyekê bistîne.
-      redirecting_to: Ajimêra te neçalak e ji ber ku niha ber bi %{acct} ve tê beralîkirin.
-    too_fast: Form pir zû hat şandin, dîsa biceribîne.
-    trouble_logging_in: Têketina te de pirsgirêk çêdibe?
-    use_security_key: Kilîteke ewlehiyê bikar bîne
-  authorize_follow:
-    already_following: Jixwe tu vê ajimêrê dişopînî
-    already_requested: Jixwe te ji vê ajimêrê re daxwazîya şopandinê şandi bû
-    error: Mixabin, dema ajimêr hat gerandin çewtiyek çêbû
-    follow: Bişopîne
-    follow_request: 'Te ji vê kesê re daxwazîya şopandinê şand:'
-    following: 'Serkeftin! Tu êdî dikarî bişopînî:'
-    post_follow:
-      close: An jî, tu dikarî tenê ev çarçoveyê bigirî.
-      return: Profîla vê bikarhênerê nîşan bike
-      web: Biçe tevneyê
-    title: Bişopîne %{acct}
-  challenge:
-    confirm: Bidomîne
-    hint_html: "<strong>Nîşe:</strong>Ji bo demjimêreke din em ê pêborîna te careke din ji te nexwazin."
-    invalid_password: Pêborîna nederbasdar
-    prompt: Ji bo bidomî lêborînê bipejirîne
-  crypto:
-    errors:
-      invalid_key: ed25519 ne derbasdare ne jî Curve25519 kilîta
-      invalid_signature: Ed25519 ne îmzeyek derbasdar e
-  date:
-    formats:
-      default: "%b%d%Y"
-      with_month_name: "%B %d, %Y"
-  datetime:
-    distance_in_words:
-      about_x_hours: "%{count}d"
-      about_x_months: "%{count}meh"
-      about_x_years: "%{count}sal"
-      almost_x_years: "%{count}sal"
-      half_a_minute: Hema niha
-      less_than_x_minutes: "%{count}xulek"
-      less_than_x_seconds: Hema niha
-      over_x_years: "%{count}sal"
-      x_days: "%{count}roj"
-      x_minutes: "%{count}xulek"
-      x_months: "%{count}meh"
-      x_seconds: "%{count}çirke"
-  deletes:
-    challenge_not_passed: Zanyariyên ku te nivîsandî ne rast in
-    confirm_password: Pêborîna xwe ya heyî binivîsine da ku nasnameya xwe piştrast bikî
-    confirm_username: Navê bikarhêneriyê xwe binivîse da ku prosedurê piştrast bike
-    proceed: Ajimêr jê bibe
-    success_msg: Ajimêra te bi serkeftî hate jêbirin
-    warning:
-      before: 'Berî ku tu pêşve biçî, jkx nvan nîşeyan bi baldarî bixwîne:'
-      caches: Naveroka ku ji hêla rajekarên din ve hatiye pêşbîrkirin dibe ku bimîne
-      data_removal: Şandiyên te û daneyên din wê bi awayekî dawî bêne rakirin
-      email_change_html: Tu dikarî navnîşana <a href="%{path}"> e-nameya xwe biguherînî </a> bêyî ku tu ajimêra xwe jê bibî
-      email_contact_html: Heke ew hîn jî negihîştiye, tu dikarî ji bo alîkariyê <a href="mailto:%{email}">%{email}</a> e-nameyê bişînî
-      email_reconfirmation_html: Heke te e-nameya pejirandinê nesitand, tu dikarî <a href="%{path}">dîsa daxwaz bike</a>
-      irreversible: Tu yê nikaribe ajimêra xwe serrast bike an ji nû ve çalak bike
-      more_details_html: Bo bêhtir zanyarî, <a href="%{terms_path}">polîtika nihêniyê</a> binêre.
-      username_available: Navê bikarhêneriyê te wê dîsa peyda bibe
-      username_unavailable: Navê bikarhêneriyê ye wê tuneyî bimîne
-  directories:
-    directory: Rêgeha profîlê
-    explanation: Bikarhêneran li gorî berjewendiyên wan bibîne
-    explore_mastodon: Vekole %{title}
-  domain_validator:
-    invalid_domain: ne naveke navper a derbasdar e
-  errors:
-    '400': Daxwaza ku te şand nederbasdar an çewt bû.
-    '403': Ji bo dîtina vê rûpelê mafê te nîn e.
-    '404': Rûpela ku tu lê digerî ne li vir e.
-    '406': Ev rûpel di awayê ku tê xwestin de peyda nabe.
-    '410': Ew rûpela ku tu lê digeriya êdî li vir nîne.
-    '422':
-      content: Rastekirina ewlehiyê têk çû. Ma tu kiloran asteng dikî?
-      title: Rastekirina ewlehiyê têk çû
-    '429': Gelek daxwazî
-    '500':
-      content: Em xemgîn in, lê tiştek di aliyê me de şaş çû.
-      title: Ev rûpel ne rast e
-    '503': Ji ber têkçûna rajekar a demkî rûpel nayê bikaranîn.
-    noscript_html: Ji bo ku tu sepanaa Mastodon a tevnê bi kar bîne, jkx JavaScript-ê çalak bike. Wekî din, yek ji <a href="%{apps_path}">sepanên xwemalî</a> ji bo Mastodon ji bo platforma xwe biceribîne.
-  existing_username_validator:
-    not_found: nikaribû bikarhênerek herêmî bi wê navê bikarhêner bibîne
-    not_found_multiple: "%{usernames} nehat dîtin"
-  exports:
-    archive_takeout:
-      date: Dem
-      download: Arşîva xwe daxîne
-      hint_html: Tu dikarî arşîvek ji <strong> weşanên xwe û medyayên barkirî </strong> re bixwaze. Daneyên derxistî dê di forma ActivityPub de bin, ku ji hêla nermalava ku vê formê ve têne xwendin. Tu dikarî her 7 rojan arşîvekê bixwaze.
-      in_progress: Arşîve te tê berhev kirin...
-      request: Daxwaza arşîva ajimêra xwe bike
-      size: Mezinahî
-    blocks: Yên te astengkirî
-    bookmarks: Şûnpel
-    csv: CSV
-    domain_blocks: Navperên astengkirî
-    lists: Rêzok
-    mutes: Te bêdeng kir
-    storage: Bîrdanaka medyayê
-  featured_tags:
-    add_new: Yeka nû tevlî bike
-    errors:
-      limit: Te jixwe berê pirtirîn hashtag destnîşan kiriye
-    hint_html: "<strong> Hashtagên destnîşankirî çi ne? </strong> Ew bi eşkere li ser profîla te ya gelemperî têne xuyakirin û dihêlin ku mirov bi taybetî di binê wan hashtagan de li şandiyên te yên gelemperî bigere. Ew ji bo şopandina karên afirîner an projeyên demdirêj amûrek girîng in."
-  filters:
-    contexts:
-      account: Profîl
-      home: Serrûpel û rêzok
-      notifications: Agahdarî
-      public: Demnameya gelemperî
-      thread: Axaftin
-    edit:
-      title: Parzûnê serrast bike
-    errors:
-      invalid_context: Naverok tune ye yan jî nederbasdar tê peydakirin
-      invalid_irreversible: Tenê qadên agahdarkirinê û serrûpel bi parzûna bêveger re dixebitin
-    index:
-      delete: Jê bibe
-      empty: Parzûnên te tune ne.
-      title: Parzûn
-    new:
-      title: Parzûnek nû li zêde bike
-  footer:
-    developers: Pêşdebir
-    more: Bêtir…
-    resources: Çavkanî
-    trending_now: Niha rojevê de
-  generic:
-    all: Hemû
-    changes_saved_msg: Guhertin bi serkeftî tomar bû!
-    copy: Jê bigire
-    delete: Jê bibe
-    no_batch_actions_available: Di vê rûpelê da tu çalakîyên tevahî tune ne
-    order_by: Rêz bike bi
-    save_changes: Guhertinan tomar bike
-    validation_errors:
-      one: Tiştek hîn ne rast e! Ji kerema xwe çewtiya li jêr di ber çavan re derbas bike
-      other: Tiştek hîn ne rast e! Ji kerema xwe %{count} çewtî li jêr di ber çavan re derbas bike
-  html_validator:
-    invalid_markup: 'di nav de nîşana HTML a nederbasdar heye: %{error}'
-  identity_proofs:
-    active: Çalak
-    authorize: Erê, bide rastandin
-    authorize_connection_prompt: Tu dixwazî ev girêdana şîfrekirinê bidî rastandin?
-    errors:
-      failed: Girêdana şîfrekirinê têk çû. Ji kerema xwe dîsa biceribîne ji%{provider}.
-      keybase:
-        invalid_token: Nîşanên Keybase beşek ji îmzeyan in û divê 66 tîpên hex bin
-        verification_failed: Keybase vê wekî îmzeya bikarhênerê %{kb_username} nas nake. Ji kerema xwe ji Keybase dîsa biceribîne.
-      wrong_user: Dema ku wekî %{current} têketin dikî, ji bo %{proving} delîl nayê çêkirin. Wekî %{proving} têkeve û dîsa biceribîne.
-    explanation_html: Li vir tu dikarî nasnameyên xwe yên din ji platformên din, wek Keybase, bi şîfrekî ve girê bidî. Ev dihêle mirovên din ji te re peyamên şîfrekirî li ser wan platforman bişînin û dihêle ew pê bawer bin ku naveroka ku tu ji wan re dişînin ji te tê.
-    i_am_html: Ez %{username} li ser %{service}.
-    identity: Nasname
-    inactive: Neçalak e
-    publicize_checkbox: 'Û vê toot bike:'
-    publicize_toot: 'Hat eşkerekirin! Ez %{username} li ser %{service}: %{url}'
-    remove: Di ajimêrê de delîla rabike
-    removed: Delîl di ajimêrê de bi serkeftî hat rakirin
-    status: Piştrastkirina rewşê
-    view_proof: Delîlan nîşan bike
-  imports:
-    errors:
-      over_rows_processing_limit: ji %{count} zêdetir rêzok hene
-    modes:
-      merge: Bi hev re bike
-      merge_long: Tomarên heyî bigire û yên nû lê zêde bike
-      overwrite: Bi ser de binivsîne
-      overwrite_long: Tomarkirinên heyî bi yên nû re biguherîne
-    preface: Tu dikarî têxistin ê daneyên bike ku te ji rajekareke din derxistî ye wek rêzoka kesên ku tu dişopîne an jî asteng dike.
-    success: Daneyên te bi serkeftî hat barkirin û di dema xwe de were pêvajotin
-    types:
-      blocking: Rêzoka astengkirinê
-      bookmarks: Şûnpel
-      domain_blocking: Rêzoka navperên astengkirî
-      following: Rêzoka yên tên şopandin
-      muting: Rêzoka bêdengiyê
-    upload: Bar bike
-  in_memoriam_html: Di bîranînê de.
-  invites:
-    delete: Neçalak bike
-    expired: Dema wê qediya
-    expires_in:
-      '1800': 30 xulek
-      '21600': 6 demjimêr
-      '3600': 1 demjimêr
-      '43200': 12 demjimêr
-      '604800': 1 hefte
-      '86400': 1 roj
-    expires_in_prompt: Tu car
-    generate: Girêdana vexwendinê çê bike
-    invited_by: 'Tu hatî vexwendin ji hêla:'
-    max_uses:
-      one: 1 bikaranîn
-      other: "%{count} bikaranîn"
-    max_uses_prompt: Bê sînor
-    prompt: Girêdanan bi kesên din re çê bike û parve bike da ku bigihîjin vê rajekarê
-    table:
-      expires_at: Diqede
-      uses: Bikaranîn
-    title: Mirovan vexwîne
-  lists:
-    errors:
-      limit: Tu gihîştî hejmara rêzika a herî zêde
-  login_activities:
-    authentication_methods:
-      otp: sepandina rastandina du-gavî
-      password: pêborîn
-      sign_in_token: koda ewlehiyê bo e-nameyê
-      webauthn: kilîtên ewlehiyê
-    description_html: Heke çalakiya ku nas nakî dibînî, çêtir dibe ku pêborîna xwe biguherînî û rastandina du-gavî çalak bikî.
-    empty: Dîroka piştrastkirinê tune ye
-    failed_sign_in_html: Hewldana têketinê ser neket bi%{method} ji %{ip} (%{browser}) de
-    successful_sign_in_html: Bi serkeftî têketin bi %{method} ji %{ip}(%{browser}) çêbû
-    title: Dîroka piştrastkirinê
-  media_attachments:
-    validations:
-      images_and_video: Nikare vîdyoyekê tevlî şandiyê ku berê wêne tê de heye bike
-      not_ready: Nikare pelên ku pêvajo neqedandî ve girêbide. Di demekê de dîsa biceribîne!
-      too_many: Zedetirî 4 pelan nayê tevlêkirin
-  migrations:
-    acct: Hate lîvandin bo
-    cancel: Beralîkirinê red bike
-    cancel_explanation: Dev berdan ji beralîkirinê dê ajimêra te ya heyî ji nû ve çalak bike, lê şopgerên ku li wê ajimêrê hatine livandin venagerêne.
-    cancelled_msg: Beralîkirin bi serkeftî hate betal kirin.
-    errors:
-      already_moved: heman ajimêr e ku te berê lê bar kiriye ye
-      missing_also_known_as: ne nasnavê vê ajimêrê ye
-      move_to_self: nikare bibe ajimêra heyî
-      not_found: nehate dîtin
-      on_cooldown: Tu li ser sarbûnê yî
-    followers_count: Di dema tevgerê de şopîner
-    incoming_migrations: Derbasî ajimêreke din bibe
-    incoming_migrations_html: Ji bo ku tu ji ajimêrek din bar bikî vê yekê, pêşî divê tu <a href="%{path}">ajimêreke bi bernaveke çê bike </a>.
-    moved_msg: Ajimêrate niha li %{acct} tê rêve kirin (beralîkirin) û şopînerên te têne livandin bo wê.
-    not_redirecting: Ajimêra te niha bo ajimêreke din nayê beralîkirin.
-    on_cooldown: Te herî dawî dev ji ajimêra xwe berda. Ev fonksiyon dê di %{count} rojan de dîsa peyda bibe.
-    past_migrations: Koçên berê
-    proceed_with_move: Şopîneran bilivîne
-    redirected_msg: Ajimêra te niha bo %{acct} tê beralîkirin.
-    redirecting_to: Ajimêra te niha bo %{acct} tê beralîkirin.
-    set_redirect: Beralîkirin saz bike
-    warning:
-      backreference_required: Pêdivî ye ku ajimêra nû wekî referanseke paşîn a vê ajimêrê were sazkirin
-      before: 'Berî ku tu berdewam bikî, ji kerema xwe re van nîşaneyan bi baldarî bixwîne:'
-      cooldown: Piştî livandin demek heye ku di wê navberê de tu yê nikaribe dîsa bilive
-      disabled_account: Ajimêra te ya heyî dê paşê bi tevahî neyê bikaranîn. Lê belê, tu dikarî bigihîje derxistinê daneyan û hem jî ji nû ve çalakkirinê.
-      followers: Ev çalakî dê hemî şopînerên ji ajimêra heyî bar bike ajimêra nû
-      only_redirect_html: Wekî din, tu dikarî <a href="%{path}"> tenê beralîkirinekê li ser profîla xwe bicîh bike </a>.
-      other_data: Daneyên din dê bi xweberî neyên livandin
-      redirect: Profîla ajimêra te ya heyî dê bi nîşeyeke beralîkirinê were nûve kirin û ji lêgerînan were bi dûrxistin
-  moderation:
-    title: Çavdêrî
-  move_handler:
-    carry_blocks_over_text: Ev bikarhêner ji %{acct}, ku te astengkirî bû, bar kir.
-    carry_mutes_over_text: Ev bikarhêner ji %{acct}, ku te bê deng kirbû, bar kir.
-    copy_account_note_text: 'Ev bikarhêner ji %{acct} livî ye, li vir nîşeyên te yên berê ku te di derbarê wî/ê de nivîsandiye:'
-  notification_mailer:
-    digest:
-      action: Hemû agahdariyan nîşan bide
-      body: Li vir kurteyeke peyamên ku li te derbasbûnd ji serdana te ya dawîn di %{since} de
-      mention: "%{name} behsa te kir:"
-      new_followers_summary:
-        one: Herwiha, dema tu dûr bûyî te şopînerek nû bi dest xist! Bijî!
-        other: Herwiha, dema tu dûr bûyî te %{count} şopînerek nû bi dest xist! Bijî!
-      subject:
-        one: "1 agahdarî ji serdana te ya herî dawî ji \U0001F418"
-        other: "%{count} agahdarî ji serdana te ya herî dawî ji \U0001F418"
-      title: Di tunebûna te de...
-    favourite:
-      body: 'Şandiya te hate bijartin ji alî %{name} ve:'
-      subject: "%{name} şandiya te hez kir"
-      title: Bijarteyek nû
-    follow:
-      body: "%{name} niha te dişopîne!"
-      subject: "%{name} niha te dişopîne"
-      title: Şopînereke nû
-    follow_request:
-      action: Daxwazên şopandinê bi rê ve bibe
-      body: "%{name} daxwaza şopandina te kir"
-      subject: Şopîner li bendê ye:%{name}
-      title: Daxwazeke şopandinê ya nû
-    mention:
-      action: Bersivê bide
-      body: 'Tu hatiyî qalkirin ji aliyê %{name}:'
-      subject: Tu hatiye qalkirin ji aliyê %{name}
-      title: Qalkirina nû
-    poll:
-      subject: Rapirsî ji hêla %{name} ve qediya
-    reblog:
-      body: 'Şandiye te hate bilindkirin ji hêla %{name} ve:'
-      subject: "%{name} şandiya te bilind kir"
-      title: Bilindkirinên nû
-    status:
-      subject: "%{name} niha şand"
-  notifications:
-    email_events: Bûyer bo agahdariyên e-nameyê
-    email_events_hint: 'Bûyera ku tu dixwazî agahdariyan jê wergerî hilbijêre:'
-    other_settings: Sazkariya agahdariyên din
-  number:
-    human:
-      decimal_units:
-        format: "%n%u"
-        units:
-          billion: B
-          million: M
-          quadrillion: Q
-          thousand: Hezar
-          trillion: Trîlyon
-  otp_authentication:
-    code_hint: Ji bo pejirandinê têkeve koda te ya ku ji alîyê sepana piştraskirinê va hatiye çê kirin
-    description_html: Heke tu<strong>bi piştrastkirina du-faktorî re</strong> sepana piştrastkirinê çalak bikî, ji bo têketinê hewceye telefona te li ba te be, ji bona têketinê te ra nîşaneyan çê bike.
-    enable: Çalak bike
-    instructions_html: "<strong>Vê kodê QR kontrol bike bi riya Google Authenticator an jî sepanekeTOTP li ser têlefona xwe </strong>. Ji niha û pê ve, ew sepan dê nîşanên ku divê tu binivîsîne dema têketinê de biafirîne."
-    manual_instructions: 'Heke tu nikarî bî koda QR venêrî û pêwîst be bi dest bikevî, ev nivîsê hêsan ê veşartî:'
-    setup: Saz bike
-    wrong_code: Koda têketinê betal e! Dema rajekarê û dema amûrê raste?
-  pagination:
-    newer: Nûtir
-    next: Pêş
-    older: Kevntir
-    prev: Paş
-    truncate: "&hellip;"
-  polls:
-    errors:
-      already_voted: Te berê deng dabû vê rapirsîyê
-      duplicate_options: tiştên dubare tê de hene
-      duration_too_long: di pêşerojê de pir dûr e
-      duration_too_short: gelek zû ye
-      expired: Jixwe rapirsî dawî bû
-      invalid_choice: Vebijarka dengdanê ya bijartî tune
-      over_character_limit: her yek ji %{max} karakterê dirêjtirîn nabe
-      too_few_options: divê ji yekî zêdetir tişt hebin
-      too_many_options: nikare ji %{max} hêmanan bêhtir pêk bê
-  preferences:
-    other: Yên din
-    posting_defaults: Berdestên şandiyê
-    public_timelines: Demnameya gelemperî
-  reactions:
-    errors:
-      limit_reached: Sînorê reaksiyonên cihêrengî gihîşte asta dawî
-      unrecognized_emoji: emojîyeke ne naskirî ye
-  relationships:
-    activity: Çalakiya ajimêrê
-    dormant: Xewok
-    follow_selected_followers: Şopînerên hilbijartî bişopîne
-    followers: Şopîner
-    following: Dişopîne
-    invited: Vexwendî
-    last_active: Çalakiya dawî
-    most_recent: Herî dawî
-    moved: Barkirî
-    mutual: Hevpar
-    primary: Sereke
-    relationship: Pêwendî
-    remove_selected_domains: Hemû şopînerên ji navpera hilbijartî rake
-    remove_selected_followers: Şopînerên hilbijartî rake
-    remove_selected_follows: Bikarhênerên hilbijartî neşopîne
-    status: Rewşa ajimêr
-  remote_follow:
-    acct: Navnîşana ajimêra xwe username@domain yê ku tu yê jê çalakî bikî binvsîne
-    missing_resource: Ji bona ajimêra te pêwistiya beralîkirina URLyê nehate dîtin
-    no_account_html: Ajimêra te tune? Tu dikarî<a href='%{sign_up_path}' target='_blank'>li vir tomar bibe</a>
-    proceed: Şopandinê bidomîne
-    prompt: 'Tu yê bişopînî:'
-    reason_html: "<strong>Ev gav ji bona çi pêwîst e?</strong><code>%{instance}</code>rajekerên ku tu tomarkiriyî dibe ku tunebe, ji bona vê divê pêşî te beralîyê rajekera te bi xwe bikin."
-  remote_interaction:
-    favourite:
-      proceed: Ber bi bijarê ve biçe
-      prompt: 'Tu dixwazî vê şandiyê bibijêrî:'
-    reblog:
-      proceed: Bo bilindkirinê bidomîne
-      prompt: 'Tu dixwazî vê şandî ye rabikî:'
-    reply:
-      proceed: Bersivandinê bidomîne
-      prompt: 'Tu dixwazî bersiva vê şandiyê bidî:'
-  scheduled_statuses:
-    over_daily_limit: Te sînorê %{limit} şandiyên demsazkirî yên ji bo îro derbas kir
-    over_total_limit: Te sînorê %{limit} şandiyên demsazkirî derbas kir
-    too_soon: Dîroka bernamesazkirinê divê dîrokeke ji îro pêşvetir be
-  sessions:
-    activity: Çalakiya dawî
-    browser: Gerok
-    browsers:
-      alipay: Alipay
-      blackberry: Blackberry
-      chrome: Chrome
-      edge: Microsoft Edge
-      electron: Electron
-      firefox: Firefox
-      generic: Gerokeke nenas
-      ie: Internet Explorer
-      micro_messenger: MicroMessenger
-      nokia: Nokia S40 Ovi Browser
-      opera: Opera
-      otter: Otter
-      phantom_js: PhantomJS
-      qq: Geroka QQ
-      safari: Safari
-      uc_browser: Geroka UCB
-      weibo: Weibo
-    current_session: Danişîna heyî
-    description: "%{platform} ser %{browser}"
-    explanation: Gerokên tevnê di dema heyî de hene ku têketin kirine di ajimêra te ya Mastodon.
-    ip: IP
-    platforms:
-      adobe_air: Adobe Air
-      android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
-      firefox_os: Firefox OS
-      ios: iOS
-      linux: Linux
-      mac: macOS
-      other: platforma nenas
-      windows: Windows
-      windows_mobile: Windows Mobile
-      windows_phone: Windows Phone
-    revoke: Rake
-    revoke_success: Danişîn bi serkeftî hate rakirin
-    title: Danîştin
-    view_authentication_history: Dîroka rastekirina ajimêra xwe bibîne
-  settings:
-    account: Ajimêr
-    account_settings: Sazkariyên ajimêr
-    aliases: Nûçikên ajimêra
-    appearance: Xuyang
-    authorized_apps: Rayedarê sepanan
-    back: Vegere bo Mastodon
-    delete: Jêbirina ajimêr
-    development: Pêşdebir
-    edit_profile: Profîlê serrast bike
-    export: Derxistinê daneyan
-    featured_tags: Hashtagên bijarte
-    identity_proofs: Delîlên nasnameyê
-    import: Têxistin
-    import_and_export: Têxistin û derxistin
-    migrate: Barkirina ajimêrê
-    notifications: Agahdarî
-    preferences: Hilbijarte
-    profile: Profîl
-    relationships: Yên tê şopandin û şopîner
-    statuses_cleanup: Bi xweberî va jê birina şandiya
-    two_factor_authentication: Piştrastkirinê du-faktorî
-    webauthn_authentication: Kilîdên ewlehiyê
-  statuses:
-    attached:
-      audio:
-        one: "%{count} deng"
-        other: "%{count} deng"
-      description: 'Pêvek: %{attached}'
-      image:
-        one: "%{count} wêne"
-        other: "%{count} wêne"
-      video:
-        one: "%{count} vîdyo"
-        other: "%{count} vîdyo"
-    boosted_from_html: Bilindkirî ji alî %{acct_link} ve
-    content_warning: 'Hişyariya naverokê: %{warning}'
-    disallowed_hashtags:
-      one: 'hashtagek bê maf tê de hebû: %{tags}'
-      other: 'hashtagek bê maf tê de hebû: %{tags}'
-    errors:
-      in_reply_not_found: Ew şandiya ku tu dikî nakî bersivê bide xuya nake an jî hatiye jêbirin.
-    language_detection: Bi xweberî ziman nas bike
-    open_in_web: Di tevnê de veke
-    over_character_limit: sînorê karakterê %{max} derbas kir
-    pin_errors:
-      limit: Jixwe te mezintirîn hejmara şandîyên xwe derzî kir
-      ownership: Şandiya kesekî din nay derzî kirin
-      private: Şandiyên negelemperî nayên daliqandin
-      reblog: Ev şandî nayê derzî kirin
-    poll:
-      total_people:
-        one: "%{count} kes"
-        other: "%{count} kes"
-      total_votes:
-        one: "%{count} deng"
-        other: "%{count} deng"
-      vote: Deng bide
-    show_more: Bêtir nîşan bide
-    show_newer: Nûtirîn nîşan bide
-    show_older: Kevntirîn nîşan bide
-    show_thread: Mijarê nîşan bide
-    sign_in_to_participate: Ji bo tevlî sohbetê bibî xwe tomar bike
-    title: "%{name}%{quote}"
-    visibilities:
-      direct: Rasterast
-      private: Tenê şopîneran
-      private_long: Tenê bo şopîneran nîşan bide
-      public: Gelemperî
-      public_long: Herkes dikare bibîne
-      unlisted: Nerêzokkirî
-      unlisted_long: Herkes dikare bibîne, lê di demnameya gelemperî de nayê rêz kirin
-  statuses_cleanup:
-    enabled: Şandiyên berê bi xweberî va jê bibe
-    enabled_hint: Gava ku ew gihîştibe sînorê temenê diyarkirî, şandiyên te bi xweberî jê dibe, ji bilî van awareteyên jêrîn
-    exceptions: Awarte
-    explanation: Ji ber ku jêbirina şandiyan pêvajoyeke biha ye, ev hêdî hêdî bi demê re tê kirin dema ku rajekar wekî din mijûl nebe. Ji ber vê sedemê, dibe ku şandiyên te demek şûnda ku bigihîjin sînorê temenê wê werin jêbirin.
-    ignore_favs: Ecibandinan paşguh bike
-    ignore_reblogs: Rakirina piştguh bike
-    interaction_exceptions: Awarteyên li ser bingehên têkiliyan
-    interaction_exceptions_explanation: Bizanibe ku heke şandiyeke ku ji binî ve têkeve jêrî bijare an bilindkirin ê piştî ku carek din di ser wan re derbas bibe, garantiyek tune ku werin jêbirin.
-    keep_direct: Peyamên rasterast veşêre
-    keep_direct_hint: Tu peyamên te yekcar jê naçe
-    keep_media: Peyamên bi pêvekên medyayê ve ne biveşêre
-    keep_media_hint: Yek ji peyamên te yê ku bi pêvekên medyayê ve ne jê nabe
-    keep_pinned: Peyamên xwe yên ku hatine derzîkirî veşêre
-    keep_pinned_hint: Yek ji peyamên te yê derzîkirî jê nabe
-    keep_polls: Rapirsîyan veşêre
-    keep_polls_hint: Yek ji rapirsiyên te jê nabe
-    keep_self_bookmark: Şandiyên ku wek şûnpel hatine tevlêkirin veşêre
-    keep_self_bookmark_hint: Şandî heke te wek şûnpel tomar kiriye we neyê jêbirin
-    keep_self_fav: Şandiyên ku te eciband veşêre
-    keep_self_fav_hint: Ger te şandiyên xwe ecibandibe jê nabe
-    min_age:
-      '1209600': 2 hefte
-      '15778476': 6 meh
-      '2629746': 1 meh
-      '31556952': 1 sal
-      '5259492': 2 meh
-      '63113904': 2 sal
-      '7889238': 3 meh
-    min_age_label: Şêmûga demê
-    min_favs: Peyamên ku ji wê zêdetir hatine ecibandin veşêre
-    min_favs_hint: Şandî ku ji evqas hezkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe
-    min_reblogs: Şandiyên ku zêdetir hatine rakirin veşêre
-    min_reblogs_hint: Şandî ku ji ji vê hejmarê bêtir bilindkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe
-  stream_entries:
-    pinned: Şandiya derzîkirî
-    reblogged: bilindkirî
-    sensitive_content: Naveroka hestiyarî
-  tags:
-    does_not_match_previous_name: bi navê berê re li hev nayê
-  terms:
-    body_html: |
-      <h2>Privacy Policy</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-        <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-        <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-        <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-        <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-        <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-        <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-        <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} mercên bikaranîn û politîkayên nehêniyê"
-  themes:
-    contrast: Mastodon (dijberiya bilind)
-    default: Mastodon (Tarî)
-    mastodon-light: Mastodon (Ronahî)
-  time:
-    formats:
-      default: "%b %d, %Y, %H:%M"
-      month: "%b %Y"
-  two_factor_authentication:
-    add: Tevlî bike
-    disable: 2FA neçalak bike
-    disabled_success: Rastandina du-gavî bi serfirazî hate sekinandin
-    edit: Serrast bike
-    enabled: Rastandina du-gavî bi serfirazî hate çalak kirin
-    enabled_success: Rastandina du-gavî bi serfirazî hate çalak kirin
-    generate_recovery_codes: Kodên xilaskirinê çêbike
-    lost_recovery_codes: Ku telefon winda bibe kodên xilaskirinê derfet dide ku tu bigihijî ajimêra xwe. Heke te kodên xwe yê xilaskirinê winda kiribe tu dikarî ji vê derê dîsa ava bikî. Kodên te yê xilaskirinê ên kevin wê nederbasdar bibe.
-    methods: Rêbazên du-gavî
-    otp: Sepana Authenticator
-    recovery_codes: Kilîtên rizgarbûna hilanînê
-    recovery_codes_regenerated: Kilîtên rizgarbûna bi serkeftî hate nûvkirin
-    recovery_instructions_html: Heke gava te têlefona xwe winda kir, tu dikarî yek ji kodên rizgarkirinê yên jêrîn bi kar bîne da ku tu bigihîjî ajimêra xwe. <strong>Kodên rizgarkirinê li cihekî ewle biparêze </strong>. Mînakî, tu dikarî wan çap bikî û wan bi peldandkên din ên girîng re tomar bike.
-    webauthn: Kilîdên ewlehiyê
-  user_mailer:
-    backup_ready:
-      explanation: Te yedekîya tijê ya ajimêrê xwe Mastodonê xwest. Niha ji daxistinê re amade ye!
-      subject: Arşîva te amede ye bo daxistinê
-      title: Pakêtkirina arşîvan
-    sign_in_token:
-      details: 'Li vir hûrgiliyên hewldanê hene:'
-      explanation: 'Me hewildanek têketina ajimêra te ji navnîşana IPya nenas nas kir. Ger ev tu bî, ji kerema xwe koda ewlehiyê ya jêr têkeve rûpela jêpirsînê:'
-      further_actions: 'Ger ev ne tu bî, ji kerema xwe re şîfreya xwe biguherîne û li ser hesaba xwe rastkirina du-gavî çalak bike. Tu dikarî wê ji vê derê çêkî:'
-      subject: Ji kerema xwe re hewldanên têketinê piştrast bike
-      title: Hewldanên têketinê
-    warning:
-      explanation:
-        disable: Tu êdî nikarî têkevî ajimêra xwe an wê bi rengeke din bi kar bînî, lê profîla te û daneyên din saxlem dimînin.
-        sensitive: Pelên te yê medyayê a barkirî û girêdanên te yên medyayê wek hestiyarî wê bihê nirxandin.
-        silence: Gava ajimêra te sînorkirî be dîsa jî tu dikarî ajimêra xwe bi kar bînî lê tenê kesên ku berê te dişopînin dê şandiyên te li ser vê rajekarê bibînin, û dibe ku tu ji navnîşên cihêreng ên gelemperî bêne awaretkirin. Lêbelê, dibe ku yên din hîn te bişopînin bi destan.
-        suspend: Tu êdî nikarî têkevî ajimêra xwe, û profîla te û daneyên din êdî nayên gihîştin. Dîsa jî tu dikarî têkevî da ku hilanîna daneyên xwe daxwaz bikî heya ku dane bi tevahî werin rakirin, lê em ê hin daneyan biparêzin da ku tu ji rawestandinê rizgar bikin.
-      get_in_touch: Ji bo bi xebatkarên %{instance} têkilî deynî tu dikarî vê e-nameyê bibersivînî.
-      review_server_policies: Rêbazên rajeker lêkolîn bike
-      statuses: 'Bi taybetî, ji bo wê:'
-      subject:
-        disable: Ajimêra te a %{acct} hat qerisandin
-        none: Hişyarî bo %{acct}
-        sensitive: Ajimêra te %{acct} medyaya ku wek hestyar hatiye nîşandin weşandiye
-        silence: Ajimêra te ya %{acct} hate bisînorkirin
-        suspend: Ajimêra te %{acct} hate rawestandin
-      title:
-        disable: Ajimêr hate qerisandin
-        none: Hişyarî
-        sensitive: Medyayê te wekî hestyar hate nîşandan
-        silence: Ajimêr sînor kiriye
-        suspend: Ajimêr hatiye rawestandin
-    welcome:
-      edit_profile_action: Profîlê saz bike
-      edit_profile_step: Tu dikarî profîla xwe bi barkirina wêne, sernav, guherandina navê xuyangê xwe û bêhtir ve xweş bikî. Heke tu dixwazî şagirtên nû binirxînî berî ku mafê bidî ku ew te bişopînê, tu dikarî ajimêra xwe kilît bike.
-      explanation: Li vir çend serişte hene ku tu dest pê bike
-      final_action: Dest bi weşandinê bike
-      final_step: 'Dest bi weşandinê bike! Bêyî şopîneran jî dibe ku şandiyên te yên gelemperî ji hêla kesên din ve werin dîtin, mînakî li ser demjimêra herêmî û di hashtagan de. Dibe ku tu bixwazî xwe li ser hashtagê #nasname bidî nasandin.'
-      full_handle: Hemî destikê te
-      full_handle_hint: Ji hevalên xwe re, ji bona ji rajekarekê din peyam bişîne an jî ji bona ku te bikaribe bişopîne tişta ku tu bibêjî ev e.
-      review_preferences_action: Bijartinan biguherîne
-      review_preferences_step: Pê bawer be ku vebijêrkên xwe saz bikî, wek mînak kîjan e-nameyên ku tu dixwaziî wergirîne, an tu dixwazî weşanên te ji kîjan astê nehêniyê de kesanekirî bin. Heke nexweşiya te ya tevgerê tune be, tu dikarî hilbijêrî ku GIF ya xweser çalak bibe.
-      subject: Tu bi xêr hatî Mastodon
-      tip_federated_timeline: Demnameya giştî dimenêke gelemperî a Mastodon e. Lê tenê kesên ku ciranên te endamên wê ne dihewîne, ji ber vê yekê ew hemû nîne.
-      tip_following: Tu rêvebir (ên) rajeker wek berdest dişopînî. Ji bo mirovên balkêştir bibînî, demnameya herêmî û federasyonî kontrol bike.
-      tip_local_timeline: Demnameya herêmî, dimenêke bi giştî ye li ser %{instance} e. Ev ciranên te yên herî nêzik in!
-      tip_mobile_webapp: Ger geroka te ya desta pêşkêşî te bike ku tu Mastodon li ser ekrana xwe ya malê lê zêde bikî, tu dikarî agahdariyên push bistînî. Ew bi gelek awayan mîna serîlêdanek xwemalî tevdigere!
-      tips: Serbend
-      title: Bi xêr hatî, %{name}!
-  users:
-    follow_limit_reached: Tu nikarî zêdetirî %{limit} kesan bişopînî
-    generic_access_help_html: Di gihîştina ajimêrê te de pirsgirêk heye? Tu dikarî ji bo alîkariyê bi %{email} re têkilî deyne
-    invalid_otp_token: Koda du-gavî ya nelê
-    invalid_sign_in_token: Kilîda ewlehiyê a nelê
-    otp_lost_help_html: Heke te gihîştina herduyan ji dest da, dibe ku tu bi %{email} re têkilî deyne
-    seamless_external_login: Te bi servîsekî biyanî re têketina xwe kir, ji ber vê yekê şîfre û e-name nayê bikaranîn.
-    signed_in_as: 'Têketin wekî:'
-    suspicious_sign_in_confirmation: Xuya dike ku te berê têketin ji vê amûrê nekiriye, ji ber vê yekê em kodeke ewlehiyê ji navnîşana e-nameya te re dişînin da ku piştrast bikî ku tu ye an na.
-  verification:
-    explanation_html: 'Tu dikarî <strong>xwe wekî xwediyê girêdanên li daneyê meta profîla xwe piştrast bikî</strong>. Ji bo vê, hewceye girêda malperê di nav profîla te ya mastodonê de girêdanekî paş hebe. Girêdana paş<strong>hewceye</strong> taybetîyek <code>rel="me"</code>hebe. Naveroka nivîsa girêdanê ne girîng e. Ev jî mînakek e:'
-    verification: Piştrastkirin
-  webauthn_credentials:
-    add: Kilîteke ewlehiyê nû tevlî bike
-    create:
-      error: Gava Kilîteke ewlehiyê nû dihat tevlîkirin pirsgirêkek derket. Jkx dîsa biceribîne.
-      success: Tevlîkirina kilîteke ewlehiyê nû bi awayekî serkeftî qediya.
-    delete: Jê bibe
-    delete_confirmation: Ma tu bi rastî dixwazî ku ev kilîta ewlehiyê jê bibe?
-    description_html: Heker tu <strong> piştrastkirina kilîta ewlehiyê </strong> çalak bikî, Ji bo têketinê ger tu kilîtekî ewlehiyê bikarbînî.
-    destroy:
-      error: Dema kilîda ewlehiyê hate jêbirin pirsgirêkek peyda bû. Ji kerema xwe re careke din biceribîne.
-      success: Kilîda ewlehiyê bi awayekî serkeftî hatê jêbirin.
-    invalid_credential: Kilîda ewlehiyê a nelê
-    nickname_hint: Bernavka kilîda te ya ewlehiyê a nû têkevê
-    not_enabled: Te hê WebAuthn çalak nekiriye
-    not_supported: Ev gerok piştgiriya kilîtên ewlehiyê nakê
-    otp_required: Ji bo ku tu kilîtên ewlehiyê bikar bînî, ji kerema xwe re pêşî piştrastkirina du-gavî çalak bike.
-    registered_on: Di %{date} dîrokê de tomar bû
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 41ec90327..a1eb58416 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,88 +1,25 @@
 ---
 ko:
   about:
-    about_hashtag_html: "<strong>#%{hashtag}</strong> 해시태그가 붙은 공개 게시물입니다. 같은 연합에 속한 임의의 인스턴스에 계정을 생성하면 당신도 대화에 참여할 수 있습니다."
     about_mastodon_html: 마스토돈은 <em>오픈 소스 기반의</em> 소셜 네트워크 서비스 입니다. 상용 플랫폼의 대체로서 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 마스토돈 인스턴스를 만들 수 있으며, 아주 매끄럽게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
-    about_this: 이 인스턴스에 대해서
-    active_count_after: 활성 사용자
-    active_footnote: 월간 활성 사용자
-    administered_by: '관리자:'
-    api: API
-    apps: 모바일 앱
-    apps_platforms: 마스토돈을 iOS, 안드로이드, 다른 플랫폼들에서도 사용하세요
-    browse_directory: 프로필 책자를 둘러보고 관심사 찾기
-    browse_local_posts: 이 서버의 공개글 실시간 스트림을 둘러보기
-    browse_public_posts: 마스토돈의 공개 라이브 스트림을 둘러보기
-    contact: 연락처
     contact_missing: 미설정
     contact_unavailable: 없음
-    discover_users: 유저 발견하기
-    documentation: 문서
-    federation_hint_html: "%{instance}에 계정을 만드는 것으로 모든 마스토돈 서버, 그리고 호환 되는 모든 서버의 사용자를 팔로우 할 수 있습니다."
-    get_apps: 모바일 앱 사용해 보기
     hosted_on: "%{domain}에서 호스팅 되는 마스토돈"
-    instance_actor_flash: |
-      이 계정은 가상의 actor로서 개인 유저가 아닌 서버 자체를 나타냅니다.
-      이것은 페더레이션을 목적으로 사용 되며 인스턴스 전체를 차단하려 하지 않는 이상 차단하지 않아야 합니다, 그 경우에는 도메인 차단을 사용하세요.
-    learn_more: 자세히
-    privacy_policy: 개인정보 정책
-    rules: 서버 규칙
-    rules_html: '아래의 글은 이 마스토돈 서버에 계정이 있다면 따라야 할 규칙의 요약입니다:'
-    see_whats_happening: 무슨 일이 일어나는 지 보기
-    server_stats: '서버 통계:'
-    source_code: 소스 코드
-    status_count_after:
-      other: 개
-    status_count_before: 게시물 수
-    tagline: 친구들을 팔로우 하고 새로운 사람들도 만나기
-    terms: 이용약관
-    unavailable_content: 이용 불가능한 컨텐츠
-    unavailable_content_description:
-      domain: 서버
-      reason: 이유
-      rejecting_media: 이 서버의 미디어 파일들은 처리되지 않고 썸네일또한 보이지 않게 됩니다. 수동으로 클릭하여 해당 서버로 가게 됩니다.
-      rejecting_media_title: 필터링 된 미디어
-      silenced: 이 서버의 게시물은 작성자를 팔로우 한 경우에만 홈 피드에 나타나며 이를 제외한 어디에도 나타나지 않습니다.
-      silenced_title: 침묵 된 서버들
-      suspended: 이 서버의 아무도 팔로우 할 수 없으며, 어떤 데이터도 처리되거나 저장 되지 않고 데이터가 교환 되지도 않습니다.
-      suspended_title: 금지된 서버들
-    unavailable_content_html: 마스토돈은 일반적으로 별무리에 있는 어떤 서버의 유저와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.
-    user_count_after:
-      other: 명
-    user_count_before: 사용자 수
-    what_is_mastodon: 마스토돈이란?
+    title: 정보
   accounts:
-    choices_html: "%{name}의 추천:"
-    endorsements_hint: 내가 팔로우 하고 있는 사람들을 여기에 추천 할 수 있습니다.
-    featured_tags_hint: 특정한 해시태그들을 여기에 표시되도록 할 수 있습니다.
     follow: 팔로우
     followers:
       other: 팔로워
     following: 팔로잉
     instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 사용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다.
-    joined: "%{date}에 가입함"
     last_active: 최근 활동
     link_verified_on: "%{date}에 이 링크의 소유가 확인되었습니다"
-    media: 미디어
-    moved_html: "%{name}은 %{new_profile_link}으로 이동되었습니다:"
-    network_hidden: 이 정보는 사용할 수 없습니다
-    never_active: 없음
     nothing_here: 아무 것도 없습니다!
-    people_followed_by: "%{name} 님이 팔로우 중인 계정"
-    people_who_follow: "%{name} 님을 팔로우 중인 계정"
     pin_errors:
       following: 추천하려는 사람을 팔로우 하고 있어야 합니다
     posts:
       other: 게시물
     posts_tab_heading: 게시물
-    posts_with_replies: 게시물과 답장
-    roles:
-      admin: 관리자
-      bot: 봇
-      group: 그룹
-      moderator: 중재자
-    unavailable: 프로필 사용 불가
-    unfollow: 팔로우 해제
   admin:
     account_actions:
       action: 조치 취하기
@@ -90,26 +27,30 @@ ko:
     account_moderation_notes:
       create: 중재 기록 작성하기
       created_msg: 중재 기록이 성공적으로 작성되었습니다!
-      delete: 삭제
       destroyed_msg: 중재 기록이 성공적으로 삭제되었습니다!
     accounts:
       add_email_domain_block: 이 이메일 도메인을 차단하기
-      approve: 승인
-      approve_all: 모두 승인
+      approve: 허가
       approved_msg: 성공적으로 %{username}의 가입 신청서를 승인했습니다
       are_you_sure: 정말로 실행하시겠습니까?
       avatar: 아바타
       by_domain: 도메인
       change_email:
-        changed_msg: 이메일이 성공적으로 바뀌었습니다!
+        changed_msg: 이메일이 성공적으로 변경되었습니다!
         current_email: 현재 이메일 주소
         label: 이메일 주소 변경
         new_email: 새 이메일 주소
         submit: 이메일 주소 변경
         title: "%{username}의 이메일 주소 변경"
-      confirm: 확인
+      change_role:
+        changed_msg: 역할이 성공적으로 변경되었습니다!
+        label: 역할 변경
+        no_role: 역할 없음
+        title: "%{username}의 역할 변경"
+      confirm: 확정
       confirmed: 확인됨
       confirming: 확인 중
+      custom: 사용자 지정
       delete: 데이터 삭제
       deleted: 삭제됨
       demote: 강등
@@ -117,8 +58,8 @@ ko:
       disable: 비활성화
       disable_sign_in_token_auth: 이메일 토큰 인증 비활성화
       disable_two_factor_authentication: 2단계 인증을 비활성화
-      disabled: 비활성화된
-      display_name: 이름
+      disabled: 비활성화됨
+      display_name: 표시되는 이름
       domain: 도메인
       edit: 편집
       email: 이메일
@@ -127,8 +68,8 @@ ko:
       enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
       enabled_msg: "%{username}의 계정을 성공적으로 얼리기 해제하였습니다"
-      followers: 팔로워 수
-      follows: 팔로잉 수
+      followers: 팔로워
+      follows: 팔로잉
       header: 헤더
       inbox_url: 수신함 URL
       invite_request_text: 가입 하려는 이유
@@ -148,18 +89,22 @@ ko:
       moderation:
         active: 활동
         all: 전체
-        pending: 대기중
-        silenced: 침묵 중
+        pending: 대기 중
+        silenced: 제한됨
         suspended: 정지 중
         title: 중재
       moderation_notes: 중재 기록
-      most_recent_activity: 최근 활동
+      most_recent_activity: 최근 활동순
       most_recent_ip: 최근 IP
-      no_account_selected: 아무 계정도 선택 되지 않아 아무 것도 변경 되지 않았습니다
+      no_account_selected: 아무 것도 선택 되지 않아 어떤 계정도 변경 되지 않았습니다
       no_limits_imposed: 제한 없음
+      no_role_assigned: 할당된 역할 없음
       not_subscribed: 구독하지 않음
       pending: 심사 대기
-      perform_full_suspension: 정지시키기
+      perform_full_suspension: 정지
+      previous_strikes: 이전의 처벌들
+      previous_strikes_description_html:
+        other: 이 계정에는 <strong>%{count}</strong>번의 처벌이 있었습니다.
       promote: 승급
       protocol: 프로토콜
       public: 공개
@@ -167,8 +112,9 @@ ko:
       redownload: 프로필 업데이트
       redownloaded_msg: 성공적으로 %{username}의 프로필을 원본으로부터 업데이트 하였습니다
       reject: 거부
-      reject_all: 모두 거부
       rejected_msg: 성공적으로 %{username}의 가입 신청서를 반려하였습니다
+      remote_suspension_irreversible: 이 계정의 데이터는 되돌릴 수 없도록 삭제되었습니다.
+      remote_suspension_reversible_hint_html: 이 계정은 계정이 속한 서버에서 정지되었습니다, 그리고 %{date}에 데이터가 완전히 삭제될 것입니다. 그 때까지는 해당 서버에서 계정을 그대로 복구할 수 있습니다. 만약 지금 당장 이 계정의 모든 데이터를 삭제하고 싶다면, 아래에서 실행할 수 있습니다.
       remove_avatar: 아바타 지우기
       remove_header: 헤더 삭제
       removed_avatar_msg: 성공적으로 %{username}의 아바타 이미지를 삭제하였습니다
@@ -180,20 +126,14 @@ ko:
       reset: 초기화
       reset_password: 암호 초기화
       resubscribe: 다시 구독
-      role: 권한
-      roles:
-        admin: 관리자
-        moderator: 중재자
-        staff: 스태프
-        user: 사용자
+      role: 역할
       search: 검색
       search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들
       search_same_ip: 같은 IP의 다른 사용자들
       security_measures:
         only_password: 암호만
         password_and_2fa: 암호와 2단계 인증
-        password_and_sign_in_token: 암호와 이메일 토큰
-      sensitive: 민감함
+      sensitive: 민감함 강제
       sensitized: 민감함으로 설정됨
       shared_inbox_url: 공유된 inbox URL
       show:
@@ -202,13 +142,16 @@ ko:
       silence: 침묵
       silenced: 침묵 됨
       statuses: 게시물
+      strikes: 이전의 처벌들
       subscribe: 구독하기
+      suspend: 정지
       suspended: 정지 됨
       suspension_irreversible: 이 계정의 데이터는 복구할 수 없도록 삭제되었습니다. 계정을 정지 해제함으로서 계정을 다시 사용 가능하게 할 수 있지만 이전에 삭제한 어떤 데이터도 복구되지 않습니다.
       suspension_reversible_hint_html: 계정이 정지되었습니다, 그리고 %{date}에 데이터가 완전히 삭제될 것입니다. 그 때까지는 어떤 안 좋은 효과 없이 계정이 복구 될 수 있습니다. 만약 지금 당장 계정의 모든 데이터를 삭제하고 싶다면, 아래에서 행할 수 있습니다.
-      time_in_queue: "%{time}동안 기다림"
       title: 계정
-      unconfirmed_email: 미확인 된 이메일 주소
+      unblock_email: 이메일 주소 차단 해제
+      unblocked_email_msg: "%{username}의 이메일 주소를 성공적으로 차단 해제했습니다"
+      unconfirmed_email: 확인되지 않은 이메일 주소
       undo_sensitized: 민감함으로 설정 취소
       undo_silenced: 침묵 해제
       undo_suspension: 정지 해제
@@ -222,26 +165,34 @@ ko:
       whitelisted: 허용 목록
     action_logs:
       action_types:
+        approve_appeal: 이의제기 승인
+        approve_user: 사용자 승인
         assigned_to_self_report: 신고 맡기
         change_email_user: 사용자의 이메일 변경
+        change_role_user: 사용자 역할 변경
         confirm_user: 사용자 확인
         create_account_warning: 경고 생성
         create_announcement: 공지사항 생성
+        create_canonical_email_block: 이메일 차단 생성
         create_custom_emoji: 커스텀 에모지 생성
         create_domain_allow: 도메인 허용 생성
         create_domain_block: 도메인 차단 추가
         create_email_domain_block: 이메일 도메인 차단 생성
         create_ip_block: IP 규칙 만들기
         create_unavailable_domain: 사용 불가능한 도메인 생성
+        create_user_role: 역할 생성
         demote_user: 사용자 강등
         destroy_announcement: 공지사항 삭제
+        destroy_canonical_email_block: 이메일 차단 삭제
         destroy_custom_emoji: 커스텀 에모지 삭제
         destroy_domain_allow: 도메인 허용 삭제
         destroy_domain_block: 도메인 차단 삭제
         destroy_email_domain_block: 이메일 도메인 차단 삭제
+        destroy_instance: 도메인 제거
         destroy_ip_block: IP 규칙 삭제
         destroy_status: 게시물 삭제
         destroy_unavailable_domain: 사용 불가능한 도메인 제거
+        destroy_user_role: 역할 삭제
         disable_2fa_user: 2단계 인증 비활성화
         disable_custom_emoji: 커스텀 에모지 비활성화
         disable_sign_in_token_auth_user: 사용자에 대한 이메일 토큰 인증 비활성화
@@ -251,70 +202,90 @@ ko:
         enable_user: 사용자 활성화
         memorialize_account: 추모계정으로 전환
         promote_user: 사용자 승급
+        reject_appeal: 이의 제기 거절
+        reject_user: 사용자 거부
         remove_avatar_user: 아바타 지우기
         reopen_report: 신고 다시 열기
+        resend_user: 확인 메일 다시 보내기
         reset_password_user: 암호 재설정
         resolve_report: 신고 처리
         sensitive_account: 당신의 계정의 미디어를 민감함으로 표시
         silence_account: 계정 침묵
         suspend_account: 계정 정지
         unassigned_report: 신고 맡기 취소
+        unblock_email_account: 이메일 주소 차단 해제
         unsensitive_account: 당신의 계정의 미디어를 민감함으로 표시하지 않음
         unsilence_account: 계정 침묵 취소
         unsuspend_account: 계정 정지 취소
         update_announcement: 공지사항 업데이트
         update_custom_emoji: 커스텀 에모지 업데이트
         update_domain_block: 도메인 차단 갱신
-        update_status: 게시물 게시
+        update_ip_block: IP 규칙 수정
+        update_status: 게시물 수정
+        update_user_role: 역할 수정
       actions:
+        approve_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 승인했습니다"
+        approve_user_html: "%{name} 님이 %{target}의 가입을 승인했습니다"
         assigned_to_self_report_html: "%{name} 님이 신고 %{target}을 자신에게 할당했습니다"
         change_email_user_html: "%{name} 님이 사용자 %{target}의 이메일 주소를 변경했습니다"
+        change_role_user_html: "%{name} 님이 %{target} 님의 역할을 수정했습니다"
         confirm_user_html: "%{name} 님이 사용자 %{target}의 이메일 주소를 승인했습니다"
         create_account_warning_html: "%{name} 님이 %{target}에게 경고를 보냈습니다"
         create_announcement_html: "%{name} 님이 새 공지 %{target}을 만들었습니다"
+        create_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단했습니다"
         create_custom_emoji_html: "%{name} 님이 새로운 에모지 %{target}를 업로드 했습니다"
         create_domain_allow_html: "%{name} 님이 %{target} 도메인을 허용리스트에 넣었습니다"
         create_domain_block_html: "%{name} 님이 도메인 %{target}를 차단했습니다"
         create_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}를 차단했습니다"
         create_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 만들었습니다"
-        create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지"
+        create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지했습니다"
+        create_user_role_html: "%{name} 님이 %{target} 역할을 생성했습니다"
         demote_user_html: "%{name} 님이 사용자 %{target} 님을 강등했습니다"
         destroy_announcement_html: "%{name} 님이 공지 %{target}을 삭제했습니다"
-        destroy_custom_emoji_html: "%{name} 님이 %{target} 에모지를 삭제했습니다"
+        destroy_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단 해제했습니다"
+        destroy_custom_emoji_html: "%{name} 님이 에모지 %{target}를 삭제했습니다"
         destroy_domain_allow_html: "%{name} 님이 %{target} 도메인과의 연합을 금지했습니다"
         destroy_domain_block_html: "%{name} 님이 도메인 %{target}의 차단을 해제했습니다"
         destroy_email_domain_block_html: "%{name} 님이 이메일 도메인 %{target}을 차단 해제하였습니다"
+        destroy_instance_html: "%{name} 님이 도메인 %{target}를 제거했습니다"
         destroy_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 삭제하였습니다"
-        destroy_status_html: "%{name} 님이 %{target}의 게시물을 삭제했습니다"
+        destroy_status_html: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다"
         destroy_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 재개"
+        destroy_user_role_html: "%{name} 님이 %{target} 역할을 삭제했습니다"
         disable_2fa_user_html: "%{name} 님이 사용자 %{target}의 2FA를 비활성화 했습니다"
-        disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화 했습니다"
-        disable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 비활성화 했습니다"
-        disable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 비활성화 했습니다"
-        enable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 활성화 했습니다"
-        enable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 활성화 했습니다"
-        enable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 활성화 했습니다"
+        disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화했습니다"
+        disable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 비활성화했습니다"
+        disable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 비활성화했습니다"
+        enable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 활성화했습니다"
+        enable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 활성화했습니다"
+        enable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 활성화했습니다"
         memorialize_account_html: "%{name} 님이 %{target}의 계정을 추모비 페이지로 전환했습니다"
         promote_user_html: "%{name} 님이 사용자 %{target}를 승급시켰습니다"
+        reject_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 거절했습니다"
+        reject_user_html: "%{name} 님이 %{target}의 가입을 거부했습니다"
         remove_avatar_user_html: "%{name} 님이 %{target}의 아바타를 지웠습니다"
         reopen_report_html: "%{name} 님이 신고 %{target}을 다시 열었습니다"
+        resend_user_html: "%{name} 님이 %{target} 님에 대한 확인 메일을 다시 보냈습니다"
         reset_password_user_html: "%{name} 님이 사용자 %{target}의 암호를 초기화했습니다"
         resolve_report_html: "%{name} 님이 신고 %{target}를 처리됨으로 변경하였습니다"
         sensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감함으로 표시했습니다"
         silence_account_html: "%{name} 님이 %{target}의 계정을 침묵시켰습니다"
         suspend_account_html: "%{name} 님이 %{target}의 계정을 정지시켰습니다"
         unassigned_report_html: "%{name} 님이 신고 %{target}을 할당 해제했습니다"
+        unblock_email_account_html: "%{name} 님이 %{target}의 이메일 주소를 차단 해제했습니다"
         unsensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감하지 않음으로 표시했습니다"
         unsilence_account_html: "%{name} 님이 %{target}의 계정에 대한 침묵을 해제했습니다"
         unsuspend_account_html: "%{name} 님이 %{target}의 계정에 대한 정지를 해제했습니다"
         update_announcement_html: "%{name} 님이 공지사항 %{target}을 갱신했습니다"
         update_custom_emoji_html: "%{name} 님이 에모지 %{target}를 업데이트 했습니다"
         update_domain_block_html: "%{name} 님이 %{target}에 대한 도메인 차단을 갱신했습니다"
-        update_status_html: "%{name} 님이 %{target}의 게시물을 업데이트 했습니다"
-      deleted_status: "(삭제된 게시물)"
+        update_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 수정했습니다"
+        update_status_html: "%{name} 님이 %{target}의 게시물을 업데이트했습니다"
+        update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
+      deleted_account: 계정을 삭제했습니다
       empty: 로그를 찾을 수 없습니다
       filter_by_action: 행동으로 거르기
-      filter_by_user: 유저로 거르기
+      filter_by_user: 사용자로 거르기
       title: 감사 기록
     announcements:
       destroyed_msg: 공지가 성공적으로 삭제되었습니다!
@@ -345,16 +316,17 @@ ko:
       destroyed_msg: 에모지가 성공적으로 삭제되었습니다!
       disable: 비활성화
       disabled: 비활성
-      disabled_msg: 성공적으로 비활성화하였습니다
+      disabled_msg: 성공적으로 에모지를 비활성화했습니다
       emoji: 에모지
       enable: 활성화
-      enabled: 활성됨
-      enabled_msg: 성공적으로 활성화하였습니다
-      image_hint: 50KB 이하의 PNG
+      enabled: 활성화됨
+      enabled_msg: 성공적으로 에모지를 활성화하였습니다
+      image_hint: "%{size} 이하의 PNG 또는 GIF"
       list: 목록에 추가
       listed: 목록에 실림
       new:
         title: 새 커스텀 에모지 추가
+      no_emoji_selected: 아무 것도 선택 되지 않아 어떤 에모지도 바뀌지 않았습니다
       not_permitted: 이 작업을 수행할 권한이 없습니다
       overwrite: 덮어쓰기
       shortcode: 짧은 코드
@@ -364,16 +336,40 @@ ko:
       unlist: 목록에서 제거
       unlisted: 목록에 없음
       update_failed_msg: 에모지를 업데이트 할 수 없습니다
-      updated_msg: 에모지가 성공적으로 업데이트 되었습니다!
+      updated_msg: 성공적으로 에모지를 업데이트했습니다!
       upload: 업로드
     dashboard:
+      active_users: 활성 사용자
+      interactions: 상호 작용
+      media_storage: 미디어 저장소
+      new_users: 새로운 사용자
+      opened_reports: 신고 열림
+      pending_appeals_html:
+        other: "<strong>%{count}</strong>개의 대기 중인 이의 제기"
+      pending_reports_html:
+        other: "<strong>%{count}</strong>건의 대기 중인 신고"
+      pending_tags_html:
+        other: "<strong>%{count}</strong>개의 대기 중인 해시태그"
+      pending_users_html:
+        other: "<strong>%{count}</strong>명의 대기 중인 사용자"
+      resolved_reports: 신고 해결됨
       software: 소프트웨어
+      sources: 가입 출처
       space: 디스크 사용량
       title: 대시보드
+      top_languages: 상위 활성 언어
+      top_servers: 상위 활성 서버
+      website: 웹사이트
+    disputes:
+      appeals:
+        empty: 이의제기 없음.
+        title: 이의제기
     domain_allows:
       add_new: 도메인 허용
       created_msg: 도메인이 성공적으로 허용 목록에 추가되었습니다
       destroyed_msg: 도메인이 허용 목록에서 제거되었습니다
+      export: 내보내기
+      import: 불러오기
       undo: 허용 목록에서 제외
     domain_blocks:
       add_new: 도메인 차단 추가하기
@@ -381,18 +377,23 @@ ko:
       destroyed_msg: 도메인 차단이 해제되었습니다
       domain: 도메인
       edit: 도메인 차단 수정
+      existing_domain_block: 이미 %{name}에 대한 더 강력한 제한이 있습니다.
       existing_domain_block_html: 이미 %{name}에 대한 더 강력한 제한이 걸려 있습니다, <a href="%{unblock_url}">차단 해제</a>를 먼저 해야 합니다.
+      export: 내보내기
+      import: 불러오기
       new:
         create: 차단 추가
         hint: 도메인 차단은 내부 데이터베이스에 계정이 생성되는 것까지는 막을 수 없지만, 그 도메인에서 생성된 계정에 자동적으로 특정한 중재 규칙을 적용하게 할 수 있습니다.
         severity:
           desc_html: |-
-            <strong>침묵</strong>은 계정을 팔로우 하지 않고 있는 사람들에겐 계정의 게시물을 보이지 않게 합니다. <strong>정지</strong>는 계정의 컨텐츠, 미디어, 프로필 데이터를 삭제합니다.
-            미디어 파일만을 거부하고 싶다면 <strong>없음</strong>으로 두세요.
+            <strong>제한</strong>은 이 도메인에 있는 계정을 팔로우 하지 않는 사람들에게 게시물을 보이지 않게 설정합니다.
+            <strong>정지</strong>는 이 도메인에 있는 계정의 모든 콘텐츠, 미디어, 프로필 데이터를 삭제합니다. 미디어 파일만 거부하고 싶다면 <strong>없음</strong>을 사용하세요.
           noop: 없음
-          silence: 침묵
+          silence: 제한
           suspend: 정지
         title: 새로운 도메인 차단
+      no_domain_block_selected: 아무 것도 선택 되지 않아 어떤 도메인 차단도 변경되지 않았습니다
+      not_permitted: 이 작업을 수행할 권한이 없습니다
       obfuscate: 도메인 이름 난독화
       obfuscate_hint: 도메인 제한 목록을 공개하는 경우 도메인 이름의 일부를 난독화 합니다
       private_comment: 비공개 주석
@@ -403,75 +404,112 @@ ko:
       reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지와는 관계 없습니다
       reject_reports: 신고 거부
       reject_reports_hint: 이 도메인으로부터의 모든 신고를 무시합니다. 정지와는 무관합니다
-      rejecting_media: 미디어 거부
-      rejecting_reports: 신고 거부
-      severity:
-        silence: 침묵
-        suspend: 정지
-      show:
-        affected_accounts:
-          other: 데이터베이스 중 %{count}개의 계정에 영향을 끼칩니다
-        retroactive:
-          silence: 이 도메인에 존재하는 모든 계정의 침묵를 해제
-          suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
-        title: "%{domain}의 도메인 차단을 해제"
-        undo: 실행 취소
       undo: 도메인 차단 취소
       view: 도메인 차단 보기
     email_domain_blocks:
       add_new: 새로 추가
+      attempts_over_week:
+        other: 지난 주 동안 %{count}건의 가입 시도가 있었습니다
       created_msg: 이메일 도메인 차단 규칙을 생성했습니다
       delete: 삭제
-      destroyed_msg: 이메일 도메인 차단 규칙을 삭제했습니다
+      dns:
+        types:
+          mx: MX 레코드
       domain: 도메인
-      empty: 현재 블랙리스트에 등록한 이메일 도메인이 없습니다
-      from_html: "%{domain}에서"
       new:
         create: 차단 규칙 생성
+        resolve: 도메인 검사
         title: 새 이메일 도메인 차단
+      no_email_domain_block_selected: 아무 것도 선택 되지 않아 어떤 이메일 도메인 차단도 변경되지 않았습니다
+      resolved_dns_records_hint_html: 도메인 네임은 다음의 MX 도메인으로 연결되어 있으며, 이메일을 받는데 필수적입니다. MX 도메인을 차단하면 같은 MX 도메인을 사용하는 어떤 이메일이라도 가입할 수 없게 되며, 보여지는 도메인이 다르더라도 적용됩니다. <strong>주요 이메일 제공자를 차단하지 않도록 조심하세요.</strong>
+      resolved_through_html: "%{domain}을 통해 해결됨"
       title: Email 도메인 차단
+    export_domain_allows:
+      new:
+        title: 도메인 허용 목록 불러오기
+      no_file: 선택된 파일이 없습니다
+    export_domain_blocks:
+      import:
+        description_html: 도메인 차단 목록을 불러오려고 합니다. 조심스럽게 검토하시고, 특히나 이 목록을 스스로 작성하지 않았을 경우엔 더 면밀히 검토하세요.
+        existing_relationships_warning: 이미 존재하는 팔로우 관계
+        private_comment_description_html: '어디서 불러온 것인지 추적을 원활하게 하기 위해서, 불러온 차단들은 다음과 같은 비공개 주석과 함께 생성될 것입니다: <q>%{comment}</q>'
+        private_comment_template: "%{date}에 %{source}에서 불러옴"
+        title: 도메인 차단 불러오기
+      new:
+        title: 도메인 차단 불러오기
+      no_file: 선택된 파일이 없습니다
     follow_recommendations:
       description_html: "<strong>팔로우 추천은 새 사용자들이 관심 가는 콘텐트를 빠르게 찾을 수 있도록 도와줍니다</strong>. 사용자가 개인화 된 팔로우 추천이 만들어지기 위한 충분한 상호작용을 하지 않은 경우, 이 계정들이 대신 추천 됩니다. 이들은 해당 언어에 대해 많은 관심을 갖거나 많은 로컬 팔로워를 가지고 있는 계정들을 섞어서 날마다 다시 계산 됩니다."
-      language: 할당할 언어
+      language: 언어 필터
       status: 상태
       suppress: 팔로우 추천 숨기기
       suppressed: 숨겨짐
       title: 팔로우 추천
       unsuppress: 팔로우 추천 복원
     instances:
+      availability:
+        description_html:
+          other: 도메인에 대한 전달이 성공 없이 <strong>%{count}</strong>일 실패한다면, 이후의 전달 시도는 해당 도메인<em>에서</em> 전달이 오기 전까지는 만들어지지 않습니다.
+        failure_threshold_reached: "%{date}에 실패 임계점에 도달했습니다."
+        failures_recorded:
+          other: 실패한 전달 시도 총 %{count}일.
+        no_failures_recorded: 실패 기록이 없습니다.
+        title: 가용성
+        warning: 이 서버에 대한 마지막 연결 시도가 성공적이지 않았습니다
       back_to_all: 전체
       back_to_limited: 제한됨
       back_to_warning: 경고
       by_domain: 도메인
+      confirm_purge: 정말로 이 도메인의 데이터를 영구적으로 삭제하길 원하십니까?
+      content_policies:
+        comment: 내부 참고사항
+        description_html: 이 도메인과 하위 도메인의 모든 계정에 적용될 콘텐츠 정책을 정의할 수 있습니다.
+        policies:
+          reject_media: 미디어 거부
+          reject_reports: 신고 거부
+          silence: 제한
+          suspend: 정지
+        policy: 정책
+        reason: 공개적인 사유
+        title: 콘텐츠 정책
+      dashboard:
+        instance_accounts_dimension: 제일 많이 팔로우된 계정
+        instance_accounts_measure: 보관된 계정
+        instance_followers_measure: 우리를 팔로우 하는 저쪽의 팔로워 수
+        instance_follows_measure: 저쪽을 팔로우 하는 우리의 팔로워 수
+        instance_languages_dimension: 상위 언어
+        instance_media_attachments_measure: 보관된 미디어 첨부파일
+        instance_reports_measure: 이들에 대한 신고
+        instance_statuses_measure: 보관된 게시물
       delivery:
         all: 전체
         clear: 전달 에러 초기화
+        failing: 실패중
         restart: 전달 재시작
         stop: 전달 중지
-        title: 전달
         unavailable: 사용불가
-        unavailable_message: 전달 불가
-        warning: 경고
-        warning_message:
-          other: 전달 실패 %{count}일
       delivery_available: 전송 가능
       delivery_error_days: 전달 에러가 난 날짜들
-      delivery_error_hint: 만약 %{count}일동안 전달이 불가능하다면, 자동으로 전달불가로 표시됩니다.
+      delivery_error_hint: 만약 %{count}일 동안 전달이 불가능하다면, 자동으로 전달 불가로 표시됩니다.
+      destroyed_msg: "%{domain}의 데이터는 곧바로 지워지도록 대기열에 들어갔습니다."
       empty: 도메인이 하나도 없습니다.
       known_accounts:
-        other: 알려진 계정 %{count}개
+        other: "%{count}개의 알려진 계정"
       moderation:
         all: 모두
         limited: 제한됨
         title: 중재
       private_comment: 비공개 주석
       public_comment: 공개 주석
+      purge: 제거
+      purge_description_html: 이 도메인이 영구적으로 오프라인 상태라고 생각되면, 스토리지에서 이 도메인의 모든 계정 레코드와 관련 데이터를 삭제할 수 있습니다. 이 작업은 시간이 좀 걸릴 수 있습니다.
       title: 연합
       total_blocked_by_us: 우리에게 차단 됨
       total_followed_by_them: 우리를 팔로우
       total_followed_by_us: 우리가 한 팔로우
       total_reported: 이들에 대한 신고
       total_storage: 미디어 첨부
+      totals_time_period_hint_html: 아래에 표시된 총계에는 모든 시간에 대한 데이터가 포함됩니다.
     invites:
       deactivate_all: 전부 비활성화
       filter:
@@ -495,65 +533,144 @@ ko:
         title: 새 IP 규칙 만들기
       no_ip_block_selected: 아무 것도 선택 되지 않아 어떤 IP 규칙도 변경 되지 않았습니다
       title: IP 규칙들
-    pending_accounts:
-      title: 대기중인 계정 (%{count})
     relationships:
       title: "%{acct}의 관계"
     relays:
       add_new: 릴레이 추가
       delete: 삭제
-      description_html: "<strong>연합 릴레이</strong>는 서버들 사이에서 많은 양의 공개 게시물을 구독하고 중개하는 서버입니다. <strong>이것은 중소 규모의 서버에서 별무리를 발견하는 데에 도움을 줄 수 있습니다</strong>, 이제 로컬 유저들이 다른 서버의 유저들을 수동으로 팔로우 하지 않아도 됩니다."
+      description_html: "<strong>연합 릴레이</strong>는 서버들 사이에서 많은 양의 공개 게시물을 구독하고 중개하는 서버입니다. <strong>이것은 중소 규모의 서버에서 연합우주를 발견하는 데에 도움을 줄 수 있습니다</strong>, 이제 로컬 사용자들이 다른 서버의 사용자들을 수동으로 팔로우 하지 않아도 됩니다."
       disable: 비활성화
       disabled: 비활성화 됨
       enable: 활성화
       enable_hint: 활성화 되면, 이 릴레이의 모든 공개 게시물을 구독하고 이 서버의 공개 게시물을 전송하게 됩니다.
       enabled: 활성화 됨
       inbox_url: 릴레이 URL
-      pending: 릴레이의 승인 대기중
+      pending: 릴레이의 승인 대기 중
       save_and_enable: 저장하고 활성화
       setup: 릴레이 연결 설정
       signatures_not_enabled: 시큐어모드나 제한된 페더레이션 모드를 사용하고 있다면 릴레이는 제대로 동작하지 않을 것입니다
       status: 상태
       title: 릴레이
     report_notes:
-      created_msg: 리포트 노트가 성공적으로 작성되었습니다!
-      destroyed_msg: 리포트 노트가 성공적으로 삭제되었습니다!
+      created_msg: 신고 기록이 성공적으로 작성되었습니다!
+      destroyed_msg: 신고 기록이 성공적으로 삭제되었습니다!
     reports:
       account:
         notes:
           other: "%{count}개의 기록"
-        reports:
-          other: "%{count}개의 신고"
+      action_log: 감사 기록
       action_taken_by: 신고 처리자
+      actions:
+        delete_description_html: 신고된 게시물은 삭제될 것이며 이 처벌기록은 같은 계정의 향후 규정 위반에 대해 참고사항으로 쓰일 수 있도록 저장됩니다.
+        mark_as_sensitive_description_html: 신고된 게시물의 미디어는 민감함으로 표시될 것이며 이 처벌기록은 같은 계정의 향후 규정 위반에 대해 참고사항으로 쓰일 수 있도록 저장됩니다.
+        other_description_html: 계정 동작을 제어하고 신고된 계정과의 의사소통을 사용자 지정하기 위한 추가 옵션을 봅니다.
+        resolve_description_html: 신고된 계정에 대해 아무런 동작도 취하지 않으며, 처벌기록이 남지 않으며, 신고는 처리됨으로 변경됩니다.
+        silence_description_html: 이미 팔로우 하고 있는 사람이나 수동으로 찾아보는 사람에게만 프로필이 보여지고, 도달 범위를 엄격하게 제한합니다. 언제든지 되돌릴 수 있습니다.
+        suspend_description_html: 프로필과 모든 콘텐츠가 최종적으로 삭제될 때까지 접근 불가상태가 됩니다. 이 계정과의 상호작용은 불가능해집니다. 30일 이내에 되돌릴 수 있습니다.
+      actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
+      add_to_report: 신고에 더 추가하기
       are_you_sure: 정말로 실행하시겠습니까?
       assign_to_self: 나에게 할당하기
-      assigned: 할당 된 중재자
+      assigned: 할당된 중재자
+      by_target_domain: 신고된 계정의 도메인
+      category: 카테고리
+      category_description_html: 이 계정 또는 게시물이 신고된 이유는 신고된 계정과의 의사소통 과정에 인용됩니다
       comment:
         none: 없음
+      comment_description_html: '더 많은 정보를 위해, %{name} 님이 작성했습니다:'
       created_at: 리포트 시각
+      delete_and_resolve: 게시물 삭제
       forwarded: 전달됨
       forwarded_to: "%{domain}에게 전달됨"
       mark_as_resolved: 해결 완료 처리
+      mark_as_sensitive: 민감함으로 설정
       mark_as_unresolved: 미해결로 표시
+      no_one_assigned: 아무도 없음
       notes:
         create: 기록 추가
         create_and_resolve: 기록을 작성하고 해결됨으로 표시
         create_and_unresolve: 기록 작성과 함께 미해결로 표시
         delete: 삭제
         placeholder: 이 리포트에 대한 조치, 기타 관련 된 사항에 대해 설명합니다…
+        title: 기록
+      notes_description_html: 확인하고 다른 중재자나 미래의 자신을 위해 기록을 작성합니다
+      quick_actions_description_html: '빠른 조치를 취하거나 아래로 스크롤해서 신고된 콘텐츠를 확인하세요:'
+      remote_user_placeholder: "%{instance}의 리모트 사용자"
       reopen: 리포트 다시 열기
       report: '신고 #%{id}'
       reported_account: 신고 대상 계정
       reported_by: 신고자
       resolved: 해결됨
       resolved_msg: 리포트가 성공적으로 해결되었습니다!
+      skip_to_actions: 작업으로 건너뛰기
       status: 상태
-      target_domain: 신고된 계정의 도메인
+      statuses: 신고된 콘텐츠
+      statuses_description_html: 문제가 되는 콘텐츠는 신고된 계정에게 인용되어 전달됩니다
       target_origin: 신고된 계정의 소속
       title: 신고
       unassign: 할당 해제
       unresolved: 미해결
       updated_at: 업데이트 시각
+      view_profile: 프로필 보기
+    roles:
+      add_new: 역할 추가
+      assigned_users:
+        other: "%{count}명의 사용자"
+      categories:
+        administration: 관리
+        devops: 데브옵스
+        invites: 초대
+        moderation: 중재
+        special: 특수
+      delete: 삭제
+      description_html: "<strong>사용자 역할</strong>을 통해, 사용자들이 마스토돈의 어떤 기능과 영역에 접근할 수 있을지 설정할 수 있습니다."
+      edit: "%{name} 역할 수정"
+      everyone: 기본 권한
+      everyone_full_description_html: 이것은 <strong>모든 사용자</strong>에게 적용될 <strong>기본 역할</strong>이며, 역할을 지정하지 않아도 적용됩니다. 다른 모든 역할들은 여기에서 권한을 상속합니다.
+      permissions_count:
+        other: "%{count}개의 권한"
+      privileges:
+        administrator: 관리자
+        administrator_description: 이 권한을 가진 사용자는 모든 권한을 우회합니다
+        delete_user_data: 사용자 데이터 삭제
+        delete_user_data_description: 사용자가 다른 사용자의 데이터를 지체 없이 삭제할 수 있도록 허용
+        invite_users: 사용자 초대
+        invite_users_description: 사용자가 다른 사람들을 서버에 초대할 수 있도록 허용
+        manage_announcements: 공지 관리
+        manage_announcements_description: 사용자가 서버의 공지사항을 관리할 수 있도록 허용
+        manage_appeals: 이의제기 관리
+        manage_appeals_description: 사용자가 중재에 대한 이의제기를 리뷰할 수 있도록 허용
+        manage_blocks: 차단 관리
+        manage_blocks_description: 사용자가 이메일 제공자와 IP 주소를 차단할 수 있도록 허용
+        manage_custom_emojis: 커스텀 에모지 관리
+        manage_custom_emojis_description: 사용자가 서버의 커스텀 에모지를 관리할 수 있도록 허용
+        manage_federation: 연합 관리
+        manage_federation_description: 사용자가 다른 도메인과의 연합을 차단하거나 허용할 수 있도록 하고, 전달 가능 여부를 조정할 수 있도록 허용
+        manage_invites: 초대 관리
+        manage_invites_description: 사용자가 초대 링크를 보고 비활성화 할 수 있도록 허용
+        manage_reports: 신고 관리
+        manage_reports_description: 사용자가 신고를 리뷰하고 해당 사용자에 대한 중재활동을 수행할 수 있도록 허용
+        manage_roles: 역할 관리
+        manage_roles_description: 사용자가 그들 이하의 권한에 대해 관리하고 할당할 수 있도록 허용
+        manage_rules: 규칙 관리
+        manage_rules_description: 사용자가 서버 규칙을 수정할 수 있도록 허용합니다
+        manage_settings: 설정 관리
+        manage_settings_description: 사용자가 서버 설정을 수정할 수 있도록 허용합니다
+        manage_taxonomies: 분류 관리
+        manage_taxonomies_description: 사용자가 트렌드를 리뷰하고 해시태그 설정을 수정할 수 있도록 허용합니다
+        manage_user_access: 사용자 접근 관리
+        manage_user_access_description: 사용자가 다른 사용자의 2차 인증을 비활성화 하거나, 이메일 주소를 바꾸거나, 암호를 초기화 할 수 있도록 허용
+        manage_users: 사용자 관리
+        manage_users_description: 사용자가 다른 사용자의 상세정보를 보고 해당 사용자에 대한 중재활동을 할 수 있도록 허용
+        manage_webhooks: 웹훅 관리
+        manage_webhooks_description: 사용자가 관리용 웹훅을 설정할 수 있도록 허용
+        view_audit_log: 감사 기록 보기
+        view_audit_log_description: 사용자가 서버의 감사 기록을 볼 수 있도록 허용
+        view_dashboard: 대시보드 보기
+        view_dashboard_description: 사용자가 여러 통계정보를 볼 수 있는 대시보드에 접근할 수 있도록 허용
+        view_devops: 데브옵스
+        view_devops_description: Sidekiq과 pgHero 대시보드에 접근할 수 있도록 허용
+      title: 역할
     rules:
       add_new: 규칙 추가
       delete: 삭제
@@ -562,152 +679,215 @@ ko:
       empty: 아직 정의된 서버 규칙이 없습니다.
       title: 서버 규칙
     settings:
-      activity_api_enabled:
-        desc_html: 주별 로컬에 게시 된 글, 활성 사용자 및 새로운 가입자 수
-        title: 유저 활동에 대한 통계 발행
-      bootstrap_timeline_accounts:
-        desc_html: 콤마로 여러 유저명을 구분. 이 계정들은 팔로우 추천에 반드시 나타나게 됩니다
-        title: 새로운 사용자들에게 추천할 계정들
-      contact_information:
-        email: 공개할 메일 주소를 입력
-        username: 연락 받을 관리자 유저네임
-      custom_css:
-        desc_html: 모든 페이지에 적용할 CSS
-        title: 커스텀 CSS
+      about:
+        manage_rules: 서버 규칙 관리
+        preamble: 이 서버가 어떻게 운영되고, 중재되고, 자금을 조달하는지 등에 관한 자세한 정보를 기입하세요.
+        rules_hint: 사용자들이 준수해야 할 규칙들을 위한 전용 공간입니다.
+        title: 정보
+      appearance:
+        preamble: 마스토돈의 웹 인터페이스를 변경
+        title: 외관
+      branding:
+        preamble: 이 서버의 브랜딩은 네트워크의 다른 서버와 차별점을 부여합니다. 이 정보는 여러 환경에서 보여질 수 있는데, 예를 들면 마스토돈 인터페이스, 네이티브 앱, 다른 웹사이트나 메시지 앱에서 보이는 링크 미리보기, 기타 등등이 있습니다. 이러한 이유로 인해, 이 정보를 명확하고 짧고 간결하게 유지하는 것이 가장 좋습니다.
+        title: 브랜딩
+      content_retention:
+        preamble: 마스토돈에 저장된 사용자 콘텐츠를 어떻게 다룰지 제어합니다.
+        title: 콘텐츠 보존기한
       default_noindex:
-        desc_html: 이 설정을 바꾸지 않은 모든 유저들에게 적용 됩니다
-        title: 유저들이 기본적으로 검색엔진에 인덱싱 되지 않도록 합니다
+        desc_html: 이 설정을 개인적으로 바꾸지 않은 모든 사용자들에게 적용 됩니다
+        title: 사용자들이 기본적으로 검색엔진에 인덱싱되지 않도록 합니다
+      discovery:
+        follow_recommendations: 팔로우 추천
+        preamble: 흥미로운 콘텐츠를 노출하는 것은 마스토돈을 알지 못할 수도 있는 신규 사용자를 유입시키는 데 중요합니다. 이 서버에서 작동하는 다양한 발견하기 기능을 제어합니다.
+        profile_directory: 프로필 책자
+        public_timelines: 공개 타임라인
+        title: 발견하기
+        trends: 유행
       domain_blocks:
         all: 모두에게
         disabled: 아무에게도 안 함
-        title: 도메인 차단 보여주기
-        users: 로그인 한 유저에게
-      domain_blocks_rationale:
-        title: 사유 보여주기
-      hero:
-        desc_html: 프론트페이지에 표시 됩니다. 최소 600x100픽셀을 권장합니다. 만약 설정되지 않았다면, 서버의 썸네일이 사용 됩니다
-        title: 히어로 이미지
-      mascot:
-        desc_html: 여러 페이지에서 보여집니다. 최소 293x205px을 추천합니다. 설정 되지 않은 경우, 기본 마스코트가 사용 됩니다
-        title: 마스코트 이미지
-      peers_api_enabled:
-        desc_html: 이 서버가 페디버스에서 만났던 도메인 네임들
-        title: 발견 된 서버들의 리스트 발행
-      preview_sensitive_media:
-        desc_html: 민감한 미디어로 설정되었더라도 다른 웹사이트에서 링크 미리보기에 썸네일을 보여줍니다
-        title: 민감한 미디어를 오픈그래프 미리보기에 보여주기
-      profile_directory:
-        desc_html: 유저들이 발견 될 수 있도록 허용
-        title: 프로필 책자 활성화
+        users: 로그인 한 사용자에게
       registrations:
-        closed_message:
-          desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. HTML 태그를 사용할 수 있습니다
-          title: 신규 등록 정지 시 메시지
-        deletion:
-          desc_html: 유저가 자신의 계정을 삭제할 수 있도록 허용합니다
-          title: 계정 삭제를 허가함
-        min_invite_role:
-          disabled: 아무도 못 하게
-          title: 초대링크를 만들 수 있는 권한
-        require_invite_text:
-          desc_html: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
-          title: 새 사용자가 초대 요청 글을 작성해야 하도록
+        preamble: 누가 이 서버에 계정을 만들 수 있는 지 제어합니다.
+        title: 가입
       registrations_mode:
         modes:
           approved: 가입하려면 승인이 필요함
           none: 아무도 가입 할 수 없음
           open: 누구나 가입 할 수 있음
-        title: 가입 모드
-      show_known_fediverse_at_about_page:
-        desc_html: 활성화 되면 프리뷰 페이지에서 페디버스의 모든 게시물을 표시합니다. 비활성화시 로컬에 있는 게시물만 표시 됩니다.
-        title: 타임라인 프리뷰에 알려진 페디버스 표시하기
-      show_staff_badge:
-        desc_html: 유저 페이지에 스태프 배지를 표시합니다
-        title: 스태프 배지 표시
-      site_description:
-        desc_html: API의 소개문에 사용 됩니다.이 마스토돈 서버의 특별한 점 등을 설명하세요. HTML 태그, 주로 <code>&lt;a&gt;</code>, <code>&lt;em&gt;</code> 같은 것을 사용 가능합니다.
-        title: 서버 설명
-      site_description_extended:
-        desc_html: 규칙, 가이드라인 등을 작성하기 좋은 곳입니다. HTML 태그를 사용할 수 있습니다
-        title: 사이트 상세 설명
-      site_short_description:
-        desc_html: 사이드바와 메타 태그에 나타납니다. 마스토돈이 무엇이고 이 서버의 특징은 무엇인지 한 문장으로 설명하세요.
-        title: 짧은 서버 설명
-      site_terms:
-        desc_html: 당신은 독자적인 개인정보 취급 방침이나 이용약관, 그 외의 법적 근거를 작성할 수 있습니다. HTML태그를 사용할 수 있습니다
-        title: 커스텀 서비스 이용 약관
-      site_title: 서버 이름
-      thumbnail:
-        desc_html: OpenGraph와 API의 미리보기로 사용 됩니다. 1200x630px을 권장합니다
-        title: 서버 썸네일
-      timeline_preview:
-        desc_html: 랜딩 페이지에 공개 타임라인을 표시합니다
-        title: 타임라인 프리뷰
-      title: 사이트 설정
-      trendable_by_default:
-        desc_html: 이전에 거부되지 않은 해시태그들에 영향을 미칩니다
-        title: 해시태그가 사전 리뷰 없이 트렌드에 올라갈 수 있도록 허용
-      trends:
-        desc_html: 리뷰를 거친 해시태그를 유행하는 해시태그에 공개적으로 보여줍니다
-        title: 유행하는 해시태그
+      title: 서버 설정
     site_uploads:
       delete: 업로드한 파일 삭제
       destroyed_msg: 사이트 업로드를 성공적으로 삭제했습니다!
     statuses:
+      account: 작성자
+      application: 애플리케이션
       back_to_account: 계정으로 돌아가기
+      back_to_report: 신고 페이지로 돌아가기
       batch:
-        delete: 삭제
-        nsfw_off: NSFW 끄기
-        nsfw_on: NSFW 켜기
+        remove_from_report: 신고에서 제거
+        report: 신고
       deleted: 삭제됨
-      failed_to_execute: 실행을 실패하였습니다
+      favourites: 좋아요
+      history: 버전 이력
+      in_reply_to: '회신 대상:'
+      language: 언어
       media:
         title: 미디어
-      no_media: 미디어 없음
-      no_status_selected: 아무 게시물도 선택 되지 않아 아무 것도 바뀌지 않았습니다
+      metadata: 메타데이터
+      no_status_selected: 아무 것도 선택 되지 않아 어떤 게시물도 바뀌지 않았습니다
+      open: 게시물 열기
+      original_status: 원본 게시물
+      reblogs: 리블로그
+      status_changed: 게시물 변경됨
       title: 계정 게시물
+      trending: 유행중
+      visibility: 공개 설정
       with_media: 미디어 있음
+    strikes:
+      actions:
+        delete_statuses: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다"
+        disable: "%{name} 님이 %{target}의 계정을 동결시켰습니다"
+        mark_statuses_as_sensitive: "%{name} 님이 %{target}의 게시물을 민감함으로 표시했습니다"
+        none: "%{name} 님이 %{target}에게 경고를 보냈습니다"
+        sensitive: "%{name} 님이 %{target}의 계정을 민감함으로 표시했습니다"
+        silence: "%{name} 님이 %{target}의 계정을 제한시켰습니다"
+        suspend: "%{name} 님이 %{target}의 계정을 정지시켰습니다"
+      appeal_approved: 이의제기됨
+      appeal_pending: 이의제기 대기중
     system_checks:
       database_schema_check:
-        message_html: 데이터베이스 마이그레이션이 대기중입니다. 응용프로그램이 예상한대로 동작할 수 있도록 마이그레이션을 실행해 주세요
+        message_html: 대기 중인 데이터베이스 마이그레이션이 있습니다. 애플리케이션이 예상대로 동작할 수 있도록 마이그레이션을 실행해 주세요
+      elasticsearch_running_check:
+        message_html: Elasticsearch에 연결할 수 없습니다. 실행중인지 확인하거나, 전문검색을 비활성화하세요
+      elasticsearch_version_check:
+        message_html: '호환되지 않는 Elasticsearch 버전: %{value}'
+        version_comparison: Elasticsearch %{required_version}버전이 필요하지만 %{running_version}버전이 실행 중입니다.
       rules_check:
         action: 서버 규칙 관리
         message_html: 아직 서버규칙을 정하지 않았습니다.
       sidekiq_process_check:
         message_html: "%{value} 큐에 대한 사이드킥 프로세스가 발견되지 않았습니다. 사이드킥 설정을 검토해주세요"
     tags:
-      accounts_today: 오늘의 순 사용자
-      accounts_week: 금주의 순 사용자
-      breakdown: 소스별 오늘의 사용량 분석
-      last_active: 최근에 사용됨
-      most_popular: 최고 인기
-      most_recent: 최근에 추가됨
-      name: 해시태그
       review: 심사 상태
-      reviewed: 심사 됨
-      title: 해시태그
-      trending_right_now: 지금 유행 중
-      unique_uses_today: 오늘 %{count}명이 포스팅
-      unreviewed: 심사 되지 않음
       updated_msg: 해시태그 설정이 성공적으로 갱신되었습니다
     title: 관리
+    trends:
+      allow: 허용
+      approved: 승인됨
+      disallow: 거부
+      links:
+        allow: 링크 허용하기
+        allow_provider: 출처 허용하기
+        description_html: 현재 서버에서 게시물을 볼 수 있는 계정에서 많이 공유되고 있는 링크들입니다. 사용자가 세상 돌아가는 상황을 파악하는 데 도움이 됩니다. 출처를 승인할 때까지 링크는 공개적으로 게시되지 않습니다. 각각의 링크를 개별적으로 허용하거나 거부할 수도 있습니다.
+        disallow: 링크 거부하기
+        disallow_provider: 출처 거부하기
+        no_link_selected: 아무 것도 선택 되지 않아 어떤 링크도 바뀌지 않았습니다
+        publishers:
+          no_publisher_selected: 아무 것도 선택 되지 않아 어떤 게시자도 바뀌지 않았습니다
+        shared_by_over_week:
+          other: 지난 주 동안 %{count} 명의 사람들이 공유했습니다
+        title: 유행하는 링크
+        usage_comparison: 오늘은 %{today}회 공유되었고, 어제는 %{yesterday}회 공유되었습니다
+      only_allowed: 허용된 것만
+      pending_review: 심사 대기
+      preview_card_providers:
+        allowed: 이 출처의 링크는 유행 목록에 실릴 수 있습니다
+        description_html: 당신의 서버에서 많은 링크가 공유되고 있는 도메인들입니다. 링크의 도메인이 승인되기 전까지는 링크들은 공개적으로 트렌드에 게시되지 않습니다. 당신의 승인(또는 거절)은 서브도메인까지 확장됩니다.
+        rejected: 이 출처의 링크는 유행 목록에 실릴 수 없습니다
+        title: 출처
+      rejected: 거부됨
+      statuses:
+        allow: 게시물 허용
+        allow_account: 작성자 허용
+        description_html: 당신의 서버가 알기로 현재 많은 수의 공유와 좋아요가 되고 있는 게시물들입니다. 새로운 사용자나 돌아오는 사용자들이 팔로우 할 사람들을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물들은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다.
+        disallow: 게시물 비허용
+        disallow_account: 작성자 불허
+        no_status_selected: 아무 것도 선택 되지 않아 어떤 유행중인 게시물도 바뀌지 않았습니다
+        not_discoverable: 작성자가 발견되기를 원치 않습니다
+        shared_by:
+          other: "%{friendly_count} 번 공유되고 마음에 들어했습니다"
+        title: 유행하는 게시물
+      tags:
+        current_score: 현재 %{score}점
+        dashboard:
+          tag_accounts_measure: 고유한 사용
+          tag_languages_dimension: 상위 언어
+          tag_servers_dimension: 상위 서버
+          tag_servers_measure: 다른 서버들
+          tag_uses_measure: 총 사용
+        description_html: 현재 서버에서 볼 수 있는 게시물에서 많이 공유되고 있는 해시태그들입니다. 현재 사람들이 무슨 이야기를 하고 있는지 사용자들이 파악할 수 있도록 도움이 됩니다. 승인하지 않는 한 해시태그는 공개적으로 게시되지 않습니다.
+        listable: 추천될 수 있습니다
+        no_tag_selected: 아무 것도 선택 되지 않아 어떤 태그도 바뀌지 않았습니다
+        not_listable: 추천될 수 없습니다
+        not_trendable: 유행 목록에 나타나지 않습니다
+        not_usable: 사용불가
+        peaked_on_and_decaying: "%{date}에 고점을 찍고, 떨어지고 있습니다"
+        title: 유행하는 해시태그
+        trendable: 유행 목록에 나타날 수 있습니다
+        trending_rank: "#%{rank}위로 유행 중"
+        usable: 사용 가능
+        usage_comparison: 오늘은 %{today}회 사용되었고, 어제는 %{yesterday}회 사용되었습니다
+        used_by_over_week:
+          other: 지난 주 동안 %{count} 명의 사람들이 사용했습니다
+      title: 유행
+      trending: 유행중
     warning_presets:
       add_new: 새로 추가
       delete: 삭제
       edit_preset: 경고 틀 수정
       empty: 아직 어떤 경고 틀도 정의되지 않았습니다.
       title: 경고 틀 관리
+    webhooks:
+      add_new: 엔드포인트 추가
+      delete: 삭제
+      description_html: "<strong>웹훅</strong>은 선택한 이벤트에 대해 마스토돈이 <strong>실시간 알림</strong>을 각자의 응용프로그램에게 보냄으로서, 당신의 응용프로그램이 <strong>자동으로 반응</strong>을 할 수 있도록 만듧니다."
+      disable: 비활성화
+      disabled: 비활성화됨
+      edit: 엔드포인트 수정
+      empty: 아직 설정한 웹훅 엔드포인트가 없습니다.
+      enable: 활성화
+      enabled: 활성화됨
+      enabled_events:
+        other: "%{count}개의 이벤트가 활성화되어 있습니다"
+      events: 이벤트
+      new: 새 웹훅
+      rotate_secret: 비밀키 회전
+      secret: 비밀키 서명
+      status: 상태
+      title: 웹훅
+      webhook: 웹훅
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: 게시물을 삭제하는 것
+        disable: 계정을 동결시키는 것
+        mark_statuses_as_sensitive: 게시물을 민감함으로 표시하는 것
+        none: 경고
+        sensitive: 계정을 민감함으로 표시하는 것
+        silence: 계정을 제한하는 것
+        suspend: 계정을 정지하는 것
+      body: "%{target} 님이 %{action_taken_by} 님에 의해 %{date}에 결정된 중재 결정에 대한 이의를 제기했습니다, 결정된 사항은 %{type}이었습니다. 작성내용은 다음과 같습니다:"
+      next_steps: 중재 결정사항을 되돌리기 위해서 상소를 승인하거나, 무시할 수 있습니다.
+      subject: "%{username} 님이 %{instance}에서 발생한 중재 결정에 대해 소명을 제출했습니다"
     new_pending_account:
       body: 아래에 새 계정에 대한 상세정보가 있습니다. 이 가입을 승인하거나 거부할 수 있습니다.
       subject: "%{instance}의 새 계정(%{username})에 대한 심사가 대기중입니다"
     new_report:
-      body: "%{reporter} 가 %{target} 를 신고했습니다"
+      body: "%{reporter} 님이 %{target}를 신고했습니다"
       body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다"
       subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
-    new_trending_tag:
-      body: '오늘 #%{name} 해시태그가 유행하고 있습니다, 하지만 심사 된 적이 없습니다. 허용하지 않는 한 공개적으로 나타나지 않습니다. 또는 그냥 저장을 눌러 더이상 나타나지 않게 할 수 있습니다.'
-      subject: 새 해시태그가 %{instance}에서 심사 대기 중입니다(#%{name})
+    new_trends:
+      body: '아래에 있는 항목들은 공개적으로 보여지기 전에 검토를 거쳐야 합니다:'
+      new_trending_links:
+        title: 유행하는 링크
+      new_trending_statuses:
+        title: 유행하는 게시물
+      new_trending_tags:
+        no_approved_tags: 현재 승인된 유행 중인 해시태그가 없습니다.
+        requirements: '이 후보들 중 어떤 것이라도 #%{rank}위의 승인된 유행 중인 해시태그를 앞지를 수 있으며, 이것은 현재 #%{lowest_tag_name}이고 %{lowest_tag_score}점을 기록하고 있습니다.'
+        title: 유행하는 해시태그
+      subject: 새 트렌드가 %{instance}에서 심사 대기 중입니다
   aliases:
     add_new: 별칭 만들기
     created_msg: 새 별칭이 성공적으로 만들어졌습니다. 이제 기존 계정에서 이주를 시작할 수 있습니다.
@@ -737,7 +917,6 @@ ko:
   applications:
     created: 애플리케이션이 성공적으로 생성되었습니다
     destroyed: 애플리케이션이 성공적으로 삭제되었습니다
-    invalid_url: 올바르지 않은 URL입니다
     regenerate_token: 토큰 재생성
     token_regenerated: 액세스 토큰이 성공적으로 재생성되었습니다
     warning: 이 데이터를 조심히 다뤄 주세요. 다른 사람들과 절대로 공유하지 마세요!
@@ -745,25 +924,25 @@ ko:
   auth:
     apply_for_account: 가입 요청하기
     change_password: 패스워드
-    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">서버 규칙</a>과 <a href="%{terms_path}" target="_blank">이용약관</a>에 동의합니다
-    checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">이용 약관</a>에 동의합니다
     delete_account: 계정 삭제
     delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
     description:
       prefix_invited_by_user: "@%{name} 님이 당신을 이 마스토돈 서버로 초대했습니다!"
       prefix_sign_up: 마스토돈에 가입하세요!
-      suffix: 계정 하나로 사람들을 팔로우 하고, 게시물을 작성하며 마스토돈을 포함한 다른 어떤 서버의 유저와도 메시지를 주고 받을 수 있습니다!
+      suffix: 계정 하나로 사람들을 팔로우 하고, 게시물을 작성하며 마스토돈을 포함한 다른 어떤 서버의 사용자와도 메시지를 주고 받을 수 있습니다!
     didnt_get_confirmation: 확인 메일을 받지 못하셨습니까?
     dont_have_your_security_key: 보안 키가 없습니까?
     forgot_password: 비밀번호를 잊어버리셨습니까?
     invalid_reset_password_token: 암호 리셋 토큰이 올바르지 못하거나 기간이 만료되었습니다. 다시 요청해주세요.
     link_to_otp: 휴대폰의 2차 코드 혹은 복구 키를 입력해 주세요
     link_to_webauth: 보안 키 장치 사용
+    log_in_with: 다음으로 로그인
     login: 로그인
     logout: 로그아웃
     migrate_account: 계정 옮기기
     migrate_account_html: 이 계정을 다른 계정으로 리디렉션 하길 원하는 경우 <a href="%{path}">여기</a>에서 설정할 수 있습니다.
     or_log_in_with: 다른 방법으로 로그인 하려면
+    privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">개인정보 보호정책</a>을 읽었고 동의합니다
     providers:
       cas: CAS
       saml: SAML
@@ -771,20 +950,29 @@ ko:
     registration_closed: "%{instance}는 새로운 가입을 받지 않고 있습니다"
     resend_confirmation: 확인 메일을 다시 보내기
     reset_password: 암호 재설정
+    rules:
+      preamble: 다음은 %{domain}의 중재자들에 의해 설정되고 적용되는 규칙들입니다.
+      title: 몇 개의 규칙이 있습니다.
     security: 보안
     set_new_password: 새 암호
     setup:
       email_below_hint_html: 아래의 이메일 계정이 올바르지 않을 경우, 여기서 변경하고 새 확인 메일을 받을 수 있습니다.
       email_settings_hint_html: 확인 메일이 %{email}로 보내졌습니다. 이메일 주소가 올바르지 않은 경우, 계정 설정에서 변경하세요.
       title: 설정
+    sign_in:
+      preamble_html: "<strong>%{domain}</strong>의 계정 정보를 이용해 로그인 하세요. 만약 내 계정이 다른 서버에 존재한다면, 여기서는 로그인 할 수 없습니다."
+      title: "%{domain}에 로그인"
+    sign_up:
+      preamble: 이 마스토돈 서버의 계정을 통해, 네트워크에 속한 다른 사람들을, 그들이 어떤 서버에 있든 팔로우 할 수 있습니다.
+      title: "%{domain}에 가입하기 위한 정보들을 입력하세요."
     status:
       account_status: 계정 상태
       confirming: 이메일 확인 과정이 완료되기를 기다리는 중.
       functional: 계정이 완벽히 작동합니다.
-      pending: 당신의 가입 신청은 스태프의 검사를 위해 대기중입니다. 이것은 시간이 다소 소요됩니다. 가입 신청이 승인 될 경우 이메일을 받게 됩니다.
+      pending: 당신의 가입 신청은 스태프의 검사를 위해 대기 중입니다. 시간이 조금 걸릴 수 있습니다. 가입 신청이 승인되면 이메일을 받게 됩니다.
       redirecting_to: 계정이 %{acct}로 리다이렉트 중이기 때문에 비활성 상태입니다.
+      view_strikes: 내 계정에 대한 과거 중재 기록 보기
     too_fast: 너무 빠르게 양식이 제출되었습니다, 다시 시도하세요.
-    trouble_logging_in: 로그인 하는데 문제가 있나요?
     use_security_key: 보안 키 사용
   authorize_follow:
     already_following: 이미 이 계정을 팔로우 하고 있습니다
@@ -795,7 +983,7 @@ ko:
     following: '성공! 당신은 다음 계정을 팔로우 하고 있습니다:'
     post_follow:
       close: 혹은, 당신은 이 윈도우를 닫을 수 있습니다.
-      return: 유저 프로필 보기
+      return: 사용자 프로필 보기
       web: 웹으로 가기
     title: "%{acct} 를 팔로우"
   challenge:
@@ -809,7 +997,7 @@ ko:
       invalid_signature: 유효하지 않은 Ed25519 서명
   date:
     formats:
-      default: "%Y-%b-%d"
+      default: "%Y-%m-%d"
       with_month_name: "%Y년 %B %d일"
   datetime:
     distance_in_words:
@@ -833,7 +1021,7 @@ ko:
     success_msg: 계정이 성공적으로 삭제되었습니다
     warning:
       before: '진행하기 전, 주의사항을 꼼꼼히 읽어보세요:'
-      caches: 다른 서버에 캐싱 된 정보들은 남아있을 수 있습니다
+      caches: 다른 서버에 캐싱된 정보들은 남아있을 수 있습니다
       data_removal: 당신의 게시물과 다른 정보들은 영구적으로 삭제 됩니다
       email_change_html: 계정을 지우지 않고도 <a href="%{path}">이메일 주소를 수정할 수 있습니다</a>
       email_contact_html: 아직 도착하지 않았다면, <a href="mailto:%{email}">%{email}</a>에 메일을 보내 도움을 요청할 수 있습니다
@@ -842,16 +1030,42 @@ ko:
       more_details_html: 더 자세한 정보는, <a href="%{terms_path}">개인정보 정책</a>을 참고하세요.
       username_available: 당신의 계정명은 다시 사용할 수 있게 됩니다
       username_unavailable: 당신의 계정명은 앞으로 사용할 수 없습니다
-  directories:
-    directory: 프로필 책자
-    explanation: 관심사에 대한 유저들을 발견합니다
-    explore_mastodon: "%{title} 탐사하기"
+  disputes:
+    strikes:
+      action_taken: 내려진 징계
+      appeal: 이의제기
+      appeal_approved: 이 중재기록은 소명이 받아들여졌으며 더이상 유효하지 않습니다
+      appeal_rejected: 소명이 기각되었습니다
+      appeal_submitted_at: 이의제기 접수됨
+      appealed_msg: 당신의 이의제기가 접수되었습니다. 만약 승인된다면, 알림을 받게 될 것입니다.
+      appeals:
+        submit: 이의 제출
+      approve_appeal: 이의제기 승인
+      associated_report: 관련된 신고
+      created_at: 날짜
+      description_html: 이 결정사항들은 당신에 계정에 대해 행해졌고 %{instance}의 스태프에 의해 경고가 발송되었습니다.
+      recipient: 수신자
+      reject_appeal: 이의 제기 거절
+      status: '게시물 #%{id}'
+      status_removed: 게시물이 이미 시스템에서 지워졌습니다
+      title: "%{action} (%{date}에)"
+      title_actions:
+        delete_statuses: 게시물 삭제
+        disable: 계정 동결
+        mark_statuses_as_sensitive: 게시물을 민감함으로 표시
+        none: 경고
+        sensitive: 계정을 민감함으로 표시
+        silence: 계정의 제한
+        suspend: 계정 정지
+      your_appeal_approved: 당신의 소명이 받아들여졌습니다
+      your_appeal_pending: 소명을 제출했습니다
+      your_appeal_rejected: 당신의 소명이 기각되었습니다
   domain_validator:
     invalid_domain: 올바른 도메인 네임이 아닙니다
   errors:
     '400': 제출한 요청이 올바르지 않습니다.
     '403': 이 페이지를 표시할 권한이 없습니다.
-    '404': 당신이 찾으려는 페이지는 존재하지 않습니다.
+    '404': 찾으려는 페이지가 존재하지 않습니다.
     '406': 이 페이지는 요청한 자료형으로 제공되지 않습니다.
     '410': 당신이 보려는 페이지는 더이상 여기에 존재하지 않습니다.
     '422':
@@ -864,7 +1078,7 @@ ko:
     '503': 이 페이지는 임시적인 서버 문제로 인해 제공 될 수 없습니다.
     noscript_html: 마스토돈을 사용하기 위해서는 자바스크립트를 켜 주십시오. 아니면 <a href="%{apps_path}">네이티브 앱</a> 중 하나를 사용할 수 있습니다.
   existing_username_validator:
-    not_found: 해당 유저네임에 대한 로컬 유저를 찾을 수 없습니다
+    not_found: 해당 사용자명에 대한 로컬 유저를 찾을 수 없습니다
     not_found_multiple: "%{usernames}를 찾을 수 없습니다"
   exports:
     archive_takeout:
@@ -875,7 +1089,7 @@ ko:
       request: 아카이브 요청하기
       size: 크기
     blocks: 차단
-    bookmarks: 보관함
+    bookmarks: 북마크
     csv: CSV
     domain_blocks: 도메인 차단
     lists: 리스트
@@ -894,55 +1108,62 @@ ko:
       public: 퍼블릭 타임라인
       thread: 대화
     edit:
+      add_keyword: 키워드 추가
+      keywords: 키워드
+      statuses: 개별 게시물
+      statuses_hint_html: 이 필터는 아래의 키워드에 매칭되는지 여부와 관계 없이 몇몇개의 게시물들에 별개로 적용되었습니다. <a href="%{path}">검토하거나 필터에서 삭제하세요</a>
       title: 필터 편집
     errors:
+      deprecated_api_multiple_keywords: 이 파라미터들은 하나를 초과하는 필터 키워드에 적용되기 때문에 이 응용프로그램에서 수정될 수 없습니다. 더 최신의 응용프로그램이나 웹 인터페이스를 사용하세요.
       invalid_context: 컨텍스트가 없거나 올바르지 않습니다
-      invalid_irreversible: 되돌릴 수 없는 필터링은 홈 타임라인과 알림에서만 동작합니다
     index:
+      contexts: "%{contexts}에 대한 필터"
       delete: 삭제
       empty: 필터가 없습니다.
+      expires_in: "%{distance} 안에 만료됨"
+      expires_on: "%{date}에 만료됨"
+      keywords:
+        other: "%{count}개의 키워드"
+      statuses:
+        other: "%{count}개의 게시물"
+      statuses_long:
+        other: "%{count}개의 개별적인 게시물 숨겨짐"
       title: 필터
     new:
+      save: 새 필터 저장
       title: 필터 추가
+    statuses:
+      back_to_filter: 필터로 돌아가기
+      batch:
+        remove: 필터에서 제거
+      index:
+        hint: 이 필터는 다른 기준에 관계 없이 선택된 개별적인 게시물들에 적용됩니다. 웹 인터페이스에서 더 많은 게시물들을 이 필터에 추가할 수 있습니다.
+        title: 필터링된 게시물
   footer:
-    developers: 개발자
-    more: 더 보기…
-    resources: 리소스
     trending_now: 지금 유행중
   generic:
     all: 모두
+    all_items_on_page_selected_html:
+      other: 현재 페이지에서 <strong>%{count}</strong>개의 항목이 선택되었습니다
+    all_matching_items_selected_html:
+      other: 검색에 잡힌 <strong>%{count}</strong>개의 항목이 모두 선택되었습니다
     changes_saved_msg: 정상적으로 변경되었습니다!
     copy: 복사
     delete: 삭제
-    no_batch_actions_available: 이 페이지에서 수행할 수 있는 일괄작업이 없습니다
+    deselect: 전체 선택 해제
+    none: 없음
     order_by: 순서
     save_changes: 변경 사항을 저장
+    select_all_matching_items:
+      other: 검색에 잡힌 %{count}개의 항목을 모두 선택하기
+    today: 오늘
     validation_errors:
       other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오
   html_validator:
     invalid_markup: '올바르지 않은 HTML 마크업을 포함하고 있습니다: %{error}'
-  identity_proofs:
-    active: 활성
-    authorize: 네, 인증합니다
-    authorize_connection_prompt: 이 암호화 연결을 인증합니까?
-    errors:
-      failed: 암호화 연결에 실패했습니다. %{provider}에서 다시 시도해 주세요.
-      keybase:
-        invalid_token: 키베이스 토큰은 서명의 해시이며 66자의 16진수 문자여야 합니다
-        verification_failed: 키베이스가 이 토큰을 키베이스 유저 %{kb_username}의 서명으로 인식하지 못했습니다. 키베이스에서 다시 시도하세요.
-      wrong_user: "%{current}로 로그인 한 상태에서는 %{proving}에 대한 증명을 할 수 없습니다. %{proving}으로 로그인 한 후 다시 시도하세요."
-    explanation_html: 키베이스와 같은 다른 명의에 대한 암호화 연결을 할 수 있습니다. 이것으로 다른 사람들이 당신에게 암호화 된 메시지를 보낼 수 있고 당신의 메시지를 믿을 수 있습니다.
-    i_am_html: 나는 %{service}의 %{username} 입니다.
-    identity: 신원
-    inactive: 비활성
-    publicize_checkbox: '그리고 이것을 게시하세요:'
-    publicize_toot: '증명되었습니다! 저는 %{service}에 있는 %{username}입니다: %{url}'
-    remove: 계정증명 삭제
-    removed: 성공적으로 계정증명을 삭제했습니다
-    status: 인증 상태
-    view_proof: 증명 보기
   imports:
     errors:
+      invalid_csv_file: '올바르지 않은 CSV 파일입니다. 오류: %{error}'
       over_rows_processing_limit: "%{count}개 이상의 열을 포함합니다"
     modes:
       merge: 병합
@@ -950,15 +1171,14 @@ ko:
       overwrite: 덮어쓰기
       overwrite_long: 기존 것을 모두 지우고 새로 추가
     preface: 다른 서버에서 내보내기 한 파일에서 팔로우 / 차단 정보를 이 계정으로 불러올 수 있습니다.
-    success: 파일이 정상적으로 업로드 되었으며, 현재 처리 중입니다
+    success: 파일이 정상적으로 업로드되었으며, 현재 처리 중입니다
     types:
       blocking: 차단한 계정 목록
-      bookmarks: 보관함
+      bookmarks: 북마크
       domain_blocking: 도메인 차단 목록
       following: 팔로우 중인 계정 목록
       muting: 뮤트 중인 계정 목록
     upload: 업로드
-  in_memoriam_html: 고인의 계정입니다.
   invites:
     delete: 비활성화
     expired: 만료됨
@@ -973,7 +1193,7 @@ ko:
     generate: 생성
     invited_by: '당신을 초대한 사람:'
     max_uses:
-      other: "%{count} 회"
+      other: "%{count}회"
     max_uses_prompt: 제한 없음
     prompt: 이 서버에 대한 초대 링크를 만들고 공유합니다
     table:
@@ -1035,24 +1255,22 @@ ko:
   move_handler:
     carry_blocks_over_text: 이 사용자는 당신이 차단한 %{acct}로부터 이주 했습니다.
     carry_mutes_over_text: 이 사용자는 당신이 뮤트한 %{acct}로부터 이주 했습니다.
-    copy_account_note_text: '이 사용자는 %{acct}로부터 이동하였습니다. 당신의 이전 노트는 이렇습니다:'
+    copy_account_note_text: '이 사용자는 %{acct}에서 옮겨왔으며 이전의 기록은 다음과 같습니다:'
+  navigation:
+    toggle_menu: 토글 메뉴
   notification_mailer:
-    digest:
-      action: 모든 알림 보기
-      body: 마지막 로그인(%{since}) 이후로 일어난 일들에 관한 요약
-      mention: "%{name} 님이 답장했습니다:"
-      new_followers_summary:
-        other: 게다가, 접속하지 않은 동안 %{count} 명의 팔로워가 생겼습니다!
-      subject:
-        other: "%{count}건의 새로운 알림 \U0001F418"
-      title: 당신이 없는 동안에...
+    admin:
+      report:
+        subject: "%{name} 님이 신고를 제출했습니다"
+      sign_up:
+        subject: "%{name} 님이 가입했습니다"
     favourite:
-      body: '당신의 게시물을 %{name} 님이 즐겨찾기에 등록했습니다:'
-      subject: "%{name} 님이 내 게시물을 즐겨찾기에 등록했습니다"
-      title: 새 즐겨찾기
+      body: '당신의 게시물을 %{name} 님이 마음에 들어했습니다:'
+      subject: "%{name} 님이 내 게시물을 마음에 들어했습니다"
+      title: 새 좋아요
     follow:
-      body: "%{name} 님이 나를 팔로우 했습니다!"
-      subject: "%{name} 님이 나를 팔로우 했습니다"
+      body: "%{name} 님이 나를 팔로우했습니다!"
+      subject: "%{name} 님이 나를 팔로우했습니다"
       title: 새 팔로워
     follow_request:
       action: 팔로우 요청 관리
@@ -1061,9 +1279,9 @@ ko:
       title: 새 팔로우 요청
     mention:
       action: 답장
-      body: "%{name} 님이 답장을 보냈습니다:"
-      subject: "%{name} 님이 답장을 보냈습니다"
-      title: 새 멘션
+      body: "%{name} 님이 나를 언급했습니다:"
+      subject: "%{name} 님이 나를 언급했습니다"
+      title: 새 답글
     poll:
       subject: "%{name}의 투표가 종료되었습니다"
     reblog:
@@ -1072,6 +1290,8 @@ ko:
       title: 새 부스트
     status:
       subject: "%{name} 님이 방금 게시물을 올렸습니다"
+    update:
+      subject: "%{name} 님이 게시물을 수정했습니다"
   notifications:
     email_events: 이메일 알림에 대한 이벤트
     email_events_hint: '알림 받을 이벤트를 선택해주세요:'
@@ -1115,9 +1335,11 @@ ko:
     other: 기타
     posting_defaults: 게시물 기본설정
     public_timelines: 공개 타임라인
+  privacy_policy:
+    title: 개인정보 정책
   reactions:
     errors:
-      limit_reached: 다른 리액션 제한에 도달했습니다
+      limit_reached: 리액션 갯수 제한에 도달했습니다
       unrecognized_emoji: 인식 되지 않은 에모지입니다
   relationships:
     activity: 계정 활동
@@ -1134,25 +1356,18 @@ ko:
     relationship: 관계
     remove_selected_domains: 선택한 도메인의 모든 팔로워 삭제
     remove_selected_followers: 선택한 팔로워 삭제
-    remove_selected_follows: 선택한 유저들을 팔로우 해제
+    remove_selected_follows: 선택한 사용자들을 팔로우 해제
     status: 계정 상태
   remote_follow:
-    acct: 당신이 사용하는 아이디@도메인을 입력해 주십시오
     missing_resource: 리디렉션 대상을 찾을 수 없습니다
-    no_account_html: 계정이 없나요? <a href='%{sign_up_path}' target='_blank'>여기에서 가입 할 수 있습니다</a>
-    proceed: 팔로우 하기
-    prompt: '팔로우 하려 하고 있습니다:'
-    reason_html: "<strong>왜 이 과정이 필요하죠?</strong><code>%{instance}</code>는 당신이 가입한 서버가 아닐 것입니다, 당신의 홈 서버로 먼저 가야 합니다."
-  remote_interaction:
-    favourite:
-      proceed: 즐겨찾기 진행
-      prompt: '이 게시물을 즐겨찾기 하려고 합니다:'
-    reblog:
-      proceed: 부스트 진행
-      prompt: '이 게시물을 부스트 하려 합니다:'
-    reply:
-      proceed: 답장 진행
-      prompt: '이 게시물에 답장을 하려 합니다:'
+  reports:
+    errors:
+      invalid_rules: 올바른 규칙을 포함하지 않습니다
+  rss:
+    content_warning: '열람 주의:'
+    descriptions:
+      account: "@%{acct}의 공개 게시물"
+      tag: "#%{hashtag} 해시태그가 붙은 공개 게시물"
   scheduled_statuses:
     over_daily_limit: 그 날짜에 대한 %{limit}개의 예약 게시물 제한을 초과합니다
     over_total_limit: 예약 게시물 제한 %{limit}을 초과합니다
@@ -1176,11 +1391,11 @@ ko:
       phantom_js: 팬텀JS
       qq: QQ 브라우저
       safari: 사파리
-      uc_browser: UC브라우저
+      uc_browser: UC 브라우저
       weibo: 웨이보
     current_session: 현재 세션
     description: "%{platform}의 %{browser}"
-    explanation: 내 마스토돈 계정에 현재 로그인 중인 웹 브라우저 목록입니다.
+    explanation: 내 마스토돈 계정에 로그인되어 있는 웹 브라우저 목록입니다.
     ip: IP
     platforms:
       adobe_air: 어도비 Air
@@ -1190,11 +1405,11 @@ ko:
       firefox_os: 파이어폭스OS
       ios: iOS
       linux: 리눅스
-      mac: 맥OS
+      mac: macOS
       other: 알 수 없는 플랫폼
-      windows: 윈도우즈
-      windows_mobile: 윈도우즈 모바일
-      windows_phone: 윈도우즈 폰
+      windows: 윈도우
+      windows_mobile: 윈도우 모바일
+      windows_phone: 윈도우 폰
     revoke: 삭제
     revoke_success: 세션이 성공적으로 삭제되었습니다
     title: 세션
@@ -1205,13 +1420,12 @@ ko:
     aliases: 계정 별명
     appearance: 외관
     authorized_apps: 인증된 애플리케이션
-    back: 돌아가기
+    back: 마스토돈으로 돌아가기
     delete: 계정 삭제
     development: 개발
     edit_profile: 프로필 편집
     export: 데이터 내보내기
     featured_tags: 추천 해시태그
-    identity_proofs: 신원 증명
     import: 데이터 가져오기
     import_and_export: 가져오기 / 내보내기
     migrate: 계정 이동
@@ -1220,6 +1434,7 @@ ko:
     profile: 프로필
     relationships: 팔로잉과 팔로워
     statuses_cleanup: 게시물 자동 삭제
+    strikes: 중재 기록
     two_factor_authentication: 2단계 인증
     webauthn_authentication: 보안 키
   statuses:
@@ -1228,22 +1443,23 @@ ko:
         other: "%{count}개의 오디오"
       description: '첨부: %{attached}'
       image:
-        other: "%{count} 이미지"
+        other: "%{count}장의 이미지"
       video:
         other: "%{count}개의 영상"
-    boosted_from_html: "%{acct_link} 님으로부터 부스트"
+    boosted_from_html: "%{acct_link}의 글을 부스트"
     content_warning: '열람 주의: %{warning}'
+    default_language: 화면 표시 언어와 동일하게
     disallowed_hashtags:
       other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'
+    edited_at_html: "%{date}에 편집됨"
     errors:
       in_reply_not_found: 답장하려는 게시물이 존재하지 않습니다.
-    language_detection: 자동으로 언어 감지
     open_in_web: Web으로 열기
     over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
     pin_errors:
+      direct: 멘션된 사용자들에게만 보이는 게시물은 고정될 수 없습니다
       limit: 이미 너무 많은 게시물을 고정했습니다
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
-      private: 비공개 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
     poll:
       total_people:
@@ -1263,17 +1479,17 @@ ko:
       private_long: 팔로워에게만 공개됩니다
       public: 공개
       public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
-      unlisted: 공개 타임라인 비공개
+      unlisted: 공개 타임라인 비표시
       unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
   statuses_cleanup:
     enabled: 오래된 게시물 자동 삭제
     enabled_hint: 아래의 예외 목록에 해당하지 않는다면, 명시된 기한 이후 당신의 게시물을 자동으로 삭제합니다
     exceptions: 예외
     explanation: 게시물 삭제는 많은 성능이 필요하기 때문에, 서버에서 바쁘지 않을 때 시간을 들여서 천천히 진행합니다. 이런 이유로, 당신의 게시물은 아마도 정해진 기간보다 좀 더 시간이 지난 이후에 삭제될 것입니다.
-    ignore_favs: 즐겨찾기 무시
+    ignore_favs: 좋아요 무시
     ignore_reblogs: 부스트 무시
     interaction_exceptions: 상호작용에 기반한 예외들
-    interaction_exceptions_explanation: 즐겨찾기나 부스트 수가 설정한 값을 넘은 후 다시 낮아진 경우에는 게시물이 삭제되는 것을 보장하지 못합니다.
+    interaction_exceptions_explanation: 좋아요나 부스트 수가 설정한 값을 넘은 후 다시 낮아진 경우에는 게시물이 삭제되는 것을 보장하지 못합니다.
     keep_direct: 다이렉트 메시지 유지
     keep_direct_hint: 다이렉트 메시지를 삭제하지 않습니다
     keep_media: 미디어가 있는 게시물 유지
@@ -1282,112 +1498,33 @@ ko:
     keep_pinned_hint: 고정 게시물을 삭제하지 않습니다
     keep_polls: 투표 유지
     keep_polls_hint: 투표를 삭제하지 않습니다
-    keep_self_bookmark: 북마크된 게시물 유지
-    keep_self_bookmark_hint: 내 스스로 북마크한 본인의 게시물을 삭제하지 않습니다
-    keep_self_fav: 즐겨찾기한 게시물 유지
-    keep_self_fav_hint: 내 스스로 즐겨찾기한 본인의 게시물을 삭제하지 않습니다
+    keep_self_bookmark: 북마크한 게시물 유지
+    keep_self_bookmark_hint: 북마크한 본인의 게시물을 삭제하지 않습니다
+    keep_self_fav: 마음에 들어한 게시물 유지
+    keep_self_fav_hint: 내 스스로 마음에  들어한 본인의 게시물을 삭제하지 않습니다
     min_age:
       '1209600': 2 주
       '15778476': 6 개월
       '2629746': 1 개월
       '31556952': 1 년
       '5259492': 2 개월
+      '604800': 1주일
       '63113904': 2 년
       '7889238': 3 개월
     min_age_label: 기한
-    min_favs: 해당 횟수 이상 즐겨찾기된 게시물 유지
-    min_favs_hint: 이 횟수 이상의 즐겨찾기가 된 게시물은 삭제하지 않습니다. 즐겨찾기 수와 관계없이 게시물을 지우고 싶다면 공백으로 두세요
+    min_favs: 해당 횟수 이상 좋아요된 게시물 유지
+    min_favs_hint: 이 횟수 이상의 좋아요가 된 게시물은 삭제하지 않습니다. 좋아요 수와 관계없이 게시물을 지우고 싶다면 공백으로 두세요
     min_reblogs: 해당 횟수 이상 부스트된 게시물 유지
     min_reblogs_hint: 이 횟수 이상의 부스트가 된 게시물은 삭제하지 않습니다. 부스트 수와 관계없이 게시물을 지우고 싶다면 공백으로 두세요
   stream_entries:
     pinned: 고정된 게시물
     reblogged: 님이 부스트 했습니다
-    sensitive_content: 민감한 컨텐츠
+    sensitive_content: 민감한 콘텐츠
+  strikes:
+    errors:
+      too_late: 이의를 제기하기에 너무 늦었습니다
   tags:
     does_not_match_previous_name: 이전 이름과 맞지 않습니다
-  terms:
-    body_html: |
-      <h2>개인정보 정책</h2>
-      <h3 id="collect">우리가 어떤 정보를 수집하나요?</h3>
-
-      <ul>
-      <li><em>기본 계정 정보</em>: 이 서버에 가입하실 때 사용자명, 이메일 주소, 패스워드 등을 입력 받게 됩니다. 추가적으로 표시되는 이름이나 자기소개, 프로필 이미지, 헤더 이미지 등의 프로필 정보를 입력하게 됩니다. 사용자명, 표시되는 이름, 자기소개, 프로필 이미지와 헤더 이미지는 언제나 공개적으로 게시됩니다.</li>
-      <li><em>게시물, 팔로잉, 기타 공개된 정보</em>: 당신이 팔로우 하는 사람들의 리스트는 공개됩니다. 당신을 팔로우 하는 사람들도 마찬가지입니다. 당신이 게시물을 작성하는 경우, 응용프로그램이 메시지를 받았을 때의 날짜와 시간이 기록 됩니다. 게시물은 그림이나 영상 등의 미디어를 포함할 수 있습니다. 퍼블릭과 미표시(unlisted) 게시물은 공개적으로 접근이 가능합니다. 프로필에 게시물을 고정하는 경우 마찬가지로 공개적으로 접근 가능한 정보가 됩니다. 당신의 게시물들은 당신의 팔로워들에게 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송되고 그곳에 사본이 저장 됩니다. 당신이 게시물을 삭제하는 경우 이 또한 당신의 팔로워들에게 전송 됩니다. 다른 게시물을 리블로깅 하거나 즐겨찾기 하는 경우 이는 언제나 공개적으로 제공 됩니다.</li>
-      <li><em>DM, 팔로워 공개 게시물</em>: 모든 게시물들은 서버에서 처리되고 저장됩니다. 팔로워 공개 게시물은 당신의 팔로워와 멘션 된 사람들에게 전달이 됩니다. 다이렉트 메시지는 멘션 된 사람들에게만 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송 되고 그곳에 사본이 저장됨을 의미합니다. 우리는 이 게시물들이 권한을 가진 사람들만 열람이 가능하도록 노력을 할 것이지만 다른 서버에서는 이것이 실패할 수도 있습니다. 그러므로 당신의 팔로워들이 속한 서버를 재확인하는 것이 중요합니다. 당신은 새 팔로워를 수동으로 승인하거나 거절하도록 설정을 변경할 수 있습니다. <em>해당 서버의 운영자는 서버가 받는 메시지를 열람할 수 있다는 것을 항상 염두해 두세요</em>, 그리고 수신자들은 스크린샷을 찍거나 복사하는 등의 방법으로 다시 공유할 수 있습니다. <em>위험한 정보를 마스토돈을 통해 공유하지 마세요.</em></li>
-      <li><em>IP와 기타 메타데이터</em>: 당신이 로그인 하는 경우 IP 주소와 브라우저의 이름을 저장합니다. 모든 세션은 당신이 검토하고 취소할 수 있도록 설정에서 제공 됩니다. 마지막으로 사용 된 IP 주소는 최대 12개월 간 저장됩니다. 또한, 모든 요청에 대해 IP주소를 포함한 정보를 로그에 저장할 수 있습니다.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">우리가 당신의 정보를 어디에 쓰나요?</h3>
-
-      <p>당신에게서 수집한 정보는 다음과 같은 곳에 사용 됩니다:</p>
-
-      <ul>
-      <li>마스토돈의 주요 기능 제공. 다른 사람의 게시물에 상호작용 하거나 자신의 게시물을 작성하기 위해서는 로그인을 해야 합니다. 예를 들어, 다른 사람의 게시물을 자신만의 홈 타임라인에서 모아 보기 위해 팔로우를 할 수 있습니다.</li>
-      <li>커뮤니티의 중재를 위해, 예를 들어 당신의 IP 주소와 기타 사항을 비교하여 금지를 우회하거나 다른 규칙을 위반하는지 판단하는 데에 사용할 수 있습니다.</li>
-      <li>당신이 제공한 이메일 주소를 통해 정보, 다른 사람들의 반응이나 받은 메시지에 대한 알림, 기타 요청 등에 관한 응답 요청 등을 보내는 데에 활용됩니다.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">어떻게 당신의 정보를 보호하나요?</h3>
-
-      <p>우리는 당신이 입력, 전송, 접근하는 개인정보를 보호하기 위해 다양한 보안 대책을 적용합니다. 당신의 브라우저 세션, 당신의 응용프로그램과의 통신, API는 SSL로 보호 되며 패스워드는 강력한 단방향 해시 알고리즘을 사용합니다. 계정의 더 나은 보안을 위해 2단계 인증을 활성화 할 수 있습니다.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">자료 저장 정책은 무엇이죠?</h3>
-
-      <p>우리는 다음을 위해 노력을 할 것입니다:</p>
-
-      <ul>
-      <li>IP를 포함해 이 서버에 전송 되는 모든 요청에 대한 로그는 90일을 초과하여 저장되지 않습니다.</li>
-      <li>가입 된 사용자의 IP 정보는 12개월을 초과하여 저장 되지 않습니다.</li>
-      </ul>
-
-      <p>당신은 언제든지 게시물, 미디어 첨부, 프로필 이미지, 헤더 이미지를 포함한 당신의 컨텐트에 대한 아카이브를 요청하고 다운로드 할 수 있습니다.</p>
-
-      <p>언제든지 계정을 완전히 삭제할 수 있습니다.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">쿠키를 사용하나요?</h3>
-
-      <p>네. 쿠키는 (당신이 허용한다면) 당신의 웹 브라우저를 통해 서버에서 당신의 하드드라이브에 저장하도록 전송하는 작은 파일들입니다. 이 쿠키들은 당신의 브라우저를 인식하고, 계정이 있는 경우 이와 연결하는 것을 가능하게 합니다.</p>
-
-      <p>당신의 환경설정을 저장하고 다음 방문에 활용하기 위해 쿠키를 사용합니다.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">외부에 정보를 공개하나요?</h3>
-
-      <p>우리는 당신을 식별 가능한 개인정보를 외부에 팔거나 제공하거나 전송하지 않습니다. 이는 당사의 사이트를 운영하기 위한, 기밀 유지에 동의하는, 신뢰 가능한 서드파티를 포함하지 않습니다. 또한 법률 준수, 사이트 정책 시행, 또는 당사나 타인에 대한 권리, 재산, 또는 안전보호를 위해 적절하다고 판단되는 경우 당신의 정보를 공개할 수 있습니다.</p>
-
-      <p>당신의 공개 게시물은 네트워크에 속한 다른 서버가 다운로드 할 수 있습니다. 당신의 팔로워나 수신자가 이 서버가 아닌 다른 곳에 존재하는 경우 당신의 공개, 팔로워 공개 게시물은 당신의 팔로워가 존재하는 서버로 전송되며, 다이렉트메시지는 수신자가 존재하는 서버로 전송 됩니다.</p>
-
-      <p>당신이 계정을 사용하기 위해 응용프로그램을 승인하는 경우 당신이 허용한 권한에 따라 응용프로그램은 당신의 공개 계정정보, 팔로잉 리스트, 팔로워 리스트, 게시물, 즐겨찾기 등에 접근이 가능해집니다. 응용프로그램은 절대로 당신의 이메일 주소나 패스워드에 접근할 수 없습니다.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">어린이의 사이트 사용</h3>
-
-      <p>이 서버가 EU나 EEA에 속해 있다면: 당사의 사이트, 제품과 서비스는 16세 이상인 사람들을 위해 제공됩니다. 당신이 16세 미만이라면 GDPR(<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>)의 요건에 따라 이 사이트를 사용할 수 없습니다.</p>
-
-      <p>이 서버가 미국에 속해 있다면: 당사의 사이트, 제품과 서비스는 13세 이상인 사람들을 위해 제공됩니다. 당신이 13세 미만이라면 COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>)의 요건에 따라 이 사이트를 사용할 수 없습니다.</p>
-
-      <p>이 서버가 있는 관할권에 따라 법적 요구가 달라질 수 있습니다.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">개인정보 정책의 변경</h3>
-
-      <p>만약 우리의 개인정보 정책이 바뀐다면, 이 페이지에 바뀐 정책이 포스트 됩니다.</p>
-
-      <p>이 문서는 CC-BY-SA 라이센스입니다. 마지막 업데이트는 2018년 3월 7일입니다.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} 이용약관과 개인정보 취급 방침"
   themes:
     contrast: 마스토돈 (고대비)
     default: 마스토돈 (어두움)
@@ -1396,6 +1533,7 @@ ko:
     formats:
       default: "%Y년 %m월 %d일 %H:%M"
       month: "%Y년 %b"
+      time: "%H:%M"
   two_factor_authentication:
     add: 추가
     disable: 비활성화
@@ -1412,78 +1550,88 @@ ko:
     recovery_instructions_html: 휴대전화를 분실한 경우, 아래 복구 코드 중 하나를 사용해 계정에 접근할 수 있습니다. <strong>복구 코드는 안전하게 보관해 주십시오.</strong> 이 코드를 인쇄해 중요한 서류와 함께 보관하는 것도 좋습니다.
     webauthn: 보안 키
   user_mailer:
+    appeal_approved:
+      action: 내 계정으로 가기
+      explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
+      subject: "%{date}에 작성한 소명이 승인되었습니다"
+      title: 소명이 받아들여짐
+    appeal_rejected:
+      explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했지만 거절되었습니다."
+      subject: "%{date}에 작성한 소명이 거절되었습니다"
+      title: 이의 제기가 거절되었습니다
     backup_ready:
       explanation: 당신이 요청한 계정의 풀 백업이 이제 다운로드 가능합니다!
       subject: 당신의 아카이브를 다운로드 가능합니다
       title: 아카이브 테이크 아웃
-    sign_in_token:
-      details: '시도에 대한 상세 내용입니다:'
-      explanation: '알 수 없는 IP로부터 당신의 계정에 대한 로그인 시도를 감지했습니다. 이것이 당신이라면, 아래의 보안 코드를 로그인 시도 페이지에 입력하세요:'
-      further_actions: '이것이 당신이 아니라면 암호를 바꾸고 계정의 2-factor 인증을 활성화 하세요. 여기에서 할 수 있습니다:'
-      subject: 로그인 시도를 확인해 주십시오
-      title: 로그인 시도
+    suspicious_sign_in:
+      change_password: 암호 변경
+      details: '로그인에 대한 상세 정보입니다:'
+      explanation: 새로운 IP 주소에서 내 계정에 로그인한 것을 감지했습니다.
+      further_actions_html: 직접 로그인한 것이 아니라면, 지금 바로 %{action}과 2단계 인증을 활성화하여 계정을 안전하게 보호하시길 권해드립니다.
+      subject: 계정이 새로운 IP에서 접근됨
+      title: 새로운 로그인
     warning:
+      appeal: 이의 제출하기
+      appeal_description: 이것이 오류라고 생각한다면, %{instance}의 중재자에게 이의신청을 할 수 있습니다.
+      categories:
+        spam: 스팸
+        violation: 콘텐츠가 다음의 커뮤니티 규정을 위반합니다
       explanation:
-        disable: 당신의 계정이 동결 된 동안 당신의 계정은 유지 됩니다. 하지만 잠금이 풀릴 때까지 당신은 아무 것도 할 수 없습니다.
-        sensitive: 당신의 업로드 한 미디어 파일들과 링크된 미디어들은 민감함으로 취급됩니다.
-        silence: 당신의 계정이 제한 된 동안엔 당신의 팔로워 이외엔 게시물을 받아 볼 수 없고 공개 리스팅에서 제외 됩니다. 하지만 다른 사람들은 여전히 당신을 팔로우 가능합니다.
-        suspend: 당신의 계정은 정지 되었으며, 모든 게시물과 업로드 한 미디어가 서버에서 삭제 되어 되돌릴 수 없습니다.
-      get_in_touch: 이 메일에 대해 답장해서 %{instance}의 스태프와 연락 할 수 있습니다.
-      review_server_policies: 서버 정책 검토하기
-      statuses: '구체적으로:'
+        delete_statuses: 귀하의 게시물 중 일부가 하나 이상의 커뮤니티 가이드라인을 위반한 것으로 확인되어 %{instance}의 중재자에 의해 삭제되었습니다.
+        disable: 당신은 더이상 당신의 계정을 사용할 수 없습니다, 하지만 프로필과 다른 데이터들은 여전히 그대로 남아있습니다. 당신의 데이터에 대한 백업을 요청하거나, 계정 설정을 변경 또는 계정을 삭제할 수 있습니다.
+        mark_statuses_as_sensitive: 당신의 몇몇 게시물들은 %{instance}의 중재자에 의해 민감함으로 설정되었습니다. 이것은 사람들이 미리보기를 보기 전에 미디어를 한번 눌러야 함을 의미합니다. 당신은 스스로도 자신의 게시물을 작성할 때 미디어를 민감함으로 설정할 수 있습니다.
+        sensitive: 지금부터는, 당신이 업로드한 미디어 파일들은 민감함 표시가 뜨게 되고 클릭해야만 볼 수 있다는 경고문 뒤에 가려지게 됩니다.
+        silence: 당신은 여전히 당신의 계정을 사용할 수 있지만 당신을 팔로우 하고 있는 사람들만 당신의 게시물을 볼 수 있으며, 여러가지 탐색 기능에서 제외됩니다. 하지만, 여전히 다른 사람들은 수동으로 당신을 팔로우 할 수 있습니다.
+        suspend: 당신은 더이상 당신의 계정을 사용할 수 없으며, 프로필과 데이터는 접근 불가능하게 됩니다. 데이터가 완전히 삭제되기 전인 30일동안은 여전히 백업을 요청하기 위해 로그인 할 수 있습니다, 하지만 계정 정지를 회피하는 것을 방지하기 위하여 몇 가지 정보는 유지됩니다.
+      reason: '사유:'
+      statuses: '인용된 게시물:'
       subject:
+        delete_statuses: 당신의 계정 %{acct}에서 작성한 게시물이 삭제되었습니다
         disable: 당신의 계정 %{acct}가 동결 되었습니다
+        mark_statuses_as_sensitive: "%{acct}로 작성한 당신의 게시물은 민감한 것으로 표시되었습니다"
         none: "%{acct}에게의 경고"
-        sensitive: 당신의 계정 %{acct}에서 포스팅 하는 미디어는 민감함으로 설정되었습니다
+        sensitive: "%{acct}로 작성되는 당신의 게시물은 이제부터 민감한 것으로 표시됩니다"
         silence: 당신의 계정 %{acct}가 제한 되었습니다
         suspend: 당신의 계정 %{acct}가 정지 되었습니다
       title:
+        delete_statuses: 게시물 삭제됨
         disable: 계정 동결 됨
+        mark_statuses_as_sensitive: 게시물이 민감함으로 표시됨
         none: 경고
-        sensitive: 당신의 미디어는 민감함으로 표시되었습니다
+        sensitive: 계정이 민감함으로 표시됨
         silence: 계정 제한 됨
         suspend: 계정 정지 됨
     welcome:
       edit_profile_action: 프로필 설정
-      edit_profile_step: 아바타, 헤더를 업로드하고, 사람들에게 표시 될 이름을 바꾸는 것으로 당신의 프로필을 커스텀 할 수 있습니다. 사람들이 당신을 팔로우 하기 전에 리뷰를 거치게 하고 싶다면 계정을 잠그면 됩니다.
+      edit_profile_step: 프로필 사진을 업로드하고, 사람들에게 표시 될 이름을 바꾸는 것 등으로 당신의 프로필을 커스텀 할 수 있습니다. 사람들이 당신을 팔로우 하기 전에 리뷰를 거치게 할 수도 있습니다.
       explanation: 시작하기 전에 몇가지 팁들을 준비했습니다
       final_action: 포스팅 시작하기
-      final_step: '포스팅을 시작하세요! 팔로워가 없더라도 퍼블릭 메시지는 다른 사람들이 볼 수 있습니다, 예를 들면 로컬 타임라인이나 해시태그에서요. 사람들에게 자신을 소개하고 싶다면 #introductions 해시태그를 이용해보세요.'
-      full_handle: 당신의 풀 핸들
+      final_step: '게시물을 올리세요! 팔로워가 없더라도, 공개 게시물들은 다른 사람에게 보여질 수 있습니다, 예를 들자면 로컬이나 연합 타임라인 등이 있습니다. 사람들에게 자신을 소개하고 싶다면 #툿친소 해시태그를 이용해보세요.'
+      full_handle: 당신의 풀 핸들은 다음과 같습니다
       full_handle_hint: 이것을 당신의 친구들에게 알려주면 다른 서버에서 팔로우 하거나 메시지를 보낼 수 있습니다.
-      review_preferences_action: 설정 바꾸기
-      review_preferences_step: 당신의 설정을 확인하세요. 어떤 이메일로 알림을 받을 것인지, 기본적으로 어떤 프라이버시 설정을 사용할 것인지, 멀미가 없다면 GIF를 자동 재생하도록 설정할 수도 있습니다.
       subject: 마스토돈에 오신 것을 환영합니다
-      tip_federated_timeline: 연합 타임라인은 마스토돈 네트워크의 소방호스입니다. 다만 여기엔 당신의 이웃들이 구독 중인 것만 뜹니다, 모든 것이 다 오는 것은 아니예요.
-      tip_following: 기본적으로 서버의 관리자를 팔로우 하도록 되어 있습니다. 흥미로운 사람들을 더 찾으려면 로컬과 연합 타임라인을 확인해 보세요.
-      tip_local_timeline: 로컬 타임라인은 %{instance}의 소방호스입니다. 여기 있는 사람들은 당신의 이웃들이에요!
-      tip_mobile_webapp: 모바일 브라우저가 홈 스크린에 바로가기를 추가해 줬다면 푸시 알림도 받을 수 있습니다. 이건 거의 네이티브 앱처럼 작동해요!
-      tips: 팁
       title: 환영합니다 %{name} 님!
   users:
     follow_limit_reached: 당신은 %{limit}명의 사람을 넘어서 팔로우 할 수 없습니다
-    generic_access_help_html: 계정 로그인에 문제가 있나요? %{email} 로 도움을 요청할 수 있습니다
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
-    invalid_sign_in_token: 잘못된 보안 코드
     otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
-    seamless_external_login: 외부 서비스를 이용해 로그인 했습니다, 패스워드와 이메일 설정을 할 수 없습니다.
+    seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
     signed_in_as: '다음과 같이 로그인 중:'
-    suspicious_sign_in_confirmation: 이 기기에서 로그인 한 적이 없거나, 로그인 한 지 오래된 것으로보입니다. 본인임을 확인하기 위해 이메일 주소로 보안 코드를 보냈습니다.
   verification:
     explanation_html: '당신은 <strong>프로필 메타데이터의 링크 소유자임을 검증할 수 있습니다</strong>. 이것을 하기 위해서는, 링크 된 웹사이트에서 당신의 마스토돈 프로필을 역으로 링크해야 합니다. 역링크는 <strong>반드시</strong> <code>rel="me"</code> 속성을 가지고 있어야 합니다. 링크의 텍스트는 상관이 없습니다. 여기 예시가 있습니다:'
     verification: 검증
   webauthn_credentials:
     add: 보안 키 추가
     create:
-      error: 보안 키를 추가하는데 문제가 발생했습니다. 다시 시도해보십시오.
+      error: 보안 키를 추가하는 데 문제가 발생했습니다. 다시 시도해보십시오.
       success: 보안 키가 성공적으로 추가되었습니다.
     delete: 삭제
     delete_confirmation: 정말로 이 보안 키를 삭제하시겠습니까?
     description_html: "<strong>보안 키 인증</strong>을 활성화 하면, 로그인 시 보안 키 중 하나가 필요합니다."
     destroy:
-      error: 보안 키를 삭제하는데 문제가 발생했습니다. 다시 시도해보십시오.
+      error: 보안 키를 삭제하는 데 문제가 발생했습니다. 다시 시도해보십시오.
       success: 보안 키가 성공적으로 삭제되었습니다.
-    invalid_credential: 잘못된 보안 키
+    invalid_credential: 올바르지 않은 보안 키
     nickname_hint: 새 보안 키의 별명을 입력해 주세요
     not_enabled: 아직 WebAuthn을 활성화 하지 않았습니다.
     not_supported: 이 브라우저는 보안 키를 지원하지 않습니다
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 7b8dde598..ccee57b42 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1,1324 +1,1671 @@
 ---
 ku:
   about:
-    about_hashtag_html: ئەمانە توتی گشتین بە هەشتەگی گشتی <strong>#%{hashtag}}</strong>. گەر ئێوە لە هەر ڕاژەیەک هەژمارەتان بێت دەتوانیت لێرە بەم نووسراوانە هاوئاهەنگ بن.
-    about_mastodon_html: 'تۆڕی کۆمەڵایەتی داهاتوو: هیچ ڕیکلامێک ، هیچ چاودێرییەکی کۆمپانیا ، دیزاینی ئەخلاقی و لامەرکەزی! خاوەنی داتاکانت نابێ لە ماستۆدۆن!'
-    about_this: دەربارە
-    active_count_after: چالاک
-    active_footnote: بەکارهێنەرانی چالاکی مانگانە (MAU)
-    administered_by: 'بەڕێوەبراو لەلایەن:'
-    apps: ئەپەکانی مۆبایل
-    apps_platforms: بەکارهێنانی ماستۆدۆن لە iOS، ئەندرۆید و سەکۆکانی تر
-    browse_directory: گەڕان لە ڕێبەرێکی پرۆفایل و پاڵاوتن بەپێی بەرژەوەندیەکان
-    browse_local_posts: گەڕانی ڕاستەوخۆ لە نووسراوە گشتیەکان لەم ڕاژەوە
-    browse_public_posts: گەڕان لە جۆگەیەکی زیندووی نووسراوە گشتیەکان لەسەر ماستۆدۆن
-    contact: بەردەنگ
-    contact_missing: سازنەکراوە
-    contact_unavailable: بوونی نییە
-    discover_users: پەیداکردنی بەکارهێنەران
-    documentation: بەڵگەکان
-    federation_hint_html: بە هەژمارەیەک لەسەر %{instance} دەتوانیت شوێن خەڵک بکەویت لەسەر هەرڕاژەیەکی ماستۆدۆن.
-    get_apps: ئەپێکی تەلەفۆن تاقی بکەرەوە
-    hosted_on: مەستودۆن میوانداری کراوە لە %{domain}
-    instance_actor_flash: |
-      ئەم هەژمارەیە ئەکتەرێکی خەیاڵی بەکارهاتووە بۆ نوێنەرایەتی کردنی خودی ڕاژەکە و نەک هیچ بەکارهێنەرێکی تاک.
-      بۆ مەبەستی فیدراسیۆن بەکاردێت و نابێت بلۆک بکرێت مەگەر دەتەوێت هەموو نمونەکە بلۆک بکەیت، کە لە حاڵەتەش دا پێویستە بلۆکی دۆمەین بەکاربهێنیت.
-    learn_more: زیاتر فێربه
-    privacy_policy: ڕامیاری تایبەتێتی
-    see_whats_happening: بزانە چی ڕوودەدات
-    server_stats: 'زانیاری ڕاژەکار:'
-    source_code: کۆدی سەرچاوە
-    status_count_after:
-      one: دۆخ
-      other: دۆخەکان
-    status_count_before: لە لایەن یەکەوە
-    tagline: دوای هاوڕێکان بکەوە و ئەوانەی نوێ بدۆزیەوە
-    terms: مەرجەکانی خزمەتگوزاری
-    unavailable_content: ڕاژەی چاودێریکراو
-    unavailable_content_description:
-      domain: ڕاژەکار
-      reason: هۆکار
-      rejecting_media: 'پەڕگەکانی میدیا لەم ڕاژانەوە پرۆسە ناکرێت یان هەڵناگیرێن، و هیچ وێنۆچکەیەک پیشان نادرێت، پێویستی بە کرتە کردنی دەستی هەیە بۆ فایلە سەرەکیەکە:'
-      rejecting_media_title: پاڵێوەری میدیا
-      silenced: 'بابەتەکانی ئەم ڕاژانە لە هێڵی کاتی گشتی و گفتوگۆکاندا دەشاردرێنەوە، و هیچ ئاگانامێک دروست ناکرێت لە چالاکی بەکارهێنەرانیان، مەگەر تۆ بەدوایان دەچیت:'
-      silenced_title: ڕاژە ناچالاکەکان
-      suspended: 'هیچ داتایەک لەم ڕاژانەوە پرۆسە ناکرێت، خەزن دەکرێت یان دەگۆڕدرێتەوە، وا دەکات هیچ کارلێک یان پەیوەندییەک لەگەڵ بەکارهێنەران لەم ڕاژانە مەحاڵ بێت:'
-      suspended_title: ڕاژە ڕاگیراوەکان
-    unavailable_content_html: ماستۆدۆن بە گشتی ڕێگەت پێدەدات بۆ پیشاندانی ناوەڕۆک لە و کارلێ کردن لەگەڵ بەکارهێنەران لە هەر ڕاژەیەکی تر بە گشتی. ئەمانە ئەو بەدەرکردنانەن کە کراون لەسەر ئەم ڕاژە تایبەتە.
-    user_count_after:
-      one: بەکارهێنەر
-      other: بەکارهێنەران
-    user_count_before: "`خاوەن"
-    what_is_mastodon: ماستۆدۆن چییە?
+    about_mastodon_html: 'Tora civakî ya pêşerojê: Ne reklam, ne şopandina şîrketan, dîzayna nenavendî! Bi Mastodon re bibe xwediyê daneyên xwe!'
+    contact_missing: Nehate sazkirin
+    contact_unavailable: Tune
+    hosted_on: Mastodon li ser %{domain} tê pêşkêşkirin
+    title: Derbar
   accounts:
-    choices_html: 'هەڵبژاردنەکانی %{name}:'
-    endorsements_hint: دەتوانیت ئەو کەسانە پەسەند بکەیت کە پەیڕەویان دەکەیت لە ڕووکاری وێب، و ئەوان لێرە دەردەکەون.
-    featured_tags_hint: دەتوانیت هاشتاگی تایبەت پێشکەش بکەیت کە لێرە پیشان دەدرێت.
-    follow: شوێن کەوە
+    follow: Bişopîne
     followers:
-      one: شوێنکەوتوو
-      other: شوێن‌کەوتووان
-    following: شوێن‌کەوتووی
-    joined: بەشداری %{date}
-    last_active: دوا چالاکی
-    link_verified_on: خاوەنداریەتی ئەم لینکە لە %{date} چێک کراوە
-    media: میدیا
-    moved_html: "%{name} گواستراوەتەوە بۆ %{new_profile_link}:"
-    network_hidden: ئەم زانیاریە بەردەست نیە
-    never_active: هەرگیز
-    nothing_here: لێرە هیچ نییە!
-    people_followed_by: ئەو کەسانەی کە %{name} بەدوایدا دەکەون
-    people_who_follow: ئەو کەسانەی کە بەدوای %{name} دا دەکەون
+      one: Şopîner
+      other: Şopîner
+    following: Dişopîne
+    instance_actor_flash: Ev ajimêr listikvaneke rastkî ye ku ji bo wek nûnerê rajekar bixwe tê bikaranîn û ne bikarhênerek kesane. Ew ji bo mebestên giştî tê bikaranîn û divê neyê rawestandin.
+    last_active: çalakiya dawî
+    link_verified_on: Xwedaniya li vê girêdanê di %{date} de hatiye kontrolkirin
+    nothing_here: Li vir tiştek tune ye!
     pin_errors:
-      following: تۆ دەبێت هەر ئێستا بە دوای ئەو کەسەدا بیت کە دەتەوێت پەسەندی بکەیت
+      following: Kesê ku tu dixwazî bipejirînî jixwe divê tu bişopînî
     posts:
-      one: توت
-      other: تووتەکان
-    posts_tab_heading: تووتەکان
-    posts_with_replies: تووتەکان و وڵامەکان
-    roles:
-      admin: بەڕێوەبەر
-      bot: بۆت
-      group: گرووپ
-      moderator: مۆد
-    unavailable: پرۆفایل بەردەست نیە
-    unfollow: بەدوادانەچو
+      one: Şandî
+      other: Şandî
+    posts_tab_heading: Şandî
   admin:
     account_actions:
-      action: ئەنجامدانی کردار
-      title: ئەنجامدانی کاری بەڕێوەبردن لە %{acct}
+      action: Çalakî yê bike
+      title: Li ser %{acct} çalakiyên li hev hatî pêk bîne
     account_moderation_notes:
-      create: جێهێشتنی تێبینی
-      created_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی دروست کرا!
-      delete: سڕینەوە
-      destroyed_msg: تێبینی بەڕێوەبەر بە سەرکەوتوویی لەناوچوو!
+      create: Nîşeyekê bihêle
+      created_msg: Nîşeyê moderator bi awayekî serkeftî hate afirandin!
+      destroyed_msg: Nîşeyê moderator bi awayekî serkeftî hate tinne kirin!
     accounts:
-      add_email_domain_block: بلۆککردنی هەموو دۆمەینەکە
-      approve: پەسەند کردن
-      approve_all: پەسەندکردنی هەموو
-      approved_msg: بەرنامەی تۆمارکردنی %{username} بۆ چوونەناوی پەسەند کرا
-      are_you_sure: دڵنیای?
-      avatar: وێنۆچکە
-      by_domain: دۆمەین
+      add_email_domain_block: Navperê e-nameyê asteng bike
+      approve: Bipejirîne
+      approved_msg: Tomarkirina %{username} bi awayekî serkeftî hate pejirandin
+      are_you_sure: Ma tu bawerî?
+      avatar: Wêne
+      by_domain: Navper
       change_email:
-        changed_msg: ئیمەیڵی ئەژمێر بە سەرکەوتوویی گۆڕا!
-        current_email: ئیمەیلی ئێستا
-        label: گۆڕینی ئیمێڵ
-        new_email: ئیمەیڵی نوێ
-        submit: گۆڕینی ئیمێڵ
-        title: گۆڕینی ئیمەیڵ بۆ %{username}
-      confirm: پشتڕاستی بکەوە
-      confirmed: پشتڕاست کرا
-      confirming: پشتڕاستکردنەوە
-      delete: سڕینەوەی داتا
-      deleted: سڕینەوە
-      demote: پلە نزمکرایەوە
-      destroyed_msg: دراوەکانی %{username} لە ڕیزی سڕینەوەن
-      disable: بەستن
-      disable_two_factor_authentication: لەکارخستنی 2FA
-      disabled: بەستوو
-      display_name: ناوی پیشاندان
-      domain: دۆمەین
-      edit: دەستکاری
-      email: پۆستی ئەلکترۆنی
-      email_status: دۆخی ئیمەیڵ
-      enable: چالاک کردن
-      enabled: چالاککراوە
-      enabled_msg: هەژمارە %{username} بە سەرکەوتوویی سنووردار کرا
-      followers: شوێنکەوتوان
-      follows: شوێنکەوتوان
-      header: سەرپەڕە
-      inbox_url: نیشانی هاتنەژوور
-      invited_by: هاتۆتە ژورەوە لە لایەن
-      ip: ئای‌پی
-      joined: ئەندام بوو لە
+        changed_msg: E-name bi awayekî serkeftî hate guhertin!
+        current_email: E-nameya heyî
+        label: E-nameyê biguherîne
+        new_email: E-nameya nû
+        submit: E-nameyê biguherîne
+        title: E-nameyê biguherîne bo %{username}
+      change_role:
+        changed_msg: Rol bi awayekî serkeftî hate guhertin!
+        label: Rolê biguherîne
+        no_role: Rol tune
+        title: Rolê biguherîne ji bo %{username}
+      confirm: Bipejirîne
+      confirmed: Hate pejirandin
+      confirming: Tê pejirandin
+      custom: Kesanekirin
+      delete: Daneyan jê bibe
+      deleted: Hate jêbirin
+      demote: Ast daxistin
+      destroyed_msg: Daneyên %{username} niha ket rêzê da yê demek nêz da were jêbirin
+      disable: Qerisî ye
+      disable_sign_in_token_auth: E-name ya rastandina token neçalak bike
+      disable_two_factor_authentication: 2FA ne çalak bike
+      disabled: Qerisî ye
+      display_name: Navê xuyangê
+      domain: Navper
+      edit: Serrast bike
+      email: E-name
+      email_status: Rewşa E-nameyê
+      enable: Çalak bike
+      enable_sign_in_token_auth: E-name ya rastandina token çalak bike
+      enabled: Çalakkirî
+      enabled_msg: Ajimêrê %{username} bi serkeftî hat çalakkirin
+      followers: Şopîner
+      follows: Dişopîne
+      header: Jormalper
+      inbox_url: Girêdana peyamên hatî
+      invite_request_text: Sedemên tevlêbûnê
+      invited_by: Bi vexwendinê
+      ip: IP
+      joined: Dîroka tevlîbûnê
       location:
-        all: هەموو
-        local: ناوخۆیی
-        remote: دوور
-        title: شوێن
-      login_status: دۆخی چوونەژوورەوە
-      media_attachments: هاوپێچی میدیا
-      memorialize: گۆڕان بە یادەوەری
-      memorialized: بیرکەوتنەوە
-      memorialized_msg: بە سەرکەوتوویی %{username} بۆ هەژمارێکی بیرەوەری گۆڕا
+        all: Hemû
+        local: Herêmî
+        remote: Ji dûr ve
+        title: Cih
+      login_status: Rewşa têketinê
+      media_attachments: Pêvekên medya
+      memorialize: Vegerîne bîranînê
+      memorialized: Bû bîranîn
+      memorialized_msg: "%{username} bi serkeftî veguherî ajimêra bîranînê"
       moderation:
-        active: چالاک
-        all: هەموو
-        pending: چاوەڕوان
-        silenced: بێدەنگ
-        suspended: ڕاگرتن
-        title: بەڕێوەبردن
-      moderation_notes: بەڕێوەبردنی تێبینیەکان
-      most_recent_activity: نوێترین چالاکی
-      most_recent_ip: نوێترین ئای پی
-      no_account_selected: هیچ هەژمارەیەک نەگۆڕاوە وەک ئەوەی هیچ یەکێک دیاری نەکراوە
-      no_limits_imposed: هیچ سنوورێک نەسەپێنرا
-      not_subscribed: بەشدار نەبوو
-      pending: پێداچوونەوەی چاوەڕوان
-      perform_full_suspension: ڕاگرتن
-      promote: بەرزکردنەوە
-      protocol: پرۆتۆکۆل
-      public: گشتی
-      push_subscription_expires: بەشداری PuSH بەسەر دەچێت
-      redownload: نوێکردنەوەی پرۆفایل
-      redownloaded_msg: پرۆفایلی %{username} لە بنەڕەتەوە بە سەرکەوتوویی نوێکرایەوە
-      reject: ڕەتکردنەوە
-      reject_all: هەموو ڕەت بکەوە
-      rejected_msg: بەرنامەی تۆمارکردنی %{username} بە سەرکەوتوویی ڕەتکرایەوە
-      remove_avatar: لابردنی وێنۆجکە
-      remove_header: سەرپەڕ لابدە
-      removed_avatar_msg: وێنەی ئەڤاتار %{username} بە سەرکەوتوویی لابرا
-      removed_header_msg: بە سەرکەوتوویی وێنەی سەرپەڕەی %{username} لابرا
+        active: Çalak
+        all: Hemû
+        pending: Tê nirxandin
+        silenced: Sînorkirî
+        suspended: Sekinandî
+        title: Çavdêrî
+      moderation_notes: Nîşeyên Rêvebirinê
+      most_recent_activity: Çalakîyên dawî
+      most_recent_ip: IP' a dawî
+      no_account_selected: Tu ajimêr nehat hilbijartin ji ber vê tu ajimêr nehat guhertin
+      no_limits_imposed: Sînor nay danîn
+      no_role_assigned: Ti rol nehatin diyarkirin
+      not_subscribed: Beşdar nebû
+      pending: Li benda nirxandinê ye
+      perform_full_suspension: Sekinî
+      previous_strikes: Binpêkirinên berê
+      previous_strikes_description_html:
+        one: Ev ajimêr <strong>yek</strong> binpêkirin kiriye.
+        other: Ev ajimêr <strong>%{count}</strong> binpêkirin kiriye.
+      promote: Derbasê asteke bilind be
+      protocol: Protokol
+      public: Gelemperî
+      push_subscription_expires: Beşdarbûna PuSH diqede
+      redownload: Profîl nûve bike
+      redownloaded_msg: Bi serkeftî profîla %{username} ji kokê va hat nûve kirin
+      reject: Nepejirîne
+      rejected_msg: Tomarkirina %{username} bi awayekî serkeftî nehate pejirandin
+      remote_suspension_irreversible: Daneyên vê ajimêrê bi awayekî bê veger hatine jêbirin.
+      remote_suspension_reversible_hint_html: Ajimêr hate rawestandin li ser rajekarê wan, û daneyên di %{date} de wê hemû werin rakirin. Heya vê demê, ajimêr bêyî bandorên nebaş dikare dîsa vegere. Ku tu dixwazî hemû daneyan ajimêrê niha rakî, tu dikarî li jêrê bikî.
+      remove_avatar: Avatarê rake
+      remove_header: Sernavê rake
+      removed_avatar_msg: Wêneyê %{username} bi awayekî serkeftî hate rakirin
+      removed_header_msg: Wêneyê dîwar ê %{username} bi awayekî serkeftî hate rakirin
       resend_confirmation:
-        already_confirmed: ئەم بەکارهێنەرە پێشتر پشتڕاستکراوەتەوە
-        send: دووبارە ناردنی ئیمەیڵی دووپاتکردنەوە
-        success: ئیمەیڵی پشتڕاستکردنەوە بە سەرکەوتوویی نێردرا!
-      reset: ڕێکخستنەوە
-      reset_password: گەڕانەوەی تێپەڕوشە
-      resubscribe: دووبارە ئابونەبوون
-      role: مۆڵەتەکان
-      roles:
-        admin: بەڕێوەبەر
-        moderator: بەڕێوەبەر
-        staff: ستاف
-        user: بەکارهێنەر
-      search: گەڕان
-      search_same_email_domain: بەکارهێنەرانی دیکە بە ئیمەیلی یەکسان
-      search_same_ip: بەکارهێنەرانی تر بەهەمان ئای پی
-      sensitive: هەستیار
-      sensitized: وەک هەستیار نیشان کراوە
-      shared_inbox_url: بەستەری سندوقی هاوبەشکراو
+        already_confirmed: Ev bikarhêner jixwe hatiye pejirandin
+        send: E-nameya pejirandinê dîsa bişîne
+        success: E-nameya pejirandinê bi awayekî serkeftî hate şandin!
+      reset: Ji nû ve saz bike
+      reset_password: Borînpeyvê ji nû ve saz bike
+      resubscribe: Dîsa beşdar bibe
+      role: Rol
+      search: Bigere
+      search_same_email_domain: Bikarhênerên din ên bi heman navpera e-nameyê
+      search_same_ip: Bikarhênerên din ên xwedî heman IP
+      security_measures:
+        only_password: Têne borînpeyv
+        password_and_2fa: Borînpeyv û 2FA
+      sensitive: Hêz-hestiyar
+      sensitized: Wek hestiyar hatiye nîşankirin
+      shared_inbox_url: Girêdana peyamên hatî ya parvekirî
       show:
-        created_reports: گوزارشتی تۆمارکراوە
-        targeted_reports: گوزارشتکراوە لەلایەن کەسانی ترەوە
-      silence: سنوور
-      silenced: سنوورکرا
-      statuses: دۆخەکان
-      subscribe: ئابوونە
-      suspended: ڕاگرتن
-      suspension_irreversible: داتای ئەم هەژمارەیە بە شێوەیەکی نائاسایی سڕاوەتەوە. دەتوانیت هەژمارەکەت ڕابخەیت بۆ ئەوەی بەکاربێت بەڵام هیچ داتایەک ناگەڕگەڕێتەوە کە پێشتر بوونی بوو.
-      suspension_reversible_hint_html: هەژمارە ڕاگیرا ، و داتاکە بەتەواوی لە %{date} لادەبرێت. تا ئەو کاتە هەژمارەکە دەتوانرێت بە بێ هیچ کاریگەریەکی خراپ بژمێردرێتەوە. ئەگەر دەتەوێت هەموو داتاکانی هەژمارەکە بسڕەوە، دەتوانیت لە خوارەوە ئەمە بکەیت.
-      time_in_queue: چاوەڕوانی لە ڕیزدا %{time}
-      title: هەژمارەکان
-      unconfirmed_email: ئیمەیڵی پشتڕاستنەکراو
-      undo_sensitized: " هەستیار نەکردن"
-      undo_silenced: بێدەنگ ببە
-      undo_suspension: دووبارە ڕاگرتن
-      unsilenced_msg: هەژماری %{username} بە سەرکەوتوویی بێسنوور کرا
-      unsubscribe: بەتاڵکردنی ئابوونە
-      unsuspended_msg: هەژمارە %{username} بە سەرکەوتوویی ئابوونەی بەتاڵکرا
-      username: ناوی بەکارهێنەر
-      view_domain: پیشاندانی کورتەبۆ دۆمەین
-      warn: وریاکردنەوە
-      web: ماڵپەڕ
-      whitelisted: پێرستی ڕێپێدراو
+        created_reports: Ragihandinên ku çêkiriye
+        targeted_reports: Ji aliyê kesên din ve hatiye ragihandin
+      silence: Sînor
+      silenced: Bêdeng kirî
+      statuses: Şandî
+      strikes: Binpêkirinên berê
+      subscribe: Bibe kiryar
+      suspend: Hatiye rawestandin
+      suspended: Hatiye rawestandin
+      suspension_irreversible: Daneyên vê ajimêrê bêveger hatine jêbirin. Tu dikarî ajimêra xwe ji rawestandinê vegerinî da ku ew bi kar bînî lê ew ê tu daneya ku berê hebû venegere.
+      suspension_reversible_hint_html: Ajimêr hate rawestandin, û daneyên di %{date} de wê hemû werin rakirin. Heya vê demê, ajimêr bêyî bandorên nebaş dikare dîsa vegere. Ku tu dixwazî hemû daneyan ajimêrê niha rakî, tu dikarî li jêrê bikî.
+      title: Ajimêr
+      unblock_email: Astengiyê li ser navnîşana e-nameyê rake
+      unblocked_email_msg: Bi serkeftî astengiya li ser navnîşana e-nameyê %{username} hate rakirin
+      unconfirmed_email: E-nameya nepejirandî
+      undo_sensitized: Hestiyariyê vegerîne
+      undo_silenced: Sînorê vegerîne
+      undo_suspension: Dûrxistinê paşve vegerîne
+      unsilenced_msg: Ajimêra %{username} bi awayekî serkeftî bêsînor çêbû
+      unsubscribe: Dev ji beşdarbûnê berde
+      unsuspended_msg: Bi awayekî serkeftî beşdarbûna bi ajimêra %{username} hate berdan
+      username: Navê bikarhêneriyê
+      view_domain: Kurte ji bo navperê bide nîşan
+      warn: Hişyarî
+      web: Tevn
+      whitelisted: Ji bo demnameya giştî maf hate dayin
     action_logs:
       action_types:
-        assigned_to_self_report: تەرخانکردنی گوزارشت
-        change_email_user: گۆڕینی ئیمەیڵ بۆ بەکارهێنەر
-        confirm_user: دڵنیابوون لە بەکارهێنەر
-        create_account_warning: دروستکردنی ئاگاداری
-        create_announcement: دروستکردنی راگەیەندراو
-        create_custom_emoji: دروستکردنی ئێمۆمۆجی دڵخواز
-        create_domain_allow: دروستکردنی ڕێپێدان بە دۆمەین
-        create_domain_block: دروستکردنی بلۆکی دۆمەین
-        create_email_domain_block: دروستکردنی بلۆکی دۆمەینی ئیمەیڵ
-        create_ip_block: دروستکردنی یاسای IP
-        demote_user: دابەزاندنی ئاستی بەکارهێنەر
-        destroy_announcement: سڕینەوەی راگەیەندراو
-        destroy_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
-        destroy_domain_allow: سڕینەوەی ڕێپێدان بە دۆمەین
-        destroy_domain_block: سڕینەوەی بلۆکی دۆمەین
-        destroy_email_domain_block: سڕینەوەی بلۆکی دۆمەینی ئیمەیڵ
-        destroy_ip_block: سڕینەوەی یاسای IP
-        destroy_status: دۆخ بسڕەوە
-        disable_2fa_user: لەکارخستنی 2FA
-        disable_custom_emoji: سڕینەوەی ئێمۆمۆجی تایبەتمەند
-        disable_user: بەکارهێنەر لە کاربخە
-        enable_custom_emoji: ئیمۆمۆجی تایبەتمەند چالاک بکە
-        enable_user: چالاککردنی بەکارهێنەر
-        memorialize_account: هەژماری بیرکەوتنەوە
-        promote_user: بەرزکردنەوەی بەکارهێنەر
-        remove_avatar_user: لابردنی وێنۆجکە
-        reopen_report: دووبارە کردنەوەی گوزارشت
-        reset_password_user: گەڕانەوەی تێپەڕوشە
-        resolve_report: گوزارشت چارەسەربکە
-        sensitive_account: میدیاکە لە هەژمارەکەت وەک هەستیار نیشانە بکە
-        silence_account: هەژماری بێدەنگی
-        suspend_account: ڕاگرتنی هەژمارە
-        unassigned_report: گوزارشتی دیارینەکراو
-        unsensitive_account: میدیاکە لە هەژمارەکەت وەک هەستیار نیشانە مەکە
-        unsilence_account: هەژماری بێ دەنگ
-        unsuspend_account: هەژماری هەڵنەوەستێنراو
-        update_announcement: بەڕۆژکردنەوەی راگەیەندراو
-        update_custom_emoji: بەڕۆژکردنی ئێمۆمۆجی دڵخواز
-        update_status: بەڕۆژکردنی دۆخ
-      deleted_status: "(نووسراوە سڕاوە)"
-      empty: هیچ لاگی کارنەدۆزرایەوە.
-      filter_by_action: فلتەر کردن بە کردار
-      filter_by_user: فلتەر کردن بە کردار
-      title: تۆماری وردبینی
+        approve_appeal: Îtîrazê bipejirîne
+        approve_user: Bikarhêner bipejirîne
+        assigned_to_self_report: Ragihandinê diyar bike
+        change_email_user: E-nameya bikarhêner biguherîne
+        change_role_user: Rola bikarhêner biguherîne
+        confirm_user: Bikarhêner bipejirîne
+        create_account_warning: Hişyariyekê çê bike
+        create_announcement: Daxûyaniyekê çê bike
+        create_canonical_email_block: Astengkirina e-nameyê biafirîne
+        create_custom_emoji: Emojiyên kesanekirî çê bike
+        create_domain_allow: Navpera ku destûr standiye peyda bike
+        create_domain_block: Astengkirina navperê biafirîne
+        create_email_domain_block: Astengkirina navpera e-nameyê biafirîne
+        create_ip_block: Rêziknameya IPyê saz bike
+        create_unavailable_domain: Navpera ku nayê bikaranîn pêk bîne
+        create_user_role: Rolê biafirîne
+        demote_user: Bikarhênerê kaşê jêr bike
+        destroy_announcement: Daxûyanîyê jê bibe
+        destroy_canonical_email_block: Astengkirina e-nameyê jê bibe
+        destroy_custom_emoji: Emojîya kesanekirî jê bibe
+        destroy_domain_allow: Navperên mafdayî jê bibe
+        destroy_domain_block: Navperên astengkirî jê bibe
+        destroy_email_domain_block: Navperên e-nameyê yên astengkirî jê bibe
+        destroy_instance: Pakirina navperê
+        destroy_ip_block: Tomara IPyê jêbibe
+        destroy_status: Şandiyê jê bibe
+        destroy_unavailable_domain: Navperên tuneyî jê bibe
+        destroy_user_role: Rolê hilweşîne
+        disable_2fa_user: 2FA neçalak bike
+        disable_custom_emoji: Emojîya kesanekirî neçalak bike
+        disable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token neçalak bike
+        disable_user: Bikarhêner neçalak bike
+        enable_custom_emoji: Emojîya kesanekirî çalak bike
+        enable_sign_in_token_auth_user: Ji bo bikarhênerê piştrastkirina navnîşana e-name yê ya token çalak bike
+        enable_user: Bikarhêner çalak bike
+        memorialize_account: Ajimêrê bike bîranînek
+        promote_user: Bikarhêner pêş bixe
+        reject_appeal: Îtîrazê nepejirîne
+        reject_user: Bikarhêner nepejirîne
+        remove_avatar_user: Avatarê rake
+        reopen_report: Ragihandina ji nû ve veke
+        resend_user: E-nameya pejirandinê dîsa bişîne
+        reset_password_user: Borînpeyvê ji nû ve saz bike
+        resolve_report: Ragihandinê çareser bike
+        sensitive_account: Ajimêra hêz-hestiyar
+        silence_account: Ajimêrê bi sînor bike
+        suspend_account: Ajimêr rawestîne
+        unassigned_report: Ragihandinê diyar neke
+        unblock_email_account: Astengiyê li ser navnîşana e-nameyê rake
+        unsensitive_account: Medyayên di ajimêrê te de wek hestyarî nepejirîne
+        unsilence_account: Ajimêra sînorkirî vegerîne
+        unsuspend_account: Ajimêrê xwe ji rewestandinê rake
+        update_announcement: Daxûyaniyê rojane bike
+        update_custom_emoji: Emojîya kesanekirî rojane bike
+        update_domain_block: Astengkirina navperê rojane bike
+        update_ip_block: Rolê IP rojane bike
+        update_status: Şandiyê rojane bike
+        update_user_role: Rolê rojane bike
+      actions:
+        approve_appeal_html: "%{name} îtiraza biryara çavdêriyê ji %{target} pejirand"
+        approve_user_html: "%{name} tomarkirina ji %{target} pejirand"
+        assigned_to_self_report_html: "%{name} ji xwe re ragihandinek %{target} hilda"
+        change_email_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} guherand"
+        change_role_user_html: "%{name} rolê %{target} guhert"
+        confirm_user_html: "%{name} navnîşana e-nameya bikarhêner %{target} piştrast kir"
+        create_account_warning_html: "%{name} ji bo %{target} hişyariyek şand"
+        create_announcement_html: "%{name} agahdarkirineke nû çêkir %{target}"
+        create_canonical_email_block_html: "%{name} bi riya dabeşkirinê e-nameya %{target} asteng kir"
+        create_custom_emoji_html: "%{name} emojîyeke nû ya %{target} bar kir"
+        create_domain_allow_html: "%{name} bi navperê %{target} re maf da demnameya giştî"
+        create_domain_block_html: "%{name} navpera %{target} asteng kir"
+        create_email_domain_block_html: "%{name} e-nameya navperê %{target} asteng kir"
+        create_ip_block_html: "%{name} ji bo IPya %{target} rêzikname saz kir"
+        create_unavailable_domain_html: "%{name} bi navperê %{target} re gihandinê rawestand"
+        create_user_role_html: "%{name} rola %{target} afirand"
+        demote_user_html: "%{name} bikarhênerê %{target} kaşê jêr kir"
+        destroy_announcement_html: "%{name} daxûyaniyeke %{target} jê bir"
+        destroy_canonical_email_block_html: "%{name} bi riya dabeşkirinê astengiya li ser e-nameya %{target} rakir"
+        destroy_custom_emoji_html: "%{name} emojiya %{target} jê bir"
+        destroy_domain_allow_html: "%{name} bi navperê %{target} re maf neda demnameya giştî"
+        destroy_domain_block_html: "%{name} navpera %{target} asteng kir"
+        destroy_email_domain_block_html: "%{name} astengiya li ser navpera e-nameyê %{target} rakir"
+        destroy_instance_html: "%{name} navpera %{target} asteng kir"
+        destroy_ip_block_html: "%{name}, ji bo IPya %{target} rêziknameyê jêbir"
+        destroy_status_html: "%{name} ji alîyê %{target} ve şandiyê rakir"
+        destroy_unavailable_domain_html: "%{name} bi navperê %{target} re gihandinê berdewam kir"
+        destroy_user_role_html: "%{name} rola %{target} jê bir"
+        disable_2fa_user_html: "%{name} ji bo bikarhênerê %{target} du faktorî neçalak kir"
+        disable_custom_emoji_html: "%{name} emojiya %{target} neçalak kir"
+        disable_sign_in_token_auth_user_html: "%{name} ji bo %{target} nîşana mafdayîna e-nameya ne çalak kir"
+        disable_user_html: "%{name} ji bo bikarhêner %{target} têketin neçalak kir"
+        enable_custom_emoji_html: "%{name} emojiya %{target} çalak kir"
+        enable_sign_in_token_auth_user_html: "%{name} ji bo %{target} nîşana mafdayîna e-nameyê çalak kir"
+        enable_user_html: "%{name} ji bo bikarhêner %{target} têketin çalak kir"
+        memorialize_account_html: "%{name} ajimêra %{target} veguherand rûpeleke bîranînê"
+        promote_user_html: "%{name} bikarhêner %{target} bilind kir"
+        reject_appeal_html: "%{name} îtiraza biryara çavdêriyê ji %{target} nepejirand"
+        reject_user_html: "%{name} tomarkirina ji %{target} nepejirand"
+        remove_avatar_user_html: "%{name} avatara bikarhêner %{target} rakir"
+        reopen_report_html: "%{name} ragihandina %{target} ji nû ve vekir"
+        resend_user_html: "%{name} e-nameya pejirandinê dîsa bişîne ji bo %{target}"
+        reset_password_user_html: "%{name} borînpeyva bikarhêner %{target} ji nû ve saz kir"
+        resolve_report_html: "%{name} ragihandina %{target} çareser kir"
+        sensitive_account_html: "%{name} medyayê %{target} wekî hestiyarî nîşan kir"
+        silence_account_html: "%{name} ajimêra %{target} bi sînor kir"
+        suspend_account_html: "%{name} ajimêra %{target} hilda rawestandinê"
+        unassigned_report_html: "%{name} ragihandina %{target} rakir"
+        unblock_email_account_html: "%{name} navnîşana e-nameyê %{target} asteng kir"
+        unsensitive_account_html: "%{name} medyayê %{target} nîşandana wek hestiyarî rakir"
+        unsilence_account_html: "%{name} bêdengiya ajimêrê %{target} rakir"
+        unsuspend_account_html: "%{name} rawestandina ajimêrê %{target} rakir"
+        update_announcement_html: "%{name} daxûyaniya %{target} rojane kir"
+        update_custom_emoji_html: "%{name} emojiya %{target} rojane kir"
+        update_domain_block_html: "%{name} ji bo navpera %{target} astengkirin rojane kir"
+        update_ip_block_html: "%{name} rolê %{target} guhert ji bo IP"
+        update_status_html: "%{name} şandiya bikarhêner %{target} rojane kir"
+        update_user_role_html: "%{name} rola %{target} guherand"
+      deleted_account: ajimêrê jêbirî
+      empty: Tomarkirin nehate dîtin.
+      filter_by_action: Li gorî çalakiyê biparzinîne
+      filter_by_user: Li gorî bikarhênerê biparzinîne
+      title: Tomarê çavdêriyê
     announcements:
-      destroyed_msg: بانگەوازەکە بە سەرکەوتوویی سڕاوەتەوە!
+      destroyed_msg: Daxûyanî bi awayekî serkeftî hate jêbirin!
       edit:
-        title: بڵاوکردنەوەی راگەیەندراو
-      empty: هیچ راگەیەندراوێک نەدۆزرایەوە.
-      live: زیندوو
+        title: Daxûyaniyê serrast bike
+      empty: Daxûyanî nehat dîtin.
+      live: Zindî
       new:
-        create: دروستکردنی راگەیەندراو
-        title: ڕاگەیاندنی نوێ
-      published_msg: بانگەوازەکە بە سەرکەوتوویی بڵاو کرایەوە!
-      scheduled_for: خشتەکراوە بۆ %{time}
-      scheduled_msg: ڕاگەیاندنی خشتەی بۆ بڵاوکردنەوە!
-      title: ڕاگه یه نراوەکان
-      unpublished_msg: بانگەواز بە سەرکەوتوویی بڵاونەکرایەوە!
-      updated_msg: بانگەوازەکە بە سەرکەوتوویی نوێکرایەوە!
+        create: Daxûyaniyekê çê bike
+        title: Daxûyaniya nû
+      publish: Biweşîne
+      published_msg: Daxûyanî bi awayekî serkeftî hate weşan!
+      scheduled_for: Bo %{time} hatiye demsazkirin
+      scheduled_msg: Daxûyanî hate demsazkirin bo weşanê!
+      title: Daxuyanî
+      unpublish: Neweşîne
+      unpublished_msg: Daxûyanî bi awayekî serkeftî weşan pûç kir!
+      updated_msg: Daxûyanî bi awayekî serkeftî hate rojanekirin!
     custom_emojis:
-      assign_category: دانانی پۆلێن
-      by_domain: دۆمەین
-      copied_msg: کۆپیەکی ناوخۆیی ئیمۆجیبەکە بە سەرکەوتوویی دروست کرد
-      copy: کۆپی
-      copy_failed_msg: نهیتوانی کۆپیهکی ناوخۆیی ئهو ئیمۆجییە دروست بکات
-      create_new_category: دروستکردنی هاوپۆلی نوێ
-      created_msg: ئیمۆجی بە سەرکەوتوویی دروستکرا!
-      delete: سڕینەوە
-      destroyed_msg: ئیمۆجی بە سەرکەوتوویی بەتاڵکرا!
-      disable: لەکارخستن
-      disabled: ناچالاککراوە
-      disabled_msg: بە سەرکەوتوویی ئەو ئیمۆجییە لە کارخراوە
-      emoji: ئیمۆجی
-      enable: چالاککردن
-      enabled: چالاککراوە
-      enabled_msg: ئەو ئیمۆجییە بە سەرکەوتووانە چالاک کرا
-      image_hint: PNG تا ٥٠کیلۆبایت
-      list: پێرست
-      listed: پێرستکراوە
+      assign_category: Diyarkirina beşê
+      by_domain: Navper
+      copied_msg: Jêgirtiyê emojî ya herêmî bi serkeftî hate afirandin
+      copy: Jê bigire
+      copy_failed_msg: Jêgirtiyêke emojî ya herêmî nehate afirandin
+      create_new_category: Beşêke nû biafirîne
+      created_msg: Hestok bi serkeftî hate çêkirin!
+      delete: Jê bibe
+      destroyed_msg: Hestok bi serkeftî hate rûxandin!
+      disable: Neçalak bike
+      disabled: Neçalakkirî
+      disabled_msg: Ev hestok bi serkeftî hate neçalak kirin
+      emoji: Emoji
+      enable: Çalak bike
+      enabled: Çalakkirî
+      enabled_msg: Ev hestok bi serkeftî hate çalak kirin
+      image_hint: Mezinahiya PNG an jî GIF digîheje heya %{size}
+      list: Rêzok
+      listed: Rêzokkirî
       new:
-        title: ئیمۆجی نوێی دڵخواز زیاد بکە
-      not_permitted: تۆ ڕێگەپێدراو نین بۆ ئەنجامدانی ئەم کارە
-      overwrite: نووسینەوە
-      shortcode: کورتەکلیل
-      shortcode_hint: بەلایەنی کەمەوە ٢نووسە، تەنها نووسەکانی ئەلف و بێ و ژێرهێڵەکان
-      title: ئیمۆجی دڵخواز
-      uncategorized: هاوپۆل نەکراوە
-      unlist: بێ پێرست
-      unlisted: پێرست نەبووە
-      update_failed_msg: نه یتوانی ئه و ئیمۆجییه نوێ بکاتەوە
-      updated_msg: ئیمۆجی بە سەرکەوتوویی نوێکرایەوە!
-      upload: بارکردن
+        title: Hestokên kesane yên nû lê zêde bike
+      no_emoji_selected: Tu emojî nehatin hilbijartin ji ber vê tu şandî jî nehatin guhertin
+      not_permitted: Mafê te tune ku tu vê çalakiyê bikî
+      overwrite: Bi ser de binivsîne
+      shortcode: Kurtekod
+      shortcode_hint: Herê kêm 2 tîp, tenê tîpên alfahejmarî û yên bin xêzkirî
+      title: Hestokên kesane
+      uncategorized: Bêbeş
+      unlist: Dervî rêzokê
+      unlisted: Nerêzokkirî
+      update_failed_msg: Ev hestok nehate rojanekirin
+      updated_msg: Emojî bi awayekî serkeftî hate rojanekirin!
+      upload: Bar bike
     dashboard:
-      authorized_fetch_mode: دۆخی پارێزراو
-      backlog: کاری پشتەواز
-      config: شێوەپێدان
-      feature_deletions: سڕینەوەی هەژمارە
-      feature_invites: بانگێشتکردنی بەستەرەکان
-      feature_profile_directory: ڕێنیشاندەرێکی پرۆفایل
-      feature_registrations: تۆمارکراوەکان
-      feature_relay: گواستنەوەی گشتی
-      feature_timeline_preview: پێش نیشاندانی نووسراوەکان
-      features: تایبەتمەندیەکان
-      hidden_service: پەیوەندی نێوان ڕاژە یان خزمەتگوزاری نێننی
-      open_reports: ڕاپۆرتەکان بکەوە
-      pending_tags: هاشتاگی چاوەڕوانی پێداچوونەوە دەکات
-      pending_users: بەکارهێنەران چاوەڕێی پێداچوونەوەن
-      recent_users: بەکارهێنەرانی ئەم دواییە
-      search: گەڕانی تەواوی-دەق
-      single_user_mode: دۆخی بەکارهێنەری تاک
-      software: نەرمەکالا
-      space: بەکارهێنانی بۆشایی
-      title: داشبۆرد
-      total_users: ژمارەی بەکارهێنەران
-      trends: تاگە بەرچاوکراوەکان
-      week_interactions: چالاکیەکانی ئەم هەفتەیە
-      week_users_active: چالاکی ئەم هەفتەیە
-      week_users_new: بەکارهێنەرانی ئەم هەفتەیە
-      whitelist_mode: شێوەی پێرستی ڕێپێدراو
+      active_users: bikarhênerên çalak
+      interactions: têgerîn
+      media_storage: Bîrdanaka medyayê
+      new_users: bikarhênerên nû
+      opened_reports: ragihandin hatin vekirin
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> îtîraz li benda nirxandinê ye"
+        other: "<strong>%{count}</strong> îtîraz li benda nirxandinê ne"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> ragihandin benda nirxandinê ye"
+        other: "<strong>%{count}</strong> ragihandin benda nirxandinê ne"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag benda nirxandinê ye"
+        other: "<strong>%{count}</strong> hashtag benda nirxandinê ne"
+      pending_users_html:
+        one: "<strong>%{count}</strong> bikarhêner benda nirxandinê ye"
+        other: "<strong>%{count}</strong> bikarhêner benda nirxandinê ne"
+      resolved_reports: ragihandinên çareserkirî
+      software: Nermalav
+      sources: Çavkaniyên tomarkirî
+      space: Bikaranîna cîh
+      title: Destgeha venasînê
+      top_languages: Zimanên herî çalak
+      top_servers: Rajekarên herî çalak
+      website: Malpera tevnê
+    disputes:
+      appeals:
+        empty: Îtîraz nehatin dîtin.
+        title: Îtîraz
     domain_allows:
-      add_new: ڕێپێدان بە دۆمەین
-      created_msg: دۆمەین بە سەرکەوتوویی رێگەی پێدرا
-      destroyed_msg: دۆمەین لە پێرستی رێگەی پێدرا لابرا
-      undo: لابردن لە پێرستی ڕێپێدراو
+      add_new: Mafê bide navpera demnameya giştî
+      created_msg: Ji bo demnameya giştî mafdayîna navperê bi serkeftî hate dayîn
+      destroyed_msg: Ji bo demnameya giştî mafdayîna navperê nehat dayîn
+      export: Derxistin
+      import: Têxistin
+      undo: Mafê nede navpera demnameya giştî
     domain_blocks:
-      add_new: زیادکردنی بلۆکی دۆمەینی نوێ
-      created_msg: بلۆککردنی دۆمەین لە حاڵێ جێبەجێکردنە
-      destroyed_msg: بلۆکی دۆمەین هەڵوەشاوەتەوە
-      domain: دۆمەین
-      edit: دەستکاری بلۆکی دۆمەینی نوێ
-      existing_domain_block_html: ئێوە پێشتر سنووری دژوارتنا لە سەر%{name} جێبەجێکردووە، سەرەتا دەبێ <a href="%{unblock_url}">بلۆک هەڵوەشێنەوە</a>.
+      add_new: Astengkirina navpera nû tevlî bike
+      created_msg: Astengkirina navperê niha dixebite
+      destroyed_msg: Astengkirina navperê hate rakirin
+      domain: Navper
+      edit: Astengkirina navperê serrast bike
+      existing_domain_block: Jixwe te sînorên tundtir li ser %{name} daye kirine.
+      existing_domain_block_html: Te jixwe sînorên mezintir li ser %{name} pêk aniye, divê tu pêşî <a href="%{unblock_url}">astengkirinê rakî</a>.
+      export: Derxistin
+      import: Têxistin
       new:
-        create: دروستکردنی بلۆک
-        hint: بلۆکی دۆمەین رێگری لە دروستکردنی هەژمارەی چوونەژوورەوە لە بنکەی زانیارێکان ناکات ، بەڵکو بە شێوەیەکی دووبارە و خۆکارانە رێوشێوازی پێشکەوتوو تایبەت لەسەر ئەو هەژمارانە جێبەجێ دەکات.
+        create: Astengkirinekê çê bike
+        hint: Astengkirina navperê pêşî li çêkirina têketinên ajimêra yên di danegehê de negire, lê wê bi riyeke vegerandî û xweberî rêbazên kontrolkirinê li ser van ajimêran pêk bîne.
         severity:
-          desc_html: "<strong> بێدەنگی</strong> وا دەکات کە نووسراوەکانی هەژمارەکان نەبینراوە بێت بۆ هەر کەسێک کە شوێنیان نەکەوێ. <strong>ڕاگرتنی</strong> هەموو ناوەڕۆکی هەژمارەکە، میدیا، و داتای پرۆفایلەکەی بەکارهێنان. <strong>هیچ </strong> ئەگەر دەتەوێت فایلەکانی میدیا ڕەت بکەیتەوە."
-          noop: هیچ
-          silence: بێدەنگ
-          suspend: ڕاگرتن
-        title: بلۆکی دۆمەینی نوێ
-      private_comment: لێدوانی تایبەت
-      private_comment_hint: لێدوان دەربارەی سنوورداری ئەم دۆمەینە بۆ بەکارهێنانی ناوخۆیی لەلایەن مۆدەرەکان.
-      public_comment: سەرنجی گشتی
-      public_comment_hint: لێدوان دەربارەی سنوورداری ئەم دۆمەینە بۆ گشتی، ئەگەر بڵاوکردنەوەی لیستی سنوورداری دۆمەینەکە چالاک بکرێت.
-      reject_media: ڕەتکردنەوەی فایلەکانی میدیا
-      reject_media_hint: پەڕگە میدیای پاشکەوتکراو بە شێوەێکی ناوخۆیی لابدە و دابەزین لە داهاتوو ڕەتدەکاتەوە. ناپەیوەندیدار ە بۆ ڕاگرتن
-      reject_reports: گوزارشتەکان ڕەت بکەوە
-      reject_reports_hint: پشتگوێ خستنی هەموو گوزارشتەکان کە دێن لەم دۆمەینە. ناپەیوەندیدارە بۆ ڕاگرتن
-      rejecting_media: ڕەتکردنەوەی فایلەکانی میدیا
-      rejecting_reports: ڕەتکردنەوەی گوزارشتەکان
-      severity:
-        silence: بێدەنگ
-        suspend: ڕاگرتن
-      show:
-        affected_accounts:
-          one: هەژمارەیەک کە لە بنکەی زانیارێکان کاریگەری لەسەرە
-          other: "%{count} هەژمارەیەک کە لە بنکەی زانیارێکان کاریگەری لەسەرە"
-        retroactive:
-          silence: نابێدەنگی ئەو ئەژمێرانەی کە هەیە لەم دۆمەینەوە
-          suspend: هەڵنەپەسێدراوی هەژمارە کاریگەرەکانی ئەم دۆمەین
-        title: گەڕانەوەی بلۆککردنی دۆمەین %{domain}
-        undo: گەڕانەوە
-      undo: گەڕانەوەی بلۆکی دۆمەینی
-      view: دیتنی بلۆکی دۆمەینی
+          desc_html: |-
+            <strong>Sînor</strong> wê şandiyan ji ajimêrên li ser vê navperê re ji her kesê ku wan naşopîne re nedîtî bike. <strong>Rawestandin</strong> wê hemû naverok, medya û daneyên profîlê yên ajimêrên vê navperê ji rajekarê te rake. Ku tu tenê dixwazî pelên medyayê nepejirînî
+            <strong>Tu kes</strong> bi kar bîne.
+          noop: Ne yek
+          silence: Sînor
+          suspend: Dur bike
+        title: Astengkirina navpera nû
+      no_domain_block_selected: Tu astengkirinên navperê e-nameyê nehatin guhertin ji ber ku tu yek nehatine hilbijartin
+      not_permitted: Mafê te tune ku tu vê çalakiyê bikî
+      obfuscate: Navê navperê veşêre
+      obfuscate_hint: Ku rêzoka sînorên navperê çalakkirî be navê navperê di rêzokê de bi awayekî beşî veşêre
+      private_comment: Şîroveya taybet
+      private_comment_hint: Derbarê sînorkirina vê navperê ji bo bikaranîna hundirîn ji aliyê çavdêram ve şîrove bike.
+      public_comment: Şîroveya gelemperî
+      public_comment_hint: Derbarê sînorkirina vê navperê ji bo raya giştî re şîrove bike, ku reklamkirina rêzoka sînorên navperê çalakkirî be.
+      reject_media: Pelên medyayê nepejirîne
+      reject_media_hint: Pelên medyayê herêmî hatine tomarkirin radike û di pêşerojê de daxistinê red dike. Ji bo rawstandinê ne girîng e
+      reject_reports: Ragihandinan nepejirîne
+      reject_reports_hint: Ragihandinên ku ji vê navperê tê paşguh bike. Ji bo dûrbûnê re ne guncav e
+      undo: Astengkirina navperê vegerîne
+      view: Astengkirina navperê nîşan bike
     email_domain_blocks:
-      add_new: زیادکردنی نوێ
-      created_msg: بە سەرکەوتوویی دۆمەینی ئیمەیڵ بلۆک کرا
-      delete: سڕینەوە
-      destroyed_msg: بە سەرکەوتوویی دۆمەینی ئیمەیڵ لە بلۆک لاچوو
-      domain: دۆمەین
-      empty: هیچ دۆمەینێک لە ئێستادا بلۆک نەکراوە.
-      from_html: لە %{domain}
+      add_new: Nû tevlî bike
+      attempts_over_week:
+        one: "%{count} hewldana tomarkirinê di hefteya borî de"
+        other: "%{count} hewldanên tomarkirinê di hefteya borî de"
+      created_msg: Bi serkeftî navpera e-name hate astengkirin
+      delete: Jê bibe
+      dns:
+        types:
+          mx: Tomarkerê MX
+      domain: Navper
       new:
-        create: زیادکردنی دۆمەین
-        title: بلۆککردنی دۆمەینی ئیمەیڵی نوێ
-      title: دۆمەینە بلۆککراوەکانی ئیمەیڵ
+        create: Navper tevlî bike
+        resolve: Navperê çareser bike
+        title: Navperê e-nameyê nû asteng bike
+      no_email_domain_block_selected: Tu astengkirnên navperê e-nameyê nehatin guhertin ji ber ku tu yek nehatine hilbijartin
+      resolved_dns_records_hint_html: Navê navperê ji MX ên jêrîn re çareser dike, ên ku di dawiyê de berpirsiyarin ji pejirandina e-nameyê. Astengkirina navperek MX wê tomarkirina ji her navnîşana e-nameyê ya ku heman navpera MX bi kar tîne asteng bike, tevlî ku navê navperê xuya cûda be. <strong>Hişyar be ku peydekarên sereke yên e-nameyê asteng nekî.</strong>
+      resolved_through_html: Bi riya %{domain} ve hate çareserkirin
+      title: Navperên e-nameyê astengkirî
+    export_domain_allows:
+      new:
+        title: Astengkirnên navperê têne
+      no_file: Tu pel nehatiye hilbijartin
+    export_domain_blocks:
+      import:
+        description_html: Tu kê rêzokek ji astengkirinên navperê têxê. Ji kerema xwe vê rêzokê pir bi baldarî binirxîne, taybet ku te ev rêzok bi xwe nenivîsandiye.
+        existing_relationships_warning: Têkiliyên şopandinê yên heyî
+        private_comment_description_html: 'Ji bo ku bibe alîkar ji te re bo ku bişopînî ka astengkirinên têxistî ji kuderê tên, astengkirinên têxistî wê werin afirandin bi şîroveya taybet ya: <q>%{comment}</q>'
+        private_comment_template: Ji %{source} hate têxistin di %{date} de
+        title: Astengkirinên navperê têxe
+      new:
+        title: Astengkirnên navperê têxe
+      no_file: Tu pel nehatiye hilbijartin
+    follow_recommendations:
+      description_html: "<strong>Şopandina pêşniyaran ji bo bikarhênerên nû re dibe alîkar ku zû naveroka balkêş bibînin</strong>. Gava ku bikarhênerek têra xwe bi kesên din re têkildar nebê da ku pêşnîyarên şopandina yên kesane bo xwe çêbike, li şûna van ajimêran têne pêşniyarkirin. Ew her roj ji tevliheviya ajimêrên bi tevlêbûnên herî dawîn ên herî bilind û jimara şopdarên herêmî yên herî pir ji bo zimaneke diyarkirî ji nû ve têne pêşniyarkirin."
+      language: Bo zimanê
+      status: Rewş
+      suppress: Bi bandorek mezin pêşniyara şopandinê bike
+      suppressed: Bandoreke mezin dibe
+      title: Pêşniyarên şopandinê
+      unsuppress: Pêşniyara şopandinê paşve vegerîne
     instances:
-      by_domain: دۆمەین
-      delivery_available: گەیاندن بەردەستە
+      availability:
+        description_html:
+          one: Ku radestkirina navperê <strong>%{count} roj </strong> bêyî serkeftin birevebiçe, heya ku radestkirinek <em> ji </em> navperê neyê wergirtin, wê hewildanên radestkirinê neyên kirin.
+          other: Ku radestkirina navperê <strong>%{count} rojên cuda</strong> bêyî serkeftin birevebiçe, heya ku radestkirinek <em> ji </em> navperê neyê wergirtin, wê hewildanên radestkirinê neyên kirin.
+        failure_threshold_reached: Rêjeya têkçûnê gihîşte %{date}.
+        failures_recorded:
+          one: Hewldana têkçûyî di %{count} roj de.
+          other: Hewldanên têkçûyî di %{count} rojên cuda de.
+        no_failures_recorded: Di tomarê de têkçûn tune.
+        title: Berdestbûnî
+        warning: Hewldana dawî ji bo girêdana bi vê rajekarê re bi ser neket
+      back_to_all: Hemû
+      back_to_limited: Sînorkirî
+      back_to_warning: Hişyarî
+      by_domain: Navper
+      confirm_purge: Ma tu dixwazî ku bi awayekî domdar daneyan ji vê navperê jê bibî?
+      content_policies:
+        comment: Nîşeya navxweyî
+        description_html: Tu dikarî polîtîkayên naverokê yên ku wê li hemû ajimêrên ji vê navperê û her kiîjan ji jêrnavperên werin sepandin diyar bikî.
+        policies:
+          reject_media: Medya nepejirîne
+          reject_reports: Ragihandinan nepejirîne
+          silence: Bi sînor bike
+          suspend: Rawestîne
+        policy: Polîtîka
+        reason: Sedemên gelemperî
+        title: Polîtîkayên naverokê
+      dashboard:
+        instance_accounts_dimension: Ajimêrên ku herî pir têne şopandin
+        instance_accounts_measure: ajimêrên tomarkirî
+        instance_followers_measure: şopînerên me li wir
+        instance_follows_measure: şopînerên wan li vir
+        instance_languages_dimension: Zimanên pir tên bikaranîn
+        instance_media_attachments_measure: pêvekên medyayê tomarkirî
+        instance_reports_measure: ragehandinên di derbarê wan de
+        instance_statuses_measure: şandiyên tomarkirî
+      delivery:
+        all: Hemû
+        clear: Çewtiyên gihandinê paqij bike
+        failing: Têkçûn
+        restart: Gihandinê nû va bike
+        stop: Gehandinê rawestîne
+        unavailable: Nederbasdar
+      delivery_available: Gihandin berdest e
+      delivery_error_days: Rojên çewtiyên gehandinê
+      delivery_error_hint: Ger gehandin %{count} rojan ne pêkan be ewê wek bixweber wê nayê gehandin were nîşandan.
+      destroyed_msg: Daneyên %{domain} niha ji bo jêbirina nêzîk di rêzê de ne.
+      empty: Tu navper nehatine dîtin.
       known_accounts:
-        one: "%{count} هەژمارەی ناسراو"
-        other: "%{count} هەژمارەکانی ناسراو"
+        one: "%{count} ajimêra naskirî"
+        other: "%{count} ajimêrên naskirî"
       moderation:
-        all: هەموو
-        limited: سنووردار
-        title: بەڕێوەبردن
-      private_comment: لێدوانی تایبەت
-      public_comment: سەرنجی گشتی
-      title: پەیوەندی نێوان ڕاژە
-      total_blocked_by_us: لەلایەن ئێمە بەربەست کراوە
-      total_followed_by_them: شوێنمان دەکەون
-      total_followed_by_us: شوێنیان کەوتین
-      total_reported: گوزارشت له باره یان
-      total_storage: هاوپێچی میدیا
+        all: Hemû
+        limited: Sînorkirî
+        title: Çavdêrî
+      private_comment: Şîroveya taybet
+      public_comment: Şîroveya ji hemû kesî re vekirî
+      purge: Pak bike
+      purge_description_html: Ku tu bawer dikî ev navper bi domdarî negirêdayî ye, tu dikarî hemû tomarên ajimêr û daneyên xwe yîn têkildarî wê navperê jê bibî. Ev dibe ku hinek dem bigire.
+      title: Giştî
+      total_blocked_by_us: Ji aliyê me ve hatiye astengkirin
+      total_followed_by_them: Ji aliyê wan ve hatiye şopandin
+      total_followed_by_us: Ji aliyê me ve hatiye şopandin
+      total_reported: Ragehandinên di derbarê wan de
+      total_storage: Pêvekên medyayê
+      totals_time_period_hint_html: Tevahiyên ku li jêr têne xuyakirin daneyên hemû deman dihewîne.
     invites:
-      deactivate_all: هەموو لەکارخستنی
+      deactivate_all: Hemûyan neçalak bike
       filter:
-        all: هەموو
-        available: بەردەستە
-        expired: بەسەرچووە
-        title: پاڵاوتن
-      title: بانگهێشتەکان
+        all: Hemû
+        available: Heye
+        expired: Dema wê qediya
+        title: Parzûn
+      title: Vexwendin
     ip_blocks:
-      add_new: دروستکردنی یاسا
-      created_msg: سەرکەوتووانە یاسای نوێی IP زیادکرا
-      delete: سڕینەوە
+      add_new: Rêbaz çê bike
+      created_msg: Rêzika nû a IPyê bi awayekî serkeftî hat tevlêkirin
+      delete: Jê bibe
       expires_in:
-        '1209600': ٢ هەفتە
-        '15778476': ٦ مانگ
-        '2629746': ١ مانگ
-        '31556952': ١ ساڵ
-        '86400': ١ ڕۆژ
-        '94670856': ٣ ساڵ
+        '1209600': 2 hefte
+        '15778476': 6 meh
+        '2629746': 1 meh
+        '31556952': 1 sal
+        '86400': 1 roj
+        '94670856': 3 sal
       new:
-        title: دروستکردنی یاسای نوێی IP
-      no_ip_block_selected: هیچ ڕێسایەکی IP نەگۆڕدرا وەک ئەوەی هیچ کامیان دەستنیشان نەکران
-      title: یاساکانی IP
-    pending_accounts:
-      title: هەژمارە هەڵواسراوەکان (%{count})
+        title: Rêzika nû a IPyê çêbike
+      no_ip_block_selected: Ji ber ku tu ajimêr nehat hilbijartin tu rêzika IPyê nehate guhertin
+      title: Rêbazên IP
     relationships:
-      title: پەیوەنیەکان %{acct}
+      title: Têkiliyên %{acct}
     relays:
-      add_new: زیادکردنی گواستنەوەی نوێ
-      delete: سڕینەوە
-      description_html: دانەیەکی <strong>ڕێڵەی نێو ڕاژەییە(federation relay) کە قەبارەیەکی فرەی لە تووتە گشتییەکان لە نێو ڕاژە هاوبەشەکان و ئابوونەکان دەگوازێتەوە <strong>رێڵە یارمەتی بە ڕاژە بچکۆلەو مامناوە ندییەکان دەدا کە بابەتی فرەتر پەیدا بکەن</strong> گەر ڕێڵە نەبێت، ئەم بابەتە گشتییانە تەنها کاتێک پەیدا دەبن کە بە کارهێنەرانی ناوخۆیی خۆیان شوێنکەوتووی بەکارهێنەران لە سەر ڕاژەکانی دیکە بن.
-      disable: لەکارخستن
-      disabled: ناچالاککراوە
-      enable: چالاککراوە
-      enable_hint: کاتێک چالاک کرا، ڕاژەکارەکەت بەشداری دەکات لە هەموو توتەکانی گشتی لەم گواستنەوەیە، و دەست دەکات بە ناردنی توتی گشتی ئەم ڕاژەیە.
-      enabled: چالاککراوە
-      inbox_url: نیشانەی URL
-      pending: چاوەڕێی پەسەندکردنی ڕێلەی
-      save_and_enable: پاشکەوتکردن و چالاککردن
-      setup: دامەزراندنی ڕێڵەی پەیوەندی
-      signatures_not_enabled: ڕیلەکان بە دروستی کارناکات لە کاتێکدا دۆخی پارێزراو یان دۆخی سنوورداری گشتی چالاک کراوە
-      status: دۆخ
-      title: ڕێڵەکان
+      add_new: Guhêrkerê nû tevlê bike
+      delete: Jê bibe
+      description_html: "<strong>Guhêrkerê giştî</strong> rajekareke navberkar e ku hejmareke mezin ji şandiyan di navbera rajekaran ku jê re dibin endam û weşanê dikin diguherîne. <strong> Ew dikare ji rajekarên piçûk û navîn re bibe alîkar ku naveroka ji fediverse </strong>ê bibîne, ku bi rengeke din pêdivî dike ku bikarhênerên herêmî bi desta li dû kesên din ên li rajekarên ji dûr be bişopînin."
+      disable: Neçalak bike
+      disabled: Neçalakkirî
+      enable: Çalak bike
+      enable_hint: Gava were çalakkirin, rajekara te dê ji hemî şandiyên giştî yên vê guhêrkerê re bibe endam, û dê dest bi şandina şandiyên giştî yên vê rajekarê bike.
+      enabled: Çalakkirî
+      inbox_url: Girêdana guhêrker
+      pending: Li benda pêjirandina guhêrker e
+      save_and_enable: Tomar û çalak bike
+      setup: Girêdanekê guhêrker saz bike
+      signatures_not_enabled: Dema ku moda ewle yan jî moda demnameya giştî çalak be guhêrker wê birêkûpêk nexebite
+      status: Rewş
+      title: Guhêrker
     report_notes:
-      created_msg: تێبینی ڕاپۆرت کردن بە سەرکەوتوویی دروست کرا!
-      destroyed_msg: تێبینی گوزارشت بە سەرکەوتوویی سڕاوەتەوە!
+      created_msg: Nîşeyê ragihandinê bi awayekî serkeftî pêk hat!
+      destroyed_msg: Nîşeyê ragihandinê bi awayekî serkeftî hate jêbirin!
     reports:
       account:
         notes:
-          one: "%{count} یاداشت"
-          other: "%{count} یاداشت"
-        reports:
-          one: "%{count} گوزارشت"
-          other: "%{count} گوزارشتەکان"
-      action_taken_by: کردەوە لە لایەن
-      are_you_sure: دڵنیای?
-      assign_to_self: دیاریکردن بۆ من
-      assigned: بەڕێوەبەری بەرپرس
+          one: "%{count} nîşe"
+          other: "%{count} nîşe"
+      action_log: Tomarê çavdêriyê
+      action_taken_by: Çalakî hate kirin ji aliyê
+      actions:
+        delete_description_html: Şandiyên hatine ragihandin wê werin jêbirin û were tomarkirin da ku ji te re bibe alîkar ku tu ji hêla heman ajimêrê ve binpêkirinên pêşerojê bêtir bikî.
+        mark_as_sensitive_description_html: Şandiyên hatine ragihandin wê werin nîşandan wekî hestyar û were tomarkirin da ku ji te re bibe alîkar ku tu ji hêla heman ajimêrê ve binpêkirinên pêşerojê bêtir bikî.
+        other_description_html: Bêtir vebijêrkên ji bo kontrolkirina tevgera ajimêrê bibîne û pêwendiyê li ser ajimêra ragihandî kesane bike.
+        resolve_description_html: Li hemberî ajimêra hatiye ragihandin wê tiştek pêk neyê, binpêkirin nayên tomarkirin û ragihandin wê were girtin.
+        silence_description_html: Wê profîl tenê ji kesên ku berê te dişopînin an ji bi destan lê serî lê didin re xuya bibe, gihandina wê bi tundî sînordar dike. Her gav dikare were vegerandin.
+        suspend_description_html: Heya ku di dawiyê de neyê jêbirin, wê profîl û hemû naverokên wê ne gihiştbar bin. Têkiliya bi ajimêrê re wê ne guncav be. Di nav 30 rojan de veger ji jêbirinê pêkan e.
+      actions_description_html: Ji bo çareserkirina vê ragihandinê biryar bide ka tê kîjan gav bavêjî. Ku tu li dijî ajimêrê ragihandî çalakiyeke cezakirinê bikî, ji bilî dema ku kategoriya <strong>Spam</strong> were hilbijartin, wê agahdariyek e-nameyê ji wan re were şandin.
+      add_to_report: Bo ragihandinê bêtir tevlî bike
+      are_you_sure: Gelo tu bawerî?
+      assign_to_self: Bo min diyar bike
+      assigned: Çavdêrê diyarkirî
+      by_target_domain: Navperê ya ajimêrê ragihandî
+      category: Beş
+      category_description_html: Sedema ku ev ajimêr û/an jî naverok hate ragihandin wê di pêwendiya bi ajimêrê ragihandinê de werê diyarkirin
       comment:
-        none: هیچ
-      created_at: گوزارشتکرا
-      mark_as_resolved: نیشانەی بکە وەک چارەسەرکراو
-      mark_as_unresolved: نیشانەکردن وەک چارەسەرنەکراوە
+        none: Ne yek
+      comment_description_html: 'Bo bêtir zanyarî bidî, %{name} nivîsand:'
+      created_at: Hate ragihandin
+      delete_and_resolve: Şandiyan jê bibe
+      forwarded: Beralîkirî
+      forwarded_to: Beralîkirî bo %{domain}
+      mark_as_resolved: Wekî çareserkirî nîşan bide
+      mark_as_sensitive: Wekî hestiyar nîşan bide
+      mark_as_unresolved: Wekî neçareserkirî nîşan bide
+      no_one_assigned: Ne yek
       notes:
-        create: زیادکردنی تێبینی
-        create_and_resolve: چارەسەر کردن لەگەڵ تێبینی
-        create_and_unresolve: دووبارە کردنەوەی بە تێبینی
-        delete: سڕینەوە
-        placeholder: باسی ئەو کردارانە بکە کە ئەنجام دراون، یان هەر نوێکردنەوەیەکی پەیوەندیداری ت...
-      reopen: دووبارە کردنەوەی گوزارشت
-      report: 'گوزارشت #%{id}'
-      reported_account: گوزارشتی هەژمارە
-      reported_by: گوزارشت لە لایەن
-      resolved: چارەسەرکرا
-      resolved_msg: گوزارشتکردن بە سەرکەوتوویی چارەسەر کرا!
-      status: دۆخ
-      target_domain: دۆمەینی هەژمارەی گوزارشتدراو
-      title: گوزارشتکرا
-      unassign: دیارینەکراوە
-      unresolved: چارەسەر نەکراوە
-      updated_at: نوێکرایەوە
+        create: Nîşe tevlî bike
+        create_and_resolve: Bi nîşe re çareser bike
+        create_and_unresolve: Bi nîşe re dîsa veke
+        delete: Jê bibe
+        placeholder: Bide nasîn ka çi çalakî hatine kirin, an jî heman rojanekirinên din ên têkildar...
+        title: Nîşe
+      notes_description_html: Nîşeyan ji çavdêrên din û ji xwe re di pêşerojê de bibîne û bihêle
+      quick_actions_description_html: 'Ji bo dîtina naveroka ragihandî çalakiyeke bilez bavêje an jî li jêr bigere:'
+      remote_user_placeholder: bikarhênerê ji dûr ve ji %{instance}
+      reopen: Ragihandina ji nû ve veke
+      report: "@%{id} Ragihîne"
+      reported_account: Ajimêra ragihandî
+      reported_by: Ragihandî ji aliyê
+      resolved: Çareserkirî
+      resolved_msg: Ragihandin bi awayekî serkeftî hate çareserkirin!
+      skip_to_actions: Derbasî çalakiyan bibe
+      status: Rewş
+      statuses: Naveroka ragihandî
+      statuses_description_html: Naveroka sûcdar wê di danûstendina bi xwediyê ajimêra ragihandî re wê werê diyarkirin
+      target_origin: Jêdera ajimêrê ragihandî
+      title: Ragihandinên
+      unassign: Diyar neke
+      unresolved: Neçareserkirî
+      updated_at: Rojanekirî
+      view_profile: Profîlê nîşan bide
+    roles:
+      add_new: Rolê tevlî bike
+      assigned_users:
+        one: "%{count} bikarhêner"
+        other: "%{count} bikarhêner"
+      categories:
+        administration: Rêvebirî
+        devops: DevOps
+        invites: Vexwendin
+        moderation: Çavdêrî
+        special: Taybet
+      delete: Jê bibe
+      description_html: Bi <strong>rolên bikarhêner</strong>, tu dikarî fonksiyon û deverên Mastodon ku bikarhênerên wê dikarin xwe bigihînin kesane bikî.
+      edit: Rolê '%{name}' serrast bike
+      everyone: Mafdayînên berdest
+      everyone_full_description_html: Ev <strong>rola bingehîn</strong> bandorê li <strong>hemû bikarhêneran</strong> dike, tevî yên bêyî rolek diyarkirî jî. Hemû rolên din mafdayînan jê digirin.
+      permissions_count:
+        one: "%{count} mafdayîn"
+        other: "%{count} mafdayîn"
+      privileges:
+        administrator: Rêvebir
+        administrator_description: Bikarhênerên xwediyê vê mafdayînan wê her mafdayîn derbas bike
+        delete_user_data: Daneyên bikarhêner jê bibe
+        delete_user_data_description: Mafê dide bikarhêneran ku daneyên bikarhênerên din bêyî derengxisitn jê bibin
+        invite_users: Bikarhêneran vexwîne
+        invite_users_description: Mafê dide bikarhêneran ku mirovên nû vexwîne bo rajekarê
+        manage_announcements: Reklaman bi rê be bibe
+        manage_announcements_description: Mafê dide bikarhêneran ku reklaman bi rê ve bibin li ser vê rajekarê
+        manage_appeals: Îtîrazan bi rê ve bibe
+        manage_appeals_description: Mafê dide bikarhêneran ku îtîrazan binirxînin li dijî çalakiyên çavdêriyê
+        manage_blocks: Astengkirinan bi rê ve bibe
+        manage_blocks_description: Mafê dide bikarhêneran ku peydakarê e-nameyê û navnîşanên IP asteng bike
+        manage_custom_emojis: Emojiyên kesane bi rêve bibe
+        manage_custom_emojis_description: Mafê dide bikarhêneran ku îmojî kesane bikin li ser vê rajekarê
+        manage_federation: Demnameya giştî bi rê ve bibe
+        manage_federation_description: Mafê dide bikarhêneran ku demnameya giştî bi navperên din re asteng bikin û radestkirinê kontrol bikin
+        manage_invites: Vexwendinan bi rêve bibe
+        manage_invites_description: Mafê dide bikarhêneran ku li girêdanên vexwendinê bigerin û neçalak bikin
+        manage_reports: Ragihandinan bi rê ve bibe
+        manage_reports_description: Mafê dide bikarhêneran ku ragihandinan binirxînin û li dijî wan kiryarên çavdêriyê çalakiyan pêk bînin
+        manage_roles: Rolan bi rêve bibe
+        manage_roles_description: Mafê dide bikarhêneran ku rolên li jêr ên xwe birêve bibin û nîşan bikin
+        manage_rules: Rolan bi rêve bibe
+        manage_rules_description: Mafê dide bikarhêneran ku rêzikên rajekarê biguherînin
+        manage_settings: Sazkariyan bi rê ve bibe
+        manage_settings_description: Mafê dide bikarhêneran ku sazkariyên malperê biguherînin
+        manage_taxonomies: Beşan bi rê ve bibe
+        manage_taxonomies_description: Mafê dide bikarhêneran ku naveroka rojevê binirxînin û sazkariyên hashtagê rojane bikin
+        manage_user_access: Gihiştinê bikarhêner bi rê ve bibe
+        manage_user_access_description: Mafê dide bikarhêneran ku piştrastkirina du-gavî ya bikarhênerên din neçalak bikin, navnîşana e-nameya xwe biguherînin û borînpeyva xwe ji nû ve bikin
+        manage_users: Bikarhêneran bi rêve bibe
+        manage_users_description: Mafê dide bikarhêneran ku hûrguliyên bikarhênerên din bibînin û li dijî wan kiryarên çavdêriyê çalakiyan pêk bînin
+        manage_webhooks: Webhook bi rê ve bibe
+        manage_webhooks_description: Mafê dide bikarhêneran ku ji bo bûyerên rêveberî yên webhook saz bikin
+        view_audit_log: Têketinên kontrolê nîşan bide
+        view_audit_log_description: Mafê dide bikarhêneran ku dîroka çalakiyên rêveberî yên li ser rajekarê bibînin
+        view_dashboard: Destgehê nîşan bide
+        view_dashboard_description: Mafê dide bikarhêneran ku bigihîjin destgehê û pîvanên cuda
+        view_devops: DevOps
+        view_devops_description: Mafê dide bikarhêneran ku bigihîjin destgehên Sidekiq û pgHero
+      title: Rol
+    rules:
+      add_new: Rêbazekê tevlî bike
+      delete: Jê bibe
+      description_html: Dema ku piranîya dibêjin ku wan merçên karanînê xwendine û dipejirînin jî, bi gelemperî mirov heta ku pirsgirêkek dernekeve holê naxwîne. <strong> Bi peydakirina wan di navnîşek xala guleya rast de hêsantir bike ku tu rêbazên rajekera xwe li ser çavekî bibîne.</strong> Hewl bide ku rêbazênn yekkesî kurt û hêsan bihêlî, lê hewl bide ku wan tênexî gelek hêmanên cuda jî.
+      edit: Rêbazê serrast bike
+      empty: Tu rêbazên rajekar hê nehatine dîyarkirin.
+      title: Rêbazên rajekar
     settings:
-      activity_api_enabled:
-        desc_html: ژماردنی دۆخی بڵاوکراوە ی ناوخۆیی و بەکارهێنەرە چالاکەکان و تۆماری نوێ لە سەتڵی هەفتانە
-        title: بڵاوکردنەوەی ئاماری کۆ دەربارەی چالاکی بەکارهێنەر
-      bootstrap_timeline_accounts:
-        desc_html: چەند ناوی بەکارهێنەرێک جیابکە بە بۆر، تەنها هەژمارەی بلۆککراوەکان و ناوخۆیی کاردەکەن. بنەڕەت کاتێک بەتاڵ بوو هەموو بەڕێوەبەرە خۆجێیەکانن.
-        title: بەدواداچوەکانی گریمانەیی بۆ بەکارهێنەرە نوێکان
-      contact_information:
-        email: ئیمەیلی بازرگانی
-        username: ناوی بەکارهێنەر
-      custom_css:
-        desc_html: دەستکاری کردنی شێوەی CSS بارکراو لەسەر هەموو لاپەڕەکان
-        title: CSSی تایبەتمەند
+      about:
+        manage_rules: Rêzikên rajekaran bi rê ve bibe
+        preamble: Zanyariyên kûr peyda bike li ser ka rajekar çawa tê xebitandin, çavdêrîkirin, fînansekirin.
+        rules_hint: Ji bo rêbazên ku ji bikarhênerên ve tê hêvîkirin ku pê ve girêdayî bin deverek veqetandî heye.
+        title: Derbar
+      appearance:
+        preamble: Navrûya tevnê ya Mastodon kesane bike.
+        title: Xuyang
+      branding:
+        preamble: Navnîşa rajekarê te wê ji rajekarên din ên di torê de cuda bike. Dibe ku ev zanyarî li ser cihên cuda, wekî navrûya bikarhêneriyê tevnê ya Mastodon, sepanên resen, di pêşdîtinên girêdanê de li ser malperên din û di nav sepanên peyamî de, û hwd werin nîşandan. Ji bo vê yekê, çêtir e ku mirov van zanyariyan zelal, kurt û bê kêmasî werin nîşandan.
+        title: Marka
+      content_retention:
+        preamble: Kontrol bike ka naveroka ku ji aliyê bikarhêner ve hatiye çêkirin di Mastodon de çawa tê tomarkirin.
+        title: Parastina naverokê
       default_noindex:
-        desc_html: کاردەکاتە سەر هەموو بەکارهێنەرەکان کە ئەم ڕێکخستنە خۆیان نەگۆڕاون
-        title: بەکارهێنەران لە پێڕستکردنی بزوێنەری گەڕان بە گریمانەیی هەڵبژێن
+        desc_html: Bandorê li ser hemû bikarhênerên ku bi xwe ev sazkarî neguhertine
+        title: Pêlrêçkirna bikarhêneran ji motorê lêgerînê dûr bixe
+      discovery:
+        follow_recommendations: Pêşniyarên şopandinê
+        preamble: Rûbirûbûna naveroka balkêş ji bo bikarhênerên nû yên ku li ser Mastodon kesek nas nakin pir bi bandor e. Kontrol bike ka çend taybetmendiyên vekolînê li ser rajekarê te çawa dixebite.
+        profile_directory: Rêgeha profîlê
+        public_timelines: Demnameya gelemperî
+        title: Vekolîne
+        trends: Rojev
       domain_blocks:
-        all: بۆ هەموو کەسێک
-        disabled: بۆ هیچ کەسێک
-        title: بلۆکەکانی دۆمەین پیشان بدە
-        users: بۆ چوونە ژوورەوەی بەکارهێنەرانی ناوخۆ
-      domain_blocks_rationale:
-        title: پیشاندانی ڕێژەیی
-      hero:
-        desc_html: نیشان درا لە پەڕەی سەرەتا. بەلایەنی کەمەوە 600x100px پێشنیارکراوە. کاتێک ڕێک نەکەویت، دەگەڕێتەوە بۆ وێنۆجکەی ڕاژە
-        title: وێنەی پاڵەوان
-      mascot:
-        desc_html: نیشان دراوە لە چەند لاپەڕەیەک. بەلایەنی کەمەوە 293× 205px پێشنیارکراوە. کاتێک دیاری ناکرێت، دەگەڕێتەوە بۆ بەختبەختێکی ئاسایی
-        title: وێنەی ماسکۆت
-      peers_api_enabled:
-        desc_html: ناوی دۆمەینەکانێک کە ئەم ڕاژە پەیوەندی پێوەگرتووە
-        title: بڵاوکردنەوەی لیستی راژەکانی دۆزراوە
-      preview_sensitive_media:
-        desc_html: بینینی لینک لە وێب سایتەکانی تر وێنۆچکەیەک پیشان دەدات تەنانەت ئەگەر میدیاکە بە هەستیاری نیشان کرابێت
-        title: پیشاندانی میدیای هەستیار لە پێشبینیەکانی OpenGraph
-      profile_directory:
-        desc_html: ڕێگەدان بە بەکارهێنەران بۆ دۆزینەوەیان
-        title: چالاککردنی ڕێنیشاندەرێکی پرۆفایل
+        all: Bo herkesî
+        disabled: Bo tu kesî
+        users: Ji bo bikarhênerên herêmî yên têketin kirine
       registrations:
-        closed_message:
-          desc_html: لە پەڕەی پێشەوە پیشان دەدرێت کاتێک تۆمارەکان داخراون. دەتوانیت تاگەکانی HTML بەکاربێنیت
-          title: نامەی تۆمارکردن داخراو
-        deletion:
-          desc_html: ڕێ بدە بە هەر کەسێک هەژمارەکەی بسڕیتەوە
-          title: سڕینەوەی هەژمارە بکەوە
-        min_invite_role:
-          disabled: هیچکەس
-          title: ڕێپێدانی بانگهێشتەکان لەلایەن
+        preamble: Kontrol bike ka kî dikare li ser rajekarê te ajimêrekê biafirîne.
+        title: Tomarkirin
       registrations_mode:
         modes:
-          approved: پەسەندکردنی داواکراو بۆ ناوتۆمارکردن
-          none: کەس ناتوانێت خۆی تۆمار بکات
-          open: هەر کەسێک دەتوانێت خۆی تۆمار بکات
-        title: مەرجی تۆمارکردن
-      show_known_fediverse_at_about_page:
-        desc_html: کاتێک ناچالاک کرا، هێڵی کاتی گشتی کە بەستراوەتەوە بە لاپەڕەی ئێستا سنووردار دەبن، تەنها ناوەڕۆکی ناوخۆیی پیشاندەدرێن
-        title: نیشاندانی ڕاژەکانی دیکە لە پێشنەمایەشی ئەم ڕاژە
-      show_staff_badge:
-        desc_html: پیشاندانی هێمایەک هاوکار لە سەر پەڕەی بەکارهێنەر
-        title: نیشاندانی هێمای هاوکار
-      site_description:
-        desc_html: کورتە باسیک دەربارەی API، دەربارەی ئەوە چ شتێک دەربارەی ئەم ڕاژەی ماستۆدۆن تایبەتە یان هەر شتێکی گرینگی دیکە. دەتوانن HTML بنووسن، بەتایبەت <code>&lt;a&gt;</code> وە <code>&lt;em&gt;</code>.
-        title: دەربارەی ئەم ڕاژە
-      site_description_extended:
-        desc_html: شوێنیکی باشە بۆ نووسینی سیاسەتی ئیس، یاسا و ڕێسا ، ڕێنمایی و هەر شتیک کە تایبەت بەم ڕاژیە، تاگەکانی HTMLــلیش ڕێگەی پێدراوە
-        title: زانیاری تەواوکەری تایبەتمەندی
-      site_short_description:
-        desc_html: نیشان لە شریتی لاتەنیشت و مێتا تاگەکان. لە پەرەگرافێک دا وەسفی بکە کە ماستۆدۆن چیە و چی وا لە ڕاژە کە دەکات تایبەت بێت.
-        title: دەربارەی ئەم ڕاژە
-      site_terms:
-        desc_html: دەتوانیت سیاسەتی تایبەتیێتی خۆت بنووسیت، مەرجەکانی خزمەتگوزاری یان یاسایی تر. دەتوانیت تاگەکانی HTML بەکاربێنیت
-        title: مەرجەکانی خزمەتگوزاری ئاسایی
-      site_title: ناوی ڕاژە
-      thumbnail:
-        desc_html: بۆ پێشبینین بەکارهاتووە لە ڕێگەی OpenGraph وە API. ڕووناکی بینین ١٢٠٠x٦٣٠پیکسێڵ پێشنیارکراوە
-        title: وێنەی بچکۆلەی ڕاژە
-      timeline_preview:
-        desc_html: لینکەکە نیشان بدە بۆ هێڵی کاتی گشتی لەسەر پەڕەی نیشتنەوە و ڕێگە بە API بدە دەستگەیشتنی هەبێت بۆ هێڵی کاتی گشتی بەبێ سەلماندنی ڕەسەنایەتی
-        title: ڕێگەبدە بە چوونە ژورەوەی نەسەلمێنراو بۆ هێڵی کاتی گشتی
-      title: ڕێکخستنەکانی ماڵپەڕ
-      trendable_by_default:
-        desc_html: کاریگەری لەسەر هاشتاگی پێشوو کە پێشتر ڕێگە پێنەدراوە
-        title: ڕێگە بدە بە هاشتاگی بەرچاوکراوە بەبێ پێداچوونەوەی پێشوو
-      trends:
-        desc_html: بە ئاشکرا هاشتاگی پێداچوونەوەی پێشوو پیشان بدە کە ئێستا بەرچاوکراوەن
-        title: هاشتاگی بەرچاوکراوە
+          approved: Ji bo têketinê erêkirin pêwîste
+          none: Kesek nikare tomar bibe
+          open: Herkes dikare tomar bibe
+      title: Sazkariyên rajekarê
     site_uploads:
-      delete: سڕینەوەی فایلی بارکراو
-      destroyed_msg: بارکردنی ماڵپەڕ بە سەرکەوتوویی سڕدراوەتەوە!
+      delete: Pela barkirî jê bibe
+      destroyed_msg: Barkirina malperê bi serkeftî hate jêbirin!
     statuses:
-      back_to_account: گەڕانەوە بۆ لاپەڕەی هەژمارە
+      account: Nivîskar
+      application: Sepan
+      back_to_account: Vegere bo rûpela ajimêr
+      back_to_report: Vegere rûpela ragihandinê
       batch:
-        delete: سڕینەوە
-        nsfw_off: نیشانەکردن وەک هەستیار نیە
-        nsfw_on: نیشانەکردن وەک هەستیار
-      deleted: سڕینەوە
-      failed_to_execute: جێبەجێ کردن سەرکەوتوو نەبوو
+        remove_from_report: Ji ragihandinê rake
+        report: Ragihîne
+      deleted: Hate jêbirin
+      favourites: Bijarte
+      history: Dîroka guhertoyê
+      in_reply_to: Bersiv bide
+      language: Ziman
       media:
-        title: میدیا
-      no_media: هیچ میدیایەک
-      no_status_selected: هیچ دۆخیک نەگۆڕاوە وەک ئەوەی هیچ بارێک دەستنیشان نەکراوە
-      title: دۆخی ئەژمێر
-      with_media: بە میدیا
+        title: Medya
+      metadata: Metadata
+      no_status_selected: Tu şandî nehat hilbijartin ji ber vê tu şandî jî nehat guhertin
+      open: Şandiyê veke
+      original_status: Şandiyê resen
+      reblogs: Ji nû ve nivîsandin
+      status_changed: Şandî hate guhertin
+      title: Şandiyên ajimêr
+      trending: Rojev
+      visibility: Xuyabarî
+      with_media: Bi medya yê re
+    strikes:
+      actions:
+        delete_statuses: "%{name} şandiyên %{target} jêbirin"
+        disable: "%{name} ajimêr %{target} cemidand"
+        mark_statuses_as_sensitive: "%{name} medyayê %{target} wekî hestiyar nîşan kir"
+        none: "%{name} ji bo %{target} hişyariyek şand"
+        sensitive: "%{name} ajimêrê %{target} wekî hestiyarî nîşan kir"
+        silence: "%{name} ajimêra %{target} bi sînor kir"
+        suspend: "%{name} ajimêra %{target} hilda rawestandinê"
+      appeal_approved: Îtîraz
+      appeal_pending: Îtîraz li benda nirxandinê ye
+    system_checks:
+      database_schema_check:
+        message_html: Koçberiyên databasê yên li bendê hene. Ji kerema xwe wan bişopîne da ku bicîh bikî ku sepan wekî ku tê hêvî kirin tevbigere
+      elasticsearch_running_check:
+        message_html: Bi Elasticsearch re nayê girêdan. Ji kerema xwe kontrol bike ku ew dixebite, an lêgerîna tev-nivîsî neçalak bike
+      elasticsearch_version_check:
+        message_html: 'Guhertoya Elasticsearch a nelihevhatî: %{value}'
+        version_comparison: Elasticsearch %{running_version} dixebite lê %{required_version} pêwîst e
+      rules_check:
+        action: Rêzikên rajekara bi rê ve bibe
+        message_html: Te qet rêzikên rajekara diyar nekiriye.
+      sidekiq_process_check:
+        message_html: Pêvajoyên Sidekiq ên heyî ji bo %{value} di rêz (an) de tune ne. Ji kerema xwe sazkariyên Sidekiq a xwe binirxîne
     tags:
-      accounts_today: بەکارهێنانی بێ هاوتای ئەمڕۆ
-      accounts_week: بەکارهێنەری یەکتا لەم هەفتەیە
-      breakdown: بەکارهێنانی ئەمڕۆ بە جوداکردنی سەرچاوە
-      last_active: دوا چالاکی
-      most_popular: بەناوبانگترین
-      most_recent: تازەترین
-      name: هەشتاگ
-      review: پێداچوونەوەی دۆخ
-      reviewed: پێداچوونەوە
-      title: هەشتاگ
-      trending_right_now: بەرچاوکردن لە ئێستادا
-      unique_uses_today: T%{count} ئەمڕۆ بڵاوکراوە
-      unreviewed: پێداچوونەوە نەکراوە
-      updated_msg: ڕێکخستنی هاشتاگ بە سەرکەوتوویی نوێکرایەوە
-    title: بەڕێوەبەر
+      review: Binêre rewşê
+      updated_msg: Sazkariyên hashtag bi awayekî serkeftî hate rojanekirin
+    title: Rêvebirî
+    trends:
+      allow: Bihêle
+      approved: Pejirandî
+      disallow: Nehêle
+      links:
+        allow: Mafê bide girêdanê
+        allow_provider: Mafê bide weşanger
+        description_html: Van girêdanên ku niha ji hêla ajimêrên ku rajekarê te ji wan peyaman dibîne pir têne parvekirin. Ew dikare ji bikarhênerên te re bibe alîkar ku fêr bibin ka li cîhanê çi diqewime. Heya ku tu weşanger nepejirînin, ti girêdan bi gelemperî nayê xuyangkirin. Her weha tu dikarî mafê bidî girêdanên kesane an jî nedî.
+        disallow: Mafê nede girêdanê
+        disallow_provider: Mafê nede weşanger
+        no_link_selected: Tu girêdan nehatin hilbijartin ji ber vê tu girêdan jî nehatin guhertin
+        publishers:
+          no_publisher_selected: Tu weşan nehatin hilbijartin ji ber vê tu weşan jî nehatin guhertin
+        shared_by_over_week:
+          one: Di nava hefteya dawî de ji aliyê keskekî ve hate parvekirin
+          other: Di nava hefteya dawî de ji aliyê %{count} ve hate parvekirin
+        title: Girêdanên di rojevê de
+        usage_comparison: Îro %{today} car hate parvekirin, li gorî %{yesterday} duh
+      only_allowed: Tenê yên mafdayî
+      pending_review: Li benda nirxandinê ye
+      preview_card_providers:
+        allowed: Girêdanên ji vê weşangerê dikarin bibin rojev
+        description_html: Ev navperên ku ji wan girêdanên bi gelemperî li ser rajekarê te têne parvekirin. Heya ku girêdana rojevê neyê pejirandin, girêdan wê ji raya giştî re nebin rojev. Pejirandina (an nepejirandina) te berbi jêrnavperan ve diçe.
+        rejected: Girêdanên ji vê weşangerê nikarin bibin rojev
+        title: Weşanger
+      rejected: Nepejirand
+      statuses:
+        allow: Mafê bide şandiyê
+        allow_account: Mafê bide nivîskar
+        description_html: Van şandiyên ku rajekarê te pê dizane ku niha pir têne parvekirin û bijartekirin. Ew dikare ji bikarhênerên te yên nû û yên vedigerin re bibe alîkar ku bêtir mirovên ku bişopînin bibînin. Heya ku tu nivîskar nepejirînî, tu şandî bi gelemperî nayên xuyangkirin, û nivîskar mafê dide ku ajimêrê xwe ji kesên din re were pêşniyarkirin. Her weha tu dikarî mafê bidî şandiyên kesane an jî nedî.
+        disallow: Mafê nede şandiyê
+        disallow_account: Mafê nede nivîskar
+        no_status_selected: Tu şandiyên rojevê nehatin hilbijartin ji ber vê tu şandî jî nehatin guhertin
+        not_discoverable: Nivîskar nejilbijartiye ji bo ku were kifşkirin
+        shared_by:
+          one: Yek carî parvekirî an bijartî
+          other: "%{friendly_count} carên parvekirî û bijartî"
+        title: Şandiyên rojevê
+      tags:
+        current_score: Encama niha %{score}
+        dashboard:
+          tag_accounts_measure: bikaranînên bêhempa
+          tag_languages_dimension: Zimanên pir tên bikaranîn
+          tag_servers_dimension: Rajekarên pir tên bikaranîn
+          tag_servers_measure: rajekarên cuda
+          tag_uses_measure: bikaranîna giştî
+        description_html: Ev hashtag in ku niha di gelek şandiyên ku rajekarê te dibîne de xuya dibin. Ew dikare ji bikarhênerên te re bibe alîkar ku fêr bibin ka mirov di vê demê de herî pir li ser çi diaxive. Heya ku tu wan nepejirînî, tu hashtag bi gelemperî nayê xuyangkirin.
+        listable: Dikare were pêşniyarkirin
+        no_tag_selected: Tu hashtag nehatin hilbijartin ji ber vê tu hashtag jî nehatin guhertin
+        not_listable: Nikare wer pêşniyarkirin
+        not_trendable: Wê di bin rojevan de xuya neke
+        not_usable: Nikare were bikaranîn
+        peaked_on_and_decaying: Di %{date} de derketiye asta herî bilind, û niha winda dibe
+        title: Hashtagên rojevê
+        trendable: Dikare di bin rojevan de xuya bibe
+        trending_rank: 'Rojev #%{rank}'
+        usable: Dikare were bikaranîn
+        usage_comparison: "%{today} car îro hate bikaranîn, li gorî %{yesterday} duh"
+        used_by_over_week:
+          one: Di nava hefteya dawî de ji aliyê kesekî ve hatiye bikaranîn
+          other: Di nava hefteya dawî de ji %{count} kes ve hatiye bikaranîn
+      title: Rojev
+      trending: Rojev
     warning_presets:
-      add_new: زیادکردنی نوێ
-      delete: سڕینەوە
-      edit_preset: دەستکاریکردنی ئاگاداری پێشگریمان
-      title: بەڕێوەبردنی ئاگادارکردنەوە پێش‌سازدان
+      add_new: Yeka nû tevlî bike
+      delete: Jê bibe
+      edit_preset: Hişyariyên pêşsazkirî serrast bike
+      empty: Te hin tu hişyariyên pêşsazkirî destnîşan nekirine.
+      title: Hişyariyên pêşsazkirî bi rêve bibe
+    webhooks:
+      add_new: Xala dawîbûnê tevlî bike
+      delete: Jê bibe
+      description_html: "<strong>çengeleke tevnê</strong> dihêle ku Mastodon <strong>agahdariyên dema-rastîn</strong> ên derbarê çalakiyên hilbijartî de bisepîne ser sepana te, bi vî awayî sepana te dikare <strong>reaksiyonan bi awayekî bixweber nîşan bide</strong>."
+      disable: Neçalak bike
+      disabled: Neçalakkirî
+      edit: Xala dawîbûnê serrast bike
+      empty: Hîn çengela tevnê ya xala dawîbûnê ya te ku hatiye pevesazkirin tune ne.
+      enable: Çalak bike
+      enabled: Çalak
+      enabled_events:
+        one: 1 bûyer çalakkirî
+        other: "%{count} bûyer çalakkirî"
+      events: Bûyer
+      new: Çengela tevnê ya nû
+      rotate_secret: Veşartî bizivirîne
+      secret: Îmzekirina veşartî
+      status: Rewş
+      title: Çengelên tevnê
+      webhook: Çengela tevnê
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: ku şandiyên wan jê bibî
+        disable: ku ajimêrê wan bicemidînî
+        mark_statuses_as_sensitive: ku şandiyê wan wekî hestyar nîşan bikî
+        none: hişyariyek
+        sensitive: ku ajimêrê wan wekî hestyar nîşan bikî
+        silence: ku ajimêrê wan sînordar bikî
+        suspend: ku ajimêrê wan bidî rawestandin
+      body: "%{target} îtiraza biryareke çavdêriyê dike bi riya %{action_taken_by} ji %{date}, ku %{type} bû. Wan nivîsand:"
+      next_steps: Tu dikarî îtirazê bipejirînî ku biryara çavdêriyê têk bibî, an jî paşguh bikî.
+      subject: "%{username} li ser %{instance} îtiraz li biryareke çavdêriyê dike"
     new_pending_account:
-      body: وردەکاریهەژمارە نوێیەکە لە خوارەوەیە. دەتوانیت ئەم نەرمەکالا پەسەند بکەیت یان ڕەت بکەیتەوە.
-      subject: هەژمارەیەک نوێ بۆ پێداچوونەوە لەسەر %{instance} (%{username})
+      body: Zanyariyênn ajimêra nû li jêr in. Tu dikarî vê serîlêdanê bipejirîne an pûç bike.
+      subject: "(%{username}) ajimêrê nû ji bo vekolandina li ser %{instance}"
     new_report:
-      body: بەکارهێنەری %{reporter} گوزارشی لە بەکارهینەری%{target} دا
-      body_remote: کەسێک لە %{domain} گوزارشتی %{target} ناردووە
-      subject: گوزارشتێکی نوی لە %{instance} (#%{id})
-    new_trending_tag:
-      body: 'هاشتاگی #%{name} ئەمڕۆ ئاراستە دەکرێت، بەڵام پێشتر پێداچوونەوەی بۆ نەکراوە. بە ئاشکرا پیشان نادرێت مەگەر تۆ ڕێگەی پێ بدەیت، یان تەنها فۆرمەکەت وەک خۆی پاشەکەوت بکەیت کە هەرگیز لێی نەبیستیت.'
-      subject: تاگێکی نوێ لە %{instance} نیازمەندی پێداچوونەوەیە (#%{name})
+      body: "%{reporter} ji %{target} ê ragihand"
+      body_remote: Kesekî bi navê %{domain} ji %{target} ê ragihand
+      subject: Ragihandinek nû ji bo %{instance} (#%{id})
+    new_trends:
+      body: 'Tiştên jêrîn berî ku ew bi gelemperî werin xuyakirin divê werin nirxandin:'
+      new_trending_links:
+        title: Girêdanên rojevê
+      new_trending_statuses:
+        title: Şandiyên rojevê
+      new_trending_tags:
+        no_approved_tags: Niha hashtagên rojevê pejirandî tune ne.
+        requirements: 'Yek ji namzedên li jêr dikare ji #%{rank} hashtagaa diyarkirî ya pejirandî derbas bibe, niha ku #%{lowest_tag_name} bi %{lowest_tag_score} puan e.'
+        title: Hashtagên rojevê
+      subject: Rojevên nû ji bo nirxandinê li ser %{instance} derdikevin
   aliases:
-    add_new: دروستکردنی ناوی ساختە
-    created_msg: نازناوێکی نوێیان سەرکەوتووانە دروستکرد. ئێستا دەتوانیت دەست بە گواستنەوە کەیت لە هەژمێرە کۆنەکەت.
-    deleted_msg: سەرکەوتووانە نازناوەکان لابدە. گواستنەوە لەو هەژمارەوە بۆ ئەم کەسە چیتر نابێت.
-    empty: هیچ نازناوێکت نیە.
-    hint_html: ئەگەر دەتەوێت لە هەژمارەیەکی ترەوە بگوێزریتەوە بۆ ئەم هەژمارە، لێرەدا دەتوانیت نازناوێک دروست بکەیت، پێش ئەوەی ئەوە بەردەوام بیت لە گواستنەوەی لە هەژمارە کۆنەکە بۆ ئەم هەژمارە پێویستە. ئەم کردەوەیە خۆی لە خۆیدا <strong>بێ زەرە و ناگەڕێتەوە</strong><strong>گواستنەوەی لە هەژمارەی کۆنە بۆ هەژمارەی نوێ دەستی پێکردووە</strong>.
-    remove: سڕینەوەی پەیوەندی ناز ناو
+    add_new: Naveke sexte çê bike
+    created_msg: Bi serkeftî nûçikê nû hat çêkirin. Tu niha dikarî di ajimêrê xwe kevn bar bikî.
+    deleted_msg: Nûçik bi serkeftî hat rakirin. Êdî nepêkan e vê ajimêrê de barkirina ajimêrek din.
+    empty: Nûçikên te tune ne.
+    hint_html: Ku tu dixwazî ji ajimêreke din bar bike bo yekî din, li vir tu dikarî bernavekê biafirîne, ku pêdivî ye berî ku tu bi şopandina şopînerên xwe ji ajimêra kevn ber bi vê yekê biçe. Ev çalakî bi serê xwe <strong>bê ziyan û vegere</strong>.<strong>Koçberiya ajimêr ji ajimêreke kevin dest pê dike</strong>.
+    remove: Girêdana nûçikê rake
   appearance:
-    advanced_web_interface: روخساری پێشکەوتوو
-    advanced_web_interface_hint: 'ئەگەر دەتەوێت پانی شاشەکە بەکاربێنیت، دەتوانی بە یارمەتی ڕووکاری پێشکەوتوو چەندین ستوونی جیاواز ڕێکبخەیت بۆ بینینی زانیاری زیاتر لە هەمان کات کە دەتەوێت بیبینیت: نووسراوەکانی نووسەرانی دیکە، ئاگانامەکان، پێرستی نووسراوەکانی هەموو شوێنێک، وە هەر ژمارەیەک لە لیستەکان و هاشتاگەکان.'
-    animations_and_accessibility: ئەنیمەیشن و توانایی دەستپێگەیشتن
-    confirmation_dialogs: پەیامەکانی پەسەندکراو
-    discovery: دۆزینەوە
+    advanced_web_interface: Navrûya tevnê yê pêşketî
+    advanced_web_interface_hint: 'Ku tu bixwazî tevahiya ferehiya dîmendera xwe bi kar bînî, navrûya pêşketî ya tevnê dihêle ku tu gelek stûnên cihêreng saz bikî da ku di heman demê de bi qasî ku tu dixwazî zanyariyan bibînî: Serrûpel, agahdarî, demnameya giştî, her hejmarek ji rêzik û hashtagan.'
+    animations_and_accessibility: Anîmasyon û gihînî
+    confirmation_dialogs: Gotûbêjên piştrastkirî
+    discovery: Vedîtin
     localization:
-      body: ماستۆدۆن لەلایەن خۆبەخشەوە وەردەگێڕێت.
-      guide_link_text: هەموو کەسێک دەتوانێت بەشداری بکات.
-    sensitive_content: ناوەڕۆکی هەستیار
-    toot_layout: لۆی توت
+      body: Mastodon ji aliyê xêrxwazan tê wergerandin.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Herkes dikare beşdar bibe.
+    sensitive_content: Naveroka hestiyarî
+    toot_layout: Xêzkirina şandîya
   application_mailer:
-    notification_preferences: گۆڕینی پەسەندکراوەکانی ئیمەیڵ
-    settings: 'گۆڕینی پەسەندکراوەکانی ئیمەیڵ: %{link}'
-    view: 'نیشاندان:'
-    view_profile: پرۆفایل نیشان بدە
-    view_status: پیشاندانی دۆخ
+    notification_preferences: Sazkariyên e-nameyê biguherîne
+    salutation: "%{name},"
+    settings: 'Sazkariyên e-nameyê biguherîne: %{link}'
+    view: 'Nîşan bide:'
+    view_profile: Profîlê nîşan bide
+    view_status: Şandiyê nîşan bide
   applications:
-    created: بەرنامە بە سەرکەوتوویی دروست کرا
-    destroyed: بەرنامە بە سەرکەوتوویی سڕدراوەتەوە
-    invalid_url: بەستەری دابینکراو نادروستە
-    regenerate_token: دووبارە دروستکردنەوەی نیشانەی چوونە ژوورەوە
-    token_regenerated: کۆدی دەستپێگەیشتن بە سەرکەوتوویی دروستکرا
-    warning: زۆر ئاگاداربە لەم داتایە. هەرگیز لەگەڵ کەس دا هاوبەشی مەکە!
-    your_token: کۆدی دەستپێگەیشتنی ئێوە
+    created: Sepan bi awayekî serkeftî hat çêkirin
+    destroyed: Sepan bi awayekî serkeftî hat jêbirin
+    regenerate_token: Nîşandera gihandinê bi nûve çêbike
+    token_regenerated: Nîşandera gihandinê bi serkeftî nû ve hat çêkirin
+    warning: Bi van daneyan re pir baldar be. Tu caran bi kesî re parve neke!
+    your_token: Nîşana gihîştinê te
   auth:
-    apply_for_account: داواکردنی بانگهێشتێک
-    change_password: تێپەڕوشە
-    checkbox_agreement_html: من ڕازیم بە <a href ="%{rules_path}" target="_blank">یاساکانی ڕاژە</a> وە <a href="%{terms_path}" target="_blank">مەرجەکانی خزمەتگوزاری</a>
-    checkbox_agreement_without_rules_html: من ڕازیم بە <a href="%{terms_path}" target="_blank">مەرجەکانی خزمەتگوزاری</a>
-    delete_account: سڕینەوەی هەژمارە
-    delete_account_html: گەر هەرەکتە هەژمارەکەت بسڕیتەوە، لە <a href="%{path}">لەم قوناغانە</a> بڕۆیتە پێشەوە. داوای پەسەند کردنتان لێدەگیرێت.
+    apply_for_account: Ajimêrekê bixwaze
+    change_password: Borînpeyv
+    delete_account: Ajimêr jê bibe
+    delete_account_html: Ku tu dixwazî ajimêra xwe jê bibe, tu dikarî <a href="%{path}">li vir bidomîne</a>. Ji te tê xwestin ku were pejirandin.
     description:
-      prefix_invited_by_user: "@%{name} بانگت دەکات بۆ پەیوەندیکردن بەم ڕاژەی ماستۆدۆن!"
-      prefix_sign_up: ئەمڕۆ خۆت تۆمار بکە لە ماستۆدۆن!
-      suffix: بە هەژمارەیەک، دەتوانیت شوێن هەژمارەکانی دیکە بکەویت، نوێکردنەوەکان بڵاوبکەوە و نامە لەگەڵ بەکارهێنەران لە هەر ڕاژەیەکی ماستۆدۆن و زیاتر بگۆڕیتەوە!
-    didnt_get_confirmation: ڕێنماییەکانی دڵنیاکردنەوەت پێنەدرا?
-    dont_have_your_security_key: کلیلی ئاسایشت نیە?
-    forgot_password: تێپەڕوشەکەت لەبیر چووە?
-    invalid_reset_password_token: وشەی نهێنی دووبارە ڕێکبخەوە دروست نیە یان بەسەرچووە. تکایە داوایەکی نوێ بکە.
-    link_to_otp: کۆدی دوو فاکتەر لە تەلەفۆنەکەت یان کۆدی چاککردنەوە تێبنووسە
-    link_to_webauth: بەکارهێنانی ئامێری کلیلی پاراستن
-    login: چوونەژوورەوە
-    logout: چوونەدەرەوە
-    migrate_account: گواستنەوە بۆ ئەژمێرێکی تر
-    migrate_account_html: ئەگەر دەتەوێت ئەم هەژمارە دووبارە ئاڕاستە بکەیت بۆ ئەژمێرێکی تر، دەتوانیت <href="%{path}"> کرتەیەک لێرە بکەی </a>.
-    or_log_in_with: یان چوونە ژوورەوە بە
-    register: خۆ تۆمارکردن
-    registration_closed: "%{instance} ئەندامانی نوێ قبووڵ ناکات"
-    resend_confirmation: دووبارە ناردنی ڕێنماییەکانی دووپاتکردنەوە
-    reset_password: گەڕانەوەی تێپەڕوشە
-    security: ئاسایش
-    set_new_password: سازدانی تێپەڕوشەی نوێ
+      prefix_invited_by_user: "@%{name} te vedixwîne ku tu beşdarî vê rajekara Mastodon-ê bibî!"
+      prefix_sign_up: Îro li Mastodonê tomar bibe!
+      suffix: Bi ajimêrekê, tu yê karibî kesan bişopînî, rojanekirinan bişînî û bi bikarhênerên ji her rajekarê Mastodon re peyaman bişînî û bêtir!
+    didnt_get_confirmation: Te rêwerzên pejirandinê wernegirt?
+    dont_have_your_security_key: Kilîda te ya ewlehiyê tune ye?
+    forgot_password: Te borînpeyva xwe ji bîr kir?
+    invalid_reset_password_token: Ji nû ve sazkirina borînpeyvê nederbasdar e an jî qediya ye. Jkx daxwaza yeka nû bike.
+    link_to_otp: Ji têlefona xwe an jî ji kodeke rizgarkirinê kodeke du-gavî binivîsine
+    link_to_webauth: Amûra kilîta ewlehiya xwe bi kar bîne
+    log_in_with: Têkeve bi riya
+    login: Têkeve
+    logout: Derkeve
+    migrate_account: Livandin bo ajimêreke din
+    migrate_account_html: Ku tu dixwazî ev ajimêr li ajimêreke cuda beralî bikî, tu dikarî <a href="%{path}">ji vir de saz bike</a>.
+    or_log_in_with: An têketinê bike bi riya
+    privacy_policy_agreement_html: Min <a href="%{privacy_policy_path}" target="_blank">Politîka taybetiyê</a> xwend û dipejirînim
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Tomar bibe
+    registration_closed: "%{instance} endamên nû napejirîne"
+    resend_confirmation: Rêwerên pejirandinê ji nû ve bişîne
+    reset_password: Borînpeyvê ji nû ve saz bike
+    rules:
+      preamble: Ev rêzik ji aliyê çavdêrên %{domain} ve tên sazkirin.
+      title: Hinek rêzikên bingehîn.
+    security: Ewlehî
+    set_new_password: Borînpeyveke nû ji nû ve saz bike
     setup:
-      email_below_hint_html: ئەگەر ناونیشانی ئیمەیڵی خوارەوە نادروستە، دەتوانیت لێرە بیگۆڕیت و ئیمەیڵێکی پشتڕاستکردنەوەی نوێ وەربگۆڕیت.
-      email_settings_hint_html: ئیمەیڵی پشتڕاستکردنەوە کە نێردرا بۆ %{email}. ئەگەر ناونیشانی ئیمەیڵ ڕاست نەبوو، دەتوانیت لە ڕێکبەندەکانی هەژمارەکەت بیگۆڕیت.
-      title: دامەزراندن
+      email_below_hint_html: Ku navnîşana e-nameya jêrîn ne rast be, tu dikarî wê li vir biguherîne û e-nameyeke pejirandinê ya nû bistîne.
+      email_settings_hint_html: E-nameya pejirandinê ji %{email} re hate şandin. Ku ew navnîşana e-nameyê ne rast be, tu dikarî wê di sazkariyên ajimêr de biguherîne.
+      title: Damezirandin
+    sign_in:
+      preamble_html: Têketinê bike bi riya <strong>%{domain}</strong> xwe. Ku ajimêrê te li ser rajekareke cuda hatiye pêşkêşkirin, tu yê nikaribû têketinê bikî vir.
+      title: Têkeve %{domain}
+    sign_up:
+      preamble: Bi ajimêrekê li ser vê rajekarê Mastodon re, tu yê karîbî her keseke din li ser torê bişopînî, her ku ajimêrê wan li ku derê tê pêşkêşkirin.
+      title: Ka em te bi rê bixin li ser %{domain}.
     status:
-      account_status: دۆخی هەژمارە
-      confirming: چاوەڕوانی دڵنیاکردنەوەی ئیمەیڵ بۆ تەواوکردن.
-      functional: هەژمارەکەت بەتەواوی کارا بووەتەوە.
-      pending: ئەپلیکەیشەنەکەت چاوەڕوانی پێداچوونەوەیە لەلایەن ستافەکەمانەوە. لەوانەیە ئەمە هەندێک کاتی بخایەنێت ئەگەر ئەۆپەکەت پەسەند کرا، ئیمەیڵت پێدەگات.
-      redirecting_to: هەژمارەکەت ناچالاکە لەبەرئەوەی ئێستا دووبارە ئاڕاستەدەکرێتەوە بۆ %{acct}.
-    trouble_logging_in: کێشە ت هەیە بۆ چوونە ژوورەوە?
-    use_security_key: کلیلی ئاسایش بەکاربهێنە
+      account_status: Rewşa ajimêr
+      confirming: Li benda pejirandina e-nameyê ne da ku biqede.
+      functional: Ajimêra te êdî amade ye.
+      pending: Daxwaza te li benda vekolînê ji hêla xebatkarên me ye. Ev dibe ku hinek dem bigire. Ku daxwaza te were pejirandin tu yê e-nameyekê bistîne.
+      redirecting_to: Ajimêra te neçalak e ji ber ku niha ber bi %{acct} ve tê beralîkirin.
+      view_strikes: Binpêkirinên berê yên dijî ajimêrê xwe bibîne
+    too_fast: Form pir zû hat şandin, dîsa biceribîne.
+    use_security_key: Kilîteke ewlehiyê bi kar bîne
   authorize_follow:
-    already_following: ئێوە ئێستا شوێن کەوتووی ئەم هەژمارەیەی
-    already_requested: تۆ پێشتر داواکاری بەدواداچوت ناردوە بۆ ئەو هەژمارە
-    error: بەداخەوە هەڵەیەک هەبوو لە کاتی گەڕان بەدوای ئەو هەژمارەیە
-    follow: شوێن کەوە
-    follow_request: 'تۆ داواکاری شوێنکەوتنت ناردووە بۆ:'
-    following: 'ئەنجام بوو! تۆ ئێستا بەدوای ئەم بەکارهێنەرە دەکەویت:'
+    already_following: Jixwe tu vê ajimêrê dişopînî
+    already_requested: Jixwe te ji vê ajimêrê re daxwazîya şopandinê şandi bû
+    error: Mixabin, dema ajimêr hat gerandin çewtiyek çêbû
+    follow: Bişopîne
+    follow_request: 'Te ji vê kesê re daxwazîya şopandinê şand:'
+    following: 'Serkeftin! Tu êdî dikarî bişopînî:'
     post_follow:
-      close: یان، دەتوانیت ئەم پەنجەرەیە دابخەیت.
-      return: پرۆفایلی بەکارهێنەر نیشان بدە
-      web: بڕۆ بۆ وێب
-    title: دوای %{acct} بکەوە
+      close: An jî, tu dikarî tenê ev çarçoveyê bigirî.
+      return: Profîla vê bikarhênerê nîşan bike
+      web: Biçe tevneyê
+    title: "%{acct} bişopîne"
   challenge:
-    confirm: بەردەوام بە
-    hint_html: "<strong>خاڵ:</strong> ئیمە لە کاتژمێری داهاتوو تێپەروشەت لێداوا ناکەین."
-    invalid_password: تێپەروشە دروست نیە
-    prompt: دڵنیابوون لە نهێنوشە بۆ بەردەوامبوون
+    confirm: Bidomîne
+    hint_html: "<strong>Nîşe:</strong>Ji bo demjimêreke din em ê borînpeyva te careke din ji te nexwazin."
+    invalid_password: Borînpeyva nederbasdar
+    prompt: Ji bo bidomî borînpeyvê bipejirîne
   crypto:
     errors:
-      invalid_key: کلیلی باوڕپێکراو Ed25519 یان Curve25519 دروست نییە
-      invalid_signature: واژووی Ed25519 بڕوادار نییە
+      invalid_key: ed25519 ne derbasdare ne jî Curve25519 kilîta
+      invalid_signature: Ed25519 ne îmzeyek derbasdar e
+  date:
+    formats:
+      default: "%b%d%Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}کات"
-      about_x_years: "%{count}ساڵ"
-      almost_x_years: "%{count}ساڵ"
-      half_a_minute: ئێستا
-      less_than_x_seconds: ئێستا
-      over_x_years: "%{count}ساڵ"
-      x_days: "%{count}ڕۆژ"
+      about_x_hours: "%{count}d"
+      about_x_months: "%{count}meh"
+      about_x_years: "%{count}sal"
+      almost_x_years: "%{count}sal"
+      half_a_minute: Hema niha
+      less_than_x_minutes: "%{count}xulek"
+      less_than_x_seconds: Hema niha
+      over_x_years: "%{count}sal"
+      x_days: "%{count}roj"
+      x_minutes: "%{count}xulek"
+      x_months: "%{count}meh"
+      x_seconds: "%{count}çirke"
   deletes:
-    challenge_not_passed: ئەو زانیاریانەی تێنووست کردووە ڕاست نەبوو
-    confirm_password: تێپەڕوشەی ئێستات تێبنووسە بۆ سەلماندنی ناسنامەکەت
-    confirm_username: ناوی بەکارهێنەرت تێبنووسە بۆ دڵنیابوون لە کردارەکە
-    proceed: سڕینەوەی هەژمارە
-    success_msg: هەژمارەکەت بە سەرکەوتوویی سڕرایەوە
+    challenge_not_passed: Zanyariyên ku te nivîsandî ne rast in
+    confirm_password: Borînpeyva xwe ya heyî binivîsine da ku nasnameya xwe piştrast bikî
+    confirm_username: Navê bikarhêneriyê xwe binivîse da ku pêvajoyê piştrast bikî
+    proceed: Ajimêr jê bibe
+    success_msg: Ajimêra te bi serkeftî hate jêbirin
     warning:
-      before: 'پێش بەردەوام بوون، تکایە ئەم تێبینیانە بە وردی بخوێننەوە:'
-      caches: وادیارە ئەو ناوەرۆکە کە ڕاژەکانی دیکە پاشکەوتیان کردووە بمینێتەوە
-      data_removal: بابەتەکانت و داتاکانی تر بە هەمیشەیی لادەبرێن
-      email_change_html: دەتوانی <a href="%{path}"> ناونیشانی ئیمەیڵەکەت بگۆڕیت</a> بەبێ سڕینەوەی هەژمارەکەت
-      email_contact_html: گەر ئیمەیل نەگەیشتووە بۆ داوای یارمەتی پەیامێک بنێرە بۆ <a href="mailto:%{email}">%{email}</a> پیغام دهید
-      email_reconfirmation_html: ئەگەر ئیمەیڵی پشتڕاستکردنەوەت پێنەگەشتووە، دەتوانیت <a href="%{path}"> دووبارە داوای لێبکە</a>
-      irreversible: ناتوانیت هەژمارەکەت بگەڕێنیتەوە یان کارا بکەیتەوە
-      more_details_html: بۆ زانیاری زیاتر، <a href="%{terms_path}"> پاراستنی نهێنیەکان</a> ببینە.
-      username_available: ناوی تێپەڕبوونت دووبارە بەردەست دەبێت
-      username_unavailable: ناوی تێپەڕبوونت بەردەست نییە
-  directories:
-    directory: ڕێنیشاندەرێکی پرۆفایل
-    explanation: دۆزینەوەی بەکارهێنەران لەسەر بنەمای بەرژەوەندییەکانیان
-    explore_mastodon: گەڕان لە %{title}
+      before: 'Berî ku tu pêşve biçî, jkx nvan nîşeyan bi baldarî bixwîne:'
+      caches: Naveroka ku ji hêla rajekarên din ve hatiye pêşbîrkirin dibe ku bimîne
+      data_removal: Şandiyên te û daneyên din wê bi awayekî dawî bêne rakirin
+      email_change_html: Tu dikarî navnîşana <a href="%{path}"> e-nameya xwe biguherînî </a> bêyî ku tu ajimêra xwe jê bibî
+      email_contact_html: Ku ew hîn jî negihîştiye, tu dikarî ji bo alîkariyê <a href="mailto:%{email}">%{email}</a> e-nameyê bişînî
+      email_reconfirmation_html: Ku te e-nameya pejirandinê nesitand, tu dikarî <a href="%{path}">dîsa daxwaz bike</a>
+      irreversible: Tu yê nikaribe ajimêra xwe serrast bike an ji nû ve çalak bike
+      more_details_html: Bo bêtir zanyarî, <a href="%{terms_path}">polîtika taybetiyê</a> binêre.
+      username_available: Navê bikarhêneriyê te wê dîsa peyda bibe
+      username_unavailable: Navê bikarhêneriyê ye wê tuneyî bimîne
+  disputes:
+    strikes:
+      action_taken: Çalakî hatin kirin
+      appeal: Îtîraz
+      appeal_approved: Ev binpêkirin bi serkeftî hate îtîraz kirin û êdî ne derbasdar e
+      appeal_rejected: Îtîraz nehate pejirandin
+      appeal_submitted_at: Îtîraz hate şandin
+      appealed_msg: Îtîraza te hatiye şandin. Ku were pejirandin, tu yê werî agahdarkirin.
+      appeals:
+        submit: Îtîrazê bişîne
+      approve_appeal: Îtîrazê bipejirîne
+      associated_report: Ragihandina têkildar
+      created_at: Dîrok
+      description_html: Ev kiryarên ku li dijî ajimêrê te hatine kirin û hişyariyên ku ji hêla xebatkarên %{instance} ve ji te re hatine şandinin.
+      recipient: Ji kê re
+      reject_appeal: Îtîrazê nepejirîne
+      status: 'Şandî #%{id}'
+      status_removed: Şandî jixwe ji pergalê hatî rakirin
+      title: "%{action} ji %{date}"
+      title_actions:
+        delete_statuses: Jêbirina şandiyê
+        disable: Cemdandina ajimêrê
+        mark_statuses_as_sensitive: Nîşankirina şandiyan wekî hestyar
+        none: Hişyarî
+        sensitive: Nîşankirina ajimêran wekî hestyar
+        silence: Sînorkirina ajimêrê
+        suspend: Rawestandina ajimêrê
+      your_appeal_approved: Îtîraza te hate pejirandin
+      your_appeal_pending: Te îtîrazek şand
+      your_appeal_rejected: Îtîraza te nehate pejirandin
   domain_validator:
-    invalid_domain: ناوی دۆمەین بڕوادار نییە
+    invalid_domain: ne naveke navper a derbasdar e
   errors:
-    '400': داواکاریەکەی کە پێشکەشت کردووە نادروستە یان نەیپێکا.
-    '403': تۆ مۆڵەتت نیە بۆ بینینی ئەم لاپەڕەیە.
-    '404': ئەو لاپەڕەیەی بەدوای دەگەڕێی لێرە نیە.
-    '406': ئەم پەڕەیە لە فۆرماتی داواکراودا بەردەست نییە.
-    '410': ئەو لاپەڕەیەی بەدوای دا دەگەڕایت چیتر لێرە بوونی نیە.
+    '400': Daxwaza ku te şand nederbasdar an çewt bû.
+    '403': Ji bo dîtina vê rûpelê mafê te nîn e.
+    '404': Rûpela ku tu lê digerî ne li vir e.
+    '406': Ev rûpel di awayê ku tê xwestin de peyda nabe.
+    '410': Ew rûpela ku tu lê digeriya êdî li vir nîne.
     '422':
-      content: سەلماندنەکەی ئاسایش سەرکەوتوو نەبوو. تۆ بلۆکی کۆکیز دەکەیت?
-      title: سەلماندنەکەی ئاسایش سەرکەوتوو نەبوو
-    '429': داواکاری زۆر
+      content: Rastekirina ewlehiyê têk çû. Ma tu kiloran asteng dikî?
+      title: Rastekirina ewlehiyê têk çû
+    '429': Gelek daxwazî
     '500':
-      content: داوای لێبوردن دەکەین، بەڵام لە کۆتاییەکەماندا. شتێک هەڵە ڕویداوە.
-      title: ئەم لاپەڕەیە ڕاست نییە
-    '503': ناتوانرێت پەڕەکە خزمەت بکرێت بەهۆی شکستی ڕاژەیەکی کاتی.
-    noscript_html: بۆ بەکارهێنانی بەرنامەی وێبی ماستۆدۆن، تکایە جاڤاسکریپت بەتوانا بکە. لە جیاتی ئەوە، یەکێک لە < href="%{apps_path}">ئەپێکی ماستۆدۆن</a>بەکارببە.
+      content: Em xemgîn in, lê tiştek di aliyê me de şaş çû.
+      title: Ev rûpel ne rast e
+    '503': Ji ber têkçûna rajekar a demkî rûpel nayê bikaranîn.
+    noscript_html: Ji bo ku tu sepanaa Mastodon a tevnê bi kar bîne, jkx JavaScript-ê çalak bike. Wekî din, yek ji <a href="%{apps_path}">sepanên xwemalî</a> ji bo Mastodon ji bo platforma xwe biceribîne.
   existing_username_validator:
-    not_found: بەکارهێنەرێک بەم هەژمارەی بەکارهێنەرە لەم ڕاژە پەیدا نەبوو
-    not_found_multiple: نەیتوانی %{usernames} بدۆزێتەوە
+    not_found: nikaribû bikarhênerek herêmî bi wê navê bikarhêner bibîne
+    not_found_multiple: "%{usernames} nehat dîtin"
   exports:
     archive_takeout:
-      date: بەروار
-      download: داگرتنی ئەرشیفەکەت
-      hint_html: دەتوانیت داوای ئەرشیفی <strong> نووسراوە و میدیای بارکراوەی خۆت </strong> بکەی. داتای هەناردەکراو لە فۆرماتی ActivityPub دەبێت، دەخوێنرێتەوە لەلایەن هەر نەرمەکالایەکی گونجاو. دەتوانیت هەموو ٧ ڕۆژ جارێک داوای ئەرشیفێکەت بکەیت.
-      in_progress: خەریکی کۆ کردنەوەی ئەرشیڤەکەت...
-      request: داوای ئەرشیفەکەت بکە
-      size: قەبارە
-    blocks: تۆ بلۆک دەکەیت
-    bookmarks: نیشانکراوەکان
-    domain_blocks: دۆمەین قەپاتکرا
-    lists: لیستەکان
-    mutes: هەژمارە بێدەنگ کراوە
-    storage: هەمارگەی میدیا
+      date: Dîrok
+      download: Arşîva xwe daxîne
+      hint_html: Tu dikarî arşîvek ji <strong> weşanên xwe û medyayên barkirî </strong> re bixwaze. Daneyên derxistî dê di forma ActivityPub de bin, ku ji hêla nermalava ku vê formê ve têne xwendin. Tu dikarî her 7 rojan arşîvekê bixwaze.
+      in_progress: Arşîve te tê berhev kirin...
+      request: Daxwaza arşîva ajimêra xwe bike
+      size: Mezinahî
+    blocks: Yên te astengkirî
+    bookmarks: Şûnpel
+    csv: CSV
+    domain_blocks: Navperên astengkirî
+    lists: Rêzok
+    mutes: Te bêdeng kir
+    storage: Bîrdanaka medyayê
   featured_tags:
-    add_new: زیادکردنی نوێ
+    add_new: Yeka nû tevlî bike
     errors:
-      limit: ئێوە ژمارەی بڕی ڕێگەپێدراوەی هاشتاگت هەیە
-    hint_html: "<strong> هاشتاگی تایبەت چییە؟</strong> بە شێوەیەکی دیار نیشان دەدرێت لەسەر پرۆفایلی گشتی و ڕێگە بە خەڵک دەدات بۆ گەڕان لە نووسراوە گشتیەکانت بە تایبەتی لەژێر ئەو هاشتاگە. ئامرازێکی زۆر باشن بۆ پاراستنی کاری داهێنەرانە یان پڕۆژەی درێژخایەنی ئێوە."
+      limit: Te jixwe berê pirtirîn hashtag destnîşan kiriye
+    hint_html: "<strong> Hashtagên destnîşankirî çi ne? </strong> Ew bi eşkere li ser profîla te ya gelemperî têne xuyakirin û dihêlin ku mirov bi taybetî di binê wan hashtagan de li şandiyên te yên gelemperî bigere. Ew ji bo şopandina karên afirîner an projeyên demdirêj amûrek girîng in."
   filters:
     contexts:
-      account: پرۆفایلەکان
-      home: ماڵەوە
-      notifications: ئاگادارییەکان
-      public: پێرستی گشتی نووسراوەکان
-      thread: گفتوگۆکان
+      account: Profîl
+      home: Serrûpel û rêzok
+      notifications: Agahdarî
+      public: Demnameya gelemperî
+      thread: Axaftin
     edit:
-      title: دەستکاری فلتەر
+      add_keyword: Kilîtpeyv tevî bike
+      keywords: Peyvkilît
+      statuses: Şandiyên kesane
+      statuses_hint_html: Ev parzûn ji bo hibijartina şandiyên kesane tê sepandin bêyî ku ew bi peyvkilîtên jêrîn re lihevhatî bin. <a href="%{path}">Şandiyan binirxîne an jî ji parzûnê rake</a>.
+      title: Parzûnê serrast bike
     errors:
-      invalid_context: هیچ دەقێکی نادروست نییە یان بێ بڕوایە
-      invalid_irreversible: فلتەرکردنی بێ گەڕانەوە تەنها کار دەکات لەگەڵ چوارچێوەی ماڵ یان ئاگانامەکان
+      deprecated_api_multiple_keywords: Van parameteran ji vê sepanê nayên guhertin ji ber ku ew li ser bêtirî yek kilîtpeyvên parzûnkirî têne sepandin. Sepaneke nûtir an navrûya bikarhêneriyê ya malperê bi kar bîne.
+      invalid_context: Naverok tune ye yan jî nederbasdar tê peydakirin
     index:
-      delete: سڕینەوە
-      empty: هیچ پالێوەرێکت نیە.
-      title: فلتەرەکان
+      contexts: Parzûnên di %{contexts} de
+      delete: Jê bibe
+      empty: Parzûnên te tune ne.
+      expires_in: Di %{distance} de diqede
+      expires_on: Di %{date} de diqede
+      keywords:
+        one: "%{count} kilîtpeyv"
+        other: "%{count} kilîtpeyv"
+      statuses:
+        one: "%{count} şandî"
+        other: "%{count} şandî"
+      statuses_long:
+        one: "%{count} şandiyê kesane yê veşartî"
+        other: "%{count} şandiyê kesane yê veşartî"
+      title: Parzûn
     new:
-      title: زیادکردنی فلتەری نوێ
+      save: Parzûna nû tomar bike
+      title: Parzûnek nû li zêde bike
+    statuses:
+      back_to_filter: Vegere bo parzûnê
+      batch:
+        remove: Ji parzûnê rake
+      index:
+        hint: Ev parzûn bêyî pîvanên din ji bo hilbijartina şandiyên kesane tê sepandin. Tu dikarî ji navrûya tevnê bêtir şandiyan tevlî vê parzûnê bikî.
+        title: Şandiyên parzûnkirî
   footer:
-    developers: پەرەپێدەران
-    more: زیاتر…
-    resources: سەرچاوەکان
-    trending_now: هەوادارانی ئێستا
+    trending_now: Niha rojevê de
   generic:
-    all: هەموو
-    changes_saved_msg: گۆڕانکاریەکان بە سەرکەوتوویی هەڵگیرا!
-    copy: ڕوونووس
-    delete: سڕینەوە
-    no_batch_actions_available: هیچ گرووپێکی کاری بەردەست نیە لەسەر ئەم لاپەڕەیە
-    order_by: ڕێکخستن بەپێی
-    save_changes: گۆڕانکاریەکان بپارێزە
+    all: Hemû
+    all_items_on_page_selected_html:
+      one: Berhemê <strong>%{count}</strong> li ser vê rûpelê hatiye hilbijartin.
+      other: Hemû berhemên <strong>%{count}</strong> li ser vê rûpelê hatine hilbijartin.
+    all_matching_items_selected_html:
+      one: Berhemê <strong>%{count}</strong> ku bi lêgerîna te re lihevhatî ye hatiye hilbijartin.
+      other: Hemû berhemên <strong>%{count}</strong> ku bi lêgerîna te re lihevhatî ne hatine hilbijartin.
+    changes_saved_msg: Guhertin bi serkeftî tomar bû!
+    copy: Jê bigire
+    delete: Jê bibe
+    deselect: Hemûyan hilnebijêre
+    none: Ne yek
+    order_by: Rêz bike bi
+    save_changes: Guhertinan tomar bike
+    select_all_matching_items:
+      one: Berhemê %{count} ku bi lêgerîna te re lihevhatî ye hilbijêre.
+      other: Hemû berhemên %{count} ku bi lêgerîna te re lihevhatî ne hilbijêre.
+    today: îro
     validation_errors:
-      one: شتێک هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەکەی خوارەوە بخشێنەوە
-      other: هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەی %{count} خوارەوە بخشێنەوە
+      one: Tiştek hîn ne rast e! Ji kerema xwe çewtiya li jêr di ber çavan re derbas bike
+      other: Tiştek hîn ne rast e! Ji kerema xwe %{count} çewtî li jêr di ber çavan re derbas bike
   html_validator:
-    invalid_markup: 'نیشانەی HTML نادروستی تێدایە: %{error}'
-  identity_proofs:
-    active: چالاک
-    authorize: بەڵێ، ڕێگە بدە
-    authorize_connection_prompt: ئایا ئەم گرێدانە نهێنییە ڕیگە دەدەی?
-    errors:
-      failed: پەیوەندی کردنی نهێنیکردن سەرکەوتوو نەبوو. تکایە دووبارە لە %{provider} هەوڵ بدەوە.
-      keybase:
-        invalid_token: نیشانە کانی بنەکلیلی سەرەکی (هەش) واژووی دیجیتاڵن و لانی کەم ٦٦ نووسە لە توانی ١٦ هەیە
-        verification_failed: ئەم بنە کلیلیە(Keybase) بە ءینوانی واژووی دیجیتاڵی بەکارهێنەری %{kb_username} پەسەند ناکا، تکایا دووبارە لە بنە کلیلێکی دیکە هەوڵ بدەوە.
-      wrong_user: ناتوانرێت پشت ڕاستکردنەوەیەک بۆ %{proving} لە کاتێک بە عینوانی %{current} هاتنەتە ناوە. بە عینوانی %{proving} بچنە ناوەو دووبارە هەوڵ بدەنەوە.
-    explanation_html: لێرە دەتوانیت بە نهێنی ناسنامەکانی تر ت گرێ بدەی لە سەکۆکانی ترەوە، وەک کلیلی بنکە. ئەمە ڕێگە دەدات بە کەسانی تر نامەی رەمزێنراوەکانت بۆ بنێرن لەسەر ئەو پلاتفۆرمە ، رێگەیان پێدەدات متمانە بکەن کە ئەو ناوەڕۆکەی تۆ دەیاننێریت لە تۆوە دێت.
-    i_am_html: من %{username} ــم لەسەر %{service} ــنم.
-    identity: ناسنامە
-    inactive: ناچالاکە
-    publicize_checkbox: 'ئەمە توت بکە:'
-    publicize_toot: 'پەسەند کرا! من %{username} لەسەر %{service} هەم: %{url}'
-    remove: لابردنی بەڵگە لە هەژمارەی
-    removed: بە سەرکەوتوویی بەڵگەنامەی سەلماندن لابرا لە هەژمارەی بەکارهینەر
-    status: دۆخی سەلماندن
-    view_proof: پیشاندانی سەلماندن
+    invalid_markup: 'di nav de nîşana HTML a nederbasdar heye: %{error}'
   imports:
+    errors:
+      invalid_csv_file: 'Pelê CSV nederbasdar e. Çewtî: %{error}'
+      over_rows_processing_limit: ji %{count} zêdetir rêzok hene
     modes:
-      merge: یەکخستن
-      merge_long: هێشتنەوەی تۆمارەکانی بەردەست و زیادکردنی دانەنوێکان
-      overwrite: نووسینەوە
-      overwrite_long: دراوەکانی ئێستا بسڕەوە و دراوی نوێ زیاد بکە
-    preface: دەتوانیت زانیاری هاوردە بکەیت کە ناردوتە تە لە ڕاژەیەکی ترەوە، وەک لیستی ئەو کەسانەی کە تۆ بەدوای دادەکەویت یان بەربەستت دەکەن.
-    success: داتاکەت بە سەرکەوتوویی بارکرا و ئێستا لە کاتی خۆیدا پرۆسێس دەکرێت
+      merge: Bi hev re bike
+      merge_long: Tomarên heyî bigire û yên nû lê zêde bike
+      overwrite: Bi ser de binivsîne
+      overwrite_long: Tomarkirinên heyî bi yên nû re biguherîne
+    preface: Tu dikarî têxistin ê daneyên bike ku te ji rajekareke din derxistî ye wek rêzoka kesên ku tu dişopîne an jî asteng dike.
+    success: Daneyên te bi serkeftî hat barkirin û di dema xwe de were pêvajotin
     types:
-      blocking: لیستی بلۆککردن
-      bookmarks: نیشانەکان
-      domain_blocking: لیستی بلۆککردنی دۆمەین
-      following: لیستی خوارەوە
-      muting: لیستی کپکردنەوە
-    upload: بارکردن
-  in_memoriam_html: لەیادبوون.
+      blocking: Rêzoka astengkirinê
+      bookmarks: Şûnpel
+      domain_blocking: Rêzoka navperên astengkirî
+      following: Rêzoka yên dişopînin
+      muting: Rêzoka bêdengiyê
+    upload: Bar bike
   invites:
-    delete: لەکارخستن
-    expired: بەسەرچووە
+    delete: Neçalak bike
+    expired: Dema wê qediya
     expires_in:
-      '1800': ٣٠ خولەک
-      '21600': ٦ کاتژمێر
-      '3600': ١ کاتژمێر
-      '43200': ١٢ کاتژمێر
-      '604800': ١ هەفتە
-      '86400': ١ ڕۆژ
-    expires_in_prompt: هەرگیز
-    generate: دروستکردنی لینکی بانگهێشت
-    invited_by: 'بانگهێشتکرایت لەلایەن:'
+      '1800': 30 xulek
+      '21600': 6 demjimêr
+      '3600': 1 demjimêr
+      '43200': 12 demjimêr
+      '604800': 1 hefte
+      '86400': 1 roj
+    expires_in_prompt: Tu car
+    generate: Girêdana vexwendinê çê bike
+    invited_by: 'Tu hatî vexwendin ji hêla:'
     max_uses:
-      one: ١ بار
-      other: "%{count} بار"
-    max_uses_prompt: بێ سنوور
-    prompt: دروست کردن و هاوبەش کردنی لینکەکان لەگەڵ ئەوانی تر بۆ پێدانی چوونە ژوورەوە بۆ ئەم ڕاژە
+      one: 1 bikaranîn
+      other: "%{count} bikaranîn"
+    max_uses_prompt: Bê sînor
+    prompt: Girêdanan bi kesên din re çê bike û parve bike da ku bigihîjin vê rajekarê
     table:
-      expires_at: بەسەرچووە
-      uses: بەکارهاوردنەکان
-    title: بانگهێشتکردنی خەڵک
+      expires_at: Diqede
+      uses: Bikaranîn
+    title: Mirovan vexwîne
   lists:
     errors:
-      limit: تۆ گەیشتوویتە زۆرترین ڕێژەی لیستەکان
+      limit: Tu gihîştî hejmara rêzika a herî zêde
+  login_activities:
+    authentication_methods:
+      otp: sepandina rastandina du-gavî
+      password: borînpeyv
+      sign_in_token: koda ewlehiyê bo e-nameyê
+      webauthn: kilîtên ewlehiyê
+    description_html: Çalakiya ku nas nakî dibînî, çêtir dibe ku borînpeyva xwe biguherînî û rastandina du-gavî çalak bikî.
+    empty: Dîroka piştrastkirinê tune ye
+    failed_sign_in_html: Hewldana têketinê ser neket bi%{method} ji %{ip} (%{browser}) de
+    successful_sign_in_html: Bi serkeftî têketin bi %{method} ji %{ip}(%{browser}) çêbû
+    title: Dîroka piştrastkirinê
   media_attachments:
     validations:
-      images_and_video: ناتوانرێت لەگەڵ ئەو نووسراوانە کە وێنەی لەگەڵە ،ڤیدیۆ بار بکەی
-      not_ready: ناتوانێت فایلەکان هاوپێچ بکات کە پرۆسەکەیان تەواو نەکردووە. دووبارە هەوڵ بدە!
-      too_many: ناتوانێت زیاتر لە ٤ فایل هاوپێچ بکات
+      images_and_video: Nikare vîdyoyekê tevlî şandiyê ku berê wêne tê de heye bike
+      not_ready: Nikare pelên ku pêvajo neqedandî ve girêbide. Di demekê de dîsa biceribîne!
+      too_many: Zedetirî 4 pelan nayê tevlêkirin
   migrations:
-    acct: گوێزرایەوە بۆ
-    cancel: پاشگەزبوونەوە لە دووبارە ئاڕاستەکردنەوە
-    cancel_explanation: هەڵوەشاندنەوەی دووبارە ئاڕاستەکردنەوە هەژمارەی ئێستات چالاک دەکات، بەڵام ئەو شوێنکەوتوانی ناهێنە وه کە گواستراوەتەوە بۆ ئەو هەژمارە.
-    cancelled_msg: سەرکەوتووانە دووبارە ئاڕاستەکردنەوەکەی بەتاڵ کردەوە.
+    acct: Hate lîvandin bo
+    cancel: Beralîkirinê red bike
+    cancel_explanation: Dev berdan ji beralîkirinê dê ajimêra te ya heyî ji nû ve çalak bike, lê şopgerên ku li wê ajimêrê hatine livandin venagerêne.
+    cancelled_msg: Beralîkirin bi serkeftî hate betal kirin.
     errors:
-      already_moved: هەمان ئەژمێرە کە تۆ پێشتر گواستووتە بۆ
-      missing_also_known_as: نازناوێکی ئەم هەژمارە نییە
-      move_to_self: ناتوانێت هەژمارەی ئێستا بێت
-      not_found: نادۆزرێتەوە
-      on_cooldown: تۆ دەبێت چاوەڕوان بیت
-    followers_count: شوێنکەوتوانی کاتی لە حاڵی گواستنەوە
-    incoming_migrations: گواستنەوە لە هەژمارەی جیاواز
-    incoming_migrations_html: بۆ گواستنەوە لە هەژمارەیەکی ترەوە بۆ ئەم هەژمارە، سەرەتا پێویستە <href="%{path}"> ئەژمێرێک دروست </a> بکەی.
-    moved_msg: هەژمارەکەت ئێستا دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct} و شوێنکەوتوانی تۆ گواستراوەتەوە بۆ ئەوێ.
-    not_redirecting: هەژمارەکەت لە ئێستادا دووبارە ئاڕاستە ناکرێتەوە بۆ هیچ هەژمارەیەکی دیکە.
-    on_cooldown: تۆ بەم دواییە هەژمارەکەت کۆچ کردووە. ئەم کارە لە رۆژەکانی %{count} دا جارێکی تر بەردەست دەبێت.
-    past_migrations: گەواستنەوەکانی ڕابردوو
-    proceed_with_move: شوێنکەوتوان بگوازەوە
-    redirected_msg: ئەژمێرەکەت ئێستا دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct}.
-    redirecting_to: ئەژمێرەکەت دووبارە ئاڕاستە دەکرێتەوە بۆ %{acct}.
-    set_redirect: دووبارە ئاڕاستەکردن ڕێک بخە
+      already_moved: heman ajimêr e ku te berê lê bar kiriye ye
+      missing_also_known_as: ne nasnavê vê ajimêrê ye
+      move_to_self: nikare bibe ajimêra heyî
+      not_found: nehate dîtin
+      on_cooldown: Tu li ser sarbûnê yî
+    followers_count: Di dema tevgerê de şopîner
+    incoming_migrations: Livandin ji ajimêreke din
+    incoming_migrations_html: Ji bo ku tu ji ajimêrek din bar bikî vê yekê, pêşî divê tu <a href="%{path}">ajimêreke bi bernaveke çê bike </a>.
+    moved_msg: Ajimêrate niha li %{acct} tê rêve kirin (beralîkirin) û şopînerên te têne livandin bo wê.
+    not_redirecting: Ajimêra te niha bo ajimêreke din nayê beralîkirin.
+    on_cooldown: Te herî dawî dev ji ajimêra xwe berda. Ev fonksiyon dê di %{count} rojan de dîsa peyda bibe.
+    past_migrations: Koçên berê
+    proceed_with_move: Şopîneran bilivîne
+    redirected_msg: Ajimêra te niha bo %{acct} tê beralîkirin.
+    redirecting_to: Ajimêra te niha bo %{acct} tê beralîkirin.
+    set_redirect: Beralîkirin saz bike
     warning:
-      backreference_required: پێویستە سەرەتا هەژمارە نوێیەکە بۆ گەڕانەوەی سەرچاوەی ئەم هەژمارە رێکوپێک بکرێت
-      before: 'پێش بەردەوام بوون، تکایە ئەم تێبینیانە بە وردی بخوێننەوە:'
-      cooldown: دوای گواستنەوە ماوەیەکی چاوەڕوان دەبێ کە لە ماوەی ئەو دا نابێت جارێکی تر بگوازیتەوە
-      disabled_account: هەژمارەی ئێستات دوای ئەوە بە تەواوی بەکارناهیێت. هەرچۆنێک بێت، تۆ دەستگەیشتنت دەبێت بۆ ناردنەدەرەوەی داتا و هەروەها دووبارە کاراکردنەوە.
-      followers: ئەم کردارە هەموو شوێنکەوتوانی هەژمارەی ئێستا دەگوازێتەوە بۆ هەژمارەی نوێ
-      only_redirect_html: ئێوە دەتانن هەژمارەکەی خۆتان <a href="%{path}">بیخەنە سەر هەژمارەیەکی دیکە</a>.
-      other_data: هیچ داتایەکی تر بە خۆکارانە ناگوێزرێتەوە
-      redirect: پرۆفایلی هەژمارەی ئێستات بە ئاگادارییەکی ئاراستەکەراوە نوێ دەکرێتەوە و دووردەکەویت لە گەڕانەکان
+      backreference_required: Pêdivî ye ku ajimêra nû wekî referanseke paşîn a vê ajimêrê were sazkirin
+      before: 'Berî ku tu berdewam bikî, ji kerema xwe re van nîşaneyan bi baldarî bixwîne:'
+      cooldown: Piştî livandin demek heye ku di wê navberê de tu yê nikaribe dîsa bilive
+      disabled_account: Ajimêra te ya heyî dê paşê bi tevahî neyê bikaranîn. Lê belê, tu dikarî bigihîje derxistinê daneyan û hem jî ji nû ve çalakkirinê.
+      followers: Ev çalakî dê hemî şopînerên ji ajimêra heyî bar bike ajimêra nû
+      only_redirect_html: Wekî din, tu dikarî <a href="%{path}"> tenê beralîkirinekê li ser profîla xwe bicîh bike </a>.
+      other_data: Daneyên din dê bi xweberî neyên livandin
+      redirect: Profîla ajimêra te ya heyî dê bi nîşeyeke beralîkirinê were nûve kirin û ji lêgerînan were bi dûrxistin
   moderation:
-    title: بەڕێوەبردن
+    title: Çavdêrî
   move_handler:
-    carry_blocks_over_text: ئەم بەکارهێنەرە گواسترایەوە بۆ %{acct}، تۆ بلۆکت کردووە.
-    carry_mutes_over_text: ئەم بەکارهێنەرە گواسترایەوە بۆ %{acct}، تۆ بێدەنگت کردووە.
-    copy_account_note_text: 'ئەم بەکارهێنەرە لە %{acct} ەوە گواستیەوە، تێبینیەکانی پێشووت دەربارەیان بوون:'
+    carry_blocks_over_text: Ev bikarhêner ji %{acct}, ku te astengkirî bû, bar kir.
+    carry_mutes_over_text: Ev bikarhêner ji %{acct}, ku te bê deng kirbû, bar kir.
+    copy_account_note_text: 'Ev bikarhêner ji %{acct} livî ye, li vir nîşeyên te yên berê ku te di derbarê wî/ê de nivîsandiye:'
+  navigation:
+    toggle_menu: Menuyê biguherîne
   notification_mailer:
-    digest:
-      action: پیشاندانی هەموو ئاگانامەکان
-      body: ئەمە کورتەی ئەو نامانەی لە دەستت دا لە دوا سەردانیت لە %{since}
-      mention: "%{name} ئاماژەی بە تۆ کرد لە:"
-      new_followers_summary:
-        one: لەکاتێک کە نەبوو ،شوێنکەوتوویێکی نوێت پەیداکرد،ئافەرم!
-        other: کاتیک کە نەبووی %{count} شوێنکەوتوویێکی نوێت پەیدا کرد! چ باشە!
-      subject:
-        one: "ئاگاداریێکی نووی لە دوایین سەردانی ئێوە\U0001F418"
-        other: "%{count} ئاگاداریێکی نوێ لە دوایین سەردانی ئێوە\U0001F418"
-      title: لە غیابی تۆدا...
+    admin:
+      report:
+        subject: "%{name} ragihandinek şand"
+      sign_up:
+        subject: "%{name} tomar bû"
     favourite:
-      body: 'دۆخت پەسەندکراوە لەلایەن %{name}:'
-      subject: "%{name} دۆخی تۆی پەسەند کرد"
-      title: دڵخوازکردنی نوێ
+      body: 'Şandiya te hate bijartin ji alî %{name} ve:'
+      subject: "%{name} şandiya te hez kir"
+      title: Bijarteyek nû
     follow:
-      body: "%{name} ئێستا شوێنکەوتوو ئێوەیە!"
-      subject: "%{name} ئێستا شوێنکەوتوو ئێوەیە"
-      title: شوێنکەوتوانی نوێ
+      body: "%{name} niha te dişopîne!"
+      subject: "%{name} niha te dişopîne"
+      title: Şopînera nû
     follow_request:
-      action: بەڕێوەبردنی داوای شوێنکەوتن
-      body: "%{name} داوای کردووە کە شوێنت بکەوێت"
-      subject: 'چاوەڕوانی شوێنکەوتووە: %{name}'
-      title: داواکاری شوینکەوتنی نوێ
+      action: Daxwazên şopandinê bi rê ve bibe
+      body: "%{name} daxwaza şopandina te kir"
+      subject: Şopîner li bendê ye:%{name}
+      title: Daxwazeke şopandinê ya nû
     mention:
-      action: وەڵام
-      body: "%{name} لێرە ناوی ئێووەی بردووە:"
-      subject: "%{name} لێرە ناوی ئێووەی بردووە"
-      title: ناوبراوەی نوێ
+      action: Bersivê bide
+      body: 'Tu hatiyî qalkirin ji aliyê %{name}:'
+      subject: Tu hatiye qalkirin ji aliyê %{name}
+      title: Qalkirina nû
+    poll:
+      subject: Rapirsî ji hêla %{name} ve qediya
     reblog:
-      body: "%{name} نووسیسراوەکەی ئێوەی توتاندەوە:"
-      subject: "%{name} نووسراوەکەتی دووبارە توتاند"
-      title: توتاندنەوەی نوێ
+      body: 'Şandiye te hate bilindkirin ji hêla %{name} ve:'
+      subject: "%{name} şandiya te bilind kir"
+      title: Bilindkirinên nû
+    status:
+      subject: "%{name} niha şand"
+    update:
+      subject: "%{name} şandiyek guhert"
   notifications:
-    email_events: رووداوەکان بۆ ئاگاداری ئیمەیلی
-    email_events_hint: 'ئەو ڕووداوانە دیاریبکە کە دەتەوێت ئاگانامەکان وەربگری بۆ:'
-    other_settings: ڕێکبەندەکانی ئاگانامەکانی تر
+    email_events: Bûyer bo agahdariyên e-nameyê
+    email_events_hint: 'Bûyera ku tu dixwazî agahdariyan jê wergerî hilbijêre:'
+    other_settings: Sazkariya agahdariyên din
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: Hezar
+          trillion: Trîlyon
   otp_authentication:
-    code_hint: کۆدێک داخڵ بکە کە دروست کراوە لەلایەن ئەپی ڕەسەنایەتیەوە بۆ دڵنیابوون
-    description_html: ئەگەر تۆ <strong> هاتنەژوورەوەی دوو قۆناغی</strong> بە یارمەتی ئەپێکی پەسەندکردن چالاک بکەن، پێویستە بۆ چوونەژوورەوە ، بە تەلەفۆنەکەتان کە کۆدیکتان بۆ دروستدەکات دەستپێگەیشتنتان هەبێت.
-    enable: چالاککردن
-    instructions_html: "<strong> QR بدۆزەوە بۆ ناو ڕەسەنایەتی گووگڵ یان کاربەرنامەی TOTP هاوشێوە لەسەر تەلەفۆنەکەت </strong>. لە ئێستاوە، ئەو کاربەرنامەیە نیشانە دروست دەکات کە دەبێت داخڵیان بکەیت لەکاتی چوونە ژوورەوە."
-    manual_instructions: 'ئەگەر ناتوانیت کۆدی QR سکان بکەیت و پێویستە بە دەستی تێبنووسە، ئەمە نهێنیی دەقی سادەیە:'
-    setup: ئامادەکردن
-    wrong_code: کۆدی داخڵکراو نادروستە! ئایا کاتی ڕاژە و کاتی ئامێر راستن?
+    code_hint: Ji bo pejirandinê têkeve koda te ya ku ji alîyê sepana piştraskirinê va hatiye çê kirin
+    description_html: Ku tu<strong>bi piştrastkirina du-gavî re</strong> sepana piştrastkirinê çalak bikî, ji bo têketinê pêdivî heye ku telefona te li ba te be, ji bona têketinê te ra nîşaneyan çê bike.
+    enable: Çalak bike
+    instructions_html: "<strong>Vê kodê QR kontrol bike bi riya Google Authenticator an jî sepanekeTOTP li ser têlefona xwe </strong>. Ji niha û pê ve, ew sepan dê nîşanên ku divê tu binivîsîne dema têketinê de biafirîne."
+    manual_instructions: 'Ku tu nikarî bî koda QR venêrî û pêwîst be bi dest bikevî, ev nivîsê hêsan ê veşartî:'
+    setup: Saz bike
+    wrong_code: Koda têketinê betal e! Dema rajekarê û dema amûrê raste?
   pagination:
-    newer: نوێتر
-    next: داهاتوو
-    older: کۆنتر
-    prev: پێشوو
+    newer: Nûtir
+    next: Pêş
+    older: Kevntir
+    prev: Paş
+    truncate: "&hellip;"
   polls:
     errors:
-      already_voted: تۆ پێشتر دەنگت داوە لەسەر ئەم ڕاپرسییە
-      duplicate_options: خاوەنی ئایەمی دووبارە
-      duration_too_long: لە داهاتوو زۆر دوورە
-      duration_too_short: لە داهاتوو زۆر نزیکە
-      expired: ڕاپرسیەکە پێشتر کۆتایی هاتووە
-      invalid_choice: بژاردەی دەنگدانی هەڵبژێردراو بوونی نییە
-      over_character_limit: ناتوانێت هەر کامێکی درێژتر بێت لە %{max} نووسە
-      too_few_options: پێویستە زیاتر لە یەک بڕگەی هەبێت
-      too_many_options: ناتوانێت زیاتر لە %{max} بەندی تێدا بێت
+      already_voted: Te berê deng dabû vê rapirsîyê
+      duplicate_options: tiştên dubare tê de hene
+      duration_too_long: di pêşerojê de pir dûr e
+      duration_too_short: gelek zû ye
+      expired: Jixwe rapirsî dawî bû
+      invalid_choice: Vebijarka dengdanê ya bijartî tune
+      over_character_limit: her yek ji %{max} karakterê dirêjtirîn nabe
+      too_few_options: divê ji yekî zêdetir tişt hebin
+      too_many_options: nikare ji %{max} hêmanan bêtir pêk be
   preferences:
-    other: هی تر
-    posting_defaults: بڵاوکردنی بنەڕەتەکان
-    public_timelines: هێڵی کاتی گشتی
+    other: Yên din
+    posting_defaults: Berdestên şandiyê
+    public_timelines: Demnameya gelemperî
+  privacy_policy:
+    title: Politîka taybetiyê
   reactions:
     errors:
-      limit_reached: سنووری کاردانه وه ی جیاواز گه یشت
-      unrecognized_emoji: ئیمۆجییەکی ناسراو نییە
+      limit_reached: Sînorê reaksiyonên cihêrengî gihîşte asta dawî
+      unrecognized_emoji: emojîyeke ne naskirî ye
   relationships:
-    activity: چالاکی هەژمارە
-    dormant: ناچالاک
-    follow_selected_followers: شوێنکەوتوان دیاریکراو بکە
-    followers: شوێنکەوتوان
-    following: شوێن‌کەوتووی
-    invited: بانگهێشتەکان
-    last_active: دوایین چالاکی
-    most_recent: تازەترین
-    moved: گوێزرایەوە
-    mutual: دوولایەنە
-    primary: سەرەتایی
-    relationship: پەیوەندی
-    remove_selected_domains: لابردنی هەموو شوێنکەوتوانی دۆمەینە دیاریکراوەکان
-    remove_selected_followers: شوێنکەوتوانی دیاریکراو لابدە
-    remove_selected_follows: کۆتایی بە بەدوادانەچوی بەکارهێنەرە دیاریکراوەکان بدە
-    status: دۆخی هەژمارە
+    activity: Çalakiya ajimêrê
+    dormant: Xewok
+    follow_selected_followers: Şopînerên hilbijartî bişopîne
+    followers: Şopîner
+    following: Dişopîne
+    invited: Vexwendî
+    last_active: Çalakiya dawî
+    most_recent: Herî dawî
+    moved: Barkirî
+    mutual: Hevpar
+    primary: Sereke
+    relationship: Pêwendî
+    remove_selected_domains: Hemû şopînerên ji navpera hilbijartî rake
+    remove_selected_followers: Şopînerên hilbijartî rake
+    remove_selected_follows: Bikarhênerên hilbijartî neşopîne
+    status: Rewşa ajimêr
   remote_follow:
-    acct: ناونیشانی هەژمارەی username@domainخۆت لێرە بنووسە
-    missing_resource: نەیتوانی URLی ئاراستەکردنەوەی پێویست بدۆزێتەوە بۆ ئەژمێرەکەت
-    no_account_html: هێشتا نەبووی بە ئەندام؟ <a href='%{sign_up_path}' target='_blank'>لێرە دەتوانی هەژمارەیەک دروست بکەی</a>
-    proceed: بەردەوام بە بۆ بەدواداچوون
-    prompt: 'تۆ بەدوای دا دەچیت:'
-    reason_html: "<strong> بۆچی ئەم هەنگاوە پێویستە؟ </strong> <code>%{instance}</code> لەوانەیە ئەو ڕاژەیە نەبێت کە تۆ تۆمارت کردووە، بۆیە پێویستە سەرەتا دووبارە ئاڕاستەت بکەین بۆ ڕاژەکاری ماڵەوەت."
-  remote_interaction:
-    favourite:
-      proceed: بۆ دڵخوازکردنی ئەم توتە
-      prompt: 'دەتەوێت ئەم تووتە تپەسەند بکەیت؛:'
-    reblog:
-      proceed: بەردەوام بە بۆ دووبارە توتاندن
-      prompt: 'دەتەوێت ئەم تووتە دووبارە بکەیتەوە:'
-    reply:
-      proceed: بۆ وەڵامدانەوە
-      prompt: 'دەتەوێت ئەم تووتە وڵام بدەیتەوە:'
+    missing_resource: Ji bo ajimêrê te girêdana beralîkirî ya pêwîst nehate dîtin
+  reports:
+    errors:
+      invalid_rules: rêbazên derbasdar nîşan nadê
+  rss:
+    content_warning: 'Hişyariya naverokê:'
+    descriptions:
+      account: Şandiyên gelemperî ji @%{acct}
+      tag: 'Şandiyên gelemperî yên nîşankirî #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: ئێوە لە سنووری ڕیپێدراوی %{limit} توتی ئەو رۆژە،خۆرتر ڕۆیشتوویت
-    over_total_limit: تۆ سنووری خشتەکراوی %{limit} ت بەزاندووە
-    too_soon: پێویستە بەرواری خشتەکراو لە داهاتوودا بێت
+    over_daily_limit: Te sînorê %{limit} şandiyên demsazkirî yên ji bo îro derbas kir
+    over_total_limit: Te sînorê %{limit} şandiyên demsazkirî derbas kir
+    too_soon: Dîroka bernamesazkirinê divê dîrokeke ji îro pêşvetir be
   sessions:
-    activity: دوایین چالاکی
-    browser: وێبگەڕ
+    activity: Çalakiya dawî
+    browser: Gerok
     browsers:
-      blackberry: بلاکبێری
-      chrome: کرۆم
-      edge: مایکرۆسۆفت ئیچ
-      electron: ئەلکترۆن
-      firefox: فایەرفۆکس
-      generic: وێبگەڕی نەناسراو
-      ie: ئینتێرنێت ئێکسپلۆرەر
-      micro_messenger: مایکرۆمێسنجەر
-      nokia: وێبگەڕی نۆکیا ئێس ٤٠ ئۆڤی
-      opera: ئۆپێرا
-      otter: ئۆتەر
-      phantom_js: فانتۆم جەی ئێس
-      qq: وێبگەڕی QQ
-      safari: سافری
-      uc_browser: وێبگەڕی UC
-    current_session: دانیشتنی ئێستا
-    description: "%{browser} لەسەر %{platform}"
-    explanation: ئەمانە وێبگەڕەکەن کە ئێستا چووەتە ژوورەوە بۆ ئەژمێری ماستۆدۆنی خۆت.
-    ip: ئای‌پی
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Gerokeke nenas
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: Geroka QQ
+      safari: Safari
+      uc_browser: Geroka UC
+      weibo: Weibo
+    current_session: Danişîna heyî
+    description: "%{platform} ser %{browser}"
+    explanation: Gerokên tevnê di dema heyî de hene ku têketin kirine di ajimêra te ya Mastodon.
+    ip: IP
     platforms:
-      android: ئەندرۆید
-      blackberry: بلاکبێری
-      chrome_os: سیستەمی کارگێڕی کرۆم
-      firefox_os: سیستەمی کارگێڕی فایەرفۆکس
-      linux: لینۆکس
-      mac: ماک
-      other: سیستەمیکارگێڕی نەناسراو
-      windows: ویندۆز
-      windows_mobile: ویندۆزموبایل
-      windows_phone: ویندۆزفۆن
-    revoke: بەتاڵکردن
-    revoke_success: دانیشتن بەسەرکەوتوویی بەتاڵکرا
-    title: کۆبوونەوەکان
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: platforma nenas
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Rake
+    revoke_success: Danişîn bi serkeftî hate rakirin
+    title: Danîştin
+    view_authentication_history: Dîroka rastekirina ajimêra xwe bibîne
   settings:
-    account: هەژمارە
-    account_settings: ڕێکخستنەکانی هەژمارە
-    aliases: نازناوەی هەژمارە
-    appearance: ڕووخسار
-    authorized_apps: ئەپەکانی ڕێگەپێدراو
-    back: گەڕانەوە بۆ ماستۆدۆن
-    delete: سڕینەوەی هەژمارە
-    development: گەشەپێدان
-    edit_profile: دەستکاری پرۆفایل
-    export: ناردن زانیاری
-    featured_tags: هاشتاگی تایبەت
-    identity_proofs: سەلماندنی ناسنامە
-    import: هاوردن
-    import_and_export: هاوردەکردن و ناردن
-    migrate: گواستنەوەی هەژمارە
-    notifications: ئاگادارییەکان
-    preferences: پەسەندەکان
-    profile: پرۆفایل
-    relationships: شوێنکەوتوو و شوێنکەوتوان
-    two_factor_authentication: کۆدی دووقۆناغی هاتنەژوور
-    webauthn_authentication: کلیلەکانی پاراستن
+    account: Ajimêr
+    account_settings: Sazkariyên ajimêr
+    aliases: Nûçikên ajimêra
+    appearance: Xuyang
+    authorized_apps: Rayedarê sepanan
+    back: Vegere bo Mastodon
+    delete: Jêbirina ajimêr
+    development: Pêşdebir
+    edit_profile: Profîlê serrast bike
+    export: Derxistinê daneyan
+    featured_tags: Hashtagên bijarte
+    import: Têxistin
+    import_and_export: Têxistin û derxistin
+    migrate: Barkirina ajimêrê
+    notifications: Agahdarî
+    preferences: Hilbijarte
+    profile: Profîl
+    relationships: Şopandin û şopîner
+    statuses_cleanup: Bi xweberî ve jêbirina şandiya
+    strikes: Binpêkirinên çavdêriyê
+    two_factor_authentication: Piştrastkirinê du-faktorî
+    webauthn_authentication: Kilîdên ewlehiyê
   statuses:
     attached:
       audio:
-        one: "%{count} دەنگ"
-        other: "%{count} دەنگ"
-      description: 'هاوپێچ: %{attached}'
+        one: "%{count} deng"
+        other: "%{count} deng"
+      description: 'Pêvek: %{attached}'
       image:
-        one: "%{count} وێنە"
-        other: "%{count} وێنەکان"
+        one: "%{count} wêne"
+        other: "%{count} wêne"
       video:
-        one: "%{count} ڤیدیۆ"
-        other: "%{count} ڤیدیۆکان"
-    boosted_from_html: توکراوەتەوە لەلایەن %{acct_link}
-    content_warning: 'ئاگاداری ناوەڕۆک: %{warning}'
+        one: "%{count} vîdyo"
+        other: "%{count} vîdyo"
+    boosted_from_html: Bilindkirî ji alî %{acct_link} ve
+    content_warning: 'Hişyariya naverokê: %{warning}'
+    default_language: Wekî zimanê navrûya bikarhêneriyê
     disallowed_hashtags:
-      one: 'هاشتاگی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
-      other: 'هاشتاگەکانی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
+      one: 'hashtagek bê maf tê de hebû: %{tags}'
+      other: 'hashtagek bê maf tê de hebû: %{tags}'
+    edited_at_html: Di %{date} de hate serrastkirin
     errors:
-      in_reply_not_found: ئەو دۆخەی کە تۆ هەوڵی وەڵامدانەوەی دەدەیت وادەرناکەوێت کە هەبێت.
-    language_detection: بە شێوەیەکی خۆکارانە زمان بدۆزیەوە
-    open_in_web: کردنەوە لە وێب
-    over_character_limit: سنووری نووسەی %{max} تێپەڕێنرا
+      in_reply_not_found: Ew şandiya ku tu dikî nakî bersivê bide xuya nake an jî hatiye jêbirin.
+    open_in_web: Di tevnê de veke
+    over_character_limit: sînorê karakterê %{max} derbas kir
     pin_errors:
-      limit: تۆ پێشتر زۆرترین ژمارەی توتتی چەسپیوەت هەیە
-      ownership: نووسراوەکانی تر ناتوانرێ بسەلمێت
-      private: توتی ناگشتی ناتوانرێت بچەسپێ
-      reblog: بەهێزکردن ناتوانرێت بچەسپێ
+      direct: Şandiyên ku tenê ji bikarhênerên qalkirî re têne xuyangkirin, nayê derzîkirin
+      limit: Jixwe te mezintirîn hejmara şandîyên xwe derzî kir
+      ownership: Şandiya kesekî din nay derzî kirin
+      reblog: Ev şandî nayê derzî kirin
     poll:
       total_people:
-        one: "%{count} کەس"
-        other: "%{count} خەڵک"
+        one: "%{count} kes"
+        other: "%{count} kes"
       total_votes:
-        one: "%{count} دەنگ"
-        other: "%{count} دەنگەکان"
-      vote: دەنگ
-    show_more: زیاتر پیشان بدە
-    show_newer: نوێتر پیشان بدە
-    show_older: پیشاندانی کۆنتر
-    show_thread: نیشاندانی ڕشتە
-    sign_in_to_participate: بچۆ ژوورەوە بۆ بەشداریکردن لە گفتوگۆکەدا
+        one: "%{count} deng"
+        other: "%{count} deng"
+      vote: Deng bide
+    show_more: Bêtir nîşan bide
+    show_newer: Nûtirîn nîşan bide
+    show_older: Kevntirîn nîşan bide
+    show_thread: Mijarê nîşan bide
+    sign_in_to_participate: Ji bo tevlî sohbetê bibî xwe tomar bike
+    title: "%{name}%{quote}"
     visibilities:
-      private: شوێنکەوتوانی تەنها
-      private_long: تەنها بۆ شوێنکەوتوانی پیشان بدە
-      public: گشتی
-      public_long: هەموو کەس دەتوانێت ببینێت
-      unlisted: پێرست نەبووە
-      unlisted_long: هەموو کەس دەتوانێت بیبینێت، بەڵام لە هێڵی کاتی گشتی دا نەریزراوە
+      direct: Rasterast
+      private: Tenê şopîneran
+      private_long: Tenê bo şopîneran nîşan bide
+      public: Gelemperî
+      public_long: Herkes dikare bibîne
+      unlisted: Nerêzokkirî
+      unlisted_long: Herkes dikare bibîne, lê di demnameya gelemperî de nayê rêz kirin
+  statuses_cleanup:
+    enabled: Şandiyên berê bi xweberî va jê bibe
+    enabled_hint: Gava ku ew gihîştibe sînorê temenê diyarkirî, şandiyên te bi xweberî jê dibe, ji bilî van awareteyên jêrîn
+    exceptions: Awarte
+    explanation: Ji ber ku jêbirina şandiyan pêvajoyeke biha ye, ev hêdî hêdî bi demê re tê kirin dema ku rajekar wekî din mijûl nebe. Ji ber vê sedemê, dibe ku şandiyên te demek şûnda ku bigihîjin sînorê temenê wê werin jêbirin.
+    ignore_favs: Ecibandinan paşguh bike
+    ignore_reblogs: Bilindkirinan piştguh bike
+    interaction_exceptions: Awarteyên li ser bingehên têkiliyan
+    interaction_exceptions_explanation: Bizanibe ku şandiyeke ku ji binî ve têkeve jêrî bijarte yan bilindkirinê piştî ku carek din di ser wan re derbas bibe, garantiyek tune ku werin jêbirin.
+    keep_direct: Peyamên rasterast veşêre
+    keep_direct_hint: Tu peyamên te yekcar jê naçe
+    keep_media: Peyamên bi pêvekên medyayê ve ne biveşêre
+    keep_media_hint: Yek ji peyamên te yê ku bi pêvekên medyayê ve ne jê nabe
+    keep_pinned: Peyamên xwe yên ku hatine derzîkirî veşêre
+    keep_pinned_hint: Yek ji peyamên te yê derzîkirî jê nabe
+    keep_polls: Rapirsîyan veşêre
+    keep_polls_hint: Yek ji rapirsiyên te jê nabe
+    keep_self_bookmark: Şandiyên ku wek şûnpel hatine tevlêkirin veşêre
+    keep_self_bookmark_hint: Şandî ku te wek şûnpel tomar kiriye wê neyê jêbirin
+    keep_self_fav: Şandiyên ku te eciband veşêre
+    keep_self_fav_hint: Ger te şandiyên xwe ecibandibe jê nabe
+    min_age:
+      '1209600': 2 hefte
+      '15778476': 6 meh
+      '2629746': 1 meh
+      '31556952': 1 sal
+      '5259492': 2 meh
+      '604800': 1 hefte
+      '63113904': 2 sal
+      '7889238': 3 meh
+    min_age_label: Şêmûga demê
+    min_favs: Peyamên ku ji wê zêdetir hatine ecibandin veşêre
+    min_favs_hint: Şandî ku ji evqas hezkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe
+    min_reblogs: Şandiyên ku bêtir hatine bilindkirin veşêre
+    min_reblogs_hint: Şandî ku ji ji vê hejmarê bêtir bilindkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe
   stream_entries:
-    pinned: توتی چەسپکراو
-    reblogged: بەهێزکردن
-    sensitive_content: ناوەڕۆکی هەستیار
+    pinned: Şandiya derzîkirî
+    reblogged: bilindkirî
+    sensitive_content: Naveroka hestiyarî
+  strikes:
+    errors:
+      too_late: Pir dereng e ji bo îtîrazê li ser vê binpêkirinê
   tags:
-    does_not_match_previous_name: لەگەڵ ناوی پێشوو یەک ناگرێتەوە
-  terms:
-    body_html: |
-      <h2>سیاسەتی تایبەت</h2>
-      <h3 id="collect">چ زانیاریێک کۆ دەکەینەوە؟</h3>
-      <ul>
-      <li><em>زانیاری ئەژمێری بنەڕەتی</em>: ئەگەر تۆ لەسەر ئەم ڕاژەی تۆماربکەیت، لەوانەیە داوات لێبکرێت ناوی بەکارهێنەر، ناونیشانی ئیمەیڵ و نهێنوشە تێبنووسیت. هەروەها دەتوانیت زانیاری پرۆفایلی زیاتر تێبنووسی ت وەک ناوی پیشاندان و ژیاننامە، و بارکردنی وێنەی پرۆفایل و وێنەی سەرپەڕە. ناوی بەکارهێنەر، ناوی پیشاندان، ژیاننامە، وێنەی پرۆفایل و وێنەی سەرپەڕە هەمیشە بە ئاشکرا لیست کراوە.</li>
-      <li><em> پۆستەکان، بەدواکەوتن و زانیاری گشتی </em>: لیستی ئەو کەسانەی کە پەیڕەوی دەکەیت بە ئاشکرا لیست کراوە، هەمان شت بۆ شوێنکەوتەکانت ڕاستە. کاتێک ئیمەیڵێکت پێشکەش کرد، بەروار و کات خەزن کراوە و هەروەها ئەو بەرنامەیەی کە نامەکەت لەوە پێشکەش کردووە. نامەکان لەوانەیە هاوپێچی میدیای تێدابێت، وەک وێنە و ڤیدیۆ. گشتی و لیستە نەکراوەکان بابەتەکان بە ئاشکرا بەردەستن. کاتێک بابەتێک پێشکەش دەکەیت لەسەر پرۆفایلەکەت، کە هەروەها زانیاری بەردەستی گشتیە. بابەتەکانت دەگەیەنینە شوێنکەوتەکانت، لە هەندێک حاڵەتدا مانای وایە دەگەیەنینە ڕاژەکاری جیاواز و کۆپیەکان لەوێ هەڵگیراون. کاتێک بابەتەکان دەسڕیتەوە، ئەمە بە هەمان شێوەیە دەگەیەنیتە شوێنکەوتوانی خۆت. کاری سەرلێبڕین یان بە دڵنییاکردنی پۆستی تر هەمیشە گشتیە.</li>
-      <li><em> ڕاستەوخۆ و تەنها شوێنکەوتوانی بابەتەکان</em>: هەموو بابەتەکان خەزن کراون و لە ڕاژەکارەکە دا پرۆسەکراون. پۆست تەنها شوێنکەوتوانی خۆت دەگەیەنینە شوێنکەوتوانی خۆت و بەکارهێنەران کە تێیدا باس دەکرێت، و پۆستی ڕاستەوخۆش تەنها دەگەیەنینە ئەو بەکارهێنەرانەی کە ئاماژەیان پێکراوە لە هەندێک حاڵەتدا واتە دەگەیەنینە ڕاژەی جیاوازەکان و کۆپیەکان لەوێ هەڵگیراون ئێمە هەوڵی باوەڕێکی باش دەکەین بۆ سنووردارکردنی گەیشتن بەو پۆستانە تەنها بۆ کەسانی ڕێگەپێدراو، بەڵام لەوانەیە ڕاژەکارەکانی تر سەرکەوتوو نەبوون. بۆیە گرنگە پێداچوونەوە بە سێرڤەرەکان بکەیت کە شوێنکەوتوانی تۆ هی ئەوەن. لەوانەیە بژاردەیەک بگۆڕیت بۆ پەسەندکردن و ڕەتکردنەوەی شوێنکەوتوانی نوێ بە دەستی لە ڕێکبەندەکان. <em> تکایە لە بیرت بێت کە کارپێکەرەکانی سێرڤەرەکە و هەر خزمەتکاری وەرگرێک لەوانەیە ئەم جۆرە نامانە </em>، و وەرگرەکان لەوانەیە گرتەی شاشە یان کۆپی بکەن یان بە پێچەوانەوە دووبارە بەشداری پێبکەن. <em> هیچ زانیاریەکی مەترسیدار لەسەر ماستۆدۆن بڵاو</em></li>
-      <li><em>ئای پی و مێتاداتای تر</em>: کاتێک دەچیتە ژوورەوە، ئێمە ئەو ئای پی ە تۆمار دەکەین کە تۆ لە ناوی ەوە داخڵ تدەکەیت، هەروەها ناوی بەرنامەی وێبگەڕەکەت. هەموو ئەو کۆکراوانەی لە کۆبوونەوەکاندا هەن بۆ پێداچوونەوە و بەتاڵکردنەوەت لە ڕێکبەندەکان. نوێترین ناونیشانی IP بەکارهێنراوە خەزن کراوە بۆ ١٢ مانگ. هەروەها لەوانەیە ئێمە مادە ڕاژەکارەکان بهێڵین کە ئای پی ئەدرێسی هەموو داواکارییەک بۆ ڕاژەکارەکانمان </li>
-      </ul>
-      < hr="spacer" />
-
-      <h3 id="use">ئێمە زانیاری ئێوەمان بۆ چییە؟</h3>
-
-      <p> ئەو زانیاریانەی لە ئێوە کۆی دەکەین لەوانەیە بەم ڕێگایانە بەکار بهێنرێت:</p>
-
-      <ul>
-      <li> بۆ دابینکردنی ئەرکە سەرەکیەکانی ماستۆدۆن. دەتوانیت تەنها کارلێک بکەیت لەگەڵ ناوەڕۆکی کەسانی تر و ناوەڕۆکی خۆت پۆست بکەیت کاتێک دەچیتە ژوورەوە. بۆ نموونە، لەوانەیە شوێن کەسانی تر بکەویت بۆ بینینی پۆستە تێکەڵەکانیان لە تایم لاینی ماڵەوەی تایبەتی خۆت.</li>
-      <li> بۆ چاودێری کردنی کۆمەڵگا، بۆ نموونە بەراوردکردنی ناونیشانی IPەکەت لەگەڵ کەسانی ناسراو بۆ دیاریکردنی خۆدزینەوە یان پێشێلکاریتر.</li>
-      <li> ئەو ئیمەیڵەی کە تۆ دەستەبەرت کردووە لەوانەیە بەکاربێت بۆ ناردنی زانیاری، ئاگاداری دەربارەی کەسانی تر کە کارلێک دەکەن لەگەڵ ناوەڕۆکەکەت یان ناردنی نامەکانت، و وەڵامدانەوەی پرسیارکردنەکان، و/یان داواکارییان یان پرسیارەکانی تر.</li>
-      </ul>
-      < hr="spacer" />
-
-      <h3 id="بپارێزە"> چۆن زانیاریەکەت دەپارێزین؟</h3>
-
-      <p> ئێمە چەندین پێوانەی ئەمنی جۆراوجۆر جێبەجێ دەکەین بۆ پاراستنی سەلامەتی زانیاری ە تایبەتیەکانت کاتێک تۆ داخڵت کردووە یان پێشکەشکردن یان چوونە ژوورەوە بۆ زانیاری تایبەتی. لە نێوان شتەکانی تردا، دانیشتنی وێبگەڕەکەت، هەروەها ترافیکی نێوان کاربەرنامەکانت و API، بە SSL پارێزراوە، و نهێنوشەکەت بە بەکارهێنانی ئەلگاریتمی یەک-ڕێگەی بەهێز بە هاوسێکراوە. دەتوانیت سەلماندنی دوو-فاکتەر بەتوانا بکەیت بۆ زیاتر پاراستنی چوونە ژوورەوە بۆ ئەژمێرەکەت.</p>
-
-      < hr="spacer" />
-      < hr="spacer" />
-
-      <h3 id="داتا-هێشتنەوە"> بیمەنامەی هێشتنەوە داتامان چییە؟</h3>
-
-      <p> ئێمە بە باشی هەوڵ بۆ باوەڕەکان </p>
-
-      <ul>
-      <li> سێرڤەری پاراستنی ناونووسەکان کە ناونیشانی ئای پی تێدایە بۆ هەموو داواکاریەکان بۆ ئەم سێرڤەرە، تا ئێستا وەک ئەو جۆرە لۆگانە پارێزراون، زیاتر لە 90 ڕۆژ.</li>
-      <li> ئای پیەکە بپارێزە کە پەیوەندی بە بەکارهێنەرە تۆمارکراوەکان هەیە زیاتر لە 12 مانگ.</li>
-      </ul>
-      <p> دەتوانیت داواکاری و داگرتنی ئەرشیفی ناوەڕۆکەکەت بکەیت، لەوانە بابەتەکانت، هاوپێچەکانی میدیا، وێنەی پرۆفایل، و وێنەی سەرپەڕە.</p>
-
-      <p> تۆ دەتوانیت بە شێوەیەکی نائاسایی ئەژمێرەکەت بسڕیتەوە لە هەر کاتێکدا.</p>
-
-      < hr="spacer"/>
-
-      <h3 id="کۆکیز"> ئایا ئێمە کۆکیز بەکار بێنە؟</h3>
-
-      <p> بەڵێ کۆکیزەکان فایلی بچووکن کە سایتێک یان دابینکەری خزمەتگوزاریەکەی دەیگوێزێتەوە بۆ هارد درایڤی کۆمپیوتەرەکەت لە ڕێگەی وێبگەڕەکەت (ئەگەر ڕێگەت پێ بدەیت). ئەم کۆکیزانە وێبسایتە بەتوانا دەکەن بۆ ناسینەوەی وێبگەڕەکەت و، ئەگەر ئەژمێرێکی تۆمارکراوت هەیە، بیبەستە بە ئەژمێری تۆمارکراو.</p>
-
-      <p> کۆکیز بەکاربێنە بۆ تێگەیشتن و هەڵگرتنی پەسەندیەکانی تۆ بۆ سەردانەکانی داهاتوو.</p>
-
-      < hr="spacer" />
-
-      <h3 ="ئاشکرا</h3> > ئایا هیچ زانیارییەک بۆ حزبەکانی دەرەوە ئاشکرا دەکەین؟
-
-      <p> ئێمە زانیاریە تایبەتەکانت نافرۆشین، بازرگانی دەکەین، یان ناگوازرێتەوە بۆ حزبەکانی دەرەوە. ئەمە لایەنی سێیەمی باوەڕپێکراو ی تێدا نییە کە یارمەتیمان دەدات لە کارپێکردنی سایتەکەمان، ئەنجامدانی کارەکانمان، یان خزمەتکردنی ئێوە، هەتا ئەو حزبانە ڕازی بن بە نهێنی هێشتنەوەی ئەم زانیاریانە. هەروەها لەوانەیە زانیاریەکەت بڵاوکەینەوه کاتێک پێمان وایە ئازادکردن گونجاوە بۆ پابەندبوون بە یاسا، سەپاندنی سیاسەتی ماڵپەڕەکەمان، یان پاراستنی مافەکانمان یان مافی تر، موڵک، یان سەلامەتی.</p>
-
-      <p> لەوانەیە ناوەڕۆکی گشتیت دابەزێنرابێت لەلایەن خزمەتگوزاریەکانی ترەوە لە تۆڕەکەدا. پۆستە گشتی و تەنها شوێنکەوتوانی تۆ دەگەیەنینە ئەو سێرڤەرانەی کە شوێنکەوتوانی تێیدا نواندووە، و پەیامی ڕاستەوخۆ دەگەیەنینە خزمەتکارەکانی وەرگرەکان، لە دووری ئەوەی کە شوێنکەوتوانی یان وەرگرەکان لە سێرڤەرێکی جیاواز لەم.</p>
-
-      <p> کاتێک تۆ مۆڵەت بە کاربەرنامەیەک بدەیت بۆ بەکارهێنانی ئەژمێرەکەت، بەگوێرەی مەودای مۆڵەتەکانت کە پەسەندت کردووە، لەوانەیە بچێتە ناو زانیاری پرۆفایلی گشتی، لیستی خوارەوەت، شوێنکەوتوانی تۆ، لیستەکانت، هەموو بابەتەکانت، و دڵراوەکانی تۆ. کاربەرنامەکان هەرگیز ناتوانن دەستگەیشتنیان هەبێت بە ناونیشانی ئیمەیڵ یان نهێنوشە.</p>
-      < hr="spacer" />
-
-      <h3 id="منداڵان"> بەکارهێنانی سایت لەلایەن منداڵانەوە</h3>
-
-      <p> ئەگەر ئەم سێرڤەرە لە یەکێتی ئەورووپا یان ئی ئی ئی ئەی بێت: ماڵپەڕ، بەرهەم و خزمەتگوزارییەکانی ئێمە هەموویان ئاراستەی ئەو کەسانە دەکرێت کە بە لایەنی کەمەوە 16 ساڵ ن. ئەگەر تەمەنت لە خوار 16 ساڵەوە بێت، لە سەر پێداویستی GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) ئەم سایتە بەکارمەهێنیت.</p>
-
-      <p> ئەگەر ئەم سێرڤەرە لە ئەمریکا بێت: ماڵپەڕ و بەرهەم و خزمەتگوزاریەکانمان هەمووی ئاراستەی ئەو کەسانە دەکرێت کە بە لایەنی کەمەوە 13 ساڵ ن. ئەگەر تۆ لە خوار تەمەنی 13 ساڵیەوەبیت، لە سەر داواکاریەکانی COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection act</a>) ئەم سایتە بەکارمەهێنیت.</p>
-
-      <p> یاسا دەتوانێت جیاواز بێت ئەگەر ئەم سێرڤەرە لە دەسەڵاتی دادوەری تر بێت.</p>
-
-      < hr="spacer" />
-
-      <h3 id="گۆڕانکاریەکان"> گۆڕانکاریەکان لە سیاسەتی تایبەتمەندیمان</h3>
-
-      <p> ئەگەر بڕیارمان دا سیاسەتی تایبەتمەندیمان بگۆڕین، ئەو گۆڕانکاریانە لەم پەڕەیە بڵاودەکەینەوە.</p>
-
-      <p> ئەم دۆکیومێنتە CC-BY-SA ە. دوایین جار نوێکرایەوە لە 7ی ئازاری 2018.</p>
-
-      <p> لە بنەڕەتدا لە < href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} مەرجەکانی خزمەتگوزاری و سیاسەتی تایبەتیێتی"
+    does_not_match_previous_name: bi navê berê re li hev nayê
   themes:
-    contrast: ماستۆدۆن (کۆنتراستی بەرز)
-    default: ماستۆدۆن (ڕەش)
-    mastodon-light: ماستۆدۆن (کاڵ)
+    contrast: Mastodon (Dijberiya bilind)
+    default: Mastodon (Tarî)
+    mastodon-light: Mastodon (Ronahî)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
-    add: زیادکردن
-    disable: لەکارخستنی 2FA
-    disabled_success: سەلماندنی سەلماندنی دوو-فاکتەر بە سەرکەوتوویی لەکارخراوە
-    edit: دەستکاری
-    enabled: سەلماندنی دوو-فاکتەر چالاک کراوە
-    enabled_success: سەلماندنی دوو-فاکتەر بە سەرکەوتوویی چالاک کرا
-    generate_recovery_codes: دروست کردنی کۆدی چاککردنەوە
-    lost_recovery_codes: کۆدی گەڕاندنەوە ڕێگەت پێ دەدات کە دەستگەیشتنت بۆ هەژمارەکەت بەدەست بهێنێ ئەگەر تەلەفۆنەکەت لەدەست بدەیت. ئەگەر کۆدەکانی چاکبوونەوەت لەدەست داوە، دەتوانیت لێرە دووبارە دروستیان کەی. کۆدی چاککردنەوەی کۆنت هەڵدەوەشێنێتەوە.
-    methods: دوو - میتۆدی فاکتەر
-    otp: ئەپی ڕاستەوە
-    recovery_codes: پاڵپشتکردن لە کۆدی هێنانەوەی
-    recovery_codes_regenerated: کۆدی گەڕاندنەوە بە سەرکەوتوویی دووبارە دروست بوویەوە
-    recovery_instructions_html: گەر تەلەفۆنەکەت بزر کرد دەتوانی بە یەکێک لە کۆدەکانی خوارەوە چاودێری هەژمارەکەت لە دەست بگریت.<strong>ائەم کۆدانە لە شوێنێکی پاراو هەڵبگرە</strong> بۆ نموونە چاپی بکەن یان لەگەڵ بەڵگەنامە گرینگەکانت دایبنێ.
-    webauthn: کلیلەکانی پاراستن
+    add: Tevlî bike
+    disable: 2FA neçalak bike
+    disabled_success: Rastandina du-gavî bi serfirazî hate sekinandin
+    edit: Serrast bike
+    enabled: Rastandina du-gavî bi serfirazî hate çalak kirin
+    enabled_success: Rastandina du-gavî bi serfirazî hate çalak kirin
+    generate_recovery_codes: Kodên xilaskirinê çêbike
+    lost_recovery_codes: Ku telefon winda bibe kodên xilaskirinê derfet dide ku tu bigihijî ajimêra xwe. Ku te kodên xwe yê xilaskirinê winda kiribe tu dikarî ji vê derê dîsa ava bikî. Kodên te yê xilaskirinê ên kevin wê nederbasdar bibe.
+    methods: Rêbazên du-gavî
+    otp: Sepana Authenticator
+    recovery_codes: Kilîtên rizgarbûna hilanînê
+    recovery_codes_regenerated: Kilîtên rizgarbûna bi serkeftî hate nûvkirin
+    recovery_instructions_html: Ku gava te têlefona xwe winda kir, tu dikarî yek ji kodên rizgarkirinê yên jêrîn bi kar bîne da ku tu bigihîjî ajimêra xwe. <strong>Kodên rizgarkirinê li cihekî ewle biparêze </strong>. Mînakî, tu dikarî wan çap bikî û wan bi peldandkên din ên girîng re tomar bike.
+    webauthn: Kilîdên ewlehiyê
   user_mailer:
+    appeal_approved:
+      action: Biçe ajimêra xwe
+      explanation: Îtîraza binpêkirinê ya li dijî ajimêrê te ya %{strike_date} ku te di %{appeal_date} de şandibû hate pejirandin. Ajimêrê te careke din di rewşek baş de ye.
+      subject: Îtîraza te ji %{date} hate pejirandin
+      title: Îtîraz hate pejirandin
+    appeal_rejected:
+      explanation: Îtîraza binpêkirinê ya li dijî ajimêrê te ya di %{strike_date} de ku te di %{appeal_date} de şandibû nehat pejirandin.
+      subject: Îtîraza te ji %{date} nehate pejirandin
+      title: Îtîraz nehate pejirandin
     backup_ready:
-      explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
-      subject: ئارشیڤی ئێوە ئامادەی داگرتنە
-      title: وەرگرتنی ئارشیڤ
-    sign_in_token:
-      details: 'وردەکاریی هەوڵەکان:'
-      explanation: 'هەوڵێک بۆ هاتنە نێو هەژمارەکەتان لە ناونیسانێکی ئای‌پی پەیداکرا. گەر خۆتانن. تێپەڕوشەی پاراستن بۆ پەڕەی بەرنگاری دابین بکە:'
-      further_actions: 'گەر ئێوە نیین تکایە تێپەڕوشە بگۆڕە وە لێرەوە پەسەند بوونی دوو قۆناغی لە سەر هەژمارەکەتان چالاک بکەن:'
-      subject: تکایە دڵنیابە لە هەوڵدان بۆ چوونە ژوورەوە
-      title: هەوڵدان بۆ چوونە ژوورەوە
+      explanation: Te yedekîya tijê ya ajimêrê xwe Mastodonê xwest. Niha ji daxistinê re amade ye!
+      subject: Arşîva te amede ye bo daxistinê
+      title: Pakêtkirina arşîvan
+    suspicious_sign_in:
+      change_password: borînpeyva xwe biguherîne
+      details: 'Li vir hûrgiliyên hewldanên têketinê hene:'
+      explanation: Me têketineke nû ji ajimêra te ji navnîşaneke IP ya nû dît.
+      further_actions_html: Ku ev ne tu ye, em pêşniyar dikin ku tu di tavilê de %{action} û piştrastkirina du-gavî çalak bikî da ku ajimêra te di ewlehiyê de bimîne.
+      subject: Ajimêra te ji navnîşaneke IP ya nû ve hatiye gihîştin
+      title: Têketineke nû
     warning:
+      appeal: Îtîrazekê bişîne
+      appeal_description: Ku tu bawer dikî ku ev şaşetiyeke, tu dikarî îtîrazekê ji karmendên %{instance} re bişînî.
+      categories:
+        spam: Nexwestî (Spam)
+        violation: Naverok rêbazên civakê yên jêrîn binpê dike
       explanation:
-        disable: تا کاتێک هەژمارەی ئێوە نەوێستاوە، دراوەکانی ئێوە دەستکاری ناکرێت.بەڵام تا کاتێک کە هەژمارەکەتان ناکرێتەوە. ناتوانن هیچ ئیشێکی لەسەر بکەن.
-        sensitive: پەڕگە میدیایە بارکراوەکانت و میدیا لینککراوەکانت وەک هەستیار مامەڵەیان لەگەڵ دەکرێت.
-        silence: تا کاتیک هەژمارەکەتان سنووردار بێت، تەنها ئەو کەسانە کە پێشتر شوێنکەوتووی ئێوە بوون نووسراوەکانی ئێوە لەم ڕاژە دەبینن. شایەد ئێوە لە زۆر پێرستی گشتی دیار نەکەون؛ بەڵام خەڵکانی دیکە دەتوانن بە دڵی خۆیان پەیگیری ئێوە بن.
-        suspend: هەژمارەکەتان هەڵواسراوە، وە تەواو توت و میدیاکان کە لەسەر ئەم ڕاژە بارتان کردووە یان ئەو ڕاژانە کە شوێنکەوتووتان لە سەری بووە ئیتر ناگەڕێنەوە.
-      get_in_touch: بە وڵام دانەوەی ئەم ئیمەیلە دەتوانن لە گەڵ لیژنەی %{instance} لە پەیوەندی بن.
-      review_server_policies: پێداچوونەوەی سیاسەتەکانی ڕاژە
-      statuses: 'بە دیاریکراوی، بۆ:'
+        delete_statuses: Hate dîtin ku hinek şandiyên te yek an jî çend rêwerzên civatê binpê dikin û dû re ji hêla çavdêrên %{instance} ve hatine rakirin.
+        disable: Tu êdî nikarî ajimêra xwe bi kar bînî, lê profîla te û daneyên din bê ziyan dimînin. Tu dikarî ji daneyên xwe hilanînê bixwazî, sazkariyên ajimêrê biguherîmî an jî ajimêrê xwe jê bibî.
+        mark_statuses_as_sensitive: Hinek şandiyên te ji hêla çavdêrên %{instance} ve wekî hestyar hatine nîşankirin. Ev tê vê wateyê ku berî ku pêşdîtinek were xuyang kirin pêdivî ye ku mirov di nav şandiyan de bitikînî. Dema ku di pêşerojê de bişînî tu dikarî medyayê wekî xwe hestyar nîşan bikî.
+        sensitive: Ji niha û pê ve, hemû pelên te yên medyayê yên hatine barkirin wê li piştî hişyariyek wekî hestyar û veşartî bêne nîşankirin.
+        silence: Tu hîn jî dikarî ajimêra xwe bi kar bînî lê tenê kesên ku jixwe te dişopînin wê şandiyên te li ser vê rajekarê bibînin, û dibe ku tu ji cûrbecûr taybetmendiyên vedîtinê werî bi dûrxistin. Lêbelê, yên din hîn jî dikarin bi destan te bişopînin.
+        suspend: Tu êdî nikarî têkevî ajimêra xwe, û profîla te û daneyên din êdî nayên gihîştin. Dîsa jî tu dikarî têkevî da ku hilanîna daneyên xwe daxwaz bikî heya ku dane bi tevahî werin rakirin di hundirê 30 roj de, lê em ê hin daneyan biparêzin da ku tu ji rawestandinê rizgar bikî.
+      reason: 'Sedem:'
+      statuses: 'Şandiyên binavkirî:'
       subject:
-        disable: هەژمارەکەت %{acct} بەستراوە
-        none: ئاگاداری بۆ %{acct}
-        sensitive: هەژمارەکەت %{acct} میدیایەکی پۆست کردن بە هەستیار نیشان کراوە
-        silence: هەژمارەکەی %{acct} سنووردار کراوە
-        suspend: هەژمارەکەی %{acct} ڕاگیرا
+        delete_statuses: Şandiyên te yên li ser %{acct} hatin rakirin
+        disable: Ajimêra te a %{acct} hat qerisandin
+        mark_statuses_as_sensitive: Şandiyên te yên li ser %{acct} wekî hestyar hatine nîşankirin
+        none: Hişyarî bo %{acct}
+        sensitive: Şandiyên te yên li ser %{acct} wê ji niha û pê ve wekî hestyar bêne nîşankirin
+        silence: Ajimêra te ya %{acct} hate bisînorkirin
+        suspend: Ajimêra te %{acct} hate rawestandin
       title:
-        disable: هەژمارە بەستراوە
-        none: ئاگاداری
-        sensitive: میدیاکەت بە هەستیار نیشان کراوە
-        silence: هەژماری سنووردار
-        suspend: هەژمار ڕاگیرا
+        delete_statuses: Şandî hatin rakirin
+        disable: Ajimêr hate qerisandin
+        mark_statuses_as_sensitive: Şandî wekî hestyar hatine nîşankirin
+        none: Hişyarî
+        sensitive: Ajimêr wekî hestyar hate nîşankirin
+        silence: Ajimêr sînor kiriye
+        suspend: Ajimêr hatiye rawestandin
     welcome:
-      edit_profile_action: پرۆفایلی جێگیرکردن
-      edit_profile_step: 'ئێوە دەتوانن پرۆفایلەکەتان بە دڵخوازی خۆتان بگۆڕن: دەتوانن وێنەی پرۆفایل،وێنەی پاشبنەما،ناو و... هتد دابین بکەن. ئەگەر هەرەکت بێت دەتوانی هەژمارەکەت تایبەت بکەیتەوە تا تەنها کەسانێک کە ئێوە ڕێگەتان داوە دەتوانن شوێنکەوتوو هەژمارەکەتان بن.'
-      explanation: ئەمە چەند ئامۆژگارییەکن بۆ دەست پێکردنت
-      final_action: دەست بکە بە بڵاوکردنەوە
-      final_step: 'چیزی بنووسید! تەنانەت گەر ئێستا کەسێک شوێن کەوتووی ئێوە نەبوو، هەژمارەکانی دیکە و سەردانکەرەکانی پرۆفایلەکەتان نووسراوەکانی گشتی ئێوە دەبینن. بۆ نموونە لە پێرستی نووسراوە خۆماڵییەکان و لە لکاوەی(هاشتاگ) ەکان، شایەد هەرەکتان بێت بە چەسپکراوەی # خۆتان بناسێنن.'
-      full_handle: ناوی بەکارهێنەری تەواوی ئێوە
-      full_handle_hint: ئەمە ئەو شتەیە کە بە هاوڕێکانت دەلێی بۆ ئەوەی پەیام یان لە ڕاژەیەکی دیکەی ترەوە بەدوات بکەون.
-      review_preferences_action: گۆڕینی پەسەندەکان
-      review_preferences_step: دڵنیابە لە دانانی پەسەندکراوەکانت، وەک کام ئیمەیل کە دەتەوێت وەریبگرێ، یان دەتەوێت چ ئاستێکی تایبەتیت بۆ بابەتەکانت پێش گریمانە بێت. ئەگەر نەخۆشی جوڵەت(دڵ تێکەڵدان لە وێنە جووڵەییەکان) نیە، دەتوانیت هەڵبژێریت بۆ بەتواناکردنی پەخشکردنی خۆکاری GIF.
-      subject: بەخێربیت بۆ ماستۆدۆن
-      tip_federated_timeline: پێرستی نووسراوەکانی هەمووشوێنێک وێنەیەکی گشتی لە تۆڕی ماستۆدۆنە، بەڵام تەنها بریتییە لە هاوسێکان کە شوێنیان کەوتن؛بس تەواو نییە.
-      tip_following: بە شیوەی بنەڕەتی بەڕێوەبەران ڕاژەکەتان چاودێری دەکەن، بۆ پەداکردنی کەسانی سەرنجڕاکێشە چاودێری نووسراوە ناخۆیی و نووسراوەکانی شوێنەکانی دیکە بکەن.
-      tip_local_timeline: پێرستی نووسراوە ناوخۆییەکان شێوەیەکی تەواو لە بەکارهێنەران لە سەر %{instance} پیسان دەدەن، ئەمانە جەیرانی ئێوەن!
-      tip_mobile_webapp: ئەگەر وێبگەڕی مۆبایلەکەت پێشنیاری زیادکردنی ماستۆدۆن بۆ شاشەی ڕوومێزیەکەتی کرد، دەتوانیت ئاگانامەکانی هاندان وەربگری. لە زۆر ڕوەوە وەک بەرنامەیەیەکی ئەسڵی ئیس دەکا!
-      tips: ئامۆژگاریەکان
-      title: بەخێربێیت، بەکارهێنەر %{name}!
+      edit_profile_action: Profîlê saz bike
+      edit_profile_step: Tu dikarî bi barkirina wêneyek profîlê, guhertina navê xwe ya xuyangê û bêtir profîla xwe kesane bikî. Berî ku mafê bidî ku te şopînerên nû te bişopînin, tu dikarî binirxînî.
+      explanation: Li vir çend serişte hene ku tu dest pê bike
+      final_action: Dest bi weşandinê bike
+      final_step: 'Dest bi weşandinê bike! Bêyî şopîneran jî dibe ku şandiyên te yên gelemperî ji hêla kesên din ve werin dîtin, mînakî li ser demjimêra herêmî û di hashtagan de. Dibe ku tu bixwazî xwe li ser hashtagê #nasname bidî nasandin.'
+      full_handle: Hemî destikê te
+      full_handle_hint: Ji hevalên xwe re, ji bona ji rajekarekê din peyam bişîne an jî ji bona ku te bikaribe bişopîne tişta ku tu bibêjî ev e.
+      subject: Tu bi xêr hatî Mastodon
+      title: Bi xêr hatî, %{name}!
   users:
-    follow_limit_reached: ناتوانیت زیاتر لە %{limit} خەڵک پەیڕەو کەیت
-    generic_access_help_html: کێشەت هەیە لە گەیشتن بە هەژمارەکەت؟ دەتوانیت لەگەڵ %{email} بۆ یارمەتیدان پەیوەندی بگرن
-    invalid_otp_token: کۆدی دوو-فاکتەر نادروستە
-    invalid_sign_in_token: کۆدی پاراستن دروست نیە
-    otp_lost_help_html: گەر بەو دووڕێگا نەتوانی بچیتە ژوورەوە، لەوانەیە پەیوەندی بگری بە %{email} بۆ یارمەتی
-    seamless_external_login: تۆ لە ڕێگەی خزمەتگوزاری دەرەکیەوە داخڵ بووی، بۆیە ڕێکبەندەکانی نهێنوشە و ئیمەیل بەردەست نین.
-    signed_in_as: 'چوونە ژوورەوە وەک:'
-    suspicious_sign_in_confirmation: وادیارە تۆ پێشتر لەم ئامێرە نەچویتە ژوورەوە، و بۆ ماوەیەک نەچویتە ژوورەوە، بۆیە کۆدی پاراستن دەنێردرینە ناونیشانی ئیمەیڵەکەت بۆ دڵنیابوون لەوەی کە ئەوە تۆیت.
+    follow_limit_reached: Tu nikarî zêdetirî %{limit} kesan bişopînî
+    invalid_otp_token: Koda du-gavî ya nelê
+    otp_lost_help_html: Ku te gihîştina herduyan ji dest da, dibe ku tu bi %{email} re têkilî deyne
+    seamless_external_login: Te bi rajekarke biyanî re têketina xwe kir, ji ber vê yekê borînpeyv û e-name nayê bikaranîn.
+    signed_in_as: 'Têketin wekî:'
   verification:
-    explanation_html: 'دەتوانیت <strong> خۆت بسەلمێنیت وەک خاوەنی لینکەکان لە مێتاداتای پرۆفایلەکەت</strong>. بۆ ئەمە، ماڵپەڕە لینککراوەکە پێویستە لینکێکی تێدا بێت بۆ پرۆفایلی ماستۆدۆنەکەت. بەستەری <strong> دەبێت </strong> هەبێت <code>="me"</code>. ناوەڕۆکی دەقی لینکەکە گرنگ نییە. ئەمە نموونەیەکە:'
-    verification: ساغ کردنەوە
+    explanation_html: 'Tu dikarî <strong>xwe wekî xwediyê girêdanên li daneyê meta profîla xwe piştrast bikî</strong>. Ji bo vê, hewceye girêda malperê di nav profîla te ya mastodonê de girêdanekî paş hebe. Girêdana paş<strong>hewceye</strong> taybetîyek <code>rel="me"</code>hebe. Naveroka nivîsa girêdanê ne girîng e. Ev jî mînakek e:'
+    verification: Piştrastkirin
   webauthn_credentials:
-    add: زیادکردنی کلیلی ئاسایشی نوێ
+    add: Kilîteke ewlehiyê nû tevlî bike
     create:
-      error: کێشەیەک هەبوو لە زیادکردنی کلیلی پاراستنەکەت. تکایە دووبارە هەوڵ دەوەشنەوە.
-      success: کلیلی ئاسایشت بە سەرکەوتوویی زیادکرا.
-    delete: سڕینەوە
-    delete_confirmation: ئایا دڵنیایت لەوەی دەتەوێت ئەم کلیلی پاراستنە بسڕیتەوە?
-    description_html: ئەگەر تۆ <strong> کلیلی سەلماندنت</strong> چالاک دەکەی، بۆ چوونە ژوورەوە پێویستت پێ دەبێ، یەکێک لە کلیلە کانی ئاسایشت بەکاربێنیت.
+      error: Gava Kilîteke ewlehiyê nû dihat tevlîkirin pirsgirêkek derket. Jkx dîsa biceribîne.
+      success: Tevlîkirina kilîteke ewlehiyê nû bi awayekî serkeftî qediya.
+    delete: Jê bibe
+    delete_confirmation: Ma tu bi rastî dixwazî ku ev kilîta ewlehiyê jê bibe?
+    description_html: Ku tu <strong> piştrastkirina kilîta ewlehiyê </strong> çalak bikî, Ji bo têketinê divê tu kilîtekî ewlehiyê bi kar bînî.
     destroy:
-      error: کێشەیەک هەبوو لە سڕینەوەی کلیلی پاراستنەکەت. تکایە دووبارە هەوڵ بدەرەوە.
-      success: کلیلی ئاسایشت بە سەرکەوتوویی سڕایەوە.
-    invalid_credential: کۆدی پاراستن دروست نیە
-    nickname_hint: نازناوی کلیلی ئاسایشی نوێت تێبنووسە
-    not_enabled: تۆ هێشتا WebAuthnت چالاک نەکردووە
-    not_supported: ئەم وێبگەڕە پشتگیری کلیلەکانی پاراستن ناکات
-    otp_required: بۆ بەکارهێنانی کلیلەکانی پاراستن تکایە سەرەتا سەلماندنی دوو-فاکتەر چالاک بکە.
-    registered_on: تۆمارکراو لە %{date}
+      error: Dema kilîda ewlehiyê hate jêbirin pirsgirêkek peyda bû. Ji kerema xwe re careke din biceribîne.
+      success: Kilîda ewlehiyê bi awayekî serkeftî hatê jêbirin.
+    invalid_credential: Kilîda ewlehiyê a nelê
+    nickname_hint: Bernavka kilîda te ya ewlehiyê a nû têkevê
+    not_enabled: Te hê WebAuthn çalak nekiriye
+    not_supported: Ev gerok piştgiriya kilîtên ewlehiyê nakê
+    otp_required: Ji bo ku tu kilîtên ewlehiyê bikar bînî, ji kerema xwe re pêşî piştrastkirina du-gavî çalak bike.
+    registered_on: Di %{date} dîrokê de tomar bû
diff --git a/config/locales/kw.yml b/config/locales/kw.yml
index 62d535b1b..7683e3042 100644
--- a/config/locales/kw.yml
+++ b/config/locales/kw.yml
@@ -1,10 +1,5 @@
 ---
 kw:
-  about:
-    about_this: A-dro dhe
-  accounts:
-    roles:
-      group: Bagas
   admin:
     accounts:
       email: Ebost
diff --git a/config/locales/la.yml b/config/locales/la.yml
new file mode 100644
index 000000000..0a4bec9ee
--- /dev/null
+++ b/config/locales/la.yml
@@ -0,0 +1,12 @@
+---
+la:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b0de04024..58d0ae4f4 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1,44 +1,18 @@
 ---
 lt:
   about:
-    about_hashtag_html: Čia visiems prieinamas įrankis <strong>#%{hashtag}</strong>. Jūs galite juo naudotis bet kur, jeigu turite paskyra fedi-visatoje.
     about_mastodon_html: Mastodon, tai socialinis tinklas pagrįstas atviro kodo programavimu, ir atvirais web protokolais. Visiškai nemokamas. Ši sistema decantrilizuota kaip jūsų elektroninis paštas.
-    about_this: Apie
-    administered_by: 'Administruoja:'
-    apps: Mobilioji Aplikacija
-    contact: Kontaktai
     contact_missing: Nenustatyta
-    documentation: Dokumentacija
     hosted_on: Mastodon palaikomas naudojantis %{domain} talpinimu
-    learn_more: Daugiau
-    privacy_policy: Privatumo Politika
-    source_code: Šaltinio kodas
-    status_count_before: Autorius
-    terms: Naudojimo sąlygos
-    user_count_before: Namai
-    what_is_mastodon: Kas tai, Mastodon?
   accounts:
-    choices_html: "%{name} pasirinkimai:"
     follow: Sekti
     following: Sekami
-    joined: Prisijungiai %{date}
     last_active: paskutinį kartą aktyvus
     link_verified_on: Nuorodos nuosavybė paskutinį kartą tikrinta %{date}
-    media: Medija
-    moved_html: "%{name} persikėlė į %{new_profile_link}:"
-    network_hidden: Ši informacija neprieinama
     nothing_here: Čia nieko nėra!
-    people_followed_by: Žmonės, kuriuos %{name} seka
-    people_who_follow: Žmonės kurie seka %{name}
     pin_errors:
       following: Privalai sekti žmogų kurį nori pagerbti
     posts_tab_heading: Tootai
-    posts_with_replies: Tootai ir atsakymai
-    roles:
-      admin: Administratorius
-      bot: Bot'as
-      moderator: Moderatorius
-    unfollow: Nesekti
   admin:
     account_actions:
       action: Veiksmas
@@ -46,14 +20,12 @@ lt:
     account_moderation_notes:
       create: Palikti žinutę
       created_msg: Moderavimo žinutė sėkimngai sukurta!
-      delete: Ištrinti
       destroyed_msg: Moderacijos žinutė sėkmingai ištrinta!
     accounts:
       are_you_sure: Ar esate įsitikinęs?
       avatar: Profilio nuotrauka
       by_domain: Domenas
       change_email:
-        changed_msg: Paskyros el paštas sėkmingai pakeistas!
         current_email: Dabartinis el paštas
         label: Pakeisti el pašto adresą
         new_email: Naujas el pašto adresas
@@ -91,7 +63,6 @@ lt:
       moderation:
         active: Aktyvus
         all: Visi
-        silenced: Užtildytas
         suspended: Užrakintas
         title: Moderacija
       moderation_notes: Medaracijos žinutės
@@ -114,12 +85,6 @@ lt:
       reset: Iš naujo
       reset_password: Atkurti slaptažodį
       resubscribe: Per prenumeruoti
-      role: Leidimai
-      roles:
-        admin: Administratorius
-        moderator: Moderatorius
-        staff: Personalas
-        user: Vartotojas
       search: Ieškoti
       shared_inbox_url: Bendroji gautųjų URL
       show:
@@ -138,7 +103,6 @@ lt:
       username: Slapyvardis
       warn: Įspėti
     action_logs:
-      deleted_status: "(panaikintas statusas)"
       title: Audito žurnalas
     custom_emojis:
       by_domain: Domenas
@@ -153,7 +117,6 @@ lt:
       emoji: Jaustukas
       enable: Įjungti
       enabled_msg: Šis jaustukas sėkmingai įjungtas
-      image_hint: PNG failo dydis iki 50KB
       listed: Įtrauktas į sąrašą
       new:
         title: Pridėti naują jaustuką
@@ -178,34 +141,18 @@ lt:
         create: Sukurti bloką
         hint: Domeno blokavimas nesustabdys vartotojų paskyrų sukūrimo duomenų sistemoje, tačiau automatiškai pritaikys atitinkamus moderavimo metodus šioms paskyroms.
         severity:
-          desc_html: |-
-            <strong>1Tyla</strong>2 padarys paskyros įkelimus nematomus visiems, kurie jų neseka.
-            <strong>3Draudimas</strong>4 panaikins visus paskyros įkėlimus ir profilio informaciją.Naudok<strong>5Nieko</strong>6 jeigu tiesiog norite atmesti medijos failus.
           noop: Nieko
-          silence: Tyla
           suspend: Draudimas
         title: Naujos domeno blokas
       reject_media: Atmesti medijos failai
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
       reject_reports: Atmesti skundai
       reject_reports_hint: Ignoruoti visus skundus, kurie siunčiami iš šio domeno. Neliečia užblokavimu
-      rejecting_media: atmetami medijos failai
-      rejecting_reports: atmetami skundai
-      severity:
-        silence: užtildytas
-        suspend: uždraustas
-      show:
-        retroactive:
-          silence: Atitildyti visus egzistuojančius vartotojus šiame domene
-          suspend: Atblokuotis visus egzistuojančius vartotojus šiame domene
-        title: Atkurti domeno blokavimą domenui %{domain}
-        undo: Atkurti
       undo: Atkurti domeno bloką
     email_domain_blocks:
       add_new: Pridėti naują
       created_msg: El pašto domenas sėkmingai pridėtas į juodąjį sąrašą
       delete: Ištrinti
-      destroyed_msg: El pašto adresas sėkmingai pašalintas iš juodojo sąrašo
       domain: Domenas
       new:
         create: Pridėto domeną
@@ -277,85 +224,13 @@ lt:
       unassign: Nepriskirti
       unresolved: Neišspręsti
       updated_at: Atnaujinti
-    settings:
-      activity_api_enabled:
-        desc_html: Skaičiai lokaliai įkeltų statusų, aktyvių vartotojų ir naujų registracijų, kas savaitiniuose atnaujinimuose
-        title: Paskelbti agreguotą statistiką apie vartotojo veiklą
-      bootstrap_timeline_accounts:
-        desc_html: Atskirti vartotojų vardus naudojant kablelį (,). Tik lokalios ir neužblokuotos paskyros veiks. Pradinis kai tuščia, visi lokalūs administratoriai.
-        title: Numatyti sekimai naujiems vartotojams
-      contact_information:
-        email: Verslo el paštas
-        username: Kontaktinis slapyvardis
-      custom_css:
-        desc_html: Pakeisk išvaizdą su CSS užkraunamu kiekviename puslapyje
-        title: Asmeninis CSS
-      hero:
-        desc_html: Rodomas pagrindiniame puslapyje. Bent 600x100px rekomenduojama. Kai nenustatyta, renkamasi numatytą serverio nuotrauką
-        title: Herojaus nuotrauka
-      mascot:
-        desc_html: Rodoma keleta puslapių. Bent 293×205px rekomenduoja. Kai nenustatyą, renkamasi numatytą varianta
-        title: Talismano nuotrauka
-      peers_api_enabled:
-        desc_html: Domeno vardai, kuriuos šis serveris sutiko fedi-visatoje
-        title: Paskelbti sąrašą atrastų serveriu
-      preview_sensitive_media:
-        desc_html: Nuorodų peržiūros kituose tinklalapiuose bus rodomos su maža nuotrauka, net jeigu failas parinktas kaip "jautraus turinio"
-        title: Rodyti jautrią informaciją OpenGraph peržiūrose
-      profile_directory:
-        desc_html: Leisti vartotojams būti atrastiems
-        title: Įjungti profilio direktorija
-      registrations:
-        closed_message:
-          desc_html: Rodoma pagrindiniame puslapyje, kuomet registracijos uždarytos. Jūs galite naudoti HTML
-          title: Uždarytos registracijos žinutė
-        deletion:
-          desc_html: Leisti visiems ištrinti savo paskyrą
-          title: Atidaryti paskyros trynimą
-        min_invite_role:
-          disabled: Nei vienas
-          title: Leisti pakvietimus
-      show_known_fediverse_at_about_page:
-        desc_html: Kai įjungta, rodys įrašus iš visos žinomos fedi-visatos. Kitokiu atvėju, rodys tik lokalius įrašus.
-        title: Rodyti žinoma fedi-visatos laiko juosta peržiūroje
-      show_staff_badge:
-        desc_html: Rodyti personalo ženklelį vartotojo puslapyje
-        title: Rodyti personalo ženklelį
-      site_description:
-        desc_html: Introdukcinis paragrafas pagrindiniame puslapyje. Apibūdink, kas padaro šį Mastodon serverį išskirtiniu ir visa kita, kas svarbu. Nebijok naudoti HTML žymes, pavyzdžiui <code> &lt; a &gt;</code> bei <code>&lt;em&gt;</code>.
-        title: Serverio apibūdinimas
-      site_description_extended:
-        desc_html: Gera vieta Jūsų elgesio kodeksui, taisyklėms, nuorodms ir kitokiai informacijai, kuri yra išskirtinė Jūsų serveriui. Galite naudoti HTML žymes
-        title: Išsamesnė išskirtine informacija
-      site_short_description:
-        desc_html: Rodoma šoniniame meniu ir meta žymėse. Apibūdink kas yra Mastodon, ir kas daro šį serverį išskirtiniu, vienu paragrafu. Jeigu tuščias, naudojamas numatytasis tekstas.
-        title: Trumpas serverio apibūdinimas
-      site_terms:
-        desc_html: Jūs galite parašyti savo pačio privatumo politika, naudojimo sąlygas ar kita informacija. Galite naudoti HTML žymes
-        title: Išskirtinės naudojimosi taisyklės
-      site_title: Serverio pavadinimas
-      thumbnail:
-        desc_html: Naudojama OpenGraph peržiūroms ir API. Rekomenduojama 1200x630px
-        title: Serverio miniatūra
-      timeline_preview:
-        desc_html: Rodyti viešą laiko juostą apsilankymo puslapyje
-        title: Laiko juostos peržiūra
-      title: Tinklalapio nustatymai
     statuses:
       back_to_account: Atgal į paskyros puslapį
-      batch:
-        delete: Ištrinti
-        nsfw_off: Pažymėti kaip ne jautrią informaciją
-        nsfw_on: Pažymėti kaip jautrią informaciją
-      failed_to_execute: Nesėkmingas veiksmas
       media:
         title: Medija
-      no_media: Nėra medijos
       no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
       title: Paskyros statusai
       with_media: Su medija
-    tags:
-      title: Saitažodžiai(#)
     title: Administracija
     warning_presets:
       add_new: Pridėti naują
@@ -376,7 +251,6 @@ lt:
   applications:
     created: Aplikacija sėkmingai sukurta
     destroyed: Aplikacija sėkmingai ištrinta
-    invalid_url: Gauta URL nuoroda netinkama
     regenerate_token: Regeneruoti prieigos žetoną
     token_regenerated: Prieigos žetonas sėkmingai sugeneruotas
     warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
@@ -427,10 +301,6 @@ lt:
     confirm_password: Kad patvirtintumėte savo tapatybę, įveskite dabartini slaptažodį
     proceed: Ištrinti paskyrą
     success_msg: Jūsų paskyra sėkmingai ištrinta
-  directories:
-    directory: Profilio direktorija
-    explanation: Raskite vartotojus, remiantis tuo, kuo jie domisi
-    explore_mastodon: Naršyti %{title}
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': Jūs neturie prieigos matyti šiam puslapiui.
@@ -473,16 +343,11 @@ lt:
       title: Keisti filtrą
     errors:
       invalid_context: Jokio arba netinkamas pateiktas kontekstas
-      invalid_irreversible: Negrąžinamas filtras veikia tik namų ir priminimų kontekste
     index:
       delete: Ištrinti
       title: Filtrai
     new:
       title: Pridėti naują filtrą
-  footer:
-    developers: Programuotojai
-    more: Daugiau…
-    resources: Resursai
   generic:
     changes_saved_msg: Pakeitimai sėkmingai išsaugoti!
     copy: Kopijuoti
@@ -501,7 +366,6 @@ lt:
       following: Sekėju sąrašas
       muting: Tildomų sąrašas
     upload: Įkelti
-  in_memoriam_html: Atminimui.
   invites:
     delete: Deaktyvuoti
     expired: Pasibaigęs
@@ -533,11 +397,6 @@ lt:
   moderation:
     title: Moderacija
   notification_mailer:
-    digest:
-      action: Peržiurėti visus pranešimus
-      body: Čia yra trumpa santrauka žinutės, kurią jūs praleidote nuo jūsų paskutinio apsilankymo %{since}
-      mention: "%{name} paminėjo jus:"
-      title: Kol jūsų nebuvo...
     favourite:
       body: 'Jūsų statusą pamėgo %{name}:'
       subject: "%{name} pamėgo Jūsų statusą"
@@ -568,22 +427,7 @@ lt:
   preferences:
     other: Kita
   remote_follow:
-    acct: Įveskite Jūsų slapyvardį@domenas kurį norite naudoti
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
-    no_account_html: Neturite paskyros? Jūs galite<a href='%{sign_up_path}' target='_blank'> užsiregistruoti čia </a>
-    proceed: Sekti
-    prompt: 'Jūs seksite:'
-    reason_html: "<strong>Kodėl šis žingsnis svarbus?</strong><code>%{instance}</code> gali būti serveris, kuriame jūs nesate užsiregistravęs, todėl mes turime jus nukreipti į Jūsų namų serveri."
-  remote_interaction:
-    favourite:
-      proceed: Pamėgti
-      prompt: 'Jūs norite pamėgti šį toot''ą:'
-    reblog:
-      proceed: Pakelti
-      prompt: 'Jūs norite pakelti šį toot''ą:'
-    reply:
-      proceed: Atsakyti
-      prompt: 'Jūs norite atsakyti šiam toot''ui:'
   scheduled_statuses:
     over_daily_limit: Jūs pasieketė limitą (%{limit}) galimų toot'ų per dieną
     over_total_limit: Jūs pasieketė %{limit} limitą galimų toot'ų
@@ -619,13 +463,11 @@ lt:
       description: 'Pridėta: %{attached}'
     boosted_from_html: Pakelta iš %{acct_link}
     content_warning: 'Turinio įspėjimas: %{warning}'
-    language_detection: Automatiškai nustatyti kalbą
     open_in_web: Atidaryti naudojan Web
     over_character_limit: pasiektas %{max} simbolių limitas
     pin_errors:
       limit: Jūs jau prisegėte maksimalų toot'ų skaičų
       ownership: Kitų vartotojų toot'ai negali būti prisegti
-      private: Ne vieši toot'ai negali būti prisegti
       reblog: Pakeltos žinutės negali būti prisegtos
     show_more: Daugiau
     sign_in_to_participate: Prisijunkite jeigu norite dalyvauti pokalbyje
@@ -640,87 +482,6 @@ lt:
     pinned: Prisegtas toot'as
     reblogged: pakeltas
     sensitive_content: Jautrus turinys
-  terms:
-    body_html: |
-      <h2>Privatumo politika</h2>
-      <h3 id="collect">Kokia informacija yra renkama?</h3>
-      <ul>
-      <li><em>Paprasa paskyros informacija</em>: Jeigu Jūs užsiregistruojate šiame serveryje, Jūsų gali paklausti, kad įrašytumėte slapyvardį, el pašto adresą ir paskyros slaptąžodį. Jūs irgi galite įrašyti papildomą profilio informaciją, tokią kaip rodomas vardas ir biografiją bei įkelti profilio nuotrauką ir antraštės nuotrauką. Slapyvardis , rodomas vardas, biografija, profilio nuotrauka ir antraštės nuotrauka visada viešai prieinama informacija.</li>
-      <li><em>Įrašai, sekami ir kita vieša informacija</em>: Sąrašas žmonių, kuriuos Jūs sekate yra matomas viešai, taip pat kaip ir Jūsų sekėjams. Kai Jūs išsiunčiate žinutę, data ir laikas yra išsaugomi bei aplikacija iš kurios jūs išsiuntėte žinutę. Žinutėse gali būti prisegtų medijos failų kaip vaizdo įrašai bei nuotraukos. Viešos ir neįtrauktos į sąrašus žinutės yra viešai prieinamos. Kai nusprendžiate rodyti pranešimą ant savo profilio, tai irgi yra viešai prieinama informacija. Jūsų pranešimai yra pristatomi Jūsų sekėjams, kai kuriais atvėjais tai gali reikšti, kad šie pranešimai yra pristatomi į kitus serverius ir saugomi ten. Kai Jūs ištrinate įrašus, šie įrašai ištrinami ir Jūsų sekėjams. Veiksmas pamėgti kitus įrašus irgi yra viešas.
-      </li><li><em>Tiesioginiai ir tik sekėjams įrašai</em>: Visi įrašai yra saugomi ir apdorojami serveryje. Tik sekėjams įrašai yra pristatomi Jūsų sekėjams ir vartotojams, kurie yra paminėti įrašuose, ir tiesioginiai įrašai pristatomi tik vartotojams, kurie yra paminėti įraše. Kai kuriais atvėjais tai gali reikšti, kad šie įrašai yra pristatomi į kitą serverį ir įrašų kopijos saugomos ten. Mes stengiames riboti prieigą prie šių pranešimų tiktai autorizuotiems gavėjams, tačiau kiti serveriai to gali nedaryti. Todėl yra svarbu peržiurėti serverius, kuriems Jūsų sekėjai priklauso. Jūs galite įjungti būseną nustatymuose, kad galėtumetė priimti arba atmesti naujas sekimo užklausas.<em> Prašome nepamiršti, kad serverio operatoriai ir kiti serveriai, kurie gauna šias žinutes, gali jas peržiurėti </em> bei, kad gavėjai gali padaryti foto kopija, tektso kopija ar kitaip pasidalinti Jūsų žinutėmis.<em> Nesidalinkite jokia jautria ar pavojinga informacija naudojantis Mastodon.</em></li>
-      <li><em>IP adresai ir kiti metaduomenys</em>: Kai prisijungiate, mes įrašome IP adresą iš kurio jūs prisijungėte, ir naudojamos naršyklės pavadinimą. Visos prisijungimo sesijos yra prieinamos Jūsų apžvalgai ir atšaukimams nustatymuose. Paskutiniai IP adresai yra saugomi iki 12-kos mėnesių. Mes taipogi galime pasilikti serverio registrą, kuriuose yra saugoma IP adresai iš visų bandymu prisijungti prie serverio prašant informacijos.
-      </li></ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Kam mes naudojame Jūsų informaciją?</h3>
-      <p>Visa surinkta informacija apie jus, gali būti panaudota šiems tikslams: </p>
-      <ul>
-      <li>Suteikti pagrindį Mastodon funkcialumą. Jūs galite sąveikauti su kitų vartotojų turiniu ir kelti sąvajį, kuomet esate prisijungęs. Pavyzdžiui, galite sekti kitus žmones, peržiūrėti jų sujungtus įrašus savo pačio personalizuotoje laiko juostoje. </li>
-      <li>Padėti bendruomenės moderavimui, pavyzdžiui, lyginant Jūsų IP adresą, su kitu žinomu IP adresu, kad nustatyti bandymus vengti užblokavimo.</li>
-      <li>Jūsų el pašto adresas gali būti naudojamas išsiųsti informacija jums, priminimus apie kitų vartotojų interakciją su jūsų paskyra, pavyzdžiui, kai jie jums siunčia žinutes, ir atsakyti į užklausas ir/arba kitais klausimais. </li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Kaip mes saugome Jūsų informacija? </h3>
-
-      <p>Mes implementavome saugumo priemones, tam, kad apsaugotume Jūsų privačią informaciją. Tarp šių dalykų, Jūsų naršyklės sesija, taip pat ir eismas tarp Jūsų aplikacijos ir API yra apsaugoti SSL, ir Jūsų slaptažodis yra užsifruotas sudėtingu algoritmu. Jūs galite įjungti dviejų veiksnių autentikaciją savo paskyrai, taip apsaugodami ją dar daugiau.
-      </p>
-
-      <hr class="spacer" />
-      <h3 id="data-retention"> Kokia yra mūsų duomenų laikymo politika? </h3>
-
-      <p>Mes stengiamės:</p>
-
-      <ul>
-      <li> Išsaugoti serverio registrą, kuriame yra visi IP adresai, kurie kreipėsi į serverį, šie duomenys laikomi neilgiau nei 90 dienų.</li>
-      <li> Išsaugoti IP adresus asocijuotus su registruotais vartotojais, ne ilgiau nei 12 mėnesių.</li>
-      </ul>
-
-      <p> Jūs galite pateikti prašymą ir parsisiųsti savo turinio archyvą, kuriame bus Jūsų įrašai, medijos failai, profilio nuotrauka ir antraštės nuotrauka.</p>
-
-      <p> Jūs galite VISIŠKAI ištrinti savo paskyrą bet kuriuo metu.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Ar mes naudojame sausainiukus?</h3>
-
-      <p> Taip. Sausainiukai yra mažos apimties failai, kuriuos svetainė arba svetainės tiekėjas perkelia į Jūsų kompiuterio kietąjį diską naudojantis interneto naršykle (jeigu jūs leidžiate). Šie sausainiai leidžia svetainiai prisiminti Jūsų naršyklę ir jeigu turite registruotą vartotoją, ji asocijuoti su Jūsu vartotoju.</p>
-      <p>Mes naudojame sausainius, kad suprastumėme ir išsaugotumėme Jūsų poreikius kitam apsilankymui.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Ar mes atskleidžiame Jūsų informacija kitoms šalims?</h3>
-
-      <p>Mes neparduodame, nesikeičiame, ar kitaip mainomės Jūsų privačiais duomenimis su trečiosiomis šalimis. Į šį sąrašą neįeina patikimos trečiosios šalys, kurios padeda mums naudotis tinklalapiu, daryti verslą, ar padėti jums, tol, kol šios šalys sutinka laikyti šią informaciją konfidencialiai. Mes taippat galime paviešinti Jūsų informaciją, jeigu manome, kad Jūs pažeidėte įstatymus, naudojimosi politiką, ar apsaugoti, ginti Jūsų, mūsų ar kitų teises. </p>
-
-      <p>Jūsų vieši duomenys gali būti atsisiųsti kitų serverių esančių tinkle. Jūsų vieši bei tik sekėjams skirti įrašai pristatomi serveriams, kuriuose Jūsų sekėjai egzistuoja, o tiesioginės žinutės pristatomos tiesiai į gavėjo serverį, tol, kol šie sekėjai ar gavėjai yra naudotojai iš kitų serverių. </p>
-
-      <p>Kai jūs patvirtinate Jūsų paskyros naudojimą aplikacijai, atitinkamai priklausant nuo leidimų, kuriuos jūs suteikėte, aplikacija turi prieiga prie Jūsų viešojo profilio informacijos, Jūsų sekėjų sąrašo, sekamų sąrašo, visų Jūsų įrašų, ir pamėgtų įrašų.
-      Aplikacijos niekada negali turėti prieigos prie Jūsų el pašto adreso arba slaptažodžio.</p>
-
-      <hr class="spacer" />
-
-
-      <h3 id="children">Tinklalapio naudojimas nepilnamečiams</h3>
-
-      <p> Jeigu serveris yra EU arba EEA: Mūsų tinklalapis, produktai ir visi teikiami aptarnavimai yra teikiami tik žmonėms, kuriems yra bent 16 metų. Jeigu jums yra mažiau nei 16 metų, sekant GDPR reikalavimais (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) prašome nenaudoti šios svetainės. </p>
-
-      <p> Jeigu šis serveris yra USA: Mūsų tinklalapis, produktai ir visi teikiami aptarnavimai yra teikiami žmonėms, kuriems yra bent 13 metų. Jeigu jums mažiau nei 13 metų, sekant COPPA reikalavimais (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) prašome nenaudotis šios svetainės.</p>
-
-      <p>Legalūs reikalavimai gali būti kitokie, jeigu serveris yra kitoje jurisdikcijoje.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Pasikeitimai mūsų privatumo politikoje</h3>
-
-      <p>Jeigu mes nusprendžiame pakeisti savo privatumo politiką, mes įrašysime šiuos pakeitimus šiame tinklalapyje.</p>
-
-      <p>Šis dokumentas yra CC-BY-SA. Paskutinį kartą keistas Kovo 7, 2018.</p>
-
-      <p>Originaliai adaptuotas iš <a href="https://github.com/discourse/discourse">Discourse privatumo politika</a>.</p>
-    title: "%{instance} Naudojimosi Sąlygos ir Privatumo Politika"
   themes:
     contrast: Mastodon (Didelio Kontrasto)
     default: Mastodon (Tamsus)
@@ -740,11 +501,6 @@ lt:
       subject: Jūsų archyvas paruoštas parsisiuntimui
       title: Archyvas išimtas
     warning:
-      explanation:
-        disable: Kol Jūsų paskyra užšaldyta, Jūsų duomenys tebėra matomi, tačiau jūs negalite atlikti jokių veiksmu, tol, kol užšaldymas panaikintas.
-        silence: Kol Jūsų paskyra limituota, tik žmonės, kurie jus jau sekė matus Jūsų toot'us serveryje, Jūs taip pat būsite išimtas iš viešųjų sąrašų. Tačiau, kiti gali jus rasti, savo rankomis.
-        suspend: Jūsų paskyra buvo užrakinta, ir visi Jūsų toot'ai, medijos failai, buvo panaikinti iš šio serverio, ir visų kitų serverių, kur turėjote sekėjų.
-      review_server_policies: Apžvelgti serverio politiką
       subject:
         disable: Jūsų paskyra %{acct} buvo užšaldyta
         none: Įspėjmas vartotojui %{acct}
@@ -757,20 +513,11 @@ lt:
         suspend: Paskyra užrakinta
     welcome:
       edit_profile_action: Nustatyti profilį
-      edit_profile_step: Jūs galite keisti savo profilį įkeldami profilio nuotrauką, antraštę, pakeičiant savo rodomą vardą ir dar daugiau. Jeigu norėtumete peržiurėti naujus sekėjus prieš leidžiant jiems jus sekti, galite užrakinti savo paskyrą.
       explanation: Štai keletas patarimų Jums
       final_action: Pradėti kelti įrašus
-      final_step: 'Pradėk kelti įrašus! Net jeigu neturi sekėjų, Jūsų viešos žinutės gali būti matomos kitų, pavyzdžiui, lokalioje laiko juostoje ir saitažodžiuose. Galite norėti prisistatyti naudojan saitąžodį #introductions.'
       full_handle: Jūsų pilnas slapyvardis
       full_handle_hint: Štai ką jūs sakytumėte savo draugams, kad jie galėtų jums siųsti žinutes arba just sekti iš kitų serverių.
-      review_preferences_action: Pakeisti pasirinkimus
-      review_preferences_step: Nustatykite savo pasirinkimus, tokius kaip el pašto laiškai, kuriuos norėtumėte gauti, arba kokiu privatumo lygiu norėtumėte, kad jūsų įrašai būtų talpinami, taip pat galite įjungti automatinį GIF paleidimą.
       subject: Sveiki atvykę į Mastodon
-      tip_federated_timeline: Federuota laiko juosta yra lyg gaisrininkų žarną rodanti Mastodon tinklą. Tačiau, joje rodomi tik žmonės kurie yra sekami Jūsų kaimynų.
-      tip_following: Jūs sekate savo serverio administratorius numatyta tvarka. Norint rasti įdomesnių žmonių, patikrinkite lokalią bei federuotą laiko juostas.
-      tip_local_timeline: Lokali laiko juosta, joje rodomi žmonės iš %{instance}. Jie yra Jūsų artimiausi kaimynai!
-      tip_mobile_webapp: Jeigu Jūsų mobilioji naršyklė leidžia jums pridėti Mastodon prie namų ekrano, jūs galite gauti priminimus. Tai gali veikti kaip vietinė aplikacija!
-      tips: Patarimai
       title: Sveiki atvykę, %{name}!
   users:
     follow_limit_reached: Negalite sekti daugiau nei %{limit} žmonių
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5b51b2bca..f0759dab0 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1,88 +1,29 @@
 ---
 lv:
   about:
-    about_hashtag_html: Šīs ir publiskas ziņas, kas atzīmētas ar <strong>#%{hashtag} </strong>. Tu vari mijiedarboties ar viņiem, ja tev ir konts jebkurā federācijas vietnē.
     about_mastodon_html: 'Nākotnes sociālais tīkls: bez reklāmām, bez korporatīvās uzraudzības, ētisks dizains un decentralizācija! Pārvaldi savus datus ar Mastodon!'
-    about_this: Par
-    active_count_after: aktīvs
-    active_footnote: Ikmēneša aktīvie lietotāji (IAL)
-    administered_by: 'Administrē:'
-    api: API
-    apps: Mobilās lietotnes
-    apps_platforms: Lieto Mastodon uz iOS, Android un citām platformām
-    browse_directory: Pārlūko profila direktoriju un atlasi pēc interesēm
-    browse_local_posts: Pārlūko publisko ziņu straumi no šī servera
-    browse_public_posts: Pārlūko publisko ziņu straumi no Mastodon
-    contact: Kontakts
     contact_missing: Nav uzstādīts
     contact_unavailable: N/A
-    discover_users: Atklāj lietotājus
-    documentation: Dokumentācija
-    federation_hint_html: Izmantojot kontu vietnē %{instance}, varēsi sekot cilvēkiem jebkurā Mastodon serverī un ārpus tā.
-    get_apps: Izmēģini mobilo lietotni
     hosted_on: Mastodon mitināts %{domain}
-    instance_actor_flash: |
-      Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju.
-      To izmanto apvienošanas nolūkos, un to nedrīkst bloķēt, ja vien nevēlies bloķēt visu instanci, un tādā gadījumā tev jāizmanto domēna bloķēšana.
-    learn_more: Uzzināt vairāk
-    privacy_policy: Privātuma politika
-    rules: Servera noteikumi
-    rules_html: 'Tālāk ir sniegts noteikumu kopsavilkums, kas jāievēro, ja vēlies izveidot kontu šajā Mastodon serverī:'
-    see_whats_happening: Redzēt, kas notiek
-    server_stats: 'Servera statistika:'
-    source_code: Pirmkods
-    status_count_after:
-      one: ziņa
-      other: ziņas
-      zero: nav
-    status_count_before: Kurš publicējis
-    tagline: Seko draugiem un atrodi jaunus
-    terms: Pakalpojuma noteikumi
-    unavailable_content: Moderētie serveri
-    unavailable_content_description:
-      domain: Serveris
-      reason: Iemesls
-      rejecting_media: 'Multivides faili no šiem serveriem netiks apstrādāti vai saglabāti, un netiks parādīti sīktēli, kuriem nepieciešama manuāla noklikšķināšana uz sākotnējā faila:'
-      rejecting_media_title: Filtrēts saturs
-      silenced: 'Ziņas no šiem serveriem tiks paslēptas publiskās ziņu lentās un sarunās, un no lietotāju mijiedarbības netiks ģenerēti paziņojumi, ja vien tu tiem nesekosi:'
-      silenced_title: Ierobežoti serveri
-      suspended: 'Nekādi dati no šiem serveriem netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu jebkādu mijiedarbību vai saziņu ar lietotājiem no šiem serveriem:'
-      suspended_title: Apturēti serveri
-    unavailable_content_html: Mastodon parasti ļauj apskatīt saturu un mijiedarboties ar lietotājiem no jebkura cita federācijas servera. Šie ir izņēmumi, kas veikti šajā konkrētajā serverī.
-    user_count_after:
-      one: lietotājs
-      other: lietotāji
-      zero: lietotājI
-    user_count_before: Mājās uz
-    what_is_mastodon: Kas ir Mastodon?
+    title: Par
   accounts:
-    choices_html: "%{name} izvēles:"
-    endorsements_hint: Jūs varat apstiprināt cilvēkus, kuriem sekojat no tīmekļa saskarnes, un viņi tiks parādīti šeit.
-    featured_tags_hint: Šeit vari norādīt īpašus tēmturus, kuri tiks parādīti šeit.
-    follow: Seko
+    follow: Sekot
+    followers:
+      one: Sekotājs
+      other: Sekotāji
+      zero: Sekotāju
     following: Seko
     instance_actor_flash: Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju. To izmanto federācijas nolūkos, un to nevajadzētu apturēt.
-    joined: Pievienojās %{date}
     last_active: pēdējā aktivitāte
     link_verified_on: Šīs saites piederība tika pārbaudīta %{date}
-    media: Mediji
-    moved_html: "%{name} ir pārcēlies uz %{new_profile_link}:"
-    network_hidden: Šāda informācija nav pieejama
-    never_active: Nekad
     nothing_here: Te nekā nav!
-    people_followed_by: Cilvēki, kuriem %{name} seko
-    people_who_follow: Cilvēki, kuri seko %{name}
     pin_errors:
       following: Tev jau ir jāseko personai, kuru vēlies apstiprināt
+    posts:
+      one: Ziņa
+      other: Ziņas
+      zero: Ziņu
     posts_tab_heading: Ziņas
-    posts_with_replies: Ziņas un atbildes
-    roles:
-      admin: Admins
-      bot: Bots
-      group: Grupa
-      moderator: Moder
-    unavailable: Profils nav pieejams
-    unfollow: Pārstāt sekot
   admin:
     account_actions:
       action: Veikt darbību
@@ -90,26 +31,30 @@ lv:
     account_moderation_notes:
       create: Atstāt piezīmi
       created_msg: Moderācijas piezīme ir veiksmīgi izveidota!
-      delete: Dzēst
       destroyed_msg: Moderācijas piezīme ir veiksmīgi iznīcināta!
     accounts:
       add_email_domain_block: Bloķēt e-pasta domēnu
       approve: Apstiprināt
-      approve_all: Apstiprināt visus
       approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
       are_you_sure: Vai esi pārliecināts?
       avatar: Avatars
       by_domain: Domēns
       change_email:
-        changed_msg: Konta e-pasts veiksmīgi nomainīts!
+        changed_msg: E-pasts veiksmīgi nomainīts!
         current_email: Pašreizējais e-pasts
         label: Mainīt e-pastu
         new_email: Jaunā e-pasta adrese
         submit: Mainīt e-pastu
         title: Mainīt e-pastu %{username}
+      change_role:
+        changed_msg: Loma veiksmīgi nomainīta!
+        label: Mainīt lomu
+        no_role: Nav lomas
+        title: Mainīt lomu %{username}
       confirm: Apstiprināt
       confirmed: Apstiprināts
       confirming: Apstiprina
+      custom: Pielāgot
       delete: Dzēst datus
       deleted: Dzēsts
       demote: Pazemināt
@@ -141,7 +86,7 @@ lv:
         remote: Attālinātie
         title: Atrašanās vieta
       login_status: Pieteikšanās statuss
-      media_attachments: Mediju pielikumi
+      media_attachments: Multivides pielikumi
       memorialize: Pārvērst atmiņās
       memorialized: Piemiņa saglabāta
       memorialized_msg: "%{username} veiksmīgi pārvērsts par piemiņas kontu"
@@ -157,9 +102,15 @@ lv:
       most_recent_ip: Pati pēdējā IP
       no_account_selected: Neviens konts netika mainīts, jo neviens netika atlasīts
       no_limits_imposed: Nav noteikti ierobežojumi
+      no_role_assigned: Loma nav piešķirta
       not_subscribed: Nav abonēts
       pending: Gaida pārskatīšanu
       perform_full_suspension: Apturēt
+      previous_strikes: Iepriekšējie brīdinājumi
+      previous_strikes_description_html:
+        one: Šim kontam ir <strong>viens</strong> brīdinājums.
+        other: Šim kontam ir <strong>%{count}</strong> brīdinājumi.
+        zero: Šim kontam ir <strong>%{count}</strong> brīdinājumi.
       promote: Veicināt
       protocol: Protokols
       public: Publisks
@@ -167,8 +118,9 @@ lv:
       redownload: Atsvaidzināt profilu
       redownloaded_msg: Veiksmīgi atsvaidzināts %{username} profils no izcelsmes
       reject: Noraidīt
-      reject_all: Noraidīt visus
       rejected_msg: Veiksmīgi noraidīts %{username} reģistrēšanās pieteikums
+      remote_suspension_irreversible: Šī konta dati ir neatgriezeniski dzēsti.
+      remote_suspension_reversible_hint_html: Konts ir apturēts viņu serverī, un dati tiks pilnībā noņemti %{date}. Līdz tam attālais serveris var atjaunot šo kontu bez jebkādām negatīvām sekām. Ja vēlaties nekavējoties noņemt visus konta datus, varat to izdarīt tālāk.
       remove_avatar: Noņemt avatāru
       remove_header: Noņemt galveni
       removed_avatar_msg: Veiksmīgi noņemts %{username} avatāra attēls
@@ -180,18 +132,13 @@ lv:
       reset: Atiestatīt
       reset_password: Atiestatīt paroli
       resubscribe: Pieteikties vēlreiz
-      role: Privilēģijas
-      roles:
-        admin: Administrators
-        moderator: Moderators
-        user: Lietotājs
+      role: Loma
       search: Meklēt
       search_same_email_domain: Citi lietotāji ar tādu pašu e-pasta domēnu
       search_same_ip: Citi lietotāji ar tādu pašu IP
       security_measures:
         only_password: Tikai parole
         password_and_2fa: Parole un 2FA
-        password_and_sign_in_token: Parole un e-pasta marķieris
       sensitive: Sensitīvs
       sensitized: Atzīmēts kā sensitīvs
       shared_inbox_url: Koplietotās iesūtnes URL
@@ -201,42 +148,116 @@ lv:
       silence: Ierobežot
       silenced: Ierobežots
       statuses: Ziņas
+      strikes: Iepriekšējie streiki
       subscribe: Abonēt
+      suspend: Apturēt
       suspended: Apturēts
       suspension_irreversible: Šī konta dati ir neatgriezeniski izdzēsti. Tu vari atcelt konta darbības apturēšanu, lai tas būtu izmantojams, taču tas neatjaunos iepriekšējos datus.
       suspension_reversible_hint_html: Konta darbība ir apturēta, un dati tiks pilnībā noņemti %{date}. Līdz tam kontu var atjaunot bez jebkādām nelabvēlīgām sekām. Ja vēlies nekavējoties noņemt visus konta datus, to vari izdarīt zemāk.
-      time_in_queue: Gaida rindā %{time}
       title: Konti
+      unblock_email: Atbloķēt e-pasta adresi
+      unblocked_email_msg: Veiksmīgi atbloķēta %{username} e-pasta adrese
       unconfirmed_email: Neapstiprināts e-pasts
       undo_sensitized: Atcelt sensitivizēšanu
+      undo_silenced: Atsaukt ierobežojumu
+      undo_suspension: Atsaukt apturēšanu
+      unsilenced_msg: Veiksmīgi atsaukts %{username} konta ierobežojums
+      unsubscribe: Anulēt abonementu
+      unsuspended_msg: Veiksmīgi neapturēts %{username} konts
+      username: Lietotājvārds
+      view_domain: Skatīt domēna kopsavilkumu
+      warn: Brīdināt
+      web: Web
+      whitelisted: Atļauts federācijai
     action_logs:
       action_types:
+        approve_appeal: Apstiprināt Apelāciju
+        approve_user: Apstiprināt lietotāju
+        assigned_to_self_report: Piešķirt Pārskatu
+        change_email_user: Mainīt e-pastu lietotājam
+        change_role_user: Mainīt lietotāja lomu
+        confirm_user: Apstiprināt lietotāju
+        create_account_warning: Izveidot Brīdinājumu
+        create_announcement: Izveidot Paziņojumu
+        create_canonical_email_block: Izveidot E-pasta Bloku
+        create_custom_emoji: Izveidot pielāgotu emocijzīmi
+        create_domain_allow: Izveidot Domēna Atļauju
+        create_domain_block: Izveidot Domēna Bloku
+        create_email_domain_block: Izveidot E-pasta Domēna Bloku
+        create_ip_block: Izveidot IP noteikumu
+        create_unavailable_domain: Izveidot Nepieejamu Domēnu
+        create_user_role: Izveidot lomu
+        demote_user: Pazemināt Lietotāju
+        destroy_announcement: Dzēst Paziņojumu
+        destroy_canonical_email_block: Dzēst E-pasta Bloku
+        destroy_custom_emoji: Dzēst pielāgoto emocijzīmi
+        destroy_domain_allow: Dzēst Domēna Atļauju
+        destroy_domain_block: Dzēst Domēna Bloku
+        destroy_email_domain_block: Dzēst E-pasta Domēna Bloku
+        destroy_instance: Attīrīt domēnu
+        destroy_ip_block: Dzēst IP noteikumu
+        destroy_status: Izdzēst Rakstu
+        destroy_unavailable_domain: Dzēst Nepieejamu Domēnu
+        destroy_user_role: Iznīcināt lomu
+        disable_2fa_user: Atspējot 2FA
+        disable_custom_emoji: Atspējot pielāgotu emocijzīmi
+        disable_sign_in_token_auth_user: Atspējoja e-pasta marķiera autentifikāciju lietotājam
+        disable_user: Atspējot Lietotāju
+        enable_custom_emoji: Iespējot pielāgotu emocijzīmi
+        enable_sign_in_token_auth_user: Iespējot e-pasta marķiera autentifikāciju lietotājam
+        enable_user: Ieslēgt Lietotāju
+        memorialize_account: Saglabāt Kontu Piemiņai
+        promote_user: Paaugstināt Lietotāju
+        reject_appeal: Noraidīt Apelāciju
+        reject_user: Noraidīt lietotāju
+        remove_avatar_user: Noņemt Avatāru
+        reopen_report: Atkārtoti Atvērt Ziņojumu
+        resend_user: Atkārtoti nosūtīt Apstiprinājuma Pastu
+        reset_password_user: Atiestatīt Paroli
+        resolve_report: Atrisināt Ziņojumu
+        sensitive_account: Piespiedu sensitīvizēt kontu
+        silence_account: Ierobežot Kontu
+        suspend_account: Apturēt Kontu
+        unassigned_report: Atcelt Pārskata Piešķiršanu
+        unblock_email_account: Atbloķēt e-pasta adresi
+        unsensitive_account: Atsaukt Konta Piespiedu Sensitivizēšanu
+        unsilence_account: Atcelt Konta Ierobežošanu
         unsuspend_account: Atcelt konta apturēšanu
         update_announcement: Atjaunināt Paziņojumu
         update_custom_emoji: Atjaunināt pielāgoto emocijzīmi
         update_domain_block: Atjaunināt Domēna Bloku
+        update_ip_block: Atjaunināt IP noteikumu
         update_status: Atjaunināt ziņu
+        update_user_role: Atjaunināt lomu
       actions:
+        approve_appeal_html: "%{name} apstiprināja moderācijas lēmuma apelāciju no %{target}"
+        approve_user_html: "%{name} apstiprināja reģistrēšanos no %{target}"
         assigned_to_self_report_html: "%{name} piešķīra pārskatu %{target} sev"
         change_email_user_html: "%{name} nomainīja e-pasta adresi lietotājam %{target}"
+        change_role_user_html: "%{name} nomainīja lomu uz %{target}"
         confirm_user_html: "%{name} apstiprināja e-pasta adresi lietotājam %{target}"
         create_account_warning_html: "%{name} nosūtīja brīdinājumu %{target}"
         create_announcement_html: "%{name} izveidoja jaunu paziņojumu %{target}"
+        create_canonical_email_block_html: "%{name} bloķēja e-pastu ar hešu %{target}"
         create_custom_emoji_html: "%{name} augšupielādēja jaunu emocijzīmi %{target}"
         create_domain_allow_html: "%{name} atļāva federāciju ar domēnu %{target}"
         create_domain_block_html: "%{name} bloķēja domēnu %{target}"
         create_email_domain_block_html: "%{name} bloķēja e-pasta domēnu %{target}"
         create_ip_block_html: "%{name} izveidoja nosacījumu priekš IP %{target}"
         create_unavailable_domain_html: "%{name} apturēja piegādi uz domēnu %{target}"
+        create_user_role_html: "%{name} nomainīja %{target} lomu"
         demote_user_html: "%{name} pazemināja lietotāju %{target}"
         destroy_announcement_html: "%{name} izdzēsa paziņojumu %{target}"
-        destroy_custom_emoji_html: "%{name} iznīcināja emocijzīmi %{target}"
+        destroy_canonical_email_block_html: "%{name} atbloķēja e-pastu ar hešu %{target}"
+        destroy_custom_emoji_html: "%{name} izdzēsa emocijzīmi %{target}"
         destroy_domain_allow_html: "%{name} neatļāva federāciju ar domēnu %{target}"
         destroy_domain_block_html: "%{name} atbloķēja domēnu %{target}"
         destroy_email_domain_block_html: "%{name} atbloķēja e-pasta domēnu %{target}"
+        destroy_instance_html: "%{name} attīrija domēnu %{target}"
         destroy_ip_block_html: "%{name} izdzēsa nosacījumu priekš IP %{target}"
         destroy_status_html: "%{name} noņēma ziņu %{target}"
         destroy_unavailable_domain_html: "%{name} atjaunoja piegādi uz domēnu %{target}"
+        destroy_user_role_html: "%{name} izdzēsa %{target} lomu"
         disable_2fa_user_html: "%{name} atspējoja divfaktoru prasības lietotājam %{target}"
         disable_custom_emoji_html: "%{name} atspējoja emocijzīmi %{target}"
         disable_sign_in_token_auth_user_html: "%{name} atspējoja e-pasta marķiera autentifikāciju %{target}"
@@ -246,22 +267,28 @@ lv:
         enable_user_html: "%{name} iespējoja pieteikšanos lietotājam %{target}"
         memorialize_account_html: "%{name} pārvērta %{target} kontu par atmiņas lapu"
         promote_user_html: "%{name} paaugstināja lietotāju %{target}"
+        reject_appeal_html: "%{name} noraidīja moderācijas lēmuma apelāciju no %{target}"
+        reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
         remove_avatar_user_html: "%{name} noņēma %{target} avatāru"
         reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
+        resend_user_html: "%{name} atkārtoti nosūtīja apstiprinājuma e-pastu %{target}"
         reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
         resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
         sensitive_account_html: "%{name} atzīmēja %{target} mediju kā sensitīvu"
         silence_account_html: "%{name} ierobežoja %{target} kontu"
         suspend_account_html: "%{name} apturēja %{target} kontu"
         unassigned_report_html: "%{name} nepiešķīra ziņojumu %{target}"
+        unblock_email_account_html: "%{name} atbloķēja %{target} e-pasta adresi"
         unsensitive_account_html: "%{name} atmarķēja %{target} mediju kā sensitīvu"
         unsilence_account_html: "%{name} atcēla ierobežojumu %{target} kontam"
         unsuspend_account_html: "%{name} neapturēja %{target} kontu"
         update_announcement_html: "%{name} atjaunināja paziņojumu %{target}"
         update_custom_emoji_html: "%{name} atjaunināja emocijzīmi %{target}"
         update_domain_block_html: "%{name} atjaunināja domēna bloku %{target}"
+        update_ip_block_html: "%{name} mainīja nosacījumu priekš IP %{target}"
         update_status_html: "%{name} atjaunināja ziņu %{target}"
-      deleted_status: "(dzēsta ziņa)"
+        update_user_role_html: "%{name} nomainīja %{target} lomu"
+      deleted_account: dzēsts konts
       empty: Žurnāli nav atrasti.
       filter_by_action: Filtrēt pēc darbības
       filter_by_user: Filtrēt pēc lietotāja
@@ -300,11 +327,12 @@ lv:
       enable: Iespējot
       enabled: Iespējots
       enabled_msg: Šī emocijzīme ir veiksmīgi iespējota
-      image_hint: PNG līdz 50 KB
+      image_hint: PNG vai GIF līdz %{size}
       list: Saraksts
       listed: Uzrakstītas
       new:
         title: Pievienojiet jaunas pielāgotās emocijzīmes
+      no_emoji_selected: Neviena emocijzīme netika mainīta, jo neviena netika atlasīta
       not_permitted: Tev nav atļauts veikt šo darbību
       overwrite: Pārrakstīt
       shortcode: Īskods
@@ -312,19 +340,50 @@ lv:
       title: Pielāgotās emocijzīmes
       uncategorized: Nekategorizētās
       unlist: Izslēgt
-      unlisted: Neminētie
+      unlisted: Nerindota
       update_failed_msg: Nevarēja atjaunināt šo emocijzīmi
       updated_msg: Emocijzīme veiksmīgi atjaunināta!
       upload: Augšupielādēt
     dashboard:
       active_users: aktīvie lietotāji
+      interactions: mijiedarbības
+      media_storage: Mediju krātuve
+      new_users: jauni lietotāji
+      opened_reports: atvērtie ziņojumi
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> izskatāmā apelācija"
+        other: "<strong>%{count}</strong> izskatāmās apelācijas"
+        zero: "<strong>%{count}</strong> izskatāmo apelāciju"
+      pending_reports_html:
+        one: "<strong>%{count}</strong>ziņojums gaida"
+        other: "<strong>%{count}</strong>ziņojumi gaida"
+        zero: "<strong>%{count}</strong>ziņojumi gaida"
+      pending_tags_html:
+        one: "<strong>%{count}</strong>tēmturis gaida"
+        other: "<strong>%{count}</strong>tēmturi gaida"
+        zero: "<strong>%{count}</strong>tēmturi gaida"
+      pending_users_html:
+        one: "<strong>%{count}</strong>lietotājs gaida"
+        other: "<strong>%{count}</strong>lietotāji gaida"
+        zero: "<strong>%{count}</strong>lietotāji gaida"
+      resolved_reports: ziņojumi atrisināti
       software: Programmatūra
+      sources: Reģistrēšanās avoti
       space: Vietas izmantošana
       title: Panelis
+      top_languages: Aktīvākās valodas
+      top_servers: Aktīvākie serveri
+      website: Tīmekļa vietne
+    disputes:
+      appeals:
+        empty: Apelācijas netika atrastas.
+        title: Apelācijas
     domain_allows:
       add_new: Atļaut federāciju ar domēnu
       created_msg: Domēns ir veiksmīgi atļauts federācijai
       destroyed_msg: Domēns ir aizliegts federācijai
+      export: Eksportēt
+      import: Importēt
       undo: Aizliegt federāciju ar domēnu
     domain_blocks:
       add_new: Pievienot jaunu domēna bloku
@@ -332,8 +391,67 @@ lv:
       destroyed_msg: Domēna bloķēšana ir atsaukta
       domain: Domēns
       edit: Rediģēt domēna bloķēšanu
+      existing_domain_block: Tu jau esi noteicis stingrākus ierobežojumus %{name}.
+      existing_domain_block_html: Tu jau esi noteicis stingrākus ierobežojumus %{name}, vispirms tev <a href="%{unblock_url}">jāatbloķē</a>.
+      export: Eksportēt
+      import: Importēt
+      new:
+        create: Izveodot bloku
+        hint: Domēna bloķēšana netraucēs izveidot kontu ierakstus datu bāzē, bet ar atpakaļejošu datumu un automātiski tiks piemērotas noteiktas moderēšanas metodes šajos kontos.
+        severity:
+          desc_html: "<strong>Ierobežojums</strong> padarīs ziņas no šī domēna kontiem neredzamas ikvienam, kas tiem neseko. <strong>Apturēšana</strong> no tava servera noņems visu šī domēna kontu saturu, multividi un profila datus. Izmanto <strong>Nav</strong>, ja vēlies vienkārši noraidīt multivides failus."
+          noop: Neviens
+          silence: Ierobežot
+          suspend: Apturēt
+        title: Jauns domēna bloks
+      no_domain_block_selected: Neviens e-pasta domēna bloks netika mainīts, jo neviens netika atlasīts
+      not_permitted: Tev nav atļauts veikt šo darbību
+      obfuscate: Apslēpt domēna vārdu
+      obfuscate_hint: Daļēji apslēpt domēna nosaukumu sarakstā, ja ir iespējota domēna ierobežojumu saraksta reklamēšana
+      private_comment: Privāts komentārs
+      private_comment_hint: Atstāj komentāru par šo domēna ierobežojumu moderatoru iekšējai lietošanai.
+      public_comment: Publisks komentārs
+      public_comment_hint: Atstāj komentāru par šo domēna ierobežojumu plašai sabiedrībai, ja ir iespējota domēnu ierobežojumu saraksta reklamēšana.
+      reject_media: Noraidīt mediju failus
+      reject_media_hint: Noņem lokāli saglabātos mediju failus un atsaka tos lejupielādēt nākotnē. Nav nozīmes apturēšanai
+      reject_reports: Noraidīt ziņojumus
+      reject_reports_hint: Ignorēt visus ziņojumus, kas nāk no šī domēna. Nav nozīmes apturēšanai
+      undo: Atsaukt domēna bloķēšanu
+      view: Skatīt domēna bloķēšanu
     email_domain_blocks:
+      add_new: Pievienot jaunu
+      attempts_over_week:
+        one: "%{count} mēģinājums pagājušajā nedēļā"
+        other: "%{count} reģistrēšanās mēģinājumi pagājušajā nedēļā"
+        zero: "%{count} mēģinājumu pagājušajā nedēļā"
+      created_msg: E-pasta domēns ir veiksmīgi bloķēts
+      delete: Dzēst
+      dns:
+        types:
+          mx: MX ieraksts
+      domain: Domēns
+      new:
+        create: Pievienot domēnu
+        resolve: Atrisināt domēnu
+        title: Bloķēt jaunu e-pasta domēnu
+      no_email_domain_block_selected: Neviens e-pasta domēna bloks netika mainīts, jo neviens netika atlasīts
+      resolved_dns_records_hint_html: Domēna nosaukums tiek izmantots tālāk norādītajos MX domēnos, kas galu galā ir atbildīgi par e-pasta pieņemšanu. Bloķējot MX domēnu, tiks bloķēta reģistrēšanās no jebkuras e-pasta adreses, kas izmanto vienu un to pašu MX domēnu, pat ja redzamais domēna nosaukums atšķiras. <strong>Esi uzmanīgs, lai nebloķētu lielākos e-pasta pakalpojumu sniedzējus.</strong>
+      resolved_through_html: Atrisināts, izmantojot %{domain}
       title: Bloķētie e-pasta domēni
+    export_domain_allows:
+      new:
+        title: Importēt domēnu atļaujas
+      no_file: Nav atlasīts neviens fails
+    export_domain_blocks:
+      import:
+        description_html: Tu gatavojies importēt domēna bloku sarakstu. Lūdzu, ļoti rūpīgi pārskati šo sarakstu, it īpaši, ja tu pats neesi to veidojis.
+        existing_relationships_warning: Esošās sekošanas attiecības
+        private_comment_description_html: 'Lai palīdzētu tev izsekot, no kurienes nāk importētie bloki, tiks izveidoti importētie bloki ar šādu privātu komentāru: <q>%{comment}</q>'
+        private_comment_template: Importēts no %{source} %{date}
+        title: Importēt bloķētos domēnus
+      new:
+        title: Importēt bloķētos domēnus
+      no_file: Nav atlasīts neviens fails
     follow_recommendations:
       description_html: "<strong>Sekošana rekomendācijām palīdz jaunajiem lietotājiem ātri atrast interesantu saturu</strong>. Ja lietotājs nav pietiekami mijiedarbojies ar citiem, lai izveidotu personalizētus ieteikumus, ieteicams izmantot šos kontus. Tie tiek pārrēķināti katru dienu, izmantojot vairākus kontus ar visaugstākajām pēdējā laika saistībām un vislielāko vietējo sekotāju skaitu noteiktā valodā."
       language: Valodai
@@ -343,35 +461,75 @@ lv:
       title: Sekošanas rekomendācijas
       unsuppress: Atjaunot sekošanas rekomendāciju
     instances:
+      availability:
+        description_html:
+          one: Ja piegāde uz domēnu neizdodas <strong>%{count} dienu</strong> bez panākumiem, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+          other: Ja piegāde uz domēnu neizdodas <strong>%{count} dažādas dienās</strong>, un tas neizdodas, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+          zero: Ja piegāde uz domēnu neizdodas <strong>%{count} dažādas dienās</strong>, un tas neizdodas, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
+        failure_threshold_reached: Kļūmju slieksnis sasniegts %{date}.
+        failures_recorded:
+          one: Neizdevies mēģinājums %{count} dienā.
+          other: Neizdevušies mēģinājumi %{count} dienās.
+          zero: Neizdevušies mēģinājumi %{count} dienās.
+        no_failures_recorded: Nav reģistrētu kļūdu.
+        title: Pieejamība
+        warning: Pēdējais mēģinājums izveidot savienojumu ar šo serveri ir bijis neveiksmīgs
       back_to_all: Visas
       back_to_limited: Ierobežotās
       back_to_warning: Brīdinājums
       by_domain: Domēns
+      confirm_purge: Vai tiešām vēlies neatgriezeniski izdzēst datus no šī domēna?
+      content_policies:
+        comment: Iekšējā piezīme
+        description_html: Tu vari definēt satura politikas, kas tiks piemērotas visiem kontiem no šī domēna un jebkura tā apakšdomēna.
+        policies:
+          reject_media: Noraidīt medijus
+          reject_reports: Noraidīt ziņojumus
+          silence: Ierobežot
+          suspend: Apturēt
+        policy: Politika
+        reason: Publisks iemesls
+        title: Satura politikas
+      dashboard:
+        instance_accounts_dimension: Visvairāk sekotie konti
+        instance_accounts_measure: saglabātie konti
+        instance_followers_measure: mūsu sekotāji tur
+        instance_follows_measure: viņu sekotāji šeit
+        instance_languages_dimension: Populārākās valodas
+        instance_media_attachments_measure: saglabātie mediju pielikumi
+        instance_reports_measure: ziņojumi par viņiem
+        instance_statuses_measure: saglabātās ziņas
       delivery:
         all: Visas
         clear: Notīrīt piegādes kļūdas
+        failing: Neizdošanās
         restart: Pārstartēt piegādi
         stop: Apturēt piegādi
-        title: Piegāde
         unavailable: Nav pieejams
-        unavailable_message: Piegāde nav iespējama
-        warning: Brīdinājums
       delivery_available: Piegāde ir iespējama
       delivery_error_days: Piegādes kļūdu dienas
       delivery_error_hint: Ja piegāde nav iespējama %{count} dienas, tā tiks automātiski atzīmēta kā nepiegādājama.
+      destroyed_msg: Dati no %{domain} tagad ir gaidīšanas rindā, lai tos drīzumā dzēstu.
       empty: Domēni nav atrasti.
+      known_accounts:
+        one: "%{count} zināms konts"
+        other: "%{count} zināmi konti"
+        zero: "%{count} zināmu kontu"
       moderation:
         all: Visas
         limited: Ierobežotās
         title: Moderācija
       private_comment: Privāts komentārs
       public_comment: Publisks komentārs
+      purge: Iztīrīt
+      purge_description_html: Ja uzskati, ka šis domēns uz visiem laikiem ir bezsaistē, tu vari no savas krātuves dzēst visus konta ierakstus un saistītos datus no šī domēna. Tas var aizņemt kādu laiku.
       title: Federācija
       total_blocked_by_us: Mūsu bloķēta
       total_followed_by_them: Viņiem seko
       total_followed_by_us: Mums seko
       total_reported: Ziņojumi par viņiem
       total_storage: Mediju pielikumi
+      totals_time_period_hint_html: Tālāk redzamajās summās ir iekļauti dati par visu laiku.
     invites:
       deactivate_all: Deaktivēt visu
       filter:
@@ -389,13 +547,156 @@ lv:
         '15778476': 6 mēneši
         '2629746': 1 mēnesis
         '31556952': 1 gads
-        '86400': 1 day
-        '94670856': 3 years
+        '86400': 1 diena
+        '94670856': 3 gadi
+      new:
+        title: Izveidot jaunu IP noteikumu
+      no_ip_block_selected: Neviens IP noteikums netika mainīts, jo netika atlasīts
+      title: IP noteikumi
+    relationships:
+      title: "%{acct} attiecības"
+    relays:
+      add_new: Pievienot jaunu releju
+      delete: Dzēst
+      description_html: "<strong>Federācijas relejs</strong> ir starpniekserveris, kas apmainās ar lielu publisko ziņu apjomu starp serveriem, kas to abonē un publicē. <strong>Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu no federācijas</strong>, pretējā gadījumā vietējiem lietotājiem manuāli jāseko citām personām attālos serveros."
+      disable: Atspējot
+      disabled: Atspējots
+      enable: Iespējot
+      enable_hint: Kad tas būs iespējots, tavs serveris abonēs visas publiskās ziņas no šī releja un sāks tam sūtīt šī servera publiskās ziņas.
+      enabled: Iespējots
+      inbox_url: Releja URL
+      pending: Gaida apstiprinājumu no releja
+      save_and_enable: Saglabāt un iespējot
+      setup: Iestatīt releja savienojumu
+      signatures_not_enabled: Releji nedarbosies pareizi, kamēr ir iespējots drošais režīms vai ierobežotas federācijas režīms
+      status: Statuss
+      title: Releji
+    report_notes:
+      created_msg: Ziņojuma piezīme ir veiksmīgi izveidota!
+      destroyed_msg: Ziņojuma piezīme ir veiksmīgi izdzēsta!
     reports:
+      account:
+        notes:
+          one: "%{count} piezīme"
+          other: "%{count} piezīmes"
+          zero: "%{count} piezīmju"
+      action_log: Auditācijas pieraksti
+      action_taken_by: Veiktā darbība
+      actions:
+        delete_description_html: Raksti, par kurām ziņots, tiks dzēsti, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākos pārkāpumus saistībā ar to pašu kontu.
+        mark_as_sensitive_description_html: Mediju faili ziņojumos, par kuriem ziņots, tiks atzīmēti kā sensitīvi, un tiks reģistrēts brīdinājums, lai palīdzētu tev izvērst turpmākus pārkāpumus saistībā ar to pašu kontu.
+        other_description_html: Skatīt vairāk iespēju kontrolēt konta uzvedību un pielāgot saziņu ar paziņoto kontu.
+        resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
+        silence_description_html: Profils būs redzams tikai tiem, kas jau tam seko vai manuāli apskata, tādējādi ievērojami ierobežojot tā sasniedzamību. Šo izvēli vienmēr var mainīt.
+        suspend_description_html: Profils un viss tā saturs kļūs nepieejami, līdz tas beidzot tiek izdzēsts. Mijiedarbība ar kontu būs neiespējama. Atgriežams 30 dienu laikā.
+      actions_description_html: Izlem, kādas darbības jāveic, lai atrisinātu šo ziņojumu. Ja veiksi sodīšanas darbību pret kontu, par kuru ziņots, tam tiks nosūtīts e-pasta paziņojums, izņemot gadījumus, kad ir atlasīta kategorija <strong>Spam</strong>.
+      add_to_report: Pievienot varāk paziņošanai
+      are_you_sure: Vai esi pārliecināts?
+      assign_to_self: Piešķirt man
+      assigned: Piešķirtais moderators
+      by_target_domain: Ziņotā konta domēns
+      category: Kategorija
+      category_description_html: Iemesls kāpēc šis konts un / vai saturs tika ziņots, tiks minēts saziņā ar paziņoto kontu
+      comment:
+        none: Neviens
+      comment_description_html: 'Lai sniegtu vairāk informācijas, %{name} rakstīja:'
+      created_at: Ziņoti
+      delete_and_resolve: Izdzēst rakstus
+      forwarded: Pārsūtīti
+      forwarded_to: Pārsūtīti %{domain}
+      mark_as_resolved: Atzīmēt kā atrisinātu
+      mark_as_sensitive: Atzīmēt kā sensitīvu
+      mark_as_unresolved: Atzīmēt kā neatrisinātu
+      no_one_assigned: Neviena
+      notes:
+        create: Pievienot piezīmi
+        create_and_resolve: Atrisināt ar piezīmi
+        create_and_unresolve: Atvērt atkārtoti ar piezīmi
+        delete: Dzēst
+        placeholder: Apraksti veiktās darbības vai citus saistītus atjauninājumus...
+        title: Piezīmes
+      notes_description_html: Skati un atstāj piezīmes citiem moderatoriem un sev nākotnei
+      quick_actions_description_html: 'Veic ātro darbību vai ritini uz leju, lai skatītu saturu, par kuru ziņots:'
+      remote_user_placeholder: attālais lietotājs no %{instance}
+      reopen: Atkārtoti atvērt ziņojumu
+      report: 'Ziņojums #%{id}'
+      reported_account: Ziņotais konts
+      reported_by: Ziņoja
+      resolved: Atrisināts
+      resolved_msg: Ziņojums veiksmīgi atrisināts!
+      skip_to_actions: Pāriet uz darbībām
+      status: Statuss
+      statuses: Ziņotais saturs
+      statuses_description_html: Pārkāpuma saturs tiks minēts saziņā ar paziņoto kontu
+      target_origin: Ziņotā konta izcelsme
       title: Ziņojumi
       unassign: Atsaukt
       unresolved: Neatrisinātie
       updated_at: Atjaunināts
+      view_profile: Skatīt profilu
+    roles:
+      add_new: Pievienot lomu
+      assigned_users:
+        one: "%{count} lietotājs"
+        other: "%{count} lietotāji"
+        zero: "%{count} lietotāju"
+      categories:
+        administration: Administrēšana
+        devops: DevOps
+        invites: Uzaicinājumi
+        moderation: Moderācija
+        special: Īpašās
+      delete: Dzēst
+      description_html: Izmantojot <strong>lietotāju lomas</strong>, vari pielāgot, kurām Mastodon funkcijām un apgabaliem var piekļūt tavi lietotāji.
+      edit: Rediģēt lomu '%{name}'
+      everyone: Noklusētās atļaujas
+      everyone_full_description_html: Šī ir <strong>pamata loma</strong>, kas ietekmē <strong>visus lietotājus</strong>, pat tos, kuriem nav piešķirta loma. Visas pārējās lomas manto atļaujas no šīs.
+      permissions_count:
+        one: "%{count} atļauja"
+        other: "%{count} atļaujas"
+        zero: "%{count} atļauju"
+      privileges:
+        administrator: Administrators
+        administrator_description: Lietotāji ar šo atļauju apies visas atļaujas
+        delete_user_data: Dzēst Lietotāja Datus
+        delete_user_data_description: Ļauj lietotājiem bez kavēšanās dzēst citu lietotāju datus
+        invite_users: Uzaicināt Lietotājus
+        invite_users_description: Ļauj lietotājiem uzaicināt jaunus cilvēkus uz šo serveri
+        manage_announcements: Pārvaldīt Paziņojumus
+        manage_announcements_description: Ļauj lietotājiem pārvaldīt paziņojumus serverī
+        manage_appeals: Pārvaldīt Pārsūdzības
+        manage_appeals_description: Ļauj lietotājiem izskatīt apelācijas pret regulēšanas darbībām
+        manage_blocks: Pārvaldīt Bloķus
+        manage_blocks_description: Ļauj lietotājiem bloķēt e-pasta pakalpojumu sniedzējus un IP adreses
+        manage_custom_emojis: Pārvaldīt Pielāgotās Emocijzīmes
+        manage_custom_emojis_description: Ļauj lietotājiem pārvaldīt pielāgotās emocijzīmes serverī
+        manage_federation: Pārvaldīt Federāciju
+        manage_federation_description: Ļauj lietotājiem bloķēt vai atļaut federāciju ar citiem domēniem un kontrolēt piegādi
+        manage_invites: Pārvaldīt Uzaicinājumus
+        manage_invites_description: Ļauj lietotājiem pārlūkot un deaktivizēt uzaicinājuma saites
+        manage_reports: Pārvaldīt Pārskatus
+        manage_reports_description: Ļauj lietotājiem pārskatīt pārskatus un veikt pret tiem regulēšanas darbības
+        manage_roles: Pārvaldīt Lomas
+        manage_roles_description: Ļauj lietotājiem pārvaldīt un piešķirt lomas, kas ir zemākas par viņu lomu
+        manage_rules: Pārvaldīt Noteikumus
+        manage_rules_description: Ļauj lietotājiem mainīt servera noteikumus
+        manage_settings: Pārvaldīt Iestatījumus
+        manage_settings_description: Ļauj lietotājiem mainīt vietnes uzstādījumus
+        manage_taxonomies: Pārvaldīt Taksonomijas
+        manage_taxonomies_description: Ļauj lietotājiem pārskatīt aktuālo saturu un atjaunināt atsauces iestatījumus
+        manage_user_access: Pārvaldīt Lietotāju Piekļuves
+        manage_user_access_description: Ļauj lietotājiem atspējot citu lietotāju divu faktoru autentifikāciju, mainīt savu e-pasta adresi un atiestatīt paroli
+        manage_users: Pārvaldīt Lietotājus
+        manage_users_description: Ļauj lietotājiem skatīt citu lietotāju informāciju un veikt pret viņiem regulēšanas darbības
+        manage_webhooks: Pārvaldīt Tīmekļa Aizķeres
+        manage_webhooks_description: Ļauj lietotājiem iestatīt tīmekļa aizķeres administratīviem pasākumiem
+        view_audit_log: Skatīt Audita Žurnālu
+        view_audit_log_description: Ļauj lietotājiem redzēt serverī veikto administratīvo darbību vēsturi
+        view_dashboard: Skatīt Informācijas Paneli
+        view_dashboard_description: Ļauj lietotājiem piekļūt informācijas panelim un dažādiem rādītājiem
+        view_devops: DevOps
+        view_devops_description: Ļauj lietotājiem piekļūt Sidekiq un pgHero informācijas paneļiem
+      title: Lomas
     rules:
       add_new: Pievienot noteikumu
       delete: Dzēst
@@ -404,84 +705,997 @@ lv:
       empty: Servera noteikumi vēl nav definēti.
       title: Servera noteikumi
     settings:
-      activity_api_enabled:
-        desc_html: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
-        title: Publicējiet apkopotu statistiku par lietotāju darbībām API
-      bootstrap_timeline_accounts:
-        desc_html: Atdaliet vairākus lietotājvārdus ar komatu. Tiks garantēts, ka šie konti tiks parādīti ieteikumos
-        title: Iesaki šos kontus jaunajiem lietotājiem
-      contact_information:
-        email: Lietišķais e-pasts
-        username: Saziņas lietotājvārds
-      custom_css:
-        desc_html: Maini izskatu, izmantojot CSS, kas ielādēta katrā lapā
-        title: Pielāgota CSS
+      about:
+        manage_rules: Pārvaldīt servera nosacījumus
+        preamble: Sniedz padziļinātu informāciju par to, kā serveris tiek darbināts, moderēts un finansēts.
+        rules_hint: Noteikumiem, kas taviem lietotājiem ir jāievēro, ir īpaša sadaļa.
+        title: Par
+      appearance:
+        preamble: Pielāgo Mastodon tīmekļa saskarni.
+        title: Izskats
+      branding:
+        preamble: Tava servera zīmols to atšķir no citiem tīkla serveriem. Šī informācija var tikt parādīta dažādās vidēs, piemēram, Mastodon tīmekļa saskarnē, vietējās lietojumprogrammās, saišu priekšskatījumos citās vietnēs un ziņojumapmaiņas lietotnēs un tā tālāk. Šī iemesla dēļ vislabāk ir saglabāt šo informāciju skaidru, īsu un kodolīgu.
+        title: Zīmola veidošana
+      content_retention:
+        preamble: Kontrolē, kā Mastodon tiek glabāts lietotāju ģenerēts saturs.
+        title: Satura saglabāšana
       default_noindex:
         desc_html: Ietekmē visus lietotājus, kuri paši nav mainījuši šo iestatījumu
         title: Pēc noklusējuma lietotāji būs atteikušies no meklētājprogrammu indeksēšanas
+      discovery:
+        follow_recommendations: Sekotšanas rekomendācijas
+        preamble: Interesanta satura parādīšana palīdz piesaistīt jaunus lietotājus, kuri, iespējams, nepazīst nevienu Mastodon. Kontrolē, kā tavā serverī darbojas dažādi atklāšanas līdzekļi.
+        profile_directory: Profila direktorija
+        public_timelines: Publiskās ziņu lentas
+        title: Atklāt
+        trends: Tendences
       domain_blocks:
         all: Visiem
         disabled: Nevienam
-        title: Rādīt domēnu bloķēšanas
         users: Vietējiem reģistrētiem lietotājiem
-      domain_blocks_rationale:
-        title: Rādīt pamatojumus
-      hero:
-        desc_html: Parādīts pirmajā lapā. Ieteicams vismaz 600x100 pikseļus. Ja tas nav iestatīts, atgriežas servera sīktēlā
-        title: Varoņa attēls
-      mascot:
-        desc_html: Parādīts vairākās lapās. Ieteicams vismaz 293 × 205 pikseļi. Ja tas nav iestatīts, tiek atgriezts noklusējuma talismans
-        title: Talismana attēls
-      peers_api_enabled:
-        desc_html: Domēna vārdi, ar kuriem šis serveris ir saskāries fediversā
-        title: Publicēt API atklāto serveru sarakstu
-      preview_sensitive_media:
-        desc_html: Saites priekšskatījumus citās vietnēs parādīs kā sīktēlu pat tad, ja medijs ir atzīmēts kā sensitīvs
-        title: Parādīt sensitīvos medijus OpenGraph priekšskatījumos
-      profile_directory:
-        desc_html: Atļaut lietotājiem būt atklājamiem
-        title: Iespējot profila direktoriju
       registrations:
-        closed_message:
-          desc_html: Tiek parādīts sākumlapā, kad reģistrācija ir slēgta. Tu vari izmantot HTML tagus
-          title: Paziņojums par slēgtu reģistrāciju
-        deletion:
-          desc_html: Atļaut ikvienam dzēst savu kontu
-          title: Atvērt konta dzēšanu
-        min_invite_role:
-          disabled: Nevienam
-          title: Atļaut uzaicinājumus
-        require_invite_text:
-          desc_html: 'Ja reģistrācijai nepieciešama manuāla apstiprināšana, izdari, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis neobligāts'
-          title: Pieprasīt jauniem lietotājiem ievadīt pievienošanās iemeslu
+        preamble: Kontrolē, kurš var izveidot kontu tavā serverī.
+        title: Reģistrācijas
       registrations_mode:
         modes:
           approved: Reģistrācijai nepieciešams apstiprinājums
           none: Neviens nevar reģistrēties
           open: Jebkurš var reģistrēties
-        title: Reģistrācijas režīms
-      show_known_fediverse_at_about_page:
-        desc_html: Ja šī funkcija ir atspējota, tā ierobežo publisko ziņu lentu, kas ir saistīta ar galveno lapu, lai parādītu tikai vietējo saturu
-        title: Iekļaut federēto saturu neautentificētā publiskā ziņu lentas lapā
-      show_staff_badge:
-        desc_html: Parādiet personāla emblēmu lietotāja lapā
+      title: Servera Iestatījumi
+    site_uploads:
+      delete: Dzēst augšupielādēto failu
+      destroyed_msg: Vietnes augšupielāde ir veiksmīgi izdzēsta!
+    statuses:
+      account: Autors
+      application: Lietotne
+      back_to_account: Atpakaļ uz konta lapu
+      back_to_report: Atpakaļ uz paziņojumu lapu
+      batch:
+        remove_from_report: Noņemt no ziņojuma
+        report: Ziņojums
+      deleted: Dzēstie
+      favourites: Izlase
+      history: Versiju vēsture
+      in_reply_to: Atbildot uz
+      language: Valoda
+      media:
+        title: Multivide
+      metadata: Metadati
+      no_status_selected: Neviena ziņa netika mainīta, jo neviena netika atlasīta
+      open: Atvērt ziņu
+      original_status: Oriģinālā ziņa
+      reblogs: Reblogi
+      status_changed: Ziņa mainīta
+      title: Konta ziņas
+      trending: Tendences
+      visibility: Redzamība
+      with_media: Ar medijiem
+    strikes:
+      actions:
+        delete_statuses: "%{name} izdzēsa %{target} publikācijas"
+        disable: "%{name} iesaldēja %{target} kontu"
+        mark_statuses_as_sensitive: "%{name} atzīmēja %{target} ziņu kā sensitīvu"
+        none: "%{name} nosūtīja brīdinājumu %{target}"
+        sensitive: "%{name} atzīmēja %{target} kontu kā sensitīvu"
+        silence: "%{name} ierobežoja %{target} kontu"
+        suspend: "%{name} apturēja %{target} kontu"
+      appeal_approved: Pārsūdzēts
+      appeal_pending: Apelācija tiek izskatīta
+    system_checks:
+      database_schema_check:
+        message_html: Notiek datubāzu migrācijas. Lūdzu, palaid tās, lai nodrošinātu, ka lietojumprogramma darbojas, kā paredzēts
+      elasticsearch_running_check:
+        message_html: Nevarēja izveidot savienojumu ar Elasticsearch. Lūdzu, pārbaudi, vai tā darbojas, vai atspējo pilna teksta meklēšanu
+      elasticsearch_version_check:
+        message_html: 'Nesaderīga Elasticsearch versija: %{value}'
+        version_comparison: Darbojas Elasticsearch %{running_version}, tomēr ir nepieciešama %{required_version}
+      rules_check:
+        action: Pārvaldīt servera nosacījumus
+        message_html: Tu neesi definējis nevienu servera nosacījumu.
+      sidekiq_process_check:
+        message_html: Rindā(s) %{value} nedarbojas neviens Sidekiq process. Lūdzu, pārskati savu Sidekiq konfigurāciju
+    tags:
+      review: Pārskatīt statusu
+      updated_msg: Tēmtura uzstādījumi ir veiksmīgi atjaunināti
     title: Administrēšana
+    trends:
+      allow: Atļaut
+      approved: Apstiprināts
+      disallow: Neatļaut
+      links:
+        allow: Atļaut saiti
+        allow_provider: Atļaut publicētāju
+        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem tavs serveris redz ziņas. Tas var palīdzēt taviem lietotājiem uzzināt, kas notiek pasaulē. Kamēr tu neapstiprini izdevēju, neviena saite netiek rādīta publiski. Vari arī atļaut vai noraidīt atsevišķas saites.
+        disallow: Neatļaut saiti
+        disallow_provider: Neatļaut publicētāju
+        no_link_selected: Neviena saite netika mainīta, jo neviena netika atlasīta
+        publishers:
+          no_publisher_selected: Neviens publicētājs netika mainīts, jo neviens netika atlasīts
+        shared_by_over_week:
+          one: Pēdējās nedēļas laikā kopīgoja viena persona
+          other: Pēdējās nedēļas laikā kopīgoja %{count} personas
+          zero: Pēdējās nedēļas laikā kopīgoja %{count} personas
+        title: Populārākās saites
+        usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar
+      only_allowed: Tikai atļautās
+      pending_review: Gaida pārskatīšanu
+      preview_card_providers:
+        allowed: Šī publicētāja saites var mainīties
+        description_html: Tie ir domēni, no kuriem tavā serverī bieži tiek koplietotas saites. Saites nebūs publiski pieejamas, ja vien saites domēns netiks apstiprināts. Tavs apstiprinājums (vai noraidījums) attiecas arī uz apakšdomēniem.
+        rejected: Saites no šī publicētāja nebūs tendence
+        title: Publicētāji
+      rejected: Noraidīts
+      statuses:
+        allow: Atļaut publicēt
+        allow_account: Atļaut autoru
+        description_html: Šīs ir ziņas, par kurām tavs serveris zina un kuras pašlaik tiek koplietotas un pašlaik ir daudz izlasē. Tas var palīdzēt taviem jaunajiem un atkārtotiem lietotājiem atrast vairāk cilvēku, kam sekot. Neviena ziņa netiek publiski rādīta, kamēr neesi apstiprinājis autoru un autors atļauj savu kontu ieteikt citiem. Vari arī atļaut vai noraidīt atsevišķas ziņas.
+        disallow: Neatļaut publicēt
+        disallow_account: Neatļaut autoru
+        no_status_selected: Neviena populāra ziņa netika mainīta, jo neviena netika atlasīta
+        not_discoverable: Autors nav izvēlējies būt atklājams
+        shared_by:
+          one: Vienreiz kopīgots vai pievienots izlasei
+          other: Kopīgots un pievienots izlasei %{friendly_count} reizes
+          zero: "%{friendly_count} reižu kopīgots vai pievienots izlasei"
+        title: Populārākās ziņas
+      tags:
+        current_score: Pašreizējais rezultāts %{score}
+        dashboard:
+          tag_accounts_measure: unikāli lietojumi
+          tag_languages_dimension: Populārākās valodas
+          tag_servers_dimension: Populārākie serveri
+          tag_servers_measure: dažādi serveri
+          tag_uses_measure: lietojumi pavisam
+        description_html: Šīs ir atsauces, kas pašlaik tiek rādītas daudzās ziņās, kuras redz tavs serveris. Tas var palīdzēt taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviena atsauce netiek rādīta publiski, kamēr tu neesi tās apstiprinājis.
+        listable: Var tikt ieteikts
+        no_tag_selected: Neviena atzīme netika mainīta, jo neviena netika atlasīta
+        not_listable: Nevar tikt ieteikts
+        not_trendable: Neparādīsies pie tendencēm
+        not_usable: Nevar tikt lietots
+        peaked_on_and_decaying: Sasniedza maksimumu %{date}, tagad samazinās
+        title: Populārākie tēmturi
+        trendable: Var parādīsies pie tendencēm
+        trending_rank: 'Populārākie #%{rank}'
+        usable: Var tikt lietots
+        usage_comparison: Šodien lietots %{today} reizes, salīdzinot ar %{yesterday} vakar
+        used_by_over_week:
+          one: Pēdējās nedēļas laikā izmantoja viens cilvēks
+          other: Pēdējās nedēļas laikā izmantoja %{count} personas
+          zero: Pēdējās nedēļas laikā izmantoja %{count} personas
+      title: Tendences
+      trending: Tendences
     warning_presets:
       add_new: Pievienot jaunu
       delete: Dzēst
       edit_preset: Labot iepriekš iestatītus brīdinājumus
       empty: Tu vēl neesi definējis iepriekš iestatītos brīdinājumus.
       title: Pārvaldīt brīdinājuma iestatījumus
+    webhooks:
+      add_new: Pievienot galapunktu
+      delete: Dzēst
+      description_html: Izmantojot <strong>tīmekļa aizķeri</strong>, Mastodon var nosūtīt jūsu lietojumprogrammai <strong>reāllaika paziņojumus</strong> par izvēlētajiem notikumiem, lai tava lietojumprogramma varētu <strong>automātiski izraisīt reakcijas</strong>.
+      disable: Atspējot
+      disabled: Atspējots
+      edit: Rediģēt galapunktu
+      empty: Tev vēl nav konfigurēts neviens tīmekļa aizķeres galapunkts.
+      enable: Iespējot
+      enabled: Aktīvie
+      enabled_events:
+        one: 1 iespējots notikums
+        other: "%{count} iespējoti notikumi"
+        zero: "%{count} iespējotu notikumu"
+      events: Notikumi
+      new: Jauna tīmekļa aizķere
+      rotate_secret: Pagriezt noslēpumu
+      secret: Paraksta noslēpums
+      status: Statuss
+      title: Tīmekļa āķi
+      webhook: Tīmekļa āķis
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: lai izdzēstu viņu ierakstus
+        disable: lai iesaldētu viņu kontu
+        mark_statuses_as_sensitive: lai atzīmētu viņu ziņas kā sensitīvas
+        none: brīdinājums
+        sensitive: lai atzīmētu viņu kontu kā sensitīvu
+        silence: lai ierobežotu viņu kontu
+        suspend: lai apturētu viņu kontu
+      body: "%{target} pārsūdzēja %{action_taken_by} moderēšanas lēmumu no %{date}, kas bija %{type}. Viņi rakstīja:"
+      next_steps: Varat apstiprināt apelāciju, lai atsauktu regulēšanas lēmumu, vai ignorēt to.
+      subject: "%{username} pārsūdz moderēšanas lēmumu par %{instance}"
     new_pending_account:
       body: Sīkāka informācija par jauno kontu ir sniegta zemāk. Tu vari apstiprināt vai noraidīt šo pieteikumu.
+      subject: Jauns konts pārskatīšanai %{instance} (%{username})
+    new_report:
+      body: "%{reporter} ziņoja par %{target}"
+      body_remote: Kāds no %{domain} ziņoja par %{target}
+      subject: Jauns ziņojums par %{instance} (#%{id})
+    new_trends:
+      body: 'Tālāk norādītie vienumi ir jāpārskata, lai tos varētu parādīt publiski:'
+      new_trending_links:
+        title: Populārākās saites
+      new_trending_statuses:
+        title: Populārākās ziņas
+      new_trending_tags:
+        no_approved_tags: Pašlaik nav apstiprinātu tendenču tēmturu.
+        requirements: 'Jebkurš no šiem kandidātiem varētu pārspēt #%{rank} apstiprināto populāro tēmturi, kas pašlaik ir #%{lowest_tag_name} ar rezultātu %{lowest_tag_score}.'
+        title: Populārākie tēmturi
+      subject: Tiek pārskatītas jaunas tendences %{instance}
+  aliases:
+    add_new: Izveidot aizstājvārdu
+    created_msg: Veiksmīgi izveidots jauns aizstājvārds. Tagad vari sākt pārvietošanu no vecā konta.
+    deleted_msg: Aizstājvārds tika veiksmīgi noņemts. Pāreja no šī konta uz šo vairs nebūs iespējama.
+    empty: Tev nav aizstājvārdu.
+    hint_html: Ja vēlies pāriet no cita konta uz šo, šeit vari izveidot aizstājvārdu, kas ir nepieciešams, lai varētu turpināt sekotāju pārvietošanu no vecā konta uz šo. Šī darbība pati par sevi ir <strong>nekaitīga un atgriezeniska</strong>. <strong>Konta migrācija tiek sākta no vecā konta</strong>.
+    remove: Atsaistīt aizstājvārdu
+  appearance:
+    advanced_web_interface: Paplašinātā tīmekļa saskarne
+    advanced_web_interface_hint: 'Ja vēlies izmantot visu ekrāna platumu, uzlabotā tīmekļa saskarne ļauj konfigurēt daudzas dažādas kolonnas, lai vienlaikus redzētu tik daudz informācijas, cik vēlies: Sākums, paziņojumi, apvienotā ziņu lenta, neierobežots skaits sarakstu un tēmturu.'
+    animations_and_accessibility: Animācijas un pieejamība
+    confirmation_dialogs: Apstiprināšanas dialogi
+    discovery: Atklāšana
+    localization:
+      body: Mastodon ir tulkojuši brīvprātīgie.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Ikviens var piedalīties.
+    sensitive_content: Sensitīvs saturs
+    toot_layout: Ziņas izskats
+  application_mailer:
+    notification_preferences: Mainīt e-pasta uztādījumus
+    salutation: "%{name},"
+    settings: 'Mainīt e-pasta uztādījumus: %{link}'
+    view: 'Skatījums:'
+    view_profile: Skatīt profilu
+    view_status: Skatīt ziņu
+  applications:
+    created: Lietojumprogramma ir veiksmīgi izveidota
+    destroyed: Lietojumprogramma ir veiksmīgi dzēsta
+    regenerate_token: Atjaunot piekļuves marķieri
+    token_regenerated: Piekļuves marķieris veiksmīgi atjaunots
+    warning: Esi ļoti uzmanīgs ar šiem datiem. Nekad nedalies ne ar vienu ar tiem!
+    your_token: Tavs piekļuves marķieris
+  auth:
+    apply_for_account: Pieprasīt kontu
+    change_password: Parole
+    delete_account: Dzēst kontu
+    delete_account_html: Ja vēlies dzēst savu kontu, tu vari <a href="%{path}">turpināt šeit</a>. Tev tiks lūgts apstiprinājums.
+    description:
+      prefix_invited_by_user: "@%{name} aicina tevi pievienoties šim Mastodon serverim!"
+      prefix_sign_up: Reģistrējies Mastodon jau šodien!
+      suffix: Izmantojot kontu, tu varēsi sekot cilvēkiem, publicēt atjauninājumus un apmainīties ar ziņojumiem ar lietotājiem no jebkura Mastodon servera un daudz ko citu!
+    didnt_get_confirmation: Vai nesaņēmi apstiprināšanas norādījumus?
+    dont_have_your_security_key: Vai tev nav drošības atslēgas?
+    forgot_password: Aizmirsi paroli?
+    invalid_reset_password_token: Paroles atiestatīšanas pilnvara nav derīga, vai tai ir beidzies derīgums. Lūdzu, pieprasi jaunu.
+    link_to_otp: Ievadi divfaktoru kodu no tālruņa vai atkopšanas kodu
+    link_to_webauth: Lieto savu drošības atslēgas iekārtu
+    log_in_with: Pieslēgties ar
+    login: Pieteikties
+    logout: Iziet
+    migrate_account: Pāriešana uz citu kontu
+    migrate_account_html: Ja vēlies novirzīt šo kontu uz citu, tu vari <a href="%{path}">to konfigurēt šeit</a>.
+    or_log_in_with: Vai piesakies ar
+    privacy_policy_agreement_html: Esmu izlasījis un piekrītu <a href="%{privacy_policy_path}" target="_blank">privātuma politikai</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Reģistrēties
+    registration_closed: "%{instance} nepieņem jaunus dalībniekus"
+    resend_confirmation: Atkārtoti nosūtīt apstiprinājuma norādījumus
+    reset_password: Atiestatīt paroli
+    rules:
+      preamble: Tos iestata un ievieš %{domain} moderatori.
+      title: Daži pamatnoteikumi.
+    security: Drošība
+    set_new_password: Iestatīt jaunu paroli
+    setup:
+      email_below_hint_html: Ja zemāk norādītā e-pasta adrese ir nepareiza, vari to nomainīt šeit un saņemt jaunu apstiprinājuma e-pastu.
+      email_settings_hint_html: Apstiprinājuma e-pasts tika nosūtīts uz %{email}. Ja šī e-pasta adrese nav pareiza, vari to nomainīt konta iestatījumos.
+      title: Iestatīt
+    sign_in:
+      preamble_html: Pierakstieties ar saviem <strong>%{domain}</strong> akreditācijas datiem. Ja jūsu konts ir mitināts citā serverī, jūs nevarēsit pieteikties šeit.
+      title: Pierakstīties %{domain}
+    sign_up:
+      preamble: Izmantojot kontu šajā Mastodon serverī, tu varēsi sekot jebkurai citai personai tīklā neatkarīgi no tā, kur tiek mitināts viņas konts.
+      title: Atļauj tevi iestatīt %{domain}.
+    status:
+      account_status: Konta statuss
+      confirming: Gaida e-pasta apstiprinājuma pabeigšanu.
+      functional: Tavs konts ir pilnībā darboties spējīgs.
+      pending: Tavu pieteikumu gaida mūsu darbinieku izskatīšana. Tas var aizņemt kādu laiku. Ja tavs pieteikums tiks apstiprināts, tu saņemsi e-pastu.
+      redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
+      view_strikes: Skati iepriekšējos brīdinājumus par savu kontu
+    too_fast: Veidlapa ir iesniegta pārāk ātri, mēģini vēlreiz.
+    use_security_key: Lietot drošības atslēgu
+  authorize_follow:
+    already_following: Tu jau seko šim kontam
+    already_requested: Tu jau esi nosūtījis sekošanas pieteikumu šim kontam
+    error: Diemžēl, meklējot attālināto kontu, radās kļūda
+    follow: Sekot
+    follow_request: 'Tu esi nosūtījis sekošanas pieteikumu:'
+    following: 'Veiksmīgi! Tu tagad seko:'
+    post_follow:
+      close: Vai vienkārši aizver šo logu.
+      return: Parādīt lietotāja profilu
+      web: Doties uz tīmekli
+    title: Seko %{acct}
+  challenge:
+    confirm: Turpināt
+    hint_html: "<strong>Padoms:</strong> Nākamās stundas laikā mēs tev vairs neprasīsim paroli."
+    invalid_password: Nepareiza parole
+    prompt: Lai turpinātu, apstiprini paroli
+  crypto:
+    errors:
+      invalid_key: nav derīga Ed25519 vai Curve25519 atslēga
+      invalid_signature: nav derīgs Ed25519 paraksts
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}st"
+      about_x_months: "%{count}mēn"
+      about_x_years: "%{count}g"
+      almost_x_years: "%{count}g"
+      half_a_minute: Tikko
+      less_than_x_minutes: "%{count}min"
+      less_than_x_seconds: Tikko
+      over_x_years: "%{count}g"
+      x_days: "%{count}d"
+      x_minutes: "%{count}min"
+      x_months: "%{count}mēn"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: Tevis ievadītā informācija nebija pareiza
+    confirm_password: Ievadi savu pašreizējo paroli, lai pārbaudītu savu identitāti
+    confirm_username: Ievadi savu lietotājvārdu, lai apstiprinātu procedūru
+    proceed: Dzēst kontu
+    success_msg: Tavs konts tika veiksmīgi dzēsts
+    warning:
+      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      caches: Citu serveru kešatmiņā saglabātais saturs var saglabāties
+      data_removal: Tavas ziņas un citi dati tiks neatgriezeniski noņemti
+      email_change_html: Tu vari <a href="%{path}">mainīt savu e-pasta adresi</a>, neizdzēšot savu kontu
+      email_contact_html: Ja tas joprojām nav saņemts, tu vari nosūtīt e-pastu <a href="mailto:%{email}">%{email}</a> lai saņemtu palīdzību
+      email_reconfirmation_html: Ja tu nesaņem apstiprinājuma e-pastu, tu vari <a href="%{path}">pieprsīt to vēlreiz</a>
+      irreversible: Tu nevarēsi atjaunot vai atkārtoti aktivizēt savu kontu
+      more_details_html: Plašāku informāciju skatīt <a href="%{terms_path}">privātuma politika</a>.
+      username_available: Tavs lietotājvārds atkal būs pieejams
+      username_unavailable: Tavs lietotājvārds paliks nepieejams
+  disputes:
+    strikes:
+      action_taken: Veiktā darbība
+      appeal: Apelācija
+      appeal_approved: Šis brīdinājums ir veiksmīgi pārsūdzēts un vairs nav spēkā
+      appeal_rejected: Apelācija ir noraidīta
+      appeal_submitted_at: Apelācija iesniegta
+      appealed_msg: Jūsu apelācija ir iesniegta. Ja tā tiks apstiprināta, jums tiks paziņots.
+      appeals:
+        submit: Iesniegt apelāciju
+      approve_appeal: Apstiprināt apelāciju
+      associated_report: Saistītais ziņojums
+      created_at: Datēts
+      description_html: Šīs ir darbības, kas veiktas pret tavu kontu, un brīdinājumi, ko tev ir nosūtījuši %{instance} darbinieki.
+      recipient: Adresēts
+      reject_appeal: Noraidīt apelāciju
+      status: 'Publikācija #%{id}'
+      status_removed: Publikācija jau ir noņemta no sistēmas
+      title: "%{action} kopš %{date}"
+      title_actions:
+        delete_statuses: Ziņas noņemšana
+        disable: Konta iesaldēšana
+        mark_statuses_as_sensitive: Ziņu atzīmēšana kā sensitīvas
+        none: Brīdinājums
+        sensitive: Konta atzīmēšana kā sensitīvs
+        silence: Konta ierobežošana
+        suspend: Konta apturēšana
+      your_appeal_approved: Jūsu apelācija ir apstiprināta
+      your_appeal_pending: Jūs esat iesniedzis apelāciju
+      your_appeal_rejected: Jūsu apelācija ir noraidīta
+  domain_validator:
+    invalid_domain: nav derīgs domēna nosaukums
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '422': 
-    '429': Too many requests
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '400': Tevis iesniegtais pieprasījums bija nederīgs vai nepareizi izveidots.
+    '403': Tev nav atļauts aplūkot šo lapu.
+    '404': Tevis meklētās lapas šeit nav.
+    '406': Šī lapa nav pieejama pieprasītajā formātā.
+    '410': Tevis meklētā lapa šeit vairs nepastāv.
+    '422':
+      content: Drošības pārbaude neizdevās. Vai tu bloķē sīkfailus?
+      title: Drošības pārbaude neizdevās
+    '429': Pārāk daudz pieprasījumu
+    '500':
+      content: Atvaino, bet kaut kas mūsu pusē nogāja greizi.
+      title: Šī lapa nav pareiza
+    '503': Lapu nevarēja apkalpot īslaicīgas servera kļūmes dēļ.
+    noscript_html: Lai izmantotu Mastodon web lietojumu, lūdzu, iespējo JavaScript. Vai arī izmēģini kādu no <a href="%{apps_path}">vietējām lietotnēm</a> Mastodon savai platformai.
+  existing_username_validator:
+    not_found: nevarēja atrast lokālo lietotāju ar šādu lietotājvārdu
+    not_found_multiple: nevarēja atrast %{usernames}
+  exports:
+    archive_takeout:
+      date: Dati
+      download: Lejupielādē savu arhīvu
+      hint_html: Tu vari pieprasīt savu <strong>ziņu un augšupielādēto mediju</strong> arhīvu. Eksportētie dati būs ActivityPub formātā, ko varēs nolasīt ar jebkuru saderīgu programmatūru. Tu vari pieprasīt arhīvu ik pēc 7 dienām.
+      in_progress: Notiek tava arhīva apkopošana...
+      request: Pieprasi savu arhīvu
+      size: Izmērs
+    blocks: Bloķētie konti
+    bookmarks: Grāmatzīmes
+    csv: CSV
+    domain_blocks: Bloķētie domēni
+    lists: Saraksti
+    mutes: Apklusinātie konti
+    storage: Mediju krātuve
+  featured_tags:
+    add_new: Pievienot jaunu
+    errors:
+      limit: Tu jau esi piedāvājis maksimālo tēmturu skaitu
+    hint_html: "<strong>Kas ir piedāvātie tēmturi?</strong> Tie ir redzami tavā publiskajā profilā un ļauj cilvēkiem pārlūkot tavas publiskās ziņas tieši zem šiem tēmturiem. Tie ir lielisks līdzeklis radošu darbu vai ilgtermiņa projektu izsekošanai."
+  filters:
+    contexts:
+      account: Profili
+      home: Sākums un saraksti
+      notifications: Paziņojumi
+      public: Publiskās ziņu lentas
+      thread: Sarunas
+    edit:
+      add_keyword: Pievienot atslēgvārdu
+      keywords: Atslēgvārdi
+      statuses: Individuālās ziņas
+      statuses_hint_html: Šis filtrs attiecas uz atsevišķām ziņām neatkarīgi no tā, vai tās atbilst tālāk norādītajiem atslēgvārdiem. <a href="%{path}">Pārskatīt vai noņemt ziņas no filtra</a>.
+      title: Rediģēt filtru
+    errors:
+      deprecated_api_multiple_keywords: Šos parametrus šajā lietojumprogrammā nevar mainīt, jo tie attiecas uz vairāk nekā vienu filtra atslēgvārdu. Izmanto jaunāku lietojumprogrammu vai tīmekļa saskarni.
+      invalid_context: Nav, vai piegādāts nederīgs konteksts
+    index:
+      contexts: Filtri %{contexts}
+      delete: Dzēst
+      empty: Tev nav filtru.
+      expires_in: Beidzas %{distance}
+      expires_on: Beidzas %{date}
+      keywords:
+        one: "%{count} atsēgvārds"
+        other: "%{count} atslēgvārdi"
+        zero: "%{count} atslēgvārdu"
+      statuses:
+        one: "%{count} ziņa"
+        other: "%{count} ziņas"
+        zero: "%{count} ziņu"
+      statuses_long:
+        one: paslēpta %{count} individuālā ziņa
+        other: slēptas %{count} individuālās ziņas
+        zero: "%{count} paslēptu ziņu"
+      title: Filtri
+    new:
+      save: Saglabāt jauno filtru
+      title: Pievienot jaunu filtru
+    statuses:
+      back_to_filter: Atpakaļ pie filtra
+      batch:
+        remove: Noņemt no filtra
+      index:
+        hint: Šis filtrs attiecas uz atsevišķu ziņu atlasi neatkarīgi no citiem kritērijiem. Šim filtram tu vari pievienot vairāk ziņu, izmantojot tīmekļa saskarni.
+        title: Filtrētās ziņas
+  footer:
+    trending_now: Šobrīd tendences
+  generic:
+    all: Visi
+    all_items_on_page_selected_html:
+      one: Šajā lapā ir atlasīts <strong>%{count}</strong> vienums.
+      other: Šajā lapā ir atlasīti <strong>%{count}</strong> vienumi.
+      zero: Šajā lapā ir atlasīts <strong>%{count}</strong> vienumu.
+    all_matching_items_selected_html:
+      one: Atlasīts <strong>%{count}</strong> vienums, kas atbilst tavam meklēšanas vaicājumam.
+      other: Atlasīti visi <strong>%{count}</strong> vienumi, kas atbilst tavam meklēšanas vaicājumam.
+      zero: Atlasīts <strong>%{count}</strong> vienumu, kas atbilst tavam meklēšanas vaicājumam.
+    changes_saved_msg: Izmaiņas veiksmīgi saglabātas!
+    copy: Kopēt
+    delete: Dzēst
+    deselect: Atcelt visu atlasi
+    none: Neviens
+    order_by: Kārtot pēc
+    save_changes: Saglabāt izmaiņas
+    select_all_matching_items:
+      one: Atlasi %{count} vienumu, kas atbilst tavam meklēšanas vaicājumam.
+      other: Atlasi visus %{count} vienumus, kas atbilst tavam meklēšanas vaicājumam.
+      zero: Atlasi %{count} vienumu, kas atbilst tavam meklēšanas vaicājumam.
+    today: šodien
+    validation_errors:
+      one: Kaut kas vēl nav īsti kārtībā! Lūdzu, pārskati zemāk norādīto kļūdu
+      other: Kaut kas vēl nav īsti kārtībā! Lūdzu, pārskati %{count} kļūdas zemāk
+      zero: "%{count} kļūdu"
+  html_validator:
+    invalid_markup: 'satur nederīgu HTML marķējumu: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Nederīgs CSV fails. Kļūda: %{error}'
+      over_rows_processing_limit: satur vairāk, nekā %{count} rindas
+    modes:
+      merge: Apvienot
+      merge_long: Saglabāt esošos ierakstus un pievienot jaunus
+      overwrite: Pārrakstīt
+      overwrite_long: Nomainīt pašreizējos ierakstus ar jauniem
+    preface: Tu vari importēt datus, kurus esi eksportējis no cita servera, piemēram, to personu sarakstu, kurām tu seko vai kuras bloķē.
+    success: Tavi dati tika veiksmīgi augšupielādēti un tiks apstrādāti noteiktajā laikā
+    types:
+      blocking: Bloķēšanas saraksts
+      bookmarks: Grāmatzīmes
+      domain_blocking: Bloķēto domēnu saraksts
+      following: Sekojamo lietotāju saraksts
+      muting: Apklusināto lietotāju saraksts
+    upload: Augšupielādēt
+  invites:
+    delete: Deaktivizēt
+    expired: Beigušies
+    expires_in:
+      '1800': 30 minūtes
+      '21600': 6 stundas
+      '3600': 1 stunda
+      '43200': 12 stundas
+      '604800': 1 nedēļa
+      '86400': 1 diena
+    expires_in_prompt: Nekad
+    generate: Ģenerēt uzaicinājuma saiti
+    invited_by: 'Tevi uzaicināja:'
+    max_uses:
+      one: 1 lietojums
+      other: "%{count} lietojumi"
+      zero: "%{count} lietojumu"
+    max_uses_prompt: Nav ierobežojuma
+    prompt: Izveido un kopīgo saites ar citiem, lai piešķirtu piekļuvi šim serverim
+    table:
+      expires_at: Beidzas
+      uses: Lieto
+    title: Uzaicināt cilvēkus
+  lists:
+    errors:
+      limit: Esi sasniedzis maksimālo sarakstu skaitu
+  login_activities:
+    authentication_methods:
+      otp: divfaktoru autentifikācijas lietotne
+      password: parole
+      sign_in_token: e-pasta drošības kods
+      webauthn: drošības atslēgas
+    description_html: Ja pamani darbības, kuras tu neatpazīsti, apsver iespēju nomainīt savu paroli un iespējot divfaktoru autentifikāciju.
+    empty: Nav pieejama autentifikācijas vēsture
+    failed_sign_in_html: Neizdevies pierakstīšanās mēģinājums ar %{method} no %{ip} (%{browser})
+    successful_sign_in_html: Veiksmīga pierakstīšanās ar %{method} no %{ip} (%{browser})
+    title: Autentifikācijas vēsture
+  media_attachments:
+    validations:
+      images_and_video: Nevar pievienot videoklipu tādai ziņai, kura jau satur attēlus
+      not_ready: Nevar pievienot failus, kuru apstrāde nav pabeigta. Pēc brīža mēģini vēlreiz!
+      too_many: Nevar pievienot vairāk kā 4 failus
+  migrations:
+    acct: Pārcēlās uz
+    cancel: Atcelt novirzīšanu
+    cancel_explanation: Atceļot novirzīšanu, tavs pašreizējais konts tiks atkārtoti aktivizēts, taču netiks atgriezti sekotāji, kas ir pārvietoti uz šo kontu.
+    cancelled_msg: Novirzīšana sekmīgi atcelta.
+    errors:
+      already_moved: ir tas pats konts, uz kuru jau esi pārcēlies
+      missing_also_known_as: nav šī konta aizstājvārds
+      move_to_self: nevar būt šis pats konts
+      not_found: nevarēja atrast
+      on_cooldown: Tu esi atpūtā
+    followers_count: Sekotāji pārvietošanās brīdī
+    incoming_migrations: Pārnākšana no cita konta
+    incoming_migrations_html: Lai pārnāktu no cita konta uz šo, vispirms tev <a href="%{path}">jāizveido konta aizstājvārds</a>.
+    moved_msg: Tavs konts tagad tiek novirzīts uz %{acct}, un tavi sekotāji tiek pārvietoti.
+    not_redirecting: Tavs konts pašlaik netiek novirzīts uz jebkādu citu kontu.
+    on_cooldown: Tu nesen migrēji savu kontu. Šī funkcija atkal būs pieejama pēc %{count} dienām.
+    past_migrations: Pagātnes migrācijas
+    proceed_with_move: Pārvietot sekotājus
+    redirected_msg: Tavs konts tagad tiek novirzīts uz %{acct}.
+    redirecting_to: Tavs konts tiek novirzīts uz %{acct}.
+    set_redirect: Iestatīt novirzīšanu
+    warning:
+      backreference_required: Jaunais konts vispirms ir jākonfigurē, lai tas atsauktos uz šo kontu
+      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      cooldown: Pēc pārcelšanās ir gaidīšanas periods, kura laikā tu vairs nevarēsi pārvietoties
+      disabled_account: Tavs pašreizējais konts pēc tam nebūs pilnībā lietojams. Tomēr tev būs piekļuve datu eksportēšanai, kā arī atkārtotai aktivizēšanai.
+      followers: Veicot šo darbību, visi sekotāji tiks pārvietoti no pašreizējā konta uz jauno kontu
+      only_redirect_html: Citādāk tu vari arī <a href="%{path}">savā profilā ievietot tikai novirzīšanu</a>.
+      other_data: Nekādi citi dati netiks automātiski pārvietoti
+      redirect: Tava pašreizējā konta profils tiks atjaunināts ar novirzīšanas paziņojumu un tiks izslēgts no meklēšanas
+  moderation:
+    title: Moderācija
+  move_handler:
+    carry_blocks_over_text: Šis lietotājs pārcēlās no %{acct}, kuru tu biji bloķējis.
+    carry_mutes_over_text: Šis lietotājs pārcēlās no %{acct}, kuru tu biji apklusinājis.
+    copy_account_note_text: 'Šis lietotājs pārcēlās no %{acct}, šeit bija tavas iepriekšējās piezīmes par viņu:'
+  navigation:
+    toggle_menu: Pārslēgt izvēlni
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} iesniedza ziņojumu"
+      sign_up:
+        subject: "%{name} ir pierakstījies"
+    favourite:
+      body: 'Tavu ziņu izlasei pievienoja %{name}:'
+      subject: "%{name} pievienoja tavu ziņu izlasei"
+      title: Jauns izcēlums
+    follow:
+      body: "%{name} tagad tev seko!"
+      subject: "%{name} tagad tev seko"
+      title: Jauns sekotājs
+    follow_request:
+      action: Pārvaldīt sekošanas pieprasījumus
+      body: "%{name} vēlas tev sekot"
+      subject: 'Gaidošs sekotājs: %{name}'
+      title: Jauns sekotāja pieprasījums
+    mention:
+      action: Atbildēt
+      body: 'Tevi pieminēja %{name}:'
+      subject: Tevi pieminēja %{name}
+      title: Jauna pieminēšana
+    poll:
+      subject: "%{name} aptauja ir beigusies"
+    reblog:
+      body: 'Tavu ziņu pastiprināja %{name}:'
+      subject: "%{name} pastiprināja tavu ziņu"
+      title: Jauns pastiprinājums
+    status:
+      subject: "%{name} tikko publicēja"
+    update:
+      subject: "%{name} rediģējis rakstu"
+  notifications:
+    email_events: E-pasta paziņojumu notikumi
+    email_events_hint: 'Atlasi notikumus, par kuriem vēlies saņemt paziņojumus:'
+    other_settings: Citu paziņojumu iestatījumi
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Lai apstiprinātu, ievadi autentifikācijas lietotnes ģenerēto kodu
+    description_html: Ja iespējosi <strong>divfaktoru autentifikāciju</strong>, izmantojot autentifikatora lietotni, lai pieteiktos, tev būs nepieciešams tālrunis, kas ģenerēs ievadāmos marķierus.
+    enable: Iespējot
+    instructions_html: "<strong>Skenē šo QR kodu Google Authenticator vai līdzīgā TOTP lietotnē savā tālrunī</strong>. No šī brīža šī lietotne ģenerēs marķierus, kas tev būs jāievada, piesakoties."
+    manual_instructions: 'Ja nevari noskenēt QR kodu un tas ir jāievada manuāli, šeit ir noslēpums vienkāršā tekstā:'
+    setup: Iestatīt
+    wrong_code: Ievadītais kods nebija derīgs! Vai servera laiks un ierīces laiks ir pareizs?
+  pagination:
+    newer: Jaunāks
+    next: Nākamais
+    older: Vecāks
+    prev: Iepr
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Šajā aptaujā tu esi jau balsojis
+      duplicate_options: satur dublētus vienumus
+      duration_too_long: ir pārāk tālu nākotnē
+      duration_too_short: ir par agru
+      expired: Aptauja jau ir beigusies
+      invalid_choice: Izvēlētā balsošanas iespēja nepastāv
+      over_character_limit: katrs nedrīkst būt garāks par %{max} rakstzīmēm
+      too_few_options: jābūt vairāk nekā vienam vienumam
+      too_many_options: nevar saturēt vairāk par %{max} vienumiem
+  preferences:
+    other: Citi
+    posting_defaults: Publicēšanas noklusējuma iestatījumi
+    public_timelines: Publiskās ziņu lentas
+  privacy_policy:
+    title: Privātuma Politika
+  reactions:
+    errors:
+      limit_reached: Sasniegts dažādu reakciju limits
+      unrecognized_emoji: nav atpazīta emocijzīme
+  relationships:
+    activity: Konta aktivitāte
+    dormant: Snaudošie
+    follow_selected_followers: Sekot atlasītajiem sekotājiem
+    followers: Sekotāji
+    following: Seko
+    invited: Uzaicinātie
+    last_active: Pēdējā aktivitāte
+    most_recent: Jaunākais
+    moved: Pārvietots
+    mutual: Savstarpējs
+    primary: Primārais
+    relationship: Attiecības
+    remove_selected_domains: Noņemt visus sekotājus no atlasītajiem domēniem
+    remove_selected_followers: Noņemt atlasītos sekotājus
+    remove_selected_follows: Pārtraukt sekošanu atlasītajiem lietotājiem
+    status: Konta statuss
+  remote_follow:
+    missing_resource: Nevarēja atrast tavam kontam nepieciešamo novirzīšanas URL
+  reports:
+    errors:
+      invalid_rules: neatsaucas uz derīgiem noteikumiem
+  rss:
+    content_warning: 'Satura brīdinājums:'
+    descriptions:
+      account: Publiskas ziņas no @%{acct}
+      tag: 'Publiskas ziņas ar atzīmi #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tu esi pārsniedzis šodien ieplānoto %{limit} ziņu ierobežojumu
+    over_total_limit: Tu esi pārsniedzis ieplānoto %{limit} ziņu ierobežojumu
+    too_soon: Ieplānotajam datumam ir jābūt nākotnē
+  sessions:
+    activity: Pēdējā aktivitāte
+    browser: Pārlūks
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Nezināms pārlūks
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Pašreizējā sesija
+    description: "%{browser} uz %{platform}"
+    explanation: Šīs ir tīmekļa pārlūkprogrammas, kurās pašlaik esi pieteicies savā Mastodon kontā.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: nezināma platforma
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Atsaukt
+    revoke_success: Sesija veiksmīgi atsaukta
+    title: Sesijas
+    view_authentication_history: Skatīt sava konta autentifikācijas vēsturi
+  settings:
+    account: Konts
+    account_settings: Konta iestatījumi
+    aliases: Konta aizstājvārdi
+    appearance: Izskats
+    authorized_apps: Autorizētās lietotnes
+    back: Atgriezties Mastodon
+    delete: Konta dzēšana
+    development: Izstrāde
+    edit_profile: Rediģēt profilu
+    export: Datu eksports
+    featured_tags: Piedāvātie tēmturi
+    import: Imports
+    import_and_export: Imports un eksports
+    migrate: Konta migrācija
+    notifications: Paziņojumi
+    preferences: Iestatījumi
+    profile: Profils
+    relationships: Sekojamie un sekotāji
+    statuses_cleanup: Automātiska ziņu dzēšana
+    strikes: Moderācijas aizrādījumi
+    two_factor_authentication: Divfaktoru Aut
+    webauthn_authentication: Drošības atslēgas
+  statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audio"
+        zero: "%{count} audio"
+      description: 'Pievienots: %{attached}'
+      image:
+        one: "%{count} attēls"
+        other: "%{count} attēli"
+        zero: "%{count} attēlu"
+      video:
+        one: "%{count} video"
+        other: "%{count} video"
+        zero: "%{count} video"
+    boosted_from_html: Pastiprināja %{acct_link}
+    content_warning: 'Satura brīdinājums: %{warning}'
+    default_language: Tāda, kā saskarnes valoda
+    disallowed_hashtags:
+      one: 'saturēja neatļautu tēmturi: %{tags}'
+      other: 'saturēja neatļautus tēmturus: %{tags}'
+      zero: 'neatļauti tēmturi: %{tags}'
+    edited_at_html: Rediģēts %{date}
+    errors:
+      in_reply_not_found: Šķiet, ka ziņa, uz kuru tu mēģini atbildēt, nepastāv.
+    open_in_web: Atvērt webā
+    over_character_limit: pārsniegts %{max} rakstzīmju ierobežojums
+    pin_errors:
+      direct: Ziņojumus, kas ir redzami tikai minētajiem lietotājiem, nevar piespraust
+      limit: Tu jau esi piespraudis maksimālo ziņu skaitu
+      ownership: Citas personas ziņu nevar piespraust
+      reblog: Pastiprinātu ierakstu nevar piespraust
+    poll:
+      total_people:
+        one: "%{count} persona"
+        other: "%{count} personas"
+        zero: "%{count} personu"
+      total_votes:
+        one: "%{count} balss"
+        other: "%{count} balsis"
+        zero: "%{count} balsu"
+      vote: Balsu skaits
+    show_more: Rādīt vairāk
+    show_newer: Nekad nerādīt
+    show_older: Rādīt senākus
+    show_thread: Rādīt tematu
+    sign_in_to_participate: Lai piedalītos sarunā, pieraksties
+    title: "%{name}: “%{quote}”"
+    visibilities:
+      direct: Tiešs
+      private: Tikai sekotājiem
+      private_long: Rādīt tikai sekotājiem
+      public: Publisks
+      public_long: Visi var redzēt
+      unlisted: Nerindota
+      unlisted_long: Redzama visiem, bet nav iekļauta publiskajās ziņu lentās
+  statuses_cleanup:
+    enabled: Automātiski dzēst vecās ziņas
+    enabled_hint: Automātiski izdzēš tavas ziņas, tiklīdz tās sasniedz noteiktu vecuma slieksni, ja vien tās neatbilst kādam no tālāk norādītajiem izņēmumiem
+    exceptions: Izņēmumi
+    explanation: Tā kā ziņu dzēšana ir dārga darbība, tā tiek veikta lēnām laika gaitā, kad serveris nav citādi aizņemts. Šī iemesla dēļ tavas ziņas var tikt izdzēstas kādu laiku pēc vecuma sliekšņa sasniegšanas.
+    ignore_favs: Ignorēt izlasi
+    ignore_reblogs: Ignorēt pastiprinātos ierakstus
+    interaction_exceptions: Izņēmumi, kuru pamatā ir mijiedarbība
+    interaction_exceptions_explanation: Ņem vērā, ka ieraksti var netikt dzēsti, ja tie noslīd zem par izlases vai pastiprinājuma sliekšņa pēc tam, kad to reiz pārsnieguši.
+    keep_direct: Saglabāt tiešos ziņojumus
+    keep_direct_hint: Nedzēš nevienu tavu tiešo ziņojumu
+    keep_media: Saglabāt ziņas ar mediju pielikumiem
+    keep_media_hint: Neizdzēš nevienu no tavām ziņām, kurām ir mediju pielikumi
+    keep_pinned: Saglabāt piespraustās ziņas
+    keep_pinned_hint: Nedzēš nevienu tavis piesprausto ziņu
+    keep_polls: Saglabāt aptaujas
+    keep_polls_hint: Nedzēš nevienu tavu aptauju
+    keep_self_bookmark: Saglabāt ziņas, kuras esi pievienojis grāmatzīmēm
+    keep_self_bookmark_hint: Neizdzēš tavas ziņas, ja esi tās pievienojis grāmatzīmēm
+    keep_self_fav: Saglabāt ziņas, kuras esi pievienojis izlasei
+    keep_self_fav_hint: Neizdzēš tavas ziņas, ja esi tās pievienojis izlasei
+    min_age:
+      '1209600': 2 nedēļas
+      '15778476': 6 mēneši
+      '2629746': 1 mēnesis
+      '31556952': 1 gads
+      '5259492': 2 mēneši
+      '604800': 1 nedēļa
+      '63113904': 2 gadi
+      '7889238': 3 mēneši
+    min_age_label: Vecuma slieksnis
+    min_favs: Saglabāt ziņas izlsasē vismaz
+    min_favs_hint: Nedzēš nevienu tavu ziņu, kas ir saņēmusi vismaz tik daudz izlases. Atstāj tukšu, lai dzēstu ziņas neatkarīgi no to izlases skaita
+    min_reblogs: Saglabāt ierakstus pastiprinātus vismaz
+    min_reblogs_hint: Neizdzēš nevienu no taviem ierakstiem, kas ir pastiprināts vismaz tik reižu. Atstāj tukšu, lai dzēstu ierakstus neatkarīgi no to pastiprinājumu skaita
+  stream_entries:
+    pinned: Piespraustā ziņa
+    reblogged: pastiprinātie
+    sensitive_content: Sensitīvs saturs
+  strikes:
+    errors:
+      too_late: Brīdinājuma apstrīdēšanas laiks ir nokavēts
+  tags:
+    does_not_match_previous_name: nesakrīt ar iepriekšējo nosaukumu
+  themes:
+    contrast: Mastodon (Augsts kontrasts)
+    default: Mastodon (Tumšs)
+    mastodon-light: Mastodon (Gaišs)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Pievienot
+    disable: Atspējot 2FA
+    disabled_success: Divfaktoru autentifikācija veiksmīgi atspējota
+    edit: Rediģēt
+    enabled: Divfaktoru autentifikācija ir iespējota
+    enabled_success: Divfaktoru autentifikācija veiksmīgi iespējota
+    generate_recovery_codes: Ģenerēt atkopšanas kodus
+    lost_recovery_codes: Atkopšanas kodi ļauj atgūt piekļuvi tavam kontam, ja pazaudē tālruni. Ja esi pazaudējis atkopšanas kodus, tu vari tos ģenerēt šeit. Tavi vecie atkopšanas kodi tiks anulēti.
+    methods: Divfaktoru metodes
+    otp: Autentifikātora lietotne
+    recovery_codes: Veidot atkopšanas kodu rezerves kopijas
+    recovery_codes_regenerated: Atkopšanas kodi veiksmīgi atjaunoti
+    recovery_instructions_html: Ja kādreiz zaudēsi piekļuvi savam tālrunim, vari izmantot kādu no tālāk norādītajiem atkopšanas kodiem, lai atgūtu piekļuvi savam kontam. <strong>Glabā atkopšanas kodus drošībā</strong>. Piemēram, tu vari tos izdrukāt un uzglabāt kopā ar citiem svarīgiem dokumentiem.
+    webauthn: Drošības atslēgas
+  user_mailer:
+    appeal_approved:
+      action: Dodies uz savu kontu
+      explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir apstiprināta. Jūsu konts atkal ir labā stāvoklī.
+      subject: Jūsu %{date} apelācija ir apstiprināta
+      title: Apelācija apstiprināta
+    appeal_rejected:
+      explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir noraidīta.
+      subject: Jūsu %{date} apelācija ir noraidīta
+      title: Apelācija noraidīta
+    backup_ready:
+      explanation: Tu pieprasīji pilnu sava Mastodon konta dublējumu. Tagad tas ir gatavs lejupielādei!
+      subject: Tavs arhīvs ir gatavs lejupielādei
+      title: Arhīva līdzņemšana
+    suspicious_sign_in:
+      change_password: mainīt paroli
+      details: 'Šeit ir detalizēta informācija par pierakstīšanos:'
+      explanation: Esam konstatējuši pierakstīšanos tavā kontā no jaunas IP adreses.
+      further_actions_html: Ja tas nebiji tu, iesakām nekavējoties %{action} un iespējot divu faktoru autentifikāciju, lai tavs konts būtu drošībā.
+      subject: Tavam kontam ir piekļūts no jaunas IP adreses
+      title: Jauna pierakstīšanās
+    warning:
+      appeal: Iesniegt apelāciju
+      appeal_description: Ja uzskatāt, ka tā ir kļūda, varat iesniegt apelāciju %{instance} darbiniekiem.
+      categories:
+        spam: Spams
+        violation: Saturs pārkāpj šādas kopienas pamatnostādnes
+      explanation:
+        delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
+        disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
+        mark_statuses_as_sensitive: "%{instance} moderatori dažas no tavām ziņām ir atzīmējušas kā sensitīvas. Tas nozīmē, ka cilvēkiem būs jāpieskaras ziņās esošajiem medijiem, pirms tiek parādīts priekšskatījums. Tu arī pats vari atzīmēt mediju kā sensitīvu, kad tādu publicēsi turpmāk."
+        sensitive: No šī brīža visi augšupielādētie mediju faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
+        silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
+        suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
+      reason: 'Iemesls:'
+      statuses: 'Citētās ziņas:'
+      subject:
+        delete_statuses: Tavas ziņas %{acct} tika noņemtas
+        disable: Tavs konts %{acct} tika iesaldēts
+        mark_statuses_as_sensitive: Tavas ziņas vietnē %{acct} ir atzīmētas kā sensitīvas
+        none: Brīdinājums par %{acct}
+        sensitive: Tavas ziņas vietnē %{acct} turpmāk tiks atzīmētas kā sensitīvas
+        silence: Tavs konts %{acct} tika ierobežots
+        suspend: Tava konta %{acct} darbība ir apturēta
+      title:
+        delete_statuses: Izdzēstās ziņas
+        disable: Konts iesaldēts
+        mark_statuses_as_sensitive: Ziņas ir atzīmēts kā sensitīvas
+        none: Brīdinājums
+        sensitive: Konts ir atzīmēts kā sensitīvs
+        silence: Konts ierobežots
+        suspend: Konts apturēts
+    welcome:
+      edit_profile_action: Iestatīt profilu
+      edit_profile_step: Tu vari pielāgot savu profilu, augšupielādējot profila attēlu, mainot parādāmo vārdu un citas lietas. Vari izvēlēties pārskatīt jaunus sekotājus, pirms atļauj viņiem tev sekot.
+      explanation: Šeit ir daži padomi, kā sākt darbu
+      final_action: Sāc publicēt
+      final_step: 'Sāc publicēt! Pat bez sekotājiem tavas publiskās ziņas var redzēt citi, piemēram, vietējā ziņu lentā vai atsaucēs. Iespējams, tu vēlēsies iepazīstināt ar sevi, izmantojot tēmturi #introductions.'
+      full_handle: Tavs pilnais lietotājvārds
+      full_handle_hint: Šis ir tas, ko tu pasaki saviem draugiem, lai viņi varētu tev ziņot vai sekot tev no cita servera.
+      subject: Laipni lūgts Mastodon
+      title: Laipni lūgts uz borta, %{name}!
+  users:
+    follow_limit_reached: Tu nevari sekot vairāk par %{limit} cilvēkiem
+    invalid_otp_token: Nederīgs divfaktora kods
+    otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email}
+    seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
+    signed_in_as: 'Pierakstījies kā:'
+  verification:
+    explanation_html: 'Tu vari <strong>apstiprināt sevi kā sava profila metadatos esošo saišu īpašnieku</strong>. Lai to izdarītu, saistītajā vietnē ir jābūt saitei uz tavu Mastodon profilu. Atpakaļsaitē <strong>jābūt</strong> atribūtam <code>rel="me"</code>. Saites teksta saturam nav nozīmes. Šeit ir piemērs:'
+    verification: Pārbaude
+  webauthn_credentials:
+    add: Pievienot jaunu drošības atslēgu
+    create:
+      error: Pievienojot drošības atslēgu, radās problēma. Lūdzu mēģini vēlreiz.
+      success: Tava drošības atslēga tika veiksmīgi pievienota.
+    delete: Dzēst
+    delete_confirmation: Vai tiešām vēlies dzēst šo drošības atslēgu?
+    description_html: Ja iespējosi <strong>drošības atslēgas autentifikāciju</strong>, piesakoties būs jāizmanto viena no tavām drošības atslēgām.
+    destroy:
+      error: Dzēšot tavu drošības atslēgu, radās problēma. Lūdzu mēģini vēlreiz.
+      success: Tava drošības atslēga tika veiksmīgi izdēsta.
+    invalid_credential: Nederīga drošības atslēga
+    nickname_hint: Ievadi savas jaunās drošības atslēgas segvārdu
+    not_enabled: Tu vel neesi iespējojis WebAuthn
+    not_supported: Šī pārlūkprogramma neatbalsta drošības atslēgas
+    otp_required: Lai izmantotu drošības atslēgas, lūdzu, vispirms iespējo divfaktoru autentifikāciju.
+    registered_on: Reģistrēts %{date}
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 1d6cbaf22..d5442c96c 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -1,57 +1,23 @@
 ---
 ml:
   about:
-    about_this: കുറിച്ച്
-    api: എപിഐ
-    apps: മൊബൈൽ ആപ്പുകൾ
-    contact: ബന്ധപ്പെടുക
     contact_missing: സജ്ജമാക്കിയിട്ടില്ല
     contact_unavailable: ലഭ്യമല്ല
-    discover_users: ഉപയോഗ്‌താക്കളെ കണ്ടെത്തുക
-    documentation: വിവരണം
-    get_apps: മൊബൈൽ ആപ്പ് പരീക്ഷിക്കുക
-    learn_more: കൂടുതൽ പഠിക്കുക
-    privacy_policy: സ്വകാര്യതാ നയം
-    see_whats_happening: എന്തൊക്കെ സംഭവിക്കുന്നു എന്ന് കാണുക
-    source_code: സോഴ്സ് കോഡ്
-    status_count_before: ആരാൽ എഴുതപ്പെട്ടു
-    tagline: സുഹൃത്തുക്കളെ പിന്തുടരുകയും പുതിയവരെ കണ്ടെത്തുകയും ചെയ്യുക
-    terms: സേവന വ്യവസ്ഥകൾ
-    unavailable_content: ലഭ്യമല്ലാത്ത ഉള്ളടക്കം
-    unavailable_content_description:
-      domain: സെർവർ
-      reason: കാരണം
-      suspended_title: താൽക്കാലികമായി നിർത്തിവെച്ച സെർവറുകൾ
-    what_is_mastodon: എന്താണ് മാസ്റ്റഡോൺ?
   accounts:
     follow: പിന്തുടരുക
     following: പിന്തുടരുന്നു
-    joined: "%{date} ൽ ചേർന്നു"
     last_active: അവസാനം സജീവമായിരുന്നത്
     link_verified_on: സന്ധിയുടെ ഉടമസ്ഥാവസ്‌കാശം %{date} ൽ പരിശോധിക്കപ്പെട്ടു
-    media: മാധ്യമങ്ങൾ
-    moved_html: "%{name}, %{new_profile_link} ലേക്ക് നീങ്ങിയിരിക്കുന്നു:"
-    network_hidden: ഈ വിവരം ലഭ്യമല്ല
     nothing_here: ഇവിടെ ഒന്നുമില്ല!
     posts_tab_heading: ടൂട്ടുകൾ
-    posts_with_replies: ടൂട്ടുകളും മറുപടികളും
-    roles:
-      admin: അഡ്‌മിന്‍
-      bot: ബോട്ട്
-      group: ഗ്രൂപ്പ്
-    unavailable: പ്രൊഫൈൽ ലഭ്യമല്ല
   admin:
-    account_moderation_notes:
-      delete: മായ്ക്കുക
     accounts:
       add_email_domain_block: ഇ-മെയിൽ ഡൊമെയ്ൻ തടയുക
       approve: അംഗീകരിക്കുക
-      approve_all: എല്ലാം അംഗീകരിക്കുക
       are_you_sure: നിങ്ങൾക്ക് ഉറപ്പാണോ?
       avatar: അവതാർ
       by_domain: മേഖല
       change_email:
-        changed_msg: അംഗത്തിന്റെ ഇലക്ട്രോണിക് കത്തിന്റെ മേൽവിലാസം വിജയകരമായി മാറ്റിയിരിക്കുന്നു!
         current_email: ഇപ്പോഴത്തെ ഇലക്ട്രോണിക് കത്തിന്റെ മേൽവിലാസം
         label: മാറിയ ഇലക്ട്രോണിക് കത്തിന്റെ മേൽവിലാസം
         new_email: പുതിയ ഇലക്ട്രോണിക് കത്ത്
@@ -87,9 +53,6 @@ ml:
         success: സ്ഥിരീകരണ ഇമെയിൽ വിജയകരമായി അയച്ചു!
       reset: പുനഃക്രമീകരിക്കുക
       reset_password: പാസ്‌വേഡ് പുനഃക്രമീകരിക്കുക
-      role: അനുമതികൾ
-      roles:
-        user: ഉപയോക്താവ്
       search: തിരയുക
       title: അക്കൗണ്ടുകൾ
       unconfirmed_email: സ്ഥിരീകരിക്കാത്ത ഇമെയിൽ
@@ -118,8 +81,6 @@ ml:
         all: എല്ലാം
   authorize_follow:
     following: 'വിജയകരം! നിങ്ങൾ ഇപ്പോൾ പിന്തുടരുന്നു:'
-  directories:
-    directory: പ്രൊഫൈൽ ഡയറക്ടറി
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -136,8 +97,6 @@ ml:
   generic:
     all: എല്ലാം
   notification_mailer:
-    digest:
-      action: എല്ലാ അറിയിപ്പുകളും കാണിക്കുക
     follow:
       body: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു!"
       subject: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു"
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index fb890e618..848580f0c 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1,88 +1,25 @@
 ---
 ms:
   about:
-    about_hashtag_html: Ini semua hantaran awam yang ditandakan dengan <strong>#%{hashtag}</strong>. Anda boleh berinteraksi dengan mereka jika anda mempunyai akaun di mana-mana dunia persekutuan.
     about_mastodon_html: 'Rangkaian sosial masa hadapan: Tiada iklan, tiada pengawasan korporat, reka bentuk beretika, dan desentralisasi! Miliki data anda dengan Mastodon!'
-    about_this: Perihal
-    active_count_after: aktif
-    active_footnote: Pengguna Aktif Bulanan (MAU)
-    administered_by: 'Ditadbir oleh:'
-    api: API
-    apps: Aplikasi mudah alih
-    apps_platforms: Guna Mastodon daripada iOS, Android dan platform yang lain
-    browse_directory: Layari direktori profil dan tapis mengikut minat
-    browse_local_posts: Layari strim langsung hantaran awam daripada pelayan ini
-    browse_public_posts: Layari strim langsung hantaran awam di Mastodon
-    contact: Hubungi kami
     contact_missing: Tidak ditetapkan
     contact_unavailable: Tidak tersedia
-    discover_users: Terokai pengguna
-    documentation: Pendokumenan
-    federation_hint_html: Dengan akaun di %{instance} anda akan mampu mengikuti orang di mana-mana pelayan Mastodon dan lebih lagi.
-    get_apps: Cuba aplikasi mudah alih
     hosted_on: Mastodon dihoskan di %{domain}
-    instance_actor_flash: |
-      Akaun ini ialah pelaku maya yang digunakan untuk mewakili pelayan itu sendiri dan bukannya mana-mana pengguna individu.
-      Ia digunakan untuk tujuan persekutuan dan tidak patut disekat melainkan anda ingin menyekat keseluruhan tika, yang mana anda sepatutnya gunakan sekatan domain.
-    learn_more: Ketahui lebih lanjut
-    privacy_policy: Polisi privasi
-    rules: Peraturan pelayan
-    rules_html: 'Di bawah ini ringkasan peraturan yang anda perlu ikuti jika anda ingin mempunyai akaun di pelayan Mastodon yang ini:'
-    see_whats_happening: Lihat apa yang sedang berlaku
-    server_stats: 'Statistik pelayan:'
-    source_code: Kod sumber
-    status_count_after:
-      other: hantaran
-    status_count_before: Siapa terbitkan
-    tagline: Ikuti rakan lama dan terokai rakan baharu
-    terms: Terma perkhidmatan
-    unavailable_content: Pelayan disederhanakan
-    unavailable_content_description:
-      domain: Pelayan
-      reason: Sebab
-      rejecting_media: 'Fail-fail media daripada pelayan-pelayan ini tidak akan diproses atau disimpan, dan tiada gambar kecil yang akan dipaparkan, memerlukan anda untuk klik fail asal:'
-      rejecting_media_title: Media ditapis
-      silenced: 'Hantaran daripada pelayan-pelayan ini akan disembunyikan di garis masa dan perbualan awam, dan tiada pemberitahuan yang akan dijana daripada interaksi pengguna mereka, melainkan anda mengikuti mereka:'
-      silenced_title: Pelayan didiamkan
-      suspended: 'Tiada data daripada pelayan-pelayan ini yang akan diproses, disimpan atau ditukar, membuatkan sebarang interaksi atau perhubungan dengan pengguna daripada pelayan-pelayan ini menjadi mustahil:'
-      suspended_title: Pelayan digantung
-    unavailable_content_html: Mastodon secara amnya membenarkan anda melihat kandungan daripada dan berinteraksi dengan pengguna daripada mana-mana pelayan dalam dunia persekutuan. Ini pengecualian yang telah dilakukan di pelayan ini secara khususnya.
-    user_count_after:
-      other: pengguna
-    user_count_before: Rumah bagi
-    what_is_mastodon: Apakah itu Mastodon?
+    title: Perihal
   accounts:
-    choices_html: 'Pilihan %{name}:'
-    endorsements_hint: Anda boleh syorkan orang yang anda ikuti menggunakan antara muka sesawang, dan mereka akan ditunjukkan di sini.
-    featured_tags_hint: Anda boleh mempromosikan tanda pagar khusus yang akan dipaparkan di sini.
     follow: Ikut
     followers:
       other: Pengikut
     following: Mengikuti
     instance_actor_flash: Akaun ini ialah pelaku maya yang digunakan untuk mewakili pelayan itu sendiri dan bukan mana-mana pengguna individu. Ia digunakan untuk tujuan persekutuan dan tidak patut digantung.
-    joined: Sertai pada %{date}
     last_active: aktif terakhir
     link_verified_on: Pemilikan pautan ini diperiksa pada %{date}
-    media: Media
-    moved_html: "%{name} telah berpindah ke %{new_profile_link}:"
-    network_hidden: Maklumat ini tidak tersedia
-    never_active: Belum pernah
     nothing_here: Tiada apa-apa di sini!
-    people_followed_by: Orang yang %{name} ikuti
-    people_who_follow: Orang yang mengikut %{name}
     pin_errors:
       following: Anda mestilah sudah mengikuti orang yang anda ingin syorkan
     posts:
       other: Hantaran
     posts_tab_heading: Hantaran
-    posts_with_replies: Hantaran dan balasan
-    roles:
-      admin: Pentadbir
-      bot: Bot
-      group: Kumpulan
-      moderator: Penyederhana
-    unavailable: Profil tidak tersedia
-    unfollow: Nyahikut
   admin:
     account_actions:
       action: Ambil tindakan
@@ -90,31 +27,36 @@ ms:
     account_moderation_notes:
       create: Tinggalkan catatan
       created_msg: Catatan penyederhanaan telah berjaya dicipta!
-      delete: Padam
       destroyed_msg: Catatan penyederhanaan telah berjaya dipadam!
     accounts:
       add_email_domain_block: Sekat domain e-mel
       approve: Luluskan
-      approve_all: Luluskan semua
       approved_msg: Berjaya meluluskan permohonan pendaftaran %{username}
       are_you_sure: Adakah anda pasti?
       avatar: Avatar
       by_domain: Domain
       change_email:
-        changed_msg: E-mel akaun telah berjaya ditukar!
+        changed_msg: E-mel berjaya ditukar!
         current_email: E-mel semasa
         label: Ubah e-mel
         new_email: E-mel baharu
         submit: Ubah e-mel
         title: Ubah e-mel untuk %{username}
+      change_role:
+        changed_msg: Peranan berjaya ditukar!
+        label: Tukar peranan
+        no_role: Tiada peranan
+        title: Tukar peranan untuk %{username}
       confirm: Sahkan
       confirmed: Disahkan
       confirming: Mengesahkan
+      custom: Tersuai
       delete: Padam data
       deleted: Dipadamkan
       demote: Turunkan taraf
       destroyed_msg: Data %{username} kini menunggu giliran untuk dipadam sebentar lagi
       disable: Bekukan
+      disable_sign_in_token_auth: Nyahdaya pengesahan token e-mel
       disable_two_factor_authentication: Lumpuhkan 2FA
       disabled: Dibekukan
       display_name: Nama paparan
@@ -123,6 +65,7 @@ ms:
       email: E-mel
       email_status: Status e-mel
       enable: Nyahbekukan
+      enable_sign_in_token_auth: Dayakan pengesahan token e-mel
       enabled: Didayakan
       enabled_msg: Berjaya menyahbekukan akaun %{username}
       followers: Pengikut
@@ -147,7 +90,7 @@ ms:
         active: Aktif
         all: Semua
         pending: Menunggu
-        silenced: Didiamkan
+        silenced: Terhad
         suspended: Digantungkan
         title: Penyederhanaan
       moderation_notes: Catatan penyederhana
@@ -155,9 +98,13 @@ ms:
       most_recent_ip: Alamat IP terbaru
       no_account_selected: Tiada akaun diubah kerana tiada yang dipilih
       no_limits_imposed: Tiada pengehadan dikenakan
+      no_role_assigned: Tiada peranan ditugaskan
       not_subscribed: Tiada langganan
       pending: Menunggu semak semula
       perform_full_suspension: Gantung
+      previous_strikes: Pelanggaran sebelumnya
+      previous_strikes_description_html:
+        other: Akaun ini mempunyai <strong>%{count}</strong> pelanggaran.
       promote: Naikkan taraf
       protocol: Protokol
       public: Awam
@@ -165,7 +112,6 @@ ms:
       redownload: Segarkan semula profil
       redownloaded_msg: Berjaya segarkan semula profil %{username} daripada asalnya
       reject: Tolak
-      reject_all: Tolak semua
       rejected_msg: Berjaya menolak permohonan pendaftaran %{username}
       remove_avatar: Buang avatar
       remove_header: Buang pengepala
@@ -178,15 +124,13 @@ ms:
       reset: Tetapkan semula
       reset_password: Tetapkan semula kata laluan
       resubscribe: Langgan semula
-      role: Kebenaran
-      roles:
-        admin: Pentadbir
-        moderator: Penyederhana
-        staff: Kakitangan
-        user: Pengguna
+      role: Peranan
       search: Cari
       search_same_email_domain: Pengguna lain dengan domain e-mel yang sama
       search_same_ip: Pengguna lain dengan alamat IP yang sama
+      security_measures:
+        only_password: Kata laluan sahaja
+        password_and_2fa: Kata laluan dan 2FA
       sensitive: Sensitif
       sensitized: ditandakan sebagai sensitif
       shared_inbox_url: URL peti masuk berkongsi
@@ -196,12 +140,15 @@ ms:
       silence: Hadkan
       silenced: Dihadkan
       statuses: Hantaran
+      strikes: Pelanggaran sebelumnya
       subscribe: Langgan
+      suspend: Gantung
       suspended: Digantung
       suspension_irreversible: Data akaun ini telah dipadam secara kekal. Anda boleh nyahgantungkannya untuk membuatkan akaun ini boleh digunakan semula tetapi data lama tidak akan diperolehi.
       suspension_reversible_hint_html: Akaun ini telah digantung, dan datanya akan dibuang pada %{date}. Sebelum tarikh itu, akaun ini boleh diperoleh semula tanpa kesan buruk. Jika anda mahu memadamkan kesemua data akaun ini serta-merta, anda boleh melakukannya di bawah.
-      time_in_queue: Menunggu giliran %{time}
       title: Akaun
+      unblock_email: Menyahsekat alamat e-mel
+      unblocked_email_msg: Alamat e-mel %{username} berjaya dinyahsekat
       unconfirmed_email: E-mel belum disahkan
       undo_sensitized: Nyahtanda sensitif
       undo_silenced: Nyahdiamkan
@@ -216,92 +163,124 @@ ms:
       whitelisted: Dibenarkan untuk persekutuan
     action_logs:
       action_types:
+        approve_appeal: Meluluskan Rayuan
+        approve_user: Luluskan Pengguna
         assigned_to_self_report: Buat Laporan
         change_email_user: Ubah E-mel untuk Pengguna
+        change_role_user: Tukar Peranan Pengguna
         confirm_user: Sahkan Pengguna
         create_account_warning: Cipta Amaran
         create_announcement: Cipta Pengumuman
+        create_canonical_email_block: Cipta Penyekatan E-mel
         create_custom_emoji: Cipta Emoji Tersendiri
         create_domain_allow: Cipta Pelepasan Domain
         create_domain_block: Cipta Penyekatan Domain
         create_email_domain_block: Cipta Penyekatan Domain E-mel
         create_ip_block: Cipta peraturan alamat IP
         create_unavailable_domain: Cipta Domain Tidak Tersedia
+        create_user_role: Cipta Peranan
         demote_user: Turunkan Taraf Pengguna
         destroy_announcement: Padam Pengumuman
+        destroy_canonical_email_block: Padam Penyekatan E-mel
         destroy_custom_emoji: Padam Emoji Tersendiri
         destroy_domain_allow: Padam Pelepasan Domain
         destroy_domain_block: Padam Penyekatan Domain
         destroy_email_domain_block: Padam penyekatan domain e-mel
+        destroy_instance: Padamkan Domain
         destroy_ip_block: Padam peraturan alamat IP
         destroy_status: Padam Hantaran
         destroy_unavailable_domain: Padam Domain Tidak Tersedia
+        destroy_user_role: Padamkan Peranan
         disable_2fa_user: Nyahdayakan 2FA
         disable_custom_emoji: Nyahdayakan Emoji Tersendiri
+        disable_sign_in_token_auth_user: Melumpuhkan pengesahan token e-mel untuk pengguna
         disable_user: Nyahdayakan Pengguna
         enable_custom_emoji: Dayakan Emoji Tersendiri
+        enable_sign_in_token_auth_user: Mendayakan pengesahan token e-mel untuk pengguna
         enable_user: Dayakan Pengguna
         memorialize_account: Jadikan Akaun Kenangan
         promote_user: Naikkan Taraf Pengguna
+        reject_appeal: Menolak Rayuan
+        reject_user: Menolak Pengguna
         remove_avatar_user: Buang Avatar
         reopen_report: Buka Semula Laporan
+        resend_user: Hantar Semula E-mel Pengesahan
         reset_password_user: Tetapkan Semula Kata Laluan
         resolve_report: Buat Keputusan Laporan
         sensitive_account: Tandakan media di akaun anda sebagai sensitif
         silence_account: Diamkan Akaun
         suspend_account: Gantungkan Akaun
         unassigned_report: Menyahtugaskan Laporan
+        unblock_email_account: Menyahsekat alamat e-mel
         unsensitive_account: Nyahtanda media di akaun anda sebagai sensitif
         unsilence_account: Nyahdiamkan Akaun
         unsuspend_account: Nyahgantungkan Akaun
         update_announcement: Kemas Kini Pengumuman
         update_custom_emoji: Kemas Kini Emoji Tersendiri
         update_domain_block: Kemas Kini Penyekatan Domain
+        update_ip_block: Kemas kini peraturan IP
         update_status: Kemas Kini Hantaran
+        update_user_role: Kemas Kini Peranan
       actions:
+        approve_appeal_html: "%{name} meluluskan rayuan keputusan penyederhanaan daripada %{target}"
+        approve_user_html: "%{name} meluluskan pendaftaran daripada %{target}"
         assigned_to_self_report_html: "%{name} menugaskan laporan %{target} kepada dirinya sendiri"
         change_email_user_html: "%{name} telah mengubah alamat e-mel pengguna %{target}"
+        change_role_user_html: "%{name} mengubah peranan %{target}"
         confirm_user_html: "%{name} telah mengesahkan alamat e-mel pengguna %{target}"
         create_account_warning_html: "%{name} telah memberi amaran kepada %{target}"
         create_announcement_html: "%{name} telah mencipta pengumuman baharu %{target}"
+        create_canonical_email_block_html: "%{name} menyekat e-mel dengan cincangan %{target}"
         create_custom_emoji_html: "%{name} telah memuat naik emoji baharu %{target}"
         create_domain_allow_html: "%{name} membenarkan persekutuan dengan domain %{target}"
         create_domain_block_html: "%{name} telah menyekat domain %{target}"
         create_email_domain_block_html: "%{name} telah menyekat domain e-mel %{target}"
         create_ip_block_html: "%{name} telah mencipta peraturan alamat IP %{target}"
         create_unavailable_domain_html: "%{name} telah menghentikan penghantaran ke domain %{target}"
+        create_user_role_html: "%{name} mewujudkan peranan %{target}"
         demote_user_html: "%{name} telah menurunkan taraf pengguna %{target}"
         destroy_announcement_html: "%{name} telah memadamkan pengumuman %{target}"
-        destroy_custom_emoji_html: "%{name} telah memusnahkan emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} telah menyahsekat e-mel dengan hash %{target}"
+        destroy_custom_emoji_html: "%{name} telah memadam emoji %{target}"
         destroy_domain_allow_html: "%{name} telah membuang kebenaran persekutuan dengan domain %{target}"
         destroy_domain_block_html: "%{name} telah menyahsekat domain %{target}"
         destroy_email_domain_block_html: "%{name} telah menyahsekat domain e-mel %{target}"
+        destroy_instance_html: "%{name} telah memadam domain %{target}"
         destroy_ip_block_html: "%{name} telah memadamkan peraturan untuk alamat IP %{target}"
         destroy_status_html: "%{name} telah membuang hantaran oleh %{target}"
         destroy_unavailable_domain_html: "%{name} telah menyambung penghantaran ke domain %{target}"
+        destroy_user_role_html: "%{name} telah memadam peranan %{target}"
         disable_2fa_user_html: "%{name} menyahdayakan keperluan dua faktor bagi pengguna %{target}"
         disable_custom_emoji_html: "%{name} telah menyahdayakan emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} melumpuhkan pengesahan token e-mel untuk %{target}"
         disable_user_html: "%{name} telah menyahdayakan log masuk bagi pengguna %{target}"
         enable_custom_emoji_html: "%{name} telah mendayakan emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} mendayakan pengesahan token e-mel untuk %{target}"
         enable_user_html: "%{name} telah mendayakan log masuk untuk pengguna %{target}"
         memorialize_account_html: "%{name} telah mengubah akaun %{target} menjadi halaman kenangan"
         promote_user_html: "%{name} telah menaikkan taraf pengguna %{target}"
+        reject_appeal_html: "%{name} menolak rayuan keputusan penyederhanaan daripada %{target}"
+        reject_user_html: "%{name} menolak pendaftaran daripada %{target}"
         remove_avatar_user_html: "%{name} telah membuang avatar %{target}"
         reopen_report_html: "%{name} telah membuka semula laporan %{target}"
+        resend_user_html: "%{name} menghantar semula e-mel pengesahan untuk %{target}"
         reset_password_user_html: "%{name} telah menetapkan semula kata laluan pengguna %{target}"
         resolve_report_html: "%{name} telah menyelesaikan laporan %{target}"
         sensitive_account_html: "%{name} telah menanda media %{target} sebagai sensitif"
         silence_account_html: "%{name} telah mendiamkan akaun %{target}"
         suspend_account_html: "%{name} telah menggantung akaun %{target}"
         unassigned_report_html: "%{name} telah menyahtugaskan laporan %{target}"
+        unblock_email_account_html: "%{name} menyahsekat alamat e-mel %{target}"
         unsensitive_account_html: "%{name} telah menyahtanda media %{target} sebagai sensitif"
         unsilence_account_html: "%{name} telah menyahdiamkan akaun %{target}"
         unsuspend_account_html: "%{name} telah menyahgantungkan akaun %{target}"
         update_announcement_html: "%{name} telah mengemaskini pengumuman %{target}"
         update_custom_emoji_html: "%{name} telah mengemaskini emoji %{target}"
         update_domain_block_html: "%{name} telah mengemaskini penyekatan domain untuk %{target}"
+        update_ip_block_html: "%{name} telah mengubah peraturan IP %{target}"
         update_status_html: "%{name} telah mengemaskini hantaran oleh %{target}"
-      deleted_status: "(hantaran telah dipadam)"
+        update_user_role_html: "%{name} telah mengubah peranan %{target}"
+      deleted_account: akaun dipadamkan
       empty: Tiada log dijumpai.
       filter_by_action: Tapis mengikut tindakan
       filter_by_user: Tapis mengikut pengguna
@@ -340,11 +319,12 @@ ms:
       enable: Dayakan
       enabled: Didayakan
       enabled_msg: Emoji tersebut berjaya didayakan
-      image_hint: PNG, maksimum 50KB
+      image_hint: PNG atau GIF sehingga %{size}
       list: Senarai
       listed: Disenaraikan
       new:
         title: Tambah emoji sendiri baharu
+      no_emoji_selected: Tiada emoji diubah kerana tiada yang dipilih
       not_permitted: Anda tidak dibenarkan untuk membuat tindakan ini
       overwrite: Tulis ganti
       shortcode: Kod pendek
@@ -357,13 +337,37 @@ ms:
       updated_msg: Emoji berjaya dikemaskini!
       upload: Muat naik
     dashboard:
+      active_users: pengguna aktif
+      interactions: interaksi
+      media_storage: Penyimpanan media
+      new_users: pengguna baru
+      opened_reports: laporan dibuka
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> rayuan masih belum selesai"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> laporan masih belum selesai"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> tanda pagar masih belum selesai"
+      pending_users_html:
+        other: "<strong>%{count}</strong> pengguna masih menunggu"
+      resolved_reports: laporan diselesaikan
       software: Perisian
+      sources: Sumber pendaftaran
       space: Kegunaan ruang
       title: Papan pemuka
+      top_languages: Bahasa paling aktif
+      top_servers: Pelayan paling aktif
+      website: Laman web
+    disputes:
+      appeals:
+        empty: Tiada rayuan ditemui.
+        title: Rayuan
     domain_allows:
       add_new: Benarkan persekutuan dengan domain
       created_msg: Domain telah berjaya dibenarkan untuk persekutuan
       destroyed_msg: Domain telah dibuang kebenaran daripada persekutuan
+      export: Eksport
+      import: Import
       undo: Buang kebenaran persekutuan dengan domain
     domain_blocks:
       add_new: Tambah penyekatan domain baharu
@@ -371,16 +375,20 @@ ms:
       destroyed_msg: Sekatan domain telah diundurkan
       domain: Domain
       edit: Sunting penyekatan domain
+      existing_domain_block: Anda telah pun mengenakan had yang lebih ketat kepada %{name}.
       existing_domain_block_html: Anda telah mengenakan pengehadan yang lebih tegas ke atas %{name}, anda perlu <a href="%{unblock_url}">menyahsekatinya</a> dahulu.
+      export: Eksport
+      import: Import
       new:
         create: Cipta sekatan
         hint: Sekatan domain tidak akan menghindarkan penciptaan entri akaun dalam pangkalan data, tetapi akan dikenakan kaedah penyederhanaan khusus tertentu pada akaun-akaun tersebut secara retroaktif dan automatik.
         severity:
-          desc_html: "<strong>Diamkan</strong> akan membuatkan hantaran akaun tidak kelihatan kepada sesiapa yang tidak mengikut mereka. <strong>Gantungkan</strong> akan membuang kesemua kandungan, media, dan data profil akaun tersebut. Gunakan <strong>Tiada</strong> jika anda hanya ingin menolak fail media."
           noop: Tiada
-          silence: Diamkan
+          silence: Hadkan
           suspend: Gantungkan
         title: Sekatan domain baharu
+      no_domain_block_selected: Tiada sekatan domain diubah kerana tiada yang dipilih
+      not_permitted: Anda tidak dibenarkan untuk melaksanakan tindakan ini
       obfuscate: Mengaburkan nama domain
       obfuscate_hint: Mengaburkan nama domain secara separa dalam senarai sekiranya pengehadan pengiklanan senarai domain didayakan
       private_comment: Ulasan peribadi
@@ -391,33 +399,33 @@ ms:
       reject_media_hint: Buang fail media yang disimpan secara tempatan dan tolak sebarang muat turun pada masa hadapan. Tidak terpakai untuk penggantungan
       reject_reports: Tolak laporan
       reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak terpakai untuk penggantungan
-      rejecting_media: menolak fail media
-      rejecting_reports: menolak laporan
-      severity:
-        silence: didiamkan
-        suspend: digantungkan
-      show:
-        affected_accounts:
-          other: "%{count} akaun dalam pangkalan data menerima kesan"
-        retroactive:
-          silence: Nyahdiamkan akaun yang menerima kesan sedia ada daripada domain ini
-          suspend: Nyahgantungkan akaun yang menerima kesan sedia ada daripada domain ini
-        title: Undurkan sekatan domain untuk %{domain}
-        undo: Undurkan
       undo: Undurkan penyekatan domain
       view: Lihat penyekatan domain
     email_domain_blocks:
       add_new: Tambah baharu
+      attempts_over_week:
+        other: "%{count} cubaan pendaftaran sepanjang minggu lepas"
       created_msg: Telah berjaya menyekat domain e-mel
       delete: Padam
-      destroyed_msg: Telah berjaya menyahsekat domain e-mel
+      dns:
+        types:
+          mx: Rekod MX
       domain: Domain
-      empty: Tiada domain e-mel sedang disekat.
-      from_html: dari %{domain}
       new:
         create: Tambah domain
+        resolve: Menyelesaikan domain
         title: Sekat domain e-mel baharu
+      no_email_domain_block_selected: Tiada sekatan domain e-mel diubah kerana tiada yang dipilih
+      resolved_through_html: Diselesaikan melalui %{domain}
       title: Domain e-mel disekat
+    export_domain_allows:
+      new:
+        title: Import kebenaran domain
+      no_file: Tiada fail dipilih
+    export_domain_blocks:
+      import:
+        existing_relationships_warning: Hubungan ikut sedia ada
+      no_file: Tiada fail yang dipilih
     follow_recommendations:
       description_html: "<strong>Saranan ikutan membantu pengguna baharu mencari kandungan menarik dengan cepat</strong>. Apabila pengguna belum cukup berinteraksi dengan akaun lain untuk membentuk saranan ikutan tersendiri, akaun-akaun inilah yang akan disarankan. Ia dinilai semula setiap hari dari gabungan keterlibatan tertinggi terkini dan juga jumlah pengikut tempatan tertinggi mengikut bahasa masing-masing."
       language: Untuk bahasa
@@ -427,27 +435,40 @@ ms:
       title: Saranan ikutan
       unsuppress: Tetap semula saranan ikutan
     instances:
+      availability:
+        title: Ketersediaan
+        warning: Percubaan terakhir untuk menyambung ke pelayan ini tidak berjaya
       back_to_all: Semua
       back_to_limited: Terhad
       back_to_warning: Amaran
       by_domain: Domain
+      confirm_purge: Adakah anda pasti mahu menghapuskan senarai ini secara kekal daripada domain ini?
+      content_policies:
+        comment: Catatan dalaman
+        policies:
+          silence: Hadkan
+        policy: Dasar
+        reason: Sebab awam
+        title: Dasar kandungan
+      dashboard:
+        instance_accounts_dimension: Akaun paling ramai diikuti
+        instance_accounts_measure: akaun disimpan
+        instance_followers_measure: pengikut kami di situ
+        instance_follows_measure: pengikut mereka di sini
+        instance_languages_dimension: Bahasa teratas
+        instance_reports_measure: laporan mengenai mereka
+        instance_statuses_measure: Hantaran yang disimpan
       delivery:
         all: Semua
         clear: Buang ralat penghantaran
+        failing: Gagal
         restart: Mulakan semula penghantaran
         stop: Hentikan penghantaran
-        title: Penghantaran
         unavailable: Tidak tersedia
-        unavailable_message: Penghantaran tidak tersedia
-        warning: Amaran
-        warning_message:
-          other: Penghantaran gagal selama %{count} hari
       delivery_available: Penghantaran tersedia
       delivery_error_days: Hari ralat penghantaran
       delivery_error_hint: Jika penghantaran tidak berjaya selama %{count} hari, ia akan ditanda sebagai tidak boleh dihantar.
       empty: Tiada domain dijumpai.
-      known_accounts:
-        other: "%{count} akaun dikenali"
       moderation:
         all: Semua
         limited: Terhad
@@ -483,8 +504,6 @@ ms:
         title: Cipta peraturan alamat IP baharu
       no_ip_block_selected: Tiada peraturan alamat IP diubah kerana tiada yang dipilih
       title: Peraturan alamat IP
-    pending_accounts:
-      title: Akaun sedang menunggu (%{count})
     relationships:
       title: Hubungan %{acct}
     relays:
@@ -510,37 +529,106 @@ ms:
       account:
         notes:
           other: "%{count} catatan"
-        reports:
-          other: "%{count} laporan"
+      action_log: Log audit
       action_taken_by: Tindakan diambil oleh
+      actions:
+        delete_description_html: Hantaran yang dilaporkan akan dihapuskan dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
+        mark_as_sensitive_description_html: Media di dalam hantaran yang dilaporkan akan ditandakan sebagai sensitif dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
+        resolve_description_html: Tiada tindakan akan diambil terhadap akaun yang dilaporkan, tiada pelanggaran direkodkan dan laporan akan ditutup.
+      add_to_report: Tambahkan lebih banyak pada laporan
       are_you_sure: Adakah anda pasti?
       assign_to_self: Menugaskan kepada saya
       assigned: Penyederhana yang ditugaskan
+      by_target_domain: Domain bagi akaun yang dilaporkan
+      category: Kumpulan
       comment:
         none: Tiada
       created_at: Dilaporkan
+      delete_and_resolve: Padam hantaran
       forwarded: Dipanjangkan
       forwarded_to: Dipanjangkan ke %{domain}
       mark_as_resolved: Tanda sebagai sudah selesai
+      mark_as_sensitive: Tandakan sebagai sensitif
       mark_as_unresolved: Tanda sebagai belum selesai
+      no_one_assigned: Tiada sesiapa
       notes:
         create: Tambah catatan
         create_and_resolve: Selesaikan dengan catatan
         create_and_unresolve: Buka semula dengan catatan
         delete: Padam
         placeholder: Terangkan tindakan apa yang telah diambil, atau sebarang kemas kini lain yang berkaitan...
+        title: Catatan
       reopen: Buka semula laporan
       report: 'Laporan #%{id}'
       reported_account: Akaun yang dilaporkan
       reported_by: Dilaporkan oleh
       resolved: Diselesaikan
       resolved_msg: Laporan berjaya diselesaikan!
+      skip_to_actions: Langkau ke tindakan
       status: Status
-      target_domain: Domain bagi akaun yang dilaporkan
+      statuses: Kandungan yang dilaporkan
+      target_origin: Asalan akaun yang dilaporkan
       title: Laporan
       unassign: Nyahtugaskan
       unresolved: Nyahselesaikan
       updated_at: Dikemaskini
+      view_profile: Lihat profil
+    roles:
+      add_new: Tambah peranan
+      assigned_users:
+        other: "%{count} pengguna"
+      categories:
+        administration: Pentadbiran
+        devops: DevOps
+        invites: Undangan
+        moderation: Penyederhanaan
+        special: Khas
+      delete: Padam
+      edit: Sunting peranan '%{name}'
+      everyone: Kebenaran lalai
+      permissions_count:
+        other: "%{count} kebenaran"
+      privileges:
+        administrator: Pentadbir
+        delete_user_data: Padamkan Data Pengguna
+        delete_user_data_description: Membenarkan pengguna menghapuskan data pengguna lain tanpa bertangguh
+        invite_users: Mengundang pengguna
+        invite_users_description: Membenarkan pengguna mengundang orang baharu ke pelayan
+        manage_announcements: Menguruskan pengumuman
+        manage_announcements_description: Membenarkan pengguna menguruskan pengumuman pada pelayan
+        manage_appeals: Menguruskan rayuan
+        manage_appeals_description: Membenarkan pengguna menyemak rayuan terhadap tindakan penyederhanaan
+        manage_blocks: Menguruskan sekatan
+        manage_blocks_description: Membenarkan pengguna menyekat pembekal e-mel dan alamat IP
+        manage_custom_emojis: Menguruskan emoji tersuai
+        manage_custom_emojis_description: Membenarkan pengguna menguruskan emoji tersuai pada pelayan
+        manage_federation: Menguruskan persekutuan
+        manage_federation_description: Membenarkan pengguna menyekat atau membenarkan persekutuan dengan domain yang lain dan mengawal kebolehhantaran
+        manage_invites: Menguruskan undangan
+        manage_invites_description: Membenarkan pengguna mengimbas dan menyahaktifkan pautan undangan
+        manage_reports: Uruskan Laporan
+        manage_reports_description: Membenarkan pengguna menyemak laporan dan melaksanakan tindakan penyederhanaan terhadapnya
+        manage_roles: Uruskan Peranan
+        manage_roles_description: Membenarkan pengguna mengurus dan menetapkan peranan di bawah mereka
+        manage_rules: Uruskan Peraturan
+        manage_rules_description: Membenarkan pengguna mengubah peraturan pelayan
+        manage_settings: Uruskan Tetapan
+        manage_settings_description: Membenarkan pengguna mengubah tetapan tapak
+        manage_taxonomies: Uruskan Taksonomi
+        manage_taxonomies_description: Membenarkan pengguna menyemak kandungan sohor kini dan mengemas kini tetapan tanda pagar
+        manage_user_access: Uruskan Akses Pengguna
+        manage_user_access_description: Membenarkan pengguna melumpuhkan pengesahan dwifaktor pengguna lain, mengubah alamat e-mel dan menetapkan semula kata laluan mereka
+        manage_users: Uruskan Pengguna
+        manage_users_description: Membenarkan pengguna melihat butiran pengguna lain dan melaksanakan tindakan penyederhanaan terhadapnya
+        manage_webhooks: Menguruskan webhook
+        manage_webhooks_description: Membenarkan pengguna menyediakan webhook bagi acara pentadbiran
+        view_audit_log: Melihat log audit
+        view_audit_log_description: Membenarkan pengguna melihat sejarah tindakan pentadbiran pada pelayan
+        view_dashboard: Melihat papan pemuka
+        view_dashboard_description: Membenarkan pengguna mencapai papan pemuka dan pelbagai metrik
+        view_devops: DevOps
+        view_devops_description: Membenarkan pengguna mencapai papan pemuka Sidekiq dan pgHero
+      title: Peranan
     rules:
       add_new: Tambah peraturan
       delete: Padam
@@ -549,48 +637,374 @@ ms:
       empty: Masih belum ada peraturan pelayan yang ditakrifkan.
       title: Peraturan pelayan
     settings:
-      peers_api_enabled:
-        title: Terbitkan senarai pelayan ditemukan dalam aplikasi
-      preview_sensitive_media:
-        desc_html: Pratonton laman sesawang daripada pautan akan terpapar di gambar kecil meski jika media itu ditanda sebagai sensitif
-        title: Papar media sensitif di pratonton OpenGraph
-      profile_directory:
-        desc_html: Benarkan pengguna untuk ditemukan
-        title: Benarkan direktori profil
+      about:
+        manage_rules: Uruskan peraturan pelayan
+        preamble: Memberikan maklumat mendalam mengenai cara pelayan dikendalikan, disederhanakan, dibiayai.
+        rules_hint: Terdapat kawasan khas untuk peraturan yang dijangka untuk dipatuhi oleh pengguna anda.
+        title: Tentang
+      appearance:
+        preamble: Menyesuaikan antara muka web Mastodon.
+        title: Penampilan
+      branding:
+        title: Penjenamaan
+      content_retention:
+        title: Pengekalan kandungan
+      discovery:
+        profile_directory: Direktori profil
+        public_timelines: Garis masa awam
+        title: Penemuan
+        trends: Sohor kini
+      domain_blocks:
+        all: Kepada semua orang
+        disabled: Tidak kepada sesiapa
+        users: Kepada pengguna tempatan yang telah dilog masuk
       registrations:
-        closed_message:
-          desc_html: Dipaparkan di muka depan apabil pendaftaran ditutup. Anda boleh menggunakan penanda HTML
-          title: Mesej pendaftaran telah ditutup
-        deletion:
-          desc_html: Benarkan sesiapapun memadamkan akaun mereka
-          title: Buka pemadaman akaun
-        min_invite_role:
-          disabled: Tiada sesiapa
-          title: Benarkan jemputan dari
-        require_invite_text:
-          desc_html: Apabila pendaftaran memerlukan kelulusan manual, tandakan input teks "Kenapa anda mahu menyertai?" sebagai wajib, bukan pilihan
-          title: Memerlukan alasan bagi pengguna baru untuk menyertai
+        preamble: Kawal siapa yang boleh membuat akaun pada pelayan anda.
+        title: Pendaftaran
       registrations_mode:
         modes:
           approved: Kelulusan diperlukan untuk pendaftaran
           none: Tiada siapa boleh mendaftar
           open: Sesiapapun boleh mendaftar
-        title: Mod pendaftaran
+      title: Tetapan Pelayan
+    site_uploads:
+      delete: Hapuskan fail yang dimuat naik
+      destroyed_msg: Muat naik tapak berjaya dihapuskan!
+    statuses:
+      account: Penulis
+      deleted: Dipadamkan
+      favourites: Gemaran
+      history: Sejarah versi
+      language: Bahasa
+      media:
+        title: Media
+      metadata: Metadata
+      no_status_selected: Tiada hantaran diubah kerana tiada yang dipilih
+      open: Buka hantaran
+      original_status: Hantaran asal
+      reblogs: Ulang siar
+      status_changed: Hantaran diubah
+      title: Hantaran akaun
+      trending: Sohor kini
+    strikes:
+      actions:
+        delete_statuses: "%{name} memadam hantaran %{target}"
+        disable: "%{name} membekukan akaun %{target}"
+        mark_statuses_as_sensitive: "%{name} menandakan hantaran %{target} sebagai sensitif"
+        none: "%{name} menghantar amaran kepada %{target}"
+        sensitive: "%{name} menandakan akaun %{target} sebagai sensitif"
+        silence: "%{name} telah mengehadkan akaun %{target}"
+        suspend: "%{name} telah menggantungkan akaun %{target}"
+      appeal_approved: Dirayu
+      appeal_pending: Rayuan yang belum selesai
+    tags:
+      review: Semak status
+    title: Pentadbiran
+    trends:
+      allow: Izin
+      approved: Diluluskan
+      links:
+        allow: Membenarkan pautan
+        allow_provider: Membenarkan penerbit
+        title: Pautan yang sedang sohor kini
+      preview_card_providers:
+        rejected: Pautan daripada penerbit ini tidak akan menjadi sohor kini
+        title: Penerbit
+      rejected: Ditolak
+      statuses:
+        allow: Izinkan hantaran
+        allow_account: Izinkan penulis
+        disallow: Tidak membenarkan hantaran
+        disallow_account: Tidak membenarkan penulis
+        title: Hantaran hangat
+      tags:
+        current_score: Markah semasa %{score}
+        dashboard:
+          tag_accounts_measure: pengguna unik
+          tag_languages_dimension: Bahasa teratas
+          tag_servers_dimension: Pelayan teratas
+          tag_servers_measure: pelayan lain
+          tag_uses_measure: penggunaan keseluruhan
+        listable: Boleh dicadangkan
+        not_usable: Tidak boleh digunakan
+        peaked_on_and_decaying: Di atas pada %{date}, kini menurun
+        title: Tanda pagar sedang sohor kini
+        trendable: Boleh muncul di bawah sohor kini
+        trending_rank: 'Sohor kini #%{rank}'
+        usable: Boleh digunakan
+      title: Sohor kini
+      trending: Sohor kini
+    warning_presets:
+      delete: Padam
+    webhooks:
+      delete: Padam
+      enable: Dayakan
+      enabled: Aktif
+  admin_mailer:
+    new_appeal:
+      actions:
+        silence: untuk mengehadkan akaun mereka
+  appearance:
+    localization:
+      guide_link_text: Sesiapa sahaja boleh memberi sumbangan.
+    sensitive_content: Kandungan sensitif
+  application_mailer:
+    notification_preferences: Tukar keutamaan e-mel
+    view: 'Lihat:'
+    view_profile: Lihat profil
+    view_status: Lihat hantaran
+  auth:
+    change_password: Kata laluan
+    delete_account: Padam akaun
+    description:
+      prefix_sign_up: Daftar pada Mastodon hari ini!
+    forgot_password: Terlupa kata laluan anda?
+    log_in_with: Daftar masuk dengan
+    login: Daftar masuk
+    logout: Daftar keluar
+    migrate_account: Pindah kepada akaun lain
+    or_log_in_with: Atau daftar masuk dengan
+    register: Daftar
+    registration_closed: "%{instance} tidak menerima ahli-ahli baru"
+    security: Keselamatan
+    status:
+      account_status: Status akaun
+      view_strikes: Lihat pelanggaran yang lepas terhadap akaun anda
+    use_security_key: Gunakan kunci keselamatan
+  authorize_follow:
+    follow: Ikut
+    follow_request: 'Anda telah menghantar permintaan mengikut kepada:'
+    post_follow:
+      close: Atau anda boleh tutup tetingkap ini.
+      return: Tunjukkan profil pengguna
+      web: Pergi ke web
+    title: Ikuti %{acct}
+  challenge:
+    confirm: Teruskan
+    invalid_password: Kata laluan tidak sah
+    prompt: Sahkan kata laluan untuk teruskan
+  datetime:
+    distance_in_words:
+      half_a_minute: Sebentar tadi
+  deletes:
+    proceed: Padam akaun
+  disputes:
+    strikes:
+      action_taken: Tindakan diambil
+      appeal: Rayu
+      appeal_approved: Rayuan pelanggaran ini telah berjaya dan tidak lagi sah
+      appeal_rejected: Rayuan ini telah ditolak
+      appeal_submitted_at: Rayuan dihantar
+      appealed_msg: Rayuan anda sudah dikemukakan. Jika diluluskan, anda akan diberitahu.
+      appeals:
+        submit: Hantar rayuan
+      approve_appeal: Luluskan rayuan
+      associated_report: Laporan berkaitan
+      created_at: Tarikh
+      description_html: Ini ialah tindakan yang diambil terhadap akaun anda dan amaran telah dihantarkan kepada anda oleh staf %{instance}.
+      recipient: Ditujukan kepada
+      reject_appeal: Tolak rayuan
+      status: 'Hantaran #%{id}'
+      status_removed: Hantaran sudah dikeluarkan daripada sistem
+      title: "%{action} dari %{date}"
+      title_actions:
+        delete_statuses: Pemadaman hantaran
+        disable: Pembekuan akaun
+        mark_statuses_as_sensitive: Menandakan hantaran sebagai sensitif
+        none: Amaran
+        sensitive: Menandakan akaun sebagai sensitif
+        silence: Keterbatasan akaun
+        suspend: Penggantungan akaun
+      your_appeal_approved: Rayuan anda telah diluluskan
+      your_appeal_pending: Anda telah menghantar rayuan
+      your_appeal_rejected: Rayuan anda telah ditolak
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '422': 
-    '429': Too many requests
+    '400': Permintaan yang anda serahkan tidak sah atau salah bentuk.
+    '403': Anda tidak mempunyai kebenaran untuk melihat halaman ini.
+    '404': Halaman yang anda cari tiada di sini.
+    '406': Halaman ini tidak tersedia dalam format yang diminta.
+    '410': Halaman yang anda cari tidak wujud di sini lagi.
+    '422':
+      title: Pengesahan keselamatan gagal
+    '429': Terlalu banyak permintaan
     '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '503': Halaman tidak dapat disampaikan kerana kegagalan pelayan sementara.
   exports:
     archive_takeout:
       in_progress: Mengkompil arkib anda...
+      request: Minta arkib anda
+    csv: CSV
+    domain_blocks: Domain disekat
+    lists: Senarai
+  filters:
+    contexts:
+      account: Profil
+      notifications: Pemberitahuan
+    edit:
+      add_keyword: Tambah kata kunci
+      keywords: Kata kunci
+      title: Sunting penapis
+    index:
+      empty: Anda tiada penapis.
+      keywords:
+        other: "%{count} kata kunci"
+      statuses:
+        other: "%{count} hantaran"
+      title: Penapis
+    new:
+      save: Simpan penapis baru
+      title: Tambah penapis baru
+    statuses:
+      back_to_filter: Balik kepada penapis
+      index:
+        title: Hantaran ditapis
+  generic:
+    all: Semua
+    copy: Salin
+    delete: Padam
+    deselect: Nyahpilih semua
+    none: Tiada
+  imports:
+    upload: Muat naik
+  invites:
+    expires_in:
+      '1800': 30 minit
+      '21600': 6 jam
+      '3600': Sejam
+      '43200': 12 jam
+      '604800': Seminggu
+      '86400': Sehari
+    expires_in_prompt: Jangan
+  login_activities:
+    authentication_methods:
+      password: kata laluan
+      sign_in_token: e-mel kod keselamatan
+      webauthn: kunci keselamatan
+  migrations:
+    acct: Dipindah ke
+    proceed_with_move: Pindah pengikut
   notification_mailer:
-    digest:
-      title: Ketika anda tiada di sini...
+    follow:
+      title: Pengikut baru
+    follow_request:
+      title: Permintaan ikutan baru
+    mention:
+      action: Balas
+    update:
+      subject: "%{name} telah menyunting satu hantaran"
+  privacy_policy:
+    title: Dasar Privasi
+  relationships:
+    follow_selected_followers: Ikut pengikut yang dipilih
+    followers: Pengikut
+    following: Ikutan
+    last_active: Terakhir aktif
+    most_recent: Terkini
+    relationship: Hubungan
+    status: Status akaun
+  rss:
+    content_warning: 'Amaran kandungan:'
+  sessions:
+    activity: Aktiviti terakhir
+    browser: Pelayar
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      opera: Opera
+      otter: Otter
+      safari: Safari
+    current_session: Sesi sekarang
+    description: "%{browser} pada %{platform}"
+    explanation: Pelayar-pelayar web berikut sedang didaftar masuk pada akaun Mastodon anda.
+    ip: IP
+    platforms:
+      android: Android
+      ios: iOS
+      linux: Linux
+      other: platform tidak dikenali
+    title: Sesi
+  settings:
+    account: Akaun
+    account_settings: Tetapan akaun
+    delete: Pemadaman akaun
+    edit_profile: Sunting profil
+    export: Eksport data
+    featured_tags: Tanda pagar terpilih
+    import: Import
+    import_and_export: Import dan eksport
+    notifications: Pemberitahuan
+    preferences: Keutamaan
+    profile: Profil
+    relationships: Ikutan dan pengikut
+    statuses_cleanup: Pemadaman hantaran automatik
+    strikes: Pelanggaran penyederhanaan
+    two_factor_authentication: Pengesahan Dua Faktor
+    webauthn_authentication: Kunci keselamatan
+  statuses:
+    content_warning: 'Amaran kandungan: %{warning}'
+    default_language: Sama dengan bahasa antara muka
+    edited_at_html: Disunting %{date}
+    poll:
+      vote: Undi
+    sign_in_to_participate: Daftar masuk untuk menyertai perbualan
+    visibilities:
+      direct: Terus
+      private: Pengikut sahaja
+      public: Awam
+      public_long: Semua orang boleh melihat
+      unlisted: Tidak tersenarai
+  statuses_cleanup:
+    enabled: Padam hantaran lama secara automatik
+    keep_pinned: Simpan hantaran disemat
+    keep_pinned_hint: Tidak memadamkan mana-mana hantaran yang anda sematkan
+    keep_self_bookmark: Simpan hantaran yang anda menandabuku
+    keep_self_bookmark_hint: Tidak memadamkan hantaran anda jika anda sudah menandabukunya
+    keep_self_fav: Simpan hantaran yang anda gemarkan
+    keep_self_fav_hint: Tidak memadamkan hantaran anda jika anda telah menggemarkannya
+    min_age:
+      '1209600': 2 minggu
+      '15778476': 6 bulan
+      '2629746': Sebulan
+      '31556952': Setahun
+      '5259492': 2 bulan
+      '604800': Seminggu
+      '63113904': 2 tahun
+      '7889238': 3 bulan
+    min_favs: Simpan hantaran digemarkan sekurang-kurangnya
+    min_favs_hint: Tidak memadamkan mana-mana hantaran anda yang telah menerima sekurang-kurangnya jumlah gemaran ini. Biarkan kosong untuk memadamkan hantaran tanpa mengira nombor gemaran
+  stream_entries:
+    pinned: Hantaran disemat
+    sensitive_content: Kandungan sensitif
+  strikes:
+    errors:
+      too_late: Rayuan pelanggaran ini sudah terlalu lambat
+  two_factor_authentication:
+    add: Tambah
+    disable: Nyahdayakan 2FA
+    edit: Sunting
+    methods: Kaedah dua faktor
+    otp: App pengesahan
+  user_mailer:
+    appeal_approved:
+      action: Pergi ke akaun anda
+      explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah diluluskan. Akaun anda kini dalam kedudukan yang baik.
+      title: Rayuan diluluskan
+    appeal_rejected:
+      explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah ditolak.
+      title: Rayuan ditolak
+    suspicious_sign_in:
+      title: Daftar masuk baru
+    welcome:
+      subject: Selamat datang kepada Mastodon
+      title: Selamat datang, %{name}!
   users:
     follow_limit_reached: Anda tidak boleh mengikut lebih daripada %{limit} orang
+    signed_in_as: 'Didaftar masuk sebagai:'
+  verification:
+    verification: Pengesahan
+  webauthn_credentials:
+    invalid_credential: Kunci keselamatan tidak sah
+    not_supported: Pelayan ini tidak menyokong kunci keselamatan
+    otp_required: Untuk menggunakan kunci keselamatan, sila mengaktifkan pengesahan dua faktor dahulu.
+    registered_on: Didaftar pada %{date}
diff --git a/config/locales/my.yml b/config/locales/my.yml
new file mode 100644
index 000000000..399105ce0
--- /dev/null
+++ b/config/locales/my.yml
@@ -0,0 +1,12 @@
+---
+my:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c83c7224a..f0236d37a 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1,122 +1,64 @@
 ---
 nl:
   about:
-    about_hashtag_html: Dit zijn openbare toots die getagged zijn met <strong>#%{hashtag}</strong>. Je kunt er op reageren of iets anders mee doen als je op Mastodon (of ergens anders in de fediverse) een account hebt.
     about_mastodon_html: Mastodon is een sociaal netwerk dat gebruikt maakt van open webprotocollen en vrije software. Het is net zoals e-mail gedecentraliseerd.
-    about_this: Over deze server
-    active_count_after: actief
-    active_footnote: Actieve gebruikers per maand (MAU)
-    administered_by: 'Beheerd door:'
-    api: API
-    apps: Mobiele apps
-    apps_platforms: Gebruik Mastodon op iOS, Android en op andere platformen
-    browse_directory: Gebruikersgids doorbladeren en op interesses filteren
-    browse_local_posts: Livestream van openbare berichten op deze server bekijken
-    browse_public_posts: Livestream van openbare Mastodonberichten bekijken
-    contact: Contact
     contact_missing: Niet ingesteld
     contact_unavailable: n.v.t
-    discover_users: Gebruikers ontdekken
-    documentation: Documentatie
-    federation_hint_html: Met een account op %{instance} ben je in staat om mensen die zich op andere Mastodonservers (en op andere plekken) bevinden te volgen.
-    get_apps: Mobiele apps
     hosted_on: Mastodon op %{domain}
-    instance_actor_flash: "Dit account is een virtuel actor dat wordt gebruikt om de server zelf te vertegenwoordigen en is geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden geblokkeerd, tenzij je de hele server wilt blokkeren. In zo'n geval dien je echter een domeinblokkade te gebruiken. \n"
-    learn_more: Meer leren
-    privacy_policy: Privacybeleid
-    rules: Serverregels
-    rules_html: 'Hieronder vind je een samenvatting van de regels die je op deze Mastodon-server moet opvolgen:'
-    see_whats_happening: Kijk wat er aan de hand is
-    server_stats: 'Serverstatistieken:'
-    source_code: Broncode
-    status_count_after:
-      one: toot
-      other: toots
-    status_count_before: Zij schreven
-    tagline: Vrienden volgen en nieuwe ontdekken
-    terms: Gebruiksvoorwaarden
-    unavailable_content: Gemodereerde servers
-    unavailable_content_description:
-      domain: Server
-      reason: 'Reden:'
-      rejecting_media: 'Mediabestanden van deze server worden niet verwerkt en er worden geen thumbnails getoond. Je moet handmatig naar deze server doorklikken om de mediabestanden te kunnen bekijken:'
-      rejecting_media_title: Mediabestanden geweigerd
-      silenced: Toots van deze server worden nergens weergegeven, behalve op jouw eigen starttijdlijn wanneer je het account volgt.
-      silenced_title: Genegeerde servers
-      suspended: Je bent niet in staat om iemand van deze server te volgen, en er worden geen gegevens van deze server verwerkt of opgeslagen, en met deze server uitgewisseld.
-      suspended_title: Opgeschorte servers
-    unavailable_content_html: Met Mastodon kun je in het algemeen berichten bekijken van en communiceren met gebruikers van elke andere server in de fediverse. Dit zijn de uitzonderingen die door deze server zijn gemaakt en expliciet alleen hier gelden.
-    user_count_after:
-      one: gebruiker
-      other: gebruikers
-    user_count_before: Thuisbasis van
-    what_is_mastodon: Wat is Mastodon?
+    title: Over
   accounts:
-    choices_html: 'Aanbevelingen van %{name}:'
-    endorsements_hint: Je kunt mensen die je volgt in de webomgeving aanbevelen, waarna ze dan hier zullen verschijnen.
-    featured_tags_hint: Je kunt specifieke hashtags uitlichten, waarna ze dan hier zullen verschijnen.
     follow: Volgen
     followers:
       one: Volger
       other: Volgers
     following: Volgend
-    instance_actor_flash: Dit account is een 'virtual actor' waarmee de server zichzelf vertegenwoordigd en is dus geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden opgeschort.
-    joined: Geregistreerd in %{date}
+    instance_actor_flash: Dit account is een 'virtual actor' waarmee de server zichzelf vertegenwoordigt en is dus geen individuele gebruiker. Het wordt voor federatiedoeleinden gebruikt en moet niet worden opgeschort.
     last_active: laatst actief
     link_verified_on: Eigendom van deze link is gecontroleerd op %{date}
-    media: Media
-    moved_html: "%{name} is verhuisd naar %{new_profile_link}:"
-    network_hidden: Deze informatie is niet beschikbaar
-    never_active: Nooit
     nothing_here: Hier is niets!
-    people_followed_by: Mensen die %{name} volgen
-    people_who_follow: Mensen die %{name} volgen
     pin_errors:
-      following: Je moet dit account wel al volgen, alvorens je het kan aanbevelen
+      following: Je moet dit account wel al volgen, alvorens je het kunt aanbevelen
     posts:
       one: Toot
-      other: Toots
-    posts_tab_heading: Toots
-    posts_with_replies: Toots en reacties
-    roles:
-      admin: Beheerder
-      bot: Bot
-      group: Groep
-      moderator: Moderator
-    unavailable: Profiel niet beschikbaar
-    unfollow: Ontvolgen
+      other: Berichten
+    posts_tab_heading: Berichten
   admin:
     account_actions:
       action: Actie uitvoeren
-      title: Moderatieactie op %{acct} uitvoeren
+      title: Moderatiemaatregel tegen %{acct} nemen
     account_moderation_notes:
       create: Laat een opmerking achter
       created_msg: Aanmaken van opmerking voor moderatoren geslaagd!
-      delete: Verwijderen
       destroyed_msg: Verwijderen van opmerking voor moderatoren geslaagd!
     accounts:
       add_email_domain_block: E-maildomein blokkeren
       approve: Goedkeuren
-      approve_all: Alles goedkeuren
-      approved_msg: Het goedkeuren van het registratieverzoek van %{username} is geslaagd
+      approved_msg: Het goedkeuren van het account van %{username} is geslaagd
       are_you_sure: Weet je het zeker?
-      avatar: Avatar
+      avatar: Profielfoto
       by_domain: Domein
       change_email:
-        changed_msg: E-mailadres van account succesvol veranderd!
+        changed_msg: E-mailadres succesvol veranderd!
         current_email: Huidig e-mailadres
         label: E-mailadres wijzigen
         new_email: Nieuw e-mailadres
         submit: E-mailadres veranderen
         title: E-mailadres wijzigen voor %{username}
+      change_role:
+        changed_msg: Rol succesvol veranderd!
+        label: Rol veranderen
+        no_role: Geen rol
+        title: Rol van %{username} veranderen
       confirm: Bevestigen
       confirmed: Bevestigd
       confirming: Bevestiging
+      custom: Handmatig
       delete: Gegevens verwijderen
       deleted: Verwijderd
       demote: Degraderen
       destroyed_msg: De verwijdering van de gegevens van %{username} staat nu in de wachtrij
       disable: Bevriezen
+      disable_sign_in_token_auth: Verificatie met een toegangscode via e-mail uitschakelen
       disable_two_factor_authentication: 2FA uitschakelen
       disabled: Bevroren
       display_name: Weergavenaam
@@ -125,6 +67,7 @@ nl:
       email: E-mail
       email_status: E-mailstatus
       enable: Ontdooien
+      enable_sign_in_token_auth: Verificatie met een toegangscode via e-mail inschakelen
       enabled: Ingeschakeld
       enabled_msg: Het ontdooien van het account van %{username} is geslaagd
       followers: Volgers
@@ -134,7 +77,7 @@ nl:
       invite_request_text: Redenen om te registreren
       invited_by: Uitgenodigd door
       ip: IP
-      joined: Geregistreerd in
+      joined: Geregistreerd
       location:
         all: Alles
         local: Lokaal
@@ -149,7 +92,7 @@ nl:
         active: Actief
         all: Alles
         pending: In afwachting
-        silenced: Genegeerd
+        silenced: Beperkt
         suspended: Opgeschort
         title: Moderatie
       moderation_notes: Opmerkingen voor moderatoren
@@ -157,39 +100,43 @@ nl:
       most_recent_ip: Laatst gebruikt IP-adres
       no_account_selected: Er zijn geen accounts veranderd, omdat er geen een was geselecteerd
       no_limits_imposed: Geen limieten ingesteld
+      no_role_assigned: Geen rol toegewezen
       not_subscribed: Niet geabonneerd
       pending: Moet nog beoordeeld worden
       perform_full_suspension: Opschorten
+      previous_strikes: Eerdere overtredingen
+      previous_strikes_description_html:
+        one: Dit account heeft <strong>één</strong> overtreding gemaakt.
+        other: Dit account heeft <strong>%{count}</strong> overtredingen gemaakt.
       promote: Promoveren
       protocol: Protocol
       public: Openbaar
       push_subscription_expires: PuSH-abonnement verloopt op
       redownload: Profiel vernieuwen
       redownloaded_msg: Het herstellen van het oorspronkelijke profiel van %{username} is geslaagd
-      reject: Afkeuren
-      reject_all: Alles afkeuren
+      reject: Afwijzen
       rejected_msg: Het afwijzen van het registratieverzoek van %{username} is geslaagd
-      remove_avatar: Avatar verwijderen
+      remote_suspension_irreversible: De gegevens van dit account zijn onomkeerbaar verwijderd.
+      remote_suspension_reversible_hint_html: Dit account is opgeschort op hun server en de gegevens worden volledig verwijderd op %{date}. Tot die tijd kan de externe server dit account herstellen zonder nadelige gevolgen. Wanneer je alle gegevens van dit account onmiddellijk wilt verwijderen, kun je dit hieronder doen.
+      remove_avatar: Profielfoto verwijderen
       remove_header: Omslagfoto verwijderen
-      removed_avatar_msg: Het verwijderen van de avatar van %{username} is geslaagd
+      removed_avatar_msg: Het verwijderen van de profielfoto van %{username} is geslaagd
       removed_header_msg: Het verwijderen van de omslagfoto van %{username} is geslaagd
       resend_confirmation:
         already_confirmed: Deze gebruiker is al bevestigd
-        send: Verzend bevestigingsmail opnieuw
+        send: Bevestigingsmail opnieuw verzenden
         success: Bevestigingsmail succesvol verzonden!
       reset: Opnieuw
       reset_password: Wachtwoord opnieuw instellen
       resubscribe: Opnieuw abonneren
-      role: Bevoegdheden
-      roles:
-        admin: Beheerder
-        moderator: Moderator
-        staff: Medewerkers
-        user: Gebruiker
+      role: Rol
       search: Zoeken
       search_same_email_domain: Andere gebruikers met hetzelfde e-maildomein
       search_same_ip: Andere gebruikers met hetzelfde IP-adres
-      sensitive: Gevoelig
+      security_measures:
+        only_password: Alleen wachtwoord
+        password_and_2fa: Wachtwoord en tweestapsverificatie
+      sensitive: Gevoelig forceren
       sensitized: als gevoelig gemarkeerd
       shared_inbox_url: Gedeelde inbox-URL
       show:
@@ -197,16 +144,19 @@ nl:
         targeted_reports: Door anderen gerapporteerd
       silence: Beperken
       silenced: Beperkt
-      statuses: Toots
+      statuses: Berichten
+      strikes: Eerdere overtredingen
       subscribe: Abonneren
+      suspend: Opschorten
       suspended: Opgeschort
       suspension_irreversible: De gegevens van dit account zijn onomkeerbaar verwijderd. Je kunt het opschorten van dit account ongedaan maken zodat het weer valt te gebruiken, maar de verwijderde gegevens worden hiermee niet hersteld.
       suspension_reversible_hint_html: Dit account is opgeschort en de gegevens worden volledig verwijderd op %{date}. Tot die tijd kan dit account worden hersteld zonder nadelige gevolgen. Wanneer je alle gegevens van dit account onmiddellijk wilt verwijderen, kun je dit hieronder doen.
-      time_in_queue: "%{time} in de wachtrij"
       title: Accounts
+      unblock_email: E-mailadres deblokkeren
+      unblocked_email_msg: Het e-mailadres van %{username} is gedeblokkeerd
       unconfirmed_email: Onbevestigd e-mailadres
-      undo_sensitized: Niet meer als gevoelig markeren
-      undo_silenced: Niet langer negeren
+      undo_sensitized: Niet meer als gevoelig forceren
+      undo_silenced: Niet langer beperken
       undo_suspension: Niet langer opschorten
       unsilenced_msg: Het opheffen van de beperkingen van %{username} zijn geslaagd
       unsubscribe: Opzeggen
@@ -218,92 +168,124 @@ nl:
       whitelisted: Goedgekeurd voor federatie
     action_logs:
       action_types:
+        approve_appeal: Bezwaar goedkeuren
+        approve_user: Gebruiker goedkeuren
         assigned_to_self_report: Rapportage toewijzen
         change_email_user: E-mailadres van gebruiker wijzigen
+        change_role_user: Gebruikersrol wijzigen
         confirm_user: Gebruiker bevestigen
         create_account_warning: Waarschuwing aanmaken
         create_announcement: Mededeling aanmaken
+        create_canonical_email_block: E-mailblokkade aanmaken
         create_custom_emoji: Lokale emoji aanmaken
         create_domain_allow: Domeingoedkeuring aanmaken
         create_domain_block: Domeinblokkade aanmaken
         create_email_domain_block: E-maildomeinblokkade aanmaken
         create_ip_block: IP-regel aanmaken
         create_unavailable_domain: Niet beschikbaar domein aanmaken
+        create_user_role: Rol aanmaken
         demote_user: Gebruiker degraderen
         destroy_announcement: Mededeling verwijderen
+        destroy_canonical_email_block: E-mailblokkade verwijderen
         destroy_custom_emoji: Lokale emoji verwijderen
         destroy_domain_allow: Domeingoedkeuring verwijderen
         destroy_domain_block: Domeinblokkade verwijderen
-        destroy_email_domain_block: E-maildomeinblokkade verwijderen
+        destroy_email_domain_block: Blokkade van e-maildomein verwijderen
+        destroy_instance: Domein volledig verwijderen
         destroy_ip_block: IP-regel verwijderen
         destroy_status: Toot verwijderen
         destroy_unavailable_domain: Niet beschikbaar domein verwijderen
+        destroy_user_role: Rol permanent verwijderen
         disable_2fa_user: Tweestapsverificatie uitschakelen
         disable_custom_emoji: Lokale emojij uitschakelen
+        disable_sign_in_token_auth_user: Verificatie met een toegangscode via e-mail voor de gebruiker uitschakelen
         disable_user: Gebruiker uitschakelen
         enable_custom_emoji: Lokale emoji inschakelen
+        enable_sign_in_token_auth_user: Verificatie met een toegangscode via e-mail voor de gebruiker inschakelen
         enable_user: Gebruiker inschakelen
         memorialize_account: Het account in een In memoriam veranderen
         promote_user: Gebruiker promoveren
-        remove_avatar_user: Avatar verwijderen
+        reject_appeal: Bezwaar afwijzen
+        reject_user: Gebruiker afwijzen
+        remove_avatar_user: Profielfoto verwijderen
         reopen_report: Rapportage heropenen
+        resend_user: Bevestigingsmail opnieuw verzenden
         reset_password_user: Wachtwoord opnieuw instellen
         resolve_report: Rapportage oplossen
         sensitive_account: De media in jouw account als gevoelig markeren
-        silence_account: Account negeren
+        silence_account: Account beperken
         suspend_account: Account opschorten
         unassigned_report: Rapportage niet langer toewijzen
+        unblock_email_account: E-mailadres deblokkeren
         unsensitive_account: De media in jouw account niet langer als gevoelig markeren
-        unsilence_account: Account niet langer negeren
+        unsilence_account: Account niet langer beperken
         unsuspend_account: Account niet langer opschorten
         update_announcement: Mededeling bijwerken
         update_custom_emoji: Lokale emoji bijwerken
         update_domain_block: Domeinblokkade bijwerken
-        update_status: Toot bijwerken
+        update_ip_block: IP-regel bijwerken
+        update_status: Bericht bijwerken
+        update_user_role: Rol bijwerken
       actions:
+        approve_appeal_html: "%{name} heeft het bezwaar tegen de moderatiemaatregel van %{target} goedgekeurd"
+        approve_user_html: "%{name} heeft het account van %{target} goedgekeurd"
         assigned_to_self_report_html: "%{name} heeft rapportage %{target} aan zichzelf toegewezen"
         change_email_user_html: "%{name} veranderde het e-mailadres van gebruiker %{target}"
+        change_role_user_html: "%{name} wijzigde de rol van %{target}"
         confirm_user_html: E-mailadres van gebruiker %{target} is door %{name} bevestigd
         create_account_warning_html: "%{name} verzond een waarschuwing naar %{target}"
         create_announcement_html: "%{name} heeft de nieuwe mededeling %{target} aangemaakt"
+        create_canonical_email_block_html: "%{name} blokkeerde e-mail met de hash %{target}"
         create_custom_emoji_html: Nieuwe emoji %{target} is door %{name} geüpload
         create_domain_allow_html: "%{name} heeft de federatie met het domein %{target} goedgekeurd"
         create_domain_block_html: Domein %{target} is door %{name} geblokkeerd
         create_email_domain_block_html: "%{name} heeft het e-maildomein %{target} geblokkeerd"
         create_ip_block_html: "%{name} maakte regel aan voor IP %{target}"
         create_unavailable_domain_html: "%{name} heeft de bezorging voor domein %{target} beëindigd"
+        create_user_role_html: "%{name} maakte de rol %{target} aan"
         demote_user_html: Gebruiker %{target} is door %{name} gedegradeerd
         destroy_announcement_html: "%{name} heeft de mededeling %{target} verwijderd"
-        destroy_custom_emoji_html: "%{name} verwijderde emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} deblokkeerde e-mail met de hash %{target}"
+        destroy_custom_emoji_html: "%{name} verwijderde de emoji %{target}"
         destroy_domain_allow_html: "%{name} heeft de federatie met het domein %{target} afgekeurd"
         destroy_domain_block_html: Domein %{target} is door %{name} gedeblokkeerd
         destroy_email_domain_block_html: "%{name} heeft het e-maildomein %{target} gedeblokkeerd"
+        destroy_instance_html: "%{name} verwijderde het domein %{target} volledig"
         destroy_ip_block_html: "%{name} verwijderde regel voor IP %{target}"
-        destroy_status_html: Toot van %{target} is door %{name} verwijderd
+        destroy_status_html: Bericht van %{target} is door %{name} verwijderd
         destroy_unavailable_domain_html: "%{name} heeft de bezorging voor domein %{target} hervat"
+        destroy_user_role_html: "%{name} verwijderde de rol %{target}"
         disable_2fa_user_html: De vereiste tweestapsverificatie voor %{target} is door %{name} uitgeschakeld
         disable_custom_emoji_html: Emoji %{target} is door %{name} uitgeschakeld
+        disable_sign_in_token_auth_user_html: "%{name} heeft verificatie met een toegangscode via e-mail uitgeschakeld voor %{target}"
         disable_user_html: Inloggen voor %{target} is door %{name} uitgeschakeld
         enable_custom_emoji_html: Emoji %{target} is door %{name} ingeschakeld
+        enable_sign_in_token_auth_user_html: "%{name} heeft verificatie met een toegangscode via e-mail ingeschakeld voor %{target}"
         enable_user_html: Inloggen voor %{target} is door %{name} ingeschakeld
         memorialize_account_html: Het account %{target} is door %{name} in een In memoriam veranderd
         promote_user_html: Gebruiker %{target} is door %{name} gepromoveerd
-        remove_avatar_user_html: "%{name} verwijderde de avatar van %{target}"
+        reject_appeal_html: "%{name} heeft het bezwaar tegen de moderatiemaatregel van %{target} afgewezen"
+        reject_user_html: "%{name} heeft de registratie van %{target} afgewezen"
+        remove_avatar_user_html: "%{name} verwijderde de profielfoto van %{target}"
         reopen_report_html: "%{name} heeft rapportage %{target} heropend"
+        resend_user_html: "%{name} heeft de bevestigingsmail voor %{target} opnieuw verzonden"
         reset_password_user_html: Wachtwoord van gebruiker %{target} is door %{name} opnieuw ingesteld
         resolve_report_html: "%{name} heeft rapportage %{target} opgelost"
         sensitive_account_html: "%{name} markeerde de media van %{target} als gevoelig"
         silence_account_html: Account %{target} is door %{name} beperkt
         suspend_account_html: Account %{target} is door %{name} opgeschort
         unassigned_report_html: "%{name} heeft het toewijzen van rapportage %{target} ongedaan gemaakt"
+        unblock_email_account_html: "%{name} deblokkeerde het e-mailadres van %{target}"
         unsensitive_account_html: "%{name} markeerde media van %{target} als niet gevoelig"
         unsilence_account_html: Beperking van account %{target} is door %{name} opgeheven
         unsuspend_account_html: Opschorten van account %{target} is door %{name} opgeheven
         update_announcement_html: "%{name} heeft de mededeling %{target} bijgewerkt"
         update_custom_emoji_html: Emoji %{target} is door %{name} bijgewerkt
         update_domain_block_html: "%{name} heeft de domeinblokkade bijgewerkt voor %{target}"
-        update_status_html: "%{name} heeft de toots van %{target} bijgewerkt"
-      deleted_status: "(verwijderde toot}"
+        update_ip_block_html: "%{name} wijzigde de IP-regel voor %{target}"
+        update_status_html: "%{name} heeft de berichten van %{target} bijgewerkt"
+        update_user_role_html: "%{name} wijzigde de rol %{target}"
+      deleted_account: verwijderd account
       empty: Geen logs gevonden.
       filter_by_action: Op actie filteren
       filter_by_user: Op gebruiker filteren
@@ -342,11 +324,12 @@ nl:
       enable: Inschakelen
       enabled: Ingeschakeld
       enabled_msg: Inschakelen van deze emoji geslaagd
-      image_hint: PNG van max. 50KB
+      image_hint: PNG of GIF niet groter dan %{size}
       list: In lijst
       listed: Weergegeven
       new:
         title: Lokale emoji toevoegen
+      no_emoji_selected: Er werden geen emoji's gewijzigd, omdat er geen enkele werd geselecteerd
       not_permitted: Het hebt geen rechten om deze actie uit te voeren
       overwrite: Overschrijven
       shortcode: Verkorte code
@@ -359,13 +342,41 @@ nl:
       updated_msg: Bijwerken van emoji is geslaagd!
       upload: Uploaden
     dashboard:
+      active_users: actieve gebruikers
+      interactions: interacties
+      media_storage: Opgeslagen mediabestanden
+      new_users: nieuwe gebruikers
+      opened_reports: aangemaakte rapportages
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> bezwaar te beoordelen"
+        other: "<strong>%{count}</strong> bezwaren te beoordelen"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> openstaande rapportage"
+        other: "<strong>%{count}</strong> openstaande rapportages"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag te beoordelen"
+        other: "<strong>%{count}</strong> hashtags te beoordelen"
+      pending_users_html:
+        one: "<strong>%{count}</strong> nieuwe gebruiker te beoordelen"
+        other: "<strong>%{count}</strong> nieuwe gebruikers te beoordelen"
+      resolved_reports: opgeloste rapportages
       software: Software
+      sources: Locatie van registratie
       space: Ruimtegebruik
       title: Dashboard
+      top_languages: Meest actieve talen
+      top_servers: Meest actieve servers
+      website: Website
+    disputes:
+      appeals:
+        empty: Geen bezwaren gevonden.
+        title: Bezwaren
     domain_allows:
       add_new: Federatie met domein goedkeuren
       created_msg: Federatie met domein is succesvol goedgekeurd
       destroyed_msg: Federatie met domein is afgekeurd
+      export: Exporteren
+      import: Importeren
       undo: Federatie met domein afkeuren
     domain_blocks:
       add_new: Nieuwe domeinblokkade toevoegen
@@ -373,16 +384,21 @@ nl:
       destroyed_msg: Domeinblokkade is ongedaan gemaakt
       domain: Domein
       edit: Domeinblokkade bewerken
+      existing_domain_block: Je hebt al strengere limieten opgelegd aan %{name}.
       existing_domain_block_html: Jij hebt al strengere beperkingen opgelegd aan %{name}, je moet het domein eerst <a href="%{unblock_url}">deblokkeren</a>.
+      export: Exporteren
+      import: Importeren
       new:
         create: Blokkade aanmaken
         hint: Een domeinblokkade voorkomt niet dat accountgegevens van dit domein aan de database worden toegevoegd, maar dat er met terugwerkende kracht en automatisch bepaalde moderatiemethoden op deze accounts worden toegepast.
         severity:
-          desc_html: "<strong>Negeren</strong> zorgt ervoor dat berichten van accounts van dit domein voor iedereen onzichtbaar zijn, behalve als een account wordt gevolgd. <strong>Opschorten</strong> zorgt ervoor dat alle berichten, media en profielgegevens van accounts van dit domein worden verwijderd. Gebruik <strong>Geen</strong> wanneer je alleen mediabestanden wilt weigeren."
+          desc_html: "<strong>Beperken</strong> zorgt ervoor dat berichten van accounts van dit domein voor iedereen onzichtbaar zijn, behalve als een account wordt gevolgd. <strong>Opschorten</strong> zorgt ervoor dat alle berichten, media en profielgegevens van accounts van dit domein worden verwijderd. Gebruik <strong>Geen</strong> wanneer je alleen mediabestanden wilt weigeren."
           noop: Geen
-          silence: Negeren
+          silence: Beperken
           suspend: Opschorten
         title: Nieuwe domeinblokkade
+      no_domain_block_selected: Er zijn geen domeinblokkades gewijzigd, omdat er niets werd geselecteerd
+      not_permitted: Je bent niet bevoegd om deze actie uit te voeren
       obfuscate: Domeinnaam verdoezelen
       obfuscate_hint: De domeinnaam gedeeltelijk verdoezelen wanneer de lijst met domeinblokkades wordt getoond
       private_comment: Privé-opmerking
@@ -393,62 +409,97 @@ 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
-      rejecting_media: mediabestanden worden geweigerd
-      rejecting_reports: rapportages worden geweigerd
-      severity:
-        silence: genegeerd
-        suspend: opgeschort
-      show:
-        affected_accounts:
-          one: Eén account in de database aangepast
-          other: "%{count} accounts in de database aangepast"
-        retroactive:
-          silence: Alle genegeerde accounts van dit domein niet langer negeren
-          suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
-        title: Domeinblokkade voor %{domain} ongedaan maken
-        undo: Ongedaan maken
       undo: domeinblokkade ongedaan maken
       view: Domeinblokkade bekijken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
+      attempts_over_week:
+        one: "%{count} registratiepoging tijdens de afgelopen week"
+        other: "%{count} registratiepogingen tijdens de afgelopen week"
       created_msg: Blokkeren e-maildomein geslaagd
       delete: Verwijderen
-      destroyed_msg: Deblokkeren e-maildomein geslaagd
+      dns:
+        types:
+          mx: MX-record
       domain: Domein
-      empty: Momenteel worden er geen e-maildomeinen geblokkeerd.
-      from_html: van %{domain}
       new:
         create: Blokkeren
+        resolve: Domein opzoeken
         title: Nieuw e-maildomein blokkeren
+      no_email_domain_block_selected: Er werden geen e-maildomeinblokkades gewijzigd, omdat er geen enkele werd geselecteerd
+      resolved_dns_records_hint_html: De domeinnaam slaat op de volgende MX-domeinen die uiteindelijk verantwoordelijk zijn voor het accepteren van e-mail. Het blokkeren van een MX-domein blokkeert aanmeldingen van elk e-mailadres dat hetzelfde MX-domein gebruikt, zelfs als de zichtbare domeinnaam anders is. <strong>Pas op dat u geen grote e-mailproviders blokkeert.</strong>
+      resolved_through_html: Geblokkeerd via %{domain}
       title: Geblokkeerde e-maildomeinen
+    export_domain_allows:
+      new:
+        title: Toegestane domeinen importeren
+      no_file: Geen bestand geselecteerd
+    export_domain_blocks:
+      import:
+        description_html: Je staat op het punt een lijst met domeinblokkades te importeren. Controleer deze lijst zeer zorgvuldig, vooral als je deze lijst niet zelf hebt gemaakt.
+        existing_relationships_warning: Bestaande volgrelaties
+        private_comment_description_html: 'Om je te helpen bijhouden waar de geïmporteerde blokkades vandaan komen, worden de geïmporteerde blokkades met de volgende privé-opmerking aangemaakt: <q>%{comment}</q>'
+        private_comment_template: Geïmporteerd van %{source} op %{date}
+        title: Domeinblokkades importeren
+      new:
+        title: Domeinblokkades importeren
+      no_file: Geen bestand geselecteerd
     follow_recommendations:
       description_html: "<strong>Deze aanbevolen accounts helpen nieuwe gebruikers snel interessante inhoud</strong>te vinden. Wanneer een gebruiker niet met andere gebruikers genoeg interactie heeft gehad om gepersonaliseerde aanbevelingen te krijgen, worden in plaats daarvan deze accounts aanbevolen. Deze accounts worden dagelijks opnieuw berekend met behulp van accounts met het hoogste aantal recente interacties en het hoogste aantal lokale volgers in een bepaalde taal."
       language: Voor taal
       status: Status
       suppress: Aanbevolen account niet meer aanbevelen
-      suppressed: Account niet meer aanbevolen
+      suppressed: Niet meer aanbevolen
       title: Aanbevolen accounts
       unsuppress: Account weer aanbevelen
     instances:
+      availability:
+        description_html:
+          one: Als de bezorging aan het domein gedurende <strong>%{count} dag</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
+          other: Als de bezorging aan het domein gedurende <strong>%{count} verschillende dagen</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
+        failure_threshold_reached: Foutieve drempelwaarde bereikt op %{date}.
+        failures_recorded:
+          one: Mislukte poging op %{count} dag.
+          other: Mislukte pogingen op %{count} verschillende dagen.
+        no_failures_recorded: Geen storingen bekend.
+        title: Beschikbaarheid
+        warning: De laatste poging om met deze server te verbinden was onsuccesvol
       back_to_all: Alles
       back_to_limited: Beperkt
       back_to_warning: Waarschuwing
       by_domain: Domein
+      confirm_purge: Weet je zeker dat je de gegevens van dit domein permanent wilt verwijderen?
+      content_policies:
+        comment: Interne reden
+        description_html: Je kunt het beleid bepalen dat op de accounts van dit domein en alle subdomeinen van toepassing is.
+        policies:
+          reject_media: Mediabestanden weigeren
+          reject_reports: Rapportages weigeren
+          silence: Beperkt
+          suspend: Opgeschort
+        policy: Zwaarte
+        reason: Publieke reden
+        title: Beleid
+      dashboard:
+        instance_accounts_dimension: Meest door ons gevolgde accounts
+        instance_accounts_measure: opgeslagen accounts
+        instance_followers_measure: daar ons daar gevolgd
+        instance_follows_measure: door hun hier gevolgd
+        instance_languages_dimension: Meest actieve talen
+        instance_media_attachments_measure: opgeslagen mediabestanden
+        instance_reports_measure: rapportages over hun
+        instance_statuses_measure: opgeslagen berichten
       delivery:
         all: Alles
         clear: Bezorgfouten weghalen
+        failing: Problemen
         restart: Bezorging herstarten
         stop: Bezorging beëindigen
-        title: Bezorging
         unavailable: Niet beschikbaar
-        unavailable_message: Bezorging is niet beschikbaar
-        warning: Waarschuwing
-        warning_message:
-          one: Bezorgingsfout voor %{count} dag
-          other: Bezorgfout voor %{count} dagen
       delivery_available: Bezorging is mogelijk
       delivery_error_days: Dagen met bezorgfouten
       delivery_error_hint: Wanneer de bezorging voor %{count} dagen niet mogelijk is, wordt de bezorging automatisch als niet beschikbaar gemarkeerd.
+      destroyed_msg: Gegevens van %{domain} staan nu in de wachtrij voor aanstaande verwijdering.
       empty: Geen domeinen gevonden.
       known_accounts:
         one: "%{count} bekend account"
@@ -459,12 +510,15 @@ nl:
         title: Moderatie
       private_comment: Privé-opmerking
       public_comment: Openbare opmerking
+      purge: Volledig verwijderen
+      purge_description_html: Als je denkt dat dit domein definitief offline is, kunt je alle accountrecords en bijbehorende gegevens van dit domein verwijderen. Dit kan een tijdje duren.
       title: Federatie
       total_blocked_by_us: Door ons geblokkeerd
       total_followed_by_them: Door hun gevolgd
       total_followed_by_us: Door ons gevolgd
       total_reported: Rapportages over hun
       total_storage: Mediabijlagen
+      totals_time_period_hint_html: De hieronder getoonde totalen bevatten gegevens sinds het begin.
     invites:
       deactivate_all: Alles deactiveren
       filter:
@@ -488,24 +542,22 @@ nl:
         title: Nieuwe IP-regel aanmaken
       no_ip_block_selected: Er zijn geen IP-regels veranderd, omdat er geen een was geselecteerd
       title: IP-regels
-    pending_accounts:
-      title: Accounts in afwachting (%{count})
     relationships:
       title: Relaties van %{acct}
     relays:
       add_new: Nieuwe relayserver toevoegen
       delete: Verwijderen
-      description_html: Een <strong>federatierelay</strong> is een tussenliggende server die grote hoeveelheden openbare toots uitwisselt tussen servers die zich hierop hebben geabonneerd. <strong>Het kan kleine en middelgrote servers helpen om content uit de fediverse te ontdekken</strong>, waarvoor anders lokale gebruikers handmatig mensen van externe servers moeten volgen.
+      description_html: Een <strong>federatierelay</strong> is een tussenliggende server die grote hoeveelheden openbare berichten uitwisselt tussen servers die zich hierop hebben geabonneerd. <strong>Het kan kleine en middelgrote servers helpen om content van de fediverse te ontdekken</strong>, waarvoor anders lokale gebruikers handmatig mensen van externe servers moeten volgen.
       disable: Uitschakelen
       disabled: Uitgeschakeld
       enable: Inschakelen
-      enable_hint: Eenmaal ingeschakeld gaat jouw server zich op alle openbare toots van deze relayserver abonneren en stuurt het de openbare toots van jouw server naar de relayserver.
+      enable_hint: Eenmaal ingeschakeld gaat jouw server zich op alle openbare berichten van deze relayserver abonneren en stuurt het de openbare berichten van jouw server naar de relayserver.
       enabled: Ingeschakeld
       inbox_url: Relay-URL
       pending: Aan het wachten op toestemming van de relayserver
       save_and_enable: Opslaan en inschakelen
       setup: Een verbinding met een relayserver maken
-      signatures_not_enabled: Federatierelays werken niet goed wanneer de veilige modus of de beperkte federatiemodus is ingeschakeld
+      signatures_not_enabled: Federatierelays werken mogelijk niet goed wanneer de veilige modus of de beperkte federatiemodus is ingeschakeld
       status: Status
       title: Relayservers
     report_notes:
@@ -516,38 +568,121 @@ nl:
         notes:
           one: "%{count} opmerking"
           other: "%{count} opmerkingen"
-        reports:
-          one: "%{count} rapportage"
-          other: "%{count} rapportages"
-      action_taken_by: Actie uitgevoerd door
+      action_log: Auditlog
+      action_taken_by: Maatregel genomen door
+      actions:
+        delete_description_html: De gerapporteerde berichten worden verwijderd en er wordt een overtreding geregistreerd om toekomstige overtredingen van hetzelfde account sneller af te kunnen handelen.
+        mark_as_sensitive_description_html: De media in de gerapporteerde berichten worden gemarkeerd als gevoelig en er wordt een overtreding geregistreerd om toekomstige overtredingen van hetzelfde account sneller af te kunnen handelen.
+        other_description_html: Bekijk meer opties voor het controleren van het gedrag van en de communicatie met het gerapporteerde account.
+        resolve_description_html: Er wordt tegen het gerapporteerde account geen maatregel genomen, geen overtreding geregistreerd en de rapportage wordt gemarkeerd als opgelost.
+        silence_description_html: Het profiel zal alleen zichtbaar zijn voor diegenen die het al volgen of het handmatig opzoeken, waardoor het bereik ernstig wordt beperkt. Kan altijd worden teruggedraaid.
+        suspend_description_html: Het profiel en alle accountgegevens worden eerst ontoegankelijk gemaakt, totdat deze uiteindelijk onomkeerbaar worden verwijderd. Het is niet meer mogelijk om interactie te hebben met het account. Dit kan binnen 30 dagen worden teruggedraaid.
+      actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
+      add_to_report: Meer aan de rapportage toevoegen
       are_you_sure: Weet je het zeker?
       assign_to_self: Aan mij toewijzen
       assigned: Toegewezen moderator
+      by_target_domain: Domein van gerapporteerde account
+      category: Category
+      category_description_html: De reden waarom dit account en/of inhoud werd gerapporteerd wordt aan het gerapporteerde account medegedeeld
       comment:
         none: Geen
+      comment_description_html: 'Om meer informatie te verstrekken, schreef %{name}:'
       created_at: Gerapporteerd op
+      delete_and_resolve: Bericht verwijderen
       forwarded: Doorgestuurd
       forwarded_to: Doorgestuurd naar %{domain}
       mark_as_resolved: Markeer als opgelost
+      mark_as_sensitive: Als gevoelig markeren
       mark_as_unresolved: Markeer als onopgelost
+      no_one_assigned: Niemand
       notes:
         create: Opmerking toevoegen
         create_and_resolve: Oplossen met opmerking
         create_and_unresolve: Heropenen met opmerking
         delete: Verwijderen
-        placeholder: Beschrijf welke acties zijn ondernomen of andere gerelateerde opmerkingen…
+        placeholder: Beschrijf welke maatregelen zijn genomen of andere gerelateerde opmerkingen...
+        title: Opmerkingen
+      notes_description_html: Bekijk en laat opmerkingen achter voor andere moderatoren en voor jouw toekomstige zelf
+      quick_actions_description_html: 'Neem een snelle maatregel of scroll naar beneden om de gerapporteerde inhoud te bekijken:'
+      remote_user_placeholder: de externe gebruiker van %{instance}
       reopen: Rapportage heropenen
       report: 'Rapportage #%{id}'
       reported_account: Gerapporteerde account
       reported_by: Gerapporteerd door
       resolved: Opgelost
       resolved_msg: Rapportage succesvol opgelost!
-      status: Toot
-      target_domain: Domein van gerapporteerde account
+      skip_to_actions: Ga direct naar de maatregelen
+      status: Rapportages
+      statuses: Gerapporteerde inhoud
+      statuses_description_html: De problematische inhoud wordt aan het gerapporteerde account medegedeeld
+      target_origin: Herkomst van de gerapporteerde accounts
       title: Rapportages
       unassign: Niet langer toewijzen
       unresolved: Onopgelost
       updated_at: Bijgewerkt
+      view_profile: Profiel bekijken
+    roles:
+      add_new: Rol toevoegen
+      assigned_users:
+        one: "%{count} gebruiker"
+        other: "%{count} gebruikers"
+      categories:
+        administration: Beheer
+        devops: DevOps
+        invites: Uitnodigingen
+        moderation: Moderatie
+        special: Speciaal
+      delete: Verwijderen
+      description_html: Met <strong>gebruikersrollen</strong> kun je de functies en onderdelen van Mastodon waar jouw gebruikers toegang tot hebben aanpassen.
+      edit: Rol '%{name}' bewerken
+      everyone: Standaardrechten
+      everyone_full_description_html: Dit is de <strong>basisrol</strong> die van toepassing is op <strong>alle gebruikers</strong>, zelfs voor diegenen zonder toegewezen rol. Alle andere rollen hebben de rechten van deze rol als minimum.
+      permissions_count:
+        one: "%{count} recht"
+        other: "%{count} rechten"
+      privileges:
+        administrator: Beheerder
+        administrator_description: Deze gebruikers hebben volledige rechten en kun dus overal bij
+        delete_user_data: Gebruikersgegevens verwijderen
+        delete_user_data_description: Staat gebruikers toe om de gegevens van andere gebruikers zonder vertraging te verwijderen
+        invite_users: Gebruikers uitnodigen
+        invite_users_description: Staat gebruikers toe om nieuwe mensen voor de server uit te nodigen
+        manage_announcements: Aankondigingen beheren
+        manage_announcements_description: Staat gebruikers toe om mededelingen op de server te beheren
+        manage_appeals: Bezwaren afhandelen
+        manage_appeals_description: Staat gebruikers toe om bewaren tegen moderatiemaatregelen te beoordelen
+        manage_blocks: Blokkades beheren
+        manage_blocks_description: Staat gebruikers toe om e-mailproviders en IP-adressen te blokkeren
+        manage_custom_emojis: Lokale emoji's beheren
+        manage_custom_emojis_description: Staat gebruikers toe om lokale emoji's op de server te beheren
+        manage_federation: Federatie beheren
+        manage_federation_description: Staat gebruikers toe om federatie met andere domeinen te blokkeren of toe te staan en om de bezorging te bepalen
+        manage_invites: Uitnodigingen beheren
+        manage_invites_description: Staat gebruikers toe om uitnodigingslinks te bekijken en te deactiveren
+        manage_reports: Rapportages afhandelen
+        manage_reports_description: Staat gebruikers toe om rapportages te beoordelen en om aan de hand hiervan moderatiemaatregelen te nemen
+        manage_roles: Rollen beheren
+        manage_roles_description: Staat gebruikers toe om rollen te beheren en toe te wijzen die minder rechten hebben dan hun eigen rol(len)
+        manage_rules: Serverregels wijzigen
+        manage_rules_description: Staat gebruikers toe om serverregels te wijzigen
+        manage_settings: Server-instellingen wijzigen
+        manage_settings_description: Staat gebruikers toe de instellingen van de site te wijzigen
+        manage_taxonomies: Trends en hashtags beheren
+        manage_taxonomies_description: Staat gebruikers toe om trending inhoud te bekijken en om hashtag-instellingen bij te werken
+        manage_user_access: Gebruikerstoegang beheren
+        manage_user_access_description: Staat gebruikers toe om tweestapsverificatie van andere gebruikers uit te schakelen, om hun e-mailadres te wijzigen en om hun wachtwoord opnieuw in te stellen
+        manage_users: Gebruikers beheren
+        manage_users_description: Staat gebruikers toe om gebruikersdetails van anderen te bekijken en moderatiemaatregelen tegen hen te nemen
+        manage_webhooks: Webhooks beheren
+        manage_webhooks_description: Staat gebruikers toe om webhooks voor beheertaken in te stellen
+        view_audit_log: Auditlog bekijken
+        view_audit_log_description: Staat gebruikers toe om een geschiedenis van beheeracties op de server te bekijken
+        view_dashboard: Dashboard bekijken
+        view_dashboard_description: Geeft gebruikers toegang tot het dashboard en verschillende statistieken
+        view_devops: DevOps
+        view_devops_description: Geeft gebruikers toegang tot de dashboards van Sidekiq en pgHero
+      title: Rollen
     rules:
       add_new: Regel toevoegen
       delete: Verwijderen
@@ -556,152 +691,219 @@ nl:
       empty: Voor deze server zijn nog geen regels opgesteld.
       title: Serverregels
     settings:
-      activity_api_enabled:
-        desc_html: Wekelijks overzicht van de hoeveelheid lokale toots, actieve gebruikers en nieuwe registraties
-        title: Statistieken over gebruikersactiviteit via de API publiceren
-      bootstrap_timeline_accounts:
-        desc_html: Meerdere gebruikersnamen met komma's scheiden. Deze accounts worden in ieder geval aan nieuwe gebruikers aanbevolen
-        title: Aanbevolen accounts voor nieuwe gebruikers
-      contact_information:
-        email: Vul een openbaar gebruikt e-mailadres in
-        username: Vul een gebruikersnaam in
-      custom_css:
-        desc_html: Het uiterlijk van deze server met CSS aanpassen
-        title: Aangepaste CSS
+      about:
+        manage_rules: Serverregels beheren
+        preamble: Geef uitgebreide informatie over hoe de server wordt beheerd, gemodereerd en gefinancierd.
+        rules_hint: Er is een speciaal gebied voor regels waaraan uw gebruikers zich dienen te houden.
+        title: Over
+      appearance:
+        preamble: Mastodons webomgeving aanpassen.
+        title: Weergave
+      branding:
+        preamble: De branding van jouw server laat zien hoe het met andere servers in het netwerk verschilt. Deze informatie wordt op verschillende plekken getoond, zoals in de webomgeving van Mastodon, in mobiele apps, in voorvertoningen op andere websites en berichten-apps, enz. Daarom is het belangrijk om de informatie helder, kort en beknopt te houden.
+        title: Branding
+      content_retention:
+        preamble: Toezicht houden op hoe berichten en media van gebruikers op Mastodon worden bewaard.
+        title: Bewaartermijn berichten
       default_noindex:
         desc_html: Heeft invloed op alle gebruikers die deze instelling niet zelf hebben veranderd
-        title: Toots van gebruikers standaard niet door zoekmachines laten indexeren
+        title: Gebruikers standaard niet door zoekmachines laten indexeren
+      discovery:
+        follow_recommendations: Aanbevolen accounts
+        preamble: Het tonen van interessante inhoud is van essentieel belang voor het aan boord halen van nieuwe gebruikers, die mogelijk niemand van Mastodon kennen. Bepaal hoe verschillende functies voor het ontdekken van inhoud en gebruikers op jouw server werken.
+        profile_directory: Gebruikersgids
+        public_timelines: Openbare tijdlijnen
+        title: Ontdekken
+        trends: Trends
       domain_blocks:
         all: Aan iedereen
         disabled: Aan niemand
-        title: Domeinblokkades tonen
         users: Aan ingelogde lokale gebruikers
-      domain_blocks_rationale:
-        title: Motivering tonen
-      hero:
-        desc_html: Wordt op de voorpagina getoond. Tenminste 600x100px aanbevolen. Wanneer dit niet is ingesteld wordt de thumbnail van de Mastodonserver getoond
-        title: Hero-afbeelding
-      mascot:
-        desc_html: Wordt op meerdere pagina's weergegeven. Tenminste 293×205px aanbevolen. Wanneer dit niet is ingesteld wordt de standaardmascotte getoond
-        title: Mascotte-afbeelding
-      peers_api_enabled:
-        desc_html: Domeinnamen die deze server in de fediverse is tegengekomen
-        title: Lijst van bekende servers via de API publiceren
-      preview_sensitive_media:
-        desc_html: Linkvoorvertoningen op andere websites hebben een thumbnail, zelfs als een afbeelding of video als gevoelig is gemarkeerd
-        title: Gevoelige afbeeldingen en video's in OpenGraph-voorvertoningen tonen
-      profile_directory:
-        desc_html: Gebruikers toestaan om vindbaar te zijn
-        title: Gebruikersgids inschakelen
       registrations:
-        closed_message:
-          desc_html: Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld<br>En ook hier kan je HTML gebruiken
-          title: Bericht wanneer registratie is uitgeschakeld
-        deletion:
-          desc_html: Toestaan dat iedereen hun eigen account kan verwijderen
-          title: Verwijderen account toestaan
-        min_invite_role:
-          disabled: Niemand
-          title: Uitnodigingen toestaan door
-        require_invite_text:
-          desc_html: Maak het invullen van "Waarom wil je je hier registreren?" verplicht in plaats van optioneel, wanneer registraties handmatig moeten worden goedgekeurd
-          title: Nieuwe gebruikers moeten een reden invullen waarom ze zich willen registreren
+        preamble: Toezicht houden op wie een account op deze server kan registreren.
+        title: Registraties
       registrations_mode:
         modes:
           approved: Goedkeuring vereist om te kunnen registreren
           none: Niemand kan zich registreren
           open: Iedereen kan zich registreren
-        title: Registratiemodus
-      show_known_fediverse_at_about_page:
-        desc_html: Wanneer ingeschakeld wordt de globale tijdlijn op de voorpagina getoond en wanneer uitgeschakeld de lokale tijdlijn
-        title: De globale tijdlijn op de openbare tijdlijnpagina tonen
-      show_staff_badge:
-        desc_html: Medewerkersbadge op profielpagina tonen
-        title: Medewerkersbadge tonen
-      site_description:
-        desc_html: Introductie-alinea voor de API. Beschrijf wat er speciaal is aan deze server en andere zaken die van belang zijn. Je kan HTML gebruiken, zoals <code>&lt;a&gt;</code> en <code>&lt;em&gt;</code>.
-        title: Omschrijving Mastodonserver (API)
-      site_description_extended:
-        desc_html: Een goede plek voor je gedragscode, regels, richtlijnen en andere zaken die jouw server uniek maken. Je kan ook hier HTML gebruiken
-        title: Uitgebreide omschrijving Mastodonserver
-      site_short_description:
-        desc_html: Dit wordt gebruikt op de voorpagina, in de zijbalk op profielpagina's en als metatag in de paginabron. Beschrijf in één alinea wat Mastodon is en wat deze server speciaal maakt.
-        title: Omschrijving Mastodonserver (website)
-      site_terms:
-        desc_html: Je kan hier jouw eigen privacybeleid, gebruiksvoorwaarden en ander juridisch jargon kwijt. Je kan HTML gebruiken
-        title: Aangepaste gebruiksvoorwaarden
-      site_title: Naam Mastodonserver
-      thumbnail:
-        desc_html: Gebruikt als voorvertoning voor OpenGraph en de API. 1200x630px aanbevolen
-        title: Thumbnail Mastodonserver
-      timeline_preview:
-        desc_html: Toon een link naar de openbare tijdlijnpagina op de voorpagina en geef de API zonder in te loggen toegang tot de openbare tijdlijn
-        title: Toegang tot de openbare tijdlijn zonder in te loggen toestaan
-      title: Server-instellingen
-      trendable_by_default:
-        desc_html: Heeft invloed op hashtags die nog niet eerder niet zijn toegestaan
-        title: Hashtags toestaan om trending te worden zonder voorafgaande beoordeling
-      trends:
-        desc_html: Eerder beoordeelde hashtags die op dit moment trending zijn openbaar tonen
-        title: Trending hashtags
+      title: Serverinstellingen
     site_uploads:
       delete: Geüpload bestand verwijderen
       destroyed_msg: Verwijderen website-upload geslaagd!
     statuses:
+      account: Account
+      application: Toepassing
       back_to_account: Terug naar accountpagina
+      back_to_report: Terug naar de rapportage
       batch:
-        delete: Verwijderen
-        nsfw_off: Als niet gevoelig markeren
-        nsfw_on: Als gevoelig markeren
+        remove_from_report: Uit de rapportage verwijderen
+        report: Rapportage
       deleted: Verwijderd
-      failed_to_execute: Uitvoeren mislukt
+      favourites: Favorieten
+      history: Versiegeschiedenis
+      in_reply_to: Reactie op
+      language: Taal
       media:
         title: Media
-      no_media: Geen media
-      no_status_selected: Er werden geen toots gewijzigd, omdat er geen enkele werd geselecteerd
-      title: Toots van account
+      metadata: Metagegevens
+      no_status_selected: Er werden geen berichten gewijzigd, omdat er geen enkele werd geselecteerd
+      open: Bericht tonen
+      original_status: Oorspronkelijk bericht
+      reblogs: Boosts
+      status_changed: Bericht veranderd
+      title: Berichten van account
+      trending: Trending
+      visibility: Zichtbaarheid
       with_media: Met media
+    strikes:
+      actions:
+        delete_statuses: "%{name} heeft de berichten van %{target} verwijderd"
+        disable: Account %{target} is door %{name} bevroren
+        mark_statuses_as_sensitive: "%{name} markeerde de berichten van %{target} als gevoelig"
+        none: "%{name} verzond een waarschuwing naar %{target}"
+        sensitive: "%{name} markeerde het account van %{target} als gevoelig"
+        silence: "%{name} beperkte het account %{target}"
+        suspend: "%{name} schortte het account %{target} op"
+      appeal_approved: Bezwaar ingediend
+      appeal_pending: Bezwaar in behandeling
     system_checks:
       database_schema_check:
         message_html: Niet alle databasemigraties zijn voltooid. Je moet deze uitvoeren om er voor te zorgen dat de applicatie blijft werken zoals het hoort
+      elasticsearch_running_check:
+        message_html: Kon geen verbinding maken met Elasticsearch. Controleer dat Elasticsearch wordt uitgevoerd of schakel full-text-zoeken uit
+      elasticsearch_version_check:
+        message_html: 'Incompatibele Elasticsearch-versie: %{value}'
+        version_comparison: Je gebruikt Elasticsearch %{running_version}, maar %{required_version} is vereist
       rules_check:
         action: Serverregels beheren
         message_html: Je hebt voor deze server geen regels opgesteld.
       sidekiq_process_check:
         message_html: Er draait geen Sidekiqproces voor de wachtrij(en) %{value}. Controleer je Sidekiqconfiguratie
     tags:
-      accounts_today: Aantal verschillende keren vandaag gebruikt
-      accounts_week: Aantal verschillende keren deze week gebruikt
-      breakdown: Uitsplitsing van het gebruik van vandaag naar bron
-      last_active: Laatst actief
-      most_popular: Meest populair
-      most_recent: Meest recent
-      name: Hashtag
       review: Status beoordelen
-      reviewed: Beoordeeld
-      title: Hashtags
-      trending_right_now: Op dit moment trending
-      unique_uses_today: "%{count} keer vandaag gebruikt"
-      unreviewed: Niet beoordeeld
       updated_msg: Instellingen hashtag succesvol bijgewerkt
     title: Beheer
+    trends:
+      allow: Goedkeuren
+      approved: Goedgekeurde
+      disallow: Afkeuren
+      links:
+        allow: Link goedkeuren
+        allow_provider: Website goedkeuren
+        description_html: Dit zijn links die momenteel veel worden gedeeld door accounts waar jouw server berichten van ontvangt. Hierdoor kunnen jouw gebruikers zien wat er in de wereld aan de hand is. Er worden geen links weergeven totdat je de website hebt goedgekeurd. Je kunt ook individuele links goed- of afkeuren.
+        disallow: Link afkeuren
+        disallow_provider: Website afkeuren
+        no_link_selected: Er werden geen links gewijzigd, omdat er geen enkele werd geselecteerd
+        publishers:
+          no_publisher_selected: Er werden geen websites gewijzigd, omdat er geen enkele werd geselecteerd
+        shared_by_over_week:
+          one: Deze week door één persoon gedeeld
+          other: Deze week door %{count} mensen gedeeld
+        title: Trending links
+        usage_comparison: Vandaag %{today} keer gedeeld, vergeleken met %{yesterday} keer gisteren
+      only_allowed: Alleen goedgekeurde
+      pending_review: In afwachting van beoordeling
+      preview_card_providers:
+        allowed: Links van deze website kunnen trending worden
+        description_html: Dit zijn domeinen waarvan er links vaak op jouw server worden gedeeld. Links zullen niet in het openbaar trending worden, voordat het domein van de link wordt goedgekeurd. Jouw goedkeuring (of afwijzing) geldt ook voor subdomeinen.
+        rejected: Links naar deze nieuwssite kunnen niet trending worden
+        title: Websites
+      rejected: Afgekeurd
+      statuses:
+        allow: Bericht goedkeuren
+        allow_account: Account goedkeuren
+        description_html: Dit zijn berichten die op jouw server bekend zijn en die momenteel veel worden gedeeld en als favoriet worden gemarkeerd. Hiermee kunnen nieuwe en terugkerende gebruikers meer mensen vinden om te volgen. Er worden geen berichten in het openbaar weergegeven totdat het account door jou is goedgekeurd en de gebruiker toestaat dat diens account aan anderen wordt aanbevolen. Je kunt ook individuele berichten goed- of afkeuren.
+        disallow: Bericht afkeuren
+        disallow_account: Account afkeuren
+        no_status_selected: Er werden geen trending berichten gewijzigd, omdat er geen enkele werd geselecteerd
+        not_discoverable: Gebruiker heeft geen toestemming gegeven om vindbaar te zijn
+        shared_by:
+          one: Een keer gedeeld of als favoriet gemarkeerd
+          other: "%{friendly_count} keer gedeeld of als favoriet gemarkeerd"
+        title: Trending berichten
+      tags:
+        current_score: Huidige score is %{score}
+        dashboard:
+          tag_accounts_measure: aantal unieke keren gebruikt
+          tag_languages_dimension: Populaire talen
+          tag_servers_dimension: Populaire servers
+          tag_servers_measure: verschillende servers
+          tag_uses_measure: totaal aantal keer gebruikt
+        description_html: Deze hashtags verschijnen momenteel in veel berichten die op jouw server zichtbaar zijn. Hiermee kunnen jouw gebruikers zien waar mensen op dit moment het meest over praten. Er worden geen hashtags in het openbaar weergegeven totdat je ze goedkeurt.
+        listable: Kan worden aanbevolen
+        no_tag_selected: Er werden geen hashtags gewijzigd, omdat er geen enkele werd geselecteerd
+        not_listable: Wordt niet aanbevolen
+        not_trendable: Zal niet onder trends verschijnen
+        not_usable: Kan niet worden gebruikt
+        peaked_on_and_decaying: Piekte op %{date} en is nu weer op diens retour
+        title: Trending hashtags
+        trendable: Kan onder trends verschijnen
+        trending_rank: 'Trending #%{rank}'
+        usable: Kan worden gebruikt
+        usage_comparison: "%{today} keer vandaag gebruikt, vergeleken met %{yesterday} keer gisteren"
+        used_by_over_week:
+          one: Door één persoon tijdens de afgelopen week gebruikt
+          other: Door %{count} mensen tijdens de afgelopen week gebruikt
+      title: Trends
+      trending: Trending
     warning_presets:
       add_new: Nieuwe toevoegen
       delete: Verwijderen
       edit_preset: Preset voor waarschuwing bewerken
       empty: Je hebt nog geen presets voor waarschuwingen toegevoegd.
       title: Presets voor waarschuwingen beheren
+    webhooks:
+      add_new: Eindpunt toevoegen
+      delete: Verwijderen
+      description_html: Met een <strong>webhook</strong> kan Mastodon <strong>meldingen in real-time</strong> over gekozen gebeurtenissen naar jouw eigen toepassing sturen, zodat je applicatie <strong>automatisch reacties kan genereren</strong>.
+      disable: Uitschakelen
+      disabled: Uitgeschakeld
+      edit: Eindpunt bewerken
+      empty: Je hebt nog geen webhook-eindpunten geconfigureerd.
+      enable: Inschakelen
+      enabled: Ingeschakeld
+      enabled_events:
+        one: 1 ingeschakelde gebeurtenis
+        other: "%{count} ingeschakelde gebeurtenissen"
+      events: Gebeurtenissen
+      new: Nieuwe webhook
+      rotate_secret: Secret opnieuw genereren
+      secret: Signing secret
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: het verwijderen van diens berichten
+        disable: het bevriezen van diens account
+        mark_statuses_as_sensitive: het markeren van diens berichten als gevoelig
+        none: een waarschuwing
+        sensitive: het gevoelig forceren van diens account
+        silence: het beperken van diens account
+        suspend: het opschorten van diens account
+      body: "%{target} maakt bezwaar tegen een moderatiemaatregel door %{action_taken_by} op %{date}, betreffende %{type}. De gebruiker schrijft:"
+      next_steps: Je kunt het bezwaar goedkeuren om daarmee de moderatiemaatregel ongedaan te maken, of je kunt het verwerpen.
+      subject: "%{username} maakt bezwaar tegen een moderatiemaatregel op %{instance}"
     new_pending_account:
-      body: Zie hieronder de details van het nieuwe account. Je kunt de aanvraag goedkeuren of afkeuren.
+      body: Zie hieronder de details van het nieuwe account. Je kunt de aanvraag goedkeuren of afwijzen.
       subject: Er dient een nieuw account op %{instance} te worden beoordeeld (%{username})
     new_report:
       body: "%{reporter} heeft %{target} gerapporteerd"
       body_remote: Iemand van %{domain} heeft %{target} gerapporteerd
       subject: Nieuwe rapportage op %{instance} (#%{id})
-    new_trending_tag:
-      body: 'De hashtag #%{name} is vandaag trending, maar is nog niet beoordeeld. Het wordt niet in het openbaar getoond alvorens je de hashtag goedkeurt. Je kunt ook het formulier zoals het nu is opslaan, waarna je er niks meer over zult horen.'
-      subject: Nieuwe hashtag te beoordelen op %{instance} (#%{name})
+    new_trends:
+      body: 'De volgende items moeten worden beoordeeld voordat ze openbaar kunnen worden getoond:'
+      new_trending_links:
+        title: Trending links
+      new_trending_statuses:
+        title: Trending berichten
+      new_trending_tags:
+        no_approved_tags: Op dit moment zijn er geen goedgekeurde hashtags.
+        requirements: 'Elk van deze kandidaten kan de #%{rank} goedgekeurde trending hashtag overtreffen, die momenteel #%{lowest_tag_name} is met een score van %{lowest_tag_score}.'
+        title: Trending hashtags
+      subject: Nieuwe trends te beoordelen op %{instance}
   aliases:
     add_new: Alias aanmaken
     created_msg: Succesvol een nieuwe alias aangemaakt. Je kunt nu met de verhuizing vanaf het oude account beginnen.
@@ -720,27 +922,24 @@ nl:
       guide_link: https://crowdin.com/project/mastodon/nl
       guide_link_text: Iedereen kan bijdragen.
     sensitive_content: Gevoelige inhoud
-    toot_layout: Lay-out van toots
+    toot_layout: Lay-out van berichten
   application_mailer:
     notification_preferences: E-mailvoorkeuren wijzigen
     salutation: "%{name},"
     settings: 'E-mailvoorkeuren wijzigen: %{link}'
     view: 'Bekijk:'
     view_profile: Profiel bekijken
-    view_status: Toot bekijken
+    view_status: Bericht bekijken
   applications:
     created: Aanmaken toepassing geslaagd
     destroyed: Verwijderen toepassing geslaagd
-    invalid_url: De opgegeven URL is ongeldig
     regenerate_token: Toegangscode opnieuw aanmaken
     token_regenerated: Opnieuw aanmaken toegangscode geslaagd
     warning: Wees voorzichtig met deze gegevens. Deel het nooit met iemand anders!
     your_token: Jouw toegangscode
   auth:
-    apply_for_account: Een uitnodiging aanvragen
+    apply_for_account: Account aanvragen
     change_password: Wachtwoord
-    checkbox_agreement_html: Ik ga akkoord met de <a href="%{rules_path}" target="_blank">regels van deze server</a> en de <a href="%{terms_path}" target="_blank">gebruiksvoorwaarden</a>
-    checkbox_agreement_without_rules_html: Ik ga akkoord met de <a href="%{terms_path}" target="_blank">gebruiksvoorwaarden</a>
     delete_account: Account verwijderen
     delete_account_html: Wanneer je jouw account graag wilt verwijderen, kun je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
     description:
@@ -753,11 +952,13 @@ nl:
     invalid_reset_password_token: De code om jouw wachtwoord opnieuw in te stellen is verlopen. Vraag een nieuwe aan.
     link_to_otp: Voer een tweestapsverificatiecode van je telefoon of een herstelcode in
     link_to_webauth: Jouw apparaat met de authenticatie-app gebruiken
+    log_in_with: Inloggen met
     login: Inloggen
     logout: Uitloggen
     migrate_account: Naar een ander account verhuizen
     migrate_account_html: Wanneer je dit account naar een ander account wilt doorverwijzen, kun je <a href="%{path}">dit hier instellen</a>.
     or_log_in_with: Of inloggen met
+    privacy_policy_agreement_html: Ik heb het <a href="%{privacy_policy_path}" target="_blank">privacybeleid</a> gelezen en ga daarmee akkoord
     providers:
       cas: CAS
       saml: SAML
@@ -765,20 +966,29 @@ nl:
     registration_closed: "%{instance} laat geen nieuwe gebruikers toe"
     resend_confirmation: Verstuur de bevestigingsinstructies nogmaals
     reset_password: Wachtwoord opnieuw instellen
+    rules:
+      preamble: Deze zijn vastgesteld en worden gehandhaafd door de moderatoren van %{domain}.
+      title: Enkele basisregels.
     security: Beveiliging
     set_new_password: Nieuw wachtwoord instellen
     setup:
       email_below_hint_html: Wanneer onderstaand e-mailadres niet klopt, kun je dat hier veranderen. Je ontvangt dan hierna een bevestigingsmail.
       email_settings_hint_html: De bevestigingsmail is verzonden naar %{email}. Wanneer dat e-mailadres niet klopt, kun je dat veranderen in je accountinstellingen.
       title: Instellen
+    sign_in:
+      preamble_html: Log in met de inloggegevens van <strong>%{domain}</strong>. Als jouw account zich op een andere server bevindt, kun je hier niet inloggen.
+      title: Inloggen op %{domain}
+    sign_up:
+      preamble: Je kunt met een Mastodon-account iedereen in het netwerk volgen, ongeacht waar deze persoon een account heeft.
+      title: Laten we je account op %{domain} instellen.
     status:
       account_status: Accountstatus
       confirming: Aan het wachten totdat de e-mail is bevestigd.
-      functional: Jouw account is volledig operationeel.
+      functional: Jouw account kan in diens geheel gebruikt worden.
       pending: Jouw aanvraag moet nog worden beoordeeld door een van onze medewerkers. Dit kan misschien eventjes duren. Je ontvangt een e-mail wanneer jouw aanvraag is goedgekeurd.
       redirecting_to: Jouw account is inactief omdat het momenteel wordt doorverwezen naar %{acct}.
+      view_strikes: Bekijk de eerder door moderatoren vastgestelde overtredingen die je hebt gemaakt
     too_fast: Formulier is te snel ingediend. Probeer het nogmaals.
-    trouble_logging_in: Problemen met inloggen?
     use_security_key: Beveiligingssleutel gebruiken
   authorize_follow:
     already_following: Je volgt dit account al
@@ -788,7 +998,7 @@ nl:
     follow_request: 'Jij hebt een volgverzoek ingediend bij:'
     following: 'Succes! Jij volgt nu:'
     post_follow:
-      close: Of je kan dit venster gewoon sluiten.
+      close: Of je kunt dit venster gewoon sluiten.
       return: Profiel van deze gebruiker tonen
       web: Ga naar de webapp
     title: Volg %{acct}
@@ -827,8 +1037,8 @@ nl:
     success_msg: Jouw account is succesvol verwijderd
     warning:
       before: 'Lees deze tekst zorgvuldig voordat je verder gaat:'
-      caches: Toots en media die op andere servers zijn opgeslagen kunnen daar achterblijven
-      data_removal: Jouw toots en andere gegevens worden permanent verwijderd
+      caches: Berichten en media die op andere servers zijn opgeslagen kunnen daar achterblijven
+      data_removal: Jouw berichten en andere gegevens worden permanent verwijderd
       email_change_html: Je kunt <a href="%{path}">je e-mailadres wijzigen</a> zonder dat je jouw account hoeft te verwijderen
       email_contact_html: Wanneer het nog steeds niet aankomt, kun je voor hulp e-mailen naar <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Wanneer je de bevestigingsmail niet hebt ontvangen, kun je deze <a href="%{path}">opnieuw aanvragen</a>
@@ -836,10 +1046,36 @@ nl:
       more_details_html: Zie het <a href="%{terms_path}">privacybeleid</a> voor meer informatie.
       username_available: Jouw gebruikersnaam zal weer beschikbaar komen
       username_unavailable: Jouw gebruikersnaam zal onbeschikbaar blijven
-  directories:
-    directory: Gebruikersgids
-    explanation: Ontdek gebruikers aan de hand van hun interesses
-    explore_mastodon: "%{title} verkennen"
+  disputes:
+    strikes:
+      action_taken: Genomen maatregel
+      appeal: Bezwaar
+      appeal_approved: Het ingediende bezwaar is goedgekeurd en de eerder vastgestelde overtreding is niet langer geldig
+      appeal_rejected: Het ingediende bezwaar is afgewezen
+      appeal_submitted_at: Bezwaar ingediend
+      appealed_msg: Jouw bezwaar is ingediend. Wanneer deze wordt goedgekeurd, krijg je hiervan bericht.
+      appeals:
+        submit: Bezwaar indienen
+      approve_appeal: Bezwaar goedkeuren
+      associated_report: Bijbehorende rapportage
+      created_at: Datum en tijd
+      description_html: Dit zijn maatregelen die tegen jouw account zijn genomen en waarschuwingen die door medewerkers van %{instance} naar je zijn gestuurd.
+      recipient: Geadresseerd aan
+      reject_appeal: Bezwaar afgewezen
+      status: 'Bericht #%{id}'
+      status_removed: Bericht is al van de server verwijderd
+      title: "%{action} van %{date}"
+      title_actions:
+        delete_statuses: Verwijdering bericht
+        disable: Bevriezen van account
+        mark_statuses_as_sensitive: Berichten als gevoelig markeren
+        none: Waarschuwing
+        sensitive: Volledige account als gevoelig markeren
+        silence: Beperking account
+        suspend: Opschorting account
+      your_appeal_approved: Jouw bezwaar is goedgekeurd
+      your_appeal_pending: Je hebt een bezwaar ingediend
+      your_appeal_rejected: Jouw bezwaar is afgewezen
   domain_validator:
     invalid_domain: is een ongeldige domeinnaam
   errors:
@@ -864,7 +1100,7 @@ nl:
     archive_takeout:
       date: Datum
       download: Jouw archief downloaden
-      hint_html: Je kunt een archief opvragen van jouw <strong>toots en geüploade media</strong>. De geëxporteerde gegevens zijn in het ActivityPub-formaat, dat door hiervoor geschikte software valt uit te lezen. Je kunt elke 7 dagen een kopie van je archief aanvragen.
+      hint_html: Je kunt een archief opvragen van jouw <strong>berichten en geüploade media</strong>. De geëxporteerde gegevens zijn in het ActivityPub-formaat, dat door hiervoor geschikte software valt uit te lezen. Je kunt elke 7 dagen een kopie van je archief aanvragen.
       in_progress: Jouw archief wordt samengesteld...
       request: Jouw archief opvragen
       size: Omvang
@@ -879,7 +1115,7 @@ nl:
     add_new: Nieuwe toevoegen
     errors:
       limit: Je hebt al het maximaal aantal hashtags uitgelicht
-    hint_html: "<strong>Wat zijn uitgelichte hashtags?</strong> Deze worden prominent op jouw openbare profiel getoond en stelt mensen in staat om jouw openbare toots per hashtag te bekijken. Het zijn een goed hulpmiddel om creatieve werkzaamheden of langetermijnprojecten bij te houden."
+    hint_html: "<strong>Wat zijn uitgelichte hashtags?</strong> Deze worden prominent op jouw openbare profiel getoond en stelt mensen in staat om jouw openbare berichten per hashtag te bekijken. Het zijn een goed hulpmiddel om creatieve werkzaamheden of langetermijnprojecten bij te houden."
   filters:
     contexts:
       account: Profielen
@@ -888,56 +1124,69 @@ nl:
       public: Openbare tijdlijnen
       thread: Gesprekken
     edit:
+      add_keyword: Trefwoord toevoegen
+      keywords: Trefwoorden
+      statuses: Individuele berichten
+      statuses_hint_html: Dit filter is van toepassing om individuele berichten te selecteren, ongeacht of ze overeenkomen met de onderstaande trefwoorden. <a href="%{path}">Berichten van het filter bekijken of verwijderen</a>.
       title: Filter bewerken
     errors:
+      deprecated_api_multiple_keywords: Deze instellingen kunnen niet via deze applicatie worden veranderd, omdat er meer dan één trefwoord wordt gebruikt. Gebruik een meer recente applicatie of de webomgeving.
       invalid_context: Geen of ongeldige context verstrekt
-      invalid_irreversible: Onomkeerbaar filteren werkt alleen met de starttijdlijn en meldingen
     index:
+      contexts: Filters in %{contexts}
       delete: Verwijderen
       empty: Je hebt geen filters aangemaakt.
+      expires_in: Vervalt na %{distance}
+      expires_on: Vervalt op %{date}
+      keywords:
+        one: "%{count} trefwoord"
+        other: "%{count} trefwoorden"
+      statuses:
+        one: "%{count} bericht"
+        other: "%{count} berichten"
+      statuses_long:
+        one: "%{count} individueel bericht verborgen"
+        other: "%{count} individuele berichten verborgen"
       title: Filters
     new:
+      save: Nieuwe filter opslaan
       title: Nieuw filter toevoegen
+    statuses:
+      back_to_filter: Terug naar het filter
+      batch:
+        remove: Uit het filter verwijderen
+      index:
+        hint: Dit filter is van toepassing om individuele berichten te selecteren, ongeacht andere criteria. Je kunt in de webomgeving meer berichten aan dit filter toevoegen.
+        title: Gefilterde berichten
   footer:
-    developers: Ontwikkelaars
-    more: Meer…
-    resources: Hulpmiddelen
     trending_now: Trends
   generic:
     all: Alles
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> item op deze pagina is geselecteerd."
+      other: Alle <strong>%{count}</strong> items op deze pagina zijn geselecteerd.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> item dat met jouw zoekopdracht overeenkomt is geselecteerd."
+      other: Alle <strong>%{count}</strong> items die met jouw zoekopdracht overeenkomen zijn geselecteerd.
     changes_saved_msg: Wijzigingen succesvol opgeslagen!
     copy: Kopiëren
     delete: Verwijderen
-    no_batch_actions_available: Geen batchacties op deze pagina beschikbaar
+    deselect: Alles deselecteren
+    none: Geen
     order_by: Sorteer op
     save_changes: Wijzigingen opslaan
+    select_all_matching_items:
+      one: "%{count} item dat met jouw zoekopdracht overeenkomt selecteren."
+      other: Alle %{count} items die met jouw zoekopdracht overeenkomen selecteren.
+    today: vandaag
     validation_errors:
       one: Er is iets niet helemaal goed! Bekijk onderstaande fout
       other: Er is iets niet helemaal goed! Bekijk onderstaande %{count} fouten
   html_validator:
     invalid_markup: 'bevat ongeldige HTML-opmaak: %{error}'
-  identity_proofs:
-    active: Actief
-    authorize: Ja, autoriseren
-    authorize_connection_prompt: Deze cryptografische verbinding autoriseren?
-    errors:
-      failed: De cryptografische verbinding is mislukt. Probeer het opnieuw vanaf %{provider}.
-      keybase:
-        invalid_token: Keybasetokens zijn hashes van handtekeningen en moeten een lengte hebben van 66 hexadecimale tekens
-        verification_failed: Keybase herkent deze token niet als een handtekening van Keybasegebruiker %{kb_username}. Probeer het opnieuw vanuit Keybase.
-      wrong_user: Er kan geen bewijs worden aangemaakt voor %{proving} terwijl je bent ingelogd als %{current}. Log in als %{proving} en probeer het opnieuw.
-    explanation_html: Hier kun je met behulp van cryptografie jouw andere identiteiten verbinden, zoals een Keybaseprofiel. Hiermee kunnen andere mensen jou versleutelde berichten sturen en inhoud die jij verstuurt vertrouwen.
-    i_am_html: Ik ben %{username} op %{service}.
-    identity: Identiteit
-    inactive: Inactief
-    publicize_checkbox: 'En toot dit:'
-    publicize_toot: 'Het is bewezen! Ik ben %{username} op %{service}: %{url}'
-    remove: Bewijs uit account verwijderen
-    removed: Bewijs is succesvol uit account verwijderd
-    status: Verificatiestatus
-    view_proof: Bekijk bewijs
   imports:
     errors:
+      invalid_csv_file: 'Ongeldig CSV-bestand. Fout: %{error}'
       over_rows_processing_limit: bevat meer dan %{count} rijen
     modes:
       merge: Samenvoegen
@@ -953,7 +1202,6 @@ nl:
       following: Volglijst
       muting: Negeerlijst
     upload: Uploaden
-  in_memoriam_html: In memoriam.
   invites:
     delete: Deactiveren
     expired: Verlopen
@@ -979,9 +1227,20 @@ nl:
   lists:
     errors:
       limit: Je hebt het maximaal aantal lijsten bereikt
+  login_activities:
+    authentication_methods:
+      otp: tweestapsverificatie-app
+      password: wachtwoord
+      sign_in_token: beveiligingscode via e-mail
+      webauthn: beveiligingssleutels
+    description_html: Wanneer je activiteit ziet die je niet herkent, overweeg dan uw wachtwoord te wijzigen en tweestapsverificatie in te schakelen.
+    empty: Geen inloggeschiedenis beschikbaar
+    failed_sign_in_html: Mislukte inlogpoging met %{method} van %{ip} (%{browser})
+    successful_sign_in_html: Succesvol ingelogd met %{method} van %{ip} (%{browser})
+    title: Inloggeschiedenis
   media_attachments:
     validations:
-      images_and_video: Een video kan niet aan een toot met afbeeldingen worden gekoppeld
+      images_and_video: Een video kan niet aan een bericht met afbeeldingen worden gekoppeld
       not_ready: Kan geen bestanden toevoegen die nog niet zijn verwerkt. Probeer het later opnieuw!
       too_many: Er kunnen niet meer dan 4 afbeeldingen toegevoegd worden
   migrations:
@@ -1021,21 +1280,17 @@ nl:
     carry_blocks_over_text: Deze gebruiker is verhuisd vanaf %{acct}. Je hebt dat account geblokkeerd.
     carry_mutes_over_text: Deze gebruiker is verhuisd vanaf %{acct}. Je hebt dat account genegeerd.
     copy_account_note_text: 'Deze gebruiker is verhuisd vanaf %{acct}. Je hebt de volgende opmerkingen over dat account gemaakt:'
+  navigation:
+    toggle_menu: Menu tonen/verbergen
   notification_mailer:
-    digest:
-      action: Alle meldingen bekijken
-      body: Hier is een korte samenvatting van de berichten die je sinds jouw laatste bezoek op %{since} hebt gemist
-      mention: "%{name} vermeldde jou in:"
-      new_followers_summary:
-        one: Je hebt trouwens sinds je weg was er ook een nieuwe volger bijgekregen! Hoera!
-        other: Je hebt trouwens sinds je weg was er ook %{count} nieuwe volgers bijgekregen! Fantastisch!
-      subject:
-        one: "1 nieuwe melding sinds jouw laatste bezoek \U0001F418"
-        other: "%{count} nieuwe meldingen sinds jouw laatste bezoek \U0001F418"
-      title: Tijdens jouw afwezigheid...
+    admin:
+      report:
+        subject: "%{name} heeft een rapportage ingediend"
+      sign_up:
+        subject: "%{name} heeft zich geregistreerd"
     favourite:
-      body: 'Jouw toot werd door %{name} aan hun favorieten toegevoegd:'
-      subject: "%{name} voegde jouw toot als favoriet toe"
+      body: 'Jouw bericht werd door %{name} als favoriet gemarkeerd:'
+      subject: "%{name} markeerde jouw bericht als favoriet"
       title: Nieuwe favoriet
     follow:
       body: "%{name} volgt jou nu!"
@@ -1054,11 +1309,13 @@ nl:
     poll:
       subject: Een poll van %{name} is beëindigd
     reblog:
-      body: 'Jouw toot werd door %{name} geboost:'
-      subject: "%{name} boostte jouw toot"
+      body: 'Jouw bericht werd door %{name} geboost:'
+      subject: "%{name} boostte jouw bericht"
       title: Nieuwe boost
     status:
-      subject: "%{name} heeft zojuist een toot geplaatst"
+      subject: "%{name} heeft zojuist een bericht geplaatst"
+    update:
+      subject: "%{name} bewerkte een bericht"
   notifications:
     email_events: E-mailmeldingen voor gebeurtenissen
     email_events_hint: 'Selecteer gebeurtenissen waarvoor je meldingen wilt ontvangen:'
@@ -1077,7 +1334,7 @@ nl:
     code_hint: Voer de code in die door de authenticatie-app werd gegenereerd
     description_html: Na het instellen van <strong>tweestapsverificatie</strong> met een authenticatie-app, kun je alleen inloggen als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren toegangscode.
     enable: Inschakelen
-    instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app toegangscodes die je bij het inloggen moet invoeren."
+    instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Vanaf nu genereert deze app toegangscodes die je bij het inloggen moet invoeren."
     manual_instructions: 'Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren, vind je hieronder de geheime code in platte tekst:'
     setup: Instellen
     wrong_code: De ingevoerde code is ongeldig! Klopt de systeemtijd van de server en die van jouw apparaat?
@@ -1100,8 +1357,10 @@ nl:
       too_many_options: kan niet meer dan %{max} items bevatten
   preferences:
     other: Overig
-    posting_defaults: Standaardinstellingen voor posten
+    posting_defaults: Standaardinstellingen voor berichten
     public_timelines: Openbare tijdlijnen
+  privacy_policy:
+    title: Privacybeleid
   reactions:
     errors:
       limit_reached: Limiet van verschillende emoji-reacties bereikt
@@ -1124,32 +1383,25 @@ nl:
     remove_selected_follows: Geselecteerde gebruikers ontvolgen
     status: Accountstatus
   remote_follow:
-    acct: Geef jouw account@domein op die je wilt gebruiken
     missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden
-    no_account_html: Heb je geen account? Je kunt er <a href='%{sign_up_path}' target='_blank'>hier een registreren</a>
-    proceed: Ga verder om te volgen
-    prompt: 'Jij gaat volgen:'
-    reason_html: "<strong> Waarom is deze extra stap nodig? </strong> <code>%{instance}</code> is wellicht niet de server waarop jij je geregistreerd hebt. We verwijzen je eerst door naar jouw eigen server."
-  remote_interaction:
-    favourite:
-      proceed: Doorgaan met toevoegen aan jouw favorieten
-      prompt: 'Je wilt de volgende toot aan jouw favorieten toevoegen:'
-    reblog:
-      proceed: Doorgaan met boosten
-      prompt: 'Je wilt de volgende toot boosten:'
-    reply:
-      proceed: Doorgaan met reageren
-      prompt: 'Je wilt op de volgende toot reageren:'
+  reports:
+    errors:
+      invalid_rules: verwijst niet naar geldige regels
+  rss:
+    content_warning: 'Inhoudswaarschuwing:'
+    descriptions:
+      account: Openbare berichten van @%{acct}
+      tag: 'Openbare berichten met hashtag #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Je hebt de limiet van %{limit} in te plannen toots voor die dag overschreden
-    over_total_limit: Je hebt de limiet van %{limit} in te plannen toots overschreden
-    too_soon: De datum voor de ingeplande toot moet in de toekomst liggen
+    over_daily_limit: Je hebt de limiet van %{limit} in te plannen berichten voor vandaag overschreden
+    over_total_limit: Je hebt de limiet van %{limit} in te plannen berichten overschreden
+    too_soon: De datum voor het ingeplande bericht moet in de toekomst liggen
   sessions:
     activity: Laatst actief
     browser: Webbrowser
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1163,7 +1415,7 @@ nl:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Huidige sessie
     description: "%{browser} op %{platform}"
@@ -1172,7 +1424,7 @@ nl:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1185,6 +1437,7 @@ nl:
     revoke: Intrekken
     revoke_success: Sessie succesvol ingetrokken
     title: Sessies
+    view_authentication_history: Inloggeschiedenis van jouw account bekijken
   settings:
     account: Account
     account_settings: Accountinstellingen
@@ -1197,7 +1450,6 @@ nl:
     edit_profile: Profiel bewerken
     export: Exporteren
     featured_tags: Uitgelichte hashtags
-    identity_proofs: Identiteitsbewijzen
     import: Importeren
     import_and_export: Importeren en exporteren
     migrate: Accountmigratie
@@ -1205,6 +1457,8 @@ nl:
     preferences: Voorkeuren
     profile: Profiel
     relationships: Volgers en gevolgden
+    statuses_cleanup: Automatisch berichten verwijderen
+    strikes: Vastgestelde overtredingen
     two_factor_authentication: Tweestapsverificatie
     webauthn_authentication: Beveiligingssleutels
   statuses:
@@ -1221,18 +1475,19 @@ nl:
         other: "%{count} video's"
     boosted_from_html: Geboost van %{acct_link}
     content_warning: 'Inhoudswaarschuwing: %{warning}'
+    default_language: Hetzelfde als de taal van de gebruikersomgeving
     disallowed_hashtags:
       one: 'bevatte een niet toegestane hashtag: %{tags}'
       other: 'bevatte niet toegestane hashtags: %{tags}'
+    edited_at_html: Bewerkt op %{date}
     errors:
-      in_reply_not_found: De toot waarop je probeert te reageren lijkt niet te bestaan.
-    language_detection: Taal automatisch detecteren
+      in_reply_not_found: Het bericht waarop je probeert te reageren lijkt niet te bestaan.
     open_in_web: In de webapp openen
     over_character_limit: Limiet van %{max} tekens overschreden
     pin_errors:
-      limit: Je hebt het maximaal aantal toots al vastgezet
-      ownership: Een toot van iemand anders kan niet worden vastgezet
-      private: Alleen openbare toots kunnen worden vastgezet
+      direct: Berichten die alleen zichtbaar zijn voor vermelde gebruikers, kunnen niet worden vastgezet
+      limit: Je hebt het maximaal aantal bericht al vastgemaakt
+      ownership: Een bericht van iemand anders kan niet worden vastgemaakt
       reblog: Een boost kan niet worden vastgezet
     poll:
       total_people:
@@ -1256,95 +1511,50 @@ nl:
       public_long: Aan iedereen tonen, ook op openbare tijdlijnen
       unlisted: Minder openbaar
       unlisted_long: Aan iedereen tonen, maar niet op openbare tijdlijnen
+  statuses_cleanup:
+    enabled: Automatisch oude berichten verwijderen
+    enabled_hint: Verwijder uw berichten automatisch zodra ze een bepaalde leeftijdsgrens bereiken, tenzij ze overeenkomen met een van de onderstaande uitzonderingen
+    exceptions: Uitzonderingen
+    explanation: Doordat het verwijderen van berichten de server zwaar belast, gebeurt dit geleidelijk aan op momenten dat de server niet bezig is. Om deze reden kunnen uw berichten een tijdje nadat ze de leeftijdsgrens hebben bereikt worden verwijderd.
+    ignore_favs: Favorieten negeren
+    ignore_reblogs: Boosts negeren
+    interaction_exceptions: Uitzonderingen op basis van interacties
+    interaction_exceptions_explanation: Merk op dat er geen garantie is dat berichten worden verwijderd, wanneer eenmaal het aantal favorieten of boosts boven de ingestelde grenswaarde zijn geweest.
+    keep_direct: Directe berichten behouden
+    keep_direct_hint: Verwijdert geen enkel directe bericht van jou
+    keep_media: Berichten met mediabijlagen behouden
+    keep_media_hint: Verwijdert geen enkel bericht met mediabijlagen
+    keep_pinned: Vastgemaakte berichten behouden
+    keep_pinned_hint: Verwijdert geen enkel vastgezet bericht van jou
+    keep_polls: Polls behouden
+    keep_polls_hint: Geen enkele poll van jou wordt verwijderd
+    keep_self_bookmark: Bladwijzers behouden
+    keep_self_bookmark_hint: Eigen berichten die je aan je bladwijzers hebt toegevoegd worden niet verwijderd
+    keep_self_fav: Favorieten behouden
+    keep_self_fav_hint: Eigen berichten die je als favoriet hebt gemarkeerd worden niet verwijderd
+    min_age:
+      '1209600': 2 weken
+      '15778476': 6 maanden
+      '2629746': 1 maand
+      '31556952': 1 jaar
+      '5259492': 2 maanden
+      '604800': 1 week
+      '63113904': 2 jaar
+      '7889238': 3 maanden
+    min_age_label: Te verwijderen na
+    min_favs: Berichten die tenminste zoveel keer als favoriet zijn gemarkeerd behouden
+    min_favs_hint: Verwijdert geen berichten die tenminste zoveel keer als favoriet zijn gemarkeerd. Laat leeg om berichten ongeacht het aantal favorieten te verwijderen
+    min_reblogs: Berichten die minstens zoveel keer zijn geboost behouden
+    min_reblogs_hint: Verwijdert geen berichten die tenminste zoveel keer zijn geboost. Laat leeg om berichten ongeacht het aantal boosts te verwijderen
   stream_entries:
-    pinned: Vastgemaakte toot
+    pinned: Vastgemaakt bericht
     reblogged: boostte
     sensitive_content: Gevoelige inhoud
+  strikes:
+    errors:
+      too_late: De periode dat je bezwaar kunt maken tegen deze overtreding is verstreken
   tags:
     does_not_match_previous_name: komt niet overeen met de vorige naam
-  terms:
-    body_html: |
-      <h2>Privacy Policy</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: Gebruiksvoorwaarden en privacybeleid van %{instance}
   themes:
     contrast: Mastodon (hoog contrast)
     default: Mastodon (donker)
@@ -1353,6 +1563,7 @@ nl:
     formats:
       default: "%d %B %Y om %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Toevoegen
     disable: Tweestapsverificatie uitschakelen
@@ -1366,66 +1577,76 @@ nl:
     otp: Authenticatie-app
     recovery_codes: Herstelcodes back-uppen
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
-    recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. <strong>Zorg ervoor dat je de herstelcodes op een veilige plek bewaard</strong>. Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.
+    recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. <strong>Zorg ervoor dat je de herstelcodes op een veilige plek bewaart</strong>. Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.
     webauthn: Beveiligingssleutels
   user_mailer:
+    appeal_approved:
+      action: Ga naar je account
+      explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is goedgekeurd. De eerder vastgestelde overtreding is hierbij niet langer geldig.
+      subject: Jouw bezwaar van %{date} is goedgekeurd
+      title: Bezwaar goedgekeurd
+    appeal_rejected:
+      explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is afgewezen. De vastgestelde overtreding blijft daarom ongewijzigd.
+      subject: Jouw bezwaar van %{date} is afgewezen
+      title: Bezwaar afgewezen
     backup_ready:
       explanation: Je hebt een volledige back-up van jouw Mastodon-account opgevraagd. Het staat nu klaar om te worden gedownload!
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
-    sign_in_token:
-      details: 'Hier zijn details van de poging:'
-      explanation: 'We hebben een inlogpoging op je account ontdekt vanaf een onbekend IP-adres. Als jij dit bent, vul dan de beveiligingscode hieronder in op de inlog-uitdagingspagina:'
-      further_actions: 'Als jij dit niet was, verander dan je wachtwoord en schakel tweestapsverificatie voor je account in. Dat kun je hier doen:'
-      subject: Bevestig de inlogpoging
-      title: Inlogpoging
+    suspicious_sign_in:
+      change_password: je wachtwoord te wijzigen
+      details: 'Hier zijn de details van inlogpoging:'
+      explanation: We hebben vastgesteld dat iemand vanaf een nieuw IP-adres op jouw account is ingelogd.
+      further_actions_html: Wanneer jij dit niet was, adviseren wij om onmiddellijk %{action} en om tweestapsverificatie in te schakelen, om zo je account veilig te houden.
+      subject: Jouw account is vanaf een nieuw IP-adres benaderd
+      title: Een nieuwe registratie
     warning:
+      appeal: Bezwaar indienen
+      appeal_description: Wanneer je denkt dat dit een fout is, kun je een bezwaar indienen bij de medewerkers van %{instance}.
+      categories:
+        spam: Spam
+        violation: De inhoud is in strijd met de volgende communityrichtlijnen
       explanation:
-        disable: Zolang jouw account is bevroren blijven jouw accountgegevens intact, maar kun je geen handelingen uitvoeren totdat het account is vrijgegeven.
-        sensitive: De mediabestanden die je upload en gekoppelde media worden als gevoelig behandeld.
-        silence: Zolang jouw account wordt beperkt, kunnen alleen mensen die jou al volgen jouw toots op deze server zien. Tevens ben je niet zichtbaar in meldingen, gesprekken en op openbare tijdlijnen. Anderen kunnen je echter wel handmatig volgen.
-        suspend: Jouw account is opgeschort. Jouw toots en geüploade media zijn onomkeerbaar van deze server verwijderd, en ook o.a. van de servers waar jij volgers had.
-      get_in_touch: Je kunt deze e-mail beantwoorden om in contact te komen met de medewerkers van %{instance}.
-      review_server_policies: Serverbeleid bekijken
-      statuses: 'Met name voor:'
+        delete_statuses: Er is vastgesteld dat sommige van jouw berichten in strijd zijn met één of meerdere communityrichtlijnen en daarom door de moderatoren van %{instance} zijn verwijderd.
+        disable: Je kunt niet langer jouw account gebruiken, maar jouw profiel en andere gegevens zijn nog wel intact. Je kunt een backup van je gegevens opvragen, accountinstellingen wijzigen of je account verwijderen.
+        mark_statuses_as_sensitive: Sommige van jouw berichten zijn als gevoelig gemarkeerd door de moderatoren van %{instance}. Dit betekent dat mensen op de media in de berichten moeten klikken/tikken om deze weer te geven. Je kunt media in de toekomst ook zelf als gevoelig markeren.
+        sensitive: Vanaf nu worden al jouw geüploade media als gevoelig gemarkeerd en verborgen achter een waarschuwing.
+        silence: Je kunt nog steeds jouw account gebruiken, maar alleen mensen die jou al volgen kunnen jouw berichten zien, en je kunt minder goed worden gevonden. Andere kunnen je echter nog wel steeds handmatig volgen.
+        suspend: Je kunt niet langer jouw account gebruiken, en jouw profiel en andere gegevens zijn niet langer toegankelijk. Je kunt nog steeds inloggen om een backup van jouw gegevens op te vragen, totdat deze na 30 dagen volledig worden verwijderd. We zullen wel enkele basisgegevens behouden om te voorkomen dat je onder je schorsing uit probeert te komen.
+      reason: 'Reden:'
+      statuses: 'Gerapporteerde berichten:'
       subject:
+        delete_statuses: Deze berichten van %{acct} zijn verwijderd
         disable: Jouw account %{acct} is bevroren
+        mark_statuses_as_sensitive: Deze berichten van %{acct} zijn als gevoelig gemarkeerd
         none: Waarschuwing voor %{acct}
-        sensitive: De door jouw account %{acct} geplaatste media is als gevoelig gemarkeerd
+        sensitive: Berichten van %{acct} zullen vanaf nu altijd als gevoelig worden gemarkeerd
         silence: Jouw account %{acct} is nu beperkt
         suspend: Jouw account %{acct} is opgeschort
       title:
+        delete_statuses: Berichten verwijderd
         disable: Account bevroren
+        mark_statuses_as_sensitive: Berichten als gevoelig gemarkeerd
         none: Waarschuwing
-        sensitive: Jouw media is als gevoelig gemarkeerd
+        sensitive: Account is als gevoelig gemarkeerd
         silence: Account beperkt
         suspend: Account opgeschort
     welcome:
       edit_profile_action: Profiel instellen
-      edit_profile_step: Je kunt jouw profiel aanpassen door een avatar (profielfoto) en omslagfoto te uploaden, jouw weergavenaam in te stellen en iets over jezelf te vertellen. Wanneer je nieuwe volgers eerst wilt goedkeuren, kun je jouw account besloten maken.
+      edit_profile_step: Je kunt jouw profiel aanpassen door een profielfoto te uploaden, jouw weergavenaam aan te passen en meer. Je kunt het handmatig goedkeuren van volgers instellen.
       explanation: Hier zijn enkele tips om je op weg te helpen
       final_action: Begin berichten te plaatsen
-      final_step: 'Begin berichten te plaatsen! Zelfs zonder volgers kunnen jouw openbare berichten door anderen gezien worden, bijvoorbeeld op de lokale tijdlijn en via hashtags. Je wilt jezelf misschien introduceren met de hashtag #introductions.'
+      final_step: 'Begin berichten te plaatsen! Zelfs zonder volgers kunnen jouw openbare berichten door anderen bekeken worden, bijvoorbeeld op de lokale tijdlijn en onder hashtags. Je kunt jezelf voorstellen met het gebruik van de hashtag #introductions.'
       full_handle: Jouw volledige Mastodonadres
-      full_handle_hint: Dit geef je aan jouw vrienden, zodat ze jouw berichten kunnen sturen of (vanaf een andere Mastodonserver) kunnen volgen.
-      review_preferences_action: Instellingen veranderen
-      review_preferences_step: Zorg dat je jouw instellingen naloopt, zoals welke e-mails je wilt ontvangen of voor wie jouw berichten standaard zichtbaar moeten zijn. Wanneer je geen last hebt van bewegende beelden, kun je het afspelen van geanimeerde GIF's inschakelen.
+      full_handle_hint: Dit geef je aan jouw vrienden, zodat ze jou berichten kunnen sturen of (vanaf een andere Mastodonserver) kunnen volgen.
       subject: Welkom op Mastodon
-      tip_federated_timeline: De globale tijdlijn toont berichten in het Mastodonnetwerk. Het bevat echter alleen berichten van mensen waar jouw buren mee zijn verbonden, dus het is niet compleet.
-      tip_following: Je volgt standaard de beheerder(s) van jouw Mastodonserver. Bekijk de lokale en de globale tijdlijnen om meer interessante mensen te vinden.
-      tip_local_timeline: De lokale tijdlijn toont berichten van mensen op %{instance}. Dit zijn jouw naaste buren!
-      tip_mobile_webapp: Wanneer jouw mobiele webbrowser Mastodon aan jouw startscherm wilt toevoegen, kun je pushmeldingen ontvangen. Het gedraagt zich op meerdere manieren als een native app!
-      tips: Tips
       title: Welkom aan boord %{name}!
   users:
     follow_limit_reached: Je kunt niet meer dan %{limit} accounts volgen
-    generic_access_help_html: Problemen met toegang tot je account? Neem dan contact op met %{email} voor assistentie
     invalid_otp_token: Ongeldige tweestaps-toegangscode
-    invalid_sign_in_token: Ongeldige beveiligingscode
     otp_lost_help_html: Als je toegang tot beiden kwijt bent geraakt, neem dan contact op via %{email}
     seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
     signed_in_as: 'Ingelogd als:'
-    suspicious_sign_in_confirmation: Het lijkt er op dat je nog niet eerder op dit apparaat bent ingelogd, en je bent een tijdje niet ingelogd, dus sturen we een beveiligingscode naar je e-mailadres om te bevestigen dat jij het bent.
   verification:
     explanation_html: 'Je kunt <strong>jezelf verifiëren als de eigenaar van de links in de metadata van jouw profiel</strong>. Hiervoor moet op de gelinkte website een link terug naar jouw Mastodonprofiel staan. Deze link <strong>moet</strong> het <code>rel="me"</code>-attribuut bevatten. De omschrijving van de link maakt niet uit. Hier is een voorbeeld:'
     verification: Verificatie
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index d3d2be46f..60858909e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1,90 +1,27 @@
 ---
 nn:
   about:
-    about_hashtag_html: Dette er offentlege tut merkt med <strong>#%{hashtag}</strong>. Du kan nytta dei om du har ein konto kvar som helst i fødiverset.
     about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig idéane dine med Mastodon!'
-    about_this: Om oss
-    active_count_after: aktiv
-    active_footnote: Månadlege aktive brukarar (MAB)
-    administered_by: 'Administrert av:'
-    api: API
-    apps: Mobilappar
-    apps_platforms: Bruk Mastodon på iOS, Android og andre plattformer
-    browse_directory: Bla gjennom en profilmappe og filtrer etter interesser
-    browse_local_posts: Bla i en sanntidsstrøm av offentlige innlegg fra denne tjeneren
-    browse_public_posts: Sjå ei direktesending av offentlege innlegg på Mastodon
-    contact: Kontakt
     contact_missing: Ikkje sett
     contact_unavailable: I/T
-    discover_users: Oppdag brukarar
-    documentation: Dokumentasjon
-    federation_hint_html: Med ein konto på %{instance} kan du fylgja folk på kva som helst slags Mastod-tenar og meir.
-    get_apps: Prøv ein mobilapp
     hosted_on: "%{domain} er vert for Mastodon"
-    instance_actor_flash: "Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet. \n"
-    learn_more: Lær meir
-    privacy_policy: Personvernsreglar
-    rules: Server regler
-    rules_html: 'Nedenfor er et sammendrag av reglene du må følge om du vil ha en konto på denne serveren av Mastodon:'
-    see_whats_happening: Sjå kva som skjer
-    server_stats: 'Tenarstatistikk:'
-    source_code: Kjeldekode
-    status_count_after:
-      one: innlegg
-      other: statuser
-    status_count_before: Som skreiv
-    tagline: Fylg vener og oppdag nye
-    terms: Brukarvilkår
-    unavailable_content: Utilgjengeleg innhald
-    unavailable_content_description:
-      domain: Sørvar
-      reason: Grunn
-      rejecting_media: 'Mediafiler fra disse tjenerne vil ikke bli behandlet eller lagret, og ingen miniatyrbilder vil bli vist, noe som vil kreve manuell klikking for å besøke den opprinnelige filen:'
-      rejecting_media_title: Filtrert media
-      silenced: 'Innlegg frå desse tenarane vert gøymde frå offentlege tidsliner og samtalar, og det kjem ingen varsel frå samhandlingane til brukarane deira, med mindre du fylgjer dei:'
-      silenced_title: Stilnede tjenere
-      suspended: 'Ingen data frå desse tenarane vert handsama, lagra eller sende til andre, som gjer det umogeleg å samhandla eller kommunisera med andre brukarar frå desse tenarane:'
-      suspended_title: Suspenderte tjenere
-    unavailable_content_html: Mastodon gjev deg som regel lov til å sjå innhald og samhandla med brukarar frå alle andre tenarar i fødiverset. Dette er unnataka som er valde for akkurat denne tenaren.
-    user_count_after:
-      one: brukar
-      other: brukarar
-    user_count_before: Her bur
-    what_is_mastodon: Kva er Mastodon?
+    title: Om
   accounts:
-    choices_html: "%{name} sine val:"
-    endorsements_hint: Du kan fremja folk dy fylgjer frå grensesnittet på nettet, og då visast dei her.
-    featured_tags_hint: Du kan velja emneknaggar som skal visast her.
     follow: Fylg
     followers:
       one: Fylgjar
       other: Fylgjarar
     following: Fylgjer
-    instance_actor_flash: Denne kontoen er en virtuell figur som brukes til å representere selve serveren og ikke noen individuell bruker. Den brukes til forbundsformål og bør ikke oppheves.
-    joined: Vart med %{date}
+    instance_actor_flash: Denne kontoen er ein virtuell figur som nyttast som representant for tenaren, og ikkje som individuell brukar. Den nyttast til forbundsformål og bør ikkje suspenderast.
     last_active: sist aktiv
     link_verified_on: Eigarskap for denne lenkja vart sist sjekka %{date}
-    media: Media
-    moved_html: "%{name} har flytta til %{new_profile_link}:"
-    network_hidden: Denne informasjonen er ikkje tilgjengeleg
-    never_active: Aldri
     nothing_here: Her er det ingenting!
-    people_followed_by: Folk som %{name} fylgjer
-    people_who_follow: Folk som fylgjer %{name}
     pin_errors:
       following: Du må allereie fylgja personen du vil fremja
     posts:
       one: Tut
       other: Tut
     posts_tab_heading: Tut
-    posts_with_replies: Tut og svar
-    roles:
-      admin: Administrator
-      bot: Robot
-      group: Gruppe
-      moderator: Moderator
-    unavailable: Profil ikkje tilgjengeleg
-    unfollow: Slutt å fylgja
   admin:
     account_actions:
       action: Utfør
@@ -92,13 +29,11 @@ nn:
     account_moderation_notes:
       create: Legg igjen merknad
       created_msg: Moderatormerknad er laga!
-      delete: Slett
       destroyed_msg: Moderatormerknad er utsletta!
     accounts:
       add_email_domain_block: Gøym e-postdomene
       approve: Godtak
-      approve_all: Godtak alle
-      approved_msg: Godkjent %{username} sin registreringsapplikasjon
+      approved_msg: Godkjende %{username} sin registreringssøknad
       are_you_sure: Er du sikker?
       avatar: Bilete
       by_domain: Domene
@@ -109,15 +44,21 @@ nn:
         new_email: Ny e-post
         submit: Byt e-post
         title: Byt e-post for %{username}
+      change_role:
+        changed_msg: Rolle endra!
+        label: Endre rolle
+        no_role: Inga rolle
+        title: Endre rolle for %{username}
       confirm: Stadfest
       confirmed: Stadfesta
       confirming: Stadfestar
+      custom: Tilpassa
       delete: Slett data
       deleted: Sletta
       demote: Degrader
-      destroyed_msg: "%{username} sine data er nå i kø for å bli slettet minimum"
+      destroyed_msg: "%{username} sine data er no i slettekøa"
       disable: Slå av
-      disable_sign_in_token_auth: Deaktiver e-post token autentisering
+      disable_sign_in_token_auth: Slå av e-post token autentisering
       disable_two_factor_authentication: Slå av 2FA
       disabled: Slege av
       display_name: Synleg namn
@@ -126,14 +67,14 @@ nn:
       email: E-post
       email_status: E-poststatus
       enable: Slå på
-      enable_sign_in_token_auth: Aktiver godkjenning av e-post token
+      enable_sign_in_token_auth: Slå på e-post token autentisering
       enabled: Aktivert
-      enabled_msg: Frossent %{username} sin konto
+      enabled_msg: Gjenaktiverte %{username} sin konto
       followers: Fylgjarar
       follows: Fylgje
       header: Overskrift
       inbox_url: Innbokslenkje
-      invite_request_text: Begrunnelse for å bli med
+      invite_request_text: Grunngjeving for å bli med
       invited_by: Innboden av
       ip: IP-adresse
       joined: Vart med
@@ -145,13 +86,13 @@ nn:
       login_status: Innlogginsstatus
       media_attachments: Medievedlegg
       memorialize: Gjør om til et minne
-      memorialized: Minnet
-      memorialized_msg: Vellykket gjort av %{username} til en minnestedet
+      memorialized: Minna
+      memorialized_msg: Endra %{username} til ei minneside
       moderation:
         active: Aktiv
         all: Alle
         pending: Ventar på svar
-        silenced: Dempa
+        silenced: Avgrensa
         suspended: Utvist
         title: Moderasjon
       moderation_notes: Moderasjonsmerknader
@@ -159,22 +100,28 @@ nn:
       most_recent_ip: Nyast IP
       no_account_selected: Ingen kontoar vart endra sidan ingen var valde
       no_limits_imposed: Ingen grenser sett
+      no_role_assigned: Inga rolle tildelt
       not_subscribed: Ikkje tinga
       pending: Ventar på gjennomgang
       perform_full_suspension: Utvis
+      previous_strikes: Tidlegare prikkar
+      previous_strikes_description_html:
+        one: Denne kontoen har <strong>ein</strong> prikk.
+        other: Denne kontoen har <strong>%{count}</strong> prikkar.
       promote: Frem
       protocol: Protokoll
       public: Offentleg
       push_subscription_expires: PuSH-abonnent utløper
       redownload: Last inn profil på nytt
-      redownloaded_msg: Oppdatert %{username} sin profil fra opprinnelse
+      redownloaded_msg: Oppdaterte %{username} sin profil frå opphavstenar
       reject: Avvis
-      reject_all: Avvis alle
-      rejected_msg: Vellykket avvist %{username} sin registreringsapplikasjon
+      rejected_msg: Avviste %{username} sin registreringssøknad
+      remote_suspension_irreversible: Dataene til denne kontoen har blitt slettet uten mulighet for gjenoppretting.
+      remote_suspension_reversible_hint_html: Kontoen har blitt suspendert på sin tjener, og dataene bli fjernet helt den %{date}. Inntil da kan tjeneren gjeninnsette kontoen uten skade. Hvis du ønsker å fjerne alle dataene til kontoen umiddelbart, kan du gjøre dette under.
       remove_avatar: Fjern bilete
       remove_header: Fjern overskrift
-      removed_avatar_msg: Fjernet %{username} sitt avatarbilde
-      removed_header_msg: Fjernet %{username} sin topptekst bilde
+      removed_avatar_msg: Fjerna %{username} sitt avatarbilete
+      removed_header_msg: Fjerna %{username} sitt toppbilete
       resend_confirmation:
         already_confirmed: Denne brukaren er allereie stadfesta
         send: Send stadfestings-e-posten på nytt
@@ -182,20 +129,15 @@ nn:
       reset: Attstill
       reset_password: Attstill passord
       resubscribe: Ting på nytt
-      role: Løyve
-      roles:
-        admin: Administrator
-        moderator: Ordstyrer
-        staff: Personell
-        user: Brukar
+      role: Rolle
       search: Søk
       search_same_email_domain: Andre brukarar med same e-postdomene
       search_same_ip: Andre brukarar med same IP
       security_measures:
-        only_password: Bare passord
+        only_password: Kun passord
         password_and_2fa: Passord og 2FA
-        password_and_sign_in_token: Passord og e-post token
-      sensitized: Merket som følsom
+      sensitive: Tving ømtolig
+      sensitized: Merka som ømtolig
       shared_inbox_url: Delt Innboks URL
       show:
         created_reports: Rapportar frå denne kontoen
@@ -203,18 +145,22 @@ nn:
       silence: Togn
       silenced: Dempa
       statuses: Statusar
+      strikes: Tidlegare prikkar
       subscribe: Ting
+      suspend: Utvis og slett kontodata for godt
       suspended: Utvist
-      suspension_irreversible: Dataene fra denne kontoen har blitt ikke reverserbart slettet. Du kan oppheve suspenderingen av kontoen for å gjøre den brukbart, men den vil ikke gjenopprette alle data den tidligere har hatt.
-      suspension_reversible_hint_html: Kontoen har blitt suspendert, og dataene vil bli fullstendig fjernet den %{date}. Frem til da kan kontoen gjenopprettes uten negative effekter. Hvis du ønsker å fjerne alle kontoens data umiddelbart, kan du gjøre det nedenfor.
-      time_in_queue: Ventar i kø %{time}
+      suspension_irreversible: Data frå denne kontoen har blitt ikkje-reverserbart sletta. Du kan oppheve suspenderinga av kontoen for å bruke den, men det vil ikkje gjenopprette alle data den tidligare har hatt.
+      suspension_reversible_hint_html: Kontoen har blitt suspendert, og data vil bli fullstendig fjerna den %{date}. Fram til då kan kontoen gjenopprettes uten negative effekter. Om du ynskjer å fjerne kontodata no, kan du gjere det nedanfor.
       title: Kontoar
+      unblock_email: Avblokker e-postadresse
+      unblocked_email_msg: Avblokkerte %{username} si e-postadresse
       unconfirmed_email: E-post utan stadfesting
+      undo_sensitized: Angr tving ømtolig
       undo_silenced: Angr målbinding
       undo_suspension: Angr utvising
       unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
       unsubscribe: Avmeld
-      unsuspended_msg: Opphevde vellykket suspenderingen av %{username} sin konto
+      unsuspended_msg: Oppheving av utvisinga av %{username} sin konto var vellykka
       username: Brukarnamn
       view_domain: Vis sammendrag for domenet
       warn: Åtvar
@@ -222,48 +168,124 @@ nn:
       whitelisted: Kvitlista
     action_logs:
       action_types:
+        approve_appeal: Godkjenn appell
+        approve_user: Godkjenn brukar
         assigned_to_self_report: Tilordne rapport
         change_email_user: Byt e-post for brukar
+        change_role_user: Endre brukarrolle
         confirm_user: Stadfest brukar
         create_account_warning: Opprett åtvaring
         create_announcement: Opprett lysing
+        create_canonical_email_block: Opprett e-post-blokkering
         create_custom_emoji: Opprett tilpassa emoji
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
         create_email_domain_block: Opprett e-post domeneblokk
         create_ip_block: Opprett IP-regel
+        create_unavailable_domain: Opprett utilgjengeleg domene
+        create_user_role: Opprett rolle
         demote_user: Degrader brukar
         destroy_announcement: Slett lysinga
+        destroy_canonical_email_block: Slett e-post-blokkering
         destroy_custom_emoji: Slett tilpassa emoji
         destroy_domain_allow: Slett domenegodkjenning
         destroy_domain_block: Slett domenesperring
         destroy_email_domain_block: Slett e-postdomenesperring
+        destroy_instance: Slett domene
         destroy_ip_block: Slett IP-regel
         destroy_status: Slett status
+        destroy_unavailable_domain: Slett utilgjengeleg domene
+        destroy_user_role: Øydelegg rolle
         disable_2fa_user: Skruv av 2FA
         disable_custom_emoji: Skruv av tilpassa emoji
+        disable_sign_in_token_auth_user: Slå av e-post tokenautentisering for brukar
         disable_user: Skruv av brukar
         enable_custom_emoji: Skruv på tilpassa emoji
+        enable_sign_in_token_auth_user: Slå på e-post tokenautentisering for brukar
         enable_user: Skruv på brukar
+        memorialize_account: Opprett minnekonto
         promote_user: Forfrem brukar
+        reject_appeal: Avvis appell
+        reject_user: Avvis brukar
         remove_avatar_user: Fjern avatar
         reopen_report: Opn rapport opp att
+        resend_user: Send stadfestings-epost på ny
         reset_password_user: Tilbakestill passord
         resolve_report: Løs rapport
+        sensitive_account: Tving ømtolig konto
         silence_account: Demp konto
         suspend_account: Suspender kontoen
+        unassigned_report: Fjern tilordna rapport
+        unblock_email_account: Avblokker e-postadresse
+        unsensitive_account: Angr tving ømtolig konto
+        unsilence_account: Angre avgrensing av konto
         unsuspend_account: Opphev suspensjonen av kontoen
         update_announcement: Oppdater kunngjøringen
         update_custom_emoji: Oppdater tilpassa emoji
+        update_domain_block: Oppdater domene-sperring
+        update_ip_block: Oppdater IP-regel
         update_status: Oppdater tut
+        update_user_role: Oppdater rolla
       actions:
-        create_custom_emoji_html: "%{name} lastet opp ny emoji %{target}"
-        create_domain_allow_html: "%{name} tillatt føderasjon med domenet %{target}"
-        create_domain_block_html: "%{name} blokkert domene %{target}"
-        create_email_domain_block_html: "%{name} blokkert e-post domene %{target}"
-        create_ip_block_html: "%{name} opprettet regel for IP %{target}"
-        silence_account_html: "%{name} begrenset %{target} sin konto"
-      deleted_status: "(sletta status)"
+        approve_appeal_html: "%{name} godkjende klagen frå %{target} på modereringa"
+        approve_user_html: "%{name} godkjende registreringa til %{target}"
+        assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg sjølv"
+        change_email_user_html: "%{name} endra e-postadressa til brukaren %{target}"
+        change_role_user_html: "%{name} endra rolla til %{target}"
+        confirm_user_html: "%{name} stadfesta e-postadressa til brukaren %{target}"
+        create_account_warning_html: "%{name} sende ei åtvaring til %{target}"
+        create_announcement_html: "%{name} oppretta ei ny kunngjering %{target}"
+        create_canonical_email_block_html: "%{name} blokkerte e-post med hash %{target}"
+        create_custom_emoji_html: "%{name} lasta opp ein ny emoji %{target}"
+        create_domain_allow_html: "%{name} tillot føderasjon med domenet %{target}"
+        create_domain_block_html: "%{name} blokkerte domenet %{target}"
+        create_email_domain_block_html: "%{name} blokkerte e-postdomenet %{target}"
+        create_ip_block_html: "%{name} oppretta ein regel for IP-en %{target}"
+        create_unavailable_domain_html: "%{name} stogga levering til domenet %{target}"
+        create_user_role_html: "%{name} oppretta rolla %{target}"
+        demote_user_html: "%{name} degraderte brukaren %{target}"
+        destroy_announcement_html: "%{name} sletta kunngjeringa %{target}"
+        destroy_canonical_email_block_html: "%{name} avblokkerte e-post med hash %{target}"
+        destroy_custom_emoji_html: "%{name} sletta emojien %{target}"
+        destroy_domain_allow_html: "%{name} forbydde føderasjon med domenet %{target}"
+        destroy_domain_block_html: "%{name} avblokkerte domenet %{target}"
+        destroy_email_domain_block_html: "%{name} avblokkerte e-postdomenet %{target}"
+        destroy_instance_html: "%{name} tømde domenet %{target}"
+        destroy_ip_block_html: "%{name} sletta ein regel for IP-en %{target}"
+        destroy_status_html: "%{name} fjerna innlegget frå %{target}"
+        destroy_unavailable_domain_html: "%{name} tok opp att levering til domenet %{target}"
+        destroy_user_role_html: "%{name} sletta rolla %{target}"
+        disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
+        disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} deaktivert e-post token for godkjenning for %{target}"
+        disable_user_html: "%{name} slo av innlogging for brukaren %{target}"
+        enable_custom_emoji_html: "%{name} aktiverte emojien %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverte e-post token autentisering for %{target}"
+        enable_user_html: "%{name} aktiverte innlogging for brukaren %{target}"
+        memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
+        promote_user_html: "%{name} fremja brukaren %{target}"
+        reject_appeal_html: "%{name} avviste klagen frå %{target} på modereringa"
+        reject_user_html: "%{name} avslo registrering fra %{target}"
+        remove_avatar_user_html: "%{name} fjerna %{target} sitt profilbilete"
+        reopen_report_html: "%{name} opna rapporten %{target} på nytt"
+        resend_user_html: "%{name} sendte bekreftelsesepost for %{target} på nytt"
+        reset_password_user_html: "%{name} tilbakestilte passordet for brukaren %{target}"
+        resolve_report_html: "%{name} løyste ein rapport %{target}"
+        sensitive_account_html: "%{name} markerte %{target} sitt media som ømtolig"
+        silence_account_html: "%{name} begrensa %{target} sin konto"
+        suspend_account_html: "%{name} utviste %{target} sin konto"
+        unassigned_report_html: "%{name} løyste ein rapport %{target}"
+        unblock_email_account_html: "%{name} avblokkerte %{target} si e-postadresse"
+        unsensitive_account_html: "%{name} avmarkerte %{target} sitt media som ømtolig"
+        unsilence_account_html: "%{name} fjerna grensa på kontoen til %{target}"
+        unsuspend_account_html: "%{name} oppheva utvisinga av %{target} sin konto"
+        update_announcement_html: "%{name} oppdaterte kunngjeringa %{target}"
+        update_custom_emoji_html: "%{name} oppdaterte emojien %{target}"
+        update_domain_block_html: "%{name} oppdaterte domeneblokkeringa for %{target}"
+        update_ip_block_html: "%{name} endret regel for IP %{target}"
+        update_status_html: "%{name} oppdaterte innlegg av %{target}"
+        update_user_role_html: "%{name} endret %{target} -rolle"
+      deleted_account: sletta konto
       empty: Ingen loggar funne.
       filter_by_action: Sorter etter handling
       filter_by_user: Sorter etter brukar
@@ -302,11 +324,12 @@ nn:
       enable: Slå på
       enabled: Slege på
       enabled_msg: Aktiverte kjensleteikn
-      image_hint: PNG opp til 50 kB
+      image_hint: PNG eller GIF opp til %{size}
       list: Oppfør
       listed: Oppført
       new:
         title: Legg til eige kjensleteikn
+      no_emoji_selected: Ingen emojiar vart endra sidan ingen vart valde
       not_permitted: Du har ikkje løyve til å utføra denne handlinga
       overwrite: Skriv over
       shortcode: Stuttkode
@@ -319,13 +342,35 @@ nn:
       updated_msg: Kjensleteiknet er oppdatert!
       upload: Last opp
     dashboard:
+      active_users: aktive brukarar
+      interactions: interaksjonar
+      media_storage: Medielagring
+      new_users: nye brukarar
+      opened_reports: rapportar opna
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> ventande ankar"
+        other: "<strong>%{count}</strong> ventande klagar"
+      pending_users_html:
+        one: "<strong>%{count}</strong> ventande brukarar"
+        other: "<strong>%{count}</strong> ventande brukarar"
+      resolved_reports: rapportar løyst
       software: Programvare
+      sources: Kjelder for registreringar
       space: Lagrinsplass nytta
       title: Dashbord
+      top_languages: Mest aktive språk
+      top_servers: Mest aktive serverar
+      website: Nettside
+    disputes:
+      appeals:
+        empty: Ingen ankar funne.
+        title: Ankar
     domain_allows:
       add_new: Kvitlist domene
       created_msg: Domene er vorte kvitlista
       destroyed_msg: Domene er fjerna frå kvitlista
+      export: Eksporter
+      import: Importer
       undo: Fjern frå kvitliste
     domain_blocks:
       add_new: Lag ny
@@ -333,18 +378,23 @@ nn:
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
       edit: Rediger domeneblokkering
+      existing_domain_block: Du har allerede pålagt strengere begrensninger på %{name}.
       existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du kan være nødt til <a href="%{unblock_url}">oppheve blokkeringen av den</a> først.
+      export: Eksporter
+      import: Importer
       new:
         create: Lag blokkering
         hint: Domeneblokkeringen vil ikke hindre opprettelse av kontooppføringer i databasen, men vil retroaktivt og automatisk benytte spesifikke moderasjonsmetoder på de kontoene.
         severity:
-          desc_html: "<strong>Målbind</strong> gjør kontoens poster usynlige for alle som ikke følger den. <strong>Utvis</strong> fjerner alt innhold, media og profildata fra kontoen. Bruk <strong>Ingen</strong> hvis du bare vil fjerne mediafiler."
+          desc_html: "<strong>Målbind</strong> gjer kontoen sine postear usynlege for alle som ikkje følger den. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoen. Bruk <strong>Ingen</strong> viss du berre vil fjerne mediafiler."
           noop: Ingen
-          silence: Togn
+          silence: Målbind
           suspend: Utvis
         title: Ny domeneblokkering
+      no_domain_block_selected: Ingen domeneblokkeringar vart endra sidan ingen var valde
+      not_permitted: Du har ikkje løyve til å utføra denne handlinga
       obfuscate: Obfuskere domenenavn
-      obfuscate_hint: Delvis skjule domenenavnet i listen hvis det er aktivert for å annonsere listen over domenebegrensninger
+      obfuscate_hint: Skjul deler av domenenavnet i listen hvis annonsering av listen over domenebegrensninger er slått på
       private_comment: Privat kommentar
       private_comment_hint: Kommenter angående denne domenebegrensningen for internt bruk av moderatorene.
       public_comment: Offentleg kommentar
@@ -353,56 +403,98 @@ nn:
       reject_media_hint: Fjernar mediefiler som er lagra lokalt og nektar å lasta ned andre i framtida. Har ikkje noko å seia for utvisingar
       reject_reports: Avvis rapportar
       reject_reports_hint: Ignorer alle rapportar frå dette domenet. Har ikkje noko å seia for utvisingar
-      rejecting_media: avviser mediefiler
-      rejecting_reports: avviser rapportar
-      severity:
-        silence: dempa
-        suspend: utvist
-      show:
-        affected_accounts:
-          one: Éin konto i databasen vert påverka
-          other: "%{count} kontoar i databasen vert påverka"
-        retroactive:
-          silence: Avmålbind alle eksisterende kontoer fre dette domenet
-          suspend: Avutvis alle eksisterende kontoer fra dette domenet
-        title: Angre domeneblokkering for %{domain}
-        undo: Angr
       undo: Angre
       view: Vis domeneblokkering
     email_domain_blocks:
       add_new: Lag ny
+      attempts_over_week:
+        one: "%{count} forsøk i løpet av den siste uken"
+        other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
       created_msg: E-postdomenet ble lagt til i blokkeringslisten uten problemer
       delete: Slett
-      destroyed_msg: E-postdomenet har blitt fjernet fra blokkeringslisten uten problemer
+      dns:
+        types:
+          mx: MX post
       domain: Domene
-      empty: Ingen e-mail-domener er sortelistet på dette tidspunkt.
-      from_html: frå %{domain}
       new:
         create: Legg til domene
+        resolve: Løs domene
         title: Ny blokkeringsoppføring av e-postdomene
+      no_email_domain_block_selected: Blokkering av e-post-domener vart ikkje endra sidan ingen var valde
+      resolved_dns_records_hint_html: Domenenamnet gjer oppslag til desse MX-domenene som til sist er ansvarlige for å motta e-post. Blokkering av eit MX-domene vil blokkere registreringar frå alle e-postadresser som bruker same MX-domene, sjølv om det synlige domenenavnet skulle vera noko anna. <strong>Pass på så du ikkje blokkerer dei store e-postleverandørane.</strong>
+      resolved_through_html: Løyst gjennom %{domain}
       title: Blokkerte e-postadresser
+    export_domain_allows:
+      new:
+        title: Importer domenetillatingar
+      no_file: Inga fil vald
+    export_domain_blocks:
+      import:
+        description_html: Du skal til å importera ei liste over domeneblokkeringar. Gjer vel og sjå nøye gjennom lista, særleg om du ikkje har laga ho sjølv.
+        existing_relationships_warning: Noverande fylgjeforhold
+        private_comment_description_html: 'For å hjelpa deg med å halda oversikt over kvar importerte blokkeringar kjem frå, vil dei bli oppretta med fylgjande private kommentar: <q>%{comment}</q>'
+        private_comment_template: Importert frå %{source} den %{date}
+        title: Importer domeneblokkeringar
+      new:
+        title: Importer domeneblokkeringar
+      no_file: Inga fil vald
     follow_recommendations:
-      description_html: "<strong>Følg anbefalinger hjelper nye brukere med å finne interessant innhold</strong>. Når en bruker ikke har kommunisert med andre nok til å danne personlig tilpassede følger anbefalinger, anbefales disse kontoene i stedet. De beregnes daglig på nytt fra en blanding av kontoer der de høyeste engasjementene er og med høyest lokal tilhenger for et gitt språk."
+      description_html: "<strong>Følgjeforslag hjelper nye brukarar å raskt finna interessant innhald</strong>. Om ein brukar ikkje har interagera nok med andre til å danne personlege følgjeforslag, vert disse kontiane føreslått i staden. Dei vert gjenkalkulert på dagleg basis ut frå ei blanding av dei konti med flest nylege engasjement og flest lokale følgjarar for eit gitt språk."
       language: For språk
       status: Status
-      suppress: Undertrykk anbefalte følger
-      suppressed: Dempet
-      title: Følg anbefalinger
-      unsuppress: Gjenopprett følg-anbefaling
+      suppress: Demp følgjeforslag
+      suppressed: Dempa
+      title: Følgjeforslag
+      unsuppress: Tilbakestill følgjeforslag
     instances:
-      back_to_all: All
+      availability:
+        description_html:
+          one: Om leveransar til domenet feilar <strong>%{count} dag</strong>, vil det ikkje bli gjort fleire forsøk før det eventuelt kjem ein leveranse <em>frå</em> domenet.
+          other: Om leveransar til domenet feilar <strong>%{count} ulike dagar</strong>, vil det ikkje bli gjort fleire forsøk før det eventuelt kjem ein leveranse <em>frå</em> domenet.
+        failure_threshold_reached: Feilterskelen ble nådd %{date}.
+        failures_recorded:
+          one: Mislykkede forsøk på %{count} dag.
+          other: Mislykkede forsøk på %{count} ulike dager.
+        no_failures_recorded: Ingen feil registrert.
+        title: Tilgjenge
+        warning: Det siste forsøket på å koble til denne serveren lyktes ikke
+      back_to_all: Alle
       back_to_limited: Begrenset
       back_to_warning: Advarsel
       by_domain: Domene
+      confirm_purge: Er du sikker på at du vil slette data permanent fra dette domenet?
+      content_policies:
+        comment: Internt notat
+        description_html: Du kan definere innholdsregler som vil bli brukt på alle kontoer fra dette domenet og hvilket som helst av underdomenene.
+        policies:
+          reject_media: Avvis media
+          reject_reports: Avvis rapporter
+          silence: Begrens
+          suspend: Suspender
+        policy: Vilkår
+        reason: Offentlig årsak
+        title: Retningslinjer for innhold
+      dashboard:
+        instance_accounts_dimension: Mest fylgde kontoar
+        instance_accounts_measure: lagrede kontoer
+        instance_followers_measure: våre følgere der
+        instance_follows_measure: deres følgere her
+        instance_languages_dimension: Mest brukte språk
+        instance_media_attachments_measure: lagrede mediavedlegg
+        instance_reports_measure: rapporter om dem
+        instance_statuses_measure: lagrede innlegg
       delivery:
-        all: All
+        all: Alle
         clear: Feil ved fjerning
+        failing: Feilar
         restart: Starte levering
         stop: Stopp levering
-        title: Levering
         unavailable: Ikke tilgjengelig
-        warning: Advarsel
       delivery_available: Levering er tilgjengelig
+      delivery_error_days: Leveringsfeildagar
+      delivery_error_hint: Dersom levering ikke er mulig i løpet av %{count} dager, blir det automatisk merket som ikke mulig å levere.
+      destroyed_msg: Data frå %{domain} er no lagt i kø for å bli sletta.
+      empty: Ingen domener funnet.
       known_accounts:
         one: "%{count} kjend konto"
         other: "%{count} kjende kontoar"
@@ -412,12 +504,15 @@ nn:
         title: Moderasjon
       private_comment: Privat kommentar
       public_comment: Offentleg kommentar
+      purge: Reinse
+      purge_description_html: Dersom du trur dette domenet har blitt kopla ned for godt, kan du sletta all kontoinformasjon og tilhøyrande data som gjeld domenet frå lageret ditt. Dette kan ta litt tid.
       title: Samling
       total_blocked_by_us: Blokkert av oss
       total_followed_by_them: Fylgd av dei
       total_followed_by_us: Fylgd av oss
       total_reported: Rapportar om dei
       total_storage: Medievedlegg
+      totals_time_period_hint_html: Totalsum vist nedanfor gjeld data for alle tidsperiodar.
     invites:
       deactivate_all: Slå av alle
       filter:
@@ -441,8 +536,6 @@ nn:
         title: Opprett ny IP-regel
       no_ip_block_selected: Ingen IP-regler ble endret da ingen ble valgt
       title: IP-regler
-    pending_accounts:
-      title: Kontoar som ventar (%{count})
     relationships:
       title: "%{acct} sitt forhold"
     relays:
@@ -469,19 +562,25 @@ nn:
         notes:
           one: "%{count} notis"
           other: "%{count} notiser"
-        reports:
-          one: "%{count} rapport"
-          other: "%{count} rapporter"
+      action_log: Tilsynslogg
       action_taken_by: Handling gjort av
+      actions:
+        delete_description_html: De rapporterte innleggene vil bli slettet, og en advarsel vil bli tatt vare på for å hjelpe deg eskalere ved fremtidige overtredelser fra samme konto.
+        mark_as_sensitive_description_html: Mediene i dei rapporterte innlegga vil verte markerte som ømtolege, og ein merknad vil verte lagra for å hjelpe deg å eskalera ved framtidige regelbrot frå same konto.
+        resolve_description_html: Ingen handling utføres mot den rapporterte kontoen, ingen advarsel gis, og rapporten lukkes.
+        silence_description_html: Profilen vil kun være synlig for dem som allerede følger den eller manuelt slår den opp, noe som sterkt begrenser dens rekkevidde. Kan alltid tilbakestilles.
       are_you_sure: Er du sikker?
       assign_to_self: Tilegn til meg
       assigned: Tilsett moderator
+      by_target_domain: Domenet av rapportert bruker
+      category: Kategori
       comment:
         none: Ingen
       created_at: Rapportert
       forwarded: Videresendt
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Merk som løyst
+      mark_as_sensitive: Marker som ømtolig
       mark_as_unresolved: Merk som uløyst
       notes:
         create: Sett inn merknad
@@ -496,151 +595,167 @@ nn:
       resolved: Oppløyst
       resolved_msg: Rapporten er løyst!
       status: Status
-      target_domain: Domenet av rapportert bruker
+      statuses: Rapportert innhold
       target_origin: Opprinnelse for innrapportert konto
       title: Rapportar
       unassign: Avset
       unresolved: Uløyst
       updated_at: Oppdatert
+      view_profile: Vis profil
+    roles:
+      add_new: Legg til rolle
+      assigned_users:
+        one: "%{count} brukar"
+        other: "%{count} brukarar"
+      categories:
+        administration: Administrasjon
+        devops: DevOps
+        invites: Innbydingar
+      delete: Slett
+      description_html: Med <strong>brukarrollar</strong> kan du kontrollera kva funksjonar og område av Mastodon brukarane dine har tilgong til.
+      edit: Endr rollen '%{name}'
+      everyone: Standard-tillatelser
+      everyone_full_description_html: Dette er <strong>grunnrollen</strong> som påverkar <strong>alle brukarar</strong>, jamvel dei utan ei tilsett rolle. Alle andre rollar arvar tillatingar frå denne.
+      permissions_count:
+        one: "%{count} tillatelse"
+        other: "%{count} tillatelser"
+      privileges:
+        administrator: Administrator
+        administrator_description: Brukere med denne tillatelsen omgår enhver tillatelse
+        delete_user_data: Slett brukerdata
+        delete_user_data_description: Lar brukere slette andre brukeres data uten forsinkelse
+        invite_users: Innby brukarar
+        invite_users_description: Tillet at brukarar innbyr nye folk til tenaren
+        manage_invites: Handsam innbydingar
+        manage_invites_description: Tillet at brukarar blar gjennom og deaktiverer innbydingslenkjer
+        manage_roles: Handsam roller
+        manage_roles_description: Tillet at brukarar handsamar og tilset rollar under deira eiga
+        manage_user_access: Administrer brukartilgang
+        manage_user_access_description: Let brukarar deaktivera 2-trinnsautentisering, endra e-postadressa og tilbakestille passordet til andre brukarar
+        manage_users: Handtere brukarar
+        manage_users_description: Let brukarar sjå detaljar om andre brukarar og utføre moderasjonshandlingar mot dei
+        manage_webhooks: Handtere webhooks
+        manage_webhooks_description: Let brukarar setje opp webhooks for administrative hendingar
+        view_audit_log: Sjå revisjonslogg
+        view_audit_log_description: Let brukarar sjå historikk over administrative handlingar på tenaren
+        view_dashboard: Vis dashbord
+        view_dashboard_description: Gir brukere tilgang til dashbordet og ulike metrikker
+        view_devops: DevOps
+        view_devops_description: Gir brukere tilgang til Sidekiq og pgHero-dashbord
+      title: Rollar
     rules:
-      add_new: Legg til et filter
+      add_new: Legg til regel
       delete: Slett
       description_html: Mens de fleste hevder å ha lest og samtykket i tjenestevilkårene, leser de vanligvis ikke gjennom før etter et problem oppstår. <strong>Gjør det enklere å se serverens regler på et øyeblikk ved å gi dem i en flat kulepunktsliste.</strong> Prøv å holde individuelle regler korte og enkelt, men prøv å ikke dele dem opp i mange separate elementer heller.
       edit: Rediger regel
       empty: Ingen serverregler har blitt definert ennå.
       title: Server regler
     settings:
-      activity_api_enabled:
-        desc_html: Antall lokale statusposter, aktive brukere og nye registreringer i ukentlige oppdelinger
-        title: Publiser samlet statistikk om brukeraktiviteter
-      bootstrap_timeline_accounts:
-        desc_html: Separer flere brukernavn med komma. Kun lokale og ulåste kontoer vil kunne brukes. Dersom tomt er standarden alle lokale administratorer.
-        title: Standard fylgjer for nye brukarar
-      contact_information:
-        email: Offentleg e-postadresse
-        username: Brukarnamn for kontakt
-      custom_css:
-        desc_html: Modifiser utseendet med CSS lastet på hver side
-        title: Eigen CSS
+      about:
+        manage_rules: Handter tenarreglar
+        preamble: Gje grundig informasjon om korleis tenaren blir drifta, moderert og finansiert.
+        rules_hint: Det er eit eige område for reglar som brukarar må retta seg etter.
+        title: Om
+      appearance:
+        title: Utsjånad
       default_noindex:
         desc_html: Påverkar alle brukarar som ikkje har justert denne innstillinga sjølve
-        title: Velg brukere som er ute av søkemotoren indeksering som standard
+        title: Ikkje la brukarar indekserast av søkjemotorar som standard
+      discovery:
+        follow_recommendations: Følgjeforslag
+        preamble: Å framheva interessant innhald er vitalt i mottakinga av nye brukarar som ikkje nødvendigvis kjenner nokon på Mastodon. Kontroller korleis oppdagingsfunksjonane på tenaren din fungerar.
+        trends: Trender
       domain_blocks:
         all: Til alle
         disabled: Til ingen
-        title: Vis domeneblokkeringer
         users: Til lokale brukarar som er logga inn
-      domain_blocks_rationale:
-        title: Vis kvifor
-      hero:
-        desc_html: Vises på forsiden. Minst 600×100px er anbefalt. Dersom dette ikke er valgt, faller det tilbake på tjenerens miniatyrbilde
-        title: Heltebilete
-      mascot:
-        desc_html: Vist på flere sider. Minst 293×205px er anbefalt. Dersom det ikke er valgt, faller det tilbake til standardmaskoten
-        title: Maskotbilete
-      peers_api_enabled:
-        desc_html: Domenenavn denne instansen har truffet på i fediverset
-        title: Publiser liste over oppdaga tenarar
-      preview_sensitive_media:
-        desc_html: Lenkeforhåndsvisninger på andre nettsteder vil vise et miniatyrbilde selv dersom mediet er merket som sensitivt
-        title: Vis sensitive medier i OpenGraph-forhåndsvisninger
-      profile_directory:
-        desc_html: Gjer at brukarar kan oppdagast
-        title: Skru på profilmappen
-      registrations:
-        closed_message:
-          desc_html: Vises på forsiden når registreringer er lukket<br>Du kan bruke HTML-tagger
-          title: Melding for lukket registrering
-        deletion:
-          desc_html: Tillat alle å sletta kontoen sin
-          title: Åpne kontosletting
-        min_invite_role:
-          disabled: Ingen
-          title: Tillat innbydingar frå
-        require_invite_text:
-          desc_html: Når registreringer krever manuell godkjenning, må du føye «Hvorfor vil du bli med?» tekstinput obligatoriske i stedet for valgfritt
-          title: Krev nye brukere for å oppgi en grunn for å delta
       registrations_mode:
         modes:
           approved: Godkjenning kreves for påmelding
           none: Ingen kan melda seg inn
           open: Kven som helst kan melda seg inn
-        title: Registreringsmodus
-      show_known_fediverse_at_about_page:
-        desc_html: Begrenser den offentlige tidslinjen som er knyttet til landingssiden når den er deaktivert, og viser bare lokalt innhold
-      show_staff_badge:
-        desc_html: Vis personalmerke på ei brukarside
-        title: Vis personalmerke
-      site_description:
-        desc_html: Vises som et avsnitt på forsiden og brukes som en meta-tagg. Du kan bruke HTML-tagger, spesielt <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
-        title: Tenarskilding
-      site_description_extended:
-        desc_html: Ein god stad å setja reglar for åtferdskode, reglar, rettningsliner og andre ting som skil din tenar frå andre. Du kan nytta HTML-taggar
-        title: Utvidet nettstedsinformasjon
-      site_short_description:
-        desc_html: Vist i sidelinjen og i metastempler. Beskriv hva Mastodon er og hva som gjør denne tjeneren spesiell i én enkelt paragraf.
-        title: Stutt om tenaren
-      site_terms:
-        desc_html: Du kan skrive din egen personverns-strategi, bruksviklår og andre regler. Du kan bruke HTML tagger
-        title: Eigne brukarvilkår
-      site_title: Tenarnamn
-      thumbnail:
-        desc_html: Brukes ved forhandsvisning via OpenGraph og API. 1200x630px anbefales
-        title: Småbilete for tenaren
-      timeline_preview:
-        desc_html: Vis offentlig tidslinje på landingssiden
-        title: Tillat uautentisert tilgang til offentleg tidsline
-      title: Sideinnstillingar
-      trendable_by_default:
-        desc_html: Påverkar emneknaggar som ikkje har vore tillatne tidlegare
-        title: Tillat emneknaggar å verta populære utan gjennomgang på førehand
-      trends:
-        title: Populære emneknaggar
+      title: Serverinnstillinger
     site_uploads:
       delete: Slett opplasta fil
       destroyed_msg: Vellukka sletting av sideopplasting!
     statuses:
+      account: Forfatter
+      application: Applikasjon
       back_to_account: Tilbake til kontosida
       batch:
-        delete: Slett
-        nsfw_off: NSFW AV
-        nsfw_on: NSFW PÅ
+        remove_from_report: Fjern fra rapport
       deleted: Sletta
-      failed_to_execute: Lét seg ikkje gjera
+      history: Versjonshistorikk
+      language: Språk
       media:
         title: Media
-      no_media: Ingen media
+      metadata: Metadata
       no_status_selected: Ingen statusar vart endra sidan ingen vart valde
+      original_status: Opprinnelig innlegg
+      status_changed: Innlegg endret
       title: Kontostatusar
+      visibility: Synlighet
       with_media: Med media
+    strikes:
+      actions:
+        delete_statuses: "%{name} slettet %{target}s innlegg"
+        disable: "%{name} frøs %{target}s konto"
+        mark_statuses_as_sensitive: "%{name} markerte %{target} sine innlegg som ømtålige"
+        none: "%{name} sendte en advarsel til %{target}"
+        sensitive: "%{name} markerte %{target} sin konto som ømtolig"
+        silence: "%{name} begrenset %{target}s konto"
+        suspend: "%{name} utviste %{target} sin konto"
+      appeal_approved: Klage tatt til følge
+      appeal_pending: Klage behandles
     system_checks:
       database_schema_check:
         message_html: Det venter på databaseoverføringer. Vennligst kjør disse for å sikre at applikasjonen oppfører seg som forventet
+      elasticsearch_running_check:
+        message_html: Kunne ikke koble til Elasticsearch. Kontroller at den kjører, eller deaktiver fulltekstsøk
+      elasticsearch_version_check:
+        message_html: 'Inkompatibel Elasticsearch-versjon: %{value}'
+        version_comparison: Elasticsearch %{running_version} kjører mens %{required_version} er påkrevd
       rules_check:
         action: Behandle serverregler
         message_html: Du har ikke definert noen serverregler.
+      sidekiq_process_check:
+        message_html: Ingen Sidekiq-prosess kjører for %{value} køen(e). Vennligst se gjennom Sidekiq-konfigurasjonen din
     tags:
-      accounts_today: Ulike brukarar i dag
-      accounts_week: Unike brukstilfeller denne uken
-      breakdown: Oversyn over bruk i dag etter kjelde
-      last_active: Sist aktiv
-      most_popular: Mest populær
-      most_recent: Nyast
-      name: Emneknagg
       review: Sjå gjennom status
-      reviewed: Gjennomgått
-      title: Emneknaggar
-      trending_right_now: Populært no
-      unique_uses_today: "%{count} legg ut i dag"
-      unreviewed: Ikkje gjennomgått
       updated_msg: Emneknagginnstillingane er oppdaterte
     title: Leiing
+    trends:
+      allow: Tillat
+      approved: Godkjent
+      disallow: Ikke tillat
+      links:
+        allow: Tillat lenke
+        disallow: Ikke tillat lenke
+        no_link_selected: Ingen lenker ble endret da ingen var valgt
+        shared_by_over_week:
+          one: Delt av %{count} person i løpet av den siste uken
+          other: Delt av %{count} personer i løpet av den siste uken
+        usage_comparison: Delt %{today} ganger i dag, sammenlignet med %{yesterday} i går
+      pending_review: Avventer gjennomgang
+      rejected: Avvist
+      statuses:
+        allow: Tillat innlegg
+        allow_account: Tillat forfatter
+        disallow: Ikke tillat innlegg
     warning_presets:
       add_new: Legg til ny
       delete: Slett
       edit_preset: Endr åtvaringsoppsett
       title: Handsam åtvaringsoppsett
+    webhooks:
+      add_new: Legg til endepunkt
+      status: Status
   admin_mailer:
+    new_appeal:
+      actions:
+        mark_statuses_as_sensitive: å merke innleggene sine som følsomme
+        sensitive: å merke kontoen sin som følsom
+        silence: for å begrense deres konto
     new_pending_account:
       body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
       subject: Ny konto opp til vurdering på %{instance} (%{username})
@@ -648,9 +763,6 @@ nn:
       body: "%{reporter} har rapportert %{target}"
       body_remote: Nokon frå %{domain} har meldt %{target}
       subject: Ny rapport for %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Emneknaggen #%{name} trender i dag, men den har ikke blitt gjennomgått tidligere. Den vil ikke bli vist offentlig med mindre du tillater at den blir det, eller du kan bare lagre skjemaet slik det er for å aldri høre om det igjen.'
-      subject: Ny emneknagg ventar gjennomgang på %{instance} (#%{name})
   aliases:
     add_new: Lag psevdonym
     created_msg: Laga eit nytt kallenamn. No kan du setja i gang med flyttinga frå den gamle kontoen.
@@ -660,14 +772,14 @@ nn:
     remove: Fjern aliaslenking
   appearance:
     advanced_web_interface: Avansert nettgrensesnitt
-    advanced_web_interface_hint: 'Hvis du ønsker å bruke hele skjermbredden din, lar det avanserte nettgrensesnittet deg sette opp mange forskjellige kolonner for å se så mye informasjon på én gang som du vil: Hjem, varslinger, fellestidslinjen, og ethvert antall lister og emneknagger.'
-    animations_and_accessibility: Animasjoner og tilgjengelighet
+    advanced_web_interface_hint: 'Om du vil bruke heile skjermbreidda di, let det avanserte nettgrensesnittet deg setje opp mange ulike kolonnar for å sjå så mykje informasjon du vil på ein gong: Heim, varsel, samla tidslinje, og kva som helst antall lister og emneknaggar.'
+    animations_and_accessibility: Animasjonar og tilgjengelegheit
     confirmation_dialogs: Bekreftelsesdialoger
     discovery: Oppdaging
     localization:
-      body: Mastodon er oversatt av frivillige.
+      body: Mastodon er omsett av friviljuge.
       guide_link_text: Alle kan bidra.
-    sensitive_content: Sensitivt innhold
+    sensitive_content: Ømtolig innhald
     toot_layout: Tutoppsett
   application_mailer:
     notification_preferences: Endr e-post-innstillingane
@@ -679,16 +791,13 @@ nn:
   applications:
     created: Søknad laga
     destroyed: Søknad sletta
-    invalid_url: Denne lenkja er ugyldig
     regenerate_token: Lag tilgangsnykel på nytt
     token_regenerated: Tilgangsnykel laga på nytt
     warning: Ver varsam med dette datumet. Aldri del det med nokon!
     your_token: Tilgangsnykelen din
   auth:
-    apply_for_account: Bed om innbyding
+    apply_for_account: Søk om ein konto
     change_password: Passord
-    checkbox_agreement_html: Eg godtek <a href="%{rules_path}" target="_blank">tenarreglane</a> og <a href="%{terms_path}" target="_blank">tenestevilkåra</a>
-    checkbox_agreement_without_rules_html: Eg godtek <a href="%{terms_path}" target="_blank">tenestevilkåra</a>
     delete_account: Slett konto
     delete_account_html: Om du vil sletta kontoen din, kan du <a href="%{path}">gå hit</a>. Du vert spurd etter stadfesting.
     description:
@@ -701,11 +810,13 @@ nn:
     invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å beda om ein ny ein.
     link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspåloggingsenhet eller en gjenopprettingskode
     link_to_webauth: Bruk sikkerhetsnøkkel-enheten din
+    log_in_with: Logg inn med
     login: Innlogging
     logout: Logg ut
     migrate_account: Flytt til ein annan konto
-    migrate_account_html: Hvis du ønsker å henvise denne kontoen til en annen, kan du <a href="%{path}">konfigurere det her</a>.
+    migrate_account_html: Om du vil visa denne kontoen til ein anna, kan du <a href="%{path}">skipe det her</a>.
     or_log_in_with: Eller logg inn med
+    privacy_policy_agreement_html: Jeg har lest og godtar <a href="%{privacy_policy_path}" target="_blank">retningslinjer for personvern</a>
     providers:
       cas: CAS
       saml: SAML
@@ -713,19 +824,26 @@ nn:
     registration_closed: "%{instance} tek ikkje imot nye medlemmar"
     resend_confirmation: Send stadfestingsinstruksjonar på nytt
     reset_password: Attstill passord
+    rules:
+      preamble: Disse angis og håndheves av %{domain}-moderatorene.
+      title: Noen grunnregler.
     security: Tryggleik
     set_new_password: Lag nytt passord
     setup:
       email_below_hint_html: Om e-posten nedfor ikkje er rett, kan du endra han her og få ein ny stadfestings-e-post.
       email_settings_hint_html: Stadfestings-e-posten vart send til %{email}. Om den e-postadressa ikkje er rett, kan du byta adresse i kontoinnstillingane.
       title: Oppsett
+    sign_up:
+      preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til.
+      title: La oss få deg satt i gang på %{domain}.
     status:
       account_status: Kontostatus
       confirming: Ventar på stadfesting av e-post.
-      functional: Kontoen din er oppe og går.
+      functional: Kontoen din er fullt operativt.
       pending: Søknaden din ventar på gjennomgang frå personalet vårt. Dette kan taka litt tid. Du får ein e-post om søknaden din vert godkjend.
       redirecting_to: Kontoen din er inaktiv fordi den for øyeblikket omdirigerer til %{acct}.
-    trouble_logging_in: Får du ikkje logga inn?
+      view_strikes: Vis tidligere advarsler mot kontoen din
+    too_fast: Skjemaet ble sendt inn for raskt, prøv på nytt.
     use_security_key: Bruk sikkerhetsnøkkel
   authorize_follow:
     already_following: Du fylgjer allereie denne kontoen
@@ -748,6 +866,10 @@ nn:
     errors:
       invalid_key: er ikkje ein gild Ed25519 eller Curve25519 nykel
       invalid_signature: er ikkje ein gild Ed25519-signatur
+  date:
+    formats:
+      default: "%d. %b, %Y"
+      with_month_name: "%d. %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}t"
@@ -779,10 +901,36 @@ nn:
       more_details_html: For fleire detaljar, sjå <a href="%{terms_path}">personvernsvilkåra</a>.
       username_available: Brukarnamnet ditt vert tilgjengeleg igjen
       username_unavailable: Brukarnamnet ditt kjem til å halda seg utilgjengeleg
-  directories:
-    directory: Profilkatalog
-    explanation: Leit fram brukarar etter interessa deira
-    explore_mastodon: Utforsk %{title}
+  disputes:
+    strikes:
+      action_taken: Handling utført
+      appeal: Klage
+      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
+      appeal_rejected: Klagen ble avvist
+      appeal_submitted_at: Klage levert
+      appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
+      appeals:
+        submit: Lever klage
+      approve_appeal: Godkjenn klage
+      associated_report: Tilhørende rapport
+      created_at: Datert
+      description_html: Dette er tiltakene mot din konto og advarsler som har blitt sent til deg av %{instance}-personalet.
+      recipient: Adressert til
+      reject_appeal: Avvis klage
+      status: 'Innlegg #%{id}'
+      status_removed: Innlegg allerede fjernet fra systemet
+      title: "%{action} fra %{date}"
+      title_actions:
+        delete_statuses: Fjerning av innlegg
+        disable: Frysing av konto
+        mark_statuses_as_sensitive: Markering av innlegg som ømtolige
+        none: Advarsel
+        sensitive: Markering av konto som ømtolig
+        silence: Begrensning av konto
+        suspend: Suspensjon av konto
+      your_appeal_approved: Din klage har blitt godkjent
+      your_appeal_pending: Du har levert en klage
+      your_appeal_rejected: Din klage har blitt avvist
   domain_validator:
     invalid_domain: er ikkje eit gangbart domenenamn
   errors:
@@ -794,7 +942,7 @@ nn:
     '422':
       content: Sikkerhetsverifisering feilet. Blokkerer du informasjonskapsler?
       title: Sikkerhetsverifisering feilet
-    '429': Overfyllt
+    '429': For mange forespørsler
     '500':
       content: Orsak. Vi har gjort noko feil.
       title: Denne sida er ikkje rett
@@ -831,6 +979,8 @@ nn:
       public: Offentlege tidsliner
       thread: Samtalar
     edit:
+      add_keyword: Legg til stikkord
+      statuses: Individuelle innlegg
       title: Endr filter
     errors:
       invalid_context: Ingen eller ugild kontekst gjeve
@@ -841,43 +991,24 @@ nn:
     new:
       title: Legg til nytt filter
   footer:
-    developers: Utviklarar
-    more: Meir…
-    resources: Ressursar
     trending_now: Populært no
   generic:
     all: Alle
     changes_saved_msg: Alle endringane vart lagra!
     copy: Kopier
     delete: Slett
-    no_batch_actions_available: Ingen batch-handlingar tilgjengelege på denne sida
     order_by: Sorter etter
     save_changes: Lagr endringar
+    today: i dag
     validation_errors:
       one: Noe er ikke helt riktig ennå. Vennligst se etter en gang til
       other: Noe er ikke helt riktig ennå. Det er ennå %{count} feil å rette på
   html_validator:
     invalid_markup: 'rommar ugild HTML-kode: %{error}'
-  identity_proofs:
-    active: Aktiv
-    authorize: Ja, stadfest
-    authorize_connection_prompt: Vil du autorisere denne kryptografiske forbindelsen?
-    errors:
-      failed: Den kryptografiske tilkoplinga gjekk gale. Venlegast prøv om att frå %{provider}.
-      keybase:
-        verification_failed: Keybase kjenner ikke igjen denne sjetongen som en signatur for Keybase-brukeren %{kb_username}. Vennligst prøv igjen gjennom Keybase.
-      wrong_user: Kan ikke lage et bevis for %{proving} mens du er logget på som %{current}. Logg på som %{proving} og prøv igjen.
-    explanation_html: Her kan du kryptografisk koble til dine andre enheter, f.eks. en Keybase-profil. Dette lar andre folk sende deg krypterte meldinger og stole på innhold som du sender dem.
-    i_am_html: Eg er %{username} på %{service}.
-    identity: Identitet
-    inactive: Uaktiv
-    publicize_checkbox: 'Og tut dette:'
-    publicize_toot: 'Det er prova! Eg er %{username} på %{service}: %{url}'
-    remove: Fjern prov frå konto
-    removed: Vellukka fjerning av prov frå konto
-    status: Stadfestingsstatus
-    view_proof: Sjå prov
   imports:
+    errors:
+      invalid_csv_file: 'Ugyldig CSV-fil. Feil: %{error}'
+      over_rows_processing_limit: inneholder flere enn %{count} rader
     modes:
       merge: Set saman
       merge_long: Hald på eksisterande data og legg til nye
@@ -891,7 +1022,6 @@ nn:
       following: Fylgjeliste
       muting: Dempeliste
     upload: Last opp
-  in_memoriam_html: Til minne.
   invites:
     delete: Slå av
     expired: Utgått
@@ -904,12 +1034,12 @@ nn:
       '86400': 1 dag
     expires_in_prompt: Aldri
     generate: Lag innbydingslenkje
-    invited_by: 'Du vart invitert av:'
+    invited_by: 'Du vart innboden av:'
     max_uses:
       one: 1 bruk
       other: "%{count} bruk"
     max_uses_prompt: Inga grense
-    prompt: Generer og del lenker med andre for å gi tilgang til denne instansen
+    prompt: Generer og del lenkjer med andre for å gje tilgong til denne tenaren
     table:
       expires_at: Vert ugyldig
       uses: Bruk
@@ -919,11 +1049,18 @@ nn:
       limit: Du har nådd grensa for kor mange lister du kan ha
   login_activities:
     authentication_methods:
+      otp: to-faktor autentiseringsapp
       password: passord
+      webauthn: sikkerhetsnøkler
+    description_html: Hvis du ser aktivitet som du ikke gjenkjenner, bør du vurdere å endre passordet ditt og aktivere to-trinnsinnlogging.
+    empty: Ingen innloggingshistorikk er tilgjengelig
+    failed_sign_in_html: Mislykket innloggingsforsøk med %{method} fra %{ip} (%{browser})
+    successful_sign_in_html: Vellykket innlogging med %{method} fra %{ip} (%{browser})
     title: Autentiseringshistorikk
   media_attachments:
     validations:
       images_and_video: Kan ikkje leggja ved video til status som allereie inneheld bilete
+      not_ready: Kan ikke legge til filer som ikke er ferdigbehandlet. Prøv igjen om et øyeblikk!
       too_many: Kan ikkje leggja til meir enn 4 filer
   migrations:
     acct: Flytta til
@@ -963,17 +1100,11 @@ nn:
     carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
     copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   notification_mailer:
-    digest:
-      action: Sjå alle varsel
-      body: Her er ei kort samanfatting av meldingane du gjekk glepp av sidan siste gong du var innom %{since}
-      mention: "%{name} nemnde deg i:"
-      new_followers_summary:
-        one: Du har forresten fått deg ein ny fylgjar mens du var borte! Hurra!
-        other: Du har forresten fått deg %{count} nye fylgjarar mens du var borte! Hurra!
-      subject:
-        one: "1 nytt varsel sidan siste gong du var innom \U0001F418"
-        other: "%{count} nye varsel sidan siste gong du var innom \U0001F418"
-      title: Mens du var borte...
+    admin:
+      report:
+        subject: "%{name} leverte en rapport"
+      sign_up:
+        subject: "%{name} registrerte seg"
     favourite:
       body: 'Statusen din vart merkt som favoritt av %{name}:'
       subject: "%{name} merkte statusen din som favoritt"
@@ -998,6 +1129,8 @@ nn:
       title: Ny framheving
     status:
       subject: "%{name} postet nettopp"
+    update:
+      subject: "%{name} redigerte et innlegg"
   notifications:
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
@@ -1041,6 +1174,8 @@ nn:
     other: Anna
     posting_defaults: Innleggsstandarder
     public_timelines: Offentlege tidsliner
+  privacy_policy:
+    title: Retningslinjer for personvern
   reactions:
     errors:
       limit_reached: Grensen for forskjellige reaksjoner nådd
@@ -1051,7 +1186,7 @@ nn:
     follow_selected_followers: Følg valgte tilhengere
     followers: Følgere
     following: Følginger
-    invited: Invitert
+    invited: Innboden
     last_active: Sist aktiv
     most_recent: Sist
     moved: Flytta
@@ -1063,22 +1198,14 @@ nn:
     remove_selected_follows: Slutt å fylgja desse brukarane
     status: Kontostatus
   remote_follow:
-    acct: Tast inn brukernavn@domene som du vil følge fra
     missing_resource: Kunne ikke finne URLen for din konto
-    no_account_html: Har du ikkje konto? Du kan <a href='%{sign_up_path}' target='_blank'>melda deg inn her</a>
-    proceed: Hald fram med å fylgja
-    prompt: 'Du kjem til å fylgja:'
-    reason_html: "<strong>Hvorfor dette trinnet er nødvendig?</strong><code>%{instance}</code> er kanskje ikke tjeneren som du er registrert på, så vi må omdirigere deg til hjemmetjeneren din først."
-  remote_interaction:
-    favourite:
-      proceed: Merk som favoritt
-      prompt: 'Du vil merkja dette tutet som favoritt:'
-    reblog:
-      proceed: Framhev
-      prompt: 'Du vil framheva dette tutet:'
-    reply:
-      proceed: Svar
-      prompt: 'Du vil svara på dette tutet:'
+  reports:
+    errors:
+      invalid_rules: refererer ikke til gyldige regler
+  rss:
+    descriptions:
+      account: Offentlige innlegg fra @%{acct}
+      tag: 'Offentlige innlegg merket med #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Du har overskredet grensen på %{limit} planlagte tuter for den dagen
     over_total_limit: Du har overskredet grensen på %{limit} planlagte tuter
@@ -1102,7 +1229,7 @@ nn:
       phantom_js: PhantomJS
       qq: QQ-lesar
       safari: Safari
-      uc_browser: UC-lesar
+      uc_browser: QQ-lesar
       weibo: Weibo
     current_session: Noverande økt
     description: "%{browser} på %{platform}"
@@ -1112,7 +1239,7 @@ nn:
       adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: IOS
       linux: Linux
@@ -1137,7 +1264,6 @@ nn:
     edit_profile: Endr profil
     export: Dataeksport
     featured_tags: Utvalgte emneknagger
-    identity_proofs: Identitetsprov
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
@@ -1145,6 +1271,8 @@ nn:
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
+    statuses_cleanup: Automatisert sletting av innlegg
+    strikes: Modereringsadvarsler
     two_factor_authentication: Tostegsautorisering
     webauthn_authentication: Sikkerhetsnøkler
   statuses:
@@ -1156,28 +1284,23 @@ nn:
       image:
         one: "%{count} bilete"
         other: "%{count} bilete"
-      video:
-        one: "%{count} video"
-        other: "%{count} videoer"
     boosted_from_html: Framheva av %{acct_link}
     content_warning: 'Innhaldsåtvaring: %{warning}'
+    default_language: Samme språk som brukergrensesnittet
     disallowed_hashtags:
       one: 'inneheldt ein emneknagg som ikkje var tillaten: %{tags}'
       other: 'inneheldt emneknaggen som ikkje var tillaten: %{tags}'
+    edited_at_html: Redigert %{date}
     errors:
       in_reply_not_found: Det ser ut til at tutet du freistar å svara ikkje finst.
-    language_detection: Kjenn att språk automatisk
     open_in_web: Opn på nett
     over_character_limit: øvregrensa for teikn, %{max}, er nådd
     pin_errors:
+      direct: Innlegg som bare er synlige for nevnte brukere kan ikke festes
       limit: Du har allereie festa så mange tut som det går an å festa
       ownership: Du kan ikkje festa andre sine tut
-      private: Du kan ikkje festa uoffentlege tut
       reblog: Ei framheving kan ikkje festast
     poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} personer"
       total_votes:
         one: "%{count} røyst"
         other: "%{count} røyster"
@@ -1196,95 +1319,50 @@ nn:
       public_long: Alle kan sjå
       unlisted: Ikkje oppført
       unlisted_long: Alle kan sjå, men ikkje oppført på offentlege tidsliner
+  statuses_cleanup:
+    enabled: Slett gamle innlegg automatisk
+    enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
+    exceptions: Unntak
+    explanation: Siden sletting av innlegg er en krevende operasjon, blir dette gjort sakte over tid når tjeneren ellers ikke er opptatt. Av denne grunn kan det hende at innleggene dine slettes først en stund etter at de har nådd aldersgrensen.
+    ignore_favs: Ignorer favoritter
+    ignore_reblogs: Ignorer fremhevinger
+    interaction_exceptions: Unntak basert på interaksjoner
+    interaction_exceptions_explanation: Merk at det ikke er noen garanti for at innlegg blir slettet hvis de går under favoritt- eller fremhevelsesgrensen etter å ha gått over dem en gang.
+    keep_direct: Behold direktemeldinger
+    keep_direct_hint: Sletter ingen av direktemeldingene dine
+    keep_media: Behold innlegg med mediavedlegg
+    keep_media_hint: Sletter ikke dine egne innlegg som har mediavedlegg
+    keep_pinned: Behald festa innlegg
+    keep_pinned_hint: Sletter ingen av dine festa innlegg
+    keep_polls: Behald røystingar
+    keep_polls_hint: Sletter ingen av dine røystingar
+    keep_self_bookmark: Behald bokmerka innlegg
+    keep_self_bookmark_hint: Sletter ikkje dine eigne innlegg om du har bokmerka dei
+    keep_self_fav: Behald innlegg som favoritt
+    keep_self_fav_hint: Sletter ikkje dine eigne innlegg om du har favorittmerka dei
+    min_age:
+      '1209600': 2 veker
+      '15778476': 6 månader
+      '2629746': 1 månad
+      '31556952': 1 år
+      '5259492': 2 månader
+      '604800': 1 veke
+      '63113904': 2 år
+      '7889238': 3 månader
+    min_age_label: Aldersterskel
+    min_favs: Behold innlegg som er favorittmarkert av minst
+    min_favs_hint: Sletter ingen av dine innlegg som har mottatt minst dette antalet favorittmerkingar. Lat vere blank for å slette innlegg uavhengig av antal favorittmerkingar
+    min_reblogs: Behold innlegg fremhevet av minst
+    min_reblogs_hint: Sletter ikke noen av dine innlegg som har blitt fremhevet minst dette antall ganger. La stå tom for å slette innlegg uavhengig av antall fremhevinger
   stream_entries:
     pinned: Festa tut
     reblogged: framheva
-    sensitive_content: Følsomt innhold
+    sensitive_content: Ømtolig innhald
+  strikes:
+    errors:
+      too_late: Det er for seint å klage på denne prikken
   tags:
     does_not_match_previous_name: stemmar ikkje med det førre namnet
-  terms:
-    body_html: |
-      <h2>Privatlivsretningslinjer</h2>
-      <h3 id="collect">Hva slags informasjon samler vi inn?</h3>
-
-      <ul>
-      <li><em>Grunnleggende kontoinformasjon</em>: Dersom du registrerer deg på denne tjeneren, vil du kanskje bli spurt om å skrive inn et brukernavn, en E-postadresse, og et passord. Du kan også skrive inn ytterligere profilinformasjon som f.eks. et visningsnavn og selvbiografi, og laste opp et profilbilde og toppfeltbilde. Brukernavnet, visningsnavnet, selvbiografien, profilbildet, og toppfeltbildet blir alltid vist offentlig.</li>
-      <li><em>Innlegg, følging, og annen offentlig informasjon</em>: Listen over folk du følger blir vist offentlig, det samme gjelder for følgerne dine. Når du sender inn en melding, blir datoen og tidspunktet lagret såvel som programmet du sendte inn meldingen ifra. Meldinger kan inneholde mediavedlegg, som f.eks. bilder og videoer. Offentlige og uoppførte innlegg er offentlig tilgjengelige. Når du viser frem et innlegg på profilen din, er det også offentlig tilgjengelig informasjon. Dinne innlegg blir levert til dine følgere, og i noen tilfeller betyr det at blir levert til forskjellige tjenere og at kopier blir lagret der. Når du sletter innlegg, blir også det levert til dine følgere. Det å fremheve eller like et annet innlegg er alltid offentlig.</li>
-      <li><em>Direkteinnlegg og innlegg som kun er for følgere</em>: Alle innlegg er lagret og behandlet på tjeneren. Innlegg som kun er for følgere, blir levert til dine følgere, og direkteinnlegg leveres kun til brukere som er nevnt i dem. I noen tilfeller betyr det at de blir levert til forskjellige tjenere og at kopier blir lagret der. Vi gjør et forsøk i god sportsånd for å begrense tilgangen til disse innleggene til kun autoriserte personer, men andre tjenere kan mislykkes med sådan. Derfor er det viktig å gå i gjennom tjenerne som følgerne dine hører til i. I innstillingene kan du veksle på en innstilling for å godkjenne og avslå nye følgere manuelt. <em>Vennligst ha i tankene at operatørene til tjeneren og enhver mottakende tjener kan se slike meldinger</em>, og at mottakere kan ta skjermklipp av, kopiere, eller på annet vis dele dem videre. <em>Ikke del noe farlig informasjon over Mastodon.</em></li>
-      <li><em>IP-er og andre metadata</em>: Når du logger på, lagrer vi IP-adressen som du logget deg på fra, såvel som navnet til nettleserprogrammet ditt. Du kan gå gjennom og tilbakekalle alle påloggede økter i innstillingene. Den seneste IP-adressen du brukte, blir lagret i opptil 12 måneder. Vi vil kanskje også holde på tjenerloggføringer som inkluderer IP-adressen til alle forespørsler til tjeneren vår.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Hva bruker vi informasjonen din til?</h3>
-
-      <p>Hva som helst av informasjonen som vi samler inn fra deg, kan bli brukt på de følgende måtene:</p>
-
-      <ul>
-      <li>Til å levere grunnfunksjonaliteten til Mastodon. Du kan bare samhandle med andre folks innhold og legge ut ditt eget innhold når du er logget på. For eksempel kan du følge andre folk for å se deres kombinerte innlegg i din egen personliggjorte hjemmetidslinje.</li>
-      <li>Til å bistå i moderasjonen av samfunnet, for eksempel å sammenligne IP-adressen din med andre andre kjente adresser for å avgjøre saker om bannlysningsunngåelse eller andre regelbrudd.</li>
-      <li>E-postadressen du oppgir kan bli brukt til å sende deg informasjon, varsler om at andre folk samhandler med innholdet ditt eller sender deg meldinger, og å svare på brukerstøttespørsmål, og/eller andre forespørsler eller spørsmål.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Hvordan beskytter vi informasjonen din?</h3>
-
-      <p>Vi implementer en rekke sikkerhetstiltak for å holde på sikkerheten til din personlige informasjon når du skriver inn, sender inn, eller besøker din personlige informasjon. Blant annet er din nettleserøkt, såvel som trafikken mellom dine apper og API-er, sikret med SSL, og passordet ditt er saltet med en kraftig énveisalgoritme. Du kan skru på 2-trinnsinnlogging for å sikre tilgangen til kontoen din ytterligere.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Hva er våre databeholdingsretningslinjer?</h3>
-
-      <p>Vi vil gjøre en innsats i god sportsånd for å</p>
-
-      <ul>
-      <li>Beholde tjenerloggføringer som inneholder IP-adressen til alle forespørsler til denne tjeneren, dersom det blir loggført i det hele tatt, i ikke mer enn 90 dager.</li>
-      <li>Beholde IP-adressene som er forbundet med registrerte brukere i ikke mer enn 12 måneder.</li>
-      </ul>
-
-      <p>Du kan be om og laste ned et arkiv av innholdet ditt, inkludert dine innlegg, media, mediavedlegg, profilbilde, og toppfeltbilde.</p>
-
-      <p>Du kan ugjenkallelig slette kontoen til enhver tid.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Bruker vi infokapsler?</h3>
-
-      <p>Ja. Infokapsler er små filer som et nettsted eller dens tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater dette). Disse infokapslene lar nettstedet kjenne igjen nettleseren din og, dersom du har en registrert konto, assosiere den med din registrerte konto.</p>
-
-      <p>Vi benytter infokapsler for å forstå og lagre dinne innstillinger til fremtidige besøk.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Forteller vi om noe informasjon til utenforstående parter?</h3>
-
-      <p>Vi hverken selger, bytter, eller på andre måter overfører din personlig identifiserbare informasjon til utenforstående parter. Dette inkluderer ikke tredjeparter som vi stoler på og som hjelper oss med å drifte nettstedet vårt, drifte våre forretninger, eller å yte tjenester til deg, så lenge disse partene sier seg enige i å holde denne informasjonen hemmelig. Vi kan også frigi informasjonen vår dersom vi mener et frigiving er passende for å møte loven, handle i tråd med vår nettstedsretningslinjer, eller å beskytte vår eller andres rettigheter, eiendom, eller trygghet.</p>
-
-      <p>Ditt offentlige innhold kan bli lastet ned av andre tjenere i nettverket. Dine offentlige innlegg og innlegg som kun er for følgere blir levert til tjenerne der følgerne dine holder til, og direktemeldinger blir levert il mottakernes tjenere, i den grad de følgerne eller mottakerne holder på en annen tjener enn denne.</p>
-
-      <p>Når du gir et program autorisasjon til å bruke kontoen din, avhengig av omfanget av tillatelser som du tillater, kan den få tilgang til din offentlige profilinformasjon, din følgingsliste, dine følgere, dine lister, alle dine innlegg, og dine likinger. Programmer kan aldri få tilgang til E-postadressen eller passordet ditt.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Nettstedsbruk av barn</h3>
-
-      <p>Dersom denne tjeneren er i EU eller EØS: Vårt nettsted, produkter og tjenester er alle siktet inn mot folk som er minst 16 år gamle. Dersom du er under 16, sier GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) at du ikke kan bruke dette nettstedet.</p>
-
-      <p>Dersom denne tjeneren er i USA: Vårt nettsted, produkter og tjenester er alle siktet inn mot folk som er minst 16 år gamle. Dersom du er under 16, sier COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) at du ikke kan bruke dette nettstedet.</p>
-
-      <p>Lovmessige krav kan være forskjellige dersom denne tjeneren befinner seg i en annen jurisdiksjon.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Endringer i våre privatlivsretningslinjer</h3>
-
-      <p>Dersom vi bestemmer oss for å endre våre privatlivsretningslinjer, vil vi legge ut endringene på denne siden.</p>
-
-      <p>Dette dokumentet er lisensiert under CC BY-SA. Den engelske originalversjonen ble sist oppdatert den 7. mars 2018. Den norske oversettelsen ble sist oppdatert den 13. desember 2019.</p>
-
-      <p>Opprinnelig modifisert utifra <a href="https://github.com/discourse/discourse">Discourse sine privatlivsretningslinjer</a>.</p>
-    title: Tenestevilkår og personvernsvilkår for %{instance}
   themes:
     contrast: Mastodon (Høg kontrast)
     default: Mastodon (Mørkt)
@@ -1293,6 +1371,7 @@ nn:
     formats:
       default: "%d.%b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Legg til
     disable: Slå av
@@ -1309,71 +1388,84 @@ nn:
     recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til å gjenopprette tilgang til din konto. <strong>Oppbevar gjenopprettingskodene sikkert</strong>, for eksempel ved å skrive dem ut og gjemme dem på et lurt sted bare du vet om.
     webauthn: Sikkerhetsnøkler
   user_mailer:
+    appeal_approved:
+      action: Gå til din konto
+      explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
+      subject: Din klage fra %{date} er godkjent
+      title: Anke godkjend
+    appeal_rejected:
+      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
+      subject: Din klage fra %{date} er avvist
+      title: Anke avvist
     backup_ready:
       explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
-    sign_in_token:
-      details: 'Her er forsøksdetaljane:'
-      explanation: 'Vi oppdaget et forsøk på å logge på kontoen fra en ukjent IP-adresse. Hvis dette er deg, vennligst skriv inn sikkerhetskoden nedenfor på påloggingssiden:'
-      further_actions: 'Om dette ikkje var deg, so venlegast endra passordet ditt og skruv på tostegsgodkjenning på kontoen din. Du kan gjera det her:'
-      subject: Venlegast stadfest forsøket på å logga inn
-      title: Forsøk på å logga inn
+      title: Nedlasting av arkiv
+    suspicious_sign_in:
+      change_password: endre passord
+      details: 'Her er påloggingsdetaljane:'
+      explanation: Vi har oppdaga ei pålogging til din konto frå ei ny IP-adresse.
+      further_actions_html: Om dette ikkje var deg, tilrår vi at du %{action} no og aktiverar 2-trinnsinnlogging for å halde kontoen din sikker.
+      subject: Din konto er opna frå ei ny IP-adresse
+      title: Ei ny pålogging
     warning:
+      appeal: Send inn anke
+      appeal_description: Om du meiner dette er ein feil, kan du sende inn ei klage til gjengen i %{instance}.
+      categories:
+        spam: Søppelpost
+        violation: Innhald bryter følgjande retningslinjer
       explanation:
-        disable: Mens kontoen din er fryst, forblir dine kontodata intakt, men du kan ikke utføre noen handlinger før den har blitt tint opp.
-        sensitive: De opplastede mediefilene og linket vil bli behandlet som sensitive.
-        silence: Mens kontoen din er begrenset, vil bare folk som allerede følger deg se dine tuter på denne tjeneren, og du kan bli ekskludert fra diverse offentlige oppføringer. Men andre kan fortsatt følge deg manuelt.
-        suspend: Kontoen din har blitt suspendert, og alle dine tuter og opplastede media har blitt ugjenkallelig fjernet fra denne tjeneren, og fra tjenere der du hadde følgere.
-      get_in_touch: Du kan svare på denne E-posten for å komme i kontakt med styret i %{instance}.
-      review_server_policies: Gjennomgå serverretningslinjer
-      statuses: 'Spesifikt for å:'
+        delete_statuses: Nokre av innlegga dine er bryt éin eller fleire retningslinjer, og har så blitt fjerna av moderatorene på %{instance}.
+        disable: Du kan ikkje lenger bruke kontoen, men profilen din og andre data er intakt. Du kan be om ein sikkerhetskopi av dine data, endre kontoinnstillingar eller slette din konto.
+        mark_statuses_as_sensitive: Nokre av innlegga dine har vorte markerte som ømtolige av moderatorane ved %{instance}. Dette tyder at folk må trykkje på mediane i innlegga for å førehandsvise dei. Du kan markera media som ømtolig sjølv når du legg ut nye innlegg.
+        sensitive: Frå no av vil alle dine opplasta mediefiler bli markert som ømtolig og skjult bak ei klikk-åtvaring.
+        silence: Medan kontoen din er avgrensa, vil berre folk som allereie fylgjer deg sjå dine tutar på denne tenaren, og du kan bli ekskludert fra diverse offentlige oppføringer. Andre kan framleis fylgje deg manuelt.
+        suspend: Du kan ikkje lenger bruke kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logge inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men vi beheld nokre grunnleggjande data for å forhindre deg å omgå suspenderinga.
+      reason: 'Årsak:'
+      statuses: 'Innlegg sitert:'
       subject:
+        delete_statuses: Dine innlegg på %{acct} har blitt fjernet
         disable: Kontoen din, %{acct}, har blitt fryst
+        mark_statuses_as_sensitive: Dine innlegg frå %{acct} har vorte markerte som ømtolige
         none: Åtvaring for %{acct}
-        sensitive: Din konto %{acct} medier har blitt merket som følsom
+        sensitive: Dine innlegg frå %{acct} vil verte markerte som ømtolige frå no av
         silence: Kontoen din, %{acct}, er vorten avgrensa
-        suspend: Kontoen din, %{acct}, er vorten utvist
+        suspend: Kontoen din, %{acct}, har vorte utvist
       title:
+        delete_statuses: Innlegg fjernet
         disable: Konto frosen
+        mark_statuses_as_sensitive: Innlegg markerte som ømtolige
         none: Åtvaring
-        sensitive: Mediet ditt er markert som følsom
+        sensitive: Konto markert som ømtolig
         silence: Konto avgrensa
         suspend: Konto utvist
     welcome:
       edit_profile_action: Lag til profil
-      edit_profile_step: Du kan tilpasse din profil ved å laste opp en avatar, overskrift, endre ditt visningsnavn med mer. Hvis du vil godkjenne hvilke personer som får lov til å følge deg kan du låse kontoen.
+      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
       explanation: Her er nokre tips for å koma i gang
       final_action: Kom i gang med å leggja ut
-      final_step: 'Byrj å skriva innlegg! Sjølv utan fylgjarar kan andre sjå dei offentlege meldingane dine, til dømes på den lokale tidslina og i emneknaggar. Du har kanskje lyst til å introdusera deg med emneknaggen #introductions.'
+      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
       full_handle: Det fulle brukarnamnet ditt
       full_handle_hint: Dette er det du fortel venene dine for at dei skal kunna senda deg meldingar eller fylgja deg frå ein annan tenar.
-      review_preferences_action: Endr innstillingar
-      review_preferences_step: Husk å justere dine innstillinger, som hvilke e-poster du ønsker å motta, eller hvor private du ønsker at dine poster skal være som standard. Hvis du ikke har bevegelsessyke kan du skru på automatisk avspilling av GIF-animasjoner.
       subject: Velkomen til Mastodon
-      tip_federated_timeline: Den forente tidslinjen blir konstant matet med meldinger fra Mastodon-nettverket. Men den inkluderer bare personer dine naboer abbonerer på, så den er ikke komplett.
-      tip_following: Du fylgjer automatisk tenaradministrator(ane). For å finna fleire forvitnelege folk kan du sjekka den lokale og fødererte tidslina.
-      tip_local_timeline: Den lokale tidslinjen blir kontant matet med meldinger fra personer på %{instance}. Dette er dine nærmeste naboer!
-      tip_mobile_webapp: Hvis din mobile nettleser tilbyr deg å legge Mastadon til din hjemmeskjerm kan du motta push-varslinger. Det er nesten som en integrert app på mange måter!
-      tips: Tips
       title: Velkomen om bord, %{name}!
   users:
     follow_limit_reached: Du kan ikkje fylgja fleire enn %{limit} folk
-    generic_access_help_html: Har du vanskar med tilgjenge til kontoen din? Tak gjerne kontakt med %{email}
     invalid_otp_token: Ugyldig tostegskode
-    invalid_sign_in_token: Ugild trygdenykel
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
-    suspicious_sign_in_confirmation: Det verkar ikkje som du har logga inn frå dette reiskapet før, og du har ikkje logga inn på ei stund, difor sender me deg ein trygdekode til e-post-addressa di for å stadfesta at det er deg.
   verification:
     explanation_html: 'Du kan <strong>bekrefte at du selv er eieren av lenkene i din profilmetadata</strong>. For å gjøre det, må det tillenkede nettstedet inneholde en lenke som fører tilbake til Mastodon-profilen din. Lenken tilbake <strong>må</strong> ha en <code>rel="me"</code>-attributt. Tekstinnholdet til lenken er irrelevant. Her er et eksempel:'
     verification: Stadfesting
   webauthn_credentials:
     add: Legg til ny sikkerhetsnøkkel
     create:
+      error: Det oppstod et problem med å legge til sikkerhetsnøkkelen. Prøv igjen.
       success: Sikkerhetsnøkkelen din ble vellykket lagt til.
     delete: Slett
     delete_confirmation: Er du sikker på at du vil slette denne sikkerhetsnøkkelen?
+    description_html: Dersom du aktiverer <strong>sikkerhetsnøkkelautentisering</strong>, vil innlogging kreve at du bruker en av sikkerhetsnøklene dine.
     destroy:
       error: Det oppsto et problem med å slette sikkerhetsnøkkelen. Prøv igjen.
       success: Sikkerhetsnøkkelen din ble vellykket slettet.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 2caa10b71..f25a2f2d1 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1,90 +1,27 @@
 ---
 'no':
   about:
-    about_hashtag_html: Dette er offentlige toots merket med <strong>#%{hashtag}</strong>. Du kan interagere med dem om du har en konto et sted i fediverset.
     about_mastodon_html: Mastodon er et sosialt nettverk laget med <em>fri programvare</em>. Et <em>desentralisert</em> alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på &mdash; uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
-    about_this: Om
-    active_count_after: aktive
-    active_footnote: Månedlige aktive brukere (MAU)
-    administered_by: 'Administrert av:'
-    api: API
-    apps: Mobilapper
-    apps_platforms: Bruk Mastodon gjennom iOS, Android og andre plattformer
-    browse_directory: Bla gjennom en profilmappe og filtrer etter interesser
-    browse_local_posts: Bla i en sanntidsstrøm av offentlige innlegg fra denne tjeneren
-    browse_public_posts: Bla i en sanntidsstrøm av offentlige innlegg på Mastodon
-    contact: Kontakt
     contact_missing: Ikke innstilt
     contact_unavailable: Ikke tilgjengelig
-    discover_users: Oppdag brukere
-    documentation: Dokumentasjon
-    federation_hint_html: Med en konto på %{instance} vil du kunne følge folk på enhver Mastodon-tjener, og mer til.
-    get_apps: Prøv en mobilapp
     hosted_on: Mastodon driftet på %{domain}
-    instance_actor_flash: "Denne brukeren er en virtuell aktør brukt til å representere selve serveren og ingen individuell bruker. Det brukes til foreningsformål og bør ikke blokkeres med mindre du vil blokkere hele instansen, hvor domeneblokkering bør brukes i stedet. \n"
-    learn_more: Lær mer
-    privacy_policy: Privatlivsretningslinjer
-    rules: Server regler
-    rules_html: 'Nedenfor er et sammendrag av reglene du må følge om du vil ha en konto på denne serveren av Mastodon:'
-    see_whats_happening: Se hva som skjer
-    server_stats: 'Tjenerstatistikker:'
-    source_code: Kildekode
-    status_count_after:
-      one: innlegg
-      other: statuser
-    status_count_before: Som skrev
-    tagline: Følg venner og oppdag nye
-    terms: Bruksvilkår
-    unavailable_content: Utilgjengelig innhold
-    unavailable_content_description:
-      domain: Tjener
-      reason: Årsak
-      rejecting_media: 'Mediafiler fra disse tjenerne vil ikke bli behandlet eller lagret, og ingen miniatyrbilder vil bli vist, noe som vil kreve manuell klikking for å besøke den opprinnelige filen:'
-      rejecting_media_title: Filtrert media
-      silenced: 'Innlegg fra disse tjenerne vil bli skjult fra offentlige tidslinjer og samtaler, og ingen varslinger vil bli generert fra disse brukernes samhandlinger, med mindre du følger dem:'
-      silenced_title: Stilnede tjenere
-      suspended: 'Ingen data fra disse tjenerne vil bli behandlet, lagret, eller utvekslet, noe som vil gjøre enhver samhandling eller kommunikasjon med brukere fra disse tjenerne umulig:'
-      suspended_title: Suspenderte tjenere
-    unavailable_content_html: Mastodon lar deg vanligvis se innhold fra og samhandle med brukere fra enhver annen tjener i strømiverset. Dette er unntakene som har blitt gjort på denne spesifikke tjeneren.
-    user_count_after:
-      one: bruker
-      other: brukere
-    user_count_before: Her bor
-    what_is_mastodon: Hva er Mastodon?
+    title: Om
   accounts:
-    choices_html: "%{name} sine anbefalte:"
-    endorsements_hint: Du kan fremheve personer du følger fra nettgrensesnittet som deretter vil bli vist her.
-    featured_tags_hint: Du kan fremheve spesifikke emneknagger som vil bli vist her.
     follow: Følg
     followers:
       one: Følger
       other: Følgere
     following: Følger
     instance_actor_flash: Denne kontoen er en virtuell figur som brukes til å representere selve serveren og ikke noen individuell bruker. Den brukes til forbundsformål og bør ikke oppheves.
-    joined: Ble med den %{date}
     last_active: sist aktiv
     link_verified_on: Eierskap av denne lenken ble sjekket %{date}
-    media: Media
-    moved_html: "%{name} har flyttet til %{new_profile_link}:"
-    network_hidden: Denne informasjonen er ikke tilgjengelig
-    never_active: Aldri
     nothing_here: Det er ingenting her!
-    people_followed_by: Folk som %{name} følger
-    people_who_follow: Folk som følger %{name}
     pin_errors:
       following: Du må allerede følge personen du vil fremheve
     posts:
-      one: Tut
-      other: Tuter
-    posts_tab_heading: Tuter
-    posts_with_replies: Tuter med svar
-    roles:
-      admin: Administrator
-      bot: Bot
-      group: Gruppe
-      moderator: Moderere
-    unavailable: Profilen er utilgjengelig
-    unfollow: Slutt å følge
+      one: Innlegg
+      other: Innlegg
+    posts_tab_heading: Innlegg
   admin:
     account_actions:
       action: Utfør handling
@@ -92,26 +29,30 @@
     account_moderation_notes:
       create: Lag
       created_msg: Moderasjonsnotat laget uten problem!
-      delete: Slett
       destroyed_msg: Moderasjonsnotat slettet uten problem!
     accounts:
       add_email_domain_block: Svartelist E-postdomenet
       approve: Godkjenn
-      approve_all: Godkjenn alle
       approved_msg: Godkjent %{username} sin registreringsapplikasjon
       are_you_sure: Er du sikker?
       avatar: Profilbilde
       by_domain: Domene
       change_email:
-        changed_msg: Konto-E-postadressen ble vellykket endret!
+        changed_msg: E-post ble endret!
         current_email: Nåværende E-post
         label: Endre e-post
         new_email: Ny E-post
         submit: Endre e-post
         title: Endre E-postadressen til %{username}
+      change_role:
+        changed_msg: Rollen ble endret!
+        label: Endre rolle
+        no_role: Ingen rolle
+        title: Endre rolle for %{username}
       confirm: Bekreft
       confirmed: Bekreftet
       confirming: Bekrefte
+      custom: Tilpasset
       delete: Slett data
       deleted: Slettet
       demote: Degrader
@@ -151,17 +92,22 @@
         active: Aktive
         all: Alle
         pending: Avventer
-        silenced: Målbundet
+        silenced: Begrenset
         suspended: Utvist
         title: Moderasjon
       moderation_notes: Moderasjonsnotater
       most_recent_activity: Nyligste aktivitet
       most_recent_ip: Nyligste IP
       no_account_selected: Ingen brukere ble forandret da ingen var valgt
-      no_limits_imposed: Ingen grenser er tatt i bruk
+      no_limits_imposed: Ingen pålagte begrensninger
+      no_role_assigned: Ingen rolle tildelt
       not_subscribed: Ikke abonnért
       pending: Avventer gjennomgang
       perform_full_suspension: Utfør full utvisning
+      previous_strikes: Tidligere advarsler
+      previous_strikes_description_html:
+        one: Denne kontoen har <strong>en</strong> advarsel.
+        other: Denne kontoen har <strong>%{count}</strong> advarsler.
       promote: Oppgradere
       protocol: Protokoll
       public: Offentlig
@@ -169,8 +115,9 @@
       redownload: Oppdater avatar
       redownloaded_msg: Oppdatert %{username} sin profil fra opprinnelse
       reject: Avslå
-      reject_all: Avslå alle
       rejected_msg: Vellykket avvist %{username} sin registreringsapplikasjon
+      remote_suspension_irreversible: Dataene til denne kontoen har blitt slettet uten mulighet for gjenoppretting.
+      remote_suspension_reversible_hint_html: Kontoen har blitt suspendert på sin tjener, og dataene bli fjernet helt den %{date}. Inntil da kan tjeneren gjeninnsette kontoen uten skade. Hvis du ønsker å fjerne alle dataene til kontoen umiddelbart, kan du gjøre dette under.
       remove_avatar: Fjern profilbilde
       remove_header: Fjern overskrift
       removed_avatar_msg: Fjernet %{username} sitt avatarbilde
@@ -182,37 +129,36 @@
       reset: Tilbakestill
       reset_password: Nullstill passord
       resubscribe: Abonner på nytt
-      role: Rettigheter
-      roles:
-        admin: Administrator
-        moderator: Ordstyrer
-        staff: Personale
-        user: Bruker
+      role: Rolle
       search: Søk
       search_same_email_domain: Andre brukere med samme E-postdomene
       search_same_ip: Andre brukere med den samme IP-en
       security_measures:
         only_password: Bare passord
         password_and_2fa: Passord og 2FA
-        password_and_sign_in_token: Passord og e-post token
+      sensitive: Tving følsom
       sensitized: Merket som følsom
       shared_inbox_url: Delt Innboks URL
       show:
         created_reports: Rapporter laget av denne kontoen
         targeted_reports: Rapporter laget om denne kontoen
-      silence: Målbind
-      silenced: Stilnet
+      silence: Begrens
+      silenced: Begrenset
       statuses: Statuser
+      strikes: Tidligere advarsler
       subscribe: Abonnere
+      suspend: Suspender
       suspended: Suspendert
       suspension_irreversible: Dataene fra denne kontoen har blitt ikke reverserbart slettet. Du kan oppheve suspenderingen av kontoen for å gjøre den brukbart, men den vil ikke gjenopprette alle data den tidligere har hatt.
       suspension_reversible_hint_html: Kontoen har blitt suspendert, og dataene vil bli fullstendig fjernet den %{date}. Frem til da kan kontoen gjenopprettes uten negative effekter. Hvis du ønsker å fjerne alle kontoens data umiddelbart, kan du gjøre det nedenfor.
-      time_in_queue: Venter i kø %{time}
       title: Kontoer
+      unblock_email: Avblokker e-postadresse
+      unblocked_email_msg: Fjernet blokkering av %{username}s e-postadresse
       unconfirmed_email: Ubekreftet E-postadresse
-      undo_silenced: Angre målbinding
+      undo_sensitized: Angre tving følsom
+      undo_silenced: Angre begrensning
       undo_suspension: Angre utvisning
-      unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
+      unsilenced_msg: Opphevde begrensningen av %{username}s konto
       unsubscribe: Avslutt abonnementet
       unsuspended_msg: Opphevde vellykket suspenderingen av %{username} sin konto
       username: Brukernavn
@@ -222,45 +168,116 @@
       whitelisted: Hvitelistet
     action_logs:
       action_types:
+        approve_appeal: Godkjenn anke
+        approve_user: Godkjenn bruker
         assigned_to_self_report: Tilordne rapport
         change_email_user: Endre brukerens E-postadresse
+        change_role_user: Endre rolle for brukeren
         confirm_user: Bekreft brukeren
         create_account_warning: Opprett en advarsel
         create_announcement: Opprett en kunngjøring
+        create_canonical_email_block: Opprett e-post-blokkering
         create_custom_emoji: Opprett en tilpasset emoji
         create_domain_allow: Opprett domene tillatt
         create_domain_block: Opprett domene-blokk
         create_email_domain_block: Opprett e-post domeneblokk
         create_ip_block: Opprett IP-regel
+        create_unavailable_domain: Opprett utilgjengelig domene
+        create_user_role: Opprett rolle
         demote_user: Degrader bruker
         destroy_announcement: Slett kunngjøringen
+        destroy_canonical_email_block: Slett blokkering av e-post
         destroy_custom_emoji: Slett den tilpassede emojien
+        destroy_domain_allow: Slett domenegodkjenning
+        destroy_domain_block: Slett blokkering av domene
+        destroy_email_domain_block: Slett blokkering av e-postdomene
+        destroy_instance: Slett domene
         destroy_ip_block: Slett IP-regel
         destroy_status: Slett statusen
+        destroy_unavailable_domain: Slett utilgjengelig domene
+        destroy_user_role: Slett rolle
         disable_2fa_user: Skru av 2-trinnsinnlogging
         disable_custom_emoji: Skru av tilpassede emojier
+        disable_sign_in_token_auth_user: Skru av e-post-tokenautentisering for bruker
         disable_user: Deaktiver bruker
         enable_custom_emoji: Skru på tilpassede emojier
+        enable_sign_in_token_auth_user: Skru på e-post-tokenautentisering for bruker
         enable_user: Aktiver bruker
+        memorialize_account: Opprett minnekonto
         promote_user: Promoter bruker
+        reject_appeal: Avvis anke
+        reject_user: Avvis bruker
         remove_avatar_user: Fjern Avatar
         reopen_report: Gjenåpne rapporten
+        resend_user: Send e-post med bekreftelse på nytt
         reset_password_user: Tilbakestill passord
         resolve_report: Løs rapport
-        silence_account: Demp konto
+        sensitive_account: Tving følsom konto
+        silence_account: Begrens konto
         suspend_account: Suspender kontoen
+        unassigned_report: Fjern tilordnet rapport
+        unblock_email_account: Fjern blokkering av e-postadresse
+        unsensitive_account: Angre tving følsom konto
+        unsilence_account: Angre begrensning av konto
         unsuspend_account: Opphev suspensjonen av kontoen
         update_announcement: Oppdater kunngjøringen
         update_custom_emoji: Oppdater tilpasset Emoji
+        update_domain_block: Oppdater blokkering av domene
+        update_ip_block: Oppdater IP-regel
         update_status: Oppdater statusen
+        update_user_role: Oppdater rolle
       actions:
+        approve_appeal_html: "%{name} godkjente klagen på modereringa fra %{target}"
+        approve_user_html: "%{name} godkjente registrering fra %{target}"
+        assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg selv"
+        change_email_user_html: "%{name} endret e-postadressen til brukeren %{target}"
+        change_role_user_html: "%{name} endret rolle for %{target}"
+        confirm_user_html: "%{name} bekreftet e-postadressen til brukeren %{target}"
+        create_account_warning_html: "%{name} sendte en advarsel til %{target}"
+        create_announcement_html: "%{name} opprettet ny kunngjøring %{target}"
+        create_canonical_email_block_html: "%{name} blokkerte e-post med hash %{target}"
         create_custom_emoji_html: "%{name} lastet opp ny emoji %{target}"
         create_domain_allow_html: "%{name} tillatt føderasjon med domenet %{target}"
         create_domain_block_html: "%{name} blokkert domene %{target}"
         create_email_domain_block_html: "%{name} blokkert e-post domene %{target}"
         create_ip_block_html: "%{name} opprettet regel for IP %{target}"
-        silence_account_html: "%{name} begrenset %{target} sin konto"
-      deleted_status: "(statusen er slettet)"
+        create_unavailable_domain_html: "%{name} stoppet levering til domenet %{target}"
+        create_user_role_html: "%{name} opprettet rollen %{target}"
+        demote_user_html: "%{name} degraderte bruker %{target}"
+        destroy_announcement_html: "%{name} slettet kunngjøring %{target}"
+        destroy_canonical_email_block_html: "%{name} fjernet blokkering av e-post med hash %{target}"
+        destroy_custom_emoji_html: "%{name} slettet emoji %{target}"
+        destroy_domain_block_html: "%{name} fjernet blokkeringen av domenet %{target}"
+        destroy_email_domain_block_html: "%{name} fjernet blokkeringen av e-post-domenet %{target}"
+        destroy_ip_block_html: "%{name} slettet regel for IP %{target}"
+        destroy_status_html: "%{name} fjernet innlegget av %{target}"
+        destroy_unavailable_domain_html: "%{name} gjenopptok levering til domenet %{target}"
+        destroy_user_role_html: "%{name} slettet %{target} -rolle"
+        disable_2fa_user_html: "%{name} deaktiverte tofaktor-autentiseringskravet for bruker %{target}"
+        disable_custom_emoji_html: "%{name} deaktiverte emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} deaktiverte autentisering med e-post-token for %{target}"
+        disable_user_html: "%{name} deaktiverte innlogging for bruker %{target}"
+        enable_custom_emoji_html: "%{name} aktiverte emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverte autentisering med e-post-token for %{target}"
+        enable_user_html: "%{name} aktiverte innlogging for bruker %{target}"
+        memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
+        promote_user_html: "%{name} forfremmet bruker %{target}"
+        reject_appeal_html: "%{name} avviste moderasjonsavgjørelsesklagen fra %{target}"
+        reject_user_html: "%{name} avslo registrering fra %{target}"
+        reopen_report_html: "%{name} gjenåpnet rapporten %{target}"
+        resend_user_html: "%{name} sendte e-postbekreftelse på nytt for %{target}"
+        reset_password_user_html: "%{name} tilbakestille passordet for brukeren %{target}"
+        sensitive_account_html: "%{name} merket %{target}s innlegg som følsomt"
+        silence_account_html: "%{name} begrenset %{target}s konto"
+        suspend_account_html: "%{name} suspenderte %{target}s konto"
+        unblock_email_account_html: "%{name} fjernet blokkering av %{target}s e-postadresse"
+        unsensitive_account_html: "%{name} fjernet følsomt-merket på %{target}s innlegg"
+        unsilence_account_html: "%{name} fjernet begrensningen av %{target}s konto"
+        update_custom_emoji_html: "%{name} oppdaterte emoji %{target}"
+        update_ip_block_html: "%{name} endret regel for IP %{target}"
+        update_status_html: "%{name} oppdaterte innlegg av %{target}"
+        update_user_role_html: "%{name} endret %{target} -rolle"
+      deleted_account: slettet konto
       empty: Ingen loggføringer ble funnet.
       filter_by_action: Sorter etter handling
       filter_by_user: Sorter etter bruker
@@ -299,11 +316,12 @@
       enable: Aktivere
       enabled: Skrudd på
       enabled_msg: Aktiverte emojien uten problem
-      image_hint: PNG opp til 50KB
+      image_hint: PNG eller GIF opptil %{size}
       list: Før opp
       listed: Oppførte
       new:
         title: Legg til ny egen emoji
+      no_emoji_selected: Ingen emojis ble endret da ingen var valgt
       not_permitted: Du har ikke rettigheter til å utføre denne handlingen
       overwrite: Overskrive
       shortcode: Kortkode
@@ -321,15 +339,6 @@
       media_storage: Medialagring
       new_users: nye brukere
       opened_reports: rapporter åpnet
-      pending_reports_html:
-        one: "<strong>1</strong> ventende rapport"
-        other: "<strong>%{count}</strong> ventende rapporter"
-      pending_tags_html:
-        one: "<strong>1</strong> ventende hashtag"
-        other: "<strong>%{count}</strong> ventende hashtags"
-      pending_users_html:
-        one: "<strong>1</strong> ventende bruker"
-        other: "<strong>%{count}</strong> ventende brukere"
       resolved_reports: rapporter løst
       software: Programvare
       sources: Kilder for registreringer
@@ -338,10 +347,16 @@
       top_languages: Mest aktive språk
       top_servers: Mest aktive servere
       website: Nettside
+    disputes:
+      appeals:
+        empty: Ingen klager funnet.
+        title: Klager
     domain_allows:
       add_new: Hvitelist domene
       created_msg: Domenet har blitt hvitelistet
       destroyed_msg: Domenet har blitt fjernet fra hvitelisten
+      export: Eksporter
+      import: Importer
       undo: Fjern fra hvitelisten
     domain_blocks:
       add_new: Lag ny
@@ -349,54 +364,62 @@
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
       edit: Rediger domeneblokkering
-      existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du kan være nødt til <a href="%{unblock_url}">oppheve blokkeringen av den</a> først.
+      existing_domain_block: Du har allerede pålagt strengere begrensninger på %{name}.
+      existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du må <a href="%{unblock_url}">oppheve blokkeringen av den</a> først.
+      export: Eksporter
+      import: Importer
       new:
         create: Lag blokkering
         hint: Domeneblokkeringen vil ikke hindre opprettelse av kontooppføringer i databasen, men vil retroaktivt og automatisk benytte spesifikke moderasjonsmetoder på de kontoene.
         severity:
-          desc_html: "<strong>Målbind</strong> gjør kontoens poster usynlige for alle som ikke følger den. <strong>Utvis</strong> fjerner alt innhold, media og profildata fra kontoen. Bruk <strong>Ingen</strong> hvis du bare vil fjerne mediafiler."
+          desc_html: "<strong>Begrens</strong> gjør at innlegg fra kontoer på dette domenet blir usynlig for de som ikke følger dem. <strong>Suspender</strong> fjerner alt innhold, media og profildata for kontoer fra dette domenet. Bruk <strong>Ingen</strong> hvis du kun ønsker å avvise mediefiler."
           noop: Ingen
-          silence: Målbind
+          silence: Begrens
           suspend: Utvis
         title: Ny domeneblokkering
+      no_domain_block_selected: Ingen domeneblokkering ble endret, siden ingen var valgt
+      not_permitted: Du har ikke tillatelse til å utføre denne handlingen
       obfuscate: Obfuskere domenenavn
-      obfuscate_hint: Delvis skjule domenenavnet i listen hvis det er aktivert for å annonsere listen over domenebegrensninger
+      obfuscate_hint: Skjul deler av domenenavnet i listen hvis annonsering av listen over domenebegrensninger er slått på
       private_comment: Privat kommentar
-      private_comment_hint: Kommenter angående denne domenebegrensningen for internt bruk av moderatorene.
+      private_comment_hint: Kommentar angående denne domenebegrensningen for internt bruk av moderatorene.
       public_comment: Offentlig kommentar
-      public_comment_hint: Kommenter angående denne domenebegrensningen for offentligheten, hvis publisering av domenebegrensningslisten er slått på.
+      public_comment_hint: Kommentar angående denne domenebegrensningen for offentligheten, hvis publisering av listen over domenebegrensninger er slått på.
       reject_media: Avvis mediefiler
       reject_media_hint: Fjerner lokalt lagrede mediefiler og nekter å laste dem ned i fremtiden. Irrelevant for utvisninger
       reject_reports: Avslå rapporter
       reject_reports_hint: Ignorer alle rapporter som kommer fra dette domenet. Irrelevant for utvisninger
-      rejecting_media: avviser mediafiler
-      rejecting_reports: avslår rapporter
-      severity:
-        silence: stilnet
-        suspend: suspendert
-      show:
-        affected_accounts:
-          one: En konto i databasen påvirket
-          other: "%{count} kontoer i databasen påvirket"
-        retroactive:
-          silence: Avmålbind alle eksisterende kontoer fre dette domenet
-          suspend: Avutvis alle eksisterende kontoer fra dette domenet
-        title: Angre domeneblokkering for %{domain}
-        undo: Angre
       undo: Angre
       view: Vis domeneblokkering
     email_domain_blocks:
       add_new: Lag ny
+      attempts_over_week:
+        one: "%{count} forsøk i løpet av den siste uken"
+        other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
       created_msg: E-postdomenet ble lagt til i blokkeringslisten uten problemer
       delete: Fjern
-      destroyed_msg: E-postdomenet har blitt fjernet fra blokkeringslisten uten problemer
+      dns:
+        types:
+          mx: MX-post
       domain: Domene
-      empty: Ingen e-mail-domener er sortelistet på dette tidspunkt.
-      from_html: fra %{domain}
       new:
         create: Legg til domene
         title: Ny blokkeringsoppføring av e-postdomene
       title: Blokkering av e-postdomene
+    export_domain_allows:
+      new:
+        title: Importer domenetillatelser
+      no_file: Ingen fil valgt
+    export_domain_blocks:
+      import:
+        description_html: Du er i ferd med å importere en liste med domeneblokkeringer. Se gjennom listen svært nøye, spesielt hvis du ikke har laget denne listen selv.
+        existing_relationships_warning: Nåværende følgeforhold
+        private_comment_description_html: 'For å hjelpe deg med å holde oversikt over hvor importerte blokkeringer kommer fra, vil de bli opprettet med følgende private kommentar: <q>%{comment}</q>'
+        private_comment_template: Importert fra %{source} den %{date}
+        title: Importer domeneblokkeringer
+      new:
+        title: Importer domeneblokkeringer
+      no_file: Ingen fil valgt
     follow_recommendations:
       description_html: "<strong>Følg anbefalinger hjelper nye brukere med å finne interessant innhold</strong>. Når en bruker ikke har kommunisert med andre nok til å danne personlig tilpassede følger anbefalinger, anbefales disse kontoene i stedet. De beregnes daglig på nytt fra en blanding av kontoer der de høyeste engasjementene er og med høyest lokal tilhenger for et gitt språk."
       language: For språk
@@ -406,22 +429,46 @@
       title: Følg anbefalinger
       unsuppress: Gjenopprett følg-anbefaling
     instances:
+      availability:
+        failure_threshold_reached: Feilterskelen ble nådd %{date}.
+        failures_recorded:
+          one: Mislykkede forsøk på %{count} dag.
+          other: Mislykkede forsøk på %{count} ulike dager.
+        no_failures_recorded: Ingen feil registrert.
+        title: Tilgjengelighet
+        warning: Det siste forsøket på å koble til denne serveren lyktes ikke
       back_to_all: All
       back_to_limited: Begrenset
       back_to_warning: Advarsel
       by_domain: Domene
+      confirm_purge: Er du sikker på at du vil slette data permanent fra dette domenet?
+      content_policies:
+        comment: Internt notat
+        description_html: Du kan definere innholdsregler som vil bli brukt på alle kontoer fra dette domenet og hvilket som helst av underdomenene.
+        policies:
+          reject_media: Avvis media
+          reject_reports: Avvis rapporter
+          silence: Begrens
+          suspend: Suspender
+        reason: Offentlig årsak
+        title: Retningslinjer for innhold
+      dashboard:
+        instance_accounts_measure: lagrede kontoer
+        instance_followers_measure: våre følgere der
+        instance_follows_measure: deres følgere her
+        instance_languages_dimension: Mest brukte språk
+        instance_media_attachments_measure: lagrede mediavedlegg
+        instance_reports_measure: rapporter om dem
+        instance_statuses_measure: lagrede innlegg
       delivery:
         all: All
         clear: Feil ved fjerning
         restart: Starte levering
         stop: Stopp levering
-        title: Levering
         unavailable: Ikke tilgjengelig
-        warning: Advarsel
       delivery_available: Levering er tilgjengelig
-      known_accounts:
-        one: "%{count} kjent konto"
-        other: "%{count} kjente kontoer"
+      delivery_error_hint: Dersom levering ikke er mulig i løpet av %{count} dager, blir det automatisk merket som ikke mulig å levere.
+      empty: Ingen domener funnet.
       moderation:
         all: Alt
         limited: Begrenset
@@ -457,24 +504,22 @@
         title: Opprett ny IP-regel
       no_ip_block_selected: Ingen IP-regler ble endret da ingen ble valgt
       title: IP-regler
-    pending_accounts:
-      title: Avventende brukere (%{count})
     relationships:
       title: "%{acct} sitt forhold"
     relays:
       add_new: Legg til ny overgang
       delete: Slett
-      description_html: En <strong>federert overgang</strong> er en mellomleddsserver som utveksler store mengder av offentlige tuter mellom servere som abonnerer og publiserer til den. <strong>Det kan hjelpe små og mellomstore servere til å oppdage innhold fra strømiverset</strong>, noe som ellers ville ha krevd at lokale brukere manuelt fulgte andre personer på fjerne servere.
+      description_html: En <strong>federert overgang</strong> er en mellomleddsserver som utveksler store mengder av offentlige innlegg mellom servere som abonnerer og publiserer til den. <strong>Det kan hjelpe små og mellomstore servere til å oppdage innhold fra strømiverset</strong>, noe som ellers ville ha krevd at lokale brukere manuelt fulgte andre personer på fjerne servere.
       disable: Skru av
       disabled: Skrudd av
       enable: Skru på
-      enable_hint: Når dette har blitt skrudd på, vil tjeneren din abonnere på alle offentlige tuter fra denne overgangen, og vil begynne å sende denne tjenerens offentlige tuter til den.
+      enable_hint: Når dette har blitt skrudd på, vil tjeneren din abonnere på alle offentlige innlegg fra denne overgangen, og vil begynne å sende denne tjenerens offentlige innlegg til den.
       enabled: Skrudd på
       inbox_url: Overførings-URL
       pending: Avventer overgangens godkjenning
       save_and_enable: Lagre og skru på
       setup: Sett opp en overgangsforbindelse
-      signatures_not_enabled: Overganger vil ikke fungere riktig mens sikkermodus eller hvitelistingsmodus er skrudd på
+      signatures_not_enabled: Videreformidlere vil ikke fungere riktig mens sikkermodus eller begrenset føderasjon er aktiv
       status: Status
       title: Overganger
     report_notes:
@@ -485,19 +530,23 @@
         notes:
           one: "%{count} notis"
           other: "%{count} notiser"
-        reports:
-          one: "%{count} rapport"
-          other: "%{count} rapporter"
       action_taken_by: Handling utført av
+      actions:
+        delete_description_html: De rapporterte innleggene vil bli slettet, og en advarsel vil bli tatt vare på for å hjelpe deg eskalere ved fremtidige overtredelser fra samme konto.
+        mark_as_sensitive_description_html: Mediene i de rapporterte innleggene vil bli merket som følsomme, og en advarsel vil bli notert for å hjelpe deg eskalere ved fremtidige overtredelser fra samme konto.
+        resolve_description_html: Ingen handling utføres mot den rapporterte kontoen, ingen advarsel gis, og rapporten lukkes.
+        silence_description_html: Profilen vil kun være synlig for dem som allerede følger den eller manuelt slår den opp, noe som sterkt begrenser dens rekkevidde. Kan alltid tilbakestilles.
       are_you_sure: Er du sikker?
       assign_to_self: Tilegn til meg
       assigned: Tilegnet moderator
+      by_target_domain: Domenet av rapportert bruker
       comment:
         none: Ingen
       created_at: Rapportert
       forwarded: Videresendt
       forwarded_to: Videresendt til %{domain}
       mark_as_resolved: Merk som løst
+      mark_as_sensitive: Merk som følsomt
       mark_as_unresolved: Merk som uoppklart
       notes:
         create: Legg til notat
@@ -512,12 +561,41 @@
       resolved: Løst
       resolved_msg: Rapport løst!
       status: Status
-      target_domain: Domenet av rapportert bruker
+      statuses: Rapportert innhold
       target_origin: Opprinnelse for innrapportert konto
       title: Rapporter
       unassign: Fjern tilegning
       unresolved: Uløst
       updated_at: Oppdatert
+      view_profile: Vis profil
+    roles:
+      add_new: Legg til rolle
+      assigned_users:
+        one: "%{count} bruker"
+        other: "%{count} brukere"
+      categories:
+        administration: Administrasjon
+        devops: DevOps
+        invites: Invitasjoner
+      delete: Slett
+      edit: Rediger rollen '%{name}'
+      everyone: Standard-tillatelser
+      everyone_full_description_html: Dette er <strong>basis-rollen</strong> som påvirker <strong>alle brukere</strong>, selv de uten en tilordnet rolle. Alle andre roller arver tillatelser fra den.
+      permissions_count:
+        one: "%{count} tillatelse"
+        other: "%{count} tillatelser"
+      privileges:
+        administrator: Administrator
+        administrator_description: Brukere med denne tillatelsen omgår enhver tillatelse
+        delete_user_data: Slett brukerdata
+        delete_user_data_description: Lar brukere slette andre brukeres data uten forsinkelse
+        invite_users: Invitere brukere
+        invite_users_description: Lar brukere invitere nye personer til serveren
+        manage_invites_description: Lar brukere bla gjennom og deaktivere invitasjonslenker
+        view_dashboard: Vis dashbord
+        view_dashboard_description: Gir brukere tilgang til dashbordet og ulike metrikker
+        view_devops: DevOps
+        view_devops_description: Gir brukere tilgang til Sidekiq og pgHero-dashbord
     rules:
       add_new: Legg til et filter
       delete: Slett
@@ -526,133 +604,102 @@
       empty: Ingen serverregler har blitt definert ennå.
       title: Server regler
     settings:
-      activity_api_enabled:
-        desc_html: Antall lokale statusposter, aktive brukere og nye registreringer i ukentlige oppdelinger
-        title: Publiser samlet statistikk om brukeraktiviteter
-      bootstrap_timeline_accounts:
-        desc_html: Separer flere brukernavn med komma. Kun lokale og ulåste kontoer vil kunne brukes. Dersom tomt er standarden alle lokale administratorer.
-        title: Standard følgere for nye brukere
-      contact_information:
-        email: Skriv en offentlig e-postadresse
-        username: Skriv brukernavn
-      custom_css:
-        desc_html: Modifiser utseendet med CSS lastet på hver side
-        title: Egendefinert CSS
+      about:
+        title: Om
       default_noindex:
-        desc_html: Påvirker alle brukerne som ikke har justert denne innstillingen selv
-        title: Velg brukere som er ute av søkemotoren indeksering som standard
+        desc_html: Påvirker alle brukerne som ikke selv har justert denne innstillingen
+        title: Ikke la brukere indekseres av søkemotorer som standard
+      discovery:
+        trends: Trender
       domain_blocks:
         all: Til alle
         disabled: Til ingen
-        title: Vis domeneblokkeringer
         users: Til lokale brukere som er logget inn
-      domain_blocks_rationale:
-        title: Vis grunnlaget
-      hero:
-        desc_html: Vises på forsiden. Minst 600×100px er anbefalt. Dersom dette ikke er valgt, faller det tilbake på tjenerens miniatyrbilde
-        title: Heltebilde
-      mascot:
-        desc_html: Vist på flere sider. Minst 293×205px er anbefalt. Dersom det ikke er valgt, faller det tilbake til standardmaskoten
-        title: Maskotbilde
-      peers_api_enabled:
-        desc_html: Domenenavn denne instansen har truffet på i fediverset
-        title: Publiser liste over oppdagede instanser
-      preview_sensitive_media:
-        desc_html: Lenkeforhåndsvisninger på andre nettsteder vil vise et miniatyrbilde selv dersom mediet er merket som sensitivt
-        title: Vis sensitive medier i OpenGraph-forhåndsvisninger
-      profile_directory:
-        desc_html: Tillat brukere å bli oppdagelige
-        title: Skru på profilmappen
-      registrations:
-        closed_message:
-          desc_html: Vises på forsiden når registreringer er lukket<br>Du kan bruke HTML-tagger
-          title: Melding for lukket registrering
-        deletion:
-          desc_html: Tillat alle å slette sin konto
-          title: Åpne kontosletting
-        min_invite_role:
-          disabled: Ingen
-          title: Tillat invitasjoner fra
-        require_invite_text:
-          desc_html: Når registreringer krever manuell godkjenning, må du føye «Hvorfor vil du bli med?» tekstinput obligatoriske i stedet for valgfritt
-          title: Krev nye brukere for å oppgi en grunn for å delta
       registrations_mode:
         modes:
           approved: Godkjenning kreves for påmelding
           none: Ingen kan melde seg inn
           open: Hvem som helst kan melde seg inn
-        title: Registreringsmodus
-      show_known_fediverse_at_about_page:
-        desc_html: Begrenser den offentlige tidslinjen som er knyttet til landingssiden når den er deaktivert, og viser bare lokalt innhold
-      show_staff_badge:
-        desc_html: Vis personalemerke på brukersiden
-        title: Vis personalemerke
-      site_description:
-        desc_html: Vises som et avsnitt på forsiden og brukes som en meta-tagg. Du kan bruke HTML-tagger, spesielt <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
-        title: Nettstedsbeskrivelse
-      site_description_extended:
-        desc_html: Vises på side for utvidet informasjon.<br>Du kan bruke HTML-tagger
-        title: Utvidet nettstedsinformasjon
-      site_short_description:
-        desc_html: Vist i sidelinjen og i metastempler. Beskriv hva Mastodon er og hva som gjør denne tjeneren spesiell i én enkelt paragraf.
-        title: Kort tjenerbeskrivelse
-      site_terms:
-        desc_html: Du kan skrive din egen personverns-strategi, bruksviklår og andre regler. Du kan bruke HTML tagger
-        title: Skreddersydde bruksvilkår
-      site_title: Nettstedstittel
-      thumbnail:
-        desc_html: Brukes ved forhandsvisning via OpenGraph og API. 1200x630px anbefales
-        title: Miniatyrbilde for instans
-      timeline_preview:
-        desc_html: Vis offentlig tidslinje på landingssiden
-        title: Forhandsvis tidslinjen
-      title: Nettstedsinnstillinger
-      trendable_by_default:
-        desc_html: Påvirker hashtags som ikke har blitt nektet tidligere
-        title: Tillat hashtags for trend uten foregående vurdering
-      trends:
-        title: Trendende emneknagger
+      title: Serverinnstillinger
     site_uploads:
       delete: Slett den opplastede filen
       destroyed_msg: Vellykket sletting av sideopplasting!
     statuses:
+      account: Forfatter
+      application: Applikasjon
       back_to_account: Tilbake til kontosiden
       batch:
-        delete: Slett
-        nsfw_off: NSFW AV
-        nsfw_on: NSFW PÅ
+        remove_from_report: Fjern fra rapport
       deleted: Slettet
-      failed_to_execute: Utføring mislyktes
+      history: Versjonshistorikk
+      language: Språk
       media:
         title: Media
-      no_media: Ingen media
+      metadata: Metadata
       no_status_selected: Ingen statuser ble endret da ingen ble valgt
+      original_status: Opprinnelig innlegg
+      status_changed: Innlegg endret
       title: Kontostatuser
+      visibility: Synlighet
       with_media: Med media
+    strikes:
+      actions:
+        delete_statuses: "%{name} slettet %{target}s innlegg"
+        disable: "%{name} frøs %{target}s konto"
+        mark_statuses_as_sensitive: "%{name} merket %{target}s innlegg som følsomme"
+        none: "%{name} sendte en advarsel til %{target}"
+        sensitive: "%{name} merket %{target}s konto som følsom"
+        silence: "%{name} begrenset %{target}s konto"
+        suspend: "%{name} suspenderte %{target}s konto"
+      appeal_approved: Klage tatt til følge
+      appeal_pending: Klage behandles
     system_checks:
       database_schema_check:
         message_html: Det venter på databaseoverføringer. Vennligst kjør disse for å sikre at applikasjonen oppfører seg som forventet
+      elasticsearch_running_check:
+        message_html: Kunne ikke koble til Elasticsearch. Kontroller at den kjører, eller deaktiver fulltekstsøk
+      elasticsearch_version_check:
+        message_html: 'Inkompatibel Elasticsearch-versjon: %{value}'
+        version_comparison: Elasticsearch %{running_version} kjører mens %{required_version} er påkrevd
       rules_check:
         action: Behandle serverregler
         message_html: Du har ikke definert noen serverregler.
+      sidekiq_process_check:
+        message_html: Ingen Sidekiq-prosess kjører for %{value} køen(e). Vennligst se gjennom Sidekiq-konfigurasjonen din
     tags:
-      accounts_today: Ulike brukere i dag
-      accounts_week: Unike brukstilfeller denne uken
-      last_active: Senest aktiv
-      most_popular: Mest populært
-      most_recent: Nyligst
-      name: Emneknagg
       review: Gjennomgangsstatus
-      reviewed: Gjennomgått
-      title: Emneknagger
-      trending_right_now: Trender akkurat nå
-      unique_uses_today: "%{count} legger ut om det i dag"
-      unreviewed: Ikke gjennomgått
     title: Administrasjon
+    trends:
+      allow: Tillat
+      approved: Godkjent
+      disallow: Ikke tillat
+      links:
+        allow: Tillat lenke
+        disallow: Ikke tillat lenke
+        no_link_selected: Ingen lenker ble endret da ingen var valgt
+        shared_by_over_week:
+          one: Delt av %{count} person i løpet av den siste uken
+          other: Delt av %{count} personer i løpet av den siste uken
+        usage_comparison: Delt %{today} ganger i dag, sammenlignet med %{yesterday} i går
+      pending_review: Avventer gjennomgang
+      rejected: Avvist
+      statuses:
+        allow: Tillat innlegg
+        allow_account: Tillat forfatter
+        disallow: Ikke tillat innlegg
     warning_presets:
       add_new: Legg til ny
       delete: Slett
+      title: Endre forhåndsinnstillinger for advarsler
+    webhooks:
+      add_new: Legg til endepunkt
+      status: Status
   admin_mailer:
+    new_appeal:
+      actions:
+        mark_statuses_as_sensitive: å merke innleggene sine som følsomme
+        sensitive: å merke kontoen sin som følsom
+        silence: for å begrense deres konto
     new_pending_account:
       body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
       subject: Ny konto opp til vurdering på %{instance} (%{username})
@@ -660,8 +707,6 @@
       body: "%{reporter} har rapportert %{target}"
       body_remote: Noen fra %{domain} har rapportert %{target}
       subject: Ny rapport for %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Emneknaggen #%{name} trender i dag, men den har ikke blitt gjennomgått tidligere. Den vil ikke bli vist offentlig med mindre du tillater at den blir det, eller du kan bare lagre skjemaet slik det er for å aldri høre om det igjen.'
   aliases:
     add_new: Lag et alias
     empty: Du har ingen aliaser.
@@ -676,69 +721,76 @@
     localization:
       body: Mastodon er oversatt av frivillige.
       guide_link_text: Alle kan bidra.
-    sensitive_content: Sensitivt innhold
-    toot_layout: Tut-utseende
+    sensitive_content: Følsomt innhold
+    toot_layout: Innleggsoppsett
   application_mailer:
     notification_preferences: Endre E-postinnstillingene
     salutation: "%{name},"
     settings: 'Endre foretrukne e-postinnstillinger: %{link}'
     view: 'Se:'
     view_profile: Vis Profil
-    view_status: Vis status
+    view_status: Vis innlegg
   applications:
     created: Søknaden ble vellykket oppretttet
     destroyed: Søknaden ble vellykket slettet
-    invalid_url: Den oppgitte URLen er ugyldig
     regenerate_token: Regenerer tilgangsnøkkel
     token_regenerated: Tilgangsnøkkel vellykket regenerert
     warning: Vær veldig forsiktig med denne data. Aldri del den med noen!
     your_token: Din tilgangsnøkkel
   auth:
-    apply_for_account: Be om en invitasjon
+    apply_for_account: Be om en konto
     change_password: Passord
-    checkbox_agreement_html: Jeg godtar <a href="%{rules_path}" target="_blank">tjenerens regler</a> og <a href="%{terms_path}" target="_blank">bruksvilkår</a>
-    checkbox_agreement_without_rules_html: Jeg godtar <a href="%{terms_path}" target="_blank">bruksvilkårene</a>
     delete_account: Slett konto
     delete_account_html: Hvis du ønsker å slette kontoen din, kan du <a href="%{path}">gå hit</a>. Du vil bli spurt om bekreftelse.
     description:
       prefix_invited_by_user: "@%{name} inviterer deg til å bli med på denne serveren til Mastodon!"
-      prefix_sign_up: Meld deg opp på Mastodon i dag!
-      suffix: Med en konto, vil kunne følge folk, legge ut oppdateringer, og utveksle meldinger med brukere fra enhver Mastodon-tjener, og mer til!
+      prefix_sign_up: Registrer deg på Mastodon i dag!
+      suffix: Med en konto, vil kunne følge folk, skrive innlegg, og utveksle meldinger med brukere fra enhver Mastodon-tjener, og mer til!
     didnt_get_confirmation: Mottok du ikke instruksjoner om bekreftelse?
     dont_have_your_security_key: Har du ikke sikkerhetsnøkkelen din?
     forgot_password: Har du glemt passordet ditt?
     invalid_reset_password_token: Tilbakestillingsnøkkelen for passord er ugyldig eller utløpt. Vennligst be om en ny.
-    link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspåloggingsenhet eller en gjenopprettingskode
+    link_to_otp: Skriv inn en to-faktor-kode fra telefonen din, eller en gjenopprettingskode
     link_to_webauth: Bruk sikkerhetsnøkkel-enheten din
-    login: Logg på
+    log_in_with: Logg inn med
+    login: Logg inn
     logout: Logg ut
     migrate_account: Flytt til en annen konto
     migrate_account_html: Hvis du ønsker å henvise denne kontoen til en annen, kan du <a href="%{path}">konfigurere det her</a>.
-    or_log_in_with: Eller logg på med
+    or_log_in_with: Eller logg inn med
+    privacy_policy_agreement_html: Jeg har lest og godtar <a href="%{privacy_policy_path}" target="_blank">retningslinjer for personvern</a>
     providers:
       cas: CAS
       saml: SAML
-    register: Bli med
-    registration_closed: "%{instance} godtar ikke nye medlemmer"
+    register: Meld deg på
+    registration_closed: "%{instance} tar ikke imot nye medlemmer"
     resend_confirmation: Send bekreftelsesinstruksjoner på nytt
-    reset_password: Nullstill passord
+    reset_password: Tilbakestill passord
+    rules:
+      preamble: Disse angis og håndheves av %{domain}-moderatorene.
+      title: Noen grunnregler.
     security: Sikkerhet
-    set_new_password: Sett nytt passord
+    set_new_password: Angi nytt passord
     setup:
       email_below_hint_html: Dersom E-postadressen nedenfor er feil, kan du endre det her og motta en ny bekreftelses-E-post.
       email_settings_hint_html: Bekreftelses-E-posten ble sendt til %{email}. Dersom den E-postadressen ikke var riktig, kan du endre den i kontoinnstillingene.
       title: Innstillinger
+    sign_up:
+      preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til.
+      title: La oss få deg satt i gang på %{domain}.
     status:
       account_status: Kontostatus
       confirming: Venter på at e-postbekreftelsen er fullført.
       functional: Kontoen din er fullt operativt.
-      pending: Søknaden din avventer gjennomgang av styret vårt. Dette kan ta litt tid. Du vil motta en E-post dersom søknaden din blir godkjent.
+      pending: Søknaden din avventer gjennomgang av våre medarbeidere. Dette kan ta litt tid. Du vil motta en e-post dersom søknaden din blir godkjent.
       redirecting_to: Kontoen din er inaktiv fordi den for øyeblikket omdirigerer til %{acct}.
-    trouble_logging_in: Har du problemer med å logge på?
+      view_strikes: Vis tidligere advarsler mot kontoen din
+    too_fast: Skjemaet ble sendt inn for raskt, prøv på nytt.
     use_security_key: Bruk sikkerhetsnøkkel
   authorize_follow:
     already_following: Du følger allerede denne kontoen
-    error: Uheldigvis skjedde det en feil da vi prøvde å få tak i en bruker fra en annen instans
+    already_requested: Du har allerede sendt en følgeforespørsel til denne kontoen
+    error: Dessverre oppstod det en feil da vi prøvde å få tak i brukeren fra tjeneren
     follow: Følg
     follow_request: 'Du har sendt en følgeforespørsel til:'
     following: 'Suksess! Nå følger du:'
@@ -756,6 +808,10 @@
     errors:
       invalid_key: er ikke en gyldig Ed25519- eller Curve25519-nøkkel
       invalid_signature: er ikke en gyldig Ed25519-signatur
+  date:
+    formats:
+      default: "%d. %b, %Y"
+      with_month_name: "%d. %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} timer"
@@ -787,10 +843,36 @@
       more_details_html: For mere detaljer, se <a href="%{terms_path}">privatlivsretningslinjene</a>.
       username_available: Brukernavnet ditt vil bli gjort tilgjengelig igjen
       username_unavailable: Brukernavnet ditt vil forbli utilgjengelig
-  directories:
-    directory: Profilmappe
-    explanation: Oppdag brukere basert på deres interesser
-    explore_mastodon: Utforsk %{title}
+  disputes:
+    strikes:
+      action_taken: Handling utført
+      appeal: Klage
+      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
+      appeal_rejected: Klagen ble avvist
+      appeal_submitted_at: Klage levert
+      appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
+      appeals:
+        submit: Lever klage
+      approve_appeal: Godkjenn klage
+      associated_report: Tilhørende rapport
+      created_at: Datert
+      description_html: Dette er tiltakene mot din konto og advarsler som har blitt sent til deg av %{instance}-personalet.
+      recipient: Adressert til
+      reject_appeal: Avvis klage
+      status: 'Innlegg #%{id}'
+      status_removed: Innlegg allerede fjernet fra systemet
+      title: "%{action} fra %{date}"
+      title_actions:
+        delete_statuses: Fjerning av innlegg
+        disable: Frysing av konto
+        mark_statuses_as_sensitive: Merking av innlegg som følsomme
+        none: Advarsel
+        sensitive: Merking av konto som sensitiv
+        silence: Begrensning av konto
+        suspend: Suspensjon av konto
+      your_appeal_approved: Din klage har blitt godkjent
+      your_appeal_pending: Du har levert en klage
+      your_appeal_rejected: Din klage har blitt avvist
   domain_validator:
     invalid_domain: er ikke et gyldig domenenavn
   errors:
@@ -815,7 +897,7 @@
     archive_takeout:
       date: Dato
       download: Last ned arkivet ditt
-      hint_html: Du kan be om et arkiv med dine <strong>tuter og opplastede media</strong>. Den eksporterte dataen vil være i ActivityPub-formatet, som kan leses av programmer som støtter det. Du kan be om et arkiv opptil hver 7. dag.
+      hint_html: Du kan be om et arkiv med dine <strong>innlegg og opplastede media</strong>. Eksporterte data vil være i ActivityPub-formatet, som kan leses av programmer som støtter det. Du kan be om et arkiv opptil hver 7. dag.
       in_progress: Samler arkivet ditt...
       request: Be om ditt arkiv
       size: Størrelse
@@ -828,6 +910,8 @@
     storage: Medialagring
   featured_tags:
     add_new: Legg til ny
+    errors:
+      limit: Du har allerede fremhevet det maksimale antal hashtags
     hint_html: "<strong>Hva er utvalgte emneknagger?</strong> De vises frem tydelig på din offentlige profil, og lar folk bla i dine offentlige innlegg som spesifikt har de emneknaggene. De er et bra verktøy for å holde styr på kreative verk eller langtidsprosjekter."
   filters:
     contexts:
@@ -837,6 +921,8 @@
       public: Offentlige tidslinjer
       thread: Samtaler
     edit:
+      add_keyword: Legg til stikkord
+      statuses: Individuelle innlegg
       title: Rediger filter
     index:
       delete: Slett
@@ -845,9 +931,6 @@
     new:
       title: Legg til nytt filter
   footer:
-    developers: Utviklere
-    more: Mer…
-    resources: Ressurser
     trending_now: Trender nå
   generic:
     all: Alle
@@ -856,27 +939,14 @@
     delete: Slett
     order_by: Sorter etter
     save_changes: Lagre endringer
+    today: i dag
     validation_errors:
       one: Noe er ikke helt riktig ennå. Vennligst se etter en gang til
       other: Noe er ikke helt riktig ennå. Det er ennå %{count} feil å rette på
-  identity_proofs:
-    active: Aktive
-    authorize: Ja, autoriser
-    authorize_connection_prompt: Vil du autorisere denne kryptografiske forbindelsen?
-    errors:
-      keybase:
-        verification_failed: Keybase kjenner ikke igjen denne sjetongen som en signatur for Keybase-brukeren %{kb_username}. Vennligst prøv igjen gjennom Keybase.
-      wrong_user: Kan ikke lage et bevis for %{proving} mens du er logget på som %{current}. Logg på som %{proving} og prøv igjen.
-    explanation_html: Her kan du kryptografisk koble til dine andre enheter, f.eks. en Keybase-profil. Dette lar andre folk sende deg krypterte meldinger og stole på innhold som du sender dem.
-    i_am_html: Jeg er %{username} på %{service}.
-    identity: Identitet
-    inactive: Inaktive
-    publicize_checkbox: 'Og tut ut dette:'
-    publicize_toot: 'Det er bevist! Jeg er %{username} på %{service}: %{url}'
-    remove: Fjern bevis fra kontoen
-    status: Verifiseringsstatus
-    view_proof: Se bevis
   imports:
+    errors:
+      invalid_csv_file: 'Ugyldig CSV-fil. Feil: %{error}'
+      over_rows_processing_limit: inneholder flere enn %{count} rader
     modes:
       merge: Slå sammen
       overwrite: Overskriv
@@ -889,7 +959,6 @@
       following: Følgeliste
       muting: Dempeliste
     upload: Opplastning
-  in_memoriam_html: Til minne.
   invites:
     delete: Deaktiver
     expired: Utløpt
@@ -917,11 +986,18 @@
       limit: Du har nådd det maksimale antall lister
   login_activities:
     authentication_methods:
+      otp: to-faktor autentiseringsapp
       password: passord
+      webauthn: sikkerhetsnøkler
+    description_html: Hvis du ser aktivitet som du ikke gjenkjenner, bør du vurdere å endre passordet ditt og aktivere to-trinnsinnlogging.
+    empty: Ingen innloggingshistorikk er tilgjengelig
+    failed_sign_in_html: Mislykket innloggingsforsøk med %{method} fra %{ip} (%{browser})
+    successful_sign_in_html: Vellykket innlogging med %{method} fra %{ip} (%{browser})
     title: Autentiseringshistorikk
   media_attachments:
     validations:
       images_and_video: Kan ikke legge ved video på en status som allerede inneholder bilder
+      not_ready: Kan ikke legge til filer som ikke er ferdigbehandlet. Prøv igjen om et øyeblikk!
       too_many: Kan ikke legge ved mer enn 4 filer
   migrations:
     acct: brukernavn@domene til den nye kontoen
@@ -961,20 +1037,14 @@
     carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
     copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   notification_mailer:
-    digest:
-      action: Vis alle varslinger
-      body: Her er en kort oppsummering av hva du har gått glipp av siden du sist logget inn den %{since}
-      mention: "%{name} nevnte deg i:"
-      new_followers_summary:
-        one: I tillegg har du fått en ny følger mens du var borte. Hurra!
-        other: I tillegg har du har fått %{count} nye følgere mens du var borte! Imponerende!
-      subject:
-        one: "1 ny hendelse siden ditt siste besøk \U0001F418"
-        other: "%{count} nye hendelser siden ditt siste besøk \U0001F418"
-      title: I ditt fravær…
+    admin:
+      report:
+        subject: "%{name} leverte en rapport"
+      sign_up:
+        subject: "%{name} registrerte seg"
     favourite:
-      body: 'Statusen din ble likt av %{name}:'
-      subject: "%{name} likte statusen din"
+      body: 'Innlegget ditt ble favorittmarkert av %{name}:'
+      subject: "%{name} favorittmarkerte innlegget ditt"
       title: Ny favoritt
     follow:
       body: "%{name} følger deg!"
@@ -991,11 +1061,13 @@
       subject: Du ble nevnt av %{name}
       title: Ny nevning
     reblog:
-      body: 'Din status ble fremhevd av %{name}:'
-      subject: "%{name} fremhevde din status"
+      body: 'Ditt innlegg ble fremhevet av %{name}:'
+      subject: "%{name} fremhevet ditt innlegg"
       title: Ny fremheving
     status:
       subject: "%{name} postet nettopp"
+    update:
+      subject: "%{name} redigerte et innlegg"
   notifications:
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
@@ -1039,9 +1111,11 @@
     other: Annet
     posting_defaults: Innleggsstandarder
     public_timelines: Offentlige tidslinjer
+  privacy_policy:
+    title: Retningslinjer for personvern
   reactions:
     errors:
-      limit_reached: Grensen for forskjellige reaksjoner nådd
+      limit_reached: Grensen for ulike reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
   relationships:
     activity: Kontoaktivitet
@@ -1061,25 +1135,17 @@
     remove_selected_follows: Avfølg de valgte brukerne
     status: Kontostatus
   remote_follow:
-    acct: Tast inn brukernavn@domene som du vil følge fra
     missing_resource: Kunne ikke finne URLen for din konto
-    no_account_html: Har du ikke en konto? Da kan du <a href='%{sign_up_path}' target='_blank'>lage en konto her</a>
-    proceed: Fortsett med følging
-    prompt: 'Du vil følge:'
-    reason_html: "<strong>Hvorfor dette trinnet er nødvendig?</strong><code>%{instance}</code> er kanskje ikke tjeneren som du er registrert på, så vi må omdirigere deg til hjemmetjeneren din først."
-  remote_interaction:
-    favourite:
-      proceed: Fortsett til likingen
-      prompt: 'Du ønsker å like denne tuten:'
-    reblog:
-      proceed: Fortsett til fremhevingen
-      prompt: 'Du ønsker å fremheve denne tuten:'
-    reply:
-      proceed: Fortsett til svaret
-      prompt: 'Du ønsker å svare på denne tuten:'
+  reports:
+    errors:
+      invalid_rules: refererer ikke til gyldige regler
+  rss:
+    descriptions:
+      account: Offentlige innlegg fra @%{acct}
+      tag: 'Offentlige innlegg merket med #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Du har overskredet grensen på %{limit} planlagte tuter for den dagen
-    over_total_limit: Du har overskredet grensen på %{limit} planlagte tuter
+    over_daily_limit: Du har overskredet grensen på %{limit} planlagte innlegg for i dag
+    over_total_limit: Du har overskredet grensen på %{limit} planlagte innlegg
     too_soon: Den planlagte datoen må være i fremtiden
   sessions:
     activity: Siste aktivitet
@@ -1110,7 +1176,7 @@
       adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1135,7 +1201,6 @@
     edit_profile: Endre profil
     export: Dataeksport
     featured_tags: Utvalgte emneknagger
-    identity_proofs: Identitetsbevis
     import: Importér
     import_and_export: Importer og eksporter
     migrate: Kontomigrering
@@ -1143,6 +1208,8 @@
     preferences: Innstillinger
     profile: Profil
     relationships: Følginger og følgere
+    statuses_cleanup: Automatisert sletting av innlegg
+    strikes: Modereringsadvarsler
     two_factor_authentication: Tofaktorautentisering
     webauthn_authentication: Sikkerhetsnøkler
   statuses:
@@ -1158,16 +1225,20 @@
         one: "%{count} video"
         other: "%{count} videoer"
     boosted_from_html: Boostet fra %{acct_link}
-    content_warning: 'Innholdsadvarsel: %{warning}'
+    content_warning: 'Innholdsvarsel: %{warning}'
+    default_language: Samme språk som brukergrensesnittet
+    disallowed_hashtags:
+      one: 'inneholdt en ikke tillatt hashtag: %{tags}'
+      other: 'inneholdt de ikke tillatte hashtaggene: %{tags}'
+    edited_at_html: Redigert %{date}
     errors:
       in_reply_not_found: Posten du prøver å svare ser ikke ut til eksisterer.
-    language_detection: Oppdag språk automatisk
     open_in_web: Åpne i nettleser
-    over_character_limit: grense på %{max} tegn overskredet
+    over_character_limit: grensen på %{max} tegn overskredet
     pin_errors:
-      limit: Du har allerede festet det maksimale antall tuter
-      ownership: Kun egne tuter kan festes
-      private: Kun offentlige tuter kan festes
+      direct: Innlegg som bare er synlige for nevnte brukere kan ikke festes
+      limit: Du har allerede festet det maksimale antall innlegg
+      ownership: Kun egne innlegg kan festes
       reblog: En fremheving kan ikke festes
     poll:
       total_people:
@@ -1191,95 +1262,50 @@
       public_long: Synlig for alle
       unlisted: Uoppført
       unlisted_long: Synlig for alle, men ikke på offentlige tidslinjer
+  statuses_cleanup:
+    enabled: Slett gamle innlegg automatisk
+    enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
+    exceptions: Unntak
+    explanation: Siden sletting av innlegg er en krevende operasjon, blir dette gjort sakte over tid når tjeneren ellers ikke er opptatt. Av denne grunn kan det hende at innleggene dine slettes først en stund etter at de har nådd aldersgrensen.
+    ignore_favs: Ignorer favoritter
+    ignore_reblogs: Ignorer fremhevinger
+    interaction_exceptions: Unntak basert på interaksjoner
+    interaction_exceptions_explanation: Merk at det ikke er noen garanti for at innlegg blir slettet hvis de går under favoritt- eller fremhevelsesgrensen etter å ha gått over dem en gang.
+    keep_direct: Behold direktemeldinger
+    keep_direct_hint: Sletter ingen av direktemeldingene dine
+    keep_media: Behold innlegg med mediavedlegg
+    keep_media_hint: Sletter ikke dine egne innlegg som har mediavedlegg
+    keep_pinned: Behold festede innlegg
+    keep_pinned_hint: Sletter ingen av de festede innleggene dine
+    keep_polls: Behold avstemninger
+    keep_polls_hint: Sletter ingen av avstemningene dine
+    keep_self_bookmark: Behold innlegg med dine bokmerker
+    keep_self_bookmark_hint: Sletter ikke dine egne innlegg hvis du har gitt dem et bokmerke
+    keep_self_fav: Behold innlegg som favoritt
+    keep_self_fav_hint: Sletter ikke dine egne innlegg hvis du har favorittmarkert de
+    min_age:
+      '1209600': 2 uker
+      '15778476': 6 måneder
+      '2629746': 1 måned
+      '31556952': 1 år
+      '5259492': 2 måneder
+      '604800': 1 uke
+      '63113904': 2 år
+      '7889238': 3 måneder
+    min_age_label: Terskel for alder
+    min_favs: Behold innlegg som er favorittmarkert av minst
+    min_favs_hint: Sletter ikke noen av dine innlegg som har mottatt minst dette antall favorittmarkeringer. La stå tom for å slette innlegg uavhengig av antall favorittmarkeringer
+    min_reblogs: Behold innlegg fremhevet av minst
+    min_reblogs_hint: Sletter ikke noen av dine innlegg som har blitt fremhevet minst dette antall ganger. La stå tom for å slette innlegg uavhengig av antall fremhevinger
   stream_entries:
-    pinned: Festet tut
-    reblogged: fremhevde
+    pinned: Festet innlegg
+    reblogged: fremhevet
     sensitive_content: Følsomt innhold
+  strikes:
+    errors:
+      too_late: Det er for sent å klage på denne advarselen
   tags:
     does_not_match_previous_name: samsvarer ikke med det forrige navnet
-  terms:
-    body_html: |
-      <h2>Privatlivsretningslinjer</h2>
-      <h3 id="collect">Hva slags informasjon samler vi inn?</h3>
-
-      <ul>
-      <li><em>Grunnleggende kontoinformasjon</em>: Dersom du registrerer deg på denne tjeneren, vil du kanskje bli spurt om å skrive inn et brukernavn, en E-postadresse, og et passord. Du kan også skrive inn ytterligere profilinformasjon som f.eks. et visningsnavn og selvbiografi, og laste opp et profilbilde og toppfeltbilde. Brukernavnet, visningsnavnet, selvbiografien, profilbildet, og toppfeltbildet blir alltid vist offentlig.</li>
-      <li><em>Innlegg, følging, og annen offentlig informasjon</em>: Listen over folk du følger blir vist offentlig, det samme gjelder for følgerne dine. Når du sender inn en melding, blir datoen og tidspunktet lagret såvel som programmet du sendte inn meldingen ifra. Meldinger kan inneholde mediavedlegg, som f.eks. bilder og videoer. Offentlige og uoppførte innlegg er offentlig tilgjengelige. Når du viser frem et innlegg på profilen din, er det også offentlig tilgjengelig informasjon. Dinne innlegg blir levert til dine følgere, og i noen tilfeller betyr det at blir levert til forskjellige tjenere og at kopier blir lagret der. Når du sletter innlegg, blir også det levert til dine følgere. Det å fremheve eller like et annet innlegg er alltid offentlig.</li>
-      <li><em>Direkteinnlegg og innlegg som kun er for følgere</em>: Alle innlegg er lagret og behandlet på tjeneren. Innlegg som kun er for følgere, blir levert til dine følgere, og direkteinnlegg leveres kun til brukere som er nevnt i dem. I noen tilfeller betyr det at de blir levert til forskjellige tjenere og at kopier blir lagret der. Vi gjør et forsøk i god sportsånd for å begrense tilgangen til disse innleggene til kun autoriserte personer, men andre tjenere kan mislykkes med sådan. Derfor er det viktig å gå i gjennom tjenerne som følgerne dine hører til i. I innstillingene kan du veksle på en innstilling for å godkjenne og avslå nye følgere manuelt. <em>Vennligst ha i tankene at operatørene til tjeneren og enhver mottakende tjener kan se slike meldinger</em>, og at mottakere kan ta skjermklipp av, kopiere, eller på annet vis dele dem videre. <em>Ikke del noe farlig informasjon over Mastodon.</em></li>
-      <li><em>IP-er og andre metadata</em>: Når du logger på, lagrer vi IP-adressen som du logget deg på fra, såvel som navnet til nettleserprogrammet ditt. Du kan gå gjennom og tilbakekalle alle påloggede økter i innstillingene. Den seneste IP-adressen du brukte, blir lagret i opptil 12 måneder. Vi vil kanskje også holde på tjenerloggføringer som inkluderer IP-adressen til alle forespørsler til tjeneren vår.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Hva bruker vi informasjonen din til?</h3>
-
-      <p>Hva som helst av informasjonen som vi samler inn fra deg, kan bli brukt på de følgende måtene:</p>
-
-      <ul>
-      <li>Til å levere grunnfunksjonaliteten til Mastodon. Du kan bare samhandle med andre folks innhold og legge ut ditt eget innhold når du er logget på. For eksempel kan du følge andre folk for å se deres kombinerte innlegg i din egen personliggjorte hjemmetidslinje.</li>
-      <li>Til å bistå i moderasjonen av samfunnet, for eksempel å sammenligne IP-adressen din med andre andre kjente adresser for å avgjøre saker om bannlysningsunngåelse eller andre regelbrudd.</li>
-      <li>E-postadressen du oppgir kan bli brukt til å sende deg informasjon, varsler om at andre folk samhandler med innholdet ditt eller sender deg meldinger, og å svare på brukerstøttespørsmål, og/eller andre forespørsler eller spørsmål.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Hvordan beskytter vi informasjonen din?</h3>
-
-      <p>Vi implementer en rekke sikkerhetstiltak for å holde på sikkerheten til din personlige informasjon når du skriver inn, sender inn, eller besøker din personlige informasjon. Blant annet er din nettleserøkt, såvel som trafikken mellom dine apper og API-er, sikret med SSL, og passordet ditt er saltet med en kraftig énveisalgoritme. Du kan skru på 2-trinnsinnlogging for å sikre tilgangen til kontoen din ytterligere.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Hva er våre databeholdingsretningslinjer?</h3>
-
-      <p>Vi vil gjøre en innsats i god sportsånd for å</p>
-
-      <ul>
-      <li>Beholde tjenerloggføringer som inneholder IP-adressen til alle forespørsler til denne tjeneren, dersom det blir loggført i det hele tatt, i ikke mer enn 90 dager.</li>
-      <li>Beholde IP-adressene som er forbundet med registrerte brukere i ikke mer enn 12 måneder.</li>
-      </ul>
-
-      <p>Du kan be om og laste ned et arkiv av innholdet ditt, inkludert dine innlegg, media, mediavedlegg, profilbilde, og toppfeltbilde.</p>
-
-      <p>Du kan ugjenkallelig slette kontoen til enhver tid.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Bruker vi infokapsler?</h3>
-
-      <p>Ja. Infokapsler er små filer som et nettsted eller dens tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater dette). Disse infokapslene lar nettstedet kjenne igjen nettleseren din og, dersom du har en registrert konto, assosiere den med din registrerte konto.</p>
-
-      <p>Vi benytter infokapsler for å forstå og lagre dinne innstillinger til fremtidige besøk.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Forteller vi om noe informasjon til utenforstående parter?</h3>
-
-      <p>Vi hverken selger, bytter, eller på andre måter overfører din personlig identifiserbare informasjon til utenforstående parter. Dette inkluderer ikke tredjeparter som vi stoler på og som hjelper oss med å drifte nettstedet vårt, drifte våre forretninger, eller å yte tjenester til deg, så lenge disse partene sier seg enige i å holde denne informasjonen hemmelig. Vi kan også frigi informasjonen vår dersom vi mener et frigiving er passende for å møte loven, handle i tråd med vår nettstedsretningslinjer, eller å beskytte vår eller andres rettigheter, eiendom, eller trygghet.</p>
-
-      <p>Ditt offentlige innhold kan bli lastet ned av andre tjenere i nettverket. Dine offentlige innlegg og innlegg som kun er for følgere blir levert til tjenerne der følgerne dine holder til, og direktemeldinger blir levert il mottakernes tjenere, i den grad de følgerne eller mottakerne holder på en annen tjener enn denne.</p>
-
-      <p>Når du gir et program autorisasjon til å bruke kontoen din, avhengig av omfanget av tillatelser som du tillater, kan den få tilgang til din offentlige profilinformasjon, din følgingsliste, dine følgere, dine lister, alle dine innlegg, og dine likinger. Programmer kan aldri få tilgang til E-postadressen eller passordet ditt.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Nettstedsbruk av barn</h3>
-
-      <p>Dersom denne tjeneren er i EU eller EØS: Vårt nettsted, produkter og tjenester er alle siktet inn mot folk som er minst 16 år gamle. Dersom du er under 16, sier GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) at du ikke kan bruke dette nettstedet.</p>
-
-      <p>Dersom denne tjeneren er i USA: Vårt nettsted, produkter og tjenester er alle siktet inn mot folk som er minst 16 år gamle. Dersom du er under 16, sier COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) at du ikke kan bruke dette nettstedet.</p>
-
-      <p>Lovmessige krav kan være forskjellige dersom denne tjeneren befinner seg i en annen jurisdiksjon.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Endringer i våre privatlivsretningslinjer</h3>
-
-      <p>Dersom vi bestemmer oss for å endre våre privatlivsretningslinjer, vil vi legge ut endringene på denne siden.</p>
-
-      <p>Dette dokumentet er lisensiert under CC BY-SA. Den engelske originalversjonen ble sist oppdatert den 7. mars 2018. Den norske oversettelsen ble sist oppdatert den 13. desember 2019.</p>
-
-      <p>Opprinnelig modifisert utifra <a href="https://github.com/discourse/discourse">Discourse sine privatlivsretningslinjer</a>.</p>
-    title: "%{instance} Personvern og villkår for bruk av nettstedet"
   themes:
     contrast: Mastodon (Høykontrast)
     default: Mastodon
@@ -1288,6 +1314,7 @@
     formats:
       default: "%-d. %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Legg til
     disable: Skru av
@@ -1304,71 +1331,82 @@
     recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til å gjenopprette tilgang til din konto. <strong>Oppbevar gjenopprettingskodene sikkert</strong>, for eksempel ved å skrive dem ut og gjemme dem på et lurt sted bare du vet om.
     webauthn: Sikkerhetsnøkler
   user_mailer:
+    appeal_approved:
+      action: Gå til kontoen din
+      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
+      subject: Din klage fra %{date} er godkjent
+      title: Klage godkjent
+    appeal_rejected:
+      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
+      subject: Din klage fra %{date} er avvist
+      title: Klage avvist
     backup_ready:
       explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
-    sign_in_token:
-      details: 'Her er detaljene om forsøket:'
-      explanation: 'Vi oppdaget et forsøk på å logge på kontoen fra en ukjent IP-adresse. Hvis dette er deg, vennligst skriv inn sikkerhetskoden nedenfor på påloggingssiden:'
-      further_actions: 'Hvis dette ikke var deg, vennligst endre passordet ditt og aktivere to-faktor autentisering på kontoen din. Du kan gjøre det her:'
-      subject: Bekreft forsøk på å logge inn
-      title: Påloggingsforsøk
+      title: Nedlasting av arkiv
+    suspicious_sign_in:
+      change_password: endre passord
+      details: 'Her er detaljer om påloggingen:'
+      explanation: Vi har oppdaget en pålogging til din konto fra en ny IP-adresse.
+      further_actions_html: Hvis dette ikke var deg, anbefaler vi at du %{action} umiddelbart og aktiverer tofaktorautentisering for å holde kontoen din sikker.
+      subject: Din konto ble tatt i bruk fra en ny IP-adresse
+      title: En ny pålogging
     warning:
+      appeal: Lever en klage
+      appeal_description: Hvis du mener dette er feil, kan du sende inn en klage til personalet i %{instance}.
+      categories:
+        spam: Søppelpost
+        violation: Innholdet bryter følgende retningslinjer for fellesskapet
       explanation:
-        disable: Mens kontoen din er fryst, forblir dine kontodata intakt, men du kan ikke utføre noen handlinger før den har blitt tint opp.
-        sensitive: De opplastede mediefilene og linket vil bli behandlet som sensitive.
-        silence: Mens kontoen din er begrenset, vil bare folk som allerede følger deg se dine tuter på denne tjeneren, og du kan bli ekskludert fra diverse offentlige oppføringer. Men andre kan fortsatt følge deg manuelt.
-        suspend: Kontoen din har blitt suspendert, og alle dine tuter og opplastede media har blitt ugjenkallelig fjernet fra denne tjeneren, og fra tjenere der du hadde følgere.
-      get_in_touch: Du kan svare på denne E-posten for å komme i kontakt med styret i %{instance}.
-      review_server_policies: Gjennomgå serverretningslinjer
-      statuses: 'Spesifikt for å:'
+        delete_statuses: Noen av innleggene dine anses å bryte en eller flere retningslinjer for fellesskapet, og har senere blitt fjernet av moderatorene på %{instance}.
+        disable: Du kan ikke lenger bruke kontoen din, men profilen din og andre data forblir intakt. Du kan be om en sikkerhetskopi av dine data, endre kontoinnstillinger eller slette din konto.
+        mark_statuses_as_sensitive: Noen av dine innlegg har blitt merket som følsomme av moderatorene på %{instance}. Dette betyr at folk må trykke på media i innleggene før en forhåndsvisning blir vist. Du kan merke medier som følsomme når du publiserer i fremtiden.
+        sensitive: Fra nå av, vil alle dine opplastede mediefiler bli merket som følsomme og skjult bak et klikk-advarsel.
+      reason: 'Årsak:'
+      statuses: 'Innlegg angitt:'
       subject:
+        delete_statuses: Dine innlegg på %{acct} har blitt fjernet
         disable: Kontoen din, %{acct}, har blitt fryst
+        mark_statuses_as_sensitive: Dine innlegg på %{acct} har blitt merket som følsomme
         none: Advarsel for %{acct}
-        sensitive: Din konto %{acct} medier har blitt merket som følsom
+        sensitive: Dine innlegg på %{acct} vil fra nå av bli merket som følsomme
         silence: Kontoen din, %{acct}, har blitt begrenset
         suspend: Kontoen din, %{acct}, har blitt suspendert
       title:
+        delete_statuses: Innlegg fjernet
         disable: Kontoen er fryst
+        mark_statuses_as_sensitive: Innlegg merket som følsomt
         none: Advarsel
-        sensitive: Mediet ditt er markert som følsom
+        sensitive: Konto merket som følsom
         silence: Kontoen er begrenset
         suspend: Kontoen er suspendert
     welcome:
       edit_profile_action: Sett opp profil
-      edit_profile_step: Du kan tilpasse din profil ved å laste opp en avatar, overskrift, endre ditt visningsnavn med mer. Hvis du vil godkjenne hvilke personer som får lov til å følge deg kan du låse kontoen.
+      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
       explanation: Her er noen tips for å komme i gang
       final_action: Start postingen
-      final_step: 'Start å poste! Selv uten følgere kan dine offentlige meldinger bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introductions.'
+      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
       full_handle: Ditt fullstendige brukernavn
       full_handle_hint: Dette er hva du forteller venner slik at de kan sende melding eller følge deg fra en annen instanse.
-      review_preferences_action: Endre innstillinger
-      review_preferences_step: Husk å justere dine innstillinger, som hvilke e-poster du ønsker å motta, eller hvor private du ønsker at dine poster skal være som standard. Hvis du ikke har bevegelsessyke kan du skru på automatisk avspilling av GIF-animasjoner.
       subject: Velkommen til Mastodon
-      tip_federated_timeline: Den forente tidslinjen blir konstant matet med meldinger fra Mastodon-nettverket. Men den inkluderer bare personer dine naboer abbonerer på, så den er ikke komplett.
-      tip_following: Du følger din tjeners administrator(er) som standard. For å finne mer interessante personer, sjekk den lokale og forente tidslinjen.
-      tip_local_timeline: Den lokale tidslinjen blir kontant matet med meldinger fra personer på %{instance}. Dette er dine nærmeste naboer!
-      tip_mobile_webapp: Hvis din mobile nettleser tilbyr deg å legge Mastadon til din hjemmeskjerm kan du motta push-varslinger. Det er nesten som en integrert app på mange måter!
-      tips: Tips
       title: Velkommen ombord, %{name}!
   users:
     follow_limit_reached: Du kan ikke følge mer enn %{limit} personer
-    generic_access_help_html: Problemer med å få tilgang til din konto? Du kan kontakte %{email} for assistanse
     invalid_otp_token: Ugyldig to-faktorkode
-    invalid_sign_in_token: Ugyldig sikkerhetskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
     seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
     signed_in_as: 'Innlogget som:'
-    suspicious_sign_in_confirmation: Du ser ikke ut til å ha logget inn fra denne enheten før, og du har ikke logget inn en stund, så vi sender en sikkerhetskode til din e-postadresse for å bekrefte at det er deg.
   verification:
     explanation_html: 'Du kan <strong>bekrefte at du selv er eieren av lenkene i din profilmetadata</strong>. For å gjøre det, må det tillenkede nettstedet inneholde en lenke som fører tilbake til Mastodon-profilen din. Lenken tilbake <strong>må</strong> ha en <code>rel="me"</code>-attributt. Tekstinnholdet til lenken er irrelevant. Her er et eksempel:'
     verification: Bekreftelse
   webauthn_credentials:
     add: Legg til ny sikkerhetsnøkkel
     create:
+      error: Det oppstod et problem med å legge til sikkerhetsnøkkelen. Prøv igjen.
       success: Sikkerhetsnøkkelen din ble vellykket lagt til.
     delete: Slett
     delete_confirmation: Er du sikker på at du vil slette denne sikkerhetsnøkkelen?
+    description_html: Dersom du aktiverer <strong>sikkerhetsnøkkelautentisering</strong>, vil innlogging kreve at du bruker en av sikkerhetsnøklene dine.
     destroy:
       error: Det oppsto et problem med å slette sikkerhetsnøkkelen. Prøv igjen.
       success: Sikkerhetsnøkkelen din ble vellykket slettet.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 8313e0ae4..5677159b6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1,84 +1,26 @@
 ---
 oc:
   about:
-    about_hashtag_html: Vaquí los estatuts publics ligats a <strong>#%{hashtag}</strong>. Podètz interagir amb eles s’avètz un compte ont que siasque sul fediverse.
     about_mastodon_html: Mastodon es un malhum social bastit amb de protocòls liures e gratuits. Es descentralizat coma los corrièls.
-    about_this: A prepaus d’aquesta instància
-    active_count_after: actius
-    active_footnote: Utilizaire actius per mes (UAM)
-    administered_by: 'Administrat per :'
-    api: API
-    apps: Aplicacions per mobil
-    apps_platforms: Utilizatz Mastodon d‘iOS, Android o d’autras plataforma estant
-    browse_directory: Navigatz per l’annuari de perfil e filtratz segon çò qu’aimatz
-    browse_local_posts: Percórrer un flux en dirècte de las publicacions publicas d’aqueste servidor
-    browse_public_posts: Navigatz pel flux public a Mastodon
-    contact: Contacte
     contact_missing: Pas parametrat
     contact_unavailable: Pas disponible
-    discover_users: Descobrissètz de nòvas personas
-    documentation: Documentacion
-    federation_hint_html: Amb un compte sus %{instance} poiretz sègre de personas de qualque siasque servidor Mastodon e encara mai.
-    get_apps: Ensajatz una aplicacion mobil
     hosted_on: Mastodon albergat sus %{domain}
-    learn_more: Ne saber mai
-    privacy_policy: Politica de confidencialitat
-    rules: Règlas del servidor
-    see_whats_happening: Agachatz çò qu’arriba
-    server_stats: 'Estatisticas del servidor :'
-    source_code: Còdi font
-    status_count_after:
-      one: estatut
-      other: estatuts
-    status_count_before: qu’an escrich
-    tagline: Seguètz d’amics e trobatz-ne de nòus
-    terms: Condicions d’utilizacion
-    unavailable_content: Contengut pas disponible
-    unavailable_content_description:
-      domain: Servidor
-      reason: 'Motiu :'
-      rejecting_media: 'Los fichièrs mèdias d’aquestes servidors estant seràn pas tractats o gardats e pas cap de miniatura serà pas mostrada, demanda de clicar sul fichièr original :'
-      rejecting_media_title: Mèdias filtrats
-      silenced_title: Servidors muts
-      suspended_title: Servidors suspenduts
-    user_count_after:
-      one: utilizaire
-      other: utilizaires
-    user_count_before: Ostal de
-    what_is_mastodon: Qu’es Mastodon ?
+    title: A prepaus
   accounts:
-    choices_html: 'Recomandacions de %{name} :'
-    endorsements_hint: Podètz recomandar personas que seguètz a partir de l’interfàcia web, apreissaràn aquí.
-    featured_tags_hint: Podètz indicar d’etiquetas que mostrarem aquí.
     follow: Sègre
     followers:
       one: Seguidor
       other: Seguidors
     following: Abonaments
-    joined: Arribèt en %{date}
     last_active: darrièra activitat
     link_verified_on: La proprietat d’aqueste ligam foguèt verificada lo %{date}
-    media: Mèdias
-    moved_html: "%{name} a mudat a %{new_profile_link} :"
-    network_hidden: Aquesta informacion es pas disponibla
-    never_active: Jamai
     nothing_here: I a pas res aquí !
-    people_followed_by: Lo monde que %{name} sèc
-    people_who_follow: Lo monde que sègon %{name}
     pin_errors:
       following: Vos cal d’en primièr sègre las personas que volètz promòure
     posts:
       one: Tut
       other: Tuts
     posts_tab_heading: Tuts
-    posts_with_replies: Tuts e responsas
-    roles:
-      admin: Admin
-      bot: Robòt
-      group: Grop
-      moderator: Moderador
-    unavailable: Perfil indisponible
-    unfollow: Quitar de sègre
   admin:
     account_actions:
       action: Realizar una accion
@@ -86,25 +28,26 @@ oc:
     account_moderation_notes:
       create: Crear una nòta
       created_msg: Nòta de moderacion ben creada !
-      delete: Suprimir
       destroyed_msg: Nòta de moderacion ben suprimida !
     accounts:
       add_email_domain_block: Metre lo domeni del corrièl en lista negra
       approve: Aprovar
-      approve_all: O validar tot
       are_you_sure: Sètz segur ?
       avatar: Avatar
       by_domain: Domeni
       change_email:
-        changed_msg: Adreça corrèctament cambiada !
         current_email: Adreça actuala
         label: Cambiar d’adreça
         new_email: Novèla adreça
         submit: Cambiar l’adreça
         title: Cambiar l’adreça a %{username}
+      change_role:
+        label: Cambiar lo ròtle
+        no_role: Cap de ròtle
       confirm: Confirmar
       confirmed: Confirmat
       confirming: Confirmacion
+      custom: Personalizar
       delete: Suprimir donadas
       deleted: Suprimits
       demote: Retrogradar
@@ -138,7 +81,6 @@ oc:
         active: Actius
         all: Totes
         pending: En espèra
-        silenced: Resconduts
         suspended: Suspenduts
         title: Moderacion
       moderation_notes: Nòtas de moderacion
@@ -155,7 +97,6 @@ oc:
       push_subscription_expires: Fin de l’abonament PuSH
       redownload: Actualizar lo perfil
       reject: Regetar
-      reject_all: O regetar tot
       remove_avatar: Supriir l’avatar
       remove_header: Levar la bandièra
       resend_confirmation:
@@ -165,14 +106,12 @@ oc:
       reset: Reïnicializar
       reset_password: Reïnicializar lo senhal
       resubscribe: Se tornar abonar
-      role: Autorizacions
-      roles:
-        admin: Administrator
-        moderator: Moderador
-        staff: Personnal
-        user: Uitlizaire
+      role: Ròtle
       search: Cercar
       search_same_ip: Autres utilizaires amb la meteissa IP
+      security_measures:
+        only_password: Sonque senhal
+        password_and_2fa: Senhal e 2FA
       sensitive: Sensible
       sensitized: marcar coma sensible
       shared_inbox_url: URL de recepcion partejada
@@ -183,8 +122,8 @@ oc:
       silenced: Rescondut
       statuses: Estatuts
       subscribe: S’abonar
+      suspend: Suspendre
       suspended: Suspendut
-      time_in_queue: En espèra a la fila %{time}
       title: Comptes
       unconfirmed_email: Adreça pas confirmada
       undo_sensitized: Desmarcar coma sensible
@@ -197,6 +136,7 @@ oc:
       whitelisted: Mes en lista blanca
     action_logs:
       action_types:
+        approve_user: Aprobar l’utilizaire
         assigned_to_self_report: Assignar lo rapòrt
         change_email_user: Cambiar l’adreça de l’utilizaire
         confirm_user: Confirmar l’utilizaire
@@ -226,7 +166,6 @@ oc:
         update_announcement: Actualizar l’anóncia
         update_custom_emoji: Actualizar l’emoji personalizat
         update_status: Actualizar l’estatut
-      deleted_status: "(estatut suprimit)"
       empty: Cap de jornal pas trobat.
       filter_by_action: Filtrar per accion
       filter_by_user: Filtrar per utilizaire
@@ -265,7 +204,7 @@ oc:
       enable: Activar
       enabled: Activat
       enabled_msg: Aqueste emoji es ben activat
-      image_hint: PNG cap a 50Ko
+      image_hint: PNG o GIF fins a %{size}
       list: Listar
       listed: Listat
       new:
@@ -285,15 +224,7 @@ oc:
       interactions: interraccions
       media_storage: Emmagazinatge dels mèdias
       new_users: utilizaire novèl
-      pending_reports_html:
-        one: "<strong>1</strong> senhalament en espèra"
-        other: "<strong>%{count}</strong> senhalaments en espèra"
-      pending_tags_html:
-        one: "<strong>1</strong> etiqueta en espèra"
-        other: "<strong>%{count}</strong> etiquetas en espèra"
-      pending_users_html:
-        one: "<strong>1</strong> utilizaire en espèra"
-        other: "<strong>%{count}</strong> utilizaires en espèra"
+      opened_reports: senhalaments dubèrts
       resolved_reports: senhalament resolguts
       software: Logicial
       space: Utilizacion de l’espaci
@@ -317,9 +248,7 @@ oc:
         create: Crear blocatge
         hint: Lo blocatge empacharà pas la creacion de compte dins la basa de donadas, mai aplicarà la moderacion sus aquestes comptes.
         severity:
-          desc_html: "<strong>Silenci</strong> farà venir invisibles los estatuts del compte al monde que son pas de seguidors. <strong>Suspendre</strong> levarà tot lo contengut del compte, los mèdias e las donadas de perfil. Utilizatz <strong>Cap</strong> se volètz regetar totes los mèdias."
           noop: Cap
-          silence: Silenci
           suspend: Suspendre
         title: Nòu blocatge domeni
       private_comment: Comentari privat
@@ -329,30 +258,13 @@ 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
-      rejecting_media: regeta los fichièrs multimèdias
-      rejecting_reports: regeta los senhalements
-      severity:
-        silence: mes en silenci
-        suspend: suspendut
-      show:
-        affected_accounts:
-          one: Un compte de la basa de donadas tocat
-          other: "%{count} compte de la basa de donadas tocat"
-        retroactive:
-          silence: Levar lo silenci de totes los comptes d’aqueste domeni
-          suspend: Levar la suspension de totes los comptes d’aqueste domeni
-        title: Restablir lo blocatge de domeni de %{domain}
-        undo: Restablir
       undo: Restablir
       view: Veire lo blocatge de domeni
     email_domain_blocks:
       add_new: Ajustar
       created_msg: Blocatge del domeni de corrièl ben plaçat
       delete: Suprimir
-      destroyed_msg: Blocatge del domeni de corrièl ben levat
       domain: Domeni
-      empty: Cap de domeni de corrièl es pas en lista negra actualament.
-      from_html: de %{domain}
       new:
         create: Crear un blocatge
         title: Nòu blocatge de domeni de corrièl
@@ -361,11 +273,12 @@ oc:
       language: Per lenga
       status: Estat
     instances:
+      availability:
+        title: Disponibilitat
       by_domain: Domeni
+      dashboard:
+        instance_languages_dimension: Lengas principalas
       delivery_available: Liurason disponibla
-      known_accounts:
-        one: "%{count} compte conegut"
-        other: "%{count} comptes coneguts"
       moderation:
         all: Totas
         limited: Limitat
@@ -399,8 +312,6 @@ oc:
       new:
         title: Crear una règlas IP novèla
       title: Règlas IP
-    pending_accounts:
-      title: Comptes en espèra (%{count})
     relationships:
       title: Relacions de %{acct}
     relays:
@@ -427,13 +338,12 @@ oc:
         notes:
           one: "%{count} nòta"
           other: "%{count} nòtas"
-        reports:
-          one: "%{count} senhalament"
-          other: "%{count} senhalaments"
       action_taken_by: Mesura menada per
       are_you_sure: Es segur ?
       assign_to_self: Me l’assignar
       assigned: Moderador assignat
+      by_target_domain: Domeni del compte senhalat
+      category: Categoria
       comment:
         none: Pas cap
       created_at: Creacion
@@ -452,134 +362,76 @@ oc:
       resolved: Resolgut
       resolved_msg: Rapòrt corrèctament resolgut !
       status: Estatut
-      target_domain: Domeni del compte senhalat
       title: Senhalament
       unassign: Levar
       unresolved: Pas resolgut
       updated_at: Actualizat
+      view_profile: Veire lo perfil
     rules:
       title: Règlas del servidor
     settings:
-      activity_api_enabled:
-        desc_html: Nombre d’estatuts publicats, d’utilizaires actius e de novèlas inscripcions en rapòrt setmanièr
-        title: Publicar las estatisticas totalas de l’activitat dels utilizaires
-      bootstrap_timeline_accounts:
-        desc_html: Separatz los noms d’utilizaire amb de virgula. Pas que los comptes locals e pas clavats foncionaràn. Se lo camp es void los admins seràn selecionats.
-        title: Per defaut los nòuvenguts sègon
-      contact_information:
-        email: Picatz una adreça de corrièl
-        username: Picatz un nom d’utilizaire
-      custom_css:
-        desc_html: Modificar l’estil amb una fuèlha CSS cargada sus cada pagina
-        title: CSS personalizada
-      default_noindex:
-        desc_html: Tòca totes los utilizaires qu’an pas cambiat lo paramètre
+      about:
+        title: A prepaus
+      appearance:
+        title: Aparéncia
+      discovery:
+        follow_recommendations: Recomandacions d’abonaments
+        profile_directory: Annuari de perfils
+        public_timelines: Fluxes d’actualitats publics
+        title: Descobèrta
+        trends: Tendéncias
       domain_blocks:
         all: A tot lo monde
         disabled: A degun
-        title: Mostrar los blocatges de domeni
         users: Als utilizaires locals connectats
-      domain_blocks_rationale:
-        title: Mostrar lo rasonament
-      hero:
-        desc_html: Mostrat en primièra pagina. Almens 600x100px recomandat. S’es pas configurat l’imatge del servidor serà mostrat
-        title: Imatge de l’eròi
-      mascot:
-        desc_html: Mostrat sus mantun pagina. Almens 293×205px recomandat. S’es pas configurat, mostrarem la mascòta per defaut
-        title: Imatge de la mascòta
-      peers_api_enabled:
-        desc_html: Noms de domeni qu’aqueste servidor a trobats pel fediverse
-        title: Publicar la lista dels servidors coneguts
-      preview_sensitive_media:
-        desc_html: Los apercebuts dels ligams sus los autres sites mostraràn una vinheta encara que lo mèdia siá marcat coma sensible
-        title: Mostrar los mèdias sensibles dins los apercebuts OpenGraph
-      profile_directory:
-        desc_html: Permet als utilizaires d’èsser trobats
-        title: Activar l’annuari de perfils
-      registrations:
-        closed_message:
-          desc_html: Mostrat sus las pagina d’acuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML
-          title: Messatge de barradura de las inscripcions
-        deletion:
-          desc_html: Autorizar lo monde a suprimir lor compte
-          title: Possibilitat de suprimir lo compte
-        min_invite_role:
-          disabled: Degun
-          title: Autorizat amb invitacions
       registrations_mode:
         modes:
           approved: Validacion necessària per s’inscriure
           none: Degun pòt pas se marcar
           open: Tot lo monde se pòt marcar
-        title: Mòdes d’inscripcion
-      show_known_fediverse_at_about_page:
-        desc_html: Un còp activat mostrarà los tuts de totes los fediverse dins l’apercebut. Autrament mostrarà pas que los tuts locals.
-        title: Mostrar los fediverse coneguts dins l’apercebut del flux
-      show_staff_badge:
-        desc_html: Mostrar lo badge Personal sus la pagina de perfil
-        title: Mostrar lo badge personal
-      site_description:
-        desc_html: Paragraf d’introduccion sus la pagina d’acuèlh. Explicatz çò que fa diferent aqueste servidor Mastodon e tot çò qu’es important de dire. Podètz utilizare de balises HTML, en particular <code>&lt;a&gt;</code> e<code>&lt;em&gt;</code>.
-        title: Descripcion del servidor
-      site_description_extended:
-        desc_html: Un bon lòc per las règles de compòrtament e d’autras causas que fan venir vòstre servidor diferent. Podètz utilizar de balisas HTML
-        title: Descripcion espandida del site
-      site_short_description:
-        desc_html: Mostrat dins la barra laterala e dins las meta balisas. Explica çò qu’es Mastodon e perque aqueste servidor es especial en un solet paragraf. S’es void, serà garnit amb la descripcion del servidor.
-        title: Descripcion corta del servidor
-      site_terms:
-        desc_html: Afichada sus la pagina de las condicions d’utilizacion<br>Podètz utilizar de balisas HTML
-        title: Politica de confidencialitat del site
-      site_title: Títol del servidor
-      thumbnail:
-        desc_html: Servís pels apercebuts via OpenGraph e las API. Talha de 1200x630px recomandada
-        title: Miniatura del servidor
-      timeline_preview:
-        desc_html: Mostrar lo flux public sus la pagina d’acuèlh
-        title: Apercebut flux public
-      title: Paramètres del site
-      trends:
-        title: Etiquetas tendéncia
+      title: Paramètres del servidor
     site_uploads:
       delete: Suprimir lo fichièr enviat
     statuses:
+      account: Autor
+      application: Aplicacion
       back_to_account: Tornar a la pagina Compte
-      batch:
-        delete: Suprimir
-        nsfw_off: Marcar coma pas sensible
-        nsfw_on: Marcar coma sensible
       deleted: Suprimits
-      failed_to_execute: Fracàs
+      language: Lenga
       media:
         title: Mèdia
-      no_media: Cap de mèdia
       no_status_selected: Cap d’estatut pas cambiat estant que cap èra pas seleccionat
       title: Estatuts del compte
+      visibility: Visibilitat
       with_media: Amb mèdia
     system_checks:
       rules_check:
         action: Gerir las règlas servidor
         message_html: Avètz pas definida cap de règla.
     tags:
-      accounts_today: Utilizacions unicas uèi
-      accounts_week: Utilizacions unicas aquesta setmana
-      last_active: Darrièra activitat
-      most_popular: Mai popularas
-      most_recent: Mai recentas
-      name: Etiqueta
       review: Repassar l’estatut
-      reviewed: Repassadas
-      title: Etiquetas
-      trending_right_now: Actualament en tendéncia
-      unique_uses_today: "%{count} publicacions uèi"
-      unreviewed: Pas repassadas
       updated_msg: Paramètres d’etiquetas corrèctament actualizats
     title: Administracion
+    trends:
+      statuses:
+        title: Publicacions endavant
+      tags:
+        current_score: Marca actuala %{score}
+        dashboard:
+          tag_languages_dimension: Lengas principalas
+          tag_servers_dimension: Servidors principals
     warning_presets:
       add_new: N’ajustar un nòu
       delete: Escafar
       edit_preset: Modificar lo tèxt predefinit d’avertiment
       title: Gerir los tèxtes predefinits
+    webhooks:
+      delete: Suprimir
+      disable: Desactivar
+      disabled: Desactivat
+      enable: Activar
+      enabled: Actiu
+      events: Eveniments
   admin_mailer:
     new_pending_account:
       body: Los detalhs del nòu compte son çai-jos. Podètz validar o regetar aquesta demanda.
@@ -588,8 +440,6 @@ oc:
       body: "%{reporter} a senhalat %{target}"
       body_remote: Qualqu’un de %{domain} senhalèt %{target}
       subject: Novèl senhalament per %{instance} (#%{id})
-    new_trending_tag:
-      subject: Nòva etiqueta per repassar sus %{instance} (#%{name})
   aliases:
     add_new: Crear un alias
     remove: Desligar l’alias
@@ -614,16 +464,12 @@ oc:
   applications:
     created: Aplicacion ben creada
     destroyed: Aplication corrcètament suprimida
-    invalid_url: L’URL donada es invalida
     regenerate_token: Tornar generar lo geton d’accès
     token_regenerated: Geton d’accès ben regenerat
     warning: Mèfi ! Agachatz de partejar aquela donada amb degun !
     your_token: Vòstre geton d’accès
   auth:
-    apply_for_account: Demandar una invitacion
     change_password: Senhal
-    checkbox_agreement_html: Accepti las <a href="%{rules_path}" target="_blank">règlas del servidor</a> e <a href="%{terms_path}" target="_blank">los tèrmes del servici</a>
-    checkbox_agreement_without_rules_html: Soi d’acòrdi amb las <a href="%{terms_path}" target="_blank">condicions d’utilizacion</a>
     delete_account: Suprimir lo compte
     delete_account_html: Se volètz suprimir vòstre compte, podètz <a href="%{path}">o far aquí</a>. Vos demandarem que confirmetz.
     description:
@@ -632,11 +478,14 @@ oc:
     didnt_get_confirmation: Avètz pas recebut las instruccions de confirmacion ?
     forgot_password: Senhal oblidat ?
     invalid_reset_password_token: Lo geton de reïnicializacion es invalid o acabat. Tornatz demandar un geton se vos plai.
+    link_to_webauth: Utilizar un aparelh de claus de seguretat
+    log_in_with: Connexion amb
     login: Se connectar
     logout: Se desconnectar
     migrate_account: Mudar endacòm mai
     migrate_account_html: Se volètz mandar los visitors d’aqueste compte a un autre, podètz<a href="%{path}"> o configurar aquí</a>.
     or_log_in_with: O autentificatz-vos amb
+    privacy_policy_agreement_html: Ai legit e accepti la <a href="%{privacy_policy_path}" target="_blank">politica de confidencialitat</a>
     providers:
       cas: CAS
       saml: SAML
@@ -651,7 +500,6 @@ oc:
     status:
       account_status: Estat del compte
       functional: Vòstre compte es complètament foncional.
-    trouble_logging_in: Problèmas de connexion ?
     use_security_key: Utilizar clau de seguretat
   authorize_follow:
     already_following: Seguètz ja aqueste compte
@@ -701,10 +549,10 @@ oc:
       more_details_html: Per mai d’informacion, vejatz la <a href="%{terms_path}">politica de confidencialitat</a>.
       username_available: Vòstre nom d’utilizaire serà disponible de nòu
       username_unavailable: Vòstre nom d’utilizaire demorarà pas disponible
-  directories:
-    directory: Annuari de perfils
-    explanation: Trobar d’utilizaires segon lor interèsses
-    explore_mastodon: Explorar %{title}
+  disputes:
+    strikes:
+      title_actions:
+        none: Avertiment
   domain_validator:
     invalid_domain: es pas un nom de domeni valid
   errors:
@@ -752,53 +600,40 @@ oc:
       public: Flux public
       thread: Conversacions
     edit:
+      add_keyword: Apondre un mot clau
+      keywords: Mots clau
       title: Modificar lo filtre
     errors:
       invalid_context: Cap de contèxte o contèxte invalid fornit
-      invalid_irreversible: Lo filtratge irreversible fonciona pas qu’amb lo flux d’actualitat o en contèxte de notificacion
     index:
       delete: Suprimir
       empty: Avètz pas cap de filtre.
+      expires_in: Expira d’aquí %{distance}
+      expires_on: Expira lo %{date}
+      keywords:
+        one: "%{count} mot clau"
+        other: "%{count} mots clau"
+      statuses:
+        one: "%{count} publicacion"
+        other: "%{count} publicacions"
       title: Filtres
     new:
       title: Ajustar un nòu filtre
   footer:
-    developers: Desvolopaires
-    more: Mai…
-    resources: Ressorsas
     trending_now: Tendéncia del moment
   generic:
     all: Tot
     changes_saved_msg: Cambiaments ben realizats !
     copy: Copiar
     delete: Suprimir
-    no_batch_actions_available: Cap d’accion de massa pas disponibla sus aquesta pagina
     order_by: Triar per
     save_changes: Salvar los cambiaments
+    today: uèi
     validation_errors:
       one: I a quicòm que truca ! Mercés de corregir l’error çai-jos
       other: I a quicòm que truca ! Mercés de corregir las %{count} errors çai-jos
   html_validator:
     invalid_markup: 'conten un balisatge HTML invalid : %{error}'
-  identity_proofs:
-    active: Actiu
-    authorize: Òc, autorizar
-    authorize_connection_prompt: Autorizar aquesta connexion criptografica ?
-    errors:
-      failed: La connexion criptografica a fracassat. Ensajatz tornamai de %{provider} estant.
-      keybase:
-        invalid_token: Los getons Keybase son de hashes de signaturas e devon èsser de caractèrs 66 hex
-        verification_failed: Keybase reconeis pas aqueste geton coma signatura de l’utilizaire Keybase %{kb_username}. Ensajatz tornamai de Keybase estant.
-      wrong_user: Creacion impossibla de la pròva per %{proving} en estant connectat coma %{current}. Connectatz-vos coma %{proving} e ensajatz tornamai.
-    explanation_html: Aquí podètz connectar d’un biais criptografic vòstras identitats, coma un perfil Keybase. Aquò permet al monde de vos enviar de messatges chifrats e fisar al contengut que lor enviatz.
-    i_am_html: Soi %{username} a %{service}.
-    identity: Identitat
-    inactive: Inactiu
-    publicize_checkbox: 'E enviatz lo tut seguent :'
-    publicize_toot: 'Es provat ! Soi %{username} de %{service} : %{url}'
-    remove: Tirar la pròva del compte
-    status: Estatut de verificacion
-    view_proof: Veire la pròva
   imports:
     modes:
       merge: Fondre
@@ -814,7 +649,6 @@ oc:
       following: Lista de monde que seguètz
       muting: Lista de monde que volètz pas legir
     upload: Importar
-  in_memoriam_html: En Memòria.
   invites:
     delete: Desactivar
     expired: Expirat
@@ -840,6 +674,11 @@ oc:
   lists:
     errors:
       limit: Avètz atengut lo maximum de listas
+  login_activities:
+    authentication_methods:
+      password: senhal
+      sign_in_token: còdi de seguretat mail
+      webauthn: claus de seguretat
   media_attachments:
     validations:
       images_and_video: Se pòt pas ajustar una vidèo a un estatut que ten ja d’imatges
@@ -854,6 +693,7 @@ oc:
       on_cooldown: Sètz en temps de recargament
     followers_count: Seguidors al moment de mudar
     incoming_migrations: Mudar d’un compte diferent
+    incoming_migrations_html: Per venir d’un autre compte cap a aqueste, vos cal d’en primièr <a href="%{path}">crear un alias de compte</a>.
     moved_msg: Vòstre compte manda ara a %{acct} e vòstres seguidors son desplaçats.
     not_redirecting: Vòstre compte manda pas enlòc pel moment.
     past_migrations: Migracions passadas
@@ -867,17 +707,9 @@ oc:
   moderation:
     title: Moderacion
   notification_mailer:
-    digest:
-      action: Veire totas las notificacions
-      body: Trobatz aquí un resumit dels messatges qu’avètz mancats dempuèi vòstra darrièra visita lo %{since}
-      mention: "%{name} vos a mencionat dins :"
-      new_followers_summary:
-        one: Avètz un nòu seguidor dempuèi vòstra darrièra visita ! Ouà !
-        other: Avètz %{count} nòus seguidors dempuèi vòstra darrièra visita ! Qué crane !
-      subject:
-        one: "Una nòva notificacion dempuèi vòstra darrièra visita \U0001F418"
-        other: "%{count} nòvas notificacions dempuèi vòstra darrièra visita \U0001F418"
-      title: Pendent vòstra abséncia…
+    admin:
+      sign_up:
+        subject: "%{name} se marquèt"
     favourite:
       body: "%{name} a mes vòstre estatut en favorit :"
       subject: "%{name} a mes vòstre estatut en favorit"
@@ -896,12 +728,16 @@ oc:
       body: "%{name} vos a mencionat dins :"
       subject: "%{name} vos a mencionat"
       title: Novèla mencion
+    poll:
+      subject: Un sondatge de %{name} es terminat
     reblog:
       body: "%{name} a tornat partejar vòstre estatut :"
       subject: "%{name} a tornat partejar vòstre estatut"
       title: Novèl partatge
     status:
       subject: "%{name} ven de publicar"
+    update:
+      subject: "%{name} modifiquèt sa publicacion"
   notifications:
     email_events: Eveniments per las notificacions per corrièl
     email_events_hint: 'Seleccionatz los eveniments que volètz recebre :'
@@ -933,6 +769,8 @@ oc:
     other: Autre
     posting_defaults: Valors per defaut de las publicacions
     public_timelines: Fluxes d’actualitats publics
+  privacy_policy:
+    title: Politica de confidencialitat
   reactions:
     errors:
       limit_reached: La limita de las reaccions diferentas es estada atenguda
@@ -954,22 +792,9 @@ oc:
     remove_selected_follows: Quitar de sègre las personas seleccionadas
     status: Estat del compte
   remote_follow:
-    acct: Picatz vòstre utilizaire@domeni que que volètz utilizar per sègre aqueste utilizaire
     missing_resource: URL de redireccion pas trobada
-    no_account_html: Avètz pas cap de compte ? Podètz <a href='%{sign_up_path}' target='_blank'>vos marcar aquí</a>
-    proceed: Clicatz per sègre
-    prompt: 'Sètz per sègre :'
-    reason_html: "<strong>Perque aquesta etapa es necessària ?</strong><code>%{instance}</code> es benlèu pas lo servidor ont vos marquèretz, doncas nos cal vos redirigir cap a vòstre prim servidor per començar."
-  remote_interaction:
-    favourite:
-      proceed: Contunhar per metre en favorit
-      prompt: 'Volètz metre en favorit aqueste tut :'
-    reblog:
-      proceed: Contunhar per repartejar
-      prompt: 'Volètz repartejar aqueste tut :'
-    reply:
-      proceed: Contunhar per respondre
-      prompt: 'Volètz respondre a aqueste tut :'
+  rss:
+    content_warning: 'Avís de contengut :'
   scheduled_statuses:
     over_daily_limit: Avètz passat la limita de %{limit}  tuts programats per aquel jorn
     over_total_limit: Avètz passat la limita de %{limit}  tuts programats
@@ -979,7 +804,6 @@ oc:
     browser: Navigator
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -993,7 +817,6 @@ oc:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
       weibo: Weibo
     current_session: Session en cors
     description: "%{browser} sus %{platform}"
@@ -1002,8 +825,6 @@ oc:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1027,7 +848,6 @@ oc:
     edit_profile: Modificar lo perfil
     export: Exportar de donadas
     featured_tags: Etiquetas en avant
-    identity_proofs: Pròvas d’identitat
     import: Importar de donadas
     import_and_export: Import e export
     migrate: Migracion de compte
@@ -1035,6 +855,7 @@ oc:
     preferences: Preferéncias
     profile: Perfil
     relationships: Abonaments e seguidors
+    statuses_cleanup: Supression auto de las publicacions
     two_factor_authentication: Autentificacion en dos temps
     webauthn_authentication: Claus de seguretat
   statuses:
@@ -1051,16 +872,18 @@ oc:
         other: "%{count} vidèos"
     boosted_from_html: Partejat de %{acct_link}
     content_warning: 'Avertiment de contengut : %{warning}'
+    default_language: Parièr que la lenga d’interfàcia
     disallowed_hashtags:
       one: 'conten una etiqueta desactivada : %{tags}'
       other: 'conten las etiquetas desactivadas : %{tags}'
-    language_detection: Detectar automaticament la lenga
+    edited_at_html: Modificat %{date}
+    errors:
+      in_reply_not_found: La publicacion que respondètz sembla pas mai exisitir.
     open_in_web: Dobrir sul web
     over_character_limit: limit de %{max} caractèrs passat
     pin_errors:
       limit: Avètz ja lo maximum de tuts penjats
       ownership: Se pòt pas penjar lo tut de qualqu’un mai
-      private: Se pòt pas penjar los tuts pas publics
       reblog: Se pòt pas penjar un tut partejat
     poll:
       total_people:
@@ -1077,6 +900,7 @@ oc:
     sign_in_to_participate: Inscrivètz-vos per participar a la conversacion
     title: '%{name} : "%{quote}"'
     visibilities:
+      direct: Dirècte
       private: Seguidors solament
       private_long: Mostrar pas qu’als seguidors
       public: Public
@@ -1085,100 +909,43 @@ oc:
       unlisted_long: Tot lo monde pòt veire mai serà pas visible sul flux public
   statuses_cleanup:
     enabled: Supression automatica de publicacions ancianas
+    enabled_hint: Suprimís automaticament vòstras publicacions quand correspondon al critèri d’atge causit, levat se correspondon tanben a las excepcions çai-jos
+    explanation: Perque la supression es una operacion costosa en ressorsa, es realizat doçament quand lo servidor es pas ocupat a quicòm mai. Per aquò, vòstras publicacions seràn benlèu pas suprimidas aprèp aver atengut lo critèri d’atge.
+    ignore_favs: Ignorar los favorits
+    ignore_reblogs: Ignorar los partatges
+    interaction_exceptions: Excepcions basadas sus las interaccions
     keep_direct: Gardar los messatges dirèctes
+    keep_direct_hint: Suprimís pas vòstres messatges dirèctes
     keep_media: Gardar las publicacions amb pèça-junta
+    keep_media_hint: Suprimís pas vòstras publicacions s’an de mèdias junts
     keep_pinned: Gardar las publicacions penjadas
+    keep_pinned_hint: Suprimís pas vòstras publicacions penjadas
+    keep_polls: Gardar los sondatges
+    keep_polls_hint: Suprimir pas vòstres sondatges
+    keep_self_bookmark: Gardar las publicacions que metèretz en favorit
+    keep_self_bookmark_hint: Suprimís pas vòstras publicacions se las avètz mesas en marcapaginas
+    keep_self_fav: Gardar las publicacions que metèretz en favorit
+    keep_self_fav_hint: Suprimís pas vòstras publicacions se las avètz mesas en favorits
+    min_age:
+      '1209600': 2 setmanas
+      '15778476': 6 meses
+      '2629746': 1 mes
+      '31556952': 1 an
+      '5259492': 2 meses
+      '604800': 1 setmana
+      '63113904': 2 ans
+      '7889238': 3 meses
+    min_age_label: Sulhet d’ancianetat
+    min_favs: Gardar al mens las publicacion en favorit
+    min_favs_hint: Suprimís pas las publicacions qu’an recebut al mens aquesta quantitat de favorits. Daissar blanc per suprimir las publicacion quina quantitat de favorits qu’ajan
+    min_reblogs: Gardar las publicacions partejadas al mens
+    min_reblogs_hint: Suprimís pas vòstras publicacions qu’an agut aqueste nombre de partiment. Daissar blanc per suprimir las publicacions sens far cas als partiments
   stream_entries:
     pinned: Tut penjat
     reblogged: a partejat
     sensitive_content: Contengut sensible
   tags:
     does_not_match_previous_name: correspond pas al nom precedent
-  terms:
-    body_html: |
-      <h2>Politica de confidencialitat</h2>
-      <h3 id="collect">Quinas informacions reculhèm ?</h3>
-
-      <ul>
-      <li><em>Inforacions de basa del compte</em> :  se vos marcatz sus aqueste servidor, vos podèm demandar de picar un escais-nom, una adreça de corrièl e un senhal. Podètz tanben ajustar d’informacions de perfil addicionalas coma un nom de far veire, una biografia, un imatge de perfil e una banièra. L’escais-nom, lo nom d’afichatge, la biografia, l’imatge de perfil e la banièra son totjorn indicats per èsser vistes publicament.</li>
-      <li><em>Publicacions, abonaments e autras informacions publicas</em> : La lista del monde que seguètz es visibla publicament, tot parièr per vòstres seguidors. Quand enviatz un messatge, la data e l’ora son gardats, l’aplicacion qu’avètz utilizada tanben. Los messatges pòdon conténer de mèdias juntats coma d’imatge e vidèos. Las publicacions publicas e pas listadas son disponiblas publicament. Quand penjatz una publicacion per vòstre perfil, aquò tanben es visible per tot lo monde. Vòstras publicacions son mandadas a vòstre seguidors, dins qualques cases aquò significa que passaràn per diferents servidors e seràn copiadas e gardadas sus aqueles servidors. Quand escafatz de publicacions, aquò es tanben mandat a vòstre seguidors. L’accion de partejar o d’ajustar als favorits una publicacion es totjorn quicòm de public.</li>
-      <li><em>Publicacions dirèctas e solament pels seguidors</em> :</li> totas las publicacions son gardadas e tractadas pel servidor. Las publicacions pas que per vòstres seguidors son enviadas a vòstres seguidors e las personas mencionadas dedins, las publicacions dirèctas son pas qu’enviadas a las personas mencionadas. Dins qualques cases aquò significa que passaràn per diferents servidors, copiadas e gardadas sus eles. Ensagem de limitar l’accès a aquelas publicacions a monde autorizat, mas los demai servidors pòdon fracar a far parièr. A causa d’aquò es fòrça important de repassar los servidors d’apertenéncia de vòstres seguidors. Podètz activar una opcion per autorizar o regetar una demanda de seguiment dins los paramètres. <em>Vos cal pas oblidar que’ls administrators dels servidors e dels servidors de recepcion pòdon veire aqueles messatges</em>, e que’ls destinataris pòdon realizar de captura d’ecran, copiar e tornar partejar los messatges.<em>Partegetz pas cap informacion perilhosa sus Mastodon</em><li>.
-      <li><em>Adreças IP e autras metadonadas</em> : quand vos connectatz, enregistrem l’adreça IP qu’utilizatz per establir la connexion, e tanben lo nom de vòstre navigador. Totas las sessions de connexion son disponiblas per que las repassetz e tiretz dins los paramètres. Las darrièras adreças IP son salvagardas fins a 12 meses. Podèm tanben gardar de jornals d’audit del servidor que pòdon conténer las adreças IP de cada requèstas mandadas a nòstre servidor.</li>
-
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Qué fasèm de vòstras informacions ?</h3>
-
-      <p>Totas las informacions que collectem de vos pòdon servir dins los cases seguents :</p>
-
-      <ul>
-      <li>Per provesir la foncionament màger de Mastodon. Podètz pas qu’interagir amb lo contengut del monde e de vòstras publicacions quand sètz connectat. Per exemple, avètz la possibilitat de sègre de monde per veire lors publicacions amassadas dins vòstre flux d’actualitat personalizat.</li>
-      <li>Per ajudar la moderacion de la comunitat, per exemple en comparant vòstra adreça IP amb d’autras per determinar d’ensages de contornament de bandiment e d’autras violéncias.</li>
-      <li>Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Cossí protegèm vòstras informacions ?</h3>
-
-      <p>Apliquem tota una mena de mesuras de seguretat per manténer la fisança de vòstras informacions personalas quand las picatz, mandatz, o i accedètz. Entre aquelas, vòstre session de navigacion, coma lo trafic entre vòstra aplicacion e l’API, son securizats amb SSL e lo senhal es copat en tròces en emplegar un algorisme fòrt a sens unic. Podètz activar l’autentificacion en dos temps pels accèsses futurs a vòstre compte.</p>
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Quala es nòstra politica de conservacion de donadas ?</h3>
-
-      <p>Farem esfòrces per :</p>
-
-      <ul>
-      <li>Gardar los jornals del servidor que contenon las adreças IP de totas las demandas al servidor pas mai de 90 jorns.</li>
-      <li>Gardar las adreças IP ligadas als utilizaires e lors publicacions pas mai de 12 messes.</li>
-      </ul>
-
-      <p>Podètz demandar e telecargar vòstre archiu de contengut, amb vòstras publicacions, los mèdias enviats, l’imatge de perfil e l’imatge de bandièra.</p>
-
-      <p>Podètz suprimir sens anullacion possibla vòstre compte quand volgatz.</p>
-
-      <hr class="spacer"/>
-
-
-      <h3 id="cookies">Utilizem de cookies ?</h3>
-
-      <p>Òc-ben. Los cookies son de pichons fichièrs qu’un site o sos provesidors de servicis plaçan dins lo disc dur de vòstre ordenador via lo navigator Web (Se los acceptatz). Aqueles cookies permeton al site de reconéisser vòstre navigator e se tenètz un compte enregistrat de l’associar a vòstre compte.</p>
-
-      <p>Empleguem de cookies per comprendre e enregistrar vòstras preferéncias per vòstras visitas venentas</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Divulguem d’informacions a de tèrces ?</h3>
-
-
-      <p>Vendèm pas, comercem o qualque transferiment que siasque a de tèrces vòstras informacions personalas identificablas. Aquò inclutz pas los tèrces partits de confisança que nos assiston a menar nòstre site, menar nòstre afar o vos servir, baste que son d’acòrd per gardar aquelas informacions confidencialas. Pòt tanben arribar que liberèssem vòstras informacions quand cresèm qu’es apropriat d’o far per se sometre a la lei, per refortir nòstras politicas, o per protegir los dreches, proprietats o seguritat de qualqu’un o de nosautres.</p>
-
-      <p>Vòstre contengut public pòt èsser telecargat per los autres servidors del malhum. Vòstras publicacions publicas e las dels seguidors solament son enviadas als servidors qu’albergan vòstres seguidors, los messatges dirèctes son mandats als servidors dels destinaris se son pas de vòstra instància.</p>
-
-      <p>Quand autorizatz una aplicacion d’utilizar vòstre compte, segon l’encastre que volètz permetre, pòt accedir a l’informacion de vòstre perfil public, vòstra lista d’abonaments, vòstres seguidors, vòstras listas, totas vòstras publicacions e vòstres favorits. Las aplicacions pòdon pas jamai accedir a vòstra adreça electronica o vòstre senhal.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Utilizacion del site pels enfants</h3>
-
-      <p>S’aqueste servidor es en EU o la EEA : òstre site, nòstres produches e servicis son totas a destinacion de monde de mai de 16 ans. S’avètz mens de 16 ans, per cumplir lo RGPD (<a href="https://ca.wikipedia.org/wiki/Reglament_General_de_Protecci%C3%B3_de_Dades">Reglament General de Proteccion de Donadas</a>) utilizetz pas aqueste site.</p>
-
-      <p>S’aqueste servidor se tròba en los Estats Units : nòstre site, nòstres produches e servicis son totas a destinacion de monde de mai de 13 ans. S’avètz mens de 13 ans, per acontentar las exigéncias del COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) utilizetz pas aqueste site.</p>
-
-      <p>Las exigéncias legalas pòdon èsser diferentas se lo servidor es en una autra juridiccion</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Cambiament dins nòstra politica de confidencialitat</h3>
-
-      <p>Se decidèm de cambiar nòstra politica de confidencialitat, publicarem los cambiaments sus aquesta pagina.</p>
-
-      <p>Aqueste document es jos licéncia CC-BY-SA. Darrièra mesa a jorn lo 4 de març de 2018</p>
-
-      <p>Prima adaptacion de la <a href="https://github.com/discourse/discourse">politica de confidencialitat de Discourse</a>.</p>
-    title: Condicions d’utilizacion e politica de confidencialitat de %{instance}
   themes:
     contrast: Mastodon (Fòrt contrast)
     default: Mastodon (Escur)
@@ -1187,6 +954,7 @@ oc:
     formats:
       default: Lo %-d %B de %Y a %Ho%M
       month: "%B de %Y"
+      time: "%H'h'%M"
   two_factor_authentication:
     add: Ajustar
     disable: Desactivar
@@ -1196,54 +964,43 @@ oc:
     generate_recovery_codes: Generar los còdis de recuperacion
     lost_recovery_codes: Los còdi de recuperacion vos permeton d’accedir a vòstre compte se perdètz vòstre mobil. S’avètz perdut vòstres còdis de recuperacion los podètz tornar generar aquí. Los ancians còdis seràn pas mai valides.
     methods: Metòde en dos temps
+    otp: Aplicacion d’autentificacion
     recovery_codes: Salvar los còdis de recuperacion
     recovery_codes_regenerated: Los còdis de recuperacion son ben estats tornats generar
     recovery_instructions_html: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. <strong>Gardatz los còdis en seguretat</strong>, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
     webauthn: Claus de seguretat
   user_mailer:
+    appeal_approved:
+      action: Anatz al vòstre compte
     backup_ready:
       explanation: Avètz demandat una salvagarda complèta de vòstre compte Mastodon. Es prèsta per telecargament !
       subject: Vòstre archiu es prèst per telecargament
       title: Archiu per emportar
     warning:
-      explanation:
-        disable: Quand vòstre compte es gelat, las donadas d’aqueste demòran senceras, mas podètz pas realizar cap d’accion fins que siá desblocat.
-        silence: Del temps que vòstre compte es limitat, solament lo monde que vos sègon veiràn vòstres tuts sus aqueste servidor, e poiriatz èsser tirat de mantuna lista publica. Pasmens, d’autres vos pòdon sègre manualament.
-        suspend: Vòstre compte es suspendut e totes vòstres tuts e fichièrs enviats son estats suprimits sens retorn possible d’aqueste servidor e los de vòstres seguidors.
-      get_in_touch: Podètz respondre a aqueste corrièl per contactar la còla de %{instance}.
-      review_server_policies: Repassar las politicas del servidor
-      statuses: 'Especificament per :'
+      reason: 'Motiu :'
+      statuses: 'Publicacion citada :'
       subject:
         disable: Vòstre compte %{acct} es gelat
         none: Avertiment per %{acct}
         silence: Vòstre compte %{acct} es limitat
         suspend: Vòstre compte %{acct} es suspendut
       title:
+        delete_statuses: Publicacion levada
         disable: Compte gelat
         none: Avertiment
         silence: Compte limitat
         suspend: Compte suspendut
     welcome:
       edit_profile_action: Configuracion del perfil
-      edit_profile_step: Podètz personalizar lo perfil en mandar un avatard, cambiar l’escais-nom e mai. Se volètz repassar las demandas d’abonaments abans que los nòus seguidors pòscan veire vòstre perfil, podètz clavar vòstre compte.
       explanation: Vaquí qualques astúcias per vos preparar
       final_action: Començar de publicar
-      final_step: 'Començatz de publicar ! Quitament s’avètz pas de seguidors los autres pòdon veire vòstres messatges publics, per exemple pel flux d’actualitat local e per las etiquetas. Benlèu que volètz vos presentar amb l’etiquetas #introductions.'
       full_handle: Vòstre escais-nom complèt
       full_handle_hint: Es aquò que vos cal donar a vòstres amics per que pòscan vos escriure o sègre a partir d’un autre servidor.
-      review_preferences_action: Cambiar las preferéncias
-      review_preferences_step: Pensatz de configurar vòstras preferéncias, tal coma los corrièls que volètz recebrer o lo nivèl de confidencialitat de vòstres tuts per defaut. O se l’animacion vos dòna pas enveja de rendre, podètz activar la lectura automatica dels GIF.
       subject: Benvengut a Mastodon
-      tip_federated_timeline: Lo flux d’actualitat federat es una vista generala del malhum Mastodon. Mas aquò inclutz solament lo monde que vòstres vesins sègon, doncas es pas complèt.
-      tip_following: Seguètz l’administrator del servidor per defaut. Per trobar de monde mai interessant, agachatz lo flux d’actualitat local e lo global.
-      tip_local_timeline: Lo flux d’actualitat local es una vista del monde de %{instance}. Son vòstres vesins dirèctes !
-      tip_mobile_webapp: Se vòstre navigator mobil nos permet d’apondre Mastodon a l’ecran d‘acuèlh, podètz recebre de notificacions. Aquò se compòrta coma una aplicacion nativa !
-      tips: Astúcias
       title: Vos desirem la benvenguda a bòrd %{name} !
   users:
     follow_limit_reached: Podètz pas sègre mai de %{limit} personas
     invalid_otp_token: Còdi d’autentificacion en dos temps invalid
-    invalid_sign_in_token: Còdi de seguretat invalid
     otp_lost_help_html: Se perdatz l’accès al dos, podètz benlèu contactar %{email}
     seamless_external_login: Sètz connectat via un servici extèrn, los paramètres de senhal e de corrièl son doncas pas disponibles.
     signed_in_as: 'Session a :'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3ab586569..194d3fd72 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1,100 +1,31 @@
 ---
 pl:
   about:
-    about_hashtag_html: Znajdują się tu publiczne wpisy oznaczone hashtagiem <strong>#%{hashtag}</strong>. Możesz dołączyć do dyskusji, jeżeli posiadasz konto gdziekolwiek w Fediwersum.
-    about_mastodon_html: Mastodon jest wolną i otwartą siecią społecznościową, zdecentralizowaną alternatywą dla zamkniętych, komercyjnych platform.
-    about_this: O tej instancji
-    active_count_after: aktywni
-    active_footnote: Aktywni użytkownicy miesięcznie (MAU)
-    administered_by: 'Administrowana przez:'
-    api: API
-    apps: Aplikacje
-    apps_platforms: Korzystaj z Mastodona z poziomu iOS-a, Androida i innych
-    browse_directory: Przeglądaj katalog profilów i filtruj z uwzględnieniem zainteresowań
-    browse_local_posts: Przeglądaj strumień publicznych wpisów z tego serwera
-    browse_public_posts: Przeglądaj strumień publicznych wpisów na Mastodonie na żywo
-    contact: Kontakt
+    about_mastodon_html: 'Sieć społecznościowa przyszłości: Bez reklam, bez inwigilacji, zaprojektowana etycznie i zdecentralizowanie! Władaj swoimi danymi z Mastodonem!'
     contact_missing: Nie ustawiono
     contact_unavailable: Nie dotyczy
-    discover_users: Odkrywaj użytkowników
-    documentation: Dokumentacja
-    federation_hint_html: Z kontem na %{instance}, możesz śledzić użytkowników każdego serwera Mastodona i nie tylko.
-    get_apps: Spróbuj aplikacji mobilnej
-    hosted_on: Mastodon uruchomiony na %{domain}
-    instance_actor_flash: |
-      To konto jest wirtualnym nadawcą, używanym do reprezentacji serwera, a nie jakiegokolwiek użytkownika.
-      Jest używane w celu federowania i nie powinno być blokowane, chyba że chcesz zablokować całą instację, w takim przypadku użyj blokady domeny.
-    learn_more: Dowiedz się więcej
-    privacy_policy: Polityka prywatności
-    rules: Regulamin serwera
-    rules_html: 'Poniżej znajduje się podsumowanie zasad, których musisz przestrzegać, jeśli chcesz mieć konto na tym serwerze Mastodona:'
-    see_whats_happening: Zobacz co się dzieje
-    server_stats: 'Statystyki serwera:'
-    source_code: Kod źródłowy
-    status_count_after:
-      few: wpisów
-      many: wpisów
-      one: wpisu
-      other: wpisów
-    status_count_before: Są autorami
-    tagline: Śledź znajomych i poznawaj nowych
-    terms: Zasady użytkowania
-    unavailable_content: Niedostępne treści
-    unavailable_content_description:
-      domain: Serwer
-      reason: Powód
-      rejecting_media: 'Pliki multimedialne z tych serwerów nie będą przetwarzane ani przechowywane, ani ich miniaturki nie będą wyświetlane, wymuszając ręczne przejście do oryginalnego pliku:'
-      rejecting_media_title: Filtrowana zawartość multimedialna
-      silenced: 'Posty z tych serwerów będą ukryte na publicznych osiach czasu i konwersacjach, a powiadomienia z interakcji ich użytkowników nie będą generowane, chyba że ich obserwujesz:'
-      silenced_title: Wyciszone serwery
-      suspended: 'Żadne dane z tych serwerów nie będą przetwarzane, przechowywane ani wymieniane, sprawiając że jakakolwiek interakcja czy komunikacja z użytkownikami tych serwerów będzie niemożliwa:'
-      suspended_title: Zawieszone serwery
-    unavailable_content_html: Normalnie Mastodon pozwala ci przeglądać treści od innych użytkowników z jakiegokolwiek serwera w fediwersum. To są wyjątki, które zostały stworzone na tym konkretnym serwerze.
-    user_count_after:
-      few: użytkowników
-      many: użytkowników
-      one: użytkownik
-      other: użytkowników
-    user_count_before: Z serwera korzysta
-    what_is_mastodon: Czym jest Mastodon?
+    hosted_on: Mastodon hostowany na %{domain}
+    title: O nas
   accounts:
-    choices_html: 'Polecani przez %{name}:'
-    endorsements_hint: Możesz promować ludzi, których obserwujesz, z poziomu interfejsu webowego - wtedy oni pojawią się w tym miejscu.
-    featured_tags_hint: Możesz przedstawić w tym miejscu kilka wybranych hasztagów.
-    follow: Śledź
+    follow: Obserwuj
     followers:
       few: śledzących
       many: śledzących
       one: śledzący
-      other: Śledzących
-    following: śledzonych
+      other: obserwujących
+    following: Obserwowanych
     instance_actor_flash: To konto jest wirtualnym profilem używanym do reprezentowania samego serwera, a nie żadnego indywidualnego użytkownika. Jest ono stosowane do celów federacji i nie powinien być zawieszany.
-    joined: Dołączył(a) %{date}
     last_active: ostatnio aktywny(-a)
     link_verified_on: Własność tego odnośnika została sprawdzona %{date}
-    media: Zawartość multimedialna
-    moved_html: "%{name} korzysta teraz z konta %{new_profile_link}:"
-    network_hidden: Ta informacja nie jest dostępna
-    never_active: Nigdy
     nothing_here: Niczego tu nie ma!
-    people_followed_by: Konta śledzone przez %{name}
-    people_who_follow: Osoby, które śledzą konto %{name}
     pin_errors:
-      following: Musisz śledzić osobę, którą chcesz polecać
+      following: Musisz obserwować osobę, którą chcesz polecać
     posts:
       few: wpisy
       many: wpisów
       one: wpis
       other: Wpisów
     posts_tab_heading: Wpisy
-    posts_with_replies: Wpisy z odpowiedziami
-    roles:
-      admin: Administrator
-      bot: Bot
-      group: Grupa
-      moderator: Moderator
-    unavailable: Profil niedostępny
-    unfollow: Przestań śledzić
   admin:
     account_actions:
       action: Wykonaj działanie
@@ -102,33 +33,37 @@ pl:
     account_moderation_notes:
       create: Pozostaw notatkę
       created_msg: Pomyślnie dodano notatkę moderacyjną!
-      delete: Usuń
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną!
     accounts:
       add_email_domain_block: Dodaj domenę e-mail na czarną listę
       approve: Przyjmij
-      approve_all: Zatwierdź wszystkie
       approved_msg: Pomyślnie zaakceptowano wniosek o rejestrację %{username}
       are_you_sure: Jesteś tego pewien?
       avatar: Awatar
       by_domain: Domena
       change_email:
-        changed_msg: Pomyślnie zmieniono adres e-mail konta!
+        changed_msg: Pomyślnie zmieniono adres e-mail!
         current_email: Obecny adres e-mail
         label: Zmień adres e-mail
         new_email: Nowy adres e-mail
         submit: Zmień adres e-mail
         title: Zmień adres e-mail dla %{username}
+      change_role:
+        changed_msg: Pomyślnie zmieniono rolę!
+        label: Zmień rolę
+        no_role: Brak roli
+        title: Zmień rolę dla %{username}
       confirm: Potwierdź
       confirmed: Potwierdzono
       confirming: Potwierdzanie
+      custom: Własne
       delete: Usuń dane
       deleted: Usunięto
       demote: Degraduj
       destroyed_msg: Dane %{username} są teraz w kolejce do natychmiastowego usunięcia
       disable: Dezaktywuj
       disable_sign_in_token_auth: Wyłącz uwierzytelnianie tokenu e-mail
-      disable_two_factor_authentication: Wyłącz uwierzytelnianie dwuetapowe
+      disable_two_factor_authentication: Wyłącz uwierzytelnianie dwuskładnikowe
       disabled: Dezaktywowano
       display_name: Wyświetlana nazwa
       domain: Domena
@@ -139,14 +74,14 @@ pl:
       enable_sign_in_token_auth: Włącz uwierzytelnianie tokenu e-mail
       enabled: Aktywowano
       enabled_msg: Pomyślnie odblokowano konto %{username}
-      followers: Śledzący
-      follows: Śledzeni
+      followers: Obserwujący
+      follows: Obserwowani
       header: Nagłówek
       inbox_url: Adres skrzynki
       invite_request_text: Powody rejestracji
       invited_by: Zaproszony(-a) przez
       ip: Adres IP
-      joined: Dołączył(-a)
+      joined: Dołączono
       location:
         all: Wszystkie
         local: Lokalne
@@ -161,7 +96,7 @@ pl:
         active: Aktywne
         all: Wszystkie
         pending: Oczekujące
-        silenced: Wyciszone
+        silenced: Ograniczone
         suspended: Zawieszone
         title: Moderacja
       moderation_notes: Notatki moderacyjne
@@ -169,9 +104,16 @@ pl:
       most_recent_ip: Ostatnie IP
       no_account_selected: Żadne konto nie zostało zmienione, bo żadne nie zostało wybrane
       no_limits_imposed: Nie nałożono ograniczeń
+      no_role_assigned: Nie przypisano żadnej roli
       not_subscribed: Nie zasubskrybowano
       pending: Oczekuje na przegląd
       perform_full_suspension: Zawieś
+      previous_strikes: Poprzednie ostrzeżenia
+      previous_strikes_description_html:
+        few: To konto ma <strong>%{count}</strong> ostrzeżenia.
+        many: To konto ma <strong>%{count}</strong> ostrzeżeń.
+        one: To konto ma <strong>jedno</strong> ostrzeżenie.
+        other: To konto ma <strong>%{count}</strong> ostrzeżeń.
       promote: Podnieś uprawnienia
       protocol: Protokół
       public: Publiczne
@@ -179,8 +121,9 @@ pl:
       redownload: Odśwież profil
       redownloaded_msg: Pomyślnie odświeżono profil %{username} z miejsca pochodzenia
       reject: Odrzuć
-      reject_all: Odrzuć wszystkie
       rejected_msg: Pomyślnie odrzucono wniosek o rejestrację %{username}
+      remote_suspension_irreversible: Dane tego konta zostały nieodwracalnie usunięte.
+      remote_suspension_reversible_hint_html: Konto zostało zawieszone na serwerze, a dane zostaną w pełni usunięte dnia %{date}. Do tego czasu zdalny serwer może przywrócić to konto bez żadnych konsekwencji. Jeśli chcesz natychmiast usunąć wszystkie dane konta, możesz to zrobić poniżej.
       remove_avatar: Usun awatar
       remove_header: Usuń nagłówek
       removed_avatar_msg: Pomyślnie usunięto awatar %{username}
@@ -192,21 +135,15 @@ pl:
       reset: Resetuj
       reset_password: Resetuj hasło
       resubscribe: Ponów subskrypcję
-      role: Uprawnienia
-      roles:
-        admin: Administrator
-        moderator: Moderator
-        staff: Ekipa
-        user: Użytkownik
+      role: Rola
       search: Szukaj
-      search_same_email_domain: Inni użytkownicy z e-mail w tej domenie
+      search_same_email_domain: Inni użytkownicy z tym samym e-mail w tej domenie
       search_same_ip: Inni użytkownicy z tym samym IP
       security_measures:
         only_password: Tylko hasło
         password_and_2fa: Hasło i 2FA
-        password_and_sign_in_token: Hasło i token e-mail
       sensitive: Wrażliwe
-      sensitized: oznaczono jako wrażliwe
+      sensitized: Oznaczono jako wrażliwe
       shared_inbox_url: Adres udostępnianej skrzynki
       show:
         created_reports: Zgłoszenia tego użytkownika
@@ -214,12 +151,15 @@ pl:
       silence: Wycisz
       silenced: Wyciszono
       statuses: Wpisy
+      strikes: Poprzednie ostrzeżenia
       subscribe: Subskrybuj
+      suspend: Zawieś
       suspended: Zawieszono
       suspension_irreversible: Dane tego konta zostały bezpowrotnie usunięte. Możesz cofnąć zawieszenie tego konta aby można było z niego ponownie korzystać, lecz nie przywróci to danych które poprzednio się na nim znajdowały.
       suspension_reversible_hint_html: Twoje konto zostało zawieszone, a dane zostaną całkowicie usunięte %{date}. Do tego czasu, konto może zostać przywrócone bez żadnych negatywnych skutków. Jeżeli chcesz natychmiastowo usunąć wszystkie dane, możesz zrobić to niżej.
-      time_in_queue: Czekanie w kolejce %{time}
       title: Konta
+      unblock_email: Odblokuj adres e-mail
+      unblocked_email_msg: Pomyślnie odblokowano adres e-mail %{username}
       unconfirmed_email: Niepotwierdzony adres e-mail
       undo_sensitized: Cofnij oznaczenie
       undo_silenced: Cofnij wyciszenie
@@ -234,26 +174,34 @@ pl:
       whitelisted: Na białej liście
     action_logs:
       action_types:
+        approve_appeal: Zatwierdź odwołanie
+        approve_user: Zatwierdź użytkownika
         assigned_to_self_report: Przypisz zgłoszenie
         change_email_user: Zmień adres e-mail użytkownika
+        change_role_user: Zmień rolę użytkownika
         confirm_user: Potwierdź użytkownika
         create_account_warning: Utwórz ostrzeżenie
         create_announcement: Utwórz ogłoszenie
+        create_canonical_email_block: Utwórz blokadę e-mail
         create_custom_emoji: Utwórz niestandardowe emoji
         create_domain_allow: Utwórz zezwolenie dla domeny
         create_domain_block: Utwórz blokadę domeny
         create_email_domain_block: Utwórz blokadę domeny e-mail
         create_ip_block: Utwórz regułę IP
         create_unavailable_domain: Utwórz niedostępną domenę
+        create_user_role: Utwórz rolę
         demote_user: Zdegraduj użytkownika
         destroy_announcement: Usuń ogłoszenie
+        destroy_canonical_email_block: Usuń blokadę e-mail
         destroy_custom_emoji: Usuń niestandardowe emoji
         destroy_domain_allow: Usuń zezwolenie dla domeny
         destroy_domain_block: Usuń blokadę domeny
         destroy_email_domain_block: Usuń blokadę domeny e-mail
+        destroy_instance: Wyczyść domenę
         destroy_ip_block: Usuń regułę IP
         destroy_status: Usuń wpis
         destroy_unavailable_domain: Usuń niedostępną domenę
+        destroy_user_role: Zlikwiduj rolę
         disable_2fa_user: Wyłącz 2FA
         disable_custom_emoji: Wyłącz niestandardowe emoji
         disable_sign_in_token_auth_user: Wyłącz uwierzytelnianie tokenu e-mail dla użytkownika
@@ -263,43 +211,57 @@ pl:
         enable_user: Włącz użytkownika
         memorialize_account: Upamiętnij konto
         promote_user: Podnieś uprawnienia
+        reject_appeal: Odrzuć odwołanie
+        reject_user: Odrzuć użytkownika
         remove_avatar_user: Usuń awatar
         reopen_report: Otwórz zgłoszenie ponownie
+        resend_user: Wyślij ponownie e-mail potwierdzający
         reset_password_user: Resetuj hasło
         resolve_report: Rozwiąż zgłoszenie
         sensitive_account: Oznacz zawartość multimedialną swojego konta jako wrażliwą
         silence_account: Wycisz konto
         suspend_account: Zawieś konto
         unassigned_report: Cofnij przypisanie zgłoszenia
+        unblock_email_account: Odblokuj adres e-mail
         unsensitive_account: Cofnij oznaczenie zawartości multimedialnej swojego konta jako wrażliwą
         unsilence_account: Cofnij wyciszenie konta
         unsuspend_account: Cofnij zawieszenie konta
         update_announcement: Aktualizuj ogłoszenie
         update_custom_emoji: Aktualizuj niestandardowe emoji
         update_domain_block: Zaktualizuj blokadę domeny
+        update_ip_block: Aktualizuj regułę IP
         update_status: Aktualizuj wpis
+        update_user_role: Aktualizuj rolę
       actions:
+        approve_appeal_html: "%{name} zatwierdził(-a) odwołanie decyzji moderacyjnej od %{target}"
+        approve_user_html: "%{name} zatwierdził rejestrację od %{target}"
         assigned_to_self_report_html: "%{name} przypisał(a) sobie zgłoszenie %{target}"
         change_email_user_html: "%{name} zmienił(a) adres e-mail użytkownika %{target}"
+        change_role_user_html: "%{name} zmienił rolę %{target}"
         confirm_user_html: "%{name} potwierdził(a) adres e-mail użytkownika %{target}"
         create_account_warning_html: "%{name} wysłał(a) ostrzeżenie do %{target}"
         create_announcement_html: "%{name} utworzył(a) nowe ogłoszenie %{target}"
+        create_canonical_email_block_html: "%{name} zablokował e-mail z hasłem %{target}"
         create_custom_emoji_html: "%{name} dodał(a) nowe emoji %{target}"
         create_domain_allow_html: "%{name} dodał(a) na białą listę domenę %{target}"
         create_domain_block_html: "%{name} zablokował(a) domenę %{target}"
         create_email_domain_block_html: "%{name} dodał(a) domenę e-mail %{target} na czarną listę"
         create_ip_block_html: "%{name} stworzył(a) regułę dla IP %{target}"
         create_unavailable_domain_html: "%{name} przestał(a) doręczać na domenę %{target}"
+        create_user_role_html: "%{name} utworzył rolę %{target}"
         demote_user_html: "%{name} zdegradował(a) użytkownika %{target}"
         destroy_announcement_html: "%{name} usunął(-ęła) ogłoszenie %{target}"
-        destroy_custom_emoji_html: "%{name} usunął(-ęła) emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} odblokował(a) e-mail z hasłem %{target}"
+        destroy_custom_emoji_html: "%{name} usunął emoji %{target}"
         destroy_domain_allow_html: "%{name} usunął(-ęła) domenę %{target} z białej listy"
         destroy_domain_block_html: "%{name} odblokował(a) domenę %{target}"
         destroy_email_domain_block_html: "%{name} usunął(-ęła) domenę e-mail %{target} z czarnej listy"
+        destroy_instance_html: "%{name} usunął domenę %{target}"
         destroy_ip_block_html: "%{name} usunął(-ęła) regułę dla IP %{target}"
         destroy_status_html: "%{name} usunął(-ęła) wpis użytkownika %{target}"
         destroy_unavailable_domain_html: "%{name} wznowił(a) doręczanie do domeny %{target}"
-        disable_2fa_user_html: "%{name} wyłączył(a) uwierzytelnianie dwustopniowe użytkownikowi %{target}"
+        destroy_user_role_html: "%{name} usunął rolę %{target}"
+        disable_2fa_user_html: "%{name} wyłączył(a) uwierzytelnianie dwuskładnikowe użytkownikowi %{target}"
         disable_custom_emoji_html: "%{name} wyłączył(a) emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} wyłączył/a uwierzytelnianie tokenem e-mail dla %{target}"
         disable_user_html: "%{name} zablokował(a) możliwość logowania użytkownikowi %{target}"
@@ -308,22 +270,28 @@ pl:
         enable_user_html: "%{name} przywrócił(a) możliwość logowania użytkownikowi %{target}"
         memorialize_account_html: "%{name} nadał(a) kontu %{target} status in memoriam"
         promote_user_html: "%{name} podniósł(a) uprawnienia użytkownikowi %{target}"
+        reject_appeal_html: "%{name} zatwierdził(-a) odwołanie decyzji moderacyjnej od %{target}"
+        reject_user_html: "%{name} odrzucił rejestrację od %{target}"
         remove_avatar_user_html: "%{name} usunął(-ęła) awatar użytkownikowi %{target}"
         reopen_report_html: "%{name} otworzył(a) ponownie zgłoszenie %{target}"
+        resend_user_html: "%{name} ponownie wysłał(a) e-mail z potwierdzeniem dla %{target}"
         reset_password_user_html: "%{name} przywrócił(a) hasło użytkownikowi %{target}"
         resolve_report_html: "%{name} rozwiązał(a) zgłoszenie %{target}"
         sensitive_account_html: "%{name} oznaczył(a) zawartość multimedialną %{target} jako wrażliwą"
         silence_account_html: "%{name} wyciszył(a) konto %{target}"
         suspend_account_html: "%{name} zawiesił(a) konto %{target}"
         unassigned_report_html: "%{name} cofnął(-ęła) przypisanie zgłoszenia %{target}"
+        unblock_email_account_html: "%{name} odblokował adres e-mail %{target}"
         unsensitive_account_html: "%{name} cofnął(-ęła) oznaczenie zawartości multimedialnej %{target} jako wrażliwą"
         unsilence_account_html: "%{name} cofnął(-ęła) wyciszenie konta %{target}"
         unsuspend_account_html: "%{name} cofnął(-ęła) zawieszenie konta %{target}"
         update_announcement_html: "%{name} zaktualizował(a) ogłoszenie %{target}"
         update_custom_emoji_html: "%{name} zaktualizował(a) emoji %{target}"
         update_domain_block_html: "%{name} zaktualizował(a) blokadę domeny dla %{target}"
+        update_ip_block_html: "%{name} stworzył(a) regułę dla IP %{target}"
         update_status_html: "%{name} zaktualizował(a) wpis użytkownika %{target}"
-      deleted_status: "(usunięty wpis)"
+        update_user_role_html: "%{name} zmienił rolę %{target}"
+      deleted_account: usunięte konto
       empty: Nie znaleziono aktywności w dzienniku.
       filter_by_action: Filtruj według działania
       filter_by_user: Filtruj według użytkownika
@@ -362,11 +330,12 @@ pl:
       enable: Włącz
       enabled: Włączone
       enabled_msg: Pomyślnie przywrócono emoji
-      image_hint: Plik PNG ważący do 50KB
+      image_hint: PNG lub GIF do %{size}
       list: Dodaj do listy
       listed: Widoczne
       new:
         title: Dodaj nowe niestandardowe emoji
+      no_emoji_selected: Żadne emoji nie zostały zmienione, ponieważ żadnych nie wybrano
       not_permitted: Nie masz uprawnień do wykonania tego działania
       overwrite: Zastąp
       shortcode: Krótki kod
@@ -384,20 +353,25 @@ pl:
       media_storage: Przechowywanie mediów
       new_users: nowi użytkownicy
       opened_reports: otwarte zgłoszenia
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> oczekujące odwołania"
+        many: "<strong>%{count}</strong> oczekujących odwołań"
+        one: "<strong>%{count}</strong> oczekujących odwołań"
+        other: "<strong>%{count}</strong> oczekujących odwołań"
       pending_reports_html:
         few: "<strong>%{count}</strong> oczekujące raporty"
         many: "<strong>%{count}</strong> oczekujących raportów"
-        one: "<strong>1</strong> oczekujący raport"
+        one: "<strong>%{count}</strong> oczekujący raport"
         other: "<strong>%{count}</strong> oczekujących raportów"
       pending_tags_html:
         few: "<strong>%{count}</strong> oczekujące hashtagi"
         many: "<strong>%{count}</strong> oczekujących hashtagów"
-        one: "<strong>1</strong> oczekujący hashtag"
+        one: "<strong>%{count}</strong> oczekujący hashtag"
         other: "<strong>%{count}</strong> oczekujących hashtagów"
       pending_users_html:
         few: "<strong>%{count}</strong> oczekujących użytkowników"
         many: "<strong>%{count}</strong> oczekujących użytkowników"
-        one: "<strong>1</strong> oczekujący użytkownik"
+        one: "<strong>%{count}</strong> oczekujący użytkownik"
         other: "<strong>%{count}</strong> oczekujących użytkowników"
       resolved_reports: zamkniętych zgłoszeń
       software: Oprogramowanie
@@ -407,10 +381,16 @@ pl:
       top_languages: Najbardziej aktywne języki
       top_servers: Najbardziej aktywne serwery
       website: Strona
+    disputes:
+      appeals:
+        empty: Nie znaleziono odwołań.
+        title: Odwołania
     domain_allows:
       add_new: Zatwierdź domenę
       created_msg: Domena dodana do białej listy
       destroyed_msg: Domena usunięta z białej listy
+      export: Eksportuj
+      import: Importuj
       undo: Usuń z białej listy
     domain_blocks:
       add_new: Dodaj nową
@@ -418,16 +398,21 @@ pl:
       destroyed_msg: Blokada domeny nie może zostać odwrócona
       domain: Domena
       edit: Edytuj blokadę domeny
+      existing_domain_block: Już nałożyłeś surowsze limity na %{name}.
       existing_domain_block_html: Już narzuciłeś bardziej rygorystyczne limity na %{name}, musisz najpierw <a href="%{unblock_url}">je odblokować</a>.
+      export: Eksportuj
+      import: Importuj
       new:
         create: Utwórz blokadę
         hint: Blokada domen nie zabroni tworzenia wpisów kont w bazie danych, ale pozwoli na automatyczną moderację kont do nich należących.
         severity:
-          desc_html: "<strong>Wyciszenie</strong> uczyni wpisy użytkownika widoczne tylko dla osób, które go śledzą. <strong>Zawieszenie</strong> spowoduje usunięcie całej zawartości dodanej przez użytkownika. Użyj <strong>Żadne</strong>, jeżeli chcesz jedynie odrzucać zawartość multimedialną."
+          desc_html: "<strong>Wyciszenie</strong> uczyni wpisy użytkowników z tej domeny widoczne tylko dla osób, które go obserwują. <strong>Zawieszenie</strong> spowoduje usunięcie całej zawartości dodanej przez użytkownika. Użyj <strong>Żadne</strong>, jeżeli chcesz jedynie odrzucać zawartość multimedialną."
           noop: Nic nie rób
-          silence: Wycisz
+          silence: Limit
           suspend: Zawieś
         title: Nowa blokada domen
+      no_domain_block_selected: Nie zmieniono żadnych bloków domen, gdyż żadna nie została wybrana
+      not_permitted: Nie możesz wykonać tej czynności
       obfuscate: Ukryj nazwę domeny
       obfuscate_hint: Częściowo ukryj nazwę domeny na liście, gdy reklamowanie listy limitów domen jest włączone
       private_comment: Prywatny komentarz
@@ -438,70 +423,107 @@ 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
-      rejecting_media: pliki multimedialne są odrzucane
-      rejecting_reports: zgłoszenia są odrzucane
-      severity:
-        silence: wyciszono
-        suspend: zawieszono
-      show:
-        affected_accounts:
-          few: Dotknęło %{count} kont w bazie danych
-          many: Dotknęło %{count} kont w bazie danych
-          one: Dotknęło jedno konto w bazie danych
-          other: Dotknęło %{count} kont w bazie danych
-        retroactive:
-          silence: Odwołaj wyciszenie wszystkich kont w tej domenie
-          suspend: Odwołaj zawieszenie wszystkich kont w tej domenie
-        title: Odwołaj blokadę dla domeny %{domain}
-        undo: Cofnij
       undo: Cofnij
       view: Zobacz blokadę domeny
     email_domain_blocks:
       add_new: Dodaj nową
+      attempts_over_week:
+        few: "%{count} próby w ciągu ostatniego tygodnia"
+        many: "%{count} prób w ciągu ostatniego tygodnia"
+        one: "%{count} próba w ciągu ostatniego tygodnia"
+        other: "%{count} prób w ciągu ostatniego tygodnia"
       created_msg: Pomyślnie utworzono blokadę domeny e-mail
       delete: Usuń
-      destroyed_msg: Pomyślnie usunięto blokadę domeny e-mail
+      dns:
+        types:
+          mx: Rekord MX
       domain: Domena
-      empty: Żadna domena e-mail nie znajduje się obecnie na czarnej liście.
-      from_html: z %{domain}
       new:
         create: Utwórz blokadę
+        resolve: Rozwiąż domenę
         title: Nowa blokada domeny e-mail
+      no_email_domain_block_selected: Żadne blokady domeny e-mail nie zostały zmienione, ponieważ żadne z nich nie zostały wybrane
+      resolved_dns_records_hint_html: Nazwa domeny rozwiązuje się do następujących domen MX, które są ostatecznie odpowiedzialne za przyjmowanie wiadomości e-mail. Blokowanie domeny MX spowoduje zablokowanie rejestracji z dowolnego adresu e-mail, który używa tej samej domeny MX, nawet jeśli widoczna nazwa domeny jest inna. <strong>Uważaj, aby nie blokować głównych dostawców poczty elektronicznej.</strong>
+      resolved_through_html: Rozwiązano przez %{domain}
       title: Blokowanie domen e-mail
+    export_domain_allows:
+      new:
+        title: Zaimportuj zezwolenia domen
+      no_file: Nie wybrano pliku
+    export_domain_blocks:
+      import:
+        description_html: Zamierzasz zaimportować listę zablokowanych domen. Przejrzyj uważnie tę listę, zwłaszcza jeśli sam jej nie utworzyłeś.
+        existing_relationships_warning: Istniejące połączenia obserwujących
+        private_comment_description_html: 'Żebyś wiedział(a) skąd pochodzą zaimportowane bloki, zostaną one utworzone z następującym prywatnym komentarzem: <q>%{comment}</q>'
+        private_comment_template: Zaimportowano z %{source} dnia %{date}
+        title: Importuj zablokowane domeny
+      new:
+        title: Importuj zablokowane domeny
+      no_file: Nie wybrano pliku
     follow_recommendations:
-      description_html: "<strong>Polecane śledzenia pomagają nowym użytkownikom szybko odnaleźć interesujące treści</strong>. Jeżeli użytkownik nie wchodził w interakcje z innymi wystarczająco często, aby powstały spersonalizowane rekomendacje, polecane są te konta. Są one obliczane każdego dnia na podstawie kombinacji kont o największej liczbie niedawnej aktywności i największej liczbie lokalnych obserwatorów dla danego języka."
+      description_html: "<strong>Polecane obserwacje pomagają nowym użytkownikom szybko odnaleźć interesujące treści</strong>. Jeżeli użytkownik nie wchodził w interakcje z innymi wystarczająco często, aby powstały spersonalizowane rekomendacje, polecane są te konta. Są one obliczane każdego dnia na podstawie kombinacji kont o największej liczbie niedawnej aktywności i największej liczbie lokalnych obserwatorów dla danego języka."
       language: Dla języka
       status: Stan
-      suppress: Usuń polecenie śledzenia
+      suppress: Usuń polecenie obserwacji
       suppressed: Usunięto
       title: Polecane konta
-      unsuppress: Przywróć polecenie śledzenia konta
+      unsuppress: Przywróć polecenie obserwacji konta
     instances:
+      availability:
+        description_html:
+          few: Jeśli dostarczenie do domeny nie powiedzie się <strong>%{count} dni</strong> bez powodzenia, nie zostaną podjęte dalsze próby dostawy, chyba że otrzymano dostawę <em>od</em> domeny.
+          many: Jeśli dostarczenie do domeny nie powiedzie się <strong>%{count} dni</strong> bez powodzenia, nie zostaną podjęte dalsze próby dostawy, chyba że otrzymano dostawę <em>od</em> domeny.
+          one: Jeśli dostarczenie do domeny nie powiedzie się <strong>%{count} dzień</strong> bez powodzenia, nie zostaną podjęte dalsze próby dostawy, chyba że otrzymano dostawę <em>od</em> domeny.
+          other: Jeśli dostarczenie do domeny nie powiedzie się <strong>%{count} dni</strong> bez powodzenia, nie zostaną podjęte dalsze próby dostawy, chyba że otrzymano dostawę <em>od</em> domeny.
+        failure_threshold_reached: Próg niepowodzenia osiągnięty dnia %{date}.
+        failures_recorded:
+          few: Nieudane próby w %{count} różnych dniach.
+          many: Nieudane próby w %{count} różnych dniach.
+          one: Nieudane próby %{count} dnia.
+          other: Nieudane próby w %{count} różnych dniach.
+        no_failures_recorded: Brak błędów w rejestrze.
+        title: Dostępność
+        warning: Ostatnia próba połączenia z tym serwerem zakończyła się niepowodzeniem
       back_to_all: Wszystkie
       back_to_limited: Ograniczone
       back_to_warning: Ostrzeżenie
       by_domain: Domena
+      confirm_purge: Czy na pewno chcesz trwale usunąć dane z tej domeny?
+      content_policies:
+        comment: Wewnętrzna notatka
+        description_html: Możesz zdefiniować zasady treści, które zostaną zastosowane do wszystkich kont z tej domeny i jej subdomen.
+        policies:
+          reject_media: Odrzucaj media
+          reject_reports: Odrzucaj zgłoszenia
+          silence: Ogranicz
+          suspend: Zawieś
+        policy: Polityka
+        reason: Powód publiczny
+        title: Polityki zawartości
+      dashboard:
+        instance_accounts_dimension: Najczęściej obserwowane konta
+        instance_accounts_measure: przechowywane konta
+        instance_followers_measure: nasi obserwujący tam
+        instance_follows_measure: ich obserwujący tutaj
+        instance_languages_dimension: Najpopularniejsze języki
+        instance_media_attachments_measure: przechowywane załączniki multimedialne
+        instance_reports_measure: zgłoszenia dotyczące ich
+        instance_statuses_measure: przechowywane wpisy
       delivery:
         all: Wszystkie
         clear: Wyczyść błędy w doręczaniu
+        failing: Niepowodzenie
         restart: Uruchom ponownie doręczenie
         stop: Zatrzymaj doręczanie
-        title: Doręczanie
         unavailable: Niedostępne
-        unavailable_message: Doręczaniei niedostępne
-        warning: Ostrzeżenie
-        warning_message:
-          few: "%{count} dni niepowodzenia doręczenia"
-          many: "%{count} dni niepowodzenia doręczenia"
-          one: "%{count} dzień niepowodzenia doręczenia"
-          other: "%{count} dni niepowodzenia doręczenia"
       delivery_available: Doręczanie jest dostępne
       delivery_error_days: Dni błędów doręczenia
       delivery_error_hint: Jeżeli doręczanie nie będzie możliwe przez %{count} dni, zostanie automatycznie oznaczona jako nie do doręczania.
+      destroyed_msg: Dane z %{domain} są teraz w kolejce do bezpośredniego usunięcia.
       empty: Nie znaleziono domen.
       known_accounts:
         few: "%{count} znane konta"
-        many: "%{count} znane konta"
+        many: "%{count} znanych kont"
         one: "%{count} znane konto"
         other: "%{count} znane konta"
       moderation:
@@ -510,12 +532,15 @@ pl:
         title: Moderacja
       private_comment: Prywatny komentarz
       public_comment: Publiczny komentarz
+      purge: Wyczyść
+      purge_description_html: Jeśli uważasz, że ta domena została zamknięta na dobre, możesz usunąć wszystkie rejestry konta i powiązane dane z tej domeny z pamięci. Proces ten może chwilę potrwać.
       title: Znane instancje
       total_blocked_by_us: Zablokowane przez nas
-      total_followed_by_them: Śledzeni przez nich
-      total_followed_by_us: Śledzeni przez nas
+      total_followed_by_them: Obserwowani przez nich
+      total_followed_by_us: Obserwowani przez nas
       total_reported: Zgłoszenia dotyczące ich
       total_storage: Załączniki multimedialne
+      totals_time_period_hint_html: Poniższe sumy zawierają dane od początku serwera.
     invites:
       deactivate_all: Unieważnij wszystkie
       filter:
@@ -539,14 +564,12 @@ pl:
         title: Utwórz nową regułę IP
       no_ip_block_selected: Żadna reguła nie została zmieniona, ponieważ żadna nie została wybrana
       title: Reguły adresów IP
-    pending_accounts:
-      title: Oczekujące konta (%{count})
     relationships:
       title: Relacje %{acct}
     relays:
       add_new: Dodaj nowy
       delete: Usuń
-      description_html: "<strong>Przekaźnik federacji</strong> jest pośredniczącym serwerem wymieniającym duże ilości publicznych wpisów pomiędzy serwerami które subskrybują je i publikują na nich. <strong>Pomaga to małym i średnim instancją poznawać nową zawartość z Fediwersum</strong>, co w innym przypadku wymagałoby od użytkowników ręcznego śledzenia osób z innych serwerów."
+      description_html: "<strong>Przekaźnik federacji</strong> jest pośredniczącym serwerem wymieniającym duże ilości publicznych wpisów pomiędzy serwerami które subskrybują je i publikują na nich. <strong>Pomaga to małym i średnim instancją poznawać nową zawartość z Fediwersum</strong>, co w innym przypadku wymagałoby od użytkowników ręcznej obserwacji osób z innych serwerów."
       disable: Wyłącz
       disabled: Wyłączony
       enable: Włącz
@@ -569,41 +592,125 @@ pl:
           many: "%{count} notatek"
           one: "%{count} notatka"
           other: "%{count} notatki"
-        reports:
-          few: "%{count} zgłoszenia"
-          many: "%{count} zgłoszeń"
-          one: "%{count} zgłoszenie"
-          other: "%{count} zgłoszenia"
+      action_log: Dziennik audytu
       action_taken_by: Działanie podjęte przez
+      actions:
+        delete_description_html: Zgłoszone posty zostaną usunięte, a zdarzenie zostanie zapisane, aby pomóc w eskalacji przyszłych wykroczeń na tym samym koncie.
+        mark_as_sensitive_description_html: Media w zgłaszanych postach zostaną oznaczone jako wrażliwe, a ostrzeżenie zostanie nagrane, aby pomóc w eskalacji przyszłych przewinień na tym samym koncie.
+        other_description_html: Zobacz więcej opcji do kontrolowania zachowania konta i dostosuj komunikację do zgłoszonego konta.
+        resolve_description_html: Nie zostaną podjęte żadne działania przeciwko zgłoszonemu sprawozdaniu, zdarzenie nie zostanie zarejestrowane, a zgłoszenie zostanie zamknięte.
+        silence_description_html: Profil będzie widoczny tylko dla tych, którzy go już obserwują lub szukaj ręcznie, poważnie ograniczając jego zasięg. Może być zawsze cofnięty.
+        suspend_description_html: Profil i cała jego zawartość staną się niedostępne, dopóki nie zostaną ostatecznie usunięte. Interakcja z kontem będzie niemożliwa. Odwracalne w ciągu 30 dni.
+      actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię <strong>Spam</strong>.
+      add_to_report: Dodaj więcej do raportu
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
+      by_target_domain: Domena zgłaszanego konta
+      category: Kategoria
+      category_description_html: Powód, dla którego to konto i/lub zawartość zostały zgłoszone, będzie cytowany w komunikacji ze zgłoszonym kontem
       comment:
         none: Brak
+      comment_description_html: 'Aby dostarczyć więcej informacji, %{name} napisał:'
       created_at: Zgłoszono
+      delete_and_resolve: Usuń posty
       forwarded: Przekazano
       forwarded_to: Przekazano do %{domain}
       mark_as_resolved: Oznacz jako rozwiązane
+      mark_as_sensitive: Oznacz jako wrażliwe
       mark_as_unresolved: Oznacz jako nierozwiązane
+      no_one_assigned: Nikt nie
       notes:
         create: Utwórz notatkę
         create_and_resolve: Rozwiąż i pozostaw notatkę
         create_and_unresolve: Cofnij rozwiązanie i pozostaw notatkę
         delete: Usuń
         placeholder: Opisz wykonane akcje i inne szczegóły dotyczące tego zgłoszenia…
+        title: Notatki
+      notes_description_html: Przeglądaj i zostaw notatki innym moderatorom i sobie samemu
+      quick_actions_description_html: 'Wykonaj szybkie działanie lub przewiń w dół, aby zobaczyć zgłoszoną zawartość:'
+      remote_user_placeholder: zdalny użytkownik z %{instance}
       reopen: Otwórz ponownie
       report: 'Zgłoszenie #%{id}'
       reported_account: Zgłoszone konto
       reported_by: Zgłaszający
       resolved: Rozwiązane
       resolved_msg: Pomyślnie rozwiązano zgłoszenie.
+      skip_to_actions: Przejdź do akcji
       status: Stan
-      target_domain: Domena zgłaszanego konta
+      statuses: Zgłoszona treść
+      statuses_description_html: Obraźliwe treści będą cytowane w komunikacji ze zgłoszonym kontem
       target_origin: Pochodzenie zgłaszanego konta
       title: Zgłoszenia
       unassign: Cofnij przypisanie
       unresolved: Nierozwiązane
       updated_at: Zaktualizowano
+      view_profile: Wyświetl profil
+    roles:
+      add_new: Dodaj rolę
+      assigned_users:
+        few: "%{count} użytkowników"
+        many: "%{count} użytkowników"
+        one: "%{count} użytkownik"
+        other: "%{count} użytkowników"
+      categories:
+        administration: Administracja
+        devops: DevOps
+        invites: Zaproszenia
+        moderation: Moderacja
+        special: Specjalne
+      delete: Usuń
+      description_html: Za pomocą <strong>ról użytkowników</strong>możesz dostosowywać funkcje i obszary Mastodon, do których użytkownicy mogą uzyskać dostęp.
+      edit: Edytuj rolę '%{name}'
+      everyone: Domyślnie uprawnienia
+      everyone_full_description_html: To jest <strong>rola podstawowa</strong> wpływająca na <strong>wszystkich użytkowników</strong>, nawet tych, którzy nie mają przypisanej roli. Wszystkie inne role dziedziczą z niej uprawnienia.
+      permissions_count:
+        few: "%{count} uprawnień"
+        many: "%{count} uprawnień"
+        one: "%{count} uprawnienie"
+        other: "%{count} uprawnień"
+      privileges:
+        administrator: Administrator
+        administrator_description: Użytkownicy z tym uprawnieniem omijają każde uprawnienie
+        delete_user_data: Usuń dane użytkownika
+        delete_user_data_description: Pozwala użytkownikom na bezzwłoczne usuwanie danych innych użytkowników
+        invite_users: Zaproś użytkowników
+        invite_users_description: Pozwala użytkownikom zapraszać nowych ludzi na serwer
+        manage_announcements: Zarządzaj ogłoszeniami
+        manage_announcements_description: Pozwala użytkownikom zarządzać ogłoszeniami na serwerze
+        manage_appeals: Zarządzaj odwołaniami
+        manage_appeals_description: Pozwala użytkownikom przeglądać odwołania od działań moderacyjnych
+        manage_blocks: Zarządzaj blokami
+        manage_blocks_description: Pozwala użytkownikom na blokowanie dostawców poczty elektronicznej i adresów IP
+        manage_custom_emojis: Zarządzaj niestandardowymi emoji
+        manage_custom_emojis_description: Pozwala użytkownikom zarządzać niestandardowymi emoji na serwerze
+        manage_federation: Zarządzaj federacją
+        manage_federation_description: Pozwala użytkownikom na blokowanie lub zezwalanie federacji z innymi domenami i kontrolowanie doręczania
+        manage_invites: Zarządzaj zaproszeniami
+        manage_invites_description: Pozwala użytkownikom przeglądać i dezaktywować linki z zaproszeniami
+        manage_reports: Zarządzaj raportami
+        manage_reports_description: Pozwala użytkownikom przeglądać raporty i wykonywać przeciwko nim działania moderacyjne
+        manage_roles: Zarządzaj rolami
+        manage_roles_description: Pozwala użytkownikom zarządzać rolami i przypisywać role poniżej ich własnych
+        manage_rules: Zarządzaj regułami
+        manage_rules_description: Pozwala użytkownikom na zmianę reguł serwera
+        manage_settings: Zarządzaj ustawieniami
+        manage_settings_description: Pozwala użytkownikom na zmianę ustawień witryny
+        manage_taxonomies: Zarządzaj taksonomiami
+        manage_taxonomies_description: Pozwala użytkownikom przeglądać najpopularniejsze treści i aktualizować ustawienia hasztagów
+        manage_user_access: Zarządzaj dostępem użytkownika
+        manage_user_access_description: Pozwala użytkownikom na wyłączenie uwierzytelniania dwuskładnikowego innych użytkowników, zmianę adresu e-mail i zresetowanie hasła
+        manage_users: Zarządzanie użytkownikami
+        manage_users_description: Pozwala użytkownikom na oglądanie szczegółów innych użytkowników i wykonywanie na ich kontach działań moderacyjnych
+        manage_webhooks: Zarządzanie webhookami
+        manage_webhooks_description: Pozwala użytkownikom na konfigurację webhooków dla wydarzeń administracyjnych
+        view_audit_log: Wyświetl dziennik zdarzeń
+        view_audit_log_description: Pozwala użytkownikom zobaczyć historię działań administracyjnych na serwerze
+        view_dashboard: Wyświetl panel
+        view_dashboard_description: Pozwala użytkownikom na dostęp do panelu i różnych metryk
+        view_devops: DevOps
+        view_devops_description: Pozwala użytkownikom na dostęp do paneli Sidekiq i pgHero
+      title: Role
     rules:
       add_new: Dodaj zasadę
       delete: Usuń
@@ -612,142 +719,209 @@ pl:
       empty: Jeszcze nie zdefiniowano zasad serwera.
       title: Regulamin serwera
     settings:
-      activity_api_enabled:
-        desc_html: Liczy publikowane lokalnie wpisy, aktywnych użytkowników i nowe rejestracje w ciągu danego tygodnia
-        title: Publikuj zbiorowe statystyki o aktywności użytkowników
-      bootstrap_timeline_accounts:
-        desc_html: Oddzielaj nazwy użytkowników przecinkami. Działa tylko dla niezablokowanych kont w obrębie instancji. Jeżeli puste, zostaną użyte konta administratorów instancji.
-        title: Domyślnie obserwowani użytkownicy
-      contact_information:
-        email: Służbowy adres e-mail
-        username: Nazwa użytkownika do kontaktu
-      custom_css:
-        desc_html: Modyfikuj wygląd pliku CSS ładowanego na każdej stronie
-        title: Niestandardowy CSS
+      about:
+        manage_rules: Zarządzaj regułami serwera
+        preamble: Podaj szczegółowe informacje na temat sposobu działania, moderacji i finansowania serwera.
+        rules_hint: Istnieje dedykowany obszar dla reguł, których twoi użytkownicy mają przestrzegać.
+        title: O...
+      appearance:
+        preamble: Dostosuj interfejs www Mastodon.
+        title: Wygląd
+      branding:
+        preamble: Marka Twojego serwera odróżnia go od innych serwerów w sieci. Informacje te mogą być wyświetlane w różnych środowiskach, takich jak interfejs internetowy Mastodon, aplikacje natywne, w podglądzie linków na innych stronach internetowych i w aplikacjach do wysyłania wiadomości itd. Z tego względu najlepiej zachować jasną, krótką i zwięzłą informację.
+        title: Marka
+      content_retention:
+        preamble: Kontroluj, jak treści generowane przez użytkownika są przechowywane w Mastodon.
+        title: Retencja treści
       default_noindex:
-        desc_html: Wpływa na wszystkich użytkowników, którzy nie zmienili tego ustawienia
-        title: Domyślnie żądaj nieindeksowania użytkowników w wyszukiwarkach
+        desc_html: Wpłynie to na wszystkich użytkowników, którzy sami tego nie zmienili w swoich ustawieniach
+        title: Domyślnie żądaj nieindeksowania użytkowników przez wyszukiwarki
+      discovery:
+        follow_recommendations: Polecane konta
+        preamble: Prezentowanie interesujących treści ma kluczowe znaczenie dla nowych użytkowników, którzy mogą nie znać nikogo z Mastodona. Kontroluj, jak różne funkcje odkrywania działają na Twoim serwerze.
+        profile_directory: Katalog profilów
+        public_timelines: Publiczne osie czasu
+        title: Odkrywanie
+        trends: Trendy
       domain_blocks:
         all: Każdemu
         disabled: Nikomu
-        title: Pokazuj zablokowane domeny
         users: Zalogowanym lokalnym użytkownikom
-      domain_blocks_rationale:
-        title: Pokaż uzasadnienia
-      hero:
-        desc_html: Wyświetlany na stronie głównej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. Jeżeli nie ustawiony, zostanie użyta miniatura serwera
-        title: Obraz bohatera
-      mascot:
-        desc_html: Wyświetlany na wielu stronach. Zalecany jest rozmiar przynajmniej 293px × 205px. Jeżeli nie ustawiono, zostanie użyta domyślna
-        title: Obraz maskotki
-      peers_api_enabled:
-        desc_html: Nazwy domen, z którymi ten serwer wchodził w interakcje
-        title: Publikuj listę znanych serwerów
-      preview_sensitive_media:
-        desc_html: Podgląd odnośników na innych instancjach będzie wyświetlał miniaturę nawet jeśli zawartość multimedialna zostanie oznaczona jako wrażliwa
-        title: Wyświetlaj zawartość wrażliwą w podglądzie OpenGraph
-      profile_directory:
-        desc_html: Pozwalaj na poznawanie użytkowników
-        title: Włącz katalog profilów
       registrations:
-        closed_message:
-          desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji nie jest dostępna. Możesz korzystać z tagów HTML
-          title: Wiadomość o nieaktywnej rejestracji
-        deletion:
-          desc_html: Pozwól każdemu na usunięcie konta
-          title: Możliwość usunięcia
-        min_invite_role:
-          disabled: Nikt
-          title: Kto może zapraszać użytkowników
-        require_invite_text:
-          desc_html: Kiedy rejestracje wymagają ręcznego zatwierdzenia, ustaw pole "Dlaczego chcesz dołączyć?" jako obowiązkowe, a nie opcjonalne
-          title: Wymagaj od nowych użytkowników wypełnienia tekstu prośby o zaproszenie
+        preamble: Kontroluj, kto może utworzyć konto na Twoim serwerze.
+        title: Rejestracje
       registrations_mode:
         modes:
           approved: Przyjęcie jest wymagane do rejestracji
           none: Nikt nie może się zarejestrować
           open: Każdy może się zarejestrować
-        title: Tryb rejestracji
-      show_known_fediverse_at_about_page:
-        desc_html: Jeśli włączone, podgląd instancji będzie wyświetlał wpisy z całego Fediwersum. W innym przypadku, będą wyświetlane tylko lokalne wpisy.
-        title: Pokazuj wszystkie znane wpisy na podglądzie instancji
-      show_staff_badge:
-        desc_html: Pokazuj odznakę uprawnień na stronie profilu użytkownika
-        title: Pokazuj odznakę administracji
-      site_description:
-        desc_html: Akapit wprowadzający, widoczny na stronie głównej. Opisz, co czyni tę instancję wyjątkową. Możesz korzystać ze znaczników HTML, w szczególności <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
-        title: Opis serwera
-      site_description_extended:
-        desc_html: Dobre miejsce na zasady użytkowania, wprowadzenie i inne rzeczy, które wyróżniają ten serwer. Możesz korzystać ze znaczników HTML
-        title: Niestandardowy opis strony
-      site_short_description:
-        desc_html: Wyświetlany na pasku bocznym i w znacznikach meta. Opisz w jednym akapicie, czym jest Mastodon i czym wyróżnia się ten serwer. Jeżeli pusty, zostanie użyty opis serwera.
-        title: Krótki opis serwera
-      site_terms:
-        desc_html: Miejsce na własną politykę prywatności, zasady użytkowania i inne unormowania prawne. Możesz korzystać ze znaczników HTML
-        title: Niestandardowe zasady użytkowania
-      site_title: Nazwa serwera
-      thumbnail:
-        desc_html: 'Używana w podglądzie przez OpenGraph i API. Zalecany rozmiar: 1200x630 pikseli'
-        title: Miniatura serwera
-      timeline_preview:
-        desc_html: Wyświetlaj publiczną oś czasu na stronie widocznej dla niezalogowanych
-        title: Podgląd osi czasu
-      title: Ustawienia strony
-      trendable_by_default:
-        desc_html: Wpływa na hashtagi, które nie były wcześniej niedozwolone
-        title: Hashtagi mogą pojawiać się w trendach bez wcześniejszego zatwierdzenia
-      trends:
-        desc_html: Wyświetlaj publicznie wcześniej sprawdzone hashtagi, które są obecnie na czasie
-        title: Popularne hashtagi
+      title: Ustawienia serwera
     site_uploads:
       delete: Usuń przesłany plik
       destroyed_msg: Pomyślnie usunięto przesłany plik!
     statuses:
+      account: Autor
+      application: Aplikacja
       back_to_account: Wróć na konto
+      back_to_report: Wróć do strony zgłoszenia
       batch:
-        delete: Usuń
-        nsfw_off: Cofnij NSFW
-        nsfw_on: Oznacz jako NSFW
+        remove_from_report: Usuń ze zgłoszenia
+        report: Zgłoszenie
       deleted: Usunięto
-      failed_to_execute: Nie udało się wykonać
+      favourites: Ulubione
+      history: Historia wersji
+      in_reply_to: W odpowiedzi na
+      language: Język
       media:
         title: Multimedia
-      no_media: Bez zawartości multimedialnej
+      metadata: Metadane
       no_status_selected: Żaden wpis nie został zmieniony, bo żaden nie został wybrany
+      open: Otwarty post
+      original_status: Oryginalny post
+      reblogs: Podbicia
+      status_changed: Post zmieniony
       title: Wpisy konta
+      trending: Popularne
+      visibility: Widoczność
       with_media: Z zawartością multimedialną
+    strikes:
+      actions:
+        delete_statuses: "%{name} usunął(-ęła) posty %{target}"
+        disable: "%{name} zamroził(a) konto %{target}"
+        mark_statuses_as_sensitive: "%{name} oznaczył/a wiadomości %{target} jako wrażliwe"
+        none: "%{name} wysłał(a) ostrzeżenie do %{target}"
+        sensitive: "%{name} oznaczył(-a) konto %{target} jako wrażliwe"
+        silence: "%{name} ograniczył(-a) konto %{target}"
+        suspend: "%{name} zawiesił(-a) konto %{target}"
+      appeal_approved: Odwołanie
+      appeal_pending: Odwołanie w toku
     system_checks:
       database_schema_check:
         message_html: Istnieją oczekujące migracje bazy danych. Uruchom je, aby upewnić się, że aplikacja działa tak, jak powinna
+      elasticsearch_running_check:
+        message_html: Nie można połączyć się z Elasticsearch. Sprawdź czy jest uruchomiony lub wyłącz wyszukiwanie pełnotekstowe
+      elasticsearch_version_check:
+        message_html: 'Niekompatybilna wersja Elasticsearch: %{value}'
+        version_comparison: Elasticsearch w wersji %{running_version} jest uruchomiony, ale wymagana wersja to %{required_version}
       rules_check:
         action: Zarządzaj regułami serwera
         message_html: Nie zdefiniowano żadnych reguł serwera.
       sidekiq_process_check:
         message_html: Brak uruchomionego procesu Sidekiq dla kolejki(-ek) %{value}. Sprawdź konfigurację Sidekiq
     tags:
-      accounts_today: Unikalne wykorzystania dzisiaj
-      accounts_week: Unikalne wykorzystania w tym tygodniu
-      breakdown: Podział dzisiejszego wykorzystania według źródła
-      last_active: Ostatnia aktywność
-      most_popular: Najpopularniejsze
-      most_recent: Ostatnie
-      name: Hasztag
       review: Stan przeglądu
-      reviewed: Przejrzany
-      title: Hashtagi
-      trending_right_now: Obecnie na czasie
-      unique_uses_today: "%{count} opublikowanych dzisiaj"
-      unreviewed: Nie przejrzano
       updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
     title: Administracja
+    trends:
+      allow: Zezwól
+      approved: Zaakceptowano
+      disallow: Niedozwolone
+      links:
+        allow: Zezwól na link
+        allow_provider: Zezwalaj na wydawcę
+        description_html: Są to linki, które są obecnie często udostępniane przez konta, z których Twój serwer widzi posty. Może to pomóc Twoim użytkownikom dowiedzieć się, co dzieje się na świecie. Żadne linki nie są wyświetlane publicznie dopóki nie zaakceptujesz wydawcy. Możesz również zezwolić lub odrzucić indywidualne linki.
+        disallow: Nie zezwalaj na link
+        disallow_provider: Nie zezwalaj na wydawcę
+        no_link_selected: Żadne linki nie zostały zmienione, ponieważ żadnych nie wybrano
+        publishers:
+          no_publisher_selected: Żadni publikujcy nie zostali zmienieni, ponieważ żadnych nie wybrano
+        shared_by_over_week:
+          few: Udostępnione przez %{count} osoby w ciągu ostatniego tygodnia
+          many: Udostępnione przez %{count} osób w ciągu ostatniego tygodnia
+          one: Udostępnione przez jedną osobę w ciągu ostatniego tygodnia
+          other: Udostępnione przez %{count} osoby w ciągu ostatniego tygodnia
+        title: Popularne linki
+        usage_comparison: Udostępnione %{today} razy dzisiaj, w porównaniu z %{yesterday} wczoraj
+      only_allowed: Tylko dozwolone
+      pending_review: Oczekuje na przegląd
+      preview_card_providers:
+        allowed: Linki od tego wydawcy mogą podlegać trendom
+        description_html: Są to domeny, z których linki są często udostępniane na Twoim serwerze. Linki nie będą się rozwijały publicznie, chyba że domena linku zostanie zatwierdzona. Twoja zgoda (lub odrzucenie) rozciąga się na subdomeny.
+        rejected: Linki od tego wydawcy nie mogą podlegać trendom
+        title: Wydawcy
+      rejected: Odrzucono
+      statuses:
+        allow: Zezwól na post
+        allow_account: Zezwól na autora
+        description_html: Są to wpisy, o których Twój serwer wie i które są obecnie często udostępniane i dodawane do ulubionych. Może to pomóc nowym i powracającym użytkownikom znaleźć więcej osób do obserwacji. Żadne posty nie są wyświetlane publicznie, dopóki nie zatwierdzisz autora, a autor ustawi zezwolenie na wyświetlanie się w katalogu. Możesz również zezwolić lub odrzucić poszczególne posty.
+        disallow: Nie zezwalaj na post
+        disallow_account: Nie zezwalaj na autora
+        no_status_selected: Żadne popularne wpisy nie zostały zmienione, ponieważ żadnych nie wybrano
+        not_discoverable: Autor nie włączył opcji, by być wyświetlany w katalogu
+        shared_by:
+          few: Udostępnione i dodane do ulubionych %{friendly_count} razy
+          many: Udostępnione i dodane do ulubionych %{friendly_count} razy
+          one: Udostępnione lub dodane do ulubionych jednorazowo
+          other: Udostępnione i dodane do ulubionych %{friendly_count} razy
+        title: Popularne teraz
+      tags:
+        current_score: Bieżący wynik %{score}
+        dashboard:
+          tag_accounts_measure: unikalne zastosowania
+          tag_languages_dimension: Najlepsze języki
+          tag_servers_dimension: Najlepsze serwery
+          tag_servers_measure: różne serwery
+          tag_uses_measure: użyć łącznie
+        description_html: To są hasztagi, które obecnie pojawiają się w wielu wpisach, które widzisz na serwerze. Może to pomóc Twoim użytkownikom dowiedzieć się, o czym obecnie ludzie najchętniej rozmawiają. Żadne hasztagi nie są wyświetlane publicznie, dopóki ich nie zaakceptujesz.
+        listable: Można zasugerować
+        no_tag_selected: Żadne tagi nie zostały zmienione, ponieważ żadnych nie wybrano
+        not_listable: Nie można zasugerować
+        not_trendable: Nie pojawia się pod trendami
+        not_usable: Nie mogą zostać użyte
+        peaked_on_and_decaying: Najwyżej %{date}, teraz idzie w dół
+        title: Popularne hashtagi
+        trendable: Może pojawić się pod trendami
+        trending_rank: 'Popularne #%{rank}'
+        usable: Może być użyty
+        usage_comparison: Używane %{today} razy dzisiaj, w porównaniu z %{yesterday} wczoraj
+        used_by_over_week:
+          few: Użyte przez %{count} osoby w ciągu ostatniego tygodnia
+          many: Użyte przez %{count} osób w ciągu ostatniego tygodnia
+          one: Użyte przez jedną osobę w ciągu ostatniego tygodnia
+          other: Użyte przez %{count} osób w ciągu ostatniego tygodnia
+      title: Na czasie
+      trending: Popularne
     warning_presets:
       add_new: Dodaj nowy
       delete: Usuń
       edit_preset: Edytuj szablon ostrzeżenia
       empty: Nie zdefiniowano jeszcze żadnych szablonów ostrzegawczych.
       title: Zarządzaj szablonami ostrzeżeń
+    webhooks:
+      add_new: Dodaj punkt końcowy
+      delete: Usuń
+      description_html: "<strong>webhook</strong> umożliwia Mastodon dostarczanie <strong>powiadomień w czasie rzeczywistym</strong> o wybranych wydarzeniach do twojej aplikacji, aby mogła <strong>automatycznie wyzwalać reakcje</strong>."
+      disable: Wyłącz
+      disabled: Wyłączone
+      edit: Edytuj punkt końcowy
+      empty: Nie masz jeszcze skonfigurowanych żadnych webhooków do punktów końcowych.
+      enable: Włącz
+      enabled: Aktywne
+      enabled_events:
+        few: "%{count} włączone zdarzenia"
+        many: "%{count} włączonych zdarzeń"
+        one: 1 włączone zdarzenie
+        other: "%{count} włączonych zdarzeń"
+      events: Zdarzenia
+      new: Nowy webhook
+      rotate_secret: Odśwież klucz szyfrowania
+      secret: Podpisywanie klucza szyfrowania
+      status: Stan
+      title: Webhooki
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: aby usunąć ich wpisy
+        disable: aby zamrozić jego/jej konto
+        mark_statuses_as_sensitive: aby oznaczyć swoje posty jako wrażliwe
+        none: ostrzeżenie
+        sensitive: aby oznaczyć konto jako wrażliwe
+        silence: aby ograniczyć swoje konto
+        suspend: aby zawiesić konto
+      body: "%{target} odwołuje się od decyzji moderatora %{action_taken_by} z %{date}, czyli %{type}. Napisał:"
+      next_steps: Możesz zaakceptować odwołanie o cofnięcie decyzji o moderacji lub je zignorować.
+      subject: "%{username} odwołuje się od decyzji moderacyjnej na %{instance}"
     new_pending_account:
       body: Poniżej znajdują się szczegóły dotycząće nowego konta. Możesz przyjąć lub odrzucić to podanie.
       subject: Nowe konto czeka na przegląd na %{instance} (%{username})
@@ -755,9 +929,17 @@ pl:
       body: Użytkownik %{reporter} zgłosił(a) %{target}
       body_remote: Użytkownik instancji %{domain} zgłosił(a) %{target}
       subject: Nowe zgłoszenie na %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Hashtag #%{name} jest dziś popularny, ale nie został wcześniej zatwierdzony. Nie będzie wyświetlany publicznie zanim na to pozwolisz, możesz też zapisać, że nie chcesz o nim już słyszeć.'
-      subject: Nowy hashtag do zatwierdzenia na %{instance} (#%{name})
+    new_trends:
+      body: 'Następujące elementy potrzebują recenzji zanim będą mogły być wyświetlane publicznie:'
+      new_trending_links:
+        title: Popularne linki
+      new_trending_statuses:
+        title: Popularne teraz
+      new_trending_tags:
+        no_approved_tags: Obecnie nie ma żadnych zatwierdzonych popularnych hasztagów.
+        requirements: 'Każdy z tych kandydatów może przekroczyć #%{rank} zatwierdzonych popularnych teraz hasztagów, który wynosi obecnie %{lowest_tag_name} z wynikiem %{lowest_tag_score}.'
+        title: Popularne hasztagi
+      subject: Nowe popularne do przeglądu na %{instance}
   aliases:
     add_new: Utwórz alias
     created_msg: Pomyślnie utworzono nowy alias. Możesz teraz rozpocząć przenoszenie ze starego konta.
@@ -787,33 +969,32 @@ pl:
   applications:
     created: Pomyślnie utworzono aplikację
     destroyed: Pomyślnie usunięto aplikację
-    invalid_url: Wprowadzony adres URL jest nieprawidłowy
     regenerate_token: Wygeneruj nowy token dostępu
     token_regenerated: Pomyślnie wygenerowano nowy token dostępu
     warning: Przechowuj te dane ostrożnie. Nie udostępniaj ich nikomu!
     your_token: Twój token dostępu
   auth:
-    apply_for_account: Poproś o zaproszenie
+    apply_for_account: Poproś o założenie konta
     change_password: Hasło
-    checkbox_agreement_html: Zgadzam się z <a href="%{rules_path}" target="_blank">regułami serwera</a> i <a href="%{terms_path}" target="_blank">zasadami korzystania z usługi</a>
-    checkbox_agreement_without_rules_html: Akceptuję <a href="%{terms_path}" target="_blank">warunki korzystania z usługi</a>
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
     description:
       prefix_invited_by_user: "@%{name} zaprasza Cię do dołączenia na ten serwer Mastodona!"
       prefix_sign_up: Zarejestruj się na Mastodon już dziś!
-      suffix: Mając konto, możesz śledzić ludzi, publikować wpisy i wymieniać się wiadomościami z użytkownikami innych serwerów Mastodona i nie tylko!
+      suffix: Mając konto, możesz obserwować ludzi, publikować wpisy i wymieniać się wiadomościami z użytkownikami innych serwerów Mastodona i nie tylko!
     didnt_get_confirmation: Nie otrzymałeś(-aś) instrukcji weryfikacji?
     dont_have_your_security_key: Nie masz klucza bezpieczeństwa?
     forgot_password: Nie pamiętasz hasła?
     invalid_reset_password_token: Token do resetowania hasła jest nieprawidłowy lub utracił ważność. Spróbuj uzyskać nowy.
     link_to_otp: Wprowadź kod dwustopniowego uwierzytelniania z telefonu lub użyj zapasowego kodu
     link_to_webauth: Użyj swojego urządzenia z kluczem bezpieczeństwa
+    log_in_with: Zaloguj się za pomocą
     login: Zaloguj się
     logout: Wyloguj się
     migrate_account: Przenieś konto
     migrate_account_html: Jeżeli chcesz skonfigurować przekierowanie z obecnego konta na inne, możesz <a href="%{path}">zrobić to tutaj</a>.
     or_log_in_with: Lub zaloguj się z użyciem
+    privacy_policy_agreement_html: Przeczytałem/am i akceptuję <a href="%{privacy_policy_path}" target="_blank">politykę prywatności</a>
     providers:
       cas: CAS
       saml: SAML
@@ -821,33 +1002,41 @@ pl:
     registration_closed: "%{instance} nie przyjmuje nowych członków"
     resend_confirmation: Ponownie prześlij instrukcje weryfikacji
     reset_password: Zresetuj hasło
+    rules:
+      preamble: Są one ustawione i wymuszone przez moderatorów %{domain}.
+      title: Kilka podstawowych zasad.
     security: Bezpieczeństwo
     set_new_password: Ustaw nowe hasło
     setup:
       email_below_hint_html: Jeżeli poniższy adres e-mail jest nieprawidłowy, możesz zmienić go tutaj i otrzymać nowy e-mail potwierdzający.
       email_settings_hint_html: E-mail potwierdzający został wysłany na %{email}. Jeżeli adres e-mail nie jest prawidłowy, możesz zmienić go w ustawieniach konta.
       title: Konfiguracja
+    sign_in:
+      title: Zaloguj się do %{domain}
+    sign_up:
+      preamble: Z kontem na tym serwerze Mastodon będziesz mógł obserwować każdą inną osobę w sieci, niezależnie od miejsca przechowywania ich konta.
+      title: Skonfigurujmy Twoje konto na %{domain}.
     status:
       account_status: Stan konta
       confirming: Oczekiwanie na potwierdzenie adresu e-mail.
-      functional: Twoje konto całkowicie funkcjonuje.
+      functional: Twoje konto jest w pełni funkcjonalne.
       pending: Twoje zgłoszenie czeka na zatwierdzenie przez nas. Może to trochę potrwać. Jeżeli zgłoszenie zostanie przyjęte, otrzymasz wiadomość e-mail.
       redirecting_to: Twoje konto jest nieaktywne, ponieważ obecnie przekierowuje je na %{acct}.
+      view_strikes: Zobacz dawne ostrzeżenia nałożone na twoje konto
     too_fast: Zbyt szybko przesłano formularz, spróbuj ponownie.
-    trouble_logging_in: Masz problem z zalogowaniem się?
     use_security_key: Użyj klucza bezpieczeństwa
   authorize_follow:
-    already_following: Już śledzisz to konto
-    already_requested: Już wysłałeś(-aś) prośbę o możliwość śledzenia tego konta
+    already_following: Już obserwujesz to konto
+    already_requested: Już wysłałeś(-aś) prośbę o możliwość obserwowania tego konta
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
-    follow: Śledź
-    follow_request: 'Wysłano prośbę o pozwolenie na śledzenie:'
-    following: 'Pomyślnie! Od teraz śledzisz:'
+    follow: Obsewuj
+    follow_request: 'Wysłano prośbę o możliwość obserwowania:'
+    following: 'Pomyślnie! Od teraz obserwujesz:'
     post_follow:
       close: Ewentualnie, możesz po prostu zamknąć tę stronę.
       return: Pokaż stronę użytkownika
       web: Przejdź do sieci
-    title: Śledź %{acct}
+    title: Obserwuj %{acct}
   challenge:
     confirm: Kontynuuj
     hint_html: "<strong>Informacja:</strong> Nie będziemy prosić Cię o ponowne podanie hasła przez następną godzinę."
@@ -892,10 +1081,36 @@ pl:
       more_details_html: Aby uzyskać więcej szczegółów, przeczytaj naszą <a href="%{terms_path}">politykę prywatności</a>.
       username_available: Twoja nazwa użytkownika będzie z powrotem dostępna
       username_unavailable: Twoja nazwa użytkownika pozostanie niedostępna
-  directories:
-    directory: Katalog profilów
-    explanation: Poznaj profile na podstawie zainteresowań
-    explore_mastodon: Odkrywaj %{title}
+  disputes:
+    strikes:
+      action_taken: Podjęte działania
+      appeal: Odwołanie
+      appeal_approved: To ostrzeżenie zostało pomyślnie odwołane i nie jest już ważne
+      appeal_rejected: Odwołanie zostało odrzucone
+      appeal_submitted_at: Przesłano odwołanie
+      appealed_msg: Twoje odwołanie zostało złożone. Jeśli zostanie zatwierdzone, zostaniesz powiadomiony.
+      appeals:
+        submit: Zgłoś odwołanie
+      approve_appeal: Zatwierdź odwołanie
+      associated_report: Powiązany raport
+      created_at: Data
+      description_html: Są to działania podjęte przeciwko Twojemu kontu i ostrzeżenia wysłane do ciebie przez administrację %{instance}.
+      recipient: Adresowane do
+      reject_appeal: Odrzuć odwołanie
+      status: 'Post #%{id}'
+      status_removed: Post został już usunięty z systemu
+      title: "%{action} z %{date}"
+      title_actions:
+        delete_statuses: Usuwanie postów
+        disable: Zamrażanie konta
+        mark_statuses_as_sensitive: Oznaczanie postów jako wrażliwych
+        none: Ostrzeżenie
+        sensitive: Oznaczanie konta jako wrażliwe
+        silence: Ograniczenie konta
+        suspend: Zawieszenie konta
+      your_appeal_approved: Twoje odwołanie zostało zatwierdzone
+      your_appeal_pending: Zgłosiłeś odwołanie
+      your_appeal_rejected: Twoje odwołanie zostało odrzucone
   domain_validator:
     invalid_domain: nie jest prawidłową nazwą domeny
   errors:
@@ -944,29 +1159,73 @@ pl:
       public: Publiczne osie czasu
       thread: Konwersacje
     edit:
+      add_keyword: Dodaj słowo kluczowe
+      keywords: Słowa kluczowe
+      statuses: Pojedyncze wpisy
+      statuses_hint_html: Ten filtr ma zastosowanie do wybierania poszczególnych wpisów niezależnie od tego, czy pasują one do słów kluczowych poniżej. <a href="%{path}">Przejrzyj lub usuń wpisy z filtra</a>.
       title: Edytuj filtr
     errors:
+      deprecated_api_multiple_keywords: Te parametry nie mogą zostać zmienione z tej aplikacji, ponieważ dotyczą więcej niż jednego słowa kluczowego. Użyj nowszej wersji aplikacji lub interfejsu internetowego.
       invalid_context: Nie podano lub podano nieprawidłową treść
-      invalid_irreversible: Nieodwracalne filtrowanie działa tylko na stronie głównej i w powiadomieniach
     index:
+      contexts: Filtry w %{contexts}
       delete: Usuń
       empty: Nie masz żadnych filtrów.
+      expires_in: Wygasa za %{distance}
+      expires_on: Wygasa %{date}
+      keywords:
+        few: "%{count} słowa kluczowe"
+        many: "%{count} słów kluczowych"
+        one: "%{count} słowo kluczowe"
+        other: "%{count} słów kluczowych"
+      statuses:
+        few: "%{count} posty"
+        many: "%{count} postów"
+        one: "%{count} post"
+        other: "%{count} postów"
+      statuses_long:
+        few: "%{count} ukryte posty"
+        many: "%{count} ukrytych postów"
+        one: "%{count} ukryty post"
+        other: "%{count} postów ukrytych"
       title: Filtry
     new:
+      save: Zapisz jako nowy filtr
       title: Dodaj nowy filtr
+    statuses:
+      back_to_filter: Powrót do filtra
+      batch:
+        remove: Usuń z filtra
+      index:
+        hint: Ten filtr ma zastosowanie do wybierania poszczególnych wpisów niezależnie od pozostałych kryteriów. Możesz dodać więcej wpisów do tego filtra z interfejsu internetowego.
+        title: Filtrowane posty
   footer:
-    developers: Dla programistów
-    more: Więcej…
-    resources: Zasoby
     trending_now: Obecnie na czasie
   generic:
     all: Wszystkie
+    all_items_on_page_selected_html:
+      few: "<strong>%{count}</strong> elementy na tej stronie są wybrane."
+      many: "<strong>%{count}</strong> elementów na tej stronie jest wybrane."
+      one: "<strong>%{count}</strong> element na tej stronie jest wybrany."
+      other: "<strong>%{count}</strong> elementów na tej stronie jest wybrane."
+    all_matching_items_selected_html:
+      few: Wszystkie <strong>%{count}</strong> elementy pasujące do Twojego wyszukiwania zostały wybrane.
+      many: Wszystkie <strong>%{count}</strong> elementy pasujące do Twojego wyszukiwania zostały wybrane.
+      one: "<strong>%{count}</strong> element pasujący do Twojego wyszukiwania został wybrany."
+      other: Wszystkie <strong>%{count}</strong> elementy pasujące do Twojego wyszukiwania zostały wybrane.
     changes_saved_msg: Ustawienia zapisane!
     copy: Kopiuj
     delete: Usuń
-    no_batch_actions_available: Brak akcji wsadowych dostępnych na tej stronie
+    deselect: Odznacz wszystkie
+    none: Żaden
     order_by: Uporządkuj według
     save_changes: Zapisz zmiany
+    select_all_matching_items:
+      few: Zaznacz wszystkie %{count} elementy pasujące do wyszukiwania.
+      many: Zaznacz wszystkie %{count} elementy pasujące do wyszukiwania.
+      one: Zaznacz %{count} element pasujący do wyszukiwania.
+      other: Zaznacz wszystkie %{count} elementy pasujące do wyszukiwania.
+    today: dzisiaj
     validation_errors:
       few: Coś jest wciąż nie tak! Przejrzyj %{count} poniższe błędy
       many: Coś jest wciąż nie tak! Przejrzyj %{count} poniższych błędów
@@ -974,44 +1233,24 @@ pl:
       other: Coś jest wciąż nie tak! Przejrzyj poniższe błędy (%{count})
   html_validator:
     invalid_markup: 'zawiera nieprawidłową składnię HTML: %{error}'
-  identity_proofs:
-    active: Aktywny
-    authorize: Tak, autoryzuj
-    authorize_connection_prompt: Czy chcesz autoryzować to połączenie kryptograficzne?
-    errors:
-      failed: Połączenioe kryptograficzne nie powiodło się. Spróbuj ponownie z poziomu %{provider}.
-      keybase:
-        invalid_token: Tokeny Keybase są hashami podpisów i musza składać się z 66 znaków heksadecymalnych
-        verification_failed: Keybase nie rozpoznaje tego tokenu jako podpisu użytkownika Keybase %{kb_username}. Spróbuj ponownie z poziomu Keybase.
-      wrong_user: Nie można utworzyć dowodu dla %{proving}, gdy jesteś zalogowany(-a) jako %{current}. Zaloguj się jako %{proving} i spróbuj ponownie.
-    explanation_html: Tutaj możesz połączyć kryptograficznie swoje inne tożsamości, takie jak profil Keybase. To pozwoli innym wysłać Ci szyfrowane wiadomości i zaufać zawartości którą im wysyłasz.
-    i_am_html: Jestem %{username} na %{service}.
-    identity: Tożsamość
-    inactive: Niekatywny
-    publicize_checkbox: 'I opublikuj to:'
-    publicize_toot: 'Udowodnione! Jestem %{username} na %{service}: %{url}'
-    remove: Usuń dowód z konta
-    removed: Pomyślnie usunięto dowód z konta
-    status: Stan weryfikacji
-    view_proof: Wyświetl dowód
   imports:
     errors:
+      invalid_csv_file: 'Nieprawidłowy plik CSV. Błąd: %{error}'
       over_rows_processing_limit: zawiera więcej niż %{count} wierszy
     modes:
       merge: Połącz
       merge_long: Zachowaj obecne wpisy i dodaj nowe
       overwrite: Nadpisz
       overwrite_long: Zastąp obecne wpisy nowymi
-    preface: Możesz zaimportować pewne dane (np. lista kont, które śledzisz lub blokujesz) do swojego konta na tym serwerze, korzystając z danych wyeksportowanych z innego serwera.
+    preface: Możesz zaimportować pewne dane (np. lista kont, które obserwujesz lub blokujesz) do swojego konta na tym serwerze, korzystając z danych wyeksportowanych z innego serwera.
     success: Twoje dane zostały załadowane i zostaną niebawem przetworzone
     types:
       blocking: Lista blokowanych
       bookmarks: Zakładki
       domain_blocking: Lista zablokowanych domen
-      following: Lista śledzonych
+      following: Lista obserwowanych
       muting: Lista wyciszonych
     upload: Załaduj
-  in_memoriam_html: Ku pamięci.
   invites:
     delete: Wygaś
     expired: Wygasły
@@ -1058,7 +1297,7 @@ pl:
   migrations:
     acct: nazwa@domena nowego konta
     cancel: Anuluj przekierowanie
-    cancel_explanation: Anulowanie przekierowania aktywuje Twoje obecne konto ponownie, ale nie przeniesie z powrotem śledzących, których przeniesiono na tamto konto.
+    cancel_explanation: Anulowanie przekierowania aktywuje Twoje obecne konto ponownie, ale nie przeniesie z powrotem obserwujących, których przeniesiono na tamto konto.
     cancelled_msg: Pomyślnie anulowano przekierowanie.
     errors:
       already_moved: jest tym samym kontem, na które już się przeniosłeś(-aś)
@@ -1066,10 +1305,10 @@ pl:
       move_to_self: nie może być bieżącym kontem
       not_found: nie mogło zostać odnalezione
       on_cooldown: Nie możesz teraz przenieść konta
-    followers_count: Śledzący w chwili przenoszenia
+    followers_count: Obserwujący w chwili przenoszenia
     incoming_migrations: Przenoszenie z innego konta
     incoming_migrations_html: Aby przenieść się z innego konta na to, musisz najpierw <a href="%{path}">utworzyć alias konta</a>.
-    moved_msg: Twoje konto przekierowuje teraz na %{acct}, a śledzący są przenoszeni.
+    moved_msg: Twoje konto przekierowuje teraz na %{acct}, a obserwujący są przenoszeni.
     not_redirecting: Twoje konto nie przekierowuje obecnie na żadne inne konto.
     on_cooldown: Ostatnio przeniosłeś(-aś) swoje konto. Ta funkcja będzie dostępna ponownie za %{count} dni.
     past_migrations: Poprzednie migracje
@@ -1082,7 +1321,7 @@ pl:
       before: 'Zanim kontynuujesz, przeczytaj uważnie te uwagi:'
       cooldown: Po przeniesieniu się, istnieje okres przez który nie możesz ponownie się przenieść
       disabled_account: Twoje obecne konto nie będzie później całkowicie użyteczne. Możesz jednak uzyskać dostęp do eksportu danych i ponownie aktywować je.
-      followers: To działanie przeniesie wszystkich Twoich śledzących z obecnego konta na nowe
+      followers: To działanie przeniesie wszystkich Twoich obserwujących z obecnego konta na nowe
       only_redirect_html: Możesz też <a href="%{path}">po prostu skonfigurować przekierowanie na swój profil</a>.
       other_data: Żadne inne dane nie zostaną automatycznie przeniesione
       redirect: Twoje obecne konto zostanie uaktualnione o informację o przeniesieniu i wyłączone z wyszukiwania
@@ -1092,35 +1331,27 @@ pl:
     carry_blocks_over_text: Ten użytkownik przeniósł się z konta %{acct}, które zablokowałeś(-aś).
     carry_mutes_over_text: Ten użytkownik przeniósł się z konta %{acct}, które wyciszyłeś(-aś).
     copy_account_note_text: 'Ten użytkownik przeniósł się z konta %{acct}, oto Twoje poprzednie notatki o nim:'
+  navigation:
+    toggle_menu: Przełącz menu
   notification_mailer:
-    digest:
-      action: Wyświetl wszystkie powiadomienia
-      body: Oto krótkie podsumowanie wiadomości, które ominęły Cię od Twojej ostatniej wizyty (%{since})
-      mention: "%{name} wspomniał o Tobie w:"
-      new_followers_summary:
-        few: "(%{count}) nowe osoby śledzą Cię!"
-        many: "(%{count}) nowych osób Cię śledzi! Wspaniale!"
-        one: Dodatkowo, w czasie nieobecności zaczęła śledzić Cię jedna osoba Gratulacje!
-        other: Dodatkowo, zaczęło Cię śledzić %{count} nowych osób! Wspaniale!
-      subject:
-        few: "%{count} nowe powiadomienia od Twojej ostatniej wizyty \U0001F418"
-        many: "%{count} nowych powiadomień od Twojej ostatniej wizyty \U0001F418"
-        one: "1 nowe powiadomienie od Twojej ostatniej wizyty \U0001F418"
-        other: "%{count} nowych powiadomień od Twojej ostatniej wizyty \U0001F418"
-      title: W trakcie Twojej nieobecności…
+    admin:
+      report:
+        subject: "%{name} wysłał raport"
+      sign_up:
+        subject: "%{name} zarejestrował(-a) się"
     favourite:
       body: 'Twój wpis został polubiony przez %{name}:'
       subject: "%{name} lubi Twój wpis"
       title: Nowe polubienie
     follow:
-      body: "%{name} Cię śledzi!"
-      subject: "%{name} Cię śledzi"
-      title: Nowy śledzący
+      body: "%{name} Cię obserwuje!"
+      subject: "%{name} Cię obserwuje"
+      title: Nowy obserwujący
     follow_request:
-      action: Zarządzaj prośbami o możliwość śledzenia
-      body: "%{name} poprosił(a) o możliwość śledzenia Cię"
-      subject: 'Prośba o możliwość śledzenia: %{name}'
-      title: Nowa prośba o możliwość śledzenia
+      action: Zarządzaj prośbami o możliwość obserwacji
+      body: "%{name} poprosił(a) o możliwość obserwowania Cię"
+      subject: 'Prośba o możliwość obserwowania: %{name}'
+      title: Nowa prośba o możliwość obsewowania
     mention:
       action: Odpowiedz
       body: "%{name} wspomniał(a) o Tobie w:"
@@ -1134,6 +1365,8 @@ pl:
       title: Nowe podbicie
     status:
       subject: "%{name} właśnie opublikował(a) wpis"
+    update:
+      subject: "%{name} edytował/a wpis"
   notifications:
     email_events: 'Powiadamiaj e-mailem o:'
     email_events_hint: 'Wybierz wydarzenia, o których chcesz otrzymywać powiadomienia:'
@@ -1177,6 +1410,8 @@ pl:
     other: Pozostałe
     posting_defaults: Domyślne ustawienia wpisów
     public_timelines: Publiczne osie czasu
+  privacy_policy:
+    title: Polityka prywatności
   reactions:
     errors:
       limit_reached: Przekroczono limit różnych reakcji
@@ -1184,9 +1419,9 @@ pl:
   relationships:
     activity: Aktywność konta
     dormant: Uśpione
-    follow_selected_followers: Zacznij śledzić wybranych śledzących
-    followers: Śledzący
-    following: Śledzeni
+    follow_selected_followers: Zacznij obserwować wybranych obserwujących
+    followers: Obserwujący
+    following: Obserwowani
     invited: Zaproszeni
     last_active: Ostatnia aktywność
     most_recent: Ostatnie
@@ -1194,27 +1429,20 @@ pl:
     mutual: Wspólna
     primary: Jednostronna
     relationship: Relacja
-    remove_selected_domains: Usuń wszystkich śledzących z zaznaczonych domen
-    remove_selected_followers: Usuń zaznaczonych śledzących
-    remove_selected_follows: Przestań śledzić zaznaczonych użytkowników
+    remove_selected_domains: Usuń wszystkich obserwujących z zaznaczonych domen
+    remove_selected_followers: Usuń zaznaczonych obserwujących
+    remove_selected_follows: Przestań obserwować zaznaczonych użytkowników
     status: Stan konta
   remote_follow:
-    acct: Podaj swój adres (nazwa@domena), z którego chcesz wykonać działanie
     missing_resource: Nie udało się znaleźć adresu przekierowania z Twojej domeny
-    no_account_html: Nie masz konta? Możesz <a href='%{sign_up_path}' target='_blank'>zarejestrować się tutaj</a>
-    proceed: Śledź
-    prompt: 'Zamierzasz śledzić:'
-    reason_html: "<strong>Dlaczego ten krok jest konieczny?</strong> <code>%{instance}</code> może nie być serwerem na którym jesteś zarejestrowany(-a), więc musisz zostać przekierowany(-a) na swój serwer."
-  remote_interaction:
-    favourite:
-      proceed: Przejdź do dodania do ulubionych
-      prompt: 'Chcesz dodać ten wpis do ulubionych:'
-    reblog:
-      proceed: Przejdź do podbicia
-      prompt: 'Chcesz podbić ten wpis:'
-    reply:
-      proceed: Przejdź do dodawania odpowiedzi
-      prompt: 'Chcesz odpowiedzieć na ten wpis:'
+  reports:
+    errors:
+      invalid_rules: nie odwołuje się do prawidłowych reguł
+  rss:
+    content_warning: 'Ostrzeżenie o zawartości:'
+    descriptions:
+      account: Publiczne posty od @%{acct}
+      tag: 'Publiczne wpisy oznaczone #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Przekroczyłeś(-aś) limit %{limit} zaplanowanych wpisów na ten dzień
     over_total_limit: Przekroczyłeś(-aś) limit %{limit} zaplanowanych wpisów
@@ -1224,7 +1452,7 @@ pl:
     browser: Przeglądarka
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1238,7 +1466,7 @@ pl:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Obecna sesja
     description: "%{browser} na %{platform}"
@@ -1247,7 +1475,7 @@ pl:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1273,15 +1501,15 @@ pl:
     edit_profile: Edytuj profil
     export: Eksportowanie danych
     featured_tags: Wyróżnione hashtagi
-    identity_proofs: Dowody tożsamości
     import: Importowanie danych
     import_and_export: Import i eksport
     migrate: Migracja konta
     notifications: Powiadomienia
     preferences: Preferencje
     profile: Profil
-    relationships: Śledzeni i śledzący
-    statuses_cleanup: Automatyczne usuwanie posta
+    relationships: Obserwowani i obserwujący
+    statuses_cleanup: Automatyczne usuwanie wpisów
+    strikes: Ostrzeżenia moderacyjne
     two_factor_authentication: Uwierzytelnianie dwuetapowe
     webauthn_authentication: Klucze bezpieczeństwa
   statuses:
@@ -1304,20 +1532,21 @@ pl:
         other: "%{count} filmów"
     boosted_from_html: Podbito przez %{acct_link}
     content_warning: 'Ostrzeżenie o zawartości: %{warning}'
+    default_language: Taki sam jak język interfejsu użytkownika
     disallowed_hashtags:
       few: 'zawiera niedozwolone hashtagi: %{tags}'
       many: 'zawiera niedozwolone hashtagi: %{tags}'
       one: 'zawiera niedozwolony hashtag: %{tags}'
       other: 'zawiera niedozwolone hashtagi: %{tags}'
+    edited_at_html: Edytowane %{date}
     errors:
       in_reply_not_found: Post, na który próbujesz odpowiedzieć, nie istnieje.
-    language_detection: Automatycznie wykrywaj język
     open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
     pin_errors:
+      direct: Nie możesz przypiąć wpisu, który jest widoczny tylko dla wspomnianych użytkowników
       limit: Przekroczyłeś maksymalną liczbę przypiętych wpisów
       ownership: Nie możesz przypiąć cudzego wpisu
-      private: Nie możesz przypiąć niepublicznego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
     poll:
       total_people:
@@ -1339,8 +1568,8 @@ pl:
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Bezpośredni
-      private: Tylko dla śledzących
-      private_long: Widoczne tylko dla osób, które Cię śledzą
+      private: Tylko dla obserwujących
+      private_long: Widoczne tylko dla osób, które Cię obserwują
       public: Publiczne
       public_long: Widoczne dla wszystkich użytkowników
       unlisted: Niewypisane
@@ -1372,6 +1601,7 @@ pl:
       '2629746': 1 miesiąc
       '31556952': 1 rok
       '5259492': 2 miesiące
+      '604800': 1 tydzień
       '63113904': 2 lata
       '7889238': 3 miesiące
     min_age_label: Próg wieku
@@ -1383,91 +1613,11 @@ pl:
     pinned: Przypięty wpis
     reblogged: podbił
     sensitive_content: Wrażliwa zawartość
+  strikes:
+    errors:
+      too_late: Jest za późno na odwołanie się od tego ostrzeżenia
   tags:
     does_not_match_previous_name: nie pasuje do poprzedniej nazwy
-  terms:
-    body_html: |
-      <h2>Polityka prywatności</h2>
-      <h3 id="collect">Jakie informacje zbieramy?</h3>
-
-      <ul>
-      <li><em>Podstawowe informacje o koncie</em>: Podczas rejestracji na tym serwerze, możesz zostać poproszony(-a) o wprowadzenie nazwy użytkownika, adresu e-mail i hasła. Możesz także wprowadzić dodatkowe informacje o profilu, takie jak nazwa wyświetlana i biografia oraz wysłać awatar i obraz nagłówka. Nazwa użytkownika, nazwa wyświetlana, biografia, awatar i obraz nagłówka są zawsze widoczne dla wszystkich.</li>
-      <li><em>Wpisy, śledzenie i inne publiczne informacje</em>: Lista osób które śledzisz jest widoczna publicznie, tak jak lista osób, które Cię śledzą. Jeżeli dodasz wpis, data i czas jego utworzenia i aplikacja, z której go wysłano są przechowywane. Wiadomości mogą zawierać załączniki multimedialne, takie jak zdjęcia i filmy. Publiczne i niewidoczne wpisy są dostępne publicznie. Udostępniony wpis również jest widoczny publicznie. Twoje wpisy są dostarczane obserwującym, co oznacza że jego kopie mogą zostać dostarczone i być przechowywane na innych serwerach. Kiedy usuniesz wpis, przestaje być widoczny również dla osób śledzących Cię. „Podbijanie” i dodanie do ulubionych jest zawsze publiczne.</li>
-      <li><em>Wpisy bezpośrednie i tylko dla śledzących</em>: Wszystkie wpisy są przechowywane i przetwarzane na serwerze. Wpisy przeznaczone tylko dla śledzących są widoczne tylko dla nich i osób wspomnianych we wpisie, a wpisy bezpośrednie tylko dla wspomnianych. W wielu przypadkach oznacza to, że ich kopie są dostarczane i przechowywane na innych serwerach. Staramy się ograniczać zasięg tych wpisów wyłącznie do właściwych odbiorców, ale inne serwery mogą tego nie robić. Ważne jest, aby sprawdzać jakich serwerów używają osoby, które Cię śledzą. Możesz aktywować opcję pozwalającą na ręczne akceptowanie i odrzucanie nowych śledzących. <em>Pamiętaj, że właściciele serwerów mogą zobaczyć te wiadomości</em>, a odbiorcy mogą wykonać zrzut ekranu, skopiować lub udostępniać ten wpis. <em>Nie udostępniaj wrażliwych danych z użyciem Mastodona.</em></li>
-      <li><em>Adresy IP i inne metadane</em>: Kiedy zalogujesz się, przechowujemy adres IP użyty w trakcie logowania wraz z nazwą używanej przeglądarki. Wszystkie aktywne sesje możesz zobaczyć (i wygasić) w ustawieniach. Ostatnio używany adres IP jest przechowywany przez nas do 12 miesięcy. Możemy również przechowywać adresy IP wykorzystywane przy każdym działaniu na serwerze.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">W jakim celu wykorzystujecie informacje?</h3>
-
-      <p>Zebrane informacje mogą zostać użyte w następujące sposoby:</p>
-
-      <ul>
-      <li>Aby dostarczyć podstawową funkcjonalność Mastodona. Możesz wchodzić w interakcje z zawartością tworzoną przez innych tylko gdy jesteś zalogowany. Na przykład, możesz śledzić innych, aby widzieć ich wpisy w dostosowanej osi czasu.</li>
-      <li>Aby wspomóc moderację społeczności, na przykład porównując Twój adres IP ze znanymi, aby rozpoznać próbę obejścia blokady i inne naruszenia.</li>
-      <li>Adres e-mail może zostać wykorzystany, aby wysyłać Ci informacje, powiadomienia o osobach wchodzących w interakcje z tworzoną przez Ciebie zawartością, wysyłających Ci wiadomości, odpowiadać na zgłoszenia i inne żądania lub zapytania.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">W jaki sposób chronimy Twoje dane?</h3>
-
-      <p>Wykorzystujemy różne zabezpieczenia, aby zapewnić bezpieczeństwo informacji, które wprowadzasz, wysyłasz lub do których uzyskujesz dostęp. Poza tym, sesja przeglądarki oraz ruch pomiędzy aplikacją a API jest zabezpieczany z użyciem SSL, a hasło jest hashowane z użyciem silnego algorytmu. Możesz też aktywować uwierzytelnianie dwustopniowe, aby lepiej zabezpieczyć dostęp do konta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Jaka jest nasza polityka przechowywania danych?</h3>
-
-      <p>Staramy się:</p>
-
-      <ul>
-      <li>Przechowywać logi zawierające adresy IP używane przy każdym żądaniu do serwera przez nie dłużej niż 90 dni.</li>
-      <li>Przechowywać adresy IP przypisane do użytkowników przez nie dłużej niż 12 miesięcy.</li>
-      </ul>
-
-      <p>Możesz zażądać i pobrać archiwum tworzonej zawartości, wliczając Twoje wpisy, załączniki multimedialne, awatar i zdjęcie nagłówka.</p>
-
-      <p>Możesz nieodwracalnie usunąć konto w każdej chwili.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Czy używany plików cookies?</h3>
-
-      <p>Tak. Pliki cookies są małymi plikami, które strona lub dostawca jej usługi dostarcza na dysk twardy komputera z użyciem przeglądarki internetowej (jeżeli na to pozwoli). Pliki cookies pozwalają na rozpoznanie przeglądarki i – jeśli jesteś zarejestrowany(-a) – przypisanie jej do konta.</p>
-
-      <p>Wykorzystujemy pliki cookies, aby przechowywać preferencje użytkowników na przyszłe wizyty.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Czy przekazujemy informacje osobom trzecim?</h3>
-
-      <p>Nie sprzedajemy, nie wymieniamy i nie przekazujemy osobom trzecim informacji pozwalających na identyfikację Ciebie. Nie dotyczy to zaufanych dostawców pomagających w prowadzeniu strony lub obsługiwaniu użytkowników, jeżeli zgadzają się, aby nie przekazywać dalej tych informacji. Możemy również udostępnić informacje, jeżeli uważany to za wymagane przez prawo, konieczne do wypełnienia polityki strony, przestrzegania naszych lub cudzych praw, własności i bezpieczeństwa.</p>
-
-      <p>Twoja publiczna zawartość może zostać pobrana przez inne serwery w sieci. Wpisy publiczne i tylko dla śledzących są dostarczane na serwery, na których znajdują się śledzący Cię, a wiadomości bezpośrednie trafiają na serwery adresatów, jeżeli są oni użytkownikami innego serwera.</p>
-
-      <p>Kiedy pozwolisz aplikacji na dostęp do Twojego konta, w zależności od nadanych jej pozwoleń, może uzyskać dostęp do publicznych informacji, listy śledzonych, Twoich list, wszystkich wpisów i ulubionych. Aplikacje nie mogą uzyskać dostępu do Twojego adresu e-mail i hasła.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Korzystanie ze strony przez dzieci</h3>
-
-      <p>Jeżeli serwer znajduje się w UE lub w EOG: Ta strona, produkty i usługi są przeznaczone dla osób, które ukończyły 16 lat. Jeżeli nie ukończyłeś(-aś) 16 roku życia, zgodnie z wymogami RODO (<a href="https://pl.wikipedia.org/wiki/Ogólne_rozporządzenie_o_ochronie_danych">Ogólne rozporządzenie o ochronie danych</a>), nie używaj tej strony.</p>
-
-      <p>Jeżeli serwer znajduje się w USA: Ta strona, produkty i usługi są przeznaczone dla osób, które ukończyły 13 lat. Jeżeli nie ukończyłeś(-aś) 13 roku życia, zgodnie z wymogami COPPA (<a href="https://pl.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Prawo o Ochronie Prywatności Dzieci w Internecie</a>), nie używaj tej strony.</p>
-
-      <p>Wymogi mogą być inne, jeżeli serwer znajduje się w innym kraju.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Zmiany w naszej polityce prywatności</h3>
-
-      <p>Jeżeli zdecydujemy się na zmiany w polityce prywatności, pojawią się na tej stronie.</p>
-
-      <p>Dokument jest dostępny na licencji CC-BY-SA. Ostatnio zmodyfikowano go 7 marca 2018, przetłumaczono 9 kwietnia 2018. Tłumaczenie (mimo dołożenia wszelkich starań) może nie być w pełni poprawne.</p>
-
-      <p>Bazowano na <a href="https://github.com/discourse/discourse">polityce prywatności Discourse</a>.</p>
-    title: Zasady korzystania i polityka prywatności %{instance}
   themes:
     contrast: Mastodon (Wysoki kontrast)
     default: Mastodon (Ciemny)
@@ -1476,6 +1626,7 @@ pl:
     formats:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Dodaj
     disable: Wyłącz
@@ -1485,70 +1636,80 @@ pl:
     enabled_success: Pomyślnie aktywowano uwierzytelnianie dwuetapowe
     generate_recovery_codes: Generuj kody zapasowe
     lost_recovery_codes: Kody zapasowe pozwolą uzyskać dostęp do portalu, jeżeli utracisz dostęp do telefonu. Jeżeli utracisz dostęp do nich, możesz wygenerować je ponownie tutaj. Poprzednie zostaną unieważnione.
-    methods: Metody uwierzytelniania dwuetapowego
+    methods: Metody uwierzytelniania dwuskładnikowego
     otp: Aplikacja uwierzytelniająca
     recovery_codes: Przywróć kody zapasowe
     recovery_codes_regenerated: Pomyślnie wygenerowano ponownie kody zapasowe
     recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>. Na przykład, wydrukuj je i przechowuj z ważnymi dokumentami.
     webauthn: Klucze bezpieczeństwa
   user_mailer:
+    appeal_approved:
+      action: Przejdź do swojego konta
+      explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało zatwierdzone. Twoje konto jest ponownie w dobrej kondycji.
+      subject: Twoje odwołanie z dnia %{date} zostało zatwierdzone
+      title: Odwołanie zatwierdzone
+    appeal_rejected:
+      explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało odrzucone.
+      subject: Twoje odwołanie z dnia %{date} zostało odrzucone
+      title: Odwołanie odrzucone
     backup_ready:
       explanation: Zażądałeś pełnej kopii zapasowej konta na Mastodonie. Jest ona dostępna do pobrania!
       subject: Twoje archiwum jest gotowe do pobrania
       title: Odbiór archiwum
-    sign_in_token:
-      details: 'Oto szczegóły próby:'
-      explanation: 'Wykryliśmy próbę zalogowania na Twoje konto z adresu IP którego nie możemy rozpoznać. Jeżeli to Ty, wprowadź poniższy kod na stronie logowania:'
-      further_actions: 'Jeśli to nie Ty, zmień swoje hasło i włącz weryfikację dwuetapową na swoim koncie. Możesz to zrobić tutaj:'
-      subject: Potwierdź próbę zalogowania
-      title: Próba logowania
+    suspicious_sign_in:
+      change_password: zmień hasło
+      details: 'Oto szczegóły logowania:'
+      explanation: Wykryliśmy logowanie na Twoje konto z nowego adresu IP.
+      further_actions_html: Jeśli to nie Ty, zalecamy %{action} natychmiastowo i włącz uwierzytelnianie dwuetapowe, aby Twoje konto było bezpieczne.
+      subject: Uzyskano dostęp do twojego konta z nowego adresu IP
+      title: Nowe logowanie
     warning:
+      appeal: Złóż odwołanie
+      appeal_description: Jeśli uważasz, że zaszło nieporozumienie, możesz złożyć odwołanie do zespołu %{instance}.
+      categories:
+        spam: Spam
+        violation: Zawartość narusza następujące wytyczne społeczności
       explanation:
-        disable: Kiedy Twoje konto jest wyłączone, Twoje dane pozostają na serwerze, ale nie możesz wykonywać żadnych działań, zanim zostanie odblokowane.
-        sensitive: Wysyłane przez Ciebie pliki multimedialne i media z odnośników będą traktowane jako wrażliwe.
-        silence: Kiedy Twoje konto jest ograniczone, tylko osoby które je śledzą będą widzieć Twoje wpisy. Może ono też przestać być widoczne na publicznych listach. Inni wciąż mogą zacząć Cię śledzić.
-        suspend: Twoje konto zostało zawieszone i wszystkie Twoje wpisy wraz z zawartością multimedialną zostały nieodwracalnie usunięte z tego serwera i serwerów, których użytkownicy śledzili Cię.
-      get_in_touch: Możesz odpowiedzieć na ten e-mail aby pozostać w kontakcie z prowadzącymi %{instance}.
-      review_server_policies: Przejrzyj zasady serwera
-      statuses: 'Szczególnie dla:'
+        delete_statuses: Stwierdzono, że niektóre z twoich wpisów łamią jedną lub więcej wytycznych dla społeczności, przez co zostały usunięte przez moderatorów %{instance}.
+        disable: Nie możesz już używać swojego konta, ale Twój profil i inne dane pozostają nienaruszone. Możesz poprosić o kopię swoich danych, zmienić ustawienia konta lub usunąć swoje konto.
+        mark_statuses_as_sensitive: Niektóre z Twoich postów zostały oznaczone jako wrażliwe przez moderatorów %{instance}. Oznacza to, że ludzie będą musieli dotknąć mediów w postach przed wyświetleniem podglądu. Możesz oznaczyć media jako wrażliwe podczas publikowania w przyszłości.
+        sensitive: Od teraz wszystkie przesłane pliki multimedialne będą oznaczone jako wrażliwe i ukryte za ostrzeżeniem kliknięcia.
+        silence: Kiedy Twoje konto jest ograniczone, tylko osoby, które je obserwują, będą widzieć Twoje wpisy. Może ono też przestać być widoczne w funkcjach odkrywania. Inni wciąż mogą zacząć Cię obserwować.
+        suspend: Nie możesz już używać Twojego konta, a Twój profil i inne dane nie są już dostępne. Zanim w pełni usuniemy Twoje dane po około 30 dniach, możesz nadal zalogować się, aby uzyskać ich kopię. Zachowamy pewne podstawowe dane, aby zapobiegać obchodzeniu przez Ciebie zawieszenia.
+      reason: 'Powód:'
+      statuses: 'Cytowane posty:'
       subject:
+        delete_statuses: Twoje wpisy na %{acct} zostały usunięte
         disable: Twoje konto %{acct} zostało wyłączone
+        mark_statuses_as_sensitive: Twoje posty na %{acct} zostały oznaczone jako wrażliwe
         none: Ostrzeżenie dla %{acct}
-        sensitive: Zawartość multimedialna publikowana przez Twoje konto %{acct} została oznaczona jako wrażliwa
+        sensitive: Twoje posty na %{acct} będą od teraz oznaczone jako wrażliwe
         silence: Twoje konto %{acct} zostało ograniczone
         suspend: Twoje konto %{acct} zostało zawieszone
       title:
+        delete_statuses: Wpisy usunięte
         disable: Konto wyłączone
+        mark_statuses_as_sensitive: Posty oznaczone jako wrażliwe
         none: Ostrzeżenie
-        sensitive: Twoja zawartość multimedialna została oznaczona jako wrażliwa
+        sensitive: Konto oznaczone jako wrażliwe
         silence: Konto ograniczone
         suspend: Konto zawieszone
     welcome:
       edit_profile_action: Skonfiguruj profil
-      edit_profile_step: Możesz dostosować profil wysyłając awatar, obraz nagłówka, zmieniając wyświetlaną nazwę i wiele więcej. Jeżeli chcesz, możesz zablokować konto, aby kontrolować, kto może Cię śledzić.
+      edit_profile_step: Możesz dostosować profil wysyłając awatar, zmieniając wyświetlaną nazwę i o wiele więcej. Jeżeli chcesz, możesz również włączyć przeglądanie i ręczne akceptowanie nowych próśb o możliwość obserwacji Twojego profilu.
       explanation: Kilka wskazówek, które pomogą Ci rozpocząć
       final_action: Zacznij pisać
-      final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie śledzi, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
+      final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie obserwuje, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
       full_handle: Twój pełny adres
-      full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć śledzić z innego serwera.
-      review_preferences_action: Zmień ustawienia
-      review_preferences_step: Upewnij się, że zmieniłeś(-aś) ustawienia, takie jak maile, które chciałbyś otrzymywać lub domyślne opcje prywatności. Jeżeli nie masz choroby lokomocyjnej, możesz włączyć automatyczne odtwarzanie animacji GIF.
+      full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć obserwować z innego serwera.
       subject: Witaj w Mastodonie
-      tip_federated_timeline: Oś czasu federacji przedstawia całą sieć Mastodona. Wyświetla tylko wpisy osób, które śledzą użytkownicy Twojej instancji, więc nie jest kompletna.
-      tip_following: Domyślnie śledzisz administratora/ów swojej instancji. Aby znaleźć więcej ciekawych ludzi, zajrzyj na lokalną i federalną oś czasu.
-      tip_local_timeline: Lokalna oś czasu przedstawia osoby z %{instance}. To Twoi najbliżsi sąsiedzi!
-      tip_mobile_webapp: Jeżeli Twoja przeglądarka pozwala na dodanie Mastodona na ekran główny, będziesz otrzymywać natychmiastowe powiadomienia. Działa to prawie jak natywna aplikacja!
-      tips: Wskazówki
       title: Witaj na pokładzie, %{name}!
   users:
-    follow_limit_reached: Nie możesz śledzić więcej niż %{limit} osób
-    generic_access_help_html: Nie możesz uzyskać dostępu do konta? Skontaktuj się z %{email} aby uzyskać pomoc
+    follow_limit_reached: Nie możesz obserwować więcej niż %{limit} osób
     invalid_otp_token: Kod uwierzytelniający jest niepoprawny
-    invalid_sign_in_token: Nieprawidłowy kod zabezpieczający
     otp_lost_help_html: Jeżeli utracisz dostęp do obu, możesz skontaktować się z %{email}
     seamless_external_login: Zalogowano z użyciem zewnętrznej usługi, więc ustawienia hasła i adresu e-mail nie są dostępne.
-    signed_in_as: 'Zalogowany jako:'
-    suspicious_sign_in_confirmation: Wygląda na to, że nie logowałeś się wcześniej z tego urządzenia i przez jakiś czas nie logowałeś się, więc wysłaliśmy na Twój adres e-mail kod zabezpieczający, aby potwierdzić, że to Ty.
+    signed_in_as: 'Zalogowano jako:'
   verification:
     explanation_html: 'Możesz <strong>zweryfikować siebie jako właściciela stron, do których odnośniki znajdują się w metadanych</strong>. Aby to zrobić, strona musi zawierać odnośnik do Twojego profilu na Mastodonie. Odnośnik <strong>musi</strong> zawierać atrybut <code>rel="me"</code>. Jego zawartość nie ma znaczenia. Przykład:'
     verification: Weryfikacja
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index e5088e712..b6202f0e6 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1,134 +1,75 @@
 ---
 pt-BR:
   about:
-    about_hashtag_html: Estes são toots públicos com a hashtag <strong>#%{hashtag}</strong>. Você pode interagir com eles se tiver uma conta em qualquer lugar no fediverso.
     about_mastodon_html: 'A rede social do futuro: Sem anúncios, sem vigilância corporativa, com design ético e muita descentralização! Possua seus próprios dados com o Mastodon!'
-    about_this: Sobre
-    active_count_after: ativo
-    active_footnote: Usuários Ativos Mensalmente (UAM)
-    administered_by: 'Administrado por:'
-    api: API
-    apps: Aplicativos
-    apps_platforms: Use o Mastodon a partir do iOS, Android e outras plataformas
-    browse_directory: Navegue pelo diretório de perfis e filtre por interesses
-    browse_local_posts: Navegue pelos toots públicos locais em tempo real
-    browse_public_posts: Navegue pelos toots públicos globais em tempo real
-    contact: Contato
     contact_missing: Não definido
     contact_unavailable: Não disponível
-    discover_users: Descubra usuários
-    documentation: Documentação
-    federation_hint_html: Com uma conta em %{instance} você vai poder seguir e interagir com pessoas de qualquer canto do fediverso.
-    get_apps: Experimente um aplicativo
-    hosted_on: Instância Mastodon em %{domain}
-    instance_actor_flash: |
-      Esta conta é um ator virtual usado para representar o próprio servidor e não qualquer usuário individual.
-      É usado para propósitos de federação e não deve ser bloqueado a menos que queira bloquear toda a instância, o que no caso devia usar um bloqueio de domínio.
-    learn_more: Saiba mais
-    privacy_policy: Política de Privacidade
-    rules: Regras do servidor
-    rules_html: 'Abaixo está um resumo das regras que você precisa seguir se você quer ter uma conta neste servidor do Mastodon:'
-    see_whats_happening: Veja o que está acontecendo
-    server_stats: 'Estatísticas da instância:'
-    source_code: Código-fonte
-    status_count_after:
-      one: toot
-      other: toots
-    status_count_before: Autores de
-    tagline: Siga seus amigos e faça novas amizades
-    terms: Termos de serviço
-    unavailable_content: Conteúdo indisponível
-    unavailable_content_description:
-      domain: Instância
-      reason: 'Motivo:'
-      rejecting_media: 'Arquivos de mídia destas instâncias não serão processados ou armazenados e nenhuma miniatura será exibida, exigindo que o usuário abra o arquivo original manualmente:'
-      rejecting_media_title: Mídia filtrada
-      silenced: 'Toots destas instâncias serão ocultos em linhas e conversas públicas, e nenhuma notificação será gerada a partir das interações dos seus usuários, a menos que esteja sendo seguido:'
-      silenced_title: Servidores silenciados
-      suspended: 'Você não será capaz de seguir ninguém destas instâncias, e nenhum dado delas será processado, armazenado ou trocado:'
-      suspended_title: Servidores banidos
-    unavailable_content_html: Mastodon geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.
-    user_count_after:
-      one: usuário
-      other: usuários
-    user_count_before: Casa de
-    what_is_mastodon: O que é Mastodon?
+    hosted_on: Servidor Mastodon em %{domain}
+    title: Sobre
   accounts:
-    choices_html: 'Sugestões de %{name}:'
-    endorsements_hint: Você pode sugerir pessoas que você segue, elas aparecerão aqui.
-    featured_tags_hint: Você pode destacar hashtags específicas, elas aparecerão aqui.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: Seguindo
     instance_actor_flash: Esta conta é um ator virtual usado para representar o próprio servidor e não um usuário individual. É utilizada para fins de federação e não deve ser suspensa.
-    joined: Entrou em %{date}
     last_active: última atividade
     link_verified_on: O link foi verificado em %{date}
-    media: Mídia
-    moved_html: "%{name} se mudou para %{new_profile_link}:"
-    network_hidden: Informação indisponível
-    never_active: Nunca
     nothing_here: Nada aqui!
-    people_followed_by: Pessoas que %{name} segue
-    people_who_follow: Pessoas que seguem %{name}
     pin_errors:
       following: Você deve estar seguindo a pessoa que você deseja sugerir
     posts:
-      one: Toot
-      other: Toots
-    posts_tab_heading: Toots
-    posts_with_replies: Toots e respostas
-    roles:
-      admin: Admin
-      bot: Robô
-      group: Grupo
-      moderator: Moderador
-    unavailable: Perfil indisponível
-    unfollow: Deixar de seguir
+      one: Publicação
+      other: Publicações
+    posts_tab_heading: Publicações
   admin:
     account_actions:
       action: Tomar uma atitude
       title: Moderar %{acct}
     account_moderation_notes:
       create: Deixar nota
-      created_msg: Nota de moderação criada com sucesso!
-      delete: Excluir
-      destroyed_msg: Nota de moderação excluída com sucesso!
+      created_msg: Nota de moderação criada!
+      destroyed_msg: Nota de moderação excluída!
     accounts:
-      add_email_domain_block: Adicionar o domínio de e-mail à lista negra
+      add_email_domain_block: Bloquear domínio de e-mail
       approve: Aprovar
-      approve_all: Aprovar tudo
-      approved_msg: Aprovado com sucesso o pedido de registro de %{username}
+      approved_msg: O registro de %{username} foi aprovado
       are_you_sure: Você tem certeza?
       avatar: Imagem de perfil
       by_domain: Domínio
       change_email:
-        changed_msg: E-mail da conta alterado com sucesso!
+        changed_msg: E-mail alterado!
         current_email: E-mail atual
         label: Alterar e-mail
         new_email: Novo e-mail
         submit: Alterar e-mail
         title: Alterar e-mail para %{username}
+      change_role:
+        changed_msg: Cargo alterado!
+        label: Alterar cargo
+        no_role: Sem cargo
+        title: Alterar cargo para %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      custom: Personalizar
       delete: Excluir dados
       deleted: Excluído
       demote: Rebaixar
       destroyed_msg: Os dados de %{username} estão na fila para serem excluídos em breve
       disable: Congelar
+      disable_sign_in_token_auth: Desativar autenticação via token por email
       disable_two_factor_authentication: Desativar autenticação de dois fatores
-      disabled: Desativada
+      disabled: Congelada
       display_name: Nome de exibição
       domain: Domínio
       edit: Editar
       email: E-mail
-      email_status: Status do e-mail
+      email_status: Estado do e-mail
       enable: Descongelar
+      enable_sign_in_token_auth: Ativar autenticação via token por email
       enabled: Ativada
-      enabled_msg: Descongelada com sucesso a conta de %{username}
+      enabled_msg: A conta de %{username} foi descongelada
       followers: Seguidores
       follows: Seguindo
       header: Capa
@@ -139,79 +80,85 @@ pt-BR:
       joined: Entrou
       location:
         all: Todos
+        local: Local
         remote: Remoto
         title: Localização
       login_status: Situação da conta
       media_attachments: Mídias anexadas
       memorialize: Converter em memorial
       memorialized: Convertidas em memorial
-      memorialized_msg: Transformou com sucesso %{username} em uma conta memorial
+      memorialized_msg: A conta de %{username} foi transformada em uma conta memorial
       moderation:
         active: Ativo
         all: Todos
         pending: Pendente
-        silenced: Silenciados
-        suspended: Banidos
+        silenced: Limitado
+        suspended: Suspendido
         title: Moderação
       moderation_notes: Notas de moderação
       most_recent_activity: Atividade mais recente
       most_recent_ip: IP mais recente
       no_account_selected: Nenhuma conta foi alterada, pois nenhuma conta foi selecionada
-      no_limits_imposed: Nenhum limite imposto
+      no_limits_imposed: Sem limite imposto
+      no_role_assigned: Sem cargo
       not_subscribed: Não inscrito
       pending: Revisão pendente
-      perform_full_suspension: Banir
+      perform_full_suspension: Suspender
+      previous_strikes: Avisos anteriores
+      previous_strikes_description_html:
+        one: Esta conta tem <strong>um</strong> aviso.
+        other: Esta conta tem <strong>%{count}</strong> ataques.
       promote: Promover
       protocol: Protocolo
       public: Público
       push_subscription_expires: Inscrição PuSH expira
       redownload: Atualizar perfil
-      redownloaded_msg: Atualizado com sucesso o perfil de %{username} a partir da origem
-      reject: Vetar
-      reject_all: Vetar tudo
-      rejected_msg: Rejeitado com sucesso o pedido de registro de %{username}
+      redownloaded_msg: O perfil de %{username} foi atualizado a partir da origem
+      reject: Rejeitar
+      rejected_msg: O pedido de registro de %{username} foi rejeitado
       remove_avatar: Remover imagem de perfil
       remove_header: Remover capa
-      removed_avatar_msg: Removida com sucesso a imagem de avatar de %{username}
-      removed_header_msg: Removida com sucesso a imagem de capa de %{username}
+      removed_avatar_msg: A imagem de perfil de %{username} foi removida
+      removed_header_msg: A capa de %{username} foi removida
       resend_confirmation:
         already_confirmed: Este usuário já está confirmado
         send: Reenviar o e-mail de confirmação
-        success: E-mail de confirmação enviado com sucesso!
+        success: E-mail de confirmação enviado!
       reset: Redefinir
       reset_password: Redefinir senha
       resubscribe: Reinscrever-se
-      role: Permissões
-      roles:
-        admin: Administrador
-        moderator: Moderador
-        staff: Equipe
-        user: Usuário
-      search: Pesquisar
+      role: Cargo
+      search: Buscar
       search_same_email_domain: Outros usuários com o mesmo domínio de e-mail
       search_same_ip: Outros usuários com o mesmo IP
+      security_measures:
+        only_password: Apenas senha
+        password_and_2fa: Senha e autenticação de dois fatores
       sensitive: Sensíveis
       sensitized: marcadas como sensíveis
       shared_inbox_url: Link da caixa de entrada compartilhada
       show:
-        created_reports: Denúncias desta conta
-        targeted_reports: Denúncias sobre esta conta
+        created_reports: Denúncias criadas
+        targeted_reports: Vezes denunciado
       silence: Silenciar
       silenced: Silenciado
-      statuses: Toots
+      statuses: Publicações
+      strikes: Avisos anteriores
       subscribe: Inscrever-se
-      suspended: Banido
-      suspension_irreversible: Os dados desta conta foram excluídos de forma irreversível. Você pode remover a suspensão da conta para torná-la utilizável, mas ela não irá recuperar nenhum dado que ela possuía anteriormente.
+      suspend: Suspender
+      suspended: Suspendido
+      suspension_irreversible: Os dados desta conta foram excluídos de forma irreversível. Você pode remover a suspensão da conta para torná-la utilizável, mas ela não recuperará nenhum dado que ela possuía anteriormente.
       suspension_reversible_hint_html: A conta foi suspensa e os dados serão totalmente removidos em %{date}. Até lá, a conta pode ser restaurada sem nenhum efeito negativo. Se você deseja remover todos os dados da conta imediatamente, você pode fazer isso abaixo.
-      time_in_queue: Esperando na fila por %{time}
       title: Contas
+      unblock_email: Desbloquear endereço de e-mail
+      unblocked_email_msg: O endereço de e-mail de %{username} foi desbloqueado
       unconfirmed_email: E-mail não confirmado
       undo_sensitized: Desfazer sensível
       undo_silenced: Desfazer silêncio
       undo_suspension: Desbanir
-      unsilenced_msg: Removidas com sucesso as limitações da conta de %{username}
+      unsilenced_msg: As limitações da conta de %{username} foram removidas
       unsubscribe: Cancelar inscrição
-      unsuspended_msg: Removida com sucesso a suspensão da conta de %{username}
+      unsuspended_msg: A suspensão da conta de %{username} foi removida
       username: Nome de usuário
       view_domain: Ver resumo para o domínio
       warn: Notificar
@@ -219,57 +166,130 @@ pt-BR:
       whitelisted: Permitido
     action_logs:
       action_types:
-        assigned_to_self_report: Adicionar relatório
-        change_email_user: Editar e-mail do usuário
-        confirm_user: Confirmar Usuário
-        create_account_warning: Criar Aviso
-        create_announcement: Criar Anúncio
-        create_custom_emoji: Criar Emoji Personalizado
-        create_domain_allow: Adicionar domínio permitido
-        create_domain_block: Criar Bloqueio de Domínio
-        create_email_domain_block: Criar Bloqueio de Domínio de E-mail
+        approve_appeal: Aprovar revisão
+        approve_user: Aprovar usuário
+        assigned_to_self_report: Atribuir denúncia
+        change_email_user: Alterar e-mail do usuário
+        change_role_user: Alterar cargo do usuário
+        confirm_user: Confirmar usuário
+        create_account_warning: Criar aviso
+        create_announcement: Criar anúncio
+        create_canonical_email_block: Criar bloqueio de e-mail
+        create_custom_emoji: Criar emoji personalizado
+        create_domain_allow: Permitir domínio
+        create_domain_block: Bloquear domínio
+        create_email_domain_block: Bloquear domínio de e-mail
         create_ip_block: Criar regra de IP
+        create_unavailable_domain: Criar domínio indisponível
+        create_user_role: Criar cargo
         demote_user: Rebaixar usuário
         destroy_announcement: Excluir anúncio
+        destroy_canonical_email_block: Desbloquear domínio de e-mail
         destroy_custom_emoji: Excluir emoji personalizado
         destroy_domain_allow: Excluir domínio permitido
-        destroy_domain_block: Excluir Bloqueio de Domínio
-        destroy_email_domain_block: Excluir bloqueio de domínio de e-mail
+        destroy_domain_block: Desbloquear domínio
+        destroy_email_domain_block: Desbloquear domínio de e-mail
+        destroy_instance: Limpar domínio
         destroy_ip_block: Excluir regra de IP
-        destroy_status: Excluir Status
+        destroy_status: Excluir publicação
+        destroy_unavailable_domain: Excluir domínio indisponível
+        destroy_user_role: Destruir cargo
         disable_2fa_user: Desativar autenticação de dois fatores
-        disable_custom_emoji: Desativar Emoji Personalizado
+        disable_custom_emoji: Desativar emoji personalizado
+        disable_sign_in_token_auth_user: Desativar autenticação via token por email para Usuário
         disable_user: Desativar usuário
-        enable_custom_emoji: Ativar Emoji Personalizado
+        enable_custom_emoji: Ativar emoji personalizado
+        enable_sign_in_token_auth_user: Ativar autenticação via token por email para Usuário
         enable_user: Ativar usuário
         memorialize_account: Converter conta em memorial
         promote_user: Promover usuário
-        remove_avatar_user: Remover Avatar
-        reopen_report: Reabrir Relatório
+        reject_appeal: Rejeitar revisão
+        reject_user: Rejeitar usuário
+        remove_avatar_user: Remover imagem de perfil
+        reopen_report: Reabrir relatório
+        resend_user: Reenviar o e-mail de confirmação
         reset_password_user: Redefinir a senha
-        resolve_report: Resolver Relatório
+        resolve_report: Resolver denúncia
         sensitive_account: Marcar a mídia na sua conta como sensível
         silence_account: Silenciar conta
-        suspend_account: Suspender Conta
-        unassigned_report: Remover relatório
+        suspend_account: Suspender conta
+        unassigned_report: Desatribuir denúncia
+        unblock_email_account: Desbloquear endereço de e-mail
         unsensitive_account: Desmarcar a mídia na sua conta como sensível
         unsilence_account: Desfazer silenciar conta
         unsuspend_account: Remover suspensão de conta
         update_announcement: Editar anúncio
         update_custom_emoji: Editar Emoji Personalizado
         update_domain_block: Atualizar bloqueio de domínio
+        update_ip_block: Atualizar regra de IP
         update_status: Editar Status
+        update_user_role: Atualizar cargo
       actions:
+        approve_appeal_html: "%{name} aprovou a revisão da decisão da moderação em %{target}"
+        approve_user_html: "%{name} aprovado inscrição de %{target}"
+        assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} para si"
+        change_email_user_html: "%{name} alterou o endereço de e-mail do usuário %{target}"
+        change_role_user_html: "%{name} alterou o cargo de %{target}"
+        confirm_user_html: "%{name} confirmou o endereço de e-mail do usuário %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
+        create_announcement_html: "%{name} criou o novo anúncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou o e-mail com o marcador %{target}"
+        create_custom_emoji_html: "%{name} enviou o novo emoji %{target}"
+        create_domain_allow_html: "%{name} permitiu federação com domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
-        create_email_domain_block_html: "%{name} bloqueou do domínio de e-mail %{target}"
-      deleted_status: "(status excluído)"
+        create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
+        create_ip_block_html: "%{name} criou a regra para o IP %{target}"
+        create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
+        create_user_role_html: "%{name} criou o cargo %{target}"
+        demote_user_html: "%{name} rebaixou o usuário %{target}"
+        destroy_announcement_html: "%{name} excluiu o anúncio %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com o marcador %{target}"
+        destroy_custom_emoji_html: "%{name} apagou o emoji %{target}"
+        destroy_domain_allow_html: "%{name} bloqueou federação com domínio %{target}"
+        destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
+        destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
+        destroy_instance_html: "%{name} limpou o domínio %{target}"
+        destroy_ip_block_html: "%{name} excluiu a regra para o IP %{target}"
+        destroy_status_html: "%{name} removeu a publicação de %{target}"
+        destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
+        destroy_user_role_html: "%{name} excluiu o cargo %{target}"
+        disable_2fa_user_html: "%{name} desativou a exigência da autenticação de dois fatores para o usuário %{target}"
+        disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desativou a autenticação via token por email para %{target}"
+        disable_user_html: "%{name} desativou o login para %{target}"
+        enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ativou a autenticação via token por email para %{target}"
+        enable_user_html: "%{name} ativou o login para %{target}"
+        memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
+        promote_user_html: "%{name} promoveu o usuário %{target}"
+        reject_appeal_html: "%{name} rejeitou a revisão da decisão da moderação em %{target}"
+        reject_user_html: "%{name} rejeitou a inscrição de %{target}"
+        remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
+        reopen_report_html: "%{name} reabriu a denúncia %{target}"
+        resend_user_html: "%{name} reenviou um e-mail de confirmação para %{target}"
+        reset_password_user_html: "%{name} redefiniu a senha de %{target}"
+        resolve_report_html: "%{name} resolveu a denúncia %{target}"
+        sensitive_account_html: "%{name} marcou a mídia de %{target} como sensível"
+        silence_account_html: "%{name} limitou a conta de %{target}"
+        suspend_account_html: "%{name} suspendeu a conta de %{target}"
+        unassigned_report_html: "%{name} desatribuiu a denúncia %{target}"
+        unblock_email_account_html: "%{name} desbloqueou o endereço de e-mail de %{target}"
+        unsensitive_account_html: "%{name} desmarcou a mídia de %{target} como sensível"
+        unsilence_account_html: "%{name} removeu a limitação da conta de %{target}"
+        unsuspend_account_html: "%{name} removeu a suspenção da conta de %{target}"
+        update_announcement_html: "%{name} atualizou o anúncio %{target}"
+        update_custom_emoji_html: "%{name} atualizou o emoji %{target}"
+        update_domain_block_html: "%{name} atualizou o bloqueio de domínio de %{target}"
+        update_ip_block_html: "%{name} alterou a regra para o IP %{target}"
+        update_status_html: "%{name} atualizou a publicação de %{target}"
+        update_user_role_html: "%{name} alterou o cargo %{target}"
+      deleted_account: conta excluída
       empty: Nenhum registro encontrado.
       filter_by_action: Filtrar por ação
       filter_by_user: Filtrar por usuário
       title: Auditar histórico
     announcements:
-      destroyed_msg: Anúncio excluído com sucesso!
+      destroyed_msg: Anúncio excluído!
       edit:
         title: Editar anúncio
       empty: Sem anúncios.
@@ -278,34 +298,36 @@ pt-BR:
         create: Criar anúncio
         title: Novo anúncio
       publish: Publicar
-      published_msg: Anúncio publicado com sucesso!
+      published_msg: Anúncio publicado!
       scheduled_for: Agendado para %{time}
       scheduled_msg: Anúncio agendado para publicação!
       title: Anúncios
       unpublish: Cancelar publicação
-      unpublished_msg: Anúncio despublicado com sucesso!
-      updated_msg: Anúncio atualizado com sucesso!
+      unpublished_msg: Anúncio desfeito!
+      updated_msg: Anúncio atualizado!
     custom_emojis:
       assign_category: Atribuir categoria
       by_domain: Domínio
-      copied_msg: Cópia local do emoji criada com sucesso
+      copied_msg: Emoji copiado localmente
       copy: Copiar
       copy_failed_msg: Não foi possível criar cópia local do emoji
       create_new_category: Criar nova categoria
-      created_msg: Emoji criado com sucesso!
+      created_msg: Emoji criado!
       delete: Excluir
-      destroyed_msg: Emoji excluído com sucesso!
+      destroyed_msg: Emoji excluído!
       disable: Desativar
       disabled: Desativado
-      disabled_msg: Emoji desativado com sucesso
+      disabled_msg: Emoji desativado
+      emoji: Emoji
       enable: Ativar
       enabled: Ativado
-      enabled_msg: Emoji ativado com sucesso
-      image_hint: PNG de até 50KB
+      enabled_msg: Emoji ativado
+      image_hint: PNG ou GIF até %{size}
       list: Listar
       listed: Listado
       new:
         title: Adicionar novo emoji personalizado
+      no_emoji_selected: Nenhum emoji foi alterado, pois nenhum foi selecionado
       not_permitted: Você não tem permissão para executar esta ação
       overwrite: Sobrescrever
       shortcode: Atalho
@@ -315,34 +337,66 @@ pt-BR:
       unlist: Não listar
       unlisted: Não-listado
       update_failed_msg: Não foi possível atualizar esse emoji
-      updated_msg: Emoji atualizado com sucesso!
+      updated_msg: Emoji atualizado!
       upload: Enviar
     dashboard:
+      active_users: usuários ativos
+      interactions: interações
+      media_storage: Armazenamento de mídia
+      new_users: novos usuários
+      opened_reports: denúncias abertas
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> revisão pendente"
+        other: "<strong>%{count}</strong> revisões pendentes"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> denúncia pendente"
+        other: "<strong>%{count}</strong> denúncias pendentes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag pendente"
+        other: "<strong>%{count}</strong> hashtags pendentes"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usuário pendente"
+        other: "<strong>%{count}</strong> usuários pendentes"
+      resolved_reports: denúncias solucionadas
       software: Software
+      sources: Origem das inscrições
       space: Uso de espaço em disco
       title: Painel de controle
+      top_languages: Línguas mais ativas
+      top_servers: Servidores mais ativos
+      website: Site
+    disputes:
+      appeals:
+        empty: Sem revisões.
+        title: Revisões
     domain_allows:
       add_new: Permitir domínio
       created_msg: Domínio foi permitido
-      destroyed_msg: Domínio foi bloqueado
-      undo: Bloquear
+      destroyed_msg: Domínio foi proibido de federar
+      export: Exportar
+      import: Importar
+      undo: Bloquear federação com domínio
     domain_blocks:
       add_new: Adicionar novo bloqueio de domínio
       created_msg: Domínio está sendo bloqueado
       destroyed_msg: Domínio desbloqueado
       domain: Domínio
       edit: Editar bloqueio de domínio
+      existing_domain_block: Você já impôs limites mais rigorosos em %{name}.
       existing_domain_block_html: Você já impôs limites mais estritos em %{name}, você precisa <a href="%{unblock_url}">desbloqueá-lo</a> primeiro.
+      export: Exportar
+      import: Importar
       new:
         create: Criar bloqueio
         hint: O bloqueio de domínio não vai prevenir a criação de entradas de contas na base de dados, mas vai retroativamente e automaticamente aplicar métodos específicos de moderação nessas contas.
         severity:
-          desc_html: "<strong>Silenciar</strong> vai fazer os posts da conta invisíveis para qualquer um que não os esteja seguindo. <strong>Suspender</strong> vai remover todo o conteúdo, mídia, e dados de perfil da conta. Use <strong>Nenhum</strong> se você só quer rejeitar arquivos de mídia."
           noop: Nenhum
-          silence: Silenciar
+          silence: Limitar
           suspend: Banir
         title: Novo bloqueio de domínio
+      not_permitted: Você não possui permissão para realizar esta ação
       obfuscate: Ofuscar nome de domínio
+      obfuscate_hint: Ofuscar parcialmente o domínio na lista se a exibição da lista de domínios limitados estiver habilitada
       private_comment: Comentário privado
       private_comment_hint: Comente sobre essa restrição ao domínio para uso interno dos moderadores.
       public_comment: Comentário público
@@ -351,38 +405,96 @@ pt-BR:
       reject_media_hint: Remove arquivos de mídia armazenados localmente e recusa fazer download de qualquer um no futuro. Irrelevante para suspensões
       reject_reports: Rejeitar denúncias
       reject_reports_hint: Ignora todas as denúncias vindo deste domínio. Irrelevante para suspensões
-      rejecting_media: rejeitando arquivos de mídia
-      rejecting_reports: rejeitando denúncias
-      severity:
-        silence: silenciado
-        suspend: banido
-      show:
-        affected_accounts:
-          one: Uma conta no banco de dados foi afetada
-          other: "%{count} contas no banco de dados foram afetadas"
-        retroactive:
-          silence: Dessilenciar contas existentes afetadas deste domínio
-          suspend: Remover a suspensão das contas afetadas deste domínio
-        title: Desfazer bloqueio de domínio para %{domain}
-        undo: Desfazer
       undo: Desfazer bloqueio de domínio
       view: Ver domínios bloqueados
     email_domain_blocks:
       add_new: Adicionar novo
-      created_msg: Domínio de e-mail adicionado à lista negra com sucesso
+      attempts_over_week:
+        one: "%{count} tentativa na última semana"
+        other: "%{count} tentativas de inscrição na última semana"
+      created_msg: O domínio de e-mail foi adicionado à lista negra
       delete: Excluir
-      destroyed_msg: Domínio de e-mail excluído da lista negra com sucesso
+      dns:
+        types:
+          mx: Registro MX
       domain: Domínio
-      empty: Nenhum domínio de e-mail atualmente bloqueado.
-      from_html: de %{domain}
       new:
         create: Adicionar domínio
+        resolve: Resolver domínio
         title: Nova entrada de lista negra de e-mail
+      no_email_domain_block_selected: Nenhum bloco de domínio de e-mail foi alterado, pois nenhum foi selecionado
+      resolved_dns_records_hint_html: O nome de domínio resolve os seguintes domínios MX, que são responsáveis finais por aceitar o e-mail. Bloquear um domínio MX bloqueará inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
+      resolved_through_html: Resolvido através de %{domain}
       title: Lista de negra de e-mail
+    export_domain_allows:
+      new:
+        title: Importar domínios permitidos
+      no_file: Nenhum arquivo selecionado
+    export_domain_blocks:
+      import:
+        description_html: Você está prestes a importar uma lista de boqueio de domínio. Por favor, revise esta lista com muito cuidado, especialmente se você mesmo não criou esta lista.
+        existing_relationships_warning: Existem relações de seguimento
+        private_comment_template: Importado de %{source} em %{date}
+        title: Importar bloqueio de domínios
+      new:
+        title: Importar bloqueio de domínios
+      no_file: Nenhum arquivo selecionado
+    follow_recommendations:
+      description_html: "<strong>A recomendação de contas ajuda os novos usuários a encontrar rapidamente conteúdo interessante</strong>. Quando um usuário ainda não tiver interagido o suficiente para gerar recomendações de contas, essas contas serão recomendadas. Essas recomendações são recalculadas diariamente a partir de uma lista de contas com alto engajamento e maior número de seguidores locais em uma dada língua."
+      language: Na língua
+      status: Situação
+      suppress: Remover recomendação de contas
+      suppressed: Removida
+      title: Recomendações de contas
+      unsuppress: Restaurar recomendação de contas
     instances:
+      availability:
+        description_html:
+          one: Se a entrega ao domínio falhar em <strong>%{count} dia</strong> sem sucesso, nenhuma tentativa de entrega será feita a menos que uma entrega <em>do</em> domínio seja recebida.
+          other: Se a entrega ao domínio falhar em <strong>%{count} dias diferentes</strong> sem sucesso, nenhuma tentativa de entrega será feita a menos que uma entrega <em>do</em> domínio seja recebida.
+        failure_threshold_reached: Limite de falhas atingido em %{date}.
+        failures_recorded:
+          one: Falha na tentativa em %{count} dia.
+          other: Tentativas falhas em %{count} dias diferentes.
+        no_failures_recorded: Sem falhas no registro.
+        title: Disponibilidade
+        warning: A última tentativa de se conectar a este servidor não foi bem sucedida
+      back_to_all: Todas
+      back_to_limited: Limitado
       back_to_warning: Aviso
       by_domain: Domínio
+      confirm_purge: Você tem certeza de que deseja excluir permanentemente os dados deste domínio?
+      content_policies:
+        comment: Nota interna
+        description_html: Você pode definir políticas de conteúdo que serão aplicadas a todas as contas deste domínio e a qualquer um dos seus subdomínios.
+        policies:
+          reject_media: Rejeitar mídia
+          reject_reports: Rejeitar denúncias
+          silence: Limite
+          suspend: Suspender
+        policy: Políticas
+        reason: Razão pública
+        title: Políticas de conteúdo
+      dashboard:
+        instance_accounts_dimension: Contas mais seguidas
+        instance_accounts_measure: contas armazenadas
+        instance_followers_measure: nossos seguidores lá
+        instance_follows_measure: seus seguidores aqui
+        instance_languages_dimension: Idiomas principais
+        instance_media_attachments_measure: anexos de mídia armazenados
+        instance_reports_measure: denúncias sobre eles
+        instance_statuses_measure: publicações armazenadas
+      delivery:
+        all: Todos
+        clear: Limpar erros de entrega
+        failing: Falhando
+        restart: Reiniciar a entrega
+        stop: Parar entrega
+        unavailable: Indisponível
       delivery_available: Envio disponível
+      delivery_error_days: Dias de erro de entrega
+      delivery_error_hint: Se a entrega não for possível durante %{count} dias, será automaticamente marcada como não realizável.
+      destroyed_msg: Dados de %{domain} agora estão na fila para exclusão iminente.
       empty: Nenhum domínio encontrado.
       known_accounts:
         one: "%{count} conta conhecida"
@@ -393,12 +505,15 @@ pt-BR:
         title: Moderação
       private_comment: Comentário privado
       public_comment: Comentário público
+      purge: Limpar
+      purge_description_html: Se você acredita que este domínio está offline definitivamente, você pode excluir todos os registros de conta e dados associados deste domínio do seu armazenamento. Isso pode demorar um pouco.
       title: Federação
       total_blocked_by_us: Bloqueado por nós
       total_followed_by_them: Seguidos por eles
       total_followed_by_us: Seguidos por nós
       total_reported: Denúncias sobre eles
       total_storage: Mídias anexadas
+      totals_time_period_hint_html: Os totais exibidos abaixo incluem dados para todo o tempo.
     invites:
       deactivate_all: Desativar todos
       filter:
@@ -409,7 +524,7 @@ pt-BR:
       title: Convites
     ip_blocks:
       add_new: Criar regra
-      created_msg: Nova regra de IP adicionada com sucesso
+      created_msg: Nova regra de IP adicionada
       delete: Excluir
       expires_in:
         '1209600': 2 semanas
@@ -422,64 +537,147 @@ pt-BR:
         title: Criar nova regra de IP
       no_ip_block_selected: Nenhuma regra de IP foi alterada pois nenhuma foi selecionada
       title: Regras de IP
-    pending_accounts:
-      title: Contas pendentes (%{count})
     relationships:
       title: Relações de %{acct}
     relays:
       add_new: Adicionar novo repetidor
       delete: Excluir
-      description_html: Um <strong>repetidor de federação</strong> é um servidor intermediário que troca um grande volume de toots públicos entre instâncias que se inscrevem e publicam nele. <strong>O repetidor pode ser usado para ajudar instâncias pequenas e médias a descobrir conteúdo pelo fediverso</strong>, que normalmente precisariam que usuários locais manualmente seguissem outras pessoas em instâncias remotas.
+      description_html: Um <strong>repetidor de federação</strong> é um servidor intermediário que troca um grande volume de publicações públicas entre servidores que se inscrevem e publicam nele. <strong>Ele pode ser usado para ajudar os servidores pequenos e médios a descobrir o conteúdo pelo fediverso</strong>, que normalmente precisariam que usuários locais manualmente seguissem outras pessoas em servidores remotas.
       disable: Desativar
       disabled: Desativado
       enable: Ativar
-      enable_hint: Uma vez ativado, sua instância se inscreverá para receber todos os toots públicos desse repetidor; E vai começar a enviar todos os toots públicos desta instância para o repetidor.
+      enable_hint: Uma vez ativado, seu servidor se inscreverá para receber todas as publicações deste repetidor e começará a enviar todas as publicações deste servidor para o repetidor.
       enabled: Ativado
       inbox_url: Link do repetidor
       pending: Esperando pela aprovação do repetidor
       save_and_enable: Salvar e ativar
       setup: Configurar uma conexão de repetidor
       signatures_not_enabled: Repetidores não funcionarão adequadamente enquanto o modo seguro ou o modo lista de permitidos estiverem ativos
+      status: Situação
       title: Repetidores
     report_notes:
-      created_msg: Nota de denúncia criada com sucesso!
-      destroyed_msg: Nota de denúncia excluída com sucesso!
+      created_msg: Nota de denúncia criada!
+      destroyed_msg: Nota de denúncia excluída!
     reports:
       account:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} denúncia"
-          other: "%{count} denúncias"
+      action_log: Registros de auditoria
       action_taken_by: Atitude tomada por
+      actions:
+        delete_description_html: As publicações denunciadas serão apagadas e um aviso de violação será mantido para te informar sobre o agravamento caso essa mesma conta cometa infrações no futuro.
+        mark_as_sensitive_description_html: Os conteúdos de mídia em publicações denunciadas serão marcados como sensíveis e um aviso de violação será mantido para te informar sobre o agravamento caso essa mesma conta comenta infrações no futuro.
+        other_description_html: Veja mais opções para controlar o comportamento da conta e personalizar a comunicação com a conta denunciada.
+        resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, nenhuma violação será guardada e a denúncia será encerrada.
+        silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou que o procuram manualmente, limitando severamente seu alcance. Pode ser revertido a qualquer momento.
+        suspend_description_html: O perfil e todo o seu conteúdo ficarão inacessíveis até que seja eventualmente excluído. Interagir com a conta será impossível. Reversível dentro de 30 dias.
+      actions_description_html: Decida que medidas tomar para resolver esta denúncia. Se você decidir punir a conta denunciada, ela receberá uma notificação por e-mail, exceto quando for selecionada a categoria <strong>spam</strong> for selecionada.
+      add_to_report: Adicionar mais à denúncia
       are_you_sure: Você tem certeza?
-      assign_to_self: Pegar
+      assign_to_self: Atribuir para si
       assigned: Moderador responsável
+      by_target_domain: Domínio da conta denunciada
+      category: Categoria
+      category_description_html: O motivo pelo qual esta conta e/ou conteúdo foi denunciado será citado na comunicação com a conta denunciada
       comment:
         none: Nenhum
+      comment_description_html: 'Para fornecer mais informações, %{name} escreveu:'
       created_at: Denunciado
+      delete_and_resolve: Excluir publicações
       forwarded: Encaminhados
       forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
+      mark_as_sensitive: Marcar como sensível
       mark_as_unresolved: Marcar como não resolvido
+      no_one_assigned: Ninguém
       notes:
         create: Adicionar nota
         create_and_resolve: Resolver com nota
         create_and_unresolve: Reabrir com nota
         delete: Excluir
-        placeholder: Descreva que ações foram tomadas, ou quaisquer outras atualizações relacionadas…
+        placeholder: Descreva quais ações foram tomadas ou quaisquer outras atualizações relacionadas...
+        title: Notas
+      notes_description_html: Visualize e deixe anotações para outros moderadores e para você mesmo no futuro
+      quick_actions_description_html: 'Tome uma ação rápida ou role para baixo para ver o conteúdo denunciado:'
+      remote_user_placeholder: o usuário remoto de %{instance}
       reopen: Reabrir denúncia
       report: 'Denúncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciada por
       resolved: Resolvido
-      resolved_msg: Denúncia resolvida com sucesso!
-      target_domain: Domínio da conta denunciada
+      resolved_msg: Denúncia resolvida!
+      skip_to_actions: Pular para ações
+      status: Estado
+      statuses: Conteúdo denunciado
+      statuses_description_html: Conteúdo ofensivo será citado em comunicação com a conta denunciada
+      target_origin: Origem da conta denunciada
       title: Denúncias
-      unassign: Largar
+      unassign: Desatribuir
       unresolved: Não resolvido
       updated_at: Atualizado
+      view_profile: Ver perfil
+    roles:
+      add_new: Adicionar cargo
+      assigned_users:
+        one: "%{count} usuário"
+        other: "%{count} usuários"
+      categories:
+        administration: Administração
+        devops: DevOps
+        invites: Convites
+        moderation: Moderação
+        special: Especial
+      delete: Excluir
+      description_html: Com as <strong>funções de usuário</strong>, você pode personalizar quais funções e áreas do Mastodon seus usuários podem acessar.
+      edit: Editar cargo '%{name}'
+      everyone: Permissões padrão
+      everyone_full_description_html: Este é o <strong>cargo base</strong> que afeta <strong>todos os usuários</strong>, mesmo aqueles sem um cargo atribuído. Todos os outros cargos herdam as permissões dele.
+      permissions_count:
+        one: "%{count} permissão"
+        other: "%{count} permissões"
+      privileges:
+        administrator: Administrador
+        administrator_description: Usuários com essa permissão irão ignorar todas as permissões
+        delete_user_data: Apagar Dados de Usuário
+        delete_user_data_description: Permitir aos usuários apagar os dados de outros usuários instantaneamente
+        invite_users: Convidar Usuários
+        invite_users_description: Permite que os usuários convidem novas pessoas para o servidor
+        manage_announcements: Gerenciar Avisos
+        manage_announcements_description: Permite aos usuários gerenciar anúncios no servidor
+        manage_appeals: Gerenciar revisões
+        manage_appeals_description: Permite aos usuários visualizar as revisões das decisões da moderação
+        manage_blocks: Gerenciar Bloqueios
+        manage_blocks_description: Permite aos usuários bloquear provedores de e-mail e endereços IP
+        manage_custom_emojis: Gerenciar Emojis Personalizados
+        manage_custom_emojis_description: Permite aos usuários gerenciar emojis personalizados no servidor
+        manage_federation: Gerenciar Federação
+        manage_federation_description: Permite aos usuários bloquear ou permitir federação com outros domínios e controlar a entregabilidade
+        manage_invites: Gerenciar convites
+        manage_invites_description: Permite que os usuários naveguem e desativem os links de convites
+        manage_reports: Gerenciar denúncias
+        manage_reports_description: Permite aos usuários avaliar denúncias e realizar ações de moderação contra elas
+        manage_roles: Gerenciar Funções
+        manage_roles_description: Permitir que os usuários gerenciem e atribuam cargos abaixo deles
+        manage_rules: Gerenciar Regras
+        manage_rules_description: Permite que os usuários alterarem as regras do servidor
+        manage_settings: Gerenciar Configurações
+        manage_settings_description: Permite que os usuários alterem as configurações do site
+        manage_taxonomies: Gerenciar taxonomias
+        manage_taxonomies_description: Permite aos usuários rever o conteúdo em alta e atualizar as configurações de hashtag
+        manage_user_access: Gerenciar Acesso de Usuário
+        manage_user_access_description: Permite aos usuários desativar a autenticação de dois fatores de outros usuários, alterar seu endereço de e-mail e redefinir sua senha
+        manage_users: Gerenciar usuários
+        manage_users_description: Permite aos usuários ver os detalhes de outros usuários e executar ações de moderação contra eles
+        manage_webhooks: Gerenciar Webhooks
+        manage_webhooks_description: Permite aos usuários configurar webhooks para eventos administrativos
+        view_audit_log: Ver o registro de auditoria
+        view_audit_log_description: Permite aos usuários ver um histórico de ações administrativas no servidor
+        view_dashboard: Ver painel
+        view_dashboard_description: Permite que os usuários acessem o painel e várias métricas
+        view_devops: DevOps
+        view_devops_description: Permite aos usuários acessar os painéis da Sidekiq e pgHero
+      title: Funções
     rules:
       add_new: Adicionar regra
       delete: Deletar
@@ -488,150 +686,220 @@ pt-BR:
       empty: Nenhuma regra do servidor foi definida.
       title: Regras do servidor
     settings:
-      activity_api_enabled:
-        desc_html: Contagem de toots locais, usuários ativos e novos usuários semanalmente
-        title: Publicar estatísticas agregadas sobre atividade de usuários
-      bootstrap_timeline_accounts:
-        desc_html: Separe nomes de usuário através de vírgulas. Funciona apenas com contas locais e destrancadas. O padrão quando vazio são todos os administradores locais.
-        title: Usuários a serem seguidos por padrão por novas contas
-      contact_information:
-        email: E-mail
-        username: Usuário de contato
-      custom_css:
-        desc_html: Alterar o visual com CSS carregado em todas as páginas
-        title: CSS personalizado
-      default_noindex:
-        desc_html: Afeta qualquer usuário que não tenha alterado esta configuração manualmente
-        title: Optar por excluir usuários da indexação de mecanismos de pesquisa por padrão
+      about:
+        manage_rules: Gerenciar regras do servidor
+        preamble: Forneça informações detalhadas sobre como o servidor é operado, moderado e financiado.
+        rules_hint: Existe uma área dedicada para as regras que os usuários devem aderir.
+        title: Sobre
+      appearance:
+        preamble: Personalize a interface web do Mastodon.
+        title: Aparência
+      branding:
+        preamble: A marca do seu servidor o diferencia de outros servidores na rede. Essa informação pode ser exibida em vários ambientes, como a interface web do Mastodon, aplicativos nativos, pré-visualizações de links em outros sites, aplicativos de mensagens, etc. Por isso, é melhor manter essa informação clara, curta e concisa.
+        title: Marca
+      content_retention:
+        preamble: Controlar como o conteúdo gerado pelo usuário é armazenado no Mastodon.
+        title: Retenção de conteúdo
+      discovery:
+        follow_recommendations: Seguir recomendações
+        preamble: Navegar por um conteúdo interessante é fundamental para integrar novos usuários que podem não conhecer ninguém no Mastodon. Controle como várias características de descoberta funcionam no seu servidor.
+        profile_directory: Diretório de perfis
+        public_timelines: Timelines públicas
+        title: Descobrir
+        trends: Tendências
       domain_blocks:
         all: Para todos
         disabled: Para ninguém
-        title: Mostrar domínios bloqueados
         users: Para usuários locais logados
-      domain_blocks_rationale:
-        title: Mostrar motivo
-      hero:
-        desc_html: Aparece na página inicial. Recomendado ao menos 600x100px. Se não estiver definido, a miniatura da instância é usada no lugar
-        title: Imagem de capa
-      mascot:
-        desc_html: Mostrado em diversas páginas. Recomendado ao menos 293×205px. Quando não está definido, o mascote padrão é mostrado
-        title: Imagem do mascote
-      peers_api_enabled:
-        desc_html: Nomes de domínio que essa instância encontrou no fediverso
-        title: Publicar lista de instâncias descobertas
-      preview_sensitive_media:
-        desc_html: A prévia do link em outros sites vai incluir uma miniatura mesmo se a mídia estiver marcada como sensível
-        title: Mostrar mídia sensível em prévias OpenGraph
-      profile_directory:
-        desc_html: Permitir que usuários possam ser descobertos
-        title: Ativar diretório de perfis
       registrations:
-        closed_message:
-          desc_html: Mostrado na página inicial quando a instância está fechada. Você pode usar tags HTML
-          title: Mensagem de instância fechada
-        deletion:
-          desc_html: Permitir que qualquer um exclua a própria conta
-          title: Exclusão aberta de contas
-        min_invite_role:
-          disabled: Ninguém
-          title: Permitir convites de
-        require_invite_text:
-          desc_html: Quando o cadastro de novas contas exigir aprovação manual, tornar obrigatório, ao invés de opcional, o texto de solicitação de convite em "Por que você deseja criar uma conta aqui?"
-          title: Exigir que novos usuários preencham um texto de solicitação de convite
+        preamble: Controle quem pode criar uma conta no seu servidor.
+        title: Inscrições
       registrations_mode:
         modes:
           approved: Aprovação necessária para criar conta
           none: Ninguém pode criar conta
           open: Qualquer um pode criar conta
-        title: Modo de novos usuários
-      show_known_fediverse_at_about_page:
-        desc_html: Quando ativado, mostra toots globais na prévia da linha, se não, mostra somente toots locais
-        title: Mostrar toots globais na prévia da linha
-      show_staff_badge:
-        desc_html: Mostrar uma insígnia de Equipe na página de usuário
-        title: Mostrar insígnia de equipe
-      site_description:
-        desc_html: Parágrafo introdutório na página inicial. Descreva o que faz esse servidor especial, e qualquer outra coisa de importante. Você pode usar tags HTML, em especial <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descrição da instância
-      site_description_extended:
-        desc_html: Um ótimo lugar para seu código de conduta, regras, diretrizes e outras coisas para diferenciar a sua instância. Você pode usar tags HTML
-        title: Informação estendida personalizada
-      site_short_description:
-        desc_html: Mostrada na barra lateral e em etiquetas de metadados. Descreve o que é o Mastodon e o que torna esta instância especial num único parágrafo. Se deixada em branco, é substituído pela descrição da instância.
-        title: Descrição curta da instância
-      site_terms:
-        desc_html: Você pode escrever a sua própria Política de Privacidade, Termos de Serviço, entre outras coisas. Você pode usar tags HTML
-        title: Termos de serviço personalizados
-      site_title: Nome da instância
-      thumbnail:
-        desc_html: Usada para prévias via OpenGraph e API. Recomenda-se 1200x630px
-        title: Miniatura da instância
-      timeline_preview:
-        desc_html: Mostra a linha do tempo pública na página inicial e permite acesso da API à mesma sem autenticação
-        title: Permitir acesso não autenticado à linha pública
-      title: Configurações do site
-      trendable_by_default:
-        desc_html: Afeta as hashtags que não foram reprovadas anteriormente
-        title: Permitir que hashtags fiquem em alta sem revisão prévia
-      trends:
-        desc_html: Mostrar publicamente hashtags previamente revisadas que estão em alta
-        title: Hashtags em alta
+      title: Configurações do Servidor
     site_uploads:
       delete: Excluir arquivo enviado
       destroyed_msg: Upload do site excluído com sucesso!
     statuses:
+      account: Autor
+      application: Aplicativo
       back_to_account: Voltar para página da conta
+      back_to_report: Voltar às denúncias
       batch:
-        delete: Excluir
-        nsfw_off: Desmarcar como sensível
-        nsfw_on: Marcar como sensível
+        remove_from_report: Remover da denúncia
+        report: Denunciar
       deleted: Excluídos
-      failed_to_execute: Falha ao executar
+      favourites: Favoritos
+      history: Histórico de versões
+      in_reply_to: Em resposta a
+      language: Idioma
       media:
         title: Mídia
-      no_media: Sem mídia
-      no_status_selected: Nenhum status foi modificado porque nenhum estava selecionado
-      title: Toots da conta
+      metadata: Metadados
+      no_status_selected: Nenhuma publicação foi modificada porque nenhuma estava selecionada
+      open: Publicação aberta
+      original_status: Publicação original
+      reblogs: Reblogs
+      status_changed: Publicação alterada
+      title: Publicações da conta
+      trending: Em alta
+      visibility: Visibilidade
       with_media: Com mídia
+    strikes:
+      actions:
+        delete_statuses: "%{name} excluiu as publicações de %{target}"
+        disable: "%{name} congelou a conta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcou as publicações de %{target} como sensíveis"
+        none: "%{name} enviou um aviso para %{target}"
+        sensitive: "%{name} marcou as publicações de %{target} como sensíveis"
+        silence: "%{name} limitou a conta de %{target}"
+        suspend: "%{name} suspendeu a conta de %{target}"
+      appeal_approved: Revisado
+      appeal_pending: Revisão pendente
     system_checks:
+      database_schema_check:
+        message_html: Existem migrações de banco de dados pendentes. Execute-as para garantir que o aplicativo se comporte como esperado
+      elasticsearch_running_check:
+        message_html: Não foi possível conectar ao Elasticsearch. Verifique se ele está em execução ou desative a pesquisa de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versão de Elasticsearch incompatível: %{value}'
+        version_comparison: A versão %{running_version} de Elasticsearch está em execução, porém é obrigatória a versão %{required_version}
       rules_check:
+        action: Gerenciar regras do servidor
         message_html: Você não definiu nenhuma regra de servidor.
+      sidekiq_process_check:
+        message_html: Nenhum processo Sidekiq rodando para a(s) fila(s) %{value}. Por favor, revise a sua configuração para Sidekiq
     tags:
-      accounts_today: Usos únicos de hoje
-      accounts_week: Usos únicos desta semana
-      breakdown: Descrição do consumo atual por fonte
-      last_active: Última atividade
-      most_popular: Mais populares
-      most_recent: Mais recentes
       review: Status da revisão
-      reviewed: Revisado
-      trending_right_now: Em alta no momento
-      unique_uses_today: "%{count} tootando hoje"
-      unreviewed: Não revisadas
-      updated_msg: Configurações de hashtag atualizadas com sucesso
+      updated_msg: Configurações de hashtag atualizadas
     title: Administração
+    trends:
+      allow: Permitir
+      approved: Aprovado
+      disallow: Impedir
+      links:
+        allow: Permitir link
+        allow_provider: Permitir editor
+        description_html: Estes são links que estão sendo compartilhados por contas que seu servidor vê. Você pode ajudar seus usuários a descobrir o que está acontecendo no mundo. Nenhum link é exibido publicamente até que você aprove o editor. Você também pode permitir ou rejeitar links individuais.
+        disallow: Proibir link
+        disallow_provider: Proibir autor
+        no_link_selected: Nenhum link foi alterado como nenhum foi selecionado
+        shared_by_over_week:
+          one: Compartilhado por uma pessoa na última semana
+          other: Compartilhado por %{count} pessoas na última semana
+        title: Em alta no momento
+        usage_comparison: Compartilhado %{today} vezes hoje, em comparação com %{yesterday} de ontem
+      only_allowed: Somente permitido
+      pending_review: Revisão pendente
+      preview_card_providers:
+        allowed: Links deste editor podem tender
+        description_html: Estes são domínios a partir dos quais links são comumente compartilhados em seu servidor. Links não tenderão publicamente a menos que o domínio do link seja aprovado. Sua aprovação (ou rejeição) estende-se aos subdomínios.
+        rejected: Links deste editor não vão tender
+        title: Editor
+      rejected: Rejeitado
+      statuses:
+        allow: Permitir publicação
+        allow_account: Permitir autor
+        description_html: Estes são as publicações que seu servidor sabe que estão sendo muito compartilhadas e favorecidas no momento. Isso pode ajudar seus usuários, novos e atuais, a encontrar mais pessoas para seguir. Nenhuma publicação é exibida publicamente até que você aprove o autor e o autor permitir que sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individuais.
+        disallow: Proibir publicação
+        disallow_account: Proibir autor
+        no_status_selected: Nenhuma publicação em alta foi alterada, pois, nenhuma foi selecionada
+        not_discoverable: O autor optou por permitir que seja descoberto
+        shared_by:
+          one: Compartilhado ou favoritado uma vez
+          other: Compartilhado e favoritado %{friendly_count} vezes
+        title: Publicações em alta
+      tags:
+        current_score: Pontuação atual %{score}
+        dashboard:
+          tag_accounts_measure: usos únicos
+          tag_languages_dimension: Idiomas principais
+          tag_servers_dimension: Servidores mais populares
+          tag_servers_measure: servidores diferentes
+          tag_uses_measure: usos
+        description_html: Estas são hashtags que atualmente estão aparecendo em várias postagens que sua instância vê. Isso pode ajudar seus usuários a descobrirem sobre o que as pessoas estão mais comentando no momento. Nenhuma hashtag é exibida publicamente até que você as aprove.
+        listable: Pode ser sugerido
+        no_tag_selected: Nenhuma tag foi alterada, pois, nenhuma foi selecionada
+        not_listable: Não será sugerido
+        not_trendable: Não aparecerá em alta
+        not_usable: Não pode ser usado
+        peaked_on_and_decaying: Atingiu o auge em %{date}, agora decaindo
+        title: Hashtags em alta
+        trendable: Aparecerá em alta
+        trending_rank: 'Em alta #%{rank}'
+        usable: Pode ser usado
+        usage_comparison: Usado %{today} vezes hoje, em comparação com %{yesterday} de ontem
+        used_by_over_week:
+          one: Usado por uma pessoa na última semana
+          other: Usado por %{count} pessoas na última semana
+      title: Em alta
+      trending: Em alta
     warning_presets:
       add_new: Adicionar novo
       delete: Excluir
       edit_preset: Editar o aviso pré-definido
+      empty: Você ainda não definiu nenhuma predefinição de alerta.
       title: Gerenciar os avisos pré-definidos
+    webhooks:
+      add_new: Adicionar endpoint
+      delete: Excluir
+      description_html: Um <strong>webhook</strong> permite que o Mastodon envie <strong>notificações em tempo real</strong> sobre os eventos escolhidos para a sua própria aplicação, então sua aplicação pode <strong>acionar reações automaticamente</strong>.
+      disable: Desabilitar
+      disabled: Desativado
+      edit: Editar endpoint
+      empty: Você não tem webhooks configurados nos endpoints.
+      enable: Habilitar
+      enabled: Ativo
+      enabled_events:
+        one: 1 evento habilitado
+        other: "%{count} eventos ativados"
+      events: Eventos
+      new: Novo webhook
+      rotate_secret: Girar segredo
+      secret: Assinatura secreta
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para excluir suas publicações
+        disable: para congelar sua conta
+        mark_statuses_as_sensitive: para marcar suas publicações como sensíveis
+        none: um aviso
+        sensitive: para marcar sua conta como sensível
+        silence: para limitar sua conta
+        suspend: para suspender sua conta
+      body: "%{target} está solicitando uma revisão da decisão da moderação por %{action_taken_by} em %{date}, que era %{type}. Ele escreveu:"
+      next_steps: Você pode aprovar a revisão para desfazer a decisão da moderação ou ignorá-la.
+      subject: "%{username} está solicitando uma revisão da decisão da moderação em %{instance}"
     new_pending_account:
       body: Os detalhes da nova conta estão abaixo. Você pode aprovar ou vetar.
       subject: Nova conta para revisão em %{instance} (%{username})
     new_report:
       body: "%{reporter} denunciou %{target}"
-      body_remote: Alguém da instância %{domain} reportou %{target}
+      body_remote: Alguém de %{domain} denunciou %{target}
       subject: Nova denúncia sobre %{instance} (#%{id})
-    new_trending_tag:
-      body: 'A hashtag #%{name} está em alta hoje, mas não foi previamente revisada. Ela não estará visível publicamente a menos que você aprove, ou salve o formulário do jeito que está para nunca mais ouvir falar dela.'
-      subject: Nova hashtag disponível para revisão em %{instance} (#%{name})
+    new_trends:
+      body: 'Os seguintes itens precisam de uma análise antes que possam ser exibidos publicamente:'
+      new_trending_links:
+        title: Links em destaque
+      new_trending_statuses:
+        title: Publicações em alta
+      new_trending_tags:
+        no_approved_tags: No momento, não há hashtags de tendências aprovadas.
+        requirements: 'Qualquer um desses candidatos poderia ultrapassar a hashtag de tendência aprovada #%{rank} , que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.'
+        title: Hashtags em alta
+      subject: Novas tendências para revisão em %{instance}
   aliases:
     add_new: Criar alias
-    created_msg: Um novo alias foi criado com sucesso. Agora você pode iniciar a mudança da conta antiga.
-    deleted_msg: Alias removido com sucesso. Não será mais possível se mudar daquela conta para esta conta.
+    created_msg: Um novo atalho foi criado. Agora você pode iniciar a mudança da conta antiga.
+    deleted_msg: O atalho foi removido. Não será mais possível se mudar daquela conta para esta conta.
     empty: Você não tem alias.
-    hint_html: Se você quiser migrar de uma outra conta para esta, você pode criar um alias aqui, o que é necessário antes que você possa migrar os seguidores da conta antiga para esta. Esta ação por si só é <strong>inofensiva e reversível</strong>. <strong>A migração da conta é iniciada pela conta antiga</strong>.
+    hint_html: Se você quiser migrar de uma outra conta para esta, você pode criar um atalho aqui, o que é necessário antes que você possa migrar os seguidores da conta antiga para esta. Esta ação por si só é <strong>inofensiva e reversível</strong>. <strong>A migração da conta é iniciada pela conta antiga</strong>.
     remove: Desvincular alias
   appearance:
     advanced_web_interface: Interface avançada de colunas
@@ -644,61 +912,69 @@ pt-BR:
       guide_link: https://br.crowdin.com/project/mastodon
       guide_link_text: Todos podem contribuir.
     sensitive_content: Conteúdo sensível
-    toot_layout: Layout do Toot
+    toot_layout: Formato da publicação
   application_mailer:
     notification_preferences: Alterar preferências de e-mail
+    salutation: "%{name},"
     settings: 'Alterar e-mail de preferência: %{link}'
     view: 'Ver:'
     view_profile: Ver perfil
-    view_status: Ver toot
+    view_status: Ver publicação
   applications:
     created: Aplicativo criado com sucesso
     destroyed: Aplicativo excluído com sucesso
-    invalid_url: O link fornecido é inválido
     regenerate_token: Gerar código de acesso
-    token_regenerated: Código de acesso gerado com sucesso
+    token_regenerated: Código de acesso gerado
     warning: Tenha cuidado com estes dados. Nunca compartilhe com alguém!
     your_token: Seu código de acesso
   auth:
-    apply_for_account: Solicitar convite
+    apply_for_account: Solicitar uma conta
     change_password: Senha
-    checkbox_agreement_html: Concordo com <a href="%{rules_path}" target="_blank">as regras da instância</a> e com <a href="%{terms_path}" target="_blank">os termos de serviço</a>
-    checkbox_agreement_without_rules_html: Concordo com os <a href="%{terms_path}" target="_blank">termos do serviço</a>
     delete_account: Excluir conta
     delete_account_html: Se você deseja excluir sua conta, você pode <a href="%{path}">fazer isso aqui</a>. Uma confirmação será solicitada.
     description:
-      prefix_invited_by_user: "@%{name} convidou você para entrar nesta instância Mastodon!"
+      prefix_invited_by_user: "@%{name} convidou você para entrar neste servidor Mastodon!"
       prefix_sign_up: Crie uma conta no Mastodon hoje!
-      suffix: Com uma conta, você poderá seguir pessoas, postar atualizações, trocar mensagens com usuários de qualquer instância Mastodon e muito mais!
+      suffix: Com uma conta, você poderá seguir pessoas, publicar atualizações, trocar mensagens com usuários de qualquer servidor Mastodon e muito mais!
     didnt_get_confirmation: Não recebeu instruções de confirmação?
     dont_have_your_security_key: Não está com a sua chave de segurança?
     forgot_password: Esqueceu a sua senha?
-    invalid_reset_password_token: Código de alteração de senha é inválido ou expirou. Por favor, solicite um novo.
+    invalid_reset_password_token: Código de alteração de senha é inválido ou expirou. Solicite um novo.
     link_to_otp: Digite um código de duas etapas do seu telefone ou um código de recuperação
     link_to_webauth: Use seu dispositivo de chave de segurança
+    log_in_with: Iniciar sessão com
     login: Entrar
     logout: Sair
     migrate_account: Mudar-se para outra conta
     migrate_account_html: Se você quer redirecionar essa conta para uma outra você pode <a href="%{path}">configurar isso aqui</a>.
     or_log_in_with: Ou entre com
+    privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
+    providers:
+      cas: CAS
+      saml: SAML
     register: Criar conta
     registration_closed: "%{instance} não está aceitando novos membros"
     resend_confirmation: Reenviar instruções de confirmação
     reset_password: Redefinir senha
+    rules:
+      title: Algumas regras básicas.
     security: Segurança
     set_new_password: Definir uma nova senha
     setup:
       email_below_hint_html: Se o endereço de e-mail abaixo não for seu, você pode alterá-lo aqui e receber um novo e-mail de confirmação.
       email_settings_hint_html: O e-mail de confirmação foi enviado para %{email}. Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
       title: Configurações
+    sign_up:
+      preamble: Com uma conta neste servidor Mastodon, você poderá seguir qualquer outra pessoa na rede, independentemente de onde sua conta esteja hospedada.
+      title: Então vamos lá criar uma conta em %{domain}.
     status:
       account_status: Status da conta
       confirming: Confirmação por e-mail pendente.
       functional: Sua conta está totalmente operacional.
       pending: Sua solicitação está com revisão pendente por parte de nossa equipe. Você receberá um e-mail se ela for aprovada.
       redirecting_to: Sua conta está inativa porque atualmente está redirecionando para %{acct}.
+      view_strikes: Veja os avisos anteriores em relação à sua conta
     too_fast: O formulário foi enviado muito rapidamente, tente novamente.
-    trouble_logging_in: Problemas para entrar?
     use_security_key: Usar chave de segurança
   authorize_follow:
     already_following: Você já segue
@@ -706,7 +982,7 @@ pt-BR:
     error: Infelizmente, ocorreu um erro ao buscar a conta remota
     follow: Seguir
     follow_request: 'Você mandou solicitação para seguir para:'
-    following: 'Sucesso! Você agora está seguindo:'
+    following: 'Sucesso! Agora você está seguindo:'
     post_follow:
       close: Ou você pode simplesmente fechar esta janela.
       return: Mostrar o perfil do usuário
@@ -727,12 +1003,15 @@ pt-BR:
       with_month_name: "%d de %b de %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count}h"
       about_x_months: "%{count}m"
       about_x_years: "%{count}a"
       almost_x_years: "%{count}a"
       half_a_minute: Agora
+      less_than_x_minutes: "%{count}min"
       less_than_x_seconds: Agora
       over_x_years: "%{count}a"
+      x_days: "%{count}dias"
       x_minutes: "%{count}min"
       x_months: "%{count}m"
       x_seconds: "%{count}seg"
@@ -741,11 +1020,11 @@ pt-BR:
     confirm_password: Digite a sua senha atual para verificar a sua identidade
     confirm_username: Digite seu nome de usuário para confirmar o procedimento
     proceed: Excluir conta
-    success_msg: A sua conta foi excluída com sucesso
+    success_msg: Sua conta foi excluída
     warning:
-      before: 'Antes de prosseguir, por favor leia com cuidado:'
-      caches: Conteúdo que foi armazenado em cache por outras instâncias pode continuar a existir
-      data_removal: Seus toots e outros dados serão removidos permanentemente
+      before: 'Antes de prosseguir, leia com cuidado:'
+      caches: Conteúdo que foi armazenado em cache por outros servidores pode continuar a existir
+      data_removal: Suas publicações e outros dados serão removidos permanentemente
       email_change_html: Você pode <a href="%{path}">alterar seu endereço de e-mail</a> sem excluir sua conta
       email_contact_html: Se você ainda não recebeu, você pode enviar um e-mail pedindo ajuda para <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Se você não está recebendo o e-mail de confirmação, você pode <a href="%{path}">solicitá-lo novamente</a>
@@ -753,10 +1032,36 @@ pt-BR:
       more_details_html: Para mais detalhes, consulte a <a href="%{terms_path}">Política de Privacidade</a>.
       username_available: Seu nome de usuário ficará disponível novamente
       username_unavailable: Seu nome de usuário permanecerá indisponível
-  directories:
-    directory: Diretório de perfis
-    explanation: Descobrir usuários baseado em seus interesses
-    explore_mastodon: Explore o %{title}
+  disputes:
+    strikes:
+      action_taken: Ações tomadas
+      appeal: Revisão
+      appeal_approved: Esta punição foi revisada e não é mais válida
+      appeal_rejected: A revisão foi rejeitada
+      appeal_submitted_at: Revisão enviada
+      appealed_msg: Sua revisão foi enviada. Se ela for aprovada, você será notificado.
+      appeals:
+        submit: Enviar revisão
+      approve_appeal: Aprovar revisão
+      associated_report: Denúncia associada
+      created_at: Datado
+      description_html: Estas são ações tomadas contra sua conta e avisos que foram enviados a você pela equipe de %{instance}.
+      recipient: Endereçado para
+      reject_appeal: Rejeitar revisão
+      status: 'Publicação #%{id}'
+      status_removed: Publicação já removida do sistema
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Remoção de publicações
+        disable: Congelamento de conta
+        mark_statuses_as_sensitive: Marcar as publicações como sensíveis
+        none: Aviso
+        sensitive: Marcar a conta como sensível
+        silence: Limitação da conta
+        suspend: Suspensão de conta
+      your_appeal_approved: Sua revisão foi aprovada
+      your_appeal_pending: Você enviou uma revisão
+      your_appeal_rejected: Sua revisão foi rejeitada
   domain_validator:
     invalid_domain: não é um nome de domínio válido
   errors:
@@ -773,7 +1078,7 @@ pt-BR:
       content: Desculpe, algo deu errado por aqui.
       title: Esta página não está certa
     '503': A página não pôde ser carregada devido a uma falha temporária do servidor.
-    noscript_html: Para usar o aplicativo web do Mastodon, por favor ative o JavaScript. Ou, se quiser, experimente um dos <a href="%{apps_path}">aplicativos nativos</a> para o Mastodon em sua plataforma.
+    noscript_html: Para usar o aplicativo web do Mastodon, ative o JavaScript. Ou, se quiser, experimente um dos <a href="%{apps_path}">aplicativos nativos</a> para o Mastodon em sua plataforma.
   existing_username_validator:
     not_found: não foi possível encontrar um usuário local com esse nome de usuário
     not_found_multiple: não foi possível encontrar %{usernames}
@@ -781,12 +1086,13 @@ pt-BR:
     archive_takeout:
       date: Data
       download: Baixe o seu arquivo
-      hint_html: Você pode pedir um arquivo dos seus <strong>toots e mídias enviadas</strong>. Os dados exportados estarão no formato ActivityPub, que podem ser lidos por qualquer software compatível. Você pode pedir um arquivo a cada 7 dias.
+      hint_html: Você pode pedir um arquivo das suas <strong>publicações e mídias enviadas</strong>. Os dados exportados estarão no formato ActivityPub, que podem ser lidos por qualquer software compatível. Você pode pedir um arquivo a cada 7 dias.
       in_progress: Preparando o seu arquivo...
       request: Solicitar o seu arquivo
       size: Tamanho
     blocks: Você bloqueou
     bookmarks: Marcadores
+    csv: CSV
     domain_blocks: Bloqueios de domínio
     lists: Listas
     mutes: Você silenciou
@@ -795,7 +1101,7 @@ pt-BR:
     add_new: Adicionar hashtag
     errors:
       limit: Você atingiu o limite de hashtags em destaque
-    hint_html: "<strong>O que são hashtags em destaque?</strong> Elas são mostradas no seu perfil público e permitem que as pessoas acessem seus toots públicos que contenham especificamente essas hashtags. São uma excelente ferramenta para acompanhar os trabalhos criativos ou os projetos de longo prazo."
+    hint_html: "<strong>O que são hashtags em destaque?</strong> Elas são exibidas no seu perfil público e permitem que as pessoas acessem suas publicações públicos que contenham especificamente essas hashtags. São uma excelente ferramenta para acompanhar os trabalhos criativos ou os projetos de longo prazo."
   filters:
     contexts:
       account: Perfis
@@ -804,62 +1110,76 @@ pt-BR:
       public: Linhas públicas
       thread: Conversas
     edit:
+      add_keyword: Adicionar palavra-chave
+      keywords: Palavras-chave
+      statuses: Publicações individuais
       title: Editar filtro
     errors:
+      deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir deste aplicativo porque se aplicam a mais de uma palavra-chave de filtro. Use um aplicativo mais recente ou a interface web.
       invalid_context: Contexto inválido ou nenhum contexto informado
-      invalid_irreversible: O filtro irreversível só funciona com os contextos página inicial e notificações
     index:
+      contexts: Filtros em %{contexts}
       delete: Remover
       empty: Sem filtros.
+      expires_in: Expira em %{distance}
+      expires_on: Expira em %{date}
+      keywords:
+        one: "%{count} palavra-chave"
+        other: "%{count} palavras-chave"
+      statuses:
+        one: "%{count} publicação"
+        other: "%{count} publicações"
+      statuses_long:
+        one: "%{count} publicação individual oculta"
+        other: "%{count} publicações individuais ocultas"
       title: Filtros
     new:
+      save: Salvar novo filtro
       title: Adicionar filtro
+    statuses:
+      back_to_filter: Voltar ao filtro
+      batch:
+        remove: Remover do filtro
+      index:
+        hint: Este filtro se aplica a publicações individuais, independentemente de outros critérios. Você pode adicionar mais postagens a este filtro a partir da interface web.
+        title: Publicações filtradas
   footer:
-    developers: Desenvolvedores
-    more: Mais…
-    resources: Recursos
     trending_now: Em alta no momento
   generic:
     all: Tudo
-    changes_saved_msg: Alterações foram salvas com sucesso!
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> item nessa página está selecionado."
+      other: Todos os <strong>%{count}</strong> itens nessa página estão selecionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> item correspondente à sua pesquisa está selecionado."
+      other: Todos os <strong>%{count}</strong> itens correspondentes à sua pesquisa estão selecionados.
+    changes_saved_msg: Alterações salvas!
     copy: Copiar
     delete: Excluir
-    no_batch_actions_available: Nenhuma ação em lote disponível nesta página
+    deselect: Desmarcar todos
+    none: Nenhum
     order_by: Ordenar por
     save_changes: Salvar alterações
+    select_all_matching_items:
+      one: Selecione %{count} item correspondente à sua pesquisa.
+      other: Selecione todos os %{count} itens correspondentes à sua pesquisa.
+    today: hoje
     validation_errors:
-      one: Algo errado não está certo! Por favor, analise o erro abaixo
-      other: Algo errado não está certo! Por favor, analise os %{count} erros abaixo
+      one: Algo não está certo! Analise o erro abaixo
+      other: Algo não está certo! Analise os %{count} erros abaixo
   html_validator:
     invalid_markup: 'contém HTML inválido: %{error}'
-  identity_proofs:
-    active: Ativo
-    authorize: Sim, autorizar
-    authorize_connection_prompt: Autorizar essa conexão criptográfica?
-    errors:
-      failed: Falha na conexão criptográfica. Por favor, tente novamente a partir de %{provider}.
-      keybase:
-        invalid_token: Tokens keybase são hashes de assinatura e devem conter 66 caracteres hexa
-        verification_failed: Keybase não reconhece esse token como uma assinatura do usuário keybase %{kb_username}. Por favor, tente novamente a partir do Keybase.
-      wrong_user: Não foi possível criar uma prova para %{proving} como %{current}. Entre como %{proving} e tente novamente.
-    explanation_html: Você pode conectar criptograficamente suas outras identidades, tais quais seu perfil Keybase. Isso permite outras pessoas de lhe enviarem mensagens criptografadas e confiar no conteúdo que você as envia.
-    i_am_html: Eu sou %{username} em %{service}.
-    identity: Identidade
-    inactive: Inativo
-    publicize_checkbox: 'E toote isso:'
-    publicize_toot: 'Está provado! Eu sou %{username} no %{service}: %{url}'
-    remove: Remover prova da conta
-    removed: Prova removida da conta com sucesso
-    status: Status da verificação
-    view_proof: Ver prova
   imports:
+    errors:
+      invalid_csv_file: 'Arquivo CSV inválido. Erro: %{error}'
+      over_rows_processing_limit: contém mais de %{count} linhas
     modes:
       merge: Juntar
       merge_long: Manter os registros existentes e adicionar novos
       overwrite: Sobrescrever
       overwrite_long: Substituir os registros atuais com os novos
-    preface: Você pode importar dados que você exportou de outra instância, como a lista de pessoas que você segue ou bloqueou.
-    success: Os seus dados foram enviados com sucesso e serão processados em instantes
+    preface: Você pode importar dados que você exportou de outro servidor, como a lista de pessoas que você segue ou bloqueou.
+    success: Seus dados foram enviados e serão processados em instantes
     types:
       blocking: Lista de bloqueio
       bookmarks: Marcadores
@@ -867,7 +1187,6 @@ pt-BR:
       following: Pessoas que você segue
       muting: Lista de silenciados
     upload: Enviar
-  in_memoriam_html: Em memória.
   invites:
     delete: Desativar
     expired: Expirados
@@ -885,7 +1204,7 @@ pt-BR:
       one: 1 uso
       other: "%{count} usos"
     max_uses_prompt: Sem limite
-    prompt: Gere e compartilhe links para permitir acesso a essa instância
+    prompt: Gere e compartilhe links para permitir acesso a esse servidor
     table:
       expires_at: Expira em
       uses: Usos
@@ -893,16 +1212,27 @@ pt-BR:
   lists:
     errors:
       limit: Você atingiu o máximo de listas
+  login_activities:
+    authentication_methods:
+      otp: autenticação de dois fatores
+      password: senha
+      sign_in_token: código de segurança do e-mail
+      webauthn: chaves de segurança
+    description_html: Se você vir atividades suspeitas ou não reconhecidas, considere alterar sua senha e ativar a autenticação de dois fatores.
+    empty: Sem histórico de autenticação disponível
+    failed_sign_in_html: Falha na tentativa de login com %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Login bem-sucedido com %{method} de %{ip} (%{browser})
+    title: Histórico de autenticação
   media_attachments:
     validations:
-      images_and_video: Não foi possível anexar um vídeo a um toot que já contém imagens
+      images_and_video: Não foi possível anexar um vídeo a uma publicação que já contém imagens
       not_ready: Não é possível anexar arquivos que não terminaram de ser processados. Tente novamente daqui a pouco!
       too_many: Não foi possível anexar mais de 4 imagens
   migrations:
     acct: Mudou-se para
     cancel: Cancelar redirecionamento
     cancel_explanation: Cancelar o redirecionamento reativará a sua conta atual, mas não trará de volta os seguidores que não foram migrados para aquela conta.
-    cancelled_msg: Redirecionamento cancelado com sucesso.
+    cancelled_msg: Redirecionamento cancelado.
     errors:
       already_moved: é a mesma conta que você migrou
       missing_also_known_as: não está referenciando esta conta
@@ -922,7 +1252,7 @@ pt-BR:
     set_redirect: Definir redirecionamento
     warning:
       backreference_required: A nova conta deve primeiro ser configurada para que esta seja referenciada
-      before: 'Antes de prosseguir, por favor leia com cuidado:'
+      before: 'Antes de prosseguir, leia com cuidado:'
       cooldown: Depois de se mudar, há um período de espera para poder efetuar uma nova mudança
       disabled_account: Sua conta não estará totalmente funcional ao término deste processo. Entretanto, você terá acesso à exportação de dados bem como à reativação.
       followers: Esta ação moverá todos os seguidores da conta atual para a nova conta
@@ -935,21 +1265,17 @@ pt-BR:
     carry_blocks_over_text: Este usuário mudou de %{acct}, que você havia bloqueado.
     carry_mutes_over_text: Este usuário mudou de %{acct}, que você havia silenciado.
     copy_account_note_text: 'Este usuário saiu de %{acct}, aqui estão suas notas anteriores sobre ele:'
+  navigation:
+    toggle_menu: Alternar menu
   notification_mailer:
-    digest:
-      action: Ver todas as notificações
-      body: Aqui está um breve resumo das mensagens que você perdeu desde o seu último acesso em %{since}
-      mention: "%{name} te mencionou em:"
-      new_followers_summary:
-        one: Você tem um novo seguidor! Uia!
-        other: Você tem %{count} novos seguidores! AÊÊÊ!
-      subject:
-        one: "Uma nova notificação desde o seu último acesso \U0001F418"
-        other: "%{count} novas notificações desde o seu último acesso \U0001F418"
-      title: Enquanto você estava ausente...
+    admin:
+      report:
+        subject: "%{name} enviou uma denúncia"
+      sign_up:
+        subject: "%{name} se inscreveu"
     favourite:
-      body: "%{name} favoritou seu toot:"
-      subject: "%{name} favoritou seu toot"
+      body: "%{name} favoritou sua publicação:"
+      subject: "%{name} favoritou sua publicação"
       title: Novo favorito
     follow:
       body: "%{name} te seguiu!"
@@ -965,10 +1291,16 @@ pt-BR:
       body: "%{name} te mencionou em:"
       subject: "%{name} te mencionou"
       title: Nova menção
+    poll:
+      subject: Uma enquete por %{name} terminou
     reblog:
-      body: "%{name} deu boost no seu toot:"
-      subject: "%{name} deu boost no seu toot"
+      body: "%{name} impulsionou a sua publicação:"
+      subject: "%{name} impulsionou a sua publicação"
       title: Novo boost
+    status:
+      subject: "%{name} acabou de publicar"
+    update:
+      subject: "%{name} editou uma publicação"
   notifications:
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
@@ -976,6 +1308,7 @@ pt-BR:
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: BI
           million: MI
@@ -984,7 +1317,7 @@ pt-BR:
           trillion: TRI
   otp_authentication:
     code_hint: Digite o código gerado pelo seu aplicativo autenticador para confirmar
-    description_html: Se você habilitar a <strong>autenticação de dois fatores</strong> usando um aplicativo autenticador, o login exigirá que você esteja com o seu telefone, que gerará tokens para você entrar.
+    description_html: Se você ativar a <strong>autenticação de dois fatores</strong> usando um aplicativo autenticador, ao se conectar será exigido que você esteja com o seu telefone, que gerará tokens para você entrar.
     enable: Habilitar
     instructions_html: "<strong>Escaneie este código QR no Google Authenticator ou em um aplicativo TOTP similar no seu telefone</strong>. A partir de agora, esse aplicativo irá gerar tokens que você terá que digitar ao fazer login."
     manual_instructions: 'Se você não pode escanear o código QR e precisa digitá-lo manualmente, aqui está o segredo em texto:'
@@ -995,6 +1328,7 @@ pt-BR:
     next: Próximo
     older: Mais antigo
     prev: Anterior
+    truncate: "&hellip;"
   polls:
     errors:
       already_voted: Enquete votada
@@ -1010,6 +1344,8 @@ pt-BR:
     other: Outro
     posting_defaults: Padrões de publicação
     public_timelines: Linhas públicas
+  privacy_policy:
+    title: Política de Privacidade
   reactions:
     errors:
       limit_reached: Limite de reações diferentes atingido
@@ -1032,25 +1368,18 @@ pt-BR:
     remove_selected_follows: Deixar de seguir usuários selecionados
     status: Status da conta
   remote_follow:
-    acct: Digite o seu usuário@domínio para continuar
     missing_resource: Não foi possível encontrar o link de redirecionamento para sua conta
-    no_account_html: Não tem uma conta? Você pode <a href='%{sign_up_path}' target='_blank'>criar uma aqui</a>
-    proceed: Continue para seguir
-    prompt: 'Você seguirá:'
-    reason_html: "<strong>Por que esse passo é necessário?</strong> <code>%{instance}</code> pode não ser a instância onde você se hospedou, então precisamos redirecionar você para a sua instância primeiro."
-  remote_interaction:
-    favourite:
-      proceed: Continue para favoritar
-      prompt: 'Você favoritará este toot:'
-    reblog:
-      proceed: Continue para dar boost
-      prompt: 'Você dará boost neste toot:'
-    reply:
-      proceed: Continue para responder
-      prompt: 'Você responderá este toot:'
+  reports:
+    errors:
+      invalid_rules: não faz referência a regras válidas
+  rss:
+    content_warning: 'Aviso de conteúdo:'
+    descriptions:
+      account: Publicações públicas de @%{acct}
+      tag: 'Publicações públicas marcadas com #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Você excedeu o limite de %{limit} toots agendados para esse dia
-    over_total_limit: Você excedeu o limite de %{limit} toots agendados
+    over_daily_limit: Você excedeu o limite de %{limit} publicações agendadas para esse dia
+    over_total_limit: Você excedeu o limite de %{limit} publicações agendadas
     too_soon: A data agendada precisa ser no futuro
   sessions:
     activity: Última atividade
@@ -1071,20 +1400,29 @@ pt-BR:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Sessão atual
     description: "%{browser} em %{platform}"
     explanation: Estes são os navegadores que estão conectados com a sua conta Mastodon.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
+      android: Android
       blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
       mac: MacOS
       other: Plataforma desconhecida
+      windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
     revoke: Fechar
-    revoke_success: Sessão fechada com sucesso
+    revoke_success: Sessão fechada
     title: Sessões
+    view_authentication_history: Ver histórico de autenticação da sua conta
   settings:
     account: Conta
     account_settings: Configurações da conta
@@ -1097,7 +1435,6 @@ pt-BR:
     edit_profile: Editar perfil
     export: Exportar dados
     featured_tags: Hashtags em destaque
-    identity_proofs: Provas de identidade
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
@@ -1105,6 +1442,8 @@ pt-BR:
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
+    statuses_cleanup: Exclusão automatizada de publicações
+    strikes: Avisos de moderação
     two_factor_authentication: Autenticação de dois fatores
     webauthn_authentication: Chaves de segurança
   statuses:
@@ -1119,21 +1458,22 @@ pt-BR:
       video:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
-    boosted_from_html: Boost de %{acct_link}
-    content_warning: 'Aviso de Conteúdo: %{warning}'
+    boosted_from_html: Impulso de %{acct_link}
+    content_warning: 'Aviso de conteúdo: %{warning}'
+    default_language: Igual ao idioma da interface
     disallowed_hashtags:
       one: 'continha hashtag não permitida: %{tags}'
       other: 'continha hashtags não permitidas: %{tags}'
+    edited_at_html: Editado em %{date}
     errors:
-      in_reply_not_found: O toot que você quer responder parece não existir.
-    language_detection: Detectar idioma automaticamente
+      in_reply_not_found: A publicação que você quer responder parece não existir.
     open_in_web: Abrir no navegador
     over_character_limit: limite de caracteres de %{max} excedido
     pin_errors:
-      limit: Quantidade máxima de toots excedida
-      ownership: Toots dos outros não podem ser fixados
-      private: Toots não-públicos não podem ser fixados
-      reblog: Boosts não podem ser fixados
+      direct: Publicações visíveis apenas para usuários mencionados não podem ser fixadas
+      limit: Você alcançou o número limite de publicações fixadas
+      ownership: As publicações dos outros não podem ser fixadas
+      reblog: Um impulso não pode ser fixado
     poll:
       total_people:
         one: "%{count} pessoa"
@@ -1147,102 +1487,59 @@ pt-BR:
     show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     sign_in_to_participate: Entre para participar dessa conversa
+    title: '%{name}: "%{quote}"'
     visibilities:
-      private: Privado
-      private_long: Posta apenas para seguidores
+      direct: Direto
+      private: Apenas seguidores
+      private_long: Exibir apenas para seguidores
       public: Público
-      public_long: Posta em linhas públicas
-      unlisted: Não-listado
-      unlisted_long: Não posta em linhas públicas
+      public_long: Todos podem ver
+      unlisted: Não listado
+      unlisted_long: Todos podem ver, mas não é listado em linhas do tempo públicas
+  statuses_cleanup:
+    enabled: Excluir publicações antigas automaticamente
+    enabled_hint: Exclui suas publicações automaticamente assim que elas alcançam sua validade, a não ser que se enquadrem em alguma das exceções abaixo
+    exceptions: Exceções
+    explanation: Já que a exclusão de publicações é uma operação custosa, ela é feita lentamente quando o servidor não está ocupado. Por isso suas publicações podem ser excluídas algum tempo depois de alcançarem sua validade.
+    ignore_favs: Ignorar favoritos
+    ignore_reblogs: Ignorar impulsos
+    interaction_exceptions: Exceções baseadas nas interações
+    interaction_exceptions_explanation: Note que não há garantia de que as publicações sejam excluídas se ficarem abaixo do limite de favoritos ou boosts depois de tê-lo ultrapassado.
+    keep_direct: Manter mensagens diretas
+    keep_direct_hint: Não exclui nenhuma de suas mensagens diretas
+    keep_media: Manter publicações com mídia
+    keep_media_hint: Não exclui nenhuma de suas publicações com mídia
+    keep_pinned: Manter publicações fixadas
+    keep_pinned_hint: Não exclui nenhuma de suas publicações fixadas
+    keep_polls: Manter enquetes
+    keep_polls_hint: Não exclui nenhuma de suas enquetes
+    keep_self_bookmark: Manter publicações que você salvou
+    keep_self_bookmark_hint: Não exclui suas próprias publicações se você as salvou
+    keep_self_fav: Manter publicações que você favoritou
+    keep_self_fav_hint: Não exclui suas próprias publicações se você as favoritou
+    min_age:
+      '1209600': 2 semanas
+      '15778476': 6 meses
+      '2629746': 1 mês
+      '31556952': 1 ano
+      '5259492': 2 meses
+      '604800': 1 semana
+      '63113904': 2 anos
+      '7889238': 3 meses
+    min_age_label: Validade
+    min_favs: Manter publicações favoritadas por ao menos
+    min_favs_hint: Não exclui publicações que receberam pelo menos esta quantidade de favoritos. Deixe em branco para excluir publicações independentemente da quantidade de favoritos
+    min_reblogs: Manter publicações impulsionadas por ao menos
+    min_reblogs_hint: Não exclui publicações que receberam pelo menos esta quantidade de impulsos. Deixe em branco para excluir publicações independentemente da quantidade de impulsos
   stream_entries:
-    pinned: Toot fixado
+    pinned: Publicação fixada
     reblogged: deu boost
     sensitive_content: Conteúdo sensível
+  strikes:
+    errors:
+      too_late: É tarde demais para solicitar uma revisão desta punição
   tags:
     does_not_match_previous_name: não corresponde ao nome anterior
-  terms:
-    body_html: |
-      <h2>Política de Privacidade</h2>
-      <h3 id="collect">Quais dados nós coletamos?</h3>
-
-      <ul>
-      <li><em>Dados básicos de conta</em>: Se você criar conta nesta instância, um nome de usuário, um e-mail e uma senha serão exigidos. Você também pode adicionar dados extras como nome de exibição, biografia, imagem de perfil e capa. Com exceção do e-mail e da senha, os dados citados sempre são públicos.</li>
-      <li><em>Toots, seguindo e outros dados públicos</em>: A lista de pessoas que você segue e a sua lista de seguidores são públicas. Ao enviar um toot, a data, a hora e o aplicativo usado são armazenados. Toots podem conter mídias anexadas, como áudios, imagens e vídeos. Toots públicos e não-listados são visíveis publicamente. Os toots fixados no seu perfil são públicos. Seus toots são enviados aos seus seguidores, em alguns casos isso significa que os toots são enviados para instâncias diferentes e cópias são armazenadas lá. Quando você exclui toots, essa informação também é enviada aos seus seguidores. O ato de dar boost ou favoritar outro toot é sempre público.</li></li>
-      <li><em>Mensagens Diretas e toots privados</em>: Todos os toots são armazenados e processados na instância. Toots privados são enviados aos seus seguidores e aos usuários mencionados neles; Mensagens Diretas (ou toots diretos) são enviadas somente aos usuários mencionados nelas. Em alguns casos isso significa que os toots são enviados para instâncias diferentes e cópias são armazenadas lá. Nós trabalhamos constantemente para limitar o acesso a estes toots somente às pessoas autorizadas, porém outras instâncias podem não fazer o mesmo. Portanto, é importante analisar as instâncias dos seus seguidores. Você pode trancar a conta para aprovar ou vetar novos seguidores manualmente nas configurações. <em>Por favor, tenha em mente que os operadores da instância em que se está e das instâncias receptoras podem ver tais toots</em>, e que os destinatários podem fazer capturas de tela, copiar ou usar outra maneira para compartilhar os toots. <em>Não compartilhe informação confidencial pelo Mastodon.</em></li>
-      <li><em>IPs e outros metadados</em>: Ao entrar na sua conta, nós armazenamos o seu endereço de IP e o nome do navegador usado. Todas as sessões abertas estão disponíveis para serem analisadas e revogadas nas configurações. O último endereço de IP usado é armazenado por até 12 meses. Nós também podemos reter históricos da instância que incluem o endereço de IP de todas as conexões à nossa instância.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Como usamos os seus dados?</h3>
-
-      <p>Todo dado que coletamos pode ser usado das seguintes maneiras:</p>
-
-      <ul>
-      <li>Para prover a funcionalidade básica do Mastodon. Você só pode interagir com o conteúdo de outras pessoas e postar seu próprio conteúdo usando uma conta. Por exemplo, você pode seguir outras pessoas para ver seus toots na sua própria linha do tempo personalizada.</li>
-      <li>Para auxiliar na moderação da comunidade, por exemplo ao comparar o seu endereço de IP com outros endereços de IP conhecidos para determinar evasão de banimento e outras violações.</li>
-      <li>O endereço de e-mail que você fornecer pode ser usado para te enviar informações, notificações sobre outras pessoas interagindo com o seu conteúdo ou contigo e para responder a questões ou outras solicitações.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Como protegemos seus dados?</h3>
-
-      <p>Nós implementamos diversas medidas de segurança para manter suas informações pessoais seguras quando você as acessa ou as envia. Entre outras coisas, sua sessão do navegador, bem como o tráfego entre os aplicativos e a API são asseguradas usando SSL e a sua senha é guardada usando um algoritmo forte de criptografia de mão única. Você pode ativar autenticação em dois fatores como forma de aumentar a segurança no acesso à sua conta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Qual é a nossa política de retenção de dados?</h3>
-
-      <p>Nós trabalhamos constantemente para:</p>
-
-      <ul>
-      <li>Reter o histórico da instância contendo os endereços de IP de todas as conexões a essa instância. O histórico é mantido por não mais que 90 dias.</li>
-      <li>Reter os endereços de IP associados à usuários da instância por não mais que 12 meses.</li>
-      </ul>
-
-      <p>Você pode solicitar e baixar um arquivo de todo o conteúdo da sua conta, incluindo seus toots, suas mídias, imagem de perfil e capa.</p>
-
-      <p>YVocê pode excluir a sua conta irreversivelmente a qualquer momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Nós usamos cookies?</h3>
-
-      <p>Sim. Cookies são pequenos arquivos que um site ou serviço baixa através do seu navegador (se você permitir). Esses cookies permitem ao site conhecer seu navegador e, se você tiver uma conta, associá-lo a ela.</p>
-
-      <p>Nós usamos cookies para salvar suas preferências para futuras visitas.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Nós compartilhamos algum dado para terceiros?</h3>
-
-      <p>Nós não vendemos, trocamos ou compartilhamos de qualquer maneira dados que possam te identificar à terceiros. Isso não inclui terceiros confiáveis que nos auxiliam a operar o nosso site, realizar nosso serviço ou prestar assistência, contanto que esses terceiros se comprometam a manter essa informação confidencial. Nós podemos também divulgar informação quando acreditamos que é apropriado para obedecer a lei, para fazer cumprir nossas políticas ou proteger os nossos direitos, propriedade ou segurança, ou de outrém.</p>
-
-      <p>Seu conteúdo público pode ser acessado por outras instâncias na rede. Seus toots públicos e privados são enviados às instâncias dos seus seguidores e seus toots diretos são enviados às instâncias dos usuários mencionados neles, contanto que esses seguidores ou usuários estejam em uma instância diferente desta.</p>
-
-      <p>Quando você autoriza um aplicativo a usar sua conta, dependendo do nível de autorização das permissões que você aprovar, o aplicativo pode acessar seus dados públicos, a lista de usuários que você segue, seus seguidores, suas listas, suas Mensagens Diretas e seus toots favoritos. Aplicativos nunca podem acessar o seu endereço de e-mail ou senha.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uso desse site por crianças</h3>
-
-      <p>Se a instância está na UE ou no EEE: Nosso site, produto e serviço são direcionados às pessoas que tem ao menos 16 anos de idade. Se você tem menos de 16 anos, de acordo com os requisitos da RGPD (<a href="https://pt.wikipedia.org/wiki/Regulamento_Geral_sobre_a_Prote%C3%A7%C3%A3o_de_Dados">Regulamento Geral sobre Proteção de Dados</a>) não use este site.</p>
-
-      <p>Se esta instância está nos EUA: Nosso site, produto e serviço são direcionados às pessoas que tem ao menos 13 anos de idade. Se você tem menos de 13 anos, de acordo com os requerimentos da COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) não use este site</p>
-
-      <p>Os requisitos da lei podem ser diferentes em outra jurisdição.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Alterações na nossa Política de Privacidade</h3>
-
-      <p>Se decidirmos mudar nossa Política de Privacidade, iremos disponibilizar as alterações nesta página.</p>
-
-      <p>CC-BY-SA. Atualizado pela última vez em 7 de março de 2018.</p>
-
-      <p>Adaptado originalmente de <a href="https://github.com/discourse/discourse">Política de Privacidade Discourse</a>.</p>
-    title: Termos de Serviço e Política de Privacidade de %{instance}
   themes:
     contrast: Mastodon  (Alto contraste)
     default: Mastodon (Noturno)
@@ -1251,79 +1548,90 @@ pt-BR:
     formats:
       default: "%H:%M em %d de %b de %Y"
       month: "%b de %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Adicionar
-    disable: Desativar
-    disabled_success: Autenticação de dois fatores desabilitada com sucesso
+    disable: Desativar autenticação de dois fatores
+    disabled_success: Autenticação de dois fatores desativada
     edit: Editar
     enabled: Autenticação de dois fatores ativada
-    enabled_success: Autenticação de dois fatores ativada com sucesso
+    enabled_success: Autenticação de dois fatores ativada
     generate_recovery_codes: Gerar códigos de recuperação
-    lost_recovery_codes: Códigos de recuperação permitem que você recupere o acesso à sua conta caso perca o seu celular. Se você perdeu seus códigos de recuperação, você pode gerá-los novamente aqui. Seus códigos de recuperação anteriores serão invalidados.
-    methods: Métodos de dois fatores
+    lost_recovery_codes: Os códigos de recuperação permitem que você recupere o acesso à sua conta caso perca o seu celular. Se você perdeu seus códigos de recuperação, você pode gerá-los novamente aqui. Seus códigos de recuperação anteriores serão invalidados.
+    methods: Métodos de autenticação de dois fatores
     otp: Aplicativo autenticador
     recovery_codes: Códigos de recuperação de reserva
-    recovery_codes_regenerated: Códigos de recuperação gerados com sucesso
-    recovery_instructions_html: Se você perder acesso ao seu celular, você pode usar um dos códigos de recuperação abaixo para acessar a sua conta. <strong>Mantenha os códigos de recuperação em um local seguro</strong>. Por exemplo, você pode imprimi-los e guardá-los junto com outros documentos importantes.
+    recovery_codes_regenerated: Códigos de recuperação gerados
+    recovery_instructions_html: Se você perder acesso ao seu celular, você pode usar um dos códigos de recuperação abaixo para acessar a sua conta. <strong>Mantenha os códigos de recuperação em um local seguro</strong>. Por exemplo, você pode imprimi-los e guardá-los junto a outros documentos importantes.
     webauthn: Chaves de segurança
   user_mailer:
+    appeal_approved:
+      action: Acessar perfil
+      explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi aprovada. Sua conta está novamente em situação regular.
+      subject: Sua revisão de %{date} foi aprovada
+      title: Revisão aprovada
+    appeal_rejected:
+      explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi rejeitada.
+      subject: Sua revisão de %{date} foi rejeitada
+      title: Revisão rejeitada
     backup_ready:
       explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
       subject: Seu arquivo está pronto para ser baixado
       title: Baixar arquivo
-    sign_in_token:
-      details: 'Aqui estão os detalhes da tentativa:'
-      explanation: 'Detectamos uma tentativa de acessar sua conta a partir de um endereço IP não reconhecido. Se for você, insira o código de segurança abaixo na página de desafio:'
-      further_actions: 'Se não foi você, por favor mude sua senha e ative a autenticação de dois fatores em sua conta. Você pode fazê-lo aqui:'
-      subject: Por favor, confirme a tentativa de acesso
-      title: Tentativa de acesso
+    suspicious_sign_in:
+      change_password: Altere sua senha
+      details: 'Aqui estão os detalhes do acesso:'
+      explanation: Detectamos um login em sua conta a partir de um novo endereço IP.
+      further_actions_html: Se não foi você, recomendamos que você %{action} imediatamente e ative a autenticação de dois fatores para manter sua conta segura.
+      subject: Sua conta foi acessada a partir de um novo endereço IP
+      title: Um novo login
     warning:
+      appeal: Enviar uma revisão
+      appeal_description: Se você acredita que isso é um erro, você pode enviar uma revisão para a equipe de %{instance}.
+      categories:
+        spam: Spam
+        violation: O conteúdo viola as seguintes diretrizes da comunidade
       explanation:
-        disable: Enquanto sua conta está congelada, seus dados de conta permanecem intactos, mas você não pode realizar nenhuma ação até que esteja destrancada.
-        sensitive: Seus arquivos de mídia carregados e mídias vinculadas serão tratados como sensíveis.
-        silence: Enquanto sua conta está silenciada, somente pessoas que já estão seguindo você poderão ver seus toots nessa instância, e você pode ser excluído de várias listas públicas. No entanto, outros ainda podem te seguir manualmente.
-        suspend: Sua conta foi banida e todos os seus toots e mídias foram irreversivelmente excluídos desta instância e das instâncias dos seus seguidores.
-      get_in_touch: Você pode responder a este e-mail para entrar em contato com a equipe de %{instance}.
-      review_server_policies: Revisar as políticas da instância
-      statuses: 'Especificamente, para:'
+        delete_statuses: Algumas de suas publicações infringiram uma ou mais diretrizes da comunidade e foram removidas pelos moderadores de %{instance}.
+        disable: Você não poderá mais usar a sua conta, mas o seu perfil e outros dados permanecem intactos. Você pode solicitar um backup dos seus dados, mudar as configurações ou excluir sua conta.
+        mark_statuses_as_sensitive: Algumas de suas postagens foram marcadas como sensíveis por moderadores da %{instance}. Isso significa que as pessoas terão que clicar nas mídias em publicações antes de ser exibida uma prévia. Você pode marcar uma mídia como sensível quando postar futuramente.
+        sensitive: A partir de agora, todos os seus arquivos de mídia enviados serão marcados como confidenciais e escondidos por trás de um aviso de clique.
+        silence: Você ainda pode usar a sua conta, mas apenas pessoas que já te seguem verão suas publicações nessa instância, e você poderá ser excluído de vários recursos de descoberta. No entanto, outros ainda poderão te seguir manualmente.
+        suspend: Você não pode mais usar sua conta, e seu perfil e outros dados não estão mais acessíveis. Você ainda pode fazer o login para solicitar um backup dos seus dados até eles serem completamente removidos em cerca de 30 dias, porém manteremos alguns dados básicos para prevenir que você escape da suspensão.
+      reason: 'Motivo:'
+      statuses: 'Publicações citadas:'
       subject:
+        delete_statuses: Suas publicações em %{acct} foram removidas
         disable: Sua conta %{acct} foi bloqueada
+        mark_statuses_as_sensitive: Suas publicações em %{acct} foram marcadas como sensíveis
         none: Aviso para %{acct}
-        sensitive: Sua conta %{acct} de postagem de mídia foi marcada como sensível
+        sensitive: Suas publicações em %{acct} serão marcadas como sensíveis a partir de agora
         silence: Sua conta %{acct} foi silenciada
         suspend: Sua conta %{acct} foi banida
       title:
+        delete_statuses: Publicações removidas
         disable: Conta bloqueada
+        mark_statuses_as_sensitive: Publicações marcadas como sensíveis
         none: Aviso
-        sensitive: Sua mídia foi marcada como sensível
+        sensitive: Conta marcada como sensível
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: Você pode personalizar o seu perfil enviando um avatar, uma capa, alterando seu nome de exibição e etc. Se você preferir aprovar seus novos seguidores antes de eles te seguirem, você pode trancar a sua conta.
+      edit_profile_step: Você pode personalizar seu perfil enviando uma foto de perfil, mudando seu nome de exibição e mais. Você pode optar por revisar novos seguidores antes que eles possam te seguir.
       explanation: Aqui estão algumas dicas para você começar
-      final_action: Comece a tootar
-      final_step: 'Comece a tootar! Mesmo sem seguidores, suas mensagens públicas podem ser vistas pelos outros, por exemplo, na linha local e nas hashtags. Você pode querer fazer uma introdução usando a hashtag #introdução, ou em inglês usando a hashtag #introductions.'
+      final_action: Comece a publicar
+      final_step: 'Comece a postar! Mesmo sem seguidores, suas postagens públicas podem ser vistas pelos outros, por exemplo, na linha do tempo local ou nas hashtags. Você pode querer fazer uma introdução usando a hashtag #introduções.'
       full_handle: Seu nome de usuário completo
-      full_handle_hint: Isso é o que você compartilha com aos seus amigos para que eles possam te mandar toots ou te seguir a partir de outra instância.
-      review_preferences_action: Alterar preferências
-      review_preferences_step: Não se esqueça de configurar suas preferências, como quais e-mails você gostaria de receber, que nível de privacidade você gostaria que seus toots tenham por padrão. Se você não sofre de enjoo com movimento, você pode habilitar GIFs animado automaticamente.
+      full_handle_hint: Isso é o que você compartilha com seus amigos para que eles possam te mandar mensagens ou te seguir a partir de outro servidor.
       subject: Boas-vindas ao Mastodon
-      tip_federated_timeline: A linha global é uma visão contínua da rede do Mastodon. Mas ela só inclui pessoas de instâncias que a sua instância conhece, então não é a rede completa.
-      tip_following: Você vai seguir administrador(es) da sua instância por padrão. Para encontrar mais gente interessante, confira as linhas local e global.
-      tip_local_timeline: A linha local é uma visão contínua das pessoas em %{instance}. Estes são seus vizinhos!
-      tip_mobile_webapp: Se o seu navegador móvel oferecer a opção de adicionar Mastodon à tela inicial, você pode receber notificações push. Será como um aplicativo nativo!
-      tips: Dicas
       title: Boas vindas, %{name}!
   users:
     follow_limit_reached: Você não pode seguir mais de %{limit} pessoas
-    generic_access_help_html: Problemas para acessar sua conta? Você pode entrar em contato com %{email} para obter ajuda
     invalid_otp_token: Código de dois fatores inválido
-    invalid_sign_in_token: Cógido de segurança inválido
     otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
     seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
     signed_in_as: 'Entrou como:'
-    suspicious_sign_in_confirmation: Parece que você não fez login deste dispositivo antes, e você não fez login por um tempo. Portanto, estamos enviando um código de segurança para o seu endereço de e-mail para confirmar que é você.
   verification:
     explanation_html: 'Você pode <strong>verificar os links nos metadados do seu perfil</strong>. Para isso, o site citado deve conter um link de volta para o seu perfil do Mastodon. O link de volta <strong>deve</strong> conter um atributo <code>rel="me"</code>. O conteúdo ou texto do link não importa. Aqui está um exemplo:'
     verification: Verificação
@@ -1331,16 +1639,16 @@ pt-BR:
     add: Adicionar nova chave de segurança
     create:
       error: Houve um problema ao adicionar sua chave de segurança. Tente novamente.
-      success: A sua chave de segurança foi adicionada com sucesso.
+      success: Sua chave de segurança foi adicionada.
     delete: Excluir
     delete_confirmation: Você tem certeza de que deseja excluir esta chave de segurança?
     description_html: Se você habilitar a <strong>autenticação por chave de segurança</strong>, o login exigirá que você use uma das suas chaves de segurança.
     destroy:
       error: Houve um problema ao excluir sua chave de segurança. Tente novamente.
-      success: Sua chave de segurança foi excluída com sucesso.
+      success: Sua chave de segurança foi excluída.
     invalid_credential: Chave de segurança inválida
     nickname_hint: Digite o apelido da sua nova chave de segurança
     not_enabled: Você ainda não habilitou o WebAuthn
     not_supported: Este navegador não tem suporte a chaves de segurança
-    otp_required: Para usar chaves de segurança, por favor habilite primeiro a autenticação de dois fatores.
+    otp_required: Para usar chaves de segurança, ative a autenticação de dois fatores.
     registered_on: Registrado em %{date}
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index e420aafa3..cb1fb5832 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1,92 +1,27 @@
 ---
 pt-PT:
   about:
-    about_hashtag_html: Estes são toots públicos marcados com <strong>#%{hashtag}</strong>. Podes interagir com eles se tiveres uma conta Mastodon.
     about_mastodon_html: Mastodon é uma rede social baseada em protocolos abertos da web e software livre e gratuito. É descentralizado como e-mail.
-    about_this: Sobre esta instância
-    active_count_after: activo
-    active_footnote: Utilizadores activos mensais (UAM)
-    administered_by: 'Administrado por:'
-    api: API
-    apps: Aplicações móveis
-    apps_platforms: Usar o Mastodon a partir do iOS, Android e outras plataformas
-    browse_directory: Navegue pelo directório de perfis e filtre por interesses
-    browse_local_posts: Visualize as publicações públicas desta instância em tempo real
-    browse_public_posts: Visualize as publicações públicas do Mastodon em tempo real
-    contact: Contacto
     contact_missing: Não configurado
     contact_unavailable: n.d.
-    discover_users: Descobrir utilizadores
-    documentation: Documentação
-    federation_hint_html: Ter uma conta em %{instance} permitirá seguir pessoas em qualquer instância Mastodon.
-    get_apps: Experimente uma aplicação
     hosted_on: Mastodon em %{domain}
-    instance_actor_flash: |
-      Esta conta é um actor virtual usado para representar a própria instância e não um utilizador individual.
-      É usada para motivos de federação e não deve ser bloqueada a não ser que que queira bloquear a instância por completo. Se for esse o caso, deverá usar o bloqueio de domínio.
-    learn_more: Saber mais
-    privacy_policy: Política de privacidade
-    rules: Regras da instância
-    rules_html: 'Abaixo está um resumo das regras que precisa seguir se pretender ter uma conta nesta instância do Mastodon:'
-    see_whats_happening: Veja o que está a acontecer
-    server_stats: 'Estatísticas da instância:'
-    source_code: Código fonte
-    status_count_after:
-      one: publicação
-      other: publicações
-    status_count_before: Que fizeram
-    tagline: Siga os seus amigos e descubra novas amizades
-    terms: Termos de serviço
-    unavailable_content: Conteúdo indisponível
-    unavailable_content_description:
-      domain: Instância
-      reason: Motivo
-      rejecting_media: 'Arquivos de media destas instâncias não serão processados ou armazenados, e nenhuma miniatura será exibida, o que requer que o utilizador clique e abra o arquivo original manualmente:'
-      rejecting_media_title: Media filtrada
-      silenced: 'Publicações destas instâncias serão ocultas em linhas do tempo e conversas públicas, e nenhuma notificação será gerada a partir das interações dos seus utilizadores, a menos que você os esteja a seguir:'
-      silenced_title: Servidores silenciados
-      suspended: 'Nenhum dado dessas instâncias será processado, armazenado ou trocado, tornando qualquer interação ou comunicação com os utilizadores dessas instâncias impossível:'
-      suspended_title: Servidores suspensos
-    unavailable_content_html: Mastodon geralmente permite que você veja o conteúdo e interaja com utilizadores de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.
-    user_count_after:
-      one: utilizador
-      other: utilizadores
-    user_count_before: Casa para
-    what_is_mastodon: O que é o Mastodon?
+    title: Sobre
   accounts:
-    choices_html: 'escolhas de %{name}:'
-    endorsements_hint: Você pode, através da interface web, escolher endossar pessoas que segue, e elas aparecerão aqui.
-    featured_tags_hint: Você pode destacar hashtags específicas que serão exibidas aqui.
     follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
     following: A seguir
     instance_actor_flash: Esta conta é um actor virtual usado para representar a própria instância e não um utilizador individual. É usada para motivos de federação e não deve ser suspenso.
-    joined: Aderiu %{date}
     last_active: última vez activo
     link_verified_on: A posse deste link foi verificada em %{date}
-    media: Media
-    moved_html: "%{name} mudou-se para %{new_profile_link}:"
-    network_hidden: Esta informação não está disponível
-    never_active: Nunca
     nothing_here: Não há nada aqui!
-    people_followed_by: Pessoas seguidas por %{name}
-    people_who_follow: Pessoas que seguem %{name}
     pin_errors:
       following: Tu tens de estar a seguir a pessoa que pretendes apoiar
     posts:
       one: Publicação
       other: Publicações
     posts_tab_heading: Publicações
-    posts_with_replies: Posts e Respostas
-    roles:
-      admin: Administrador(a)
-      bot: Robô
-      group: Grupo
-      moderator: Moderador
-    unavailable: Perfil indisponível
-    unfollow: Deixar de seguir
   admin:
     account_actions:
       action: Executar acção
@@ -94,26 +29,30 @@ pt-PT:
     account_moderation_notes:
       create: Criar nota
       created_msg: Nota de moderação criada com sucesso!
-      delete: Eliminar
       destroyed_msg: Nota de moderação excluída com sucesso!
     accounts:
       add_email_domain_block: Adicionar o domínio de e-mail à lista negra
       approve: Aprovar
-      approve_all: Aprovar todos
       approved_msg: Inscrição de %{username} aprovada com sucesso
       are_you_sure: Tens a certeza?
       avatar: Imagem de Perfil
       by_domain: Domínio
       change_email:
-        changed_msg: E-mail da conta alterado com sucesso!
+        changed_msg: E-mail alterado com sucesso!
         current_email: E-mail atual
         label: Alterar e-mail
         new_email: Novo e-mail
         submit: Alterar e-mail
         title: Alterar e-mail para %{username}
+      change_role:
+        changed_msg: Função alterada com sucesso!
+        label: Alterar função
+        no_role: Nenhuma função
+        title: Alterar a função de %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: A confirmar
+      custom: Personalizar
       delete: Eliminar dados
       deleted: Eliminada
       demote: Despromoveu
@@ -153,7 +92,7 @@ pt-PT:
         active: Activo
         all: Todos
         pending: Pendente
-        silenced: Silenciados
+        silenced: Limitadas
         suspended: Supensos
         title: Moderação
       moderation_notes: Notas de moderação
@@ -161,9 +100,14 @@ pt-PT:
       most_recent_ip: IP mais recente
       no_account_selected: Nenhuma conta foi alterada porque nenhuma foi selecionada
       no_limits_imposed: Sem limites impostos
+      no_role_assigned: Nenhuma função atribuída
       not_subscribed: Não inscrito
       pending: Pendente de revisão
       perform_full_suspension: Fazer suspensão completa
+      previous_strikes: Punições anteriores
+      previous_strikes_description_html:
+        one: Esta conta tem <strong>1</strong> punição.
+        other: Esta conta tem <strong>%{count}</strong> punições.
       promote: Promover
       protocol: Protocolo
       public: Público
@@ -171,8 +115,9 @@ pt-PT:
       redownload: Atualizar perfil
       redownloaded_msg: Atualizado com sucesso o perfil de %{username} da origem
       reject: Rejeitar
-      reject_all: Rejeitar todas
       rejected_msg: Inscrição de %{username} rejeitada com sucesso
+      remote_suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente.
+      remote_suspension_reversible_hint_html: A conta foi suspensa no servidor de origem e os seus dados serão totalmente eliminados em %{date}. Até lá, o servidor de origem poderá recuperar esta conta sem quaisquer efeitos negativos. Se desejar eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
       remove_avatar: Remover a imagem de perfil
       remove_header: Remover o cabeçalho
       removed_avatar_msg: Imagem de perfil de %{username} removida com sucesso
@@ -184,34 +129,31 @@ pt-PT:
       reset: Restaurar
       reset_password: Reset palavra-passe
       resubscribe: Reinscrever
-      role: Permissões
-      roles:
-        admin: Administrador(a)
-        moderator: Moderador
-        staff: Equipa
-        user: Utilizador
+      role: Função
       search: Pesquisar
       search_same_email_domain: Outros utilizadores com o mesmo domínio de e-mail
       search_same_ip: Outros utilizadores com o mesmo IP
       security_measures:
         only_password: Apenas palavra-passe
         password_and_2fa: Palavra-passe e 2FA
-        password_and_sign_in_token: Palavra-passe e token por e-mail
       sensitive: Marcar como sensível
       sensitized: marcada como sensível
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
-        created_reports: Relatórios gerados por esta conta
-        targeted_reports: Relatórios feitos sobre esta conta
+        created_reports: Denúncias realizadas
+        targeted_reports: Denunciada por outros
       silence: Silêncio
       silenced: Silenciada
       statuses: Status
+      strikes: Punições anteriores
       subscribe: Inscrever-se
+      suspend: Suspender
       suspended: Suspensa
       suspension_irreversible: Os dados desta conta foram eliminados irreversivelmente. Pode cancelar a suspensão da conta para torná-la utilizável, mas ela não irá recuperar os dados que possuía anteriormente.
       suspension_reversible_hint_html: A conta foi suspensa e os dados serão totalmente eliminados em %{date}. Até lá, a conta poderá ser recuperada sem quaisquer efeitos negativos. Se deseja eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
-      time_in_queue: Aguardando na fila %{time}
       title: Contas
+      unblock_email: Desbloquear endereço de e-mail
+      unblocked_email_msg: Endereço de e-mail de %{username} desbloqueado com sucesso
       unconfirmed_email: E-mail não confirmado
       undo_sensitized: Desmarcar como sensível
       undo_silenced: Desfazer silenciar
@@ -226,26 +168,34 @@ pt-PT:
       whitelisted: Está na lista branca
     action_logs:
       action_types:
-        assigned_to_self_report: Atribuir Relatório
+        approve_appeal: Aprovar Recurso
+        approve_user: Aprovar Utilizador
+        assigned_to_self_report: Atribuir Denúncia
         change_email_user: Alterar E-mail do Utilizador
+        change_role_user: Alterar Função do Utilizador
         confirm_user: Confirmar Utilizador
         create_account_warning: Criar Aviso
         create_announcement: Criar Anúncio
+        create_canonical_email_block: Criar Bloqueio de E-mail
         create_custom_emoji: Criar Emoji Personalizado
         create_domain_allow: Criar Permissão de Domínio
         create_domain_block: Criar Bloqueio de Domínio
         create_email_domain_block: Criar Bloqueio de Domínio de E-mail
         create_ip_block: Criar regra de IP
         create_unavailable_domain: Criar Domínio Indisponível
+        create_user_role: Criar Função
         demote_user: Despromover Utilizador
         destroy_announcement: Eliminar Anúncio
+        destroy_canonical_email_block: Eliminar Bloqueio de E-mail
         destroy_custom_emoji: Eliminar Emoji Personalizado
         destroy_domain_allow: Eliminar Permissão de Domínio
         destroy_domain_block: Eliminar Bloqueio de Domínio
         destroy_email_domain_block: Eliminar Bloqueio de Domínio de E-mail
+        destroy_instance: Purgar Domínio
         destroy_ip_block: Eliminar regra de IP
         destroy_status: Eliminar Publicação
         destroy_unavailable_domain: Eliminar Domínio Indisponível
+        destroy_user_role: Eliminar Função
         disable_2fa_user: Desativar 2FA
         disable_custom_emoji: Desativar Emoji Personalizado
         disable_sign_in_token_auth_user: Desativar token de autenticação por e-mail para Utilizador
@@ -255,42 +205,56 @@ pt-PT:
         enable_user: Ativar Utilizador
         memorialize_account: Memorizar Conta
         promote_user: Promover Utilizador
+        reject_appeal: Rejeitar Recurso
+        reject_user: Rejeitar Utilizador
         remove_avatar_user: Remover Imagem de Perfil
-        reopen_report: Reabrir Relatório
+        reopen_report: Reabrir Denúncia
+        resend_user: Reenviar E-mail de Confirmação
         reset_password_user: Repor Password
-        resolve_report: Resolver Relatório
+        resolve_report: Resolver Denúncia
         sensitive_account: Marcar a media na sua conta como sensível
         silence_account: Silenciar Conta
         suspend_account: Suspender Conta
-        unassigned_report: Desatribuir Relatório
+        unassigned_report: Desatribuir Denúncia
+        unblock_email_account: Desbloquear endereço de e-mail
         unsensitive_account: Desmarcar a media na sua conta como sensível
         unsilence_account: Deixar de Silenciar Conta
         unsuspend_account: Retirar Suspensão à Conta
         update_announcement: Atualizar Anúncio
         update_custom_emoji: Atualizar Emoji Personalizado
         update_domain_block: Atualizar Bloqueio de Domínio
+        update_ip_block: Atualizar regra de IP
         update_status: Atualizar Estado
+        update_user_role: Atualizar Função
       actions:
-        assigned_to_self_report_html: "%{name} atribuiu o relatório %{target} a si próprio"
+        approve_appeal_html: "%{name} aprovou recurso da decisão de moderação de %{target}"
+        approve_user_html: "%{name} aprovou a inscrição de %{target}"
+        assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} a si próprio"
         change_email_user_html: "%{name} alterou o endereço de e-mail do utilizador %{target}"
+        change_role_user_html: "%{name} alterou a função de %{target}"
         confirm_user_html: "%{name} confirmou o endereço de e-mail do utilizador %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou o e-mail com a hash %{target}"
         create_custom_emoji_html: "%{name} carregou o novo emoji %{target}"
         create_domain_allow_html: "%{name} habilitou a federação com o domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
         create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
         create_ip_block_html: "%{name} criou regra para o IP %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
+        create_user_role_html: "%{name} criou a função %{target}"
         demote_user_html: "%{name} despromoveu o utilizador %{target}"
         destroy_announcement_html: "%{name} eliminou o anúncio %{target}"
-        destroy_custom_emoji_html: "%{name} destruiu o emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com a hash %{target}"
+        destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
         destroy_domain_allow_html: "%{name} desabilitou a federação com o domínio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
         destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
+        destroy_instance_html: "%{name} purgou o domínio %{target}"
         destroy_ip_block_html: "%{name} eliminou regra para o IP %{target}"
         destroy_status_html: "%{name} removeu a publicação de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
+        destroy_user_role_html: "%{name} eliminou a função %{target}"
         disable_2fa_user_html: "%{name} desativou o requerimento de autenticação em dois passos para o utilizador %{target}"
         disable_custom_emoji_html: "%{name} desabilitou o emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} desativou token de autenticação por e-mail para %{target}"
@@ -300,22 +264,28 @@ pt-PT:
         enable_user_html: "%{name} ativou o acesso para o utilizador %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o utilizador %{target}"
+        reject_appeal_html: "%{name} rejeitou recurso da decisão de moderação de %{target}"
+        reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
-        reopen_report_html: "%{name} reabriu o relatório %{target}"
+        reopen_report_html: "%{name} reabriu a denúncia %{target}"
+        resend_user_html: "%{name} reenviou e-mail de confirmação para %{target}"
         reset_password_user_html: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
-        resolve_report_html: "%{name} resolveu o relatório %{target}"
+        resolve_report_html: "%{name} resolveu a denúncia %{target}"
         sensitive_account_html: "%{name} marcou a media de %{target} como sensível"
         silence_account_html: "%{name} silenciou a conta de %{target}"
         suspend_account_html: "%{name} suspendeu a conta de %{target}"
-        unassigned_report_html: "%{name} desatribuiu o realtório %{target}"
+        unassigned_report_html: "%{name} desatribuiu a denúncia %{target}"
+        unblock_email_account_html: "%{name} desbloqueou o endereço de e-mail de %{target}"
         unsensitive_account_html: "%{name} desmarcou a media de %{target} como sensível"
         unsilence_account_html: "%{name} desativou o silêncio de %{target}"
         unsuspend_account_html: "%{name} desativou a suspensão de %{target}"
         update_announcement_html: "%{name} atualizou o anúncio %{target}"
         update_custom_emoji_html: "%{name} atualizou o emoji %{target}"
         update_domain_block_html: "%{name} atualizou o bloqueio de domínio para %{target}"
+        update_ip_block_html: "%{name} alterou regra para IP %{target}"
         update_status_html: "%{name} atualizou o estado de %{target}"
-      deleted_status: "(publicação eliminada)"
+        update_user_role_html: "%{name} alterou a função %{target}"
+      deleted_account: conta excluída
       empty: Não foram encontrados registos.
       filter_by_action: Filtrar por ação
       filter_by_user: Filtrar por utilizador
@@ -354,11 +324,12 @@ pt-PT:
       enable: Ativar
       enabled: Ativado
       enabled_msg: Ativado com sucesso este emoji
-      image_hint: PNG de até 50KB
+      image_hint: PNG ou GIF até %{size}
       list: Lista
       listed: Listado
       new:
         title: Adicionar novo emoji customizado
+      no_emoji_selected: Nenhum emojis foi alterado, pois nenhum foi selecionado
       not_permitted: Não está autorizado a executar esta ação
       overwrite: Sobrescrever
       shortcode: Código de atalho
@@ -375,17 +346,20 @@ pt-PT:
       interactions: interações
       media_storage: Armazenamento de media
       new_users: novos utilizadores
-      opened_reports: relatórios abertos
+      opened_reports: denúncias abertas
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> recurso pendente"
+        other: "<strong>%{count}</strong> recursos pendentes"
       pending_reports_html:
-        one: "<strong>1</strong> relatório pendente"
-        other: "<strong>%{count}</strong> relatórios pendentes"
+        one: "<strong>%{count}</strong> denuncia pendente"
+        other: "<strong>%{count}</strong> denuncias pendentes"
       pending_tags_html:
-        one: "<strong>1</strong> hashtag pendente"
+        one: "<strong>%{count}</strong> hashtag pendente"
         other: "<strong>%{count}</strong> hashtags pendentes"
       pending_users_html:
-        one: "<strong>1</strong> utilizador pendente"
+        one: "<strong>%{count}</strong> utilizador pendente"
         other: "<strong>%{count}</strong> utilizadores pendentes"
-      resolved_reports: relatórios resolvidos
+      resolved_reports: denúncias resolvidas
       software: Software
       sources: Origem de inscrições
       space: Utilização do espaço
@@ -393,10 +367,16 @@ pt-PT:
       top_languages: Principais idiomas activos
       top_servers: Servidores mais activos
       website: Website
+    disputes:
+      appeals:
+        empty: Nenhum recurso encontrado.
+        title: Recursos
     domain_allows:
       add_new: Colocar domínio na lista branca
       created_msg: Domínio foi adicionado à lista branca com sucesso
       destroyed_msg: Domínio foi removido da lista branca
+      export: Exportar
+      import: Importar
       undo: Remover da lista branca
     domain_blocks:
       add_new: Adicionar novo
@@ -404,16 +384,21 @@ pt-PT:
       destroyed_msg: Bloqueio de domínio está a ser removido
       domain: Domínio
       edit: Editar bloqueio de domínio
+      existing_domain_block: Já impôs limites mais rigorosos a %{name}.
       existing_domain_block_html: Você já impôs limites mais restritivos a %{name}, é necessário primeiro <a href="%{unblock_url}">desbloqueá-lo</a>.
+      export: Exportar
+      import: Importar
       new:
         create: Criar bloqueio
         hint: O bloqueio de dominio não vai previnir a criação de entradas na base de dados, mas irá retroativamente e automaticamente aplicar métodos de moderação específica nessas contas.
         severity:
-          desc_html: "<strong>Silenciar</strong> irá fazer com que as publicações dessa conta sejam invisíveis para quem não a segue. <strong>Supender</strong> irá eliminar todo o conteúdo guardado dessa conta, media e informação de perfil. Use <strong>Nenhum</strong> se apenas deseja rejeitar arquivos de media."
+          desc_html: "<strong>Limitar</strong> tornará as mensagens das contas neste domínio invisíveis a qualquer pessoa que não as esteja a seguir. <strong>Suspender</strong> removerá do seu servidor todo o conteúdo, media, e dados de perfil das contas deste domínio. Utilize <strong>Nenhum</strong> se apenas quiser rejeitar ficheiros media."
           noop: Nenhum
-          silence: Silenciar
+          silence: Limitar
           suspend: Suspender
         title: Novo bloqueio de domínio
+      no_domain_block_selected: Nenhum bloqueio de domínio foi alterado pois nenhum foi selecionado
+      not_permitted: Não está autorizado a executar esta ação
       obfuscate: Ofuscar nome de domínio
       obfuscate_hint: Ofuscar parcialmente o nome de domínio na lista, se estiverem habilitadas as limitações na publicação da lista de domínios
       private_comment: Comentário privado
@@ -422,36 +407,43 @@ pt-PT:
       public_comment_hint: Comentário sobre essa limitação de domínio para o público geral, se ativada a divulgação da lista de limitações de domínio.
       reject_media: Rejeitar ficheiros de media
       reject_media_hint: Remove arquivos de media armazenados localmente e rejeita descarregar novos arquivos no futuro. Irrelevante para suspensões
-      reject_reports: Rejeitar relatórios
-      reject_reports_hint: Ignorar todos os relatórios vindos deste domínio. Irrelevantes para efectuar suspensões
-      rejecting_media: a rejeitar ficheiros de media
-      rejecting_reports: a rejeitar relatórios
-      severity:
-        silence: silenciado
-        suspend: suspenso
-      show:
-        affected_accounts:
-          one: Uma conta na base de dados afectada
-          other: "%{count} contas na base de dados afectadas"
-        retroactive:
-          silence: Não silenciar contas afetadas existentes deste domínio
-          suspend: Não suspender todas as contas existentes nesse domínio
-        title: Remover o bloqueio de domínio de %{domain}
-        undo: Anular
+      reject_reports: Rejeitar denúncia
+      reject_reports_hint: Ignorar todos as denúncias provenientes deste domínio. Irrelevante para suspensões
       undo: Anular
       view: Ver domínios bloqueados
     email_domain_blocks:
       add_new: Adicionar novo
+      attempts_over_week:
+        one: "%{count} tentativa na última semana"
+        other: "%{count} tentativas de inscrição na última semana"
       created_msg: Bloqueio de domínio de e-mail criado com sucesso
       delete: Eliminar
-      destroyed_msg: Bloqueio de domínio de e-mail excluído com sucesso
+      dns:
+        types:
+          mx: Registo MX
       domain: Domínio
-      empty: Nenhum domínio de e-mail atualmente na lista negra.
-      from_html: de %{domain}
       new:
         create: Adicionar domínio
+        resolve: Domínio de resolução
         title: Novo bloqueio de domínio de e-mail
+      no_email_domain_block_selected: Nenhum bloqueio de domínio de e-mail foi alterado pois nenhum foi selecionado
+      resolved_dns_records_hint_html: O nome de domínio resolve para os seguintes domínios MX, que são, em última análise, responsáveis por aceitar o e-mail. Bloquear um domínio MX irá bloquear as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo quando o nome de domínio visível é diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
+      resolved_through_html: Resolvido através de %{domain}
       title: Domínios de e-mail bloqueados
+    export_domain_allows:
+      new:
+        title: Importar permissões de domínio
+      no_file: Nenhum ficheiro selecionado
+    export_domain_blocks:
+      import:
+        description_html: Está prestes a importar uma lista de bloqueios de domínio. Por favor, reveja esta lista com muito cuidado, especialmente se não tiver sido o autor desta lista.
+        existing_relationships_warning: Relações de seguimento existentes
+        private_comment_description_html: 'Para o ajudar a rastrear a origem dos bloqueios importados, estes serão criados com o seguinte comentário privado: <q>%{comment}</q>'
+        private_comment_template: Importado de %{source} em %{date}
+        title: Importar bloqueios de domínio
+      new:
+        title: Importar bloqueios de domínio
+      no_file: Nenhum ficheiro selecionado
     follow_recommendations:
       description_html: "<strong>Recomendações de quem seguir ajudam novos utilizadores a encontrar conteúdo interessante rapidamente.</strong>. Quando um utilizador não interage com outros o suficiente para formar recomendações personalizadas, estas contas são recomendadas. Elas são recalculadas diariamente a partir de uma mistura de contas com mais atividade recente e maior número de seguidores locais para um determinado idioma."
       language: Para o idioma
@@ -461,25 +453,53 @@ pt-PT:
       title: Seguir recomendações
       unsuppress: Restaurar recomendações de contas a seguir
     instances:
+      availability:
+        description_html:
+          one: Se a transmissão ao domínio falhar <strong>%{count} dia</strong> sem sucesso, nenhuma tentativa de transmissão será feita a menos que uma transmissão <em>proveniente</em> do domínio seja recebida.
+          other: Se a transmissão ao domínio falhar em <strong>%{count} dias diferentes</strong> sem sucesso, nenhuma tentativa de transmissão será feita a menos que uma transmissão <em>proveniente</em> do domínio seja recebida.
+        failure_threshold_reached: Limite de falhas atingido em %{date}.
+        failures_recorded:
+          one: Tentativa falhada em %{count} dia.
+          other: Tentativas em %{count} dias diferentes.
+        no_failures_recorded: Sem falhas registadas.
+        title: Disponibilidade
+        warning: A última tentativa de conectar a este servidor não foi bem sucedida
       back_to_all: Todas
       back_to_limited: Limitadas
       back_to_warning: Aviso
       by_domain: Domínio
+      confirm_purge: Tem a certeza que deseja eliminar permanentemente os dados deste domínio?
+      content_policies:
+        comment: Nota interna
+        description_html: Pode definir políticas de conteúdo que serão aplicadas a todas as contas deste domínio e a qualquer um dos seus subdomínios.
+        policies:
+          reject_media: Rejeitar media
+          reject_reports: Rejeitar denúncias
+          silence: Limitar
+          suspend: Suspender
+        policy: Política
+        reason: Justificação pública
+        title: Políticas de conteúdo
+      dashboard:
+        instance_accounts_dimension: Contas mais seguidas
+        instance_accounts_measure: contas armazenadas
+        instance_followers_measure: nossos seguidores lá
+        instance_follows_measure: os seus seguidores aqui
+        instance_languages_dimension: Idiomas mais populares
+        instance_media_attachments_measure: anexos de media armazenados
+        instance_reports_measure: denúncias sobre eles
+        instance_statuses_measure: publicações armazenadas
       delivery:
         all: Todas
         clear: Limpar erros de entrega
+        failing: A falhar
         restart: Reiniciar entrega
         stop: Parar entrega
-        title: Entrega
         unavailable: Indisponível
-        unavailable_message: Entrega indisponível
-        warning: Aviso
-        warning_message:
-          one: Falhou entrega %{count} dia
-          other: Falhou entrega %{count} dias
       delivery_available: Entrega disponível
       delivery_error_days: Dias de erro de entrega
       delivery_error_hint: Se a entrega não for possível durante %{count} dias, será automaticamente marcada como não realizável.
+      destroyed_msg: Dados de %{domain} estão agora na fila para iminente eliminação.
       empty: Não foram encontrados domínios.
       known_accounts:
         one: "%{count} conta conhecida"
@@ -490,12 +510,15 @@ pt-PT:
         title: Moderação
       private_comment: Comentários privados
       public_comment: Comentários públicos
+      purge: Purgar
+      purge_description_html: Se acredita que este domínio está definitivamente offline, pode excluir todos os registos de contas e dados associados a ele do seu armazenamento. Isso pode demorar algum tempo.
       title: Instâncias conhecidas
       total_blocked_by_us: Bloqueadas por nós
       total_followed_by_them: Seguidas por eles
       total_followed_by_us: Seguidas por nós
-      total_reported: Relatórios sobre eles
+      total_reported: Denúncias sobre eles
       total_storage: Anexos de media
+      totals_time_period_hint_html: Os totais exibidos abaixo incluem dados referentes ao tempo total.
     invites:
       deactivate_all: Desativar todos
       filter:
@@ -519,8 +542,6 @@ pt-PT:
         title: Criar nova regra de IP
       no_ip_block_selected: Nenhuma regra de IP foi alterada pois nenhuma foi selecionada
       title: Regras de IP
-    pending_accounts:
-      title: Contas pendentes (%{count})
     relationships:
       title: Relações de %{acct}
     relays:
@@ -540,46 +561,128 @@ pt-PT:
       status: Estado
       title: Retransmissores
     report_notes:
-      created_msg: Relatório criado com sucesso!
-      destroyed_msg: Nota de relatório eliminada com sucesso!
+      created_msg: Nota de denúncia criada com sucesso!
+      destroyed_msg: Nota de denúncia eliminada com sucesso!
     reports:
       account:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} relatório"
-          other: "%{count} relatórios"
+      action_log: Registo de auditoria
       action_taken_by: Ação tomada por
-      are_you_sure: Tens a certeza?
-      assign_to_self: Atribuí-me a mim
-      assigned: Atribuído ao moderador
+      actions:
+        delete_description_html: As publicações denunciadas serão eliminadas e uma punição será registada para ajudá-lo a escalar ações em futuras infrações pela mesma conta.
+        mark_as_sensitive_description_html: A media nas publicações denunciadas será marcada como sensível e uma punição será registada para ajudá-lo a escalar ações em futuras infrações pela mesma conta.
+        other_description_html: Ver mais opções para controlar o comportamento da conta e personalizar a comunicação para a conta denunciada.
+        resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, nenhuma punição será registada, e a denuncia será fechada.
+        silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando severamente o seu alcance. Pode sempre ser revertido.
+        suspend_description_html: O perfil e todo o seu conteúdo tornar-se-ão inacessíveis até serem eventualmente apagados. A interacção com a conta será impossível. Reversível no prazo de 30 dias.
+      actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
+      add_to_report: Adicionar mais à denúncia
+      are_you_sure: Tem a certeza?
+      assign_to_self: Atribuída a mim
+      assigned: Atribuída ao moderador
+      by_target_domain: Domínio da conta denunciada
+      category: Categorização
+      category_description_html: A razão pela qual esta conta e/ou conteúdo foi denunciado será citada na comunicação com a conta denunciada
       comment:
         none: Nenhum
-      created_at: Relatado
+      comment_description_html: 'Para fornecer mais informações, %{name} escreveu:'
+      created_at: Denunciado
+      delete_and_resolve: Eliminar publicações
       forwarded: Encaminhado
       forwarded_to: Encaminhado para %{domain}
       mark_as_resolved: Marcar como resolvido
+      mark_as_sensitive: Marcar como sensível
       mark_as_unresolved: Marcar como não resolvido
+      no_one_assigned: Ninguém
       notes:
         create: Adicionar nota
         create_and_resolve: Resolver com nota
         create_and_unresolve: Reabrir com nota
         delete: Eliminar
         placeholder: Descreve as ações que foram tomadas ou quaisquer outras atualizações relacionadas...
-      reopen: Reabrir relatório
+        title: Notas
+      notes_description_html: Visualize e deixe anotações para outros moderadores e para sí no futuro
+      quick_actions_description_html: 'Tome uma ação rápida ou role para baixo para ver o conteúdo denunciado:'
+      remote_user_placeholder: o utilizador remoto de %{instance}
+      reopen: Reabrir denúncia
       report: 'Denúncia #%{id}'
       reported_account: Conta denunciada
-      reported_by: Reportado por
+      reported_by: Denunciado por
       resolved: Resolvido
-      resolved_msg: Relatório resolvido com sucesso!
+      resolved_msg: Denúncia resolvida com sucesso!
+      skip_to_actions: Passar para as ações
       status: Estado
-      target_domain: Domínio da conta reportada
-      target_origin: Origem da conta reportada
-      title: Relatórios
+      statuses: Conteúdo denunciado
+      statuses_description_html: O conteúdo ofensivo será citado na comunicação com a conta denunciada
+      target_origin: Origem da conta denunciada
+      title: Denúncias
       unassign: Não atribuir
       unresolved: Por resolver
       updated_at: Atualizado
+      view_profile: Ver perfil
+    roles:
+      add_new: Adicionar função
+      assigned_users:
+        one: "%{count} utilizador"
+        other: "%{count} utilizadores"
+      categories:
+        administration: Administração
+        devops: DevOps
+        invites: Convites
+        moderation: Moderação
+        special: Especiais
+      delete: Eliminar
+      description_html: Com as <strong>funções de utilizador</strong>, pode personalizar quais funções e áreas do Mastodon os seus utilizadores podem aceder.
+      edit: Editar função '%{name}'
+      everyone: Permissões padrão
+      everyone_full_description_html: Esta é a <strong>função base</strong> que afeta <strong>todos os utilizadores</strong>, mesmo aqueles sem uma função atribuída. Todas as outras funções herdam as permissões desta.
+      permissions_count:
+        one: "%{count} permissão"
+        other: "%{count} permissões"
+      privileges:
+        administrator: Administrador
+        administrator_description: Utilizadores com esta permissão irão contornar todas as permissões
+        delete_user_data: Eliminar Dados de Utilizador
+        delete_user_data_description: Permite que os utilizadores eliminem os dados de outros utilizadores sem atraso
+        invite_users: Convidar Utilizadores
+        invite_users_description: Permite aos utilizadores convidar pessoas novas para o servidor
+        manage_announcements: Gerir Anúncios
+        manage_announcements_description: Permite aos utilizadores gerir anúncios no servidor
+        manage_appeals: Gerir Recursos
+        manage_appeals_description: Permite aos utilizadores rever recursos de moderação
+        manage_blocks: Gerir Bloqueios
+        manage_blocks_description: Permite aos utilizadores bloquear provedores de e-mail e endereços IP
+        manage_custom_emojis: Gerir Emojis Personalizados
+        manage_custom_emojis_description: Permite aos utilizadores gerir os emojis personalizados do servidor
+        manage_federation: Gerir Federação
+        manage_federation_description: Permite aos utilizadores bloquear ou permitir federação com outros domínios e controlar a entregabilidade
+        manage_invites: Gerir Convites
+        manage_invites_description: Permite aos utilizadores pesquisar e desativar links de convite
+        manage_reports: Gerir Relatórios
+        manage_reports_description: Permite aos utilizadores rever relatórios e executar ações de moderação contra eles
+        manage_roles: Gerir Funções
+        manage_roles_description: Permite aos usuários gerir e atribuir funções abaixo das deles
+        manage_rules: Gerir Regras
+        manage_rules_description: Permite aos utilizadores alterar as regras do servidor
+        manage_settings: Gerir Configurações
+        manage_settings_description: Permite aos utilizadores alterar as configurações do site
+        manage_taxonomies: Gerir Taxonomias
+        manage_taxonomies_description: Permite aos utilizadores rever o conteúdo em tendência e atualizar as configurações de hashtag
+        manage_user_access: Gerir Acesso de Utilizador
+        manage_user_access_description: Permite aos utilizadores desativar a autenticação em duas etapas de outros utilizadores, alterar o seu endereço de e-mail e redefinir a sua palavra-passe
+        manage_users: Gerir Utilizadores
+        manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles
+        manage_webhooks: Gerir Webhooks
+        manage_webhooks_description: Permite aos utilizadores configurar webhooks para eventos administrativos
+        view_audit_log: Ver Registo de Auditoria
+        view_audit_log_description: Permite aos utilizadores ver um histórico de ações administrativas no servidor
+        view_dashboard: Ver Painel de Controlo
+        view_dashboard_description: Permite aos utilizadores aceder ao painel de controlo e várias métricas
+        view_devops: DevOps
+        view_devops_description: Permite aos utilizadores aceder aos painéis de controlo do Sidekiq e pgHero
+      title: Funções
     rules:
       add_new: Adicionar regra
       delete: Eliminar
@@ -588,152 +691,219 @@ pt-PT:
       empty: Nenhuma regra de instância foi ainda definida.
       title: Regras da instância
     settings:
-      activity_api_enabled:
-        desc_html: Contagem semanais de publicações locais, utilizadores activos e novos registos
-        title: Publicar estatísticas agregadas sobre atividade dos utilizadores
-      bootstrap_timeline_accounts:
-        desc_html: Separa os nomes de utilizadores por vírgulas. Funciona apenas com contas locais e desbloqueadas. O padrão quando vazio são todos os administradores locais.
-        title: Seguidores predefinidos para novas contas
-      contact_information:
-        email: Inserir um endereço de e-mail para tornar público
-        username: Insira um nome de utilizador
-      custom_css:
-        desc_html: Modificar a aparência com CSS carregado em cada página
-        title: CSS personalizado
+      about:
+        manage_rules: Gerir regras do servidor
+        preamble: Forneça informações aprofundadas sobre como o servidor é operado, moderado, financiado.
+        rules_hint: Existe uma área dedicada às regras a que os seus utilizadores devem aderir.
+        title: Sobre
+      appearance:
+        preamble: Personalize a interface web do Mastodon.
+        title: Aspeto
+      branding:
+        preamble: A marca do seu servidor diferencia-a de outros servidores na rede. Essa informação pode ser exibida em vários ambientes, como a interface web do Mastodon, aplicativos nativos, visualizações de links em outros sites e dentro de aplicativos de mensagens, etc. Por esta razão, é melhor manter esta informação clara, curta e concisa.
+        title: Marca
+      content_retention:
+        preamble: Controle como o conteúdo gerado pelos utilizadores é armazenado no Mastodon.
+        title: Retenção de conteúdo
       default_noindex:
         desc_html: Afeta todos os utilizadores que não alteraram esta configuração
         title: Desativar, por omissão, a indexação de utilizadores por parte dos motores de pesquisa
+      discovery:
+        follow_recommendations: Recomendações para seguir
+        preamble: Revelar conteúdos interessantes é fundamental para a entrada de novos utilizadores que podem não conhecer ninguém no Mastodon. Controle como os vários recursos de descoberta funcionam no seu servidor.
+        profile_directory: Diretório de perfis
+        public_timelines: Cronologias públicas
+        title: Descobrir
+        trends: Tendências
       domain_blocks:
         all: Para toda a gente
         disabled: Para ninguém
-        title: Mostrar domínios bloqueados
         users: Para utilizadores locais que se encontrem autenticados
-      domain_blocks_rationale:
-        title: Mostrar motivo
-      hero:
-        desc_html: Apresentado na primeira página. Pelo menos 600x100px recomendados. Quando não é definido, é apresentada a miniatura da instância
-        title: Imagem Hero
-      mascot:
-        desc_html: Apresentada em múltiplas páginas. Pelo menos 293x205px recomendados. Quando não é definida, é apresentada a mascote predefinida
-        title: Imagem da mascote
-      peers_api_enabled:
-        desc_html: Nomes de domínio que esta instância encontrou no fediverso
-        title: Publicar lista de instâncias descobertas
-      preview_sensitive_media:
-        desc_html: A pre-visualização de links noutros sites irá apresentar uma miniatura, mesmo que a media seja marcada como sensível
-        title: Mostrar media sensível em pre-visualizações OpenGraph
-      profile_directory:
-        desc_html: Permite aos utilizadores serem descobertos
-        title: Ativar directório do perfil
       registrations:
-        closed_message:
-          desc_html: Mostrar na página inicial quando registos estão encerrados<br/>Podes usar tags HTML
-          title: Mensagem de registos encerrados
-        deletion:
-          desc_html: Permitir a qualquer utilizador eliminar a sua conta
-          title: Permitir eliminar contas
-        min_invite_role:
-          disabled: Ninguém
-          title: Permitir convites de
-        require_invite_text:
-          desc_html: Quando os registos exigirem aprovação manual, faça o texto "Porque se quer juntar a nós?" da solicitação de convite obrigatório, em vez de opcional
-          title: Exigir que novos utilizadores preencham um texto de solicitação de convite
+        preamble: Controle quem pode criar uma conta no seu servidor.
+        title: Inscrições
       registrations_mode:
         modes:
           approved: Registo sujeito a aprovação
           none: Ninguém se pode registar
           open: Qualquer pessoa se pode registar
-        title: Modo de registo
-      show_known_fediverse_at_about_page:
-        desc_html: Quando comutado, irá mostrar a previsualização de publicações de todo o fediverse conhecido. De outro modo só mostrará publicações locais.
-        title: Mostrar o fediverse conhecido na previsualização da cronologia
-      show_staff_badge:
-        desc_html: Mostrar um crachá da equipa na página de utilizador
-        title: Mostrar crachá da equipa
-      site_description:
-        desc_html: Mostrar como parágrafo na página inicial e usado como meta tag.Podes usar tags HTML, em particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descrição do site
-      site_description_extended:
-        desc_html: Mostrar na página de mais informações<br/>Podes usar tags HTML
-        title: Página de mais informações
-      site_short_description:
-        desc_html: Mostrada na barra lateral e em etiquetas de metadados. Descreve o que o Mastodon é e o que torna esta instância especial num único parágrafo. Se deixada em branco, remete para a descrição da instância.
-        title: Breve descrição da instância
-      site_terms:
-        desc_html: Podes escrever a sua própria política de privacidade, termos de serviço, entre outras coisas. Pode utilizar etiquetas HTML
-        title: Termos de serviço personalizados
-      site_title: Título do site
-      thumbnail:
-        desc_html: Usada para visualizações via OpenGraph e API. Recomenda-se 1200x630px
-        title: Miniatura da instância
-      timeline_preview:
-        desc_html: Exibir a linha temporal pública na página inicial
-        title: Visualização da linha temporal
-      title: Configurações do site
-      trendable_by_default:
-        desc_html: Afecta as hashtags que ainda não tenham sido proibidas
-        title: Permitir hashtags em tendência sem revisão prévia
-      trends:
-        desc_html: Exibir publicamente hashtags atualmente em destaque que já tenham sido revistas anteriormente
-        title: Hashtags em destaque
+      title: Definições do Servidor
     site_uploads:
       delete: Eliminar arquivo carregado
       destroyed_msg: Upload do site eliminado com sucesso!
     statuses:
+      account: Autor
+      application: Aplicação
       back_to_account: Voltar para página da conta
+      back_to_report: Voltar à página da denúncia
       batch:
-        delete: Eliminar
-        nsfw_off: NSFW OFF
-        nsfw_on: NSFW ON
+        remove_from_report: Remover da denúncia
+        report: Denúncia
       deleted: Eliminado
-      failed_to_execute: Falhou ao executar
+      favourites: Favoritos
+      history: Histórico de versões
+      in_reply_to: A responder a
+      language: Idioma
       media:
         title: Media
-      no_media: Não há media
+      metadata: Metadados
       no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado
+      open: Abrir publicação
+      original_status: Publicação original
+      reblogs: Reblogs
+      status_changed: Publicação alterada
       title: Estado das contas
+      trending: Em destaque
+      visibility: Visibilidade
       with_media: Com media
+    strikes:
+      actions:
+        delete_statuses: "%{name} eliminou a publicação de %{target}"
+        disable: "%{name} congelou a conta de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcou as publicações de %{target} como sensíveis"
+        none: "%{name} enviou uma advertência a %{target}"
+        sensitive: "%{name} marcou a conta de %{target} como sensível"
+        silence: "%{name} limitou a conta de %{target}"
+        suspend: "%{name} suspendeu a conta de %{target}"
+      appeal_approved: Recorrido
+      appeal_pending: Recurso pendente
     system_checks:
       database_schema_check:
         message_html: Existem migrações de base de dados pendentes. Por favor, execute-as para garantir que o aplicativo se comporte como esperado
+      elasticsearch_running_check:
+        message_html: Não foi possível conectar ao Elasticsearch. Por favor, verifique se está em execução, ou desabilite a pesquisa de texto completo
+      elasticsearch_version_check:
+        message_html: 'Versão de Elasticsearch incompatível: %{value}'
+        version_comparison: A versão de Elasticsearch %{running_version} está em execução. No entanto, é obrigatória a versão %{required_version}
       rules_check:
         action: Gerir regras da instância
         message_html: Não definiu nenhuma regra para a instância.
       sidekiq_process_check:
         message_html: Nenhum processo Sidekiq em execução para a(s) fila(s) %{value}. Reveja a configuração do seu Sidekiq
     tags:
-      accounts_today: Usos únicos hoje
-      accounts_week: Usos únicos desta semana
-      breakdown: Descrição do consumo atual por fonte
-      last_active: Última actividade
-      most_popular: Mais popular
-      most_recent: Mais recente
-      name: Hashtag
       review: Estado da revisão
-      reviewed: Revista
-      title: Hashtags
-      trending_right_now: Tendências agora
-      unique_uses_today: "%{count} publicando hoje"
-      unreviewed: Não revista
       updated_msg: Definições de hashtags actualizadas com sucesso
     title: Administração
+    trends:
+      allow: Permitir
+      approved: Aprovado
+      disallow: Não permitir
+      links:
+        allow: Permitir link
+        allow_provider: Permitir editor
+        description_html: Estes são links que atualmente estão a ser frequentemente partilhados por contas visiveis pelo seu servidor. Eles podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhum link é exibido publicamente até que aprove o editor. Também pode permitir ou rejeitar links individualmente.
+        disallow: Não permitir link
+        disallow_provider: Não permitir editor
+        no_link_selected: Nenhum link foi alterado, pois nenhum foi selecionado
+        publishers:
+          no_publisher_selected: Nenhum editor foi alterado, pois nenhum foi selecionado
+        shared_by_over_week:
+          one: Partilhado por uma pessoa na última semana
+          other: Partilhado por %{count} pessoas na última semana
+        title: Links em destaque
+        usage_comparison: Partilhado %{today} vezes hoje, em comparação com %{yesterday} ontem
+      only_allowed: Apenas permitidos
+      pending_review: Pendente de revisão
+      preview_card_providers:
+        allowed: Links deste editor poderão ser incluídos nos destaques
+        description_html: Estes são domínios a partir dos quais links são frequentemente partilhados no seu servidor. Estes links não serão colocados em destaque a menos que o seu domínio de origem seja aprovado. A sua aprovação (ou rejeição) estende-se a subdomínios.
+        rejected: Links deste editor não serão incluídos nos destaques
+        title: Editores
+      rejected: Rejeitado
+      statuses:
+        allow: Permitir publicação
+        allow_account: Permitir autor
+        description_html: Estas são publicações que o seu servidor conhece e que atualmente estão a ser frequentemente partilhadas e adicionadas aos favoritos. Isto pode ajudar os seus utilizadores, novos e retornados, a encontrar mais pessoas para seguir. Nenhuma publicação será exibida publicamente até que aprove o autor, e o autor permita que a sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individualmente.
+        disallow: Não permitir publicação
+        disallow_account: Não permitir autor
+        no_status_selected: Nenhuma publicação em tendência foi alterada, pois nenhuma foi selecionada
+        not_discoverable: O autor optou por não permitir que a sua conta seja sugerida a outros
+        shared_by:
+          one: Partilhado ou adicionado aos favoritos uma vez
+          other: Partilhado e adicionado aos favoritos %{friendly_count} vezes
+        title: Publicações em destaque
+      tags:
+        current_score: Pontuação atual %{score}
+        dashboard:
+          tag_accounts_measure: utilizadores únicos
+          tag_languages_dimension: Idiomas mais populares
+          tag_servers_dimension: Servidores mais populares
+          tag_servers_measure: servidores diferentes
+          tag_uses_measure: utilizações totais
+        description_html: Estas são hashtags que aparecem atualmente com frequência em publicações visíveis pelo seu servidor. Isto pode ajudar os seus utilizadores a descobrir o que está ser mais falado no momento. Nenhuma hashtag é exibida publicamente até que a aprove.
+        listable: Pode ser sugerida
+        no_tag_selected: Nenhuma etiqueta foi alterada, pois nenhuma foi selecionada
+        not_listable: Não será sugerida
+        not_trendable: Não aparecerá nas tendências
+        not_usable: Não pode ser utilizada
+        peaked_on_and_decaying: Máximo em %{date}, agora a decair
+        title: Hashtags em destaque
+        trendable: Pode aparecer nas tendências
+        trending_rank: 'Tendência #%{rank}'
+        usable: Pode ser utilizada
+        usage_comparison: Utilizada %{today} vezes hoje, em comparação com %{yesterday} ontem
+        used_by_over_week:
+          one: Utilizada por uma pessoa na última semana
+          other: Utilizada por %{count} pessoas na última semana
+      title: Tendências
+      trending: Em destaque
     warning_presets:
       add_new: Adicionar novo
       delete: Eliminar
       edit_preset: Editar o aviso predefinido
       empty: Ainda não definiu nenhum aviso predefinido.
       title: Gerir os avisos predefinidos
+    webhooks:
+      add_new: Adicionar endpoint
+      delete: Eliminar
+      description_html: Um <strong>webhook</strong> possibilita que o Mastodon envie <strong>notificações em tempo real</strong> de eventos seleccionados, para um seu aplicativo, para que este possa <strong>acionar ações automaticamente</strong>.
+      disable: Desativar
+      disabled: Desativado
+      edit: Editar endpoint
+      empty: Não tem ainda qualquer endpoint de webhook configurado.
+      enable: Ativar
+      enabled: Activo
+      enabled_events:
+        one: 1 evento ativado
+        other: "%{count} eventos ativados"
+      events: Eventos
+      new: Novo webhook
+      rotate_secret: Alternar segredo
+      secret: Segredo de assinatura
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para elimintar as suas publicações
+        disable: para congelar a sua conta
+        mark_statuses_as_sensitive: marcar as suas publicações como sensíveis
+        none: uma advertência
+        sensitive: marcação da sua conta como sensível
+        silence: limitação da sua conta
+        suspend: suspensão da sua conta
+      body: "%{target} está a recorrer de uma decisão de moderação de %{action_taken_by} a %{date}, que consistiu em %{type}. Escreveu:"
+      next_steps: Pode aprovar o recurso para reverter a decisão de moderação, ou ignorá-lo.
+      subject: "%{username} está a recorrer da decisão de moderação em %{instance}"
     new_pending_account:
       body: Em baixo, estão os detalhes da nova conta. Pode aprovar ou rejeitar esta inscrição.
       subject: Nova conta para revisão em %{instance} (%{username})
     new_report:
-      body: "%{reporter} relatou %{target}"
-      body_remote: Alguém de %{domain} relatou %{target}
-      subject: Novo relatório sobre %{instance} (#%{id})
-    new_trending_tag:
-      body: 'A hashtag #%{name} está hoje a destacar-se, mas não foi anteriormente revista. Ela não será exibida publicamente a menos que você o permita, ou limite-se a salvar o formulário tal como está, para nunca mais ouvir falar dela.'
-      subject: Nova hashtag para revisão em %{instance} (#%{name})
+      body: "%{reporter} denunciou %{target}"
+      body_remote: Alguém de %{domain} denunciou %{target}
+      subject: Nova denúncia para %{instance} (#%{id})
+    new_trends:
+      body: 'Os seguintes itens precisam ser revistos antes de poderem ser exibidos publicamente:'
+      new_trending_links:
+        title: Links em destaque
+      new_trending_statuses:
+        title: Publicações em destaque
+      new_trending_tags:
+        no_approved_tags: Não existem, atualmente, hashtags aprovadas em destaque.
+        requirements: 'Qualquer um destes candidatos pode ultrapassar a #%{rank} hashtag aprovada em destaque, que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.'
+        title: Hashtags em destaque
+      subject: Novas tendências para revisão em %{instance}
   aliases:
     add_new: Criar pseudónimo
     created_msg: Criou com sucesso um novo pseudónimo. Pode agora iniciar a migração da conta antiga.
@@ -763,16 +933,13 @@ pt-PT:
   applications:
     created: Aplicação criada com sucesso
     destroyed: Aplicação eliminada com sucesso
-    invalid_url: O URL é inválido
     regenerate_token: Regenerar token de acesso
     token_regenerated: Token de acesso regenerado com sucesso
     warning: Cuidado com estes dados. Não partilhar com ninguém!
     your_token: O teu token de acesso
   auth:
-    apply_for_account: Solicitar um convite
+    apply_for_account: Solicitar uma conta
     change_password: Palavra-passe
-    checkbox_agreement_html: Concordo com as <a href="%{rules_path}" target="_blank">regras da instância</a> e com os <a href="%{terms_path}" target="_blank">termos de serviço</a>
-    checkbox_agreement_without_rules_html: Concordo com os <a href="%{terms_path}" target="_blank">termos do serviço</a>
     delete_account: Eliminar conta
     delete_account_html: Se deseja eliminar a sua conta, pode <a href="%{path}">continuar aqui</a>. Uma confirmação será solicitada.
     description:
@@ -785,11 +952,13 @@ pt-PT:
     invalid_reset_password_token: Token de modificação da palavra-passe é inválido ou expirou. Por favor, solicita um novo.
     link_to_otp: Insira um código de autenticação em duas etapas do seu telemóvel ou um código de recuperação
     link_to_webauth: Usa o teu dispositivo de chave de segurança
+    log_in_with: Iniciar sessão com
     login: Entrar
     logout: Sair
     migrate_account: Mudar para uma conta diferente
     migrate_account_html: Se deseja redirecionar esta conta para uma outra pode <a href="%{path}">configurar isso aqui</a>.
     or_log_in_with: Ou iniciar sessão com
+    privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     providers:
       cas: CAS
       saml: SAML
@@ -797,20 +966,29 @@ pt-PT:
     registration_closed: "%{instance} não está a aceitar novos membros"
     resend_confirmation: Reenviar instruções de confirmação
     reset_password: Criar nova palavra-passe
+    rules:
+      preamble: Estas são definidos e aplicadas pelos moderadores de %{domain}.
+      title: Algumas regras básicas.
     security: Alterar palavra-passe
     set_new_password: Editar palavra-passe
     setup:
       email_below_hint_html: Se o endereço de e-mail abaixo estiver incorreto, pode alterá-lo aqui e receber um novo e-mail de confirmação.
       email_settings_hint_html: O e-mail de confirmação foi enviado para %{email}. Se esse endereço de e-mail não estiver correto, pode alterá-lo nas definições da conta.
       title: Configuração
+    sign_in:
+      preamble_html: Iniciar sessão com as suas credenciais de <strong>%{domain}</strong>. Se a sua conta estiver hospedada noutro servidor, não poderá inciar sessão aqui.
+      title: Iniciar sessão em %{domain}
+    sign_up:
+      preamble: Com uma conta neste servidor Mastodon, poderá seguir qualquer outra pessoa na rede, independentemente do servidor onde a conta esteja hospedada.
+      title: Vamos lá inscrevê-lo em %{domain}.
     status:
       account_status: Estado da conta
       confirming: A aguardar que conclua a confirmação do e-mail.
       functional: A sua conta está totalmente operacional.
       pending: A sua inscrição está pendente de revisão pela nossa equipa. Isso pode demorar algum tempo. Receberá um e-mail se a sua conta for aprovada.
       redirecting_to: A sua conta está inativa porque está atualmente a ser redirecionada para %{acct}.
+      view_strikes: Veja as punições anteriores contra a sua conta
     too_fast: Formulário enviado muito rapidamente, tente novamente.
-    trouble_logging_in: Problemas em iniciar sessão?
     use_security_key: Usar chave de segurança
   authorize_follow:
     already_following: Tu já estás a seguir esta conta
@@ -868,10 +1046,36 @@ pt-PT:
       more_details_html: Para mais detalhes, leia a <a href="%{terms_path}">política de privacidade</a>.
       username_available: O seu nome de utilizador ficará novamente disponível
       username_unavailable: O seu nome de utilizador permanecerá indisponível
-  directories:
-    directory: Dirétorio de perfil
-    explanation: Descobre utilizadores com base nos seus interesses
-    explore_mastodon: Explorar %{title}
+  disputes:
+    strikes:
+      action_taken: Ação tomada
+      appeal: Recorrer
+      appeal_approved: Esta punição foi alvo de recurso, bem sucedido, pelo que já não é válida
+      appeal_rejected: O recurso foi rejeitado
+      appeal_submitted_at: Recurso submetido
+      appealed_msg: O seu recurso foi submetido. Se ele for aprovado, será notificado.
+      appeals:
+        submit: Submeter recurso
+      approve_appeal: Aprovar recurso
+      associated_report: Denúncia associada
+      created_at: Data
+      description_html: Estas são ações tomadas contra a sua conta e avisos que lhe foram enviados pela equipa de %{instance}.
+      recipient: Endereçado a
+      reject_appeal: Rejeitar recurso
+      status: 'Publicação #%{id}'
+      status_removed: Publicação já eliminada do sistema
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Remoção de publicação
+        disable: Congelamento da conta
+        mark_statuses_as_sensitive: Marcação das publicações como sensíveis
+        none: Advertência
+        sensitive: Marcação da conta como sensível
+        silence: Limitação da conta
+        suspend: Suspensão da conta
+      your_appeal_approved: O seu recurso foi aprovado
+      your_appeal_pending: Submeteu um recurso
+      your_appeal_rejected: O seu recurso foi rejeitado
   domain_validator:
     invalid_domain: não é um nome de domínio válido
   errors:
@@ -920,56 +1124,69 @@ pt-PT:
       public: Cronologias públicas
       thread: Conversações
     edit:
+      add_keyword: Adicionar palavra-chave
+      keywords: Palavras-chave
+      statuses: Publicações individuais
+      statuses_hint_html: Este filtro aplica-se a publicações individuais selecionadas independentemente de estas corresponderem às palavras-chave abaixo. <a href="%{path}">Reveja ou remova publicações do filtro</a>.
       title: Editar filtros
     errors:
+      deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir deste aplicativo porque se aplicam a mais de um filtro de palavra-chave. Use um aplicativo mais recente ou a interface web.
       invalid_context: Inválido ou nenhum contexto fornecido
-      invalid_irreversible: Filtragem irreversível só funciona no contexto das notificações ou do início
     index:
+      contexts: Filtros em %{contexts}
       delete: Eliminar
       empty: Não tem filtros.
+      expires_in: Expira em %{distance}
+      expires_on: Expira em %{date}
+      keywords:
+        one: "%{count} palavra-chave"
+        other: "%{count} palavras-chaves"
+      statuses:
+        one: "%{count} publicação"
+        other: "%{count} publicações"
+      statuses_long:
+        one: "%{count} publicação individual ocultada"
+        other: "%{count} publicações individuais ocultadas"
       title: Filtros
     new:
+      save: Salvar novo filtro
       title: Adicionar novo filtro
+    statuses:
+      back_to_filter: Voltar ao filtro
+      batch:
+        remove: Remover do filtro
+      index:
+        hint: Este filtro aplica-se a publicações individuais selecionadas independentemente de outros critérios. Pode adicionar mais publicações a este filtro através da interface web.
+        title: Publicações filtradas
   footer:
-    developers: Responsáveis pelo desenvolvimento
-    more: Mais…
-    resources: Recursos
     trending_now: Tendências atuais
   generic:
     all: Tudo
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> item nesta página está selecionado."
+      other: Todo os <strong>%{count}</strong> items nesta página estão selecionados.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> item que corresponde à sua pesquisa está selecionado."
+      other: Todos os <strong>%{count}</strong> items que correspondem à sua pesquisa estão selecionados.
     changes_saved_msg: Alterações guardadas!
     copy: Copiar
     delete: Eliminar
-    no_batch_actions_available: Nenhuma ação em lote disponível nesta página
+    deselect: Desmarcar todos
+    none: Nenhum
     order_by: Ordenar por
     save_changes: Guardar alterações
+    select_all_matching_items:
+      one: Selecione %{count} item que corresponde à sua pesquisa.
+      other: Selecione todos os %{count} items que correspondem à sua pesquisa.
+    today: hoje
     validation_errors:
       one: Algo não está correcto. Por favor vê o erro abaixo
       other: Algo não está correto. Por favor vê os %{count} erros abaixo
   html_validator:
     invalid_markup: 'contém marcação HTML inválida: %{error}'
-  identity_proofs:
-    active: Ativo
-    authorize: Sim, autorizar
-    authorize_connection_prompt: Autorizar esta conexão criptográfica?
-    errors:
-      failed: A conexão criptográfica falhou. Por favor, tente novamente a partir de %{provider}.
-      keybase:
-        invalid_token: Os tokens Keybase são hashes de assinaturas e devem conter 66 caracteres hexadecimais
-        verification_failed: O Keybase não reconhece este token como uma assinatura do utilizador do Keybase %{kb_username}. Por favor, tente novamente a partir do Keybase.
-      wrong_user: Não é possível criar um comprovativo para %{proving} enquanto estiver conetado como %{current}. Inicie sessão como %{proving} e tente novamente.
-    explanation_html: Aqui pode conetar criptograficamente as suas outras identidades, tais como um perfil Keybase. Isto permite que outras pessoas lhe enviem mensagens encriptadas e confiar em conteúdo que você lhes envia.
-    i_am_html: Sou %{username} em %{service}.
-    identity: Identidade
-    inactive: Inativo
-    publicize_checkbox: 'E publique isso:'
-    publicize_toot: 'Está comprovado! Eu sou %{username} em %{service}: %{url}'
-    remove: Remover comprovatido da conta
-    removed: Comprovativo removido da conta com sucesso
-    status: Estado da verificação
-    view_proof: Ver prova
   imports:
     errors:
+      invalid_csv_file: 'Arquivo CSV inválido. Erro: %{error}'
       over_rows_processing_limit: contém mais de %{count} linhas
     modes:
       merge: Juntar
@@ -985,7 +1202,6 @@ pt-PT:
       following: Lista de pessoas que estás a seguir
       muting: Lista de utilizadores silenciados
     upload: Enviar
-  in_memoriam_html: Em memória.
   invites:
     delete: Desativar
     expired: Expirados
@@ -1064,18 +1280,14 @@ pt-PT:
     carry_blocks_over_text: Este utilizador migrou de %{acct}, que você tinha bloqueado.
     carry_mutes_over_text: Este utilizador migrou de %{acct}, que você tinha silenciado.
     copy_account_note_text: 'Este utilizador migrou de %{acct}, aqui estão as suas notas anteriores sobre ele:'
+  navigation:
+    toggle_menu: Abrir/fechar menu
   notification_mailer:
-    digest:
-      action: Ver todas as notificações
-      body: Aqui tens um breve resumo do que perdeste desde o último acesso a %{since}
-      mention: "%{name} mencionou-te em:"
-      new_followers_summary:
-        one: Tens um novo seguidor! Boa!
-        other: Tens %{count} novos seguidores! Fantástico!
-      subject:
-        one: "1 nova notificação desde o último acesso \U0001F418"
-        other: "%{count} novas notificações desde o  último acesso \U0001F418"
-      title: Enquanto estiveste ausente…
+    admin:
+      report:
+        subject: "%{name} submeteu uma denúncia"
+      sign_up:
+        subject: "%{name} inscreveu-se"
     favourite:
       body: 'O teu post foi adicionado aos favoritos por %{name}:'
       subject: "%{name} adicionou o teu post aos favoritos"
@@ -1102,6 +1314,8 @@ pt-PT:
       title: Nova partilha
     status:
       subject: "%{name} acabou de publicar"
+    update:
+      subject: "%{name} editou uma publicação"
   notifications:
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos para os quais deseja receber notificações:'
@@ -1145,6 +1359,8 @@ pt-PT:
     other: Outro
     posting_defaults: Padrões de publicação
     public_timelines: Cronologias públicas
+  privacy_policy:
+    title: Política de Privacidade
   reactions:
     errors:
       limit_reached: Limite de reações diferentes atingido
@@ -1167,22 +1383,15 @@ pt-PT:
     remove_selected_follows: Deixar de seguir os utilizadores selecionados
     status: Estado da conta
   remote_follow:
-    acct: Introduza o seu utilizador@domínio do qual quer seguir
     missing_resource: Não foi possível achar a URL de redirecionamento para sua conta
-    no_account_html: Não tens uma conta? Tu podes <a href='%{sign_up_path}' target='_blank'> aderir aqui</a>
-    proceed: Prossiga para seguir
-    prompt: 'Você vai seguir:'
-    reason_html: "<strong> Porque é este passo necessário?</strong> <code>%{instance}</code> pode não ser a instância onde você está registado. Por isso, precisamos de o redirecionar para a sua instância de origem em primeiro lugar."
-  remote_interaction:
-    favourite:
-      proceed: Prosseguir para os favoritos
-      prompt: 'Queres favoritar esta publicação:'
-    reblog:
-      proceed: Prosseguir com partilha
-      prompt: 'Queres partilhar esta publicação:'
-    reply:
-      proceed: Prosseguir com resposta
-      prompt: 'Queres responder a esta publicação:'
+  reports:
+    errors:
+      invalid_rules: não faz referência a regras válidas
+  rss:
+    content_warning: 'Aviso de conteúdo:'
+    descriptions:
+      account: Publicações públicas de @%{acct}
+      tag: 'Publicações públicas marcadas com #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Excedeste o limite de %{limit} publicações agendadas para esse dia
     over_total_limit: Tu excedeste o limite de %{limit} publicações agendadas
@@ -1206,7 +1415,7 @@ pt-PT:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Navegador UC
       weibo: Weibo
     current_session: Sessão atual
     description: "%{browser} em %{platform}"
@@ -1241,7 +1450,6 @@ pt-PT:
     edit_profile: Editar perfil
     export: Exportar dados
     featured_tags: Hashtags destacadas
-    identity_proofs: Provas de identidade
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
@@ -1250,6 +1458,7 @@ pt-PT:
     profile: Perfil
     relationships: Seguindo e seguidores
     statuses_cleanup: Remoção automática da publicação
+    strikes: Punições de moderação
     two_factor_authentication: Autenticação em duas etapas
     webauthn_authentication: Chaves de segurança
   statuses:
@@ -1266,18 +1475,19 @@ pt-PT:
         other: "%{count} vídeos"
     boosted_from_html: Partilhadas de %{acct_link}
     content_warning: 'Aviso de conteúdo: %{warning}'
+    default_language: Mesmo do idioma da interface
     disallowed_hashtags:
       one: 'continha uma hashtag proibida: %{tags}'
       other: 'continha as hashtags proibidas: %{tags}'
+    edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação a que está a tentar responder parece não existir.
-    language_detection: Detectar automaticamente a língua
     open_in_web: Abrir no browser
     over_character_limit: limite de caracter excedeu %{max}
     pin_errors:
+      direct: Publicações visíveis apenas para utilizadores mencionados não podem ser fixados
       limit: Já fixaste a quantidade máxima de publicações
       ownership: Posts de outras pessoas não podem ser fixados
-      private: Post não-público não pode ser fixado
       reblog: Não podes fixar uma partilha
     poll:
       total_people:
@@ -1328,6 +1538,7 @@ pt-PT:
       '2629746': 1 mês
       '31556952': 1 ano
       '5259492': 2 meses
+      '604800': 1 semana
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Limite de idade
@@ -1339,91 +1550,11 @@ pt-PT:
     pinned: Toot fixado
     reblogged: partilhado
     sensitive_content: Conteúdo sensível
+  strikes:
+    errors:
+      too_late: É tarde demais para apelar desta punição
   tags:
     does_not_match_previous_name: não coincide com o nome anterior
-  terms:
-    body_html: |
-      <h2>Política de privacidade</h2>
-      <h3 id="collect">Que informação nós recolhemos?</h3>
-
-      <ul>
-      <li><em>Informação básica da conta</em>: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de email e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.</li>
-      <li><em>Publicações, seguimento e outra informação pública</em>: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos média, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A ação de republicar ou favoritar outra publicação é sempre pública.</li>
-      <li><em>Publicações diretas e exclusivas para seguidores</em>: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações diretas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objetivo. Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes ativar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. <em>Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-la</em> e que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. <em>Não partilhes qualquer informação perigosa no Mastodon.</em></li>
-      <li><em>IPs e outros metadados</em>: Quando inicias sessão, nós guardamos o endereço de IP a partir do qual iniciaste a sessão, tal como o nome do teu navegador. Todas as sessões estão disponíveis para verificação e revogação nas configurações. O último endereço de IP usado é guardado até 12 meses. Nós também podemos guardar registos de servidor, os quais incluem o endereço de IP de cada pedido dirigido ao nosso servidor.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Para que usamos a tua informação?</h3>
-
-      <p>Qualquer informação que recolhemos sobre ti pode ser usada dos seguintes modos:</p>
-
-      <ul>
-      <li>Para providenciar a funcionalidade central do Mastodon. Tu só podes interagir com o conteúdo de outras pessoas e publicar o teu próprio conteúdo depois de teres iniciado sessão. Por exemplo, tu podes seguir outras pessoas para veres as suas publicações na tua cronologia inicial personalizada. </li>
-      <li>Para ajudar na moderação da comunidade para, por exemplo, comparar o teu endereço IP com outros conhecidos, para determinar a fuga ao banimento ou outras violações.</li>
-      <li>O endereço de e-mail que tu forneces pode ser usado para te enviar informações e/ou notificações sobre outras pessoas que estão a interagir com o teu conteúdo ou a enviar-te mensagens, para responderes a inquéritos e/ou outros pedidos ou questões.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Como é que nós protegemos a tua informação?</h3>
-
-      <p>Nós implementamos uma variedade de medidas de segurança para garantir a segurança da tua informação pessoal quando tu introduzes, submetes ou acedes à mesma. Entre outras coisas, a tua sessão de navegação, tal como o tráfego entre as tuas aplicações e a API, estão seguras por SSL e a tua palavra-passe é codificada usando um forte algoritmo de sentido único. Tu podes activar a autenticação em dois passos para aumentares ainda mais a segurança do acesso à tua conta.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Qual é a nossa política de retenção de dados?</h3>
-
-      <p>Nós envidaremos todos os esforços no sentido de:</p>
-
-      <ul>
-      <li>Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este servidor, considerando que estes registos não serão guardados por mais de 90 dias.</li>
-      <li>Guardar os endereços de IP associados aos utilizadores registados durante um período que não ultrapassará os 12 meses.</li>
-      </ul>
-
-      <p>Tu podes pedir e descarregar um ficheiro com o teu conteúdo, incluindo as tuas publicações, os ficheiros multimédia, a imagem de perfil e a imagem de cabeçalho.</p>
-
-      <p>Tu podes apagar a tua conta de modo definitivo e a qualquer momento.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Usamos cookies?</h3>
-
-      <p>Sim. Cookies são pequenos ficheiros que um site ou o seu fornecedor de serviço transfere para o disco rígido do teu computador através do teu navegador (se tu permitires). Estes cookies permitem ao site reconhecer o teu navegador e, se tu tiveres uma conta registada, associá-lo a ela.</p>
-
-      <p>Nós usamos os cookies para compreender e guardar as tuas preferências para as visitas futuras.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Nós divulgamos alguma informação para entidades externas?</h3>
-
-      <p>Nós não vendemos, trocamos ou transferimos de qualquer modo a tua informação pessoal que seja identificável para qualquer entidade externa. Isto não inclui terceiros de confiança que nos ajudam a manter o nosso site, conduzir o nosso negócio ou prestar-te este serviço, desde que esses terceiros concordem em manter essa informação confidencial. Poderemos também revelar a tua informação quando nós acreditamos que isso é apropriado para cumprir a lei, forçar a aplicação dos nossos termos de serviço ou proteger os direitos, propriedade e segurança, nossos e de outrem.</p>
-
-      <p>O teu conteúdo público pode ser descarregado por outros servidores na rede. As tuas publicações públicas e exclusivas para os teus seguidores são enviadas para os servidores onde os teus seguidores residem e as mensagens directas são entregues aos servidores dos seus destinatários, no caso desses seguidores ou destinatários residirem num servidor diferente deste.</p>
-
-      <p>Quando tu autorizas uma aplicação a usar a tua conta, dependendo da abrangência das permissões que tu aprovas, ela pode ter acesso à informação pública do teu perfil, à lista de quem segues, aos teus seguidores, às tuas listas, a todas as tuas publicações e aos teus favoritos. As aplicações nunca terão acesso ao teu endereço de e-mail ou à tua palavra-passe.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Utilização do site por crianças</h3>
-
-      <p>Se este servidor estiver na EU ou na EEA: O nosso site, produtos e serviços são todos dirigidos a pessoas que têm, pelo menos, 16 de idade. Se tu tens menos de 16 anos, devido aos requisitos da GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) não uses este site.</p>
-
-      <p>Se este servidor estiver nos EUA: O nosso site, produtos e serviços são todos dirigidos a pessoas que têm, pelo menos, 13 anos de idade. Se tu tens menos de 13 anos de idade, devido aos requisitos da COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) não uses este site.</p>
-
-      <p>Os requisitos legais poderão ser diferentes se este servidor estiver noutra jurisdição.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Alterações à nossa Política de Privacidade</h3>
-
-      <p>Se nós decidirmos alterar a nossa política de privacidade, nós iremos publicar essas alterações nesta página.</p>
-
-      <p>Este documento é CC-BY-SA. Ele foi actualizado pela última vez em 7 de Março 2018.</p>
-
-      <p>Originalmente adaptado de <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Termos de Serviço e Política de Privacidade"
   themes:
     contrast: Mastodon (Elevado contraste)
     default: Mastodon
@@ -1432,6 +1563,7 @@ pt-PT:
     formats:
       default: "%H:%M em %d de %b de %Y"
       month: "%b de %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Adicionar
     disable: Desativar
@@ -1448,63 +1580,73 @@ pt-PT:
     recovery_instructions_html: Se tu alguma vez perderes o teu smartphone, to poderás usar um dos códigos de recuperação para voltares a ter acesso à tua conta. <strong>Mantém os códigos de recuperação seguros</strong>. Por exemplo, tu podes imprimi-los e guardá-los junto a outros documentos importantes.
     webauthn: Chaves de segurança
   user_mailer:
+    appeal_approved:
+      action: Ir para a sua conta
+      explanation: O recurso à punição contra a sua conta de %{strike_date}, o qual submeteu a %{appeal_date}, foi aprovado. A sua conta encontra-se novamente em situação regular.
+      subject: O seu recurso de %{date} foi aprovado
+      title: Recurso aprovado
+    appeal_rejected:
+      explanation: O recurso à punição contra a sua conta de %{strike_date}, o qual submeteu a %{appeal_date}, foi rejeitado.
+      subject: O seu recurso de %{date} foi rejeitado
+      title: Recurso rejeitado
     backup_ready:
       explanation: Pediste uma cópia completa da tua conta Mastodon. Ela já está pronta para descarregares!
       subject: O teu arquivo está pronto para descarregar
       title: Arquivo de ficheiros
-    sign_in_token:
-      details: 'Aqui estão os detalhes da tentativa:'
-      explanation: 'Detectamos uma tentativa de entrar na sua conta a partir de um endereço IP não reconhecido. Se é você, por favor, insira o código de segurança abaixo na página de acesso:'
-      further_actions: 'Se não foi você, por favor altere a sua palavra-passe e ative a autenticação em duas etapzs na sua conta. Pode fazê-lo aqui:'
-      subject: Por favor, confirme a tentativa de acesso
-      title: Tentativa de acesso
+    suspicious_sign_in:
+      change_password: alterar a sua palavra-passe
+      details: 'Aqui estão os detalhes do inicio de sessão:'
+      explanation: Detetamos um inicio de sessão na sua conta a partir de um novo endereço IP.
+      further_actions_html: Se não foi você, recomendamos que %{action} imediatamente e ative a autenticação de dois fatores para manter a sua conta segura.
+      subject: A sua conta foi acessada a partir de um novo endereço IP
+      title: Novo inicio de sessão
     warning:
+      appeal: Submeter um recurso
+      appeal_description: Se acredita que isso é um erro, pode submeter um recurso para a equipa de %{instance}.
+      categories:
+        spam: Spam
+        violation: O conteúdo infringe as seguintes diretrizes da comunidade
       explanation:
-        disable: Enquanto a tua conta está congelada, os seus dados permanecem intactos, mas tu não podes executar quaisquer acções até que ela seja desbloqueada.
-        sensitive: Os seus ficheiros de media carregados e os media ligados serão tratados como sensíveis.
-        silence: Enquanto a sua conta estiver limitada, só pessoas que já estiver a seguir irão ver as suas publicações nesta instância e poderá ser excluído de várias listagens públicas. No entanto, outros ainda o poderão seguir de forma manual.
-        suspend: A sua conta foi suspensa e todas as suas publicações e os seus ficheiros de media foram irreversivelmente removidos desta instância e das instâncias onde tinhas seguidores.
-      get_in_touch: Pode responder a este e-mail para entrar em contacto com a equipa de %{instance}.
-      review_server_policies: Reveja a política da instância
-      statuses: 'Especificamente, para:'
+        delete_statuses: Algumas das suas publicações foram consideradas como a infringir uma ou mais diretrizes da comunidade e foram subsequentemente removidas pelos moderadores de %{instance}.
+        disable: Não pode mais utilizar a sua conta, mas o seu perfil e outros dados permanecem intactos. Pode solicitar uma cópia dos seus dados, alterar as definições da conta ou apagá-la.
+        mark_statuses_as_sensitive: Algumas das suas publicações foram marcadas como sensíveis pelos moderadores de %{instance}. Isto significa que as pessoas terão de clicar na media nas publicações, antes de ser exibida uma pré-visualização. No futuro, quando publicar, lembre-se que pode você mesmo marcar a media como sensível.
+        sensitive: A partir de agora, todos os ficheiros de media que carregue serão marcados como sensíveis e escondidos atrás de um aviso de "clicar-para-continuar".
+        silence: Pode ainda utilizar a sua conta mas apenas as pessoas que já o seguem poderão ver as suas mensagens neste servidor, e poderá ser excluído de várias funcionalidades de divulgação. No entanto, outros poderão ainda segui-lo manualmente.
+        suspend: Não pode mais utilizar a sua conta, e o seu perfil e outros dados já não se encontram acessíveis. Poderá ainda iniciar sessão para solicitar uma cópia dos seus dados até os mesmos serem totalmente removidos em cerca de 30 dias, porém reteremos alguns dados básicos para o impedir evitar a suspensão.
+      reason: 'Motivo:'
+      statuses: 'Publicações citadas:'
       subject:
+        delete_statuses: As suas publicações em %{acct} foram removidas
         disable: A tua conta %{acct} foi congelada
+        mark_statuses_as_sensitive: As suas publicações em %{acct} foram marcadas como sensíveis
         none: Aviso para %{acct}
-        sensitive: As publicações de media da sua conta %{acct} foram marcadas como sensíveis
+        sensitive: As suas publicações em %{acct} serão a partir de agora marcadas como sensíveis
         silence: A tua conta %{acct} foi limitada
         suspend: A tua conta %{acct} foi suspensa
       title:
+        delete_statuses: Publicações removidas
         disable: Conta congelada
+        mark_statuses_as_sensitive: Publicações marcadas como sensíveis
         none: Aviso
-        sensitive: A sua media foi marcada como sensível
+        sensitive: Conta marcada como sensível
         silence: Conta limitada
         suspend: Conta suspensa
     welcome:
-      edit_profile_action: Configura o perfil
-      edit_profile_step: Podes personalizar o teu perfil carregando uma imagem de perfil e de cabeçalho ou alterando o nome a exibir, entre outras opções. Se preferires rever os novos seguidores antes deles te poderem seguir, podes tornar a tua conta privada.
-      explanation: Aqui estão algumas dicas para começares
-      final_action: Começa a publicar
-      final_step: 'Começa a publicar! Mesmo sem seguidores, as tuas mensagens públicas podem ser vistas por outros, por exemplo, na cronologia local e em hashtags. Tu podes querer apresentar-te na hashtag #introductions.'
-      full_handle: O teu nome completo
-      full_handle_hint: Isto é o que você diria aos seus amigos para que eles lhe possam enviar mensagens ou seguir a partir de outra instância.
-      review_preferences_action: Alterar preferências
-      review_preferences_step: Certifique-se de configurar as suas preferências, tais como os e-mails que gostaria de receber ou o nível de privacidade que deseja que as suas publicações tenham por defeito. Se não sofres de enjoo, podes ativar a opção de auto-iniciar GIFs.
+      edit_profile_action: Configurar o perfil
+      edit_profile_step: Pode personalizar o seu perfil carregando uma imagem de perfil, alterando o nome a exibir, entre outras opções. Pode optar por rever os novos seguidores antes de estes o poderem seguir.
+      explanation: Aqui estão algumas dicas para começar
+      final_action: Começar a publicar
+      final_step: 'Comece a publicar! Mesmo sem seguidores, as suas mensagens públicas podem ser vistas por outros, por exemplo, na cronologia local e em hashtags. Pode querer apresentar-se utilizando a hashtag #introduções ou #introductions.'
+      full_handle: O seu nome completo
+      full_handle_hint: Isto é o que tem de facultar aos seus amigos para que eles lhe possam enviar mensagens ou seguir a partir de outra instância.
       subject: Bem-vindo ao Mastodon
-      tip_federated_timeline: A cronologia federativa é uma visão global da rede Mastodon. Mas só inclui pessoas que os teus vizinhos subscrevem, por isso não é uma visão completa.
-      tip_following: Segues o(s) administrador(es) do teu servidor por defeito. Para encontrar mais pessoas interessantes, procura nas cronologias local e federada.
-      tip_local_timeline: A cronologia local é uma visão global das pessoas em %{instance}. Estes são os seus vizinhos mais próximos!
-      tip_mobile_webapp: Se o teu navegador móvel te oferecer a possibilidade de adicionar o Mastodon ao teu homescreen, tu podes receber notificações push. Ele age como uma aplicação nativa de vários modos!
-      tips: Dicas
       title: Bem-vindo a bordo, %{name}!
   users:
     follow_limit_reached: Não podes seguir mais do que %{limit} pessoas
-    generic_access_help_html: Problemas para aceder à sua conta? Pode entrar em contacto com %{email} para obter ajuda
     invalid_otp_token: Código de autenticação inválido
-    invalid_sign_in_token: Cógido de segurança inválido
     otp_lost_help_html: Se perdeu acesso a ambos, pode entrar em contacto com %{email}
     seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
     signed_in_as: 'Registado como:'
-    suspicious_sign_in_confirmation: Parece que não iniciou sessão através deste dispositivo antes, e não acede à sua conta há algum tempo. Portanto, enviámos um código de segurança para o seu endereço de e-mail para confirmar que é você.
   verification:
     explanation_html: 'Pode <strong>comprovar que é o dono dos links nos metadados do seu perfil</strong>. Para isso, o website para o qual o link aponta tem de conter um link para o seu perfil do Mastodon. Esse link <strong>tem</strong> de ter um atributo <code>rel="me"</code>. O conteúdo do texto não é relevante. Aqui está um exemplo:'
     verification: Verificação
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 0e2dc57af..48cf790b7 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1,72 +1,22 @@
 ---
 ro:
   about:
-    about_hashtag_html: Acestea sunt postări publice etichetate cu <strong>#%{hashtag}</strong>. Poți interacționa cu ele dacă ai un cont oriunde în rețea.
     about_mastodon_html: 'Rețeaua socială a viitorului: Fără reclame, fără supraveghere corporativă, design etic și descentralizare! Dețineți-vă datele cu Mastodon!'
-    about_this: Despre
-    active_count_after: activi
-    active_footnote: Utilizatori activi lunar (UAL)
-    administered_by: 'Administrat de:'
-    apps: Aplicații mobile
-    apps_platforms: Folosește Mastodon de pe iOS, Android și alte platforme
-    browse_directory: Răsfoiți directorul de profil și filtrați după interese
-    browse_local_posts: Răsfoiți un flux live al postărilor publice de pe acest server
-    browse_public_posts: Răsfoiește un flux live de postări publice pe Mastodon
     contact_missing: Nesetat
-    discover_users: Descoperă utilizatori
-    documentation: Documentație
-    federation_hint_html: Cu un cont pe %{instance} vei putea urmări oameni pe orice server de Mastodon sau mai departe.
-    get_apps: Încercați o aplicație pentru mobil
+    contact_unavailable: Indisponibil
     hosted_on: Mastodon găzduit de %{domain}
-    instance_actor_flash: |
-      Acest cont este un actor virtual folosit pentru a reprezenta serverul în sine și nu un utilizator individual.
-      Acesta este folosit în scopuri de federație și nu ar trebui blocat decât dacă doriți să blocați întreaga instanță, în ce caz trebuie să utilizaţi un bloc de domeniu.
-    learn_more: Află mai multe
-    privacy_policy: Politica de confidenţialitate
-    see_whats_happening: Vezi ce se întâmplă
-    server_stats: 'Statistici server:'
-    source_code: Cod sursă
-    status_count_after:
-      few: stări
-      one: stare
-      other: de stări
-    status_count_before: Care au postat
-    tagline: Urmăriți prietenii și descoperiți alții noi
-    terms: Termeni de serviciu
-    unavailable_content: Conținut indisponibil
-    unavailable_content_description:
-      reason: Motiv
-      rejecting_media: 'Fişierele media de pe aceste servere nu vor fi procesate sau stocate şi nici o miniatură nu va fi afişată, necesitând click manual la fişierul original:'
-      rejecting_media_title: Fișiere media filtrate
-      silenced: 'Postările de pe aceste servere vor fi ascunse în cronologii și conversații publice, și nici o notificare nu va fi generată de interacțiunile utilizatorilor lor decât dacă le urmărești:'
-      suspended: 'Nici o informație de pe aceste servere nu va fi procesată, stocată sau schimbată, ceea ce face imposibilă orice interacțiune sau comunicare cu utilizatorii de pe aceste servere:'
-      suspended_title: Servere suspendate
-    unavailable_content_html: Mastodon vă permite în general să vedeți conținutul din orice alt server și să interacționați cu utilizatorii din rețea. Acestea sunt excepţiile care au fost făcute pe acest server.
-    user_count_after:
-      few: utilizatori
-      one: utilizator
-      other: de utilizatori
-    user_count_before: Casa a
-    what_is_mastodon: Ce este Mastodon?
+    title: Despre
   accounts:
-    choices_html: 'Alegerile lui %{name}:'
-    endorsements_hint: Poți promova oameni pe care îi urmărești din interfața web, și ei vor apărea aici.
-    featured_tags_hint: Puteți promova anumite hashtag-uri care vor fi afișate aici.
     follow: Urmărește
     followers:
       few: Urmăritori
       one: Urmăritor
       other: De Urmăritori
     following: Urmăriți
-    joined: Înscris %{date}
+    instance_actor_flash: Acest cont este un actor virtual folosit pentru a reprezenta serverul în sine și nu un utilizator individual. Acesta este utilizat în scopuri federative şi nu trebuie suspendat.
     last_active: ultima activitate
     link_verified_on: Proprietatea acestui link a fost verificată la %{date}
-    moved_html: "%{name} s-a mutat la %{new_profile_link}:"
-    network_hidden: Aceste informaţii nu sunt disponibile
-    never_active: Niciodată
     nothing_here: Nu există nimic aici!
-    people_followed_by: Persoane pe care %{name} le urmărește
-    people_who_follow: Persoane care urmăresc pe %{name}
     pin_errors:
       following: Trebuie să urmăriți deja persoana pe care doriți să o aprobați
     posts:
@@ -74,12 +24,6 @@ ro:
       one: Postare
       other: De Postări
     posts_tab_heading: Postări
-    posts_with_replies: Postări și răspunsuri
-    roles:
-      bot: Robot
-      group: Grup
-    unavailable: Profil indisponibil
-    unfollow: Nu mai urmării
   admin:
     account_actions:
       action: Efectuează acțiunea
@@ -87,27 +31,36 @@ ro:
     account_moderation_notes:
       create: Lasă o notă
       created_msg: Notă de moderare creată cu succes!
-      delete: Șterge
       destroyed_msg: Notă de moderare distrusă cu succes!
     accounts:
       add_email_domain_block: Domeniu de e-mail în lista neagră
       approve: Aprobă
-      approve_all: Aprobă toate
+      approved_msg: Cererea de înregistrare de către %{username} a fost aprobată cu succes
       are_you_sure: Ești sigur?
+      avatar: Poză de profil
       by_domain: Domeniu
       change_email:
-        changed_msg: E-mail de cont schimbat cu succes!
+        changed_msg: E-mail schimbat cu succes!
         current_email: E-mailul curent
         label: Schimbă adresa de email
         new_email: E-mail nou
         submit: Schimbă adresa de email
         title: Schimbă e-mailul pentru %{username}
+      change_role:
+        changed_msg: Rol actualizat cu succes!
+        label: Schimbare rol
+        no_role: Niciun rol
+        title: Schimbă rolul pentru %{username}
       confirm: Confirmă
       confirmed: Confirmat
       confirming: Confirmare
+      custom: Personalizat
+      delete: Ștergere datele
       deleted: Șters
       demote: Retrogradează
+      destroyed_msg: Datele utilizatorului %{username} sunt acum în așteptare pentru a fi șterse iminent
       disable: Dezactivează
+      disable_sign_in_token_auth: Dezactivează autentificarea prin token e-mail
       disable_two_factor_authentication: Dezactivează 2FA
       disabled: Dezactivat
       display_name: Nume afișat
@@ -116,25 +69,32 @@ ro:
       email: E-mail
       email_status: Stare e-mail
       enable: Activează
+      enable_sign_in_token_auth: Activează autentificarea prin token e-mail
       enabled: Activat
+      enabled_msg: Am dezghețat cu succes contul %{username}
       followers: Urmăritori
       follows: Urmăriri
       header: Antet
       inbox_url: URL mesaje primite
+      invite_request_text: Motive pentru alăturare
       invited_by: Invitat de
+      ip: IP
       joined: Înscris
       location:
         all: Toate
+        local: Local
         remote: La distanţă
         title: Locaţie
       login_status: Stare conectare
       media_attachments: Atașamente media
       memorialize: Transformă în memorie
+      memorialized: Comemorat
+      memorialized_msg: S-a transforma cu succes %{username} într-un cont comemorat
       moderation:
         active: Activ
         all: Toate
         pending: În așteptare
-        silenced: Ignorate
+        silenced: Limitat
         suspended: Suspendate
         title: Moderare
       moderation_notes: Note de moderare
@@ -142,16 +102,23 @@ ro:
       most_recent_ip: Cel mai recent IP
       no_account_selected: Nici un cont nu a fost schimbat deoarece nici unul nu a fost selectat
       no_limits_imposed: Nicio limită impusă
+      no_role_assigned: Niciun rol atribuit
       not_subscribed: Nesubscrise
       pending: În așteptare
       perform_full_suspension: Suspendate
+      previous_strikes: Atenționări anterioare
       promote: Promovează
+      protocol: Protocol
+      public: Public
       push_subscription_expires: Abonamentul PuSH expiră
       redownload: Reîmprospătează profilul
+      redownloaded_msg: S-a reîmprospătat cu succes profilul %{username} de la origine
       reject: Respinge
-      reject_all: Respinge toate
+      rejected_msg: S-a respins cu succes cererea de înregistrare a utilizatorului %{username}
       remove_avatar: Elimină avatar
       remove_header: Elimină antet
+      removed_avatar_msg: S-a îndepărtat cu succes poza de profil a utilizatorului %{username}
+      removed_header_msg: S-a îndepărtat cu succes coperta utilizatorului %{username}
       resend_confirmation:
         already_confirmed: Acest utilizator este deja confirmat
         send: Retrimite e-mail de confirmare
@@ -159,13 +126,15 @@ ro:
       reset: Resetează
       reset_password: Resetează parola
       resubscribe: Resubscrie-te
-      role: Permisiuni
-      roles:
-        staff: Personal
-        user: Utilizator
+      role: Rol
       search: Caută
       search_same_email_domain: Alţi utilizatori cu acelaşi domeniu de e-mail
       search_same_ip: Alţi utilizatori cu acelaşi IP
+      security_measures:
+        only_password: Doar parola
+        password_and_2fa: Parolă și Conectarea în 2 pași
+      sensitive: Sensibil
+      sensitized: Marcat ca sensibil
       shared_inbox_url: URL inbox distribuit
       show:
         created_reports: Rapoarte realizate
@@ -173,21 +142,34 @@ ro:
       silence: Ignoră
       silenced: Ignorate
       statuses: Stări
+      strikes: Atenționări anterioare
       subscribe: Subscrie
+      suspend: Suspendă
       suspended: Suspendate
-      time_in_queue: Așteptare în coadă %{time}
+      suspension_irreversible: Datele acestui cont au fost șterse în mod ireversibil. Poți să renunți la suspnedarea contului pentru a-l face utilizabil, dar acesta nu va recupera nicio informație pe care a avut-o anterior.
+      suspension_reversible_hint_html: Contul a fost suspendat și datele vor fi șterse complet pe %{date}. Până atunci, contul poate fi restabilit fără efecte adverse. Dacă dorești să ştergi imediat toate datele contului, poți face acest lucru mai jos.
       title: Conturi
+      unblock_email: Deblochează adresa de e-mail
+      unblocked_email_msg: S-a deblocat cu succes adresa de email a utilizatorului %{username}
       unconfirmed_email: E-mail neconfirmat
+      undo_sensitized: Anulează ca sensibil
       undo_silenced: Anulează ignorarea
       undo_suspension: Anulați suspendarea
+      unsilenced_msg: S-a refăcut cu succes limita contului %{username}
       unsubscribe: Dezabonare
+      unsuspended_msg: S-a anulat cu succes suspendarea contului %{username}
       username: Nume
+      view_domain: Vezi sumarul pentru domeniul
       warn: Avertizează
+      web: Web
       whitelisted: Excluse la blocare
     action_logs:
       action_types:
+        approve_appeal: Aprobare apel
+        approve_user: Aprobă Utilizatorul
         assigned_to_self_report: Atribuie raportul
         change_email_user: Schimbă e-mailul pentru utilizator
+        change_role_user: Schimbă rolul utilizatorului
         confirm_user: Confirmare Utilizator
         create_account_warning: Crează avertisment
         create_announcement: Creează Anunț
@@ -195,32 +177,228 @@ ro:
         create_domain_allow: Creează permis domeniu
         create_domain_block: Crează blocare de domenii
         create_email_domain_block: Creați blocare de domeniu e-mail
+        create_ip_block: Creează regulă IP
+        create_unavailable_domain: Crează domeniu indisponibil
+        create_user_role: Creează Rol
         demote_user: Retrogradare Utilizatorul
         destroy_announcement: Ștergere anunț
         destroy_custom_emoji: Ștergere Zâmbet Personalizat
         destroy_domain_allow: Ștergere Permitere Domeniu
         destroy_domain_block: Ștergere Blocare Domeniu
+        destroy_email_domain_block: Șterge Blocarea Domeniului de Email
+        destroy_instance: Curăță Domeniul
+        destroy_ip_block: Șterge regula IP
         destroy_status: Șterge starea
+        destroy_unavailable_domain: Șterge Domeniul Indisponibil
         disable_2fa_user: Dezactivează 2FA
         disable_custom_emoji: Dezactivează Emoji-urile Personalizate
+        disable_sign_in_token_auth_user: Dezactivează Autentificarea prin Token E-mail pentru Utilizator
         disable_user: Dezactivează Utilizator
         enable_custom_emoji: Activează Emoji Personalizat
+        enable_sign_in_token_auth_user: Activează Autentificarea prin Token e-mail pentru Utilizator
         enable_user: Activează Utilizator
+        memorialize_account: Comemoreză Contul
         promote_user: Promovează utilizator
+        reject_appeal: Respingere apel
+        reject_user: Respinge Utilizatorul
         remove_avatar_user: Elimină avatar
         reopen_report: Redeschide Raport
         reset_password_user: Resetează Parola
         resolve_report: Rezolvă Raport
+        sensitive_account: Cont Sensibil
+        silence_account: Limitează cont
         suspend_account: Suspendă Cont
         unassigned_report: Raport Neasignat
+        unblock_email_account: Deblochează adresa de e-mail
+        unsilence_account: Anulează Limitarea Contului
         unsuspend_account: Anulează Suspendarea Contului
         update_announcement: Actualizare Anunț
         update_custom_emoji: Actualizare Emoji Personalizat
         update_status: Actualizează Starea
+      actions:
+        create_custom_emoji_html: "%{name} a încărcat noi emoji %{target}"
+      deleted_account: cont șters
+      empty: Niciun jurnal nu a fost găsit.
+      filter_by_action: Filtrează după acțiune
+      filter_by_user: Filtrează după utilizator
+      title: Jurnal de audit
     announcements:
+      destroyed_msg: Anunț șters cu succes!
+      edit:
+        title: Modifică anunțul
+      empty: Niciun anunț nu a fost găsit.
       live: În direct
       new:
         create: Creează Anunț
+        title: Anunț nou
+      publish: Publică
+      published_msg: Anunț publicat cu succes!
+      scheduled_for: Programat pentru ora %{time}
+      scheduled_msg: Publicarea anunțului va avea loc la ora programată!
+      title: Anunțuri
+      unpublish: Revocă publicarea
+      unpublished_msg: Publicarea anunțului a fost revocată cu succes!
+      updated_msg: Anunț actualizat cu succes!
+    custom_emojis:
+      assign_category: Atribuie o categorie
+      by_domain: Domeniu
+      copied_msg: Copie locală a emoticonului creată cu succes
+      copy: Copiază
+      copy_failed_msg: Nu s-a putut realiza o copie locală a acelui emoticon
+      create_new_category: Creează o categorie nouă
+      created_msg: Emoticon creat cu succes!
+      delete: Șterge
+      destroyed_msg: Emoticon distrus cu succes!
+      disable: Dezactivează
+      disabled: Dezactivat
+      disabled_msg: Emoticon dezactivat cu succes
+      emoji: Emoticon
+      enable: Activează
+      enabled: Activat
+      enabled_msg: Emoticon activat cu succes
+      image_hint: PNG sau GIF de cel mult %{size}
+      list: Listează
+      listed: Listat
+      new:
+        title: Adaugă un nou emoticon personalizat
+      no_emoji_selected: Niciun emoticon nu a fost modificat pentru că niciunul nu era selectat
+      not_permitted: Nu ai permisiunea de a efectua această acțiune
+      overwrite: Suprascrie
+      shortcode: Scurtătură
+      shortcode_hint: Cel puțin două caractere, doar caractere alfanumerice sau linii de subliniere
+      title: Emoticoane personalizate
+      uncategorized: Necategorizat
+      unlist: Nu mai lista
+      unlisted: Nelistat
+      update_failed_msg: Nu s-a putut actualiza emoticonul respectiv
+      updated_msg: Emoticon actualizat cu succes!
+      upload: Încarcă
+    email_domain_blocks:
+      delete: Șterge
+      dns:
+        types:
+          mx: Înregistrare MX
+      domain: Domeniu
+      new:
+        create: Adaugă domeniu
+        resolve: Rezolvă domeniul
+    export_domain_allows:
+      no_file: Niciun fișier selectat
+    follow_recommendations:
+      status: Stare
+    instances:
+      back_to_all: Toate
+      back_to_limited: Limitat
+      back_to_warning: Avertizare
+      by_domain: Domeniu
+      content_policies:
+        comment: Notă internă
+        policies:
+          reject_media: Respinge conținutul multimedia
+          reject_reports: Respinge raportările
+      moderation:
+        all: Toate
+        limited: Limitat
+        title: Moderare
+      private_comment: Comentariu privat
+      public_comment: Comentariu public
+      title: Federație
+      total_blocked_by_us: Blocat de către noi
+    ip_blocks:
+      expires_in:
+        '1209600': 2 săptămâni
+        '15778476': 6 luni
+        '2629746': o lună
+        '31556952': un an
+        '86400': o zi
+        '94670856': 3 ani
+      new:
+        title: Creează o regulă IP nouă
+      no_ip_block_selected: Nicio regulă IP nu a fost modificată deoarece niciuna nu era selectată
+      title: Reguli IP
+    relationships:
+      title: Relațiile lui %{acct}
+    relays:
+      delete: Șterge
+      disable: Dezactivează
+      disabled: Dezactivat
+      enable: Activează
+    reports:
+      are_you_sure: Ești sigur?
+      assign_to_self: Alocă-mi-o mie
+      assigned: Moderator alocat
+      category: Categorie
+      category_description_html: Motivul pentru care acest cont și/sau conținut a fost raportat va fi citat în comunicarea trimisă contului raportat
+      comment:
+        none: Niciunul
+      comment_description_html: 'Pentru a furniza mai multe informaţii, %{name} a scris:'
+      created_at: Raportat
+      delete_and_resolve: Șterge postările
+      forwarded: Redirecționat
+      forwarded_to: Redirecționat către %{domain}
+      mark_as_resolved: Marchează ca fiind rezolvat
+      mark_as_sensitive: Marchează ca fiind sensibil
+      mark_as_unresolved: Marchează ca fiind nerezolvat
+      no_one_assigned: Nimeni
+      notes:
+        create: Adaugă o notă
+        create_and_resolve: Rezolvă cu o notă
+        create_and_unresolve: Redeschide cu o notă
+        delete: Șterge
+        title: Note
+      reopen: Redeschide raportarea
+      report: Raportare №%{id}
+      reported_account: Contul raportat
+      reported_by: Raportat de către
+      resolved: Rezolvată
+      resolved_msg: Raportare rezolvată cu succes!
+      skip_to_actions: Treci la acțiuni
+      status: Stare
+      statuses: Conținut raportat
+      statuses_description_html: Conținutul problematic va fi citat în comunicarea trimisă contului raportat
+      target_origin: Originea contului raportat
+      title: Raportări
+      unassign: Anulează alocarea
+      unresolved: Cu rezolvare anulată
+      updated_at: Actualizată
+      view_profile: Vezi profilul
+    roles:
+      add_new: Adaugă un rol
+      categories:
+        administration: Administrație
+        devops: Dezvoltare și operațiuni
+        invites: Invitații
+        moderation: Moderare
+        special: Speciale
+      delete: Șterge
+      description_html: Folosind <strong>roluri pentru utilizatori</strong>, poți alege ce funcții și zone din Mastodon pot accesa utilizatorii tăi.
+      edit: Modifică rolul lui „%{name}”
+      everyone: Permisiuni implicite
+      everyone_full_description_html: Acesta este <strong>rolul de bază</strong> care afectează <strong>toți utilizatorii</strong>, chiar și pe cei fără un rol alocat. Toate celelalte roluri îi moștenesc permisiunile lui.
+      privileges:
+        administrator: Administrator
+        administrator_description: Utilizatorii cu această permisiune vor putea avea orice permisiune
+        delete_user_data: Șterge datele utilizatorului
+    rules:
+      title: Regulile serverului
+    settings:
+      about:
+        manage_rules: Administrează regulile serverului
+        preamble: Furnizează informații detaliate despre modul în care serverul este operat, moderat și finanțat.
+        rules_hint: Există o zonă dedicată pentru regulile pe care utilizatorii tăi ar trebui să le respecte.
+        title: Despre
+      appearance:
+        preamble: Personalizează interfața web a Mastodon.
+        title: Aspect
+      branding:
+        preamble: Elementele de marcă ale serverului tău îl diferențiază de celelalte servere din rețea. Acestea pot fi afișate într-o varietate de medii precum în interfața web a Mastodon, în aplicațiile native, în previzualizarea linkurilor pe alte site-uri web, în aplicațiile de mesagerie ș.a.m.d. Din acest motiv, este de preferat ca aceste elemente să fie clare, scurte şi concise.
+        title: Elemente de marcă
+      content_retention:
+        preamble: Controlează modul în care conținutul generat de utilizatori este stocat în Mastodon.
+        title: Retenția conținutului
+      discovery:
+        follow_recommendations: Urmează recomandările
+        profile_directory: Catalogul de profiluri
   aliases:
     add_new: Creează un alias
     created_msg: A fost creat cu succes un alias nou. Acum puteţi iniţia mutarea din vechiul cont.
@@ -242,16 +420,12 @@ ro:
   applications:
     created: Aplicație creată cu succes
     destroyed: Aplicație ștearsă cu succes
-    invalid_url: URL-ul furnizat nu este valid
     regenerate_token: Regenerează token-ul de acces
     token_regenerated: Token de acces regenerat cu succes
     warning: Fiți foarte atent cu aceste date. Nu le împărtășiți niciodată cu cineva!
     your_token: Token-ul tău de acces
   auth:
-    apply_for_account: Solicită o invitație
     change_password: Parolă
-    checkbox_agreement_html: Sunt de acord cu <a href="%{rules_path}" target="_blank">regulile serverului</a> şi <a href="%{terms_path}" target="_blank">termenii de serviciu</a>
-    checkbox_agreement_without_rules_html: Sunt de acord cu <a href="%{terms_path}" target="_blank">termenii serviciului</a>
     delete_account: Șterge contul
     delete_account_html: Dacă vrei să ștergi acest cont <a href="%{path}">poți începe aici</a>. Va trebui să confirmi această acțiune.
     description:
@@ -279,10 +453,8 @@ ro:
     status:
       account_status: Starea contului
       confirming: Se așteaptă finalizarea confirmării prin e-mail.
-      functional: Contul dvs. este complet operațional.
       pending: Cererea dvs. este în curs de revizuire de către personalul nostru. Este posibil să dureze ceva timp. Veți primi un e-mail dacă cererea dvs. este aprobată.
       redirecting_to: Contul dvs. este inactiv deoarece în prezent se redirecționează către %{acct}.
-    trouble_logging_in: Probleme la conectare?
   authorize_follow:
     already_following: Urmărești deja acest cont
     already_requested: Ați trimis deja o cerere de urmărire către acel cont
@@ -327,9 +499,6 @@ ro:
       data_removal: Postările tale și alte date vor fi șterse permanent
       email_change_html: Puteți <a href="%{path}">schimba adresa de e-mail</a> fără a șterge contul dvs
       email_contact_html: Dacă tot nu ajunge, puteți trimite e-mail la <a href="mailto:%{email}">%{email}</a> pentru ajutor
-  directories:
-    explanation: Descoperă oameni și companii în funcție de interesele lor
-    explore_mastodon: Explorează %{title}
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': Nu ai permisiunea să vizitezi această pagină.
@@ -367,7 +536,6 @@ ro:
       title: Editează filtru
     errors:
       invalid_context: Lipsa conținut sau acesta este invalid
-      invalid_irreversible: Filtrarea ireversibilă funcționează dor cu context din fluxul Acasă și notificări
     index:
       delete: Șterge
       title: Filtre
@@ -385,7 +553,6 @@ ro:
       following: Lista de urmărire
       muting: Lista de ignorare
     upload: Încarcă
-  in_memoriam_html: În Memoria.
   invites:
     delete: Dezactivați
     expired: Expirat
@@ -475,22 +642,7 @@ ro:
     remove_selected_follows: Anulează urmărirea utilizatorilor selectați
     status: Starea contului
   remote_follow:
-    acct: Introduceți numele@domeniu din care doriți să acționați
     missing_resource: Nu s-a putut găsi URL-ul de redirecționare necesar pentru contul dvs
-    no_account_html: Nu ai un cont? Poți <a href='%{sign_up_path}' target='_blank'>să te înregistrezi aici</a>
-    proceed: Continuă să urmărești
-    prompt: 'Vei urmării pe:'
-    reason_html: "<strong>De ce este necesar acest pas?</strong> <code>%{instance}</code> ar putea să nu fie serverul în care sunteți înregistrat, așa că trebuie să te redirecționăm către serverul tău de acasă."
-  remote_interaction:
-    favourite:
-      proceed: Continuă să favorizezi
-      prompt: 'Vrei să favorizezi această postare:'
-    reblog:
-      proceed: Continuă să dai impuls
-      prompt: 'Vrei să impulsionezi această postare:'
-    reply:
-      proceed: Continuă să răspunzi
-      prompt: 'Vrei să răspunzi la această postare:'
   scheduled_statuses:
     over_daily_limit: Ai depășit limita de %{limit} postări programate pentru acea zi
     over_total_limit: Ai depășit limita de %{limit} postări programate
@@ -521,13 +673,11 @@ ro:
       other: 'conținea aceste hashtag-uri nepermise: %{tags}'
     errors:
       in_reply_not_found: Postarea la care încercați să răspundeți nu pare să existe.
-    language_detection: Detectează automat limba
     open_in_web: Deschide pe web
     over_character_limit: s-a depășit limita de caracter %{max}
     pin_errors:
       limit: Deja ai fixat numărul maxim de postări
       ownership: Postarea altcuiva nu poate fi fixată
-      private: Postarea non-publică nu poate fi fixată
       reblog: Un impuls nu poate fi fixat
     poll:
       total_people:
@@ -554,87 +704,6 @@ ro:
     sensitive_content: Conținut sensibil
   tags:
     does_not_match_previous_name: nu se potrivește cu numele anterior
-  terms:
-    body_html: |
-      <h2> Politica de confidențialitate </h2>
-      <h3 id = "collect"> Ce informații colectăm? </h3>
-
-      <Ul>
-      <li> <em> Informații de bază despre cont </em>: dacă vă înregistrați pe acest server, vi se poate cere să introduceți un nume de utilizator, o adresă de e-mail și o parolă. De asemenea, puteți introduce informații suplimentare despre profil, cum ar fi numele afișat și biografie, și puteți încărca o imagine de profil și o imagine de antet. Numele de utilizator, numele afișat, biografia, imaginea de profil și imaginea antetului sunt întotdeauna listate public. </li>
-      <li> <em> Postări, umăriri și alte informații publice </em>: Lista persoanelor pe care le urmărești este listată public, aceeași este valabilă și pentru urmăritorii tăi. Când trimiteți un mesaj, data și ora sunt stocate, precum și aplicația din care ați trimis mesajul. Mesajele pot conține atașamente media, cum ar fi imagini și videoclipuri. Postările publice și nelistate sunt disponibile public. Când aveți o postare pe profilul dvs., aceasta este, de asemenea, informații disponibile publicului. Postările dvs. sunt livrate urmăritorilor dvs., în unele cazuri înseamnă că sunt livrate pe diferite servere și copiile sunt stocate acolo. Când ștergeți postări, acest lucru este de asemenea livrat urmăritorilor dvs. Acțiunea de a impulsiona sau favoriza o altă postare este întotdeauna publică. </li>
-      <li> <em> Postări directe și doar pentru urmăritori </em>: toate postările sunt stocate și procesate pe server. Postările destinate numai urmăritorilor sunt livrate urmăritorilor și utilizatorilor dvs. menționați în ele, iar postările directe sunt livrate numai utilizatorilor menționați în ele. În unele cazuri, înseamnă că sunt livrate pe diferite servere și copiile sunt stocate acolo. Facem un efort de bună-credință pentru a limita accesul la aceste postări doar persoanelor autorizate, dar este posibil ca alte servere să nu reușească. Prin urmare, este important să revizuiți serverele de pe care urmăritorii dvs provin. Puteți comuta o opțiune pentru a aproba și respinge manual următorii noi din setări. <em> Vă rugăm să rețineți că operatorii serverului și orice server primitor pot vizualiza astfel de mesaje </em> și că destinatarii pot face captură de ecran, copie sau distribuirea lor. <em> Nu împărtășiți informații periculoase  pe servere. </em> </li>
-      <li> <em> IP-uri și alte metadate </em>: atunci când vă conectați, înregistrăm adresa IP de lacare vă conectați, precum și numele aplicației dvs. de navigare pe internet. Toate sesiunile conectate sunt disponibile pentru revizuire și revocare în setări. Cea mai recentă adresă IP folosită este stocată până la 12 luni. De asemenea, putem păstra jurnalele de server care includ adresa IP a fiecărei solicitări către serverul nostru. </li>
-      </ Ul>
-
-      <hr class = "spacer" />
-
-      <h3 id = "use"> Pentru ce folosim informațiile dvs.? </h3>
-
-      <p> Toate informațiile pe care le colectăm de la dvs. pot fi utilizate în următoarele moduri: </p>
-
-      <Ul>
-      <li> Pentru a oferi funcționalitatea de bază a platformei. Puteți interacționa cu conținutul altor persoane și puteți posta propriul conținut atunci când sunteți autentificat. De exemplu, puteți urmări alte persoane pentru a vizualiza postările combinate în fluxul personal. </li>
-      <li> Pentru a ajuta la moderarea comunității, de exemplu, compararea adresei IP cu altele cunoscute pentru a determina evaziunea interdicției sau alte încălcări. </li>
-      <li> Adresa de e-mail pe care o furnizați poate fi utilizată pentru a vă trimite informații, notificări despre alte persoane care interacționează cu conținutul dvs. sau pentru a vă trimite mesaje și pentru a răspunde la întrebări și / sau alte solicitări sau întrebări. </li>
-      </ Ul>
-
-      <hr class = "spacer" />
-
-      <h3 id = "protect"> Cum vă protejăm informațiile? </h3>
-
-      <p> Implementăm o varietate de măsuri de securitate pentru a menține siguranța informațiilor dvs. personale atunci când introduceți, trimiteți sau accesați informațiile dvs. personale. Printre altele, sesiunea navigatorului dvs., precum și traficul dintre aplicațiile dvs. și API-ul, sunt securizate cu SSL, iar parola dvs. este salvată folosind un algoritm puternic unidirecțional. Puteți activa autentificarea în doi pași pentru a asigura accesul suplimentar la contul dvs.. </p>
-
-      <hr class = "spacer" />
-
-      <h3 id = "data-retenție"> Care este politica noastră de păstrare a datelor? </h3>
-
-      <p> Vom depune eforturi de bună credință pentru: </p>
-
-      <Ul>
-      <li>Păstrarea jurnalelor serverului care conțin adresa IP a tuturor solicitărilor către acest server, în măsura în care se păstrează astfel de jurnale, nu mai mult de 90 de zile. </li>
-      <li> Păstrarea adreselor IP asociate cu utilizatorii înregistrați nu mai mult de 12 luni. </li>
-      </ Ul>
-
-      <p> Puteți solicita și descărca o arhivă a conținutului dvs., inclusiv postările, atașamentele media, poza de profil și imaginea antetului. </p>
-
-      <p> Puteți șterge ireversibil contul în orice moment. </p>
-
-      <hr class = "spacer" />
-
-      <h3 id = "cookies"> Folosim module cookie? </h3>
-
-      <P> Da. Cookie-urile sunt fișiere mici pe care un site sau furnizorul său de servicii le transferă pe hard disk-ul computerului prin intermediul navigatorului dvs. Web (dacă permiteți). Aceste cookie-uri permit site-ului să vă recunoască navigatorul și, dacă aveți un cont înregistrat, să îl asociați cu contul dvs. înregistrat. </p>
-
-      <p> Folosim cookie-uri pentru a înțelege și salva preferințele pentru vizitele viitoare. </p>
-
-      <hr class = "spacer" />
-
-      <h3 id = "divulgare"> Dezvăluim informații părților din afară? </h3>
-
-      <p> Nu vindem, comercializăm sau nu transferăm în alte părți informațiilor dvs. de identificare personală. Aceasta nu include terți de încredere care ne ajută în operarea site-ului nostru, în desfășurarea activității noastre sau în deservirea dvs., atât timp cât acele părți acceptă să păstreze aceste informații confidențiale. De asemenea, putem elibera informațiile dvs. atunci când considerăm că eliberarea este adecvată pentru a respecta legea, a aplica politicile site-ului nostru sau a proteja drepturile noastre, proprietatea sau siguranța noastră sau a altor persoane. </p>
-
-      <p> Conținutul dvs. public poate fi descărcat de alte servere din rețea. Postările dvs. publice și cele doar pentru urmăritori sunt livrate pe serverele de unde provin urmăritorii dvs., iar mesajele directe sunt livrate către serverele destinatarilor, în măsura în care acei urmăritori sau destinatari provin de pe un server diferit decât acesta. </p>
-
-      <p> Atunci când autorizați o aplicație să vă utilizeze contul, în funcție de sfera de autorizare pe care o aprobați, aceasta poate accesa informațiile despre profilul dvs. public, lista dvs. de urmăritori, urmăritorii, listele dvs., toate postările și favorizările dvs. Aplicațiile nu vă pot accesa niciodată adresa de e-mail sau parola. </p>
-
-      <hr class = "spacer" />
-
-      <h3 id = "children"> Utilizarea site-ului de către copii </h3>
-
-      <p> Site-ul nostru, produsele și serviciile noastre sunt destinate tuturor persoanelor care au cel puțin 16 ani. Dacă aveți sub 16 ani, conform cerințelor GDPR (<a href="https://ro.wikipedia.org/wiki/General_Data_Protection_Regulation"> Regulamentul general privind protecția datelor </a>) nu utilizați acest site . </ p>
-
-      <p> Cerințele legii pot fi diferite dacă acest server se află într-o altă jurisdicție. </p>
-
-      <hr class = "spacer" />
-
-      <h3 id = "changes"> Modificări ale politicii noastre de confidențialitate </h3>
-
-      <p> Dacă decidem să ne schimbăm politica de confidențialitate, vom posta aceste modificări pe această pagină. </p>
-
-      <p> Acsta a fost actualizat ultima dată pe 27 aprilie 2020. </p>
-
-      <p> Adaptat inițial din <a href="https://github.com/discourse/discourse"> Politica de confidențialitate Discourse </a>. </p>
-    title: "%{instance} Termeni de utilizare și Politica de confidențialitate"
   themes:
     contrast: Mastodon (contrast mare)
     default: Mastodon (Întunecat)
@@ -658,13 +727,6 @@ ro:
       subject: Arhiva ta este gata pentru descărcare
       title: Preluare arhivă
     warning:
-      explanation:
-        disable: În timp ce contul tău este înghețat, datele contului tău rămân intacte, dar nu poți efectua nicio acțiune până când acesta este deblocat.
-        silence: În timp ce contul tău este limitat, doar persoanele care deja te urmăresc îți vor vedea postările pe acest server, și puteți fi exclus de la diverse liste publice. Cu toate acestea, este posibil ca alte persoane să vă urmărească manual.
-        suspend: Contul tău a fost suspendat și toate postările tale și fișierele media încărcate au fost șterse ireversibil de pe acest server, și servere unde ai avut urmăritori.
-      get_in_touch: Puteți răspunde la acest e-mail pentru a lua legătura cu personalul din %{instance}.
-      review_server_policies: Revizuiește politicile serverului
-      statuses: 'Mai precis, pentru:'
       subject:
         disable: Contul tău %{acct} a fost înghețat
         none: Avertizare pentru %{acct}
@@ -677,20 +739,11 @@ ro:
         suspend: Cont suspendat
     welcome:
       edit_profile_action: Configurare profil
-      edit_profile_step: Vă puteți personaliza profilul încărcând un avatar, un antet, schimbându-vă numele afișat și multe altele. Dacă dorești să revizuiești noi urmăritori înainte de a primi permisiunea de a te urmări, îți poți bloca contul.
       explanation: Iată câteva sfaturi pentru a începe
       final_action: Începe să postezi
-      final_step: 'Începe să postezi! Chiar și fără urmăritori, mesajele publice pot fi văzute de alții, de exemplu pe fluxul local și pe hashtag-uri. Poate doriți să vă prezentați pe hashtag-ul #introducere.'
       full_handle: Numele tău complet
       full_handle_hint: Asta este ceea ce vei putea spune prietenilor pentru a te putea contacta sau pentru a te urmării de pe un alt server.
-      review_preferences_action: Schimbă preferințele
-      review_preferences_step: Asigură-te că setezi preferințele tale, cum ar fi e-mailurile pe care dorești să le primești sau ce nivel de confidențialitate vrei ca mesajele tale să fie implicite. Dacă nu ai rău de mişcare, ai putea alege să activezi imaginile GIF să pornească automat.
       subject: Bine ai venit
-      tip_federated_timeline: Fluxul federat este o vedere de ansamblu a rețelei Mastodon. Dar include doar oameni la care s-au abonat vecinii tăi, așa că nu este completă.
-      tip_following: Urmăriți implicit administratorul(ii) serverului. Pentru a găsi oameni mai interesanți, verificați fluxurile locale și federalizate.
-      tip_local_timeline: Fluxul local este o vedere în ansamblu a persoanelor de pe %{instance}. Aceștia sunt vecinii tăi apropiați!
-      tip_mobile_webapp: Dacă navigatorul tău mobil îți oferă să adaugi Mastodon pe ecranul tău de pornire, poți primi notificări push. Se comportă ca o aplicație nativă în multe moduri!
-      tips: Sfaturi
       title: Bine ai venit la bord, %{name}!
   users:
     follow_limit_reached: Nu poți urmări mai mult de %{limit} persoane
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index fce70ae32..e955afc30 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,66 +1,12 @@
 ---
 ru:
   about:
-    about_hashtag_html: Это публичные посты, отмеченные хэштегом <strong>#%{hashtag}</strong>. Вы можете взаимодействовать с ними при наличии у Вас учётной записи в глобальной сети Mastodon.
     about_mastodon_html: 'Социальная сеть будущего: никакой рекламы, слежки корпорациями, этичный дизайн и децентрализация! С Mastodon ваши данные под вашим контролем.'
-    about_this: Об этом узле
-    active_count_after: активных
-    active_footnote: Ежемесячно активные пользователи (MAU)
-    administered_by: 'Администратор узла:'
-    api: API
-    apps: Приложения
-    apps_platforms: Используйте Mastodon на iOS, Android и других платформах
-    browse_directory: Изучите каталог и найдите профили по интересам
-    browse_local_posts: Просматривайте в реальном времени новые посты с этого сервера
-    browse_public_posts: Взгляните на новые посты Mastodon в реальном времени
-    contact: Связаться
     contact_missing: не указан
     contact_unavailable: неизв.
-    discover_users: Найдите пользователей
-    documentation: Документация
-    federation_hint_html: С учётной записью на %{instance} вы сможете подписываться на людей с любого сервера Mastodon и не только.
-    get_apps: Попробуйте мобильные приложения
     hosted_on: Вы получили это сообщение, так как зарегистрированы на %{domain}
-    instance_actor_flash: |
-      Эта учетная запись является виртуальным персонажем, используемым для представления самого сервера, а не какого-либо пользователя.
-      Используется для целей федерации и не должен быть заблокирован, если вы не хотите заблокировать всю инстанцию, вместо этого лучше использовать доменную блокировку.
-    learn_more: Узнать больше
-    privacy_policy: Политика конфиденциальности
-    rules: Правила сервера
-    rules_html: 'Ниже приведена сводка правил, которых вам нужно придерживаться, если вы хотите иметь учётную запись на этом сервере Мастодона:'
-    see_whats_happening: Узнайте, что происходит вокруг
-    server_stats: 'Статистика сервера:'
-    source_code: Исходный код
-    status_count_after:
-      few: поста
-      many: постов
-      one: пост
-      other: поста
-    status_count_before: И опубликовано
-    tagline: Подписывайтесь на друзей и заводите новые знакомства
-    terms: Условия использования
-    unavailable_content: Недоступный контент
-    unavailable_content_description:
-      domain: Сервер
-      reason: Причина
-      rejecting_media: 'Медиафайлы с этих серверов не будут обработаны или сохранены. Их миниатюры не будут отображаться и вам придётся вручную нажимать на исходный файл:'
-      rejecting_media_title: Отфильтрованные файлы
-      silenced: 'Посты с этих серверов будут скрыты из публичных лент и обсуждений, как и не будут рассылаться уведомления касательно действий тамошних пользователей, если, конечно, вы не подписаны на них:'
-      silenced_title: Заглушенные серверы
-      suspended: 'Обмен, хранение и обработка данных с этих серверов будут прекращены, что сделает невозможным взаимодействие или общение с пользователями с этих серверов:'
-      suspended_title: Заблокированные пользователи
-    unavailable_content_html: 'Mastodon в основном позволяет просматривать содержимое и взаимодействовать с другими пользователями любых серверов в федерации. Вот исключения, сделанные конкретно для этого сервера:'
-    user_count_after:
-      few: пользователя
-      many: пользователей
-      one: пользователь
-      other: пользователя
-    user_count_before: Здесь расположились
-    what_is_mastodon: Что такое Mastodon?
+    title: О проекте
   accounts:
-    choices_html: "%{name} рекомендует:"
-    endorsements_hint: Вы можете рекомендовать людей, которые вы отслеживаете из веб-интерфейса, и они будут показаны здесь.
-    featured_tags_hint: Вы можете указать конкретные хэштеги, которые будут отображаться здесь.
     follow: Подписаться
     followers:
       few: подписчика
@@ -69,16 +15,9 @@ ru:
       other: подписчиков
     following: подписки
     instance_actor_flash: Эта учетная запись - виртуальный пользователь, используемый для представления самого сервера, а не отдельного пользователя. Она используется для организационных целей и не может быть заморожена.
-    joined: 'Дата регистрации: %{date}'
     last_active: последняя активность
     link_verified_on: Владение этой ссылкой было проверено %{date}
-    media: Медиафайлы
-    moved_html: "%{name} переехал(а) на %{new_profile_link}:"
-    network_hidden: Эта информация недоступна
-    never_active: Никогда
     nothing_here: Здесь ничего нет!
-    people_followed_by: Люди, на которых подписан(а) %{name}
-    people_who_follow: Подписчики %{name}
     pin_errors:
       following: Чтобы порекомендовать кого-то, надо сначала на них подписаться
     posts:
@@ -87,14 +26,6 @@ ru:
       one: Пост
       other: статусов
     posts_tab_heading: Посты
-    posts_with_replies: Посты с ответами
-    roles:
-      admin: Администратор
-      bot: Бот
-      group: Группа
-      moderator: Модератор
-    unavailable: Профиль недоступен
-    unfollow: Отписаться
   admin:
     account_actions:
       action: Выполнить действие
@@ -102,26 +33,30 @@ ru:
     account_moderation_notes:
       create: Создать
       created_msg: Заметка модератора успешно создана!
-      delete: Удалить
       destroyed_msg: Заметка модератора успешно удалена!
     accounts:
       add_email_domain_block: Заблокировать e-mail домен
       approve: Подтвердить
-      approve_all: Подтвердить все
       approved_msg: Успешно одобрена заявка на регистрацию %{username}
       are_you_sure: Вы уверены?
       avatar: Аватар
       by_domain: Домен
       change_email:
-        changed_msg: E-mail учётной записи успешно изменён!
+        changed_msg: Адрес эл. почты успешно изменен!
         current_email: Текущий e-mail
         label: Сменить e-mail
         new_email: Новый e-mail
         submit: Сменить e-mail
         title: Сменить e-mail для %{username}
+      change_role:
+        changed_msg: Роль успешно изменена!
+        label: Изменить роль
+        no_role: Нет роли
+        title: Изменить роль %{username}
       confirm: Подтвердить
       confirmed: Подтверждено
       confirming: Подтверждение
+      custom: Другое
       delete: Удалить данные
       deleted: Удалён
       demote: Разжаловать
@@ -161,7 +96,7 @@ ru:
         active: Действующие
         all: Все
         pending: В ожидании
-        silenced: Скрытые
+        silenced: Ограниченные
         suspended: Заблокированные
         title: Модерация
       moderation_notes: Заметки модератора
@@ -169,9 +104,16 @@ ru:
       most_recent_ip: Последний IP
       no_account_selected: Ничего не изменилось, так как ни одна учётная запись не была выделена
       no_limits_imposed: Без ограничений
+      no_role_assigned: Роль не присвоена
       not_subscribed: Не подписаны
       pending: Ожидает рассмотрения
       perform_full_suspension: Блокировка
+      previous_strikes: Предыдущие замечания
+      previous_strikes_description_html:
+        few: У этой учётной записи <strong>%{count}</strong> замечания.
+        many: У этой учётной записи <strong>%{count}</strong> замечаний.
+        one: У этой учётной записи <strong>одно</strong> замечание.
+        other: У этой учетной записи <strong>%{count}</strong> замечание.
       promote: Повысить
       protocol: Протокол
       public: Публичный
@@ -179,8 +121,9 @@ ru:
       redownload: Обновить аватар
       redownloaded_msg: Профиль %{username} успешно обновлен из оригинала
       reject: Отклонить
-      reject_all: Отклонить все
       rejected_msg: Успешно отклонено приложение для регистрации %{username}
+      remote_suspension_irreversible: Данные этого аккаунта были необратимо удалены.
+      remote_suspension_reversible_hint_html: Учётная запись была заблокирована, и данные будут полностью удалены %{date}. До этого момента её можно восстановить без каких-либо неприятных последствий. Если вы хотите немедленно удалить все данные учётной записи, вы можете сделать это ниже.
       remove_avatar: Удалить аватар
       remove_header: Убрать шапку
       removed_avatar_msg: Аватар %{username} успешно удален
@@ -192,19 +135,13 @@ ru:
       reset: Сбросить
       reset_password: Сбросить пароль
       resubscribe: Переподписаться
-      role: Разрешения
-      roles:
-        admin: Администратор
-        moderator: Модератор
-        staff: Персонал
-        user: Пользователь
+      role: Роль
       search: Поиск
       search_same_email_domain: Другие пользователи с тем же доменом электронной почты
       search_same_ip: Другие пользователи с таким же IP
       security_measures:
         only_password: Только пароль
         password_and_2fa: Пароль и 2FA
-        password_and_sign_in_token: Пароль и e-mail код
       sensitive: Отметить как «деликатного содержания»
       sensitized: отмечено как «деликатного характера»
       shared_inbox_url: URL общих входящих
@@ -214,12 +151,15 @@ ru:
       silence: Скрытие
       silenced: Заглушен
       statuses: Посты
+      strikes: Предыдущие замечания
       subscribe: Подписаться
+      suspend: Заблокировать
       suspended: Заморожен
       suspension_irreversible: Данные этой учётной записи были необратимо удалены. Вы можете разблокировать учетную запись, чтобы сделать её доступной, но это не восстановит ранее имевшиеся в ней данные.
       suspension_reversible_hint_html: Учётная запись была заблокирована, и данные будут полностью удалены %{date}. До этого момента её можно восстановить без каких-либо неприятных последствий. Если вы хотите немедленно удалить все данные учётной записи, вы можете сделать это ниже.
-      time_in_queue: Ожидание в очереди %{time}
       title: Учётные записи
+      unblock_email: Разблокировать e-mail адрес
+      unblocked_email_msg: E-mail адрес %{username} разблокирован
       unconfirmed_email: Неподтверждённый e-mail
       undo_sensitized: Убрать отметку «деликатного содержания»
       undo_silenced: Отменить скрытие
@@ -234,26 +174,34 @@ ru:
       whitelisted: В белом списке
     action_logs:
       action_types:
+        approve_appeal: Одобрить обжалование
+        approve_user: Утвердить
         assigned_to_self_report: Присвоение жалоб
-        change_email_user: Изменение e-mail пользователей
+        change_email_user: Изменение эл. почты пользователя
+        change_role_user: Изменить роль пользователя
         confirm_user: Подтверждение пользователей
         create_account_warning: Выдача предупреждения
         create_announcement: Создание объявлений
+        create_canonical_email_block: Создать блокировку эл. почты
         create_custom_emoji: Добавление эмодзи
         create_domain_allow: Разрешение доменов
         create_domain_block: Блокировка доменов
         create_email_domain_block: Блокировка e-mail доменов
         create_ip_block: Создание правил для IP-адресов
         create_unavailable_domain: Добавление домена в список недоступных
+        create_user_role: Создать роль
         demote_user: Разжалование пользователей
         destroy_announcement: Удаление объявлений
+        destroy_canonical_email_block: Удалить блокировку эл. почты
         destroy_custom_emoji: Удаление эмодзи
         destroy_domain_allow: Отзыв разрешений для доменов
         destroy_domain_block: Разблокировка доменов
         destroy_email_domain_block: Разблокировка e-mail доменов
+        destroy_instance: Очистить домен
         destroy_ip_block: Удаление правил для IP-адресов
         destroy_status: Удаление постов
         destroy_unavailable_domain: Исключение доменов из списка недоступных
+        destroy_user_role: Удалить роль
         disable_2fa_user: Отключение 2FA
         disable_custom_emoji: Отключение эмодзи
         disable_sign_in_token_auth_user: Отключение аутентификации по e-mail кодам у пользователей
@@ -263,42 +211,56 @@ ru:
         enable_user: Разморозка пользователей
         memorialize_account: Присвоение пользователям статуса «мемориала»
         promote_user: Повышение пользователей
+        reject_appeal: Отклонить обжалование
+        reject_user: Отклонить
         remove_avatar_user: Удаление аватаров
         reopen_report: Возобновление жалоб
+        resend_user: Повторно отправить письмо с подтверждением
         reset_password_user: Сброс пароля пользователей
         resolve_report: Отметка жалоб «решёнными»
         sensitive_account: Присвоение пользователям отметки «деликатного содержания»
         silence_account: Скрытие пользователей
         suspend_account: Блокировка пользователей
         unassigned_report: Снятие жалоб
+        unblock_email_account: Разблокировать e-mail адрес
         unsensitive_account: Снятие с пользователей отметки «деликатного содержания»
         unsilence_account: Отмена скрытия пользователей
         unsuspend_account: Разблокировка пользователей
         update_announcement: Обновление объявлений
         update_custom_emoji: Обновление эмодзи
         update_domain_block: Изменение блокировки домена
+        update_ip_block: Обновить правило для IP-адреса
         update_status: Изменение постов
+        update_user_role: Обновить роль
       actions:
+        approve_appeal_html: "%{name} одобрил апелляцию на умеренное решение от %{target}"
+        approve_user_html: "%{name} утвердил(а) регистрацию %{target}"
         assigned_to_self_report_html: "%{name} назначил(а) себя для решения жалобы %{target}"
         change_email_user_html: "%{name} сменил(а) e-mail пользователя %{target}"
+        change_role_user_html: "%{name} изменил(а) роль %{target}"
         confirm_user_html: "%{name} подтвердил(а) e-mail адрес пользователя %{target}"
         create_account_warning_html: "%{name} выдал(а) предупреждение %{target}"
         create_announcement_html: "%{name} создал(а) новое объявление %{target}"
+        create_canonical_email_block_html: "%{name} заблокировал(а) эл. почту с хешем %{target}"
         create_custom_emoji_html: "%{name} загрузил(а) новый эмодзи %{target}"
         create_domain_allow_html: "%{name} разрешил(а) федерацию с доменом %{target}"
         create_domain_block_html: "%{name} заблокировал(а) домен %{target}"
         create_email_domain_block_html: "%{name} заблокировал(а) e-mail домен %{target}"
         create_ip_block_html: "%{name} создал(а) правило для IP %{target}"
         create_unavailable_domain_html: "%{name} приостановил доставку на узел %{target}"
+        create_user_role_html: "%{name} создал(а) роль %{target}"
         demote_user_html: "%{name} разжаловал(а) пользователя %{target}"
         destroy_announcement_html: "%{name} удалил(а) объявление %{target}"
+        destroy_canonical_email_block_html: "%{name} снял(а) блокировку e-mail с хэшем %{target}"
         destroy_custom_emoji_html: "%{name} удалил(а) эмодзи %{target}"
         destroy_domain_allow_html: "%{name} запретил(а) федерацию с доменом %{target}"
         destroy_domain_block_html: "%{name} снял(а) блокировку с домена %{target}"
         destroy_email_domain_block_html: "%{name} снял(а) блокировку с e-mail домена %{target}"
+        destroy_instance_html: "%{name} очистил(а) данные для домена %{target}"
         destroy_ip_block_html: "%{name} удалил(а) правило для IP %{target}"
         destroy_status_html: "%{name} удалил(а) пост пользователя %{target}"
         destroy_unavailable_domain_html: "%{name} возобновил доставку на узел %{target}"
+        destroy_user_role_html: "%{name} удалил(а) роль %{target}"
         disable_2fa_user_html: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
         disable_custom_emoji_html: "%{name} отключил(а) эмодзи %{target}"
         disable_sign_in_token_auth_user_html: "%{name} отключил(а) аутентификацию по e-mail кодам для %{target}"
@@ -308,26 +270,32 @@ ru:
         enable_user_html: "%{name} разморозил(а) пользователя %{target}"
         memorialize_account_html: "%{name} перевел(а) учётную запись пользователя %{target} в статус памятника"
         promote_user_html: "%{name} повысил(а) пользователя %{target}"
+        reject_appeal_html: "%{name} отклонил апелляцию на модерацию от %{target}"
+        reject_user_html: "%{name} отклонил(а) регистрацию %{target}"
         remove_avatar_user_html: "%{name} убрал(а) аватарку пользователя %{target}"
         reopen_report_html: "%{name} повторно открыл(а) жалобу %{target}"
+        resend_user_html: "%{name} переслал письмо с подтверждением для %{target}"
         reset_password_user_html: "%{name} сбросил(а) пароль пользователя %{target}"
         resolve_report_html: "%{name} решил(а) жалобу %{target}"
         sensitive_account_html: "%{name} установил(а) отметку файлов %{target} как «деликатного характера»"
         silence_account_html: "%{name} наложил(а) ограничения на видимость постов пользователя %{target}"
         suspend_account_html: "%{name} заблокировал(а) учётную запись %{target}"
         unassigned_report_html: "%{name} снял(а) назначение жалобы %{target}"
+        unblock_email_account_html: "%{name} разблокировал(а) e-mail адрес %{target}"
         unsensitive_account_html: "%{name} снял(а) отметку файлов %{target} как «деликатного характера»"
         unsilence_account_html: "%{name} снял(а) ограничения видимости постов пользователя %{target}"
         unsuspend_account_html: "%{name} снял(а) блокировку с пользователя %{target}"
         update_announcement_html: "%{name} обновил(а) объявление %{target}"
         update_custom_emoji_html: "%{name} обновил(а) эмодзи %{target}"
         update_domain_block_html: "%{name} обновил(а) блокировку домена для %{target}"
+        update_ip_block_html: "%{name} изменил(а) правило для IP %{target}"
         update_status_html: "%{name} изменил(а) пост пользователя %{target}"
-      deleted_status: "(удалённый пост)"
+        update_user_role_html: "%{name} изменил(а) роль %{target}"
+      deleted_account: удалённая учётная запись
       empty: Журнал пуст.
       filter_by_action: Фильтр по действию
       filter_by_user: Фильтр по пользователю
-      title: Журнал событий
+      title: Журнал аудита
     announcements:
       destroyed_msg: Объявление удалено.
       edit:
@@ -362,11 +330,12 @@ ru:
       enable: Включить
       enabled: Включено
       enabled_msg: Эмодзи успешно включено
-      image_hint: PNG до 50KB
+      image_hint: PNG или GIF до %{size}
       list: Список
       listed: В списке
       new:
         title: Добавить новый эмодзи
+      no_emoji_selected: Не было изменено ни одного эмодзи
       not_permitted: У вас нет прав для совершения данного действия
       overwrite: Заменить
       shortcode: Краткий код
@@ -384,21 +353,26 @@ ru:
       media_storage: Медиа файлы
       new_users: новые пользователи
       opened_reports: жалоб открыто
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> ожидают аппеляции"
+        many: "<strong>%{count}</strong> ожидают апелляции"
+        one: "<strong>%{count}</strong> ожидает апелляции"
+        other: 'Ожидают апелляции: <strong>%{count}</strong>'
       pending_reports_html:
-        few: "<strong>%{count}</strong> жалобы к рассмотрению"
-        many: "<strong>%{count}</strong> жалоб к рассмотрению"
-        one: "<strong>%{count}</strong> жалоба к рассмотрению"
-        other: "<strong>%{count}</strong> жалобы к рассмотрению"
+        few: "<strong>%{count}</strong> ожидающих отчета"
+        many: "<strong>%{count}</strong> ожидающих отчетов"
+        one: "<strong>%{count}</strong> ожидающий отчет"
+        other: "<strong>%{count}</strong> ожидающих отчетов"
       pending_tags_html:
-        few: "<strong>%{count}</strong> хэштега к рассмотрению"
-        many: "<strong>%{count}</strong> хэштегов к рассмотрению"
-        one: "<strong>%{count}</strong> хэштег к рассмотрению"
-        other: "<strong>%{count}</strong> хэштега к рассмотрению"
+        few: "<strong>%{count}</strong> ожидающих хэштега"
+        many: "<strong>%{count}</strong> ожидающих хэштегов"
+        one: "<strong>%{count}</strong> ожидающий хэштег"
+        other: "<strong>%{count}</strong> ожидающих хэштегов"
       pending_users_html:
-        few: "<strong>%{count}</strong> регистрации к рассмотрению"
-        many: "<strong>%{count}</strong> регистраций к рассмотрению"
-        one: "<strong>%{count}</strong> регистрация к рассмотрению"
-        other: "<strong>%{count}</strong> регистрации к рассмотрению"
+        few: "<strong>%{count}</strong> ожидающих пользователя"
+        many: "<strong>%{count}</strong> ожидающих пользователей"
+        one: "<strong>%{count}</strong> ожидающий пользователь"
+        other: "<strong>%{count}</strong> ожидающих пользователей"
       resolved_reports: жалоб решено
       software: Программное обеспечение
       sources: Источники регистрации
@@ -407,10 +381,16 @@ ru:
       top_languages: Самые активные языки
       top_servers: Самые активные серверы
       website: Веб-сайт
+    disputes:
+      appeals:
+        empty: Обжалования не найдены.
+        title: Обжалования
     domain_allows:
       add_new: Внести в белый список
       created_msg: Домен добавлен в белый список
       destroyed_msg: Домен убран из белого списка
+      export: Экспорт
+      import: Импорт
       undo: Убрать из белого списка
     domain_blocks:
       add_new: Заблокировать домен
@@ -418,21 +398,21 @@ ru:
       destroyed_msg: Блокировка домена снята
       domain: Домен
       edit: Редактировать блокировку
+      existing_domain_block: Вы уже установили более строгие ограничения для %{name}.
       existing_domain_block_html: Вы уже ввели более строгие ограничения на %{name}, вам нужно <a href="%{unblock_url}">разблокировать его</a> сначала.
+      export: Экспорт
+      import: Импорт
       new:
         create: Создать блокировку
         hint: Блокировка домена не предотвратит создание новых учётных записей в базе данных, но ретроактивно и автоматически применит указанные методы модерации для этих учётных записей.
         severity:
-          desc_html: |-
-            Используйте <strong>скрытие</strong> для того, чтобы публикуемые пользователями посты перестали быть видимыми для всех, кроме их подписчиков.<br>
-            <br>
-            <strong>Блокировка</strong> удалит весь локальный контент учётных записей с этого домена, включая мультимедийные вложения и данные профилей.<br>
-            <br>
-            <strong>Ничего</strong> же попросту скроет медиаконтент с домена.
+          desc_html: "<strong>Лимит</strong> сделает посты с аккаунтов данного домена невидимым для всех, кто на них не подписан. <strong>Приостановка</strong> удалит весь контент, медиа и данные профиля с аккаунта домена на вашем сервере. Используйте <strong>Ничего</strong> если хотите отказываться от медиа файлов."
           noop: Ничего
-          silence: Скрытие
+          silence: Ограничение
           suspend: Блокировка
         title: Новая блокировка e-mail домена
+      no_domain_block_selected: Не были сделаны изменения блокирования домена, так как не выбраны
+      not_permitted: У Вас недостаточно прав для выполнения этого действия
       obfuscate: Скрыть доменное имя
       obfuscate_hint: Частично скрыть доменное имя в списке, если включена публикация списка ограничений домена
       private_comment: Приватный комментарий
@@ -443,36 +423,43 @@ ru:
       reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки.
       reject_reports: Отклонять жалобы
       reject_reports_hint: Игнорировать все жалобы с этого домена. Не имеет значения в случае блокировки.
-      rejecting_media: отклонение медиафайлов
-      rejecting_reports: отклонение жалоб
-      severity:
-        silence: скрывается
-        suspend: заблокирован
-      show:
-        affected_accounts:
-          few: "%{count} учетных записей в базе данных затронуты"
-          many: "%{count} учетных записей в базе данных затронуты"
-          one: Влияет на одну учётную запись в базе данных
-          other: "%{count} учетных записей в базе данных затронуты"
-        retroactive:
-          silence: Убрать скрытие постов учётных записей с этого узла
-          suspend: Снять блокировку со всех существующих учётных записей этого домена
-        title: Снять блокировку с домена %{domain}
-        undo: Отменить
       undo: Отменить блокировку домена
       view: Посмотреть доменные блокировки
     email_domain_blocks:
       add_new: Добавить новую
+      attempts_over_week:
+        few: "%{count} попытки за последнюю неделю"
+        many: "%{count} попыток за последнюю неделю"
+        one: "%{count} попытка за последнюю неделю"
+        other: "%{count} попыток регистрации за последнюю неделю"
       created_msg: E-mail домен внесён в список блокировки
       delete: Удалить
-      destroyed_msg: Домен убран из списка e-mail блокировки
+      dns:
+        types:
+          mx: Запись MX
       domain: Домен
-      empty: Никакие e-mail домены не блокируются.
-      from_html: с %{domain}
       new:
         create: Создать блокировку
+        resolve: Проверить домен
         title: Новая блокировка по домену
+      no_email_domain_block_selected: Блоки домена электронной почты не были изменены, так как не были выбраны
+      resolved_dns_records_hint_html: Доменное имя устраняется на следующие MX-домены, которые в конечном итоге отвечают за прием электронной почты. Блокировка MX-домена будет блокировать регистрации с любого адреса электронной почты, который использует тот же MX-домен, даже если видимое доменное имя отличается от него. <strong>Будьте осторожны, чтобы не блокировать основных поставщиков электронной почты</strong>
+      resolved_through_html: Разрешено через %{domain}
       title: Блокировка e-mail доменов
+    export_domain_allows:
+      new:
+        title: Импорт домена разрешён
+      no_file: Файл не выбран
+    export_domain_blocks:
+      import:
+        description_html: Вы собираетесь импортировать список блокировок. Пожалуйста, просмотрите список очень внимательно, если вы не сделали этот сами.
+        existing_relationships_warning: Существуют взаимоотношения в виде подписок
+        private_comment_description_html: 'Чтобы помочь вам отслеживать откуда импортируются блокировка, импортированные блокировки будут созданы со следующим приватным комментарием: <q>%{comment}</q>'
+        private_comment_template: Импортировано из %{source} %{date}
+        title: Импорт доменных блокировок
+      new:
+        title: Импорт доменных блокировок
+      no_file: Файл не выбран
     follow_recommendations:
       description_html: "<strong>Следуйте рекомендациям, чтобы помочь новым пользователям быстро находить интересный контент</strong>. Если пользователь не взаимодействовал с другими в достаточной степени, чтобы сформировать персонализированные рекомендации, вместо этого рекомендуется использовать эти учетные записи. Они пересчитываются на ежедневной основе на основе комбинации аккаунтов с наибольшим количеством недавних взаимодействий и наибольшим количеством местных подписчиков для данного языка."
       language: Для языка
@@ -482,45 +469,73 @@ ru:
       title: Рекомендации подписок
       unsuppress: Восстановить рекомендацию
     instances:
+      availability:
+        failure_threshold_reached: Порог отказа достиг %{date}.
+        failures_recorded:
+          few: Попытки неудачны уже %{count} дня.
+          many: Попытки неудачны уже %{count} дней.
+          one: Попытки неудачны %{count} день.
+          other: Попытки неудачны уже %{count} дней.
+        no_failures_recorded: Сбоев в записи нет.
+        title: Доступность
+        warning: Последняя попытка подключения к этому серверу не удалась
       back_to_all: Все узлы
       back_to_limited: Все ограниченные узлы
       back_to_warning: Все узлы требующие внимания
       by_domain: Домен
+      confirm_purge: Вы уверены, что хотите навсегда удалить данные с этого домена?
+      content_policies:
+        comment: Внутренняя заметка
+        description_html: Вы можете определить политики контента, которые будут применяться ко всем учетным записям этого домена и любого из его субдоменов.
+        policies:
+          reject_media: Отклонить медиа
+          reject_reports: Отклонять жалобы
+          silence: Лимит
+          suspend: Приостановить
+        policy: Политика
+        reason: Публичная причина
+        title: Политика контента
+      dashboard:
+        instance_accounts_dimension: Популярные аккаунты
+        instance_accounts_measure: сохраненные учетные записи
+        instance_followers_measure: наши подписчики там
+        instance_follows_measure: их подписчики тут
+        instance_languages_dimension: Популярные языки
+        instance_media_attachments_measure: сохраненные медиафайлы
+        instance_reports_measure: сообщить о них
+        instance_statuses_measure: сохраненные посты
       delivery:
         all: Все
         clear: Очистить ошибки доставки
+        failing: Неудача
         restart: Перезапустить доставку
         stop: Остановить доставку
-        title: По доступности
         unavailable: Недоступные
-        unavailable_message: Доставка невозможна
-        warning: Требующие внимания
-        warning_message:
-          few: Доставка невозможна %{count} дня
-          many: Доставка невозможна %{count} дней
-          one: Доставка невозможна %{count} день
-          other: Доставка невозможна %{count} дня
       delivery_available: Доставка возможна
       delivery_error_days: Дней ошибок доставки
       delivery_error_hint: Если доставка доставка не удастся в течение %{count} дней, он будет автоматически отмечен недоступным для доставки.
+      destroyed_msg: Данные для домена %{domain} поставлены в очередь на удаление.
       empty: Домены не найдены.
       known_accounts:
         few: "%{count} известные учётные записи"
         many: "%{count} известных учётных записей"
         one: "%{count} известная учётная запись"
-        other: "%{count} известных учётных записей"
+        other: "%{count} известная учётная запись"
       moderation:
         all: Все
         limited: Ограниченные
         title: Модерация
       private_comment: Приватный комментарий
       public_comment: Публичный комментарий
+      purge: Удалить данные
+      purge_description_html: Если вы считаете, что этот домен отключен навсегда, вы можете удалить все записи учетной записи и связанные с этим доменом данные из своего хранилища. Это может занять некоторое время.
       title: Федерация
       total_blocked_by_us: Заблокировано нами
       total_followed_by_them: Их подписчиков
       total_followed_by_us: Наших подписчиков
       total_reported: Жалобы на них
       total_storage: Медиафайлы
+      totals_time_period_hint_html: Итоги, показанные ниже, включают данные за всё время.
     invites:
       deactivate_all: Отключить все
       filter:
@@ -544,8 +559,6 @@ ru:
         title: Создать новое IP правило
       no_ip_block_selected: Не было изменено ни одного IP правила, так как не было выбрано ни одного
       title: IP правила
-    pending_accounts:
-      title: Ожидающие учетные записи (%{count})
     relationships:
       title: Связи %{acct}
     relays:
@@ -574,41 +587,125 @@ ru:
           many: "%{count} заметок"
           one: "%{count} заметка"
           other: "%{count} заметок"
-        reports:
-          few: "%{count} жалобы"
-          many: "%{count} жалоб"
-          one: "%{count} жалоба"
-          other: "%{count} жалоб"
+      action_log: Журнал аудита
       action_taken_by: 'Действие предпринято:'
+      actions:
+        delete_description_html: Обжалованные сообщения будут удалены, а претензия - записана, чтобы помочь вам в решении конфликтов при повторных нарушениях со стороны того же аккаунта.
+        mark_as_sensitive_description_html: Весь медиаконтент в обжалованных сообщениях будет отмечен как чувствительный, а претензия - записана, чтобы помочь вам в решении конфликтов при повторных нарушениях со стороны того же аккаунта.
+        other_description_html: Посмотрите больше настроек для контроля поведения учётной записи и наладьте связь с аккаунтом с жалобой.
+        resolve_description_html: Никаких действий не будет выполнено относительно доложенного содержимого. Жалоба будет закрыта.
+        silence_description_html: Профиль будет просматриваем только пользователями, которые уже подписаны на него, либо открыли его вручную. Это действие можно отменить в любой момент.
+        suspend_description_html: Профиль и всё опубликованное в нём содержимое станут недоступны, пока в конечном итоге учётная запись не будет удалена. Пользователи не смогут взаимодействовать с этой учётной записью. Это действие можно отменить в течение 30 дней.
+      actions_description_html: Выберите действие, чтобы решить данную жалобу. Если вы выберите наказание против аккаунта, вы получите уведомление по E-Mail, проверяйте папку <strong>Спам</strong>.
+      add_to_report: Прикрепить ещё
       are_you_sure: Вы уверены?
       assign_to_self: Назначить себе
       assigned: Назначенный модератор
+      by_target_domain: Домен объекта жалобы
+      category: Категория
+      category_description_html: Причина, по которой были доложены этот пользователь или содержимое, будет указана при коммуникации с фигурирующим в жалобе пользователем
       comment:
         none: Нет
+      comment_description_html: 'В дополнение, %{name} добавил(а) следующий комментарий:'
       created_at: Создана
+      delete_and_resolve: Удалить посты
       forwarded: Переслано
       forwarded_to: Переслано на %{domain}
       mark_as_resolved: Отметить как решённую
+      mark_as_sensitive: Отметить как деликатное
       mark_as_unresolved: Отметить как нерешённую
+      no_one_assigned: Никто
       notes:
         create: Добавить заметку
         create_and_resolve: Разрешить с примечанием
         create_and_unresolve: Переоткрыть с примечанием
         delete: Удалить
         placeholder: Опишите, какие действия были приняты, или любые другие подробности…
+        title: Примечания
+      notes_description_html: Просмотрите или оставьте примечания для остальных модераторов и себя в будущем
+      quick_actions_description_html: 'Выберите действие или прокрутите вниз, чтобы увидеть контент с жалобой:'
+      remote_user_placeholder: удаленный пользователь из %{instance}
       reopen: Переоткрыть жалобу
       report: Жалоба №%{id}
       reported_account: Учётная запись нарушителя
       reported_by: Отправитель жалобы
       resolved: Решённые
       resolved_msg: Жалоба обработана, спасибо!
+      skip_to_actions: Перейти к действиям
       status: Статус
-      target_domain: Домен объекта жалобы
+      statuses: Содержимое относящееся к жалобе
+      statuses_description_html: Нарушающее правила содержимое будет процитировано при коммуникации с фигурирующим в жалобе аккаунтом
       target_origin: Происхождение объекта жалобы
       title: Жалобы
       unassign: Снять назначение
       unresolved: Нерешённые
       updated_at: Обновлена
+      view_profile: Открыть профиль
+    roles:
+      add_new: Добавить роль
+      assigned_users:
+        few: "%{count} пользователя"
+        many: "%{count} пользователей"
+        one: "%{count} пользователь"
+        other: "%{count} пользователей"
+      categories:
+        administration: Администрация
+        devops: DevOps
+        invites: Приглашения
+        moderation: Модерация
+        special: Особые
+      delete: Удалить
+      description_html: С помощью <strong>ролей пользователей</strong> вы можете настроить, к каким функциям и областям Mastodon у ваших пользователей будет доступ.
+      edit: Изменить роль '%{name}' '
+      everyone: Разрешения по умолчанию
+      everyone_full_description_html: Это <strong>базовая роль</strong>, касающаяся <strong>всех пользователей</strong>, даже тех, кто не имеет назначенной роли. Все другие роли наследуют разрешения от нее.
+      permissions_count:
+        few: "%{count} разрешения"
+        many: "%{count} разрешений"
+        one: "%{count} разрешение"
+        other: "%{count} разрешений"
+      privileges:
+        administrator: Администратор
+        administrator_description: Пользователи с этим разрешением будут обходить все права
+        delete_user_data: Удалить пользовательские данные
+        delete_user_data_description: Позволяет пользователям удалять данные других пользователей без задержки
+        invite_users: Пригласить пользователей
+        invite_users_description: Позволяет пользователям приглашать новых людей на сервер
+        manage_announcements: Управление объявлениями
+        manage_announcements_description: Позволяет пользователям управлять объявлениями на сервере
+        manage_appeals: Управление апелляциями
+        manage_appeals_description: Позволяет пользователям просматривать апелляции на действия модерации
+        manage_blocks: Управление блоками
+        manage_blocks_description: Позволяет пользователям блокировать домены электронной почты и IP адреса
+        manage_custom_emojis: Управление смайлами
+        manage_custom_emojis_description: Позволяет пользователям управлять пользовательскими эмодзи на сервере
+        manage_federation: Управление Федерацией
+        manage_federation_description: Позволяет пользователям блокировать или разрешить объединение с другими доменами и контролировать возможность доставки
+        manage_invites: Управление приглашениями
+        manage_invites_description: Позволяет пользователям просматривать и деактивировать пригласительные ссылки
+        manage_reports: Управление жалобами
+        manage_reports_description: Позволяет пользователям просматривать жалобы и осуществлять модерацию по ним
+        manage_roles: Управление ролями
+        manage_roles_description: Разрешает пользователям управлять ролями и назначать их
+        manage_rules: Управление правилами
+        manage_rules_description: Разрешает пользователям изменять правила на сервере
+        manage_settings: Управление параметрами
+        manage_settings_description: Разрешает пользователям управлять параметрами сайта
+        manage_taxonomies: Управление трендами
+        manage_taxonomies_description: Позволяет пользователям модерировать список популярного контента и менять настройки хэштегов
+        manage_user_access: Управление правами пользователей
+        manage_user_access_description: Разрешает пользователям отключать двухэтапную аутентификацию другим пользователям, изменять их адрес электронной почты и сбрасывать их пароль
+        manage_users: Управление пользователями
+        manage_users_description: Разрешает пользователям просматривать информацию о других пользователях и применять против них модерацию
+        manage_webhooks: Управление веб-хуками
+        manage_webhooks_description: Разрешает пользователям настраивать веб-хуки для административных событий
+        view_audit_log: Посмотреть журнал аудита
+        view_audit_log_description: Позволяет пользователям просматривать историю административных действий на сервере
+        view_dashboard: Открыть панель управления
+        view_dashboard_description: Разрешает пользователям просматривать статистику сервера
+        view_devops: DevOps
+        view_devops_description: Разрешить пользователям доступ к панелям Sidekiq и pgHero
+      title: Роли
     rules:
       add_new: Добавить правило
       delete: Удалить
@@ -617,142 +714,208 @@ ru:
       empty: Правила сервера еще не определены.
       title: Правила сервера
     settings:
-      activity_api_enabled:
-        desc_html: Подсчёт количества локальных постов, активных пользователей и новых регистраций на еженедельной основе
-        title: Публикация агрегированной статистики активности пользователей
-      bootstrap_timeline_accounts:
-        desc_html: Разделяйте имена пользователей запятыми. Сработает только для локальных незакрытых учётных записей. По умолчанию включены все локальные администраторы.
-        title: Подписки по умолчанию для новых пользователей
-      contact_information:
-        email: Введите публичный e-mail
-        username: Введите имя пользователя
-      custom_css:
-        desc_html: Измените внешний вид с CSS, загружаемым на каждой странице
-        title: Особый CSS
+      about:
+        manage_rules: Управление правилами на сервере
+        preamble: Предоставьте подробную информацию как сервер работает, модерируется, финансируется.
+        rules_hint: Это отдельное место для правил, которыми должны руководствоваться пользователи.
+        title: О нас
+      appearance:
+        preamble: Настройте веб-интерфейс Мастодона.
+        title: Внешний вид
+      branding:
+        preamble: Брендинг вашего сервера отличает его от других серверов сети. Эта информация может отображаться в различных средах, таких как веб-интерфейс Mastodon, нативные приложения, в виде предпросмотра ссылок на других веб-сайтах, в почтовых приложениях и так далее. По этой причине лучше держать эту информацию ясной, короткой и краткой.
+        title: Брендинг
+      content_retention:
+        preamble: Управление сохранением пользовательского контента в Mastodon.
+        title: Хранение контента
       default_noindex:
-        desc_html: Влияет на всех пользователей, которые не изменили эти настройки сами
+        desc_html: Влияет на всех пользователей, которые не изменили эту настройку сами
         title: Исключить пользователей из индексации поисковиками по умолчанию
+      discovery:
+        follow_recommendations: Рекомендации подписок
+        preamble: Наблюдение интересного контента играет важную роль при открытии новых пользователей, которые могут не знать ни одного Mastodon. Контролируйте как работают различные функции обнаружения на вашем сервере.
+        profile_directory: Каталог профилей
+        public_timelines: Публичные ленты
+        title: Обзор
+        trends: Популярное
       domain_blocks:
         all: Всем
         disabled: Никому
-        title: Доменные блокировки
         users: Залогиненным локальным пользователям
-      domain_blocks_rationale:
-        title: Показать обоснование
-      hero:
-        desc_html: Отображается на главной странице. Рекомендуется разрешение не менее 600х100px. Если не установлено, используется изображение узла
-        title: Баннер узла
-      mascot:
-        desc_html: Отображается на различных страницах. Рекомендуется размер не менее 293×205px. Если ничего не выбрано, используется персонаж по умолчанию
-        title: Персонаж сервера
-      peers_api_enabled:
-        desc_html: Домены, которые были замечены этим узлом среди всей федерации
-        title: Публикация списка обнаруженных узлов
-      preview_sensitive_media:
-        desc_html: Предпросмотр для ссылок будет показывать миниатюры даже для содержимого, помеченного как «деликатного характера»
-        title: Показывать медиафайлы «деликатного характера» в превью OpenGraph
-      profile_directory:
-        desc_html: Позволять находить пользователей
-        title: Включить каталог профилей
       registrations:
-        closed_message:
-          desc_html: Отображается на титульной странице, когда закрыта регистрация<br>Можно использовать HTML-теги
-          title: Сообщение о закрытой регистрации
-        deletion:
-          desc_html: Позволяет всем удалять собственные учётные записи
-          title: Разрешить удаление учётных записей
-        min_invite_role:
-          disabled: Никого
-          title: Разрешать приглашения от
-        require_invite_text:
-          desc_html: Когда регистрация требует ручного подтверждения, сделать ответ на вопрос "Почему вы хотите присоединиться?" обязательным, а не опциональным
-          title: Обязать новых пользователей заполнять текст запроса на приглашение
+        preamble: Контролируйте, кто может создать учетную запись на вашем сервере.
+        title: Регистрации
       registrations_mode:
         modes:
           approved: Для регистрации требуется подтверждение
           none: Никто не может регистрироваться
           open: Все могут регистрироваться
-        title: Режим регистраций
-      show_known_fediverse_at_about_page:
-        desc_html: Если включено, показывает посты со всех известных узлов в предпросмотре ленты. В противном случае отображаются только локальные посты.
-        title: Показывать контент со всей федерации в публичной ленте неавторизованным пользователям
-      show_staff_badge:
-        desc_html: Показывать метку персонала на странице пользователя
-        title: Показывать метку персонала
-      site_description:
-        desc_html: Отображается в качестве параграфа на титульной странице и используется в качестве мета-тега.<br>Можно использовать HTML-теги, в особенности <code>&lt;a&gt;</code> и <code>&lt;em&gt;</code>.
-        title: Описание сайта
-      site_description_extended:
-        desc_html: Отображается на странице дополнительной информации<br>Можно использовать HTML-теги
-        title: Расширенное описание узла
-      site_short_description:
-        desc_html: Отображается в боковой панели и в тегах. Опишите, что такое Mastodon и что делает именно этот узел особенным. Если пусто, используется описание узла по умолчанию.
-        title: Краткое описание узла
-      site_terms:
-        desc_html: Вы можете добавить сюда собственную политику конфиденциальности, пользовательское соглашение и другие документы. Можно использовать теги HTML
-        title: Условия использования
-      site_title: Название сайта
-      thumbnail:
-        desc_html: Используется для предпросмотра с помощью OpenGraph и API. Рекомендуется разрешение 1200x630px
-        title: Картинка узла
-      timeline_preview:
-        desc_html: Показывать публичную ленту на приветственной странице
-        title: Предпросмотр ленты
-      title: Настройки сайта
-      trendable_by_default:
-        desc_html: Влияет на хэштеги, которые не были ранее запрещены
-        title: Разрешить добавление хештегов в список актульных без предварительной проверки
-      trends:
-        desc_html: Публично отобразить проверенные хэштеги, актуальные на данный момент
-        title: Популярные хэштеги
+      title: Настройки Сервера
     site_uploads:
       delete: Удалить загруженный файл
       destroyed_msg: Файл успешно удалён.
     statuses:
+      account: Автор
+      application: Заявка
       back_to_account: Назад к учётной записи
+      back_to_report: Вернуться к жалобе
       batch:
-        delete: Удалить
-        nsfw_off: Снять отметку «деликатного характера»
-        nsfw_on: Отметить как «деликатного характера»
+        remove_from_report: Убрать из жалобы
+        report: Пожаловаться
       deleted: Удалено
-      failed_to_execute: Не удалось выполнить
+      favourites: Избранное
+      history: История версий
+      in_reply_to: В ответ
+      language: Язык
       media:
         title: Файлы мультимедиа
-      no_media: Без файлов
+      metadata: Метаданные
       no_status_selected: Ничего не изменилось, так как ни один пост не был выделен
+      open: Открыть запись
+      original_status: Оригинальный пост
+      reblogs: Продвинули
+      status_changed: Пост изменен
       title: Посты пользователя
+      trending: Популярное
+      visibility: Видимость
       with_media: С файлами
+    strikes:
+      actions:
+        delete_statuses: "%{name} удалил(а) посты %{target}"
+        disable: "%{name} заморозил(а) учётную запись %{target}"
+        mark_statuses_as_sensitive: "%{name} отметил(а) %{target} посты как деликатные"
+        none: "%{name} отправил(а) предупреждение %{target}"
+        sensitive: "%{name} отметил(а) учетную запись %{target} как деликатную"
+        silence: "%{name} ограничил(а) учетную запись %{target}"
+        suspend: "%{name} приостановил аккаунт %{target}"
+      appeal_approved: Обжаловано
+      appeal_pending: Обжалование в обработке
     system_checks:
       database_schema_check:
         message_html: Есть отложенные миграции базы данных. Запустите их, чтобы убедиться, что приложение работает должным образом
+      elasticsearch_running_check:
+        message_html: Не удалось подключиться к Elasticsearch. Пожалуйста, проверьте, что он запущен, или отключите полнотекстовый поиск
+      elasticsearch_version_check:
+        message_html: 'Несовместимая версия Elasticsearch: %{value}'
+        version_comparison: Запущен Elasticsearch %{running_version}, а необходим %{required_version}
       rules_check:
         action: Управление правилами сервера
         message_html: Вы не определили правила сервера.
       sidekiq_process_check:
         message_html: Ни один Sidekiq не запущен для %{value} очереди(-ей). Пожалуйста, просмотрите настройки Sidekiq
     tags:
-      accounts_today: Уникальных использований за сегодня
-      accounts_week: Уникальных использований за эту неделю
-      breakdown: Разбивка сегодняшнего использования по источникам
-      last_active: Последняя активность
-      most_popular: Самые популярные
-      most_recent: Последние
-      name: Хэштег
       review: Состояние проверки
-      reviewed: Проверенные
-      title: Хэштеги
-      trending_right_now: Популярно сейчас
-      unique_uses_today: "%{count} чел. пишут об этом"
-      unreviewed: Непроверенные
       updated_msg: Настройки хэштега обновлены
     title: Администрирование
+    trends:
+      allow: Разрешить
+      approved: Принятые
+      disallow: Отклонить
+      links:
+        allow: Разрешить ссылку
+        allow_provider: Разрешить издание
+        description_html: Это ссылки, которыми в настоящее время много пользуются аккаунты, с которых ваш сервер видит сообщения. Это может помочь вашим пользователям узнать, что происходит в мире. Никакие ссылки не отображаются публично, пока вы не одобрите издателя. Вы также можете разрешить или отклонить индивидуальные ссылки.
+        disallow: Запретить ссылку
+        disallow_provider: Отклонить издание
+        no_link_selected: Ссылки не были изменены, так как не были выбраны ни один
+        publishers:
+          no_publisher_selected: Ничего не изменилось, так как ни один издатель не был выбран
+        shared_by_over_week:
+          few: Поделилось %{count} человека за последнюю неделю
+          many: Поделилось %{count} человек за последнюю неделю
+          one: Поделился один человек за последнюю неделю
+          other: Поделился %{count} человек за последнюю неделю
+        title: Актуальные ссылки
+        usage_comparison: Поделились %{today} раз сегодня, по сравнению с %{yesterday} вчера
+      only_allowed: Только разрешенное
+      pending_review: Ожидает рассмотрения
+      preview_card_providers:
+        allowed: Ссылки этого издания могут отображаться в «актуальном»
+        description_html: Это домены, ссылки на которых часто используются на вашем сервере. Ссылки не будут публично прослеживаться до тех пор, пока домен ссылки не будет одобрен. Ваше одобрение (или отклонение) будет распространяться на субдомены.
+        rejected: Ссылки этого издания не будут отображаться в «актуальном»
+        title: Издатели
+      rejected: Отклонённые
+      statuses:
+        allow: Разрешить пост
+        allow_account: Разрешить автора
+        disallow: Запретить пост
+        disallow_account: Запретить автора
+        no_status_selected: Тенденции не были изменены, так как ни одна запись не была выбрана
+        not_discoverable: Автор решил не раскрывать себя
+        shared_by:
+          few: Поделились или добавили в избранное %{friendly_count} раза
+          many: Поделились или добавили в избранное %{friendly_count} раз
+          one: Поделились или добавили в избранное один раз
+          other: Поделились или добавили в избранное %{friendly_count} раз
+        title: Популярные посты
+      tags:
+        current_score: Текущий счет %{score}
+        dashboard:
+          tag_accounts_measure: уникальных использований
+          tag_languages_dimension: Популярные языки
+          tag_servers_dimension: Самые популярные серверы
+          tag_servers_measure: разные сервера
+          tag_uses_measure: всего использований
+        description_html: Это хэштеги, которые сейчас появляются в большом количестве сообщений, которые видит ваш сервер. Это может помочь вашим пользователям узнать о том, что говорят больше всего на данный момент. Хэштеги не отображаются публично до тех пор, пока вы их не подтвердите.
+        listable: Может предлагаться
+        no_tag_selected: Теги небыли изменены, поскольку ни один из них не выбран
+        not_listable: Не будет предлагаться
+        not_trendable: Не будет появляться в списке «актуального»
+        not_usable: Не может использоваться
+        peaked_on_and_decaying: Последний пик — %{date}, сейчас идёт на спад
+        title: Актуальные хэштеги
+        trendable: Может появляться в списке «актуального»
+        trending_rank: 'Популярное #%{rank}'
+        usable: Может использоваться
+        usage_comparison: Использовано %{today} сегодня, для сравнения вчера %{yesterday}
+        used_by_over_week:
+          few: За последнюю неделю использовало %{count} человека
+          many: За последнюю неделю использовало %{count} человек
+          one: За последнюю неделю использовал один человек
+          other: За последнюю неделю использовал %{count} человек
+      title: Популярное
+      trending: Популярное
     warning_presets:
       add_new: Добавить
       delete: Удалить
       edit_preset: Удалить шаблон предупреждения
       empty: Вы еще не определили пресеты предупреждений.
       title: Управление шаблонами предупреждений
+    webhooks:
+      add_new: Добавить конечную точку
+      delete: Удалить
+      description_html: "<strong>Вебхуки</strong> позволяют Mastodon отправлять вашим приложениям <strong>уведомления в реальном времени</strong> о выбранных происходящих событиях, а они могут <strong>обрабатывать их в автоматическом режиме</strong>."
+      disable: Отключить
+      disabled: Отключено
+      edit: Редактировать вебхук
+      empty: У вас пока нет настроенных конечных точек вебхуков.
+      enable: Включить
+      enabled: Активен
+      enabled_events:
+        few: "%{count} события включено"
+        many: "%{count} событий включено"
+        one: "%{count} событие включено"
+        other: "%{count} событий включено"
+      events: События
+      new: Новый вебхук
+      rotate_secret: Сгенерировать новый
+      secret: Ключ подписи
+      status: Состояние
+      title: Вебхуки
+      webhook: Вебхук
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: удалить их посты
+        disable: заморозить их аккаунт
+        mark_statuses_as_sensitive: пометить их посты как деликатного содержимого
+        none: предупреждение
+        sensitive: пометить их аккаунт как деликатного характера
+        silence: ограничить учётную запись
+        suspend: приостановить действие учётной записи
+      body: "%{target} обжалуют решение модератора %{action_taken_by} от %{date}, которое %{type}. Они написали:"
+      next_steps: Вы можете одобрить апелляцию на отмену решения модерации или проигнорировать её.
+      subject: "%{username} обжалует решение модерации на %{instance}"
     new_pending_account:
       body: Ниже указана информация учётной записи. Вы можете одобрить или отклонить заявку.
       subject: Новая учётная запись для рассмотрения на %{instance} (%{username})
@@ -760,9 +923,16 @@ ru:
       body: "%{reporter} подал(а) жалобу на %{target}"
       body_remote: Кто-то с узла %{domain} пожаловался на %{target}
       subject: Новая жалоба, узел %{instance} (№%{id})
-    new_trending_tag:
-      body: 'Хэштег #%{name} актуален сегодня, но не был проверен. Он не будет отображаться публично, если вы не одобрите его, или просто сохраните эту форму как есть, чтоб никогда больше о нём не слышать.'
-      subject: Новый хэштег для проверки на %{instance} (#%{name})
+    new_trends:
+      body: 'Прежде чем можно будет опубликовать, проверьте следующие элементы:'
+      new_trending_links:
+        title: Популярные ссылки
+      new_trending_statuses:
+        title: Популярные посты
+      new_trending_tags:
+        no_approved_tags: На данный момент популярные подтвержденные хэштеги отсутствуют.
+        title: Популярные хэштеги
+      subject: Новые тренды для проверки на %{instance}
   aliases:
     add_new: Создать псевдоним
     created_msg: Новый псевдоним установлен. Теперь мы можете начать миграцию со старой учётной записи.
@@ -778,7 +948,7 @@ ru:
     discovery: Обзор
     localization:
       body: Mastodon переводится добровольцами.
-      guide_link: https://sasha-sorokin.gitlab.io/mastodon-ru/
+      guide_link: https://ru.crowdin.com/project/mastodon
       guide_link_text: Каждый может внести свой вклад.
     sensitive_content: Содержимое деликатного характера
     toot_layout: Структура постов
@@ -792,16 +962,13 @@ ru:
   applications:
     created: Приложение успешно создано
     destroyed: Приложение успешно удалено
-    invalid_url: Введенный URL неверен
     regenerate_token: Повторно сгенерировать токен доступа
     token_regenerated: Токен доступа успешно сгенерирован
     warning: Будьте очень внимательны с этими данными. Не делитесь ими ни с кем!
     your_token: Ваш токен доступа
   auth:
-    apply_for_account: Запросить приглашение
+    apply_for_account: Запросить аккаунт
     change_password: Пароль
-    checkbox_agreement_html: Я соглашаюсь с <a href="%{rules_path}" target="_blank">правилами сервера</a> и <a href="%{terms_path}" target="_blank">Условиями использования</a>
-    checkbox_agreement_without_rules_html: Я согласен с <a href="%{terms_path}" target="_blank">условиями использования</a>
     delete_account: Удалить учётную запись
     delete_account_html: Удалить свою учётную запись <a href="%{path}">можно в два счёта здесь</a>, но прежде у вас будет спрошено подтверждение.
     description:
@@ -814,11 +981,13 @@ ru:
     invalid_reset_password_token: Токен сброса пароля неверен или устарел. Пожалуйста, запросите новый.
     link_to_otp: Введите двухфакторный код с телефона или код восстановления
     link_to_webauth: Используйте устройство с ключом безопасности
+    log_in_with: Войти используя
     login: Войти
     logout: Выйти
     migrate_account: Перенос учётной записи
     migrate_account_html: Завели новую учётную запись? Перенаправьте подписчиков на неё — <a href="%{path}">настройте перенаправление тут</a>.
     or_log_in_with: Или войти с помощью
+    privacy_policy_agreement_html: Мной прочитана и принята <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
     providers:
       cas: CAS
       saml: SAML
@@ -826,20 +995,28 @@ ru:
     registration_closed: "%{instance} не принимает новых участников"
     resend_confirmation: Повторить отправку инструкции для подтверждения
     reset_password: Сбросить пароль
+    rules:
+      preamble: Они устанавливаются и применяются модераторами %{domain}.
+      title: Несколько основных правил.
     security: Безопасность
     set_new_password: Задать новый пароль
     setup:
       email_below_hint_html: Если ниже указан неправильный адрес, вы можете исправить его здесь и получить новое письмо подтверждения.
       email_settings_hint_html: Письмо с подтверждением было отправлено на %{email}. Если адрес указан неправильно, его можно поменять в настройках учётной записи.
       title: Установка
+    sign_in:
+      title: Войти в %{domain}
+    sign_up:
+      preamble: С учётной записью на этом сервере Mastodon вы сможете следить за любым другим пользователем в сети, независимо от того, где размещён их аккаунт.
+      title: Зарегистрируйтесь в %{domain}.
     status:
       account_status: Статус учётной записи
       confirming: Ожидание подтверждения e-mail.
       functional: Ваша учётная запись в полном порядке.
       pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
       redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
+      view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
     too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
-    trouble_logging_in: Не удаётся войти?
     use_security_key: Использовать ключ безопасности
   authorize_follow:
     already_following: Вы уже подписаны на эту учётную запись
@@ -897,10 +1074,36 @@ ru:
       more_details_html: За всеми подробностями, изучите <a href="%{terms_path}">политику конфиденциальности</a>.
       username_available: Ваше имя пользователя снова станет доступным
       username_unavailable: Ваше имя пользователя останется недоступным для использования
-  directories:
-    directory: Каталог профилей
-    explanation: Находите пользователей по интересам
-    explore_mastodon: Изучайте %{title}
+  disputes:
+    strikes:
+      action_taken: Предпринятые меры
+      appeal: Обжаловать
+      appeal_approved: Это замечание было успешно обжаловано и более не действительно
+      appeal_rejected: Апелляция была отклонена
+      appeal_submitted_at: Апелляция отправлена
+      appealed_msg: Ваша апелляция была отправлена. Если она будет одобрена, вы будете уведомлены.
+      appeals:
+        submit: Подать обжалование
+      approve_appeal: Одобрить обжалование
+      associated_report: Связанные обращения
+      created_at: Дата
+      description_html: Это действия против вашей учетной записи и предупреждения, которые были отправлены вам сотрудниками %{instance}.
+      recipient: Адресовано
+      reject_appeal: Отклонить обжалование
+      status: 'Пост #%{id}'
+      status_removed: Пост уже удален из системы
+      title: "%{action} от %{date}"
+      title_actions:
+        delete_statuses: Удаление поста
+        disable: Заморозка аккаунта
+        mark_statuses_as_sensitive: Помечать посты как деликатные
+        none: Требующие внимания
+        sensitive: Отметить учетную запись как деликатную
+        silence: Ограничение учетной записи
+        suspend: Приостановка Аккаунта
+      your_appeal_approved: Ваша апелляция одобрена
+      your_appeal_pending: Вы подали апелляцию
+      your_appeal_rejected: Ваша апелляция отклонена
   domain_validator:
     invalid_domain: не является корректным доменным именем
   errors:
@@ -934,13 +1137,13 @@ ru:
     csv: CSV
     domain_blocks: Доменные блокировки
     lists: Списки
-    mutes: Ваши игнорируемые
+    mutes: Ваши игнорируете
     storage: Ваши файлы
   featured_tags:
     add_new: Добавить
     errors:
       limit: Вы уже добавили максимальное число хэштегов
-    hint_html: "<strong>Особенные хэштеги</strong> отображаются в вашем профиле и позволяют людям просматривать ваши посты, отмеченные ими. Это отличный инструмент для отслеживания долгосрочных проектов и творческих работ."
+    hint_html: "<strong>Избранные хэштеги</strong> отображаются в вашем профиле и позволяют людям быстро найти посты, отмеченные ими. Это отличный инструмент для отслеживания долгосрочных проектов и творческих работ."
   filters:
     contexts:
       account: Посты в профилях
@@ -949,29 +1152,63 @@ ru:
       public: Публичные ленты
       thread: Диалоги
     edit:
+      add_keyword: Добавить ключевое слово
+      keywords: Ключевые слова
+      statuses: Отдельные сообщения
+      statuses_hint_html: Этот фильтр применяется для выбора отдельных постов, независимо от того, соответствуют ли они ключевым словам ниже. <a href="%{path}">Просмотрите или удалите посты из фильтра</a>.
       title: Изменить фильтр
     errors:
+      deprecated_api_multiple_keywords: Эти параметры нельзя изменить из этого приложения, так как применяются к более чем одному ключевому слову фильтра. Используйте более последнее приложение или веб-интерфейс.
       invalid_context: Некорректный контекст или ничего
-      invalid_irreversible: Необратимая фильтрация работает только с лентой уведомлений и домашней лентой
     index:
+      contexts: Фильтры по %{contexts}
       delete: Удалить
       empty: У вас пока нет фильтров.
+      expires_in: Истекает через %{distance}
+      expires_on: Истекает %{date}
+      keywords:
+        few: "%{count} ключевых слова"
+        many: "%{count} ключевых слов"
+        one: "%{count} ключевое слово"
+        other: "%{count} ключевых слов"
+      statuses:
+        few: "%{count} поста"
+        many: "%{count} постов"
+        one: "%{count} пост"
+        other: 'Постов: %{count}'
+      statuses_long:
+        few: Скрыто %{count} отдельных поста
+        many: Скрыто %{count} отдельных постов
+        one: Скрыт %{count} отдельный пост
+        other: 'Скрыто отдельных постов: %{count}'
       title: Фильтры
     new:
+      save: Сохранить новый фильтр
       title: Добавить фильтр
+    statuses:
+      back_to_filter: Вернуться к фильтру
+      batch:
+        remove: Удалить из фильтра
+      index:
+        hint: Этот фильтр применяется для выбора отдельных постов, независимо от других критериев. Вы можете добавить больше записей в этот фильтр из веб-интерфейса.
+        title: Отфильтрованные посты
   footer:
-    developers: Разработчикам
-    more: Ещё…
-    resources: Ссылки
     trending_now: Актуально сейчас
   generic:
     all: Любой
     changes_saved_msg: Изменения успешно сохранены!
     copy: Копировать
     delete: Удалить
-    no_batch_actions_available: На этой странице нет запланированных действий
+    deselect: Снять выделение
+    none: Ничего
     order_by: Сортировка
     save_changes: Сохранить изменения
+    select_all_matching_items:
+      few: Выберите %{count} предмета, совпадающих вашему поисковому запросу.
+      many: Выберите %{count} предметов, совпадающих вашему поисковому запросу.
+      one: Выберите %{count} предмет, совпадающий вашему поисковому запросу.
+      other: Выберите все %{count} предмет(-ов), совпадающий(-их) вашему поисковому запросу.
+    today: сегодня
     validation_errors:
       few: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
       many: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
@@ -979,28 +1216,9 @@ ru:
       other: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
   html_validator:
     invalid_markup: 'невалидная разметка HTML: %{error}'
-  identity_proofs:
-    active: Активно
-    authorize: Да, авторизовать
-    authorize_connection_prompt: Авторизовать эту криптографическую связь?
-    errors:
-      failed: Криптографическое соединение не установлено. Попробуйте ещё раз на %{provider}.
-      keybase:
-        invalid_token: Токены Keybase — это хэши от подписей и должны быть по длине в 66 hex-символов
-        verification_failed: Keybase не распознаёт этот токен как подпись пользователя %{kb_username}. Пожалуйста, повторите на Keybase.
-      wrong_user: Невозможно подтвердить пользователя %{proving}, будучи залогиненным как %{current}. Выполните вход как %{proving} и попробуйте ещё раз.
-    explanation_html: На этой странице отображаются криптографически подтверждённые идентификаторы — например, привязанный профиль Keybase. Это позволяет людям отправлять вам зашифрованные сообщения, а также доверять вашим постам.
-    i_am_html: Я %{username} на %{service}.
-    identity: Идентификатор
-    inactive: Неактивно
-    publicize_checkbox: 'И опубликуйте текст:'
-    publicize_toot: 'Подтверждено! Я %{username} на %{service}: %{url}'
-    remove: Удалить идентификатор
-    removed: Идентификатор учётной записи удалён
-    status: Статус
-    view_proof: Посмотреть подтверждение
   imports:
     errors:
+      invalid_csv_file: 'Неверный файл CSV. Ошибка: %{error}'
       over_rows_processing_limit: содержит более %{count} строк
     modes:
       merge: Объединить
@@ -1016,7 +1234,6 @@ ru:
       following: Подписки
       muting: Список глушения
     upload: Загрузить
-  in_memoriam_html: В память о пользователе.
   invites:
     delete: Удалить
     expired: Истекло
@@ -1031,10 +1248,10 @@ ru:
     generate: Сгенерировать
     invited_by: 'Вас пригласил(а):'
     max_uses:
-      few: "%{count} исп."
-      many: "%{count} исп."
-      one: 1 исп
-      other: "%{count} исп"
+      few: "%{count} раза"
+      many: "%{count} раз"
+      one: "%{count} раз"
+      other: "%{count} раза"
     max_uses_prompt: Без ограничения
     prompt: Создавайте и делитесь ссылками с другими, чтобы предоставить им доступом к этому узлу.
     table:
@@ -1095,24 +1312,16 @@ ru:
     title: Модерация
   move_handler:
     carry_blocks_over_text: Этот пользователь переехал с учётной записи %{acct}, которую вы заблокировали.
-    carry_mutes_over_text: Этот пользователь переехал с учётной записи %{acct}, которую вы добавили в список игнорирования.
+    carry_mutes_over_text: Этот пользователь перешёл с учётной записи %{acct}, которую вы игнорируете.
     copy_account_note_text: 'Этот пользователь переехал с %{acct}, вот ваша предыдущая заметка о нём:'
+  navigation:
+    toggle_menu: Переключить меню
   notification_mailer:
-    digest:
-      action: Просмотреть все уведомления
-      body: Вот краткая сводка сообщений, которые вы пропустили с последнего захода %{since}
-      mention: "%{name} упомянул(а) Вас в:"
-      new_followers_summary:
-        few: У вас появилось %{count} новых подписчика! Отлично!
-        many: У вас появилось %{count} новых подписчиков! Отлично!
-        one: Также, пока вас не было, у вас появился новый подписчик! Ура!
-        other: Также, пока вас не было, у вас появилось %{count} новых подписчиков! Отлично!
-      subject:
-        few: "%{count} новых уведомления с вашего последнего захода \U0001F418"
-        many: "%{count} новых уведомлений с вашего последнего захода \U0001F418"
-        one: "%{count} новое уведомление с вашего последнего захода \U0001F418"
-        other: "%{count} новых уведомлений с вашего последнего захода \U0001F418"
-      title: В ваше отсутствие…
+    admin:
+      report:
+        subject: "%{name} отправил жалобу"
+      sign_up:
+        subject: "%{name} зарегистрирован"
     favourite:
       body: "%{name} добавил(а) ваш пост в избранное:"
       subject: "%{name} добавил(а) ваш пост в избранное"
@@ -1139,6 +1348,8 @@ ru:
       title: Новое продвижение
     status:
       subject: "%{name} только что запостил(а)"
+    update:
+      subject: "%{name} изменил(а) пост"
   notifications:
     email_events: События для e-mail уведомлений
     email_events_hint: 'Выберите события, для которых вы хотели бы получать уведомления:'
@@ -1182,6 +1393,8 @@ ru:
     other: Остальное
     posting_defaults: Настройки отправки по умолчанию
     public_timelines: Публичные ленты
+  privacy_policy:
+    title: Политика конфиденциальности
   reactions:
     errors:
       limit_reached: Достигнут лимит разных реакций
@@ -1204,22 +1417,15 @@ ru:
     remove_selected_follows: Отписаться от выбранных пользователей
     status: Статус учётной записи
   remote_follow:
-    acct: Введите свой username@domain для продолжения
     missing_resource: Поиск требуемого перенаправления URL для Вашей учётной записи завершился неудачей
-    no_account_html: Нет учётной записи? Вы можете <a href='%{sign_up_path}' target='_blank'>зарегистрироваться здесь</a>
-    proceed: Продолжить подписку
-    prompt: 'Вы хотите подписаться на:'
-    reason_html: "<strong>Почему это необходимо?</strong> Возможно, <code>%{instance}</code> не является узлом, на котором вы зарегистрированы, поэтому нам сперва нужно перенаправить вас на домашний узел."
-  remote_interaction:
-    favourite:
-      proceed: Добавить в избранное
-      prompt: 'Вы собираетесь добавить в избранное следующий пост:'
-    reblog:
-      proceed: Продвинуть пост
-      prompt: 'Вы хотите продвинуть этот пост:'
-    reply:
-      proceed: Ответить
-      prompt: 'Вы собираетесь ответить на этот пост:'
+  reports:
+    errors:
+      invalid_rules: не ссылается на действительные правила
+  rss:
+    content_warning: 'Предупреждение о содержании:'
+    descriptions:
+      account: Публичные посты @%{acct}
+      tag: 'Публичные посты отмеченные хэштегом #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
     over_total_limit: Вы превысили лимит на %{limit} запланированных постов
@@ -1243,7 +1449,7 @@ ru:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Текущая сессия
     description: "%{browser} на %{platform}"
@@ -1252,7 +1458,7 @@ ru:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1274,11 +1480,10 @@ ru:
     authorized_apps: Приложения
     back: Назад в Mastodon
     delete: Удаление учётной записи
-    development: Разработка
+    development: Разработчикам
     edit_profile: Изменить профиль
     export: Экспорт данных
-    featured_tags: Особенные хэштеги
-    identity_proofs: Идентификация
+    featured_tags: Избранные хэштеги
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
@@ -1287,6 +1492,7 @@ ru:
     profile: Профиль
     relationships: Подписки и подписчики
     statuses_cleanup: Авто-удаление постов
+    strikes: Замечания модерации
     two_factor_authentication: Подтверждение входа
     webauthn_authentication: Ключи безопасности
   statuses:
@@ -1309,20 +1515,21 @@ ru:
         other: "%{count} видео"
     boosted_from_html: Продвижение польз. %{acct_link}
     content_warning: 'Спойлер: %{warning}'
+    default_language: Тот же, что язык интерфейса
     disallowed_hashtags:
       few: 'содержались запрещённые хэштеги: %{tags}'
       many: 'содержались запрещённые хэштеги: %{tags}'
       one: 'содержался запрещённый хэштег: %{tags}'
       other: 'содержались запрещённые хэштеги: %{tags}'
+    edited_at_html: Редактировано %{date}
     errors:
       in_reply_not_found: Пост, на который вы пытаетесь ответить, не существует или удалён.
-    language_detection: Определять язык автоматически
     open_in_web: Открыть в веб-версии
     over_character_limit: превышен лимит символов (%{max})
     pin_errors:
+      direct: Сообщения, видимые только упомянутым пользователям, не могут быть закреплены
       limit: Вы закрепили максимально возможное число постов
       ownership: Нельзя закрепить чужой пост
-      private: Нельзя закрепить непубличный пост
       reblog: Нельзя закрепить продвинутый пост
     poll:
       total_people:
@@ -1352,23 +1559,23 @@ ru:
       unlisted_long: Показывать всем, но не отображать в публичных лентах
   statuses_cleanup:
     enabled: Автоматически удалять устаревшие посты
-    enabled_hint: Автоматически удаляет ваши посты после того, как они достигли определённого возраста, за некоторыми исключениями ниже.
+    enabled_hint: Автоматически удаляет ваши посты после того, как они достигли определённого возрастного порога, за некоторыми исключениями ниже.
     exceptions: Исключения
-    explanation: Из-за того, что удаление постов — это ресурсоёмкий процесс, оно производится медленно со временем, когда сервер менее всего занят. По этой причине, посты могут удаляться не сразу, а спустя определённое время, по достижению возрастного порога.
-    ignore_favs: Игнорировать отметки «избранного»
+    explanation: Из-за того, что удаление постов — это ресурсоёмкий процесс, оно производится медленно со временем, когда сервер менее всего загружен. По этой причине, посты могут удаляться не сразу, а спустя определённое время, по достижению возрастного порога.
+    ignore_favs: Игнорировать избранное
     ignore_reblogs: Игнорировать продвижения
     interaction_exceptions: Исключения на основе взаимодействий
     interaction_exceptions_explanation: 'Обратите внимание: нет никаких гарантий, что посты будут удалены, после того, как они единожды перешли порог по отметкам «избранного» или продвижений.'
     keep_direct: Не удалять адресованные посты
     keep_direct_hint: Не удалять ваши посты с «адресованной» видимостью.
     keep_media: Не удалять посты с вложениями
-    keep_media_hint: Не удалять ваши посты, содержащие любые медийные вложения
+    keep_media_hint: Не удалять ваши посты, содержащие любые медийные вложения.
     keep_pinned: Не удалять закреплённые посты
     keep_pinned_hint: Не удалять ваши посты, которые закреплены в профиле.
     keep_polls: Не удалять опросы
     keep_polls_hint: Не удалять ваши посты с опросами.
     keep_self_bookmark: Не удалять закладки
-    keep_self_bookmark_hint: Не удалять ваши посты с закладками
+    keep_self_bookmark_hint: Не удалять ваши посты с закладками.
     keep_self_fav: Оставить посты, отмеченные «избранными»
     keep_self_fav_hint: Не удалять ваши посты, если вы отметили их как «избранные».
     min_age:
@@ -1377,98 +1584,23 @@ ru:
       '2629746': 1 месяц
       '31556952': 1 год
       '5259492': 2 месяца
+      '604800': 1 неделя
       '63113904': 2 года
       '7889238': 3 месяца
     min_age_label: Возрастной порог
     min_favs: Порог отметок «избранного»
-    min_favs_hint: Не удаляет ваши посты, которые получили отметок «избранного» больше, чем указано выше. Оставьте поле пустым, чтобы удалять посты независимо от количества отметок.
+    min_favs_hint: Не удаляет ваши посты, у которых количество отметок «избранного» достигло указанного выше значения. Оставьте поле пустым, чтобы удалять посты независимо от количества отметок.
     min_reblogs: Порог продвижений
-    min_reblogs_hint: Не удаляет ваши посты, количество продвижений которых больше, чем указано выше. Оставьте поле пустым, чтобы удалять посты независимо от количества продвижений.
+    min_reblogs_hint: Не удаляет ваши посты, количество продвижений которых достигло указанного выше значения. Оставьте поле пустым, чтобы удалять посты независимо от количества продвижений.
   stream_entries:
     pinned: Закреплённый пост
     reblogged: продвинул(а)
     sensitive_content: Содержимое деликатного характера
+  strikes:
+    errors:
+      too_late: Слишком поздно обжаловать это замечание
   tags:
     does_not_match_previous_name: не совпадает с предыдущим именем
-  terms:
-    body_html: |
-      <h2>Privacy Policy</h2>
-      <h3 id="collect">What information do we collect?</h3>
-
-      <ul>
-      <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
-      <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3>
-
-      <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: Условия обслуживания и политика конфиденциальности %{instance}
   themes:
     contrast: Mastodon (высококонтрастная)
     default: Mastodon (тёмная)
@@ -1477,6 +1609,7 @@ ru:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%m.%Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Добавить
     disable: Отключить
@@ -1493,65 +1626,75 @@ ru:
     recovery_instructions_html: 'Пожалуйста, сохраните коды ниже в надёжном месте: они понадобятся, чтобы войти в учётную запись, если вы потеряете доступ к своему смартфону. Вы можете вручную переписать их, распечатать и спрятать среди важных документов или, например, в любимой книжке. <strong>Каждый код действителен только один раз</strong>.'
     webauthn: Ключи безопасности
   user_mailer:
+    appeal_approved:
+      action: Перейти к своему профилю
+      explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
+      subject: Ваше обжалование от %{date} была одобрено
+      title: Обжалование одобрено
+    appeal_rejected:
+      explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись восстановлена.
+      subject: Ваше обжалование от %{date} отклонено
+      title: Обжалование отклонено
     backup_ready:
       explanation: Вы запросили архив всех данных вашей учётной записи Mastodon. Что ж, он готов к скачиванию.
       subject: Ваш архив готов к загрузке
       title: Архив ваших данных готов
-    sign_in_token:
-      details: 'Вот подробная информация о попытке:'
-      explanation: 'Мы обнаружили попытку войти в вашу учётную запись с нераспознанного IP-адреса. Если это вы, введите код безопасности ниже на странице вызова:'
-      further_actions: 'Если это были не вы, пожалуйста, смените пароль и включите двухфакторную аутентификацию для вашей учётной записи. Вы можете сделать это здесь:'
-      subject: Пожалуйста, подтвердите попытку входа
-      title: Попытка входа
+    suspicious_sign_in:
+      change_password: сменить пароль
+      details: 'Подробности о новом входе:'
+      explanation: Мы заметили вход в вашу учётную запись с нового IP-адреса.
+      further_actions_html: Если это были не вы, рекомендуем вам немедленно %{action} и включить двухфакторную авторизацию, чтобы обезопасить свою учётную запись.
+      subject: В вашу учётную запись был выполнен вход с нового IP-адреса
+      title: Выполнен вход
     warning:
+      appeal: Обжаловать
+      appeal_description: Если вы считаете, что это ошибка, вы можете обратиться к поддержке %{instance}.
+      categories:
+        spam: Спам
+        violation: Содержимое нарушает следующие правила сообщества
       explanation:
-        disable: Пока ваша учётная запись заморожена, ваши данные остаются нетронутыми, но вы не можете производить никаких действий до разблокировки.
-        sensitive: Все загружаемые и прикреплённые вами медиафайлы будут расцениваться как «деликатного характера».
-        silence: Пока действуют данные ограничения, публикуемые вами посты будут видеть исключительно люди, которые на вас уже подписаны на этом узле, вы также можете быть исключены из различных публичных лент. Несмотря на это, остальные пользователи по-прежнему могут подписаться на вас, чтобы читать новые посты.
-        suspend: Ваша учётная запись заблокирована и все ваши посты и загруженные медиафайлы безвозвратно удалены с этого сервера и других серверов, где у вас были подписчики.
-      get_in_touch: Вы можете ответить на это письмо, чтобы связаться с сотрудниками %{instance}.
-      review_server_policies: Посмотреть правила сервера
-      statuses: 'В частности, для:'
+        delete_statuses: Было обнаружено, что некоторые из ваших постов нарушают одно или несколько правил сообщества, и они были удалены модераторами %{instance}.
+        disable: Вы не можете использовать свою учётную запись, однако ваш профиль и данные остаются нетронутыми. Вы можете запросить выгрузку своих данных, менять настройки, либо полностью удалить свою учётную запись.
+        mark_statuses_as_sensitive: Некоторые из ваших сообщений были отмечены модераторами %{instance} как деликатные. Это означает, что людям нужно будет нажать на медиа в сообщениях, прежде чем будет показан предпросмотр. При публикации в будущем вы можете помечать медиафайлы как деликатные самостоятельно.
+        sensitive: С этого момента, все прикрепляемые вами файлы будут отмечаться как «деликатного характера» и скрыты за предупреждением, требующими клика.
+        silence: Вы по-прежнему можете использовать свою учётную запись, но только пользователи, которые подписаны на вас, смогут видеть ваши публикации на данном узле. Вы также будете исключены из различных поисковых функций, однако пользователи всё ещё могут вручную подписаться на вас.
+        suspend: Вы больше не сможете использовать эту учётную запись и ваш профиль более недоступен к просмотру. Вы по-прежнему можете войти в учётную запись, чтобы запросить выгрузку своих данных, до тех пор, пока они не будут удалены спустя 30 дней (за исключением информации, которая не позволит вам обойти эту блокировку).
+      reason: 'Причина:'
+      statuses: 'Цитируемые посты:'
       subject:
+        delete_statuses: Опубликованные вами с учётной записи %{acct} посты были удалены
         disable: Ваша учётная запись %{acct} заморожена
+        mark_statuses_as_sensitive: Ваши сообщения в %{acct} были отмечены как деликатные
         none: "%{acct} вынесено предупреждение"
-        sensitive: Ваша учётная запись %{acct} была отмечена как «деликатного содержания»
+        sensitive: Ваши сообщения в %{acct} будут отмечены с этого момента как деликатные
         silence: На учётную запись %{acct} наложены ограничения
         suspend: Ваша учётная запись %{acct} была заблокирована
       title:
+        delete_statuses: Ваши посты удалены
         disable: Учётная запись заморожена
+        mark_statuses_as_sensitive: Посты, отмеченные как деликатные
         none: Предупреждение
-        sensitive: Ваши медиафайлы отмечены как «деликатного характера»
+        sensitive: Учетная запись отмечена как деликатная
         silence: На учётную запись наложены ограничения
         suspend: Учётная запись заблокирована
     welcome:
       edit_profile_action: Настроить профиль
-      edit_profile_step: Настройте свой профиль, загрузив аватарку, шапку, изменив отображаемое имя и ещё много чего. Если вы хотите вручную рассматривать и подтверждать подписчиков, можно закрыть свою учётную запись.
-      explanation: Несколько советов для новичков
+      edit_profile_step: Вы можете настроить свой профиль добавляя аватарку, изменяя отображаемое имя и так далее. Вы можете вручную подтверждать подписчиков, перед тем как им будет разрешено подписаться на вас.
+      explanation: Вот несколько советов для новичков
       final_action: Начать постить
-      final_step: 'Начните постить! Ваши публичные посты могут видеть другие, например, в локальной ленте или по хэштегам, даже если у вас нет подписчиков. Вы также можете поздороваться с остальными и представиться, используя хэштег #приветствие.'
+      final_step: 'Начинайте постить! Даже без подписчиков, ваши публичные посты могут быть увиденными другими, например в локальной ленте или в хештегах. Вы можете представиться с хэштегом #introductions.'
       full_handle: Ваше обращение
       full_handle_hint: То, что Вы хотите сообщить своим друзьям, чтобы они могли написать Вам или подписаться с другого узла.
-      review_preferences_action: Изменить настройки
-      review_preferences_step: Проверьте все настройки, например, какие письма вы хотите получать или уровень приватности постов по умолчанию. Если вы не страдаете морской болезнью, можете включить автовоспроизведение GIF.
       subject: Добро пожаловать в Mastodon
-      tip_federated_timeline: В глобальной ленте отображается сеть Mastodon. Но в ней показаны посты только от людей, на которых подписаны вы и ваши соседи, поэтому лента может быть неполной.
-      tip_following: По умолчанию вы подписаны на администратора(-ов) вашего узла. Чтобы найти других интересных людей, проверьте локальную и глобальную ленты.
-      tip_local_timeline: В локальной ленте показаны посты от людей с %{instance}. Это ваши непосредственные соседи!
-      tip_mobile_webapp: Если ваш мобильный браузер предлагает добавить иконку Mastodon на домашний экран, то вы можете получать push-уведомления. Прямо как полноценное приложение!
-      tips: Советы
       title: Добро пожаловать на борт, %{name}!
   users:
     follow_limit_reached: Вы не можете подписаться больше, чем на %{limit} человек
-    generic_access_help_html: Не можете войти в свою учётную запись? Свяжитесь с %{email} для помощи
     invalid_otp_token: Введен неверный код двухфакторной аутентификации
-    invalid_sign_in_token: Неверный код безопасности
     otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
     seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
     signed_in_as: 'Выполнен вход под именем:'
-    suspicious_sign_in_confirmation: Похоже, вы раньше не входили с этого устройства, и давно не осуществляли вход, поэтому мы отправили вам код безопасности на почту, чтобы подтвердить, что это действительно вы.
   verification:
-    explanation_html: 'Владение ссылками в профиле <strong>можно подтвердить</strong>. Для этого на указанном сайте должна содержаться ссылка на ваш профиль Mastodon, а у самой ссылки <strong>должен</strong> быть атрибут <code>rel="me"</code>. Что внутри ссылки — значения не имеет. Вот вам пример ссылки:'
+    explanation_html: 'Вы можете <strong>подтвердить владение</strong> любой из ссылок в таблице. Для этого страница по ссылке должна содержать обратную ссылку на ваш профиль Mastodon, а у самой ссылки <strong>должен</strong> атрибут <code>rel="me"</code>. Текст ссылки значения не имеет. Вот пример:'
     verification: Верификация ссылок
   webauthn_credentials:
     add: Добавить новый ключ безопасности
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 3e74319e8..3c6149be1 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1,90 +1,26 @@
 ---
 sc:
   about:
-    about_hashtag_html: Custos sunt tuts pùblicos etichetados cun <strong>#%{hashtag}</strong>. Bi podes intrare in cuntatu si tenes unu contu in cale si siat logu de su fediversu.
     about_mastodon_html: 'Sa rete sotziale de su benidore: sena publitzidade, sena vigilàntzia corporativa, disinnu èticu e detzentralizatzione! Sias mere de is datos tuos cun Mastodon!'
-    about_this: Informatziones
-    active_count_after: ativu
-    active_footnote: Utentes cun atividade mensile (UAM)
-    administered_by: 'Amministradu dae:'
-    api: API
-    apps: Aplicatziones mòbiles
-    apps_platforms: Imprea Mastodon dae iOS, Android e àteras prataformas
-    browse_directory: Nàviga in su diretòriu de profilos e filtra segundu interessos
-    browse_local_posts: Nàviga in unu flussu in direta de messàgios pùblicos de custu serbidore
-    browse_public_posts: Nàviga in unu flussu in direta de messàgios pùblicos in Mastodon
-    contact: Cuntatu
     contact_missing: No cunfiguradu
     contact_unavailable: No a disponimentu
-    discover_users: Iscoberi utentes
-    documentation: Documentatzione
-    federation_hint_html: Cun unu contu in %{instance} as a pòdere sighire persones in cale si siat serbidore de Mastodon o de su fediversu.
-    get_apps: Proa un'aplicatzione mòbile
     hosted_on: Mastodon allogiadu in %{domain}
-    instance_actor_flash: Custu contu est un'atore virtuale impreadu pro rapresentare su pròpiu serbidore, no est un'utente individuale. Benit impreadu pro punnas de federatzione e no ddu dias dèpere blocare si non boles blocare su domìniu intreu, e in cussu casu dias dèpere impreare unu blocu de domìniu.
-    learn_more: Àteras informatziones
-    privacy_policy: Polìtica de riservadesa
-    rules: Règulas de su serbidore
-    rules_html: 'Depes sighire is règulas imbenientes si boles tènnere unu contu in custu serbidore de Mastodon:'
-    see_whats_happening: Càstia su chi est acontessende
-    server_stats: 'Istatìsticas de su serbidore:'
-    source_code: Còdighe de orìgine
-    status_count_after:
-      one: istadu
-      other: istados
-    status_count_before: Atributzione de
-    tagline: Sighi is amistades tuas e iscoberi·nde àteras
-    terms: Cunditziones de su servìtziu
-    unavailable_content: Serbidores moderados
-    unavailable_content_description:
-      domain: Serbidore
-      reason: Resone
-      rejecting_media: 'Is documentos multimediales de custos serbidores no ant a èssere protzessados o sarvados e peruna miniadura at a èssere ammustrada, ca tenent bisòngiu de unu clic manuale in su documentu originale:'
-      rejecting_media_title: Cuntenutos multimediales filtrados
-      silenced: 'Is messàgios dae custos serbidores ant a èssere cuados in is lìnias de tempus e is arresonadas pùblicas, e no at a èssere generada peruna notìfica dae is interatziones de is utentes, francu chi nde sias sighende:'
-      silenced_title: Serbidores a sa muda
-      suspended: 'Perunu datu de custos serbidores at a èssere protzessadu, immagasinadu o cuncambiadu; est impossìbile duncas cale si siat interatzione o comunicatzione cun is utentes de custos serbidores:'
-      suspended_title: Serbidores suspèndidos
-    unavailable_content_html: Mastodon ti permitit de bìdere su cuntenutu de utentes de cale si siat àteru serbidore de su fediversu. Custas sunt etzetziones fatas in custu serbidore ispetzìficu.
-    user_count_after:
-      one: utente
-      other: utentes
-    user_count_before: Allogiadu dae
-    what_is_mastodon: Ite est Mastodon?
   accounts:
-    choices_html: 'Sèberos de %{name}:'
-    endorsements_hint: Podes cussigiare gente chi sighis dae s'interfache web, e at a aparèssere inoghe.
-    featured_tags_hint: Podes evidentziare etichetas ispetzìficas chi ant a èssere ammustradas inoghe.
     follow: Sighi
     followers:
       one: Sighidura
       other: Sighiduras
     following: Sighende
     instance_actor_flash: Custu contu est un'atore virtuale chi costumaiat a rapresentare su serbidore etotu e nono unu cale si siat utente individuale. Est impreadu pro finalidades de sa federatzione e non si depet suspèndere.
-    joined: At aderidu su %{date}
     last_active: ùrtima atividade
     link_verified_on: Sa propiedade de custu ligàmene est istada controllada su %{date}
-    media: Elementos multimediales
-    moved_html: "%{name} est istadu trasferidu a %{new_profile_link}:"
-    network_hidden: Custa informatzione no est a disponimentu
-    never_active: Mai
     nothing_here: Nudda inoghe.
-    people_followed_by: Gente sighida dae %{name}
-    people_who_follow: Gente chi sighit a %{name}
     pin_errors:
       following: Depes sighire sa persone chi boles promòvere
     posts:
       one: Tut
       other: Tuts
     posts_tab_heading: Tuts
-    posts_with_replies: Tuts e rispostas
-    roles:
-      admin: Admin
-      bot: Bot
-      group: Grupu
-      moderator: Moderatzione
-    unavailable: Su profilu no est a disponimentu
-    unfollow: Non sigas prus
   admin:
     account_actions:
       action: Faghe un'atzione
@@ -92,18 +28,15 @@ sc:
     account_moderation_notes:
       create: Lassa una nota
       created_msg: As creadu una nota de moderatzione.
-      delete: Cantzella
       destroyed_msg: As cantzelladu una nota de moderatzione.
     accounts:
       add_email_domain_block: Bloca domìniu de posta eletrònica
       approve: Aprova
-      approve_all: Aprova totus
       approved_msg: Sa dimanda de registru de %{username} est istada aprovada
       are_you_sure: Seguru?
       avatar: Immàgine de profilu
       by_domain: Domìniu
       change_email:
-        changed_msg: As cambiadu s'indiritzu eletrònicu.
         current_email: Indiritzu eletrònicu atuale
         label: Muda s'indiritzu eletrònicu
         new_email: Indiritzu eletrònicu nou
@@ -149,7 +82,6 @@ sc:
         active: Ativu
         all: Totus
         pending: De imbiare
-        silenced: A sa muda
         suspended: Suspèndidu
         title: Moderatzione
       moderation_notes: Notas de moderatzione
@@ -167,7 +99,6 @@ sc:
       redownload: Atualiza su profilu
       redownloaded_msg: Su profilu de %{username} est istadu atualizadu dae s'orìgine
       reject: Refuda
-      reject_all: Refuda totu
       rejected_msg: Sa dimanda de registru de %{username} est istada refudada
       remove_avatar: Boga immàgine de profilu
       remove_header: Boga s'intestatzione
@@ -180,12 +111,6 @@ sc:
       reset: Reseta
       reset_password: Reseta sa crae
       resubscribe: Torra a sutascrìere
-      role: Permissos
-      roles:
-        admin: Amministratzione
-        moderator: Moderatzione
-        staff: Personale
-        user: Utente
       search: Chirca
       search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
       search_same_ip: Àteras persones cun sa pròpiu IP
@@ -202,7 +127,6 @@ sc:
       suspended: Suspèndidu
       suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversìbile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
       suspension_reversible_hint_html: Su contu est istadu suspèndidu, e is datos ant a èssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fàghere inoghe in bassu.
-      time_in_queue: Isetende in coa %{time}
       title: Contos
       unconfirmed_email: Posta eletrònica sena cunfirmare
       undo_sensitized: Boga sa marcadura comente "sensìbile"
@@ -271,7 +195,6 @@ sc:
         create_ip_block_html: "%{name} at creadu una règula pro s'IP %{target}"
         demote_user_html: "%{name} at degradadu s'utente %{target}"
         destroy_announcement_html: "%{name} at cantzelladu s'annùntziu %{target}"
-        destroy_custom_emoji_html: "%{name} at cantzelladu s'emoji %{target}"
         destroy_domain_allow_html: "%{name} no at permìtidu sa federatzione cun su domìniu %{target}"
         destroy_domain_block_html: "%{name} at isblocadu su domìniu %{target}"
         destroy_email_domain_block_html: "%{name} at isblocadu su domìniu de posta eletrònica %{target}"
@@ -299,7 +222,6 @@ sc:
         update_custom_emoji_html: "%{name} at atualizadu s'emoji %{target}"
         update_domain_block_html: "%{name} at atualizadu su blocu de domìniu pro %{target}"
         update_status_html: "%{name} at atualizadu sa publicatzione de %{target}"
-      deleted_status: "(istadu cantzelladu)"
       empty: Perunu registru agatadu.
       filter_by_action: Filtra pro atzione
       filter_by_user: Filtra pro utente
@@ -338,7 +260,6 @@ sc:
       enable: Ativa
       enabled: Ativadu
       enabled_msg: As ativadu s'emoji
-      image_hint: PNG de finas a 50 KB
       list: Lista
       listed: Listadu
       new:
@@ -374,9 +295,7 @@ sc:
         create: Crea unu blocu
         hint: Su blocu de domìniu no at a impedire sa creatzione de contos noos in sa base de datos, ma ant a èssere aplicados in manera retroativa mètodos de moderatzione ispetzìficos subra custos contos.
         severity:
-          desc_html: "<strong>A sa muda</strong> at a pònnere is messàgios de custos contos comente invisìbiles a sa gente chi no ddos siat sighende. <strong>Sa suspensione</strong> at a cantzellare totu su cuntenutu de su contu, elementos multimediales e datos de profilu. Imprea <strong>Perunu</strong> si boles isceti refudare is archìvios multimediales."
           noop: Perunu
-          silence: A sa muda
           suspend: Suspensione
         title: Blocu de domìniu nou
       obfuscate: Cua su nòmine de domìniu
@@ -389,30 +308,13 @@ sc:
       reject_media_hint: Cantzellat elementos multimediales sarvados in locale e refudat iscarrigamentos in su benidore. Non rilevante pro is suspensiones
       reject_reports: Refuda informes
       reject_reports_hint: Iscarta informes chi benint de custu domìniu. Non rilevante pro is suspensiones
-      rejecting_media: refudende documentos multimediales
-      rejecting_reports: refudende informes
-      severity:
-        silence: a sa muda
-        suspend: suspèndidu
-      show:
-        affected_accounts:
-          one: Unu contu de sa base de datos implicadu
-          other: "%{count} contos de sa base de datos implicados"
-        retroactive:
-          silence: Boga de is contos a sa muda is contos de custu domìniu implicados
-          suspend: Boga sa suspensione de is contos de custu domìniu implicados
-        title: Iscontza su blocu de domìniu de %{domain}
-        undo: Iscontza
       undo: Iscontza su blocu de domìniu
       view: Bide su blocu de domìniu
     email_domain_blocks:
       add_new: Agiunghe nou
       created_msg: Domìniu de posta eletrònica blocadu
       delete: Cantzella
-      destroyed_msg: Domìniu de posta eletrònica isblocadu
       domain: Domìniu
-      empty: Perunu domìniu de posta eletrònica blocadu.
-      from_html: dae %{domain}
       new:
         create: Agiunghe unu domìniu
         title: Bloca su domìniu de posta eletrònica nou
@@ -429,9 +331,6 @@ sc:
       by_domain: Domìniu
       delivery_available: Sa cunsigna est a disponimentu
       empty: Perunu domìniu agatadu.
-      known_accounts:
-        one: "%{count} contu connòschidu"
-        other: "%{count} contos connòschidos"
       moderation:
         all: Totus
         limited: Limitadas
@@ -467,8 +366,6 @@ sc:
         title: Crea una règula IP noa
       no_ip_block_selected: Peruna règula IP est istada mudada dae chi non nd'as seletzionadu
       title: Règulas IP
-    pending_accounts:
-      title: Contos in ispera (%{count})
     relationships:
       title: relatziones de %{acct}
     relays:
@@ -495,13 +392,11 @@ sc:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
-        reports:
-          one: "%{count} informe"
-          other: "%{count} informes"
       action_taken_by: Mesuras adotadas dae
       are_you_sure: Seguru?
       assign_to_self: Assigna a mie
       assigned: Moderatzione assignada
+      by_target_domain: Domìniu de su contu signaladu
       comment:
         none: Perunu
       created_at: Sinnaladu
@@ -522,7 +417,6 @@ sc:
       resolved: Isòrvidu
       resolved_msg: Informe isòrvidu.
       status: Istadu
-      target_domain: Domìniu de su contu signaladu
       title: Informes
       unassign: Boga s'assignatzione
       unresolved: No isòrvidu
@@ -535,108 +429,23 @@ sc:
       empty: Peruna règula de serbidore definida ancora.
       title: Règulas de su serbidore
     settings:
-      activity_api_enabled:
-        desc_html: Nùmeru de tuts publicados in locale, utentes ativos e registros noos in perìodos chidajolos
-        title: Pùblica istatìsticas agregadas subra s'atividade de s'utente
-      bootstrap_timeline_accounts:
-        desc_html: Imprea vìrgulas intre is nòmines de utente. Isceti is contos locales e isblocados ant a funtzionare. Su valore predefinidu cando est bòidu est totu is admins locales
-        title: Cussìgia custos contos a is persones noas
-      contact_information:
-        email: Indiritzu eletrònicu de impresa
-        username: Nòmine de utente de su cuntatu
-      custom_css:
-        desc_html: Modìfica s'aspetu cun CSS carrigadu in cada pàgina
-        title: CSS personalizadu
-      default_noindex:
-        desc_html: Ìmplicat a totu is utentes chi no apant modificadu custa cunfiguratzione
-        title: Esclude in manera predefinida is utentes dae s'inditzamentu de is motores de chirca
       domain_blocks:
         all: Pro totus
         disabled: Pro nemos
-        title: Ammustra blocos de domìniu
         users: Pro utentes locales in lìnia
-      domain_blocks_rationale:
-        title: Ammustra sa resone
-      hero:
-        desc_html: Ammustradu in sa pàgina printzipale. Cussigiadu a su mancu 600x100px. Si no est cunfiguradu, at a èssere ammustradu cussu de su serbidore
-        title: Immàgine de eroe
-      mascot:
-        desc_html: Ammustrada in vàrias pàginas. Cussigiadu a su mancu 293x205px. Si no est cunfiguradu, torra a su personàgiu predefinidu
-        title: Immàgine de su personàgiu
-      peers_api_enabled:
-        desc_html: Is nòmines de domìniu chi custu serbidore at agatadu in su fediversu
-        title: Pùblica sa lista de serbidores iscobertos in s'API
-      preview_sensitive_media:
-        desc_html: Is previsualizatziones de ligòngios de àteros sitos web ant a ammustrare una miniadura fintzas cando is elementos multimediales siant marcados comente a sensìbiles
-        title: Ammustra elementos multimediales sensìbiles in is previsualizatziones de OpenGraph
-      profile_directory:
-        desc_html: Permite a is persones de èssere iscobertas
-        title: Ativa diretòriu de profilos
-      registrations:
-        closed_message:
-          desc_html: Ammustradu in sa prima pàgina cando is registratziones sunt serradas. Podes impreare etichetas HTML
-          title: Messàgiu de registru serradu
-        deletion:
-          desc_html: Permite a chie si siat de cantzellare su contu suo
-          title: Aberi s'eliminatzione de su contu
-        min_invite_role:
-          disabled: Nemos
-          title: Permite invitos de
-        require_invite_text:
-          desc_html: Cando is registratziones rechedent s'aprovatzione manuale, faghe chi a incarcare su butone "Pro ite ti boles iscrìere?" siat obligatòriu e no a praghere
-          title: Rechede a is persones noas chi iscriant una resone prima de aderire
       registrations_mode:
         modes:
           approved: Aprovatzione rechesta pro si registrare
           none: Nemos si podet registrare
           open: Chie si siat si podet registrare
-        title: Modu de registratzione
-      show_known_fediverse_at_about_page:
-        desc_html: Cando ativu, ammustrat in sa previsualizatzione is tuts de totu is istàntzias connòschidas. Si nono, ammustrat isceti is cuntenutos locales
-        title: Include su cuntenutu federadu in sa pàgina no autenticada de sa lìnia de tempus pùblica
-      show_staff_badge:
-        desc_html: Ammustra un'insigna de personale in sa pàgina de utente
-        title: Ammustra insigna de personale
-      site_description:
-        desc_html: Paràgrafu de introdutzione a s'API. Descrie pro ite custu serbidore de Mastodon siat ispetziale e cale si siat àtera cosa de importu. Podes impreare etichetas HTML, mescamente <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descritzione de su serbidore
-      site_description_extended:
-        desc_html: Unu logu adatu pro publicare su còdighe de cumportamentu, règulas, diretivas e àteras caraterìsticas ispetzìficas de su serbidore tuo. Podes impreare etichetas HTML
-        title: Descritzione estèndida de su logu
-      site_short_description:
-        desc_html: Ammustradu in sa barra laterale e in is meta-etichetas. Descrie ite est Mastodon e pro ite custu serbidore est ispetziale in unu paràgrafu.
-        title: Descritzione curtza de su serbidore
-      site_terms:
-        desc_html: Podes iscrìere sa normativa de riservadesa tua, cunditziones de servìtziu e àteras normas legales. Podes impreare etichetas HTML
-        title: Cunditziones de su servìtziu personalizadas
-      site_title: Nòmine de su serbidore
-      thumbnail:
-        desc_html: Impreadu pro otènnere pre-visualizatziones pro mèdiu de OpenGraph e API. Cussigiadu 1200x630px
-        title: Miniadura de su serbidore
-      timeline_preview:
-        desc_html: Ammustra su ligàmene a sa lìnia de tempus pùblica in sa pàgina initziale e permite s'atzessu pro mèdiu de s'API a sa lìnia de tempus pùblica sena autenticatzione
-        title: Permite s'atzessu no autenticadu a sa lìnia de tempus pùblica
-      title: Cunfiguratzione de su logu
-      trendable_by_default:
-        desc_html: Tocat a is etichetas chi non siant istadas refudadas prima
-        title: Permite chi is etichetas divenant tendèntzia sena revisione pretzedente
-      trends:
-        desc_html: Ammustra in pùblicu is etichetas chi siant istadas revisionadas in passadu e chi oe siant in tendèntzia
-        title: Etichetas de tendèntzia
     site_uploads:
       delete: Cantzella s'archìviu carrigadu
       destroyed_msg: Càrriga de su situ cantzellada.
     statuses:
       back_to_account: Torra a sa pàgina de su contu
-      batch:
-        delete: Cantzella
-        nsfw_off: Signala comente a non sensìbile
-        nsfw_on: Signala comente a sensìbile
       deleted: Cantzelladu
-      failed_to_execute: Faddina in s'esecutzione
       media:
         title: Elementos multimediales
-      no_media: Perunu elementu multimediale
       no_status_selected: Perunu istadu est istadu mudadu dae chi non nd'as seletzionadu
       title: Istados de su contu
       with_media: Cun elementos multimediales
@@ -649,19 +458,7 @@ sc:
       sidekiq_process_check:
         message_html: Perunu protzessu Sidekiq est in esecutzione pro sa coa(s) %{value}. Revisiona is cunfiguratziones de Sidekiq
     tags:
-      accounts_today: Impreos ùnicos atuales
-      accounts_week: Impreos ùnicos de custa chida
-      breakdown: Detàllios de s'impreu atuale pro orìgine
-      last_active: Ùrtima atividade
-      most_popular: Prus populares
-      most_recent: Prus reghentes
-      name: Eticheta
       review: Revisiona s'istadu
-      reviewed: Revisionadas
-      title: Etichetas
-      trending_right_now: In tendèntzia immoe
-      unique_uses_today: "%{count} publicatziones de oe"
-      unreviewed: Sena revisionare
       updated_msg: Cunfiguratzione de etichetas atualizada
     title: Amministratzione
     warning_presets:
@@ -678,9 +475,6 @@ sc:
       body: "%{reporter} at sinnaladu %{target}"
       body_remote: Una persone de su domìniu %{domain} at sinnaladu %{target}
       subject: Informe nou pro %{instance} (#%{id})
-    new_trending_tag:
-      body: 'S''eticheta #%{name} est in tendèntzia oe, ma no est istada revisionada in passadu. No at a èssere ammustrada in pùblicu francu chi ddu permitas; si sarvas su formulàriu sena ddu modificare, no ddu as a bìdere mai prus.'
-      subject: Eticheta noa de revisionare in %{instance} (#%{name})
   aliases:
     add_new: Crea unu nomìngiu
     created_msg: Nomìngiu creadu. Immoe podes cumintzare a tramudare dae su contu betzu.
@@ -710,16 +504,12 @@ sc:
   applications:
     created: Aplicatzione creada
     destroyed: Aplicatzione cantzellada
-    invalid_url: S'URL frunidu no est curretu
     regenerate_token: Torra a generare s'identificadore de atzessu
     token_regenerated: Identificadore de atzessu generadu
     warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos!
     your_token: S'identificadore tuo de atzessu
   auth:
-    apply_for_account: Pedi un'invitu
     change_password: Crae
-    checkbox_agreement_html: So de acòrdiu cun is <a href="%{rules_path}" target="_blank">règulas de su serbidore</a> e is <a href="%{terms_path}" target="_blank">cunditziones de su servìtziu</a>
-    checkbox_agreement_without_rules_html: So de acòrdiu cun is <a href="%{terms_path}" target="_blank">cunditziones de su servìtziu</a>
     delete_account: Cantzella su contu
     delete_account_html: Si boles cantzellare su contu, ddu podes <a href="%{path}">fàghere inoghe</a>. T'amus a dimandare una cunfirmatzione.
     description:
@@ -753,11 +543,9 @@ sc:
     status:
       account_status: Istadu de su contu
       confirming: Isetende chi sa posta eletrònica siat cumpletada.
-      functional: Su contu tuo est operativu.
       pending: Sa dimanda tua est in protzessu de revisione dae su personale nostru. Podet serbire unu pagu de tempus. As a retzire unu messàgiu eletrònicu si sa dimanda est aprovada.
       redirecting_to: Su contu tuo est inativu pro ite in die de oe est torrende a indiritzare a %{acct}.
     too_fast: Formulàriu imbiadu tropu a lestru, torra a proare.
-    trouble_logging_in: Tenes problemas de atzessu?
     use_security_key: Imprea una crae de seguresa
   authorize_follow:
     already_following: Ses giai sighende custu contu
@@ -815,10 +603,6 @@ sc:
       more_details_html: Pro àteros detàllios, bide sa <a href="%{terms_path}">normativa de riservadesa</a>.
       username_available: Su nòmine de utente tuo at a torrare a èssere a disponimentu
       username_unavailable: Su nòmine de utente tuo no at a abarrare a disponimentu
-  directories:
-    directory: Diretòriu de profilos
-    explanation: Iscoberi gente segundu is interessos suos
-    explore_mastodon: Esplora %{title}
   domain_validator:
     invalid_domain: no est unu nòmine de domìniu vàlidu
   errors:
@@ -870,7 +654,6 @@ sc:
       title: Modìfica filtru
     errors:
       invalid_context: Cuntestu mancante o non vàlidu
-      invalid_irreversible: Su filtràgiu non reversìbile funtzionat isceti in is cuntestos printzipale o de notìficas
     index:
       delete: Cantzella
       empty: Non tenes perunu filtru.
@@ -878,16 +661,12 @@ sc:
     new:
       title: Agiunghe unu filtru nou
   footer:
-    developers: Iscuadra de isvilupu
-    more: Àteru…
-    resources: Resursas
     trending_now: Est tendèntzia immoe
   generic:
     all: Totus
     changes_saved_msg: Modìficas sarvadas.
     copy: Còpia
     delete: Cantzella
-    no_batch_actions_available: Peruna atzione in blocu a disponimentu dae custa pàgina
     order_by: Òrdina pro
     save_changes: Sarva is modìficas
     validation_errors:
@@ -895,26 +674,6 @@ sc:
       other: Calicuna cosa ancora no est andende. Bide is %{count} faddinas in bàsciu
   html_validator:
     invalid_markup: 'cuntenet etichetas HTML non vàlidas: %{error}'
-  identity_proofs:
-    active: Ativu
-    authorize: Eja, autoriza
-    authorize_connection_prompt: Boles autorizare custa connessione critografada?
-    errors:
-      failed: Faddina in sa connessione critografada. Torra·bi a proare dae %{provider}.
-      keybase:
-        invalid_token: Is còdighes de autorizatzione de Keybase sunt hash de firmas e depent tènnere 66 caràteres esadetzimales
-        verification_failed: Keybase non reconnoschet custu còdighe de autorizatzione che a firma de s'utente de Keybase %{kb_username}. Torra·bi a proare dae Keybase.
-      wrong_user: Impossìbile creare una proa pro %{proving} cando as fatu s'atzessu che a %{current}. Intra che a %{proving} e torra·bi a proare.
-    explanation_html: Inoghe podes collegare critograficamente is àteras identidades tuas dae àteras prataformas, che a Keybase. Custu permitit a àteras persones de t'imbiare messàgios tzifrados in cussas prataformas e de tènnere sa seguresa chi is cuntenutos chi ddis ses imbiende benint dae tene.
-    i_am_html: So %{username} in %{service}.
-    identity: Identidade
-    inactive: Inativu
-    publicize_checkbox: 'E imbia custu tut:'
-    publicize_toot: 'Verificadu! So %{username} in %{service}: %{url}'
-    remove: Boga sa proa dae su contu
-    removed: Proa bogada dae su contu
-    status: Istadu de verìfica
-    view_proof: Ammustra sa proa
   imports:
     errors:
       over_rows_processing_limit: cuntenet prus de %{count} filas
@@ -932,7 +691,6 @@ sc:
       following: Lista de sighiduras
       muting: Lista gente a sa muda
     upload: Càrriga
-  in_memoriam_html: In memoriam.
   invites:
     delete: Disativa
     expired: Iscadidu
@@ -1001,17 +759,6 @@ sc:
     carry_mutes_over_text: Custa persone s'est tramudada dae %{acct}, chi as postu a sa muda.
     copy_account_note_text: 'Custa persone s''est tramudada dae %{acct}, custas sunt is notas antepostas tuas chi ddi pertocant:'
   notification_mailer:
-    digest:
-      action: Ammustra totu is notìficas
-      body: Custu est unu resumu de su chi ti est sutzèdidu dae sa visita ùrtima tua su %{since}
-      mention: "%{name} t'at mentovadu in:"
-      new_followers_summary:
-        one: In prus, %{count} persone noa ti sighit dae cando fias assente. Incredìbile!
-        other: In prus, %{count} persones noas ti sighint dae cando fias assente. Incredìbile!
-      subject:
-        one: "1 notìfica noa dae s'ùrtima visita tua \U0001F418"
-        other: "%{count} notìficas noas dae s'ùrtima visita tua \U0001F418"
-      title: Durante s'ausèntzia tua...
     favourite:
       body: "%{name} at marcadu comente a preferidu s'istadu tuo:"
       subject: "%{name} at marcadu comente a preferidu s'istadu tuo"
@@ -1103,22 +850,7 @@ sc:
     remove_selected_follows: Non sigas prus is persones seletzionadas
     status: Istadu de su contu
   remote_follow:
-    acct: Inserta·nche s'utente@domìniu tuo dae su chi boles sighire custa persone
     missing_resource: Impossìbile agatare sa rechesta de indiritzamentu URL pro su contu tuo
-    no_account_html: Non tenes ancora unu contu? Ti podes <a href='%{sign_up_path}' target='_blank'>registrare inoghe</a>
-    proceed: Cumintza a sighire
-    prompt: 'As a sighire a:'
-    reason_html: "<strong>Pro ite serbit custu?</strong> Podet èssere chi <code>%{instance}</code> non siat su serbidore aunde ses registradu, pro custu tenimus bisòngiu de ti torrare a indiritzare prima a su serbidore tuo."
-  remote_interaction:
-    favourite:
-      proceed: Sighi pro marcare che a preferidu
-      prompt: 'Boles marcare comente a preferidu custu tut:'
-    reblog:
-      proceed: Sighi pro cumpartzire
-      prompt: 'Boles cumpartzire custu tut:'
-    reply:
-      proceed: Sighi pro rispòndere
-      prompt: 'Boles rispòndere a custu tut:'
   scheduled_statuses:
     over_daily_limit: As superadu su lìmite de %{limit} tuts programmados pro cudda die
     over_total_limit: As superadu su lìmite de %{limit} tuts programmados
@@ -1128,7 +860,6 @@ sc:
     browser: Navigadore
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1142,7 +873,6 @@ sc:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
       weibo: Weibo
     current_session: Sessione atuale
     description: "%{browser} de %{platform}"
@@ -1151,8 +881,6 @@ sc:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1176,7 +904,6 @@ sc:
     edit_profile: Modìfica profilu
     export: Esportatzione de datos
     featured_tags: Etichetas in evidèntzia
-    identity_proofs: Proas de identidade
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
@@ -1205,13 +932,11 @@ sc:
       other: 'cuntenet is etichetas non permìtidas: %{tags}'
     errors:
       in_reply_not_found: Ses chirchende de rispòndere a unu tut chi no esistit prus.
-    language_detection: Rileva s'idioma in automàticu
     open_in_web: Aberi in sa web
     over_character_limit: lìmite de caràteres de %{max} superadu
     pin_errors:
       limit: As giai apicadu su nùmeru màssimu de tuts
       ownership: Is tuts de àtere non podent èssere apicados
-      private: Is tuts non pùblicos non podent èssere apicados
       reblog: Is cumpartziduras non podent èssere apicadas
     poll:
       total_people:
@@ -1242,6 +967,7 @@ sc:
       '2629746': 1 mese
       '31556952': 1 annu
       '5259492': 2 meses
+      '604800': 1 week
       '63113904': 2 annos
       '7889238': 3 meses
   stream_entries:
@@ -1250,89 +976,6 @@ sc:
     sensitive_content: Cuntenutu sensìbile
   tags:
     does_not_match_previous_name: non cointzidet cun su nòmine anteriore
-  terms:
-    body_html: |
-      <h2>Polìtica de riservadesa</h2>
-      <h3 id="collect">Ite informatziones collimus?</h3>
-
-      <ul>
-      <li><em>Informatziones de base de su contu</em>: Si t'as a registrare in custu serbidore, ti diant pòdere pedire de insertare unu nòmine utente, un'indiritzu de posta eletrònica e una crae de intrada. Dias pòdere insertare fintzas àteras informatziones de profilu, che a unu nòmine de ammustrare e una biografia, e carrigare un'immàgine de profilu e una de cobertedda. Su nòmine utente, cussu ammustradu, sa biografia, s'immàgine de profilu e de cobertedda sunt semper allistados in pùblicu.</li>
-      <li><em>Publicatziones, sighidores e àteras informatziones pùblicas</em>: Sa lista de is persones chi sighis est allistada in pùblicu, e sa matessi cosa balet pro is chi ti sighint. Cando imbias unu messàgiu sa data e s'ora benint sarvadas, aici comente s'aplicatzione dae sa cale as imbiadu su messàgiu. Is messàgios diant pòdere cuntènnere cuntenutos multimediales allongiados, che a immàgines e vìdeos. Is publicatziones pùblicas e no allistadas sunt a disponimentu in abertu. Cando ammustras una publicatzione in su profilu tuo, fintzas cussa est un'informatzione a disponimentu pùblicu. Is publicatziones tuas benint imbiadas a is sighidores tuos, cosa chi a bortas bolet nàrrere chi benint intregadas a serbidores diferentes chi nde sarvant còpias in cue. Cando cantzellas publicatziones, custu acuntessimentu benit imbiadu fintzas issu a is persones chi ti sighint. S'atzione de torrare a cumpartzire o de pònnere in is preferidos un'àtera publicatzione est semper pùblica.</li>
-      <li><em>Publicatziones diretas e pro chie ti sighit ebbia</em>: Totu is publicatziones benint archiviadas e protzessadas in su serbidore. Is publicatziones pro is sighidores ebbia benint intregadas a chie ti sighit e a is utentes mentovados in intro, e is publicatziones diretas benint intregadas isceti a chie sighit a chi ddoe sunt mentovados in intro. In unos cantos casos bolet nàrrere chi benint intregados a serbidores diferentes e chi còpias issoro benint sarvadas in cue. Nois chircamus de limitare s'atzessu a custas publicatziones a is persones autorizadas ebbia, ma àteros serbidores bi diant pòdere non resessere. Pro custa resone est de importu mannu su de revisionare is serbidores a is cales faghent parte is sighiduras tuas. Podes impreare un'optzione pro aprovare o refudare in manera automàtica sighiduras noas in is cunfiguratziones. <em>Regorda·ti chi is operadores de su serbidore e cale si siat serbidore chi ddos retzit podent castiare custos messàgios</em>, e chi is retzidores ddos diant pòdere sarvare faghende caturas, copiende·los o torrende·los a cumpartzire in àteras maneras. <em>Non cumpartzas peruna informatzione perigulosa impreende Mastodon.</em></li>
-      <li><em>IP e àteros metadatos</em>: Cando intras in su contu tuo sarvamus s'indiritzu IP dae ue ses intrende, e fintzas su nòmine de s'aplicatzione chi impreas comente navigadore. Totu is sessiones de atzessu abertas sunt a disponimentu pro sa revisione e sa rèvoca in is cunfiguratziones tuas. S'ùrtimu indiritzu IP impreadu benit sarvadu finas a 12 meses. Diamus pòdere archiviare fintzas raportos chi includent is indiritzos IP de totu is rechestas a su serbidore nostru.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Pro ite cosas impreamus is informatziones tuas?</h3>
-
-      <p>Totu is informatziones chi collimus dae tene diant pòdere èssere impreadas in is maneras chi sighint:</p>
-
-      <ul>
-      <li>Pro frunire sa funtzionalidade de base de Mastodon. Podes interagire cun is cuntenutos de is àteras persones, e cumpartzire is tuos, isceti cando as fatu s'atzessu in su contu tuo. Pro esèmpiu, podes sighire àteras persones pro castiare is publicatziones cumbinadas issoro in sa lìnia de tempus personalizada printzipale tua.</li>
-      <li>Pro agiudare sa moderatzione de sa comunidade, pro esèmpiu cunfrontende s'indiritzu IP tuo cun àteros giai connotos pro verificare evasiones de blocos o àteras violatziones.</li>
-      <li>S'indiritzu de posta eletrònica chi as a frunire diat pòdere èssere impreadu pro t'imbiare informatziones, notìficas a pitzu de àteras persones chi ant a interagire cun is cuntenutos tuos o chi t'ant a imbiare messàgios, e pro rispòndere a interrogativos e/o àteras rechestas o preguntas.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Comente amparamus is informatziones tuas?</h3>
-
-      <p>Impreamus medidas de seguresa vàrias pro amparare sa seguresa de is informatziones personales tuas cando insertas o imbias is informatziones personales tuas, o cando bi atzedes. In paris a àteras cosas, sa sessione de su navigadore tuo, e fintzas su tràficu intre s'aplicatzione tua e s'API, benint amparados cun SSL, e sa crae tua benit tzifrada impreende un'algoritmu forte a una diretzione. Pro afortiare sa seguresa de s'atzessu a su contu tuo ancora de prus podes abilitare s'autenticatzione in duos fatores.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Cale est sa polìtica nostra de archiviatzione de is datos?</h3>
-
-      <p>Amus a fàghere un'isfortzu in fide bona pro chircare de:</p>
-
-      <ul>
-      <li>Mantènnere in archìviu is raportos chi cuntenent is indiritzos IP de totu is rechestas a custu serbidore, cando cussas rechestas benint registradas, pro non prus de 90 dies.</li>
-      <li>Mantènnere in archìviu is indiritzos IP assotziados a is utentes registrados pro non prus de 12 meses.</li>
-      </ul>
-
-      <p>Podes pedire e iscarrigare un'archìviu de is cuntenutos tuos chi includet is publicatziones tuas, is elementos multimediales allongiados, s'immàgine de profilu e cussa de cobertedda.</p>
-
-      <p>Podes cantzellare su contu tuo in manera irreversìbile in cale si siat momentu.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Impreamus is testimòngios?</h3>
-
-      <p>Eja. Is testimòngios ("cookies") sunt documentos minores chi unu situ o su frunidore de servìtzios suos tramudant a su discu tèteru de s'elaboradore tuo pro mèdiu de su navigadore web tuo (si si ddu permitis). Custos testimòngios permitint a su situ de reconnòschere su navigadore tuo e, si tenes unu contu registradu, de ddu assotziare cun su contu tuo.</p>
-
-      <p>Impreamus is testimòngios pro cumprèndere e sarvare is preferèntzias tuas pro is visitas imbenientes.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Rivelamus calicuna informatzione a tertzas partes?</h3>
-
-      <p>Non bendimus, cuncambiamus, o tramudamus in àteras maneras is informatziones tuas chi ti diant pòdere individuare in manera personale. Custu no incluit sugetos de tertzas partes fidados chi nos agiudant a amministrare su situ, fàghere is fainas nostras, o a t'agiudare, finas a cando cussos sugetos atzetant de mantènnere cunfidentziales cussas informatziones. Diamus fintzas pòdere frunire is informatziones tuas si amus a èssere cumbintos chi siat apropriadu pro sighire is leges, aplicare is polìticas de su situ nostru, e amparare is deretos, propiedades o seguresas nostros o de àteros.</p>
-
-      <p>Is cuntenutos pùblicos tuos diant pòdere èssere iscarrigados dae àteros serbidores in sa rete. Is publicatziones pùblicas e pro is sighiduras ebbia benint intregadas a is serbidores in ue istant is retzidores, si istant in unu serbidore chi no est custu.</p>
-
-      <p>Cando autorizas un'aplicatzione a impreare su contu tuo, a segunda de sa mannària de is permissos chi frunis, cussa diat pòdere atzèdere a is informatziones pùblicas de profilu tuas, a sa lista de is persones chi sighis e chi ti sighint, a is listas tuas, a totu is publicatziones tuas e a is referidos tuos. Is aplicatziones non podent mai tènnere atzessu a s'indiritzu de posta eletrònica tuo e a sa crae de intrada tua.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Impreu de custu situ dae parte de minores</h3>
-
-      <p>Si custu serbidore est in s'UE o in s'ÀEE: Su situ nostru, is produtos nostros e is servìtzios nostros sunt totu cantos pensados pro persones chi tenent a su mancu 16 annos de edade. Si tenes de mancu de 16 annos, in aplicatzione de is rechisitos de su GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) no imprees custu situ.</p>
-
-      <p>Si custu serbidore est in is IUA: Su situ nostru, is produtos e is servìtzios suos sunt totu cantos pensados pro persones chi tenent a su mancu 13 annos de edade. Si tenes de mancu de 13 annos, in aplicatzione de su COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no imprees custu situ.</p>
-
-      <p>Is rechisitos de sa lege diant pòdere èssere diferentes si custu serbidore est in suta de un'àtera giurisditzione.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Modìficas a sa polìtica de riservadesa nostra</h3>
-
-      <p>Si amus a seberare de cambiare sa polìtica de riservadesa nostra amus a publicare is modìficas in custa pàgina.</p>
-
-      <p>Custu documentu tenet una litzèntzia CC-BY-SA. Est istadu agiornadu s'ùrtima borta su 7 de martzu de su 2018.</p>
-
-      <p>Adatadu, in orìgine, dae sa <a href="https://github.com/discourse/discourse">Polìtica de riservadesa de Discourse</a>.</p>
-    title: "%{instance} Cunditziones de su servìtziu e polìtica de riservadesa"
   themes:
     contrast: Mastodon (cuntrastu artu)
     default: Mastodon (iscuru)
@@ -1361,59 +1004,31 @@ sc:
       explanation: As pedidu una còpia de seguresa totale de su contu de Mastodon tuo. Immoe est pronta pro s'iscarrigamentu!
       subject: S'archìviu tuo est prontu pro èssere iscarrigadu
       title: Collida dae s'archìviu
-    sign_in_token:
-      details: 'Custos sunt is detàllios de su tentativu:'
-      explanation: 'Amus rilevadu unu tentativu de identificatzione in su contu tuo dae un''indiritzu IP non reconnotu. Si fias tue, inserta su còdighe de seguresa in bàsciu in sa pàgina de disafiu de identificatzione:'
-      further_actions: 'Si non fias tue, càmbia sa crae tua e ativa s''autenticatzione in duos passos in su contu tuo. Ddu podes fàghere inoghe:'
-      subject: Cunfirma su tentativu de identificatzione
-      title: Tentativu de identificatzione
     warning:
-      explanation:
-        disable: Non podes prus intrare in su contu tuo o dd'impreare in cale si siat àtera manera, ma su profilu e is àteros datos tuos abarrant intatos.
-        sensitive: Is elementos e documentos multimediales carrigados e ligados tuos ant a èssere tratados che a sensìbiles.
-        silence: Podes ancora impreare su contu tuo, ma isceti is persones chi ti sunt giai sighende ant a bìdere is tuts tuos in custu serbidore, e dias pòdere èssere esclùdidu dae unas cantas listas pùblicas. Nointames custu, is àteros ti diant pòdere galu sighire in manera manuale.
-        suspend: Non podes prus impreare su contu tuo, e su profilu e àteros datos non sunt prus atzessìbiles. Bi podes ancora intrare pro pedire una còpia de seguresa de is datos tuos finas a cando no ant a èssere cantzellados de su totu, ma nd'amus a mantènnere unos cantos pro non ti permìtere de evàdere sa suspensione.
-      get_in_touch: Podes rispòndere a custu indiritzu de posta eletrònica pro cuntatare cun su personale de %{instance}.
-      review_server_policies: Revisiona sas polìticas de su serbidore
-      statuses: 'In manera cuncreta, pro:'
       subject:
         disable: Su contu tuo %{acct} est istadu cungeladu
         none: Avisu pro %{acct}
-        sensitive: Is elementos multimediales de publicatzione de su contu tuo %{acct} sunt istados marcados comente sensìbiles
         silence: Su contu tuo %{acct} est istadu limitadu
         suspend: Su contu tuo %{acct} est istadu suspèndidu
       title:
         disable: Contu congeladu
         none: Atentzione
-        sensitive: S'elementu multimediale tuo est istadu marcadu comente sensìbile
         silence: Contu limitadu
         suspend: Contu suspèndidu
     welcome:
       edit_profile_action: Cunfigura su profilu
-      edit_profile_step: Podes personalizare su profilu tuo carrighende un'immàgine de profilu o un'intestatzione, cambiende su nòmine de utente tuo e àteru. Si boles revisionare is sighidores noos in antis chi tèngiant su permissu de ti sighire podes blocare su contu tuo.
       explanation: Inoghe ddoe at una paja de impòsitos pro cumintzare
       final_action: Cumintza a publicare
-      final_step: 'Cumintza a publicare! Fintzas si no ti sighit nemos àtera gente podet bìdere is messàgios pùblicos tuos, pro esèmpiu in sa lìnia de tempus locale e in is etichetas ("hashtags"). Ti dias pòdere bòlere introduire a sa comunidade cun s''eticheta #introductions.'
       full_handle: Su nòmine utente intreu tuo
       full_handle_hint: Custu est su chi dias nàrrere a is amistades tuas pro chi ti potzant imbiare messàgios o sighire dae un'àteru serbidore.
-      review_preferences_action: Muda is preferèntzias
-      review_preferences_step: Regorda·ti de cunfigurare is preferèntzias tuas, comente a cale messàgios de posta eletrònicas boles retzire, o ite livellu de riservadesa dias bòlere chi siat predefinidu pro is messàgios tuos. Si is immàgines in movimentu non ti infadant podes seberare de abilitare sa riprodutzione automàtica de is GIF.
       subject: Ti donamus su benebènnidu a Mastodon
-      tip_federated_timeline: Sa lìnia de tempus federada est una vista globale de sa retza de Mastodon. Ma includet isceti is persones sighidas dae is bighinos tuos, duncas no est totale.
-      tip_following: Pro more de is cunfiguratziones predefinidas sighis s'amministratzione de su serbidore tuo. Pro agatare àteras persones de interessu, càstia is lìnias de su tempus locale e federada.
-      tip_local_timeline: Sa lìnia de tempus locale est una vista globale de is persones in %{instance}. Custos sunt is bighinos tuos!
-      tip_mobile_webapp: Si su navigadore mòbile tuo t'oferit de agiùnghere Mastodon a s'ischermada printzipale tua podes retzire notìficas push. Funtzionat che a un'aplicatzione nativa in maneras medas!
-      tips: Impòsitos
       title: Ti donamus su benebènnidu, %{name}!
   users:
     follow_limit_reached: Non podes sighire prus de %{limit} persones
-    generic_access_help_html: Tenes problemas a intrare in su contu tuo? Podes cuntatare a %{email} pro retzire agiudu
     invalid_otp_token: Còdighe a duas fases non vàlidu
-    invalid_sign_in_token: Còdighe de seguresa non vàlidu
     otp_lost_help_html: Si as pèrdidu s'atzessu a ambos, podes cuntatare a %{email}
     seamless_external_login: As abertu sa sessione pro mèdiu de unu servìtziu esternu, e pro custa resone is cunfiguratziones de sa crae de intrada e de posta eletrònica non sunt a disponimentu.
     signed_in_as: 'Sessione aberta comente:'
-    suspicious_sign_in_confirmation: Paret chi no as mai abertu sa sessione dae custu dispositivu e est dae unu pagu de tempus chi no intras in Mastodon, duncas ti semus imbiende unu còdighe de seguresa a s'indiritzu de posta eletrònica tuo pro cunfirmare chi ses tue.
   verification:
     explanation_html: 'Ti podes <strong>verificare a sa sola comente mere de is ligòngios in is metadatos de su profilu tuo</strong>. Pro ddu fàghere su situ ligadu depet cuntènnere unu ligòngiu chi torret a su profilu de Mastodon tuo. Su ligòngiu in su situ <strong>depet</strong> tènnere un''atributu <code>rel="me"</code>. Su testu cuntenutu in su ligòngiu no est de importu. Custu est un''esèmpiu:'
     verification: Verìfica
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
new file mode 100644
index 000000000..23b905754
--- /dev/null
+++ b/config/locales/sco.yml
@@ -0,0 +1,1661 @@
+---
+sco:
+  about:
+    about_mastodon_html: 'The social network o wir future: Nae adverts, nae corporate surveillance; ethical design, an decentralization! Ain yer ain data wi Mastodon!'
+    contact_missing: No set
+    contact_unavailable: N/A
+    hosted_on: Mastodon hostit on %{domain}
+    title: Aboot
+  accounts:
+    follow: Follae
+    followers:
+      one: Follaer
+      other: Follaers
+    following: Follaein
+    instance_actor_flash: This accoont is a virtual actor uised tae represent the server itsel an no onie individual uiser. It is uised fir federation purposes an shuidnae be suspendit.
+    last_active: last active
+    link_verified_on: Ainership o this link wis checkt on %{date}
+    nothing_here: There naethin here!
+    pin_errors:
+      following: Ye hae tae awriddy be follaein the person thit ye'r wantin tae endorse
+    posts:
+      one: Post
+      other: Posts
+    posts_tab_heading: Posts
+  admin:
+    account_actions:
+      action: Perform action
+      title: Perform moderation action on %{acct}
+    account_moderation_notes:
+      create: Lea note
+      created_msg: Moderation note successfully makkit!
+      destroyed_msg: Moderation note successfully destroyed!
+    accounts:
+      add_email_domain_block: Dingie email domain
+      approve: Approve
+      approved_msg: Successfully approvit %{username}'s sign-up application
+      are_you_sure: Ye shuir?
+      avatar: Avatar
+      by_domain: Domain
+      change_email:
+        changed_msg: Email successfully chynged!
+        current_email: Current email
+        label: Chynge email
+        new_email: New email
+        submit: Chynge email
+        title: Chynge email fir %{username}
+      change_role:
+        changed_msg: Role successfully chynged!
+        label: Chynge role
+        no_role: Nae role
+        title: Chynge role fir %{username}
+      confirm: Mak siccar
+      confirmed: Makkit siccar
+      confirming: Makkin siccar
+      custom: Custom
+      delete: Delete data
+      deleted: Deletit
+      demote: Demote
+      destroyed_msg: "%{username}'s data is noo queued fir tae be deletit the noo"
+      disable: Freeze
+      disable_sign_in_token_auth: Turn aff email token authentication
+      disable_two_factor_authentication: Turn aff 2FA
+      disabled: Froze
+      display_name: Display nemm
+      domain: Domain
+      edit: Edit
+      email: Email
+      email_status: Email status
+      enable: Unfreeze
+      enable_sign_in_token_auth: Turn on email token authentication
+      enabled: Turnt on
+      enabled_msg: Successfully unfroze %{username}'s accoont
+      followers: Follaers
+      follows: Follaes
+      header: Heider
+      inbox_url: Inbox URL
+      invite_request_text: Raisons fir jynin
+      invited_by: Invitit bi
+      ip: IP
+      joined: Jynt
+      location:
+        all: Aw
+        local: Local
+        remote: Remote
+        title: Location
+      login_status: Login status
+      media_attachments: Media attachments
+      memorialize: Turn intae memorial
+      memorialized: Memorialized
+      memorialized_msg: Successfully turnt %{username} intae a memorial accoont
+      moderation:
+        active: Active
+        all: Aw
+        pending: Pendin
+        silenced: Limitit
+        suspended: Suspendit
+        title: Moderation
+      moderation_notes: Moderation notes
+      most_recent_activity: Maist recent activity
+      most_recent_ip: Maist recent IP
+      no_account_selected: Nae accoonts wis chynged as naen wis selectit
+      no_limits_imposed: Nae limits imposed
+      no_role_assigned: Nae role assignt
+      not_subscribed: No subscribed
+      pending: Pendin review
+      perform_full_suspension: Suspend
+      previous_strikes: Previous strikes
+      previous_strikes_description_html:
+        one: This accoont haes <strong>ae</strong> strike.
+        other: This accoont haes <strong>%{count}</strong> strikes.
+      promote: Promote
+      protocol: Protocol
+      public: Public
+      push_subscription_expires: PuSH subscription expires
+      redownload: Refresh profile
+      redownloaded_msg: Successfully refreshed %{username}'s profile fae origin
+      reject: Rejeck
+      rejected_msg: Successfully rejectit %{username}'s sign-up application
+      remove_avatar: Remove avatar
+      remove_header: Tak aff heider
+      removed_avatar_msg: Successfully taen aff %{username}'s avatar image
+      removed_header_msg: Successfully taen aff %{username}'s heider image
+      resend_confirmation:
+        already_confirmed: This uiser is awriddy confirmt
+        send: Resen confirmation email
+        success: Confirmation email successfully sent!
+      reset: Reset
+      reset_password: Reset passwird
+      resubscribe: Resubscribe
+      role: Role
+      search: Seirch
+      search_same_email_domain: Ither uisers wi the same email domain
+      search_same_ip: Ither uisers wi the same IP
+      security_measures:
+        only_password: Ainly passwird
+        password_and_2fa: Passwird an 2FA
+      sensitive: Force-sensitive
+      sensitized: Mairked as sensitive
+      shared_inbox_url: Shared inbox URL
+      show:
+        created_reports: Made clypes
+        targeted_reports: Clyped on bi ithers
+      silence: Limit
+      silenced: Limitit
+      statuses: Posts
+      strikes: Previous strikes
+      subscribe: Subscribe
+      suspend: Suspend
+      suspended: Suspendit
+      suspension_irreversible: The data o this accoont haes been irreversibly deletit. Ye kin unsuspend the accoont fir tae mak it uisable but it wullnae recover onie data it haed afore.
+      suspension_reversible_hint_html: The accoont haes been suspendit, an the data wull be fully removed on %{date}. Tae then, the accoont kin be restored athoot onie ill effecks. Gin ye'r wantin tae remove aw the accoont's data the noo, ye kin dae it ablow.
+      title: Accoonts
+      unblock_email: Undingie email address
+      unblocked_email_msg: Successfully undingied %{username}'s email address
+      unconfirmed_email: Email no confirmt
+      undo_sensitized: Undae force-sensitive
+      undo_silenced: Undae limit
+      undo_suspension: Undae suspension
+      unsilenced_msg: Successfully unduin the limitin o %{username}'s accoont
+      unsubscribe: Unsubscribe
+      unsuspended_msg: Successfully unsuspendit %{username}'s accoont
+      username: Uisernemm
+      view_domain: Deek at summary fir domain
+      warn: Warn
+      web: Wab
+      whitelisted: Allooed fir federation
+    action_logs:
+      action_types:
+        approve_appeal: Approve Appeal
+        approve_user: Approve Uiser
+        assigned_to_self_report: Assign Clype
+        change_email_user: Chynge Email fir Uiser
+        change_role_user: Chynge Role o Uiser
+        confirm_user: Confirm Uiser
+        create_account_warning: Mak Warnin
+        create_announcement: Mak Annooncement
+        create_canonical_email_block: Mak a Email Dingie
+        create_custom_emoji: Mak Custom Emoji
+        create_domain_allow: Mak Domain Alloo
+        create_domain_block: Mak Domain Dingie
+        create_email_domain_block: Mak Email Domain Dingie
+        create_ip_block: Mak IP rule
+        create_unavailable_domain: Mak Unavailable Domain
+        create_user_role: Mak Role
+        demote_user: Demote Uiser
+        destroy_announcement: Delete Annooncement
+        destroy_canonical_email_block: Delete Email Dingie
+        destroy_custom_emoji: Delete Custom Emoji
+        destroy_domain_allow: Delete Domain Alloo
+        destroy_domain_block: Delete Domain Dingie
+        destroy_email_domain_block: Delete Email Domain Dingie
+        destroy_instance: Purge Domain
+        destroy_ip_block: Delete IP rule
+        destroy_status: Delete Post
+        destroy_unavailable_domain: Delete Unavailable Domain
+        destroy_user_role: Destroy Role
+        disable_2fa_user: Disable 2FA
+        disable_custom_emoji: Disable Custom Emoji
+        disable_sign_in_token_auth_user: Disable Email Token Authentication fir Uiser
+        disable_user: Turn aff Uiser
+        enable_custom_emoji: Turn on Custom Emoji
+        enable_sign_in_token_auth_user: Turn on Email Token Authentication fir Uiser
+        enable_user: Turn on Uiser
+        memorialize_account: Memorialize Accoont
+        promote_user: Promote Uiser
+        reject_appeal: Rejeck Appeal
+        reject_user: Rejeck Uiser
+        remove_avatar_user: Tak doon Avatar
+        reopen_report: Reopen Clype
+        resend_user: Resen Confirmation Email
+        reset_password_user: Reset Passwird
+        resolve_report: Sort Clype
+        sensitive_account: Force-Sensitive Accoont
+        silence_account: Limit Accoont
+        suspend_account: Suspend Accoont
+        unassigned_report: Unassign Clype
+        unblock_email_account: Undingie email address
+        unsensitive_account: Undae Force-Sensitive Accoont
+        unsilence_account: Undae Limit Accoont
+        unsuspend_account: Unsuspend Accoont
+        update_announcement: Update Annooncement
+        update_custom_emoji: Update Custom Emoji
+        update_domain_block: Update Domain Dingie
+        update_ip_block: Update IP rule
+        update_status: Update Post
+        update_user_role: Update Role
+      actions:
+        approve_appeal_html: "%{name} approved moderation decision appeal fae %{target}"
+        approve_user_html: "%{name} approved sign-up fae %{target}"
+        assigned_to_self_report_html: "%{name} assigned clype %{target} tae theirsels"
+        change_email_user_html: "%{name} chynged the email address o uiser %{target}"
+        change_role_user_html: "%{name} chynged the role o %{target}"
+        confirm_user_html: "%{name} confirmt email address o uiser %{target}"
+        create_account_warning_html: "%{name} sent a warnin tae %{target}"
+        create_announcement_html: "%{name} creatit new annooncement %{target}"
+        create_canonical_email_block_html: "%{name} dingied email wi the hash %{target}"
+        create_custom_emoji_html: "%{name} uploadit new emoji %{target}"
+        create_domain_allow_html: "%{name} allooed federation wi domain %{target}"
+        create_domain_block_html: "%{name} dingied domain %{target}"
+        create_email_domain_block_html: "%{name} dingied email domain %{target}"
+        create_ip_block_html: "%{name} creatit rule fir IP %{target}"
+        create_unavailable_domain_html: "%{name} stapt delivery tae domain %{target}"
+        create_user_role_html: "%{name} creatit %{target} role"
+        demote_user_html: "%{name} demotit uiser %{target}"
+        destroy_announcement_html: "%{name} deletit annooncement %{target}"
+        destroy_canonical_email_block_html: "%{name} undingied email wi the hash %{target}"
+        destroy_custom_emoji_html: "%{name} deletit emoji %{target}"
+        destroy_domain_allow_html: "%{name} disallooed federation wi domain %{target}"
+        destroy_domain_block_html: "%{name} undingied domain %{target}"
+        destroy_email_domain_block_html: "%{name} undingied email domain %{target}"
+        destroy_instance_html: "%{name} purged domain %{target}"
+        destroy_ip_block_html: "%{name} deletit rule fir IP %{target}"
+        destroy_status_html: "%{name} taen doon post bi %{target}"
+        destroy_unavailable_domain_html: "%{name} restertit delivery tae domain %{target}"
+        destroy_user_role_html: "%{name} deletit %{target} role"
+        disable_2fa_user_html: "%{name} turnt aff twa factor requirement fir uiser %{target}"
+        disable_custom_emoji_html: "%{name} turnt aff emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} turnt aff email token authentication fir %{target}"
+        disable_user_html: "%{name} turnt aff login fir uiser %{target}"
+        enable_custom_emoji_html: "%{name} turnt on emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} turnt on email token authentication fir %{target}"
+        enable_user_html: "%{name} turnt on login fir uiser %{target}"
+        memorialize_account_html: "%{name} pit %{target}'s accoont ower intae a memorial page"
+        promote_user_html: "%{name} promotit uiser %{target}"
+        reject_appeal_html: "%{name} rejectit moderation decision appeal fae %{target}"
+        reject_user_html: "%{name} rejectit sign-up fae %{target}"
+        remove_avatar_user_html: "%{name} taen doon %{target}'s avatar"
+        reopen_report_html: "%{name} reopent clype %{target}"
+        resend_user_html: "%{name} resent confirmation email fir %{target}"
+        reset_password_user_html: "%{name} reset passwird fir uiser %{target}"
+        resolve_report_html: "%{name} resolved clype %{target}"
+        sensitive_account_html: "%{name} mairked %{target}'s media as sensitive"
+        silence_account_html: "%{name} limitit %{target}'s accoont"
+        suspend_account_html: "%{name} suspendit %{target}'s accoont"
+        unassigned_report_html: "%{name} unassigned clype %{target}"
+        unblock_email_account_html: "%{name} undingied %{target}'s email address"
+        unsensitive_account_html: "%{name} unmairked %{target}'s media as sensitive"
+        unsilence_account_html: "%{name} undid limit o %{target}'s accoont"
+        unsuspend_account_html: "%{name} unsuspendit %{target}'s accoont"
+        update_announcement_html: "%{name} updatit annooncement %{target}"
+        update_custom_emoji_html: "%{name} updatit emoji %{target}"
+        update_domain_block_html: "%{name} updatit domain dingie fir %{target}"
+        update_ip_block_html: "%{name} chynged rule fir IP %{target}"
+        update_status_html: "%{name} updatit post bi %{target}"
+        update_user_role_html: "%{name} chynged %{target} role"
+      deleted_account: deletit accoont
+      empty: Nae logs fun.
+      filter_by_action: Filter bi action
+      filter_by_user: Filter bi uiser
+      title: Audit log
+    announcements:
+      destroyed_msg: Annooncement successfully deletit!
+      edit:
+        title: Edit annooncement
+      empty: Nae annooncements fun.
+      live: Live
+      new:
+        create: Mak annooncement
+        title: New annooncement
+      publish: Publish
+      published_msg: Annooncement successfully published!
+      scheduled_for: Schedult fir %{time}
+      scheduled_msg: Annooncement schedult fir publication!
+      title: Annooncements
+      unpublish: Unpublish
+      unpublished_msg: Annooncement successfully unpublished!
+      updated_msg: Annooncement successfully updatit!
+    custom_emojis:
+      assign_category: Assign caitegory
+      by_domain: Domain
+      copied_msg: Successfully creatit local copy o the emoji
+      copy: Copy
+      copy_failed_msg: Cuidnae mak a local copy o that emoji
+      create_new_category: Mak new category
+      created_msg: Emoji successfully creatit!
+      delete: Delete
+      destroyed_msg: Emoji successfully destroyit!
+      disable: Turn aff
+      disabled: Turnt aff
+      disabled_msg: Successfully turnt aff that emoji
+      emoji: Emoji
+      enable: Turn on
+      enabled: Turnt on
+      enabled_msg: Successfully turnt on that emoji
+      image_hint: PNG or GIF up tae %{size}
+      list: List
+      listed: Listit
+      new:
+        title: Add new custom emoji
+      no_emoji_selected: Nae emojis wis chynged as naen wis selectit
+      not_permitted: Ye'r no permittit fir tae dae this action
+      overwrite: Owerwrite
+      shortcode: Shortcode
+      shortcode_hint: At least 2 chairacters, ainly alphanumeric chairacters an unnerscores
+      title: Custom emoji
+      uncategorized: No categorized
+      unlist: Unlist
+      unlisted: Unlistit
+      update_failed_msg: Cuidnae update that emoji
+      updated_msg: Emoji successfully updatit!
+      upload: Upload
+    dashboard:
+      active_users: active uisers
+      interactions: interactions
+      media_storage: Media storage
+      new_users: new uisers
+      opened_reports: clypes opent
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> pendin appeal"
+        other: "<strong>%{count}</strong> pendin appeals"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> pendin clype"
+        other: "<strong>%{count}</strong> pendin clypes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> pendin hashtag"
+        other: "<strong>%{count}</strong> pendin hashtags"
+      pending_users_html:
+        one: "<strong>%{count}</strong> pendin uiser"
+        other: "<strong>%{count}</strong> pendin uisers"
+      resolved_reports: clypes resolvit
+      software: Saftware
+      sources: Sign-up soorces
+      space: Space uisage
+      title: Dashboord
+      top_languages: Tap active leids
+      top_servers: Tap active servers
+      website: Wabsteid
+    disputes:
+      appeals:
+        empty: Nae appeals fun.
+        title: Appeals
+    domain_allows:
+      add_new: Alloo federation wi domain
+      created_msg: Domain haes been successfully allooed fir federation
+      destroyed_msg: Domain haes been disallooed fae federation
+      export: Export
+      import: Import
+      undo: Disalloo federation wi domain
+    domain_blocks:
+      add_new: Add new domain dingie
+      created_msg: Domain dingie is noo gettin processed
+      destroyed_msg: Domain dingie haes been unduin
+      domain: Domain
+      edit: Edit domain dingie
+      existing_domain_block: Ye'v awriddy pitten stricter limits on %{name}.
+      existing_domain_block_html: Ye'v awriddy pitten stricter limits on %{name}, ye need tae <a href="%{unblock_url}">undingie it</a> furst.
+      export: Export
+      import: Import
+      new:
+        create: Mak dingie
+        hint: The domain dingie wullnae stap the makkin o accoont entries in the database, but wull retroactively an automatically apply specific moderation methods on thae accoonts.
+        severity:
+          desc_html: "<strong>Limit</strong> wull mak posts fae accoonts at this domain invisible tae oniebody thit isnae follaein them. <strong>Suspend</strong> wull tak doon aw content, media, an profile data fir this domain's accoonts fae yer server. Uise <strong>Naen</strong> if ye juist want tae reject media files."
+          noop: Naen
+          silence: Limit
+          suspend: Suspend
+        title: New domain dingie
+      no_domain_block_selected: Nae domain dingies wis chynged as naen wis selectit
+      not_permitted: Ye urnae permittit tae dae this action
+      obfuscate: Obfuscate domain nemm
+      obfuscate_hint: Pairtly obfuscate the domain nemm in the list if advertisin the list o domain limitations is turnt on
+      private_comment: Private comment
+      private_comment_hint: Comment aboot this domain limitation fir internal uise bi the moderators.
+      public_comment: Public comment
+      public_comment_hint: Comment aboot this domain limitation fir the general public, if advertisin the list of domain limitations is turnt on.
+      reject_media: Rejeck media files
+      reject_media_hint: Taks doon locally stored media files an refuses tae doonload onie in the future. Irrelevant fir suspensions
+      reject_reports: Rejeck clypes
+      reject_reports_hint: Ignore aw clypes comin fae this domain. Irrelevant fir suspensions
+      undo: Undae domain dingie
+      view: Luik at domain dingie
+    email_domain_blocks:
+      add_new: Add new
+      attempts_over_week:
+        one: "%{count} attempt ower the last week"
+        other: "%{count} sign-up attempts ower the last week"
+      created_msg: Successfully dingied email domain
+      delete: Delete
+      dns:
+        types:
+          mx: MX record
+      domain: Domain
+      new:
+        create: Add domain
+        resolve: Resolve domain
+        title: Dingie new email domain
+      no_email_domain_block_selected: Nae email domain dingies got chynged as naen wis selectit
+      resolved_dns_records_hint_html: The domain nemm resolves tae the follaein MX domains, thit ur ultimately responsible fir acceptin email. Dingiein a MX domain wull dingie sign-ups fae onie email address thit uises the same MX domain, even if the visible domain name is different. <strong>Caw canny no tae dingie major email providers.</strong>
+      resolved_through_html: Resolvit throu %{domain}
+      title: Dingied email domains
+    export_domain_allows:
+      new:
+        title: Import domain alloos
+      no_file: Nae file selectit
+    export_domain_blocks:
+      import:
+        description_html: Ye'r aboot tae import a list o domain dingies. Please luik ower this list affa carefu like, especially if ye didnae write this list yersel.
+        existing_relationships_warning: Existin follae relationships
+        private_comment_description_html: 'Tae help ye track whaur importit dingies come fae, importit dingies wull be makkit wi the follaein private comment: <q>%{comment}</q>'
+        private_comment_template: Importit fae %{source} on %{date}
+        title: Import domain dingies
+      new:
+        title: Import domain dingies
+      no_file: Nae file selectit
+    follow_recommendations:
+      description_html: "<strong>Follae recommendations gie new uisers a haun tae quickly fin interestin content</strong>. Whan a uiser haesnae interactit wi ithers eneuch fir ta get personalized follae recommendations, thir accounts get recommendit insteid. They get re-calculatit on a daily basis fae a mix o accoonts wi the heichest recent engagements an heichest local folloaer coonts fir a gien leid."
+      language: Fir leid
+      status: Status
+      suppress: Turn aff follae recommendation
+      suppressed: Turnt aff
+      title: Follae recommendations
+      unsuppress: Turn on follae recommendation
+    instances:
+      availability:
+        description_html:
+          one: If deliverin tae the domain fails <strong>%{count} day</strong> athoot succeedin, nae mair delivery attempts wull be made unless a delivery <em>fae</em> the domain is received.
+          other: If deliverin tae the domain fails on <strong>%{count} different days</strong> athoot succeedin, nae mair delivery attempts wull be made unless a delivery <em>fae</em> the domain is received.
+        failure_threshold_reached: Failure threshaud reached on %{date}.
+        failures_recorded:
+          one: Failed attempt on %{count} day.
+          other: Failed attempts on %{count} different days.
+        no_failures_recorded: Nae failures on record.
+        title: Availability
+        warning: The last attempt tae connect tae this server haesnae been successful
+      back_to_all: Aw
+      back_to_limited: Limitit
+      back_to_warning: Warnin
+      by_domain: Domain
+      confirm_purge: Ye sure ye'r wantin tae delete data fae this domain fir ever?
+      content_policies:
+        comment: Internal note
+        description_html: Ye kin define content policies thit'll be applied tae aw accoonts fae this domain an onie o its subdomains.
+        policies:
+          reject_media: Reject media
+          reject_reports: Reject clypes
+          silence: Limit
+          suspend: Suspend
+        policy: Policy
+        reason: Public raison
+        title: Content policies
+      dashboard:
+        instance_accounts_dimension: Maist follaed accoonts
+        instance_accounts_measure: stowed accoonts
+        instance_followers_measure: oor follaers there
+        instance_follows_measure: their follaers here
+        instance_languages_dimension: Tap leids
+        instance_media_attachments_measure: stowed media attachments
+        instance_reports_measure: clypes aboot them
+        instance_statuses_measure: stowed posts
+      delivery:
+        all: Aw
+        clear: Claer delivery errors
+        failing: Failin
+        restart: Restert delivery
+        stop: Stap delivery
+        unavailable: No available
+      delivery_available: Delivery is available
+      delivery_error_days: Delivery error days
+      delivery_error_hint: If delivery isnae possible fir %{count} days, it wull be automatically mairked as no deliverable.
+      destroyed_msg: Data fae %{domain} is noo queued fir imminent deletion.
+      empty: Nae domains fun.
+      known_accounts:
+        one: "%{count} kent accoont"
+        other: "%{count} kent accoonts"
+      moderation:
+        all: Aw
+        limited: Limitit
+        title: Moderation
+      private_comment: Private comment
+      public_comment: Public comment
+      purge: Purge
+      purge_description_html: Gin ye believe this domain is affline fae no on, ye kin delete aw accoont records an associatit data fae this domain fae yer storage. This'll mibbie tak a while.
+      title: Federation
+      total_blocked_by_us: Dingied bi us
+      total_followed_by_them: Follaed bi them
+      total_followed_by_us: Follaed bi us
+      total_reported: Clypes aboot them
+      total_storage: Media attachments
+      totals_time_period_hint_html: The totals shawn ablow include data fir aw time.
+    invites:
+      deactivate_all: Deactivate aw
+      filter:
+        all: Aw
+        available: Available
+        expired: Expirit
+        title: Filter
+      title: Invites
+    ip_blocks:
+      add_new: Mak rule
+      created_msg: Successfully addit new IP rule
+      delete: Delete
+      expires_in:
+        '1209600': 2 weeks
+        '15778476': 6 month
+        '2629746': 1 month
+        '31556952': 1 year
+        '86400': 1 day
+        '94670856': 3 year
+      new:
+        title: Mak new IP rule
+      no_ip_block_selected: Nae IP rules wis chynged as naen wis selectit
+      title: IP rules
+    relationships:
+      title: "%{acct}'s relationships"
+    relays:
+      add_new: Add new relay
+      delete: Delete
+      description_html: A <strong>federation relay</strong> is a intermediary server thit exchanges large volumes o public posts atween servers thit subscribe an publish tae it. <strong>It kin help oot wee an medium servers fin content fae the fediverse</strong>, thit wad itherwise require local uisers follaein ither fowk on remote servers.
+      disable: Turn aff
+      disabled: Turnt aff
+      enable: Turn in
+      enable_hint: Ance turnt on, yer server wull subscribe tae aw public posts fae this relay, an will stert sennin this server's public posts tae it.
+      enabled: Turnt on
+      inbox_url: Relay URL
+      pending: Waitin fir relay's approval
+      save_and_enable: Save an turn on
+      setup: Setup a relay connexion
+      signatures_not_enabled: Relays wullnae wirk richt whilst secure mode or limitit federation mode is turnt on
+      status: Status
+      title: Relays
+    report_notes:
+      created_msg: Clype note successfully creatit!
+      destroyed_msg: Clype note successfully deletit!
+    reports:
+      account:
+        notes:
+          one: "%{count} note"
+          other: "%{count} notes"
+      action_log: Audit log
+      action_taken_by: Action taen bi
+      actions:
+        delete_description_html: The clyped on posts wull be deletit an a strike wull be recordit fir tae help ye escalate on future infractions bi the same accoont.
+        mark_as_sensitive_description_html: The media in the clyped on posts will be mairked as sensitive an a strike wull be recordit fir tae help ye escalate on future infractions bi the same accoont.
+        other_description_html: See mair options fir controllin the accoont's behaviour an customize communication tae the clyped on accoont.
+        resolve_description_html: Nae action wull be taen aginst the clyped on accoont, nae strike recordit, an the clype wull be shut.
+        silence_description_html: The profile wull be visible ainly tae thaim thit awriddy follae it or luik it up bi haun, severely limitin its reach. This kin aye be revertit.
+        suspend_description_html: The profile an aw its contents wull become inaccessible tae it is eventually deletit. Interactin wi the accoont wullnae be possible. Reversible athin 30 days.
+      actions_description_html: Decide whit action fir tae tak fir tae resolve this clype. If ye tak a punitive action agin the accoont thit wis clyped on, a email note wull be sent tae them, except whan the <strong>Mince</strong> caitegory is selectit.
+      add_to_report: Add mair tae yer clype
+      are_you_sure: Ye sure?
+      assign_to_self: Assign tae me
+      assigned: Assignt moderator
+      by_target_domain: Domain o clyped on accoont
+      category: Caitegory
+      category_description_html: The raison thit this accoont an/or content wis clyped on wull be cited in communication wi the clyped on accoont
+      comment:
+        none: Naen
+      comment_description_html: 'Fir tae gie mair information, %{name} wrate:'
+      created_at: Clyped on
+      delete_and_resolve: Delete posts
+      forwarded: Forretit
+      forwarded_to: Forertit tae %{domain}
+      mark_as_resolved: Mairk as resolvt
+      mark_as_sensitive: Mairk as sensitive
+      mark_as_unresolved: Mairk as no resolvt
+      no_one_assigned: Naebody
+      notes:
+        create: Add note
+        create_and_resolve: Resolve wi note
+        create_and_unresolve: Reopen wi note
+        delete: Delete
+        placeholder: Describe whit actions hae been taen, or onie ither relatit updates...
+        title: Notes
+      notes_description_html: View an lea notes tae ither moderators an yer future sel
+      quick_actions_description_html: 'Tak a quick action or scrow doon fir tae see clyped on content:'
+      remote_user_placeholder: the remote uiser fae %{instance}
+      reopen: Reopen clype
+      report: 'Clype #%{id}'
+      reported_account: Clyped on accoont
+      reported_by: Clyped on bi
+      resolved: Resolvt
+      resolved_msg: Clype successfully resolvt!
+      skip_to_actions: Jouk tae actions
+      status: Status
+      statuses: Clyped on content
+      statuses_description_html: Offendin content wull be citit in communication wi the clyped on accoont
+      target_origin: Origin o clyped on accoont
+      title: Clypes
+      unassign: Unassign
+      unresolved: No resolvt
+      updated_at: Updatit
+      view_profile: Luik at profile
+    roles:
+      add_new: Add role
+      assigned_users:
+        one: "%{count} uiser"
+        other: "%{count} uisers"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Invites
+        moderation: Moderation
+        special: Special
+      delete: Delete
+      description_html: Wi <strong>uiser roles</strong>, ye kin customize whit functions an areas o Mastodon yer uisers kin access.
+      edit: Edit '%{name}' role
+      everyone: Defaut permissions
+      everyone_full_description_html: This is the <strong>base role</strong> affectin <strong>aw uisers</strong>, even thaim athoot a assignt role. Aw ither roles inherit permissions fae it.
+      permissions_count:
+        one: "%{count} permission"
+        other: "%{count} permissions"
+      privileges:
+        administrator: Administrator
+        administrator_description: Uisers wi this permission wull bypass every permission
+        delete_user_data: Delete Uiser Data
+        delete_user_data_description: Alloos uisers fir tae delete ither uisers' data athoot delay
+        invite_users: Invite Uisers
+        invite_users_description: Alloos uisers fir tae invite new fowk tae the server
+        manage_announcements: Manage Annooncements
+        manage_announcements_description: Alloos uisers fir tae manage annooncements on the server
+        manage_appeals: Manage Appeals
+        manage_appeals_description: Alloos uisers fir tae luik ower appeals aginst moderation actions
+        manage_blocks: Manage Dingies
+        manage_blocks_description: Alloos uisers fir tae dingie email providers an IP addresses
+        manage_custom_emojis: Manage Custom Emoji
+        manage_custom_emojis_description: Alloos uisers fir tae manage custom emoji on the server
+        manage_federation: Manage Federation
+        manage_federation_description: Alloos uisers fir tae dingie or alloo federation wi ither domains, an control deliverability
+        manage_invites: Manage Invites
+        manage_invites_description: Alloos uisers fir tae broose an turn aff invite links
+        manage_reports: Manage Clypes
+        manage_reports_description: Alloos uisers fir tae luik ower clypes an perform moderation actions aginst them
+        manage_roles: Manage Roles
+        manage_roles_description: Alloos uisers fir tae manage an assign roles ablow their ain's
+        manage_rules: Manage Rules
+        manage_rules_description: Alloos uisers fir tae chynge server rules
+        manage_settings: Manage Settins
+        manage_settings_description: Alloos uisers fir tae chynge site settins
+        manage_taxonomies: Manage Taxonomies
+        manage_taxonomies_description: Alloos uisers fir tae luik ower trendin content an update hashtag settins
+        manage_user_access: Manage Uiser Access
+        manage_user_access_description: Alloos uisers fir tae turn aff ither uisers' twa-factor authentication, chynge their email address, an reset their passwird
+        manage_users: Manage Uisers
+        manage_users_description: Alloos uisers fir tae luik at ither uisers' details an cairry oot moderation actions agin them
+        manage_webhooks: Manage Webhooks
+        manage_webhooks_description: Alloos uisers fir tae set up webhooks fir administrative events
+        view_audit_log: Luik at Audit Log
+        view_audit_log_description: Alloos uisers fir tae see a history o administrative actions on the server
+        view_dashboard: View Dashboord
+        view_dashboard_description: Alloos uisers fir tae access the dashboord an a hantle o metrics
+        view_devops: DevOps
+        view_devops_description: Alloos uisers fir tae access Sidekiq an pgHero dashboords
+      title: Roles
+    rules:
+      add_new: Add rule
+      delete: Delete
+      description_html: Whilst maist fowk haud thit they'v read and agree wi the terms o service, uisually fowk dinnae read throu them tae efter a problem comes up. <strong>Mak it easier fir tae see yer server's rules at a glisk bi pittin them up in a flat bullet pynt list.</strong> Try fir tae keep individual rules short an simple, but try no tae sinner them intae a wheen o separate items tae.
+      edit: Edit rule
+      empty: Nae server rules hae been definit yit.
+      title: Server rules
+    settings:
+      about:
+        manage_rules: Manage server rules
+        preamble: Gie in-depth information aboot hou the server is operatit, moderatit, an fundit.
+        rules_hint: There a dedicatit area fir the rules thit yer uisers ur expectit tae haud tae.
+        title: Aboot
+      appearance:
+        preamble: Customize Mastodon's wab interface.
+        title: Appearance
+      branding:
+        preamble: Yer server's ain brandin haes it staun oot fae ither servers in the netwirk. This information wull mibbie get displayit athort a variety o environments, sic as Mastodon's wab interface, native applications, in link previews on ither wabsteids an athin messaging apps, an mair asides. Fir this raison, it is best fir tae keep this information claer, short an concise.
+        title: Brandin
+      content_retention:
+        preamble: Control hou uiser-generatit content is stored in Mastodon.
+        title: Content retention
+      discovery:
+        follow_recommendations: Follae recommendations
+        preamble: Bringin forret interestin content helps ye tae bring in new uisers thit mibbie wullnae ken oniebody on Mastodon yit. Control hou various discovery features wirk on yer server.
+        profile_directory: Profile directory
+        public_timelines: Public timelines
+        title: Discovery
+        trends: Trends
+      domain_blocks:
+        all: Tae awbody
+        disabled: Tae naebody
+        users: Tae logged-in local uisers
+      registrations:
+        preamble: Control wha kin mak a accoont on yer server.
+        title: Registrations
+      registrations_mode:
+        modes:
+          approved: Approval needit fir sign up
+          none: Naebody kin sign up
+          open: Oniebody kin sign up
+      title: Server Settins
+    site_uploads:
+      delete: Delete uploadit file
+      destroyed_msg: Site upload successfully deletit!
+    statuses:
+      account: Author
+      application: Application
+      back_to_account: Back tae accoont page
+      back_to_report: Back tae clype page
+      batch:
+        remove_from_report: Remove fae clype
+        report: Clype
+      deleted: Deletit
+      favourites: Favourites
+      history: Version history
+      in_reply_to: Replyin tae
+      language: Leid
+      media:
+        title: Media
+      metadata: Metadata
+      no_status_selected: Nae posts wis chynged as naen wis selectit
+      open: Open post
+      original_status: Original post
+      reblogs: Reblogs
+      status_changed: Post chynged
+      title: Accoont posts
+      trending: Trendin
+      visibility: Visibility
+      with_media: Wi media
+    strikes:
+      actions:
+        delete_statuses: "%{name} deletit %{target}'s posts"
+        disable: "%{name} froze %{target}'s accoont"
+        mark_statuses_as_sensitive: "%{name} mairked %{target}'s posts as sensitive"
+        none: "%{name} sent a warnin tae %{target}"
+        sensitive: "%{name} mairked %{target}'s accoont as sensitive"
+        silence: "%{name} limitit %{target}'s accoont"
+        suspend: "%{name} suspendit %{target}'s accoont"
+      appeal_approved: Appealt
+      appeal_pending: Appeal pendin
+    system_checks:
+      database_schema_check:
+        message_html: There pendin database migrations. Please rin them fir tae mak siccar the application behaves as expectit
+      elasticsearch_running_check:
+        message_html: Cuidnae connect tae Elasticseirch. Please check that it is rinnin, or turn aff ful-text seirch
+      elasticsearch_version_check:
+        message_html: 'Incompatible Elasticseirch version: %{value}'
+        version_comparison: Elasticseirch %{running_version} is rinnin whilst %{required_version} is requirt
+      rules_check:
+        action: Manage server rules
+        message_html: Ye huvnae definit onie server rules.
+      sidekiq_process_check:
+        message_html: Nae Sidekiq process rinnin fir the %{value} queue(s). Please luik ower yer Sidekiq configuration
+    tags:
+      review: Luik ower status
+      updated_msg: Hashtag settins updatit successfully
+    title: Administration
+    trends:
+      allow: Alloo
+      approved: Approvt
+      disallow: Disalloo
+      links:
+        allow: Alloo link
+        allow_provider: Alloo publisher
+        description_html: Thir's links thit ur bein shared aboot a lot the noo bi accoonts thit yer server sees posts fae. It kin help yer uisers fin oot whit's gaun on in the warld. Nae links ur displayed in public tae ye approve the publisher. Ye kin alloo or rejeck individual links tae.
+        disallow: Disalloo link
+        disallow_provider: Disalloo publisher
+        no_link_selected: Nae links wis chynged as naen wis selectit
+        publishers:
+          no_publisher_selected: Nae publishers wis chynged as naen wis selectit
+        shared_by_over_week:
+          one: Shared bi ae person ower the last week
+          other: Shared bi %{count} fowk ower the last week
+        title: Trendin links
+        usage_comparison: Shared %{today} times the day, compart tae %{yesterday} yisterday
+      only_allowed: Ainly allooed
+      pending_review: Pendin review
+      preview_card_providers:
+        allowed: Links fae this publisher kin trend
+        description_html: Thir's the domains thit links aften get shared fae on yer server. Links wullnae trend publicly unless the domain o the link is approved. Yer approval (or rejection) extends tae subdomains.
+        rejected: Links fae this publisher wullnae trend
+        title: Publishers
+      rejected: Rejectit
+      statuses:
+        allow: Alloo post
+        allow_account: Alloo author
+        description_html: Thir's posts thit yer server kens aboot thit's bein shared an favourited a lot the noo. It kin help yer new an returnin uisers fir tae fin mair fowk tae follae. Nae posts get displayed publicly tae ye approve the author, an the author alloos their accoont tae be suggestit tae ithers. Ye kin alloo or rejeck individual posts tae.
+        disallow: Disalloo post
+        disallow_account: Disalloo author
+        no_status_selected: Nae trendin posts wis chynged as naen wis selectit
+        not_discoverable: Author haesnae optit-in tae bein discoverable
+        shared_by:
+          one: Shared or favouritit ae time
+          other: Shared an favouritit %{friendly_count} times
+        title: Trendin posts
+      tags:
+        current_score: Current score %{score}
+        dashboard:
+          tag_accounts_measure: unique uises
+          tag_languages_dimension: Tap leids
+          tag_servers_dimension: Tap servers
+          tag_servers_measure: different servers
+          tag_uses_measure: total uises
+        description_html: Thir's hashtags thit ur appearin the noo in a load o posts thit yer server sees. It kin help yer uisers fin oot whit fowk ur talkin aboot maist the noo. Nae hashtags ur displayit publicly tae ye approve them.
+        listable: Kin be suggestit
+        no_tag_selected: Nae tags wis chynged as naen wis selectit
+        not_listable: Wullnae be suggestit
+        not_trendable: Wullnae appear unner trends
+        not_usable: Cannae be uised
+        peaked_on_and_decaying: Peaked on %{date}, noo fawin aff
+        title: Trendin hashtags
+        trendable: Kin appear unner trends
+        trending_rank: 'Trendin #%{rank}'
+        usable: Kin be uised
+        usage_comparison: Uised %{today} times the day, compart tae %{yesterday} yisterday
+        used_by_over_week:
+          one: Uised bi ae person ower the last week
+          other: Uised bi %{count} fowk ower the last week
+      title: Trends
+      trending: Trendin
+    warning_presets:
+      add_new: Add new
+      delete: Delete
+      edit_preset: Edit warnin preset
+      empty: Ye huvnae definit onie warnin presets yit.
+      title: Manage warnin presets
+    webhooks:
+      add_new: Add enpynt
+      delete: Delete
+      description_html: A <strong>wabhook</strong> lets Mastodon push <strong>rael-time notifications</strong> aboot srlectit events tae yer ain application, sae thit yer application kin <strong>automatically trigger reactions</strong>.
+      disable: Turn aff
+      disabled: Turnt aff
+      edit: Edit enpynt
+      empty: Ye'v nae wabhook enpynts configurt yit.
+      enable: Turn on
+      enabled: Active
+      enabled_events:
+        one: 1 enabilt event
+        other: "%{count} enabilt events"
+      events: Events
+      new: New webhook
+      rotate_secret: Rotate secret
+      secret: Signin secret
+      status: Status
+      title: Webhooks
+      webhook: Webhook
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: tae delete their posts
+        disable: tae freeze their accoont
+        mark_statuses_as_sensitive: tae mairk their posts as sensitive
+        none: a warnin
+        sensitive: tae mairk their accoont as sensitive
+        silence: tae limit their accoont
+        suspend: tae suspend their accoont
+      body: "%{target} is appealin a moderation decision bi %{action_taken_by} fae %{date}, thit wis %{type}. They wrate:"
+      next_steps: Ye kin approve the appeal fir tae undae the moderation decision, or dingie it.
+      subject: "%{username} is appealin a moderation decision on %{instance}"
+    new_pending_account:
+      body: The details o the new accoont' ablow. Ye kin approve or rejeck this application.
+      subject: New accoont up fir review on %{instance} (%{username})
+    new_report:
+      body: "%{reporter} haes clyped on %{target}"
+      body_remote: Somebody fae %{domain} haes clyped on %{target}
+      subject: New coype fir %{instance} (#%{id})
+    new_trends:
+      body: 'The follaein items need luiked ower afore they kin get displayit publicly:'
+      new_trending_links:
+        title: Trendin links
+      new_trending_statuses:
+        title: Trendin posts
+      new_trending_tags:
+        no_approved_tags: There nae approved trendin hashtags the noo.
+        requirements: 'Onie o thir candidates cuid surpass the #%{rank} approved trendin hashtag, thit''s #%{lowest_tag_name} the noo, wi a score o %{lowest_tag_score}.'
+        title: Trendin hashtags
+      subject: New trends up fir luikin ower on %{instance}
+  aliases:
+    add_new: Mak alias
+    created_msg: Successfully makkit a new alias. Ye kin noo initiate the flit fae the auld accoont.
+    deleted_msg: Successfully removit the alias. Movin fae that accoont ower tae this ane wull nae langer be possible.
+    empty: Ye hae nae aliases.
+    hint_html: If ye'r wantin fir tae flit fae anither accoont tae this ane, ye kin mak a alias here, this is requirt afore ye kin gae forret flittin follaers fae the auld accoont tae this ane. This action bi an o itsel is <strong>hermless an reversible</strong>. <strong>The accoont migration is initiatie fae the auld accoont</strong>.
+    remove: Unlink alias
+  appearance:
+    advanced_web_interface: Advanced wab interface
+    advanced_web_interface_hint: 'Gin ye''r wantin fir tae mak uise o the ful width o yer screen, the advanced wab interface lets ye configure a wheen o different columns sae''s ye kin see as muckle information at the same time as ye want: Hame, notes, federatit timeline, onie nummer o lists an hashtags.'
+    animations_and_accessibility: Animations an accessibility
+    confirmation_dialogs: Confirmation dialogs
+    discovery: Discovery
+    localization:
+      body: Mastodon is translatit bi volunteers.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Awbody kin contribute.
+    sensitive_content: Sensitive content
+    toot_layout: Post leyoot
+  application_mailer:
+    notification_preferences: Chynge email preferences
+    salutation: "%{name},"
+    settings: 'Chynge email preferences: %{link}'
+    view: 'View:'
+    view_profile: View profile
+    view_status: View post
+  applications:
+    created: Application successfully creatit
+    destroyed: Application successfully deletit
+    regenerate_token: Regenerate access token
+    token_regenerated: Access token successfully regeneratit
+    warning: Be gey carefu wi this data. Never share it wi oniebody!
+    your_token: Yer access token
+  auth:
+    apply_for_account: Request a accoont
+    change_password: Passwird
+    delete_account: Delete accoont
+    delete_account_html: If ye'r wantin tae delete yer accoont, ye kin <a href="%{path}">dae it here</a>. Ye'll get asked fir confirmation.
+    description:
+      prefix_invited_by_user: "@%{name} invites ye tae jyne this server o Mastodon!"
+      prefix_sign_up: Sign up on Mastodon the day!
+      suffix: Wi a accoont, ye'll be able tae follae fowk, post updates an exchynge messages wi uisers fae onie Mastodon server an mair!
+    didnt_get_confirmation: Didnae gey yer confirmation instructions?
+    dont_have_your_security_key: Dinnae hae yer security key?
+    forgot_password: Forgot yer passwird?
+    invalid_reset_password_token: Passwird reset token isnae valid or expirit. Please request a new ane.
+    link_to_otp: Pit in a twa-factor code fae yer phone or a recovery code
+    link_to_webauth: Uise yer security key device
+    log_in_with: Log in wi
+    login: Log in
+    logout: Logoot
+    migrate_account: Uise a different accoont
+    migrate_account_html: Gin ye'r wantin fir tae redireck this accoont tae a different ane, ye kin <a href="%{path}">configure it here</a>.
+    or_log_in_with: Or log in wi
+    privacy_policy_agreement_html: A'v read an A agree tae the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Sign up
+    registration_closed: "%{instance} isnae acceptin onie new memmers"
+    resend_confirmation: Resen confirmation instructions
+    reset_password: Reset yer passwird
+    rules:
+      preamble: Thir's set an enforced bi the %{domain} moderators.
+      title: Some grun rules.
+    security: Security
+    set_new_password: Set new passwird
+    setup:
+      email_below_hint_html: If the email address ablow isnae correct, ye kin chynge it here an get a new confirmation email.
+      email_settings_hint_html: The confirmation email wis sent tae %{email}. If that email address isnae correct, ye kin chynge it in accoont settins.
+      title: Setup
+    sign_up:
+      preamble: Wi a accoont on this Mastodon server, ye'll be able tae follae onie ither person on the netwirk, regairdless o whaur their accoont is hostit.
+      title: Let's get ye set up on %{domain}.
+    status:
+      account_status: Accoont status
+      confirming: Waitin fir email confirmation fir tae be completit.
+      functional: Yer accoont is fully operational.
+      pending: Yer application is pendin review bi oor staff. This'll mibbie tak some time. Ye'll get a email if yer application is approved.
+      redirecting_to: Yer accoont isnae active acause it is redirectin tae %{acct} the noo.
+      view_strikes: Luik at past strikes aginst yer accoont
+    too_fast: Form submittit ower fast, try again.
+    use_security_key: Uise security key
+  authorize_follow:
+    already_following: Ye'r awriddy follaein this accoont
+    already_requested: Ye'v awriddy sent a follae request tae that accoont
+    error: Unfortunately, there wis a error luikin up the remote accoont
+    follow: Follae
+    follow_request: 'Ye hae sent a follae request tae:'
+    following: 'Success! Ye''r noo follaein:'
+    post_follow:
+      close: Or, ye kin juist shut this windae.
+      return: Shaw the uiser's profile
+      web: Gang tae the wab
+    title: Follae %{acct}
+  challenge:
+    confirm: Continue
+    hint_html: "<strong>wee tip:</strong> We wullnae ask ye fir yer passwird again fir the neist oor."
+    invalid_password: Passwird isnae valid
+    prompt: Confirm yer passwird fir tae continue
+  crypto:
+    errors:
+      invalid_key: isnae a valid Ed25519 or Curve25519 key
+      invalid_signature: isnae a valid Ed25519 signature
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}o"
+      about_x_months: "%{count}mo"
+      about_x_years: "%{count}y"
+      almost_x_years: "%{count}y"
+      half_a_minute: The noo
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: The noo
+      over_x_years: "%{count}y"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mo"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: The information ye pit in wisnae correct
+    confirm_password: Pit in yer current passwird fir tae verify yer identity
+    confirm_username: Pit in yer uisernemm fir tae confirm the procedure
+    proceed: Delete accoont
+    success_msg: Yer accoont wis successfully deletit
+    warning:
+      before: 'Afore proceedin, please read thir notes careful:'
+      caches: Content thit haes been cached bi ither servers eull mibbie persist
+      data_removal: Yer posts an ither data wull get permanently removed
+      email_change_html: Ye kin <a href="%{path}">chynge yer email address</a> athoot deletin yer accoont
+      email_contact_html: Gin it stull disnae arrive, ye kin email <a href="mailto:%{email}">%{email}</a> fir help
+      email_reconfirmation_html: Gin ye urnae gettin the confirmation email, ye kin <a href="%{path}">request it again</a>
+      irreversible: Ye wullnae be able tae restore or reactivate yer accoont
+      more_details_html: Fir mair details, see the <a href="%{terms_path}">privacy policy</a>.
+      username_available: Yer uisernemm wull become available again
+      username_unavailable: Yer uisername wull remain no available
+  disputes:
+    strikes:
+      action_taken: Action taen
+      appeal: Appeal
+      appeal_approved: This strike haes been successfully appealt an is nae langer valid
+      appeal_rejected: The appeal haes been rejectit
+      appeal_submitted_at: Appeal submittit
+      appealed_msg: Yer appeal haes been submittit. If it is approved, ye'll be notified.
+      appeals:
+        submit: Submit appeal
+      approve_appeal: Approve appeal
+      associated_report: Associatit clype
+      created_at: Datit
+      description_html: Thir's actions taen aginst yer accoont an warnins thit hae been sent tae ye bi the staff o %{instance}.
+      recipient: Addressed tae
+      reject_appeal: Rejeck appeal
+      status: 'Post #%{id}'
+      status_removed: Post awriddy taen aff the system
+      title: "%{action} fae %{date}"
+      title_actions:
+        delete_statuses: Post removal
+        disable: Freezin a accoont
+        mark_statuses_as_sensitive: Mairkin o posts as sensitive
+        none: Warnin
+        sensitive: Mairkin o accoont as sensitive
+        silence: Limitation o accoont
+        suspend: Suspension o accoont
+      your_appeal_approved: Yer appeal haes been approved
+      your_appeal_pending: Ye hae submittit a appeal
+      your_appeal_rejected: Yer appeal haes been rejectit
+  domain_validator:
+    invalid_domain: isnae a valid domain nemm
+  errors:
+    '400': The request thit ye submittit wisnae valid or it wis illformt.
+    '403': Ye dinnae hae permission fir tae luik at this page.
+    '404': The page thit ye'r luikin fir isnae here.
+    '406': This page isnae available in the requestit format.
+    '410': The page thit ye wur luikin fir disnae exist here oniemair.
+    '422':
+      content: Security verification failt. Ur ye dingiein cookies?
+      title: Security verification failt
+    '429': Ower monie requests
+    '500':
+      content: We're sorry, but somethin went wrang on oor en.
+      title: This page isnae correct
+    '503': The page cuidnae be served doon tae a temporary server failure.
+    noscript_html: Fir tae uise the Mastodon wab application, please turn on JavaScript. Alternatively, try ane o the <a href="%{apps_path}">native apps</a> fir Mastodon fir yer platform.
+  existing_username_validator:
+    not_found: cuidnae fin a local uiser wi that uisernemm
+    not_found_multiple: cuidnae fin %{usernames}
+  exports:
+    archive_takeout:
+      date: Date
+      download: Doonload yer archive
+      hint_html: Ye kin get a archive o yer <strong>posts an uploadit media</strong>. The exportit data wull be in the ActivityPub format, readable bi onie compliant saftware. Ye kin get a archive ilka 7 days.
+      in_progress: Compilin yer archive...
+      request: Get yer archive
+      size: Size
+    blocks: Ye dingie
+    bookmarks: Buikmairks
+    csv: CSV
+    domain_blocks: Domain dingies
+    lists: Lists
+    mutes: Ye wheesht
+    storage: Media storage
+  featured_tags:
+    add_new: Add new
+    errors:
+      limit: Ye'v awriddy featurt the maximum amoont o hashtags
+    hint_html: "<strong>Whit's featurt hashtags?</strong> They get pit prominently on yer public profile an alloo fowk fir tae broose yer public posts specifically unner thae hashtags. They'r a braw tuil fir keepin track o creative warks or lang-term projects."
+  filters:
+    contexts:
+      account: Profiles
+      home: Hame an lists
+      notifications: Notes
+      public: Public timelines
+      thread: Conversations
+    edit:
+      add_keyword: Add keywird
+      keywords: Keywirds
+      statuses: Individual posts
+      statuses_hint_html: This filter applies tae select individual posts regairdless o whither or no they match the keywirds ablow. <a href="%{path}">Review or remove posts fae the filter</a>.
+      title: Edit filter
+    errors:
+      deprecated_api_multiple_keywords: Thir parameters cannae be chynged fae this application acause they apply tae mair nor ane filter keywird. Uise a mair recent application or the wab interface.
+      invalid_context: Nae or invalid context supplied
+    index:
+      contexts: Filters in %{contexts}
+      delete: Delete
+      empty: Ye'v nae filters.
+      expires_in: Expires in %{distance}
+      expires_on: Expires on %{date}
+      keywords:
+        one: "%{count} keywird"
+        other: "%{count} keywirds"
+      statuses:
+        one: "%{count} post"
+        other: "%{count} posts"
+      statuses_long:
+        one: "%{count} individual post hid"
+        other: "%{count} individual posts hid"
+      title: Filters
+    new:
+      save: Save new filter
+      title: Add new filter
+    statuses:
+      back_to_filter: Back tae filter
+      batch:
+        remove: Remove fae filter
+      index:
+        hint: This filter applies tae select individual posts regairdless o ither criteria. Ye kin add mair posts tae this filter fae the wab interface.
+        title: Filtert posts
+  footer:
+    trending_now: Trendin the noo
+  generic:
+    all: Aw
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> item on this page is selectit."
+      other: Aw <strong>%{count}</strong> items on this page ur selectit.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> item matchin yer seirch is selectit."
+      other: Aw <strong>%{count}</strong> items matchin yer seirch is selectit.
+    changes_saved_msg: Chynges successfully saved!
+    copy: Copy
+    delete: Delete
+    deselect: Deselect aw
+    none: Naen
+    order_by: Order bi
+    save_changes: Save chynges
+    select_all_matching_items:
+      one: Pick %{count} item matchin yer seirch.
+      other: Pick aw %{count} items matchin yer seirch.
+    today: the day
+    validation_errors:
+      one: Somethin isnae quite richt yit! Please luik ower the error ablow
+      other: Somethin isnae quite richt yit! Please review %{count} errors ablow
+  html_validator:
+    invalid_markup: 'contains invalid HTML mairkup: %{error}'
+  imports:
+    errors:
+      invalid_csv_file: 'Invalid CSV file. Error: %{error}'
+      over_rows_processing_limit: contains mair nor %{count} rows
+    modes:
+      merge: Merge
+      merge_long: Keep existin records an add new anes
+      overwrite: Owerwrite
+      overwrite_long: Replace current records wi the new anes
+    preface: Ye kin import data thit ye'v exportit fae anither server, sic as a list o the fowk thit ye'r follaein or thaim thit ye'v dingied.
+    success: Yer data wis successfully uploadit an wull get processed in guid time
+    types:
+      blocking: Dingied list
+      bookmarks: Buikmairks
+      domain_blocking: Domain dingied list
+      following: Follaein list
+      muting: Wheesht list
+    upload: Upload
+  invites:
+    delete: Deactivate
+    expired: Expirt
+    expires_in:
+      '1800': 30 minties
+      '21600': 6 oors
+      '3600': 1 oor
+      '43200': 12 oors
+      '604800': 1 week
+      '86400': 1 day
+    expires_in_prompt: Niver
+    generate: Generate invite link
+    invited_by: 'Ye got invitit bi:'
+    max_uses:
+      one: 1 uise
+      other: "%{count} uises"
+    max_uses_prompt: Nae limit
+    prompt: Generate an share links wi ithers fir tae gie access tae this server
+    table:
+      expires_at: Expires
+      uses: Uises
+    title: Invite fowk
+  lists:
+    errors:
+      limit: Ye'v hit the maximum amoont o lists
+  login_activities:
+    authentication_methods:
+      otp: twa-factor authentication app
+      password: passwird
+      sign_in_token: email security code
+      webauthn: security keys
+    description_html: If ye see activity on yer accoont thit ye dinnae recognize, consider chyngin yer passwird an turnin on twa-factor authentication.
+    empty: Nae authentication history available
+    failed_sign_in_html: Failt sign-in attempt wi %{method} fae %{ip} (%{browser})
+    successful_sign_in_html: Successfu sign-in wi %{method} fae %{ip} (%{browser})
+    title: Authentication history
+  media_attachments:
+    validations:
+      images_and_video: Cannae attach a video tae a post thit awriddy contains images
+      not_ready: Cannae attach files thit huvnae finisht processin. Try again in a wee minute!
+      too_many: Cannae attach mair nor 4 files
+  migrations:
+    acct: Flitit tae
+    cancel: Cancel redirect
+    cancel_explanation: Cancellin the redirect wull re-activate yer current accoont, but wullnae bring back follaers thit hae been flitit tae that accoont.
+    cancelled_msg: Successfully cancelt the redirect.
+    errors:
+      already_moved: is the same accoont thit ye'v awriddy flittit tae
+      missing_also_known_as: isnae a alias o this accoont
+      move_to_self: cannae be current accoont
+      not_found: cuidnae be fun
+      on_cooldown: Ye'r on cooldoon
+    followers_count: Follaers at time o flit
+    incoming_migrations: Flittin fae a different accoont
+    incoming_migrations_html: Tae flit fae anither accoont tae this ane, first ye need tae <a href="%{path}">mak a accoont alias</a>.
+    moved_msg: Yer accoont is noo redirectin tae %{acct} an yer follaers ur gettin flittit ower.
+    not_redirecting: Yer accoont isnae redirectin tae onie ither accoont the noo.
+    on_cooldown: Ye'v flittit yer accoont o late. This function wull become available again in %{count} days.
+    past_migrations: Past flittins
+    proceed_with_move: Flit follaers
+    redirected_msg: Yer accoont is noo redirectin tae %{acct}.
+    redirecting_to: Yer accoont is redirectin tae %{acct}.
+    set_redirect: Set redirect
+    warning:
+      backreference_required: The new accoont haes tae be configurt furst fir tae back-reference this ane
+      before: 'Afore proceedin, please read thir notes carefully:'
+      cooldown: Efter flittin there a waitin period durin which ye will cannae flit again
+      disabled_account: Yer current accoont wullnae be fully uisable efterwart. Hou an iver, ye wull hae access tae data export as weil as re-activation.
+      followers: This action wull flit aw follaers fae the current accoont tae the new accoont
+      only_redirect_html: Alternatively, ye kin <a href="%{path}">ainly pit up a redirect on yer profile</a>.
+      other_data: Nae ither data wull get flittit automatically
+      redirect: Yer current accoont's profile wull get updatit wi a redirect note an be excludit fae seirches
+  moderation:
+    title: Moderation
+  move_handler:
+    carry_blocks_over_text: This uiser flittit fae %{acct}, thit ye'v dingied.
+    carry_mutes_over_text: This uiser flittit fae %{acct}, thit ye'v wheesht.
+    copy_account_note_text: 'This uiser flittit fae %{acct}, here yer previous notes aboot them:'
+  navigation:
+    toggle_menu: Toggle menu
+  notification_mailer:
+    admin:
+      report:
+        subject: "%{name} submittit a clype"
+      sign_up:
+        subject: "%{name} signt up"
+    favourite:
+      body: 'Yer post wis favouritit bi %{name}:'
+      subject: "%{name} favouritit yer post"
+      title: New favourite
+    follow:
+      body: "%{name} is noo follaein ye!"
+      subject: "%{name} is noo follaein ye"
+      title: New follaer
+    follow_request:
+      action: Manage follae requests
+      body: "%{name} haes requestit tae follae ye"
+      subject: 'Pendin follaer: %{name}'
+      title: New follae request
+    mention:
+      action: Reply
+      body: 'Ye wur menshied bi %{name} in:'
+      subject: Ye got mentioned bi %{name}
+      title: New menshie
+    poll:
+      subject: A poll bi %{name} haes endit
+    reblog:
+      body: 'Yer post wis heezed bi %{name}:'
+      subject: "%{name} heezed yer post"
+      title: New heeze
+    status:
+      subject: "%{name} juist postit"
+    update:
+      subject: "%{name} editit a post"
+  notifications:
+    email_events: Events fir email notes
+    email_events_hint: 'Pick events thit ye''r wantin tae get notes fir:'
+    other_settings: Ither notes settins
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Pit in the code generatit bi yer authenticator app fir tae confirm
+    description_html: If ye turn on <strong>twa-factor authentication</strong> uisin a authenticator app, loggin in wull require ye fir tae be in possession o yer phone, thit wull generate tokens fir ye tae pit in.
+    enable: Turn on
+    instructions_html: "<strong>Scan this QR code intae Google Authenticator or a similar TOTP app on yer phone</strong>. Fae noo on, that app will generate tokens thit ye wull hae tae pit in whan ye'r loggin in."
+    manual_instructions: 'If ye cannae scan in the QR code an need tae pit it in bi haun, here the plain-text secret:'
+    setup: Set up
+    wrong_code: The enterit code wisnae valid! Is yer server time an device time richt?
+  pagination:
+    newer: Newer
+    next: Neist
+    older: Aulder
+    prev: Prev
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Ye'v votit in this poll awriddy
+      duplicate_options: hae duplicate items
+      duration_too_long: is ower faur intae the future
+      duration_too_short: is ower suin
+      expired: The poll haes endit awriddy
+      invalid_choice: The vote option ye picked disnae exist
+      over_character_limit: cannae be langer nor %{max} chairacters each
+      too_few_options: shuid hae mait nor ae item
+      too_many_options: cannae contain mair than %{max} items
+  preferences:
+    other: Ither
+    posting_defaults: Postin defauts
+    public_timelines: Public timelines
+  privacy_policy:
+    title: Privacy Policy
+  reactions:
+    errors:
+      limit_reached: Limit o different reactions reached
+      unrecognized_emoji: isnae a recognized emoji
+  relationships:
+    activity: Accoont activity
+    dormant: Dormant
+    follow_selected_followers: Follae selectit follaers
+    followers: Follaers
+    following: Follaein
+    invited: Invitit
+    last_active: Last active
+    most_recent: Maist recent
+    moved: Flittit
+    mutual: Mutual
+    primary: Primary
+    relationship: Relationship
+    remove_selected_domains: Tak doon aw follaers fae the selectit domains
+    remove_selected_followers: Remove selectit follaers
+    remove_selected_follows: Unfollae selectit uisers
+    status: Accoont status
+  remote_follow:
+    missing_resource: Cuidnae fin the requirt redirect URL fir yer accoont
+  reports:
+    errors:
+      invalid_rules: disnae reference valid rules
+  rss:
+    content_warning: 'Content warnin:'
+    descriptions:
+      account: Public posts fae @%{acct}
+      tag: 'Public posts tagged #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Ye'v went by the limit o %{limit} scheduled posts thit ye'r allooed fir the day
+    over_total_limit: Ye'v went by the limit o %{limit} scheduled posts
+    too_soon: The schedult date haes tae be in the future
+  sessions:
+    activity: Last activity
+    browser: Brooser
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Unkent brooser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Current session
+    description: "%{browser} on %{platform}"
+    explanation: Thir's the wab broosers logged in tae yer Mastodon accoont the noo.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: unkent platform
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Revoke
+    revoke_success: Session successfully revokt
+    title: Sessions
+    view_authentication_history: Luik at authentication history o yer accoont
+  settings:
+    account: Accoont
+    account_settings: Accoont settins
+    aliases: Accoont aliases
+    appearance: Appearance
+    authorized_apps: Authorized apps
+    back: Back tae Mastodon
+    delete: Accoont deletion
+    development: Development
+    edit_profile: Edit profile
+    export: Data export
+    featured_tags: Featured hashtags
+    import: Import
+    import_and_export: Import an export
+    migrate: Accoont flittin
+    notifications: Notes
+    preferences: Preferences
+    profile: Profile
+    relationships: Follaes and follaers
+    statuses_cleanup: Automatit post deletion
+    strikes: Moderation strikes
+    two_factor_authentication: Twa-factor Auth
+    webauthn_authentication: Security keys
+  statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audio"
+      description: 'Attached: %{attached}'
+      image:
+        one: "%{count} image"
+        other: "%{count} images"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    boosted_from_html: Heezed fae %{acct_link}
+    content_warning: 'Content warnin: %{warning}'
+    default_language: Same as interface leid
+    disallowed_hashtags:
+      one: 'containt a disallooed hashtag: %{tags}'
+      other: 'containt the disallooed hashtags: %{tags}'
+    edited_at_html: Editit %{date}
+    errors:
+      in_reply_not_found: The post thit ye'r trying tae reply tae disnae appear tae exist.
+    open_in_web: Open in wab
+    over_character_limit: chairacter limit o %{max} exceedit
+    pin_errors:
+      direct: Posts thit's ainly visible tae menshied uisers cannae be preent
+      limit: Ye awriddy preent the maximum nummer o posts
+      ownership: Somebody else's post cannae be preent
+      reblog: A heeze cannae be preent
+    poll:
+      total_people:
+        one: "%{count} person"
+        other: "%{count} fowk"
+      total_votes:
+        one: "%{count} vote"
+        other: "%{count} votes"
+      vote: Vote
+    show_more: Shaw mair
+    show_newer: Shaw newer
+    show_older: Shaw aulder
+    show_thread: Shaw threid
+    sign_in_to_participate: Sign in fir tae tak pairt in the conversation
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      direct: Direck
+      private: Follaers-ainly
+      private_long: Ainly shaw tae follaers
+      public: Public
+      public_long: Awbody kin see
+      unlisted: No listit
+      unlisted_long: Awbody kin see, but no listit on public timelines
+  statuses_cleanup:
+    enabled: Automatically delete auld posts
+    enabled_hint: Automatically deletes yer posts ance they reach a specified age threshold, unless they match ane o the exceptions ablow
+    exceptions: Exceptions
+    explanation: Acause deletin posts is an expensive operation, this is duin slow ower time whan the server isnae itherwise busy. Fir this raison, yer posts wull mibbie be deletit a wee while efter they reach the age threshaud.
+    ignore_favs: Ignore favourites
+    ignore_reblogs: Ignore heezes
+    interaction_exceptions: Exceptions based on interactions
+    interaction_exceptions_explanation: Note thit there nae guarantee fir posts tae get deletit if they gae ablow the favourite or heeze threshaud efter haein ance went ower them.
+    keep_direct: Keep direck messages
+    keep_direct_hint: Disnae delete onie o yer direck messages
+    keep_media: Keep posts wi media attachments
+    keep_media_hint: Disnae delete onie o yer posts thit hae media attachments
+    keep_pinned: Keep preent posts
+    keep_pinned_hint: Disnae delete onie o yer preent posts
+    keep_polls: Keep polls
+    keep_polls_hint: Disnae delete onie o yer polls
+    keep_self_bookmark: Keep posts thit ye buikmairkt
+    keep_self_bookmark_hint: Disnae delete yer ain posts if ye'v buikmairkt them
+    keep_self_fav: Keep posts thit ye favouritit
+    keep_self_fav_hint: Disnae delete yer ain posts if ye'v favouritit them
+    min_age:
+      '1209600': 2 weeks
+      '15778476': 6 month
+      '2629746': 1 month
+      '31556952': 1 year
+      '5259492': 2 month
+      '604800': 1 week
+      '63113904': 2 year
+      '7889238': 3 month
+    min_age_label: Age threshaud
+    min_favs: Keep posts favouritit at least
+    min_favs_hint: Disnae delete onie o yer posts thit's got at least this amoont o favourites. Lea blank fir tae delete posts regairdless o their nummer o favourites
+    min_reblogs: Keep posts heezed at least
+    min_reblogs_hint: Disnae delete onie o yer posts thit's been heezed at least this nummer o times. Lea blank fir tae delete posts regairdless o their number o heezes
+  stream_entries:
+    pinned: Preent post
+    reblogged: heezed
+    sensitive_content: Sensitive content
+  strikes:
+    errors:
+      too_late: It is ower late fir tae appeal this strike
+  tags:
+    does_not_match_previous_name: disnae match the previous nemm
+  themes:
+    contrast: Mastodon (Heich contrast)
+    default: Mastodon (Daurk)
+    mastodon-light: Mastodon (Licht)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Add
+    disable: Turn aff 2FA
+    disabled_success: Twa-factor authentication successfully turnt aff
+    edit: Edit
+    enabled: Twa-factor authentication is turnt on
+    enabled_success: Twa-factor authentication successfully turnt on
+    generate_recovery_codes: Generate recovery codes
+    lost_recovery_codes: Recovery codes alloo ye tae regain access tae yer accoont if ye loss yer phone. If ye'v lost yer recovery codes, ye kin regenerate them here. Yer auld recovery codes will get invalidatit.
+    methods: Twa-factor methods
+    otp: Authenticator app
+    recovery_codes: Backup recovery codes
+    recovery_codes_regenerated: Recovery codes successfully regeneratit
+    recovery_instructions_html: Gin ye e'er loss access tae yer phone, ye kin uise ane o the recovery codes ablow fir tae regain access tae yer accoont. <strong>Keep the recovery codes safe</strong>. Fir example, ye cuid print them an store them wi yer ither important documents.
+    webauthn: Security keys
+  user_mailer:
+    appeal_approved:
+      action: Gang tae yer accoont
+      explanation: The appeal o the strike agin yer accoont on %{strike_date} thit ye submittit on %{appeal_date} haes been approved. Yer accoont is ance again in guid staunnin.
+      subject: Yer appeal fae %{date} haes been approved
+      title: Appeal approved
+    appeal_rejected:
+      explanation: The appeal o the strike agin yer accoont on %{strike_date} thit ye submittit on %{appeal_date} haes been rejectit.
+      subject: Yer appeal fae %{date} haes been rejectit
+      title: Appeal rejectit
+    backup_ready:
+      explanation: Ye wantit a ful backup o yer Mastodon accoont. It's riddy fir tae doonload noo!
+      subject: Yer archive is riddy fir doonload
+      title: Archive takoot
+    suspicious_sign_in:
+      change_password: chynge yer passwird
+      details: 'Here details o the sign-in:'
+      explanation: We've detectit a sign-in tae yer accoont fae a new IP address.
+      further_actions_html: If this wisnae you, we recommend thit ye %{action} immediately an turn on twa-factor authentication fir tae keep yer accoont secure.
+      subject: Yer accoont haes been accessed fae a new IP address
+      title: A new sign-in
+    warning:
+      appeal: Submit a appeal
+      appeal_description: Gin ye believe this is a error, ye kin submit a appeal tae the staff o %{instance}.
+      categories:
+        spam: Mince
+        violation: Content violates the follaein community guidelines
+      explanation:
+        delete_statuses: Some o yer posts hae been fun tae violate ane or mair community guidelines an hae been subsequently taen doon bi the moderators o %{instance}.
+        disable: Ye kin nae langer uise yer accoont, but yer profile an ither data is stull intack. Ye kin request a backup o yer data, chynge accoont settins or delete yer accoont.
+        mark_statuses_as_sensitive: Some o yer posts hae been mairkt as sensitive bi the moderators o %{instance}. This means thit fowk wull need tae tap the media in the posts afore a preview is displayy. Ye kin mairk media as sensitive yersel whan postin in the future.
+        sensitive: Fae noo on, aw yer uploadit media files will get mairkt as sensitive an hid ahin a click-throu warnin.
+        silence: Ye kin stull uise yer accoont but ainly fowk thit's awriddy follaein ye wull see yer posts on this server, an ye'll mibbie get excludit fae various discovery features. Hou an iver, ithers kin still follae ye bi haun.
+        suspend: Ye kin nae langer uise yer accoont, an yer profile an ither data urnae accessible onie mair. Ye kin stull login fir tae request a backup o yer data tae the data is fully taen doon in aboot 30 days, but we wull retain some basic data fir tae prevent ye fae evadin the suspension.
+      reason: 'Raison:'
+      statuses: 'Posts citit:'
+      subject:
+        delete_statuses: Yer posts on %{acct} hae been removed
+        disable: Yer accoont %{acct} haes been froze
+        mark_statuses_as_sensitive: Yer posts on %{acct} hae been mairkt as sensitive
+        none: Warnin fir %{acct}
+        sensitive: Yer posts on %{acct} wull be mairkt as sensitive fae noo on
+        silence: Yer accoont %{acct} haes been limitit
+        suspend: Yer accoont %{acct} haes been suspendit
+      title:
+        delete_statuses: Posts taen doon
+        disable: Accoont froze
+        mark_statuses_as_sensitive: Posts mairkt sensitive
+        none: Warnin
+        sensitive: Accoont mairkt as sensitive
+        silence: Accoont limitit
+        suspend: Accoont suspendit
+    welcome:
+      edit_profile_action: Setup profile
+      edit_profile_step: Ye kin customize yer profile bi uploadin a profile picture, chyngin yer display nemm an mair. Ye kin opt-in fir tae luik ower new follaers afore they’re allooed tae follae ye.
+      explanation: Here some tips fir tae get ye stertit
+      final_action: Stert postin
+      final_step: 'Stert postin! Even athout follaers, yer public posts kin stull be seen bi ithers, fir example on the local timeline or in hashtags. Ye mibbie want tae introduce yersel on the #introductions hashtag.'
+      full_handle: Yer ful haunnle
+      full_handle_hint: This is whit ye wad tell yer pals sae thit they kin message or follae ye fae anither server.
+      subject: Welcome tae Mastodon, 'mon in
+      title: Welcome aboord, %{name}!
+  users:
+    follow_limit_reached: Ye cannae follae mair than %{limit} fowk
+    invalid_otp_token: Invalid twa-factor code
+    otp_lost_help_html: If ye lost access tae baith, ye kin get in touch wi %{email}
+    seamless_external_login: Ye'r logged in via a external service, sae passwird an email settins urnae available.
+    signed_in_as: 'Signt in as:'
+  verification:
+    explanation_html: 'Ye kin <strong>verify yersel as the ainer o the links in yer profile metadata</strong>. Fir that, the linkt wabsteid haes tae contain a link back tae yer Mastodon profile. The link back <strong>haes tae</strong> hae a <code>rel="me"</code> attribute. The text content o the link disnae maitter. Here a example:'
+    verification: Verification
+  webauthn_credentials:
+    add: Add new security key
+    create:
+      error: There wis a problem addin yer security key. Please try again.
+      success: Yer security key wis successfully addit.
+    delete: Delete
+    delete_confirmation: Ye sure thit ye want tae delete this security key?
+    description_html: Gin ye turn on <strong>security key authentication</strong>, loggin in wull require ye tae uise ane o yer security keys.
+    destroy:
+      error: There wis a problem wi deletin yer security key. Please try again.
+      success: Yer security key wis successfully deletit.
+    invalid_credential: Invalid security key
+    nickname_hint: Pit in the nickname o yer new security key
+    not_enabled: Ye huvnae turnt on WebAuthn yit
+    not_supported: This brooser disnae support security keys
+    otp_required: Fir tae uise security keys please turn on twa-factor authentication furst.
+    registered_on: Registert on %{date}
diff --git a/config/locales/si.yml b/config/locales/si.yml
index d5650f2d4..37f8a8d7e 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1,67 +1,74 @@
 ---
 si:
   about:
-    about_this: පිලිබඳව
-    active_count_after: සක්‍රීයයි
-    active_footnote: මාසික ක්‍රියාකාරී පරිශීලකයින් (මාක්‍රිප)
-    api: යෙ.ක්‍ර. මු. (API)
-    apps: ජංගම යෙදුම්
-    contact: සබඳතාව
-    contact_missing: සකසා නැත
+    about_mastodon_html: 'අනාගත සමාජ ජාලය: දැන්වීම් නැත, ආයතනික නිරීක්ෂණ නැත, සදාචාරාත්මක සැලසුම් සහ විමධ්‍යගත කිරීම! Mastodon සමඟ ඔබේ දත්ත අයිති කරගන්න!'
+    contact_missing: සකස් කර නැත
     contact_unavailable: අ/නොවේ
-    documentation: ප්‍රලේඛනය
-    get_apps: ජංගම යෙදුමක් උත්සාහ කරන්න
-    learn_more: තව දැනගන්න
-    privacy_policy: රහස්‍යතා ප්‍රතිපත්තිය
-    rules: සේවාදායකයේ නීති
-    source_code: මූල කේතය
-    status_count_after:
-      one: තත්වය
-      other: තත්වයන්
-    terms: සේවාවේ කොන්දේසි
-    unavailable_content_description:
-      domain: සේවාදායකය
-      reason: හේතුව
-      silenced_title: සීමාසහිත සේවාදායක
-      suspended_title: අත්හිටවූ සේවාදායකයන්
-    user_count_after:
-      one: පරිශීලක
-      other: පරිශීලකයින්
-    what_is_mastodon: මාස්ටඩන් යනු කුමක්ද?
+    hosted_on: Mastodon %{domain}හි සත්කාරකත්වය දරයි
   accounts:
-    joined: "%{date} එක් වී ඇත"
-    media: මාධ්‍යය
+    follow: අනුගමනය
+    followers:
+      one: අනුගාමිකයා
+      other: අනුගාමිකයින්
+    following: අනුගමනය
+    instance_actor_flash: මෙම ගිණුම සේවාදායකයම නියෝජනය කිරීමට භාවිතා කරන අතථ්‍ය නළුවෙකු වන අතර කිසිදු තනි පරිශීලකයෙකු නොවේ. එය ෆෙඩරේෂන් අරමුණු සඳහා භාවිතා කරන අතර අත්හිටුවිය යුතු නොවේ.
+    last_active: අවසාන ක්රියාකාරී
+    link_verified_on: මෙම සබැඳියේ හිමිකාරිත්වය %{date}හි පරීක්ෂා කරන ලදී
     nothing_here: මෙහි කිසිත් නැත!
-    roles:
-      admin: පරිපාලක
-      bot: ස්වයං ක්‍රමලේඛය
-      group: සමූහය
+    pin_errors:
+      following: ඔබට අනුමත කිරීමට අවශ්‍ය පුද්ගලයා ඔබ දැනටමත් අනුගමනය කරමින් සිටිය යුතුය
+    posts:
+      one: ලිපිය
+      other: ලිපි
+    posts_tab_heading: ලිපි
   admin:
+    account_actions:
+      action: ක්‍රියාව සිදු කරන්න
+      title: "%{acct}මත මධ්‍යස්ථ ක්‍රියාව සිදු කරන්න"
     account_moderation_notes:
       create: සටහන හැරයන්න
+      created_msg: මධ්‍යස්ථ සටහන සාර්ථකව සාදන ලදී!
+      destroyed_msg: මධ්‍යස්ථ සටහන සාර්ථකව විනාශ විය!
     accounts:
       add_email_domain_block: වි-තැපැල් වසම අවහිර කරන්න
       approve: අනුමත කරන්න
-      approve_all: සියල්ල අනුමත කරන්න
+      approved_msg: "%{username}හි ලියාපදිංචි වීමේ යෙදුම සාර්ථකව අනුමත කරන ලදී"
       are_you_sure: ඔබට විශ්වාසද?
+      avatar: අවතාරය
       by_domain: වසම
       change_email:
-        changed_msg: ගිණුමේ වි-තැපෑල සාර්ථකව වෙනස් කෙරිණි!
         current_email: වත්මන් වි-තැපෑල
         label: වි-තැපෑල වෙනස් කරන්න
         new_email: නව විද්‍යුත් තැපෑල
         submit: වි-තැපෑල වෙනස් කරන්න
         title: "%{username} සඳහා වි-තැපෑල වෙනස් කරන්න"
       confirm: සනාථ කරන්න
-      confirmed: සනාථ කර ඇත
+      confirmed: තහවුරු කර ඇත
       confirming: සනාථ කරමින්
+      custom: අභිරුචි
+      delete: දත්ත මකන්න
+      deleted: මකා දමන ලදී
+      demote: පහත් කරන්න
+      destroyed_msg: "%{username}හි දත්ත ඉක්මනින් මකා දැමීමට පෝලිම් කර ඇත"
+      disable: කැටි කරන්න
+      disable_sign_in_token_auth: ඊමේල් ටෝකන් සත්‍යාපනය අක්‍රීය කරන්න
+      disable_two_factor_authentication: 2FA අබල කරන්න
+      disabled: ශීත කළ
+      display_name: ප්රදර්ශන නාමය
       domain: වසම
       edit: සංස්කරණය
       email: විද්‍යුත් තැපෑල
       email_status: වි-තැපෑලෙහි තත්වය
+      enable: කැටි කිරීම ඉවත් කරන්න
+      enable_sign_in_token_auth: විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සබල කරන්න
       enabled: සබල කර ඇත
+      enabled_msg: "%{username}ගේ ගිණුම සාර්ථකව අත්හිටුවා ඇත"
+      followers: අනුගාමිකයින්
+      follows: පහත සඳහන්
       header: ශීර්ෂය
-      invite_request_text: එක්වීම සඳහා හේතුව
+      inbox_url: එන ලිපි URL
+      invite_request_text: එක්වීම සඳහා
+      invited_by: විසින් ආරාධනා කරන ලදී
       ip: අ.ජා. කෙ. (IP)
       joined: එක් වී ඇත
       location:
@@ -71,275 +78,1119 @@ si:
         title: ස්ථානය
       login_status: පිවිසීමේ තත්වය
       media_attachments: මාධ්‍ය ඇමුණුම්
+      memorialize: මතක සටහන් බවට පත් කරන්න
+      memorialized: අනුස්මරණය කරන ලදී
+      memorialized_msg: සාර්ථක ලෙස %{username} අනුස්මරණ ගිණුමක් බවට පත් කරන ලදී
       moderation:
         active: සක්‍රීයයි
         all: සියල්ල
-        silenced: සීමාසහිත
+        pending: පොරොත්තුවෙන්
         suspended: අත්හිටුවන ලදි
-      most_recent_ip: වඩා මෑත අ.ජා.කෙ.(IP)
+        title: මධ්යස්ථභාවය
+      moderation_notes: මධ්‍යස්ථ සටහන්
+      most_recent_activity: වඩාත්ම මෑත ක්රියාකාරිත්වය
+      most_recent_ip: ඊට වඩා අ.ජා.කේ.(IP)
+      no_account_selected: කිසිවක් තෝරා නොගත් බැවින් ගිණුම් කිසිවක් වෙනස් කර නැත
+      no_limits_imposed: සීමාවන් පනවා නැත
+      not_subscribed: දායක වී නැත
+      pending: පොරොත්තු සමාලෝචනය
       perform_full_suspension: අත්හිටුවන්න
+      previous_strikes: පෙර වැඩ වර්ජන
+      previous_strikes_description_html:
+        one: මෙම ගිණුමට <strong>එක</strong> වර්ජනයක් ඇත.
+        other: මෙම ගිණුමේ වර්ජන <strong>%{count}</strong> ඇත.
+      promote: ප්රවර්ධනය කරන්න
       protocol: කෙටුම්පත
-      public: ප්‍රසිද්ධ
+      public: ප්රසිද්ධ
+      push_subscription_expires: පුෂ් දායකත්වය කල් ඉකුත් වේ
       redownload: පැතිකඩ නැවුම්කරන්න
+      redownloaded_msg: මූලාරම්භයේ සිට %{username}හි පැතිකඩ සාර්ථකව නැවුම් කරන ලදී
       reject: ප්‍රතික්ෂේප
+      rejected_msg: "%{username}හි ලියාපදිංචි වීමේ අයදුම්පත සාර්ථකව ප්‍රතික්ෂේප විය"
+      remove_avatar: අවතාරය ඉවත් කරන්න
       remove_header: ශීර්ෂය ඉවත්කරන්න
+      removed_avatar_msg: "%{username}ගේ අවතාර රූපය සාර්ථකව ඉවත් කරන ලදී"
+      removed_header_msg: "%{username}හි ශීර්ෂ රූපය සාර්ථකව ඉවත් කරන ලදී"
+      resend_confirmation:
+        already_confirmed: මෙම පරිශීලකයා දැනටමත් තහවුරු කර ඇත
+        send: තහවුරුකිරීමේ විද්යුත් තැපැල් පණිවිඩය නැවත එවන්න
+        success: තහවුරු කිරීමේ විද්‍යුත් තැපෑල සාර්ථකව යවා ඇත!
       reset: නැවත සකසන්න
       reset_password: මුරපදය නැවතසකසන්න
-      role: අවසරයන්
-      roles:
-        admin: පරිපාලක
-        staff: කාර්ය මණ්ඩලය
-        user: පරිශීලක
+      resubscribe: නැවත දායක වන්න
       search: සොයන්න
+      search_same_email_domain: එකම විද්‍යුත් තැපැල් වසම සහිත වෙනත් පරිශීලකයන්
+      search_same_ip: එකම IP සහිත වෙනත් පරිශීලකයන්
       security_measures:
         only_password: මුරපදය පමණි
+        password_and_2fa: මුරපදය සහ 2FA
       sensitive: සංවේදී
+      sensitized: සංවේදී ලෙස සලකුණු කර ඇත
+      shared_inbox_url: බෙදාගත් එන ලිපි URL
+      show:
+        created_reports: වාර්තා හැදුවා
+        targeted_reports: වෙනත් අය විසින් වාර්තා කරන ලදී
       silence: සීමාව
       silenced: සීමාසහිත
-      statuses: තත්වයන්
+      statuses: ලිපි
+      strikes: පෙර වැඩ වර්ජන
+      subscribe: දායක වන්න
+      suspend: අත්හිටුවන්න
       suspended: අත්හිටුවන ලදි
+      suspension_irreversible: මෙම ගිණුමේ දත්ත ආපසු හැරවිය නොහැකි ලෙස මකා ඇත. ඔබට එය භාවිතා කළ හැකි බවට පත් කිරීම සඳහා ගිණුම අත්හිටුවිය හැක නමුත් එය පෙර තිබූ දත්ත කිසිවක් ප්‍රතිසාධනය නොකරයි.
+      suspension_reversible_hint_html: ගිණුම අත්හිටුවා ඇති අතර, දත්ත සම්පූර්ණයෙන්ම %{date}දින ඉවත් කරනු ලැබේ. එතෙක් කිසිදු අයහපත් ප්‍රතිඵලයකින් තොරව ගිණුම යථා තත්ත්වයට පත් කළ හැක. ඔබට ගිණුමේ සියලුම දත්ත වහාම ඉවත් කිරීමට අවශ්‍ය නම්, ඔබට එය පහතින් කළ හැක.
       title: ගිණුම්
+      unblock_email: ඊමේල් ලිපිනය අවහිර කිරීම ඉවත් කරන්න
+      unblocked_email_msg: "%{username}ගේ විද්‍යුත් තැපැල් ලිපිනය අවහිර කිරීම සාර්ථකව ඉවත් කරන ලදී"
+      unconfirmed_email: තහවුරු නොකළ ඊමේල්
+      undo_sensitized: බල සංවේදී අහෝසි කරන්න
+      undo_silenced: සීමාව අහෝසි කරන්න
+      undo_suspension: අත්හිටුවීම අහෝසි කරන්න
+      unsilenced_msg: "%{username}ගිණුමේ සීමාව සාර්ථකව ඉවත් කරන ලදී"
+      unsubscribe: දායක නොවන්න
+      unsuspended_msg: "%{username}ගිණුම සාර්ථකව අත්හිටුවන ලදී"
       username: පරිශීලක නාමය
+      view_domain: වසම සඳහා සාරාංශය බලන්න
       warn: අවවාද
       web: වියමන
+      whitelisted: ෆෙඩරේෂන් සඳහා අවසර ඇත
     action_logs:
       action_types:
-        change_email_user: පරිශීලකට වි-තැපෑල වෙනස් කරන්න
+        approve_appeal: අභියාචනය අනුමත කරන්න
+        approve_user: පරිශීලක අනුමත කරන්න
+        assigned_to_self_report: වාර්තාව පැවරීම
+        change_email_user: පරිශීලකයින්ට වි-තැපෑල වෙනස් කරන්න
+        confirm_user: පරිශීලක තහවුරු කරන්න
         create_account_warning: අවවාදයක් සාදන්න
         create_announcement: නිවේදනය සාදන්න
+        create_custom_emoji: අභිරුචි ඉමොජි සාදන්න
         create_domain_allow: වසම් ඉඩදීමක් සාදන්න
         create_domain_block: වසම් අවහිරයක් සාදන්න
+        create_email_domain_block: ඊමේල් ඩොමේන් බ්ලොක් එකක් සාදන්න
         create_ip_block: අ.ජා. කෙ. (IP) නීතියක් සාදන්න
-        disable_user: පරිශීලක අබල කරන්න
+        create_unavailable_domain: ලබා ගත නොහැකි වසම සාදන්න
+        demote_user: පරිශීලකයා පහත් කරන්න
+        destroy_announcement: නිවේදනය මකන්න
+        destroy_custom_emoji: අභිරුචි ඉමොජි මකන්න
+        destroy_domain_allow: වසම මකන්න ඉඩ දෙන්න
+        destroy_domain_block: වසම් වාරණය මකන්න
+        destroy_email_domain_block: ඊමේල් ඩොමේන් බ්ලොක් එක මකන්න
+        destroy_instance: වසම පිරිසිදු කරන්න
+        destroy_ip_block: IP රීතිය මකන්න
+        destroy_status: පළ කිරීම මකන්න
+        destroy_unavailable_domain: ලබා ගත නොහැකි වසම මකන්න
+        disable_2fa_user: 2FA අබල කරන්න
+        disable_custom_emoji: අභිරුචි ඉමොජි අබල කරන්න
+        disable_sign_in_token_auth_user: පරිශීලකයා සඳහා ඊමේල් ටෝකන් සත්‍යාපනය අක්‍රීය කරන්න
+        disable_user: පරිශීලනය කරන්න
+        enable_custom_emoji: අභිරුචි ඉමොජි සබල කරන්න
+        enable_sign_in_token_auth_user: පරිශීලකයා සඳහා විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සක්‍රීය කරන්න
         enable_user: පරිශීලක සබල කරන්න
+        memorialize_account: ගිණුම අනුස්මරණ කරන්න
+        promote_user: පරිශීලක ප්රවර්ධනය කරන්න
+        reject_appeal: අභියාචනය ප්‍රතික්ෂේප කරන්න
+        reject_user: පරිශීලක ප්‍රතික්ෂේප කරන්න
+        remove_avatar_user: Avatar ඉවත් කරන්න
         reopen_report: වාර්තාව නැවත විවෘත කරන්න
         reset_password_user: මුරපදය නැවතසකසන්න
-        suspend_account: ගිණුම අත්හිටුවන්න
+        resolve_report: වාර්තාව විසඳන්න
+        sensitive_account: බල සංවේදී ගිණුම
+        silence_account: ගිණුම සීමා කරන්න
+        suspend_account: සැලකිය යුතු
+        unassigned_report: වාර්තාව පැවරීම ඉවත් කරන්න
+        unblock_email_account: ඊමේල් ලිපිනය අවහිර කිරීම ඉවත් කරන්න
+        unsensitive_account: බල සංවේදී ගිණුම අහෝසි කරන්න
+        unsilence_account: සීමාව ගිණුම අහෝසි කරන්න
+        unsuspend_account: ගිණුම අත්හිටුවීම
         update_announcement: නිවේදනය යාවත්කාල කරන්න
-      filter_by_action: ක්‍රියාමාර්ගය අනුව පෙරන්න
+        update_custom_emoji: අභිරුචි ඉමොජි යාවත්කාලීන කරන්න
+        update_domain_block: ඩොමේන් බ්ලොක් යාවත්කාලීන කරන්න
+        update_status: පළ කිරීම යාවත්කාලීන කරන්න
+      actions:
+        approve_appeal_html: "%{name} අනුමත මධ්‍යස්ථ තීරණ අභියාචනය %{target}සිට"
+        approve_user_html: "%{name} අනුමත ලියාපදිංචිය %{target}සිට"
+        assigned_to_self_report_html: "%{name} වාර්තාව %{target} තමන්ටම පවරා ඇත"
+        change_email_user_html: "%{name} පරිශීලක %{target}ගේ ඊමේල් ලිපිනය වෙනස් කළේය"
+        confirm_user_html: "%{name} පරිශීලකයාගේ තහවුරු කරන ලද විද්‍යුත් තැපැල් ලිපිනය %{target}"
+        create_account_warning_html: "%{name} %{target}අනතුරු ඇඟවීමක් යවා ඇත"
+        create_announcement_html: "%{name} නව නිවේදනයක් තනන %{target}"
+        create_custom_emoji_html: "%{name} නව ඉමොජි %{target}උඩුගත කරන ලදී"
+        create_domain_allow_html: "%{name} වසම %{target}සමඟ ෆෙඩරේෂණයට අවසර දී ඇත"
+        create_domain_block_html: "%{name} අවහිර කළ වසම %{target}"
+        create_email_domain_block_html: "%{name} අවහිර කරන ලද විද්‍යුත් තැපැල් වසම %{target}"
+        create_ip_block_html: "%{name} IP %{target}සඳහා රීතිය සාදන ලදී"
+        create_unavailable_domain_html: "%{name} වසම %{target}වෙත බෙදා හැරීම නැවැත්වීය"
+        demote_user_html: "%{name} පහත හෙලන ලද පරිශීලක %{target}"
+        destroy_announcement_html: "%{name} මකා දැමූ නිවේදනය %{target}"
+        destroy_domain_allow_html: වසම %{target}සමඟ %{name} අවසර නොදුන් සම්මේලනය
+        destroy_domain_block_html: "%{name} අවහිර නොකළ වසම %{target}"
+        destroy_email_domain_block_html: "%{name} අවහිර නොකළ විද්‍යුත් තැපැල් වසම %{target}"
+        destroy_instance_html: "%{name} පිරිසිදු කරන ලද වසම %{target}"
+        destroy_ip_block_html: IP %{target}සඳහා %{name} මකා දැමූ රීතිය
+        destroy_status_html: "%{name} පෝස්ට් %{target}විසින් ඉවත් කරන ලදී"
+        destroy_unavailable_domain_html: "%{name} වසම %{target}වෙත බෙදා හැරීම නැවත ආරම්භ විය"
+        disable_2fa_user_html: "%{name} පරිශීලක %{target}සඳහා සාධක දෙකක අවශ්‍යතාවය අක්‍රීය කර ඇත"
+        disable_custom_emoji_html: "%{name} ආබාධිත ඉමොජි %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} අක්‍රීය කරන ලද විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සඳහා %{target}"
+        disable_user_html: "%{name} පරිශීලක %{target}සඳහා අබල කළ පිවිසුම"
+        enable_custom_emoji_html: "%{name} සක්‍රීය ඉමොජි %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} %{target}විද්‍යුත් තැපෑල ටෝකන් සත්‍යාපනය සක්‍රීය කර ඇත"
+        enable_user_html: පරිශීලක %{target}සඳහා %{name} සක්‍රීය පුරනය වීම
+        memorialize_account_html: "%{name} %{target}ගේ ගිණුම සිහිවටන පිටුවක් බවට පත් කළේය"
+        promote_user_html: "%{name} උසස් පරිශීලක %{target}"
+        reject_appeal_html: "%{name} %{target}සිට මධ්‍යස්ථ තීරණ අභියාචනය ප්‍රතික්ෂේප කරන ලදී"
+        reject_user_html: "%{name} %{target}සිට ලියාපදිංචි වීම ප්‍රතික්ෂේප විය"
+        remove_avatar_user_html: "%{name} %{target}ගේ අවතාරය ඉවත් කරන ලදී"
+        reopen_report_html: "%{name} නැවත විවෘත කළ වාර්තාව %{target}"
+        reset_password_user_html: "%{name} පරිශීලක %{target}හි මුරපදය යළි පිහිටුවන්න"
+        resolve_report_html: "%{name} විසඳන ලද වාර්තාව %{target}"
+        sensitive_account_html: "%{name} %{target}හි මාධ්‍ය සංවේදී ලෙස සලකුණු කර ඇත"
+        silence_account_html: "%{name} සීමිත %{target}ගිණුමක්"
+        suspend_account_html: "%{name} %{target}ගේ ගිණුම අත්හිටුවා ඇත"
+        unassigned_report_html: "%{name} පවරා නොදුන් වාර්තාව %{target}"
+        unblock_email_account_html: "%{name} %{target}ගේ ඊමේල් ලිපිනය අවහිර කිරීම ඉවත් කරන ලදී"
+        unsensitive_account_html: "%{name} සලකුණු නොකළ %{target}ගේ මාධ්‍ය සංවේදී ලෙස"
+        unsilence_account_html: "%{target}ගිණුමේ %{name} undid සීමාව"
+        unsuspend_account_html: "%{name} අත්හිටුවන ලද %{target}ගිණුම"
+        update_announcement_html: "%{name} යාවත්කාලීන නිවේදනය %{target}"
+        update_custom_emoji_html: "%{name} යාවත්කාලීන කළ ඉමොජි %{target}"
+        update_domain_block_html: "%{target}සඳහා %{name} යාවත්කාලීන කරන ලද වසම් වාරණ"
+        update_status_html: "%{name} %{target}යාවත්කාලීන කරන ලද පළ කිරීම"
+      empty: ලඝු-සටහන් හමු නොවිණි.
+      filter_by_action: ක්‍රියාව අනුව පෙරන්න
       filter_by_user: පරිශීලක අනුව පෙරන්න
+      title: විගණන සටහන
     announcements:
+      destroyed_msg: නිවේදනය සාර්ථකව මකා ඇත!
       edit:
         title: නිවේදනය සංස්කරණය
+      empty: නිවේදන කිසිවක් හමු නොවීය.
       live: සජීවී
       new:
         create: නිවේදනය සාදන්න
         title: නව නිවේදනය
+      publish: ප්‍රකාශ කරන්න
       published_msg: නිවේදනය සාර්ථකව ප්‍රකාශයට පත් කරන ලදි!
+      scheduled_for: "%{time}සඳහා සැලසුම් කර ඇත"
+      scheduled_msg: නිවේදනය නිකුත් කිරීමට නියමිතයි!
       title: නිවේදන
+      unpublish: ප්‍රකාශනය ඉවත් කරන්න
+      unpublished_msg: නිවේදනය සාර්ථකව ප්‍රකාශයට පත් නොකළේය!
+      updated_msg: නිවේදනය සාර්ථකව යාවත්කාලීන කරන ලදී!
     custom_emojis:
+      assign_category: කාණ්ඩය පැවරීම
       by_domain: වසම
+      copied_msg: ඉමොජි වල දේශීය පිටපත සාර්ථකව සාදන ලදී
       copy: පිටපත්
+      copy_failed_msg: එම ඉමොජියේ දේශීය පිටපතක් සෑදීමට නොහැකි විය
       create_new_category: නව ප්‍රවර්ගයක් සාදන්න
+      created_msg: ඉමොජි සාර්ථකව නිර්මාණය කළා!
+      delete: මකන්න
+      destroyed_msg: Emojo සාර්ථකව විනාශ විය!
       disable: අබල කරන්න
       disabled: අබල කර ඇත
+      disabled_msg: එම ඉමොජිය සාර්ථකව අබල කරන ලදී
+      emoji: ඉමොජි
       enable: සබල කරන්න
       enabled: සබල කර ඇත
+      enabled_msg: එම ඉමොජි සාර්ථකව සබල කරන ලදී
+      image_hint: PNG හෝ GIF %{size}දක්වා
       list: ලැයිස්තුව
+      listed: ලැයිස්තුගත කර ඇත
+      new:
+        title: නව අභිරුචි ඉමොජි එක් කරන්න
+      not_permitted: මෙම ක්‍රියාව සිදු කිරීමට ඔබට අවසර නැත
+      overwrite: උඩින් ලියන්න
       shortcode: කෙටිකේතය
+      shortcode_hint: අවම වශයෙන් අක්ෂර 2 ක්, අක්ෂරාංක අක්ෂර සහ යටි ඉරි පමණි
+      title: අභිරුචි ඉමෝජි
+      uncategorized: වර්ගීකරණය නොකළ
+      unlist: ලැයිස්තුගත නොකරන්න
+      unlisted: ලැයිස්තුගත නොකළ
+      update_failed_msg: එම ඉමොජි යාවත්කාලීන කළ නොහැකි විය
+      updated_msg: ඉමොජි සාර්ථකව යාවත්කාලීන කරන ලදී!
       upload: උඩුගත කරන්න
     dashboard:
+      active_users: ක්රියාකාරී පරිශීලකයන්
+      interactions: අන්තර්ක්රියා
+      media_storage: මාධ්ය ගබඩාව
+      new_users: නව පරිශීලකයන්
+      opened_reports: වාර්තා විවෘත විය
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> අභියාචනයක් බලාපොරොත්තු වේ"
+        other: "<strong>%{count}</strong> අභියාචනා පොරොත්තු"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> පොරොත්තු වාර්තාව"
+        other: "<strong>%{count}</strong> පොරොත්තු වාර්තා"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> පොරොත්තු හැෂ් ටැගය"
+        other: "<strong>%{count}</strong> පොරොත්තු හැෂ් ටැග්"
+      pending_users_html:
+        one: "<strong>%{count}</strong> අපේක්ෂිත පරිශීලකයා"
+        other: "<strong>%{count}</strong> අපේක්ෂිත පරිශීලකයින්"
+      resolved_reports: වාර්තා විසඳා ඇත
       software: මෘදුකාංගය
+      sources: ලියාපදිංචි මූලාශ්‍ර
+      space: අවකාශය භාවිතය
       title: උපකරණ පුවරුව
+      top_languages: ඉහළම ක්රියාකාරී භාෂා
+      top_servers: ඉහළම ක්රියාකාරී සේවාදායකයන්
+      website: වෙබ් අඩවිය
+    disputes:
+      appeals:
+        empty: අභියාචනා හමු නොවීය.
+        title: අභියාචනා
+    domain_allows:
+      add_new: වසම සමඟ සම්මේලනයට ඉඩ දෙන්න
+      created_msg: ෆෙඩරේෂන් සඳහා වසම සාර්ථකව අවසර දී ඇත
+      destroyed_msg: ෆෙඩරේෂන් වෙතින් වසම අනුමත කර නැත
+      undo: වසම සමඟ සම්මේලනයට ඉඩ නොදෙන්න
     domain_blocks:
+      add_new: නව වසම් වාරණ එක් කරන්න
+      created_msg: වසම් අවහිර කිරීම දැන් සකසමින් පවතී
+      destroyed_msg: වසම් අවහිර කිරීම ඉවත් කර ඇත
       domain: වසම
+      edit: වසම් වාරණය සංස්කරණය කරන්න
+      existing_domain_block: ඔබ දැනටමත් %{name}මත දැඩි සීමාවන් පනවා ඇත.
+      existing_domain_block_html: ඔබ දැනටමත් %{name}මත දැඩි සීමාවන් පනවා ඇත, ඔබට <a href="%{unblock_url}">එය අවහිර කිරීම ඉවත් කිරීමට අවශ්‍යයි</a>.
       new:
+        create: බ්ලොක් එකක් සාදන්න
+        hint: ඩොමේන් බ්ලොක් එක දත්ත සමුදාය තුල ගිණුම් ඇතුලත් කිරීම් නිර්මාණය වීම වලක්වන්නේ නැත, නමුත් එම ගිණුම් වලට ප්‍රතික්‍රියාශීලීව සහ ස්වයංක්‍රීයව විශේෂිත මධ්‍යස්ථ ක්‍රම යොදනු ඇත.
         severity:
           noop: කිසිවක් නැත
           suspend: අත්හිටුවන්න
+        title: නව වසම් වාරණ
+      obfuscate: අපැහැදිලි වසම් නාමය
+      obfuscate_hint: වසම් සීමාවන් ලැයිස්තුව ප්‍රචාරණය කිරීම සබල කර ඇත්නම් ලැයිස්තුවේ වසම් නාමය අර්ධ වශයෙන් අපැහැදිලි කරන්න
       private_comment: පුද්ගලික අදහස
+      private_comment_hint: පරිපාලකයින් විසින් අභ්‍යන්තර භාවිතය සඳහා මෙම වසම් සීමාව ගැන අදහස් දක්වන්න.
       public_comment: ප්‍රසිද්ධ අදහස
+      public_comment_hint: වසම් සීමාවන් ලැයිස්තුව ප්‍රචාරණය කිරීම සබල කර ඇත්නම්, සාමාන්‍ය ජනතාව සඳහා මෙම වසම් සීමාව ගැන අදහස් දක්වන්න.
+      reject_media: මාධ්‍ය ගොනු ප්‍රතික්ෂේප කරන්න
+      reject_media_hint: දේශීයව ගබඩා කර ඇති මාධ්‍ය ගොනු ඉවත් කරන අතර අනාගතයේදී ඒවා බාගත කිරීම ප්‍රතික්ෂේප කරයි. අත්හිටුවීම් සඳහා අදාළ නොවේ
       reject_reports: වාර්තා ප්‍රතික්ෂේප කරන්න
-      rejecting_media: මාධ්‍ය වාර්තා ප්‍රතික්ෂේප කරමින්
-      rejecting_reports: වාර්තා ප්‍රතික්ෂේප කරමින්
-      severity:
-        suspend: අත්හිටුවන ලදි
-      show:
-        undo: පෙරසේ
+      reject_reports_hint: මෙම වසමෙන් එන සියලුම වාර්තා නොසලකා හරින්න. අත්හිටුවීම් සඳහා අදාළ නොවේ
+      undo: වසම් අවහිර කිරීම අහෝසි කරන්න
+      view: වසම් වාරණය බලන්න
     email_domain_blocks:
+      add_new: අලුතින් එකතු කරන්න
+      attempts_over_week:
+        one: පසුගිය සතිය පුරා %{count} උත්සාහයක්
+        other: පසුගිය සතියේ ලියාපදිංචි වීමේ උත්සාහයන් %{count} ක්
+      created_msg: විද්‍යුත් තැපැල් වසම සාර්ථකව අවහිර කරන ලදී
+      delete: මකන්න
+      dns:
+        types:
+          mx: MX වාර්තාව
       domain: වසම
       new:
         create: වසම එකතු කරන්න
+        resolve: වසම විසඳන්න
+        title: නව විද්‍යුත් තැපැල් වසම අවහිර කරන්න
+      no_email_domain_block_selected: කිසිවක් තෝරා නොගත් බැවින් විද්‍යුත් තැපැල් වසම් වාරණ කිසිවක් වෙනස් කර නැත
+      resolved_dns_records_hint_html: ඩොමේන් නාමය පහත දැක්වෙන MX වසම් වලට විසඳයි, ඒවා අවසානයේ ඊමේල් පිළිගැනීම සඳහා වගකිව යුතුය. MX වසමක් අවහිර කිරීම දෘශ්‍ය වසම් නාමය වෙනස් වුවද, එකම MX වසම භාවිතා කරන ඕනෑම විද්‍යුත් තැපැල් ලිපිනයකින් ලියාපදිංචි වීම අවහිර කරයි. <strong>ප්‍රධාන විද්‍යුත් තැපැල් සපයන්නන් අවහිර නොකිරීමට ප්‍රවේශම් වන්න.</strong>
+      resolved_through_html: "%{domain}හරහා විසඳා ඇත"
       title: අවහිර කළ වි-තැපැල් වසම්
     follow_recommendations:
+      description_html: "<strong>නව පරිශීලකයින්ට රසවත් අන්තර්ගතයන් ඉක්මනින් සොයා ගැනීමට උපකාර වන නිර්දේශ අනුගමනය කරන්න</strong>. පෞද්ගලීකරණය කළ පසු විපරම් නිර්දේශ සැකසීමට තරම් පරිශීලකයෙකු අන් අය සමඟ අන්තර් ක්‍රියා කර නොමැති විට, ඒ වෙනුවට මෙම ගිණුම් නිර්දේශ කෙරේ. දී ඇති භාෂාවක් සඳහා ඉහළම මෑත කාලීන නියැලීම් සහ ඉහළම දේශීය අනුගාමික සංඛ්‍යාව සහිත ගිණුම් මිශ්‍රණයකින් ඒවා දෛනික පදනමින් නැවත ගණනය කෙරේ."
       language: භාෂාව සඳහා
-      status: තත්වය
+      status: තත්‍වය
+      suppress: අනුගමනය නිර්දේශය යටපත් කරන්න
+      suppressed: යටපත් කළා
+      title: නිර්දේශ අනුගමනය කරන්න
+      unsuppress: නිර්දේශ පිළිපැදීම ප්‍රතිසාධනය කරන්න
     instances:
+      availability:
+        description_html:
+          one: වසම වෙත බෙදා හැරීම සාර්ථක නොවී දින <strong>%{count}</strong> අසාර්ථක වුවහොත්, වසම</em> න් <em>බෙදා හැරීමක් ලැබෙන්නේ නම් මිස වැඩිදුර බෙදා හැරීමේ උත්සාහයන් සිදු නොකෙරේ.
+          other: වසම වෙත බෙදා හැරීම සාර්ථක නොවී <strong>%{count} වෙනස් දින</strong> අසාර්ථක වුවහොත්, වසම</em> සිට <em>බෙදා හැරීමක් නොලැබුනේ නම්, තවදුරටත් බෙදා හැරීමේ උත්සාහයන් සිදු නොකෙරේ.
+        failure_threshold_reached: අසාර්ථක වීමේ සීමාව %{date}ට ළඟා විය.
+        failures_recorded:
+          one: දින %{count} කින් අසාර්ථක උත්සාහයක්.
+          other: විවිධ දින %{count} ක අසාර්ථක උත්සාහයන්.
+        no_failures_recorded: වාර්තාගත අසාර්ථක වීම් නොමැත.
+        title: පවතින බව
+        warning: මෙම සේවාදායකයට සම්බන්ධ වීමට ගත් අවසන් උත්සාහය අසාර්ථක විය
       back_to_all: සියල්ල
+      back_to_limited: සීමා සහිතයි
       back_to_warning: අවවාදයයි
       by_domain: වසම
+      confirm_purge: ඔබට මෙම වසමෙන් දත්ත ස්ථිරවම මැකීමට අවශ්‍ය බව විශ්වාසද?
+      content_policies:
+        comment: අභ්යන්තර සටහන
+        description_html: ඔබට මෙම වසම සහ එහි ඕනෑම උප වසමකින් සියලුම ගිණුම් වලට අදාළ වන අන්තර්ගත ප්‍රතිපත්ති නිර්වචනය කළ හැක.
+        policies:
+          reject_media: මාධ්‍ය ප්‍රතික්ෂේප කරන්න
+          reject_reports: වාර්තා ප්‍රතික්ෂේප කරන්න
+          silence: සීමාව
+          suspend: අත්හිටුවන්න
+        policy: ප්රතිපත්ති
+        reason: පොදු හේතුව
+        title: අන්තර්ගත ප්රතිපත්ති
+      dashboard:
+        instance_accounts_dimension: වැඩිපුරම අනුගමනය කරන ගිණුම්
+        instance_accounts_measure: ගබඩා කර ඇති ගිණුම්
+        instance_followers_measure: එතන අපේ අනුගාමිකයෝ
+        instance_follows_measure: ඔවුන්ගේ අනුගාමිකයන් මෙහි
+        instance_languages_dimension: ඉහළම භාෂා
+        instance_media_attachments_measure: ගබඩා කළ මාධ්‍ය ඇමුණුම්
+        instance_reports_measure: ඔවුන් ගැන වාර්තා
+        instance_statuses_measure: ගබඩා කළ ලිපි
       delivery:
         all: සියල්ල
-        warning: අවවාදයයි
+        clear: බෙදා හැරීමේ දෝෂ ඉවත් කරන්න
+        failing: අසාර්ථක වෙනවා
+        restart: බෙදා හැරීම නැවත ආරම්භ කරන්න
+        stop: බෙදා හැරීම නවත්වන්න
+        unavailable: ලබා ගත නොහැක
+      delivery_available: බෙදා හැරීම ලබා ගත හැකිය
+      delivery_error_days: බෙදා හැරීමේ දෝෂ සහිත දින
+      delivery_error_hint: දින %{count} ක් සඳහා බෙදා හැරීම කළ නොහැකි නම්, එය ස්වයංක්‍රීයව බෙදා හැරිය නොහැකි ලෙස ලකුණු කරනු ලැබේ.
+      destroyed_msg: "%{domain} සිට දත්ත දැන් ආසන්න මකාදැමීම සඳහා පෝලිම් කර ඇත."
+      empty: වසම් කිසිවක් හමු නොවීය.
+      known_accounts:
+        one: "%{count} දන්නා ගිණුම්"
+        other: දන්නා ගිණුම් %{count} ක්
       moderation:
         all: සියල්ල
+        limited: සීමා සහිතයි
+        title: මධ්යස්ථභාවය
       private_comment: පුද්ගලික අදහස
       public_comment: ප්‍රසිද්ධ අදහස
+      purge: පිරිසිදු කරන්න
+      purge_description_html: මෙම වසම යහපත සඳහා නොබැඳි බව ඔබ විශ්වාස කරන්නේ නම්, ඔබට ඔබගේ ගබඩාවෙන් මෙම වසමෙන් සියලුම ගිණුම් වාර්තා සහ ආශ්‍රිත දත්ත මකා දැමිය හැක. මෙයට යම් කාලයක් ගත විය හැක.
+      title: සම්මේලනය
+      total_blocked_by_us: අප විසින් අවහිර කරන ලදී
+      total_followed_by_them: ඔවුන් විසින් අනුගමනය කරන ලදී
+      total_followed_by_us: අප විසින් අනුගමනය කරන ලදී
+      total_reported: ඔවුන් ගැන වාර්තා
+      total_storage: මාධ්ය ඇමුණුම්
+      totals_time_period_hint_html: පහත දැක්වෙන එකතුවෙහි සියලු කාලය සඳහා දත්ත ඇතුළත් වේ.
     invites:
+      deactivate_all: සියල්ල අක්‍රිය කරන්න
       filter:
         all: සියල්ල
-        expired: කල් ඉකුත් වී ඇත
+        available: පවතින
+        expired: ඉකුත් වී ඇත
         title: පෙරහන
       title: ඇරයුම්
     ip_blocks:
       add_new: නීතිය සාදන්න
+      created_msg: නව IP රීතිය සාර්ථකව එක් කරන ලදී
+      delete: මකන්න
       expires_in:
         '1209600': සති 2
         '15778476': මාස 6
         '2629746': මාස 1
         '31556952': අවුරුදු 1
-        '86400': දින 1
+        '86400': දවස් 1
         '94670856': අවුරුදු 3
       new:
-        title: නව අ.ජා. කෙ.(IP) නීතියක් සාදන්න
+        title: නව අ.ජා.කෙ. නීතියක් සාදන්න
+      no_ip_block_selected: IP රීති කිසිවක් තෝරා නොගත් බැවින් වෙනස් කර නැත
       title: අ.ජා. කෙ. (IP) නීති
+    relationships:
+      title: "%{acct}හි සබඳතා"
     relays:
+      add_new: නව රිලේ එක් කරන්න
+      delete: මකන්න
+      description_html: "<strong>ෆෙඩරේෂන් රිලේ</strong> යනු එයට දායක වී ප්‍රකාශයට පත් කරන සේවාදායකයන් අතර විශාල ප්‍රසිද්ධ පළ කිරීම් හුවමාරු කරන අතරමැදි සේවාදායකයකි. <strong>එය කුඩා සහ මධ්‍යම සේවාදායකයන්ට fediverse</strong>වෙතින් අන්තර්ගතය සොයා ගැනීමට උදවු කළ හැකි අතර, එසේ නොමැති නම් දේශීය පරිශීලකයින්ට දුරස්ථ සේවාදායකයන් මත වෙනත් පුද්ගලයින් හස්තීයව අනුගමනය කිරීම අවශ්‍ය වේ."
       disable: අබල කරන්න
       disabled: අබල කර ඇත
       enable: සබල කරන්න
+      enable_hint: සක්‍රිය කළ පසු, ඔබේ සේවාදායකය මෙම රිලේ වෙතින් සියලුම පොදු පළ කිරීම් සඳහා දායක වන අතර, මෙම සේවාදායකයේ පොදු පළ කිරීම් එයට යැවීම ආරම්භ කරනු ඇත.
       enabled: සබල කර ඇත
+      inbox_url: රිලේ URL
+      pending: රිලේ අනුමැතිය සඳහා රැඳී සිටිමින්
+      save_and_enable: සුරකින්න සහ සක්රිය කරන්න
+      setup: රිලේ සම්බන්ධතාවයක් සකසන්න
+      signatures_not_enabled: ආරක්ෂිත මාදිලිය හෝ සීමිත ෆෙඩරේෂන් මාදිලිය සබල කර ඇති අතර රිලේ නිවැරදිව ක්‍රියා නොකරනු ඇත
       status: තත්වය
+      title: රිලේස්
+    report_notes:
+      created_msg: වාර්තා සටහන සාර්ථකව සාදන ලදී!
+      destroyed_msg: වාර්තා සටහන සාර්ථකව මකා ඇත!
     reports:
+      account:
+        notes:
+          one: "%{count} සටහන"
+          other: "%{count} සටහන්"
+      action_log: විගණන සටහන
+      action_taken_by: විසින් ගන්නා ලද පියවර
+      actions:
+        delete_description_html: වාර්තා කරන ලද පළ කිරීම් මකා දැමෙනු ඇති අතර එම ගිණුමේම අනාගත උල්ලංඝනයන් තීව්‍ර කිරීමට ඔබට උදවු කිරීමට වර්ජනයක් වාර්තා කරනු ඇත.
+        mark_as_sensitive_description_html: වාර්තා කරන ලද පළ කිරීම් වල මාධ්‍ය සංවේදී ලෙස සලකුණු කරනු ලබන අතර එම ගිණුම මගින් අනාගත උල්ලංඝනයන් උත්සන්න කිරීමට ඔබට උපකාර කිරීමට වර්ජනයක් වාර්තා කරනු ඇත.
+        other_description_html: ගිණුමේ හැසිරීම පාලනය කිරීම සහ වාර්තා කළ ගිණුමට සන්නිවේදනය අභිරුචිකරණය කිරීම සඳහා තවත් විකල්ප බලන්න.
+        resolve_description_html: වාර්තා කරන ලද ගිණුමට එරෙහිව කිසිදු ක්‍රියාමාර්ගයක් නොගනු ඇත, වැඩ වර්ජනයක් වාර්තා නොකෙරේ, වාර්තාව වසා දමනු ඇත.
+        silence_description_html: පැතිකඩ දෘශ්‍යමාන වනු ඇත්තේ දැනටමත් එය අනුගමනය කරන හෝ අතින් බලන අයට පමණක් වන අතර, එහි ළඟාවීම දැඩි ලෙස සීමා කරයි. සෑම විටම ආපසු හැරවිය හැක.
+        suspend_description_html: එය අවසානයේ මකා දමන තුරු පැතිකඩ සහ එහි සියලුම අන්තර්ගතයන් ප්‍රවේශ විය නොහැකි වනු ඇත. ගිණුම සමඟ අන්තර් ක්රියා කිරීම කළ නොහැකි වනු ඇත. දින 30 ක් ඇතුළත ආපසු හැරවිය හැකිය.
+      actions_description_html: මෙම වාර්තාව විසඳීමට ගත යුතු ක්‍රියාමාර්ගය තීරණය කරන්න. ඔබ වාර්තා කරන ලද ගිණුමට එරෙහිව දණ්ඩනීය ක්‍රියාමාර්ගයක් ගන්නේ නම්, <strong>Spam</strong> කාණ්ඩය තෝරාගත් විට හැර, ඔවුන්ට විද්‍යුත් තැපෑලෙන් දැනුම්දීමක් යවනු ලැබේ.
+      add_to_report: වාර්තා කිරීමට තවත් එක් කරන්න
       are_you_sure: ඔබට විශ්වාසද?
+      assign_to_self: මට පවරන්න
+      assigned: පවරා ඇති උපපරිපාලක
+      by_target_domain: වාර්තා කළ ගිණුමෙහි වසම
+      category: වර්ගය
+      category_description_html: මෙම ගිණුම සහ/හෝ අන්තර්ගතය වාර්තා කළ හේතුව වාර්තා කළ ගිණුම සමඟ සන්නිවේදනයේ සඳහන් කරනු ඇත
       comment:
         none: කිසිවක් නැත
+      comment_description_html: 'වැඩි විස්තර සැපයීම සඳහා, %{name} ලිවීය:'
+      created_at: වාර්තා කර ඇත
+      delete_and_resolve: පළ කිරීම් මකන්න
+      forwarded: යොමු කළා
+      forwarded_to: "%{domain}වෙත යොමු කරන ලදී"
+      mark_as_resolved: විසඳා ඇති ලෙස ලකුණු කරන්න
+      mark_as_sensitive: සංවේදී ලෙස ලකුණු කරන්න
+      mark_as_unresolved: නොවිසඳුනු ලෙස ලකුණු කරන්න
+      no_one_assigned: කිසි කෙනෙක නැහැ
       notes:
         create: සටහන එකතු කරන්න
+        create_and_resolve: සටහන සමඟ විසඳන්න
+        create_and_unresolve: සටහනක් සමඟ නැවත විවෘත කරන්න
+        delete: මකන්න
+        placeholder: ගෙන ඇති ක්‍රියාමාර්ග, හෝ වෙනත් අදාළ යාවත්කාලීන විස්තර කරන්න...
+        title: සටහන්
+      notes_description_html: අනෙකුත් උපපරිපාලකයින්ට සහ ඔබේ අනාගතයට සටහන් බලන්න සහ තබන්න
+      quick_actions_description_html: 'වාර්තා කළ අන්තර්ගතය බැලීමට ඉක්මන් ක්‍රියාමාර්ගයක් ගන්න හෝ පහළට අනුචලනය කරන්න:'
+      remote_user_placeholder: "%{instance}සිට දුරස්ථ පරිශීලකයා"
       reopen: වාර්තාව නැවත විවෘත කරන්න
       report: "@%{id} වාර්තා කරන්න"
       reported_account: වාර්තා කළ ගිණුම
+      reported_by: විසින් වාර්තා
+      resolved: විසඳා ඇත
+      resolved_msg: වාර්තාව සාර්ථකව විසඳා ඇත!
+      skip_to_actions: ක්‍රියාවන් වෙත යන්න
       status: තත්වය
-      target_domain: වාර්තා කළ ගිණුමෙහි වසම
+      statuses: වාර්තා කළ අන්තර්ගතය
+      statuses_description_html: වාර්තා කරන ලද ගිණුම සමඟ සන්නිවේදනය කිරීමේදී වැරදි අන්තර්ගතයන් උපුටා දක්වනු ඇත
+      target_origin: වාර්තා කළ ගිණුමේ ආරම්භය
       title: වාර්තා
+      unassign: පැවරීම ඉවත් කරන්න
+      unresolved: නොවිසඳී ඇත
+      updated_at: යාවත්කාලීන කරන ලදී
+      view_profile: පැතිකඩ බලන්න
     rules:
       add_new: නීතිය එකතු කරන්න
+      delete: මකන්න
+      description_html: බොහෝ දෙනා සේවා කොන්දේසි කියවා එකඟ වූ බව ප්‍රකාශ කරන අතර, සාමාන්‍යයෙන් මිනිසුන් ගැටලුවක් පැනනඟින තුරු කියවා නොගනිති. <strong>පැතලි බුලට් පොයින්ට් ලිස්ට් එකකින් ඒවා ලබා දීමෙන් බැලූ බැල්මට ඔබේ සේවාදායකයේ නීති බැලීම පහසු කරන්න.</strong> තනි නීති කෙටි හා සරලව තබා ගැනීමට උත්සාහ කරන්න, නමුත් ඒවා විවිධ අයිතම වලට බෙදීමට උත්සාහ නොකරන්න.
       edit: නීතිය සංස්කරණය කරන්න
+      empty: තවමත් සේවාදායක රීති නිර්වචනය කර නොමැත.
       title: සේවාදායකයේ නීති
     settings:
-      contact_information:
-        email: ව්‍යාපාරික වි-තැපෑල
-      site_description:
-        title: සේවාදායකයේ සවිස්තරය
-      site_short_description:
-        title: සේවාදායකයේ කෙටි සවිස්තරය
-      site_title: සේවාදායකයේ නම
-      title: අඩවියේ සැකසුම්
+      domain_blocks:
+        all: හැමෝටම
+        disabled: කාටවත් නෑ
+        users: පුරනය වී ඇති දේශීය පරිශීලකයින් වෙත
+      registrations_mode:
+        modes:
+          approved: ලියාපදිංචි වීමට අනුමැතිය අවශ්‍යයි
+          none: කිසිවෙකුට ලියාපදිංචි විය නොහැක
+          open: ඕනෑම කෙනෙකුට ලියාපදිංචි විය හැක
+    site_uploads:
+      delete: උඩුගත කළ ගොනුව මකන්න
+      destroyed_msg: අඩවිය උඩුගත කිරීම සාර්ථකව මකා ඇත!
     statuses:
       back_to_account: ගිණුම් පිටුවට ආපසු යන්න
+      back_to_report: වාර්තා පිටුවට ආපසු යන්න
+      batch:
+        remove_from_report: වාර්තාවෙන් ඉවත් කරන්න
+        report: වාර්තාව
+      deleted: මකා දමන ලදී
       media:
         title: මාධ්‍යය
-      no_media: මාධ්‍ය නැත
-      with_media: මාධ්‍ය සමඟ
+      no_status_selected: කිසිවක් තෝරා නොගත් බැවින් තනතුරු කිසිවක් වෙනස් කර නැත
+      title: ගිණුම් තනතුරු
+      with_media: මාධ්‍ය දායකත්වය
+    strikes:
+      actions:
+        delete_statuses: "%{target}ගේ පළ කිරීම් %{name} මකා දමන ලදී"
+        disable: "%{name} %{target}ගේ ගිණුම නිශ්චල කළේය"
+        mark_statuses_as_sensitive: "%{name} %{target}ගේ පළ කිරීම් සංවේදී ලෙස ලකුණු කර ඇත"
+        none: "%{name} %{target}අනතුරු ඇඟවීමක් යවා ඇත"
+        sensitive: "%{name} %{target}ගේ ගිණුම සංවේදී ලෙස ලකුණු කර ඇත"
+        silence: "%{name} සීමිත %{target}ගිණුමක්"
+        suspend: "%{name} %{target}ගේ ගිණුම අත්හිටුවා ඇත"
+      appeal_approved: අභියාචනා කළා
+      appeal_pending: අභියාචනය පොරොත්තුවෙන්
+    system_checks:
+      database_schema_check:
+        message_html: පොරොත්තු දත්ත සමුදා සංක්‍රමණයන් ඇත. යෙදුම අපේක්ෂිත පරිදි ක්‍රියා කරන බව සහතික කිරීමට කරුණාකර ඒවා ධාවනය කරන්න
+      elasticsearch_running_check:
+        message_html: Elasticsearch වෙත සම්බන්ධ වීමට නොහැකි විය. කරුණාකර එය ක්‍රියාත්මක වන බව පරීක්ෂා කරන්න, නැතහොත් සම්පූර්ණ පෙළ සෙවීම අක්‍රීය කරන්න
+      elasticsearch_version_check:
+        message_html: 'නොගැලපෙන ඉලාස්ටික් සෙවුම් අනුවාදය: %{value}'
+        version_comparison: Elasticsearch %{running_version} ක්‍රියාත්මක වන අතර %{required_version} අවශ්‍ය වේ
+      rules_check:
+        action: සේවාදායක නීති කළමනාකරණය කරන්න
+        message_html: ඔබ සේවාදායක රීති කිසිවක් නිර්වචනය කර නැත.
+      sidekiq_process_check:
+        message_html: "%{value} පෝලිම්(ය) සඳහා Sidekiq ක්‍රියාවලියක් ක්‍රියාත්මක නොවේ. කරුණාකර ඔබේ Sidekiq වින්‍යාසය සමාලෝචනය කරන්න"
+    tags:
+      review: තත්‍වය සමාලෝචනය
+      updated_msg: Hashtag සැකසුම් සාර්ථකව යාවත්කාලීන කරන ලදී
     title: පරිපාලනය
+    trends:
+      allow: ඉඩ දෙන්න
+      approved: අනුමත කළා
+      disallow: අවසර නොදෙන්න
+      links:
+        allow: සබැඳියට ඉඩ දෙන්න
+        allow_provider: ප්‍රකාශකයාට ඉඩ දෙන්න
+        description_html: මේවා ඔබගේ සේවාදායකය විසින් පළ කිරීම් දකින ගිණුම් මගින් දැනට බොහෝ සෙයින් බෙදා ගන්නා සබැඳි වේ. එය ඔබගේ පරිශීලකයින්ට ලෝකයේ සිදුවෙමින් පවතින දේ සොයා ගැනීමට උදවු කළ හැක. ඔබ ප්‍රකාශකයා අනුමත කරන තුරු සබැඳි කිසිවක් ප්‍රසිද්ධියේ ප්‍රදර්ශනය නොවේ. ඔබට තනි සබැඳිවලට ඉඩ දීමට හෝ ප්‍රතික්ෂේප කිරීමටද හැකිය.
+        disallow: සබැඳියට ඉඩ නොදෙන්න
+        disallow_provider: ප්‍රකාශකයාට ඉඩ නොදෙන්න
+        shared_by_over_week:
+          one: පසුගිය සතිය පුරා එක් පුද්ගලයෙකු විසින් බෙදා ගන්නා ලදී
+          other: පසුගිය සතිය පුරා පුද්ගලයින් %{count} දෙනෙකු විසින් බෙදා ගන්නා ලදී
+        title: නැඟී එන සබැඳි
+        usage_comparison: ඊයේ %{yesterday} හා සසඳන විට අද %{today} වරක් බෙදා ගන්නා ලදී
+      only_allowed: අවසර දී ඇත
+      pending_review: පොරොත්තු සමාලෝචනය
+      preview_card_providers:
+        allowed: මෙම ප්‍රකාශකයාගේ සබැඳි නැඹුරු විය හැක
+        description_html: මේවා බොහෝ විට ඔබගේ සේවාදායකයේ සබැඳි බෙදා ගන්නා වසම් වේ. සබැඳියේ වසම අනුමත කරන්නේ නම් මිස සබැඳි ප්‍රසිද්ධියේ නැඹුරු නොවේ. ඔබගේ අනුමැතිය (හෝ ප්‍රතික්ෂේප කිරීම) උපවසම් දක්වා විහිදේ.
+        rejected: මෙම ප්‍රකාශකයාගේ සබැඳි නැඹුරු නොවනු ඇත
+        title: ප්‍රකාශකයන්
+      rejected: ප්‍රතික්ෂේප කළා
+      statuses:
+        allow: පළ කිරීමට ඉඩ දෙන්න
+        allow_account: කතුවරයාට ඉඩ දෙන්න
+        description_html: මේ වන විට ඔබේ සේවාදායකය දන්නා පෝස්ට් මේ වන විට බොහෝ බෙදාහරින සහ මේ මොහොතේ වැඩි කැමැත්තක් දක්වයි. එය ඔබගේ නව සහ නැවත පැමිණෙන පරිශීලකයින්ට අනුගමනය කිරීමට තවත් පුද්ගලයින් සොයා ගැනීමට උදවු කළ හැක. ඔබ කර්තෘ අනුමත කරන තෙක් පළ කිරීම් කිසිවක් ප්‍රසිද්ධියේ නොපෙන්වන අතර, කර්තෘ තම ගිණුම අන් අයට යෝජනා කිරීමට ඉඩ දෙයි. ඔබට තනි පළ කිරීම්වලට ඉඩ දීමට හෝ ප්‍රතික්ෂේප කිරීමටද හැකිය.
+        disallow: පළ කිරීමට ඉඩ නොදෙන්න
+        disallow_account: කතුවරයාට ඉඩ නොදෙන්න
+        not_discoverable: කර්තෘ සොයා ගත හැකි බව තෝරාගෙන නැත
+        shared_by:
+          one: එක් වරක් බෙදාගත් හෝ ප්‍රිය කරන ලදී
+          other: "%{friendly_count} වරක් බෙදාගෙන ප්‍රිය කරන ලදී"
+        title: ප්‍රවණතා පළ කිරීම්
+      tags:
+        current_score: වත්මන් ලකුණු %{score}
+        dashboard:
+          tag_accounts_measure: අද්විතීය භාවිතයන්
+          tag_languages_dimension: ඉහළම භාෂා
+          tag_servers_dimension: ඉහළම සේවාදායකයන්
+          tag_servers_measure: විවිධ සේවාදායකයන්
+          tag_uses_measure: සම්පූර්ණ භාවිතය
+        description_html: මේවා දැනට ඔබගේ සේවාදායකය දකින බොහෝ පළ කිරීම් වල දිස්වන හැෂ් ටැග් වේ. මේ මොහොතේ මිනිසුන් වැඩිපුරම කතා කරන්නේ කුමක් දැයි සොයා ගැනීමට එය ඔබගේ පරිශීලකයින්ට උදවු කළ හැක. ඔබ ඒවා අනුමත කරන තුරු හෑෂ් ටැග් ප්‍රසිද්ධියේ නොපෙන්වයි.
+        listable: යෝජනා කළ හැක
+        not_listable: යෝජනා නොකරනු ඇත
+        not_trendable: ප්‍රවණතා යටතේ දිස් නොවනු ඇත
+        not_usable: භාවිතා කළ නොහැක
+        peaked_on_and_decaying: "%{date}හි උච්චතම, දැන් දිරාපත් වෙමින් පවතී"
+        title: ප්‍රවණතා හැෂ් ටැග්
+        trendable: ප්රවණතා යටතේ පෙනී සිටිය හැක
+        trending_rank: 'නැඹුරු #%{rank}'
+        usable: භාවිතා කළ හැක
+        usage_comparison: ඊයේ %{yesterday} හා සසඳන විට අද %{today} වරක් භාවිතා වේ
+        used_by_over_week:
+          one: පසුගිය සතිය පුරා එක් පුද්ගලයෙකු විසින් භාවිතා කරන ලදී
+          other: පසුගිය සතිය පුරා පුද්ගලයින් %{count} දෙනෙකු විසින් භාවිතා කරන ලදී
+      title: ප්රවණතා
+      trending: ප්රවණතා
+    warning_presets:
+      add_new: අලුතින් එකතු කරන්න
+      delete: මකන්න
+      edit_preset: අනතුරු ඇඟවීමේ පෙර සැකසුම සංස්කරණය කරන්න
+      empty: ඔබ තවම කිසිදු අනතුරු ඇඟවීමේ පෙරසිටුවක් නිර්වචනය කර නැත.
+      title: අනතුරු ඇඟවීමේ පෙරසිටුවීම් කළමනාකරණය කරන්න
+    webhooks:
+      add_new: අන්ත ලක්ෂ්‍යය එක් කරන්න
+      delete: මකන්න
+      description_html: A <strong>webhook</strong> Mastodon හට තෝරාගත් සිදුවීම් පිළිබඳ තත්‍ය කාලීන දැනුම්දීම් <strong>ක්</strong> ඔබේම යෙදුමට තල්ලු කිරීමට හැකියාව ලබා දෙයි, එම නිසා ඔබේ යෙදුමට <strong>ස්වයංක්‍රීයව ප්‍රතික්‍රියා අවුලුවාලීමට හැකිය</strong>.
+      disable: අක්රිය කරන්න
+      disabled: ආබාධිතයි
+      edit: අන්ත ලක්ෂ්‍යය සංස්කරණය කරන්න
+      empty: ඔබට තවම වින්‍යාස කර ඇති කිසිදු webhook අන්ත ලක්ෂ්‍යයක් නොමැත.
+      enable: සබල කරන්න
+      enabled: ක්රියාකාරී
+      enabled_events:
+        one: 1 සබල කළ සිදුවීමක්
+        other: "%{count} සබල කළ සිදුවීම්"
+      events: සිදුවීම්
+      new: නව webhook
+      rotate_secret: රහස කරකවන්න
+      secret: අත්සන් කිරීමේ රහස
+      status: තත්‍වය
+      webhook: වෙබ්හුක්
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: ඔවුන්ගේ පළ කිරීම් මකා දැමීමට
+        disable: ඔවුන්ගේ ගිණුම කැටි කිරීමට
+        mark_statuses_as_sensitive: ඔවුන්ගේ තනතුරු සංවේදී ලෙස සලකුණු කිරීමට
+        none: අනතුරු ඇඟවීමක්
+        sensitive: ඔවුන්ගේ ගිණුම සංවේදී ලෙස සලකුණු කිරීමට
+        silence: ඔවුන්ගේ ගිණුම සීමා කිරීමට
+        suspend: ඔවුන්ගේ ගිණුම අත්හිටුවීමට
+      body: "%{target} යනු %{type}ක් වූ %{date}සිට %{action_taken_by} කින් මධ්‍යස්ථ තීරණයක් අභියාචනා කරයි. ඔවුන් මෙසේ ලිවීය."
+      next_steps: ඔබට මධ්‍යස්ථ තීරණය අවලංගු කිරීමට අභියාචනය අනුමත කළ හැකිය, නැතහොත් එය නොසලකා හරින්න.
+      subject: "%{username} යනු %{instance}හි මධ්‍යස්ථ තීරණයකට අභියාචනා කරයි"
+    new_pending_account:
+      body: නව ගිණුමේ විස්තර පහතින්. ඔබට මෙම යෙදුම අනුමත කිරීමට හෝ ප්‍රතික්ෂේප කිරීමට හැකිය.
+      subject: නව ගිණුම සමාලෝචනය සඳහා %{instance} (%{username})
+    new_report:
+      body: "%{reporter} %{target}වාර්තා කර ඇත"
+      body_remote: "%{domain} සිට යමෙක් %{target}වාර්තා කර ඇත"
+      subject: "%{instance} සඳහා නව වාර්තාව (#%{id})"
+    new_trends:
+      body: 'පහත අයිතම ප්‍රසිද්ධියේ ප්‍රදර්ශනය කිරීමට පෙර සමාලෝචනයක් අවශ්‍ය වේ:'
+      new_trending_links:
+        title: නැඟී එන සබැඳි
+      new_trending_statuses:
+        title: ප්‍රවණතා පළ කිරීම්
+      new_trending_tags:
+        no_approved_tags: දැනට අනුමත ප්‍රවණතා හැෂ් ටැග් නොමැත.
+        requirements: 'මෙම ඕනෑම අපේක්ෂකයෙකුට #%{rank} අනුමත ප්‍රවණතා හැෂ් ටැගය අභිබවා යා හැකිය, එය දැනට ලකුණු %{lowest_tag_score}ක් සමඟ #%{lowest_tag_name} වේ.'
+        title: ප්‍රවණතා හැෂ් ටැග්
+      subject: "%{instance}හි සමාලෝචනය සඳහා නව ප්‍රවණතා"
+  aliases:
+    add_new: අන්වර්ථ නාමයක් සාදන්න
+    created_msg: නව අන්වර්ථ නාමයක් සාර්ථකව නිර්මාණය කරන ලදී. ඔබට දැන් පැරණි ගිණුමෙන් මාරුවීම ආරම්භ කළ හැක.
+    deleted_msg: අන්වර්ථය සාර්ථකව ඉවත් කරන ලදී. එම ගිණුමෙන් මෙම ගිණුමට මාරුවීම තවදුරටත් කළ නොහැකි වනු ඇත.
+    empty: ඔබට අන්වර්ථ නාම නොමැත.
+    hint_html: ඔබට වෙනත් ගිණුමකින් මෙය වෙත මාරු වීමට අවශ්‍ය නම්, මෙහිදී ඔබට අන්වර්ථ නාමයක් සෑදිය හැක, එය පැරණි ගිණුමෙන් අනුගාමිකයින් මෙම ගිණුමට ගෙන යාමට පෙර අවශ්‍ය වේ. මෙම ක්‍රියාවම <strong>හානිකර නොවන සහ ආපසු හැරවිය හැකි</strong>වේ. <strong>ගිණුම් සංක්‍රමණය පැරණි ගිණුමෙන් ආරම්භ වේ</strong>.
+    remove: අන්වර්ථය විසන්ධි කරන්න
   appearance:
     advanced_web_interface: උසස් වියමන අතුරුමුහුණත
+    advanced_web_interface_hint: 'ඔබට ඔබේ සම්පූර්ණ තිරයේ පළල භාවිතා කිරීමට අවශ්‍ය නම්, උසස් වෙබ් අතුරු මුහුණත ඔබට අවශ්‍ය පරිදි එකම වේලාවක බොහෝ තොරතුරු බැලීමට විවිධ තීරු වින්‍යාස කිරීමට ඉඩ දෙයි: නිවස, දැනුම්දීම්, ෆෙඩරේටඩ් කාලරාමුව, ඕනෑම ලැයිස්තු සහ හැෂ් ටැග්.'
+    animations_and_accessibility: සජීවිකරණ සහ ප්‍රවේශ්‍යතාව
+    confirmation_dialogs: තහවුරු කිරීමේ සංවාද
+    discovery: සොයාගැනීම
     localization:
+      body: Mastodon ස්වේච්ඡා සේවකයන් විසින් පරිවර්තනය කර ඇත.
       guide_link: https://crowdin.com/project/mastodon
-    sensitive_content: සංවේදී අන්තර්ගතයකි
+      guide_link_text: සෑම කෙනෙකුටම දායක විය හැකිය.
+    sensitive_content: සංවේදී අන්තර්ගතය
+    toot_layout: පෝස්ට් පිරිසැලසුම
   application_mailer:
+    notification_preferences: ඊමේල් මනාප වෙනස් කරන්න
     salutation: "%{name},"
+    settings: 'ඊමේල් මනාප වෙනස් කරන්න: %{link}'
+    view: 'දැක්ම:'
+    view_profile: පැතිකඩ බලන්න
+    view_status: පළ කිරීම බලන්න
+  applications:
+    created: යෙදුම සාර්ථකව නිර්මාණය කරන ලදී
+    destroyed: යෙදුම සාර්ථකව මකා ඇත
+    regenerate_token: ප්‍රවේශ ටෝකනය නැවත උත්පාදනය කරන්න
+    token_regenerated: ප්‍රවේශ ටෝකනය සාර්ථකව ප්‍රතිජනනය කරන ලදී
+    warning: මෙම දත්ත සමඟ ඉතා ප්රවේශම් වන්න. එය කිසි විටෙක කිසිවෙකු සමඟ බෙදා නොගන්න!
+    your_token: ඔබේ ප්‍රවේශ ටෝකනය
   auth:
     change_password: මුර පදය
+    delete_account: ගිණුම මකන්න
+    delete_account_html: ඔබට ඔබගේ ගිණුම මකා දැමීමට අවශ්‍ය නම්, ඔබට <a href="%{path}">මෙතැනින් ඉදිරියට යා හැක</a>. තහවුරු කිරීම සඳහා ඔබෙන් අසනු ඇත.
+    description:
+      prefix_invited_by_user: "@%{name} ඔබට Mastodon හි මෙම සේවාදායකයට සම්බන්ධ වීමට ආරාධනා කරයි!"
+      prefix_sign_up: අදම මාස්ටඩන් හි ලියාපදිංචි වන්න!
+      suffix: ගිණුමක් සමඟ, ඔබට ඕනෑම Mastodon සේවාදායකයකින් සහ තවත් බොහෝ දේ භාවිතා කරන්නන් සමඟ පුද්ගලයින් අනුගමනය කිරීමට, යාවත්කාලීන කිරීම් පළ කිරීමට සහ පණිවිඩ හුවමාරු කර ගැනීමට හැකි වනු ඇත!
+    didnt_get_confirmation: තහවුරු කිරීමේ උපදෙස් ලැබුණේ නැද්ද?
+    dont_have_your_security_key: ඔබගේ ආරක්ෂක යතුර නොමැතිද?
+    forgot_password: මුරපදය අමතක වුනාද?
+    invalid_reset_password_token: මුරපද යළි පිහිටුවීමේ ටෝකනය අවලංගු හෝ කල් ඉකුත් වී ඇත. කරුණාකර අලුත් එකක් ඉල්ලන්න.
+    link_to_otp: ඔබගේ දුරකථනයෙන් ද්වි සාධක කේතයක් හෝ ප්‍රතිසාධන කේතයක් ඇතුළු කරන්න
+    link_to_webauth: ඔබගේ ආරක්ෂක යතුරු උපාංගය භාවිතා කරන්න
+    log_in_with: සමඟ ලොග් වන්න
     login: පිවිසෙන්න
     logout: නික්මෙන්න
-    or_log_in_with: හෝ සමඟ පිවිසෙන්න
+    migrate_account: වෙනත් ගිණුමකට යන්න
+    migrate_account_html: ඔබට මෙම ගිණුම වෙනත් එකකට හරවා යැවීමට අවශ්‍ය නම්, ඔබට එය <a href="%{path}">මෙහි වින්‍යාසගත කළ හැක</a>.
+    or_log_in_with: හෝ සමඟින් පිවිසෙන්න
+    register: ලියාපදිංචිය
+    registration_closed: "%{instance} නව සාමාජිකයින් පිළිගන්නේ නැත"
+    resend_confirmation: තහවුරු කිරීමේ උපදෙස් නැවත යවන්න
+    reset_password: මුරපදය නැවත සකසන්න
     security: ආරක්ෂාව
+    set_new_password: නව මුරපදය සකසන්න
+    setup:
+      email_below_hint_html: පහත විද්‍යුත් තැපැල් ලිපිනය වැරදි නම්, ඔබට එය මෙතැනින් වෙනස් කර නව තහවුරු කිරීමේ විද්‍යුත් තැපෑලක් ලබා ගත හැක.
+      email_settings_hint_html: තහවුරු කිරීමේ විද්‍යුත් තැපෑල %{email}වෙත යවන ලදී. එම විද්‍යුත් තැපැල් ලිපිනය නිවැරදි නොවේ නම්, ඔබට එය ගිණුම් සැකසුම් තුළ වෙනස් කළ හැක.
+      title: සැලසුම
     status:
       account_status: ගිණුමේ තත්වය
+      confirming: විද්‍යුත් තැපෑල තහවුරු කිරීම සම්පූර්ණ කිරීම සඳහා රැඳී සිටිමින්.
+      functional: ඔබගේ ගිණුම සම්පුර්ණයෙන්ම ක්‍රියාත්මකයි.
+      pending: ඔබගේ අයදුම්පත අපගේ කාර්ය මණ්ඩලය විසින් සමාලෝචනය කිරීමට බලාපොරොත්තු වේ. මෙය යම් කාලයක් ගත විය හැක. ඔබගේ අයදුම්පත අනුමත වුවහොත් ඔබට විද්‍යුත් තැපෑලක් ලැබෙනු ඇත.
+      redirecting_to: එය දැනට %{acct}වෙත හරවා යවන බැවින් ඔබගේ ගිණුම අක්‍රියයි.
+      view_strikes: ඔබගේ ගිණුමට එරෙහිව පසුගිය වර්ජන බලන්න
+    too_fast: පෝරමය ඉතා වේගයෙන් ඉදිරිපත් කර ඇත, නැවත උත්සාහ කරන්න.
+    use_security_key: ආරක්ෂක යතුර භාවිතා කරන්න
   authorize_follow:
+    already_following: ඔබ දැනටමත් මෙම ගිණුම අනුගමනය කරයි
+    already_requested: ඔබ දැනටමත් එම ගිණුමට අනුගමනය ඉල්ලීමක් යවා ඇත
+    error: අවාසනාවකට, දුරස්ථ ගිණුම සෙවීමේදී දෝෂයක් ඇති විය
+    follow: අනුගමනය
+    follow_request: 'ඔබ පහත ඉල්ලීමක් යවා ඇත:'
+    following: 'සාර්ථකත්වය! ඔබ දැන් පහත දැක්වේ:'
     post_follow:
       close: හෝ ඔබට මෙම කවුළුව වසාදැමිය හැකිය.
       return: පරිශීලකගේ පැතිකඩ පෙන්වන්න
       web: වියමන ට යන්න
+    title: "%{acct} අනුගමනය"
   challenge:
     confirm: ඉදිරියට
-    invalid_password: අවලංගු නොවන මුරපදයකි
+    hint_html: "<strong>ඉඟිය:</strong> අපි ඉදිරි පැය සඳහා නැවත ඔබගේ මුරපදය ඔබෙන් නොඉල්ලමු."
+    invalid_password: නොවන මුරපදයකි
+    prompt: ඉදිරියට යාමට මුරපදය තහවුරු කරන්න
+  crypto:
+    errors:
+      invalid_key: වලංගු Ed25519 හෝ Curve25519 යතුරක් නොවේ
+      invalid_signature: වලංගු Ed25519 අත්සනක් නොවේ
   date:
     formats:
       default: "%b %d, %Y"
       with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
+      about_x_hours: පැය %{count}
+      about_x_months: මාස %{count}
+      half_a_minute: මේ දැන්
+      less_than_x_minutes: මීටර් %{count}
       less_than_x_seconds: මේ දැන්
+      x_minutes: මීටර් %{count}
+      x_months: මාස %{count}
+      x_seconds: "%{count}තත්"
+  deletes:
+    challenge_not_passed: ඔබ ඇතුළත් කළ තොරතුරු නිවැරදි නැත
+    confirm_password: ඔබගේ අනන්‍යතාවය තහවුරු කිරීමට ඔබගේ වත්මන් මුරපදය ඇතුලත් කරන්න
+    confirm_username: ක්රියා පටිපාටිය තහවුරු කිරීමට ඔබගේ පරිශීලක නාමය ඇතුලත් කරන්න
+    proceed: ගිණුම මකන්න
+    success_msg: ඔබගේ ගිණුම සාර්ථකව මකා ඇත
+    warning:
+      before: 'ඉදිරියට යාමට පෙර, කරුණාකර මෙම සටහන් හොඳින් කියවන්න:'
+      caches: වෙනත් සේවාදායකයන් විසින් හැඹිලිගත කර ඇති අන්තර්ගතය දිගටම පැවතිය හැක
+      data_removal: ඔබගේ පළ කිරීම් සහ අනෙකුත් දත්ත ස්ථිරවම ඉවත් කරනු ලැබේ
+      email_change_html: ඔබට ඔබගේ ගිණුම මකා</a> <a href="%{path}">කළ හැක
+      email_contact_html: එය තවමත් නොපැමිණියේ නම්, ඔබට උදව් සඳහා <a href="mailto:%{email}">%{email}</a> විද්‍යුත් තැපෑලෙන් යැවිය හැක
+      email_reconfirmation_html: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑල නොලැබුනේ නම්, ඔබට එය <a href="%{path}">නැවත ඉල්ලා සිටිය හැක</a>
+      irreversible: ඔබට ඔබගේ ගිණුම ප්‍රතිසාධනය කිරීමට හෝ නැවත සක්‍රිය කිරීමට නොහැකි වනු ඇත
+      more_details_html: වැඩි විස්තර සඳහා, <a href="%{terms_path}">පෞද්ගලිකත්ව ප්‍රතිපත්තිය</a>බලන්න.
+      username_available: ඔබගේ පරිශීලක නාමය නැවත ලබා ගත හැකි වනු ඇත
+      username_unavailable: ඔබගේ පරිශීලක නාමය නොතිබෙනු ඇත
+  disputes:
+    strikes:
+      action_taken: පියවර ගත්තා
+      appeal: අභියාචනය
+      appeal_approved: මෙම වර්ජනය සාර්ථකව අභියාචනා කර ඇති අතර එය තවදුරටත් වලංගු නොවේ
+      appeal_rejected: අභියාචනය ප්‍රතික්ෂේප කර ඇත
+      appeal_submitted_at: අභියාචනය ඉදිරිපත් කරන ලදී
+      appealed_msg: ඔබගේ අභියාචනය ඉදිරිපත් කර ඇත. එය අනුමත වුවහොත්, ඔබට දැනුම් දෙනු ලැබේ.
+      appeals:
+        submit: අභියාචනය ඉදිරිපත් කරන්න
+      approve_appeal: අභියාචනය අනුමත කරන්න
+      associated_report: ආශ්රිත වාර්තාව
+      created_at: දිනැති
+      description_html: මේවා ඔබගේ ගිණුමට එරෙහිව ගන්නා ලද ක්‍රියා සහ %{instance}හි කාර්ය මණ්ඩලය විසින් ඔබට එවා ඇති අනතුරු ඇඟවීම් වේ.
+      recipient: වෙත යොමු කරන ලදී
+      reject_appeal: අභියාචනය ප්‍රතික්ෂේප කරන්න
+      status: 'පළ කිරීම #%{id}'
+      status_removed: පළ කිරීම දැනටමත් පද්ධතියෙන් ඉවත් කර ඇත
+      title: "%{action} සිට %{date}"
+      title_actions:
+        delete_statuses: පසු ඉවත් කිරීම
+        disable: ගිණුම කැටි කිරීම
+        mark_statuses_as_sensitive: තනතුරු සංවේදී ලෙස සලකුණු කිරීම
+        none: අවවාදයයි
+        sensitive: ගිණුම සංවේදී ලෙස සලකුණු කිරීම
+        silence: ගිණුම සීමා කිරීම
+        suspend: ගිණුම අත්හිටුවීම
+      your_appeal_approved: ඔබගේ අභියාචනය අනුමත කර ඇත
+      your_appeal_pending: ඔබ අභියාචනයක් ඉදිරිපත් කර ඇත
+      your_appeal_rejected: ඔබගේ අභියාචනය ප්‍රතික්ෂේප කර ඇත
+  domain_validator:
+    invalid_domain: වලංගු ඩොමේන් නාමයක් නොවේ
   errors:
-    '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
-    '404': The page you are looking for isn't here.
-    '406': This page is not available in the requested format.
-    '410': The page you were looking for doesn't exist here anymore.
-    '422': 
-    '429': Too many requests
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '400': ඔබ ඉදිරිපත් කළ ඉල්ලීම අවලංගු හෝ විකෘති විය.
+    '403': ඔබට මෙම පිටුව බැලීමට අවසර නැත.
+    '404': ඔබ සොයන පිටුව මෙහි නොමැත.
+    '406': මෙම පිටුව ඉල්ලන ලද ආකෘතියෙන් නොමැත.
+    '410': ඔබ සොයන පිටුව තවදුරටත් මෙහි නොමැත.
+    '422':
+      content: ආරක්ෂක සත්‍යාපනය අසාර්ථක විය. ඔබ කුකීස් අවහිර කරනවාද?
+      title: ආරක්ෂක සත්‍යාපනය අසාර්ථක විය
+    '429': ඉල්ලීම් වැඩියි
+    '500':
+      content: අපට කණගාටුයි, නමුත් අපගේ පැත්තෙන් යමක් වැරදී ඇත.
+      title: මෙම පිටුව නිවැරදි නොවේ
+    '503': තාවකාලික සේවාදායකයේ අසාර්ථක වීමක් හේතුවෙන් පිටුව සේවය කිරීමට නොහැකි විය.
+    noscript_html: Mastodon වෙබ් යෙදුම භාවිතා කිරීමට, කරුණාකර JavaScript සක්‍රීය කරන්න. විකල්පයක් ලෙස, ඔබේ වේදිකාව සඳහා</a> <a href="%{apps_path}">එකක් උත්සාහ කරන්න.
+  existing_username_validator:
+    not_found: එම පරිශීලක නාමය සහිත දේශීය පරිශීලකයෙකු සොයා ගැනීමට නොහැකි විය
+    not_found_multiple: "%{usernames}සොයා ගැනීමට නොහැකි විය"
   exports:
     archive_takeout:
       date: දිනය
-      download: ඔබගේ සංරක්ෂිතය බාගන්න
+      download: ඔබගේ සුරක්ෂිතභාවය බාගන්න
+      hint_html: ඔබට ඔබගේ පළ කිරීම් <strong>සහ උඩුගත කළ මාධ්‍ය</strong>හි සංරක්ෂිතයක් ඉල්ලා සිටිය හැක. නිර්යාත කළ දත්ත ActivityPub ආකෘතියෙන්, ඕනෑම අනුකූල මෘදුකාංගයකට කියවිය හැකිය. ඔබට දින 7කට වරක් ලේඛනාගාරයක් ඉල්ලා සිටිය හැක.
+      in_progress: ඔබගේ සංරක්ෂිතය සම්පාදනය කරමින්...
+      request: ඔබගේ සංරක්ෂිතය ඉල්ලන්න
       size: ප්‍රමාණය
-    bookmarks: පොත් යොමු
-    lists: ලැයිස්තු
+    blocks: ඔබ අවහිර කරන්න
+    bookmarks: පොත් යොමු කරන්න
+    domain_blocks: වසම් අවහිර කිරීම්
+    lists: ලැයිස්තුව
+    mutes: ඔබ නිහඬ කරන්න
     storage: මාධ්‍ය ගබඩාව
+  featured_tags:
+    add_new: අලුතින් එකතු කරන්න
+    errors:
+      limit: ඔබ දැනටමත් උපරිම හෑෂ් ටැග් ප්‍රමාණය විශේෂාංග කර ඇත
+    hint_html: "<strong>විශේෂාංගගත හැෂ් ටැග් මොනවාද?</strong> ඒවා ඔබේ පොදු පැතිකඩෙහි ප්‍රමුඛව ප්‍රදර්ශනය වන අතර එම හැෂ් ටැග් යටතේ ඔබේ පොදු පළ කිරීම් බ්‍රවුස් කිරීමට මිනිසුන්ට ඉඩ සලසයි. නිර්මාණාත්මක කෘති හෝ දිගු කාලීන ව්යාපෘති පිළිබඳ වාර්තාවක් තබා ගැනීම සඳහා ඔවුන් විශිෂ්ට මෙවලමක් වේ."
   filters:
     contexts:
       account: පැතිකඩයන්
+      home: නිවස සහ ලැයිස්තු
       notifications: දැනුම්දීම්
+      public: පොදු කාලරේඛා
       thread: සංවාද
     edit:
+      add_keyword: මූල පදය එක් කරන්න
+      keywords: මූල පද
       title: පෙරහන සංස්කරණය
+    errors:
+      deprecated_api_multiple_keywords: මෙම පරාමිති පෙරහන් මූල පද එකකට වඩා අදාළ වන බැවින් මෙම යෙදුමෙන් වෙනස් කළ නොහැක. වඩාත් මෑත යෙදුමක් හෝ වෙබ් අතුරු මුහුණතක් භාවිතා කරන්න.
+      invalid_context: කිසිවක් හෝ වලංගු නොවන සන්දර්භයක් සපයා නැත
     index:
+      contexts: "%{contexts}හි පෙරහන්"
+      delete: මකන්න
+      empty: ඔබට පෙරහන් නොමැත.
+      expires_in: "%{distance}කින් කල් ඉකුත් වේ"
+      expires_on: "%{date}දින කල් ඉකුත් වේ"
+      keywords:
+        one: "%{count} මූල පදය"
+        other: "%{count} මූල පද"
       title: පෙරහන්
     new:
+      save: නව පෙරහන සුරකින්න
       title: නව පෙරහනක් එකතු කරන්න
   footer:
-    developers: සංවර්ධකයින්
-    more: තව…
-    resources: සම්පත්
+    trending_now: දැන් ප්‍රවණතාවය
   generic:
     all: සියල්ල
-    copy: පිටපත්
+    changes_saved_msg: වෙනස්කම් සාර්ථකව සුරකින ලදී!
+    copy: පිටපතක්
+    delete: මකන්න
+    none: කිසිවක් නැත
+    order_by: විසින් ඇණවුම් කරන්න
     save_changes: වෙනස්කම් සුරකින්න
-  identity_proofs:
-    active: ක්‍රියාත්මකයි
-    identity: අනන්‍යතාව
+    today: අද
+    validation_errors:
+      one: යමක් තවමත් හරි නැත! කරුණාකර පහත දෝෂය සමාලෝචනය කරන්න
+      other: යමක් තවමත් හරි නැත! කරුණාකර පහත දෝෂ %{count} ක් සමාලෝචනය කරන්න
+  html_validator:
+    invalid_markup: 'වලංගු නොවන HTML සලකුණු අඩංගු වේ: %{error}'
   imports:
+    errors:
+      over_rows_processing_limit: පේළි %{count} කට වඩා අඩංගු වේ
+    modes:
+      merge: ඒකාබද්ධ කරන්න
+      merge_long: පවතින වාර්තා තබා නව ඒවා එකතු කරන්න
+      overwrite: උඩින් ලියන්න
+      overwrite_long: වත්මන් වාර්තා නව ඒවා සමඟ ප්‍රතිස්ථාපනය කරන්න
+    preface: ඔබ අනුගමන කරන හෝ අවහිර කරන පුද්ගලයින්ගේ ලැයිස්තුවක් වැනි වෙනත් සේවාදායකයකින් ඔබ නිර්යාත කර ඇති දත්ත ඔබට ආයාත කළ හැක.
+    success: ඔබගේ දත්ත සාර්ථකව උඩුගත කර ඇති අතර නියමිත වේලාවට සැකසෙනු ඇත
     types:
+      blocking: අවහිර කිරීමේ ලැයිස්තුව
       bookmarks: පොත් යොමු
+      domain_blocking: වසම් අවහිර කිරීමේ ලැයිස්තුව
+      following: පහත ලැයිස්තුව
+      muting: නිහඬ කිරීමේ ලැයිස්තුව
     upload: උඩුගත කරන්න
   invites:
+    delete: අක්රිය කරන්න
+    expired: කල් ඉකුත් වී ඇත
     expires_in:
       '1800': විනාඩි 30
-      '21600': හෝරා 6
-      '3600': හෝරා 1
-      '43200': හෝරා 12
+      '21600': පැය 6
+      '3600': පැය 1
+      '43200': පැය 12
       '604800': සති 1
-      '86400': දින 1
+      '86400': දවස් 1
+    expires_in_prompt: කවදාවත් නැහැ
+    generate: ආරාධනා සබැඳිය උත්පාදනය කරන්න
+    invited_by: 'ඔබට ආරාධනා කළේ:'
+    max_uses:
+      one: 1 භාවිතය
+      other: "%{count} භාවිතා කරයි"
+    max_uses_prompt: සීමාවක් නැත
+    prompt: මෙම සේවාදායකයට ප්‍රවේශය ලබා දීමට අන් අය සමඟ සබැඳි ජනනය කර බෙදා ගන්න
+    table:
+      expires_at: කල් ඉකුත් වේ
+      uses: භාවිතා කරයි
     title: මිනිසුන්ට ආරාධනා කරන්න
+  lists:
+    errors:
+      limit: ඔබ උපරිම ලැයිස්තු ප්‍රමාණයට ළඟා වී ඇත
   login_activities:
     authentication_methods:
-      password: මුර පදය
+      otp: ද්වි-සාධක සත්‍යාපන යෙදුම
+      password: මුරපදය
+      sign_in_token: ඊමේල් ආරක්ෂක කේතය
+      webauthn: ආරක්ෂක යතුරු
+    description_html: ඔබ හඳුනා නොගත් ක්‍රියාකාරකම් ඔබ දුටුවහොත්, ඔබේ මුරපදය වෙනස් කිරීම සහ ද්වි-සාධක සත්‍යාපනය සක්‍රීය කිරීම සලකා බලන්න.
+    empty: සත්‍යාපන ඉතිහාසයක් නොමැත
+    failed_sign_in_html: "%{ip} (%{browser}) සිට %{method} සමඟ අසාර්ථක පුරනය වීමේ උත්සාහය"
+    successful_sign_in_html: "%{ip} (%{browser}) සිට %{method} සමඟ සාර්ථක පුරනය වීම"
+    title: සත්‍යාපන ඉතිහාසය
+  media_attachments:
+    validations:
+      images_and_video: දැනටමත් පින්තූර අඩංගු පළ කිරීමකට වීඩියෝවක් ඇමිණිය නොහැක
+      not_ready: සැකසීම අවසන් නොකළ ගොනු ඇමිණිය නොහැක. මොහොතකින් නැවත උත්සාහ කරන්න!
+      too_many: ගොනු 4කට වඩා ඇමිණිය නොහැක
+  migrations:
+    acct: වෙත ගෙන යන ලදී
+    cancel: යළි-යොමුවීම් අවලංගු කරන්න
+    cancel_explanation: යළි-යොමුවීම් අවලංගු කිරීම ඔබගේ ජංගම ගිණුම නැවත සක්‍රිය කරනු ඇත, නමුත් එම ගිණුමට ගෙන ගිය අනුගාමිකයින් ආපසු ගෙන එන්නේ නැත.
+    cancelled_msg: යළි-යොමුවීම සාර්ථකව අවලංගු කරන ලදී.
+    errors:
+      already_moved: ඔබ දැනටමත් මාරු කර ඇති ගිණුමයි
+      missing_also_known_as: මෙම ගිණුමේ අන්වර්ථ නාමයක් නොවේ
+      move_to_self: ජංගම ගිණුම විය නොහැක
+      not_found: සොයා ගැනීමට නොහැකි විය
+      on_cooldown: ඔබ සිසිලනය මත සිටී
+    followers_count: චලනය වන අවස්ථාවේ අනුගාමිකයන්
+    incoming_migrations: වෙනත් ගිණුමකින් මාරු වීම
+    incoming_migrations_html: වෙනත් ගිණුමකින් මෙම ගිණුමට මාරු වීමට, පළමුව ඔබ <a href="%{path}">අන්වර්ථ</a>ගිණුමක් සෑදිය යුතුය.
+    moved_msg: ඔබගේ ගිණුම දැන් %{acct} වෙත හරවා යවනු ලබන අතර ඔබගේ අනුගාමිකයින් එහා මෙහා ගෙන යමින් පවතී.
+    not_redirecting: ඔබගේ ගිණුම දැනට වෙනත් කිසිදු ගිණුමකට හරවා යවන්නේ නැත.
+    on_cooldown: ඔබ මෑතකදී ඔබගේ ගිණුම සංක්‍රමණය කර ඇත. මෙම කාර්යය දින %{count} කින් නැවත ලබා ගත හැකි වනු ඇත.
+    past_migrations: අතීත සංක්‍රමණ
+    proceed_with_move: අනුගාමිකයන් මාරු කරන්න
+    redirected_msg: ඔබගේ ගිණුම දැන් %{acct}වෙත හරවා යවනු ලැබේ.
+    redirecting_to: ඔබගේ ගිණුම %{acct}වෙත හරවා යවනු ලැබේ.
+    set_redirect: යළි-යොමුවීම් සකසන්න
+    warning:
+      backreference_required: නව ගිණුම ප්‍රථමයෙන් මෙය ආපසු යොමු කිරීමට වින්‍යාස කළ යුතුය
+      before: 'ඉදිරියට යාමට පෙර, කරුණාකර මෙම සටහන් හොඳින් කියවන්න:'
+      cooldown: මාරු වීමෙන් පසු ඔබට නැවත ගමන් කිරීමට නොහැකි වනු ඇති පොරොත්තු කාල සීමාවක් ඇත
+      disabled_account: ඔබගේ ජංගම ගිණුම පසුව සම්පූර්ණයෙන්ම භාවිතා කළ නොහැක. කෙසේ වෙතත්, ඔබට දත්ත අපනයනයට මෙන්ම නැවත සක්‍රිය කිරීමට ප්‍රවේශය ඇත.
+      followers: මෙම ක්‍රියාව සියළුම අනුගාමිකයින් ජංගම ගිණුමේ සිට නව ගිණුමට ගෙන යනු ඇත
+      only_redirect_html: විකල්පයක් ලෙස, ඔබට <a href="%{path}">ඔබගේ පැතිකඩ</a>හි යළි-යොමුවීමක් පමණක් තැබිය හැකිය.
+      other_data: වෙනත් දත්ත කිසිවක් ස්වයංක්‍රීයව ගෙන නොයනු ඇත
+      redirect: ඔබගේ ජංගම ගිණුමේ පැතිකඩ යළි-යොමු කිරීමේ දැන්වීමක් සමඟ යාවත්කාලීන කෙරෙන අතර සෙවුම් වලින් බැහැර කරනු ලැබේ
+  moderation:
+    title: මධ්යස්ථභාවය
+  move_handler:
+    carry_blocks_over_text: මෙම පරිශීලකයා ඔබ අවහිර කර තිබූ %{acct}සිට මාරු විය.
+    carry_mutes_over_text: මෙම පරිශීලකයා ඔබ නිශ්ශබ්ද කර තිබූ %{acct}වෙතින් මාරු විය.
+    copy_account_note_text: 'මෙම පරිශීලකයා %{acct}සිට මාරු විය, මෙන්න ඔවුන් ගැන ඔබේ පෙර සටහන්:'
   notification_mailer:
+    admin:
+      report:
+        subject: "%{name} වාර්තාවක් ඉදිරිපත් කළේය"
+      sign_up:
+        subject: "%{name} අත්සන් කර ඇත"
+    favourite:
+      body: 'ඔබේ පළ කිරීම %{name}විසින් ප්‍රිය කරන ලදී:'
+      subject: "%{name} ඔබගේ පළ කිරීම ප්‍රිය කරන ලදී"
+      title: නව ප්රියතම
+    follow:
+      body: "%{name} දැන් ඔබව අනුගමනය කරයි!"
+      subject: "%{name} දැන් ඔබව අනුගමනය කරයි"
+      title: නව අනුගාමිකයෙක්
+    follow_request:
+      action: අනුගමනය කරන ඉල්ලීම් කළමනාකරණය කරන්න
+      body: "%{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත"
+      subject: 'පොරොත්තු අනුගාමිකයා: %{name}'
+      title: නව අනුගමනය ඉල්ලීම
     mention:
       action: පිළිතුර
+      body: 'ඔබව මෙහි %{name} කින් සඳහන් කර ඇත:'
+      subject: ඔබව %{name}මගින් සඳහන් කර ඇත
       title: නව සඳැහුම
+    poll:
+      subject: "%{name} න් මත විමසුමක් අවසන් විය"
+    reblog:
+      body: 'ඔබේ පළ කිරීම %{name}කින් වැඩි කරන ලදී:'
+      subject: "%{name} ඔබේ පළ කිරීම ඉහළ නැංවීය"
+      title: නව තල්ලුවක්
+    status:
+      subject: "%{name} දැන් පළ කළා"
+    update:
+      subject: "%{name} පළ කිරීමක් සංස්කරණය කළා"
   notifications:
+    email_events: ඊමේල් දැනුම්දීම් සඳහා සිදුවීම්
+    email_events_hint: 'ඔබට දැනුම්දීම් ලැබීමට අවශ්‍ය සිදුවීම් තෝරන්න:'
     other_settings: වෙනත් දැනුම්දීම් සැකසුම්
   number:
     human:
       decimal_units:
         format: "%n%u"
+        units:
+          billion: බී
+          million: ද.ල.
+          quadrillion: ප්‍රශ්නය
+          thousand: ද.
+          trillion: ටී
   otp_authentication:
+    code_hint: තහවුරු කිරීමට ඔබගේ සත්‍යාපන යෙදුම මගින් ජනනය කරන ලද කේතය ඇතුළු කරන්න
+    description_html: ඔබ සත්‍යාපන යෙදුමක් භාවිතයෙන් <strong>ද්වි-සාධක සත්‍යාපනය</strong> සක්‍රීය කරන්නේ නම්, ලොගින් වීමේදී ඔබට ඔබගේ දුරකථනය සන්තකයේ තබා ගැනීමට අවශ්‍ය වනු ඇත, එය ඔබට ඇතුළු වීමට ටෝකන ජනනය කරයි.
     enable: සබල කරන්න
+    instructions_html: "<strong>මෙම QR කේතය ඔබගේ දුරකථනයේ Google Authenticator හෝ එවැනිම TOTP යෙදුමකට පරිලෝකනය කරන්න</strong>. මෙතැන් සිට, එම යෙදුම ඔබට ලොග් වීමේදී ඇතුළත් කළ යුතු ටෝකන ජනනය කරයි."
+    manual_instructions: 'ඔබට QR කේතය පරිලෝකනය කළ නොහැකි නම් සහ එය අතින් ඇතුල් කිරීමට අවශ්‍ය නම්, මෙන්න සරල පෙළ රහස:'
+    setup: සැලසුම
+    wrong_code: ඇතුළත් කළ කේතය අවලංගුයි! සේවාදායක වේලාව සහ උපාංග වේලාව නිවැරදිද?
   pagination:
+    newer: අලුත්
     next: ඊළඟ
+    older: වැඩිහිටි
+    prev: පෙර
     truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: ඔබ දැනටමත් මෙම මත විමසුමට ඡන්දය දී ඇත
+      duplicate_options: අනුපිටපත් අයිතම අඩංගු වේ
+      duration_too_long: අනාගතයට බොහෝ දුරයි
+      duration_too_short: ඉතා ඉක්මනින් වේ
+      expired: මත විමසුම දැනටමත් අවසන් වී ඇත
+      invalid_choice: තෝරාගත් ඡන්ද විකල්පය නොපවතී
+      over_character_limit: එක් එක් අක්ෂර %{max} ට වඩා දිගු විය නොහැක
+      too_few_options: එක් අයිතමයකට වඩා තිබිය යුතුය
+      too_many_options: අයිතම %{max} කට වඩා අඩංගු විය නොහැක
+  preferences:
+    other: වෙනත්
+    posting_defaults: පෙරනිමි පළ කිරීම
+    public_timelines: පොදු කාලරේඛා
+  reactions:
+    errors:
+      limit_reached: විවිධ ප්‍රතික්‍රියා වල සීමාව ළඟා විය
+      unrecognized_emoji: පිළිගත් ඉමොජියක් නොවේ
   relationships:
     activity: ගිණුමේ ක්‍රියාකාරකම්
-    status: ගිණුමේ තත්වය
+    dormant: නිදිමතයි
+    follow_selected_followers: තෝරාගත් අනුගාමිකයින් අනුගමනය කරන්න
+    followers: අනුගාමිකයින්
+    following: අනුගමනය
+    invited: ආරාධනා කළා
+    last_active: අවසන් වරට ක්‍රියාකාරී
+    most_recent: මෑතකාලීන
+    moved: මාරු කළා
+    mutual: අන්යෝන්ය
+    primary: ප්රාථමික
+    relationship: සම්බන්ධතාවය
+    remove_selected_domains: තෝරාගත් වසම් වලින් සියලුම අනුගාමිකයින් ඉවත් කරන්න
+    remove_selected_followers: තෝරාගත් අනුගාමිකයින් ඉවත් කරන්න
+    remove_selected_follows: තෝරාගත් පරිශීලකයින් අනුගමනය නොකරන්න
+    status: ගිණුමේ තත්‍වය
+  remote_follow:
+    missing_resource: ඔබගේ ගිණුම සඳහා අවශ්‍ය යළි-යොමුවීම් URL එක සොයා ගැනීමට නොහැකි විය
+  reports:
+    errors:
+      invalid_rules: වලංගු නීති සඳහන් නොකරයි
+  rss:
+    content_warning: 'අන්තර්ගත අනතුරු ඇඟවීම:'
+    descriptions:
+      account: "@%{acct}සිට පොදු පළ කිරීම්"
+      tag: "#%{hashtag}ටැග් කර ඇති පොදු පළ කිරීම්"
+  scheduled_statuses:
+    over_daily_limit: ඔබ අද දිනට නියමිත පළ කිරීම් %{limit} සීමාව ඉක්මවා ඇත
+    over_total_limit: ඔබ නියමිත පළ කිරීම් %{limit} සීමාව ඉක්මවා ඇත
+    too_soon: නියමිත දිනය අනාගතයේ විය යුතුය
   sessions:
+    activity: අවසාන ක්‍රියාකාරකම
     browser: අතිරික්සුව
     browsers:
       alipay: අලිපේ
-      blackberry: බ්ලැක්බෙරි
       chrome: ක්‍රෝම්
       edge: මයික්‍රොසොෆ්ට් එඩ්ගේ
       electron: ඉලෙක්ට්‍රෝන්
@@ -347,41 +1198,250 @@ si:
       generic: නොදන්නා අතිරික්සුවකි
       ie: ඉන්ටර්නෙට් එක්ස්ප්ලෝරර්
       micro_messenger: මයික්‍රොමැසෙන්ජර්
+      nokia: Nokia S40 Ovi බ්‍රව්සරය
       opera: ඔපෙරා
       otter: ඔටර්
       qq: කියුකියු අතිරික්සුව
       safari: සෆාරි
-      uc_browser: යූසී අතිරික්සුව
       weibo: වෙයිබො
+    current_session: වත්මන් සැසිය
+    description: "%{browser} මත %{platform}"
+    explanation: මේවා දැනට ඔබගේ Mastodon ගිණුමට ලොග් වී ඇති වෙබ් බ්‍රව්සර් වේ.
     ip: අ.ජා. කෙ. (IP)
     platforms:
       adobe_air: ඇඩෝබි එයාර්
       android: ඇන්ඩ්‍රොයිඩ්
-      blackberry: බ්ලැක්බෙරි
-      chrome_os: ක්‍රෝම් ඕඑස්
       firefox_os: ෆයර්ෆොක්ස් ඕඑස්
       ios: අයිඕඑස්
       linux: ලිනක්ස්
       mac: මැක්ඕඑස්
+      other: නොදන්නා වේදිකාව
       windows: වින්ඩෝස්
       windows_mobile: වින්ඩෝස් මොබයිල්
       windows_phone: වින්ඩෝස් පෝන්
+    revoke: අවලංගු කරන්න
+    revoke_success: සැසිය සාර්ථකව අවලංගු කරන ලදී
+    title: සැසිවාර
+    view_authentication_history: ඔබගේ ගිණුමේ සත්‍යාපන ඉතිහාසය බලන්න
   settings:
     account: ගිණුම
     account_settings: ගිණුමේ සැකසුම්
+    aliases: ගිණුම් අන්වර්ථ නාමයන්
+    appearance: පෙනුම
+    authorized_apps: අවසර ලත් යෙදුම්
+    back: Mastodon වෙත නැවත යන්න
+    delete: ගිණුම මකා දැමීම
+    development: සංවර්ධනය
     edit_profile: පැතිකඩ සංස්කරණය
-    export: දත්ත නිර්යාත
-    import: ආයාත කරන්න
-    import_and_export: ආයාත සහ නිර්යාත
+    export: දත්ත නිර්යාතය
+    featured_tags: විශේෂාංගගත හැෂ් ටැග්
+    import: ආයාතය
+    import_and_export: ආයාත හා නිර්යාත
+    migrate: ගිණුම් සංක්‍රමණය
     notifications: දැනුම්දීම්
+    preferences: මනාප
     profile: පැතිකඩ
+    relationships: අනුගාමිකයින් සහ අනුගාමිකයින්
+    statuses_cleanup: ස්වයංක්‍රීය පළ කිරීම් මකාදැමීම
+    strikes: මධ්‍යස්ථ වැඩ වර්ජන
+    two_factor_authentication: ද්වි සාධක Aut
+    webauthn_authentication: ආරක්ෂක යතුරු
   statuses:
+    attached:
+      audio:
+        one: "%{count} ශ්රව්ය"
+        other: "%{count} ශ්රව්ය"
+      description: 'අමුණා ඇත: %{attached}'
+      image:
+        one: "%{count} රූපය"
+        other: පින්තූර %{count}
+      video:
+        one: "%{count} වීඩියෝ"
+        other: වීඩියෝ %{count}
+    boosted_from_html: "%{acct_link}සිට වැඩි කරන ලදී"
+    content_warning: 'අන්තර්ගත අනතුරු ඇඟවීම: %{warning}'
+    default_language: අතුරු මුහුණත් භාෂාවට සමානයි
+    disallowed_hashtags:
+      one: 'අනුමත නොකළ හැෂ් ටැගයක් අඩංගු විය: %{tags}'
+      other: 'අනුමත නොකළ හැෂ් ටැග් අඩංගු විය: %{tags}'
+    edited_at_html: සංස්කරණය %{date}
+    errors:
+      in_reply_not_found: ඔබ පිළිතුරු දීමට උත්සාහ කරන පළ කිරීම පවතින බවක් නොපෙනේ.
+    open_in_web: වෙබයේ විවෘත කරන්න
+    over_character_limit: අක්ෂර සීමාව %{max} ඉක්මවා ඇත
+    pin_errors:
+      direct: සඳහන් කළ පරිශීලකයින්ට පමණක් පෙනෙන පළ කිරීම් ඇමිණිය නොහැක
+      limit: ඔබ දැනටමත් උපරිම පළ කිරීම් සංඛ්‍යාව අමුණා ඇත
+      ownership: වෙනත් කෙනෙකුගේ පළ කිරීමක් ඇමිණිය නොහැක
+      reblog: බූස්ට් එකක් ඇලවිය නොහැක
+    poll:
+      total_people:
+        one: "%{count} පුද්ගලයෙක්"
+        other: පුද්ගලයන් %{count}
+      total_votes:
+        one: "%{count} ඡන්ද"
+        other: ඡන්ද %{count} යි
+      vote: ඡන්දය දෙන්න
     show_more: තව පෙන්වන්න
+    show_newer: අලුත්ම පෙන්වන්න
+    show_older: පැරණි පෙන්වන්න
+    show_thread: නූල් පෙන්වන්න
+    sign_in_to_participate: සංවාදයට සහභාගී වීමට පුරන්න
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: සෘජු
+      private: අනුගාමිකයින්-පමණි
+      private_long: අනුගාමිකයින්ට පමණක් පෙන්වන්න
       public: ප්‍රසිද්ධ
+      public_long: හැමෝටම පේනවා
+      unlisted: ලැයිස්තුගත නොකළ
+      unlisted_long: සෑම කෙනෙකුටම දැකිය හැක, නමුත් පොදු කාලරාමුවෙහි ලැයිස්තුගත කර නොමැත
+  statuses_cleanup:
+    enabled: පැරණි පළ කිරීම් ස්වයංක්‍රීයව මකන්න
+    enabled_hint: ඔබේ පළ කිරීම් පහත ව්‍යතිරේකවලින් එකකට ගැලපෙන්නේ නම් මිස, ඒවා නිශ්චිත වයස් සීමාවකට ළඟා වූ පසු ස්වයංක්‍රීයව මකයි
+    exceptions: ව්යතිරේක
+    explanation: පළ කිරීම් මකා දැමීම මිල අධික මෙහෙයුමක් වන බැවින්, සේවාදායකය වෙනත් ආකාරයකින් කාර්යබහුල නොවන විට කාලයත් සමඟ මෙය සෙමින් සිදු කෙරේ. මෙම හේතුව නිසා, ඔබේ පළ කිරීම් වයස් සීමාවට ළඟා වූ පසු ටික වේලාවකට පසුව මකා දැමිය හැක.
+    ignore_favs: ප්‍රියතමයන් නොසලකා හරින්න
+    ignore_reblogs: වැඩි කිරීම් නොසලකා හරින්න
+    interaction_exceptions: අන්තර්ක්‍රියා මත පදනම් වූ ව්‍යතිරේක
+    interaction_exceptions_explanation: පළ කිරීම් වරක් ඒවා ඉක්මවා ගිය පසු ප්‍රියතම හෝ බූස්ට් සීමාවට පහළින් ගියහොත් ඒවා මැකීමට සහතිකයක් නොමැති බව සලකන්න.
+    keep_direct: සෘජු පණිවිඩ තබා ගන්න
+    keep_direct_hint: ඔබගේ සෘජු පණිවිඩ කිසිවක් මකන්නේ නැත
+    keep_media: මාධ්‍ය ඇමුණුම් සමඟ පළ කිරීම් තබා ගන්න
+    keep_media_hint: මාධ්‍ය ඇමුණුම් ඇති ඔබේ පළ කිරීම් කිසිවක් මකන්නේ නැත
+    keep_pinned: ඇමිණූ ලිපි තබාගන්න
+    keep_pinned_hint: ඔබ ඇමිණූ ලිපි කිසිවක් නොමැකෙයි
+    keep_polls: ඡන්ද තබා ගන්න
+    keep_polls_hint: ඔබගේ ඡන්ද විමසීම් කිසිවක් මකන්නේ නැත
+    keep_self_bookmark: ඔබ පිටු සලකුණු කළ පළ කිරීම් තබා ගන්න
+    keep_self_bookmark_hint: ඔබ ඔබේම පළ කිරීම් පිටු සලකුණු කර ඇත්නම් ඒවා මකා නොදමන්න
+    keep_self_fav: ඔබ කැමති පළ කිරීම් තබා ගන්න
+    keep_self_fav_hint: ඔබ ඒවාට කැමති නම් ඔබේම පළ කිරීම් මකා නොදමන්න
+    min_age:
+      '1209600': සති 2 යි
+      '15778476': මාස 6 යි
+      '2629746': මාස 1 යි
+      '31556952': වසර 1 යි
+      '5259492': මාස 2 ක්
+      '604800': 1 සතිය
+      '63113904': අවුරුදු 2 ක්
+      '7889238': මාස 3 යි
+    min_age_label: වයස් සීමාව
+    min_favs: අඩුම තරමින් පෝස්ට් ප්‍රිය කරන ලෙස තබා ගන්න
+    min_favs_hint: අවම වශයෙන් මෙම ප්‍රියතම ප්‍රමාණය ලබා ඇති ඔබේ පළ කිරීම් කිසිවක් මකන්නේ නැත. ඔවුන්ගේ ප්‍රියතමයන් ගණන නොතකා පළ කිරීම් මැකීමට හිස්ව තබන්න
+    min_reblogs: අඩුම තරමේ පෝස්ට් බූස්ට් කරගෙන තියාගන්න
+    min_reblogs_hint: අඩුම තරමින් මෙම වාර ගණන වැඩි කර ඇති ඔබගේ පළ කිරීම් කිසිවක් මකා නොදමන්න. බූස්ට් ගණන නොතකා පළ කිරීම් මැකීමට හිස්ව තබන්න
   stream_entries:
+    pinned: ඇමිණූ ලිපිය
+    reblogged: ඉහල නැංවීය
     sensitive_content: සංවේදී අන්තර්ගතයකි
+  strikes:
+    errors:
+      too_late: මෙම වර්ජනයට අභියාචනයක් ඉදිරිපත් කිරීමට ප්‍රමාද වැඩියි
+  tags:
+    does_not_match_previous_name: පෙර නමට නොගැලපේ
+  themes:
+    contrast: Mastodon (ඉහළ වෙනස)
+    default: මැස්ටෝඩන් (අඳුරු)
+    mastodon-light: මැස්ටෝඩන් (ආලෝකය)
   two_factor_authentication:
+    add: එකතු කරන්න
+    disable: 2FA අබල කරන්න
+    disabled_success: ද්වි-සාධක සත්‍යාපනය සාර්ථකව අබල කර ඇත
     edit: සංස්කරණය
+    enabled: ද්වි-සාධක සත්‍යාපනය සක්‍රීය කර ඇත
+    enabled_success: ද්වි-සාධක සත්‍යාපනය සාර්ථකව සබල කර ඇත
+    generate_recovery_codes: ප්‍රතිසාධන කේත ජනනය කරන්න
+    lost_recovery_codes: ඔබගේ දුරකථනය නැති වුවහොත් ඔබගේ ගිණුමට ප්‍රවේශය නැවත ලබා ගැනීමට ප්‍රතිසාධන කේත ඔබට ඉඩ සලසයි. ඔබට ඔබේ ප්‍රතිසාධන කේත නැති වී ඇත්නම්, ඔබට ඒවා මෙහි නැවත උත්පාදනය කළ හැක. ඔබගේ පැරණි ප්‍රතිසාධන කේත අවලංගු වනු ඇත.
+    methods: ද්වි සාධක ක්රම
+    otp: Authenticator යෙදුම
+    recovery_codes: උපස්ථ ප්‍රතිසාධන කේත
+    recovery_codes_regenerated: ප්‍රතිසාධන කේත සාර්ථකව ප්‍රතිජනනය කරන ලදී
+    recovery_instructions_html: ඔබට කවදා හෝ ඔබගේ දුරකථනයට ප්‍රවේශය අහිමි වුවහොත්, ඔබගේ ගිණුමට ප්‍රවේශය නැවත ලබා ගැනීමට පහත ප්‍රතිසාධන කේත වලින් එකක් භාවිතා කළ හැක. <strong>ප්‍රතිසාධන කේත ආරක්ෂිතව තබා ගන්න</strong>. උදාහරණයක් ලෙස, ඔබට ඒවා මුද්‍රණය කර වෙනත් වැදගත් ලේඛන සමඟ ගබඩා කළ හැකිය.
     webauthn: ආරක්‍ෂණ යතුරු
+  user_mailer:
+    appeal_approved:
+      action: ඔබගේ ගිණුමට යන්න
+      explanation: ඔබ %{appeal_date} දින ඉදිරිපත් කළ %{strike_date} හි ඔබේ ගිණුමට එරෙහි වර්ජනයේ අභියාචනය අනුමත කර ඇත. ඔබගේ ගිණුම නැවත වරක් හොඳ තත්වයක පවතී.
+      subject: "%{date} සිට ඔබගේ අභියාචනය අනුමත කර ඇත"
+      title: අභියාචනය අනුමත කර ඇත
+    appeal_rejected:
+      explanation: "%{strike_date} දින ඔබේ ගිණුමට එරෙහිව ඔබ %{appeal_date} දින ඉදිරිපත් කළ වර්ජනයේ අභියාචනය ප්‍රතික්ෂේප කර ඇත."
+      subject: "%{date} සිට ඔබගේ අභියාචනය ප්‍රතික්ෂේප කර ඇත"
+      title: අභියාචනය ප්‍රතික්ෂේප විය
+    backup_ready:
+      explanation: ඔබ ඔබේ Mastodon ගිණුමේ සම්පූර්ණ උපස්ථයක් ඉල්ලා ඇත. එය දැන් බාගත කිරීම සඳහා සූදානම්!
+      subject: ඔබගේ සංරක්ෂිතය බාගැනීමට සූදානම්ය
+      title: සංරක්ෂිත රැගෙන යාම
+    suspicious_sign_in:
+      change_password: ඔබගේ මුරපදය වෙනස් කරන්න
+      details: 'පුරනය වීමේ විස්තර මෙන්න:'
+      explanation: අපි නව IP ලිපිනයකින් ඔබගේ ගිණුමට පුරනය වීමක් අනාවරණය කරගෙන ඇත.
+      further_actions_html: මෙය ඔබ නොවේ නම්, අපි ඔබට වහාම %{action} ලෙස නිර්දේශ කර ඔබගේ ගිණුම සුරක්ෂිතව තබා ගැනීමට සාධක දෙකක සත්‍යාපනය සබල කරන්න.
+      subject: ඔබගේ ගිණුම නව IP ලිපිනයකින් ප්‍රවේශ වී ඇත
+      title: නව පුරනය වීමක්
+    warning:
+      appeal: අභියාචනයක් ඉදිරිපත් කරන්න
+      appeal_description: මෙය දෝෂයක් බව ඔබ විශ්වාස කරන්නේ නම්, ඔබට %{instance}හි කාර්ය මණ්ඩලයට අභියාචනයක් ඉදිරිපත් කළ හැක.
+      categories:
+        spam: ආයාචිත තැපැල්
+        violation: අන්තර්ගතය පහත ප්‍රජා මාර්ගෝපදේශ උල්ලංඝනය කරයි
+      explanation:
+        delete_statuses: ඔබගේ සමහර පළ කිරීම් ප්‍රජා මාර්ගෝපදේශ එකක් හෝ කිහිපයක් උල්ලංඝනය කරන බව සොයා ගෙන ඇති අතර පසුව %{instance}හි උපපරිපාලකයින් විසින් ඉවත් කර ඇත.
+        disable: ඔබට තවදුරටත් ඔබගේ ගිණුම භාවිතා කළ නොහැක, නමුත් ඔබගේ පැතිකඩ සහ අනෙකුත් දත්ත නොවෙනස්ව පවතී. ඔබට ඔබගේ දත්තවල උපස්ථයක් ඉල්ලා සිටීමට, ගිණුම් සැකසීම් වෙනස් කිරීමට හෝ ඔබගේ ගිණුම මකා දැමීමට හැකිය.
+        mark_statuses_as_sensitive: ඔබගේ සමහර පළ කිරීම් %{instance}හි පරිපාලකයින් විසින් සංවේදී ලෙස සලකුණු කර ඇත. මෙයින් අදහස් කරන්නේ පෙරදසුනක් දර්ශනය වීමට පෙර පුද්ගලයින්ට පළ කිරීම් වල මාධ්‍ය තට්ටු කිරීමට අවශ්‍ය වනු ඇති බවයි. අනාගතයේදී පළ කිරීමේදී ඔබට මාධ්‍ය සංවේදී ලෙස සලකුණු කළ හැක.
+        sensitive: මෙතැන් සිට, ඔබගේ උඩුගත කරන ලද සියලුම මාධ්‍ය ගොනු සංවේදී ලෙස සලකුණු කර ක්ලික්-හරහා අනතුරු ඇඟවීමක් පිටුපස සඟවනු ඇත.
+        silence: ඔබට තවමත් ඔබගේ ගිණුම භාවිතා කළ හැකි නමුත් දැනටමත් ඔබව අනුගමනය කරන පුද්ගලයින් පමණක් මෙම සේවාදායකයේ ඔබගේ පළ කිරීම් දකිනු ඇති අතර, විවිධ සොයාගැනීම් විශේෂාංග වලින් ඔබව බැහැර කරනු ලැබිය හැක. කෙසේ වෙතත්, අනෙක් අය තවමත් ඔබව අතින් අනුගමනය කළ හැක.
+        suspend: ඔබට තවදුරටත් ඔබගේ ගිණුම භාවිතා කළ නොහැකි අතර, ඔබගේ පැතිකඩ සහ අනෙකුත් දත්ත තවදුරටත් ප්‍රවේශ විය නොහැක. දින 30කින් පමණ දත්ත සම්පූර්ණයෙන් ඉවත් කරන තෙක් ඔබට තවමත් ඔබේ දත්තවල උපස්ථයක් ඉල්ලා සිටීමට පුරනය විය හැක, නමුත් ඔබව අත්හිටුවීම මගහැර යාම වැළැක්වීමට අපි මූලික දත්ත කිහිපයක් රඳවා ගන්නෙමු.
+      reason: 'හේතුව:'
+      statuses: 'උපුටා දක්වන ලද පළ කිරීම්:'
+      subject:
+        delete_statuses: "%{acct} හි ඔබගේ පළ කිරීම් ඉවත් කර ඇත"
+        disable: ඔබගේ ගිණුම %{acct} කර ඇත
+        mark_statuses_as_sensitive: "%{acct} හි ඔබගේ පළ කිරීම් සංවේදී ලෙස සලකුණු කර ඇත"
+        none: "%{acct}සඳහා අනතුරු ඇඟවීම"
+        sensitive: "%{acct} හි ඔබගේ පළ කිරීම් මෙතැන් සිට සංවේදී ලෙස සලකුණු කෙරේ"
+        silence: ඔබගේ ගිණුම %{acct} සීමා කර ඇත
+        suspend: ඔබගේ ගිණුම %{acct} අත්හිටුවා ඇත
+      title:
+        delete_statuses: පළ කිරීම් ඉවත් කරන ලදී
+        disable: ගිණුම නිශ්චල කර ඇත
+        mark_statuses_as_sensitive: පළ කිරීම් සංවේදී ලෙස ලකුණු කර ඇත
+        none: අවවාදයයි
+        sensitive: ගිණුම සංවේදී ලෙස ලකුණු කර ඇත
+        silence: ගිණුම සීමා සහිතයි
+        suspend: ගිණුම අත්හිටුවා ඇත
+    welcome:
+      edit_profile_action: සැකසුම් පැතිකඩ
+      explanation: ඔබ ආරම්භ කිරීමට උපදෙස් කිහිපයක් මෙන්න
+      final_action: පළ කිරීම ආරම්භ කරන්න
+      full_handle: ඔබේ සම්පූර්ණ හසුරුව
+      full_handle_hint: මෙය ඔබ ඔබේ මිතුරන්ට පවසනු ඇත, එවිට ඔවුන්ට වෙනත් සේවාදායකයකින් ඔබට පණිවිඩ යැවීමට හෝ අනුගමනය කිරීමට හැකිය.
+      subject: Mastodon වෙත සාදරයෙන් පිළිගනිමු
+      title: නැවට සාදරයෙන් පිළිගනිමු, %{name}!
+  users:
+    follow_limit_reached: ඔබට පුද්ගලයින් %{limit} කට වඩා අනුගමනය කළ නොහැක
+    invalid_otp_token: වලංගු නොවන ද්වි-සාධක කේතය
+    otp_lost_help_html: ඔබට දෙකටම ප්‍රවේශය අහිමි වුවහොත්, ඔබට %{email}සමඟ සම්බන්ධ විය හැක
+    seamless_external_login: ඔබ බාහිර සේවාවක් හරහා ලොග් වී ඇත, එබැවින් මුරපදය සහ ඊමේල් සැකසුම් නොමැත.
+    signed_in_as: 'මෙසේ පුරනය වී ඇත:'
+  verification:
+    explanation_html: 'ඔබගේ පැතිකඩ පාරදත්ත</strong>හි ඇති සබැඳි වල හිමිකරු ලෙස ඔබට <strong>සත්‍යාපනය කළ හැක. ඒ සඳහා, සම්බන්ධිත වෙබ් අඩවියේ ඔබේ Mastodon පැතිකඩ වෙත ආපසු සබැඳියක් තිබිය යුතුය. සබැඳිය ආපසු <strong></code> </strong> <code>යුතුය. සබැඳියේ පෙළ අන්තර්ගතය වැදගත් නොවේ. මෙන්න උදාහරණයක්:'
+    verification: සත්යාපනය
+  webauthn_credentials:
+    add: නව ආරක්ෂක යතුර එක් කරන්න
+    create:
+      error: ඔබගේ ආරක්ෂක යතුර එක් කිරීමේ ගැටලුවක් ඇති විය. කරුණාකර නැවත උත්සාහ කරන්න.
+      success: ඔබගේ ආරක්ෂක යතුර සාර්ථකව එක් කරන ලදී.
+    delete: මකන්න
+    delete_confirmation: ඔබට මෙම ආරක්ෂක යතුර මැකීමට අවශ්‍ය බව විශ්වාසද?
+    description_html: ඔබ <strong>ආරක්‍ෂක යතුරු සත්‍යාපනය</strong>සක්‍රීය කරන්නේ නම්, පුරනය වීමේදී ඔබගේ ආරක්‍ෂක යතුරු වලින් එකක් භාවිතා කිරීම අවශ්‍ය වේ.
+    destroy:
+      error: ඔබගේ ආරක්ෂක යතුර මැකීමේ ගැටලුවක් ඇති විය. කරුණාකර නැවත උත්සාහ කරන්න.
+      success: ඔබගේ ආරක්ෂක යතුර සාර්ථකව මකා ඇත.
+    invalid_credential: වලංගු නොවන ආරක්ෂක යතුර
+    nickname_hint: ඔබගේ නව ආරක්ෂක යතුරේ අන්වර්ථ නාමය ඇතුළත් කරන්න
+    not_enabled: ඔබ තවමත් WebAuthn සබල කර නැත
+    not_supported: මෙම බ්‍රවුසරය ආරක්ෂක යතුරු සඳහා සහය නොදක්වයි
+    otp_required: ආරක්ෂක යතුරු භාවිතා කිරීමට කරුණාකර පළමුව ද්වි-සාධක සත්‍යාපනය සක්‍රීය කරන්න.
+    registered_on: "%{date}හි ලියාපදිංචි වී ඇත"
diff --git a/config/locales/simple_form.af.yml b/config/locales/simple_form.af.yml
index 252f9fd5a..6c87a7a63 100644
--- a/config/locales/simple_form.af.yml
+++ b/config/locales/simple_form.af.yml
@@ -1 +1,28 @@
+---
 af:
+  simple_form:
+    hints:
+      announcement:
+        scheduled_at: Laat oop om die aankondiging onmiddellik te publiseer
+      defaults:
+        autofollow: Mense wat aanmeld deur die uitnodiging te aanvaar, sal jou outomaties volg
+      featured_tag:
+        name: 'Hier is van die hutsetikette wat jy onlangs gebruik het:'
+      webhook:
+        events: Kies gebeurtenisse vir stuur
+        url: Waarheen gebeurtenisse gestuur sal word
+    labels:
+      defaults:
+        locale: Koppelvlaktaal
+      featured_tag:
+        name: Hutsetiket
+      form_admin_settings:
+        site_terms: Privaatheidsbeleid
+      interactions:
+        must_be_following: Blokkeer kennisgewings van persone wat jy nie volg nie
+        must_be_following_dm: Blokkeer direkte boodskappe van persone wat jy nie volg nie
+      tag:
+        name: Hutsetiket
+      webhook:
+        events: Geaktiveerde gebeurtenisse
+        url: Eindpunt-URL
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
new file mode 100644
index 000000000..1ff16cca5
--- /dev/null
+++ b/config/locales/simple_form.an.yml
@@ -0,0 +1,309 @@
+---
+an:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Especifique lo suyo nombre d'usuario@dominio d'a cuenta d'an se deseya migrar
+      account_migration:
+        acct: Especifique lo nombre d'usuario@dominio d'a cuenta d'a quala se deseya migrar
+      account_warning_preset:
+        text: Puede usar sintaxi de publicacions, como URLs, hashtags y mencions
+        title: Opcional. No ye visible pa lo destinatario
+      admin_account_action:
+        include_statuses: L'usuario veyerá qué publicacions han causau l'acción de moderación u alvertencia
+        send_email_notification: L'usuario recibirá una explicación d'o que ha succediu con a suya cuenta
+        text_html: Opcional. Puede usar sintaxi de publicacions. Puede anyadir <a href="%{path}">configuracions predefinidas d'alvertencia</a> pa cabidar tiempo
+        type_html: Tría lo qué vas a fer con <strong>%{acct}</strong>
+        types:
+          disable: Priva que l'usuario utilice la suya cuenta, pero no elimina ni amagada los suyos contenius.
+          none: Utilizar esto pa ninviar una alvertencia a l'usuario, sin enchegar garra atra acción.
+          sensitive: Forzar que totz los fichers multimedia d'este usuario sían marcaus como sensibles.
+          silence: Privar que l'usuario pueda publicar con visibilidat publica, amagada los suyos mensaches y notificacions a personas que no lo siguen.
+          suspend: Privar qualsequier interacción dende u enta esta cuenta y eliminar lo suyo conteniu. Reversible en un plazo de 30 días.
+        warning_preset_id: Opcional. Encara puede anyadir texto personalizau a la fin d'a configuración predefinida
+      announcement:
+        all_day: Quan ye triau nomás s'amostrarán las calendatas d'o rango de tiempo
+        ends_at: Opcional. L'anuncio desapareixerá automaticament en este momento
+        scheduled_at: Deixar en blanco pa publicar l'anuncio immediatament
+        starts_at: Opcional. Caso que lo suyo anuncio sía vinculau a un intervalo de tiempo especifico
+        text: Puetz usar la sintaxi de publicacions. Per favor tiene en cuenta lo espacio que ocupará l'anuncio en a pantalla de l'usuario
+      appeal:
+        text: Nomás puetz apelar una amonestación una vegada
+      defaults:
+        autofollow: Los usuarios que se rechistren per medio d'a invitación te seguirán automaticament
+        avatar: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
+        bot: Esta cuenta executa prencipalment accions automatizadas y podría no estar monitorizada
+        context: Un u multiples contextos en os quals ha d'aplicar-se lo filtro
+        current_password: Per razons de seguranza per favor ingrese la clau d'a cuenta actual
+        current_username: Pa confirmar, per favor ingrese lo nombre d'usuario d'a cuenta actual
+        digest: Solo ninviau dimpués d'un largo periodo d'inactividat y nomás si has recibiu mensaches personals entre la tuya ausencia
+        discoverable: Permite que la tuya cuenta sía descubierta per extranyos a traviés de recomendacions, tendencias y atras caracteristicas
+        email: Se le ninviará un correu de confirmación
+        fields: Puetz tener dica 4 elementos amostrando-se como una tabla en o tuyo perfil
+        header: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
+        inbox_url: Copia la URL d'a pachina prencipal d'o relés que quiers utilizar
+        irreversible: Las publicacions filtradas desapareixerán irreversiblement, mesmo si este filtro ye eliminau mas abance
+        locale: L'idioma d'a interficie d'usuario, correus y notificacions push
+        locked: Requiere que manualment aprebes seguidores y las publicacions serán amostradas nomás a las tuyas seguidores
+        password: Utilice a lo menos 8 caracters
+        phrase: S'aplicará sin importar las mayusclas u los avisos de conteniu d'una publicación
+        scopes: Qué APIs de l'aplicación tendrán acceso. Si trías l'aconsiga de libel pero alto, no amenestes triar las individuals.
+        setting_aggregate_reblogs: No amostrar nuevos retutz pa las publicacions que han estau recientment retutadas (nomás afecta a los retutz recibius recientment)
+        setting_always_send_emails: Normalment las notificacions per correu electronico no se ninviarán quan sías usando Mastodon activament
+        setting_default_sensitive: Lo conteniu multimedia sensible ye amagau per defecto y puede estar amostrau con un click
+        setting_display_media_default: Amagar conteniu multimedia marcau como sensible
+        setting_display_media_hide_all: Siempre amagar tot lo conteniu multimedia
+        setting_display_media_show_all: Amostrar siempre conteniu multimedia marcau como sensible
+        setting_hide_network: A quí sigues y quí te sigue no será amostrau en o tuyo perfil
+        setting_noindex: Afecta a lo tuyo perfil publico y pachinas d'estau
+        setting_show_application: L'aplicación que utiliza vusté pa publicar publicacions s'amostrará en a vista detallada d'as suyas publicacions
+        setting_use_blurhash: Los gradientes se basan en as colors d'as imachens amagadas pero fendo borrosos los detalles
+        setting_use_pending_items: Amagar nuevos estaus dezaga d'un clic en cuenta de desplazar automaticament lo feed
+        username: Lo tuyo nombre d'usuario será solo en %{domain}
+        whole_word: Quan la parola clau u frase ye nomás alfanumerica, nomás será aplicau si concuerda con tota la parola
+      domain_allow:
+        domain: Este dominio podrá obtener datos d'este servidor y los datos dentrants serán procesaus y archivados
+      email_domain_block:
+        domain: Este puede estar lo nombre de dominio que amaneixe en l'adreza de correu electronico u lo rechistro MX que utiliza. Se comprebarán en rechistrar-se.
+        with_dns_records: Se ferá un intento de resolver los rechistros DNS d'o dominio dau y los resultaus serán tamién mesos en lista negra
+      featured_tag:
+        name: 'Aquí son belunas d''as etiquetas que mas has utilizau recientment:'
+      filters:
+        action: Triar qué acción realizar quan una publicación coincide con o filtro
+        actions:
+          hide: Amagar completament lo conteniu filtrau, comportando-se como si no existise
+          warn: Amagar lo conteniu filtrau dezaga d'una alvertencia mencionando lo titol d'o filtro
+      form_admin_settings:
+        backups_retention_period: Mantener los fichers d'usuario cheneraus entre lo numero de días especificau.
+        bootstrap_timeline_accounts: Estas cuentas amaneixerán en a parte superior d'as recomendacions d'os nuevos usuarios.
+        closed_registrations_message: Amostrau quan los rechistros son zarraus
+        content_cache_retention_period: Las publicacions d'atros servidors s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva. Esto puede estar irreversible.
+        custom_css: Puetz aplicar estilos personalizaus a la versión web de Mastodon.
+        mascot: Reemplaza la ilustración en a interficie web abanzada.
+        media_cache_retention_period: Los fichers multimedia descargaus s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva, y se redescargarán baixo demanda.
+        profile_directory: Lo directorio de perfils lista a totz los usuarios que han optado per que la suya cuenta pueda estar descubierta.
+        require_invite_text: Quan los rechistros requieren aprebación manual, fa obligatoria la dentrada de texto "Per qué quiers unir-te?" en cuenta d'opcional
+        site_contact_email: Cómo la chent puede meter-se en contacto con tu pa consultas legals u d'aduya.
+        site_contact_username: Cómo puede contactar-te la chent en Mastodon.
+        site_extended_description: Qualsequier información adicional que pueda estar util pa los visitantes y los suyos usuarios. Se puede estructurar con formato Markdown.
+        site_short_description: Una breu descripción pa aduyar a identificar lo suyo servidor de forma sola. Quí l'administra, a quí va endrezau?
+        site_terms: Fe servir la tuya propia politica de privacidat u deixa-la en blanco pa usar la predeterminada. La puetz estructurar con formato Markdown.
+        site_title: Cómo puede referir-se la chent a lo tuyo servidor amás de per lo nombre de dominio.
+        theme: Lo tema que los visitantes no rechistraus y los nuevos usuarios veyen.
+        thumbnail: Una imachen d'aproximadament 2:1 s'amuestra chunto a la información d'o tuyo servidor.
+        timeline_preview: Los visitantes no rechistraus podrán navegar per los mensaches publicos mas recients disponibles en o servidor.
+        trendable_by_default: Omitir la revisión manual d'o conteniu en tendencia. Los elementos individuals encara podrán eliminar-se d'as tendencias.
+        trends: Las tendencias amuestran qué mensaches, etiquetas y noticias son ganando tracción en o tuyo servidor.
+      form_challenge:
+        current_password: Yes dentrando en una aria segura
+      imports:
+        data: Fichero CSV exportau dende unatra instancia de Mastodon
+      invite_request:
+        text: Esto nos aduyará a revisar la suya aplicación
+      ip_block:
+        comment: Opcional. Recuerda per qué has anyadiu esta regla.
+        expires_in: Las adrezas IP son un recurso finito, a vegadas se comparten y a ormino cambian de mans. Per esta razón, no se recomiendan bloqueyos d'IP indefinida.
+        ip: Escriba una adreza IPv4 u IPv6. Puede blocar rangos completos usando la sintaxi CIDR. Tienga cudiau de no quedar-se estase!
+        severities:
+          no_access: Blocar acceso a totz los recursos
+          sign_up_block: Los nuevos rechistros se deshabilitarán
+          sign_up_requires_approval: Nuevos rechistros requerirán la suya aprebación
+        severity: Triar lo que pasará con as peticions dende esta IP
+      rule:
+        text: Describe una norma u requisito pa los usuarios d'este servidor. Intenta fer-la curta y sencilla
+      sessions:
+        otp: 'Escribe lo codigo d''autenticación de dos factors chenerau per la tuya aplicación de telefono u usa un d''os tuyos codigos de recuperación:'
+        webauthn: Si ye una tecla USB, s'asegure de ficar-la y, si ye necesario, la prete.
+      tag:
+        name: Nomás se puede cambiar lo cajón d'as letras, per eixemplo, pa que sía mas leyible
+      user:
+        chosen_languages: Quan se marca, nomás s'amostrarán las publicacions en os idiomas triaus en as linias de tiempo publicas
+        role: Lo rol controla qué permisos tiene la usuaria
+      user_role:
+        color: Color que s'utilizará pa lo rol a lo largo d'a interficie d'usuario, como RGB en formato hexadecimal
+        highlighted: Esto fa que lo rol sía publicament visible
+        name: Nombre publico d'o rol, si lo rol s'estableix pa que s'amuestre como una insignia
+        permissions_as_keys: Los usuarios con este rol tendrán acceso a...
+        position: Un rol superior decide la resolución de conflictos en bellas situacions. Bellas accions nomás pueden levar-se a cabo en rols con menor prioridat
+      webhook:
+        events: Triar eventos pa ninviar
+        url: An los eventos serán ninviaus
+    labels:
+      account:
+        fields:
+          name: Etiqueta
+          value: Conteniu
+      account_alias:
+        acct: Maneya la cuenta antiga
+      account_migration:
+        acct: Alias d'a nueva cuenta
+      account_warning_preset:
+        text: Texto predefinido
+        title: Titol
+      admin_account_action:
+        include_statuses: Incluyir en o correu electronico a las publicacions denunciadas
+        send_email_notification: Notificar a l'usuario per correu electronico
+        text: Aviso personalizau
+        type: Acción
+        types:
+          disable: Deshabilitar
+          none: No fer cosa
+          sensitive: Sensible
+          silence: Silenciar
+          suspend: Suspender y eliminar de forma irreversible la información d'a cuenta
+        warning_preset_id: Usar un aviso predeterminau
+      announcement:
+        all_day: Evento de tot lo día
+        ends_at: Fin de l'evento
+        scheduled_at: Programar publicación
+        starts_at: Comienzo de l'evento
+        text: Anuncio
+      appeal:
+        text: Explica per qué esta decisión ha d'estar revertida
+      defaults:
+        autofollow: Convidar a seguir la tuya cuenta
+        avatar: Avatar
+        bot: Esta ye una cuenta bot
+        chosen_languages: Filtrar idiomas
+        confirm_new_password: Confirmar nueva clau
+        confirm_password: Confirmar clau
+        context: Filtrar contextos
+        current_password: Clau actual
+        data: Información
+        discoverable: Sucherir la cuenta a atros
+        display_name: Nombre pa amostrar
+        email: Adreza de correu electronico
+        expires_in: Expirar dimpués de
+        fields: Metadatos de perfil
+        header: Img. capitero
+        honeypot: "%{label} (no replenar)"
+        inbox_url: URL d'a dentrada de relés
+        irreversible: Refusar en cuenta d'amagar
+        locale: Idioma
+        locked: Fer privada esta cuenta
+        max_uses: Máx. numero d'usos
+        new_password: Nueva clau
+        note: Biografía
+        otp_attempt: Codigo de dos factors
+        password: Clau
+        phrase: Parola clau u frase
+        setting_advanced_layout: Habilitar interficie web abanzada
+        setting_aggregate_reblogs: Agrupar retutz en as linias de tiempo
+        setting_always_send_emails: Ninviar siempre notificacions per correu
+        setting_auto_play_gif: Reproducir automaticament los GIFs animaus
+        setting_boost_modal: Amostrar finestra de confirmación antes de retutar
+        setting_crop_images: Retallar a 16x9 las imachens d'as publicacions no expandidas
+        setting_default_language: Idioma de publicación
+        setting_default_privacy: Privacidat de publicacions
+        setting_default_sensitive: Marcar siempre imachens como sensibles
+        setting_delete_modal: Amostrar dialogo de confirmación antes de borrar una publicación
+        setting_disable_swiping: Deshabilitar movimientos d'eslizamiento
+        setting_display_media: Visualización multimedia
+        setting_display_media_default: Per defecto
+        setting_display_media_hide_all: Amagar tot
+        setting_display_media_show_all: Amostrar tot
+        setting_expand_spoilers: Siempre expandir las publicacions marcadas con alvertencias de conteniu
+        setting_hide_network: Amagar lo tuyo ret
+        setting_noindex: Excluyir-se d'o indexado de motors de busqueda
+        setting_reduce_motion: Reducir lo movimiento d'as animacions
+        setting_show_application: Amostrar aplicación usada pa publicar publicacions
+        setting_system_font_ui: Utilizar la tipografía per defecto d'o sistema
+        setting_theme: Tema d'o puesto
+        setting_trends: Amostrar las tendencias de hue
+        setting_unfollow_modal: Amostrar dialogo de confirmación antes de deixar de seguir a belún
+        setting_use_blurhash: Amostrar gradientes colorius pa conteniu multimedia amagau
+        setting_use_pending_items: Modo lento
+        severity: Severidat
+        sign_in_token_attempt: Codigo de seguranza
+        title: Titol
+        type: Importar tipo
+        username: Nombre d'usuario
+        username_or_email: Usuario u Email
+        whole_word: Tota la parola
+      email_domain_block:
+        with_dns_records: Incluye los rechistros MX y las IP d'o dominio
+      featured_tag:
+        name: Etiqueta
+      filters:
+        actions:
+          hide: Amagar completament
+          warn: Amagar con una alvertencia
+      form_admin_settings:
+        backups_retention_period: Periodo de retención d'o fichero d'usuario
+        bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
+        closed_registrations_message: Mensache personalizau quan los rechistros no son disponibles
+        content_cache_retention_period: Periodo de retención de caché de conteniu
+        custom_css: CSS personalizau
+        mascot: Mascota personalizada (legado)
+        media_cache_retention_period: Periodo de retención de caché multimedia
+        profile_directory: Habilitar directorio de perfils
+        registrations_mode: Quí puede rechistrar-se
+        require_invite_text: Requerir una razón pa unir-se
+        show_domain_blocks: Amostrar dominios blocaus
+        show_domain_blocks_rationale: Amostrar per qué se blocoron los dominios
+        site_contact_email: Adreza de correu electronico de contacto
+        site_contact_username: Nombre d'usuario de contacto
+        site_extended_description: Descripción extendida
+        site_short_description: Descripción d'o servidor
+        site_terms: Politica de Privacidat
+        site_title: Nombre d'o servidor
+        theme: Tema per defecto
+        thumbnail: Miniatura d'o servidor
+        timeline_preview: Permitir l'acceso no autenticau a las linias de tiempo publicas
+        trendable_by_default: Permitir tendencias sin revisión previa
+        trends: Habilitar tendencias
+      interactions:
+        must_be_follower: Blocar notificacions de personas que no te siguen
+        must_be_following: Blocar notificacions de personas que no sigues
+        must_be_following_dm: Blocar mensaches directos d'a chent que no sigues
+      invite:
+        comment: Comentar
+      invite_request:
+        text: Per qué quiere unir-se vusté?
+      ip_block:
+        comment: Comentario
+        ip: IP
+        severities:
+          no_access: Blocar acceso
+          sign_up_block: Blocar rechistros
+          sign_up_requires_approval: Limitar rechistros
+        severity: Regla
+      notification_emails:
+        appeal: Belún ha apelado una decisión de moderación
+        digest: Ninviar resumen de correus electronicos
+        favourite: Ninviar correu electronico quan belún d'a2 favorito en a suya publicación
+        follow: Ninviar correu electronico quan belún te siga
+        follow_request: Ninviar correu electronico quan belún solicita seguir-te
+        mention: Ninviar correu electronico quan belún te mencione
+        pending_account: Ninviar correu electronico quan una nueva cuenta ameneste revisión
+        reblog: Ninviar correu electronico quan belún comparta la suya publicación
+        report: Nuevo informe ninviau
+        trending_tag: Una nueva tendencia requiere revisión
+      rule:
+        text: Norma
+      tag:
+        listable: Permitir que esta etiqueta amaneixca en as busquedas y en o directorio d'o perfil
+        name: Etiqueta
+        trendable: Permitir que esta etiqueta amaneixca baixo tendencias
+        usable: Permitir a las publicacions usar esta etiqueta
+      user:
+        role: Rol
+      user_role:
+        color: Color d'insignia
+        highlighted: Amostrar rol como insignia en perfils d'usuario
+        name: Nombre
+        permissions_as_keys: Permisos
+        position: Prioridat
+      webhook:
+        events: Eventos habilitaus
+        url: URL de Endpoint
+    'no': 'No'
+    not_recommended: No recomendau
+    recommended: Recomendau
+    required:
+      mark: "*"
+      text: necesario
+    title:
+      sessions:
+        webauthn: Utilice una d'as suyas claus de seguranza pa iniciar sesión
+    'yes': Ell
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 96620ed6c..41b659fac 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -10,7 +10,7 @@ ar:
         text: بإمكانك استخدام نفس القواعد التي نجدها في التبويقات كعناوين الروابط والوسوم والإشارات
         title: اختياري. غير مرئي للمُستَلِم
       admin_account_action:
-        include_statuses: سيرى المستخدم أي مِن التبويقات تسببت في إجراء الإشراف أو التحذير
+        include_statuses: سيرى المستخدم أي المنشورات تسببت في إجراء الإشراف أو التحذير
         send_email_notification: سوف يتلقى المستخدم رسالة تُفسِّر ما حدث على حسابه
         text_html: اختياري، يمكنك استخدام بناء التبويق. يمكنك <a href="%{path}">إضافة إعدادات تحذير مسبقة</a> لتوفير الوقت
         type_html: اختر ما تود إجراؤه على <strong>%{acct}</strong>
@@ -27,6 +27,8 @@ ar:
         scheduled_at: اتركه فارغا لنشر الإعلان في الحين
         starts_at: اختياري. في حالة ما كان إعلانك ذو صلة بنطاق زمني مخصّص
         text: يمكنك استخدام نسق التبويق. يجب الأخذ في الحسبان المساحة التي سيُغطّيها الإعلان على شاشة المستخدم
+      appeal:
+        text: يمكنك الطعن في عقوبة مرة واحدة فقط
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
         avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
@@ -35,26 +37,26 @@ ar:
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
-        discoverable: سِجل الملفات التعريفية للمستخدمين هو طريقة أخرى لبلوغ جمهور أوسع
-        discoverable_no_directory: السماح باكتشاف حسابك من قبل الغرباء من خلال التوصيات والميزات الأخرى
+        discoverable: السماح للغرباء اكتشاف حسابك من خلال التوصيات والمتداولة وغيرها من الميزات
         email: سوف تتلقى رسالة إلكترونية للتأكيد
         fields: يُمكنك عرض 4 عناصر على شكل جدول في صفحتك التعريفية
         header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
         inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
-        irreversible: التبويقات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
+        irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
         locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
         locked: يتطلب منك الموافقة يدويا على طلبات المتابعة
         password: يُنصح باستخدام 8 أحرف على الأقل
         phrase: سوف يتم العثور عليه مهما كان نوع النص أو حتى و إن كان داخل الويب فيه تحذير عن المحتوى
         scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الاستغناء عن الخَيار اليدوي.
-        setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لتبويقات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها)
+        setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لمنشورات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها)
+        setting_always_send_emails: عادة لن ترسل الإشعارات إلى بريدك الإلكتروني عندما تكون نشط على ماستدون
         setting_default_sensitive: تُخفى الوسائط الحساسة تلقائيا ويمكن اظهارها عن طريق النقر عليها
         setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة
         setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا
         setting_display_media_show_all: دائمًا عرض الوسائط المُعيَّنة كحساسة
         setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك التعريفية
         setting_noindex: ذلك يؤثر على صفحتك التعريفية وصفحات المنشورات
-        setting_show_application: يتم عرض اسم التطبيق الذي تستخدمه عند التبويق في العرض المفصّل لتبوبيقاتك
+        setting_show_application: سيُعرَض اسم التطبيق الذي تستخدمه عند النشر في العرض المفصّل لمنشوراتك
         setting_use_blurhash: الألوان التدرّجية مبنية على ألوان المرئيات المخفية ولكنها تحجب كافة التفاصيل
         setting_use_pending_items: إخفاء تحديثات الخط وراء نقرة بدلًا مِن التمرير التلقائي للتدفق
         username: اسم المستخدم الخاص بك سوف يكون فريدا مِن نوعه على %{domain}
@@ -62,14 +64,40 @@ ar:
       domain_allow:
         domain: سيكون بإمكان هذا النطاق جلب البيانات من هذا الخادم ومعالجة وتخزين البيانات الواردة منه
       email_domain_block:
-        domain: يمكن لهذا أن يكون اسم النطاق الذي يظهر في عنوان البريد الإلكتروني، سجل MX الذي يُقرر هذا النطاق إليه، أو IP الخادم الذي يقرره سجل MX. وسيتم التحقق من ذلك عند تسجيل المستخدم وسيتم رفض التسجيل.
+        domain: يمكن أن يكون هذا اسم المجال الذي يظهر في عنوان البريد الإلكتروني أو سجل MX الذي يستخدمه. سيتم التحقق منه عند التسجيل.
         with_dns_records: سوف تُبذل محاولة لحل سجلات DNS الخاصة بالنطاق المعني، كما ستُمنع النتائج
       featured_tag:
-        name: 'رُبَّما تريد·ين استخدام واحد مِن بين هذه:'
+        name: 'فيما يلي بعض الوسوم التي استخدمتها مؤخراً:'
+      filters:
+        action: اختر الإجراء الذي سينفذ عند تطابق المشاركة فلتر التصفية
+        actions:
+          hide: إخفاء المحتويات التي تم تصفيتها، والتصرف كما لو أنها غير موجودة
+          warn: إخفاء المحتوى الذي تم تصفيته خلف تحذير يذكر عنوان الفلتر
+      form_admin_settings:
+        backups_retention_period: الاحتفاظ بأرشيف المستخدم الذي تم إنشاؤه لعدد محدد من الأيام.
+        bootstrap_timeline_accounts: سيتم تثبيت هذه الحسابات على قمة التوصيات للمستخدمين الجدد.
+        closed_registrations_message: ما سيعرض عند إغلاق التسجيلات
+        content_cache_retention_period: سيتم حذف المشاركات من الخوادم الأخرى بعد عدد الأيام المحدد عند تعيينها إلى قيمة موجبة. قد يكون هذا لا رجعة فيه.
+        custom_css: يمكنك تطبيق أساليب مخصصة على نسخة الويب من ماستدون.
+        mascot: تجاوز الرسوم التوضيحية في واجهة الويب المتقدمة.
+        media_cache_retention_period: سيتم حذف ملفات الوسائط التي تم تنزيلها بعد عدد الأيام المحدد عند تعيينها إلى قيمة موجبة، وإعادة تنزيلها عند الطلب.
+        profile_directory: دليل الملف الشخصي يسرد جميع المستخدمين الذين اختاروا الدخول ليكونوا قابلين للاكتشاف.
+        require_invite_text: عندما تتطلب التسجيلات الموافقة اليدوية، اجعل إدخال النص "لماذا تريد الانضمام ؟" إلزاميا بدلا من اختياري
+        site_contact_email: كيف يمكن للأشخاص أن يصلوا إليك للحصول على استفسارات قانونية أو استفسارات دعم.
+        site_contact_username: كيف يمكن للناس أن يصلوا إليك في ماستدون.
+        site_extended_description: أي معلومات إضافية قد تكون مفيدة للزوار والمستخدمين. يمكن تنظيمها مع بناء بنية Markdown.
+        site_short_description: وصف قصير للمساعدة في التعرف على الخادم الخاص بك. من يقوم بتشغيله، ولمن ؟
+        site_terms: استخدم سياسة الخصوصية الخاصة بك أو اتركها فارغة لاستخدام الافتراضي. يمكن هيكلتها مع بناء الجملة المصغرة مارك داون.
+        site_title: كيف يمكن للناس الرجوع إلى الخادم الخاص بك إلى جانب اسم النطاق.
+        theme: الشكل الذي يشاهده الزوار الجدد و الغير مسجلين الدخول.
+        thumbnail: عرض حوالي 2:1 صورة إلى جانب معلومات الخادم الخاص بك.
+        timeline_preview: الزوار الذين سجلوا خروجهم سيكونون قادرين على تصفح أحدث المشاركات العامة المتاحة على الخادم.
+        trendable_by_default: تخطي مراجعة المحتوى التريند اليدوي. لا يزال من الممكن الإزالة اللاحقة للعناصر الفردية من التريندات.
+        trends: تظهر التريندز أي المشاركات وعلامات وقصص الأخبار التي تجذب الانتباه على الخادم الخاص بك.
       form_challenge:
         current_password: إنك بصدد الدخول إلى منطقة آمنة
       imports:
-        data: ملف CSV تم تصديره مِن خادوم ماستدون آخر
+        data: ملف CSV تم تصديره مِن خادم ماستدون آخر
       invite_request:
         text: هذا سوف يساعدنا في مراجعة تطبيقك
       ip_block:
@@ -78,6 +106,7 @@ ar:
         ip: أدخل عنوان IPv4 أو IPv6. يمكنك حظر نطاقات كاملة باستخدام بناء الـCIDR. كن حذراً على أن لا تَحظر نفسك!
         severities:
           no_access: حظر الوصول إلى جميع المصادر
+          sign_up_block: لا يمكن إنشاء حسابات جديدة
           sign_up_requires_approval: التسجيلات الجديدة سوف تتطلب موافقتك
         severity: اختر ما سيحدث مع الطلبات من هذا الـIP
       rule:
@@ -88,7 +117,14 @@ ar:
       tag:
         name: يمكنك فقط تغيير غلاف الحروف ، على سبيل المثال ، لجعلها أكثر قابلية للقراءة
       user:
-        chosen_languages: لن تظهر على الخيوط العمومية إلّا التبويقات المنشورة في اللغات المختارة
+        chosen_languages: إن تم اختيارها، فلن تظهر على الخيوط العامة إلّا الرسائل المنشورة في تلك اللغات
+        role: الوظيفة تتحكم في الصلاحيات التي يملكها المستخدم
+      user_role:
+        color: اللون الذي سيتم استخدامه للوظيفه في جميع وحدات واجهة المستخدم، كـ RGB بتنسيق hex
+        highlighted: وهذا يجعل الوظيفه مرئيا علنا
+        name: الاسم العام للوظيفه، إذا تم تعيين الوظيفه ليتم عرضه كشارة
+        permissions_as_keys: سيكون للمستخدمين الذين لديهم هذه الوظيفة حق الصلاحيه إلى...
+        position: وتقرر الوظيفة الأعلى تسوية النزاعات في حالات معينة، ولا يمكن القيام ببعض الإجراءات إلا على أساس الوظائف ذات الأولوية الأقل
     labels:
       account:
         fields:
@@ -102,7 +138,7 @@ ar:
         text: نموذج نصي
         title: العنوان
       admin_account_action:
-        include_statuses: أدرج التبويقات التي تم الإبلاغ عنها ضمن الرسالة الإلكترونية
+        include_statuses: أدرج المنشورات التي تم الإبلاغ عنها ضمن الرسالة الإلكترونية
         send_email_notification: إشعار المستخدِم عبر البريد الإلكتروني
         text: تحذير مخصص
         type: الإجراء
@@ -119,6 +155,8 @@ ar:
         scheduled_at: جَدوِل المنشور
         starts_at: بداية الفعالية
         text: إعلان
+      appeal:
+        text: اشرح لماذا يجب إلغاء هذا القرار
       defaults:
         autofollow: إرسال دعوة لمتابعة حسابك
         avatar: الصورة الرمزية
@@ -148,23 +186,24 @@ ar:
         phrase: كلمة مفتاح أو عبارة
         setting_advanced_layout: تمكين واجهة الويب المتقدمة
         setting_aggregate_reblogs: جمع الترقيات في خيوط زمنية
+        setting_always_send_emails: ارسل إشعارات البريد الإلكتروني دائماً
         setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
-        setting_boost_modal: إظهار مربع حوار للتأكيد قبل ترقية أي تبويق
-        setting_crop_images: قص الصور في التبويقات غير الموسعة إلى 16x9
+        setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة مشاركة أي منشور
+        setting_crop_images: قص الصور في المنشورات غير الموسعة إلى 16x9
         setting_default_language: لغة النشر
         setting_default_privacy: خصوصية المنشور
         setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
-        setting_delete_modal: إظهار مربع حوار للتأكيد قبل حذف أي تبويق
+        setting_delete_modal: إظهار مربع حوار التأكيد قبل حذف أي منشور
         setting_disable_swiping: تعطيل حركات التمرير
         setting_display_media: عرض الوسائط
         setting_display_media_default: افتراضي
         setting_display_media_hide_all: إخفاء الكل
         setting_display_media_show_all: عرض الكل
-        setting_expand_spoilers: توسيع التبويقات التي تحتوي على تحذيرات عن المحتوى تلقائيا
+        setting_expand_spoilers: توسيع المنشورات التي تحتوي على تحذيرات عن المحتوى دائما
         setting_hide_network: إخفِ شبكتك
         setting_noindex: الطلب مِن محركات البحث بعدم فهرسة معلوماتك وصفحتك التعريفية الشخصية
         setting_reduce_motion: تخفيض عدد الصور في الوسائط المتحركة
-        setting_show_application: اكشف اسم التطبيقات المستخدمة لنشر التبويقات
+        setting_show_application: اكشف اسم التطبيق المستخدَم لإرسال المنشورات
         setting_system_font_ui: استخدم الخطوط الافتراضية للنظام
         setting_theme: سمة الموقع
         setting_trends: اعرض ما يُتداوَل اليوم
@@ -173,6 +212,7 @@ ar:
         setting_use_pending_items: الوضع البطيء
         severity: القوّة
         sign_in_token_attempt: رمز الأمان
+        title: العنوان
         type: صيغة الاستيراد
         username: اسم المستخدم
         username_or_email: اسم المستخدم أو كلمة السر
@@ -181,9 +221,33 @@ ar:
         with_dns_records: تضمين سجلات MX و عناوين IP للنطاق
       featured_tag:
         name: الوسم
+      filters:
+        actions:
+          hide: إخفاء بالكامل
+          warn: إخفاء بتحذير
+      form_admin_settings:
+        backups_retention_period: فترة الاحتفاظ بأرشيف المستخدم
+        custom_css: سي أس أس CSS مخصص
+        media_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
+        profile_directory: تفعيل دليل الصفحات التعريفية
+        registrations_mode: من يمكنه التسجيل
+        require_invite_text: يتطلب سببا للانضمام
+        show_domain_blocks: إظهار النطاقات المحظورة
+        show_domain_blocks_rationale: أظهِر لماذا تم حظر النطاقات
+        site_contact_email: للاتصال بالبريد الإلكتروني
+        site_contact_username: اسم مستخدم جهة الاتصال
+        site_extended_description: الوصف الموسع
+        site_short_description: وصف الخادم
+        site_terms: سياسة الخصوصية
+        site_title: اسم الخادم
+        theme: الحُلَّة الإفتراضية
+        thumbnail: الصورة المصغرة للخادم
+        timeline_preview: السماح بالوصول غير الموثق إلى الخيوط الزمنية العامة
+        trendable_by_default: السماح للوسوم بالظهور على المتداوَلة دون مراجعة مسبقة
+        trends: تمكين المتداوَلة
       interactions:
-        must_be_follower: حظر الإخطارات القادمة من حسابات لا تتبعك
-        must_be_following: حظر الإخطارات القادمة من الحسابات التي لا تتابعها
+        must_be_follower: حظر الإشعارات القادمة من حسابات لا تتبعك
+        must_be_following: حظر الإشعارات القادمة من الحسابات التي لا تتابعها
         must_be_following_dm: حظر الرسائل المباشرة القادمة من طرف أشخاص لا تتبعهم
       invite:
         comment: التعليق
@@ -194,9 +258,11 @@ ar:
         ip: عنوان IP
         severities:
           no_access: حظر الوصول
+          sign_up_block: حظر التسجيلات
           sign_up_requires_approval: حد التسجيلات
         severity: قانون
       notification_emails:
+        appeal: شخص ما طعن في قرار لأحد المنسقين
         digest: إرسال ملخصات عبر البريد الإلكتروني
         favourite: ابعث بريداً إلكترونيًا عندما يُعجَب أحدهم بمنشورك
         follow: ابعث بريداً إلكترونيًا عندما يتبعك أحد
@@ -204,16 +270,27 @@ ar:
         mention: ابعث بريداً إلكترونيًا عندما يُشير إليك أو يذكُرك أحدهم
         pending_account: ابعث رسالة إلكترونية إن كان هناك حساب جديد بحاجة إلى مراجعة
         reblog: ابعث بريداً إلكترونيًا عندما يقوم أحدهم بترقية منشورك
-        report: إرسال رسالة إلكترونية عند تلقّي إبلاغ جديد
-        trending_tag: ابعث رسالة إلكترونية إن كان هناك وسم متداوَل بحاجة إلى مراجعة
+        report: هناك إبلاغ جديد تم إرساله
+        trending_tag: المتداولة الجديدة تتطلّب مراجعة
       rule:
         text: قانون
       tag:
         listable: اسمح لهذا الوسم بالظهور في البحث وفي دليل الصفحات التعريفية
         name: الوسم
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
-        usable: اسمح للتبويقات باستخدام هذا الوسم
+        usable: اسمح للمنشورات استخدام هذا الوسم
+      user:
+        role: الدور
+      user_role:
+        color: لون الشارة
+        highlighted: عرض الدور كشارة على الملفات الشخصية للمستخدمين
+        name: التسمية
+        permissions_as_keys: الصلاحيات
+        position: الأولوية
+      webhook:
+        url: الرابط التشعبّي URL لنقطة النهاية
     'no': لا
+    not_recommended: غير مستحسن
     recommended: موصى بها
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 332f55079..6a0dc22c4 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -2,27 +2,52 @@
 ast:
   simple_form:
     hints:
+      admin_account_action:
+        text_html: Opcional. Pues usar la sintaxis de los artículos ya amestar <a href="%{path}">amestar preconfiguraes</a> p'aforrar tiempu
+      announcement:
+        all_day: Al marcar la opción, namás apaecen les dates del intervalu de tiempu
+        ends_at: Opcional. L'anunciu dexa de tar espublizáu na data qu'indiques
+        starts_at: Opcional. En casu de que l'anunciu tea arreyáu a un intervalu de tiempu específicu
+        text: Pues usar la sintaxis de los artículos. Ten en cuenta l'espaciu que l'anunciu va ocupar na pantalla del usuariu/a
       defaults:
-        autofollow: La xente que se rexistre pente la invitación va siguite automáticamente
-        bot: Esta cuenta fai principalmente aiciones automatizaes y podría nun supervisase
-        digest: Namái s'unvia dempués d'un periodu llargu d'inactividá y namái si recibiesti cualesquier mensaxe personal na to ausencia
-        discoverable: El direutoru de perfiles ye otru mou de facer qu'una cuenta llegué a una audiencia más amplia
-        email: Vamos unviate un corréu de confirmación
-        irreversible: Los barritos peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués
-        password: Usa 8 caráuteres polo menos
-        setting_hide_network: La xente que sigas y teas siguiendo nun va amosase nel perfil
-        setting_show_application: L'aplicación qu'uses pa barritar va amosase na vista detallada d'ellos
-        username: El nome d'usuariu va ser únicu en %{domain}
+        autofollow: Les persones que se rexistren pente la invitación van siguite automáticamente
+        avatar: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
+        bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
+        digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
+        discoverable: Permite que persones desconocíes descubran la to cuenta pente recomendaciones, tendencies ya otres funciones
+        fields: Pues tener hasta 4 elementos qu'apaecen nuna tabla dientro del to perfil
+        header: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
+        irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
+        locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
+        locked: Controla manualmente quién pue siguite pente l'aprobación de les solicitúes de siguimientu
+        setting_display_media_default: Anubrilu cuando se marque como sensible
+        setting_display_media_hide_all: Anubrilu siempres
+        setting_display_media_show_all: Amosalu siempres
+        setting_hide_network: Les persones que sigas ya les que te sigan nun van apaecer nel to perfil
+        setting_show_application: L'aplicación qu'uses pa espublizar apaez na vista detallada de los tos artículos
+        username: 'El nome d''usuariu va ser únicu en: %{domain}'
       featured_tag:
-        name: 'Quiciabes quieras usar unu d''estos:'
+        name: 'Equí tán dalgunes de les etiquetes qu''usesti apocayá:'
+      form_admin_settings:
+        backups_retention_period: Caltién los archivos xeneraos polos perfiles demientres el númberu de díes especificáu.
+        closed_registrations_message: Apaez cuando'l rexistru ta desactiváu
+        content_cache_retention_period: Los artículos d'otros sirvidores desaníciense dempués del numberu de díes especificáu al configurar un valor positivu. Ye posible qu'esta opción seya irreversible.
+        custom_css: Pues aplicar estilos personalizaos a la versión web de Mastodon.
+        mascot: Anula la ilustración na interfaz web avanzada.
+        media_cache_retention_period: Los ficheros multimedia baxaos desaníciense dempués del númberu de díes especificáu al configurar un valor positivu, ya vuelven baxase baxo demanda.
+        require_invite_text: Cuando los rexistros riquen una aprobación manual, el campu «¿Por qué quies xunite?» vuélvese obligatoriu
+        site_extended_description: Cualesquier tipu d'información adicional que pueda ser útil pa visitantes ya pa perfiles rexistraos. El testu pue estructurase cola sintaxis de Mastodon.
+        site_short_description: Un descripción curtia qu'ayuda a identificar de forma única al sirvidor. ¿Quién lu lleva?, ¿pa quién ye?
+        theme: L'estilu que los visitantes ya los perfiles nuevos usen.
       form_challenge:
-        current_password: Tas entrando nuna área segura
+        current_password: Tas entrando a una área segura
       imports:
-        data: El ficheru CSV esportáu dende otra instancia de Mastodon
+        data: El ficheru CSV que s'esportó d'otru sirvidor de Mastodon
       invite_request:
-        text: Esto va ayudanos a revisar la to aplicación
-      sessions:
-        otp: 'Introduz el códigu de dos pasos xeneráu pola aplicación autenticadora o usa unu de los códigos de recuperación:'
+        text: Esto va ayudanos a revisar la to solicitú
+      ip_block:
+        comment: Opcional. Un recordatoriu de por qué amestesti esta regla.
+        expires_in: Les direiciones IP son un recursu finitu, suelen compartise ya cambiar de manes. Por esti motivu, nun s'aconseyen los bloqueos indefiníos de direiciones IP.
     labels:
       account:
         fields:
@@ -31,69 +56,104 @@ ast:
       account_warning_preset:
         title: Títulu
       admin_account_action:
+        include_statuses: Incluyir nel mensaxe los artículos de los que s'informó
+        send_email_notification: Avisar al perfil per corréu electrónicu
         type: Aición
         types:
-          none: Nun facer nada
+          suspend: Suspender
       announcement:
+        all_day: Eventu de tol día
+        ends_at: Fin del eventu
+        scheduled_at: Anunciu programáu
+        starts_at: Comienzu del eventu
         text: Anunciu
       defaults:
+        avatar: Avatar
         bot: Esta cuenta ye d'un robó
         chosen_languages: Peñera de llingües
         confirm_new_password: Confirmación de la contraseña nueva
         confirm_password: Confirmación de la contraseña
         current_password: Contraseña actual
         data: Datos
-        discoverable: Llistar esta cuenta nel direutoriu
-        display_name: Nome a amosar
-        email: Direición de corréu
+        discoverable: Suxerir esta cuenta a otres persones
+        display_name: Nome visible
+        email: Direición de corréu electrónicu
         expires_in: Caduca dempués de
         fields: Metadatos del perfil
         header: Testera
         irreversible: Escartar en cuentes d'anubrir
         locale: Llingua de la interfaz
-        locked: Bloquiar la cuenta
+        locked: Riquir solicitúes de siguimientu
         max_uses: Númberu máximu d'usos
         new_password: Contraseña nueva
         note: Biografía
-        otp_attempt: Códigu de la verificación en dos pasos
+        otp_attempt: Códigu de l'autenticación en dos pasos
         password: Contraseña
         phrase: Pallabra clave o fras
         setting_advanced_layout: Activar la interfaz web avanzada
-        setting_auto_play_gif: Reproducir GIFs automáticamente
-        setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir un barritu
-        setting_default_language: Llingua de los espublizamientos
-        setting_default_privacy: Privacidá de los espublizamientos
-        setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar un barritu
-        setting_noindex: Nun apaecer nos índices de los motores de gueta
-        setting_show_application: Dicir les aplicaciones que s'usen pa barritar
+        setting_aggregate_reblogs: Agrupar los artículos compartíos nes llinies de tiempu
+        setting_auto_play_gif: Reproducir automáticamente los GIFs
+        setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir un artículu
+        setting_default_language: Llingua de los artículos
+        setting_default_privacy: Privacidá de los artículos
+        setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar un artículu
+        setting_display_media: Conteníu multimedia
+        setting_reduce_motion: Amenorgar el movimientu de les animaciones
+        setting_show_application: Dicir les aplicaciones que s'usen pa unviar artículos
         setting_system_font_ui: Usar la fonte predeterminada del sistema
         setting_theme: Estilu del sitiu
         setting_trends: Amosar les tendencies de güei
         setting_unfollow_modal: Amosar el diálogu de confirmación enantes de dexar de siguir a daquién
         setting_use_pending_items: Mou lentu
-        severity: Severidá
-        type: Triba de la importación
+        severity: Gravedá
+        sign_in_token_attempt: Códigu de seguranza
+        title: Títulu
+        type: Tipu de la importación
         username: Nome d'usuariu
-        username_or_email: Nome d'usuariu o corréu
+        username_or_email: Nome d'usuariu o direición de corréu electrónicu
         whole_word: La pallabra entera
       featured_tag:
         name: Etiqueta
+      form_admin_settings:
+        backups_retention_period: Periodu de retención de los archivos de los perfiles
+        closed_registrations_message: Mensaxe personalizáu cuando'l rexistru nun ta disponible
+        content_cache_retention_period: Periodu de retención de la caché de conteníu
+        media_cache_retention_period: Periodu de retención de la caché multimedia
+        registrations_mode: Quién pue rexistrase
+        require_invite_text: Riquir un motivu pa rexistrase
+        show_domain_blocks_rationale: Amosar por qué se bloquiaron los dominios
+        site_extended_description: Descripción estendida
+        site_short_description: Descripción del sirvidor
+        site_terms: Política de privacidá
+        site_title: Nome del sirvidor
+        theme: Estilu predetermináu
+        thumbnail: Miniatura del sirvidor
       interactions:
-        must_be_follower: Bloquiar los avisos de persones que nun son siguidores
-        must_be_following: Bloquiar los avisos de persones que nun sigues
-        must_be_following_dm: Bloquiar los mensaxes direutos de persones que nun sigues
+        must_be_follower: Bloquiar los avisos de los perfiles que nun te siguen
+        must_be_following: Bloquiar los avisos de los perfiles que nun sigues
+        must_be_following_dm: Bloquiar los mensaxes direutos de los perfiles que nun sigues
       invite_request:
         text: "¿Por qué quies xunite?"
+      ip_block:
+        ip: IP
       notification_emails:
-        favourite: Daquién marcó como favoritu un estáu de to
+        favourite: Daquién marcó como favoritu'l to artículu
         follow: Daquién te sigue
         follow_request: Daquién solicitó siguite
         mention: Daquién te mentó
-        reblog: Daquién compartió dalgún estáu de to
+        pending_account: Una cuenta nueva precisa una revisión
+        reblog: Daquién compartió'l to artículu
+        report: Unvióse un informe nuevu
+        trending_tag: Una tendencia rique una revisión
       tag:
         name: Etiqueta
+      user:
+        role: Rol
+      user_role:
+        name: Nome
+        permissions_as_keys: Permisos
+        position: Prioridá
     'no': Non
-    recommended: Aconséyase
     required:
-      text: ríquese
+      mark: "*"
     'yes': Sí
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
new file mode 100644
index 000000000..54651ca66
--- /dev/null
+++ b/config/locales/simple_form.be.yml
@@ -0,0 +1,309 @@
+---
+be:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Прызначце карыстальнік@дамен уліковага запісу з якога вы хочаце пераехаць
+      account_migration:
+        acct: Прызначце карыстальнік@дамен уліковага запісу на які вы хочаце пераехаць
+      account_warning_preset:
+        text: Вы можаце выкарыстоўваць сінтаксіс паведамленняў, такі як URL, хэштэгі ці згадкі
+        title: Неабавязкова. Не паказваецца атрымальніку
+      admin_account_action:
+        include_statuses: Карыстальнік пабачыць, якія допісы ёсць прычынай мадэрацыі ці папярэджання
+        send_email_notification: Карыстальнік атрымае тлумачэнне аб тым, што здарылася з яго ўліковым запісам
+        text_html: Неабавязкова. Вы можаце выкарыстоўваць сінтаксіс допісаў. <a href="%{path}">Дадайце шаблоны папярэджанняў</a>, якія будуць эканоміць час
+        type_html: Выберы што рабіць з <strong>%{acct}</strong>
+        types:
+          disable: Перадухіліць выкарыстанне акаунтаў, але не выдаляць і не хаваць іх змесціва.
+          none: Выкарыстоўвай гэта для папярэджвання карыстальнікаў але без іншых наступстваў.
+          sensitive: Прымусова адмячаць усе медыя карыстальніка як дэлікатныя.
+          silence: Забараніць карыстальніку пасты з публічнай бачнасцю, схаваць ягоныя допісы і апавяшчэнні ад людзей, якія на яго не падпісаныя.
+          suspend: Забараніць любыя ўзаемадзеянні ад ці з гэтым уліковым запісам і выдаліць ягонае змесціва. Можна адрабіць цягам 30 дзён.
+        warning_preset_id: Неабавязкова. Вы можаце дадаць уласны тэкст напрыканцы шаблону
+      announcement:
+        all_day: Калі пазначана, будуць паказаны толькі даты з пазначанага прамежку часу
+        ends_at: Неабавязкова. Аб'ява будзе аўтаматычна знята ў пэўны час
+        scheduled_at: Пакіньце пустым, каб апублікаваць аб'яву імаверна
+        starts_at: Неабавязкова. На выпадак, калі ваша аб'ява прывязана да пэўнага перыяду часу
+        text: Вы можаце карыстацца сінтаксісам допісаў. Калі ласка, улічвайце месца, якое аб'ява зойме на экране карыстальніка
+      appeal:
+        text: Вы можаце абскардзіць рашэнне толькі адзін раз
+      defaults:
+        autofollow: Людзі, якія зарэгістраваліся праз запрашэнне, аўтаматычна падпішуцца на вас
+        avatar: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        bot: Паведаміць іншым, што гэты ўліковы запіс у асноўным выконвае аўтаматычныя дзеянні і можа не кантралявацца
+        context: Адзін ці некалькі кантэкстаў, да якіх трэба прымяніць фільтр
+        current_password: У мэтах бяспекі, калі ласка, увядзіце пароль бягучага ўліковага запісу
+        current_username: Каб пацвердзіць, увядзіце, калі ласка імя карыстальніка бягучага ўліковага запісу
+        digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
+        discoverable: Дазволіць незнаёмым людзям знаходзіць ваш уліковы запіс праз рэкамендацыі, трэнды і іншыя функцыі
+        email: Пацвярджэнне будзе выслана па электроннай пошце
+        fields: У вашаму профілі можа быць паказана да 4 элементаў у выглядзе табліцы
+        header: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
+        irreversible: Адфільтраваныя пасты прападуць незваротна, нават калі фільтр потым будзе выдалены
+        locale: Мова карыстальніцкага інтэрфейсу, электронных паведамленняў і апавяшчэнняў
+        locked: Уручную кантралюйце, хто можа быць вашым падпісантам, ухваляючы запросы на падпіску
+        password: Не менш за 8 сімвалаў
+        phrase: Параўнанне адбудзецца нягледзячы на рэгістр тэксту і папярэджанні аб змесціве допісу
+        scopes: Якімі API праграм будзе дазволена карыстацца. Калі вы абярэце найвышэйшы ўзровень, не трэба абіраць асобныя.
+        setting_aggregate_reblogs: Не паказваць новыя пашырэнні для допісаў, якія нядаўна пашырылі(уплывае выключна на будучыя пашырэнні)
+        setting_always_send_emails: Звычайна лісты з апавяшчэннямі не будуць дасылацца, калі вы актыўна карыстаецеся Mastodon
+        setting_default_sensitive: Далікатныя медыя прадвызначана схаваныя. Іх можна адкрыць адзіным клікам
+        setting_display_media_default: Хаваць медыя пазначаныя як далікатныя
+        setting_display_media_hide_all: Заўсёды хаваць медыя
+        setting_display_media_show_all: Заўсёды паказваць медыя
+        setting_hide_network: Вашы падпіскі і вашы падпісчыкі будуць нябачны ў вашым профілі
+        setting_noindex: Уплывае на бачнасць старонкі вашага профілю і вашых допісаў
+        setting_show_application: Праграма, праз якую вы ствараеце допісы, будзе паказвацца ў падрабязнасцях пра допісы
+        setting_use_blurhash: Градыенты заснаваны на колерах схаваных выяў, але размываюць дэталі
+        setting_use_pending_items: Схаваць абнаўленні стужкі за клікам замест аўтаматычнага пракручвання стужкі
+        username: Ваша імя карыстальніка будзе ўнікальным на %{domain}
+        whole_word: Калі ключавое слова ці фраза складаецца толькі з літар і лічбаў, яно будзе ўжытае толькі калі супадае з усім словам
+      domain_allow:
+        domain: Гэты дамен зможа атрымліваць даныя з гэтага сервера. Даныя з гэтага дамену будуць апрацаваныя ды захаваныя
+      email_domain_block:
+        domain: Гэта можа быць імя дамена, якое паказваецца ў электронным адрасе ці ў MX запісе, якім ён карыстаецца. Іх правераць пры рэгістрацыі.
+        with_dns_records: Будзе здзейснена спроба развязаць DNS запісы дадзенага дамену. Вынікі таксама будуць заблакіраваны
+      featured_tag:
+        name: 'Вось некаторыя з хэштэгаў, якімі вы нядаўна карысталіся:'
+      filters:
+        action: Абярыце, што зрабіць, калі пост падпадае пад умовы фільтру
+        actions:
+          hide: Поўнасцю схаваць адфільтраванае змесціва, дзейнічаць, нібы яго не існуе
+          warn: Схаваць адфільтраваны кантэнт за папярэджаннем з назвай фільтру
+      form_admin_settings:
+        backups_retention_period: Захоўваць створаныя архівы карыстальніка адзначаную колькасць дзён.
+        bootstrap_timeline_accounts: Гэтыя ўліковыя запісы будуць замацаваны ў топе рэкамендацый для новых карыстальнікаў.
+        closed_registrations_message: Паказваецца, калі рэгістрацыя закрытая
+        content_cache_retention_period: Допісы з іншых сервераў будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік. Гэта можа быць незваротным.
+        custom_css: Вы можаце прымяняць карыстальніцкія стылі ў вэб-версіі Mastodon.
+        mascot: Замяняе ілюстрацыю ў пашыраным вэб-інтэрфейсе.
+        media_cache_retention_period: Спампаваныя медыя будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік, і спампоўвацца нанова па запыце.
+        profile_directory: Дырэкторыя профіляў змяшчае спіс усіх карыстальнікаў, якія вырашылі быць бачнымі.
+        require_invite_text: Калі рэгістрацыя патрабуе ручнога пацвержання, зрабіце поле "Чаму вы хочаце далучыцца?" абавязковым
+        site_contact_email: Як людзі могуць звязацца з вамі па юрыдычных запытах або пытаннях падтрымкі.
+        site_contact_username: Як людзі могуць звязацца з вамі на Mastodon.
+        site_extended_description: Любая дадатковая інфармацыя, якая можа быць карыснай наведвальнікам ды вашым карыстальнікам. Можна карыстацца сінтаксісам Markdown каб структураваць тэкст.
+        site_short_description: Кароткае апісанне, каб дапамагчы адназначна ідэнтыфікаваць ваш сервер. Хто яго падтрымлівае, для каго ён?
+        site_terms: Апішыце ўласную палітыку прыватнасці альбо пакіньце поле пустым, калі хочаце скарыстацца прадвызначанай. Можна карыстацца сінтаксісам Markdown каб структураваць тэкст.
+        site_title: Як людзі могуць звяртацца да вашага серверу акрамя яго даменнага імя.
+        theme: Тэма, што бачаць новыя карыстальнікі ды наведвальнікі, якія выйшлі.
+        thumbnail: Выява памерамі прыкладна 2:1, якая паказваецца побач з інфармацыяй пра ваш сервер.
+        timeline_preview: Наведвальнікі, якія выйшлі, змогуць праглядаць апошнія публічныя допісы на серверы.
+        trendable_by_default: Прапусціць ручны агляд трэндавага змесціва. Асобныя элементы ўсё яшчэ можна будзе выдаліць з трэндаў пастфактум.
+        trends: Трэнды паказваюць, якія допісы, хэштэгі і навіны набываюць папулярнасць на вашым серверы.
+      form_challenge:
+        current_password: Вы ўваходзіце ў бяспечную зону
+      imports:
+        data: Файл CSV экспартаваны з іншага сервера Mastodon
+      invite_request:
+        text: Гэта дапаможа нам разгледзець вашу заяву
+      ip_block:
+        comment: Неабавязкова. Напамін, чаму вы дадалі гэта правіла.
+        expires_in: IP адрасы з'яўляюцца абмежаваным рэсурсам, часам яны падзяляюцца паміж карыстальнікамі і мяняюць уладальніка. Па гэтай прычыне, безтэрміновае блакаванне IP не рэкамендуецца.
+        ip: Увядзіце адрас IPv4 ці IPv6. Вы можаце заблакіраваць цэлыя абсягі з дапамогай CIDR сінтаксісу. Асцярожна! Не заблакіруйце самі сябе!
+        severities:
+          no_access: Заблакіраваць доступ да ўсіх рэсурсаў
+          sign_up_block: Новыя рэгістрацыі будуць немагчымы
+          sign_up_requires_approval: Новыя рэгістрацыі запатрабуюць вашага ўзгаднення
+        severity: Абярыце, што будзе адбывацца з запытамі з гэтага IP
+      rule:
+        text: Апішыце правіла ці патрабаванне для карыстальнікаў на гэтым серверы. Імкніцеся зрабіць яго простым ды кароткім
+      sessions:
+        otp: 'Увядзіце код двухфактарнай аўтэнтыфікацыі з вашага тэлефона або адзін з кодаў аднаўлення:'
+        webauthn: Калі гэта USB прылада, устаўце яе і, калі неабходна, націсніце на яе.
+      tag:
+        name: Вы можаце змяняць толькі рэгістр літар, напрыклад для таго, каб падвысіць чытабельнасць
+      user:
+        chosen_languages: У публічных стужках будуць паказвацца допісы толькі на тых мовах, якія вы пазначыце
+        role: Гэтая роля кантралюе дазволы, якія мае карыстальнік
+      user_role:
+        color: Колер, які будзе выкарыстоўвацца для гэтай ролі па ўсім UI, у фармаце RGB ці hex
+        highlighted: Гэта робіць ролю публічна бачнай
+        name: Публічная назва ролі, калі роля дэманструецца як значок у профілю
+        permissions_as_keys: Карыстальнікі з гэтай роляй будуць мець доступ да...
+        position: Ролі вышэйшага рангу займаюцца вырашэннем канфліктаў у пэўных сітуацыях. Некаторыя дзеянні можна выкананаць толькі над ролямі з ніжэйшым рангам
+      webhook:
+        events: Выберыце падзеі для адпраўкі
+        url: Куды падзеі будуць адпраўляцца
+    labels:
+      account:
+        fields:
+          name: Пазнака
+          value: Змесціва
+      account_alias:
+        acct: Маркер старога ўліковага запісу
+      account_migration:
+        acct: Маркер новага ўліковага запісу
+      account_warning_preset:
+        text: Тэкст шаблону
+        title: Загаловак
+      admin_account_action:
+        include_statuses: Дадаць допісы, на якія вы скардзіцеся, у электронны ліст
+        send_email_notification: Паведаміць карыстальніку па электроннай пошце
+        text: Карыстальніцкае папярэджанне
+        type: Дзеянне
+        types:
+          disable: Замарозіць
+          none: Даслаць папярэджанне
+          sensitive: Далікатны
+          silence: Абмежаваць
+          suspend: Прыпыніць
+        warning_preset_id: Выкарыстаць шаблон папярэджання
+      announcement:
+        all_day: Падзея на ўвесь дзень
+        ends_at: Канец падзеі
+        scheduled_at: Запланаваць публікацыю
+        starts_at: Пачатак падзеі
+        text: Аб'ява
+      appeal:
+        text: Растлумачце, чаму гэтае рашэнне павінна быць адменена
+      defaults:
+        autofollow: Прапануйце падпісацца на ваш акаўнт
+        avatar: Аватар
+        bot: Гэта бот
+        chosen_languages: Фільтр моў
+        confirm_new_password: Пацвердзіць новы пароль
+        confirm_password: Пацвердзіць пароль
+        context: Фільтр кантэкстаў
+        current_password: Бягучы пароль
+        data: Даныя
+        discoverable: Рэкамендаваць уліковы запіс іншым карыстальнікам
+        display_name: Адлюстраванае імя
+        email: Адрас электроннай пошты
+        expires_in: Заканчваецца пасля
+        fields: Метаданыя профілю
+        header: Загаловак
+        honeypot: "%{label} (не запаўняць)"
+        inbox_url: URL паштовай скрыні-рэтранслятара
+        irreversible: Выдаляць, а не хаваць
+        locale: Мова інтэрфейсу
+        locked: Зрабіць уліковы запіс закрытым
+        max_uses: Максімальная колькасць выкарыстанняў
+        new_password: Новы пароль
+        note: Пра сябе
+        otp_attempt: Двухфактарны код
+        password: Пароль
+        phrase: Ключавое слова ці фраза
+        setting_advanced_layout: Уключыць пашыраны вэб-інтэрфейс
+        setting_aggregate_reblogs: Групаваць прасоўванні ў стужках
+        setting_always_send_emails: Заўжды дасылаць для апавяшчэнні эл. пошты
+        setting_auto_play_gif: Аўтапрайграванне анімаваных GIF
+        setting_boost_modal: Паказваць акно пацвярджэння перад пашырэннем
+        setting_crop_images: У неразгорнутых допісах абразаць відарысы да 16:9
+        setting_default_language: Мова допісаў
+        setting_default_privacy: Прыватнасць допісаў
+        setting_default_sensitive: Заўсёды пазначаць кантэнт як далікатны
+        setting_delete_modal: Паказваць акно пацвярджэння перад выдаленнем допісу
+        setting_disable_swiping: Адключыць прагортванні
+        setting_display_media: Адлюстраванне медыя
+        setting_display_media_default: Перадвызначана
+        setting_display_media_hide_all: Схаваць усё
+        setting_display_media_show_all: Паказаць усё
+        setting_expand_spoilers: Заўжды разгортваць допісы з папярэджаннем аб змесціве
+        setting_hide_network: Схаваць вашы сувязі
+        setting_noindex: Адмовіцца ад індэксавання пашуковымі рухавікамі
+        setting_reduce_motion: Памяншэнне руху ў анімацыях
+        setting_show_application: Паказваць праграмы, праз якія дасылаюцца допісы
+        setting_system_font_ui: Выкарыстоўваць прадвызначаны сістэмны шрыфт
+        setting_theme: Тэма сайта
+        setting_trends: Паказваць трэнды дня
+        setting_unfollow_modal: Паказваць акно пацвярджэння перад адпіскай
+        setting_use_blurhash: Паказваць каляровыя градыенты замест схаваных медыя
+        setting_use_pending_items: Павольны рэжым
+        severity: Узровень
+        sign_in_token_attempt: Код бяспекі
+        title: Загаловак
+        type: Тып імпарту
+        username: Імя карыстальніка
+        username_or_email: Імя карыст. або адрас эл. пошты
+        whole_word: Слова цалкам
+      email_domain_block:
+        with_dns_records: Уключыць MX запісы і IP-адрасы дамену
+      featured_tag:
+        name: Хэштэг
+      filters:
+        actions:
+          hide: Схаваць цалкам
+          warn: Схаваць з папярэджаннем
+      form_admin_settings:
+        backups_retention_period: Працягласць захавання архіву карыстальніка
+        bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
+        closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
+        content_cache_retention_period: Працягласць захавання кэшу для змесціва
+        custom_css: CSS карыстальніка
+        mascot: Уласны маскот(спадчына)
+        media_cache_retention_period: Працягласць захавання кэшу для медыя
+        profile_directory: Уключыць каталог профіляў
+        registrations_mode: Хто можа зарэгістравацца
+        require_invite_text: Каб далучыцца, патрэбна прычына
+        show_domain_blocks: Паказаць заблакіраваныя дамены
+        show_domain_blocks_rationale: Паказваць прычыну блакавання даменаў
+        site_contact_email: Электронная пошта для сувязі
+        site_contact_username: Назва рахунку суразмоўцы
+        site_extended_description: Падрабязнае апісанне
+        site_short_description: Апісанне сервера
+        site_terms: Палітыка канфідэнцыйнасці
+        site_title: Назва сервера
+        theme: Тэма па змаўчанні
+        thumbnail: Мініяцюра сервера
+        timeline_preview: Дазволіць неаўтэнтыфікаваны доступ да публічных стужак
+        trendable_by_default: Дазваляць трэнды без папярэдняй праверкі
+        trends: Уключыць трэнды
+      interactions:
+        must_be_follower: Заблакіраваць апавяшчэнні ад непадпісаных людзей
+        must_be_following: Заблакіраваць апавяшчэнні ад людзей на якіх вы не падпісаны
+        must_be_following_dm: Заблакіраваць асабістыя паведамленні ад людзей на якіх вы не падпісаны
+      invite:
+        comment: Каментар
+      invite_request:
+        text: Чаму вы жадаеце далучыцца?
+      ip_block:
+        comment: Каментар
+        ip: IP
+        severities:
+          no_access: Заблакіраваць доступ
+          sign_up_block: Заблакіраваць рэгістрацыі
+          sign_up_requires_approval: Абмежаваць рэгістрацыі
+        severity: Правіла
+      notification_emails:
+        appeal: Нехта падае апеляцыю на рашэнне мадэратара
+        digest: Дасылаць лісты з дайджэстам
+        favourite: Нехта ўпадабаў ваш допіс
+        follow: Нехта падпісаўся на вас
+        follow_request: Нехта даслаў вам запыт на падпіску
+        mention: Нехта згадаў вас
+        pending_account: Новы акаўнт патрабуе разгляду
+        reblog: Нехта пашырыў ваш допіс
+        report: Новая скарга даслана
+        trending_tag: Новы трэнд патрабуе разгляду
+      rule:
+        text: Правіла
+      tag:
+        listable: Дазволіць паказ хэштэгу ў пошуку і ў каталозе профіляў
+        name: Хэштэг
+        trendable: Дазволіць паказ гэтага хэштэга ў трэндах
+        usable: Дазволіць выкарыстанне хэштэгу ў допісах
+      user:
+        role: Роля
+      user_role:
+        color: Колер значка
+        highlighted: Паказваць ролю як значок у профілях
+        name: Назва
+        permissions_as_keys: Дазволы
+        position: Прыярытэт
+      webhook:
+        events: Актыўныя падзеі
+        url: URL-адрас канцавога пункту
+    'no': Не
+    not_recommended: Не рэкамендавана
+    recommended: Рэкамендуем
+    required:
+      mark: "*"
+      text: абавязкова
+    title:
+      sessions:
+        webauthn: Выкарыстайце адзін са сваіх ключоў бяспекі для ўваходу
+    'yes': Так
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 2a23ea057..94cae75d1 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -2,54 +2,308 @@
 bg:
   simple_form:
     hints:
+      account_alias:
+        acct: Посочете потребителско_име@домейн на акаунта си, от който искате да се преместите
+      account_migration:
+        acct: Посочете потребителско_име@домейн на акаунта си, към който се премествате
+      account_warning_preset:
+        text: 'Можете да използвате синтаксиса на публикация: URL адреси, хаштагове и споменавания и пр.'
+        title: По избор. Невидимо за получателя
+      admin_account_action:
+        include_statuses: Потребителят ще може да види кои публикации са довели до действието от страна на модератора или до предупреждението
+        send_email_notification: Потребителят ще получи обяснение какво се е случило с неговия акаунт
+        text_html: По избор. Можете да използвате синтаксисът на публикация. Можете да <a href="%{path}">добавите предварително настроени предупреждения</a>, за да спестите време
+        type_html: Изберете какво да сторите с <strong>%{acct}</strong>
+        types:
+          disable: Забранете на потребител да достъпва акаунта си, без да изтривате или скривате съдържанието на този акаунт.
+          none: Служи за изпращане на предупреждение до потребител, без да се активира друго действие.
+          sensitive: Принудително отбелязване на прикачената от потребителя мултимедия като чувствителна.
+          silence: Забраняване на потребителя да публикува публично, скриване на неговите публикации и известия от други потребители, които не го следват.
+          suspend: Забрана на всякаква интеракция с този акаунт и изтриване на съдържанието му. Обратимо в рамките на 30 дни.
+        warning_preset_id: По избор. Можете да добавите допълнително текст накрая на предварително настроения текст
+      announcement:
+        all_day: Когато е избрана настройката, само датите от времевия диапазон ще бъдат показани
+        ends_at: По избор. В зададеното време обявлението ще бъде автоматично премахнато
+        scheduled_at: Ако се остави празно, обявлението ще се публикува незабавно
+        starts_at: По избор. В случай, че обявлението е ограничено до определен времеви диапазон
+        text: Можете да използвате синтаксиса на обикновени публикации. Не забравяйте, че обявлението ще заеме известно място от екрана на потребителя
+      appeal:
+        text: Можете да възразите срещу провинение само веднъж
       defaults:
+        autofollow: Хората, които се регистрират чрез поканата, автоматично ще ви последват
         avatar: PNG, GIF или JPG. До %{size}. Ще бъде смалена до %{dimensions} пиксела
+        bot: Покажете на останалите потребители, че акаунтът извършва предимно автоматизирани действия, които не се следят
+        context: Един или повече контексти, към които да се приложи филтърът
+        current_password: От съображения за сигуроност, въведете паролата на текущия профил
+        current_username: Въведете потребителското име на текущия профил, за да потвърдите
+        digest: Изпраща се само след дълъг период на бездействие и само ако сте получили лични съобщения във ваше отсъствие
+        discoverable: Позволяване на странници да откриват вашия акаунт чрез препоръки, нашумели и други неща
+        email: Ще ви се изпрати е-писмо за потвърждение
+        fields: Може да добавите до 4 елемента в таблицата към профила си
         header: PNG, GIF или JPG. До %{size}. Ще бъде смалена до %{dimensions} пиксела
+        inbox_url: Копирайте URL адреса на заглавната страница на предаващия сървър, който искат да използвате
+        irreversible: Филтрираните публикации ще изчезнат безвъзвратно, дори филтърът да бъде премахнат по-късно
+        locale: Езикът на потребителския интерфейс, известиятата по имейл и насочените известия
         locked: Изисква ръчно одобрение на последователите. По подразбиране, публикациите са достъпни само до последователи.
+        password: Използвайте поне 8 символа
+        phrase: Ще съвпадне без значение дали са главни или малки букви, или ако е предупреждение към публикация
+        scopes: Указва до кои API има достъп приложението. Ако изберете диапазон от най-високо ниво, няма нужда да избирате индивидуални.
+        setting_aggregate_reblogs: Скриване на нови споделяния за публикации, които са били споделени наскоро (засяга само новополучени споделяния)
+        setting_always_send_emails: Обикновено известия по имейл няма да бъдат изпратени при активно използване на Mastodon
+        setting_default_sensitive: Деликатната мултимедия е скрита по подразбиране и може да се разкрие с едно щракване
+        setting_display_media_default: Скриване на мултимедия отбелязана като деликатна
+        setting_display_media_hide_all: Винаги да се скрива мултимедията
+        setting_display_media_show_all: Винаги да се показва мултимедията
+        setting_hide_network: В профила ви ще бъде скрито кой може да последвате и кой може да ви последва
+        setting_noindex: Засяга вашите публикации и публичен профил
+        setting_show_application: Приложението, което ползвате за публикуване, ще се показва в подробностите на публикацията ви
+        setting_use_blurhash: Преливането се определя от цветовете на скритите изображения, но детайлите остават скрити
+        setting_use_pending_items: Да се показват обновявания на часовата ос само след щракване вместо автоматично превъртане на инфоканала
+        username: Вашето потребителско име ще е неповторим в %{domain}
+        whole_word: Ако ключовата дума/фраза е стриктно буквеноцифрена, ще бъде приложена само, ако съвпадне с цялата дума
+      domain_allow:
+        domain: Този домейн ще може да извлече данни от този сървър и входящите данни от него ще бъдат обработени и запазени
+      email_domain_block:
+        domain: Това може да е името на домейна, който се съдържа в имейл адреса или MX записа, който той използва. Ще бъдат проверени при регистрация.
+        with_dns_records: Ще има опит за преобразуване на DNS записите за дадения домейн и резултатите също ще бъдат блокирани
+      featured_tag:
+        name: 'Ето няколко хаштага, които последно сте използвали:'
+      filters:
+        action: Изберете кое действие да се извърши, прецеждайки съвпаденията на публикацията
+        actions:
+          hide: Напълно скриване на филтрираното съдържание, сякаш не съществува
+          warn: Скриване на филтрираното съдържание зад предупреждение, включващо името на филтъра
+      form_admin_settings:
+        backups_retention_period: Запазване на генерираните потребителски архиви за посочения брой дни.
+        bootstrap_timeline_accounts: Тези акаунти ще се закачат в горния край на препоръките за следване на нови потребители.
+        closed_registrations_message: Показва се, когато е затворено за регистрации
+        content_cache_retention_period: Публикации от други сървъри ще се изтрият след определен брой дни при положително число. Действието може да е необратимо.
+        custom_css: Може да прилагате собствени стилове в уеб версията на Mastodon.
+        mascot: Можете да заместите илюстрацията в разширения уеб интерфейс.
+        media_cache_retention_period: Свалените мултимедийни файлове ще бъдат изтрити след посочения брой дни, когато броят е положително число, и ще бъдат свалени отново при поискване.
+        profile_directory: Указателят на профили съдържа всички потребители, които са се съгласили да бъдат откривани.
+        require_invite_text: Когато регистрацията изисква ръчно одобрение, текстовото поле за това "Защо желаете да се присъедините?" ще бъде задължително, вместо по желание
+        site_contact_email: Как могат хората да се свържат с вас относно правни запитвания или помощ.
+        site_contact_username: Как хората могат да ви достигнат в Mastodon.
+        site_extended_description: Всяка допълнителна информация, която може да е полезна за посетителите и потребителите ви. Може да се структурира със синтаксиса на Markdown.
+        site_short_description: Кратък опис за помощ на неповторимата самоличност на сървъра ви. Кой го управлява, за кого е?
+        site_terms: Използвайте собствени правила за поверителност или оставете празно, за да използвате тези по подразбиране. Може да се структурира с Markdown синтаксис.
+        site_title: Как могат хората да наричат вашия сървър, освен името на домейна.
+        theme: Темата, която нови и невлезли потребители ще виждат.
+        thumbnail: Изображение в резолюция около 2:1, показвана до информацията за вашия сървър.
+        timeline_preview: Невлезлите потребители ще могат да преглеждат най-новите публични публикации, налични на сървъра.
+        trendable_by_default: Прескачане на ръчния преглед на нашумяло съдържание. Отделни елементи могат да бъдат премахвани от нашумели в последствие.
+        trends: В секцията Нашумели се показват публикации, хаштагове и новини, набрали популярност на вашия сървър.
+      form_challenge:
+        current_password: Навлизате в защитена зона
       imports:
         data: CSV файл, експортиран от друга инстанция на Mastodon
+      invite_request:
+        text: Това ще ни помогне да разгледаме заявлението ви
+      ip_block:
+        comment: По избор. Помага да се сетите защо сте добавили това правило.
+        expires_in: IP адресите са краен ресурс. Понякога са споделени и често сменят притежателите си. Поради това, блокиране на IP за неопределен период не се препоръчва.
+        ip: Въведете адреси IPv4 или IPv6. Може да блокирате цели обхвати с помощта на синтаксиса CIDR. Внимавайте да не се самозаключите!
+        severities:
+          no_access: Блокиране на достъп до всички ресурси
+          sign_up_block: Забрана на нови регистрации
+          sign_up_requires_approval: Ще трябва да одобрите новопостъпващи регистрации
+        severity: Изберете какво да се случва със заявките от този IP
+      rule:
+        text: Опишете правило или изискване за потребителите на този сървър. Опитайте се да го направите кратко и просто
+      sessions:
+        otp: 'Въведете двуфакторния код, породен от приложението на телефона си или използвайте един от кодовете си за възстановяване:'
+        webauthn: Ако е USB ключ, то не забравяйте да го вмъкнете и, ако е необходимо, го натикайте.
+      tag:
+        name: Можете да смените само употребата на големи/малки букви, например, за да е по-четимо
+      user:
+        chosen_languages: Само публикации на езиците с отметка ще бъдат показвани в публичните инфопотоци
+        role: Ролите управляват какви права има потребителят
+      user_role:
+        color: Цветът, използван за ролите в потребителския интерфейс, като RGB в шестнадесетичен формат
+        highlighted: Това прави ролята публично видима
+        name: Публично име за ролята, ако ролята е настроена да се показва като значка
+        permissions_as_keys: Потребители с тази роля ще имат достъп до...
+        position: По-висшата роля може да разреши конфликти в някои ситуации. Някои действия могат да бъдат извършени само за роли с по-нисък приоритет
+      webhook:
+        events: Изберете събития за изпращане
+        url: До къде ще се изпращат събитията
     labels:
       account:
         fields:
+          name: Етикет
           value: Съдържание
+      account_alias:
+        acct: Потребителско име на предишния акаунт
+      account_migration:
+        acct: Потребителско име на новия акаунт
       account_warning_preset:
+        text: Предварително настроен текст
         title: Заглавие
       admin_account_action:
+        include_statuses: Включва докладваните публикации в е-писмо
+        send_email_notification: Известяване на потребителя по имейл
+        text: Потребителско предупреждение
         type: Действие
         types:
           disable: Замразяване
+          none: Изпращане на предупреждение
           sensitive: Деликатно
           silence: Ограничение
           suspend: Спиране
+        warning_preset_id: Употреба на преднастройка за предупреждение
+      announcement:
+        all_day: Целодневно събитие
+        ends_at: Край на събитието
+        scheduled_at: Планиране на публикация
+        starts_at: Начало на събитието
+        text: Оповестяване
+      appeal:
+        text: Обяснете защо това решение трябва да се отхвърли
       defaults:
+        autofollow: Поканете за следване на акаунта ви
         avatar: Аватар
-        confirm_new_password: Потвърди новата парола
-        confirm_password: Потвърди паролата
+        bot: Акаунтът е бот
+        chosen_languages: Филтриране на езиците
+        confirm_new_password: Потвърждаване на новата парола
+        confirm_password: Потвърдете паролата
+        context: Филтриране на контекста
         current_password: Текуща парола
         data: Данни
+        discoverable: Предложете акаунта на други
         display_name: Показвано име
-        email: E-mail адрес
-        header: Заглавен ред
-        locale: Език
+        email: Адрес на имейла
+        expires_in: Изтича след
+        fields: Метаданни за профила
+        header: Заглавка
+        honeypot: "%{label} (не се попълва)"
+        inbox_url: URL адрес за входящи съобщения на предаващия сървър
+        irreversible: Премахване, вместо скриване
+        locale: Език на интерфейса
         locked: Направи акаунта поверителен
+        max_uses: Максимален брой използвания
         new_password: Нова парола
-        note: Био
-        otp_attempt: Двустепенен код
+        note: Биогр.
+        otp_attempt: Двуфакторен код
         password: Парола
-        setting_default_privacy: Поверителност на публикациите
+        phrase: Ключова дума или фраза
+        setting_advanced_layout: Включване на разширен уеб интерфейс
+        setting_aggregate_reblogs: Групиране на споделянията в инфопотока
+        setting_always_send_emails: Винаги да се изпращат известия по имейл
+        setting_auto_play_gif: Самопускащи се анимирани гифчета
+        setting_boost_modal: Показване на диалога за потвърждение преди споделяне
+        setting_crop_images: Изрязване на образи в неразгънати публикации до 16x9
+        setting_default_language: Език на публикуване
+        setting_default_privacy: Поверителност на публикуване
+        setting_default_sensitive: Винаги да се отбелязва мултимедията като деликатна
+        setting_delete_modal: Показване на прозорче за потвърждение преди изтриване на публикация
+        setting_disable_swiping: Деактивиране на бързо плъзгащи движения
+        setting_display_media: Показване на мултимедия
+        setting_display_media_default: Стандартно
+        setting_display_media_hide_all: Скриване на всичко
+        setting_display_media_show_all: Показване на всичко
+        setting_expand_spoilers: Винаги разширяване на публикации, отбелязани с предупреждения за съдържание
+        setting_hide_network: Скриване на социалното ви графосвързване
+        setting_noindex: Отказване от индексирането от търсачки
+        setting_reduce_motion: Обездвижване на анимациите
+        setting_show_application: Разкриване на приложението, изпращащо публикации
+        setting_system_font_ui: Употреба на стандартния шрифт на системата
+        setting_theme: Тема на сайта
+        setting_trends: Показване на днешните нашумели
+        setting_unfollow_modal: Показване на прозорче за потвърждение преди прекратяване следването на някого
+        setting_use_blurhash: Показване на цветни преливки за скрита мултимедия
+        setting_use_pending_items: Бавен режим
+        severity: Тежест
+        sign_in_token_attempt: Код за сигурност
+        title: Заглавие
         type: Тип на импортиране
         username: Потребителско име
+        username_or_email: Потребителско име или имейл
+        whole_word: Цяла дума
+      email_domain_block:
+        with_dns_records: Включване не MX записи и IP на домейна
+      featured_tag:
+        name: Хаштаг
+      filters:
+        actions:
+          hide: Напълно скриване
+          warn: Скриване зад предупреждение
+      form_admin_settings:
+        backups_retention_period: Период за съхранение на потребителския архив
+        bootstrap_timeline_accounts: Винаги да се препоръчват следните акаунти на нови потребители
+        closed_registrations_message: Съобщение, показвано, когато записвания не са възможни
+        content_cache_retention_period: Период на съхранение на кеша за съдържание
+        custom_css: Персонализиран CSS
+        mascot: Талисман по избор (остаряла настройка)
+        media_cache_retention_period: Период на запазване на мултимедията в кеш паметта
+        profile_directory: Показване на директорията от профили
+        registrations_mode: Кой може да се регистрира
+        require_invite_text: Изисква се причина за присъединяване
+        show_domain_blocks: Показване на блокиранията на домейни
+        show_domain_blocks_rationale: Показване защо са били блокирани домейните
+        site_contact_email: Имейл за контакт
+        site_contact_username: Потребителско име на контакт
+        site_extended_description: Разширен опис
+        site_short_description: Опис на сървъра
+        site_terms: Политика за поверителност
+        site_title: Име на сървъра
+        theme: Стандартна тема
+        thumbnail: Миниобраз на сървъра
+        timeline_preview: Позволяване на неупълномощен достъп до публични часови оси
+        trendable_by_default: Без преглед на нашумели
+        trends: Включване на нашумели
       interactions:
         must_be_follower: Блокирай известия от не-последователи
-        must_be_following: Блокирай известия от хора, които не следваш
+        must_be_following: Блокиране на известия от неследваните
+        must_be_following_dm: Блокиране на директни съобщения от неследваните
+      invite:
+        comment: Коментар
+      invite_request:
+        text: Защо искате да се присъедините?
+      ip_block:
+        comment: Коментар
+        ip: IP адрес
+        severities:
+          no_access: Блокиране на адреса
+          sign_up_block: Блокиране на регистрации
+          sign_up_requires_approval: Ограничаване на регистриране
+        severity: Правило
       notification_emails:
+        appeal: Някой възразява срещу решение на модератора
         digest: Изпращай извлечения на съобщенията
-        favourite: Изпращай e-mail, когато някой хареса твоя публикация
-        follow: Изпращай e-mail, когато някой те последва
-        follow_request: Изпращай e-mail, когато някой пожелае да те последва
-        mention: Изпращай e-mail, когато някой те спомене
+        favourite: Изпращане на е-писмо, когато някой означи ваша публикация като любима
+        follow: Изпращане на е-писмо, когато някой ви последва
+        follow_request: Изпращане на е-писмо, когато някой пожелае да ви последва
+        mention: Изпращане на е-писмо, когато някой ви спомене
+        pending_account: Новите акаунти трябва да се прегледат
         reblog: Изпращай e-mail, когато някой сподели твоя публикация
+        report: Новият доклад е подаден
+        trending_tag: Изискване на преглед за новонашумели
+      rule:
+        text: Правило
+      tag:
+        listable: Позволяване на хаштага да се появява при търсене и предложения
+        name: Хаштаг
+        trendable: Показване на хаштага да се появява под нашумели
+        usable: Позволяване на публикациите да употребяват този хаштаг
+      user:
+        role: Роля
+      user_role:
+        color: Цвят на значката
+        highlighted: Показване на ролята като значка на потребителските профили
+        name: Име
+        permissions_as_keys: Разрешения
+        position: Приоритет
+      webhook:
+        events: Включване на събития
+        url: URL адрес на крайната точка
     'no': Не
+    not_recommended: Не се препоръчва
+    recommended: Препоръчано
     required:
+      mark: "*"
       text: задължително
+    title:
+      sessions:
+        webauthn: Употребете един от ключовете си за сигурност, за да влезете
     'yes': Да
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 8c490e952..09fe1f6d1 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -11,6 +11,10 @@ br:
       form_challenge:
         current_password: Emaoc'h o tont-tre ul lec'h diogel
     labels:
+      account:
+        fields:
+          name: Label
+          value: Endalc'h
       account_warning_preset:
         title: Titl
       admin_account_action:
@@ -18,6 +22,7 @@ br:
         types:
           disable: Skornañ
           sensitive: Kizidik
+          silence: Bevenn
           suspend: Astalañ
       announcement:
         all_day: Darvoud a-hed an devezh
@@ -38,11 +43,14 @@ br:
         header: Talbenn
         locale: Yezh ar c'hetal
         new_password: Ger-tremen nevez
+        note: Kinnig
         password: Ger-tremen
         phrase: Ger-alc'hwez pe frazenn
         setting_display_media_default: Dre ziouer
         setting_display_media_hide_all: Kuzhat pep tra
         setting_display_media_show_all: Diskouez pep tra
+        setting_use_pending_items: Mod gorrek
+        title: Titl
         username: Anv
         whole_word: Ger a-bezh
       featured_tag:
@@ -50,12 +58,20 @@ br:
       invite:
         comment: Evezhiadenn
       ip_block:
+        comment: Evezhiadenn
         ip: IP
+        severity: Reolenn
       notification_emails:
         follow: Heuliañ a ra {name} ac'hanoc'h
+      rule:
+        text: Reolenn
       tag:
         name: Ger-klik
         trendable: Aotren an hashtag-mañ da zont war wel dindan tuadurioù
+      user:
+        role: Roll
+      user_role:
+        name: Anv
     'no': Ket
     recommended: Erbedet
     required:
diff --git a/config/locales/simple_form.bs.yml b/config/locales/simple_form.bs.yml
new file mode 100644
index 000000000..e9e174462
--- /dev/null
+++ b/config/locales/simple_form.bs.yml
@@ -0,0 +1 @@
+bs:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index e82ac2f73..597d97859 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -3,69 +3,97 @@ ca:
   simple_form:
     hints:
       account_alias:
-        acct: Especifica l'usuari@domini del compte des d'on et vols moure
+        acct: Especifica l'usuari@domini del compte des d'on et vols traslladar
       account_migration:
-        acct: Especifica l'usuari@domini del compte al que et vols moure
+        acct: Especifica l'usuari@domini del compte al qual et vols traslladar
       account_warning_preset:
-        text: Pots utilitzar totes les sintaxi com ara URL, etiquetes i mencions
+        text: Pots usar totes les sintaxis, com ara URL, etiquetes i mencions
         title: Opcional. No és visible per al destinatari
       admin_account_action:
-        include_statuses: L'usuari veurà quins tuts han causat l'acció de moderació o avís
+        include_statuses: L'usuari veurà quines publicacions han provocat que s'hagi moderat o avisat
         send_email_notification: L'usuari rebrà una explicació del que ha passat amb el seu compte
-        text_html: Opcional. Pots utilitzar tota la sintaxi. Pots <a href="%{path}">afegir configuracions predefinides d'avís</a> per a estalviar temps
+        text_html: Opcional. En les publicacions, pots usar tota la sintaxi. Pots <a href="%{path}">afegir configuracions predefinides d'avís</a> per a estalviar temps
         type_html: Tria què fer amb <strong>%{acct}</strong>
         types:
-          disable: Evita que l'usuari faci ús del seu compte però no li esborra o amaga els seus continguts.
-          none: Fes servir això per a enviar un avís al usuari sense desencadenar cap altre acció.
-          sensitive: Obliga a marcar tots els fitxers multi mèdia adjunts com a sensibles.
-          silence: Evita que l'usuari sigui capaç de publicar amb visibilitat publica, amaga els tuts i notificacions de usuaris que no el segueixen.
-          suspend: Evita qualsevol interacció de o a aquest compte i esborra els seus continguts. Reversible en un termini de 30 dies.
+          disable: Evita que l'usuari faci servir el seu compte, però no esborris ni amaguis el seu contingut.
+          none: Fes servir això per a enviar un avís a l'usuari sense desencadenar cap altra acció.
+          sensitive: Obliga a marcar tots els fitxers multimèdia adjunts com a sensibles.
+          silence: Evita que l'usuari pugui publicar amb visibilitat pública, amagar les seves publicacions i les notificacions d'usuaris que no el segueixin.
+          suspend: Evita qualsevol interacció des de o cap a aquest compte i esborra els seus continguts. Reversible en un termini de 30 dies.
         warning_preset_id: Opcional. Encara pots afegir text personalitzat al final de la configuració predefinida
       announcement:
         all_day: Si es marca, només es mostraran les dates de l'interval de temps
-        ends_at: Opcional. En aquest moment, l’anunci deixarà automàticament d'estar publicat
+        ends_at: Opcional. En aquest moment, l'anunci no es publicarà automàticament
         scheduled_at: Deixa-ho en blanc per a publicar l’anunci immediatament
-        starts_at: Opcional. En el cas que el teu anunci estigui vinculat a un interval de temps específic
-        text: Pots utilitzar sintaxi d'un tut. Tingues en compte l’espai que l’anunci ocuparà a la pantalla de l’usuari
+        starts_at: Opcional. En cas que el teu anunci estigui vinculat a un interval de temps específic
+        text: Pots fer servir la sintaxi de publicacions. Tingues en compte l’espai que l’anunci ocuparà a la pantalla de l’usuari
+      appeal:
+        text: Només pots emetre una apel·lació per cada acció
       defaults:
         autofollow: Les persones que es registrin a través de la invitació et seguiran automàticament
-        avatar: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px
-        bot: Aquest compte realitza principalment accions automatitzades i pot no estar controlat per cap persona
-        context: Un o diversos contextos on s'ha d'aplicar el filtre
-        current_password: Per motius de seguretat si us plau entra la contrasenya del compte actual
+        avatar: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        bot: Notifica que aquest compte realitza principalment accions automatitzades i que pot no estar controlat per cap persona
+        context: Un o diversos contextos en què s'ha d'aplicar el filtre
+        current_password: Per motius de seguretat, introdueix la contrasenya del compte actual
         current_username: Per a confirmar, si us plau entra el nom d'usuari del compte actual
-        digest: Només s'envia després d'un llarg període d'inactivitat amb un resum de les mencions que has rebut en la teva absència
-        discoverable: El directori de perfils és una altra manera per quin el teu compte pot assolir una audiència més àmplia
-        discoverable_no_directory: Permet que el teu compte sigui descobert per estranys grácies a les sugerències i altres característiques
+        digest: Només s'envia després d'un llarg període d'inactivitat i només si has rebut algun missatge personal durant la teva absència
+        discoverable: Permet que el teu compte sigui descobert per desconeguts a través de recomanacions, etiquetes i altres característiques
         email: Se t'enviarà un correu electrònic de confirmació
         fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil
-        header: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px
-        inbox_url: Copia l'URL des de la pàgina principal del relay que vols utilitzar
-        irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
-        locale: El llenguatge de l’interfície d’usuari, els correus i les notificacions push
-        locked: Requereix que aprovis manualment els seguidors
+        header: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        inbox_url: Copia l'URL de la pàgina principal del relay que vols usar
+        irreversible: Les publicacions filtrades desapareixeran de manera irreversible, fins i tot si el filtre s'elimina més tard
+        locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
+        locked: Controla manualment qui et pot seguir, aprovant sol·licituds
         password: Utilitza com a mínim 8 caràcters
         phrase: Es combinarà independentment del format en el text o l'avís de contingut del tut
-        scopes: A quines API es permetrà a l'aplicació accedir. Si selecciones un àmbit d'alt nivell, no cal que seleccionis un d'individual.
-        setting_aggregate_reblogs: No mostra els nous impulsos dels tuts que ja s'han impulsat recentment (només afecta als impulsos nous rebuts)
-        setting_default_sensitive: Els mèdia sensibles estan ocults per defecte i es poden revelar amb un clic
-        setting_display_media_default: Amaga els multimèdia marcats com a sensibles
+        scopes: API permeses per a accedir a l'aplicació. Si selecciones un àmbit de nivell superior, no cal que en seleccionis un d'individual.
+        setting_aggregate_reblogs: No mostris els nous impulsos de les publicacions que ja s'han impulsat recentment (només afecta els nous impulsos rebuts)
+        setting_always_send_emails: Normalment, no s'enviarà cap notificació per correu electrònic mentre facis servir Mastodon
+        setting_default_sensitive: El contingut sensible està ocult per defecte i es pot mostrar fent-hi clic
+        setting_display_media_default: Ocultar 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 els elements multimèdia marcats com a sensibles
-        setting_hide_network: Qui tu segueixes i els que et segueixen a tu no es mostraran en el teu perfil
+        setting_display_media_show_all: Mostra sempre el contingut gràfic
+        setting_hide_network: Qui segueixes i els que et segueixen no es mostraran en el teu perfil
         setting_noindex: Afecta el teu perfil públic i les pàgines d'estat
-        setting_show_application: L'aplicació que fas servir per a publicar es mostrarà a la vista detallada dels teus tuts
-        setting_use_blurhash: Els degradats es basen en els colors de les imatges ocultes, però enfosqueixen els detalls
-        setting_use_pending_items: Amaga les actualitzacions de la línia de temps després d'un clic en comptes de desplaçar-se automàticament
+        setting_show_application: L'aplicació que fas servir per a publicar es mostrarà en la vista detallada de les publicacions
+        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 automàticament les publicacions
         username: El teu nom d'usuari serà únic a %{domain}
         whole_word: Quan la paraula clau o la frase sigui només alfanumèrica, s'aplicarà si coincideix amb la paraula sencera
       domain_allow:
         domain: Aquest domini podrà obtenir dades d’aquest servidor i les dades entrants d’aquests seran processades i emmagatzemades
       email_domain_block:
-        domain: Això pot ser el nom del domini que es veu en l’adreça de correu electrònic, el registre MX al que resol el domini o l’IP del servidor al que resol el registre MX. Es comprovaran amb el registre d’usuari i es rebutjarà la inscripció.
+        domain: Aquest pot ser el nom del domini que es mostra en l'adreça de correu o el registre MX que utilitza. Es revisaran ql registrar-se.
         with_dns_records: Es procurarà resoldre els registres DNS del domini determinat i els resultats també es llistaran a la llista negra
       featured_tag:
-        name: 'És possible que vulguis utilitzar un d''aquests:'
+        name: 'Aquí estan algunes de les etiquetes que més has usat recentment:'
+      filters:
+        action: Tria quina acció cal executar quan un apunt coincideixi amb el filtre
+        actions:
+          hide: Ocultar completament el contingut filtrat, comportant-se com si no existís
+          warn: Oculta el contingut filtrat darrere d'un avís mencionant el títol del filtre
+      form_admin_settings:
+        backups_retention_period: Manté els arxius d'usuari generats durant el nombre de dies especificats.
+        bootstrap_timeline_accounts: Aquests comptes es fixaran en la part superior de les recomanacions de seguiment dels nous usuaris.
+        closed_registrations_message: Mostrat quan el registres estan tancats
+        content_cache_retention_period: Les publicacions d'altres servidors se suprimiran després del nombre de dies especificat quan s'estableix un valor positiu. Això pot ser irreversible.
+        custom_css: Pots aplicar estils personalitzats en la versió web de Mastodon.
+        mascot: Anul·la la il·lustració en la interfície web avançada.
+        media_cache_retention_period: Els fitxers multimèdia descarregats s'esborraran després del nombre de dies especificat quan el valor configurat és positiu, i tornats a descarregats sota demanda.
+        profile_directory: El directori de perfils llista tots els usuaris que tenen activat ser descoberts.
+        require_invite_text: Quan el registre requereix aprovació manual, fes que sigui obligatori en lloc d'opcional escriure el text de la sol·licitud d'invitació "Per què vols unir-te?"
+        site_contact_email: Com pot la gent comunicar amb tu per a consultes legals o de recolzament.
+        site_contact_username: Com pot la gent trobar-te a Mastodon.
+        site_extended_description: Qualsevol informació addicional que pot ser útil per als visitants i els teus usuaris. Es pot estructurar amb format Markdown.
+        site_short_description: Una descripció curta per a ajudar a identificar de manera única el teu servidor. Qui el fa anar, per a qui és?
+        site_terms: Usa la teva pròpia política de privacitat o deixa-ho en blanc per a usar la per defecte. Pot ser estructurat amb format Markdown.
+        site_title: Com pot la gent referir-se al teu servidor a part del seu nom de domini.
+        theme: El tema que els visitants i els nous usuaris veuen.
+        thumbnail: Una imatge d'aproximadament 2:1 que es mostra al costat la informació del teu servidor.
+        timeline_preview: Els visitants amb sessió no iniciada seran capaços de navegar per les publicacions més recents en el teu servidor.
+        trendable_by_default: Omet la revisió manual del contingut en tendència. Els articles individuals poden encara ser eliminats després del fet.
+        trends: Les tendències mostren quines publicacions, etiquetes i notícies estan guanyant força al vostre servidor.
       form_challenge:
         current_password: Estàs entrant en una àrea segura
       imports:
@@ -73,22 +101,33 @@ ca:
       invite_request:
         text: Això ens ajudarà a revisar la teva petició
       ip_block:
-        comment: Opcional. Recordatori de perquè l’has afegit.
-        expires_in: Les adreces IP son un recurs finit, de vegades son compartides i sovint canvien de mans. Per aquest motiu no es recomanen els bloquejos d’IP indefinits.
+        comment: Opcional. Recordatori de per què l’has afegit.
+        expires_in: Les adreces IP són un recurs finit, a vegades són compartides i sovint canvien de mans. Per aquest motiu, no es recomanen els bloquejos d’IP indefinits.
         ip: Introdueix una adreça IPv4 o IPv6. Pots bloquejar rangs complets amb la sintaxi CIDR. Ves a compte no et bloquegis a tu mateix!
         severities:
           no_access: Bloqueja l’accés a tots els recursos
+          sign_up_block: Els nous registres no seran possibles
           sign_up_requires_approval: Els nous registres requeriran la teva aprovació
         severity: Tria què passarà amb les sol·licituds des d’aquesta IP
       rule:
         text: Descriu una norma o requeriment pels usuaris d'aquest servidor. Intenta fer-la curta i senzilla
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
-        webauthn: Si és una clau USB assegurat de que està inserida i, si és necessari, toca-ho.
+        webauthn: Si és una clau USB, assegura't que està inserida i, si cal, toca-la.
       tag:
         name: Només pots canviar la caixa de les lletres, per exemple, per fer-la més llegible
       user:
-        chosen_languages: Quan estigui marcat, només es mostraran els tuts de les llengües seleccionades en les línies de temps públiques
+        chosen_languages: Quan estigui marcat, només es mostraran les publicacions en les llengües seleccionades en les línies de temps públiques
+        role: El rol controla quines permissions té l'usuari
+      user_role:
+        color: Color que s'usarà per al rol a tota la interfície d'usuari, com a RGB en format hexadecimal
+        highlighted: Això fa el rol visible públicament
+        name: Nom públic del rol, si el rol està configurat per a ser mostrat com a insígnia
+        permissions_as_keys: Els usuaris amb aquest rol tingran accés a...
+        position: El rol superior decideix la resolució de conflictes en certes situacions. Certes accions només es poden realitzar amb rols amb menor prioritat
+      webhook:
+        events: Selecciona esdeveniments a enviar
+        url: On els esdeveniments seran enviats
     labels:
       account:
         fields:
@@ -102,7 +141,7 @@ ca:
         text: Text predefinit
         title: Títol
       admin_account_action:
-        include_statuses: Inclou tuts reportats en el correu electrònic
+        include_statuses: Inclou les publicacions reportades en el correu electrònic
         send_email_notification: Notifica l'usuari per correu electrònic
         text: Avís personalitzat
         type: Acció
@@ -115,12 +154,15 @@ ca:
         warning_preset_id: Utilitza una configuració predefinida d'avís
       announcement:
         all_day: Esdeveniment de tot el dia
-        ends_at: Fi del esdeveniment
+        ends_at: Fi de l'esdeveniment
         scheduled_at: Programa la publicació
-        starts_at: Inici del esdeveniment
+        starts_at: Inici de l'esdeveniment
         text: Anunci
+      appeal:
+        text: Explica per què aquesta decisió s'hauria de revertir
       defaults:
-        autofollow: Convida a seguir el teu compte
+        autofollow: Convidar a seguir el teu compte
+        avatar: Avatar
         bot: Aquest compte és un bot
         chosen_languages: Filtrar llengües
         confirm_new_password: Confirma la contrasenya nova
@@ -128,7 +170,7 @@ ca:
         context: Filtre els contextos
         current_password: Contrasenya actual
         data: Informació
-        discoverable: Mostra aquest compte en el directori
+        discoverable: Mostra aquest compte en el directori de perfils
         display_name: Nom visible
         email: Adreça de correu electrònic
         expires_in: Expira després
@@ -137,41 +179,43 @@ ca:
         honeypot: "%{label} (no omplir)"
         inbox_url: URL de la safata d'entrada del relay
         irreversible: Cau en lloc d'ocultar
-        locale: Llengua de la interfície
-        locked: Fes aquest compte privat
+        locale: Idioma de la interfície
+        locked: Requereix sol·licituds de seguiment
         max_uses: Nombre màxim d'usos
         new_password: Contrasenya nova
         note: Biografia
         otp_attempt: Codi de dos factors
         password: Contrasenya
         phrase: Paraula clau o frase
-        setting_advanced_layout: Activar l’interfície web avançada
-        setting_aggregate_reblogs: Agrupa impulsos en les línies de temps
-        setting_auto_play_gif: Reproducció automàtica de GIFs animats
+        setting_advanced_layout: Activa la interfície web avançada
+        setting_aggregate_reblogs: Agrupar impulsos en les línies de temps
+        setting_always_send_emails: Envia'm sempre notificacions per correu electrònic
+        setting_auto_play_gif: Reprodueix automàticament els GIF animats
         setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar
-        setting_crop_images: Retalla les imatges en tuts no ampliats a 16x9
-        setting_default_language: Llengua de les publicacions
+        setting_crop_images: Retalla les imatges en publicacions no ampliades a 16x9
+        setting_default_language: Idioma de les publicacions
         setting_default_privacy: Privacitat de les publicacions
-        setting_default_sensitive: Marca sempre els elements multimèdia com a sensibles
+        setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostra la finestra de confirmació abans d'esborrar un tut
-        setting_disable_swiping: Desactivar les animacions
+        setting_disable_swiping: Desactiva les animacions
         setting_display_media: Visualització multimèdia
         setting_display_media_default: Per defecte
         setting_display_media_hide_all: Amaga-ho tot
         setting_display_media_show_all: Mostra-ho tot
-        setting_expand_spoilers: Sempre amplia els tuts marcats amb advertències de contingut
+        setting_expand_spoilers: Desplega sempre les publicacions marcades amb advertències de contingut
         setting_hide_network: Amaga la teva xarxa
-        setting_noindex: Desactivació de la indexació del motor de cerca
-        setting_reduce_motion: Redueix el moviment en animacions
-        setting_show_application: Revela l'aplicació utilitzada per enviar tuts
-        setting_system_font_ui: Utilitza el tipus de lletra predeterminat del sistema
+        setting_noindex: Desactiva la indexació dels motors de cerca
+        setting_reduce_motion: Redueix el moviment de les animacions
+        setting_show_application: Revelar l'aplicació utilitzada per fer les publicacions
+        setting_system_font_ui: Usa la lletra predeterminada del sistema
         setting_theme: Tema del lloc
         setting_trends: Mostra les tendències d'avui
-        setting_unfollow_modal: Mostra el diàleg de confirmació abans de deixar de seguir a algú
-        setting_use_blurhash: Mostra degradats de colors per als Mèdia amagats
+        setting_unfollow_modal: Mostra el diàleg de confirmació abans de deixar de seguir algú
+        setting_use_blurhash: Mostra degradats de colors per al contingut gràfic ocult
         setting_use_pending_items: Mode lent
         severity: Severitat
         sign_in_token_attempt: Codi de seguretat
+        title: Títol
         type: Importa el tipus
         username: Nom d'usuari
         username_or_email: Nom d'usuari o adreça electrònica
@@ -180,39 +224,84 @@ ca:
         with_dns_records: Incloure registres MX i IP del domini
       featured_tag:
         name: Etiqueta
+      filters:
+        actions:
+          hide: Oculta completament
+          warn: Oculta amb un avís
+      form_admin_settings:
+        backups_retention_period: Període de retenció del arxiu d'usuari
+        bootstrap_timeline_accounts: Recomana sempre aquests comptes als nous usuaris
+        closed_registrations_message: Missatge personalitzat quan el registre està tancat
+        content_cache_retention_period: Període de retenció de la memòria cau de contingut
+        custom_css: CSS personalitzat
+        mascot: Mascota personalitzada (llegat)
+        media_cache_retention_period: Període de retenció del cau multimèdia
+        profile_directory: Habilita el directori de perfils
+        registrations_mode: Qui es pot registrar
+        require_invite_text: Requereix un motiu per el registre
+        show_domain_blocks: Mostra els bloquejos de domini
+        show_domain_blocks_rationale: Mostra perquè estan bloquejats els dominis
+        site_contact_email: E-mail de contacte
+        site_contact_username: Nom d'usuari del contacte
+        site_extended_description: Descripció ampliada
+        site_short_description: Descripció del servidor
+        site_terms: Política de Privacitat
+        site_title: Nom del servidor
+        theme: Tema per defecte
+        thumbnail: Miniatura del servidor
+        timeline_preview: Permet l'accés no autenticat a les línies de temps públiques
+        trendable_by_default: Permet tendències sense revisió prèvia
+        trends: Activa les tendències
       interactions:
-        must_be_follower: Blocar les notificacions de persones que no et segueixen
-        must_be_following: Bloca les notificacions de persones que no segueixes
-        must_be_following_dm: Bloca els missatges directes de persones que no segueixes
+        must_be_follower: Bloqueja les notificacions de persones que no em segueixen
+        must_be_following: Bloqueja les notificacions de persones no seguides
+        must_be_following_dm: Blocar els missatges directes de persones que no segueixes
       invite:
         comment: Comenta
       invite_request:
         text: Per què vols unir-te?
       ip_block:
         comment: Comentari
+        ip: IP
         severities:
           no_access: Bloquejar l’accés
+          sign_up_block: Bloqueja registres
           sign_up_requires_approval: Limitar els registres
         severity: Regla
       notification_emails:
-        digest: Envia un resum per correu electrònic
-        favourite: Envia un correu electrònic si algú marca com a preferit el teu estat
-        follow: Envia un correu electrònic si algú et segueix
-        follow_request: Envia un correu electrònic si algú sol·licita seguir-te
-        mention: Envia un correu electrònic si algú et menciona
-        pending_account: Envia un correu electrònic quan es necessiti revisar un compte nou
-        reblog: Envia un correu electrònic si algú comparteix el teu estat
-        report: Envia un correu electrònic quan s'enviï un nou informe
-        trending_tag: Envia un correu quan una etiqueta sense revisar està en tendència
+        appeal: Algú ha apel·lat una decisió de moderació
+        digest: Envia'm un resum per correu electrònic
+        favourite: Algú marca com a preferit el teu estat
+        follow: Algú et segueix
+        follow_request: Algú sol·licita seguir-te
+        mention: Algú et menciona
+        pending_account: Un nou compte necessita revisió
+        reblog: Algú comparteix el teu estat
+        report: S'ha enviat l'informe nou
+        trending_tag: Nova tendència requereix revisió
       rule:
         text: Norma
       tag:
         listable: Permet que aquesta etiqueta aparegui en les cerques i en el directori de perfils
         name: Etiqueta
         trendable: Permet que aquesta etiqueta aparegui en les tendències
-        usable: Permet als tuts emprar aquesta etiqueta
+        usable: Permetre a les publicacions emprar aquesta etiqueta
+      user:
+        role: Rol
+      user_role:
+        color: Color de la insígnia
+        highlighted: Mostra el rol com a insígnia en el perfil dels usuaris
+        name: Nom
+        permissions_as_keys: Permisos
+        position: Prioritat
+      webhook:
+        events: Esdeveniments activats
+        url: URL de l'extrem
+    'no': 'No'
+    not_recommended: No recomanat
     recommended: Recomanat
     required:
+      mark: "*"
       text: necessari
     title:
       sessions:
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
new file mode 100644
index 000000000..9ce9ac065
--- /dev/null
+++ b/config/locales/simple_form.ckb.yml
@@ -0,0 +1,207 @@
+---
+ckb:
+  simple_form:
+    hints:
+      account_alias:
+        acct: username@domainـی ئەو هەژمارە دیاری بکە کە لێیەوە دێیت
+      account_migration:
+        acct: username@domainـی ئەو هەژمارە دیاری بکە کە بۆی بچیت
+      account_warning_preset:
+        text: دەتوانیت لە پۆستەکانتدا بەستەر و هاشتاگ دابنێیت یان ئاماژە بەکارهێنەرانی دیکە بکەیت
+        title: ئارەزوومەندانە. دیار نیە بۆ وەرگر
+      admin_account_action:
+        include_statuses: بەکارهێنەرەکە دەزانێت کام پۆستانە بوونەتە هۆی ئاگادارکردنەوە یان گرتنەبەری ڕێکار
+        send_email_notification: بەکارهێنەرەکە دەزانێت چی لە هەژمارەکەی هاتووە
+        text_html: ئارزوومەندانە. دەتوانن وەک توتی ئاسایی بینووسن. دەتوانن بۆ کەمکردنەوەی کات <a href="%{path}">ئاگادارییەکان لە پێشەوە زیادبکەن</a>
+        type_html: بڕیار بدە چی لە <strong>%{acct}</strong> دەکەیت
+        types:
+          disable: ڕێ لە بەکارهێنەرەکە بگرە هەژمارەکەی بەکار بهێنێت، بەڵام ناوەڕۆکەکانیان مەسڕەوە و مەشارەوە.
+        warning_preset_id: ئارەزوومەندانەیە. هێشتا دەتوانیت لە کۆتایی دەق شتێک زیاد بکەی
+      announcement:
+        all_day: کاتێک چاودێریکرا، تەنها بەروارەکانی مەودای کات پیشان دەدرێت
+        ends_at: ئارەزوومەندانەیە. ئەم کاتە راگەیەنراوەکە بە شێوەیەکی خۆکارانە بڵاوناکرێتەوە
+        scheduled_at: چۆڵ یبهێڵەوە بۆ بڵاوکردنەوەی دەستبەجێی بانگەوازەکە
+        starts_at: ئارەزوومەندانەیە. لە حاڵەتی ڕاگەیاندنی تۆ بەستراو بە مەودایەکی کاتی دیاریکراو
+        text: دەتوانیت ڕستەسازی توت بەکار بێنیت. تکایە بیر لەو بۆشاییە بکەوە کە بانگەوازەکە لەسەر شاشەی بەکارهێنەرەکە دەست نیشان دەکات
+      defaults:
+        autofollow: ئەو کەسانەی کە لە ڕێگەی بانگهێشتکردنەوە تۆمار دەکرێن بە خۆکارانە شوێنت دەکەون
+        avatar: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}px
+        bot: ئەم هەژمارە بەشێوەیەکی سەرەکی کردارە خۆکارانە ئەنجام دەدات و لەوانەیە چاودێری نەکرێت
+        context: یەک یان چەند دەقێک کە پالافتنەکە جێبەجێ بکات
+        current_password: بۆ مەبەستی پاراستن تکایە تێپەروشەی هەژمارەی ئێستاکەت بنووسە
+        current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
+        digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
+        email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
+        fields: دەتوانیت تا ٤بڕگەت هەبێت کە وەک خشتەیەک لەسەر پرۆفایلەکەت پیشان بدرێت
+        header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
+        inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
+        irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
+        locale: زمانی ڕووکاری بەکارهێنەر، ئیمەیلەکان و ئاگانامەکان
+        locked: خۆت بڕیار بدە کێ دەتوانێت شوێنت بکەوێت بە وەرگتنی داوای شوێنکەوتن
+        password: لایەنی کەم 8 نووسە بەکار بهێنە
+        phrase: سەربەخۆ لە بچکۆلی و گەورەیی پیتەکان، لەگەڵ دەقی ئەسڵی یان ئاگانامەکانی ناوەرۆکی توتەکان هاوئاهەنگ دەکرێت
+        scopes: APIـیەکانی بەرنامەنووسی کە ئەم ماڵپەڕە دەستپێگەیشتنی لەگەڵیان هیە. ئەگەر بەرزترین ئاست هەڵبژێرن ئیتر نیاز بە بژاردەی ئاستی نزم نییە.
+        setting_aggregate_reblogs: بۆ ئەو دووبارە توتانە کە بە نوێیی پێتان نیشان دراوە،دووبارە توتەکانی پێشتر زیاد مەکە(تەنها کاریگەری لەسەر توتەکانی ئەم دواییە هەیە)
+        setting_default_sensitive: میدیای هەستیار لە بنەڕەت شاراوەیە و دەتوانرێت بە کلیکیک ئاشکرا بکرێت
+        setting_display_media_default: ئەو میدیایانە بشارەوە کە هەستیارن
+        setting_display_media_hide_all: هەمیشە میدیا بشارەوە
+        setting_display_media_show_all: هەمیشە میدیا نیشان بدە
+        setting_hide_network: شوێنکەوتوو و شوێنکەوتنەکانت لە پرۆفایلەکەت نیشان نادرێن
+        setting_noindex: کاردەکاتە سەر پرۆفایل و لاپەڕە گشتیەکانت
+        setting_show_application: بەرنامەیەک کە بە یارمەتیت توت دەکەیت، لە دیمەنی وردی توتەکان پیشان دەدرێت
+        setting_use_blurhash: سێبەرەکان لە سەر بنەمای ڕەنگەکانی بەکارهاتوو لە وێنە داشاراوەکان دروست دەبن بەڵام وردەزانیاری وێنە تێیدا ڕوون نییە
+        setting_use_pending_items: لەجیاتی ئەوەی بە خۆکارانە کێشان هەبێت لە نووسراوەکان بە کرتەیەک بەڕۆژبوونی پێرستی نووسراوەکان بشارەوە
+        username: ناوی بەکارهێنەری ئێوە لەسەر %{domain} یەکتا دەبێت
+        whole_word: کاتێک کلیل‌وشە بریتییە لە ژمارە و پیت، تنەها کاتێک پەیدا دەبێت کە لەگەڵ گشتی وشە لە نێو دەقەکە هاوئاهەنگ بێت، نە تەنها لەگەڵ بەشێک لە وشە
+      domain_allow:
+        domain: ئەم دۆمەینە دەتوانێت دراوە لە ئەم ڕاژە وەربگرێت و دراوەی ئەم دۆمەینە لێرە ڕێکدەخرین و پاشکەوت دەکرێن
+      email_domain_block:
+        with_dns_records: هەوڵێک بۆ چارەسەرکردنی تۆمارەکانی DNSی دۆمەین دراوە کە ئەنجامەکان بلۆک دەکرێت
+      form_challenge:
+        current_password: تۆ دەچیتە ناو ناوچەی پارێزراو
+      imports:
+        data: فایلی CSV هەناردەکراوە لە ڕاژەیەکی تری ماستۆدۆن
+      invite_request:
+        text: ئەمە یارمەتیمان دەدات بۆ پێداچوونەوەی بەرنامەکەت
+      ip_block:
+        comment: دڵخوازە. لەبیرتە بۆچی ئەم یاسایەت زیاد کرد.
+        expires_in: ناونیشانی IP سەرچاوەی سنوردارن، هەندێک جار هاوبەشکراون و زۆر جار دەستەکان دەگۆڕن. لەبەر ئەم هۆیە، بلۆکی IP بێ نەناسراو پێشنیار نەکراوە.
+        ip: ناونیشانی IPv4 یان IPv6 تێبنووسە. دەتوانیت هەموو مەوداکان بلۆک بکەیت بە بەکارهێنانی داڕستانی CIDR. وریابە خۆت قفڵ مەکە!
+        severities:
+          no_access: بلۆککردنی گەیشتن بە هەموو سەرچاوەکان
+          sign_up_requires_approval: نوێ ناوتۆمارکردن پێویستی بە ڕەزامەندی تۆیە
+        severity: هەڵبژێرە چی ڕوودەدات لەگەڵ داواکاریەکانی ئەم IP
+      sessions:
+        otp: 'کۆدی دوو-فاکتۆر بنووسە کە لەلایەن ئەپی تەلەفۆنەکەتەوە دروست کراوە یان یەکێک لە کۆدەکانی هێنانەوەی خۆت بەکاربهێنە:'
+        webauthn: ئەگەر کلیلی USB بێت دڵنیابە لە تێکردنی و ئەگەر پێویست بوو، لێیبدە.
+      tag:
+        name: ئێوە دەتوانن گەورەیی و بجکۆلیی پیتەکان دەستکاری بکەن تاکوو خوێنەوارتر دیاربن
+      user:
+        chosen_languages: کاتێک چاودێری کرا، تەنها توتەکان بە زمانە دیاریکراوەکان لە هێڵی‌کاتی گشتی پیشان دەدرێت
+    labels:
+      account:
+        fields:
+          name: ناونیشان
+          value: ناوەڕۆک
+      account_alias:
+        acct: چارەسەرکردنی هەژمارە کۆنەکە
+      account_migration:
+        acct: چارەسەرکردنی هەژمارە نوێکە
+      account_warning_preset:
+        text: دەقی پێشوەختی ڕێکخستن
+        title: ناونیشان
+      admin_account_action:
+        include_statuses: لەخۆگرتنی توتەکانی گوزارشت لە ئیمەیل
+        send_email_notification: بەکارهێنەر ئاگادار بکەوە بۆ هەر ئیمەیڵێک
+        text: ئاگاداری تایبەتمەند
+        type: کردار
+        types:
+          disable: بەستن
+          none: ناردنی ئاگاداری
+          sensitive: هەستیار
+          silence: سنوور
+          suspend: ڕاگرتن
+        warning_preset_id: بەکاهێنانی ئاگاداری پێش وەختە
+      announcement:
+        all_day: ڕووداوی هەموو ڕۆژەکە
+        ends_at: کۆتایی ڕووداو
+        scheduled_at: بڵاوکراوەکە خشتە بکە
+        starts_at: دەستپێکردنی ڕووداو
+        text: بانگەواز
+      defaults:
+        autofollow: بانگهێشت کردن بۆ شوێنکەوتنی هەژمارەکەت
+        avatar: وێنۆچکە
+        bot: ئەمە هەژمارێکی ساختەیە
+        chosen_languages: پاڵاوتنی زمانەکان
+        confirm_new_password: پشتڕاستکردنەوەی تێپەڕوشەی نوێ
+        confirm_password: پشتڕاستکردنەوەی تێپەڕوشە
+        context: چوارچێوەی پاڵافتن
+        current_password: تێپەروشەی ئێستا
+        data: دراوه
+        discoverable: ئەم هەژمێرە لە پێرستی بژاردەی بەکارهێنەران نیشان بدە
+        display_name: ناوی پیشاندان
+        email: ناونیشانی ئیمەیڵ
+        expires_in: بەسەردەچێت پاش
+        fields: مێتاداتای پرۆفایل
+        header: سەرپەڕە
+        inbox_url: بەستەری سندوقی گواستنەوەی
+        irreversible: فرێدان لەجیاتی شاردنەوە
+        locale: زمانی پەڕەی بەکارهێنەر
+        locked: داخستنی هەژمارە
+        max_uses: زۆرترین ژمارەی بەکاربەرەکان
+        new_password: تێپەروشەی نوێ
+        note: دەربارەی ئیوە
+        otp_attempt: کۆدی دووقۆناغی هاتنەژوور
+        password: تێپەڕوشە
+        phrase: وشەکلیل یان دەستەواژە
+        setting_advanced_layout: چالاککردنی ڕووکاری وێبی پێشکەوتوو
+        setting_aggregate_reblogs: گرووپی توتەکان یەکبخە
+        setting_auto_play_gif: خۆکاربەخشکردنی GIFــەکان
+        setting_boost_modal: پیشاندانی دیالۆگی دووپاتکردنەوە پێش دوبارە توتاندن
+        setting_crop_images: لە تووتی نەکراوە،وینەکان لە ئەندازی ۱٦×۹ ببڕە
+        setting_default_language: زمانی نووسراوەکانتان
+        setting_default_privacy: چوارچێوەی تایبەتێتی ئێوە
+        setting_default_sensitive: هەمیشە نیشانکردنی میدیا وەک هەستیار
+        setting_delete_modal: نیساندانی پەیامی پەسەند کردن پاش سڕینەوە
+        setting_disable_swiping: جوڵەی سڕینەوە لە کاربخە
+        setting_display_media: پیشاندانی میدیا
+        setting_display_media_default: بنەڕەت
+        setting_display_media_hide_all: شاردنەوەی هەموو
+        setting_display_media_show_all: هەموو نیشان بدە
+        setting_expand_spoilers: هەمیشە ئەو توتانەی کە بە ئاگادارکردنەوەکانی ناوەڕۆکەوە نیشانەکراون، پیسان بدە
+        setting_hide_network: شاردنەوەی تۆڕەکەت
+        setting_noindex: داوا لە مەکینەی گەڕان بۆ پیشاننەدان لە دەئەنجامی گەڕانەکان
+        setting_reduce_motion: کەمکردنەوەی جوڵە لە ئەنیمەکان
+        setting_show_application: ئاشکراکردنی ئەپەکان بۆ ناردنی توتەکان
+        setting_system_font_ui: فۆنتی بنەڕەتی سیستەم بەکاربهێنە
+        setting_theme: ڕووکاری ماڵپەڕ
+        setting_trends: پیشاندانی نووسراوە بەرچاوکراوەی ئەمڕۆ
+        setting_unfollow_modal: پیشاندانی پەیامی پەسەندکردن پێش شوێن‌نەکەوتنی کەسێک
+        setting_use_blurhash: بەجیاتی وینەی داشاراوە، سێبەری ڕەنگاوڕەنگ نیشان بدە
+        setting_use_pending_items: دۆخی خاو
+        severity: ئاستی گرنگی
+        sign_in_token_attempt: کۆدی پاراستن
+        type: جۆری هاوردەکردن
+        username: ناوی بەکارهێنەر
+        username_or_email: ناوی بەکاهێنەر یان ئیمەیڵ
+        whole_word: هەموو وشەکە
+      email_domain_block:
+        with_dns_records: لەخۆگرتنی تۆمارەکانی MX و ئای پییەکانی دۆمەین
+      featured_tag:
+        name: هەشتاگ
+      interactions:
+        must_be_follower: قەپاتکردنی ئاگانامەکان بێجگە لە شوێنکەوتووان
+        must_be_following: بەئاگانامەکان بلۆک بکە لە خەڵکێک کە پەیڕەویان ناکەیت
+        must_be_following_dm: پەیامەکانی ڕاستەوخۆ بلۆک بکە لەو کەسانەی کە، پەیڕەوی ناکەن
+      invite:
+        comment: بۆچوون
+      invite_request:
+        text: بۆچی دەتەوێت بەشدار بیت?
+      ip_block:
+        comment: بۆچوون
+        severities:
+          no_access: بلۆککردنی ده‌ستپێگه‌یشتن
+          sign_up_requires_approval: سنووردارکردنی چوونەناو
+        severity: یاسا
+      notification_emails:
+        digest: کورتکردنی ئاگادارییکەن لەیەک ئیمەیل
+        favourite: کەسێک دۆخی تۆی بەدڵ بوو
+        follow: کەسێک دوای تۆ کەوت
+        follow_request: کەسێک داوای کردووە کە بەدوات بکەوێت
+        mention: کەسێک باسی کردووی
+        pending_account: هەژمارەی نوێ پێویستی بە پێداچوونەوەهەیە
+        reblog: کاتێک کەسێک نووسراوەی ئێوە دووبارە توت دەکاتەوە
+      tag:
+        listable: ڕیگەبدە ئەم هاشتاگە لە پێرستی هەڵبژاردەی بەکارهێنەران و پەڕەی گەڕان نیشان بدرێت
+        name: هەشتاگ
+        trendable: ڕێگەبدە ئەم هەشتاگە لە نووسراوەی بەرچاوکراو نیسان بدرێت
+        usable: ڕێگەبدە بە توتەکان بۆ بەکارهێنانی ئەم هەشتاگە
+    'no': نە
+    recommended: پێشنیارکراوە
+    required:
+      mark: "*"
+      text: پێویستە
+    title:
+      sessions:
+        webauthn: یەکێک لە کلیلەکانی پاراستن بەکاربهێنە بۆ چوونە ژوورەوە
+    'yes': بەڵێ
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index b326f3f55..79e5837d4 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -29,7 +29,6 @@ co:
         current_password: Per ragione di sicurità, entrate a chjave d'accessu di stu contu
         current_username: Per cunfirmà, entrate u cugnome di questu contu
         digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti
-        discoverable: L'annuariu di i prufili hè un'altra manera per u vostru contu di tuccà un'audienza più larga
         email: Avete da riceve un'e-mail di cunfirmazione
         fields: Pudete avè fin’à 4 elementi mustrati cum’un tavulone nant’à u vostru prufile
         header: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
@@ -55,10 +54,7 @@ co:
       domain_allow:
         domain: Stu duminiu puderà ricuperà i dati di stu servore è i dati ch'affaccanu da quallà saranu trattati è cunservati
       email_domain_block:
-        domain: Pò esse u duminiu affissatu nant'à l'indirizzu e-mail, l'intrata MX assuciata à u duminiu, o l'IP di u servore assuciatu à l'intrata MX. Quessi anu da esse verificati durante l'arregistramente di l'utilizatore, chì sarà righjittatu.
         with_dns_records: Un tintativu di cunsultà i dati DNS di u duminiu sarà fattu, è i risultati saranu ancu messi nant'à a lista nera
-      featured_tag:
-        name: 'Pudete vulè utilizà unu di quelli:'
       form_challenge:
         current_password: Entrate in in una zona sicurizata
       imports:
@@ -197,8 +193,6 @@ co:
         mention: Mandà un’e-mail quandu qualch’unu mi mintuva
         pending_account: Mandà un'e-mail quandu un novu contu hà bisognu d'esse valutatu
         reblog: Mandà un’e-mail quandu qualch’unu sparte i mo statuti
-        report: Mandà un'e-mail quandu c'hè un novu signalamentu
-        trending_tag: Mandà un'e-mail quandu un hashtag micca verificatu hè in e tendenze
       rule:
         text: Regula
       tag:
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 3ba75acc9..4dd7463f4 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -8,7 +8,7 @@ cs:
         acct: Zadejte svůj účet, na který se chcete přesunout, ve formátu přezdívka@doména
       account_warning_preset:
         text: Můžete použít syntax příspěvku, jako jsou URL, hashtagy nebo zmínky
-        title: Nepovinné. Není viditelné pro příjemce
+        title: Volitelné. Není viditelné pro příjemce
       admin_account_action:
         include_statuses: Uživatel uvidí, které příspěvky způsobily moderátorskou akci nebo varování
         send_email_notification: Uživatel obdrží vysvětlení toho, co se stalo s jeho účtem
@@ -18,15 +18,17 @@ cs:
           disable: Zabránit uživateli používat svůj účet, ale nemazat ani neskrývat jejich obsah.
           none: Toto použijte pro zaslání varování uživateli, bez vyvolání jakékoliv další akce.
           sensitive: Vynutit označení všech mediálních příloh tohoto uživatele jako citlivých.
-          silence: Zamezit uživateli odesílat příspěvky s veřejnou viditelností, schovat jejich příspěvky a notifikace před lidmi, kteří je nesledují.
+          silence: Zamezit uživateli odesílat veřejné příspěvky, schovat jejich příspěvky a notifikace před lidmi, kteří je nesledují.
           suspend: Zamezit jakékoliv interakci z nebo do tohoto účtu a smazat jeho obsah. Vratné do 30 dnů.
         warning_preset_id: Volitelné. Na konec předlohy můžete stále vložit vlastní text
       announcement:
-        all_day: Po vybrání budou zobrazeny jenom dny z časového období
+        all_day: Po vybrání budou zobrazeny jen dny z daného časového období
         ends_at: Volitelné. Zveřejněné oznámení bude v uvedený čas skryto
         scheduled_at: Pro okamžité zveřejnění ponechte prázdné
         starts_at: Volitelné. Jen pokud je oznámení vázáno na konkrétní časové období
         text: Můžete použít syntax příspěvků. Mějte prosím na paměti, kolik prostoru oznámení zabere na obrazovce uživatele
+      appeal:
+        text: Proti prohřešku se můžete odvolat jen jednou
       defaults:
         autofollow: Lidé, kteří se zaregistrují na základě pozvánky, vás budou automaticky sledovat
         avatar: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
@@ -34,20 +36,20 @@ cs:
         context: Jeden či více kontextů, ve kterých má být filtr uplatněn
         current_password: Z bezpečnostních důvodů prosím zadejte heslo současného účtu
         current_username: Potvrďte prosím tuto akci zadáním uživatelského jména aktuálního účtu
-        digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste při své nepřítomnosti obdrželi osobní zprávy
-        discoverable: Umožnit objevení vašeho účtu neznámými uživateli skrze doporučení, adresář profilů a další funkce
-        discoverable_no_directory: Umožnit objevení vašeho účtu neznámými uživateli skrze doporučení a další funkce
+        digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste během své nepřítomnosti obdrželi osobní zprávy
+        discoverable: Umožnit, aby mohli váš účet objevit neznámí lidé pomocí doporučení, trendů a dalších funkcí
         email: Bude vám poslán potvrzovací e-mail
-        fields: Na profilu můžete mít až 4 položky zobrazené jako tabulka
+        fields: Na svém profilu můžete mít zobrazeny až 4 položky jako tabulku
         header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         inbox_url: Zkopírujte URL z hlavní stránky mostu, který chcete použít
         irreversible: Filtrované příspěvky nenávratně zmizí, i pokud bude filtr později odstraněn
-        locale: Jazyk uživatelského rozhraní, e-mailů a oznámení push
+        locale: Jazyk uživatelského rozhraní, e-mailů a push notifikací
         locked: Kontrolujte, kdo vás může sledovat pomocí schvalování žádostí o sledování
         password: Použijte alespoň 8 znaků
         phrase: Shoda bude nalezena bez ohledu na velikost písmen v textu příspěvku či varování o obsahu
-        scopes: Která API bude aplikaci povoleno používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě.
+        scopes: Která API bude aplikace moct používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě.
         setting_aggregate_reblogs: Nezobrazovat nové boosty pro příspěvky, které byly nedávno boostnuty (ovlivňuje pouze nově přijaté boosty)
+        setting_always_send_emails: Jinak nebudou e-mailové notifikace posílány, když Mastodon aktivně používáte
         setting_default_sensitive: Citlivá média jsou ve výchozím stavu skryta a mohou být zobrazena kliknutím
         setting_display_media_default: Skrývat média označená jako citlivá
         setting_display_media_hide_all: Vždy skrývat média
@@ -56,16 +58,42 @@ cs:
         setting_noindex: Ovlivňuje váš veřejný profil a stránky příspěvků
         setting_show_application: Aplikace, kterou používáte k odeslání příspěvků, bude zobrazena jejich detailním zobrazení
         setting_use_blurhash: Gradienty jsou založeny na barvách skryté grafiky, ale zakrývají jakékoliv detaily
-        setting_use_pending_items: Aktualizovat časovou osu až po kliknutím namísto automatického rolování kanálu
+        setting_use_pending_items: Aktualizovat časovou osu až po kliknutí namísto automatického rolování kanálu
         username: Vaše uživatelské jméno bude na serveru %{domain} unikátní
-        whole_word: Je-li klíčové slovo či fráze pouze alfanumerická, bude aplikována pouze, pokud se shoduje s celým slovem
+        whole_word: Je-li klíčové slovo či fráze pouze alfanumerická, bude aplikován pouze, pokud se shoduje s celým slovem
       domain_allow:
         domain: Tato doména bude moci stahovat data z tohoto serveru a příchozí data z ní budou zpracována a uložena
       email_domain_block:
-        domain: Toto může být název domény v e-mailové adresy, její MX záznam nebo IP adresa odpovídající MX záznamu. Při registraci uživatele dojde k jejich kontrole a registrace bude zamítnuta.
+        domain: Toto může být doménové jméno, které je v e-mailové adrese, nebo MX záznam, který používá. Budou zkontrolovány při registraci.
         with_dns_records: Dojde k pokusu o překlad DNS záznamů dané domény a výsledky budou rovněž zablokovány
       featured_tag:
-        name: 'Nejspíš budete chtít použít jeden z těchto:'
+        name: 'Zde jsou některé z hashtagů, které jste nedávno použili:'
+      filters:
+        action: Vyberte, jakou akci provést, když příspěvek odpovídá filtru
+        actions:
+          hide: Úplně schovat filtrovaný obsah tak, jako by neexistoval
+          warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
+      form_admin_settings:
+        backups_retention_period: Zachovat generované uživatelské archivy pro zadaný počet dní.
+        bootstrap_timeline_accounts: Tyto účty budou připnuty na vrchol nových uživatelů podle doporučení.
+        closed_registrations_message: Zobrazeno při zavření registrace
+        content_cache_retention_period: Příspěvky z jiných serverů budou odstraněny po zadaném počtu dní, pokud je nastavena kladná hodnota. To může být nevratné.
+        custom_css: Můžete použít vlastní styly ve verzi Mastodonu.
+        mascot: Přepíše ilustraci v pokročilém webovém rozhraní.
+        media_cache_retention_period: Stažené mediální soubory budou po zadaném počtu dní odstraněny, pokud je nastavena kladná hodnota, a na požádání znovu staženy.
+        profile_directory: Adresář profilu obsahuje seznam všech uživatelů, kteří se přihlásili, aby mohli být nalezeni.
+        require_invite_text: Pokud přihlášení vyžaduje ruční schválení, měl by být textový vstup „Proč se chcete připojit?“ povinný spíše než volitelný
+        site_contact_email: Jak vás mohou lidé kontaktovat v případě právních dotazů nebo dotazů na podporu.
+        site_contact_username: Jak vás lidé mohou oslovit na Mastodon.
+        site_extended_description: Jakékoli další informace, které mohou být užitečné pro návštěvníky a vaše uživatele. Může být strukturováno pomocí Markdown syntaxe.
+        site_short_description: Krátký popis, který pomůže jednoznačně identifikovat váš server. Kdo ho provozuje, pro koho je určen?
+        site_terms: Použijte vlastní zásady ochrany osobních údajů nebo ponechte prázdné pro použití výchozího nastavení. Může být strukturováno pomocí Markdown syntaxe.
+        site_title: Jak mohou lidé odkazovat na váš server kromě názvu domény.
+        theme: Vzhled stránky, který vidí noví a odhlášení uživatelé.
+        thumbnail: Přibližně 2:1 obrázek zobrazený vedle informací o vašem serveru.
+        timeline_preview: Odhlášení uživatelé budou moci procházet nejnovější veřejné příspěvky na serveru.
+        trendable_by_default: Přeskočit manuální kontrolu populárního obsahu. Jednotlivé položky mohou být odstraněny z trendů později.
+        trends: Trendy zobrazují, které příspěvky, hashtagy a zprávy získávají na serveru pozornost.
       form_challenge:
         current_password: Vstupujete do zabezpečeného prostoru
       imports:
@@ -78,6 +106,7 @@ cs:
         ip: Zadejte IPv4 nebo IPv6 adresu. Můžete blokovat celé rozsahy použitím CIDR notace. Dejte pozor, ať neodříznete přístup sami sobě!
         severities:
           no_access: Blokovat přístup ke všem zdrojům
+          sign_up_block: Nové přihlášení nebude možné
           sign_up_requires_approval: Nové registrace budou vyžadovat schválení
         severity: Zvolte, jak naložit s požadavky z dané IP
       rule:
@@ -89,6 +118,16 @@ cs:
         name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti
       user:
         chosen_languages: Po zaškrtnutí budou ve veřejných časových osách zobrazeny pouze příspěvky ve zvolených jazycích
+        role: Role určuje, která oprávnění má uživatel
+      user_role:
+        color: Barva, která má být použita pro roli v celém UI, jako RGB v hex formátu
+        highlighted: Toto roli učiní veřejně viditelnou
+        name: Veřejný název role, pokud má být role zobrazena jako odznak
+        permissions_as_keys: Uživatelé s touto rolí budou moci...
+        position: Vyšší role rozhoduje o řešení konfliktů v určitých situacích. Některé akce lze provádět pouze na rolích s nižší prioritou
+      webhook:
+        events: Zvolte odesílané události
+        url: Kam budou události odesílány
     labels:
       account:
         fields:
@@ -107,11 +146,11 @@ cs:
         text: Vlastní varování
         type: Akce
         types:
-          disable: Deaktivovat přihlašování
+          disable: Zmrazit
           none: Nic nedělat
           sensitive: Citlivý
-          silence: Ztišit
-          suspend: Pozastavit účet a nenávratně smazat jeho data
+          silence: Omezit
+          suspend: Pozastavit
         warning_preset_id: Použít předlohu pro varování
       announcement:
         all_day: Celodenní událost
@@ -119,6 +158,8 @@ cs:
         scheduled_at: Naplánovat zveřejnění
         starts_at: Začátek události
         text: Oznámení
+      appeal:
+        text: Vysvětlete proč by toto rozhodnutí mělo být vráceno
       defaults:
         autofollow: Pozvat ke sledování vašeho účtu
         avatar: Avatar
@@ -148,6 +189,7 @@ cs:
         phrase: Klíčové slovo či fráze
         setting_advanced_layout: Povolit pokročilé webové rozhraní
         setting_aggregate_reblogs: Seskupovat boosty v časových osách
+        setting_always_send_emails: Vždy posílat e-mailová oznámení
         setting_auto_play_gif: Automaticky přehrávat animace GIF
         setting_boost_modal: Před boostnutím zobrazovat potvrzovací okno
         setting_crop_images: Ořezávat obrázky v nerozbalených příspěvcích na 16x9
@@ -167,12 +209,13 @@ cs:
         setting_show_application: Odhalit aplikaci použitou k odeslání příspěvků
         setting_system_font_ui: Použít výchozí písmo systému
         setting_theme: Vzhled stránky
-        setting_trends: Zobrazit dnes populární hashtagy
+        setting_trends: Zobrazit dnešní trendy
         setting_unfollow_modal: Před zrušením sledování zobrazovat potvrzovací okno
         setting_use_blurhash: Zobrazit pro skrytá média barevné gradienty
         setting_use_pending_items: Pomalý režim
         severity: Vážnost
         sign_in_token_attempt: Bezpečnostní kód
+        title: Název
         type: Typ importu
         username: Uživatelské jméno
         username_or_email: Uživatelské jméno nebo e-mail
@@ -181,6 +224,34 @@ cs:
         with_dns_records: Zahrnout MX záznamy a IP adresy domény
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Zcela skrýt
+          warn: Skrýt s varováním
+      form_admin_settings:
+        backups_retention_period: Doba uchovávání archivu uživatelů
+        bootstrap_timeline_accounts: Vždy doporučovat tyto účty novým uživatelům
+        closed_registrations_message: Vlastní zpráva, když přihlášení není k dispozici
+        content_cache_retention_period: Doba uchování mezipaměti obsahu
+        custom_css: Vlastní CSS
+        mascot: Vlastní maskot (zastaralé)
+        media_cache_retention_period: Doba uchovávání mezipaměti médií
+        profile_directory: Povolit adresář profilů
+        registrations_mode: Kdo se může přihlásit
+        require_invite_text: Požadovat důvod pro připojení
+        show_domain_blocks: Zobrazit blokace domén
+        show_domain_blocks_rationale: Zobrazit proč byly blokovány domény
+        site_contact_email: Kontaktní e-mail
+        site_contact_username: Jméno kontaktu
+        site_extended_description: Rozšířený popis
+        site_short_description: Popis serveru
+        site_terms: Ochrana osobních údajů
+        site_title: Název serveru
+        theme: Výchozí motiv
+        thumbnail: Miniatura serveru
+        timeline_preview: Povolit neověřený přístup k veřejným časovým osám
+        trendable_by_default: Povolit trendy bez předchozí revize
+        trends: Povolit trendy
       interactions:
         must_be_follower: Blokovat oznámení od lidí, kteří vás nesledují
         must_be_following: Blokovat oznámení od lidí, které nesledujete
@@ -194,9 +265,11 @@ cs:
         ip: IP
         severities:
           no_access: Blokovat přístup
+          sign_up_block: Blokovat registrace
           sign_up_requires_approval: Omezit registrace
         severity: Pravidlo
       notification_emails:
+        appeal: Někdo se odvolává proti rozhodnutí moderátora
         digest: Posílat e-maily s přehledem
         favourite: Někdo si oblíbil váš příspěvek
         follow: Někdo vás začal sledovat
@@ -205,7 +278,7 @@ cs:
         pending_account: Je třeba posoudit nový účet
         reblog: Někdo boostnul váš příspěvek
         report: Je odesláno nové hlášení
-        trending_tag: Neposouzený hashtag je populární
+        trending_tag: Nový trend vyžaduje posouzení
       rule:
         text: Pravidlo
       tag:
@@ -213,7 +286,19 @@ cs:
         name: Hashtag
         trendable: Povolit zobrazení tohoto hashtagu mezi populárními
         usable: Povolit používat tento hashtag v příspěvcích
+      user:
+        role: Role
+      user_role:
+        color: Barva odznaku
+        highlighted: Zobrazit roli jako odznak na profilech uživatelů
+        name: Název
+        permissions_as_keys: Oprávnění
+        position: Priorita
+      webhook:
+        events: Zapnuté události
+        url: URL koncového bodu
     'no': Ne
+    not_recommended: Nedoporučuje se
     recommended: Doporučeno
     required:
       mark: "*"
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 6d7b01746..11b572fe2 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -3,77 +3,135 @@ cy:
   simple_form:
     hints:
       account_alias:
-        acct: Rhowch enwdefnyddiwr@parth y cyfrif rydych chi am symud ohono
+        acct: Rhowch enwdefnyddiwr@parth y cyfrif y hoffech chi symud ohono
       account_migration:
         acct: Rhowch enwdefnyddiwr@parth y cyfrif rydych chi am symud iddo
       account_warning_preset:
-        text: Gallwch defnyddio cystrawen tŵt, fel URLs, hashnodau a sôniadau
-        title: Yn ddewisiol. Ddim yn weladwy i'r derbynydd
+        text: Gallwch defnyddio cystrawen post, fel URLs, hashnodau a chrybwylliadau
+        title: Dewisol. Nid yw'n weladwy i'r derbynnydd
       admin_account_action:
-        include_statuses: Bydd y defnyddiwr yn gweld pa tŵtiau sydd wedi achosi'r weithred gymedroli neu'r rhybudd
-        send_email_notification: Bydd y defnyddiwr yn derbyn esboniad o beth digwyddodd gyda'i cyfrif
-        text_html: Yn ddewisol. Gallwch defnyddio cystrawen tŵt. Gallwch <a href="%{path}">ychwanegu rhagosodiadau rhybydd</a> i arbed amser
+        include_statuses: Bydd y defnyddiwr yn gweld pa bostiadau sydd wedi achosi'r weithred gymedroli neu'r rhybudd
+        send_email_notification: Bydd y defnyddiwr yn derbyn esboniad o'r hyn a ddigwyddodd â'i gyfrif
+        text_html: Yn ddewisol. Gallwch defnyddio cystrawen post. Gallwch <a href="%{path}">ychwanegu rhagosodiadau rhybydd</a> i arbed amser
         type_html: Dewis beth i wneud gyda <strong>%{acct}</strong>
-        warning_preset_id: Yn ddewisol. Gallwch dal ychwanegu testun addasiol I ddiwedd y rhagosodiad
+        types:
+          disable: Yn atal y defnyddiwr rhag defnyddio ei gyfrif, ond peidio â dileu neu guddio ei gynnwys.
+          none: Defnyddio hwn i anfon rhybudd at y defnyddiwr, heb ysgogi unrhyw gamau eraill.
+          sensitive: Gorfodi holl atodiadau cyfryngau'r defnyddiwr hwn i gael eu nodi fel rhai sensitif.
+          silence: Atal y defnyddiwr rhag gallu postio gyda gwelededd cyhoeddus, cuddio ei bostiadau a'i hysbysiadau rhag pobl nad ydyn nhw'n eu dilyn.
+          suspend: Atal unrhyw ryngweithio o neu i'r cyfrif hwn a dileu ei gynnwys. Mae modd ei ddadwneud o fewn 30 diwrnod.
+        warning_preset_id: Yn ddewisol. Gallwch dal ychwanegu testun cyfaddas i ddiwedd y rhagosodiad
       announcement:
-        all_day: Pam ddewisir, caiff ddim ond dyddiau o'r amrediad amser ei ymddangos
-        ends_at: Dewisiol. Caiff y cyhoeddiad ei angyhoeddi yn awtomatig at yr amser hon
+        all_day: Pan gaiff ei wirio, dim ond dyddiadau'r ystod amser fydd yn cael eu harddangos
+        ends_at: Dewisol. N fydd y cyhoeddiad yn cael ei gyhoeddi'n awtomatig ar yr adeg hon
         scheduled_at: Gadael yn wag i gyhoeddi'r cyhoeddiad ar unwaith
-        starts_at: Dewisiol. Os mae eich cyhoeddiad yn gyfyniedig i amrediad amser penodol
-        text: Gallwch defnyddio cystrawen tŵt. Byddwch yn ymwybodol o'r lle cymerir y cyhoeddiad ar sgrin y defnyddwr
+        starts_at: Dewisol. Rhag ofn bod eich cyhoeddiad yn gaeth i ystod amser benodol
+        text: Gallwch ddefnyddio cystrawen post. Cofiwch faint o le y bydd y cyhoeddiad yn ei gymryd ar sgrin y defnyddiwr
+      appeal:
+        text: Dim ond unwaith y gallwch apelio yn erbyn rhybudd
       defaults:
         autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
-        avatar: PNG, GIF neu JPG. %{size} ar y mwyaf. Caiff ei israddio i %{dimensions}px
+        avatar: PNG, GIF neu JPG. %{size} yn uchafswm. Bydd yn cael ei israddio i %{dimensions}px
         bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
         context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
-        discoverable: Mae'r cyfeirlyfr proffil yn ffordd arall y gall eich cyfrif gyrraedd cynulleidfa ehangach
-        email: Byddwch yn derbyn e-bost i gadarnhau
-        fields: Mae modd i chi arddangos hyd at 4 eitem fel tabl ar eich proffil
-        header: PNG, GIF neu JPG. %{size} ar y mwyaf. Ceith ei israddio i %{dimensions}px
+        discoverable: Caniatáu i'ch cyfrif gael ei ddarganfod gan ddieithriaid trwy argymhellion, pynciau llosg a nodweddion eraill
+        email: Byddwch yn derbyn e-bost cadarnhau
+        fields: Mae modd i chi ddangos hyd at 4 eitem fel tabl ar eich proffil
+        header: PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei israddio i %{dimensions}px
         inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
-        irreversible: Bydd tŵtiau wedi eu hidlo yn diflannu am byth, hyd yn oed os ceith yr hidlydd ei ddileu'n hwyrach
+        irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
         locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
-        locked: Ei wneud yn ofynnol i chi i ganiatau dilynwyr a llaw
-        password: Defnyddiwch oleiaf 8 nodyn
-        phrase: Caiff ei gyfateb heb ystyriaeth o briflythrennu mewn testun neu rhybudd ynghylch cynnwys tŵt
-        scopes: Pa APIau y bydd gan y rhaglen ganiatad i gael mynediad iddynt. Os dewiswch maes lefel uchaf, yna nid oes angen dewis rhai unigol.
-        setting_aggregate_reblogs: Paid dangos bŵstiau newydd ar gyfer tŵtiau sydd wedi'i fŵstio yn ddiweddar (dim ond yn effeithio bŵstiau newydd ei dderbyn)
-        setting_default_sensitive: Mae cyfryngau sensitif yn cael ei gyddio'n rhagosodiedig, a gall cael eu dangos â chlic
+        locked: Mae hyn yn eich galluogi i reoli pwy sy'n gallu eich dilyn drwy gymeradwyo ceisiadau dilyn
+        password: Defnyddiwch o leiaf 8 nod
+        phrase: Caiff ei gyfateb heb ystyriaeth o briflythrennu mewn testun neu rhybudd ynghylch cynnwys postiad
+        scopes: Pa APIs y bydd y rhaglen yn cael mynediad iddynt. Os dewiswch gwmpas lefel uchaf, nid oes angen i chi ddewis rhai unigol.
+        setting_aggregate_reblogs: Peidiwch â dangos hybiau newydd ar bostiadau sydd wedi cael eu hybu'n ddiweddar (dim ond yn effeithio ar hybiau newydd ei dderbyn)
+        setting_always_send_emails: Fel arfer ni fydd hysbysiadau e-bost yn cael eu hanfon pan fyddwch chi wrthi'n defnyddio Mastodon
+        setting_default_sensitive: Mae cyfryngau sensitif wedi'u cuddio yn rhagosodedig a gellir eu datgelu trwy glicio
         setting_display_media_default: Cuddio cyfryngau wedi eu marcio'n sensitif
         setting_display_media_hide_all: Cuddio cyfryngau bob tro
-        setting_display_media_show_all: Dangos cyfryngau wedi eu marcio'n sensitif bob tro
-        setting_hide_network: Ni fydd y rheini yr ydych yn eu dilyn a phwy sy'n eich dilyn chi yn cael ei ddangos ar eich proffil
+        setting_display_media_show_all: Dangos cyfryngau bob tro
+        setting_hide_network: Ni fydd y pobl yr ydych chi'n eu dilyn a'ch dilynwyr yn ymddangos ar eich proffil
         setting_noindex: Mae hyn yn effeithio ar eich proffil cyhoeddus a'ch tudalennau statws
-        setting_show_application: Bydd y offer frydych yn defnyddio i dŵtio yn cael ei arddangos yn golwg manwl eich tŵtiau
-        setting_use_blurhash: Mae graddiannau wedi'u seilio ar liwiau'r delweddau cudd ond maent yn cuddio unrhyw fanylion
-        setting_use_pending_items: Cuddio diweddariadau llinell amser y tu ôl i glic yn lle sgrolio yn awtomatig
+        setting_show_application: Bydd y cymhwysiad a ddefnyddiwch i bostio yn cael ei arddangos yng ngolwg fanwl eich postiadau
+        setting_use_blurhash: Mae graddiannau wedi'u seilio ar liwiau'r delweddau cudd ond maen nhw'n cuddio unrhyw fanylion
+        setting_use_pending_items: Cuddio diweddariadau llinell amser y tu ôl i glic yn lle sgrolio'n awtomatig
         username: Bydd eich enw defnyddiwr yn unigryw ar %{domain}
         whole_word: Os yw'r allweddair neu'r ymadrodd yn alffaniwmerig yn unig, mi fydd ond yn cael ei osod os yw'n cyfateb a'r gair cyfan
       domain_allow:
         domain: Bydd y parth hwn yn gallu nôl data o'r gweinydd hwn a bydd data sy'n dod i mewn ohono yn cael ei brosesu a'i storio
       email_domain_block:
-        domain: Gall hyn fod yr enw parth sy'n dangos yn yr ebost, y cofnod MX mae'r parth yn adfer i, neu'r cyfeiriad IP o'r gweinydd mae'r cofnod MX yn adfer i. Bydd y rhain yn cael eu gwirio wrth i defnyddiwr cofrestru, a chaiff y cofrestriad ei wrthod.
-        with_dns_records: Bydd ceisiad i adfer cofnodau DNS y parth penodol yn cael ei wneud, a bydd y canlyniadau hefyd yn cael ei gosbrestru
+        domain: Gall hwn fod yr enw parth sy'n ymddangos yn y cyfeiriad e-bost neu'r cofnod MX y mae'n ei ddefnyddio. Byddant yn cael eu gwirio wrth gofrestru.
+        with_dns_records: Gwneir ymgais i ddatrys cofnodion DNS y parth a roddwyd a bydd y canlyniadau hefyd yn cael eu rhwystro
       featured_tag:
-        name: 'Efallai hoffech defnyddio un o''r rhain:'
+        name: 'Dyma rai o’r hashnodau a ddefnyddioch chi''n ddiweddar:'
+      filters:
+        action: Dewiswch pa weithred i'w chyflawni pan fydd postiad yn cyfateb i'r hidlydd
+        actions:
+          hide: Cuddiwch y cynnwys wedi'i hidlo'n llwyr, gan ymddwyn fel pe na bai'n bodoli
+          warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
+      form_admin_settings:
+        backups_retention_period: Cadw archifau defnyddwyr a gynhyrchwyd am y nifer penodedig o ddyddiau.
+        bootstrap_timeline_accounts: Bydd y cyfrifon hyn yn cael eu pinio i frig argymhellion dilynol defnyddwyr newydd.
+        closed_registrations_message: Yn cael eu dangos pan fydd cofrestriadau wedi cau
+        content_cache_retention_period: Bydd postiadau o weinyddion eraill yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan fyddan nhw wedi'u gosod i werth positif. Gall nad oes modd dadwneud hyn.
+        custom_css: Gallwch gymhwyso arddulliau cyfaddas ar fersiwn gwe Mastodon.
+        mascot: Yn diystyru'r darlun yn y rhyngwyneb gwe uwch.
+        media_cache_retention_period: Bydd ffeiliau cyfryngau wedi'u llwytho i lawr yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan gânt eu gosod i werth cadarnhaol, a'u hail-lwytho i lawr ar alw.
+        profile_directory: Mae'r cyfeiriadur proffil yn rhestru'r holl ddefnyddwyr sydd wedi dewis i fod yn ddarganfyddiadwy.
+        require_invite_text: Pan fydd angen cymeradwyaeth â llaw ar gyfer cofrestriadau, gwnewch y “Pam ydych chi am ymuno?” mewnbwn testun yn orfodol yn hytrach na dewisol
+        site_contact_email: Sut y gall pobl gysylltu â chi ar gyfer ymholiadau cyfreithiol neu gymorth.
+        site_contact_username: Sut y gall pobl eich cyrraedd ar Mastodon.
+        site_extended_description: Unrhyw wybodaeth ychwanegol a allai fod yn ddefnyddiol i ymwelwyr a'ch defnyddwyr. Mae modd ei strwythuro gyda chystrawen Markdown.
+        site_short_description: Disgrifiad byr i helpu i adnabod eich gweinydd yn unigryw. Pwy sy'n ei redeg, ar gyfer pwy mae e?
+        site_terms: Defnyddiwch eich polisi preifatrwydd eich hun neu gadewch yn wag i ddefnyddio'r rhagosodiad. Mae modd ei strwythuro gyda chystrawen Markdown.
+        site_title: Sut y gall pobl gyfeirio at eich gweinydd ar wahân i'w enw parth.
+        theme: Thema sy'n allgofnodi ymwelwyr a defnyddwyr newydd yn gweld.
+        thumbnail: Delwedd tua 2:1 yn cael ei dangos ochr yn ochr â manylion eich gweinydd.
+        timeline_preview: Bydd ymwelwyr sydd wedi allgofnodi yn gallu pori drwy'r postiadau cyhoeddus diweddaraf sydd ar gael ar y gweinydd.
+        trendable_by_default: Hepgor adolygiad llaw o gynnwys sy'n tueddu. Gall eitemau unigol gael eu tynnu o dueddiadau o hyd ar ôl y ffaith.
+        trends: Mae pynciau llosg yn dangos y postiadau, hashnodau, a newyddion sy'n denu sylw ar eich gweinydd.
       form_challenge:
-        current_password: Rydych chi'n mynd i mewn i ardal sicr
+        current_password: Rydych chi'n mynd i mewn i ardal ddiogel
       imports:
         data: Allforiwyd dogfen CSV o achos Mastodon arall
       invite_request:
         text: Bydd hyn yn helpu ni adolygu eich cais
+      ip_block:
+        comment: Dewisol. Cofiwch pam wnaethoch chi ychwanegu'r rheol hon.
+        expires_in: Mae cyfeiriadau IP yn adnodd cyfyngedig, weithiau maen nhw'n cael eu rhannu ac yn aml yn newid dwylo. Am y rheswm hwn, ni argymhellir blociau IP amhenodol.
+        ip: Rhowch gyfeiriad IPv4 neu IPv6. Gallwch rwystro ystodau cyfan gan ddefnyddio'r gystrawen CIDR. Byddwch yn ofalus i beidio â chloi eich hun allan!
+        severities:
+          no_access: Rhwystro mynediad i'r holl adnoddau
+          sign_up_block: Ni fydd yn bosibl derbyn cofrestriadau newydd
+          sign_up_requires_approval: Bydd angen eich cymeradwyaeth ar gyfer cofrestriadau newydd
+        severity: Dewiswch beth fydd yn digwydd gyda cheisiadau o'r IP hwn
+      rule:
+        text: Disgrifiwch reol neu ofyniad ar gyfer defnyddwyr ar y gweinydd hwn. Ceisiwch ei gadw'n fyr ac yn syml
       sessions:
         otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffôn neu defnyddiwch un o''ch codau adfer:'
+        webauthn: Os mai allwedd USB ydyw, gwnewch yn siŵr ei fewnosod ac, os oes angen, tapiwch ef.
       tag:
         name: Dim ond er mwyn ei gwneud yn fwy darllenadwy y gallwch chi newid y llythrennau, er enghraifft
       user:
         chosen_languages: Wedi eu dewis, dim ond tŵtiau yn yr ieithoedd hyn bydd yn cael eu harddangos mewn ffrydiau cyhoeddus
+        role: Mae'r rôl yn rheoli pa ganiatâd sydd gan y defnyddiwr
+      user_role:
+        color: Lliw i'w ddefnyddio ar gyfer y rôl drwy'r UI, fel RGB mewn fformat hecs
+        highlighted: Mae hyn yn gwneud y rôl yn weladwy i'r cyhoedd
+        name: Enw cyhoeddus y rôl, os yw'r rôl wedi'i gosod i'w dangos fel bathodyn
+        permissions_as_keys: Bydd defnyddwyr sydd â'r rôl hon yn cael mynediad at...
+        position: Mae rôl uwch yn penderfynu ar ddatrys gwrthdrawiadau mewn rhai sefyllfaoedd. Dim ond ar rolau â blaenoriaeth is y gellir cyflawni rhai gweithredoedd
+      webhook:
+        events: Dewiswch ddigwyddiadau i'w hanfon
+        url: I ble bydd digwyddiadau'n cael eu hanfon
     labels:
       account:
         fields:
+          name: Label
           value: Cynnwys
       account_alias:
         acct: Enw'r hen gyfrif
@@ -83,22 +141,25 @@ cy:
         text: Testun rhagosodedig
         title: Teitl
       admin_account_action:
-        include_statuses: Cynhwyswch tŵtiau yr adroddwyd amdanynt yn yr e-bost
+        include_statuses: Cynhwyswch postiadau yr adroddwyd amdanynt yn yr e-bost
         send_email_notification: Hysbysu'r defnyddiwr trwy e-bost
-        text: Rhybudd wedi'i addasu
+        text: Rhybudd cyfaddas
         type: Gweithredu
         types:
           disable: Analluogi
-          none: Gwneud dim
-          silence: Tawelwch
+          none: Anfon rhybudd
+          sensitive: Sensitif
+          silence: Cyfyngu
           suspend: Dileu data cyfrif
         warning_preset_id: Defnyddiwch ragnod rhag rhybudd
       announcement:
-        all_day: Digwiddiad trwy'r dydd
-        ends_at: Diwedd digwyddiad
+        all_day: Digwyddiad trwy'r dydd
+        ends_at: Diwedd y digwyddiad
         scheduled_at: Amserlenni cyhoeddiad
-        starts_at: Dechreuad digwyddiad
+        starts_at: Dechrau digwyddiad
         text: Cyhoeddiad
+      appeal:
+        text: Eglurwch pam y dylid gwrthdroi'r penderfyniad hwn
       defaults:
         autofollow: Gwahodd i ddilyn eich cyfrif
         avatar: Afatar
@@ -107,49 +168,54 @@ cy:
         confirm_new_password: Cadarnhau cyfrinair newydd
         confirm_password: Cadarnhau cyfrinair
         context: Hidlo cyd-destunau
-        current_password: Cyfrinair presennol
-        discoverable: Rhestrwch y cyfrif hwn ar y cyfeiriadur
-        display_name: Enw arddangos
+        current_password: Cyfrinair cyfredol
+        data: Data
+        discoverable: Awgrymu cyfrif i eraill
+        display_name: Enw dangos
         email: Cyfeiriad e-bost
         expires_in: Yn dod i ben ar ôl
         fields: Metadata proffil
         header: Pennyn
+        honeypot: "%{label} (peidiwch â llenwi)"
         inbox_url: URL y mewnflwch relái
         irreversible: Gollwng yn hytrach na chuddio
         locale: Iaith y rhyngwyneb
-        locked: Cloi cyfrif
-        max_uses: Uchafswm y nifer o ddefnyddiau
+        locked: Angen ceisiadau dilyn
+        max_uses: Nifer y ddefnyddiau uchafswm
         new_password: Cyfrinair newydd
         note: Bywgraffiad
         otp_attempt: Côd dau gam
         password: Cyfrinair
         phrase: Allweddair neu ymadrodd
-        setting_advanced_layout: Alluogi rhyngwyneb wê uwch
-        setting_aggregate_reblogs: Grŵp hybiau mewn ffrydiau
+        setting_advanced_layout: Galluogi rhyngwyneb gwe uwch
+        setting_aggregate_reblogs: Grwpio hybiau mewn ffrydiau
+        setting_always_send_emails: Anfonwch hysbysiadau e-bost bob amser
         setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
-        setting_boost_modal: Dangos deialog cadarnhad cyn bŵstio
-        setting_crop_images: Tocio lluniau o fewn tŵtiau ddi-ehangedig i 16x9
-        setting_default_language: Cyhoeddi iaith
-        setting_default_privacy: Cyfrinachedd cyhoeddi
+        setting_boost_modal: Dangos deialog cadarnhau cyn rhoi hwb
+        setting_crop_images: Tocio delweddau o fewn postiadau nad ydynt wedi'u hehangu i 16x9
+        setting_default_language: Iaith postio
+        setting_default_privacy: Preifatrwydd cyhoeddi
         setting_default_sensitive: Marcio cyfryngau fel eu bod yn sensitif bob tro
-        setting_delete_modal: Dangos deialog cadarnhau cyn dileu tŵt
-        setting_display_media: Arddangos cyfryngau
+        setting_delete_modal: Dangos deialog cadarnhau cyn dileu postiad
+        setting_disable_swiping: Analluogi cynigion llusgo
+        setting_display_media: Dangos cyfryngau
         setting_display_media_default: Rhagosodiad
-        setting_display_media_hide_all: Cuddio oll
-        setting_display_media_show_all: Dangos oll
-        setting_expand_spoilers: Ymestyn tŵtiau wedi'u marcio a rhybudd cynnwys bob tro
-        setting_hide_network: Cuddio eich rhwydwaith
-        setting_noindex: Dewis peidio mynegeio peiriant chwilota
+        setting_display_media_hide_all: Cuddio popeth
+        setting_display_media_show_all: Dangos popeth
+        setting_expand_spoilers: Dangos postiadau wedi'u marcio â rhybudd cynnwys bob tro
+        setting_hide_network: Cuddio eich graff cymdeithasol
+        setting_noindex: Peidio mynegeio peiriannau chwilio
         setting_reduce_motion: Lleihau mudiant mewn animeiddiadau
-        setting_show_application: Datguddio'r offer defnyddwyd i anfon tŵtiau
+        setting_show_application: Datgelu rhaglen a ddefnyddir i anfon postiadau
         setting_system_font_ui: Defnyddio ffont rhagosodedig y system
         setting_theme: Thema'r wefan
-        setting_trends: Dangos tueddiadau o heddiw ymlaen
+        setting_trends: Dangos pynciau llosg heddiw
         setting_unfollow_modal: Dangos deialog cadarnhau cyn dad-ddilyn rhywun
-        setting_use_blurhash: Dangoswch raddiannau lliwgar ar gyfer cyfryngau cudd
+        setting_use_blurhash: Dangos graddiannau lliwgar ar gyfryngau cudd
         setting_use_pending_items: Modd araf
         severity: Difrifoldeb
-        sign_in_token_attempt: Cod dioelwch
+        sign_in_token_attempt: Cod diogelwch
+        title: Teitl
         type: Modd mewnforio
         username: Enw defnyddiwr
         username_or_email: Enw defnyddiwr neu e-bost
@@ -158,31 +224,86 @@ cy:
         with_dns_records: Cynnwys cofnodion MX a chyfeiriadau IP y parth
       featured_tag:
         name: Hashnod
+      filters:
+        actions:
+          hide: Cuddio'n llwyr
+          warn: Cuddio â rhybudd
+      form_admin_settings:
+        backups_retention_period: Cyfnod cadw archif defnyddwyr
+        bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
+        closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
+        content_cache_retention_period: Cyfnod cadw storfa cynnwys
+        custom_css: CSS cyfaddas
+        mascot: Mascot cyfaddas (hen)
+        media_cache_retention_period: Cyfnod cadw storfa cyfryngau
+        profile_directory: Galluogi cyfeiriadur proffil
+        registrations_mode: Pwy all gofrestru
+        require_invite_text: Gofyn am reswm i ymuno
+        show_domain_blocks: Dangos blociau parth
+        show_domain_blocks_rationale: Dangos pam y cafodd parthau eu rhwystro
+        site_contact_email: E-bost cyswllt
+        site_contact_username: Enw defnyddiwr cyswllt
+        site_extended_description: Disgrifiad estynedig
+        site_short_description: Disgrifiad y gweinydd
+        site_terms: Polisi Preifatrwydd
+        site_title: Enw'r gweinydd
+        theme: Thema ragosodedig
+        thumbnail: Lluniau bach gweinydd
+        timeline_preview: Caniatáu mynediad heb ei ddilysu i linellau amser cyhoeddus
+        trendable_by_default: Caniatáu pynciau llosg heb adolygiad
+        trends: Galluogi pynciau llosg
       interactions:
         must_be_follower: Blocio hysbysiadau o bobl nad ydynt yn eich dilyn
         must_be_following: Blocio hysbysiadau o bobl nad ydych yn eu dilyn
-        must_be_following_dm: Blocio negeseuon uniongyrchol o bobl nad ydych yn eu dilyn
+        must_be_following_dm: Blocio negeseuon preifat o bobl nad ydych yn eu dilyn
       invite:
         comment: Sylw
       invite_request:
-        text: Pam hoffech ymuno?
+        text: Pam ydych chi eisiau ymuno?
+      ip_block:
+        comment: Sylw
+        ip: IP
+        severities:
+          no_access: Rhwystro mynediad
+          sign_up_block: Rhwystro cofrestriadau
+          sign_up_requires_approval: Cyfyngu ar gofrestru
+        severity: Rheol
       notification_emails:
+        appeal: Mae rhywun yn apelio yn erbyn penderfyniad y cymedrolwr
         digest: Anfonwch e-byst crynhoi
-        favourite: Anfon e-bost pan mae rhywun yn ffefrynnu eich statws
-        follow: Anfon e-bost pan mae rhywun yn eich dilyn chi
-        follow_request: Anfon e-bost pan mae rhywun yn gofyn i chi i'w dilyn
-        mention: Anfon e-bost pan mae rhywun yn eich crybwyll
-        pending_account: Anfon ebost pan mae cyfrif newydd angen adolygiad
-        reblog: Anfon e-bost pan mae rhywun yn bŵstio eich statws
-        report: Anfon e-bost pan y cyflwynir adroddiad newydd
-        trending_tag: Anfonwch e-bost pan fydd hashnod heb ei adolygu yn tueddu
+        favourite: Mae rhywun wedi ffafrio eich post
+        follow: Mae rhywun yn eich dilyn chi
+        follow_request: Mae rhywun yn ceisio eich dilyn chi
+        mention: Mae rhywun yn sôn amdanoch chi
+        pending_account: Mae cyfrif newydd angen adolygiad
+        reblog: Mae rhywun wedi hybu eich post
+        report: Cyflwynwyd adroddiad newydd
+        trending_tag: Mae pwnc llosg newydd angen adolygiad
+      rule:
+        text: Rheol
       tag:
-        listable: Gadewch i'r hashnod hwn ymddangos mewn chwiliadau ac ar y cyfeiriadur proffil
+        listable: Caniatáu i'r hashnod hwn ymddangos mewn chwiliadau ac awgrymiadau
         name: Hashnod
-        trendable: Gadewch i'r hashnod hwn ymddangos o dan dueddiadau
-        usable: Caniatáu i tŵtiau ddefnyddio'r hashnod hwn
+        trendable: Caniatáu i'r hashnod hwn ymddangos o dan bynciau llosg
+        usable: Caniatáu i bostiadau ddefnyddio'r hashnod hwn
+      user:
+        role: Rôl
+      user_role:
+        color: Lliw bathodyn
+        highlighted: Dangos rôl fel bathodyn ar broffiliau defnyddwyr
+        name: Enw
+        permissions_as_keys: Caniatâd
+        position: Blaenoriaeth
+      webhook:
+        events: Digwyddiadau wedi'u galluogi
+        url: URL diweddbwynt
     'no': Na
+    not_recommended: Heb ei argymell
     recommended: Argymhellwyd
     required:
+      mark: "*"
       text: gofynnol
+    title:
+      sessions:
+        webauthn: Defnyddiwch un o'ch allweddi diogelwch i fewngofnodi
     'yes': Ie
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 3492a41b9..e4dccca73 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -27,45 +27,73 @@ da:
         scheduled_at: Lad stå tomt for straks at publicere bekendtgørelsen
         starts_at: Valgfri. Såfremt din bekendtgørelse er knyttet til et bestemt tidsinterval
         text: Du kan bruge markup-formattering i indlæg. Vær opmærksom på den plads, som en bekendtgørelse vil fylde på brugerens skærm
+      appeal:
+        text: En advarsel kan kun appelleres én gang
       defaults:
-        autofollow: Personer, som har tilmeldt sig via invitationen, vil automatisk følge dig
+        autofollow: Personer tilmeldt via invitationen vil automatisk blive følgere
         avatar: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
         bot: Signalér til andre, at denne konto primært udfører automatiserede handlinger og muligvis ikke monitoreres
-        context: En eller flere kontekster, hvor filteret skal være gældende
+        context: En eller flere kontekster, hvor filteret skal anvendes
         current_password: Angiv af sikkerhedsårsager adgangskoden til den aktuelle konto
         current_username: For at bekræfte, angiv brugernavnet for den aktuelle konto
-        digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder i dit fravær
-        discoverable: Tillad din konto at blive fundet af fremmede via anbefalinger og øvrige funktioner
-        discoverable_no_directory: Tillad din konto at blive fundet af fremmede via anbefalinger og øvrige funktioner
-        email: Du tilsendes en bekræftelsese-mail
-        fields: Du kan have op til 4 elementer vist som en tabel på din profil
+        digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder under fraværet
+        discoverable: Tillad kontoen at blive fundet af fremmede via anbefalinger og øvrige funktioner
+        email: En bekræftelsese-mail fremsendes
+        fields: Profilen kan have op til 4 elementer vist som en tabel
         header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
-        inbox_url: Kopiér URL'en fra forsiden af den videreformidler, du ønsker at bruge
-        irreversible: Filtrerede indlæg forsvinder helt, selv hvis filteret senere fjernes
-        locale: Brugerfladesprog, e-mails og push-notifikationer
+        inbox_url: Kopiér URL'en fra forsiden af den videreformidler, der skal anvendes
+        irreversible: Filtrerede indlæg forsvinder permanent, selv hvis filteret senere fjernes
+        locale: Sprog til brug for brugerflade, e-mails og push-notifikationer
         locked: Godkend manuelt følgeanmodninger for at styre, hvem der følger dig
         password: Brug mindst 8 tegn
-        phrase: Matches uanset majuskel-/minuskel-brug i teksten eller indholdsadvarsel på et indlæg
-        scopes: Hvilke API'er applikationen vil få adgang til. Vælges en højniveaudstrækning, vil granuleringsvalg være unødvendige.
-        setting_aggregate_reblogs: Vis ikke nye boosts for indlæg boostet for nylig (påvirker kun nyligt modtagne boosts)
-        setting_default_sensitive: Sensitive medier er som standard skjult og kan afsløres med et klik
-        setting_display_media_default: Skjul medier markeret som sensitive
+        phrase: Matches uanset uanset brug af store/små bogstaver i teksten eller indholdsadvarsel for et indlæg
+        scopes: De API'er, som applikationen vil kunne tilgå. Vælges en topniveaudstrækning, vil detailvalg være unødvendige.
+        setting_aggregate_reblogs: Vis ikke nye boosts for nyligt boostede indlæg (påvirker kun nyligt modtagne boosts)
+        setting_always_send_emails: Normalt sendes ingen e-mailnotifikationer under aktivt brug af Mastodon
+        setting_default_sensitive: Sensitive medier er som standard skjult og kan vises med et klik
+        setting_display_media_default: Skjul medier med sensitiv-markering
         setting_display_media_hide_all: Skjul altid medier
         setting_display_media_show_all: Vis altid medier
         setting_hide_network: Hvem du følger, og hvem som følger dig, skjules på din profil
-        setting_noindex: Påvirker din offentlige profil og statussider
-        setting_show_application: Applikation, hvormed du skrive indlæg, vil fremgå i den detaljerede visning af dine indlæg
+        setting_noindex: Påvirker din offentlige profil samt indlægssider
+        setting_show_application: Applikationen, hvormed der postes, vil fremgå af detailvisningen af dine indlæg
         setting_use_blurhash: Gradienter er baseret på de skjulte grafikelementers farver, men slører alle detaljer
-        setting_use_pending_items: Klik for at vise tidslinjeopdateringer i stedet auto-feedrulning
+        setting_use_pending_items: Skjul tidslinjeopdateringer bag et klik i stedet for brug af auto-feedrulning
         username: Dit brugernavn vil være unikt på %{domain}
-        whole_word: Når nøgleordet/-udtrykket er rent alfanumerisk, bruges det kun, såfremt det matcher hele ordet
+        whole_word: Ved rent alfanumeriske nøgleord/-sætning, forudsætter brugen matchning af hele ordet
       domain_allow:
-        domain: Dette domæne vil kunne hente data, og dermed behandle og gemme indgående data, fra denne server
+        domain: Dette domæne vil kunne hente data, som efterfølgende behandles og gemmes, fra denne server
       email_domain_block:
-        domain: Dette kan være det domænenavn, der vises i e-mailadressen, MX-posten domænet opløser til eller IP'en på den server, som MX-posten opløser til. Disse tjekkes ved brugertilmelding, og tilmeldingen afvises.
-        with_dns_records: Et forsøg på at løse det givne domænes DNS-poster foretages og resultaterne blokeres ligeledes
+        domain: Dette kan være domænenavnet vist i den benyttede i e-mailadresse eller MX-post. Begge tjekkes under tilmelding.
+        with_dns_records: Et forsøg på at opløse det givne domænes DNS-poster foretages, og resultaterne blokeres ligeledes
       featured_tag:
-        name: 'Du vil formentlig ønske at bruge en af flg.:'
+        name: 'Her er nogle af dine hyppigst brugte hashtags:'
+      filters:
+        action: Vælg handlingen til eksekvering, når et indlæg matcher filteret
+        actions:
+          hide: Skjul filtreret indhold helt (adfærd som om, det ikke fandtes)
+          warn: Skjul filtreret indhold bag en advarsel, der nævner filterets titel
+      form_admin_settings:
+        backups_retention_period: Behold genererede brugerarkiver i det angivne antal dage.
+        bootstrap_timeline_accounts: Disse konti fastgøres øverst på nye brugeres følg-anbefalinger.
+        closed_registrations_message: Vises, når tilmeldinger er lukket
+        content_cache_retention_period: Indlæg fra andre servere slettes efter det angivne antal dage, når sat til en positiv værdi. Dette kan være irreversibelt.
+        custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen.
+        mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade.
+        media_cache_retention_period: Downloadede mediefiler slettes efter det angivne antal dage, når sat til en positiv værdi, og gendownloades på forlangende.
+        profile_directory: Profilmappen oplister alle brugere, som har valgt at kunne opdages.
+        require_invite_text: Når tilmelding kræver manuel godkendelse, så gør “Hvorfor ønsker du at deltage?” tekstinput obligatorisk i stedet for valgfrit
+        site_contact_email: Hvordan folk kan opnå kontakt ifm. juridiske eller supportforespørgsler.
+        site_contact_username: Hvordan folk kan kontakte dig på Mastodon.
+        site_extended_description: Evt. yderligere oplysninger, som kan være nyttige for både besøgende og brugere. Kan struktureres vha. Markdown-syntaks.
+        site_short_description: En kort beskrivelse mhp. entydigt at kunne identificere denne server. Hvem kører den, hvem er den for?
+        site_terms: Brug egen fortrolighedspolitik eller lad stå tomt for standardpolitikken. Kan struktureres med Markdown-syntaks.
+        site_title: Hvordan folk kan henvise til serveren udover domænenavnet.
+        theme: Tema, som udloggede besøgende og nye brugere ser.
+        thumbnail: Et ca. 2:1 billede vist sammen med serveroplysningerne.
+        timeline_preview: Udloggede besøgende kan gennemse serverens seneste offentlige indlæg.
+        trendable_by_default: Spring manuel gennemgang af trendindhold over. Individuelle elementer kan stadig fjernes fra trends efter kendsgerningen.
+        trends: Tendenser viser, hvilke indlæg, hashtags og nyheder opnår momentum på serveren.
       form_challenge:
         current_password: Du bevæger dig ind på et sikkert område
       imports:
@@ -73,60 +101,73 @@ da:
       invite_request:
         text: Dette vil hjælpe os med at gennemgå din ansøgning
       ip_block:
-        comment: Valgfri. Husk, hvorfor du tilføjede denne regel.
-        expires_in: IP-adresser er en begrænset ressource, de deles undertiden og skifter ofte hænder. Af denne grund anbefales ubegrænsede IP-blokke ikke.
-        ip: Angiv en IPv4- eller IPv6-adresse. Du kan blokere hele intervaller vha. CIDR-syntaksen. Vær forsigtig med ikke at låse dig ude!
+        comment: Valgfri. Begrundelse for denne regel.
+        expires_in: IP-adresser er en begrænset ressource, de deles undertiden og skifter ofte hænder, hvorfor ubegrænsede IP-blokke ikke anbefales.
+        ip: Angiv en IPv4- eller IPv6-adresse. Hele intervaller kan blokeres vha. CIDR-syntaksen. Pas på med ikke selv at blive låst ude!
         severities:
           no_access: Blokér adgang til alle ressourcer
+          sign_up_block: Nye tilmeldinger vil ikke være mulige
           sign_up_requires_approval: Nye tilmeldinger kræver din godkendelse
-        severity: Vælg, hvad der vil ske med anmodninger fra denne IP
+        severity: Afgør, hvordan forespørgsler fra denne IP behandles
       rule:
         text: Beskriv på en kort og enkel form en regel/krav for brugere på denne server
       sessions:
-        otp: 'Angiv tofaktorkoden generet af appen på din mobil eller brug en af dine genoprettelses koder:'
+        otp: 'Angiv tofaktorkoden generet af din mobil-app eller brug en af genoprettelseskoderne:'
         webauthn: Er det en USB-nøgle, så sørg for at isætte den og, om nødvendigt, åbne den manuelt.
       tag:
-        name: Du kan kun ændre bogstavtyperne for eksempelvis at gøre det mere læsbart
+        name: Kun bogstavtyper (store/små) kan ændres, eksempelvis for at gøre det mere læsbart
       user:
         chosen_languages: Når markeret, vil kun indlæg på de valgte sprog fremgå på offentlige tidslinjer
+        role: Rollen styrer, hvilke tilladelser brugeren har
+      user_role:
+        color: Farven, i RGB hex-format, der skal bruges til rollen i hele UI'en
+        highlighted: Dette gør rollen offentligt synlig
+        name: Offentligt rollennavn, hvis rollen er opsat til fremstå som et badge
+        permissions_as_keys: Brugere med denne rolle vil kunne tilgå...
+        position: Højere rolle bestemmer konfliktløsning i visse situationer. Visse handlinger kan kun udføres på roller med lavere prioritet
+      webhook:
+        events: Vælg begivenheder at sende
+        url: Hvor begivenheder sendes til
     labels:
       account:
         fields:
           name: Etiket
           value: Indhold
       account_alias:
-        acct: Kaldenavn på den gamle konto
+        acct: Brugernavn på den gamle konto
       account_migration:
-        acct: Kaldenavn på den nye konto
+        acct: Brugernavn på den nye konto
       account_warning_preset:
-        text: Tilpasset tekst
+        text: Tekstskabelon
         title: Titel
       admin_account_action:
-        include_statuses: Inkludér anmeldte indlæg i e-mailen
-        send_email_notification: Advisér brugeren pr. e-mail
+        include_statuses: Medtag anmeldte indlæg i e-mailen
+        send_email_notification: Underret brugeren pr. e-mail
         text: Tilpasset advarsel
         type: Handling
         types:
           disable: Frys
           none: Send en advarsel
-          sensitive: Sensitive
-          silence: Begrænsning
+          sensitive: Sensitiv
+          silence: Begræns
           suspend: Suspendér
-        warning_preset_id: Brug en forvalgsadvarsel
+        warning_preset_id: Brug en advarselsskabelon
       announcement:
         all_day: Heldagsbegivenhed
         ends_at: Slut på begivenhed
         scheduled_at: Planlæg offentliggørelse
-        starts_at: Start af begivenhed
+        starts_at: Start på begivenhed
         text: Bekendtgørelse
+      appeal:
+        text: Forklar, hvorfor denne beslutning bør omgøres
       defaults:
         autofollow: Invitér til at følge din konto
         avatar: Profilbillede
         bot: Dette er en bot-konto
-        chosen_languages: Filtrér sprog
+        chosen_languages: Sprogfiltrering
         confirm_new_password: Bekræft ny adgangskode
         confirm_password: Bekræft adgangskode
-        context: Filtrér kontekster
+        context: Kontekstfiltrering
         current_password: Aktuel adgangskode
         data: Data
         discoverable: Foreslå konto til andre
@@ -148,15 +189,16 @@ da:
         phrase: Nøgleord/-sætning
         setting_advanced_layout: Aktivér avanceret webgrænseflade
         setting_aggregate_reblogs: Gruppér boosts på tidslinjer
+        setting_always_send_emails: Send altid en e-mailnotifikationer
         setting_auto_play_gif: Autoafspil animerede GIF'er
         setting_boost_modal: Vis bekræftelsesdialog inden boosting
         setting_crop_images: Beskær billeder i ikke-ekspanderede indlæg til 16x9
-        setting_default_language: Sprog for opslag
-        setting_default_privacy: Fortrolighed for opslag
+        setting_default_language: Sprog for indlæg
+        setting_default_privacy: Fortrolighed for indlæg
         setting_default_sensitive: Markér altid medier som sensitive
         setting_delete_modal: Vis bekræftelsesdialog før et indlæg slettes
         setting_disable_swiping: Deaktivér strygebevægelser
-        setting_display_media: Medivisning
+        setting_display_media: Medievisning
         setting_display_media_default: Standard
         setting_display_media_hide_all: Skjul alle
         setting_display_media_show_all: Vis alle
@@ -164,7 +206,7 @@ da:
         setting_hide_network: Skjul din sociale graf
         setting_noindex: Fravælg søgemaskineindeksering
         setting_reduce_motion: Reducér animationsbevægelse
-        setting_show_application: Viser applikation, der bruges til at sende indlæg
+        setting_show_application: Vis applikationen brugt til at poste indlæg
         setting_system_font_ui: Brug systemets standardskrifttype
         setting_theme: Webstedstema
         setting_trends: Vis dagens tendenser
@@ -173,6 +215,7 @@ da:
         setting_use_pending_items: Langsom tilstand
         severity: Alvorlighed
         sign_in_token_attempt: Sikkerhedskode
+        title: Titel
         type: Importtype
         username: Brugernavn
         username_or_email: Brugernavn eller e-mail
@@ -181,10 +224,38 @@ da:
         with_dns_records: Inkludér domænets MX-poster og IP'er
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Skjul helt
+          warn: Skjul bag en advarsel
+      form_admin_settings:
+        backups_retention_period: Brugerarkivs opbevaringsperiode
+        bootstrap_timeline_accounts: Anbefal altid disse konti til nye brugere
+        closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig
+        content_cache_retention_period: Indholds-cache opbevaringsperiode
+        custom_css: Tilpasset CSS
+        mascot: Tilpasset maskot (ældre funktion)
+        media_cache_retention_period: Media-cache opbevaringsperiode
+        profile_directory: Aktivér profiloversigt
+        registrations_mode: Hvem, der kan tilmelde sig
+        require_invite_text: Kræv tilmeldingsbegrundelse
+        show_domain_blocks: Vis domæneblokeringer
+        show_domain_blocks_rationale: Vis, hvorfor domæner blev blokeret
+        site_contact_email: Kontakt e-mail
+        site_contact_username: Kontakt brugernavn
+        site_extended_description: Udvidet beskrivelse
+        site_short_description: Serverbeskrivelse
+        site_terms: Fortrolighedspolitik
+        site_title: Servernavn
+        theme: Standardtema
+        thumbnail: Serverminiaturebillede
+        timeline_preview: Tillad ikke-godkendt adgang til offentlige tidslinjer
+        trendable_by_default: Tillad ikke-reviderede tendenser
+        trends: Aktivér trends
       interactions:
         must_be_follower: Blokér notifikationer fra ikke-følgere
-        must_be_following: Blokér notifikationer fra folk du ikke følger
-        must_be_following_dm: Bloker direkte beskeder fra folk du ikke følger
+        must_be_following: Blokér notifikationer fra folk, som ikke følges
+        must_be_following_dm: Bloker direkte beskeder fra folk, som ikke følges
       invite:
         comment: Kommentar
       invite_request:
@@ -194,30 +265,44 @@ da:
         ip: IP
         severities:
           no_access: Blokér adgang
+          sign_up_block: Blokér tilmeldinger
           sign_up_requires_approval: Begræns tilmeldinger
         severity: Regel
       notification_emails:
+        appeal: En moderatorafgørelse er appelleret
         digest: Send resumé e-mails
-        favourite: Nogen gav dig favoritstatus
+        favourite: Nogen favoritmarkerede dit indlæg
         follow: Nogen begyndte at følge dig
         follow_request: Nogen anmodede om at følge dig
         mention: Nogen nævnte dig
         pending_account: Ny konto kræver gennemgang
-        reblog: Nogen boostede din status
-        report: Ny anmeldelse er indsendt
-        trending_tag: Et ikke-gennemgået hashtag trender
+        reblog: Nogen boostede dit indlæg
+        report: Ny anmeldelse indsendt
+        trending_tag: Ny tendens kræver revidering
       rule:
         text: Regel
       tag:
-        listable: Tillad visning af dette hashtag i søgninger og på profilmappen
+        listable: Tillad visning af dette hashtag i søgninger og forslag
         name: Hashtag
         trendable: Tillad visning af dette hashtag under trends
         usable: Tillad indlæg at benytte dette hashtag
+      user:
+        role: Rolle
+      user_role:
+        color: Badge-farve
+        highlighted: Vis rolle som badge på brugerprofiler
+        name: Navn
+        permissions_as_keys: Tilladelser
+        position: Prioritet
+      webhook:
+        events: Aktive begivenheder
+        url: Endepunkts-URL
     'no': Nej
+    not_recommended: Ikke anbefalet
     recommended: Anbefalet
     required:
       mark: "*"
-      text: krævet
+      text: obligatorisk
     title:
       sessions:
         webauthn: Brug en af dine sikkerhedskoder til indlogning
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 58ffab89a..5e8a5b3a9 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -3,69 +3,97 @@ de:
   simple_form:
     hints:
       account_alias:
-        acct: Gib den benutzernamen@domain des Kontos an, von dem du umziehen möchtest
+        acct: Gib profilname@domain des Kontos an, von dem du umziehen möchtest
       account_migration:
-        acct: Gib den benutzernamen@domain des Kontos an, zu dem du umziehen möchtest
+        acct: Gib profilname@domain des Kontos an, zu dem du umziehen möchtest
       account_warning_preset:
-        text: Du kannst Beitragssyntax benutzen, wie z.B. URLs, Hashtags und Erwähnungen
+        text: Du kannst Beitragssyntax verwenden, wie z. B. URLs, Hashtags und Erwähnungen
         title: Optional. Für den Empfänger nicht sichtbar
       admin_account_action:
-        include_statuses: Der Benutzer wird sehen, welche Beiträge diese Maßnahme verursacht haben
-        send_email_notification: Benutzer_in wird Bescheid gegeben, was mit dem Konto geschehen ist
-        text_html: Optional. Du kannst Beitragssyntax nutzen. Du kannst <a href="%{path}">Warnungsvorlagen</a> benutzen um Zeit zu sparen
+        include_statuses: Die Person sieht, welche Beiträge die Moderationsmaßnahme oder Warnung verursacht haben
+        send_email_notification: Benutzer*in wird eine Erklärung erhalten, was mit dem Konto geschehen ist
+        text_html: Optional. Du kannst Beitragssyntax verwenden. Du kannst <a href="%{path}">Warnvorlagen hinzufügen</a>, um Zeit zu sparen
         type_html: Wähle aus, was du mit <strong>%{acct}</strong> machen möchtest
         types:
-          disable: Den Benutzer daran hindern, sein Konto zu verwenden, aber seinen Inhalt nicht löschen oder ausblenden.
-          none: Verwende dies, um eine Warnung an den Benutzer zu senden, ohne eine andere Aktion auszulösen.
-          sensitive: Erzwinge, dass alle Medienanhänge des Benutzers als NSFW markiert werden.
-          silence: Verhindern, dass der Benutzer in der Lage ist, mit der öffentlichen Sichtbarkeit zu posten und seine Beiträge und Benachrichtigungen von Personen zu verstecken, die ihm nicht folgen.
+          disable: Benutzer*in daran hindern, das Konto verwenden zu können, aber die Inhalte nicht löschen oder ausblenden.
+          none: Verwende dies, um dem Account eine Warnung zu schicken, ohne dabei eine andere Aktion vorzunehmen.
+          sensitive: Erzwingen, dass alle Medienanhänge dieses Profils mit einer Inhaltswarnung versehen werden.
+          silence: Verhindern, dass der Benutzer in der Lage ist, mit der öffentlichen Sichtbarkeit zu posten und seine Beiträge und Benachrichtigungen vor Personen zu verbergen, die ihm nicht folgen.
           suspend: Verhindert jegliche Interaktion von oder zu diesem Konto und löscht dessen Inhalt. Kann innerhalb von 30 Tagen rückgängig gemacht werden.
         warning_preset_id: Optional. Du kannst immer noch eigenen Text an das Ende der Vorlage hinzufügen
       announcement:
-        all_day: Wenn aktiviert werden nur die Daten des Zeitraums angezeigt
+        all_day: Falls aktiviert, werden nur der Tag bzw. die Tage innerhalb des Zeitraums angezeigt
         ends_at: Optional. Die Ankündigung wird zu diesem Zeitpunkt automatisch zurückgezogen
-        scheduled_at: Leer lassen um die Ankündigung sofort zu veröffentlichen
-        starts_at: Optional. Falls deine Ankündigung an einen bestimmten Zeitraum gebunden ist
-        text: Du kannst die Toot-Syntax verwenden. Bitte beachte den Platz, den die Ankündigung auf dem Bildschirm des Benutzers einnehmen wird
+        scheduled_at: Leer lassen, um die Ankündigung sofort zu veröffentlichen
+        starts_at: Optional. Nur für den Fall, dass deine Ankündigung an einen bestimmten Zeitraum gebunden ist
+        text: Du kannst die reguläre Syntax wie für Beiträge verwenden, also auch Profile erwähnen und Hashtags nutzen. Bitte beachte den Platz, den die Ankündigung auf dem Bildschirm der Benutzer*innen einnehmen wird
+      appeal:
+        text: Du kannst nur einmal Einspruch gegen einen Verstoß einlegen
       defaults:
-        autofollow: Leute, die sich über deine Einladung registrieren, werden dir automatisch folgen
-        avatar: PNG, GIF oder JPG. Maximal %{size}. Wird auf %{dimensions} px herunterskaliert
-        bot: Dieses Konto führt lediglich automatisierte Aktionen durch und wird möglicherweise nicht überwacht
-        context: Ein oder mehrere Kontexte, wo der Filter aktiv werden soll
+        autofollow: Personen, die sich über deine Einladung registrieren, folgen automatisch deinem Profil
+        avatar: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
+        bot: Hinweis an andere Benutzer*innen, dass dieses Konto hauptsächlich automatisierte Aktionen durchführt und möglicherweise nicht persönlich betreut wird
+        context: In welchem Bereich soll der Filter aktiv sein?
         current_password: Aus Sicherheitsgründen gib bitte das Passwort des aktuellen Kontos ein
-        current_username: Um das zu bestätigen, gib den Benutzernamen des aktuellen Kontos ein
-        digest: Wenn du eine lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen zugeschickt, die du in deiner Abwesenheit empfangen hast
-        discoverable: Das Profilverzeichnis ist eine andere Möglichkeit, mit der dein Konto ein größeres Publikum erreichen kann
-        discoverable_no_directory: Erlaube deinem Konto durch Empfehlungen und andere Funktionen von Fremden entdeckt zu werden
-        email: Du wirst eine Bestätigungs-E-Mail erhalten
-        fields: Du kannst bis zu 4 Elemente auf deinem Profil anzeigen lassen, die als Tabelle dargestellt werden
-        header: PNG, GIF oder JPG. Maximal %{size}. Wird auf %{dimensions} px herunterskaliert
+        current_username: Um das zu bestätigen, gib den Profilnamen des aktuellen Kontos ein
+        digest: Wenn du eine längere Zeit inaktiv bist oder du in deiner Abwesenheit eine Direktnachricht erhalten hast
+        discoverable: Erlaube deinem Konto, durch Empfehlungen, Trends und andere Funktionen von Fremden entdeckt zu werden
+        email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
+        fields: Du kannst bis zu vier Metadaten auf deinem Profil anzeigen lassen, die als Tabelle dargestellt werden
+        header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
-        irreversible: Gefilterte Beiträge werden unwiderruflich gelöscht, selbst wenn der Filter später entfernt wird
+        irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
         locale: Die Sprache der Oberfläche, E-Mails und Push-Benachrichtigungen
-        locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten
+        locked: Wer dir folgen und deine Inhalte sehen möchte, muss dein Follower sein und dafür um deine Erlaubnis bitten
         password: Verwende mindestens 8 Zeichen
-        phrase: Wird schreibungsunabhängig mit dem Text und Inhaltswarnung eines Beitrags verglichen
+        phrase: Wird unabhängig von der Groß- und Kleinschreibung im Text oder der Inhaltswarnung eines Beitrags abgeglichen
         scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen.
         setting_aggregate_reblogs: Zeige denselben Beitrag nicht nochmal an, wenn er erneut geteilt wurde (dies betrifft nur neulich erhaltene erneut geteilte Beiträge)
-        setting_default_sensitive: NSFW-Medien werden erst nach einem Klick sichtbar
-        setting_display_media_default: Verstecke Medien, die als NSFW markiert sind
-        setting_display_media_hide_all: Alle Medien immer verstecken
-        setting_display_media_show_all: Alle Medien immer anzeigen
+        setting_always_send_emails: Normalerweise werden Benachrichtigungen nicht per E-Mail verschickt, wenn du gerade auf Mastodon aktiv bist
+        setting_default_sensitive: Medien, die mit einer Inhaltswarnung versehen worden sind, werden erst nach einem zusätzlichen Klick angezeigt
+        setting_display_media_default: Medien mit Inhaltswarnung verbergen
+        setting_display_media_hide_all: Medien immer verbergen
+        setting_display_media_show_all: Medien mit Inhaltswarnung immer anzeigen
         setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
-        setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
-        setting_show_application: Die Anwendung die du nutzst wird in der detaillierten Ansicht deiner Beiträge angezeigt
-        setting_use_blurhash: Die Farbverläufe basieren auf den Farben der versteckten Medien, aber verstecken jegliche Details
-        setting_use_pending_items: Neue Beiträge hinter einem Klick verstecken anstatt automatisch zu scrollen
-        username: Dein Benutzername wird auf %{domain} einzigartig sein
-        whole_word: Wenn das Schlagwort nur aus Buchstaben und Zahlen besteht, wird es nur angewendet, wenn es dem ganzen Wort entspricht
+        setting_noindex: Betrifft alle öffentlichen Daten deines Profils, z. B. deine Beiträge, Account-Empfehlungen und „Über mich“
+        setting_show_application: Die Anwendung die du nutzt wird in der detaillierten Ansicht deiner Beiträge angezeigt
+        setting_use_blurhash: Die Farbverläufe basieren auf den Farben der verborgenen Medien, verschleiern aber jegliche Details
+        setting_use_pending_items: Neue Beiträge hinter einem Klick verstecken, anstatt des automatischen Bildlaufs
+        username: Dein Profilname wird auf %{domain} einmalig sein
+        whole_word: Wenn das Wort oder die Formulierung nur aus Buchstaben oder Zahlen besteht, tritt der Filter nur dann in Kraft, wenn er exakt dieser Zeichenfolge entspricht
       domain_allow:
-        domain: Diese Domain kann Daten von diesem Server abrufen und eingehende Daten werden verarbeitet und gespeichert
+        domain: Diese Domain kann Daten von diesem Server abrufen, und eingehende Daten werden verarbeitet und gespeichert
       email_domain_block:
-        domain: Dies kann der Domainname sein, der in der E-Mail-Adresse angezeigt wird, den MX-Datensatz, der aufgelöst wird oder die IP des Servers, auf dem der MX-Eintrag aufgelöst wird. Diese werden bei der Registrierung überprüft und die Registrierung wird abgelehnt.
-        with_dns_records: Ein Versuch die DNS-Einträge der Domain aufzulösen wurde unternommen und diese Ergebnisse werden unter anderem auch geblockt
+        domain: Das kann die Domain aus einer E-Mail-Adresse oder einem MX-Eintrag sein. Bei der Registrierung eines neuen Profils wird beides überprüft.
+        with_dns_records: Ein Versuch, die DNS-Einträge der Domain aufzulösen, wurde unternommen, und diese Ergebnisse werden unter anderem auch blockiert
       featured_tag:
-        name: 'Du möchtest vielleicht einen von diesen benutzen:'
+        name: 'Hier sind ein paar Hashtags, die du in letzter Zeit am häufigsten genutzt hast:'
+      filters:
+        action: Gib an, welche Aktion ausgeführt werden soll, wenn ein Beitrag dem Filter entspricht
+        actions:
+          hide: Den gefilterten Beitrag vollständig ausblenden, als hätte er nie existiert
+          warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
+      form_admin_settings:
+        backups_retention_period: Behalte die Archive, die von den Benutzer*innen erstellt worden sind, für die angegebene Anzahl an Tagen.
+        bootstrap_timeline_accounts: Diese Profile werden bei den Follower-Empfehlungen für neu registrierte Nutzer*innen oben angeheftet.
+        closed_registrations_message: Wird angezeigt, wenn Registrierungen deaktiviert sind
+        content_cache_retention_period: Beiträge von anderen Servern werden nach der angegebenen Anzahl von Tagen, wenn sie auf einen positiven Wert gesetzt werden, gelöscht. Dies kann eventuell nicht rückgängig gemacht werden.
+        custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden.
+        mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche.
+        media_cache_retention_period: Von anderen Instanzen übertragene Mediendateien werden nach der angegebenen Anzahl an Tagen – sofern das Feld eine positive Zahl enthält – aus dem Cache gelöscht und bei Bedarf erneut heruntergeladen.
+        profile_directory: Das Profilverzeichnis zeigt alle Benutzer*innen an, die sich dafür entschieden haben, entdeckt zu werden.
+        require_invite_text: Wenn Registrierungen eine manuelle Genehmigung erfordern, dann werden Nutzer einen Grund für ihre Registrierung angeben müssen
+        site_contact_email: Wie man dich bei rechtlichen oder Support-Anfragen erreichen kann.
+        site_contact_username: Wie man dich auf Mastodon erreichen kann.
+        site_extended_description: Alle zusätzlichen Informationen, die für Besucher*innen und deine Benutzer*innen nützlich sein könnten. Kann mit der Markdown-Syntax formatiert werden.
+        site_short_description: Eine kurze Beschreibung zur eindeutigen Identifizierung des Servers. Wer betreibt ihn, für wen ist er bestimmt?
+        site_terms: Verwende eine eigene Datenschutzerklärung oder lasse das Feld leer, um die allgemeine Vorlage zu verwenden. Kann mit der Markdown-Syntax formatiert werden.
+        site_title: Wie Personen neben dem Domainnamen auf deinen Server verweisen können.
+        theme: Das Design, das abgemeldete Besucher und neue Benutzer sehen.
+        thumbnail: Ein Bild ungefähr im 2:1-Format, das neben den Server-Informationen angezeigt wird.
+        timeline_preview: Besucher*innen und ausgeloggte Benutzer*innen können die neuesten öffentlichen Beiträge dieses Servers aufrufen.
+        trendable_by_default: Manuelles Überprüfen angesagter Inhalte überspringen. Einzelne Elemente können später noch aus den Trends entfernt werden.
+        trends: Trends zeigen, welche Beiträge, Hashtags und Nachrichten auf deinem Server immer beliebter werden.
       form_challenge:
         current_password: Du betrittst einen sicheren Bereich
       imports:
@@ -73,22 +101,33 @@ de:
       invite_request:
         text: Dies wird uns helfen deine Anmeldungsanfrage besser zu verarbeiten
       ip_block:
-        comment: Optional. Denke daran, warum du diese Regel hinzugefügt hast.
-        expires_in: IP-Adressen sind eine endliche Ressource, sie werden manchmal geteilt und werden ab und zu ausgetauscht. Aus diesem Grund werden unbestimmte IP-Blöcke nicht empfohlen.
-        ip: Gebe eine IPv4- oder IPv6-Adresse an. Du kannst ganze Bereiche mit der CIDR-Syntax blockieren. Achte darauf, dass du dich nicht aussperrst!
+        comment: Optional. Zur Erinnerung, weshalb du diese Regel eingeführt hast.
+        expires_in: IP-Adressen sind eine begrenzte Ressource. Sie können außerdem auf viele Computer aufgeteilt sein und auch die Zuordnungen ändern sich. Deshalb werden unbestimmte IP-Blöcke nicht empfohlen.
+        ip: Gib eine IPv4- oder IPv6-Adresse an. Du kannst ganze Bereiche mit der CIDR-Syntax blockieren. Achte darauf, dass du dich nicht aussperrst!
         severities:
           no_access: Zugriff auf alle Ressourcen blockieren
-          sign_up_requires_approval: Neue Anmeldungen erfordern deine Zustimmung
-        severity: Wähle aus, was mit Anfragen aus dieser IP passiert
+          sign_up_block: Neue Registrierungen werden nicht möglich sein
+          sign_up_requires_approval: Neue Registrierungen müssen genehmigt werden
+        severity: Wähle aus, was mit Anfragen von dieser IP-Adresse geschehen soll
       rule:
-        text: Beschreibe eine Regel oder Anforderung für Benutzer auf diesem Server. Versuche es kurz und einfach zu halten
+        text: Führe eine Regel oder Bedingung für Benutzer*innen auf diesem Server ein. Bleib dabei kurz und knapp
       sessions:
-        otp: 'Gib die Zwei-Faktor-Authentifizierung von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
+        otp: 'Gib den Zwei-Faktor-Code von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
         webauthn: Wenn es sich um einen USB-Schlüssel handelt, stelle sicher, dass du ihn einsteckst und ihn antippst.
       tag:
         name: Du kannst zum Beispiel nur die Groß- und Kleinschreibung der Buchstaben ändern, um es lesbarer zu machen
       user:
-        chosen_languages: Wenn aktiviert, werden nur Beiträge in den ausgewählten Sprachen auf den öffentlichen Zeitleisten angezeigt
+        chosen_languages: Wenn du hier eine oder mehrere Sprachen auswählst, werden ausschließlich Beiträge in diesen Sprachen in deinen öffentlichen Timelines angezeigt
+        role: Die Rolle legt fest, welche Berechtigungen das Konto hat
+      user_role:
+        color: Farbe, die für diese Rolle in der gesamten Benutzerschnittstelle verwendet wird, als RGB im Hexadezimalsystem
+        highlighted: Dies macht die Rolle öffentlich im Profil sichtbar
+        name: Name der Rolle, der auch öffentlich als Badge angezeigt wird, sofern dies unten aktiviert ist
+        permissions_as_keys: Benutzer*innen mit dieser Rolle haben Zugriff auf...
+        position: Die höhere Rolle entscheidet über die Konfliktlösung in bestimmten Situationen. Bestimmte Aktionen können nur in Rollen mit geringerer Priorität ausgeführt werden
+      webhook:
+        events: Zu sendende Ereignisse auswählen
+        url: Wo Ereignisse hingesendet werden
     labels:
       account:
         fields:
@@ -102,89 +141,121 @@ de:
         text: Vorlagentext
         title: Titel
       admin_account_action:
-        include_statuses: Meldungen der E-Mail beifügen
-        send_email_notification: Benachrichtige den Nutzer per E-Mail
+        include_statuses: Gemeldete Beiträge der E-Mail beifügen
+        send_email_notification: Nutzer*in per E-Mail benachrichtigen
         text: Eigene Warnung
         type: Aktion
         types:
-          disable: Deaktivieren
+          disable: Einfrieren
           none: Nichts tun
-          sensitive: NSFW
+          sensitive: Inhaltswarnung
           silence: Stummschalten
-          suspend: Deaktivieren und Benutzerdaten unwiderruflich löschen
+          suspend: Sperren
         warning_preset_id: Benutze eine Warnungsvorlage
       announcement:
         all_day: Ganztägiges Ereignis
-        ends_at: Ereignisende
+        ends_at: Ende der Ankündigung
         scheduled_at: Veröffentlichung planen
-        starts_at: Beginn des Ereignisses
+        starts_at: Beginn der Ankündigung
         text: Ankündigung
+      appeal:
+        text: Erkläre, warum diese Entscheidung rückgängig gemacht werden soll
       defaults:
-        autofollow: Eingeladene Nutzer sollen dir automatisch folgen
+        autofollow: Meinem Profil automatisch folgen
         avatar: Profilbild
         bot: Dieses Profil ist ein Bot
-        chosen_languages: Sprachen filtern
+        chosen_languages: Sprachen einschränken
         confirm_new_password: Neues Passwort bestätigen
         confirm_password: Passwort bestätigen
-        context: In Kontexten filtern
+        context: Filter nach Bereichen
         current_password: Derzeitiges Passwort
         data: Daten
-        discoverable: Dieses Profil im Profilverzeichnis zeigen
+        discoverable: Konto für andere empfehlen
         display_name: Anzeigename
         email: E-Mail-Adresse
         expires_in: Läuft ab
-        fields: Tabellenfelder
+        fields: Metadaten
         header: Titelbild
         honeypot: "%{label} (nicht ausfüllen)"
         inbox_url: Inbox-URL des Relais
-        irreversible: Verwerfen statt verstecken
-        locale: Sprache der Benutzeroberfläche
-        locked: Profil sperren
+        irreversible: Endgültig, nicht nur temporär ausblenden
+        locale: Sprache des Webinterface
+        locked: Geschütztes Profil
         max_uses: Maximale Verwendungen
         new_password: Neues Passwort
         note: Über mich
-        otp_attempt: Zwei-Faktor-Authentifizierung
+        otp_attempt: Zwei-Faktor-Authentisierung
         password: Passwort
-        phrase: Schlagwort oder Satz
-        setting_advanced_layout: Fortgeschrittene Benutzeroberfläche benutzen
-        setting_aggregate_reblogs: Gruppiere erneut geteilte Beiträge auf der Startseite
+        phrase: Wort oder Formulierung
+        setting_advanced_layout: Erweitertes Webinterface verwenden
+        setting_aggregate_reblogs: Geteilte Beiträge in den Timelines gruppieren
+        setting_always_send_emails: Benachrichtigungen immer senden
         setting_auto_play_gif: Animierte GIFs automatisch abspielen
         setting_boost_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag geteilt wird
         setting_crop_images: Bilder in nicht ausgeklappten Beiträgen auf 16:9 zuschneiden
         setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
-        setting_default_sensitive: Medien immer als NSFW markieren
+        setting_default_sensitive: Eigene Medien immer mit einer Inhaltswarnung versehen
         setting_delete_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag gelöscht wird
-        setting_disable_swiping: Deaktiviere Wischgesten
+        setting_disable_swiping: Wischgesten deaktivieren
         setting_display_media: Medien-Anzeige
-        setting_display_media_default: NSFW-Inhalte verstecken
+        setting_display_media_default: Standard
         setting_display_media_hide_all: Alle Medien verstecken
         setting_display_media_show_all: Alle Medien anzeigen
-        setting_expand_spoilers: Beiträge mit Inhaltswarnungen immer ausklappen
-        setting_hide_network: Netzwerk ausblenden
+        setting_expand_spoilers: Beiträge mit Inhaltswarnung immer ausklappen
+        setting_hide_network: Deine Follower und „Folge ich“ nicht anzeigen
         setting_noindex: Suchmaschinen-Indexierung verhindern
         setting_reduce_motion: Bewegung in Animationen verringern
-        setting_show_application: Anwendung preisgeben, die benutzt wurde um Beiträge zu versenden
-        setting_system_font_ui: Standardschriftart des Systems verwenden
-        setting_theme: Theme
+        setting_show_application: Den Namen der App offenlegen, mit der du deine Beiträge veröffentlichst
+        setting_system_font_ui: Standardschriftart des Browsers verwenden
+        setting_theme: Design
         setting_trends: Heutige Trends anzeigen
         setting_unfollow_modal: Bestätigungsdialog anzeigen, bevor jemandem entfolgt wird
-        setting_use_blurhash: Farbverlauf für versteckte Medien anzeigen
+        setting_use_blurhash: Farbverlauf für verborgene Medien anzeigen
         setting_use_pending_items: Langsamer Modus
         severity: Schweregrad
         sign_in_token_attempt: Sicherheitscode
+        title: Titel
         type: Art des Imports
         username: Profilname
         username_or_email: Profilname oder E-Mail
-        whole_word: Ganzes Wort
+        whole_word: Phrasensuche mit exakter Zeichenfolge erzwingen
       email_domain_block:
-        with_dns_records: MX-Einträge und IPs der Domain einbeziehen
+        with_dns_records: MX-Einträge und IP-Adressen der Domain einbeziehen
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Komplett ausblenden
+          warn: Mit einer Warnung ausblenden
+      form_admin_settings:
+        backups_retention_period: Aufbewahrungsfrist für Archive
+        bootstrap_timeline_accounts: Neuen Nutzern immer diese Konten empfehlen
+        closed_registrations_message: Nachricht, falls Registrierungen deaktiviert sind
+        content_cache_retention_period: Aufbewahrungsfrist für Inhalte im Cache
+        custom_css: Eigenes CSS
+        mascot: Benutzerdefiniertes Maskottchen (Legacy)
+        media_cache_retention_period: Aufbewahrungsfrist für den Medien-Cache
+        profile_directory: Profilverzeichnis aktivieren
+        registrations_mode: Wer darf ein neues Konto registrieren?
+        require_invite_text: Grund für den Beitritt verlangen
+        show_domain_blocks: Anzeigen, welche Domains gesperrt wurden
+        show_domain_blocks_rationale: Anzeigen, weshalb Domains gesperrt wurden
+        site_contact_email: E-Mail-Adresse
+        site_contact_username: Profilname
+        site_extended_description: Detaillierte Beschreibung
+        site_short_description: Serverbeschreibung
+        site_terms: Datenschutzerklärung
+        site_title: Servername
+        theme: Standard-Design
+        thumbnail: Vorschaubild des Servers
+        timeline_preview: Nicht-authentifizierten Zugriff auf die öffentliche Timeline gestatten
+        trendable_by_default: Trends ohne vorherige Überprüfung erlauben
+        trends: Trends aktivieren
       interactions:
-        must_be_follower: Benachrichtigungen von Profilen blockieren, die mir nicht folgen
-        must_be_following: Benachrichtigungen von Profilen blockieren, denen ich nicht folge
-        must_be_following_dm: Private Nachrichten von Profilen, denen ich nicht folge, blockieren
+        must_be_follower: Benachrichtigungen von Profilen verbergen, die mir nicht folgen
+        must_be_following: Benachrichtigungen von Profilen verbergen, denen ich nicht folge
+        must_be_following_dm: Direktnachrichten von Profilen, denen ich nicht folge, ablehnen
       invite:
         comment: Kommentar
       invite_request:
@@ -194,31 +265,45 @@ de:
         ip: IP-Adresse
         severities:
           no_access: Zugriff sperren
-          sign_up_requires_approval: Anmeldungen begrenzen
+          sign_up_block: Registrierung sperren
+          sign_up_requires_approval: Registrierungen begrenzen
         severity: Regel
       notification_emails:
-        digest: Kurzfassungen über E-Mail senden
-        favourite: E-Mail senden, wenn jemand meinen Beitrag favorisiert
-        follow: E-Mail senden, wenn mir jemand folgt
-        follow_request: E-Mail senden, wenn mir jemand folgen möchte
-        mention: E-Mail senden, wenn mich jemand erwähnt
-        pending_account: E-Mail senden, wenn ein neues Benutzerkonto zur Überprüfung aussteht
-        reblog: E-Mail senden, wenn jemand meinen Beitrag teilt
-        report: E-Mail senden, wenn ein neuer Bericht vorliegt
-        trending_tag: E-Mail senden, wenn ein ausstehender Hashtag angesagt ist
+        appeal: wenn jemand einer Moderationsentscheidung widerspricht
+        digest: Zusammenfassung senden
+        favourite: wenn jemand meinen Beitrag favorisiert
+        follow: wenn mir jemand folgt
+        follow_request: wenn mir jemand folgen möchte
+        mention: wenn mich jemand erwähnt
+        pending_account: wenn ein neues Konto überprüft werden muss
+        reblog: wenn jemand meinen Beitrag teilt
+        report: wenn eine neue Meldung vorliegt
+        trending_tag: wenn ein neuer Trend überprüft werden soll
       rule:
         text: Regel
       tag:
-        listable: Erlaube diesem Hashtag im Profilverzeichnis zu erscheinen
+        listable: Erlaube diesem Hashtag, im Profilverzeichnis zu erscheinen
         name: Hashtag
-        trendable: Erlaube es diesen Hashtag in den Trends erscheinen zu lassen
-        usable: Beiträge erlauben, diesen Hashtag zu verwenden
+        trendable: Erlaube es, diesen Hashtag in den Trends erscheinen zu lassen
+        usable: Beiträgen erlauben, diesen Hashtag zu verwenden
+      user:
+        role: Rolle
+      user_role:
+        color: Badge-Farbe
+        highlighted: Rolle als Badge im Profil anzeigen
+        name: Name
+        permissions_as_keys: Berechtigungen
+        position: Priorität
+      webhook:
+        events: Aktivierte Ereignisse
+        url: Endpunkt-URL
     'no': Nein
+    not_recommended: Nicht empfohlen
     recommended: Empfohlen
     required:
       mark: "*"
       text: Pflichtfeld
     title:
       sessions:
-        webauthn: Verwende einer deiner Sicherheitsschlüssel zum Anmelden
+        webauthn: Verwende einen deiner Sicherheitsschlüssel zum Anmelden
     'yes': Ja
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 375bf6527..7e10bc728 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -35,7 +35,6 @@ el:
         current_password: Για λόγους ασφαλείας παρακαλώ γράψε τον κωδικό του τρέχοντος λογαριασμού
         current_username: Για επιβεβαίωση, παρακαλώ γράψε το όνομα χρήστη του τρέχοντος λογαριασμού
         digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
-        discoverable: Ο κατάλογος λογαριασμών είναι ένας ακόμα τρόπος ώστε ο λογαριασμός σου να βρει μεγαλύτερο κοινό
         email: Θα σου σταλεί email επιβεβαίωσης
         fields: Μπορείς να έχεις έως 4 σημειώσεις σε μορφή πίνακα στο προφίλ σου
         header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
@@ -47,6 +46,7 @@ el:
         phrase: Θα ταιριάζει ανεξαρτήτως πεζών/κεφαλαίων ή προειδοποίησης περιεχομένου του τουτ
         scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και εξειδικευμένα.
         setting_aggregate_reblogs: Απόκρυψη των νέων προωθήσεωνγια τα τουτ που έχουν προωθηθεί πρόσφατα (επηρεάζει μόνο τις νέες προωθήσεις)
+        setting_always_send_emails: Κανονικά οι ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου δεν θα αποστέλλονται όταν χρησιμοποιείτε ενεργά το Mastodon
         setting_default_sensitive: Τα ευαίσθητα πολυμέσα είναι κρυμμένα και εμφανίζονται με ένα κλικ
         setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων
         setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων
@@ -61,10 +61,9 @@ el:
       domain_allow:
         domain: Ο τομέας αυτός θα επιτρέπεται να ανακτά δεδομένα από αυτό τον διακομιστή και τα εισερχόμενα δεδομένα θα επεξεργάζονται και θα αποθηκεύονται
       email_domain_block:
-        domain: Αυτό μπορεί να είναι το όνομα του τομέα που εμφανίζεται στη διεύθυνση email, στην εγγραφή MX στην οποία δείχνει ο τομέας ή την διεύθυνση IP του σέρβερ που δείχνει η εγγραφή MX. Αυτά θα ελεγχθούν κατά την εγγραφή του χρήστη και η εγγραφή θα απορριφθεί αναλόγως.
         with_dns_records: Θα γίνει απόπειρα ανάλυσης των εγγραφών DNS του τομέα και τα αποτελέσματα θα μπουν και αυτά σε μαύρη λίστα
       featured_tag:
-        name: 'Ίσως να θες να χρησιμοποιήσεις μια από αυτές:'
+        name: 'Εδώ είναι μερικά από τα hashtags που χρησιμοποιήσατε περισσότερο πρόσφατα:'
       form_challenge:
         current_password: Μπαίνεις σε ασφαλή περιοχή
       imports:
@@ -77,6 +76,7 @@ el:
         ip: Εισάγετε μια διεύθυνση IPv4 ή IPv6. Μπορείτε να αποκλείσετε ολόκληρο το εύρος χρησιμοποιώντας τη σύνταξη CIDR. Προσέξτε να μην κλειδώσετε τον εαυτό σας!
         severities:
           no_access: Αποκλεισμός πρόσβασης σε όλους τους πόρους
+          sign_up_block: Νέες εγγραφές δεν θα είναι δυνατές
           sign_up_requires_approval: Νέες εγγραφές θα απαιτούν την έγκριση σας
         severity: Επιλέξτε τι θα γίνεται με αιτήσεις από αυτήν την διεύθυνση IP
       rule:
@@ -147,6 +147,7 @@ el:
         phrase: Λέξη ή φράση κλειδί
         setting_advanced_layout: Ενεργοποίηση προηγμένης λειτουργίας χρήσης
         setting_aggregate_reblogs: Ομαδοποίηση προωθήσεων στις ροές
+        setting_always_send_emails: Πάντα να αποστέλλονται ειδοποίησεις μέσω email
         setting_auto_play_gif: Αυτόματη αναπαραγωγή των GIF
         setting_boost_modal: Επιβεβαίωση πριν την προώθηση
         setting_crop_images: Περιορισμός των εικόνων σε μη-ανεπτυγμένα τουτ σε αναλογία 16x9
@@ -172,6 +173,7 @@ el:
         setting_use_pending_items: Αργή λειτουργία
         severity: Αυστηρότητα
         sign_in_token_attempt: Κωδικός ασφαλείας
+        title: Τίτλος
         type: Τύπος εισαγωγής
         username: Όνομα χρηστη
         username_or_email: Όνομα ή διεύθυνση email χρήστη
@@ -180,6 +182,15 @@ el:
         with_dns_records: Συμπερίληψη εγγραφών MX και διευθύνσεων IP του τομέα
       featured_tag:
         name: Ετικέτα
+      filters:
+        actions:
+          hide: Πλήρης απόκρυψη
+          warn: Απόκρυψη με προειδοποίηση
+      form_admin_settings:
+        custom_css: Προσαρμοσμένο CSS
+        registrations_mode: Ποιος μπορεί να εγγραφεί
+        site_contact_email: E-mail επικοινωνίας
+        site_contact_username: Όνομα χρήστη επικοινωνίας
       interactions:
         must_be_follower: Μπλόκαρε τις ειδοποιήσεις από όσους δεν σε ακολουθούν
         must_be_following: Μπλόκαρε τις ειδοποιήσεις από όσους δεν ακολουθείς
@@ -193,6 +204,7 @@ el:
         ip: Διεύθυνση IP
         severities:
           no_access: Αποκλεισμός πρόσβασης
+          sign_up_block: Αποκλεισμός εγγραφών
           sign_up_requires_approval: Περιορισμός εγγραφών
         severity: Κανόνας
       notification_emails:
@@ -203,8 +215,6 @@ el:
         mention: Αποστολή email όταν κάποιος σε αναφέρει
         pending_account: Αποστολή email όταν υπάρχει νέος λογαριασμός για επιθεώρηση
         reblog: Αποστολή email όταν κάποιος προωθεί τη δημοσίευση σου
-        report: Αποστολή email όταν υποβάλλεται νέα καταγγελία
-        trending_tag: Αποστολή email όταν μια μη-εγκεκριμένη ετικέτα γίνεται δημοφιλής
       rule:
         text: Κανόνας
       tag:
@@ -212,6 +222,8 @@ el:
         name: Ετικέτα
         trendable: Εμφάνιση της ετικέτας στις τάσεις
         usable: Χρήση της ετικέτας σε τουτ
+      user:
+        role: Ρόλος
     'no': Όχι
     recommended: Προτείνεται
     required:
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
new file mode 100644
index 000000000..89e78c9b0
--- /dev/null
+++ b/config/locales/simple_form.en-GB.yml
@@ -0,0 +1,46 @@
+---
+en-GB:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Specify the username@domain of the account you want to move from
+      account_migration:
+        acct: Specify the username@domain of the account you want to move to
+      account_warning_preset:
+        text: You can use post syntax, such as URLs, hashtags and mentions
+        title: Optional. Not visible to the recipient
+      admin_account_action:
+        include_statuses: The user will see which posts have caused the moderation action or warning
+        send_email_notification: The user will receive an explanation of what happened with their account
+        text_html: Optional. You can use post syntax. You can <a href="%{path}">add warning presets</a> to save time
+        type_html: Choose what to do with <strong>%{acct}</strong>
+        types:
+          disable: Prevent the user from using their account, but do not delete or hide their contents.
+          none: Use this to send a warning to the user, without triggering any other action.
+          sensitive: Force all this user's media attachments to be flagged as sensitive.
+          silence: Prevent the user from being able to post with public visibility, hide their posts and notifications from people not following them.
+          suspend: Prevent any interaction from or to this account and delete its contents. Revertible within 30 days.
+        warning_preset_id: Optional. You can still add custom text to end of the preset
+      announcement:
+        all_day: When checked, only the dates of the time range will be displayed
+        ends_at: Optional. Announcement will be automatically unpublished at this time
+        scheduled_at: Leave blank to publish the announcement immediately
+        starts_at: Optional. In case your announcement is bound to a specific time range
+        text: You can use post syntax. Please be mindful of the space the announcement will take up on the user's screen
+      appeal:
+        text: You can only appeal a strike once
+      defaults:
+        autofollow: People who sign up through the invite will automatically follow you
+        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        bot: Signal to others that the account mainly performs automated actions and might not be monitored
+        context: One or multiple contexts where the filter should apply
+    labels:
+      notification_emails:
+        follow_request: Someone requested to follow you
+        mention: Someone mentioned you
+        pending_account: New account needs review
+        reblog: Someone boosted your post
+        report: New report is submitted
+        trending_tag: New trend requires review
+      rule:
+        text: Rule
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index d6376782d..6edf7b4e9 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -27,6 +27,8 @@ en:
         scheduled_at: Leave blank to publish the announcement immediately
         starts_at: Optional. In case your announcement is bound to a specific time range
         text: You can use post syntax. Please be mindful of the space the announcement will take up on the user's screen
+      appeal:
+        text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
         avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
@@ -35,8 +37,7 @@ en:
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
-        discoverable: Allow your account to be discovered by strangers through recommendations, profile directory and other features
-        discoverable_no_directory: Allow your account to be discovered by strangers through recommendations and other features
+        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
         email: You will be sent a confirmation e-mail
         fields: You can have up to 4 items displayed as a table on your profile
         header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
@@ -48,6 +49,7 @@ en:
         phrase: Will be matched regardless of casing in text or content warning of a post
         scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
         setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts)
+        setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
@@ -62,10 +64,36 @@ en:
       domain_allow:
         domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored
       email_domain_block:
-        domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
+        domain: This can be the domain name that shows up in the e-mail address or the MX record it uses. They will be checked upon sign-up.
         with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked
       featured_tag:
-        name: 'You might want to use one of these:'
+        name: 'Here are some of the hashtags you used the most recently:'
+      filters:
+        action: Chose which action to perform when a post matches the filter
+        actions:
+          hide: Completely hide the filtered content, behaving as if it did not exist
+          warn: Hide the filtered content behind a warning mentioning the filter's title
+      form_admin_settings:
+        backups_retention_period: Keep generated user archives for the specified number of days.
+        bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
+        closed_registrations_message: Displayed when sign-ups are closed
+        content_cache_retention_period: Posts from other servers will be deleted after the specified number of days when set to a positive value. This may be irreversible.
+        custom_css: You can apply custom styles on the web version of Mastodon.
+        mascot: Overrides the illustration in the advanced web interface.
+        media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
+        profile_directory: The profile directory lists all users who have opted-in to be discoverable.
+        require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
+        site_contact_email: How people can reach you for legal or support inquiries.
+        site_contact_username: How people can reach you on Mastodon.
+        site_extended_description: Any additional information that may be useful to visitors and your users. Can be structured with Markdown syntax.
+        site_short_description: A short description to help uniquely identify your server. Who is running it, who is it for?
+        site_terms: Use your own privacy policy or leave blank to use the default. Can be structured with Markdown syntax.
+        site_title: How people may refer to your server besides its domain name.
+        theme: Theme that logged out visitors and new users see.
+        thumbnail: A roughly 2:1 image displayed alongside your server information.
+        timeline_preview: Logged out visitors will be able to browse the most recent public posts available on the server.
+        trendable_by_default: Skip manual review of trending content. Individual items can still be removed from trends after the fact.
+        trends: Trends show which posts, hashtags and news stories are gaining traction on your server.
       form_challenge:
         current_password: You are entering a secure area
       imports:
@@ -78,6 +106,7 @@ en:
         ip: Enter an IPv4 or IPv6 address. You can block entire ranges using the CIDR syntax. Be careful not to lock yourself out!
         severities:
           no_access: Block access to all resources
+          sign_up_block: New sign-ups will not be possible
           sign_up_requires_approval: New sign-ups will require your approval
         severity: Choose what will happen with requests from this IP
       rule:
@@ -89,6 +118,16 @@ en:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
+        role: The role controls which permissions the user has
+      user_role:
+        color: Color to be used for the role throughout the UI, as RGB in hex format
+        highlighted: This makes the role publicly visible
+        name: Public name of the role, if role is set to be displayed as a badge
+        permissions_as_keys: Users with this role will have access to...
+        position: Higher role decides conflict resolution in certain situations. Certain actions can only be performed on roles with a lower priority
+      webhook:
+        events: Select events to send
+        url: Where events will be sent to
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ en:
         scheduled_at: Schedule publication
         starts_at: Start of event
         text: Announcement
+      appeal:
+        text: Explain why this decision should be reversed
       defaults:
         autofollow: Invite to follow your account
         avatar: Avatar
@@ -148,6 +189,7 @@ en:
         phrase: Keyword or phrase
         setting_advanced_layout: Enable advanced web interface
         setting_aggregate_reblogs: Group boosts in timelines
+        setting_always_send_emails: Always send e-mail notifications
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_crop_images: Crop images in non-expanded posts to 16x9
@@ -173,6 +215,7 @@ en:
         setting_use_pending_items: Slow mode
         severity: Severity
         sign_in_token_attempt: Security code
+        title: Title
         type: Import type
         username: Username
         username_or_email: Username or Email
@@ -181,6 +224,34 @@ en:
         with_dns_records: Include MX records and IPs of the domain
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Hide completely
+          warn: Hide with a warning
+      form_admin_settings:
+        backups_retention_period: User archive retention period
+        bootstrap_timeline_accounts: Always recommend these accounts to new users
+        closed_registrations_message: Custom message when sign-ups are not available
+        content_cache_retention_period: Content cache retention period
+        custom_css: Custom CSS
+        mascot: Custom mascot (legacy)
+        media_cache_retention_period: Media cache retention period
+        profile_directory: Enable profile directory
+        registrations_mode: Who can sign-up
+        require_invite_text: Require a reason to join
+        show_domain_blocks: Show domain blocks
+        show_domain_blocks_rationale: Show why domains were blocked
+        site_contact_email: Contact e-mail
+        site_contact_username: Contact username
+        site_extended_description: Extended description
+        site_short_description: Server description
+        site_terms: Privacy Policy
+        site_title: Server name
+        theme: Default theme
+        thumbnail: Server thumbnail
+        timeline_preview: Allow unauthenticated access to public timelines
+        trendable_by_default: Allow trends without prior review
+        trends: Enable trends
       interactions:
         must_be_follower: Block notifications from non-followers
         must_be_following: Block notifications from people you don't follow
@@ -194,9 +265,11 @@ en:
         ip: IP
         severities:
           no_access: Block access
+          sign_up_block: Block sign-ups
           sign_up_requires_approval: Limit sign-ups
         severity: Rule
       notification_emails:
+        appeal: Someone appeals a moderator decision
         digest: Send digest e-mails
         favourite: Someone favourited your post
         follow: Someone followed you
@@ -204,8 +277,8 @@ en:
         mention: Someone mentioned you
         pending_account: New account needs review
         reblog: Someone boosted your post
-        report: A new report is submitted
-        trending_tag: A new trend requires approval
+        report: New report is submitted
+        trending_tag: New trend requires review
       rule:
         text: Rule
       tag:
@@ -213,7 +286,19 @@ en:
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
         usable: Allow posts to use this hashtag
+      user:
+        role: Role
+      user_role:
+        color: Badge color
+        highlighted: Display role as badge on user profiles
+        name: Name
+        permissions_as_keys: Permissions
+        position: Priority
+      webhook:
+        events: Enabled events
+        url: Endpoint URL
     'no': 'No'
+    not_recommended: Not recommended
     recommended: Recommended
     required:
       mark: "*"
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index b00cc46f1..148479d9d 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -2,16 +2,33 @@
 eo:
   simple_form:
     hints:
+      account_alias:
+        acct: Specifu la uzantnomon@domajnon de la konto el kiu vi volas translokiĝi
+      account_migration:
+        acct: Specifu la uzantnomon@domajnon de la konto al kiu vi volas translokiĝi
       account_warning_preset:
-        text: Vi povas uzi skribmanierojn de mesaĝoj, kiel URL-ojn, kradvortojn kaj menciojn
+        text: Vi povas uzi skribmanierojn de afiŝoj, kiel URL-ojn, kradvortojn kaj menciojn
+        title: Laŭvola. Ne videbla por la ricevanto
       admin_account_action:
+        include_statuses: La uzanto vidos, kiujn afiŝojn kaŭzis la agon de moderigo aŭ de averto
         send_email_notification: La uzanto ricevos klarigon pri tio, kio okazis al ties konto
-        text_html: Malnepra. Vi povas uzi skribmanierojn de mesaĝoj. Vi povas <a href="%{path}">aldoni avertajn antaŭagordojn</a> por ŝpari tempon
+        text_html: Malnepra. Vi povas uzi sintaksojn de afiŝoj. Vi povas <a href="%{path}">aldoni avertajn antaŭagordojn</a> por ŝpari tempon
         type_html: Elektu kion fari kun <strong>%{acct}</strong>
         types:
+          disable: Malhelpi la uzanton uzi sian konton, sed ne forigi aŭ kaŝi ties enhavojn.
           none: Uzu ĉi tion por sendi averton al la uzanto, sen ekigi alian agon.
+          sensitive: Devigi ĉiujn da plurmediaj aldonaĵoj esti markitaj kiel sentemaj.
+          silence: Malhelpi la uzanton povu afiŝi per publika videbleco, kaŝi ties afiŝojn kaj sciigojn de homoj kiuj ne sekvas rin.
           suspend: Malhelpu ajnan interagon de aŭ al ĉi tiu konto kaj forigu ĝian enhavon. Returnebla ene de 30 tagoj.
         warning_preset_id: Malnepra. Vi povas ankoraŭ aldoni propran tekston al la fino de la antaŭagordo
+      announcement:
+        all_day: Kiam markita, nur la datoj de la tempointervalo estos montrataj
+        ends_at: Laŭvola. La anonco estos aŭtomate maleldonita ĉi tiam
+        scheduled_at: Lasi malplena por eldoni la anoncon tuj
+        starts_at: Laŭvola. Se via anonco estas ligita al specifa tempo
+        text: Vi povas uzi la sintakso de afiŝoj. Bonvolu zorgi pri la spaco, kiun la anonco okupos sur la ekrano de la uzanto
+      appeal:
+        text: Oni povas apelaci strikin nur unufoje
       defaults:
         autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin
         avatar: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
@@ -20,30 +37,63 @@ eo:
         current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
         current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
-        discoverable: Montru ĉi tiun profilon en la profilujon por ke la konto estos pli-vaste vidata
-        email: Vi ricevos konfirman retmesaĝon
+        discoverable: Permesi vian konton esti malkovrita de fremduloj per rekomendoj, tendencoj kaj aliaj funkcioj
+        email: Vi ricevos konfirman retpoŝton
         fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo
         header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
-        irreversible: Elfiltritaj mesaĝoj malaperos por ĉiam, eĉ se la filtrilo estas poste forigita
-        locale: La lingvo de la uzant-interfaco, retmesaĝoj kaj puŝ-sciigoj
+        irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
+        locale: La lingvo de la fasado, retpoŝtaĵoj, kaj sciigoj
         locked: Vi devos aprobi ĉiun peton de sekvado mane
         password: Uzu almenaŭ 8 signojn
         phrase: Estos provita senzorge pri la uskleco de teksto aŭ averto pri enhavo de mesaĝo
         scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
-        setting_aggregate_reblogs: Ne montri novajn diskonigojn de mesaĝoj laste diskonigitaj (nur efikas al novaj diskonigoj)
-        setting_default_sensitive: Tiklaj aŭdovidaĵoj estas defaŭlte kaŝita kaj povas esti malkiŝita per klako
-        setting_display_media_default: Kaŝi aŭdovidaĵojn markitajn kiel tiklaj
-        setting_display_media_hide_all: Ĉiam kaŝi ĉiujn aŭdovidaĵojn
-        setting_display_media_show_all: Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj
-        setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo
-        setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn
-        setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj mesaĝoj
+        setting_aggregate_reblogs: Ne montri novajn plusendojn de mesaĝoj lastatempe plusenditaj (nur efikas al nove ricevitaj plusendoj)
+        setting_always_send_emails: Normale, la sciigoj per retpoŝto ne estos senditaj kiam vi uzas Mastodon aktive
+        setting_default_sensitive: La tiklaj aŭdovidaĵoj estas kaŝitaj implicite, kaj povas esti montritaj per klako
+        setting_display_media_default: Kaŝi aŭdovidaĵojn markitajn kiel tikla
+        setting_display_media_hide_all: Ĉiam kaŝi la aŭdovidaĵojn
+        setting_display_media_show_all: Ĉiam montri la aŭdovidaĵojn
+        setting_hide_network: Tiuj kiujn vi sekvas, kaj tiuj kiuj sekvas vin estos kaŝitaj en via profilo
+        setting_noindex: Influas vian publikan profilon kaj afiŝajn paĝojn
+        setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj afiŝoj
         setting_use_blurhash: Transirojn estas bazita sur la koloroj de la kaŝitaj aŭdovidaĵoj sed ne montri iun ajn detalon
-        username: Via uzantnomo estos unika ĉe %{domain}
+        setting_use_pending_items: Kaŝi tempoliniajn ĝisdatigojn malantaŭ klako anstataŭ aŭtomate rulumi la fluon
+        username: Via uzantnomo estos unika en %{domain}
         whole_word: Kiam la vorto aŭ frazo estas nur litera aŭ cifera, ĝi estos uzata nur se ĝi kongruas kun la tuta vorto
+      domain_allow:
+        domain: Ĉi tiu domajno povos akiri datumon de ĉi tiu servilo kaj envenanta datumo estos prilaborita kaj konservita
+      email_domain_block:
+        domain: Ĉi tio povas esti la domajnnomo kiu montritas en la retadreso au la MX-rekordo uzitas.
+        with_dns_records: Provi de regajni DNS-rekordojn de la domajn farotas kaj la rezultaj ankorau blokitas
       featured_tag:
-        name: 'Vi povus uzi iun el la jenaj:'
+        name: 'Jen kelkaj el la kradvortoj, kiujn vi uzis lastatempe:'
+      filters:
+        action: Elekti ago kiam mesaĝo kongruas la filtrilon
+        actions:
+          hide: Tute kaŝigi la filtritajn enhavojn, kvazau ĝi ne ekzistis
+          warn: Kaŝi la enhavon filtritan malantaŭ averto mencianta la nomon de la filtro
+      form_admin_settings:
+        backups_retention_period: Konservi generitajn uzantoarkivojn por la kvanto de tagoj.
+        bootstrap_timeline_accounts: Ĉi tiuj kontoj pinglitas al la supro de sekvorekomendoj de novaj uzantoj.
+        closed_registrations_message: Montrita kiam registroj fermitas
+        content_cache_retention_period: Mesaĝoj de aliaj serviloj forigitas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
+        custom_css: Vi povas meti propajn stilojn en la retversio de Mastodon.
+        mascot: Anstatauigi la ilustraĵon en la altnivela retinterfaco.
+        media_cache_retention_period: Elŝutitaj audovidaĵojn forigotas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
+        profile_directory: La profilujo listigas ĉiujn uzantojn kiu volonte malkovrebli.
+        require_invite_text: Kiam registroj bezonas permanan aprobon, igi la "Kial vi volas aliĝi?" tekstoenigon deviga anstau nedeviga
+        site_contact_email: Kiel personoj povas kontakti vin por juraj au subtenaj demandoj.
+        site_contact_username: Kial personoj povas kontakti vin ĉe Mastodon.
+        site_extended_description: Ajn aldonaj informo kiu eble estas utila al vizitantoj kaj via uzantoj.
+        site_short_description: Mallonga priskribo por helpi unike identigi vian servilon. Kiu faras, por kiu?
+        site_terms: Uzu vian sian privatecan politekon au ignoru por uzi la defaulton.
+        site_title: Kiel personoj voki vian servilon anstatau ĝia domajnnomo.
+        theme: Etoso kiun elsalutitaj vizitantoj kaj novaj uzantoj vidas.
+        thumbnail: Ĉirkaua 2:1 bildo montritas kun via servilinformo.
+        timeline_preview: Elsalutitaj vizitantoj povos vidi la plej lastajn publikajn mesaĝojn disponeblaj en la servilo.
+        trendable_by_default: Ignori permanan kontrolon de tendenca enhavo.
+        trends: Tendencoj montras kiu mesaĝoj, kradvortoj kaj novaĵoj populariĝas en via servilo.
       form_challenge:
         current_password: Vi eniras sekuran areon
       imports:
@@ -51,12 +101,33 @@ eo:
       invite_request:
         text: Ĉi tio helpos nin revizii vian kandidatiĝon
       ip_block:
+        comment: Laŭvola. Memoru, kial vi aldonis ĉi tiun regulon.
+        expires_in: IP-adresoj estas finia rimedo, ili kelkfoje kunhavitis kaj ofte malsame poseditas.
+        ip: Enigu IPv4 au IPv6-adreso. Ne elseruru vian sian!
         severities:
-          sign_up_requires_approval: Novaj registriĝoj devigos vian aprobon
+          no_access: Bloki aliron al ĉiuj rimedoj
+          sign_up_block: Novaj registroj ne estos ebla
+          sign_up_requires_approval: Novaj registriĝoj bezonos vian aprobon
+        severity: Elektu, kio okazos pri petoj de ĉi tiu IP-adreso
+      rule:
+        text: Priskribu regulon aŭ neceson por uzantoj en ĉi tiu servilo. Provu fari ĝin mallonga kaj simpla
       sessions:
         otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:'
+        webauthn: Se ĝi estas USB-ŝlosilo, certu enmeti ĝin kaj, se necese, frapi ĝin.
+      tag:
+        name: Vi povas ŝanĝi nur la majuskladon de la literoj, ekzemple, por igi ĝin pli legebla
       user:
-        chosen_languages: Kiam estas elekto, nur mesaĝoj en elektitaj lingvoj aperos en publikaj templinioj
+        chosen_languages: Kun tio markita nur mesaĝoj en elektitaj lingvoj aperos en publikaj tempolinioj
+        role: La rolregiloj kies permesojn la uzanto havas
+      user_role:
+        color: Koloro uzita por la rolo sur la UI, kun RGB-formato
+        highlighted: Ĉi tio igi la rolon publike videbla
+        name: Publika nomo de la rolo, se rolo fiksitas montritis kiel insigno
+        permissions_as_keys: Uzantoj kun ĉi tiu rolo gajnos aliro al...
+        position: Pli altaj rolo decidas konfliktosolvo en kelkaj situacioj
+      webhook:
+        events: Elektu eventojn por sendi
+        url: Kien eventoj sendotas
     labels:
       account:
         fields:
@@ -70,6 +141,7 @@ eo:
         text: Antaŭagordita teksto
         title: Titolo
       admin_account_action:
+        include_statuses: Inkluzivi raportitajn afiŝojn en la retpoŝto
         send_email_notification: Sciigi la uzanton retpoŝte
         text: Propra averto
         type: Ago
@@ -78,7 +150,7 @@ eo:
           none: Fari nenion
           sensitive: Tikla
           silence: Silentigi
-          suspend: Haltigi kaj nemalfereble forigi kontajn datumojn
+          suspend: Suspendi
         warning_preset_id: Uzi antaŭagorditan averton
       announcement:
         all_day: Ĉiutaga evento
@@ -86,9 +158,11 @@ eo:
         scheduled_at: Plani publikigo
         starts_at: Komenco de evento
         text: Anonco
+      appeal:
+        text: Klarigu kial ĉi tiu decido devas inversigitis
       defaults:
         autofollow: Inviti al sekvi vian konton
-        avatar: Profilbildo
+        avatar: Rolfiguro
         bot: Tio estas robota konto
         chosen_languages: Filtri lingvojn
         confirm_new_password: Konfirmi novan pasvorton
@@ -105,46 +179,79 @@ eo:
         honeypot: "%{label} (ne plenigi)"
         inbox_url: URL de la ripetila enirkesto
         irreversible: Forĵeti anstataŭ kaŝi
-        locale: Interfaca lingvo
+        locale: Lingvo de la fasado
         locked: Ŝlosi konton
         max_uses: Maksimuma nombro de uzoj
         new_password: Nova pasvorto
         note: Sinprezento
         otp_attempt: Kodo de dufaktora aŭtentigo
         password: Pasvorto
-        phrase: Vorto aŭ frazo
+        phrase: Ĉefvorto aŭ frazo
         setting_advanced_layout: Ebligi altnivelan retpaĝan interfacon
         setting_aggregate_reblogs: Grupigi diskonigojn en templinioj
+        setting_always_send_emails: Ĉiam sendi la sciigojn per retpoŝto
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
         setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon
         setting_crop_images: Stuci bildojn en negrandigitaj mesaĝoj al 16x9
         setting_default_language: Publikada lingvo
-        setting_default_privacy: Mesaĝa videbleco
+        setting_default_privacy: Privateco de afiŝado
         setting_default_sensitive: Ĉiam marki aŭdovidaĵojn tiklaj
         setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
+        setting_disable_swiping: Malebligi svingajn movojn
         setting_display_media: Aŭdovidaĵa montrado
-        setting_display_media_default: Dekomenca
+        setting_display_media_default: Implicita
         setting_display_media_hide_all: Kaŝi ĉiujn
         setting_display_media_show_all: Montri ĉiujn
         setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
         setting_noindex: Ellistiĝi de retserĉila indeksado
-        setting_reduce_motion: Malrapidigi animaciojn
+        setting_reduce_motion: Redukti la movecojn de la animacioj
         setting_show_application: Publikigi la aplikaĵon uzatan por sendi mesaĝojn
         setting_system_font_ui: Uzi la dekomencan tiparon de la sistemo
-        setting_theme: Reteja etoso
+        setting_theme: Etoso de la retejo
         setting_trends: Montri hodiaŭajn furoraĵojn
         setting_unfollow_modal: Montri konfirman fenestron antaŭ ol ĉesi sekvi iun
         setting_use_blurhash: Montri buntajn transirojn por kaŝitaj aŭdovidaĵoj
-        setting_use_pending_items: Malrapida reĝimo
+        setting_use_pending_items: Malrapida modo
         severity: Graveco
         sign_in_token_attempt: Sekureca kodo
+        title: Titolo
         type: Importa tipo
         username: Uzantnomo
         username_or_email: Uzantnomo aŭ Retadreso
         whole_word: Tuta vorto
+      email_domain_block:
+        with_dns_records: Inkluzu MX-rekordojn kaj IP de la domajno
       featured_tag:
         name: Kradvorto
+      filters:
+        actions:
+          hide: Kaŝi komplete
+          warn: Kaŝi malantaŭ averto
+      form_admin_settings:
+        backups_retention_period: Uzantoarkivretendauro
+        bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
+        closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
+        content_cache_retention_period: Enhavkaŝaĵretendauro
+        custom_css: Propa CSS
+        mascot: Propa maskoto
+        media_cache_retention_period: Audovidaĵkaŝaĵretendauro
+        profile_directory: Ebligi la profilujon
+        registrations_mode: Kiu povas krei konton
+        require_invite_text: Bezoni kialon por aliĝi
+        show_domain_blocks: Montri domajnblokojn
+        show_domain_blocks_rationale: Montri kial domajnoj estis blokitaj
+        site_contact_email: Kontaktoretadreso
+        site_contact_username: Kontaktouzantonomo
+        site_extended_description: Longa priskribo
+        site_short_description: Priskribo de servilo
+        site_terms: Privateca politiko
+        site_title: Nomo de la servilo
+        theme: Implicita etoso
+        thumbnail: Bildeto de servilo
+        timeline_preview: Permesi la neaŭtentigitan aliron al la publikaj templinioj
+        trendable_by_default: Permesi tendencojn sen deviga kontrolo
+        trends: Ŝalti furorojn
       interactions:
         must_be_follower: Bloki sciigojn de nesekvantoj
         must_be_following: Bloki sciigojn de homoj, kiujn vi ne sekvas
@@ -158,9 +265,11 @@ eo:
         ip: IP
         severities:
           no_access: Bloki atingon
+          sign_up_block: Malpermesi registrojn
           sign_up_requires_approval: Limigi registriĝojn
         severity: Regulo
       notification_emails:
+        appeal: Iu apelacias moderigantodecidon
         digest: Sendi resumajn retmesaĝojn
         favourite: Sendi retmesaĝon kiam iu stelumas vian mesaĝon
         follow: Sendi retmesaĝon kiam iu sekvas vin
@@ -168,15 +277,28 @@ eo:
         mention: Sendi retmesaĝon kiam iu mencias vin
         pending_account: Sendi retmesaĝon kiam nova konto bezonas kontrolon
         reblog: Sendi retmesaĝon kiam iu diskonigas vian mesaĝon
-        report: Nova signalo estas sendita
-        trending_tag: Nekontrolita kradvorto furoras
+        report: Nova raporto estas proponita
+        trending_tag: Nova furoro bezonas kontrolon
       rule:
         text: Regulo
       tag:
+        listable: Permesi ĉi tiun kradvorton aperi en serĉoj kaj sugestoj
         name: Kradvorto
         trendable: Permesi al ĉi tiu kradvorto aperi en furoraĵoj
         usable: Permesi mesaĝojn uzi ĉi tiun kradvorton
+      user:
+        role: Rolo
+      user_role:
+        color: Koloro de ŝildo
+        highlighted: Montri rolon kiel insignon sur uzantoprofiloj
+        name: Nomo
+        permissions_as_keys: Permesoj
+        position: Prioritato
+      webhook:
+        events: Ŝaltitaj eventoj
+        url: Finpunkto-URL
     'no': Ne
+    not_recommended: Nerekomendita
     recommended: Rekomendita
     required:
       mark: "*"
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index bd6dbf98b..8ea4dc520 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -27,19 +27,20 @@ es-AR:
         scheduled_at: Dejar en blanco para publicar el anuncio inmediatamente
         starts_at: Opcional. En caso de que tu anuncio esté vinculado a un rango de tiempo específico
         text: Podés usar sintaxis de mensajes. Por favor, tené en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
+      appeal:
+        text: Sólo podés apelar un incumplimiento una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles'
+        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
         current_username: Para confirmar, por favor, ingresá el nombre de usuario de la cuenta actual
         digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
-        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones y otras funciones
-        discoverable_no_directory: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones y otras funciones
+        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras funciones
         email: Se te enviará un correo electrónico de confirmación
         fields: Podés tener hasta 4 elementos mostrados en una tabla en tu perfil
-        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles'
+        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
         inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
         irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
         locale: El idioma de la interface de usuario, correos electrónicos y notificaciones push
@@ -48,6 +49,7 @@ es-AR:
         phrase: Se aplicará sin importar las mayúsculas o las advertencias de contenido de un mensaje
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionás el alcance de nivel más alto, no necesitás seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevas adhesiones de los mensajes que fueron recientemente adheridos (sólo afecta a las adhesiones recibidas recientemente)
+        setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
         setting_default_sensitive: El contenido de medios sensibles está oculto predeterminadamente y puede ser mostrado con un clic
         setting_display_media_default: Ocultar medios marcados como sensibles
         setting_display_media_hide_all: Siempre ocultar todos los medios
@@ -62,10 +64,36 @@ es-AR:
       domain_allow:
         domain: Este dominio podrá recolectar datos de este servidor, y los datos entrantes serán procesados y archivados
       email_domain_block:
-        domain: Puede ser el nombre de dominio que aparece en la dirección de correo electrónico, el registro MX hacia el cual resuelve el dominio, o la dirección IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del registro del usuario, y el registro será rechazado.
+        domain: Este puede ser el nombre de dominio que aparece en la dirección de correo electrónico o el registro MX que se use. Se revisarán al registrarse.
         with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también bloqueados
       featured_tag:
-        name: 'Puede que quieras usar una de estas:'
+        name: 'Acá tenés algunas de las etiquetas que más usaste recientemente:'
+      filters:
+        action: Elegir qué acción realizar cuando un mensaje coincide con el filtro
+        actions:
+          hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
+          warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
+      form_admin_settings:
+        backups_retention_period: Conservar los archivos historiales generados por el usuario durante el número de días especificado.
+        bootstrap_timeline_accounts: Estas cuentas serán fijadas a la parte superior de las recomendaciones de cuentas a seguir para nuevos usuarios.
+        closed_registrations_message: Mostrado cuando los registros están cerrados
+        content_cache_retention_period: Los mensajes de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon.
+        mascot: Reemplaza la ilustración en la interface web avanzada.
+        media_cache_retention_period: Los archivos de medios descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se volverán a descargar a pedido.
+        profile_directory: El directorio de perfiles lista a todos los usuarios que han optado a que su cuenta pueda ser descubierta.
+        require_invite_text: Cuando registros aprobación manual, hacé que la solicitud de invitación "¿Por qué querés unirte?" sea obligatoria, en vez de opcional
+        site_contact_email: Cómo la gente puede estar en contacto con vos para consultas legales o de ayuda.
+        site_contact_username: Cómo la gente puede estar en contacto con vos en Mastodon.
+        site_extended_description: Cualquier información adicional que pueda ser útil para los visitantes y tus usuarios. Se puede estructurar con sintaxis Markdown.
+        site_short_description: Una breve descripción para ayudar a identificar individualmente a tu servidor. ¿Quién lo administra, a quién va dirigido?
+        site_terms: Usá tu propia política de privacidad o dejala en blanco para usar la predeterminada. Puede estructurarse con sintaxis Markdown.
+        site_title: Cómo la gente puede referirse a tu servidor además de su nombre de dominio.
+        theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
+        thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
+        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
+        trendable_by_default: Omití la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
+        trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
       form_challenge:
         current_password: Estás ingresando en un área segura
       imports:
@@ -78,6 +106,7 @@ es-AR:
         ip: Ingresá una dirección IPv4 ó IPv6. Podés bloquear rangos completos usando la sintaxis CIDR. ¡Tené cuidado de no bloquearte vos mismo!
         severities:
           no_access: Bloquear acceso a todos los recursos
+          sign_up_block: Los nuevos registros se deshabilitarán
           sign_up_requires_approval: Los nuevos registros requerirán tu aprobación
         severity: Elegí lo que pasará con las solicitudes desde esta dirección IP
       rule:
@@ -89,6 +118,16 @@ es-AR:
         name: Sólo podés cambiar la capitalización de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando estén marcados, sólo se mostrarán los mensajes en los idiomas seleccionados en las líneas temporales públicas
+        role: El rol controla qué permisos tiene el usuario
+      user_role:
+        color: Color que se utilizará para el rol a lo largo de la interface de usuario, como RGB en formato hexadecimal
+        highlighted: Esto hace que el rol sea públicamente visible
+        name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
+        permissions_as_keys: Los usuarios con este rol tendrán acceso a…
+        position: Un rol más alto decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con prioridad inferior
+      webhook:
+        events: Seleccionar eventos para enviar
+        url: Adónde serán enviados los eventos
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ es-AR:
         scheduled_at: Programar publicación
         starts_at: Inicio del evento
         text: Anuncio
+      appeal:
+        text: Explicá por qué esta decisión debería ser revertida
       defaults:
         autofollow: Invitar para seguir tu cuenta
         avatar: Avatar
@@ -148,6 +189,7 @@ es-AR:
         phrase: Palabra clave o frase
         setting_advanced_layout: Habilitar interface web avanzada
         setting_aggregate_reblogs: Agrupar adhesiones en las líneas temporales
+        setting_always_send_emails: Siempre enviar notificaciones por correo electrónico
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar diálogo de confirmación antes de adherir
         setting_crop_images: Recortar imágenes en mensajes no expandidos a 16x9
@@ -173,6 +215,7 @@ es-AR:
         setting_use_pending_items: Modo lento
         severity: Severidad
         sign_in_token_attempt: Código de seguridad
+        title: Título
         type: Tipo de importación
         username: Nombre de usuario
         username_or_email: Nombre de usuario o correo electrónico
@@ -181,6 +224,34 @@ es-AR:
         with_dns_records: Incluir los registros MX y las direcciones IP del dominio
       featured_tag:
         name: Etiqueta
+      filters:
+        actions:
+          hide: Ocultar completamente
+          warn: Ocultar con una advertencia
+      form_admin_settings:
+        backups_retention_period: Período de retención del archivo historial del usuario
+        bootstrap_timeline_accounts: Siempre recomendar estas cuentas a usuarios nuevos
+        closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
+        content_cache_retention_period: Período de retención de la caché de contenido
+        custom_css: CSS personalizado
+        mascot: Mascota personalizada (legado)
+        media_cache_retention_period: Período de retención de la caché de medios
+        profile_directory: Habilitar directorio de perfiles
+        registrations_mode: Quién puede registrarse
+        require_invite_text: Requerir un motivo para unirse
+        show_domain_blocks: Mostrar dominios bloqueados
+        show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
+        site_contact_email: Dirección de correo electrónico de contacto
+        site_contact_username: Nombre de usuario de contacto
+        site_extended_description: Descripción extendida
+        site_short_description: Descripción del servidor
+        site_terms: Política de privacidad
+        site_title: Nombre del servidor
+        theme: Tema predeterminado
+        thumbnail: Miniatura del servidor
+        timeline_preview: Permitir el acceso no autenticado a las líneas temporales públicas
+        trendable_by_default: Permitir tendencias sin revisión previa
+        trends: Habilitar tendencias
       interactions:
         must_be_follower: Bloquear notificaciones de cuentas que no te siguen
         must_be_following: Bloquear notificaciones de cuentas que no seguís
@@ -194,9 +265,11 @@ es-AR:
         ip: Dirección IP
         severities:
           no_access: Bloquear acceso
+          sign_up_block: Bloquear registros
           sign_up_requires_approval: Limitar registros
         severity: Regla
       notification_emails:
+        appeal: Alguien apela una solicitud de moderador
         digest: Enviar correos electrónicos compilatorios
         favourite: Una cuenta marca tu mensaje como favorito
         follow: Una cuenta te sigue
@@ -204,8 +277,8 @@ es-AR:
         mention: Una cuenta te menciona
         pending_account: Una nueva cuenta necesita revisión
         reblog: Una cuenta adhiere a tu mensaje
-        report: Se envía una nueva denuncia
-        trending_tag: Una etiqueta no revisada está en tendencia
+        report: Se envió una nueva denuncia
+        trending_tag: Una nueva tendencia requiere revisión
       rule:
         text: Regla
       tag:
@@ -213,7 +286,19 @@ es-AR:
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a los mensajes usar esta etiqueta
+      user:
+        role: Rol
+      user_role:
+        color: Color de Insignia
+        highlighted: Mostrar rol como insignia en perfiles de usuario
+        name: Nombre
+        permissions_as_keys: Permisos
+        position: Prioridad
+      webhook:
+        events: Eventos habilitados
+        url: Dirección web del punto final
     'no': 'No'
+    not_recommended: No recomendado
     recommended: Opción recomendada
     required:
       mark: "*"
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index dc1bf65e6..b08403426 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -5,7 +5,7 @@ es-MX:
       account_alias:
         acct: Especifique el nombre de usuario@dominio de la cuenta desde la cual se desea migrar
       account_migration:
-        acct: Especifique el nombre de usuario@dominio de la cuenta a la cual se desea migrar
+        acct: Especifique el nombre de usuario@dominio de la cuenta a la cual desea migrar
       account_warning_preset:
         text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
         title: Opcional. No visible para el destinatario
@@ -27,6 +27,8 @@ es-MX:
         scheduled_at: Dejar en blanco para publicar el anuncio inmediatamente
         starts_at: Opcional. En caso de que su anuncio esté vinculado a un intervalo de tiempo específico
         text: Puedes usar la sintaxis toot. Por favor ten en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
+      appeal:
+        text: Sólo puede apelar una amonestación a la vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
         avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -35,7 +37,7 @@ es-MX:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: El directorio del perfil es otra forma en la que su cuenta puede llegar a un público más amplio
+        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -47,6 +49,7 @@ es-MX:
         phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de un toot
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevos retoots para los toots que han sido recientemente retooteados (sólo afecta a los retoots recibidos recientemente)
+        setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
         setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un click
         setting_display_media_default: Ocultar contenido multimedia marcado como sensible
         setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
@@ -61,10 +64,36 @@ es-MX:
       domain_allow:
         domain: Este dominio podrá obtener datos de este servidor y los datos entrantes serán procesados y archivados
       email_domain_block:
-        domain: Puede ser el nombre de dominio que aparece en la dirección de correo, el registro MX hacia el cual resuelve el dominio, o la IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del alta del usuario y el alta se rechazará.
+        domain: Este puede ser el nombre de dominio que se muestra en al dirección de correo o el registro MX que utiliza. Se comprobarán al registrarse.
         with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en lista negra
       featured_tag:
-        name: 'Puede que quieras usar uno de estos:'
+        name: 'Aquí están algunas de las etiquetas que más has utilizado recientemente:'
+      filters:
+        action: Elegir qué acción realizar cuando una publicación coincide con el filtro
+        actions:
+          hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
+          warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
+      form_admin_settings:
+        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
+        closed_registrations_message: Mostrado cuando los registros están cerrados
+        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        mascot: Reemplaza la ilustración en la interfaz web avanzada.
+        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
+        require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
+        site_contact_email: Cómo la gente puede ponerse en contacto contigo para consultas legales o de ayuda.
+        site_contact_username: Cómo puede contactarte la gente en Mastodon.
+        site_extended_description: Cualquier información adicional que pueda ser útil para los visitantes y sus usuarios. Se puede estructurar con formato Markdown.
+        site_short_description: Una breve descripción para ayudar a identificar su servidor de forma única. ¿Quién lo administra, a quién va dirigido?
+        site_terms: Utiliza tu propia política de privacidad o déjala en blanco para usar la predeterminada Puede estructurarse con formato Markdown.
+        site_title: Cómo puede referirse la gente a tu servidor además de por el nombre de dominio.
+        theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
+        thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
+        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
+        trendable_by_default: Omitir la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
+        trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
       form_challenge:
         current_password: Estás entrando en un área segura
       imports:
@@ -77,6 +106,7 @@ es-MX:
         ip: Introduzca una dirección IPv4 o IPv6. Puede bloquear rangos completos usando la sintaxis CIDR. ¡Tenga cuidado de no quedarse fuera!
         severities:
           no_access: Bloquear acceso a todos los recursos
+          sign_up_block: Los nuevos registros se deshabilitarán
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
@@ -88,6 +118,16 @@ es-MX:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
+        role: El rol controla qué permisos tiene el usuario
+      user_role:
+        color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
+        highlighted: Esto hace que el rol sea públicamente visible
+        name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
+        permissions_as_keys: Los usuarios con este rol tendrán acceso a...
+        position: Un rol superior decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con menor prioridad
+      webhook:
+        events: Seleccionar eventos para enviar
+        url: Donde los eventos serán enviados
     labels:
       account:
         fields:
@@ -118,6 +158,8 @@ es-MX:
         scheduled_at: Programar publicación
         starts_at: Comienzo del evento
         text: Anuncio
+      appeal:
+        text: Explica por qué esta decisión debe ser revertida
       defaults:
         autofollow: Invitar a seguir tu cuenta
         avatar: Foto de perfil
@@ -147,6 +189,7 @@ es-MX:
         phrase: Palabra clave o frase
         setting_advanced_layout: Habilitar interfaz web avanzada
         setting_aggregate_reblogs: Agrupar retoots en las líneas de tiempo
+        setting_always_send_emails: Enviar siempre notificaciones por correo
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar ventana de confirmación antes de un Retoot
         setting_crop_images: Recortar a 16x9 las imágenes de los toots no expandidos
@@ -172,6 +215,7 @@ es-MX:
         setting_use_pending_items: Modo lento
         severity: Severidad
         sign_in_token_attempt: Código de seguridad
+        title: Título
         type: Importar tipo
         username: Nombre de usuario
         username_or_email: Usuario o Email
@@ -180,6 +224,34 @@ es-MX:
         with_dns_records: Incluye los registros MX y las IP del dominio
       featured_tag:
         name: Etiqueta
+      filters:
+        actions:
+          hide: Ocultar completamente
+          warn: Ocultar con una advertencia
+      form_admin_settings:
+        backups_retention_period: Período de retención del archivo de usuario
+        bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
+        closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
+        content_cache_retention_period: Período de retención de caché de contenido
+        custom_css: CSS personalizado
+        mascot: Mascota personalizada (legado)
+        media_cache_retention_period: Período de retención de caché multimedia
+        profile_directory: Habilitar directorio de perfiles
+        registrations_mode: Quién puede registrarse
+        require_invite_text: Requerir una razón para unirse
+        show_domain_blocks: Mostrar dominios bloqueados
+        show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
+        site_contact_email: Dirección de correo electrónico de contacto
+        site_contact_username: Nombre de usuario de contacto
+        site_extended_description: Descripción extendida
+        site_short_description: Descripción del servidor
+        site_terms: Política de Privacidad
+        site_title: Nombre del servidor
+        theme: Tema por defecto
+        thumbnail: Miniatura del servidor
+        timeline_preview: Permitir el acceso no autenticado a las líneas de tiempo públicas
+        trendable_by_default: Permitir tendencias sin revisión previa
+        trends: Habilitar tendencias
       interactions:
         must_be_follower: Bloquear notificaciones de personas que no te siguen
         must_be_following: Bloquear notificaciones de personas que no sigues
@@ -193,9 +265,11 @@ es-MX:
         ip: IP
         severities:
           no_access: Bloquear acceso
+          sign_up_block: Bloquear registros
           sign_up_requires_approval: Limitar registros
         severity: Regla
       notification_emails:
+        appeal: Alguien ha apelado una decisión de moderación
         digest: Enviar resumen de correos electrónicos
         favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación
         follow: Enviar correo electrónico cuando alguien te siga
@@ -203,8 +277,8 @@ es-MX:
         mention: Enviar correo electrónico cuando alguien te mencione
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
-        report: Enviar un correo cuando se envía un nuevo informe
-        trending_tag: Enviar correo electrónico cuando una etiqueta no revisada está de tendencia
+        report: Nuevo reporte enviado
+        trending_tag: La nueva tendencia requiere de revisión
       rule:
         text: Norma
       tag:
@@ -212,7 +286,19 @@ es-MX:
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a los toots usar esta etiqueta
+      user:
+        role: Rol
+      user_role:
+        color: Color de insignia
+        highlighted: Mostrar rol como insignia en perfiles de usuario
+        name: Nombre
+        permissions_as_keys: Permisos
+        position: Prioridad
+      webhook:
+        events: Eventos habilitados
+        url: URL de Endpoint
     'no': 'No'
+    not_recommended: No recomendado
     recommended: Recomendado
     required:
       mark: "*"
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 286558854..d5ae3be7f 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,19 +3,19 @@ es:
   simple_form:
     hints:
       account_alias:
-        acct: Especifique el nombre de usuario@dominio de la cuenta desde la cual se desea migrar
+        acct: Especifique su nombre de usuario@dominio de la cuenta de donde se desea migrar
       account_migration:
-        acct: Especifique el nombre de usuario@dominio de la cuenta a la cual se desea migrar
+        acct: Especifique el nombre de usuario@dominio de la cuenta de la cual se desea migrar
       account_warning_preset:
         text: Puede usar sintaxis de publicaciones, como URLs, hashtags y menciones
-        title: Opcional. No visible para el destinatario
+        title: Opcional. No es visible para el destinatario
       admin_account_action:
         include_statuses: El usuario verá qué publicaciones han causado la acción de moderación o advertencia
-        send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
+        send_email_notification: El usuario recibirá una explicación de lo que ha sucedido con su cuenta
         text_html: Opcional. Puede usar sintaxis de publicaciones. Puede añadir <a href="%{path}">configuraciones predefinidas de advertencia</a> para ahorrar tiempo
-        type_html: Elige qué hacer con <strong>%{acct}</strong>
+        type_html: Elige lo qué vas a hacer con <strong>%{acct}</strong>
         types:
-          disable: Evitar que el usuario utilice su cuenta, pero no eliminar ni ocultar sus contenidos.
+          disable: Evita que el usuario utilice su cuenta, pero no elimina ni oculta sus contenidos.
           none: Utilizar esto para enviar una advertencia al usuario, sin poner en marcha ninguna otra acción.
           sensitive: Forzar que todos los archivos multimedia de este usuario sean marcados como sensibles.
           silence: Evitar que el usuario pueda publicar con visibilidad pública, oculta sus mensajes y notificaciones a personas que no lo siguen.
@@ -27,6 +27,8 @@ es:
         scheduled_at: Dejar en blanco para publicar el anuncio inmediatamente
         starts_at: Opcional. En caso de que su anuncio esté vinculado a un intervalo de tiempo específico
         text: Puedes usar la sintaxis de publicaciones. Por favor ten en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
+      appeal:
+        text: Sólo puedes apelar una amonestación una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
         avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -35,8 +37,7 @@ es:
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        discoverable: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas
-        discoverable_no_directory: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas
+        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
         email: Se le enviará un correo de confirmación
         fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -48,6 +49,7 @@ es:
         phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de una publicación
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevos retoots para las publicaciones que han sido recientemente retooteadas (sólo afecta a los retoots recibidos recientemente)
+        setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
         setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un click
         setting_display_media_default: Ocultar contenido multimedia marcado como sensible
         setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
@@ -62,10 +64,36 @@ es:
       domain_allow:
         domain: Este dominio podrá obtener datos de este servidor y los datos entrantes serán procesados y archivados
       email_domain_block:
-        domain: Puede ser el nombre de dominio que aparece en la dirección de correo, el registro MX hacia el cual resuelve el dominio, o la IP del servidor hacia el cual resuelve ese registro MX. Esto se comprobará en el momento del alta del usuario y el alta se rechazará.
+        domain: Este puede ser el nombre de dominio que aparece en la dirección de correo electrónico o el registro MX que utiliza. Se comprobarán al registrarse.
         with_dns_records: Se hará un intento de resolver los registros DNS del dominio dado y los resultados serán también puestos en lista negra
       featured_tag:
-        name: 'Puede que quieras usar uno de estos:'
+        name: 'Aquí están algunas de las etiquetas que más has utilizado recientemente:'
+      filters:
+        action: Elegir qué acción realizar cuando una publicación coincide con el filtro
+        actions:
+          hide: Ocultar completamente el contenido filtrado, comportándose como si no existiera
+          warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
+      form_admin_settings:
+        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
+        closed_registrations_message: Mostrado cuando los registros están cerrados
+        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        mascot: Reemplaza la ilustración en la interfaz web avanzada.
+        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
+        require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
+        site_contact_email: Cómo la gente puede ponerse en contacto contigo para consultas legales o de ayuda.
+        site_contact_username: Cómo puede contactarte la gente en Mastodon.
+        site_extended_description: Cualquier información adicional que pueda ser útil para los visitantes y sus usuarios. Se puede estructurar con formato Markdown.
+        site_short_description: Una breve descripción para ayudar a identificar su servidor de forma única. ¿Quién lo administra, a quién va dirigido?
+        site_terms: Utiliza tu propia política de privacidad o déjala en blanco para usar la predeterminada Puede estructurarse con formato Markdown.
+        site_title: Cómo puede referirse la gente a tu servidor además de por el nombre de dominio.
+        theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
+        thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
+        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
+        trendable_by_default: Omitir la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
+        trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
       form_challenge:
         current_password: Estás entrando en un área segura
       imports:
@@ -78,6 +106,7 @@ es:
         ip: Introduzca una dirección IPv4 o IPv6. Puede bloquear rangos completos usando la sintaxis CIDR. ¡Tenga cuidado de no quedarse fuera!
         severities:
           no_access: Bloquear acceso a todos los recursos
+          sign_up_block: Los nuevos registros se deshabilitarán
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
@@ -89,6 +118,16 @@ es:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
+        role: El rol controla qué permisos tiene el usuario
+      user_role:
+        color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
+        highlighted: Esto hace que el rol sea públicamente visible
+        name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
+        permissions_as_keys: Los usuarios con este rol tendrán acceso a...
+        position: Un rol superior decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con menor prioridad
+      webhook:
+        events: Seleccionar eventos para enviar
+        url: Donde los eventos serán enviados
     labels:
       account:
         fields:
@@ -97,7 +136,7 @@ es:
       account_alias:
         acct: Maneja la cuenta antigua
       account_migration:
-        acct: Maneja la cuenta nueva
+        acct: Alias de la nueva cuenta
       account_warning_preset:
         text: Texto predefinido
         title: Título
@@ -119,6 +158,8 @@ es:
         scheduled_at: Programar publicación
         starts_at: Comienzo del evento
         text: Anuncio
+      appeal:
+        text: Explica por qué esta decisión debe ser revertida
       defaults:
         autofollow: Invitar a seguir tu cuenta
         avatar: Avatar
@@ -137,7 +178,7 @@ es:
         header: Img. cabecera
         honeypot: "%{label} (no rellenar)"
         inbox_url: URL de la entrada de relés
-        irreversible: Dejar en lugar de ocultar
+        irreversible: Rechazar en lugar de ocultar
         locale: Idioma
         locked: Hacer privada esta cuenta
         max_uses: Máx. número de usos
@@ -148,6 +189,7 @@ es:
         phrase: Palabra clave o frase
         setting_advanced_layout: Habilitar interfaz web avanzada
         setting_aggregate_reblogs: Agrupar retoots en las líneas de tiempo
+        setting_always_send_emails: Enviar siempre notificaciones por correo
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar ventana de confirmación antes de retootear
         setting_crop_images: Recortar a 16x9 las imágenes de las publicaciones no expandidas
@@ -173,6 +215,7 @@ es:
         setting_use_pending_items: Modo lento
         severity: Severidad
         sign_in_token_attempt: Código de seguridad
+        title: Título
         type: Importar tipo
         username: Nombre de usuario
         username_or_email: Usuario o Email
@@ -181,6 +224,34 @@ es:
         with_dns_records: Incluye los registros MX y las IP del dominio
       featured_tag:
         name: Etiqueta
+      filters:
+        actions:
+          hide: Ocultar completamente
+          warn: Ocultar con una advertencia
+      form_admin_settings:
+        backups_retention_period: Período de retención del archivo de usuario
+        bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
+        closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
+        content_cache_retention_period: Período de retención de caché de contenido
+        custom_css: CSS personalizado
+        mascot: Mascota personalizada (legado)
+        media_cache_retention_period: Período de retención de caché multimedia
+        profile_directory: Habilitar directorio de perfiles
+        registrations_mode: Quién puede registrarse
+        require_invite_text: Requerir una razón para unirse
+        show_domain_blocks: Mostrar dominios bloqueados
+        show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
+        site_contact_email: Dirección de correo electrónico de contacto
+        site_contact_username: Nombre de usuario de contacto
+        site_extended_description: Descripción extendida
+        site_short_description: Descripción del servidor
+        site_terms: Política de Privacidad
+        site_title: Nombre del servidor
+        theme: Tema por defecto
+        thumbnail: Miniatura del servidor
+        timeline_preview: Permitir el acceso no autenticado a las líneas de tiempo públicas
+        trendable_by_default: Permitir tendencias sin revisión previa
+        trends: Habilitar tendencias
       interactions:
         must_be_follower: Bloquear notificaciones de personas que no te siguen
         must_be_following: Bloquear notificaciones de personas que no sigues
@@ -194,9 +265,11 @@ es:
         ip: IP
         severities:
           no_access: Bloquear acceso
+          sign_up_block: Bloquear registros
           sign_up_requires_approval: Limitar registros
         severity: Regla
       notification_emails:
+        appeal: Alguien ha apelado una decisión de moderación
         digest: Enviar resumen de correos electrónicos
         favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación
         follow: Enviar correo electrónico cuando alguien te siga
@@ -204,8 +277,8 @@ es:
         mention: Enviar correo electrónico cuando alguien te mencione
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
-        report: Enviar un correo cuando se envía un nuevo informe
-        trending_tag: Enviar correo electrónico cuando una etiqueta no revisada está de tendencia
+        report: Nuevo informe enviado
+        trending_tag: Una nueva tendencia requiere revisión
       rule:
         text: Norma
       tag:
@@ -213,7 +286,19 @@ es:
         name: Etiqueta
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a las publicaciones usar esta etiqueta
+      user:
+        role: Rol
+      user_role:
+        color: Color de insignia
+        highlighted: Mostrar rol como insignia en perfiles de usuario
+        name: Nombre
+        permissions_as_keys: Permisos
+        position: Prioridad
+      webhook:
+        events: Eventos habilitados
+        url: URL de Endpoint
     'no': 'No'
+    not_recommended: No recomendado
     recommended: Recomendado
     required:
       mark: "*"
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 7d8957b18..df14bf839 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -3,96 +3,154 @@ et:
   simple_form:
     hints:
       account_alias:
-        acct: Sisesta selle konto kasutajanimi@domeen, millelt soovite kolida
+        acct: Sisesta konto kasutajanimi@domeen, mille soovid siia ümber kolida
       account_migration:
-        acct: Sisesta selle konto kasutajanimi@domeen, millele soovite kolida
+        acct: Sisesta kasutajanimi@domeen, kuhu soovid konto siit kolida
       account_warning_preset:
-        text: Te saate kasutada tuututuse süntaksi, näiteks URLe, silte ja mainimisi
+        text: Te saate kasutada postituse süntaksi, näiteks URLe, silte ja mainimisi
         title: Valikuline. Ei ole nähtav saajale
       admin_account_action:
-        include_statuses: Kasutaja näeb, millised tuututused on põhjustanud selle moderaatori tegevuse või hoiatuse
+        include_statuses: Kasutaja näeb, millised postitused on põhjustanud moderaatori otsuse või hoiatuse
         send_email_notification: Konto omanik saab selgituse selle kohta, mis juhtus nende kontoga
-        text_html: Valikuline. Te saate kasutada tuututuse süntaksi. Te saate <a href="%{path}">lisada hoiatuste eelseadistusi</a> aega säästmiseks
+        text_html: Valikuline. On võimalik kasutada postituse süntaksi. On võimalik <a href="%{path}">lisada hoiatuste eelseadistusi</a> säästmaks aega
         type_html: Vali, mida teha kasutajaga <strong>%{acct}</strong>
+        types:
+          disable: Keela kasutajal konto kasutamine, sisu kustutamata või varjamata.
+          none: Hoiatuse saatmine kasutajale, ilma täiendavate tegevuste käivitamiseta.
+          sensitive: Kogu kasutaja meediasisu märgitakse kui tundlik sisu.
+          silence: Takistab kasutajal avaliku nähtavusega postitamist, peidab tema postitused ja märguanded inimeste eest, kes ei jälgi.
+          suspend: Takistamaks suhtlust selle kontoga ja kustutamaks kogu sisu. Tagasivõetav 30 päeva jooksul.
         warning_preset_id: Valikuline. Te saate ikka lisada mis tahes teksti eelseadistuse lõppu
       announcement:
-        all_day: Kui valitud, ainult kuupäevad antud ajavahemikus on kuvatud
+        all_day: Kui valitud, kuvatakse vaid selle ajavahemiku kuupäevi
         ends_at: Valikuline. Teadaanne eemaldatakse automaatselt sellel ajal
         scheduled_at: Jäta tühjaks, et avaldada teadaande koheselt
-        starts_at: Valikuline. Juhul, kui teie teadaanne on limiteeritud kindlale ajavahemikule
-        text: Te saate kasutada tuututuse süntaksi. Palun pidage silmas seda, kui palju ruumi teadaanne võtab kasutaja ekraanil
+        starts_at: Valikuline. Juhul, kui teadaanne on limiteeritud kindlale ajavahemikule
+        text: Te saate kasutada postituse süntaksi. Tuleks silmas pidada, kui palju ruumi teadaanne võtab kasutaja ekraanil
+      appeal:
+        text: Otsust on võimalik vaidlustada vaid 1 kord
       defaults:
         autofollow: Inimesed, kes loovad konto selle kutse läbi, automaatselt jälgivad Teid
         avatar: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
-        bot: See konto teeb enamjaolt automatiseeritud tegevusi ja ei pruugi olla järelvalve all
+        bot: Teavita teisi, et see konto teeb enamjaolt automatiseeritud tegevusi ja ei pruugi olla järelvalve all
         context: Üks või mitu konteksti, mille vastu see filter peaks rakenduma
-        current_password: Turvalisuse huvides palun sisestage praeguse konto salasõna
+        current_password: Sisesta turvalisuse huvides oma siinse konto salasõna
         current_username: Kinnitamiseks palun sisestage oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka perioodi tegevusetust ja ainult siis, kui Teile on saadetud privaatseid sõnumeid
-        discoverable: Profiilikataloog on veel üks viis, kuidas Teie konto saab jõuda laiema publikuni
+        discoverable: Konto on leitav võhivõõraste jaoks soovituste ja trendide sirvimise teel vm sarnaste vahenditega
         email: Teile saadetakse kinnituskiri e-posti teel
         fields: Te saate oma profiilil tabelina kuvada kuni 4 asja
         header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         inbox_url: Kopeerige soovitud relee avalehe URL
-        irreversible: Filtreeritud tuututused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
+        irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja push-teadete keel
         locked: Nõuab käsitsi jälgijate kinnitamist
-        password: Sisestage vähemalt 8 tähemärki
-        phrase: Kattub olenemata tuututuse teksti suurtähtedest või sisuhoiatusest
+        password: Vajalik on vähemalt 8 märki
+        phrase: Kattub olenemata postituse teksti suurtähtedest või sisuhoiatusest
         scopes: Milliseid API-sid see rakendus tohib kasutada. Kui Te valite kõrgeima taseme, ei pea Te valima individuaalseid.
-        setting_aggregate_reblogs: Ära näita uusi upitusi tuututustele, mis on just hiljuti upitatud (ainult kehtib uutele upitusele)
+        setting_aggregate_reblogs: Ära kuva uusi postituste jagamisi, mis on hiljuti jagatud (kehtib vaid uutele jagamistele)
+        setting_always_send_emails: Mastodoni aktiivsel kasutamisel sulle tavaliselt meilile teavitusi ei saadeta
         setting_default_sensitive: Tundlik meedia on vaikimisi peidetud ning seda saab avada sellele klikkides
         setting_display_media_default: Peida tundlikuks märgitud meedia
         setting_display_media_hide_all: Alati peida kõik meedia
         setting_display_media_show_all: Alati näita tundlikuks märgistatud meedia
-        setting_hide_network: Keda Te jälgite ja kes jägib Teid ei kuvata Teie profiilil
-        setting_noindex: Mõjutab Teie avalikku profiili ja staatuse lehekülgi
-        setting_show_application: Rakendus, mida kasutate tuututamiseks, kuvatakse tuututuste üksikasjade vaates
+        setting_hide_network: Profiilil ei kuvata Keda sa jälgid ja kes jälgib sind
+        setting_noindex: Mõjutab su avalikku profiili ja postituste lehekülgi
+        setting_show_application: Postitamiseks kasutatud rakenduse infot kuvatakse postituse üksikasjavaates
         setting_use_blurhash: Värvid põhinevad peidetud visuaalidel, kuid hägustavad igasuguseid detaile
-        setting_use_pending_items: Peida ajajoone uuendused kliki taga selle asemel, et automaatselt kerida voogu
-        username: Teie kasutajanimi on %{domain}-il unikaalne
+        setting_use_pending_items: Voo automaatse kerimise asemel peida ajajoone uuendused kliki taha
+        username: Su kasutajanimi on %{domain}-il unikaalne
         whole_word: Kui võtmesõna või fraas on ainult tähtnumbriline, rakendub see ainult siis, kui see kattub terve sõnaga
       domain_allow:
         domain: See domeen saab tõmmata andmeid sellelt serverilt ning sissetulevad andmed sellelt domeenilt töödeldakse ning salvestatakse
       email_domain_block:
-        domain: See võib olla domeeninimi, mis esineb e-posti aadressil, MX kirjele vastav domeen või serveri IP. Neid kontrollitakse, kui kasutaja loob konto ning seejärel konto loomine keelatakse.
-        with_dns_records: Proovitakse ka üles vaadata selle domeeni DNS kirjed ning selle vastused samuti keelatakse
+        domain: See võib olla e-postiaadressis näha olev domeen või MX-kirje, mida aadress kasutab. Kontroll toimub liitumise käigus.
+        with_dns_records: Püütakse lahendada selle domeeni DNS-kirjed ja ühtlasi blokeerida ka selle tulemused
       featured_tag:
-        name: 'Äkki soovite kasutada mõnda neist:'
+        name: 'Siin on mõned nendest siltidest mida sa oled kõige hiljutisemalt kasutanud:'
+      filters:
+        action: Tegevuse valik, kui postitus vastab filtrile
+        actions:
+          hide: Filtreeritud sisu täielik peitmine, nagu seda polekski üldse olemas
+          warn: Varja filtreeritud sisu hoiatusega, nimetades filtri pealkirja
+      form_admin_settings:
+        backups_retention_period: Talleta genereeritud kasutajaarhiivid määratud arv päevi.
+        bootstrap_timeline_accounts: Need kasutajad kinnitatakse uute kasutajate jälgimissoovituste esiritta.
+        closed_registrations_message: Kuvatakse, kui liitumised pole võimalikud
+        content_cache_retention_period: Teiste serverite postitused kustutatakse pärast määratud päevade arvu, kui see on seatud positiivsele väärtusele. See võib olla pöördumatu.
+        custom_css: Kohandatud stiile on võimalik kasutada Mastodoni veebiliideses.
+        mascot: Asendab kohandatud veebiliidese illustratsiooni.
+        media_cache_retention_period: Positiivse väärtuse korral kustutatakse allalaetud meediafailid määratud päevade möödudes. Vajadusel laaditakse need uuesti alla.
+        profile_directory: Kasutajate kataloog kuvab nimekirja kasutajatest, kes on seda lubanud.
+        require_invite_text: Kui liitumisi on tarvis kinnitada, oleks "Miks Te soovite liituda?" vastus vajalik
+        site_contact_email: Kui peaks tekkima vajadus ühendust võtta täiendavate küsimuste osas.
+        site_contact_username: Kuidas Mastodoni kaudu ühendust võtta.
+        site_extended_description: Igasugune lisateave, mis võib külastajatele ja kasutajatele kasulik olla. Saab liigendada Markdown süntaksiga.
+        site_short_description: Lühikirjeldus serveri unikaalseks identifitseerimiseks. Kes haldab, kellele mõeldud?
+        site_terms: Lisa siia serveri isikuandmete kaitse põhimõtted või jäta tühjaks, et kasutada geneerilisi. Tekstis on lubatud Markdowni süntaks.
+        site_title: Kuidas inimesed saavad serverile viidata, lisaks domeeninimele.
+        theme: Teema, mida näevad sisenemata ning uued kasutajad.
+        thumbnail: Umbes 2:1 mõõdus pilt serveri informatsiooni kõrval.
+        timeline_preview: Sisenemata külastajatel on võimalik sirvida viimaseid avalikke postitusi serveril.
+        trendable_by_default: Populaarse sisu ülevaatuse vahele jätmine. Pärast seda on siiski võimalik üksikuid üksusi trendidest eemaldada.
+        trends: Populaarsuse suunad näitavad millised postitused, sildid ja uudislood koguvad sinu serveris tähelepanu.
       form_challenge:
-        current_password: Te sisenete turvalisele alale
+        current_password: Turvalisse alasse sisenemine
       imports:
         data: CSV fail eksporditi teisest Mastodoni serverist
       invite_request:
-        text: See aitab meil üle vaadata Teie taotlust
+        text: See aitab meil su taotlust üle vaadata
+      ip_block:
+        comment: Valikuline. Talletamaks reegli lisamise põhjust.
+        expires_in: IP-aadressid on lõplik ressurss ja on tihtipeale ühiskasutuses või vahetub kasutaja. Sel põhjusel pole kestvad IP-piirangud soovituslikud.
+        ip: IPv4 või IPv6 aadress. Vahemike keelamine on võimalik CIDR-süntaksit kasutades. Ettevaatust, et iseend uksetaha ei jäta!
+        severities:
+          no_access: Keela ligipääs kõigile ressurssidele
+          sign_up_block: Uued liitumised pole võimalikud
+          sign_up_requires_approval: Uued liitumised vajavad kinnitamist
+        severity: Valik, mis juhtub päringutega sellelt IP-aadressilt
+      rule:
+        text: Reegli või nõude kirjeldus selle serveri kasutajatele. Võimalikult lühidalt ja lihtsalt
       sessions:
-        otp: 'Sisesta kahesammulise autentimise kood loodud Teie mobiilirakenduse poolt või sisesta mõni taastuskood:'
+        otp: 'Kahe-etapise autentimise kood telefonirakendusest või mõni taastekood:'
+        webauthn: Kui see on USB-võti, sisesta see ning vajadusel aktiveeri.
       tag:
         name: Te saate ainult muuta tähtede tõstetust, näiteks selleks, et muuta seda rohkem loetavaks
       user:
-        chosen_languages: Kui valitud, ainult valitud keeltes tuututused näidatakse avalikes ajajoontes
+        chosen_languages: Keelte valimisel näidatakse avalikel ajajoontel ainult neis keeltes postitusi
+        role: See roll kontrollib, millised õigused kasutajal on
+      user_role:
+        color: Rolli tähistamise värvus üle kasutajaliidese, RGB 16nd-formaadis
+        highlighted: Teeb rolli avalikult nähtavaks
+        name: Rolli avalik nimi, kui roll on märgitud avalikuks kuvamiseks märgina
+        permissions_as_keys: Selle rolliga kasutajatel on ligipääs...
+        position: Kõrgem roll otsustab teatud olukordades konfliktide lahendamise. Teatud toiminguid saab teha ainult madalama prioriteediga rollidega
+      webhook:
+        events: Saadetavate sündmuste valik
+        url: Kuhu sündmused saadetakse
     labels:
       account:
         fields:
           name: Nimetus
           value: Sisu
       account_alias:
-        acct: Vana konto täisnimi
+        acct: Vana konto aadress
       account_migration:
-        acct: Uue konto täisnimi
+        acct: Uue konto aadress
       account_warning_preset:
         text: Eelseadistatud tekst
         title: Pealkiri
       admin_account_action:
-        include_statuses: Kaasa teavitatud tuututused selles e-kirjas
+        include_statuses: Kaasa teavitatud postitused selles e-kirjas
         send_email_notification: Teavita kasutajat e-posti teel
         text: Hoiatus
         type: Tegevus
         types:
           disable: Keela
           none: Ära tee midagi
+          sensitive: Tundlik
           silence: Vaigista
-          suspend: Peata ja taastamatult kustuta konto andmed
+          suspend: Kustuta
         warning_preset_id: Kasuta hoiatuse eelseadistust
       announcement:
         all_day: Kogu päeva sündmus
@@ -100,13 +158,15 @@ et:
         scheduled_at: Ajasta avalikustamine
         starts_at: Sündmuse algus
         text: Teadaanne
+      appeal:
+        text: Kirjeldus, miks see otsus tuleks tagasi pöörata
       defaults:
         autofollow: Kutsu oma kontot jälgima
         avatar: Profiilipilt
         bot: See konto on robot
-        chosen_languages: Filtreeri keeli
-        confirm_new_password: Kinnita uus salasõna
-        confirm_password: Kinnita salasõna
+        chosen_languages: Keelte filtreerimine
+        confirm_new_password: Uue salasõna kinnitamine
+        confirm_password: Salasõna kinnitamine
         context: Filtreeri kontekste
         current_password: Kehtiv salasõna
         data: Andmed
@@ -114,8 +174,9 @@ et:
         display_name: Kuvanimi
         email: E-posti aadress
         expires_in: Aegu pärast
-        fields: Profiili metaandmed
+        fields: Veebiviited
         header: Päis
+        honeypot: "%{label} (ära sisesta)"
         inbox_url: Relee sisendkausta URL
         irreversible: Kustuta selle asemel, et peita
         locale: Kasutajaliidese keel
@@ -123,27 +184,29 @@ et:
         max_uses: Maksimum kasutajate arv
         new_password: Uus salasõna
         note: Elulugu
-        otp_attempt: Kahesammulise autentimise kood
+        otp_attempt: Kahe-etapine kood
         password: Salasõna
         phrase: Võtmesõna või fraas
-        setting_advanced_layout: Aktiveeri arenenud veebiliides
-        setting_aggregate_reblogs: Grupita upitused ajajoontes
-        setting_auto_play_gif: Mängi GIF-e automaatselt
-        setting_boost_modal: Näita kinnitusdialoogi enne upitamist
-        setting_crop_images: Kärbi suurendamata tuututuste pildid resolutsiooni 16x9
+        setting_advanced_layout: Aktiveeri kohandatud veebiliides
+        setting_aggregate_reblogs: Grupeeri jagamised ajajoontel
+        setting_always_send_emails: Edasta kõik teavitused meilile
+        setting_auto_play_gif: Esita GIF-e automaatselt
+        setting_boost_modal: Näita enne jagamist kinnitusdialoogi
+        setting_crop_images: Kärbi suurendamata postituste pildid mõõtu 16x9
         setting_default_language: Postituse keel
-        setting_default_privacy: Postituse privaatsus
+        setting_default_privacy: Postituse nähtavus
         setting_default_sensitive: Alati märgista meedia tundlikuks
-        setting_delete_modal: Näita kinnitusdialoogi enne tuututuse kustutamist
+        setting_delete_modal: Näita kinnitusdialoogi enne postituse kustutamist
+        setting_disable_swiping: Keela pühkimisliigutused
         setting_display_media: Meedia kuvarežiim
         setting_display_media_default: Vaikimisi
         setting_display_media_hide_all: Peida kõik
         setting_display_media_show_all: Kuva kõik
-        setting_expand_spoilers: Alati laienda sisuhoiatustega tuututused
+        setting_expand_spoilers: Alati laienda sisuhoiatustega postitused
         setting_hide_network: Peida oma võrk
         setting_noindex: Keeldu otsingumootorite indekseerimistest
-        setting_reduce_motion: Vähenda liikumist animatsioonides
-        setting_show_application: Avalikusta tuututuste saatmisel kasutatud rakendused
+        setting_reduce_motion: Vähenda animatsioonides liikumist
+        setting_show_application: Avalikusta postituste tegemisel kasutatud rakendus
         setting_system_font_ui: Kasuta süsteemi vaikefonti
         setting_theme: Saidi teema
         setting_trends: Näita tänaseid trende
@@ -151,14 +214,44 @@ et:
         setting_use_blurhash: Näita peidetud meedia asemel värvilist pilti
         setting_use_pending_items: Aeglane režiim
         severity: Tõsidus
+        sign_in_token_attempt: Turvakood
+        title: Pealkiri
         type: Impordi tüüp
         username: Kasutajanimi
         username_or_email: Kasutajanimi või e-post
         whole_word: Terve sõna
       email_domain_block:
-        with_dns_records: Kaasa domeeni MX kirjed ning IP aadressid
+        with_dns_records: Kaasa domeeni MX-kirjed ning IP-aadressid
       featured_tag:
         name: Silt
+      filters:
+        actions:
+          hide: Peida täielikult
+          warn: Peida hoiatusega
+      form_admin_settings:
+        backups_retention_period: Kasutajate arhiivi talletusperiood
+        bootstrap_timeline_accounts: Alati soovita neid kontosid uutele kasutajatele
+        closed_registrations_message: Kohandatud teade, kui liitumine pole võimalik
+        content_cache_retention_period: Meediapuhvri talletusperiood
+        custom_css: Kohandatud CSS
+        mascot: Kohandatud maskott (kunagine)
+        media_cache_retention_period: Meediapuhvri talletusperiood
+        profile_directory: Luba kasutajate kataloog
+        registrations_mode: Kes saab liituda
+        require_invite_text: Nõua liitumiseks põhjendust
+        show_domain_blocks: Näita domeenikeelde
+        show_domain_blocks_rationale: Näite domeenikeeldude põhjuseid
+        site_contact_email: Kontaktisiku e-post
+        site_contact_username: Kontaktisiku kasutajanimi
+        site_extended_description: Serveri pikem kirjeldus
+        site_short_description: Serveri lühikirjeldus
+        site_terms: Isikuandmete kaitse
+        site_title: Serveri nimi
+        theme: Vaikmisi teema
+        thumbnail: Serveri pisipilt
+        timeline_preview: Luba autentimata ligipääs avalikele ajajoontele
+        trendable_by_default: Luba trendid eelneva ülevaatuseta
+        trends: Luba trendid
       interactions:
         must_be_follower: Keela teavitused mittejälgijatelt
         must_be_following: Keela teavitused kasutajatelt, keda sa ei jälgi
@@ -167,23 +260,50 @@ et:
         comment: Kommenteerima
       invite_request:
         text: Miks Te soovite liituda?
+      ip_block:
+        comment: Kommentaar
+        ip: IP
+        severities:
+          no_access: Keela ligipääs
+          sign_up_block: Keela liitumised
+          sign_up_requires_approval: Piira liitumisi
+        severity: Reegel
       notification_emails:
+        appeal: Moderaatori otsus on vaidlustatud
         digest: Saada ülevaatlike e-kirju
-        favourite: Saada e-kiri, kui keegi lisab teie staatuse lemmikuks
+        favourite: Saada e-kiri, kui keegi lisab su postituse lemmikuks
         follow: Saada e-kiri, kui keegi alustab Teie jälgimist
         follow_request: Saada e-kiri, kui keegi soovib Teid jälgida
         mention: Saada e-kiri, kui keegi mainib Teid
         pending_account: Saada e-kiri, kui uus konto vajab ülevaatlust
-        reblog: Saada e-kiri, kui keegi upitab Teie staatust
-        report: Saada e-kiri, kui esitatud on uus teavitus
-        trending_tag: Saada e-kiri, kui ülevaatamata silt trendib
+        reblog: Keegi jagas postitust
+        report: Esitatud on uus raport
+        trending_tag: Uus trend vajab ülevaatust
+      rule:
+        text: Reegel
       tag:
         listable: Luba sellel sildil ilmuda profiilide kataloogis
         name: Silt
         trendable: Luba sellel sildil trendida
-        usable: Luba tuututustel seda silti kasutada
+        usable: Luba postitustel seda silti kasutada
+      user:
+        role: Roll
+      user_role:
+        color: Märgi värv
+        highlighted: Kuva roll kasutajaprofiilidel märgina
+        name: Nimi
+        permissions_as_keys: Load
+        position: Positsioon
+      webhook:
+        events: Lubatud sündmused
+        url: Lõpp-punkti URL
     'no': Ei
+    not_recommended: Pole soovitatav
     recommended: Soovituslik
     required:
+      mark: "*"
       text: kohustuslik
+    title:
+      sessions:
+        webauthn: Kasuta sisenemiseks ühte turvavõtmeist
     'yes': Jah
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 68913558f..34c60a553 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -7,10 +7,10 @@ eu:
       account_migration:
         acct: Zehaztu migrazioaren xede den kontuaren erabiltzaile@domeinua
       account_warning_preset:
-        text: Toot sintaxia erabili dezakezu, URLak, traolak eta aipamenak
+        text: Bidalketaren sintaxia erabili dezakezu, hala nola, URLak, traolak eta aipamenak
         title: Aukerakoa. Hartzaileak ez du ikusiko
       admin_account_action:
-        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten tootak ikusi ahal izango ditu
+        include_statuses: Erabiltzaileak moderazio ekintza edo abisu bat eragin duten bidalketak ikusi ahal izango ditu
         send_email_notification: Erabiltzaileak bere kontuarekin gertatutakoaren azalpen bat jasoko du
         text_html: Aukerakoa. Toot sintaxia erabili dezakezu. <a href="%{path}">Abisu aurre-ezarpenak</a> gehitu ditzakezu denbora aurrezteko
         type_html: Erabaki zer egin <strong>%{acct}</strong> kontuarekin
@@ -27,6 +27,8 @@ eu:
         scheduled_at: Laga hutsik iragarpena berehala argitaratzeko
         starts_at: Aukerakoa. Zure iragarpena denbora-tarte batera lotuta dagoenerako
         text: Tootetako sintaxia erabili dezakezu. Kontuan izan iragarpenak erabiltzailearen pantailan hartuko duen neurria
+      appeal:
+        text: Neurri bati apelazioa behin bakarrik jarri diezaiokezu
       defaults:
         autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
         avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
@@ -35,7 +37,7 @@ eu:
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
         digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
-        discoverable: Profilen direktorioa zure kontua jende gehiagok irakurtzeko modu bat da
+        discoverable: Baimendu zure kontua ezezagunek aurkitu ahal izatea gomendio, joera eta beste ezaugarrien bidez
         email: Baieztapen e-mail bat bidaliko zaizu
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
         header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
@@ -47,6 +49,7 @@ eu:
         phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe
         scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar.
         setting_aggregate_reblogs: Ez erakutsi bultzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die bakarrik)
+        setting_always_send_emails: Normalean eposta jakinarazpenak ez dira bidaliko Mastodon aktiboki erabiltzen ari zaren bitartean
         setting_default_sensitive: Multimedia hunkigarria lehenetsita ezkutatzen da, eta sakatuz ikusi daiteke
         setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
         setting_display_media_hide_all: Ezkutatu multimedia guztia beti
@@ -61,10 +64,36 @@ eu:
       domain_allow:
         domain: Domeinu honek zerbitzari honetatik datuak hartu ahal izango ditu eta bertatik jasotako informazioa prozesatu eta gordeko da
       email_domain_block:
-        domain: Hau e-mail helbidean agertzen den domeinua izan daiteke, honen MX erregistroa, edo MX erregistroaren IP helbidea. Hauek erabiltzaileak izena ematean egiaztatuko dira eta atzera botako da.
+        domain: Hau eposta helbidean agertzen den domeinu-izena edo MX erregistroak erabiltzen duena izan daiteke. Izen-ematean egiaztatuko dira.
         with_dns_records: Emandako domeinuaren DNS erregistroak ebazteko saiakera bat egingo da eta emaitzak ere zerrenda beltzean sartuko dira
       featured_tag:
-        name: 'Hauetakoren bat erabili zenezake:'
+        name: 'Hemen dituzu azkenaldian gehien erabili dituzun traoletako batzuk:'
+      filters:
+        action: Aukeratu ze ekintza burutu behar den bidalketa bat iragazkiarekin bat datorrenean
+        actions:
+          hide: Ezkutatu erabat iragazitako edukia, existituko ez balitz bezala
+          warn: Ezkutatu iragazitako edukia iragazkiaren izenburua duen abisu batekin
+      form_admin_settings:
+        backups_retention_period: Mantendu sortutako erabiltzailearen artxiboa zehazturiko egun kopuruan.
+        bootstrap_timeline_accounts: Kontu hauek erabiltzaile berrien jarraitzeko gomendioen goiko aldean ainguratuko dira.
+        closed_registrations_message: Izen-ematea itxia dagoenean bistaratua
+        content_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietako bidalketak ezabatuko dira. Hau ezin da desegin.
+        custom_css: Estilo pertsonalizatuak aplikatu ditzakezu Mastodonen web bertsioan.
+        mascot: Web interfaze aurreratuko ilustrazioa gainidazten du.
+        media_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietatik deskargatutako multimedia fitxategiak ezabatuko dira. Ondoren, eskatu ahala deskargatuko dira berriz.
+        profile_directory: Profilen direktorioan ikusgai egotea aukeratu duten erabiltzaile guztiak zerrendatzen dira.
+        require_invite_text: Izen emateak eskuz onartu behar direnean, "Zergatik elkartu nahi duzu?" testu sarrera derrigorrezko bezala ezarri, ez hautazko
+        site_contact_email: Jendeak kontsulta legalak egin edo laguntza eskatzeko bidea.
+        site_contact_username: Jendea Mastodonen zurekin harremanetan jartzeko bidea.
+        site_extended_description: Bisitari eta erabiltzaileentzat erabilgarria izan daitekeen informazio gehigarria. Markdown sintaxiarekin egituratu daiteke.
+        site_short_description: Zure zerbitzaria identifikatzen laguntzen duen deskribapen laburra. Nork du ardura? Nori zuzendua dago?
+        site_terms: Erabili zure pribatutasun politika edo hutsik utzi lehenetsia erabiltzeko. Markdown sintaxiarekin egituratu daiteke.
+        site_title: Jendeak nola deituko dion zure zerbitzariari, domeinu-izenaz gain.
+        theme: Saioa hasi gabeko erabiltzaileek eta berriek ikusiko duten gaia.
+        thumbnail: Zerbitzariaren informazioaren ondoan erakusten den 2:1 inguruko irudia.
+        timeline_preview: Saioa hasi gabeko erabiltzaileek ezingo dituzte arakatu zerbitzariko bidalketa publiko berrienak.
+        trendable_by_default: Saltatu joeretako edukiaren eskuzko berrikuspena. Ondoren elementuak banan-bana kendu daitezke joeretatik.
+        trends: Joeretan zure zerbitzarian bogan dauden bidalketa, traola eta albisteak erakusten dira.
       form_challenge:
         current_password: Zonalde seguruan sartzen ari zara
       imports:
@@ -77,6 +106,7 @@ eu:
         ip: Sartu IPv4 edo IPv6 helbide bat. Tarte osoak blokeatu ditzakezu CIDR sintaxia erabiliz. Kontuz zure burua blokeatu gabe!
         severities:
           no_access: Blokeatu baliabide guztietarako sarbidea
+          sign_up_block: Ezingo da izen-emate berririk egin
           sign_up_requires_approval: Izen emate berriek zure onarpena beharko dute
         severity: Aukeratu zer gertatuko den IP honetatik datozen eskaerekin
       rule:
@@ -88,6 +118,16 @@ eu:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
         chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden tootak besterik ez dira erakutsiko
+        role: Rolak erabiltzaileak dituen baimenak kontrolatzen ditu
+      user_role:
+        color: Rolarentzat erabiltzaile interfazean erabiliko den kolorea, formatu hamaseitarreko RGB bezala
+        highlighted: Honek rola publikoki ikusgai jartzen du
+        name: Rolaren izen publikoa, rola bereizgarri bezala bistaratzeko ezarrita badago
+        permissions_as_keys: Rol hau duten erabiltzaileek sarbidea izango dute...
+        position: Maila goreneko rolak erabakitzen du gatazkaren konponbidea kasu batzuetan. Ekintza batzuk maila baxuagoko rolen gain bakarrik gauzatu daitezke
+      webhook:
+        events: Hautatu gertaerak bidaltzeko
+        url: Nora bidaliko diren gertaerak
     labels:
       account:
         fields:
@@ -118,6 +158,8 @@ eu:
         scheduled_at: Programatu argitaratzea
         starts_at: Ekitaldiaren hasiera
         text: Iragarpena
+      appeal:
+        text: Azaldu zergatik bota behar litzatekeen atzera erabaki hau
       defaults:
         autofollow: Gonbidatu zure kontua jarraitzera
         avatar: Abatarra
@@ -147,6 +189,7 @@ eu:
         phrase: Hitz edo esaldi gakoa
         setting_advanced_layout: Gaitu web interfaze aurreratua
         setting_aggregate_reblogs: Taldekatu bultzadak denbora-lerroetan
+        setting_always_send_emails: Bidali beti eposta jakinarazpenak
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
         setting_crop_images: Moztu irudiak hedatu gabeko tootetan 16x9 proportzioan
@@ -172,6 +215,7 @@ eu:
         setting_use_pending_items: Modu geldoa
         severity: Larritasuna
         sign_in_token_attempt: Segurtasun kodea
+        title: Izenburua
         type: Inportazio mota
         username: Erabiltzaile-izena
         username_or_email: Erabiltzaile-izena edo e-mail helbidea
@@ -180,6 +224,34 @@ eu:
         with_dns_records: Sartu ere domeinuaren MX erregistroak eta IPak
       featured_tag:
         name: Traola
+      filters:
+        actions:
+          hide: Ezkutatu guztiz
+          warn: Ezkutatu ohar batekin
+      form_admin_settings:
+        backups_retention_period: Erabiltzailearen artxiboa gordetzeko epea
+        bootstrap_timeline_accounts: Gomendatu beti kontu hauek erabiltzaile berriei
+        closed_registrations_message: Izen-emateak itxita daudenerako mezu pertsonalizatua
+        content_cache_retention_period: Edukiaren cache-a atxikitzeko epea
+        custom_css: CSS pertsonalizatua
+        mascot: Maskota pertsonalizatua (zaharkitua)
+        media_cache_retention_period: Multimediaren cachea atxikitzeko epea
+        profile_directory: Gaitu profil-direktorioa
+        registrations_mode: Nork eman dezake izena
+        require_invite_text: Eskatu arrazoi bat batzeko
+        show_domain_blocks: Erakutsi domeinu-blokeoak
+        show_domain_blocks_rationale: Erakutsi domeinuak zergatik blokeatu ziren
+        site_contact_email: Harremanetarako eposta
+        site_contact_username: Harremanetarako erabiltzaile-izena
+        site_extended_description: Deskribapen hedatua
+        site_short_description: Zerbitzariaren deskribapena
+        site_terms: Pribatutasun politika
+        site_title: Zerbitzariaren izena
+        theme: Lehenetsitako gaia
+        thumbnail: Zerbitzariaren koadro txikia
+        timeline_preview: Onartu autentifikatu gabeko sarbidea denbora lerro publikoetara
+        trendable_by_default: Onartu joerak aurrez berrikusi gabe
+        trends: Gaitu joerak
       interactions:
         must_be_follower: Blokeatu jarraitzaile ez direnen jakinarazpenak
         must_be_following: Blokeatu zuk jarraitzen ez dituzu horien jakinarazpenak
@@ -193,9 +265,11 @@ eu:
         ip: IP-a
         severities:
           no_access: Blokeatu sarbidea
+          sign_up_block: Blokeatu izen-emateak
           sign_up_requires_approval: Mugatu izen emateak
         severity: Araua
       notification_emails:
+        appeal: Norbaitek moderatzailearen erabakia eskatu du
         digest: Bidali laburpenak e-mail bidez
         favourite: Bidali e-mail bat norbaitek zure mezua gogoko duenean
         follow: Bidali e-mail bat norbaitek jarraitzen zaituenean
@@ -203,8 +277,8 @@ eu:
         mention: Bidali e-mail bat norbaitek zu aipatzean
         pending_account: Bidali e-mail bat kontu bat berrikusi behar denean
         reblog: Bidali e-mail bat norbaitek zure mezuari bultzada ematen badio
-        report: Bidali e-maila txosten berri bat aurkezten denean
-        trending_tag: Bidali e-mail bat errebisatu gabeko traola bat joeran dagoenean
+        report: Salaketa berria bidali da
+        trending_tag: Joera berriak berrikuspena behar du
       rule:
         text: Araua
       tag:
@@ -212,7 +286,19 @@ eu:
         name: Traola
         trendable: Baimendu traola hau joeretan agertzea
         usable: Baimendu tootek traola hau erabiltzea
+      user:
+        role: Rola
+      user_role:
+        color: Bereizgarriaren kolorea
+        highlighted: Bistaratu rola bereizgarri bezala erabiltzaileen profiletan
+        name: Izena
+        permissions_as_keys: Baimenak
+        position: Lehentasuna
+      webhook:
+        events: Gertaerak gaituta
+        url: Amaiera-puntuaren URLa
     'no': Ez
+    not_recommended: Ez gomendatua
     recommended: Aholkatua
     required:
       mark: "*"
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 50e7dd3f2..b74b08e9a 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -7,12 +7,12 @@ fa:
       account_migration:
         acct: نشانی username@domain را برای حسابی که می‌خواهید به آن منتقل شوید بنویسید
       account_warning_preset:
-        text: می‌توانید مانند بوق‌های معمولی کاربران دیگر را نام ببرید یا پیوند و برچسب بگذارید
+        text: می‌توانید مانند فرسته‌های معمولی کاربران دیگر را نام ببرید یا پیوند و برچسب بگذارید
         title: اختیاری. برای گیرنده قابل مشاهده نیست
       admin_account_action:
-        include_statuses: این کاربر خواهد دید که کدام بوق او موجب اقدام مدیریتی یا هشدار شده است
+        include_statuses: این کاربر خواهد دید که کدام فرسته او موجب اقدام مدیریتی یا هشدار شده است
         send_email_notification: توضیحی که کاربر می‌بینید که برای حسابش چه رخ داده است
-        text_html: اختیاری. می‌توانید مثل بوق‌های معمولی بنویسید. می‌توانید برای صرفه‌جویی در زمان <a href="%{path}">هشدارهای ازپیش‌آماده بیفزایید</a>
+        text_html: اختیاری. می‌توانید مثل فرسته‌های معمولی بنویسید. می‌توانید برای صرفه‌جویی در زمان <a href="%{path}">هشدارهای ازپیش‌آماده بیفزایید</a>
         type_html: با حساب <strong>%{acct}</strong> می‌خواهید چه کار کنید؟‌
         types:
           disable: از استفادهٔ کاربر از حسابش جلوگیری می‌کند، ولی محتوایش را حذف یا پنهان نمی‌کند.
@@ -26,7 +26,9 @@ fa:
         ends_at: اختیاری. اعلامیه در این به صورت خودکار نامنتشر خواهد شد
         scheduled_at: برای انتشار فوری اعلامیه، خالی بگذارید
         starts_at: اختیاری. در صورتی که اعلامیه‌تان محدود به بازهٔ زمانی خاصی است
-        text: می‌توانید مانند یک بوق‌ معمولی بنویسید. یادتان باشد که اعلامیهٔ شما فضای صفحهٔ کاربران را اشغال خواهد کرد
+        text: می‌توانید مانند یک فرسته‌ معمولی بنویسید. یادتان باشد که اعلامیهٔ شما فضای صفحهٔ کاربران را اشغال خواهد کرد
+      appeal:
+        text: فقط یک بار می‌توانید برای اخطار درخواست تجدیدنظر کنید
       defaults:
         autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد
         avatar: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
@@ -35,26 +37,25 @@ fa:
         current_password: به دلایل امنیتی لطفاً رمز این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
-        discoverable: فهرست گزیدهٔ کاربران، راهی دیگر برای رسیدن به مخاطبان گسترده‌تری برای حسابتان است
-        discoverable_no_directory: اجازه دهید که حساب‌تان از طریق پیشنهادات و سایر قابلیت‌ها، توسط افراد غریبه قابل کشف باشد
+        discoverable: اجازه دهید حساب‌تان از طریق پیشنهادها، پرطرفدارها و سایر قابلیت‌ها، توسط افراد غریبه قابل کشف باشد
         email: به شما ایمیل تأییدی فرستاده خواهد شد
         fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
-        irreversible: بوق‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
-        locale: زبان محیط کاربری، ایمیل‌ها، و اعلان‌ها
+        irreversible: فرسته‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
+        locale: زبان واسط کاربری، رایانامه‌ها و آگاهی‌های ارسالی
         locked: باید پیگیران تازه را خودتان تأیید کنید
         password: دست‌کم باید ۸ نویسه داشته باشد
-        phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای بوق‌ها مقایسه می‌شود
+        phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای فرسته‌ها مقایسه می‌شود
         scopes: واسط‌های برنامه‌نویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطح‌های پایینی ندارید.
-        setting_aggregate_reblogs: برای بازبوق‌هایی که به تازگی برایتان نمایش داده شده‌اند، بازبوق‌های بیشتر را نشان نده (فقط روی بازبوق‌های اخیر تأثیر می‌گذارد)
+        setting_aggregate_reblogs: برای تقویت‌هایی که به تازگی برایتان نمایش داده شده‌اند، تقویت‌های بیشتر را نمایش نده (فقط روی تقویت‌های اخیر تأثیر می‌گذارد)
         setting_default_sensitive: تصاویر حساس به طور پیش‌فرض پنهان هستند و می‌توانند با یک کلیک آشکار شوند
         setting_display_media_default: تصویرهایی را که به عنوان حساس علامت زده شده‌اند پنهان کن
         setting_display_media_hide_all: همیشه همهٔ عکس‌ها و ویدیوها را پنهان کن
         setting_display_media_show_all: همیشه تصویرهایی را که به عنوان حساس علامت زده شده‌اند را نشان بده
         setting_hide_network: فهرست پیگیران شما و فهرست کسانی که شما پی می‌گیرید روی نمایهٔ شما دیده نخواهد شد
         setting_noindex: روی نمایهٔ عمومی و صفحهٔ نوشته‌های شما تأثیر می‌گذارد
-        setting_show_application: برنامه‌ای که به کمک آن بوق می‌زنید، در جزئیات بوق شما نمایش خواهد یافت
+        setting_show_application: برنامه‌ای که به کمک آن فرسته می‌زنید، در جزئیات فرسته شما نمایش خواهد یافت
         setting_use_blurhash: سایه‌ها بر اساس رنگ‌های به‌کاررفته در تصویر پنهان‌شده ساخته می‌شوند ولی جزئیات تصویر در آن‌ها آشکار نیست
         setting_use_pending_items: به جای پیش‌رفتن خودکار در فهرست، به‌روزرسانی فهرست نوشته‌ها را پشت یک کلیک پنهان کن
         username: نام کاربری شما روی %{domain} یکتا خواهد بود
@@ -62,10 +63,8 @@ fa:
       domain_allow:
         domain: این دامین خواهد توانست داده‌ها از این سرور را دریافت کند و داده‌های از این دامین در این‌جا پردازش و ذخیره خواهند شد
       email_domain_block:
-        domain: می‌تواند نام دامنه که در نشانی رایانامه ظاهر می‌شود، رکورد MX که دامنه به آن resolve می‌شود یا IP کارسازی که رکورد MX به آن resolve می‌شود باشد. این موارد هنگام ثبت‌نام کاربر بررسی شده و ثبت‌نام رد می‌شود.
+        domain: این می‌تواند نام دامنه‌ای باشد که در نشانی رایانامه یا رکورد MX استفاده می‌شود. پس از ثبت نام بررسی خواهند شد.
         with_dns_records: تلاشی برای resolve کردن رکوردهای ساناد دامنهٔ داده‌شده انجام شده و نتیجه نیز مسدود خواهد شد
-      featured_tag:
-        name: 'شاید بخواهید چنین چیزهایی را به کار ببرید:'
       form_challenge:
         current_password: شما در حال ورود به یک منطقهٔ‌ حفاظت‌شده هستید
       imports:
@@ -102,7 +101,7 @@ fa:
         text: متن از پیش آماده‌شده
         title: عنوان
       admin_account_action:
-        include_statuses: بوق‌های گزارش‌شده را در ایمیل بگنجان
+        include_statuses: فرسته‌های گزارش‌شده را در ایمیل بگنجان
         send_email_notification: اطلاع‌رسانی به کاربر از راه ایمیل
         text: هشدار موردی
         type: کنش
@@ -119,6 +118,8 @@ fa:
         scheduled_at: زمان‌بندی انتشار
         starts_at: آغاز رویداد
         text: اعلامیه
+      appeal:
+        text: توضیح دهید که چرا این تصمیم باید معکوس شود
       defaults:
         autofollow: دعوت از دیگران برای عضو شدن و پیگیری حساب شما
         avatar: تصویر نمایه
@@ -129,7 +130,7 @@ fa:
         context: زمینه‌های پالایش
         current_password: رمز فعلی
         data: داده‌ها
-        discoverable: این حساب را در فهرست گزیدهٔ کاربران نشان بده
+        discoverable: پیشنهاد حساب به دیگران
         display_name: نمایش به نام
         email: نشانی ایمیل
         expires_in: تاریخ انقضا
@@ -147,10 +148,10 @@ fa:
         password: رمز
         phrase: کلیدواژه یا عبارت
         setting_advanced_layout: فعال‌سازی رابط کاربری پیشرفته
-        setting_aggregate_reblogs: بازبوق‌ها را متحد کن
+        setting_aggregate_reblogs: تقویت‌ها را در خط‌زمانی گروه‌بندی کن
         setting_auto_play_gif: پخش خودکار تصویرهای متحرک
-        setting_boost_modal: نمایش پیغام تأیید پیش از بازبوقیدن
-        setting_crop_images: در بوق‌های بازنشده، تصویرها را به ابعاد ۱۶×۹ کوچک کن
+        setting_boost_modal: نمایش پیغام تأیید پیش از تقویت کردن
+        setting_crop_images: در فرسته‌های ناگسترده، تصویرها را به ابعاد ‎۱۶×۹ کوچک کن
         setting_default_language: زبان نوشته‌های شما
         setting_default_privacy: حریم خصوصی نوشته‌ها
         setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن
@@ -160,7 +161,7 @@ fa:
         setting_display_media_default: پیش‌فرض
         setting_display_media_hide_all: نهفتن همه
         setting_display_media_show_all: نمایش همه
-        setting_expand_spoilers: همیشه بوق‌هایی را که هشدار محتوا دارند کامل نشان بده
+        setting_expand_spoilers: همیشه فرسته‌هایی را که هشدار محتوا دارند کامل نشان بده
         setting_hide_network: نهفتن شبکهٔ ارتباطی
         setting_noindex: درخواست از موتورهای جستجوگر برای ظاهر نشدن در نتایج جستجو
         setting_reduce_motion: کاستن از حرکت در پویانمایی‌ها
@@ -182,8 +183,8 @@ fa:
       featured_tag:
         name: برچسب
       interactions:
-        must_be_follower: مسدودکردن اعلان‌های همه به جز پیگیران
-        must_be_following: مسدودکردن اعلان‌های کسانی که شما پی نمی‌گیرید
+        must_be_follower: انسداد آگاهی‌ها از ناپی‌گیران
+        must_be_following: انسداد آگاهی‌ها از افرادی که پی نمی‌گیرید
         must_be_following_dm: مسدودکردن پیغام‌های خصوصی کسانی که شما پی نمی‌گیرید
       invite:
         comment: توضیح
@@ -197,22 +198,23 @@ fa:
           sign_up_requires_approval: محدود کردن ثبت نام‌ها
         severity: قانون
       notification_emails:
-        digest: خلاصه‌کردن چند اعلان در یک ایمیل
+        appeal: شخصی به تصمیم مدیر اعتراض کرد
+        digest: فرستادن رایانامه‌های خلاصه
         favourite: وقتی کسی نوشتهٔ شما را پسندید ایمیل بفرست
         follow: وقتی کسی پیگیر شما شد ایمیل بفرست
         follow_request: وقتی کسی درخواست پیگیری کرد ایمیل بفرست
         mention: وقتی کسی از شما نام برد ایمیل بفرست
         pending_account: وقتی حساب تازه‌ای نیاز به بازبینی داشت ایمیل بفرست
-        reblog: وقتی کسی نوشتهٔ شما را بازبوقید ایمیل بفرست
-        report: وقتی گزارش تازه‌ای فرستاده شد ایمیل بفرست
-        trending_tag: وقتی یک برچسب بازبینی‌نشده پرطرفدار شد ایمیل بفرست
+        reblog: وقتی کسی فرستهٔ شما را تقویت کرد ایمیل بفرست
+        report: گزارش جدیدی فرستاده شد
+        trending_tag: روند جدیدی نیازمند بازبینی است
       rule:
         text: قانون
       tag:
-        listable: بگذارید که این برچسب در جستجوها و در فهرست گزیدهٔ کاربران نمایش داده شود
+        listable: اجازه به این برچسب برای ظاهر شدن در جست‌وجوها و پیشنهادها
         name: برچسب
         trendable: بگذارید که این برچسب در موضوعات پرطرفدار دیده شود
-        usable: بگذارید که این برچسب در بوق‌ها به کار بروند
+        usable: بگذارید که این برچسب در فرسته‌ها به کار بروند
     'no': خیر
     recommended: توصیه می‌شود
     required:
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 770c3e9e0..cd9a034b5 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -7,6 +7,7 @@ fi:
       account_migration:
         acct: Määrittele käyttäjän käyttäjänimi@verkkotunnus, johon haluat siirtyä
       account_warning_preset:
+        text: Voit käyttää julkaisun syntaksia, kuten URL-osoitteita, hashtageja ja mainintoja
         title: Vapaaehtoinen. Ei näytetä vastaanottajalle
       admin_account_action:
         include_statuses: Käyttäjä näkee mitkä viestit johtivat toimenpiteeseen tai varoitukseen
@@ -22,44 +23,143 @@ fi:
         warning_preset_id: Valinnainen. Voit silti lisätä mukautetun tekstin esiasetuksen loppuun
       announcement:
         all_day: Kun valittu, vain valittu aikaväli näytetään
+        ends_at: Valinnainen. Ilmoitus tullaan poistamaan automaattisesti tällä hetkellä
         scheduled_at: Jätä tyhjäksi julkaistaksesi ilmoituksen välittömästi
+        starts_at: Valinnainen. Jos ilmoituksesi on sidottu tiettyyn aikaväliin
+        text: Voit käyttää julkaisun syntaksia. Muista, kuinka paljon tilaa ilmoitus vie käyttäjän näytöltä
+      appeal:
+        text: Voit valittaa varoituksesta vain kerran
       defaults:
+        autofollow: Henkilöt, jotka rekisteröityvät kutsun kautta, seuraavat sinua automaattisesti
         avatar: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         bot: Tämä tili suorittaa enimmäkseen automaattisia toimintoja eikä sitä ehkä valvota
+        context: Yksi tai useampi asiayhteys, jossa suodattimen pitäisi olla käytössä
+        current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
+        current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjätunnus
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
-        discoverable: Profiilihakemisto on toinen tapa, jolla tilisi voi tavoittaa laajemman yleisön
+        discoverable: Salli tuntemattomien löytää tilisi suositusten, trendien ja muiden ominaisuuksien kautta
         email: Sinulle lähetetään vahvistussähköposti
         fields: Sinulla voi olla korkeintaan 4 asiaa profiilissasi taulukossa
         header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
+        inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
+        irreversible: Suodatetut julkaisut katoavat lopullisesti, vaikka suodatin poistettaisiin myöhemmin
+        locale: Käyttöliittymän, sähköpostien ja ilmoitusten kieli
         locked: Sinun täytyy hyväksyä seuraajat manuaalisesti
+        password: Käytä vähintään 8 merkkiä
+        phrase: Täytetään riippumatta julkaisun kirjainkoon tai sisällön varoituksesta
+        scopes: Mihin sovellusliittymiin sovellus pääsee käsiksi. Jos valitset ylätason laajuuden, sinun ei tarvitse valita yksittäisiä.
+        setting_aggregate_reblogs: Älä näytä uusia tehosteita viesteille, joita on äskettäin tehostettu (koskee vain äskettäin saatuja tehosteita)
+        setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät aktiivisesti Mastodonia
+        setting_default_sensitive: Arkaluontoinen media on oletuksena piilotettu ja se voidaan näyttää yhdellä napsautuksella
         setting_display_media_default: Piilota arkaluonteiseksi merkitty media
         setting_display_media_hide_all: Piilota aina kaikki media
         setting_display_media_show_all: Näytä aina arkaluonteiseksi merkitty media
+        setting_hide_network: Ketä seuraat ja kuka seuraa sinua, piilotetaan profiiliisi
         setting_noindex: Vaikuttaa julkiseen profiiliisi ja tilasivuihisi
         setting_show_application: Viestittelyyn käyttämäsi sovellus näkyy viestiesi yksityiskohtaisessa näkymässä
         setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin, mutta sumentavat yksityiskohdat
+        setting_use_pending_items: Piilota aikajanan päivitykset napsautuksen taakse sen sijaan, että vierittäisi syötettä automaattisesti
+        username: Käyttäjänimesi tulee olemaan yksilöllinen %{domain}
+        whole_word: Kun avainsana tai lause on vain aakkosnumeerinen, se otetaan käyttöön, jos se vastaa koko sanaa
+      domain_allow:
+        domain: Tämä verkkotunnus voi noutaa tietoja tältä palvelimelta ja sieltä saapuvat tiedot käsitellään ja tallennetaan
+      email_domain_block:
+        domain: Tämä voi olla se verkkotunnus, joka näkyy sähköpostiosoitteessa tai MX tietueessa jota se käyttää. Ne tarkistetaan rekisteröitymisen yhteydessä.
+        with_dns_records: Annetun verkkotunnuksen DNS-tietueet yritetään ratkaista ja tulokset myös estetään
+      featured_tag:
+        name: 'Tässä muutamia aihetunnisteita, joita käytit viime aikoina:'
+      filters:
+        action: Valitse, mikä toiminto suoritetaan, kun viesti vastaa suodatinta
+        actions:
+          hide: Piilota suodatettu sisältö kokonaan ja käyttäydy ikään kuin sitä ei olisi olemassa
+          warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen otsikko
+      form_admin_settings:
+        backups_retention_period: Säilytä luodut arkistot määritetyn määrän päiviä.
+        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien suositusten yläpuolelle.
+        closed_registrations_message: Näkyy, kun ilmoittautuminen on suljettu
+        content_cache_retention_period: Viestit muilta palvelimilta poistetaan määritetyn määrän päiviä jälkeen, kun arvo on asetettu positiiviseksi. Tämä voi olla peruuttamatonta.
+        custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
+        mascot: Ohittaa kuvituksen edistyneessä käyttöliittymässä.
+        media_cache_retention_period: Ladatut mediatiedostot poistetaan määritetyn määrän päiviä jälkeen, kun arvo on positiivinen ja ladataan uudelleen pyynnöstä.
+        profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
+        require_invite_text: Kun kirjautuminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” teksti syötetään pakolliseksi eikä vapaaehtoiseksi
+        site_contact_email: Kuinka ihmiset voivat tavoittaa sinut oikeudellisissa tai tukikysymyksissä.
+        site_contact_username: Miten ihmiset voivat tavoittaa sinut Mastodonissa.
+        site_extended_description: Kaikki lisätiedot, jotka voivat olla hyödyllisiä kävijöille ja käyttäjille. Voidaan jäsentää Markdown-syntaksilla.
+        site_short_description: Lyhyt kuvaus auttaa yksilöimään palvelimesi. Kuka sitä johtaa, kenelle se on tarkoitettu?
+        site_terms: Käytä omaa tietosuojakäytäntöä tai jätä tyhjäksi, jos haluat käyttää oletusta. Voidaan jäsentää Markdown-syntaksilla.
+        site_title: Kuinka ihmiset voivat viitata palvelimeen sen verkkotunnuksen lisäksi.
+        theme: Teema, jonka uloskirjautuneet vierailijat ja uudet käyttäjät näkevät.
+        thumbnail: Noin 2:1 kuva näytetään palvelimen tietojen rinnalla.
+        timeline_preview: Uloskirjautuneet vierailijat voivat selata uusimpia julkisia viestejä, jotka ovat saatavilla palvelimella.
+        trendable_by_default: Ohita suositun sisällön manuaalinen tarkistus. Yksittäisiä kohteita voidaan edelleen poistaa jälkikäteen.
+        trends: Trendit osoittavat, mitkä viestit, hashtagit ja uutiset ovat saamassa vetoa palvelimellasi.
+      form_challenge:
+        current_password: Olet menossa suojatulle alueelle
       imports:
         data: Toisesta Mastodon-instanssista tuotu CSV-tiedosto
+      invite_request:
+        text: Tämä auttaa meitä arvioimaan hakemustasi
+      ip_block:
+        comment: Valinnainen. Muista miksi lisäsit tämän säännön.
+        expires_in: IP-osoitteet ovat rajallinen resurssi, joskus niitä jaetaan ja vaihtavat usein omistajaa. Tästä syystä epämääräisiä IP-lohkoja ei suositella.
+        ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia alueita käyttämällä CIDR-syntaksia. Varo, että et lukitse itseäsi!
+        severities:
+          no_access: Estä pääsy kaikkiin resursseihin
+          sign_up_block: Uudet kirjautumiset eivät ole mahdollisia
+          sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
+        severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
+      rule:
+        text: Kuvaile sääntöä tai vaatimusta tämän palvelimen käyttäjille. Yritä pitää se lyhyenä ja yksinkertaisena
       sessions:
         otp: Syötä puhelimeen saamasi kaksivaiheisen tunnistautumisen koodi tai käytä palautuskoodia.
+        webauthn: Jos kyseessä on USB-avain, muista laittaa se paikalleen ja tarvittaessa napauttaa sitä.
+      tag:
+        name: Voit muuttaa esimerkiksi kirjaimia paremmin luettavaksi
+      user:
+        chosen_languages: Kun valittu, vain valituilla kielillä julkaistut viestit näkyvät julkisilla aikajanoilla
+        role: Rooli määrää, mitkä käyttöoikeudet käyttäjällä on
+      user_role:
+        color: Väri, jota käytetään roolin koko käyttöliittymässä, RGB heksamuodossa
+        highlighted: Tämä tekee roolista julkisesti näkyvän
+        name: Roolin julkinen nimi, jos rooli on asetettu näytettäväksi mekkinä
+        permissions_as_keys: Käyttäjillä, joilla on tämä rooli, on käyttöoikeus...
+        position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimintoja voidaan suorittaa vain rooleille, joiden prioriteetti on pienempi
+      webhook:
+        events: Valitse lähetettävät tapahtumat
+        url: Mihin tapahtumat lähetetään
     labels:
       account:
         fields:
           name: Nimike
           value: Sisältö
+      account_alias:
+        acct: Vanhan tilin käsittely
+      account_migration:
+        acct: Uuden tilin käsittely
       account_warning_preset:
+        text: Esiasetettu teksti
         title: Otsikko
       admin_account_action:
+        include_statuses: Sisällytä raportoidut viestit sähköpostiin
+        send_email_notification: Ilmoita käyttäjälle sähköpostitse
         text: Mukautettu varoitus
         type: Toimenpide
         types:
           disable: Poista kirjautuminen käytöstä
           none: Älä tee mitään
+          sensitive: Arkaluontoinen
           silence: Hiljennä
           suspend: Poista käytöstä ja tuhoa käyttäjätunnuksen tiedot peruuttamattomasti
+        warning_preset_id: Käytä varoitusmallia
       announcement:
         all_day: Koko päivän kestävä tapahtuma
+        ends_at: Tapahtuman loppu
+        scheduled_at: Ajasta julkaisu
+        starts_at: Tapahtuman alku
         text: Ilmoitus
+      appeal:
+        text: Perustele, miksi tämä päätös olisi kumottava
       defaults:
         autofollow: Kutsu seuraamaan tiliäsi
         avatar: Profiilikuva
@@ -76,6 +176,9 @@ fi:
         expires_in: Vanhenee
         fields: Profiilin metadata
         header: Otsakekuva
+        honeypot: "%{label} (älä täytä)"
+        inbox_url: Välittäjän postilaatikon URL-osoite
+        irreversible: Pudota piilottamisen sijaan
         locale: Kieli
         locked: Lukitse tili
         max_uses: Käyttökertoja enintään
@@ -84,8 +187,9 @@ fi:
         otp_attempt: Kaksivaiheisen tunnistuksen koodi
         password: Salasana
         phrase: Avainsana tai lause
-        setting_advanced_layout: Ota käyttöön edistynyt web käyttöliittymä
+        setting_advanced_layout: Ota käyttöön edistynyt selainkäyttöliittymä
         setting_aggregate_reblogs: Ryhmitä boostaukset aikajanalla
+        setting_always_send_emails: Lähetä aina sähköposti-ilmoituksia
         setting_auto_play_gif: Toista GIF-animaatiot automaattisesti
         setting_boost_modal: Kysy vahvistusta ennen buustausta
         setting_crop_images: Rajaa kuvat avaamattomissa tuuttauksissa 16:9 kuvasuhteeseen
@@ -93,21 +197,25 @@ fi:
         setting_default_privacy: Julkaisun näkyvyys
         setting_default_sensitive: Merkitse media aina arkaluontoiseksi
         setting_delete_modal: Kysy vahvistusta ennen viestin poistamista
+        setting_disable_swiping: Poista pyyhkäisyt käytöstä
         setting_display_media: Median näyttäminen
         setting_display_media_default: Oletus
         setting_display_media_hide_all: Piilota kaikki
         setting_display_media_show_all: Näytä kaikki
+        setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt viestit
         setting_hide_network: Piilota verkkosi
-        setting_noindex: Jättäydy pois hakukoneindeksoinnista
+        setting_noindex: Jättäydy hakukoneindeksoinnin ulkopuolelle
         setting_reduce_motion: Vähennä animaatioiden liikettä
         setting_show_application: Näytä sovellus mistä lähetät viestejä
         setting_system_font_ui: Käytä järjestelmän oletusfonttia
         setting_theme: Sivuston teema
         setting_trends: Näytä päivän trendit
         setting_unfollow_modal: Kysy vahvistusta, ennen kuin lopetat seuraamisen
+        setting_use_blurhash: Näytä värikkäät liukuvärit piilotetulle medialle
         setting_use_pending_items: Hidastila
         severity: Vakavuus
         sign_in_token_attempt: Turvakoodi
+        title: Otsikko
         type: Tietojen laji
         username: Käyttäjänimi
         username_or_email: Käyttäjänimi tai sähköposti
@@ -116,6 +224,34 @@ fi:
         with_dns_records: Sisällytä toimialueen MX tietueet ja IP-osoite
       featured_tag:
         name: Aihetunniste
+      filters:
+        actions:
+          hide: Piilota kokonaan
+          warn: Piilota varoituksella
+      form_admin_settings:
+        backups_retention_period: Käyttäjän arkiston säilytysaika
+        bootstrap_timeline_accounts: Suosittele aina näitä tilejä uusille käyttäjille
+        closed_registrations_message: Mukautettu viesti, kun kirjautumisia ei ole saatavilla
+        content_cache_retention_period: Sisällön välimuistin säilytysaika
+        custom_css: Mukautettu CSS
+        mascot: Mukautettu maskotti (legacy)
+        media_cache_retention_period: Median välimuistin säilytysaika
+        profile_directory: Ota profiilihakemisto käyttöön
+        registrations_mode: Kuka voi rekisteröityä
+        require_invite_text: Vaadi syy liittyä
+        show_domain_blocks: Näytä domainestot
+        show_domain_blocks_rationale: Näytä miksi verkkotunnukset on estetty
+        site_contact_email: Ota yhteyttä sähköpostilla
+        site_contact_username: Kontaktin käyttäjänimi
+        site_extended_description: Laajennettu kuvaus
+        site_short_description: Palvelimen kuvaus
+        site_terms: Tietosuojakäytäntö
+        site_title: Palvelimen nimi
+        theme: Oletusteema
+        thumbnail: Palvelimen pikkukuva
+        timeline_preview: Salli todentamaton pääsy julkiselle aikajanalle
+        trendable_by_default: Salli trendit ilman ennakkotarkastusta
+        trends: Trendit käyttöön
       interactions:
         must_be_follower: Estä ilmoitukset käyttäjiltä, jotka eivät seuraa sinua
         must_be_following: Estä ilmoitukset käyttäjiltä, joita et seuraa
@@ -124,7 +260,16 @@ fi:
         comment: Kommentoi
       invite_request:
         text: Miksi haluat liittyä?
+      ip_block:
+        comment: Kommentti
+        ip: IP
+        severities:
+          no_access: Estä pääsy
+          sign_up_block: Estä kirjautumiset
+          sign_up_requires_approval: Rajoita rekisteröitymisiä
+        severity: Sääntö
       notification_emails:
+        appeal: Joku valittaa valvojan päätöksestä
         digest: Lähetä koosteviestejä sähköpostitse
         favourite: Lähetä sähköposti, kun joku tykkää tilastasi
         follow: Lähetä sähköposti, kun joku seuraa sinua
@@ -132,12 +277,33 @@ fi:
         mention: Lähetä sähköposti, kun sinut mainitaan
         pending_account: Uusi tili tarvitsee tarkastusta
         reblog: Lähetä sähköposti, kun joku buustaa julkaisusi
+        report: Uusi raportti on lähetetty
+        trending_tag: Uusi trendi vaatii tarkastelua
+      rule:
+        text: Sääntö
       tag:
+        listable: Salli tämän hashtagin näkyä hauissa ja ehdotuksissa
         name: Aihetunniste
         trendable: Salli tämän aihetunnisteen näkyä trendeissä
         usable: Salli postauksien käyttää tätä aihetunnistetta
+      user:
+        role: Rooli
+      user_role:
+        color: Merkin väri
+        highlighted: Näyttä rooli merkkinä käyttäjäprofiileissa
+        name: Nimi
+        permissions_as_keys: Oikeudet
+        position: Prioriteetti
+      webhook:
+        events: Tapahtumat käytössä
+        url: Päätepisteen URL
     'no': Ei
+    not_recommended: Ei suositella
     recommended: Suositeltu
     required:
+      mark: "*"
       text: pakollinen tieto
+    title:
+      sessions:
+        webauthn: Käytä jotakin suojausavainta kirjautuaksesi sisään
     'yes': Kyllä
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
new file mode 100644
index 000000000..84a695aca
--- /dev/null
+++ b/config/locales/simple_form.fo.yml
@@ -0,0 +1,309 @@
+---
+fo:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Upplýs brúkaranavn@navnaøki á kontuni, sum tú vilt flyta frá
+      account_migration:
+        acct: Upplýs brúkaranavn@navnaøki á kontuni, sum tú vilt flyta til
+      account_warning_preset:
+        text: Tú kanst brúka sama syntaks sum við postum, sosum URL'ar, frámerki og brúkaranøvn
+        title: Valfrítt. Ikki sjónligt fyri móttakaran
+      admin_account_action:
+        include_statuses: Brúkarin sær, hvørjir postar hava ført við sær umsjónaratgerðina ella ávaringina
+        send_email_notification: Brúkarin fer at móttaka eina frágreiðing um, hvat hendi við teirra kontu
+        text_html: Valfrítt. Tú kanst brúka sama syntaks sum í postum. Tú kann <a href="%{path}">leggja fastar ávaringarstillingar</a> fyri at spara tíð
+        type_html: Vel, hvat tú vil gera við <strong>%{acct}</strong>
+        types:
+          disable: Forða brúkaranum at brúka teirra kontu, men lat vera við at strika ella fjala teirra innihald.
+          none: Brúka hetta at senda eina ávaring til brúkaran, uttan at íverkseta nakra aðra atgerð.
+          sensitive: Flagga øll framtíðar miðlaviðfesti hjá brúkaranum sum viðkvom.
+          silence: Forða brúkaranum at posta alment, fjal teirra postar og fráboðanir frá fólki, sum ikki fylgja teimum.
+          suspend: Forða alt samskifti frá og til hesa kontuna og strika innihaldið hjá henni. Kann angrast innan 30 dagar.
+        warning_preset_id: Valfrítt. Tú kanst enn leggja serskildan tekst afturat undanstillingini
+      announcement:
+        all_day: Tá hetta er valt, verða einans dagfestingarnar í tíðarbilinum vístar
+        ends_at: Valfrítt. Kunngerðin verður sjálvvirkandi fjald, tá hendan tíðin er komin
+        scheduled_at: Lat vera blankt fyri at útgeva kunngerðina beinan vegin
+        starts_at: Valfrítt. Um so er, at kunngerðin hjá tær er avmarkað til eitt ávíst tíðarbil
+        text: Tú kanst brúka sama syntaks sum í postum. Gev gætur, hvussu nógv kunngerðin fyllir á skerminum hjá brúkaranum
+      appeal:
+        text: Tú kanst bara kæra eina atsókn eina ferð
+      defaults:
+        autofollow: Fólk, sum tilmelda seg gjøgnum innbjóðingina, fylgja tær sjálvvirkandi
+        avatar: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        bot: Tekin til onnur, at kontan í høvuðsheitum ger sjálvvirkandi atgerðir og møguliga ikki verður yvirvakað
+        context: Ein ella fleiri kontekstir, har sum filtrið skal brúkast
+        current_password: Av trygdarávum vinarliga les inn loyniorðið hjá verandi kontu
+        current_username: Fyri at vátta, vinarliga les inn brúkaranavnið á verandi kontu
+        digest: Einans sent eftir eitt langt tíðarskeið við óvirkni og einans um tú hevur móttikið persónlig boð meðan tú var burtur
+        discoverable: Loyv kontu tíni at verða funnin av fremmandum gjøgnum viðmæli, rák og aðrar hentleikar
+        email: Tú fær sendandi ein váttanarteldupost
+        fields: Tú kanst hava upp til 4 lutir vístar sum eina talvu á vanga tínum
+        header: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        inbox_url: Avrita URL'in frá forsíðuni hjá reiðlagnum, sum tú vilt brúka
+        irreversible: Filtreraðir postar blíva burtur med alla, eisini sjálvt um filtrið seinni verður strikað
+        locale: Málið, sum verður brúkt í brúkaramarkamótinum, teldupostum og skumpiboðum
+        locked: Stýr hvør kann fylgja tær við at góðtaka ella vraka umbønir um at fylgja
+        password: Skriva minst 8 tekin
+        phrase: Fer at samsvara óanæsð um tað er skrivað við lítlum ella stórum ella um postar hava innihaldsávaringar
+        scopes: Hvørji API nýtsluskipanin fær atgongd til. Velur tú eitt vav á hægsta stigi, so er ikki neyðugt at velja tey einstøku.
+        setting_aggregate_reblogs: Vís ikki nýggjar stimbranir fyri postar, sum nýliga eru stimbraðir (ávirkar einans stimbranir, ið eru móttiknar fyri kortum)
+        setting_always_send_emails: Vanliga vera teldupostfráboðanir ikki sendar, tá tú virkin brúkar Mastodon
+        setting_default_sensitive: Viðkvæmar miðlafílur eru fjaldar og kunnu avdúkast við einum klikki
+        setting_display_media_default: Fjal miðlafílur, sum eru merktar sum viðkvæmar
+        setting_display_media_hide_all: Fjal altíð miðlafílur
+        setting_display_media_show_all: Vís altíð miðlafílur
+        setting_hide_network: Tey, ið tú fylgir og tey, ið fylgja tær, verða ikki víst á tínum vanga
+        setting_noindex: Ávirkar almenna vangan og síður við postum hjá tær
+        setting_show_application: Nýtsluskipanin, sum tú brúkar at posta við, verður víst í nágreinligu vísingini av postum tínum
+        setting_use_blurhash: Gradientar eru grundaðir á litirnar av fjaldu myndunum, men grugga allar smálutir
+        setting_use_pending_items: Fjal tíðarlinjudagføringar aftan fyri eitt klikk heldur enn at skrulla tilføringina sjálvvirkandi
+        username: Brúkaranavnið hjá tær verður eindømi á %{domain}
+        whole_word: Tá lyklaorðið ella frasan einans hevur bókstavir og tøl, so verður hon einans nýtt, um tú samsvarar við alt orðið
+      domain_allow:
+        domain: Økisnavnið kann heinta dátur frá hesum ambætaranum og inngangandi dátur frá honum verða viðgjørdar og goymdar
+      email_domain_block:
+        domain: Hetta kann vera navnaøkið, sum sæst í teldupostinum ella í MX teigaraðnum, sum hann brúkar. Tey verða eftirkannaði í sambandi við tilmelding.
+        with_dns_records: Ein roynd at finna DNS teigarøðirnar hjá givna navnaøkinum verður gjørd, og úrslitini verða eisini blokeraði
+      featured_tag:
+        name: 'Her eru nakrir tvíkrossar, ið tú hevur brúkt í seinastuni:'
+      filters:
+        action: Vel, hvat skal henda, tá eitt uppslag svarar til filtrið
+        actions:
+          hide: Fjal filtreraða innihaldið fullkomiliga, ber seg at sum at tað ikki fanst
+          warn: Fjal filtreraða innihaldið aftan fyri eina ávaring, sum nevnir heitið á filtrinum
+      form_admin_settings:
+        backups_retention_period: Varðveit gjørd brúkarasøvn í ásetta talið av døgum.
+        bootstrap_timeline_accounts: Hesar kontur verða festar ovast á listanum yvir brúkarar, sum tey nýggju verða mælt til at fylgja.
+        closed_registrations_message: Víst tá stongt er fyri tilmeldingum
+        content_cache_retention_period: Postar frá øðrum ambætarum verða strikaðir eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði. Hetta kann møguliga ikki broytast.
+        custom_css: Tú kanst seta títt egna snið upp í net-útgávuni av Mastodon.
+        mascot: Skúgvar til viks myndprýðingina í framkomna vev-markamótinum.
+        media_cache_retention_period: Miðlafílur, sum eru tiknar niður, verða strikaðar eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði, og takast niður umaftur eftir ynski.
+        profile_directory: Vangaskráin listar allar brúkarar, sum hava valt at kunna uppdagast.
+        require_invite_text: Tá tilmeldingar krevja serskilda góðkenning, set so "Hví vil tú vera við?" tekstateigin til at vera kravdan heldur enn valfrían
+        site_contact_email: Hvussu fólk kunnu røkka teg við løgfrøðisligum og brúks-fyrispurningum.
+        site_contact_username: Hvussu fólk kunnu fáa fatur á tær á Mastodon.
+        site_extended_description: Fleiri upplýsingar, sum kunnu vera brúkiligir fyri vitjandi og tínar brúkarar. Kann brúka Markdown syntaks.
+        site_short_description: Ein stutt lýsing at eyðmerkja ambætaran hjá tær. Hvør rekur hann og hvønn er hann til?
+        site_terms: Brúka tín egna privatlívspolitikk ella lat vera blankt fyri at brúka tann sjálvsetta. Kann skrivast við Markdown syntaksi.
+        site_title: Hvussu fólk kunnu vísa til ambætaran hjá tær útyvir at brúka navnaøkið.
+        theme: Uppsetingareyðkenni, sum vitjandi, ið ikki eru ritaði inn, og nýggir brúkarar síggja.
+        thumbnail: Ein mynd í lutfallinum 2:1, sum verður víst saman við ambætaraupplýsingunum hjá tær.
+        timeline_preview: Vitjandi, sum eru ritaði út, fara at kunna blaða ígjøgnum nýggjastu almennu postarnar, sum eru tøkir á ambætaranum.
+        trendable_by_default: Loyp uppum serskilda eftirkannan av tilfari, sum er vælumtókt. Einstakir lutir kunnu framvegis strikast frá listum við vælumtóktum tilfari seinni.
+        trends: Listar við vælumtóktum tilfari vísa, hvørjir postar, frámerki og tíðindasøgur hava framburð á tínum ambætara.
+      form_challenge:
+        current_password: Tú ert á veg til eitt trygt øki
+      imports:
+        data: CSV fíla flutt út frá einum øðrum Mastodon ambætara
+      invite_request:
+        text: Hetta fer at hjálpa okkum at viðgera umsókn tína
+      ip_block:
+        comment: Valfrítt. Minst til, hví tú legði hesa regluna afturat.
+        expires_in: IP adressur eru avmarkað tilfeingi, tær eru summar tíðir deildar og ofta skifta tær hendur. Av hesi orsøk verður ikki viðmælt at hava óavmarkaðar IP-blokkar.
+        ip: Skriva eina IPv4 ella IPv6 adressu. Tú kanst blokera heilar røðir við at brúka CIDR syntaks. Ver varin, at tú ikki læsir teg sjálva/n úti!
+        severities:
+          no_access: Blokera atgongd til alt tilfeingi
+          sign_up_block: Nýggjar tilmeldingar verða ikki møguligar
+          sign_up_requires_approval: Nýggjar tilmeldingar fara at krevja tína góðkenning
+        severity: Vel, hvat skal henda við umbønum frá hesari IP adressuni
+      rule:
+        text: Lýs eina reglu ella eitt krav fyri brúkarar á hesum ambætaranum. Ger tað stutt og einfalt
+      sessions:
+        otp: 'Skriva tvey-faktor koduna frá telefon-appini ella brúka eina av tínum endurgerðskodum:'
+        webauthn: Er tað ein geymi, minst so til at seta hann í og, um neyðugt, pikka hann.
+      tag:
+        name: Tú kanst einans broyta millum stórar og smáar stavir, til dømis fyri at gera tað meira lesiligt
+      user:
+        chosen_languages: Tá hetta er valt, verða einans postar í valdum málum vístir á almennum tíðarlinjum
+        role: Leikluturin stýrir, hvørji loyvir brúkarin hevur
+      user_role:
+        color: Litur, sum leikluturin hevur í øllum brúkaramarkamótinum, sum RGB og upplýst sum sekstandatal
+        highlighted: Hetta ger, at leikluturin er alment sjónligur
+        name: Almenna navnið á leiklutinum, um leikluturin er settur at verða vístur sum eitt tignarmerki
+        permissions_as_keys: Brúkarar við hesum leiklutinum fara at fáa atgongd til...
+        position: Hægri leiklutur er avgerandi fyri loysn av ósemjum í ávísum støðum. Ávísar atgerðir kunnu einans verða gjørdar móti leiklutum, sum hava eina lægri raðfesting
+      webhook:
+        events: Vel hendingar at senda
+        url: Hvar hendingar verða sendar til
+    labels:
+      account:
+        fields:
+          name: Spjaldur
+          value: Innihald
+      account_alias:
+        acct: Brúkaranavn á gomlu kontuni
+      account_migration:
+        acct: Brúkaranavn á nýggju kontuni
+      account_warning_preset:
+        text: Undansettur tekstur
+        title: Heiti
+      admin_account_action:
+        include_statuses: Tak meldaða postin við í teldupostin
+        send_email_notification: Boða brúkaranum frá í telduposti
+        text: Tillagað ávaring
+        type: Atgerð
+        types:
+          disable: Fryst
+          none: Send eina ávaring
+          sensitive: Viðkvæmt
+          silence: Mark
+          suspend: Fyribils ikki í gildi
+        warning_preset_id: Brúka eina ávaringar-undanstilling
+      announcement:
+        all_day: Tiltak allan dagin
+        ends_at: Hending liðug
+        scheduled_at: Vel nær útgevast skal
+        starts_at: Tiltak byrjar
+        text: Kunngerð
+      appeal:
+        text: Greið frá, hví hendan avgerðin átti at verið kolldømd
+      defaults:
+        autofollow: Bjóða at fylgja tíni kontu
+        avatar: Eftirgjørdur skapningur
+        bot: Hetta er ein bot-konta
+        chosen_languages: Filtrera mál
+        confirm_new_password: Endurtak nýggja loyniorðið
+        confirm_password: Endurtak loyniorðið
+        context: Filtrera kontekstir
+        current_password: Núverandi loyniorð
+        data: Dáta
+        discoverable: Skjót kontuna upp fyri øðrum
+        display_name: Navn, sum skal vísast
+        email: Teldubrævabústaður
+        expires_in: Endar aftan á
+        fields: Metadátur hjá vanganum
+        header: Høvd
+        honeypot: "%{label} (ikki fylla út)"
+        inbox_url: URL'ur hjá innbakkanum hjá reiðlagnum
+        irreversible: Strika heldur enn at fjala
+        locale: Markamótsmál
+        locked: Krev umbønir um at fylgja
+        max_uses: Ikki brúka oftari enn
+        new_password: Nýtt loyniorð
+        note: Ævilýsing
+        otp_attempt: Tvey-faktor koda
+        password: Loyniorð
+        phrase: Lyklaorð ella frasa
+        setting_advanced_layout: Ger framkomið vevmarkamót virkið
+        setting_aggregate_reblogs: Bólka stimbranir í tíðarlinjum
+        setting_always_send_emails: Send altíð fráboðanir við telduposti
+        setting_auto_play_gif: Spæl teknimyndagjørdar GIFar sjálvvirkandi
+        setting_boost_modal: Vís váttanarmynd, áðrenn tú stimbrar postar
+        setting_crop_images: Sker myndir til lutfallið 16x9 í postum, sum ikki eru víðkaðir
+        setting_default_language: Mál, sum verður brúkt til postar
+        setting_default_privacy: Hvussu privatir eru postar?
+        setting_default_sensitive: Merk altíð miðlafílur sum viðkvæmar
+        setting_delete_modal: Vís váttanarmynd, áðrenn postar verða strikaðir
+        setting_disable_swiping: Ger sveipurørslur óvirknar
+        setting_display_media: Vístir miðlar
+        setting_display_media_default: Sjálvvirði
+        setting_display_media_hide_all: Fjal alt
+        setting_display_media_show_all: Vís alt
+        setting_expand_spoilers: Víðka altíð postar, sum eru merktir við innihaldsávaringum
+        setting_hide_network: Fjal sosiala grafin hjá tær
+        setting_noindex: Frábið tær indeksering á leitimaskinum
+        setting_reduce_motion: Minka um rørslu í teknimyndum
+        setting_show_application: Avdúka serskipan, sum verður brúkt til at senda postar
+        setting_system_font_ui: Brúka vanliga skriftaslagið hjá skipanini
+        setting_theme: Uppsetingareyðkenni
+        setting_trends: Vís dagsins rák
+        setting_unfollow_modal: Vís váttanarmynd, áðrenn tú gevst at fylgja onkrum
+        setting_use_blurhash: Vís litríkar gradientar fyri fjaldar miðlar
+        setting_use_pending_items: Spakulig støða
+        severity: Álvarssemi
+        sign_in_token_attempt: Trygdarkoda
+        title: Heiti
+        type: Slag av innflutningi
+        username: Brúkaranavn
+        username_or_email: Brúkaranavn ella teldupostur
+        whole_word: Heil orð
+      email_domain_block:
+        with_dns_records: Tak MX teigarøð og IP-adressur hjá navnaøkjum við
+      featured_tag:
+        name: Tvíkrossur
+      filters:
+        actions:
+          hide: Fjal fullkomiliga
+          warn: Fjal við eini ávaring
+      form_admin_settings:
+        backups_retention_period: Hvussu leingi verða brúkarasøvn goymd
+        bootstrap_timeline_accounts: Mæl altíð nýggjum brúkarum at fylgja hesar kontur
+        closed_registrations_message: Serskild boð, tá tað ikki er møguligt at tilmelda seg
+        content_cache_retention_period: Tíðarskeið, har innihaldgoymslan verður varðveitt
+        custom_css: Serskilt CSS
+        mascot: Serskildur maskottur (arvur)
+        media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
+        profile_directory: Ger vangaskrá virkna
+        registrations_mode: Hvør kann tilmelda seg
+        require_invite_text: Krev eina orsøk at luttaka
+        show_domain_blocks: Vís navnaøkisblokeringar
+        show_domain_blocks_rationale: Vís hví navnaøki vóru blokeraði
+        site_contact_email: Samband umvegis teldupost
+        site_contact_username: Brúkaranavn hjá umsitara
+        site_extended_description: Víðkað lýsing
+        site_short_description: Ambætaralýsing
+        site_terms: Privatlívspolitikkur
+        site_title: Ambætaranavn
+        theme: Sjálvvalt uppsetingareyðkenni
+        thumbnail: Ambætarasmámynd
+        timeline_preview: Loyv teimum, sum ikki eru ritaði inn, atgongd til almennar tíðarlinjur
+        trendable_by_default: Loyv vælumtóktum tilfari uttan at viðgera tað fyrst
+        trends: Loyv ráki
+      interactions:
+        must_be_follower: Blokera fráboðanum frá teimum, sum ikki fylgja tær
+        must_be_following: Blokera fráboðanum frá teimum, tú ikki fylgir
+        must_be_following_dm: Blokera beinleiðis boð frá fólki, sum tú ikki fylgir
+      invite:
+        comment: Viðmerk
+      invite_request:
+        text: Hví vil tú vera við?
+      ip_block:
+        comment: Viðmerking
+        ip: IP
+        severities:
+          no_access: Blokera atgongd
+          sign_up_block: Blokera tilmeldingar
+          sign_up_requires_approval: Avmarka tilmeldingar
+        severity: Regla
+      notification_emails:
+        appeal: Onkur kærir eina umsjónaravgerð
+        digest: Send ein teldupost við samandrátti
+        favourite: Onkur dámdi títt uppslag
+        follow: Onkur fylgdi tær
+        follow_request: Onkur biður um at fylgja tær
+        mention: Onkur nevndi teg
+        pending_account: Nýggj konta krevur viðgerð
+        reblog: Onkur stimbraði postin hjá tær
+        report: Nýggj melding er send inn
+        trending_tag: Broytt rák skal kannast
+      rule:
+        text: Regla
+      tag:
+        listable: Loyva hesum tvíkrossið, at verða vístur í leitingum og uppskotum
+        name: Tvíkrossur
+        trendable: Loyv hesum frámerki at síggjast undir rákum
+        usable: Loyva uppsløgum at brúka hendan tvíkross
+      user:
+        role: Leiklutur
+      user_role:
+        color: Litur á tignarmerki
+        highlighted: Vís leiklut sum tignarmerki á brúkaravangum
+        name: Navn
+        permissions_as_keys: Loyvi
+        position: Raðfesting
+      webhook:
+        events: Virknar hendingar
+        url: Endapunkts-URLur
+    'no': Nei
+    not_recommended: Ikki viðmælt
+    recommended: Viðmælt
+    required:
+      mark: "*"
+      text: kravt
+    title:
+      sessions:
+        webauthn: Brúka ein av tínum trygdarlyklum at rita inn
+    'yes': Ja
diff --git a/config/locales/simple_form.fr-QC.yml b/config/locales/simple_form.fr-QC.yml
new file mode 100644
index 000000000..41e14e5b2
--- /dev/null
+++ b/config/locales/simple_form.fr-QC.yml
@@ -0,0 +1,309 @@
+---
+fr-QC:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Spécifiez l’identifiant@domaine du compte que vous souhaitez faire migrer
+      account_migration:
+        acct: Spécifiez l’identifiant@domaine du compte vers lequel vous souhaitez migrer
+      account_warning_preset:
+        text: Vous pouvez utiliser la syntaxe des messages, comme les URL, les hashtags et les mentions
+        title: Facultatif. Invisible pour le destinataire
+      admin_account_action:
+        include_statuses: L’utilisateur·rice verra quels messages sont la source de l’action de modération ou de l’avertissement
+        send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
+        text_html: Facultatif. Vous pouvez utiliser la syntaxe des publications. Vous pouvez <a href="%{path}">ajouter des présélections d'attention</a> pour gagner du temps
+        type_html: Choisir que faire avec <strong>%{acct}</strong>
+        types:
+          disable: Empêcher l’utilisateur·rice d’utiliser son compte, mais ne pas supprimer ou masquer son contenu.
+          none: Utilisez ceci pour envoyer un avertissement à l’utilisateur·rice, sans déclencher aucune autre action.
+          sensitive: Forcer toutes les pièces jointes de cet·te utilisateur·rice à être signalées comme sensibles.
+          silence: Empêcher l’utilisateur·rice de poster avec une visibilité publique, cacher ses messages et ses notifications aux personnes qui ne les suivent pas.
+          suspend: Empêcher toute interaction depuis ou vers ce compte et supprimer son contenu. Réversible dans les 30 jours.
+        warning_preset_id: Facultatif. Vous pouvez toujours ajouter un texte personnalisé à la fin de la présélection
+      announcement:
+        all_day: Coché, seules les dates de l’intervalle de temps seront affichées
+        ends_at: Facultatif. La fin de l'annonce surviendra automatiquement à ce moment
+        scheduled_at: Laisser vide pour publier l’annonce immédiatement
+        starts_at: Facultatif. Si votre annonce est liée à une période spécifique
+        text: Vous pouvez utiliser la syntaxe des messages. Veuillez prendre en compte l’espace que l'annonce prendra sur l’écran de l'utilisateur·rice
+      appeal:
+        text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
+      defaults:
+        autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
+        avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
+        context: Un ou plusieurs contextes où le filtre devrait s’appliquer
+        current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
+        current_username: Pour confirmer, veuillez saisir le nom d'utilisateur de ce compte
+        digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
+        discoverable: Permet à votre compte d’être découvert par des inconnus par le biais de recommandations, de tendances et autres fonctionnalités
+        email: Vous recevrez un courriel de confirmation
+        fields: Vous pouvez avoir jusqu’à 4 éléments affichés en tant que tableau sur votre profil
+        header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        inbox_url: Copiez l’URL depuis la page d’accueil du relai que vous souhaitez utiliser
+        irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
+        locale: La langue de l’interface, des courriels et des notifications
+        locked: Nécessite que vous approuviez manuellement chaque abonné·e
+        password: Utilisez au moins 8 caractères
+        phrase: Sera filtré peu importe la casse ou l’avertissement de contenu du message
+        scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
+        setting_aggregate_reblogs: Ne pas afficher les nouveaux partages pour les messages déjà récemment partagés (n’affecte que les partages futurs)
+        setting_always_send_emails: Normalement, les notifications par courriel ne seront pas envoyées lorsque vous utilisez Mastodon activement
+        setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic
+        setting_display_media_default: Masquer les médias marqués comme sensibles
+        setting_display_media_hide_all: Toujours masquer les médias
+        setting_display_media_show_all: Toujours afficher les médias
+        setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
+        setting_noindex: Affecte votre profil public ainsi que vos messages
+        setting_show_application: Le nom de l’application que vous utilisez pour publier sera affichée dans la vue détaillée de vos messages
+        setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
+        setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
+        username: Votre nom d’utilisateur sera unique sur %{domain}
+        whole_word: Si le mot-clé ou la phrase est alphanumérique, alors le filtre ne sera appliqué que s’il correspond au mot entier
+      domain_allow:
+        domain: Ce domaine pourra récupérer des données de ce serveur et les données entrantes seront traitées et stockées
+      email_domain_block:
+        domain: Cela peut être le nom de domaine qui apparaît dans l'adresse courriel ou l'enregistrement MX qu'il utilise. Une vérification sera faite à l'inscription.
+        with_dns_records: Une tentative de résolution des enregistrements DNS du domaine donné sera effectuée et les résultats seront également mis sur liste noire
+      featured_tag:
+        name: 'Voici quelques hashtags que vous avez utilisés récemment :'
+      filters:
+        action: Choisir l'action à effectuer quand un message correspond au filtre
+        actions:
+          hide: Cacher complètement le contenu filtré, faire comme s'il n'existait pas
+          warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
+      form_admin_settings:
+        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
+        bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
+        closed_registrations_message: Affiché lorsque les inscriptions sont fermées
+        content_cache_retention_period: Les publications depuis d'autres serveurs seront supprimées après un nombre de jours spécifiés lorsque défini sur une valeur positive. Cela peut être irréversible.
+        custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
+        mascot: Remplace l'illustration dans l'interface Web avancée.
+        media_cache_retention_period: Les fichiers multimédias téléchargés seront supprimés après le nombre de jours spécifiés lorsque la valeur est positive, et seront téléchargés à nouveau sur demande.
+        profile_directory: L'annuaire des profils répertorie tous les utilisateurs qui ont opté pour être découverts.
+        require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
+        site_contact_email: Comment les personnes peuvent vous joindre pour des demandes de renseignements juridiques ou d'assistance.
+        site_contact_username: Comment les gens peuvent vous conracter sur Mastodon.
+        site_extended_description: Toute information supplémentaire qui peut être utile aux visiteurs et à vos utilisateurs. Peut être structurée avec la syntaxe Markdown.
+        site_short_description: Une courte description pour aider à identifier de manière unique votre serveur. Qui l'exécute, à qui il est destiné ?
+        site_terms: Utilisez votre propre politique de confidentialité ou laissez vide pour utiliser la syntaxe par défaut. Peut être structurée avec la syntaxe Markdown.
+        site_title: Comment les personnes peuvent se référer à votre serveur en plus de son nom de domaine.
+        theme: Thème que verront les utilisateur·rice·s déconnecté·e·s ainsi que les nouveaux·elles utilisateur·rice·s.
+        thumbnail: Une image d'environ 2:1 affichée à côté des informations de votre serveur.
+        timeline_preview: Les visiteurs déconnectés pourront parcourir les derniers messages publics disponibles sur le serveur.
+        trendable_by_default: Ignorer l'examen manuel du contenu tendance. Des éléments individuels peuvent toujours être supprimés des tendances après coup.
+        trends: Les tendances montrent quelles publications, hashtags et actualités sont en train de gagner en traction sur votre serveur.
+      form_challenge:
+        current_password: Vous entrez une zone sécurisée
+      imports:
+        data: Un fichier CSV généré par un autre serveur de Mastodon
+      invite_request:
+        text: Cela nous aidera à considérer votre demande
+      ip_block:
+        comment: Optionnel. Pour ne pas oublier pourquoi vous avez ajouté cette règle.
+        expires_in: Les adresses IP sont une ressource finie, elles sont parfois partagées et changent souvent de mains. Pour cette raison, les blocages d’IP indéfiniment ne sont pas recommandés.
+        ip: Entrez une adresse IPv4 ou IPv6. Vous pouvez bloquer des plages entières en utilisant la syntaxe CIDR. Faites attention à ne pas vous bloquer vous-même !
+        severities:
+          no_access: Bloquer l’accès à toutes les ressources
+          sign_up_block: Les nouvelles inscriptions ne seront pas possibles
+          sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
+        severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
+      rule:
+        text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple
+      sessions:
+        otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
+        webauthn: Si c'est une clé USB, assurez-vous de l'insérer et, si nécessaire, de la tapoter.
+      tag:
+        name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible
+      user:
+        chosen_languages: Lorsque coché, seuls les messages dans les langues sélectionnées seront affichés sur les fils publics
+        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice
+      user_role:
+        color: Couleur à attribuer au rôle dans l'interface, au format hexadécimal RVB
+        highlighted: Cela rend le rôle visible publiquement
+        name: Nom public du rôle, si le rôle est configuré pour être affiché avec un badge
+        permissions_as_keys: Les utilisateur·rice·s ayant ce rôle auront accès à …
+        position: Dans certaines situations, un rôle supérieur peut trancher la résolution d'un conflit. Mais certaines opérations ne peuvent être effectuées que sur des rôles ayant une priorité inférieure
+      webhook:
+        events: Sélectionnez les événements à envoyer
+        url: Là où les événements seront envoyés
+    labels:
+      account:
+        fields:
+          name: Étiquette
+          value: Contenu
+      account_alias:
+        acct: Identifiant de l’ancien compte
+      account_migration:
+        acct: L’identifiant du nouveau compte
+      account_warning_preset:
+        text: Texte de présélection
+        title: Titre
+      admin_account_action:
+        include_statuses: Inclure les messages signalés dans le courriel
+        send_email_notification: Notifier l’utilisateur par courriel
+        text: Attention personnalisée
+        type: Action
+        types:
+          disable: Désactiver
+          none: Ne rien faire
+          sensitive: Sensible
+          silence: Masquer
+          suspend: Suspendre et supprimer les données du compte de manière irréversible
+        warning_preset_id: Utiliser un modèle d’avertissement
+      announcement:
+        all_day: Événement de toute la journée
+        ends_at: Fin de l’événement
+        scheduled_at: Planifier la publication
+        starts_at: Début de l’événement
+        text: Annonce
+      appeal:
+        text: Expliquez pourquoi cette décision devrait être annulée
+      defaults:
+        autofollow: Invitation à suivre votre compte
+        avatar: Image de profil
+        bot: Ceci est un robot
+        chosen_languages: Filtrer les langues
+        confirm_new_password: Confirmation du nouveau mot de passe
+        confirm_password: Confirmation du mot de passe
+        context: Contextes du filtre
+        current_password: Mot de passe actuel
+        data: Données
+        discoverable: Suggérer ce compte aux autres
+        display_name: Nom public
+        email: Adresse courriel
+        expires_in: Expire après
+        fields: Métadonnées du profil
+        header: Image d’en-tête
+        honeypot: "%{label} (ne pas remplir)"
+        inbox_url: URL de la boîte de relais
+        irreversible: Supprimer plutôt que masquer
+        locale: Langue de l’interface
+        locked: Verrouiller le compte
+        max_uses: Nombre maximum d’utilisations
+        new_password: Nouveau mot de passe
+        note: Présentation
+        otp_attempt: Code d’identification à deux facteurs
+        password: Mot de passe
+        phrase: Mot-clé ou phrase
+        setting_advanced_layout: Activer l’interface Web avancée
+        setting_aggregate_reblogs: Grouper les partages dans les fils d’actualités
+        setting_always_send_emails: Toujours envoyer les notifications par courriel
+        setting_auto_play_gif: Lire automatiquement les GIFs animés
+        setting_boost_modal: Demander confirmation avant de partager un message
+        setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouverts en vue détaillée
+        setting_default_language: Langue de publication
+        setting_default_privacy: Confidentialité des messages
+        setting_default_sensitive: Toujours marquer les médias comme sensibles
+        setting_delete_modal: Demander confirmation avant de supprimer un message
+        setting_disable_swiping: Désactiver les actions par glissement
+        setting_display_media: Affichage des médias
+        setting_display_media_default: Défaut
+        setting_display_media_hide_all: Masquer tout
+        setting_display_media_show_all: Montrer tout
+        setting_expand_spoilers: Toujours déplier les messages marqués d’un avertissement de contenu
+        setting_hide_network: Cacher votre réseau
+        setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
+        setting_reduce_motion: Réduire la vitesse des animations
+        setting_show_application: Dévoiler l’application utilisée pour envoyer les messages
+        setting_system_font_ui: Utiliser la police par défaut du système
+        setting_theme: Thème du site
+        setting_trends: Afficher les tendances du jour
+        setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte
+        setting_use_blurhash: Afficher des dégradés colorés pour les médias cachés
+        setting_use_pending_items: Mode lent
+        severity: Sévérité
+        sign_in_token_attempt: Code de sécurité
+        title: Nom
+        type: Type d’import
+        username: Identifiant
+        username_or_email: Nom d’utilisateur·rice ou courriel
+        whole_word: Mot entier
+      email_domain_block:
+        with_dns_records: Inclure les enregistrements MX et IP du domaine
+      featured_tag:
+        name: Hashtag
+      filters:
+        actions:
+          hide: Cacher complètement
+          warn: Cacher derrière un avertissement
+      form_admin_settings:
+        backups_retention_period: Période d'archivage utilisateur
+        bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
+        closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+        content_cache_retention_period: Durée de rétention du contenu dans le cache
+        custom_css: CSS personnalisé
+        mascot: Mascotte personnalisée (héritée)
+        media_cache_retention_period: Durée de rétention des médias dans le cache
+        profile_directory: Activer l’annuaire des profils
+        registrations_mode: Qui peut s’inscrire
+        require_invite_text: Exiger une raison pour s’inscrire
+        show_domain_blocks: Afficher les blocages de domaines
+        show_domain_blocks_rationale: Montrer pourquoi les domaines ont été bloqués
+        site_contact_email: E-mail de contact
+        site_contact_username: Nom d'utilisateur du contact
+        site_extended_description: Description étendue
+        site_short_description: Description du serveur
+        site_terms: Politique de confidentialité
+        site_title: Nom du serveur
+        theme: Thème par défaut
+        thumbnail: Miniature du serveur
+        timeline_preview: Autoriser l’accès non authentifié aux fils publics
+        trendable_by_default: Autoriser les tendances sans révision préalable
+        trends: Activer les tendances
+      interactions:
+        must_be_follower: Bloquer les notifications des personnes qui ne vous suivent pas
+        must_be_following: Bloquer les notifications des personnes que vous ne suivez pas
+        must_be_following_dm: Bloquer les messages directs des personnes que vous ne suivez pas
+      invite:
+        comment: Commentaire
+      invite_request:
+        text: Pourquoi voulez-vous vous inscrire ?
+      ip_block:
+        comment: Commentaire
+        ip: IP
+        severities:
+          no_access: Bloquer l’accès
+          sign_up_block: Bloquer les inscriptions
+          sign_up_requires_approval: Limite des inscriptions
+        severity: Règle
+      notification_emails:
+        appeal: Une personne fait appel d'une décision des modérateur·rice·s
+        digest: Envoyer des courriels récapitulatifs
+        favourite: Quelqu’un a ajouté mon message à ses favoris
+        follow: Quelqu’un vient de me suivre
+        follow_request: Quelqu’un demande à me suivre
+        mention: Quelqu’un me mentionne
+        pending_account: Nouveau compte en attente d’approbation
+        reblog: Quelqu’un a partagé mon message
+        report: Nouveau signalement soumis
+        trending_tag: Nouvelle tendance nécessitant supervision
+      rule:
+        text: Règle
+      tag:
+        listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
+        name: Hashtag
+        trendable: Autoriser ce hashtag à apparaitre dans les tendances
+        usable: Autoriser les messages à utiliser ce hashtag
+      user:
+        role: Rôle
+      user_role:
+        color: Couleur du badge
+        highlighted: Afficher le rôle avec un badge sur les profils des utilisateur·rice·s
+        name: Nom
+        permissions_as_keys: Autorisations
+        position: Priorité
+      webhook:
+        events: Événements activés
+        url: URL du point de terminaison
+    'no': Non
+    not_recommended: Non recommandé
+    recommended: Recommandé
+    required:
+      mark: "*"
+      text: champs requis
+    title:
+      sessions:
+        webauthn: Utilisez l'une de vos clés de sécurité pour vous connecter
+    'yes': Oui
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 419f28cb9..73fb4f334 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -3,57 +3,59 @@ fr:
   simple_form:
     hints:
       account_alias:
-        acct: Spécifiez l’identifiant@domaine du compte que vous souhaitez migrer
+        acct: Spécifiez l’identifiant@domaine du compte que vous souhaitez faire migrer
       account_migration:
-        acct: Spécifiez l’identifiant@domaine du compte vers lequel vous souhaitez déménager
+        acct: Spécifiez l’identifiant@domaine du compte vers lequel vous souhaitez migrer
       account_warning_preset:
         text: Vous pouvez utiliser la syntaxe des messages, comme les URL, les hashtags et les mentions
         title: Facultatif. Invisible pour le destinataire
       admin_account_action:
-        include_statuses: L’utilisateur verra quels messages sont la source de l’action de modération ou de l’avertissement
+        include_statuses: L’utilisateur·rice verra quels messages sont la source de l’action de modération ou de l’avertissement
         send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
-        text_html: Optionnel. Vous pouvez utilisez la syntaxe des messages. Vous pouvez <a href="%{path}">ajouter des modèles d’avertissement</a> pour économiser du temps
+        text_html: Facultatif. Vous pouvez utiliser la syntaxe des publications. Vous pouvez <a href="%{path}">ajouter des présélections d'attention</a> pour gagner du temps
         type_html: Choisir que faire avec <strong>%{acct}</strong>
         types:
-          disable: Empêcher l’utilisateur d’utiliser son compte, mais ne pas supprimer ou masquer son contenu.
-          none: Utilisez ceci pour envoyer un avertissement à l’utilisateur, sans déclencher aucune autre action.
-          sensitive: Forcer toutes les pièces jointes de cet utilisateur à être signalées comme sensibles.
-          silence: Empêcher l’utilisateur de poster avec une visibilité publique, cacher ses messages et ses notifications aux personnes qui ne les suivent pas.
+          disable: Empêcher l’utilisateur·rice d’utiliser son compte, mais ne pas supprimer ou masquer son contenu.
+          none: Utilisez ceci pour envoyer un avertissement à l’utilisateur·rice, sans déclencher aucune autre action.
+          sensitive: Forcer toutes les pièces jointes de cet·te utilisateur·rice à être signalées comme sensibles.
+          silence: Empêcher l’utilisateur·rice de poster avec une visibilité publique, cacher ses messages et ses notifications aux personnes qui ne les suivent pas.
           suspend: Empêcher toute interaction depuis ou vers ce compte et supprimer son contenu. Réversible dans les 30 jours.
-        warning_preset_id: Optionnel. Vous pouvez toujours ajouter un texte personnalisé à la fin de la présélection
+        warning_preset_id: Facultatif. Vous pouvez toujours ajouter un texte personnalisé à la fin de la présélection
       announcement:
-        all_day: Si coché, seules les dates de l’intervalle de temps seront affichées
-        ends_at: Optionnel. L’annonce sera automatiquement dépubliée à ce moment
+        all_day: Coché, seules les dates de l’intervalle de temps seront affichées
+        ends_at: Facultatif. La fin de l'annonce surviendra automatiquement à ce moment
         scheduled_at: Laisser vide pour publier l’annonce immédiatement
-        starts_at: Optionnel. Si votre annonce est liée à une période spécifique
-        text: Vous pouvez utiliser la syntaxe des messages. Veuillez prendre en compte l’espace que l'annonce prendra sur l’écran de l'utilisateur
+        starts_at: Facultatif. Si votre annonce est liée à une période spécifique
+        text: Vous pouvez utiliser la syntaxe des messages. Veuillez prendre en compte l’espace que l'annonce prendra sur l’écran de l'utilisateur·rice
+      appeal:
+        text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
       defaults:
         autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
         avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
-        bot: Ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
+        bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         context: Un ou plusieurs contextes où le filtre devrait s’appliquer
-        current_password: Pour des raisons de sécurité, veuillez saisir le mot de passe du compte courant
-        current_username: Pour confirmer, veuillez saisir le nom d'utilisateur du compte courant
-        digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence
-        discoverable: L’annuaire des profils est une autre façon pour votre compte d’atteindre une plus grande audience
-        discoverable_no_directory: Permettre à des inconnu·e·s de découvrir votre compte par le biais des recommandations et autres fonctionnalités
+        current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
+        current_username: Pour confirmer, veuillez saisir le nom d'utilisateur de ce compte
+        digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
+        discoverable: Permet à votre compte d’être découvert par des inconnus par le biais de recommandations, de tendances et autres fonctionnalités
         email: Vous recevrez un courriel de confirmation
         fields: Vous pouvez avoir jusqu’à 4 éléments affichés en tant que tableau sur votre profil
         header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
-        inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
-        irreversible: Les messages filtrés disparaîtront pour toujours, même si le filtre est supprimé plus tard
+        inbox_url: Copiez l’URL depuis la page d’accueil du relai que vous souhaitez utiliser
+        irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
-        locked: Nécessite que vous approuviez manuellement chaque abonné
+        locked: Nécessite que vous approuviez manuellement chaque abonné·e
         password: Utilisez au moins 8 caractères
         phrase: Sera filtré peu importe la casse ou l’avertissement de contenu du message
         scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez une permission générale, vous n’avez pas besoin de sélectionner les permissions plus précises.
         setting_aggregate_reblogs: Ne pas afficher les nouveaux partages pour les messages déjà récemment partagés (n’affecte que les partages futurs)
+        setting_always_send_emails: Normalement, les notifications par courriel ne seront pas envoyées lorsque vous utilisez Mastodon activement
         setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic
         setting_display_media_default: Masquer les médias marqués comme sensibles
         setting_display_media_hide_all: Toujours masquer les médias
-        setting_display_media_show_all: Toujours montrer les médias
+        setting_display_media_show_all: Toujours afficher les médias
         setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
-        setting_noindex: Affecte votre profil public ainsi que vos statuts
+        setting_noindex: Affecte votre profil public ainsi que vos messages
         setting_show_application: Le nom de l’application que vous utilisez pour publier sera affichée dans la vue détaillée de vos messages
         setting_use_blurhash: Les dégradés sont basés sur les couleurs des images cachées mais n’en montrent pas les détails
         setting_use_pending_items: Cacher les mises à jour des fils d’actualités derrière un clic, au lieu de les afficher automatiquement
@@ -62,10 +64,36 @@ fr:
       domain_allow:
         domain: Ce domaine pourra récupérer des données de ce serveur et les données entrantes seront traitées et stockées
       email_domain_block:
-        domain: Ceci peut être le nom de domaine qui apparaît dans le courriel, l’enregistrement MX que le domaine résout, ou l’IP du serveur auquel l’enregistrement MX résout. Celles-ci seront vérifiées lors de l’inscription de l’utilisateur et l’inscription sera rejetée.
+        domain: Cela peut être le nom de domaine qui apparaît dans l'adresse courriel ou l'enregistrement MX qu'il utilise. Une vérification sera faite à l'inscription.
         with_dns_records: Une tentative de résolution des enregistrements DNS du domaine donné sera effectuée et les résultats seront également mis sur liste noire
       featured_tag:
-        name: 'Vous pourriez vouloir utiliser l’un d’entre eux :'
+        name: 'Voici quelques hashtags que vous avez utilisés récemment :'
+      filters:
+        action: Choisir l'action à effectuer quand un message correspond au filtre
+        actions:
+          hide: Cacher complètement le contenu filtré, faire comme s'il n'existait pas
+          warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
+      form_admin_settings:
+        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
+        bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
+        closed_registrations_message: Affiché lorsque les inscriptions sont fermées
+        content_cache_retention_period: Les publications depuis d'autres serveurs seront supprimées après un nombre de jours spécifiés lorsque défini sur une valeur positive. Cela peut être irréversible.
+        custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
+        mascot: Remplace l'illustration dans l'interface Web avancée.
+        media_cache_retention_period: Les fichiers multimédias téléchargés seront supprimés après le nombre de jours spécifiés lorsque la valeur est positive, et seront téléchargés à nouveau sur demande.
+        profile_directory: L'annuaire des profils répertorie tous les utilisateurs qui ont opté pour être découverts.
+        require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
+        site_contact_email: Comment les personnes peuvent vous joindre pour des demandes de renseignements juridiques ou d'assistance.
+        site_contact_username: Comment les gens peuvent vous contacter sur Mastodon.
+        site_extended_description: Toute information supplémentaire qui peut être utile aux visiteurs et à vos utilisateurs. Peut être structurée avec la syntaxe Markdown.
+        site_short_description: Une courte description pour aider à identifier de manière unique votre serveur. Qui l'exécute, à qui il est destiné ?
+        site_terms: Utilisez votre propre politique de confidentialité ou laissez vide pour utiliser la syntaxe par défaut. Peut être structurée avec la syntaxe Markdown.
+        site_title: Comment les personnes peuvent se référer à votre serveur en plus de son nom de domaine.
+        theme: Thème que verront les utilisateur·rice·s déconnecté·e·s ainsi que les nouveaux·elles utilisateur·rice·s.
+        thumbnail: Une image d'environ 2:1 affichée à côté des informations de votre serveur.
+        timeline_preview: Les visiteurs déconnectés pourront parcourir les derniers messages publics disponibles sur le serveur.
+        trendable_by_default: Ignorer l'examen manuel du contenu tendance. Des éléments individuels peuvent toujours être supprimés des tendances après coup.
+        trends: Les tendances montrent quelles publications, hashtags et actualités sont en train de gagner en traction sur votre serveur.
       form_challenge:
         current_password: Vous entrez une zone sécurisée
       imports:
@@ -75,9 +103,10 @@ fr:
       ip_block:
         comment: Optionnel. Pour ne pas oublier pourquoi vous avez ajouté cette règle.
         expires_in: Les adresses IP sont une ressource finie, elles sont parfois partagées et changent souvent de mains. Pour cette raison, les blocages d’IP indéfiniment ne sont pas recommandés.
-        ip: Entrez une adresse IPv4 ou IPv6. Vous pouvez bloquer des plages entières en utilisant la syntaxe CIDR. Faites attention à ne pas vous bloquer vous-même!
+        ip: Entrez une adresse IPv4 ou IPv6. Vous pouvez bloquer des plages entières en utilisant la syntaxe CIDR. Faites attention à ne pas vous bloquer vous-même !
         severities:
           no_access: Bloquer l’accès à toutes les ressources
+          sign_up_block: Les nouvelles inscriptions ne seront pas possibles
           sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
         severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
       rule:
@@ -89,6 +118,16 @@ fr:
         name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible
       user:
         chosen_languages: Lorsque coché, seuls les messages dans les langues sélectionnées seront affichés sur les fils publics
+        role: Le rôle définit quelles autorisations a l'utilisateur⋅rice
+      user_role:
+        color: Couleur à attribuer au rôle dans l'interface, au format hexadécimal RVB
+        highlighted: Cela rend le rôle visible publiquement
+        name: Nom public du rôle, si le rôle est configuré pour être affiché avec un badge
+        permissions_as_keys: Les utilisateur·rice·s ayant ce rôle auront accès à …
+        position: Dans certaines situations, un rôle supérieur peut trancher la résolution d'un conflit. Mais certaines opérations ne peuvent être effectuées que sur des rôles ayant une priorité inférieure
+      webhook:
+        events: Sélectionnez les événements à envoyer
+        url: Là où les événements seront envoyés
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ fr:
         scheduled_at: Planifier la publication
         starts_at: Début de l’événement
         text: Annonce
+      appeal:
+        text: Expliquez pourquoi cette décision devrait être annulée
       defaults:
         autofollow: Invitation à suivre votre compte
         avatar: Image de profil
@@ -129,8 +170,8 @@ fr:
         context: Contextes du filtre
         current_password: Mot de passe actuel
         data: Données
-        discoverable: Proposer ce compte aux autres
-        display_name: Afficher le nom
+        discoverable: Suggérer ce compte aux autres
+        display_name: Nom public
         email: Adresse courriel
         expires_in: Expire après
         fields: Métadonnées du profil
@@ -143,11 +184,12 @@ fr:
         max_uses: Nombre maximum d’utilisations
         new_password: Nouveau mot de passe
         note: Présentation
-        otp_attempt: Code d’identification à deux facteurs
+        otp_attempt: Code d’authentification à deux facteurs
         password: Mot de passe
         phrase: Mot-clé ou phrase
         setting_advanced_layout: Activer l’interface Web avancée
         setting_aggregate_reblogs: Grouper les partages dans les fils d’actualités
+        setting_always_send_emails: Toujours envoyer les notifications par courriel
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Demander confirmation avant de partager un message
         setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouverts en vue détaillée
@@ -173,6 +215,7 @@ fr:
         setting_use_pending_items: Mode lent
         severity: Sévérité
         sign_in_token_attempt: Code de sécurité
+        title: Nom
         type: Type d’import
         username: Identifiant
         username_or_email: Nom d’utilisateur·rice ou courriel
@@ -181,6 +224,34 @@ fr:
         with_dns_records: Inclure les enregistrements MX et IP du domaine
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Cacher complètement
+          warn: Cacher derrière un avertissement
+      form_admin_settings:
+        backups_retention_period: Période d'archivage utilisateur
+        bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
+        closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+        content_cache_retention_period: Durée de rétention du contenu dans le cache
+        custom_css: CSS personnalisé
+        mascot: Mascotte personnalisée (héritée)
+        media_cache_retention_period: Durée de rétention des médias dans le cache
+        profile_directory: Activer l’annuaire des profils
+        registrations_mode: Qui peut s’inscrire
+        require_invite_text: Exiger une raison pour s’inscrire
+        show_domain_blocks: Afficher les blocages de domaines
+        show_domain_blocks_rationale: Montrer pourquoi les domaines ont été bloqués
+        site_contact_email: E-mail de contact
+        site_contact_username: Nom d'utilisateur du contact
+        site_extended_description: Description étendue
+        site_short_description: Description du serveur
+        site_terms: Politique de confidentialité
+        site_title: Nom du serveur
+        theme: Thème par défaut
+        thumbnail: Miniature du serveur
+        timeline_preview: Autoriser l’accès non authentifié aux fils publics
+        trendable_by_default: Autoriser les tendances sans révision préalable
+        trends: Activer les tendances
       interactions:
         must_be_follower: Bloquer les notifications des personnes qui ne vous suivent pas
         must_be_following: Bloquer les notifications des personnes que vous ne suivez pas
@@ -194,9 +265,11 @@ fr:
         ip: IP
         severities:
           no_access: Bloquer l’accès
+          sign_up_block: Bloquer les inscriptions
           sign_up_requires_approval: Limite des inscriptions
         severity: Règle
       notification_emails:
+        appeal: Une personne fait appel d'une décision des modérateur·rice·s
         digest: Envoyer des courriels récapitulatifs
         favourite: Quelqu’un a ajouté mon message à ses favoris
         follow: Quelqu’un vient de me suivre
@@ -204,8 +277,8 @@ fr:
         mention: Quelqu’un me mentionne
         pending_account: Nouveau compte en attente d’approbation
         reblog: Quelqu’un a partagé mon message
-        report: Un nouveau rapport est envoyé
-        trending_tag: Un hashtag non approuvé est dans les tendances
+        report: Nouveau signalement soumis
+        trending_tag: Nouvelle tendance nécessitant supervision
       rule:
         text: Règle
       tag:
@@ -213,7 +286,19 @@ fr:
         name: Hashtag
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
         usable: Autoriser les messages à utiliser ce hashtag
+      user:
+        role: Rôle
+      user_role:
+        color: Couleur du badge
+        highlighted: Afficher le rôle avec un badge sur les profils des utilisateur·rice·s
+        name: Nom
+        permissions_as_keys: Autorisations
+        position: Priorité
+      webhook:
+        events: Événements activés
+        url: URL du point de terminaison
     'no': Non
+    not_recommended: Non recommandé
     recommended: Recommandé
     required:
       mark: "*"
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
new file mode 100644
index 000000000..0125ca40f
--- /dev/null
+++ b/config/locales/simple_form.fy.yml
@@ -0,0 +1,157 @@
+---
+fy:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Fermeld de brûkersnamme@domein fan de account fan wêr’t jo ferhúzje wolle
+      account_migration:
+        acct: Fermeld de brûkersnamme@domein fan de account wêr’t jo nei ta ferhúzje wolle
+      account_warning_preset:
+        text: Jo kinne spesifike tekst foar berjochten brûke, lykas URL’s, hashtags en fermeldingen
+        title: Opsjoneel. Net sichtber foar de ûntfanger
+      admin_account_action:
+        include_statuses: De brûker sjocht hokker berjochten ferantwurdlik binne foar de moderaasjemaatregel of warskôging
+        send_email_notification: De brûker ûntfangt in útlis oer wat der mei harren account bard is
+        text_html: Opsjoneel. Jo kinne spesifike tekst foar berjochten brûke. Om tiid te besparjen kinne jo <a href="%{path}">presets foar warskôgingen tafoegje</a>
+        type_html: Kies wat der mei <strong>%{acct}</strong> barre moat
+        types:
+          disable: Foarkom dat de brûker harren account brûkt, mar wiskje of ferstopje de ynhâld net.
+          none: Brûk dit om in warskôging nei de brûker te stjoeren, sûnder dat noch in oare maatregel nommen wurdt.
+          sensitive: Forsearje dat alle mediabylagen fan dizze brûker as gefoelich markearre wurde.
+          silence: Foarkom dat de brûker iepenbiere berjochten ferstjoere kin, ferstopje harren berjochten en meldingen foar minsken dy’t dyjinge net folgje.
+          suspend: Alle ynteraksjes fan en mei dizze account opkeare, en de accountgegevens fuortsmite. Dit kin binnen 30 dagen weromdraaid wurde.
+        warning_preset_id: Opsjoneel. Jo kinne noch hieltyd hânmjittich tekst tafoegje oan it ein fan de foarynstelling
+      announcement:
+        all_day: Wannear dit oanfinkt is, wurde allinnich de datums binnen it tiidrek toand
+        ends_at: Opsjoneel. De publikaasje fan de meidieling wurdt op dit tiidstip automatysk beëinige
+        scheduled_at: Lit leech om de meidieling daliks te publisearjen
+        starts_at: Opsjoneel. Yn it gefal dat jo meidieling oan in bepaald tiidrek bûn is
+        text: Jo kinne spesifike tekst foar berjochten brûke. Let op de romte dy’t de meidieling op it skerm fan de brûker yn nimt
+      appeal:
+        text: Jo kinne mar ien kear beswier yntsjinje tsjin in fêststelde oertrêding
+      defaults:
+        autofollow: Minsken dy’t harren fia de útnûging registrearre hawwe, folgje jo automatysk
+        avatar: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
+        bot: Sinjaal nei oare brûkers ta dat dizze account yn haadsaak automatisearre berjochten stjoert en mooglik net kontrolearre wurdt
+        context: Ien of meardere lokaasjes wêr’t it filter aktyf wêze moat
+        current_password: Fier foar feilichheidsredenen it wachtwurd fan jo aktuele account yn
+        current_username: Fier ta befêstiging de brûkersnamme fan jo aktuele account yn
+        digest: Wurdt allinnich nei in lange perioade fan ynaktiviteit ferstjoerd en allinnich wannear’t jo wylst jo ôfwêzigens persoanlike berjochten ûntfongen hawwe
+        discoverable: Tastean dat jo account te finen is foar ûnbekenden, fia oanrekommandaasjes, trends en op oare manieren
+        email: Jo krije in befêstigings-e-mailberjocht
+        fields: Jo kinne maksimaal 4 items as in tabel op jo profyl werjaan
+        header: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
+        inbox_url: Kopiearje de URL fan de foarside fan de relayserver dy’t jo brûke wolle
+        irreversible: Filtere berjochten ferdwine definityf, sels as it filter letter fuortsmiten wurdt
+        locale: De taal fan de brûkersomjouwing, e-mailberjochten en pushmeldingen
+        locked: Troch it goedkarren fan folgers hânmjittich bepale wa’t jo folgje mei
+        password: Brûk op syn minst 8 tekens
+        phrase: Komt oerien nettsjinsteande haad-/lytse letters of in ynhâldswarskôging
+        scopes: Ta hokker API’s hat de tapassing tagong. Wannear’t jo in tastimming fan it boppeste nivo kieze, hoege jo gjin yndividuele tastimmingen mear te kiezen.
+        setting_aggregate_reblogs: Gjin nije boosts toane foar berjochten dy’t resintlik noch boost binne (hat allinnich effekt op nij ûntfongen boosts)
+        setting_always_send_emails: Normaliter wurde der gjin e-mailmeldingen ferstjoerd wannear’t jo aktyf Mastodon brûke
+        setting_default_sensitive: Gefoelige media wurdt standert ferstoppe en kin mei ien klik toand wurde
+        setting_display_media_default: As gefoelich markearre media ferstopje
+        setting_display_media_hide_all: Media altyd ferstopje
+        setting_display_media_show_all: Media altyd toane
+        setting_hide_network: Wa’t jo folgje en wa’t jo folget wurdt net op jo profyl toand
+        setting_noindex: Hat ynfloed op jo iepenbiere profyl en siden mei berjochten
+        setting_show_application: De tapassing dy’t jo brûke om berjochten te pleatsen, wurdt yn de detaillearre werjefte fan it berjocht toand
+        setting_use_blurhash: Dizige kleuroergongen binne basearre op de kleuren fan de ferstoppe media, wêrmei elk detail ferdwynt
+        setting_use_pending_items: De tiidline wurdt bywurke troch op it oantal nije items te klikken, yn stee fan dat dizze automatysk bywurke wurdt
+        username: Jo brûkersnamme is unyk op %{domain}
+        whole_word: Wannear it trefwurd of part fan de sin alfanumeryk is, wurdt it allinnich filtere wannear’t it hiele wurd oerienkomt
+      domain_allow:
+        domain: Dit domein is yn steat om gegevens fan dizze server op te heljen, en ynkommende gegevens wurde ferwurke en bewarre
+      email_domain_block:
+        domain: Dit kin de domeinnamme wêze dy’t werjûn wurdt yn it e-mailadres of yn it MX-record dat it brûkt. Se wurde kontrolearre wylst de registraasje.
+        with_dns_records: Der wurdt in besykjen dien om de oanbelangjende DNS-records op te sykjen, wêrnei de resultaten ek blokkearre wurde
+      featured_tag:
+        name: 'Hjir binne inkelde fan de hashtags dy’t jo koartlyn brûkt hawwe:'
+    labels:
+      account:
+        fields:
+          name: Label
+          value: Ynhâld
+      account_alias:
+        acct: Mastodonadres fan it âlde account
+      account_migration:
+        acct: Mastodonadres fan it nije account
+      account_warning_preset:
+        text: Tekst fan preset
+        title: Titel
+      admin_account_action:
+        include_statuses: Rapportearre berjochten oan it e-mailberjocht tafoegje
+        send_email_notification: Meld dit per e-mailberjocht oan de brûker
+      announcement:
+        all_day: De hiele dei troch
+        ends_at: Einiget
+        scheduled_at: Meidieling ynplanne
+        starts_at: Begjint
+        text: Oankundiging
+      defaults:
+        avatar: Profylfoto
+        bot: Dit is in bot-account
+        chosen_languages: Talen filterje
+        confirm_new_password: Nij wachtwurd befêstigje
+        confirm_password: Wachtwurd befêstigje
+        context: Filterlokaasjes
+        current_password: Aktueel wachtwurd
+        data: Gegevens
+        discoverable: Dizze account oanrekommandearje litte en yn de brûkersgids toane
+        display_name: Werjeftenamme
+        email: E-mailadres
+        expires_in: Ferrint nei
+        fields: Profylmetadata
+        header: Omslachfoto
+        honeypot: "%{label} (net ynfolje)"
+        inbox_url: Relais-ynboks-URL
+        new_password: Nije wachtwurd
+        note: Bio
+        otp_attempt: Twa-stapstagangskoade
+        password: Wachtwurd
+        setting_display_media_default: Standert
+        setting_display_media_hide_all: Alles ferstopje
+        setting_display_media_show_all: Alles toane
+      form_admin_settings:
+        site_contact_email: E-mailadres kontaktpersoan
+        site_contact_username: Brûkersnamme kontaktpersoan
+        site_terms: Privacybelied
+        site_title: Servernamme
+        theme: Standerttema
+        thumbnail: Serverthumbnail
+        trends: Trends ynskeakelje
+      invite:
+        comment: Opmerking
+      invite_request:
+        text: Wêrom wolle jo jo hjir registrearje?
+      ip_block:
+        comment: Opmerking
+        ip: IP-adres
+        severities:
+          no_access: Tagong blokkearje
+          sign_up_block: Registraasjes blokkearje
+          sign_up_requires_approval: Registraasjes beheine
+        severity: Regel
+      notification_emails:
+        mention: Ien hat jo fermeld
+      rule:
+        text: Regel
+      tag:
+        name: Hashtag
+      user:
+        role: Rol
+      user_role:
+        color: Badgekleur
+        name: Namme
+        permissions_as_keys: Tastimmingen
+        position: Prioriteit
+      webhook:
+        url: Einpunt-URL
+    'no': Nee
+    not_recommended: Net oanrekommandearre
+    recommended: Oanrekommandearre
+    required:
+      mark: "*"
+      text: fereaske
+    'yes': Ja
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
new file mode 100644
index 000000000..997668a34
--- /dev/null
+++ b/config/locales/simple_form.ga.yml
@@ -0,0 +1,60 @@
+---
+ga:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Sonraigh ainm@fearann an chuntais ar mhaith leat aistriú uaidh
+      account_migration:
+        acct: Sonraigh ainm@fearann an chuntais ar mhaith leat aistriú chuige
+      admin_account_action:
+        types:
+          disable: Cuir cosc ar an úsáideoir a chuntas a úsáid, ach ná scrios nó folaigh a bhfuil ann.
+      defaults:
+        setting_display_media_hide_all: Folaítear meáin i gcónaí
+        setting_display_media_show_all: Go dtaispeántar meáin i gcónaí
+    labels:
+      account_warning_preset:
+        title: Teideal
+      admin_account_action:
+        text: Rabhadh saincheaptha
+        types:
+          none: Seol rabhadh
+      announcement:
+        text: Fógra
+      defaults:
+        avatar: Abhatár
+        data: Sonraí
+        display_name: Ainm taispeána
+        email: Seoladh ríomhphoist
+        header: Ceanntásc
+        note: Beathaisnéis
+        password: Pasfhocal
+        setting_display_media_default: Réamhshocrú
+        setting_display_media_hide_all: Cuir uile i bhfolach
+        setting_display_media_show_all: Taispeáin uile
+        setting_theme: Téama suímh
+        setting_trends: Taispeáin treochta an lae
+        title: Teideal
+        username: Ainm úsáideora
+      featured_tag:
+        name: Haischlib
+      filters:
+        actions:
+          hide: Cuir i bhfolach go hiomlán
+          warn: Cuir i bhfolach le rabhadh
+      form_admin_settings:
+        site_extended_description: Cur síos fada
+        site_short_description: Cur síos freastalaí
+        site_terms: Polasaí príobháideachais
+        site_title: Ainm freastalaí
+      ip_block:
+        ip: IP
+      notification_emails:
+        follow: Lean duine éigin tú
+        reblog: Mhol duine éigin do phostáil
+      tag:
+        name: Haischlib
+      user_role:
+        name: Ainm
+    required:
+      mark: "*"
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index cf124c967..090fbc552 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -10,7 +10,7 @@ gd:
         text: "’S urrainn dhut co-chàradh puist a chleachdadh, can URLaichean, tagaichean hais is iomraidhean"
         title: Roghainneil. Chan fhaic am faightear seo
       admin_account_action:
-        include_statuses: Chì an cleachdaiche dè na postaichean a dh’adhbharaich gnìomh na maorsainneachd no an rabhadh
+        include_statuses: Chì an cleachdaiche dè na postaichean a dh’adhbharaich gnìomh maorsainneachd no rabhadh
         send_email_notification: Ghaibh am faightear mìneachadh air dè thachair leis a’ chunntas aca
         text_html: Roghainneil. Faodaidh tu co-chàradh puist a chleachdadh. ’S urrainn dhut <a href="%{path}">rabhaidhean ro-shuidhichte a chur ris</a> airson ùine a chaomhnadh
         type_html: Tagh dè nì thu le <strong>%{acct}</strong>
@@ -18,54 +18,82 @@ gd:
           disable: Bac an cleachdaiche o chleachdadh a’ chunntais aca ach na sguab às no falaich an t-susbaint aca.
           none: Cleachd seo airson rabhadh a chur dhan chleachdaiche gun ghnìomh eile a ghabhail.
           sensitive: Èignich comharra gu bheil e frionasach air a h-uile ceanglachan meadhain a’ chleachdaiche seo.
-          silence: Bac an cleachdaiche o phostadh le faicsinneachd poblach, falaich na postaichean is brathan aca o na daoine nach eil a’ leantainn air.
+          silence: Bac an cleachdaiche o bhith a’ postadh le faicsinneachd poblach, falaich na postaichean aca agus brathan o na daoine nach eil ’ga leantainn.
           suspend: Bac conaltradh sam bith leis a’ chunntas seo agus sguab às an t-susbaint aige. Gabhaidh seo a neo-dhèanamh am broinn 30 latha.
         warning_preset_id: Roghainneil. ’S urrainn dhut teacsa gnàthaichte a chur ri deireadh an ro-sheata fhathast
       announcement:
         all_day: Nuair a bhios cromag ris, cha nochd ach cinn-latha na rainse-ama
         ends_at: Roghainneil. Thèid am brath-fios a neo-fhoillseachadh gu fèin-obrachail aig an àm ud
         scheduled_at: Fàg seo bàn airson am brath-fios fhoillseachadh sa bhad
-        starts_at: Roghainnean. Cleachd seo airson am brath-fios a chuingeachadh rè ama shònraichte
+        starts_at: Roghainneil. Cleachd seo airson am brath-fios a chuingeachadh rè ama shònraichte
         text: "’S urrainn dhut co-chàradh puist a chleachdadh. Thoir an aire air am meud a chaitheas am brath-fios air sgrìn an luchd-chleachdaidh"
+      appeal:
+        text: Chan urrainn dhut ath-thagradh a dhèanamh air rabhadh ach aon turas
       defaults:
-        autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh ort gu fèin-obrachail
+        autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh thu gu fèin-obrachail
         avatar: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         bot: Comharraich do chàch gu bheil an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir
         context: Na co-theacsaichean air am bi a’ chriathrag an sàs
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
-        discoverable: Ceadaich gun lorg coigrich an cunntas agad le taic o mholaidhean is gleusan eile
-        discoverable_no_directory: Ceadaich gun lorg coigrich an cunntas agad le taic o mholaidhean is gleusan eile
+        discoverable: Ceadaich gun rùraich coigrich an cunntas agad le taic o mholaidhean, treandaichean is gleusan eile
         email: Thèid post-d dearbhaidh a chur thugad
         fields: Faodaidh tu suas ri 4 nithean a shealltainn mar chlàr air a’ phròifil agad
         header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh
-        irreversible: Thèid postaichean criathraichte a-mach à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh uaireigin eile
+        irreversible: Thèid postaichean criathraichte à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh às dèidh làimhe
         locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh
-        locked: Stiùirich cò dh’fhaodas leantainn ort le gabhail ri iarrtasan leantainn a làimh
+        locked: Stiùirich cò dh’fhaodas ’gad leantainn le gabhail ri iarrtasan leantainn a làimh
         password: Cleachd co-dhiù 8 caractaran
         phrase: Thèid a mhaidseadh gun aire air litrichean mòra ’s beaga no air rabhadh susbainte puist
         scopes: Na APIan a dh’fhaodas an aplacaid inntrigeadh. Ma thaghas tu sgòp air ìre as àirde, cha leig thu leas sgòpaichean fa leth a thaghadh.
         setting_aggregate_reblogs: Na seall brosnachaidhean ùra do phostaichean a chaidh a bhrosnachadh o chionn goirid (cha doir seo buaidh ach air brosnachaidhean ùra o seo a-mach)
+        setting_always_send_emails: Mar as àbhaist, cha dèid brathan puist-d a chur nuair a a bhios tu ri Mastodon gu cunbhalach
         setting_default_sensitive: Thèid meadhanan frionasach fhalach a ghnàth is gabhaidh an nochdadh le briogadh orra
         setting_display_media_default: Falaich meadhanan ris a bheil comharra gu bheil iad frionasach
         setting_display_media_hide_all: Falaich na meadhanan an-còmhnaidh
         setting_display_media_show_all: Seall na meadhanan an-còmhnaidh
-        setting_hide_network: Thèid cò a tha thu a’ leantainn orra ’s an luchd-leantainn agad fhèin a chur am falach air a’ phròifil agad
+        setting_hide_network: Thèid cò a tha thu a’ leantainn ’s an luchd-leantainn agad fhèin a chur am falach air a’ phròifil agad
         setting_noindex: Bheir seo buaidh air a’ phròifil phoblach ’s air duilleagan nam postaichean agad
         setting_show_application: Chithear cò an aplacaid a chleachd thu airson post a sgrìobhadh ann an seallaidhean mionaideach nam postaichean agad
         setting_use_blurhash: Tha caiseadan stèidhichte air dathan nan nithean lèirsinneach a chaidh fhalach ach chan fhaicear am mion-fhiosrachadh
-        setting_use_pending_items: Falaich ùrachaidhean na loidhne-ama air cùlaibh briogaidh seach a bhith a’ sgroladh an inbhir gu fèin-obrachail
+        setting_use_pending_items: Falaich ùrachaidhean na loidhne-ama air cùlaibh briogaidh seach a bhith a’ sgroladh nam postaichean gu fèin-obrachail
         username: Bidh ainm-cleachdaiche àraidh agad air %{domain}
         whole_word: Mur eil ach litrichean is àireamhan san fhacal-luirg, cha dèid a chur an sàs ach ma bhios e a’ maidseadh an fhacail shlàin
       domain_allow:
         domain: "’S urrainn dhan àrainn seo dàta fhaighinn on fhrithealaiche seo agus thèid an dàta a thig a-steach uaithe a phròiseasadh ’s a stòradh"
       email_domain_block:
-        domain: Gabhaidh an t-ainm àrainne a nochdas san t-seòladh puist-d a chleachdadh no an clàr MX dhan dèid an àrainn fhuasgladh no IP an fhrithealaiche dhan dèid an clàr MX fuasgladh. Thèid an dearbhadh nuair a chlàraicheas cleachdaiche ùr leinn is thèid an clàradh a dhiùltadh.
+        domain: Seo ainm na h-àrainne a nochdas san t-seòladh puist-d no sa chlàr MX a chleachdas e. Thèid an dearbhadh aig àm a’ chlàraidh.
         with_dns_records: Thèid oidhirp a dhèanamh air fuasgladh clàran DNS na h-àrainne a chaidh a thoirt seachad agus thèid na toraidhean a bhacadh cuideachd
       featured_tag:
-        name: 'Mholamaid fear dhe na tagaichean seo:'
+        name: 'Seo cuid dhe na tagaichean hais a chleachd thu o chionn goirid:'
+      filters:
+        action: Tagh na thachras nuair a bhios post a’ maidseadh na criathraige
+        actions:
+          hide: Falaich an t-susbaint chriathraichte uile gu lèir mar nach robh i ann idir
+          warn: Falaich an t-susbaint chriathraichte air cùlaibh rabhaidh a dh’innseas tiotal na criathraige
+      form_admin_settings:
+        backups_retention_period: Cùm na tasg-lannan a chaidh a ghintinn dhan luchd-cleachdaidh rè an àireamh de làithean a shònraich thu.
+        bootstrap_timeline_accounts: Thèid na cunntasan seo a phrìneachadh air bàrr nam molaidhean leantainn dhan luchd-cleachdaidh ùr.
+        closed_registrations_message: Thèid seo a shealltainn nuair a bhios an clàradh dùinte
+        content_cache_retention_period: Thèid na postaichean o fhrithealaichean eile a sguabadh às às dèidh an àireamh de làithean a shònraich thu nuair a bhios luach dearbh air. Dh’fhaoidte nach gabh seo a neo-dhèanamh.
+        custom_css: "’S urrainn dhut stoidhlean gnàthaichte a chur an sàs air an tionndadh-lìn de Mhastodon."
+        mascot: Tar-àithnidh seo an sgead-dhealbh san eadar-aghaidh-lìn adhartach.
+        media_cache_retention_period: Thèid na faidhlichean meadhain air an luchdadh a-nuas a sguabadh às às dèidh an àireamh de làithean a shònraich thu nuair a bhios luach dearbh air agus an ath-luachdadh nuair a thèid an iarraidh an uairsin.
+        profile_directory: Seallaidh eòlaire nam pròifil liosta dhen luchd-cleachdaidh a dh’aontaich gun gabh an rùrachadh.
+        require_invite_text: Nuair a bhios aontachadh a làimh riatanach dhan chlàradh, dèan an raon teacsa “Carson a bu mhiann leat ballrachd fhaighinn?” riatanach seach roghainneil
+        site_contact_email: Mar a ruigear thu le ceistean laghail no taice.
+        site_contact_username: Mar a ruigear thu air Mastodon.
+        site_extended_description: Cuir fiosrachadh sam bith eile ris a bhios feumail do dh’aoighean ’s an luchd-cleachdaidh agad. ’S urrainn dhut structar a chur air le co-chàradh Markdown.
+        site_short_description: Tuairisgeul goirid a chuidicheas le aithneachadh sònraichte an fhrithealaiche agad. Cò leis is cò dha a tha e?
+        site_terms: Cleachd am poileasaidh prìobhaideachd agad fhèin no fàg bàn e gus am fear bunaiteach a chleachdadh. ’S urrainn dhut structar a chur air le co-chàradh Markdown.
+        site_title: An t-ainm a tha air an fhrithealaiche agad seach ainm àrainne.
+        theme: An t-ùrlar a chì na h-aoighean gun chlàradh a-staigh agus an luchd-cleachdaidh ùr.
+        thumbnail: Dealbh mu 2:1 a thèid a shealltainn ri taobh fiosrachadh an fhrithealaiche agad.
+        timeline_preview: "’S urrainn dha na h-aoighean gun chlàradh a-staigh na postaichean poblach as ùire a tha ri fhaighinn air an fhrithealaiche a bhrabhsadh."
+        trendable_by_default: Geàrr leum thar lèirmheas a làimh na susbainte a’ treandadh. Gabhaidh nithean fa leth a thoirt far nan treandaichean fhathast an uairsin.
+        trends: Seallaidh na treandaichean na postaichean, tagaichean hais is naidheachdan a tha fèill mhòr orra air an fhrithealaiche agad.
       form_challenge:
         current_password: Tha thu a’ tighinn a-steach gu raon tèarainte
       imports:
@@ -78,6 +106,7 @@ gd:
         ip: Cuir a-steach seòladh IPv4 no IPv6. ’S urrainn dhut rainsean gu lèir a bhacadh le co-chàradh CIDR. Thoir an aire nach gluais thu thu fhèin a-mach!
         severities:
           no_access: Bac inntrigeadh dha na goireasan uile
+          sign_up_block: Cha bhi ùr-chlàradh ceadaichte
           sign_up_requires_approval: Bidh cleachdaichean air an ùr-chlàradh feumach air d’ aonta
         severity: Tagh na thachras le iarrtasan on IP seo
       rule:
@@ -89,6 +118,16 @@ gd:
         name: Mar eisimpleir, ’s urrainn dhut measgachadh de litrichean mòra ’s beaga a chleachdadh ach an gabh a leughadh nas fhasa
       user:
         chosen_languages: Nuair a bhios cromag ris, cha nochd ach postaichean sna cànain a thagh thu air loidhnichean-ama poblach
+        role: Stiùiridh an dreuchd dè na ceadan a bhios aig cleachdaiche
+      user_role:
+        color: An datha a bhios air an dreuchd air feadh na h-eadar-aghaidh, ’na RGB san fhòrmat sia-dheicheach
+        highlighted: Le seo, chithear an dreuchd gu poblach
+        name: Ainm poblach na dreuchd ma chaidh a suidheachadh gun nochd i na baidse
+        permissions_as_keys: Gheibh na cleachdaichean aig a bheil an dreuchd seo inntrigeadh dha…
+        position: Ma tha còmhstri ann, buannaichidh an dreuchd as àirde ann an cuid a shuidheachaidhean. Tha gnìomhan sònraichte ann nach urrainn ach dreuchdan le prìomhachas ìosail a ghabhail
+      webhook:
+        events: Tagh na tachartasan a thèid a chur
+        url: Far an dèid na tachartasan a chur
     labels:
       account:
         fields:
@@ -110,7 +149,7 @@ gd:
           disable: Reòth
           none: Cuir rabhadh
           sensitive: Frionasach
-          silence: Crìoch
+          silence: Cuingich
           suspend: Cuir à rèim
         warning_preset_id: Cleachd rabhadh ro-shuidhichte
       announcement:
@@ -119,8 +158,10 @@ gd:
         scheduled_at: Cuir foillseachadh air an sgeideal
         starts_at: Toiseach an tachartais
         text: Brath-fios
+      appeal:
+        text: Mìnich carson a bu chòir an caochladh a chur orra
       defaults:
-        autofollow: Thoir cuireadh dhaibh airson leantainn air a’ chunntas agad
+        autofollow: Thoir cuireadh dhaibh airson an cunntas agad a leantainn
         avatar: Avatar
         bot: Seo cunntas bot
         chosen_languages: Criathraich na cànain
@@ -148,6 +189,7 @@ gd:
         phrase: Facal no abairt-luirg
         setting_advanced_layout: Cuir an comas an eadar-aghaidh-lìn adhartach
         setting_aggregate_reblogs: Buidhnich na brosnachaidhean air an loidhne-ama
+        setting_always_send_emails: Cuir brathan puist-d an-còmhnaidh
         setting_auto_play_gif: Cluich GIFs beòthaichte gu fèin-obrachail
         setting_boost_modal: Seall còmhradh dearbhaidh mus dèan thu brosnachadh
         setting_crop_images: Beàrr na dealbhan sna postaichean gun leudachadh air 16x9
@@ -168,11 +210,12 @@ gd:
         setting_system_font_ui: Cleachd cruth-clò bunaiteach an t-siostaim
         setting_theme: Ùrlar na làraich
         setting_trends: Seall na treandaichean an-diugh
-        setting_unfollow_modal: Seall còmhradh dearbhaidh mus sguir thu de leantainn air cuideigin
+        setting_unfollow_modal: Seall còmhradh dearbhaidh mus sguir thu de chuideigin a leantainn
         setting_use_blurhash: Seall caiseadan dathte an àite meadhanan falaichte
         setting_use_pending_items: Am modh slaodach
         severity: Donad
         sign_in_token_attempt: Còd-tèarainteachd
+        title: Tiotal
         type: Seòrsa an ion-phortaidh
         username: Ainm-cleachdaiche
         username_or_email: Ainm-cleachdaiche no post-d
@@ -181,10 +224,38 @@ gd:
         with_dns_records: Gabh a-steach clàran MX agus IPan na h-àrainne
       featured_tag:
         name: Taga hais
+      filters:
+        actions:
+          hide: Falaich uile gu lèir
+          warn: Falaich le rabhadh
+      form_admin_settings:
+        backups_retention_period: Ùine glèidhidh aig tasg-lannan an luchd-cleachdaidh
+        bootstrap_timeline_accounts: Mol na cunntasan seo do chleachdaichean ùra an-còmhnaidh
+        closed_registrations_message: Teachdaireachd ghnàthaichte nuair nach eil clàradh ri fhaighinn
+        content_cache_retention_period: Ùine glèidhidh aig tasgadan na susbainte
+        custom_css: CSS gnàthaichte
+        mascot: Suaichnean gnàthaichte (dìleabach)
+        media_cache_retention_period: Ùine glèidhidh aig tasgadan nam meadhanan
+        profile_directory: Cuir eòlaire nam pròifil an comas
+        registrations_mode: Cò dh’fhaodas clàradh
+        require_invite_text: Iarr adhbhar clàraidh
+        show_domain_blocks: Seall bacaidhean àrainne
+        show_domain_blocks_rationale: Seall carson a chaidh àrainnean a bacadh
+        site_contact_email: Post-d a’ chonaltraidh
+        site_contact_username: Ainm cleachdaiche a’ chonaltraidh
+        site_extended_description: Tuairisgeul leudaichte
+        site_short_description: Tuairisgeul an fhrithealaiche
+        site_terms: Poileasaidh prìobhaideachd
+        site_title: Ainm an fhrithealaiche
+        theme: An t-ùrlar bunaiteach
+        thumbnail: Dealbhag an fhrithealaiche
+        timeline_preview: Ceadaich inntrigeadh gun ùghdarrachadh air na loidhnichean-ama phoblach
+        trendable_by_default: Ceadaich treandaichean gun lèirmheas ro làimh
+        trends: Cuir na treandaichean an comas
       interactions:
-        must_be_follower: Mùch na brathan nach eil o luchd-leantainn
-        must_be_following: Mùch na brathan o dhaoine air nach lean thu
-        must_be_following_dm: Bac teachdaireachdan dìreach o dhaoine air nach lean thu
+        must_be_follower: Bac na brathan nach eil o luchd-leantainn
+        must_be_following: Bac na brathan o dhaoine nach lean thu
+        must_be_following_dm: Bac teachdaireachdan dìreach o dhaoine nach lean thu
       invite:
         comment: Beachd
       invite_request:
@@ -194,18 +265,20 @@ gd:
         ip: IP
         severities:
           no_access: Bac inntrigeadh
+          sign_up_block: Bac clàraidhean ùra
           sign_up_requires_approval: Cuingich clàraidhean ùra
         severity: Riaghailt
       notification_emails:
+        appeal: Tha cuideigin ag ath-thagradh co-dhùnadh na maorsainneachd
         digest: Cuir puist-d le geàrr-chunntas
         favourite: Is annsa le cuideigin am post agad
-        follow: Lean cuideigin ort
-        follow_request: Dh’iarr cuideigin leantainn ort
+        follow: Lean cuideigin thu
+        follow_request: Dh’iarr cuideigin ’gad leantainn
         mention: Thug cuideigin iomradh ort
         pending_account: Tha cunntas ùr feumach air lèirmheas
         reblog: Bhrosnaich cuideigin am post agad
         report: Chaidh gearan ùr a chur a-null
-        trending_tag: Tha taga hais gun lèirmheas a’ treandadh
+        trending_tag: Tha treand ùr ri lèirmheasadh
       rule:
         text: Riaghailt
       tag:
@@ -213,7 +286,19 @@ gd:
         name: Taga hais
         trendable: Leig leis an taga hais seo gun nochd e am measg nan treandaichean
         usable: Leig le postaichean an taga hais seo a chleachdadh
+      user:
+        role: Dreuchd
+      user_role:
+        color: Dathan na baidse
+        highlighted: Seall an dreuchd ’na baidse air pròifilean nan cleachdaichean
+        name: Ainm
+        permissions_as_keys: Ceadan
+        position: Prìomhachas
+      webhook:
+        events: Na tachartas an comas
+        url: URL na puinge-deiridh
     'no': Chan eil
+    not_recommended: Cha mholamaid seo
     recommended: Molta
     required:
       mark: "*"
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index e10067fd2..a94bb8efb 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -13,7 +13,7 @@ gl:
         include_statuses: A usuaria verá que publicacións causaron a acción da moderación ou aviso
         send_email_notification: A usuaria recibirá unha explicación sobre o que lle aconteceu a súa conta
         text_html: Optativo. Podes utilizar formato na publicación. Podes <a href="%{path}">engadir avisos preestablecidos</a> para aforrar tempo
-        type_html: Escolle que facer con <strong>%{acct}</strong>
+        type_html: Elixe que facer con <strong>%{acct}</strong>
         types:
           disable: Evitar que a usuaria utilice a súa conta, mais non eliminala ou agochar o seu contido.
           none: Utiliza esto para darlle un aviso á usuaria, se activar ningunha outra acción.
@@ -27,6 +27,8 @@ gl:
         scheduled_at: Déixao baleiro para publicar o anuncio de xeito inmediato
         starts_at: Opcional. No caso de que o teu anuncio estea vinculado a un intre de tempo específico
         text: Podes empregar a sintaxe na publicación. Ten en conta o espazo que ocupará o anuncio na pantalla da usuaria
+      appeal:
+        text: Só podes apelar a decisión unha vez
       defaults:
         autofollow: As persoas que se conectaron a través dun convite seguirante automáticamente
         avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
@@ -35,8 +37,7 @@ gl:
         current_password: Por razóns de seguridade, introduce o contrasinal da conta actual
         current_username: Para confirmar, introduce o nome de usuaria da conta actual
         digest: Enviar só tras un longo período de inactividade e só se recibiches algunha mensaxe directa na tua ausencia
-        discoverable: Permite que a túa conta poida ser descuberta por persoas descoñecidas a través de recomendacións e outras ferramentas
-        discoverable_no_directory: Permitir que a túa conta poida ser descuberta por extrañas a través das recomendacións e outras ferramentas
+        discoverable: Permite que a túa conta poida ser descuberta por persoas descoñecidas a través de recomendacións, tendencias e outras ferramentas
         email: Ímosche enviar un correo de confirmación
         fields: Podes ter ate 4 elementos no teu perfil mostrados como unha táboa
         header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
@@ -48,47 +49,85 @@ gl:
         phrase: Concordará independentemente das maiúsculas ou avisos de contido na publicación
         scopes: A que APIs terá acceso a aplicación. Se escolles un ámbito de alto nivel, non precisas seleccionar elementos individuais.
         setting_aggregate_reblogs: Non mostrar novas promocións de publicacións que foron promovidas recentemente (só afecta a promocións recén recibidas)
+        setting_always_send_emails: Como norma xeral non che enviamos correos electrónicos se usas activamente Mastodon
         setting_default_sensitive: Medios sensibles marcados como ocultos por defecto e móstranse cun click
         setting_display_media_default: Ocultar medios marcados como sensibles
         setting_display_media_hide_all: Ocultar sempre os medios
         setting_display_media_show_all: Mostrar sempre os medios marcados como sensibles
         setting_hide_network: Non se mostrará no teu perfil quen te segue e a quen estás a seguir
-        setting_noindex: Afecta ao teu perfil público e páxinas de estado
+        setting_noindex: Afecta ao teu perfil público e páxinas de publicación
         setting_show_application: A aplicación que estás a utilizar para enviar publicacións mostrarase na vista detallada da publicación
-        setting_use_blurhash: Os gradientes toman as cores da imaxe oculta pero esborranchando todos os detalles
+        setting_use_blurhash: Os gradientes toman as cores da imaxe oculta pero esvaecendo tódolos detalles
         setting_use_pending_items: Agochar actualizacións da cronoloxía tras un click no lugar de desprazar automáticamente os comentarios
         username: O teu nome de usuaria será único en %{domain}
         whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa
       domain_allow:
         domain: Este dominio estará en disposición de obter datos desde este servidor e datos de entrada a el poderán ser procesados e gardados
       email_domain_block:
-        domain: Esto pode ser o nome de dominio que aparece no enderezo do correo, o rexistro MX que resolve o dominio, ou o IP do servidor que resolve o rexistro MX. Estos confrontaranse contra o rexistro da usuaria e o rexistro será rexeitado.
+        domain: Este pode ser o nome de dominio que aparece no enderezo de email ou o rexistro MX que utiliza. Será comprobado no momento do rexistro.
         with_dns_records: Vaise facer un intento de resolver os rexistros DNS proporcionados e os resultados tamén irán a lista de bloqueo
       featured_tag:
-        name: 'Poderías usar algunha destas:'
+        name: 'Aquí tes algúns dos cancelos que usaches recentemente:'
+      filters:
+        action: Elixe a acción a realizar cando algunha publicación coincida co filtro
+        actions:
+          hide: Agochar todo o contido filtrado, facer coma se non existise
+          warn: Agochar o contido filtrado tras un aviso que conteña o nome do filtro
+      form_admin_settings:
+        backups_retention_period: Gardar os arquivos xerados pola usuaria durante o número de días indicado.
+        bootstrap_timeline_accounts: Estas contas aparecerán fixas na parte superior das recomendacións para as usuarias.
+        closed_registrations_message: Móstrase cando non se admiten novas usuarias
+        content_cache_retention_period: As publicacións desde outros servidores serán eliminadas despois do número de días indicados ao poñer un valor positivo. É unha acción irreversible.
+        custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
+        mascot: Sobrescribe a ilustración na interface web avanzada.
+        media_cache_retention_period: Os ficheiros multimedia descargados serán eliminados despois do número de días indicado ao establecer un valor positivo, e voltos a descargar baixo petición.
+        profile_directory: O directorio de perfís inclúe a tódalas usuarias que optaron por ser descubribles.
+        require_invite_text: Cando os rexistros requiren aprobación manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
+        site_contact_email: De que xeito se pode contactar contigo para temas legais ou obter axuda.
+        site_contact_username: De que xeito se pode contactar contigo en Mastodon.
+        site_extended_description: Calquera información adicional que poida ser útil para visitantes e usuarias. Pode utilizarse sintaxe Markdown.
+        site_short_description: Breve descrición que axuda a identificar de xeito único o teu servidor. Quen o xestiona, a quen vai dirixido?
+        site_terms: Escribe a túa propia política de privacidade ou usa o valor por defecto. Podes usar sintaxe Markdow.
+        site_title: De que xeito se pode referir o teu servidor ademáis do seu nome de dominio.
+        theme: Decorado que verán visitantes e novas usuarias.
+        thumbnail: Imaxe con proporcións 2:1 mostrada xunto á información sobre o servidor.
+        timeline_preview: Visitantes e usuarias non conectadas poderán ver as publicacións públicas máis recentes do servidor.
+        trendable_by_default: Omitir a revisión manual das tendencias. Poderás igualmente eliminar manualmente os elementos que vaian aparecendo.
+        trends: As tendencias mostran publicacións, cancelos e novas historias que teñen popularidade no teu servidor.
       form_challenge:
         current_password: Estás entrando nun área segura
       imports:
         data: Ficheiro CSV exportado desde outro servidor Mastodon
       invite_request:
-        text: Esto axudaranos a revisar a tua aplicación
+        text: Esto axudaranos a revisar a tua solicitude
       ip_block:
         comment: Opcional. Lembrar a razón para engadir esta regra.
         expires_in: Os enderezos IP son un recurso finito, a veces son compartidos e cambian de mans con frecuencia. Por esta razón, non se recomendan os bloqueos indefinidos de IPs.
         ip: Escribe un enderezo IPv4 ou IPv6. Podes bloquear rangos completos usando a sintaxe CIDR. Ten coidado e non te bloquees a ti mesma!
         severities:
           no_access: Bloquear acceso a tódolos recursos
+          sign_up_block: Non se poderán rexistrar novas contas
           sign_up_requires_approval: Os novos rexistros requerirán a túa aprobación
         severity: Escolle que acontecerá coas peticións desde este IP
       rule:
         text: Describe unha regra ou requerimento para as usuarias deste servidor. Intenta que sexa curta e simple
       sessions:
-        otp: 'Introduce o código do segundo factor creado pola aplicación do teu móbil ou usa un dos códigos de recuperación:'
+        otp: 'Escribe o código do segundo factor creado pola aplicación do teu móbil ou usa un dos códigos de recuperación:'
         webauthn: Se é unha chave USB asegúrate de que está conectada e preme o botón.
       tag:
         name: Só podes cambiar maiús/minúsculas, por exemplo, mellorar a lexibilidade
       user:
         chosen_languages: Se ten marca, só as publicacións nos idiomas seleccionados serán mostrados en cronoloxías públicas
+        role: O control dos roles adxudicados ás usuarias
+      user_role:
+        color: Cor que se usará para o rol a través da IU, como RGB en formato hex
+        highlighted: Isto fai o rol publicamente visible
+        name: Nome público do rol, se o rol se mostra como unha insignia
+        permissions_as_keys: As usuarias con este rol terán acceso a...
+        position: O rol superior decide nos conflitos en certas situacións. Algunhas accións só poden aplicarse sobre roles cunha prioridade menor
+      webhook:
+        events: Elixir eventos a enviar
+        url: A onde se enviarán os eventos
     labels:
       account:
         fields:
@@ -103,7 +142,7 @@ gl:
         title: Título
       admin_account_action:
         include_statuses: Incluír no correo as publicacións denunciadas
-        send_email_notification: Notificar a usuaria por correo-e
+        send_email_notification: Notificar á usuaria por email
         text: Aviso personalizado
         type: Acción
         types:
@@ -119,6 +158,8 @@ gl:
         scheduled_at: Publicación programada
         starts_at: Comezo do acontecemento
         text: Anuncio
+      appeal:
+        text: Indica a razón pola que habería que reverter a decisión
       defaults:
         autofollow: Convida a seguir a tua conta
         avatar: Avatar
@@ -137,7 +178,7 @@ gl:
         header: Cabeceira
         honeypot: "%{label} (non completar)"
         inbox_url: URL da caixa de entrada do repetidor
-        irreversible: Soltar en lugar de agochar
+        irreversible: Desbotar en lugar de agochar
         locale: Idioma da interface
         locked: Requerir aprobar seguimento
         max_uses: Número máximo de usos
@@ -148,6 +189,7 @@ gl:
         phrase: Palabra chave ou frase
         setting_advanced_layout: Activar interface web avanzada
         setting_aggregate_reblogs: Agrupar promocións nas cronoloxías
+        setting_always_send_emails: Enviar sempre notificacións por correo electrónico
         setting_auto_play_gif: Reprodución automática de GIFs animados
         setting_boost_modal: Pedir confirmación antes de promocionar
         setting_crop_images: Recortar imaxes a 16x9 en publicacións non despregadas
@@ -169,18 +211,47 @@ gl:
         setting_theme: Decorado da instancia
         setting_trends: Mostrar as tendencias de hoxe
         setting_unfollow_modal: Solicitar confirmación antes de deixar de seguir alguén
-        setting_use_blurhash: Mostrar gradientes coloridos para medios ocultos
+        setting_use_blurhash: Mostrar gradientes coloridos para multimedia oculto
         setting_use_pending_items: Modo lento
         severity: Severidade
         sign_in_token_attempt: Código de seguridade
+        title: Título
         type: Tipo de importación
         username: Nome de usuaria
-        username_or_email: Nome de usuaria ou Correo-e
+        username_or_email: Identificador ou Email
         whole_word: Palabra completa
       email_domain_block:
         with_dns_records: Incluír rexistros MX e IPs do dominio
       featured_tag:
         name: Cancelo
+      filters:
+        actions:
+          hide: Agochar completamente
+          warn: Agochar tras un aviso
+      form_admin_settings:
+        backups_retention_period: Período de retención do arquivo da usuaria
+        bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
+        closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
+        content_cache_retention_period: Período de retención da caché do contido
+        custom_css: CSS personalizado
+        mascot: Mascota propia (herdado)
+        media_cache_retention_period: Período de retención da caché multimedia
+        profile_directory: Activar o directorio de perfís
+        registrations_mode: Quen se pode rexistrar
+        require_invite_text: Pedir unha razón para unirse
+        show_domain_blocks: Amosar dominios bloqueados
+        show_domain_blocks_rationale: Explicar porque están bloqueados os dominios
+        site_contact_email: Email de contacto
+        site_contact_username: Nome do contacto
+        site_extended_description: Descrición ampla
+        site_short_description: Descrición do servidor
+        site_terms: Política de Privacidade
+        site_title: Nome do servidor
+        theme: Decorado por omisión
+        thumbnail: Icona do servidor
+        timeline_preview: Permitir acceso á cronoloxía pública sen autenticación
+        trendable_by_default: Permitir tendencias sen aprobación previa
+        trends: Activar tendencias
       interactions:
         must_be_follower: Bloquear as notificacións de non-seguidoras
         must_be_following: Bloquea as notificacións de persoas que non segues
@@ -194,9 +265,11 @@ gl:
         ip: IP
         severities:
           no_access: Bloquear acceso
+          sign_up_block: Bloquear novos rexistros
           sign_up_requires_approval: Limitar o rexistro
         severity: Regra
       notification_emails:
+        appeal: Alguén apelou contra a decisión da moderación
         digest: Enviar correos con resumos
         favourite: Enviar un correo cando alguén marca como favorita unha das tuas publicacións
         follow: Enviar un correo cando alguén te segue
@@ -204,8 +277,8 @@ gl:
         mention: Enviar un correo cando alguén te menciona
         pending_account: Enviar un correo cando unha nova conta precisa revisión
         reblog: Enviar un correo cando alguén promociona a tua mensaxe
-        report: Enviar un correo cando se envíe unha denuncia
-        trending_tag: Un cancelo ser revisar está sendo tendencia
+        report: Enviouse unha nova denuncia
+        trending_tag: Hai que revisar unha nova tendencia
       rule:
         text: Regra
       tag:
@@ -213,7 +286,19 @@ gl:
         name: Cancelo
         trendable: Permitir que este cancelo apareza en tendencias
         usable: Permitir que as publicacións utilicen este cancelo
+      user:
+        role: Rol
+      user_role:
+        color: Cor da insignia
+        highlighted: Mostrar rol como insignia en perfís de usuarias
+        name: Nome
+        permissions_as_keys: Permisos
+        position: Prioridade
+      webhook:
+        events: Eventos activados
+        url: URL do extremo
     'no': Non
+    not_recommended: Non é recomendable
     recommended: Recomendado
     required:
       mark: "*"
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 36d7cbf67..6c87e2bd6 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -2,27 +2,183 @@
 he:
   simple_form:
     hints:
+      account_alias:
+        acct: נא לציין משתמש@דומיין של החשבון ממנו תרצה/י לעבור
+      account_migration:
+        acct: נא לציין משתמש@דומיין של החשבון אליו תרצה/י לעבור
+      account_warning_preset:
+        text: ניתן להשתמש בתחביר הודעות, כגון קישוריות, תגיות ואזכורים
+        title: אופציונלי. בלתי נראה למקבל ההודעה
+      admin_account_action:
+        include_statuses: המשתמש יראה אילו הודעות גרמו לפעולה או לאזהרה
+        send_email_notification: המשתמש יקבל הסבר מה קרה לחשבונם
+        text_html: אופציונלי. ניתן להשתמש בתחביר הודעות. ניתן <a href="%{path}">להוסיף הגדרות אזהרה</a> כדי לחסוך זמן
+        type_html: נא לבחור מה לעשות עם <strong>%{acct}</strong>
+        types:
+          disable: מנעי מהמשתמש להשתמש בחשבונם, מבלי למחוק או להסתיר את תוכנו.
+          none: השתמשי בזה כדי לשלוח למשתמש אזהרה, מבלי לגרור פעולות נוספות.
+          sensitive: אלצי את כל קבצי המדיה המצורפים על ידי המשתמש להיות מסומנים כרגישים.
+          silence: מנעי מהמשתמש להיות מסוגל לחצרץ בנראות פומבית, החביאי את חצרוציהם והתראותיהם מאנשים שלא עוקבים אחריהם.
+          suspend: מנעי כל התקשרות עם חשבון זה ומחקי את תוכנו. ניתן לשחזור תוך 30 יום.
+        warning_preset_id: אופציונלי. ניתן עדיין להוסיף טקסט ייחודי לסוף ההגדרה
+      announcement:
+        all_day: אם נבחר, רק התאריכים בטווח הזמן יוצגו
+        ends_at: אופציונלי. הכרזות יוסרו באופן אוטומטי בזמן זה
+        scheduled_at: נא להשאיר ריק כדי לפרסם את ההכרזה באופן מיידי
+        starts_at: אופציונלי. במקרה שהכרזתך כבולה לטווח זמן ספציפי
+        text: ניתן להשתמש בתחביר הודעות. נא לשים לב לשטח שתתפוס ההכרזה על מסך המשתמש
+      appeal:
+        text: ניתן לערער על עברה רק פעם אחת
       defaults:
+        autofollow: אנשים שיצטרפו בעזרת ההזמנה יעקבו אחריך באופן אוטומטי
         avatar: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן ל-%{dimensions}px
+        bot: איתות לאחרים שהחשבון מבצע בעיקר פעולות אוטומטיות ועשוי לא להיות מנוטר
+        context: הקשר אחד או יותר בהם יופעל המסנן
+        current_password: מסיבות אבטחה נא להזין את הסיסמא של החשבון הנוכחי
+        current_username: על מנת לאשר, נא להכניס את שם המשתמש של החשבון הנוכחי
         digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך
+        discoverable: אשר/י לחשבונך להתגלות לזרים על ידי המלצות, נושאים חמים ושאר דרכים
+        email: דוא"ל אישור יישלח אליך
+        fields: ניתן להציג עד ארבעה פריטים כטבלה בפרופילך
         header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
+        inbox_url: נא להעתיק את הקישורית מדף הבית של הממסר בו תרצה/י להשתמש
+        irreversible: הודעות מסוננות יעלמו באופן בלתי הפיך, אפילו אם מאוחר יותר יוסר המסנן
+        locale: שפת ממשק המשתמש, הדוא"ל וההתראות בדחיפה
         locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת
+        password: נא להשתמש בלפחות 8 תוים
+        phrase: התאמה תמצא ללא תלות באזהרת תוכן בהודעה
+        scopes: לאיזה ממשק יורשה היישום לגשת. בבחירת תחום כללי, אין צורך לבחור ממשקים ספציפיים.
+        setting_aggregate_reblogs: לא להראות הדהודים של הודעות שהודהדו לאחרונה (משפיע רק על הדהודים שהתקבלו לא מזמן)
+        setting_always_send_emails: בדרך כלל התראות דוא"ל לא יישלחו בזמן שימוש פעיל במסטודון
+        setting_default_sensitive: מדיה רגישה מוסתרת כברירת מחדל וניתן להציגה בקליק
+        setting_display_media_default: הסתרת מדיה המסומנת כרגישה
+        setting_display_media_hide_all: הסתר מדיה תמיד
+        setting_display_media_show_all: גלה מדיה תמיד
+        setting_hide_network: עוקבייך ונעקבייך יוסתרו בפרופילך
         setting_noindex: משפיע על הפרופיל הציבורי שלך ועמודי ההודעות
+        setting_show_application: היישום בו נעשה שימוש כדי לחצרץ יופיע בתצוגה המפורטת של החצרוץ
+        setting_use_blurhash: הגראדיינטים מבוססים על תוכן התמונה המוסתרת, אבל מסתירים את כל הפרטים
+        setting_use_pending_items: הסתר עדכוני פיד מאחורי קליק במקום לגלול את הפיד אוטומטית
+        username: שם המשתמש שלך יהיה ייחודי ב- %{domain}
+        whole_word: אם מילת מפתח או ביטוי הם אלפאנומריים בלבד, הם יופעלו רק אם נמצאה התאמה למילה שלמה
+      domain_allow:
+        domain: דומיין זה יוכל לייבא מידע משרת זה והמידע המגיע ממנו יעובד ויאופסן
+      email_domain_block:
+        domain: זה יכול להיות שם הדומיין המופיע בכתובת הדוא"ל או רשומת ה-MX בה הוא משתמש. הם ייבדקו בהרשמה.
+        with_dns_records: ייעשה נסיון למצוא את רשומות ה-DNS של דומיין נתון והתוצאות ייחסמו גם הן
+      featured_tag:
+        name: 'הנה כמה מהתגיות שהשתמשת בהן לאחרונה:'
+      filters:
+        action: בחרו איזו פעולה לבצע כאשר הודעה מתאימה למסנן
+        actions:
+          hide: הסתר את התוכן המסונן, כאילו לא היה קיים
+          warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
+      form_admin_settings:
+        backups_retention_period: לשמור ארכיון משתמש שנוצר למשך מספר הימים המצוין.
+        bootstrap_timeline_accounts: חשבונות אלו יוצמדו לראש רשימת המלצות המעקב של משתמשים חדשים.
+        closed_registrations_message: להציג כאשר הרשמות חדשות אינן מאופשרות
+        content_cache_retention_period: הודעות משרתים אחרים ימחקו אחרי מספר הימים המצוין כאשר מצוין מספר חיובי. פעולה זו אינה הפיכה.
+        custom_css: ניתן לבחור ערכות סגנון אישיות בגרסת הדפדפן של מסטודון.
+        mascot: בחירת ציור למנשק הווב המתקדם.
+        media_cache_retention_period: קבצי מדיה שהורדו ימחקו אחרי מספר הימים שיצוינו אם נבחר מספר חיובי, או-אז יורדו שוב מחדש בהתאם לצורך.
+        profile_directory: מדריך הפרופילים מפרט את כל המשתמשים שביקשו להיות ניתנים לגילוי.
+        require_invite_text: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
+        site_contact_email: מה היא הדרך ליצור איתך קשר לצורך תמיכה או לצורך תאימות עם החוק.
+        site_contact_username: כיצד יכולים אחרים ליצור איתך קשר על רשת מסטודון.
+        site_extended_description: מידע נוסף שיהיה מועיל למבקרים ולמשתמשים שלך. ניתן לכתוב בתחביר מארקדאון.
+        site_short_description: תיאור קצר שיעזור להבחין בייחודיות השרת שלך. מי מריץ אותו, למי הוא מיועד?
+        site_terms: נסחו מדיניות פרטיות או השאירו ריק כדי להשתמש בברירת המחדל. ניתן לנסח בעזרת תחביר מארקדאון.
+        site_title: כיצד יקרא השרת שלך על ידי הקהל מלבד שם המתחם.
+        theme: ערכת המראה שיראו משתמשים חדשים ולא מחוברים.
+        thumbnail: תמונה ביחס 2:1 בערך שתוצג ליד המידע על השרת שלך.
+        timeline_preview: משתמשים מנותקים יוכלו לדפדף בהודעות ציר הזמן הציבורי שעל השרת.
+        trendable_by_default: לדלג על בדיקה ידנית של התכנים החמים. פריטים ספציפיים עדיין ניתנים להסרה לאחר מעשה.
+        trends: נושאים חמים יציגו אילו הודעות, תגיות וידיעות חדשות צוברות חשיפה על השרת שלך.
+      form_challenge:
+        current_password: את.ה נכנס. ת לאזור מאובטח
       imports:
         data: קובץ CSV שיוצא משרת מסטודון אחר
+      invite_request:
+        text: זה יעזור לנו בסקירת הבקשה שלך
+      ip_block:
+        comment: רשות. זכור/י מדוע הוספת את הכלל הזה.
+        expires_in: כתובות IP הם משאב מוגבל, לפעמים הם משותפים ולעתים קרובות מחליפים ידיים. לכן, חסימות IP לצמיתות לא מומלצות.
+        ip: נא להכניס כתובת IPv4 או IPv6. ניתן לחסום תחומים שלמים על ידי שימוש בתחביר CIDR. זהירות לא לנעול את עצמכם בחוץ!
+        severities:
+          no_access: חסימת גישה לכל המשאבים
+          sign_up_block: הרשמות חדשות לא יאופשרו
+          sign_up_requires_approval: הרשמות חדשות ידרשו את אישורך
+        severity: נא לבחור מה יקרה לבקשות מכתובת IP זו
+      rule:
+        text: נא לתאר את הכלל או הדרישה למשתמשים משרת זה. על התיאור להיות קצר ובהיר
       sessions:
-        otp: נא להקליד קוד אימות דו-שלבי ממכשירך או קוד אחזור גישה.
+        otp: 'נא להקליד קוד אימות דו-שלבי ממכשירך או להשתמש באחד מקודי אחזור הגישה שלך:'
+        webauthn: אם זהו מכשיר USB יש לוודא שהוא מוכנס, ואם יש צורך, להקיש עליו.
+      tag:
+        name: ניתן רק להחליף בין אותיות קטנות וגדולות, למשל כדי לשפר את הקריאות
+      user:
+        chosen_languages: אם פעיל, רק הודעות בשפות הנבחרות יוצגו לפידים הפומביים
+        role: התפקיד שולט על אילו הרשאות יש למשתמש
+      user_role:
+        color: צבע לתפקיד בממשק המשתמש, כ RGB בפורמט הקסדצימלי
+        highlighted: מאפשר נראות ציבורית של התפקיד
+        name: שם ציבורי של התפקיד, במידה והתפקיד מוגדר ככזה שמופיע כתג
+        permissions_as_keys: למשתמשים בתפקיד זה תהיה גישה ל...
+        position: תפקיד גבוה יותר מכריע בחילוקי דעות במצבים מסוימים. פעולות מסוימות יכולות להתבצע רק על תפקידים בדרגה נמוכה יותר
+      webhook:
+        events: בחר אירועים לשליחה
+        url: היעד שאליו יישלחו אירועים
     labels:
+      account:
+        fields:
+          name: תווית
+          value: תוכן
+      account_alias:
+        acct: שם משתמש של החשבון הישן
+      account_migration:
+        acct: שם משתמש של החשבון החדש
+      account_warning_preset:
+        text: טקסט קבוע מראש
+        title: כותרת
+      admin_account_action:
+        include_statuses: כלול הודעות מדווחות בהודעת הדוא"ל
+        send_email_notification: יידע את המשתמש באמצעות דוא"ל
+        text: התראה בהתאמה אישית
+        type: פעולה
+        types:
+          disable: הקפא
+          none: שלח התרעה
+          sensitive: רגיש
+          silence: הגבלה
+          suspend: השעייה
+        warning_preset_id: השתמש/י בטקסט מוכן מראש לאזהרה
+      announcement:
+        all_day: אירוע למשך כל היום
+        ends_at: סוף האירוע
+        scheduled_at: תיזמון פרסום
+        starts_at: תחילת האירוע
+        text: הכרזה
+      appeal:
+        text: הסבר מדוע יש להפוך את ההחלטה
       defaults:
+        autofollow: להזמין מעקב אחרי חשבונך
         avatar: תמונת פרופיל
+        bot: זהו חשבון מסוג בוט
+        chosen_languages: סינון שפות
         confirm_new_password: אישור סיסמא חדשה
         confirm_password: אישור סיסמא
+        context: סינון לפי הקשר
         current_password: סיסמא נוכחית
         data: מידע
+        discoverable: הצע חשבון לאחרים
         display_name: שם להצגה
         email: כתובת דוא"ל
         expires_in: תפוגה לאחר
-        header: ראשה
+        fields: מטא-נתונים על הפרופיל
+        header: כותרת
+        honeypot: "%{label} (לא למלא)"
+        inbox_url: קישורית לתיבת ממסר
+        irreversible: הסרה במקום הסתרה
         locale: שפה
         locked: הפוך חשבון לפרטי
         max_uses: מספר מרבי של שימושים
@@ -30,31 +186,124 @@ he:
         note: אודות
         otp_attempt: קוד אימות דו-שלבי
         password: סיסמא
+        phrase: מילת מפתח או ביטוי
+        setting_advanced_layout: אפשר ממשק ווב מתקדם
+        setting_aggregate_reblogs: קבץ הדהודים זהים
+        setting_always_send_emails: תמיד שלח התראות לדוא"ל
         setting_auto_play_gif: ניגון אוטומטי של גיפים
         setting_boost_modal: הצגת דיאלוג אישור לפני הדהוד
+        setting_crop_images: קטום תמונות בהודעות לא מורחבות ל 16 על 9
+        setting_default_language: שפת ברירת מחדל להודעה
         setting_default_privacy: פרטיות ההודעות
         setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה
         setting_delete_modal: להראות תיבת אישור לפני מחיקת חיצרוץ
+        setting_disable_swiping: ביטול החלקת-צד
+        setting_display_media: תצוגת מדיה
+        setting_display_media_default: ברירת מחדל
+        setting_display_media_hide_all: להסתיר הכל
+        setting_display_media_show_all: להציג הכול
+        setting_expand_spoilers: להרחיב תמיד הודעות מסומנות באזהרת תוכן
+        setting_hide_network: להחביא את הגרף החברתי שלך
         setting_noindex: לבקש הסתרה ממנועי חיפוש
         setting_reduce_motion: הפחתת תנועה בהנפשות
+        setting_show_application: הצגת הישום ששימש לפרסום ההודעה
         setting_system_font_ui: להשתמש בגופן ברירת המחדל של המערכת
         setting_theme: ערכת העיצוב של האתר
+        setting_trends: הצגת הנושאים החמים
         setting_unfollow_modal: להראות תיבת אישור לפני הפסקת מעקב אחרי אחרים
+        setting_use_blurhash: הצגת גראדיינטים צבעוניים למדיה מוסתרת
+        setting_use_pending_items: מצב איטי
         severity: חומרה
+        sign_in_token_attempt: קוד אבטחה
+        title: כותרת
         type: סוג יבוא
         username: שם משתמש
+        username_or_email: שם משתמש או דוא"ל
+        whole_word: מילה שלמה
+      email_domain_block:
+        with_dns_records: לכלול רשומות MX וכתובות IP של הדומיין
+      featured_tag:
+        name: תגית
+      filters:
+        actions:
+          hide: הסתרה כוללת
+          warn: הסתרה עם אזהרה
+      form_admin_settings:
+        backups_retention_period: תקופת השמירה של ארכיון המשתמש
+        bootstrap_timeline_accounts: המלצה על חשבונות אלה למשתמשים חדשים
+        closed_registrations_message: הודעה מיוחדת כשההרשמה לא מאופשרת
+        content_cache_retention_period: תקופת שמירת מטמון תוכן
+        custom_css: CSS בהתאמה אישית
+        mascot: סמל השרת (ישן)
+        media_cache_retention_period: תקופת שמירת מטמון מדיה
+        profile_directory: הפעלת ספריית פרופילים
+        registrations_mode: מי יכולים לפתוח חשבון
+        require_invite_text: לדרוש סיבה להצטרפות
+        show_domain_blocks: הצגת חסימת דומיינים
+        show_domain_blocks_rationale: הצגת סיבות חסימה למתחמים
+        site_contact_email: דואל ליצירת קשר
+        site_contact_username: שם משתמש של איש קשר
+        site_extended_description: תיאור מורחב
+        site_short_description: תיאור השרת
+        site_terms: מדיניות פרטיות
+        site_title: שם השרת
+        theme: ערכת נושא ברירת מחדל
+        thumbnail: תמונה ממוזערת מהשרת
+        timeline_preview: הרשאת גישה בלתי מאומתת לפיד הפומבי
+        trendable_by_default: הרשאה לפריטים להופיע בנושאים החמים ללא אישור מוקדם
+        trends: אפשר פריטים חמים (טרנדים)
       interactions:
         must_be_follower: חסימת התראות משאינם עוקבים
         must_be_following: חסימת התראות משאינם נעקבים
         must_be_following_dm: חסימת הודעות ישירות מכותבים שאינם במעקב
+      invite:
+        comment: הערה
+      invite_request:
+        text: למה תרצה/י להצטרף?
+      ip_block:
+        comment: הערה
+        ip: IP
+        severities:
+          no_access: חסימת גישה
+          sign_up_block: חסימת הרשמות
+          sign_up_requires_approval: הגבלת הרשמות
+        severity: כלל
       notification_emails:
+        appeal: מישהם מערערים על החלטת מנהל קהילה
         digest: שליחת הודעות דוא"ל מסכמות
-        favourite: שליחת דוא"ל כשמחבבים חצרוץ
+        favourite: שליחת דוא"ל כשמחבבים הודעה
         follow: שליחת דוא"ל כשנוספות עוקבות
         follow_request: שליחת דוא"ל כשמבקשים לעקוב
         mention: שליחת דוא"ל כשפונים אלייך
-        reblog: שליחת דוא"ל כשמהדהדים חצרוץ שלך
+        pending_account: נדרשת סקירה של חשבון חדש
+        reblog: שליחת דוא"ל כשמהדהדים הודעה שלך
+        report: דו"ח חדש הוגש
+        trending_tag: נושאים חמים חדשים דורשים סקירה
+      rule:
+        text: כלל
+      tag:
+        listable: הרשה/י לתגית זו להופיע בחיפושים והצעות
+        name: תגית
+        trendable: הרשה/י לתגית זו להופיע תחת נושאים חמים
+        usable: הרשה/י להודעות להכיל תגית זו
+      user:
+        role: תפקיד
+      user_role:
+        color: צבע תג
+        highlighted: הצג תפקיד כתג בפרופיל משתמש
+        name: שם
+        permissions_as_keys: הרשאות
+        position: עדיפות
+      webhook:
+        events: אירועים מאופשרים
+        url: כתובת URL של נקודת הקצה
     'no': לא
+    not_recommended: לא מומלצים
+    recommended: מומלץ
     required:
+      mark: "*"
       text: שדה חובה
+    title:
+      sessions:
+        webauthn: נא להשתמש באחד ממפתחות האבטחה שלך כדי להכנס
     'yes': כן
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index b328ea267..be1ba159f 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -20,13 +20,15 @@ hu:
           sensitive: Ennek a felhasználónak minden médiatartalmát jelöljük meg kényesként.
           silence: Megakadályozzuk, hogy ez a felhasználó nyilvános láthatóságú bejegyzést tegyen közzé, elrejtjük a bejegyzéseit és a róla szóló értesítéseket azok elől, akik nem közvetlen követői.
           suspend: Minden interakciót megakadályozunk ezzel a fiókkal és töröljük a tartalmát. 30 napon belül még visszacsinálható.
-        warning_preset_id: Opcionális. A figyelmeztetés végére saját szöveget is írhatsz
+        warning_preset_id: Nem kötelező. A figyelmeztetés végére saját szöveget is írhatsz.
       announcement:
         all_day: Bejelölve csak a dátumok számítanak majd a megadott intervallumból
         ends_at: Opcionális. A közleményt ekkor automatikusan levesszük
         scheduled_at: Hagyd üresen, hogy a közleményt azonnal közzétegyük
         starts_at: Opcionális. Akkor használd, ha a közleményed adott időintervallumra vonatkozik
         text: Használhatod a bejegyzések szintaxisát. Ügyelj arra, hogy mennyi helyet foglal el majd a közlemény a felhasználó képernyőjén
+      appeal:
+        text: Egy vétséget csak egyszer fellebbezhetsz meg
       defaults:
         autofollow: Akik meghívón keresztül regisztrálnak, automatikusan követni fognak téged
         avatar: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
@@ -35,8 +37,7 @@ hu:
         current_password: Biztonsági okok miatt kérlek, írd be a jelenlegi fiók jelszavát
         current_username: A jóváhagyáshoz írd be a jelenlegi fiók felhasználói nevét
         digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
-        discoverable: A profil adatbázis egy újabb mód, ahogyan a fiókod szélesebb tömegeket érhet el
-        discoverable_no_directory: Engedélyezzük, hogy a fiókod idegenek által megtalálható legyen javaslatokon és más funkciókon keresztül
+        discoverable: Engedélyezés, hogy a fiókod idegenek által megtalálható legyen javaslatokon, trendeken és más funkciókon keresztül
         email: Kapsz egy megerősítő e-mailt
         fields: A profilodon legfeljebb 4 bejegyzés szerepelhet táblázatos formában
         header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
@@ -45,9 +46,10 @@ hu:
         locale: A felhasználói felület, e-mailek, push üzenetek nyelve
         locked: Egyenként engedélyezned kell a követőidet
         password: Legalább 8 karakter
-        phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalom-figyelmeztetések mögött is
+        phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalmi figyelmeztetések mögött is
         scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket.
         setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan bejegyzésekhez, melyeket nemrég toltak meg (csak új megtolásokra lép életbe)
+        setting_always_send_emails: Alapesetben nem küldünk e-mail értesítéseket, ha aktívan használod a Mastodont
         setting_default_sensitive: A kényes médiatartalmat alapesetben elrejtjük, de egyetlen kattintással előhozható
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
         setting_display_media_hide_all: Mindig minden média elrejtése
@@ -60,28 +62,55 @@ hu:
         username: A felhasználói neved egyedi lesz a %{domain} domainen
         whole_word: Ha a kulcsszó alfanumerikus, csak akkor minősül majd találatnak, ha teljes szóra illeszkedik
       domain_allow:
-        domain: Ez a domain adatot kérhet le a szerverünkről és az ettől érkező adatokat feldolgozzuk és mentjük
+        domain: Ez a domain adatokat kérhet le erről a kiszolgálóról, és a bejövő adatok fel lesznek dolgozva és tárolva lesznek
       email_domain_block:
-        domain: Lehet domain név, mely az email címben szerepel, MX rekord, amire a domain hivatkozik vagy a szerver IP címe, amire az MX rekord hivatkozik. Ezeket regisztrációkor ellenőrizzük és visszautasítjuk a regisztrációt, ha szükséges.
+        domain: Ez lehet az e-mail címben szereplő domain név vagy az MX rekord, melyet ez használ. Ezeket feliratkozáskor ellenőrizzük.
         with_dns_records: Megpróbáljuk a megadott domain DNS rekordjait lekérni, és az eredményeket hozzáadjuk a tiltólistához
       featured_tag:
-        name: 'Ezeket esetleg használhatod:'
+        name: 'Itt vannak azok a hashtagek, melyeket legutóbb használtál:'
+      filters:
+        action: A végrehajtandó műveletet, ha a bejegyzés megfelel a szűrőnek
+        actions:
+          hide: A szűrt tartalom teljes elrejtése, mintha nem is létezne
+          warn: A szűrt tartalom a szűrő címét említő figyelmeztetés mögé rejtése
+      form_admin_settings:
+        backups_retention_period: Az előállított felhasználói archívumok megtartása a megadott napokig.
+        bootstrap_timeline_accounts: Ezek a fiókok ki lesznek tűzve az új felhasználók követési javaslatainak élére.
+        closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
+        content_cache_retention_period: A más kiszolgálókról származó bejegyzések megadott számú nap után törölve lesznek, ha pozitív értékre van állítva. Ez lehet, hogy nem fordítható vissza.
+        custom_css: A Mastodon webes verziójában használhatsz egyedi stílusokat.
+        mascot: Felülvágja a haladó webes felületen található illusztrációt.
+        media_cache_retention_period: A letöltött médiafájlok megadott számú nap után törölve lesznek, ha pozitív értékre van állítva, és igény szerint újból le lesznek töltve.
+        profile_directory: A profilok jegyzéke minden olyan felhasználót felsorol, akik engedélyezték a felfedezhetőségüket.
+        require_invite_text: Ha a regisztrációhoz manuális jóváhagyásra van szükség, akkor a „Miért akarsz csatlakozni?” válasz kitöltése legyen kötelező, és ne opcionális
+        site_contact_email: Hogyan érhetnek el jogi vagy támogatási kérésekkel.
+        site_contact_username: Hogyan érhetnek el Mastodonon.
+        site_extended_description: Bármilyen egyéb információ, mely hasznos lehet a látogatóid vagy felhasználóid számára. Markdown szintaxis használható.
+        site_short_description: Rövid leírás, amely segíthet a kiszolgálód egyedi azonosításában. Ki futtatja, kinek készült?
+        site_terms: Használd a saját adatvédelmi irányelveidet, vagy hagyd üresen az alapértelmezett használatához. Markdown szintaxis használható.
+        site_title: Hogyan hivatkozhatnak mások a kiszolgálódra a domain nevén kívül.
+        theme: A téma, melyet a kijelentkezett látogatók és az új felhasználók látnak.
+        thumbnail: Egy durván 2:1 arányú kép, amely a kiszolgálóinformációk mellett jelenik meg.
+        timeline_preview: A kijelentkezett látogatók továbbra is böngészhetik a kiszolgáló legfrissebb nyilvános bejegyzéseit.
+        trendable_by_default: Kézi felülvizsgálat kihagyása a felkapott tartalmaknál. Az egyes elemek utólag távolíthatók el a trendek közül.
+        trends: A trendek azt mondják meg, hogy mely bejegyzések, hashtagek és hírbejegyzések felkapottak a kiszolgálódon.
       form_challenge:
         current_password: Beléptél egy biztonsági térben
       imports:
-        data: Egy másik Mastodon szerverről exportált CSV fájl
+        data: Egy másik Mastodon kiszolgálóról exportált CSV-fájl
       invite_request:
         text: Ez segít nekünk átnézni a jelentkezésedet
       ip_block:
-        comment: Opcionális. Emlékeztető, hogy miért is vetted fel ezt a szabályt.
+        comment: Nem kötelező. Emlékeztető, hogy miért is vetted fel ezt a szabályt.
         expires_in: Az IP címek korlátos erőforrások, ezért néha meg vannak osztva és gyakran gazdát is cserélnek. Ezért a korlátlan IP tiltások használatát nem javasoljuk.
         ip: Írj be egy IPv4 vagy IPv6 címet. A CIDR formátum használatával teljes tartományokat tilthatsz ki. Légy óvatos, hogy magadat véletlenül se zárd ki!
         severities:
           no_access: Elérés tiltása minden erőforráshoz
+          sign_up_block: Új feliratkozások nem lesznek lehetségesek
           sign_up_requires_approval: Új regisztrációk csak a jóváhagyásoddal történhetnek majd meg
         severity: Válaszd ki, mi történjen a kérésekkel erről az IP-ről
       rule:
-        text: Írd le, mi a szabály vagy elvárás ezen a szerveren a felhasználók felé. Próbálj röviden, egyszerűen fogalmazni
+        text: Írd le, mi a szabály vagy elvárás ezen a kiszolgálón a felhasználók felé. Próbálj röviden, egyszerűen fogalmazni.
       sessions:
         otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:'
         webauthn: Ha ez egy USB kulcs, ellenőrizd, hogy csatlakoztattad és ha szükséges, aktiváltad is.
@@ -89,6 +118,16 @@ hu:
         name: Csak a kis/nagybetűséget változtathatod meg, pl. hogy olvashatóbb legyen
       user:
         chosen_languages: Ha aktív, csak a kiválasztott nyelvű bejegyzések jelennek majd meg a nyilvános idővonalon
+        role: A szerep szabályozza, hogy a felhasználó milyen jogosultságokkal rendelkezik
+      user_role:
+        color: A szerephez használandó szín mindenhol a felhasználói felületen, hexa RGB formátumban
+        highlighted: Ez nyilvánosan láthatóvá teszi a szerepet
+        name: A szerep nyilvános neve, ha a szerepet úgy állították be, hogy jelvényként látható legyen
+        permissions_as_keys: A felhasználók ezzel a szereppel elérhetik a...
+        position: A magasabb szerepkör oldja fel az ütközéseket bizonyos helyzetekben. Bizonyos műveleteket csak alacsonyabb prioritású szerepkörrel lehet elvégezni.
+      webhook:
+        events: Válaszd ki a küldendő eseményeket
+        url: Ahová az eseményket küldjük
     labels:
       account:
         fields:
@@ -104,7 +143,7 @@ hu:
       admin_account_action:
         include_statuses: Tedd az e-mailbe a bejelentett bejegyzéseket
         send_email_notification: Figyelmeztessük a felhasználót e-mailben
-        text: Egyedi figyelmeztetés
+        text: Egyéni figyelmeztetés
         type: Művelet
         types:
           disable: Letiltás
@@ -119,6 +158,8 @@ hu:
         scheduled_at: Közlemény időzítése
         starts_at: Esemény kezdete
         text: Közlemény
+      appeal:
+        text: Magyarázd el, miért kellene visszavonni ezt a döntést
       defaults:
         autofollow: Meghívás a fiókod követésére
         avatar: Profilkép
@@ -133,7 +174,7 @@ hu:
         display_name: Megjelenített név
         email: E-mail cím
         expires_in: Elévül
-        fields: Profil metaadatok
+        fields: Profil metaadatai
         header: Fejléc
         honeypot: "%{label} (ne töltsd ki)"
         inbox_url: Relé inbox-hoz tartozó URL
@@ -148,6 +189,7 @@ hu:
         phrase: Kulcsszó vagy kifejezés
         setting_advanced_layout: Haladó webes felület engedélyezése
         setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon
+        setting_always_send_emails: E-mail értesítések küldése mindig
         setting_auto_play_gif: GIF-ek automatikus lejátszása
         setting_boost_modal: Megerősítés kérése megtolás előtt
         setting_crop_images: Képek 16x9-re vágása nem kinyitott bejegyzéseknél
@@ -160,7 +202,7 @@ hu:
         setting_display_media_default: Alapértelmezés
         setting_display_media_hide_all: Mindent elrejt
         setting_display_media_show_all: Mindent mutat
-        setting_expand_spoilers: Tartalom figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
+        setting_expand_spoilers: Tartalmi figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
         setting_hide_network: Hálózatod elrejtése
         setting_noindex: Megtiltom a keresőmotoroknak, hogy indexeljék a tartalmaimat
         setting_reduce_motion: Animációk mozgásának csökkentése
@@ -169,10 +211,11 @@ hu:
         setting_theme: Megjelenítési sablon
         setting_trends: Mai trend mutatása
         setting_unfollow_modal: Megerősítés kérése mielőtt abbahagyod valaki követését
-        setting_use_blurhash: Rejtett média helyett homály mutatása
+        setting_use_blurhash: Színátmenetek megjelenítése a rejtett médiáknál
         setting_use_pending_items: Lassú mód
         severity: Súlyosság
         sign_in_token_attempt: Biztonsági kód
+        title: Cím
         type: Importálás típusa
         username: Felhasználónév
         username_or_email: Felhasználónév vagy e-mail cím
@@ -181,6 +224,34 @@ hu:
         with_dns_records: Domain MX rekordjainak és IP-címeinek hozzávétele
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Teljes elrejtés
+          warn: Elrejtés figyelmeztetéssel
+      form_admin_settings:
+        backups_retention_period: Felhasználói archívum megtartási időszaka
+        bootstrap_timeline_accounts: Mindig javasoljuk ezeket a fiókokat az új felhasználók számára
+        closed_registrations_message: A feliratkozáskor megjelenő egyéni üzenet nem érhető el
+        content_cache_retention_period: Tartalom-gyorsítótár megtartási időszaka
+        custom_css: Egyéni CSS
+        mascot: Egyéni kabala (örökölt)
+        media_cache_retention_period: Média-gyorsítótár megtartási időszaka
+        profile_directory: Profiladatbázis engedélyezése
+        registrations_mode: Ki regisztrálhat
+        require_invite_text: Indok megkövetelése a csatlakozáshoz
+        show_domain_blocks: Domain tiltások megjelenitése
+        show_domain_blocks_rationale: A domainok blokkolásának okának megjelenítése
+        site_contact_email: Kapcsolattartó e-mail
+        site_contact_username: Kapcsolattartó felhasználóneve
+        site_extended_description: Bővített leírás
+        site_short_description: Kiszolgáló leírása
+        site_terms: Adatvédelmi szabályzat
+        site_title: Kiszolgáló neve
+        theme: Alapértelmezett téma
+        thumbnail: Kiszolgáló bélyegképe
+        timeline_preview: A nyilvános idővonalak hitelesítés nélküli elérésének engedélyezése
+        trendable_by_default: Trendek engedélyezése előzetes ellenőrzés nélkül
+        trends: Trendek engedélyezése
       interactions:
         must_be_follower: Nem követőidtől érkező értesítések tiltása
         must_be_following: Nem követettjeidtől érkező értesítések tiltása
@@ -194,9 +265,11 @@ hu:
         ip: IP
         severities:
           no_access: Elérés letiltása
+          sign_up_block: Feliratkozások letiltása
           sign_up_requires_approval: Regisztrációk korlátozása
         severity: Szabály
       notification_emails:
+        appeal: Valaki fellebbez egy moderátori döntéssel szemben
         digest: Összevont e-mailek küldése
         favourite: Valaki kedvencnek jelölte a bejegyzésedet
         follow: E-mail küldése, amikor valaki követni kezd téged
@@ -204,16 +277,28 @@ hu:
         mention: E-mail küldése, amikor valaki megemlít téged
         pending_account: E-mail küldése, ha új fiókot kell engedélyezni
         reblog: Valaki megtolta a bejegyzésedet
-        report: E-mail küldése, ha új bejelentés érkezett
-        trending_tag: E-mail küldése, ha egy még nem látott hashtag trendi lett
+        report: Új bejelentést küldtek be
+        trending_tag: Új trend felülvizsgálatra vár
       rule:
         text: Szabály
       tag:
         listable: A hashtag megjelenhet a profiladatbázisban
         name: Hashtag
-        trendable: A hashtag megjelenhet a trendek között
+        trendable: A hashtag megjelenhet a felkapottak között
         usable: Bejegyzések használhatják ezt a hashtaget
+      user:
+        role: Szerep
+      user_role:
+        color: Jelvény színe
+        highlighted: Szerep megjelenítése jelvényként a felhasználói profilokon
+        name: Név
+        permissions_as_keys: Engedélyek
+        position: Prioritás
+      webhook:
+        events: Engedélyezett események
+        url: Végponti URL
     'no': Nem
+    not_recommended: Nem ajánlott
     recommended: Ajánlott
     required:
       mark: "*"
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index d468032ab..b95502155 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -29,7 +29,6 @@ hy:
         current_password: Անվտանգութեան նկատառումներից ելնելով, խնդրում ենք մուտքագրել տուել հաշուի ծածկագիրը
         current_username: Հաստատելու համար խնդրում ենք մուտքագրել տուել հաշուի օգտանունը
         digest: Ուղարկուում է պասիւութեան երկար շրջանից յետոյ եւ միայն այն դէպքում, երբ բացակայութեանդ ժամանակ որեւէ անձնական հաղորդագրութիւն ես ստացել
-        discoverable: Էջի մատեանն այլ եղանակ է հաշիւդ լայն շրջանակներին հասանելի դարձնելու
         email: Քեզ ուղարկուել է հաստատման իմակ
         fields: Կարող ես ունենալ մինչեւ 4 կէտ հաշուիդ աղիւսակում ցուցադրելու
         header: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
@@ -55,10 +54,7 @@ hy:
       domain_allow:
         domain: Այս տիրոյթը կարող է ստանալ տուեալներ այս սպասարկչից եւ ստացուող տուեալները կարող են օգտագործուել եւ պահուել
       email_domain_block:
-        domain: Սա կարող է լինել տիրոյթի անուն, որը ցուցադրում է էլ․ հասցէն, MX գրառում, որին տիրոյթը պատկանում է, կամ MX գրառման սպասարկչի  IP։ Դրանք ստուգուելու են օգտատիրոջ գրանցման պահին եւ գրանցումը մերժուելու է։
         with_dns_records: Այս տիրոյթի DNS գրառումները կը տարրալուծուեն եւ արդիւնքները նոյնպէս կուղարկուեն սեւ ցուցակ
-      featured_tag:
-        name: Գուցէ ցանկանաս օգտագործել սրանցից մէկը․
       form_challenge:
         current_password: Մուտք ես գործել ապահով տարածք
       imports:
@@ -195,8 +191,6 @@ hy:
         mention: Որեւէ մեկը նշեց քեզ
         pending_account: Վերանայման կարիք ունեցող նոր հաշիւ
         reblog: Ինչ֊որ մէկը գրառումդ տարածեց
-        report: Նոր բողոք է ուղարկուել
-        trending_tag: Չվերանայուած պիտակը թրենդի մէջ է
       rule:
         text: Կանոն
       tag:
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 8d870dc61..b214e856a 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -27,6 +27,8 @@ id:
         scheduled_at: Biarkan kosong jika ingin menerbitkan pengumuman secara langsung
         starts_at: Opsional. Persiapan jika pengumuman Anda terikat pada rentang waktu tertentu
         text: Anda dapat menggunakan sintaks toot. Mohon perhatikan ruang pengumuman yang mungkin akan memenuhi layar pengguna
+      appeal:
+        text: Anda hanya dapat mengajukan banding peringatan sekali
       defaults:
         autofollow: Orang yang ingin mendaftar lewat undangan, otomatis mengikuti Anda
         avatar: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
@@ -35,8 +37,7 @@ id:
         current_password: Untuk tujuan keamanan mohon masukkan kata sandi akun ini
         current_username: Untuk konfirmasi, mohon masukkan nama pengguna akun ini
         digest: Hanya kirim setelah lama tidak aktif dan hanya jika Anda menerima pesan personal atas absensi Anda
-        discoverable: Direktori profil adalah cara lain agar akun Anda menyentuh audiens yang lebih luas
-        discoverable_no_directory: Izinkan akun Anda ditemukan orang lain lewat rekomendasi dan fitur lain
+        discoverable: Izinkan akun Anda ditemukan orang lain lewat rekomendasi, tren, dan fitur lain
         email: Anda akan dikirimi email konfirmasi
         fields: Anda bisa memiliki hingga 4 item utk ditampilkan sebagai tabel di profil Anda
         header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
@@ -46,8 +47,9 @@ id:
         locked: Anda harus menerima permintaan pengikut secara manual dan setting privasi postingan akan diubah khusus untuk pengikut
         password: Gunakan minimal 8 karakter
         phrase: Akan dicocokkan terlepas dari luaran dalam teks atau peringatan konten dari toot
-        scopes: API mana yang diizinkan untuk diakses aplikasi. Jika Anda memilih cakupan level-atas, Anda tak perlu memilih yang individual.
+        scopes: API mana yang diizinkan untuk diakses aplikasi. Jika Anda memilih cakupan level-atas, Anda tidak perlu memilih yang individu.
         setting_aggregate_reblogs: Jangan tampilkan boost baru untuk toot yang baru saja di-boost (hanya memengaruhi boost yang baru diterima)
+        setting_always_send_emails: Secara normal, notifikasi email tidak akan dikirimkan kepada Anda ketika Anda sedang aktif menggunakan Mastodon
         setting_default_sensitive: Media sensitif disembunyikan secara bawaan dan akan ditampilkan dengan klik
         setting_display_media_default: Sembunyikan media yang ditandai sebagai sensitif
         setting_display_media_hide_all: Selalu sembunyikan semua media
@@ -62,10 +64,36 @@ id:
       domain_allow:
         domain: Domain ini dapat mengambil data dari server ini dan data yang diterima akan diproses dan disimpan
       email_domain_block:
-        domain: Ini bisa nama domain yang muncul di alamat email, data MX yang sedang diselesaikan oleh domain, atau IP server yang dipecahkan oleh data MX. Mereka akan dicek saat pendaftaran pengguna dan pendaftaran akan ditolak.
+        domain: Ini bisa berupa nama domain yang tampil di alamat email atau data MX yang memakainya. Mereka akan diperiksa saat mendaftar.
         with_dns_records: Usaha untuk menyelesaikan data DNS domain yang diberikan akan dilakukan dan hasilnya akan masuk daftar hitam
       featured_tag:
-        name: 'Anda mungkin ingin pakai salah satu dari ini:'
+        name: 'Ini adalah beberapa tagar yang sering Anda gunakan:'
+      filters:
+        action: Pilih tindakan apa yang dilakukan ketika sebuah kiriman cocok dengan saringan
+        actions:
+          hide: Sembunyikan konten yang disaring, seperti itu tidak ada
+          warn: Sembunyikan konten yang disaring di belakang sebuah peringatan menyebutkan judul saringan
+      form_admin_settings:
+        backups_retention_period: Simpan arsip pengguna yang dibuat untuk jumlah hari yang ditetapkan.
+        bootstrap_timeline_accounts: Akun ini akan disematkan di atas rekomendasi ikut pengguna baru.
+        closed_registrations_message: Ditampilkan ketika pendaftaran ditutup
+        content_cache_retention_period: Kiriman dari server lain akan dihapus setelah jumlah hari yang ditentukan jika nilai positif ditetapkan. Ini mungkin tidak dapat diurungkan.
+        custom_css: Anda dapat menerapkan gaya kustom di versi web Mastodon.
+        mascot: Menimpa ilustrasi di antarmuka web tingkat lanjut.
+        media_cache_retention_period: File media yang diunduh akan dihapus setelah beberapa hari yang ditentukan ketika ditetapkan ke nilai yang positif, dan diunduh ulang pada permintaan.
+        profile_directory: Direktori profil mendaftarka semua pengguna yang ingin untuk dapat ditemukan.
+        require_invite_text: Ketika pendaftaran membutuhkan persetujuan manual, buat masukan teks "Mengapa Anda ingin bergabung?" dibutuhkan daripada opsional
+        site_contact_email: Bagaimana orang dapat menghubungi Anda untuk kebutuhan hukum atau dukungan.
+        site_contact_username: Bagaimana orang dapat menghubungi Anda di Mastodon.
+        site_extended_description: Informasi tambahan yang mungkin berguna bagi pengunjung dan pengguna Anda. Dapat distruktur dengan sintaks Markdown.
+        site_short_description: Sebuah deskripsi pendek untuk membantu mengenal server Anda secara unik. Siapa yang menjalankannya, untuk siapa itu?
+        site_terms: Gunakan kebijakan privasi Anda sendiri atau tinggalkan kosong untuk menggunakan bawaan. Dapat distruktur dengan sintaks Markdown.
+        site_title: Bagaimana orang dapat memberitahu tentang server selain nama domain.
+        theme: Tema yang dilihat oleh pengunjung yang keluar dan pengguna baru.
+        thumbnail: Gambar sekitar 2:1 yang ditampilkan di samping informasi server Anda.
+        timeline_preview: Pengunjung yang keluar akan dapat menjelajahi kiriman publik terkini yang tersedia di server.
+        trendable_by_default: Lewati tinjauan manual dari konten tren. Item individu masih dapat dihapus dari tren setelah faktanya.
+        trends: Tren yang menampilkan kiriman, tagar, dan cerita berita apa yang sedang tren di server Anda.
       form_challenge:
         current_password: Anda memasuki area aman
       imports:
@@ -78,17 +106,28 @@ id:
         ip: Masukkan alamat IPv4 atau IPv6. Anda dapat memblokir seluruh rentang dengan sintaks CIDR. Hati-hati, jangan mengunci Anda sendiri!
         severities:
           no_access: Blokir akses ke seluruh sumber daya
+          sign_up_block: Pendaftaran baru tidak akan dimungkinkan
           sign_up_requires_approval: Pendaftaran baru memerlukan persetujuan Anda
         severity: Pilih apa yang akan dilakukan dengan permintaan dari IP ini
       rule:
         text: Jelaskan aturan atau persyaratan untuk pengguna di server ini. Buatlah pendek dan sederhana
       sessions:
-        otp: Masukkan kode dua-faktor dari handphone atau gunakan kode pemulihan anda.
+        otp: 'Masukkan kode dua faktor dari aplikasi ponsel atau gunakan kode pemulihan Anda:'
         webauthn: Jika ini kunci USB pastikan dalam keadaan tercolok dan, jika perlu, ketuk.
       tag:
         name: Anda hanya dapat mengubahnya ke huruf kecil/besar, misalnya, agar lebih mudah dibaca
       user:
         chosen_languages: Ketika dicentang, hanya toot dalam bahasa yang dipilih yang akan ditampilkan di linimasa publik
+        role: Peran mengatur izin apa yang dimiliki pengguna
+      user_role:
+        color: Warna yang digunakan untuk peran di antarmuka pengguna, sebagai RGB dalam format hex
+        highlighted: Ini membuat peran terlihat secara publik
+        name: Nama publik peran, jika peran ditampilkan sebagai lencana
+        permissions_as_keys: Pengguna dengan peran ini mendapatkan akses ke...
+        position: Peran lebih tinggi dapat menyelesaikan konflik dalam beberapa situasi. Beberapa tindakan hanya dapat dilakukan pada peran dengan prioritas lebih rendah
+      webhook:
+        events: Pilih peristiwa untuk dikirim
+        url: Di mana peristiwa akan dikirim
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ id:
         scheduled_at: Jadwal publikasi
         starts_at: Awal mulai event
         text: Pengumuman
+      appeal:
+        text: Jelaskan mengapa keputusan ini perlu dibatalkan
       defaults:
         autofollow: Undang untuk mengikuti Anda
         avatar: Avatar
@@ -148,6 +189,7 @@ id:
         phrase: Kata kunci atau frasa
         setting_advanced_layout: Aktifkan antar muka web mahir
         setting_aggregate_reblogs: Boost grup di linimasa
+        setting_always_send_emails: Selalu kirim notifikasi email
         setting_auto_play_gif: Mainkan otomatis animasi GIF
         setting_boost_modal: Tampilkan dialog konfirmasi dialog sebelum boost
         setting_crop_images: Potong gambar ke 16x9 pada toot yang tidak dibentangkan
@@ -160,7 +202,7 @@ id:
         setting_display_media_default: Bawaan
         setting_display_media_hide_all: Sembunyikan semua
         setting_display_media_show_all: Tunjukkan semua
-        setting_expand_spoilers: Selalu bentangkan toot yang bertanda peringatan konten
+        setting_expand_spoilers: Selalu bentangkan kiriman yang bertanda peringatan konten
         setting_hide_network: Sembunyikan jaringan Anda
         setting_noindex: Opt-out dari pengindeksan mesin pencari
         setting_reduce_motion: Kurangi gerakan animasi
@@ -173,6 +215,7 @@ id:
         setting_use_pending_items: Mode pelan
         severity: Keparahan
         sign_in_token_attempt: Kode keamanan
+        title: Judul
         type: Tipe impor
         username: Nama pengguna
         username_or_email: Nama pengguna atau Email
@@ -181,9 +224,37 @@ id:
         with_dns_records: Termasuk data MX dan IP domain
       featured_tag:
         name: Tagar
+      filters:
+        actions:
+          hide: Sembunyikan seluruhnya
+          warn: Sembunyikan dengan peringatan
+      form_admin_settings:
+        backups_retention_period: Rentang retensi arsip pengguna
+        bootstrap_timeline_accounts: Selalu rekomendasikan akun ini ke pengguna baru
+        closed_registrations_message: Pesan kustom ketika pendaftaran tidak tersedia
+        content_cache_retention_period: Rentang retensi tembolok konten
+        custom_css: CSS kustom
+        mascot: Maskot kustom (lawas)
+        media_cache_retention_period: Rentang retensi tembolok media
+        profile_directory: Aktifkan direktori profil
+        registrations_mode: Siapa yang dapat mendaftar
+        require_invite_text: Membutuhkan alasan untuk bergabung
+        show_domain_blocks: Tampilkan pemblokiran domain
+        show_domain_blocks_rationale: Tampilkan kenapa domain diblokir
+        site_contact_email: Surel kontak
+        site_contact_username: Nama pengguna kontak
+        site_extended_description: Deskripsi panjang
+        site_short_description: Deskripsi server
+        site_terms: Kebijakan Privasi
+        site_title: Nama server
+        theme: Tema bawaan
+        thumbnail: Gambar kecil server
+        timeline_preview: Perbolehkan akses tidak terotentikasi ke linimasa publik
+        trendable_by_default: Perbolehkan tren tanpa tinjauan
+        trends: Aktifkan tren
       interactions:
         must_be_follower: Blokir notifikasi dari non-pengikut
-        must_be_following: Blokir notifikasi dari orang yang tidak anda ikuti
+        must_be_following: Blokir notifikasi dari orang yang tidak Anda ikuti
         must_be_following_dm: Blokir pesan langsung dari orang yang tak Anda ikuti
       invite:
         comment: Komentar
@@ -194,18 +265,20 @@ id:
         ip: IP
         severities:
           no_access: Blok akses
+          sign_up_block: Blokir pendaftaran
           sign_up_requires_approval: Batasi pendaftaran
         severity: Aturan
       notification_emails:
+        appeal: Seseorang mengajukan banding tehadap keputusan moderator
         digest: Kirim email berisi rangkuman
-        favourite: Kirim email saat seseorang menyukai status anda
-        follow: Kirim email saat seseorang mengikuti anda
-        follow_request: Kirim email saat seseorang meminta untuk mengikuti anda
-        mention: Kirim email saat seseorang menyebut anda
+        favourite: Seseorang memfavorit kiriman Anda
+        follow: Seseorang mengikuti Anda
+        follow_request: Seseorang meminta untuk mengikuti Anda
+        mention: Seseorang menyebutkan Anda
         pending_account: Kirim email ketika akun baru perlu ditinjau
-        reblog: Kirim email saat seseorang mem-boost status anda
-        report: Kirim email ketika laporan baru dikirim
-        trending_tag: Kirim email ketika tagar tak tertinjau jadi tren
+        reblog: Seseorang mem-boost kiriman Anda
+        report: Laporan baru dikirim
+        trending_tag: Tren baru harus ditinjau
       rule:
         text: Aturan
       tag:
@@ -213,7 +286,19 @@ id:
         name: Tagar
         trendable: Izinkan tagar ini muncul di bawah tren
         usable: Izinkan toot memakai tagar ini
+      user:
+        role: Peran
+      user_role:
+        color: Warna lencana
+        highlighted: Tampilkan peran sebagai lencana di profil pengguna
+        name: Nama
+        permissions_as_keys: Izin
+        position: Prioritas
+      webhook:
+        events: Acara yang diaktifkan
+        url: URL Titik Akhir
     'no': Tidak
+    not_recommended: Tidak disarankan
     recommended: Direkomendasikan
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ig.yml b/config/locales/simple_form.ig.yml
new file mode 100644
index 000000000..7c264f0d7
--- /dev/null
+++ b/config/locales/simple_form.ig.yml
@@ -0,0 +1 @@
+ig:
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 4d640fd9a..42c95a9ae 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -2,42 +2,306 @@
 io:
   simple_form:
     hints:
+      account_alias:
+        acct: Partikulare pozez uzantonomo@domeno di konto quon vua volas ektransferesar
+      account_migration:
+        acct: Partikulare pozez uzantonomo@domeno di konto quon vua volas entransferesar
+      account_warning_preset:
+        text: Vu povas uzar postosintaxo tale URL, hashtagi e mencioni
+        title: Neobligata. Nevidebla da recevanto
+      admin_account_action:
+        include_statuses: Uzanto vidos quala posti quo kauzigas jero o averto
+        send_email_notification: Uzanto ganos expliko pri quo eventas a olia konto
+        text_html: Neobligata. Vu povas uzar postosintaxo. Vu povas <a href="%{path}">insertar avertofixiti</a> por sparar tempo
+        type_html: Selektez ago per <strong>%{acct}</strong>
+        types:
+          disable: Preventez uzanto de uzar olia konto ma ne efacez o celez olia kontenaji.
+          none: Uzez co por sendar averto a la uzanto sen eventigar irga altra ago.
+          sensitive: Koaktez omna mediiatachaji da ca uzanto markizesar quale sentoza.
+          silence: Preventez la uzanto de povar postar per publika videbleso, celez olia posti e avizi de personi quo ne sequas oli.
+          suspend: Preventez irga interago de o a ca konto e efacez ola kontenaji. Inversebla til 30 dii.
+        warning_preset_id: Neobligata. Vu povas ankore insertar kustume texto a extremajo di fixito
+      announcement:
+        all_day: Kande kontrolesas, nur tempoporteodato montresos
+        ends_at: Neobligata. Anunco automatika depublikigesos dum ta tempo
+        scheduled_at: Restez quale vakua por publikigar anunco quik
+        starts_at: Neobligata. Por vua anunco limitizesas a partikulare tempoporteo
+        text: Vu povas uzar postosintaxo. Notez intervalo quon anunco uzas che skreno de uzanto
+      appeal:
+        text: Vu povas nur apelar striko unafoye
       defaults:
+        autofollow: Personi quo registresesas tra invito automatika sequos vu
         avatar: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
+        bot: Signalez a altra personi ke la konto precipue havas automatikigita agi e forsan ne surveyesas
+        context: Situeso kande filtrilo debas aplikesar
+        current_password: Por sekuresorezoni, pozez pasvorto di ca konto
+        current_username: Por konfirmar, pozez uzantonomo di ca konto
+        digest: Nur sendesas pos longa neaktiveso e nur se vu ganis irga mesaji dum ke vu esas neprezenta
+        discoverable: Permisez vua konto deskovresar da nekonociti tra rekomendi, tendenci e altra traiti
+        email: Vu sendesos konfirmretposto
+        fields: On povas havar maxime 4 kozi quo montresas quale tabelo che ona profilo
         header: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
+        inbox_url: Kopiez URL de frontpagino de relayo quon vu volas uzar
+        irreversible: Filtrita posti neinversigeble desaparos, mem se filtro efacesas pose
+        locale: Linguo di uzantointervizajo, retposti e pulsavizi
         locked: Tu devos aprobar omna demandi di sequado, e tua mesaji esos senchanje nur por tua sequanti.
+        password: Uzes minime 8 litri
+        phrase: Parigesos ne ye textosituaciono o konteneyoaverto di posto
+        scopes: Quala API quon softwaro permisesas acesar. Se vu selektas alta skopo, vu ne mustas selektar individui.
+        setting_aggregate_reblogs: Ne montrez nova busti di posti quo recente bustesas (nova busti)
+        setting_always_send_emails: Normale retpostoavizi ne sendesas kande vu aktiva uzas Mastodon
+        setting_default_sensitive: Sentoza medii originala celesas e povas revelesar per klikto
+        setting_display_media_default: Celez medii quo markizesis quale sentoza
+        setting_display_media_hide_all: Sempre celez medii
+        setting_display_media_show_all: Sempre montrez medii
+        setting_hide_network: Vua sequato e sequanto celesos che vua profilo
+        setting_noindex: Efektigar vua publika profilo e postopagini
+        setting_show_application: Softwaro quon vu uzar por postigar montresos che detala vidajo di vua posti
+        setting_use_blurhash: Inklini esas segun kolori di celesis vidaji ma kovras irga detali
+        setting_use_pending_items: Celez tempolineonovi dop kliktar e ne automatike movigar niuzeto
+        username: Vua uzantonomo esos nura che %{domain}
+        whole_word: Kande klefvorto o fraz esas nur litera e nombra, ol nur aplikesos se ol parigesas la tota vorto
+      domain_allow:
+        domain: Ca domeno povas ganar informi de ca servilo e venanta informo de ol procedagesos e sparesos
+      email_domain_block:
+        domain: Co povas esas domennomo quo montresas che retposto o registrajo MX quon ol uzas. Oli kontrolesos kande registro.
+        with_dns_records: Probo di rezolvar registri DNS di la domeno agesos e rezulti anke preventesos
+      filters:
+        action: Selektez ago kande posto parigas filtrilo
+        actions:
+          hide: Komplete celez filtrita kontenajo quale ol ne existas
+          warn: Celez filtrita kontenajo dop avert quo montras titulo di filtrilo
+      form_admin_settings:
+        backups_retention_period: Retenez igita uzantoarkivi por la diiquanto.
+        bootstrap_timeline_accounts: Ca konti pinglagesos a super sequorekomendi di nova uzanti.
+        closed_registrations_message: Montresas kande registradi klozesas
+        content_cache_retention_period: Posti de altra servili efacesos pos la diiquanto kande fixesas a positiva nombro. Co darfas desagesar.
+        custom_css: Vu povas pozar kustumizita staili en retverso di Mastodon.
+        mascot: Remplas montreso en avanca retintervizajo.
+        media_cache_retention_period: Deschargita mediifaili efacesos pos la diiquanto kande fixesas a positiva nombro, e rideschargesas irgatempe.
+        profile_directory: La profilcheflisto montras omna uzanti quo voluntale volas esar deskovrebla.
+        require_invite_text: Kande registradi bezonas manuala aprobo, ol kauzigas "Por quo vu volas juntas?" textoenpozo esar obliganta
+        site_contact_email: Quale personi povas kontaktar vu por legala o suportquestioni.
+        site_contact_username: Quale personi povas kontaktar vu en Mastodon.
+        site_extended_description: Irga plusa informi quo forsan esar utila por vizitanti e uzanti. Povas strukturigesar per sintaxo di Markdown.
+        site_short_description: Kurta deskripto por helpar unala identifikar ca servilo. Qua funcionigar lu e por qua?
+        site_terms: Uzez vua sua privatesguidilo o ignorez por uzar la originalo. Povas strukturigesar per sintaxo di Markdown.
+        site_title: Quale personi vokas ca servilo se ne uzas domennomo.
+        theme: Temo quo videsas da ekirita vizitanti e nova uzanti.
+        thumbnail: Cirkum 2:1 imajo montresar kun informo di ca servilo.
+        timeline_preview: Ekirita vizitanti videsos maxim recenta publika posti quo esas displonebla en la servilo.
+        trendable_by_default: Ignorez manuala kontrolar di tendencoza kontenajo. Singla kozi povas ankore efacesar de tendenci pose.
+        trends: Tendenci montras quala posti, hashtagi e niuzrakonti famozeskas en ca servilo.
+      form_challenge:
+        current_password: Vu eniras sekura areo
       imports:
         data: Dosiero CSV de altra instaluro di Mastodon
+      invite_request:
+        text: Co helpos ni kontrolar vua apliko
+      ip_block:
+        comment: Neobligata. Memorez por quo vu insertas ca regulo.
+        expires_in: IP-Adresi esas finita moyeno, oli kelkafoye partigesas e frequenta uzesas da multa personi. Do, nedefinita IP-restrikti ne rekomendesas.
+        ip: Tipez adreso di IPv4 o IPv6. Vu povas restrikar tota porteo per sintaxo CIDR. Sorgemez por ke vu ne klefklozas su!
+        severities:
+          no_access: Restriktez aceso a omna moyeni
+          sign_up_block: Nova registrago ne esos posibla
+          sign_up_requires_approval: Nova registro bezonos vua aprobo
+        severity: Selektez quo eventos kun demandi de ca IP
+      rule:
+        text: Deskriptez regulo o bezonaj por uzanti en ca servilo. Vu debas lasar lu esar korta e simpla
       sessions:
         otp: Enter the Two-factor code from your phone or use one of your recovery codes.
+        webauthn: Se ol esas klefo di USB, certigar ke vu insertas e se bezonesas, tushetez.
+      tag:
+        name: Vu povas nur chanjar literkaso, por exemplo, por kauzigar lu divenar plu lektebla
+      user:
+        chosen_languages: Kande marketigesis, nur posti en selektesis lingui montresos en publika tempolinei
+        role: Rolo dominacas permisi quon uzanto havas
+      user_role:
+        color: Koloro quo uzesas por rolo en tota UI, quale RGB kun hexformato
+        highlighted: Co kauzigas rolo divenar publike videbla
+        name: Publika nomo di ca rolo, se rolo ajustesas quale montresas quale insigno
+        permissions_as_keys: Uzanti kun ca rolo povas...
+        position: Plu alta rolo decidas problemsolvo en kelka situeso. Kelka agi povas nur eventar a roli kun plu basa prioreso
+      webhook:
+        events: Selektigez eventi por sendar
+        url: Ibe eventi sendesos
     labels:
+      account:
+        fields:
+          name: Etiketo
+          value: Kontenajo
+      account_alias:
+        acct: Nomo di olda konto
+      account_migration:
+        acct: Nomo di nova konto
+      account_warning_preset:
+        text: Fixita texto
+        title: Titulo
+      admin_account_action:
+        include_statuses: Inkluzez raportizita posti en retposto
+        send_email_notification: Notifikez la uzanto di retposto
+        text: Kustumizita averto
+        type: Ago
+        types:
+          disable: Cesez
+          none: Sendez averto
+          sensitive: Privata
+          silence: Limitigez
+          suspend: Desaprobez
+        warning_preset_id: Uzez avertfixito
+      announcement:
+        all_day: Evento di tota dio
+        ends_at: Fino di evento
+        scheduled_at: Skemigez publikigito
+        starts_at: Komenco di evento
+        text: Anunco
+      appeal:
+        text: Explikar por quo ca decidajo debas inversigesar
       defaults:
+        autofollow: Invitez por sequar vua konto
         avatar: Profilimajo
+        bot: Co esas botkonto
+        chosen_languages: Filtrez lingui
         confirm_new_password: Konfirmar nova pasvorto
         confirm_password: Konfirmar nova pasvorto
+        context: Filtrez kuntexti
         current_password: Nuna pasvorto
         data: Datumi
+        discoverable: Sugestez konto a altra personi
         display_name: Publika nomo
         email: Retpost-adreso
+        expires_in: Expiras pos
+        fields: Profilmetadato
         header: Kapimajo
+        honeypot: "%{label} (ne plenigez)"
+        inbox_url: URL di relayomesajbuxo
+        irreversible: Deslevez e ne celez
         locale: Linguo
         locked: Privatigar la konto
+        max_uses: Maxima uzi
         new_password: Nova pasvorto
         note: Suprizento
         otp_attempt: Dufaktora identigilo
         password: Pasvorto
+        phrase: Klefvorto o frazo
+        setting_advanced_layout: Aktivigez avancata retintervizajo
+        setting_aggregate_reblogs: Grupbusti en tempolinei
+        setting_always_send_emails: Sempre sendez retpostoavizi
+        setting_auto_play_gif: Automate pleez animigita GIFi
+        setting_boost_modal: Montrez konfirmdialogo ante bustar
+        setting_crop_images: Ektranchez imaji en neexpansigita posti a 16x9
+        setting_default_language: Postolinguo
         setting_default_privacy: Videbleso di la mesaji
+        setting_default_sensitive: Sempre markizez medii quale sentoza
+        setting_delete_modal: Montrez konfirmdialogo ante efacar posto
+        setting_disable_swiping: Desaktivigez fingromovi
+        setting_display_media: Mediomontrajo
+        setting_display_media_default: Originalo
+        setting_display_media_hide_all: Celez omno
+        setting_display_media_show_all: Montrez omno
+        setting_expand_spoilers: Sempre expansigez posti quo markizesis kun kontenajaverti
+        setting_hide_network: Celez vua sociala grafiko
+        setting_noindex: Desjuntez trovmotorindexigo
+        setting_reduce_motion: Diminutez moveso di animacii
+        setting_show_application: Montrez softwaro quo uzesis por sendar posti
+        setting_system_font_ui: Uzez originala literfonto di sistemo
+        setting_theme: Sittemo
+        setting_trends: Montrez tendenco di hodie
+        setting_unfollow_modal: Montrez konfirmdialogo ante desequar ulu
+        setting_use_blurhash: Montrez koloroza inklini por celata medii
+        setting_use_pending_items: Modo lenta
+        severity: Severeso
+        sign_in_token_attempt: Sekureskodexo
+        title: Titulo
         type: Tipo di importaco
         username: Uzernomo
+        username_or_email: Uzantonomo o retposto
+        whole_word: Tota vorto
+      email_domain_block:
+        with_dns_records: Inkluzez registraji MX e IPi di domeno
+      featured_tag:
+        name: Hashtago
+      filters:
+        actions:
+          hide: Tote celez
+          warn: Celez kun averto
+      form_admin_settings:
+        backups_retention_period: Uzantoarkivretendurtempo
+        bootstrap_timeline_accounts: Sempre rekomendez ca konti a nova uzanti
+        closed_registrations_message: Kustumizita mesajo kande registradi ne esas disponebla
+        content_cache_retention_period: Kontenajmemorajretendurtempo
+        custom_css: Kustumizita CSS
+        mascot: Kustumizita reprezentimajo (oldo)
+        media_cache_retention_period: Mediimemorajretendurtempo
+        profile_directory: Aktivigez profilcheflisto
+        registrations_mode: Qua povas registragar
+        require_invite_text: Mustez pozar motivo por juntar
+        show_domain_blocks: Montrez domenobstrukti
+        show_domain_blocks_rationale: Montrez por quo domeni obstruktesir
+        site_contact_email: Kontaktoretposto
+        site_contact_username: Kontaktouzantonomo
+        site_extended_description: Longa deskripto
+        site_short_description: Servildeskripto
+        site_terms: Privatesguidilo
+        site_title: Servilnomo
+        theme: Originala temo
+        thumbnail: Servilimajeto
+        timeline_preview: Permisez neyurizita aceso a publika tempolineo
+        trendable_by_default: Permisez tendenci sen bezonar kontrolo
+        trends: Aktivigez tendenci
       interactions:
         must_be_follower: Celar la savigi da homi, qui ne sequas tu
         must_be_following: Celar la savigi da homi, quin tu ne sequas
+        must_be_following_dm: Obstruktez direta mesaji de personi quon vu ne sequas
+      invite:
+        comment: Komento
+      invite_request:
+        text: Por quo vu volas juntar?
+      ip_block:
+        comment: Komento
+        ip: IP
+        severities:
+          no_access: Depermisez aceso
+          sign_up_block: Obstruktez registragi
+          sign_up_requires_approval: Limitigez registri
+        severity: Regulo
       notification_emails:
+        appeal: Ulu apelas jererdecidajo
         digest: Sendar rezuma retpost-mesaji
         favourite: Sendar retpost-mesajo, kande ulu favoras mesajo da tu
         follow: Sendar retpost-mesajo, kande ulu sequeskas tu
         follow_request: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
         mention: Sendar retpost-mesajo, kande ulu mencionas tu
+        pending_account: Nova konto bezonas kontrolo
         reblog: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
+        report: Nova raport sendesas
+        trending_tag: Nova tendenco bezonas kontrolo
+      rule:
+        text: Regulo
+      tag:
+        listable: Permisez ca hashtago aparar en trovaji e sugestaji
+        name: Hashtago
+        trendable: Permisez ca hashtago aparar che tendenci
+        usable: Permisez posti uzar ca hashtago
+      user:
+        role: Rolo
+      user_role:
+        color: Insignokoloro
+        highlighted: Montrez rolo quale insigno en uzantoprofili
+        name: Nomo
+        permissions_as_keys: Permisi
+        position: Prioreso
+      webhook:
+        events: Aktivigita eventi
+        url: URL di finpunto
+    'no': Ne
+    not_recommended: Ne rekomendesas
+    recommended: Rekomendito
     required:
+      mark: "*"
       text: bezonata
+    title:
+      sessions:
+        webauthn: Uzez 1 de vua sekuresklefti por enirar
+    'yes': 'Yes'
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index c10fe28b1..1f0ac6eef 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -7,12 +7,12 @@ is:
       account_migration:
         acct: Tilgreindu notandanafn@lén á notandaaðgangnum sem þú vilt flytjast til
       account_warning_preset:
-        text: Þú getur notað sömu skilgreiningar og fyrir tíst, svo sem URL-slóðir, myllumerki og tilvísanir
+        text: Þú getur notað sömu skilgreiningar og fyrir færslur, svo sem URL-slóðir, myllumerki og tilvísanir
         title: Valkvætt. Ekki sýnilegt viðtakandanum
       admin_account_action:
-        include_statuses: Notandinn mun sjá hvaða tíst hafa valdið viðbrögðum umsjónarmanns eða aðvörun kerfisins
+        include_statuses: Notandinn mun sjá hvaða færslur hafa valdið viðbrögðum umsjónarmanns eða aðvörun kerfisins
         send_email_notification: Notandinn mun fá útskýringar á því hvað gerðist með notandaaðganginn hans
-        text_html: Valfrjálst. Þú getur notað sömu skilgreiningar og fyrir tíst. Þú getur <a href="%{path}">bætt inn forstilltum aðvörunum</a> til að spara tíma
+        text_html: Valfrjálst. Þú getur notað sömu skilgreiningar og fyrir færslur. Þú getur <a href="%{path}">bætt inn forstilltum aðvörunum</a> til að spara tíma
         type_html: Veldu hvað eigi að gera við <strong>%{acct}</strong>
         types:
           disable: Koma í veg fyrir að notandinn noti aðganginn sinn, en ekki eyða eða fela efnið þeirra.
@@ -26,7 +26,9 @@ is:
         ends_at: Valfrjálst. Auglýsing verðut tekin úr birtingu á þessum tíma
         scheduled_at: Skildu þetta eftir autt til að birta auglýsinguna samstundis
         starts_at: Valfrjálst. Notað ef auglýsing er bundin við tiltekinn tímaramma
-        text: Þú getur notað sömu skilgreiningar og fyrir tíst. Hafðu í huga það pláss sem auglýsingin mun taka á skjá notandans
+        text: Þú getur notað sömu skilgreiningar og fyrir færslur. Hafðu í huga það pláss sem auglýsingin mun taka á skjá notandans
+      appeal:
+        text: Þú getur aðeins áfrýjað refsingu einu sinni
       defaults:
         autofollow: Fólk sem skráir sig í gegnum boðið mun sjálfkrafa fylgjast með þér
         avatar: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
@@ -35,37 +37,63 @@ is:
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
-        discoverable: Persónusniðamappan er önnur leið til að láta notandaaðganginn þinn ná til fleiri lesenda
-        discoverable_no_directory: Gerðu öðrum kleift að finna aðganginn þinn í gegnum meðmæli og annað slíkt
+        discoverable: Gerðu öðrum kleift að finna aðganginn þinn í gegnum meðmæli, vinsældir og annað slíkt
         email: Þú munt fá sendan staðfestingarpóst
         fields: Þú getur birt allt að 4 atriði sem töflu á notandasniðinu þínu
         header: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         inbox_url: Afritaðu slóðina af forsíðu endurvarpans sem þú vilt nota
-        irreversible: Síuð tíst munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
+        irreversible: Síaðar færslur munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
         locale: Tungumál notandaviðmótsins, tölvupósts og ýti-tilkynninga
         locked: Krefst þess að þú samþykkir fylgjendur handvirkt
         password: Notaðu minnst 8 stafi
-        phrase: Verður notað til samsvörunar burtséð frá stafstöðu texta eða viðvörunar vegna efnis í tísti
+        phrase: Verður notað til samsvörunar burtséð frá stafstöðu texta eða viðvörunar vegna efnis í færslu
         scopes: Að hvaða API-kerfisviðmótum forritið fær aðgang. Ef þú velur efsta-stigs svið, þarftu ekki að gefa einstakar heimildir.
-        setting_aggregate_reblogs: Ekki sýna nýjar endurbirtingar á tístum sem hafa nýlega verið endurbirt (hefur bara áhrif á ný-mótteknar endurbirtingar)
+        setting_aggregate_reblogs: Ekki sýna nýjar endurbirtingar á færslum sem hafa nýlega verið endurbirtar (hefur bara áhrif á ný-mótteknar endurbirtingar)
+        setting_always_send_emails: Venjulega eru tilkynningar í tölvupósti ekki sendar þegar þú ert virk/ur í að nota Mastodon
         setting_default_sensitive: Viðkvæmt myndefni er sjálfgefið falið og er hægt að birta með smelli
         setting_display_media_default: Fela myndefni sem merkt er viðkvæmt
         setting_display_media_hide_all: Alltaf fela allt myndefni
         setting_display_media_show_all: Alltaf birta myndefni sem merkt er viðkvæmt
         setting_hide_network: Hverjum þú fylgist með og hverjir fylgjast með þér verður ekki birt á notandasniðinu þínu
-        setting_noindex: Hefur áhrif á opinbera notandasniðið þitt og stöðusíður
-        setting_show_application: Nafnið á forritinu sem þú notar til að tísta mun birtast í ítarlegri sýn á tístunum þínum
+        setting_noindex: Hefur áhrif á opinbera notandasniðið þitt og færslusíður
+        setting_show_application: Nafnið á forritinu sem þú notar til að senda færslur mun birtast í ítarlegri sýn á færslunum þínum
         setting_use_blurhash: Litstiglarnir byggja á litunum í földu myndunum, en gera öll smáatriði óskýr
         setting_use_pending_items: Fela uppfærslur tímalínu þar til smellt er, í stað þess að hún skruni streyminu sjálfvirkt
         username: Notandanafnið þitt verður einstakt á %{domain}
-        whole_word: Þegar stikkorð eða frasi er einungis tölur og bókstafir, verður það aðeins notað ef það samsvarar heilu orði
+        whole_word: Þegar stikkorð eða setning er einungis tölur og bókstafir, verður það aðeins notað ef það samsvarar heilu orði
       domain_allow:
         domain: Þetta lén mun geta sótt gögn af þessum vefþjóni og tekið verður á móti innsendum gögnum frá léninu til vinnslu og geymslu
       email_domain_block:
-        domain: Þetta getur verið heiti lénsins sem birtist í tölvupóstfanginu, MX-færslan sem það lén beinist að, eða IP-vistfang netþjónsins sem sú MX-færsla beinist að. Þetta verður athugað um leið og notandi skráir sig, og verður þá skráningunni hafnað.
+        domain: Þetta getur verið lénið sem birtist í tölvupóstfanginu eða MX-færslunni sem það notar. Þetta verður yfirfarið við nýskráningu.
         with_dns_records: Tilraun verður gerð til að leysa DNS-færslur uppgefins léns og munu niðurstöðurnar einnig verða útilokaðar
       featured_tag:
-        name: 'Þú gætir viljað nota eitt af þessum:'
+        name: 'Hér eru nokkur af þeim myllumerkjum sem þú hefur notað nýlega:'
+      filters:
+        action: Veldu hvaða aðgerð á að framkvæma þegar færsla samsvarar síunni
+        actions:
+          hide: Fela síað efni algerlega, rétt eins og það sé ekki til staðar
+          warn: Fela síað efni á bakvið aðvörun sem tekur fram titil síunnar
+      form_admin_settings:
+        backups_retention_period: Halda safni notandans í tiltekinn fjölda daga.
+        bootstrap_timeline_accounts: Þessir notendaaðgangar verða festir efst í meðmælum til nýrra notenda um að fylgjast með þeim.
+        closed_registrations_message: Birtist þegar lokað er á nýskráningar
+        content_cache_retention_period: Færslum af öðrum netþjónum verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi. Þetta gæti verið óafturkallanleg aðgerð.
+        custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
+        mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
+        media_cache_retention_period: Sóttu myndefni verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi og síðan sótt aftur eftir þörfum.
+        profile_directory: Notendamappan telur upp alla þá notendur sem hafa valið að vera uppgötvanlegir.
+        require_invite_text: Þegar nýskráningar krefjast handvirks samþykkis, þá skal gera textann í “Hvers vegna viltu taka þátt?” að kröfu en ekki valkvæðan
+        site_contact_email: Hovernig fólk getur haft samband við þig til að fá aðstoð eða vegna lagalegra mála.
+        site_contact_username: Hovernig fólk getur haft samband við þig á Mastodon.
+        site_extended_description: Hverjar þær viðbótarupplýsingar sem gætu nýst gestum þínum og notendum. Má sníða með Markdown-málskipan.
+        site_short_description: Stutt lýsing sem hjálpar til við að auðkenna netþjóninn þinn. Hver er að reka hann, fyrir hverja er hann?
+        site_terms: Notaðu þína eigin persónuverndarstefnu eða skildu þetta eftir autt til að nota sjálfgefna stefnu. Má sníða með Markdown-málskipan.
+        site_title: Hvað fólk kallar netþjóninn þinn annað en með heiti lénsins.
+        theme: Þema sem útskráðir gestir og nýjir notendur sjá.
+        thumbnail: Mynd um það bil 2:1 sem birtist samhliða upplýsingum um netþjóninn þinn.
+        timeline_preview: Gestir sem ekki eru skráðir inn munu geta skoðað nýjustu opinberu færslurnar sem tiltækar eru á þjóninum.
+        trendable_by_default: Sleppa handvirkri yfirferð á vinsælu efni. Áfram verður hægt að fjarlægja stök atriði úr vinsældarlistum.
+        trends: Vinsældir sýna hvaða færslur, myllumerki og fréttasögur séu í umræðunni á netþjóninum þínum.
       form_challenge:
         current_password: Þú ert að fara inn á öryggissvæði
       imports:
@@ -78,6 +106,7 @@ is:
         ip: Settu inn IPv4 eða IPv6 vistfang. Þú getur lokað á svið vistfanga með því að nota CIDR-framsetningu. Gættu þess að loka ekki sjálfa/n þig úti!
         severities:
           no_access: Loka á aðgang að öllum tilföngum
+          sign_up_block: Nýskráningar verða ekki mögulegar
           sign_up_requires_approval: Nýskráningar munu þurfa samþykki þitt
         severity: Veldu hvað munir gerast við beiðnir frá þessu IP-vistfangi
       rule:
@@ -88,7 +117,17 @@ is:
       tag:
         name: Þú getur aðeins breytt stafstöði mill há-/lágstafa, til gæmis til að gera þetta læsilegra
       user:
-        chosen_languages: Þegar merkt er við þetta, birtast einungis tíst á völdum tungumálum á opinberum tímalínum
+        chosen_languages: Þegar merkt er við þetta, birtast einungis færslur á völdum tungumálum á opinberum tímalínum
+        role: Hlutverk stýrir hvaða heimildir notandinn hefur
+      user_role:
+        color: Litur sem notaður er fyrir hlutverkið allsstaðar í viðmótinu, sem RGB-gildi á hex-sniði
+        highlighted: Þetta gerir hlutverk sýnilegt opinberlega
+        name: Opinbert heiti hlutverks, ef birta á hlutverk sem merki
+        permissions_as_keys: Notendur með þetta hlutverk munu hafa aðgang að...
+        position: Rétthærra hlutverk ákvarðar lausn árekstra í ákveðnum tilfellum. Sumar aðgerðir er aðeins hægt að framkvæma á hlutverk með lægri forgangi
+      webhook:
+        events: Veldu atburði sem á að senda
+        url: Hvert atburðir verða sendir
     labels:
       account:
         fields:
@@ -102,16 +141,16 @@ is:
         text: Forstilltur texti
         title: Titill
       admin_account_action:
-        include_statuses: Innifela kærð tíst í tölvupóstinum
+        include_statuses: Innifela kærðar færslur í tölvupóstinum
         send_email_notification: Láta notanda vita með tölvupósti
         text: Sérsniðin aðvörun
         type: Aðgerð
         types:
           disable: Gera innskráningu óvirka
-          none: Gera ekkert
+          none: Senda aðvörun
           sensitive: Viðkvæmt
           silence: Hylja
-          suspend: Setja í bið og eyða endanlega gögnum notandaaðgangsins
+          suspend: Setja í frysti
         warning_preset_id: Nota forstillta aðvörun
       announcement:
         all_day: Heilsdags atburður
@@ -119,10 +158,12 @@ is:
         scheduled_at: Áætla birtingu
         starts_at: Upphaf atburðar
         text: Auglýsing
+      appeal:
+        text: Útskýrðu af hverju ætti að afturkalla þessa ákvörðun
       defaults:
         autofollow: Bjóða að fylgjast með aðgangnum þínum
         avatar: Auðkennismynd
-        bot: Þetta er aðgangur fyrir róbót
+        bot: Þetta er aðgangur fyrir yrki
         chosen_languages: Sía tungumál
         confirm_new_password: Staðfestu nýja lykilorðið
         confirm_password: Staðfestu lykilorðið
@@ -139,32 +180,33 @@ is:
         inbox_url: URL-slóð á innhólf endurvarpa
         irreversible: Fella niður í staðinn fyrir að fela
         locale: Tungumál viðmóts
-        locked: Læsa aðgangi
+        locked: Krefjast fylgjendabeiðna
         max_uses: Hámarksfjöldi afnota
         new_password: Nýtt lykilorð
         note: Æviágrip
         otp_attempt: Teggja-þátta kóði
         password: Lykilorð
-        phrase: Stikkorð eða frasi
+        phrase: Stikkorð eða setning
         setting_advanced_layout: Virkja ítarlegt vefviðmót
         setting_aggregate_reblogs: Hópa endurbirtingar í tímalínum
+        setting_always_send_emails: Alltaf senda tilkynningar í tölvupósti
         setting_auto_play_gif: Spila sjálfkrafa GIF-hreyfimyndir
         setting_boost_modal: Sýna staðfestingarglugga fyrir endurbirtingu
-        setting_crop_images: Utansníða myndir í ekki útfelldum tístum í 16x9
+        setting_crop_images: Utansníða myndir í ekki-útfelldum færslum í 16x9
         setting_default_language: Tungumál sem skrifað er á
         setting_default_privacy: Gagnaleynd færslna
         setting_default_sensitive: Alltaf merkja myndefni sem viðkvæmt
-        setting_delete_modal: Birta staðfestingarglugga áður en tísti er eytt
+        setting_delete_modal: Birta staðfestingarglugga áður en færslu er eytt
         setting_disable_swiping: Gera strokuhreyfingar óvirkar
         setting_display_media: Birting myndefnis
         setting_display_media_default: Sjálfgefið
         setting_display_media_hide_all: Fela allt
         setting_display_media_show_all: Birta allt
-        setting_expand_spoilers: Alltaf útfella tíst sem eru með aðvörun vegna efnisins
-        setting_hide_network: Fela netkerfið þitt
+        setting_expand_spoilers: Alltaf útfella færslur sem eru með aðvörun vegna efnisins
+        setting_hide_network: Fela félagsnetið þitt
         setting_noindex: Afþakka atriðaskráningu í leitarvélum
         setting_reduce_motion: Minnka hreyfingu í hreyfimyndum
-        setting_show_application: Upplýsa um forrit sem er til að senda tíst
+        setting_show_application: Upplýsa um forrit sem er til að senda færslur
         setting_system_font_ui: Nota sjálfgefið letur kerfisins
         setting_theme: Þema vefsvæðis
         setting_trends: Birta það sem er efst á baugi í dag
@@ -173,6 +215,7 @@ is:
         setting_use_pending_items: Rólegur hamur
         severity: Mikilvægi
         sign_in_token_attempt: Öryggiskóði
+        title: Titill
         type: Tegund innflutnings
         username: Notandanafn
         username_or_email: Notandanafn eða tölvupóstfang
@@ -181,6 +224,34 @@ is:
         with_dns_records: Hafa með MX-færslur og IP-vistföng lénsins
       featured_tag:
         name: Myllumerki
+      filters:
+        actions:
+          hide: Fela alveg
+          warn: Fela með aðvörun
+      form_admin_settings:
+        backups_retention_period: Tímalengd sem safni notandans er haldið eftir
+        bootstrap_timeline_accounts: Alltaf mæla með þessum notendaaðgöngum fyrir nýja notendur
+        closed_registrations_message: Sérsniðin skilaboð þegar ekki er hægt að nýskrá
+        content_cache_retention_period: Tímalengd sem haldið er í biðminni
+        custom_css: Sérsniðið CSS
+        mascot: Sérsniðið gæludýr (eldra)
+        media_cache_retention_period: Tímalengd sem myndefni haldið
+        profile_directory: Virkja notendamöppu
+        registrations_mode: Hverjir geta nýskráð sig
+        require_invite_text: Krefjast ástæðu fyrir þátttöku
+        show_domain_blocks: Sýna útilokanir léna
+        show_domain_blocks_rationale: Sýna af hverju lokað var á lén
+        site_contact_email: Tölvupóstfang tengiliðar
+        site_contact_username: Notandanafn tengiliðar
+        site_extended_description: Ítarleg lýsing
+        site_short_description: Lýsing á vefþjóni
+        site_terms: Persónuverndarstefna
+        site_title: Heiti vefþjóns
+        theme: Sjálfgefið þema
+        thumbnail: Smámynd vefþjóns
+        timeline_preview: Leyfa óauðkenndan aðgang að opinberum tímalínum
+        trendable_by_default: Leyfa vinsælt efni án undanfarandi yfirferðar
+        trends: Virkja vinsælt
       interactions:
         must_be_follower: Loka á tilkynningar frá þeim sem ekki eru fylgjendur
         must_be_following: Loka á tilkynningar frá þeim sem þú fylgist ekki með
@@ -194,26 +265,40 @@ is:
         ip: IP-vistfang
         severities:
           no_access: Loka á aðgang
+          sign_up_block: Loka á nýskráningar
           sign_up_requires_approval: Takmarka nýskráningar
         severity: Regla
       notification_emails:
+        appeal: Einhver áfrýjar ákvörðun umsjónarmanns
         digest: Senda uppsafnaðan tölvupóst
-        favourite: Einhver setti stöðufærslu þína í eftirlæti
+        favourite: Einhver setti færslu þína í eftirlæti
         follow: Einhver fylgist núna með þér
         follow_request: Einhver hefur beðið um að fylgjast með þér
         mention: Einhver minntist á þig
         pending_account: Nýr notandaaðgangur þarfnast yfirferðar
-        reblog: Einhver endurbirti stöðufærslu þína
+        reblog: Einhver endurbirti færsluna þína
         report: Ný kæra hefur verið send inn
-        trending_tag: Óyfirfarið myllumerki er í umræðunni
+        trending_tag: Nýtt vinsælt efni krefst yfirferðar
       rule:
         text: Regla
       tag:
         listable: Leyfa þessu myllumerki að birtast í leitum og í persónusniðamöppunni
         name: Myllumerki
-        trendable: Leyfa þessu myllumerki að birtast undir tilhneigingum
-        usable: Leyfa tístum að nota þetta myllumerki
+        trendable: Leyfa þessu myllumerki að birtast undir vinsælu efni
+        usable: Leyfa færslum að nota þetta myllumerki
+      user:
+        role: Hlutverk
+      user_role:
+        color: Litur merkis
+        highlighted: Birta hlutverk sem merki á notandaauðkenni
+        name: Nafn
+        permissions_as_keys: Heimildir
+        position: Forgangur
+      webhook:
+        events: Virkjaðir atburðir
+        url: Slóð á endapunkt
     'no': Nei
+    not_recommended: Ekki mælt með þessu
     recommended: Mælt með
     required:
       mark: "*"
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 147a5eea4..2f33fb622 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -3,16 +3,16 @@ it:
   simple_form:
     hints:
       account_alias:
-        acct: Indica il nomeutente@dominio dell'account da cui vuoi trasferirti
+        acct: Indica il nomeutente@dominio dell'account dal quale vuoi trasferirti
       account_migration:
         acct: Indica il nomeutente@dominio dell'account al quale vuoi trasferirti
       account_warning_preset:
-        text: Puoi usare la sintassi dei toot, come URL, hashtag e menzioni
+        text: Puoi usare la sintassi dei post, come URL, hashtag e menzioni
         title: Opzionale. Non visibile al destinatario
       admin_account_action:
-        include_statuses: L'utente vedrà quali toot hanno causato l'azione di moderazione o l'avviso
+        include_statuses: L'utente vedrà quali post hanno causato l'azione di moderazione o l'avviso
         send_email_notification: L'utente riceverà una spiegazione di ciò che è successo con suo account
-        text_html: Opzionale. Puoi usare la sintassi dei toot. Puoi <a href="%{path}">aggiungere avvisi preimpostati</a> per risparmiare tempo
+        text_html: Opzionale. Puoi usare la sintassi dei post. Puoi <a href="%{path}">aggiungere avvisi preimpostati</a> per risparmiare tempo
         type_html: Decidi cosa fare con <strong>%{acct}</strong>
         types:
           disable: Impedisce all'utente di utilizzare il suo account, ma non elimina o nasconde i suoi contenuti.
@@ -26,7 +26,9 @@ it:
         ends_at: Opzionale. L'annuncio verrà automaticamente ritirato in questo momento
         scheduled_at: Lascia vuoto per pubblicare immediatamente l'annuncio
         starts_at: Opzionale. Quando l'annuncio è legato a un intervallo di tempo specifico
-        text: Puoi usare la sintassi dei toot. Tieni presente lo spazio che l'annuncio occuperà nello schermo dell'utente
+        text: Puoi usare la sintassi dei post. Tieni presente lo spazio che l'annuncio occuperà nello schermo dell'utente
+      appeal:
+        text: Puoi appellarti solo una volta
       defaults:
         autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente
         avatar: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
@@ -35,19 +37,19 @@ it:
         current_password: Per motivi di sicurezza inserisci la password dell'account attuale
         current_username: Per confermare, inserisci il nome utente dell'account attuale
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
-        discoverable: La directory dei profili è un altro modo in cui il tuo account può raggiungere un pubblico più ampio
-        discoverable_no_directory: Consenti al tuo profilo di esser scoperto da sconosciuti tramite consigli e altre funzionalità
+        discoverable: Consenti al tuo account di essere scoperto da sconosciuti tramite consigli, tendenze e altre funzionalità
         email: Ti manderemo una email di conferma
         fields: Puoi avere fino a 4 voci visualizzate come una tabella sul tuo profilo
         header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare
-        irreversible: I toot filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
+        irreversible: I post filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
         locale: La lingua dell'interfaccia utente, di email e notifiche push
         locked: Richiede che approvi i follower manualmente
         password: Usa almeno 8 caratteri
         phrase: Il confronto sarà eseguito ignorando minuscole/maiuscole e i content warning
         scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole.
         setting_aggregate_reblogs: Non mostrare nuove condivisioni per toot che sono stati condivisi di recente (ha effetto solo sulle nuove condivisioni)
+        setting_always_send_emails: Normalmente le notifiche e-mail non vengono inviate quando si utilizza attivamente Mastodon
         setting_default_sensitive: Media con contenuti sensibili sono nascosti in modo predefinito e possono essere rivelati con un click
         setting_display_media_default: Nascondi media segnati come sensibili
         setting_display_media_hide_all: Nascondi sempre tutti i media
@@ -62,10 +64,36 @@ it:
       domain_allow:
         domain: Questo dominio potrà recuperare i dati da questo server e i dati in arrivo da esso verranno elaborati e memorizzati
       email_domain_block:
-        domain: Questo può essere il nome del dominio che fa parte dell'indirizzo email, il record MX a cui il dominio si risolve o l'indirizzo IP del server a cui il record MX si risolve. Saranno verificati alla registrazione da parte dell'utente e la sua iscrizione sarà respinta.
+        domain: Questo può essere il nome di dominio che appare nell'indirizzo e-mail o nel record MX che utilizza. Verranno controllati al momento dell'iscrizione.
         with_dns_records: Sarà effettuato un tentativo di risolvere i record DNS del dominio in questione e i risultati saranno inseriti anche nella blacklist
       featured_tag:
-        name: 'Eccone alcuni che potresti usare:'
+        name: 'Ecco alcuni degli hashtag che hai usato di più recentemente:'
+      filters:
+        action: Scegli quale azione eseguire quando un post corrisponde al filtro
+        actions:
+          hide: Nascondi completamente il contenuto filtrato, come se non esistesse
+          warn: Nascondi il contenuto filtrato e mostra invece un avviso, citando il titolo del filtro
+      form_admin_settings:
+        backups_retention_period: Conserva gli archivi utente generati per il numero di giorni specificato.
+        bootstrap_timeline_accounts: Questi account verranno aggiunti in cima ai consigli da seguire dei nuovi utenti.
+        closed_registrations_message: Visualizzato alla chiusura delle iscrizioni
+        content_cache_retention_period: I post da altri server verranno eliminati dopo il numero di giorni specificato se impostato su un valore positivo. Questo potrebbe essere irreversibile.
+        custom_css: È possibile applicare stili personalizzati sulla versione web di Mastodon.
+        mascot: Sostituisce l'illustrazione nell'interfaccia web avanzata.
+        media_cache_retention_period: I file multimediali scaricati verranno eliminati dopo il numero di giorni specificato se impostati su un valore positivo e scaricati nuovamente su richiesta.
+        profile_directory: La directory del profilo elenca tutti gli utenti che hanno acconsentito ad essere individuabili.
+        require_invite_text: 'Quando le iscrizioni richiedono l''approvazione manuale, rendi la domanda: "Perché vuoi unirti?" obbligatoria anziché facoltativa'
+        site_contact_email: In che modo le persone possono contattarti per richieste legali o di supporto.
+        site_contact_username: In che modo le persone possono raggiungerti su Mastodon.
+        site_extended_description: Qualsiasi informazione aggiuntiva che possa essere utile ai visitatori e ai tuoi utenti. Può essere strutturata con la sintassi Markdown.
+        site_short_description: Una breve descrizione per aiutare a identificare in modo univoco il tuo server. Chi lo gestisce, a chi è rivolto?
+        site_terms: Usa la tua politica sulla privacy o lascia vuoto per usare l'impostazione predefinita. Può essere strutturata con la sintassi Markdown.
+        site_title: In che modo le persone possono fare riferimento al tuo server oltre al suo nome di dominio.
+        theme: Tema visualizzato dai visitatori e dai nuovi utenti disconnessi.
+        thumbnail: Un'immagine approssimativamente 2:1 visualizzata insieme alle informazioni del tuo server.
+        timeline_preview: I visitatori disconnessi potranno sfogliare i post pubblici più recenti disponibili sul server.
+        trendable_by_default: Salta la revisione manuale dei contenuti di tendenza. I singoli elementi possono ancora essere rimossi dalle tendenze dopo il fatto.
+        trends: Le tendenze mostrano quali post, hashtag e notizie stanno guadagnando popolarità sul tuo server.
       form_challenge:
         current_password: Stai entrando in un'area sicura
       imports:
@@ -78,6 +106,7 @@ it:
         ip: Inserisci un indirizzo IPv4 o IPv6. Puoi bloccare interi intervalli usando la sintassi CIDR. Fai attenzione a non bloccare te stesso!
         severities:
           no_access: Blocca l'accesso a tutte le risorse
+          sign_up_block: Le nuove iscrizioni non saranno possibili
           sign_up_requires_approval: Le nuove iscrizioni richiederanno la tua approvazione
         severity: Scegli cosa accadrà con le richieste da questo IP
       rule:
@@ -89,6 +118,16 @@ it:
         name: Puoi cambiare solo il minuscolo/maiuscolo delle lettere, ad esempio, per renderlo più leggibile
       user:
         chosen_languages: Quando una o più lingue sono contrassegnate, nelle timeline pubbliche vengono mostrati solo i toot nelle lingue selezionate
+        role: Il ruolo controlla quali permessi ha l'utente
+      user_role:
+        color: Colore da usare per il ruolo in tutta l'UI, come RGB in formato esadecimale
+        highlighted: Rende il ruolo visibile
+        name: Nome pubblico del ruolo, se il ruolo è impostato per essere visualizzato come distintivo
+        permissions_as_keys: Gli utenti con questo ruolo avranno accesso a...
+        position: Un ruolo più alto decide la risoluzione dei conflitti in determinate situazioni. Alcune azioni possono essere eseguite solo su ruoli con priorità più bassa
+      webhook:
+        events: Seleziona eventi da inviare
+        url: Dove gli eventi saranno inviati
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ it:
         scheduled_at: Programma la pubblicazione
         starts_at: Inizio dell'evento
         text: Annuncio
+      appeal:
+        text: Spiega perché la decisione dovrebbe essere annullata
       defaults:
         autofollow: Invita a seguire il tuo account
         avatar: Immagine di profilo
@@ -148,31 +189,33 @@ it:
         phrase: Parola chiave o frase
         setting_advanced_layout: Abilita interfaccia web avanzata
         setting_aggregate_reblogs: Raggruppa condivisioni in timeline
-        setting_auto_play_gif: Play automatico GIF animate
+        setting_always_send_emails: Manda sempre notifiche via email
+        setting_auto_play_gif: Riproduci automaticamente le GIF animate
         setting_boost_modal: Mostra dialogo di conferma prima del boost
-        setting_crop_images: Ritaglia immagini in toot non espansi a 16x9
+        setting_crop_images: Ritaglia immagini in post non espansi a 16x9
         setting_default_language: Lingua dei post
         setting_default_privacy: Privacy dei post
         setting_default_sensitive: Segna sempre i media come sensibili
-        setting_delete_modal: Mostra dialogo di conferma prima di eliminare un toot
+        setting_delete_modal: Mostra dialogo di conferma prima di eliminare un post
         setting_disable_swiping: Disabilita i movimenti di scorrimento
         setting_display_media: Visualizzazione dei media
         setting_display_media_default: Predefinita
         setting_display_media_hide_all: Nascondi tutti
         setting_display_media_show_all: Mostra tutti
-        setting_expand_spoilers: Espandi sempre toot con content warning
+        setting_expand_spoilers: Espandi sempre post con content warning
         setting_hide_network: Nascondi la tua rete
         setting_noindex: Non farti indicizzare dai motori di ricerca
         setting_reduce_motion: Riduci movimento nelle animazioni
-        setting_show_application: Rendi pubblica l'applicazione usata per inviare i toot
+        setting_show_application: Rendi pubblica l'applicazione usata per inviare i post
         setting_system_font_ui: Usa il carattere predefinito del sistema
-        setting_theme: Tema sito
+        setting_theme: Tema del sito
         setting_trends: Mostra tendenze di oggi
         setting_unfollow_modal: Chiedi conferma prima di smettere di seguire qualcuno
         setting_use_blurhash: Mostra i gradienti colorati per i media nascosti
         setting_use_pending_items: Modalità lenta
         severity: Severità
         sign_in_token_attempt: Codice di sicurezza
+        title: Titolo
         type: Tipo importazione
         username: Nome utente
         username_or_email: Nome utente o email
@@ -181,6 +224,34 @@ it:
         with_dns_records: Includi record MX e indirizzi IP del dominio
       featured_tag:
         name: Etichetta
+      filters:
+        actions:
+          hide: Nascondi completamente
+          warn: Nascondi con avviso
+      form_admin_settings:
+        backups_retention_period: Periodo di conservazione dell'archivio utente
+        bootstrap_timeline_accounts: Consiglia sempre questi account ai nuovi utenti
+        closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili
+        content_cache_retention_period: Periodo di conservazione della cache dei contenuti
+        custom_css: Personalizza CSS
+        mascot: Personalizza mascotte (legacy)
+        media_cache_retention_period: Periodo di conservazione della cache multimediale
+        profile_directory: Abilita directory del profilo
+        registrations_mode: Chi può iscriversi
+        require_invite_text: Richiedi un motivo per unirsi
+        show_domain_blocks: Mostra i blocchi di dominio
+        show_domain_blocks_rationale: Mostra perché i domini sono stati bloccati
+        site_contact_email: Contatto email
+        site_contact_username: Nome utente di contatto
+        site_extended_description: Descrizione estesa
+        site_short_description: Descrizione del server
+        site_terms: Politica sulla privacy
+        site_title: Nome del server
+        theme: Tema predefinito
+        thumbnail: Miniatura del server
+        timeline_preview: Consenti l'accesso non autenticato alle timeline pubbliche
+        trendable_by_default: Consenti le tendenze senza revisione preventiva
+        trends: Abilita le tendenze
       interactions:
         must_be_follower: Blocca notifiche da chi non ti segue
         must_be_following: Blocca notifiche dalle persone che non segui
@@ -194,26 +265,40 @@ it:
         ip: IP
         severities:
           no_access: Blocca accesso
+          sign_up_block: Blocca iscrizioni
           sign_up_requires_approval: Limita iscrizioni
         severity: Regola
       notification_emails:
+        appeal: Qualcuno ricorre contro una decisione del moderatore
         digest: Invia email riassuntive
-        favourite: Invia email quando segna come preferito al tuo stato
+        favourite: Qualcuno ha apprezzato il tuo post
         follow: Invia email quando qualcuno ti segue
         follow_request: Invia email quando qualcuno chiede di seguirti
         mention: Invia email quando qualcuno ti menziona
         pending_account: Invia e-mail quando un nuovo account richiede l'approvazione
-        reblog: Invia email quando qualcuno condivide un tuo toot
-        report: Manda una mail quando viene inviato un nuovo rapporto
-        trending_tag: Invia e-mail quando un hashtag non controllato è in tendenza
+        reblog: Qualcuno ha condiviso il tuo post
+        report: Una nuova segnalazione è stata inviata
+        trending_tag: La nuova tendenza richiede un controllo
       rule:
         text: Regola
       tag:
         listable: Permetti a questo hashtag di apparire nella directory dei profili
         name: Hashtag
         trendable: Permetti a questo hashtag di apparire nelle tendenze
-        usable: Permetti ai toot di utilizzare questo hashtag
+        usable: Permetti ai post di usare questo hashtag
+      user:
+        role: Ruolo
+      user_role:
+        color: Colore distintivo
+        highlighted: Mostra il ruolo come distintivo sui profili utente
+        name: Nome
+        permissions_as_keys: Permessi
+        position: Priorità
+      webhook:
+        events: Eventi abilitati
+        url: URL endpoint
     'no': 'No'
+    not_recommended: Non consigliato
     recommended: Consigliato
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 4c4133baf..66f211659 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -27,6 +27,8 @@ ja:
         scheduled_at: お知らせを今すぐ掲載する場合は空欄にしてください
         starts_at: オプションです。お知らせしたい事柄の期間が決まっている場合に使用します
         text: 投稿と同じ構文を使用できます。アナウンスが占める画面のスペースに注意してください
+      appeal:
+        text: 一度だけ異議を申し立てることができます
       defaults:
         autofollow: 招待から登録した人が自動的にあなたをフォローするようになります
         avatar: "%{size}までのPNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
@@ -35,7 +37,7 @@ ja:
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
-        discoverable: ディレクトリはあなたのアカウントをより多くの人に見つけてもらうためのひとつの手段です
+        discoverable: レコメンド、トレンド、その他の機能により、あなたのアカウントを他の人から見つけられるようにします
         email: 確認のメールが送信されます
         fields: プロフィールに表として4つまでの項目を表示することができます
         header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
@@ -47,6 +49,7 @@ ja:
         phrase: 投稿内容の大文字小文字や閲覧注意に関係なく一致
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
         setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響)
+        setting_always_send_emails: 通常、Mastodon からメール通知は行われません。
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
         setting_display_media_hide_all: メディアを常に隠す
@@ -56,19 +59,45 @@ ja:
         setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
-        username: あなたのユーザー名は %{domain} の中で重複していない必要があります
+        username: あなたのユーザー名は%{domain}の中で重複していない必要があります
         whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります
       domain_allow:
         domain: 登録するとこのサーバーからデータを受信したり、このドメインから受信するデータを処理して保存できるようになります
       email_domain_block:
-        domain: メールアドレスのドメイン名および、名前解決したMXレコード、IPアドレスを指定できます。ユーザー登録時にこれらをチェックし、該当する場合はユーザー登録を拒否します。
+        domain: 電子メールアドレスのドメイン名、または使用されるMXレコードを指定できます。新規登録時にチェックされます。
         with_dns_records: 指定したドメインのDNSレコードを取得し、その結果もメールドメインブロックに登録されます
       featured_tag:
-        name: 'これらを使うといいかもしれません:'
+        name: 最近使用したハッシュタグ
+      filters:
+        action: 投稿がフィルタに一致したときに実行するアクションを選択
+        actions:
+          hide: フィルタリングしたコンテンツを完全に隠し、あたかも存在しないかのようにします
+          warn: フィルタリングされたコンテンツを、フィルタータイトルの警告の後ろに隠します。
+      form_admin_settings:
+        backups_retention_period: 生成されたユーザーのアーカイブを指定した日数の間保持します。
+        bootstrap_timeline_accounts: これらのアカウントは、新しいユーザーのフォロー推奨リストの一番上にピン留めされます。
+        closed_registrations_message: アカウント作成を停止している時に表示されます
+        content_cache_retention_period: 正の値に設定されている場合、他のサーバーの投稿は指定された日数の後に削除されます。元に戻せません。
+        custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
+        mascot: 上級者向けWebインターフェースのイラストを上書きする。
+        media_cache_retention_period: 正の値に設定されている場合、ダウンロードされたメディアファイルは指定された日数の後に削除され、リクエストに応じて再ダウンロードされます。
+        profile_directory: プロフィールディレクトリには、掲載するよう設定したすべてのユーザーが一覧表示されます。
+        require_invite_text: アカウント登録が承認制の場合、「意気込みをお聞かせください」のテキストの入力を必須にする
+        site_contact_email: 法律またはサポートに関する問い合わせ先
+        site_contact_username: マストドンでの連絡方法
+        site_extended_description: 訪問者やユーザーに役立つかもしれない任意の追加情報。Markdownが使えます。
+        site_short_description: 誰が運営しているのか、誰に向けたものなのかなど、サーバーを特定する短い説明。
+        site_terms: 独自のプライバシーポリシーを使用するか空白にしてデフォルトのプライバシーポリシーを使用します。Markdownが使えます。
+        site_title: ドメイン名以外でサーバーを参照する方法です。
+        theme: ログインしていない人と新規ユーザーに表示されるテーマ。
+        thumbnail: サーバー情報と共に表示される、アスペクト比が約 2:1 の画像。
+        timeline_preview: ログアウトした人でも、サーバー上で利用可能な最新の公開投稿を閲覧することができます。
+        trendable_by_default: トレンドコンテンツの手動レビューをスキップする。個々のコンテンツは後でトレンドから削除できます。
+        trends: トレンドは、サーバー上でどの投稿、ハッシュタグ、ニュース記事が人気を集めているかを示します。
       form_challenge:
         current_password: セキュリティ上重要なエリアにアクセスしています
       imports:
-        data: 他の Mastodon サーバーからエクスポートしたCSVファイルを選択して下さい
+        data: 他のMastodonサーバーからエクスポートしたCSVファイルを選択して下さい
       invite_request:
         text: このサーバーは現在承認制です。申請を承認する際に役立つメッセージを添えてください
       ip_block:
@@ -77,17 +106,28 @@ ja:
         ip: IPv4またはIPv6アドレスを入力してください。CIDR構文を用いて範囲指定でブロックすることもできます。自分自身を締め出さないよう注意してください！
         severities:
           no_access: すべてのリソースへのアクセスをブロックします
+          sign_up_block: 新規のアカウント作成はできません
           sign_up_requires_approval: 承認するまで新規登録が完了しなくなります
         severity: このIPに対する措置を選択してください
       rule:
         text: ユーザーのためのルールや要件を記述してください。短くシンプルにしてください。
       sessions:
-        otp: '携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:'
+        otp: '携帯電話のアプリで生成された二要素認証コードを入力するか、リカバリーコードを使用してください:'
         webauthn: USBキーの場合は、必ず挿入し、必要に応じてタップしてください。
       tag:
         name: 視認性向上などのためにアルファベット大文字小文字の変更のみ行うことができます
       user:
         chosen_languages: 選択すると、選択した言語の投稿のみが公開タイムラインに表示されるようになります
+        role: このロールはユーザーが持つ権限を管理します
+      user_role:
+        color: UI 全体で使用される色（RGB hex 形式）
+        highlighted: これによりロールが公開されます。
+        name: ロールのバッジを表示する際の表示名
+        permissions_as_keys: このロールを持つユーザーは次の機能にアクセスできます
+        position: 特定の状況では、より高いロールが競合の解決を決定します。特定のアクションは優先順位が低いロールでのみ実行できます。
+      webhook:
+        events: 送信するイベントを選択
+        url: イベントの送信先
     labels:
       account:
         fields:
@@ -96,7 +136,7 @@ ja:
       account_alias:
         acct: 引っ越し元のユーザー ID
       account_migration:
-        acct: 引っ越し先のユーザー ID
+        acct: 引っ越し先のユーザーID
       account_warning_preset:
         text: プリセット警告文
         title: タイトル
@@ -118,10 +158,12 @@ ja:
         scheduled_at: 掲載予約日時
         starts_at: 予定開始日時
         text: お知らせ
+      appeal:
+        text: この決定を覆すべき理由を説明してください
       defaults:
         autofollow: 招待から参加後、あなたをフォロー
         avatar: アイコン
-        bot: これは BOT アカウントです
+        bot: これはBOTアカウントです
         chosen_languages: 表示する言語
         confirm_new_password: 新しいパスワード（確認用）
         confirm_password: パスワード（確認用）
@@ -142,11 +184,12 @@ ja:
         max_uses: 使用できる回数
         new_password: 新しいパスワード
         note: プロフィール
-        otp_attempt: 二段階認証コード
+        otp_attempt: 二要素認証コード
         password: パスワード
         phrase: キーワードまたはフレーズ
-        setting_advanced_layout: 上級者向け UI を有効にする
+        setting_advanced_layout: 上級者向けUIを有効にする
         setting_aggregate_reblogs: ブーストをまとめる
+        setting_always_send_emails: 常にメール通知を送信する
         setting_auto_play_gif: アニメーションGIFを自動再生する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
         setting_crop_images: 投稿の詳細以外では画像を16:9に切り抜く
@@ -172,6 +215,7 @@ ja:
         setting_use_pending_items: 手動更新モード
         severity: 重大性
         sign_in_token_attempt: セキュリティコード
+        title: タイトル
         type: インポートする項目
         username: ユーザー名
         username_or_email: ユーザー名またはメールアドレス
@@ -180,6 +224,34 @@ ja:
         with_dns_records: ドメインのMXレコードとIPアドレスを含む
       featured_tag:
         name: ハッシュタグ
+      filters:
+        actions:
+          hide: 完全に隠す
+          warn: 警告付きで隠す
+      form_admin_settings:
+        backups_retention_period: ユーザーアーカイブの保持期間
+        bootstrap_timeline_accounts: 新規ユーザーに必ずおすすめするアカウント
+        closed_registrations_message: サインアップできない場合のカスタムメッセージ
+        content_cache_retention_period: コンテンツキャッシュの保持期間
+        custom_css: カスタムCSS
+        mascot: カスタムマスコット（レガシー）
+        media_cache_retention_period: メディアキャッシュの保持期間
+        profile_directory: ディレクトリを有効にする
+        registrations_mode: 新規登録が可能な人
+        require_invite_text: 意気込み理由の入力を必須にする。
+        show_domain_blocks: ドメインブロックを表示
+        show_domain_blocks_rationale: ドメインがブロックされた理由を表示
+        site_contact_email: 連絡先メールアドレス
+        site_contact_username: 連絡先ユーザー名
+        site_extended_description: 詳細説明
+        site_short_description: サーバーの説明
+        site_terms: プライバシーポリシー
+        site_title: サーバーの名前
+        theme: デフォルトテーマ
+        thumbnail: サーバーのサムネイル
+        timeline_preview: 公開タイムラインへの未認証のアクセスを許可する
+        trendable_by_default: 審査前のハッシュタグのトレンドへの表示を許可する
+        trends: トレンドを有効にする
       interactions:
         must_be_follower: フォロワー以外からの通知をブロック
         must_be_following: フォローしていないユーザーからの通知をブロック
@@ -193,9 +265,11 @@ ja:
         ip: IP
         severities:
           no_access: ブロック
+          sign_up_block: アカウント作成をブロック
           sign_up_requires_approval: 登録を制限
         severity: ルール
       notification_emails:
+        appeal: モデレーターの判断に異議申し立てが行われた時
         digest: タイムラインからピックアップしてメールで通知する
         favourite: お気に入り登録された時
         follow: フォローされた時
@@ -203,8 +277,8 @@ ja:
         mention: 返信が来た時
         pending_account: 新しいアカウントの承認が必要な時
         reblog: 投稿がブーストされた時
-        report: 通報を受けた時
-        trending_tag: 未審査のハッシュタグが人気の時
+        report: 新しい通報が送信された時
+        trending_tag: 新しいトレンドのレビューをする必要がある時
       rule:
         text: ルール
       tag:
@@ -212,7 +286,19 @@ ja:
         name: ハッシュタグ
         trendable: トレンドへの表示を許可する
         usable: 投稿への使用を許可する
+      user:
+        role: ロール
+      user_role:
+        color: バッジの色
+        highlighted: プロフィールにロールのバッジを表示する
+        name: 名前
+        permissions_as_keys: 権限
+        position: 優先度
+      webhook:
+        events: 有効なイベント
+        url: エンドポイントURL
     'no': いいえ
+    not_recommended: 非推奨
     recommended: おすすめ
     required:
       mark: "*"
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 4327fcc8e..2f8a9261e 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -11,7 +11,6 @@ kab:
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
-        discoverable: Tabdert n yimaγnuten d udem-nniḍen i umiḍan-ik akken ad yettwassen ugar
         email: Ad n-teṭṭfeḍ imayl i usentem
         irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
@@ -22,8 +21,6 @@ kab:
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
         setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaγnu-inek
         username: Isem-ik n umseqdac ad yili d ayiwen, ulac am netta deg %{domain}
-      featured_tag:
-        name: 'Ahat ad tebγuḍ ad tesqedceḍ yiwen gar-asen:'
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       ip_block:
@@ -45,6 +42,7 @@ kab:
         types:
           disable: Sens anekcum
           none: Ur teg kra
+          sensitive: Amḥulfu
           silence: Sgugem
           suspend: Ḥbes di leεḍil
       announcement:
@@ -78,12 +76,16 @@ kab:
         setting_theme: Asental n wesmel
         setting_use_pending_items: Askar aleγwayan
         sign_in_token_attempt: Tangalt n tɣellist
+        title: Azwel
         type: Anaw n uktar
         username: Isem n useqdac
         username_or_email: Isem n useqdac neγ imal
         whole_word: Awal akk
       featured_tag:
         name: Ahacṭag
+      form_admin_settings:
+        site_terms: Tasertit tabaḍnit
+        site_title: Isem n uqeddac
       invite:
         comment: Awennit
       invite_request:
@@ -95,14 +97,19 @@ kab:
           no_access: Sewḥel anekcum
         severity: Alugen
       notification_emails:
+        follow: Yeḍfer-ik·im-id walbɛaḍ
         mention: Yuder-ik·em-id walbɛaḍ
         reblog: Yella win yesselhan adda-dik·im
       rule:
         text: Alugen
       tag:
         name: Ahacṭag
+      user_role:
+        name: Isem
+        permissions_as_keys: Tisirag
     'no': Ala
     recommended: Yettuwelleh
     required:
+      mark: "*"
       text: ilaq
     'yes': Ih
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index 63fe3d460..7932e54be 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -85,8 +85,6 @@ kk:
         mention: Біреу мен туралы жазған кезде хат жібер
         pending_account: Жаңа аккаунт құптау күткен кезде хат жібер
         reblog: Жазбамды біреу бөліскен кезде хат жібер
-        report: Жаңа шағым түскен кезде хат жібер
-        trending_tag: Қаралмаған хештег шыққан кезде хат жібер
       tag:
         listable: Бұл хештегті барлық жерде көрсетуге рұқсат бер
         name: Хэштег
diff --git a/config/locales/simple_form.kmr.yml b/config/locales/simple_form.kmr.yml
deleted file mode 100644
index 015dfcbf4..000000000
--- a/config/locales/simple_form.kmr.yml
+++ /dev/null
@@ -1,226 +0,0 @@
----
-kmr:
-  simple_form:
-    hints:
-      account_alias:
-        acct: Ajimêrê ku tu dixwazî bar bikî navê bikarhêner@domain diyar bike
-      account_migration:
-        acct: Ajimêrê ku tu dixwazî bar bikî navê bikarhêner@domain diyar bike
-      account_warning_preset:
-        text: Tu dikarî wek URLyan, hashtagan û şîroveyan, tootê ristesazî jî bikarbînî
-        title: Bi dilê xwe ye. Ji wergir re nay xûyakirin
-      admin_account_action:
-        include_statuses: Bikarhênerê bibîne kîjan toot dibin sedemê çalakî an jî agahdarî
-        send_email_notification: Bikarhêner dê ravekirinê tiştê ku bi ajimêra wan re qewimî bistîne
-        text_html: Bi dili xwe ye. Tu dikarî hevoksazî ye toot bikarbînî. Tu dikarî <a href="%{path}"> pêşsazîyên hişyariyê lê zêde bikî </a> ji bo ku demê derbas nekî
-        type_html: Hilbijêre ka tu yê çi bikî bi <strong>%{acct}</strong> re
-        types:
-          disable: Nehêle bila bikarhêner ajimêrê xwe bikar bîne lê naverokan jê nebe an jî veneşêre.
-          none: Ji bo ku tu hişyariyekê ji bikarhêner re bişînî vê bi kar bîne, bêyî ku çalakiyeke din dest lê neda.
-          sensitive: Neçar bihêle ku ev bikarhêner hemû pêvekên medyayê hestiyar nîşan bike.
-          silence: Pêşî li bikarhêneran bigire ku bikarhêner bi herkesî ra xûyabarî neşîne, post û agahdarîyên xwe ji mirovên ku wan naşopîne veşêre.
-          suspend: Pêşîya hevbandorîya vî ajimêrê bigire û naveroka wê jê bibe. Di nava 30 rojan de tê vegerandin.
-        warning_preset_id: Bi dilê xwe ye. Tu hîn jî dikarî dawîya pêşsazkirî de nivîsek teybet li zêde bikî
-      announcement:
-        all_day: Dema were nîşankirin, tenê dîrokên navbera demê dê werin nîşan kirin
-        ends_at: Bi dilê xwe ye. Daxuyanî di vê demê de bi xweberî ji weşanê de rabe
-        scheduled_at: Vala bihêle ku yekcar daxûyanî were weşandin
-        starts_at: Bi dilê xwe ye. Heke daxûyanî ya te di demeke diyar ve girêdayî be
-        text: Tu dikarî hevoksazî yên toot bikarbînî. Ji kerema xwe cihê ku ev daxuyanî li ser dîmenderê bikarhêner bigire baldar be
-      defaults:
-        autofollow: Mirovên ku bi rêya vexwendinê xwe tomar kirine ew ên bi xweberî te bişopînin
-        avatar: PNG, GIF an jî JPG. Herî zêde %{size} dê ber bi %{dimensions}px ve were kêmkirin
-        bot: Ji yên din re nîşan bike ku ajimêr bi piranî kiryarên xweberî dike û dibe ku neyê çavdêrî kirin
-        context: Yek an jî zêdetir girêdan divê parzûn were sepandin
-        current_password: Ji bo ewlehiyê ji kerema xwe şîfreya ajimêrê xwe niha têkevin
-        current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
-        digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
-        discoverable: Mafê biden ku ajimêra te bi pêşniyar, peldanka profîlê û taybetmendiyên din ji aliyê bîyaniyan ve bê vedîtin
-        discoverable_no_directory: Mafê biden ku ajimêra te bi pêşniyar û taybetmendiyên din ji aliyê bîyaniyan ve bê vedîtin
-        email: Ji te re e-name ya pejirandinê were
-        fields: Tu dikarî heya 4 hêmanan wekî tabloyek li ser profîla xwe nîşan bidî
-        header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
-        inbox_url: URLyê di rûpela pêşî de guhêrkerê ku tu dixwazî bi kar bînî jê bigire
-        irreversible: Tootên parzûnkirî êdî bê veger wenda bibe, heger parzûn paşê were rakirin jî nabe
-        locale: Zimanê navrûyê bikarhêner, agahdarîyên e-name û pêl kirin
-        locked: Bi destan daxwazên şopê hilbijêrîne da ku kî bikaribe te bişopîne
-        password: Herî kêm 8 karakter bikar bîne
-        phrase: Ji rewşa nivîsê tîpên girdek/hûrdek an jî ji hişyariya naveroka ya şandiyê wek serbixwe wê were hevbeş kirin
-        scopes: |-
-          Sepana ku dê kîjan maf bide bigihije APIyan.
-          Ger te asteke jor hilbijartibe, ne pêwîste ku tu yên berfirehî a kesane hilbijêrî.
-        setting_aggregate_reblogs: Bilindkirinên ku nû hatine weşan ji şandiyên di dema dawî de nîşan nede (tenê li ser bilindkirinên nû wergirtî bandor dike)
-        setting_default_sensitive: Medyaya hestiyar berdestî ve tê veşartin û bi tikandin dikare were eşkere kirin
-        setting_display_media_default: Medyaya wekî hestyarî hatiye nîşankirî ye veşêre
-        setting_display_media_hide_all: Medyayê tim veşêre
-        setting_display_media_show_all: Medyayê tim nîşan bike
-        setting_hide_network: Kesên ku te dişopîne û kesên tu dişopînî ev ên profîla te de were veşartin
-        setting_noindex: Bandor li hemî profîla te û tootên rûpela te dike
-        setting_show_application: Navê sepana ku tu ji bo şandinê wê bi kar tîne dê di dîtinê berferh ên di şandiyên te de were xuyakirin
-        setting_use_blurhash: Gradyen xwe bi rengên dîtbarîyên veşartî ve radigire, lê belê hûrgilîyan diveşêre
-        setting_use_pending_items: Li şûna ku herkê wek bixweber bizivirînî nûvekirina demnameyê li paş tikandinekî veşêre
-        username: Navê te yê bikarhênerî li ser %{domain} de bêhempa be
-        whole_word: Dema peyvkilîd an jî hevok bi tenê alfahejmarî çêbe, bi tenê hemû bêjeyê re li hev bike wê pêk bê
-      domain_allow:
-        domain: Ev navê navperê, ji vê rajekarê wê daneyan bistîne û daneyên ku jê bê wê were sazkirin û veşartin
-      email_domain_block:
-        domain: Ev navê qada yê ku di navnîşana e-maîlê da xuya dibe, tomara MXê ya ku qada vê çareser dike an jî iPya rajekara ku MX tomar dike. Ev ên bi tomarê bikarhêneran bên kontrolkirin û tomarê were redkirin.
-        with_dns_records: Hewl tê dayîn ku tomarên DNSê yên li qada jê re hatine dayîn were çareserkirin û encamên wê jî were astengkirin
-      featured_tag:
-        name: 'Belkî tu yekê bi kar bînî çi van:'
-      form_challenge:
-        current_password: Tu dikevî qadeke ewledar
-      imports:
-        data: Pelê CSV-ê ji rajekareke din a Mastodon hate derxistin
-      invite_request:
-        text: Ev ê alikariya me bikê bo nirxandina sepanê te
-      ip_block:
-        comment: Bi dilê xwe ye. Ji bîr neke te çima ev bîranînê lê zêde kiriye.
-        expires_in: Navnîşanên IPyan çavkaniyên bi sînor in, carinan dihê parvekirin lê pirî caran dest diguherîne. Ji bo vê blokên IP ên nediyar nayê pêşniyarkirin.
-        ip: Têkeve navnîşana IPv4 an jî IPv6'yek. Tu dikarî bi hevoksazî ya CIDR re hemî valahîyan asteng bikî. Hay ji xwe hebe ku xwe derve nehêle!
-        severities:
-          no_access: Gihîştina hemî çavkaniyan asteng bike
-          sign_up_requires_approval: Tomarkirinên nû de pejirandina te pêwîste
-        severity: Daxwazên ku ji vê IPyê tên dê çi bibe hilbijêre
-      rule:
-        text: Ji bo bikarhênerên li ser vê rajekarê rêzikek an jî pêdivîyê pênase bike. Hewl bide ku rêzikê kin û xwerû bigire
-      sessions:
-        otp: 'Koda du-gavî a telefona xwe têkevê an jî yek ji wan kodên xilaskirinê têkevê:'
-        webauthn: Heke kilîta USB-yê be, jê ewle be ku wê têxinê û heke pêdivî be, pê li wê bike.
-      tag:
-        name: Tîpan, mînak ji bo ku bêhtir paknivîs bibe, tenê rewşa tîpên girdek/hûrdek dikarî biguherînî
-      user:
-        chosen_languages: Dema were nîşankirin, tenê parvekirinên bi zimanên hilbijartî dê di rêzikên giştî de werin nîşandan
-    labels:
-      account:
-        fields:
-          name: Nîşan
-          value: Naverok
-      account_alias:
-        acct: Destika ajimêrê te yê kevn
-      account_migration:
-        acct: Destika ajimêrê te yê nû
-      account_warning_preset:
-        text: Nivîsa pêşsazkirî
-        title: Sernav
-      admin_account_action:
-        include_statuses: Şandiyên hatine ragihandinê jî têxe nav e-name yê
-        send_email_notification: Bikarhênerê bi e-name yê agahdar bike
-        text: Agahdarî ya kesane
-        type: Çalakî
-        types:
-          disable: Qerisî ye
-          none: Hişyariyek bişîne
-          sensitive: Hestiyar
-          silence: Bi sînor bike
-          suspend: Hatiye rawestandin
-        warning_preset_id: Hişyariyeke pêşsazkirî bi kar bîne
-      announcement:
-        all_day: Çalakiya tevahiya rojê
-        ends_at: Dawiya bûyerê
-        scheduled_at: Weşanê demsaz bike
-        starts_at: Destpêka bûyerê
-        text: Daxuyanî
-      defaults:
-        autofollow: Ji bo şopandina ajimêra xwe vexwîne
-        avatar: Wêne
-        bot: Ev ajimêrekî bot e
-        chosen_languages: Parzûnê zimanan
-        confirm_new_password: Peborîna nû bipejirîne
-        confirm_password: Peborîn bipejirîne
-        context: Parzûnê naverokan
-        current_password: Pêborîna heyî
-        data: Dane
-        discoverable: Ji yên din re ajimêrê pêşniyar bike
-        display_name: Navê nîşandanê
-        email: Navnîşana E-nameyê
-        expires_in: Dîroka xilasbûyînê
-        fields: Profîla daneyên meta
-        header: Jormalper
-        honeypot: "%{label} (tijî neke)"
-        inbox_url: URLya guhêzkera wergirtî
-        irreversible: Li şûna veşartinê jê bibe
-        locale: Zimanê navrûyê
-        locked: Ajimêr qefl bike
-        max_uses: Hejmara bikaranîna herî zêde
-        new_password: Pêborîna nû
-        note: Jiyanname
-        otp_attempt: Koda du faktoran
-        password: Pêborîn
-        phrase: Peyvkilîd an jî hevok
-        setting_advanced_layout: Navrûya tevnê yê pêşketî çalak bike
-        setting_aggregate_reblogs: Di demnameyê de tootên bilindkirî kom bike
-        setting_auto_play_gif: GIF ên livok bi xweber bilîzine
-        setting_boost_modal: Gotûbêja pejirandinê nîşan bide berî ku şandî werê bilindkirin
-        setting_crop_images: Wêneyên di nav şandiyên ku nehatine berfireh kirin wek 16×9 jê bike
-        setting_default_language: Zimanê weşanê
-        setting_default_privacy: Ewlehiya weşanê
-        setting_default_sensitive: Her dem medya wek hestyar bide nîşan
-        setting_delete_modal: Berî ku peyamek were jêbirin, gotûbêja pejirandinê nîşan bide
-        setting_disable_swiping: Tevgerên dişiqite ne çalak bike
-        setting_display_media: Nîşandana medyayê
-        setting_display_media_default: Berdest
-        setting_display_media_hide_all: Hemûyan veşêre
-        setting_display_media_show_all: Hemûyan nîşan bide
-        setting_expand_spoilers: Şandîyên ku bi agahdarîyên naverokê va hatine nîşankirin her dem berfireh bike
-        setting_hide_network: Grafîka xwe ya civakî veşêre
-        setting_noindex: Bes e nexe di nav rêzên lêgerîna gerokan
-        setting_reduce_motion: Lîstikên livoka kêm bike
-        setting_show_application: Sepana ku ji bo şandina toot'a tê bikaranîn diyar bike
-        setting_system_font_ui: Curenivîsa berdest a pergalê bi kar bîne
-        setting_theme: Rûkarê malperê
-        setting_trends: Rojeva îro nîşan bide
-        setting_unfollow_modal: Gotûbêja pejirandinê nîşan bide berî ku dev ji şopa kesekî tê berdan
-        setting_use_blurhash: Ji bo medyaya veşartî de gradyanên rengîn nîşan bike
-        setting_use_pending_items: Awayê hêdî
-        severity: Asta girîngiyê
-        sign_in_token_attempt: Koda ewlehiyê
-        type: Cureya têxistinê
-        username: Navê bikarhêneriyê
-        username_or_email: Navê bikarhêner an jî e-name
-        whole_word: Hemû peyv
-      email_domain_block:
-        with_dns_records: Tomarên MX û IP yên hundirê navper lê zêde bike
-      featured_tag:
-        name: Hashtag
-      interactions:
-        must_be_follower: Danezanên ji kesên ku ne şopînerên min tên asteng bike
-        must_be_following: Agahdariyan asteng bike ji kesên ku tu wan naşopînî
-        must_be_following_dm: Peyamên rasterast asteng bike ji kesên ku tu wan naşopînî
-      invite:
-        comment: Şîrove
-      invite_request:
-        text: Tu çima dixwazî beşdar bibî?
-      ip_block:
-        comment: Şîrove
-        ip: IP
-        severities:
-          no_access: Gihîştinê asteng bike
-          sign_up_requires_approval: Tomaran sînordar bike
-        severity: Rêbaz
-      notification_emails:
-        digest: Kurte e-name bişîne
-        favourite: Kesekî şandiya te hez kir
-        follow: Kesekî te şopand
-        follow_request: Kesekî daxwaz kir bo şopandina te
-        mention: Kesekî qale te kir
-        pending_account: Pewîste ku ajimêra nû bihê lêkolînkirin
-        reblog: Kesekî şandiya te bilind kir
-        report: Ragihandinek nû hate şandin
-        trending_tag: Hashtageke nenirxandî bûye rojev
-      rule:
-        text: Rêbaz
-      tag:
-        listable: Bihêle ku ev hashtag werê xuyakirin di lêgerîn û pêşniyaran de
-        name: Hashtag
-        trendable: Bihêle ku ev hashtag werê xuyakirin di bin rojevê de
-        usable: Bihêle ku şandî ev hashtag bi kar bînin
-    'no': Na
-    recommended: Pêşniyarkirî
-    required:
-      mark: "*"
-      text: pêdivî ye
-    title:
-      sessions:
-        webauthn: Yek ji kilîtên ewlehiyê yên xwe bi kar bîne bo têketinê
-    'yes': Erê
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 106b36121..82abda07e 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -11,11 +11,11 @@ ko:
         title: 선택사항. 수신자에게는 보이지 않습니다
       admin_account_action:
         include_statuses: 사용자는 어떤 게시물에 대해 경고나 조치가 취해졌는지 볼 수 있게 됩니다
-        send_email_notification: 유저는 어떤 일이 일어났는 지에 대한 설명을 받게 됩니다
+        send_email_notification: 사용자는 어떤 일이 일어났는 지에 대한 설명을 받게 됩니다
         text_html: 선택사항. 게시물 문법을 사용할 수 있습니다. <a href="%{path}">경고 틀을 추가</a>하여 시간을 절약할 수 있습니다
         type_html: "<strong>%{acct}</strong>에 대해 취할 행동 선택"
         types:
-          disable: 사용자가 계정을 사용하는 것을 막지만, 그들의 게시물을 삭제하거나 숨기지는 않습니다.
+          disable: 사용자가 계정을 사용하는 것을 막지만, 그의 게시물을 삭제하거나 숨기지는 않습니다.
           none: 이것을 사용해서 어떤 동작도 하지 않고, 사용자에게 경고를 보냅니다.
           sensitive: 이 사용자의 모든 미디어 첨부를 민감함으로 강제 설정합니다.
           silence: 이 사용자가 공개 설정으로 게시물을 작성할 수 없도록 하고, 그를 팔로우 하지 않는 사람에게는 이 사용자의 게시물과 알림을 숨깁니다.
@@ -27,6 +27,8 @@ ko:
         scheduled_at: 공백으로 두면 공지사항이 곧바로 발행 됩니다
         starts_at: 공지사항이 특정한 시간에 종속 될 때를 위한 옵션입니다
         text: 게시물 문법을 사용할 수 있습니다. 공지사항은 사용자의 화면 상단 공간을 차지한다는 것을 명심하세요
+      appeal:
+        text: 처벌에 대해 단 한 번만 이의제기를 할 수 있습니다
       defaults:
         autofollow: 이 초대를 통해 가입하는 사람은 당신을 자동으로 팔로우 하게 됩니다
         avatar: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
@@ -35,19 +37,19 @@ ko:
         current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
         current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
         digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
-        discoverable: 당신의 계정을 추천과 기타 기능들에 의해 다른 사람들이 발견할 수 있게 허용합니다
-        discoverable_no_directory: 당신의 계정을 추천과 기타 기능들에 의해 다른 사람들이 발견할 수 있도록 허용합니다
+        discoverable: 추천, 트렌드 및 기타 기능을 통해 낯선 사람이 내 계정을 발견할 수 있도록 허용합니다
         email: 당신은 확인 메일을 받게 됩니다
         fields: 당신의 프로파일에 최대 4개까지 표 형식으로 나타낼 수 있습니다
         header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
         inbox_url: 사용 할 릴레이 서버의 프론트페이지에서 URL을 복사합니다
         irreversible: 필터링 된 게시물은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다
-        locale: 유저 인터페이스, 이메일, 푸시 알림 언어
-        locked: 팔로우 요청을 승인함으로써 누가 당신을 팔로우 할 수 있는지를 수동으로 제어합니다.
+        locale: 사용자 인터페이스, 이메일, 푸시 알림 언어
+        locked: 팔로우 요청을 승인제로 두어 누가 당신을 팔로우 할 수 있는지를 수동으로 제어합니다.
         password: 최소 8글자
         phrase: 게시물 내용이나 열람주의 내용 안에서 대소문자 구분 없이 매칭 됩니다
         scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다.
         setting_aggregate_reblogs: 최근에 부스트 됐던 게시물은 새로 부스트 되어도 보여주지 않기 (새로 받은 부스트에만 적용됩니다)
+        setting_always_send_emails: 기본적으로 마스토돈을 활동적으로 사용하고 있을 때에는 이메일 알림이 보내지지 않습니다
         setting_default_sensitive: 민감한 미디어는 기본적으로 가려져 있으며 클릭해서 볼 수 있습니다
         setting_display_media_default: 민감함으로 설정 된 미디어 가리기
         setting_display_media_hide_all: 항상 모든 미디어를 가리기
@@ -57,15 +59,41 @@ ko:
         setting_show_application: 당신이 게시물을 작성하는데에 사용한 앱이 게시물의 상세정보에 표시 됩니다
         setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다
         setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다
-        username: 당신의 유저네임은 %{domain} 안에서 유일해야 합니다
+        username: 당신의 사용자명은 %{domain} 안에서 유일해야 합니다
         whole_word: 키워드가 영문과 숫자로만 이루어 진 경우, 단어 전체에 매칭 되었을 때에만 작동하게 합니다
       domain_allow:
         domain: 이 도메인은 이 서버에서 데이터를 가져갈 수 있고 이 도메인에서 보내진 데이터는 처리되고 저장 됩니다
       email_domain_block:
-        domain: 이것은 이메일 주소에 보이는 도메인 네임이거나, 도메인이 향하는 MX 레코드이거나, 또는 MX 레코드가 향하는 IP 주소일 수 있습니다. 이것들은 사용자가 가입 할 때 확인 되며 가입은 반려될 것입니다.
+        domain: 이메일에 표시되는 도메인 네임이거나 그것이 사용하는 MX 레코드일 수 있습니다. 가입시에 검증됩니다.
         with_dns_records: 입력한 도메인의 DNS를 조회를 시도하여 나온 값도 차단됩니다
       featured_tag:
-        name: '이것들을 사용하면 좋을 것 같습니다:'
+        name: '이것들은 최근에 많이 쓰인 해시태그들입니다:'
+      filters:
+        action: 게시물이 필터에 걸러질 때 어떤 동작을 수행할 지 고르세요
+        actions:
+          hide: 필터에 걸러진 글을 처음부터 없었던 것처럼 완전히 가리기
+          warn: 필터에 걸러진 글을 필터 제목과 함께 경고 뒤에 가리기
+      form_admin_settings:
+        backups_retention_period: 생성된 사용자 아카이브를 며칠동안 저장할 지.
+        bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다.
+        closed_registrations_message: 새 가입을 차단했을 때 표시됩니다
+        content_cache_retention_period: 양수로 설정되었다면 다른 서버의 게시물은 여기서 설정된 일수가 지나면 삭제될 것입니다. 되돌릴 수 없는 작업일 수 있습니다.
+        custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다.
+        mascot: 고급 사용자 인터페이스에 있는 일러스트를 교체합니다.
+        media_cache_retention_period: 양수로 설정된 경우 다운로드된 미디어 파일들은 지정된 일수가 지나면 삭제될 것이고 필요할 때 다시 다운로드 될 것입니다.
+        profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
+        require_invite_text: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
+        site_contact_email: 사람들이 법적이나 도움 요청을 위해 당신에게 연락할 방법.
+        site_contact_username: 사람들이 마스토돈에서 당신에게 연락할 방법.
+        site_extended_description: 방문자와 사용자에게 유용할 수 있는 추가정보들. 마크다운 문법을 사용할 수 있습니다.
+        site_short_description: 이 서버를 특별하게 구분할 수 있는 짧은 설명. 누가 운영하고, 누구를 위한 것인가요?
+        site_terms: 자신만의 개인정보 정책을 사용하거나 비워두는 것으로 기본값을 사용할 수 있습니다. 마크다운 문법을 사용할 수 있습니다.
+        site_title: 사람들이 이 서버를 도메인 네임 대신에 부를 이름.
+        theme: 로그인 하지 않은 사용자나 새로운 사용자가 보게 될 테마.
+        thumbnail: 대략 2:1 비율의 이미지가 서버 정보 옆에 표시됩니다.
+        timeline_preview: 로그아웃 한 사용자들이 이 서버에 있는 최신 공개글들을 볼 수 있게 합니다.
+        trendable_by_default: 유행하는 콘텐츠에 대한 수동 승인을 건너뜁니다. 이 설정이 적용된 이후에도 각각의 항목들을 삭제할 수 있습니다.
+        trends: 트렌드는 어떤 게시물, 해시태그 그리고 뉴스 기사가 이 서버에서 인기를 끌고 있는지 보여줍니다.
       form_challenge:
         current_password: 당신은 보안 구역에 진입하고 있습니다
       imports:
@@ -78,6 +106,7 @@ ko:
         ip: IPv4 또는 IPv6 주소를 입력하세요. CIDR 문법을 사용해서 모든 범위를 차단할 수도 있습니다. 자기 자신을 잠가버리지 않도록 주의하세요!
         severities:
           no_access: 모든 자원에 대한 접근 차단
+          sign_up_block: 새 가입이 불가능하게 됩니다
           sign_up_requires_approval: 새 가입이 승인을 필요로 하도록 합니다
         severity: 해당 IP로부터의 요청에 대해 무엇이 일어나게 할 지 고르세요
       rule:
@@ -89,6 +118,16 @@ ko:
         name: 읽기 쉽게하기 위한 글자의 대소문자만 변경할 수 있습니다.
       user:
         chosen_languages: 체크하면, 선택 된 언어로 작성된 게시물들만 공개 타임라인에 보여집니다
+        role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다
+      user_role:
+        color: 색상은 사용자 인터페이스에서 역할을 나타내기 위해 사용되며, RGB 16진수 형식입니다
+        highlighted: 이 역할이 공개적으로 보이도록 설정합니다
+        name: 역할이 배지로 표시될 경우, 그 역할에 대한 공개적인 이름입니다
+        permissions_as_keys: 이 역할을 가진 사용자는 다음에 접근할 수 있게 됩니다...
+        position: 특정 상황에서 충돌이 발생할 경우 더 높은 역할이 충돌을 해결합니다. 특정 작업은 우선순위가 낮은 역할에 대해서만 수행될 수 있습니다
+      webhook:
+        events: 전송할 이벤트를 선택하세요
+        url: 이벤트가 어디로 전송될 지
     labels:
       account:
         fields:
@@ -103,7 +142,7 @@ ko:
         title: 제목
       admin_account_action:
         include_statuses: 신고된 게시물을 이메일에 포함
-        send_email_notification: 이메일로 유저에게 알리기
+        send_email_notification: 이메일로 사용자에게 알리기
         text: 커스텀 경고
         type: 조치
         types:
@@ -119,6 +158,8 @@ ko:
         scheduled_at: 발행 일정
         starts_at: 이벤트 시작
         text: 공지사항
+      appeal:
+        text: 이 결정이 왜 번복되어야 하는지에 대해 설명해주세요
       defaults:
         autofollow: 초대를 통한 팔로우
         avatar: 아바타
@@ -148,12 +189,13 @@ ko:
         phrase: 키워드 또는 문장
         setting_advanced_layout: 고급 웹 UI 활성화
         setting_aggregate_reblogs: 타임라인의 부스트를 그룹화
+        setting_always_send_emails: 항상 이메일 알림 보내기
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
         setting_boost_modal: 부스트 전 확인 창을 표시
         setting_crop_images: 확장되지 않은 게시물의 이미지를 16x9로 자르기
         setting_default_language: 게시물 언어
         setting_default_privacy: 게시물 프라이버시
-        setting_default_sensitive: 미디어를 언제나 민감한 컨텐츠로 설정
+        setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
         setting_delete_modal: 게시물 삭제 전 확인 창을 표시
         setting_disable_swiping: 스와이프 모션 비활성화
         setting_display_media: 미디어 표시
@@ -165,7 +207,7 @@ ko:
         setting_noindex: 검색엔진의 인덱싱을 거절
         setting_reduce_motion: 애니메이션 줄이기
         setting_show_application: 툿 작성에 사용한 앱을 공개
-        setting_system_font_ui: 시스템의 초기 설정 폰트를 사용
+        setting_system_font_ui: 시스템의 기본 글꼴을 사용
         setting_theme: 사이트 테마
         setting_trends: 오늘의 유행 보이기
         setting_unfollow_modal: 언팔로우 전 언팔로우 확인 표시
@@ -173,14 +215,43 @@ ko:
         setting_use_pending_items: 느린 모드
         severity: 심각도
         sign_in_token_attempt: 보안 코드
+        title: 제목
         type: 불러오기 종류
-        username: 유저 이름
-        username_or_email: 유저네임 또는 이메일
+        username: 사용자명
+        username_or_email: 사용자명 또는 이메일
         whole_word: 단어 전체에 매칭
       email_domain_block:
         with_dns_records: 도메인의 IP와 MX 레코드 값을 포함
       featured_tag:
         name: 해시태그
+      filters:
+        actions:
+          hide: 완전히 숨기기
+          warn: 경고와 함께 숨기기
+      form_admin_settings:
+        backups_retention_period: 사용자 아카이브 유지 기한
+        bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
+        closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
+        content_cache_retention_period: 콘텐츠 캐시 유지 기한
+        custom_css: 사용자 정의 CSS
+        mascot: 사용자 정의 마스코트 (legacy)
+        media_cache_retention_period: 미디어 캐시 유지 기한
+        profile_directory: 프로필 책자 활성화
+        registrations_mode: 누가 가입할 수 있는지
+        require_invite_text: 가입 하는 이유를 필수로 입력하게 하기
+        show_domain_blocks: 도메인 차단 보여주기
+        show_domain_blocks_rationale: 왜 도메인이 차단되었는지 보여주기
+        site_contact_email: 연락처 이메일
+        site_contact_username: 연락 받을 관리자 사용자명
+        site_extended_description: 확장된 설명
+        site_short_description: 서버 설명
+        site_terms: 개인정보 정책
+        site_title: 서버 이름
+        theme: 기본 테마
+        thumbnail: 서버 썸네일
+        timeline_preview: 로그인 하지 않고 공개 타임라인에 접근하는 것을 허용
+        trendable_by_default: 사전 리뷰 없이 트렌드에 오르는 것을 허용
+        trends: 유행 활성화
       interactions:
         must_be_follower: 나를 팔로우 하지 않는 사람에게서 온 알림을 차단
         must_be_following: 내가 팔로우 하지 않는 사람에게서 온 알림을 차단
@@ -194,18 +265,20 @@ ko:
         ip: IP
         severities:
           no_access: 접근 차단
+          sign_up_block: 가입 차단
           sign_up_requires_approval: 가입 제한
         severity: 규칙
       notification_emails:
+        appeal: 누군가가 중재자의 결정에 이의를 제기했을 때
         digest: 요약 이메일 보내기
-        favourite: 누군가 내 상태를 즐겨찾기로 등록했을 때 이메일 보내기
-        follow: 누군가 나를 팔로우 했을 때 이메일 보내기
-        follow_request: 누군가 나를 팔로우 하길 원할 때 이메일 보내기
-        mention: 누군가 나에게 답장했을 때 이메일 보내기
-        pending_account: 새 계정이 심사가 필요할 때 이메일 보내기
-        reblog: 누군가 내 툿을 부스트 했을 때 이메일 보내기
-        report: 새 신고 등록시 이메일로 알리기
-        trending_tag: 리뷰 되지 않은 해시태그가 유행할 때 이메일 보내기
+        favourite: 누군가 내 상태를 마음에 들어했을 때
+        follow: 누군가 나를 팔로우 했을 때
+        follow_request: 누군가 나를 팔로우 하길 요청할 때
+        mention: 누군가 나를 언급했을 때
+        pending_account: 새 계정이 심사가 필요할 때
+        reblog: 누군가 내 게시물을 부스트 했을 때
+        report: 새 신고가 접수되었을 때
+        trending_tag: 새 트렌드에 대한 리뷰가 필요할 때
       rule:
         text: 규칙
       tag:
@@ -213,7 +286,19 @@ ko:
         name: 해시태그
         trendable: 이 해시태그가 유행에 보여지도록 허용
         usable: 이 해시태그를 게시물에 사용 가능하도록 허용
+      user:
+        role: 역할
+      user_role:
+        color: 배지 색상
+        highlighted: 역할 배지를 사용자 프로필에 표시
+        name: 이름
+        permissions_as_keys: 권한
+        position: 우선순위
+      webhook:
+        events: 활성화된 이벤트
+        url: 엔드포인트 URL
     'no': 아니오
+    not_recommended: 추천하지 않음
     recommended: 추천함
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index 0a6cbc703..aaef8cf55 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -3,208 +3,309 @@ ku:
   simple_form:
     hints:
       account_alias:
-        acct: دیاریکردنی username@domain ئەو هەژمارە کە دەتەوێت بیگوازیەوە لە
+        acct: Ajimêrê ku tu dixwazî jê bar bikî navê bikarhêner@navper diyar bike
       account_migration:
-        acct: دیاریکردنی username@domain ئەو هەژمارە کە دەتەوێت بیگوازیەوە لە
+        acct: Ajimêrê ku tu dixwazî bar bikî bo wê navê bikarhêner@navper diyar bike
       account_warning_preset:
-        text: دەتوانی ڕستەسازی ی توت بەکاربێنیت، وەک لینک، هاشتاگ و باسەکان
-        title: ئارەزوومەندانە. دیار نیە بۆ وەرگر
+        text: Tu dikarî hevoksaziya şandiyê wekî URL, hashtag û şîroveyan, bi kar bînî
+        title: Vebijêrkî ye. Ji wergir re nayê xuyakirin
       admin_account_action:
-        include_statuses: بەکارهێنەرەکە دەبینێت کام توتی هۆکاری کرداری بەڕێوەبەر یان ئاگادارکردنەوە
-        send_email_notification: بەکارهێنەر ڕوننکردەوەیەک دەبینێت کە تێدا دەزانێت چی بە سەر هەژمارەکەی هاتووە
-        text_html: ئارزوومەندانە. دەتوانن وەک توتی ئاسایی بینووسن. دەتوانن بۆ کەمکردنەوەی کات <a href="%{path}">ئاگادارییەکان لە پێشەوە زیادبکەن</a>
-        type_html: گەرکتە لەگەڵ هەژمارەی <strong>%{acct}</strong> چی بکەیت
-        warning_preset_id: ئارەزوومەندانەیە. هێشتا دەتوانیت لە کۆتایی دەق شتێک زیاد بکەی
+        include_statuses: Bikarhêner wê bibîne kîjan şandî dibin sedemê çalakî an jî agahdarikirina çavdêriyê
+        send_email_notification: Bikarhêner dê ravekirinê tiştê ku bi ajimêra wan re qewimî bistîne
+        text_html: Bi dilê xwe ye. Tu dikarî hevoksaziye şandiyê bi kar bînî. Tu dikarî <a href="%{path}"> pêşsaziyên hişyariyê tevlî bikî </a> ji bo ku demê derbas nekî
+        type_html: Hilbijêre ka tu yê çi bikî bi <strong>%{acct}</strong> re
+        types:
+          disable: Nehêle bikarhêner ajimêrê xwe bi kar bîne lê naverokan jê nabe an jî veneşêre.
+          none: Ji bo ku tu hişyariyekê ji bikarhêner re bişînî vê bi kar bîne, bêyî ku çalakiyeke din bikî.
+          sensitive: Neçar bihêle ku ev bikarhêner hemû pêvekên medyayê hestiyar nîşan bike.
+          silence: Pêşî li bikarhêneran bigire ku bikarhêner bi herkesî ra xûyabarî neşîne, post û agahdarîyên xwe ji mirovên ku wan naşopîne veşêre.
+          suspend: Pêşîya hevbandorîya vî ajimêrê bigire û naveroka wê jê bibe. Di nava 30 rojan de tê vegerandin.
+        warning_preset_id: Bi dilê xwe ye. Tu hîn jî dikarî dawîya pêşsazkirî de nivîsek teybet li zêde bikî
       announcement:
-        all_day: کاتێک چاودێریکرا، تەنها بەروارەکانی مەودای کات پیشان دەدرێت
-        ends_at: ئارەزوومەندانەیە. ئەم کاتە راگەیەنراوەکە بە شێوەیەکی خۆکارانە بڵاوناکرێتەوە
-        scheduled_at: چۆڵ یبهێڵەوە بۆ بڵاوکردنەوەی دەستبەجێی بانگەوازەکە
-        starts_at: ئارەزوومەندانەیە. لە حاڵەتی ڕاگەیاندنی تۆ بەستراو بە مەودایەکی کاتی دیاریکراو
-        text: دەتوانیت ڕستەسازی توت بەکار بێنیت. تکایە بیر لەو بۆشاییە بکەوە کە بانگەوازەکە لەسەر شاشەی بەکارهێنەرەکە دەست نیشان دەکات
+        all_day: Dema were nîşankirin, tenê dîrokên navbera demê dê werin nîşan kirin
+        ends_at: Bi dilê xwe ye. Daxuyanî di vê demê de bi xweberî ji weşanê de rabe
+        scheduled_at: Vala bihêle ku yekcar daxûyanî were weşandin
+        starts_at: Vebijêrkî ye. Ku daxûyanî ya te di demeke diyar ve girêdayî be
+        text: Tu dikarî hevoksaziya şandiyê bi kar bînî. Ji kerema xwe bila haya te ji cihê ku ev daxuyanî li ser dîmenderê bikarhêner bigire hebe
+      appeal:
+        text: Tu dikarî tenê carekê îtîraza binpêkirinê bikî
       defaults:
-        autofollow: ئەو کەسانەی کە لە ڕێگەی بانگهێشتکردنەوە تۆمار دەکرێن بە خۆکارانە شوێنت دەکەون
-        avatar: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}px
-        bot: ئەم هەژمارە بەشێوەیەکی سەرەکی کردارە خۆکارانە ئەنجام دەدات و لەوانەیە چاودێری نەکرێت
-        context: یەک یان چەند دەقێک کە پالافتنەکە جێبەجێ بکات
-        current_password: بۆ مەبەستی پاراستن تکایە تێپەروشەی هەژمارەی ئێستاکەت بنووسە
-        current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
-        digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
-        discoverable: پێرستی هەڵبژاردەی بەکارهێنەران،تەنها ڕیگایەکی دیکەیە بۆ گەیشتنی بەکارهێنەری فرەتر بۆ هەژمارەکەت
-        email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
-        fields: دەتوانیت تا ٤بڕگەت هەبێت کە وەک خشتەیەک لەسەر پرۆفایلەکەت پیشان بدرێت
-        header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
-        inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
-        irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
-        locale: زمانی ڕووکاری بەکارهێنەر، ئیمەیلەکان و ئاگانامەکان
-        locked: بە دەستی شوێنکەوتوانی خۆت پەسەند بکە
-        password: بەلایەنی کەمەوە ٨ نووسە بەکاربهێنە
-        phrase: سەربەخۆ لە بچکۆلی و گەورەیی پیتەکان، لەگەڵ دەقی ئەسڵی یان ئاگانامەکانی ناوەرۆکی توتەکان هاوئاهەنگ دەکرێت
-        scopes: APIـیەکانی بەرنامەنووسی کە ئەم ماڵپەڕە دەستپێگەیشتنی لەگەڵیان هیە. ئەگەر بەرزترین ئاست هەڵبژێرن ئیتر نیاز بە بژاردەی ئاستی نزم نییە.
-        setting_aggregate_reblogs: بۆ ئەو دووبارە توتانە کە بە نوێیی پێتان نیشان دراوە،دووبارە توتەکانی پێشتر زیاد مەکە(تەنها کاریگەری لەسەر توتەکانی ئەم دواییە هەیە)
-        setting_default_sensitive: میدیای هەستیار لە بنەڕەت شاراوەیە و دەتوانرێت بە کلیکیک ئاشکرا بکرێت
-        setting_display_media_default: شاردنەوەی ئەو میدیایانەی وەک هەستیار نیشانکراون
-        setting_display_media_hide_all: هەمیشە میدیا بشارەوە
-        setting_display_media_show_all: هەمیشە میدیا نیشان بدە
-        setting_hide_network: کێ دوای دەکەویت و کێ دوای تۆ دەکەوێت لە پرۆفایلەکەت پیشان نادرێت
-        setting_noindex: کاردەکاتە سەر پرۆفایل و لاپەڕە گشتیەکانت
-        setting_show_application: بەرنامەیەک کە بە یارمەتیت توت دەکەیت، لە دیمەنی وردی توتەکان پیشان دەدرێت
-        setting_use_blurhash: سێبەرەکان لە سەر بنەمای ڕەنگەکانی بەکارهاتوو لە وێنە داشاراوەکان دروست دەبن بەڵام وردەزانیاری وێنە تێیدا ڕوون نییە
-        setting_use_pending_items: لەجیاتی ئەوەی بە خۆکارانە کێشان هەبێت لە نووسراوەکان بە کرتەیەک بەڕۆژبوونی پێرستی نووسراوەکان بشارەوە
-        username: ناوی بەکارهێنەری ئێوە لەسەر %{domain} یەکتا دەبێت
-        whole_word: کاتێک کلیل‌وشە بریتییە لە ژمارە و پیت، تنەها کاتێک پەیدا دەبێت کە لەگەڵ گشتی وشە لە نێو دەقەکە هاوئاهەنگ بێت، نە تەنها لەگەڵ بەشێک لە وشە
+        autofollow: Mirovên ku bi riya vexwendinê xwe tomar kirine ew ên bi xweberî te bişopînin
+        avatar: PNG, GIF an jî JPG. Herî zêde %{size} dê ber bi %{dimensions}px ve were kêmkirin
+        bot: Ji yên din re nîşan bike ku ajimêr bi piranî kiryarên xweberî dike û dibe ku neyê çavdêrî kirin
+        context: Yek an jî zêdetir girêdan divê parzûn were sepandin
+        current_password: Ji bo ewlehiyê ji kerema xwe borînpeyva ajimêrê xwe têxe
+        current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
+        digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
+        discoverable: Mafê biden ku ajimêra te bi pêşniyar û taybetmendiyên din ji aliyê biyaniyan ve bê vedîtin
+        email: Ji te re e-name ya pejirandinê were
+        fields: Tu dikarî heya 4 hêmanan wekî tabloyek li ser profîla xwe nîşan bidî
+        header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
+        inbox_url: Girêdanê ji rûpela pêşîn a guhêrkera ku tu dixwazî bi kar bînî jê bigire
+        irreversible: Şandiyên parzûnkirî êdî bê veger wenda bibe, heger parzûn paşê were rakirin jî nabe
+        locale: Zimanê navrûyê bikarhêner, agahdarîyên e-name û pêl kirin
+        locked: Bi pejirandina daxwazên şopandinê, kî dikare te bişopîne bi destan kontrol bike
+        password: Herî kêm 8 tîpan bi kar bîne
+        phrase: Ji rewşa nivîsê tîpên girdek/hûrdek an jî ji hişyariya naveroka ya şandiyê wek serbixwe wê were hevbeş kirin
+        scopes: |-
+          Sepana ku dê kîjan maf bide bigihije APIyan.
+          Ger te asteke jor hilbijartibe, ne pêwîste ku tu yên berfirehî a kesane hilbijêrî.
+        setting_aggregate_reblogs: Bilindkirinên ku nû hatine weşan ji şandiyên di dema dawî de nîşan nede (tenê li ser bilindkirinên nû wergirtî bandor dike)
+        setting_always_send_emails: Dema ku tu Mastodon bi rengek çalak bi kar tînî, bi gelemperî agahdariya e-nameyê nayê şandin
+        setting_default_sensitive: Medyaya hestiyar berdestî ve tê veşartin û bi tikandin dikare were eşkere kirin
+        setting_display_media_default: Medyaya wekî hestyarî hatiye nîşankirî ye veşêre
+        setting_display_media_hide_all: Medyayê tim veşêre
+        setting_display_media_show_all: Medyayê tim nîşan bike
+        setting_hide_network: Kesên ku te dişopîne û kesên tu dişopînî ev ên profîla te de were veşartin
+        setting_noindex: Bandor li hemî profîla te û şandiyên rûpela te dike
+        setting_show_application: Navê sepana ku tu ji bo şandinê wê bi kar tîne dê di dîtinê berferh ên di şandiyên te de were xuyakirin
+        setting_use_blurhash: Gradyen xwe bi rengên dîtbarîyên veşartî ve radigire, lê belê hûrgilîyan diveşêre
+        setting_use_pending_items: Li şûna ku herkê wek bixweber bizivirînî nûvekirina demnameyê li paş tikandinekî veşêre
+        username: Navê te yê bikarhênerî li ser %{domain} de bêhempa be
+        whole_word: Dema peyvkilîd an jî hevok bi tenê alfahejmarî çêbe, bi tenê hemû bêjeyê re li hev bike wê pêk bê
       domain_allow:
-        domain: ئەم دۆمەینە دەتوانێت دراوە لە ئەم ڕاژە وەربگرێت و دراوەی ئەم دۆمەینە لێرە ڕێکدەخرین و پاشکەوت دەکرێن
+        domain: Ev navê navperê, ji vê rajekarê wê daneyan bistîne û daneyên ku jê bê wê were sazkirin û veşartin
       email_domain_block:
-        domain: ئەمە دەکرێت ناوی دۆمەینەکە بێت کە لە ناونیشانی ئیمەیلدا دەرکەوێ، تۆماری MX کە دۆمەین چارەسەری دەکات یان IPی ڕاژەکە کە تۆماری MX چارەسەری دەکات. ئەوانە دەپشکنن لەسەر تۆمارکردنی بەکارهێنەر و تۆمارکردن ڕەت دەکرێت.
-        with_dns_records: هەوڵێک بۆ چارەسەرکردنی تۆمارەکانی DNSی دۆمەین دراوە کە ئەنجامەکان بلۆک دەکرێت
+        domain: Ev dikare bibe navê navperek ku di navnîşana e-nameyê de an tomara MX ya ku ew bi kar tîne de xuya dike. Ew ê di dema tomarkirinê de werin kontrolkirin.
+        with_dns_records: Hewl tê dayîn ku tomarên DNSê yên li qada jê re hatine dayîn were çareserkirin û encamên wê jî were astengkirin
       featured_tag:
-        name: 'لەوانەیە بتەوێت یەکێک لەمانە بەکاربهێنیت:'
+        name: 'Li virê çend haştag hene ku te demên dawî bi kar anîne:'
+      filters:
+        action: Hilbijêre ku dema şandiyek bi parzûnê re lihevhatî be bila kîjan çalakî were pêkanîn
+        actions:
+          hide: Naveroka parzûnkirî bi tevahî veşêre, mîna ku ew tune be tevbigere
+          warn: Naveroka parzûnkirî li pişt hişyariyek ku sernavê parzûnê qal dike veşêre
+      form_admin_settings:
+        backups_retention_period: Arşîvên bikarhênerên çêkirî ji bo rojên diyarkirî tomar bike.
+        bootstrap_timeline_accounts: Ev ajimêr wê di pêşnîyarên şopandina bikarhênerên nû de werin derzîkirin.
+        closed_registrations_message: Dema ku tomarkirin girtî bin têne xuyakirin
+        content_cache_retention_period: Şandiyên ji rajekarên din wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin. Dibe ku ev bê veger be.
+        custom_css: Tu dikarî awayên kesane li ser guhertoya malperê ya Mastodon bicîh bikî.
+        mascot: Îlustrasyona navrûyê webê yê pêşketî bêbandor dike.
+        media_cache_retention_period: Pelên medyayê yên daxistî wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin, û li gorî daxwazê ​​ji nû ve werin daxistin.
+        profile_directory: Pelrêça profîlê hemû bikarhênerên keşfbûnê hilbijartine lîste dike.
+        require_invite_text: Gava ku tomarkirin pêdiviya pejirandina destan dike, Têketina nivîsê "Tu çima dixwazî beşdar bibî?" Bike sereke ji devla vebijêrkî
+        site_contact_email: Mirov dikarin ji bo pirsên qanûnî yan jî yên piştgiriyê çawa xwe digihînin te.
+        site_contact_username: Mirov dikarin li ser Mastodonê xwe çawa xwe bigihînin te.
+        site_extended_description: Her zanyariyek daxwazî dibe ku bibe alîkar bo mêvan û bikarhêneran re. Û dikarin bi hevoksaziya Markdown re werin sazkirin.
+        site_short_description: Danasîneke kurt ji bo ku bibe alîkar ku rajekara te ya bêhempa werê naskirin. Kî bi rê ve dibe, ji bo kê ye?
+        site_terms: Politîka taybetiyê ya xwe bi kar bîne an jî vala bihêle da ku berdest werê bikaranîn. Dikare bi hevoksaziya Markdown ve werê sazkirin.
+        site_title: Tu çawa dixwazî mirov qale rajekarê te bikin ji bilî navê navperê wî.
+        theme: Rûkara ku mêvanên têneketî û bikarhênerên nû dibînin.
+        thumbnail: Li kêleka zanyariyên rajekarê xwe wêneyeke 2:1 nîşan bide.
+        timeline_preview: Mêvanên têneketî wê karibin li şandiyên gelemperî yên herî dawî yên ku li ser rajekarê peyda dibin bigerin.
+        trendable_by_default: Nirxandina destan a naveroka rojevê derbas bike. Tiştên kesane dîsa jî dikarin piştî rastiyê ji rojevê werin derxistin.
+        trends: Rojev nîşan dide ka kîjan şandî, hashtag û çîrokê nûçeyan balê dikişîne li ser rajekarê te.
       form_challenge:
-        current_password: تۆ دەچیتە ناو ناوچەی پارێزراو
+        current_password: Tu dikevî qadeke ewledar
       imports:
-        data: فایلی CSV هەناردەکراوە لە ڕاژەیەکی تری ماستۆدۆن
+        data: Pelê CSV-ê ji rajekareke din a Mastodon hate derxistin
       invite_request:
-        text: ئەمە یارمەتیمان دەدات بۆ پێداچوونەوەی بەرنامەکەت
+        text: Ev ê alikariya me bikê bo nirxandina sepanê te
       ip_block:
-        comment: دڵخوازە. لەبیرتە بۆچی ئەم یاسایەت زیاد کرد.
-        expires_in: ناونیشانی IP سەرچاوەی سنوردارن، هەندێک جار هاوبەشکراون و زۆر جار دەستەکان دەگۆڕن. لەبەر ئەم هۆیە، بلۆکی IP بێ نەناسراو پێشنیار نەکراوە.
-        ip: ناونیشانی IPv4 یان IPv6 تێبنووسە. دەتوانیت هەموو مەوداکان بلۆک بکەیت بە بەکارهێنانی داڕستانی CIDR. وریابە خۆت قفڵ مەکە!
+        comment: Bi dilê xwe ye. Ji bîr neke te çima ev bîranînê lê zêde kiriye.
+        expires_in: Navnîşanên IPyan çavkaniyên bi sînor in, carinan dihê parvekirin lê pirî caran dest diguherîne. Ji bo vê blokên IP ên nediyar nayê pêşniyarkirin.
+        ip: Têkeve navnîşana IPv4 an jî IPv6'yek. Tu dikarî bi hevoksazî ya CIDR re hemî valahîyan asteng bikî. Hay ji xwe hebe ku xwe derve nehêle!
         severities:
-          no_access: بلۆککردنی گەیشتن بە هەموو سەرچاوەکان
-          sign_up_requires_approval: نوێ ناوتۆمارکردن پێویستی بە ڕەزامەندی تۆیە
-        severity: هەڵبژێرە چی ڕوودەدات لەگەڵ داواکاریەکانی ئەم IP
+          no_access: Gihîştina hemî çavkaniyan asteng bike
+          sign_up_block: Tomarkirinên nû wê ne pêkan bin
+          sign_up_requires_approval: Tomarkirinên nû de pejirandina te pêwîste
+        severity: Daxwazên ku ji vê IPyê tên dê çi bibe hilbijêre
+      rule:
+        text: Ji bo bikarhênerên li ser vê rajekarê rêzikek an jî pêdivîyê pênase bike. Hewl bide ku rêzikê kin û xwerû bigire
       sessions:
-        otp: 'کۆدی دوو-فاکتۆر بنووسە کە لەلایەن ئەپی تەلەفۆنەکەتەوە دروست کراوە یان یەکێک لە کۆدەکانی هێنانەوەی خۆت بەکاربهێنە:'
-        webauthn: ئەگەر کلیلی USB بێت دڵنیابە لە تێکردنی و ئەگەر پێویست بوو، لێیبدە.
+        otp: 'Koda du-gavî a telefona xwe têkevê an jî yek ji wan kodên xilaskirinê têkevê:'
+        webauthn: Ku kilîta USB be, jê ewle be ku wê têxî û ku pêdivî be, pê li wê bike.
       tag:
-        name: ئێوە دەتوانن گەورەیی و بجکۆلیی پیتەکان دەستکاری بکەن تاکوو خوێنەوارتر دیاربن
+        name: Tu dikarî tenê mezinahiya tîpan biguherînî bo mînak, da ku ew bêtir were xwendin
       user:
-        chosen_languages: کاتێک چاودێری کرا، تەنها توتەکان بە زمانە دیاریکراوەکان لە هێڵی‌کاتی گشتی پیشان دەدرێت
+        chosen_languages: Dema were nîşankirin, tenê parvekirinên bi zimanên hilbijartî dê di rêzikên giştî de werin nîşandan
+        role: Rola kîjan mafdayînên bikarhêner heye kontrol dike
+      user_role:
+        color: Renga ku were bikaranîn ji bo rola li seranserê navrûya bikarhêneriyê, wekî RGB di forma hex
+        highlighted: Ev rola xwe ji raya giştî re xuya dike
+        name: Navê giştî yê rolê, ku rol wekî nîşanekê were nîşankirin
+        permissions_as_keys: Bikarhênerên bi vê rolê wê bigihîjin...
+        position: Rola bilind di hinek rewşan de biryara çareserkirina nakokiyan dide. Hinej çalakî tenê dikarin li ser rolên bi pêşanînek kêmtir bêne kirin
+      webhook:
+        events: Bûyeran hilbijêre bo şandinê
+        url: Cihê ku bûyer wê werin şandin
     labels:
       account:
         fields:
-          name: ناونیشان
-          value: ناوەڕۆک
+          name: Nîşan
+          value: Naverok
       account_alias:
-        acct: چارەسەرکردنی هەژمارە کۆنەکە
+        acct: Destika ajimêrê te yê kevn
       account_migration:
-        acct: چارەسەرکردنی هەژمارە نوێکە
+        acct: Destika ajimêrê te yê nû
       account_warning_preset:
-        text: دەقی پێشوەختی ڕێکخستن
-        title: سەردێڕ
+        text: Nivîsa pêşsazkirî
+        title: Sernav
       admin_account_action:
-        include_statuses: لەخۆگرتنی توتەکانی گوزارشت لە ئیمەیل
-        send_email_notification: بەکارهێنەر ئاگادار بکەوە بۆ هەر ئیمەیڵێک
-        text: ئاگاداری تایبەتمەند
-        type: کردار
+        include_statuses: Şandiyên hatine ragihandinê jî têxe nav e-name yê
+        send_email_notification: Bikarhênerê bi e-name yê agahdar bike
+        text: Agahdarî ya kesane
+        type: Çalakî
         types:
-          disable: بەستن
-          none: ناردنی ئاگاداری
-          sensitive: هەستیار
-          silence: سنوور
-          suspend: ڕاگرتن
-        warning_preset_id: بەکاهێنانی ئاگاداری پێش وەختە
+          disable: Qerisî ye
+          none: Hişyariyek bişîne
+          sensitive: Hestiyar
+          silence: Bi sînor bike
+          suspend: Hatiye rawestandin
+        warning_preset_id: Hişyariyeke pêşsazkirî bi kar bîne
       announcement:
-        all_day: ڕووداوی هەموو ڕۆژەکە
-        ends_at: کۆتایی ڕووداو
-        scheduled_at: بڵاوکراوەکە خشتە بکە
-        starts_at: دەستپێکردنی ڕووداو
-        text: بانگەواز
+        all_day: Çalakiya tevahiya rojê
+        ends_at: Dawiya bûyerê
+        scheduled_at: Weşanê demsaz bike
+        starts_at: Destpêka bûyerê
+        text: Daxuyanî
+      appeal:
+        text: Şîrove bike çima divê ev biryar were berovajîkirin
       defaults:
-        autofollow: بانگهێشت کردن بۆ شوێنکەوتنی هەژمارەکەت
-        avatar: وێنۆچکە
-        bot: ئەمە هەژمارێکی ساختەیە
-        chosen_languages: پاڵاوتنی زمانەکان
-        confirm_new_password: پشتڕاستکردنەوەی تێپەڕوشەی نوێ
-        confirm_password: پشتڕاستکردنەوەی تێپەڕوشە
-        context: چوارچێوەی پاڵافتن
-        current_password: تێپەروشەی ئێستا
-        data: دراوه
-        discoverable: ئەم هەژمێرە لە پێرستی بژاردەی بەکارهێنەران نیشان بدە
-        display_name: ناوی پیشاندان
-        email: ناونیشانی ئیمەیڵ
-        expires_in: بەسەردەچێت پاش
-        fields: مێتاداتای پرۆفایل
-        header: سەرپەڕە
-        inbox_url: بەستەری سندوقی گواستنەوەی
-        irreversible: فرێدان لەجیاتی شاردنەوە
-        locale: زمانی پەڕەی بەکارهێنەر
-        locked: داخستنی هەژمارە
-        max_uses: زۆرترین ژمارەی بەکاربەرەکان
-        new_password: تێپەروشەی نوێ
-        note: دەربارەی ئیوە
-        otp_attempt: کۆدی دووقۆناغی هاتنەژوور
-        password: تێپەڕوشە
-        phrase: وشەکلیل یان دەستەواژە
-        setting_advanced_layout: چالاککردنی ڕووکاری وێبی پێشکەوتوو
-        setting_aggregate_reblogs: گرووپی توتەکان یەکبخە
-        setting_auto_play_gif: خۆکاربەخشکردنی GIFــەکان
-        setting_boost_modal: پیشاندانی دیالۆگی دووپاتکردنەوە پێش دوبارە توتاندن
-        setting_crop_images: لە تووتی نەکراوە،وینەکان لە ئەندازی ۱٦×۹ ببڕە
-        setting_default_language: زمانی نووسراوەکانتان
-        setting_default_privacy: چوارچێوەی تایبەتێتی ئێوە
-        setting_default_sensitive: هەمیشە نیشانکردنی میدیا وەک هەستیار
-        setting_delete_modal: نیساندانی پەیامی پەسەند کردن پاش سڕینەوە
-        setting_disable_swiping: جوڵەی سڕینەوە لە کاربخە
-        setting_display_media: پیشاندانی میدیا
-        setting_display_media_default: بنەڕەت
-        setting_display_media_hide_all: شاردنەوەی هەموو
-        setting_display_media_show_all: هەموو نیشان بدە
-        setting_expand_spoilers: هەمیشە ئەو توتانەی کە بە ئاگادارکردنەوەکانی ناوەڕۆکەوە نیشانەکراون، پیسان بدە
-        setting_hide_network: شاردنەوەی تۆڕەکەت
-        setting_noindex: داوا لە مەکینەی گەڕان بۆ پیشاننەدان لە دەئەنجامی گەڕانەکان
-        setting_reduce_motion: کەمکردنەوەی جوڵە لە ئەنیمەکان
-        setting_show_application: ئاشکراکردنی ئەپەکان بۆ ناردنی توتەکان
-        setting_system_font_ui: فۆنتی بنەڕەتی سیستەم بەکاربهێنە
-        setting_theme: ڕووکاری ماڵپەڕ
-        setting_trends: پیشاندانی نووسراوە بەرچاوکراوەی ئەمڕۆ
-        setting_unfollow_modal: پیشاندانی پەیامی پەسەندکردن پێش شوێن‌نەکەوتنی کەسێک
-        setting_use_blurhash: بەجیاتی وینەی داشاراوە، سێبەری ڕەنگاوڕەنگ نیشان بدە
-        setting_use_pending_items: دۆخی خاو
-        severity: ئاستی گرنگی
-        sign_in_token_attempt: کۆدی پاراستن
-        type: جۆری هاوردەکردن
-        username: ناوی بەکارهێنەر
-        username_or_email: ناوی بەکاهێنەر یان ئیمەیڵ
-        whole_word: هەموو وشەکە
+        autofollow: Ji bo şopandina ajimêra xwe vexwîne
+        avatar: Wêne
+        bot: Ev ajimêrekî bot e
+        chosen_languages: Parzûnê zimanan
+        confirm_new_password: Borînpeyva nû bipejirîne
+        confirm_password: Borînpeyvê bipejirîne
+        context: Parzûnê naverokan
+        current_password: Borînpeyva heyî
+        data: Dane
+        discoverable: Ji yên din re ajimêrê pêşniyar bike
+        display_name: Navê nîşandanê
+        email: Navnîşana E-nameyê
+        expires_in: Dîroka xilasbûyînê
+        fields: Profîla daneyên meta
+        header: Jormalper
+        honeypot: "%{label} (tijî neke)"
+        inbox_url: Girêdana guhêrkera peymanên hatî
+        irreversible: Li şûna veşartinê jê bibe
+        locale: Zimanê navrûyê
+        locked: Ajimêr kilît bike
+        max_uses: Hejmara bikaranîna herî zêde
+        new_password: Borînpeyva nû
+        note: Jiyanname
+        otp_attempt: Koda du faktoran
+        password: Borînpeyv
+        phrase: Peyvkilîd an jî hevok
+        setting_advanced_layout: Navrûya tevnê yê pêşketî çalak bike
+        setting_aggregate_reblogs: Di demnameyê de şandiyên bilindkirî kom bike
+        setting_always_send_emails: Her dem agahdariya e-nameyê bişîne
+        setting_auto_play_gif: GIF ên livok bi xweber bilîzine
+        setting_boost_modal: Gotûbêja pejirandinê nîşan bide berî ku şandî werê bilindkirin
+        setting_crop_images: Wêneyên di nav şandiyên ku nehatine berfireh kirin wek 16×9 jê bike
+        setting_default_language: Zimanê weşanê
+        setting_default_privacy: Ewlehiya weşanê
+        setting_default_sensitive: Her dem medya wek hestyar bide nîşan
+        setting_delete_modal: Berî ku peyamek were jêbirin, gotûbêja pejirandinê nîşan bide
+        setting_disable_swiping: Tevgerên dişiqite ne çalak bike
+        setting_display_media: Nîşandana medyayê
+        setting_display_media_default: Berdest
+        setting_display_media_hide_all: Hemûyan veşêre
+        setting_display_media_show_all: Hemûyan nîşan bide
+        setting_expand_spoilers: Şandîyên ku bi agahdarîyên naverokê va hatine nîşankirin her dem berfireh bike
+        setting_hide_network: Grafîka xwe ya civakî veşêre
+        setting_noindex: Bes e nexe di nav rêzên lêgerîna gerokan
+        setting_reduce_motion: Lîstikên livoka kêm bike
+        setting_show_application: Sepana ku ji bo şandina şandiyan tê bikaranîn diyar bike
+        setting_system_font_ui: Curenivîsa berdest a pergalê bi kar bîne
+        setting_theme: Rûkarê malperê
+        setting_trends: Rojeva îro nîşan bide
+        setting_unfollow_modal: Gotûbêja pejirandinê nîşan bide berî ku dev ji şopa kesekî tê berdan
+        setting_use_blurhash: Ji bo medyaya veşartî de gradyanên rengîn nîşan bike
+        setting_use_pending_items: Awayê hêdî
+        severity: Asta girîngiyê
+        sign_in_token_attempt: Koda ewlehiyê
+        title: Sernav
+        type: Cureya têxistinê
+        username: Navê bikarhêneriyê
+        username_or_email: Navê bikarhêner an jî e-name
+        whole_word: Hemû peyv
       email_domain_block:
-        with_dns_records: لەخۆگرتنی تۆمارەکانی MX و ئای پییەکانی دۆمەین
+        with_dns_records: Tomarên MX û IP yên hundirê navper lê zêde bike
       featured_tag:
-        name: هەشتاگ
+        name: Hashtag
+      filters:
+        actions:
+          hide: Bi tevahî veşêre
+          warn: Bi hişyariyekê veşêre
+      form_admin_settings:
+        backups_retention_period: Serdema tomarkirina arşîva bikarhêner
+        bootstrap_timeline_accounts: Van ajimêran ji bikarhênerên nû re pêşniyar bike
+        closed_registrations_message: Peyama kesane dema ku tomarkirin peyda nebin
+        content_cache_retention_period: Serdema tomarkirina bîrdanka naverokê
+        custom_css: CSS a kesanekirî
+        mascot: Mascot a kesanekirî (legacy)
+        media_cache_retention_period: Serdema tomarkirina bîrdanka medyayê
+        profile_directory: Rêgeha profilê çalak bike
+        registrations_mode: Kî dikare tomar bibe
+        require_invite_text: Ji bo tevlêbûnê sedemek pêdivî ye
+        show_domain_blocks: Astengkirinên navperê nîşan bide
+        show_domain_blocks_rationale: Nîşan bide ka çima navper hatine astengkirin
+        site_contact_email: Bi me re biaxive bi riya e-name
+        site_contact_username: Bi bikarhêner re têkeve têkiliyê
+        site_extended_description: Danasîna berferhkirî
+        site_short_description: Danasîna rajekar
+        site_terms: Politîka taybetiyê
+        site_title: Navê rajekar
+        theme: Rûkara berdest
+        thumbnail: Wêneya piçûk a rajekar
+        timeline_preview: Mafê bide gihîştina ne naskirî bo demnameya gelemperî
+        trendable_by_default: Mafê bide rojevê bêyî ku were nirxandin
+        trends: Rojevê çalak bike
       interactions:
-        must_be_follower: قەپاتکردنی ئاگانامەکان بێجگە لە شوێنکەوتووان
-        must_be_following: بەئاگانامەکان بلۆک بکە لە خەڵکێک کە پەیڕەویان ناکەیت
-        must_be_following_dm: پەیامەکانی ڕاستەوخۆ بلۆک بکە لەو کەسانەی کە، پەیڕەوی ناکەن
+        must_be_follower: Danezanên ji kesên ku ne şopînerên min tên asteng bike
+        must_be_following: Agahdariyan asteng bike ji kesên ku tu wan naşopînî
+        must_be_following_dm: Peyamên rasterast asteng bike ji kesên ku tu wan naşopînî
       invite:
-        comment: بۆچوون
+        comment: Şîrove
       invite_request:
-        text: بۆچی دەتەوێت بەشدار بیت?
+        text: Tu çima dixwazî beşdar bibî?
       ip_block:
-        comment: بۆچوون
+        comment: Şîrove
+        ip: IP
         severities:
-          no_access: بلۆککردنی ده‌ستپێگه‌یشتن
-          sign_up_requires_approval: سنووردارکردنی چوونەناو
-        severity: یاسا
+          no_access: Gihîştinê asteng bike
+          sign_up_block: Tomarkirinan asteng bike
+          sign_up_requires_approval: Tomaran sînordar bike
+        severity: Rêbaz
       notification_emails:
-        digest: کورتکردنی ئاگادارییکەن لەیەک ئیمەیل
-        favourite: کەسێک دۆخی تۆی بەدڵ بوو
-        follow: کەسێک دوای تۆ کەوت
-        follow_request: کەسێک داوای کردووە کە بەدوات بکەوێت
-        mention: کەسێک باسی کردووی
-        pending_account: هەژمارەی نوێ پێویستی بە پێداچوونەوەهەیە
-        reblog: کاتێک کەسێک نووسراوەی ئێوە دووبارە توت دەکاتەوە
-        report: گوزارشتی نوێ پێشکەش کراوە
-        trending_tag: کاتێک هاشتاگێکی پێدانەچوو هۆگری فرە بوو، ئیمەیلێک بنێرە
+        appeal: Kesek îtîrazê biryara çavdêr dike
+        digest: Kurte e-name bişîne
+        favourite: Kesekî şandiya te hez kir
+        follow: Kesekî te şopand
+        follow_request: Kesekî daxwaz kir bo şopandina te
+        mention: Kesekî qale te kir
+        pending_account: Pewîste ku ajimêra nû bihê lêkolînkirin
+        reblog: Kesekî şandiya te bilind kir
+        report: Ragihandina nû hate şandin
+        trending_tag: Rojeva nû pêdivî nirxandinê ye
+      rule:
+        text: Rêbaz
       tag:
-        listable: ڕیگەبدە ئەم هاشتاگە لە پێرستی هەڵبژاردەی بەکارهێنەران و پەڕەی گەڕان نیشان بدرێت
-        name: هەشتاگ
-        trendable: ڕێگەبدە ئەم هەشتاگە لە نووسراوەی بەرچاوکراو نیسان بدرێت
-        usable: ڕێگەبدە بە توتەکان بۆ بەکارهێنانی ئەم هەشتاگە
-    'no': نە
-    recommended: پێشنیارکراوە
+        listable: Bihêle ku ev hashtag werê xuyakirin di lêgerîn û pêşniyaran de
+        name: Hashtag
+        trendable: Bihêle ku ev hashtag werê xuyakirin di bin rojevê de
+        usable: Bihêle ku şandî ev hashtag bi kar bînin
+      user:
+        role: Rol
+      user_role:
+        color: Rengê nîşanê
+        highlighted: Li ser profîlên bikarhêner rola wekî nîşan bide nîşankirin
+        name: Nav
+        permissions_as_keys: Maf
+        position: Pêşikî
+      webhook:
+        events: Bûyerên çalakkirî
+        url: Girêdana xala dawîbûnê
+    'no': Na
+    not_recommended: Nayê pêşniyarkirin
+    recommended: Pêşniyarkirî
     required:
-      text: پێویستە
+      mark: "*"
+      text: pêdivî ye
     title:
       sessions:
-        webauthn: یەکێک لە کلیلەکانی پاراستن بەکاربهێنە بۆ چوونە ژوورەوە
-    'yes': بەڵێ
+        webauthn: Yek ji kilîtên ewlehiyê yên xwe bi kar bîne bo têketinê
+    'yes': Erê
diff --git a/config/locales/simple_form.la.yml b/config/locales/simple_form.la.yml
new file mode 100644
index 000000000..3a7ba0d44
--- /dev/null
+++ b/config/locales/simple_form.la.yml
@@ -0,0 +1 @@
+la:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 36695fa3c..dd0dda314 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -27,6 +27,8 @@ lv:
         scheduled_at: Lai nekavējoties publicētu paziņojumu, atstāj tukšu
         starts_at: Neobligāts. Ja tavs paziņojums ir saistīts ar noteiktu laika diapazonu
         text: Varari izmantot ziņu sintaksi. Lūdzu, apdomā lauku, ko paziņojums aizņems lietotāja ekrānā
+      appeal:
+        text: Brīdinājumu var pārsūdzēt tikai vienu reizi
       defaults:
         autofollow: Cilvēki, kuri reģistrējas, izmantojot uzaicinājumu, automātiski sekos tev
         avatar: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions} px
@@ -35,8 +37,7 @@ lv:
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
         digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
-        discoverable: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem, profila direktoriju un citām iespējām
-        discoverable_no_directory: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem un citām iespējām
+        discoverable: Ļauj svešiniekiem atklāt savu kontu caur ieteikumiem, tendencēm un citām iespējām
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
         fields: Savā profilā kā tabulu vari parādīt līdz 4 vienumiem
         header: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
@@ -47,12 +48,13 @@ lv:
         password: Izmanto vismaz 8 rakstzīmes
         phrase: Tiks saskaņots neatkarīgi no ziņas teksta reģistra vai satura brīdinājuma
         scopes: Kuriem API lietojumprogrammai būs atļauta piekļuve. Ja izvēlies augstākā līmeņa tvērumu, tev nav jāatlasa atsevišķi vienumi.
-        setting_aggregate_reblogs: Nerādīt jaunus palielinājumus ziņām, kas nesen tika palielinātas (ietekmē tikai nesen saņemtos palielinājumus)
+        setting_aggregate_reblogs: Nerādīt jaunus pastiprinājumus ierakstiem, kas nesen tikuši pastiprināti (ietekmēs tikai turpmāk saņemtos pastiprinājumus)
+        setting_always_send_emails: Parasti e-pasta paziņojumi netiek sūtīti, kad aktīvi izmantojat Mastodon
         setting_default_sensitive: Sensitīvi mediji pēc noklusējuma ir paslēpti, un tos var atklāt, noklikšķinot
         setting_display_media_default: Paslēpt mediju, kas atzīmēts kā sensitīvs
         setting_display_media_hide_all: Vienmēr slēpt medijus
         setting_display_media_show_all: Vienmēr rādīt medijus
-        setting_hide_network: Kam tu seko un kurš seko tev, tavā profilā tiks paslēps
+        setting_hide_network: Tavā profilā netiks rādīts, kam tu seko un kurš seko tev
         setting_noindex: Ietekmē tavu publisko profilu un ziņu lapas
         setting_show_application: Lietojumprogramma, ko tu izmanto publicēšanai, tiks parādīta tavu ziņu detalizētajā skatā
         setting_use_blurhash: Gradientu pamatā ir paslēpto vizuālo attēlu krāsas, bet neskaidras visas detaļas
@@ -62,10 +64,36 @@ lv:
       domain_allow:
         domain: Šis domēns varēs izgūt datus no šī servera, un no tā ienākošie dati tiks apstrādāti un saglabāti
       email_domain_block:
-        domain: Tas var būt domēna nosaukums, kas redzams e-pasta adresē, MX ieraksts, kuru domēns atrisina, vai servera IP, uz kuru tiek atrisināts MX ieraksts. Tie tiks pārbaudīti, reģistrējoties lietotājam, un reģistrācija tiks noraidīta.
+        domain: Tas var būt domēna nosaukums, kas tiek parādīts e-pasta adresē vai izmantotajā MX ierakstā. Tie tiks pārbaudīti reģistrācijas laikā.
         with_dns_records: Tiks mēģināts atrisināt dotā domēna DNS ierakstus, un rezultāti arī tiks bloķēti
       featured_tag:
-        name: 'Iespējams, vēlēsies izmantot kādu no šīm:'
+        name: 'Šeit ir daži no pēdējiem lietotajiem tēmturiem:'
+      filters:
+        action: Izvēlies, kuru darbību veikt, ja ziņa atbilst filtram
+        actions:
+          hide: Paslēp filtrēto saturu pilnībā, izturoties tā, it kā tas neeksistētu
+          warn: Paslēp filtrēto saturu aiz brīdinājuma, kurā minēts filtra nosaukums
+      form_admin_settings:
+        backups_retention_period: Saglabā ģenerētos lietotāju arhīvus norādīto dienu skaitā.
+        bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
+        closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
+        content_cache_retention_period: Ziņas no citiem serveriem tiks dzēstas pēc norādītā dienu skaita, ja ir iestatīta pozitīva vērtība. Tas var būt neatgriezeniski.
+        custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
+        mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
+        media_cache_retention_period: Lejupielādētie multivides faili tiks dzēsti pēc norādītā dienu skaita, kad tie būs iestatīti uz pozitīvu vērtību, un pēc pieprasījuma tiks lejupielādēti atkārtoti.
+        profile_directory: Profilu direktorijā ir uzskaitīti visi lietotāji, kuri ir izvēlējušies būt atklājami.
+        require_invite_text: 'Ja pierakstīšanai nepieciešama manuāla apstiprināšana, izdari tā, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis opcionāla'
+        site_contact_email: Kā cilvēki var sazināties ar tevi par juridiskiem vai atbalsta jautājumiem.
+        site_contact_username: Tagad cilvēki var tevi sasniegt Mastodon.
+        site_extended_description: Jebkura papildu informācija, kas var būt noderīga apmeklētājiem un lietotājiem. Var strukturēt ar Markdown sintaksi.
+        site_short_description: Īss apraksts, kas palīdzēs unikāli identificēt tavu serveri. Kurš to darbina, kam tas paredzēts?
+        site_terms: Izmanto pats savu konfidencialitātes politiku vai atstāj tukšu, lai izmantotu noklusējuma iestatījumu. Var strukturēt ar Markdown sintaksi.
+        site_title: Kā cilvēki var atsaukties uz tavu serveri, izņemot tā domēna nosaukumu.
+        theme: Tēma, kuru redz apmeklētāji, kuri ir atteikušies, un jaunie lietotāji.
+        thumbnail: Aptuveni 2:1 attēls, kas tiek parādīts kopā ar tava servera informāciju.
+        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākās serverī pieejamās publiskās ziņas.
+        trendable_by_default: Izlaist aktuālā satura manuālu pārskatīšanu. Atsevišķas preces joprojām var noņemt no tendencēm pēc fakta.
+        trends: Tendences parāda, kuras ziņas, atsauces un ziņu stāsti gūst panākumus tavā serverī.
       form_challenge:
         current_password: Tu ieej drošā zonā
       imports:
@@ -78,6 +106,7 @@ lv:
         ip: Ievadi IPv4 vai IPv6 adresi. Izmantojot CIDR sintaksi, tu vari bloķēt visus diapazonus. Esi piesardzīgs un neizslēdz pats sevi!
         severities:
           no_access: Bloķēt piekļuvi visiem resursiem
+          sign_up_block: Jaunas pieteikšanās nebūs iespējamas
           sign_up_requires_approval: Jaunām reģistrācijām būs nepieciešams tavs apstiprinājums
         severity: Izvēlies, kas notiks ar pieprasījumiem no šīs IP adreses
       rule:
@@ -89,6 +118,16 @@ lv:
         name: Tu vari mainīt tikai burtu lielumu, piemēram, lai tie būtu vieglāk lasāmi
       user:
         chosen_languages: Ja ieķeksēts, publiskos laika grafikos tiks parādītas tikai ziņas noteiktajās valodās
+        role: Loma kontrolē, kādas atļaujas ir lietotājam
+      user_role:
+        color: Krāsa, kas jāizmanto lomai visā lietotāja saskarnē, kā RGB hex formātā
+        highlighted: Tas padara lomu publiski redzamu
+        name: Lomas publiskais nosaukums, ja loma ir iestatīta rādīšanai kā emblēma
+        permissions_as_keys: Lietotājiem ar šo lomu būs piekļuve...
+        position: What is "alower"?
+      webhook:
+        events: Atlasi nosūtāmos notikums
+        url: Kur notikumi tiks nosūtīti
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ lv:
         scheduled_at: Ieplānot publikāciju
         starts_at: Pasākuma sākums
         text: Paziņojums
+      appeal:
+        text: Paskaidrojiet, kāpēc šis lēmums ir jāatceļ
       defaults:
         autofollow: Uzaicini sekot tavam kontam
         avatar: Avatars
@@ -138,7 +179,7 @@ lv:
         honeypot: "%{label} (neaizpildi)"
         inbox_url: URL vai releja pastkaste
         irreversible: Nomest, nevis paslēpt
-        locale: Interfeisa valoda
+        locale: Saskarnes valoda
         locked: Pieprasīt sekotāju pieprasījumus
         max_uses: Maksimālais lietojumu skaits
         new_password: Jauna parole
@@ -146,33 +187,35 @@ lv:
         otp_attempt: Divfaktoru kods
         password: Parole
         phrase: Atslēgvārds vai frāze
-        setting_advanced_layout: Iespējot paplašināto web interfeisu
-        setting_aggregate_reblogs: Grupēt paaugstinājumus ziņu lentās
+        setting_advanced_layout: Iespējot paplašināto tīmekļa saskarni
+        setting_aggregate_reblogs: Grupēt pastiprinājumus ierakstu lentās
+        setting_always_send_emails: Vienmēr sūtīt e-pasta paziņojumus
         setting_auto_play_gif: Automātiski atskaņot animētos GIF
-        setting_boost_modal: Parādīt apstiprinājuma dialogu pirms paaugstināšanas
+        setting_boost_modal: Rādīt apstiprinājuma dialogu pirms pastiprināšanas
         setting_crop_images: Apgrieziet attēlus neizvērstajās ziņās līdz 16x9
         setting_default_language: Publicēšanas valoda
         setting_default_privacy: Publicēšanas privātums
         setting_default_sensitive: Atļaut atzīmēt medijus kā sensitīvus
         setting_delete_modal: Parādīt apstiprinājuma dialogu pirms ziņas dzēšanas
         setting_disable_swiping: Atspējot vilkšanas kustības
-        setting_display_media: Mediju bibliotēka
+        setting_display_media: Mediju rādīšana
         setting_display_media_default: Noklusējums
         setting_display_media_hide_all: Paslēpt visu
         setting_display_media_show_all: Parādīt visu
         setting_expand_spoilers: Vienmēr izvērst ziņas, kas apzīmētas ar brīdinājumiem par saturu
-        setting_hide_network: Slēpt savu sociālo diagrammu
+        setting_hide_network: Slēpt savu sociālo grafu
         setting_noindex: Atteikties no meklētājprogrammu indeksēšanas
         setting_reduce_motion: Ierobežot kustību animācijās
         setting_show_application: Atklāt lietojumprogrammu, ko izmanto ziņu nosūtīšanai
         setting_system_font_ui: Lietot sistēmas noklusējuma fontu
         setting_theme: Vietnes motīvs
         setting_trends: Parādīt šodienas tendences
-        setting_unfollow_modal: Parādīt apstiprinājuma dialogu pirms atsekoties no kāda
+        setting_unfollow_modal: Parādīt apstiprinājuma dialogu pirms pārtraukt kādam sekot
         setting_use_blurhash: Rādīt krāsainos gradientus slēptajiem medijiem
         setting_use_pending_items: Lēnais režīms
         severity: Smagums
         sign_in_token_attempt: Drošības kods
+        title: Virsraksts
         type: Importa veids
         username: Lietotājvārds
         username_or_email: Lietotājvārds vai e-pasts
@@ -181,6 +224,34 @@ lv:
         with_dns_records: Ietvert domēna MX ierakstus un IP adreses
       featured_tag:
         name: Tēmturis
+      filters:
+        actions:
+          hide: Paslēpt pilnībā
+          warn: Paslēpt ar brīdinājumu
+      form_admin_settings:
+        backups_retention_period: Lietotāja arhīva glabāšanas periods
+        bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem
+        closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama
+        content_cache_retention_period: Satura arhīva glabāšanas periods
+        custom_css: Pielāgots CSS
+        mascot: Pielāgots talismans (mantots)
+        media_cache_retention_period: Multivides kešatmiņas saglabāšanas periods
+        profile_directory: Iespējot profila direktoriju
+        registrations_mode: Kurš drīkst pieteikties
+        require_invite_text: Pieprasīt pievienošanās iemeslu
+        show_domain_blocks: Rādīt domēnu bloķēšanas
+        show_domain_blocks_rationale: Rādīt, kāpēc domēni tika bloķēti
+        site_contact_email: E-pasts saziņai
+        site_contact_username: Lietotājvārds saziņai
+        site_extended_description: Paplašināts apraksts
+        site_short_description: Servera apraksts
+        site_terms: Privātuma Politika
+        site_title: Servera nosaukums
+        theme: Noklusētā tēma
+        thumbnail: Servera sīkbilde
+        timeline_preview: Atļaut neautentificētu piekļuvi publiskajām ziņu lentām
+        trendable_by_default: Atļaut tendences bez iepriekšējas pārskatīšanas
+        trends: Iespējot tendences
       interactions:
         must_be_follower: Bloķēt paziņojumus no ne-sekotājiem
         must_be_following: Bloķēt paziņojumus no cilvēkiem, kuriem tu neseko
@@ -194,18 +265,20 @@ lv:
         ip: IP
         severities:
           no_access: Bloķēt piekļuvi
+          sign_up_block: Bloķēt pieteikšanās
           sign_up_requires_approval: Ierobežot reģistrēšanos
         severity: Noteikumi
       notification_emails:
+        appeal: Kāds pārsūdz moderatora lēmumu
         digest: Sūtīt kopsavilkumu e-pastus
         favourite: Kāds izcēla tavu ziņu
         follow: Kāds uzsāka tev sekot
         follow_request: Kāds vēlas tev sekot
         mention: Kāds pieminēja tevi
         pending_account: Jāpārskata jaunu kontu
-        reblog: Kāds paaugstināja tavu ziņu
+        reblog: Kāds pastiprināja tavu ierakstu
         report: Tika iesniegts jauns ziņojums
-        trending_tag: Kļūst populārs nepārskatīts tēmturis
+        trending_tag: Jaunā tendence ir jāpārskata
       rule:
         text: Noteikumi
       tag:
@@ -213,7 +286,19 @@ lv:
         name: Tēmturis
         trendable: Atļaut šim tēmturim parādīties zem tendencēm
         usable: Atļaut lietot ziņās šo tēmturi
+      user:
+        role: Loma
+      user_role:
+        color: Emblēmas krāsa
+        highlighted: Atainot lomu kā emblēmu lietotāju profilos
+        name: Nosaukums
+        permissions_as_keys: Atļaujas
+        position: Prioritāte
+      webhook:
+        events: Iespējotie notikumi
+        url: Galapunkta URL
     'no': Nē
+    not_recommended: Nav ieteicams
     recommended: Ieteicams
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index 2925688a0..fb892181d 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -1 +1,177 @@
+---
 ms:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Tentukan namapengguna@domain akaun yang ingin anda alihkan daripada
+      account_migration:
+        acct: Tentukan namapengguna@domain akaun yang ingin anda alihkan ke
+      account_warning_preset:
+        text: Anda boleh menggunakan sintaks hantaran seperti URL, tanda pagar dan sebutan
+        title: Pilihan. Penerima tidak dapat melihatnya
+      admin_account_action:
+        include_statuses: Pengguna akan melihat kiriman mana yang menyebabkan tindakan atau amaran penyederhanaan
+        send_email_notification: Pengguna akan menerima penjelasan tentang apa yang berlaku dengan akaun mereka
+        text_html: Pilihan. Anda boleh menggunakan sintaks hantaran. Anda juga boleh <a href="%{path}">menambahkan praset amaran</a> untuk menjimatkan masa
+        type_html: Pilih apa yang ingin dilakukan dengan <strong>%{acct}</strong>
+        types:
+          disable: Halang pengguna daripada menggunakan akaun mereka, tetapi jangan hapus atau sorokkan kandungan mereka.
+          none: Gunakan ini untuk menghantar amaran kepada pengguna, tanpa mencetuskan sebarang tindakan lain.
+          sensitive: Memaksa semua lampiran media pengguna ini ditandakan sebagai sensitif.
+          silence: Halang pengguna daripada membuat hantaran secara awam, menyorokkan hantaran dan pemberitahuan mereka daripada orang yang tidak mengikuti mereka.
+          suspend: Halang sebarang interaksi daripada atau kepada akaun ini dan menghapuskan kandungannya. Boleh dikembalikan dalam 30 hari.
+        warning_preset_id: Pilihan. Anda masih boleh menambah teks tersuai pada akhir praset
+      announcement:
+        all_day: Apabila diperiksa, hanya tarikh dalam julat masa yang akan dipaparkan
+        ends_at: Pilihan. Pengumuman akan dinyahterbitkan secara automatik pada masa ini
+        scheduled_at: Biarkan kosong untuk menerbitkan pengumuman dengan segera
+        starts_at: Pilihan. Sekiranya pengumuman anda terikat pada julat masa tertentu
+        text: Anda boleh menggunakan sintaks hantaran. Sila ambil perhatian tentang ruang yang akan digunakan oleh pengumuman pada skrin pengguna
+      appeal:
+        text: Anda boleh membuat rayuan terhadap pelanggaran sekali sahaja
+      defaults:
+        autofollow: Orang yang mendaftar melalui undangan akan mengikuti anda secara automatik
+        avatar: PNG, GIF atau JPG. Kebanyakannya %{size}. Saiz akan dikecilkan kepada %{dimensions}px
+        email: Anda akan dihantar e-mel pengesahan
+        locale: Bahasa untuk antara muka pengguna, e-mel dan pemberitahuan segera
+        password: Gunakan sekurang-kurangnya 8 aksara
+        setting_always_send_emails: Biasanya pemberitahuan e-mel tidak akan dihantar apabila anda selalu menggunakan Mastodon
+        setting_display_media_default: Sembunyikan media yang ditanda sebagai sensitif
+        setting_display_media_hide_all: Sentiasa sembunyikan media
+        setting_display_media_show_all: Sentiasa paparkan media
+        setting_hide_network: Sesiapa yang anda ikuti dan sesiapa yang mengikuti anda akan disembunyi daripada profil anda
+        setting_noindex: Menjejaskan profil awam dan laman hantaran anda
+      form_admin_settings:
+        closed_registrations_message: Dipaparkan semasa pendaftaran ditutup
+        site_contact_username: Bagaimana orang boleh menghubungi anda pada Mastodon.
+        site_extended_description: Apa-apa maklumat tambahan yang mungkin berguna untuk pelawat dan pengguna anda. Boleh distruktur dengan sintaks Markdown.
+        site_terms: Gunakan dasar polisi anda atau biarkan kosong untuk menggunakan lalai. Boleh distruktur dengan sintaks Markdown.
+      form_challenge:
+        current_password: Anda sedang memasuki kawasan selamat
+      imports:
+        data: Fail CSV dieksport daripada pelayan Mastodon yang lain
+      invite_request:
+        text: Ini akan membantu kami menyemak permohonan anda
+      ip_block:
+        severities:
+          no_access: Menyekat akses kepada semua sumber
+          sign_up_block: Pendaftaran baru tidak akan dibenarkan
+          sign_up_requires_approval: Pendaftaran baru akan memerlukan kelulusan anda
+      user_role:
+        color: Warna yang akan digunakan untuk peranan ini dalam seluruh UI, sebagai RGB dalam format hex
+        highlighted: Ini menjadikan peranan ini dipaparkan secara umum
+        permissions_as_keys: Pengguna dengan peranan ini akan mempunyai akses kepada...
+    labels:
+      account:
+        fields:
+          value: Kandungan
+      account_warning_preset:
+        title: Tajuk
+      admin_account_action:
+        text: Amaran tersuai
+        type: Tindakan
+        types:
+          none: Hantar amaran
+          sensitive: Sensitif
+          silence: Hadkan
+          suspend: Gantung
+        warning_preset_id: Gunakan amaran yang ditetapkan
+      announcement:
+        text: Pengumuman
+      appeal:
+        text: Jelaskan mengapa keputusan ini patut diterbalikkan
+      defaults:
+        bot: Ini ialah akaun bot
+        chosen_languages: Tapis bahasa
+        confirm_new_password: Sahkan kata laluan baru
+        confirm_password: Sahkan kata laluan
+        context: Konteks penapis
+        current_password: Kata laluan semasa
+        data: Data
+        discoverable: Mencadangkan akaun kepada pengguna lain
+        display_name: Nama paparan
+        email: Alamat e-mel
+        expires_in: Tamat tempoh selepas
+        fields: Metadata profil
+        locale: Bahasa antara muka
+        new_password: Kata laluan baru
+        otp_attempt: Kod dua faktor
+        password: Kata laluan
+        phrase: Kata kunci atau frasa
+        setting_advanced_layout: Dayakan antara muka web lanjutan
+        setting_default_language: Bahasa hantaran
+        setting_default_privacy: Privasi hantaran
+        setting_default_sensitive: Selalu tandakan media sebagai sensitif
+        setting_display_media: Paparan media
+        setting_display_media_default: Lalai
+        setting_display_media_hide_all: Sembunyikan semua
+        setting_display_media_show_all: Paparkan semua
+        setting_system_font_ui: Gunakan fon lalai sistem
+        setting_theme: Tema halaman
+        setting_trends: Paparkan trend hari ini
+        sign_in_token_attempt: Kod keselamatan
+        title: Tajuk
+        type: Jenis import
+        username: Nama pengguna
+        username_or_email: Nama Pengguna atau E-mel
+        whole_word: Seluruh perkataan
+      featured_tag:
+        name: Tanda pagar
+      filters:
+        actions:
+          hide: Sembunyikan sepenuhnya
+          warn: Sembunyikan dengan amaran
+      form_admin_settings:
+        custom_css: CSS tersuai
+        profile_directory: Dayakan direktori profil
+        registrations_mode: Siapa boleh mendaftar
+        require_invite_text: Memerlukan sebab penyertaan
+        show_domain_blocks: Tunjukan sekatan domain
+        show_domain_blocks_rationale: Tunjukan sebab domain disekat
+        site_contact_email: E-mel hubungan
+        site_contact_username: Nama pengguna hubungan
+        site_extended_description: Penerangan lanjut
+        site_short_description: Penerangan pelayan
+        site_terms: Dasar Privasi
+        site_title: Nama pelayan
+        theme: Tema asal
+        trends: Dayakan trend
+      invite:
+        comment: Komen
+      invite_request:
+        text: Mengapa anda hendak menyertai?
+      ip_block:
+        comment: Komen
+        ip: IP
+        severities:
+          no_access: Sekat akses
+          sign_up_block: Sekat pendaftaran
+          sign_up_requires_approval: Hadkan pendaftaran
+        severity: Peraturan
+      notification_emails:
+        favourite: Seorang menggemarkan hantaran anda
+        follow: Seorang mengikuti anda
+        follow_request: Seorang meminta untuk mengikuti anda
+        mention: Seorang menyebut anda
+        pending_account: Akaun baru memerlukan semakan
+        reblog: Seorang menggalakan hantaran anda
+        report: Laporan baru telah dihantar
+        trending_tag: Trend baru memerlukan semakan
+      rule:
+        text: Peraturan
+      tag:
+        name: Tanda pagar
+        usable: Benarkan siaran untuk menggunakan tanda pagar ini
+      user:
+        role: Peranan
+      user_role:
+        color: Warna lencana
+        name: Nama
+        permissions_as_keys: Kebenaran
+        position: Keutamaan
+    'no': Tidak
+    not_recommended: Tidak disyorkan
+    recommended: Disyorkan
+    required:
+      text: diperlukan
+    'yes': Ya
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
new file mode 100644
index 000000000..5e1fc6bee
--- /dev/null
+++ b/config/locales/simple_form.my.yml
@@ -0,0 +1 @@
+my:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 4fdcb70f0..f564fd1db 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -3,30 +3,32 @@ nl:
   simple_form:
     hints:
       account_alias:
-        acct: Vul de gebruikersnaam@domein van het account in, die je wilt verhuizen
+        acct: Vermeld de gebruikersnaam@domein van het account vanwaar je wilt verhuizen
       account_migration:
-        acct: Vul de gebruikersnaam@domein van het account in, waarnaartoe je wilt verhuizen
+        acct: Vermeld de gebruikersnaam@domein van het account waar je naartoe wilt verhuizen
       account_warning_preset:
-        text: Je kunt voor toots specifieke tekst gebruiken, zoals URL's, hashtags en vermeldingen
+        text: Je kunt specifieke tekst voor berichten gebruiken, zoals URL's, hashtags en vermeldingen
         title: Optioneel. Niet zichtbaar voor de ontvanger
       admin_account_action:
-        include_statuses: De gebruiker ziet welke toots verantwoordelijk zijn voor de moderatieactie of waarschuwing
-        send_email_notification: De gebruiker ontvangt een uitleg over wat er met hun account is gebeurd
-        text_html: Optioneel. Je kunt voor toots specifieke tekst gebruiken. Om tijd te besparen kun je <a href="%{path}">presets voor waarschuwingen toevoegen</a>
+        include_statuses: De gebruiker ziet welke berichten verantwoordelijk zijn voor de moderatiemaatregel of waarschuwing
+        send_email_notification: De gebruiker ontvangt een uitleg over wat er met diens account is gebeurd
+        text_html: Optioneel. Je kunt specifieke tekst voor berichten gebruiken. Om tijd te besparen kun je <a href="%{path}">presets voor waarschuwingen toevoegen</a>
         type_html: Kies wat er met <strong>%{acct}</strong> moet gebeuren
         types:
-          disable: Voorkom dat de gebruiker hun account gebruikt, maar verwijder of verberg de inhoud niet.
-          none: Gebruik dit om een waarschuwing naar de gebruiker te sturen, zonder dat nog een andere actie wordt uitgevoerd.
+          disable: Voorkom dat de gebruiker diens account gebruikt, maar verwijder of verberg de inhoud niet.
+          none: Gebruik dit om een waarschuwing naar de gebruiker te sturen, zonder dat nog een andere maatregel wordt genomen.
           sensitive: Forceer dat alle mediabijlagen van deze gebruiker als gevoelig worden gemarkeerd.
-          silence: Voorkom dat de gebruiker openbare toots kan versturen, verberg hun toots en meldingen voor mensen die hen niet volgen.
-          suspend: Alle interacties van en met dit account blokkeren en de inhoud verwijderen. Dit kan binnen dertig dagen worden teruggedraaid.
+          silence: Voorkom dat de gebruiker openbare berichten kan versturen, verberg diens berichten en meldingen voor mensen die diegene niet volgen.
+          suspend: Alle interacties van en met dit account voorkomen, en de accountgegevens verwijderen. Dit kan binnen 30 dagen worden teruggedraaid.
         warning_preset_id: Optioneel. Je kunt nog steeds handmatig tekst toevoegen aan het eind van de voorinstelling
       announcement:
         all_day: Wanneer dit is aangevinkt worden alleen de datums binnen het tijdvak getoond
         ends_at: Optioneel. De publicatie van de mededeling wordt op dit tijdstip automatisch beëindigd
         scheduled_at: Laat leeg om de mededeling meteen te publiceren
         starts_at: Optioneel. In het geval dat jouw mededeling aan een bepaald tijdvak is gebonden
-        text: Je kunt voor toots specifieke tekst gebruiken. Let op de ruimte die de mededeling op het scherm van de gebruiker inneemt
+        text: Je kunt specifieke tekst voor berichten gebruiken. Let op de ruimte die de mededeling op het scherm van de gebruiker inneemt
+      appeal:
+        text: Je kunt maar eenmalig bezwaar indienen tegen een vastgestelde overtreding
       defaults:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
         avatar: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
@@ -35,25 +37,26 @@ nl:
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
-        discoverable: De gebruikersgids is een andere manier waarmee jouw account een groter publiek kan bereiken
+        discoverable: Toestaan dat jouw account vindbaar is voor onbekenden, via aanbevelingen, trends en op andere manieren
         email: Je krijgt een bevestigingsmail
-        fields: Je kan maximaal 4 items als een tabel op je profiel weergeven
+        fields: Je kunt maximaal 4 items als een tabel op je profiel weergeven
         header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
         inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken
-        irreversible: Gefilterde toots verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
+        irreversible: Gefilterde berichten verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
         locked: Door het goedkeuren van volgers handmatig bepalen wie jou mag volgen
         password: Gebruik tenminste 8 tekens
         phrase: Komt overeen ongeacht hoofd-/kleine letters of een inhoudswaarschuwing
         scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen.
-        setting_aggregate_reblogs: Geen nieuwe boosts tonen voor toots die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts)
+        setting_aggregate_reblogs: Geen nieuwe boosts tonen voor berichten die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts)
+        setting_always_send_emails: Normaliter worden er geen e-mailmeldingen verstuurd wanneer je actief Mastodon gebruikt
         setting_default_sensitive: Gevoelige media wordt standaard verborgen en kan met één klik worden getoond
         setting_display_media_default: Als gevoelig gemarkeerde media verbergen
         setting_display_media_hide_all: Media altijd verbergen
         setting_display_media_show_all: Media altijd tonen
         setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
-        setting_noindex: Heeft invloed op jouw openbare profiel en toots
-        setting_show_application: De toepassing de je gebruikt om te tooten wordt in de gedetailleerde weergave van de toot getoond
+        setting_noindex: Heeft invloed op jouw openbare profiel en pagina's met berichten
+        setting_show_application: De toepassing de je gebruikt om berichten te plaatsen wordt in de gedetailleerde weergave van het bericht getoond
         setting_use_blurhash: Wazige kleurovergangen zijn gebaseerd op de kleuren van de verborgen media, waarmee elk detail verdwijnt
         setting_use_pending_items: De tijdlijn wordt bijgewerkt door op het aantal nieuwe items te klikken, in plaats van dat deze automatisch wordt bijgewerkt
         username: Jouw gebruikersnaam is uniek op %{domain}
@@ -61,10 +64,36 @@ nl:
       domain_allow:
         domain: Dit domein is in staat om gegevens van deze server op te halen, en binnenkomende gegevens worden verwerkt en opgeslagen
       email_domain_block:
-        domain: Dit kan de domeinnaam zijn, onderdeel van het e-mailadres, het MX-record dat het desbetreffende domein afhandelt, of het IP-adres van de server dat het MX-record afhandelt. Deze worden gecontroleerd tijdens het registreren, waarna de registratie wordt afgewezen.
+        domain: Dit kan de domeinnaam zijn die wordt weergegeven in het e-mailadres of in het MX-record dat het gebruikt. Ze worden gecontroleerd tijdens de registratie.
         with_dns_records: Er wordt een poging gewaagd om de desbetreffende DNS-records op te zoeken, waarna de resultaten ook worden geblokkeerd
       featured_tag:
-        name: 'Je wilt misschien een van deze gebruiken:'
+        name: 'Hier zijn enkele van de hashtags die je onlangs hebt gebruikt:'
+      filters:
+        action: Kies welke acties uitgevoerd moeten wanneer een bericht overeenkomt met het filter
+        actions:
+          hide: Verberg de gefilterde inhoud volledig, alsof het niet bestaat
+          warn: Verberg de gefilterde inhoud achter een waarschuwing, met de titel van het filter als waarschuwingstekst
+      form_admin_settings:
+        backups_retention_period: De aangemaakte gebruikersarchieven voor het opgegeven aantal dagen behouden.
+        bootstrap_timeline_accounts: Deze accounts worden bovenaan de aanbevelingen aan nieuwe gebruikers getoond. Meerdere gebruikersnamen met komma's scheiden.
+        closed_registrations_message: Weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
+        content_cache_retention_period: 'Berichten van andere servers worden na het opgegeven aantal dagen verwijderd. Let op: Dit is onomkeerbaar.'
+        custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server.
+        mascot: Overschrijft de illustratie in de geavanceerde webomgeving.
+        media_cache_retention_period: Mediabestanden die van andere servers zijn gedownload worden na het opgegeven aantal dagen verwijderd en worden op verzoek opnieuw gedownload.
+        profile_directory: De gebruikersgids bevat een lijst van alle gebruikers die ervoor gekozen hebben om ontdekt te kunnen worden.
+        require_invite_text: Maak het invullen van "Waarom wil je je hier registreren?" verplicht in plaats van optioneel, wanneer registraties handmatig moeten worden goedgekeurd
+        site_contact_email: Hoe mensen je kunnen bereiken voor juridische vragen of support.
+        site_contact_username: Hoe mensen je op Mastodon kunnen bereiken.
+        site_extended_description: Alle aanvullende informatie die nuttig kan zijn voor bezoekers en jouw gebruikers. Kan worden opgemaakt met Markdown.
+        site_short_description: Een korte beschrijving om het unieke karakter van je server te tonen. Wie beheert de server, wat is de doelgroep?
+        site_terms: Gebruik je eigen privacybeleid of laat leeg om de standaardwaarde te gebruiken. Kan worden opgemaakt met Markdown.
+        site_title: Hoe mensen buiten de domeinnaam naar je server kunnen verwijzen.
+        theme: Thema die (niet ingelogde) bezoekers en nieuwe gebruikers zien.
+        thumbnail: Een afbeelding van ongeveer een verhouding van 2:1 die naast jouw serverinformatie wordt getoond.
+        timeline_preview: Bezoekers (die niet zijn ingelogd) kunnen de meest recente, op de server aanwezige openbare berichten bekijken.
+        trendable_by_default: Handmatige beoordeling van trends overslaan. Individuele items kunnen later alsnog worden afgekeurd.
+        trends: Trends laten zien welke berichten, hashtags en nieuwsberichten op jouw server aan populariteit winnen.
       form_challenge:
         current_password: Je betreedt een veilige omgeving
       imports:
@@ -77,6 +106,7 @@ nl:
         ip: Voer een IPv4- of IPv6-adres in. Je kunt hele reeksen blokkeren met de CIDR-methode. Pas op dat je jezelf niet buitensluit!
         severities:
           no_access: Toegang tot de hele server blokkeren
+          sign_up_block: Nieuwe registraties zijn niet mogelijk
           sign_up_requires_approval: Nieuwe registraties vereisen jouw goedkeuring
         severity: Kies wat er moet gebeuren met aanvragen van dit IP-adres
       rule:
@@ -87,7 +117,17 @@ nl:
       tag:
         name: Je kunt elk woord met een hoofdletter beginnen, om zo bijvoorbeeld de tekst leesbaarder te maken
       user:
-        chosen_languages: Alleen toots in de aangevinkte talen worden op de openbare tijdlijnen getoond
+        chosen_languages: Alleen berichten in de aangevinkte talen worden op de openbare tijdlijnen getoond
+        role: De rol bepaalt welke rechten een gebruiker heeft
+      user_role:
+        color: Kleur die gebruikt wordt voor de rol in de UI, als RGB in hexadecimale formaat
+        highlighted: Dit maakt de rol openbaar zichtbaar
+        name: Openbare naam van de rol, wanneer de rol als badge op profielpagina's wordt getoond
+        permissions_as_keys: Gebruikers met deze rol hebben toegang tot...
+        position: Een hogere rol beslist in bepaalde situaties over het oplossen van conflicten. Bepaalde acties kunnen alleen worden uitgevoerd op rollen met een lagere prioriteit
+      webhook:
+        events: Selecteer de te verzenden gebeurtenissen
+        url: Waar gebeurtenissen naartoe worden verzonden
     labels:
       account:
         fields:
@@ -101,7 +141,7 @@ nl:
         text: Tekst van preset
         title: Titel
       admin_account_action:
-        include_statuses: Gerapporteerde toots aan de e-mail toevoegen
+        include_statuses: Gerapporteerde berichten aan de e-mail toevoegen
         send_email_notification: Meld dit per e-mail aan de gebruiker
         text: Aangepaste waarschuwing
         type: Actie
@@ -118,9 +158,11 @@ nl:
         scheduled_at: Mededeling inplannen
         starts_at: Begint
         text: Mededeling
+      appeal:
+        text: Leg uit waarom deze beslissing volgens jou teruggedraaid moet worden
       defaults:
         autofollow: Uitnodigen om jouw account te volgen
-        avatar: Avatar
+        avatar: Profielfoto
         bot: Dit is een bot-account
         chosen_languages: Talen filteren
         confirm_new_password: Nieuw wachtwoord bevestigen
@@ -147,23 +189,24 @@ nl:
         phrase: Trefwoord of zinsdeel
         setting_advanced_layout: Geavanceerde webomgeving inschakelen
         setting_aggregate_reblogs: Boosts in tijdlijnen groeperen
+        setting_always_send_emails: Altijd e-mailmeldingen verzenden
         setting_auto_play_gif: Speel geanimeerde GIF's automatisch af
-        setting_boost_modal: Vraag voor het boosten van een toot een bevestiging
-        setting_crop_images: Afbeeldingen bijsnijden tot 16x9 in toots op tijdlijnen
-        setting_default_language: Taal van jouw toots
-        setting_default_privacy: Standaardzichtbaarheid van jouw toots
+        setting_boost_modal: Vraag voor het boosten van een bericht een bevestiging
+        setting_crop_images: Afbeeldingen bijsnijden tot 16x9 in berichten op tijdlijnen
+        setting_default_language: Taal van jouw berichten
+        setting_default_privacy: Zichtbaarheid van nieuwe berichten
         setting_default_sensitive: Media altijd als gevoelig markeren
-        setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging
+        setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
         setting_disable_swiping: Swipebewegingen uitschakelen
         setting_display_media: Mediaweergave
         setting_display_media_default: Standaard
         setting_display_media_hide_all: Alles verbergen
         setting_display_media_show_all: Alles tonen
-        setting_expand_spoilers: Altijd toots met inhoudswaarschuwingen uitklappen
+        setting_expand_spoilers: Altijd berichten met inhoudswaarschuwingen uitklappen
         setting_hide_network: Jouw volgers en wie je volgt verbergen
-        setting_noindex: Jouw toots niet door zoekmachines laten indexeren
+        setting_noindex: Jouw berichten niet door zoekmachines laten indexeren
         setting_reduce_motion: Langzamere animaties
-        setting_show_application: Toepassing onthullen die je voor het verzenden van toots gebruikt
+        setting_show_application: Toepassing onthullen die je voor het verzenden van berichten gebruikt
         setting_system_font_ui: Standaardlettertype van jouw systeem gebruiken
         setting_theme: Thema website
         setting_trends: Trends van vandaag tonen
@@ -172,6 +215,7 @@ nl:
         setting_use_pending_items: Langzame modus
         severity: Zwaarte
         sign_in_token_attempt: Beveiligingscode
+        title: Titel
         type: Importtype
         username: Gebruikersnaam
         username_or_email: Gebruikersnaam of e-mailadres
@@ -180,6 +224,34 @@ nl:
         with_dns_records: MX-records en IP-adressen van het domein toevoegen
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Volledig verbergen
+          warn: Met een waarschuwing verbergen
+      form_admin_settings:
+        backups_retention_period: Bewaartermijn gebruikersarchief
+        bootstrap_timeline_accounts: Accounts die altijd aan nieuwe gebruikers worden aanbevolen
+        closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld
+        content_cache_retention_period: Bewaartermijn berichtencache
+        custom_css: Aangepaste CSS
+        mascot: Aangepaste mascotte (legacy)
+        media_cache_retention_period: Bewaartermijn mediacache
+        profile_directory: Gebruikersgids inschakelen
+        registrations_mode: Wie kan zich registreren
+        require_invite_text: Opgeven van een reden is verplicht
+        show_domain_blocks: Domeinblokkades tonen
+        show_domain_blocks_rationale: Redenen voor domeinblokkades tonen
+        site_contact_email: E-mailadres contactpersoon
+        site_contact_username: Gebruikersnaam contactpersoon
+        site_extended_description: Uitgebreide omschrijving
+        site_short_description: Serveromschrijving
+        site_terms: Privacybeleid
+        site_title: Servernaam
+        theme: Standaardthema
+        thumbnail: Serverthumbnail
+        timeline_preview: Toegang tot de openbare tijdlijnen zonder in te loggen toestaan
+        trendable_by_default: Trends goedkeuren zonder voorafgaande beoordeling
+        trends: Trends inschakelen
       interactions:
         must_be_follower: Meldingen van mensen die jou niet volgen blokkeren
         must_be_following: Meldingen van mensen die jij niet volgt blokkeren
@@ -193,26 +265,40 @@ nl:
         ip: IP
         severities:
           no_access: Toegang blokkeren
+          sign_up_block: Registraties blokkeren
           sign_up_requires_approval: Registraties beperken
         severity: Regel
       notification_emails:
+        appeal: Iemand heeft bezwaar ingediend tegen een beslissing van een moderator
         digest: Periodiek e-mails met een samenvatting versturen
-        favourite: Wanneer iemand jouw toot aan hun favorieten heeft toegevoegd
+        favourite: Wanneer iemand jouw bericht als favoriet markeert
         follow: Wanneer iemand jou is gaan volgen
         follow_request: Wanneer iemand jou wil volgen
         mention: Wanneer iemand jou heeft vermeld
         pending_account: Wanneer een nieuw account moet worden beoordeeld
-        reblog: Wanneer iemand jouw toot heeft geboost
-        report: Bij het indienen van een nieuwe rapportage
-        trending_tag: Wanneer een nog niet beoordeelde hashtag trending is
+        reblog: Wanneer iemand jouw bericht heeft geboost
+        report: Nieuwe rapportage is ingediend
+        trending_tag: Nieuwe trend vereist beoordeling
       rule:
         text: Regel
       tag:
         listable: Toestaan dat deze hashtag in zoekopdrachten en aanbevelingen te zien valt
         name: Hashtag
-        trendable: Toestaan dat deze hashtag onder trends te zien valt
-        usable: Toestaan dat deze hashtag in toots gebruikt mag worden
+        trendable: Goedkeuren dat deze hashtag onder trends te zien valt
+        usable: Toestaan dat deze hashtag in berichten gebruikt mag worden
+      user:
+        role: Rol
+      user_role:
+        color: Kleur van badge
+        highlighted: Rol als badge op profielpagina's tonen
+        name: Naam
+        permissions_as_keys: Rechten
+        position: Prioriteit
+      webhook:
+        events: Ingeschakelde gebeurtenissen
+        url: Eindpunt URL
     'no': Nee
+    not_recommended: Niet aanbevolen
     recommended: Aanbevolen
     required:
       mark: "*"
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 97ce17415..50dacf53a 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -3,23 +3,23 @@ nn:
   simple_form:
     hints:
       account_alias:
-        acct: Spesifiser brukarnamn@domenet til brukaren du vil flytja frå
+        acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta frå
       account_migration:
-        acct: Spesifiser brukarnamn@domenet til brukaren du vil flytja til
+        acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta til
       account_warning_preset:
         text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og nemningar
         title: Valfritt. Ikkje synleg for mottakar
       admin_account_action:
-        include_statuses: Brukaren får sjå kva tut som gjorde moderatorhandllinga eller -åtvaringa
+        include_statuses: Brukaren får sjå kva tut som førte til moderatorhandlinga eller -åtvaringa
         send_email_notification: Brukaren får ei forklåring av kva som har hendt med kontoen sin
         text_html: Valfritt. Du kan bruka tut-syntaks. Du kan <a href="%{path}">leggja til åtvaringsførehandsinnstillingar</a> for å spara tid
         type_html: Vel det du vil gjera med <strong>%{acct}</strong>
         types:
-          disable: Forhindre brukeren å bruke kontoen sin, men ikke slett eller skjule innholdet deres.
-          none: Bruk dette for å sende en advarsel til brukeren uten å utløse noen andre handlinger.
-          sensitive: Tving alle denne brukerens medievedlegg til å bli markert som følsom.
-          silence: Hindre brukeren i å kunne skrive offentlig synlighet, skjule sine innlegg og varsler for personer som ikke kan følge dem.
-          suspend: Forhindre interaksjon fra eller til denne kontoen og slett innholdet der. Reversibel innen 30 dager.
+          disable: Hindre eigaren frå å bruke kontoen, men fjern eller skjul ikkje innhaldet deira.
+          none: Bruk dette for å senda ei åtvaring til brukaren utan å utløyse andre handlingar.
+          sensitive: Tving markering for sensitivt innhald på alle mediavedlegga til denne brukaren.
+          silence: Hindre brukaren frå å publisere offentlege innlegg og i å skjule eigne innlegg og varsel frå folk som ikkje fylgjer dei.
+          suspend: Hindre samhandling med– og slett innhaldet til denne kontoen. Kan omgjerast innan 30 dagar.
         warning_preset_id: Valfritt. Du kan leggja inn eigen tekst på enden av føreoppsettet
       announcement:
         all_day: Når merka, vil berre datoane til tidsramma synast
@@ -27,6 +27,8 @@ nn:
         scheduled_at: Lat stå blankt for å gjeva ut lysinga med ein gong
         starts_at: Valfritt. Om lysinga di er bunden til eit tidspunkt
         text: Du kan bruka tut-syntaks. Ver merksam på plassen lysinga tek på brukaren sin skjerm
+      appeal:
+        text: Ei åtvaring kan kun ankast ein gong
       defaults:
         autofollow: Folk som lagar ein konto gjennom innbydinga fylgjer deg automatisk
         avatar: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
@@ -35,7 +37,7 @@ nn:
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: Profilmappen er en annen måte for kontoen din å nå et bredere publikum på
+        discoverable: La kontoen din bli oppdaga av ukjende gjennom anbefalingar, trendar og andre funksjonar
         email: Du får snart ein stadfestings-e-post
         fields: Du kan ha opptil 4 gjenstander vist som en tabell på profilsiden din
         header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
@@ -47,24 +49,51 @@ nn:
         phrase: Vil bli samsvart med, uansett bruk av store/små bokstaver eller innholdsadvarselen til en tut
         scopes: API-ane som programmet vil få tilgjenge til. Ettersom du vel eit toppnivåomfang tarv du ikkje velja einskilde API-ar.
         setting_aggregate_reblogs: Ikkje vis nye framhevingar for tut som nyleg har vorte heva fram (Påverkar berre nylege framhevingar)
+        setting_always_send_emails: Vanlegvis vil ikkje e-postvarsel bli sendt når du brukar Mastodon aktivt
         setting_default_sensitive: Nærtakande media vert gøymd som standard og kan synast med eit klikk
         setting_display_media_default: Gøym media som er merka som nærtakande
         setting_display_media_hide_all: Alltid skjul alt media
         setting_display_media_show_all: Vis alltid media
         setting_hide_network: Kven du fylgjer og kven som fylgjer deg vert ikkje vist på profilen din
         setting_noindex: Påverkar den offentlege profilen og statussidene dine
-        setting_show_application: Programmet du brukar for å tuta synast i den detaljerte visninga av tuta dine
-        setting_use_blurhash: Overgangar er bygt på dei løynde sine leter, men gjer detaljar utydelege
-        setting_use_pending_items: Gøym tidslineoppdateringar ved eit klikk, i staden for å bla ned hendestraumen automatisk
+        setting_show_application: Programmet du brukar for å tuta blir vist i den detaljerte visninga av tuta dine
+        setting_use_blurhash: Overgangar er basert på fargane til skjulte grafikkelement, men gjer detaljar utydelege
+        setting_use_pending_items: Gøym tidslineoppdateringar bak eit klikk, i staden for å rulla ned automatisk
         username: Brukarnamnet ditt vert unikt på %{domain}
         whole_word: Når søkjeordet eller setninga berre er alfanumerisk, nyttast det berre om det samsvarar med heile ordet
       domain_allow:
         domain: Dette domenet er i stand til å henta data frå denne tenaren og innkomande data vert handsama og lagra
       email_domain_block:
-        domain: Dette kan vera domenenamnet som synest i e-postaddressa, MX-recorden som domenet løyser til eller IP-adressa til tenaren som MX-record løyser til. Dei sjekkast ved brukarregistrering og registretinga vert avvist.
-        with_dns_records: Eit forsøk på å løysa gjeve domene som DNS-data vil vera gjord og resultata vert svartelista
+        domain: Dette kan vera domenenamnet som blir vist i e-postadressa eller den MX-oppføringa den brukar. Dei vil bli kontrollert ved registrering.
+        with_dns_records: Det vil bli gjort eit forsøk på å avgjera DNS-oppføringa til domenet og resultata vil bli tilsvarande blokkert
       featured_tag:
-        name: 'Kanskje du vil nytta ein av desse:'
+        name: 'Her er nokre av emneknaggane du har brukt i det siste:'
+      filters:
+        action: Velg kva som skal gjerast når eit innlegg samsvarar med filteret
+        actions:
+          hide: Skjul filtrert innhald fullstendig og lat som om det ikkje finst
+          warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
+      form_admin_settings:
+        backups_retention_period: Ta vare på genererte brukararkiv i angitt antal dagar.
+        bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
+        closed_registrations_message: Vist når det er stengt for registrering
+        content_cache_retention_period: Innlegg frå andre tenarar vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi. Dette kan vera irreversibelt.
+        custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
+        mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
+        media_cache_retention_period: Mediafiler som har blitt lasta ned vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi, og lasta ned på nytt ved etterspørsel.
+        profile_directory: Profilkatalogen viser alle brukarar som har valt å kunne bli oppdaga.
+        require_invite_text: Når registrering krev manuell godkjenning, lyt du gjera tekstfeltet "Kvifor vil du bli med?" obligatorisk i staden for valfritt
+        site_contact_email: Korleis kan ein få tak i deg når det gjeld juridiske spørsmål eller spørsmål om støtte.
+        site_contact_username: Korleis folk kan koma i kontakt med deg på Mastodon.
+        site_extended_description: Tilleggsinformasjon som kan vera nyttig for besøkjande og brukarar. Kan strukturerast med Markdown-syntaks.
+        site_short_description: Ein kort omtale for lettare å finne tenaren blant alle andre. Kven driftar han, kven er i målgruppa?
+        site_terms: Bruk eigen personvernpolicy eller la stå tom for å bruka standard. Kan strukturerast med Markdown-syntaks.
+        site_title: Kva ein kan kalla tenaren, utanom domenenamnet.
+        theme: Tema som er synleg for nye brukarar og besøkjande som ikkje er logga inn.
+        thumbnail: Eit omlag 2:1 bilete vist saman med informasjon om tenaren.
+        timeline_preview: Besøkjande som ikkje er logga inn vil kunne bla gjennom dei siste offentlege innlegga på tenaren.
+        trendable_by_default: Hopp over manuell gjennomgang av populært innhald. Enkeltståande innlegg kan fjernast frå trendar i etterkant.
+        trends: Trendar viser kva for nokre innlegg, emneknaggar og nyheiter som er i støytet på tenaren.
       form_challenge:
         current_password: Du går inn i eit trygt område
       imports:
@@ -72,21 +101,33 @@ nn:
       invite_request:
         text: Dette kjem til å hjelpa oss med å gå gjennom søknaden din
       ip_block:
-        comment: Valgfritt. Husk hvorfor du la til denne regelen.
-        expires_in: IP-adressene er en helt begrenset ressurs, de deles og endres ofte hender. Ubestemte IP-blokker anbefales ikke.
-        ip: Skriv inn en IPv4 eller IPv6-adresse. Du kan blokkere alle områder ved å bruke CIDR-syntaksen. Pass på å ikke låse deg selv!
+        comment: Valfritt. Hugs kvifor du la til denne regelen.
+        expires_in: IP-adresser er ein avgrensa ressurs, er av og til delte og byter ofte eigar. På grunn av dette er det ikkje tilrådd med uavgrensa IP-blokkeringar.
+        ip: Skriv inn ei IPv4 eller IPv6 adresse. Du kan blokkere heile IP-områder ved bruk av CIDR-syntaks. Pass på å ikkje blokkera deg sjølv!
         severities:
           no_access: Blokker tilgang til alle ressurser
-          sign_up_requires_approval: Nye registreringer vil kreve din godkjenning
-        severity: Velg hva som vil skje med forespørsler fra denne IP
+          sign_up_block: Nye registreringar vil ikkje vera mogleg
+          sign_up_requires_approval: Du må godkjenna nye registreringar
+        severity: Vel kva som skal skje ved førespurnader frå denne IP
       rule:
-        text: Beskriv en regel eller krav til brukere på denne serveren. Prøv å holde den kort og enkelt
+        text: Forklar ein regel eller eit krav for brukarar på denne tenaren. Prøv å skriva kort og lettfattleg
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
+        webauthn: Om det er ein USB-nøkkel må du setja han inn og om nødvendig trykkja på han.
       tag:
         name: Du kan berre endra bruken av store/små bokstavar, t. d. for å gjera det meir leseleg
       user:
         chosen_languages: Når merka vil berre tuta på dei valde språka synast på offentlege tidsliner
+        role: Rolla kontrollerer kva tilgangar brukaren har
+      user_role:
+        color: Fargen som skal nyttast for denne rolla i heile brukargrensesnittet, som RGB i hex-format
+        highlighted: Dette gjer rolla synleg offentleg
+        name: Offentleg namn på rolla, dersom rolla skal visast som eit emblem
+        permissions_as_keys: Brukarar med denne rolla vil ha tilgang til...
+        position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan kun utførast på rollar med lågare prioritet
+      webhook:
+        events: Vel hendingar å senda
+        url: Kvar hendingar skal sendast
     labels:
       account:
         fields:
@@ -107,7 +148,7 @@ nn:
         types:
           disable: Slå av innlogging
           none: Gjer inkje
-          sensitive: Sensitiv
+          sensitive: Ømtolig
           silence: Togn
           suspend: Utvis og slett kontodata for godt
         warning_preset_id: Bruk åtvaringsoppsett
@@ -117,6 +158,8 @@ nn:
         scheduled_at: Planlegg publisering
         starts_at: Byrjing av hendinga
         text: Lysing
+      appeal:
+        text: Forklar kvifor denne avgjerda bør gjerast om
       defaults:
         autofollow: Bed om å fylgja kontoen din
         avatar: Bilete
@@ -146,6 +189,7 @@ nn:
         phrase: Nykelord eller frase
         setting_advanced_layout: Skruv på det avanserte nettgrensesnittet
         setting_aggregate_reblogs: Gruppeframhevingar på tidsliner
+        setting_always_send_emails: Alltid send epostvarsel
         setting_auto_play_gif: Spel av animerte GIF-ar automatisk
         setting_boost_modal: Vis stadfesting før framheving
         setting_crop_images: Skjer bilete i ikkje-utvida tut til 16x9
@@ -171,6 +215,7 @@ nn:
         setting_use_pending_items: Saktemodus
         severity: Alvorsgrad
         sign_in_token_attempt: Trygdenykel
+        title: Tittel
         type: Importtype
         username: Brukarnamn
         username_or_email: Brukarnamn eller E-post
@@ -179,6 +224,34 @@ nn:
         with_dns_records: Ha med MX-recordar og IP-ar til domenet
       featured_tag:
         name: Emneknagg
+      filters:
+        actions:
+          hide: Gøym totalt
+          warn: Gøym med ei advarsel
+      form_admin_settings:
+        backups_retention_period: Arkiveringsperiode for brukararkiv
+        bootstrap_timeline_accounts: Tilrå alltid desse kontoane for nye brukarar
+        closed_registrations_message: Eigendefinert melding når registrering ikkje er mogleg
+        content_cache_retention_period: Oppbevaringsperiode for innhaldsbuffer
+        custom_css: Egendefinert CSS
+        mascot: Eigendefinert maskot (eldre funksjon)
+        media_cache_retention_period: Oppbevaringsperiode for mediebuffer
+        profile_directory: Aktiver profilkatalog
+        registrations_mode: Kven kan registrera seg
+        require_invite_text: Krev ei grunngjeving for å få bli med
+        show_domain_blocks: Vis domeneblokkeringar
+        show_domain_blocks_rationale: Vis grunngjeving for domeneblokkeringar
+        site_contact_email: E-postadresse for kontakt
+        site_contact_username: Brukarnamn for kontakt
+        site_extended_description: Utvida omtale av tenaren
+        site_short_description: Stutt om tenaren
+        site_terms: Personvernsreglar
+        site_title: Tenarnamn
+        theme: Standardtema
+        thumbnail: Miniatyrbilete for tenaren
+        timeline_preview: Tillat uautentisert tilgang til offentleg tidsline
+        trendable_by_default: Tillat trendar utan gjennomgang på førehand
+        trends: Aktiver trendar
       interactions:
         must_be_follower: Gøym varslingar frå folk som ikkje fylgjer deg
         must_be_following: Gøym varslingar frå folk du ikkje fylgjer
@@ -192,9 +265,11 @@ nn:
         ip: IP
         severities:
           no_access: Blokker tilgang
+          sign_up_block: Blokker registrering
           sign_up_requires_approval: Begrens påmeldinger
         severity: Oppføring
       notification_emails:
+        appeal: Nokon klagar på ei moderatoravgjerd
         digest: Send samandrag på e-post
         favourite: Send e-post når nokon merkjer statusen din som favoritt
         follow: Send e-post når nokon fylgjer deg
@@ -202,8 +277,8 @@ nn:
         mention: Send e-post når nokon nemner deg
         pending_account: Send e-post når ein ny konto treng gjennomgang
         reblog: Send e-post når nokon framhevar statusen din
-        report: Send e-post når nokon rapporterer noko
-        trending_tag: Ein emneknagg som ikkje er sett igjennom er på veg opp
+        report: Ny rapport er sendt
+        trending_tag: Ny trend krev gjennomgang
       rule:
         text: Regler
       tag:
@@ -211,7 +286,19 @@ nn:
         name: Emneknagg
         trendable: Tillat denne emneknaggen til å synast under trendar
         usable: Gje tut lov til å nytta denne emneknaggen
+      user:
+        role: Rolle
+      user_role:
+        color: Emblemfarge
+        highlighted: Vis rolle som emblem på brukarprofil
+        name: Namn
+        permissions_as_keys: Løyve
+        position: Prioritet
+      webhook:
+        events: Aktiverte hendingar
+        url: Endepunkts-URL
     'no': Nei
+    not_recommended: Ikkje anbefalt
     recommended: Tilrådt
     required:
       mark: "*"
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 789777936..e5268fb3d 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -7,17 +7,17 @@
       account_migration:
         acct: Spesifiser brukernavn@domene til brukeren du vil flytte til
       account_warning_preset:
-        text: Du kan bruke tut syntaks, f.eks. URLer, emneknagger og nevnelser
+        text: Du kan bruke innlegg-syntaks, f.eks. URLer, emneknagger og nevnelser
         title: Valgfritt. Ikke synlig for mottaker
       admin_account_action:
-        include_statuses: Brukeren vil se hvilke tuter som forårsaket moderator-handlingen eller -advarselen
+        include_statuses: Brukeren vil se hvilke innlegg som forårsaket moderator-handlingen eller -advarselen
         send_email_notification: Brukeren vil motta en forklaring på hva som har skjedd med deres bruker
-        text_html: Valgfritt. Du kan bruke tut syntaks. Du kan <a href="%{path}">legge til advarsels-forhåndsinnstillinger</a> for å spare tid
+        text_html: Valgfritt. Du kan bruke innlegg-syntaks. Du kan <a href="%{path}">legge til advarsels-forhåndsinnstillinger</a> for å spare tid
         type_html: Velg hva du vil gjøre med <strong>%{acct}</strong>
         types:
-          disable: Forhindre brukeren å bruke kontoen sin, men ikke slett eller skjule innholdet deres.
+          disable: Forhindre brukeren fra å bruke kontoen sin, men ikke slett eller skjul innholdet deres.
           none: Bruk dette for å sende en advarsel til brukeren uten å utløse noen andre handlinger.
-          sensitive: Tving alle denne brukerens medievedlegg til å bli markert som følsom.
+          sensitive: Tving alle denne brukerens medievedlegg til å bli merket som følsomme.
           silence: Hindre brukeren i å kunne skrive offentlig synlighet, skjule sine innlegg og varsler for personer som ikke kan følge dem.
           suspend: Forhindre interaksjon fra eller til denne kontoen og slett innholdet der. Reversibel innen 30 dager.
         warning_preset_id: Valgfritt. Du kan fortsatt legge til tilpasset tekst til slutten av forhåndsinnstillingen
@@ -26,7 +26,9 @@
         ends_at: Valgfritt. Kunngjøring vil bli automatisk avpublisert på dette tidspunktet
         scheduled_at: La stå tomt for å publisere kunngjøringen umiddelbart
         starts_at: Valgfritt. I tilfellet din kunngjøring er bundet til en spesifikk tidsramme
-        text: Du kan bruke tut syntaks. Vennligst vær oppmerksom på plassen som kunngjøringen vil ta opp på brukeren sin skjerm
+        text: Du kan bruke innlegg-syntaks. Vennligst vær oppmerksom på plassen som kunngjøringen vil ta opp på brukeren sin skjerm
+      appeal:
+        text: Du kan kun klage på en advarsel en gang
       defaults:
         autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
         avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
@@ -35,25 +37,26 @@
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        discoverable: Profilmappen er en annen måte for kontoen din å nå et bredere publikum på
+        discoverable: La kontoen din bli oppdaget av ukjente gjennom anbefalinger, trender og andre funksjoner
         email: Du vil bli tilsendt en bekreftelses-E-post
         fields: Du kan ha opptil 4 gjenstander vist som en tabell på profilsiden din
         header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
-        irreversible: Filtrerte tuter vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
+        irreversible: Filtrerte innlegg vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
         locale: Språket til brukergrensesnittet, e-mailer og push-varsler
         locked: Krever at du manuelt godkjenner følgere
         password: Bruk minst 8 tegn
-        phrase: Vil bli samsvart med, uansett bruk av store/små bokstaver eller innholdsadvarselen til en tut
+        phrase: Vil bli samsvart med, uansett bruk av store/små bokstaver eller innholdsvarselet til et innlegg
         scopes: Hvilke API-er programmet vil bli gitt tilgang til. Dersom du velger et toppnivåomfang, trenger du ikke å velge individuelle API-er.
-        setting_aggregate_reblogs: Ikke vis nye fremhevinger for tuter som nylig har blitt fremhever (Påvirker kun nylige fremhevinger)
-        setting_default_sensitive: Sensitivt media blir skjult som standard og kan bli vist med et klikk
-        setting_display_media_default: Skjul media som er merket som sensitivt
+        setting_aggregate_reblogs: Ikke vis nye fremhevinger for innlegg som nylig har blitt fremhevet (påvirker kun nylige fremhevinger)
+        setting_always_send_emails: E-postvarsler sendes normalt sett ikke mens du aktivt bruker Mastodon
+        setting_default_sensitive: Følsomme media blir i utgangspunktet skjult, og kan vises frem ved hjelp av et klikk
+        setting_display_media_default: Skjul media som er merket som følsomt
         setting_display_media_hide_all: Skjul alltid all media
         setting_display_media_show_all: Alltid vis media som er merket som sensitivt
         setting_hide_network: De som du følger, og de som følger deg, vil ikke bli vist på profilen din
         setting_noindex: Påvirker din offentlige profil og statussider
-        setting_show_application: Appen du brukte til å tute vil bli vist i den detaljerte visningen til tutene dine
+        setting_show_application: Appen du bruker til å publisere innlegg vil bli vist i den detaljerte visningen til innleggene dine
         setting_use_blurhash: Gradientene er basert på fargene til de skjulte visualitetene, men gjør alle detaljer uklare
         setting_use_pending_items: Skjul tidslinjeoppdateringer bak et klikk, i stedet for å automatisk la strømmen skrolle
         username: Brukernavnet ditt vil være unikt på %{domain}
@@ -61,10 +64,32 @@
       domain_allow:
         domain: Dette domenet vil være i stand til å hente data fra denne serveren og dets innkommende data vil bli prosessert og lagret
       email_domain_block:
-        domain: Det kan være domenenavnet som vises i e-postadressen, MX-posten, som domenet bestemmer til, eller IP-en til serveren som MX-posten løser etter. De vil bli sjekket ved brukerregistrering og registrering vil bli avvist.
-        with_dns_records: Et forsøk på å løse det gitte domenets DNS-poster vil bli gjort, og resultatene vil også bli svartelistet
+        domain: Dette kan være domenenavnet som vises i e-postadressen eller MX-oppføringen den bruker. De vil bli sjekket ved oppretting av konto.
+        with_dns_records: Et forsøk på å slå opp det gitte domenets DNS-poster vil bli gjort, og resultatene vil også bli blokkert
       featured_tag:
-        name: 'Du vil kanskje ønske å bruke en av disse:'
+        name: 'Her er noen av emneknaggene du har brukt i det siste:'
+      filters:
+        action: Velg hvilken handling som skal utføres når et innlegg samsvarer med filteret
+        actions:
+          hide: Skjul filtrert innhold fullstendig, som om det ikke eksisterte
+          warn: Skjul det filtrerte innholdet bak et varsel som omtaler filterets tittel
+      form_admin_settings:
+        backups_retention_period: Behold genererte brukerarkiv i det angitte antall dager.
+        bootstrap_timeline_accounts: Disse kontoene vil bli festet til toppen av nye brukeres følge-anbefalinger.
+        closed_registrations_message: Vises når det er stengt for registrering
+        content_cache_retention_period: Innlegg fra andre tjenere vil slettes etter det angitte antall dager når det er satt til en positiv verdi. Dette kan være irreversibelt.
+        custom_css: Du kan bruke egendefinerte stiler på nettversjonen av Mastodon.
+        mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
+        media_cache_retention_period: Mediafiler som lastes ned vil bli slettet etter det angitte antall dager når det settes til en positiv verdi, og blir lastet ned på nytt ved behov.
+        profile_directory: Profilkatalogen viser alle brukere som har valgt å kunne bli oppdaget.
+        require_invite_text: Når registreringer krever manuell godkjenning, må du gjøre «Hvorfor vil du bli med?»-tekstinput obligatorisk i stedet for valgfritt
+        site_contact_email: Hvordan mennesker får tak i deg for rettslige spørsmål eller brukerstøtte.
+        site_contact_username: Hvordan mennesker kan få tak i deg på Mastodon.
+        site_extended_description: Eventuell ekstra informasjon som kan være nyttig for besøkende og dine brukere. Kan struktureres med Markdown-syntaks.
+        site_short_description: En kort beskrivelse for å bidra til å definere din tjeners identitet. Hvem kjører den, hvem er det for?
+        site_terms: Bruk dine egne personvernregler eller la stå tom for å bruke standarden. Kan struktureres med Markdown-syntaks.
+        site_title: Hva man kan kalle tjeneren din utover domenenavnet.
+        theme: Tema som vises for nye brukere og besøkende som ikke er logget inn.
       form_challenge:
         current_password: Du går inn i et sikkert område
       imports:
@@ -77,6 +102,7 @@
         ip: Skriv inn en IPv4 eller IPv6-adresse. Du kan blokkere alle områder ved å bruke CIDR-syntaksen. Pass på å ikke låse deg selv!
         severities:
           no_access: Blokker tilgang til alle ressurser
+          sign_up_block: Nyregistrering vil ikke være mulig
           sign_up_requires_approval: Nye registreringer vil kreve din godkjenning
         severity: Velg hva som vil skje med forespørsler fra denne IP
       rule:
@@ -86,7 +112,7 @@
       tag:
         name: Du kan bare forandre bruken av store/små bokstaver, f.eks. for å gjøre det mer lesbart
       user:
-        chosen_languages: Hvis noen av dem er valgt, vil kun tuter i de valgte språkene bli vist i de offentlige tidslinjene
+        chosen_languages: Hvis noen av dem er valgt, vil kun innlegg i de valgte språkene bli vist i de offentlige tidslinjene
     labels:
       account:
         fields:
@@ -100,15 +126,15 @@
         text: Forhåndsvalgt tekst
         title: Tittel
       admin_account_action:
-        include_statuses: Inkluder rapporterte tuter i e-mailen
+        include_statuses: Inkluder rapporterte innlegg i e-posten
         send_email_notification: Si ifra til brukeren over E-post
         text: Tilpasset advarsel
         type: Handling
         types:
           disable: Deaktiver pålogging
           none: Ikke gjør noe
-          sensitive: Sensitiv
-          silence: Stilne
+          sensitive: Følsom
+          silence: Begrens
           suspend: Suspender og ugjenkallelig slett brukerdata
         warning_preset_id: Bruk en advarsels-forhåndsinnstilling
       announcement:
@@ -148,21 +174,21 @@
         setting_aggregate_reblogs: Gruppefremhevinger i tidslinjer
         setting_auto_play_gif: Autoavspill animert GIF-filer
         setting_boost_modal: Vis bekreftelse før fremheving
-        setting_crop_images: Klipp bilder i ikke-utvidede tuter til 16:9
+        setting_crop_images: Klipp bilder i ikke-utvidede innlegg til 16:9
         setting_default_language: Innleggsspråk
         setting_default_privacy: Postintegritet
-        setting_default_sensitive: Marker alltid media som sensitivt
-        setting_delete_modal: Vis bekreftelse før du sletter en tut
+        setting_default_sensitive: Merk alltid media som følsomt
+        setting_delete_modal: Vis bekreftelse før du sletter et innlegg
         setting_disable_swiping: Skru av sveipebevegelser
         setting_display_media: Mediavisning
         setting_display_media_default: Standard
         setting_display_media_hide_all: Skjul alle
         setting_display_media_show_all: Vis alle
-        setting_expand_spoilers: Utvid alltid tuter som er merket med innholdsadvarsler
+        setting_expand_spoilers: Utvid alltid innlegg som er merket med innholdsvarsler
         setting_hide_network: Skjul nettverket ditt
         setting_noindex: Avmeld fra søkemotorindeksering
         setting_reduce_motion: Reduser bevegelser i animasjoner
-        setting_show_application: Skryt av appen som ble brukt til å sende tuter
+        setting_show_application: Vis hvilken app som ble brukt til å sende innlegg
         setting_system_font_ui: Bruk systemets standardfont
         setting_theme: Sidens tema
         setting_trends: Vis dagens trender
@@ -179,6 +205,12 @@
         with_dns_records: Inkluder MX-poster og IP-adresser for domenet
       featured_tag:
         name: Emneknagg
+      form_admin_settings:
+        profile_directory: Aktiver profilkatalog
+        registrations_mode: Hvem kan opprette konto
+        show_domain_blocks_rationale: Vis grunnen til at domener ble blokkert
+        site_contact_email: E-postadresse for kontakt
+        site_title: Servernavn
       interactions:
         must_be_follower: Blokker varslinger fra ikke-følgere
         must_be_following: Blokker varslinger fra personer du ikke følger
@@ -202,16 +234,21 @@
         mention: Send e-post når noen nevner deg
         pending_account: Ny bruker avventer gjennomgang
         reblog: Send e-post når noen fremhever din status
-        report: Ny rapport er sendt inn
-        trending_tag: En ugjennomgått emneknagg trender
       rule:
         text: Regler
       tag:
         listable: Tillat denne emneknaggen å vises i søk og på profilmappen
         name: Emneknagg
         trendable: Tillat denne emneknaggen til å vises under trender
-        usable: Tillat tuter å bruke denne emneknaggen
+        usable: Tillat innlegg å bruke denne emneknaggen
+      user:
+        role: Rolle
+      user_role:
+        name: Navn
+        permissions_as_keys: Tillatelser
+        position: Prioritet
     'no': Nei
+    not_recommended: Ikke anbefalt
     recommended: Anbefalt
     required:
       mark: "*"
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index e2520da3f..b6e6da78f 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -14,6 +14,8 @@ oc:
         send_email_notification: L’utilizaire recebrà una explicacion de çò qu’arribèt a son compte
         text_html: Opcional. Podètz utilizar la sintaxi dels tuts. Podètz <a href="%{path}">ajustar un avertiment personalizat</a> per estalviar de temps
         type_html: Causir de qué far amb <strong>%{acct}</strong>
+        types:
+          disable: Empachar l’utilizaire d’utilizar son compte mas suprimir o amagar pas son contengut.
         warning_preset_id: Opcional. Podètz ajustar un tèxt personalizat a a fin de çò predefinit
       announcement:
         all_day: Se son marcadas, solament las datas de l’interval de temps seràn mostrada
@@ -29,7 +31,6 @@ oc:
         current_password: Per de rasons de seguretat volgatz picar lo senhal del compte actual
         current_username: Per confirmar, volgatz picar lo nom d’utilizaire del compte actual
         digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia
-        discoverable: L’annuari de perfiles es un biais mai per que vòstre compte aja una audiéncia mai granda
         email: Vos mandarem un corrièl de confirmacion
         fields: Podètz far veire cap a 4 elements sus vòstre perfil
         header: PNG, GIF o JPG. Maximum %{size}. Serà retalhada en %{dimensions}px
@@ -41,6 +42,7 @@ oc:
         phrase: Serà pres en compte que siá en majuscula o minuscula o dins un avertiment de contengut sensible
         scopes: A quinas APIs poiràn accedir las aplicacions. Se seleccionatz un encastre de naut nivèl, fa pas mestièr de seleccionar los nivèls mai basses.
         setting_aggregate_reblogs: Mostrar pas los nòus partatges que son estats partejats recentament (afecta pas que los nòus partatges recebuts)
+        setting_always_send_emails: Normalament enviam pas los corrièls de notificacion se sètz a utilizar Mastodon activament
         setting_default_sensitive: Los mèdias sensibles son resconduts per defaut e se revelhan amb un clic
         setting_display_media_default: Rescondre los mèdias marcats coma sensibles
         setting_display_media_hide_all: Totjorn rescondre los mèdias
@@ -55,10 +57,7 @@ oc:
       domain_allow:
         domain: Aqueste domeni poirà recuperar las donadas d’aqueste servidor estant e las donadas venent d’aqueste domeni seràn tractadas e gardadas
       email_domain_block:
-        domain: Pòt èsser lo nom de domeni mostrat sus l’adreça electronica, l’enregistrament MX, o l’adreça IP ligada. Serà verificat pendent l’inscripcion de la persona puèi serà regetada.
         with_dns_records: Un ensag de resolucion dels enregistraments DNS del domeni donat serà realizat e los resultats seràn tanben meses en lista negra
-      featured_tag:
-        name: 'Benlèu que volètz utilizar una d’aquestas causas :'
       form_challenge:
         current_password: Dintratz dins una zòna segura
       imports:
@@ -139,6 +138,7 @@ oc:
         phrase: Senhal o frasa
         setting_advanced_layout: Activar l’interfàcia web avançada
         setting_aggregate_reblogs: Agropar los partatges dins lo flux d’actualitat
+        setting_always_send_emails: Totjorn enviar los corrièls de notificacion
         setting_auto_play_gif: Lectura automatica dels GIFS animats
         setting_boost_modal: Mostrar una fenèstra de confirmacion abans de partejar un estatut
         setting_crop_images: Retalhar los imatges dins los tuts pas desplegats a 16x9
@@ -164,6 +164,7 @@ oc:
         setting_use_pending_items: Mòde lent
         severity: Severitat
         sign_in_token_attempt: Còdi de seguretat
+        title: Títol
         type: Tipe d’impòrt
         username: Nom d’utilizaire
         username_or_email: Nom d’utilizaire o corrièl
@@ -172,6 +173,24 @@ oc:
         with_dns_records: Inclure los enregistraments MX e las IP del domeni
       featured_tag:
         name: Etiqueta
+      filters:
+        actions:
+          hide: Rescondre complètament
+          warn: Rescondre amb avertiment
+      form_admin_settings:
+        custom_css: CSS personalizada
+        media_cache_retention_period: Durada de conservacion dels mèdias en cache
+        profile_directory: Activar l’annuari de perfils
+        registrations_mode: Qual se pòt marcar
+        require_invite_text: Requerir una rason per s’inscriure
+        site_contact_email: Adreça de contacte
+        site_contact_username: Nom d’utilizaire de contacte
+        site_extended_description: Descripcion espandida
+        site_short_description: Descripcion del servidor
+        site_terms: Politica de confidencialitat
+        site_title: Nom del servidor
+        theme: Tèma per defaut
+        thumbnail: Miniatura del servidor
       interactions:
         must_be_follower: Blocar las notificacions del mond que vos sègon pas
         must_be_following: Blocar las notificacions del mond que seguètz pas
@@ -195,8 +214,6 @@ oc:
         mention: Enviar un corrièl quand qualqu’un vos menciona
         pending_account: Enviar un corrièl quand cal validar un compte novèl
         reblog: Enviar un corrièl quand qualqu’un tòrna partejar vòstre estatut
-        report: Enviar un corrièl pels nòus senhalaments
-        trending_tag: Enviar un corrièl quand una etiqueta pas repassada es en tendéncia
       rule:
         text: Règla
       tag:
@@ -204,7 +221,15 @@ oc:
         name: Etiqueta
         trendable: Permetre a aquesta etiqueta d’aparéisser a las tendéncias
         usable: Permetre als tuts d’utilizar aquesta etiqueta
+      user:
+        role: Ròtle
+      user_role:
+        color: Color del badge
+        name: Nom
+        permissions_as_keys: Autorizacions
+        position: Prioritat
     'no': Non
+    not_recommended: Pas recomandat
     recommended: Recomandat
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index a82bbb8da..b660f4d89 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -27,32 +27,34 @@ pl:
         scheduled_at: Pozostaw puste, aby opublikować ogłoszenie natychmiastowo
         starts_at: Nieobowiązkowe. Jeżeli ogłoszenie jest związane z danym przedziałem czasu
         text: Możesz używać składni wpisu. Pamiętaj o tym, ile miejsca zajmie ogłoszenie na ekranie użytkownika
+      appeal:
+        text: Możesz wysłać odwołanie do ostrzeżenia tylko raz
       defaults:
-        autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić
+        autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię obserwować
         avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany
         current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
         current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
-        discoverable: Katalog profilu jest jednym ze sposobów, dzięki którym Twoje konto dotrze do szerszego grona
-        discoverable_no_directory: Pozwól na odkrywanie Twojego konta przez nieznajomych poprzez rekomendacje i inne funkcje
+        discoverable: Pozwala na odkrywanie twojego konta przez nieznajomych poprzez rekomendacje, popularne wpisy i inne funkcje
         email: Otrzymasz e-mail potwierdzający
         fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
         header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         inbox_url: Skopiuj adres ze strony głównej przekaźnika, którego chcesz użyć
         irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty
         locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
-        locked: Musisz akceptować prośby o śledzenie
+        locked: Musisz akceptować prośby o możliwość obserwacji
         password: Użyj co najmniej 8 znaków
         phrase: Zostanie wykryte nawet, gdy znajduje się za ostrzeżeniem o zawartości
         scopes: Wybór API, do których aplikacja będzie miała dostęp. Jeżeli wybierzesz nadrzędny zakres, nie musisz wybierać jego elementów.
         setting_aggregate_reblogs: Nie pokazuj nowych podbić dla wpisów, które zostały niedawno podbite (dotyczy tylko nowo otrzymanych podbić)
+        setting_always_send_emails: Powiadomienia e-mail zwykle nie będą wysyłane, gdy używasz Mastodon
         setting_default_sensitive: Wrażliwe multimedia są domyślnie schowane i mogą być odkryte kliknięciem
-        setting_display_media_default: Ukrywaj zawartość oznaczoną jako wrażliwa
-        setting_display_media_hide_all: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
-        setting_display_media_show_all: Nie ukrywaj zawartości multimedialnej oznaczonej jako wrażliwa
-        setting_hide_network: Informacje o tym, kto Cię śledzi i kogo śledzisz nie będą widoczne
+        setting_display_media_default: Ukrywaj zawartość multimedialną oznaczoną jako wrażliwa
+        setting_display_media_hide_all: Zawsze ukrywaj zawartość multimedialną
+        setting_display_media_show_all: Zawsze pokazuj zawartość multimedialną
+        setting_hide_network: Informacje o tym, kto Cię obserwuje i kogo obserwujesz nie będą widoczne
         setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
         setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany
         setting_use_blurhash: Gradienty są oparte na kolorach ukrywanej zawartości, ale uniewidaczniają wszystkie szczegóły
@@ -62,10 +64,36 @@ pl:
       domain_allow:
         domain: Ta domena będzie mogła pobierać dane z serwera, a dane przychodzące z niej będą przetwarzane i przechowywane
       email_domain_block:
-        domain: Może to być nazwa domeny pojawiająca się w adresu e-mail, rekord MX na który rozwiązuje domena lub IP serwera na który rozwiązuje rekord MX. Będą one wykrywane i odrzucane przy rejestracji.
+        domain: To może być nazwa domeny, która pojawia się w adresie e-mail lub rekordzie MX, którego używa. Zostaną one sprawdzone przy rejestracji.
         with_dns_records: Zostanie wykonana próba rozwiązania rekordów DNS podanej domeny, a wyniki również zostaną dodane na czarną listę
       featured_tag:
-        name: 'Sugerujemy użycie jednego z następujących:'
+        name: 'Oto niektóre hasztagi, których były ostatnio przez ciebie użyte:'
+      filters:
+        action: Wybierz akcję do wykonania, gdy post pasuje do filtra
+        actions:
+          hide: Całkowicie ukryj przefiltrowaną zawartość, jakby nie istniała
+          warn: Ukryj filtrowaną zawartość za ostrzeżeniem wskazującym tytuł filtra
+      form_admin_settings:
+        backups_retention_period: Zachowaj wygenerowane archiwa użytkownika przez określoną liczbę dni.
+        bootstrap_timeline_accounts: Te konta zostaną przypięte na górze rekomendacji obserwacji nowych użytkowników.
+        closed_registrations_message: Wyświetlane po zamknięciu rejestracji
+        content_cache_retention_period: Posty z innych serwerów zostaną usunięte po określonej liczbie dni, kiedy liczba jest ustawiona na wartość dodatnią. Może to być nieodwracalne.
+        custom_css: Możesz zastosować niestandardowe style w internetowej wersji Mastodon.
+        mascot: Nadpisuje ilustrację w zaawansowanym interfejsie internetowym.
+        media_cache_retention_period: Pobrane pliki multimedialne zostaną usunięte po określonej liczbie dni po ustawieniu na wartość dodatnią i ponownie pobrane na żądanie.
+        profile_directory: Katalog profili zawiera listę wszystkich użytkowników, którzy zgodzili się na bycie znalezionymi.
+        require_invite_text: Kiedy rejestracje wymagają ręcznego zatwierdzenia, ustaw pole "Dlaczego chcesz dołączyć?" jako obowiązkowe, a nie opcjonalne
+        site_contact_email: Jak ludzie mogą się z Tobą skontaktować w celu uzyskania odpowiedzi na zapytania prawne lub wsparcie.
+        site_contact_username: Jak ludzie mogą do Ciebie dotrzeć na Mastodon.
+        site_extended_description: Wszelkie dodatkowe informacje, które mogą być przydatne dla odwiedzających i użytkowników. Można je formatować używając składni Markdown.
+        site_short_description: Krótki opis, który pomoże w unikalnym zidentyfikowaniu Twojego serwera. Kto go obsługuje, do kogo jest skierowany?
+        site_terms: Użyj własnej polityki prywatności lub zostaw puste, aby użyć domyślnej. Może być sformatowana za pomocą składni Markdown.
+        site_title: Jak ludzie mogą odwoływać się do Twojego serwera inaczej niże przez nazwę jego domeny.
+        theme: Motyw, który widzą wylogowani i nowi użytkownicy.
+        thumbnail: Obraz o proporcjach mniej więcej 2:1 wyświetlany obok informacji o serwerze.
+        timeline_preview: Wylogowani użytkownicy będą mogli przeglądać najnowsze publiczne wpisy dostępne na serwerze.
+        trendable_by_default: Pomiń ręczny przegląd treści trendów. Pojedyncze elementy nadal mogą być usuwane z trendów po fakcie.
+        trends: Tendencje pokazują, które posty, hasztagi i newsy zyskują popularność na Twoim serwerze.
       form_challenge:
         current_password: Wchodzisz w strefę bezpieczną
       imports:
@@ -78,6 +106,7 @@ pl:
         ip: Wprowadź adres IPv4 lub IPv6. Możesz zablokować całe zakresy za pomocą składni CIDR. Uważaj, aby się nie zablokować!
         severities:
           no_access: Zablokuj dostęp do wszystkich zasobów
+          sign_up_block: Nowe rejestracje nie będą możliwe
           sign_up_requires_approval: Nowe rejestracje będą wymagać twojej zgody
         severity: Wybierz co ma się stać z żadaniami z tego adresu IP
       rule:
@@ -89,6 +118,16 @@ pl:
         name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
       user:
         chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
+        role: Rola kontroluje uprawnienia użytkownika
+      user_role:
+        color: Kolor używany dla roli w całym interfejsie użytkownika, wyrażony jako RGB w formacie szesnastkowym
+        highlighted: To sprawia, że rola jest widoczna publicznie
+        name: Publiczna nazwa roli, jeśli włączone jest wyświetlanie odznaki
+        permissions_as_keys: Użytkownicy z tą rolą będą mieli dostęp do...
+        position: Wyższa rola decyduje o rozwiązywaniu konfliktów w pewnych sytuacjach. Niektóre działania mogą być wykonywane tylko na rolach z niższym priorytetem
+      webhook:
+        events: Wybierz zdarzenia do wysłania
+        url: Dokąd będą wysłane zdarzenia
     labels:
       account:
         fields:
@@ -119,8 +158,10 @@ pl:
         scheduled_at: Zaplanuj publikację
         starts_at: Początek wydarzenia
         text: Ogłoszenie
+      appeal:
+        text: Wyjaśnij, dlaczego ta decyzja powinna zostać cofnięta
       defaults:
-        autofollow: Zapraszaj do śledzenia swojego konta
+        autofollow: Zapraszaj do obserwacji swojego konta
         avatar: Awatar
         bot: To konto jest prowadzone przez bota
         chosen_languages: Filtrowanie języków
@@ -148,6 +189,7 @@ pl:
         phrase: Słowo kluczowe lub fraza
         setting_advanced_layout: Włącz zaawansowany interfejs użytkownika
         setting_aggregate_reblogs: Grupuj podbicia na osiach czasu
+        setting_always_send_emails: Zawsze wysyłaj powiadomienia e-mail
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_crop_images: Przycinaj obrazki w nierozwiniętych wpisach do 16x9
@@ -168,11 +210,12 @@ pl:
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         setting_theme: Motyw strony
         setting_trends: Pokazuj dzisiejsze „Na czasie”
-        setting_unfollow_modal: Pytaj o potwierdzenie przed cofnięciem śledzenia
+        setting_unfollow_modal: Pytaj o potwierdzenie przed cofnięciem obserwacji
         setting_use_blurhash: Pokazuj kolorowe gradienty dla ukrytej zawartości multimedialnej
         setting_use_pending_items: Tryb spowolniony
         severity: Priorytet
         sign_in_token_attempt: Kod zabezpieczający
+        title: Tytuł
         type: Importowane dane
         username: Nazwa użytkownika
         username_or_email: Nazwa użytkownika lub adres e-mail
@@ -181,10 +224,38 @@ pl:
         with_dns_records: Uwzględnij rekordy MX i adresy IP domeny
       featured_tag:
         name: Hasztag
+      filters:
+        actions:
+          hide: Ukryj całkowicie
+          warn: Ukryj z ostrzeżeniem
+      form_admin_settings:
+        backups_retention_period: Okres przechowywania archiwum użytkownika
+        bootstrap_timeline_accounts: Zawsze rekomenduj te konta nowym użytkownikom
+        closed_registrations_message: Niestandardowa wiadomość, gdy rejestracje nie są dostępne
+        content_cache_retention_period: Okres przechowywania pamięci podręcznej
+        custom_css: Niestandardowy CSS
+        mascot: Własna ikona
+        media_cache_retention_period: Okres przechowywania pamięci podręcznej
+        profile_directory: Włącz katalog profilów
+        registrations_mode: Kto może się zarejestrować
+        require_invite_text: Wymagaj powodu, aby dołączyć
+        show_domain_blocks: Pokazuj zablokowane domeny
+        show_domain_blocks_rationale: Pokaż dlaczego domeny zostały zablokowane
+        site_contact_email: E-mail kontaktowy
+        site_contact_username: Nazwa użytkownika do kontaktu
+        site_extended_description: Rozszerzony opis
+        site_short_description: Opis serwera
+        site_terms: Polityka prywatności
+        site_title: Nazwa serwera
+        theme: Domyślny motyw
+        thumbnail: Miniaturka serwera
+        timeline_preview: Zezwalaj na nieuwierzytelniony dostęp do publicznych osi czasu
+        trendable_by_default: Zezwalaj na trendy bez wcześniejszego przeglądu
+        trends: Włącz trendy
       interactions:
-        must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie śledzą
-        must_be_following: Nie wyświetlaj powiadomień od osób, których nie śledzisz
-        must_be_following_dm: Nie wyświetlaj wiadomości bezpośrednich od osób, których nie śledzisz
+        must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie obserwują
+        must_be_following: Nie wyświetlaj powiadomień od osób, których nie obserwujesz
+        must_be_following_dm: Nie wyświetlaj wiadomości bezpośrednich od osób, których nie obserwujesz
       invite:
         comment: Komentarz
       invite_request:
@@ -194,18 +265,20 @@ pl:
         ip: Adres IP
         severities:
           no_access: Zablokuj dostęp
+          sign_up_block: Zablokuj nowe rejestracje
           sign_up_requires_approval: Ogranicz rejestracje
         severity: Reguła
       notification_emails:
+        appeal: Ktoś odwołuje się od decyzji moderatora
         digest: Wysyłaj podsumowania e-mailem
         favourite: Powiadamiaj mnie e-mailem, gdy ktoś polubi mój wpis
-        follow: Powiadamiaj mnie e-mailem, gdy ktoś zacznie mnie śledzić
-        follow_request: Powiadamiaj mnie e-mailem, gdy ktoś poprosi o pozwolenie na śledzenie mnie
+        follow: Powiadamiaj mnie e-mailem, gdy ktoś zaobserwuje mnie
+        follow_request: Powiadamiaj mnie e-mailem, gdy ktoś poprosi o pozwolenie na obserwowanie mnie
         mention: Powiadamiaj mnie e-mailem, gdy ktoś o mnie wspomni
         pending_account: Wyślij e-mail kiedy nowe konto potrzebuje recenzji
         reblog: Powiadamiaj mnie e-mailem, gdy ktoś podbije mój wpis
-        report: Powiadamiaj mnie e-mailem, gdy zostanie utworzone nowe zgłoszenie
-        trending_tag: Nieprzejrzany hashtag jest na czasie
+        report: Nowy raport został wysłany
+        trending_tag: Nowe popularne wymagają przeglądu
       rule:
         text: Zasada
       tag:
@@ -213,7 +286,19 @@ pl:
         name: Hashtag
         trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie”
         usable: Pozwól na umieszczanie tego hashtagu we wpisach
+      user:
+        role: Rola
+      user_role:
+        color: Kolor odznaki
+        highlighted: Wyświetl rolę jako odznakę na profilach użytkowników
+        name: Nazwa
+        permissions_as_keys: Uprawnienia
+        position: Priorytet
+      webhook:
+        events: Włączone zdarzenia
+        url: Endpoint URL
     'no': Nie
+    not_recommended: Niezalecane
     recommended: Polecane
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index b1bb020dd..7f162155a 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -27,33 +27,36 @@ pt-BR:
         scheduled_at: Deixe em branco para publicar o comunicado agora
         starts_at: Opcional. Caso o comunicado esteja vinculado a um período específico
         text: Você pode usar a sintaxe do toot. Considere o espaço que o comunicado ocupará na tela do usuário
+      appeal:
+        text: Você só pode solicitar uma revisão uma vez
       defaults:
         autofollow: Pessoas que criarem conta através de seu convite te seguirão automaticamente
         avatar: PNG, GIF or JPG. Arquivos de até %{size}. Serão redimensionados para %{dimensions}px
         bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada
         context: Um ou mais contextos onde o filtro deve atuar
-        current_password: Para fins de segurança, por favor, digite a senha da conta atual
-        current_username: Para confirmar, por favor, digite o nome de usuário da conta atual
+        current_password: Para fins de segurança, digite a senha da conta atual
+        current_username: Para confirmar, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
-        discoverable: O diretório de perfis é outra maneira de sua conta alcançar um público maior
+        discoverable: Permita que a sua conta seja descoberta por estranhos através de recomendações, tendências e outros recursos
         email: Você receberá um e-mail de confirmação
         fields: Você pode ter até 4 itens mostrados em forma de tabela no seu perfil
-        header: PNG, GIF or JPG. Arquivos de até %{size}. Serão redimensionados para %{dimensions}px
+        header: PNG, GIF ou JPG de até %{size}. Serão redimensionados para %{dimensions}px
         inbox_url: Copie o link da página inicial do repetidor que você deseja usar
-        irreversible: Toots filtrados desaparecerão irreversivelmente, mesmo se o filtro for removido depois
+        irreversible: As publicações filtradas desaparecerão irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma da interface do usuário, e-mails e notificações
         locked: Requer aprovação manual de seguidores
         password: Use pelo menos 8 caracteres
         phrase: Corresponderá independente de maiúsculas ou minúsculas, no texto ou no Aviso de Conteúdo de um toot
         scopes: Quais APIs o aplicativo vai ter permissão de acessar. Se você selecionar uma autorização de alto nível, você não precisa selecionar individualmente os outros.
-        setting_aggregate_reblogs: Não mostra novos boosts para toots que receberam boost recentemente (afeta somente os boosts mais recentes)
+        setting_aggregate_reblogs: Não mostra novos impulsos para publicações já receberam recentemente (afeta somente os impulsos mais recentes)
+        setting_always_send_emails: Normalmente, as notificações por e-mail não serão enviadas enquanto você estiver usando ativamente o Mastodon
         setting_default_sensitive: Mídia sensível está oculta por padrão e pode ser revelada com um clique
         setting_display_media_default: Sempre ocultar mídia sensível
         setting_display_media_hide_all: Sempre ocultar todas as mídias
         setting_display_media_show_all: Sempre mostrar mídia sensível
         setting_hide_network: Quem você segue e seus seguidores não serão mostrados no seu perfil
-        setting_noindex: Afeta seu perfil público e as páginas dos seus toots
-        setting_show_application: O aplicativo que você usar para tootar será mostrado na visão detalhada dos seus toots
+        setting_noindex: Afeta seu perfil público e as páginas das suas publicações
+        setting_show_application: O aplicativo que você usar para publicar será exibido na visão detalhada das suas publicações
         setting_use_blurhash: O blur é baseado nas cores da imagem oculta, ofusca a maioria dos detalhes
         setting_use_pending_items: Ocultar atualizações da linha do tempo atrás de um clique ao invés de rolar automaticamente
         username: Seu nome de usuário será único em %{domain}
@@ -61,14 +64,39 @@ pt-BR:
       domain_allow:
         domain: Este domínio poderá obter dados deste servidor e os dados recebidos dele serão processados e armazenados
       email_domain_block:
-        domain: Este pode ser o nome de domínio que aparece no endereço de e-mail, o registro MX para o qual o domínio resolve, ou o IP do servidor para o qual o registro MX resolve. Esses vão ser verificados no momento de registro do usuário e o registro será rejeitado.
+        domain: Este pode ser o nome de domínio que aparece no endereço de e-mail ou no registro MX que ele utiliza. Eles serão verificados após a inscrição.
         with_dns_records: Será feita uma tentativa de resolver os registros DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
-        name: 'Você pode querer usar um destes:'
+        name: 'Aqui estão algumas hashtags usadas recentemente:'
+      filters:
+        action: Escolher qual ação executar quando uma publicação corresponder ao filtro
+        actions:
+          hide: Esconder completamente o conteúdo filtrado, comportando-se como se ele não existisse
+          warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
+      form_admin_settings:
+        backups_retention_period: Manter os arquivos de usuário gerados pelo número de dias especificados.
+        bootstrap_timeline_accounts: Estas contas serão fixadas no topo das recomendações de novos usuários para seguir.
+        closed_registrations_message: Exibido quando as inscrições estiverem fechadas
+        content_cache_retention_period: Postagens de outros servidores serão excluídas após o número de dias especificados, quando definido com um valor positivo. Isso pode ser irreversível.
+        custom_css: Você pode aplicar estilos personalizados na versão da web do Mastodon.
+        mascot: Substitui a ilustração na interface web avançada.
+        media_cache_retention_period: Os arquivos de mídia baixados serão excluídos após o número especificado de dias, quando definido para um valor positivo, e baixados novamente na demanda.
+        profile_directory: O diretório de perfis lista todos os usuários que optaram por permitir que suas contas sejam descobertas.
+        site_contact_email: Como as pessoas podem entrar em contato com você para obter informações legais ou de suporte.
+        site_contact_username: Como as pessoas podem chegar até você no Mastodon.
+        site_extended_description: Quaisquer informações adicionais que possam ser úteis para os visitantes e seus usuários. Podem ser estruturadas com formato Markdown.
+        site_short_description: Uma curta descrição para ajudar unicamente a identificar a sua instância. Quem está o administrando, e para quem é direcionado?
+        site_terms: Use a sua própria política de privacidade ou deixe em branco para usar o padrão. Pode ser estruturado com o formato Markdown.
+        site_title: Como as pessoas podem se referir ao seu servidor além do nome do domínio.
+        theme: Tema que visitantes e novos usuários veem.
+        thumbnail: Uma imagem de aproximadamente 2:1 exibida ao lado da informação de sua instância.
+        timeline_preview: Visitantes conseguirão navegar pelas postagens públicas mais recentes disponíveis na instância.
+        trendable_by_default: Pular a revisão manual do conteúdo em tendência. Itens individuais ainda poderão ser removidos das tendências após a sua exibição.
+        trends: Tendências mostram quais publicações, hashtags e notícias estão ganhando destaque na sua instância.
       form_challenge:
         current_password: Você está entrando em uma área segura
       imports:
-        data: Arquivo CSV exportado de outra instância Mastodon
+        data: Arquivo CSV exportado de outro servidor Mastodon
       invite_request:
         text: Isso vai nos ajudar a revisar sua aplicação
       ip_block:
@@ -77,7 +105,8 @@ pt-BR:
         ip: Digite um endereço IPv4 ou IPv6. Você pode bloquear intervalos inteiros usando a sintaxe CIDR. Tenha cuidado para não bloquear a si mesmo!
         severities:
           no_access: Bloquear o acesso a todos os recursos
-          sign_up_requires_approval: Novos registros exigirão sua aprovação
+          sign_up_block: Não serão possíveis novas inscrições
+          sign_up_requires_approval: Novas inscrições exigirão sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
         text: Descreva uma regra ou requisito para os usuários neste servidor. Tente mantê-la curta e simples.
@@ -87,7 +116,17 @@ pt-BR:
       tag:
         name: Você pode mudar a capitalização das letras, por exemplo, para torná-la mais legível
       user:
-        chosen_languages: Apenas toots dos idiomas selecionados serão mostrados nas linhas públicas
+        chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
+        role: O cargo controla quais permissões o usuário tem
+      user_role:
+        color: Cor a ser usada para o cargo em toda a interface do usuário, como RGB no formato hexadecimal
+        highlighted: Isso torna o cargo publicamente visível
+        name: Nome público do cargo, se ele for definido para ser exibido como um distintivo
+        permissions_as_keys: Usuários com esse cargo terão acesso a...
+        position: Um cargo superior decide a resolução de conflitos em certas situações. Certas ações só podem ser executadas com cargos de menor prioridade
+      webhook:
+        events: Selecione eventos para enviar
+        url: Aonde os eventos serão enviados
     labels:
       account:
         fields:
@@ -118,6 +157,8 @@ pt-BR:
         scheduled_at: Agendar publicação
         starts_at: Início do evento
         text: Comunicados
+      appeal:
+        text: Explique o porquê essa decisão deve ser revertida
       defaults:
         autofollow: Convite para seguir a sua conta
         avatar: Imagem de perfil
@@ -147,9 +188,10 @@ pt-BR:
         phrase: Palavra-chave ou frase
         setting_advanced_layout: Ativar interface web avançada
         setting_aggregate_reblogs: Agrupar boosts nas linhas
+        setting_always_send_emails: Sempre enviar notificações por e-mail
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Solicitar confirmação antes de dar boost
-        setting_crop_images: Cortar imagens no formato 16x9 em toots não expandidos
+        setting_crop_images: Cortar imagens no formato 16x9 em publicações não expandidas
         setting_default_language: Idioma dos toots
         setting_default_privacy: Privacidade dos toots
         setting_default_sensitive: Sempre marcar mídia como sensível
@@ -163,7 +205,7 @@ pt-BR:
         setting_hide_network: Ocultar suas relações
         setting_noindex: Não quero ser indexado por mecanismos de pesquisa
         setting_reduce_motion: Reduzir animações
-        setting_show_application: Mostrar o aplicativo usado para enviar os toots
+        setting_show_application: Mostrar o aplicativo usado para enviar as publicações
         setting_system_font_ui: Usar fonte padrão do sistema
         setting_theme: Tema do site
         setting_trends: Mostrar em alta hoje
@@ -172,6 +214,7 @@ pt-BR:
         setting_use_pending_items: Modo lento
         severity: Gravidade
         sign_in_token_attempt: Código de segurança
+        title: Título
         type: Tipo de importação
         username: Nome de usuário
         username_or_email: Nome de usuário ou e-mail
@@ -180,6 +223,34 @@ pt-BR:
         with_dns_records: Incluir registros MX e IPs do domínio
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Ocultar completamente
+          warn: Ocultar com um aviso
+      form_admin_settings:
+        backups_retention_period: Período de retenção do arquivo de usuário
+        bootstrap_timeline_accounts: Sempre recomendar essas contas para novos usuários
+        closed_registrations_message: Mensagem personalizada quando inscrições não estão disponíveis
+        content_cache_retention_period: Período de retenção do cachê de conteúdo
+        custom_css: CSS personalizável
+        mascot: Mascote personalizado (legado)
+        media_cache_retention_period: Período de retenção do cachê de mídia
+        profile_directory: Ativar diretório de perfis
+        registrations_mode: Quem pode se inscrever
+        require_invite_text: Exigir uma razão para entrar
+        show_domain_blocks: Mostrar domínios bloqueados
+        show_domain_blocks_rationale: Mostrar por que domínios foram bloqueados
+        site_contact_email: E-mail de contato
+        site_contact_username: Usuário de contato
+        site_extended_description: Descrição estendida
+        site_short_description: Descrição do servidor
+        site_terms: Política de privacidade
+        site_title: Nome do servidor
+        theme: Tema padrão
+        thumbnail: Miniatura do servidor
+        timeline_preview: Permitir acesso não autenticado às linhas do tempo públicas
+        trendable_by_default: Permitir tendências sem revisão prévia
+        trends: Habilitar tendências
       interactions:
         must_be_follower: Bloquear notificações de não-seguidores
         must_be_following: Bloquear notificações de não-seguidos
@@ -193,9 +264,11 @@ pt-BR:
         ip: IP
         severities:
           no_access: Bloquear acesso
+          sign_up_block: Bloquear registros
           sign_up_requires_approval: Limitar novas contas
         severity: Regra
       notification_emails:
+        appeal: Alguém solicitou uma revisão de uma decisão da moderação
         digest: Enviar e-mails de resumo
         favourite: Enviar e-mail quando alguém favoritar teus toots
         follow: Enviar e-mail quando alguém te seguir
@@ -203,8 +276,8 @@ pt-BR:
         mention: Enviar e-mail quando alguém te mencionar
         pending_account: Enviar e-mail quando uma nova conta precisa ser revisada
         reblog: Enviar e-mail quando alguém der boost nos teus toots
-        report: Enviar e-mail quando uma nova denúncia for enviada
-        trending_tag: Enviar e-mail quando uma hashtag não-revisada está em alta
+        report: Nova denúncia foi enviada
+        trending_tag: Uma nova tendência requer revisão
       rule:
         text: Regra
       tag:
@@ -212,7 +285,19 @@ pt-BR:
         name: Hashtag
         trendable: Permitir que esta hashtag fique em alta
         usable: Permitir que toots usem esta hashtag
+      user:
+        role: Cargo
+      user_role:
+        color: Cor do emblema
+        highlighted: Exibir cargo como distintivo nos perfis de usuários
+        name: Nome
+        permissions_as_keys: Permissões
+        position: Prioridade
+      webhook:
+        events: Eventos habilitados
+        url: URL do Endpoint
     'no': Não
+    not_recommended: Não recomendado
     recommended: Recomendado
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 9519ee35a..211a2fac4 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -27,6 +27,8 @@ pt-PT:
         scheduled_at: Deixe em branco para publicar o anúncio imediatamente
         starts_at: Opcional. Caso o seu anúncio seja vinculado a um intervalo de tempo específico
         text: Pode utilizar a sintaxe dos toot. Por favor, tenha em consideração o espaço que o anúncio ocupará no ecrã do utilizador
+      appeal:
+        text: Só pode recorrer de uma punição uma vez
       defaults:
         autofollow: As pessoas que aderem através do convite seguir-te-ão automaticamente
         avatar: PNG, GIF or JPG. Arquivos até %{size}. Vão ser reduzidos para %{dimensions}px
@@ -35,8 +37,7 @@ pt-PT:
         current_password: Para fins de segurança, por favor, introduza a palavra-passe da conta atual
         current_username: Para confirmar, por favor, introduza o nome de utilizador da conta atual
         digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência
-        discoverable: O diretório de perfis é outra maneira da sua conta alcançar um público mais vasto
-        discoverable_no_directory: Permitir que a sua conta seja descoberta por estranhos através de recomendações e outras funções
+        discoverable: Permitir que a sua conta seja descoberta por outros através de recomendações, destaques e outras funções
         email: Será enviado um e-mail de confirmação
         fields: Pode ter até 4 itens expostos, em forma de tabela, no seu perfil
         header: PNG, GIF or JPG. Arquivos até %{size}. Vão ser reduzidos para %{dimensions}px
@@ -48,6 +49,7 @@ pt-PT:
         phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
         scopes: Quais as APIs a que será concedido acesso. Se escolheres uma abrangência de nível superior, não precisarás de as seleccionar individualmente.
         setting_aggregate_reblogs: Não mostrar novas partilhas que foram partilhadas recentemente (só afecta as novas partilhas)
+        setting_always_send_emails: Normalmente as notificações por e-mail não serão enviadas quando estiver a utilizar ativamente o Mastodon
         setting_default_sensitive: Media sensível está oculta por padrão e pode ser revelada com um clique
         setting_display_media_default: Esconder media marcada como sensível
         setting_display_media_hide_all: Esconder sempre toda a media
@@ -62,10 +64,36 @@ pt-PT:
       domain_allow:
         domain: Este domínio será capaz de obter dados desta instância e os dados dele recebidos serão processados e armazenados
       email_domain_block:
-        domain: Este pode ser o nome de domínio que aparece no endereço de e-mail, o registo MX para o qual o domínio resolve, ou o IP do servidor para o qual o registo MX resolve. Estes serão verificados no momento da inscrição do utilizador e a inscrição será rejeitada.
+        domain: Este pode ser o nome de domínio que aparece no endereço de e-mail ou o registo MX por ele utilizado. Eles serão verificados aquando da inscrição.
         with_dns_records: Será feita uma tentativa de resolver os registos DNS do domínio em questão e os resultados também serão colocados na lista negra
       featured_tag:
-        name: 'Poderás querer usar um destes:'
+        name: 'Aqui estão algumas das hashtags que utilizou recentemente:'
+      filters:
+        action: Escolha qual a ação a executar quando uma publicação corresponde ao filtro
+        actions:
+          hide: Ocultar completamente o conteúdo filtrado, comportando-se como se não existisse
+          warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
+      form_admin_settings:
+        backups_retention_period: Manter os arquivos gerados pelos utilizadores por um número específico de dias.
+        bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
+        closed_registrations_message: Exibido quando as inscrições estão encerradas
+        content_cache_retention_period: Publicações de outros servidores serão excluídos após o número de dias especificado, quando definido com um valor positivo. Isso pode ser irreversível.
+        custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
+        mascot: Sobrepõe-se à ilustração na interface web avançada.
+        media_cache_retention_period: Os ficheiros de media descarregados serão excluídos após o número de dias especificado, quando definido com um valor positivo, e descarregados novamente quando solicitados.
+        profile_directory: O diretório de perfis lista todos os utilizadores que optaram por a sua conta ser sugerida a outros.
+        require_invite_text: Quando as incrições exigirem aprovação manual, faça o texto "Porque se quer juntar a nós?" da solicitação de convite, obrigatório ao invés de opcional
+        site_contact_email: Como as pessoas podem entrar em contacto consigo para obter informações legais ou de suporte.
+        site_contact_username: Como as pessoas conseguem chegar até si no Mastodon.
+        site_extended_description: Qualquer informação adicional que possa ser útil para os visitantes e os seus utilizadores. Pode ser estruturada com a sintaxe Markdown.
+        site_short_description: Uma breve descrição para ajudar a identificar de forma única o seu servidor. Quem o está a gerir, para quem é?
+        site_terms: Use a sua própria política de privacidade ou deixe em branco para usar a política padrão. Pode ser estruturada com a sintaxe Markdown.
+        site_title: Como as pessoas podem referir-se ao seu servidor para além do seu nome de domínio.
+        theme: Tema que os visitantes e os novos utilizadores visualizam.
+        thumbnail: Uma imagem de aproximadamente 2:1, exibida ao lado da informação do seu servidor.
+        timeline_preview: Os visitantes sem sessão iniciada poderão consultar as publicações públicas mais recentes disponíveis no servidor.
+        trendable_by_default: Ignorar a revisão manual do conteúdo das tendências. Itens individuais ainda poderão ser removidos das tendências após a sua exibição.
+        trends: As tendências mostram quais as publicações, hashtags e notícias estão a ganhar destaque no seu servidor.
       form_challenge:
         current_password: Está a entrar numa área restrita
       imports:
@@ -78,6 +106,7 @@ pt-PT:
         ip: Introduza um endereço IPv4 ou IPv6. Pode bloquear intervalos inteiros usando a sintaxe CIDR. Tenha cuidado para não se bloquear a sí mesmo!
         severities:
           no_access: Bloquear o acesso a todos os recursos
+          sign_up_block: Não serão possíveis novas inscrições
           sign_up_requires_approval: Novas inscrições requererão a sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
@@ -89,6 +118,16 @@ pt-PT:
         name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis
       user:
         chosen_languages: Quando seleccionado, só publicações nas línguas escolhidas serão mostradas nas cronologias públicas
+        role: A função controla que permissões o utilizador tem
+      user_role:
+        color: Cor a ser utilizada para a função em toda a interface de utilizador, como RGB no formato hexadecimal
+        highlighted: Isto torna a função visível publicamente
+        name: Nome público da função, se a função for definida para ser exibida como um distintivo
+        permissions_as_keys: Utilizadores com esta função terão acesso a...
+        position: Função mais alta decidem a resolução de conflitos em certas situações. Certas ações só podem ser executadas em funções com uma menor prioridade
+      webhook:
+        events: Selecione os eventos a enviar
+        url: Para onde os eventos serão enviados
     labels:
       account:
         fields:
@@ -102,7 +141,7 @@ pt-PT:
         text: Texto pré-definido
         title: Título
       admin_account_action:
-        include_statuses: Incluir no e-mail os toots reportados
+        include_statuses: Incluir no e-mail as publicações denunciadas
         send_email_notification: Notificar o utilizador por e-mail
         text: Aviso personalizado
         type: Acção
@@ -119,6 +158,8 @@ pt-PT:
         scheduled_at: Agendar publicação
         starts_at: Início do evento
         text: Anúncio
+      appeal:
+        text: Explique porque esta decisão deve ser revertida
       defaults:
         autofollow: Convidar para seguir a tua conta
         avatar: Imagem de Perfil
@@ -148,6 +189,7 @@ pt-PT:
         phrase: Palavra ou expressão-chave
         setting_advanced_layout: Ativar interface web avançada
         setting_aggregate_reblogs: Agrupar partilhas em cronologias
+        setting_always_send_emails: Enviar notificações de email sempre
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Solicitar confirmação antes de partilhar uma publicação
         setting_crop_images: Cortar imagens em toots não expandidos para o formato 16x9
@@ -173,6 +215,7 @@ pt-PT:
         setting_use_pending_items: Modo lento
         severity: Gravidade
         sign_in_token_attempt: Código de segurança
+        title: Título
         type: Tipo de importação
         username: Nome de utilizador
         username_or_email: Nome de utilizador ou e-mail
@@ -181,6 +224,34 @@ pt-PT:
         with_dns_records: Incluir registos MX e IPs do domínio
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Ocultar por completo
+          warn: Ocultar com um aviso
+      form_admin_settings:
+        backups_retention_period: Período de retenção de arquivos de utilizador
+        bootstrap_timeline_accounts: Sempre recomendar essas contas para novos utilizadores
+        closed_registrations_message: Mensagem personalizada quando as inscrições não estão disponíveis
+        content_cache_retention_period: Período de retenção de conteúdo em cache
+        custom_css: CSS Personalizado
+        mascot: Mascote personalizada (legado)
+        media_cache_retention_period: Período de retenção de ficheiros de media em cache
+        profile_directory: Habilitar diretório de perfis
+        registrations_mode: Quem pode inscrever-se
+        require_invite_text: Requerer uma razão para entrar
+        show_domain_blocks: Mostrar domínios bloqueados
+        show_domain_blocks_rationale: Mostrar porque os domínios foram bloqueados
+        site_contact_email: E-mail de contacto
+        site_contact_username: Nome de utilizador do contacto
+        site_extended_description: Descrição estendida
+        site_short_description: Descrição do servidor
+        site_terms: Política de Privacidade
+        site_title: Nome do servidor
+        theme: Tema predefinido
+        thumbnail: Miniatura do servidor
+        timeline_preview: Permitir acesso não autenticado às cronologias públicas
+        trendable_by_default: Permitir tendências sem revisão prévia
+        trends: Habilitar tendências
       interactions:
         must_be_follower: Bloquear notificações de não-seguidores
         must_be_following: Bloquear notificações de pessoas que não segues
@@ -194,9 +265,11 @@ pt-PT:
         ip: IP
         severities:
           no_access: Bloquear acesso
+          sign_up_block: Bloquear inscrições
           sign_up_requires_approval: Limitar inscrições
         severity: Regra
       notification_emails:
+        appeal: Alguém recorreu de uma decisão de moderação
         digest: Enviar e-mails de resumo
         favourite: Quando alguém adiciona uma publicação sua aos favoritos
         follow: Quando alguém começar a segui-lo
@@ -204,8 +277,8 @@ pt-PT:
         mention: Quando alguém o mencionar
         pending_account: Quando uma nova conta aguarda aprovação
         reblog: Quando alguém partilhar uma publicação sua
-        report: Quando um novo relatório é submetido
-        trending_tag: Quando uma hashtag não aprovada anteriormente estiver em destaque
+        report: Nova denúncia submetida
+        trending_tag: Nova tendência requer revisão
       rule:
         text: Regra
       tag:
@@ -213,7 +286,19 @@ pt-PT:
         name: Hashtag
         trendable: Permitir que esta hashtag apareça em destaque
         usable: Permitir que toots utilizem esta hashtag
+      user:
+        role: Função
+      user_role:
+        color: Cor do distintivo
+        highlighted: Exibir a função como distintivo nos perfis de utilizador
+        name: Nome
+        permissions_as_keys: Permissões
+        position: Prioridade
+      webhook:
+        events: Eventos ativados
+        url: URL do Endpoint
     'no': Não
+    not_recommended: Não recomendado
     recommended: Recomendado
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 8d30c2746..6ed4905db 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -29,7 +29,6 @@ ro:
         current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
         current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
         digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
-        discoverable: Directorul de profil este un alt mod prin care contul tău poate ajunge la un public mai larg
         email: Vei primi un e-mail de confirmare
         fields: Poti afișa pană la maxim 4 adrese sub formă de tabel pe pofilul tău
         header: PNG, GIF sau JPG. Cel mult %{size}. Vor fi redimensionate la %{dimensions}px
@@ -55,10 +54,7 @@ ro:
       domain_allow:
         domain: Acest domeniu va putea prelua date de pe acest server și datele primite de la el vor fi procesate și stocate
       email_domain_block:
-        domain: Acesta poate fi numele domeniului care apare pe adresa de e-mail, înregistrarea MX la care domeniul se rezolvă sau IP-ul serverului la care înregistrează MX rezolvă. Acestea vor fi verificate după înregistrarea utilizatorului, iar înscrierea va fi respinsă.
         with_dns_records: Se va face o încercare de a rezolva înregistrările DNS ale domeniului dat și rezultatele vor fi de asemenea afișate pe lista neagră
-      featured_tag:
-        name: 'S-ar putea să vreți să folosiți unul dintre acestea:'
       form_challenge:
         current_password: Ați intrat într-o zonă securizată
       imports:
@@ -133,7 +129,7 @@ ro:
         setting_crop_images: Decupează imaginile în postările non-extinse la 16x9
         setting_default_language: În ce limbă postezi
         setting_default_privacy: Cine vede postările tale
-        setting_default_sensitive: Întotdeauna marchează conținutul media ca sensibil
+        setting_default_sensitive: Întotdeauna marchează conținutul media ca fiind sensibil
         setting_delete_modal: Arată dialogul de confirmare înainte de a șterge o postare
         setting_display_media: Afișare media
         setting_display_media_default: Standard
@@ -173,8 +169,6 @@ ro:
         mention: Trimite e-mail când cineva te menționează
         pending_account: Noul cont trebuie revizuit
         reblog: Trimite e-mail când cineva impulsionează una din postările tale
-        report: Trimite e-mail când un raport nou este trimis
-        trending_tag: Un hashtag nerevizuit este în tendință
       tag:
         listable: Permite acestui hashtag să apară în căutări și în directorul de profil
         trendable: Permite acestui hashtag să apară sub tendințe
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 356f9f2b9..91db26275 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -3,7 +3,7 @@ ru:
   simple_form:
     hints:
       account_alias:
-        acct: Укажите имя_пользователя@домен учётной записи, с которой вы собираетесь мигрировать
+        acct: Укажите ник@домен учётной записи, с которой вы собираетесь мигрировать
       account_migration:
         acct: Укажите имя_пользователя@домен учётной записи, на которую вы собираетесь мигрировать
       account_warning_preset:
@@ -27,6 +27,8 @@ ru:
         scheduled_at: Оставьте поля незаполненными, чтобы опубликовать объявление сразу
         starts_at: Необязательно. На случай, если ваше объявление привязано к какому-то временному интервалу
         text: Вы можете использовать тот же синтаксис, что и в постах. Будьте предусмотрительны насчёт места, которое займёт объявление на экране пользователей
+      appeal:
+        text: Вы можете обжаловать замечание только один раз
       defaults:
         autofollow: Люди, пришедшие по этому приглашению, автоматически будут подписаны на вас.
         avatar: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшен до %{dimensions}px.
@@ -35,19 +37,19 @@ ru:
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
-        discoverable: Каталог профилей это один из способов получить охват вашего профиля более обширной аудиторией.
-        discoverable_no_directory: Разрешить сторонним людям находить ваш профиль через рекомендации и прочие функции
+        discoverable: Разрешить другим людям находить ваш профиль через рекомендации, тренды и другие функции.
         email: Вам будет отправлено электронное письмо с подтверждением.
-        fields: В профиле можно отобразить до 4 пунктов в виде таблицы.
+        fields: В профиле можно отобразить до 4 пунктов в виде таблицы. Например, ваши местоимения, часовой пояс или ссылку на свой сайт.
         header: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшена до %{dimensions}px.
         inbox_url: Копировать URL с главной страницы ретранслятора, который вы хотите использовать
         irreversible: Отфильтрованные посты будут утеряны навсегда, даже если в будущем фильтр будет убран
         locale: Язык интерфейса, e-mail писем и push-уведомлений
-        locked: Подписчиков нужно будет подтверждать вручную.
+        locked: Вручную контролируйте, кто может подписываться на вас, утверждая запросы на подписку
         password: Укажите не менее 8 символов.
         phrase: Будет сопоставлено независимо от присутствия в тексте или предупреждения о содержании поста
         scopes: Какие API приложению будет позволено использовать. Если вы выберете самый верхний, нижестоящие будут выбраны автоматически.
         setting_aggregate_reblogs: Не показывать новые продвижения постов, которые уже были недавно продвинуты (относится только к новым продвижениям).
+        setting_always_send_emails: По умолчанию, когда вы активно используете Mastodon, уведомления по электронной почте не отправляются
         setting_default_sensitive: Медиафайлы «деликатного характера» скрыты по умолчанию и могут быть показаны по нажатию на них.
         setting_display_media_default: Скрывать файлы «деликатного характера»
         setting_display_media_hide_all: Всегда скрывать любые медиафайлы
@@ -62,10 +64,36 @@ ru:
       domain_allow:
         domain: Этот домен сможет получать данные с этого сервера и его входящие данные будут обрабатываться и сохранены
       email_domain_block:
-        domain: Это может быть домен, отображаемый в адресе электронной почты, MX-запись, на которую разрешается домен или IP сервера, на который разрешается MX-запись. Они будут проверены при регистрации пользователя, и регистрация будет отклонена.
+        domain: Это может быть доменное имя, которое отображается в адресе электронной почты или используемая MX запись. Они будут проверяться при регистрации.
         with_dns_records: Будет сделана попытка разрешить DNS-записи данного домена и результаты также будут внесены в чёрный список
       featured_tag:
-        name: 'Возможно, вы захотите добавить что-то из этого:'
+        name: 'Вот некоторые хэштеги, которые вы использовали в последнее время:'
+      filters:
+        action: Выберите действие, которое нужно выполнить, когда сообщение соответствует фильтру
+        actions:
+          hide: Полностью скрыть отфильтрованный контент так, как будто его не существует
+          warn: Скрыть отфильтрованный контент за предупреждением с указанием названия фильтра
+      form_admin_settings:
+        backups_retention_period: Сохранять сгенерированные пользовательские архивы для указанного количества дней.
+        bootstrap_timeline_accounts: Эти аккаунты будут рекомендованы для подписки новым пользователям.
+        closed_registrations_message: Отображается, когда регистрация закрыта
+        content_cache_retention_period: Записи с других серверов будут удалены после указанного количества дней, когда установлено положительное значение. Это может быть необратимо.
+        custom_css: Вы можете применять пользовательские стили в веб-версии Mastodon.
+        mascot: Заменяет иллюстрацию в расширенном веб-интерфейсе.
+        media_cache_retention_period: Скачанные медиа-файлы будут удалены после указанного количества дней, когда установлено положительное значение и повторно загружены по требованию.
+        profile_directory: В каталоге профилей перечислены все пользователи, которые согласились быть доступными для обнаружения.
+        require_invite_text: Когда регистрация требует ручного одобрения, сделайте текстовый ввод "Почему вы хотите присоединиться?" обязательным, а не опциональным
+        site_contact_email: Как люди могут связаться с вами по юридическим вопросам или вопросам поддержки.
+        site_contact_username: Как люди могут связаться с вами на Mastodon.
+        site_extended_description: Любая дополнительная информация, которая может быть полезна посетителям и вашим пользователям. Можно использовать синтаксис Markdown.
+        site_short_description: Краткое описание, помогающее однозначно идентифицировать ваш сервер. Кто им управляет, для кого он предназначен?
+        site_terms: Используйте свою собственную политику конфиденциальности или оставьте пустым, чтобы использовать политику по умолчанию. Можно использовать синтаксис Markdown.
+        site_title: Как люди могут ссылаться на ваш сервер, помимо его доменного имени.
+        theme: Тема, которую видят вышедшие из системы посетители и новые пользователи.
+        thumbnail: Изображение примерно 2:1, отображаемое рядом с информацией о вашем сервере.
+        timeline_preview: Посетители, вышедшие из системы, смогут просматривать последние публичные сообщения, имеющиеся на сервере.
+        trendable_by_default: Пропустить ручной просмотр трендового контента. Отдельные элементы могут быть удалены из трендов уже постфактум.
+        trends: Тренды показывают, какие посты, хэштеги и новостные истории набирают обороты на вашем сервере.
       form_challenge:
         current_password: Вы переходите к настройкам безопасности
       imports:
@@ -78,6 +106,7 @@ ru:
         ip: Введите IPv4 или IPv6 адрес. Вы можете блокировать целые диапазоны, используя синтаксис CIDR. Будьте осторожны, не заблокируйте самого себя!
         severities:
           no_access: Заблокировать доступ ко всем ресурсам
+          sign_up_block: Новые регистрации будут невозможны
           sign_up_requires_approval: Новые регистрации потребуют вашего одобрения
         severity: Выберите, что будет происходить с запросами с этого IP
       rule:
@@ -89,6 +118,16 @@ ru:
         name: Вы можете изменить только регистр букв чтобы, например, сделать тег более читаемым
       user:
         chosen_languages: Если выбрано, то в публичных лентах будут показаны только посты на выбранных языках.
+        role: Роль определяет, какие разрешения есть у пользователя
+      user_role:
+        color: Цвет, который будет использоваться для роли в интерфейсе (UI), как RGB в формате HEX
+        highlighted: Это действие сделает роль публичной
+        name: Публичное имя роли, если роль настроена на отображение в виде значка
+        permissions_as_keys: Пользователи с этой ролью будут иметь доступ...
+        position: Повышение роли разрешают конфликты интересов в некоторых ситуациях. Некоторые действия могут выполняться только на ролях с более низким приоритетом
+      webhook:
+        events: Выберите события для отправки
+        url: Куда события будут отправляться
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ ru:
         scheduled_at: Отложенная публикация
         starts_at: Время начала
         text: Объявление
+      appeal:
+        text: Объясните, почему это решение должно быть отменено
       defaults:
         autofollow: С подпиской на вашу учётную запись
         avatar: Аватар
@@ -129,7 +170,7 @@ ru:
         context: Контекст фильтра
         current_password: Текущий пароль
         data: Данные
-        discoverable: Показывать эту учётную запись в каталоге
+        discoverable: Рекомендовать учётную запись другим пользователям
         display_name: Отображаемое имя
         email: Адрес e-mail
         expires_in: Истекает через
@@ -140,7 +181,7 @@ ru:
         irreversible: Удалять, а не скрывать
         locale: Язык интерфейса
         locked: Сделать учётную запись закрытой
-        max_uses: Максимальное число использований
+        max_uses: Максимальное кол-во использований
         new_password: Новый пароль
         note: О себе
         otp_attempt: Код из приложения-аутентификатора
@@ -148,6 +189,7 @@ ru:
         phrase: Слово или фраза
         setting_advanced_layout: Включить многоколоночный интерфейс
         setting_aggregate_reblogs: Группировать продвижения в лентах
+        setting_always_send_emails: Всегда отправлять уведомления по электронной почте
         setting_auto_play_gif: Автоматически проигрывать GIF анимации
         setting_boost_modal: Всегда спрашивать перед продвижением
         setting_crop_images: Кадрировать изображения в нераскрытых постах до 16:9
@@ -173,6 +215,7 @@ ru:
         setting_use_pending_items: Медленный режим
         severity: Накладываемые ограничения
         sign_in_token_attempt: Код безопасности
+        title: Название
         type: Тип импорта
         username: Имя пользователя
         username_or_email: Имя пользователя или e-mail
@@ -180,7 +223,35 @@ ru:
       email_domain_block:
         with_dns_records: Включить MX-записи и IP-адреса домена
       featured_tag:
-        name: Хэштег
+        name: Добавить хэштег
+      filters:
+        actions:
+          hide: Скрыть полностью
+          warn: Скрыть с предупреждением
+      form_admin_settings:
+        backups_retention_period: Период хранения архива пользователя
+        bootstrap_timeline_accounts: Всегда рекомендовать эти учетные записи новым пользователям
+        closed_registrations_message: Сообщение, когда регистрация недоступна
+        content_cache_retention_period: Период хранения кэша содержимого
+        custom_css: Пользовательский CSS
+        mascot: Пользовательский маскот (устаревшее)
+        media_cache_retention_period: Период хранения кэша медиафайлов
+        profile_directory: Включить каталог профилей
+        registrations_mode: Кто может зарегистрироваться
+        require_invite_text: Требуется причина для присоединения
+        show_domain_blocks: Показать блокировки домена
+        show_domain_blocks_rationale: Показать причину блокировки доменов
+        site_contact_email: Контактный e-mail
+        site_contact_username: Контактное имя пользователя
+        site_extended_description: Подробное описание
+        site_short_description: Описание сервера
+        site_terms: Политика конфиденциальности
+        site_title: Имя сервера
+        theme: Тема по умолчанию
+        thumbnail: Изображение сервера
+        timeline_preview: Разрешить доступ к публичным лентам без авторизации
+        trendable_by_default: Разрешить треды без предварительной проверки
+        trends: Включить тренды
       interactions:
         must_be_follower: Присылать уведомления только от подписчиков
         must_be_following: Присылать уведомления только от людей на которых вы подписаны
@@ -194,9 +265,11 @@ ru:
         ip: IP
         severities:
           no_access: Блокировать доступ
+          sign_up_block: Заблокировать регистрацию
           sign_up_requires_approval: Ограничить регистрации
         severity: Правило
       notification_emails:
+        appeal: Кто-то обжалует решение модератора
         digest: Присылать дайджест по e-mail
         favourite: Ваш пост добавили в избранное
         follow: Новый подписчик
@@ -204,8 +277,8 @@ ru:
         mention: Новое упоминание
         pending_account: Новая заявка на создание аккаунта
         reblog: Ваш пост продвинули
-        report: Поступила новая жалоба
-        trending_tag: Актуальный хэштег требует проверки
+        report: Новое обращение отправлено
+        trending_tag: Новый тренд требует рассмотрения
       rule:
         text: Правило
       tag:
@@ -213,7 +286,19 @@ ru:
         name: Хэштег
         trendable: Разрешить показ хэштега в трендах
         usable: Разрешить использовать этот хэштег в постах
+      user:
+        role: Роль
+      user_role:
+        color: Цвет значка
+        highlighted: Отображать роль в качестве значка в профилях пользователей
+        name: Название
+        permissions_as_keys: Разрешения
+        position: Приоритет
+      webhook:
+        events: Включенные события
+        url: Endpoint URL
     'no': Нет
+    not_recommended: Не рекомендуется
     recommended: Рекомендуем
     required:
       mark: "*"
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index f24193347..96c31c374 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -35,7 +35,6 @@ sc:
         current_password: Pro chistiones de seguresa inserta sa crae de intrada de su contu atuale
         current_username: Pro cunfirmare inserta su nòmine utente de su contu atuale
         digest: Imbiadu isceti a pustis de unu perìodu longu de inatividade, e isceti si as retzidu calicunu messàgiu personale cando non bi fias
-        discoverable: Permite chi su contu tuo potzat èssere iscobertu dae persones disconnotas pro mèdiu de cussìgios e àteras optziones
         email: As a retzire unu messàgiu eletrònicu de cunfirma
         fields: Podes tènnere finas a 4 elementos ammustrados in una tabella in su profilu tuo
         header: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
@@ -61,10 +60,7 @@ sc:
       domain_allow:
         domain: Custu domìniu at a pòdere recuperare datos dae custu serbidore e is datos in intrada dae cue ant a èssere protzessados e archiviados
       email_domain_block:
-        domain: Custu podet èssere su nòmine de domìniu chi benit ammustradu in s'indiritzu de posta eletrònica, in su registru MX in ue si risolvet su domìniu o s'IP de su serbidore in ue si risolvet su registru MX. Ant a èssere verificados cun sa registratzione de s'utente e sa registratzione at a èssere refudada.
         with_dns_records: S'at a fàghere unu tentativu de risòlvere is registros DNS de su domìniu e fintzas is risultados ant a èssere blocados
-      featured_tag:
-        name: 'Forsis boles impreare unu de custos:'
       form_challenge:
         current_password: Ses intrende in un'àrea segura
       imports:
@@ -203,8 +199,6 @@ sc:
         mention: Una persone t'at mentovadu
         pending_account: Unu contu nou tenet bisòngiu de una revisione
         reblog: Una persone at cumpartzidu s'istadu tuo
-        report: Imbiu de un'informe nou
-        trending_tag: Un'eticheta non revisionada est in tendèntzia
       rule:
         text: Règula
       tag:
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
new file mode 100644
index 000000000..4127a8e7e
--- /dev/null
+++ b/config/locales/simple_form.sco.yml
@@ -0,0 +1,309 @@
+---
+sco:
+  simple_form:
+    hints:
+      account_alias:
+        acct: Gie the username@domain o the accoont thit ye'r wantin tae flit fae
+      account_migration:
+        acct: Gie the username@domain o the accoont thit ye'r wantin tae flit tae
+      account_warning_preset:
+        text: Ye kin uise post syntax, sic as URLs, hashtags an menshies
+        title: Optional. No visible tae the recipient
+      admin_account_action:
+        include_statuses: The uiser wull see whit posts causit the moderation action or warnin
+        send_email_notification: The uiser wull get a explanation o whit happent wi their accoont
+        text_html: Optional. Ye kin uise post syntax. Ye kin <a href="%{path}">add warnin presets</a> tae save time
+        type_html: Pick whit tae dae wi <strong>%{acct}</strong>
+        types:
+          disable: Stap the uiser fae uisin their accoont, but dinnae delete or hide their content.
+          none: Uise this fir tae sen a warnin tae the uiser, athoot stertin onie ither actions.
+          sensitive: Mak aw this uiser's media attachments hae a flag sayin it's sensitive.
+          silence: Stap the uiser fae bein able tae post wi public visibility, plank their posts an notes fae fowk no follaein them.
+          suspend: Stap onie interactions fae this accoont an delete its contents. Revertable athin 30 days.
+        warning_preset_id: Optional. Ye kin stull eik custom text tae the en o the preset
+      announcement:
+        all_day: Whan ticked, ainly the dates o the time range'll get shawn
+        ends_at: Optional. Annooncement wull get automatically unpublishit at this time
+        scheduled_at: Lea blank fir tae publish the annooncement the noo
+        starts_at: Optional. In case yer annooncement is boont tae a specific time range
+        text: Ye kin uise post syntax. Please be mindfae o the space the annooncement'll tak up on the uiser's screen
+      appeal:
+        text: Ye kin ainly appeal a strike the wance
+      defaults:
+        autofollow: Fowk thit signs up throu the invite wull follae ye automatic
+        avatar: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
+        bot: Signal tae ithers thit the accoont maistly performs automatit actions an mibbie wullnae be monitort
+        context: Ae or mair contexts whaur the filter shuid apply
+        current_password: Fir security purposes please pit in the passwird o the current accoont
+        current_username: Fir tae confirm, please pit in the uisernemm o the current accoont
+        digest: Ainly sent efter a lang whilie o inactivity an ainly if ye'v gotten onie personal messages whilst ye wis awa
+        discoverable: Alloo yer accoont fir tae get discovert bi strangers throu recommendations, trends an ither features
+        email: Ye'll be sent a confirmation email
+        fields: Ye kin hae up tae 4 items displayed as a table on yer profile
+        header: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
+        inbox_url: Copy the URL fae the frontpage o the relay thit ye'r wantin tae uise
+        irreversible: Filtert posts wull dizappear irreversibly, even if filter is taen aff efter
+        locale: The leid o the uiser interface, emails an push notes
+        locked: Control bi haun wha kin follae ye bi approvin follae requests
+        password: Uise at least 8 chairecters
+        phrase: Wull get matched regairdless o case in text or content warnin o a post
+        scopes: Whit APIs the application wull be allooed tae access. Gin ye dinnae pick a tap-level scope, ye dinnae need tae pick anes ane at a time.
+        setting_aggregate_reblogs: Dinnae shaw new heezes fir posts thit haes been juist heezed (ainly affects new-received heezes)
+        setting_always_send_emails: Uisually email notes wullnae get sent whan ye'r uisin Mastodon at the time
+        setting_default_sensitive: Sensitive media is hid bi defaut an kin be revealt wi a chap
+        setting_display_media_default: Hide media mairked sensitive
+        setting_display_media_hide_all: Aye hide media
+        setting_display_media_show_all: Aye shaw media
+        setting_hide_network: Wha ye follae an thaim thit follaes ye wull get hid on yer profile
+        setting_noindex: Affects yer public profile an post pages
+        setting_show_application: The application thit ye uise fir tae post wull be displayed in the detailt view o yer posts
+        setting_use_blurhash: Gradients is based aff o the colors o the image thit's hid, but ye cannae see onie details
+        setting_use_pending_items: Plank timeline updates ahin a chap insteid o automatic scrowin o the feed
+        username: Yer uisernemm wull be a ane aff on %{domain}
+        whole_word: Whan the keywird or phrase is alphanumeric ainly, it wull ainly get applied if it matches the haill wird
+      domain_allow:
+        domain: This domain wull be able tae get data fae this server an data comin in fae it wull get processed an stowed
+      email_domain_block:
+        domain: This kin be the domain nemm thit shaws up in the email address or the MX record thit it uises. They'll be checked on sign-up.
+        with_dns_records: An attempt fie tae resolve the gien domain's DNS records wull be made an the results will be dingied tae
+      featured_tag:
+        name: 'Here some o the hashtags ye uised the maist o late:'
+      filters:
+        action: Pick whit action tae dae whan a post matches the filter
+        actions:
+          hide: Totally plank the filtert content, ackin as if it didnae exist
+          warn: Plank the filtert content ahin a warnin menshiein the filter's title
+      form_admin_settings:
+        backups_retention_period: Haud generatit uiser archives fir the specified nummer o days.
+        bootstrap_timeline_accounts: Thir accoonts wull get preenit tae the tap o new uisers' follae recommendations.
+        closed_registrations_message: Displayit whan sign-ups is shut
+        content_cache_retention_period: Posts fae ither servers wull get deletit efter the specified nummer o days whan set tae a positive value. This wull mibbie be irreversible.
+        custom_css: Ye kin pit custom styles on tae the web version o Mastodon.
+        mascot: Owerrides the illustration in the advanced web interface.
+        media_cache_retention_period: Doonloadit media files wull be deletit efter the specified nummer o days whan set tae a positive value, an re-doonloadit on demand.
+        profile_directory: The profile directory lists aw uisers thit hae opted-in fir tae be discoverable.
+        require_invite_text: Whan sign-ups require approval bi haun, mak the “Hou dae ye want tae jyne?” text input mandatory raither nor optional
+        site_contact_email: Hou fowk kin reach ye fir legal or support inquiries.
+        site_contact_username: Hou fowk kin reach ye on Mastodon.
+        site_extended_description: Onie mair information thit mibbie wad be uisefae tae visitors an yer uisers. Kin be structurt wi Mairkdoon syntax.
+        site_short_description: A wee description fir tae help uniquely identify yer server. Wha is rinnin it, wha is it fir?
+        site_terms: Uise yer ain privacy policy or lea blank fir tae uise the defaut. Kin be structurt wi Mairkdoon syntax.
+        site_title: Hou fowk kin refer tae yer server asides its domain nemm.
+        theme: Theme thit logged oot visitors an new uisers see.
+        thumbnail: A rochly 2:1 image displayit alangsides yer server information.
+        timeline_preview: Logged oot visitors wull be able tae broose the maist recent public posts available on the server.
+        trendable_by_default: Jouk the review bi haun o trendin content. Individual items kin stull get taen aff trends efter the fact.
+        trends: Trends shaw whit posts, hashtags an news stories is gettin traction on yer server.
+      form_challenge:
+        current_password: Ye'r enterin a secure area
+      imports:
+        data: CSV file exportit fae anither Mastodon server
+      invite_request:
+        text: This'll help us luik ower yer application
+      ip_block:
+        comment: Optional. Mind whit ye addit this rule fir.
+        expires_in: IP addresses is a finite resoorce, they'r sometimes shared an aften chynge hauns. Fir this raison, indefinite IP dingies urnae recommendit.
+        ip: Pit in a IPv4 or IPv6 address. Ye kin dingie entire ranges uisin the CIDR syntax. Be carefu no tae snib yersel oot!
+        severities:
+          no_access: Dingie access tae aw resoorces
+          sign_up_block: New sign-ups wullnae be possible
+          sign_up_requires_approval: New sign-ups wull be wantin yer approval
+        severity: Pick whit'll happen wi requests fae this IP
+      rule:
+        text: Describe a rule or requirement fir uisers on this server. Try tae keep it short an simple
+      sessions:
+        otp: 'Pit in the twa-factor code generatit bi yer phone app or uise ane o yer recovery codes:'
+        webauthn: Gin it's a USB key be sure fir tae insert it an, if necessary, tap it.
+      tag:
+        name: Ye kin ainly chynge the case o the letters, fir example, fir tae mak it mair readable
+      user:
+        chosen_languages: Whan ticked, ainly posts in selectit leids wull be displayit in public timelines
+        role: The role controls whit permissions the uiser haes
+      user_role:
+        color: Colour tae be uised fir the role throuoot the UI, as RGB in hex format
+        highlighted: This maks the role visible publicly
+        name: Public nemm o the role, if role is set tae be displayit as a badge
+        permissions_as_keys: Uisers wi this role wull hae access tae...
+        position: Heicher role decides stramash resolution in certain situations. Certain actions kin ainly be cairried oot on thaim wi roles wi a laicher priority
+      webhook:
+        events: Pick events fir tae sen
+        url: Whaur events'll be sent tae
+    labels:
+      account:
+        fields:
+          name: Label
+          value: Content
+      account_alias:
+        acct: Haunnle o the auld accoont
+      account_migration:
+        acct: Haunnle o the new accoont
+      account_warning_preset:
+        text: Preset text
+        title: Title
+      admin_account_action:
+        include_statuses: Pit the clyped posts in the email
+        send_email_notification: Tell the uiser bi email
+        text: Custom warnin
+        type: Action
+        types:
+          disable: Freeze
+          none: Sen a warnin
+          sensitive: Sensitive
+          silence: Limit
+          suspend: Suspend
+        warning_preset_id: Uise a warnin preset
+      announcement:
+        all_day: Aw-day event
+        ends_at: En o event
+        scheduled_at: Schedule publication
+        starts_at: Stert o event
+        text: Annooncement
+      appeal:
+        text: Explain hou this decision shuid get reversed
+      defaults:
+        autofollow: Invite tae follae yer accoont
+        avatar: Avatar
+        bot: This is a bot accoont
+        chosen_languages: Filter leids
+        confirm_new_password: Confirm new passwird
+        confirm_password: Confirm passwird
+        context: Filter contexts
+        current_password: Current passwird
+        data: Data
+        discoverable: Suggest accoont tae ithers
+        display_name: Display nemm
+        email: Email address
+        expires_in: Rin oot efter
+        fields: Profile metadata
+        header: Heider
+        honeypot: "%{label} (dinnae full oot)"
+        inbox_url: URL o the relay inbox
+        irreversible: Drap insteid o plank
+        locale: Interface leid
+        locked: Require follae requests
+        max_uses: Maist nummer o uises
+        new_password: New passwird
+        note: Bio
+        otp_attempt: Twa-factor code
+        password: Passwird
+        phrase: Keywird or phrase
+        setting_advanced_layout: Turn on advanced web interface
+        setting_aggregate_reblogs: Group heezes in timelines
+        setting_always_send_emails: Aye sen email notifications
+        setting_auto_play_gif: Auto-pley animatit GIFs
+        setting_boost_modal: Shaw confirmation dialog afore heezin
+        setting_crop_images: Crap images in non-expandit posts tae 16x9
+        setting_default_language: Postin leid
+        setting_default_privacy: Postin privacy
+        setting_default_sensitive: Aye mairk media as sensitive
+        setting_delete_modal: Shaw confirmation dialog afore deletin a post
+        setting_disable_swiping: Turn aff swipin motions
+        setting_display_media: Media display
+        setting_display_media_default: Defaut
+        setting_display_media_hide_all: Plank aw
+        setting_display_media_show_all: Shaw aw
+        setting_expand_spoilers: Aye expand posts mairked wi content warnins
+        setting_hide_network: Plank yer social graph
+        setting_noindex: Opt-oot o seirch engine indexin
+        setting_reduce_motion: Reduce motion in animations
+        setting_show_application: Disclose application uised fir tae sen posts
+        setting_system_font_ui: Uise system's defaut font
+        setting_theme: Steid theme
+        setting_trends: Shaw the day's trends
+        setting_unfollow_modal: Shaw confirmation dialog afore unfollaein somebody
+        setting_use_blurhash: Shaw colourfu gradients fir hid media
+        setting_use_pending_items: Slaw mode
+        severity: Severity
+        sign_in_token_attempt: Security code
+        title: Title
+        type: Import type
+        username: Uisernemm
+        username_or_email: Uisernemm or Email
+        whole_word: Hail wird
+      email_domain_block:
+        with_dns_records: Include MX records an IPs o the domain
+      featured_tag:
+        name: Hashtag
+      filters:
+        actions:
+          hide: Plank awthegither
+          warn: Plank wi a warnin
+      form_admin_settings:
+        backups_retention_period: Uiser archive retention period
+        bootstrap_timeline_accounts: Aye recommend thir accoonts tae new uisers
+        closed_registrations_message: Custom message whan sign-ups urnae available
+        content_cache_retention_period: Content cache retention period
+        custom_css: Custom CSS
+        mascot: Custom mascot (legacy)
+        media_cache_retention_period: Media cache retention period
+        profile_directory: Enable profile directory
+        registrations_mode: Wha kin sign-up
+        require_invite_text: Require a raison fir tae jyne
+        show_domain_blocks: Shaw domain dingies
+        show_domain_blocks_rationale: Shaw whit domains war dingied fir
+        site_contact_email: Contack email
+        site_contact_username: Contact uisernemm
+        site_extended_description: Extendit description
+        site_short_description: Server description
+        site_terms: Privacy Policy
+        site_title: Server nemm
+        theme: Defaut theme
+        thumbnail: Server thoomnail
+        timeline_preview: Alloo unauthenticated access tae public timelines
+        trendable_by_default: Alloo trends athoot prior review
+        trends: Turn on trends
+      interactions:
+        must_be_follower: Dingie notes fae non-follaers
+        must_be_following: Dingie notes fae fowk ye dinnae follae
+        must_be_following_dm: Fingie direct messages fae fowk thit ye dinnae follae
+      invite:
+        comment: Comment
+      invite_request:
+        text: Whit dae ye want tae jyne fir?
+      ip_block:
+        comment: Comment
+        ip: IP
+        severities:
+          no_access: Dingie access
+          sign_up_block: Dingie sign-ups
+          sign_up_requires_approval: Limit sign-ups
+        severity: Rule
+      notification_emails:
+        appeal: Somebody appeals a moderator decision
+        digest: Sen digest emails
+        favourite: Somebody favouritit yer post
+        follow: Somebody follaed ye
+        follow_request: Somebody requestit fir tae follae ye
+        mention: Somebody menshied ye
+        pending_account: New accoont is needin reviewit
+        reblog: Somebody heezed yer post
+        report: New clype is submittit
+        trending_tag: New trend requires reviewin
+      rule:
+        text: Rule
+      tag:
+        listable: Alloo this hashtag tae appear in seirches an suggestions
+        name: Hashtag
+        trendable: Alloo this hashtag fir tae appear unner trends
+        usable: Alloo posts fir tae uise this hashtag
+      user:
+        role: Role
+      user_role:
+        color: Badge colour
+        highlighted: Display role as badge on uiser profiles
+        name: Nemm
+        permissions_as_keys: Permissions
+        position: Priority
+      webhook:
+        events: Enabilt events
+        url: Enpynt URL
+    'no': Naw
+    not_recommended: No recommendit
+    recommended: Recommendit
+    required:
+      mark: "*"
+      text: requirit
+    title:
+      sessions:
+        webauthn: Uise ane o yer security keys fir tae sign in
+    'yes': Ay
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index 9f2e0ee31..829d42e4c 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -1,38 +1,244 @@
 ---
 si:
   simple_form:
-    labels:
+    hints:
+      account_alias:
+        acct: ඔබට ගෙන යාමට අවශ්‍ය ගිණුමේ username@domain සඳහන් කරන්න
+      account_migration:
+        acct: ඔබට යාමට අවශ්‍ය ගිණුමේ username@domain සඳහන් කරන්න
+      account_warning_preset:
+        text: ඔබට URL, හෑෂ් ටැග් සහ සඳහන් කිරීම් වැනි පෝස්ට් සින්ටැක්ස් භාවිතා කළ හැක
+        title: විකල්ප. ලබන්නාට නොපෙනේ
       admin_account_action:
+        include_statuses: මධ්‍යස්ථ ක්‍රියාව හෝ අනතුරු ඇඟවීමට හේතු වී ඇත්තේ කුමන පළ කිරීම්දැයි පරිශීලකයා දකිනු ඇත
+        send_email_notification: පරිශීලකයාට ඔවුන්ගේ ගිණුම සමඟ සිදු වූ දේ පිළිබඳ පැහැදිලි කිරීමක් ලැබෙනු ඇත
+        text_html: විකල්ප. ඔබට post syntax භාවිතා කළ හැක. කාලය ඉතිරි කර ගැනීම සඳහා ඔබට අනතුරු ඇඟවීමේ</a> <a href="%{path}">කළ හැක
+        type_html: "<strong>%{acct}</strong>සමඟ කළ යුතු දේ තෝරන්න"
+        types:
+          disable: පරිශීලකයාගේ ගිණුම භාවිතා කිරීමෙන් වළක්වන්න, නමුත් ඔවුන්ගේ අන්තර්ගතය මකා දැමීම හෝ සඟවන්න එපා.
+          none: වෙනත් ක්‍රියාවක් අවුලුවාලීමකින් තොරව, පරිශීලකයාට අනතුරු ඇඟවීමක් යැවීමට මෙය භාවිතා කරන්න.
+          sensitive: මෙම පරිශීලකයාගේ සියලුම මාධ්‍ය ඇමුණුම් සංවේදී ලෙස සලකුණු කිරීමට බල කරන්න.
+          silence: පරිශීලකයාට පොදු දෘශ්‍යතාව සමඟ පළ කිරීමට හැකි වීම වළක්වන්න, ඔවුන් අනුගමනය නොකරන පුද්ගලයින්ගෙන් ඔවුන්ගේ පළ කිරීම් සහ දැනුම්දීම් සඟවන්න.
+          suspend: මෙම ගිණුමෙන් හෝ මෙම ගිණුමට යම් අන්තර්ක්‍රියා වළක්වා එහි අන්තර්ගතය මකා දමන්න. දින 30 ක් ඇතුළත ආපසු හැරවිය හැකිය.
+        warning_preset_id: විකල්ප. ඔබට තවමත් පෙරසිටුවීමේ අවසානයට අභිරුචි පෙළ එක් කළ හැක
+      announcement:
+        all_day: පරීක්ෂා කළ විට, කාල පරාසයේ දින පමණක් දර්ශනය වනු ඇත
+        ends_at: විකල්ප. මෙම අවස්ථාවේදී නිවේදනය ස්වයංක්‍රීයව ප්‍රකාශනය කිරීමෙන් ඉවත් වනු ඇත
+        scheduled_at: නිවේදනය වහාම ප්‍රකාශයට පත් කිරීමට හිස්ව තබන්න
+        starts_at: විකල්ප. ඔබගේ නිවේදනය නිශ්චිත කාල පරාසයකට බැඳී ඇත්නම්
+        text: ඔබට post syntax භාවිතා කළ හැක. කරුණාකර පරිශීලකයාගේ තිරය මත නිවේදනය ලබා ගන්නා ඉඩ ගැන සැලකිලිමත් වන්න
+      appeal:
+        text: ඔබට වර්ජනයකට අභියාචනා කළ හැක්කේ එක් වරක් පමණි
+      defaults:
+        autofollow: ආරාධනාව හරහා ලියාපදිංචි වන පුද්ගලයින් ස්වයංක්‍රීයව ඔබව අනුගමනය කරනු ඇත
+        avatar: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
+        bot: ගිණුම ප්‍රධාන වශයෙන් ස්වයංක්‍රීය ක්‍රියා සිදු කරන බවත් නිරීක්ෂණය නොකළ හැකි බවත් අන් අයට සංඥා කරන්න
+        context: පෙරහන යෙදිය යුතු සන්දර්භ එකක් හෝ කිහිපයක්
+        current_password: ආරක්ෂක අරමුණු සඳහා කරුණාකර ජංගම ගිණුමේ මුරපදය ඇතුළත් කරන්න
+        current_username: තහවුරු කිරීමට, කරුණාකර වත්මන් ගිණුමේ පරිශීලක නාමය ඇතුළත් කරන්න
+        digest: දිගු කාලයක් අක්‍රියව සිටීමෙන් පසුව පමණක් යවන ලද අතර ඔබ නොමැති විට ඔබට කිසියම් පුද්ගලික පණිවිඩයක් ලැබී ඇත්නම් පමණි
+        discoverable: නිර්දේශ, ප්‍රවණතා සහ වෙනත් විශේෂාංග හරහා ඔබේ ගිණුම ආගන්තුකයන්ට සොයා ගැනීමට ඉඩ දෙන්න
+        email: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑලක් එවනු ලැබේ
+        fields: ඔබට ඔබගේ පැතිකඩෙහි වගුවක් ලෙස අයිතම 4ක් දක්වා පෙන්විය හැක
+        header: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
+        inbox_url: ඔබට භාවිතා කිරීමට අවශ්‍ය රිලේ හි මුල් පිටුවෙන් URL එක පිටපත් කරන්න
+        irreversible: පෙරහන පසුව ඉවත් කළද, පෙරූ පළ කිරීම් ආපසු හැරවිය නොහැකි ලෙස අතුරුදහන් වනු ඇත
+        locale: පරිශීලක අතුරුමුහුණතේ භාෂාව, ඊමේල් සහ තල්ලු දැනුම්දීම්
+        locked: අනුගමන ඉල්ලීම් අනුමත කිරීමෙන් ඔබව අනුගමනය කළ හැක්කේ කාටදැයි හස්තීයව පාලනය කරන්න
+        password: අවම වශයෙන් අක්ෂර 8 ක් භාවිතා කරන්න
+        phrase: පළ කිරීමක පෙළ හෝ අන්තර්ගත අනතුරු ඇඟවීම නොසලකා ගැලපේ
+        scopes: යෙදුමට ප්‍රවේශ වීමට ඉඩ දෙන්නේ කුමන API වලටද. ඔබ ඉහළ මට්ටමේ විෂය පථයක් තෝරා ගන්නේ නම්, ඔබට තනි ඒවා තෝරා ගැනීමට අවශ්‍ය නොවේ.
+        setting_aggregate_reblogs: මෑතකදී බූස්ට් කරන ලද පළ කිරීම් සඳහා නව බූස්ට් පෙන්වන්න එපා (අලුතින් ලැබුණු බූස්ට් වලට පමණක් බලපායි)
+        setting_always_send_emails: සාමාන්‍යයෙන් ඔබ Mastodon සක්‍රියව භාවිතා කරන විට විද්‍යුත් තැපැල් දැනුම්දීම් නොයවනු ඇත
+        setting_default_sensitive: සංවේදී මාධ්‍ය පෙරනිමියෙන් සඟවා ඇති අතර ක්ලික් කිරීමකින් හෙළිදරව් කළ හැක
+        setting_display_media_default: සංවේදී ලෙස සලකුණු කළ මාධ්‍ය සඟවන්න
+        setting_display_media_hide_all: සෑම විටම මාධ්‍ය සඟවන්න
+        setting_display_media_show_all: සෑම විටම මාධ්‍ය පෙන්වන්න
+        setting_hide_network: ඔබ අනුගමනය කරන්නේ කවුරුන්ද සහ ඔබව අනුගමනය කරන්නේ කවුරුන්ද යන්න ඔබගේ පැතිකඩෙහි සඟවනු ඇත
+        setting_noindex: ඔබගේ පොදු පැතිකඩ සහ පළ කිරීම් පිටු වලට බලපායි
+        setting_show_application: ඔබ පළ කිරීමට භාවිතා කරන යෙදුම ඔබගේ පළ කිරීම් වල සවිස්තරාත්මක දර්ශනයේ පෙන්වනු ඇත
+        setting_use_blurhash: අනුක්‍රමණ සැඟවුණු දෘශ්‍යවල වර්ණ මත පදනම් වන නමුත් ඕනෑම විස්තරයක් අපැහැදිලි කරයි
+        setting_use_pending_items: සංග්‍රහය ස්වයංක්‍රීයව අනුචලනය කරනවා වෙනුවට ක්ලික් කිරීමක් පිටුපස කාලරේඛා යාවත්කාලීන සඟවන්න
+        username: ඔබගේ පරිශීලක නාමය %{domain}හි අද්විතීය වනු ඇත
+        whole_word: මූල පදය හෝ වාක්‍ය ඛණ්ඩය අක්ෂරාංක පමණක් වන විට, එය යෙදෙන්නේ එය සම්පූර්ණ වචනයට ගැලපේ නම් පමණි
+      domain_allow:
+        domain: මෙම වසමට මෙම සේවාදායකයෙන් දත්ත ලබා ගැනීමට හැකි වන අතර එයින් ලැබෙන දත්ත සකස් කර ගබඩා කරනු ලැබේ
+      email_domain_block:
+        domain: මෙය විද්‍යුත් තැපැල් ලිපිනයේ හෝ එය භාවිතා කරන MX වාර්තාවේ පෙන්වන ඩොමේන් නාමය විය හැක. ලියාපදිංචි වූ පසු ඒවා පරීක්ෂා කරනු ලැබේ.
+        with_dns_records: ලබා දී ඇති වසමේ DNS වාර්තා විසඳීමට උත්සාහ කරන අතර ප්‍රතිඵල ද අවහිර කරනු ලැබේ
+      filters:
+        action: පළ කිරීමක් පෙරහනට ගැළපෙන විට සිදු කළ යුතු ක්‍රියාව තෝරන්න
+        actions:
+          hide: පෙරහන් කළ අන්තර්ගතය සම්පූර්ණයෙන්ම සඟවන්න, එය නොපවතින ලෙස හැසිරෙන්න
+          warn: පෙරහන මාතෘකාව සඳහන් කරන අනතුරු ඇඟවීමක් පිටුපස පෙරූ අන්තර්ගතය සඟවන්න
+      form_challenge:
+        current_password: ඔබ ආරක්ෂිත ප්‍රදේශයකට ඇතුල් වේ
+      imports:
+        data: CSV ගොනුව වෙනත් Mastodon සේවාදායකයකින් අපනයනය කරන ලදී
+      invite_request:
+        text: මෙය ඔබගේ අයදුම්පත සමාලෝචනය කිරීමට අපට උපකාරී වනු ඇත
+      ip_block:
+        comment: විකල්ප. ඔබ මෙම රීතිය එක් කළේ මන්දැයි මතක තබා ගන්න.
+        expires_in: IP ලිපින යනු සීමිත සම්පතකි, ඒවා සමහර විට බෙදාගෙන ඇති අතර බොහෝ විට අත් වෙනස් වේ. මෙම හේතුව නිසා අවිනිශ්චිත IP වාරණ නිර්දේශ නොකරයි.
+        ip: IPv4 හෝ IPv6 ලිපිනයක් ඇතුළත් කරන්න. ඔබට CIDR සින්ටැක්ස් භාවිතයෙන් සම්පූර්ණ පරාසයන් අවහිර කළ හැක. ඔබව අගුලු නොදැමීමට ප්‍රවේශම් වන්න!
+        severities:
+          no_access: සියලු සම්පත් වෙත ප්‍රවේශය අවහිර කරන්න
+          sign_up_requires_approval: නව ලියාපදිංචි කිරීම් සඳහා ඔබේ අනුමැතිය අවශ්‍ය වනු ඇත
+        severity: මෙම IP වෙතින් ඉල්ලීම් සමඟ කුමක් සිදුවේද යන්න තෝරන්න
+      rule:
+        text: මෙම සේවාදායකයේ භාවිතා කරන්නන් සඳහා රීතියක් හෝ අවශ්‍යතාවයක් විස්තර කරන්න. එය කෙටි හා සරල කිරීමට උත්සාහ කරන්න
+      sessions:
+        otp: 'ඔබගේ දුරකථන යෙදුම මගින් උත්පාදනය කරන ලද ද්වි-සාධක කේතය ඇතුළු කරන්න හෝ ඔබගේ ප්‍රතිසාධන කේත වලින් එකක් භාවිතා කරන්න:'
+        webauthn: එය USB යතුරක් නම්, එය ඇතුළු කිරීමට වග බලා ගන්න, අවශ්ය නම්, එය තට්ටු කරන්න.
+      tag:
+        name: ඔබට අකුරු වල ආවරණය පමණක් වෙනස් කළ හැකිය, උදාහරණයක් ලෙස, එය වඩාත් කියවිය හැකි කිරීමට
+      user:
+        chosen_languages: පරීක්ෂා කළ විට, තෝරාගත් භාෂාවලින් පළ කිරීම් පමණක් පොදු කාලරේඛා තුළ සංදර්ශන කෙරේ
+      webhook:
+        events: යැවීමට සිදුවීම් තෝරන්න
+        url: සිදුවීම් යවනු ලබන ස්ථානය
+    labels:
+      account:
+        fields:
+          name: නම්පත
+          value: අන්තර්ගතය
+      account_alias:
+        acct: පැරණි ගිණුමේ හැසිරවීම
+      account_migration:
+        acct: නව ගිණුමේ හැසිරවීම
+      account_warning_preset:
+        text: පෙර සැකසූ පෙළ
+        title: ශීර්ෂය
+      admin_account_action:
+        include_statuses: විද්‍යුත් තැපෑලෙහි වාර්තා කරන ලද පළ කිරීම් ඇතුළත් කරන්න
+        send_email_notification: විද්‍යුත් තැපෑලෙන් පරිශීලකයාට දැනුම් දෙන්න
+        text: අභිරුචි අනතුරු ඇඟවීම
         type: ක්‍රියාමාර්ගය
         types:
-          sensitive: සංවේදීතාව
+          disable: කැටි කරන්න
+          none: අනතුරු ඇඟවීමක් යවන්න
+          sensitive: පවතී
+          silence: සීමාව
           suspend: අත්හිටුවන්න
+        warning_preset_id: අනතුරු ඇඟවීමේ පෙරසිටුවක් භාවිතා කරන්න
+      announcement:
+        all_day: දවස පුරා සිදුවීම
+        ends_at: සිදුවීමේ අවසානය
+        scheduled_at: උපලේඛන ප්රකාශනය
+        starts_at: සිදුවීමේ ආරම්භය
+        text: නිවේදනය
+      appeal:
+        text: මෙම තීරණය ආපසු හැරවිය යුත්තේ මන්දැයි පැහැදිලි කරන්න
       defaults:
+        autofollow: ඔබගේ ගිණුම අනුගමනය කිරීමට ආරාධනා කරන්න
+        avatar: අවතාරය
         bot: මෙය ස්වයං ක්‍රමලේඛගත ගිණුමකි
+        chosen_languages: භාෂා පෙරහන් කරන්න
         confirm_new_password: නව මුර පදය තහවුරු කරන්න
-        confirm_password: මුරපදය තහවුරු කරන්න
+        confirm_password: මුරපදය තහවුරු කර ඇත
+        context: සන්දර්භ පෙරහන් කරන්න
+        current_password: වත්මන් මුර පදය
         data: දත්ත
+        discoverable: අන් අයට ගිණුමක් යෝජනා කරන්න
+        display_name: ප්රදර්ශන නාමය
         email: වි-තැපැල් ලිපිනය
+        expires_in: පසු කල් ඉකුත් වේ
+        fields: පැතිකඩ පාරදත්ත
+        header: ශීර්ෂකය
+        honeypot: "%{label} (පුරවන්න එපා)"
+        inbox_url: රිලේ එන ලිපි URL
+        irreversible: සැඟවීම වෙනුවට අතහරින්න
+        locale: අතුරු මුහුණත භාෂාව
+        locked: ඉල්ලීම් අනුගමනය කිරීම අවශ්‍ය වේ
+        max_uses: උපරිම භාවිත ගණන
         new_password: නව මුරපදය
-        password: මුර පදය
+        note: ජෛව
+        otp_attempt: ද්වි සාධක කේතය
+        password: මුරපදය
+        phrase: මූල පදය හෝ වාක්‍ය ඛණ්ඩය
+        setting_advanced_layout: උසස් වෙබ් අතුරු මුහුණත සබල කරන්න
+        setting_aggregate_reblogs: කණ්ඩායම් කාලරේඛාව වැඩි කරයි
+        setting_always_send_emails: සෑම විටම විද්‍යුත් තැපැල් දැනුම්දීම් යවන්න
+        setting_auto_play_gif: සජීවිකරණ GIF ස්වයංක්‍රීයව ධාවනය කරන්න
+        setting_boost_modal: වැඩි කිරීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න
+        setting_crop_images: ප්‍රසාරණය නොකළ පළ කිරීම් වල පින්තූර 16x9 දක්වා කප්පාදු කරන්න
+        setting_default_language: පළ කිරීමේ භාෂාව
+        setting_default_privacy: පුද්ගලිකත්වය පළ කිරීම
+        setting_default_sensitive: සෑම විටම මාධ්‍ය සංවේදී ලෙස සලකුණු කරන්න
+        setting_delete_modal: පළ කිරීමක් මැකීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න
+        setting_disable_swiping: ස්වයිප් චලන අක්‍රීය කරන්න
+        setting_display_media: මාධ්ය සංදර්ශකය
+        setting_display_media_default: පෙරනිමිය
         setting_display_media_hide_all: සියල්ල සඟවන්න
         setting_display_media_show_all: සියල්ල පෙන්වන්න
+        setting_expand_spoilers: අන්තර්ගත අනතුරු ඇඟවීම් සමඟ සලකුණු කර ඇති පළ කිරීම් සැමවිටම පුළුල් කරන්න
         setting_hide_network: ඔබගේ ජාලය සඟවන්න
+        setting_noindex: සෙවුම් යන්ත්‍ර සුචිගත කිරීමෙන් ඉවත් වීම
+        setting_reduce_motion: සජීවිකරණවල චලනය අඩු කරන්න
+        setting_show_application: පළ කිරීම් යැවීමට භාවිතා කරන යෙදුම හෙළි කරන්න
+        setting_system_font_ui: පද්ධතියේ පෙරනිමි අකුරු භාවිතා කරන්න
         setting_theme: අඩවියේ තේමාව
+        setting_trends: අද ප්‍රවණතා පෙන්වන්න
+        setting_unfollow_modal: යමෙකු අනුගමනය නොකිරීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න
+        setting_use_blurhash: සැඟවුණු මාධ්‍ය සඳහා වර්ණවත් අනුක්‍රමික පෙන්වන්න
+        setting_use_pending_items: මන්දගාමී මාදිලිය
+        severity: බරපතලකම
         sign_in_token_attempt: ආරක්‍ෂණ කේතය
+        title: ශීර්ෂය
+        type: ආයාත වර්ගය
         username: පරිශීලක නාමය
-        username_or_email: පරිශීලක නාමය හෝ වි-තැපෑල
+        username_or_email: පරි. නාමය හෝ වි-තැපෑල
         whole_word: සමස්ත වචනය
+      email_domain_block:
+        with_dns_records: වසමෙහි MX වාර්තා සහ IP ඇතුළත් කරන්න
+      featured_tag:
+        name: හෑෂ් ටැගය
+      filters:
+        actions:
+          hide: සම්පූර්ණයෙන්ම සඟවන්න
+          warn: අනතුරු ඇඟවීමක් සමඟ සඟවන්න
+      interactions:
+        must_be_follower: අනුගාමිකයින් නොවන අයගේ දැනුම්දීම් අවහිර කරන්න
+        must_be_following: ඔබ අනුගමනය නොකරන පුද්ගලයින්ගේ දැනුම්දීම් අවහිර කරන්න
+        must_be_following_dm: ඔබ අනුගමනය නොකරන පුද්ගලයින්ගෙන් සෘජු පණිවිඩ අවහිර කරන්න
       invite:
         comment: අදහස
+      invite_request:
+        text: ඔබට එක් වීමට අවශ්‍ය ඇයි?
       ip_block:
         comment: අදහස
         ip: අ.ජා. කෙ. (IP)
         severities:
-          no_access: ප්‍රවේශය අවහිර කරන්න
+          no_access: ප්රවේශය අවහිර කරන්න
+          sign_up_requires_approval: ලියාපදිංචි වීම සීමා කරන්න
         severity: නීතිය
+      notification_emails:
+        appeal: යමෙක් උපපරිපාලක තීරණයකට අභියාචනා කරයි
+        digest: digest ඊමේල් යවන්න
+        favourite: කවුරුහරි ඔබේ පළ කිරීම ප්‍රිය කළා
+        follow: කවුරුහරි ඔබව අනුගමනය කළා
+        follow_request: කවුරුහරි ඔබව අනුගමනය කරන ලෙස ඉල්ලා සිටියේය
+        mention: කවුරුහරි ඔබව සඳහන් කළා
+        pending_account: නව ගිණුම සමාලෝචනය අවශ්‍යයි
+        reblog: කවුරුහරි ඔබේ පළ කිරීම වැඩි කළා
+        report: නව වාර්තාවක් ඉදිරිපත් කෙරේ
+        trending_tag: නව ප්‍රවණතාවයට සමාලෝචනයක් අවශ්‍ය වේ
+      rule:
+        text: නීතිය
+      tag:
+        listable: මෙම හැෂ් ටැගය සෙවීම් සහ යෝජනා වල දිස් වීමට ඉඩ දෙන්න
+        name: හෑෂ් ටැගය
+        trendable: මෙම හැෂ් ටැගය ප්‍රවණතා යටතේ දිස් වීමට ඉඩ දෙන්න
+        usable: මෙම හැෂ් ටැගය භාවිතා කිරීමට පළ කිරීම් වලට ඉඩ දෙන්න
+      webhook:
+        events: සබල කළ සිදුවීම්
+        url: අන්ත ලක්ෂ්‍ය URL
+    'no': නැත
     recommended: නිර්දේශිත
     required:
       mark: "*"
       text: අවශ්‍යයි
+    title:
+      sessions:
+        webauthn: පුරනය වීමට ඔබගේ ආරක්ෂක යතුරු වලින් එකක් භාවිතා කරන්න
     'yes': ඔව්
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 01995011e..18a3b032f 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -22,7 +22,6 @@ sk:
         current_password: Z bezpečtnostných dôvodov prosím zadaj heslo súčasného účtu
         current_username: Pre potvrdenie prosím zadaj prezývku súčasného účtu
         digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdržal/a nejaké osobné správy kým si bol/a preč
-        discoverable: Zoznam profilov predstavuje ďalšiu cestu akou tvoj účet môže dosiahnúť väčšie publikum
         email: Bude ti odoslaný potvrdzujúci email
         fields: Až štyri položky môžeš mať na svojom profile zobrazené vo forme tabuľky
         header: PNG, GIF, alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
@@ -47,14 +46,15 @@ sk:
         whole_word: Ak je kľúčové slovo, alebo fráza poskladaná iba s písmen a čísel, bude použité iba ak sa zhoduje s celým výrazom
       domain_allow:
         domain: Táto doména bude schopná získavať dáta z tohto servera, a prichádzajúce dáta ním budú spracovávané a uložené
-      featured_tag:
-        name: 'Možno by si chcel/a použiť niektoré z týchto:'
       form_challenge:
         current_password: Vstupuješ do zabezpečenej časti
       imports:
         data: CSV súbor vyexportovaný z iného Mastodon serveru
       invite_request:
         text: Toto pomôže s vyhodnocovaním tvojej žiadosti
+      ip_block:
+        severities:
+          sign_up_block: Nové registrácie nebudú možné
       sessions:
         otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:'
       tag:
@@ -112,7 +112,7 @@ sk:
         max_uses: Najviac možno použiť
         new_password: Nové heslo
         note: O tebe
-        otp_attempt: Dvoj-faktorový overovací (2FA) kód
+        otp_attempt: Dvoj-faktorový overovací kód
         password: Heslo
         phrase: Kľúčové slovo, alebo fráza
         setting_advanced_layout: Zapni pokročilé užívateľské rozhranie
@@ -140,6 +140,7 @@ sk:
         setting_use_blurhash: Ukáž farebné prechody pre skryté médiá
         setting_use_pending_items: Pomalý režim
         severity: Závažnosť
+        sign_in_token_attempt: Bezpečnostný kód
         type: Typ importu
         username: Prezývka
         username_or_email: Prezývka, alebo email
@@ -154,6 +155,9 @@ sk:
         comment: Okomentuj
       invite_request:
         text: Prečo sa k nám chceš pridať?
+      ip_block:
+        comment: Komentár
+        severity: Pravidlo
       notification_emails:
         digest: Zasielať súhrnné emaily
         favourite: Zaslať email, ak si niekto obľúbi tvoj príspevok
@@ -162,8 +166,6 @@ sk:
         mention: Zaslať email, ak ťa niekto spomenie vo svojom príspevku
         pending_account: Zaslať email, ak treba prehodnotiť nový účet
         reblog: Zaslať email, ak niekto re-tootne tvoj príspevok
-        report: Zaslať email, ak niekto podá nové nahlásenie
-        trending_tag: Pošli email, ak sa neoverený haštag stane populárnym
       tag:
         listable: Povoľ zobrazovanie tohto haštagu v zozname profilov
         name: Haštag
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 20a07eccb..30d0b24e4 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -2,70 +2,164 @@
 sl:
   simple_form:
     hints:
+      account_alias:
+        acct: Določite uporabniškoime@domena računa, od katerega se želite preseliti
+      account_migration:
+        acct: Določite uporabniškoime@domena računa, na katerega se želite preseliti
       account_warning_preset:
-        text: Lahko uporabite skladnjo tuta, kot so URL-ji, ključniki in omembe
+        text: Lahko uporabite skladnjo objave, kot so URL-ji, ključniki in omembe
+        title: Neobvezno. Ni vidno prejemniku
       admin_account_action:
+        include_statuses: Uporabnik vidi, katere objave so povzročile dejanje moderiranja ali opozorilo
         send_email_notification: Uporabnik bo prejel razlago, kaj se je zgodilo z njihovim računom
-        text_html: Neobvezno. Lahko uporabite skladnjo tuta. <a href="%{path}">Prednastavite opozorila</a>, da prihranite čas
+        text_html: Neobvezno. Lahko uporabite skladnjo objave. <a href="%{path}">Prednastavite opozorila</a>, da prihranite čas
         type_html: Izberite, kaj boste storili z <strong>%{acct}</strong>
+        types:
+          disable: Preprečite uporabniku, da uporablja svoj račun, vendar ne izbrišite ali skrijte njegove vsebine.
+          none: Uporabite to, da pošljete opozorilo uporabnik, ne da bi sprožili kakšno drugo dejanje.
+          sensitive: Vsilite, da so vse medijske priponke tega uporabnika označene kot občutljive.
+          silence: Prepreči uporabniku, da lahko objavlja javno, skrije njihove objave in obvestila pred osebami, ki mu ne sledijo.
+          suspend: Prepreči vsakršno interakcijo od ali do tega računa in izbriše njegovo vsebino. Povratno v roku 30 dni.
         warning_preset_id: Neobvezno. Še vedno lahko dodate besedilo po meri na konec prednastavitve
+      announcement:
+        all_day: Če je potrjeno, bodo prikazani le datumi časovnega obsega
+        ends_at: Neobvezno. Obvestilo bo samodejno neobjavljeno v navedenem času
+        scheduled_at: Pustite prazno, da objavite obvestilo takoj
+        starts_at: Neobvezno. V primeru, da je vaše obvestilo vezano na določen časovni obseg
+        text: Uporabite lahko skladnjo objav. Pazite na prostor, ki ga zavzame obvestilo na zaslonu uporabnika
+      appeal:
+        text: Na ukrep se lahko pritožite le enkrat
       defaults:
         autofollow: Osebe, ki se prijavijo prek povabila, vas bodo samodejno sledile
         avatar: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
         bot: Ta račun v glavnem opravlja samodejna dejanja in morda ni pod nadzorom
         context: En ali več kontekstov, kjer naj se uporabi filter
+        current_password: Iz varnostnih razlogov vnesite geslo trenutnega računa
+        current_username: Za potrditev vnesite uporabniško ime trenutnega računa
         digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti
+        discoverable: Dovolite, da vaš račun odkrijejo neznanci prek priporočil, trendov in drugih funkcij
         email: Poslali vam bomo potrditveno e-pošto
         fields: Na svojem profilu lahko imate do 4 predmete prikazane kot tabelo.
         header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
         inbox_url: Kopirajte URL naslov s prve strani releja, ki ga želite uporabiti
-        irreversible: Filtrirani trobi bodo nepovratno izginili, tudi če je filter kasneje odstranjen
+        irreversible: Filtrirane objave bodo nepovratno izginile, tudi če je filter kasneje odstranjen
         locale: Jezik uporabniškega vmesnika, e-poštnih sporočil in potisnih obvestil
         locked: Zahteva, da ročno odobrite sledilce
         password: Uporabite najmanj 8 znakov
-        phrase: Se bo ujemal, ne glede na začetnice v tekstu ali opozorilo o vsebini troba
+        phrase: Se bo ujemal, ne glede na začetnice v besedilu ali opozorilo o vsebini objave
         scopes: Do katerih API-jev bo imel program dostop. Če izberete obseg najvišje ravni, vam ni treba izbrati posameznih.
-        setting_aggregate_reblogs: Ne prikažite novih spodbud za tute, ki so bili nedavno spodbujeni (vpliva samo na novo prejete spodbude)
+        setting_aggregate_reblogs: Ne prikažite novih izpostavitev za objave, ki so bile nedavno izpostavljene (vpliva samo na novo prejete izpostavitve)
+        setting_always_send_emails: Običajno e-obvestila ne bodo poslana, če ste na Mastodonu dejavni
         setting_default_sensitive: Občutljivi mediji so privzeto skriti in jih je mogoče razkriti s klikom
         setting_display_media_default: Skrij medij, ki je označen kot občutljiv
         setting_display_media_hide_all: Vedno skrij vse medije
         setting_display_media_show_all: Vedno pokaži medij, ki je označen kot občutljiv
         setting_hide_network: Kogar spremljate in kdo vas spremlja ne bo prikazano na vašem profilu
-        setting_noindex: Vpliva na vaš javni profil in na strani s stanjem
-        setting_show_application: Aplikacija, ki jo uporabljate za tutanje, bo prikazana v podrobnem pogledu vaših tutov
-        setting_use_blurhash: Gradienti temeljijo na barvah skrite vizualne slike, vendar zakrivajo vse podrobnosti
+        setting_noindex: Vpliva na vaš javni profil in na strani z objavami
+        setting_show_application: Aplikacija, ki jo uporabljate za objavljanje, bo prikazana v podrobnem pogledu vaših objav
+        setting_use_blurhash: Prelivi temeljijo na barvah skrite vizualne slike, vendar zakrivajo vse podrobnosti
         setting_use_pending_items: Skrij posodobitev časovnice za klikom namesto samodejnega posodabljanja
         username: Vaše uporabniško ime bo edinstveno na %{domain}
         whole_word: Ko je ključna beseda ali fraza samo alfanumerična, se bo uporabljala le, če se bo ujemala s celotno besedo
       domain_allow:
         domain: Ta domena bo lahko prejela podatke s tega strežnika, dohodni podatki z nje pa bodo obdelani in shranjeni
+      email_domain_block:
+        domain: To je lahko ime domene, ki se pokaže v e-poštnem naslovu, ali zapis MX, ki ga uporablja. Ob prijavi bo preverjeno.
+        with_dns_records: Poskus razrešitve zapisov DNS danih domen bo izveden in rezultati bodo prav tako blokirani
       featured_tag:
-        name: 'Morda boste želeli uporabiti eno od teh:'
+        name: 'Tukaj je nekaj ključnikov, ki ste jih nedavno uporabili:'
+      filters:
+        action: Izberite, kako naj se program vede, ko se objava sklada s filtrom
+        actions:
+          hide: Povsem skrij filtrirano vsebino, kot da ne bi obstajala
+          warn: Skrij filtrirano vsebino za opozorilom, ki pomenja naslov filtra
+      form_admin_settings:
+        backups_retention_period: Hani tvorjene arhive uporabnikov navedeno število dni.
+        bootstrap_timeline_accounts: Ti računi bodo pripeti na vrh priporočenih sledenj za nove uporabnike.
+        closed_registrations_message: Prikazano, ko so registracije zaprte
+        content_cache_retention_period: Objave z drugih strežnikov bodo izbrisane po navedenem številu dni, če je vrednost pozitivna. Ta dejanja lahko nepovratna.
+        custom_css: Spletni različici Mastodona lahko uveljavite sloge po meri.
+        mascot: Preglasi ilustracijo v naprednem spletnem vmesniku.
+        media_cache_retention_period: Prenesene predstavnostne datoteke bodo izbrisane po navedenem številu dni, če je vrednost pozitivna, in ponovno prenesene na zahtevo.
+        profile_directory: Imenik profilov izpiše vse uporabnike, ki so dovolili, da so v njem navedeni.
+        require_invite_text: Če registracije zahtevajo ročno potrditev, nastavite vnos besedila pod »Zakaj se želite pridružiti?« za obveznega.
+        site_contact_email: Kako vas lahko uporabniki dosežejo glede pravnih ali podpornih vprašanj.
+        site_contact_username: Kako vas lahko kontaktirajo na Mastodonu.
+        site_extended_description: Dodajte podatke, ki so lahko uporabni za obiskovalce in uporabnike. Vsebino lahko oblikujete s skladnjo Markdown.
+        site_short_description: Kratek opis v pomoč za identifikacijo vašega strežnika. Kdo ga vzdržuje, komu je namenjen?
+        site_terms: Uporabite svoj lasten pravilnik o zasebnosti ali pustite prazno za privzetega. Lahko ga strukturirate s skladnjo Markdown.
+        site_title: Kako naj imenujejo vaš strežnik poleg njegovega domenskega imena.
+        theme: Tema, ki jo vidijo odjavljeni obiskovalci in novi uporabniki.
+        thumbnail: Slika v razmerju stranic približno 2:1, prikazana vzdolž podatkov o vašem strežniku.
+        timeline_preview: Odjavljeni obiskovalci bodo lahko brskali po najnovejših javnih objavah, ki so na voljo na strežniku.
+        trendable_by_default: Preskočite ročni pregled vsebine v trendu. Posamezne elemente še vedno lahko odstranite iz trenda post festum.
+        trends: Trendi prikažejo, katere objave, ključniki in novice privlačijo zanimanje na vašem strežniku.
+      form_challenge:
+        current_password: Vstopate v varovano območje
       imports:
         data: Izvožena CSV datoteka iz drugega Mastodon vozlišča
       invite_request:
         text: To nam bo pomagalo pregledati vašo prijavo
+      ip_block:
+        comment: Neobvezno. Spomnite se, zakaj ste dodali to pravilo.
+        expires_in: Naslovi IP so končno imejen vir, včasij si jih delimo in pogosto menjajo rabo. Zato nedoločeni bloki IP niso priporočeni.
+        ip: Vnesite naslov IPv4 oz. IPv6. S skladnjo CIDR lahko blokirate celotne obsege. Pazite, da se ne zaklenete ven!
+        severities:
+          no_access: Blokiraj dostop do vseh virov
+          sign_up_block: Nove registracije ne bodo možne
+          sign_up_requires_approval: Za nove registracije bo potrebna vaša odobritev
+        severity: Izberite, kaj se bo zgodilo z zahtevami iz tega IP-naslova
+      rule:
+        text: Opišite pravilo ali zahtevo za uporabnike na tem strežniku. Poskusite biti kratki in jasni
       sessions:
         otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaših obnovitvenih kod:'
+        webauthn: Če gre za ključek USB, ga ne pozabite vstaviti in, če je potrebno, tapniti.
+      tag:
+        name: Spremenite lahko le npr. velikost črk (velike/male), da je bolj berljivo
       user:
-        chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazani samo trobi v izbranih jezikih
+        chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazane samo objave v izbranih jezikih
+        role: Vloga nadzira, katere pravice ima uporabnik
+      user_role:
+        color: Barva, uporabljena za vlogo po celem up. vmesniku, podana v šestnajstiškem zapisu RGB
+        highlighted: S tem je vloga javno vidna
+        name: Javno ime vloge, če naj bo vloga prikazana kot priponka
+        permissions_as_keys: Uporabniki s to vlogo bodo imeli dostop do ...
+        position: Višja vloga se odloča o razrešitvi sporov v določenih situacijah. Določena dejanja lahko izvede le na vlogah z nižjo prioriteto
+      webhook:
+        events: Izberite dogodke za pošiljanje
+        url: Kam bodo poslani dogodki
     labels:
       account:
         fields:
           name: Oznaka
           value: Vsebina
+      account_alias:
+        acct: Ročica starega računa
+      account_migration:
+        acct: Ročica novega računa
       account_warning_preset:
         text: Prednastavljeno besedilo
+        title: Naslov
       admin_account_action:
+        include_statuses: Vključi omenjene objave v e-sporočilo
         send_email_notification: Obvesti uporabnika po e-pošti
         text: Opozorilo po meri
         type: Dejanje
         types:
           disable: Onemogoči
           none: Ne naredi ničesar
+          sensitive: Občutljivo
           silence: Utišaj
           suspend: Suspendiraj in nepovratno izbriši podatke računa
         warning_preset_id: Uporabi prednastavljeno opozorilo
+      announcement:
+        all_day: Celodnevni dogodek
+        ends_at: Konec dogodka
+        scheduled_at: Načrtuj čas objave
+        starts_at: Začetek dogodka
+        text: Objava
+      appeal:
+        text: Razložite, zakaj bi morali to odločitev spremeniti
       defaults:
         autofollow: Povabite, da sledi vašemu računu
         avatar: Podoba
@@ -82,61 +176,134 @@ sl:
         expires_in: Preteče po
         fields: Metapodatki profila
         header: Glava
+        honeypot: "%{label} (ne izpolnjujte)"
         inbox_url: URL mape "Prejeto"
         irreversible: Opusti namesto skrij
         locale: Jezik vmesnika
         locked: Zaklenjen račun
         max_uses: Največje število uporabnikov
         new_password: Novo geslo
+        note: Biografija
         otp_attempt: Dvofaktorska koda
         password: Geslo
         phrase: Ključna beseda ali fraza
         setting_advanced_layout: Omogoči napredni spletni vmesnik
-        setting_aggregate_reblogs: Skupinske spodbude na časovnicah
+        setting_aggregate_reblogs: Skupinske izpostavitve na časovnicah
+        setting_always_send_emails: Vedno pošlji e-obvestila
         setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov
-        setting_boost_modal: Pred sunkom pokaži potrditveno okno
+        setting_boost_modal: Pred izpostavljanjem pokaži potrditveno okno
+        setting_crop_images: Obreži slike v nerazširjenih objavah v razmerju 16:9
         setting_default_language: Jezik objavljanja
         setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
-        setting_delete_modal: Pred brisanjem troba prikaži okno za pritrditev
+        setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
+        setting_disable_swiping: Onemogoči poteze drsanja
         setting_display_media: Prikaz medijev
         setting_display_media_default: Privzeto
         setting_display_media_hide_all: Skrij vse
         setting_display_media_show_all: Prikaži vse
-        setting_expand_spoilers: Vedno razširi trobe, označene z opozorili o vsebini
+        setting_expand_spoilers: Vedno razširi objave, označene z opozorili o vsebini
         setting_hide_network: Skrij svoje omrežje
         setting_noindex: Odsotnost indeksiranja iskalnikov
         setting_reduce_motion: Zmanjšanje premikanja v animacijah
-        setting_show_application: Razkrij aplikacijo za pošiljanje tutov
+        setting_show_application: Razkrij aplikacijo za pošiljanje objav
         setting_system_font_ui: Uporabi privzeto pisavo sistema
         setting_theme: Tema strani
+        setting_trends: Pokaži današnje trende
         setting_unfollow_modal: Pokaži potrditveno okno, preden nekoga prenehamo slediti
-        setting_use_blurhash: Pokaži barvite gradiente za skrite medije
+        setting_use_blurhash: Pokaži barvite prelive za skrite medije
         setting_use_pending_items: Počasen način
         severity: Strogost
+        sign_in_token_attempt: Varnostna koda
+        title: Naslov
         type: Vrsta uvoza
         username: Uporabniško ime
         username_or_email: Uporabniško ime ali E-pošta
         whole_word: Celotna beseda
+      email_domain_block:
+        with_dns_records: Vključi zapise MX in IP-številke domene
       featured_tag:
         name: Ključnik
+      filters:
+        actions:
+          hide: Povsem skrij
+          warn: Skrij z opozorilom
+      form_admin_settings:
+        backups_retention_period: Obdobje hrambe arhivov uporabnikov
+        bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
+        closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
+        content_cache_retention_period: Obdobje hrambe predpomnilnika vsebine
+        custom_css: CSS po meri
+        mascot: Maskota po meri (opuščeno)
+        media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
+        profile_directory: Omogoči imenik profilov
+        registrations_mode: Kdo se lahko registrira
+        require_invite_text: Zahtevaj razlog za pridružitev
+        show_domain_blocks: Pokaži blokade domen
+        show_domain_blocks_rationale: Pokaži, zakaj so bile domene blokirane
+        site_contact_email: E-naslov za stik
+        site_contact_username: Uporabniško ime stika
+        site_extended_description: Razširjeni opis
+        site_short_description: Opis strežnika
+        site_terms: Pravilnik o zasebnosti
+        site_title: Ime strežnika
+        theme: Privzeta tema
+        thumbnail: Sličica strežnika
+        timeline_preview: Omogoči neoverjen dostop do javnih časovnic
+        trendable_by_default: Dovoli trende brez predhodnega pregleda
+        trends: Omogoči trende
       interactions:
         must_be_follower: Blokiraj obvestila nesledilcev
         must_be_following: Blokiraj obvestila oseb, ki jim ne sledite
         must_be_following_dm: Blokiraj neposredna sporočila oseb, ki jim ne sledite
+      invite:
+        comment: Komentar
       invite_request:
         text: Zakaj se želite pridružiti?
+      ip_block:
+        comment: Komentar
+        ip: IP
+        severities:
+          no_access: Blokiraj dostop
+          sign_up_block: Blokiraj registracije
+          sign_up_requires_approval: Omeji število prijav
+        severity: Pravilo
       notification_emails:
+        appeal: Nekdo se je pritožil na odločitev moderatorja
         digest: Pošlji izvlečke e-pošt
-        favourite: Pošlji e-pošto, ko nekdo doda vaše stanje med priljubljene
+        favourite: Pošlji e-pošto, ko nekdo doda vašo objavo med priljubljene
         follow: Pošlji e-pošto, ko vas nekdo sledi
         follow_request: Pošlji e-pošto, ko vam nekdo želi slediti
         mention: Pošlji e-pošto, ko vas nekdo omeni
         pending_account: Pošlji e-pošto, ko je potreben pregled novega računa
-        reblog: Pošlji e-pošto, ko nekdo sune vaše stanje
-        report: Pošlji e-pošto, ko je oddana nova prijava
+        reblog: Pošlji e-sporočilo, ko nekdo izpostavi vašo objavo
+        report: Novo poročilo je oddano
+        trending_tag: Nov trend zahteva pregled
+      rule:
+        text: Pravilo
+      tag:
+        listable: Dovoli, da se ta ključnik pojavi v iskanjih in predlogih
+        name: Ključnik
+        trendable: Dovoli, da se ta ključnik pojavi med trendi
+        usable: Dovoli, da objave uporabljajo ta ključnik
+      user:
+        role: Vloga
+      user_role:
+        color: Barva značke
+        highlighted: Prikaži vlogo kot značko na uporabniškem profilu
+        name: Ime
+        permissions_as_keys: Pravice
+        position: Prioriteta
+      webhook:
+        events: Omogočeni dogodki
+        url: URL končne točke
     'no': Ne
+    not_recommended: Ni priporočeno
     recommended: Priporočeno
     required:
+      mark: "*"
       text: zahtevano
+    title:
+      sessions:
+        webauthn: Za prijavo uporabite eno od svojih varnostnih kod
     'yes': Da
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 80bab0e04..4d7d8935e 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -27,6 +27,8 @@ sq:
         scheduled_at: Që lajmërimi të botohet menjëherë, lëreni të zbrazët
         starts_at: Opsionale. Në rast se lajmërimi juaj është i lidhur me një interval kohor të caktuar
         text: Mund të përdorni sintaksë mesazhesh. Ju lutemi, mos harroni që hapësira e lajmërimit do të hajë vend në ekranin e përdoruesit
+      appeal:
+        text: Një paralajmërim mund ta apeloni vetëm një herë
       defaults:
         autofollow: Personat që regjistrohen përmes ftesës do t’ju ndjekin vetvetiu
         avatar: PNG, GIF ose JPG. Maksimumi %{size}. Do të zvogëlohen në %{dimensions}px
@@ -35,8 +37,7 @@ sq:
         current_password: Për qëllime sigurie, ju lutemi, jepni fjalëkalimin e llogarisë së tanishme
         current_username: Që ta ripohoni, ju lutemi, jepni emrin e përdoruesit të llogarisë së tanishme
         digest: I dërguar vetëm pas një periudhe të gjatë pasiviteti dhe vetëm nëse keni marrë ndonjë mesazh personal gjatë mungesës tuaj
-        discoverable: Drejtoria e profileve është një rrugë tjetër përmes së cilës llogaria juaj mund të mbërrijë te një publik më i gjerë
-        discoverable_no_directory: Lejojeni llogarinë tuaj të zbulohet nga të panjohur përmes rekomandimesh dhe veçorish të tjera
+        discoverable: Lejoni që llogaria juaj të zbulohet nga të huaj përmes rekomandimesh, gjërash në modë dhe veçorish të tjera
         email: Do t’ju dërgohet një email ripohimi
         fields: Te profili juaj mund të keni deri në 4 objekte të shfaqur si tabelë
         header: PNG, GIF ose JPG. E shumta %{size}. Do të ripërmasohet në %{dimensions}px
@@ -48,6 +49,7 @@ sq:
         phrase: Do të kërkohet përputhje pavarësish se teksti ose sinjalizimi mbi lëndën e një mesazhi është shkruar me të mëdha apo me të vogla
         scopes: Cilat API do të lejohen të përdorin aplikacioni. Nëse përzgjidhni një shkallë të epërme, nuk ju duhet të përzgjidhni individualet një nga një.
         setting_aggregate_reblogs: Mos shfaq përforcime të reja për mesazhe që janë përforcuar tani së fundi (prek vetëm përforcime të marra rishtas)
+        setting_always_send_emails: Normalisht s’do të dërgohen njoftime, kur përdorni aktivisht Mastodon-in
         setting_default_sensitive: Media rezervat fshihet, si parazgjedhje, dhe mund të shfaqet me një klikim
         setting_display_media_default: Fshih media me shenjën rezervat
         setting_display_media_hide_all: Fshih përherë mediat
@@ -62,10 +64,36 @@ sq:
       domain_allow:
         domain: Kjo përkatësi do të jetë në gjendje të sjellë të dhëna prej këtij shërbyesi dhe të dhënat ardhëse prej tij do të përpunohen dhe depozitohen
       email_domain_block:
-        domain: Ky mund të jetë emri i përkatësisë që shfaqet te adresa email, zëri MX që i takon asaj përkatësie, ose IP-ja e shërbyesit te i cili shpie ai zë MX. Këto do të kontrollohen gjatë regjistrimit të përdoruesit dhe regjistrimi do të hidhet poshtë.
+        domain: Ky mund të jetë emri i përkatësisë që shfaqet te adresa email, ose zëri MX që përdor. Do të kontrollohen gjatë regjistrimit.
         with_dns_records: Do të bëhet një përpjekje për ftillimin e zërave DNS të përkatësisë së dhënë dhe do të futen në listë bllokimesh edhe përfundimet
       featured_tag:
-        name: 'Mund të doni të përdorni një nga këto:'
+        name: 'Ja disa nga hashtag-ët që përdorët tani afër:'
+      filters:
+        action: Zgjidhni cili veprim të kryhet, kur një postim ka përputhje me një filtër
+        actions:
+          hide: Fshihe plotësisht lëndën e filtruar, duke u sjellë sikur të mos ekzistonte
+          warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
+      form_admin_settings:
+        backups_retention_period: Mbaji arkivat e prodhuara të përdoruesve për aq ditë sa numri i dhënë.
+        bootstrap_timeline_accounts: Këto llogari do të fiksohen në krye të rekomandimeve për ndjekje nga përdorues të rinj.
+        closed_registrations_message: Shfaqur kur mbyllen dritare regjistrimesh
+        content_cache_retention_period: Postimet prej shërbyesve të tjerë do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive. Kjo mund të jetë e pakthyeshme.
+        custom_css: Stile vetjakë mund të aplikoni në versionin web të Mastodon-it.
+        mascot: Anashkalon ilustrimin te ndërfaqja web e thelluar.
+        media_cache_retention_period: Kartelat media të shkarkuara do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive dhe rishkarkohen po u kërkua.
+        profile_directory: Drejtoria e profileve paraqet krejt përdoruesit që kanë zgjedhur të jenë të zbulueshëm.
+        require_invite_text: Kur regjistrimet lypin miratim dorazi, bëje tekstin “Përse doni të bëheni pjesë?” të detyrueshëm, në vend se opsional
+        site_contact_email: Si mund të lidhen me ju njerëzit, për çështje ligjore, ose për asistencë.
+        site_contact_username: Si mund të lidhen njerëzit me ju në Mastodon.
+        site_extended_description: Çfarëdo hollësie shtesë që mund të jetë e dobishme për vizitorët dhe përdoruesit tuaj. Mund të hartohet me sintaksë Markdown.
+        site_short_description: Një përshkrim i shkurtër për të ndihmuar identifikimin unik të shërbyesit tuaj. Kush e mban në punë, për kë është?
+        site_terms: Përdorni rregullat tuaja të privatësisë, ose lëreni të zbrazët që të përdoren ato parazgjedhje. Mund të hartohet me sintaksë Markdown.
+        site_title: Si mund t’i referohen njerëzit shërbyesit tuaj, përveç emrit të tij të përkatësisë.
+        theme: Temë që shohin vizitorët që kanë bërë daljen dhe përdorues të rinj.
+        thumbnail: Një figurë afërsisht 2:1 e shfaqur tok me hollësi mbi shërbyesin tuaj.
+        timeline_preview: Vizitorët që kanë bërë daljen do të jenë në gjendje të shfletojnë psotimet më të freskëta publike të passhme në shërbyes.
+        trendable_by_default: Anashkalo shqyrtim dorazi lënde në modë. Gjëra individuale prapë mund të hiqen nga lëndë në modë pas publikimi.
+        trends: Gjërat në modë shfaqin cilat postime, hashtagë dhe histori të reja po tërheqin vëmendjen në shërbyesin tuaj.
       form_challenge:
         current_password: Po hyni në një zonë të sigurt
       imports:
@@ -78,6 +106,7 @@ sq:
         ip: Jepni një adresë IPv4 ose IPv6. Duke përdorur sintaksën CIDR, mund të bllokoni intervale të tëra. Hapni sytë mos lini veten jashtë!
         severities:
           no_access: Blloko hyrje në krejt burimet
+          sign_up_block: S’do të jenë të mundur regjistrime të reja
           sign_up_requires_approval: Regjistrime të reja do të duan miratimin tuaj
         severity: Zgjidhni ç’do të ndodhë me kërkesa nga kjo IP
       rule:
@@ -89,6 +118,16 @@ sq:
         name: Mund të ndryshoni shkronjat vetëm nga të mëdha në të vogla ose anasjelltas, për shembull, për t’i bërë më të lexueshme
       user:
         chosen_languages: Në iu vëntë shenjë, te rrjedha kohore publike do të shfaqen vetëm mesazhe në gjuhët e përzgjedhura
+        role: Roli kontrollon cilat leje ka përdoruesi
+      user_role:
+        color: Ngjyrë për t’u përdorur për rolin nëpër UI, si RGB në format gjashtëmbëdhjetësh
+        highlighted: Kjo e bën rolin të dukshëm publikisht
+        name: Emër publik për rolin, nëse roli është ujdisur të shfaqet si një stemë
+        permissions_as_keys: Përdoruest me këtë rol do të mund të…
+        position: Role më të lartë vendosin zgjidhje përplasje në disa raste. Disa veprime mund të kryhen vetëm mbi role të një shkalle më të ulët
+      webhook:
+        events: Përzgjidhni akte për dërgim
+        url: Ku do të dërgohen aktet
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ sq:
         scheduled_at: Planifikoji botimin
         starts_at: Fillim i aktit
         text: Lajmërim
+      appeal:
+        text: Shpjegoni pse duhet përmbysur ky vendim
       defaults:
         autofollow: Ftesë për ndjekje të llogarisë tuaj
         avatar: Avatar
@@ -148,6 +189,7 @@ sq:
         phrase: Fjalëkyç ose frazë
         setting_advanced_layout: Aktivizo ndërfaqe web të thelluar
         setting_aggregate_reblogs: Grupoji përforcimet në rrjedha kohore
+        setting_always_send_emails: Dërgo përherë njoftime me email
         setting_auto_play_gif: Vetëluaji GIF-et e animuar
         setting_boost_modal: Shfaq dialog ripohimi përpara përforcimi
         setting_crop_images: Në mesazhe jo të zgjerueshëm, qethi figurat në 16x9
@@ -173,6 +215,7 @@ sq:
         setting_use_pending_items: Mënyra ngadalë
         severity: Rëndësi
         sign_in_token_attempt: Kod sigurie
+        title: Titull
         type: Lloj importimi
         username: Emër përdoruesi
         username_or_email: Emër përdoruesi ose Email
@@ -181,6 +224,34 @@ sq:
         with_dns_records: Përfshi zëra MX dhe IP-ra të përkatësisë
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Fshihe plotësisht
+          warn: Fshihe me një sinjalizim
+      form_admin_settings:
+        backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
+        bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
+        closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
+        content_cache_retention_period: Periudhë mbajtjeje lënde fshehtine
+        custom_css: CSS Vetjake
+        mascot: Simbol vetjak (e dikurshme)
+        media_cache_retention_period: Periudhë mbajtjeje lënde media
+        profile_directory: Aktivizo drejtori profilesh
+        registrations_mode: Kush mund të regjistrohet
+        require_invite_text: Kërko një arsye për pjesëmarrje
+        show_domain_blocks: Shfaq bllokime përkatësish
+        show_domain_blocks_rationale: Shfaq pse janë bllokuar përkatësitë
+        site_contact_email: Email kontakti
+        site_contact_username: Emër përdoruesi kontakti
+        site_extended_description: Përshkrim i zgjeruar
+        site_short_description: Përshkrim shërbyesi
+        site_terms: Rregulla Privatësie
+        site_title: Emër shërbyesi
+        theme: Temë parazgjedhje
+        thumbnail: Miniaturë shërbyesi
+        timeline_preview: Lejo hyrje pa mirëfilltësim te rrjedha kohore publike
+        trendable_by_default: Lejoni gjëra në modë pa shqyrtim paraprak
+        trends: Aktivizo gjëra në modë
       interactions:
         must_be_follower: Blloko njoftime nga jo-ndjekës
         must_be_following: Blloko njoftime nga persona që s’i ndiqni
@@ -194,9 +265,11 @@ sq:
         ip: IP
         severities:
           no_access: Bllokoji hyrjen
+          sign_up_block: Blloko regjistrime
           sign_up_requires_approval: Kufizo regjistrime
         severity: Rregull
       notification_emails:
+        appeal: Dikush apelon një vendim moderatori
         digest: Dërgo email-e përmbledhës
         favourite: Dikush parapëlqeu gjendjen tuaj
         follow: Dikush filloi t’ju ndjekë
@@ -205,7 +278,7 @@ sq:
         pending_account: Llogaria e re lyp shqyrtim
         reblog: Dikush përforcoi gjendjen tuaj
         report: Parashtrohet raportim i ri
-        trending_tag: Një hashtag i pashqyrtuar zë e bëhet popullor
+        trending_tag: Për gjëra të reja në modë lypset shqyrtim
       rule:
         text: Rregull
       tag:
@@ -213,7 +286,19 @@ sq:
         name: Hashtag
         trendable: Lejoje këtë hashtag të shfaqet në prirje
         usable: Lejoji mesazhet të përdorin këtë hashtag
+      user:
+        role: Rol
+      user_role:
+        color: Ngjyrë steme
+        highlighted: Shfaqe rolin si një stemë në profile përdoruesish
+        name: Emër
+        permissions_as_keys: Leje
+        position: Përparësi
+      webhook:
+        events: Akte të aktivizuar
+        url: URL pikëmbarimi
     'no': Jo
+    not_recommended: Jo e këshilluar
     recommended: E rekomanduar
     required:
       mark: "*"
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 66efa3db8..069d30b6d 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -2,58 +2,308 @@
 sr-Latn:
   simple_form:
     hints:
+      account_alias:
+        acct: Navedi korisničko_ime@domen naloga sa kojeg želiš da pređeš
+      account_migration:
+        acct: Navedi korisničko_ime@domen naloga na koji želiš da pređeš
+      account_warning_preset:
+        text: Možete koristiti sintaksu truba, kao što su npr. URL-ova, tarabe i pominjanja
+        title: Opciono. Nije vidljivo primaocu
+      admin_account_action:
+        include_statuses: Korisnik će videti koje su objave prouzrokovale moderiranje ili upozorenje
+        send_email_notification: Korisnik će dobiti objašnjenje toga šta mu se desilo sa naloga
+        text_html: Opcionalno. Možete koristiti sintaksu truba. Možete <a href="%{path}">dodati upozoravajuća prepodešavanje</a> da sačuvate vreme
+        type_html: Izaberite šta da radite sa <strong>%{acct}</strong>
+        types:
+          disable: Spreči korisnika da koristi svoj nalog, ali nemoj brisati ili sakrivati njegov sadržaj.
+          none: Koristi ovo da pošalješ upozorenje korisniku, bez pokretanja bilo koje druge akcije.
+          sensitive: Učini da svi medijski prilozi ovog korisnika prisilno budu označeni kao osetljivi.
+          silence: Onemogući korisnika da objavljuje javno, sakrij sve njegove svoje objave i obaveštenja od korisnika koji ga ne prate.
+          suspend: Spreči bilo kakvu interakciju sa ovog naloga ili sa njim i izbriši njegov sadržaj. Može da se opozove u roku od 30 dana.
+        warning_preset_id: Opcionalno. Možete i dalje dodati prilagođeni tekst na kraj preseta
+      announcement:
+        all_day: Biće prikazani samo datumi vremenskog opsega koji su označeni
+        ends_at: Opciono. Objava će biti automatski opozvana u ovom trenutku
+        scheduled_at: Ostavi prazno da bi najava bila odmah objavljena
+        starts_at: Opciono. U slučaju da je najava vezana za određeni vremenski raspon
+        text: Možeš koristiti post sintaksu. Vodi računa o prostoru koji će objava zauzimati na ekranu korisnika
+      appeal:
+        text: Na brisanje se možeš žaliti samo jednom
       defaults:
+        autofollow: Osobe koje se prijave kroz pozivnice će vas automatski zapratiti
         avatar: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px
+        bot: Ovaj nalog uglavnom vrši automatizovane radnje i možda se ne nadgleda
+        context: Jedan ili više konteksta u kojima treba da se primeni filter
+        current_password: Unesi lozinku tekućeg naloga iz bezbednosnih razloga
+        current_username: Unesi korisničko ime tekućeg naloga za potvrdu
         digest: Poslato posle dužeg perioda neaktivnosti sa pregledom svih bitnih stvari koje ste dobili dok ste bili odsutni
+        discoverable: Dozvoli nepoznatim korisnicima da otkriju tvoj nalog putem preporuka, trendova i drugih funkcija
+        email: Biće vam poslata e-pošta sa potvrdom
+        fields: Možete imati do 4 stavke prikazane kao tabela na vašem nalogu
         header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px
+        inbox_url: Kopirajte URL sa naslovne strane releja koji želite koristiti
+        irreversible: Filtrirane trube će nestati nepovratno, čak i ako je filter kasnije uklonjen
+        locale: Jezik korisničkog interfejsa, e-pošte i mobilnih obaveštenja
         locked: Zahteva da pojedinačno odobrite pratioce
-        setting_noindex: Utiče na Vaš javni profil i statusne strane
+        password: Koristite najmanje 8 znakova
+        phrase: Biće uparena bez obzira na veliko ili malo slovo u tekstu ili upozorenja o sadržaju trube
+        scopes: Kojim API-jima će aplikacija dozvoliti pristup. Ako izaberete opseg najvišeg nivoa, ne morate odabrati pojedinačne.
+        setting_aggregate_reblogs: Ne pokazuj nova deljenja za trube koje su nedavno podeljene (utiče samo na nedavno primljena deljenja)
+        setting_always_send_emails: Obaveštenja e-poštom se po pravilu neće slati kada aktivno koristiš Mastodon
+        setting_default_sensitive: Osetljivi mediji su podrazumevano skriveni i mogu se otkriti klikom
+        setting_display_media_default: Sakrij medije označene kao osetljive
+        setting_display_media_hide_all: Uvek sakrij sve medije
+        setting_display_media_show_all: Uvek prikaži medije označene kao osetljive
+        setting_hide_network: Koga pratite i ko vas prati neće biti prikazano na vašem nalogu
+        setting_noindex: Utiče na Vaš javni nalog i statusne strane
+        setting_show_application: Aplikacija koju koristiš za objavljivanje biće prikazana u detaljnom prikazu tvojih objava
+        setting_use_blurhash: Gradijent se zasniva na bojama skrivenih vizuelnih prikaza, ali prikriva sve detalje
+        setting_use_pending_items: Sakrij ažuriranja vremenske ose iza klika umesto automatskog pomeranja izvora objava
+        username: Vaš nadimak će biti jedinstven na %{domain}
+        whole_word: Kada je ključna reč ili fraza isključivo alfanumerička, biće primenjena samo ako se podudara sa celom reči
+      domain_allow:
+        domain: Ovaj domen će moći da preuzima podatke sa ovog servera i dolazni podaci sa njega će se obrađivati i čuvati
+      email_domain_block:
+        domain: Ovo može biti ime domena koje se pojavljuje u adresi e-pošte ili MX zapisa koji koristi. Oni će biti provereni prilikom registracije.
+        with_dns_records: Biće učinjen pokušaj da se razreše DNS zapisi datog domena i rezultati će takođe biti blokirani
+      featured_tag:
+        name: 'Evo nekih od heš oznaka koje ste nedavno koristili:'
+      filters:
+        action: Izaberi koju radnju treba izvršiti kada objava odgovara filteru
+        actions:
+          hide: Potpuno sakrij filtrirani sadržaj, ponašajući se kao da ne postoji
+          warn: Sakrij filtrirani sadržaj iza upozorenja u kome se navodi naziv filtera
+      form_admin_settings:
+        backups_retention_period: Čuvaj generisane korisničke arhive navedeni broj dana.
+        bootstrap_timeline_accounts: Ovi nalozi će biti zakačeni na vrh preporuka za praćenje novih korisnika.
+        closed_registrations_message: Prikazuje se kada su prijave zatvorene
+        content_cache_retention_period: Kada se postavi na pozitivnu vrednost, objave sa drugih servera će biti izbrisane nakon navedenog broja dana. Ovo može biti nepovratno.
+        custom_css: Možeš da primeniš prilagođene stilove na veb verziji Mastodona.
+        mascot: Zamenjuje ilustraciju u naprednom veb interfejsu.
+        media_cache_retention_period: Kada se postavi na pozitivnu vrednost, preuzete medijske datoteke će biti izbrisane nakon navedenog broja dana, i ponovo preuzete na zahtev.
+        profile_directory: Direktorijum profila navodi sve korisnike koji su se opredelili da budu vidljivi.
+        require_invite_text: Kada registracije zahtevaju ručno odobrenje, postavi da unos teksta „Zašto želiš da se pridružiš?“ bude obavezan, a ne opcioni
+        site_contact_email: Kako korisnici mogu da te kontaktiraju za pravna pitanja ili pitanja u vezi podrške.
+        site_contact_username: Kako korisnici mogu da te kontaktiraju na Mastodonu.
+        site_extended_description: Bilo koja dodatna informacija koja može biti korisne posetiocima i tvojim korisnicima. Može se strukturirati pomoću Markdown sintakse.
+        site_short_description: Kratak opis pomoću koga se na jedinstven način identifikuje tvoj server. Ko ga održava, kome je namenjen?
+        site_terms: Koristi sopstvenu politiku privatnosti ili ostavi prazno da bi se koristila podrazumevana. Može se strukturirati pomoću Markdown sintakse.
+        site_title: Način na moji može da se pozove na tvoj server osim naziva njegovog domena.
+        theme: Tema koju vide posetioci koji nisu prijavljeni i novi korisnici.
+        thumbnail: Slika koja se približno 2:1 prikazuje pored informacija o tvom serveru.
+        timeline_preview: Posetioci koji nisu prijavljeni će moći da pregledaju najnovije javne objave dostupne na serveru.
+        trendable_by_default: Preskoči ručni pregled sadržaja koji je u trendu. Pojedinačne stavke se nakon toga i dalje mogu ukloniti iz trendova.
+        trends: Trendovi pokazuju koje objave, heš oznake i vesti postaju sve popularniji na tvom serveru.
+      form_challenge:
+        current_password: Ulaziš u bezbedno područje
       imports:
         data: CSV fajl izvezen sa druge Mastodont instance
+      invite_request:
+        text: Ovo će nam pomoći da pregledamo tvoju prijavu
+      ip_block:
+        comment: Opciono. Zapamti zašto si dodao ovo pravilo.
+        expires_in: IP adrese su ograničeni resurs, ponekad se dele i često menjaju korisnika. Zbog toga se IP blokovi na neograničeno vreme ne preporučuju.
+        ip: Unesi IPv4 ili IPv6 adresu. Možeš blokirati čitave opsege koristeći CIDR sintaksu. Vodi računa da sebe ne zaključaš!
+        severities:
+          no_access: Blokiraj pristup svim resursima
+          sign_up_block: Nove prijave neće biti moguće
+          sign_up_requires_approval: Nove prijave će zahtevati tvoje odobrenje
+        severity: Izaberi šta će se desiti sa zahtevima sa ove IP adrese
+      rule:
+        text: Opiši pravilo ili zahtev za korisnike na ovom serveru. Potrudi se da opis bude kratak i jednostavan
       sessions:
         otp: 'Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak:'
+        webauthn: Ako je to USB ključ, obavezno ga ubaci i, ako je potrebno, pritisni ga.
+      tag:
+        name: Mogu se samo promeniti mala slova u velika, na primer, da bi bilo čitljivije
+      user:
+        chosen_languages: Kada označite, trube u izabranim jezicima će se prikazati na javnoj vremenskoj liniji
+        role: Uloga kontroliše koje dozvole korisnik ima
+      user_role:
+        color: Boja koja će se koristiti za ulogu u celom korisničkom interfejsu, kao RGB, u heksadecimalnom formatu
+        highlighted: Ovo čini ulogu javno vidljivom
+        name: Javni naziv uloge, ako je uloga podešena da se prikazuje kao značka
+        permissions_as_keys: Korisnici sa ovom ulogom će imati pristup...
+        position: Viša uloga odlučuje o rešavanju sukoba u određenim situacijama. Određene radnje se mogu izvršiti samo na ulogama sa nižim prioritetom
+      webhook:
+        events: Izaberite događaje za slanje
+        url: Gde će se događaji slati
     labels:
+      account:
+        fields:
+          name: Etiketa
+          value: Sadržaj
+      account_alias:
+        acct: Ručica (@) starog naloga
+      account_migration:
+        acct: Ručica (@) novog naloga
+      account_warning_preset:
+        text: Tekst preseta
+        title: Naslov
+      admin_account_action:
+        include_statuses: Uključi prijavljene objave u e-poštu
+        send_email_notification: Obavesti korisnika preko e-pošte
+        text: Prilagođeno upozorenje
+        type: Radnja
+        types:
+          disable: Onemogući
+          none: Ne radi ništa
+          sensitive: Osetljivo
+          silence: Utišaj
+          suspend: Obustavite i nepovratno izbrišite podatke o nalogu
+        warning_preset_id: Koristi upozoravajući preset
+      announcement:
+        all_day: Celodnevni događaj
+        ends_at: Kraj događaja
+        scheduled_at: Planiraj objavljivanje
+        starts_at: Početak događaja
+        text: Najava
+      appeal:
+        text: Objasni zašto ovu odluku treba poništiti
       defaults:
+        autofollow: Pozovite da prati vaš nalog
+        avatar: Avatar
+        bot: Ovo je nalog bota
+        chosen_languages: Filtriraj jezike
         confirm_new_password: Potvrdite novu lozinku
         confirm_password: Potvrdite lozinku
+        context: Filtriraj kontekste
         current_password: Trenutna lozinka
         data: Podaci
+        discoverable: Navedite ovaj nalog u fascikli
         display_name: Ime za prikaz
         email: Adresa e-pošte
         expires_in: Ističe nakon
+        fields: Metapodaci naloga
         header: Zaglavlje
+        honeypot: "%{label} (ne popunjavaj)"
+        inbox_url: URL od relejnog prijemnog sandučeta
+        irreversible: Ispustiti umesto sakriti
         locale: Jezik
-        locked: Zaključaj nalog
+        locked: Zahtevaj zahteve za praćenje
         max_uses: Maksimalni broj korišćenja
         new_password: Nova lozinka
         note: Biografija
         otp_attempt: Dvofaktorski kod
         password: Lozinka
+        phrase: Ključna reč ili fraza
+        setting_advanced_layout: Omogući napredni veb interfejs
+        setting_aggregate_reblogs: Grupiši deljenja u vremenskim linijama
+        setting_always_send_emails: Uvek šalji obaveštenja e-poštom
         setting_auto_play_gif: Automatski puštaj animirane GIF-ove
         setting_boost_modal: Prikaži dijalog za potvrdu pre davanja podrške
+        setting_crop_images: Izreži slike u neproširenim objavama na 16x9
+        setting_default_language: Jezik objavljivanja
         setting_default_privacy: Privatnost objava
         setting_default_sensitive: Uvek označi multimediju kao osetljivu
         setting_delete_modal: Prikaži dijalog za potvrdu pre brisanja tuta
+        setting_disable_swiping: Onemogući pokrete prevlačenja
+        setting_display_media: Prikaz medija
+        setting_display_media_default: Podrazumevano
+        setting_display_media_hide_all: Sakrij sve
+        setting_display_media_show_all: Prikaži sve
+        setting_expand_spoilers: Uvek prošiti trube koje su označene upozorenjem sadržaja
+        setting_hide_network: Sakrij svoju mrežu
         setting_noindex: Odjavi se od indeksiranja search engine-a
         setting_reduce_motion: Smanji pokrete u animacijama
+        setting_show_application: Otkrij aplikaciju koja se koristi za slanje postova
         setting_system_font_ui: Koristi sistemski font
         setting_theme: Tema sajta
+        setting_trends: Prikaži današnje trendove
         setting_unfollow_modal: Prikaži dijalog za potvrdu pre nego što otpratite nekoga
+        setting_use_blurhash: Prikaži gradijente u boji za skrivene medije
+        setting_use_pending_items: Spori režim
         severity: Oštrina
+        sign_in_token_attempt: Sigurnosni kod
+        title: Naslov
         type: Tip uvoza
         username: Korisničko ime
+        username_or_email: Korisničko ime ili E-pošta
+        whole_word: Cela reč
+      email_domain_block:
+        with_dns_records: Uključite MX zapise i IP adrese domena
+      featured_tag:
+        name: Heš oznaka
+      filters:
+        actions:
+          hide: Sakrij u potpunosti
+          warn: Sakrij uz upozorenje
+      form_admin_settings:
+        backups_retention_period: Period čuvanja korisničke arhive
+        bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
+        closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
+        content_cache_retention_period: Period čuvanja keša sadržaja
+        custom_css: Prilagođeni CSS
+        mascot: Prilagođena maskota (nasleđe)
+        media_cache_retention_period: Period čuvanja keša medija
+        profile_directory: Omogući direktorijum profila
+        registrations_mode: Ko može da se prijavi
+        require_invite_text: Zatraži razlog za pristupanje
+        show_domain_blocks: Pprikaži blokove domena
+        show_domain_blocks_rationale: Pokaži zašto su domeni blokirani
+        site_contact_email: E-adresa za kontakt
+        site_contact_username: Korisničko ime za kontakt
+        site_extended_description: Prošireni opis
+        site_short_description: Opis servera
+        site_terms: Politika privatnosti
+        site_title: Ime servera
+        theme: Podrazumevana tema
+        thumbnail: Sličica servera
+        timeline_preview: Dozvoli neautorizovan pristup javnim vremenskim osama
+        trendable_by_default: Dozvoli trendove bez prethodnog pregleda
+        trends: Omogući trendove
       interactions:
         must_be_follower: Blokiraj obaveštenja od korisnika koji me ne prate
         must_be_following: Blokiraj obaveštenja od ljudi koje ne pratim
         must_be_following_dm: Blokiraj direktne poruke od ljudi koje ne pratim
+      invite:
+        comment: Komentar
+      invite_request:
+        text: Zašto želiš da se pridružiš?
+      ip_block:
+        comment: Komentar
+        ip: Avatar
+        severities:
+          no_access: Blokiraj pristup
+          sign_up_block: Blokiraj prijave
+          sign_up_requires_approval: Ograniči prijave
+        severity: Pravilo
       notification_emails:
+        appeal: Neko se žali na odluku moderatora
         digest: Šalji e-poštu sa sažetkom
         favourite: Šalji e-poštu kada neko stavi da mu je Vaš status omiljen
         follow: Šalji e-poštu kada Vas neko zaprati
         follow_request: Šalji e-poštu kada neko zatraži da Vas zaprati
         mention: Šalji e-poštu kada Vas neko pomene
+        pending_account: Novi nalog treba pregledati
         reblog: Šalji e-poštu kada neko podrži Vaš status
+        report: Podneta je nova prijava
+        trending_tag: Novi trend treba pregledati
+      rule:
+        text: Pravilo
+      tag:
+        listable: Dozvoli da se ova heš oznaka pojavljuje u pretragama i predlozima
+        name: Heš oznaka
+        trendable: Dozvoli da se ova heš oznaka pojavi u okviru trendova
+        usable: Dozvoli objavama da koriste ovu heš oznaku
+      user:
+        role: Uloga
+      user_role:
+        color: Boja bedža
+        highlighted: Prikaži ulogu i bedž na profilima korisnika
+        name: Ime
+        permissions_as_keys: Ovlašćenja
+        position: Prioritet
+      webhook:
+        events: Omogućeni događaji
+        url: URL krajnje tačke
     'no': Ne
+    not_recommended: Nije preporučeno
+    recommended: Preporučeno
     required:
+      mark: "*"
       text: obavezno
+    title:
+      sessions:
+        webauthn: Koristi jedan od svojih bezbednosnih ključeva za prijavljivanje
     'yes': Da
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 4210b0a99..cf590b5f4 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -2,19 +2,42 @@
 sr:
   simple_form:
     hints:
+      account_alias:
+        acct: Наведи корисничко_име@домен налога са којег желиш да пређеш
+      account_migration:
+        acct: Наведи корисничко_име@домен налога на који желиш да пређеш
       account_warning_preset:
         text: Можете користити синтаксу труба, као што су нпр. УРЛ-ова, тарабе и помињања
+        title: Опционо. Није видљиво примаоцу
       admin_account_action:
+        include_statuses: Корисник ће видети које су објаве проузроковале модерирање или упозорење
         send_email_notification: Корисник ће добити објашњење тога шта му се десило са налога
         text_html: Опционално. Можете користити синтаксу труба. Можете <a href="%{path}">додати упозоравајућа преподешавање</a> да сачувате време
         type_html: Изаберите шта да радите са <strong>%{acct}</strong>
+        types:
+          disable: Спречи корисника да користи свој налог, али немој брисати или сакривати његов садржај.
+          none: Користи ово да пошаљеш упозорење кориснику, без покретања било које друге акције.
+          sensitive: Учини да сви медијски прилози овог корисника присилно буду означени као осетљиви.
+          silence: Онемогући корисника да објављује јавно, сакриј све његове своје објаве и обавештења од корисника који га не прате.
+          suspend: Спречи било какву интеракцију са овог налога или са њим и избриши његов садржај. Може да се опозове у року од 30 дана.
         warning_preset_id: Опционално. Можете и даље додати прилагођени текст на крај пресета
+      announcement:
+        all_day: Биће приказани само датуми временског опсега који су означени
+        ends_at: Опционо. Објава ће бити аутоматски опозвана у овом тренутку
+        scheduled_at: Остави празно да би најава била одмах објављена
+        starts_at: Опционо. У случају да је најава везана за одређени временски распон
+        text: Можеш користити пост синтаксу. Води рачуна о простору који ће објава заузимати на екрану корисника
+      appeal:
+        text: На брисање се можеш жалити само једном
       defaults:
         autofollow: Особе које се пријаве кроз позивнице ће вас аутоматски запратити
         avatar: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px
         bot: Овај налог углавном врши аутоматизоване радње и можда се не надгледа
         context: Један или више контекста у којима треба да се примени филтер
+        current_password: Унеси лозинку текућег налога из безбедносних разлога
+        current_username: Унеси корисничко име текућег налога за потврду
         digest: Послато после дужег периода неактивности са прегледом свих битних ствари које сте добили док сте били одсутни
+        discoverable: Дозволи непознатим корисницима да открију твој налог путем препорука, трендова и других функција
         email: Биће вам послата е-пошта са потврдом
         fields: Можете имати до 4 ставке приказане као табела на вашем налогу
         header: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px
@@ -26,36 +49,117 @@ sr:
         phrase: Биће упарена без обзира на велико или мало слово у тексту или упозорења о садржају трубе
         scopes: Којим API-јима ће апликација дозволити приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне.
         setting_aggregate_reblogs: Не показуј нова дељења за трубе које су недавно подељене (утиче само на недавно примљена дељења)
+        setting_always_send_emails: Обавештења е-поштом се по правилу неће слати када активно користиш Мастодон
+        setting_default_sensitive: Осетљиви медији су подразумевано скривени и могу се открити кликом
         setting_display_media_default: Сакриј медије означене као осетљиве
         setting_display_media_hide_all: Увек сакриј све медије
         setting_display_media_show_all: Увек прикажи медије означене као осетљиве
         setting_hide_network: Кога пратите и ко вас прати неће бити приказано на вашем налогу
         setting_noindex: Утиче на Ваш јавни налог и статусне стране
+        setting_show_application: Апликација коју користиш за објављивање биће приказана у детаљном приказу твојих објава
+        setting_use_blurhash: Градијент се заснива на бојама скривених визуелних приказа, али прикрива све детаље
+        setting_use_pending_items: Сакриј ажурирања временске осе иза клика уместо аутоматског померања извора објава
         username: Ваш надимак ће бити јединствен на %{domain}
         whole_word: Када је кључна реч или фраза искључиво алфанумеричка, биће примењена само ако се подудара са целом речи
+      domain_allow:
+        domain: Овај домен ће моћи да преузима податке са овог сервера и долазни подаци са њега ће се обрађивати и чувати
+      email_domain_block:
+        domain: Ово може бити име домена које се појављује у адреси е-поште или MX записа који користи. Они ће бити проверени приликом регистрације.
+        with_dns_records: Биће учињен покушај да се разреше DNS записи датог домена и резултати ће такође бити блокирани
+      featured_tag:
+        name: 'Ево неких од хеш ознака које сте недавно користили:'
+      filters:
+        action: Изабери коју радњу треба извршити када објава одговара филтеру
+        actions:
+          hide: Потпуно сакриј филтрирани садржај, понашајући се као да не постоји
+          warn: Сакриј филтрирани садржај иза упозорења у коме се наводи назив филтера
+      form_admin_settings:
+        backups_retention_period: Чувај генерисане корисничке архиве наведени број дана.
+        bootstrap_timeline_accounts: Ови налози ће бити закачени на врх препорука за праћење нових корисника.
+        closed_registrations_message: Приказује се када су пријаве затворене
+        content_cache_retention_period: Када се постави на позитивну вредност, објаве са других сервера ће бити избрисане након наведеног броја дана. Ово може бити неповратно.
+        custom_css: Можеш да примениш прилагођене стилове на веб верзији Мастодона.
+        mascot: Замењује илустрацију у напредном веб интерфејсу.
+        media_cache_retention_period: Када се постави на позитивну вредност, преузете медијске датотеке ће бити избрисане након наведеног броја дана, и поново преузете на захтев.
+        profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
+        require_invite_text: Када регистрације захтевају ручно одобрење, постави да унос текста „Зашто желиш да се придружиш?“ буде обавезан, а не опциони
+        site_contact_email: Како корисници могу да те контактирају за правна питања или питања у вези подршке.
+        site_contact_username: Како корисници могу да те контактирају на Мастодону.
+        site_extended_description: Било која додатна информација која може бити корисне посетиоцима и твојим корисницима. Може се структурирати помоћу Markdown синтаксе.
+        site_short_description: Кратак опис помоћу кога се на јединствен начин идентификује твој сервер. Ко га одржава, коме је намењен?
+        site_terms: Користи сопствену политику приватности или остави празно да би се користила подразумевана. Може се структурирати помоћу Markdown синтаксе.
+        site_title: Начин на моји може да се позове на твој сервер осим назива његовог домена.
+        theme: Тема коју виде посетиоци који нису пријављени и нови корисници.
+        thumbnail: Слика која се приближно 2:1 приказује поред информација о твом серверу.
+        timeline_preview: Посетиоци који нису пријављени ће моћи да прегледају најновије јавне објаве доступне на серверу.
+        trendable_by_default: Прескочи ручни преглед садржаја који је у тренду. Појединачне ставке се након тога и даље могу уклонити из трендова.
+        trends: Трендови показују које објаве, хеш ознаке и вести постају све популарнији на твом серверу.
+      form_challenge:
+        current_password: Улазиш у безбедно подручје
       imports:
         data: CSV фајл извезен са друге Мастодонт инстанце
+      invite_request:
+        text: Ово ће нам помоћи да прегледамо твоју пријаву
+      ip_block:
+        comment: Опционо. Запамти зашто си додао ово правило.
+        expires_in: IP адресе су ограничени ресурс, понекад се деле и често мењају корисника. Због тога се IP блокови на неограничено време не препоручују.
+        ip: Унеси IPv4 или IPv6 адресу. Можеш блокирати читаве опсеге користећи CIDR синтаксу. Води рачуна да себе не закључаш!
+        severities:
+          no_access: Блокирај приступ свим ресурсима
+          sign_up_block: Нове пријаве неће бити могуће
+          sign_up_requires_approval: Нове пријаве ће захтевати твоје одобрење
+        severity: Изабери шта ће се десити са захтевима са ове IP адресе
+      rule:
+        text: Опиши правило или захтев за кориснике на овом серверу. Потруди се да опис буде кратак и једноставан
       sessions:
         otp: 'Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак:'
+        webauthn: Ако је то USB кључ, обавезно га убаци и, ако је потребно, притисни га.
+      tag:
+        name: Могу се само променити мала слова у велика, на пример, да би било читљивије
       user:
         chosen_languages: Када означите, трубе у изабраним језицима ће се приказати на јавној временској линији
+        role: Улога контролише које дозволе корисник има
+      user_role:
+        color: Боја која ће се користити за улогу у целом корисничком интерфејсу, као RGB, у хексадецималном формату
+        highlighted: Ово чини улогу јавно видљивом
+        name: Јавни назив улоге, ако је улога подешена да се приказује као значка
+        permissions_as_keys: Корисници са овом улогом ће имати приступ...
+        position: Виша улога одлучује о решавању сукоба у одређеним ситуацијама. Одређене радње се могу извршити само на улогама са нижим приоритетом
+      webhook:
+        events: Изаберите догађаје за слање
+        url: Где ће се догађаји слати
     labels:
       account:
         fields:
           name: Етикета
           value: Садржај
+      account_alias:
+        acct: Ручица (@) старог налога
+      account_migration:
+        acct: Ручица (@) новог налога
       account_warning_preset:
         text: Текст пресета
+        title: Наслов
       admin_account_action:
+        include_statuses: Укључи пријављене објаве у е-пошту
         send_email_notification: Обавести корисника преко е-поште
         text: Прилагођено упозорење
         type: Радња
         types:
           disable: Онемогући
           none: Не ради ништа
+          sensitive: Осетљиво
           silence: Утишај
           suspend: Обуставите и неповратно избришите податке о налогу
         warning_preset_id: Користи упозоравајући пресет
+      announcement:
+        all_day: Целодневни догађај
+        ends_at: Крај догађаја
+        scheduled_at: Планирај објављивање
+        starts_at: Почетак догађаја
+        text: Најава
+      appeal:
+        text: Објасни зашто ову одлуку треба поништити
       defaults:
         autofollow: Позовите да прати ваш налог
         avatar: Аватар
@@ -72,23 +176,28 @@ sr:
         expires_in: Истиче након
         fields: Метаподаци налога
         header: Заглавље
+        honeypot: "%{label} (не попуњавај)"
         inbox_url: URL од релејног пријемног сандучета
         irreversible: Испустити уместо сакрити
         locale: Језик
-        locked: Закључај налог
+        locked: Захтевај захтеве за праћење
         max_uses: Максимални број коришћења
         new_password: Нова лозинка
         note: Биографија
         otp_attempt: Двофакторски код
         password: Лозинка
         phrase: Кључна реч или фраза
+        setting_advanced_layout: Омогући напредни веб интерфејс
         setting_aggregate_reblogs: Групиши дељења у временским линијама
+        setting_always_send_emails: Увек шаљи обавештења е-поштом
         setting_auto_play_gif: Аутоматски пуштај анимиране GIF-ове
         setting_boost_modal: Прикажи дијалог за потврду пре давања подршке
+        setting_crop_images: Изрежи слике у непроширеним објавама на 16x9
         setting_default_language: Језик објављивања
         setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања тута
+        setting_disable_swiping: Онемогући покрете превлачења
         setting_display_media: Приказ медија
         setting_display_media_default: Подразумевано
         setting_display_media_hide_all: Сакриј све
@@ -97,27 +206,104 @@ sr:
         setting_hide_network: Сакриј своју мрежу
         setting_noindex: Одјави се од индексирања search engine-а
         setting_reduce_motion: Смањи покрете у анимацијама
+        setting_show_application: Откриј апликацију која се користи за слање постова
         setting_system_font_ui: Користи системски фонт
         setting_theme: Тема сајта
+        setting_trends: Прикажи данашње трендове
         setting_unfollow_modal: Прикажи дијалог за потврду пре него што отпратите некога
+        setting_use_blurhash: Прикажи градијенте у боји за скривене медије
+        setting_use_pending_items: Спори режим
         severity: Оштрина
+        sign_in_token_attempt: Сигурносни код
+        title: Наслов
         type: Тип увоза
         username: Корисничко име
         username_or_email: Корисничко име или Е-пошта
         whole_word: Цела реч
+      email_domain_block:
+        with_dns_records: Укључите MX записе и IP адресе домена
+      featured_tag:
+        name: Хеш ознака
+      filters:
+        actions:
+          hide: Сакриј у потпуности
+          warn: Сакриј уз упозорење
+      form_admin_settings:
+        backups_retention_period: Период чувања корисничке архиве
+        bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
+        closed_registrations_message: Прилагођена порука када пријаве нису могуће
+        content_cache_retention_period: Период чувања кеша садржаја
+        custom_css: Прилагођени CSS
+        mascot: Прилагођена маскота (наслеђе)
+        media_cache_retention_period: Период чувања кеша медија
+        profile_directory: Омогући директоријум профила
+        registrations_mode: Ко може да се пријави
+        require_invite_text: Затражи разлог за приступање
+        show_domain_blocks: Пприкажи блокове домена
+        show_domain_blocks_rationale: Покажи зашто су домени блокирани
+        site_contact_email: Е-адреса за контакт
+        site_contact_username: Корисничко име за контакт
+        site_extended_description: Проширени опис
+        site_short_description: Опис сервера
+        site_terms: Политика приватности
+        site_title: Име сервера
+        theme: Подразумевана тема
+        thumbnail: Сличица сервера
+        timeline_preview: Дозволи неауторизован приступ јавним временским осама
+        trendable_by_default: Дозволи трендове без претходног прегледа
+        trends: Омогући трендове
       interactions:
         must_be_follower: Блокирај обавештења од корисника који ме не прате
         must_be_following: Блокирај обавештења од људи које не пратим
         must_be_following_dm: Блокирај директне поруке од људи које не пратим
+      invite:
+        comment: Коментар
+      invite_request:
+        text: Зашто желиш да се придружиш?
+      ip_block:
+        comment: Коментар
+        ip: IP
+        severities:
+          no_access: Блокирај приступ
+          sign_up_block: Блокирај пријаве
+          sign_up_requires_approval: Ограничи пријаве
+        severity: Правило
       notification_emails:
+        appeal: Неко се жали на одлуку модератора
         digest: Шаљи е-пошту са сажетком
         favourite: Шаљи е-пошту када неко стави да му је Ваш статус омиљен
         follow: Шаљи е-пошту када Вас неко запрати
         follow_request: Шаљи е-пошту када неко затражи да Вас запрати
         mention: Шаљи е-пошту када Вас неко помене
+        pending_account: Нови налог треба прегледати
         reblog: Шаљи е-пошту када неко подржи Ваш статус
-        report: Пошаљи Е-пошту када се поднесе нова пријава
+        report: Поднета је нова пријава
+        trending_tag: Нови тренд треба прегледати
+      rule:
+        text: Правило
+      tag:
+        listable: Дозволи да се ова хеш ознака појављује у претрагама и предлозима
+        name: Хеш ознака
+        trendable: Дозволи да се ова хеш ознака појави у оквиру трендова
+        usable: Дозволи објавама да користе ову хеш ознаку
+      user:
+        role: Улога
+      user_role:
+        color: Боја беџа
+        highlighted: Прикажи улогу и беџ на профилима корисника
+        name: Име
+        permissions_as_keys: Овлашћења
+        position: Приоритет
+      webhook:
+        events: Омогућени догађаји
+        url: URL крајње тачке
     'no': Не
+    not_recommended: Није препоручено
+    recommended: Препоручено
     required:
+      mark: "*"
       text: обавезно
+    title:
+      sessions:
+        webauthn: Користи један од својих безбедносних кључева за пријављивање
     'yes': Да
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 12ddc9547..8e2a40a04 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -3,54 +3,131 @@ sv:
   simple_form:
     hints:
       account_alias:
-        acct: Ange användarnamn@domän för kontot du flyttar från
+        acct: Ange användarnamn@domän för kontot som du vill flytta från
       account_migration:
-        acct: Ange användarnamn@domän för kontot du flyttar till
+        acct: Ange användarnamn@domän för kontot du vill flytta till
       account_warning_preset:
         text: Du kan använda inläggssyntax som webbadresser, hashtaggar och omnämnanden
         title: Valfri. Inte synlig för mottagaren
       admin_account_action:
-        include_statuses: Användaren ser de toots som orsakat moderering eller varning
-        send_email_notification: Användaren kommer att få en förklaring av vad som hände med sitt konto
-        text_html: Extra. Du kan använda toot syntax. Du kan <a href="%{path}">lägga till förvalda varningar</a> för att spara tid
+        include_statuses: Användaren ser vilka inlägg som orsakat modereringsåtgärd eller varning
+        send_email_notification: Användaren kommer få en förklaring på vad som hände med deras konto
+        text_html: Valfri. Du kan använda inläggssyntax. Du kan <a href="%{path}">lägga till förvalda varningar</a> för att spara tid
         type_html: Välj vad du vill göra med <strong>%{acct}</strong>
         types:
-          disable: Förhindra användaren från att använda sitt konto, men ta inte bort eller dölj innehållet.
-        warning_preset_id: Extra. Du kan lägga till valfri text i slutet av förinställningen
+          disable: Förhindra användaren från att använda sitt konto, men radera eller dölj inte innehållet.
+          none: Använd det här för att skicka en varning till användaren, utan att vidta någon ytterligare åtgärd.
+          sensitive: Tvinga alla denna användares mediebilagor till att flaggas som känsliga.
+          silence: Hindra användaren från att kunna göra offentliga inlägg, göm deras inlägg och notiser från folk som inte följer dem.
+          suspend: Hindra all interaktion från eller till detta konto och radera allt dess innehåll. Går att ångra inom 30 dagar.
+        warning_preset_id: Valfri. Du kan lägga till anpassad text i slutet av förinställningen
       announcement:
         all_day: När det är markerat visas endast datum för tidsintervallet
-        ends_at: Frivillig. Meddelandet kommer automatiskt att publiceras just nu
-        scheduled_at: Lämna tomt för att publicera meddelandet omedelbart
-        starts_at: Valfritt. Om ditt meddelande är bundet till ett visst tidsintervall
+        ends_at: Valfri. Kungörelsen kommer automatiskt avpubliceras vid denna tidpunkt
+        scheduled_at: Lämna tomt för att publicera kungörelsen omedelbart
+        starts_at: Valfritt. Om din kungörelse är bunden till ett visst tidsintervall
+        text: Du kan använda inläggssyntax. Håll i åtanke hur mycket plats din kungörelse tar upp på användarnas skärmar
+      appeal:
+        text: Du kan endast överklaga en varning en gång
       defaults:
         autofollow: Användarkonton som skapas genom din inbjudan kommer automatiskt följa dig
         avatar: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
         bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas
+        context: Ett eller fler sammanhang där filtret ska tillämpas
+        current_password: Av säkerhetsskäl krävs lösenordet till det nuvarande kontot
+        current_username: Ange det nuvarande kontots användarnamn för att bekräfta
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
-        discoverable_no_directory: Tillåt att ditt konto kan ses genom rekommendationer och andra funktioner
+        discoverable: Tillåt att ditt konto upptäcks av främlingar genom rekommendationer, trender och andra funktioner
         email: Du kommer att få ett bekräftelsemeddelande via e-post
         fields: Du kan ha upp till 4 objekt visade som en tabell på din profil
         header: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
+        inbox_url: Kopiera webbadressen från hemsidan av det ombud du vill använda
         irreversible: Filtrerade inlägg kommer att försvinna oåterkalleligt, även om filter tas bort senare
         locale: Språket för användargränssnittet, e-postmeddelanden och push-aviseringar
         locked: Kräver att du manuellt godkänner följare
         password: Använd minst 8 tecken
+        phrase: Matchas oavsett användande i text eller innehållsvarning för ett inlägg
+        scopes: 'Vilka API: er applikationen kommer tillåtas åtkomst till. Om du väljer en omfattning på högstanivån behöver du inte välja individuella sådana.'
+        setting_aggregate_reblogs: Visa inte nya boostar för inlägg som nyligen blivit boostade (påverkar endast nymottagna boostar)
+        setting_always_send_emails: E-postnotiser kommer vanligtvis inte skickas när du aktivt använder Mastodon
+        setting_default_sensitive: Känslig media döljs som standard och kan visas med ett klick
         setting_display_media_default: Dölj media markerad som känslig
         setting_display_media_hide_all: Dölj alltid all media
         setting_display_media_show_all: Visa alltid media markerad som känslig
         setting_hide_network: Vem du följer och vilka som följer dig kommer inte att visas på din profilsida
         setting_noindex: Påverkar din offentliga profil och statussidor
+        setting_show_application: Applikationen du använder för att göra inlägg kommer visas i detaljvyn för dina inlägg
+        setting_use_blurhash: Gradienter är baserade på färgerna av de dolda objekten men fördunklar alla detaljer
+        setting_use_pending_items: Dölj tidslinjeuppdateringar bakom ett klick istället för att automatiskt bläddra i flödet
         username: Ditt användarnamn måste vara unikt på %{domain}
+        whole_word: När sökordet eller frasen endast är alfanumerisk, kommer det endast att tillämpas om det matchar hela ordet
+      domain_allow:
+        domain: Denna domän kommer att kunna hämta data från denna server och inkommande data från den kommer att behandlas och lagras
+      email_domain_block:
+        domain: Detta kan vara domännamnet som dyker upp i e-postadressen eller MX-posten som används. De kommer kontrolleras vid registrering.
+        with_dns_records: Ett försök att slå upp den angivna domänens DNS-poster kommer att göras och resultaten kommer också att blockeras
       featured_tag:
-        name: 'Du kan vilja använda en av dessa:'
+        name: 'Här är några av de hashtaggar du använt nyligen:'
+      filters:
+        action: Välj vilken åtgärd som ska utföras när ett inlägg matchar filtret
+        actions:
+          hide: Dölj det filtrerade innehållet helt (beter sig som om det inte fanns)
+          warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
+      form_admin_settings:
+        backups_retention_period: Behåll genererade användararkiv i det angivna antalet dagar.
+        bootstrap_timeline_accounts: Dessa konton kommer fästas högst upp i nya användares följrekommendationer.
+        closed_registrations_message: Visas när nyregistreringar är avstängda
+        content_cache_retention_period: Inlägg från andra servrar kommer att raderas efter det angivna antalet dagar när detta är inställt på ett positivt värde. Åtgärden kan vara oåterkallelig.
+        custom_css: Du kan använda anpassade stilar på webbversionen av Mastodon.
+        mascot: Åsidosätter illustrationen i det avancerade webbgränssnittet.
+        media_cache_retention_period: Nedladdade mediefiler kommer raderas efter det angivna antalet dagar, om inställt till ett positivt värde, och laddas ned på nytt vid behov.
+        profile_directory: Profilkatalogen visar alla användare som har samtyckt till att bli upptäckbara.
+        require_invite_text: Gör fältet "Varför vill du gå med?" obligatoriskt när nyregistreringar kräver manuellt godkännande
+        site_contact_email: Hur människor kan nå dig för juridiska spörsmål eller supportfrågor.
+        site_contact_username: Hur folk kan nå dig på Mastodon.
+        site_extended_description: Eventuell övrig information som kan vara användbar för besökare och dina användare. Kan struktureras med Markdown-syntax.
+        site_short_description: En kort beskrivning för att unikt identifiera din server. Vem är det som driver den, vilka är den till för?
+        site_terms: Använd din egen sekretesspolicy eller lämna tomt för att använda standardinställningen. Kan struktureras med Markdown-syntax.
+        site_title: Hur folk kan hänvisa till din server förutom med dess domännamn.
+        theme: Tema som utloggade besökare och nya användare ser.
+        thumbnail: En bild i cirka 2:1-proportioner som visas tillsammans med din serverinformation.
+        timeline_preview: Utloggade besökare kommer kunna bläddra bland de senaste offentliga inläggen som finns på servern.
+        trendable_by_default: Hoppa över manuell granskning av trendande innehåll. Enskilda objekt kan ändå raderas från trender retroaktivt.
+        trends: Trender visar vilka inlägg, hashtaggar och nyheter det pratas om på din server.
+      form_challenge:
+        current_password: Du går in i ett säkert område
       imports:
-        data: CSV-fil som exporteras från en annan Mastodon-instans
+        data: CSV-fil som exporterats från en annan Mastodon-server
+      invite_request:
+        text: Detta kommer hjälpa oss att granska din ansökan
+      ip_block:
+        comment: Valfritt. Kom ihåg varför du lade till denna regel.
+        expires_in: IP-adresser är en ändlig resurs, de delas ibland och byter ofta händer. Av den här anledningen så rekommenderas inte IP-blockeringar på obestämd tid.
+        ip: Ange en IPv4- eller IPv6-adress. Du kan blockera hela intervall med hjälp av CIDR-syntax. Var försiktig så att du inte låser ute dig själv!
+        severities:
+          no_access: Blockera åtkomst till alla resurser
+          sign_up_block: Nyregistreringar kommer inte vara möjliga
+          sign_up_requires_approval: Nya registreringar kräver ditt godkännande
+        severity: Välj vad som ska hända med förfrågningar från denna IP
       rule:
-        text: Beskriv en kort och enkel regel för användare på denna server
+        text: Beskriv en regel eller ett krav för användare av denna server. Försök hålla det kort och koncist
       sessions:
-        otp: 'Ange tvåfaktorkoden genererad från din telefonapp eller använd någon av dina återställningskoder:'
+        otp: 'Ange tvåfaktorskoden som genererades av din telefonapp, eller använd någon av dina återställningskoder:'
+        webauthn: Om det är en USB-nyckel se till att sätta in den och, om nödvändigt, tryck på den.
+      tag:
+        name: Du kan bara ändra skriftläget av bokstäverna, till exempel, för att göra det mer läsbart
       user:
-        chosen_languages: När aktiverat så visas bara inlägg i dina valda språk i den offentliga tidslinjen
+        chosen_languages: Vid aktivering visas bara inlägg på dina valda språk i offentliga tidslinjer
+        role: Rollen bestämmer vilka behörigheter användaren har
+      user_role:
+        color: Färgen som ska användas för rollen i användargränssnittet, som RGB i hex-format
+        highlighted: Detta gör rollen synlig offentligt
+        name: Offentligt namn på rollen, om rollen är inställd på att visas som ett emblem
+        permissions_as_keys: Användare med denna roll kommer ha tillgång till...
+        position: Högre roll avgör konfliktlösning i vissa situationer. Vissa åtgärder kan endast utföras på roller med lägre prioritet
+      webhook:
+        events: Välj händelser att skicka
+        url: Dit händelser kommer skickas
     labels:
       account:
         fields:
@@ -61,23 +138,28 @@ sv:
       account_migration:
         acct: Namnet på det nya kontot
       account_warning_preset:
+        text: Förinställd text
         title: Rubrik
       admin_account_action:
-        send_email_notification: Meddela användaren via e-post
+        include_statuses: Inkludera rapporterade inlägg i e-postmeddelandet
+        send_email_notification: Notifiera användaren via e-post
         text: Anpassad varning
         type: Åtgärd
         types:
-          disable: Inaktivera inloggning
-          none: Gör ingenting
+          disable: Frys
+          none: Skicka en varning
           sensitive: Känslig
           silence: Tysta
-          suspend: Stäng av
+          suspend: Pausa
+        warning_preset_id: Använd en förinställd varning
       announcement:
         all_day: Heldagsevenemang
         ends_at: Evenemangets slut
         scheduled_at: Schemalägg publicering
         starts_at: Evenemangets början
         text: Kungörelse
+      appeal:
+        text: Redogör anledningen till att detta beslut bör upphävas
       defaults:
         autofollow: Bjud in till att följa ditt konto
         avatar: Profilbild
@@ -85,35 +167,36 @@ sv:
         chosen_languages: Filtrera språk
         confirm_new_password: Bekräfta nytt lösenord
         confirm_password: Bekräfta lösenord
-        context: Filter sammanhang
+        context: Filtrera sammanhang
         current_password: Nuvarande lösenord
         data: Data
-        discoverable: Lista detta konto i katalogen
+        discoverable: Föreslå konto för andra
         display_name: Visningsnamn
         email: E-postadress
-        expires_in: Förfaller efter
+        expires_in: Utgår efter
         fields: Profil-metadata
-        header: Bakgrundsbild
+        header: Sidhuvud
         honeypot: "%{label} (fyll inte i)"
-        inbox_url: URL för reläinkorg
+        inbox_url: Webbadress för ombudsinkorg
         irreversible: Släng istället för att dölja
-        locale: Språk
-        locked: Lås konto
-        max_uses: Högst antal  användningar
+        locale: Språk för gränssnittet
+        locked: Kräv följförfrågningar
+        max_uses: Max antal användningar
         new_password: Nytt lösenord
         note: Biografi
         otp_attempt: Tvåfaktorskod
         password: Lösenord
-        phrase: Nyckelord eller fras
+        phrase: Nyckelord eller -fras
         setting_advanced_layout: Aktivera avancerat webbgränssnitt
-        setting_aggregate_reblogs: Gruppera knuffar i tidslinjer
-        setting_auto_play_gif: Spela upp animerade GIF-bilder automatiskt
-        setting_boost_modal: Visa bekräftelsedialog innan du knuffar
-        setting_crop_images: Beskär bilder i icke-utökade tutningar till 16x9
-        setting_default_language: Språk
-        setting_default_privacy: Postintegritet
+        setting_aggregate_reblogs: Gruppera boostar i tidslinjer
+        setting_always_send_emails: Skicka alltid e-postnotiser
+        setting_auto_play_gif: Spela upp GIF:ar automatiskt
+        setting_boost_modal: Visa bekräftelsedialog innan boostning
+        setting_crop_images: Beskär bilder i icke-utökade inlägg till 16x9
+        setting_default_language: Inläggsspråk
+        setting_default_privacy: Inläggsintegritet
         setting_default_sensitive: Markera alltid media som känsligt
-        setting_delete_modal: Visa bekräftelsedialog innan du raderar en toot
+        setting_delete_modal: Visa bekräftelsedialog innan radering av inlägg
         setting_disable_swiping: Inaktivera svepande rörelser
         setting_display_media: Mediavisning
         setting_display_media_default: Standard
@@ -132,6 +215,7 @@ sv:
         setting_use_pending_items: Långsamt läge
         severity: Strikthet
         sign_in_token_attempt: Säkerhetskod
+        title: Rubrik
         type: Importtyp
         username: Användarnamn
         username_or_email: Användarnamn eller e-mail
@@ -140,9 +224,37 @@ sv:
         with_dns_records: Inkludera MX-poster och IP-adresser för domänen
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Dölj helt
+          warn: Dölj med en varning
+      form_admin_settings:
+        backups_retention_period: Lagringsperiod för användararkivet
+        bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
+        closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
+        content_cache_retention_period: Tid för bibehållande av innehållscache
+        custom_css: Anpassad CSS
+        mascot: Anpassad maskot (tekniskt arv)
+        media_cache_retention_period: Tid för bibehållande av mediecache
+        profile_directory: Aktivera profilkatalog
+        registrations_mode: Vem kan registrera sig
+        require_invite_text: Kräv anledning för att gå med
+        show_domain_blocks: Visa domänblockeringar
+        show_domain_blocks_rationale: Visa varför domäner blockerades
+        site_contact_email: Kontakt via e-post
+        site_contact_username: Användarnamn för kontakt
+        site_extended_description: Utökad beskrivning
+        site_short_description: Serverbeskrivning
+        site_terms: Integritetspolicy
+        site_title: Servernamn
+        theme: Standardtema
+        thumbnail: Serverns tumnagelbild
+        timeline_preview: Tillåt oautentiserad åtkomst till offentliga tidslinjer
+        trendable_by_default: Tillåt trender utan föregående granskning
+        trends: Aktivera trender
       interactions:
-        must_be_follower: Blockera aviseringar från icke-följare
-        must_be_following: Blockera aviseringar från personer du inte följer
+        must_be_follower: Blockera notiser från icke-följare
+        must_be_following: Blockera notiser från personer du inte följer
         must_be_following_dm: Blockera direktmeddelanden från personer du inte följer
       invite:
         comment: Kommentar
@@ -153,30 +265,44 @@ sv:
         ip: IP
         severities:
           no_access: Blockera åtkomst
+          sign_up_block: Blockera registreringar
           sign_up_requires_approval: Begränsa registreringar
         severity: Regel
       notification_emails:
-        digest: Skicka sammandrag via e-post
-        favourite: Skicka e-post när någon favoriserar din status
-        follow: Skicka e-post när någon följer dig
-        follow_request: Skicka e-post när någon begär att följa dig
-        mention: Skicka e-post när någon nämner dig
-        pending_account: Nytt konto behöver granskas
-        reblog: Skicka e-post när någon knuffar din status
-        report: Ny rapport har skickats
-        trending_tag: En ogranskad hashtag trendar
+        appeal: Någon överklagar ett moderatorbeslut
+        digest: Skicka e-postsammandrag
+        favourite: Någon favoritmarkerar ditt inlägg
+        follow: Någon följt dig
+        follow_request: Någon begärt att följa dig
+        mention: Någon nämnt dig
+        pending_account: Ett nytt konto behöver granskas
+        reblog: Någon boostade ditt inlägg
+        report: En ny rapport har skickats
+        trending_tag: En ny trend kräver granskning
       rule:
         text: Regel
       tag:
-        listable: Tillåt att denna hashtag visas i sökningar och förslag
-        name: Hashtag
-        trendable: Tillåt att denna hashtag visas under trender
-        usable: Tillåt tutningar att använda denna hashtag
+        listable: Tillåt denna hashtagg att visas i sökningar och förslag
+        name: Hashtagg
+        trendable: Tillåt denna hashtagg att visas under trender
+        usable: Tillåt inlägg att använda denna hashtagg
+      user:
+        role: Roll
+      user_role:
+        color: Emblemsfärg
+        highlighted: Visa roll som emblem på användarprofiler
+        name: Namn
+        permissions_as_keys: Behörigheter
+        position: Prioritet
+      webhook:
+        events: Aktiverade händelser
+        url: Slutpunkts-URL
     'no': Nej
+    not_recommended: Rekommenderas inte
     recommended: Rekommenderad
     required:
       mark: "*"
-      text: obligatorisk
+      text: krävs
     title:
       sessions:
         webauthn: Använd en av dina säkerhetsnycklar för att logga in
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index e306ce64d..3dbea2009 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -26,7 +26,6 @@ ta:
         setting_display_media_hide_all: எப்போதும் எல்லா ஊடகங்களையும் மறைக்கவும்
         setting_display_media_show_all: உணர்ச்சி வயப்படு (Sensitive) குறிக்கப்பட்ட மீடியாவை எப்போதும் காட்டுங்கள்
       email_domain_block:
-        domain: இது மின்னஞ்சலில் காணப்படும் களத்தின் பெயராக இருக்கலாம், அல்லது அக்களம் சார்ந்திருக்கும் MX record-ஆக இருக்கலாம், அல்லது அந்த MX record சார்ந்திருக்கும் சர்வரின் IP முகவரியாக இருக்கலாம். பயனர் கணக்கைத் துவங்கும்போது அவை கண்காணிக்கப்பட்டு, கணக்குத் துவக்கம் நிராகரிக்கப்படும்.
         with_dns_records: இக்களத்தின் DNS record-களை சரிசெய்யும் முயற்சி மேற்கொள்ளப்படும், மற்றும் அதன் முடிவுகள் தடுப்புப்பட்டியலில் சேர்க்கப்படும்
     labels:
       account:
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 8311e1d12..3635c3990 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -20,34 +20,36 @@ th:
           sensitive: บังคับให้ทำเครื่องหมายไฟล์แนบสื่อของผู้ใช้นี้ทั้งหมดว่าละเอียดอ่อน
           silence: ป้องกันไม่ให้ผู้ใช้สามารถโพสต์โดยมีการมองเห็นเป็นสาธารณะ ซ่อนโพสต์และการแจ้งเตือนของเขาจากผู้คนที่ไม่ได้กำลังติดตามผู้ใช้
           suspend: ป้องกันไม่ให้มีการโต้ตอบใด ๆ จากหรือไปยังบัญชีนี้และลบเนื้อหาของบัญชี แปลงกลับได้ภายใน 30 วัน
-        warning_preset_id: ไม่จำเป็น คุณยังสามารถเพิ่มข้อความที่กำหนดเองที่จุดสิ้นสุดของค่าที่ตั้งไว้ล่วงหน้า
+        warning_preset_id: ไม่จำเป็น คุณยังคงสามารถเพิ่มข้อความที่กำหนดเองที่จุดสิ้นสุดของค่าที่ตั้งไว้ล่วงหน้า
       announcement:
         all_day: เมื่อกาเครื่องหมาย จะแสดงเฉพาะวันที่ของช่วงเวลาเท่านั้น
         ends_at: ไม่จำเป็น จะเลิกเผยแพร่ประกาศที่เวลานี้โดยอัตโนมัติ
         scheduled_at: เว้นว่างไว้เพื่อเผยแพร่ประกาศทันที
-        starts_at: ไม่จำเป็น ในกรณีที่ประกาศของคุณผูกไว้กับช่วงเวลาที่เจาะจง
+        starts_at: ไม่จำเป็น ในกรณีที่ประกาศของคุณผูกไว้กับช่วงเวลาที่เฉพาะเจาะจง
         text: คุณสามารถใช้ไวยากรณ์โพสต์ โปรดระวังพื้นที่ที่ประกาศจะใช้ในหน้าจอของผู้ใช้
+      appeal:
+        text: คุณสามารถอุทธรณ์การดำเนินการได้เพียงครั้งเดียวเท่านั้น
       defaults:
         autofollow: ผู้คนที่ลงทะเบียนผ่านคำเชิญจะติดตามคุณโดยอัตโนมัติ
         avatar: PNG, GIF หรือ JPG สูงสุด %{size} จะถูกย่อขนาดเป็น %{dimensions}px
         bot: ส่งสัญญาณให้ผู้อื่นว่าบัญชีทำการกระทำแบบอัตโนมัติเป็นหลักและอาจไม่ได้รับการสังเกตการณ์
-        context: บริบทจำนวนหนึ่งหรือมากกว่าที่ตัวกรองควรใช้
+        context: หนึ่งหรือหลายบริบทที่ตัวกรองควรนำไปใช้
         current_password: เพื่อวัตถุประสงค์ด้านความปลอดภัย โปรดป้อนรหัสผ่านของบัญชีปัจจุบัน
         current_username: เพื่อยืนยัน โปรดป้อนชื่อผู้ใช้ของบัญชีปัจจุบัน
         digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
-        discoverable: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำและคุณลักษณะอื่น ๆ
-        discoverable_no_directory: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำและคุณลักษณะอื่น ๆ
+        discoverable: อนุญาตให้คนแปลกหน้าค้นพบบัญชีของคุณได้ผ่านคำแนะนำ, แนวโน้ม และคุณลักษณะอื่น ๆ
         email: คุณจะได้รับอีเมลยืนยัน
         fields: คุณสามารถมีได้มากถึง 4 รายการแสดงเป็นตารางในโปรไฟล์ของคุณ
         header: PNG, GIF หรือ JPG สูงสุด %{size} จะถูกย่อขนาดเป็น %{dimensions}px
         inbox_url: คัดลอก URL จากหน้าแรกของรีเลย์ที่คุณต้องการใช้
-        irreversible: โพสต์ที่กรองจะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลัง
+        irreversible: โพสต์ที่กรองอยู่จะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลังก็ตาม
         locale: ภาษาของส่วนติดต่อผู้ใช้, อีเมล และการแจ้งเตือนแบบผลัก
         locked: ควบคุมผู้ที่สามารถติดตามคุณด้วยตนเองได้โดยอนุมัติคำขอติดตาม
         password: ใช้อย่างน้อย 8 ตัวอักษร
         phrase: จะถูกจับคู่โดยไม่คำนึงถึงตัวพิมพ์ใหญ่เล็กในข้อความหรือคำเตือนเนื้อหาของโพสต์
-        scopes: API ใดที่แอปพลิเคชันจะได้รับอนุญาตให้เข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกแต่ละขอบเขต
+        scopes: API ใดที่จะอนุญาตให้แอปพลิเคชันเข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกขอบเขตแต่ละรายการ
         setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น)
+        setting_always_send_emails: โดยปกติจะไม่ส่งการแจ้งเตือนอีเมลเมื่อคุณกำลังใช้ Mastodon อยู่
         setting_default_sensitive: ซ่อนสื่อที่ละเอียดอ่อนเป็นค่าเริ่มต้นและสามารถเปิดเผยได้ด้วยการคลิก
         setting_display_media_default: ซ่อนสื่อที่มีการทำเครื่องหมายว่าละเอียดอ่อน
         setting_display_media_hide_all: ซ่อนสื่อเสมอ
@@ -62,9 +64,36 @@ th:
       domain_allow:
         domain: โดเมนนี้จะสามารถดึงข้อมูลจากเซิร์ฟเวอร์นี้และจะประมวลผลและจัดเก็บข้อมูลขาเข้าจากโดเมน
       email_domain_block:
+        domain: สิ่งนี้สามารถเป็นชื่อโดเมนที่ปรากฏในที่อยู่อีเมลหรือระเบียน MX ที่โดเมนใช้ จะตรวจสอบโดเมนเมื่อลงทะเบียน
         with_dns_records: จะทำการพยายามแปลงที่อยู่ระเบียน DNS ของโดเมนที่กำหนดและจะปิดกั้นผลลัพธ์เช่นกัน
       featured_tag:
-        name: 'คุณอาจต้องการใช้หนึ่งในนี้:'
+        name: 'นี่คือแฮชแท็กบางส่วนที่คุณได้ใช้ล่าสุด:'
+      filters:
+        action: เลือกว่าการกระทำใดที่จะทำเมื่อโพสต์ตรงกับตัวกรอง
+        actions:
+          hide: ซ่อนเนื้อหาที่กรองอยู่อย่างสมบูรณ์ ทำเสมือนว่าไม่มีเนื้อหาอยู่
+          warn: ซ่อนเนื้อหาที่กรองอยู่หลังคำเตือนที่กล่าวถึงชื่อเรื่องของตัวกรอง
+      form_admin_settings:
+        backups_retention_period: เก็บการเก็บถาวรผู้ใช้ที่สร้างขึ้นตามจำนวนวันที่ระบุ
+        bootstrap_timeline_accounts: จะปักหมุดบัญชีเหล่านี้ไว้ด้านบนสุดของคำแนะนำการติดตามของผู้ใช้ใหม่
+        closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
+        content_cache_retention_period: จะลบโพสต์จากเซิร์ฟเวอร์อื่น ๆ หลังจากจำนวนวันที่ระบุเมื่อตั้งเป็นค่าบวก นี่อาจย้อนกลับไม่ได้
+        custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
+        mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
+        media_cache_retention_period: จะลบไฟล์สื่อที่ดาวน์โหลดหลังจากจำนวนวันที่ระบุเมื่อตั้งเป็นค่าบวก และดาวน์โหลดใหม่ตามความต้องการ
+        profile_directory: ไดเรกทอรีโปรไฟล์แสดงรายการผู้ใช้ทั้งหมดที่ได้เลือกรับให้สามารถค้นพบได้
+        require_invite_text: เมื่อการลงทะเบียนต้องมีการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
+        site_contact_email: วิธีที่ผู้คนสามารถเข้าถึงคุณสำหรับการสอบถามด้านกฎหมายหรือการสนับสนุน
+        site_contact_username: วิธีที่ผู้คนสามารถเข้าถึงคุณใน Mastodon
+        site_extended_description: ข้อมูลเพิ่มเติมใด ๆ ที่อาจเป็นประโยชน์กับผู้เยี่ยมชมและผู้ใช้ของคุณ สามารถจัดโครงสร้างด้วยไวยากรณ์ Markdown
+        site_short_description: คำอธิบายแบบสั้นเพื่อช่วยระบุเซิร์ฟเวอร์ของคุณอย่างไม่ซ้ำกัน ผู้ดำเนินการเซิร์ฟเวอร์ เซิร์ฟเวอร์สำหรับใคร?
+        site_terms: ใช้นโยบายความเป็นส่วนตัวของคุณเองหรือเว้นว่างไว้เพื่อใช้ค่าเริ่มต้น สามารถจัดโครงสร้างด้วยไวยากรณ์ Markdown
+        site_title: วิธีที่ผู้คนอาจอ้างอิงถึงเซิร์ฟเวอร์ของคุณนอกเหนือจากชื่อโดเมนของเซิร์ฟเวอร์
+        theme: ชุดรูปแบบที่ผู้เยี่ยมชมที่ออกจากระบบและผู้ใช้ใหม่เห็น
+        thumbnail: แสดงภาพ 2:1 โดยประมาณควบคู่ไปกับข้อมูลเซิร์ฟเวอร์ของคุณ
+        timeline_preview: ผู้เยี่ยมชมที่ออกจากระบบจะสามารถเรียกดูโพสต์สาธารณะล่าสุดที่มีในเซิร์ฟเวอร์
+        trendable_by_default: ข้ามการตรวจทานเนื้อหาที่กำลังนิยมด้วยตนเอง ยังคงสามารถเอารายการแต่ละรายการออกจากแนวโน้มได้หลังเกิดเหตุ
+        trends: แนวโน้มแสดงว่าโพสต์, แฮชแท็ก และเรื่องข่าวใดกำลังได้รับความสนใจในเซิร์ฟเวอร์ของคุณ
       form_challenge:
         current_password: คุณกำลังเข้าสู่พื้นที่ปลอดภัย
       imports:
@@ -73,16 +102,32 @@ th:
         text: นี่จะช่วยให้เราตรวจทานใบสมัครของคุณ
       ip_block:
         comment: ไม่จำเป็น จดจำเหตุผลที่คุณเพิ่มกฎนี้
+        expires_in: ที่อยู่ IP เป็นทรัพยากรที่มีจำกัด บางครั้งที่อยู่ใช้ร่วมกันและมักเปลี่ยนมือ ด้วยเหตุผลนี้ การปิดกั้น IP แบบไม่มีกำหนดจึงไม่แนะนำ
+        ip: ป้อนที่อยู่ IPv4 หรือ IPv6 คุณสามารถปิดกั้นทั้งช่วงได้โดยใช้ไวยากรณ์ CIDR ระวังอย่าล็อคตัวคุณเองออก!
         severities:
           no_access: ปิดกั้นการเข้าถึงทรัพยากรทั้งหมด
+          sign_up_block: จะไม่สามารถทำการลงทะเบียนใหม่
           sign_up_requires_approval: การลงทะเบียนใหม่จะต้องมีการอนุมัติของคุณ
         severity: เลือกสิ่งที่จะเกิดขึ้นกับคำขอจาก IP นี้
+      rule:
+        text: อธิบายกฎหรือข้อกำหนดสำหรับผู้ใช้ในเซิร์ฟเวอร์นี้ พยายามทำให้กฎหรือข้อกำหนดสั้นและเรียบง่าย
       sessions:
         otp: 'ป้อนรหัสสองปัจจัยที่สร้างโดยแอปในโทรศัพท์ของคุณหรือใช้หนึ่งในรหัสกู้คืนของคุณ:'
+        webauthn: หากกุญแจความปลอดภัยเป็นกุญแจ USB ตรวจสอบให้แน่ใจว่าได้เสียบกุญแจ และหากจำเป็น ให้แตะกุญแจ
       tag:
         name: คุณสามารถเปลี่ยนได้เฉพาะตัวพิมพ์ใหญ่เล็กของตัวอักษรเท่านั้น ตัวอย่างเช่น เพื่อทำให้ตัวอักษรอ่านได้ง่ายขึ้น
       user:
         chosen_languages: เมื่อกาเครื่องหมาย จะแสดงเฉพาะโพสต์ในภาษาที่เลือกในเส้นเวลาสาธารณะเท่านั้น
+        role: บทบาทควบคุมว่าสิทธิอนุญาตใดที่ผู้ใช้มี
+      user_role:
+        color: สีที่ใช้สำหรับบทบาททั่วทั้ง UI เป็น RGB ในรูปแบบฐานสิบหก
+        highlighted: สิ่งนี้ทำให้บทบาทปรากฏเป็นสาธารณะ
+        name: ชื่อสาธารณะของบทบาท หากมีการตั้งบทบาทให้แสดงเป็นป้าย
+        permissions_as_keys: ผู้ใช้ที่มีบทบาทนี้จะสามารถเข้าถึง...
+        position: บทบาทที่สูงขึ้นตัดสินใจการแก้ปัญหาข้อขัดแย้งในบางสถานการณ์ การกระทำบางอย่างสามารถทำได้เฉพาะกับบทบาทที่มีระดับความสำคัญต่ำกว่าเท่านั้น
+      webhook:
+        events: เลือกเหตุการณ์ที่จะส่ง
+        url: ที่ซึ่งจะส่งเหตุการณ์ไปยัง
     labels:
       account:
         fields:
@@ -110,9 +155,11 @@ th:
       announcement:
         all_day: เหตุการณ์ตลอดทั้งวัน
         ends_at: การสิ้นสุดเหตุการณ์
-        scheduled_at: จัดกำหนดการเผยแพร่
+        scheduled_at: จัดกำหนดการสำหรับการเผยแพร่
         starts_at: การเริ่มต้นเหตุการณ์
         text: ประกาศ
+      appeal:
+        text: อธิบายเหตุผลที่ควรกลับการตัดสินใจนี้
       defaults:
         autofollow: เชิญให้ติดตามบัญชีของคุณ
         avatar: ภาพประจำตัว
@@ -127,8 +174,9 @@ th:
         display_name: ชื่อที่แสดง
         email: ที่อยู่อีเมล
         expires_in: หมดอายุหลังจาก
-        fields: ข้อมูลเมตาโปรไฟล์
+        fields: ข้อมูลอภิพันธุ์โปรไฟล์
         header: ส่วนหัว
+        honeypot: "%{label} (ไม่ต้องกรอก)"
         inbox_url: URL กล่องขาเข้าแบบรีเลย์
         irreversible: ลบแทนที่จะซ่อน
         locale: ภาษาส่วนติดต่อ
@@ -141,6 +189,7 @@ th:
         phrase: คำสำคัญหรือวลี
         setting_advanced_layout: เปิดใช้งานส่วนติดต่อเว็บขั้นสูง
         setting_aggregate_reblogs: จัดกลุ่มการดันในเส้นเวลา
+        setting_always_send_emails: ส่งการแจ้งเตือนอีเมลเสมอ
         setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
         setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
         setting_crop_images: ครอบตัดภาพในโพสต์ที่ไม่ได้ขยายเป็น 16x9
@@ -166,6 +215,7 @@ th:
         setting_use_pending_items: โหมดช้า
         severity: ความรุนแรง
         sign_in_token_attempt: รหัสความปลอดภัย
+        title: ชื่อเรื่อง
         type: ชนิดการนำเข้า
         username: ชื่อผู้ใช้
         username_or_email: ชื่อผู้ใช้หรืออีเมล
@@ -174,6 +224,34 @@ th:
         with_dns_records: รวมระเบียน MX และ IP ของโดเมน
       featured_tag:
         name: แฮชแท็ก
+      filters:
+        actions:
+          hide: ซ่อนอย่างสมบูรณ์
+          warn: ซ่อนด้วยคำเตือน
+      form_admin_settings:
+        backups_retention_period: ระยะเวลาการเก็บรักษาการเก็บถาวรผู้ใช้
+        bootstrap_timeline_accounts: แนะนำบัญชีเหล่านี้ให้กับผู้ใช้ใหม่เสมอ
+        closed_registrations_message: ข้อความที่กำหนดเองเมื่อการลงทะเบียนไม่พร้อมใช้งาน
+        content_cache_retention_period: ระยะเวลาการเก็บรักษาแคชเนื้อหา
+        custom_css: CSS ที่กำหนดเอง
+        mascot: มาสคอตที่กำหนดเอง (ดั้งเดิม)
+        media_cache_retention_period: ระยะเวลาการเก็บรักษาแคชสื่อ
+        profile_directory: เปิดใช้งานไดเรกทอรีโปรไฟล์
+        registrations_mode: ผู้ที่สามารถลงทะเบียน
+        require_invite_text: ต้องมีเหตุผลที่จะเข้าร่วม
+        show_domain_blocks: แสดงการปิดกั้นโดเมน
+        show_domain_blocks_rationale: แสดงเหตุผลที่โดเมนได้รับการปิดกั้น
+        site_contact_email: อีเมลสำหรับติดต่อ
+        site_contact_username: ชื่อผู้ใช้สำหรับติดต่อ
+        site_extended_description: คำอธิบายแบบขยาย
+        site_short_description: คำอธิบายเซิร์ฟเวอร์
+        site_terms: นโยบายความเป็นส่วนตัว
+        site_title: ชื่อเซิร์ฟเวอร์
+        theme: ชุดรูปแบบเริ่มต้น
+        thumbnail: ภาพขนาดย่อเซิร์ฟเวอร์
+        timeline_preview: อนุญาตการเข้าถึงเส้นเวลาสาธารณะที่ไม่ได้รับรองความถูกต้อง
+        trendable_by_default: อนุญาตแนวโน้มโดยไม่มีการตรวจทานล่วงหน้า
+        trends: เปิดใช้งานแนวโน้ม
       interactions:
         must_be_follower: ปิดกั้นการแจ้งเตือนจากผู้ที่ไม่ใช่ผู้ติดตาม
         must_be_following: ปิดกั้นการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม
@@ -187,18 +265,20 @@ th:
         ip: IP
         severities:
           no_access: ปิดกั้นการเข้าถึง
+          sign_up_block: ปิดกั้นการลงทะเบียน
           sign_up_requires_approval: จำกัดการลงทะเบียน
         severity: กฎ
       notification_emails:
+        appeal: ใครสักคนอุทธรณ์การตัดสินใจของผู้ควบคุม
         digest: ส่งอีเมลสรุป
         favourite: ใครสักคนได้ชื่นชอบโพสต์ของคุณ
         follow: ใครสักคนได้ติดตามคุณ
         follow_request: ใครสักคนได้ขอติดตามคุณ
         mention: ใครสักคนได้กล่าวถึงคุณ
-        pending_account: บัญชีใหม่ต้องมีการตรวจทาน
+        pending_account: บัญชีใหม่จำเป็นต้องมีการตรวจทาน
         reblog: ใครสักคนได้ดันโพสต์ของคุณ
         report: มีการส่งรายงานใหม่
-        trending_tag: แฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม
+        trending_tag: แนวโน้มใหม่ต้องการการตรวจทาน
       rule:
         text: กฎ
       tag:
@@ -206,7 +286,19 @@ th:
         name: แฮชแท็ก
         trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
         usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้
+      user:
+        role: บทบาท
+      user_role:
+        color: สีป้าย
+        highlighted: แสดงบทบาทเป็นป้ายในโปรไฟล์ผู้ใช้
+        name: ชื่อ
+        permissions_as_keys: สิทธิอนุญาต
+        position: ระดับความสำคัญ
+      webhook:
+        events: เหตุการณ์ที่เปิดใช้งาน
+        url: URL ปลายทาง
     'no': ไม่
+    not_recommended: ไม่แนะนำ
     recommended: แนะนำ
     required:
       mark: "*"
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 88c96896c..5ccb60169 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -3,16 +3,16 @@ tr:
   simple_form:
     hints:
       account_alias:
-        acct: Taşımak istediğiniz hesabın kullanıcıadı@alanadını belirtin
+        acct: Taşımak istediğiniz hesabı kullanıcıadı@alanadı şeklinde belirtin
       account_migration:
-        acct: Taşımak istediğiniz hesabın kullanıcıadı@alanadını belirtin
+        acct: Yeni hesabınızı kullanıcıadı@alanadını şeklinde belirtin
       account_warning_preset:
-        text: URL'ler, etiketler ve bahsedenler gibi toot sözdizimini kullanabilirsiniz
+        text: URL'ler, etiketler ve bahsedenler gibi gönderi sözdizimini kullanabilirsiniz
         title: İsteğe bağlı. Alıcıya görünmez
       admin_account_action:
-        include_statuses: Kullanıcı hangi tootların denetleme eylemi ya da uyarısına neden olduğunu görecektir
+        include_statuses: Kullanıcı hangi gönderilerin denetleme eylemi veya uyarısına neden olduğunu görecektir
         send_email_notification: Kullanıcı, hesabına ne olduğuna dair bir açıklama alacak
-        text_html: İsteğe bağlı. Toot sözdizimleri kullanabilirsiniz. Zamandan kazanmak için <a href="%{path}">uyarı ön-ayarları ekleyebilirsiniz</a>
+        text_html: İsteğe bağlı. Gönderi sözdizimini kullanabilirsiniz. Zamandan kazanmak için <a href="%{path}">uyarı ön-ayarları ekleyebilirsiniz</a>
         type_html: "<strong>%{acct}</strong> ile ne yapılacağını seçin"
         types:
           disable: Kullanıcının hesabını kullanmasını engelle ama içeriklerini silme veya gizleme.
@@ -26,7 +26,9 @@ tr:
         ends_at: İsteğe bağlı. Duyuru, bu tarihte otomatik olarak yayından kaldırılacak
         scheduled_at: Duyuruyu hemen yayınlamak için boş bırakın
         starts_at: İsteğe bağlı. Duyurunuzun belirli bir zaman aralığına bağlı olması durumunda
-        text: Toot söz dizimini kullanabilirsiniz. Lütfen duyurunun kullanıcının ekranında yer alacağı alanı göz önünde bulundurun
+        text: Gönderi sözdizimini kullanabilirsiniz. Lütfen duyurunun kullanıcının ekranında yer alacağı alanı göz önünde bulundurun
+      appeal:
+        text: Bir eyleme yalnızca bir kere itiraz edebilirsiniz
       defaults:
         autofollow: Davetiyeyle kaydolan kişiler sizi otomatik olarak takip eder
         avatar: En fazla %{size} olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px büyüklüğüne indirgenecektir
@@ -35,26 +37,26 @@ tr:
         current_password: Güvenlik nedeniyle lütfen şu anki hesabın parolasını girin
         current_username: Onaylamak için lütfen şu anki hesabın kullanıcı adını girin
         digest: Sadece uzun bir süre hareketsiz kaldıktan sonra ve yalnızca yokluğunuzda herhangi bir kişisel mesaj aldıysanız gönderilir
-        discoverable: Profil dizini, hesabınızın daha geniş bir kitleye ulaşmasının başka bir yoludur
-        discoverable_no_directory: Hesabınızın, öneriler ve diğer özellikler aracılığıyla yabancılar tarafından keşfedilmesine izin verin
+        discoverable: Hesabınızın öneriler, trendler ve diğer özellikler aracılığıyla yabancılar tarafından keşfedilmesine izin verin
         email: Onay e-postası gönderilir
         fields: Profilinizde tablo olarak görüntülenen en fazla 4 ögeye sahip olabilirsiniz
         header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
         inbox_url: Kullanmak istediğiniz aktarıcının ön sayfasından URL'yi kopyalayın
-        irreversible: Filtre uygulanmış tootlar, filtre daha sonra çıkartılsa bile geri dönüşümsüz biçimde kaybolur
+        irreversible: Filtrelenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
         locale: Kullanıcı arayüzünün dili, e-postalar ve push bildirimleri
         locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar.
         password: En az 8 karakter kullanın
-        phrase: Metnin büyük/küçük harf durumundan veya tootun içerik uyarısından bağımsız olarak eşleştirilecek
+        phrase: Metnin büyük/küçük harf durumundan veya gönderinin içerik uyarısından bağımsız olarak eşleştirilecek
         scopes: Uygulamanın erişmesine izin verilen API'ler. Üst seviye bir kapsam seçtiyseniz, bireysel kapsam seçmenize gerek yoktur.
-        setting_aggregate_reblogs: Yakın zamanda boostlanmış tootlar için yeni boostları göstermeyin (yalnızca yeni alınan boostları etkiler)
+        setting_aggregate_reblogs: Yakın zamanda teşvik edilmiş gönderiler için yeni teşvikleri göstermeyin (yalnızca yeni alınan teşvikleri etkiler)
+        setting_always_send_emails: Normalde, Mastodon'u aktif olarak kullanırken e-posta bildirimleri gönderilmeyecektir
         setting_default_sensitive: Hassas medya varsayılan olarak gizlidir ve bir tıklama ile gösterilebilir
         setting_display_media_default: Hassas olarak işaretlenmiş medyayı gizle
         setting_display_media_hide_all: Medyayı her zaman gizle
         setting_display_media_show_all: Medyayı her zaman göster
         setting_hide_network: Takip ettiğiniz ve sizi takip eden kişiler profilinizde gösterilmeyecek
         setting_noindex: Herkese açık profilinizi ve durum sayfalarınızı etkiler
-        setting_show_application: Tootlamak için kullandığınız uygulama, tootlarınızın detaylı görünümünde gösterilecektir
+        setting_show_application: Gönderi gönderimi için kullandığınız uygulama, gönderilerinizin ayrıntılı görünümünde gösterilecektir
         setting_use_blurhash: Gradyenler gizli görsellerin renklerine dayanır, ancak detayları gizler
         setting_use_pending_items: Akışı otomatik olarak kaydırmak yerine, zaman çizelgesi güncellemelerini tek bir tıklamayla gizleyin
         username: Kullanıcı adınız %{domain} alanında benzersiz olacak
@@ -62,10 +64,36 @@ tr:
       domain_allow:
         domain: Bu alan adı, bu sunucudan veri alabilecek ve ondan gelen veri işlenecek ve saklanacaktır
       email_domain_block:
-        domain: Bu, e-posta adresinde görünen etki alanı adı, etki alanının çözümlediği MX kaydı veya MX kaydının çözümlediği sunucunun IP'si olabilir. Bunlar kullanıcı kaydı ile kontrol edilecek ve kayıt reddedilecektir.
+        domain: Bu e-posta adresinde görünen veya kullanılan MX kaydındaki alan adı olabilir. Kayıt sırasında denetleneceklerdir.
         with_dns_records: Belirli bir alanın DNS kayıtlarını çözmeyi deneyecek ve sonuçlar kara listeye eklenecek
       featured_tag:
-        name: 'Bunlardan birini kullanmak isteyebilirsiniz:'
+        name: 'Son zamanlarda sıkça kullandığınız etiketlerin bazıları:'
+      filters:
+        action: Bir gönderi filtreyle eşleştiğinde hangi eylemin yapılacağını seçin
+        actions:
+          hide: Filtrelenmiş içeriği tamamen gizle, sanki varolmamış gibi
+          warn: Filtrelenmiş içeriği, filtrenin başlığından söz eden bir uyarının arkasında gizle
+      form_admin_settings:
+        backups_retention_period: Üretilen kullanıcı arşivlerini belirli gün sayısı kadar sakla.
+        bootstrap_timeline_accounts: Bu hesaplar, yeni kullanıcıların takip önerilerinin tepesinde sabitlenecektir.
+        closed_registrations_message: Kayıt olma kapalıyken görüntülenir
+        content_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan gelen gönderiler belirli bir gün sonra silinecektir. Silme geri alınamayabilir.
+        custom_css: Mastodon'un web sürümüne özel biçimler uygulayabilirsiniz.
+        mascot: Gelişmiş web arayüzündeki illüstrasyonu geçersiz kılar.
+        media_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan indirilen medya dosyaları belirli bir gün sonra silinecektir, isteğe bağlı olarak tekrar indirilebilir.
+        profile_directory: Profil dizini keşfedilebilir olmayı kabul eden tüm kullanıcıları listeler.
+        require_invite_text: Kayıt olmak elle doğrulama gerektiriyorsa, "Neden katılmak istiyorsunuz?" metin girdisini isteğe bağlı yerine zorunlu yapın
+        site_contact_email: İnsanlar yasal konular veya destek hakkında bilgi edinmek için size nasıl ulaşabilir.
+        site_contact_username: İnsanlar size Mastodon'da nasıl ulaşabilir.
+        site_extended_description: Ziyaretçileriniz ve kullanıcılarınıza yardımı dokunabilecek herhangi bir ek bilgi. Markdown sözdizimiyle biçimlendirilebilir.
+        site_short_description: Sunucunuzu tekil olarak tanımlamaya yardımcı olacak kısa tanım. Kim işletiyor, kimin için?
+        site_terms: Kendi gizlilik politikanızı kullanın veya varsayılanı kullanmak için boş bırakın. Markdown sözdizimiyle biçimlendirilebilir.
+        site_title: İnsanlar sunucunuzu alan adı dışında nasıl isimlendirmeli.
+        theme: Giriş yapmamış ziyaretçilerin ve yeni kullanıcıların gördüğü tema.
+        thumbnail: Sunucu bilginizin yanında gösterilen yaklaşık 2:1'lik görüntü.
+        timeline_preview: Giriş yapmamış ziyaretçiler, sunucuda mevcut olan en son genel gönderileri tarayabilecekler.
+        trendable_by_default: Öne çıkan içeriğin elle incelenmesini atla. Tekil öğeler sonrada öne çıkanlardan kaldırılabilir.
+        trends: Öne çıkanlar, sunucunuzda ilgi toplayan gönderileri, etiketleri ve haber yazılarını gösterir.
       form_challenge:
         current_password: Güvenli bir bölgeye giriyorsunuz
       imports:
@@ -78,6 +106,7 @@ tr:
         ip: Bir IPv4 veya IPv6 adresi girin. CIDR sözdizimini kullanarak tüm aralıkları engelleyebilirsiniz. Kendinizi dışarıda bırakmamaya dikkat edin!
         severities:
           no_access: Tüm kaynaklara erişimi engelle
+          sign_up_block: Yeni kayıtlar mümkün olmayacaktır
           sign_up_requires_approval: Yeni kayıt onayınızı gerektirir
         severity: Bu IP'den gelen isteklere ne olacağını seçin
       rule:
@@ -88,7 +117,17 @@ tr:
       tag:
         name: Harflerin, örneğin daha okunabilir yapmak için, sadece büyük/küçük harf durumlarını değiştirebilirsiniz
       user:
-        chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki tootlar genel zaman çizelgelerinde görüntülenir
+        chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki gönderiler genel zaman çizelgelerinde görüntülenir
+        role: Rol, kullanıcıların sahip olduğu izinleri denetler
+      user_role:
+        color: Arayüz boyunca rol için kullanılacak olan renk, hex biçiminde RGB
+        highlighted: Bu rolü herkese açık hale getirir
+        name: Rolün, eğer rozet olarak görüntülenmesi ayarlandıysa kullanılacak herkese açık ismi
+        permissions_as_keys: Bu role sahip kullanıcıların şunlara erişimi var...
+        position: Belirli durumlarda çatışmayı çözmek için daha yüksek rol belirleyicidir. Bazı eylemler ancak daha düşük öncelikteki rollere uygulanabilir
+      webhook:
+        events: Gönderilecek etkinlikleri seçin
+        url: Olayların gönderileceği yer
     labels:
       account:
         fields:
@@ -102,7 +141,7 @@ tr:
         text: Ön ayarlı metin
         title: Başlık
       admin_account_action:
-        include_statuses: Bildirilen tootları e-postaya dahil et
+        include_statuses: Bildirilen gönderileri e-postaya dahil et
         send_email_notification: Kullanıcıyı e-posta ile bilgilendir
         text: Özel uyarı
         type: Eylem
@@ -119,15 +158,17 @@ tr:
         scheduled_at: Yayınlamayı zamanla
         starts_at: Etkinliğin başlangıcı
         text: Duyuru
+      appeal:
+        text: Bu kararın neden geri alınması gerektiğini açıklayın
       defaults:
         autofollow: Hesabınızı takip etmeye davet edin
         avatar: Profil resmi
         bot: Bu bir bot hesabı
         chosen_languages: Dilleri filtrele
-        confirm_new_password: Yeni şifreyi onayla
-        confirm_password: Şifreyi onayla
+        confirm_new_password: Yeni parolayı onayla
+        confirm_password: Parolayı doğrula
         context: İçeriği filtrele
-        current_password: Geçerli şifre
+        current_password: Güncel parola
         data: Veri
         discoverable: Bu hesabı dizinde listele
         display_name: Görünen isim
@@ -137,34 +178,35 @@ tr:
         header: Kapak resmi
         honeypot: "%{label} (doldurmayın)"
         inbox_url: Aktarıcı gelen kutusunun URL'si
-        irreversible: Gizlemek yerine bırak
+        irreversible: Gizlemek yerine benim için sil
         locale: Arayüz dili
         locked: Hesabı kilitle
         max_uses: Maksimum kullanım sayısı
-        new_password: Yeni şifre
+        new_password: Yeni parola
         note: Kişisel bilgiler
         otp_attempt: İki adımlı doğrulama kodu
-        password: Şifre
+        password: Parola
         phrase: Anahtar kelime veya kelime öbeği
         setting_advanced_layout: Gelişmiş web arayüzünü etkinleştir
         setting_aggregate_reblogs: Zaman çizelgesindeki boostları grupla
+        setting_always_send_emails: Her zaman e-posta bildirimleri gönder
         setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
         setting_boost_modal: Boostlamadan önce onay iletişim kutusu göster
-        setting_crop_images: Genişletilmemiş tootlardaki resimleri 16x9 olarak kırp
+        setting_crop_images: Genişletilmemiş gönderilerdeki resimleri 16x9 olarak kırp
         setting_default_language: Gönderi dili
         setting_default_privacy: Gönderi gizliliği
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
-        setting_delete_modal: Bir tootu silmeden önce onay iletişim kutusu göster
+        setting_delete_modal: Bir gönderiyi silmeden önce onay iletişim kutusu göster
         setting_disable_swiping: Kaydırma hareketlerini devre dışı bırak
         setting_display_media: Medya görüntüleme
         setting_display_media_default: Varsayılan
         setting_display_media_hide_all: Tümünü gizle
         setting_display_media_show_all: Tümünü göster
-        setting_expand_spoilers: İçerik uyarılarıyla işaretli tootları her zaman genişlet
+        setting_expand_spoilers: İçerik uyarılarıyla işaretli gönderileri her zaman genişlet
         setting_hide_network: Sosyal grafiğini gizle
         setting_noindex: Arama motoru dizinine eklemeyi iptal et
         setting_reduce_motion: Animasyonlarda hareketi azalt
-        setting_show_application: Tootları göndermek için kullanılan uygulamayı belirt
+        setting_show_application: Gönderileri göndermek için kullanılan uygulamayı belirt
         setting_system_font_ui: Sistemin varsayılan yazı tipini kullan
         setting_theme: Site teması
         setting_trends: Bugünün gündemini göster
@@ -173,6 +215,7 @@ tr:
         setting_use_pending_items: Yavaş mod
         severity: Önem derecesi
         sign_in_token_attempt: Güvenlik kodu
+        title: Başlık
         type: İçeri aktarma türü
         username: Kullanıcı adı
         username_or_email: Kullanıcı adı ya da e-posta
@@ -181,6 +224,34 @@ tr:
         with_dns_records: Alan adının MX kayıtlarını ve IP'lerini ekleyin
       featured_tag:
         name: Etiket
+      filters:
+        actions:
+          hide: Tamamen gizle
+          warn: Uyarıyla gizle
+      form_admin_settings:
+        backups_retention_period: Kullanıcı arşivi saklama süresi
+        bootstrap_timeline_accounts: Bu hesapları yeni kullanıcılara her zaman öner
+        closed_registrations_message: Kayıt olma mevcut değilken gösterilen özel ileti
+        content_cache_retention_period: İçerik önbelleği saklama süresi
+        custom_css: Özel CSS
+        mascot: Özel maskot (eski)
+        media_cache_retention_period: Medya önbelleği saklama süresi
+        profile_directory: Profil dizinini etkinleştir
+        registrations_mode: Kim kaydolabilir
+        require_invite_text: Katılmak için bir gerekçe iste
+        show_domain_blocks: Engellenen alan adlarını göster
+        show_domain_blocks_rationale: Alan adlarının neden engellendiğini göster
+        site_contact_email: İletişim e-postası
+        site_contact_username: İletişim kullanıcı adı
+        site_extended_description: Geniş açıklama
+        site_short_description: Sunucu açıklaması
+        site_terms: Gizlilik Politikası
+        site_title: Sunucu adı
+        theme: Öntanımlı tema
+        thumbnail: Sunucu küçük resmi
+        timeline_preview: Genel zaman çizelgelerine yetkisiz erişime izin ver
+        trendable_by_default: Ön incelemesiz öne çıkanlara izin ver
+        trends: Öne çıkanları etkinleştir
       interactions:
         must_be_follower: Takipçim olmayan kişilerden gelen bildirimleri engelle
         must_be_following: Takip etmediğim kişilerden gelen bildirimleri engelle
@@ -194,9 +265,11 @@ tr:
         ip: IP
         severities:
           no_access: Erişimi engelle
+          sign_up_block: Kayıt olmayı engelle
           sign_up_requires_approval: Kayıtları sınırla
         severity: Kural
       notification_emails:
+        appeal: Birisi, bir yönetim kararına itiraz ediyor
         digest: Özet e-postaları gönder
         favourite: Birisi gönderinizi beğendi
         follow: Biri seni takip etti
@@ -205,15 +278,27 @@ tr:
         pending_account: Yeni hesabın incelenmesi gerekiyor
         reblog: Birisi gönderini boostladı
         report: Yeni rapor gönderildi
-        trending_tag: İncelenmemiş bir etiket gündem oluyor
+        trending_tag: Yeni eğilimin gözden geçmesi gerekiyor
       rule:
         text: Kural
       tag:
         listable: Bu etiketin aramalarda ve profil dizininde görünmesine izin ver
         name: Etiket
         trendable: Bu etiketin gündem altında görünmesine izin ver
-        usable: Tootların bu etiketi kullanmasına izin ver
+        usable: Gönderilerin bu etiketi kullanmasına izin ver
+      user:
+        role: Rol
+      user_role:
+        color: Rozet rengi
+        highlighted: Rolü kullanıcıların profilinde rozet olarak görüntüle
+        name: Ad
+        permissions_as_keys: İzinler
+        position: Öncelik
+      webhook:
+        events: Etkin olaylar
+        url: Uç nokta URL’si
     'no': Hayır
+    not_recommended: Önerilmez
     recommended: Önerilen
     required:
       mark: "*"
diff --git a/config/locales/simple_form.tt.yml b/config/locales/simple_form.tt.yml
index 1b1d034b3..d4e44c0db 100644
--- a/config/locales/simple_form.tt.yml
+++ b/config/locales/simple_form.tt.yml
@@ -17,6 +17,8 @@ tt:
         password: Парол
         setting_display_media_default: Töpcay
         username: Кулланучы исеме
+      featured_tag:
+        name: Хэштег
       invite:
         comment: Аңлатма
       ip_block:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 2ff7bd0b3..06b2f9100 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -7,10 +7,10 @@ uk:
       account_migration:
         acct: Вкажіть ім'я користувача@домен облікового запису, на який ви хочете здійснити перенесення
       account_warning_preset:
-        text: Ви можете використовувати синтаксис дмухів, наприклад URLи, хештеґи та згадки
+        text: Ви можете використовувати синтаксис дописів, наприклад URL, хештеги та згадки
         title: Необов'язково. Не відображається отримувачу
       admin_account_action:
-        include_statuses: Користувач побачить, які дмухи призвели до адміністративних дій або попереджень
+        include_statuses: Користувач побачить, які дописи призвели до адміністративних дій або попереджень
         send_email_notification: Користувач отримає роз'яснення, що сталося з його обліковим записом
         text_html: Необов'язково. Ви можете використовувати синтаксис дмухів. Ви можете <a href="%{path}">додати шаблони попереджень</a>, щоб заощадити час
         type_html: Оберіть, що робити з <strong>%{acct}</strong>
@@ -26,46 +26,74 @@ uk:
         ends_at: Необов'язково. Оголошення буде автоматично знято з публікації
         scheduled_at: Залиште поля незаповненими, щоб опублікувати оголошення відразу
         starts_at: Необов'язково. У разі якщо оголошення прив'язується до певного періоду часу
-        text: Ви можете використовувати той же синтаксис, що і в постах. Будьте завбачливі щодо місця, яке займе оголошення на екрані користувачів
+        text: Ви можете використовувати той же синтаксис, що і в дописах. Будьте завбачливі щодо місця, яке займе оголошення на екрані користувачів
+      appeal:
+        text: Ви можете оскаржити рішення лише один раз
       defaults:
         autofollow: Люди, що зареєструвалися за вашим запрошенням, автоматично підпишуться на вас
         avatar: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
-        bot: Цей акаунт виконує автоматичні дії та може не відстежуватися
+        bot: Цей обліковий запис виконує переважно автоматичні дії та може не відстежуватися
         context: Один або кілька контекстів, до яких повинні бути застосовані фільтри
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
-        discoverable: Ще один шлях, за яким про вас можуть дізнатися користувачі — каталог профілів
-        discoverable_no_directory: Дозволити знаходити ваш обліковий запис стороннім людям за допомогою рекомендацій та інших можливостей
+        discoverable: Дозволити знаходити ваш обліковий запис стороннім людям за допомогою рекомендацій, трендів та інших функцій
         email: Вам надійде електронний лист з підтвердженням
-        fields: До 4 елементів може бути відображено як таблиця у вашому профілі
+        fields: У вашому профілі може бути показано таблицю з 4 елементів
         header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
         inbox_url: Скопіюйте інтернет-адресу з титульної сторінки ретранслятора
-        irreversible: Відсіяні дмухи зникнуть назавжди, навіть якщо фільтр потім буде знято
+        irreversible: Відфільтровані дописи зникнуть назавжди, навіть якщо фільтр потім буде вилучено
         locale: Мова інтерфейсу, електронних листів та push-сповіщень
-        locked: Буде вимагати від Вас самостійного підтверждення підписників, змінить приватність постів за замовчуванням на "тільки для підписників"
+        locked: Вручну контролюйте, хто може слідкувати за вами, затверджуючи запити на стеження
         password: Не менше 8 символів
-        phrase: Шукає без врахування регістру у тексті дмуха або у його попередженні про вміст
+        phrase: Шукає без врахування регістру у тексті допису або у його попередженні про вміст
         scopes: Які API додатку буде дозволено використовувати. Якщо ви виберете самий верхній, нижчестоящі будуть обрані автоматично.
-        setting_aggregate_reblogs: Не показувати передмухи для дмухів, які нещодавно вже були передмухнуті (не вплине на вже отримані передмухи)
-        setting_default_sensitive: Дражливі медіа приховані за промовчанням та можуть бути розкрити кліком
-        setting_display_media_default: Приховувати медіа, помічені як дражливі
+        setting_aggregate_reblogs: Не показувати поширення для дописів, які нещодавно вже були поширені (не вплине на вже отримані поширення)
+        setting_always_send_emails: Зазвичай, під час активного користування Mastodon, сповіщення не будуть відправлятися електронною поштою
+        setting_default_sensitive: Делікатні медіа типово приховані та можуть бути розкриті натисканням
+        setting_display_media_default: Приховувати медіа, позначені як делікатними
         setting_display_media_hide_all: Завжди приховувати медіа
         setting_display_media_show_all: Завжди показувати медіа
-        setting_hide_network: У вашому профілі не буде відображено підписки та підписників
-        setting_noindex: Впливає на ваш публічний профіль та сторінки статусу
-        setting_show_application: Застосунок, за допомогою якого ви дмухнули, буде відображено серед деталей дмуху
+        setting_hide_network: У вашому профілі не буде показано підписки та підписників
+        setting_noindex: Впливає на ваш загальнодоступний профіль і сторінки дописів
+        setting_show_application: Застосунок, за допомогою якого ви зробили допис, буде показано серед подробиць допису
         setting_use_blurhash: Градієнти, що базуються на кольорах прихованих медіа, але роблять нерозрізненними будь-які деталі
-        setting_use_pending_items: Не додавати нові повідомлення до стрічок миттєво. Показувати їх тільки після додаткового клацання.
+        setting_use_pending_items: Не додавати нові повідомлення до стрічок миттєво, показувати лише після додаткового клацання
         username: Ваше ім'я користувача буде унікальним у %{domain}
         whole_word: Якщо пошукове слово або фраза містить лише літери та цифри, воно має збігатися цілком
       domain_allow:
-        domain: Цей домен зможе отримувати дані з цього серверу. Вхідні дані будуть оброблені та збережені
+        domain: Цей домен зможе отримувати дані з цього сервера. Вхідні дані будуть оброблені та збережені
       email_domain_block:
-        domain: Це може бути домен, що відображається у поштовій адресі, запис MX для домену чи IP адреси сервера. Вони будуть перевірені при реєстрації користувача, і реєстрація буде відхилена.
+        domain: Це може бути доменне ім'я, яке відображується в адресі електронної пошти, або використовуваний запис MX. Вони будуть перевірятися при реєстрації.
         with_dns_records: Спроба визначення DNS-записів заданого домену буде здійснена, а результати також будуть занесені до чорного списку
       featured_tag:
-        name: 'Можливо, ви захочете використовувати один з цих:'
+        name: 'Ось деякі використані останнім часом хештеґи:'
+      filters:
+        action: Виберіть дію для виконання коли допис збігається з фільтром
+        actions:
+          hide: Повністю сховати фільтрований вміст, ніби його не існує
+          warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
+      form_admin_settings:
+        backups_retention_period: Зберігати створені архіви користувача вказану кількість днів.
+        bootstrap_timeline_accounts: Ці облікові записи будуть закріплені в топі пропозицій для нових користувачів.
+        closed_registrations_message: Показується, коли реєстрація закрита
+        content_cache_retention_period: Матеріали з інших серверів будуть видалені після вказаної кількості днів, коли встановлено позитивне значення. Ця дія може бути незворотна.
+        custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
+        mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
+        media_cache_retention_period: Завантажені медіафайли будуть видалені після вказаної кількості днів після встановлення додатного значення та повторного завантаження за запитом.
+        profile_directory: У каталозі профілів перераховані всі користувачі, які погодились бути видимими.
+        require_invite_text: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
+        site_contact_email: Як люди можуть зв'язатися з вами для отримання правової допомоги або підтримки.
+        site_contact_username: Як люди можуть зв'язатися з вами у Mastodon.
+        site_extended_description: Будь-яка додаткова інформація, яка може бути корисною для відвідувачів і ваших користувачів. Може бути структурована за допомогою синтаксису Markdown.
+        site_short_description: Короткий опис, щоб допомогти однозначно ідентифікувати ваш сервер. Хто ним керує, для кого він потрібен?
+        site_terms: Використовуйте власну політику приватності або залиште поле порожнім, щоб використовувати усталене значення. Може бути структуровано за допомогою синтаксису Markdown.
+        site_title: Як люди можуть посилатися на ваш сервер, окрім його доменного імені.
+        theme: Тема, яку бачать відвідувачі, що вийшли з системи, та нові користувачі.
+        thumbnail: Зображення приблизно 2:1, що показується поряд з відомостями про ваш сервер.
+        timeline_preview: Зареєстровані відвідувачі зможуть переглядати останні публічні дописи, доступні на сервері.
+        trendable_by_default: Пропустити ручний огляд популярних матеріалів. Індивідуальні елементи все ще можна вилучити з популярних постфактум.
+        trends: Популярні показують, які дописи, хештеґи та новини набувають популярності на вашому сервері.
       form_challenge:
         current_password: Ви входите до безпечної зони
       imports:
@@ -78,21 +106,32 @@ uk:
         ip: Введіть адресу IPv4 або IPv6. Ви можете блокувати цілі діапазони, використовуючи синтаксис CIDR. Будьте обережні, щоб не заблокувати себе!
         severities:
           no_access: Заблокувати доступ до всіх ресурсів
+          sign_up_block: Нові реєстрації будуть неможливі
           sign_up_requires_approval: Нові реєстрації потребуватимуть затвердження вами
         severity: Виберіть, що буде відбуватися з запитами з цієї IP
       rule:
         text: Опис правила або вимоги для користувачів на цьому сервері. Спробуйте зробити його коротким і простим
       sessions:
-        otp: Введите код двухфакторной аутентификации или используйте один из Ваших кодов восстановления.
+        otp: 'Введіть код двофакторної автентифікації, згенерований вашим мобільним застосунком, або скористайтеся одним з ваших кодів відновлення:'
         webauthn: Якщо це USB ключ, вставте його і, якщо необхідно, натисніть на нього.
       tag:
         name: Тут ви можете лише змінювати регістр літер, щоб підвищити читабельність
       user:
-        chosen_languages: У глобальних стрічках будуть відображатися дмухи тільки обраними мовами
+        chosen_languages: У глобальних стрічках будуть показані дописи тільки вибраними мовами
+        role: Роль визначає права користувача
+      user_role:
+        color: Колір, який буде використовуватися для ролі у всьому інтерфейсі, як RGB у форматі hex
+        highlighted: Це робить роль видимою всім
+        name: Загальнодоступна назва ролі, якщо роль налаштована бути показаною у вигляді відзнаки
+        permissions_as_keys: Користувачі з цією роллю матимуть доступ до...
+        position: Вища роль розв'язує конфлікти у певних ситуаціях. Певні дії можуть бути виконані лише щодо ролей з нижчим пріоритетом
+      webhook:
+        events: Оберіть події для надсилання
+        url: Куди надсилатимуться події
     labels:
       account:
         fields:
-          name: Позначка
+          name: Мітка
           value: Вміст
       account_alias:
         acct: Оброблювач старого облікового запису
@@ -102,7 +141,7 @@ uk:
         text: Текст шаблону
         title: Заголовок
       admin_account_action:
-        include_statuses: Додати дмухи, на які ви скаржитесь, до електронного листа
+        include_statuses: Додати дописи, на які ви скаржитесь, до електронного листа
         send_email_notification: Сповістити користувача електронною поштою
         text: Користувацьке попередження
         type: Дія
@@ -119,6 +158,8 @@ uk:
         scheduled_at: Відкладена публікація
         starts_at: Час початку
         text: Оголошення
+      appeal:
+        text: Поясніть, чому це рішення слід скасувати
       defaults:
         autofollow: Запросити слідкувати за вашим обліковим записом
         avatar: Аватар
@@ -131,48 +172,50 @@ uk:
         data: Дані
         discoverable: Оприлюднити обліковий запис у каталозі
         display_name: Ім'я
-        email: Email адреса
+        email: Адреса е-пошти
         expires_in: Закінчується після
-        fields: Метадані профіля
+        fields: Метадані профілю
         header: Заголовок
         honeypot: "%{label} (не заповнюйте)"
         inbox_url: URL поштової скриньки ретранслятора
         irreversible: Видалити назавжди, а не просто сховати
         locale: Мова
-        locked: Зробити акаунт приватним
+        locked: Зробити обліковий запис приватним
         max_uses: Максимальна кількість використань
         new_password: Новий пароль
         note: Про Вас
         otp_attempt: Двофакторний код
         password: Пароль
         phrase: Ключове слово або фраза
-        setting_advanced_layout: Увімкнути розширений web-інтерфейс
-        setting_aggregate_reblogs: Групувати просування в стрічках
+        setting_advanced_layout: Увімкнути розширений вебінтерфейс
+        setting_aggregate_reblogs: Групувати поширення в стрічках
+        setting_always_send_emails: Завжди надсилати сповіщення електронною поштою
         setting_auto_play_gif: Автоматично відтворювати анімовані GIF
-        setting_boost_modal: Відображати діалог підтвердження під час передмухування
-        setting_crop_images: Обрізати зображення в нерозкритих постах до 16x9
-        setting_default_language: Мова дмухів
-        setting_default_privacy: Видимість постів
-        setting_default_sensitive: Позначити медіа як дражливе
-        setting_delete_modal: Показувати діалог підтвердження під час видалення дмуху
-        setting_disable_swiping: Вимкнути рух проведення
-        setting_display_media: Відображення медіа
+        setting_boost_modal: Показувати діалог підтвердження під час поширення
+        setting_crop_images: Обрізати зображення в нерозгорнутих дописах до 16x9
+        setting_default_language: Мова дописів
+        setting_default_privacy: Видимість дописів
+        setting_default_sensitive: Позначати медіа делікатними
+        setting_delete_modal: Показувати діалог підтвердження під час видалення допису
+        setting_disable_swiping: Вимкнути рух посування
+        setting_display_media: Показ медіа
         setting_display_media_default: За промовчанням
         setting_display_media_hide_all: Сховати всі
         setting_display_media_show_all: Показати всі
-        setting_expand_spoilers: Завжди розгортати дмухи з попередженнями про вміст
+        setting_expand_spoilers: Завжди розгортати дописи з попередженнями про вміст
         setting_hide_network: Сховати вашу мережу
         setting_noindex: Відмовитися від індексування пошуковими системами
         setting_reduce_motion: Менше руху в анімаціях
-        setting_show_application: Відображати застосунки, використані для дмухання
+        setting_show_application: Показувати застосунки, з яких створюються дописи
         setting_system_font_ui: Використовувати типовий системний шрифт
         setting_theme: Тема сайту
-        setting_trends: Показати сьогоднішні тренди
-        setting_unfollow_modal: Відображати діалог підтвердження під час відписки від когось
-        setting_use_blurhash: Відображати барвисті градієнти замість прихованих медіа
+        setting_trends: Показувати популярні сьогодні дописи
+        setting_unfollow_modal: Показувати діалог підтвердження під час відписки від когось
+        setting_use_blurhash: Показувати барвисті градієнти замість прихованих медіа
         setting_use_pending_items: Повільний режим
         severity: Серйозність
         sign_in_token_attempt: Код безпеки
+        title: Заголовок
         type: Тип імпорту
         username: Ім'я користувача
         username_or_email: Ім'я користувача або електронна пошта
@@ -181,6 +224,34 @@ uk:
         with_dns_records: Включити MX записи та IP-адреси домену
       featured_tag:
         name: Хештеґ
+      filters:
+        actions:
+          hide: Сховати повністю
+          warn: Сховати за попередженням
+      form_admin_settings:
+        backups_retention_period: Період утримання архіву користувача
+        bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
+        closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
+        content_cache_retention_period: Час зберігання кешу контенту
+        custom_css: Користувацький CSS
+        mascot: Користувацький символ (застарілий)
+        media_cache_retention_period: Період збереження кешу медіа
+        profile_directory: Увімкнути каталог профілів
+        registrations_mode: Хто може зареєструватися
+        require_invite_text: Для того, щоб приєднатися потрібна причина
+        show_domain_blocks: Показати заблоковані домени
+        show_domain_blocks_rationale: Показати чому домени були заблоковані
+        site_contact_email: Контактна адреса електронної пошти
+        site_contact_username: Ім'я контакта
+        site_extended_description: Розширений опис
+        site_short_description: Опис сервера
+        site_terms: Політика приватності
+        site_title: Назва сервера
+        theme: Стандартна тема
+        thumbnail: Мініатюра сервера
+        timeline_preview: Дозволити неавтентифікований доступ до публічних стрічок
+        trendable_by_default: Дозволити популярне без попереднього огляду
+        trends: Увімкнути популярні
       interactions:
         must_be_follower: Блокувати сповіщення від непідписаних людей
         must_be_following: Блокувати сповіщення від людей, на яких ви не підписані
@@ -194,26 +265,40 @@ uk:
         ip: IP
         severities:
           no_access: Заборонити доступ
+          sign_up_block: Блокувати реєстрацію
           sign_up_requires_approval: Обмеження реєстрації
         severity: Правило
       notification_emails:
+        appeal: Хтось подає апеляцію на рішення модератора
         digest: Надсилати дайджест електронною поштою
-        favourite: Надсилати листа, коли комусь подобається Ваш статус
-        follow: Надсилати листа, коли хтось підписується на Вас
-        follow_request: Надсилати листа, коли хтось запитує дозволу на підписку
-        mention: Надсилати листа, коли хтось згадує Вас
+        favourite: Коли хтось вподобає ваш допис
+        follow: Коли хтось підписується на вас
+        follow_request: Коли хтось запитує дозвіл підписатися
+        mention: Коли хтось згадує вас
         pending_account: Надсилати електронного листа, коли новий обліковий запис потребує розгляду
-        reblog: Надсилати листа, коли хтось передмухує Ваш статус
-        report: Надсилати електронного листа, коли з'являється нова скарга
-        trending_tag: Надсилати електронного листа, коли нерозглянутий хештеґ стає популярним
+        reblog: Коли хтось поширює ваш допис
+        report: Нову скаргу надіслано
+        trending_tag: Нове популярне вимагає розгляду
       rule:
         text: Правило
       tag:
-        listable: Дозволити появу цього хештеґа у каталозі профілів
+        listable: Дозволити появу цього хештеґа у каталозі пошуку і пропозицій
         name: Хештеґ
         trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
-        usable: Дозволити дмухам використовувати цей хештеґ
+        usable: Дозволити дописам використовувати цей хештег
+      user:
+        role: Роль
+      user_role:
+        color: Колір відзнаки
+        highlighted: Показувати роль у вигляді відзнаки у профілях користувачів
+        name: Назва
+        permissions_as_keys: Дозволи
+        position: Пріоритет
+      webhook:
+        events: Увімкнені події
+        url: URL кінцевої точки
     'no': Ні
+    not_recommended: Не рекомендовано
     recommended: Рекомендовано
     required:
       mark: "*"
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index d85de10ea..69bf94329 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -5,41 +5,42 @@ vi:
       account_alias:
         acct: Nhập tên_người_dùng@máy chủ của tài khoản cũ
       account_migration:
-        acct: Nhập tên_người_dùng@máy chủ của tài khoản bạn muốn dời sang
+        acct: tên_người_dùng@máy chủ của tài khoản bạn muốn chuyển sang
       account_warning_preset:
         text: Bạn có thể dùng URL, hashtag và nhắc đến
         title: Tùy chọn. Không cho người nhận xem
       admin_account_action:
         include_statuses: Người dùng sẽ thấy các tút nào của họ bị kiểm duyệt
         send_email_notification: Người dùng sẽ nhận được lời giải thích về những gì xảy ra với tài khoản của họ
-        text_html: Tùy chọn. Bạn nên dùng <a href="%{path}">cảnh cáo cài sẵn</a> để tiết kiệm thời gian
+        text_html: Tùy chọn. Bạn nên dùng <a href="%{path}">mẫu có sẵn</a> để tiết kiệm thời gian
         type_html: Chọn làm gì với <strong>%{acct}</strong>
         types:
-          disable: Cấm người này tiếp tục đăng nhập, nhưng không xóa hoặc ẩn tút của họ.
-          none: Sử dụng để gửi cảnh cáo tới tài khoản này, không áp đặt trừng phạt.
+          disable: Tạm khóa đăng nhập tài khoản, nhưng không xóa hoặc ẩn tút.
+          none: Cảnh cáo tài khoản này, không áp đặt trừng phạt.
           sensitive: Mọi tập tin của tài khoản này tải lên đều sẽ bị gắn nhãn nhạy cảm.
           silence: Cấm tài khoản này đăng tút công khai, ẩn tút của họ hiện ra với những người chưa theo dõi họ.
-          suspend: Vô hiệu hóa mọi hoạt động của tài khoản này và xóa sạch dữ liệu. Có thể mở lại trong vòng 30 ngày.
-        warning_preset_id: Tùy chọn. Bạn vẫn có thể thêm ghi chú riêng
+          suspend: Vô hiệu hóa và xóa sạch dữ liệu của tài khoản này. Có thể khôi phục trước 30 ngày.
+        warning_preset_id: Tùy chọn. Bạn vẫn có thể thêm chú thích riêng
       announcement:
         all_day: Chỉ có khoảng thời gian được đánh dấu mới hiển thị
         ends_at: Tùy chọn. Thông báo sẽ tự động hủy vào lúc này
         scheduled_at: Để trống nếu muốn đăng thông báo ngay lập tức
         starts_at: Tùy chọn. Trong trường hợp thông báo của bạn đăng vào một khoảng thời gian cụ thể
-        text: Bạn có thể dùng URL, hashtag và nhắc đến. Cố gắng ngắn gọn bởi vì thông báo sẽ xuất hiện trên màn hình điện thoại của người dùng
+        text: Bạn có thể dùng URL, hashtag và nhắc đến. Cố gắng ngắn gọn bởi vì thông báo sẽ xuất hiện trên màn hình điện thoại
+      appeal:
+        text: Bạn chỉ có thể khiếu nại mỗi lần một cảnh cáo
       defaults:
         autofollow: Những người đăng ký sẽ tự động theo dõi bạn
-        avatar: PNG, GIF hoặc JPG. Kích cỡ tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
+        avatar: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
         context: Chọn một hoặc nhiều nơi mà bộ lọc sẽ áp dụng
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
-        discoverable: Cho phép tài khoản của bạn xuất hiện trong gợi ý theo dõi và những tính năng khác
-        discoverable_no_directory: Cho phép mọi người tìm thấy tài khoản của bạn thông qua gợi ý theo dõi và các tính năng khác
+        discoverable: Cho phép tài khoản của bạn xuất hiện trong gợi ý theo dõi, thịnh hành và những tính năng khác
         email: Bạn sẽ được gửi một email xác nhận
-        fields: Được phép tạo tối đa 4 mục trên trang cá nhân của bạn
-        header: PNG, GIF hoặc JPG. Kích cỡ tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
+        fields: Được phép thêm tối đa 4 mục trên trang hồ sơ của bạn
+        header: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         inbox_url: Sao chép URL của máy chủ mà bạn muốn dùng
         irreversible: Các tút đã lọc sẽ không thể phục hồi, kể cả sau khi xóa bộ lọc
         locale: Ngôn ngữ của giao diện, email và thông báo đẩy
@@ -47,25 +48,52 @@ vi:
         password: Dùng ít nhất 8 ký tự
         phrase: Sẽ được hiện thị trong văn bản hoặc cảnh báo nội dung của một tút
         scopes: API nào ứng dụng sẽ được phép truy cập. Nếu bạn chọn quyền hạn cấp cao nhất, bạn không cần chọn từng phạm vi.
-        setting_aggregate_reblogs: Nếu một tút đã được chia sẻ thì những lượt chia sẻ sau sẽ không hiển thị trên bảng tin nữa
-        setting_default_sensitive: Mặc định là nội dung nhạy cảm và chỉ hiển thị nếu nhấn vào
-        setting_display_media_default: Làm mờ những thứ được đánh dấu là nhạy cảm
-        setting_display_media_hide_all: Không hiển thị
-        setting_display_media_show_all: Luôn luôn hiển thị
-        setting_hide_network: Ẩn những người bạn theo dõi và những người theo dõi bạn trên trang cá nhân
+        setting_aggregate_reblogs: Nếu một tút đã được đăng lại thì những lượt đăng lại sau sẽ không hiện trên bảng tin nữa
+        setting_always_send_emails: Bình thường thì email thông báo sẽ không gửi khi bạn đang dùng Mastodon
+        setting_default_sensitive: Mặc định là nội dung nhạy cảm và chỉ hiện nếu nhấn vào
+        setting_display_media_default: Làm mờ nội dung nhạy cảm
+        setting_display_media_hide_all: Ẩn
+        setting_display_media_show_all: Luôn hiển thị
+        setting_hide_network: Ẩn những người bạn theo dõi và những người theo dõi bạn
         setting_noindex: Ảnh hưởng đến trang cá nhân và tút của bạn
-        setting_show_application: Tên ứng dụng bạn dùng để đăng tút sẽ hiện trong chi tiết bài đăng
+        setting_show_application: Tên ứng dụng bạn dùng để đăng tút sẽ hiện trong chi tiết của tút
         setting_use_blurhash: Lớp phủ mờ dựa trên màu sắc của hình ảnh nhạy cảm
-        setting_use_pending_items: Dồn lại toàn bộ tút mới và chỉ hiển thị khi nhấp chuột vào
+        setting_use_pending_items: Dồn lại toàn bộ tút mới và chỉ hiển thị khi nhấn vào
         username: Tên người dùng của bạn sẽ là duy nhất trên %{domain}
         whole_word: Khi từ khóa hoặc cụm từ là chữ và số, nó sẽ chỉ hiện ra những từ chính xác như vậy
       domain_allow:
         domain: Máy chủ này sẽ tiếp nhận dữ liệu, rồi sau đó xử lý và lưu trữ
       email_domain_block:
-        domain: Đây có thể là tên miền hoặc IP của dịch vụ email. Người dùng của những dịch vụ email này sẽ bị từ chối khi đăng ký.
+        domain: Phân tích tên miền thành các tên miền MX sau, các tên miền này chịu trách nhiệm cuối cùng trong chấp nhận email. Giá trị MX sẽ chặn đăng ký từ bất kỳ địa chỉ email nào sử dụng cùng một giá trị MX, ngay cả khi tên miền hiển thị là khác.
         with_dns_records: Nếu DNS có vấn đề, nó sẽ bị đưa vào danh sách cấm
       featured_tag:
-        name: 'Những hashtag gợi ý cho bạn:'
+        name: 'Các hashtag mà bạn đã sử dụng gần đây:'
+      filters:
+        action: Chọn hành động sẽ thực hiện khi một tút khớp với bộ lọc
+        actions:
+          hide: Ẩn hoàn toàn nội dung đã lọc, hoạt động như thể nó không tồn tại
+          warn: Ẩn nội dung đã lọc đằng sau một cảnh báo đề cập đến tiêu đề của bộ lọc
+      form_admin_settings:
+        backups_retention_period: Lưu trữ dữ liệu người dùng đã tạo trong số ngày được chỉ định.
+        bootstrap_timeline_accounts: Những người này sẽ được ghim vào đầu các gợi ý theo dõi của người mới.
+        closed_registrations_message: Được hiển thị khi đóng đăng ký
+        content_cache_retention_period: Tút từ các máy chủ khác sẽ bị xóa sau số ngày được chỉ định. Sau đó có thể không thể phục hồi được.
+        custom_css: Bạn có thể tùy chỉnh phong cách trên bản web của Mastodon.
+        mascot: Ghi đè hình minh họa trong giao diện web nâng cao.
+        media_cache_retention_period: Media đã tải xuống sẽ bị xóa sau số ngày được chỉ định và sẽ tải xuống lại theo yêu cầu.
+        profile_directory: Liệt kê tất cả người đã chọn tham gia để có thể khám phá.
+        require_invite_text: Khi đăng ký yêu cầu phê duyệt thủ công, hãy đặt câu hỏi "Tại sao bạn muốn tham gia?" nhập văn bản bắt buộc thay vì tùy chọn
+        site_contact_email: Cách mọi người có thể liên hệ với bạn khi có thắc mắc về pháp lý hoặc hỗ trợ.
+        site_contact_username: Cách mọi người có thể liên hệ với bạn trên Mastodon.
+        site_extended_description: Bất kỳ thông tin bổ sung nào cũng có thể hữu ích cho khách truy cập và người dùng của bạn. Có thể được soạn bằng cú pháp Markdown.
+        site_short_description: Mô tả ngắn gọn để giúp nhận định máy chủ của bạn. Ai đang điều hành nó, nó là cho ai?
+        site_terms: Sử dụng chính sách bảo mật của riêng bạn hoặc để trống để sử dụng mặc định. Có thể soạn bằng cú pháp Markdown.
+        site_title: Cách mọi người có thể tham chiếu đến máy chủ của bạn ngoài tên miền của nó.
+        theme: Chủ đề mà khách truy cập đăng xuất và người mới nhìn thấy.
+        thumbnail: 'Một hình ảnh tỉ lệ 2: 1 được hiển thị cùng với thông tin máy chủ của bạn.'
+        timeline_preview: Khách truy cập đã đăng xuất sẽ có thể xem các tút công khai gần đây nhất trên máy chủ.
+        trendable_by_default: Bỏ qua việc duyệt thủ công nội dung thịnh hành. Các mục riêng lẻ vẫn có thể bị xóa khỏi xu hướng sau này.
+        trends: Hiển thị những tút, hashtag và tin tức đang được thảo luận nhiều trên máy chủ của bạn.
       form_challenge:
         current_password: Biểu mẫu này an toàn
       imports:
@@ -78,17 +106,28 @@ vi:
         ip: Nhập một địa chỉ IPv4 hoặc IPv6. Bạn cũng có thể chặn toàn bộ dãy IP bằng cú pháp CIDR. Hãy cẩn thận đừng chặn nhầm toàn bộ!
         severities:
           no_access: Chặn truy cập từ tất cả IP này
+          sign_up_block: Không chấp nhận đăng ký mới
           sign_up_requires_approval: Bạn sẽ phê duyệt những đăng ký mới từ IP này
         severity: Chọn hành động nếu nhận được yêu cầu từ IP này
       rule:
         text: Mô tả một quy tắc bắt buộc trên máy chủ này. Nên để ngắn và đơn giản.
       sessions:
-        otp: 'Nhập mã xác thực hai bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
+        otp: 'Nhập mã xác minh 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
         webauthn: Nếu đây là USB key, hãy cắm vào và thử xoay chiều.
       tag:
         name: Bạn có thể thay đổi cách viết hoa các chữ cái để giúp nó dễ đọc hơn
       user:
         chosen_languages: Chỉ hiển thị những tút viết bằng các ngôn ngữ được chọn sau
+        role: Vai trò kiểm soát những quyền mà người dùng có
+      user_role:
+        color: Màu được sử dụng cho vai trò trong toàn bộ giao diện người dùng, dưới dạng RGB ở định dạng hex
+        highlighted: Vai trò sẽ hiển thị công khai
+        name: Tên công khai của vai trò, nếu vai trò được đặt để hiển thị dưới dạng huy hiệu
+        permissions_as_keys: Người có vai trò này sẽ có quyền truy cập vào...
+        position: Vai trò cao hơn sẽ có quyền quyết định xung đột trong các tình huống. Các vai trò có mức độ ưu tiên thấp hơn chỉ có thể thực hiện một số hành động nhất định
+      webhook:
+        events: Chọn sự kiện để gửi
+        url: Nơi những sự kiện được gửi đến
     labels:
       account:
         fields:
@@ -104,13 +143,13 @@ vi:
       admin_account_action:
         include_statuses: Đính kèm những tút bị báo cáo trong e-mail
         send_email_notification: Thông báo cho người này qua email
-        text: Ghi chú riêng
+        text: Chú thích riêng
         type: Hành động
         types:
-          disable: Tạm khóa
+          disable: Khóa
           none: Cảnh cáo
           sensitive: Nhạy cảm
-          silence: Tạm ẩn
+          silence: Hạn chế
           suspend: Vô hiệu hóa
         warning_preset_id: Dùng mẫu có sẵn
       announcement:
@@ -119,6 +158,8 @@ vi:
         scheduled_at: Lên lịch đăng
         starts_at: Bắt đầu sự kiện
         text: Thông báo
+      appeal:
+        text: Giải thích rõ vì sao quyết định này có thể đảo ngược
       defaults:
         autofollow: Mời theo dõi tài khoản của bạn
         avatar: Ảnh đại diện
@@ -129,8 +170,8 @@ vi:
         context: Áp dụng
         current_password: Mật khẩu hiện tại
         data: Dữ liệu
-        discoverable: Liệt kê tài khoản trên danh sách thành viên
-        display_name: Tên hiển thị
+        discoverable: Đề xuất tài khoản
+        display_name: Biệt danh
         email: Địa chỉ email
         expires_in: Hết hạn sau
         fields: Metadata
@@ -139,17 +180,18 @@ vi:
         inbox_url: Hộp thư relay
         irreversible: Xóa bỏ vĩnh viễn
         locale: Ngôn ngữ
-        locked: Đây là tài khoản riêng tư
+        locked: Yêu cầu theo dõi
         max_uses: Số lần dùng tối đa
         new_password: Mật khẩu mới
-        note: Tiểu sử
-        otp_attempt: Xác thực hai bước
+        note: Giới thiệu
+        otp_attempt: Mã xác minh 2 bước
         password: Mật khẩu
         phrase: Từ khóa hoặc cụm từ
-        setting_advanced_layout: Bật giao diện nhiều cột
-        setting_aggregate_reblogs: Không hiện lượt chia sẻ trùng lặp
+        setting_advanced_layout: Bật bố cục nhiều cột
+        setting_aggregate_reblogs: Không hiện lượt đăng lại trùng lặp
+        setting_always_send_emails: Luôn gửi email thông báo
         setting_auto_play_gif: Tự động phát ảnh GIF
-        setting_boost_modal: Yêu cầu xác nhận trước khi chia sẻ tút
+        setting_boost_modal: Yêu cầu xác nhận trước khi đăng lại tút
         setting_crop_images: Hiển thị ảnh theo tỉ lệ 16x9
         setting_default_language: Ngôn ngữ đăng
         setting_default_privacy: Kiểu đăng
@@ -160,19 +202,20 @@ vi:
         setting_display_media_default: Mặc định
         setting_display_media_hide_all: Ẩn toàn bộ
         setting_display_media_show_all: Hiện toàn bộ
-        setting_expand_spoilers: Luôn hiển thị đầy đủ nội dung tút
+        setting_expand_spoilers: Luôn hiển thị tút có nội dung ẩn
         setting_hide_network: Ẩn quan hệ của bạn
         setting_noindex: Không xuất hiện trong công cụ tìm kiếm
         setting_reduce_motion: Giảm chuyển động ảnh GIF
         setting_show_application: Hiện ứng dụng đã dùng để đăng tút
         setting_system_font_ui: Dùng phông chữ mặc định của hệ thống
         setting_theme: Giao diện
-        setting_trends: Hiển thị xu hướng hôm nay
-        setting_unfollow_modal: Yêu cầu xác nhận trước khi hủy theo dõi ai đó
+        setting_trends: Hiển thị thịnh hành hôm nay
+        setting_unfollow_modal: Yêu cầu xác nhận trước khi ngưng theo dõi ai đó
         setting_use_blurhash: Làm mờ trước ảnh/video nhạy cảm
         setting_use_pending_items: Không tự động cập nhật bảng tin
         severity: Mức độ nghiêm trọng
         sign_in_token_attempt: Mã an toàn
+        title: Tựa đề
         type: Kiểu nhập
         username: Tên người dùng
         username_or_email: Tên người dùng hoặc email
@@ -181,6 +224,34 @@ vi:
         with_dns_records: Bao gồm bản ghi MX và địa chỉ IP của máy chủ
       featured_tag:
         name: Hashtag
+      filters:
+        actions:
+          hide: Ẩn toàn bộ
+          warn: Ẩn kèm theo cảnh báo
+      form_admin_settings:
+        backups_retention_period: Thời hạn lưu trữ nội dung người dùng sao lưu
+        bootstrap_timeline_accounts: Luôn đề xuất những người này đến người mới
+        closed_registrations_message: Thông báo tùy chỉnh khi tắt đăng ký
+        content_cache_retention_period: Thời hạn lưu trữ cache nội dung
+        custom_css: Tùy chỉnh CSS
+        mascot: Tùy chỉnh linh vật (kế thừa)
+        media_cache_retention_period: Thời hạn lưu trữ cache media
+        profile_directory: Cho phép hiện danh sách thành viên
+        registrations_mode: Ai có thể đăng ký
+        require_invite_text: Yêu cầu lí do đăng ký
+        show_domain_blocks: Xem máy chủ chặn
+        show_domain_blocks_rationale: Hiện lý do máy chủ bị chặn
+        site_contact_email: Email liên lạc
+        site_contact_username: Tên người dùng liên lạc
+        site_extended_description: Mô tả mở rộng
+        site_short_description: Mô tả máy chủ
+        site_terms: Chính sách bảo mật
+        site_title: Tên máy chủ
+        theme: Chủ đề mặc định
+        thumbnail: Hình thu nhỏ của máy chủ
+        timeline_preview: Cho phép truy cập vào dòng thời gian công khai
+        trendable_by_default: Cho phép thịnh hành mà không cần duyệt trước
+        trends: Bật thịnh hành
       interactions:
         must_be_follower: Chặn thông báo từ những người không theo dõi bạn
         must_be_following: Chặn thông báo từ những người bạn không theo dõi
@@ -194,26 +265,40 @@ vi:
         ip: IP
         severities:
           no_access: Chặn truy cập
+          sign_up_block: Chặn đăng ký
           sign_up_requires_approval: Giới hạn đăng ký
         severity: Mức độ
       notification_emails:
+        appeal: Ai đó kháng cáo kiểm duyệt
         digest: Gửi email định kỳ
         favourite: Ai đó thích tút của bạn
         follow: Ai đó theo dõi bạn
         follow_request: Ai đó yêu cầu theo dõi bạn
         mention: Ai đó nhắc đến bạn
-        pending_account: Tài khoản mới cần phê duyệt
-        reblog: Ai đó chia sẻ tút của bạn
+        pending_account: Phê duyệt tài khoản mới
+        reblog: Ai đó đăng lại tút của bạn
         report: Ai đó gửi báo cáo
-        trending_tag: Một hashtag chưa được phê duyệt đang là xu hướng
+        trending_tag: Phê duyệt nội dung nổi bật mới
       rule:
         text: Quy tắc
       tag:
-        listable: Cho phép hashtag này xuất hiện trong tìm kiếm và đề xuất
+        listable: Cho phép xuất hiện trong tìm kiếm và đề xuất
         name: Hashtag
-        trendable: Cho phép hashtag này xuất hiện trong xu hướng
-        usable: Cho phép dùng hashtag này trong tút
+        trendable: Cho phép hashtag này thịnh hành
+        usable: Cho phép dùng trong tút
+      user:
+        role: Vai trò
+      user_role:
+        color: Màu huy hiệu
+        highlighted: Hiển thị huy hiệu vai trò trên hồ sơ người dùng
+        name: Tên
+        permissions_as_keys: Quyền
+        position: Mức độ ưu tiên
+      webhook:
+        events: Những sự kiện đã bật
+        url: URL endpoint
     'no': Tắt
+    not_recommended: Không đề xuất
     recommended: Đề xuất
     required:
       mark: "*"
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index b578b331c..7cda89e46 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -3,14 +3,14 @@ zh-CN:
   simple_form:
     hints:
       account_alias:
-        acct: 指定你想要迁移过来的原帐号：用户名@站点域名
+        acct: 指定你想要迁移过来的原账号：用户名@站点域名
       account_migration:
-        acct: 指定你想迁移过去的目标帐号：用户名@站点域名
+        acct: 指定你想迁移过去的目标账号：用户名@站点域名
       account_warning_preset:
         text: 你可以使用嘟文格式，例如加入 URL、话题标签和“@”
         title: 可选。对接收者不可见
       admin_account_action:
-        include_statuses: 用户将会看到哪些嘟文导致了审核行为或警告
+        include_statuses: 用户将会看到哪些嘟文导致了管理操作或警告
         send_email_notification: 用户将收到关于其账号异动的解释
         text_html: 可选。你可以使用嘟文格式。你可以<a href="%{path}">预置警告</a>以节省时间
         type_html: 用<strong>%{acct}</strong>选择做什么
@@ -27,16 +27,17 @@ zh-CN:
         scheduled_at: 留空的话，公告会立即发布。
         starts_at: 可选。你可以让你的公告只在特定时间段显示。
         text: 你可以使用嘟文格式。但请注意不要让公告占据用户太多屏幕空间。
+      appeal:
+        text: 你仅能对单次处罚提交一次申诉
       defaults:
         autofollow: 通过邀请链接注册的用户将会自动关注你
         avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
-        bot: 来自这个帐户的绝大多数操作都是自动进行的，并且可能无人监控
-        context: 过滤器的应用场景
+        bot: 来自这个账户的绝大多数操作都是自动进行的，并且可能无人监控
+        context: 过滤器的应用环境
         current_password: 为了安全起见，请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录，且收到了私信时发送
-        discoverable: 用户目录能够让你的帐号广为人知
-        discoverable_no_directory: 允许别人通过推荐和其他途径发现你的账户
+        discoverable: 允许他人通过推荐、热门和其他途径发现你的账户
         email: 我们会向你发送一封确认邮件
         fields: 这将会在个人资料页上以表格的形式展示，最多 4 个项目
         header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
@@ -48,6 +49,7 @@ zh-CN:
         phrase: 匹配将忽略嘟文或内容警告里的字母大小写
         scopes: 哪些 API 被允许使用。如果你勾选了更高一级的范围，就不用单独选中子项目了。
         setting_aggregate_reblogs: 不显示最近已经被转嘟过的嘟文(只会影响新收到的转嘟)
+        setting_always_send_emails: 一般情况下，如果您活跃使用 Mastodon，我们不会给您发送电子邮件通知
         setting_default_sensitive: 敏感内容默认隐藏，并在点击后显示
         setting_display_media_default: 隐藏被标记为敏感内容的媒体
         setting_display_media_hide_all: 隐藏所有媒体
@@ -62,10 +64,36 @@ zh-CN:
       domain_allow:
         domain: 该站点将能够从该服务器上拉取数据，并处理和存储收到的数据。
       email_domain_block:
-        domain: 这里可以是邮箱地址中的域名部分、域名解析到的 MX 记录，或者 MX 记录解析到的域名。这些检查会在用户注册时进行，如果邮箱域名被封禁，那么注册会被拒绝。
+        domain: 这可以是电子邮件地址的域名或它使用的 MX 记录所指向的域名。用户注册时，系统会对此检查。
         with_dns_records: Mastodon 会尝试解析所给域名的 DNS 记录，然后把解析结果一并封禁
       featured_tag:
-        name: 你可能想要使用以下之一：
+        name: 以下是你最近使用过的标签：
+      filters:
+        action: 选择在帖子匹配过滤器时要执行的操作
+        actions:
+          hide: 彻底屏蔽过滤内容，犹如它不曾存在过一般
+          warn: 在警告中提及过滤器标题后，隐藏过滤内容
+      form_admin_settings:
+        backups_retention_period: 将在指定天数内保留生成的用户存档。
+        bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
+        closed_registrations_message: 在关闭注册时显示
+        content_cache_retention_period: 设为正数值时，来自其他服务器的嘟文将在指定天数后被删除。删除有可能会是不可逆的。
+        custom_css: 你可以为网页版 Mastodon 应用自定义样式。
+        mascot: 覆盖高级网页界面中的绘图形象。
+        media_cache_retention_period: 设为正数值时，来自其他服务器的媒体文件将在指定天数后被删除，并在需要时再次下载。
+        profile_directory: 个人资料目录会列出所有选择可被发现的用户。
+        require_invite_text: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
+        site_contact_email: 他人需要询恰法务或支持信息时的联络方式
+        site_contact_username: 他人在 Mastodon 上联系你的方式
+        site_extended_description: 任何可能对访客和用户有用的额外信息。可以使用 Markdown 语法。
+        site_short_description: 有助于区分你的服务器独特性的简短描述。谁在管理？供谁使用？
+        site_terms: 使用你自己的隐私政策或留空以使用默认版。可以使用 Markdown 语法。
+        site_title: 除了域名，人们还可以如何指代你的服务器。
+        theme: 给未登录访客和新用户使用的主题。
+        thumbnail: 与服务器信息一并展示的约 2:1 比例的图像。
+        timeline_preview: 未登录访客将能够浏览服务器上最新的公共嘟文。
+        trendable_by_default: 跳过对热门内容的手工审核。个别项目仍可在之后从趋势中删除。
+        trends: 趋势中会显示正在你服务器上受到关注的嘟文、标签和新闻故事。
       form_challenge:
         current_password: 你正在进入安全区域
       imports:
@@ -78,6 +106,7 @@ zh-CN:
         ip: 输入 IPv4 或 IPv6 地址。你可以使用 CIDR 语法屏蔽 IP 段。小心不要屏蔽自己！
         severities:
           no_access: 阻止访问所有资源
+          sign_up_block: 无法进行新的账号注册
           sign_up_requires_approval: 新注册需要你的批准
         severity: 选择如何处理来自此 IP 的请求。
       rule:
@@ -89,13 +118,23 @@ zh-CN:
         name: 你只能改变字母的大小写，让它更易读
       user:
         chosen_languages: 仅选中语言的嘟文会出现在公共时间轴上（全不选则显示所有语言的嘟文）
+        role: 角色用于控制用户拥有的权限
+      user_role:
+        color: 在界面各处用于标记该角色的颜色，以十六进制 RGB 格式表示
+        highlighted: 使角色公开可见
+        name: 角色的公开名称，将在设为展示徽章时使用
+        permissions_as_keys: 具有此角色的用户将有权访问...
+        position: 用于在特定情况下处理决策冲突。一些特定操作只能对优先级更低的角色执行
+      webhook:
+        events: 选择要发送的事件
+        url: 事件将被发往的目的地
     labels:
       account:
         fields:
           name: 标签
           value: 内容
       account_alias:
-        acct: 处理旧帐号
+        acct: 处理旧账号
       account_migration:
         acct: 处理新账号
       account_warning_preset:
@@ -119,14 +158,16 @@ zh-CN:
         scheduled_at: 定时发布
         starts_at: 事件开始
         text: 公告
+      appeal:
+        text: 说明此结果应当被推翻的理由
       defaults:
-        autofollow: 让被邀请人关注你的帐户
+        autofollow: 让被邀请人关注你的账户
         avatar: 头像
-        bot: 这是一个机器人帐户
+        bot: 这是一个机器人账户
         chosen_languages: 语言过滤
         confirm_new_password: 确认新密码
         confirm_password: 确认密码
-        context: 过滤器场景
+        context: 过滤器环境
         current_password: 当前密码
         data: 数据文件
         discoverable: 在本站用户目录中收录此账号
@@ -139,7 +180,7 @@ zh-CN:
         inbox_url: 中继站收件箱的 URL
         irreversible: 丢弃而非隐藏
         locale: 界面语言
-        locked: 保护你的帐户（锁嘟）
+        locked: 保护你的账户（锁嘟）
         max_uses: 最大使用次数
         new_password: 新密码
         note: 简介
@@ -148,6 +189,7 @@ zh-CN:
         phrase: 关键词
         setting_advanced_layout: 启用高级 Web 界面
         setting_aggregate_reblogs: 在时间轴中合并转嘟
+        setting_always_send_emails: 总是发送电子邮件通知
         setting_auto_play_gif: 自动播放 GIF 动画
         setting_boost_modal: 在转嘟前询问我
         setting_crop_images: 把未展开嘟文中的图片裁剪到 16x9
@@ -173,14 +215,43 @@ zh-CN:
         setting_use_pending_items: 慢速模式
         severity: 级别
         sign_in_token_attempt: 安全码
+        title: 标题
         type: 导入数据类型
         username: 用户名
         username_or_email: 用户名或电子邮件地址
         whole_word: 整个词条
       email_domain_block:
-        with_dns_records: 包括改域名的 MX 记录和 IP 地址
+        with_dns_records: 包括该域名的 MX 记录和 IP 地址
       featured_tag:
         name: 话题标签
+      filters:
+        actions:
+          hide: 完全隐藏
+          warn: 隐藏时显示警告信息
+      form_admin_settings:
+        backups_retention_period: 用户存档保留期
+        bootstrap_timeline_accounts: 推荐新用户关注以下账号
+        closed_registrations_message: 在关闭注册时显示的自定义消息
+        content_cache_retention_period: 内容缓存保留期
+        custom_css: 自定义 CSS
+        mascot: 自定义吉祥物（旧）
+        media_cache_retention_period: 媒体缓存保留期
+        profile_directory: 启用用户目录
+        registrations_mode: 谁可以注册
+        require_invite_text: 注册前需要提供理由
+        show_domain_blocks: 显示域名屏蔽列表
+        show_domain_blocks_rationale: 显示域名屏蔽原因
+        site_contact_email: 联系邮箱
+        site_contact_username: 用于联系的公开用户名
+        site_extended_description: 完整说明
+        site_short_description: 本站简介
+        site_terms: 隐私政策
+        site_title: 本站名称
+        theme: 默认主题
+        thumbnail: 本站缩略图
+        timeline_preview: 时间轴预览
+        trendable_by_default: 允许在未审核的情况下将话题置为热门
+        trends: 启用趋势
       interactions:
         must_be_follower: 屏蔽来自未关注我的用户的通知
         must_be_following: 屏蔽来自我未关注的用户的通知
@@ -194,18 +265,20 @@ zh-CN:
         ip: IP 地址
         severities:
           no_access: 阻止访问
+          sign_up_block: 阻止账号注册
           sign_up_requires_approval: 限制注册
         severity: 规则
       notification_emails:
+        appeal: 有人对审核结果提出申诉
         digest: 发送摘要邮件
         favourite: 当有用户喜欢了我的嘟文时，发送电子邮件提醒我
         follow: 当有用户关注我时，发送电子邮件提醒我
         follow_request: 当有用户向我发送关注请求时，发送电子邮件提醒我
         mention: 当有用户在嘟文中提及我时，发送电子邮件提醒我
-        pending_account: 在有帐号需要审核时，发送电子邮件提醒我
+        pending_account: 在有账号需要审核时，发送电子邮件提醒我
         reblog: 当有用户转嘟了我的嘟文时，发送电子邮件提醒我
-        report: 在提交新举报时，发送电子邮件提醒我
-        trending_tag: 当未经审核的话题成为当前热门时发邮件提醒
+        report: 新举报已提交
+        trending_tag: 新热门待审核
       rule:
         text: 规则
       tag:
@@ -213,7 +286,19 @@ zh-CN:
         name: 话题标签
         trendable: 允许在热门下显示此话题
         usable: 允许嘟文使用此话题标签
+      user:
+        role: 角色
+      user_role:
+        color: 徽章颜色
+        highlighted: 在用户资料中显示角色徽章
+        name: 名称
+        permissions_as_keys: 权限设置
+        position: 优先级
+      webhook:
+        events: 已启用事件
+        url: 对端 URL
     'no': 否
+    not_recommended: 不推荐
     recommended: 推荐
     required:
       mark: "*"
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 2f65e5213..abc22323d 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -27,6 +27,8 @@ zh-HK:
         scheduled_at: 留空此項以立即發布公告
         starts_at: 可選，你可以讓公告在指定時間範圍內顯示
         text: 你可以使用文章格式，但請小心別讓公告佔據太大的使用者畫面空間。
+      appeal:
+        text: 你每次只能提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
@@ -35,8 +37,7 @@ zh-HK:
         current_password: 基於保安緣故，請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
-        discoverable: 個人資料目錄可以讓你的帳號更廣為人知
-        discoverable_no_directory: 允許他人通過推薦與其他功能探索你的賬號
+        discoverable: 允許陌生人從推薦、趨勢及其他功能發現你的帳號
         email: 你將收到一封確認電郵
         fields: 個人資料頁可顯示多至 4 個項目
         header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
@@ -48,6 +49,7 @@ zh-HK:
         phrase: 過濾器會閱讀文章和內容警告標語的字眼，然後決定過濾與否
         scopes: 選擇應用程式可以存取的 API。 若你選擇最高階的權限範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示新近被轉推的文章（只影響最新被推的文章）
+        setting_always_send_emails: 通常當你積極使用 Mastodon 時，我們不會發送電郵通知給你
         setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
@@ -62,10 +64,36 @@ zh-HK:
       domain_allow:
         domain: 此網域將能從此站獲取資料，而此站發出的數據也會被處理和存儲。
       email_domain_block:
-        domain: 這裡可以是電郵地址中的域名、域名解析到的MX記錄、或MX紀錄解析到的服務器IP。如果上述資料被封禁，那麼註冊將被拒絕。
+        domain: 這可以是電郵地址所示的域名或它使用的 MX 紀錄。註冊時系統將檢查它。
         with_dns_records: Mastodon 會嘗試解析所給域名的 DNS 記錄，然後與解析結果一併封禁
       featured_tag:
-        name: 你可能想使用其中一個：
+        name: 以下是你最近常用的標籤：
+      filters:
+        action: 選擇當帖文符合篩選器時要執行的動作
+        actions:
+          hide: 完全隱藏被篩選的內容，猶如它不存在般。
+          warn: 將已篩選的內容隱藏在篩選器標題的警告後面。
+      form_admin_settings:
+        backups_retention_period: 繼續封存生成的使用者到指定的天數。
+        bootstrap_timeline_accounts: 這些帳號會被置頂在新使用者的追蹤建議上。
+        closed_registrations_message: 關閉註冊時顯示
+        content_cache_retention_period: 當設定為正數時，來自其他伺服器的帖文將在指定天數後被刪除。無法還原這個操作。
+        custom_css: 你可以在 Mastodon 網頁版套用自訂樣式。
+        mascot: 覆蓋進階網頁介面中的插圖。
+        media_cache_retention_period: 當設定為正數時，已下載的媒體檔案將在指定天數後被刪除，並視乎需要重新下載。
+        profile_directory: 個人檔案目錄羅列了所有選擇被發現的使用者。
+        require_invite_text: 如果需要手動審核註冊，請將「為何你想加入？」文字欄設定為必填，而非選填。
+        site_contact_email: 大家如何聯絡你有關法律或支援的查詢。
+        site_contact_username: 大家如何在 Mastodon 聯繫你。
+        site_extended_description: 所有對訪客和使用者有用的額外資訊，都可以用 Markdown 語法編寫。
+        site_short_description: 用作辨別你的伺服器的一段簡短描述。誰營運它，它為誰服務的？
+        site_terms: 使用你的私隱政策，或者留空使用預設的，可以用 Markdown 語法編寫。
+        site_title: 除了域名以外，其他人會如何指稱你的伺服器。
+        theme: 未登入訪客和新使用者看到的主題。
+        thumbnail: 一幅約 2:1 的圖片顯示在你的伺服器資訊的旁邊。
+        timeline_preview: 未登入的訪客能夠瀏覽伺服器上最新的公開帖文。
+        trendable_by_default: 跳過對趨勢內容的手動審查，事後仍可從趨勢中刪除個別項目。
+        trends: 趨勢顯示哪些帖文、標籤和新聞故事在你的伺服器上較有吸引力。
       form_challenge:
         current_password: 你正要進入安全區域
       imports:
@@ -78,6 +106,7 @@ zh-HK:
         ip: 請輸入 IPv4 或 IPv6 位址，你亦可以用 CIDR 語法來封鎖整個 IP 區段。請小心使用，不要把自己給一併封鎖！
         severities:
           no_access: 封鎖所有資源存取
+          sign_up_block: 無法進行新註冊
           sign_up_requires_approval: 新登記申請正等候你審批
         severity: 請設定伺服器將如何處理來自這個 IP 位址的請求
       rule:
@@ -89,6 +118,16 @@ zh-HK:
         name: 你只能變更大小寫（以使其更易讀）。
       user:
         chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
+        role: 角色控制使用者擁有的權限
+      user_role:
+        color: 介面各處用於角色的顏色，是以十六進制 RGB 格式表示
+        highlighted: 這使該角色公開可見
+        name: 角色的公開名稱，如果角色被設定為顯示徽章
+        permissions_as_keys: 此角色的使用者可存取…
+        position: 在某些情況下，由較高階的角色決定如何解決衝突。某些動作只能對優先度較低的角色執行
+      webhook:
+        events: 選取要傳送的事件
+        url: 事件將被傳送至何處
     labels:
       account:
         fields:
@@ -119,6 +158,8 @@ zh-HK:
         scheduled_at: 排程發佈
         starts_at: 活動開始時間
         text: 公告
+      appeal:
+        text: 解釋為何要推翻此決定
       defaults:
         autofollow: 邀請別人關注你的帳號
         avatar: 個人頭像
@@ -148,6 +189,7 @@ zh-HK:
         phrase: 關鍵字或片語
         setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉推
+        setting_always_send_emails: 總是傳送電郵通知
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
         setting_crop_images: 將未展開文章中的圖片裁剪到 16x9
@@ -167,12 +209,13 @@ zh-HK:
         setting_show_application: 顯示用來發表文章的應用程式
         setting_system_font_ui: 使用系統預設字型
         setting_theme: 網站主題
-        setting_trends: 顯示今天熱門主題
+        setting_trends: 顯示今天的趨勢
         setting_unfollow_modal: 取消關注前請讓我確定
         setting_use_blurhash: 將隱藏媒體以彩色漸變圖樣表示
         setting_use_pending_items: 限速模式
         severity: 等級
         sign_in_token_attempt: 安全碼
+        title: 標題
         type: 匯入資料類型
         username: 使用者名稱
         username_or_email: 使用者名稱或電郵
@@ -181,6 +224,34 @@ zh-HK:
         with_dns_records: 包括域名的 MX 記錄和 IP 位址
       featured_tag:
         name: 主題標籤 (Hashtag)
+      filters:
+        actions:
+          hide: 完全隱藏
+          warn: 警告並隱藏
+      form_admin_settings:
+        backups_retention_period: 封存使用者保留期
+        bootstrap_timeline_accounts: 總是向新使用者推薦這些帳號
+        closed_registrations_message: 無法註冊時的自訂訊息
+        content_cache_retention_period: 內容快取保留期
+        custom_css: 自訂 CSS
+        mascot: 自訂吉祥物 (舊版)
+        media_cache_retention_period: 媒體快取保留期
+        profile_directory: 啟用個人檔案目錄
+        registrations_mode: 誰能註冊
+        require_invite_text: 提供一個加入的理由
+        show_domain_blocks: 顯示封鎖的網域
+        show_domain_blocks_rationale: 顯示網域遭封鎖的原因
+        site_contact_email: 聯絡人郵箱
+        site_contact_username: 聯絡人使用者名稱
+        site_extended_description: 展開描述
+        site_short_description: 伺服器描述
+        site_terms: 私隱政策
+        site_title: 伺服器名稱
+        theme: 預設主題
+        thumbnail: 伺服器縮圖
+        timeline_preview: 允許未經認證的人存取公共時間軸
+        trendable_by_default: 允許未經審核的趨勢
+        trends: 啟用趨勢
       interactions:
         must_be_follower: 隱藏你關注者以外的人的通知
         must_be_following: 隱藏你不關注的人的通知
@@ -194,9 +265,11 @@ zh-HK:
         ip: IP 位址
         severities:
           no_access: 封鎖
+          sign_up_block: 禁止註冊
           sign_up_requires_approval: 限制註冊
         severity: 規則
       notification_emails:
+        appeal: 有人對管理員的裁決提出申訴
         digest: 定期電郵摘要
         favourite: 有人喜歡你的文章
         follow: 當有人關注你時
@@ -204,8 +277,8 @@ zh-HK:
         mention: 當有人在文章提及你時
         pending_account: 有新帳號需要審核時
         reblog: 當有人轉推你的文章時
-        report: 收到新檢舉時
-        trending_tag: 當未審核的標籤成為當前熱門時
+        report: 新檢舉已提交
+        trending_tag: 新趨勢須經過審核
       rule:
         text: 規則
       tag:
@@ -213,7 +286,19 @@ zh-HK:
         name: 主題標籤
         trendable: 允許此主題標籤在趨勢下顯示
         usable: 允許文章使用此主題標籤
+      user:
+        role: 角色
+      user_role:
+        color: 徽章顏色
+        highlighted: 在使用者個人檔案上以徽章顯示角色
+        name: 名稱
+        permissions_as_keys: 權限
+        position: 優先權
+      webhook:
+        events: 已啟用事件
+        url: 端點網址
     'no': 否
+    not_recommended: 不推薦
     recommended: 建議
     required:
       mark: "*"
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 8b4440013..f19dc24b0 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -3,23 +3,23 @@ zh-TW:
   simple_form:
     hints:
       account_alias:
-        acct: 指定欲移動之帳戶的 使用者名稱@站台
+        acct: 指定要移動的帳號的「使用者名稱@網域名稱」
       account_migration:
-        acct: 指定欲移動至之帳戶的 使用者名稱@站台
+        acct: 指定要移動至的帳號的「使用者名稱@網域名稱」
       account_warning_preset:
         text: 您可使用嘟文語法，例如網址、「#」標籤和提及功能
         title: 可選。不會向收件者顯示
       admin_account_action:
         include_statuses: 使用者可看到導致檢舉或警告的嘟文
-        send_email_notification: 使用者將收到帳戶發生之事情的解釋
+        send_email_notification: 使用者將收到帳號發生之事情的解釋
         text_html: 選用。您能使用嘟文語法。您可 <a href="%{path}">新增警告預設</a> 來節省時間
         type_html: 設定要使用 <strong>%{acct}</strong> 做的事
         types:
-          disable: 禁止該使用者使用他們的帳戶，但是不刪除或隱藏他們的內容。
+          disable: 禁止該使用者使用他們的帳號，但是不刪除或隱藏他們的內容。
           none: 使用這個寄送警告給該使用者，而不進行其他動作。
           sensitive: 強制標記此使用者所有媒體為敏感內容。
-          silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳戶中隱藏嘟文和通知。
-          suspend: 禁止所有對該帳戶任何互動，並且刪除其內容。三十日內可以撤回。
+          silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文和通知。
+          suspend: 禁止所有對該帳號任何互動，並且刪除其內容。三十日內可以撤回。
         warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字
       announcement:
         all_day: 核取後，只會顯示出時間範圍中的日期部分
@@ -27,68 +27,107 @@ zh-TW:
         scheduled_at: 空白則立即發布公告
         starts_at: 可選的，讓公告在特定時間範圍內顯示
         text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
+      appeal:
+        text: 您只能對警示提出一次申訴
       defaults:
-        autofollow: 通過邀請網址註冊的使用者將自動關注你
-        avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會等比例縮減成 %{dimensions} 像素
-        bot: 此帳戶主要執行自動操作且可能未被監控
+        autofollow: 通過邀請網址註冊的使用者將自動跟隨您
+        avatar: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
+        bot: 此帳號主要執行自動化操作且可能未受人為監控
         context: 應該套用過濾器的一項或多項內容
-        current_password: 因安全因素，請輸入目前帳戶的密碼
-        current_username: 請輸入目前帳戶的使用者名稱以確認
-        digest: 僅在你長時間未登入且在未登入期間收到私訊時傳送
-        discoverable: 加入個人資料目錄能接觸更多閱聽眾
-        discoverable_no_directory: 允許陌生人透過推薦與其他功能探索您的帳號
+        current_password: 因安全因素，請輸入目前帳號的密碼
+        current_username: 請輸入目前帳號的使用者名稱以確認
+        digest: 僅在您長時間未登入且在未登入期間收到私訊時傳送
+        discoverable: 允許陌生人透過推薦、熱門趨勢及其他功能發現您的帳號
         email: 您將收到一封確認電子郵件
-        fields: 您可在個人資料上有至多 4 個以表格形式顯示的項目
-        header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會按比例縮小成 %{dimensions} 像素
+        fields: 您可在個人檔案上有至多 4 個以表格形式顯示的項目
+        header: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
         inbox_url: 從您想要使用的中繼首頁複製網址
-        irreversible: 已過濾的嘟文將會不可逆的消失，即便過濾器移除之後也一樣
-        locale: 使用者介面、電子信件和推送通知的語言
-        locked: 需要您手動核准關注請求
+        irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
+        locale: 使用者介面、電子郵件和推播通知的語言
+        locked: 需要您手動批准跟隨請求
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
         scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
-        setting_default_sensitive: 敏感媒體預設隱藏，且按一下即可重新顯示
-        setting_display_media_default: 隱藏標為敏感的媒體
+        setting_always_send_emails: 一般情況下若您活躍使用 Mastodon ，我們不會寄送 e-mail 通知
+        setting_default_sensitive: 敏感內容媒體預設隱藏，且按一下即可重新顯示
+        setting_display_media_default: 隱藏標為敏感內容的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感的媒體
-        setting_hide_network: 你關注的人與關注你的人將不會在你的個人資料頁上顯示
-        setting_noindex: 會影響您的公開個人資料與嘟文頁面
+        setting_hide_network: 您跟隨的人與跟隨您的人將不會在您的個人檔案頁面上顯示
+        setting_noindex: 會影響您的公開個人檔案與嘟文頁面
         setting_show_application: 您用來發嘟文的應用程式將會在您嘟文的詳細檢視顯示
-        setting_use_blurhash: 漸層圖樣是基於隱藏媒體內容顏色產生，所有細節會變得模糊
+        setting_use_blurhash: 彩色漸層圖樣是基於隱藏媒體內容顏色產生，所有細節會變得模糊
         setting_use_pending_items: 關閉自動捲動更新，時間軸只會在點擊後更新
         username: 您的使用者名稱將在 %{domain} 是獨一無二的
         whole_word: 如果關鍵字或詞組僅有字母與數字，則其將只在符合整個單字的時候才會套用
       domain_allow:
         domain: 此域名將能夠攫取本站資料，而自域名該發出的資料也會於本站處理和留存。
       email_domain_block:
-        domain: 這裡可以是電子郵件地址中的域名、域名解析到的 MX 記錄、或 MX 記錄解析到的伺服器 IP 地址。新使用者註冊時會比對上述資料，如果相符時將拒絕相關註冊。
+        domain: 這可以是顯示在電子郵件中的網域名稱，或是其使用的 MX 紀錄。其將在註冊時檢查。
         with_dns_records: Mastodon 會嘗試解析所給域名的 DNS 記錄，解析結果一致者將一併封鎖
       featured_tag:
-        name: 您可能想使用其中一個：
+        name: 這些是您最近使用的一些主題標籤：
+      filters:
+        action: 請選擇當嘟文符合該過濾器時將被執行之動作
+        actions:
+          hide: 完全隱藏過濾內容，當作它似乎不曾存在過
+          warn: 隱藏過濾內容於過濾器標題之警告後
+      form_admin_settings:
+        backups_retention_period: 將已產生的使用者封存資料保存特定天數。
+        bootstrap_timeline_accounts: 這些帳號將被釘選於新帳號跟隨推薦之上。
+        closed_registrations_message: 於註冊關閉時顯示
+        content_cache_retention_period: 當設定成正值時，從其他伺服器而來的嘟文會於指定天數後被刪除。這項操作可能是不可逆的。
+        custom_css: 您於 Mastodon 網頁版本中能套用客製化風格。
+        mascot: 覆寫進階網頁介面中的圖例。
+        media_cache_retention_period: 當設定成正值時，已下載的多媒體檔案會於指定天數後被刪除，並且視需要重新下載。
+        profile_directory: 個人檔案目錄將會列出那些有選擇被發現的使用者。
+        require_invite_text: 如果已設定為手動審核註冊，請將「加入原因」設定為必填項目。
+        site_contact_email: 其他人如何聯繫您關於法律或支援之諮詢。
+        site_contact_username: 其他人如何於 Mastodon 上聯繫您。
+        site_extended_description: 任何其他可能對訪客或使用者有用的額外資訊。可由 Markdown 語法撰寫。
+        site_short_description: 一段有助於辨別您伺服器的簡短說明。例如：誰運行該伺服器、該伺服器是提供給哪些人群？
+        site_terms: 使用您自己的隱私權政策，或者保留空白以使用預設值。可由 Markdown 語法撰寫。
+        site_title: 除了網域外，其他人該如何指稱您的伺服器。
+        theme: 未登入之訪客或新使用者所見之佈景主題。
+        thumbnail: 大約 2:1 圖片會顯示於您伺服器資訊之旁。
+        timeline_preview: 未登入之訪客能夠瀏覽此伺服器上最新的公開嘟文。
+        trendable_by_default: 跳過手動審核熱門內容。仍能在登上熱門趨勢後移除個別內容。
+        trends: 熱門趨勢將顯示於您伺服器上正在吸引大量注意力的嘟文、主題標籤、或者新聞。
       form_challenge:
         current_password: 您正要進入安全區域
       imports:
         data: 從其他 Mastodon 伺服器匯出的 CSV 檔案
       invite_request:
-        text: 這會協助我們審核您的應用程式
+        text: 這會協助我們審核您的申請
       ip_block:
         comment: 可選的，但請記得您為何添加這項規則。
         expires_in: IP 位址是經常共用或轉手的有限資源，不建議無限期地封鎖特定 IP 位址。
         ip: 請輸入 IPv4 或 IPv6 位址，亦可以用 CIDR 語法以封鎖整個 IP 區段。小心不要把自己給一併封鎖掉囉！
         severities:
           no_access: 封鎖對所有資源存取
+          sign_up_block: 無法註冊新帳號
           sign_up_requires_approval: 新註冊申請需要先經過您的審核
         severity: 請選擇將如何處理來自這個 IP 位址的請求
       rule:
         text: 說明使用者在此伺服器上需遵守的規則或條款。試著維持各項條款簡短而明瞭。
       sessions:
-        otp: 請輸入產生自您手機 App 的兩步驟驗證碼，或輸入其中一個復原代碼：
+        otp: 請輸入產生自您手機 App 的兩階段驗證碼，或輸入其中一個備用驗證碼：
         webauthn: 如果它是 USB 安全金鑰的話，請確認已正確插入，如有需要請觸擊。
       tag:
         name: 您只能變更大小寫，例如，以使其更易讀。
       user:
-        chosen_languages: 當核取時，只有選取語言的嘟文會在公開時間軸中顯示
+        chosen_languages: 當選取時，只有選取語言之嘟文會在公開時間軸中顯示
+        role: 角色控制使用者有哪些權限
+      user_role:
+        color: 在整個使用者介面中用於角色的顏色，十六進位格式的 RGB
+        highlighted: 這會讓角色公開可見
+        name: 角色的公開名稱，如果角色設定為顯示為徽章
+        permissions_as_keys: 有此角色的使用者將有權存取……
+        position: 在某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
+      webhook:
+        events: 請選擇要傳送的事件
+        url: 事件會被傳送至何處
     labels:
       account:
         fields:
@@ -103,15 +142,15 @@ zh-TW:
         title: 標題
       admin_account_action:
         include_statuses: 在電子郵件中加入檢舉的嘟文
-        send_email_notification: 透過電子信件通知使用者
+        send_email_notification: 透過電子郵件通知使用者
         text: 自訂警告
         type: 動作
         types:
           disable: 停用
           none: 什麼也不做
-          sensitive: 有雷小心
+          sensitive: 敏感内容
           silence: 安靜
-          suspend: 停權並不可逆的刪除帳戶資料
+          suspend: 停權並不可逆的刪除帳號資料
         warning_preset_id: 使用警告預設
       announcement:
         all_day: 全天活動
@@ -119,37 +158,40 @@ zh-TW:
         scheduled_at: 排程發佈
         starts_at: 活動開始時間
         text: 公告
+      appeal:
+        text: 解釋為什麼要撤銷這個決定
       defaults:
-        autofollow: 邀請別人關注你的帳戶
+        autofollow: 邀請別人跟隨您的帳號
         avatar: 大頭貼
-        bot: 此帳戶是台機器人
+        bot: 此帳號是台機器人
         chosen_languages: 過濾語言
         confirm_new_password: 確認新密碼
         confirm_password: 確認密碼
         context: 過濾情境
         current_password: 目前密碼
         data: 資料
-        discoverable: 在目錄列出此帳戶
+        discoverable: 在目錄列出此帳號
         display_name: 顯示名稱
-        email: 電子信箱地址
+        email: 電子郵件地址
         expires_in: 失效時間
-        fields: 個人資料中繼資料
-        header: 頁面頂端
+        fields: 個人檔案詮釋資料
+        header: 封面圖片
         honeypot: "%{label} (請勿填寫)"
         inbox_url: 中繼收件匣的 URL
         irreversible: 放棄而非隱藏
         locale: 介面語言
-        locked: 鎖定帳戶
+        locked: 鎖定帳號
         max_uses: 最大使用次數
         new_password: 新密碼
-        note: 簡介
-        otp_attempt: 兩步驟驗證碼
+        note: 個人簡介
+        otp_attempt: 兩階段驗證碼
         password: 密碼
         phrase: 關鍵字或片語
         setting_advanced_layout: 啟用進階網頁介面
         setting_aggregate_reblogs: 時間軸中的群組轉嘟
+        setting_always_send_emails: 總是發送 e-mail 通知
         setting_auto_play_gif: 自動播放 GIF 動畫
-        setting_boost_modal: 在轉嘟前先詢問我
+        setting_boost_modal: 轉嘟前先詢問我
         setting_crop_images: 將未展開嘟文中的圖片裁剪至 16x9
         setting_default_language: 嘟文語言
         setting_default_privacy: 嘟文可見範圍
@@ -166,25 +208,54 @@ zh-TW:
         setting_reduce_motion: 減少過渡動畫效果
         setting_show_application: 顯示用來傳送嘟文的應用程式
         setting_system_font_ui: 使用系統預設字型
-        setting_theme: 站點主題
-        setting_trends: 顯示本日趨勢
-        setting_unfollow_modal: 取消關注某人前先詢問我
-        setting_use_blurhash: 將隱藏媒體以彩色漸變圖樣表示
+        setting_theme: 佈景主題
+        setting_trends: 顯示本日熱門趨勢
+        setting_unfollow_modal: 取消跟隨某人前先詢問我
+        setting_use_blurhash: 將隱藏媒體以彩色漸層圖樣表示
         setting_use_pending_items: 限速模式
         severity: 優先級
         sign_in_token_attempt: 安全代碼
+        title: 標題
         type: 匯入類型
         username: 使用者名稱
-        username_or_email: 使用者名稱或電子信箱地址
+        username_or_email: 使用者名稱或電子郵件地址
         whole_word: 整個詞彙
       email_domain_block:
         with_dns_records: 包括網域的 MX 記錄和 IP 位址
       featured_tag:
         name: "「#」標籤"
+      filters:
+        actions:
+          hide: 完全隱藏
+          warn: 隱藏於警告之後
+      form_admin_settings:
+        backups_retention_period: 使用者封存資料保留期間
+        bootstrap_timeline_accounts: 永遠推薦這些帳號給新使用者
+        closed_registrations_message: 當註冊關閉時的客製化訊息
+        content_cache_retention_period: 內容快取資料保留期間
+        custom_css: 自訂 CSS
+        mascot: 自訂吉祥物 (legacy)
+        media_cache_retention_period: 多媒體快取資料保留期間
+        profile_directory: 啟用個人檔案目錄
+        registrations_mode: 誰能註冊
+        require_invite_text: 要求「加入原因」
+        show_domain_blocks: 顯示封鎖的網域
+        show_domain_blocks_rationale: 顯示網域被封鎖之原因
+        site_contact_email: 聯絡 e-mail
+        site_contact_username: 聯絡人帳號
+        site_extended_description: 進階描述
+        site_short_description: 伺服器描述
+        site_terms: 隱私權政策
+        site_title: 伺服器名稱
+        theme: 預設佈景主題
+        thumbnail: 伺服器縮圖
+        timeline_preview: 允許未登入使用者瀏覽公開時間軸
+        trendable_by_default: 允許熱門趨勢直接顯示，不需經過審核
+        trends: 啟用熱門趨勢
       interactions:
-        must_be_follower: 封鎖非關注者的通知
-        must_be_following: 封鎖您未關注之使用者的通知
-        must_be_following_dm: 封鎖您未關注之使用者的私訊
+        must_be_follower: 封鎖非跟隨者的通知
+        must_be_following: 封鎖您未跟隨之使用者的通知
+        must_be_following_dm: 封鎖您未跟隨之使用者的私訊
       invite:
         comment: 備註
       invite_request:
@@ -194,26 +265,40 @@ zh-TW:
         ip: IP 位址
         severities:
           no_access: 封鎖
+          sign_up_block: 禁止註冊新帳號
           sign_up_requires_approval: 限制註冊
         severity: 規則
       notification_emails:
-        digest: 傳送摘要信件
-        favourite: 當有使用者喜歡你的嘟文時，傳送電子信件通知
-        follow: 當有使用者關注你時，傳送電子信件通知
-        follow_request: 當有使用者請求關注你時，傳送電子信件通知
-        mention: 當有使用者在嘟文提及你時，傳送電子信件通知
-        pending_account: 需要審核的新帳戶
-        reblog: 當有使用者轉嘟你的嘟文時，傳送電子信件通知
-        report: 當提交新檢舉時傳送電子郵件
-        trending_tag: 未經審核的標籤正在炎上中
+        appeal: 有人對管理員的決定提出上訴
+        digest: 傳送摘要電子郵件
+        favourite: 當有使用者喜歡您的嘟文時，傳送電子郵件通知
+        follow: 當有使用者跟隨您時，傳送電子郵件通知
+        follow_request: 當有使用者請求跟隨您時，傳送電子郵件通知
+        mention: 當有使用者在嘟文提及您時，傳送電子郵件通知
+        pending_account: 需要審核的新帳號
+        reblog: 當有使用者轉嘟您的嘟文時，傳送電子郵件通知
+        report: 新回報已遞交
+        trending_tag: 新熱門趨勢需要審核
       rule:
         text: 規則
       tag:
         listable: 允許此主題標籤在搜尋及個人檔案目錄中顯示
         name: 主題標籤
-        trendable: 允許此主題標籤在趨勢下顯示
+        trendable: 允許此主題標籤在熱門趨勢下顯示
         usable: 允許嘟文使用此主題標籤
+      user:
+        role: 角色
+      user_role:
+        color: 識別顏色
+        highlighted: 在使用者個人檔案上將角色顯示為徽章
+        name: 名稱
+        permissions_as_keys: 權限
+        position: 優先權
+      webhook:
+        events: 已啟用的事件
+        url: 端點 URL
     'no': 否
+    not_recommended: 不建議
     recommended: 建議
     required:
       mark: "*"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index df7a0b6c2..064d44d20 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1,80 +1,23 @@
 ---
 sk:
   about:
-    about_hashtag_html: Toto sú verejné príspevky, otagované pod <strong>#%{hashtag}</strong>. Ak máš účet hocikde v rámci fediversa, môžeš s nimi narábať.
     about_mastodon_html: Mastodon je sociálna sieť založená na otvorených webových protokoloch a na slobodnom softvéri. Je decentralizovaná, podobne ako email.
-    about_this: O tomto serveri
-    active_count_after: aktívni
-    active_footnote: Mesačne aktívnych užívateľov (MAU)
-    administered_by: 'Správcom je:'
-    apps: Aplikácie
-    apps_platforms: Užívaj Mastodon z iOSu, Androidu, a iných platforiem
-    browse_directory: Prehľadávaj databázu profilov, a filtruj podľa záujmov
-    browse_local_posts: Prebádaj naživo prúd verejných príspevkov z tohto servera
-    browse_public_posts: Sleduj naživo prúd verejných príspevkov na Mastodone
-    contact: Kontakt
     contact_missing: Nezadaný
     contact_unavailable: Neuvedený/á
-    discover_users: Objavuj užívateľov
-    documentation: Dokumentácia
-    federation_hint_html: S účtom na %{instance} budeš môcť následovať ľúdí na hociakom Mastodon serveri, ale aj na iných serveroch.
-    get_apps: Vyskúšaj aplikácie
     hosted_on: Mastodon hostovaný na %{domain}
-    instance_actor_flash: |
-      Tento účet je virtuálnym aktérom, ktorý predstavuje samotný server a nie žiadného jedného užívateľa.
-      Je využívaný pre potreby federovania a nemal by byť blokovaný, pokiaľ nechceš zablokovať celý server, čo ide lepšie dosiahnúť cez blokovanie domény.
-    learn_more: Zisti viac
-    privacy_policy: Zásady súkromia
-    rules: Serverové pravidlá
-    see_whats_happening: Pozoruj, čo sa deje
-    server_stats: 'Serverové štatistiky:'
-    source_code: Zdrojový kód
-    status_count_after:
-      few: príspevkov
-      many: príspevkov
-      one: príspevok
-      other: príspevky
-    status_count_before: Ktorí napísali
-    tagline: Nasleduj kamarátov, a objavuj nových
-    terms: Podmienky užitia
-    unavailable_content: Nedostupný obsah
-    unavailable_content_description:
-      reason: 'Dôvod:'
-      rejecting_media: 'Mediálne súbory z týchto serverov nebudú spracované, alebo ukladané, a nebudú z nich zobrazované žiadne náhľady, vyžadujúc ručné prekliknutie priamo až k pôvodnému súboru:'
-      rejecting_media_title: Triedené médiá
-      silenced: 'Príspevky z týchto serverov budú skryté z verejných osí a z konverzácií, a nebudú vytvorené žiadné oboznámena ohľadom aktivity ich užívateľov, pokiaľ ich nenásleduješ:'
-      silenced_title: Utíšené servery
-      suspended: 'Z týchto serverov nebudú spracovávané, ukladané, alebo vymieňané žiadne dáta, čo urobí nemožnou akúkoľvek interakciu, alebo komunikáciu s užívateľmi z týchto serverov:'
-      suspended_title: Vylúčené servery
-    unavailable_content_html: Vo všeobecnosti, Mastodon ti dovoľuje vidieť obsah, a komunikovať s užívateľmi akéhokoľvek iného serveru v rámci fediversa. Toto sú výnimky, ktoré boli vytvorené na tomto konkrétnom serveri.
-    user_count_after:
-      few: užívateľov
-      many: užívatelia
-      one: užívateľ
-      other: užívateľov
-    user_count_before: Domov pre
-    what_is_mastodon: Čo je Mastodon?
+    title: O
   accounts:
-    choices_html: "%{name}vé voľby:"
-    endorsements_hint: Môžeš ukázať sledovaných užívateľov, s ktorými si spriaznený/á cez webové rozhranie, a tí tu budú zobrazení.
-    featured_tags_hint: Môžeš zvýrazniť určité haštagy, ktoré tu budú zobrazené.
-    follow: Následuj
+    follow: Nasleduj
     followers:
       few: Sledovateľov
       many: Sledovateľov
       one: Sledujúci
       other: Sledovatelia
-    following: Následujem
-    joined: Pridal/a sa v %{date}
+    following: Nasledujem
+    instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
     last_active: naposledy aktívny
     link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date}
-    media: Médiá
-    moved_html: "%{name} účet bol presunutý na %{new_profile_link}:"
-    network_hidden: Táto informácia nieje k dispozícii
-    never_active: Nikdy
     nothing_here: Nič tu nie je!
-    people_followed_by: Ľudia, ktorých %{name} sleduje
-    people_who_follow: Ľudia sledujúci %{name}
     pin_errors:
       following: Musíš už následovať toho človeka, ktorého si praješ zviditeľniť
     posts:
@@ -83,13 +26,6 @@ sk:
       one: Príspevok
       other: Príspevkov
     posts_tab_heading: Príspevky
-    posts_with_replies: Príspevky s odpoveďami
-    roles:
-      admin: Správca
-      group: Skupina
-      moderator: Moderátor
-    unavailable: Profil nieje dostupný
-    unfollow: Prestaň sledovať
   admin:
     account_actions:
       action: Vykonaj
@@ -97,37 +33,47 @@ sk:
     account_moderation_notes:
       create: Zanechaj poznámku
       created_msg: Poznámka moderátora bola úspešne vytvorená!
-      delete: Vymaž
       destroyed_msg: Moderátorska poznámka bola úspešne zmazaná!
     accounts:
       add_email_domain_block: Pridaj e-mailovú doménu na zoznam zakázaných
       approve: Schváľ
-      approve_all: Schváľ všetky
+      approved_msg: Úspešne schválená prihláška %{username}
       are_you_sure: Si si istý/á?
       avatar: Maskot
       by_domain: Doména
       change_email:
-        changed_msg: Email pre tento účet bol úspešne zmenený!
+        changed_msg: E-mail úspešne zmenený!
         current_email: Súčasný email
         label: Zmeň email
         new_email: Nový email
         submit: Zmeň email
         title: Zmeň email pre %{username}
+      change_role:
+        changed_msg: Postavenie úspešne zmenené!
+        label: Zmeň pozíciu
+        no_role: Žiadna pozícia
+        title: Zmeň pozíciu pre %{username}
       confirm: Potvrď
       confirmed: Potvrdený
       confirming: Potvrdzujúci
+      custom: Vlastné
       delete: Vymaž dáta
       deleted: Vymazané
       demote: Degraduj
+      destroyed_msg: "%{username} je teraz zaradený do fronty na okamžité vymazanie"
       disable: Zablokuj
+      disable_sign_in_token_auth: Zakázanie overovania e-mailovým tokenom
       disable_two_factor_authentication: Vypni dvoj-faktorové overovanie
       disabled: Blokovaný
       display_name: Ukáž meno
       domain: Doména
       edit: Uprav
+      email: Email
       email_status: Stav emailu
       enable: Povoľ
+      enable_sign_in_token_auth: Povolenie overovania e-mailovým tokenom
       enabled: Povolený
+      enabled_msg: Úspešne rozmrazené konto %{username}
       followers: Sledujúci
       follows: Sledovania
       header: Záhlavie
@@ -144,11 +90,13 @@ sk:
       login_status: Stav prihlásenia
       media_attachments: Prílohy
       memorialize: Zmeň na "Navždy budeme spomínať"
+      memorialized: Spomienka na
+      memorialized_msg: Úspešne zmenené %{username} na spomienkové konto
       moderation:
         active: Aktívny/a
         all: Všetko
         pending: Čakajúci
-        silenced: Umlčané
+        silenced: Obmedzený
         suspended: Vylúčený/á
         title: Moderácia
       moderation_notes: Moderátorské poznámky
@@ -156,18 +104,23 @@ sk:
       most_recent_ip: Posledná IP adresa
       no_account_selected: Nedošlo k žiadnému pozmeneniu účtov, keďže žiadne neboli vybrané
       no_limits_imposed: Nie sú stanovené žiadné obmedzenia
+      no_role_assigned: Žiadne postavenie nepriradené
       not_subscribed: Neodoberá
       pending: Vyžaduje posúdenie
       perform_full_suspension: Vylúč
+      previous_strikes: Predchádzajúce údery
       promote: Vyzdvihni
       protocol: Protokol
       public: Verejná časová os
       push_subscription_expires: PuSH odoberanie expiruje
       redownload: Obnov profil
+      redownloaded_msg: Úspešne obnovený profil %{username} z pôvodného
       reject: Zamietni
-      reject_all: Zamietni všetky
+      rejected_msg: Úspešne zamietnutá prihláška %{username}
       remove_avatar: Vymaž avatar
       remove_header: Vymaž záhlavie
+      removed_avatar_msg: Úspešne odstránený obrázok avatara %{username}
+      removed_header_msg: Úspešne odstránený obrázok hlavičky %{username}
       resend_confirmation:
         already_confirmed: Tento užívateľ je už potvrdený
         send: Odošli potvrdzovací email znovu
@@ -175,18 +128,14 @@ sk:
       reset: Resetuj
       reset_password: Obnov heslo
       resubscribe: Znovu odoberaj
-      role: Oprávnenia
-      roles:
-        admin: Správca
-        moderator: Moderátor
-        staff: Člen
-        user: Užívateľ
+      role: Postavenie
       search: Hľadaj
       search_same_email_domain: Iní užívatelia s tou istou emailovou doménou
       search_same_ip: Ostatní užívatelia s rovnakou IP adresou
       security_measures:
         only_password: Iba heslo
         password_and_2fa: Heslo a dvoj-faktorové overovanie
+      sensitive: Citlivé na silu
       sensitized: Označený ako chúlostivý
       shared_inbox_url: URL zdieľanej schránky
       show:
@@ -194,34 +143,48 @@ sk:
         targeted_reports: Nahlásenia od ostatných
       silence: Stíš
       silenced: Stíšený/é
-      statuses: Príspevky
+      statuses: Príspevkov
+      strikes: Predchádzajúce údery
       subscribe: Odoberaj
+      suspend: Vylúč
       suspended: Vylúčený/á
-      time_in_queue: Čakajúci %{time} v poradí
+      suspension_irreversible: Údaje tohto účtu boli nenávratne vymazané. Účet môžete zrušiť, aby sa dal používať, ale neobnovia sa žiadne údaje, ktoré predtým mal.
+      suspension_reversible_hint_html: Účet bol pozastavený a údaje budú úplne odstránené dňa %{date}. Dovtedy je možné účet obnoviť bez akýchkoľvek nepriaznivých účinkov. Ak chcete okamžite odstrániť všetky údaje účtu, môžete tak urobiť nižšie.
       title: Účty
+      unblock_email: Odblokuj emailovú adresu
+      unblocked_email_msg: Úspešné odblokovanie e-mailovej adresy %{username}
       unconfirmed_email: Nepotvrdený email
+      undo_sensitized: Zrušenie citlivosti na silu
       undo_silenced: Zruš stíšenie
       undo_suspension: Zruš blokovanie
+      unsilenced_msg: Úspešne zrušené obmedzenie účtu %{username}
       unsubscribe: Prestaň odoberať
       username: Prezývka
       view_domain: Ukáž súhrn pre doménu
       warn: Varuj
+      web: Web
       whitelisted: Na bielej listine
     action_logs:
       action_types:
+        approve_user: Odobri užívateľa
         assigned_to_self_report: Priraď hlásenie
         change_email_user: Zmeň email pre užívateľa
         confirm_user: Potvrď užívateľa
         create_account_warning: Vytvor výstrahu
         create_announcement: Vytvor oboznámenie
+        create_custom_emoji: Vytvor vlastné emotikony
         create_domain_allow: Vytvor povolenie pre doménu
         create_domain_block: Vytvor zákaz domény
         create_email_domain_block: Vytvor zákaz emailovej domény
         create_ip_block: Vytvor IP pravidlo
+        create_user_role: Vytvoriť rolu
         demote_user: Zniž užívateľskú rolu
         destroy_announcement: Vymaž oboznámenie
+        destroy_custom_emoji: Vymaž vlastné emotikony
         destroy_domain_allow: Zmaž povolenie pre doménu
         destroy_domain_block: Zruš blokovanie domény
+        destroy_email_domain_block: Zmazať zákaz emailovej domény
+        destroy_instance: Vyčistiť doménu
         destroy_ip_block: Vymaž IP pravidlo
         destroy_status: Vymaž príspevok
         destroy_unavailable_domain: Vymaž nedostupnú doménu
@@ -231,6 +194,7 @@ sk:
         enable_custom_emoji: Povoľ vlastné emotikony
         enable_user: Povoľ užívateľa
         promote_user: Povýš užívateľskú rolu
+        reject_user: Zamietni užívateľa
         remove_avatar_user: Vymaž avatar
         reopen_report: Znovu otvor hlásenie
         reset_password_user: Obnov heslo
@@ -238,17 +202,20 @@ sk:
         sensitive_account: Vynúť všetky médiá na účte ako chúlostivé
         silence_account: Utíš účet
         suspend_account: Vylúč účet
+        unassigned_report: Odober priradenie nahlásenia
+        unblock_email_account: Odblokuj emailovú adresu
         unsilence_account: Zvráť obmedzenie účtu
         unsuspend_account: Odblokuj účet
         update_announcement: Aktualizuj oboznámenie
         update_domain_block: Aktualizuj zákaz domény
+        update_ip_block: Aktualizovať IP pravidlo
         update_status: Aktualizuj stav
+        update_user_role: Aktualizovať rolu
       actions:
         assigned_to_self_report_html: "%{name} pridelil/a hlásenie užívateľa %{target} sebe"
         change_email_user_html: "%{name} zmenil/a emailovú adresu užívateľa %{target}"
         confirm_user_html: "%{name} potvrdil/a emailovú adresu používateľa %{target}"
         create_account_warning_html: "%{name} poslal/a upozornenie užívateľovi %{target}"
-      deleted_status: "(zmazaný príspevok)"
       filter_by_action: Filtruj podľa úkonu
       filter_by_user: Trieď podľa užívateľa
       title: Kontrólny záznam
@@ -266,6 +233,7 @@ sk:
       scheduled_for: Načasované na %{time}
       scheduled_msg: Oboznámenie bolo naplánované na zverejnenie!
       title: Oboznámenia
+      unpublish: Zruš zverejnenie
     custom_emojis:
       assign_category: Priraď kategóriu
       by_domain: Doména
@@ -283,7 +251,6 @@ sk:
       enable: Povoľ
       enabled: Povolené
       enabled_msg: Emoji bolo úspešne povolené
-      image_hint: PNG do 50KB
       list: Zoznam
       listed: V zozname
       new:
@@ -299,9 +266,17 @@ sk:
       updated_msg: Emoji bolo úspešne aktualizované!
       upload: Nahraj
     dashboard:
+      active_users: aktívni užívatelia
+      media_storage: Úložisko médií
+      new_users: noví užívatelia
+      opened_reports: otvorené hlásenia
+      resolved_reports: vyriešené hlásenia
       software: Softvér
       space: Využitie miesta
       title: Spravovacie rozhranie
+      top_languages: Hlavne aktívne jazyky
+      top_servers: Hlavne aktívne servery
+      website: Webová stránka
     domain_allows:
       add_new: Povolená doména
       created_msg: Doména bola úspešne povolená
@@ -318,9 +293,7 @@ sk:
         create: Vytvor blokovanie domény
         hint: Blokovanie domény stále dovolí vytvárať nové účty v databázi, ale tieto budú spätne automaticky moderované.
         severity:
-          desc_html: "<strong>Stíšenie</strong> urobí všetky príspevky daného účtu neviditeľné pre všetkých ktorí nenásledujú tento účet. <strong>Vylúčenie</strong> zmaže všetky príspevky, médiá a profilové informácie. Použi <strong>Žiadne</strong>, ak chceš iba neprijímať súbory médií."
           noop: Nič
-          silence: Stíš
           suspend: Vylúč
         title: Nové blokovanie domény
       obfuscate: Zatemniť názov domény
@@ -331,35 +304,18 @@ sk:
       reject_media_hint: Vymaže miestne uložené súbory médií a odmietne ich sťahovanie v budúcnosti. Nepodstatné pri vylúčení
       reject_reports: Zamietni hlásenia
       reject_reports_hint: Ignoruj všetky hlásenia prichádzajúce z tejto domény. Nevplýva na blokovania
-      rejecting_media: odmietanie médiálnych súborov
-      rejecting_reports: odmietanie hlásení
-      severity:
-        silence: stíšené
-        suspend: vylúčené
-      show:
-        affected_accounts:
-          few: "%{count} účtov v databázi ovplyvnených"
-          many: "%{count} účtov v databázi ovplyvnených"
-          one: Jeden účet v databázi ovplyvnený
-          other: "%{count} účty v databázi ovplyvnené"
-        retroactive:
-          silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény
-          suspend: Zruš suspendáciu všetkých momentálne ovplyvnených účtov z tejto domény
-        title: Zruš blokovanie domény %{domain}
-        undo: Vráť späť
       undo: Odvolaj blokovanie domény
       view: Ukáž blokovanie domén
     email_domain_blocks:
       add_new: Pridaj nový
       created_msg: Emailová doména bola úspešne pridaná do zoznamu zakázaných
       delete: Vymaž
-      destroyed_msg: Emailová doména bola úspešne vymazaná zo zoznamu zakázaných
       domain: Doména
-      empty: Žiadné emailové domény niesú v súčasnosti na čiernej listine.
-      from_html: z %{domain}
       new:
         create: Pridaj doménu
+        resolve: Preveď doménu
         title: Nový email na zablokovanie
+      resolved_through_html: Prevedená cez %{domain}
       title: Blokované emailové adresy
     follow_recommendations:
       description_html: "<strong>Odporúčania na sledovanie pomáhaju novým užívateľom rýchlo nájsť zaujímavý obsah</strong>. Ak užívateľ zatiaľ nedostatočne interagoval s ostatnými aby si vyformoval personalizované odporúčania na sledovanie, tak mu budú odporúčané tieto účty. Sú prepočítavané na dennej báze z mixu účtov s nedávnym najvyšším záujmom a najvyšším počtom lokálnych sledujúcich pre daný jazyk."
@@ -370,19 +326,26 @@ sk:
       title: Odporáčania na sledovanie
       unsuppress: Obnoviť odporúčanie na sledovanie
     instances:
+      availability:
+        title: Dostupnosť
       back_to_all: Všetko
       back_to_limited: Obmedzené
       back_to_warning: Upozornenie
       by_domain: Doména
+      content_policies:
+        comment: Interná poznámka
+        policies:
+          reject_media: Zamietni médiá
+          suspend: Vylúč
+        policy: Zásady
+        reason: Verejné odôvodnenie
+        title: Zásady o obsahu
+      dashboard:
+        instance_accounts_dimension: Najsledovanejšie účty
       delivery:
         all: Všetko
-        warning: Upozornenie
+        unavailable: Nedostupné
       delivery_available: Je v dosahu doručovania
-      known_accounts:
-        few: "%{count} známych účtov"
-        many: "%{count} známych účtov"
-        one: "%{count} známy účet"
-        other: "%{count} známe účty"
       moderation:
         all: Všetky
         limited: Obmedzené
@@ -405,6 +368,7 @@ sk:
       title: Pozvánky
     ip_blocks:
       add_new: Vytvor pravidlo
+      created_msg: Nové IP pravidlo úspešne pridané
       delete: Vymaž
       expires_in:
         '1209600': 2 týždne
@@ -415,8 +379,8 @@ sk:
         '94670856': 3 roky
       new:
         title: Vytvor nové IP pravidlo
-    pending_accounts:
-      title: Čakajúcich účtov (%{count})
+      no_ip_block_selected: Žiadne IP pravidlá neboli zmenené, keďže si žiadne nemal/a zvolené
+      title: pravidlá pre IP adresy
     relationships:
       title: Vzťahy užívateľa %{acct}
     relays:
@@ -439,27 +403,29 @@ sk:
       created_msg: Poznámka o nahlásení úspešne vytvorená!
       destroyed_msg: Poznámka o nahlásení úspešne vymazaná!
     reports:
-      account:
-        reports:
-          few: "%{count} hlásení"
-          many: "%{count} hlásenia"
-          one: "%{count} hlásenie"
-          other: "%{count} hlásení"
       action_taken_by: Zákrok vykonal/a
       are_you_sure: Si si istý/á?
       assign_to_self: Priraď sebe
       assigned: Priradený moderátor
+      by_target_domain: Doména nahláseného účtu
+      category: Kategória
       comment:
         none: Žiadne
       created_at: Nahlásené
+      delete_and_resolve: Vymaž príspevky
+      forwarded: Preposlané
+      forwarded_to: Preposlané na %{domain}
       mark_as_resolved: Označiť ako vyriešené
+      mark_as_sensitive: Označ ako chúlostivé
       mark_as_unresolved: Označ ako nevyriešené
+      no_one_assigned: Nikoho
       notes:
         create: Pridaj poznámku
         create_and_resolve: Vyrieš s poznámkou
         create_and_unresolve: Otvor znovu, s poznámkou
         delete: Vymaž
         placeholder: Opíš aké opatrenia boli urobené, alebo akékoľvek iné súvisiace aktualizácie…
+        title: Poznámky
       reopen: Znovu otvor report
       report: 'Nahlásiť #%{id}'
       reported_account: Nahlásený účet
@@ -467,111 +433,49 @@ sk:
       resolved: Vyriešené
       resolved_msg: Hlásenie úspešne vyriešené!
       status: Stav
-      target_domain: Doména nahláseného účtu
+      statuses: Nahlásený obsah
       title: Hlásenia
       unassign: Odober
       unresolved: Nevyriešené
       updated_at: Aktualizované
+      view_profile: Zobraz profil
+    roles:
+      add_new: Pridaj postavenie
+      assigned_users:
+        few: "%{count} užívateľov"
+        many: "%{count} užívateľov"
+        one: "%{count} užívateľ"
+        other: "%{count} užívatelia"
+      categories:
+        administration: Spravovanie
+        invites: Pozvánky
+      edit: Uprav postavenie %{name}
+      privileges:
+        administrator: Správca
+        invite_users: Pozvi užívateľov
+        manage_roles: Spravuj postavenia
+      title: Postavenia
+    rules:
+      empty: Žiadne pravidlá servera ešte neboli určené.
+      title: Serverové pravidlá
     settings:
-      activity_api_enabled:
-        desc_html: Sčítanie miestne uverejnených príspevkov, aktívnych užívateľov, a nových registrácii, v týždenných intervaloch
-        title: Vydať hromadné štatistiky o užívateľskej aktivite
-      bootstrap_timeline_accounts:
-        desc_html: Ak je prezývok viacero, každú oddeľ čiarkou. Tieto účty budú zobrazené v odporúčaniach na sledovanie
-        title: Štandardní následovníci nových užívateľov
-      contact_information:
-        email: Pracovný email
-        username: Kontaktné užívateľské meno
-      custom_css:
-        desc_html: Uprav vzhľad pomocou CSS, ktoré je načítané na každej stránke
-        title: Vlastné CSS
-      default_noindex:
-        desc_html: Ovplyvňuje všetkých užívateľov, ktorí si toto nasavenie nezmenili sami
-        title: Vyraď užívateľov z indexovania vyhľadávačmi, ako východzie nastavenie
       domain_blocks:
         all: Všetkým
         disabled: Nikomu
-        title: Ukáž blokované domény
         users: Prihláseným, miestnym užívateľom
-      domain_blocks_rationale:
-        title: Ukáž zdôvodnenie
-      hero:
-        desc_html: Zobrazuje sa na hlavnej stránke. Doporučené je rozlišenie aspoň 600x100px. Pokiaľ nič nieje dodané, bude nastavený základný orázok serveru.
-        title: Obrázok hrdinu
-      mascot:
-        desc_html: Zobrazované na viacerých stránkach. Odporúčaná veľkosť aspoň 293×205px. Pokiaľ nieje nahraté, bude zobrazený základný maskot.
-        title: Obrázok maskota
-      peers_api_enabled:
-        desc_html: Domény, na ktoré tento server už v rámci fediversa natrafil
-        title: Zverejni zoznam objavených serverov
-      preview_sensitive_media:
-        desc_html: Náhľad odkazov z iných serverov, bude zobrazený aj vtedy, keď sú médiá označené ako chúlostivé
-        title: Ukazuj aj chúlostivé médiá v náhľadoch OpenGraph
-      profile_directory:
-        desc_html: Povoľ užívateľom, aby mohli byť nájdení
-        title: Zapni profilový katalóg
-      registrations:
-        closed_message:
-          desc_html: Toto sa zobrazí na hlavnej stránke v prípade, že sú registrácie uzavreté. Možno tu použiť aj HTML kód
-          title: Správa o uzavretých registráciách
-        deletion:
-          desc_html: Dovoľ každému, aby si mohli vymazať svok účet
-          title: Sprístupni možnosť vymazať si účet
-        min_invite_role:
-          disabled: Nikto
-          title: Povoľ pozvánky od
       registrations_mode:
         modes:
           approved: Pre registráciu je nutné povolenie
           none: Nikto sa nemôže registrovať
           open: Ktokoľvek sa môže zaregistrovať
-        title: Režím registrácií
-      show_known_fediverse_at_about_page:
-        desc_html: Ak je zapnuté, bude v ukážke osi možné nahliadnúť príspevky z celého známeho fediversa. Inak budú ukázané iba príspevky z miestnej osi.
-        title: Ukáž celé známe fediverse na náhľade osi
-      show_staff_badge:
-        desc_html: Ukáž moderátorsky odznak na užívateľovom profile
-        title: Ukáž značku moderátora
-      site_description:
-        desc_html: Oboznamujúci paragraf na hlavnej stránke a pri meta tagoch. Opíš, čo robí tento Mastodon server špecifickým, a ďalej hocičo iné, čo považuješ za dôležité. Môžeš použiť HTML kód, hlavne <code>&lt;a&gt;</code> a <code>&lt;em&gt;</code>.
-        title: Popis servera
-      site_description_extended:
-        desc_html: Toto je vhodné miesto pre tvoje pravidlá o prevádzke, pokyny, podmienky a iné veci, ktorými je tvoj server špecifický. Je možné tu používať HTML tagy
-        title: Vlastné doplňujúce informácie
-      site_short_description:
-        desc_html: Zobrazené na bočnom paneli a pri meta tagoch. Popíš čo je Mastodon, a čo robí tento server iným, v jednom paragrafe. Pokiaľ toto necháš prázdne, bude tu zobrazený základný popis servera.
-        title: Krátky popis serveru
-      site_terms:
-        desc_html: Môžeš si napísať svoje vlastné pravidla o súkromí, prevádzke, alebo aj iné legality. Môžeš tu používať HTML kód
-        title: Vlastné pravidlá prevádzky
-      site_title: Názov servera
-      thumbnail:
-        desc_html: Používané pre náhľady cez OpenGraph a API. Doporučuje sa rozlišenie 1200x630px
-        title: Miniatúra servera
-      timeline_preview:
-        desc_html: Zobraziť verejnú nástenku na hlavnej stránke
-        title: Náhľad nástenky
-      title: Nastavenia stránky
-      trendable_by_default:
-        desc_html: Ovplyvňuje haštagy ktoré predtým neboli zakázané
-        title: Dovoľ haštagom zobrazovať sa ako populárne, bez predchodzieho posudzovania
-      trends:
-        desc_html: Verejne zobraz už schválené haštagy, ktoré práve trendujú
-        title: Populárne haštagy
     site_uploads:
       delete: Vymaž nahratý súbor
       destroyed_msg: Nahratie bolo zo stránky úspešne vymazané!
     statuses:
       back_to_account: Späť na účet
-      batch:
-        delete: Vymaž
-        nsfw_off: Označ ako nechúlostivé
-        nsfw_on: Označ ako chúlostivé
       deleted: Vymazané
-      failed_to_execute: Nepodarilo sa vykonať
       media:
         title: Médiá
-      no_media: Žiadné médiá
       no_status_selected: Žiadne príspevky neboli zmenené, keďže si žiadne nemal/a zvolené
       title: Príspevky na účte
       with_media: S médiami
@@ -580,21 +484,27 @@ sk:
         action: Spravuj serverové pravidlá
         message_html: Neurčil/a si žiadne serverové pravidlá.
     tags:
-      accounts_today: Jedinečných užívateľov za dnešok
-      accounts_week: Jedinečných užívateľov tento týždeň
-      breakdown: Rozpis dnešného využitia podľa zdroja
-      last_active: Naposledy aktívny
-      most_popular: Najpopulárnejšie
-      most_recent: Najnovšie
-      name: Haštag
       review: Prehodnoť stav
-      reviewed: Zhodnotené
-      title: Haštagy
-      trending_right_now: Práve populárne
-      unique_uses_today: "%{count} dnes prispievajú"
-      unreviewed: Neposúdené
       updated_msg: Nastavenia haštagov boli úspešne aktualizované
     title: Spravovanie
+    trends:
+      allow: Povoľ
+      approved: Povolené
+      disallow: Zakáž
+      links:
+        allow: Povoľ odkaz
+        allow_provider: Povoľ zverejňovateľa
+        disallow: Zakáž odkaz
+        disallow_provider: Zákaž zverejňovateľa
+        title: Populárne odkazy
+      preview_card_providers:
+        title: Zverejňovatelia
+      rejected: Odmietnuté
+      tags:
+        title: Populárne štítky
+        trending_rank: 'Populárne #%{rank}'
+        usable: Môže byť použitý
+      title: Trendy
     warning_presets:
       add_new: Pridaj nové
       delete: Vymaž
@@ -608,8 +518,6 @@ sk:
       body: "%{reporter} nahlásil/a %{target}"
       body_remote: Niekto z %{domain} nahlásil/a %{target}
       subject: Nové hlásenie pre %{instance} (#%{id})
-    new_trending_tag:
-      subject: Nový haštag očakáva preverenie na %{instance} (#%{name})
   aliases:
     add_new: Vytvor alias
     created_msg: Nový alias úspešne vytvorený. Teraz môžeš začať presun zo starého účtu.
@@ -635,16 +543,12 @@ sk:
   applications:
     created: Aplikácia bola vytvorená úspešne
     destroyed: Aplikáciu sa podarilo odstrániť
-    invalid_url: Zadaná URL adresa je nesprávna
     regenerate_token: Znovu vygeneruj prístupový token
     token_regenerated: Prístupový token bol úspešne vygenerovaný znova
     warning: Na tieto údaje dávaj ohromný pozor. Nikdy ich s nikým nezďieľaj!
     your_token: Tvoj prístupový token
   auth:
-    apply_for_account: Vyžiadaj si pozvánku
     change_password: Heslo
-    checkbox_agreement_html: Súhlasím s <a href="%{rules_path}" target="_blank">pravidlami servera</a>, aj s <a href="%{terms_path}" target="_blank">prevoznými podmienkami</a>
-    checkbox_agreement_without_rules_html: Súhlasím s <a href="%{terms_path}" target="_blank">podmienkami užívania</a>
     delete_account: Vymaž účet
     delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak <a href="%{path}">urobiť tu</a>. Budeš požiadaný/á o potvrdenie tohto kroku.
     description:
@@ -654,6 +558,7 @@ sk:
     didnt_get_confirmation: Neobdržal/a si kroky na potvrdenie?
     forgot_password: Zabudnuté heslo?
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
+    log_in_with: Prihlás sa s
     login: Prihlás sa
     logout: Odhlás sa
     migrate_account: Presúvam sa na iný účet
@@ -672,13 +577,11 @@ sk:
     status:
       account_status: Stav účtu
       confirming: Čaká sa na dokončenie potvrdenia emailom.
-      functional: Tvoj účet je plne funkčný.
       pending: Tvoja žiadosť čaká na schvílenie od nášho týmu. Môže to chviľu potrvať. Ak bude tvoja žiadosť schválená, dostaneš o tom email.
       redirecting_to: Tvoj účet je neaktívny, lebo v súčasnosti presmerováva na %{acct}.
-    trouble_logging_in: Problém s prihlásením?
     use_security_key: Použi bezpečnostný kľúč
   authorize_follow:
-    already_following: Tento účet už následuješ
+    already_following: Tento účet už nasleduješ
     error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu
     follow: Nasleduj
     follow_request: 'Poslal/a si žiadosť následovať užívateľa:'
@@ -687,7 +590,7 @@ sk:
       close: Alebo môžeš iba zatvoriť toto okno.
       return: Ukáž užívateľov profil
       web: Prejdi do siete
-    title: Následuj %{acct}
+    title: Nasleduj %{acct}
   challenge:
     confirm: Pokračuj
     hint_html: "<strong>Tip:</strong> Hodinu nebudeme znovu vyžadovať tvoje heslo."
@@ -724,10 +627,6 @@ sk:
       more_details_html: Pre viac podrobností, pozri <a href="%{terms_path}">zásady súkromia</a>.
       username_available: Tvoje užívateľské meno bude znova dostupné
       username_unavailable: Tvoja prezývka ostane neprístupná
-  directories:
-    directory: Katalóg profilov
-    explanation: Pátraj po užívateľoch podľa ich záujmov
-    explore_mastodon: Prebádaj %{title}
   domain_validator:
     invalid_domain: nieje správny tvar domény
   errors:
@@ -777,7 +676,6 @@ sk:
       title: Uprav triedenie
     errors:
       invalid_context: Nebola poskytnutá žiadna, alebo ide o neplatnú súvislosť
-      invalid_irreversible: Nezvratné filtrovanie funguje iba so súvislostiami domovskej osi a oboznámení
     index:
       delete: Vymaž
       empty: Nemáš žiadné filtrovanie.
@@ -785,16 +683,12 @@ sk:
     new:
       title: Pridaj nové triedenie
   footer:
-    developers: Vývojári
-    more: Viac…
-    resources: Podklady
     trending_now: Teraz populárne
   generic:
     all: Všetko
     changes_saved_msg: Zmeny boli úspešne uložené!
     copy: Kopíruj
     delete: Vymaž
-    no_batch_actions_available: Na tejto stránke niesú k dispozícii žiadne hromadné akcie
     order_by: Zoraď podľa
     save_changes: Ulož zmeny
     validation_errors:
@@ -804,28 +698,6 @@ sk:
       other: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chyby uvedené nižšie
   html_validator:
     invalid_markup: 'obsahuje neplatný HTML kód: %{error}'
-  identity_proofs:
-    active: Aktívne
-    authorize: Áno, povoľ
-    authorize_connection_prompt: Povoliť toto kryptografické prepojenie?
-    errors:
-      failed: Kryptografické prepojenie sa nepodarilo. Prosím skús to znova z %{provider}.
-      keybase:
-        invalid_token: Keybase tokeny sú hašovaniami podpisov a musia mať 66 znakov
-        verification_failed: Keybase nerozpoznáva tento token ako podpis od Keybase užívateľa menom %{kb_username}. Prosím skús to znova cez Keybase.
-      wrong_user: Nemožno vytvoriť overenie pre %{proving}, pokiaľ si prihlásený/á ako %{current}. Prihlás sa za %{proving} a skús to znova.
-    explanation_html: |-
-      Tu si môžeš kryptograficky prepojiť svoje iné identity, ako napríklad tvoj profil na Keybase.
-      Umožňuje to ostatním ľudom posielať ti enkryptované správy a veriť obsahu ktorý im pošleš ty.
-    i_am_html: Na %{service} som %{username}.
-    identity: Identita
-    inactive: Neaktívne
-    publicize_checkbox: 'A poslať toto:'
-    publicize_toot: 'Je to dokázané! Na %{service} som %{username}: %{url}'
-    remove: Odstrániť z účtu dôkaz
-    removed: Dôkaz z účtu úspešne odstránený
-    status: Stav overenia
-    view_proof: Ukáž overenie
   imports:
     errors:
       over_rows_processing_limit: obsahuje viac než %{count} riadkov
@@ -843,7 +715,6 @@ sk:
       following: Zoznam sledovaných
       muting: Zoznam ignorovaných
     upload: Nahraj
-  in_memoriam_html: V pamäti.
   invites:
     delete: Deaktivuj
     expired: Neplatné
@@ -918,21 +789,6 @@ sk:
     carry_blocks_over_text: Tento užívateľ sa presunul z účtu %{acct}, ktorý si mal/a zablokovaný.
     carry_mutes_over_text: Tento užívateľ sa presunul z účtu %{acct}, ktorý si mal/a stíšený.
   notification_mailer:
-    digest:
-      action: Zobraziť všetky notifikácie
-      body: Tu nájdete krátky súhrn správ ktoré ste zmeškali od svojej poslednj návštevi od %{since}
-      mention: "%{name} ťa spomenul/a v:"
-      new_followers_summary:
-        few: A ešte, kým si bol/a preč, si získal/a %{count} nových následovateľov! Hurá!
-        many: A ešte, kým si bol/a preč, si získal/a %{count} nových následovateľov! Hurá!
-        one: A ešte, kým si bol/a preč, si získal/a jedného nového následovateľa! Hurá!
-        other: A ešte, kým si bol/a preč, si získal/a %{count} nových následovateľov! Hurá!
-      subject:
-        few: "%{count} nových oboznámení od tvojej poslednej návštevy \U0001F418"
-        many: "%{count} nových oboznámení od tvojej poslednej návštevy \U0001F418"
-        one: "Jedno nové oboznámenie od tvojej poslednej návštevy \U0001F418"
-        other: "%{count} nové oboznámenia od tvojej poslednej návštevy \U0001F418"
-      title: Zatiaľ čo si bol/a preč…
     favourite:
       body: 'Tvoj príspevok bol uložený medzi obľúbené užívateľa %{name}:'
       subject: "%{name} si obľúbil/a tvoj príspevok"
@@ -1005,22 +861,7 @@ sk:
     remove_selected_follows: Prestaň sledovať vybraných užívateľov
     status: Stav účtu
   remote_follow:
-    acct: Napíš svoju prezývku@doménu z ktorej chceš následovať
     missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu
-    no_account_html: Nemáš účet? Môžeš sa <a href='%{sign_up_path}' target='_blank'>zaregistrovať tu</a>
-    proceed: Začni následovať
-    prompt: 'Budeš sledovať:'
-    reason_html: "<strong>Načo je tento krok potrebný?</strong> <code>%{instance}</code> nemusí byť práve tým serverom na ktorom si zaregistrovaný/á, takže je ťa najprv potrebné presmerovať na tvoj domáci server."
-  remote_interaction:
-    favourite:
-      proceed: Pokračuj k obľúbeniu
-      prompt: 'Chceš si obľúbiť tento príspevok:'
-    reblog:
-      proceed: Pokračuj k vyzdvihnutiu
-      prompt: 'Chceš vyzdvihnúť tento príspevok:'
-    reply:
-      proceed: Pokračuj odpovedaním
-      prompt: 'Chceš odpovedať na tento príspevok:'
   scheduled_statuses:
     over_daily_limit: Prekročil/a si denný limit %{limit} predplánovaných príspevkov
     over_total_limit: Prekročil/a si limit %{limit} predplánovaných príspevkov
@@ -1029,7 +870,6 @@ sk:
     activity: Najnovšia aktivita
     browser: Prehliadač
     browsers:
-      blackberry: RIM Blackberry
       chrome: Google Chrome
       firefox: Mozilla Firefox
       generic: Neznámy prehliadač
@@ -1043,7 +883,6 @@ sk:
     explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
     ip: IP adresa
     platforms:
-      chrome_os: Google ChromeOS
       ios: Apple iOS
       linux: GNU/Linux
       mac: MacOSX
@@ -1064,7 +903,6 @@ sk:
     edit_profile: Uprav profil
     export: Exportuj dáta
     featured_tags: Zvýraznené haštagy
-    identity_proofs: Overenia identity
     import: Importuj
     import_and_export: Import a export
     migrate: Presuň účet
@@ -1090,13 +928,11 @@ sk:
       other: 'obsahoval nepovolené haštagy: %{tags}'
     errors:
       in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, už pravdepodobne neexistuje.
-    language_detection: Zisti automaticky
     open_in_web: Otvor v okne na webe
     over_character_limit: limit %{max} znakov bol presiahnutý
     pin_errors:
       limit: Už si si pripol ten najvyšší možný počet hlášok
       ownership: Nieje možné pripnúť hlášku od niekoho iného
-      private: Neverejný príspevok nemôže byť pripnutý
       reblog: Vyzdvihnutie sa nedá pripnúť
     poll:
       total_people:
@@ -1121,40 +957,16 @@ sk:
       public_long: Všetci môžu vidieť
       unlisted: Nezaradené
       unlisted_long: Všetci môžu vidieť, ale nieje zaradené do verejnej osi
+  statuses_cleanup:
+    keep_pinned: Ponechaj pripnuté príspevky
+    keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov
+    keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami
   stream_entries:
     pinned: Pripnutý príspevok
     reblogged: vyzdvihli
     sensitive_content: Senzitívny obsah
   tags:
     does_not_match_previous_name: nezhoduje sa s predošlým názvom
-  terms:
-    body_html: |
-      <h2>Podmienky súkromia</h2>
-
-      <h3 id="collect">Aké informácie sú zbierané?</h3>
-
-      <ul>
-      <li><em>Základné informácie o účte</em>: Ak sa na tomto serveri zaregistruješ, budeš môcť byť požiadaný/á zadať prezývku, emailovú adresu a heslo. Budeš tiež môcť zadať aj ďalšie profilové údaje, ako napríklad meno a životopis, a nahrať profilovú fotku aj obrázok v záhlaví. Tvoja prezývka, meno, životopis, profilová fotka a obrázok v záhlaví sú vždy zobrazené verejne.</li><li><em>Príspevky, sledovania a iné verejné informácie</em>:
-      Zoznam ľudí, ktorých sleduješ je zobrazený verejne, a to isté platí aj pre zoznam tvojích nasledovateľov. Keď pošleš správu, ukladá sa jej dátum a čas, ale aj z akej aplikácie bola poslaná. Správy môžu obsahovať mediálne prílohy, ako obrázky a videá. Verejné, a nezaradené príspevky sú verejne prístupné. Keď si pripneš príspevok na svoj profil, toto je tiež verejne dostupnou informáciou. Tvoje príspevky sú takisto doručené tvojím sledovateľom, a to aj v rámci iných serverov, kde je potom uložená kópia tvojho príspevku. Ak vymažeš príspevok, táto akcia bude takisto doručená tvojím sledovateľom. Vyzdvihnutie, alebo obľúbenie iného príspevku je vždy verejne viditeľné.</li>
-
-      <li><em>Priame príspevky, a príspevky určené iba pre sledovateľov</em>: Všetky príspevky sú uložené a spracované na serveri. Príspevky iba pre sledovateľov sú doručené tvojím sledovateľom a užívateľom ktorí sú v nich spomenutí, pričom priame príspevky sú doručené iba tím užívateľom ktorí sú v nich spomenutí. V niektorých prípadoch to môže znamenať, že tieto príspevkz sú doručené aj v rámci iných serverov, a kópie príspevkov sú na nich uložené.
-      V dobrej viere robíme všetko preto, aby bol prístup k tímto príspevkom vymedzený iba pre oprávnených používateľov, ale môže sa stať, že iné servery v tomto ohľade zlyhajú. Preto je dôležité prezrieť si a zhodnotiť, na aké servery patria tvoji následovatelia. V nastaveniach si môžeš zapnúť voľbu ručne povoľovať a odmietať nových následovateľov.
-      <em>Prosím maj na pamäti, že správcovia tvojho, aj vzdialeného obdŕžiavajúceho servera majú možnosť vidieť dané príspevky a správy, ale aj, že obdŕžitelia týchto správ si ich môzu odfotiť, skopírovať, alebo ich inak zdieľať. <em>Nezdieľaj žiadne nebezpečné, alebo ohrozujúce správy pomocou Mastodonu!</em></li>
-
-      <li><em>IPky a iné metadáta</em>: Keď sa prihlásiš, zaznamenáva sa IP adresa z ktorej si sa prihlásil/a, takisto ako aj názov tvojho prehliadača. Všetky zaznamenané sezóny sú pre teba dostupné na konktolu, alebo na zamietnutie prístupu v nastaveniach. Posledná použitá IP adresa je uložená až po dobu dvanástich mesiacov. Môžeme si tiež ponechať serverové záznamy, ktoré obsahujú IP adresu každej požiadavky na tento server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Načo sú tvoje údaje používané?</h3>
-
-      <p>Hociktorá z informácií, ktoré sú o tebe zozbierané, môže byť použité následujúcimi spôsobmi:</p>
-      <ul>
-      <li>Pre zabezpečenie základného fungovania Mastodonu. Narábať s užívateľským obsahom iných, ako aj prispievať svoj vlastný obsah, možeš len keď si prihlásený/á. Môžeš napríklad nasledovať iných ľudí, aby si potom videl/a ich príspevky v rámci svojej osobne prispôsobenej domácej osi.</li>
-      <li>Pre lepšie moderovanie komunity sa napríklad môže tvoja IP adresa porovnať s ostatnými už známimi adresami, aby bolo možné zistiť, či nedochádza napríklad k obchádzaniu pravidiel vylúčenia, aleb k iným porušeniam zásad.</li>
-      <li>Emailová adresa, ktorú poskytneš, môže byť použitá na zasielanie informácií, oboznámení keď ostatní užívatelia interaktujú s tvojím obsahom, alebo na posielanie správ, odpovedí na otázky a iné požiadavky.</li>
-      </ul>
-    title: Podmienky užívania, a pravidlá súkromia pre %{instance}
   themes:
     contrast: Mastodon (vysoký kontrast)
     default: Mastodon (tmavý)
@@ -1176,17 +988,7 @@ sk:
       explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu. Táto záloha je teraz pripravená na stiahnutie!
       subject: Tvoj archív je pripravený na stiahnutie
       title: Odber archívu
-    sign_in_token:
-      subject: Prosím potvrď pokus o prihlásenie
-      title: Pokus o prihlásenie
     warning:
-      explanation:
-        disable: Pokiaľ je tvoj účet zamrazený, tvoje dáta zostávajú nedoknuté, ale nemôžeš v rámci neho nič robiť, až kým nebude odomknutý.
-        silence: Kým máš účet obmedzený, tvoje príspevky na tomto serveri uvidia iba tí ľudia, ktorí ťa už následujú, a môžeš byť vylúčený/á z rôznych verejných záznamov. Ostatní ťa však stále budú môcť následovať manuálne.
-        suspend: Tvoj účet bol vylúčený, a všetky tvoje príspevky a nahraté médiálné súbory boli nenávratne zmazané z tohto serveru, a zo serverov na ktorých si mal následovateľov.
-      get_in_touch: Môžeš na tento email odpovedať, pre skontaktovanie sa s tímom %{instance}.
-      review_server_policies: Prehodnoť pravidlá servera
-      statuses: 'Konkrétne kvôli:'
       subject:
         disable: Tvoj účet %{acct} bol zamrazený
         none: Varovanie pre %{acct}
@@ -1199,20 +1001,11 @@ sk:
         suspend: Tvoj účet bol vylúčený
     welcome:
       edit_profile_action: Nastav profil
-      edit_profile_step: Profil si môžeš prispôsobiť nahratím portrétu a záhlavia, môžeš upraviť svoje meno a viac. Pokiaľ chceš preverovať nových následovateľov predtým než ťa budú môcť sledovať, môžeš uzamknúť svoj účet.
       explanation: Tu nájdeš nejaké tipy do začiatku
       final_action: Začni prispievať
-      final_step: 'Začni písať! Aj bez následovateľov budú tvoje verejné príspevky videné ostatnými, napríklad na miestnej osi a pod haštagmi. Ak chceš, môžeš sa ostatným predstaviť pod haštagom #introductions.'
       full_handle: Adresa tvojho profilu v celom formáte
       full_handle_hint: Toto je čo musíš dať vedieť svojím priateľom aby ti mohli posielať správy, alebo ťa následovať z iného serveru.
-      review_preferences_action: Zmeniť nastavenia
-      review_preferences_step: Daj si záležať na svojích nastaveniach, napríklad že aké emailové notifikácie chceš dostávať, alebo pod aký level súkromia sa tvoje príspevky majú sami automaticky zaradiť. Pokiaľ nemáš malátnosť z pohybu, môžeš si zvoliť aj automatické spúšťanie GIF animácií.
       subject: Vitaj na Mastodone
-      tip_federated_timeline: Federovaná os zobrazuje sieť Mastodonu až po jej hranice. Ale zahŕňa iba ľúdí ktorých ostatní okolo teba sledujú, takže predsa nieje úplne celistvá.
-      tip_following: Správcu servera následuješ automaticky. Môžeš ale nájsť mnoho iných zaujímavých ľudí ak prezrieš tak lokálnu, ako aj globálne federovanú os.
-      tip_local_timeline: Miestna časová os je celkový pohľad na aktivitu užívateľov %{instance}. Toto sú tvoji najbližší susedia!
-      tip_mobile_webapp: Pokiaľ ti prehliadač ponúkne možnosť pridať Mastodon na tvoju obrazovku, môžeš potom dostávať notifikácie skoro ako z natívnej aplikácie!
-      tips: Tipy
       title: Vitaj na palube, %{name}!
   users:
     follow_limit_reached: Nemôžeš následovať viac ako %{limit} ľudí
@@ -1220,7 +1013,6 @@ sk:
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
     seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
     signed_in_as: 'Prihlásená/ý ako:'
-    suspicious_sign_in_confirmation: Vyzerá to, že si sa predtým z tohto zariadenia ešte neprihlasoval/a, takže ti na tvoju emailovú adresu pošleme bezpečnostný kód, aby sa potvrdilo, že si to ty.
   verification:
     explanation_html: 'Môžeš sa <strong>overiť ako majiteľ odkazov v metadátach tvojho profilu</strong>. Na to ale musí odkazovaná stránka obsahovať odkaz späť na tvoj Mastodon profil. Tento spätný odkaz <strong>musí</strong> mať prívlastok <code>rel="me"</code>. Na texte odkazu nezáleží. Tu je príklad:'
     verification: Overenie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 05420b18c..299f6107b 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1,136 +1,102 @@
 ---
 sl:
   about:
-    about_hashtag_html: To so javni tuti, označeni z <strong>#%{hashtag}</strong>. Z njimi se lahko povežete, če imate račun kjerkoli v fediverse-u.
-    about_mastodon_html: Mastodon je socialno omrežje, ki temelji na odprtih spletnih protokolih in prosti ter odprtokodni programski opremi. Je decentraliziran, kot e-pošta.
-    about_this: O Mastodonu
-    active_count_after: dejaven
-    active_footnote: Aktivni mesečni uporabniki (AMU)
-    administered_by: 'Upravlja:'
-    apps: Mobilne aplikacije
-    apps_platforms: Uporabljajte Mastodon iz iOS, Android ali iz drugih platform
-    browse_directory: Brskajte po imeniku profilov in filtriranje po interesih
-    browse_public_posts: Brskajte javnih objav v živo na Mastodonu
-    contact: Kontakt
+    about_mastodon_html: 'Družbeno omrežje prihodnosti: brez oglasov, brez nadzora korporacij, etično oblikovanje in decentralizacija! Ohranite lastništvo nad svojimi podatki z Mastodonom!'
     contact_missing: Ni nastavljeno
     contact_unavailable: Ni na voljo
-    discover_users: Odkrijte uporabnike
-    documentation: Dokumentacija
-    federation_hint_html: Z računom na %{instance} boste lahko spremljali ljudi na kateremkoli Mastodon strežniku.
-    get_apps: Poskusite mobilno aplikacijo
     hosted_on: Mastodon gostuje na %{domain}
-    instance_actor_flash: |
-      Ta račun je navidezni igralec, ki predstavlja strežnik in ne posameznega uporabnika.
-      Uporablja se za namene federacije in se ne blokira, če ne želite blokirati celotne instance. V tem primeru blokirajte domeno.
-    learn_more: Nauči se več
-    privacy_policy: Pravilnik o zasebnosti
-    see_whats_happening: Poglejte, kaj se dogaja
-    server_stats: 'Statistika strežnika:'
-    source_code: Izvorna koda
-    status_count_after:
-      few: stanja
-      one: stanje
-      other: stanj
-      two: stanja
-    status_count_before: Ki so avtorji
-    tagline: Sledite prijateljem in odkrijte nove
-    terms: Pogoji storitve
-    user_count_after:
-      few: uporabniki
-      one: uporabnik
-      other: uporabnikov
-      two: uporabnika
-    user_count_before: Dom za
-    what_is_mastodon: Kaj je Mastodon?
+    title: O programu
   accounts:
-    choices_html: "%{name} izbire:"
     follow: Sledi
     followers:
       few: Sledilci
       one: Sledilec
       other: Sledilcev
       two: Sledilca
-    following: Sledim
-    joined: Se je pridružil na %{date}
+    following: Sledi
+    instance_actor_flash: Ta račun je navidezni akter, ki se uporablja za predstavljanje strežnika samega in ne posameznega uporabnika. Uporablja se za namene federacije in se ne sme začasno ustaviti.
     last_active: zadnja dejavnost
-    link_verified_on: Lastništvo te povezave je bilo preverjeno na %{date}
-    media: Mediji
-    moved_html: "%{name} se je prestavil na %{new_profile_link}:"
-    network_hidden: Ta informacija ni na voljo
-    never_active: Nikoli
+    link_verified_on: Lastništvo te povezave je bilo preverjeno %{date}
     nothing_here: Tukaj ni ničesar!
-    people_followed_by: Ljudje, ki jim sledi %{name}
-    people_who_follow: Ljudje, ki sledijo %{name}
     pin_errors:
       following: Verjetno že sledite osebi, ki jo želite potrditi
     posts:
-      few: Tuti
-      one: Tut
-      other: Tutov
-      two: Tuta
-    posts_tab_heading: Tuti
-    posts_with_replies: Tuti in odgovori
-    roles:
-      admin: Skrbnik
-      bot: Robot
-    unavailable: Profil ni na voljo
-    unfollow: Prenehaj slediti
+      few: Objave
+      one: Objava
+      other: Objav
+      two: Objavi
+    posts_tab_heading: Objave
   admin:
     account_actions:
       action: Izvedi dejanje
       title: Izvedi moderirano dejanje za %{acct}
     account_moderation_notes:
       create: Pusti opombo
-      created_msg: Moderirana opomba je uspešno ustvarjena!
-      delete: Izbriši
-      destroyed_msg: Moderirana opomba je uspešno uničena!
+      created_msg: Opomba moderiranja je uspešno ustvarjena!
+      destroyed_msg: Opomba moderiranja je uspešno uničena!
     accounts:
+      add_email_domain_block: Blokiraj domeno e-pošte
       approve: Odobri
-      approve_all: Odobri vse
+      approved_msg: Uspešno odobrena vloga prijave uporabnika %{username}
       are_you_sure: Ali ste prepričani?
       avatar: Podoba
       by_domain: Domena
       change_email:
-        changed_msg: E-pošta računa je uspešno spremenjena!
-        current_email: Trenutna e-pošta
-        label: Spremeni e-pošto
-        new_email: Nova e-pošta
-        submit: Spremeni e-pošto
-        title: Spremeni e-pošto za %{username}
+        changed_msg: E-pošni naslov uspešno spremenjen!
+        current_email: Trenutni e-naslov
+        label: Spremeni e-naslov
+        new_email: Nov e-naslov
+        submit: Spremeni e-naslov
+        title: Spremeni e-naslov za %{username}
+      change_role:
+        changed_msg: Vloga uspešno spremenjena!
+        label: Spremeni vlogo
+        no_role: Brez vloge
+        title: Spremeni vlogo za %{username}
       confirm: Potrdi
       confirmed: Potrjeno
-      confirming: Potrjujem
+      confirming: V potrjevanju
+      custom: Po meri
+      delete: Izbriši podatke
       deleted: Izbrisano
-      demote: Degradiraj
-      disable: Onemogoči
+      demote: Ponižaj
+      destroyed_msg: Podatki uporabnika %{username} so zdaj v vrsti za trajen izbris
+      disable: Zamrzni
+      disable_sign_in_token_auth: Onemogoči overjanje z žetonom po e-pošti
       disable_two_factor_authentication: Onemogoči 2FA
-      disabled: Onemogočeno
-      display_name: Prikazno ime
+      disabled: Zamrznjeno
+      display_name: Pojavno ime
       domain: Domena
       edit: Uredi
-      email: E-pošta
-      email_status: Stanje e-pošte
-      enable: Omogoči
+      email: E-naslov
+      email_status: Stanje e-naslova
+      enable: Odmrzni
+      enable_sign_in_token_auth: Omogoči overjanje z žetonom po e-pošti
       enabled: Omogočeno
+      enabled_msg: Uspešno odmrznjen račun uporabnika %{username}
       followers: Sledilci
       follows: Sledi
       header: Glava
       inbox_url: URL mape "Prejeto"
-      invited_by: Povabljen od
-      joined: Pridružil
+      invite_request_text: Razlogi za pridružitev
+      invited_by: Na povabilo
+      ip: IP
+      joined: Pridružen_a
       location:
         all: Vse
-        local: Lokalni
+        local: Krajevni
         remote: Oddaljeni
         title: Lokacija
       login_status: Stanje prijave
       media_attachments: Predstavnostne priloge
-      memorialize: Spremenite v spomin
+      memorialize: Spremenite v pomnik
+      memorialized: Spominificirano
+      memorialized_msg: Uspešno preoblikovan %{username} v spominski račun
       moderation:
         active: Dejaven
         all: Vse
         pending: Na čakanju
-        silenced: Utišan
+        silenced: Omejeno
         suspended: Suspendiran
         title: Moderiranje
       moderation_notes: Opombe moderiranja
@@ -138,297 +104,824 @@ sl:
       most_recent_ip: Zadnji IP
       no_account_selected: Noben račun ni bil spremenjen, ker ni bil izbran noben
       no_limits_imposed: Brez omejitev
-      not_subscribed: Ni naročen
+      no_role_assigned: Dodeljena ni nobena vloga
+      not_subscribed: Ni naročnin
       pending: Čakanje na pregled
       perform_full_suspension: Suspendiraj
+      previous_strikes: Predhodni ukrepi
+      previous_strikes_description_html:
+        few: Ta račun ima <strong>%{count}</strong> ukrepe.
+        one: Ta račun ima <strong>%{count}</strong> ukrep.
+        other: Ta račun ima <strong>%{count}</strong> ukrepov.
+        two: Ta račun ima <strong>%{count}</strong> ukrepa.
       promote: Promoviraj
       protocol: Protokol
       public: Javen
       push_subscription_expires: Naročnina PuSH preteče
       redownload: Osveži profil
+      redownloaded_msg: Uspešno osvežen profil %{username} iz izvirnika
       reject: Zavrni
-      reject_all: Zavrni vse
+      rejected_msg: Uspešno zavrnjena vloga prijave uporabnika %{username}
+      remote_suspension_irreversible: Podatki tega računa so bili nepovratno izbrisani.
+      remote_suspension_reversible_hint_html: Račun je bil suspendiran na njihovem strežniku, podatki pa bodo v celoti odstranjeni %{date}. Do takrat lahko oddaljeni strežnik obnovi ta račun obnoviti brez negativnih posledic. Če želite takoj odstraniti vse podatke računa, lahko to storite spodaj.
       remove_avatar: Odstrani podobo
       remove_header: Odstrani glavo
+      removed_avatar_msg: Uspešno odstranjena slika avatarja uporabnika %{username}
+      removed_header_msg: Uspešno odstranjena naslovna slika uporabnika %{username}
       resend_confirmation:
         already_confirmed: Ta uporabnik je že potrjen
-        send: Ponovno pošlji potrditveno e-pošto
-        success: Potrditvena e-pošta je uspešno poslana!
+        send: Ponovno pošlji potrditveno e-sporočilo
+        success: Potrditveno e-sporočilo je uspešno poslano!
       reset: Ponastavi
       reset_password: Ponastavi geslo
       resubscribe: Ponovno se naroči
-      role: Dovoljenja
-      roles:
-        admin: Skrbnik
-        staff: Osebje
-        user: Uporabnik
+      role: Vloga
       search: Iskanje
+      search_same_email_domain: Drugi uporabniki z isto e-poštno domeno
+      search_same_ip: Drugi uporabniki z istim IP
+      security_measures:
+        only_password: Samo geslo
+        password_and_2fa: Geslo in 2FA
+      sensitive: Občutljivo
+      sensitized: Označeno kot občutljivo
       shared_inbox_url: URL mape "Prejeto v skupni rabi"
       show:
-        created_reports: Narejene prijave
+        created_reports: Opravljene prijave
         targeted_reports: Prijavili drugi
-      silence: Utišaj
-      silenced: Utišan
-      statuses: Stanja
+      silence: Omeji
+      silenced: Omejen
+      statuses: Objave
+      strikes: Predhodni ukrepi
       subscribe: Naroči
+      suspend: Suspendiraj
       suspended: Suspendiran
-      time_in_queue: Čakanje v vrsti %{time}
+      suspension_irreversible: Podatki tega računa so bili nepovratno izbrisani. Račun lahko vrnete iz suspenza, da bo ponovno uporaben, vendar preteklih podatkov ne boste mogli obnoviti.
+      suspension_reversible_hint_html: Račun je bil suspendiran, podatki pa bodo v celoti odstranjeni %{date}. Do takrat je mogoče račun obnoviti brez negativnih posledic. Če želite takoj odstraniti vse podatke računa, lahko to storite spodaj.
       title: Računi
-      unconfirmed_email: Nepotrjena e-pošta
-      undo_silenced: Razveljavi utišanje
-      undo_suspension: Razveljavi suspendiranje
-      unsubscribe: Odjavi se od naročnine
+      unblock_email: Odblokiraj e-poštni naslov
+      unblocked_email_msg: E-poštni naslov uporabnika %{username} uspešno odblokiran
+      unconfirmed_email: Nepotrjen e-naslov
+      undo_sensitized: Ni občutljivo
+      undo_silenced: Razveljavi omejitve
+      undo_suspension: Razveljavi suspenz
+      unsilenced_msg: Uspešno razveljavljena omejitev računa uporabnika %{username}
+      unsubscribe: Odjavi od naročnine
+      unsuspended_msg: Uspešno preklican suspenz računa uporabnika %{username}
       username: Uporabniško ime
+      view_domain: Pokaži povzetek za domeno
       warn: Opozori
       web: Splet
       whitelisted: Na belem seznamu
     action_logs:
-      deleted_status: "(izbrisano stanje)"
+      action_types:
+        approve_appeal: Odobri pritožbo
+        approve_user: Odobri uporabnika
+        assigned_to_self_report: Dodeli prijavo
+        change_email_user: Spremeni e-naslov uporabnika
+        change_role_user: Spremeni vlogo uporabnika
+        confirm_user: Potrdi uporabnika
+        create_account_warning: Ustvari opozorilo
+        create_announcement: Ustvari obvestilo
+        create_canonical_email_block: Ustvari blokado e-naslova
+        create_custom_emoji: Ustvari emotikon po meri
+        create_domain_allow: Ustvari odobritev domene
+        create_domain_block: Ustvari blokado domene
+        create_email_domain_block: Ustvari blokado domene e-pošte
+        create_ip_block: Ustvari pravilo IP
+        create_unavailable_domain: Ustvari domeno, ki ni na voljo
+        create_user_role: Ustvari vlogo
+        demote_user: Ponižaj uporabnika
+        destroy_announcement: Izbriši obvestilo
+        destroy_canonical_email_block: Izbriši blokado e-naslova
+        destroy_custom_emoji: Izbriši emotikon po meri
+        destroy_domain_allow: Izbriši odobritev domene
+        destroy_domain_block: Izbriši blokado domene
+        destroy_email_domain_block: Izbriši blokado domene e-pošte
+        destroy_instance: Očisti domeno
+        destroy_ip_block: Izbriši pravilo IP
+        destroy_status: Izbriši objavo
+        destroy_unavailable_domain: Izbriši nedosegljivo domeno
+        destroy_user_role: Uniči vlogo
+        disable_2fa_user: Onemogoči
+        disable_custom_emoji: Onemogoči emotikon po meri
+        disable_sign_in_token_auth_user: Onemogoči overjanje z žetonom po e-pošti za uporabnika
+        disable_user: Onemogoči uporabnika
+        enable_custom_emoji: Omogoči emotikon po meri
+        enable_sign_in_token_auth_user: Omogoči overjanje z žetonom po e-pošti za uporabnika
+        enable_user: Omogoči uporabnika
+        memorialize_account: Spomenificiraj račun
+        promote_user: Povišaj uporabnika
+        reject_appeal: Zavrni pritožbo
+        reject_user: Zavrni uporabnika
+        remove_avatar_user: Odstrani avatar
+        reopen_report: Ponovno odpri prijavo
+        resend_user: Ponovno pošlji potrditveno e-sporočilo
+        reset_password_user: Ponastavi geslo
+        resolve_report: Razreši prijavo
+        sensitive_account: Občutljivi račun
+        silence_account: Omeji račun
+        suspend_account: Začasno prekini račun
+        unassigned_report: Prekliči dodelitev prijave
+        unblock_email_account: Odblokiraj e-poštni naslov
+        unsensitive_account: Ni občutljiv račun
+        unsilence_account: Razveljavi omejitev računa
+        unsuspend_account: Prekliči začasno prekinitev računa
+        update_announcement: Posodobi objavo
+        update_custom_emoji: Posodobi emotikon po meri
+        update_domain_block: Posodobi blokado domene
+        update_ip_block: Posodobi pravilo IP
+        update_status: Posodobi objavo
+        update_user_role: Posodobi vlogo
+      actions:
+        approve_appeal_html: "%{name} je ugodil pritožbi uporabnika %{target} na moderatorsko odločitev"
+        approve_user_html: "%{name} je odobril/a registracijo iz %{target}"
+        assigned_to_self_report_html: "%{name} je dodelil/a prijavo %{target} sebi"
+        change_email_user_html: "%{name} je spremenil/a naslov e-pošte uporabnika %{target}"
+        change_role_user_html: "%{name} je spremenil/a vlogo %{target}"
+        confirm_user_html: "%{name} je potrdil/a naslov e-pošte uporabnika %{target}"
+        create_account_warning_html: "%{name} je poslal/a opozorilo %{target}"
+        create_announcement_html: "%{name} je ustvarila/a novo obvestilo %{target}"
+        create_canonical_email_block_html: "%{name} je dal/a na črni seznam e-pošto s ključnikom %{target}"
+        create_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
+        create_domain_allow_html: "%{name} je dovolil/a federacijo z domeno %{target}"
+        create_domain_block_html: "%{name} je blokiral/a domeno %{target}"
+        create_email_domain_block_html: "%{name} je dal/a na črni seznam e-pošto domene %{target}"
+        create_ip_block_html: "%{name} je ustvaril/a pravilo za IP %{target}"
+        create_unavailable_domain_html: "%{name} je prekinil/a dostavo v domeno %{target}"
+        create_user_role_html: "%{name} je ustvaril/a vlogo %{target}"
+        demote_user_html: "%{name} je ponižal/a uporabnika %{target}"
+        destroy_announcement_html: "%{name} je izbrisal/a obvestilo %{target}"
+        destroy_canonical_email_block_html: "%{name} je odstranil/a s črnega seznama e-pošto s ključnikom %{target}"
+        destroy_custom_emoji_html: "%{name} je izbrisal/a emotikon %{target}"
+        destroy_domain_allow_html: "%{name} ni dovolil/a federacije z domeno %{target}"
+        destroy_domain_block_html: "%{name} je odblokiral/a domeno %{target}"
+        destroy_email_domain_block_html: "%{name} je odblokiral/a e-pošto domene %{target}"
+        destroy_instance_html: "%{name} je očistil/a domeno %{target}"
+        destroy_ip_block_html: "%{name} je izbrisal/a pravilo za IP %{target}"
+        destroy_status_html: "%{name} je odstranil/a objavo uporabnika %{target}"
+        destroy_unavailable_domain_html: "%{name} je nadaljeval/a dostav v domeno %{target}"
+        destroy_user_role_html: "%{name} je izbrisal/a vlogo %{target}"
+        disable_2fa_user_html: "%{name} je onemogočil/a dvofaktorsko zahtevo za uporabnika %{target}"
+        disable_custom_emoji_html: "%{name} je onemogočil/a emotikone %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} je onemogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
+        disable_user_html: "%{name} je onemogočil/a prijavo za uporabnika %{target}"
+        enable_custom_emoji_html: "%{name} je omogočil/a emotikone %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} je omogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
+        enable_user_html: "%{name} je omogočil/a prijavo za uporabnika %{target}"
+        memorialize_account_html: "%{name} je spremenil/a račun uporabnika %{target} v spominsko stran"
+        promote_user_html: "%{name} je povišal/a uporabnika %{target}"
+        reject_appeal_html: "%{name} je zavrnil/a pritožbo uporabnika %{target} na moderatorsko odločitev"
+        reject_user_html: "%{name} je zavrnil/a registracijo iz %{target}"
+        remove_avatar_user_html: "%{name} je odstranil podobo (avatar) uporabnika %{target}"
+        reopen_report_html: "%{name} je ponovno odprl/a prijavo %{target}"
+        resend_user_html: "%{name} je ponovno poslal_a potrditveno e-sporočilo za %{target}"
+        reset_password_user_html: "%{name} je ponastavil/a geslo uporabnika %{target}"
+        resolve_report_html: "%{name} je razrešil/a prijavo %{target}"
+        sensitive_account_html: "%{name} je označil/a medije računa %{target}'s kot občutljive"
+        silence_account_html: "%{name} je omejil/a račun uporabnika %{target}"
+        suspend_account_html: "%{name} je suspendiral/a račun uporabnika %{target}"
+        unassigned_report_html: "%{name} je preklical dodelitev prijave uporabnika %{target}"
+        unblock_email_account_html: "%{name} je odblokiral/a e-poštni naslov uporabnika %{target}"
+        unsensitive_account_html: "%{name} je odznačil/a medije računa %{target}'s kot občutljive"
+        unsilence_account_html: "%{name} je preklical omejitev računa %{target}"
+        unsuspend_account_html: "%{name} je preklical suspenz računa %{target}"
+        update_announcement_html: "%{name} je posodobil/a objavo %{target}"
+        update_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
+        update_domain_block_html: "%{name} je posodobil/a domenski blok za %{target}"
+        update_ip_block_html: "%{name} je spremenil/a pravilo za IP %{target}"
+        update_status_html: "%{name} je posodobil/a objavo uporabnika %{target}"
+        update_user_role_html: "%{name} je spremenil/a vlogo %{target}"
+      deleted_account: izbrisan račun
+      empty: Ni najdenih zapisnikov.
+      filter_by_action: Filtriraj po dejanjih
+      filter_by_user: Filtriraj po uporabnikih
       title: Dnevnik revizije
+    announcements:
+      destroyed_msg: Obvestilo je bilo uspešno izbrisano!
+      edit:
+        title: Uredi obvestilo
+      empty: Obvestil ni mogoče najti.
+      live: V živo
+      new:
+        create: Ustvari obvestilo
+        title: Novo obvestilo
+      publish: Objavi
+      published_msg: Obvestilo je bilo uspešno objavljeno!
+      scheduled_for: Načrtovano ob %{time}
+      scheduled_msg: Obvestilo ima načrtovano objavo!
+      title: Obvestila
+      unpublish: Umakni iz objave
+      unpublished_msg: Obvestilo je bilo uspešno umaknjeno!
+      updated_msg: Obvestilo je bilo uspešno posodobljeno!
     custom_emojis:
+      assign_category: Dodeli kategorijo
       by_domain: Domena
       copied_msg: Lokalna kopija emotikonov je bila uspešno ustvarjena
       copy: Kopiraj
       copy_failed_msg: Lokalne kopije emotikonov ni bilo mogoče ustvariti
+      create_new_category: Ustvari novo kategorijo
       created_msg: Emotikon je uspešno ustvarjen!
       delete: Izbriši
       destroyed_msg: Emotikon je uspešno uničen!
       disable: Onemogoči
+      disabled: Onemogočeno
       disabled_msg: Ta emotikon je uspešno onemogočen
       emoji: Emotikon
       enable: Omogoči
+      enabled: Omogočeno
       enabled_msg: Ta emotikon je uspešno omogočen
-      image_hint: PNG do 50KB
+      image_hint: PNG ali GIF do %{size}
+      list: Seznam
       listed: Navedeno
       new:
         title: Dodaj nove emotikone
+      no_emoji_selected: Noben emotikon ni bil spremenjen, ker noben ni bil izbran
+      not_permitted: Nimate pravic za izvedbo tega dejanja.
       overwrite: Prepiši
       shortcode: Kratka koda
       shortcode_hint: Najmanj 2 znaka, samo alfanumerični znaki in podčrtaji
       title: Emotikoni po meri
+      uncategorized: Brez kategorije
+      unlist: Ne prikaži na seznamu
       unlisted: Neuvrščeni
       update_failed_msg: Tega emotikona ni bilo mogoče posodobiti
       updated_msg: Emotikon je uspešno posodobljen!
       upload: Pošlji
     dashboard:
+      active_users: dejavnih uporabnikov
+      interactions: interakcij
+      media_storage: Shramba za medije
+      new_users: novih uporabnikov
+      opened_reports: odprtih prijav
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> čakajoče pritožbe"
+        one: "<strong>%{count}</strong> čakajoča pritožba"
+        other: "<strong>%{count}</strong> čakajočih pritožb"
+        two: "<strong>%{count}</strong> čakajoči pritožbi"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> čakajoče prijave"
+        one: "<strong>%{count}</strong> čakajoča prijava"
+        other: "<strong>%{count}</strong> čakajočih prijav"
+        two: "<strong>%{count}</strong> čakajoči prijavi"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> čakajoči ključniki"
+        one: "<strong>%{count}</strong> čakajoči ključnik"
+        other: "<strong>%{count}</strong> čakajočih ključnikov"
+        two: "<strong>%{count}</strong> čakajoča ključnika"
+      pending_users_html:
+        few: "<strong>%{count}</strong> čakajoči uporabniki"
+        one: "<strong>%{count}</strong> čakajoči uporabnik"
+        other: "<strong>%{count}</strong> čakajočih uporabnikov"
+        two: "<strong>%{count}</strong> čakajoča uporabnika"
+      resolved_reports: razrešenih prijav
       software: Programska oprema
+      sources: Viri registracij
       space: Uporaba prostora
       title: Nadzorna plošča
+      top_languages: Najbolj dejavni jeziki
+      top_servers: Najbolj dejavni strežniki
+      website: Spletišče
+    disputes:
+      appeals:
+        empty: Ni najdenih pritožb.
+        title: Pritožbe
     domain_allows:
       add_new: Dodaj domeno na beli seznam
       created_msg: Domena je bila uspešno dodana na beli seznam
       destroyed_msg: Domena je bila odstranjena iz belega seznama
+      export: Izvozi
+      import: Uvozi
       undo: Odstrani iz belega seznama
     domain_blocks:
       add_new: Dodaj nov domenski blok
       created_msg: Domenski blok se sedaj obdeluje
       destroyed_msg: Domenski blok je bil razveljavljen
       domain: Domena
+      edit: Uredi domenski blok
+      existing_domain_block: Ste že uveljavili strožje omejitve na %{name}.
       existing_domain_block_html: Uvedli ste strožje omejitve za %{name}, sedaj ga morate najprej <a href="%{unblock_url}">odblokirati</a>.
+      export: Izvozi
+      import: Uvozi
       new:
         create: Ustvari blok
         hint: Domenski blok ne bo preprečil ustvarjanja vnosov računov v zbirko podatkov, ampak bo retroaktivno in samodejno uporabil posebne metode moderiranja na teh računih.
         severity:
-          desc_html: "<strong>Utišaj</strong> bo vse objave računa naredil nevidne vsem, ki jih ne sledijo. <strong>Suspendiraj</strong> bo odstranil vso vsebino, medije in podatke profila računa. Uporabi <strong>nič</strong>, če želite le zavrniti predstavnostne datoteke."
+          desc_html: "<strong>Omeji</strong> bo vse objave računa naredil nevidne vsem, ki jih ne sledijo. <strong>Suspendiraj</strong> bo odstranil vso vsebino, medije in podatke profila računov te domene na vašem strežniku. Uporabite <strong>Brez</strong>, če želite le zavrniti predstavnostne datoteke."
           noop: Brez
-          silence: Utišaj
+          silence: Omeji
           suspend: Suspendiraj
         title: Nov domenski blok
+      no_domain_block_selected: Nobena blokada domene ni bila spremenjena, saj nobena ni bila izbrana
+      not_permitted: Nimate pravic za izvedbo tega dejanja
+      obfuscate: Zakrij ime domene
+      obfuscate_hint: Delno zakrij ime domene na seznamu, če je omogočeno oglaševanje omejitev seznama domen
+      private_comment: Zasebni komentar
+      private_comment_hint: Komentar o tej omejitvi domene za interno uporabo moderatorjev.
+      public_comment: Javni komentar
+      public_comment_hint: Komentar o tej omejitvi domene za širšo javnost, če je omogočeno oglaševanje seznama omejitev domene.
       reject_media: Zavrni predstavnostne datoteke
       reject_media_hint: Odstrani lokalno shranjene predstavnostne datoteke in zavrača prenašanje le-teh v prihodnosti. Za suspenzije ni pomembno
       reject_reports: Zavrnjene prijave
       reject_reports_hint: Prezri vse prijave, ki pridejo iz te domene. Za suspenzije ni pomembno
-      rejecting_media: zavrnitev predstavnostnih datotek
-      rejecting_reports: zavrnitev prijav
-      severity:
-        silence: utišani
-        suspend: suspendirani
-      show:
-        affected_accounts:
-          few: "%{count} računi v bazi podatkov so prizadeti"
-          one: En račun v bazi podatkov je prizadet
-          other: "%{count} računov v bazi podatkov je prizadetih"
-          two: "%{count} računa v bazi podatkov so prizadeta"
-        retroactive:
-          silence: Prekliči utišanje za vse obstoječe račune iz te domene
-          suspend: Aktiviraj vse obstoječe račune iz te domene
-        title: Razveljavi domenski blok za %{domain}
-        undo: Razveljavi
       undo: Razveljavi domenski blok
+      view: Pokaži domenski blok
     email_domain_blocks:
       add_new: Dodaj novo
+      attempts_over_week:
+        few: "%{count} poskusi prijave zadnji teden"
+        one: "%{count} poskus prijave zadnji teden"
+        other: "%{count} poskusov prijave zadnji teden"
+        two: "%{count} poskusa prijave zadnji teden"
       created_msg: Domena e-pošte je bila uspešno dodana na črni seznam
       delete: Izbriši
-      destroyed_msg: Domena e-pošte je bila uspešno izbrisana iz črnega seznama
+      dns:
+        types:
+          mx: Zapis MX
       domain: Domena
       new:
         create: Dodaj domeno
+        resolve: Razreši domeno
         title: Nov vnos e-pošte na črni seznam
+      no_email_domain_block_selected: Nobena domena e-računa ni bila spremenjena, ker nobena ni bila izbrana
+      resolved_dns_records_hint_html: Ime domene se razreši na naslednje domene MX, ki so končno odgovorne za sprejemanje e-pošte. Blokiranje domene MX bo blokiralo prijave s poljubnega e-poštnega naslova, ki uporablja isto domeno MX, tudi če je vidno ime domene drugačno. <strong>Pazite, da ne blokirate večjih ponudnikov e-pošte.</strong>
+      resolved_through_html: Razrešeno prek %{domain}
       title: Črni seznam e-pošt
+    export_domain_allows:
+      new:
+        title: Uvozi prepustnice domen
+      no_file: Nobena datoteka ni izbrana
+    export_domain_blocks:
+      import:
+        description_html: Uvozili boste seznam blokad domen. Pozorno preglejte ta seznam, še posebej, če ga niste sami pripravili.
+        existing_relationships_warning: Obstoječi odnosi sledenja
+        private_comment_description_html: 'Kot pomoč pri sledenju izvora uvoženih blokad bodo le-te ustvarjene z naslednjim zasebnim komentarjem: <q>%{comment}</q>'
+        private_comment_template: Uvoženo iz %{source} %{date}
+        title: Uvozi blokade domen
+      new:
+        title: Uvozi blokade domen
+      no_file: Nobena datoteka ni izbrana
+    follow_recommendations:
+      description_html: "<strong>Sledi priporočilom pomaga novim uporabnikom, da hitro najdejo zanimivo vsebino</strong>. Če uporabnik ni dovolj komuniciral z drugimi, da bi oblikoval prilagojena priporočila za sledenje, se namesto tega priporočajo ti računi. Dnevno se ponovno izračunajo iz kombinacije računov z najvišjimi nedavnimi angažiranostmi in najvišjim številom krajevnih sledilcev za določen jezik."
+      language: Za jezik
+      status: Stanje
+      suppress: Zatri sledenje priporočilom
+      suppressed: Zatrto
+      title: Sledi priporočilom
+      unsuppress: Obnovi sledenje priporočilom
     instances:
+      availability:
+        description_html:
+          few: Če dostava v domeno spodleti <strong>%{count} različne dni</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          one: Če dostava v domeno spodleti <strong>%{count} dan</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          other: Če dostava v domeno spodleti <strong>%{count} različne dni</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          two: Če dostava v domeno spodleti <strong>%{count} različna dneva</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+        failure_threshold_reached: Prag neuspelih poskusov dosežen %{date}.
+        failures_recorded:
+          few: Neuspeli poskusi %{count} različnih dni.
+          one: Neuspel poskus %{count} različen dan.
+          other: Neuspeli poskusi %{count} različnih dni.
+          two: Neuspeli poskusi %{count} različnih dni.
+        no_failures_recorded: Ni zabeleženih neuspelih poskusov.
+        title: Razpoložljivost
+        warning: Zadnji poskus povezave na ta strežnik je spodletel
+      back_to_all: Vse
+      back_to_limited: Omejeno
+      back_to_warning: Opozorilo
       by_domain: Domena
+      confirm_purge: Ali ste prepričani, da želite trajno izbrisati podatke s te domene?
+      content_policies:
+        comment: Interna opomba
+        description_html: Določite lahko pravila (t.i. politike), ki bodo veljale za vse račune te domene ter vseh njenih poddomen.
+        policies:
+          reject_media: Zavrni večpredstavnost
+          reject_reports: Zavrni prijave
+          silence: Omeji
+          suspend: Suspendiraj
+        policy: Pravila
+        reason: Javni razlog
+        title: Pravila glede vsebine
+      dashboard:
+        instance_accounts_dimension: Najpogosteje sledeni računi
+        instance_accounts_measure: shranjenih računov
+        instance_followers_measure: naših sledilcev tukaj
+        instance_follows_measure: njihovih sledilcev tukaj
+        instance_languages_dimension: Naj jeziki
+        instance_media_attachments_measure: shranjenih predstavnostnih priponk
+        instance_reports_measure: prijav o njih
+        instance_statuses_measure: shanjenih objav
+      delivery:
+        all: Vse
+        clear: Počisti napake dostave
+        failing: Spodletuje
+        restart: Ponovno zaženi dostavo
+        stop: Ustavi dostavo
+        unavailable: Ni na voljo
       delivery_available: Na voljo je dostava
+      delivery_error_days: Dnevi napak pri dostavi
+      delivery_error_hint: Če dostava ni možna %{count} dni, bo samodejno označeno kot nedostavljivo.
+      destroyed_msg: Podatki iz %{domain} so zdaj v vrsti za takojšnje brisanje.
+      empty: Ni zadetkov med domenami.
       known_accounts:
         few: "%{count} znani računi"
         one: "%{count} znan račun"
-        other: "%{count} znanih računov"
+        other: "%{count} znani računi"
         two: "%{count} znana računa"
       moderation:
         all: Vse
         limited: Omejeno
         title: Moderiranje
+      private_comment: Zasebni komentar
+      public_comment: Javni komentar
+      purge: Očisti
+      purge_description_html: Če menite, da je ta domena trajno nedosegljiva, lahko v svoji shrambi izbrišete vse zapise računov in povezane podatke iz te domene. To lahko vzame nekaj časa.
       title: Federacija
       total_blocked_by_us: Blokirano iz naše strani
       total_followed_by_them: Oni ti sledijo
       total_followed_by_us: Mi ti sledimo
-      total_reported: Poročila o njih
+      total_reported: Prijave o njih
       total_storage: Predstavnostne priloge
+      totals_time_period_hint_html: Spodaj prikazani seštevki vključujejo podatke za celotno obdobje.
     invites:
       deactivate_all: Onemogoči vse
       filter:
         all: Vse
         available: Razpoložljivo
         expired: Potekel
+        title: Filter
       title: Povabila
-    pending_accounts:
-      title: "(%{count}) računov na čakanju"
+    ip_blocks:
+      add_new: Ustvari pravilo
+      created_msg: Uspešno dodano novo pravilo IP
+      delete: Izbriši
+      expires_in:
+        '1209600': 2 tedna
+        '15778476': 6 mesecev
+        '2629746': 1 mesec
+        '31556952': 1 leto
+        '86400': 1 dan
+        '94670856': 3 leta
+      new:
+        title: Ustvari novo pravilo IP
+      no_ip_block_selected: Nobeno pravilo IP ni bilo spremenjeno, ker nobeno ni bilo izbrano
+      title: IP-pravila
+    relationships:
+      title: Odnosi računa %{acct}
     relays:
       add_new: Dodaj nov rele
       delete: Izbriši
-      description_html: "<strong>Rele federacije</strong> je posredniški strežnik, ki si izmenjuje velike količine javnih tutov med strežniki, ki so se naročili in objavili na njem. <strong>Majhnim in srednjim strežnikom lahko pomaga pri odkrivanju vsebine iz sistema fediverse</strong>, kar bi sicer zahtevalo, da lokalni uporabniki ročno sledijo druge osebe na oddaljenih strežnikih."
+      description_html: "<strong>Rele federacije</strong> je posredniški strežnik, ki si izmenjuje velike količine javnih objav med strežniki, ki so se naročili in objavili na njem. <strong>Majhnim in srednjim strežnikom lahko pomaga pri odkrivanju vsebine iz sistema fediverse</strong>, kar bi sicer zahtevalo, da lokalni uporabniki ročno sledijo druge osebe na oddaljenih strežnikih."
       disable: Onemogoči
       disabled: Onemogočeno
       enable: Omogoči
-      enable_hint: Ko je omogočen, se bo vaš strežnik naročil na vse javne tute iz tega releja in začel pošiljati javne tute tega strežnika.
+      enable_hint: Ko je omogočen, se bo vaš strežnik naročil na vse javne objave iz tega releja in začel pošiljati javne objave tega strežnika.
       enabled: Omogočeno
       inbox_url: URL releja
       pending: Čakanje na odobritev releja
       save_and_enable: Shrani in omogoči
       setup: Nastavi povezavo releja
+      signatures_not_enabled: Posredovanja ne bodo delovala pravilno, ko je omogočen varni način ali omejen način federacije
       status: Stanje
       title: Releji
     report_notes:
       created_msg: Opomba o prijavi je uspešno ustvarjena!
       destroyed_msg: Opomba o prijavi je uspešno izbrisana!
     reports:
+      account:
+        notes:
+          few: "%{count} opombe"
+          one: "%{count} opomba"
+          other: "%{count} opomb"
+          two: "%{count} opombi"
+      action_log: Revizijski zapisnik
       action_taken_by: Dejanje, ki ga je sprejel
+      actions:
+        delete_description_html: Prijavljene objave bodo izbrisane in ukrep bo zabeležen, da vam pomaga stopnjevati ukrepe ob naslednjih kršitvah z istega računa.
+        mark_as_sensitive_description_html: Mediji v prijavljenih objavah bodo označeni kot občutljivi in ukrep bo zabeležen, da vam pomaga stopnjevati ukrepe ob naslednjih kršitvah z istega računa.
+        other_description_html: Oglejte si več možnosti za nadzor vedenja računa in prilagodite komunikacijo s prijavljenim računom.
+        resolve_description_html: Proti prijavljenemu računu ne bo izvedeno nobeno dejanje, noben ukrep ne bo zabeležen in prijava bo zaprta.
+        silence_description_html: Profil bo viden samo tistim, ki mu že sledijo ali ga ročno poiščejo, s čimer bo resno omejen njegov doseg. To je vedno možno povrniti.
+        suspend_description_html: Profil in vsa njegova vsebina bodo postali nedosegljivi, dokler niso dokončno izbrisani. Interakcija z računom ne bo možna. Povrnitev je možna v času 30 dni.
+      actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
+      add_to_report: Dodaj več v prijavo
       are_you_sure: Ali ste prepričani?
       assign_to_self: Dodeli meni
       assigned: Dodeljen moderator
+      by_target_domain: Domena prijavljenega računa
+      category: Kategorija
+      category_description_html: Razlog, zakaj je ta račun in/ali vsebina prijavljena, bo naveden v komunikaciji z računom iz prijave
       comment:
         none: Brez
+      comment_description_html: 'V pojasnilo je %{name} zapisal/a:'
       created_at: Prijavljeno
+      delete_and_resolve: Izbriši objave
+      forwarded: Posredovano
+      forwarded_to: Posredovano na %{domain}
       mark_as_resolved: Označi kot rešeno
+      mark_as_sensitive: Označi, kot občutljivo
       mark_as_unresolved: Označi kot nerešeno
+      no_one_assigned: Nihče
       notes:
         create: Dodaj opombo
         create_and_resolve: Razreši z opombo
         create_and_unresolve: Ponovo odpri z opombo
         delete: Izbriši
-        placeholder: Opišite dejanja, ki ste jih izvedli, ali katere koli druge posodobitve...
+        placeholder: Opišite dejanja, ki ste jih izvedli, ali katere koli druge posodobitve ...
+        title: Zapiski
+      notes_description_html: Pokaži in pusti opombe drugim moderatorjem in sebi v prihodnosti
+      quick_actions_description_html: 'Opravite hitro dejanje ali podrsajte navzdol, da si ogledate prijavljeno vsebino:'
+      remote_user_placeholder: oddaljeni uporabnik iz %{instance}
       reopen: Ponovno odpri prijavo
       report: 'Prijavi #%{id}'
       reported_account: Prijavljeni račun
-      reported_by: Prijavljen od
+      reported_by: Prijavil/a
       resolved: Razrešeni
       resolved_msg: Prijava je uspešno razrešena!
+      skip_to_actions: Preskoči na dejanja
       status: Stanje
+      statuses: Prijavljena vsebina
+      statuses_description_html: Žaljiva vsebina bo citirana v komunikaciji z računom iz prijave
+      target_origin: Izvor prijavljenega računa
       title: Prijave
       unassign: Odstopljeni
       unresolved: Nerešeni
       updated_at: Posodobljeni
+      view_profile: Pokaži profil
+    roles:
+      add_new: Dodaj vlogo
+      assigned_users:
+        few: "%{count} uporabniki"
+        one: "%{count} uporabnik"
+        other: "%{count} uporabnikov"
+        two: "%{count} uporabnika"
+      categories:
+        administration: Upravljanje
+        devops: DevOps
+        invites: Povabila
+        moderation: Moderiranje
+        special: Posebno
+      delete: Izbriši
+      description_html: Z <strong>uporabniškimi vlogami</strong> lahko prilagodite, do katerih funkcij in področij Mastodona lahko dostopajo vaši uporabniki.
+      edit: Uredi vlogo %{name}
+      everyone: Privzete pravice
+      everyone_full_description_html: To je <strong>osnovna vloga</strong>, ki vpliva na <strong>vse uporabnike</strong>, celo na tiste brez dodeljene vloge. Vse druge vloge dedujejo njene pravice.
+      permissions_count:
+        few: "%{count} pravice"
+        one: "%{count} pravica"
+        other: "%{count} pravic"
+        two: "%{count} pravici"
+      privileges:
+        administrator: Skrbnik
+        administrator_description: Uporabniki s temi pravicami bodo zaobšli vse pravice
+        delete_user_data: Izbriši uporabniške podatke
+        delete_user_data_description: Omogoča uporabnikom, da izbrišejo podatke drugih uporabnikov brez časvnega zamika
+        invite_users: Povabi uporabnike
+        invite_users_description: Omogoča uporabnikom, da povabi nove osebe na strežnik
+        manage_announcements: Upravljaj obvestila
+        manage_announcements_description: Omogoča uporabnikom, da upravljajo obvestila na strežniku
+        manage_appeals: Upravljaj pritožbe
+        manage_appeals_description: Omogoča uporabnikom, da pregledajo pritožbe glede dejanj moderiranja
+        manage_blocks: Upravljaj blokirano
+        manage_blocks_description: Omogoča uporabnikom, da blokirajo ponudnike e-pošte in naslove IP
+        manage_custom_emojis: Upravljaj emotikone po meri
+        manage_custom_emojis_description: Omogoča uporabnikom, da upravljajo emotikone po meri na strežniku
+        manage_federation: Upravljaj beli seznam
+        manage_federation_description: Omogoča uporabnikom blokirati ali dovoljevati vstop na beli seznam z druimi domenami ter nadzirati dostavljivost
+        manage_invites: Upravljaj vabila
+        manage_invites_description: Omogoča uporabnikom, da brskajo in deaktivirajo povezave povabil
+        manage_reports: Upravljaj poročila
+        manage_reports_description: Omogoča uporabnikom, da pregledajo poročila in glede le-teh opravijo dejanja moderiranja
+        manage_roles: Upravljaj vloge
+        manage_roles_description: Omogoča uporabnikom upravljati in dodeljevati vloge pod svojo
+        manage_rules: Upravljaj pravila
+        manage_rules_description: Omogoča uporabnikom, da spremenijo pravila strežnika
+        manage_settings: Upravljaj nastavitve
+        manage_settings_description: Omogoča uporabnikom, da spremenijo nastavitve spletišča
+        manage_taxonomies: Upravljaj taksonomije
+        manage_taxonomies_description: Omogoča uporabnikom, da preverijo vsebino v trendu in posodobijo nastavitve ključnikov
+        manage_user_access: Upravljaj dostop uporabnikov
+        manage_user_access_description: Omogoča uporabnikom, da onemogočijo drugim uporabnikom dvofazno overjanje, spremenijo njihov e-naslov ter ponastavijo njihovo geslo
+        manage_users: Upravljaj uporabnike
+        manage_users_description: Omogoča uporabnikom, da vidijo podrobnosti drugih uporabnikov in nad njimi izvedejo dejanja moderiranja
+        manage_webhooks: Upravljaj spletne zanke
+        manage_webhooks_description: Omogoča uporabnikom, da vzpostavijo nove spletne zanke za skrbniške dogodke
+        view_audit_log: Pokaži revizijski zapisnik
+        view_audit_log_description: Omogoča, da uporabnik vidi zgodovino skrbniških opravil na strežniku
+        view_dashboard: Pokaži nadzorno ploščo
+        view_dashboard_description: Omogoča uporabnikom, da dostopajo do nadzorne plošče in različnih meritev
+        view_devops: DevOps
+        view_devops_description: Omogoča uporabnikom, da dostopajo do nadzornih plošč Sidekiq in phHero
+      title: Vloge
+    rules:
+      add_new: Dodaj pravilo
+      delete: Izbriši
+      description_html: Večina trdi, da so prebrali in da se strinjajo s pogoji rabe storitve, vendar le-teh ponavadi ne preberejo, dokler ne pride do težav. <strong>Poenostavite in naredite pravila svojega strežnika vidna na prvi pogled tako, da jih izpišete v označenem seznamu.</strong>Posamezna pravila skušajte ohraniti kratka in enostavna, ne razbijajte pa jih v preveč različnih točk.
+      edit: Uredi pravilo
+      empty: Zaenkrat še ni opredeljenih pravil.
+      title: Pravila strežnika
     settings:
-      activity_api_enabled:
-        desc_html: Številke lokalno objavljenih stanj, aktivnih uporabnikov in novih registracij na tedenskih seznamih
-        title: Objavi združeno statistiko o dejavnosti uporabnikov
-      bootstrap_timeline_accounts:
-        desc_html: Več uporabniških imen ločite z vejico. Deluje samo na lokalnih in odklenjenih računih. Privzeto, ko je prazno, je pri vseh lokalnih skrbnikih.
-        title: Privzeta sledenja za nove uporabnike
-      contact_information:
-        email: Poslovna e-pošta
-        username: Uporabniško ime stika
-      custom_css:
-        desc_html: Spremeni videz z naloženim CSS na vsaki strani
-        title: CSS po meri
-      hero:
-        desc_html: Prikazano na sprednji strani. Priporoča se vsaj 600x100px. Ko ni nastavljen, se vrne na sličico strežnika
-        title: Slika junaka
-      mascot:
-        desc_html: Prikazano na več straneh. Priporočena je najmanj 293 × 205 px. Ko ni nastavljen, se vrne na privzeto maskoto
-        title: Slika maskote
-      peers_api_enabled:
-        desc_html: Domene, na katere je ta strežnik naletel na fediverse-u
-        title: Objavi seznam odkritih strežnikov
-      preview_sensitive_media:
-        desc_html: Predogledi povezav na drugih spletiščih bodo prikazali sličico, tudi če je medij označen kot občutljiv
-        title: Prikaži občutljive medije v predogledih OpenGraph
-      profile_directory:
-        desc_html: Dovoli uporabnikom, da jih lahko odkrijejo
-        title: Omogoči imenik profilov
+      about:
+        manage_rules: Upravljaj pravila strežnika
+        preamble: Podrobneje opišite, kako upravljate, moderirate in financirate strežnik.
+        rules_hint: Na voljo je poseben prostor za pravila, ki jih naj spoštujejo vaši uporabniki.
+        title: O programu
+      appearance:
+        preamble: Prilagodite spletni vmesnik Mastodona.
+        title: Videz
+      branding:
+        preamble: Blagovna znamka vašega strežnika ga loči od drugih strežnikov v omrežju. Podatki se lahko prikžejo prek številnih okolij, kot so spletni vmesnik Mastodona, domorodni programi, predogledi povezav na drugih spletiščih, aplikacije za sporočanje itn. Zatorej je najbolje, da te podatke ohranite jasne, kratke in pomenljive.
+        title: Blagovne znamke
+      content_retention:
+        preamble: Nazdor nad hrambo vsebine uporabnikov v Mastodonu.
+        title: Hramba vsebin
+      default_noindex:
+        desc_html: Vpliva na vse uporabnike, ki niso sami spremenili te nastavitve
+        title: Privzeto izvzemi uporabnike iz indeksiranja iskalnika
+      discovery:
+        follow_recommendations: Sledi priporočilom
+        preamble: Izpostavljanje zanimivih vsebin je ključno za pridobivanje novih uporabnikov, ki morda ne poznajo nikogar na Mastodonu. Nadzirajte, kako različne funkcionalnosti razkritja delujejo na vašem strežniku.
+        profile_directory: Imenik profilov
+        public_timelines: Javne časovnice
+        title: Razkrivanje
+        trends: Trendi
+      domain_blocks:
+        all: Vsem
+        disabled: Nikomur
+        users: Prijavljenim krajevnim uporabnikom
       registrations:
-        closed_message:
-          desc_html: Prikazano na prvi strani, ko so registracije zaprte. Lahko uporabite oznake HTML
-          title: Sporočilo o zaprti registraciji
-        deletion:
-          desc_html: Dovoli vsakomur, da izbriše svoj račun
-          title: Odpri brisanje računa
-        min_invite_role:
-          disabled: Nihče
-          title: Dovoli vabila od
+        preamble: Nadzirajte, kdo lahko ustvari račun na vašem strežniku.
+        title: Registracije
       registrations_mode:
         modes:
           approved: Potrebna je odobritev za prijavo
           none: Nihče se ne more prijaviti
           open: Vsakdo se lahko prijavi
-        title: Način registracije
-      show_known_fediverse_at_about_page:
-        desc_html: Ko preklopite, bo prikazal tute vseh znanih fediverse-ov v predogledu. V nasprotnem primeru bodo prikazani samo lokalni tuti.
-        title: Pokaži znane fediverse-e v predogledu časovnice
-      show_staff_badge:
-        desc_html: Prikaži značko osebja na uporabniški strani
-        title: Prikaži značko osebja
-      site_description:
-        desc_html: Uvodni odstavek na API-ju. Opišite, zakaj je ta Mastodon strežnik poseben in karkoli pomembnega. Lahko uporabite HTML oznake, zlasti <code>&lt;a&gt;</code> in <code>&lt;em&gt;</code>.
-        title: Opis strežnika
-      site_description_extended:
-        desc_html: Dober kraj za vaš kodeks ravnanja, pravila, smernice in druge stvari, ki ločujejo vaš strežnik. Lahko uporabite oznake HTML
-        title: Razširjene informacije po meri
-      site_short_description:
-        desc_html: Prikazano v stranski vrstici in metaoznakah. V enem odstavku opišite, kaj je Mastodon in kaj naredi ta strežnik poseben.
-        title: Kratek opis strežnika
-      site_terms:
-        desc_html: Lahko napišete svojo pravilnik o zasebnosti, pogoje storitve ali druge pravne dokumente. Lahko uporabite oznake HTML
-        title: Pogoji storitve po meri
-      site_title: Ime strežnika
-      thumbnail:
-        desc_html: Uporablja se za predogled prek OpenGrapha in API-ja. Priporočamo 1200x630px
-        title: Sličica strežnika
-      timeline_preview:
-        desc_html: Prikaži javno časovnico na ciljni strani
-        title: Predogled časovnice
-      title: Nastavitve strani
+      title: Nastavitve strežnika
+    site_uploads:
+      delete: Izbriši naloženo datoteko
+      destroyed_msg: Prenos na strežnik uspešno izbrisan!
     statuses:
+      account: Avtor
+      application: Program
       back_to_account: Nazaj na stran računa
+      back_to_report: Nazaj na stran prijave
       batch:
-        delete: Izbriši
-        nsfw_off: Označi, da ni občutljivo
-        nsfw_on: Označi, kot občutljivo
-      failed_to_execute: Ni bilo mogoče izvesti
+        remove_from_report: Odstrani iz prijave
+        report: Poročaj
+      deleted: Izbrisano
+      favourites: Priljubljeni
+      history: Zgodovina različic
+      in_reply_to: Odgovarja
+      language: Jezik
       media:
         title: Mediji
-      no_media: Ni medijev
-      no_status_selected: Nobeno stanje ni bilo spremenjeno, ker ni bilo izbrano nobeno
-      title: Stanja računa
+      metadata: Metapodatki
+      no_status_selected: Nobena objava ni bila spremenjena, ker ni bila nobena izbrana
+      open: Odpri objavo
+      original_status: Izvorna objava
+      reblogs: Ponovljeni blogi
+      status_changed: Objava spremenjena
+      title: Objave računa
+      trending: V trendu
+      visibility: Vidnost
       with_media: Z mediji
+    strikes:
+      actions:
+        delete_statuses: "%{name} je izbrisal/a objave uporabnika %{target}"
+        disable: "%{name} je zamrznil/a račun uporabnika %{target}"
+        mark_statuses_as_sensitive: "%{name} je označil/a objave računa %{target} kot občutljive"
+        none: "%{name} je poslal/a opozorilo %{target}"
+        sensitive: "%{name} je označil/a račun %{target} kot občutljiv"
+        silence: "%{name} je omejil/a račun uporabnika %{target}"
+        suspend: "%{name} je suspendiral/a račun uporabnika %{target}"
+      appeal_approved: Pritoženo
+      appeal_pending: Čakajoč na ugovor
+    system_checks:
+      database_schema_check:
+        message_html: Na čakanju so migracije zbirke podatkov. Prosimo, izvedite jih, da zagotovite, da se program vede pričakovano
+      elasticsearch_running_check:
+        message_html: Povezava z Elasticsearch ni uspela. Preverite, da deluje, ali onemogočite iskanje po vsem besedilu
+      elasticsearch_version_check:
+        message_html: 'Nezdružljiva različica Elasticsearch: %{value}'
+        version_comparison: Izvaja se Elasticsearch %{running_version}, zahtevana pa je različica %{required_version}
+      rules_check:
+        action: Upravljaj pravila strežnika
+        message_html: Nobenih pravil strežnika niste določili.
+      sidekiq_process_check:
+        message_html: Noben proces Sidekiq ne poteka za %{value} vrst. Preglejte svojo prilagoditev Sidekiq
     tags:
-      title: Ključniki
+      review: Stanje pregleda
+      updated_msg: Nastavitve ključnikov uspešno posodobljene
     title: Upravljanje
+    trends:
+      allow: Dovoli
+      approved: Odobren
+      disallow: Ne dovoli
+      links:
+        allow: Dovoli povezavo
+        allow_provider: Dovoli izdajatelja
+        description_html: To so povezave, ki jih trenutno veliko delijo računi, iz katerih vaš strežnik vidi objave. Vašim uporabnikom lahko pomaga izvedeti, kaj se dogaja po svetu. Nobene povezave niso javno prikazane, dokler ne odobrite izdajatelja. Posamezne povezave lahko tudi dovolite ali zavrnete.
+        disallow: Ne dovoli povezave
+        disallow_provider: Ne dovoli izdajatelja
+        no_link_selected: Nobena povezava ni bila spremenjena, ker nobena ni bila izbrana
+        publishers:
+          no_publisher_selected: Noben izdajatelj ni bil spremenjen, ker noben ni bila izbran
+        shared_by_over_week:
+          few: Delile %{count} osebe v zadnjem tednu
+          one: Delila %{count} oseba v zadnjem tednu
+          other: Delilo %{count} oseb v zadnjem tednu
+          two: Delili %{count} osebi v zadnjem tednu
+        title: Povezave v trendu
+        usage_comparison: Danes deljeno %{today}-krat, včeraj pa %{yesterday}-krat
+      only_allowed: Samo dovoljeni
+      pending_review: Čakajoče na pregled
+      preview_card_providers:
+        allowed: Povezave tega izdajatelja so lahko v trendu
+        description_html: To so domene, iz katerih se povezave pogosto delijo na vašem strežniku. Povezave ne bodo javno objavljene, razen če je domena povezave odobrena. Vaša odobritev (ali zavrnitev) se nanaša na poddomene.
+        rejected: Povezave tega izdajatelja ne bodo v trendu
+        title: Izdajatelji
+      rejected: Zavrnjen
+      statuses:
+        allow: Dovoli objavo
+        allow_account: Dovoli avtorja
+        description_html: To so objave, za katere vaš strežnik ve, da so trenutno v skupni rabi in med priljubljenimi. Vašim novim uporabnikom in uporabnikom, ki se vračajo, lahko pomaga najti več oseb, ki jim bodo sledili. Nobena objava ni javno prikazana, dokler avtorja ne odobrite in avtor ne dovoli, da se njegov račun predlaga drugim. Posamezne objave lahko tudi dovolite ali zavrnete.
+        disallow: Ne dovoli objave
+        disallow_account: Ne dovoli avtorja
+        no_status_selected: Nobena trendna objava ni bila spremenjena, ker ni bila nobena izbrana
+        not_discoverable: Avtor ni dovolil, da bi ga bilo moč odkriti
+        shared_by:
+          few: Deljeno ali priljubljeno %{friendly_count}-krat
+          one: Deljeno ali priljubljeno %{friendly_count}-krat
+          other: Deljeno ali priljubljeno %{friendly_count}-krat
+          two: Deljeno ali priljubljeno %{friendly_count}-krat
+        title: Trendne objave
+      tags:
+        current_score: Trenutni rezultat %{score}
+        dashboard:
+          tag_accounts_measure: enkratnih uporab
+          tag_languages_dimension: Naj jeziki
+          tag_servers_dimension: Naj strežniki
+          tag_servers_measure: različnih strežnikov
+          tag_uses_measure: uporab skupaj
+        description_html: To so ključniki, ki se trenutno pojavljajo v številnih objavah, ki jih vidi vaš strežnik. Uporabnikom lahko pomaga ugotoviti, o čem ljudje trenutno največ govorijo. Noben ključnik ni javno prikazan, dokler ga ne odobrite.
+        listable: Je moč predlagati
+        no_tag_selected: Nobena značka ni bila spremenjena, ker nobena ni bila izbrana
+        not_listable: Ne bo predlagano
+        not_trendable: Se ne bo pojavilo med trendi
+        not_usable: Ni mogoče uporabiti
+        peaked_on_and_decaying: Vrh dne %{date}, zdaj v upadu
+        title: Ključniki v trendu
+        trendable: Se lahko pojavi med trendi
+        trending_rank: 'V trendu #%{rank}'
+        usable: Je moč uporabiti
+        usage_comparison: Danes uporabljeno %{today}-krat, včeraj pa %{yesterday}-krat
+        used_by_over_week:
+          few: Uporabile %{count} osebe v zadnjem tednu
+          one: Uporabila %{count} oseba v zadnjem tednu
+          other: Uporabilo %{count} oseb v zadnjem tednu
+          two: Uporabili %{count} osebi v zadnjem tednu
+      title: Trendi
+      trending: V porastu
     warning_presets:
       add_new: Dodaj novo
       delete: Izbriši
       edit_preset: Uredi prednastavitev opozoril
+      empty: Zaenkrat še niste določili nobenih opozorilnih prednastavitev.
       title: Upravljaj prednastavitev opozoril
+    webhooks:
+      add_new: Dodaj končno točko
+      delete: Izbriši
+      description_html: "<strong>Spletna zanka</strong> omogoča, da Mastodon potiska <strong>obvestila v resničnem času</strong> o izbranih dogodkih vašemu programu, tako da ta lahko <strong>samodejno proži odzive</strong>."
+      disable: Onemogoči
+      disabled: Onemogočeno
+      edit: Uredi končno točko
+      empty: Zaenkrat še nimate prilagojenih končnih točk spletnih zank.
+      enable: Omogoči
+      enabled: Dejaven
+      enabled_events:
+        few: "%{count} omogočeni dogodki"
+        one: "%{count} omogočen dogodek"
+        other: "%{count} omogočenih dogodkov"
+        two: "%{count} omogočena dogodka"
+      events: Dogodki
+      new: Nova spletna zanka
+      rotate_secret: Zasukaj skrivnost
+      secret: Skrivnost podpisovanja
+      status: Stanje
+      title: Spletne zanke
+      webhook: Spletna zanka
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: brisanje njihovih objav,
+        disable: zamrznitev njihovega računa,
+        mark_statuses_as_sensitive: označitev njihovih objav kot občutljivih,
+        none: opozorilo
+        sensitive: označitev njihovega računa kot občutljivega,
+        silence: omejitev njihovega računa,
+        suspend: suspenz njihovega računa,
+      body: "%{target} se pritožuje na moderatorsko odločitev %{action_taken_by} z dne %{date}, ki je bila %{type}. Zapisal/a je:"
+      next_steps: Pritožbi lahko ugodite in s tem razveljavite moderatorsko odločitev ali pa jo prezrete.
+      subject: "%{username} se je pritožil na moderatorsko odločitev na %{instance}"
     new_pending_account:
       body: Podrobnosti o novem računu so navedene spodaj. To aplikacijo lahko odobrite ali zavrnete.
       subject: Nov račun za pregled na %{instance} (%{username})
@@ -436,58 +929,106 @@ sl:
       body: "%{reporter} je prijavil %{target}"
       body_remote: Nekdo iz %{domain} je prijavil %{target}
       subject: Nove prijave za %{instance} (#%{id})
+    new_trends:
+      body: 'Naslednji elementi potrebujejo pregled, preden jih je možno javno prikazati:'
+      new_trending_links:
+        title: Povezave v trendu
+      new_trending_statuses:
+        title: Trendne objave
+      new_trending_tags:
+        no_approved_tags: Trenutno ni odobrenih ključnikov v trendu.
+        requirements: Vsak od teh kandidatov bi lahko presegel odobreni ključnik v trendu št. %{rank}, ki je trenutno %{lowest_tag_name} z rezultatom %{lowest_tag_score}.
+        title: Ključniki v trendu
+      subject: Novi trendi za pregled na %{instance}
+  aliases:
+    add_new: Ustvari vzdevek
+    created_msg: Uspešno ustvarjen novi vzdevek. Zdaj lahko pričnete s selitvijo s starega računa.
+    deleted_msg: Uspešno odstranjen vzdevek. Selitev iz tistega računa na tega ne bo več možna.
+    empty: Nimate vzdevkov.
+    hint_html: Če se želite preseliti iz drugega računa v tega, lahko tukaj ustvarite vzdevek, ki je potreben, preden lahko nadaljujete s selitvijo sledilcev iz starega računa v tega. To dejanje je samo po sebi <strong>neškodljivo in povratno</strong>. <strong>Selitev računa sprožite iz starega računa</strong>.
+    remove: Razveži vzdevek
   appearance:
     advanced_web_interface: Napredni spletni vmesnik
     advanced_web_interface_hint: 'Če želite uporabiti celotno širino zaslona, vam napredni spletni vmesnik omogoča, da si nastavite več različnih stolpcev in da si hkrati ogledate toliko informacij, kot želite: domačo stran, obvestila, združeno časovnico, poljubno število seznamov in ključnikov.'
     animations_and_accessibility: Animacije in dostopnost
     confirmation_dialogs: Potrditvena okna
+    discovery: Odkrito
+    localization:
+      body: Mastodon prevajamo prostovoljci.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Vsakdo lahko prispeva.
     sensitive_content: Občutljiva vsebina
+    toot_layout: Postavitev objave
   application_mailer:
     notification_preferences: Spremenite e-poštne nastavitve
+    salutation: "%{name},"
     settings: 'Spremenite e-poštne nastavitve: %{link}'
     view: 'Pogled:'
     view_profile: Ogled profila
-    view_status: Ogled stanja
+    view_status: Pokaži objavo
   applications:
     created: Aplikacija je bila uspešno ustvarjena
     destroyed: Aplikacija je bila uspešno izbrisana
-    invalid_url: Navedeni URL je neveljaven
     regenerate_token: Obnovite dostopni žeton
     token_regenerated: Dostopni žeton je bil uspešno regeneriran
     warning: Bodite zelo previdni s temi podatki. Nikoli jih ne delite z nikomer!
     your_token: Vaš dostopni žeton
   auth:
-    apply_for_account: Zahtevajte povabilo
+    apply_for_account: Zaprosite za račun
     change_password: Geslo
-    checkbox_agreement_html: Strinjam se s <a href="%{rules_path}" target="_blank">pravili strežnika</a> in <a href="%{terms_path}" target="_blank">pogoji storitve</a>
-    checkbox_agreement_without_rules_html: Strinjam se s <a href="%{terms_path}" target="_blank">pogoji storitve</a>
     delete_account: Izbriši račun
     delete_account_html: Če želite izbrisati svoj račun, lahko nadaljujete <a href="%{path}">tukaj</a>. Prosili vas bomo za potrditev.
+    description:
+      prefix_invited_by_user: "@%{name} vas vabi, da se pridružite temu strežniku Mastodon!"
+      prefix_sign_up: Še danes se priključite Mastodonu!
+      suffix: Z računom boste lahko sledili osebam, objavljali posodobitve in izmenjevali sporočila z uporabniki s poljubnega strežnika Mastodon in še veliko več!
     didnt_get_confirmation: Niste prejeli navodil za potrditev?
+    dont_have_your_security_key: Ali imate svoj varnostni ključ?
     forgot_password: Ste pozabili svoje geslo?
     invalid_reset_password_token: Žeton za ponastavitev gesla je neveljaven ali je potekel. Zahtevajte novo.
+    link_to_otp: Vnesite dvofaktorsko kodo s svojega telefona ali obnovitveno kodo
+    link_to_webauth: Vnesite svojo napravo za varnostni ključ
+    log_in_with: Prijavi se s
     login: Prijava
     logout: Odjava
     migrate_account: Premakni se na drug račun
     migrate_account_html: Če želite ta račun preusmeriti na drugega, ga lahko <a href="%{path}">nastavite tukaj</a>.
     or_log_in_with: Ali se prijavite z
+    privacy_policy_agreement_html: Prebral_a sem in se strinjam s <a href="%{privacy_policy_path}" target="_blank">pravilnikom o zasebnosti</a>.
+    providers:
+      cas: CAS
+      saml: SAML
     register: Vpis
     registration_closed: "%{instance} ne sprejema novih članov"
     resend_confirmation: Ponovno pošlji navodila za potrditev
     reset_password: Ponastavi geslo
+    rules:
+      preamble: Slednje določajo in njihovo spoštovanje zagotavljajo moderatorji %{domain}.
+      title: Nekaj osnovnih pravil.
     security: Varnost
     set_new_password: Nastavi novo geslo
     setup:
       email_below_hint_html: Če spodnji e-poštni naslov ni pravilen, ga lahko spremenite tukaj in prejmete novo potrditveno e-pošto.
       email_settings_hint_html: Potrditvena e-pošta je bila poslana na %{email}. Če ta e-poštni naslov ni pravilen, ga lahko spremenite v nastavitvah računa.
       title: Nastavitev
+    sign_in:
+      preamble_html: Prijavite se s svojimi poverilnicami <strong>%{domain}</strong>. Če vaš račun gostuje na drugem strežniku, se tukaj ne boste mogli prijaviti.
+      title: Vpiši se v %{domain}
+    sign_up:
+      preamble: Z računom na strežniku Mastodon boste lahko sledili vsem drugim v tem omrežju, ne glede na to, kje gostuje njihov račun.
+      title: Naj vas namestimo na %{domain}.
     status:
       account_status: Stanje računa
       confirming: Čakanje na potrditev e-pošte.
+      functional: Vaš račun je polno opravilen.
       pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
-    trouble_logging_in: Težave pri prijavi?
+      redirecting_to: Vaš račun ni dejaven, ker trenutno preusmerja na račun %{acct}.
+      view_strikes: Pokaži pretekle ukrepe proti mojemu računu
+    too_fast: Obrazec oddan prehitro, poskusite znova.
+    use_security_key: Uporabi varnostni ključ
   authorize_follow:
     already_following: Temu računu že sledite
+    already_requested: Temu računu ste že poslali zahtevo po sledenju
     error: Na žalost je prišlo do napake pri iskanju oddaljenega računa
     follow: Sledi
     follow_request: 'Prošnjo za sledenje se poslali:'
@@ -497,23 +1038,87 @@ sl:
       return: Prikaži uporabnikov profil
       web: Pojdi na splet
     title: Sledi %{acct}
+  challenge:
+    confirm: Nadaljuj
+    hint_html: "<strong>Namig:</strong> naslednjo uro vas ne bomo več vprašali po vašem geslu."
+    invalid_password: Neveljavno geslo
+    prompt: Potrdite geslo za nadaljevanje
+  crypto:
+    errors:
+      invalid_key: ni veljaven ključ Ed25519 ali Curve25519
+      invalid_signature: ni veljaven podpis Ed25519
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%B %d %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count} u"
+      about_x_months: "%{count} m"
+      about_x_years: "%{count} l"
+      almost_x_years: "%{count} l"
       half_a_minute: Pravkar
+      less_than_x_minutes: "%{count} min"
       less_than_x_seconds: Pravkar
+      over_x_years: "%{count} l"
+      x_days: "%{count} d"
+      x_minutes: "%{count} min"
+      x_months: "%{count} m"
+      x_seconds: "%{count} s"
   deletes:
+    challenge_not_passed: Podatki, ki ste jih vnesli, niso pravilni
     confirm_password: Vnesite svoje trenutno geslo, da potrdite svojo identiteto
+    confirm_username: Vnesite svoje uporabniško ime, da potrdite postopek
     proceed: Izbriši račun
     success_msg: Vaš račun je bil uspešno izbrisan
-  directories:
-    directory: Imenik profilov
-    explanation: Odkrijte uporabnike glede na njihove interese
-    explore_mastodon: Razišči %{title}
+    warning:
+      before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
+      caches: Vsebina, ki jo medpomnijo drugi strežniki, lahko vztraja
+      data_removal: Vaše objave in drugi podatki bodo trajno odstranjeni
+      email_change_html: <a href="%{path}">Svoj e-naslov lahko spremenite</a> brez izbrisa svojega računa
+      email_contact_html: Če še vedno ni dostavljeno, lahko za pomoč pošljete e-sporočilo na naslov <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Če niste prejeli potrditvenega e-sporočila, lahko <a href="%{path}">znova zaprosite zanj</a>
+      irreversible: Vašega računa ne boste mogli obnoviti ali ponovno aktivirati
+      more_details_html: Za podrobnosti glejte <a href="%{terms_path}">politiko zasebnosti</a>.
+      username_available: Vaše uporabniško ime bo znova na voljo
+      username_unavailable: Vaše uporabniško ime še vedno ne bo na voljo
+  disputes:
+    strikes:
+      action_taken: Izvedeno dejanje
+      appeal: Pritoži se
+      appeal_approved: Pritožba na ukrep je bila uspešna in ukrep ni več veljaven
+      appeal_rejected: Pritožba je bila zavržena
+      appeal_submitted_at: Pritožba oddana
+      appealed_msg: Vaša pritožba je oddana. Če bo odobrena, boste o tem obveščeni.
+      appeals:
+        submit: Pošlji pritožbo
+      approve_appeal: Ugodi pritožbi
+      associated_report: Povezana prijava
+      created_at: Datum
+      description_html: To so dejanja, izvedena proti vašemu računu ter opozorila, ki so vam jih poslali sodelavci %{instance}.
+      recipient: Naslovljeno na
+      reject_appeal: Zavrni pritožbo
+      status: 'Objava #%{id}'
+      status_removed: Objava je že odstranjena iz sistema
+      title: "%{action} dne %{date}"
+      title_actions:
+        delete_statuses: Odstranitev objave
+        disable: Zamrznitev računa
+        mark_statuses_as_sensitive: Označevanje objav kot občutljivih
+        none: Opozorilo
+        sensitive: Označevanj računa kot občutljivega
+        silence: Omejitev računa
+        suspend: Suspenz računa
+      your_appeal_approved: Vaša pritožba je bila odobrena
+      your_appeal_pending: Oddali ste pritožbo
+      your_appeal_rejected: Vaša pritožba je bila zavržena
+  domain_validator:
+    invalid_domain: ni veljavno ime domene
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Zahteva, ki ste jo oddali, je neveljavna ali nepravilno oblikovana.
     '403': Nimate dovoljenja za ogled te strani.
     '404': Iskana stran ne obstaja.
-    '406': This page is not available in the requested format.
+    '406': Ta stran ni na voljo v zahtevani obliki.
     '410': Iskana stran ne obstaja več.
     '422':
       content: Varnostno preverjanje ni uspelo. Ali blokirate piškotke?
@@ -522,7 +1127,7 @@ sl:
     '500':
       content: Žal nam je, toda na našem koncu je prišlo do napake.
       title: Ta stran ni pravilna
-    '503': The page could not be served due to a temporary server failure.
+    '503': Strani ni mogoče postreči zaradi začasne odpovedi strežnika.
     noscript_html: Če želite uporabljati spletno aplikacijo Mastodon, omogočite JavaScript. Druga možnost je, da za svojo platformo poskusite eno od <a href="%{apps_path}">lastnih aplikacij</a> za Mastodon.
   existing_username_validator:
     not_found: s tem uporabniškim imenom ni bilo mogoče najti lokalnega uporabnika
@@ -531,11 +1136,13 @@ sl:
     archive_takeout:
       date: Datum
       download: Prenesi svoj arhiv
-      hint_html: Zahtevate lahko arhiv vaših <strong>tutov in naloženih medijev</strong>. Izvoženi podatki bodo v formatu ActivityPub, ki ga bo mogoče brati s katerokoli skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
+      hint_html: Zahtevate lahko arhiv vaših <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
       in_progress: Prevajanje arhiva...
       request: Zahtevajte svoj arhiv
       size: Velikost
     blocks: Blokirate
+    bookmarks: Zaznamki
+    csv: CSV
     domain_blocks: Bloki domene
     lists: Seznami
     mutes: Utišate
@@ -544,32 +1151,82 @@ sl:
     add_new: Dodaj novo
     errors:
       limit: Ste že dodali največje število ključnikov
+    hint_html: "<strong>Kaj so izpostavljeni ključniki?</strong> Prikazani so vidno na vašem javnem profilu in ljudem omogočajo brskanje po vaših javnih objavah posebej pod temi ključniki. So odlično orodje za spremljanje ustvarjalnih del ali dolgoročnih projektov."
   filters:
     contexts:
+      account: Profili
       home: Domača časovnica
       notifications: Obvestila
       public: Javne časovnice
       thread: Pogovori
     edit:
+      add_keyword: Dodaj ključno besedo
+      keywords: Ključne besede
+      statuses: Posamezne objave
+      statuses_hint_html: Ta filter velja za izbrane posamezne objave, ne glede na to, ali se ujemajo s spodnjimi ključnimi besedami. <a href="%{path}">Preglejte ali odstarnite objave iz filtra</a>.
       title: Uredite filter
     errors:
+      deprecated_api_multiple_keywords: Teh parametrov ni mogoče spremeniti iz tega programa, ker veljajo za več kot eno ključno besedo filtra. Uporabite novejšo izdaj programa ali spletni vmesnik.
       invalid_context: Ne vsebuje nobenega ali vsebuje neveljaven kontekst
-      invalid_irreversible: Nepovratno filtriranje deluje le v kontekstu doma ali obvestil
     index:
+      contexts: Filtri v %{contexts}
       delete: Izbriši
+      empty: Nimate filtrov.
+      expires_in: Poteče čez %{distance}
+      expires_on: Poteče %{date}
+      keywords:
+        few: "%{count} ključne besede"
+        one: "%{count} ključna beseda"
+        other: "%{count} ključnih besed"
+        two: "%{count} ključni besedi"
+      statuses:
+        few: "%{count} objave"
+        one: "%{count} objava"
+        other: "%{count} objav"
+        two: "%{count} objavi"
+      statuses_long:
+        few: "%{count} posamezne objave skrite"
+        one: "%{count} posamezna objava skrita"
+        other: "%{count} posameznih objav skritih"
+        two: "%{count} posamezni objavi skriti"
       title: Filtri
     new:
+      save: Shrani nov filter
       title: Dodaj nov filter
+    statuses:
+      back_to_filter: Nazaj na filter
+      batch:
+        remove: Odstrani iz filtra
+      index:
+        hint: Ta filter se nanaša na posamezne objave ne glede na druge pogoje. Filtru lahko dodate več objav prek spletnega vmesnika.
+        title: Filtrirane objave
   footer:
-    developers: Razvijalci
-    more: Več…
-    resources: Viri
+    trending_now: Zdaj v trendu
   generic:
     all: Vse
+    all_items_on_page_selected_html:
+      few: Na tej strani so izbrani <strong>%{count}</strong> elementi.
+      one: Na tej strani je izbran <strong>%{count}</strong> element.
+      other: Na tej strani je izbranih <strong>%{count}</strong> elementov.
+      two: Na tej strani sta izbrana <strong>%{count}</strong> elementa.
+    all_matching_items_selected_html:
+      few: Izbrani so <strong>%{count}</strong> elementi, ki ustrezajo vašemu iskanju.
+      one: Izbran je <strong>%{count}</strong> element, ki ustreza vašemu iskanju.
+      other: Izbranih je <strong>%{count}</strong> elementov, ki ustrezajo vašemu iskanju.
+      two: Izbrana sta <strong>%{count}</strong> elementa, ki ustrezata vašemu iskanju.
     changes_saved_msg: Spremembe so uspešno shranjene!
     copy: Kopiraj
+    delete: Izbriši
+    deselect: Prekliči ves izbor
+    none: Brez
     order_by: Razvrsti po
     save_changes: Shrani spremembe
+    select_all_matching_items:
+      few: Izberite %{count} elemente, ki ustrezajo vašemu iskanju.
+      one: Izberite %{count} element, ki ustreza vašemu iskanju.
+      other: Izberite %{count} elementov, ki ustrezajo vašemu iskanju.
+      two: Izberite %{count} elementa, ki ustrezata vašemu iskanju.
+    today: danes
     validation_errors:
       few: Nekaj še ni čisto v redu! Spodaj si oglejte %{count} napake
       one: Nekaj še ni čisto v redu! Spodaj si oglejte napako
@@ -577,25 +1234,10 @@ sl:
       two: Nekaj še ni čisto v redu! Spodaj si oglejte %{count} napaki
   html_validator:
     invalid_markup: 'vsebuje neveljavno oznako HTML: %{error}'
-  identity_proofs:
-    active: Dejaven
-    authorize: Da, odobri
-    authorize_connection_prompt: Odobrite to kriptografsko povezavo?
-    errors:
-      failed: Kriptografska povezava ni uspela. Poskusite znova od %{provider}.
-      keybase:
-        invalid_token: Žetoni Keybase so algoritem podpisov in morajo biti sestavljeni iz 66 heksadecimalnih znakov
-        verification_failed: Keybase ne prepozna tega žetona kot podpis uporabnika %{kb_username}. Poskusite znova s Keybase-om.
-      wrong_user: Dokler se prijavite kot %{current}, ni mogoče ustvariti dokazila za %{proving}. Prijavite se kot %{proving} in poskusite znova.
-    explanation_html: Tukaj lahko kriptografsko povežete druge identitete, na primer profil Keybase. To omogoča drugim, da vam pošljejo šifrirana sporočila in zaupate vsebino, ki ste jo poslali.
-    i_am_html: Jaz sem %{username} na %{service}.
-    identity: Identiteta
-    inactive: Neaktiven
-    publicize_checkbox: 'In to tutnite:'
-    publicize_toot: 'Dokazano je! Jaz sem %{username} na %{service}: %{url}'
-    status: Stanje preverjanja
-    view_proof: Oglejte si dokaz
   imports:
+    errors:
+      invalid_csv_file: 'Neveljavna datoteka CSV. Napaka: %{error}'
+      over_rows_processing_limit: vsebuje več kot %{count} vrstic
     modes:
       merge: Združi
       merge_long: Ohrani obstoječe zapise in dodaj nove
@@ -605,11 +1247,11 @@ sl:
     success: Vaši podatki so bili uspešno naloženi in bodo zdaj pravočasno obdelani
     types:
       blocking: Seznam blokiranih
+      bookmarks: Zaznamki
       domain_blocking: Seznam blokiranih domen
       following: Seznam uporabnikov, katerim sledite
       muting: Seznam utišanih
     upload: Pošlji
-  in_memoriam_html: V spomin.
   invites:
     delete: Onemogoči
     expired: Poteklo
@@ -637,33 +1279,70 @@ sl:
   lists:
     errors:
       limit: Dosegli ste največje število seznamov
+  login_activities:
+    authentication_methods:
+      otp: aplikacija za dvoravenjsko overjanje
+      password: geslo
+      sign_in_token: varnostna koda po e-pošti
+      webauthn: varnostni ključi
+    description_html: Če opazite dejavnost, ki je ne prepoznate kot svoje, razmislite o spremembi svojega gesla in omogočanju dvoravenskega overjanja.
+    empty: Zgodovina overjanja ni na voljo
+    failed_sign_in_html: Spodletela prijava z metodo %{method} iz %{ip} (%{browser})
+    successful_sign_in_html: Uspešna prijava z metodo %{method} iz %{ip} (%{browser})
+    title: Zgodovina overjanja
   media_attachments:
     validations:
-      images_and_video: Videoposnetka ni mogoče priložiti stanju, ki že vsebuje slike
+      images_and_video: Videoposnetka ni mogoče priložiti objavi, ki že vsebuje slike
+      not_ready: Datotek, katerih obdelava ni dokončana, ni mogoče pripeti. Poskusite znova kmalu!
       too_many: Ni možno priložiti več kot 4 datoteke
   migrations:
     acct: username@domain novega računa
+    cancel: Prekliči preusmeritev
+    cancel_explanation: Preklic preusmeritve ponovno aktivira vaš trenutni račun, vendar ne povrne sledilcev, ki so bili preseljeni na tisti račun.
+    cancelled_msg: Preusmeritev je bila uspešno preklicana.
+    errors:
+      already_moved: je isti račun, na katerega ste se že preselili
+      missing_also_known_as: ni vzdevek za ta račun
+      move_to_self: ne more biti trenutni račun
+      not_found: ni mogoče najti
+      on_cooldown: Ste na ohlajanju
+    followers_count: Sledilcev ob času selitve
+    incoming_migrations: Selitev iz drugega računa
+    incoming_migrations_html: Če se želite preseliti iz drugega računa na tega, morate najprej <a href="%{path}">ustvariti vzdevek računa</a>.
+    moved_msg: Vaš račun se zdaj preusmerja na %{acct} in vaši sledilci so preseljeni.
+    not_redirecting: Vaš račun trenutno ne preusmerja na noben drug račun.
+    on_cooldown: Nedavno ste migrirali svoj račun. Funkcija bo znova na voljo čez %{count} dni.
+    past_migrations: Pretekle migracije
+    proceed_with_move: Premakni sledilce
+    redirected_msg: Vaš račun se zdaj preusmerja na %{acct}.
+    redirecting_to: Vaš račun se preusmerja na %{acct}.
+    set_redirect: Nastavi preusmeritev
+    warning:
+      backreference_required: Novi račun je potrebno najprej prilagoditi, da se bo skliceval nazaj na tega
+      before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
+      cooldown: Po selitvi sledi čakalna doba, v kateri računa ne boste mogli ponovno seliti
+      disabled_account: Vaš trenutni račun zatem ne bo polno uporaben. Vendar pa boste imeli dostop do izvoza podatkov kot tudi do ponovne aktivacije.
+      followers: S tem dejanjem boste preselili vse sledilce iz trenutnega računa na novi račun
+      only_redirect_html: Namesto tega lahko <a href="%{path}">na svojem profilu zgolj vzpostavite preusmeritev</a>.
+      other_data: Nobeni drugi podatki se ne bodo preselili samodejno
+      redirect: Profil vašega trenutnega računa bo posodobljen z obvestilom o preusmeritvi in bo izključen iz iskanj
   moderation:
     title: Moderiranje
+  move_handler:
+    carry_blocks_over_text: Ta uporabnik se je preselil iz računa %{acct}, ki ste ga blokirali.
+    carry_mutes_over_text: Ta uporabnik se je preselil iz računa %{acct}, ki ste ga utišali.
+    copy_account_note_text: 'Ta uporabnik se je preselil iz %{acct}, tukaj so vaše poprejšnje opombe o njem:'
+  navigation:
+    toggle_menu: Preklopi meni
   notification_mailer:
-    digest:
-      action: Prikaži vsa obvestila
-      body: Tukaj je kratek povzetek sporočil, ki ste jih zamudili od vašega zadnjega obiska v %{since}
-      mention: "%{name} vas je omenil/a v:"
-      new_followers_summary:
-        few: Prav tako ste pridobili %{count} nove sledilce, ko ste bili odsotni! Juhu!
-        one: Prav tako ste pridobili enega novega sledilca, ko ste bili odsotni! Juhu!
-        other: Prav tako ste pridobili %{count} novih sledilcev, ko ste bili odsotni! Juhu!
-        two: Prav tako ste pridobili %{count} nova sledilca, ko ste bili odsotni! Juhu!
-      subject:
-        few: "%{count} nova obvestila od vašega zadnjega obiska \U0001F418"
-        one: "1 novo obvestilo od vašega zadnjega obiska \U0001F418"
-        other: "%{count} novih obvestil od vašega zadnjega obiska \U0001F418"
-        two: "%{count} novi obvestili od vašega zadnjega obiska \U0001F418"
-      title: V vaši odsotnosti...
+    admin:
+      report:
+        subject: "%{name} je oddal/a prijavo"
+      sign_up:
+        subject: "%{name} se je vpisal/a"
     favourite:
-      body: "%{name} je vzljubil/a vaše stanje:"
-      subject: "%{name} je vzljubil/a vaše stanje"
+      body: "%{name} je vzljubil/a vašo objavo:"
+      subject: "%{name} je vzljubil/a vašo objavo"
       title: Novo priljubljeno
     follow:
       body: "%{name} vam sedaj sledi!"
@@ -679,15 +1358,44 @@ sl:
       body: "%{name} vas je omenil/a v:"
       subject: "%{name} vas je omenil/a"
       title: Nova omemba
+    poll:
+      subject: Anketa, ki jo je pripravil/a %{name}, se je iztekla
     reblog:
-      body: "%{name} je spodbudil/a vaše stanje:"
-      subject: "%{name} je spodbudil/a vaše stanje"
-      title: Nova spodbuda
+      body: 'Vašo objavo je izpostavil/a %{name}:'
+      subject: "%{name} je izpostavil/a vašo objavo"
+      title: Nova izpostavitev
+    status:
+      subject: "%{name} je pravkar objavil/a"
+    update:
+      subject: "%{name} je uredil(a) objavo"
+  notifications:
+    email_events: Dogodki za e-obvestila
+    email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
+    other_settings: Druge nastavitve obvestil
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: Za potrditev vnesite kodo, ki jo je ustvarila aplikacija za preverjanje pristnosti
+    description_html: Če omogočite <strong>dvofaktorsko preverjanje pristnosti</strong> z aplikacijo za overjanje, boste za prijavo morali imeti pri sebi svoj telefon, s katerim boste ustvarili žetone za vstop.
+    enable: Omogoči
+    instructions_html: "<strong>Skenirajte to QR-kodo z Google Authenticator ali s podobno aplikacijo TOTP na vašem telefnu</strong>. Od zdaj naprej bo ta aplikacija ustvarjala žetone, ki jih boste morali vnesti ob prijavi."
+    manual_instructions: 'Če ne morete skenirati QR-kode in jo morate vnesti ročno, je tu skrivnost v tekstovni obliki:'
+    setup: Vzpostavi
+    wrong_code: Vnesena koda je neveljavna! Ali sta čas strežnika in čas naprave pravilna?
   pagination:
     newer: Novejše
     next: Naprej
     older: Starejše
     prev: Nazaj
+    truncate: "&hellip;"
   polls:
     errors:
       already_voted: Na tej anketi ste že glasovali
@@ -695,6 +1403,7 @@ sl:
       duration_too_long: je predaleč v prihodnosti
       duration_too_short: je prezgodaj
       expired: Glasovanje se je že zaključilo
+      invalid_choice: Izbrana možnost glasovanja ne obstaja
       over_character_limit: ne more biti daljše od %{max} znakov
       too_few_options: mora imeti več kot en element
       too_many_options: ne more vsebovati več kot %{max} elementov
@@ -702,9 +1411,19 @@ sl:
     other: Ostalo
     posting_defaults: Privzete nastavitev objavljanja
     public_timelines: Javne časovnice
+  privacy_policy:
+    title: Pravilnik o zasebnosti
+  reactions:
+    errors:
+      limit_reached: Dosežena omejitev različnih reakcij/odzivov
+      unrecognized_emoji: ni prepoznan emotikon
   relationships:
     activity: Dejavnost računa
     dormant: Skrit
+    follow_selected_followers: Sledi izbranim sledilcem
+    followers: Sledilci
+    following: Sledi
+    invited: Vabljeni
     last_active: Zadnja dejavnost
     most_recent: Najnovejša
     moved: Prestavljeno
@@ -716,46 +1435,65 @@ sl:
     remove_selected_follows: Prenehaj slediti izbranim uporabnikom
     status: Stanje računa
   remote_follow:
-    acct: Vnesite uporabniško_ime@domena, iz katerega želite delovati
     missing_resource: Za vaš račun ni bilo mogoče najti zahtevanega URL-ja za preusmeritev
-    no_account_html: Še nimate računa? Tukaj se lahko <a href='%{sign_up_path}' target='_blank'>prijavite</a>
-    proceed: Nadaljujte
-    prompt: 'Sledili boste:'
-    reason_html: "<strong>Zakaj je ta korak potreben?</strong> <code>%{instance}</code> morda ni strežnik, kjer ste registrirani, zato vas moramo najprej preusmeriti na domači strežnik."
-  remote_interaction:
-    favourite:
-      proceed: Nadaljuj s priljubljenim
-      prompt: 'Ali želite vzljubiti ta tut:'
-    reblog:
-      proceed: Nadaljuj s spodbudo
-      prompt: 'Ali želite spodbuditi ta tut:'
-    reply:
-      proceed: Nadaljuj z odgovorom
-      prompt: 'Ali želite odgovoriti na ta tut:'
+  reports:
+    errors:
+      invalid_rules: se ne sklicuje na veljavna pravila
+  rss:
+    content_warning: 'Opozorilo o vsebini:'
+    descriptions:
+      account: Javne objave @%{acct}
+      tag: 'Javne objave s ključnikom #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih tutov
-    over_total_limit: Presegli ste omejitev %{limit} načrtovanih tutov
+    over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih objav
+    over_total_limit: Presegli ste omejitev %{limit} načrtovanih objav
     too_soon: Načrtovani datum mora biti v prihodnosti
   sessions:
     activity: Zadnja dejavnost
     browser: Brskalnik
     browsers:
+      alipay: Alipay
       blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
       generic: Neznan brskalnik
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Brskalnik Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
       uc_browser: UC Browser
+      weibo: Weibo
     current_session: Trenutna seja
     description: "%{browser} na %{platform}"
     explanation: To so spletni brskalniki, ki so trenutno prijavljeni v vaš Mastodon račun.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
+      android: Android
       blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
       mac: Mac
       other: neznana platforma
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Prekliči
     revoke_success: Seja je bila uspešno preklicana
     title: Seje
+    view_authentication_history: Oglejte si zgodovino overjanja za vaš račun
   settings:
     account: Račun
     account_settings: Nastavitve računa
+    aliases: Vzdevki računa
     appearance: Videz
     authorized_apps: Pooblaščene aplikacije
     back: Nazaj na Mastodon
@@ -764,7 +1502,6 @@ sl:
     edit_profile: Uredi profil
     export: Izvoz podatkov
     featured_tags: Vključeni ključniki
-    identity_proofs: Dokazi o identiteti
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
@@ -772,9 +1509,17 @@ sl:
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
+    statuses_cleanup: Samodejno brisanje objav
+    strikes: Ukrepi morediranja
     two_factor_authentication: Dvofaktorsko overjanje
+    webauthn_authentication: Varnostni ključi
   statuses:
     attached:
+      audio:
+        few: "%{count} zvočni posnetki"
+        one: "%{count} zvočni posnetek"
+        other: "%{count} zvočnih posnetkov"
+        two: "%{count} zvočna posnetka"
       description: 'Priloženo: %{attached}'
       image:
         few: "%{count} slike"
@@ -786,22 +1531,30 @@ sl:
         one: "%{count} video posnetek"
         other: "%{count} video posnetkov"
         two: "%{count} video posnetka"
-    boosted_from_html: Spodbujeno iz %{acct_link}
+    boosted_from_html: Izpostavljeno z računa %{acct_link}
     content_warning: 'Opozorilo o vsebini: %{warning}'
+    default_language: Enak kot jezik vmesnika
     disallowed_hashtags:
       few: 'vsebuje nedovoljene ključnike: %{tags}'
       one: 'vsebuje nedovoljeni ključnik: %{tags}'
       other: 'vsebuje nedovoljenih ključnikov: %{tags}'
       two: 'vsebuje nedovoljena ključnika: %{tags}'
-    language_detection: Samodejno zaznaj jezik
+    edited_at_html: Urejeno %{date}
+    errors:
+      in_reply_not_found: Objava, na katero želite odgovoriti, ne obstaja.
     open_in_web: Odpri na spletu
     over_character_limit: omejitev %{max} znakov je presežena
     pin_errors:
-      limit: Pripeli ste največje število tutov
-      ownership: Trob nekoga drugega ne more biti pripet
-      private: Nejavnega troba ni mogoče pripeti
-      reblog: Spodbuda ne more biti pripeta
+      direct: Objav, ki so vidne samo omenjenum uporabnikom, ni mogoče pripenjati
+      limit: Pripeli ste največje število objav
+      ownership: Objava nekoga drugega ne more biti pripeta
+      reblog: Izpostavitev ne more biti pripeta
     poll:
+      total_people:
+        few: "%{count} osebe"
+        one: "%{count} Oseba"
+        other: "%{count} oseb"
+        two: "%{count} osebi"
       total_votes:
         few: "%{count} glasovi"
         one: "%{count} glas"
@@ -809,151 +1562,148 @@ sl:
         two: "%{count} glasova"
       vote: Glasuj
     show_more: Pokaži več
+    show_newer: Pokaži novejše
+    show_older: Pokaži starejše
+    show_thread: Pokaži nit
     sign_in_to_participate: Prijavite se, če želite sodelovati v pogovoru
+    title: "%{name}: »%{quote}«"
     visibilities:
+      direct: Neposredno
       private: Samo sledilci
       private_long: Prikaži samo sledilcem
       public: Javno
       public_long: Vsi lahko vidijo
       unlisted: Ni prikazano
       unlisted_long: Vsi lahko vidijo, vendar ni objavljeno na javnih časovnicah
+  statuses_cleanup:
+    enabled: Samodejno izbriši stare objave
+    enabled_hint: Samodejno izbriše vaše objave, ko dosežejo določen starostni prag, razen če ne ustrezajo eni od spodnjih izjem
+    exceptions: Izjeme
+    explanation: Ker je brisanje objav draga operacija, se to postopoma izvaja počasi, ko strežnik sicer ni zaseden. Zaradi tega se lahko vaše objave izbrišejo nekaj časa po tem, ko dosežejo starostni prag.
+    ignore_favs: Prezri priljubljene
+    ignore_reblogs: Prezri izpostavitve
+    interaction_exceptions: Izjeme na osnovi interakcije
+    interaction_exceptions_explanation: Upoštevajte, da ni nobene garancije za objave, ki bodo izbrisane, če padejo pod prag priljubljenosti ali izpostavljenosti, ko so ga že enkrat presegle.
+    keep_direct: Ohrani neposredna sporočila
+    keep_direct_hint: Ne izbriše nobenega izmed vaših neposrednih sporočil
+    keep_media: Ohrani objave z medijskimi priponkami
+    keep_media_hint: Ne izbriše nobene vaših objav, ki imajo medijske priponke
+    keep_pinned: Ohrani pripete objave
+    keep_pinned_hint: Ne izbriše nobene od vaših pripetih objav
+    keep_polls: Ohrani ankete
+    keep_polls_hint: Ne izbriše vaših anket
+    keep_self_bookmark: Ohrani objave z zaznamki
+    keep_self_bookmark_hint: Ne izbriše vaših lastnih objav, če ste jih postavili med zaznamke
+    keep_self_fav: Ohrani priljubljene objave
+    keep_self_fav_hint: Ne izbriše vaših lastnih objav, če ste jih postavili med priljubljene
+    min_age:
+      '1209600': 2 tedna
+      '15778476': 6 mesecev
+      '2629746': 1 mesec
+      '31556952': 1 leto
+      '5259492': 2 meseca
+      '604800': 1 teden
+      '63113904': 2 leti
+      '7889238': 3 mesece
+    min_age_label: Starostna meja
+    min_favs: Obrži objave priljubljene vsaj
+    min_favs_hint: Ne izbriše nobene od vaših objav, ki je prejela vsaj takšno količino priljubljenih. Pustite prazno, če želite izbrisati objave ne glede na število všečkov
+    min_reblogs: Obdrži objave izpostavljene vsaj
+    min_reblogs_hint: Ne izbriše nobene od vaših objav, ki je bila vsaj tolikokrat podprta. Pustite prazno, če želite izbrisati objave ne glede na število izpostavitev
   stream_entries:
-    pinned: Pripet trob
-    reblogged: spodbujen
+    pinned: Pripeta objava
+    reblogged: izpostavljeno
     sensitive_content: Občutljiva vsebina
-  terms:
-    body_html: |
-      <h2>Pravilnik o zasebnosti</h2>
-      <h3 id="collect">Katere informacije zbiramo?</h3>
-
-      <ul>
-      <li><em>Osnovni podatki o računu</em>: Če se registrirate na tem strežniku, boste morda morali vnesti uporabniško ime, e-poštni naslov in geslo. Vnesete lahko tudi dodatne informacije o profilu, na primer prikazno ime in biografijo, ter naložite sliko profila in sliko glave. Uporabniško ime, prikazno ime, biografija, slika profila in slika glave so vedno javno dostopni.</li>
-      <li><em>Objave, sledenja in druge javne informacije</em>: Seznam oseb, ki jim sledite, je javno dostopen, enako velja za vaše sledilce. Ko pošljete sporočilo, sta datum in čas shranjena, kot tudi aplikacija, iz katere ste poslali sporočilo. Sporočila lahko vsebujejo medijske priloge, kot so slike in video posnetki. Javne in neprikazane objave so javno dostopne. Ko v profilu vključite objavo, je to tudi javno dostopna informacija. Vaše objave, ki so dostavljene vašim sledilcem, so včasih dostavljeni na različne strežnike, kjer se kopije objav tudi shranijo. Ko izbrišete objave, se to prav tako dostavi vašim sledilcem. Spodbujanje in vzljubitev drugih objav sta veno javni.</li>
-      <li><em>Neposredne objave in objave samo za sledilce</em>: Vse objave so shranjene in obdelane na strežniku. Objave samo za sledilce se dostavijo vašim sledilcem in uporabnikom, ki so v njih omenjeni. Neposredne objave se posredujejo samo uporabnikom, ki so v njih omenjeni. V nekaterih primerih so dostavljeni na različne strežnike, kopije pa se shranijo tam. V dobri veri si prizadevamo omejiti dostop do teh objav samo pooblaščenim osebam, vendar drugi strežniki to morda ne bodo storili. Zato je pomembno, da pregledate strežnike, na katerih so sledilci. V nastavitvah lahko preklapljate med možnostmi za odobritev in zavrnitev novih sledilcev. <em> Ne pozabite, da lahko operaterji strežnika in kateri koli prejemni strežnik takšna sporočila pregledajo </em> in da jih lahko prejemniki posnamejo, kopirajo ali drugače ponovno delijo. <em> Ne pošiljajte nevarnih informacij skozi Mastodon. </em> </li>
-      <li><em>IP-ji in drugi metapodatki</em>: Ko se prijavite, zabeležimo naslov IP, s katerega se prijavljate, in ime aplikacije brskalnika. V nastavitvah so za pregled in preklic na voljo vse prijavljene seje. Zadnji uporabljeni IP naslov je shranjen do 12 mesecev. Prav tako lahko obdržimo dnevnike strežnikov, ki vsebujejo IP naslov vsake zahteve na naš strežnik. </li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Za kaj uporabljamo vaše podatke?</h3>
-
-      <p>Vse informacije, ki jih zbiramo od vas, so lahko uporabljene na naslednje načine:</p>
-
-      <ul>
-      <li>Za zagotavljanje osrednje funkcionalnosti Mastodona. Komunicirate lahko z vsebino drugih oseb in objavljate lastno vsebino, ko ste prijavljeni. Na primer, lahko spremljate druge osebe in si ogledate njihove kombinirane objave v svoji prilagojeni domači časovnici.</li>
-      <li>Za pomoč pri moderiranju skupnosti, na primer primerjavo vašega naslova IP naslova z drugimi znanimi, za izobčitev izmikanja ali drugih kršitev.</li>
-      <li>E-poštni naslov, ki ga navedete, se lahko uporabi za pošiljanje informacij, obvestil o drugih osebah, ki komunicirajo z vašo vsebino ali pošiljanju sporočil, ter za odzivanje na poizvedbe in/ali druge zahteve ali vprašanja.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Kako zaščitimo vaše podatke?</h3>
-
-      <p>Za ohranitev varnosti vaših osebnih podatkov izvajamo različne varnostne ukrepe, ko vnašate, pošiljate ali dostopate do vaših osebnih podatkov. Med drugim je seja brskalnika, pa tudi promet med vašimi aplikacijami in API-jem zaščitena s SSL-jem, geslo pa je zgoščeno z uporabo močnega enosmernega algoritma. Če želite omogočiti varen dostop do računa, lahko omogočite dvofaktorsko preverjanje pristnosti.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Kakšna je naša politika hrambe podatkov?</h3>
-
-      <p>Prizadevali si bomo za:</p>
-
-      <ul>
-      <li>Shranjevanje dnevnike strežnikov, ki vsebujejo naslov IP vseh zahtev za ta strežnik, če so hranjeni, največ 90 dni.</li>
-      <li>Obdržiitev naslovov IP, povezane z registriranimi uporabniki, ne več kot 12 mesecev.</li>
-      </ul>
-
-      <p>Lahko zahtevate in prenesete arhiv vaše vsebine, vključno z objavami, predstavnostnimi prilogami, sliko profila in sliko glave.</p>
-
-      <p>Račun lahko kadar koli nepovratno izbrišete.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Ali uporabljamo piškotke?</h3>
-
-      <p>Da. Piškotki so majhne datoteke, ki jih spletno mesto ali njegov ponudnik storitev prenese na trdi disk vašega računalnika prek spletnega brskalnika (če dovolite). Ti piškotki omogočajo, da spletno mesto prepozna vaš brskalnik in ga, če imate registriran račun, povežete z vašim registriranim računom.</p>
-
-      <p>Piškotke uporabljamo za razumevanje in shranjevanje vaših nastavitev za prihodnje obiske.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Ali razkrivamo informacije zunanjim strankam?</h3>
-
-      <p>Vaših osebnih podatkov ne prodajamo, preprodajamo ali kako drugače posredujemo zunanjim osebam. To ne vključuje zaupanja vrednih tretjih oseb, ki nam pomagajo pri upravljanju naše spletne strani, vodenju našega poslovanja ali storitev, če se te strani strinjajo, da bodo te informacije zaupne. Vaše podatke lahko tudi objavimo, če menimo, da je objava ustrezna in v skladu z zakonom, uveljavlja pravilnike o spletnih mestih ali ščiti naše ali druge pravice, lastnino ali varnost.</p>
-
-      <p>Vaše javne vsebine lahko prenesejo drugi strežniki v omrežju. Vaše objave in objave samo za sledilce so dostavljene na strežnike, na katerih prebivajo vaši sledilci, in neposredna sporočila so dostavljena na strežnike prejemnikov, če so ti sledilci ali prejemniki na drugem strežniku.</p>
-
-      <p>Ko odobrite aplikacijo za uporabo vašega računa, lahko glede na obseg dovoljenj, ki jih odobravate, dostopa do vaših javnih podatkov o profilu, seznama osebam, ki jim sledite, vaših sledilcev, seznamov, vseh vaših objav in priljubljenih. Aplikacije ne morejo nikoli dostopati do vašega e-poštnega naslova ali gesla.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Uporaba strani s strani otrok</h3>
-
-      <p>Če je ta strežnik v EU ali EEA: Naše spletno mesto, izdelki in storitve so namenjeni ljudem, ki so stari vsaj 16 let. Če ste mlajši od 16 let, po zahtevah GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) ne uporabljajte tega spletnega mesta.</p>
-
-      <p>Če je ta strežnik v ZDA Naše spletno mesto, izdelki in storitve so namenjeni ljudem, ki so stari vsaj 13 let. Če ste mlajši od 13 let, po zahtevah COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) ne uporabljajte tega spletnega mesta.</p>
-
-      <p>Če je ta strežnik v drugi jurisdikciji, so lahko zakonske zahteve drugačne.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Spremembe našega pravilnika o zasebnosti</h3>
-
-      <p>Če se odločimo za spremembo našega pravilnika o zasebnosti, bomo te spremembe objavili na tej strani.</p>
-
-      <p>Ta dokument je CC-BY-SA. Zadnja posodobitev je bila 7. marca 2018.</p>
-
-      <p>Prvotno je bila prilagojena v skladu s <a href="https://github.com/discourse/discourse">pravilnikom o zasebnosti diskurza</a>.</p>
-    title: "%{instance} Pogoji storitve in pravilnik o zasebnosti"
+  strikes:
+    errors:
+      too_late: Prepozno je, da bi se pritožili na ta ukrep
+  tags:
+    does_not_match_previous_name: se ne ujema s prejšnjim imenom
   themes:
     contrast: Mastodon (Visok kontrast)
     default: Mastodon (Temna)
     mastodon-light: Mastodon (Svetla)
+  time:
+    formats:
+      default: "%b %d %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
+    add: Dodaj
     disable: Onemogoči
+    disabled_success: Dvofaktorsko preverjanje pristnosti je uspešno onemogočeno
+    edit: Uredi
     enabled: Dvofaktorsko preverjanje pristnosti je omogočeno
     enabled_success: Dvofaktorsko preverjanje pristnosti je uspešno omogočeno
     generate_recovery_codes: Ustvari kode za obnovitev
     lost_recovery_codes: Obnovitvene kode vam omogočajo, da ponovno pridobite dostop do svojega računa, če izgubite telefon. Če ste izgubili obnovitvene kode, jih lahko obnovite tukaj. Vaše stare obnovitvene kode bodo neveljavne.
+    methods: Dvofaktorske metode
+    otp: Avtentikacijska aplikacija
     recovery_codes: Varnostna kopija obnovitvenih kod
     recovery_codes_regenerated: Obnovitvene kode so bile uspešno regenerirane
     recovery_instructions_html: Če kdaj izgubite dostop do telefona, lahko uporabite eno od spodnjih obnovitvenih kod, da ponovno pridobite dostop do svojega računa. <strong>Shranite obnovitvene kode</strong>. Lahko jih natisnete in shranite z drugimi pomembnimi dokumenti.
+    webauthn: Varnostni ključi
   user_mailer:
+    appeal_approved:
+      action: Pojdite na svoj račun
+      explanation: Pritožbi na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bilo ugodeno. Vaš račun je znova nesporen.
+      subject: Vaši pritožbi z dne %{date} je bilo ugodeno
+      title: Pritožbi ugodeno
+    appeal_rejected:
+      explanation: Pritožba na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bila zavrnjena.
+      subject: Vaša pritožba z dne %{date} je bila zavrnjena
+      title: Pritožba zavrnjena
     backup_ready:
       explanation: Zahtevali ste popolno varnostno kopijo računa Mastodon. Zdaj je pripravljen za prenos!
       subject: Vaš arhiv je pripravljen za prenos
       title: Prevzem arhiva
+    suspicious_sign_in:
+      change_password: spremenite svoje geslo
+      details: 'Tukaj so podrobnosti prijave:'
+      explanation: Zaznali smo prijavo v vaš račun z novega naslova IP.
+      further_actions_html: Če to niste bili vi, priporočamo da takoj ukrepate (%{action}) in omogočite dvo-ravensko overjanje (2FA), da ohranite račun varen.
+      subject: Do vašega računa je bil opravljen dostop z novega naslova IP
+      title: Nova prijava
     warning:
+      appeal: Pošlji pritožbo
+      appeal_description: Če menite, da gre za napako, lahko pošljete pritožbo osebju %{instance}.
+      categories:
+        spam: Neželeno
+        violation: Vsebina krši naslednja navodila skupnosti
       explanation:
-        disable: Medtem ko je vaš račun zamrznjen, podatki vašega računa ostanejo nedotaknjeni, vendar ne morete izvajati nobenih dejanj, dokler ga ne odklenete.
-        silence: Medtem ko je vaš račun omejen, bodo na tem strežniku videli vaše tute samo osebe, ki vam že sledijo in morda boste izključeni iz različnih javnih seznamov. Vendar vam lahko še vedno ročno sledijo drugi.
-        suspend: Vaš račun je bil začasno ukinjen, vsi vaši tuti in naložene predstavnostne datoteke so bili nepovratno odstranjeni s tega strežnika in strežnikov, kjer ste imeli sledilce.
-      review_server_policies: Preglejte pravilnike strežnika
+        delete_statuses: Za nekatere vaših objav se je izkazalo, da kršijo eno ali več pravil skupnosti, zato so jih moderatorji %{instance} posledično odstranili.
+        disable: Svojega računa ne morete več uporabljati, vendar vaš profil in drugi podatki ostajajo nedotaknjeni. Zahtevate lahko varnostno kopiranje svojih podatkov, spremenite nastavitve računa ali izbrišete svoj račun.
+        mark_statuses_as_sensitive: Nekatere vaše objave so moderatorji %{instance} označili kot občutljive. To pomeni, da se bodo morale osebe dotakniti medijskih vsebin v objavah, preden se prikaže predogled. Med objavljanjem v prihodnosti lahko sami označite medijske vsebine kot občutljive.
+        sensitive: Odslej bodo vse vaše naložene medijske datoteke označene kot občutljive in skrite za opozorilom, ki ga je potrebno klikniti.
+        silence: Še vedno lahko uporabljate svoj račun, vendar bodo samo osebe, ki vas že spremljajo, videle vaše objave na tem strežniku in morda boste izključeni iz različnih funkcij odkrivanja. Vendar vam lahko drugi še vedno ročno sledijo.
+        suspend: Ne morete več uporabljati svojega računa, vaš profil in drugi podatki pa niso več dostopni. Še vedno se lahko prijavite in zahtevate varnostno kopijo svojih podatkov, dokler podatki niso v celoti odstranjeni v približno 30 dneh, vendar bomo ohranili nekaj osnovnih podatkov, da preprečimo, da bi se izognili suspenzu.
+      reason: 'Razlog:'
+      statuses: 'Citirane objave:'
       subject:
+        delete_statuses: Vaše objave na %{acct} so bile odstranjene
         disable: Vaš račun %{acct} je zamrznjen
+        mark_statuses_as_sensitive: Vaše objave na računu %{acct} so bile označene kot občutljive
         none: Opozorila za %{acct}
+        sensitive: Vaše objave na računu %{acct} bodo odslej označene kot občutljive
         silence: Vaš račun %{acct} je omejen
         suspend: Vaš račun %{acct} je suspendiran
       title:
+        delete_statuses: Objave odstranjene
         disable: Račun je zamrznjen
+        mark_statuses_as_sensitive: Objave, označene kot občuljive
         none: Opozorilo
+        sensitive: Račun je označen kot občutljiv
         silence: Račun je omejen
         suspend: Račun je suspendiran
     welcome:
       edit_profile_action: Nastavitve profila
-      edit_profile_step: Profil lahko prilagodite tako, da naložite podobo, glavo, spremenite prikazno ime in drugo. Če želite pregledati nove sledilce, preden jim dovolite sledenje, lahko zaklenete svoj račun.
+      edit_profile_step: Profil lahko prilagodite tako, da naložite sliko profila, spremenite pojavno ime in drugo. Lahko izberete, da želite pregledati nove sledilce, preden jim dovolite sledenje.
       explanation: Tu je nekaj nasvetov za začetek
       final_action: Začnite objavljati
-      final_step: 'Začnite objavljati! Tudi brez sledilcev bodo vaša javna sporočila videli drugi, na primer na lokalni časovnici in v ključnikih. Morda se želite predstaviti s ključnikom #introductions.'
+      final_step: 'Začnite objavljati! Tudi brez sledilcev bodo vaše javne objave videli drugi, npr. na krajevni časovnici ali v ključnikih. Morda se želite predstaviti s ključnikom #introductions.'
       full_handle: Vaša polna ročica
       full_handle_hint: To bi povedali svojim prijateljem, da vam lahko pošljejo sporočila ali vam sledijo iz drugega strežnika.
-      review_preferences_action: Spremenite nastavitve
-      review_preferences_step: Poskrbite, da določite svoje nastavitve, na primer, katera e-poštna sporočila želite prejemati ali katere privzete ravni zasebnosti bodo imele vaše objave. Če nimate potovalne slabosti, lahko omogočite samodejno predvajanje GIF-ov.
       subject: Dobrodošli na Mastodon
-      tip_federated_timeline: Združena časovnica je pogled na mrežo Mastodona. Vključuje pa samo ljudi, na katere so naročeni vaši sosedje, zato ni popolna.
-      tip_following: Privzeto sledite skrbnikom strežnika. Če želite najti več zanimivih ljudi, preverite lokalne in združene časovnice.
-      tip_local_timeline: Lokalna časovnica je strežniški pogled ljudi na %{instance}. To so vaši neposredni sosedje!
-      tip_mobile_webapp: Če vam mobilni brskalnik ponuja, da dodate Mastodon na domači zaslon, lahko prejmete potisna obvestila. Deluje kot lastna aplikacija na več načinov!
-      tips: Nasveti
       title: Dobrodošli, %{name}!
   users:
     follow_limit_reached: Ne morete spremljati več kot %{limit} ljudi
@@ -964,3 +1714,20 @@ sl:
   verification:
     explanation_html: '<strong>V metapodatkih svojega profila se lahko potrdite kot lastnik povezav</strong>. Za to mora povezano spletno mesto vsebovati povezavo do vašega Mastodon profila. Povezava <strong>mora</strong> imeti atribut <code>el="me"</code>. Vsebina besedila povezave ni pomembna. Tukaj je primer:'
     verification: Potrditev
+  webauthn_credentials:
+    add: Dodaj nov varnostni ključ
+    create:
+      error: Pri dodajanju vašega varnostnega ključa je prišlo do težav. Poskusite znova.
+      success: Vaš varnostni ključ je bil uspešno dodan.
+    delete: Izbriši
+    delete_confirmation: Ali ste prepričani, da želite izbrisati ta varnostni ključ?
+    description_html: Če omogočite <strong>overjanje z varnostnim ključem</strong>, boste morali ob prijavi uporabiti enega od svojih varnostnih ključev.
+    destroy:
+      error: Pri brisanju vašega varnostnega ključa je prišlo do težav. Poskusite znova.
+      success: Vaš varnostni ključ je bil uspešno izbrisan.
+    invalid_credential: Neveljaven varnostni ključ
+    nickname_hint: Vnesite vzdevek svojega novega varnostnega ključa
+    not_enabled: Niste še omogočili WebAuthn
+    not_supported: Ta brskalnik ne podpira varnostnih ključev
+    otp_required: Za uporabo varnostnih ključev morate najprej omogočiti 2FA (dvostopenjsko overjanje).
+    registered_on: Datum registracije %{date}
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index b3aeea9cd..8b46063a7 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1,92 +1,27 @@
 ---
 sq:
   about:
-    about_hashtag_html: Këto janë mesazhe publike të etiketuara me <strong>#%{hashtag}</strong>. Mundeni të ndërveproni me ta, nëse keni një llogari kudo qoftë në fedivers.
     about_mastodon_html: 'Rrjeti shoqëror i së ardhmes: Pa reklama, pa survejim nga korporata, konceptim etik dhe decentralizim! Jini zot i të dhënave tuaja, me Mastodon-in!'
-    about_this: Mbi
-    active_count_after: aktive
-    active_footnote: Përdorues Aktivë Mujorë (PAM)
-    administered_by: 'Administruar nga:'
-    api: API
-    apps: Aplikacione për celular
-    apps_platforms: Përdoreni Mastodon-in prej iOS-i, Android-i dhe platformash të tjera
-    browse_directory: Shfletoni një drejtori profilesh dhe filtrojeni sipas interesash
-    browse_local_posts: Shfletoni një rrjedhë të drejtpërdrejtë postimesh publike nga ky shërbyes
-    browse_public_posts: Shfletoni një rrjedhë të drejtpërdrejtë postimesh publike në Mastodon
-    contact: Kontakt
     contact_missing: I parregulluar
     contact_unavailable: N/A
-    discover_users: Zbuloni përdorues
-    documentation: Dokumentim
-    federation_hint_html: Me një llogari në %{instance}, do të jeni në gjendje të ndiqni persona në çfarëdo shërbyesi Mastodon dhe më tej.
-    get_apps: Provoni një aplikacion për celular
     hosted_on: Mastodon i strehuar në %{domain}
-    instance_actor_flash: |
-      Kjo llogari është një aktor virtual i përdorur për të përfaqësuar vetë shërbyesin dhe jo ndonjë përdorues individual.
-      Përdoret për qëllime federimi dhe s’duhet bllokuar, veç në daçi të bllokoni krejt instancën, me ç’rast do të duhej të përdornit bllokim përkatësie.
-    learn_more: Mësoni më tepër
-    privacy_policy: Rregulla privatësie
-    rules: Rregulla shërbyesi
-    rules_html: 'Më poshtë keni një përmbledhje të rregullave që duhet të ndiqni, nëse doni të keni një llogari në këtë shërbyes Mastodon:'
-    see_whats_happening: Shihni ç'ndodh
-    server_stats: 'Statistika shërbyesi:'
-    source_code: Kod burim
-    status_count_after:
-      one: mesazh
-      other: mesazhe
-    status_count_before: Që kanë krijuar
-    tagline: Ndiqni shokë dhe zbuloni të rinj
-    terms: Kushte shërbimi
-    unavailable_content: Shërbyes të moderuar
-    unavailable_content_description:
-      domain: Shërbyes
-      reason: Arsye
-      rejecting_media: 'Kartelat media prej këtyre shërbyesve s’do të përpunohen apo depozitohen, dhe s’do të shfaqet ndonjë miniaturë, duke kërkuar kështu doemos klikim dorazi te kartela origjinale:'
-      rejecting_media_title: Media e filtruar
-      silenced: 'Postimet prej këtyre shërbyesve do të jenë të fshehura në rrjedha kohore dhe biseda publike, dhe prej ndërveprimeve të përdoruesve të tyre s’do të prodhohen njoftime, veç në i ndjekshi:'
-      silenced_title: Shërbyes të heshtuar
-      suspended: 'S’do të përpunohen, depozitohen apo shkëmbehen të dhëna prej këtyre shërbyesve, duke e bërë të pamundur çfarëdo ndërveprimi apo komunikimi me përdorues prej këtyre shërbyesve:'
-      suspended_title: Shërbyes të pezulluar
-    unavailable_content_html: Mastodon-i përgjithësisht ju lejon të shihni lëndë nga përdorues dhe të ndërveproni me të tillë prej cilitdo shërbyes në fedivers. Këto janë përjashtimet që janë bërë në këtë shërbyes.
-    user_count_after:
-      one: përdorues
-      other: përdorues
-    user_count_before: Shtëpi e
-    what_is_mastodon: Ç’është Mastodon-i?
+    title: Mbi
   accounts:
-    choices_html: 'Zgjedhje të %{name}:'
-    endorsements_hint: Mund t’i mbështesni personat që nga ndërfaqja web, dhe do të shfaqen këtu.
-    featured_tags_hint: Mund të zgjidhni hashtag-ë të veçantë që do të shfaqen këtu.
     follow: Ndiqeni
     followers:
       one: Ndjekës
       other: Ndjekës
     following: Ndjekje
     instance_actor_flash: Kjo llogari është një aktor virtual, i përdorur për të përfaqësuar vetë shërbyesin dhe jo ndonjë përdorues individual. Përdoret për qëllime federimi dhe s’duhet pezulluar.
-    joined: U bë pjesë më %{date}
     last_active: aktiv së fundi
     link_verified_on: Pronësia e kësaj lidhjeje qe kontrolluar më %{date}
-    media: Media
-    moved_html: "%{name} ka kaluar te %{new_profile_link}:"
-    network_hidden: Këto të dhëna s’janë të passhme
-    never_active: Kurrë
     nothing_here: S’ka gjë këtu!
-    people_followed_by: Persona të ndjekur nga %{name}
-    people_who_follow: Persona që ndjekin %{name}
     pin_errors:
       following: Personin që doni të pasqyroni, duhet ta keni ndjekur tashmë
     posts:
       one: Mesazh
       other: Mesazhe
     posts_tab_heading: Mesazhe
-    posts_with_replies: Mesazhe dhe përgjigje
-    roles:
-      admin: Përgjegjës
-      bot: Robot
-      group: Grup
-      moderator: Moderator
-    unavailable: Profil jashtë funksionimi
-    unfollow: Resht së ndjekuri
   admin:
     account_actions:
       action: Kryeje veprimin
@@ -94,26 +29,30 @@ sq:
     account_moderation_notes:
       create: Lini një shënim
       created_msg: Shënimi i moderimit u krijua me sukses!
-      delete: Fshije
       destroyed_msg: Shënimi i moderimit u asgjësua me sukses!
     accounts:
       add_email_domain_block: Blloko përkatësi email
       approve: Miratojeni
-      approve_all: Miratojini krejt
       approved_msg: U miratua me sukses aplikimi për regjistrim të %{username}
       are_you_sure: Jeni i sigurt?
       avatar: Avatar
       by_domain: Përkatësi
       change_email:
-        changed_msg: Email-i i llogarisë u ndryshua me sukses!
+        changed_msg: Email-i u ndryshua me sukses!
         current_email: Email-i i tanishëm
         label: Ndrysho email-in
         new_email: Email i ri
         submit: Ndrysho email-in
         title: Ndrysho email-in për %{username}
+      change_role:
+        changed_msg: Roli u ndryshua me sukses!
+        label: Ndryshoni rol
+        no_role: Pa rol
+        title: Ndryshoni rolin për %{username}
       confirm: Ripohojeni
       confirmed: U ripohua
       confirming: Po ripohohet
+      custom: Vetjake
       delete: Fshiji të dhënat
       deleted: U fshi
       demote: Zhgradoje
@@ -153,7 +92,7 @@ sq:
         active: Aktiv
         all: Krejt
         pending: Pezull
-        silenced: Të heshtuara
+        silenced: I kufizuar
         suspended: Të pezulluara
         title: Moderim
       moderation_notes: Shënime moderimesh
@@ -161,9 +100,14 @@ sq:
       most_recent_ip: IP-ja më e freskët
       no_account_selected: S’u ndryshua ndonjë llogari, ngaqë s’u përzgjodh ndonjë
       no_limits_imposed: Pa imponim kufijsh
+      no_role_assigned: Pa rol të caktuar
       not_subscribed: Jo i pajtuar
       pending: Në pritje të shqyrtimit
       perform_full_suspension: Pezulloje
+      previous_strikes: Paralajmërime të mëparshme
+      previous_strikes_description_html:
+        one: Kjo llogari ka <strong>një</strong> paralajmërim.
+        other: Kjo llogari ka <strong>%{count}</strong> paralajmërime.
       promote: Promovojeni
       protocol: Protokoll
       public: Publike
@@ -171,8 +115,9 @@ sq:
       redownload: Rifresko profilin
       redownloaded_msg: Profili i %{username} u rifreskua me sukses prej origjinës
       reject: Hidhe tej
-      reject_all: Hidhi krejt tej
       rejected_msg: Aplikimi për regjistrim i %{username} u hodh poshtë me sukses
+      remote_suspension_irreversible: Të dhënat e kësaj llogarie janë fshirë në mënyrë të pakthyeshme.
+      remote_suspension_reversible_hint_html: Llogaria është pezulluar në shërbyesit e tyre dhe të dhënat do të hiqen plotësisht më %{date}. Deri atëherë, shërbyesi i largët mund të rikthejë këtë llogari pa u cënuar. Nëse dëshironi të hiqen menjëherë të dhënat e llogarisë, mund ta bëni më poshtë.
       remove_avatar: Hiqe avatarin
       remove_header: Hiqe kryen
       removed_avatar_msg: U hoq me sukses figura e avatarit të %{username}
@@ -184,21 +129,15 @@ sq:
       reset: Riktheje te parazgjedhjet
       reset_password: Ricaktoni fjalëkalimin
       resubscribe: Ripajtohuni
-      role: Leje
-      roles:
-        admin: Përgjegjës
-        moderator: Moderator
-        staff: Staf
-        user: Përdorues
+      role: Rol
       search: Kërkoni
       search_same_email_domain: Të tjerë përdorues me të njëjtën përkatësi email-i
       search_same_ip: Të tjerë përdorues me të njëjtën IP
       security_measures:
         only_password: Vetëm fjalëkalim
         password_and_2fa: Fjalëkalim dhe 2FA
-        password_and_sign_in_token: Fjalëkalim dhe token email-i
       sensitive: Rezervat
-      sensitized: iu vu shenjë si rezervat
+      sensitized: Iu vu shenjë si rezervat
       shared_inbox_url: URL kutie të përbashkët mesazhesh
       show:
         created_reports: Ka bërë raportime
@@ -206,12 +145,15 @@ sq:
       silence: Heshtoje
       silenced: E heshtuar
       statuses: Gjendje
+      strikes: Ndëshkime të mëparshme
       subscribe: Pajtomë
+      suspend: Pezulloje
       suspended: Të pezulluara
       suspension_irreversible: Të dhënat e kësaj llogarie janë fshirë në mënyrë të pakthyeshme. Mund ta shpezulloni llogarinë, për ta bërë të përdorshme, por kjo s’do të kthejë ndonjë të dhënë që kihej më parë.
       suspension_reversible_hint_html: Llogaria është pezulluar, dhe të dhënat do të hiqen plotësisht më %{date}. Deri atëherë, llogaria mund të rikthehet pa ndonjë zarar. Nëse doni të hiqen menjëherë krejt të dhënat e llogarisë, këtë mund ta bëni më poshtë.
-      time_in_queue: Pritje në radhë %{time}
       title: Llogari
+      unblock_email: Zhbllokoje adresën email
+      unblocked_email_msg: U zhbllokua me sukses adresa email e %{username}
       unconfirmed_email: Email i paripohuar
       undo_sensitized: Hiqja shenjën si rezervat
       undo_silenced: Zhbëje heshtjen
@@ -226,26 +168,34 @@ sq:
       whitelisted: Lejuar për federim
     action_logs:
       action_types:
+        approve_appeal: Miratojeni Apelimin
+        approve_user: Miratoje Përdoruesin
         assigned_to_self_report: Caktoji Raportim
         change_email_user: Ndrysho Email për Përdoruesin
+        change_role_user: Ndryshoni Rol Përdoruesi
         confirm_user: Ripohoje Përdoruesin
         create_account_warning: Krijo Sinjalizim
         create_announcement: Krijoni Lajmërim
+        create_canonical_email_block: Krijoni Bllokim Email-esh
         create_custom_emoji: Krijo Emotikon Vetjak
         create_domain_allow: Krijo Lejim Përkatësie
         create_domain_block: Krijo Bllokim Përkatësie
         create_email_domain_block: Krijo Bllokim Përkatësie Email-esh
         create_ip_block: Krijoni Rregull IP
         create_unavailable_domain: Krijo Përkatësi të Papërdorshme
+        create_user_role: Krijoni Rol
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
+        destroy_canonical_email_block: Fshi Bllokim El-esh
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim Përkatësie
         destroy_domain_block: Fshi Bllokim Përkatësie
         destroy_email_domain_block: Fshi bllokim përkatësie email-esh
+        destroy_instance: Spastroje Përkatësinë
         destroy_ip_block: Fshini Rregull IP
         destroy_status: Fshi Gjendje
         destroy_unavailable_domain: Fshi Përkatësi të Papërdorshme
+        destroy_user_role: Asgjësoje Rolin
         disable_2fa_user: Çaktivizo 2FA-në
         disable_custom_emoji: Çaktivizo Emotikon Vetjak
         disable_sign_in_token_auth_user: Çaktivizo Mirëfilltësim me Token Email-i për Përdoruesin
@@ -255,42 +205,56 @@ sq:
         enable_user: Aktivizo Përdorues
         memorialize_account: Bëje Llogari Përkujtimore
         promote_user: Promovojeni Përdoruesin
+        reject_appeal: Hidheni Poshtë Apelimin
+        reject_user: Hidhe Poshtë Përdoruesin
         remove_avatar_user: Hiqe Avatarin
         reopen_report: Rihape Raportimin
+        resend_user: Ridërgo Email Ripohimi
         reset_password_user: Ricaktoni Fjalëkalimin
         resolve_report: Zgjidhe Raportimin
         sensitive_account: I vini shenjë si rezervat medias në llogarinë tuaj
         silence_account: Heshtoje Llogarinë
         suspend_account: Pezulloje Llogarinë
         unassigned_report: Hiqe Caktimin e Raportimit
+        unblock_email_account: Zhbllokoje adresën email
         unsensitive_account: Hiqjani shenjën si rezervat medias në llogarinë tuaj
         unsilence_account: Hiqe Heshtimin e Llogarisë
         unsuspend_account: Hiqe Pezullimin e Llogarisë
         update_announcement: Përditëso Lajmërimin
         update_custom_emoji: Përditëso Emoxhi Vetjake
         update_domain_block: Përditëso Bllok Përkatësish
+        update_ip_block: Përditësoni rregull IP
         update_status: Përditëso Gjendjen
+        update_user_role: Përditësoni Rol
       actions:
+        approve_appeal_html: "%{name} miratoi apelim vendimi moderimi nga %{target}"
+        approve_user_html: "%{name} miratoi regjistrim nga %{target}"
         assigned_to_self_report_html: "%{name} ia kaloi raportimin %{target} në ngarkim vetvetes"
         change_email_user_html: "%{name} ndryshoi adresën email të përdoruesit %{target}"
+        change_role_user_html: "%{name} ndryshoi rolin e %{target}"
         confirm_user_html: "%{name} ripohoi adresën email të përdoruesit %{target}"
         create_account_warning_html: "%{name} dërgoi një sinjalizim për %{target}"
         create_announcement_html: "%{name} krijoi lajmërim të ri për %{target}"
+        create_canonical_email_block_html: "%{name} bllokoi email-in me hashin %{target}"
         create_custom_emoji_html: "%{name} ngarkoi emoxhi të ri %{target}"
         create_domain_allow_html: "%{name} lejoi federim me përkatësinë %{target}"
         create_domain_block_html: "%{name} bllokoi përkatësinë %{target}"
         create_email_domain_block_html: "%{name} bllokoi përkatësinë email %{target}"
         create_ip_block_html: "%{name} krijoi rregull për IP-në %{target}"
         create_unavailable_domain_html: "%{name} ndali dërgimin drejt përkatësisë %{target}"
+        create_user_role_html: "%{name} krijoi rolin %{target}"
         demote_user_html: "%{name} zhgradoi përdoruesin %{target}"
         destroy_announcement_html: "%{name} fshiu lajmërimin për %{target}"
-        destroy_custom_emoji_html: "%{name} asgjësoi emoxhin %{target}"
+        destroy_canonical_email_block_html: "%{name} zhbllokoi email-n me hashin %{target}"
+        destroy_custom_emoji_html: "%{name} fshiu emoji-n %{target}"
         destroy_domain_allow_html: "%{name} hoqi lejimin për federim me %{target}"
         destroy_domain_block_html: "%{name} zhbllokoi përkatësinë %{target}"
         destroy_email_domain_block_html: "%{name} hoqi bllokimin për përkatësinë email %{target}"
+        destroy_instance_html: "%{name} spastroi përkatësinë %{target}"
         destroy_ip_block_html: "%{name} fshiu rregull për IP-në %{target}"
         destroy_status_html: "%{name} hoqi gjendje nga %{target}"
         destroy_unavailable_domain_html: "%{name} rinisi dërgimin drejt përkatësisë %{target}"
+        destroy_user_role_html: "%{name} fshiu rolin %{target}"
         disable_2fa_user_html: "%{name} çaktivizoi domosdoshmërinë për dyfaktorësh për përdoruesin %{target}"
         disable_custom_emoji_html: "%{name} çaktivizoi emoxhin %{target}"
         disable_sign_in_token_auth_user_html: "%{name} çaktivizo mirëfilltësim me token email-i për %{target}"
@@ -300,22 +264,28 @@ sq:
         enable_user_html: "%{name} aktivizoi hyrje për përdoruesin %{target}"
         memorialize_account_html: "%{name} e shndërroi llogarinë e %{target} në një faqe përkujtimore"
         promote_user_html: "%{name} gradoi përdoruesin %{target}"
+        reject_appeal_html: "%{name} hodhi poshtë apelim vendimi moderimi nga %{target}"
+        reject_user_html: "%{name} hodhi poshtë regjistrimin nga %{target}"
         remove_avatar_user_html: "%{name} hoqi avatarin e %{target}"
         reopen_report_html: "%{name} rihapi raportimin %{target}"
+        resend_user_html: "%{name} ridërgoi email ripohimi për %{target}"
         reset_password_user_html: "%{name} ricaktoi fjalëkalimi për përdoruesin %{target}"
         resolve_report_html: "%{name} zgjidhi raportimin %{target}"
         sensitive_account_html: "%{name} i vuri shenjë si rezervat medias në %{target}"
         silence_account_html: "%{name} heshtoi llogarinë e %{target}"
         suspend_account_html: "%{name} pezulloi llogarinë e %{target}"
         unassigned_report_html: "%{name} rihapi raportimin %{target}"
+        unblock_email_account_html: "%{name} zhbllokoi adresën email të %{target}"
         unsensitive_account_html: "%{name} ia hoqi shenjën si rezervat medias në %{target}"
         unsilence_account_html: "%{name} hoqi heshtimin për llogarinë %{target}"
         unsuspend_account_html: "%{name} hoqi pezullimin për llogarinë e %{target}"
         update_announcement_html: "%{name} përditësoi lajmërimin %{target}"
         update_custom_emoji_html: "%{name} përditësoi emoxhin %{target}"
         update_domain_block_html: "%{name} përditësoi bllokimin e përkatësish për %{target}"
+        update_ip_block_html: "%{name} ndryshoi rregull për IP-në %{target}"
         update_status_html: "%{name} përditësoi gjendjen me %{target}"
-      deleted_status: "(fshiu gjendjen)"
+        update_user_role_html: "%{name} ndryshoi rolin për %{target}"
+      deleted_account: fshiu llogarinë
       empty: S’u gjetën regjistra.
       filter_by_action: Filtroji sipas veprimit
       filter_by_user: Filtroji sipas përdoruesit
@@ -354,11 +324,12 @@ sq:
       enable: Aktivizoje
       enabled: I aktivizuar
       enabled_msg: Ai emoxhi u aktivizua me sukses
-      image_hint: PNG deri 50KB
+      image_hint: PNG ose GIF deri në %{size}
       list: Vëre në listë
       listed: Në listë
       new:
         title: Shtoni emoxhi të ri vetjak
+      no_emoji_selected: S’u ndryshuan emoxhi, ngaqë s’qe përzgjedhur i tillë
       not_permitted: S’keni leje të kryeni këtë veprim
       overwrite: Mbishkruaje
       shortcode: Kod i shkurtër
@@ -376,6 +347,18 @@ sq:
       media_storage: Depozitë media
       new_users: përdorues të rinj
       opened_reports: raportime të hapur
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelim pezull"
+        other: "<strong>%{count}</strong> apelime pezull"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> raportim pezull"
+        other: "<strong>%{count}</strong> raportime pezull"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag pezull"
+        other: "<strong>%{count}</strong> hashtag-ë pezull"
+      pending_users_html:
+        one: "<strong>%{count}</strong> përdorues pezull"
+        other: "<strong>%{count}</strong> përdorues pezull"
       resolved_reports: raportime të zgjidhur
       software: Software
       sources: Burime regjistrimi
@@ -384,10 +367,16 @@ sq:
       top_languages: Gjuhët aktive kryesuese
       top_servers: Shërbyesit aktivë kryesues
       website: Sajt
+    disputes:
+      appeals:
+        empty: S’u gjetën apelime.
+        title: Apelime
     domain_allows:
       add_new: Shtoje përkatësinë në listë lejimesh
       created_msg: Përkatësia u shtua me sukses në listë lejimesh
       destroyed_msg: Përkatësia u hoq nga listë lejimesh
+      export: Eksportim
+      import: Importim
       undo: Hiqe nga listë lejimesh
     domain_blocks:
       add_new: Shtoni bllokim të ri përkatësie
@@ -395,16 +384,21 @@ sq:
       destroyed_msg: Bllokimi i përkatësisë u hoq
       domain: Përkatësi
       edit: Përpunoni bllokim përkatësie
+      existing_domain_block: Keni vendosur tashmë kufizime më të rrepta mbi %{name}.
       existing_domain_block_html: Keni vendosur tashmë kufizime më të rrepta mbi %{name}, lypset ta <a href="%{unblock_url}">zhbllokoni</a> së pari.
+      export: Eksportim
+      import: Importim
       new:
         create: Krijoni bllokim
         hint: Bllokimi i përkatësisë nuk do të pengojë krijim zërash llogarie te baza e të dhënave, por do të aplikojë në mënyrë retroaktive dhe të vetvetishme metoda specifike moderimi mbi këto llogari.
         severity:
-          desc_html: "<strong>Heshtja</strong> do t’i bëjë postimet e llogarisë të padukshme për këdo që nuk i ndjek ato. <strong>Pezullimi</strong> do të heqë krejt lëndën e llogarisë, media, dhe të dhëna profili. Përdorni <strong>Asnjë</strong>, nëse thjesht doni të mos pranohen kartela media."
+          desc_html: "<strong>Kufizoje</strong> do t’i bëjë postimet prej llogarish në këtë përkatësi të padukshme për këtë që nuk i ndjek. <strong>Pezulloje</strong> do të heqë nga shërbyesi juaj krejt lëndën, media dhe të dhëna profili për llogaritë e kësaj përkatësie. Përdorni <strong>Asnjë</strong>, nëse doni thjesht të hidhni tej kartela media."
           noop: Asnjë
-          silence: Heshtoji
+          silence: Kufizoje
           suspend: Pezulloje
         title: Bllokim i ri përkatësie
+      no_domain_block_selected: S’u ndryshuan bllokime përkatësish, ngaqë s’u përzgjodh ndonjë i tillë
+      not_permitted: S’keni leje të kryeni këtë veprim
       obfuscate: Errësoje emrin e përkatësisë
       obfuscate_hint: Errësoje pjesërisht emrin e përkatësisë te lista, nëse është aktivizuar publikimi i listës së kufizimeve të përkatësive
       private_comment: Koment privat
@@ -415,34 +409,41 @@ sq:
       reject_media_hint: Heq kartela media të depozituara lokalisht dhe nuk pranon të shkarkohen të tilla në të ardhmen. Pa peshë për pezullimet
       reject_reports: Hidh tej raportimet
       reject_reports_hint: Shpërfillini krejt raportimet e ardhura nga kjo përkatësi. Pa peshë për pezullimet
-      rejecting_media: mospranim kartelash media
-      rejecting_reports: mospranim raportimesh
-      severity:
-        silence: e heshtuar
-        suspend: e pezulluar
-      show:
-        affected_accounts:
-          one: Pat ndikim te një llogari në bazën e të dhënave
-          other: Pat ndikim te %{count} llogari në bazën e të dhënave
-        retroactive:
-          silence: Hiqu heshtimin krejt llogarive ekzistuese nga kjo përkatësi
-          suspend: Hiqu pezullimin krejt llogarive ekzistuese nga kjo përkatësi
-        title: Zhbëje bllokimin e përkatësisë për %{domain}
-        undo: Zhbëje
       undo: Zhbëje bllokimin e përkatësisë
       view: Shihni bllokim përkatësie
     email_domain_blocks:
       add_new: Shtoni të ri
+      attempts_over_week:
+        one: "%{count} përpjekje gjatë javës së shkuar"
+        other: "%{count} përpjekje regjistrimi gjatë javës së kaluar"
       created_msg: Përkatësia email u shtua me sukses te lista e bllokimeve
       delete: Fshije
-      destroyed_msg: Përkatësia email u fshi me sukses nga lista e bllokimeve
+      dns:
+        types:
+          mx: Zë MX
       domain: Përkatësi
-      empty: S’ka përkatësi email në ndonjë listë bllokimesh.
-      from_html: nga %{domain}
       new:
         create: Shtoni përkatësi
+        resolve: Ftilloje përkatësinë
         title: Zë i ri email në listë bllokimesh
+      no_email_domain_block_selected: S’u ndryshuan blloqe përkatësish email, ngaqë s’qe përzgjedhur ndonjë
+      resolved_dns_records_hint_html: Emri i përkatësisë jep u përket përkatësive vijuese MX, që janë përgjegjëset për pranim email-esh. Bllokimi i një përkatësie MX do të bllokojë regjistrime nga çfarëdo adrese email që përdor të njëjtën përkatësi MX, edhe nëse emri i dukshëm i përkatësisë është i ndryshëm. <strong>Jini i kujdesshëm të mos bllokoni shërbime të njohur email-esh.</strong>
+      resolved_through_html: Zgjidhur përmes %{domain}
       title: Listë bllokimesh email-esh
+    export_domain_allows:
+      new:
+        title: Impotoni lejime përkatësish
+      no_file: S’u përzgjodh kartelë
+    export_domain_blocks:
+      import:
+        description_html: Ju ndan një hap nga importimi i një liste bllokimesh përkatësish. Ju lutemi, shqyrtojeni këtë listë me shumë kujdes, sidomos nëse këtë listë s’e keni krijuar ju.
+        existing_relationships_warning: Marrëdhënie ekzistuese ndjekjeje
+        private_comment_description_html: 'Për t’ju ndihmuar të ndiqni se nga vijnë bllokimet e importuara, këto do të krijohen me komentin vijues privat: <q>%{comment}</q>'
+        private_comment_template: Importuar nga %{source} më %{date}
+        title: Importoni bllokime përkatësish
+      new:
+        title: Importoni bllokime përkatësish
+      no_file: S’u përzgjodh kartelë
     follow_recommendations:
       description_html: "<strong>Rekomandimet për ndjekje ndihmojnë përdoruesit e rinj të gjejnë shpejt lëndë me interes</strong>. Kur një përdorues nuk ka ndërvepruar mjaftueshëm me të tjerët, që të formohen rekomandime të personalizuara ndjekjeje, rekomandohen këto llogari. Ato përzgjidhen çdo ditë, prej një përzierje llogarish me shkallën më të lartë të angazhimit dhe numrin më të lartë të ndjekësve vendorë për një gjuhë të dhënë."
       language: Për gjuhën
@@ -452,25 +453,52 @@ sq:
       title: Rekomandime ndjekjeje
       unsuppress: Rikthe rekomandime ndjekjeje
     instances:
+      availability:
+        description_html:
+          one: Nëse dhënia e mesazheve te përkatësia dështon për <strong>%{count} ditë</strong> pa sukses, s’do të bëhen përpjekje të tjera për dhënie, veç në u marrtë një dërgim <em>prej</em> përkatësisë.
+          other: Nëse dhënia e mesazheve te përkatësia dështon për <strong>%{count} ditë</strong> pa sukses, s’do të bëhen përpjekje të tjera për dhënie, veç në u marrtë një dërgim <em>prej</em> përkatësisë.
+        failure_threshold_reached: U mbërrit në prag dështimesh më %{date}.
+        failures_recorded:
+          one: Përpjekje e dështuar në %{count} ditë.
+          other: Përpjekje e dështuar në %{count} ditë të ndryshme.
+        no_failures_recorded: S’ka dështime të regjistruara.
+        warning: Përpjekja e fundit për t’u lidhur me këtë shërbyes ka qenë e pasuksesshme
       back_to_all: Krejt
       back_to_limited: E kufizuar
       back_to_warning: Kujdes
       by_domain: Përkatësi
+      confirm_purge: Jeni i sigurt se doni të fshihen përgjithmonë të dhënat prej kësaj përkatësie?
+      content_policies:
+        comment: Shënim i brendshëm
+        description_html: Mund të përkufizoni rregulla lënde që do të zbatohen mbi krejt llogaritë prej kësaj përkatësie dhe cilësdo nënpërkatësi të saj.
+        policies:
+          reject_media: Mos prano media
+          reject_reports: Hidh tej raportimet
+          silence: Kufizoje
+          suspend: Pezulloje
+        policy: Rregulla
+        reason: Arsye publike
+        title: Rregulla lënde
+      dashboard:
+        instance_accounts_dimension: Llogaritë më të ndjekura
+        instance_accounts_measure: llogari të depozituara
+        instance_followers_measure: ndjekës tanët atje
+        instance_follows_measure: ndjekës të tyre këtu
+        instance_languages_dimension: Gjuhë kryesuese
+        instance_media_attachments_measure: bashkëngjitje media të depozituara
+        instance_reports_measure: raportime rreth tyre
+        instance_statuses_measure: postime të depozituara
       delivery:
         all: Krejt
         clear: Spastro gabime dërgimi
+        failing: Dështim
         restart: Rinis dërgimin
         stop: Ndale dërgimin
-        title: Dërgim
         unavailable: Jo i passhëm
-        unavailable_message: Dërgim jo i passhëm
-        warning: Kujdes
-        warning_message:
-          one: Dështim dërgimi %{count} ditë
-          other: Dështim dërgimi %{count} ditë
       delivery_available: Ka shpërndarje të mundshme
       delivery_error_days: Ditë gabimi dështimi
       delivery_error_hint: Nëse dërgimi s’është i mundshëm për %{count} ditë, do t’i vihet shenjë automatikisht si i padërgueshëm.
+      destroyed_msg: Të dhënat prej %{domain} tani janë vënë në radhë për fshirje të menjëhershme.
       empty: S’u gjetën përkatësi.
       known_accounts:
         one: "%{count} llogari e njohur"
@@ -481,12 +509,15 @@ sq:
         title: Moderim
       private_comment: Koment privat
       public_comment: Koment publik
+      purge: Spastroje
+      purge_description_html: Nëse besoni se kjo përkatësi është përgjithnjë e mbyllur, mund të fshini prej hapësirës tuaj të depozitimit krejt regjistrimet dhe të dhëna të përshoqëruara me llogarinë. Kjo mund të zgjasë ca.
       title: Federim
       total_blocked_by_us: Bllokuar nga ne
       total_followed_by_them: Ndjekur prej tyre
       total_followed_by_us: Ndjekur nga ne
       total_reported: Raportime rreth tyre
       total_storage: Bashkëngjitje media
+      totals_time_period_hint_html: Vlerat e shfaqura më poshtë përfshijnë të dhënat për krejt kohën.
     invites:
       deactivate_all: Çaktivizoji krejt
       filter:
@@ -510,8 +541,6 @@ sq:
         title: Krijoni rregull IP të ri
       no_ip_block_selected: S’u ndryshua ndonjë rregull IP, ngaqë s’u përzgjodh ndonjë i tillë
       title: Rregulla IP
-    pending_accounts:
-      title: Llogari pezull (%{count})
     relationships:
       title: Marrëdhënie të %{acct}
     relays:
@@ -538,39 +567,119 @@ sq:
         notes:
           one: "%{count} shënim"
           other: "%{count} shënime"
-        reports:
-          one: "%{count} raportim"
-          other: "%{count} raportime"
+      action_log: Auditim regjistri
       action_taken_by: Veprimi i ndërmarrë nga
+      actions:
+        delete_description_html: Postimet e raportuara do të fshihen dhe do të regjistrohet një paralajmërim, për t’ju ndihmuar të përshkallëzoni hapat në rast shkeljesh të ardhme nga e njëjta llogari.
+        mark_as_sensitive_description_html: Medias te postimet e raportuara do t’i vihet shenjë si me spec dhe për të do të regjistrohet një paralajmërim, për t’ju ndihmuar të përshkallëzoni masat tuaja mbi shkelje të ardhshme nga e njëjta llogari.
+        other_description_html: Shihni më tepër mundësi për kontroll të sjelljes së një llogari dhe përshtatni komunikimin me llogarinë e raportuar.
+        resolve_description_html: Ndaj llogarisë së raportuar nuk do të ndërmerret ndonjë veprim, s’do të regjistrohet ndonjë paralajmërim dhe raporti do të mbyllet.
+        silence_description_html: Profili do të jetë i dukshëm vetëm për ata që e ndjekin tashmë, ose që e kërkojnë dorazi, duke reduktuar rëndë përhapjen e tij. Mundet përherë të prapakthehet.
+        suspend_description_html: Profili dhe krej lënda e tij do të bëhen të papërdorshëm, deri sa më në fund të fshihet. Ndërveprimi me llogarinë do të jetë i pamundur. E prapakthyeshme brenda 30 ditësh.
+      actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
+      add_to_report: Shtoni më tepër te raportimi
       are_you_sure: A jeni i sigurt?
       assign_to_self: Caktojani vetes
       assigned: Iu caktua moderator
+      by_target_domain: Përkatësi e llogarisë së raportuar
+      category: Kategori
+      category_description_html: Arsyeja pse kjo llogari dhe/ose lëndë raportohet do të citohet te komunikimi me llogarinë e raportuar
       comment:
         none: Asnjë
+      comment_description_html: 'Për të dhënë më tepër informacion, %{name} shkroi:'
       created_at: Raportuar më
+      delete_and_resolve: Fshiji postimet
       forwarded: U përcoll
       forwarded_to: U përcoll te %{domain}
       mark_as_resolved: Vëri shenjë si i zgjidhur
+      mark_as_sensitive: Vëri shenjë si rezervat
       mark_as_unresolved: Vëri shenjë si të pazgjidhur
+      no_one_assigned: Askush
       notes:
         create: Shtoni shënim
         create_and_resolve: Zgjidhe me shënim
         create_and_unresolve: Rihape me shënim
         delete: Fshije
         placeholder: Përshkruani ç’veprime janë ndërmarrë, ose çfarëdo përditësimi tjetër që lidhet me të…
+        title: Shënime
+      notes_description_html: Shihni dhe lini shënime për moderatorët e tjerë dhe për veten në të ardhmen
+      quick_actions_description_html: 'Kryeni një veprim të shpejtë, ose rrëshqitni poshtë për të parë lëndën e raportuar:'
+      remote_user_placeholder: përdoruesi i largët prej %{instance}
       reopen: Rihape raportimin
       report: 'Raportim #%{id}'
       reported_account: Llogari e raportuar
       reported_by: Raportuar nga
       resolved: I zgjidhur
       resolved_msg: Raportimi u zgjidh me sukses!
+      skip_to_actions: Kaloni te veprimet
       status: Gjendje
-      target_domain: Përkatësi e llogarisë së raportuar
+      statuses: Lëndë e raportuar
+      statuses_description_html: Lënda problematike do të citohet në komunikimin me llogarinë e raportuar
       target_origin: Origjinë e llogarisë së raportuar
       title: Raportime
       unassign: Hiqja
       unresolved: Të pazgjidhur
       updated_at: U përditësua më
+      view_profile: Shihni profilin
+    roles:
+      add_new: Shtoni rol
+      assigned_users:
+        one: "%{count} përdorues"
+        other: "%{count} përdorues"
+      categories:
+        administration: Administrim
+        invites: Ftesa
+        moderation: Moderim
+        special: Special
+      delete: Fshije
+      description_html: Me <strong>role përdoruesi</strong>, mund të përshtatni cilat funksione dhe fusha të Mastodon-it mund të përdorin përdoruesit tuaj.
+      edit: Përpunoni rolin e '%{name}'
+      everyone: Leje parazgjedhje
+      everyone_full_description_html: Ky është <strong>roli bazë</strong> që prek <strong>krejt përdoruesit</strong>, madje edhe ata pa një rol të caktuar. Krejt rolet e tjerë trashëgojnë lejet prej tij.
+      permissions_count:
+        one: "%{count} leje"
+        other: "%{count} leje"
+      privileges:
+        administrator: Përgjegjës
+        administrator_description: Përdoruesit me këtë leje do të anashkalojnë çdo leje
+        delete_user_data: Të Fshijë të Dhëna Përdoruesi
+        delete_user_data_description: U lejon përdoruesve të fshijnë pa humbur kohë të dhëna përdoruesish të tjerë
+        invite_users: Të Ftojë Përdorues
+        invite_users_description: U lejon përdruesve të ftojë te shërbyesi persona të rinj
+        manage_announcements: Të Administrojë Njoftime
+        manage_announcements_description: U lejon përdoruesve të administrojë njoftime te shërbyesi
+        manage_appeals: Të Administrojë Apelime
+        manage_appeals_description: U lejon përdoruesve të shqyrtojnë apelime kundër veprimesh moderimi
+        manage_blocks: Të Administrojë Bllokim
+        manage_blocks_description: U lejon përdoruesve të bllokojnë shërbime email dhe adresa IP
+        manage_custom_emojis: Të Administrojë Emoxhi Vetjake
+        manage_custom_emojis_description: U lejon përdoruesve të administrojnë te shërbyesi emoxhi vetjake
+        manage_federation: Të Administrjë Federim
+        manage_federation_description: U lejon përdoruesve të bllokojnë ose lejojnë federim me përkatësi të tjera dhe të kontrollojnë shpërndarjen
+        manage_invites: Të Administrojë Ftesa
+        manage_invites_description: U lejon përdoruesve të shfletojnë dhe çaktivizojnë lidhje ftesash
+        manage_reports: Të Administrojë Raportime
+        manage_reports_description: U lejon përdruesve të shqyrtojnë raportime dhe kryejnë veprime moderimi ndaj tyre
+        manage_roles: Të Administrojë Role
+        manage_roles_description: U lejon përdoruesve të administrojnë dhe caktojnë role nën të tyret
+        manage_rules: Të Administrojë Rregulla
+        manage_rules_description: U lejon përdoruesve të ndryshojnë rregulla shërbyesi
+        manage_settings: Të Administrojë Rregullime
+        manage_settings_description: U lejon përdoruesve të ndryshojnë rregullime sajti
+        manage_taxonomies: Të Administrojë Klasifikime
+        manage_taxonomies_description: U lejon përdoruesve të shqyrtojnë lëndë në modë dhe të përditësojnë rregullime hashtag-ësh
+        manage_user_access: Të Administrojë Hyrje Përdoruesi
+        manage_user_access_description: U lejon përdoruesve të çaktivizojnë mirëfilltësim dyfaktorësh për përdorues të tjerë, të ndryshojnë adresa të tyret email dhe të ricaktojnë fjalëkalimet e tyre
+        manage_users: Të Administrojë Përdorues
+        manage_users_description: U lejon përdoruesve të shohin hollësi përdoruesish të tjerë dhe të kryejnë veprime moderimi mbi ta
+        manage_webhooks: Të Administrojë Webhook-e
+        manage_webhooks_description: U lejon përdoruesve të ujdisin webhook-e për veprime administrative
+        view_audit_log: Shihni Regjistër Auditimesh
+        view_audit_log_description: U lejon përdoruesve të shohin një historik veprimesh administrative te shërbyesi
+        view_dashboard: Shihni Pultin
+        view_dashboard_description: U lejon përdoruesve të hyjnë te pulti dhe shohin shifra të ndryshme matjesh
+        view_devops_description: U lejon përdoruesve të hyjnë në pultet Sidekiq dhe pgHero
+      title: Role
     rules:
       add_new: Shtoni rregull
       delete: Fshije
@@ -579,142 +688,200 @@ sq:
       empty: S’janë përcaktuar ende rregulla shërbyesi.
       title: Rregulla shërbyesi
     settings:
-      activity_api_enabled:
-        desc_html: Numër postimesh të postuara lokalisht, përdorues aktivë, dhe regjistrime të reja në kosha javorë
-        title: Botoni statistika përmbledhëse mbi veprimtarinë e përdoruesve te API
-      bootstrap_timeline_accounts:
-        desc_html: Emrat e përdoruesve ndajini prej njëri-tjetrit me presje. Për këto llogari do të garantohet shfaqja te rekomandime ndjekjeje
-        title: Rekomandoji këto llogari për përdorues të rinj
-      contact_information:
-        email: Email biznesi
-        username: Emër përdoruesi kontakti
-      custom_css:
-        desc_html: Ndryshojeni pamjen me CSS të ngarkuar në çdo faqe
-        title: CSS Vetjake
+      about:
+        manage_rules: Administroni rregulla shërbyesi
+        preamble: Jepni informacion të hollësishëm rreth se si mbahet në punë, si moderohet dhe si financohet shërbyesi.
+        rules_hint: Ka një zonë enkas për rregulla me të cilat pritet që përdoruesit tuaj të pajtohen.
+        title: Mbi
+      appearance:
+        preamble: Përshtatni ndërfaqen web të Mastodon-it.
+        title: Dukje
+      branding:
+        preamble: Elementët e markës të shërbyesit tuaj e dallojnë atë nga shërbyes të tjerë në rrjet. Këto hollësi mund të shfaqen në një larmi mjedisesh, bie fjala, në ndërfaqen web të Mastodon-it, aplikacione për platforma të ndryshme, në paraparje lidhjesh në sajte të tjerë dhe brenda aplikacionesh për shkëmbim mesazhesh, e me radhë. Për këtë arsyes, më e mira është që këto hollësi të jenë të qarta, të shkurtra dhe të kursyera.
+        title: Elementë marke
+      content_retention:
+        preamble: Kontrolloni se si depozitohen në Mastodon lënda e prodhuar nga përdoruesit.
+        title: Mbajtje lënde
       default_noindex:
-        desc_html: Prek krejt përdoruesi që s’e kanë ndryshuar vetë këtë rregullim
-        title: Lejo, si parazgjedhje, lënien e përdoruesve jashtë indeksimi nga motorë kërkimesh
+        desc_html: Prek krejt përdoruesit që s’e kanë ndryshuar vetë këtë rregullim
+        title: Lëri, si parazgjedhje, përdoruesit jashtë indeksimi nga motorë kërkimesh
+      discovery:
+        follow_recommendations: Rekomandime ndjekjeje
+        preamble: Shpërfaqja e lëndës interesante është me rëndësi kyçe për mirëseardhjen e përdoruesve të rinj që mund të mos njohin njeri në Mastodon. Kontrolloni se si funksionojnë në shërbyesin tuaj veçori të ndryshme zbulimi.
+        profile_directory: Drejtori profilesh
+        public_timelines: Rrjedha kohore publike
+        title: Zbulim
+        trends: Në modë
       domain_blocks:
         all: Për këdo
         disabled: Për askënd
-        title: Shfaq bllokime përkatësish
         users: Për përdorues vendorë që kanë bërë hyrjen
-      domain_blocks_rationale:
-        title: Shfaq arsye
-      hero:
-        desc_html: E shfaqur në faqen ballore. Këshillohet të paktën 600x100px. Kur nuk caktohet gjë, përdoret miniaturë e shërbyesit
-        title: Figurë heroi
-      mascot:
-        desc_html: E shfaqur në faqe të shumta. Këshillohet të paktën 293x205. Kur nuk caktohet gjë, përdoret simboli parazgjedhje
-        title: Figurë simboli
-      peers_api_enabled:
-        desc_html: Emra përkatësish që ka hasur në fedivers ky shërbyes
-        title: Boto listë shërbyesish të gjetur
-      preview_sensitive_media:
-        desc_html: Në sajte të tjera, paraparjet e lidhjeve do të shfaqin një miniaturë, edhe pse medias i është vënë shenjë si rezervat
-        title: Shfaq në paraparje OpenGraph media me shenjën rezervat
-      profile_directory:
-        desc_html: Lejoju përdoruesve të jenë të zbulueshëm
-        title: Aktivizo drejtori profilesh
       registrations:
-        closed_message:
-          desc_html: E shfaqur në faqen ballore, kur regjistrimet janë të mbyllura. Mund të përdorni etiketa HTML
-          title: Mesazh mbylljeje regjistrimesh
-        deletion:
-          desc_html: Lejo këdo të fshijë llogarinë e vet
-          title: Hapni fshirje llogarie
-        min_invite_role:
-          disabled: Asnjë
-          title: Lejo ftesa nga
-        require_invite_text:
-          desc_html: Kur regjistrimet lypin miratim dorazi, tekstin e kërkesës për ftesë “Pse doni të merrni pjesë?” bëje të detyrueshëm, në vend se opsional
-          title: Kërkoju përdoruesve të rinj të plotësojnë doemos një tekst kërkese për ftesë
+        preamble: Kontrolloni cilët mund të krijojnë llogari në shërbyesin tuaj.
+        title: Regjistrime
       registrations_mode:
         modes:
           approved: Për regjistrim, lypset miratimi
           none: S’mund të regjistrohet ndokush
           open: Mund të regjistrohet gjithkush
-        title: Mënyrë regjistrimi
-      show_known_fediverse_at_about_page:
-        desc_html: Kur përdoret, do të shfaqë mesazhe prej krejt fediversit të njohur, si paraparje. Përndryshe do të shfaqë vetëm mesazhe vendore
-        title: Përfshi lëndë të federuar në faqe rrjedhe publike kohore të pamirëfilltësuar
-      show_staff_badge:
-        desc_html: Shfaq një stemë stafi në faqen e një përdoruesi
-        title: Shfaq stemë stafi
-      site_description:
-        desc_html: Paragraf hyrës te faqja ballore. Përshkruani ç’e bën special këtë shërbyes Mastodon dhe çfarëdo gjëje tjetër të rëndësishme. Mund të përdorni etiketa HTML, veçanërisht <code>&lt;a&gt;</code> dhe <code>&lt;em&gt;</code>.
-        title: Përshkrim shërbyesi
-      site_description_extended:
-        desc_html: Një vend i mirë për kodin e sjelljes në shërbyesin tuaj, rregulla, udhëzime dhe gjëra të tjera që e bëjnë të veçantë këtë shërbyes. Mund të përdorni etiketa HTML
-        title: Informacion i zgjeruar vetjak
-      site_short_description:
-        desc_html: E shfaqur në anështyllë dhe etiketa meta. Përshkruani në një paragraf të vetëm ç’është Mastodon-i dhe ç’e bën special këtë shërbyes. Në u lëntë i zbrazët, për shërbyesin do të përdoret përshkrimi parazgjedhje.
-        title: Përshkrim i shkurtër shërbyesi
-      site_terms:
-        desc_html: Mund të shkruani rregullat tuaja të privatësisë, kushtet e shërbimit ose gjëra të tjera ligjore. Mund të përdorni etiketa HTML
-        title: Kushte vetjake shërbimi
-      site_title: Emër shërbyesi
-      thumbnail:
-        desc_html: I përdorur për paraparje përmes OpenGraph-it dhe API-t. Këshillohet 1200x630px
-        title: Miniaturë shërbyesi
-      timeline_preview:
-        desc_html: Shfaqni lidhje te rrjedhë kohore publike në faqen hyrëse dhe lejoni te rrjedhë kohore publike hyrje API pa mirëfilltësim
-        title: Lejo në rrjedhë kohore publike hyrje pa mirëfilltësim
-      title: Rregullime sajti
-      trendable_by_default:
-        desc_html: Prek hashtag-ë që nuk kanë qenë të palejuar më parë
-        title: Lejo hashtag-ë në prirje pa paraparje paraprake
-      trends:
-        desc_html: Shfaqni publikisht hashtag-ë të shqyrtuar më parë që janë popullorë tani
-        title: Hashtag-ë popullorë tani
+      title: Rregullime Shërbyesi
     site_uploads:
       delete: Fshi kartelën e ngarkuar
       destroyed_msg: Ngarkimi në sajt u fshi me sukses!
     statuses:
+      account: Autor
+      application: Aplikacion
       back_to_account: Mbrapsht te faqja e llogarisë
+      back_to_report: Mbrapsht te faqja e raportimit
       batch:
-        delete: Fshije
-        nsfw_off: Vëri shenjë si jo rezervat
-        nsfw_on: Vëri shenjë si rezervat
+        remove_from_report: Hiqe prej raportimit
+        report: Raportojeni
       deleted: E fshirë
-      failed_to_execute: S’u arrit të përmbushej
+      favourites: Të parapëlqyer
+      history: Historik versioni
+      in_reply_to: Përgjigje për
+      language: Gjuhë
       media:
         title: Media
-      no_media: S’ka media
+      metadata: Tejtëdhëna
       no_status_selected: S’u ndryshua ndonjë gjendje, ngaqë s’u përzgjodh ndonjë e tillë
+      open: Hape postimin
+      original_status: Postim origjinal
+      reblogs: Riblogime
+      status_changed: Postimi ndryshoi
       title: Gjendje llogarish
+      trending: Në modë
+      visibility: Dukshmëri
       with_media: Me media
+    strikes:
+      actions:
+        delete_statuses: "%{name} fshiu postime të %{target}"
+        disable: "%{name} ngriu postime të %{target}"
+        mark_statuses_as_sensitive: "%{name} u vuri shenjë postimeve të %{target} si rezervat"
+        none: "%{name} dërgoi një sinjalizim për %{target}"
+        sensitive: "%{name} i vuri shenjë llogarisë së %{target} si rezervat"
+        silence: "%{name} e kufizoi llogarinë %{target}"
+        suspend: "%{name} e pezulloi llogarinë e %{target}"
+      appeal_approved: Apeluar
+      appeal_pending: Apelim pezull
     system_checks:
       database_schema_check:
         message_html: Ka migrime bazash të dhënash pezull. Ju lutemi, kryejini, për të qenë të sigurt se aplikacioni sillet siç priteet
+      elasticsearch_running_check:
+        message_html: S’u lidh dot me Elasticsearch. Ju lutemi, kontrolloni nëse ky xhiron, ose çaktivizoni kërkimin në tërë tekstin
+      elasticsearch_version_check:
+        message_html: 'Version Elasticsearch i papërputhshëm: %{value}'
+        version_comparison: Xhiron Elasticsearch %{running_version}, ndërkohë që është i domosdoshëm %{required_version}
       rules_check:
         action: Administroni rregulla shërbyesi
         message_html: S’keni përcaktuar ndonjë rregull shërbyesi.
       sidekiq_process_check:
         message_html: S’ka proces Sidekiq në punë për %{value} radhë. Ju lutemi, shqyrtoni formësimin tuaj për Sidekiq-un
     tags:
-      accounts_today: Përdorime unike sot
-      accounts_week: Përdorime unike këtë javë
-      breakdown: Përdorimi sot, analizuar sipas burimesh
-      last_active: Aktive së fundi më
-      most_popular: Më populloret
-      most_recent: Më të rejat
-      name: Hashtag
       review: Gjendje rishikimi
-      reviewed: E shqyrtuar
-      title: Hashtag-ë
-      trending_right_now: Popullore mu tani
-      unique_uses_today: "%{count} postime sot"
-      unreviewed: E pashqyrtuar
       updated_msg: Rregullimet për hashtag-ët u përditësuan me sukses
     title: Administrim
+    trends:
+      allow: Lejojeni
+      approved: Miratuar
+      disallow: Mos e lejo
+      links:
+        allow: Lejoje lidhjen
+        allow_provider: Lejoje botuesin
+        description_html: Këto janë lidhje që ndahen aktualisht shumë me llogari prej të cilave shërbyesi juaj sheh postime. Mund të ndihmojë përdoruesit tuaj të gjejnë se ç’po ndodh në botë. S’shfaqen lidhje publikisht, deri sa të miratoni botuesin. Mundeni edhe të lejoni ose hidhni poshtë lidhje individuale.
+        disallow: Hiq lejimin e lidhjes
+        disallow_provider: Mos e lejo botuesin
+        no_link_selected: S’u ndryshuan lidhje, ngaqë s’qe përzgjedhur e tillë
+        publishers:
+          no_publisher_selected: S’u ndryshuan botues, ngaqë s’qe përzgjedhur i tillë
+        shared_by_over_week:
+          one: Ndarë me të tjerë nga një person gjatë javës së kaluar
+          other: Ndarë me të tjerë nga %{count} vetë gjatë javës së kaluar
+        title: Lidhje në modë
+        usage_comparison: Ndarë %{today} herë sot, kundrejt %{yesterday} dje
+      only_allowed: Lejuar vetëm
+      pending_review: Në pritje të shqyrtimit
+      preview_card_providers:
+        allowed: Lidhje prej këtij botuesi mund të përdoren
+        description_html: Këto janë përkatësi prej të cilave ndahen shpesh lidhje në shërbyesin tuaj. Lidhjet nuk do të ofrohen publikisht, veç në u miratoftë përkatësia e lidhjes. Miratimi (ose hedhja poshtë) shtrihet edhe te nënpërkatësitë.
+        rejected: Lidhje prej këtij botuesi s’do të përdoren
+        title: Botues
+      rejected: Hedhur poshtë
+      statuses:
+        allow: Lejo postim
+        allow_account: Lejo autor
+        description_html: Këto janë postime të cilat shërbyesi juaj di se po ndahen shumë dhe po zgjidhen si të parapëlqyera për çastin. Mund të ndihmojnë përdoruesit tuaj të rinj dhe të riardhur të gjejnë më tepër vetë për të ndjekur. S’shfaqen postime publikisht, pa miratuar ju autorin dhe autori lejon që llogaria e tij t’u sugjerohet të tjerëve. Mundeni edhe të lejoni, ose hidhni, poshtë postime individuale.
+        disallow: Mos lejo postim
+        disallow_account: Mos lejo autor
+        no_status_selected: S’u ndryshuan postime në modë, ngaqë s’qe përzgjedhur i tillë
+        not_discoverable: Autori s’ka zgjedhur të jetë i zbulueshëm
+        shared_by:
+          one: Ndarë me të tjerë, ose shënuar si e parapëlqyer një herë
+          other: Ndarë me të tjerë, ose shënuar si e parapëlqyer %{friendly_count} herë
+        title: Postime në modë
+      tags:
+        current_score: Vlera aktuale %{score}
+        dashboard:
+          tag_accounts_measure: përdorime unike
+          tag_languages_dimension: Gjuhë kryesuese
+          tag_servers_dimension: Shërbyes kryesues
+          tag_servers_measure: shërbyes të ndryshëm
+          tag_uses_measure: përdorime gjithsej
+        description_html: Këta hashtag-ë aktualisht po shfaqen në një numër të madh postimesh që sheh shërbyesi juaj. Kjo mund të ndihmojë përdoruesit tuaj të gjejnë se për çfarë po flasin më shumë njerëzit aktualisht. Pa i miratuar ju, nuk shfaqen publikisht hashtag-ë.
+        listable: Mund të sugjerohet
+        no_tag_selected: S’u ndryshuan etiketa, ngaqë s’qe përzgjedhur e tillë
+        not_listable: S’do të sugjerohet
+        not_trendable: S’do të shfaqet nën të modës
+        not_usable: S’mund të përdoret
+        peaked_on_and_decaying: Kulmoi më %{date}, tani në rënie
+        title: Hashtag-ë në modë
+        trendable: Mund të shfaqet nën të modës
+        usable: Mund të përdoret
+        usage_comparison: Përdorur %{today} herë sot, krahasuar me %{yesterday} dje
+        used_by_over_week:
+          one: Përdorur nga një person gjatë javës së kaluar
+          other: Përdorur nga %{count} vetë gjatë javës së kaluar
+      title: Në modë
+      trending: Në modë
     warning_presets:
       add_new: Shtoni të ri
       delete: Fshije
       edit_preset: Përpunoni sinjalizim të paracaktuar
       empty: S’keni përcaktuar ende sinjalizime të gatshme.
       title: Administroni sinjalizime të paracaktuara
+    webhooks:
+      add_new: Shtoni pikëmbarim
+      delete: Fshije
+      description_html: Një <strong>webhook</strong> i bën të mundur Mastodon-it t’i dërgojë aplikacioni tuaj <strong>njoftime aty për aty</strong> rreth aktesh që keni zgjedhur, që kështu aplikacioni juaj të mund <strong>të prodhojë automatikisht reagime</strong>.
+      disable: Çaktivizoje
+      disabled: Të çaktivizuar
+      edit: Përpunoni pikëmbarim
+      empty: S’keni ende ndonjë pikëmbarim webhook të formësuar.
+      enable: Aktivizoje
+      enabled: Aktiv
+      enabled_events:
+        one: 1 akt i aktivizuar
+        other: "%{count}s akte të aktivizuar"
+      events: Akte
+      new: "<em>Webhook</em> i ri"
+      rotate_secret: Ciklo të fshehtën
+      secret: E fshehtë nënshkrimesh
+      status: Gjendje
+      title: Webhook-ë
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: fshirje e postimeve të tij
+        disable: ngrirje e llogarisë së tij
+        mark_statuses_as_sensitive: për ’i vënë shenjë postimeve të tyre si rezervat
+        none: një vërejtje
+        sensitive: vënie shenjë llogarisë së tij si rezervat
+        silence: kufizim i llogarisë së tij
+        suspend: pezullim i llogarisë së tij
+      body: "%{target} po apelon një vendim moderimi nga %{action_taken_by} të marrë më %{date}, që qe %{type}. Shkruan:"
+      next_steps: Apelimin mund të miratoni, që të zhbëhet vendimi i marrë, ose ta shpërfillni.
+      subject: "%{username} po apelon një vendim moderimi te %{instance}"
     new_pending_account:
       body: Hollësitë e llogarisë së re gjenden më poshtë. Mund ta miratoni ose hidhni poshtë këtë aplikim.
       subject: Llogari e re për shqyrtim në %{instance} (%{username})
@@ -722,9 +889,16 @@ sq:
       body: "%{reporter} ka raportuar %{target}"
       body_remote: Dikush nga %{domain} ka raportuar %{target}
       subject: Raportim i ri për %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Hashtag-u #%{name} është popullor sot, por s’është shqyrtuar më parë. S’do të shfaqet publikisht pa e lejuar ju, ose thjesht ruani formularin siç është, që të mos dëgjoni më për të.'
-      subject: Hashtag i ri për shqyrtim te %{instance} (#%{name})
+    new_trends:
+      body: 'Gjërat vijuese lypin një shqyrtim, përpara se të mund të shfaqen publikisht:'
+      new_trending_links:
+        title: Lidhje në modë
+      new_trending_statuses:
+        title: Postime në modë
+      new_trending_tags:
+        no_approved_tags: Aktualisht s’ka hashtag-ë në modë të miratuar.
+        title: Hashtag-ë në modë
+      subject: Gjëra të reja në modë për shqyrtim te %{instance}
   aliases:
     add_new: Krijo alias
     created_msg: U krijua me sukses alias i ri. Tani mund të filloni lëvizjen prej llogarisë së vjetër.
@@ -754,16 +928,13 @@ sq:
   applications:
     created: Aplikimi u krijua me sukses
     destroyed: Aplikimi u fshi me sukses
-    invalid_url: URL-ja e dhënë është e pavlefshme
     regenerate_token: Riprodho token hyrjesh
     token_regenerated: Token-i i hyrjeve u riprodhua me sukses
     warning: Bëni shumë kujdes me ato të dhëna. Mos ia jepni kurrë njeriu!
     your_token: Token-i juaj për hyrje
   auth:
-    apply_for_account: Kërko ftesë
+    apply_for_account: Kërkoni një llogari
     change_password: Fjalëkalim
-    checkbox_agreement_html: Pajtohem me <a href="%{rules_path}" target="_blank">rregullat e shërbyesit</a> dhe <a href="%{terms_path}" target="_blank">kushtet e shërbimit</a>
-    checkbox_agreement_without_rules_html: Pajtohem me <a href="%{terms_path}" target="_blank">kushtet e shërbimit</a>
     delete_account: Fshije llogarinë
     delete_account_html: Nëse dëshironi të fshihni llogarinë tuaj, mund <a href="%{path}">ta bëni që këtu</a>. Do t’ju kërkohet ta ripohoni.
     description:
@@ -776,11 +947,13 @@ sq:
     invalid_reset_password_token: Token-i i ricaktimit të fjalëkalimit është i pavlefshëm ose ka skaduar. Ju lutemi, kërkoni një të ri.
     link_to_otp: Jepni një kod mirëfilltësimi dyfaktorësh prej telefonit tuaj ose një kod rimarrjeje
     link_to_webauth: Përdorni pajisjen tuaj të kyçeve të sigurisë
+    log_in_with: Hyni me
     login: Hyni
     logout: Dalje
     migrate_account: Kaloni në një tjetër llogari
     migrate_account_html: Nëse doni ta ridrejtoni këtë llogari te një tjetër, këtë mund <a href="%{path}">ta formësoni këtu</a>.
     or_log_in_with: Ose bëni hyrjen me
+    privacy_policy_agreement_html: I kam lexuar dhe pajtohem me <a href="%{privacy_policy_path}" target="_blank">rregullat e privatësisë</a>
     providers:
       cas: CAS
       saml: SAML
@@ -788,20 +961,29 @@ sq:
     registration_closed: "%{instance} s’pranon anëtarë të rinj"
     resend_confirmation: Ridërgo udhëzime ripohimi
     reset_password: Ricaktoni fjalëkalimin
+    rules:
+      preamble: Këto vendosen dhe zbatimi i tyre është nën kujdesin e moderatorëve të %{domain}.
+      title: Disa rregulla bazë.
     security: Siguri
     set_new_password: Caktoni fjalëkalim të ri
     setup:
       email_below_hint_html: Nëse adresa email më poshtë s’është e saktë, mund ta ndryshoni këtu dhe të merrni një email të ri ripohimi.
       email_settings_hint_html: Email-i i ripohimit u dërgua te %{email}. Nëse ajo adresë email s’është e saktë, mund ta ndryshoni që nga rregullimet e llogarisë.
       title: Ujdisje
+    sign_in:
+      preamble_html: Hyni me kredencialet tuaja për te <strong>%{domain}</strong>. Nëse llogaria juaj strehohet në një tjetër shërbyes, s’do të jeni në gjendje të bëni hyrjen këtu.
+      title: Bëni hyrjen te %{domain}
+    sign_up:
+      preamble: Me një llogari në këtë shërbyes Mastodon, do të jeni në gjendje të ndiqni cilindo person tjetër në rrjet, pavarësisht se ku strehohet llogaria e tyre.
+      title: Le të ujdisim llogarinë tuaj në %{domain}.
     status:
       account_status: Gjendje llogarie
       confirming: Po pritet që të plotësohet ripohimi i email-it.
       functional: Llogaria juaj është tërësisht funksionale.
       pending: Aplikimi juaj është në pritje të shqyrtimit nga stafi ynë. Kjo mund të dojë ca kohë. Nëse aplikimi juaj miratohet, do të merrni një email.
       redirecting_to: Llogaria juaj është joaktive, ngaqë aktualisht ridrejton te %{acct}.
+      view_strikes: Shihni paralajmërime të dikurshme kundër llogarisë tuaj
     too_fast: Formulari u parashtrua shumë shpejt, riprovoni.
-    trouble_logging_in: Probleme me hyrjen?
     use_security_key: Përdor kyç sigurie
   authorize_follow:
     already_following: E ndiqni tashmë këtë llogari
@@ -859,10 +1041,36 @@ sq:
       more_details_html: Për më tepër hollësi, shihni <a href="%{terms_path}">rregulla privatësie</a>.
       username_available: Emri juaj i përdoruesit do të jetë sërish i passhëm
       username_unavailable: Emri juaj i përdoruesit do të mbetet i papërdorshëm
-  directories:
-    directory: Drejtori profilesh
-    explanation: Zbuloni përdorues bazuar në interesat e tyre
-    explore_mastodon: Eksploroni %{title}
+  disputes:
+    strikes:
+      action_taken: Vendim i marrë
+      appeal: Apelim
+      appeal_approved: Ky paralajmërim është apeluar me sukses dhe s’vlen më
+      appeal_rejected: Apelimi është hedhur poshtë
+      appeal_submitted_at: Apelimi u parashtrua
+      appealed_msg: Apelimi juaj u parashtruar. Nëse miratohet, do të njoftoheni.
+      appeals:
+        submit: Parashtroni apelim
+      approve_appeal: Miratoni apelimin
+      associated_report: Raportimi i përshoqëruar
+      created_at: Datuar
+      description_html: Këto janë veprime të ndërmara kundër llogarisë tuaj dhe sinjalizime që ju janë dërguar nga stafi i %{instance}.
+      recipient: Drejtuar
+      reject_appeal: Hidheni poshtë apelimin
+      status: "#%{id} postimi"
+      status_removed: Postim i hequr tashmë nga sistemi
+      title: "%{action} prej %{date}"
+      title_actions:
+        delete_statuses: Heqje postimi
+        disable: Ngrirje e llogarisë
+        mark_statuses_as_sensitive: Vënie shenjë postimeve si me spec
+        none: Vërejtje
+        sensitive: Vënie shenjë llogarive si me spec
+        silence: Kufizim llogarie
+        suspend: Pezullim llogarie
+      your_appeal_approved: Apelimi juaj u miratua
+      your_appeal_pending: Keni parashtruar një apelim
+      your_appeal_rejected: Apelimi juaj është hedhur poshtë
   domain_validator:
     invalid_domain: s’është emër i vlefshëm përkatësie
   errors:
@@ -911,56 +1119,69 @@ sq:
       public: Rrjedha kohore publike
       thread: Biseda
     edit:
+      add_keyword: Shtoni fjalëkyç
+      keywords: Fjalëkyçe
+      statuses: Postime individuale
+      statuses_hint_html: Ky filtër aplikohet për të përzgjedhur postime individuale, pavarësish se kanë apo jo përkim me fjalëkyçat më poshtë. <a href="%{path}">Shqyrtoni, ose hiqni postime prej filtrit</a>.
       title: Përpunoni filtër
     errors:
+      deprecated_api_multiple_keywords: Këta parametra s’mund të ndryshohen nga ky aplikacion, ngaqë aplikohen mbi më shumë se një fjalëkyç filtri. Përdorni një aplikacion më të ri, ose ndërfaqen web.
       invalid_context: Ose s’u dha fare, ose u dha kontekst i pavlefshëm
-      invalid_irreversible: Filtrim i pakthyeshëm funksionon vetëm me kontekste <em>home</em> ose njoftimesh
     index:
+      contexts: Filtra në %{contexts}
       delete: Fshije
       empty: S’keni filtra.
+      expires_in: Skadon për %{distance}
+      expires_on: Skadon më %{date}
+      keywords:
+        one: "%{count} fjalëkyç"
+        other: "%{count} fjalëkyçe"
+      statuses:
+        one: "%{count} postim"
+        other: "%{count} postime"
+      statuses_long:
+        one: "%{count} postim individual i fshehur"
+        other: "%{count} postime individuale të fshehur"
       title: Filtra
     new:
+      save: Ruani filtër të ri
       title: Shtoni filtër të ri
+    statuses:
+      back_to_filter: Mbrapsht te filtri
+      batch:
+        remove: Hiqe prej filtri
+      index:
+        hint: Ky filtër aplikohet për të përzgjedhur postime individuale, pavarësisht kriteresh të tjera. Që nga ndërfaqja web mund të shtoni më tepër postime te ky filtër.
+        title: Postime të filtruar
   footer:
-    developers: Zhvillues
-    more: Më tepër…
-    resources: Burime
     trending_now: Prirjet e tashme
   generic:
     all: Krejt
+    all_items_on_page_selected_html:
+      one: Në këtë faqe është i përzgjedhur <strong>%{count}</strong> objekt.
+      other: Në këtë faqe janë përzgjedhur krejt <strong>%{count}</strong> objektet.
+    all_matching_items_selected_html:
+      one: Është përzgjedhur <strong>%{count}</strong> objekt me përkim me kërkimin tuaj.
+      other: Janë përzgjedhur krejt <strong>%{count}</strong> objektet me përkim me kërkimin tuaj.
     changes_saved_msg: Ndryshimet u ruajtën me sukses!
     copy: Kopjoje
     delete: Fshije
-    no_batch_actions_available: Në këtë faqe s’ka veprime masive gati
+    deselect: Shpërzgjidhi krejt
+    none: Asnjë
     order_by: Renditi sipas
     save_changes: Ruaji ndryshimet
+    select_all_matching_items:
+      one: Përzgjidhni %{count} objekt me përkim me kërkimin tuaj.
+      other: Përzgjidhni krejt %{count} objektet me përkim me kërkimin tuaj.
+    today: sot
     validation_errors:
       one: Diçka s’është ende si duhet! Ju lutemi, shqyrtoni gabimin më poshtë
       other: Diçka s’është ende si duhet! Ju lutemi, shqyrtoni %{count} gabimet më poshtë
   html_validator:
     invalid_markup: 'përmban elementë HTML të pavlefshëm: %{error}'
-  identity_proofs:
-    active: Aktive
-    authorize: Po, autorizoje
-    authorize_connection_prompt: Të autorizohet kjo lidhje kriptografike?
-    errors:
-      failed: Lidhja kriptografike dështoi. Ju lutemi, riprovoni prej %{provider}.
-      keybase:
-        invalid_token: Token-ët Keybase janë hashe nënshkrimesh dhe duhet të jenë 66 shenja gjashtëmbëdhjetëshe
-        verification_failed: Keybase-i s’e njeh këtë token si një nënshkrim nga përdoruesi %{kb_username} i Keybase-it. Ju lutemi, riprovoni që prej Keybase-it.
-      wrong_user: S’mund të krijohet provë për %{proving} teksa është i futur si %{current}. Hyni si %{proving} dhe riprovoni.
-    explanation_html: Këtu mund të lidhni në mënyrë kriptografike identitetet tuaja të tjera prej platformash të tjera, bie fjala Keybase. Kjo u lejon të tjerëve t’ju dërgojnë mesazhe të fshehtëzuar në këto platforma dhe u lejon atyre të besojnë se lënda që u dërgoni vjen prej jush.
-    i_am_html: Jam %{username} në %{service}.
-    identity: Identitet
-    inactive: Jo aktiv
-    publicize_checkbox: 'Dhe cicëro këtë:'
-    publicize_toot: 'Është i provuar! Jam %{username} te %{service}: %{url}'
-    remove: Hiq provën prej llogarie
-    removed: Prova u hoq me sukses nga llogaria
-    status: Gjendje verifikimi
-    view_proof: Shihni provën
   imports:
     errors:
+      invalid_csv_file: 'Kartelë CSV e pavlefshme. Gabim: %{error}'
       over_rows_processing_limit: përmban më shumë se %{count} rreshta
     modes:
       merge: Përzieji
@@ -976,7 +1197,6 @@ sq:
       following: Listë ndjekjesh
       muting: Listë heshtimesh
     upload: Ngarkoje
-  in_memoriam_html: In Memoriam.
   invites:
     delete: Çaktivizoje
     expired: Ka skaduar
@@ -1055,18 +1275,14 @@ sq:
     carry_blocks_over_text: Ky përdorues lëvizi prej %{acct}, të cilin e keni bllokuar.
     carry_mutes_over_text: Ky përdorues lëvizi prej %{acct}, që e keni heshtuar.
     copy_account_note_text: 'Ky përdorues ka ikur prej %{acct}, ja ku janë shënimet tuaja të mëparshme mbi të:'
+  navigation:
+    toggle_menu: Shfaq/Fshih menunë
   notification_mailer:
-    digest:
-      action: Shihini krejt njoftimet
-      body: Ja një përmbledhje e shkurtër e mesazheve që keni humbur që nga vizita juaj e fundit më %{since}
-      mention: "%{name} ju ka përmendur te:"
-      new_followers_summary:
-        one: Veç kësaj, u bëtë me një ndjekës të ri, teksa s’ishit këtu! Ëhë!
-        other: Veç kësaj, u bëtë me %{count} ndjekës të rinj, teksa s’ishit këtu! Shkëlqyeshëm!
-      subject:
-        one: "1 njoftim i ri që nga vizita juaj e fundit \U0001F418"
-        other: "%{count} njoftime të reja që nga vizita juaj e fundit \U0001F418"
-      title: Gjatë mungesës tuaj…
+    admin:
+      report:
+        subject: "%{name} parashtroi një raportim"
+      sign_up:
+        subject: "%{name} u regjistrua"
     favourite:
       body: 'Gjendja juaj u parapëlqye nga %{name}:'
       subject: "%{name} parapëlqeu gjendjen tuaj"
@@ -1093,6 +1309,8 @@ sq:
       title: Përforcim i ri
     status:
       subject: "%{name} sapo postoi"
+    update:
+      subject: "%{name} përpunoi një postim"
   notifications:
     email_events: Akte për njoftim me email
     email_events_hint: 'Përzgjidhni akte për të cilët doni të merrni njoftime:'
@@ -1136,6 +1354,8 @@ sq:
     other: Tjetër
     posting_defaults: Parazgjedhje postimesh
     public_timelines: Rrjedha kohore publike
+  privacy_policy:
+    title: Rregulla Privatësie
   reactions:
     errors:
       limit_reached: U mbërrit në kufirin e reagimeve të ndryshme
@@ -1158,22 +1378,15 @@ sq:
     remove_selected_follows: Hiqe ndjekjen e përdoruesve të përzgjedhur
     status: Gjendje llogarie
   remote_follow:
-    acct: Jepni çiftin tuaj emërpërdoruesi@përkatësi prej të cilit doni që të veprohet
     missing_resource: S’u gjet dot URL-ja e domosdoshme e ridrejtimit për llogarinë tuaj
-    no_account_html: S’keni llogari? Mund të <a href='%{sign_up_path}' target='_blank'>regjistroheni këtu</a>
-    proceed: Ripohoni ndjekjen
-    prompt: 'Do të ndiqni:'
-    reason_html: "<strong>Pse është i domosdoshëm ky hap?</strong> <code>%{instance}</code> mund të mos jetë shërbyesi ku jeni regjistruar, ndaj na duhet t’ju ridrejtojmë së pari te shërbyesi juaj Home."
-  remote_interaction:
-    favourite:
-      proceed: Ripohoni parapëlqimin
-      prompt: 'Doni të parapëlqeni këtë mesazh:'
-    reblog:
-      proceed: Ripohoni përforcimin
-      prompt: 'Doni të përforconi këtë mesazh:'
-    reply:
-      proceed: Ripohoni përgjigjen
-      prompt: 'Doni t’i përgjigjeni këtij mesazhi:'
+  reports:
+    errors:
+      invalid_rules: s’i referohet ndonjë rregulli të vlefshëm
+  rss:
+    content_warning: 'Sinjalizim lënde:'
+    descriptions:
+      account: Postime publike prej @%{acct}
+      tag: 'Postime publike etiketuar me #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Keni tejkaluar kufirin e %{limit} mesazheve të planifikuara për atë ditë
     over_total_limit: Keni tejkaluar kufirin prej %{limit} mesazhesh të planifikuara
@@ -1183,7 +1396,7 @@ sq:
     browser: Shfletues
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1197,7 +1410,7 @@ sq:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: Shfletues UC
       weibo: Weibo
     current_session: Sesioni i tanishëm
     description: "%{browser} në %{platform}"
@@ -1206,7 +1419,7 @@ sq:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1232,7 +1445,6 @@ sq:
     edit_profile: Përpunoni profilin
     export: Eksportim të dhënash
     featured_tags: Hashtag-ë të zgjedhur
-    identity_proofs: Prova identiteti
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
@@ -1241,6 +1453,7 @@ sq:
     profile: Profil
     relationships: Ndjekje dhe ndjekës
     statuses_cleanup: Fshirje e automatizuar postimesh
+    strikes: Paralajmërime nga moderimi
     two_factor_authentication: Mirëfilltësim Dyfaktorësh
     webauthn_authentication: Kyçe sigurie
   statuses:
@@ -1257,18 +1470,19 @@ sq:
         other: "%{count} video"
     boosted_from_html: Përforcuar nga %{acct_link}
     content_warning: 'Sinjalizim lënde: %{warning}'
+    default_language: Njësoj me gjuhën e ndërfaqes
     disallowed_hashtags:
       one: 'përmbante një hashtag të palejuar: %{tags}'
       other: 'përmbante hashtag-ë të palejuar: %{tags}'
+    edited_at_html: Përpunuar më %{date}
     errors:
       in_reply_not_found: Gjendja të cilës po provoni t’i përgjigjeni s’duket se ekziston.
-    language_detection: Pikase gjuhën vetvetiu
     open_in_web: Hape në internet
     over_character_limit: u tejkalua kufi shenjash prej %{max}
     pin_errors:
+      direct: Postimet që janë të dukshme vetëm për përdoruesit e përmendur s’mund të fiksohen
       limit: Keni fiksuar tashmë numrin maksimum të mesazheve
       ownership: S’mund të fiksohen mesazhet e të tjerëve
-      private: S’mund të fiksohet mesazh jopublik
       reblog: S’mund të fiksohet një përforcim
     poll:
       total_people:
@@ -1319,6 +1533,7 @@ sq:
       '2629746': 1 muaj
       '31556952': 1 vit
       '5259492': 2 muaj
+      '604800': 1 javë
       '63113904': 2 vjet
       '7889238': 3 muaj
     min_age_label: Prag moshe
@@ -1330,91 +1545,11 @@ sq:
     pinned: Mesazh i fiksuar
     reblogged: të përforcuara
     sensitive_content: Lëndë rezervat
+  strikes:
+    errors:
+      too_late: Është shumë vonë për apelim të këtij paralajmërimi
   tags:
     does_not_match_previous_name: s’përputhet me emrin e mëparshëm
-  terms:
-    body_html: |
-      <h2>Rregulla Privatësie</h2>
-      <h3 id="collect">Ç’të dhëna grumbullojmë?</h3>
-
-      <ul>
-      <li><em>Të dhëna bazë llogarie</em>: Nëse regjistroheni në këtë shërbyes, mund t’ju kërkohet të jepni një emër përdoruesi, një adresë email dhe një fjalëkalim. Mundet të jepni edhe të dhëna shtesë profili, të tilla si emër në ekran dhe jetëshkrim, dhe të ngarkoni një foto profili dhe figurë kryesh. Emri i përdoruesit, emri për në ekran, jetëshkrimi, fotoja e profilit dhe figura për kryet shfaqen përherë publikisht.</li>
-      <li><em>Postime, ndjekje dhe të tjera të dhëna publike</em>: Lista e personave që ndiqni, shfaqet publikisht, po njësoj edhe ajo e ndjekësve tuaj. Kur parashtroni një mesazh, depozitohet data dhe koha, si dhe aplikacioni prej nga u parashtrua mesazhi. Mesazhet mund të përmbajnë bashkëngjitje media, bie fjala, foto dhe video. Postimet publike dhe ato të pashfaqura janë të passhme publikisht. Kur një postim e vini të zgjedhur në profilin tuaj, edhe ky është informacion i passhëm publikisht. Postimet tuaja u dërgohen ndjekësve tuaj, në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Kur fshini postime, edhe kjo u dërgohet ndjekësve tuaj. Veprimi i riblogimit apo i parapëlqimit të një postimi tjetër është përherë publik.</li>
-      <li><em>Postime të drejtpërdrejta dhe ato vetëm për ndjekësit</em>: Krejt postimet depozitohen dhe trajtohen te shërbyesi. Postimet vetëm për ndjekës u dërgohen ndjekësve tuaj të cilët përmenden në to, dhe postimet e drejtpërdrejta u dërgohen vetëm përdoruesve të përmendur në to. Në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Përpiqemi pa hile të kufizojmë hyrjen në këto postime vetëm të personave të autorizuar, por shërbyesit e tjerë mund të mos bëjnë të njëjtën gjë. Ndaj është e rëndësishme të shqyrtoni shërbyesit pjesë e të cilëve janë ndjekësit tuaj. Te rregullimet mund të përdorni një mundësi për të miratuar ose hedhur poshtë dorazi ndjekës të rinj. <em>Ju lutemi, mbani parasysh se operatorët e shërbyesit dhe cilido shërbyes marrës mund t’i shohin mesazhe të tillë</em>, dhe që marrësit mund të bëjnë për ta foto ekrani, t’i kopjojnë ose t’i rindajnë ato me të tjerët. <em>Mos u jepni të tjerëve të dhëna të rrezikshme përmes Mastodon-it.</em></li>
-      <li><em>IP dhe të tjera tejtëdhëna</em>: Kur bëni hyrjen, regjistrojmë adresën IP prej nga hytë, si dhe emrin e shfletuesit tuaj. Te rregullimet mund të shqyrtoni dhe shfuqizoni krejt sesionet ku keni qenë të futur. Adresa e fundit IP e përdorur depozitohet për 12 muaj. Mund të mbajmë edhe regjistra shërbyesi të cilët përfshijnë adresën IP të çdo kërkese ndaj shërbyesit tonë.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Përse i përdorim të dhënat tuaja?</h3>
-
-      <p>Cilado prej të dhënave që grumbullojmë prej jush mund të përdoret në rrugët vijuese:</p>
-
-      <ul>
-      <li>Për të mundësuar funksionimin bazë të Mastodon-it. Mundeni të ndërveproni me lëndën e personave të tjerë dhe të postoni lëndë tuajën vetëm kur jeni i futur në llogarinë tuaj. Për shembull, mund të ndiqni njerëz të tjerë për të parë postimet e tyre të ndërthurura te rrjedha juaj kohore e përshtatur.</li>
-      <li>Për të ndihmuar moderimin e bashkësisë, për shembull, duke krahasuar adresën tuaj IP me të tjera të njohura, për të përcaktuar shmangie nga dëbime ose cenime të tjera.</li>
-      <li>Adresa email që jepni mund të përdoret për t’ju dërguar informacion, njoftime mbi persona të tjerë që ndërveprojnë me lëndën tuaj ose që ju dërgojnë mesazhe, dhe për t’iu përgjigju pyetjeve dhe/ose kërkesave të tjera.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Si i mbrojmë të dhënat tuaja?</h3>
-
-      <p>Vëmë në punë një larmi masash sigurie për të ruajtur të parrezikuara të dhënat tuaja personale kur jepni, parashtroni, ose hyni në to. Mes të tjerash, sesioni juaj i shfletimit, si edhe trafiku mes aplikacioneve tuaja dhe API-t, sigurohen me SSL, dhe fjalëkalimi juaj mbrohet duke përdorur një algoritëm të sigurt njëdrejtimsh. Për të siguruar edhe më hyrjet te llogaria juaj, mund të aktivizoni mirëfilltësimin dyfaktorësh.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Cilat janë rregullat tona mbi mbajtjen e të dhënave?</h3>
-
-      <p>Do të përpiqemi pa hile:</p>
-
-      <ul>
-      <li>Të mbajmë regjistra shërbyesi që përmbajnë adresën IP të krejt kërkesave te ky shërbyes, sa kohë që regjistra të tillë mbahen, për jo më shumë se 90 ditë.</li>
-      <li>Të mbajmë adresat IP përshoqëruar me përdoruesit e regjistruar, për jo më shumë se 12 muaj.</li>
-      </ul>
-
-      <p>Mund të kërkoni dhe të shkarkoni një arkiv të lëndës tuaj, përfshi postimet tuaja, bashkëngjitje media, foto profili, dhe figurë kryesh.</p>
-
-      <p>Mund të fshini në mënyrë të pakthyeshme llogarinë tuaj në çfarëdo kohe.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">A përdorim <em>cookies</em>?</h3>
-
-      <p>Po. <em>Cookie</em>-t janë kartela të vockla, ose furnizuesi i shërbimit për të, i depoziton në diskun e kompjuterit tuaj përmes shfletuesit (nëse e lejoni ju). Këto <em>cookies</em> i bëjnë të mundur sajtit të njohë shfletuesin tuaj dhe, nëse keni një llogari të regjistruar, ta përshoqërojë atë me llogarinë tuaj të regjistruar.</p>
-
-      <p>Ne i përdorim <em>cookie</em>-t për të kuptuar dhe ruajtur parapëlqimet tuaja, për vizita të ardhshme.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">A u japim palëve të treta ndonjë të dhënë?</h3>
-
-      <p>Nuk u shesim, shkëmbejmë, ose transferojmë në rrugë të tjera palëve të treta të dhëna tuajat personale që lejojnë identifikimin tuaj. Kjo përfshin palë të treta të besuara që na ndihmojnë të xhirojmë sajtin tonë, të bëjmë punën tonë, ose t’ju shërbejmë juve, sa kohë që këto palë pajtohen t’i mbajnë të fshehta këto të dhëna. Mund të japim të dhëna tuajat kur besojmë se kjo është e nevojshme për të qenë në rregull me ligjin, për të zbatuar rregullat e sajtit tonë, ose për të mbrojtur të drejta, pronësi, ose siguri tonën apo të të tjerëve.</p>
-
-      <p>Lënda juaj publike mund të shkarkohet nga shërbyes të tjerë në rrjet. Postimet tuaja publike dhe ato vetëm për ndjekësit dërgohen te shërbyesit ku gjenden ndjekësit tuaj, dhe mesazhet e drejtpërdrejtë jepen te shërbyesit e marrësve, për rastet ku këta ndjekës apo marrës gjenden në një tjetër shërbyes nga i këtushmi.</p>
-
-      <p>Kur autorizoni një aplikacion të përdorë llogarinë tuaj, në varësi të shtrirje së lejeve që miratoni, aplikacioni mund të hyjë në të dhënat e profilit tuaj publik, listat tuaja të ndjekjeve, ndjekësit tuaj, lista tuajat, krejt postimet tuaja, dhe të parapëlqyerit tuaj. Aplikacionet s’mund të njohin kurrë adresën tuaj email ose fjalëkalimin.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Përdorim i sajtit nga fëmijë</h3>
-
-      <p>Nëse ky shërbyes gjendet në BE apo në ZEE: Krejt sajti, produktet dhe shërbimet tona u drejtohen personave që janë të paktën 16 vjeç. Nëse jeni nën moshën 16 vjeç, sipas kërkesave të GDPR-së (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>), mos e përdorni këtë sajt.</p>
-
-      <p>Nëse ky shërbyes gjendet në ShBA: Krejt sajti, produktet dhe shërbimet tona u drejtohen personave që janë të paktën 13 vjeç. Nëse jeni nën moshën 13 vjeç, sipas kërkesave të COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), mos e përdorni këtë sajt.</p>
-
-      <p>Domosdoshmëritë e ligjit mund të jenë të ndryshme, nëse ky shërbyes gjendet në një tjetër juridiksion.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Ndryshime te Rregullat tona të Privatësisë</h3>
-
-      <p>Nëse vendosim të ndryshojmë rregullat tona të privatësisë, këto ndryshime do t’i botojmë në këtë faqe.</p>
-
-      <p>Ky dokument është CC-BY-SA. U përditësua së fundi më 7 mars, 2018.</p>
-
-      <p>Përshtatur fillimisht nga <a href="https://github.com/discourse/discourse">rregullat e privatësisë në Discourse</a>.</p>
-    title: Kushte Shërbimi dhe Rregulla Privatësie te %{instance}
   themes:
     contrast: Mastodon (Me shumë kontrast)
     default: Mastodon (I errët)
@@ -1423,6 +1558,7 @@ sq:
     formats:
       default: "%d %b, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Shtoje
     disable: Çaktivizoje
@@ -1439,63 +1575,73 @@ sq:
     recovery_instructions_html: Në ndodhtë që të humbni hyrje te telefoni juaj, mund të përdorni një nga kodet e rikthimit më poshtë, që të rifitoni hyrje te llogaria juaj. <strong>Mbajini të parrezikuar kodet e rikthimeve</strong>. Për shembull, mund t’i shtypni dhe t’i ruani tok me dokumente të tjerë të rëndësishëm.
     webauthn: Kyçe sigurie
   user_mailer:
+    appeal_approved:
+      action: Kaloni te llogaria juaj
+      explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
+      subject: Apelimi juaj i datës %{date} u miratua
+      title: Apelimi u miratua
+    appeal_rejected:
+      explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date}, u hodh poshtë.
+      subject: Apelimi juaj prej %{date} është hedhur poshtë
+      title: Apelimi u hodh poshtë
     backup_ready:
       explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon. E keni gati për shkarkim!
       subject: Arkivi juaj është gati për shkarkim
       title: Marrje arkivi me vete
-    sign_in_token:
-      details: 'Ja hollësitë e përpjekjes:'
-      explanation: 'Pikasëm një përpjekje për të bërë hyrje në llogarinë tuaj nga një adresë IP jo e pranuar. Nëse ky jeni ju, ju lutemi jepni kodin e sigurisë më poshtë te faqja e pyetjes për hyrje:'
-      further_actions: 'Nëse ky s’qetë ju, ju lutemi, ndryshoni fjalëkalimin tuaj dhe aktivizoni në llogarinë tuaj mirëfilltësim dyfaktorësh. Këtë mund ta bëni këtu:'
-      subject: Ju lutemi, ripohoni përpjekje hyrjeje
-      title: Përpjekje hyrjeje
+    suspicious_sign_in:
+      change_password: ndryshoni fjalëkalimin tuaj
+      details: 'Ja hollësitë për hyrjen:'
+      explanation: Kemi pikasur një hyrje në llogarinë tuaj që nga adresë e re IP.
+      further_actions_html: Nëse s’ishit ju, këshillojmë të %{action} menjëherë dhe të aktivizoni mirëfilltësim dyfaktorësh, për ta mbajtur llogarinë tuaj të sigurt.
+      subject: Llogaria juaj është përdorur që nga një adresë e re IP
+      title: Hyrje e re
     warning:
+      appeal: Parashtroni një apelim
+      appeal_description: Nëse besoni se është gabim, mund t’i parashtroni një apelim stafit të %{instance}.
+      categories:
+        spam: I padëshiruar
+        violation: Lënda cenon udhëzimet vijuese të bashkësisë
       explanation:
-        disable: Kur llogaria juaj është e ngrirë, të dhënat në llogarinë tuaj mbeten të paprekura, por s’mund të kryeni ndonjë veprim, para se të shkyçet.
-        sensitive: Kartelat tuaja media të ngarkuara dhe media e lidhur prej jush do të trajtohet si rezervat.
-        silence: Kur llogaria juaj është e kufizuar, mesazhet tuaj në këtë shërbyes do t’i shohin vetëm personat që ju ndjekin tashmë. dhe mund të liheni jashtë nga lista të ndryshme publike. Megjithatë, të tjerët prapë mund t’ju ndjekin dorazi.
-        suspend: Llogaria juaj është pezulluar, dhe krejt mesazhet tuaja dhe kartelat media të ngarkuara janë hequr në mënyrë të pakthyeshme nga ky shërbyes, dhe nga shërbyesit te të cilët kishit ndjekës.
-      get_in_touch: Që të lidheni me ekipin e %{instance}, mund t’i përgjigjeni këtij email-i.
-      review_server_policies: Shqyrtoni rregullat e shërbyesit
-      statuses: 'Posaçërisht, për:'
+        delete_statuses: Disa nga postimet tuaja janë parë të cenojnë një ose më tepër udhëzime të bashkësisë dhe për pasojë janë hequr nga moderatorët e %{instance}.
+        disable: S’mund të përdorni më llogarinë tuaj, por profili juaj dhe të dhëna të tjera mbeten të paprekura. Mund të kërkoni një kopjeruajtje të të dhënave tuaja, të ndryshoni rregullime llogarie, ose të fshini llogarinë tuaj.
+        mark_statuses_as_sensitive: Disave nga postimet tuaj u është vënë shenjë si me spec nga moderatorët e %{instance}. Kjo do të thotë se njerëzve do t’u duhet të prekin median te postimet, para se të shfaqet një paraparje. Mund t’i vini vetë shenjë medias si me spec, kur postoni në të ardhmen.
+        sensitive: Nga sot e tutje, krejt kartelave media të ngarkuara do t’u vihet shenjë si me spec dhe do të fshihen pas një sinjalizimi “klikojeni”.
+        silence: Mundeni ende të përdorni llogarinë tuaj, por vetëm personat që tashmë ju ndjekin do të shohin postimet tuaja në këtë shërbyes dhe mund të përjashtoheni nga veçori të ndryshme për zbulim lënde. Sidoqoftë, të tjerët mund t’ju ndjekin dorazi.
+        suspend: S’mund të përdorni më llogarinë tuaj dhe profili juaj, si dhe të dhëna të tjera, s’janë më të përdorshëm. Mundeni ende të bëni hyrjen në llogarinë tuaj për të kërkuar një kopjeruajtje të të dhënave tuaja, deri para se të dhënat tuaja të hiqen plotësisht brenda afërsisht 30 ditësh, por do të mbajmë ca të dhëna elementare, për t’ju penguar t’i bëni bisht pezullimin.
+      reason: 'Arsye:'
+      statuses: 'Postime të cituar:'
       subject:
+        delete_statuses: Postimet tuaja në %{acct} janë hequr
         disable: Llogaria juaj %{acct} është ngrirë
+        mark_statuses_as_sensitive: Postimeve tuaj në %{acct} u është vënë shenjë si me spec
         none: Sinjalizim për %{acct}
-        sensitive: Medias postuar nga llogaria juaj %{acct} i është vënë shenjë si rezervat
+        sensitive: Tani e tutje, postimeve tuaj në %{acct} do t’u vihet shenjë si me spec
         silence: Llogaria juaj %{acct} është kufizuar
         suspend: Llogaria juaj %{acct} është pezulluar
       title:
+        delete_statuses: Postime të hequra
         disable: Llogari e ngrirë
+        mark_statuses_as_sensitive: Postimeve iu vu shenjë si me spec
         none: Sinjalizim
-        sensitive: Medias tuaj i është vënë shenjë si rezervat
+        sensitive: Llogarice iu vu shenjë si me spec
         silence: Llogari e kufizuar
         suspend: Llogari e pezulluar
     welcome:
       edit_profile_action: Ujdisje profili
-      edit_profile_step: Profilin mund ta personalizoni duke ngarkuar një avatar, figurë kryesh, duke ndryshuar emrin tuaj në ekran, etj. Nëse dëshironi të shqyrtoni ndjekës të rinj, përpara se të jenë lejuar t’ju ndjekin, mund të kyçni llogarinë tuaj.
+      edit_profile_step: Profilin tuaj mund ta përshtatni duke ngarkuar një figurë, duke ndryshuar emrin tuaj në ekran, etj. Mund të zgjidhni të shqyrtoni ndjekës të rinj, para se të jenë lejuar t’ju ndjekin.
       explanation: Ja disa ndihmëza, sa për t’ia filluar
       final_action: Filloni të postoni
-      final_step: 'Filloni të postoni! Edhe pse pa ndjekës, mesazhet tuaj publike mund të shihen nga të tjerët, për shembull te rrjedha kohore vendore dhe në hashtag-ë. Mund të donit të prezantoni veten nën hashtagun #introductions.'
+      final_step: 'Filloni të postoni! Edhe pa ndjekës, postimet tuaja publike mund të shihen nga të tjerët, për shembull, në rrjedhën kohore vendore, ose në hashtag-ë. Mund të doni të prezantoni veten përmes hashtag-ut #introductions.'
       full_handle: Identifikuesi juaj i plotë
       full_handle_hint: Kjo është ajo çka do të duhej t’u tregonit shokëve tuaj, që të mund t’ju dërgojnë mesazhe ose t’ju ndjekin nga një shërbyes tjetër.
-      review_preferences_action: Ndryshoni parapëlqime
-      review_preferences_step: Mos harroni të caktoni parapëlqimet tuaja, fjala vjen, ç’email-e dëshironi të merrni, ose çfarë shkalle privatësie do të donit të kishin, si parazgjedhje, postimet tuaja. Nëse nuk ju merren mendtë nga rrotullimi, mund të zgjidhni të aktivizoni vetëluajtje GIF-esh.
       subject: Mirë se vini te Mastodon-i
-      tip_federated_timeline: Rrjedha kohore e të federuarve është një pamje e fluksit të rrjetit Mastodon. Por përfshin vetëm persona te të cilët janë pajtuar fqinjët tuaj, pra s’është e plotë.
-      tip_following: Përgjegjësin e shërbyesit tuaj e ndiqni, si parazgjedhje. Për të gjetur më shumë persona interesantë, shihni te rrjedha kohore vendore dhe ajo e të federuarve.
-      tip_local_timeline: Rrjedha kohore vendore është një pamje e fluksit të njerëzve në %{instance}. Këta janë fqinjët tuaj më të afërt!
-      tip_mobile_webapp: Nëse shfletuesi juaj celular ju ofron të shtohet Mastodon-i te skena juaj e kreut, mund të merrni njoftime <em>push</em>. Nga shumë pikëpamje vepron si një aplikacion i brendshëm i platformës së celularit!
-      tips: Ndihmëza
       title: Mirë se vini, %{name}!
   users:
     follow_limit_reached: S’mund të ndiqni më tepër se %{limit} persona
-    generic_access_help_html: Problem me hyrjen në llogarinë tuaj? Për asistencë mund të lidheni me %{email}
     invalid_otp_token: Kod dyfaktorësh i pavlefshëm
-    invalid_sign_in_token: Kod sigurie i pavlefshëm
     otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
     seamless_external_login: Jeni futur përmes një shërbimi të jashtëm, ndaj s’ka rregullime fjalëkalimi dhe email.
     signed_in_as: 'I futur si:'
-    suspicious_sign_in_confirmation: Duket se s’keni hyrë më parë nga kjo pajisje, dhe se keni kohë pa bërë hyrje, ndaj po ju dërgojmë një kod sigurie te adresa juaj email, që të ripohoni se jeni ju.
   verification:
     explanation_html: 'Mundeni <strong>të verifikoni veten si i zoti i lidhjeve te tejtëdhënat e profilit tuaj</strong>. Për këtë, sajti i lidhur duhet të përmbajë një lidhje për te profili juaj Mastodon. Lidhje për te ajo <strong>duhet</strong> të ketë një atribut <code>rel="me"</code>. Lënda tekst e lidhjes nuk ngre peshë. Ja një shembull:'
     verification: Verifikim
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index e762126ad..dc62f2220 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1,33 +1,15 @@
 ---
 sr-Latn:
   about:
-    about_hashtag_html: Ovo su javni statusi tagovani sa <strong>#%{hashtag}</strong>. Možete odgovarati na njih ako imate nalog bilo gde u fediversu.
     about_mastodon_html: Mastodont je društvena mreža bazirana na otvorenim protokolima i slobodnom softveru otvorenog koda. Decentralizovana je kao što je decentralizovana e-pošta.
-    about_this: O instanci
-    contact: Kontakt
     contact_missing: Nije postavljeno
     hosted_on: Mastodont hostovan na %{domain}
-    learn_more: Saznajte više
-    source_code: Izvorni kod
-    status_count_before: Koji su napisali
-    user_count_before: Dom za
-    what_is_mastodon: Šta je Mastodont?
   accounts:
-    media: Multimedija
-    moved_html: "%{name} je pomeren na %{new_profile_link}:"
     nothing_here: Ovde nema ništa!
-    people_followed_by: Ljudi koje %{name} prati
-    people_who_follow: Ljudi koji prate %{name}
-    posts_with_replies: Tutovi i odgovori
-    roles:
-      admin: Administrator
-      moderator: Moderator
-    unfollow: Otprati
   admin:
     account_moderation_notes:
       create: Napravi
       created_msg: Moderatorska beleška uspešno napravljena!
-      delete: Obriši
       destroyed_msg: Moderatorska beleška uspešno obrisana!
     accounts:
       are_you_sure: Da li ste sigurni?
@@ -59,7 +41,6 @@ sr-Latn:
       memorialize: Prebaci u in memoriam
       moderation:
         all: Svi
-        silenced: Ućutkani
         suspended: Suspendovani
         title: Moderacija
       moderation_notes: Moderatorske beleške
@@ -71,6 +52,7 @@ sr-Latn:
       protocol: Protokol
       public: Javno
       redownload: Osveži avatar
+      remote_suspension_reversible_hint_html: Налог је суспендован на њиховом серверу, а подаци ће бити у потпуности уклоњени %{date}. До тада, удаљени сервер може вратити овај налог без икаквих негативних ефеката. Ако желите одмах да уклоните све податке налога, то можете учинити у наставку.
       resend_confirmation:
         already_confirmed: Ovaj korisnik je već potvrđen
         send: Ponovo pošaljite e-poruku za potvrdu
@@ -78,10 +60,6 @@ sr-Latn:
       reset: Resetuj
       reset_password: Resetuj lozinku
       resubscribe: Ponovo se pretplati
-      role: Ovlašćenja
-      roles:
-        staff: Osoblje
-        user: Korisnik
       search: Pretraga
       shared_inbox_url: Adresa deljenog sandučeta
       show:
@@ -111,7 +89,6 @@ sr-Latn:
       emoji: Emotikon
       enable: Omogući
       enabled_msg: Emotikon uspešno omogućen
-      image_hint: PNG do 50KB
       listed: Izlistan
       new:
         title: Dodaj novi proizvoljni emotikon
@@ -132,29 +109,16 @@ sr-Latn:
         create: Napravi blokadu
         hint: Blokiranje domena neće sprečiti pravljenje naloga u bazi, ali će retroaktivno i automatski primeniti određene moderatorske metode nad tim nalozima.
         severity:
-          desc_html: "<strong>Ućutkavanje</strong> će sve statuse ovog naloga učiniti nevidiljivim za sve, osim za one koji nalog već prate. <strong>Suspenzija</strong> će ukloniti sav sadržaj naloga, svu multimediju, i profilne podatke. Koristite <strong>Ništa</strong> ako samo želite da odbacite multimedijalne fajlove."
           noop: Ništa
-          silence: Ućutkavanje
           suspend: Suspenzija
         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
-      show:
-        affected_accounts:
-          few: Utiče na %{count} naloga u bazi
-          one: Utiče na jedan nalog u bazi
-          other: Utiče na %{count} naloga u bazi
-        retroactive:
-          silence: Ugasi ućutkivanje za sve postojeće naloge sa ovog domena
-          suspend: Ugasi suspenzije za sve postojeće naloge sa ovog domena
-        title: Poništi blokadu domena za domen %{domain}
-        undo: Poništi
       undo: Poništi
     email_domain_blocks:
       add_new: Dodaj novuAdd new
       created_msg: Uspešno dodao domen e-pošte na crnu listu
       delete: Ukloni
-      destroyed_msg: Uspešno uklonjen domen e-pošte sa crne liste
       domain: Domen
       new:
         create: Dodaj domen
@@ -180,53 +144,10 @@ sr-Latn:
       resolved: Rešeni
       title: Prijave
       unresolved: Nerešeni
-    settings:
-      bootstrap_timeline_accounts:
-        desc_html: Odvojite više korisničkih imena zarezom. Radi samo za lokalne i otključane naloge. Ako je prazno, onda se odnosi na sve lokalne administratore.
-        title: Nalozi za automatsko zapraćivanje za nove korisnike
-      contact_information:
-        email: Poslovna e-pošta
-        username: Kontakt korisničko ime
-      registrations:
-        closed_message:
-          desc_html: Prikazuje se na glavnoj strani kada je instanca zatvorena za registracije. Možete koristiti HTML tagove
-          title: Poruka o zatvorenoj registraciji
-        deletion:
-          desc_html: Dozvoli svima da mogu da obrišu svoj nalog
-          title: Otvori brisanje naloga
-        min_invite_role:
-          disabled: Niko
-          title: Samo preko pozivnice
-      show_staff_badge:
-        desc_html: Prikaži bedž osoblja na korisničkoj strani
-        title: Prikaži bedž osoblja
-      site_description:
-        desc_html: Uvodni pasus na naslovnoj strani i u meta HTML tagovima. Možete koristiti HTML tagove, konkretno <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
-        title: Opis instance
-      site_description_extended:
-        desc_html: Dobro mesto za vaš kod ponašanja, pravila, smernice i druge stvari po kojima se Vaša instanca razlikuje. Možete koristiti HTML tagove
-        title: Proizvoljne dodatne informacije
-      site_terms:
-        desc_html: Možete pisati Vašu politiku privatnosti, uslove korišćenja i ostale legalne stvari. Možete koristiti HTML tagove
-        title: Proizvoljni uslovi korišćenja
-      site_title: Ime instance
-      thumbnail:
-        desc_html: Koristi se za preglede kroz OpenGraph i API. Preporučuje se 1200x630px
-        title: Sličica instance
-      timeline_preview:
-        desc_html: Prikaži javnu lajnu na početnoj strani
-        title: Pregled lajne
-      title: Postavke sajta
     statuses:
       back_to_account: Nazad na stranu naloga
-      batch:
-        delete: Obriši
-        nsfw_off: NSFW isključen
-        nsfw_on: NSFW uključen
-      failed_to_execute: Neuspelo izvršavanje
       media:
         title: Multimedija
-      no_media: Bez multimedije
       title: Statusi naloga
       with_media: Sa multimedijom
     title: Administracija
@@ -240,7 +161,6 @@ sr-Latn:
   applications:
     created: Aplikacija uspešno napravljena
     destroyed: Aplikacija uspešno obrisana
-    invalid_url: Data adresa nije ispravna
     regenerate_token: Rekreiraj pristupni token
     token_regenerated: Pristupni token uspešno rekreiran
     warning: Oprezno sa ovim podacima. Nikad je ne delite ni sa kim!
@@ -349,17 +269,6 @@ sr-Latn:
   moderation:
     title: Moderacija
   notification_mailer:
-    digest:
-      body: Evo kratak pregled šta ste propustili od poslednje posete od %{since}
-      mention: "%{name} Vas je pomenuo u:"
-      new_followers_summary:
-        few: Dobili ste %{count} nova pratioca! Sjajno!
-        one: Dobili ste jednog novog pratioca! Jeee!
-        other: Dobili ste %{count} novih pratioca! Sjajno!
-      subject:
-        few: "%{count} nova obaveštenja od poslednje posete \U0001F418"
-        one: "1 novo obaveštenje od poslednje posete \U0001F418"
-        other: "%{count} novih obaveštenja od poslednje posete \U0001F418"
     favourite:
       body: "%{name} je postavio kao omiljen Vaš status:"
       subject: "%{name} je postavio kao omiljen Vaš status"
@@ -381,15 +290,11 @@ sr-Latn:
   preferences:
     other: Ostali
   remote_follow:
-    acct: Unesite Vaš korisnik@domen sa koga želite da pratite
     missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog
-    proceed: Nastavite da zapratite
-    prompt: 'Zapratite će:'
   sessions:
     activity: Poslednja aktivnost
     browser: Veb čitač
     browsers:
-      blackberry: Blekberi
       chrome: Hrom
       generic: Nepoznati veb čitač
     current_session: Trenutna sesija
@@ -398,8 +303,6 @@ sr-Latn:
     platforms:
       adobe_air: Adobe Air-a
       android: Androida
-      blackberry: Blekberija
-      chrome_os: Hrom OS-a
       firefox_os: Fajerfoks OS-a
       linux: Linuksa
       mac: Mac-a
@@ -428,7 +331,6 @@ sr-Latn:
     pin_errors:
       limit: Već imate prikačen najveći broj tutova
       ownership: Tuđi tutovi ne mogu da se prikače
-      private: Tutovi koji nisu javni ne mogu da se prikače
       reblog: Podrška ne može da se prikači
     show_more: Prikaži još
     visibilities:
@@ -442,8 +344,6 @@ sr-Latn:
     pinned: Prikačeni tut
     reblogged: podržano
     sensitive_content: Osetljiv sadržaj
-  terms:
-    title: Uslovi korišćenja i politika privatnosti instance %{instance}
   themes:
     default: Mastodont
   two_factor_authentication:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b6c92976a..656b6f763 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1,62 +1,28 @@
 ---
 sr:
   about:
-    about_hashtag_html: Ово су јавни статуси таговани са <strong>#%{hashtag}</strong>. Можете одговарати на њих ако имате налог било где у федиверсу.
     about_mastodon_html: Мастодон је друштвена мрежа базирана на отвореним протоколима и слободном софтверу отвореног кода. Децентрализована је као што је децентрализована е-пошта.
-    about_this: О инстанци
-    administered_by: 'Администрирано од стране:'
-    apps: Мобилне апликације
-    browse_directory: Прегледајте директоријум налога и филтрирајте према интересовањима
-    contact: Контакт
     contact_missing: Није постављено
-    documentation: Документација
-    hosted_on: Мастодонт хостован на %{domain}
-    learn_more: Сазнајте више
-    privacy_policy: Полиса приватности
-    source_code: Изворни код
-    status_count_after:
-      few: статуси
-      one: статус
-      other: статуса
-    status_count_before: Који су написали
-    terms: Услови коришћења
-    user_count_after:
-      few: корисници
-      one: корисник
-      other: корисника
-    user_count_before: Дом за
-    what_is_mastodon: Шта је Мастодон?
+    contact_unavailable: Није доступно
+    hosted_on: Мастодон хостован на %{domain}
+    title: О
   accounts:
-    choices_html: "%{name}'s избори:"
-    follow: Запрати
+    follow: Прати
     followers:
       few: Пратиоци
       one: Пратиоц
       other: Пратиоци
     following: Пратим
-    joined: Придружио/ла се %{date}
     last_active: последњи пут активни
     link_verified_on: Власништво над овом везом је проверено %{date}
-    media: Медији
-    moved_html: "%{name} је прешао на %{new_profile_link}:"
-    network_hidden: Ова информација није доступна
     nothing_here: Овде нема ништа!
-    people_followed_by: Људи које %{name} прати
-    people_who_follow: Људи који прате %{name}
     pin_errors:
       following: Морате пратити ову особу ако хоћете да потврдите
     posts:
-      few: Трубе
-      one: Труба
-      other: Трубе
-    posts_tab_heading: Трубе
-    posts_with_replies: Трубе и одговори
-    roles:
-      admin: Администратор
-      bot: Бот
-      moderator: Модератор
-    unavailable: Налог је недоступан
-    unfollow: Отпрати
+      few: Објаве
+      one: Објава
+      other: Објава
+    posts_tab_heading: Објаве
   admin:
     account_actions:
       action: Извршите радњу
@@ -64,9 +30,10 @@ sr:
     account_moderation_notes:
       create: Оставите белешку
       created_msg: Модераторска белешка успешно направљена!
-      delete: Обриши
       destroyed_msg: Модераторска белешка успешно обрисана!
     accounts:
+      add_email_domain_block: Блокирај домен е-поште
+      approve: Одобри
       are_you_sure: Да ли сте сигурни?
       avatar: Аватар
       by_domain: Домен
@@ -77,9 +44,16 @@ sr:
         new_email: Нова e-пошта
         submit: Промените e-пошту
         title: Промените e-пошту за %{username}
+      change_role:
+        changed_msg: Улога успешно промењена!
+        label: Промени улогу
+        no_role: Нема улогу
+        title: Промени улогу за %{username}
       confirm: Потврди
       confirmed: Потврђено
       confirming: Потврдување
+      custom: Произвољно
+      delete: Обриши податке
       deleted: Избрисано
       demote: Ражалуј
       disable: Искључи
@@ -96,7 +70,9 @@ sr:
       follows: Праћени
       header: Заглавље
       inbox_url: Адреса сандучета
+      invite_request_text: Разлози за придруживање
       invited_by: Позван од стране
+      ip: IP
       joined: Придружио се
       location:
         all: Све
@@ -109,20 +85,24 @@ sr:
       moderation:
         active: Активан
         all: Сви
-        silenced: Ућуткани
+        pending: На чекању
+        silenced: Ограничено
         suspended: Суспендовани
         title: Модерација
       moderation_notes: Модераторске белешке
       most_recent_activity: Најскорија активност
       most_recent_ip: Најскорија IP адреса
       no_limits_imposed: Нема ограничења
+      no_role_assigned: Ниједна улога није додељена
       not_subscribed: Није претплаћен
+      pending: Чека на преглед
       perform_full_suspension: Искључи
       promote: Унапреди
       protocol: Протокол
       public: Јавно
       push_subscription_expires: PuSH претплата истиче
       redownload: Освежи налог
+      reject: Одбаци
       remove_avatar: Уклони аватар
       remove_header: Одстрани заглавље
       resend_confirmation:
@@ -132,13 +112,11 @@ sr:
       reset: Ресетуј
       reset_password: Ресетуј лозинку
       resubscribe: Поново се претплати
-      role: Овлашћења
-      roles:
-        admin: Администратор
-        moderator: Модератор
-        staff: Особље
-        user: Корисник
+      role: Улога
       search: Претрага
+      security_measures:
+        only_password: Само лозинка
+      sensitized: Означено као осетљиво
       shared_inbox_url: Адреса дељеног сандучета
       show:
         created_reports: Направљени извештаји
@@ -147,8 +125,10 @@ sr:
       silenced: Ућуткан
       statuses: Статуси
       subscribe: Претплати се
+      suspend: Суспендуј
       suspended: Суспендовани
       title: Налози
+      unblock_email: Одблокирај адресу е-поште
       unconfirmed_email: Непотврђена е-пошта
       undo_silenced: Укини ћутање
       undo_suspension: Укини суспензију
@@ -157,22 +137,57 @@ sr:
       warn: Упозори
       web: Веб
     action_logs:
-      deleted_status: "(обрисан статус)"
+      action_types:
+        approve_user: Одобри корисника
+        change_email_user: Промени e-адресу корисника
+        change_role_user: Промени улогу корисника
+        confirm_user: Потврди корисника
+        create_account_warning: Креирај упозорење
+        create_announcement: Креирај најаву
+        create_canonical_email_block: Креирај блок е-поште
+        create_user_role: Креирај улогу
+        destroy_announcement: Избриши најаву
+        destroy_canonical_email_block: Избриши блок е-поште
+        destroy_status: Избриши пост
+        disable_user: Онемогући корисника
+        enable_user: Омогући корисника
+        reject_user: Одбаци корисника
+        silence_account: Ограничи налог
+        suspend_account: Обустави налог
+        update_status: Уреди објаву
+        update_user_role: Уреди улогу
+      deleted_account: обрисан налог
+      filter_by_action: Филтрирај по активности
+      filter_by_user: Филтрирај по кориснику
       title: Записник
+    announcements:
+      edit:
+        title: Уреди најаву
+      empty: Ниједна најава није пронађена.
+      live: Уживо
+      new:
+        create: Креирај најаву
+        title: Нова најава
+      publish: Објави
+      published_msg: Најава успешно објављена!
+      title: Најаве
     custom_emojis:
+      assign_category: Додели категорију
       by_domain: Домен
       copied_msg: Успешно направљена локална копија емоџија
       copy: Копирај
       copy_failed_msg: Не могу да направим локалну копију тог емотиџија
+      create_new_category: Kreiraj novu kategoriju
       created_msg: Емоџи успешно направљен!
       delete: Обриши
       destroyed_msg: Емоџи успешно обрисан!
       disable: Онемогући
+      disabled: Онемогућено
       disabled_msg: Емоџи успешно онемогућен
       emoji: Емоџи
       enable: Омогући
+      enabled: Омогућено
       enabled_msg: Емоџи успешно омогућен
-      image_hint: PNG до 50KB
       listed: Излистан
       new:
         title: Додај нови произвољни емоџи
@@ -188,60 +203,62 @@ sr:
       software: Софтвер
       space: Коришћење простора
       title: Командна табла
+    domain_allows:
+      export: Извоз
+      import: Увоз
     domain_blocks:
       add_new: Додај нови блок домена
       created_msg: Блокирање домена се обрађује
       destroyed_msg: Блокирање домена је опозвано
       domain: Домен
+      export: Извоз
+      import: Увоз
       new:
         create: Направи блокаду
         hint: Блокирање домена неће спречити прављење налога у бази, али ће ретроактивно и аутоматски применити одређене модераторске методе над тим налозима.
         severity:
-          desc_html: "<strong>Ућуткавање</strong> ће све статусе овог налога учинити невидљивим за све, осим за оне који их већ прате. <strong>Суспензија</strong> ће уклонити сав садржај налога, сву мултимедију и податке налога. Користите <strong>Ништа</strong> само ако желите да одбаците мултимедијалне фајлове."
           noop: Ништа
-          silence: Ућуткавање
           suspend: Суспензија
         title: Ново блокирање домена
+      private_comment: Приватни коментар
+      public_comment: Јавни коментар
       reject_media: Одбаци мултимедију
       reject_media_hint: Уклања локално ускладиштене мултимедијске фајлове и одбија да их скида убудуће. Небитно је за суспензију
       reject_reports: Одбаци извештај
       reject_reports_hint: Игнориши све извештаје који долазе са овог домена. Небитно је за суспензије
-      rejecting_media: одбацивање медијских датотека
-      rejecting_reports: одбацивање пријава
-      severity:
-        silence: ућуткани
-        suspend: суспендовани
-      show:
-        affected_accounts:
-          few: Утиче на %{count} налога у бази
-          one: Један налог у бази података је под утицајем
-          other: Утиче на %{count} налога у бази података
-        retroactive:
-          silence: Угаси ућуткивање за све постојеће налоге са овог домена
-          suspend: Уклони суспензије за све постојеће налоге са овог домена
-        title: Поништи блокаду домена за %{domain}
-        undo: Поништи
       undo: Поништи блок домена
     email_domain_blocks:
       add_new: Додај нови
       created_msg: Успешно додао домен Е-поште на црну листу
       delete: Обриши
-      destroyed_msg: Успешно уклоњен домен Е-поште са црне листе
       domain: Домен
       new:
         create: Додај домен
         title: Нова ставка е-поштe у црној листи
       title: Црна листа E-поште
+    follow_recommendations:
+      status: Статус
     instances:
+      back_to_all: Све
+      back_to_limited: Ограничено
+      back_to_warning: Упозорење
+      by_domain: Домен
+      content_policies:
+        policies:
+          silence: Ограничи
+          suspend: Суспендуј
+        policy: Политика
+        reason: Јавни разлог
+      delivery:
+        all: Све
+        unavailable: Недоступно
       delivery_available: Достава је доступна
-      known_accounts:
-        few: "%{count} знаних налога"
-        one: "%{count} знан налог"
-        other: "%{count} знаних налога"
       moderation:
         all: Све
         limited: Ограничено
         title: Модерација
+      private_comment: Приватни коментар
+      public_comment: Јавни коментар
       title: Федерација
       total_blocked_by_us: Блокирано од стране нас
       total_followed_by_them: Праћени од стране њих
@@ -255,6 +272,17 @@ sr:
         expired: Истекли
         title: Филтер
       title: Позивнице
+    ip_blocks:
+      expires_in:
+        '1209600': 2 недеље
+        '15778476': 6 месеци
+        '2629746': 1 месец
+        '31556952': 1 година
+        '86400': 1 дан
+        '94670856': 3 године
+      new:
+        title: Креирај ново IP правило
+      no_ip_block_selected: Ниједно IP правило није промењено јер ниједно није изабрано
     relays:
       add_new: Додај нови релеј
       delete: Обриши
@@ -300,85 +328,44 @@ sr:
       unassign: Уклони доделу
       unresolved: Нерешене
       updated_at: Ажурирана
+      view_profile: Погледај профил
+    roles:
+      add_new: Додај улогу
+      categories:
+        administration: Администрација
+        moderation: Модерација
+      delete: Избриши
+      privileges:
+        administrator: Администратор
+        delete_user_data: Избриши податке корисника
+        invite_users: Позови кориснике
+        manage_announcements: Управљај обавештењима
+        manage_roles: Управљај улогама
+        manage_rules: Управљај правилима
+        manage_rules_description: Дозволи корисницима да мењају правила сервера
+        manage_settings: Управљај поставкама
+        manage_settings_description: Дозволи корисницима да мењају поставке сајта
+    rules:
+      add_new: Додај правило
+      delete: Избриши
+      edit: Уреди правило
+      empty: Ниједно правило сервера још није дефинисано.
+      title: Правила сервера
     settings:
-      activity_api_enabled:
-        desc_html: Бројеви локално објављених статуса, активних корисника и нових регистрација по недељама
-        title: Објављуј агрегиране статистике о корисничким активностима
-      bootstrap_timeline_accounts:
-        desc_html: Одвојите више корисничких имена зарезом. Ради само за локалне и откључане налоге. Ако је празно, онда се односи на све локалне администраторе.
-        title: Налози за аутоматско запраћивање за нове кориснике
-      contact_information:
-        email: Пословна е-пошта
-        username: Контакт корисничко име
-      custom_css:
-        desc_html: Промени изглед на свакој страни када се CSS учита
-        title: Произвољни CSS
-      hero:
-        desc_html: Приказано на почетној страни. Препоручено је бар 600х100рх. Када се не одреди, враћа се на иконицу инстанце
-        title: Лого слика
-      mascot:
-        desc_html: Приказано на више страна. Препоручено је бар 293×205px. Када није постављена, користи се подразумевана маскота
-        title: Слика маскоте
-      peers_api_enabled:
-        desc_html: Имена домена које је ова инстанца срела у федиверсу
-        title: Објављуј списак откривених инстанци
-      preview_sensitive_media:
-        desc_html: Преглед веза на другим веб страницама ће приказати иконицу чак и ако је медиј означен као осетљиво
-        title: Покажи осетљив медиј у ОпенГраф прегледу
-      profile_directory:
-        desc_html: Дозволи корисницима да буду откривени
-        title: Омогући директоријум налога
-      registrations:
-        closed_message:
-          desc_html: Приказује се на главној страни када је инстанца затворена за регистрације. Можете користити HTML тагове
-          title: Порука о затвореној регистрацији
-        deletion:
-          desc_html: Дозволи свима да могу да обришу свој налог
-          title: Отвори брисање налога
-        min_invite_role:
-          disabled: Нико
-          title: Само преко позивнице
-      show_known_fediverse_at_about_page:
-        desc_html: Када се упали, показаће трубе из свих знаних федиверса на преглед. У супротном ће само показати локалне трубе.
-        title: Покажи познате здружене инстанце у прегледнику временске линије
-      show_staff_badge:
-        desc_html: Прикажи беџ особља на корисничкој страни
-        title: Прикажи беџ особља
-      site_description:
-        desc_html: Уводни пасус на насловној страни и у meta HTML таговима. Можете користити HTML тагове, конкретно <code>&lt;a&gt;</code> и <code>&lt;em&gt;</code>.
-        title: Опис инстанце
-      site_description_extended:
-        desc_html: Добро место за ваш код понашања, правила, смернице и друге ствари по којима се Ваша инстанца разликује. Можете користити HTML тагове
-        title: Произвољне додатне информације
-      site_short_description:
-        desc_html: Приказано у изборнику са стране и у мета ознакама. Опиши шта је Мастодон и шта чини овај сервер посебним у једном пасусу. Ако остане празно, вратиће се првобитни опис инстанце.
-        title: Кратак опис инстанце
-      site_terms:
-        desc_html: Можете писати Вашу политику приватности, услове коришћења и остале легалне ствари. Можете користити HTML тагове
-        title: Произвољни услови коришћења
-      site_title: Име инстанце
-      thumbnail:
-        desc_html: Користи се за прегледе кроз OpenGraph и API. Препоручује се 1200x630px
-        title: Сличица инстанце
-      timeline_preview:
-        desc_html: Прикажи јавну лајну на почетној страни
-        title: Преглед лајне
-      title: Поставке сајта
+      appearance:
+        title: Изглед
+      default_noindex:
+        desc_html: Утиче на све кориснике који нису сами променили ову поставку
+        title: Подразумевано искључи кориснике из индексирања претраживача
+      discovery:
+        public_timelines: Јавне временске линије
     statuses:
       back_to_account: Назад на страну налога
-      batch:
-        delete: Обриши
-        nsfw_off: NSFW искључен
-        nsfw_on: NSFW укључен
-      failed_to_execute: Неуспело извршавање
       media:
         title: Мултимедија
-      no_media: Без мултимедије
       no_status_selected: Ниједан статус није промењен јер ниједан није изабран
       title: Статуси налога
       with_media: Са мултимедијом
-    tags:
-      title: Тараба
     title: Администрација
     warning_presets:
       add_new: Додај нови
@@ -399,7 +386,6 @@ sr:
   applications:
     created: Апликација успешно направљена
     destroyed: Апликација успешно обрисана
-    invalid_url: Дата адреса није исправна
     regenerate_token: Рекреирај приступни токен
     token_regenerated: Приступни токен успешно рекреиран
     warning: Опрезно са овим подацима. Никад је не делите ни са ким!
@@ -449,10 +435,6 @@ sr:
     confirm_password: Унесите тренутну лозинку да бисмо проверили Ваш идентитет
     proceed: Обриши налог
     success_msg: Ваш налог је успешно обрисан
-  directories:
-    directory: Директоријум налога
-    explanation: Откријте кориснике на основу њихових интереса
-    explore_mastodon: Истражи %{title}
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': Немате дозвола да видите ову страну.
@@ -485,22 +467,17 @@ sr:
     contexts:
       home: Временска линија почетне
       notifications: Обавештења
-      public: Јавна временска линија
+      public: Јавне временске линије
       thread: Разговори
     edit:
       title: Измени филтер
     errors:
       invalid_context: Ниједан или неважећи контекст испоручен
-      invalid_irreversible: Неповратно филтрирање функционише само са почетном или контекстом обавештења
     index:
       delete: Избриши
       title: Филтери
     new:
       title: Додај нови филтер
-  footer:
-    developers: Програмери
-    more: Више…
-    resources: Ресурси
   generic:
     changes_saved_msg: Измене успешно сачуване!
     copy: Копирај
@@ -552,19 +529,6 @@ sr:
   moderation:
     title: Модерација
   notification_mailer:
-    digest:
-      action: Погледајте сва обавештења
-      body: Ево кратак преглед порука које сте пропустили од последње посете од %{since}
-      mention: "%{name} Вас је поменуо у:"
-      new_followers_summary:
-        few: Добили сте %{count} нова пратиоца! Сјајно!
-        one: Добили сте једног новог пратиоца! Јеее!
-        other: Добили сте %{count} нових пратиоца! Сјајно!
-      subject:
-        few: "%{count} нова обавештења од последње посете \U0001F418"
-        one: "1 ново обавештење од последње посете \U0001F418"
-        other: "%{count} нових обавештења од последње посете \U0001F418"
-      title: Док нисте били ту...
     favourite:
       body: "%{name} је поставио као омиљен Ваш статус:"
       subject: "%{name} је поставио као омиљен Ваш статус"
@@ -596,20 +560,9 @@ sr:
     prev: Претходни
   preferences:
     other: Остало
+    public_timelines: Јавне временске линије
   remote_follow:
-    acct: Унесите Ваш корисник@домен са кога желите да пратите
     missing_resource: Не могу да нађем захтевану адресу преусмеравања за Ваш налог
-    no_account_html: Немате налог? Можете се <a href='%{sign_up_path}' target='_blank'>пријавити овде</a>
-    proceed: Наставите да би сте запратили
-    prompt: 'Запратићете:'
-    reason_html: "<strong>Зашто је овај корак неопходан?</strong><code>%{instance}</code> можда није сервер на којем сте регистровани, тако да прво морамо да вас преусмеримо на ваш сервер."
-  remote_interaction:
-    reblog:
-      proceed: Наставите да бисте поделили
-      prompt: 'Желите да делите ову трубу:'
-    reply:
-      proceed: Наставите да бисте одговорили
-      prompt: 'Желите да одговорите на ову трубу:'
   scheduled_statuses:
     over_daily_limit: Прекорачили сте границу од %{limit} планираних труба за тај дан
     over_total_limit: Прекорачили сте границу од %{limit} планираних труба
@@ -619,7 +572,6 @@ sr:
     browser: Веб читач
     browsers:
       alipay: Алипеј
-      blackberry: Блекберија
       chrome: Хром
       edge: Мајкрософт Еџ
       electron: Електрон
@@ -633,7 +585,6 @@ sr:
       phantom_js: ФантомЏејЕс
       qq: КјуКју Претраживач
       safari: Сафари
-      uc_browser: УЦПретраживач
       weibo: Веибо
     current_session: Тренутна сесија
     description: "%{browser} са %{platform}"
@@ -641,8 +592,6 @@ sr:
     platforms:
       adobe_air: Адоб Ер-а
       android: Андроида
-      blackberry: Блекберија
-      chrome_os: Хром ОС-а
       firefox_os: Фајерфокс ОС-а
       ios: иОС-а
       linux: Линукса
@@ -655,6 +604,7 @@ sr:
     revoke_success: Сесија успешно опозвана
     title: Сесије
   settings:
+    appearance: Изглед
     authorized_apps: Ауторизоване апликације
     back: Назад на Мастодон
     delete: Брисање налога
@@ -662,6 +612,7 @@ sr:
     edit_profile: Измена налога
     export: Извоз података
     import: Увоз
+    import_and_export: Увоз и извоз
     migrate: Пребацивање налога
     notifications: Обавештења
     preferences: Подешавања
@@ -685,13 +636,11 @@ sr:
       few: 'садржи забрањене хештегове: %{tags}'
       one: 'садржи забрањени хештег: %{tags}'
       other: 'садржи забрањене хештегове: %{tags}'
-    language_detection: Аутоматскo откривање језика
     open_in_web: Отвори у вебу
     over_character_limit: ограничење од %{max} карактера прекорачено
     pin_errors:
       limit: Већ имате прикачен највећи број труба
-      ownership: Туђе трубе не могу да се прикаче
-      private: Трубе које нису јавне не могу бити прикачене
+      ownership: Туђа објава се не може закачити
       reblog: Подршка не може да се прикачи
     show_more: Прикажи још
     sign_in_to_participate: Пријавите се да учествујете у разговору
@@ -703,11 +652,9 @@ sr:
       unlisted: Неизлистано
       unlisted_long: Свако може да види, али није излистано на јавним временским линијама
   stream_entries:
-    pinned: Прикачена труба
+    pinned: Закачена објава
     reblogged: подржано
     sensitive_content: Осетљив садржај
-  terms:
-    title: Услови коришћења и политика приватности инстанце %{instance}
   themes:
     contrast: Велики контраст
     default: Мастодон
@@ -727,11 +674,6 @@ sr:
       subject: Ваша архива је спремна за преузимање
       title: Извоз архиве
     warning:
-      explanation:
-        disable: Док је ваш рачун замрзнут, подаци о вашем рачуну остају нетакнути, али не можете вршити никакве радње док се не откључа.
-        silence: Иако је ваш налог ограничен, само људи који вас већ прате ће видети ваше трубе на овом серверу, и можда ћете бити искључени из различитих јавних листа. Међутим, други вас могу и даље ручно пратити.
-        suspend: Ваш налог је суспендован, а све ваше трубе и учитане медијске датотеке неповратно су уклоњени са овог сервера и сервера на којима сте имали следбенике.
-      review_server_policies: Прегледај политику сервера
       subject:
         disable: Ваш налог %{acct} је замрзнут
         none: Упозорење за %{acct}
@@ -744,20 +686,11 @@ sr:
         suspend: Налог суспендован
     welcome:
       edit_profile_action: Подеси налог
-      edit_profile_step: Налог можете прилагодити постављањем аватара, заглавља, променом имена и још много тога. Ако желите да прегледате нове пратиоце пре него што буду дозвољени да вас прате, можете закључати свој налог.
       explanation: Ево неколико савета за почетак
       final_action: Почните објављивати
-      final_step: 'Почните објављивати! Чак и без пратиоца ваше јавне поруке ће бити виђене од стране других, нпр. на локалној јавног линији и у тараба за означавање. Можда бисте желели да се представите у #увод тараби за означавање.'
       full_handle: Ваш пун надимак
       full_handle_hint: Ово бисте рекли својим пријатељима како би вам они послали поруку, или запратили са друге инстанце.
-      review_preferences_action: Промените подешавања
-      review_preferences_step: Обавезно поставите своја подешавања, као што су какву Е-пошту желите да примите или на који ниво приватности желите да ваше поруке буду постављене. Ако немате морску болест или епилепсију, можете изабрати аутоматско покретање ГИФ-а.
       subject: Добродошли на Мастодон
-      tip_federated_timeline: Здружена временска линија пружа комплетан увид у Мастодонову мрежу. Али она само укључује људе на које су ваше комшије претплаћене, тако да није комплетна.
-      tip_following: Аутоматски пратите админа/не вашег сервера. Да пронађете занимљиве људе, проверите локалне и здружене временске линије.
-      tip_local_timeline: Локална временска линија је комплетан увид људи у %{instance}.  Ово су вам прве комшије!
-      tip_mobile_webapp: Ако вам мобилни претраживач предложи да додате Мастодон на Ваш почетни екран, добијаћете мобилна обавештења. Делује као изворна апликација на много начина!
-      tips: Савети
       title: Добродошли, %{name}!
   users:
     follow_limit_reached: Не можете пратити више од %{limit} људи
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4a6ed5137..bae4a964b 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1,89 +1,27 @@
 ---
 sv:
   about:
-    about_hashtag_html: Dessa är offentliga toots märkta med <strong>#%{hashtag}</strong>. Du kan interagera med dem om du har ett konto någonstans i federationen.
-    about_mastodon_html: Mastodon är ett socialt nätverk baserat på öppna webbprotokoll och gratis, öppen källkodsprogramvara. Det är decentraliserat som e-post.
-    about_this: Om
-    active_count_after: aktiv
-    active_footnote: Månatligen Aktiva användare (MAU)
-    administered_by: 'Administreras av:'
-    api: API
-    apps: Mobilappar
-    apps_platforms: Använd Mastodon från iOS, Android och andra plattformar
-    browse_directory: Titta på en profilkatalog och filtrera enligt intressen
-    browse_local_posts: Titta på strömmande publika inlägg från denna server
-    browse_public_posts: Titta på strömmande publika inlägg på Mastodon
-    contact: Kontakt
+    about_mastodon_html: 'Framtidens sociala medium: Ingen reklam. Ingen övervakning. Etisk design och decentralisering! Äg din data med Mastodon!'
     contact_missing: Inte inställd
     contact_unavailable: Ej tillämplig
-    discover_users: Upptäck användare
-    documentation: Dokumentation
-    federation_hint_html: Med ett konto på %{instance} kommer du att kunna följa personer på alla Mastodon-servers och mer än så.
-    get_apps: Prova en mobilapp
     hosted_on: Mastodon-värd på %{domain}
-    instance_actor_flash: "Detta konto är en virtuell agent som används för att representera servern själv och inte någon individuell användare. Det används av sammanslutningsskäl och ska inte blockeras såvitt du inte vill blockera hela instansen, och för detta fall ska domänblockering användas. \n"
-    learn_more: Lär dig mer
-    privacy_policy: Integritetspolicy
-    rules: Serverns regler
-    rules_html: 'Nedan en sammanfattning av kontoreglerna för denna Mastodonserver:'
-    see_whats_happening: Se vad som händer
-    server_stats: 'Serverstatistik:'
-    source_code: Källkod
-    status_count_after:
-      one: status
-      other: statusar
-    status_count_before: Som skapat
-    tagline: Följ vänner och upptäck nya
-    terms: Användarvillkor
-    unavailable_content: Otillgängligt innehåll
-    unavailable_content_description:
-      domain: Server
-      reason: Anledning
-      rejecting_media: 'Mediafiler från dessa servers kommer inte hanteras eller lagras, och inga miniatyrer kammer att visas, utan manuell klickning erfordras på originalfilen:'
-      rejecting_media_title: Filtrerade media
-      silenced: 'Poster från dessa servers kommer att döljas i publika tidslinjer och konversationer, och meddelanden kommer inte att genereras från deras användares handlingar, förutom om du följer dem:'
-      silenced_title: Ljuddämpade värddatorer
-      suspended: 'Ingen data från dessa serverdatorer kommer bearbetas, lagras eller bytas ut vilket omöjliggör kommunikation med användare från dessa serverdatorer:'
-      suspended_title: Avstängda värddatorer
-    unavailable_content_html: Mastodon låter dig se material från, och interagera med, andra användare i servernätverket. Det är undantag som gjorts på denna serverdator.
-    user_count_after:
-      one: användare
-      other: användare
-    user_count_before: Hem till
-    what_is_mastodon: Vad är Mastodon?
+    title: Om
   accounts:
-    choices_html: "%{name}s val:"
-    endorsements_hint: Från webbgränssnittet kan du rekommendera följare, som sedan visas här.
-    featured_tags_hint: Du kan använda fyrkanter som visas här.
     follow: Följa
     followers:
       one: Följare
       other: Följare
     following: Följer
-    joined: Gick med %{date}
+    instance_actor_flash: Detta konto är en virtuell aktör som används för att representera servern i sig och inte någon enskild användare. Den används för federeringsändamål och bör inte stängas av.
     last_active: senast aktiv
     link_verified_on: Ägarskap för denna länk kontrollerades den %{date}
-    media: Media
-    moved_html: "%{name} har flyttat till %{new_profile_link}:"
-    network_hidden: Denna information är inte tillgänglig
-    never_active: Aldrig
     nothing_here: Det finns inget här!
-    people_followed_by: Personer som %{name} följer
-    people_who_follow: Personer som följer %{name}
     pin_errors:
       following: Du måste vara följare av den person du vill godkänna
     posts:
-      one: Tuta
-      other: Tutor
-    posts_tab_heading: Tutor
-    posts_with_replies: Toots med svar
-    roles:
-      admin: Administratör
-      bot: Robot
-      group: Grupp
-      moderator: Moderator
-    unavailable: Profilen är inte tillgänglig
-    unfollow: Sluta följa
+      one: Inlägg
+      other: Inlägg
+    posts_tab_heading: Inlägg
   admin:
     account_actions:
       action: Utför åtgärd
@@ -91,29 +29,36 @@ sv:
     account_moderation_notes:
       create: Lämna kommentar
       created_msg: Modereringsnotering skapad utan problem!
-      delete: Radera
-      destroyed_msg: Modereringsnotering borttagen utan problem!
+      destroyed_msg: Modereringsanteckning borttagen!
     accounts:
       add_email_domain_block: Blockera e-postdomän
       approve: Godkänn
-      approve_all: Godkänn alla
+      approved_msg: "%{username}s registreringsansökan godkändes"
       are_you_sure: Är du säker?
       avatar: Profilbild
       by_domain: Domän
       change_email:
         changed_msg: E-postadressen har ändrats!
-        current_email: Nuvarande E-postadress
-        label: Byt E-postadress
-        new_email: Ny E-postadress
-        submit: Byt E-postadress
-        title: Byt E-postadress för %{username}
+        current_email: Nuvarande e-postadress
+        label: Byt e-postadress
+        new_email: Ny e-postadress
+        submit: Byt e-postadress
+        title: Byt e-postadress för %{username}
+      change_role:
+        changed_msg: Rollen har ändrats!
+        label: Ändra roll
+        no_role: Ingen roll
+        title: Ändra roll för %{username}
       confirm: Bekräfta
       confirmed: Bekräftad
       confirming: Bekräftande
+      custom: Anpassade
       delete: Radera data
       deleted: Raderad
       demote: Degradera
+      destroyed_msg: "%{username}'s data har nu lagts till kön för att raderas omedelbart"
       disable: inaktivera
+      disable_sign_in_token_auth: Inaktivera autentisering med e-post-token
       disable_two_factor_authentication: Inaktivera 2FA
       disabled: inaktiverad
       display_name: Visningsnamn
@@ -122,7 +67,9 @@ sv:
       email: E-post
       email_status: E-poststatus
       enable: Aktivera
+      enable_sign_in_token_auth: Aktivera autentisering med e-post-token
       enabled: Aktiverad
+      enabled_msg: Uppfrysningen av %{username}'s konto lyckades
       followers: Följare
       follows: Följs
       header: Rubrik
@@ -139,43 +86,50 @@ sv:
       login_status: Inloggningsstatus
       media_attachments: Media bifogade filer
       memorialize: Förvandla till ett memoriam
+      memorialized: Memorialiserad
+      memorialized_msg: Omvandlingen av %{username} till ett minneskonto lyckades
       moderation:
         active: Aktiv
         all: Alla
         pending: Väntande
-        silenced: Tystas
-        suspended: Avstängd
+        silenced: Begränsad
+        suspended: Avstängda
         title: Moderering
       moderation_notes: Moderation anteckning
       most_recent_activity: Senaste aktivitet
       most_recent_ip: Senaste IP
       no_account_selected: Inga konton har ändrats och inget har valts
       no_limits_imposed: Inga begränsningar har införts
+      no_role_assigned: Ingen roll tilldelad
       not_subscribed: Inte prenumererat
       pending: Inväntar granskning
-      perform_full_suspension: Utför full avstängning
+      perform_full_suspension: Stäng av
+      previous_strikes: Tidigare varningar
+      previous_strikes_description_html:
+        one: Detta konto har <strong>en</strong> varning.
+        other: Detta konto har <strong>%{count}</strong> varningar.
       promote: Befordra
       protocol: Protokoll
       public: Offentlig
       push_subscription_expires: PuSH-prenumerationen löper ut
       redownload: Uppdatera profil
+      redownloaded_msg: Uppdaterade %{username}s profil från server
       reject: Förkasta
-      reject_all: Förkasta allt / Avvisa alla
+      rejected_msg: Avvisade %{username}s registreringsansökan
+      remote_suspension_irreversible: Detta konto har raderats och uppgifterna kan inte återkallas.
+      remote_suspension_reversible_hint_html: Kontot har stängts av på dess server och all data som tillhör det kommer att raderas permanent den %{date}. Tills dess kan kontot återställas på sin server utan dataförlust. Om du vill radera all kontodata redan nu, kan du göra detta nedan.
       remove_avatar: Ta bort avatar
       remove_header: Ta bort rubrik
+      removed_avatar_msg: Tog bort %{username}s profilbild
+      removed_header_msg: Tog bort %{username}s sidhuvudsbild
       resend_confirmation:
         already_confirmed: Den här användaren är redan bekräftad
         send: Skicka om e-postbekräftelse
-        success: Bekräftelsemeddelande skickas framgångsrikt!
+        success: Bekräftelsemeddelande skickades framgångsrikt!
       reset: Återställ
       reset_password: Återställ lösenord
       resubscribe: Starta en ny prenumeration
-      role: Behörigheter
-      roles:
-        admin: Administratör
-        moderator: Moderator
-        staff: Personal
-        user: Användare
+      role: Roll
       search: Sök
       search_same_email_domain: Andra användare med samma e-postdomän
       search_same_ip: Annan användare med samma IP-adress
@@ -190,15 +144,23 @@ sv:
         targeted_reports: Anmälningar gjorda om detta konto
       silence: Tystnad
       silenced: Tystad / Tystat
-      statuses: Status
+      statuses: Inlägg
+      strikes: Föregående varningar
       subscribe: Prenumerera
-      suspended: Avstängd / Avstängt
-      time_in_queue: Väntar i kö %{time}
+      suspend: Stäng av
+      suspended: Avstängda
+      suspension_irreversible: All data som tillhör detta konto har permanent raderats. Du kan låsa upp kontot om du vill att det ska gå att använda, men ingen data kommer finnas kvar.
+      suspension_reversible_hint_html: Kontot har stängts av och all data som tillhör det kommer att raderas permanent den %{date}. Tills dess kan kontot återställas utan dataförlust. Om du vill radera all kontodata redan nu, kan du göra detta nedan.
       title: Konton
-      unconfirmed_email: Obekräftad E-postadress
+      unblock_email: Avblockera e-postadress
+      unblocked_email_msg: "%{username}s e-postadress avblockerad"
+      unconfirmed_email: Obekräftad e-postadress
+      undo_sensitized: Ångra tvinga känsligt
       undo_silenced: Ångra tystnad
       undo_suspension: Ångra avstängning
+      unsilenced_msg: Begränsningen borttagen för %{username}s konto
       unsubscribe: Avsluta prenumeration
+      unsuspended_msg: Låste upp %{username}s konto
       username: Användarnamn
       view_domain: Visa sammanfattning för domän
       warn: Varna
@@ -206,92 +168,145 @@ sv:
       whitelisted: Vitlistad
     action_logs:
       action_types:
+        approve_appeal: Godkänn överklagande
+        approve_user: Godkänn användare
         assigned_to_self_report: Tilldela anmälan
         change_email_user: Ändra e-post för användare
+        change_role_user: Ändra roll för användaren
         confirm_user: Bekräfta användare
         create_account_warning: Skapa varning
-        create_announcement: Skapa ett anslag
+        create_announcement: Skapa kungörelse
+        create_canonical_email_block: Skapa e-postblockering
         create_custom_emoji: Skapa egen emoji
         create_domain_allow: Skapa tillåten domän
         create_domain_block: Skapa blockerad domän
+        create_email_domain_block: Skapa blockering av e-postdomän
         create_ip_block: Skapa IP-regel
         create_unavailable_domain: Skapa otillgänglig domän
+        create_user_role: Skapa roll
         demote_user: Degradera användare
-        destroy_announcement: Ta bort anslag
+        destroy_announcement: Radera kungörelse
+        destroy_canonical_email_block: Radera e-postblockering
         destroy_custom_emoji: Radera egen emoji
         destroy_domain_allow: Ta bort tillåten domän
         destroy_domain_block: Ta bort blockerad domän
+        destroy_email_domain_block: Radera blockering av e-postdomän
+        destroy_instance: Rensa domänen
         destroy_ip_block: Radera IP-regel
-        destroy_status: Ta bort status
+        destroy_status: Radera inlägg
         destroy_unavailable_domain: Ta bort otillgänglig domän
+        destroy_user_role: Förstör roll
         disable_2fa_user: Inaktivera 2FA
         disable_custom_emoji: Inaktivera egna emojis
+        disable_sign_in_token_auth_user: Inaktivera autentisering med e-post-token för användare
         disable_user: Inaktivera användare
         enable_custom_emoji: Aktivera egna emojis
+        enable_sign_in_token_auth_user: Aktivera autentisering med e-post-token för användare
         enable_user: Aktivera användare
         memorialize_account: Minnesmärk konto
         promote_user: Befordra användare
+        reject_appeal: Avvisa överklagande
+        reject_user: Avvisa användare
         remove_avatar_user: Ta bort avatar
         reopen_report: Öppna rapporten igen
+        resend_user: Skicka bekräftelse på nytt
         reset_password_user: Återställ lösenord
         resolve_report: Lös rapport
         sensitive_account: Markera mediet i ditt konto som känsligt
         silence_account: Tysta konto
         suspend_account: Stäng av konto
-        unsuspend_account: Återaktivera konto
-        update_announcement: Uppdatera meddelande
+        unassigned_report: Återkalla rapport
+        unblock_email_account: Avblockera e-postadress
+        unsensitive_account: Ångra tvinga känsligt konto
+        unsilence_account: Ångra begränsa konto
+        unsuspend_account: Ångra avstängning av konto
+        update_announcement: Uppdatera kungörelse
         update_custom_emoji: Uppdatera egna emojis
         update_domain_block: Uppdatera blockerad domän
-        update_status: Uppdatera status
+        update_ip_block: Uppdatera IP-regel
+        update_status: Uppdatera inlägg
+        update_user_role: Uppdatera roll
       actions:
+        approve_appeal_html: "%{name} godkände överklagande av modereringsbeslut från %{target}"
+        approve_user_html: "%{name} godkände registrering från %{target}"
+        assigned_to_self_report_html: "%{name} tilldelade rapporten %{target} till sig själva"
+        change_email_user_html: "%{name} bytte e-postadress för användare %{target}"
+        change_role_user_html: "%{name} ändrade roll för %{target}"
+        confirm_user_html: "%{name} bekräftade e-postadress för användare %{target}"
         create_account_warning_html: "%{name} skickade en varning till %{target}"
-        create_announcement_html: "%{name} skapade tillkännagivande %{target}"
+        create_announcement_html: "%{name} skapade kungörelsen %{target}"
+        create_canonical_email_block_html: "%{name} blockerade e-post med hashen %{target}"
         create_custom_emoji_html: "%{name} laddade upp ny emoji %{target}"
-        destroy_custom_emoji_html: "%{name} förstörde emoji %{target}"
+        create_domain_allow_html: "%{name} vitlistade domän %{target}"
+        create_domain_block_html: "%{name} blockerade domänen %{target}"
+        create_email_domain_block_html: "%{name} blockerade e-postdomänen %{target}"
+        create_ip_block_html: "%{name} skapade regel för IP %{target}"
+        create_unavailable_domain_html: "%{name} stoppade leverans till domänen %{target}"
+        create_user_role_html: "%{name} skapade rollen %{target}"
+        demote_user_html: "%{name} nedgraderade användare %{target}"
+        destroy_announcement_html: "%{name} raderade kungörelsen %{target}"
+        destroy_canonical_email_block_html: "%{name} avblockerade e-post med hashen %{target}"
+        destroy_custom_emoji_html: "%{name} raderade emoji %{target}"
+        destroy_domain_allow_html: "%{name} raderade domän %{target} från vitlistan"
         destroy_domain_block_html: "%{name} avblockerade domänen %{target}"
-        destroy_email_domain_block_html: "%{name} avblockerade e-postdomän %{target}"
+        destroy_email_domain_block_html: "%{name} avblockerade e-postdomänen %{target}"
+        destroy_instance_html: "%{name} rensade domän %{target}"
         destroy_ip_block_html: "%{name} tog bort regel för IP %{target}"
         destroy_status_html: "%{name} tog bort inlägget av %{target}"
+        destroy_unavailable_domain_html: "%{name} återupptog leverans till domänen %{target}"
+        destroy_user_role_html: "%{name} raderade rollen %{target}"
+        disable_2fa_user_html: "%{name} inaktiverade tvåfaktorsautentiseringskrav för användaren %{target}"
         disable_custom_emoji_html: "%{name} inaktiverade emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} inaktiverade e-posttokenautentisering för %{target}"
         disable_user_html: "%{name} stängde av inloggning för användaren %{target}"
         enable_custom_emoji_html: "%{name} aktiverade emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} aktiverade e-posttokenautentisering för %{target}"
         enable_user_html: "%{name} aktiverade inloggning för användaren %{target}"
         memorialize_account_html: "%{name} gjorde %{target}'s konto till en minnessida"
         promote_user_html: "%{name} befordrade användaren %{target}"
+        reject_appeal_html: "%{name} avvisade överklagande av modereringsbeslut från %{target}"
+        reject_user_html: "%{name} avvisade registrering från %{target}"
         remove_avatar_user_html: "%{name} tog bort %{target}'s avatar"
         reopen_report_html: "%{name} öppnade rapporten igen %{target}"
+        resend_user_html: "%{name} skickade bekräftelsemail för %{target} på nytt"
         reset_password_user_html: "%{name} återställ användarens lösenord %{target}"
         resolve_report_html: "%{name} löste rapporten %{target}"
         sensitive_account_html: "%{name} markerade %{target}'s media som känsligt"
         silence_account_html: "%{name} begränsade %{target}'s konto"
-        suspend_account_html: "%{name} stängde av %{target}'s konto"
+        suspend_account_html: "%{name} stängde av %{target}s konto"
+        unassigned_report_html: "%{name} tog bort tilldelning av rapporten %{target}"
+        unblock_email_account_html: "%{name} avblockerade %{target}s e-postadress"
         unsensitive_account_html: "%{name} avmarkerade %{target}'s media som känsligt"
-        unsuspend_account_html: "%{name} tog bort avstängningen av %{target}'s konto"
-        update_announcement_html: "%{name} uppdaterade tillkännagivandet %{target}"
+        unsilence_account_html: "%{name} tog bort begränsning av %{target}s konto"
+        unsuspend_account_html: "%{name} ångrade avstängningen av %{target}s konto"
+        update_announcement_html: "%{name} uppdaterade kungörelsen %{target}"
         update_custom_emoji_html: "%{name} uppdaterade emoji %{target}"
         update_domain_block_html: "%{name} uppdaterade domän-block för %{target}"
+        update_ip_block_html: "%{name} ändrade regel för IP %{target}"
         update_status_html: "%{name} uppdaterade inlägget av %{target}"
-      deleted_status: "(raderad status)"
+        update_user_role_html: "%{name} ändrade rollen %{target}"
+      deleted_account: raderat konto
       empty: Inga loggar hittades.
       filter_by_action: Filtrera efter åtgärd
       filter_by_user: Filtrera efter användare
       title: Revisionslogg
     announcements:
-      destroyed_msg: Borttagning av tillkännagivandet lyckades!
+      destroyed_msg: Kungörelsen raderades!
       edit:
-        title: Redigera tillkännagivande
-      empty: Inga tillkännagivanden hittades.
+        title: Redigera kungörelse
+      empty: Inga kungörelser hittades.
       live: Direkt
       new:
-        create: Skapa tillkännagivande
-        title: Nytt tillkännagivande
+        create: Skapa kungörelse
+        title: Ny kungörelse
       publish: Publicera
-      published_msg: Publiceringen av tillkännagivandet lyckades!
-      scheduled_for: Schemalagd för %{time}
-      scheduled_msg: Tillkännagivandet schemalades för publicering!
-      title: Tillkännagivanden
+      published_msg: Publicerade kungörelsen!
+      scheduled_for: Schemalagd till %{time}
+      scheduled_msg: Kungörelsen schemalades för publicering!
+      title: Kungörelser
       unpublish: Avpublicera
-      updated_msg: Uppdatering av tillkännagivandet lyckades!
+      unpublished_msg: Kungörelsen raderades!
+      updated_msg: Kungörelsen uppdaterades!
     custom_emojis:
       assign_category: Tilldela kategori
       by_domain: Domän
@@ -309,11 +324,12 @@ sv:
       enable: Aktivera
       enabled: Aktiverad
       enabled_msg: Aktiverade den emoji utan problem
-      image_hint: PNG upp till 50KB
+      image_hint: PNG eller GIF upp till %{size}
       list: Lista
       listed: Noterade
       new:
         title: Lägg till ny egen emoji
+      no_emoji_selected: Inga emojier ändrades eftersom inga valdes
       not_permitted: Du har inte behörighet att utföra denna åtgärd
       overwrite: Skriva över
       shortcode: Kortkod
@@ -326,13 +342,41 @@ sv:
       updated_msg: Emoji uppdaterades utan problem!
       upload: Ladda upp
     dashboard:
+      active_users: aktiva användare
+      interactions: interaktioner
+      media_storage: Medialagring
+      new_users: nya användare
+      opened_reports: öppnade rapporter
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> väntande överklagan"
+        other: "<strong>%{count}</strong> väntande överklaganden"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> väntande rapport"
+        other: "<strong>%{count}</strong> väntande rapporter"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> väntande hashtagg"
+        other: "<strong>%{count}</strong> väntande hashtaggar"
+      pending_users_html:
+        one: "<strong>%{count}</strong> väntande användare"
+        other: "<strong>%{count}</strong> väntande användare"
+      resolved_reports: lösta rapporter
       software: Programvara
+      sources: Registreringskällor
       space: Utrymmesutnyttjande / Utrymmesanvändning
       title: Kontrollpanel
+      top_languages: Mest aktiva språk
+      top_servers: Mest aktiva servrar
+      website: Hemsida
+    disputes:
+      appeals:
+        empty: Inga överklaganden hittades.
+        title: Överklaganden
     domain_allows:
       add_new: Vitlistedomän
       created_msg: Domänen har vitlistats
       destroyed_msg: Domänen har tagits bort från vitlistan
+      export: Exportera
+      import: Importera
       undo: Tag bort från vitlistan
     domain_blocks:
       add_new: Lägg till ny
@@ -340,72 +384,122 @@ sv:
       destroyed_msg: Domänblockering har återtagits
       domain: Domän
       edit: Ändra domänblock
+      existing_domain_block: Du har redan satt strängare gränser för %{name}.
       existing_domain_block_html: Du har redan satt begränsningar för %{name} så <a href="%{unblock_url}">avblockera användaren</a> först.
+      export: Exportera
+      import: Importera
       new:
         create: Skapa block
-        hint: Domänblocket hindrar inte skapandet av kontoposter i databasen, men kommer retroaktivt, automatiskt att tillämpa specifika modereringsmetoder på dessa konton.
+        hint: Domänblockeringen hindrar inte skapandet av kontoposter i databasen, men kommer retroaktivt och automatiskt tillämpa specifika modereringsmetoder på dessa konton.
         severity:
-          desc_html: "<strong>Tysta ner</strong> kommer att göra kontoinlägg osynliga för alla som inte följer dem. <strong>Suspendera</strong> kommer ta bort allt av kontots innehåll, media och profildata. Använd <strong>Ingen</strong> om du bara vill avvisa mediefiler."
+          desc_html: "<strong>Gräns</strong> gör inlägg från konton på denna domän osynliga för alla som inte följer kontona. <strong>Avstängning</strong> tar bort allt innehåll, media och profildata för domänens konton från din server. Använd <strong>Ingen</strong> om du bara vill avvisa mediefiler."
           noop: Ingen
-          silence: Tysta ner
-          suspend: Suspendera
+          silence: Begränsa
+          suspend: Stäng av
         title: Nytt domänblock
+      no_domain_block_selected: Inga blockeringar av domäner ändrades eftersom inga valdes
+      not_permitted: Du har inte behörighet att utföra denna åtgärd
       obfuscate: Dölj domännamn
       obfuscate_hint: Dölj domännamnet i listan till viss del, om underrättelser för listan över domänbegränsningar aktiverats
       private_comment: Privat kommentar
       private_comment_hint: Kommentar för moderatorer om denna domänbegränsning.
       public_comment: Offentlig kommentar
+      public_comment_hint: Kommentar om denna domänbegränsning för allmänheten, om listan över domänbegränsningar är publik.
       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
       reject_reports: Avvisa rapporter
       reject_reports_hint: Ignorera alla rapporter som kommer från den här domänen. Gäller inte för avstängningar
-      rejecting_media: avvisar media-filer
-      rejecting_reports: avvisar rapporter
-      severity:
-        silence: tystad
-        suspend: avstängd
-      show:
-        affected_accounts:
-          one: Ett konto i databasen drabbades
-          other: "%{count} konton i databasen har drabbats"
-        retroactive:
-          silence: Ta bort tysta ner från alla befintliga konton på den här domänen
-          suspend: Ta bort suspendering från alla befintliga konton på den här domänen
-        title: Ångra domänblockering för %{domain}
-        undo: Ångra
       undo: Ångra
       view: Visa domänblock
     email_domain_blocks:
       add_new: Lägg till ny
-      created_msg: E-postdomän har lagts till i domänblockslistan utan problem
+      attempts_over_week:
+        one: "%{count} försök under den senaste veckan"
+        other: "%{count} registreringsförsök under den senaste veckan"
+      created_msg: Blockerade e-postdomänen
       delete: Radera
-      destroyed_msg: E-postdomän har tagits bort från domänblockslistan utan problem
+      dns:
+        types:
+          mx: MX-post
       domain: Domän
-      empty: För tillfället inga svartlistade mejl.
-      from_html: från %{domain}
       new:
         create: Skapa domän
-        title: Ny E-postdomänblocklistningsinmatning
-      title: E-postdomänblock
+        resolve: Slå upp domän
+        title: Blockera ny e-postdomän
+      no_email_domain_block_selected: Inga blockeringar av e-postdomäner ändrades eftersom inga valdes
+      resolved_dns_records_hint_html: Domännamnet ger uppslag till följande MX-domäner, vilka är ytterst ansvariga för att e-post tas emot. Att blockera en MX-domän blockerar även registreringar från alla e-postadresser som använder samma MX-domän, även om det synliga domännamnet är annorlunda. <strong>Var noga med att inte blockera stora e-postleverantörer.</strong>
+      resolved_through_html: Uppslagen genom %{domain}
+      title: Blockerade e-postdomäner
+    export_domain_allows:
+      new:
+        title: Importera domäntillåtelser
+      no_file: Ingen fil vald
+    export_domain_blocks:
+      import:
+        description_html: Du håller på att importera en lista med domänblockeringar. Granska denna lista mycket noga, särskilt om du inte har skapat listan själv.
+        existing_relationships_warning: Befintliga följ-relationer
+        private_comment_description_html: 'För att hjälpa dig spåra var importerade blockeringar kommer från kommer importerade blockeringar att skapas med följande privata kommentar: <q>%{comment}</q>'
+        private_comment_template: Importerad från %{source} den %{date}
+        title: Importera domänblockeringar
+      new:
+        title: Importera domänblockeringar
+      no_file: Ingen fil vald
     follow_recommendations:
+      description_html: "<strong>Följrekommendationer hjälper nya användare att snabbt hitta intressant innehåll</strong>. När en användare inte har interagerat med andra tillräckligt mycket för att forma personliga följrekommendationer, rekommenderas istället dessa konton. De beräknas om varje dag från en mix av konton med nylig aktivitet och högst antal följare för ett givet språk."
       language: För språket
       status: Status
+      suppress: Tryck ner följrekommendation
+      suppressed: Undertryckt
       title: Följ rekommendationer
+      unsuppress: Återställ följrekommendation
     instances:
+      availability:
+        description_html:
+          one: Om leveranser till domänen misslyckas i <strong>%{count} dag</strong> kommer inga ytterligare leveransförsök att göras förrän en leverans <em>från</em> domänen tas emot.
+          other: Om leveranser till domänen misslyckas på <strong>%{count} olika dagar</strong> kommer inga ytterligare leveransförsök att göras förrän en leverans <em>från</em> domänen tas emot.
+        failure_threshold_reached: Tröskeln för misslyckande nåddes den %{date}.
+        failures_recorded:
+          one: Misslyckat försök under %{count} dag.
+          other: Misslyckade försök under %{count} olika dagar.
+        no_failures_recorded: Inga fel registrerade.
+        title: Tillgänglighet
+        warning: Det senaste försöket att ansluta till denna värddator har misslyckats
       back_to_all: Alla
       back_to_limited: Begränsat
       back_to_warning: Varning
       by_domain: Domän
+      confirm_purge: Är du säker på att du vill ta bort data permanent från den här domänen?
+      content_policies:
+        comment: Intern anteckning
+        description_html: Du kan definiera innehållspolicyer som kommer tillämpas på alla konton från denna domän samt alla dess underdomäner.
+        policies:
+          reject_media: Avvisa media
+          reject_reports: Avvisa rapporter
+          silence: Gräns
+          suspend: Stäng av
+        policy: Policy
+        reason: Offentlig orsak
+        title: Riktlinjer för innehåll
+      dashboard:
+        instance_accounts_dimension: Mest följda konton
+        instance_accounts_measure: lagrade konton
+        instance_followers_measure: våra följare där
+        instance_follows_measure: sina följare här
+        instance_languages_dimension: Mest använda språk
+        instance_media_attachments_measure: lagrade mediebilagor
+        instance_reports_measure: rapporter om dem
+        instance_statuses_measure: sparade inlägg
       delivery:
         all: Alla
         clear: Rensa leverans-fel
+        failing: Misslyckas
         restart: Starta om leverans
         stop: Stoppa leverans
-        title: Leverans
         unavailable: Ej tillgänglig
-        unavailable_message: Leverans otillgängligt
-        warning: Varning
       delivery_available: Leverans är tillgängligt
+      delivery_error_days: Leveransfelsdagar
+      delivery_error_hint: Om leverans inte är möjligt i %{count} dagar, kommer det automatiskt markeras som ej levererbart.
+      destroyed_msg: Data från %{domain} står nu i kö för förestående radering.
       empty: Inga domäner hittades.
       known_accounts:
         one: "%{count} känt konto"
@@ -416,12 +510,15 @@ sv:
         title: Moderering
       private_comment: Privat kommentar
       public_comment: Offentlig kommentar
+      purge: Rensa
+      purge_description_html: Om du tror att denna domän har kopplats ned för gott, kan du radera alla kontoposter och associerad data tillhörande denna domän från din lagringsyta. Detta kan ta tid.
       title: Kända instanser
       total_blocked_by_us: Blockerad av oss
       total_followed_by_them: Följs av dem
       total_followed_by_us: Följs av oss
       total_reported: Rapporter om dem
       total_storage: Media-bilagor
+      totals_time_period_hint_html: Totalsummorna som visas nedan inkluderar data för all tid.
     invites:
       deactivate_all: Inaktivera alla
       filter:
@@ -445,20 +542,22 @@ sv:
         title: Skapa ny IP-regel
       no_ip_block_selected: Inga IP-regler ändrades då inga var valda
       title: IP-regler
-    pending_accounts:
-      title: Väntande konton (%{count})
     relationships:
       title: "%{acct}'s relationer"
     relays:
       add_new: Lägg till nytt relä
       delete: Radera
+      description_html: Ett <strong>federeringsombud</strong> är en mellanliggande server som utbyter höga antal offentliga inlägg mellan servrar som prenumererar på och publicerar till det. <strong>Det kan hjälpa små och medelstora servrar upptäcka innehåll från fediversumet</strong>, vilket annars skulle kräva att lokala användare manuellt följer personer på fjärrservrar.
       disable: Inaktivera
       disabled: Inaktiverad
       enable: Aktivera
-      enable_hint: När den är aktiverad kommer din server att prenumerera på alla publika toots från detta relay, och kommer att börja skicka serverns publika toots till den.
+      enable_hint: Vid aktivering kommer din server börja prenumerera på alla offentliga inlägg från detta ombud, och kommer börja sända denna servers offentliga inlägg till den.
       enabled: Aktivera
+      inbox_url: Ombuds-URL
+      pending: Väntar på ombudets godkännande
       save_and_enable: Spara och aktivera
       setup: Konfigurera en relä-anslutning
+      signatures_not_enabled: Ombud fungerar inte korrekt medan säkert läge eller begränsat federeringsläge är aktiverade
       status: Status
       title: Relä
     report_notes:
@@ -469,211 +568,397 @@ sv:
         notes:
           one: "%{count} anteckning"
           other: "%{count} anteckningar"
-        reports:
-          one: "%{count} rapport"
-          other: "%{count} rapporter"
+      action_log: Granskningslogg
       action_taken_by: Åtgärder vidtagna av
+      actions:
+        delete_description_html: De rapporterade inläggen kommer raderas och en prick kommer registreras för att hjälpa dig eskalera framtida överträdelser av samma konto.
+        mark_as_sensitive_description_html: Medierna i de rapporterade inläggen kommer markeras som känsliga och en prick kommer registreras för att hjälpa dig eskalera framtida överträdelser av samma konto.
+        other_description_html: Se fler alternativ för att kontrollera kontots beteende och anpassa kommunikationen till det rapporterade kontot.
+        resolve_description_html: Ingen åtgärd vidtas mot det rapporterade kontot, ingen prick registreras och rapporten stängs.
+        silence_description_html: Profilen kommer endast synas för de som redan följer den eller manuellt söker på den, vilket dramatiskt minskar dess räckvidd. Kan alltid ångras.
+        suspend_description_html: Profilen och allt dess innehåll kommer att bli oåtkomligt tills det slutligen raderas. Det kommer inte vara möjligt att interagera med kontot. Går att ångra inom 30 dagar.
+      actions_description_html: Välj vilken åtgärd som skall vidtas för att lösa denna rapport. Om du vidtar en bestraffningsåtgärd mot det rapporterade kontot kommer en e-postnotis att skickas till dem, förutom om du valt kategorin <strong>Skräppost</strong>.
+      add_to_report: Lägg till mer i rapporten
       are_you_sure: Är du säker?
       assign_to_self: Tilldela till mig
       assigned: Tilldelad moderator
+      by_target_domain: Domän för rapporterat konto
+      category: Kategori
+      category_description_html: Anledningen till att kontot och/eller innehållet rapporterades kommer att visas i kommunikation med det rapporterade kontot
       comment:
         none: Ingen
+      comment_description_html: 'För att ge mer information, skrev %{name}:'
       created_at: Anmäld
+      delete_and_resolve: Ta bort inlägg
       forwarded: Vidarebefordrad
       forwarded_to: Vidarebefordrad till %{domain}
       mark_as_resolved: Markera som löst
+      mark_as_sensitive: Markera som känslig
       mark_as_unresolved: Markera som olöst
+      no_one_assigned: Ingen
       notes:
         create: Lägg till anteckning
         create_and_resolve: Lös med anteckning
         create_and_unresolve: Återuppta med anteckning
         delete: Radera
         placeholder: Beskriv vilka åtgärder som vidtagits eller andra uppdateringar till den här anmälan.
+        title: Anteckningar
+      notes_description_html: Visa och lämna anteckningar till andra moderatorer och ditt framtida jag
+      quick_actions_description_html: 'Ta en snabb åtgärd eller bläddra ner för att se rapporterat innehåll:'
+      remote_user_placeholder: fjärranvändaren från %{instance}
       reopen: Återuppta anmälan
-      report: 'Anmäl #%{id}'
+      report: 'Rapport #%{id}'
       reported_account: Anmält konto
       reported_by: Anmäld av
       resolved: Löst
       resolved_msg: Anmälan har lösts framgångsrikt!
+      skip_to_actions: Hoppa till åtgärder
       status: Status
-      target_domain: Domän för rapporterat konto
+      statuses: Rapporterat innehåll
+      statuses_description_html: Stötande innehåll kommer att citeras i kommunikationen med det rapporterade kontot
       target_origin: Ursprung för anmält konto
       title: Anmälningar
       unassign: Otilldela
       unresolved: Olösta
       updated_at: Uppdaterad
+      view_profile: Visa profil
+    roles:
+      add_new: Lägg till roll
+      assigned_users:
+        one: "%{count} användare"
+        other: "%{count} användare"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Inbjudningar
+        moderation: Moderering
+        special: Särskild
+      delete: Ta bort
+      description_html: Med <strong>användarroller</strong> kan du anpassa vilka funktioner och områden dina användare kan komma åt i Mastodon.
+      edit: Redigera roll för '%{name}'
+      everyone: Standardbehörigheter
+      everyone_full_description_html: Detta är den <strong>grundroll</strong> som påverkar <strong>alla användare</strong>, även de utan särskilt tilldelad roll. Alla andra roller ärver behörigheter från denna.
+      permissions_count:
+        one: "%{count} behörighet"
+        other: "%{count} behörigheter"
+      privileges:
+        administrator: Administratör
+        administrator_description: Användare med denna behörighet kommer att kringgå alla behörigheter
+        delete_user_data: Ta bort användardata
+        delete_user_data_description: Tillåter användare att omedelbart radera andra användares data
+        invite_users: Bjud in användare
+        invite_users_description: Tillåter användare att bjuda in nya personer till servern
+        manage_announcements: Hantera kungörelser
+        manage_announcements_description: Tillåt användare att hantera kungörelser på servern
+        manage_appeals: Hantera överklaganden
+        manage_appeals_description: Tillåter användare att granska överklaganden av modereringsåtgärder
+        manage_blocks: Hantera blockeringar
+        manage_blocks_description: Tillåter användare att blockera e-postleverantörer och IP-adresser
+        manage_custom_emojis: Hantera egna emojier
+        manage_custom_emojis_description: Tillåter användare att hantera egna emojier på servern
+        manage_federation: Hantera federering
+        manage_federation_description: Tillåter användare att blockera eller tillåta federering med andra domäner, samt kontrollera levererbarhet
+        manage_invites: Hantera inbjudningar
+        manage_invites_description: Tillåter användare att granska och inaktivera inbjudningslänkar
+        manage_reports: Hantera rapporter
+        manage_reports_description: Tillåter användare att granska rapporter och utföra modereringsåtgärder på dessa
+        manage_roles: Hantera roller
+        manage_roles_description: Tillåter användare att hantera och tilldela roller underordnade deras
+        manage_rules: Hantera regler
+        manage_rules_description: Tillåter användare att ändra serverregler
+        manage_settings: Hantera inställningar
+        manage_settings_description: Tillåter användare att ändra webbplatsinställningar
+        manage_taxonomies: Hantera taxonomier
+        manage_taxonomies_description: Tillåter användare att granska trendande innehåll och uppdatera inställningar för hashtaggar
+        manage_user_access: Hantera användaråtkomst
+        manage_user_access_description: Tillåter användare att inaktivera andra användares tvåfaktorsautentisering, ändra deras e-postadress samt återställa deras lösenord
+        manage_users: Hantera användare
+        manage_users_description: Tillåter användare att granska användares data och utföra modereringsåtgärder på dessa
+        manage_webhooks: Hantera webhooks
+        manage_webhooks_description: Tillåter användare att konfigurera webhooks för administrativa händelser
+        view_audit_log: Visa granskningsloggen
+        view_audit_log_description: Tillåter användare att se historiken över administrativa åtgärder på servern
+        view_dashboard: Visa instrumentpanel
+        view_dashboard_description: Ger användare tillgång till instrumentpanelen och olika mätvärden
+        view_devops: DevOps
+        view_devops_description: Ger användare tillgång till instrumentpanelerna Sidekiq och pgHero
+      title: Roller
     rules:
       add_new: Lägg till regel
       delete: Radera
+      description_html: Även om de flesta hävdar att de samtycker till tjänstevillkoren, läser folk ofta inte igenom dem förrän det uppstår problem. <strong>Gör dina serverregler mer lättöverskådliga genom att tillhandahålla dem i en enkel punktlista.</strong> Försök att hålla enskilda regler korta och koncisa utan att samtidigt separera dem till för många enskilda punkter.
       edit: Ändra regel
+      empty: Inga serverregler har ännu angetts.
       title: Serverns regler
     settings:
-      activity_api_enabled:
-        desc_html: Räkning av lokalt postade statusar, aktiva användare och nyregistreringar per vecka
-        title: Publicera uppsamlad statistik om användaraktivitet
-      bootstrap_timeline_accounts:
-        desc_html: Separera flera användarnamn med kommatecken. Endast lokala och olåsta konton kommer att fungera. Standard när det är tomt och alla är lokala administratörer.
-        title: Standard att följa för nya användare
-      contact_information:
-        email: Företag E-post
-        username: Användarnamn för kontakt
-      custom_css:
-        desc_html: Ändra utseendet genom CSS laddat på varje sida
-        title: Anpassad CSS
+      about:
+        manage_rules: Hantera serverregler
+        preamble: Ange fördjupad information om hur servern driftas, modereras och finansieras.
+        rules_hint: Det finns ett dedikerat ställe för regler som användarna förväntas följa.
+        title: Om
+      appearance:
+        preamble: Anpassa Mastodons webbgränssnitt.
+        title: Utseende
+      branding:
+        preamble: Din servers profilering differentierar den från andra servrar på nätverket. Denna information kan visas i en mängd olika miljöer, så som Mastodons webbgränssnitt, nativapplikationer, länkförhandsvisningar på andra webbsidor och i meddelandeapplikationer och så vidare. Av dessa anledningar är det bäst att hålla informationen tydlig, kort och koncis.
+        title: Profilering
+      content_retention:
+        preamble: Kontrollera hur användargenererat innehåll lagras i Mastodon.
+        title: Bibehållande av innehåll
       default_noindex:
-        desc_html: Påverkar alla användare som inte har ändrat denna inställning själva
+        desc_html: Påverkar alla användare som inte själva ändrat denna inställning
         title: Undantag användare från sökmotorindexering som standard
+      discovery:
+        follow_recommendations: Följrekommendationer
+        preamble: Att visa intressant innehåll är avgörande i onboarding av nya användare som kanske inte känner någon på Mastodon. Styr hur olika upptäcktsfunktioner fungerar på din server.
+        profile_directory: Profilkatalog
+        public_timelines: Offentliga tidslinjer
+        title: Upptäck
+        trends: Trender
       domain_blocks:
         all: Till alla
         disabled: För ingen
-        title: Visa domän-blockeringar
         users: För inloggade lokala användare
-      domain_blocks_rationale:
-        title: Visa motiv
-      hero:
-        desc_html: Visas på framsidan. Minst 600x100px rekommenderas. Om inte angiven faller den tillbaka på instansens miniatyrbild
-        title: Hjältebild
-      mascot:
-        title: Maskot bild
-      peers_api_enabled:
-        desc_html: Domännamn denna instans har påträffat i fediverse
-        title: Publicera lista över upptäckta instanser
-      preview_sensitive_media:
-        title: Visa känsligt media i OpenGraph-förhandsvisningar
-      profile_directory:
-        desc_html: Tillåt användare att upptäckas
-        title: Aktivera profil-mapp
       registrations:
-        closed_message:
-          desc_html: Visas på framsidan när registreringen är stängd. Du kan använda HTML-taggar
-          title: Stängt registreringsmeddelande
-        deletion:
-          desc_html: Tillåt vem som helst att radera sitt konto
-          title: Öppen kontoradering
-        min_invite_role:
-          disabled: Ingen
-          title: Tillåt inbjudningar av
-        require_invite_text:
-          desc_html: När nyregistrering kräver manuellt godkännande, gör det obligatoriskt att fylla i text i fältet "Varför vill du gå med?"
-          title: Kräv att nya användare fyller i en inbjudningsförfrågan
+        preamble: Kontrollera vem som kan skapa ett konto på din server.
+        title: Registreringar
       registrations_mode:
         modes:
           approved: Godkännande krävs för registrering
           none: Ingen kan registrera
           open: Alla kan registrera
-        title: Registreringsläge
-      show_known_fediverse_at_about_page:
-        desc_html: När den växlas, kommer toots från hela fediverse visas på förhandsvisning. Annars visas bara lokala toots.
-        title: Visa det kända fediverse på tidslinjens förhandsgranskning
-      show_staff_badge:
-        desc_html: Visa en personalbricka på en användarsida
-        title: Visa personalbricka
-      site_description:
-        desc_html: Inledande stycke på framsidan och i metataggar. Du kan använda HTML-taggar, i synnerhet <code>&lt;a&gt;</code> och <code>&lt;em&gt;</code>.
-        title: Instansbeskrivning
-      site_description_extended:
-        desc_html: Ett bra ställe för din uppförandekod, regler, riktlinjer och andra saker som stämmer med din instans. Du kan använda HTML-taggar
-        title: Egentillverkad utökad information
-      site_short_description:
-        title: Kort beskrivning av servern
-      site_terms:
-        desc_html: Du kan skriva din egen integritetspolicy, användarvillkor eller andra regler. Du kan använda HTML-taggar
-        title: Egentillverkad villkor för tjänster
-      site_title: Namn på instans
-      thumbnail:
-        desc_html: Används för förhandsgranskningar via OpenGraph och API. 1200x630px rekommenderas
-        title: Instans tumnagelbild
-      timeline_preview:
-        desc_html: Visa offentlig tidslinje på landingsidan
-        title: Förhandsgranska tidslinje
-      title: Sidans inställningar
-      trends:
-        title: Trendande hashtaggar
+      title: Serverinställningar
     site_uploads:
       delete: Radera uppladdad fil
+      destroyed_msg: Webbplatsuppladdningen har raderats!
     statuses:
+      account: Författare
+      application: Applikation
       back_to_account: Tillbaka till kontosidan
+      back_to_report: Tillbaka till rapportsidan
       batch:
-        delete: Radera
-        nsfw_off: Markera som ej känslig
-        nsfw_on: Markera som känslig
+        remove_from_report: Ta bort från rapport
+        report: Rapportera
       deleted: Raderad
-      failed_to_execute: Misslyckades att utföra
+      favourites: Favoriter
+      history: Versionshistorik
+      in_reply_to: Svarar på
+      language: Språk
       media:
         title: Media
-      no_media: Ingen media
-      title: Kontostatus
+      metadata: Metadata
+      no_status_selected: Inga inlägg ändrades eftersom inga valdes
+      open: Öppna inlägg
+      original_status: Ursprungligt inlägg
+      reblogs: Ombloggningar
+      status_changed: Inlägg ändrat
+      title: Kontoinlägg
+      trending: Trendande
+      visibility: Synlighet
       with_media: med media
+    strikes:
+      actions:
+        delete_statuses: "%{name} raderade %{target}s inlägg"
+        disable: "%{name} frös %{target}s konto"
+        mark_statuses_as_sensitive: "%{name} markerade %{target}s inlägg som känsliga"
+        none: "%{name} skickade en varning till %{target}"
+        sensitive: "%{name} markerade %{target}s konto som känsligt"
+        silence: "%{name} begränsade %{target}s konto"
+        suspend: "%{name} stängde av %{target}s konto"
+      appeal_approved: Överklagad
+      appeal_pending: Överklagande väntar
     system_checks:
+      database_schema_check:
+        message_html: Det finns väntande databasmigreringar. Vänligen kör dem för att säkerställa att programmet beter sig som förväntat
+      elasticsearch_running_check:
+        message_html: Kunde inte ansluta till Elasticsearch. Kontrollera att det körs, eller inaktivera fulltextsökning
+      elasticsearch_version_check:
+        message_html: 'Inkompatibel Elasticsearch-version: %{value}'
+        version_comparison: Elasticsearch %{running_version} körs medan %{required_version} krävs
       rules_check:
         action: Hantera serverregler
         message_html: Du har inte definierat några serverregler.
+      sidekiq_process_check:
+        message_html: Ingen Sidekiq-process körs för kön/köerna %{value}. Vänligen kontrollera din Sidekiq-konfiguration
     tags:
-      accounts_today: Unika användare idag
-      accounts_week: Unika användare den här veckan
-      last_active: Senast aktiv
-      most_popular: Mest populära
-      most_recent: Nyligen skapade
-      name: Hashtag
-      reviewed: Granskad
-      title: Hashtaggar
-      trending_right_now: Trenderar just nu
-      unreviewed: Ej granskad
+      review: Granskningsstatus
+      updated_msg: Hashtagg-inställningarna har uppdaterats
     title: Administration
+    trends:
+      allow: Tillåt
+      approved: Godkänd
+      disallow: Neka
+      links:
+        allow: Tillåt länk
+        allow_provider: Tillåt utgivare
+        description_html: Detta är länkar som för närvarande delas mycket av konton som din server ser inlägg från. Det kan hjälpa dina användare att ta reda på vad som händer i världen. Inga länkar visas offentligt tills du godkänner utgivaren. Du kan också tillåta eller avvisa enskilda länkar.
+        disallow: Blockera länk
+        disallow_provider: Blockera utgivare
+        no_link_selected: Inga länkar ändrades eftersom inga valdes
+        publishers:
+          no_publisher_selected: Inga utgivare ändrades eftersom inga valdes
+        shared_by_over_week:
+          one: Delad av en person under den senaste veckan
+          other: Delad av %{count} personer under den senaste veckan
+        title: Trendande länkar
+        usage_comparison: Delade %{today} gånger idag, jämfört med %{yesterday} igår
+      only_allowed: Endast tillåtna
+      pending_review: Väntar på granskning
+      preview_card_providers:
+        allowed: Länkar från denna utgivare kan trenda
+        description_html: Detta är domäner från vilka länkar ofta delas på din server. Länkar kommer inte att trenda offentligt om inte deras domän godkänns. Ditt godkännande (eller avslag) omfattar underdomäner.
+        rejected: Länkar från denna utgivare kommer inte att trenda
+        title: Utgivare
+      rejected: Avvisade
+      statuses:
+        allow: Tillåt inlägg
+        allow_account: Godkänn författare
+        description_html: Detta är inlägg som din server vet om som för närvarande delas och favoriseras mycket just nu. Det kan hjälpa dina nya och återvändande användare att hitta fler människor att följa. Inga inlägg visas offentligt förrän du godkänner författaren, och författaren tillåter att deras konto föreslås till andra. Du kan också tillåta eller avvisa enskilda inlägg.
+        disallow: Tillåt inte inlägg
+        disallow_account: Tillåt inte författare
+        no_status_selected: Inga trendande inlägg ändrades eftersom inga valdes
+        not_discoverable: Författaren har valt att inte vara upptäckbar
+        shared_by:
+          one: Delad eller favoritmarkerad en gång
+          other: Delade och favoritmarkerade %{friendly_count} gånger
+        title: Trendande inlägg
+      tags:
+        current_score: Nuvarande poäng %{score}
+        dashboard:
+          tag_accounts_measure: unika användningar
+          tag_languages_dimension: Mest använda språk
+          tag_servers_dimension: Mest använda servrar
+          tag_servers_measure: olika servrar
+          tag_uses_measure: total användning
+        description_html: Detta är hashtaggar som just nu visas i många inlägg som din server ser. Det kan hjälpa dina användare att ta reda på vad människor talar mest om för tillfället. Inga hashtaggar visas offentligt tills du godkänner dem.
+        listable: Kan föreslås
+        no_tag_selected: Inga taggar ändrades eftersom inga valdes
+        not_listable: Kommer ej föreslås
+        not_trendable: Kommer ej visas under trender
+        not_usable: Kan inte användas
+        peaked_on_and_decaying: Nådde sin höjdpunkt %{date}, faller nu
+        title: Trendande hashtaggar
+        trendable: Kan visas under trender
+        trending_rank: 'Trendande #%{rank}'
+        usable: Kan användas
+        usage_comparison: Använd %{today} gånger idag, jämfört med %{yesterday} igår
+        used_by_over_week:
+          one: Använd av en person under den senaste veckan
+          other: Använd av %{count} personer under den senaste veckan
+      title: Trender
+      trending: Trendande
     warning_presets:
       add_new: Lägg till ny
       delete: Radera
+      edit_preset: Redigera varningsförval
+      empty: Du har inte definierat några varningsförval ännu.
+      title: Hantera varningsförval
+    webhooks:
+      add_new: Lägg till slutpunkt
+      delete: Ta bort
+      description_html: En <strong>webhook</strong> gör det möjligt för Mastodon att skicka <strong>realtidsaviseringar</strong> om valda händelser till din egen applikation så att den <strong>automatiskt kan utlösa händelser</strong>.
+      disable: Inaktivera
+      disabled: Inaktiverad
+      edit: Redigera slutpunkt
+      empty: Du har inte några webhook-slutpunkter konfigurerade ännu.
+      enable: Aktivera
+      enabled: Aktiv
+      enabled_events:
+        one: 1 aktiverad händelse
+        other: "%{count} aktiverade händelser"
+      events: Händelser
+      new: Ny webhook
+      rotate_secret: Rotera hemlighet
+      secret: Signeringshemlighet
+      status: Status
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: att radera deras inlägg
+        disable: för att frysa deras konto
+        mark_statuses_as_sensitive: för att markera deras inlägg som känsliga
+        none: en varning
+        sensitive: för att markera deras konto som känsligt
+        silence: för att begränsa deras konto
+        suspend: för att stänga av deras konto
+      body: "%{target} överklagade ett modereringsbeslut av typen %{type}, taget av %{action_taken_by} den %{date}. De skrev:"
+      next_steps: Du kan godkänna överklagan för att ångra modereringsbeslutet, eller ignorera det.
+      subject: "%{username} överklagar ett modereringsbeslut på %{instance}"
+    new_pending_account:
+      body: Detaljerna för det nya kontot finns nedan. Du kan godkänna eller avvisa denna ansökan.
+      subject: Nytt konto flaggat för granskning på %{instance} (%{username})
     new_report:
       body: "%{reporter} har rapporterat %{target}"
       body_remote: Någon från %{domain} har rapporterat %{target}
       subject: Ny rapport för %{instance} (#%{id})
+    new_trends:
+      body: 'Följande objekt behöver granskas innan de kan visas publikt:'
+      new_trending_links:
+        title: Trendande länkar
+      new_trending_statuses:
+        title: Trendande inlägg
+      new_trending_tags:
+        no_approved_tags: Det finns för närvarande inga godkända trendande hashtaggar.
+        requirements: 'Någon av dessa kandidater skulle kunna överträffa #%{rank} godkända trendande hashtaggar, som för närvarande är #%{lowest_tag_name} med en poäng på %{lowest_tag_score}.'
+        title: Trendande hashtaggar
+      subject: Nya trender tillgängliga för granskning på %{instance}
   aliases:
     add_new: Skapa alias
+    created_msg: Ett nytt alias skapades. Du kan nu initiera flytten från det gamla kontot.
+    deleted_msg: Aliaset togs bort. Att flytta från det kontot till detta kommer inte längre vara möjligt.
+    empty: Du har inga alias.
+    hint_html: Om du vill flytta från ett annat konto till detta kan du skapa ett alias här, detta krävs innan du kan fortsätta med att flytta följare från det gamla kontot till detta. Denna åtgärd är <strong>ofarlig och kan ångras</strong>. <strong>Kontomigreringen initieras från det gamla kontot.</strong>.
     remove: Avlänka alias
   appearance:
     advanced_web_interface: Avancerat webbgränssnitt
+    advanced_web_interface_hint: 'Om du vill utnyttja hela skärmens bredd så kan du i det avancerade webbgränssnittet ställa in många olika kolumner för att se så mycket information samtidigt som du vill: Hem, notiser, federerad tidslinje, valfritt antal listor och hashtaggar.'
     animations_and_accessibility: Animationer och tillgänglighet
+    confirmation_dialogs: Bekräftelsedialoger
     discovery: Upptäck
     localization:
       body: Mastodon översätts av volontärer.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Alla kan bidra.
     sensitive_content: Känsligt innehåll
+    toot_layout: Inläggslayout
   application_mailer:
     notification_preferences: Ändra e-postinställningar
     salutation: "%{name},"
     settings: 'Ändra e-postinställningar: %{link}'
     view: 'Granska:'
     view_profile: Visa profil
-    view_status: Visa status
+    view_status: Visa inlägg
   applications:
     created: Ansökan är framgångsrikt skapad
     destroyed: Ansökan är framgångsrikt borttagen
-    invalid_url: Den angivna webbadressen är ogiltig
     regenerate_token: Regenerera access token
     token_regenerated: Access token lyckades regenereras
     warning: Var mycket försiktig med denna data. Dela aldrig den med någon!
     your_token: Din access token
   auth:
-    apply_for_account: Be om en inbjudan
+    apply_for_account: Ansök om konto
     change_password: Lösenord
-    checkbox_agreement_html: Jag accepterar <a href="%{rules_path}" target="_blank">serverreglerna</a> och <a href="%{terms_path}" target="_blank">villkoren för användning</a>
     delete_account: Radera konto
     delete_account_html: Om du vill radera ditt konto kan du <a href="%{path}">fortsätta här</a>. Du kommer att bli ombedd att bekräfta.
     description:
       prefix_invited_by_user: "@%{name} bjuder in dig att gå med i en Mastodon-server!"
       prefix_sign_up: Registrera dig på Mastodon idag!
+      suffix: Med ett konto kommer du att kunna följa personer, göra inlägg och utbyta meddelanden med användare från andra Mastodon-servrar, och ännu mer!
     didnt_get_confirmation: Fick du inte instruktioner om bekräftelse?
     dont_have_your_security_key: Har du inte din säkerhetsnyckel?
     forgot_password: Glömt ditt lösenord?
     invalid_reset_password_token: Lösenordsåterställningstoken är ogiltig eller utgått. Vänligen be om en ny.
     link_to_otp: Ange en tvåfaktor-kod från din telefon eller en återställningskod
+    link_to_webauth: Använd din säkerhetsnyckel
+    log_in_with: Logga in med
     login: Logga in
     logout: Logga ut
     migrate_account: Flytta till ett annat konto
     migrate_account_html: Om du vill omdirigera detta konto till ett annat, kan du <a href="%{path}">konfigurera det här</a>.
     or_log_in_with: Eller logga in med
+    privacy_policy_agreement_html: Jag har läst och godkänner <a href="%{privacy_policy_path}" target="_blank">integritetspolicyn</a>
     providers:
       cas: CAS
       saml: SAML
@@ -681,15 +966,29 @@ sv:
     registration_closed: "%{instance} accepterar inte nya medlemmar"
     resend_confirmation: Skicka instruktionerna om bekräftelse igen
     reset_password: Återställ lösenord
+    rules:
+      preamble: Dessa bestäms och upprätthålls av moderatorerna för %{domain}.
+      title: Några grundregler.
     security: Säkerhet
     set_new_password: Skriv in nytt lösenord
     setup:
-      email_settings_hint_html: Bekräftelsemeddelandet skickades till %{email}. Om den e-postadressen inte stämmer så kan du ändra den i kontoinställningarna.
+      email_below_hint_html: Om nedanstående e-postadress är felaktig kan du ändra den här, och få ett nytt bekräftelsemeddelande.
+      email_settings_hint_html: E-postmeddelande för verifiering skickades till %{email}. Om e-postadressen inte stämmer kan du ändra den i kontoinställningarna.
+      title: Ställ in
+    sign_in:
+      preamble_html: Logga in med dina användaruppgifter på <strong>%{domain}</strong>. Om ditt konto finns på en annan server kommer du inte att kunna logga in här.
+      title: Logga in på %{domain}
+    sign_up:
+      preamble: Med ett konto på denna Mastodon-server kan du följa alla andra personer på nätverket, oavsett vilken server deras konto tillhör.
+      title: Låt oss få igång dig på %{domain}.
     status:
       account_status: Kontostatus
+      confirming: Väntar på att e-postbekräftelsen ska slutföras.
+      functional: Ditt konto fungerar som det ska.
+      pending: Din ansökan inväntar granskning. Detta kan ta tid. Du kommer att få ett e-postmeddelande om din ansökan godkänns.
       redirecting_to: Ditt konto är inaktivt eftersom det för närvarande dirigeras om till %{acct}.
+      view_strikes: Visa tidigare prickar på ditt konto
     too_fast: Formuläret har skickats för snabbt, försök igen.
-    trouble_logging_in: Har du problem med att logga in?
     use_security_key: Använd säkerhetsnyckel
   authorize_follow:
     already_following: Du följer redan detta konto
@@ -737,18 +1036,50 @@ sv:
     proceed: Radera konto
     success_msg: Ditt konto har raderats
     warning:
+      before: 'Läs dessa noteringar noga innan du fortsätter:'
+      caches: Innehåll som har cachats av andra servrar kan bibehållas
+      data_removal: Dina inlägg och annan data kommer permanent raderas
       email_change_html: Du kan <a href="%{path}">ändra din e-postadress</a> utan att radera ditt konto
+      email_contact_html: Om det fortfarande inte kommer kan du e-posta <a href="mailto:%{email}">%{email}</a> för support
+      email_reconfirmation_html: Om du inte får bekräftelsemeddelandet kan du <a href="%{path}">begära ett nytt</a>
       irreversible: Du kan inte återställa eller återaktivera ditt konto
+      more_details_html: För mer information, se <a href="%{terms_path}">integritetspolicyn</a>.
       username_available: Ditt användarnamn kommer att bli tillgängligt igen
       username_unavailable: Ditt användarnamn kommer att fortsätta vara otillgängligt
-  directories:
-    directory: Profil-mapp
-    explanation: Upptäck användare baserat på deras intressen
-    explore_mastodon: Utforska %{title}
+  disputes:
+    strikes:
+      action_taken: Vidtagen åtgärd
+      appeal: Överklaga
+      appeal_approved: Pricken är inte längre giltig då överklagan godkändes
+      appeal_rejected: Överklagan har avvisats
+      appeal_submitted_at: Överklagan inskickad
+      appealed_msg: Din överklagan har skickats in. Du blir notifierad om den godkänns.
+      appeals:
+        submit: Skicka överklagan
+      approve_appeal: Godkänn förfrågan
+      associated_report: Associerad rapport
+      created_at: Daterad
+      description_html: Dessa är åtgärder som vidtas mot ditt konto och varningar som har skickats till dig av administratörerna för %{instance}.
+      recipient: Adressat
+      reject_appeal: Avvisa förfrågan
+      status: 'Inlägg #%{id}'
+      status_removed: Inlägget har redan raderats från systemet
+      title: "%{action} den %{date}"
+      title_actions:
+        delete_statuses: Borttagning av inlägg
+        disable: Kontofrysning
+        mark_statuses_as_sensitive: Markering av inlägg som känsliga
+        none: Varning
+        sensitive: Märkning av konto som känslig
+        silence: Begränsning av konto
+        suspend: Avstängning av konto
+      your_appeal_approved: Din överklagan har godkänts
+      your_appeal_pending: Du har lämnat in en överklagan
+      your_appeal_rejected: Din överklagan har avvisats
   domain_validator:
     invalid_domain: är inte ett giltigt domännamn
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Förfrågningen som du skickade in var ogiltig eller felaktigt utformad.
     '403': Du har inte behörighet att visa den här sidan.
     '404': Sidan du letade efter existerar inte.
     '406': Den här sidan är inte tillgänglig i det förfrågade formatet.
@@ -760,15 +1091,16 @@ sv:
     '500':
       content: Vi är ledsna, men något gick fel från vårat håll.
       title: Den här sidan är inte korrekt
-    '503': The page could not be served due to a temporary server failure.
+    '503': Sidan kunde inte visas på grund av ett tillfälligt serverfel.
     noscript_html: För att använda Mastodon webbapplikationen, vänligen aktivera JavaScript. Alternativt kan du prova en av <a href="%{apps_path}">inhemska appar</a> för Mastodon för din plattform.
   existing_username_validator:
+    not_found: kunde inte hitta en lokal användare med det användarnamnet
     not_found_multiple: kunde inte hitta %{usernames}
   exports:
     archive_takeout:
       date: Datum
       download: Ladda ner ditt arkiv
-      hint_html: Du kan begära ett arkiv av dina <strong>toots och uppladdad media</strong>. Den exporterade datan kommer att vara i ActivityPub-format och läsbar av kompatibel programvara. Du kan begära ett arkiv var sjunde dag.
+      hint_html: Du kan begära ett arkiv av dina <strong>inlägg och uppladdad media</strong>. Den exporterade datan kommer att vara i ActivityPub-format och läsbar av kompatibel programvara. Du kan begära ett arkiv var sjunde dag.
       in_progress: Kompilerar ditt arkiv...
       request: Efterfråga ditt arkiv
       size: Storlek
@@ -781,6 +1113,9 @@ sv:
     storage: Medialagring
   featured_tags:
     add_new: Lägg till ny
+    errors:
+      limit: Du har redan det maximala antalet utvalda hashtaggar
+    hint_html: "<strong>Vad är utvalda hashtaggar?</strong> De visas tydligt på din offentliga profil och låter andra bläddra bland dina offentliga inlägg specifikt under dessa hashtaggar. De är ett bra verktyg för att hålla reda på kreativa arbeten eller långsiktiga projekt."
   filters:
     contexts:
       account: Profiler
@@ -789,56 +1124,84 @@ sv:
       public: Publika tidslinjer
       thread: Konversationer
     edit:
+      add_keyword: Lägg till nyckelord
+      keywords: Nyckelord
+      statuses: Individuella inlägg
+      statuses_hint_html: Detta filter gäller för att välja enskilda inlägg oavsett om de matchar sökorden nedan. <a href="%{path}">Granska eller ta bort inlägg från filtret</a>.
       title: Redigera filter
+    errors:
+      deprecated_api_multiple_keywords: Dessa parametrar kan inte ändras från denna applikation eftersom de gäller mer än ett filtersökord. Använd en nyare applikation eller webbgränssnittet.
+      invalid_context: Ingen eller ogiltig kontext angiven
     index:
+      contexts: Filter i %{contexts}
       delete: Radera
       empty: Du har inga filter.
+      expires_in: Förfaller om %{distance}
+      expires_on: Förfaller på %{date}
+      keywords:
+        one: "%{count} nyckelord"
+        other: "%{count} nyckelord"
+      statuses:
+        one: "%{count} inlägg"
+        other: "%{count} inlägg"
+      statuses_long:
+        one: "%{count} enskilt inlägg dolt"
+        other: "%{count} enskilda inlägg dolda"
       title: Filter
     new:
+      save: Spara nytt filter
       title: Lägg till nytt filter
+    statuses:
+      back_to_filter: Tillbaka till filter
+      batch:
+        remove: Ta bort från filter
+      index:
+        hint: Detta filter gäller för att välja enskilda inlägg oavsett andra kriterier. Du kan lägga till fler inlägg till detta filter från webbgränssnittet.
+        title: Filtrerade inlägg
   footer:
-    developers: Utvecklare
-    more: Mer…
-    resources: Resurser
     trending_now: Trendar nu
   generic:
     all: Alla
-    changes_saved_msg: Ändringar sparades framgångsrikt!
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> objekt på denna sida valt."
+      other: "<strong>%{count}</strong> objekt på denna sida valda."
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> objekt som matchar din sökning är valt."
+      other: "<strong>%{count}</strong> objekt som matchar din sökning är valda."
+    changes_saved_msg: Ändringar sparade!
     copy: Kopiera
     delete: Radera
+    deselect: Avmarkera alla
+    none: Ingen
     order_by: Sortera efter
     save_changes: Spara ändringar
+    select_all_matching_items:
+      one: Välj %{count} objekt som matchar din sökning.
+      other: Välj alla %{count} objekt som matchar din sökning.
+    today: idag
     validation_errors:
       one: Något är inte riktigt rätt ännu! Kontrollera felet nedan
       other: Något är inte riktigt rätt ännu! Kontrollera dom %{count} felen nedan
-  identity_proofs:
-    active: Aktiv
-    authorize: Ja, autentisera
-    authorize_connection_prompt: Autentisera den här kryptografiska anslutningen?
-    errors:
-      failed: Den kryptografiska anslutningen misslyckades. Vänligen försök igen från %{provider}.
-    i_am_html: Jag är %{username} på %{service}.
-    identity: Identitet
-    inactive: Inaktiv
-    publicize_checkbox: 'Och tuta det här:'
-    publicize_toot: 'Det är bevisat! Jag är %{username} på %{service}: %{url}'
-    remove: Ta bort bevis från konto
-    status: Bekräftelse-status
-    view_proof: Visa bevis
+  html_validator:
+    invalid_markup: 'innehåller ogiltig HTML: %{error}'
   imports:
     errors:
+      invalid_csv_file: 'Ogiltig CSV-fil. Felmeddelande: %{error}'
       over_rows_processing_limit: innehåller fler än %{count} rader
     modes:
+      merge: Slå ihop
+      merge_long: Behåll befintliga uppgifter och lägg till nya
       overwrite: Skriv över
+      overwrite_long: Ersätt de nuvarande uppgifterna med de nya
     preface: Du kan importera data som du exporterat från en annan instans, till exempel en lista över personer du följer eller blockerar.
-    success: Dina uppgifter har laddats upp och kommer nu att behandlas snarast
+    success: Dina uppgifter har laddats upp och kommer att behandlas snarast
     types:
       blocking: Lista av blockerade
       bookmarks: Bokmärken
+      domain_blocking: Domänblockeringslista
       following: Lista av följare
       muting: Lista av nertystade
     upload: Ladda upp
-  in_memoriam_html: Till minne av.
   invites:
     delete: Avaktivera
     expired: Utgånget
@@ -866,23 +1229,32 @@ sv:
       limit: Du har nått det maximala antalet listor
   login_activities:
     authentication_methods:
+      otp: tvåfaktorsautentiseringsapp
       password: lösenord
+      sign_in_token: e-postsäkerhetskod
       webauthn: säkerhetsnycklar
     description_html: Om du ser aktivitet som du inte känner igen, överväg att byta ditt lösenord och aktivera tvåfaktor-autentisering.
+    empty: Ingen autentiseringshistorik tillgänglig
+    failed_sign_in_html: Misslyckat inloggningsförsök med %{method} från %{ip} (%{browser})
+    successful_sign_in_html: Lyckad inloggning med %{method} från %{ip} (%{browser})
+    title: Autentiseringshistorik
   media_attachments:
     validations:
-      images_and_video: Det går inte att bifoga en video till en status som redan innehåller bilder
+      images_and_video: Det går inte att bifoga en video till ett inlägg som redan innehåller bilder
+      not_ready: Kan inte bifoga filer som inte har behandlats färdigt. Försök igen om ett ögonblick!
       too_many: Det går inte att bifoga mer än 4 filer
   migrations:
     acct: användarnamn@domän av det nya kontot
     cancel: Avbryt omdirigering
     cancel_explanation: Avstängning av omdirigeringen kommer att återaktivera ditt nuvarande konto, men kommer inte att återskapa följare som har flyttats till det kontot.
+    cancelled_msg: Avbröt omdirigeringen.
     errors:
       already_moved: är samma konto som du redan har flyttat till
       missing_also_known_as: är inte ett alias för det här kontot
       move_to_self: kan inte vara nuvarande konto
       not_found: kunde inte hittas
       on_cooldown: Du är på nerkylning
+    followers_count: Följare vid tidpunkten för flytten
     incoming_migrations: Flyttar från ett annat konto
     incoming_migrations_html: För att flytta från ett annat konto till det här så behöver du först <a href="%{path}">skapa ett konto-alias</a>.
     moved_msg: Ditt konto omdirigerar nu till %{acct} och dina följare flyttas över.
@@ -894,30 +1266,31 @@ sv:
     redirecting_to: Ditt konto omdirigerar till %{acct}.
     set_redirect: Konfigurera omdirigering
     warning:
+      backreference_required: Det nya kontot måste först vara konfigurerat till att bakåt-referera till det här
       before: 'Vänligen läs dessa anteckningar noggrant innan du fortsätter:'
+      cooldown: Efter flytten följer en vänteperiod under vilken du inte kan flytta igen
+      disabled_account: Ditt nuvarande konto kommer inte att kunna användas fullt ut efteråt. Du kommer dock att ha tillgång till dataexport samt återaktivering.
       followers: Den här åtgärden kommer att flytta alla följare från det nuvarande kontot till det nya kontot
+      only_redirect_html: Alternativt kan du <a href="%{path}">bara sätta upp en omdirigering på din profil</a>.
       other_data: Ingen annan data kommer att flyttas automatiskt
+      redirect: Ditt nuvarande kontos profil kommer att uppdateras med ett meddelande om omdirigering och uteslutas från sökningar
   moderation:
     title: Moderera
   move_handler:
     carry_blocks_over_text: Den här användaren flyttades från %{acct} som du hade blockerat.
     carry_mutes_over_text: Den här användaren flyttade från %{acct} som du hade tystat.
     copy_account_note_text: 'Den här användaren flyttade från %{acct}, här var dina föregående anteckningar om dem:'
+  navigation:
+    toggle_menu: Växla meny
   notification_mailer:
-    digest:
-      action: Visa alla aviseringar
-      body: Här är en kort sammanfattning av de meddelanden du missade sedan ditt senaste besök på %{since}
-      mention: "%{name} nämnde dig i:"
-      new_followers_summary:
-        one: Du har också förvärvat en ny följare! Jippie!
-        other: Du har också fått %{count} nya följare medans du var iväg! Otroligt!
-      subject:
-        one: "1 nytt meddelande sedan ditt senaste besök \U0001F418"
-        other: "%{count} nya meddelanden sedan ditt senaste besök \U0001F418"
-      title: I din frånvaro...
+    admin:
+      report:
+        subject: "%{name} skickade in en rapport"
+      sign_up:
+        subject: "%{name} registrerade sig"
     favourite:
-      body: 'Din status favoriserades av %{name}:'
-      subject: "%{name} favoriserade din status"
+      body: 'Din status favoritmarkerades av %{name}:'
+      subject: "%{name} favoritmarkerade din status"
       title: Ny favorit
     follow:
       body: "%{name} följer nu dig!"
@@ -930,19 +1303,21 @@ sv:
       title: Ny följefterfrågning
     mention:
       action: Svar
-      body: 'Du nämndes av %{name} in:'
+      body: 'Du nämndes av %{name} i:'
       subject: Du nämndes av %{name}
       title: Ny omnämning
     poll:
       subject: En undersökning av %{name} har avslutats
     reblog:
-      body: 'Din status knuffades av %{name}:'
-      subject: "%{name} knuffade din status"
-      title: Ny knuff
+      body: 'Ditt inlägg boostades av %{name}:'
+      subject: "%{name} boostade ditt inlägg"
+      title: Ny boost
     status:
-      subject: "%{name} publicerade nyss"
+      subject: "%{name} publicerade just ett inlägg"
+    update:
+      subject: "%{name} redigerade ett inlägg"
   notifications:
-    email_events: Händelser för e-postaviseringar
+    email_events: Händelser för e-postnotiser
     email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
     other_settings: Andra aviseringsinställningar
   number:
@@ -956,8 +1331,13 @@ sv:
           thousand: K
           trillion: T
   otp_authentication:
+    code_hint: Ange koden som genererats av din autentiseringsapp för att bekräfta
+    description_html: Om du aktiverar <strong>tvåfaktorsautentisering</strong> med en autentiseringsapp kommer du behöva din mobiltelefon för att logga in, som kommer generera koder för dig att ange.
     enable: Aktivera
+    instructions_html: "<strong>Skanna den här QR-koden i Google Authenticator eller en liknande TOTP-app i din telefon</strong>. Från och med nu så kommer den appen att generera symboler som du måste skriva in när du ska logga in."
+    manual_instructions: 'Om du inte kan skanna QR-koden och istället behöver skriva in nyckeln i oformatterad text, finns den här:'
     setup: Konfigurera
+    wrong_code: Den ifyllda koden är ogiltig! Är server-tiden och enhetens tid korrekt?
   pagination:
     newer: Nyare
     next: Nästa
@@ -967,17 +1347,23 @@ sv:
   polls:
     errors:
       already_voted: Du har redan röstat på den här undersökningen
+      duplicate_options: innehåller dublett-objekt
       duration_too_long: är för långt in i framtiden
       duration_too_short: är för tidigt
       expired: Undersökningen har redan avslutats
       invalid_choice: Det valda röstalternativet finns inte
+      over_character_limit: kan inte vara längre än %{max} tecken var
       too_few_options: måste ha mer än ett objekt
       too_many_options: kan inte innehålla mer än %{max} objekt
   preferences:
     other: Annat
+    posting_defaults: Standardinställningar för inlägg
     public_timelines: Publika tidslinjer
+  privacy_policy:
+    title: Integritetspolicy
   reactions:
     errors:
+      limit_reached: Gränsen för unika reaktioner uppnådd
       unrecognized_emoji: är inte en igenkänd emoji
   relationships:
     activity: Kontoaktivitet
@@ -997,25 +1383,25 @@ sv:
     remove_selected_follows: Sluta följ valda användare
     status: Kontostatus
   remote_follow:
-    acct: Ange ditt användarnamn@domän du vill följa från
     missing_resource: Det gick inte att hitta den begärda omdirigeringsadressen för ditt konto
-    no_account_html: Har du inget konto? Du kan <a href='%{sign_up_path}' target='_blank'>registrera dig här</a>
-    proceed: Fortsätt för att följa
-    prompt: 'Du kommer att följa:'
-    reason_html: "<strong>Varför är det här steget nödvändigt?</strong> <code>%{instance}</code> är kanske inte den server du är registrerad vid, så vi behöver dirigera dig till din hemserver först."
-  remote_interaction:
-    favourite:
-      proceed: Fortsätt till favorit
-      prompt: 'Du vill favorit-markera det här inlägget:'
-    reply:
-      proceed: Fortsätt till svar
-      prompt: 'Du vill svara på det här inlägget:'
+  reports:
+    errors:
+      invalid_rules: refererar inte till giltiga regler
+  rss:
+    content_warning: 'Innehållsvarning:'
+    descriptions:
+      account: Offentliga inlägg från @%{acct}
+      tag: 'Offentliga inlägg taggade med #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Du har överskridit dygnsgränsen på %{limit} schemalagda inlägg
+    over_total_limit: Du har överskridit gränsen på %{limit} schemalagda inlägg
+    too_soon: Schemaläggningsdatumet måste vara i framtiden
   sessions:
     activity: Senaste aktivitet
     browser: Webbläsare
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1023,11 +1409,13 @@ sv:
       generic: Okänd browser
       ie: Internet Explorer
       micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
       opera: Opera
       otter: Otter
       phantom_js: PhantomJS
+      qq: QQ browser
       safari: Safari
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Nuvarande session
     description: "%{browser} på %{platform}"
@@ -1036,8 +1424,8 @@ sv:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1049,6 +1437,7 @@ sv:
     revoke: Återkalla
     revoke_success: Sessionen återkallas framgångsrikt
     title: Sessioner
+    view_authentication_history: Visa autentiseringshistoriken för ditt konto
   settings:
     account: Konto
     account_settings: Kontoinställningar
@@ -1060,7 +1449,7 @@ sv:
     development: Utveckling
     edit_profile: Redigera profil
     export: Exportera data
-    identity_proofs: Identifiera bevisen
+    featured_tags: Utvalda hashtaggar
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
@@ -1068,7 +1457,8 @@ sv:
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
-    statuses_cleanup: Automatisk borttagning av inlägg
+    statuses_cleanup: Automatisk radering av inlägg
+    strikes: Modereringsprickar
     two_factor_authentication: Tvåfaktorsautentisering
     webauthn_authentication: Säkerhetsnycklar
   statuses:
@@ -1083,21 +1473,22 @@ sv:
       video:
         one: "%{count} video"
         other: "%{count} videor"
-    boosted_from_html: Boosted från %{acct_link}
+    boosted_from_html: Boostad från %{acct_link}
     content_warning: 'Innehållsvarning: %{warning}'
+    default_language: Samma som användargränssnittet
     disallowed_hashtags:
       one: 'innehöll en otillåten hashtag: %{tags}'
       other: 'innehöll de otillåtna hashtagarna: %{tags}'
+    edited_at_html: 'Ändrad: %{date}'
     errors:
-      in_reply_not_found: Statusen du försöker svara på existerar inte.
-    language_detection: Lista ut språk automatiskt
+      in_reply_not_found: Inlägget du försöker svara på verkar inte existera.
     open_in_web: Öppna på webben
     over_character_limit: teckengräns på %{max} har överskridits
     pin_errors:
-      limit: Du har redan fäst det maximala antalet toots
-      ownership: Någon annans toot kan inte fästas
-      private: Icke-offentliga toot kan inte fästas
-      reblog: Knuffar kan inte fästas
+      direct: Inlägg som endast är synliga för nämnda användare kan inte fästas
+      limit: Du har redan fäst det maximala antalet inlägg
+      ownership: Någon annans inlägg kan inte fästas
+      reblog: En boost kan inte fästas
     poll:
       total_people:
         one: "%{count} person"
@@ -1122,117 +1513,48 @@ sv:
       unlisted_long: Alla kan se, men listas inte på offentliga tidslinjer
   statuses_cleanup:
     enabled: Ta automatiskt bort gamla inlägg
+    enabled_hint: Raderar dina inlägg automatiskt när de når en specifik ålder, såvida de inte matchar något av undantagen nedan
     exceptions: Undantag
+    explanation: Eftersom inläggsradering är resursintensivt görs detta stegvis när servern inte är högbelastad. Därför kan det dröja innan dina inlägg raderas efter att de uppnått ålderströskeln.
     ignore_favs: Bortse från favoriter
+    ignore_reblogs: Ignorera boostar
+    interaction_exceptions: Undantag baserat på interaktioner
+    interaction_exceptions_explanation: Observera att det inte finns någon garanti att inlägg blir raderade om de går under favorit- eller boost-tröskeln efter att en gång ha gått över dem.
     keep_direct: Behåll direktmeddelanden
     keep_direct_hint: Tar inte bort någon av dina direktmeddelanden
-    keep_media: Behåll inlägg med media-bilagor
-    keep_media_hint: Tar inte bort någon av dina inlägg som har media-bilagor
-    keep_pinned: Behåll fästade inlägg
-    keep_pinned_hint: Tar inte bort någon av dina fästade inlägg
+    keep_media: Behåll inlägg med mediebilagor
+    keep_media_hint: Tar inte bort någon av dina inlägg som har mediebilagor
+    keep_pinned: Behåll fästa inlägg
+    keep_pinned_hint: Raderar inte något av dina fästa inlägg
     keep_polls: Behåll undersökningar
     keep_polls_hint: Tar inte bort någon av dina undersökningar
-    keep_self_bookmark: Behåller inlägg som du har bokmärkt
+    keep_self_bookmark: Behåll inlägg du har bokmärkt
     keep_self_bookmark_hint: Tar inte bort dina egna inlägg om du har bokmärkt dem
-    keep_self_fav: Behåll inlägg som du har favorit-märkt
+    keep_self_fav: Behåll inlägg du favoritmarkerat
+    keep_self_fav_hint: Tar inte bort dina egna inlägg om du har favoritmarkerat dem
     min_age:
       '1209600': 2 veckor
       '15778476': 6 månader
       '2629746': 1 månad
       '31556952': 1 år
       '5259492': 2 månader
+      '604800': 1 vecka
       '63113904': 2 år
       '7889238': 3 månader
     min_age_label: Åldersgräns
+    min_favs: Behåll favoritmarkerade inlägg i minst
+    min_favs_hint: Raderar inte något av dina inlägg som har blivit favoritmarkerat minst detta antal gånger. Lämna tomt för att radera inlägg oavsett antal favoritmarkeringar
+    min_reblogs: Behåll boostade inlägg i minst
+    min_reblogs_hint: Raderar inte något av dina inlägg som har blivit boostat minst detta antal gånger. Lämna tomt för att radera inlägg oavsett antal boostar
   stream_entries:
-    pinned: Fäst toot
+    pinned: Fäst inlägg
     reblogged: boostad
     sensitive_content: Känsligt innehåll
+  strikes:
+    errors:
+      too_late: Det är för sent att överklaga denna strejk
   tags:
     does_not_match_previous_name: matchar inte det föregående namnet
-  terms:
-    body_html: |
-      <h2>Integritetspolicy</h2>
-      <h3 id="collect">Vilken information samlar vi in?</h3>
-
-      <ul>
-      <li><em>Grundläggande kontoinformation</em>: Det användarnamn du väljer, visningsnamn, biografi, avatar/profilbild och bakgrundsbild kommer alltid vara tillgängliga för alla som kan nå webbsidan. </li>
-      <li><em>Inlägg, vem du följer och annan tillgänglig information</em>: Dina följare och de konton du följer är alltid tillgängliga. När du skapar ett nytt inlägg sparas datum och tid för meddelandet, samt vilket program du använde för att skapa inlägget. Detta gäller även bilder och media som inlägg kan innehålla.Både "Publika" och "Olistade" inlägg kan vara tillgängliga för alla som har åtkomst till webbsidan. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-      <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
-      <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">What do we use your information for?</h3>
-
-      <p>Any of the information we collect from you may be used in the following ways:</p>
-
-      <ul>
-      <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
-      <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
-      <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">How do we protect your information?</h3>
-
-      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">What is our data retention policy?</h3>
-
-      <p>We will make a good faith effort to:</p>
-
-      <ul>
-      <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-      <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
-      </ul>
-
-      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
-
-      <p>You may irreversibly delete your account at any time.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Do we use cookies?</h3>
-
-      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
-
-      <p>We use cookies to understand and save your preferences for future visits.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
-
-      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
-
-      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
-
-      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Site usage by children</h3>
-
-      <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p>
-
-      <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
-
-      <p>Law requirements can be different if this server is in another jurisdiction.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Changes to our Privacy Policy</h3>
-
-      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
-
-      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
-
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Användarvillkor och Sekretesspolicy"
   themes:
     contrast: Hög kontrast
     default: Mastodon
@@ -1241,9 +1563,11 @@ sv:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Lägg till
     disable: Inaktivera
+    disabled_success: Tvåfaktorsautentisering inaktiverat
     edit: Redigera
     enabled: Tvåfaktorsautentisering är aktiverad
     enabled_success: Tvåfaktorsautentisering aktiverad
@@ -1256,58 +1580,90 @@ sv:
     recovery_instructions_html: Om du någonsin tappar åtkomst till din telefon kan du använda någon av återställningskoderna nedan för att återställa åtkomst till ditt konto. <strong> Håll återställningskoderna säkra </strong>. Du kan till exempel skriva ut dem och lagra dem med andra viktiga dokument.
     webauthn: Säkerhetsnycklar
   user_mailer:
+    appeal_approved:
+      action: Gå till ditt konto
+      explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har godkänts. Ditt konto har återigen bra anseende.
+      subject: Din överklagan den %{date} har godkänts
+      title: Överklagan godkänd
+    appeal_rejected:
+      explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har avslagits.
+      subject: Din överklagan den %{date} har avslagits
+      title: Överklagan avslagen
     backup_ready:
       explanation: Du begärde en fullständig säkerhetskopiering av ditt Mastodon-konto. Det är nu klart för nedladdning!
       subject: Ditt arkiv är klart för nedladdning
       title: Arkivuttagning
-    sign_in_token:
-      details: 'Här är detaljerna för försöket:'
-      further_actions: 'Om det inte var du, vänligen ändra ditt lösenord och aktivera tvåfaktor-autentisering i ditt konto. Du kan göra det här:'
-      title: Inloggningsförsök
+    suspicious_sign_in:
+      change_password: Ändra ditt lösenord
+      details: 'Här är inloggningsdetaljerna:'
+      explanation: Vi har upptäckt en inloggning till ditt konto från en ny IP-adress.
+      further_actions_html: Om detta inte var du, rekommenderar vi att du snarast %{action} och aktiverar tvåfaktorsautentisering för att hålla ditt konto säkert.
+      subject: Ditt konto har nåtts från en ny IP-adress
+      title: En ny inloggning
     warning:
-      statuses: 'Specifikt för:'
+      appeal: Skicka överklagan
+      appeal_description: Om du anser detta felaktigt kan du skicka överklagan till administratörerna av %{instance}.
+      categories:
+        spam: Skräppost
+        violation: Innehållet bryter mot följande gemenskapsprinciper
+      explanation:
+        delete_statuses: Några av dina inlägg har ansetts bryta mot en eller flera gemenskapsprinciper, de har därför raderats av moderatorerna för %{instance}.
+        disable: Du kan inte längre använda ditt konto, men din profil och övrig data bibehålls intakt. Du kan begära en kopia av dina data, ändra kontoinställningar eller radera ditt konto.
+        mark_statuses_as_sensitive: Några av dina inlägg har markerats som känsliga av moderatorerna för %{instance}. Detta betyder att folk behöver trycka på medier i inläggen innan de kan se en förhandsvisning. Du kan själv markera medier som känsliga när du gör inlägg i framtiden.
+        sensitive: Från och med nu markeras alla dina uppladdade mediefiler som känsliga och göms bakom en innehållsvarning som först måste tryckas bort.
+        silence: Du kan fortfarande använda ditt konto, men endast personer som redan följer dig kommer att se dina inlägg på denna server. Du kan även exkluderas från olika upptäcktsfunktioner, men andra kan fortfarande manuellt följa dig.
+        suspend: Du kan inte längre använda ditt konto, din profil och annan data är heller inte längre tillgängliga. Du kan fortfarande logga in och begära en kopia av dina data tills dess att de fullkomligt raderas om cirka 30 dagar, vi kommer dock bibehålla viss metadata för att förhindra försök att kringgå avstängingen.
+      reason: 'Anledning:'
+      statuses: 'Inlägg citerades:'
       subject:
+        delete_statuses: Dina inlägg under %{acct} har raderats
         disable: Ditt konto %{acct} har blivit fruset
+        mark_statuses_as_sensitive: Dina inlägg under %{acct} har markerats som känsliga
         none: Varning för %{acct}
+        sensitive: Från och med nu kommer dina inlägg under %{acct} markeras som känsliga
         silence: Ditt konto %{acct} har blivit begränsat
         suspend: Ditt konto %{acct} har stängts av
       title:
+        delete_statuses: Inlägg borttagna
         disable: Kontot fruset
+        mark_statuses_as_sensitive: Inlägg markerade som känsliga
         none: Varning
-        sensitive: Ditt media har blivit markerat som känsligt
+        sensitive: Konto markerat som känsligt
         silence: Kontot begränsat
-        suspend: Kontot avstängt
+        suspend: Konto avstängt
     welcome:
       edit_profile_action: Profilinställning
-      edit_profile_step: Du kan anpassa din profil genom att ladda upp en avatar, bakgrundsbild, ändra ditt visningsnamn och mer. Om du vill granska nya följare innan de får följa dig kan du låsa ditt konto.
+      edit_profile_step: Du kan anpassa din profil genom att ladda upp en profilbild, ändra ditt visningsnamn med mera. Du kan välja att granska nya följare innan de får följa dig.
       explanation: Här är några tips för att komma igång
-      final_action: Börja posta
-      final_step: 'Börja posta! Även utan anhängare kan dina offentliga meddelanden ses av andra, till exempel på den lokala tidslinjen och i hashtags. Du får gärna presentera dig via hashtaggen #introductions.'
+      final_action: Börja göra inlägg
+      final_step: 'Börja skriv inlägg! Även utan följare kan dina offentliga inlägg ses av andra, exempelvis på den lokala tidslinjen eller i hashtaggar. Du kanske vill introducera dig själv under hashtaggen #introduktion eller #introductions.'
       full_handle: Ditt fullständiga användarnamn/mastodonadress
       full_handle_hint: Det här är vad du skulle berätta för dina vänner så att de kan meddela eller följa dig från en annan instans.
-      review_preferences_action: Ändra inställningar
-      review_preferences_step: Se till att du ställer in dina inställningar, t.ex. vilka e-postmeddelanden du vill ta emot eller vilken integritetsnivå du vill att dina inlägg ska vara. Om du inte har åksjuka, kan du välja att aktivera automatisk uppspelning av GIF-bilder.
       subject: Välkommen till Mastodon
-      tip_federated_timeline: Den förenade tidslinjen är en störtflodsvy av Mastodon-nätverket. Men det inkluderar bara människor som dina grannar följer, så det är inte komplett.
-      tip_following: Du följer din servers administratör(er) som standard. För att hitta fler intressanta personer, kolla de lokala och förenade tidslinjerna.
-      tip_local_timeline: Den lokala tidslinjen är en störtflodsvy av personer på %{instance}. Det här är dina närmaste grannar!
-      tip_mobile_webapp: Om din mobila webbläsare erbjuder dig att lägga till Mastodon på din hemskärm kan du få push-aviseringar. Det fungerar som en inbyggd app på många sätt!
-      tips: Tips
       title: Välkommen ombord, %{name}!
   users:
     follow_limit_reached: Du kan inte följa fler än %{limit} personer
-    generic_access_help_html: Har du problem med att komma åt ditt konto? Du kan komma i kontakt med %{email} för assistans
     invalid_otp_token: Ogiltig tvåfaktorskod
-    invalid_sign_in_token: Ogiltig säkerhetskod
     otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
-    seamless_external_login: Du är inloggad via en extern tjänst, så lösenord och e-postinställningar är inte tillgängliga.
+    seamless_external_login: Du är inloggad via en extern tjänst, inställningar för lösenord och e-post är därför inte tillgängliga.
     signed_in_as: 'Inloggad som:'
   verification:
+    explanation_html: 'Du kan <strong>verifiera dig själv som ägare av länkar i din profilmetadata</strong>, genom att på den länkade webbplatsen även länka tillbaka till din Mastodon-profil. Länken tillbaka <strong>måste</strong> ha attributet <code>rel="me"</code>. Textinnehållet i länken spelar ingen roll. Här är ett exempel:'
     verification: Bekräftelse
   webauthn_credentials:
     add: Lägg till ny säkerhetsnyckel
+    create:
+      error: Det gick inte att lägga till din säkerhetsnyckel. Försök igen.
+      success: Din säkerhetsnyckel har lagts till.
     delete: Radera
     delete_confirmation: Är du säker på att du vill ta bort denna säkerhetsnyckel?
+    description_html: Om du aktiverar <strong>autentisering med säkerhetsnyckel</strong>, kommer inloggning kräva att du använder en av dina säkerhetsnycklar.
     destroy:
+      error: Det gick inte att ta bort din säkerhetsnyckel. Försök igen.
       success: Din säkerhetsnyckel har raderats.
+    invalid_credential: Ogiltig säkerhetsnyckel
+    nickname_hint: Ange smeknamnet på din nya säkerhetsnyckel
     not_enabled: Du har inte aktiverat WebAuthn än
+    not_supported: Denna webbläsare stöder inte säkerhetsnycklar
+    otp_required: För att använda säkerhetsnycklar måste du först aktivera tvåfaktorsautentisering.
+    registered_on: Registrerad den %{date}
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index b6c407388..d691c0ec8 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -2,74 +2,20 @@
 ta:
   about:
     about_mastodon_html: 'எதிர்காலத்தின் சமூகப் பிணையம்: விளம்பரம் இல்லை, பொதுநிறுவனக் கண்காணிப்பு இல்லை, நெறிக்குட்பட்ட வரைவுத்திட்டம், மற்றும் பகிர்ந்தாளுதல்! மஸ்டோடோனுடன் உங்கள் தரவுகள் உங்களுக்கே சொந்தம்!'
-    about_this: தகவல்
-    active_count_after: செயலில்
-    active_footnote: செயலிலுள்ள மாதாந்திர பயனர்கள் (செமாப)
-    administered_by: 'நிர்வாகம்:'
-    api: செயலிக்கான மென்பொருள் இடைமுகம் API
-    apps: கைப்பேசி செயலிகள்
-    apps_platforms: மஸ்டோடோனை ஐஓஎஸ், ஆன்டிராய்டு, மற்றும் பிற இயங்குதளங்களில் பயன்படுத்துக
-    browse_directory: தன்விவரக் கோப்புகளைப் பார்த்து உங்கள் விருப்பங்களுக்கேற்பத் தேர்வு செய்க
-    browse_local_posts: நேரலையில் பொதுப் பதிவுகளை இந்த வழங்கியிலிருந்து காண்க
-    browse_public_posts: நேரலையில் பொதுப் பதிவுகளை மஸ்டோடோனிலிருந்து காண்க
-    contact: தொடர்புக்கு
     contact_missing: நிறுவப்படவில்லை
     contact_unavailable: பொ/இ
-    discover_users: பயனர்களை அறிக
-    documentation: ஆவணச்சான்று
-    get_apps: கைப்பேசி செயலியை முயற்சி செய்யவும்
     hosted_on: மாஸ்டோடாண் %{domain} இனையத்தில் இயங்குகிறது
-    learn_more: மேலும் அறிய
-    privacy_policy: தனியுரிமை கொள்கை
-    see_whats_happening: என்ன நடக்கிறது என்று பார்க்க
-    server_stats: 'வழங்கியின் புள்ளிவிவரங்கள்:'
-    source_code: நிரல் மூலம்
-    status_count_after:
-      one: பதிவு
-      other: பதிவுகள்
-    status_count_before: எழுதிய
-    tagline: நண்பர்களைப் பின்தொடரவும் மற்றும் புதியவர்களைக் கண்டுபிடிக்கவும்
-    terms: சேவை விதிமுறைகள்
-    unavailable_content: விசயங்கள் இல்லை
-    unavailable_content_description:
-      domain: வழங்கி
-      reason: காரணம்
-      rejecting_media_title: வடிகட்டப்பட்ட மீடியா
-      silenced_title: அணைக்கபட்ட சர்வர்கள்
-      suspended_title: இடைநீக்கப்பட்ட சர்வர்கள்
-    user_count_after:
-      one: பயனர்
-      other: பயனர்கள்
-    user_count_before: இணைந்திருக்கும்
-    what_is_mastodon: மச்டொடன் என்றால் என்ன?
   accounts:
-    choices_html: "%{name}-இன் தேர்வுகள்:"
-    featured_tags_hint: குறிப்பிட்ட சிட்டைகளை இங்கு நீங்கள் காட்சிப்படுத்தலாம்.
     follow: பின்தொடர்
     followers:
       one: பின்தொடர்பவர்
       other: பின்தொடர்பவர்கள்
     following: பின்தொடரும்
-    joined: "%{date} அன்று இனைந்தார்"
     last_active: கடைசியாக பார்த்தது
-    media: படங்கள்
-    moved_html: "%{name} %{new_profile_link}க்கு மாறியுள்ளது:"
-    network_hidden: இத்தகவல் கிடைக்கவில்லை
-    never_active: எப்போதுமில்லை
     nothing_here: இங்கு எதுவும் இல்லை!
-    people_followed_by: "%{name} பின்தொடரும் நபர்கள்"
-    people_who_follow: "%{name}ஐ பின்தொடரும் நபர்கள்"
     pin_errors:
       following: தாங்கள் அங்கீகரிக்க விரும்பும் நபரை தாங்கள் ஏற்கனவே பின்தொடரந்து கொண்டு இருக்க வேண்டும்
     posts_tab_heading: பிளிறல்கள்
-    posts_with_replies: பிளிறல்கள் மற்றும் மறுமொழிகள்
-    roles:
-      admin: நிர்வாகி
-      bot: பொறி
-      group: குழு
-      moderator: மட்டுறுத்துநர்
-    unavailable: சுயவிவரம் கிடைக்கவில்லை
-    unfollow: பின்தொடராதே
   admin:
     account_actions:
       action: நடவடிக்கை எடு
@@ -77,17 +23,14 @@ ta:
     account_moderation_notes:
       create: குறிப்பு எழுதவும்
       created_msg: நடுநிலை குறிப்பு வெற்றிகரமாக பதிவு செய்யப்பட்டது!
-      delete: அகற்று
       destroyed_msg: நடுநிலை குறிப்பு வெற்றிகரமாக அகற்றப்பட்டது!
     accounts:
       add_email_domain_block: இம்மின்னஞ்சல் களத்தைத் தடுப்புப்பட்டியலில் சேர்
       approve: அங்கீகரி
-      approve_all: அனைத்தும் அங்கீகரி
       are_you_sure: நிச்சயமா?
       avatar: அவதாரம்
       by_domain: தளம்
       change_email:
-        changed_msg: உறிமை மின் அஞ்சல் வெற்றிகரமாக மாற்ற்ப்பட்டது!
         current_email: தற்கால மின் அஞ்சல்
         label: மின் அஞ்சலை மற்றுக
         new_email: புதிய மின் அஞ்சல்
@@ -126,7 +69,6 @@ ta:
         active: அனுமதிக்கப்பட்டுள்ளது
         all: அனைத்தும்
         pending: நிலுவையில் உள்ளது
-        silenced: தடுக்கப்பட்டுள்ளது
         suspended: இடைநீக்கப்பட்டது
         title: மிதமானர்
       moderation_notes: நடுவர் கருத்து
@@ -139,18 +81,11 @@ ta:
       protocol: நெறிமுறை
       public: பொது
       reject: விலக்கு
-      reject_all: அனைத்தையும் மறு
       remove_avatar: அவதாரத்தை நீக்குக
       resend_confirmation:
         already_confirmed: இப்பயனர் ஏற்கனவே  உறுதி  படுத்திவிட்டார்
       reset: மீட்டமைக்கவும்
       reset_password: கடவுச்சொல்லை மீளமைத்திடுக
-      role: அனுமதி
-      roles:
-        admin: நிர்வாகி
-        moderator: நடுவர்
-        staff: பணியாளர்
-        user: பயனர்
       search: தேடு
       search_same_email_domain: இம்மின்னஞ்சல் களத்தில் உள்ள மற்ற பயனர்கள்
       shared_inbox_url: குழு மின்னஞ்சல் முகவரி
@@ -161,7 +96,6 @@ ta:
       silenced: அணைக்கப்பட்டது
       statuses: பதிவுகள்
       suspended: இடைநீக்கப்பட்டது
-      time_in_queue: வரிசையில் காத்திருக்கிறது %{time}
       title: கணக்குகள்
       username: பயனர் பெயர்
       warn: எச்சரி
@@ -230,9 +164,6 @@ ta:
         severity:
           noop: எதுவுமில்லை
           suspend: தற்காலீகமாக நீக்குக
-    email_domain_blocks:
-      empty: மின்னஞ்சற் களங்கள் எதுவும் தடுக்கப்படவில்லை.
-      from_html: "%{domain} -இலிருந்து"
     invites:
       filter:
         all: அனைத்தும்
@@ -249,9 +180,6 @@ ta:
         notes:
           one: "%{count} குறிப்பு"
           other: "%{count} குறிப்புகள்"
-        reports:
-          one: "%{count} புகார்"
-          other: "%{count} புகார்கள்"
       comment:
         none: எதுவுமில்லை
     site_uploads:
@@ -284,9 +212,6 @@ ta:
       empty: தடுப்புகள் ஏதும் இல்லை.
   generic:
     delete: நீக்கு
-  identity_proofs:
-    remove: ஆதாரத்தைக் கணக்கிலிருந்து நீக்கு
-    removed: ஆதாரம் கணக்கிலிருந்து வெற்றிகரமாக நீக்கப்பட்டது
   media_attachments:
     validations:
       not_ready: பதிவேற்றம் முடிவடையாத கோப்புகளை இணைக்க முடியாது. சிறிது நேரம் கழித்து மீண்டும் முயற்சி செய்யவும்!
@@ -315,14 +240,3 @@ ta:
     errors:
       in_reply_not_found: நீங்கள் மறுமொழி அளிக்க முயலும் பதிவு இருப்பதுபோல் தெரியவில்லை.
     show_thread: தொடரைக் காட்டு
-  user_mailer:
-    sign_in_token:
-      details: 'அம்முயற்சி பற்றிய விவரங்கள் இங்கே:'
-      explanation: 'அங்கீகரிக்கப்படாத ஓர் IP முகவரியிலிருந்து உங்கள் கணக்கிற்குள் நுழையும் முயற்சி நடந்துள்ளது. இது நீங்கள்தான் என்றால், தயவுசெய்து பாதுகாப்பு குறியீட்டைக் கீழே உள்ளிடவும்:'
-      further_actions: 'இது நீங்கள் இல்லை என்றால், தயவுசெய்து உங்கள் கடவுச்சொல்லை மாற்றவும். மேலும், உங்கள் கணக்கிற்கு இரண்டு கட்ட அங்கீகாரத்தை (two-factor authentication) செயலாக்கவும். அதை இங்கு செய்ய இயலும்:'
-      subject: உள்நுழைய முயற்சித்ததை தயவுசெய்து உறுதிபடுத்தவும்
-      title: உள்நுழைய முயற்சி
-  users:
-    generic_access_help_html: உங்கள் கணக்கை அணுகுவதில் சிக்கலா? உதவிக்கு %{email} -உடன் தொடர்பு கொள்ளவும்
-    invalid_sign_in_token: தவறான பாதுகாப்புக் குறியீடு
-    suspicious_sign_in_confirmation: இதற்கு முன்பு இந்த சாதனத்திலிருந்து நீங்கள் உள்நுழைந்ததுபோல் தெரியவில்லை. மேலும், நீங்கள் உள்நுழைந்தே சில காலம் ஆகிறது. எனவே, இது நீங்கள்தானா என்பதை உறுதிப்படுத்த உங்கள் மின்னஞ்சல் முகவரிக்கு ஒரு பாதுகாப்புக் குறியீட்டை அனுப்புகிறோம்.
diff --git a/config/locales/tai.yml b/config/locales/tai.yml
index f7451a906..3b22e9999 100644
--- a/config/locales/tai.yml
+++ b/config/locales/tai.yml
@@ -1,10 +1,5 @@
 ---
 tai:
-  about:
-    see_whats_happening: Khòaⁿ hoat-seng siáⁿ-mih tāi-chì
-    unavailable_content_description:
-      reason: Lí-iû
-    what_is_mastodon: Siáⁿ-mih sī Mastodon?
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 2030f02b7..d325d0fba 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1,57 +1,25 @@
 ---
 te:
   about:
-    about_hashtag_html: ఇవి <strong>#%{hashtag}</strong>తో ట్గాగ్ చేయబడిన పబ్లిక్ టూట్లు. ఫెడివర్స్ లో ఎక్కడ ఖాతావున్నా వీటిలో పాల్గొనవచ్చు.
     about_mastodon_html: మాస్టొడాన్ అనేది ఒక సామాజిక మాధ్యమం. ఇది పూర్తిగా ఉచితం మరియు స్వేచ్ఛా సాఫ్టువేరు. ఈమెయిల్ లాగానే ఇది వికేంద్రీకరించబడినది.
-    about_this: గురించి
-    administered_by: 'నిర్వహణలో:'
-    apps: మొబైల్ యాప్స్
-    contact: సంప్రదించండి
     contact_missing: ఇంకా సెట్ చేయలేదు
     contact_unavailable: వర్తించదు
-    documentation: పత్రీకరణ
     hosted_on: మాస్టొడాన్ %{domain} లో హోస్టు చేయబడింది
-    learn_more: మరింత తెలుసుకోండి
-    privacy_policy: గోప్యత విధానము
-    source_code: సోర్సు కోడ్
-    status_count_after:
-      one: స్థితి
-      other: స్థితులు
-    status_count_before: ఎవరు రాశారు
-    terms: సేవా నిబంధనలు
-    user_count_after:
-      one: వినియోగదారు
-      other: వినియోగదారులు
-    user_count_before: హోం కు
-    what_is_mastodon: మాస్టొడాన్ అంటే ఏమిటి?
   accounts:
-    choices_html: "%{name}'s ఎంపికలు:"
     follow: అనుసరించు
     followers:
       one: అనుచరి
       other: అనుచరులు
     following: అనుసరిస్తున్నారు
-    joined: "%{date}న చేరారు"
     last_active: చివరిగా క్రియాశీలకంగా వుంది
     link_verified_on: ఈ లంకె యొక్క యాజమాన్యాన్ని చివరిగా పరిశీలించింది %{date}న
-    media: మీడియా
-    moved_html: "%{name} ఈ %{new_profile_link}కు మారారు:"
-    network_hidden: ఈ సమాచారం అందుబాటులో లేదు
     nothing_here: ఇక్కడ ఏమీ లేదు!
-    people_followed_by: "%{name} అనుసరించే వ్యక్తులు"
-    people_who_follow: "%{name}ను అనుసరించే వ్యక్తులు"
     pin_errors:
       following: మీరు ధృవీకరించాలనుకుంటున్న వ్యక్తిని మీరిప్పటికే అనుసరిస్తూ వుండాలి
     posts:
       one: టూటు
       other: టూట్లు
     posts_tab_heading: టూట్లు
-    posts_with_replies: టూట్లు మరియు ప్రత్యుత్తరాలు
-    roles:
-      admin: నిర్వాహకులు
-      bot: బోట్
-      moderator: నియంత్రికుడు
-    unfollow: అనుసరించవద్దు
   admin:
     account_actions:
       action: చర్య తీసుకో
@@ -59,14 +27,12 @@ te:
     account_moderation_notes:
       create: ఏదైనా గమనికను వదులు
       created_msg: మోడరేషన్ గమనిక విజయవంతంగా సృష్టించబడింది!
-      delete: తీసివేయి
       destroyed_msg: మోడరేషన్ గమనిక విజయవంతంగా తొలగించబడింది!
     accounts:
       are_you_sure: ఖచ్ఛితమేగా?
       avatar: అవతారం
       by_domain: డొమైను
       change_email:
-        changed_msg: ఖాతా యొక్క ఈమెయిల్ విజయవంతంగా మార్చబడింది!
         current_email: ప్రస్తుత ఈమెయిల్
         label: ఈమెయిల్ ను మార్చు
         new_email: కొత్త ఈమెయిల్
@@ -99,7 +65,6 @@ te:
       moderation:
         active: యాక్టివ్
         all: అన్నీ
-        silenced: నిశ్శబ్ధం చేయబడింది
         suspended: నిషేధించబడింది
         title: మోడరేషన్
       moderation_notes: మోడరేషన్ నోట్స్
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 9a1b51f17..9ef2b4f30 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1,78 +1,25 @@
 ---
 th:
   about:
-    about_hashtag_html: มีการแท็กโพสต์สาธารณะเหล่านี้ด้วย <strong>#%{hashtag}</strong> คุณสามารถโต้ตอบกับโพสต์ได้หากคุณมีบัญชีที่ใดก็ตามในเฟดิเวิร์ส
     about_mastodon_html: 'เครือข่ายสังคมแห่งอนาคต: ไม่มีโฆษณา ไม่มีการสอดแนมโดยองค์กร การออกแบบตามหลักจริยธรรม และการกระจายศูนย์! เป็นเจ้าของข้อมูลของคุณด้วย Mastodon!'
-    about_this: เกี่ยวกับ
-    active_count_after: ใช้งานอยู่
-    active_footnote: ผู้ใช้ที่ใช้งานอยู่รายเดือน (MAU)
-    administered_by: 'ดูแลโดย:'
-    api: API
-    apps: แอปมือถือ
-    apps_platforms: ใช้ Mastodon จาก iOS, Android และแพลตฟอร์มอื่น ๆ
-    browse_directory: เรียกดูไดเรกทอรีโปรไฟล์และกรองตามความสนใจ
-    browse_local_posts: เรียกดูสตรีมสดของโพสต์สาธารณะจากเซิร์ฟเวอร์นี้
-    browse_public_posts: เรียกดูสตรีมสดของโพสต์สาธารณะใน Mastodon
-    contact: ติดต่อ
     contact_missing: ไม่ได้ตั้ง
     contact_unavailable: ไม่มี
-    discover_users: ค้นพบผู้ใช้
-    documentation: เอกสารประกอบ
-    federation_hint_html: ด้วยบัญชีที่ %{instance} คุณจะสามารถติดตามผู้คนในเซิร์ฟเวอร์ Mastodon และอื่น ๆ
-    get_apps: ลองแอปมือถือ
     hosted_on: Mastodon ที่โฮสต์ที่ %{domain}
-    learn_more: เรียนรู้เพิ่มเติม
-    privacy_policy: นโยบายความเป็นส่วนตัว
-    rules: กฎของเซิร์ฟเวอร์
-    see_whats_happening: ดูสิ่งที่กำลังเกิดขึ้น
-    server_stats: 'สถิติเซิร์ฟเวอร์:'
-    source_code: โค้ดต้นฉบับ
-    status_count_after:
-      other: โพสต์
-    status_count_before: ผู้เผยแพร่
-    tagline: ติดตามเพื่อน ๆ และค้นพบเพื่อนใหม่ ๆ
-    terms: เงื่อนไขการให้บริการ
-    unavailable_content: เซิร์ฟเวอร์ที่มีการควบคุม
-    unavailable_content_description:
-      domain: เซิร์ฟเวอร์
-      reason: เหตุผล
-      rejecting_media: 'จะไม่ประมวลผลหรือจัดเก็บไฟล์สื่อจากเซิร์ฟเวอร์เหล่านี้ และจะไม่แสดงภาพขนาดย่อ ต้องมีการคลิกไปยังไฟล์ต้นฉบับด้วยตนเอง:'
-      rejecting_media_title: สื่อที่กรองอยู่
-      silenced: 'จะซ่อนโพสต์จากเซิร์ฟเวอร์เหล่านี้ในเส้นเวลาสาธารณะและการสนทนา และจะไม่สร้างการแจ้งเตือนจากการโต้ตอบของผู้ใช้ เว้นแต่คุณกำลังติดตามผู้ใช้:'
-      silenced_title: เซิร์ฟเวอร์ที่จำกัดอยู่
-      suspended: 'จะไม่ประมวลผล จัดเก็บ หรือแลกเปลี่ยนข้อมูลจากเซิร์ฟเวอร์เหล่านี้ ทำให้การโต้ตอบหรือการสื่อสารใด ๆ กับผู้ใช้จากเซิร์ฟเวอร์เหล่านี้เป็นไปไม่ได้:'
-      suspended_title: เซิร์ฟเวอร์ที่ระงับอยู่
-    user_count_after:
-      other: ผู้ใช้
-    user_count_before: บ้านของ
-    what_is_mastodon: Mastodon คืออะไร?
+    title: เกี่ยวกับ
   accounts:
-    choices_html: 'ตัวเลือกของ %{name}:'
     follow: ติดตาม
     followers:
       other: ผู้ติดตาม
     following: กำลังติดตาม
-    joined: เข้าร่วมเมื่อ %{date}
+    instance_actor_flash: บัญชีนี้เป็นตัวดำเนินการเสมือนที่ใช้เพื่อเป็นตัวแทนของเซิร์ฟเวอร์เองและไม่ใช่ผู้ใช้รายบุคคลใด ๆ มีการใช้บัญชีสำหรับวัตถุประสงค์ในการติดต่อกับภายนอกและไม่ควรได้รับการระงับ
     last_active: ใช้งานล่าสุด
     link_verified_on: ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ %{date}
-    media: สื่อ
-    moved_html: "%{name} ได้ย้ายไปยัง %{new_profile_link}:"
-    network_hidden: ไม่มีข้อมูลนี้
-    never_active: ไม่เลย
     nothing_here: ไม่มีสิ่งใดที่นี่!
-    people_followed_by: ผู้คนที่ %{name} ติดตาม
-    people_who_follow: ผู้คนที่ติดตาม %{name}
+    pin_errors:
+      following: คุณต้องกำลังติดตามบุคคลที่คุณต้องการแนะนำอยู่แล้ว
     posts:
       other: โพสต์
     posts_tab_heading: โพสต์
-    posts_with_replies: โพสต์และการตอบกลับ
-    roles:
-      admin: ผู้ดูแล
-      bot: บอต
-      group: กลุ่ม
-      moderator: ผู้ควบคุม
-    unavailable: โปรไฟล์ไม่พร้อมใช้งาน
-    unfollow: เลิกติดตาม
   admin:
     account_actions:
       action: ทำการกระทำ
@@ -80,29 +27,34 @@ th:
     account_moderation_notes:
       create: เขียนหมายเหตุ
       created_msg: สร้างหมายเหตุการควบคุมสำเร็จ!
-      delete: ลบ
       destroyed_msg: ทำลายหมายเหตุการควบคุมสำเร็จ!
     accounts:
       add_email_domain_block: ปิดกั้นโดเมนอีเมล
       approve: อนุมัติ
-      approve_all: อนุมัติทั้งหมด
       approved_msg: อนุมัติใบสมัครลงทะเบียนของ %{username} สำเร็จ
       are_you_sure: คุณแน่ใจหรือไม่?
       avatar: ภาพประจำตัว
       by_domain: โดเมน
       change_email:
-        changed_msg: เปลี่ยนอีเมลบัญชีสำเร็จ!
+        changed_msg: เปลี่ยนอีเมลสำเร็จ!
         current_email: อีเมลปัจจุบัน
         label: เปลี่ยนอีเมล
         new_email: อีเมลใหม่
         submit: เปลี่ยนอีเมล
         title: เปลี่ยนอีเมลสำหรับ %{username}
+      change_role:
+        changed_msg: เปลี่ยนบทบาทสำเร็จ!
+        label: เปลี่ยนบทบาท
+        no_role: ไม่มีบทบาท
+        title: เปลี่ยนบทบาทสำหรับ %{username}
       confirm: ยืนยัน
       confirmed: ยืนยันแล้ว
       confirming: กำลังยืนยัน
+      custom: กำหนดเอง
       delete: ลบข้อมูล
       deleted: ลบแล้ว
       demote: ลดขั้น
+      destroyed_msg: ตอนนี้จัดคิวเพื่อลบข้อมูลของ %{username} ในเร็ว ๆ นี้แล้ว
       disable: อายัด
       disable_sign_in_token_auth: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมล
       disable_two_factor_authentication: ปิดใช้งาน 2FA
@@ -144,10 +96,15 @@ th:
       moderation_notes: หมายเหตุการควบคุม
       most_recent_activity: กิจกรรมล่าสุด
       most_recent_ip: IP ล่าสุด
+      no_account_selected: ไม่มีการเปลี่ยนแปลงบัญชีเนื่องจากไม่มีการเลือก
       no_limits_imposed: ไม่ได้กำหนดขีดจำกัด
+      no_role_assigned: ไม่ได้กำหนดบทบาท
       not_subscribed: ไม่ได้บอกรับ
       pending: การตรวจทานที่รอดำเนินการ
       perform_full_suspension: ระงับ
+      previous_strikes: การดำเนินการก่อนหน้านี้
+      previous_strikes_description_html:
+        other: บัญชีนี้มี <strong>%{count}</strong> การดำเนินการ
       promote: เลื่อนขั้น
       protocol: โปรโตคอล
       public: สาธารณะ
@@ -155,8 +112,9 @@ th:
       redownload: รีเฟรชโปรไฟล์
       redownloaded_msg: รีเฟรชโปรไฟล์ของ %{username} จากจุดเริ่มต้นสำเร็จ
       reject: ปฏิเสธ
-      reject_all: ปฏิเสธทั้งหมด
       rejected_msg: ปฏิเสธใบสมัครลงทะเบียนของ %{username} สำเร็จ
+      remote_suspension_irreversible: ลบข้อมูลของบัญชีนี้อย่างถาวรแล้ว
+      remote_suspension_reversible_hint_html: ระงับบัญชีในเซิร์ฟเวอร์ของเขาแล้ว และจะเอาข้อมูลออกอย่างสมบูรณ์ใน %{date} จนกว่าจะถึงตอนนั้น เซิร์ฟเวอร์ระยะไกลสามารถกู้คืนบัญชีนี้ได้โดยไม่มีผลร้ายใด ๆ หากคุณต้องการเอาข้อมูลของบัญชีทั้งหมดออกในทันที คุณสามารถทำได้ด้านล่าง
       remove_avatar: เอาภาพประจำตัวออก
       remove_header: เอาส่วนหัวออก
       removed_avatar_msg: เอาภาพประจำตัวของ %{username} ออกสำเร็จ
@@ -165,21 +123,16 @@ th:
         already_confirmed: ผู้ใช้นี้ได้รับการยืนยันอยู่แล้ว
         send: ส่งอีเมลยืนยันใหม่
         success: ส่งอีเมลยืนยันสำเร็จ!
+      reset: รีเซ็ต
       reset_password: ตั้งรหัสผ่านใหม่
       resubscribe: บอกรับใหม่
-      role: สิทธิอนุญาต
-      roles:
-        admin: ผู้ดูแล
-        moderator: ผู้ควบคุม
-        staff: พนักงาน
-        user: ผู้ใช้
+      role: บทบาท
       search: ค้นหา
       search_same_email_domain: ผู้ใช้อื่น ๆ ที่มีโดเมนอีเมลเดียวกัน
       search_same_ip: ผู้ใช้อื่น ๆ ที่มี IP เดียวกัน
       security_measures:
         only_password: รหัสผ่านเท่านั้น
         password_and_2fa: รหัสผ่านและ 2FA
-        password_and_sign_in_token: รหัสผ่านและโทเคนอีเมล
       sensitive: บังคับให้ละเอียดอ่อน
       sensitized: ทำเครื่องหมายว่าละเอียดอ่อนแล้ว
       shared_inbox_url: URL กล่องขาเข้าที่แบ่งปัน
@@ -189,10 +142,15 @@ th:
       silence: จำกัด
       silenced: จำกัดอยู่
       statuses: โพสต์
+      strikes: การดำเนินการก่อนหน้านี้
       subscribe: บอกรับ
+      suspend: ระงับ
       suspended: ระงับอยู่
-      time_in_queue: กำลังรออยู่ในคิว %{time}
+      suspension_irreversible: ลบข้อมูลของบัญชีนี้อย่างถาวรแล้ว คุณสามารถเลิกระงับบัญชีเพื่อทำให้บัญชีใช้งานได้แต่จะไม่กู้คืนข้อมูลใด ๆ ที่บัญชีมีก่อนหน้านี้
+      suspension_reversible_hint_html: ระงับบัญชีแล้ว และจะเอาข้อมูลออกอย่างสมบูรณ์ใน %{date} จนกว่าจะถึงตอนนั้น สามารถกู้คืนบัญชีได้โดยไม่มีผลร้ายใด ๆ หากคุณต้องการเอาข้อมูลของบัญชีทั้งหมดออกในทันที คุณสามารถทำได้ด้านล่าง
       title: บัญชี
+      unblock_email: เลิกปิดกั้นที่อยู่อีเมล
+      unblocked_email_msg: เลิกปิดกั้นที่อยู่อีเมลของ %{username} สำเร็จ
       unconfirmed_email: อีเมลที่ยังไม่ได้ยืนยัน
       undo_sensitized: เลิกทำการบังคับให้ละเอียดอ่อน
       undo_silenced: เลิกทำการจำกัด
@@ -207,26 +165,34 @@ th:
       whitelisted: อนุญาตการติดต่อกับภายนอกแล้ว
     action_logs:
       action_types:
+        approve_appeal: อนุมัติการอุทธรณ์
+        approve_user: อนุมัติผู้ใช้
         assigned_to_self_report: มอบหมายรายงาน
         change_email_user: เปลี่ยนอีเมลสำหรับผู้ใช้
+        change_role_user: เปลี่ยนบทบาทของผู้ใช้
         confirm_user: ยืนยันผู้ใช้
         create_account_warning: สร้างคำเตือน
         create_announcement: สร้างประกาศ
+        create_canonical_email_block: สร้างการปิดกั้นอีเมล
         create_custom_emoji: สร้างอีโมจิที่กำหนดเอง
         create_domain_allow: สร้างการอนุญาตโดเมน
         create_domain_block: สร้างการปิดกั้นโดเมน
         create_email_domain_block: สร้างการปิดกั้นโดเมนอีเมล
         create_ip_block: สร้างกฎ IP
         create_unavailable_domain: สร้างโดเมนที่ไม่พร้อมใช้งาน
+        create_user_role: สร้างบทบาท
         demote_user: ลดขั้นผู้ใช้
         destroy_announcement: ลบประกาศ
+        destroy_canonical_email_block: ลบการปิดกั้นอีเมล
         destroy_custom_emoji: ลบอีโมจิที่กำหนดเอง
         destroy_domain_allow: ลบการอนุญาตโดเมน
         destroy_domain_block: ลบการปิดกั้นโดเมน
         destroy_email_domain_block: ลบการปิดกั้นโดเมนอีเมล
+        destroy_instance: ล้างข้อมูลโดเมน
         destroy_ip_block: ลบกฎ IP
         destroy_status: ลบโพสต์
         destroy_unavailable_domain: ลบโดเมนที่ไม่พร้อมใช้งาน
+        destroy_user_role: ทำลายบทบาท
         disable_2fa_user: ปิดใช้งาน 2FA
         disable_custom_emoji: ปิดใช้งานอีโมจิที่กำหนดเอง
         disable_sign_in_token_auth_user: ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับผู้ใช้
@@ -236,41 +202,56 @@ th:
         enable_user: เปิดใช้งานผู้ใช้
         memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
         promote_user: เลื่อนขั้นผู้ใช้
+        reject_appeal: ปฏิเสธการอุทธรณ์
+        reject_user: ปฏิเสธผู้ใช้
         remove_avatar_user: เอาภาพประจำตัวออก
         reopen_report: เปิดรายงานใหม่
+        resend_user: ส่งจดหมายยืนยันใหม่
         reset_password_user: ตั้งรหัสผ่านใหม่
         resolve_report: แก้ปัญหารายงาน
         sensitive_account: บังคับให้บัญชีละเอียดอ่อน
         silence_account: จำกัดบัญชี
         suspend_account: ระงับบัญชี
         unassigned_report: เลิกมอบหมายรายงาน
+        unblock_email_account: เลิกปิดกั้นที่อยู่อีเมล
         unsensitive_account: เลิกทำการบังคับให้บัญชีละเอียดอ่อน
         unsilence_account: เลิกทำการจำกัดบัญชี
         unsuspend_account: เลิกระงับบัญชี
         update_announcement: อัปเดตประกาศ
         update_custom_emoji: อัปเดตอีโมจิที่กำหนดเอง
         update_domain_block: อัปเดตการปิดกั้นโดเมน
+        update_ip_block: อัปเดตกฎ IP
         update_status: อัปเดตโพสต์
+        update_user_role: อัปเดตบทบาท
       actions:
+        approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        approve_user_html: "%{name} ได้อนุมัติการลงทะเบียนจาก %{target}"
         assigned_to_self_report_html: "%{name} ได้มอบหมายรายงาน %{target} ให้กับตนเอง"
         change_email_user_html: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
+        change_role_user_html: "%{name} ได้เปลี่ยนบทบาทของ %{target}"
         confirm_user_html: "%{name} ได้ยืนยันที่อยู่อีเมลของผู้ใช้ %{target}"
         create_account_warning_html: "%{name} ได้ส่งคำเตือนไปยัง %{target}"
         create_announcement_html: "%{name} ได้สร้างประกาศใหม่ %{target}"
+        create_canonical_email_block_html: "%{name} ได้ปิดกั้นอีเมลที่มีแฮช %{target}"
         create_custom_emoji_html: "%{name} ได้อัปโหลดอีโมจิใหม่ %{target}"
         create_domain_allow_html: "%{name} ได้อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         create_domain_block_html: "%{name} ได้ปิดกั้นโดเมน %{target}"
         create_email_domain_block_html: "%{name} ได้ปิดกั้นโดเมนอีเมล %{target}"
         create_ip_block_html: "%{name} ได้สร้างกฎสำหรับ IP %{target}"
         create_unavailable_domain_html: "%{name} ได้หยุดการจัดส่งไปยังโดเมน %{target}"
+        create_user_role_html: "%{name} ได้สร้างบทบาท %{target}"
         demote_user_html: "%{name} ได้ลดขั้นผู้ใช้ %{target}"
         destroy_announcement_html: "%{name} ได้ลบประกาศ %{target}"
-        destroy_custom_emoji_html: "%{name} ได้ทำลายอีโมจิ %{target}"
+        destroy_canonical_email_block_html: "%{name} ได้เลิกปิดกั้นอีเมลที่มีแฮช %{target}"
+        destroy_custom_emoji_html: "%{name} ได้ลบอีโมจิ %{target}"
         destroy_domain_allow_html: "%{name} ได้ไม่อนุญาตการติดต่อกับภายนอกกับโดเมน %{target}"
         destroy_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมน %{target}"
         destroy_email_domain_block_html: "%{name} ได้เลิกปิดกั้นโดเมนอีเมล %{target}"
+        destroy_instance_html: "%{name} ได้ล้างข้อมูลโดเมน %{target}"
         destroy_ip_block_html: "%{name} ได้ลบกฎสำหรับ IP %{target}"
         destroy_status_html: "%{name} ได้เอาโพสต์โดย %{target} ออก"
+        destroy_unavailable_domain_html: "%{name} ได้ทำการจัดส่งไปยังโดเมน %{target} ต่อ"
+        destroy_user_role_html: "%{name} ได้ลบบทบาท %{target}"
         disable_2fa_user_html: "%{name} ได้ปิดใช้งานความต้องการสองปัจจัยสำหรับผู้ใช้ %{target}"
         disable_custom_emoji_html: "%{name} ได้ปิดใช้งานอีโมจิ %{target}"
         disable_sign_in_token_auth_user_html: "%{name} ได้ปิดใช้งานการรับรองความถูกต้องด้วยโทเคนอีเมลสำหรับ %{target}"
@@ -280,22 +261,28 @@ th:
         enable_user_html: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         memorialize_account_html: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user_html: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
+        reject_appeal_html: "%{name} ได้ปฏิเสธการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        reject_user_html: "%{name} ได้ปฏิเสธการลงทะเบียนจาก %{target}"
         remove_avatar_user_html: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report_html: "%{name} ได้เปิดรายงาน %{target} ใหม่"
+        resend_user_html: "%{name} ได้ส่งอีเมลยืนยันสำหรับ %{target} ใหม่"
         reset_password_user_html: "%{name} ได้ตั้งรหัสผ่านของผู้ใช้ %{target} ใหม่"
         resolve_report_html: "%{name} ได้แก้ปัญหารายงาน %{target}"
         sensitive_account_html: "%{name} ได้ทำเครื่องหมายสื่อของ %{target} ว่าละเอียดอ่อน"
         silence_account_html: "%{name} ได้จำกัดบัญชีของ %{target}"
         suspend_account_html: "%{name} ได้ระงับบัญชีของ %{target}"
         unassigned_report_html: "%{name} ได้เลิกมอบหมายรายงาน %{target}"
+        unblock_email_account_html: "%{name} ได้เลิกปิดกั้นที่อยู่อีเมลของ %{target}"
         unsensitive_account_html: "%{name} ได้เลิกทำเครื่องหมายสื่อของ %{target} ว่าละเอียดอ่อน"
         unsilence_account_html: "%{name} ได้เลิกจำกัดบัญชีของ %{target}"
         unsuspend_account_html: "%{name} ได้เลิกระงับบัญชีของ %{target}"
         update_announcement_html: "%{name} ได้อัปเดตประกาศ %{target}"
         update_custom_emoji_html: "%{name} ได้อัปเดตอีโมจิ %{target}"
         update_domain_block_html: "%{name} ได้อัปเดตการปิดกั้นโดเมนสำหรับ %{target}"
+        update_ip_block_html: "%{name} ได้เปลี่ยนกฎสำหรับ IP %{target}"
         update_status_html: "%{name} ได้อัปเดตโพสต์โดย %{target}"
-      deleted_status: "(โพสต์ที่ลบแล้ว)"
+        update_user_role_html: "%{name} ได้เปลี่ยนบทบาท %{target}"
+      deleted_account: บัญชีที่ลบแล้ว
       empty: ไม่พบรายการบันทึก
       filter_by_action: กรองตามการกระทำ
       filter_by_user: กรองตามผู้ใช้
@@ -311,8 +298,8 @@ th:
         title: ประกาศใหม่
       publish: เผยแพร่
       published_msg: เผยแพร่ประกาศสำเร็จ!
-      scheduled_for: จัดกำหนดไว้สำหรับ %{time}
-      scheduled_msg: จัดกำหนดการเผยแพร่ประกาศแล้ว!
+      scheduled_for: จัดกำหนดการไว้สำหรับ %{time}
+      scheduled_msg: จัดกำหนดการสำหรับการเผยแพร่ประกาศแล้ว!
       title: ประกาศ
       unpublish: เลิกเผยแพร่
       unpublished_msg: เลิกเผยแพร่ประกาศสำเร็จ!
@@ -334,11 +321,12 @@ th:
       enable: เปิดใช้งาน
       enabled: เปิดใช้งานอยู่
       enabled_msg: เปิดใช้งานอีโมจินั้นสำเร็จ
-      image_hint: PNG สูงสุด 50KB
+      image_hint: PNG หรือ GIF สูงสุด %{size}
       list: แสดงรายการ
       listed: อยู่ในรายการ
       new:
         title: เพิ่มอีโมจิที่กำหนดเองใหม่
+      no_emoji_selected: ไม่มีการเปลี่ยนแปลงอีโมจิเนื่องจากไม่มีการเลือก
       not_permitted: คุณไม่ได้รับอนุญาตให้ทำการกระทำนี้
       overwrite: เขียนทับ
       shortcode: รหัสย่อ
@@ -351,63 +339,105 @@ th:
       updated_msg: อัปเดตอีโมจิสำเร็จ!
       upload: อัปโหลด
     dashboard:
+      active_users: ผู้ใช้ที่ใช้งานอยู่
+      interactions: การโต้ตอบ
+      media_storage: ที่เก็บข้อมูลสื่อ
+      new_users: ผู้ใช้ใหม่
+      opened_reports: รายงานที่เปิด
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> การอุทธรณ์ที่รอดำเนินการ"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> รายงานที่รอดำเนินการ"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> แฮชแท็กที่รอดำเนินการ"
+      pending_users_html:
+        other: "<strong>%{count}</strong> ผู้ใช้ที่รอดำเนินการ"
+      resolved_reports: รายงานที่แก้ปัญหาแล้ว
       software: ซอฟต์แวร์
+      sources: แหล่งที่มาการลงทะเบียน
       space: การใช้พื้นที่
       title: แดชบอร์ด
+      top_languages: ภาษาที่ใช้งานอยู่สูงสุด
+      top_servers: เซิร์ฟเวอร์ที่ใช้งานอยู่สูงสุด
+      website: เว็บไซต์
+    disputes:
+      appeals:
+        empty: ไม่พบการอุทธรณ์
+        title: การอุทธรณ์
     domain_allows:
       add_new: อนุญาตการติดต่อกับภายนอกกับโดเมน
       created_msg: อนุญาตการติดต่อกับภายนอกกับโดเมนสำเร็จ
       destroyed_msg: ไม่อนุญาตการติดต่อกับภายนอกกับโดเมนแล้ว
+      export: ส่งออก
+      import: นำเข้า
       undo: ไม่อนุญาตการติดต่อกับภายนอกกับโดเมน
     domain_blocks:
       add_new: เพิ่มการปิดกั้นโดเมนใหม่
-      created_msg: กำลังประมวลผลการปิดกั้นโดเมน
+      created_msg: ตอนนี้กำลังประมวลผลการปิดกั้นโดเมน
       destroyed_msg: เลิกทำการปิดกั้นโดเมนแล้ว
       domain: โดเมน
       edit: แก้ไขการปิดกั้นโดเมน
+      existing_domain_block: คุณได้กำหนดขีดจำกัดที่เข้มงวดกว่าใน %{name} ไปแล้ว
+      existing_domain_block_html: คุณได้กำหนดขีดจำกัดที่เข้มงวดกว่าใน %{name} ไปแล้ว คุณจำเป็นต้อง <a href="%{unblock_url}">เลิกปิดกั้น</a> ก่อน
+      export: ส่งออก
+      import: นำเข้า
       new:
         create: สร้างการปิดกั้น
-        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะใช้วิธีการควบคุมเฉพาะกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
+        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะนำไปใช้วิธีการควบคุมที่เฉพาะเจาะจงกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
         severity:
-          desc_html: "<strong>ทำให้เงียบ</strong> จะทำให้โพสต์ของบัญชีไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามบัญชี <strong>ระงับ</strong> จะเอาเนื้อหา, สื่อ และข้อมูลโปรไฟล์ทั้งหมดของบัญชีออก ใช้ <strong>ไม่มี</strong> หากคุณเพียงแค่ต้องการปฏิเสธไฟล์สื่อ"
+          desc_html: "<strong>จำกัด</strong> จะทำให้โพสต์จากบัญชีที่โดเมนนี้ไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามเขา <strong>ระงับ</strong> จะเอาข้อมูลเนื้อหา, สื่อ และโปรไฟล์ทั้งหมดสำหรับบัญชีของโดเมนนี้ออกจากเซิร์ฟเวอร์ของคุณ ใช้ <strong>ไม่มี</strong> หากคุณแค่ต้องการปฏิเสธไฟล์สื่อ"
           noop: ไม่มี
-          silence: ทำให้เงียบ
+          silence: จำกัด
           suspend: ระงับ
         title: การปิดกั้นโดเมนใหม่
+      no_domain_block_selected: ไม่มีการเปลี่ยนแปลงการปิดกั้นโดเมนเนื่องจากไม่มีการเลือก
+      not_permitted: คุณไม่ได้รับอนุญาตให้ทำการกระทำนี้
+      obfuscate: ทำให้ชื่อโดเมนคลุมเครือ
+      obfuscate_hint: ปิดบังชื่อโดเมนบางส่วนในรายการหากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       private_comment: ความคิดเห็นส่วนตัว
+      private_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับการใช้งานภายในโดยผู้ควบคุม
       public_comment: ความคิดเห็นสาธารณะ
+      public_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับสาธารณชนทั่วไป หากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       reject_media: ปฏิเสธไฟล์สื่อ
       reject_media_hint: เอาไฟล์สื่อที่จัดเก็บไว้ในเซิร์ฟเวอร์ออกและปฏิเสธที่จะดาวน์โหลดไฟล์ใด ๆ ในอนาคต ไม่เกี่ยวข้องกับการระงับ
       reject_reports: ปฏิเสธรายงาน
-      reject_reports_hint: เพิกเฉยรายงานทั้งหมดที่มาจากโดเมนนี้ ไม่เกี่ยวข้องกับการระงับ
-      rejecting_media: กำลังปฏิเสธไฟล์สื่อ
-      rejecting_reports: กำลังปฏิเสธรายงาน
-      severity:
-        silence: จำกัดอยู่
-        suspend: ระงับอยู่
-      show:
-        affected_accounts:
-          other: มีผลต่อ %{count} บัญชีในฐานข้อมูล
-        retroactive:
-          silence: เลิกทำการจำกัดบัญชีที่มีผลที่มีอยู่จากโดเมนนี้
-          suspend: เลิกระงับบัญชีที่มีผลที่มีอยู่จากโดเมนนี้
-        title: เลิกทำการปิดกั้นโดเมนสำหรับ %{domain}
-        undo: เลิกทำ
+      reject_reports_hint: เพิกเฉยต่อรายงานทั้งหมดที่มาจากโดเมนนี้ ไม่เกี่ยวข้องกับการระงับ
       undo: เลิกทำการปิดกั้นโดเมน
       view: ดูการปิดกั้นโดเมน
     email_domain_blocks:
       add_new: เพิ่มใหม่
+      attempts_over_week:
+        other: "%{count} ความพยายามในการลงทะเบียนในช่วงสัปดาห์ที่ผ่านมา"
       created_msg: ปิดกั้นโดเมนอีเมลสำเร็จ
       delete: ลบ
-      destroyed_msg: เลิกปิดกั้นโดเมนอีเมลสำเร็จ
+      dns:
+        types:
+          mx: ระเบียน MX
       domain: โดเมน
-      empty: ไม่มีโดเมนอีเมลที่ปิดกั้นอยู่
-      from_html: จาก %{domain}
       new:
         create: เพิ่มโดเมน
+        resolve: แปลงที่อยู่โดเมน
         title: ปิดกั้นโดเมนอีเมลใหม่
+      no_email_domain_block_selected: ไม่มีการเปลี่ยนแปลงการปิดกั้นโดเมนอีเมลเนื่องจากไม่มีการเลือก
+      resolved_dns_records_hint_html: ชื่อโดเมนแปลงที่อยู่เป็นโดเมน MX ดังต่อไปนี้ ซึ่งท้ายที่สุดแล้วจะรับผิดชอบสำหรับการยอมรับอีเมล การปิดกั้นโดเมน MX จะปิดกั้นการลงทะเบียนจากที่อยู่อีเมลใด ๆ ซึ่งใช้โดเมน MX เดียวกัน แม้ว่าชื่อโดเมนที่ปรากฏจะแตกต่างกันก็ตาม <strong>ระวังอย่าปิดกั้นผู้ให้บริการอีเมลรายใหญ่</strong>
+      resolved_through_html: แปลงที่อยู่ผ่าน %{domain}
       title: โดเมนอีเมลที่ปิดกั้นอยู่
+    export_domain_allows:
+      new:
+        title: นำเข้าการอนุญาตโดเมน
+      no_file: ไม่ได้เลือกไฟล์
+    export_domain_blocks:
+      import:
+        description_html: คุณกำลังจะนำเข้ารายการการปิดกั้นโดเมน โปรดตรวจทานรายการนี้อย่างระมัดระวังมาก โดยเฉพาะอย่างยิ่งหากคุณไม่ได้สร้างรายการนี้ด้วยตัวคุณเอง
+        existing_relationships_warning: ความสัมพันธ์การติดตามที่มีอยู่
+        private_comment_description_html: 'เพื่อช่วยให้คุณติดตามว่าการปิดกั้นที่นำเข้ามาจากที่ใด จะสร้างการปิดกั้นที่นำเข้าโดยมีความคิดเห็นส่วนตัวดังต่อไปนี้: <q>%{comment}</q>'
+        private_comment_template: นำเข้าจาก %{source} เมื่อ %{date}
+        title: นำเข้าการปิดกั้นโดเมน
+      new:
+        title: นำเข้าการปิดกั้นโดเมน
+      no_file: ไม่ได้เลือกไฟล์
     follow_recommendations:
+      description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามส่วนบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
       language: สำหรับภาษา
       status: สถานะ
       suppress: ระงับคำแนะนำการติดตาม
@@ -415,21 +445,51 @@ th:
       title: คำแนะนำการติดตาม
       unsuppress: คืนค่าคำแนะนำการติดตาม
     instances:
+      availability:
+        description_html:
+          other: หากการจัดส่งไปยังโดเมนล้มเหลวเป็นเวลา <strong>%{count} วันที่แตกต่างกัน</strong> โดยไม่สำเร็จ จะไม่ทำการพยายามจัดส่งเพิ่มเติมเว้นแต่จะได้รับการจัดส่ง <em>จาก</em> โดเมน
+        failure_threshold_reached: ถึงค่าเกณฑ์ความล้มเหลวเมื่อ %{date}
+        failures_recorded:
+          other: ความพยายามที่ล้มเหลวเป็นเวลา %{count} วันที่แตกต่างกัน
+        no_failures_recorded: ไม่มีความล้มเหลวในระเบียน
+        title: ความพร้อมใช้งาน
+        warning: ความพยายามล่าสุดในการเชื่อมต่อกับเซิร์ฟเวอร์นี้ไม่สำเร็จ
       back_to_all: ทั้งหมด
       back_to_limited: จำกัดอยู่
       back_to_warning: คำเตือน
       by_domain: โดเมน
+      confirm_purge: คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลจากโดเมนนี้อย่างถาวร?
+      content_policies:
+        comment: หมายเหตุภายใน
+        description_html: คุณสามารถกำหนดนโยบายเนื้อหาที่จะนำไปใช้กับบัญชีทั้งหมดจากโดเมนนี้และโดเมนย่อยใดก็ตามของโดเมน
+        policies:
+          reject_media: ปฏิเสธสื่อ
+          reject_reports: ปฏิเสธรายงาน
+          silence: จำกัด
+          suspend: ระงับ
+        policy: นโยบาย
+        reason: เหตุผลสาธารณะ
+        title: นโยบายเนื้อหา
+      dashboard:
+        instance_accounts_dimension: บัญชีที่ติดตามมากที่สุด
+        instance_accounts_measure: บัญชีที่จัดเก็บไว้
+        instance_followers_measure: ผู้ติดตามของเราที่นั่น
+        instance_follows_measure: ผู้ติดตามของเขาที่นี่
+        instance_languages_dimension: ภาษายอดนิยม
+        instance_media_attachments_measure: ไฟล์แนบสื่อที่จัดเก็บไว้
+        instance_reports_measure: รายงานเกี่ยวกับเขา
+        instance_statuses_measure: โพสต์ที่จัดเก็บไว้
       delivery:
         all: ทั้งหมด
         clear: ล้างข้อผิดพลาดการจัดส่ง
+        failing: ล้มเหลว
         restart: เริ่มการจัดส่งใหม่
         stop: หยุดการจัดส่ง
-        title: การจัดส่ง
         unavailable: ไม่พร้อมใช้งาน
-        unavailable_message: การจัดส่งไม่พร้อมใช้งาน
-        warning: คำเตือน
       delivery_available: มีการจัดส่ง
       delivery_error_days: วันที่มีข้อผิดพลาดการจัดส่ง
+      delivery_error_hint: หากไม่สามารถทำการจัดส่งได้เป็นเวลา %{count} วัน ระบบจะทำเครื่องหมายโดเมนว่าจัดส่งไม่ได้โดยอัตโนมัติ
+      destroyed_msg: ตอนนี้จัดคิวข้อมูลจาก %{domain} สำหรับการลบในเร็ว ๆ นี้แล้ว
       empty: ไม่พบโดเมน
       known_accounts:
         other: "%{count} บัญชีที่รู้จัก"
@@ -439,12 +499,15 @@ th:
         title: การควบคุม
       private_comment: ความคิดเห็นส่วนตัว
       public_comment: ความคิดเห็นสาธารณะ
+      purge: ล้างข้อมูล
+      purge_description_html: หากคุณเชื่อว่าโดเมนนี้ออฟไลน์อย่างถาวร คุณสามารถลบระเบียนบัญชีและข้อมูลที่เกี่ยวข้องทั้งหมดจากโดเมนนี้จากที่เก็บข้อมูลของคุณ นี่อาจใช้เวลาสักครู่
       title: การติดต่อกับภายนอก
       total_blocked_by_us: ปิดกั้นโดยเรา
       total_followed_by_them: ติดตามโดยเขา
       total_followed_by_us: ติดตามโดยเรา
       total_reported: รายงานเกี่ยวกับเขา
       total_storage: ไฟล์แนบสื่อ
+      totals_time_period_hint_html: ยอดรวมที่แสดงด้านล่างรวมข้อมูลสำหรับเวลาทั้งหมด
     invites:
       deactivate_all: ปิดใช้งานทั้งหมด
       filter:
@@ -466,14 +529,14 @@ th:
         '94670856': 3 ปี
       new:
         title: สร้างกฎ IP ใหม่
+      no_ip_block_selected: ไม่มีการเปลี่ยนแปลงกฎ IP เนื่องจากไม่มีการเลือก
       title: กฎ IP
-    pending_accounts:
-      title: บัญชีที่รอดำเนินการ (%{count})
     relationships:
       title: ความสัมพันธ์ของ %{acct}
     relays:
       add_new: เพิ่มรีเลย์ใหม่
       delete: ลบ
+      description_html: "<strong>รีเลย์การติดต่อกับภายนอก</strong> เป็นเซิร์ฟเวอร์ตัวกลางที่แลกเปลี่ยนโพสต์สาธารณะจำนวนมากระหว่างเซิร์ฟเวอร์ที่บอกรับและเผยแพร่ไปยังรีเลย์ <strong>รีเลย์สามารถช่วยให้เซิร์ฟเวอร์ขนาดเล็กและขนาดกลางค้นพบเนื้อหาจากจักรวาลสหพันธ์</strong> ซึ่งมิฉะนั้นจะต้องให้ผู้ใช้ในเซิร์ฟเวอร์ติดตามผู้คนอื่น ๆ ในเซิร์ฟเวอร์ระยะไกลด้วยตนเอง"
       disable: ปิดใช้งาน
       disabled: ปิดใช้งานอยู่
       enable: เปิดใช้งาน
@@ -483,6 +546,7 @@ th:
       pending: กำลังรอการอนุมัติของรีเลย์
       save_and_enable: บันทึกแล้วเปิดใช้งาน
       setup: ตั้งค่าการเชื่อมต่อแบบรีเลย์
+      signatures_not_enabled: รีเลย์จะทำงานไม่ถูกต้องขณะที่มีการเปิดใช้งานโหมดปลอดภัยหรือโหมดการติดต่อกับภายนอกแบบจำกัด
       status: สถานะ
       title: รีเลย์
     report_notes:
@@ -492,190 +556,349 @@ th:
       account:
         notes:
           other: "%{count} หมายเหตุ"
-        reports:
-          other: "%{count} รายงาน"
+      action_log: รายการบันทึกการตรวจสอบ
+      action_taken_by: ใช้การกระทำโดย
+      actions:
+        delete_description_html: จะลบโพสต์ที่รายงานและจะบันทึกการดำเนินการเพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตโดยบัญชีเดียวกัน
+        mark_as_sensitive_description_html: จะทำเครื่องหมายสื่อในโพสต์ที่รายงานว่าละเอียดอ่อนและจะบันทึกการดำเนินการเพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตโดยบัญชีเดียวกัน
+        other_description_html: ดูตัวเลือกเพิ่มเติมสำหรับการควบคุมพฤติกรรมของบัญชีและปรับแต่งการสื่อสารไปยังบัญชีที่รายงาน
+        resolve_description_html: จะไม่ใช้การกระทำกับบัญชีที่รายงาน ไม่มีการบันทึกการดำเนินการ และจะปิดรายงาน
+        silence_description_html: โปรไฟล์จะปรากฏแก่เฉพาะผู้ที่ติดตามโปรไฟล์อยู่แล้วหรือค้นหาโปรไฟล์ด้วยตนเองเท่านั้น จำกัดการเข้าถึงโปรไฟล์อย่างมาก สามารถแปลงกลับได้เสมอ
+        suspend_description_html: โปรไฟล์และเนื้อหาของโปรไฟล์ทั้งหมดจะเข้าถึงไม่ได้จนกว่าจะลบโปรไฟล์ในที่สุด การโต้ตอบกับบัญชีจะเป็นไปไม่ได้ แปลงกลับได้ภายใน 30 วัน
+      actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษกับบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
+      add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
       are_you_sure: คุณแน่ใจหรือไม่?
       assign_to_self: มอบหมายให้ฉัน
       assigned: ผู้ควบคุมที่ได้รับมอบหมาย
+      by_target_domain: โดเมนของบัญชีที่ได้รับการรายงาน
+      category: หมวดหมู่
+      category_description_html: จะอ้างถึงเหตุผลที่บัญชีและ/หรือเนื้อหานี้ได้รับการรายงานในการสื่อสารกับบัญชีที่ได้รับการรายงาน
       comment:
         none: ไม่มี
+      comment_description_html: 'เพื่อให้ข้อมูลเพิ่มเติม %{name} ได้เขียน:'
       created_at: รายงานเมื่อ
+      delete_and_resolve: ลบโพสต์
       forwarded: ส่งต่อแล้ว
       forwarded_to: ส่งต่อไปยัง %{domain} แล้ว
       mark_as_resolved: ทำเครื่องหมายว่าแก้ปัญหาแล้ว
+      mark_as_sensitive: ทำเครื่องหมายว่าละเอียดอ่อน
       mark_as_unresolved: ทำเครื่องหมายว่ายังไม่ได้แก้ปัญหา
+      no_one_assigned: ไม่มีใคร
       notes:
         create: เพิ่มหมายเหตุ
         create_and_resolve: แก้ปัญหาโดยมีหมายเหตุ
         create_and_unresolve: เปิดใหม่โดยมีหมายเหตุ
         delete: ลบ
+        placeholder: อธิบายว่าการกระทำใดที่ใช้ หรือการอัปเดตที่เกี่ยวข้องอื่นใด...
+        title: หมายเหตุ
+      notes_description_html: ดูและฝากหมายเหตุถึงผู้ควบคุมอื่น ๆ และตัวคุณเองในอนาคต
+      quick_actions_description_html: 'ดำเนินการอย่างรวดเร็วหรือเลื่อนลงเพื่อดูเนื้อหาที่รายงาน:'
+      remote_user_placeholder: ผู้ใช้ระยะไกลจาก %{instance}
       reopen: เปิดรายงานใหม่
       report: 'รายงาน #%{id}'
       reported_account: บัญชีที่ได้รับการรายงาน
       reported_by: รายงานโดย
       resolved: แก้ปัญหาแล้ว
       resolved_msg: แก้ปัญหารายงานสำเร็จ!
+      skip_to_actions: ข้ามไปยังการกระทำ
       status: สถานะ
-      target_domain: โดเมนของบัญชีที่ได้รับการรายงาน
+      statuses: เนื้อหาที่รายงาน
+      statuses_description_html: จะอ้างถึงเนื้อหาที่ละเมิดในการสื่อสารกับบัญชีที่ได้รับการรายงาน
       target_origin: จุดเริ่มต้นของบัญชีที่ได้รับการรายงาน
       title: รายงาน
       unassign: เลิกมอบหมาย
       unresolved: ยังไม่ได้แก้ปัญหา
       updated_at: อัปเดตเมื่อ
+      view_profile: ดูโปรไฟล์
+    roles:
+      add_new: เพิ่มบทบาท
+      assigned_users:
+        other: "%{count} ผู้ใช้"
+      categories:
+        administration: การดูแล
+        devops: DevOps
+        invites: คำเชิญ
+        moderation: การควบคุม
+        special: พิเศษ
+      delete: ลบ
+      description_html: ด้วย <strong>บทบาทผู้ใช้</strong> คุณสามารถปรับแต่งว่าฟังก์ชันและพื้นที่ใดของ Mastodon ที่ผู้ใช้ของคุณสามารถเข้าถึง
+      edit: แก้ไขบทบาท '%{name}'
+      everyone: สิทธิอนุญาตเริ่มต้น
+      everyone_full_description_html: นี่คือ <strong>บทบาทพื้นฐาน</strong> ที่มีผลต่อ <strong>ผู้ใช้ทั้งหมด</strong> แม้แต่ผู้ใช้ที่ไม่มีบทบาทที่กำหนด บทบาทอื่น ๆ ทั้งหมดสืบทอดสิทธิอนุญาตจากบทบาทพื้นฐาน
+      permissions_count:
+        other: "%{count} สิทธิอนุญาต"
+      privileges:
+        administrator: ผู้ดูแล
+        administrator_description: ผู้ใช้ที่มีสิทธิอนุญาตนี้จะข้ามทุกสิทธิอนุญาต
+        delete_user_data: ลบข้อมูลผู้ใช้
+        delete_user_data_description: อนุญาตให้ผู้ใช้ลบข้อมูลของผู้ใช้อื่น ๆ โดยทันที
+        invite_users: เชิญผู้ใช้
+        invite_users_description: อนุญาตให้ผู้ใช้เชิญผู้คนใหม่ไปยังเซิร์ฟเวอร์
+        manage_announcements: จัดการประกาศ
+        manage_announcements_description: อนุญาตให้ผู้ใช้จัดการประกาศในเซิร์ฟเวอร์
+        manage_appeals: จัดการการอุทธรณ์
+        manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการควบคุม
+        manage_blocks: จัดการการปิดกั้น
+        manage_blocks_description: อนุญาตให้ผู้ใช้ปิดกั้นผู้ให้บริการอีเมลและที่อยู่ IP
+        manage_custom_emojis: จัดการอีโมจิที่กำหนดเอง
+        manage_custom_emojis_description: อนุญาตให้ผู้ใช้จัดการอีโมจิที่กำหนดเองในเซิร์ฟเวอร์
+        manage_federation: จัดการการติดต่อกับภายนอก
+        manage_federation_description: อนุญาตให้ผู้ใช้ปิดกั้นหรืออนุญาตการติดต่อกับภายนอกกับโดเมนอื่น ๆ และควบคุมความสามารถในการจัดส่ง
+        manage_invites: จัดการคำเชิญ
+        manage_invites_description: อนุญาตให้ผู้ใช้เรียกดูและปิดใช้งานลิงก์เชิญ
+        manage_reports: จัดการรายงาน
+        manage_reports_description: อนุญาตให้ผู้ใช้ตรวจทานรายงานและทำการกระทำการควบคุมกับรายงาน
+        manage_roles: จัดการบทบาท
+        manage_roles_description: อนุญาตให้ผู้ใช้จัดการและกำหนดบทบาทที่ต่ำกว่าบทบาทของเขา
+        manage_rules: จัดการกฎ
+        manage_rules_description: อนุญาตให้ผู้ใช้เปลี่ยนกฎของเซิร์ฟเวอร์
+        manage_settings: จัดการการตั้งค่า
+        manage_settings_description: อนุญาตให้ผู้ใช้เปลี่ยนการตั้งค่าไซต์
+        manage_taxonomies: จัดการอนุกรมวิธาน
+        manage_taxonomies_description: อนุญาตให้ผู้ใช้ตรวจทานเนื้อหาที่กำลังนิยมและอัปเดตการตั้งค่าแฮชแท็ก
+        manage_user_access: จัดการการเข้าถึงของผู้ใช้
+        manage_user_access_description: อนุญาตให้ผู้ใช้ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยของผู้ใช้อื่น เปลี่ยนที่อยู่อีเมลของเขา และตั้งรหัสผ่านของเขาใหม่
+        manage_users: จัดการผู้ใช้
+        manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการควบคุมกับผู้ใช้
+        manage_webhooks: จัดการเว็บฮุค
+        manage_webhooks_description: อนุญาตให้ผู้ใช้ตั้งค่าเว็บฮุคสำหรับเหตุการณ์การดูแล
+        view_audit_log: ดูรายการบันทึกการตรวจสอบ
+        view_audit_log_description: อนุญาตให้ผู้ใช้ดูประวัติการกระทำการดูแลในเซิร์ฟเวอร์
+        view_dashboard: ดูแดชบอร์ด
+        view_dashboard_description: อนุญาตให้ผู้ใช้เข้าถึงแดชบอร์ดและเมตริกต่าง ๆ
+        view_devops: DevOps
+        view_devops_description: อนุญาตให้ผู้ใช้เข้าถึงแดชบอร์ด Sidekiq และ pgHero
+      title: บทบาท
     rules:
       add_new: เพิ่มกฎ
       delete: ลบ
+      description_html: ขณะที่ส่วนใหญ่อ้างว่าได้อ่านและยอมรับเงื่อนไขการให้บริการ ผู้คนมักจะไม่อ่านจนกว่าหลังจากปัญหาเกิดขึ้น <strong>ทำให้การดูกฎของเซิร์ฟเวอร์ของคุณอย่างรวดเร็วง่ายขึ้นโดยการระบุกฎของเซิร์ฟเวอร์ในรายการสัญลักษณ์แสดงหัวข้อย่อยแบบแบน</strong> พยายามทำให้กฎแต่ละข้อสั้นและเรียบง่าย แต่พยายามอย่าแบ่งกฎเป็นหลายรายการแยกเช่นกัน
       edit: แก้ไขกฎ
       empty: ยังไม่ได้กำหนดกฎของเซิร์ฟเวอร์
       title: กฎของเซิร์ฟเวอร์
     settings:
-      activity_api_enabled:
-        desc_html: จำนวนโพสต์ที่เผยแพร่ในเซิร์ฟเวอร์, ผู้ใช้ที่ใช้งานอยู่ และการลงทะเบียนใหม่ในบักเก็ตรายสัปดาห์
-        title: เผยแพร่สถิติรวมเกี่ยวกับกิจกรรมผู้ใช้ใน API
-      bootstrap_timeline_accounts:
-        title: แนะนำบัญชีเหล่านี้ให้กับผู้ใช้ใหม่
-      contact_information:
-        email: อีเมลธุรกิจ
-        username: ชื่อผู้ใช้ในการติดต่อ
-      custom_css:
-        desc_html: ปรับเปลี่ยนรูปลักษณ์ด้วย CSS ที่โหลดในทุกหน้า
-        title: CSS ที่กำหนดเอง
+      about:
+        manage_rules: จัดการกฎของเซิร์ฟเวอร์
+        preamble: ให้ข้อมูลเชิงลึกเกี่ยวกับวิธีที่เซิร์ฟเวอร์ได้รับการดำเนินงาน ควบคุม ได้รับทุน
+        rules_hint: มีพื้นที่เฉพาะสำหรับกฎที่คาดหวังให้ผู้ใช้ของคุณปฏิบัติตาม
+        title: เกี่ยวกับ
+      appearance:
+        preamble: ปรับแต่งส่วนติดต่อเว็บของ Mastodon
+        title: ลักษณะที่ปรากฏ
+      branding:
+        preamble: ตราสินค้าของเซิร์ฟเวอร์ของคุณสร้างความแตกต่างตราสินค้าของเซิร์ฟเวอร์ของคุณจากเซิร์ฟเวอร์อื่น ๆ ในเครือข่าย อาจแสดงข้อมูลนี้ข้ามสภาพแวดล้อมที่หลากหลาย เช่น ส่วนติดต่อเว็บของ Mastodon, แอปพลิเคชันเนทีฟ, ในการแสดงตัวอย่างลิงก์ในเว็บไซต์อื่น ๆ และภายในแอปการส่งข้อความ และอื่น ๆ ด้วยเหตุผลนี้ จึงเป็นการดีที่สุดที่จะทำให้ข้อมูลนี้ชัดเจน สั้น และกระชับ
+        title: ตราสินค้า
+      content_retention:
+        preamble: ควบคุมวิธีการจัดเก็บเนื้อหาที่ผู้ใช้สร้างขึ้นใน Mastodon
+        title: การเก็บรักษาเนื้อหา
       default_noindex:
         desc_html: มีผลต่อผู้ใช้ทั้งหมดที่ไม่ได้เปลี่ยนการตั้งค่านี้ด้วยตนเอง
         title: เลือกให้ผู้ใช้ไม่รับการทำดัชนีโดยเครื่องมือค้นหาเป็นค่าเริ่มต้น
+      discovery:
+        follow_recommendations: คำแนะนำการติดตาม
+        preamble: การแสดงเนื้อหาที่น่าสนใจเป็นเครื่องมือในการเตรียมความพร้อมให้ผู้ใช้ใหม่ที่อาจไม่รู้จักใครก็ตามใน Mastodon ควบคุมวิธีที่คุณลักษณะการค้นพบต่าง ๆ ทำงานในเซิร์ฟเวอร์ของคุณ
+        profile_directory: ไดเรกทอรีโปรไฟล์
+        public_timelines: เส้นเวลาสาธารณะ
+        title: การค้นพบ
+        trends: แนวโน้ม
       domain_blocks:
         all: ให้กับทุกคน
         disabled: ให้กับไม่มีใคร
-        title: แสดงการปิดกั้นโดเมน
         users: ให้กับผู้ใช้ในเซิร์ฟเวอร์ที่เข้าสู่ระบบ
-      domain_blocks_rationale:
-        title: แสดงคำชี้แจงเหตุผล
-      hero:
-        desc_html: แสดงในหน้าแรก อย่างน้อย 600x100px ที่แนะนำ เมื่อไม่ได้ตั้ง กลับไปใช้ภาพขนาดย่อเซิร์ฟเวอร์
-        title: ภาพแบนเนอร์หลัก
-      mascot:
-        desc_html: แสดงในหลายหน้า อย่างน้อย 293×205px ที่แนะนำ เมื่อไม่ได้ตั้ง กลับไปใช้มาสคอตเริ่มต้น
-        title: ภาพมาสคอต
-      peers_api_enabled:
-        desc_html: ชื่อโดเมนที่เซิร์ฟเวอร์นี้ได้พบในเฟดิเวิร์ส
-        title: เผยแพร่รายการเซิร์ฟเวอร์ที่ค้นพบใน API
-      preview_sensitive_media:
-        desc_html: การแสดงตัวอย่างลิงก์ในเว็บไซต์อื่น ๆ จะแสดงภาพขนาดย่อแม้ว่าจะมีการทำเครื่องหมายสื่อว่าละเอียดอ่อน
-        title: แสดงสื่อที่ละเอียดอ่อนในการแสดงตัวอย่าง OpenGraph
-      profile_directory:
-        desc_html: อนุญาตให้ผู้ใช้สามารถค้นพบได้
-        title: เปิดใช้งานไดเรกทอรีโปรไฟล์
       registrations:
-        closed_message:
-          desc_html: แสดงในหน้าแรกเมื่อปิดการลงทะเบียน คุณสามารถใช้แท็ก HTML
-          title: ข้อความการปิดการลงทะเบียน
-        deletion:
-          desc_html: อนุญาตให้ใครก็ตามลบบัญชีของเขา
-          title: เปิดการลบบัญชี
-        min_invite_role:
-          disabled: ไม่มีใคร
-          title: อนุญาตคำเชิญโดย
-        require_invite_text:
-          title: ต้องให้ผู้ใช้ใหม่ป้อนเหตุผลที่จะเข้าร่วม
+        preamble: ควบคุมผู้ที่สามารถสร้างบัญชีในเซิร์ฟเวอร์ของคุณ
+        title: การลงทะเบียน
       registrations_mode:
         modes:
-          approved: ต้องมีการอนุมัติสำหรับการลงทะเบียน
+          approved: ต้องการการอนุมัติสำหรับการลงทะเบียน
           none: ไม่มีใครสามารถลงทะเบียน
           open: ใครก็ตามสามารถลงทะเบียน
-        title: โหมดการลงทะเบียน
-      show_known_fediverse_at_about_page:
-        desc_html: เมื่อปิดใช้งาน จำกัดเส้นเวลาสาธารณะที่เชื่อมโยงจากหน้าเริ่มต้นให้แสดงเฉพาะเนื้อหาในเซิร์ฟเวอร์เท่านั้น
-        title: รวมเนื้อหาที่ติดต่อกับภายนอกไว้ในหน้าเส้นเวลาสาธารณะที่ไม่ได้รับรองความถูกต้อง
-      show_staff_badge:
-        desc_html: แสดงป้ายพนักงานในหน้าผู้ใช้
-        title: แสดงป้ายพนักงาน
-      site_description:
-        desc_html: ย่อหน้าเกริ่นนำใน API อธิบายถึงสิ่งที่ทำให้เซิร์ฟเวอร์ Mastodon นี้พิเศษและสิ่งอื่นใดที่สำคัญ คุณสามารถใช้แท็ก HTML โดยเฉพาะอย่างยิ่ง <code>&lt;a&gt;</code> และ <code>&lt;em&gt;</code>
-        title: คำอธิบายเซิร์ฟเวอร์
-      site_description_extended:
-        desc_html: สถานที่ที่ดีสำหรับแนวทางปฏิบัติ, กฎ, หลักเกณฑ์ และสิ่งอื่น ๆ ของคุณที่ทำให้เซิร์ฟเวอร์ของคุณแตกต่าง คุณสามารถใช้แท็ก HTML
-        title: ข้อมูลแบบขยายที่กำหนดเอง
-      site_short_description:
-        desc_html: แสดงในแถบข้างและแท็กเมตา อธิบายว่า Mastodon คืออะไรและสิ่งที่ทำให้เซิร์ฟเวอร์นี้พิเศษในย่อหน้าเดียว
-        title: คำอธิบายเซิร์ฟเวอร์แบบสั้น
-      site_terms:
-        desc_html: คุณสามารถเขียนนโยบายความเป็นส่วนตัว, เงื่อนไขการให้บริการ หรือภาษากฎหมายอื่น ๆ ของคุณเอง คุณสามารถใช้แท็ก HTML
-        title: เงื่อนไขการให้บริการที่กำหนดเอง
-      site_title: ชื่อเซิร์ฟเวอร์
-      thumbnail:
-        desc_html: ใช้สำหรับการแสดงตัวอย่างผ่าน OpenGraph และ API 1200x630px ที่แนะนำ
-        title: ภาพขนาดย่อเซิร์ฟเวอร์
-      timeline_preview:
-        desc_html: แสดงลิงก์ไปยังเส้นเวลาสาธารณะในหน้าเริ่มต้นและอนุญาตการเข้าถึง API ไปยังเส้นเวลาสาธารณะโดยไม่มีการรับรองความถูกต้อง
-        title: อนุญาตการเข้าถึงเส้นเวลาสาธารณะที่ไม่ได้รับรองความถูกต้อง
-      title: การตั้งค่าไซต์
-      trendable_by_default:
-        desc_html: มีผลต่อแฮชแท็กที่ไม่ได้ไม่อนุญาตก่อนหน้านี้
-        title: อนุญาตให้แฮชแท็กขึ้นแนวโน้มโดยไม่มีการตรวจทานล่วงหน้า
-      trends:
-        desc_html: แสดงแฮชแท็กที่ตรวจทานแล้วก่อนหน้านี้ที่กำลังนิยมเป็นสาธารณะ
-        title: แฮชแท็กที่กำลังนิยม
+      title: การตั้งค่าเซิร์ฟเวอร์
     site_uploads:
       delete: ลบไฟล์ที่อัปโหลด
       destroyed_msg: ลบการอัปโหลดไซต์สำเร็จ!
     statuses:
+      account: ผู้สร้าง
+      application: แอปพลิเคชัน
       back_to_account: กลับไปที่หน้าบัญชี
+      back_to_report: กลับไปที่หน้ารายงาน
       batch:
-        delete: ลบ
-        nsfw_off: ทำเครื่องหมายว่าไม่ละเอียดอ่อน
-        nsfw_on: ทำเครื่องหมายว่าละเอียดอ่อน
+        remove_from_report: เอาออกจากรายงาน
+        report: รายงาน
       deleted: ลบแล้ว
-      failed_to_execute: ไม่สามารถปฏิบัติการ
+      favourites: รายการโปรด
+      history: ประวัติรุ่น
+      in_reply_to: กำลังตอบกลับ
+      language: ภาษา
       media:
         title: สื่อ
-      no_media: ไม่มีสื่อ
+      metadata: ข้อมูลอภิพันธุ์
+      no_status_selected: ไม่มีการเปลี่ยนแปลงโพสต์เนื่องจากไม่มีการเลือก
+      open: เปิดโพสต์
+      original_status: โพสต์ดั้งเดิม
+      reblogs: การดัน
+      status_changed: เปลี่ยนโพสต์แล้ว
       title: โพสต์ของบัญชี
+      trending: กำลังนิยม
+      visibility: การมองเห็น
       with_media: มีสื่อ
+    strikes:
+      actions:
+        delete_statuses: "%{name} ได้ลบโพสต์ของ %{target}"
+        disable: "%{name} ได้อายัดบัญชีของ %{target}"
+        mark_statuses_as_sensitive: "%{name} ได้ทำเครื่องหมายโพสต์ของ %{target} ว่าละเอียดอ่อน"
+        none: "%{name} ได้ส่งคำเตือนไปยัง %{target}"
+        sensitive: "%{name} ได้ทำเครื่องหมายบัญชีของ %{target} ว่าละเอียดอ่อน"
+        silence: "%{name} ได้จำกัดบัญชีของ %{target}"
+        suspend: "%{name} ได้ระงับบัญชีของ %{target}"
+      appeal_approved: อุทธรณ์แล้ว
+      appeal_pending: รอดำเนินการการอุทธรณ์
     system_checks:
+      database_schema_check:
+        message_html: มีการโยกย้ายฐานข้อมูลที่รอดำเนินการ โปรดเรียกใช้การโยกย้ายเพื่อให้แน่ใจว่าแอปพลิเคชันทำงานตามที่คาดไว้
+      elasticsearch_running_check:
+        message_html: ไม่สามารถเชื่อมต่อกับ Elasticsearch โปรดตรวจสอบว่าซอฟต์แวร์กำลังทำงาน หรือปิดใช้งานการค้นหาข้อความแบบเต็ม
+      elasticsearch_version_check:
+        message_html: 'รุ่น Elasticsearch ที่เข้ากันไม่ได้: %{value}'
+        version_comparison: Elasticsearch %{running_version} กำลังทำงานขณะที่ต้องการ %{required_version}
       rules_check:
         action: จัดการกฎของเซิร์ฟเวอร์
         message_html: คุณไม่ได้กำหนดกฎของเซิร์ฟเวอร์ใด ๆ
       sidekiq_process_check:
         message_html: ไม่มีกระบวนการ Sidekiq ที่กำลังทำงานสำหรับคิว %{value} โปรดตรวจทานการกำหนดค่า Sidekiq ของคุณ
     tags:
-      accounts_today: การใช้งานที่ไม่ซ้ำกันในวันนี้
-      accounts_week: การใช้งานที่ไม่ซ้ำกันในสัปดาห์นี้
-      breakdown: การแบ่งการใช้งานของวันนี้ตามแหล่งที่มา
-      last_active: ใช้งานล่าสุด
-      most_popular: ยอดนิยม
-      most_recent: สร้างล่าสุด
-      name: แฮชแท็ก
       review: สถานะการตรวจทาน
-      reviewed: ตรวจทานแล้ว
-      title: แฮชแท็ก
-      trending_right_now: กำลังนิยม
-      unique_uses_today: "%{count} การโพสต์วันนี้"
-      unreviewed: ยังไม่ได้ตรวจทาน
       updated_msg: อัปเดตการตั้งค่าแฮชแท็กสำเร็จ
     title: การดูแล
+    trends:
+      allow: อนุญาต
+      approved: อนุมัติแล้ว
+      disallow: ไม่อนุญาต
+      links:
+        allow: อนุญาตลิงก์
+        allow_provider: อนุญาตผู้เผยแพร่
+        description_html: นี่คือลิงก์ที่กำลังได้รับการแบ่งปันเป็นจำนวนมากโดยบัญชีที่เซิร์ฟเวอร์ของคุณเห็นโพสต์จากในปัจจุบัน ลิงก์สามารถช่วยให้ผู้ใช้ของคุณค้นหาสิ่งที่กำลังเกิดขึ้นในโลก จะไม่แสดงลิงก์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้เผยแพร่ คุณยังสามารถอนุญาตหรือปฏิเสธลิงก์แต่ละรายการ
+        disallow: ไม่อนุญาตลิงก์
+        disallow_provider: ไม่อนุญาตผู้เผยแพร่
+        no_link_selected: ไม่มีการเปลี่ยนแปลงลิงก์เนื่องจากไม่มีการเลือก
+        publishers:
+          no_publisher_selected: ไม่มีการเปลี่ยนแปลงผู้เผยแพร่เนื่องจากไม่มีการเลือก
+        shared_by_over_week:
+          other: แบ่งปันโดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
+        title: ลิงก์ที่กำลังนิยม
+        usage_comparison: แบ่งปัน %{today} ครั้งวันนี้ เทียบกับ %{yesterday} เมื่อวานนี้
+      only_allowed: อนุญาตเท่านั้น
+      pending_review: การตรวจทานที่รอดำเนินการ
+      preview_card_providers:
+        allowed: ลิงก์จากผู้เผยแพร่นี้สามารถขึ้นแนวโน้ม
+        description_html: นี่คือโดเมนจากลิงก์ที่มักได้รับการแบ่งปันในเซิร์ฟเวอร์ของคุณ ลิงก์จะไม่ขึ้นแนวโน้มเป็นสาธารณะเว้นแต่จะอนุมัติโดเมนของลิงก์ การอนุมัติ (หรือการปฏิเสธ) ของคุณจะขยายไปยังโดเมนย่อย
+        rejected: ลิงก์จากผู้เผยแพร่นี้จะไม่ขึ้นแนวโน้ม
+        title: ผู้เผยแพร่
+      rejected: ปฏิเสธแล้ว
+      statuses:
+        allow: อนุญาตโพสต์
+        allow_account: อนุญาตผู้สร้าง
+        description_html: นี่คือโพสต์ที่เซิร์ฟเวอร์ของคุณทราบเกี่ยวกับที่กำลังได้รับการแบ่งปันและชื่นชอบเป็นจำนวนมากในปัจจุบันในขณะนี้ โพสต์สามารถช่วยให้ผู้ใช้ใหม่และที่กลับมาของคุณค้นหาผู้คนเพิ่มเติมที่จะติดตาม จะไม่แสดงโพสต์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้สร้าง และผู้สร้างอนุญาตให้แนะนำบัญชีของเขากับผู้อื่น คุณยังสามารถอนุญาตหรือปฏิเสธโพสต์แต่ละรายการ
+        disallow: ไม่อนุญาตโพสต์
+        disallow_account: ไม่อนุญาตผู้สร้าง
+        no_status_selected: ไม่มีการเปลี่ยนแปลงโพสต์ที่กำลังนิยมเนื่องจากไม่มีการเลือก
+        not_discoverable: ผู้สร้างไม่ได้เลือกรับให้สามารถค้นพบได้
+        shared_by:
+          other: แบ่งปันและชื่นชอบ %{friendly_count} ครั้ง
+        title: โพสต์ที่กำลังนิยม
+      tags:
+        current_score: คะแนนปัจจุบัน %{score}
+        dashboard:
+          tag_accounts_measure: การใช้งานที่ไม่ซ้ำกัน
+          tag_languages_dimension: ภาษายอดนิยม
+          tag_servers_dimension: เซิร์ฟเวอร์ยอดนิยม
+          tag_servers_measure: เซิร์ฟเวอร์ต่าง ๆ
+          tag_uses_measure: การใช้งานทั้งหมด
+        description_html: นี่คือแฮชแท็กที่กำลังปรากฏในโพสต์จำนวนมากที่เซิร์ฟเวอร์ของคุณเห็นในปัจจุบัน แฮชแท็กสามารถช่วยให้ผู้ใช้ของคุณค้นหาสิ่งที่ผู้คนกำลังพูดถึงมากที่สุดในขณะนี้ จะไม่แสดงแฮชแท็กเป็นสาธารณะจนกว่าคุณจะอนุมัติแฮชแท็ก
+        listable: สามารถแนะนำ
+        no_tag_selected: ไม่มีการเปลี่ยนแปลงแท็กเนื่องจากไม่มีการเลือก
+        not_listable: จะไม่แนะนำ
+        not_trendable: จะไม่ปรากฏภายใต้แนวโน้ม
+        not_usable: ไม่สามารถใช้
+        peaked_on_and_decaying: สูงสุดเมื่อ %{date} ตอนนี้กำลังลง
+        title: แฮชแท็กที่กำลังนิยม
+        trendable: สามารถปรากฏภายใต้แนวโน้ม
+        trending_rank: 'กำลังนิยม #%{rank}'
+        usable: สามารถใช้
+        usage_comparison: ใช้ %{today} ครั้งวันนี้ เทียบกับ %{yesterday} เมื่อวานนี้
+        used_by_over_week:
+          other: ใช้โดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
+      title: แนวโน้ม
+      trending: กำลังนิยม
     warning_presets:
       add_new: เพิ่มใหม่
       delete: ลบ
       edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
       empty: คุณยังไม่ได้กำหนดคำเตือนที่ตั้งไว้ล่วงหน้าใด ๆ
       title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
+    webhooks:
+      add_new: เพิ่มปลายทาง
+      delete: ลบ
+      description_html: "<strong>เว็บฮุค</strong> ทำให้ Mastodon สามารถส่ง <strong>การแจ้งเตือนตามเวลาจริง</strong> แบบผลักเกี่ยวกับเหตุการณ์ที่เลือกไปยังแอปพลิเคชันของคุณเอง ดังนั้นแอปพลิเคชันของคุณสามารถ <strong>ทริกเกอร์การตอบสนองได้โดยอัตโนมัติ</strong>"
+      disable: ปิดใช้งาน
+      disabled: ปิดใช้งานอยู่
+      edit: แก้ไขปลายทาง
+      empty: คุณยังไม่ได้กำหนดค่าปลายทางเว็บฮุคใด ๆ
+      enable: เปิดใช้งาน
+      enabled: ใช้งานอยู่
+      enabled_events:
+        other: "%{count} เหตุการณ์ที่เปิดใช้งาน"
+      events: เหตุการณ์
+      new: เว็บฮุคใหม่
+      rotate_secret: สับเปลี่ยนข้อมูลลับ
+      secret: ข้อมูลลับการเซ็น
+      status: สถานะ
+      title: เว็บฮุค
+      webhook: เว็บฮุค
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: เพื่อลบโพสต์ของเขา
+        disable: เพื่ออายัดบัญชีของเขา
+        mark_statuses_as_sensitive: เพื่อทำเครื่องหมายโพสต์ของเขาว่าละเอียดอ่อน
+        none: คำเตือน
+        sensitive: เพื่อทำเครื่องหมายบัญชีของเขาว่าละเอียดอ่อน
+        silence: เพื่อจำกัดบัญชีของเขา
+        suspend: เพื่อระงับบัญชีของเขา
+      body: "%{target} กำลังอุทธรณ์การตัดสินใจในการควบคุมโดย %{action_taken_by} จาก %{date} ซึ่งเป็น %{type} เขาเขียนว่า:"
+      next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการควบคุม หรือเพิกเฉยต่อการอุทธรณ์
+      subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
     new_pending_account:
       body: รายละเอียดของบัญชีใหม่อยู่ด้านล่าง คุณสามารถอนุมัติหรือปฏิเสธใบสมัครนี้
+      subject: บัญชีใหม่สำหรับตรวจทานใน %{instance} (%{username})
     new_report:
       body: "%{reporter} ได้รายงาน %{target}"
       body_remote: ใครสักคนจาก %{domain} ได้รายงาน %{target}
       subject: รายงานใหม่สำหรับ %{instance} (#%{id})
+    new_trends:
+      body: 'รายการดังต่อไปนี้จำเป็นต้องมีการตรวจทานก่อนที่จะสามารถแสดงรายการเป็นสาธารณะ:'
+      new_trending_links:
+        title: ลิงก์ที่กำลังนิยม
+      new_trending_statuses:
+        title: โพสต์ที่กำลังนิยม
+      new_trending_tags:
+        no_approved_tags: ไม่มีแฮชแท็กที่กำลังนิยมที่ได้รับอนุมัติในปัจจุบัน
+        requirements: 'ตัวเลือกใดก็ตามนี้สามารถแซงหน้าแฮชแท็กที่กำลังนิยมที่ได้รับอนุมัติ #%{rank} ซึ่งคือ #%{lowest_tag_name} ในปัจจุบันด้วยคะแนน %{lowest_tag_score}'
+        title: แฮชแท็กที่กำลังนิยม
+      subject: แนวโน้มใหม่สำหรับตรวจทานใน %{instance}
   aliases:
     add_new: สร้างนามแฝง
+    created_msg: สร้างนามแฝงใหม่สำเร็จ ตอนนี้คุณสามารถเริ่มต้นการย้ายจากบัญชีเก่า
     deleted_msg: เอานามแฝงออกสำเร็จ จะไม่สามารถย้ายจากบัญชีนั้นไปยังบัญชีนี้ได้อีกต่อไป
     empty: คุณไม่มีนามแฝง
+    hint_html: หากคุณต้องการย้ายจากบัญชีอื่นไปยังบัญชีนี้ ที่นี่คุณสามารถสร้างนามแฝง ซึ่งจำเป็นก่อนที่คุณจะสามารถดำเนินการต่อด้วยการย้ายผู้ติดตามจากบัญชีเก่าไปยังบัญชีนี้ การกระทำนี้โดยตัวการกระทำเอง <strong>ไม่เป็นอันตรายและย้อนกลับได้</strong> <strong>การโยกย้ายบัญชีเริ่มต้นจากบัญชีเก่า</strong>
     remove: เลิกเชื่อมโยงนามแฝง
   appearance:
     advanced_web_interface: ส่วนติดต่อเว็บขั้นสูง
+    advanced_web_interface_hint: 'หากคุณต้องการใช้ประโยชน์จากความกว้างหน้าจอทั้งหมดของคุณ ส่วนติดต่อเว็บขั้นสูงอนุญาตให้คุณกำหนดค่าคอลัมน์ต่าง ๆ จำนวนมากเพื่อให้เห็นข้อมูลได้มากในเวลาเดียวกันเท่าที่คุณต้องการ: หน้าแรก, การแจ้งเตือน, เส้นเวลาที่ติดต่อกับภายนอก, รายการและแฮชแท็กจำนวนเท่าใดก็ได้'
     animations_and_accessibility: ภาพเคลื่อนไหวและการช่วยการเข้าถึง
     confirmation_dialogs: กล่องโต้ตอบการยืนยัน
-    discovery: ค้นพบ
+    discovery: การค้นพบ
     localization:
       body: Mastodon ได้รับการแปลโดยอาสาสมัคร
       guide_link: https://crowdin.com/project/mastodon/th
@@ -692,15 +915,13 @@ th:
   applications:
     created: สร้างแอปพลิเคชันสำเร็จ
     destroyed: ลบแอปพลิเคชันสำเร็จ
-    invalid_url: URL ที่ระบุไม่ถูกต้อง
     regenerate_token: สร้างโทเคนการเข้าถึงใหม่
     token_regenerated: สร้างโทเคนการเข้าถึงใหม่สำเร็จ
+    warning: ระวังเป็นอย่างสูงกับข้อมูลนี้ อย่าแบ่งปันข้อมูลกับใครก็ตาม!
     your_token: โทเคนการเข้าถึงของคุณ
   auth:
-    apply_for_account: ขอคำเชิญ
+    apply_for_account: ขอบัญชี
     change_password: รหัสผ่าน
-    checkbox_agreement_html: ฉันเห็นด้วยกับ <a href="%{rules_path}" target="_blank">กฎของเซิร์ฟเวอร์</a> และ <a href="%{terms_path}" target="_blank">เงื่อนไขการให้บริการ</a>
-    checkbox_agreement_without_rules_html: ฉันเห็นด้วยกับ <a href="%{terms_path}" target="_blank">เงื่อนไขการให้บริการ</a>
     delete_account: ลบบัญชี
     delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ <a href="%{path}">ดำเนินการต่อที่นี่</a> คุณจะได้รับการถามเพื่อการยืนยัน
     description:
@@ -713,11 +934,13 @@ th:
     invalid_reset_password_token: โทเคนการตั้งรหัสผ่านใหม่ไม่ถูกต้องหรือหมดอายุแล้ว โปรดขอโทเคนใหม่
     link_to_otp: ป้อนรหัสสองปัจจัยจากโทรศัพท์ของคุณหรือรหัสกู้คืน
     link_to_webauth: ใช้อุปกรณ์กุญแจความปลอดภัยของคุณ
+    log_in_with: เข้าสู่ระบบด้วย
     login: เข้าสู่ระบบ
     logout: ออกจากระบบ
     migrate_account: ย้ายไปยังบัญชีอื่น
     migrate_account_html: หากคุณต้องการเปลี่ยนเส้นทางบัญชีนี้ไปยังบัญชีอื่น คุณสามารถ <a href="%{path}">กำหนดค่าบัญชีที่นี่</a>
     or_log_in_with: หรือเข้าสู่ระบบด้วย
+    privacy_policy_agreement_html: ฉันได้อ่านและเห็นด้วยกับ <a href="%{privacy_policy_path}" target="_blank">นโยบายความเป็นส่วนตัว</a>
     providers:
       cas: CAS
       saml: SAML
@@ -725,24 +948,37 @@ th:
     registration_closed: "%{instance} ไม่ได้กำลังเปิดรับสมาชิกใหม่"
     resend_confirmation: ส่งคำแนะนำการยืนยันใหม่
     reset_password: ตั้งรหัสผ่านใหม่
+    rules:
+      preamble: มีการตั้งและบังคับใช้กฎโดยผู้ควบคุมของ %{domain}
+      title: กฎพื้นฐานบางประการ
     security: ความปลอดภัย
     set_new_password: ตั้งรหัสผ่านใหม่
     setup:
       email_below_hint_html: หากที่อยู่อีเมลด้านล่างไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลที่นี่และรับอีเมลยืนยันใหม่
       email_settings_hint_html: ส่งอีเมลยืนยันไปยัง %{email} แล้ว หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
+      title: การตั้งค่า
+    sign_in:
+      preamble_html: ลงชื่อเข้าด้วยข้อมูลประจำตัว <strong>%{domain}</strong> ของคุณ หากบัญชีของคุณได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น คุณจะไม่สามารถเข้าสู่ระบบได้ที่นี่
+      title: ลงชื่อเข้า %{domain}
+    sign_up:
+      preamble: เมื่อมีบัญชีในเซิร์ฟเวอร์ Mastodon นี้ คุณจะสามารถติดตามบุคคลอื่นใดในเครือข่าย โดยไม่คำนึงถึงที่ซึ่งบัญชีของเขาได้รับการโฮสต์
+      title: มาตั้งค่าของคุณใน %{domain} กันเลย
     status:
       account_status: สถานะบัญชี
       confirming: กำลังรอการยืนยันอีเมลให้เสร็จสมบูรณ์
       functional: บัญชีของคุณทำงานได้อย่างเต็มที่
+      pending: ใบสมัครของคุณกำลังรอดำเนินการตรวจทานโดยพนักงานของเรา นี่อาจใช้เวลาสักครู่ คุณจะได้รับอีเมลหากมีการอนุมัติใบสมัครของคุณ
+      redirecting_to: บัญชีของคุณไม่ได้ใช้งานเนื่องจากบัญชีกำลังเปลี่ยนเส้นทางไปยัง %{acct} ในปัจจุบัน
+      view_strikes: ดูการดำเนินการที่ผ่านมากับบัญชีของคุณ
     too_fast: ส่งแบบฟอร์มเร็วเกินไป ลองอีกครั้ง
-    trouble_logging_in: มีปัญหาในการเข้าสู่ระบบ?
     use_security_key: ใช้กุญแจความปลอดภัย
   authorize_follow:
     already_following: คุณกำลังติดตามบัญชีนี้อยู่แล้ว
     already_requested: คุณได้ส่งคำขอติดตามไปยังบัญชีนั้นไปแล้ว
+    error: น่าเสียดาย มีข้อผิดพลาดในการค้นหาบัญชีระยะไกล
     follow: ติดตาม
     follow_request: 'คุณได้ส่งคำขอติดตามไปยัง:'
-    following: 'สำเร็จ! คุณกำลังติดตาม:'
+    following: 'สำเร็จ! ตอนนี้คุณกำลังติดตาม:'
     post_follow:
       close: หรือคุณสามารถปิดหน้าต่างนี้
       return: แสดงโปรไฟล์ของผู้ใช้
@@ -750,6 +986,7 @@ th:
     title: ติดตาม %{acct}
   challenge:
     confirm: ดำเนินการต่อ
+    hint_html: "<strong>เคล็ดลับ:</strong> เราจะไม่ถามรหัสผ่านของคุณกับคุณสำหรับชั่วโมงถัดไป"
     invalid_password: รหัสผ่านไม่ถูกต้อง
     prompt: ยืนยันรหัสผ่านเพื่อดำเนินการต่อ
   crypto:
@@ -781,25 +1018,53 @@ th:
     proceed: ลบบัญชี
     success_msg: ลบบัญชีของคุณสำเร็จ
     warning:
+      before: 'ก่อนดำเนินการต่อ โปรดอ่านหมายเหตุเหล่านี้อย่างระมัดระวัง:'
       caches: เนื้อหาที่ได้รับการแคชโดยเซิร์ฟเวอร์อื่น ๆ อาจยังคงอยู่
       data_removal: จะเอาโพสต์และข้อมูลอื่น ๆ ของคุณออกโดยถาวร
       email_change_html: คุณสามารถ <a href="%{path}">เปลี่ยนที่อยู่อีเมลของคุณ</a> ได้โดยไม่ต้องลบบัญชีของคุณ
+      email_contact_html: หากอีเมลยังคงมาไม่ถึง คุณสามารถส่งอีเมลถึง <a href="mailto:%{email}">%{email}</a> สำหรับความช่วยเหลือ
       email_reconfirmation_html: หากคุณไม่ได้รับอีเมลยืนยัน คุณสามารถ <a href="%{path}">ขออีเมลอีกครั้ง</a>
       irreversible: คุณจะไม่สามารถคืนค่าหรือเปิดใช้งานบัญชีของคุณใหม่
       more_details_html: สำหรับรายละเอียดเพิ่มเติม ดู <a href="%{terms_path}">นโยบายความเป็นส่วนตัว</a>
       username_available: ชื่อผู้ใช้ของคุณจะพร้อมใช้งานอีกครั้ง
       username_unavailable: ชื่อผู้ใช้ของคุณจะยังคงไม่พร้อมใช้งาน
-  directories:
-    directory: ไดเรกทอรีโปรไฟล์
-    explanation: ค้นพบผู้ใช้ตามความสนใจของเขา
-    explore_mastodon: สำรวจ %{title}
+  disputes:
+    strikes:
+      action_taken: การกระทำที่ใช้
+      appeal: อุทธรณ์
+      appeal_approved: อุทธรณ์การดำเนินการนี้สำเร็จและไม่มีผลบังคับอีกต่อไป
+      appeal_rejected: ปฏิเสธการอุทธรณ์แล้ว
+      appeal_submitted_at: ส่งการอุทธรณ์แล้ว
+      appealed_msg: ส่งการอุทธรณ์ของคุณแล้ว หากมีการอนุมัติการอุทธรณ์ คุณจะได้รับการแจ้งเตือน
+      appeals:
+        submit: ส่งการอุทธรณ์
+      approve_appeal: อนุมัติการอุทธรณ์
+      associated_report: รายงานที่เกี่ยวข้อง
+      created_at: ลงวันที่
+      description_html: นี่คือการกระทำที่ใช้กับบัญชีของคุณและคำเตือนที่ส่งถึงคุณโดยพนักงานของ %{instance}
+      recipient: ส่งถึง
+      reject_appeal: ปฏิเสธการอุทธรณ์
+      status: 'โพสต์ #%{id}'
+      status_removed: เอาโพสต์ออกจากระบบไปแล้ว
+      title: "%{action} จาก %{date}"
+      title_actions:
+        delete_statuses: การเอาโพสต์ออก
+        disable: การอายัดบัญชี
+        mark_statuses_as_sensitive: การทำเครื่องหมายโพสต์ว่าละเอียดอ่อน
+        none: คำเตือน
+        sensitive: การทำเครื่องหมายบัญชีว่าละเอียดอ่อน
+        silence: การจำกัดบัญชี
+        suspend: การระงับบัญชี
+      your_appeal_approved: อนุมัติการอุทธรณ์ของคุณแล้ว
+      your_appeal_pending: คุณได้ส่งการอุทธรณ์
+      your_appeal_rejected: ปฏิเสธการอุทธรณ์ของคุณแล้ว
   domain_validator:
     invalid_domain: ไม่ใช่ชื่อโดเมนที่ถูกต้อง
   errors:
     '400': คำขอที่คุณได้ส่งไม่ถูกต้องหรือผิดรูปแบบ
     '403': คุณไม่มีสิทธิอนุญาตเพื่อดูหน้านี้
     '404': หน้าที่คุณกำลังมองหาไม่ได้อยู่ที่นี่
-    '406': This page is not available in the requested format.
+    '406': หน้านี้ไม่พร้อมใช้งานในรูปแบบที่ขอ
     '410': ไม่มีหน้าที่คุณกำลังมองหาอยู่ที่นี่อีกต่อไป
     '422':
       content: การตรวจสอบความปลอดภัยล้มเหลว คุณกำลังปิดกั้นคุกกี้หรือไม่?
@@ -808,7 +1073,8 @@ th:
     '500':
       content: เราขออภัย แต่มีบางอย่างผิดพลาดในส่วนของเรา
       title: หน้านี้ไม่ถูกต้อง
-    '503': The page could not be served due to a temporary server failure.
+    '503': ไม่สามารถให้บริการหน้าได้เนื่องจากเซิร์ฟเวอร์ล้มเหลวชั่วคราว
+    noscript_html: เพื่อใช้แอปพลิเคชันเว็บ Mastodon โปรดเปิดใช้งาน JavaScript หรืออีกวิธีหนึ่ง ลองหนึ่งใน <a href="%{apps_path}">แอปเนทีฟ</a> สำหรับ Mastodon สำหรับแพลตฟอร์มของคุณ
   existing_username_validator:
     not_found: ไม่พบผู้ใช้ในเซิร์ฟเวอร์ที่มีชื่อผู้ใช้นั้น
     not_found_multiple: ไม่พบ %{usernames}
@@ -829,6 +1095,9 @@ th:
     storage: ที่เก็บข้อมูลสื่อ
   featured_tags:
     add_new: เพิ่มใหม่
+    errors:
+      limit: คุณได้แนะนำแฮชแท็กถึงจำนวนสูงสุดไปแล้ว
+    hint_html: "<strong>แฮชแท็กที่แนะนำคืออะไร?</strong> จะแสดงแฮชแท็กที่แนะนำอย่างเด่นชัดในโปรไฟล์สาธารณะของคุณและอนุญาตให้ผู้คนเรียกดูโพสต์สาธารณะของคุณโดยเฉพาะภายใต้แฮชแท็กเหล่านั้น แฮชแท็กที่แนะนำเป็นเครื่องมือที่ยอดเยี่ยมสำหรับการติดตามงานสร้างสรรค์หรือโครงการระยะยาว"
   filters:
     contexts:
       account: โปรไฟล์
@@ -837,44 +1106,62 @@ th:
       public: เส้นเวลาสาธารณะ
       thread: การสนทนา
     edit:
+      add_keyword: เพิ่มคำสำคัญ
+      keywords: คำสำคัญ
+      statuses: โพสต์แต่ละรายการ
+      statuses_hint_html: ตัวกรองนี้นำไปใช้เพื่อเลือกโพสต์แต่ละรายการโดยไม่คำนึงถึงว่าโพสต์ตรงกับคำสำคัญด้านล่างหรือไม่ <a href="%{path}">ตรวจทานหรือเอาโพสต์ออกจากตัวกรอง</a>
       title: แก้ไขตัวกรอง
+    errors:
+      deprecated_api_multiple_keywords: ไม่สามารถเปลี่ยนพารามิเตอร์เหล่านี้จากแอปพลิเคชันนี้เนื่องจากพารามิเตอร์นำไปใช้กับคำสำคัญของตัวกรองมากกว่าหนึ่ง ใช้แอปพลิเคชันที่ใหม่กว่าหรือส่วนติดต่อเว็บ
+      invalid_context: ไม่มีหรือบริบทที่ให้มาไม่ถูกต้อง
     index:
+      contexts: กรองใน %{contexts}
       delete: ลบ
       empty: คุณไม่มีตัวกรอง
+      expires_in: หมดอายุใน %{distance}
+      expires_on: หมดอายุเมื่อ %{date}
+      keywords:
+        other: "%{count} คำสำคัญ"
+      statuses:
+        other: "%{count} โพสต์"
+      statuses_long:
+        other: มีการซ่อน %{count} โพสต์แต่ละรายการ
       title: ตัวกรอง
     new:
+      save: บันทึกตัวกรองใหม่
       title: เพิ่มตัวกรองใหม่
+    statuses:
+      back_to_filter: กลับไปที่ตัวกรอง
+      batch:
+        remove: เอาออกจากตัวกรอง
+      index:
+        hint: ตัวกรองนี้นำไปใช้เพื่อเลือกโพสต์แต่ละรายการโดยไม่คำนึงถึงเกณฑ์อื่น ๆ คุณสามารถเพิ่มโพสต์เพิ่มเติมไปยังตัวกรองนี้ได้จากส่วนติดต่อเว็บ
+        title: โพสต์ที่กรองอยู่
   footer:
-    developers: นักพัฒนา
-    more: เพิ่มเติม…
-    resources: ทรัพยากร
     trending_now: กำลังนิยม
   generic:
     all: ทั้งหมด
+    all_items_on_page_selected_html:
+      other: เลือกอยู่ทั้งหมด <strong>%{count}</strong> รายการในหน้านี้
+    all_matching_items_selected_html:
+      other: เลือกอยู่ทั้งหมด <strong>%{count}</strong> รายการที่ตรงกับการค้นหาของคุณ
     changes_saved_msg: บันทึกการเปลี่ยนแปลงสำเร็จ!
     copy: คัดลอก
     delete: ลบ
+    deselect: ไม่เลือกทั้งหมด
+    none: ไม่มี
     order_by: เรียงลำดับตาม
     save_changes: บันทึกการเปลี่ยนแปลง
+    select_all_matching_items:
+      other: เลือกทั้งหมด %{count} รายการที่ตรงกับการค้นหาของคุณ
+    today: วันนี้
+    validation_errors:
+      other: ยังมีบางอย่างไม่ถูกต้อง! โปรดตรวจทาน %{count} ข้อผิดพลาดด้านล่าง
   html_validator:
     invalid_markup: 'มีมาร์กอัป HTML ที่ไม่ถูกต้อง: %{error}'
-  identity_proofs:
-    active: ใช้งานอยู่
-    authorize: ใช่ อนุญาต
-    authorize_connection_prompt: อนุญาตการเชื่อมต่อการเข้ารหัสนี้?
-    errors:
-      failed: การเชื่อมต่อการเข้ารหัสล้มเหลว โปรดลองอีกครั้งจาก %{provider}
-    i_am_html: ฉันคือ %{username} ใน %{service}
-    identity: ตัวตน
-    inactive: ไม่ได้ใช้งาน
-    publicize_checkbox: 'และโพสต์สิ่งนี้:'
-    publicize_toot: 'พิสูจน์ตัวตนแล้ว! ฉันคือ %{username} ใน %{service}: %{url}'
-    remove: เอาการพิสูจน์ออกจากบัญชี
-    removed: เอาการพิสูจน์ออกจากบัญชีสำเร็จ
-    status: สถานะการตรวจสอบ
-    view_proof: ดูการพิสูจน์
   imports:
     errors:
+      invalid_csv_file: 'ไฟล์ CSV ไม่ถูกต้อง ข้อผิดพลาด: %{error}'
       over_rows_processing_limit: มีมากกว่า %{count} แถว
     modes:
       merge: ผสาน
@@ -882,6 +1169,7 @@ th:
       overwrite: เขียนทับ
       overwrite_long: แทนที่ระเบียนปัจจุบันด้วยระเบียนใหม่
     preface: คุณสามารถนำเข้าข้อมูลที่คุณได้ส่งออกจากเซิร์ฟเวอร์อื่น เช่น รายการผู้คนที่คุณกำลังติดตามหรือกำลังปิดกั้น
+    success: อัปโหลดข้อมูลของคุณสำเร็จและจะได้รับการประมวลผลในเวลาที่ครบกำหนด
     types:
       blocking: รายการปิดกั้น
       bookmarks: ที่คั่นหน้า
@@ -889,7 +1177,6 @@ th:
       following: รายการติดตาม
       muting: รายการซ่อน
     upload: อัปโหลด
-  in_memoriam_html: เพื่อระลึกถึง
   invites:
     delete: ปิดใช้งาน
     expired: หมดอายุแล้ว
@@ -904,13 +1191,16 @@ th:
     generate: สร้างลิงก์เชิญ
     invited_by: 'คุณได้รับเชิญโดย:'
     max_uses:
-      other: "%{count} การใช้"
+      other: "%{count} การใช้งาน"
     max_uses_prompt: ไม่มีขีดจำกัด
     prompt: สร้างและแบ่งปันลิงก์กับผู้อื่นเพื่ออนุญาตให้เข้าถึงเซิร์ฟเวอร์นี้
     table:
       expires_at: หมดอายุเมื่อ
-      uses: การใช้
+      uses: การใช้งาน
     title: เชิญผู้คน
+  lists:
+    errors:
+      limit: คุณมีรายการถึงจำนวนสูงสุดแล้ว
   login_activities:
     authentication_methods:
       otp: แอปการรับรองความถูกต้องด้วยสองปัจจัย
@@ -930,8 +1220,10 @@ th:
   migrations:
     acct: ย้ายไปยัง
     cancel: ยกเลิกการเปลี่ยนเส้นทาง
+    cancel_explanation: การยกเลิกการเปลี่ยนเส้นทางจะเปิดใช้งานบัญชีปัจจุบันของคุณใหม่ แต่จะไม่นำผู้ติดตามที่ได้รับการย้ายไปยังบัญชีนั้นกลับมา
     cancelled_msg: ยกเลิกการเปลี่ยนเส้นทางสำเร็จ
     errors:
+      already_moved: เป็นบัญชีเดียวกันกับที่คุณได้ย้ายไปแล้ว
       missing_also_known_as: ไม่ใช่นามแฝงของบัญชีนี้
       move_to_self: ไม่สามารถเป็นบัญชีปัจจุบัน
       not_found: ไม่พบ
@@ -939,36 +1231,44 @@ th:
     followers_count: ผู้ติดตาม ณ เวลาที่ย้าย
     incoming_migrations: การย้ายจากบัญชีอื่น
     incoming_migrations_html: เพื่อย้ายจากบัญชีอื่นไปยังบัญชีนี้ ก่อนอื่นคุณจำเป็นต้อง <a href="%{path}">สร้างนามแฝงบัญชี</a>
+    moved_msg: ตอนนี้กำลังเปลี่ยนเส้นทางบัญชีของคุณไปยัง %{acct} และกำลังย้ายผู้ติดตามของคุณไป
+    not_redirecting: บัญชีของคุณไม่ได้กำลังเปลี่ยนเส้นทางไปยังบัญชีอื่นใดในปัจจุบัน
     on_cooldown: คุณเพิ่งโยกย้ายบัญชีของคุณ ฟังก์ชันนี้จะพร้อมใช้งานอีกครั้งในอีก %{count} วัน
     past_migrations: การโยกย้ายที่ผ่านมา
     proceed_with_move: ย้ายผู้ติดตาม
-    redirected_msg: บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
+    redirected_msg: ตอนนี้บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
     redirecting_to: บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
     set_redirect: ตั้งการเปลี่ยนเส้นทาง
     warning:
+      backreference_required: ต้องกำหนดค่าให้บัญชีใหม่อ้างอิงย้อนกลับไปยังบัญชีนี้ก่อน
+      before: 'ก่อนดำเนินการต่อ โปรดอ่านหมายเหตุเหล่านี้อย่างระมัดระวัง:'
+      cooldown: หลังจากการย้ายจะมีระยะเวลาการรอซึ่งในระหว่างนั้นคุณจะไม่สามารถย้ายได้อีกครั้ง
+      disabled_account: บัญชีปัจจุบันของคุณจะไม่สามารถใช้งานได้อย่างเต็มที่หลังจากนั้น อย่างไรก็ตาม คุณจะสามารถเข้าถึงการส่งออกข้อมูลเช่นเดียวกับการเปิดใช้งานใหม่
       followers: การกระทำนี้จะย้ายผู้ติดตามทั้งหมดจากบัญชีปัจจุบันไปยังบัญชีใหม่
+      only_redirect_html: หรืออีกวิธีหนึ่ง คุณสามารถ <a href="%{path}">ตั้งเพียงการเปลี่ยนเส้นทางในโปรไฟล์ของคุณเท่านั้น</a>
+      other_data: จะไม่ย้ายข้อมูลอื่น ๆ โดยอัตโนมัติ
+      redirect: จะอัปเดตโปรไฟล์ของบัญชีปัจจุบันของคุณด้วยข้อสังเกตการเปลี่ยนเส้นทางและจะไม่รวมอยู่ในการค้นหา
   moderation:
     title: การควบคุม
   move_handler:
     carry_blocks_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ปิดกั้น
     carry_mutes_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ซ่อน
-    copy_account_note_text: 'ผู้ใช้นี้ได้ย้ายจาก %{acct} นี่คือหมายเหตุก่อนหน้าของคุณเกี่ยวกับผู้ใช้:'
+    copy_account_note_text: 'ผู้ใช้นี้ได้ย้ายจาก %{acct} นี่คือหมายเหตุก่อนหน้านี้ของคุณเกี่ยวกับผู้ใช้:'
+  navigation:
+    toggle_menu: เปิด/ปิดเมนู
   notification_mailer:
-    digest:
-      action: ดูการแจ้งเตือนทั้งหมด
-      mention: "%{name} ได้กล่าวถึงคุณใน:"
-      new_followers_summary:
-        other: นอกจากนี้คุณยังได้รับ %{count} ผู้ติดตามใหม่ขณะที่ไม่อยู่! มหัศจรรย์!
-      subject:
-        other: "%{count} การแจ้งเตือนใหม่นับตั้งแต่การเยี่ยมชมล่าสุดของคุณ \U0001F418"
-      title: เมื่อคุณไม่อยู่...
+    admin:
+      report:
+        subject: "%{name} ได้ส่งรายงาน"
+      sign_up:
+        subject: "%{name} ได้ลงทะเบียน"
     favourite:
       body: 'โพสต์ของคุณได้รับการชื่นชอบโดย %{name}:'
       subject: "%{name} ได้ชื่นชอบโพสต์ของคุณ"
       title: รายการโปรดใหม่
     follow:
-      body: "%{name} กำลังติดตามคุณ!"
-      subject: "%{name} กำลังติดตามคุณ"
+      body: ตอนนี้ %{name} กำลังติดตามคุณ!
+      subject: ตอนนี้ %{name} กำลังติดตามคุณ
       title: ผู้ติดตามใหม่
     follow_request:
       action: จัดการคำขอติดตาม
@@ -980,12 +1280,16 @@ th:
       body: 'คุณได้รับการกล่าวถึงโดย %{name} ใน:'
       subject: คุณได้รับการกล่าวถึงโดย %{name}
       title: การกล่าวถึงใหม่
+    poll:
+      subject: การสำรวจความคิดเห็นโดย %{name} ได้สิ้นสุดแล้ว
     reblog:
       body: 'โพสต์ของคุณได้รับการดันโดย %{name}:'
       subject: "%{name} ได้ดันโพสต์ของคุณ"
       title: การดันใหม่
     status:
       subject: "%{name} เพิ่งโพสต์"
+    update:
+      subject: "%{name} ได้แก้ไขโพสต์"
   notifications:
     email_events: เหตุการณ์สำหรับการแจ้งเตือนอีเมล
     email_events_hint: 'เลือกเหตุการณ์ที่คุณต้องการรับการแจ้งเตือน:'
@@ -1002,7 +1306,9 @@ th:
           trillion: ล้านล้าน
   otp_authentication:
     code_hint: ป้อนรหัสที่สร้างโดยแอปตัวรับรองความถูกต้องของคุณเพื่อยืนยัน
+    description_html: หากคุณเปิดใช้งาน <strong>การรับรองความถูกต้องด้วยสองปัจจัย</strong> โดยใช้แอปตัวรับรองความถูกต้อง การเข้าสู่ระบบจะต้องการให้คุณอยู่ในความครอบครองโทรศัพท์ของคุณ ซึ่งจะสร้างโทเคนสำหรับให้คุณป้อน
     enable: เปิดใช้งาน
+    instructions_html: "<strong>สแกนรหัส QR นี้ลงใน Google Authenticator หรือแอป TOTP ที่คล้ายกันในโทรศัพท์ของคุณ</strong> จากนี้ไป แอปนั้นจะสร้างโทเคนที่คุณจะต้องป้อนเมื่อเข้าสู่ระบบ"
     manual_instructions: 'หากคุณไม่สามารถสแกนรหัส QR และจำเป็นต้องป้อนรหัสด้วยตนเอง นี่คือรหัสลับแบบข้อความธรรมดา:'
     setup: ตั้งค่า
     wrong_code: รหัสที่ป้อนไม่ถูกต้อง! เวลาเซิร์ฟเวอร์และเวลาอุปกรณ์ถูกต้องหรือไม่?
@@ -1020,14 +1326,18 @@ th:
       duration_too_short: อยู่เร็วเกินไป
       expired: การสำรวจความคิดเห็นได้สิ้นสุดไปแล้ว
       invalid_choice: ไม่มีตัวเลือกการลงคะแนนที่เลือกอยู่
+      over_character_limit: ไม่สามารถยาวกว่า %{max} ตัวอักษรในแต่ละรายการ
       too_few_options: ต้องมีมากกว่าหนึ่งรายการ
       too_many_options: ไม่สามารถมีมากกว่า %{max} รายการ
   preferences:
     other: อื่น ๆ
     posting_defaults: ค่าเริ่มต้นการโพสต์
     public_timelines: เส้นเวลาสาธารณะ
+  privacy_policy:
+    title: นโยบายความเป็นส่วนตัว
   reactions:
     errors:
+      limit_reached: ถึงขีดจำกัดของการตอบสนองต่าง ๆ แล้ว
       unrecognized_emoji: ไม่ใช่อีโมจิที่รู้จัก
   relationships:
     activity: กิจกรรมบัญชี
@@ -1047,27 +1357,25 @@ th:
     remove_selected_follows: เลิกติดตามผู้ใช้ที่เลือก
     status: สถานะบัญชี
   remote_follow:
-    acct: ป้อน username@domain ของคุณที่คุณต้องการกระทำจาก
-    no_account_html: ไม่มีบัญชี? คุณสามารถ <a href='%{sign_up_path}' target='_blank'>ลงทะเบียนที่นี่</a>
-    proceed: ดำเนินการต่อเพื่อติดตาม
-    prompt: 'คุณกำลังจะติดตาม:'
-  remote_interaction:
-    favourite:
-      proceed: ดำเนินการต่อเพื่อชื่นชอบ
-      prompt: 'คุณต้องการชื่นชอบโพสต์นี้:'
-    reblog:
-      proceed: ดำเนินการต่อเพื่อดัน
-      prompt: 'คุณต้องการดันโพสต์นี้:'
-    reply:
-      proceed: ดำเนินการต่อเพื่อตอบกลับ
-      prompt: 'คุณต้องการตอบกลับโพสต์นี้:'
+    missing_resource: ไม่พบ URL การเปลี่ยนเส้นทางที่จำเป็นสำหรับบัญชีของคุณ
+  reports:
+    errors:
+      invalid_rules: ไม่ได้อ้างอิงกฎที่ถูกต้อง
+  rss:
+    content_warning: 'คำเตือนเนื้อหา:'
+    descriptions:
+      account: โพสต์สาธารณะจาก @%{acct}
+      tag: 'โพสต์สาธารณะที่ได้รับการแท็ก #%{hashtag}'
   scheduled_statuses:
-    too_soon: วันที่ตามกำหนดการต้องอยู่ในอนาคต
+    over_daily_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit} สำหรับวันนี้
+    over_total_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit}
+    too_soon: วันที่จัดกำหนดการต้องอยู่ในอนาคต
   sessions:
     activity: กิจกรรมล่าสุด
     browser: เบราว์เซอร์
     browsers:
       alipay: Alipay
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1081,18 +1389,21 @@ th:
       phantom_js: PhantomJS
       qq: เบราว์เซอร์ QQ
       safari: Safari
+      uc_browser: เบราว์เซอร์ UC
       weibo: Weibo
     current_session: เซสชันปัจจุบัน
     description: "%{browser} ใน %{platform}"
+    explanation: นี่คือเว็บเบราว์เซอร์ที่เข้าสู่ระบบบัญชี Mastodon ของคุณในปัจจุบัน
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
-      mac: Mac
+      mac: macOS
       other: แพลตฟอร์มที่ไม่รู้จัก
       windows: Windows
       windows_mobile: Windows Mobile
@@ -1113,7 +1424,6 @@ th:
     edit_profile: แก้ไขโปรไฟล์
     export: การส่งออกข้อมูล
     featured_tags: แฮชแท็กที่แนะนำ
-    identity_proofs: การพิสูจน์ตัวตน
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
@@ -1122,6 +1432,7 @@ th:
     profile: โปรไฟล์
     relationships: การติดตามและผู้ติดตาม
     statuses_cleanup: การลบโพสต์แบบอัตโนมัติ
+    strikes: การดำเนินการการควบคุม
     two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
     webauthn_authentication: กุญแจความปลอดภัย
   statuses:
@@ -1135,13 +1446,18 @@ th:
         other: "%{count} วิดีโอ"
     boosted_from_html: ดันจาก %{acct_link}
     content_warning: 'คำเตือนเนื้อหา: %{warning}'
+    default_language: เหมือนกับภาษาส่วนติดต่อ
     disallowed_hashtags:
       other: 'มีแฮชแท็กที่ไม่อนุญาต: %{tags}'
-    language_detection: ตรวจหาภาษาโดยอัตโนมัติ
+    edited_at_html: แก้ไขเมื่อ %{date}
+    errors:
+      in_reply_not_found: ดูเหมือนว่าจะไม่มีโพสต์ที่คุณกำลังพยายามตอบกลับอยู่
     open_in_web: เปิดในเว็บ
+    over_character_limit: เกินขีดจำกัดตัวอักษรที่ %{max}
     pin_errors:
+      direct: ไม่สามารถปักหมุดโพสต์ที่ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น
+      limit: คุณได้ปักหมุดโพสต์ถึงจำนวนสูงสุดไปแล้ว
       ownership: ไม่สามารถปักหมุดโพสต์ของคนอื่น
-      private: ไม่สามารถปักหมุดโพสต์ที่ไม่เป็นสาธารณะ
       reblog: ไม่สามารถปักหมุดการดัน
     poll:
       total_people:
@@ -1165,10 +1481,13 @@ th:
       unlisted_long: ทุกคนสามารถเห็น แต่ไม่แสดงรายการในเส้นเวลาสาธารณะ
   statuses_cleanup:
     enabled: ลบโพสต์เก่าโดยอัตโนมัติ
+    enabled_hint: ลบโพสต์ของคุณโดยอัตโนมัติเมื่อโพสต์ถึงค่าเกณฑ์อายุที่ระบุ เว้นแต่โพสต์ตรงกับหนึ่งในข้อยกเว้นด้านล่าง
     exceptions: ข้อยกเว้น
-    ignore_favs: เพิกเฉยรายการโปรด
-    ignore_reblogs: เพิกเฉยการดัน
+    explanation: เนื่องจากการลบโพสต์เป็นการดำเนินงานที่มีค่าใช้จ่ายสูง นี่จึงทำอย่างช้า ๆ เมื่อเวลาผ่านไปเมื่อเซิร์ฟเวอร์ไม่ได้ไม่ว่างอย่างอื่น ด้วยเหตุผลนี้ อาจลบโพสต์ของคุณสักครู่หลังจากที่โพสต์ถึงค่าเกณฑ์อายุ
+    ignore_favs: เพิกเฉยต่อรายการโปรด
+    ignore_reblogs: เพิกเฉยต่อการดัน
     interaction_exceptions: ข้อยกเว้นตามการโต้ตอบ
+    interaction_exceptions_explanation: โปรดทราบว่าไม่มีการรับประกันว่าจะลบโพสต์หากโพสต์ลงไปต่ำกว่าค่าเกณฑ์การชื่นชอบหรือการดันหลังจากที่ผ่านโพสต์ไปแล้วครั้งหนึ่ง
     keep_direct: เก็บข้อความโดยตรง
     keep_direct_hint: ไม่ลบข้อความโดยตรงใดก็ตามของคุณ
     keep_media: เก็บโพสต์ที่มีไฟล์แนบสื่อ
@@ -1187,16 +1506,23 @@ th:
       '2629746': 1 เดือน
       '31556952': 1 ปี
       '5259492': 2 เดือน
+      '604800': 1 สัปดาห์
       '63113904': 2 ปี
       '7889238': 3 เดือน
+    min_age_label: ค่าเกณฑ์อายุ
+    min_favs: เก็บโพสต์ที่ได้รับการชื่นชอบอย่างน้อย
+    min_favs_hint: ไม่ลบโพสต์ใดก็ตามของคุณที่ได้รับจำนวนการชื่นชอบอย่างน้อยเท่านี้ เว้นว่างไว้เพื่อลบโพสต์โดยไม่คำนึงถึงจำนวนการชื่นชอบของโพสต์
+    min_reblogs: เก็บโพสต์ที่ได้รับการดันอย่างน้อย
+    min_reblogs_hint: ไม่ลบโพสต์ใดก็ตามของคุณที่ได้รับจำนวนครั้งการดันอย่างน้อยเท่านี้ เว้นว่างไว้เพื่อลบโพสต์โดยไม่คำนึงถึงจำนวนการดันของโพสต์
   stream_entries:
     pinned: โพสต์ที่ปักหมุด
     reblogged: ดันแล้ว
     sensitive_content: เนื้อหาที่ละเอียดอ่อน
+  strikes:
+    errors:
+      too_late: สายเกินไปที่จะอุทธรณ์การดำเนินการนี้
   tags:
-    does_not_match_previous_name: ไม่ตรงกับชื่อก่อนหน้า
-  terms:
-    title: เงื่อนไขการให้บริการและนโยบายความเป็นส่วนตัวของ %{instance}
+    does_not_match_previous_name: ไม่ตรงกับชื่อก่อนหน้านี้
   themes:
     contrast: Mastodon (ความคมชัดสูง)
     default: Mastodon (มืด)
@@ -1205,6 +1531,7 @@ th:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: เพิ่ม
     disable: ปิดใช้งาน 2FA
@@ -1213,55 +1540,83 @@ th:
     enabled: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว
     enabled_success: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำเร็จ
     generate_recovery_codes: สร้างรหัสกู้คืน
+    lost_recovery_codes: รหัสกู้คืนอนุญาตให้คุณเข้าถึงบัญชีของคุณได้อีกครั้งหากคุณทำโทรศัพท์ของคุณหาย หากคุณทำรหัสกู้คืนหาย คุณสามารถสร้างรหัสใหม่ได้ที่นี่ จะยกเลิกรหัสกู้คืนเก่าของคุณ
     methods: วิธีการสองปัจจัย
     otp: แอปตัวรับรองความถูกต้อง
     recovery_codes: รหัสกู้คืนข้อมูลสำรอง
     recovery_codes_regenerated: สร้างรหัสกู้คืนใหม่สำเร็จ
+    recovery_instructions_html: หากคุณสูญเสียการเข้าถึงโทรศัพท์ของคุณ คุณสามารถใช้หนึ่งในรหัสกู้คืนด้านล่างเพื่อให้เข้าถึงบัญชีของคุณได้อีกครั้ง <strong>รักษารหัสกู้คืนให้ปลอดภัย</strong> ตัวอย่างเช่น คุณสามารถพิมพ์รหัสและจัดเก็บรหัสไว้กับเอกสารสำคัญอื่น ๆ
     webauthn: กุญแจความปลอดภัย
   user_mailer:
+    appeal_approved:
+      action: ไปยังบัญชีของคุณ
+      explanation: อนุมัติการอุทธรณ์การดำเนินการกับบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
+      subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
+      title: อนุมัติการอุทธรณ์แล้ว
+    appeal_rejected:
+      explanation: ปฏิเสธการอุทธรณ์การดำเนินการกับบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว
+      subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
+      title: ปฏิเสธการอุทธรณ์แล้ว
     backup_ready:
+      explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
       subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
-    sign_in_token:
-      details: 'นี่คือรายละเอียดของความพยายาม:'
-      explanation: 'เราตรวจพบความพยายามลงชื่อเข้าบัญชีของคุณจากที่อยู่ IP ที่ไม่รู้จัก หากนี่คือคุณ โปรดป้อนรหัสความปลอดภัยด้านล่างในหน้าตรวจสอบการลงชื่อเข้า:'
-      further_actions: 'หากนี่ไม่ใช่คุณ โปรดเปลี่ยนรหัสผ่านของคุณและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยในบัญชีของคุณ คุณสามารถทำได้ที่นี่:'
-      subject: โปรดยืนยันการลงชื่อเข้าที่พยายาม
-      title: ความพยายามลงชื่อเข้า
+      title: การส่งออกการเก็บถาวร
+    suspicious_sign_in:
+      change_password: เปลี่ยนรหัสผ่านของคุณ
+      details: 'นี่คือรายละเอียดของการลงชื่อเข้า:'
+      explanation: เราตรวจพบการลงชื่อเข้าบัญชีของคุณจากที่อยู่ IP ใหม่
+      further_actions_html: หากนี่ไม่ใช่คุณ เราแนะนำให้คุณ %{action} ทันทีและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยเพื่อรักษาบัญชีของคุณให้ปลอดภัย
+      subject: มีการเข้าถึงบัญชีของคุณจากที่อยู่ IP ใหม่
+      title: การลงชื่อเข้าใหม่
     warning:
-      get_in_touch: คุณสามารถตอบกลับอีเมลนี้เพื่อติดต่อกับพนักงานของ %{instance}
-      review_server_policies: ตรวจทานนโยบายของเซิร์ฟเวอร์
-      statuses: 'โดยเฉพาะสำหรับ:'
+      appeal: ส่งการอุทธรณ์
+      appeal_description: หากคุณเชื่อว่านี่เป็นข้อผิดพลาด คุณสามารถส่งการอุทธรณ์ไปยังพนักงานของ %{instance}
+      categories:
+        spam: สแปม
+        violation: เนื้อหาละเมิดหลักเกณฑ์ชุมชนดังต่อไปนี้
+      explanation:
+        delete_statuses: มีการพบว่าโพสต์บางส่วนของคุณละเมิดหนึ่งหลักเกณฑ์ชุมชนหรือมากกว่าและได้รับการเอาออกโดยผู้ควบคุมของ %{instance} ในเวลาต่อมา
+        disable: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป แต่โปรไฟล์และข้อมูลอื่น ๆ ของคุณยังคงอยู่ในสภาพเดิม คุณสามารถขอข้อมูลสำรองของข้อมูลของคุณ เปลี่ยนการตั้งค่าบัญชี หรือลบบัญชีของคุณ
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนโดยผู้ควบคุมของ %{instance} แล้ว นี่หมายความว่าผู้คนจะต้องแตะสื่อในโพสต์ก่อนที่จะแสดงตัวอย่าง คุณสามารถทำเครื่องหมายสื่อว่าละเอียดอ่อนด้วยตัวคุณเองเมื่อโพสต์ในอนาคต
+        sensitive: จากนี้ไป จะทำเครื่องหมายไฟล์สื่อที่อัปโหลดทั้งหมดของคุณว่าละเอียดอ่อนและซ่อนอยู่หลังการคลิกไปยังคำเตือน
+        silence: คุณยังคงสามารถใช้บัญชีของคุณแต่เฉพาะผู้คนที่กำลังติดตามคุณอยู่แล้วเท่านั้นที่จะเห็นโพสต์ของคุณในเซิร์ฟเวอร์นี้ และอาจไม่รวมคุณอยู่ในคุณลักษณะการค้นพบต่าง ๆ อย่างไรก็ตาม ผู้อื่นอาจยังติดตามคุณด้วยตนเอง
+        suspend: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป และจะไม่สามารถเข้าถึงโปรไฟล์และข้อมูลอื่น ๆ ของคุณได้อีกต่อไป คุณยังคงสามารถเข้าสู่ระบบเพื่อขอข้อมูลสำรองของข้อมูลของคุณจนกว่าจะเอาข้อมูลออกอย่างสมบูรณ์ในเวลาประมาณ 30 วัน แต่เราจะเก็บรักษาข้อมูลพื้นฐานบางอย่างไว้เพื่อป้องกันไม่ให้คุณหลบเลี่ยงการระงับ
+      reason: 'เหตุผล:'
+      statuses: 'โพสต์ที่อ้างถึง:'
       subject:
-        disable: บัญชีของคุณ %{acct} ถูกอายัด
+        delete_statuses: เอาโพสต์ของคุณใน %{acct} ออกแล้ว
+        disable: อายัดบัญชีของคุณ %{acct} แล้ว
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์ของคุณใน %{acct} ว่าละเอียดอ่อนแล้ว
         none: คำเตือนสำหรับ %{acct}
-        silence: บัญชีของคุณ %{acct} ถูกจำกัด
-        suspend: บัญชีของคุณ %{acct} ถูกระงับ
+        sensitive: จะทำเครื่องหมายโพสต์ของคุณใน %{acct} ว่าละเอียดอ่อนนับจากนี้ไป
+        silence: จำกัดบัญชีของคุณ %{acct} แล้ว
+        suspend: ระงับบัญชีของคุณ %{acct} แล้ว
       title:
+        delete_statuses: เอาโพสต์ออกแล้ว
         disable: อายัดบัญชีอยู่
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์ว่าละเอียดอ่อนแล้ว
         none: คำเตือน
-        sensitive: มีการทำเครื่องหมายสื่อของคุณว่าละเอียดอ่อน
+        sensitive: ทำเครื่องหมายบัญชีว่าละเอียดอ่อนแล้ว
         silence: จำกัดบัญชีอยู่
         suspend: ระงับบัญชีอยู่
     welcome:
       edit_profile_action: ตั้งค่าโปรไฟล์
+      edit_profile_step: คุณสามารถปรับแต่งโปรไฟล์ของคุณได้โดยอัปโหลดรูปภาพโปรไฟล์ เปลี่ยนชื่อที่แสดงของคุณ และอื่น ๆ คุณสามารถเลือกรับการตรวจทานผู้ติดตามใหม่ก่อนที่จะอนุญาตให้เขาติดตามคุณ
+      explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
       final_action: เริ่มโพสต์
-      final_step: 'เริ่มโพสต์! แม้ว่าไม่มีผู้ติดตาม โพสต์สาธารณะของคุณอาจเห็นโดยผู้อื่น ตัวอย่างเช่น ในเส้นเวลาในเซิร์ฟเวอร์และในแฮชแท็ก คุณอาจต้องการแนะนำตัวเองในแฮชแท็ก #introductions'
+      final_step: 'เริ่มโพสต์! แม้ว่าไม่มีผู้ติดตาม โพสต์สาธารณะของคุณอาจเห็นโดยผู้อื่น ตัวอย่างเช่น ในเส้นเวลาในเซิร์ฟเวอร์หรือในแฮชแท็ก คุณอาจต้องการแนะนำตัวเองในแฮชแท็ก #introductions'
       full_handle: นามเต็มของคุณ
       full_handle_hint: นี่คือสิ่งที่คุณจะบอกเพื่อน ๆ ของคุณ เพื่อให้เขาสามารถส่งข้อความหรือติดตามคุณจากเซิร์ฟเวอร์อื่น
-      review_preferences_action: เปลี่ยนการกำหนดลักษณะ
       subject: ยินดีต้อนรับสู่ Mastodon
-      tip_following: คุณติดตามผู้ดูแลเซิร์ฟเวอร์ของคุณเป็นค่าเริ่มต้น เพื่อค้นหาผู้คนที่น่าสนใจเพิ่มเติม ตรวจสอบเส้นเวลาในเซิร์ฟเวอร์และที่ติดต่อกับภายนอก
-      tips: เคล็ดลับ
       title: ยินดีต้อนรับ %{name}!
   users:
     follow_limit_reached: คุณไม่สามารถติดตามมากกว่า %{limit} คน
-    generic_access_help_html: มีปัญหาในการเข้าถึงบัญชีของคุณ? คุณสามารถติดต่อ %{email} สำหรับความช่วยเหลือ
     invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
-    invalid_sign_in_token: รหัสความปลอดภัยไม่ถูกต้อง
     otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
     seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นจึงไม่มีการตั้งค่ารหัสผ่านและอีเมล
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
+    explanation_html: 'คุณสามารถ <strong>ยืนยันตัวคุณเองว่าเป็นเจ้าของของลิงก์ในข้อมูลอภิพันธุ์โปรไฟล์ของคุณ</strong> สำหรับสิ่งนั้น เว็บไซต์ที่เชื่อมโยงต้องมีลิงก์ย้อนกลับไปยังโปรไฟล์ Mastodon ของคุณ ลิงก์ย้อนกลับ <strong>ต้อง</strong> มีแอตทริบิวต์ <code>rel="me"</code> เนื้อหาข้อความของลิงก์ไม่สำคัญ นี่คือตัวอย่าง:'
     verification: การตรวจสอบ
   webauthn_credentials:
     add: เพิ่มกุญแจความปลอดภัยใหม่
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1eb14a043..cd377ff54 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1,92 +1,27 @@
 ---
 tr:
   about:
-    about_hashtag_html: Bunlar <strong>#%{hashtag}</strong> ile etiketlenen genel tootlar. Fediverse içinde herhangi bir yerde bir hesabınız varsa, onlarla etkileşime geçebilirsiniz.
     about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
-    about_this: Hakkında
-    active_count_after: etkin
-    active_footnote: Aylık Aktif Kullanıcılar (AAK)
-    administered_by: 'Yönetici:'
-    api: API
-    apps: Mobil uygulamalar
-    apps_platforms: İos, Android ve diğer platformlardaki Mastodon'u kullanın
-    browse_directory: Bir profil dizinine göz atın ve ilgi alanlarına göre filtreleyin
-    browse_local_posts: Bu sunucudaki herkese açık yayınlara göz atın
-    browse_public_posts: Mastodon'daki herkese açık yayınlara göz atın
-    contact: İletişim
     contact_missing: Ayarlanmadı
     contact_unavailable: Yok
-    discover_users: Kullanıcıları keşfet
-    documentation: Belgeler
-    federation_hint_html: "%{instance} hesabınızla, herhangi bir Mastodon sunucusundaki ve haricindeki kişileri takip edebilirsiniz."
-    get_apps: Bir mobil uygulamayı deneyin
     hosted_on: Mastodon %{domain} üzerinde barındırılıyor
-    instance_actor_flash: |
-      Bu hesap, herhangi bir kullanıcıyı değil sunucunun kendisini temsil etmek için kullanılan sanal bir aktördür.
-      Federasyon amaçlı kullanılır ve tüm yansıyı engellemek istemediğiniz sürece engellenmemelidir; bu durumda bir etki alanı bloğu kullanmanız gerekir.
-    learn_more: Daha fazla bilgi edinin
-    privacy_policy: Gizlilik politikası
-    rules: Sunucu kuralları
-    rules_html: 'Aşağıda, bu Mastodon sunucusu üzerinde bir hesap açmak istiyorsanız uymanız gereken kuralların bir özeti var:'
-    see_whats_happening: Neler olduğunu görün
-    server_stats: 'Sunucu istatistikleri:'
-    source_code: Kaynak kodu
-    status_count_after:
-      one: durum yazıldı
-      other: durum yazıldı
-    status_count_before: Şu ana kadar
-    tagline: Arkadaşlarını takip et ve yenilerini keşfet
-    terms: Kullanım şartları
-    unavailable_content: Denetlenen sunucular
-    unavailable_content_description:
-      domain: Sunucu
-      reason: Sebep
-      rejecting_media: 'Bu sunuculardaki medya dosyaları işlenmeyecek ya da saklanmayacak, ve hiçbir küçük resim gösterilmeyecektir, dolayısıyla orjinal dosyaya manuel tıklama gerekecektir:'
-      rejecting_media_title: Filtrelenmiş medya
-      silenced: 'Bu sunuculardan gelen gönderiler genel zaman çizelgelerinde ve konuşmalarda gizlenecek ve siz onları takip etmediğiniz sürece, kullanıcıların etkileşimlerinden hiçbir bildirim alınmayacaktır:'
-      silenced_title: Susturulmuş sunucular
-      suspended: 'Bu sunuculardaki hiçbir veri işlenmeyecek, saklanmayacak veya değiş tokuş edilmeyecektir, dolayısıyla bu sunuculardaki kullanıcılarla herhangi bir etkileşim ya da iletişim imkansız olacaktır:'
-      suspended_title: Askıya alınan sunucular
-    unavailable_content_html: Mastodon, genel olarak fediverse'teki herhangi bir sunucudan içerik görüntülemenize ve kullanıcılarıyla etkileşim kurmanıza izin verir. Bunlar, bu sunucuda yapılmış olan istisnalardır.
-    user_count_after:
-      one: kullanıcı
-      other: kullanıcı
-    user_count_before: Kayıtlı
-    what_is_mastodon: Mastodon nedir?
+    title: Hakkında
   accounts:
-    choices_html: "%{name} kişisinin seçimleri:"
-    endorsements_hint: Takip ettiğiniz kişileri web arayüzünden onaylayabilirsiniz, burada görünecekler.
-    featured_tags_hint: Burada görüntülenecek belirli etiketlere sahip olabilirsiniz.
     follow: Takip et
     followers:
       one: Takipçi
       other: Takipçi
     following: Takip edilenler
     instance_actor_flash: Bu hesap, herhangi bir bireysel kullanıcı değil, sunucunun kendisini temsil etmek için kullanılan sanal bir aktördür. Birleştirme amacıyla kullanılmaktadır ve askıya alınmamalıdır.
-    joined: "%{date} tarihinde katıldı"
     last_active: son etkinlik
     link_verified_on: Bu bağlantının mülkiyeti %{date} tarihinde kontrol edildi
-    media: Medya
-    moved_html: "%{name}, %{new_profile_link} adresine taşındı:"
-    network_hidden: Bu bilgi mevcut değil
-    never_active: Asla
     nothing_here: Burada henüz hiçbir gönderi yok!
-    people_followed_by: Kullanıcı %{name}'in takip ettikleri
-    people_who_follow: Kullanıcı %{name}'i takip edenler
     pin_errors:
       following: Onaylamak istediğiniz kişiyi zaten takip ediyor olmalısınız
     posts:
       one: Gönderi
-      other: Toot
-    posts_tab_heading: Tootlar
-    posts_with_replies: Tootlar ve yanıtlar
-    roles:
-      admin: Yönetici
-      bot: Bot
-      group: Grup
-      moderator: Denetleyici
-    unavailable: Profil kullanılamıyor
-    unfollow: Takibi bırak
+      other: Gönderiler
+    posts_tab_heading: Gönderiler
   admin:
     account_actions:
       action: Eylemi gerçekleştir
@@ -94,26 +29,30 @@ tr:
     account_moderation_notes:
       create: Not bırak
       created_msg: Denetim notu başarıyla oluşturuldu!
-      delete: Sil
       destroyed_msg: Denetim notu başarıyla yok edildi!
     accounts:
       add_email_domain_block: E-posta alan adını engelle
       approve: Onayla
-      approve_all: Tümünü onayla
       approved_msg: "%{username} adlı kullanıcının kayıt başvurusu başarıyla onaylandı"
       are_you_sure: Emin misiniz?
       avatar: Profil resmi
       by_domain: Alan adı
       change_email:
-        changed_msg: Hesap e-postası başarıyla değiştirildi!
+        changed_msg: E-posta başarıyla değiştirildi!
         current_email: Mevcut e-posta
         label: E-postayı değiştir
         new_email: Yeni e-posta
         submit: E-postayı değiştir
         title: "%{username} için e-postayı değiştir"
+      change_role:
+        changed_msg: Rol başarıyla değiştirildi!
+        label: Rolü değiştir
+        no_role: Rol yok
+        title: "%{username} için rolü değiştir"
       confirm: Onayla
       confirmed: Onaylandı
       confirming: Onaylanıyor
+      custom: Özel
       delete: Veriyi sil
       deleted: Silindi
       demote: Düşür
@@ -153,7 +92,7 @@ tr:
         active: Etkin
         all: Hepsi
         pending: Bekliyor
-        silenced: Susturulanlar
+        silenced: Sınırlı
         suspended: Uzaklaştırılanlar
         title: Denetim
       moderation_notes: Denetleme notları
@@ -161,9 +100,14 @@ tr:
       most_recent_ip: Son IP
       no_account_selected: Hiçbiri seçilmediğinden hiçbir hesap değiştirilmedi
       no_limits_imposed: Sınır koymaz
+      no_role_assigned: Rol atanmamış
       not_subscribed: Abone edilmedi
       pending: Bekleyen yorum
       perform_full_suspension: Askıya al
+      previous_strikes: Önceki eylemler
+      previous_strikes_description_html:
+        one: Bu hesap için <strong>bir</strong> eylem yapılmış.
+        other: Bu hesap için <strong>%{count}</strong> eylem yapılmış.
       promote: Yükselt
       protocol: Protokol
       public: Herkese açık
@@ -171,8 +115,9 @@ tr:
       redownload: Profili yenile
       redownloaded_msg: "%{username} kullanıcısının profili kökenden başarıyla yenilendi"
       reject: Reddet
-      reject_all: Tümünü reddet
       rejected_msg: "%{username} adlı kullanıcının kayıt başvurusu başarıyla reddedildi"
+      remote_suspension_irreversible: Bu hesaba ait veriler geri dönüşümsüz bir şekilde silindi.
+      remote_suspension_reversible_hint_html: Hesap sunucusunda askıya alındı ve veriler %{date} tarihinde tamamen kaldırılacak. O zamana kadar, uzak sunucu herhangi bir olumsuz etki olmadan hesabı geri yüklenebilir. Hesabın tüm verilerini hemen kaldırmak isterseniz, bunu aşağıdan yapabilirsiniz.
       remove_avatar: Profil resmini kaldır
       remove_header: Üstbilgiyi kaldır
       removed_avatar_msg: "%{username} hesabının avatar resmi başarıyla kaldırıldı"
@@ -182,21 +127,15 @@ tr:
         send: Doğrulama epostasını yeniden gönder
         success: Onay e-postası başarıyla gönderildi!
       reset: Sıfırla
-      reset_password: Şifreyi sıfırla
+      reset_password: Parolayı sıfırla
       resubscribe: Yeniden abone ol
-      role: İzinler
-      roles:
-        admin: Yönetici
-        moderator: Denetleyici
-        staff: Personel
-        user: Kullanıcı
+      role: Rol
       search: Ara
       search_same_email_domain: Aynı e-posta alan adına sahip diğer kullanıcılar
       search_same_ip: Aynı IP adresine sahip diğer kullanıcılar
       security_measures:
         only_password: Sadece parola
         password_and_2fa: Parola ve İki aşamalı doğrulama
-        password_and_sign_in_token: Parola ve e-posta tokeni
       sensitive: Hassas
       sensitized: Hassas olarak işaretlendi
       shared_inbox_url: Paylaşılan gelen kutusu bağlantısı
@@ -206,12 +145,15 @@ tr:
       silence: Sustur
       silenced: Susturulmuş
       statuses: Durumlar
+      strikes: Önceki eylemler
       subscribe: Abone ol
+      suspend: Askıya al
       suspended: Askıya alındı
       suspension_irreversible: Bu hesabın verileri geri dönüşümsüz olarak silindi. Hesabı kullanılabilir hale getirmek için hesabın askıya alınmasını kaldırabilirsiniz, ancak daha önce sahip olduğu herhangi bir veri kurtarılamaz.
       suspension_reversible_hint_html: Hesap askıya alındı ve veriler %{date} tarihinde tamamen kaldırılacak. O zamana kadar, hesap herhangi bir olumsuz etki olmaksızın geri yüklenebilir. Hesabın tüm verilerini hemen kaldırmak isterseniz, bunu aşağıdan yapabilirsiniz.
-      time_in_queue: "%{time} kuyruğunda bekliyor"
       title: Hesaplar
+      unblock_email: E-posta adresinin engelini kaldır
+      unblocked_email_msg: "%{username} kişisinin e-posta adresinin engeli başarıyla kaldırıldı"
       unconfirmed_email: Onaylanmamış e-posta
       undo_sensitized: Hassaslığı geri al
       undo_silenced: Susturmayı geri al
@@ -226,26 +168,34 @@ tr:
       whitelisted: Beyaz listede
     action_logs:
       action_types:
+        approve_appeal: İtirazı Kabul Et
+        approve_user: Kullanıcıyı Onayla
         assigned_to_self_report: Raporu Ata
         change_email_user: Kullanıcı E-postasını Değiştir
+        change_role_user: Kullanıcının Rolünü Değiştir
         confirm_user: Kullanıcıyı Onayla
         create_account_warning: Uyarı Oluştur
         create_announcement: Duyuru Oluştur
+        create_canonical_email_block: E-posta Engeli Oluştur
         create_custom_emoji: Özel İfade Oluştur
         create_domain_allow: İzin Verilen Alan Adı Oluştur
         create_domain_block: Engellenen Alan Adı Oluştur
         create_email_domain_block: E-Posta Alan Adı Engeli Oluştur
         create_ip_block: IP kuralı oluştur
         create_unavailable_domain: Mevcut Olmayan Alan Adı Oluştur
+        create_user_role: Rol Oluştur
         demote_user: Kullanıcıyı Düşür
         destroy_announcement: Duyuru Sil
+        destroy_canonical_email_block: E-Posta Engelini Sil
         destroy_custom_emoji: Özel İfadeyi Sil
         destroy_domain_allow: İzin Verilen Alan Adını Sil
         destroy_domain_block: Engellenen Alan Adını Sil
         destroy_email_domain_block: E-posta alan adı engelini sil
+        destroy_instance: Alan adını temizle
         destroy_ip_block: IP kuralını sil
         destroy_status: Durumu Sil
         destroy_unavailable_domain: Mevcut Olmayan Alan Adı Sil
+        destroy_user_role: Rolü Kaldır
         disable_2fa_user: 2AD Kapat
         disable_custom_emoji: Özel İfadeyi Devre Dışı Bırak
         disable_sign_in_token_auth_user: Kullanıcı için E-posta Token Doğrulamayı devre dışı bırak
@@ -255,42 +205,56 @@ tr:
         enable_user: Kullanıcıyı Etkinleştir
         memorialize_account: Hesabı Anıtlaştır
         promote_user: Kullanıcıyı Yükselt
+        reject_appeal: İtirazı Reddet
+        reject_user: Kullanıcıyı Reddet
         remove_avatar_user: Profil Resmini Kaldır
         reopen_report: Şikayeti Tekrar Aç
+        resend_user: Doğrulama E-postasını Tekrar Gönder
         reset_password_user: Parolayı Sıfırla
         resolve_report: Şikayeti Çöz
         sensitive_account: Hesabınızdaki medyayı hassas olarak işaretleyin
         silence_account: Hesabı Sustur
         suspend_account: Hesabı Askıya Al
         unassigned_report: Rapor Atamasını Kaldır
+        unblock_email_account: E-posta adresinin engelini kaldır
         unsensitive_account: Hesabınızdaki medyayı hassas olarak işaretlemeyin
         unsilence_account: Hesabın Sesini Aç
         unsuspend_account: Hesabı Askıdan Kaldır
         update_announcement: Duyuruyu Güncelle
         update_custom_emoji: Özel İfadeyi Güncelle
         update_domain_block: Engellenen Alan Adını Güncelle
+        update_ip_block: IP kuralını güncelle
         update_status: Durumu Güncelle
+        update_user_role: Rolü Güncelle
       actions:
+        approve_appeal_html: "%{name}, %{target} kullanıcısının yönetim kararına itirazını kabul etti"
+        approve_user_html: "%{name}, %{target} konumundan kaydı onayladı"
         assigned_to_self_report_html: "%{name} kendilerine %{target} adlı raporu verdi"
         change_email_user_html: "%{name}, %{target} kullanıcısının e-posta adresini değiştirdi"
+        change_role_user_html: "%{name}, %{target} kişisinin rolünü değiştirdi"
         confirm_user_html: "%{name} %{target} kullanıcısının e-posta adresini onayladı"
         create_account_warning_html: "%{name} %{target} 'a bir uyarı gönderdi"
         create_announcement_html: "%{name}, yeni %{target} duyurusunu oluşturdu"
+        create_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelledi"
         create_custom_emoji_html: "%{name} yeni %{target} ifadesini yükledi"
         create_domain_allow_html: "%{name}, %{target} alan adıyla birliğe izin verdi"
         create_domain_block_html: "%{name}, %{target} alan adını engelledi"
         create_email_domain_block_html: "%{name}, %{target} e-posta alan adını engelledi"
         create_ip_block_html: "%{name}, %{target} IP adresi için kural oluşturdu"
         create_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı durdurdu"
+        create_user_role_html: "%{name}, %{target} rolünü oluşturdu"
         demote_user_html: "%{name}, %{target} kullanıcısını düşürdü"
         destroy_announcement_html: "%{name}, %{target} duyurusunu sildi"
-        destroy_custom_emoji_html: "%{name}, %{target} emojisini yok etti"
+        destroy_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelini kaldırdı"
+        destroy_custom_emoji_html: "%{name}, %{target} ifadesini sildi"
         destroy_domain_allow_html: "%{name}, %{target} alan adıyla birlik iznini kaldırdı"
         destroy_domain_block_html: "%{name}, %{target} alan adı engelini kaldırdı"
         destroy_email_domain_block_html: "%{name}, %{target} e-posta alan adı engelini kaldırdı"
+        destroy_instance_html: "%{name}, %{target} alan adını temizledi"
         destroy_ip_block_html: "%{name}, %{target} IP adresi kuralını sildi"
         destroy_status_html: "%{name}, %{target} kullanıcısının gönderisini kaldırdı"
         destroy_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı sürdürdü"
+        destroy_user_role_html: "%{name}, %{target} rolünü sildi"
         disable_2fa_user_html: "%{name}, %{target} kullanıcısının iki aşamalı doğrulama gereksinimini kapattı"
         disable_custom_emoji_html: "%{name}, %{target} emojisini devre dışı bıraktı"
         disable_sign_in_token_auth_user_html: "%{name}, %{target} için e-posta token doğrulamayı devre dışı bıraktı"
@@ -300,22 +264,28 @@ tr:
         enable_user_html: "%{name}, %{target} kullanıcısı için oturum açmayı etkinleştirdi"
         memorialize_account_html: "%{name}, %{target} kullanıcısının hesabını bir anıt sayfaya dönüştürdü"
         promote_user_html: "%{name}, %{target} kullanıcısını yükseltti"
+        reject_appeal_html: "%{name}, %{target} kullanıcısının yönetim kararına itirazını reddetti"
+        reject_user_html: "%{name}, %{target} konumundan kaydı reddetti"
         remove_avatar_user_html: "%{name}, %{target} kullanıcısının avatarını kaldırdı"
         reopen_report_html: "%{name}, %{target} şikayetini yeniden açtı"
+        resend_user_html: "%{name}, %{target} için doğrulama e-postasını tekrar gönderdi"
         reset_password_user_html: "%{name}, %{target} kullanıcısının parolasını sıfırladı"
         resolve_report_html: "%{name}, %{target} şikayetini çözdü"
         sensitive_account_html: "%{name}, %{target} kullanıcısının medyasını hassas olarak işaretledi"
         silence_account_html: "%{name}, %{target} kullanıcısının hesabını sessize aldı"
         suspend_account_html: "%{name}, %{target} kullanıcısının hesabını askıya aldı"
         unassigned_report_html: "%{name}, %{target} şikayetinin atamasını kaldırdı"
+        unblock_email_account_html: "%{name}, %{target} kişisinin e-posta adresinin engelini kaldırdı"
         unsensitive_account_html: "%{name}, %{target} kullanıcısının medyasının hassas işaretini kaldırdı"
         unsilence_account_html: "%{name}, %{target} kullanıcısının hesabının sessizliğini kaldırdı"
         unsuspend_account_html: "%{name}, %{target} kullanıcısının hesabının askı durumunu kaldırdı"
         update_announcement_html: "%{name}, %{target} duyurusunu güncelledi"
         update_custom_emoji_html: "%{name}, %{target} emojisini güncelledi"
         update_domain_block_html: "%{name}, %{target} alan adının engelini güncelledi"
+        update_ip_block_html: "%{name}, %{target} IP adresi için kuralı güncelledi"
         update_status_html: "%{name}, %{target} kullanıcısının gönderisini güncelledi"
-      deleted_status: "(silinmiş durum)"
+        update_user_role_html: "%{name}, %{target} rolünü değiştirdi"
+      deleted_account: hesap silindi
       empty: Kayıt bulunamadı.
       filter_by_action: Eyleme göre filtre
       filter_by_user: Kullanıcıya göre filtre
@@ -354,11 +324,12 @@ tr:
       enable: Etkinleştir
       enabled: Etkin
       enabled_msg: Bu emojiyi başarıyla etkinleştirdi
-      image_hint: 50 KB'a kadar PNG
+      image_hint: En fazla %{size} boyutunda PNG veya GIF
       list: Liste
       listed: Listelenen
       new:
         title: Yeni özel emoji ekle
+      no_emoji_selected: Hiçbiri seçilmediğinden hiçbir emoji değiştirilmedi
       not_permitted: Bu işlemi gerçekleştirme izniniz yok
       overwrite: Üzerine yaz
       shortcode: Kısa kod
@@ -376,14 +347,17 @@ tr:
       media_storage: Medya deposu
       new_users: yeni kullanıcılar
       opened_reports: açılan bildirimler
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> bekleyen itiraz"
+        other: "<strong>%{count}</strong> bekleyen itiraz"
       pending_reports_html:
-        one: "<strong>1</strong> bekleyen bildirim"
+        one: "<strong>%{count}</strong> bekleyen bildirim"
         other: "<strong>%{count}</strong> bekleyen bildirim"
       pending_tags_html:
-        one: "<strong>1</strong> bekleyen etiket"
+        one: "<strong>%{count}</strong> bekleyen etiket"
         other: "<strong>%{count}</strong> bekleyen etiket"
       pending_users_html:
-        one: "<strong>1</strong> bekleyen kullanıcı"
+        one: "<strong>%{count}</strong> bekleyen kullanıcı"
         other: "<strong>%{count}</strong> bekleyen kullanıcı"
       resolved_reports: çözülmüş bildirimler
       software: Yazılım
@@ -393,10 +367,16 @@ tr:
       top_languages: En aktif diller
       top_servers: En aktif sunucular
       website: Web sitesi
+    disputes:
+      appeals:
+        empty: İtiraz bulunamadı.
+        title: İtirazlar
     domain_allows:
       add_new: Alan adını beyaz listeye al
       created_msg: Alan adı başarıyla beyaz listeye alındı
       destroyed_msg: Alan adı beyaz listeden kaldırıldı
+      export: Dışa Aktar
+      import: İçe aktar
       undo: Beyaz listeden çıkar
     domain_blocks:
       add_new: Yeni ekle
@@ -404,54 +384,66 @@ tr:
       destroyed_msg: Domain bloğu silindi
       domain: Alan adı
       edit: Etki alanı bloğunu düzenle
+      existing_domain_block: Zaten %{name} için daha katı sınırlamalar dayatmıştınız.
       existing_domain_block_html: '%{name}''e zaten daha katı sınırlar uyguladınız, önce <a href="%{unblock_url}">engellemesini kaldırmanız</a> gerekiyor.'
+      export: Dışa Aktar
+      import: İçe aktar
       new:
         create: Yeni blok oluştur
         hint: Domain bloğu, veri tabanında hesap kayıtlarının oluşturulmasını engellemez, fakat o hesapların üzerine otomatik olarak belirli yönetim metodlarını olarak uygular.
         severity:
-          desc_html: "<strong>Susturma</strong>, uygulanan hesabın gönderilerini, o hesabı takip etmeyen diğer herkese gizler. <strong>Uzaklaştırma</strong> hesabın bütün içeriğini, ortam dosyalarını ve profil verisini siler."
+          desc_html: "<strong>Sınırlama</strong>, bu sunucudaki hesabın gönderilerini, o hesabı takip etmeyen diğer herkese gizler. <strong>Uzaklaştırma</strong> bu alan adındaki hesapların tüm içeriğini, medya dosyalarını ve profil verisini sunucunuzdan siler. Sadece medya dosyalarını reddetmek için <strong>Hiçbiri</strong> kullanın."
           noop: Yok
-          silence: Sustur
+          silence: Sınırla
           suspend: Uzaklaştır
         title: Yeni domain bloğu
+      no_domain_block_selected: Seçim yapılmadığından hiç bir alan adı engeli değiştirilmedi
+      not_permitted: Bu işlemi gerçekleştirme izniniz yok
       obfuscate: Alan adını gizle
       obfuscate_hint: Alan adı kısıtlamaları listelerinin duyurulması etkinleştirilmişse alan adını listede kısmen gizle
       private_comment: Özel yorum
       private_comment_hint: Denetleyiciler tarafından dahili kullanım için bu alan adı sınırlaması hakkında yorum.
       public_comment: Genel yorum
       public_comment_hint: Eğer alan adı sınırlamaları listesinin tanıtılması etkinleştirilmişse, genel kullanım için bu alan adı sınırlaması hakkında yorum.
-      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
+      reject_media: Medya dosyalarını reddet
+      reject_media_hint: Yerel olarak depolanmış medya dosyalarını ve gelecekte indirilecek olanları reddeder. Uzaklaştırmalarla ilgisizdir
       reject_reports: Raporları reddet
       reject_reports_hint: Bu alan adından gelen tüm şikayetleri yok sayın. Uzaklaştırmalar için mevzu dışıdır
-      rejecting_media: ortam dosyalarını reddet
-      rejecting_reports: şikayetleri reddet
-      severity:
-        silence: susturulmuş
-        suspend: uzaklaştırılmış
-      show:
-        affected_accounts:
-          one: Veritabanındaki bir hesap etkilendi
-          other: Veritabanındaki %{count} hesap etkilendi
-        retroactive:
-          silence: Bu domaindeki tüm hesapların üzerindeki susturulma işlemini kaldır
-          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
       undo: Geri al
       view: Alan adı bloğunu görüntüle
     email_domain_blocks:
       add_new: Yeni ekle
+      attempts_over_week:
+        one: Son haftada %{count} deneme
+        other: Son haftada %{count} kayıt denemesi
       created_msg: E-posta alan adı kara listeye başarıyla eklendi
       delete: Sil
-      destroyed_msg: E-posta alan adı kara listeden başarıyla silindi
+      dns:
+        types:
+          mx: MX kaydı
       domain: Alan adı
-      empty: Şu anda hiçbir e-posta alan adı kara listeye alınmadı.
-      from_html: "%{domain} alan adından"
       new:
         create: Alan adı ekle
+        resolve: Alan adı çözümleme
         title: Yeni e-posta kara liste girişi
+      no_email_domain_block_selected: Seçim yapılmadığından hiç bir e-posta alan adı engeli değiştirilmedi
+      resolved_dns_records_hint_html: Alan adı aşağıdaki MX alan adlarına çözümleniyor, ancak hiç biri nihayetinde e-posta kabulünden sorum değil. Bir MX alan adını engellemek, görünen alan adı farklı osa bile aynı MX alan adını kullanan e-posta adreslerinden gelen kayıtları engelleyecektir. <strong>Başlıca e-posta sağlayıcıları engellememek için dikkatli olun.</strong>
+      resolved_through_html: "%{domain} aracılığıyla çözümlendi"
       title: E-posta kara listesi
+    export_domain_allows:
+      new:
+        title: Alan adı engellerini içe aktar
+      no_file: Dosya seçilmedi
+    export_domain_blocks:
+      import:
+        description_html: Bir alan adı engeli listesini içe aktarmak üzeresiniz. Bu listeyi iyice gözden geçirin, özellikle listeyi siz hazırlamadıysanız.
+        existing_relationships_warning: Mevcut takip ilişkileri
+        private_comment_description_html: 'İçe aktarılan engellerin nereden geldiğini izlemenize olanak sağlamak için, içe aktarılan engeller şu özel yorum ile oluşturulacak: <q>%{comment}</q>'
+        private_comment_template: "%{source} kaynağından %{date} tarihinde içe aktarıldı"
+        title: Domain bloklarını içe aktar
+      new:
+        title: Domain bloklarını içe aktar
+      no_file: Dosya seçilmedi
     follow_recommendations:
       description_html: "<strong>Takip önerileri yeni kullanıcıların hızlı bir şekilde ilginç içerik bulmalarını sağlar</strong>. Eğer bir kullanıcı, kişisel takip önerileri almaya yetecek kadar başkalarıyla etkileşime girmediğinde, onun yerine bu hesaplar önerilir. Bu öneriler, verili bir dil için en yüksek takipçi sayısına ve en yüksek güncel meşguliyete sahip hesapların bir karışımdan günlük olarak hesaplanıyorlar."
       language: Dil için
@@ -461,25 +453,53 @@ tr:
       title: Takip önerileri
       unsuppress: Takip önerisini geri getir
     instances:
+      availability:
+        description_html:
+          one: Eğer alan adına teslimat <strong>%{count} gün</strong> boyunca başarısız olursa, alan adından bir teslimat <em>gelmedikçe</em> yeni bir iletim denemesi yapılmayacak.
+          other: Eğer alan adına teslimat <strong>%{count} farklı gün</strong> boyunca başarısız olursa, alan adından bir teslimat <em>gelmedikçe</em> yeni bir iletim denemesi yapılmayacak.
+        failure_threshold_reached: Başarısızlık eşiğine %{date} tarihinde ulaşıldı.
+        failures_recorded:
+          one: "%{count} gün başarısız girişim."
+          other: "%{count} farklı gün başarısız girişim."
+        no_failures_recorded: Kayıtlı başarısızlık yok.
+        title: Ulaşılabilirlik
+        warning: Bu sunucuya önceki bağlanma denemesi başarısız olmuştu
       back_to_all: Tümü
       back_to_limited: Sınırlı
       back_to_warning: Uyarı
       by_domain: Alan adı
+      confirm_purge: Bu alan adından verileri kalıcı olarak silmek istediğinizden emin misin?
+      content_policies:
+        comment: İç not
+        description_html: Bu alan adındaki ve alt alan adlarındaki tüm hesaplara uygulanacak içerik ilkeleri belirleyebilirsiniz.
+        policies:
+          reject_media: Medyayı reddet
+          reject_reports: Şikayetleri reddet
+          silence: Sınırla
+          suspend: Askıya al
+        policy: İlke
+        reason: Kamuya açık gerekçe
+        title: İçerik ilkeleri
+      dashboard:
+        instance_accounts_dimension: En çok takip edilen hesaplar
+        instance_accounts_measure: kayıtlı hesaplar
+        instance_followers_measure: oradaki takipçilerimiz
+        instance_follows_measure: buradaki takipçileri
+        instance_languages_dimension: En gözde diller
+        instance_media_attachments_measure: kayıtlı medya ekleri
+        instance_reports_measure: haklarındaki şikayetler
+        instance_statuses_measure: kayıtlı gönderiler
       delivery:
         all: Tümü
         clear: Teslimat hatalarını temizle
+        failing: Hata
         restart: Teslimatı yeniden başlat
         stop: Teslimatı durdur
-        title: Teslimat
         unavailable: Mevcut Değil
-        unavailable_message: Teslimat mevcut değil
-        warning: Uyarı
-        warning_message:
-          one: Teslimat %{count} gündür başarısız
-          other: Teslimat %{count} gündür başarısız
       delivery_available: Teslimat mevcut
       delivery_error_days: Teslimat hatası günleri
       delivery_error_hint: Eğer teslimat %{count} gün boyunca mümkün olmazsa, otomatik olarak teslim edilemiyor olarak işaretlenecek.
+      destroyed_msg: "%{domain} alan adından veriler hemen silinmek üzere kuyruğa alındı."
       empty: Alan adı bulunamadı.
       known_accounts:
         one: "%{count} bilinen hesap"
@@ -490,12 +510,15 @@ tr:
         title: Denetim
       private_comment: Özel yorum
       public_comment: Genel yorum
+      purge: Temizle
+      purge_description_html: Eğer bu alan adının temelli çevrimdışı olduğunu düşünüyorsanız, bu alanda adına ait tüm hesap kayıtlarını ve ilişkili tüm veriyi depolama alanınızdan kaldırabilirsiniz. Bu işlem uzun sürebilir.
       title: Bilinen Sunucular
       total_blocked_by_us: Tarafımızca engellenen
       total_followed_by_them: Onlar tarafından takip edilen
       total_followed_by_us: Tarafımızca takip edilen
       total_reported: Onlar hakkında şikayetler
       total_storage: Medya ekleri
+      totals_time_period_hint_html: Aşağıdaki gösterilen toplamlar, gelmiş geçmiş tüm veriyi içeriyor.
     invites:
       deactivate_all: Tümünü devre dışı bırak
       filter:
@@ -519,18 +542,16 @@ tr:
         title: Yeni IP kuralı oluştur
       no_ip_block_selected: Hiçbiri seçilmediğinden hiçbir IP kuralı değiştirilmedi
       title: IP kuralları
-    pending_accounts:
-      title: Bekleyen hesaplar (%{count})
     relationships:
       title: "%{acct} kişisinin ilişkileri"
     relays:
       add_new: Yeni aktarıcı ekle
       delete: Sil
-      description_html: "<strong>Federasyon aktarıcısı</strong>, kendisine abone olan ve yayın yapan sunucular arasında büyük miktarlarda herkese açık tootların değiş tokuşunu yapan aracı bir sunucudur. <strong>Küçük ve orta boyutlu sunucuların fediverse'ten içerik keşfetmesine yardımcı olurlar</strong>, aksi takdirde yerel kullanıcıların uzak sunuculardaki diğer kişileri manuel olarak takip etmeleri gerekecektir."
+      description_html: "<strong>Federasyon aktarıcısı</strong>, kendisine abone olan ve yayın yapan sunucular arasında büyük miktarlarda herkese açık gönderilerin değiş tokuşunu yapan aracı bir sunucudur. <strong>Küçük ve orta boyutlu sunucuların fediverse'ten içerik keşfetmesine yardımcı olurlar</strong>, aksi takdirde yerel kullanıcıların uzak sunuculardaki diğer kişileri manuel olarak takip etmeleri gerekecektir."
       disable: Devre dışı
       disabled: Devre dışı
       enable: Etkin
-      enable_hint: Etkinleştirildiğinde, sunucunuz bu aktarıcıdan gelecek tüm herkese açık tootlara abone olacak, ve kendisinin herkese açık tootlarını bu aktarıcıya göndermeye başlayacaktır.
+      enable_hint: Etkinleştirildiğinde, sunucunuz bu aktarıcıdan gelecek tüm herkese açık gönderilere abone olacak, ve kendisinin herkese açık gönderilerini bu aktarıcıya göndermeye başlayacaktır.
       enabled: Etkin
       inbox_url: Aktarıcı URL'si
       pending: Aktarıcının onaylaması için bekleniyor
@@ -547,39 +568,121 @@ tr:
         notes:
           one: "%{count} not"
           other: "%{count} not"
-        reports:
-          one: "%{count} şikayet"
-          other: "%{count} şikayet"
+      action_log: Denetim günlüğü
       action_taken_by: tarafından gerçekleştirilen eylem
+      actions:
+        delete_description_html: Bildirilen gönderiler silinecek ve aynı hesapla ileride yaşabileceğiniz etkileşimlerde çoğaltmanız için bir eylem kaydedilecek.
+        mark_as_sensitive_description_html: Bildirilen gönderilerdeki medya dosyaları hassas olarak işaretlenecek ve aynı hesabın gelecekteki ihlallerinde daha yetkili makamlara bildirmenize yardımcı olmak için bir eylem kaydedilecek.
+        other_description_html: Hesabın davranışını denetlemek ve bildirilen hesabın iletişimini yapılandırmak için daha fazla seçenek görün.
+        resolve_description_html: Bildirilen hesap için bir şey yapılmayacak, eylem kaydedilmeyecek ve bildirim kapatılacak.
+        silence_description_html: Profil sadece halihazırda takip edenler ve elle bakanlarca görünecek, böylece erişimi ciddi bir şekilde kısıtlanacak. Her zaman geri alınabilir.
+        suspend_description_html: Profil ve tüm içeriği sonunda silinene kadar erişilmez olacak. Hesapla etkileşim mümkün olmayacak. 30 gün boyunca geri alınabilir.
+      actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
+      add_to_report: Bildirime daha fazlasını ekle
       are_you_sure: Emin misiniz?
       assign_to_self: Bana ata
       assigned: Denetleyici atandı
+      by_target_domain: Şikayet edilen hesabın alan adı
+      category: Kategori
+      category_description_html: Bu hesap ve/veya içeriğin bildirilme gerekçesi, bildirilen hesapla iletişimde alıntılanacaktır
       comment:
         none: Yok
+      comment_description_html: 'Daha fazla bilgi vermek için %{name} şunu yazdı:'
       created_at: Şikayet edildi
+      delete_and_resolve: Gönderileri sil
       forwarded: İletildi
       forwarded_to: "%{domain}'e iletildi"
       mark_as_resolved: Giderildi olarak işaretle
+      mark_as_sensitive: Hassas olarak işaretle
       mark_as_unresolved: Çözümlenmemiş olarak işaretle
+      no_one_assigned: Hiç kimse
       notes:
         create: Not Ekle
         create_and_resolve: Not ile çözümle
         create_and_unresolve: Not ile tekrar aç
         delete: Sil
         placeholder: Hangi işlemlerin yapıldığını, ya da diğer ilgili güncellemeleri açıklayın...
+        title: Notlar
+      notes_description_html: Kendiniz ve diğer moderatörler için not bırakın veya notları görüntüleyin
+      quick_actions_description_html: 'Hemen bir şey yapın veya bildirilen içeriği görmek için aşağı kaydırın:'
+      remote_user_placeholder: "%{instance}'dan uzak kullanıcı"
       reopen: Şikayeti tekrar aç
       report: 'Şikayet #%{id}'
       reported_account: Şikayet edilen hesap
       reported_by: Şikayet eden
       resolved: Giderildi
       resolved_msg: Şikayet başarıyla çözümlendi!
+      skip_to_actions: İşlemlere atla
       status: Durum
-      target_domain: Şikayet edilen hesabın alan adı
+      statuses: Bildirilen içerik
+      statuses_description_html: İncitici içerik, bildirilen hesapla iletişimde alıntılanacaktır
       target_origin: Şikayet edilen hesabın kökeni
       title: Şikayetler
       unassign: Atamayı geri al
       unresolved: Giderilmedi
       updated_at: Güncellendi
+      view_profile: Profili görüntüle
+    roles:
+      add_new: Rol ekle
+      assigned_users:
+        one: "%{count} kullanıcı"
+        other: "%{count} kullanıcı"
+      categories:
+        administration: Yönetim
+        devops: DevOps
+        invites: Davetler
+        moderation: Denetim
+        special: Özel
+      delete: Sil
+      description_html: "<strong>Kullanıcı rolleri</strong> ile, kullanıcılarınızın Mastodon'un hangi işlevlerine ve alanlarına erişebileceğini düzenleyebilirsiniz."
+      edit: "'%{name}' rolünü düzenle"
+      everyone: Varsayılan izinler
+      everyone_full_description_html: Bu, herhangi bir rol atanmamış olanlar da olmak üzere <strong>tüm kullanıcıları</strong> etkileyen <strong>temel rol</strong>dür. Diğer tüm roller izinleri bu rolden alıyorlar.
+      permissions_count:
+        one: "%{count} izin"
+        other: "%{count} izin"
+      privileges:
+        administrator: Yönetici
+        administrator_description: Bu izne sahip kullanıcılar tüm diğer izinleri atlıyorlar
+        delete_user_data: Kullanıcı Verilerini Silme
+        delete_user_data_description: Kullanıcıların, diğer kullanıcıların verisini gecikme olmaksızın silmesine izin verir
+        invite_users: Kullanıcıları Davet Etme
+        invite_users_description: Kullanıcıların yeni kişileri sunucuya davet etmesine izin verir
+        manage_announcements: Duyuruları Yönetme
+        manage_announcements_description: Kullanıcıların sunucudaki duyuruları yönetmesine izin verir
+        manage_appeals: İtirazları Yönetme
+        manage_appeals_description: Kullanıcıların denetleme eylemlerine itirazları gözden geçirmesine izin verir
+        manage_blocks: Engelleri Yönetme
+        manage_blocks_description: Kullanıcıların e-posta sağlayıcıları ve IP adreslerini engellemesine izin verir
+        manage_custom_emojis: Özel İfadeleri Yönetme
+        manage_custom_emojis_description: Kullanıcıların sunucudaki özel ifadeleri yönetmesine izin verir
+        manage_federation: Birleştirme Yönetme
+        manage_federation_description: Kullanıcıların diğer alan adlarıyla birleştirmeye izin vermesi veya engellemesine ve teslim edilebilirliği denetlemesine izin verir
+        manage_invites: Davetleri Yönetme
+        manage_invites_description: Kullanıcıların davet bağlantılarını görüntüleme ve etkisizleştirmesine izin verir
+        manage_reports: Raporları Yönetme
+        manage_reports_description: Kullanıcıların bildirimleri incelemesine ve onlara yönelik denetim eylemleri gerçekleştirmesine izin verir
+        manage_roles: Rolleri Yönetme
+        manage_roles_description: Kullanıcıların kendi rollerinden düşük rolleri atamasına izin verir
+        manage_rules: Kuralları Yönetme
+        manage_rules_description: Kullanıcıların sunucu kurallarını değiştirmesine izin ver
+        manage_settings: Ayarları Yönetme
+        manage_settings_description: Kullanıcıların site ayarlarını değiştirmesine izin verir
+        manage_taxonomies: Kategorileri Yönetme
+        manage_taxonomies_description: Kullanıcıların öne çıkan içeriği incelemesine ve etiket ayarlarını güncellemesine izin verir
+        manage_user_access: Kullanıcı Erişimini Yönetme
+        manage_user_access_description: Kullanıcıların, diğer kullanıcıların işi aşamalı yetkilendirme, e-posta adreslerini değiştirme ve parolalarını sıfırlama eylemlerini etkisizleştirmesine izin verir
+        manage_users: Kullanıcıları Yönetme
+        manage_users_description: Kullanıcıların, diğer kullanıcıların ayrıntılarını görüntülemesine ve onlara karşı denetim eylemleri gerçekleştirmesine izin verir
+        manage_webhooks: Webhookları Yönetme
+        manage_webhooks_description: Kullanıcıların yönetsel olaylar için webhook kurmasına izin verir
+        view_audit_log: Denetim Kaydını Görüntüleme
+        view_audit_log_description: Kullanıcıların sunucudaki yönetsel eylemlerin bir tarihçesini görüntülemesine izin verir
+        view_dashboard: Ana Paneli Görüntüleme
+        view_dashboard_description: Kullanıcıların ana panele ve çeşitli ölçütlere erişmesine izin verir
+        view_devops: DevOps
+        view_devops_description: Kullanıcıların Sidekiq ve pgHero panellerine erişmesine izin verir
+      title: Roller
     rules:
       add_new: Kural ekle
       delete: Sil
@@ -588,142 +691,201 @@ tr:
       empty: Henüz bir sunucu kuralı tanımlanmadı.
       title: Sunucu kuralları
     settings:
-      activity_api_enabled:
-        desc_html: Yerel olarak yayınlanan durumların, aktif kullanıcıların, ve haftalık kovalardaki yeni kayıtların sayısı
-        title: Kullanıcı etkinliği hakkında toplu istatistikler yayınlayın
-      bootstrap_timeline_accounts:
-        desc_html: Birden fazla kullanıcı adını virgülle ayırın. Yalnızca yerel ve kilitlenmemiş hesaplar geçerlidir. Boş olduğunda varsayılan tüm yerel yöneticilerdir.
-        title: Yeni kullanıcılar için varsayılan takipler
-      contact_information:
-        email: Herkese açık e-posta adresiniz
-        username: Bir kullanıcı adı giriniz
-      custom_css:
-        desc_html: Görünümü her sayfada yüklenecek CSS ile değiştirin
-        title: Özel CSS
+      about:
+        manage_rules: Sunucu kurallarını yönet
+        preamble: Sunucunun nasıl işletildiği, yönetildiği ve fonlandığı hakkında ayrıntılı bilgi verin.
+        rules_hint: Kullanıcılarınızın uyması beklenen kurallar için özel bir alan var.
+        title: Hakkında
+      appearance:
+        preamble: Mastodon'un web arayüzünü düzenleyin.
+        title: Görünüm
+      branding:
+        preamble: Sunucunuzun markalaşması ağdaki diğer sunuculardan farklıdır. Bu bilgiler Mastodon'un web arayüzü, doğal uygulamalar, diğer sitelerdeki ve ileti uygulamalarındaki bağlantı önizlemeleri, vb. gibi çeşitli ortamlarda görüntülenebilir. Bu nedenle bu bilgiyi açık, kısa ve özlü tutmak en iyisidir.
+        title: Marka
+      content_retention:
+        preamble: Kullanıcıların ürettiği içeriğin Mastodon'da nasıl saklanacağını denetleyin.
+        title: İçerik saklama
       default_noindex:
         desc_html: Bu ayarı kendileri değiştirmeyen tüm kullanıcıları etkiler
         title: Varsayılan olarak kullanıcıları arama motoru indekslemesinin dışında tut
+      discovery:
+        follow_recommendations: Takip önerileri
+        preamble: İlginç içeriği gezinmek, Mastodon'da kimseyi tanımayan yeni kullanıcıları alıştırmak için oldukça etkilidir. Sunucunuzdaki çeşitli keşif özelliklerinin nasıl çalıştığını denetleyin.
+        profile_directory: Profil dizini
+        public_timelines: Genel zaman çizelgeleri
+        title: Keşfet
+        trends: Öne çıkanlar
       domain_blocks:
         all: Herkes için
         disabled: Hiç kimseye
-        title: Engellenen alan adlarını göster
         users: Oturum açan yerel kullanıcılara
-      domain_blocks_rationale:
-        title: Gerekçeyi göster
-      hero:
-        desc_html: Önsayfada görüntülenir. En az 600x100px önerilir. Ayarlanmadığında, sunucu küçük resmi kullanılır
-        title: Kahraman görseli
-      mascot:
-        desc_html: Birden fazla sayfada görüntülenir. En az 293x205px önerilir. Ayarlanmadığında, varsayılan maskot kullanılır
-        title: Maskot görseli
-      peers_api_enabled:
-        desc_html: Bu sunucunun fediverse'te karşılaştığı alan adları
-        title: Keşfedilen sunucuların listesini yayınla
-      preview_sensitive_media:
-        desc_html: Medya duyarlı olarak işaretlenmiş olsa bile, diğer web sitelerindeki bağlantı ön izlemeleri küçük resim gösterecektir
-        title: OpenGraph ön izlemelerinde hassas medyayı göster
-      profile_directory:
-        desc_html: Kullanıcıların keşfedilebilir olmasına izin ver
-        title: Profil dizinini etkinleştir
       registrations:
-        closed_message:
-          desc_html: Kayıt alımları kapatıldığında ana sayfada görüntülenecek mesajdır. <br> HTML etiketleri kullanabilirsiniz
-          title: Kayıt alımları kapatılma mesajı
-        deletion:
-          desc_html: Herkese hesabını silme izni ver
-          title: Hesap silmeyi aç
-        min_invite_role:
-          disabled: Hiç kimse
-          title: tarafından yapılan davetlere izin ver
-        require_invite_text:
-          desc_html: Kayıtlar elle doğrulama gerektiriyorsa, "Neden katılmak istiyorsunuz?" metin girdisini isteğe bağlı yerine zorunlu yapın
-          title: Yeni kullanıcıların katılmak için bir gerekçe sunmasını gerektir
+        preamble: Sunucunuzda kimin hesap oluşturabileceğini denetleyin.
+        title: Kayıtlar
       registrations_mode:
         modes:
           approved: Kayıt için onay gerekli
           none: Hiç kimse kayıt olamaz
           open: Herkes kaydolabilir
-        title: Kayıt modu
-      show_known_fediverse_at_about_page:
-        desc_html: Değiştirildiğinde, bilinen bütün fediverse'lerden gönderileri ön izlemede gösterir. Diğer türlü sadece yerel gönderileri gösterecektir.
-        title: Zaman çizelgesi ön izlemesinde bilinen fediverse'i göster
-      show_staff_badge:
-        desc_html: Kullanıcının sayfasında bir personel rozeti göster
-        title: Personel rozeti göster
-      site_description:
-        desc_html: Ana sayfada paragraf olarak görüntülenecek bilgidir.<br>Özellikle <code>&lt;a&gt;</code> ve <code>&lt;em&gt;</code> olmak suretiyle HTML etiketlerini kullanabilirsiniz.
-        title: Site açıklaması
-      site_description_extended:
-        desc_html: Harici bilgi sayfasında gösterilir.<br>HTML etiketleri girebilirsiniz
-        title: Sunucu hakkında detaylı bilgi
-      site_short_description:
-        desc_html: Kenar çubuğunda ve meta etiketlerinde görüntülenir. Mastodon'un ne olduğunu ve bu sunucuyu özel kılan şeyleri tek bir paragrafta açıklayın.
-        title: Kısa sunucu açıklaması
-      site_terms:
-        desc_html: Kendi gizlilik politikanızı, hizmet şartlarınızı ya da diğer hukuki metinlerinizi yazabilirsiniz. HTML etiketleri kullanabilirsiniz
-        title: Özel hizmet şartları
-      site_title: Site başlığı
-      thumbnail:
-        desc_html: OpenGraph ve API ile ön izlemeler için kullanılır. 1200x630px tavsiye edilir
-        title: Sunucu küçük resmi
-      timeline_preview:
-        desc_html: Açılış sayfasında genel zaman çizelgesini görüntüle
-        title: Zaman çizelgesi önizlemesi
-      title: Site Ayarları
-      trendable_by_default:
-        desc_html: Daha önce izin verilmeyen etiketleri etkiler
-        title: Ön inceleme yapmadan etiketlerin trend olmasına izin ver
-      trends:
-        desc_html: Şu anda trend olan ve daha önce incelenen etiketleri herkese açık olarak göster
-        title: Gündem etiketleri
+      title: Sunucu Ayarları
     site_uploads:
       delete: Yüklenen dosyayı sil
       destroyed_msg: Site yüklemesi başarıyla silindi!
     statuses:
+      account: Yazar
+      application: Uygulama
       back_to_account: Hesap sayfasına geri dön
+      back_to_report: Bildirim sayfasına geri dön
       batch:
-        delete: Sil
-        nsfw_off: Hassas değil olarak işaretle
-        nsfw_on: Hassas olarak işaretle
+        remove_from_report: Bildirimden kaldır
+        report: Bildirim
       deleted: Silindi
-      failed_to_execute: Çalıştırılamadı
+      favourites: Favoriler
+      history: Sürüm geçmişi
+      in_reply_to: Yanıtlanan
+      language: Dil
       media:
         title: Medya
-      no_media: Medya yok
+      metadata: Üstveri
       no_status_selected: Hiçbiri seçilmediğinden hiçbir durum değiştirilmedi
+      open: Gönderiyi aç
+      original_status: Özgün gönderi
+      reblogs: Yeniden Paylaşımlar
+      status_changed: Gönderi değişti
       title: Hesap durumları
+      trending: Öne çıkanlar
+      visibility: Görünürlük
       with_media: Medya ile
+    strikes:
+      actions:
+        delete_statuses: "%{name}, %{target} kullanıcısının gönderilerini sildi"
+        disable: "%{name}, %{target} kullanıcısının hesabını dondurdu"
+        mark_statuses_as_sensitive: "%{name}, %{target} kullanıcısının gönderilerini hassas olarak işaretledi"
+        none: "%{name}, %{target} kullanıcısına bir uyarı gönderdi"
+        sensitive: "%{name}, %{target} kullanıcısının hesabını hassas olarak işaretledi"
+        silence: "%{name}, %{target} kullanıcısının hesabını kısıtladı"
+        suspend: "%{name}, %{target} kullanıcısının hesabını askıya aldı"
+      appeal_approved: İtiraz Edildi
+      appeal_pending: İtiraz bekliyor
     system_checks:
       database_schema_check:
         message_html: Beklemede olan veritabanı güncellemeleri mevcut. Uygulamanın beklenildiği gibi çalışması için lütfen onları çalıştırın
+      elasticsearch_running_check:
+        message_html: Elasticsearch'e bağlanılamıyor. Çalıştığından emin olun veya tüm metin aramayı devre dışı bırakın
+      elasticsearch_version_check:
+        message_html: 'Uyumsuz Elasticsearch sürümü: %{value}'
+        version_comparison: Elasticsearch %{running_version} sürümü çalışıyor, ancak %{required_version} sürümü gerekiyor
       rules_check:
         action: Sunucu kurallarını yönet
         message_html: Herhangi bir sunucu kuralı belirlemediniz.
       sidekiq_process_check:
         message_html: "%{value} kuyruk(lar)ı için herhangi bir Sidekiq süreci çalışmıyor. Lütfen Sidekiq yapılandırmanızı gözden geçirin"
     tags:
-      accounts_today: Bugünkü eşsiz kullanımlar
-      accounts_week: Bu haftaki eşsiz kullanımlar
-      breakdown: Bugünkü kullanımın kaynağa göre dağılımı
-      last_active: Son etkinlik
-      most_popular: En popüler
-      most_recent: En yeni
-      name: Etiket
       review: Durumu gözden geçir
-      reviewed: Gözden geçirildi
-      title: Etiketler
-      trending_right_now: Şu anda trend
-      unique_uses_today: bugün %{count} gönderi
-      unreviewed: Gözden geçirilmedi
       updated_msg: Etiket ayarları başarıyla güncellendi
     title: Yönetim
+    trends:
+      allow: İzin ver
+      approved: Onaylandı
+      disallow: İzin verme
+      links:
+        allow: Bağlantıya izin ver
+        allow_provider: Yayıncıya izin ver
+        description_html: Bu bağlantılar şu anda sunucunuzun gönderilerini gördüğü hesaplarca bolca paylaşılıyor. Kullanıcılarınızın dünyada neler olduğunu görmesine yardımcı olabilir. Yayıncıyı onaylamadığınız sürece hiçbir bağlantı herkese açık yayınlanmaz. Tekil bağlantıları onaylayabilir veya reddedebilirsiniz.
+        disallow: Bağlantıya izin verme
+        disallow_provider: Yayıncıya izin verme
+        no_link_selected: Hiçbiri seçilmediğinden hiçbir bağlantı değiştirilmedi
+        publishers:
+          no_publisher_selected: Hiçbiri seçilmediğinden hiçbir yayıncı değiştirilmedi
+        shared_by_over_week:
+          one: Geçen hafta bir kişi paylaştı
+          other: Geçen hafta %{count} kişi paylaştı
+        title: Öne çıkan bağlantılar
+        usage_comparison: Bugün %{today} kere paylaşıldı, dün %{yesterday} kere paylaşılmıştı
+      only_allowed: Sadece izin verilenler
+      pending_review: İnceleme bekliyor
+      preview_card_providers:
+        allowed: Bu yayıncının bağlantıları öne çıkabilir
+        description_html: Sunucunuzda bağlantıları sıklıkla paylaşılan alan adları var. Bağlantının alan adı onaylanmadıkça, bağlantılar öne çıkmayacaktır. Onayınız (veya reddiniz) alt alan adlarını kapsar.
+        rejected: Bu yayıncının bağlantıları öne çıkmayacak
+        title: Yayıncılar
+      rejected: Reddedildi
+      statuses:
+        allow: Gönderiye izin ver
+        allow_account: Yazara izin ver
+        description_html: Bunlar, sunucunuzca bilinen, şu an sıklıkla paylaşılan ve beğenilen gönderilerdir. Yeni ve geri dönen kullanıcılarınızın takip etmesi için daha fazla kullanıcı bulmasına yararlar. Siz yazarı onaylamadığınız ve yazar hesabının başkalarına önerilmesine izin vermediği sürece gönderileri herkese açık olarak gösterilmez. Tekil gönderileri de onaylayabilir veya reddedebilirsiniz.
+        disallow: Gönderi iznini kaldır
+        disallow_account: Yazar iznini kaldır
+        no_status_selected: Hiçbiri seçilmediğinden hiçbir öne çıkan gönderi değiştirilmedi
+        not_discoverable: Yazar keşfedilebilir olmamayı seçiyor
+        shared_by:
+          one: Bir defa paylaşıldı veya favorilendi
+          other: "%{friendly_count} defa paylaşıldı veya favorilendi"
+        title: Öne çıkan gönderiler
+      tags:
+        current_score: Mevcut puan %{score}
+        dashboard:
+          tag_accounts_measure: tekil kullanımlar
+          tag_languages_dimension: En gözde diller
+          tag_servers_dimension: En gözde sunucular
+          tag_servers_measure: farklı sunucular
+          tag_uses_measure: toplam kullanım
+        description_html: Bunlar sunucunuzun gördüğü gönderilerde sıklıkla gözüken etiketlerdir. Kullanıcılarınızın, şu an en çok ne hakkında konuşulduğunu görmesine yardımcı olurlar. Onaylamadığınız sürece etiketler herkese açık görünmez.
+        listable: Önerilebilir
+        no_tag_selected: Hiçbiri seçilmediğinden hiçbir etiket değiştirilmedi
+        not_listable: Önerilmeyecek
+        not_trendable: Öne çıkanlar altında görünmeyecek
+        not_usable: Kullanılamaz
+        peaked_on_and_decaying: "%{date} tarihinde zirvedeydi, şimdi azalıyor"
+        title: Öne çıkan etiketler
+        trendable: Öne çıkanlar altında görünebilir
+        trending_rank: 'Öne çıkanlar #%{rank}'
+        usable: Kullanılabilir
+        usage_comparison: Bugün %{today} kere kullanıldı, dün %{yesterday} kere kullanılmıştı
+        used_by_over_week:
+          one: Geçen hafta bir kişi tarafından kullanıldı
+          other: Geçen hafta %{count} kişi tarafından kullanıldı
+      title: Öne çıkanlar
+      trending: Öne çıkanlar
     warning_presets:
       add_new: Yeni ekle
       delete: Sil
       edit_preset: Uyarı ön-ayarını düzenle
       empty: Henüz önceden ayarlanmış bir uyarı tanımlanmadı.
       title: Uyarı ön-ayarlarını yönet
+    webhooks:
+      add_new: Uç nokta ekle
+      delete: Sil
+      description_html: Bir <strong>web kancası</strong> Mastodon'un, uygulamanızda seçili olaylar hakkında <strong>gerçek zamanlı bildirimler</strong> göndermesini sağlar, böylece uygulamanız <strong>otomatik olarak tepkileri tetikleyebilir</strong>.
+      disable: Devre dışı bırak
+      disabled: Devre dışı
+      edit: Uç nokta düzenle
+      empty: Henüz yapılandırılmış bir web kancanız yok.
+      enable: Etkinleştir
+      enabled: Etkin
+      enabled_events:
+        one: 1 aktif etkinlik
+        other: "%{count} aktif etkinlik"
+      events: Olaylar
+      new: Yeni web kancası
+      rotate_secret: Gizi döndür
+      secret: Gizi imzalama
+      status: Durum
+      title: Web kancaları
+      webhook: Web kancası
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: gönderilerini silme
+        disable: hesaplarını dondurma
+        mark_statuses_as_sensitive: gönderilerini hassas olarak işaretleme
+        none: uyarı
+        sensitive: hesaplarını hassas olarak işaretleme
+        silence: hesaplarını kısıtlama
+        suspend: hesaplarını askıya alma
+      body: "%{target}, %{date} tarihinde %{action_taken_by} tarafından alınan %{type} yönetim kararına itiraz etti. Şunu yazdılar:"
+      next_steps: Yönetim kararını geri almak için itirazı onaylayabilir veya itirazı görmezden gelebilirsiniz.
+      subject: "%{username}, %{instance} hakkındaki bir yönetim kararına itiraz ediyor"
     new_pending_account:
       body: Yeni hesabın detayları aşağıdadır. Bu başvuruyu onaylayabilir ya da reddedebilirsiniz.
       subject: "%{instance} üzerinde gözden geçirmek için yeni hesap (%{username})"
@@ -731,9 +893,17 @@ tr:
       body: "%{reporter}, %{target} kişisini bildirdi"
       body_remote: "%{domain} alan adından birisi %{target} kişisini bildirdi"
       subject: "%{instance} için yeni şikayet (#%{id})"
-    new_trending_tag:
-      body: "#%{name} etiketi bugün trend, ancak daha önce incelenmedi. Siz izin vermediğiniz sürece herkese açık olarak gösterilmeyecek, ya da bir daha asla hakkında bir şey duymamak için olduğu şekliyle formu kaydedin."
-      subject: "%{instance} üzerinde gözden geçirmek için yeni etiket (#%{name})"
+    new_trends:
+      body: 'Aşağıdaki öğeler herkese açık olarak gösterilmeden önce gözden geçirilmelidir:'
+      new_trending_links:
+        title: Öne çıkan bağlantılar
+      new_trending_statuses:
+        title: Öne çıkan gönderiler
+      new_trending_tags:
+        no_approved_tags: Şu anda onaylanmış öne çıkan etiket yok.
+        requirements: 'Aşağıdaki adaylardan herhangi biri, şu anda %{lowest_tag_score} skoruna sahip "%{lowest_tag_name}" olan #%{rank} onaylanmış öne çıkan etiketi geçebilir.'
+        title: Öne çıkan etiketler
+      subject: "%{instance}, inceleme bekleyen yeni öne çıkan öğelere sahip"
   aliases:
     add_new: Takma ad oluştur
     created_msg: Yeni takma ad başarıyla oluşturuldu. Artık eski hesaptan taşınmayı başlatabilirsiniz.
@@ -752,7 +922,7 @@ tr:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Herkes katkıda bulunabilir.
     sensitive_content: Hassas içerik
-    toot_layout: Toot yerleşimi
+    toot_layout: Gönderi düzeni
   application_mailer:
     notification_preferences: E-posta tercihlerini değiştir
     salutation: "%{name},"
@@ -763,16 +933,13 @@ tr:
   applications:
     created: Uygulama başarıyla oluşturuldu
     destroyed: Uygulama başarıyla silindi
-    invalid_url: Verilen URL geçerli değil
     regenerate_token: Erişim belirtecini yeniden oluştur
     token_regenerated: Erişim belirteci başarıyla oluşturuldu
     warning: Bu verilere çok dikkat edin. Asla kimseyle paylaşmayın!
     your_token: Erişim belirteciniz
   auth:
-    apply_for_account: Davet et
-    change_password: Şifre
-    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">Sunucu kurallarını</a> ve <a href="%{terms_path}" target="_blank">hizmet şartlarını</a> kabul ediyorum
-    checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">Hizmet şartlarını</a> kabul ediyorum
+    apply_for_account: Bir hesap talep et
+    change_password: Parola
     delete_account: Hesabı sil
     delete_account_html: Hesabını silmek istersen, <a href="%{path}">buradan devam edebilirsin</a>. Onay istenir.
     description:
@@ -781,36 +948,47 @@ tr:
       suffix: Bir hesapla, kişileri takip edebilir, güncellemeler gönderebilir, herhangi bir Mastodon sunucusundan kullanıcılarla mesaj alışverişinde bulunabilir ve daha birçok şey yapabilirsin!
     didnt_get_confirmation: Doğrulama talimatlarını almadınız mı?
     dont_have_your_security_key: Güvenlik anahtarınız yok mu?
-    forgot_password: Şifrenizi mi unuttunuz?
+    forgot_password: Parolanızı mı unuttunuz?
     invalid_reset_password_token: Parola sıfırlama belirteci geçersiz veya süresi dolmuş. Lütfen yeni bir tane talep edin.
     link_to_otp: Telefonunuzdan iki adımlı bir kod veya bir kurtarma kodu girin
     link_to_webauth: Güvenlik anahtarı cihazınızı kullanın
+    log_in_with: Şununla giriş yap
     login: Oturum aç
     logout: Oturumu kapat
     migrate_account: Farklı bir hesaba taşıyın
     migrate_account_html: Bu hesabı başka bir hesaba yönlendirmek istiyorsan, <a href="%{path}">buradan yapılandırabilirsin</a>.
     or_log_in_with: 'Veya şununla oturum açın:'
+    privacy_policy_agreement_html: <a href="%{privacy_policy_path}" target="_blank">Gizlilik politikasını</a> okudum ve kabul ettim
     providers:
       cas: CAS
       saml: SAML
     register: Kaydol
     registration_closed: "%{instance} yeni üyeler kabul etmemektedir"
     resend_confirmation: Onaylama talimatlarını tekrar gönder
-    reset_password: Şifreyi sıfırla
+    reset_password: Parolayı sıfırla
+    rules:
+      preamble: Bunlar, %{domain} moderatörleri tarafından ayarlanmış ve uygulanmıştır.
+      title: Bazı temel kurallar.
     security: Güvenlik
-    set_new_password: Yeni şifre belirle
+    set_new_password: Yeni parola belirle
     setup:
       email_below_hint_html: Eğer aşağıdaki e-posta adresi yanlışsa, onu burada değiştirebilir ve yeni bir doğrulama e-postası alabilirsiniz.
       email_settings_hint_html: Onaylama e-postası %{email} adresine gönderildi. Eğer bu e-posta adresi doğru değilse, hesap ayarlarından değiştirebilirsiniz.
       title: Kurulum
+    sign_in:
+      preamble_html: "<strong>%{domain}</strong> kimlik bilgilerinizi kullanarak giriş yapın. Eğer hesabınız başka bir sunucuda barındırılıyorsa, burada giriş yapamazsınız."
+      title: "%{domain} giriş yapın"
+    sign_up:
+      preamble: Bu Mastodon sunucusu üzerinden bir hesap ile ağdaki herhangi bir kişiyi, hesabı hangi sunucuda saklanırsa saklansın, takip edebilirsiniz.
+      title: "%{domain} için kurulumunuzu yapalım."
     status:
       account_status: Hesap durumu
       confirming: E-posta doğrulamasının tamamlanması bekleniyor.
       functional: Hesabınız tamamen kullanıma hazır.
       pending: Başvurunuz personelimiz tarafından gözden geçirilmeyi beklemektedir. Bu biraz zaman alabilir. Başvurunuz onaylanırsa bir e-posta alacaksınız.
       redirecting_to: Hesabınız aktif değil çünkü şu anda %{acct} adresine yönlendirilmektedir.
+      view_strikes: Hesabınıza yönelik eski eylemleri görüntüleyin
     too_fast: Form çok hızlı gönderildi, tekrar deneyin.
-    trouble_logging_in: Oturum açarken sorun mu yaşıyorsunuz?
     use_security_key: Güvenlik anahtarını kullan
   authorize_follow:
     already_following: Bu hesabı zaten takip ediyorsunuz
@@ -827,8 +1005,8 @@ tr:
   challenge:
     confirm: Devam et
     hint_html: "<strong>İpucu:</strong> Önümüzdeki saat boyunca sana parolanı sormayacağız."
-    invalid_password: Geçersiz şifre
-    prompt: Devam etmek için şifreyi doğrulayın
+    invalid_password: Geçersiz parola
+    prompt: Devam etmek için parolanızı doğrulayın
   crypto:
     errors:
       invalid_key: geçerli bir Ed25519 veya Curve25519 anahtarı değil
@@ -852,7 +1030,7 @@ tr:
       x_months: "%{count}ay"
       x_seconds: "%{count}sn"
   deletes:
-    challenge_not_passed: Girdiğiniz bilgi doğru değildi
+    challenge_not_passed: Girdiğiniz bilgi hatalı
     confirm_password: Kimliğinizi doğrulamak için mevcut parolanızı girin
     confirm_username: Prosedürü doğrulamak için kullanıcı adınızı girin
     proceed: Hesabı sil
@@ -868,10 +1046,36 @@ tr:
       more_details_html: Daha fazla ayrıntı için, <a href="%{terms_path}">gizlilik politikası</a>na göz atın.
       username_available: Kullanıcı adınız tekrar kullanılabilir olacaktır
       username_unavailable: Kullanıcı adınız kullanılamaz kalacaktır
-  directories:
-    directory: Profil Dizini
-    explanation: Kullanıcıları ilgi alanlarına göre keşfedin
-    explore_mastodon: "%{title} sunucusunu keşfet"
+  disputes:
+    strikes:
+      action_taken: Yapılan işlem
+      appeal: İtiraz
+      appeal_approved: Eyleme başarılı bir şekilde itiraz edildi ve artık geçerli değil
+      appeal_rejected: İtiraz reddedildi
+      appeal_submitted_at: İtiraz gönderildi
+      appealed_msg: İtiraz gönderildi. Kabul edilirse bilgilendirileceksiniz.
+      appeals:
+        submit: İtirazı gönder
+      approve_appeal: İtirazı kabul et
+      associated_report: İlişkili rapor
+      created_at: Tarih
+      description_html: Bunlar hesabınıza yönelik eylemler ve %{instance} yönetimi tarafından size gönderilen uyarılardır.
+      recipient: Kime
+      reject_appeal: İtirazı reddet
+      status: 'Gönderi #%{id}'
+      status_removed: Gönderi zaten sistemden kaldırıldı
+      title: "%{date} tarihli %{action}"
+      title_actions:
+        delete_statuses: Gönderi kaldırma
+        disable: Hesabın dondurulması
+        mark_statuses_as_sensitive: Gönderileri hassas olarak işaretleme
+        none: Uyarı
+        sensitive: Hesabı hassas olarak işaretleme
+        silence: Hesabın kısıtlanması
+        suspend: Hesabın askıya alınması
+      your_appeal_approved: İtirazınız onaylandı
+      your_appeal_pending: Bir itiraz gönderdiniz
+      your_appeal_rejected: İtirazınız reddedildi
   domain_validator:
     invalid_domain: geçerli bir alan adı değil
   errors:
@@ -896,7 +1100,7 @@ tr:
     archive_takeout:
       date: Tarih
       download: Arşivinizi indirin
-      hint_html: "<strong>Tootlarınızın ve yüklediğiniz ortamların</strong> bir arşivini talep edebilirsiniz. Dışa aktarılan veriler, herhangi bir uyumlu yazılım tarafından okunabilen ActivityPub formatında olacaktır. Her 7 günde bir arşiv talep edebilirsiniz."
+      hint_html: "<strong>Gönderileriniz ve yüklediğiniz medya dosyalarının</strong> bir arşivini talep edebilirsiniz. Dışa aktarılan veriler, herhangi bir uyumlu yazılım tarafından okunabilen ActivityPub biçiminde olacaktır. Her 7 günde bir arşiv talep edebilirsiniz."
       in_progress: Arşivinizi derliyoruz...
       request: Arşivinizi isteyin
       size: Boyut
@@ -920,56 +1124,69 @@ tr:
       public: Genel zaman çizelgesi
       thread: Sohbetler
     edit:
+      add_keyword: Anahtar sözcük ekle
+      keywords: Anahtar Sözcükler
+      statuses: Tekil gönderiler
+      statuses_hint_html: Bu filtre, aşağıdaki anahtar kelimelerle eşleşip eşleşmediklerinden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. <a href="%{path}">Filtredeki gönderileri inceleyin veya kaldırın</a>.
       title: Filtreyi düzenle
     errors:
+      deprecated_api_multiple_keywords: Bu parametreler, birden fazla filtre anahtar sözcüğü için geçerli olduğundan dolayı bu uygulama içerisinden değiştirilemezler. Daha yeni bir uygulama veya web arayüzünü kullanın.
       invalid_context: Sıfır ya da geçersiz içerik sağlandı
-      invalid_irreversible: Geri dönüşümsüz filtreleme sadece anasayfa ya da bildirim bağlamında çalışır
     index:
+      contexts: "%{contexts} içindeki filtreler"
       delete: Sil
       empty: Hiç filtreniz yok.
+      expires_in: "%{distance} sürede sona eriyor"
+      expires_on: "%{date} tarihinde sona eriyor"
+      keywords:
+        one: "%{count} anahtar sözcük"
+        other: "%{count} anahtar sözcük"
+      statuses:
+        one: "%{count} gönderi"
+        other: "%{count} gönderi"
+      statuses_long:
+        one: "%{count} tekil gönderi gizli"
+        other: "%{count} tekil gönderi gizli"
       title: Filtreler
     new:
+      save: Yeni filtre kaydet
       title: Yeni filtre ekle
+    statuses:
+      back_to_filter: Filtreye dön
+      batch:
+        remove: Filtreden kaldır
+      index:
+        hint: Bu filtre diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu filtreye daha fazla gönderi ekleyebilirsiniz.
+        title: Filtrelenmiş gönderiler
   footer:
-    developers: Geliştiriciler
-    more: Daha Fazla…
-    resources: Kaynaklar
     trending_now: Şu an gündemde
   generic:
     all: Tümü
+    all_items_on_page_selected_html:
+      one: Bu sayfadaki <strong>%{count}</strong> öğe seçilmiş.
+      other: Bu sayfadaki tüm <strong>%{count}</strong> öğe seçilmiş.
+    all_matching_items_selected_html:
+      one: Aramanızla eşleşen <strong>%{count}</strong> öğe seçilmiş.
+      other: Aramanızla eşleşen tüm <strong>%{count}</strong> öğe seçilmiş.
     changes_saved_msg: Değişiklikler başarıyla kaydedildi!
     copy: Kopyala
     delete: Sil
-    no_batch_actions_available: Bu sayfada toplu işlem yok
+    deselect: Hiçbirini seçme
+    none: Hiçbiri
     order_by: Sıralama ölçütü
     save_changes: Değişiklikleri kaydet
+    select_all_matching_items:
+      one: Aramanızla eşleşen %{count} öğeyi seç.
+      other: Aramanızla eşleşen tüm %{count} öğeyi seç.
+    today: bugün
     validation_errors:
       one: Bir şeyler ters gitti! Lütfen aşağıdaki hatayı gözden geçiriniz
       other: Bir şeyler ters gitti! Lütfen aşağıdaki %{count} hatayı gözden geçiriniz
   html_validator:
     invalid_markup: 'geçersiz HTML markup içermektedir: %{error}'
-  identity_proofs:
-    active: Etkin
-    authorize: Evet, izin ver
-    authorize_connection_prompt: Bu kriptolu bağlantıyı yetkilendir?
-    errors:
-      failed: Kriptolu bağlantı başarısız oldu. Lütfen %{provider} üzerinden tekrar deneyin.
-      keybase:
-        invalid_token: Keybase belirteçleri imza hash'leridir ve 66 hex karakter içermelidir
-        verification_failed: Keybase, bu belirteci, %{kb_username} Keybase kullanıcısının imzası olarak tanımıyor. Lütfen Keybase'den tekrar deneyin.
-      wrong_user: "%{current} olarak giriş yaparken %{proving} için bir kanıt oluşturulamıyor. %{proving} olarak giriş yapın ve tekrar deneyin."
-    explanation_html: Burada, Keybase profili gibi diğer kimliklerinizi şifreli olarak bağlayabilirsiniz. Bu, diğer kişilerin size şifreli mesajlar göndermesini ve gönderdiğiniz içeriğe güvenmelerini sağlar.
-    i_am_html: Ben %{service} üzerinde %{username}.
-    identity: Kimlik
-    inactive: Pasif
-    publicize_checkbox: 'Ve bunu tootla:'
-    publicize_toot: 'İspatlandı! Ben %{service} üzerinde %{username}: %{url}'
-    remove: Hesaptan kanıtı kaldır
-    removed: Kanıt hesaptan başarıyla kaldırıldı
-    status: Doğrulama durumu
-    view_proof: Kanıtı görüntüle
   imports:
     errors:
+      invalid_csv_file: 'Geçersiz CSV dosyası. Hata: %{error}'
       over_rows_processing_limit: "%{count} satırdan fazlasını içeriyor"
     modes:
       merge: Birleştir
@@ -985,7 +1202,6 @@ tr:
       following: Takip edilenler listesi
       muting: Susturulanlar listesi
     upload: Yükle
-  in_memoriam_html: Hatırada.
   invites:
     delete: Devre dışı bırak
     expired: Süresi dolmuş
@@ -1064,22 +1280,18 @@ tr:
     carry_blocks_over_text: Bu kullanıcı engellediğiniz %{acct} adresinden taşındı.
     carry_mutes_over_text: Bu kullanıcı sessize aldığınız %{acct} adresinden taşındı.
     copy_account_note_text: 'Bu kullanıcı %{acct} adresinden taşındı, işte onlarla ilgili önceki notlarınız:'
+  navigation:
+    toggle_menu: Menüyü aç/kapa
   notification_mailer:
-    digest:
-      action: Tüm bildirimleri görüntüle
-      body: Son ziyaretiniz olan %{since}'den beri'da kaçırdığınız şeylerin özeti
-      mention: "%{name} senden bahsetti:"
-      new_followers_summary:
-        one: Ayrıca, uzaktayken yeni bir takipçi kazandınız! Yaşasın!
-        other: Ayrıca, uzaktayken %{count} yeni takipçi kazandınız! İnanılmaz!
-      subject:
-        one: "Son ziyaretinizden bu yana 1 yeni bildirim \U0001F418"
-        other: "Son ziyaretinizden bu yana %{count} yeni bildirim \U0001F418"
-      title: Senin yokluğunda...
+    admin:
+      report:
+        subject: "%{name} bir bildirim gönderdi"
+      sign_up:
+        subject: "%{name} kaydoldu"
     favourite:
       body: "%{name} durumunu beğendi:"
       subject: "%{name} durumunu beğendi"
-      title: Yeni beğeni
+      title: Yeni Favori
     follow:
       body: "%{name} artık seni takip ediyor!"
       subject: "%{name} artık seni takip ediyor"
@@ -1102,6 +1314,8 @@ tr:
       title: Yeni boost
     status:
       subject: "%{name} az önce gönderdi"
+    update:
+      subject: "%{name} bir gönderiyi düzenledi"
   notifications:
     email_events: E-posta bildirimi gönderilecek etkinlikler
     email_events_hint: 'Bildirim almak istediğiniz olayları seçin:'
@@ -1114,7 +1328,7 @@ tr:
           billion: Mr
           million: Mn
           quadrillion: Kn
-          thousand: Bn
+          thousand: Bin
           trillion: Tn
   otp_authentication:
     code_hint: Onaylamak için authenticator uygulamanız tarafından oluşturulan kodu girin
@@ -1145,6 +1359,8 @@ tr:
     other: Diğer
     posting_defaults: Gönderi varsayılanları
     public_timelines: Genel zaman çizelgeleri
+  privacy_policy:
+    title: Gizlilik Politikası
   reactions:
     errors:
       limit_reached: Farklı reaksiyonların sınırına ulaşıldı
@@ -1167,32 +1383,25 @@ tr:
     remove_selected_follows: Seçili kullanıcıları takip etmeyi bırak
     status: Hesap durumu
   remote_follow:
-    acct: İşlem yapmak istediğiniz kullaniciadi@alanadini girin
     missing_resource: Hesabınız için gerekli yönlendirme URL'si bulunamadı
-    no_account_html: Hesabınız yok mu? <a href='%{sign_up_path}' target='_blank'>Buradan kaydolabilirsiniz</a>
-    proceed: Takip etmek için devam edin
-    prompt: Bu kullanıcıyı takip etmek istediğinize emin misiniz?
-    reason_html: "<strong>Bu adım neden gerekli?</strong><code>%{instance}</code> kayıtlı olduğunuz sunucu olmayabilir, bu yüzden önce sizi kendi sunucunuza yönlendirmemiz gerekmektedir."
-  remote_interaction:
-    favourite:
-      proceed: Beğenmek için devam edin
-      prompt: 'Bu tootu beğenmek istiyorsunuz:'
-    reblog:
-      proceed: Boostlamak için devam edin
-      prompt: 'Bu tootu boostlamak istiyorsunuz:'
-    reply:
-      proceed: Yanıtlamak için devam edin
-      prompt: 'Bu tootu yanıtlamak istiyorsunuz:'
+  reports:
+    errors:
+      invalid_rules: geçerli kurallara işaret etmez
+  rss:
+    content_warning: 'İçerik uyarısı:'
+    descriptions:
+      account: "@%{acct} hesabından herkese açık gönderiler"
+      tag: "#%{hashtag} etiketli herkese açık gönderiler"
   scheduled_statuses:
-    over_daily_limit: O gün için %{limit} zamanlanmış toot sınırını aştınız
-    over_total_limit: "%{limit} zamanlanmış toot sınırını aştınız"
+    over_daily_limit: Bugün için %{limit} zamanlanmış gönderi sınırını aştınız
+    over_total_limit: "%{limit} zamanlanmış gönderi sınırını aştınız"
     too_soon: Programlanan tarih bugünden ileri bir tarihte olmalıdır
   sessions:
     activity: Son etkinlik
     browser: Tarayıcı
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -1215,7 +1424,7 @@ tr:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1241,7 +1450,6 @@ tr:
     edit_profile: Profili düzenle
     export: Veriyi dışa aktar
     featured_tags: Öne çıkan etiketler
-    identity_proofs: Kimlik kanıtları
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
@@ -1250,6 +1458,7 @@ tr:
     profile: Profil
     relationships: Takip edilenler ve takipçiler
     statuses_cleanup: Otomatik gönderi silme
+    strikes: Moderasyon eylemleri
     two_factor_authentication: İki adımlı doğrulama
     webauthn_authentication: Güvenlik anahtarları
   statuses:
@@ -1266,18 +1475,19 @@ tr:
         other: "%{count} video"
     boosted_from_html: "%{acct_link} kişisinden boostladı"
     content_warning: 'İçerik uyarısı: %{warning}'
+    default_language: Arayüz diliyle aynı
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket içeriyordu: %{tags}'
       other: 'izin verilmeyen hashtag''leri içeriyordu: %{tags}'
+    edited_at_html: "%{date} tarihinde düzenlendi"
     errors:
       in_reply_not_found: Yanıtlamaya çalıştığınız durum yok gibi görünüyor.
-    language_detection: Dili otomatik olarak algıla
     open_in_web: Web sayfasında aç
     over_character_limit: "%{max} karakter limiti aşıldı"
     pin_errors:
-      limit: Hali hazırda maksimum sayıda tootu sabitlediniz
-      ownership: Başkasının tootu sabitlenemez
-      private: Halka açık olmayan toot sabitlenemez
+      direct: Sadece değinilen kullanıcıların görebileceği gönderiler üstte tutulamaz
+      limit: Halihazırda maksimum sayıda gönderi sabitlediniz
+      ownership: Başkasının gönderisi sabitlenemez
       reblog: Bir boost sabitlenemez
     poll:
       total_people:
@@ -1306,7 +1516,7 @@ tr:
     enabled_hint: Belirli bir zaman eşiğine ulaşan eski gönderilerinizi, aşağıdaki istisnalara uymadıkları sürece otomatik olarak siler
     exceptions: İstisnalar
     explanation: Gönderi silme maliyetli bir iş olduğu için, sunucu çok yoğun olmadığında yavaş yavaş yapılmaktadır. Bu nedenle, gönderilerinizin zaman eşiği geldiğinde silinmesi belirli bir süre alabilir.
-    ignore_favs: Beğenileri yoksay
+    ignore_favs: Favorileri yoksay
     ignore_reblogs: Teşvikleri yoksay
     interaction_exceptions: Etkileşimlere dayalı istisnalar
     interaction_exceptions_explanation: Bir kere değerlendirmeye alındıktan sonra, belirtilen beğeni veya teşvik eşiğinin altında düşünce gönderilerin silinmesinin bir güvencesi yok.
@@ -1328,6 +1538,7 @@ tr:
       '2629746': 1 ay
       '31556952': 1 yıl
       '5259492': 2 ay
+      '604800': 1 hafta
       '63113904': 2 yıl
       '7889238': 3 ay
     min_age_label: Zaman eşiği
@@ -1336,94 +1547,14 @@ tr:
     min_reblogs: Şundan daha fazla teşvik edilen gönderileri sakla
     min_reblogs_hint: Bu belirtilenden daha fazla teşvik edilen gönderilerinizin herhangi birini silmez. Teşvik sayısından bağımsız olarak gönderilerin silinmesi için burayı boş bırakın
   stream_entries:
-    pinned: Sabitlenmiş toot
+    pinned: Sabitlenmiş gönderi
     reblogged: boostladı
     sensitive_content: Hassas içerik
+  strikes:
+    errors:
+      too_late: Bu eyleme itiraz etmek için çok geç
   tags:
     does_not_match_previous_name: önceki adla eşleşmiyor
-  terms:
-    body_html: |
-      <h2>Gizlilik Politikası</h2>
-      <h3 id="collect">Hangi bilgileri topluyoruz?</h3>
-
-      <ul>
-      <li><em>Temel hesap bilgileri</em>: Bu sunucuya kaydolursanız, bir kullanıcı adı, bir e-posta adresi ve bir parola girmeniz istenebilir. Ayrıca, ekran adı ve biyografi gibi ek profil bilgileri girebilir ve bir profil fotoğrafı ve başlık resmi yükleyebilirsiniz. Kullanıcı adı, ekran ad, biyografi, profil fotoğrafı ve başlık resmi her zaman herkese açık olarak listelenir.</li>
-      <li><em>Gönderiler, takip etmeler ve diğer herkese açık bilgiler</em>: Takip ettiğiniz kişilerin listesi herkese açık olarak listelenir, sizi takip edenler için de aynısı geçerlidir. Bir mesaj gönderdiğinizde, mesajı gönderdiğiniz uygulamanın yanı sıra tarih ve saati de saklanır. Mesajlar, resim ve video gibi medya ekleri içerebilir. Herkese açık ve listelenmemiş gönderiler halka açıktır. Profilinizde bir gönderiyi yayınladığınızda, bu da herkese açık olarak mevcut bir bilgidir. Gönderileriniz takipçilerinize iletilir, bazı durumlarda farklı sunuculara gönderilir ve kopyalar orada saklanır. Gönderilerinizi sildiğinizde, bu da takipçilerinize iletilir. Başka bir gönderiyi yeniden bloglama veya favorileme eylemi her zaman halka açıktır.</li>
-      <li><em>Doğrudan ve takipçilere özel gönderiler</em>: Tüm gönderiler sunucuda saklanır ve işlenir. Takipçilere özel gönderiler, takipçilerinize ve içinde bahsedilen kullanıcılara, doğrudan gönderiler ise yalnızca içinde bahsedilen kullanıcılara iletilir. Bu, bazı durumlarda farklı sunuculara iletildiği ve kopyaların orada saklandığı anlamına gelir. Bu gönderilere erişimi yalnızca yetkili kişilerle sınırlamak için iyi niyetle çalışıyoruz, ancak diğer sunucular bunu yapamayabilir. Bu nedenle, takipçilerinizin ait olduğu sunucuları incelemek önemlidir. Ayarlarda yeni izleyicileri manuel olarak onaylama ve reddetme seçeneğini değiştirebilirsiniz. <em>Sunucuyu ve alıcı sunucuyu işleten kişilerin bu mesajları görüntüleyebileceğini unutmayın</em>, ve alıcılar ekran görüntüsü alabilir, kopyalayabilir veya başka bir şekilde yeniden paylaşabilir. <em>Mastodon üzerinden herhangi bir tehlikeli bilgi paylaşmayın.</em></li>
-      <li><em>IP'ler ve diğer meta veriler</em>: Oturum açarken, giriş yaptığınız IP adresini ve tarayıcı uygulamanızın adını kaydederiz. Giriş yapılan tüm oturumlar, incelemek ve iptal etmek için ayarlarda mevcuttur. En son kullanılan IP adresi 12 aya kadar saklanır. Sunucumuza gelen her isteğin IP adresini içeren sunucu loglarını da saklayabiliriz.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">Bilgilerinizi ne için kullanıyoruz?</h3>
-
-      <p>Sizden topladığımız bilgilerin herhangi bir kısmı aşağıdaki şekillerde kullanılabilir:</p>
-
-      <ul>
-      <li>Mastodon'un ana işlevselliğini sağlamak için. Yalnızca oturum açtığınızda diğer kişilerin içeriğiyle etkileşime girebilir ve kendi içeriğinizi gönderebilirsiniz. Örneğin, başkalarının kombine gönderilerini kendi kişiselleştirilmiş ana sayfanızdaki zaman çizelgenizde görüntülemek için onları takip edebilirsiniz.</li>
-      <li>Topluluğun denetlenmesine yardımcı olmak için, örneğin, yasaktan kaçınma veya diğer ihlalleri belirlemek için IP adresinizin diğer bilinen adreslerle karşılaştırılması.</li>
-      <li>Verdiğiniz e-posta adresi, size bilgi, içeriğinizle etkileşimde bulunan diğer kişilerle ilgili bildirimler veya mesaj göndermek, sorgulara ve/veya diğer istek ve sorulara cevap vermek için kullanılabilir.</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">Bilgilerinizi nasıl koruyoruz?</h3>
-
-      <p>Kişisel bilgilerinizi girerken, gönderirken veya onlara erişirken kişisel bilgilerinizin güvenliğini sağlamak için çeşitli güvenlik önlemleri uyguluyoruz. Diğer şeylerin yanı sıra, tarayıcı oturumunuz ve uygulamalarınız ile API arasındaki trafik SSL ile güvence altına alınır ve şifreniz sağlam bir tek yönlü bir algoritma kullanılarak şifrelenir. Hesabınıza daha güvenli bir şekilde erişebilmek için iki adımlı kimlik doğrulamasını etkinleştirebilirsiniz.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">Veri saklama politikamız nedir?</h3>
-
-      <p>Şunları yapmak için iyi niyetli bir şekilde çalışacağız:</p>
-
-      <ul>
-      <li>Bu sunucuya yapılan tüm isteklerin IP adresini içeren sunucu loglarını, bu tür logların şimdiye kadar saklandığı gibi, 90 günden fazla saklamayacağız.</li>
-      <li>Kayıtlı kullanıcılarla ilişkili IP adreslerini en fazla 12 ay boyunca saklayacağız.</li>
-      </ul>
-
-      <p>Gönderileriniz, medya ekleriniz, profil fotoğrafınız ve başlık resminiz dahil, içeriğimizin arşivini talep edebilir ve indirebilirsiniz.</p>
-
-      <p>Hesabınızı istediğiniz zaman geri alınamaz şekilde silebilirsiniz.</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">Çerez kullanıyor muyuz?</h3>
-
-      <p>Evet. Çerezler, bir sitenin veya servis sağlayıcısının Web tarayıcınız üzerinden bilgisayarınızın sabit diskine aktardığı küçük dosyalardır (eğer izin verirseniz). Bu çerezler sitenin tarayıcınızı tanımasını ve kayıtlı bir hesabınız varsa, kayıtlı hesabınızla ilişkilendirmesini sağlar.</p>
-
-      <p>Sonraki ziyaretlerde tercihlerinizi anlamak ve kaydetmek için çerezleri kullanıyoruz.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">Herhangi bir bilgiyi dış taraflara açıklıyor muyuz?</h3>
-
-      <p>Kişisel olarak tanımlanabilir bilgilerinizi dış taraflara satmıyor, takas etmiyor veya devretmiyoruz. Bu, taraflarımız bu bilgileri gizli tutmayı kabul ettiği sürece sitemizi işletmemize, işimizi yürütmemize veya size hizmet etmemize yardımcı olan güvenilir üçüncü tarafları içermemektedir. Ayrıca, yayınlanmanın yasalara uymayı, site politikalarımızı yürürlüğe koymayı ya da kendimizin ya da diğerlerinin haklarını, mülklerini ya da güvenliğini korumamızı sağladığına inandığımızda bilgilerinizi açıklayabiliriz.</p>
-
-      <p>Herkese açık içeriğiniz ağdaki diğer sunucular tarafından indirilebilir. Bu takipçiler veya alıcılar bundan farklı bir sunucuda bulundukları sürece, herkese açık ve takipçilere özel gönderileriniz, takipçilerinizin bulunduğu sunuculara, ve doğrudan mesajlar, alıcıların sunucularına iletilir.</p>
-
-      <p>Hesabınızı kullanması için bir uygulamayı yetkilendirdiğinizde, onayladığınız izinlerin kapsamına bağlı olarak, herkese açık profil bilgilerinize, takip ettiklerinizin listesine, takipçilerinize, listelerinize, tüm gönderilerinize ve favorilerinize erişebilir. Uygulamalar e-posta adresinize veya parolanıza asla erişemez.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">Sitenin çocuklar tarafından kullanımı</h3>
-
-      <p>Bu sunucu AB’de veya AEA’da ise: Site, ürün ve hizmetlerimizin tamamı en az 16 yaşında olan kişilere yöneliktir. Eğer 16 yaşın altındaysanız, GDPR yükümlülükleri gereği (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) bu siteyi kullanmayın.</p>
-
-      <p>Bu sunucu ABD’de ise: Site, ürün ve hizmetlerimizin tamamı en az 13 yaşında olan kişilere yöneliktir. Eğer 13 yaşın altındaysanız, COPPA yükümlülükleri gereği (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) bu siteyi kullanmayın.</p>
-
-      <p>Bu sunucu başka bir ülkede ise yasal gereklilikler farklı olabilir.</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">Gizlilik Politikamızdaki Değişiklikler</h3>
-
-      <p>Gizlilik politikamızı değiştirmeye karar verirsek, bu değişiklikleri bu sayfada yayınlayacağız.</p>
-
-      <p>Bu belge CC-BY-SA altında lisanslanmıştır. En son 7 Mart 2018 tarihinde güncellenmiştir.</p>
-
-      <p><a href="https://github.com/discourse/discourse">Discourse gizlilik politikasından uyarlanmıştır</a>.</p>
-    title: "%{instance} Hizmet Şartları ve Gizlilik Politikası"
   themes:
     contrast: Mastodon (Yüksek karşıtlık)
     default: Mastodon (Karanlık)
@@ -1432,6 +1563,7 @@ tr:
     formats:
       default: "%d %b %Y %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Ekle
     disable: 2FA'yı devre dışı bırak
@@ -1448,63 +1580,73 @@ tr:
     recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. Kurtarma kodlarınızı güvenli halde tutunuz. Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
     webauthn: Güvenlik anahtarları
   user_mailer:
+    appeal_approved:
+      action: Hesabınıza gidin
+      explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız onaylandı. Hesabınız artık tekrar iyi durumda."
+      subject: "%{date} tarihli itirazınız kabul edildi"
+      title: İtiraz onaylandı
+    appeal_rejected:
+      explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız reddedildi."
+      subject: "%{date} tarihli itirazınız reddedildi"
+      title: İtiraz reddedildi
     backup_ready:
       explanation: Mastodon hesabınızın tam yedeğini istemiştiniz. Şimdi indirilebilir durumda!
       subject: Arşiviniz indirilmeye hazır
       title: Arşiv paketlemesi
-    sign_in_token:
-      details: 'İşte bu girişimin ayrıntıları:'
-      explanation: 'Tanınmayan bir IP adresinden hesabınızda oturum açma denemesi tespit ettik. Bu sizseniz, lütfen oturum açma sorgulama sayfasına aşağıdaki güvenlik kodunu girin:'
-      further_actions: 'Bu siz değildiyseniz, lütfen şifrenizi değiştirin ve hesabınızda iki faktörlü kimlik doğrulamayı etkinleştirin. Bunu buradan yapabilirsiniz:'
-      subject: Lütfen oturum açma girişimini onaylayın
-      title: Oturum açma girişimi
+    suspicious_sign_in:
+      change_password: parolanızı değiştirin
+      details: 'Oturum açma ayrıntıları şöyledir:'
+      explanation: Hesabınıza yeni bir IP adresinden oturum açıldığını farkettik.
+      further_actions_html: Eğer oturum açan siz değildiyseniz, hesabınızı güvenli tutmanız için hemen %{action} yapmanızı ve iki aşamalı yetkilendirmeyi etkinleştirmenizi öneriyoruz.
+      subject: Hesabınıza yeni bir IP adresinden erişim oldu
+      title: Yeni bir oturum açma
     warning:
+      appeal: Bir itiraz gönder
+      appeal_description: Bunun bir hata olduğunu düşünüyorsanız, %{instance} sunucusunun personeline bir itiraz gönderebilirsiniz.
+      categories:
+        spam: İstenmeyen
+        violation: İçerik aşağıdaki topluluk ilkelerini ihlal ediyor
       explanation:
-        disable: Hesabınız donmuşken, hesap verileriniz bozulmadan kalır, ancak kilidi açılıncaya kadar herhangi bir işlem gerçekleştiremezsiniz.
-        sensitive: Yüklediğiniz medya dosyalarınız ve bağlantılı medyanız hassas olarak değerlendirilecektir.
-        silence: Hesabınız sınırlı iken, yalnızca sizi takip eden kişiler bu sunucuda tootlarınızı görecek ve çeşitli halka açık listelerin dışında tutulabilirsiniz. Ancak, diğerleri hala sizi manuel olarak takip edebilir.
-        suspend: Hesabınız askıya alındı ve tüm tootlarınız ve yüklediğiniz medya dosyalarınız bu sunucudan ve takipçilerinizin bulunduğu sunuculardan geri alınamaz şekilde kaldırıldı.
-      get_in_touch: "%{instance} çalışanlarıyla iletişim kurmak için bu e-postayı yanıtlayabilirsiniz."
-      review_server_policies: Sunucu politikalarını inceleyin
-      statuses: 'Özellikle, şunun için:'
+        delete_statuses: Bazı gönderilerinizin, topluluk ilkelerimizden bir veya daha fazlasını ihlal ettiği görüldü ve daha sonra %{instance} moderatörleri tarafından kaldırıldılar.
+        disable: Artık hesabınızı kullanamazsınız, ancak profil ve diğer veri sağlam. Verinizin bir yedeğini isteyebilir, hesap ayarlarınızı değiştirebilir veya hesabınızı silebilirsiniz.
+        mark_statuses_as_sensitive: Gönderilerinizin bazıları %{instance} moderatörleri tarafından hassas olarak işaretlendi. Bu nedenle bir önizleme görüntülenmeden önce insanların gönderilerinizdeki medya dosyalarına dokunması gerekiyor. Gelecekte gönderimde bulunurken medya dosyalarını hassas olarak işaretleyebilirsiniz.
+        sensitive: Artık tüm yüklenmiş medya dosyalarınız hassas olarak işaretlenecek ve üzerine tıklanarak açılacak şekilde bir uyarının ardına gizlenecektir.
+        silence: Hesabınız sınırlı iken, yalnızca sizi takip eden kişiler bu sunucudaki gönderilenizi görecek ve çeşitli keşif özelliklerinin dışında bırakılabilirsiniz. Ancak, başkaları sizi manuel olarak hala takip edebilir.
+        suspend: Hesabınızı artık kullanamazsınız ve profiliniz ve diğer veri artık erişilebilir değil. Yaklaşık 30 gün içinde silinene kadar verinizin bir yedeğini istemek için giriş yapabilirsiniz, ancak askıdan kaçınmanızı önlemek için bazı temel veriyi saklayabiliriz.
+      reason: 'Gerekçe:'
+      statuses: 'Sözü geçen gönderiler:'
       subject:
+        delete_statuses: "%{acct} hesabınızdaki gönderiler kaldırıldı"
         disable: "%{acct} hesabınız donduruldu"
+        mark_statuses_as_sensitive: "%{acct} hesabındaki gönderiler hassas olarak işaretlendi"
         none: "%{acct} için uyarı"
-        sensitive: Hesabınızdan yayınlanan %{acct} medyanız hassas olarak işaretlendi
+        sensitive: "%{acct} hesabınızdaki gönderiler artık hassas olarak işaretlenecek"
         silence: "%{acct} hesabınız sınırlandırıldı"
         suspend: "%{acct} hesabınız askıya alındı"
       title:
+        delete_statuses: Kaldırılan gönderiler
         disable: Hesap donduruldu
+        mark_statuses_as_sensitive: Gönderiler hassas olarak işaretlendi
         none: Uyarı
-        sensitive: Medyanız hassas olarak işaretlendi
+        sensitive: Hesap hassas olarak işaretlendi
         silence: Hesap sınırlandırıldı
         suspend: Hesap askıya alındı
     welcome:
       edit_profile_action: Profil kurulumu
-      edit_profile_step: Bir avatar veya başlık yükleyerek, ekran adınızı değiştirerek ve daha fazlasını yaparak profilinizi kişiselleştirebilirsiniz. Yeni takipçileri sizi takip etmelerine izin verilmeden önce incelemek isterseniz, hesabınızı kilitleyebilirsiniz.
+      edit_profile_step: Bir profil resmi yükleyerek, ekran adınızı değiştirerek ve daha fazlasını yaparak profilinizi kişiselleştirebilirsiniz. Sizi takip etmelerine izin verilmeden önce yeni takipçileri incelemeyi tercih edebilirsiniz.
       explanation: İşte sana başlangıç için birkaç ipucu
       final_action: Gönderi yazmaya başlayın
-      final_step: 'Gönderi yazmaya başlayın! Takipçiler olmadan bile, herkese açık mesajlarınız başkaları tarafından görülebilir, örneğin yerel zaman çizelgesinde ve etiketlerde. Kendinizi #introductions etiketinde tanıtmak isteyebilirsiniz.'
+      final_step: 'Gönderi yazmaya başlayın! Takipçiler olmadan bile, herkese açık gönderileriniz başkaları tarafından görülebilir, örneğin yerel zaman tünelinde veya etiketlerde. Kendinizi #introductions etiketinde tanıtmak isteyebilirsiniz.'
       full_handle: Tanıtıcınız
       full_handle_hint: Arkadaşlarınıza, size başka bir sunucudan mesaj atabilmeleri veya sizi takip edebilmeleri için söyleyeceğiniz şey budur.
-      review_preferences_action: Tercihleri değiştirin
-      review_preferences_step: Hangi e-postaları almak veya gönderilerinizin varsayılan olarak hangi gizlilik seviyesinde olmasını istediğiniz gibi tercihlerinizi ayarladığınızdan emin olun. Hareket hastalığınız yoksa, GIF otomatik oynatmayı etkinleştirmeyi seçebilirsiniz.
       subject: Mastodon'a hoş geldiniz
-      tip_federated_timeline: Federe zaman tüneli, Mastodon ağının genel bir görüntüsüdür. Ancak yalnızca komşularınızın abone olduğu kişileri içerir, bu yüzden tamamı değildir.
-      tip_following: Sunucu yönetici(ler)ini varsayılan olarak takip edersiniz. Daha ilginç insanlar bulmak için yerel ve federe zaman çizelgelerini kontrol edin.
-      tip_local_timeline: Yerel zaman çizelgesi, %{instance} üzerindeki kişilerin genel bir görüntüsüdür. Bunlar senin en yakın komşularındır!
-      tip_mobile_webapp: Mobil tarayıcınız size ana ekranınıza Mastodon eklemenizi önerirse, push bildirimleri alabilirsiniz. Birçok yönden yerli bir uygulama gibi davranır!
-      tips: İpuçları
       title: Gemiye hoşgeldin, %{name}!
   users:
     follow_limit_reached: "%{limit} kişiden daha fazlasını takip edemezsiniz"
-    generic_access_help_html: Hesabınıza erişirken sorun mu yaşıyorsunuz? Yardım için %{email} ile iletişime geçebilirsiniz
     invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
-    invalid_sign_in_token: Geçersiz güvenlik kodu
     otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
     seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
     signed_in_as: 'Oturum açtı:'
-    suspicious_sign_in_confirmation: Bu cihazdan daha önce oturum açmamış gibi görünüyorsunuz ve bir süredir oturum açmamışsınız, bu yüzden kimliğinizi doğrulamak için e-posta adresinize bir güvenlik kodu gönderiyoruz.
   verification:
     explanation_html: '<strong>Profil meta verisindeki bağlantıların sahibi olarak kendinizi doğrulayabilirsiniz</strong>. Bunun için, link verilen web sitesi Mastodon profilinize geri bir link içermelidir. Geri link bir <code>rel="me"</code> özelliğine sahip <strong>olmalıdır</strong>. Bağlantının metin içeriği önemli değildir. İşte bir örnek:'
     verification: Doğrulama
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index b9fc1b868..b2986602d 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -1,27 +1,11 @@
 ---
 tt:
   about:
-    about_this: Хакында
-    api: API
     contact_unavailable: Юк
-    privacy_policy: Хосусыйлык сәясәте
-    unavailable_content_description:
-      domain: Сервер
-    user_count_after:
-      other: кулланучы
   accounts:
     follow: Языл
     following: Язылгансыз
-    media: Медиа
-    never_active: Беркайчан да
-    roles:
-      admin: Админ
-      bot: Бот
-      group: Törkem
-    unfollow: Язылынмау
   admin:
-    account_moderation_notes:
-      delete: Бетерү
     accounts:
       avatar: Аватар
       by_domain: Домен
@@ -40,16 +24,17 @@ tt:
         local: Җирле
         title: Урын
       moderation:
+        active: Актив
         all: Бөтенесе
       perform_full_suspension: Искә алмау
       reset: Ташлату
-      role: Рөхсәтләр
-      roles:
-        user: Кулланучы
       search: Эзләү
       sensitive: Sizmäle
       username: Кулланучы исеме
       web: Веб
+    action_logs:
+      action_types:
+        disable_2fa_user: 2FA cүндерү
     custom_emojis:
       by_domain: Домен
       copy: Күчереп алу
@@ -65,11 +50,11 @@ tt:
         severity:
           noop: Бернинди дә
           suspend: Искә алмау
-      show:
-        undo: Кире алу
     email_domain_blocks:
       delete: Бетерү
       domain: Домен
+    follow_recommendations:
+      status: Халәт
     instances:
       by_domain: Домен
       moderation:
@@ -83,11 +68,12 @@ tt:
       delete: Бетерү
       expires_in:
         '1209600': 2 атна
-        '15778476': 6 months
+        '15778476': 6 ай
         '2629746': 1 ай
         '31556952': 1 ел
         '86400': 1 көн
         '94670856': 3 ел
+      title: IP кагыйдәләре
     relays:
       delete: Бетерү
       disable: Cүндерү
@@ -102,12 +88,14 @@ tt:
         delete: Бетерү
       status: Халәт
       updated_at: Яңартылды
+    rules:
+      delete: Бетерү
     statuses:
-      batch:
-        delete: Бетерү
       deleted: Бетерелде
       media:
         title: Медиа
+    trends:
+      allow: Рөхсәт итү
     warning_presets:
       delete: Бетерү
   application_mailer:
@@ -132,9 +120,12 @@ tt:
     distance_in_words:
       about_x_hours: "%{count}сәг"
       about_x_months: "%{count}ай"
+      about_x_years: "%{count}ел"
+      almost_x_years: "%{count}ел"
       half_a_minute: Хәзер генә
       less_than_x_minutes: "%{count}м"
       less_than_x_seconds: Хәзер генә
+      over_x_years: "%{count}ел"
       x_days: "%{count}к"
       x_minutes: "%{count}м"
       x_months: "%{count}ай"
@@ -161,12 +152,11 @@ tt:
     index:
       delete: Бетерү
       title: Сөзгечләр
-  footer:
-    more: Тагы…
   generic:
     all: Бөтенесе
     copy: Күчереп алу
     delete: Бетерү
+    today: бүген
   imports:
     types:
       bookmarks: Кыстыргычлар
@@ -199,7 +189,6 @@ tt:
     browser: Браузер
     browsers:
       alipay: Аlipay
-      blackberry: Blаckberry
       chrome: Chrоme
       edge: Microsоft Edge
       electron: Electrоn
@@ -212,14 +201,12 @@ tt:
       phantom_js: PhаntomJS
       qq: QQ Brоwser
       safari: Safаri
-      uc_browser: UCBrоwser
       weibo: Weibо
     description: "%{browser} - %{platform}"
     ip: ІР
     platforms:
       adobe_air: Adobе Air
       android: Andrоid
-      chrome_os: ChromеOS
       firefox_os: Firеfox OS
       ios: iОS
       linux: Lіnux
@@ -240,15 +227,28 @@ tt:
       video:
         other: "%{count} видео"
     title: '%{name}: "%{quote}"'
+  statuses_cleanup:
+    min_age:
+      '1209600': 2 атна
+      '15778476': 6 months
+      '2629746': 1 ай
+      '31556952': 1 ел
+      '5259492': 2 ай
+      '604800': 1 атна
+      '63113904': 2 ел
+      '7889238': 3 ай
   time:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Өстәү
+    disable: 2FA cүндерү
     edit: Үзгәртү
   user_mailer:
     warning:
+      reason: 'Сәбаб:'
       title:
         none: Игътибар
   webauthn_credentials:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e5cd1624e..69ac1d68a 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1,98 +1,31 @@
 ---
 uk:
   about:
-    about_hashtag_html: Це публічні дмухи, позначені символом <strong>#%{hashtag}</strong>. Ви можете взаємодіяти з ними, якщо маєте обліковий запис будь-де у федіверсі.
-    about_mastodon_html: Mastodon — це соціальна мережа, заснована на відкритих веб-протоколах та вільному програмному забезпеченні з відкритим кодом. Вона є децентралізованою на кшталт електронної пошти.
-    about_this: Про цю інстанцію
-    active_count_after: активних
-    active_footnote: Активні користувачі місяця (MAU)
-    administered_by: 'Адміністратор:'
-    api: API
-    apps: Мобільні додатки
-    apps_platforms: Користуйтесь Mastodon на iOS, Android та інших платформах
-    browse_directory: Переглядайте каталог профілів та фільтруйте за інтересами
-    browse_local_posts: Переглядайте потік публічних постів з цього сервера
-    browse_public_posts: Переглядайте потік публічних постів на Mastodon
-    contact: Зв'язатися
+    about_mastodon_html: 'Соціальна мережа майбутнього: жодної реклами, жодного корпоративного нагляду, етичний дизайн та децентралізація! З Mastodon ваші дані під вашим контролем!'
     contact_missing: Не зазначено
     contact_unavailable: Недоступно
-    discover_users: Знайдіть цікавих користувачів
-    documentation: Документація
-    federation_hint_html: З обліковим записом на %{instance} ви зможете слідкувати за людьми на будь-якому сервері Mastodon та поза ним.
-    get_apps: Спробуйте мобільний додаток
     hosted_on: Mastodon розміщено на %{domain}
-    instance_actor_flash: "Цей обліковий запис є віртуальною особою, яка використовується для представлення самого сервера, а не певного користувача. Він використовується для потреб федерації і не повинен бути заблокований, якщо тільки ви не хочете заблокувати весь сервер, у цьому випадку ви повинні скористатися блокуванням домену. \n"
-    learn_more: Дізнатися більше
-    privacy_policy: Політика приватності
-    rules: Правила сервера
-    rules_html: 'Внизу наведено підсумок правил, яких ви повинні дотримуватися, якщо хочете мати обліковий запис на цьому сервері Mastodon:'
-    see_whats_happening: Погляньте, що відбувається
-    server_stats: 'Статистика серверу:'
-    source_code: Вихідний код
-    status_count_after:
-      few: статуса
-      many: статусів
-      one: статус
-      other: статуси
-    status_count_before: Опубліковано
-    tagline: Слідкуйте за друзями та знаходьте нових
-    terms: Правила використання
-    unavailable_content: Недоступний вміст
-    unavailable_content_description:
-      domain: Сервер
-      reason: Причина
-      rejecting_media: 'Медіа файли з цих серверів не будуть оброблятися або зберігатись, а мініатюри відображатись. Щоб побачити оригінальний файл, треба буде натиснути на посилання:'
-      rejecting_media_title: Відфільтровані медіа
-      silenced: 'Повідомлення з цих серверів будуть приховані в публічних стрічках та розмовах, також ви не отримуватимете сповіщень щодо взаємодій з їх користувачами, якщо ви їх не відстежуєте:'
-      silenced_title: Заглушені сервери
-      suspended: 'Жодна інформація з цих серверів не буде оброблена, збережена чи передана, що робить спілкування з користувачами цих серверів неможливим:'
-      suspended_title: Призупинені сервери
-    unavailable_content_html: Mastodon зазвичай дозволяє вам взаємодіяти з користувачами будь-яких серверів в Федіверсі та переглядати їх контент. Ось винятки, які було зроблено на цьому конкретному сервері.
-    user_count_after:
-      few: користувача
-      many: користувачів
-      one: користувач
-      other: користувачі
-    user_count_before: Тут живе
-    what_is_mastodon: Що таке Mastodon?
+    title: Про програму
   accounts:
-    choices_html: 'Вподобання %{name}:'
-    endorsements_hint: У веб-інтерфейсі ви можете рекомендувати людей, на яких підписані, і вони з'являться тут.
-    featured_tags_hint: Ви можете вказати хештеги, які будуть відображатись тут.
     follow: Підписатися
     followers:
-      few: Підписника
+      few: Підписники
       many: Підписників
       one: Підписник
-      other: Підписників
-    following: Підписаний(-а)
+      other: Підписники
+    following: Підписок
     instance_actor_flash: Цей обліковий запис є віртуальним персонажем, який використовується для показу самого сервера, а не будь-якого окремого користувача. Він використовується з метою федералізації і не повинен бути зупинений.
-    joined: Приєднався %{date}
     last_active: остання активність
     link_verified_on: Права власності на це посилання були перевірені %{date}
-    media: Медіа
-    moved_html: "%{name} переїхав до %{new_profile_link}:"
-    network_hidden: Ця інформація недоступна
-    never_active: Ніколи
     nothing_here: Тут нічого немає!
-    people_followed_by: Люди, на яких підписаний(-а) %{name}
-    people_who_follow: Підписники %{name}
     pin_errors:
       following: Ви повинні бути підписаним на людину, яку бажаєте схвалити
     posts:
-      few: Дмуха
-      many: Дмухів
-      one: Дмух
-      other: Дмухів
-    posts_tab_heading: Дмухи
-    posts_with_replies: Дмухи та відповіді
-    roles:
-      admin: Адміністратор
-      bot: Бот
-      group: Група
-      moderator: Мод
-    unavailable: Профіль недоступний
-    unfollow: Відписатися
+      few: Дописи
+      many: Дописів
+      one: Допис
+      other: Дописів
+    posts_tab_heading: Дописів
   admin:
     account_actions:
       action: Виконати дію
@@ -100,26 +33,30 @@ uk:
     account_moderation_notes:
       create: Залишити нотатку
       created_msg: Нотатку модератора успішно створено!
-      delete: Видалити
       destroyed_msg: Нотатку модератора успішно видалено!
     accounts:
       add_email_domain_block: Додати поштовий домен до чорного списку
       approve: Схвалити
-      approve_all: Схвалити всіх
       approved_msg: Заявку на реєстрацію %{username} затверджено
       are_you_sure: Ви впевнені?
       avatar: Аватар
       by_domain: Домен
       change_email:
-        changed_msg: Адресу електронної пошти облікового запису успішно змінено!
+        changed_msg: Адресу електронної пошти успішно змінено!
         current_email: Поточна адреса електронної пошти
         label: Змінити адресу електронної пошти
         new_email: Нова адреса електронної пошти
         submit: Змінити адресу електронної пошти
         title: Змінити адресу електронної пошти для %{username}
+      change_role:
+        changed_msg: Роль успішно змінено!
+        label: Змінити роль
+        no_role: Немає ролі
+        title: Змінити роль для %{username}
       confirm: Зберегти
       confirmed: Збережено
       confirming: Зберігається
+      custom: Власне
       delete: Видалити дані
       deleted: Видалено
       demote: Усунути
@@ -132,7 +69,7 @@ uk:
       domain: Домен
       edit: Змінити
       email: Електронна пошта
-      email_status: Статус електронної пошти
+      email_status: Стан електронної пошти
       enable: Увімкнути
       enable_sign_in_token_auth: Увімкнути автентифікацію за допомогою е-пошти
       enabled: Увімкнено
@@ -142,15 +79,15 @@ uk:
       header: Заголовок
       inbox_url: URL вхідних повідомлень
       invite_request_text: Причини приєднатися
-      invited_by: 'Запросив:'
+      invited_by: Запросив
       ip: IP
-      joined: Приєднався
+      joined: Дата приєднання
       location:
         all: Усі
         local: Локальні
         remote: Віддалені
         title: Розміщення
-      login_status: Статус авторизації
+      login_status: Стан входу
       media_attachments: Мультимедійні вкладення
       memorialize: Зробити пам'ятником
       memorialized: Перетворено на пам'ятник
@@ -159,7 +96,7 @@ uk:
         active: Активний
         all: Усі
         pending: Очікують
-        silenced: Заглушені
+        silenced: Обмежені
         suspended: Призупинені
         title: Модерація
       moderation_notes: Нотатки модераторів
@@ -167,9 +104,16 @@ uk:
       most_recent_ip: Останній IP
       no_account_selected: Жоден обліковий запис не було змінено, оскільки жоден не було вибрано
       no_limits_imposed: Жодних обмежень не накладено
+      no_role_assigned: Роль не призначено
       not_subscribed: Не підписані
       pending: Відгук в очікуванні
       perform_full_suspension: Призупинити
+      previous_strikes: Попередні попередження
+      previous_strikes_description_html:
+        few: У цього облікового запису є <strong>%{count}</strong> попередження.
+        many: У цього облікового запису є <strong>%{count}</strong> попереджень.
+        one: У цього облікового запису є <strong>одне</strong> попередження.
+        other: У цього облікового запису є <strong>%{count}</strong> попереджень.
       promote: Просунути
       protocol: Протокол
       public: Публічний
@@ -177,8 +121,9 @@ uk:
       redownload: Оновити аватар
       redownloaded_msg: Профіль %{username} оновлено з джерела походження
       reject: Відхилити
-      reject_all: Відхилити усе
       rejected_msg: Заявку на реєстрацію %{username} відхилено
+      remote_suspension_irreversible: Дані цього облікового запису безповоротно видалені.
+      remote_suspension_reversible_hint_html: Обліковий запис було призупинено на їхньому сервері, а дані будуть повністю вилучені на %{date}. До цього часу віддалений сервер може відновити цей обліковий запис без будь-яких наслідків. Якщо ви бажаєте вилучити всі дані облікового запису негайно, ви можете зробити це нижче.
       remove_avatar: Видалити аватар
       remove_header: Видалити заголовок
       removed_avatar_msg: Зображення користувача %{username} вилучено
@@ -190,34 +135,31 @@ uk:
       reset: Скинути
       reset_password: Скинути пароль
       resubscribe: Перепідписатися
-      role: Дозволи
-      roles:
-        admin: Адміністратор
-        moderator: Модератор
-        staff: Персонал
-        user: Користувач
+      role: Роль
       search: Пошук
       search_same_email_domain: Інші користувачі з тим самим поштовим доменом
       search_same_ip: Інші користувачі з тим самим IP
       security_measures:
         only_password: Лише пароль
         password_and_2fa: Пароль та 2FA
-        password_and_sign_in_token: Пароль та токен з е-пошти
       sensitive: Делікатне
-      sensitized: позначено делікатним
+      sensitized: Позначено делікатним
       shared_inbox_url: URL спільного вхідного кошика
       show:
-        created_reports: Скарги, створені цим акаунтом
-        targeted_reports: Скарги щодо цього акаунту
+        created_reports: Скарги, створені цим обліковим записом
+        targeted_reports: Скарги на цей обліковий запис
       silence: Глушення
       silenced: Заглушені
-      statuses: Статуси
+      statuses: Дописи
+      strikes: Попередні попередження
       subscribe: Підписатися
+      suspend: Призупинити
       suspended: Призупинені
       suspension_irreversible: Дані цього облікового запису безповоротно видалено. Ви можете розблокувати обліковий запис, щоб могти ним користуватися, але будь-які його дані не відновляться.
       suspension_reversible_hint_html: Обліковий запис заблоковано, а дані буде повністю вилучено %{date}. До цього часу обліковий запис можна відновити без будь-яких негативних наслідків. Якщо ви бажаєте вилучити всі дані облікового запису негайно, ви можете зробити це внизу.
-      time_in_queue: Очікує в черзі %{time}
       title: Облікові записи
+      unblock_email: Розблокувати адресу е-пошти
+      unblocked_email_msg: Адреса електронної пошти %{username} успішно розблокована
       unconfirmed_email: Непідтверджена адреса електронної пошти
       undo_sensitized: Скасувати позначення делікатним
       undo_silenced: Зняти глушення
@@ -232,26 +174,34 @@ uk:
       whitelisted: У білому списку
     action_logs:
       action_types:
+        approve_appeal: Затвердити апеляцію
+        approve_user: Затвердити користувачів
         assigned_to_self_report: Призначити звіт
         change_email_user: Змінити електронну пошту для користувача
+        change_role_user: Змінити роль користувача
         confirm_user: Підтвердити користувача
         create_account_warning: Створити попередження
         create_announcement: Створити оголошення
+        create_canonical_email_block: Створити блок електронної пошти
         create_custom_emoji: Створити користувацьке емодзі
         create_domain_allow: Створити дозвіл на домен
         create_domain_block: Створити блокування домену
         create_email_domain_block: Створити блокування поштового домену
         create_ip_block: Створити правило IP
         create_unavailable_domain: Створити недоступний домен
+        create_user_role: Створити роль
         demote_user: Понизити користувача
         destroy_announcement: Видалити оголошення
+        destroy_canonical_email_block: Видалити блок електронної пошти
         destroy_custom_emoji: Видалити користувацьке емодзі
         destroy_domain_allow: Видалити дозвіл на домен
         destroy_domain_block: Видалити блокування домену
         destroy_email_domain_block: Видалити блокування поштового домену
+        destroy_instance: Очистити домен
         destroy_ip_block: Видалити правило IP
-        destroy_status: Видалити пост
+        destroy_status: Видалити допис
         destroy_unavailable_domain: Видалити недоступний домен
+        destroy_user_role: Знищити роль
         disable_2fa_user: Вимкнути 2FA
         disable_custom_emoji: Вимкнути користувацькі емодзі
         disable_sign_in_token_auth_user: Вимкнути автентифікацію за допомогою е-пошти для користувача
@@ -261,42 +211,56 @@ uk:
         enable_user: Активувати користувача
         memorialize_account: Зробити обліковий запис меморіалом
         promote_user: Підвищити користувача
+        reject_appeal: Відхилити апеляцію
+        reject_user: Відхилити користувача
         remove_avatar_user: Видалити аватар
-        reopen_report: Перевідкрити скаргу
+        reopen_report: Поновити скаргу
+        resend_user: Повторне підтвердження пошти
         reset_password_user: Скинути пароль
         resolve_report: Розв'язати скаргу
         sensitive_account: Позначити делікатним медіа вашого облікового запису
         silence_account: Заглушити обліковий запис
         suspend_account: Призупинити обліковий запис
-        unassigned_report: Видалити скаргу
+        unassigned_report: Зняти скаргу
+        unblock_email_account: Розблокувати адресу е-пошти
         unsensitive_account: Прибрати позначку "делікатне" з медіа вашого облікового запису
         unsilence_account: Розглушити обліковий запис
         unsuspend_account: Розморозити обліковий запис
         update_announcement: Оновити оголошення
         update_custom_emoji: Оновити користувацькі емодзі
         update_domain_block: Оновити блокування домену
-        update_status: Оновити статус
+        update_ip_block: Оновити правило IP
+        update_status: Оновити допис
+        update_user_role: Оновити роль
       actions:
+        approve_appeal_html: "%{name} затвердили звернення на оскарження рішення від %{target}"
+        approve_user_html: "%{name} схвалює реєстрацію від %{target}"
         assigned_to_self_report_html: "%{name} створює скаргу %{target} на себе"
         change_email_user_html: "%{name} змінює поштову адресу користувача %{target}"
+        change_role_user_html: "%{name} змінює роль %{target}"
         confirm_user_html: "%{name} підтверджує стан поштової адреси користувача %{target}"
         create_account_warning_html: "%{name} надсилає попередження до %{target}"
         create_announcement_html: "%{name} створює нове оголошення %{target}"
+        create_canonical_email_block_html: "%{name} блокує електронну пошту з хешем %{target}"
         create_custom_emoji_html: "%{name} завантажує нові емодзі %{target}"
         create_domain_allow_html: "%{name} дозволяє федерацію з доменом %{target}"
         create_domain_block_html: "%{name} блокує домен %{target}"
         create_email_domain_block_html: "%{name} блокує домен електронної пошти %{target}"
         create_ip_block_html: "%{name} створює правило для IP %{target}"
         create_unavailable_domain_html: "%{name} зупиняє доставляння на домен %{target}"
+        create_user_role_html: "%{name} створює роль %{target}"
         demote_user_html: "%{name} понижує користувача %{target}"
         destroy_announcement_html: "%{name} видаляє оголошення %{target}"
-        destroy_custom_emoji_html: "%{name} знищує емодзі %{target}"
+        destroy_canonical_email_block_html: "%{name} розблоковує електронну пошту з хешем %{target}"
+        destroy_custom_emoji_html: "%{name} видаляє емоджі %{target}"
         destroy_domain_allow_html: "%{name} скасовує федерацію з доменом %{target}"
         destroy_domain_block_html: "%{name} розблокує домен %{target}"
         destroy_email_domain_block_html: "%{name} розблоковує домен електронної пошти %{target}"
+        destroy_instance_html: "%{name} очищує домен %{target}"
         destroy_ip_block_html: "%{name} видаляє правило для IP %{target}"
-        destroy_status_html: "%{name} видаляє статус %{target}"
+        destroy_status_html: "%{name} вилучає допис %{target}"
         destroy_unavailable_domain_html: "%{name} відновлює доставляння на домен %{target}"
+        destroy_user_role_html: "%{name} видаляє роль %{target}"
         disable_2fa_user_html: "%{name} вимикає двоетапну перевірку для користувача %{target}"
         disable_custom_emoji_html: "%{name} вимикає емодзі %{target}"
         disable_sign_in_token_auth_user_html: "%{name} вимикає автентифікацію через е-пошту для %{target}"
@@ -306,22 +270,28 @@ uk:
         enable_user_html: "%{name} вмикає вхід для користувача %{target}"
         memorialize_account_html: "%{name} перетворює обліковий запис %{target} на сторінку пам'яті"
         promote_user_html: "%{name} підвищує користувача %{target}"
+        reject_appeal_html: "%{name} відхилили звернення на оскарження рішення від %{target}"
+        reject_user_html: "%{name} відхиляє реєстрацію від %{target}"
         remove_avatar_user_html: "%{name} прибирає аватар %{target}"
         reopen_report_html: "%{name} знову відкриває звіт %{target}"
+        resend_user_html: "%{name} було надіслано листа з підтвердженням для %{target}"
         reset_password_user_html: "%{name} скидає пароль користувача %{target}"
         resolve_report_html: "%{name} розв'язує скаргу %{target}"
         sensitive_account_html: "%{name} позначає медіа від %{target} делікатним"
         silence_account_html: "%{name} приглушує обліковий запис %{target}"
         suspend_account_html: "%{name} заморожує обліковий запис %{target}"
         unassigned_report_html: "%{name} прибирає призначення скарги %{target}"
+        unblock_email_account_html: "%{name} розблоковує електронну пошту %{target}"
         unsensitive_account_html: '%{name} прибирає позначку "делікатне" з медіа від %{target}'
         unsilence_account_html: "%{name} розглушує обліковий запис %{target}"
         unsuspend_account_html: "%{name} розморожує обліковий запис %{target}"
         update_announcement_html: "%{name} оновлює оголошення %{target}"
         update_custom_emoji_html: "%{name} оновлює емодзі %{target}"
         update_domain_block_html: "%{name} оновлює блокування домену для %{target}"
-        update_status_html: "%{name} змінює статус користувача %{target}"
-      deleted_status: "(видалений статус)"
+        update_ip_block_html: "%{name} змінює правило для IP %{target}"
+        update_status_html: "%{name} оновлює допис %{target}"
+        update_user_role_html: "%{name} змінює роль %{target}"
+      deleted_account: видалений обліковий запис
       empty: Не знайдено жодного журналу.
       filter_by_action: Фільтрувати за дією
       filter_by_user: Фільтрувати за користувачем
@@ -360,11 +330,12 @@ uk:
       enable: Увімкнути
       enabled: Увімкнено
       enabled_msg: Емодзі успішно увімкнене
-      image_hint: PNG розміром до 50 КБ
+      image_hint: PNG або GIF до %{size}
       list: Список
       listed: У списку
       new:
         title: Додати новий емодзі
+      no_emoji_selected: Жоден емоджі не було змінено, оскільки жоден не було вибрано
       not_permitted: Вам не дозволено виконувати цю дію
       overwrite: Переписати
       shortcode: Шорткод
@@ -382,20 +353,25 @@ uk:
       media_storage: Медіасховище
       new_users: нові користувачі
       opened_reports: звітів відкрито
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> апеляції в черзі"
+        many: "<strong>%{count}</strong> апеляцій в черзі"
+        one: "<strong>%{count}</strong> апеляція в черзі"
+        other: "<strong>%{count}</strong> апеляції в черзі"
       pending_reports_html:
         few: "<strong>%{count}</strong> звіти у черзі"
         many: "<strong>%{count}</strong> звітів у черзі"
-        one: "<strong>1</strong> звіт у черзі"
+        one: "<strong>%{count}</strong> звіт у черзі"
         other: "<strong>%{count}</strong> звіти у черзі"
       pending_tags_html:
         few: "<strong>%{count}</strong> хештеґи у черзі"
         many: "<strong>%{count}</strong> хештеґів у черзі"
-        one: "<strong>1</strong> хештеґ у черзі"
-        other: "<strong>%{count}</strong> хештеґи у черзі"
+        one: "<strong>%{count}</strong> хештеґ у черзі"
+        other: "<strong>%{count}</strong> хештеґа у черзі"
       pending_users_html:
         few: "<strong>%{count}</strong> користувачі у черзі"
         many: "<strong>%{count}</strong> користувачів у черзі"
-        one: "<strong>1</strong> користувач у черзі"
+        one: "<strong>%{count}</strong> користувач у черзі"
         other: "<strong>%{count}</strong> користувача у черзі"
       resolved_reports: розв'язані звіти
       software: Програмне забезпечення
@@ -405,10 +381,16 @@ uk:
       top_languages: Найактивніші мови
       top_servers: Найактивніші сервери
       website: Вебсайт
+    disputes:
+      appeals:
+        empty: Апеляцій не знайдено.
+        title: Апеляції
     domain_allows:
       add_new: Додати домен до білого списку
       created_msg: Домен було успішно додано до білого списку
       destroyed_msg: Домен було видалено з білого списку
+      export: Експорт
+      import: Імпорт
       undo: Видалити з білого списку
     domain_blocks:
       add_new: Додати нове
@@ -416,16 +398,21 @@ uk:
       destroyed_msg: Блокування домену знято
       domain: Домен
       edit: Редагувати блокування доменів
+      existing_domain_block: Ви вже наклали суворіші обмеження на %{name}.
       existing_domain_block_html: Ви вже наклали більш суворі обмеження на %{name}, вам треба спочатку <a href="%{unblock_url}">розблокувати його</a>.
+      export: Експорт
+      import: Імпорт
       new:
         create: Створити блокування
         hint: Блокування домену не завадить створенню нових облікових записів у базі даних, але ретроактивно та автоматично застосує до них конкретні методи модерації.
         severity:
-          desc_html: "<strong>Глушення</strong> зробить пости облікового запису невидимими для всіх, окрім його підписників. <strong>Заморожування</strong> видалить увесь контент, медіа та дані профілю облікового запису. Якщо ви хочете лише заборонити медіафайли, оберіть <strong>Нічого</strong>."
+          desc_html: "<strong>Обмеження</strong> зробить дописи облікових записів цього домену невидимими для всіх, окрім його підписників. <strong>Заморожування</strong> видалить усі матеріали облікових записів, медіа та дані профілів для облікових записів цього домену з вашого сервера. Якщо ви хочете лише заборонити медіафайли, оберіть <strong>Нічого</strong>."
           noop: Нічого
-          silence: Глушення
+          silence: Обмежити
           suspend: Блокування
         title: Нове блокування домену
+      no_domain_block_selected: Жодні налаштування блокування доменів не змінено, оскільки жоден з них не було вибрано
+      not_permitted: Вам не дозволено виконувати цю дію
       obfuscate: Сховати назву домена
       obfuscate_hint: Частково приховувати доменне ім'я в списку, якщо ввімкнено показ списку обмежень домену
       private_comment: Приватний коментар
@@ -436,36 +423,43 @@ uk:
       reject_media_hint: Видаляє медіаконтент, збережений локально, і забороняє його завантаження у майбутньому. Не має значення у випадку блокування
       reject_reports: Відхилити скарги
       reject_reports_hint: Ігнорувати всі скарги з цього домену. Не має значення у випадку блокування
-      rejecting_media: відхилення медіафайлів
-      rejecting_reports: відхилення скарг
-      severity:
-        silence: заглушені
-        suspend: призупинені
-      show:
-        affected_accounts:
-          few: Впливає на %{count} облікових записи у базі даних
-          many: Впливає на %{count} облікових записів у базі даних
-          one: Впливає на один обліковий запис у базі даних
-          other: Впливає на %{count} облікових записів у базі даних
-        retroactive:
-          silence: Зняти глушення з усіх існуючих заглушених облікових записів цього домену
-          suspend: Розморозити існуючі заморожені облікові записи з цього домену
-        title: Зняти блокування з домена %{domain}
-        undo: Відмінити
       undo: Відмінити
       view: Переглянути заблоковані домени
     email_domain_blocks:
       add_new: Додати
+      attempts_over_week:
+        few: "%{count} спроби входу за останній тиждень"
+        many: "%{count} спроб входу за останній тиждень"
+        one: "%{count} спроба за останній тиждень"
+        other: "%{count} спроби входу за останній тиждень"
       created_msg: Успішно додано поштовий домен до чорного списку
       delete: Видалити
-      destroyed_msg: Успішно видалено поштовий домен з чорного списку
+      dns:
+        types:
+          mx: MX-запис
       domain: Домен
-      empty: Ніякі e-mail домени не блокуються.
-      from_html: з %{domain}
       new:
         create: Додати домен
+        resolve: Розв'язати домен
         title: Нове блокування поштового домену
+      no_email_domain_block_selected: Жодні налаштування блокування доменів електронної пошти не було змінено, оскільки жоден з них не було обрано
+      resolved_dns_records_hint_html: Ім'я домену резолвиться в наступні домени MX, які в кінцевому рахунку відповідають за прийняття електронної пошти. Блокування домену MX заблокує реєстрацію з будь-якої e-mail адреси, яка використовує однаковий домен MX, навіть якщо доменне ім'я буде інакше. <strong>Будьте обережні, щоб не блокувати великих поштових провайдерів.</strong>
+      resolved_through_html: Розв'язано через %{domain}
       title: Чорний список поштових доменів
+    export_domain_allows:
+      new:
+        title: Імпорт дозволів домену
+      no_file: Файл не вибрано
+    export_domain_blocks:
+      import:
+        description_html: Ви збираєтеся імпортувати список блокування доменів. Уважно перегляньте цей список, особливо якщо ви не авторизували цей список.
+        existing_relationships_warning: Наявні відносини стеження
+        private_comment_description_html: 'Щоб допомогти вам відстежувати, звідки беруться імпортовані блокування, вони створюються за допомогою наступного приватного коментаря: <q>%{comment}</q>'
+        private_comment_template: Імпортовано з %{source} %{date}
+        title: Імпорт блокувань домену
+      new:
+        title: Імпорт блокувань домену
+      no_file: Файл не вибрано
     follow_recommendations:
       description_html: "<strong>Слідувати рекомендаціям та допомогти новим користувачам швидко знайти цікавий вміст</strong>. Коли користувачі не взаємодіяли з іншими людьми достатньо, щоб сформувати персоналізовані рекомендації, радимо замість цього вказувати ці облікові записи. Вони щоденно переобчислюються з масиву облікових записів з найбільшою кількістю недавніх взаємодій і найбільшою кількістю місцевих підписників розраховується для цієї мови."
       language: Для мови
@@ -475,30 +469,60 @@ uk:
       title: Поради щодо підписок
       unsuppress: Відновити поради щодо підписок
     instances:
+      availability:
+        description_html:
+          few: Якщо доставлення до домену не вдалася за <strong>%{count} інших дні</strong>, жодних спроб доставлення не здійснюється, доки доставлення <em>від домену</em> не отримуватиметься.
+          many: Якщо доставлення до домену не вдалася за <strong>%{count} інших днів</strong>, жодних спроб доставлення не здійснюється, доки доставлення <em>від домену</em> не отримуватиметься.
+          one: Якщо доставлення до домену не вдалася <strong>%{count} день</strong>, жодних спроб доставлення не здійснюється, доки доставлення <em>від домену</em> не отримуватиметься.
+          other: Якщо доставлення до домену не вдалася за <strong>%{count} інших днів</strong>, жодних спроб доставлення не здійснюється, доки доставлення <em>від домену</em> не отримуватиметься.
+        failure_threshold_reached: Досягнуто поріг допустимих помилок станом на %{date}.
+        failures_recorded:
+          few: Невдалих спроб за %{count} різні дні.
+          many: Невдалих спроб за %{count} різних днів.
+          one: Невдалих спроб за %{count} день.
+          other: Невдалих спроб за %{count} різних днів.
+        no_failures_recorded: Проблем щодо запису немає.
+        title: Доступність
+        warning: Остання спроба підключення до цього сервера була невдала
       back_to_all: Усі
       back_to_limited: Обмежені
       back_to_warning: Попередження
       by_domain: Домен
+      confirm_purge: Ви впевнені, що хочете видалити ці дані з цього домену?
+      content_policies:
+        comment: Внутрішня примітка
+        description_html: Ви можете визначити правила вмісту що буде застосовано до всіх облікових записів із цього домену та будь-якого з його піддоменів.
+        policies:
+          reject_media: Відхилити медіа
+          reject_reports: Відхилити скарги
+          silence: Обмеження
+          suspend: Призупинити
+        policy: Правила
+        reason: Суспільна причина
+        title: Політика вмісту
+      dashboard:
+        instance_accounts_dimension: Найвідстежуваніші облікові записи
+        instance_accounts_measure: розміщені облікові записи
+        instance_followers_measure: наші підписники там
+        instance_follows_measure: їхні підписники тут
+        instance_languages_dimension: Найуживаніші мови
+        instance_media_attachments_measure: розміщені медіавкладення
+        instance_reports_measure: звітів про них
+        instance_statuses_measure: розміщені дописи
       delivery:
         all: Усі
         clear: Очистити помилки доставляння
+        failing: Невдалі
         restart: Перезапустити доставляння
         stop: Припинити доставляння
-        title: Доставляння
         unavailable: Недоступно
-        unavailable_message: Доставлення недоступне
-        warning: Попередження
-        warning_message:
-          few: Збій доставляння %{count} дні
-          many: Збій доставляння %{count} днів
-          one: Збій доставляння %{count} день
-          other: Збій доставляння %{count} днів
       delivery_available: Доставлення доступне
       delivery_error_days: Днів помилок доставляння
       delivery_error_hint: Якщо доставляння неможливе впродовж %{count} днів, воно автоматично позначиться недоставленим.
+      destroyed_msg: Дані з %{domain} тепер у черзі на видалення.
       empty: Доменів не знайдено.
       known_accounts:
-        few: "%{count} відомих облікових записів"
+        few: "%{count} відомі облікові записи"
         many: "%{count} відомих облікових записів"
         one: "%{count} відомий обліковий запис"
         other: "%{count} відомих облікових записів"
@@ -508,12 +532,15 @@ uk:
         title: Модерація
       private_comment: Приватний коментар
       public_comment: Публічний коментар
-      title: Відомі інстанції
+      purge: Очисти
+      purge_description_html: Якщо ви вважаєте, що цей домен більше ніколи не працюватиме, ви можете видалити всі дані облікових записів та пов'язані з ним дані з цього домену зі свого сховища. Це може зайняти деякий час.
+      title: Федерація
       total_blocked_by_us: Заблокованих нами
       total_followed_by_them: Вони стежать за
       total_followed_by_us: Ми стежимо за
       total_reported: Звітів про них
       total_storage: Мультимедійні вкладення
+      totals_time_period_hint_html: Нижче зображена статистика за все існування сервера.
     invites:
       deactivate_all: Деактивувати всі
       filter:
@@ -537,25 +564,23 @@ uk:
         title: Створити нове правило IP
       no_ip_block_selected: Жодних правил IP не було змінено, оскільки жодного не було вибрано
       title: Правила IP
-    pending_accounts:
-      title: Облікові записи у черзі (%{count})
     relationships:
       title: "%{acct} відносини"
     relays:
       add_new: Додати новий ретранслятор
       delete: Видалити
-      description_html: "<strong>Ретлянслятор дмухів</strong> (federation relay) — це проміжний сервер, що обмінюється великими обсягами публічних дмухів між серверами, які цього хочуть. Він може допомогти маленьким та середнім серверам отримувати вміст з усього <strong>федесвіту</strong> (fediverse). Без нього локальним користувачам довелося б вручну підписуватися на людей з віддалених серверів."
+      description_html: "<strong>Ретранслятор дописів</strong> (federation relay) — це проміжний сервер, що обмінюється великими обсягами публічних дописів між серверами, які цього хочуть. Він може допомогти маленьким та середнім серверам отримувати вміст з усього <strong>федесвіту</strong> (fediverse). Без нього локальним користувачам довелося б вручну підписуватися на людей з віддалених серверів."
       disable: Вимкнути
       disabled: Вимкнено
       enable: Увімкнути
-      enable_hint: Коли ретрансляцію увімкнено, ваш сервер буде підписаний на усі публічні дмухи з цього ретранслятора, та почне посилати до нього свої публічні дмухи.
+      enable_hint: Коли ретрансляцію увімкнено, ваш сервер буде підписаний на усі публічні дописи з цього ретранслятора, та почне посилати до нього свої публічні дописи.
       enabled: Увімкнено
       inbox_url: URL ретранслятора
       pending: Очікуємо на підтвердження ретранслятором
       save_and_enable: Зберегти та увімкнути
       setup: Налаштування з'єднання з ретранслятором
-      signatures_not_enabled: Ретранслятори не будуть добре працювати поки ввімкнений безопасний режим або режим білого списка
-      status: Статус
+      signatures_not_enabled: Ретранслятори не будуть працювати коректно поки ввімкнений безпечний режим або режим обмеженої федерації
+      status: Стан
       title: Ретранслятори
     report_notes:
       created_msg: Скарга успішно створена!
@@ -567,41 +592,125 @@ uk:
           many: "%{count} приміток"
           one: "%{count} примітка"
           other: "%{count} приміток"
-        reports:
-          few: "%{count} скарги"
-          many: "%{count} скарг"
-          one: "%{count} скарга"
-          other: "%{count} скарг"
+      action_log: Журнал подій
       action_taken_by: Дія виконана
+      actions:
+        delete_description_html: Дописи, на які скаржилися будуть видалені, а попередження буде записано, щоб допомогти вам підвищити рівень майбутніх порушень того самого облікового запису.
+        mark_as_sensitive_description_html: Медіа у дописах, на які скаржилися будуть позначені делікатними, а попередження буде записано, щоб допомогти вам підвищити рівень майбутніх порушень того самого облікового запису.
+        other_description_html: Більше опцій керування поведінкою облікового запису і налаштування комунікації з обліковим записом, на який поскаржилися.
+        resolve_description_html: Не буде застосовано жодних дій проти облікового запису, на який скаржилися, не буде записано попередження, а скаргу буде закрито.
+        silence_description_html: Профіль буде видимий лише тим, хто вже стежить за ним або знайде його самостійно, сильно обмежуючи його знаходження. Можна потім скасувати.
+        suspend_description_html: Профіль і весь його вміст буде недоступним, поки його не буде видалено. Взаємодія з обліковим записом буде неможливою.
+      actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
+      add_to_report: Додати ще подробиць до скарги
       are_you_sure: Ви впевнені?
       assign_to_self: Призначити мені
       assigned: Призначений модератор
+      by_target_domain: Домен облікового запису, на який скаржаться
+      category: Категорія
+      category_description_html: Причина скарги на цей обліковий запис та/або вміст, яку буде вказано у звіті
       comment:
         none: Немає
+      comment_description_html: 'Щоб надати більше відомостей, %{name} пише:'
       created_at: Створено
+      delete_and_resolve: Видалити дописи
       forwarded: Переслано
       forwarded_to: Переслано до %{domain}
-      mark_as_resolved: Відмітити як вирішену
-      mark_as_unresolved: Відмітити як невирішену
+      mark_as_resolved: Позначити вирішеним
+      mark_as_sensitive: Позначити делікатним
+      mark_as_unresolved: Позначити невирішеним
+      no_one_assigned: Ніхто
       notes:
         create: Додати примітку
         create_and_resolve: Розв'язати з приміткою
         create_and_unresolve: Перевідкрити з приміткою
         delete: Видалити
         placeholder: Опишіть, які дії були виконані, або інші зміни, що стосуються справи...
+        title: Примітки
+      notes_description_html: Переглядайте та залишайте примітки для інших модераторів та для себе на майбутнє
+      quick_actions_description_html: 'Виберіть швидку дію або гортайте вниз, щоб побачити матеріал, на який надійшла скарга:'
+      remote_user_placeholder: віддалений користувач із %{instance}
       reopen: Перевідкрити скаргу
       report: 'Скарга #%{id}'
       reported_account: Обліковий запис порушника
       reported_by: Відправник скарги
       resolved: Вирішено
       resolved_msg: Скаргу успішно вирішено!
-      status: Статус
-      target_domain: Домен облікового запису, на який скаржаться
+      skip_to_actions: Перейти до дій
+      status: Стан
+      statuses: Вміст, на який поскаржилися
+      statuses_description_html: Замінений вміст буде цитований у спілкуванні з обліковим записом, на який поскаржилися
       target_origin: Походження облікового запису, на який скаржаться
       title: Скарги
       unassign: Зняти призначення
       unresolved: Невирішені
       updated_at: Оновлені
+      view_profile: Переглянути профіль
+    roles:
+      add_new: Додати роль
+      assigned_users:
+        few: "%{count} користувачі"
+        many: "%{count} користувачів"
+        one: "%{count} користувач"
+        other: "%{count} користувача"
+      categories:
+        administration: Адміністрування
+        devops: DevOps
+        invites: Запрошення
+        moderation: Модерація
+        special: Спеціальні
+      delete: Видалити
+      description_html: За допомогою <strong>ролі користувача</strong>, ви можете налаштувати, до яких функцій і місць можуть доступатися ваші користувачі Mastodon.
+      edit: Змінити роль «%{name}»
+      everyone: Типові дозволи
+      everyone_full_description_html: Це <strong>базова роль</strong>, яка впливає на <strong>всіх користувачів</strong>, навіть ті, яким не призначені ролі. Усі інші ролі успадковують її дозволи.
+      permissions_count:
+        few: "%{count} дозволи"
+        many: "%{count} дозволів"
+        one: "%{count} дозвіл"
+        other: "%{count} дозволи"
+      privileges:
+        administrator: Адміністратор
+        administrator_description: Користувачі з цим дозволом обходять усі дозволи
+        delete_user_data: Видаляти дані користувача
+        delete_user_data_description: Дозволяє користувачам видаляти дані інших користувачів без затримок
+        invite_users: Запрошувати користувачів
+        invite_users_description: Дозволяє користувачам запрошувати нових людей на сервер
+        manage_announcements: Керувати оголошеннями
+        manage_announcements_description: Дозволяє користувачам керувати оголошеннями на сервері
+        manage_appeals: Керувати оскарженнями
+        manage_appeals_description: Дозволяє користувачам розглядати оскарження дій модерації
+        manage_blocks: Керувати блокуваннями
+        manage_blocks_description: Дозволяє користувачам блокувати постачальників е-пошти та IP-адреси
+        manage_custom_emojis: Керувати користувацькими емоджі
+        manage_custom_emojis_description: Дозволяє користувачам керувати користувацькими емоджі на сервері
+        manage_federation: Керувати федерацією
+        manage_federation_description: Дозволяє користувачам блокувати або дозволяти федерацію з іншими доменами й керувати можливостями доставлення
+        manage_invites: Керувати запрошеннями
+        manage_invites_description: Дозволяє користувачам переглядати й деактивувати запрошувальні посилання
+        manage_reports: Керувати скаргами
+        manage_reports_description: Дозволяє користувачам переглядати скарги та виконувати відповідні дії модерації
+        manage_roles: Керувати ролями
+        manage_roles_description: Дозволяє користувачам керувати та призначати ролі, нижчі за свій рівень
+        manage_rules: Керувати правилами
+        manage_rules_description: Дозволяє користувачам змінювати правила сервера
+        manage_settings: Керування налаштуваннями
+        manage_settings_description: Дозволяє користувачам змінювати налаштування сайту
+        manage_taxonomies: Керувати таксономіями
+        manage_taxonomies_description: Дозволяє користувачам переглядати актуальні налаштування вмісту й оновити хештеґ
+        manage_user_access: Керувати доступом користувачів
+        manage_user_access_description: Дозволяє користувачам вимкнути двоетапну перевірку інших користувачів, змінити їхню адресу електронної пошти та відновити пароль
+        manage_users: Керувати користувачами
+        manage_users_description: Дозволяє користувачам переглядати подробиці інших користувачів і виконувати їхню модерацію
+        manage_webhooks: Керувати Webhooks
+        manage_webhooks_description: Дозволяє користувачам налаштовувати вебхуки для адміністративних подій
+        view_audit_log: Переглядати журнал перевірки
+        view_audit_log_description: Дозволяє користувачам бачити історію адміністративних дій на сервері
+        view_dashboard: Переглядати панель керування
+        view_dashboard_description: Дозволяє користувачам доступ до панелі керування та різних метрик
+        view_devops: DevOps
+        view_devops_description: Дозволяє користувачам доступ до Sidekiq і панелі pgHero
+      title: Ролі
     rules:
       add_new: Додати правило
       delete: Видалити
@@ -610,164 +719,237 @@ uk:
       empty: Жодних правил сервера ще не визначено.
       title: Правила сервера
     settings:
-      activity_api_enabled:
-        desc_html: Кількість локальних постів, активних та нових користувачів у тижневих розрізах
-        title: Публікація агрегованої статистики про активність користувачів
-      bootstrap_timeline_accounts:
-        desc_html: Розділяйте імена користувачів комами. Працюватимуть тільки локальні і розблоковані облікові записи. Якщо порожньо, то типово це всі локальні адміністратори.
-        title: Типові підписки для нових користувачів
-      contact_information:
-        email: Введіть публічний email
-        username: Введіть ім'я користувача
-      custom_css:
-        desc_html: Відобразити вигляд, коли CSS завантажено для кожної сторінки
-        title: Користувацький CSS
+      about:
+        manage_rules: Керувати правилами сервера
+        preamble: Надати детальну інформацію про те, як працює сервер, модерується та фінансується.
+        rules_hint: Виділена ділянка для правил, яких повинні дотримуватись ваші користувачі.
+        title: Про застосунок
+      appearance:
+        preamble: Налаштування вебінтерфейсу Mastodon.
+        title: Вигляд
+      branding:
+        preamble: Брендинг вашого сервера відрізняє його від інших серверів в мережі. Ця інформація може показуватися в різних середовищах, таких як вебінтерфейс Mastodon, застосунки, у попередньому перегляді посилань на інші вебсайти та в застосунках обміну повідомленнями. Тому краще, щоб ця інформація була чіткою, короткою та лаконічною.
+        title: Брендинг
+      content_retention:
+        preamble: Контролюйте, як зберігаються користувацькі матеріали в Mastodon.
+        title: Зберігання вмісту
       default_noindex:
-        desc_html: Впливає на усіх користувачів, які не змінили це настроювання самостійно
-        title: Виключити користувачів з індексації пошуковими системами за замовчуванням
+        desc_html: Впливає на всіх користувачів, які не змінили це налаштування самостійно
+        title: Усталено відмовитись від індексації користувачів пошуковими системами
+      discovery:
+        follow_recommendations: Поради щодо підписок
+        preamble: Показ цікавих матеріалів відіграє важливу роль у залученні нових користувачів, які, можливо, не знають нікого з Mastodon. Контролюйте роботу різних функцій виявлення на вашому сервері.
+        profile_directory: Каталог профілів
+        public_timelines: Публічна стрічка
+        title: Виявлення
+        trends: Популярні
       domain_blocks:
         all: Всi
         disabled: Нікого
-        title: Показати, які домени заблоковані
         users: Для авторизованих локальних користувачів
-      domain_blocks_rationale:
-        title: Обґрунтування
-      hero:
-        desc_html: Відображається на головній сторінці. Рекомендовано як мінімум 600x100 пікселів. Якщо не вказано, буде використано передпоказ інстанції
-        title: Банер інстанції
-      mascot:
-        desc_html: Відображається на багатьох сторінках. Щонайменше 293×205 пікселів рекомендовано. Якщо не вказано, буде використано талісман інстанції
-        title: Талісман
-      peers_api_enabled:
-        desc_html: Доменні ім'я, помічені цією інстанцією федисвіту
-        title: Опублікувати список знайдених інстанцій
-      preview_sensitive_media:
-        desc_html: Передпоказ посилання на інших сайтах буде відображати мініатюру навіть якщо медіа відмічене як дражливе
-        title: Показувати дражливе медіа у передпоказах OpenGraph
-      profile_directory:
-        desc_html: Дозволити користувачам бути видимими
-        title: Увімкнути каталог профілів
       registrations:
-        closed_message:
-          desc_html: Відображається на титульній сторінці, коли реєстрація закрита <br>Можна використовувати HTML-теги
-          title: Повідомлення про закриту реєстрацію
-        deletion:
-          desc_html: Дозволити будь-кому видаляти свій обліковий запис
-          title: Видалення відкритого облікового запису
-        min_invite_role:
-          disabled: Ніхто
-          title: Дозволити запрошення від
-        require_invite_text:
-          desc_html: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
-          title: Вимагати повідомлення причини приєднання від нових користувачів
+        preamble: Контролюйте, хто може створити обліковий запис на вашому сервері.
+        title: Реєстрації
       registrations_mode:
         modes:
           approved: Для входу потрібне схвалення
           none: Ніхто не може увійти
           open: Будь-хто може увійти
-        title: Режим реєстрації
-      show_known_fediverse_at_about_page:
-        desc_html: Коли увімкнено, будуть показані пости з усього відомого федисвіту у передпоказі. Інакше будуть показані лише локальні дмухи.
-        title: Показувати доступний федисвіт у передпоказі стрічки
-      show_staff_badge:
-        desc_html: Відмічати персонал на сторінці користувачів
-        title: Показувати персонал
-      site_description:
-        desc_html: Відображається у якості параграфа на титульній сторінці та використовується у якості мета-тега.<br>Можна використовувати HTML-теги, особливо <code>&lt;a&gt;</code> і <code>&lt;em&gt;</code>.
-        title: Опис інстанції
-      site_description_extended:
-        desc_html: Відображається на сторінці додаткової информації<br>Можна використовувати HTML-теги
-        title: Розширений опис сайту
-      site_short_description:
-        desc_html: Відображається в бічній панелі та мета-тегах. Опишіть, що таке Mastodon і що робить цей сервер особливим, в одному абзаці.
-        title: Короткий опис сервера
-      site_terms:
-        desc_html: |-
-          Ви можене написати власну політику приватності, умови використанні та інші законні штуки<br>
-          Можете використовувати HTML теги
-        title: Особливі умови використання
-      site_title: Назва сайту
-      thumbnail:
-        desc_html: Використовується для передпоказів через OpenGraph та API. Бажано розміром 1200х640 пікселів
-        title: Мініатюра інстанції
-      timeline_preview:
-        desc_html: Показувати публічну стрічку на головній сторінці
-        title: Передпоказ фіду
-      title: Налаштування сайту
-      trendable_by_default:
-        desc_html: Впливає на хештеги, які не були заборонені раніше
-        title: Дозволити хештегам потрапляти в тренди без попереднього перегляду
-      trends:
-        desc_html: Відображати розглянуті хештеґи, які популярні зараз
-        title: Популярні хештеги
+      title: Налаштування сервера
     site_uploads:
       delete: Видалити завантажений файл
       destroyed_msg: Завантаження сайту успішно видалено!
     statuses:
+      account: Автор
+      application: Застосунок
       back_to_account: Назад до сторінки облікового запису
+      back_to_report: Повернутися до сторінки скарги
       batch:
-        delete: Видалити
-        nsfw_off: Відмітити прийнятним
-        nsfw_on: Відмітити неприйнятним
+        remove_from_report: Вилучити зі скарги
+        report: Скарга
       deleted: Видалено
-      failed_to_execute: Не вийшло
+      favourites: Вподобане
+      history: Історія версій
+      in_reply_to: У відповідь
+      language: Мова
       media:
         title: Медіа
-      no_media: Немає медіа
-      no_status_selected: Жодного статуса не було змінено, оскільки жодного не було вибрано
-      title: Статуси облікових записів
+      metadata: Метадані
+      no_status_selected: Жодного допису не було змінено, оскільки жодного з них не було вибрано
+      open: Відкрити допис
+      original_status: Оригінальний допис
+      reblogs: Поширення
+      status_changed: Допис змінено
+      title: Дописи облікових записів
+      trending: Популярне
+      visibility: Видимість
       with_media: З медіа
+    strikes:
+      actions:
+        delete_statuses: "%{name} видаляє допис від %{target}"
+        disable: "%{name} заморожує обліковий запис %{target}"
+        mark_statuses_as_sensitive: "%{name} позначає допис від %{target} делікатним"
+        none: "%{name} надсилає попередження до %{target}"
+        sensitive: "%{name} позначає обліковий запис %{target} делікатним"
+        silence: "%{name} обмежує обліковий запис %{target}"
+        suspend: "%{name} заморожує обліковий запис %{target}"
+      appeal_approved: Оскаржено
+      appeal_pending: Оскарження в очікуванні
     system_checks:
       database_schema_check:
         message_html: Існують відкладені перенесення бази даних. Запустіть їх, щоб забезпечити очікувану роботу програми
+      elasticsearch_running_check:
+        message_html: Не вдалося під'єднатися до Elasticsearch. Перевірте, чи він запущений або вимкніть повнотекстовий пошук
+      elasticsearch_version_check:
+        message_html: 'Несумісна версія Elasticsear: %{value}'
+        version_comparison: Запущено Elasticsearch %{running_version}, але вимагається %{required_version}
       rules_check:
         action: Керування правилами сервера
         message_html: Ви не визначили будь-які правила сервера.
       sidekiq_process_check:
         message_html: Не працює процес Sidekiq для %{value} черги. Перегляньте конфігурації вашого Sidekiq
     tags:
-      accounts_today: Унікальних використань за сьогодні
-      accounts_week: Унікальних використань за тиждень
-      breakdown: Аналіз використання за сьогодні за джерелом
-      last_active: За активністю
-      most_popular: За популярністю
-      most_recent: За часом створення
-      name: Хештеґ
-      review: Переглянути статус
-      reviewed: Переглянуто
-      title: Хештеґи
-      trending_right_now: Популярні саме зараз
-      unique_uses_today: "%{count} постять сьогодні"
-      unreviewed: Не переглянуто
+      review: Переглянути допис
       updated_msg: Параметри хештеґів успішно оновлені
     title: Адміністрування
+    trends:
+      allow: Дозволити
+      approved: Схвалено
+      disallow: Заборонити
+      links:
+        allow: Дозволити посилання
+        allow_provider: Дозволити публікатора
+        description_html: Це посилання, з яких наразі багаторазово поширюються записи, з яких ваш сервер бачить дописи. Це може допомогти вашим користувачам дізнатися, що відбувається у світі. Посилання не показується публічно, поки ви не затверджуєте його публікацію. Ви також можете дозволити або відхилити окремі посилання.
+        disallow: Заборонити посилання
+        disallow_provider: Заборонити публікатора
+        no_link_selected: Жодне посилання не було змінено, оскільки жодне не було вибрано
+        publishers:
+          no_publisher_selected: Жодного видавця не було змінено, оскільки жодного не було вибрано
+        shared_by_over_week:
+          few: Поширили %{count} людини за останній тиждень
+          many: Поширили %{count} людей за останній тиждень
+          one: Поширила одна людина за останній тиждень
+          other: Поширили %{count} людей за останній тиждень
+        title: Популярні посилання
+        usage_comparison: Сьогодні поширено %{today} разів, у порівнянні з %{yesterday} вчора
+      only_allowed: Тільки дозволене
+      pending_review: Очікує перевірки
+      preview_card_providers:
+        allowed: Посилання цього публікатора можуть бути популярними
+        description_html: Це домени, з яких часто передаються посилання на вашому сервері. Посилання не будуть публічно приходити, якщо домен посилання не буде затверджено. Ваше затвердження (або відхилення) поширюється на піддомени.
+        rejected: Посилання цього публікатора можуть не будуть популярними
+        title: Публікатори
+      rejected: Відхилено
+      statuses:
+        allow: Дозволити оприлюднення
+        allow_account: Дозволити автора
+        description_html: Це дописи, про які ваш сервер знає як такі, що в даний час є спільні і навіть ті, які зараз є дуже популярними. Це може допомогти вашим новим та старим користувачам, щоб знайти більше людей для слідування. Жоден запис не відображається публічно, поки ви не затверджуєте автора, і автор дозволяє іншим користувачам підписатися на це. Ви також можете дозволити або відхилити окремі повідомлення.
+        disallow: Заборонити допис
+        disallow_account: Заборонити автора
+        no_status_selected: Жодного популярного допису не було змінено, оскільки жодного не було вибрано
+        not_discoverable: Автор не вирішив бути видимим
+        shared_by:
+          few: Поділитись або додати в улюблені %{friendly_count} рази
+          many: Поділитись або додати в улюблені %{friendly_count} разів
+          one: Поділитись або додати в улюблені один раз
+          other: Поділитись або додати в улюблені %{friendly_count} рази
+        title: Популярні дописи
+      tags:
+        current_score: Поточний результат %{score}
+        dashboard:
+          tag_accounts_measure: унікальних використань
+          tag_languages_dimension: Найуживаніші мови
+          tag_servers_dimension: Найуживаніші сервери
+          tag_servers_measure: різні сервери
+          tag_uses_measure: всього використань
+        description_html: Ці хештеґи, які бачить ваш сервер, в цей час з’являються у багатьох дописах. Це може допомогти вашим користувачам дізнатися про що люди наразі найбільше говорять. Жодні хештеґи публічно не показуються, доки ви їх не затвердите.
+        listable: Може бути запропоновано
+        no_tag_selected: Жоден теґ не було змінено, оскільки жоден не було вибрано
+        not_listable: Не буде запропоновано
+        not_trendable: Не показуватиметься серед популярних
+        not_usable: Неможливо використати
+        peaked_on_and_decaying: Найвище %{date}, на разі спадає
+        title: Популярні хештеги
+        trendable: Може зʼявитися серед популярних
+        trending_rank: 'Популярність #%{rank}'
+        usable: Може бути використано
+        usage_comparison: Сьогодні використано %{today} разів, у порівнянні з %{yesterday} вчора
+        used_by_over_week:
+          few: Використали %{count} людини за минулий тиждень
+          many: Використали %{count} людей за минулий тиждень
+          one: Використала одна людина за минулий тиждень
+          other: Використали %{count} людей за минулий тиждень
+      title: Популярні
+      trending: Популярне
     warning_presets:
       add_new: Додати новий
       delete: Видалити
       edit_preset: Редагувати шаблон попередження
       empty: Ви ще не визначили жодних попереджень.
-      title: Управління шаблонами попереджень
+      title: Керування шаблонами попереджень
+    webhooks:
+      add_new: Додати кінцеву точку
+      delete: Видалити
+      description_html: "<strong>Вебхук</strong> дає змогу Mastodon надсилати повідомлення про обрані події до вашого застосунку <strong>в реальному часі</strong>, щоб застосунок міг <strong>автоматично реагувати на реакції</strong>."
+      disable: Вимкнути
+      disabled: Вимкнено
+      edit: Редагувати кінцеву точку
+      empty: Ще не налаштовано жодних кінцевих точок вебхука.
+      enable: Увімкнути
+      enabled: Активні
+      enabled_events:
+        few: "%{count} увімкнені події"
+        many: "%{count} увімкнених подій"
+        one: 1 увімкнена подія
+        other: "%{count} увімкнені події"
+      events: Події
+      new: Новий вебхук
+      rotate_secret: Обернути секрет
+      secret: Секрет підписування
+      status: Стан
+      title: Вебхуки
+      webhook: Вебхук
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: щоб видалити їхні дописи
+        disable: щоб заморозити їхній обліковий запис
+        mark_statuses_as_sensitive: позначати їхні повідомлення делікатними
+        none: попередження
+        sensitive: щоб позначати їхній обліковий запис делікатним
+        silence: щоб обмежити їхній обліковий запис
+        suspend: щоб призупинити їхній обліковий запис
+      body: "%{target} оскаржує модерацію %{action_taken_by} від %{date}, яка була %{type}. Вони написали:"
+      next_steps: Ви можете схвалити апеляцію, щоб скасувати рішення про модерацію або проігнорувати її.
+      subject: "%{username} апелює до рішення про модерацію на %{instance}"
     new_pending_account:
       body: Деталі нового облікового запису наведено нижче. Ви можете схвалити або відхилити цю заяву.
       subject: Новий обліковий запис надіслано на розгляд на %{instance} (%{username})
     new_report:
-      body: "%{reporter} поскаржився(-лася) на %{target}"
-      body_remote: Хтось з домену %{domain} поскаржився(-лася) на %{target}
+      body: "%{reporter} поскаржився на %{target}"
+      body_remote: Хтось з домену %{domain} поскаржився на %{target}
       subject: Нова скарга до %{instance} (#%{id})
-    new_trending_tag:
-      body: 'Хештег #%{name} сьогодні є в тренді, але раніше не переглядався. Він не відображатиметься публічно, якщо ви не дозволите це чи просто збережете форму, щоб ніколи більше про нього не чути.'
-      subject: Новий хештеґ надіслано на розгляд до %{instance} (#%{name})
+    new_trends:
+      body: 'Ці елементи потребують розгляду перед оприлюдненням:'
+      new_trending_links:
+        title: Популярні посилання
+      new_trending_statuses:
+        title: Популярні дописи
+      new_trending_tags:
+        no_approved_tags: На цей час немає схвалених популярних хештегів.
+        requirements: 'Кожен з цих кандидатів може перевершити #%{rank} затвердженого популярного хештеґу, який зараз на #%{lowest_tag_name} з рейтингом %{lowest_tag_score}.'
+        title: Популярні хештеги
+      subject: Нове популярне до розгляду на %{instance}
   aliases:
     add_new: Створити псевдонім
     created_msg: Новий псевдонім успішно створено. Тепер ви можете починати переміщення зі старого облікового запису.
     deleted_msg: Псевдонім успішно видалено. Переміщення з того облікового запису до цього більше не можливе.
     empty: У вас немає псевдонімів.
-    hint_html: Якщо ви збираєтеся мігрувати з іншого облікового запису на цей, ви можете налаштувати псевдонім, що потрібно для перенесення передплатників зі старою облікового запису. Ця дія саме по собі <strong>нешкідливо і оборотно</strong>. <strong>Міграція облікового запису починається з старого облікового запису</strong>.
+    hint_html: Якщо ви збираєтеся мігрувати з іншого облікового запису на цей, ви можете налаштувати псевдонім, який потрібен для перенесення підписок зі старою облікового запису. Ця дія сама по собі <strong>нешкідлива і її можна скасувати</strong>. <strong>Міграція облікового запису починається зі старого облікового запису</strong>.
     remove: Від'єднати псевдонім
   appearance:
-    advanced_web_interface: Розширений web-інтерфейс
-    advanced_web_interface_hint: 'Розширений веб-інтерфейс дає змогу бачити багато стовпчиків одночасно: основна сторінка, сповіщення, глобальна стрічка, будь-які списки та хештеґи. Потребує широкого екрана.'
+    advanced_web_interface: Розширений вебінтерфейс
+    advanced_web_interface_hint: 'Якщо ви бажаєте використовувати всю ширину вашого екрана, розширений вебінтерфейс дає змогу налаштовувати одночасний показ багатьох стовпчиків: головна, сповіщення, федеративна стрічка, будь-яка кількість списків і хештеґів.'
     animations_and_accessibility: Анімація та доступність
     confirmation_dialogs: Діалоги підтвердження
     discovery: Виявлення
@@ -776,44 +958,43 @@ uk:
       guide_link: https://uk.crowdin.com/project/mastodon
       guide_link_text: Кожен може взяти участь.
     sensitive_content: Дражливий зміст
-    toot_layout: Зовнішній вигляд дмухів
+    toot_layout: Зовнішній вигляд дописів
   application_mailer:
-    notification_preferences: Змінити налаштування e-mail
+    notification_preferences: Змінити налаштування електронної пошти
     salutation: "%{name},"
-    settings: 'Змінити налаштування e-mail: %{link}'
+    settings: 'Змінити налаштування електронної пошти: %{link}'
     view: 'Перегляд:'
     view_profile: Показати профіль
-    view_status: Показати статус
+    view_status: Показати допис
   applications:
     created: Застосунок успішно створений
     destroyed: Застосунок успішно видалений
-    invalid_url: Введена URL неправильна
     regenerate_token: Перегенерувати токен доступу
     token_regenerated: Токен доступу успішне перегенеровано
     warning: Будьте дуже обережні з цими даними. Ніколи не діліться ними ні з ким!
     your_token: Ваш токен доступу
   auth:
-    apply_for_account: Запитати запрошення
+    apply_for_account: Запит облікового запису
     change_password: Пароль
-    checkbox_agreement_html: Я погоджуюсь з <a href="%{rules_path}" target="_blank">правилами сервера</a> та <a href="%{terms_path}" target="_blank">умовами використання</a>
-    checkbox_agreement_without_rules_html: Я погоджуюся з <a href="%{terms_path}" target="_blank">умовами використання</a>
     delete_account: Видалити обліковий запис
     delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете <a href="%{path}">перейти сюди</a>. Вас попросять підтвердити дію.
     description:
       prefix_invited_by_user: "@%{name} запрошує вас приєднатися до цього сервера Mastodon!"
       prefix_sign_up: Зареєструйтеся на Mastodon сьогодні!
-      suffix: Маючи обліковий запис, ви зможете підписуватися на людей, публікувати пости та листуватися з користувачами будь-якого сервера Mastodon!
-    didnt_get_confirmation: Ви не отримали інструкції з підтвердження?
+      suffix: Маючи обліковий запис, ви зможете підписуватися на людей, публікувати дописи та листуватися з користувачами будь-якого сервера Mastodon!
+    didnt_get_confirmation: Не отримали інструкції з підтвердження?
     dont_have_your_security_key: Не маєте ключа безпеки?
     forgot_password: Забули пароль?
     invalid_reset_password_token: Токен скидання паролю неправильний або просрочений. Спробуйте попросити новий.
     link_to_otp: Введіть двофакторний код з вашого телефону або код відновлення
     link_to_webauth: Використовувати пристрій ключа безпеки
+    log_in_with: Увійти через
     login: Увійти
     logout: Вийти
     migrate_account: Переїхати на інший обліковий запис
-    migrate_account_html: Якщо ви бажаєте перенаправити цей обліковий запис на інший, ви можете <a href="%{path}">налаштувати це тут</a>.
+    migrate_account_html: Якщо ви бажаєте переспрямувати цей обліковий запис на інший, ви можете <a href="%{path}">налаштувати це тут</a>.
     or_log_in_with: Або увійдіть з
+    privacy_policy_agreement_html: Мною прочитано і я погоджуюся з <a href="%{privacy_policy_path}" target="_blank">політикою приватності</a>
     providers:
       cas: CAS
       saml: SAML
@@ -821,20 +1002,29 @@ uk:
     registration_closed: "%{instance} не приймає нових членів"
     resend_confirmation: Повторно відправити інструкції з підтвердження
     reset_password: Скинути пароль
+    rules:
+      preamble: Вони налаштовані та закріплені модераторами %{domain}.
+      title: Деякі основні правила.
     security: Зміна паролю
     set_new_password: Встановити новий пароль
     setup:
       email_below_hint_html: Якщо ця електронна адреса не є вірною, ви можете змінити її тут та отримати новий лист для підтвердження.
-      email_settings_hint_html: Електронний лист-підтвердження було вислано до %{email}. Якщо ця адреса електронної пошти не є вірною, ви можете змінити її в налаштуваннях облікового запису.
+      email_settings_hint_html: Електронний лист-підтвердження було вислано на %{email}. Якщо ця адреса електронної пошти не правильна, ви можете змінити її в налаштуваннях облікового запису.
       title: Налаштування
+    sign_in:
+      preamble_html: Увійдіть за допомогою облікових даних <strong>%{domain}</strong>. Якщо ваш обліковий запис розміщений на іншому сервері, ви не зможете увійти тут.
+      title: Увійти до %{domain}
+    sign_up:
+      preamble: За допомогою облікового запису на цьому сервері Mastodon, ви зможете слідкувати за будь-якою іншою людиною в мережі, не зважаючи на те, де розміщений обліковий запис.
+      title: Налаштуймо вас на %{domain}.
     status:
-      account_status: Статус облікового запису
+      account_status: Стан облікового запису
       confirming: Очікуємо на завершення підтвердження за допомогою електронної пошти.
-      functional: Ваш обліковий запис повністю робочій.
+      functional: Ваш обліковий запис повністю робочий.
       pending: Ваша заява очікує на розгляд нашим персоналом. Це може зайняти деякий час. Ви отримаєте електронний лист, якщо ваша заява буде схвалена.
       redirecting_to: Ваш обліковий запис наразі неактивний, тому що він перенаправлений до %{acct}.
+      view_strikes: Переглянути попередні попередження вашому обліковому запису
     too_fast: Форму подано занадто швидко, спробуйте ще раз.
-    trouble_logging_in: Проблема під час входу?
     use_security_key: Використовувати ключ безпеки
   authorize_follow:
     already_following: Ви вже слідкуєте за цим обліковим записом
@@ -884,7 +1074,7 @@ uk:
     warning:
       before: 'До того як продовжити, будь ласка уважно прочитайте це:'
       caches: Інформація, кешована іншими серверами, може залишитися
-      data_removal: Ваші пости та інші дані будуть видалені назавжди
+      data_removal: Ваші дописи й інші дані будуть вилучені назавжди
       email_change_html: Ви можете <a href="%{path}">змінити вашу електронну адресу</a>, не видаляючи ваш обліковий запис
       email_contact_html: Якщо його все ще немає, ви можете написали до <a href="mailto:%{email}">%{email}</a> для допомоги
       email_reconfirmation_html: Якщо ви не отримали електронного листа з підтвердженням, ви можете <a href="%{path}">запросити його знову</a>
@@ -892,10 +1082,36 @@ uk:
       more_details_html: Подробиці за посиланням <a href="%{terms_path}">політика конфіденційності</a>.
       username_available: Ваше ім'я користувача стане доступним для використання
       username_unavailable: Ваше ім'я користувача залишиться недоступним для використання
-  directories:
-    directory: Каталог профілів
-    explanation: Шукайте користувачів за їх інтересами
-    explore_mastodon: Досліджуйте %{title}
+  disputes:
+    strikes:
+      action_taken: Дію виконано
+      appeal: Апеляція
+      appeal_approved: Це попередження було успішно оскаржене і більше не дійсне
+      appeal_rejected: Апеляцію було відхилено
+      appeal_submitted_at: Апеляцію надіслано
+      appealed_msg: Вашу апеляцію було надіслано. Якщо її погодять, вам буде повідомлено про це.
+      appeals:
+        submit: Подати апеляцію
+      approve_appeal: Схвалити апеляцію
+      associated_report: Пов'язана скарга
+      created_at: Застарілі
+      description_html: Це дії, виконані проти вашого облікового запису та попереджень, які були відправлені вам персоналом %{instance}.
+      recipient: Адресант
+      reject_appeal: Відхилити апеляцію
+      status: 'Допис #%{id}'
+      status_removed: Допис уже вилучено з системи
+      title: "%{action} від %{date}"
+      title_actions:
+        delete_statuses: Вилучення допису
+        disable: Заморожування облікового запису
+        mark_statuses_as_sensitive: Позначати дописи делікатними
+        none: Попередження
+        sensitive: Позначення облікового запису делікатним
+        silence: Обмеження облікового запису
+        suspend: Призупинення облікового запису
+      your_appeal_approved: Вашу апеляцію було схвалено
+      your_appeal_pending: Ви не подавали апеляцій
+      your_appeal_rejected: Вашу апеляцію було відхилено
   domain_validator:
     invalid_domain: не є допустимим ім'ям домену
   errors:
@@ -920,7 +1136,7 @@ uk:
     archive_takeout:
       date: Дата
       download: Завантажити ваш архів
-      hint_html: Ви можете зробити запит на архів ваших <strong>постів та вивантаженого медіа контенту</strong>. Завантажені дані будуть у форматі ActivityPub, доступні для читання будь-яким сумісним програмним забезпеченням. Ви можете робити запит на архів кожні 7 днів.
+      hint_html: Ви можете зробити запит на архів ваших <strong>дописів та вивантаженого медіавмісту</strong>. Експортовані дані будуть у форматі ActivityPub, доступні для читання будь-яким сумісним програмним забезпеченням. Ви можете робити запит на архів що 7 днів.
       in_progress: Збираємо ваш архів...
       request: Зробити запит на архів
       size: Розмір
@@ -929,13 +1145,13 @@ uk:
     csv: CSV
     domain_blocks: Блокування доменів
     lists: Списки
-    mutes: Список глушення
-    storage: Ваш медіаконтент
+    mutes: Список нехтуваних
+    storage: Ваш медіавміст
   featured_tags:
     add_new: Додати новий
     errors:
       limit: Ви досягли максимальної кількості хештеґів
-    hint_html: "<strong>Що таке виділені хештеґи?</strong> Це ті, що відображаються ни видному місці у вашому публічному профілі. Вони дають змогу людям фільтрувати ваші публічні пости за цими хештеґами. Це дуже корисно для відстеження мистецьких творів та довготривалих проектів."
+    hint_html: "<strong>Що таке виділені хештеґи?</strong> Це ті, що показуються на видному місці у вашому загальнодоступному профілі. Вони дають змогу людям фільтрувати ваші загальнодоступні дописи за цими хештеґами. Це дуже корисно для стеження з мистецькими творами та довготривалими проєктами."
   filters:
     contexts:
       account: Профілі
@@ -944,29 +1160,73 @@ uk:
       public: Глобальні стрічки
       thread: Повідомлення
     edit:
+      add_keyword: Додати ключове слово
+      keywords: Ключові слова
+      statuses: Окремі дописи
+      statuses_hint_html: Цей фільтр застосовується для вибору окремих дописів, незалежно від того, чи збігаються вони з ключовими словами нижче. <a href="%{path}">Перегляд чи вилучення дописів з фільтра</a>.
       title: Редагувати фільтр
     errors:
+      deprecated_api_multiple_keywords: Ці параметри не можна змінити з цього застосунку, тому що вони застосовуються до більш ніж одного ключового слова. Використовуйте новішу версію застосунку або вебінтерфейс.
       invalid_context: Контекст неправильний або не був наданий
-      invalid_irreversible: Незворотне фільтрування працює тільки в контексті свого фіду або сповіщень
     index:
+      contexts: Фільтри в %{contexts}
       delete: Видалити
       empty: У вас немає фільтрів.
+      expires_in: Закінчується %{distance}
+      expires_on: Закінчується %{date}
+      keywords:
+        few: "%{count} ключові слова"
+        many: "%{count} ключових слів"
+        one: "%{count} ключове слово"
+        other: "%{count} ключових слів"
+      statuses:
+        few: "%{count} дописи"
+        many: "%{count} дописів"
+        one: "%{count} допис"
+        other: "%{count} дописа"
+      statuses_long:
+        few: Сховано %{count} окремі дописи
+        many: Сховано %{count} окремих дописів
+        one: Сховано %{count} окремий допис
+        other: Сховано %{count} окремі дописи
       title: Фільтри
     new:
+      save: Зберегти новий фільтр
       title: Додати фільтр
+    statuses:
+      back_to_filter: Назад до фільтру
+      batch:
+        remove: Вилучити з фільтра
+      index:
+        hint: Цей фільтр застосовується для вибору окремих дописів, незалежно від інших критеріїв. Ви можете додавати більше дописів до цього фільтра з вебінтерфейсу.
+        title: Відфільтровані дописи
   footer:
-    developers: Розробникам
-    more: Більше…
-    resources: Ресурси
     trending_now: Актуальні
   generic:
     all: Усі
+    all_items_on_page_selected_html:
+      few: Усі <strong>%{count}</strong> елементи на цій сторінці вибрано.
+      many: Усі <strong>%{count}</strong> елементів на цій сторінці вибрано.
+      one: "<strong>%{count}</strong> елемент на цій сторінці вибрано."
+      other: "<strong>%{count}</strong> елементи на цій сторінці вибрано."
+    all_matching_items_selected_html:
+      few: Усі <strong>%{count}</strong> елементи, що збігаються з вашим пошуком вибрано.
+      many: Усі <strong>%{count}</strong> елементів, що збігаються з вашим пошуком вибрано.
+      one: "<strong>%{count}</strong> елемент, що збігається з вашим пошуком вибрано."
+      other: Усі <strong>%{count}</strong> елементи, що збігаються з вашим пошуком вибрано.
     changes_saved_msg: Зміни успішно збережені!
     copy: Копіювати
     delete: Видалити
-    no_batch_actions_available: На цій сторінці немає запланованих дій
+    deselect: Скасувати вибір
+    none: Немає
     order_by: Сортувати за
     save_changes: Зберегти зміни
+    select_all_matching_items:
+      few: Вибрати всі %{count} елементи, що збігаються з вашим пошуком.
+      many: Вибрати всі %{count} елементів, що збігаються з вашим пошуком.
+      one: Вибрати %{count} елемент, що збігається з вашим пошуком.
+      other: Вибрати всі %{count} елементи, що збігаються з вашим пошуком.
+    today: сьогодні
     validation_errors:
       few: Щось досі не гаразд! Перегляньте %{count} повідомлень про помилки
       many: Щось досі не гаразд! Перегляньте %{count} повідомлень про помилки
@@ -974,36 +1234,17 @@ uk:
       other: Щось досі не гаразд! Перегляньте %{count} повідомлень про помилки
   html_validator:
     invalid_markup: 'містить неприпустиму HTML розмітку: %{error}'
-  identity_proofs:
-    active: Активне
-    authorize: Так, авторизувати
-    authorize_connection_prompt: Авторизувати це зашифроване з'єднання?
-    errors:
-      failed: Не вдалося встановити це зашифроване з'єднання. Спробуйте ще раз за допомогою %{provider}.
-      keybase:
-        invalid_token: Токени Keybase - це хеші від підписів і повинні бути по довжині в 66 hex-символів
-        verification_failed: Keybase не розпізнає цей токен як підпис користувача Keybase %{kb_username}. Будь-ласка, спробуйте з Keybase.
-      wrong_user: Неможливо підтвердити користувача%{proving}, під час входу в систему як %{current}. Виконайте вхід як %{proving} і спробуйте ще раз.
-    explanation_html: На цій сторінці відображаються криптографічні підтверджені ідентифікатори - наприклад, прив'язаний профіль Keybase. Це дозволяє людям відправляти вам зашифровані повідомлення, а також довіряти вашим постам.
-    i_am_html: Я %{username} з %{service}.
-    identity: Ідентичність
-    inactive: Неактивний
-    publicize_checkbox: 'Та дмухнути це:'
-    publicize_toot: 'Це доведено! Я таки %{username} з %{service}: %{url}'
-    remove: Видалення підтвердження з облікового запису
-    removed: Підтвердження видалено з облікового запису
-    status: Стан перевірки
-    view_proof: Переглянути доказ
   imports:
     errors:
+      invalid_csv_file: 'Хибний файл CSV. Помилка: %{error}'
       over_rows_processing_limit: містить більше ніж %{count} рядків
     modes:
       merge: Злиття
-      merge_long: Зберегти існуючі записи та додати нові
+      merge_long: Зберегти наявні записи та додати нові
       overwrite: Перезаписувати
-      overwrite_long: Замінити поточні записи новими
-    preface: Вы можете завантажити деякі дані, наприклад, списки людей, на яких Ви підписані чи яких блокуєте, в Ваш акаунт на цій інстанції з файлів, експортованих з іншої інстанції.
-    success: Ваші дані були успішно загружені та будуть оброблені в найближчий момент
+      overwrite_long: Замінити наявні записи новими
+    preface: Ви можете імпортувати дані, які ви експортували з іншого сервера, наприклад, список людей, яких ви відстежуєте або блокуєте.
+    success: Ваші дані завантажено та буде оброблено найближчим часом
     types:
       blocking: Список блокувань
       bookmarks: Закладки
@@ -1011,7 +1252,6 @@ uk:
       following: Підписки
       muting: Список глушення
     upload: Завантажити
-  in_memoriam_html: Пам'ятник.
   invites:
     delete: Деактивувати
     expired: Вийшов
@@ -1024,7 +1264,7 @@ uk:
       '86400': 1 день
     expires_in_prompt: Ніколи
     generate: Згенерувати
-    invited_by: 'Вас запросив(-ла):'
+    invited_by: 'Вас запросив:'
     max_uses:
       few: "%{count} використання"
       many: "%{count} використань"
@@ -1052,11 +1292,11 @@ uk:
     title: Історія входів
   media_attachments:
     validations:
-      images_and_video: Не можна додати відео до статусу з зображеннями
+      images_and_video: Не можна додати відео до допису з зображеннями
       not_ready: Не можна прикріпити файли, оброблення яких ще не закінчилося. Спробуйте ще раз через хвилину!
       too_many: Не можна додати більше 4 файлів
   migrations:
-    acct: username@domain нового облікового запису
+    acct: Перенесено до
     cancel: Скасувати перенаправлення
     cancel_explanation: Скасування перенаправлення реактивує ваш поточний обліковий запис, але не поверне підписників, які були переміщені в інший обліковий запис.
     cancelled_msg: Перенаправлення успішно скасовано.
@@ -1090,50 +1330,44 @@ uk:
     title: Модерація
   move_handler:
     carry_blocks_over_text: Цей користувач переїхав з %{acct}, який ви заблокували.
-    carry_mutes_over_text: Цей користувач переїхав з %{acct}, який ви заглушили.
+    carry_mutes_over_text: Цей користувач переїхав з %{acct}, який ви нехтуєте.
     copy_account_note_text: 'Цей користувач був переміщений з %{acct}, ось ваші попередні нотатки:'
+  navigation:
+    toggle_menu: Відкрити меню
   notification_mailer:
-    digest:
-      action: Показати усі сповіщення
-      body: Коротко про пропущене вами з Вашого останнього входу %{since}
-      mention: "%{name} згадав(-ла) Вас в:"
-      new_followers_summary:
-        few: У Вас з'явилось %{count} нових підписники! Чудово!
-        many: У Вас з'явилось %{count} нових підписників! Чудово!
-        one: Також, у Вас з'явився новий підписник, коли ви були відсутні! Ура!
-        other: Також, у Вас з'явилось %{count} нових підписників, поки ви були відсутні! Чудово!
-      subject:
-        few: "%{count} нові сповіщення з Вашого останнього входу \U0001F418"
-        many: "%{count} нових сповіщень з Вашого останнього входу \U0001F418"
-        one: "1 нове сповіщення з Вашого останнього входу \U0001F418"
-        other: "%{count} нових сповіщень з Вашого останнього входу \U0001F418"
-      title: Поки ви були відсутні...
+    admin:
+      report:
+        subject: "%{name} подає скаргу"
+      sign_up:
+        subject: "%{name} приєднується"
     favourite:
-      body: 'Ваш статус подобається %{name}:'
-      subject: Користувачу %{name} сподобався ваш статус
+      body: 'Ваш допис подобається %{name}:'
+      subject: Ваш допис сподобався %{name}
       title: Нове вподобання
     follow:
-      body: "%{name} тепер підписаний(-а) на вас!"
-      subject: "%{name} тепер підписаний(-а) на вас"
-      title: Новий підписник(-ця)
+      body: "%{name} тепер стежить за вами!"
+      subject: "%{name} тепер стежить за вами"
+      title: Новий підписник
     follow_request:
       action: Керувати запитами на підписку
-      body: "%{name} запитав(-ла) Вас про підписку"
+      body: "%{name} надіслав запит на підписку"
       subject: "%{name} хоче підписатися на Вас"
       title: Новий запит на підписку
     mention:
       action: Відповісти
       body: 'Вас згадав(-ла) %{name} в:'
-      subject: Вас згадав(-ла) %{name}
+      subject: Вас згадав %{name}
       title: Нова згадка
     poll:
       subject: Опитування від %{name} завершено
     reblog:
-      body: 'Ваш статус було передмухнуто %{name}:'
-      subject: "%{name} передмухнув(-ла) ваш статус"
-      title: Нове передмухування
+      body: "%{name} поширює ваш допис:"
+      subject: "%{name} поширив ваш статус"
+      title: Нове поширення
     status:
       subject: "%{name} щойно опубліковано"
+    update:
+      subject: "%{name} змінює допис"
   notifications:
     email_events: Події, про які сповіщати електронною поштою
     email_events_hint: 'Оберіть події, про які ви хочете отримувати сповіщення:'
@@ -1150,9 +1384,9 @@ uk:
           trillion: трлн
   otp_authentication:
     code_hint: Для підтверждення введіть код, згенерований додатком аутентифікатора
-    description_html: При увімкненні <strong>двофакторної аутентифікації</strong>, вхід буде вимагати від Вас використання Вашого телефона для генерації вхідного коду.
+    description_html: Якщо ви увімкнете <strong>двофакторну автентифікацію</strong> за допомогою застосунку автентифікації, для входу вам буде потрібен телефон, що генеруватиме токени для входу.
     enable: Увімкнути
-    instructions_html: "<strong>Відскануйте цей QR-код за допомогою Google Authenticator чи іншого TOTP-додатку на Вашому телефоні</strong>. Відтепер додаток буде генерувати коди, які буде необхідно ввести для входу."
+    instructions_html: "<strong>Скануйте цей QR-код за допомогою Google Authenticator чи іншого TOTP-застосунку на своєму телефоні</strong>. Відтепер застосунок генеруватиме коди, які буде необхідно ввести для входу."
     manual_instructions: 'Якщо ви не можете сканувати QR-код і потрібно ввести його вручну, ось він:'
     setup: Налаштувати
     wrong_code: Введений код неправильний! Чи правильно встановлений час на сервері та пристрої?
@@ -1175,8 +1409,10 @@ uk:
       too_many_options: не може мати більше ніж %{max} варіантів
   preferences:
     other: Інше
-    posting_defaults: Промовчання для постів
+    posting_defaults: Усталені налаштування дописів
     public_timelines: Глобальні стрічки
+  privacy_policy:
+    title: Політика конфіденційності
   reactions:
     errors:
       limit_reached: Досягнуто обмеження різних реакцій
@@ -1186,9 +1422,9 @@ uk:
     dormant: Неактивні
     follow_selected_followers: Стежити за вибраними підписниками
     followers: Підписники
-    following: Підписник(-ця)
+    following: Підписник
     invited: Запрошені
-    last_active: Крайня активність
+    last_active: Остання активність
     most_recent: За часом створення
     moved: Переміщено
     mutual: Взаємні уподобання
@@ -1197,34 +1433,27 @@ uk:
     remove_selected_domains: Видалити усіх підписників з обраних доменів
     remove_selected_followers: Видалити обраних підписників
     remove_selected_follows: Не стежити за обраними користувачами
-    status: Статус облікового запису
+    status: Стан облікового запису
   remote_follow:
-    acct: Введіть username@domain, яким ви хочете підписатися
     missing_resource: Не вдалося знайти необхідний URL переадресації для вашого облікового запису
-    no_account_html: Не маєте облікового запису? Ви можете <a href='%{sign_up_path}' target='_blank'>зареєструватися тут</a>
-    proceed: Перейти до підписки
-    prompt: 'Ви хочете підписатися на:'
-    reason_html: "<strong>Чому це необхідно?</strong> <code>%{instance}</code> можливо, не є сервером, на якому ви зареєстровані, тому ми маємо спрямувати вас до вашого домашнього сервера."
-  remote_interaction:
-    favourite:
-      proceed: Перейти до додавання в улюблені
-      prompt: 'Ви хочете зробити улюбленим цей дмух:'
-    reblog:
-      proceed: Перейти до передмухування
-      prompt: 'Ви хочете передмухнути цей дмух:'
-    reply:
-      proceed: Перейти до відповіді
-      prompt: 'Ви хочете відповісти на цей дмух:'
+  reports:
+    errors:
+      invalid_rules: не посилається на чинні правила
+  rss:
+    content_warning: 'Попередження про матеріали:'
+    descriptions:
+      account: Загальнодоступні дописи від @%{acct}
+      tag: 'Загальнодоступні дописи позначені #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Ви перевищили ліміт в %{limit} запланованих дмухів на сьогодні
-    over_total_limit: Ви перевищили ліміт в %{limit} запланованих дмухів
+    over_daily_limit: Ви перевищили ліміт в %{limit} запланованих дописів на сьогодні
+    over_total_limit: Ви перевищили ліміт в %{limit} запланованих дописів
     too_soon: Запланована дата має бути в майбутньому
   sessions:
     activity: Остання активність
     browser: Браузер
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Хром
       edge: Microsoft Edge
       electron: Electron
@@ -1238,28 +1467,28 @@ uk:
       phantom_js: PhantomJS
       qq: QQ Browser
       safari: Сафарі
-      uc_browser: UCBrowser
+      uc_browser: UC Browser
       weibo: Weibo
-    current_session: Активна сесія
+    current_session: Поточний сеанс
     description: "%{browser} на %{platform}"
     explanation: Це веб-браузери, авторизовані у вашому обліковому записі Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
-      mac: Mac
+      mac: macOS
       other: невідома платформа
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
     revoke: Закінчити
     revoke_success: Сесія успішно закінчена
-    title: Сесії
+    title: Сеанси
     view_authentication_history: Переглянути історію входів вашого облікового запису
   settings:
     account: Обліковий запис
@@ -1273,7 +1502,6 @@ uk:
     edit_profile: Редагувати профіль
     export: Експорт даних
     featured_tags: Рекомендовані хештеґи
-    identity_proofs: Докази ідентичності
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
@@ -1282,7 +1510,8 @@ uk:
     profile: Профіль
     relationships: Підписки та підписники
     statuses_cleanup: Автовидалення допису
-    two_factor_authentication: Двофакторна авторизація
+    strikes: Попередження модераторів
+    two_factor_authentication: Двофакторна автентифікація
     webauthn_authentication: Ключі безпеки
   statuses:
     attached:
@@ -1304,21 +1533,22 @@ uk:
         other: "%{count} відео"
     boosted_from_html: Просунуто від %{acct_link}
     content_warning: 'Попередження про контент: %{warning}'
+    default_language: Така ж як і мова інтерфейсу
     disallowed_hashtags:
       few: 'заборонених хештеґа: %{tags}'
       many: 'заборонених хештеґів: %{tags}'
       one: 'заборонений хештеґ: %{tags}'
       other: 'заборонених хештеґів: %{tags}'
+    edited_at_html: Відредаговано %{date}
     errors:
-      in_reply_not_found: Статуса, на який ви намагаєтеся відповісти, не існує.
-    language_detection: Автоматично визначати мову
+      in_reply_not_found: Допису, на який ви намагаєтеся відповісти, не існує.
     open_in_web: Відкрити у вебі
-    over_character_limit: перевищено ліміт символів (%{max})
+    over_character_limit: перевищено ліміт символів %{max}
     pin_errors:
-      limit: Ви вже закріпили максимальну кількість постів
-      ownership: Не можна закріпити чужий пост
-      private: Не можна закріпити непублічний пост
-      reblog: Не можна закріпити просунутий пост
+      direct: Не можливо прикріпити дописи, які видимі лише згаданим користувачам
+      limit: Ви вже закріпили максимальну кількість дописів
+      ownership: Не можна закріпити чужий допис
+      reblog: Не можна закріпити просунутий допис
     poll:
       total_people:
         few: "%{count} людей"
@@ -1351,7 +1581,7 @@ uk:
     exceptions: Винятки
     explanation: Оскільки видалення дописів є складною операцією, то це відбувається повільно, коли сервер не дуже завантажено. З цієї причини ваші дописи можуть бути видалені через деякий час після досягнення вікового порогу.
     ignore_favs: Ігнорувати обране
-    ignore_reblogs: Ігнорувати передмухнуті
+    ignore_reblogs: Ігнорувати поширення
     interaction_exceptions: Винятки базуються на взаємодії
     interaction_exceptions_explanation: Зверніть увагу, що немає гарантії, щоб дописи були видалені, якщо вони йдуть нижче улюблених або підсилювачів після того, як вони перейшли за них.
     keep_direct: Зберігати приватні повідомлення
@@ -1372,30 +1602,32 @@ uk:
       '2629746': 1 місяць
       '31556952': 1 рік
       '5259492': 2 місяці
+      '604800': 1 тиждень
       '63113904': 2 роки
       '7889238': 3 місяці
     min_age_label: Поріг давності
     min_favs: Залишати дописи в обраному більше ніж
     min_favs_hint: Не видаляти ваших дописів, що отримали більше вказаної кількості додавання до закладок. Залиште порожнім, щоб видаляти дописи незалежно від кількості їхнього додавання до обраних
-    min_reblogs: Залишати дописи передмухнуті більше ніж
-    min_reblogs_hint: Не видаляти ваших дописів, що були передмухнуті більш ніж вказану кількість разів. Залиште порожнім, щоб видаляти дописи, попри кількість їхніх передмухів
+    min_reblogs: Залишати дописи, поширені більше ніж
+    min_reblogs_hint: Не видаляти ваших дописів, що були поширені більш ніж вказану кількість разів. Залиште порожнім, щоб видаляти дописи, попри кількість їхніх поширень
   stream_entries:
-    pinned: Закріплений пост
-    reblogged: передмухнув(-ла)
+    pinned: Закріплений допис
+    reblogged: поширив
     sensitive_content: Дражливий зміст
+  strikes:
+    errors:
+      too_late: Запізно оскаржувати це попередження
   tags:
     does_not_match_previous_name: не збігається з попереднім ім'ям
-  terms:
-    body_html: "<h2>Політика конфіденційності</h2>\n<h3 id=\"collect\">Яку інформацію ми збираємо?</h3>\n\n<ul>\n<li><em>Основна інформація про обліковий запис</em>: Якщо ви реєструєтесь на цьому сервері, вас можуть попросити ввести ім’я користувача, електронну адресу та пароль. Ви також можете ввести додаткову інформацію профілю, наприклад, ім'я для відображення та біографію, завантажити зображення профілю та зображення заголовка. Ім'я користувача, відображуване ім’я, біографія, зображення профілю та зображення заголовка завжди є загальнодоступними.</li>\n<li><em>Повідомлення, підписки та інша публічна інформація</em>: Список людей, на яких ви підписані, є публічним, це ж стосується і списка ваших підписників. Коли ви надсилаєте повідомлення, дата та час зберігаються, а також програма, за допомогою якої ви надіслали повідомлення. Повідомлення можуть містити мультимедійні вкладення, такі як зображення та відео. Загальнодоступні публікації, навіть приховані зі стрічок, доступні для всіх. Коли ви розміщуєте публікацію у своєму профілі, це також загальнодоступна інформація. Ваші публікації доставляються вашим підписникам, у деяких випадках це означає, що вони доставляються на інші сервери і копії зберігаються там. Коли ви видаляєте публікації, ця інформація також доставляється вашим \nпідписникам. Перепости та вподобання завжди публічні.</li>\n<li><em>Прямі публікації та пости лише для підписників</em>: Усі повідомлення зберігаються та обробляються на сервері. Публікації лише для підписників доставляються вашим підписникам та користувачам, які згадуються в них, а прямі повідомлення надсилаються лише тим користувачам, які в них згадуються. У \nдеяких випадках це означає, що вони доставляються на інші сервери і копії зберігаються там. Ми докладаємо сумлінних зусиль, щоб обмежити доступ до цих постів лише уповноваженим особам, але інші сервери можуть цього не зробити. Тому важливо переглянути сервери, до яких належать ваші підписники. Ви можете переключити параметр для схвалення та відхилення нових підписників вручну в налаштуваннях. <em>Будь ласка, майте на увазі, що оператори нашого сервера та будь-якого приймаючого сервера, можуть переглядати такі повідомлення</em>, і що одержувачі можуть робити скріншот, копіювати або повторно ділитися ними. <em>Не діліться будь-якою небезпечною інформацією на Mastodon.</em></li>\n<li><em>IP-адреси та інші метадані</em>: Коли ви входите в систему, ми записуємо IP-адресу, з якої ви входите, а також назву веб-переглядача. Усі сеанси, якими ви ввійшли в систему, доступні вам для перегляду та скасування в налаштуваннях. Остання використана IP-адреса зберігається до 12 місяців. Ми також можемо зберігати журнали серверів, які включають IP-адресу кожного запиту на наш сервер.</li>\n</ul>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"use\">Для чого ми використовуємо вашу інформацію?</h3>\n\n<p>Будь-яка інформація, яку ми збираємо від вас, може використовуватися такими способами:</p>\n\n<ul>\n<li>Для забезпечення основної функціональності Mastodon. Ви можете взаємодіяти з вмістом інших людей та розміщувати власний вміст лише тоді, коли ви ввійшли в систему. Наприклад, ви можете підписатись на інших людей, щоб переглядати їх публікації об’єднаними на вашій власній персоналізованій локальній стрічці. </li>\n<li>Щоб сприяти модерації спільноти, наприклад, порівнюючи вашу IP-адресу з іншими відомими адресами для визначення ухилення від бану чи інших порушень.</li>\n<li>Електронна адреса, яку ви вводите, може використовуватися для надсилання вам інформації, сповіщень про інших людей, які взаємодіють з вашим вмістом або надсилають вам повідомлення, а також для відповіді на запити та/або інші запитання./li>\n</ul>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"protect\">Як ми захищаємо вашу інформацію?</h3>\n\n<p>Ми застосовуємо різноманітні заходи безпеки для підтримки безпеки вашої особистої інформації під час введення, подання чи доступу до вашої особистої інформації. Крім усього іншого, сеанс вашого веб-переглядача, а також трафік між вашими програмами та API захищені SSL, а ваш пароль хеширується за допомогою сильного одностороннього алгоритму. Ви можете дозволити двофакторну автентифікацію для подальшого захисту доступу до свого облікового запису.</p>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"data-retention\">Яка наша політика збереження даних?</h3>\n\n<p>Ми докладемо зусиль для того, щоб:</p>\n\n<ul>\n<li>Зберігати журнали сервера, що містять IP-адресу всіх запитів на цьому сервері, але більше 90 днів.</li>\n<li>Зберігати IP-адреси, пов’язані з зареєстрованими користувачами, не більше 12 місяців.</li>\n</ul>\n\n<p>Ви можете запитати та завантажити архів свого вмісту, включаючи ваші публікації, медіа-додатки, зображення профілю та зображення заголовка.</p>\n\n<p>Ви можете в будь-який час безповоротно видалити свій обліковий запис.</p>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"cookies\">Чи використовуємо ми файли cookie?</h3>\n\n<p>Так. Файли cookie — це невеликі файли, які сайт або його постачальник послуг передає на жорсткий диск вашого комп'ютера через веб-браузер (якщо ви це дозволите). Ці файли cookie дозволяють сайту розпізнавати ваш веб-переглядач і, якщо у вас зареєстрований обліковий запис, пов’язувати його зі своїм зареєстрованим обліковим записом.</p>\n\n<p>Ми використовуємо файли cookie, щоб зрозуміти і зберегти ваші налаштування для майбутніх відвідувань. </p>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"disclose\">Чи розкриваємо ми будь-яку інформацію іншим сторонам?</h3>\n\n<p>Ми не продаємо, не торгуємо та іншим чином не передаємо назовні вашої особистої інформації. Це не стосується довірених третіх осіб, які допомагають нам керувати нашим сайтом, вести наш бізнес або обслуговувати вас, якщо ці сторони погоджуються зберігати цю інформацію конфіденційною. Ми також можемо оприлюднити вашу інформацію, коли вважаємо, що випуск доцільний для дотримання законодавства, \nзастосування політики нашого веб-сайта чи захисту наших або інших прав, власності чи безпеки.</p>\n\n<p>Ваш загальнодоступний вміст може завантажуватися іншими серверами в мережі. Ваші загальнодоступні публікації та публікації лише для підписників, доставляються на сервери, де \"проживають\" ваші підписники, а прямі повідомлення надходять на сервери одержувачів, якщо ці підписники або одержувачі проживають на іншому сервері, ніж цей./p>\n\n<p>Коли ви дозволяєте додатку використовувати ваш обліковий запис, залежно від обсягу дозволів, які ви затверджуєте, він може отримати доступ до вашої інформації про загальнодоступний профіль, список ваших підписок, ваші підписники, ваші списки, всі ваші публікації та вибране. Програми ніколи не можуть отримати доступ до вашої електронної адреси чи пароля.</p>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"children\">Використання сайту дітьми</h3>\n\n<p>Якщо цей сервер знаходиться в ЄС або ЄЕП: наш сайт, продукти та послуги спрямовані на людей, яким не менше 16 років. Якщо вам не виповнилося 16 років, відповідно до вимог GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">Загальне положення про захист даних</a>) не використовуйте цей веб-сайт.</p>\n\n<p>Якщо цей сервер знаходиться в США: наш сайт, продукти та послуги спрямовані на людей, яким не менше 13 років. Якщо вам не виповнилося 13 років, відповідно до вимог COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Закон про захист конфіденційності дітей в Інтернеті</a>) не використовуйте цей сайт.</p>\n\n<p>Законодавчі вимоги можуть бути різними, якщо цей сервер знаходиться в іншій юрисдикції.</p>\n\n<hr class=\"spacer\"/>\n\n<h3 id=\"changes\">Зміни в нашій Політиці конфіденційності</h3>\n\n<p>Якщо ми вирішимо змінити нашу політику конфіденційності, ми опублікуємо ці зміни на цій сторінці. </p>\n\n<p>Цей документ є CC-BY-SA. Востаннє оновлено 7 березня 2018 року.</p>\n\n<p>Первісно адаптовано з <a href=\"https://github.com/discourse/discourse\">політики конфіденційності дискурсу</a>.</p>\n"
-    title: Умови використання та Політика приватності %{instance}
   themes:
-    contrast: Висока контрасність
-    default: Mastodon
+    contrast: Mastodon (Висока контрастність)
+    default: Mastodon (Темна)
     mastodon-light: Mastodon (світла)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Додати
     disable: Вимкнути
@@ -1412,65 +1644,75 @@ uk:
     recovery_instructions_html: У випадку втрати доступу до вашого телефону ви можете використати один з нижчевказаних кодів відновлення, щоб повернути доступ до вашого облікового запису. <strong>Тримайте коди відновлення у безпеці</strong>, наприклад, роздрукуйте їх та зберігайте разом з іншими важливими документами.
     webauthn: Ключі безпеки
   user_mailer:
+    appeal_approved:
+      action: Перейти у ваш обліковий запис
+      explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було схвалено. Ваш обліковий запис знову вважається добропорядним.
+      subject: Вашу апеляцію від %{date} було схвалено
+      title: Апеляцію схвалено
+    appeal_rejected:
+      explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було відхилено.
+      subject: Вашу апеляцію від %{date} було відхилено
+      title: Апеляцію відхилено
     backup_ready:
       explanation: Ви робили запит повної резервної копії вашого облікового запису Mastodon. Вона вже готова для завантаження!
       subject: Ваш архів готовий до завантаження
       title: Винесення архіву
-    sign_in_token:
-      details: 'Детальніше про спробу входу:'
-      explanation: 'Ми виявили спробу входу до вашого облікового запису з невідомої IP-адреси. Якщо це ви, будь ласка, введіть наведений нижче код безпеки на сторінці входу:'
-      further_actions: 'Якщо це були не ви, будь ласка, змініть свій пароль та увімкніть двофакторну автентифікацію для вашого облікового запису. Ви можете зробити це тут:'
-      subject: Будь ласка, підтвердіть спробу входу
-      title: Спроба входу
+    suspicious_sign_in:
+      change_password: змінити свій пароль
+      details: 'Відомості про вхід:'
+      explanation: Ми виявили вхід до вашого облікового запису з нової IP-адреси.
+      further_actions_html: Якщо це були не ви. Радимо вам негайно %{action} й увімкнути двоетапну перевірку, щоб уберегти свій обліковий запис.
+      subject: До вашого облікового запису отримано доступ з нової IP-адреси
+      title: Новий вхід
     warning:
+      appeal: Подати апеляцію
+      appeal_description: Якщо ви вважаєте, що це помилка, ви можете надіслати оскаржити дії персоналу %{instance}.
+      categories:
+        spam: Спам
+        violation: Вміст порушує такі правила спільноти
       explanation:
-        disable: Поки ваш обліковий запис заморожений, його дані залишаються незмінними. Проте ви не зможете виконувати будь-які дії над обліковим записом, доки його не буде розблоковано.
-        sensitive: Ваші завантажені медіа-файли та пов'язані медіа вважатимуться делікатними.
-        silence: Поки ваш обліковий запис обмежено, ваші дмухи на цьому сервері бачитимуть лише ті люди, які вже слідкують за вами, а вас може бути виключено з різних публічних списків. Тим не менш, інші можуть слідкувати за вами вручну.
-        suspend: Ваш обліковий запис було призупинено, а всі ваші дмухи і вивантажені медіафайли - безповоротно видалено з цього сервера та серверів, де ви мали послідовників.
-      get_in_touch: Ви можете відповісти на цей електронний лист, щоб зконтактувати з працівниками %{instance}.
-      review_server_policies: Переглянути політики сервера
-      statuses: 'Зокрема, для:'
+        delete_statuses: Деякі з ваших дописів порушили одне або кілька правил спільноти, і модератори %{instance} видалили їх.
+        disable: Ви можете більше не використовувати свій обліковий запис, але ваш профіль та інші дані залишаються недоторканими. Ви можете надіслати запит на створення резервної копії ваших даних, змінити налаштування облікового запису або видалити свій обліковий запис.
+        mark_statuses_as_sensitive: Деякі з ваших дописів модератори %{instance} позначили делікатними. Це означає, що людям потрібно буде торкнутися медіа у дописах перед тим, як буде показано попередній перегляд. Ви можете самостійно позначити медіа делікатним, коли розміщуватимете його в майбутньому.
+        sensitive: Відтепер усі ваші завантажені медіафайли будуть позначені делікатними й приховані за попередженням.
+        silence: Ви й надалі можете користуватися своїм обліковим записом, але ваші дописи на цьому сервері бачитимуть лише ті люди, які вже стежать за вами, а вас може бути виключено з різних можливостей виявлення. Проте, інші можуть почати стежити за вами вручну.
+        suspend: Ви більше не можете користуватися своїм обліковим записом, а ваші інші дані більше недоступні. Ви досі можете увійти, щоб надіслати запит на отримання резервної копії своїх даних до повного видалення впродовж приблизно 30 днів, але ми збережемо деякі основні дані, щоб унеможливити ухилення вами від призупинення.
+      reason: 'Причина:'
+      statuses: 'Цитовані дописи:'
       subject:
+        delete_statuses: Ваші дописи на %{acct} були вилучені
         disable: Ваш обліковий запис %{acct} було заморожено
+        mark_statuses_as_sensitive: Ваші дописи на %{acct} позначені делікатними
         none: Попередження для %{acct}
-        sensitive: Ваш обліковий запис %{acct} надсилав медіа позначені делікатними
+        sensitive: Ваші дописи на %{acct} відтепер будуть позначені делікатними
         silence: Ваш обліковий запис %{acct} було обмежено
         suspend: Ваш обліковий запис %{acct} було призупинено
       title:
+        delete_statuses: Дописи вилучено
         disable: Обліковий запис заморожено
+        mark_statuses_as_sensitive: Дописи позначено делікатними
         none: Попередження
-        sensitive: Ваші медіа позначено делікатними
+        sensitive: Обліковий запис позначено делікатним
         silence: Ообліковий запис обмежено
         suspend: Обліковий запис призупинено
     welcome:
       edit_profile_action: Налаштувати профіль
-      edit_profile_step: Ви можете налаштувати ваш профіль, завантаживши аватар, шпалери, змінивши відображуване ім'я тощо. Якщо ви захочете переглядати нових підписників до того, як вони зможуть підписатися на вас, ви можете заблокувати свій обліковий запис.
-      explanation: Ось декілька порад для початку
-      final_action: Почати постити
-      final_step: 'Почність постити! Навіть не підписавшись на вас, інші зможуть побачити ваші пости, наприклад, у локальній стрічці та у хештеґах. Якщо ви хочете представитися, можете скористатися хештеґом #introductions.'
+      edit_profile_step: Ви можете налаштувати свій профіль, завантаживши зображення профілю, змінивши відображуване ім'я та інше. Ви можете включити для перегляду нових підписників до того, як вони матимуть змогу підписатися на вас.
+      explanation: Ось кілька порад для початку
+      final_action: Почати писати
+      final_step: 'Почніть дописувати! Навіть не підписавшись на вас, інші зможуть побачити ваші дописи, наприклад, у локальній стрічці та у хештеґах. Якщо ви хочете представитися, можете скористатися хештеґом #introductions.'
       full_handle: Ваше звернення
       full_handle_hint: Те, що ви хочете сказати друзям, щоб вони могли написати вам або підписатися з інших сайтів.
-      review_preferences_action: Змінити налаштування
-      review_preferences_step: Переконайтеся у тому, що ви налаштували все необхідне, як от які e-mail повідомлення ви хочете отримувати, або який рівень приватності ви хочете встановити вашим постам за замовчуванням. Якщо хочете, ви можете увімкнути автоматичне програвання GIF анімацій.
       subject: Ласкаво просимо до Mastodon
-      tip_federated_timeline: Федерований фід є широким поглядом на мережу Mastodon. Але він включає лише людей, на яких підписані ваші сусіди по сайту, тому він не є повним.
-      tip_following: Ви автоматично підписані на адміністратора(-ів) сервера. Для того, щоб знайти ще цікавих людей, дослідіть локальну та глобальну стрічки.
-      tip_local_timeline: Локальний фід - це погляд згори на людей на %{instance}. Це ваші прямі сусіди!
-      tip_mobile_webapp: Якщо ваш мобільний браузер пропонує вам додати Mastodon на робочий стіл, ви можете отримувати push-сповіщення. Все може виглядати як нативний застосунок у багатьох речах.
-      tips: Поради
       title: Ласкаво просимо, %{name}!
   users:
     follow_limit_reached: Не можна слідкувати більш ніж за %{limit} людей
-    generic_access_help_html: Не вдається отримати доступ до облікового запису? Ви можете зв'язатися з %{email} для допомоги
     invalid_otp_token: Введено неправильний код
-    invalid_sign_in_token: Хибний код безпеки
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
     seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
-    suspicious_sign_in_confirmation: Здається, ви не входили до цього облікового запису з цього пристрою, а також не входили взагалі деякий час, таким чином ми надсилаємо код безпеки на вашу адресу електронної пошти, щоб підтвердити, що це ви.
   verification:
-    explanation_html: 'Володіння посиланнями у профілі <strong>можна підтвердити</strong>. Для цього на зазначеному сайті повинна міститися посилання на ваш профіль Mastodon, а у самому посиланні <strong>повинен</strong> бути атрибут <code>rel="me"</code>. Що всередині посилання - значення не має. Ось вам приклад посилання:'
+    explanation_html: 'Ви можете <strong>підтвердити володіння посиланнями в метаданих вашого профілю</strong>. Для цього на зазначеному сайті повинне міститися посилання на ваш профіль Mastodon. Посилання <strong>повинне</strong> мати атрибут <code>rel="me"</code>. Текстовий вміст посилання не має значення. Ось приклад:'
     verification: Підтвердження
   webauthn_credentials:
     add: Додати новий ключ безпеки
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c02abef22..fbc8db2cc 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1,128 +1,71 @@
 ---
 vi:
   about:
-    about_hashtag_html: Đây là các tút <strong>#%{hashtag}</strong> trên mạng liên hợp. Bạn có thể tương tác với chúng sau khi đăng nhập.
-    about_mastodon_html: 'Mạng xã hội của tương lai: Không quảng cáo, không theo dõi người dùng và phi tập quyền! Làm chủ quyền riêng tư của bạn với Mastodon!'
-    about_this: Giới thiệu
-    active_count_after: hoạt động
-    active_footnote: Người dùng hoạt động hàng tháng (MAU)
-    administered_by: 'Quản trị viên:'
-    api: API
-    apps: Ứng dụng di động
-    apps_platforms: Lướt Mastodon trên iOS, Android và các nền tảng khác
-    browse_directory: Bạn bè từ khắp mọi nơi trên thế giới
-    browse_local_posts: Xem những gì đang xảy ra
-    browse_public_posts: Đọc thử những tút công khai trên Mastodon
-    contact: Liên lạc
+    about_mastodon_html: 'Mạng xã hội của tương lai: Không quảng cáo, không bán thông tin người dùng và phi tập trung! Làm chủ dữ liệu của bạn với Mastodon!'
     contact_missing: Chưa thiết lập
     contact_unavailable: N/A
-    discover_users: Thành viên
-    documentation: Tài liệu
-    federation_hint_html: Đăng ký tài khoản %{instance} là bạn có thể giao tiếp với bất cứ ai trên bất kỳ máy chủ Mastodon nào và còn hơn thế nữa.
-    get_apps: Ứng dụng di động
     hosted_on: "%{domain} vận hành nhờ Mastodon"
-    instance_actor_flash: Đây là một tài khoản ảo được sử dụng để đại diện cho máy chủ chứ không phải bất kỳ người dùng cá nhân nào. Nó được sử dụng cho mục đích liên kết và không nên chặn trừ khi bạn muốn chặn toàn bộ máy chủ.
-    learn_more: Tìm hiểu
-    privacy_policy: Chính sách bảo mật
-    rules: Quy tắc máy chủ
-    rules_html: 'Bên dưới là những quy tắc của máy chủ Mastodon này, bạn phải đọc kỹ trước khi đăng ký:'
-    see_whats_happening: Dòng thời gian
-    server_stats: 'Thống kê:'
-    source_code: Mã nguồn
-    status_count_after:
-      other: tút
-    status_count_before: Nơi lưu giữ
-    tagline: Theo dõi bạn bè và khám phá thế giới
-    terms: Điều khoản dịch vụ
-    unavailable_content: Giới hạn chung
-    unavailable_content_description:
-      domain: Máy chủ
-      reason: Lý do
-      rejecting_media: 'Ảnh và video từ những máy chủ sau sẽ không được xử lý, lưu trữ và hiển thị hình thu nhỏ. Bắt buộc nhấp thủ công vào tệp gốc để xem:'
-      rejecting_media_title: Ảnh và video
-      silenced: 'Tút từ những máy chủ sau sẽ bị ẩn trên bảng tin, trong tin nhắn và không có thông báo nào được tạo từ các tương tác của người dùng của họ, trừ khi bạn có theo dõi người dùng của họ:'
-      silenced_title: Những máy chủ bị hạn chế
-      suspended: 'Những máy chủ sau sẽ không được xử lý, lưu trữ hoặc trao đổi nội dung. Mọi tương tác hoặc giao tiếp với người dùng từ các máy chủ này đều bị cấm:'
-      suspended_title: Những máy chủ bị vô hiệu hóa
-    unavailable_content_html: Mastodon cho phép bạn tương tác nội dung và giao tiếp với người dùng từ bất kỳ máy chủ nào khác trong mạng liên hợp. Còn máy chủ này có những ngoại lệ riêng.
-    user_count_after:
-      other: người dùng
-    user_count_before: Nhà của
-    what_is_mastodon: Mastodon là gì?
+    title: Giới thiệu
   accounts:
-    choices_html: "%{name} tôn vinh:"
-    endorsements_hint: Bạn có thể tôn vinh những người bạn theo dõi và họ sẽ hiển thị ở giao diện web.
-    featured_tags_hint: Bạn có thể cho biết những hashtag thường dùng ở đây.
     follow: Theo dõi
     followers:
       other: Người theo dõi
     following: Theo dõi
     instance_actor_flash: Tài khoản này được dùng để đại diện cho máy chủ và không phải là người thật. Đừng bao giờ vô hiệu hóa tài khoản này.
-    joined: Đã tham gia %{date}
     last_active: online
-    link_verified_on: Liên kết này đã được xác thực quyền sở hữu vào %{date}
-    media: Media
-    moved_html: "%{name} đã đổi thành %{new_profile_link}:"
-    network_hidden: Dữ liệu đã bị ẩn
-    never_active: Chưa có
+    link_verified_on: Liên kết này đã được xác minh quyền sở hữu vào %{date}
     nothing_here: Trống trơn!
-    people_followed_by: Những người %{name} theo dõi
-    people_who_follow: Những người theo dõi %{name}
     pin_errors:
       following: Để tôn vinh người nào đó, bạn phải theo dõi họ trước
     posts:
       other: Tút
     posts_tab_heading: Tút
-    posts_with_replies: Trả lời
-    roles:
-      admin: Quản trị viên
-      bot: Tài khoản Bot
-      group: Nhóm
-      moderator: Kiểm duyệt viên
-    unavailable: Tài khoản bị đình chỉ
-    unfollow: Ngưng theo dõi
   admin:
     account_actions:
       action: Thực hiện hành động
       title: Áp đặt kiểm duyệt với %{acct}
     account_moderation_notes:
-      create: Thêm ghi chú
-      created_msg: Thêm ghi chú kiểm duyệt thành công!
-      delete: Xóa bỏ
-      destroyed_msg: Đã xóa ghi chú kiểm duyệt!
+      create: Thêm lưu ý
+      created_msg: Thêm lưu ý kiểm duyệt thành công!
+      destroyed_msg: Đã xóa lưu ý kiểm duyệt!
     accounts:
       add_email_domain_block: Chặn tên miền email
       approve: Phê duyệt
-      approve_all: Phê duyệt tất cả
       approved_msg: Đã phê duyệt %{username} đăng ký thành công
       are_you_sure: Bạn có chắc không?
       avatar: Ảnh đại diện
       by_domain: Máy chủ
       change_email:
-        changed_msg: Email tài khoản đã thay đổi thành công!
+        changed_msg: Email đã thay đổi thành công!
         current_email: Email hiện tại
         label: Thay đổi email
         new_email: Email mới
         submit: Thay đổi email
         title: Thay đổi email cho %{username}
+      change_role:
+        changed_msg: Vai trò đã thay đổi thành công!
+        label: Đổi vai trò
+        no_role: Chưa có vai trò
+        title: Thay đổi vai trò %{username}
       confirm: Phê duyệt
-      confirmed: Đã xác thực
+      confirmed: Đã xác minh
       confirming: Chờ xác nhận
+      custom: Tùy chỉnh
       delete: Xóa dữ liệu
       deleted: Đã xóa
-      demote: Xóa chức vụ
+      demote: Xóa vai trò
       destroyed_msg: Dữ liệu %{username} sẽ được lên lịch xóa ngay bây giờ
-      disable: Tạm khóa
-      disable_sign_in_token_auth: Tắt xác thực bằng email
-      disable_two_factor_authentication: Vô hiệu hóa xác thực hai bước
-      disabled: Đã vô hiệu hóa
-      display_name: Tên hiển thị
+      disable: Khóa
+      disable_sign_in_token_auth: Vô hiệu hóa xác minh bằng email
+      disable_two_factor_authentication: Vô hiệu hóa xác minh 2 bước
+      disabled: Tạm khóa
+      display_name: Biệt danh
       domain: Máy chủ
       edit: Chỉnh sửa
       email: Email
       email_status: Trạng thái
       enable: Mở lại
-      enable_sign_in_token_auth: Bật xác thực bằng email
+      enable_sign_in_token_auth: Bật xác minh bằng email
       enabled: Đã duyệt
       enabled_msg: Đã kích hoạt lại tài khoản %{username} thành công
       followers: Người theo dõi
@@ -134,8 +77,8 @@ vi:
       ip: IP
       joined: Đã tham gia
       location:
-        all: Toàn bộ
-        local: Máy chủ của bạn
+        all: Tất cả
+        local: Máy chủ này
         remote: Máy chủ khác
         title: Vị trí
       login_status: Trạng thái tài khoản
@@ -145,68 +88,70 @@ vi:
       memorialized_msg: Đã chuyển %{username} thành tài khoản tưởng nhớ
       moderation:
         active: Hoạt động
-        all: Toàn bộ
-        pending: Chờ xử lý
+        all: Tất cả
+        pending: Chờ
         silenced: Hạn chế
         suspended: Vô hiệu hóa
         title: Trạng thái
       moderation_notes: Nhật ký kiểm duyệt
       most_recent_activity: Hoạt động lần cuối
-      most_recent_ip: IP gần đây nhất
+      most_recent_ip: IP gần nhất
       no_account_selected: Không có tài khoản nào thay đổi vì không có tài khoản nào được chọn
       no_limits_imposed: Bình thường
+      no_role_assigned: Chưa có vai trò
       not_subscribed: Chưa đăng ký
       pending: Chờ duyệt
       perform_full_suspension: Vô hiệu hóa
-      promote: Chỉ định chức vụ
+      previous_strikes: Lịch sử kiểm duyệt
+      previous_strikes_description_html:
+        other: Người này bị cảnh cáo <strong>%{count}</strong> lần.
+      promote: Chỉ định vai trò
       protocol: Giao thức
       public: Công khai
       push_subscription_expires: Đăng ký PuSH hết hạn
-      redownload: Làm mới trang cá nhân
+      redownload: Làm mới trang hồ sơ
       redownloaded_msg: Đã tiếp nhận tài khoản %{username} thành công
       reject: Từ chối
-      reject_all: Từ chối tất cả
       rejected_msg: Đã từ chối đăng ký tài khoản %{username}
+      remote_suspension_irreversible: Dữ liệu của người này đã bị xóa vĩnh viễn.
+      remote_suspension_reversible_hint_html: Mọi dữ liệu của người này sẽ bị xóa hoàn toàn vào %{date}. Trước thời hạn này, các máy chủ khác vẫn có thể lưu trữ mà không ảnh hưởng. Nếu bạn muốn xóa dữ liệu của người này ngay lập tức, hãy tiếp tục.
       remove_avatar: Xóa ảnh đại diện
       remove_header: Xóa ảnh bìa
       removed_avatar_msg: Đã xóa bỏ ảnh đại diện của %{username}
       removed_header_msg: Đã xóa bỏ ảnh bìa của %{username}
       resend_confirmation:
-        already_confirmed: Người dùng này đã được xác thực
+        already_confirmed: Người này đã được xác minh
         send: Gửi lại email xác nhận
         success: Email xác nhận đã gửi thành công!
-      reset: Làm tươi
+      reset: Đặt lại
       reset_password: Đặt lại mật khẩu
       resubscribe: Đăng ký lại
-      role: Chức vụ
-      roles:
-        admin: Quản trị viên
-        moderator: Kiểm duyệt viên
-        staff: Nhân viên
-        user: Người dùng
+      role: Vai trò
       search: Tìm kiếm
       search_same_email_domain: Tra cứu email
       search_same_ip: Tra cứu IP
       security_measures:
         only_password: Chỉ mật khẩu
         password_and_2fa: Mật khẩu và 2FA
-        password_and_sign_in_token: Mật khẩu và email
       sensitive: Nhạy cảm
       sensitized: Đánh dấu nhạy cảm
       shared_inbox_url: Hộp thư của máy chủ người này
       show:
-        created_reports: Lượt báo cáo
-        targeted_reports: Báo cáo bởi người khác
-      silence: Ẩn
+        created_reports: Gửi báo cáo
+        targeted_reports: Bị báo cáo
+      silence: Hạn chế
       silenced: Hạn chế
       statuses: Tút
+      strikes: Lịch sử kiểm duyệt
       subscribe: Đăng ký
+      suspend: Vô hiệu hóa
       suspended: Vô hiệu hóa
-      suspension_irreversible: Toàn bộ dữ liệu của người dùng này sẽ bị xóa hết. Bạn vẫn có thể ngừng vô hiệu hóa nhưng dữ liệu sẽ không thể phục hồi.
+      suspension_irreversible: Toàn bộ dữ liệu của người này sẽ bị xóa hết. Bạn vẫn có thể ngừng vô hiệu hóa nhưng dữ liệu sẽ không thể phục hồi.
       suspension_reversible_hint_html: Mọi dữ liệu của người này sẽ bị xóa sạch vào %{date}. Trước thời hạn này, dữ liệu vẫn có thể phục hồi. Nếu bạn muốn xóa dữ liệu của người này ngay lập tức, hãy tiếp tục.
-      time_in_queue: Đang chờ cách đây %{time}
       title: Tài khoản
-      unconfirmed_email: Email chưa được xác thực
+      unblock_email: Mở khóa địa chỉ email
+      unblocked_email_msg: Mở khóa thành công địa chỉ email của %{username}
+      unconfirmed_email: Email chưa được xác minh
       undo_sensitized: Đánh dấu bình thường
       undo_silenced: Bỏ hạn chế
       undo_suspension: Bỏ vô hiệu hóa
@@ -215,111 +160,139 @@ vi:
       unsuspended_msg: Đã kích hoạt lại %{username} thành công
       username: Tài khoản
       view_domain: Xem mô tả tài khoản này
-      warn: Cảnh cáo
+      warn: Nhắc
       web: Web
       whitelisted: Danh sách trắng
     action_logs:
       action_types:
+        approve_appeal: Chấp nhận kháng cáo
+        approve_user: Chấp nhận người dùng
         assigned_to_self_report: Tự xử lý báo cáo
         change_email_user: Đổi email
-        confirm_user: Xác thực
+        change_role_user: Thay đổi vai trò
+        confirm_user: Xác minh
         create_account_warning: Cảnh cáo
         create_announcement: Tạo thông báo mới
-        create_custom_emoji: Tạo emoji mới
-        create_domain_allow: Tạo cho phép máy chủ mới
-        create_domain_block: Tạo chặn máy chủ mới
-        create_email_domain_block: Tạo chặn tên miền email mới
+        create_canonical_email_block: Tạo chặn tên miền email mới
+        create_custom_emoji: Tạo emoji
+        create_domain_allow: Cho phép máy chủ
+        create_domain_block: Chặn máy chủ
+        create_email_domain_block: Chặn tên miền email
         create_ip_block: Tạo chặn IP mới
-        create_unavailable_domain: Tạo máy chủ không khả dụng
-        demote_user: Xóa chức vụ
+        create_unavailable_domain: Máy chủ không khả dụng
+        create_user_role: Tạo vai trò
+        demote_user: Xóa vai trò
         destroy_announcement: Xóa thông báo
+        destroy_canonical_email_block: Bỏ chặn tên miền email
         destroy_custom_emoji: Xóa emoji
-        destroy_domain_allow: Xóa máy chủ cho phép
-        destroy_domain_block: Xóa máy chủ đã chặn
-        destroy_email_domain_block: Xóa tên miền email đã chặn
+        destroy_domain_allow: Bỏ cho phép máy chủ
+        destroy_domain_block: Bỏ chặn máy chủ
+        destroy_email_domain_block: Bỏ chặn tên miền email
+        destroy_instance: Thanh trừng máy chủ
         destroy_ip_block: Xóa IP đã chặn
         destroy_status: Xóa tút
         destroy_unavailable_domain: Xóa máy chủ không khả dụng
+        destroy_user_role: Xóa vai trò
         disable_2fa_user: Vô hiệu hóa 2FA
         disable_custom_emoji: Vô hiệu hóa emoji
-        disable_sign_in_token_auth_user: Tắt xác thực bằng email cho người dùng
-        disable_user: Tạm khóa người dùng
-        enable_custom_emoji: Kích hoạt Emoji
-        enable_sign_in_token_auth_user: Bật xác thực bằng email cho người dùng
-        enable_user: Kích hoạt lại người dùng
+        disable_sign_in_token_auth_user: Vô hiệu hóa xác minh bằng email
+        disable_user: Vô hiệu hóa đăng nhập
+        enable_custom_emoji: Cho phép emoji
+        enable_sign_in_token_auth_user: Bật xác minh bằng email
+        enable_user: Bỏ vô hiệu hóa đăng nhập
         memorialize_account: Đánh dấu tưởng niệm
-        promote_user: Chỉ định chức vụ
+        promote_user: Chỉ định vai trò
+        reject_appeal: Từ chối kháng cáo
+        reject_user: Từ chối người dùng
         remove_avatar_user: Xóa ảnh đại diện
         reopen_report: Mở lại báo cáo
+        resend_user: Gửi lại email xác nhận
         reset_password_user: Đặt lại mật khẩu
         resolve_report: Xử lý báo cáo
-        sensitive_account: Đánh dấu nhạy cảm
-        silence_account: Đánh dấu hạn chế
-        suspend_account: Đánh dấu vô hiệu hóa
+        sensitive_account: Áp đặt nhạy cảm
+        silence_account: Áp đặt ẩn
+        suspend_account: Áp đặt vô hiệu hóa
         unassigned_report: Báo cáo chưa xử lý
+        unblock_email_account: Mở khóa địa chỉ email
         unsensitive_account: Bỏ nhạy cảm
-        unsilence_account: Bỏ hạn chế
+        unsilence_account: Bỏ ẩn
         unsuspend_account: Bỏ vô hiệu hóa
         update_announcement: Cập nhật thông báo
-        update_custom_emoji: Cập nhật Emoji mới
+        update_custom_emoji: Cập nhật emoji
         update_domain_block: Cập nhật máy chủ chặn
+        update_ip_block: Cập nhật chặn IP
         update_status: Cập nhật tút
+        update_user_role: Cập nhật vai trò
       actions:
+        approve_appeal_html: "%{name} đã chấp nhận kháng cáo của %{target}"
+        approve_user_html: "%{name} đã chấp nhận đăng ký từ %{target}"
         assigned_to_self_report_html: "%{name} tự xử lý báo cáo %{target}"
-        change_email_user_html: "%{name} đã thay đổi địa chỉ email cho %{target}"
-        confirm_user_html: "%{name} xác nhận địa chỉ email của người dùng %{target}"
-        create_account_warning_html: "%{name} đã gửi cảnh cáo %{target}"
+        change_email_user_html: "%{name} đã thay đổi địa chỉ email của %{target}"
+        change_role_user_html: "%{name} đã thay đổi vai trò %{target}"
+        confirm_user_html: "%{name} đã xác minh địa chỉ email của %{target}"
+        create_account_warning_html: "%{name} đã cảnh cáo %{target}"
         create_announcement_html: "%{name} tạo thông báo mới %{target}"
+        create_canonical_email_block_html: "%{name} chặn email với hàm băm %{target}"
         create_custom_emoji_html: "%{name} đã tải lên biểu tượng cảm xúc mới %{target}"
         create_domain_allow_html: "%{name} kích hoạt liên hợp với %{target}"
         create_domain_block_html: "%{name} chặn máy chủ %{target}"
         create_email_domain_block_html: "%{name} chặn tên miền email %{target}"
         create_ip_block_html: "%{name} đã chặn IP %{target}"
         create_unavailable_domain_html: "%{name} ngưng phân phối với máy chủ %{target}"
-        demote_user_html: "%{name} đã xóa chức vụ %{target}"
+        create_user_role_html: "%{name} đã tạo vai trò %{target}"
+        demote_user_html: "%{name} đã xóa vai trò của %{target}"
         destroy_announcement_html: "%{name} xóa thông báo %{target}"
+        destroy_canonical_email_block_html: "%{name} bỏ chặn email với hàm băm %{target}"
         destroy_custom_emoji_html: "%{name} đã xóa emoji %{target}"
         destroy_domain_allow_html: "%{name} đã ngừng liên hợp với %{target}"
-        destroy_domain_block_html: "%{name} bỏ chặn tên miền email %{target}"
+        destroy_domain_block_html: "%{name} bỏ chặn máy chủ %{target}"
         destroy_email_domain_block_html: "%{name} bỏ chặn tên miền email %{target}"
+        destroy_instance_html: "%{name} thanh trừng máy chủ %{target}"
         destroy_ip_block_html: "%{name} bỏ chặn IP %{target}"
         destroy_status_html: "%{name} đã xóa tút của %{target}"
         destroy_unavailable_domain_html: "%{name} tiếp tục phân phối với máy chủ %{target}"
-        disable_2fa_user_html: "%{name} đã vô hiệu hóa xác thực hai bước của %{target}"
+        destroy_user_role_html: "%{name} đã xóa vai trò %{target}"
+        disable_2fa_user_html: "%{name} đã vô hiệu hóa xác minh hai bước của %{target}"
         disable_custom_emoji_html: "%{name} đã ẩn emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} tắt xác thực email của %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} vô hiệu hóa xác minh email của %{target}"
         disable_user_html: "%{name} vô hiệu hóa đăng nhập %{target}"
         enable_custom_emoji_html: "%{name} cho phép Emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} bật xác thực email của %{target}"
-        enable_user_html: "%{name} mở khóa cho người dùng %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} bật xác minh email của %{target}"
+        enable_user_html: "%{name} bỏ vô hiệu hóa đăng nhập %{target}"
         memorialize_account_html: "%{name} đã biến tài khoản %{target} thành một trang tưởng niệm"
-        promote_user_html: "%{name} chỉ định chức vụ cho %{target}"
+        promote_user_html: "%{name} chỉ định vai trò cho %{target}"
+        reject_appeal_html: "%{name} đã từ chối kháng cáo của %{target}"
+        reject_user_html: "%{name} đã từ chối đăng ký từ %{target}"
         remove_avatar_user_html: "%{name} đã xóa ảnh đại diện của %{target}"
         reopen_report_html: "%{name} mở lại báo cáo %{target}"
-        reset_password_user_html: "%{name} đặt lại mật khẩu của người dùng %{target}"
+        resend_user_html: "%{name} gửi lại email xác nhận cho %{target}"
+        reset_password_user_html: "%{name} đã đặt lại mật khẩu của %{target}"
         resolve_report_html: "%{name} đã xử lý báo cáo %{target}"
         sensitive_account_html: "%{name} đánh dấu nội dung của %{target} là nhạy cảm"
         silence_account_html: "%{name} đã ẩn %{target}"
         suspend_account_html: "%{name} đã vô hiệu hóa %{target}"
         unassigned_report_html: "%{name} đã xử lý báo cáo %{target} chưa xử lí"
+        unblock_email_account_html: "%{name} mở khóa địa chỉ email của %{target}"
         unsensitive_account_html: "%{name} đánh dấu nội dung của %{target} là bình thường"
         unsilence_account_html: "%{name} đã bỏ ẩn %{target}"
-        unsuspend_account_html: "%{name} đã ngừng vô hiệu hóa %{target}"
+        unsuspend_account_html: "%{name} đã bỏ vô hiệu hóa %{target}"
         update_announcement_html: "%{name} cập nhật thông báo %{target}"
         update_custom_emoji_html: "%{name} đã cập nhật emoji %{target}"
         update_domain_block_html: "%{name} cập nhật chặn máy chủ %{target}"
+        update_ip_block_html: "%{name} cập nhật chặn IP %{target}"
         update_status_html: "%{name} cập nhật tút của %{target}"
-      deleted_status: "(tút đã xóa)"
+        update_user_role_html: "%{name} đã thay đổi vai trò %{target}"
+      deleted_account: tài khoản đã xóa
       empty: Không tìm thấy bản ghi.
-      filter_by_action: Lọc theo hành động
-      filter_by_user: Lọc theo người
+      filter_by_action: Theo hành động
+      filter_by_user: Theo người
       title: Nhật ký kiểm duyệt
     announcements:
       destroyed_msg: Xóa thông báo thành công!
       edit:
         title: Sửa thông báo
       empty: Không tìm thấy thông báo.
-      live: Trực tiếp
+      live: Đang hiển thị
       new:
         create: Tạo thông báo
         title: Tạo thông báo mới
@@ -348,11 +321,12 @@ vi:
       enable: Cho phép
       enabled: Đã cho phép
       enabled_msg: Đã cho phép thành công Emoji này
-      image_hint: PNG tối đa 50KB
+      image_hint: PNG hoặc GIF tối đa %{size}
       list: Danh sách
       listed: Liệt kê
       new:
         title: Thêm Emoji mới
+      no_emoji_selected: Không có emoji nào thay đổi vì không có emoji nào được chọn
       not_permitted: Bạn không có quyền thực hiện việc này
       overwrite: Ghi đè
       shortcode: Viết tắt
@@ -365,13 +339,37 @@ vi:
       updated_msg: Cập nhật thành công Emoji!
       upload: Tải lên
     dashboard:
+      active_users: người hoạt động
+      interactions: tương tác
+      media_storage: Dung lượng lưu trữ
+      new_users: người mới
+      opened_reports: tổng báo cáo
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> kháng cáo đang chờ"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> báo cáo đang chờ"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> hashtag đang chờ"
+      pending_users_html:
+        other: "<strong>%{count}</strong> người đang chờ"
+      resolved_reports: báo cáo đã xử lí
       software: Phần mềm
+      sources: Nguồn đăng ký
       space: Dung lượng lưu trữ
       title: Thống kê
+      top_languages: Ngôn ngữ phổ biến
+      top_servers: Máy chủ phổ biến
+      website: Website
+    disputes:
+      appeals:
+        empty: Không tìm thấy.
+        title: Kháng cáo
     domain_allows:
       add_new: Cho phép liên hợp với máy chủ
       created_msg: Máy chủ đã được kích hoạt liên hợp thành công
       destroyed_msg: Máy chủ đã bị ngưng liên hợp
+      export: Xuất
+      import: Nhập
       undo: Xóa khỏi danh sách trắng
     domain_blocks:
       add_new: Chặn máy chủ
@@ -379,16 +377,21 @@ vi:
       destroyed_msg: Đã thôi chặn máy chủ
       domain: Máy chủ
       edit: Chỉnh sửa máy chủ bị chặn
+      existing_domain_block: Bạn đã hạn chế %{name} trước đó.
       existing_domain_block_html: Bạn đã áp đặt các giới hạn chặt chẽ hơn cho %{name}, trước tiên bạn cần <a href="%{unblock_url}">bỏ chặn nó</a>.
+      export: Xuất
+      import: Nhập
       new:
         create: Tạo chặn
         hint: Chặn máy chủ sẽ không ngăn việc hiển thị tút của máy chủ đó trong cơ sở dữ liệu, nhưng sẽ khiến tự động áp dụng các phương pháp kiểm duyệt cụ thể trên các tài khoản đó.
         severity:
-          desc_html: "<strong>Ẩn</strong> sẽ làm cho bài đăng của tài khoản trở nên vô hình đối với bất kỳ ai không theo dõi họ. <strong>Vô hiệu hóa</strong> sẽ xóa tất cả nội dung, phương tiện và dữ liệu khác của tài khoản. Dùng <strong>Cảnh cáo</strong> nếu bạn chỉ muốn cấm tải lên ảnh và video."
+          desc_html: "<strong>Ẩn</strong> sẽ làm cho tút của tài khoản trở nên vô hình đối với bất kỳ ai không theo dõi họ. <strong>Vô hiệu hóa</strong> sẽ xóa tất cả nội dung, phương tiện và dữ liệu khác của tài khoản. Dùng <strong>Cảnh cáo</strong> nếu bạn chỉ muốn cấm tải lên ảnh và video."
           noop: Không hoạt động
           silence: Ẩn
           suspend: Vô hiệu hóa
         title: Máy chủ bị chặn mới
+      no_domain_block_selected: Không có chặn tên miền nào thay đổi vì không có mục nào được chọn
+      not_permitted: Bạn không có quyền thực hiện việc này
       obfuscate: Làm mờ tên máy chủ
       obfuscate_hint: Làm mờ tên máy chủ trong danh sách nếu giới hạn máy chủ đã bật
       private_comment: Bình luận riêng
@@ -399,35 +402,42 @@ vi:
       reject_media_hint: Xóa ảnh và video đang được lưu trữ và không cho phép tải xuống trong tương lai. Không liên quan tới việc vô hiệu hóa
       reject_reports: Từ chối báo cáo
       reject_reports_hint: Bỏ qua tất cả các báo cáo từ máy chủ này. Không liên quan việc vô hiệu hóa
-      rejecting_media: từ chối các tập tin phương tiện truyền thông
-      rejecting_reports: từ chối báo cáo
-      severity:
-        silence: bị hạn chế
-        suspend: bị vô hiệu hóa
-      show:
-        affected_accounts:
-          other: "%{count} tài khoản trong cơ sở dữ liệu bị ảnh hưởng"
-        retroactive:
-          silence: Bỏ hạn chế những tài khoản ở máy chủ này
-          suspend: Ngưng vô hiệu hóa các tài khoản ở máy chủ này
-        title: Hủy chặn máy chủ %{domain}
-        undo: Hủy bỏ
       undo: Hủy chặn máy chủ
       view: Xem máy chủ chặn
     email_domain_blocks:
       add_new: Thêm mới
+      attempts_over_week:
+        other: "%{count} lần thử đăng ký vào tuần trước"
       created_msg: Đã chặn tên miền email này
       delete: Xóa bỏ
-      destroyed_msg: Đã bỏ chặn tên miền email này
+      dns:
+        types:
+          mx: Giá trị MX
       domain: Địa chỉ email
-      empty: Chưa chặn tên miền email nào.
-      from_html: từ %{domain}
       new:
         create: Thêm địa chỉ
+        resolve: Xử lý tên miền
         title: Chặn tên miền email mới
+      no_email_domain_block_selected: Không có chặn e-mail nào thay đổi vì không có mục nào được chọn
+      resolved_dns_records_hint_html: Tên miền phân giải thành các tên miền MX sau, các tên miền này chịu trách nhiệm cuối cùng trong việc chấp nhận email. Chặn tên miền MX sẽ chặn đăng ký từ bất kỳ địa chỉ email nào sử dụng cùng một tên miền MX, ngay cả khi tên miền hiển thị là khác. <strong>Cẩn thận đừng chặn những dịch vụ email lớn.</strong>
+      resolved_through_html: Đã xử lý thông qua %{domain}
       title: Tên miền email đã chặn
+    export_domain_allows:
+      new:
+        title: Nhập tên miền cho phép
+      no_file: Không có tập tin nào được chọn
+    export_domain_blocks:
+      import:
+        description_html: Bạn sắp nhập danh sách các tên miền chặn. Vui lòng xem lại danh sách này thật cẩn thận, đặc biệt nếu bạn không phải là tác giả của danh sách này.
+        existing_relationships_warning: Các mối quan hệ theo dõi hiện tại
+        private_comment_description_html: 'Để giúp bạn theo dõi nguồn gốc của các chặn tên miền đã nhập, các tên miền chặn đã nhập sẽ được tạo bằng nhận xét riêng tư sau: <q>%{comment}</q>'
+        private_comment_template: Nhập từ %{source} vào %{date}
+        title: Nhập máy chủ chặn
+      new:
+        title: Nhập máy chủ chặn
+      no_file: Không có tập tin nào được chọn
     follow_recommendations:
-      description_html: "<strong>Gợi ý theo dõi là cách giúp những người dùng mới nhanh chóng tìm thấy những nội dung thú vị</strong>. Khi một người dùng chưa đủ tương tác với những người khác để hình thành các đề xuất theo dõi được cá nhân hóa, thì những tài khoản này sẽ được đề xuất. Nó bao gồm các tài khoản có số lượt tương tác gần đây cao nhất và số lượng người theo dõi cao nhất cho một ngôn ngữ nhất định trong máy chủ."
+      description_html: "<strong>Gợi ý theo dõi là cách giúp những người mới nhanh chóng tìm thấy những nội dung thú vị</strong>. Khi một người chưa đủ tương tác với những người khác để hình thành các đề xuất theo dõi được cá nhân hóa, thì những người này sẽ được đề xuất. Nó bao gồm những người có số lượt tương tác gần đây cao nhất và số lượng người theo dõi cao nhất cho một ngôn ngữ nhất định trong máy chủ."
       language: Theo ngôn ngữ
       status: Trạng thái
       suppress: Tắt gợi ý theo dõi
@@ -435,24 +445,51 @@ vi:
       title: Gợi ý theo dõi
       unsuppress: Mở lại gợi ý theo dõi
     instances:
+      availability:
+        description_html:
+          other: Nếu chuyển đến tên miền <strong>%{count} ngày</strong> mà không thành công, không chuyển gì nữa cho tới khi sự tiếp nhận <em>từ</em> máy chủ được nhận.
+        failure_threshold_reached: Thất bại đạt ngưỡng vào %{date}.
+        failures_recorded:
+          other: Thất bại tạm thời vào %{count} ngày khác.
+        no_failures_recorded: Chưa bao giờ thất bại.
+        title: Khả dụng
+        warning: Lần thử cuối cùng để kết nối tới máy chủ này đã không thành công
       back_to_all: Toàn bộ
       back_to_limited: Hạn chế
       back_to_warning: Cảnh báo
       by_domain: Máy chủ
+      confirm_purge: Bạn có chắc chắn muốn xóa dữ liệu từ máy chủ này vĩnh viễn?
+      content_policies:
+        comment: Lưu ý nội bộ
+        description_html: Bạn có thể xác định các chính sách nội dung sẽ được áp dụng cho tất cả các tài khoản trên máy chủ này và bất kỳ tên miền phụ nào của nó.
+        policies:
+          reject_media: Từ chối media
+          reject_reports: Từ chối báo cáo
+          silence: Hạn chế
+          suspend: Vô hiệu hóa
+        policy: Chính sách
+        reason: Lý do công khai
+        title: Chính sách nội dung
+      dashboard:
+        instance_accounts_dimension: Những tài khoản được theo dõi nhiều nhất
+        instance_accounts_measure: tài khoản đã lưu trữ
+        instance_followers_measure: người theo dõi của chúng ta ở đó
+        instance_follows_measure: người theo dõi của họ ở đây
+        instance_languages_dimension: Top ngôn ngữ
+        instance_media_attachments_measure: tệp đính kèm
+        instance_reports_measure: báo cáo về họ
+        instance_statuses_measure: tút đã lưu trữ
       delivery:
         all: Toàn bộ
         clear: Xóa phân phối lỗi
+        failing: Mất kết nối
         restart: Khởi động lại phân phối
         stop: Ngưng phân phối
-        title: Phân phối
         unavailable: Không khả dụng
-        unavailable_message: Không thể phân phối
-        warning: Cảnh báo
-        warning_message:
-          other: Phân phối thất bại %{count} ngày
       delivery_available: Cho phép liên kết
       delivery_error_days: Ngày lỗi phân phối
       delivery_error_hint: Nếu không thể phân phối sau %{count} ngày, nó sẽ tự dộng đánh dấu là không thể phân phối.
+      destroyed_msg: Dữ liệu từ %{domain} đã lên lịch để xóa.
       empty: Không có máy chủ nào.
       known_accounts:
         other: "%{count} tài khoản đã biết"
@@ -462,12 +499,15 @@ vi:
         title: Kiểm duyệt
       private_comment: Bình luận riêng
       public_comment: Bình luận công khai
+      purge: Thanh trừng
+      purge_description_html: Nếu bạn tin rằng máy chủ này đã chết, bạn có thể xóa tất cả các bản ghi tài khoản và dữ liệu đã liên kết khỏi bộ nhớ của mình. Việc này có thể mất một lúc.
       title: Mạng liên hợp
       total_blocked_by_us: Bị chặn bởi chúng ta
       total_followed_by_them: Được họ theo dõi
       total_followed_by_us: Được quản trị viên theo dõi
       total_reported: Toàn bộ báo cáo
       total_storage: Media
+      totals_time_period_hint_html: Tổng số được hiển thị bên dưới bao gồm dữ liệu cho mọi thời điểm.
     invites:
       deactivate_all: Vô hiệu hóa tất cả
       filter:
@@ -491,14 +531,12 @@ vi:
         title: Chặn một IP mới
       no_ip_block_selected: Bạn chưa chọn bất kỳ IP nào
       title: Những IP bị chặn
-    pending_accounts:
-      title: Tài khoản đang chờ xem xét (%{count})
     relationships:
       title: Mối quan hệ của %{acct}
     relays:
       add_new: Thêm liên hợp mới
       delete: Loại bỏ
-      description_html: "<strong>Liên hợp</strong> nghĩa là cho phép bài đăng công khai của máy chủ này xuất hiện trên bảng tin của máy chủ khác và ngược lại. <strong>Nó giúp các máy chủ vừa và nhỏ tiếp cận nội dung từ các máy chủ lớn hơn</strong>. Nếu không chọn, người dùng ở máy chủ này vẫn có thể theo dõi người dùng khác trên các máy chủ khác."
+      description_html: "<strong>Liên hợp</strong> nghĩa là cho phép bài đăng công khai của máy chủ này xuất hiện trên bảng tin của máy chủ khác và ngược lại. <strong>Nó giúp các máy chủ vừa và nhỏ tiếp cận nội dung từ các máy chủ lớn hơn</strong>. Nếu không chọn, người ở máy chủ này vẫn có thể theo dõi người khác trên các máy chủ khác."
       disable: Tắt
       disabled: Đã tắt
       enable: Kích hoạt
@@ -509,191 +547,327 @@ vi:
       save_and_enable: Lưu và kích hoạt
       setup: Kết nối mạng liên hợp
       signatures_not_enabled: Mạng liên hợp sẽ không hoạt động nếu chế độ an ninh hoặc chế độ danh sách trắng được bật trước đó
-      status: Trạng thái hiện tại
+      status: Trạng thái
       title: Mạng liên hợp
     report_notes:
-      created_msg: Đã thêm ghi chú kiểm duyệt!
-      destroyed_msg: Đã xóa ghi chú kiểm duyệt!
+      created_msg: Đã thêm lưu ý kiểm duyệt!
+      destroyed_msg: Đã xóa lưu ý kiểm duyệt!
     reports:
       account:
         notes:
           other: "%{count} kiểm duyệt"
-        reports:
-          other: "%{count} báo cáo"
-      action_taken_by: Hành động được thực hiện bởi
+      action_log: Nhật ký kiểm duyệt
+      action_taken_by: Quyết định bởi
+      actions:
+        delete_description_html: Xóa các tút và ghi lại 1 lần cảnh cáo.
+        mark_as_sensitive_description_html: Đánh dấu nhạy cảm media trong các tút và ghi lại 1 lần cảnh cáo.
+        other_description_html: Tùy chọn cách kiểm soát và giao tiếp với tài khoản bị báo cáo.
+        resolve_description_html: Không áp dụng trừng phạt nào và đóng báo cáo.
+        silence_description_html: Chỉ hiển thị trang với những người đã theo dõi hoặc tìm kiếm thủ công.
+        suspend_description_html: Đóng băng hồ sơ và chặn truy cập tất cả các nội dung cho đến khi chúng bị xóa hoàn toàn. Đảo ngược trong vòng 30 ngày.
+      actions_description_html: Nếu áp đặt trừng phạt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
+      add_to_report: Bổ sung báo cáo
       are_you_sure: Bạn có chắc không?
       assign_to_self: Giao cho tôi
       assigned: Người xử lý
+      by_target_domain: Tên tài khoản bị báo cáo
+      category: Phân loại
+      category_description_html: Lý do tài khoản hoặc nội dung này bị báo cáo sẽ được trích dẫn khi giao tiếp với họ
       comment:
         none: Không có mô tả
+      comment_description_html: "%{name} cho biết thêm:"
       created_at: Báo cáo lúc
+      delete_and_resolve: Xóa tút
       forwarded: Chuyển tiếp
       forwarded_to: Chuyển tiếp tới %{domain}
-      mark_as_resolved: Đã xử lý xong!
+      mark_as_resolved: Xử lý xong
+      mark_as_sensitive: Đánh dấu nhạy cảm
       mark_as_unresolved: Mở lại
+      no_one_assigned: Chưa có
       notes:
-        create: Ghi chú
+        create: Lưu ý
         create_and_resolve: Xử lý
-        create_and_unresolve: Mở lại kèm ghi chú mới
+        create_and_unresolve: Mở lại kèm lưu ý mới
         delete: Xóa bỏ
-        placeholder: Mô tả vi phạm của người này, mức độ xử lý và những cập nhật liên quan khác...
+        placeholder: Mô tả vi phạm của người này, hướng xử lý và những cập nhật liên quan khác...
+        title: Lưu ý
+      notes_description_html: Xem và để lại lưu ý cho các kiểm duyệt viên khác
+      quick_actions_description_html: 'Kiểm duyệt nhanh hoặc kéo xuống để xem nội dung bị báo cáo:'
+      remote_user_placeholder: người ở %{instance}
       reopen: Mở lại báo cáo
       report: 'Báo cáo #%{id}'
       reported_account: Tài khoản bị báo cáo
       reported_by: Báo cáo bởi
-      resolved: Đã xử lý xong
+      resolved: Đã xong
       resolved_msg: Đã xử lý báo cáo xong!
+      skip_to_actions: Kiểm duyệt
       status: Trạng thái
-      target_domain: Tên tài khoản bị báo cáo
-      target_origin: Nguồn đã báo cáo người dùng
+      statuses: Nội dung bị báo cáo
+      statuses_description_html: Lý do tài khoản hoặc nội dung này bị báo cáo sẽ được trích dẫn khi giao tiếp với họ
+      target_origin: Nguồn báo cáo
       title: Báo cáo
       unassign: Bỏ qua
       unresolved: Chờ xử lý
       updated_at: Cập nhật lúc
+      view_profile: Xem trang
+    roles:
+      add_new: Thêm vai trò
+      assigned_users:
+        other: "%{count} người"
+      categories:
+        administration: Quản trị viên
+        devops: Nhà phát triển
+        invites: Lời mời
+        moderation: Kiểm duyệt
+        special: Đặc biệt
+      delete: Xóa
+      description_html: Thông qua <strong>vai trò</strong>, bạn có thể tùy chỉnh những tính năng và vị trí của Mastodon mà mọi người có thể truy cập.
+      edit: Sửa vai trò '%{name}'
+      everyone: Quyền hạn mặc định
+      everyone_full_description_html: Đây <strong>vai trò cơ bản</strong> ảnh hưởng tới <strong>mọi người khác</strong>, kể cả những người không có vai trò được chỉ định. Tất cả các vai trò khác đều kế thừa quyền từ vai trò đó.
+      permissions_count:
+        other: "%{count} quyền hạn"
+      privileges:
+        administrator: Quản trị viên
+        administrator_description: Người này có thể truy cập mọi quyền hạn
+        delete_user_data: Xóa dữ liệu
+        delete_user_data_description: Cho phép xóa dữ liệu của mọi người khác lập tức
+        invite_users: Mời tham gia
+        invite_users_description: Cho phép mời những người mới vào máy chủ
+        manage_announcements: Quản lý thông báo
+        manage_announcements_description: Cho phép quản lý thông báo trên máy chủ
+        manage_appeals: Quản lý kháng cáo
+        manage_appeals_description: Cho phép xem xét kháng cáo đối với các hành động kiểm duyệt
+        manage_blocks: Quản lý chặn
+        manage_blocks_description: Cho phép chặn các nhà cung cấp e-mail và địa chỉ IP
+        manage_custom_emojis: Quản lý emoji
+        manage_custom_emojis_description: Cho phép quản lý các emoji tùy chỉnh trên máy chủ
+        manage_federation: Quản lý liên hợp
+        manage_federation_description: Cho phép chặn hoặc liên hợp với các máy chủ khác và kiểm soát khả năng phân phối
+        manage_invites: Quản lý lời mời
+        manage_invites_description: Cho phép mở và đóng các lời mời đăng ký
+        manage_reports: Quản lý báo cáo
+        manage_reports_description: Cho phép xem xét các báo cáo và thực hiện hành động kiểm duyệt đối với chúng
+        manage_roles: Quản lý vai trò
+        manage_roles_description: Cho phép quản lý và chỉ định các vai trò nhỏ hơn họ
+        manage_rules: Quản lý quy tắc máy chủ
+        manage_rules_description: Cho phép thay đổi quy tắc máy chủ
+        manage_settings: Quản lý thiết lập
+        manage_settings_description: Cho phép thay đổi thiết lập máy chủ
+        manage_taxonomies: Quản lý phân loại
+        manage_taxonomies_description: Cho phép đánh giá nội dung thịnh hành và cập nhật cài đặt hashtag
+        manage_user_access: Quản lý người truy cập
+        manage_user_access_description: Cho phép vô hiệu hóa xác thực hai bước của người khác, thay đổi địa chỉ email và đặt lại mật khẩu của họ
+        manage_users: Quản lý người
+        manage_users_description: Cho phép xem thông tin chi tiết của người khác và thực hiện các hành động kiểm duyệt
+        manage_webhooks: Quản lý Webhook
+        manage_webhooks_description: Cho phép thiết lập webhook cho các sự kiện quản trị
+        view_audit_log: Xem nhật ký
+        view_audit_log_description: Cho phép xem lịch sử của các hành động quản trị trên máy chủ
+        view_dashboard: Xem quản trị
+        view_dashboard_description: Cho phép truy cập trang tổng quan và các chỉ số khác
+        view_devops: Nhà phát triển
+        view_devops_description: Cho phép truy cập trang tổng quan Sidekiq và pgHero
+      title: Danh sách vai trò
     rules:
       add_new: Thêm quy tắc
       delete: Xóa bỏ
-      description_html: Mặc dù được yêu cầu chấp nhận điều khoản dịch vụ khi đăng ký, nhưng người dùng thường không đọc cho đến khi vấn đề gì đó xảy ra. <strong>Hãy làm điều này rõ ràng hơn bằng cách liệt kê quy tắc máy chủ theo gạch đầu dòng.</strong> Cố gắng viết ngắn và đơn giản, nhưng đừng tách ra quá nhiều mục.
+      description_html: Mặc dù được yêu cầu chấp nhận điều khoản dịch vụ khi đăng ký, nhưng mọi người thường không đọc cho đến khi vấn đề gì đó xảy ra. <strong>Hãy làm điều này rõ ràng hơn bằng cách liệt kê quy tắc máy chủ theo gạch đầu dòng.</strong> Cố gắng viết ngắn và đơn giản, nhưng đừng tách ra quá nhiều mục.
       edit: Sửa quy tắc
       empty: Chưa có quy tắc máy chủ.
       title: Quy tắc máy chủ
     settings:
-      activity_api_enabled:
-        desc_html: Thu thập số lượng tút được đăng, người dùng hoạt động và người dùng đăng ký mới hàng tuần
-        title: Công khai số liệu thống kê về hoạt động người dùng trong API
-      bootstrap_timeline_accounts:
-        desc_html: Tách tên người dùng bằng dấu phẩy. Những người dùng này sẽ xuất hiện trong mục gợi ý theo dõi
-        title: Gợi ý theo dõi cho người dùng mới
-      contact_information:
-        email: Email liên hệ
-        username: Tên tài khoản liên hệ
-      custom_css:
-        desc_html: Sửa đổi giao diện với CSS trên mỗi trang
-        title: Tùy chỉnh CSS
+      about:
+        manage_rules: Sửa quy tắc máy chủ
+        preamble: Cung cấp thông tin chuyên sâu về cách máy chủ được vận hành, kiểm duyệt, tài trợ.
+        rules_hint: Có một khu vực dành riêng cho các quy tắc mà người tham gia máy chủ của bạn phải tuân thủ.
+        title: Giới thiệu
+      appearance:
+        preamble: Tùy chỉnh giao diện web của Mastodon.
+        title: Giao diện
+      branding:
+        preamble: Thương hiệu máy chủ của bạn phân biệt nó với các máy chủ khác trong mạng. Thông tin này có thể được hiển thị trên nhiều môi trường khác nhau, chẳng hạn như giao diện web của Mastodon, các ứng dụng gốc, trong bản xem trước liên kết trên các trang web khác và trong các ứng dụng nhắn tin, v.v. Vì lý do này, cách tốt nhất là giữ cho thông tin này rõ ràng, ngắn gọn và súc tích.
+        title: Thương hiệu
+      content_retention:
+        preamble: Kiểm soát cách lưu trữ nội dung cá nhân trong Mastodon.
+        title: Lưu giữ nội dung
       default_noindex:
-        desc_html: Ảnh hưởng đến tất cả người dùng không tự thay đổi cài đặt này
+        desc_html: Ảnh hưởng đến tất cả người không tự thay đổi cài đặt này
         title: Mặc định người dùng không xuất hiện trong công cụ tìm kiếm
+      discovery:
+        follow_recommendations: Gợi ý theo dõi
+        preamble: Hiển thị nội dung thú vị là công cụ để thu hút người dùng mới, những người có thể không quen bất kỳ ai trong Mastodon. Kiểm soát cách các tính năng khám phá hoạt động trên máy chủ của bạn.
+        profile_directory: Cộng đồng
+        public_timelines: Bảng tin
+        title: Khám phá
+        trends: Thịnh hành
       domain_blocks:
         all: Tới mọi người
         disabled: Không ai
-        title: Hiển thị khối miền
-        users: Để đăng nhập người dùng cục bộ
-      domain_blocks_rationale:
-        title: Hiển thị lý do
-      hero:
-        desc_html: Hiển thị trên trang chủ. Kích cỡ tối thiểu 600x100px. Mặc định dùng hình thu nhỏ của máy chủ
-        title: Hình ảnh giới thiệu
-      mascot:
-        desc_html: Hiển thị trên nhiều trang. Kích cỡ tối thiểu 293 × 205px. Mặc định dùng linh vật Mastodon
-        title: Logo máy chủ
-      peers_api_enabled:
-        desc_html: Tên miền mà máy chủ này đã kết giao trong mạng liên hợp
-        title: Công khai danh sách những máy chủ đã khám phá trong API
-      preview_sensitive_media:
-        desc_html: Liên kết xem trước trên các trang web khác sẽ hiển thị hình thu nhỏ ngay cả khi phương tiện được đánh dấu là nhạy cảm
-        title: Hiển thị phương tiện nhạy cảm trong bản xem trước OpenGraph
-      profile_directory:
-        desc_html: Cho phép tìm kiếm người dùng
-        title: Cho phép hiện danh sách thành viên
+        users: Để đăng nhập người cục bộ
       registrations:
-        closed_message:
-          desc_html: Hiển thị trên trang chủ khi đăng ký được đóng lại. Bạn có thể viết bằng thẻ HTML
-          title: Thông điệp báo máy chủ đã ngừng đăng ký
-        deletion:
-          desc_html: Cho phép mọi người xóa tài khoản của họ
-          title: Xóa tài khoản
-        min_invite_role:
-          disabled: Không một ai
-          title: Cho phép lời mời bằng cách
-        require_invite_text:
-          desc_html: Khi chọn phê duyệt người dùng thủ công, hiện “Tại sao bạn muốn đăng ký?” thay cho tùy chọn nhập
-          title: Người đăng ký mới phải nhập mã mời tham gia
+        preamble: Kiểm soát những ai có thể tạo tài khoản trên máy chủ của bạn.
+        title: Đăng ký
       registrations_mode:
         modes:
           approved: Yêu cầu phê duyệt để đăng ký
           none: Không ai có thể đăng ký
           open: Bất cứ ai cũng có thể đăng ký
-        title: Chế độ đăng ký
-      show_known_fediverse_at_about_page:
-        desc_html: Nếu tắt, bảng tin sẽ chỉ hiển thị nội dung do người dùng của máy chủ này tạo ra
-        title: Bao gồm nội dung từ mạng liên hợp trên bảng tin không được xác thực
-      show_staff_badge:
-        desc_html: Hiển thị huy hiệu nhân viên trên trang người dùng
-        title: Hiển thị huy hiệu nhân viên
-      site_description:
-        desc_html: Nội dung giới thiệu về máy chủ. Mô tả những gì làm cho máy chủ Mastodon này đặc biệt và bất cứ điều gì quan trọng khác. Bạn có thể dùng các thẻ HTML, đặc biệt là <code>&lt;a&gt;</code> và <code>&lt;em&gt;</code>.
-        title: Mô tả máy chủ
-      site_description_extended:
-        desc_html: Bạn có thể tạo thêm các mục như quy định chung, hướng dẫn và những thứ khác liên quan tới máy chủ của bạn. Dùng thẻ HTML
-        title: Thông tin bổ sung
-      site_short_description:
-        desc_html: Hiển thị trong thanh bên và thẻ meta. Mô tả Mastodon là gì và điều gì làm cho máy chủ này trở nên đặc biệt trong một đoạn văn duy nhất.
-        title: Mô tả máy chủ ngắn
-      site_terms:
-        desc_html: Bạn có thể viết điều khoản dịch vụ, quyền riêng tư hoặc các vấn đề pháp lý khác. Dùng thẻ HTML
-        title: Điều khoản dịch vụ tùy chỉnh
-      site_title: Tên máy chủ
-      thumbnail:
-        desc_html: Bản xem trước thông qua OpenGraph và API. Khuyến nghị 1200x630px
-        title: Hình thu nhỏ của máy chủ
-      timeline_preview:
-        desc_html: Hiển thị dòng thời gian công khai trên trang đích và cho phép API truy cập vào dòng thời gian công khai mà không cần xác thực
-        title: Cho phép truy cập không xác thực vào dòng thời gian công cộng
-      title: Cài đặt trang web
-      trendable_by_default:
-        desc_html: Ảnh hưởng đến các hashtag chưa được cho phép trước đây
-        title: Cho phép hashtags theo xu hướng mà không cần xem xét trước
-      trends:
-        desc_html: Hiển thị công khai các hashtag được xem xét trước đây hiện đang là xu hướng
-        title: Hashtag xu hướng
+      title: Cài đặt máy chủ
     site_uploads:
       delete: Xóa tập tin đã tải lên
       destroyed_msg: Đã xóa tập tin tải lên thành công!
     statuses:
+      account: Tác giả
+      application: Ứng dụng
       back_to_account: Quay lại trang tài khoản
+      back_to_report: Quay lại trang báo cáo
       batch:
-        delete: Xóa bỏ
-        nsfw_off: Đánh dấu là bình thường
-        nsfw_on: Đánh dấu là nhạy cảm
+        remove_from_report: Xóa khỏi báo cáo
+        report: Báo cáo
       deleted: Đã xóa
-      failed_to_execute: Không thể thực thi
+      favourites: Lượt thích
+      history: Lịch sử phiên bản
+      in_reply_to: Trả lời đến
+      language: Ngôn ngữ
       media:
         title: Media
-      no_media: Toàn bộ
+      metadata: Metadata
       no_status_selected: Bạn chưa chọn bất kỳ tút nào
+      open: Mở tút
+      original_status: Tút gốc
+      reblogs: Lượt đăng lại
+      status_changed: Tút đã thay đổi
       title: Toàn bộ tút
+      trending: Thịnh hành
+      visibility: Hiển thị
       with_media: Có media
+    strikes:
+      actions:
+        delete_statuses: "%{name} đã xóa tút của %{target}"
+        disable: "%{name} đã ẩn %{target}"
+        mark_statuses_as_sensitive: "%{name} đã đánh dấu tút của %{target} là nhạy cảm"
+        none: "%{name} đã gửi cảnh cáo %{target}"
+        sensitive: "%{name} đã đánh dấu %{target} là nhạy cảm"
+        silence: "%{name} đã ẩn %{target}"
+        suspend: "%{name} đã vô hiệu hóa %{target}"
+      appeal_approved: Đã khiếu nại
+      appeal_pending: Đang kháng cáo
     system_checks:
       database_schema_check:
         message_html: Có cơ sở dữ liệu đang chờ xử lý. Xin khởi động nó để ứng dụng có thể hoạt động một cách ổn định nhất
+      elasticsearch_running_check:
+        message_html: Không thể kết nối Elasticsearch. Hãy kiểm tra xem nó có đang chạy, hay tìm kiếm full-text bị tắt
+      elasticsearch_version_check:
+        message_html: 'Phiên bản Elasticsearch không tương thích: %{value}'
+        version_comparison: Đang dùng Elasticsearch %{running_version} trong khi bắt buộc phải có %{required_version}
       rules_check:
         action: Sửa quy tắc máy chủ
         message_html: Bạn chưa cập nhật quy tắc máy chủ.
       sidekiq_process_check:
         message_html: Sidekiq không hoạt động khi truy vấn %{value}. Hãy kiểm tra lại cấu hình Sidekiq
     tags:
-      accounts_today: Sử dụng hôm nay
-      accounts_week: Sử dụng trong tuần
-      breakdown: Thống kê số lượt dùng hôm nay
-      last_active: Hôm nay
-      most_popular: Phổ biến nhất
-      most_recent: Gần đây
-      name: Hashtag
       review: Phê duyệt
-      reviewed: Đã phê duyệt
-      title: Hashtag
-      trending_right_now: Xu hướng
-      unique_uses_today: "%{count} tút dùng hôm nay"
-      unreviewed: Chưa phê duyệt
       updated_msg: Hashtag đã được cập nhật thành công
     title: Quản trị
+    trends:
+      allow: Cho phép
+      approved: Đã cho phép
+      disallow: Cấm
+      links:
+        allow: Cho phép liên kết
+        allow_provider: Cho phép nguồn đăng
+        description_html: Đây là những liên kết được chia sẻ nhiều trên máy chủ của bạn. Nó có thể giúp người dùng tìm hiểu những gì đang xảy ra trên thế giới. Không có liên kết nào được hiển thị công khai cho đến khi bạn duyệt nguồn đăng. Bạn cũng có thể cho phép hoặc từ chối từng liên kết riêng.
+        disallow: Cấm liên kết
+        disallow_provider: Cấm nguồn đăng
+        no_link_selected: Không có liên kết nào thay đổi vì không có liên kết nào được chọn
+        publishers:
+          no_publisher_selected: Không có nguồn đăng nào thay đổi vì không có nguồn đăng nào được chọn
+        shared_by_over_week:
+          other: "%{count} người chia sẻ tuần rồi"
+        title: Liên kết nổi bật
+        usage_comparison: Chia sẻ %{today} lần hôm nay, so với %{yesterday} lần hôm qua
+      only_allowed: Chỉ cho phép
+      pending_review: Đang chờ
+      preview_card_providers:
+        allowed: Liên kết từ nguồn đăng này có thể nổi bật
+        description_html: Đây là những nguồn mà từ đó các liên kết thường được chia sẻ trên máy chủ của bạn. Các liên kết sẽ không thể thịnh hành trừ khi bạn cho phép nguồn. Sự cho phép (hoặc cấm) của bạn áp dụng luôn cho các tên miền phụ.
+        rejected: Liên kết từ nguồn đăng không thể nổi bật
+        title: Nguồn đăng
+      rejected: Đã cấm
+      statuses:
+        allow: Cho phép tút
+        allow_account: Cho phép người đăng
+        description_html: Đây là những tút đang được đăng lại và yêu thích rất nhiều trên máy chủ của bạn. Nó có thể giúp người mới và người cũ tìm thấy nhiều người hơn để theo dõi. Không có tút nào được hiển thị công khai cho đến khi bạn cho phép người đăng và người cho phép đề xuất tài khoản của họ cho người khác. Bạn cũng có thể cho phép hoặc từ chối từng tút riêng.
+        disallow: Cấm tút
+        disallow_account: Cấm người đăng
+        no_status_selected: Không có tút thịnh hành nào thay đổi vì không có tút nào được chọn
+        not_discoverable: Tác giả đã chọn không tham gia mục khám phá
+        shared_by:
+          other: Được thích và đăng lại %{friendly_count} lần
+        title: Tút nổi bật
+      tags:
+        current_score: Chỉ số gần đây %{score}
+        dashboard:
+          tag_accounts_measure: lần dùng
+          tag_languages_dimension: Top ngôn ngữ
+          tag_servers_dimension: Top máy chủ
+          tag_servers_measure: máy chủ khác
+          tag_uses_measure: tổng lượt dùng
+        description_html: Đây là những hashtag đang xuất hiện trong rất nhiều tút trên máy chủ của bạn. Nó có thể giúp mọi người tìm ra những gì đang được quan tâm nhiều nhất vào lúc này. Không có hashtag nào được hiển thị công khai cho đến khi bạn cho phép chúng.
+        listable: Có thể đề xuất
+        no_tag_selected: Không có hashtag thịnh hành nào thay đổi vì không có hashtag nào được chọn
+        not_listable: Không thể đề xuất
+        not_trendable: Không cho thịnh hành
+        not_usable: Không được phép dùng
+        peaked_on_and_decaying: Đỉnh điểm %{date}, giờ đang giảm
+        title: Hashtag nổi bật
+        trendable: Cho phép thịnh hành
+        trending_rank: 'Nổi bật #%{rank}'
+        usable: Có thể dùng
+        usage_comparison: Dùng %{today} lần hôm nay, so với %{yesterday} hôm qua
+        used_by_over_week:
+          other: "%{count} người dùng tuần rồi"
+      title: Xu hướng
+      trending: Thịnh hành
     warning_presets:
       add_new: Thêm mới
       delete: Xóa bỏ
       edit_preset: Sửa mẫu có sẵn
-      empty: Bạn chưa thêm mẫu có sẵn nào cả.
+      empty: Bạn chưa thêm mẫu cảnh cáo nào cả.
       title: Quản lý mẫu cảnh cáo
+    webhooks:
+      add_new: Thêm endpoint
+      delete: Xóa bỏ
+      description_html: "<strong>Webhook</strong> cho phép Mastodon gửi nhận <strong>thông báo đẩy thời gian thật</strong> về những sự kiện cho ứng dụng thứ ba của bạn, cho ứng dụng của bạn có thể <strong>tự động kích hoạt reaction</strong>."
+      disable: Tắt
+      disabled: Đã tắt
+      edit: Sửa endpoint
+      empty: Bạn chưa thiết lập webhook endpoint nào.
+      enable: Bật
+      enabled: Hoạt động
+      enabled_events:
+        other: "%{count} sự kiện đã bật"
+      events: Sự kiện
+      new: Webhook mới
+      rotate_secret: Xoay bí mật
+      secret: Token đăng nhập
+      status: Trạng thái
+      title: Webhook
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: xóa tút của họ
+        disable: hạn chế tài khoản của họ
+        mark_statuses_as_sensitive: đánh dấu tút của họ là nhạy cảm
+        none: một cảnh báo
+        sensitive: đánh dấu tài khoản của họ là nhạy cảm
+        silence: hạn chế tài khoản của họ
+        suspend: vô hiệu hóa tài khoản của họ
+      body: "%{target} đã khiếu nại vì bị %{action_taken_by} %{type} vào %{date}. Họ cho biết:"
+      next_steps: Bạn có thể chấp nhận kháng cáo để hủy kiểm duyệt hoặc bỏ qua.
+      subject: "%{username} đang khiếu nại quyết định kiểm duyệt trên %{instance}"
     new_pending_account:
       body: Thông tin chi tiết của tài khoản mới ở phía dưới. Bạn có thể phê duyệt hoặc từ chối người này.
       subject: Tài khoản chờ xét duyệt trên %{instance} (%{username})
@@ -701,9 +875,17 @@ vi:
       body: "%{reporter} vừa báo cáo %{target}"
       body_remote: Ai đó từ %{domain} đã báo cáo %{target}
       subject: "(%{instance}) Báo cáo #%{id}"
-    new_trending_tag:
-      body: 'Hashtag # %{name} đang là xu hướng nhưng chưa được kiểm duyệt. Nó sẽ không được hiển thị công khai trừ khi bạn cho phép. Bỏ qua nếu bạn không bao giờ muốn thấy nó xuất hiện.'
-      subject: Hashtag mới được xem xét trên %{instance} (# %{name})
+    new_trends:
+      body: 'Các mục sau đây cần được xem xét trước khi chúng hiển thị công khai:'
+      new_trending_links:
+        title: Liên kết nổi bật
+      new_trending_statuses:
+        title: Tút nổi bật
+      new_trending_tags:
+        no_approved_tags: Hiện tại không có hashtag nổi bật nào được duyệt.
+        requirements: 'Bất kỳ ứng cử viên nào vượt qua #%{rank} duyệt hashtag nổi bật, với hiện tại là "%{lowest_tag_name}" với điểm số %{lowest_tag_score}.'
+        title: Hashtag nổi bật
+      subject: Nội dung nổi bật chờ duyệt trên %{instance}
   aliases:
     add_new: Kết nối tài khoản
     created_msg: Tạo thành công một tên hiển thị mới. Bây giờ bạn có thể bắt đầu di chuyển từ tài khoản cũ.
@@ -713,14 +895,14 @@ vi:
     remove: Bỏ liên kết bí danh
   appearance:
     advanced_web_interface: Bố cục
-    advanced_web_interface_hint: 'Giao diện nhiều cột cho phép bạn chuyển bố cục hiển thị thành nhiều cột khác nhau. Bao gồm: Bảng tin, thông báo, thế giới, cũng như danh sách và hashtag. Rất thích hợp nếu bạn đang dùng màn hình rộng.'
+    advanced_web_interface_hint: 'Bố cục nhiều cột cho phép bạn chuyển bố cục hiển thị thành nhiều cột khác nhau. Bao gồm: Bảng tin, thông báo, thế giới, cũng như danh sách và hashtag. Thích hợp nếu bạn đang dùng màn hình rộng.'
     animations_and_accessibility: Bảng tin
     confirmation_dialogs: Hộp thoại xác nhận
     discovery: Khám phá
     localization:
-      body: Mastodon Tiếng Việt được dịch bởi Hồ Nhất Duy.
+      body: Mastodon được dịch bởi tình nguyện viên.
       guide_link: https://crowdin.com/project/mastodon
-      guide_link_text: Đây là trang cá nhân của anh ấy.
+      guide_link_text: Ai cũng có thể đóng góp.
     sensitive_content: Nội dung nhạy cảm
     toot_layout: Tút
   application_mailer:
@@ -728,59 +910,67 @@ vi:
     salutation: "%{name},"
     settings: 'Thay đổi tùy chọn email: %{link}'
     view: 'Chi tiết:'
-    view_profile: Xem trang cá nhân
+    view_profile: Xem trang hồ sơ
     view_status: Xem tút
   applications:
     created: Đơn đăng ký được tạo thành công
     destroyed: Đã xóa đơn đăng ký
-    invalid_url: Cung cấp URL không hợp lệ
     regenerate_token: Tạo lại mã truy cập
     token_regenerated: Mã truy cập được tạo lại thành công
     warning: Hãy rất cẩn thận với dữ liệu này. Không bao giờ chia sẻ nó với bất cứ ai!
     your_token: Mã truy cập của bạn
   auth:
-    apply_for_account: Đăng ký
+    apply_for_account: Xin đăng ký
     change_password: Mật khẩu
-    checkbox_agreement_html: Tôi đồng ý <a href="%{rules_path}" target="_blank">quy tắc</a> và <a href="%{terms_path}" target="_blank">chính sách bảo mật</a>
-    checkbox_agreement_without_rules_html: Tôi đồng ý <a href="%{terms_path}" target="_blank">chính sách bảo mật</a>
     delete_account: Xóa tài khoản
     delete_account_html: Nếu bạn muốn xóa tài khoản của mình, hãy <a href="%{path}">yêu cầu tại đây</a>. Bạn sẽ được yêu cầu xác nhận.
     description:
       prefix_invited_by_user: "@%{name} mời bạn tham gia máy chủ Mastodon này!"
       prefix_sign_up: Tham gia Mastodon ngay hôm nay!
-      suffix: Với tài khoản, bạn sẽ có thể theo dõi mọi người, đăng tút và nhắn tin với người dùng từ bất kỳ máy chủ Mastodon khác!
-    didnt_get_confirmation: Gửi lại email xác thực?
+      suffix: Với tài khoản, bạn sẽ có thể theo dõi mọi người, đăng tút và nhắn tin với người từ bất kỳ máy chủ Mastodon khác!
+    didnt_get_confirmation: Gửi lại email xác minh?
     dont_have_your_security_key: Bạn có khóa bảo mật chưa?
     forgot_password: Quên mật khẩu
     invalid_reset_password_token: Mã đặt lại mật khẩu không hợp lệ hoặc hết hạn. Vui lòng yêu cầu một cái mới.
-    link_to_otp: Nhập mã xác thực từ điện thoại hoặc mã phục hồi
+    link_to_otp: Nhập mã xác minh từ điện thoại hoặc mã khôi phục
     link_to_webauth: Nhập khóa bảo mật từ thiết bị
+    log_in_with: Đăng nhập bằng
     login: Đăng nhập
     logout: Đăng xuất
     migrate_account: Chuyển sang tài khoản khác
-    migrate_account_html: Nếu bạn muốn bỏ tài khoản này để dùng một tài khoản khác, bạn có thể <a href="%{path}">thiết lập nó ở đây</a>.
+    migrate_account_html: Nếu bạn muốn bỏ tài khoản này để dùng một tài khoản khác, bạn có thể <a href="%{path}">thiết lập tại đây</a>.
     or_log_in_with: Hoặc đăng nhập bằng
+    privacy_policy_agreement_html: Tôi đã đọc và đồng ý <a href="%{privacy_policy_path}" target="_blank">chính sách bảo mật</a>
     providers:
       cas: CAS
       saml: SAML
     register: Đăng ký
     registration_closed: "%{instance} tạm ngưng đăng ký mới"
-    resend_confirmation: Gửi lại email xác thực
+    resend_confirmation: Gửi lại email xác minh
     reset_password: Đặt lại mật khẩu
+    rules:
+      preamble: Được ban hành và áp dụng bởi quản trị máy chủ %{domain}.
+      title: Quy tắc máy chủ.
     security: Bảo mật
     set_new_password: Đặt mật khẩu mới
     setup:
       email_below_hint_html: Nếu địa chỉ email dưới đây không chính xác, bạn có thể thay đổi địa chỉ tại đây và nhận email xác nhận mới.
-      email_settings_hint_html: Email xác thực đã được gửi tới %{email}. Nếu địa chỉ email đó không chính xác, bạn có thể thay đổi nó trong cài đặt tài khoản.
+      email_settings_hint_html: Email xác minh đã được gửi tới %{email}. Nếu địa chỉ email đó không chính xác, bạn có thể thay đổi nó trong cài đặt tài khoản.
       title: Thiết lập
+    sign_in:
+      preamble_html: Đăng nhập bằng tài khoản <strong>%{domain}</strong>. Nếu tài khoản của bạn được lưu trữ trên một máy chủ khác, bạn sẽ không thể đăng nhập tại đây.
+      title: Đăng nhập %{domain}
+    sign_up:
+      preamble: Với tài khoản trên máy chủ Mastodon này, bạn sẽ có thể theo dõi bất kỳ người nào trên các máy chủ khác, bất kể tài khoản của họ ở đâu.
+      title: Cho phép bạn đăng ký trên %{domain}.
     status:
       account_status: Trạng thái tài khoản
-      confirming: Đang chờ xác thực email.
-      functional: Tài khoản của bạn đã được xác thực.
+      confirming: Đang chờ xác minh email.
+      functional: Tài khoản của bạn đã được xác minh.
       pending: Đơn đăng ký của bạn đang chờ phê duyệt. Điều này có thể mất một thời gian. Bạn sẽ nhận được email nếu đơn đăng ký của bạn được chấp thuận.
       redirecting_to: Tài khoản của bạn không hoạt động vì hiện đang chuyển hướng đến %{acct}.
+      view_strikes: Xem những lần cảnh cáo cũ
     too_fast: Nghi vấn đăng ký spam, xin thử lại.
-    trouble_logging_in: Quên mật khẩu?
     use_security_key: Dùng khóa bảo mật
   authorize_follow:
     already_following: Bạn đang theo dõi người này
@@ -791,7 +981,7 @@ vi:
     following: Chúc mừng! Bạn đã trở thành người theo dõi
     post_follow:
       close: Bạn có thể đóng cửa sổ này rồi.
-      return: Xem trang cá nhân
+      return: Xem trang hồ sơ
       web: Mở trong Mastodon
     title: Theo dõi %{acct}
   challenge:
@@ -806,7 +996,7 @@ vi:
   date:
     formats:
       default: "%-d %B, %Y"
-      with_month_name: "%B %d, %Y"
+      with_month_name: "%-d %B, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} giờ"
@@ -838,10 +1028,36 @@ vi:
       more_details_html: Đọc <a href="%{terms_path}">chính sách bảo mật</a> để biết thêm chi tiết.
       username_available: Tên người dùng của bạn sẽ có thể đăng ký lại
       username_unavailable: Tên người dùng của bạn sẽ không thể đăng ký mới
-  directories:
-    directory: Khám phá
-    explanation: Tìm những người chung sở thích
-    explore_mastodon: Thành viên %{title}
+  disputes:
+    strikes:
+      action_taken: Hành động áp dụng
+      appeal: Khiếu nại
+      appeal_approved: Khiếu nại đã được chấp nhận và cảnh cáo không còn giá trị
+      appeal_rejected: Khiếu nại bị từ chối
+      appeal_submitted_at: Đã gửi khiếu nại
+      appealed_msg: Khiếu nại của bạn đã được gửi đi. Nếu nó được chấp nhận, bạn sẽ nhận được thông báo.
+      appeals:
+        submit: Gửi khiếu nại
+      approve_appeal: Chấp nhận kháng cáo
+      associated_report: Báo cáo đính kèm
+      created_at: Ngày
+      description_html: Đây là những cảnh cáo và áp đặt kiểm duyệt đối với bạn bởi đội ngũ %{instance}.
+      recipient: Người nhận
+      reject_appeal: Từ chối kháng cáo
+      status: 'Tút #%{id}'
+      status_removed: Tút này đã được xóa khỏi hệ thống
+      title: "%{action} từ %{date}"
+      title_actions:
+        delete_statuses: Xóa tút
+        disable: Đóng băng tài khoản
+        mark_statuses_as_sensitive: Đánh dấu tút là nhạy cảm
+        none: Cảnh cáo
+        sensitive: Đánh dấu tài khoản là nhạy cảm
+        silence: Hạn chế tài khoản
+        suspend: Vô hiệu hóa tài khoản
+      your_appeal_approved: Khiếu nại của bạn được chấp nhận
+      your_appeal_pending: Bạn đã gửi một khiếu nại
+      your_appeal_rejected: Khiếu nại của bạn bị từ chối
   domain_validator:
     invalid_domain: không phải là một tên miền hợp lệ
   errors:
@@ -870,75 +1086,82 @@ vi:
       in_progress: Đang tổng hợp dữ liệu của bạn...
       request: Tải về dữ liệu của bạn
       size: Dung lượng
-    blocks: Người bạn chặn
+    blocks: Người chặn
     bookmarks: Tút đã lưu
     csv: CSV
-    domain_blocks: Máy chủ bạn chặn
+    domain_blocks: Máy chủ chặn
     lists: Danh sách
-    mutes: Người bạn ẩn
+    mutes: Người ẩn
     storage: Tập tin
   featured_tags:
     add_new: Thêm mới
     errors:
       limit: Bạn đã đạt tới số lượng hashtag tối đa
-    hint_html: "<strong>Hashtag thường dùng</strong> là gì? Chúng là những hashtag sẽ được hiển thị nổi bật trên trang cá nhân của bạn, cho phép mọi người tìm kiếm các bài đăng công khai của bạn có chứa các hashtag đó. Tính năng này có thể dùng để đánh dấu chuỗi tác phẩm sáng tạo hoặc dự án dài hạn."
+    hint_html: "<strong>Hashtag thường dùng</strong> là gì? Chúng là những hashtag sẽ được hiển thị nổi bật trên trang hồ sơ của bạn, cho phép mọi người tìm kiếm các bài đăng công khai của bạn có chứa các hashtag đó. Tính năng này có thể dùng để đánh dấu chuỗi tác phẩm sáng tạo hoặc dự án dài hạn."
   filters:
     contexts:
-      account: Trang cá nhân
+      account: Trang hồ sơ
       home: Bảng tin
       notifications: Thông báo
       public: Tin công khai
       thread: Thảo luận
     edit:
+      add_keyword: Thêm từ khoá
+      keywords: Từ khóa
+      statuses: Những tút riêng lẻ
+      statuses_hint_html: Bộ lọc này áp dụng cho các tút riêng lẻ được chọn bất kể chúng có khớp với các từ khóa bên dưới hay không. <a href="%{path}">Xem lại hoặc xóa các tút từ bộ lọc</a>.
       title: Chỉnh sửa bộ lọc
     errors:
+      deprecated_api_multiple_keywords: Không thể thay đổi các tham số này từ ứng dụng này vì chúng áp dụng cho nhiều hơn một từ khóa bộ lọc. Sử dụng ứng dụng mới hơn hoặc giao diện web.
       invalid_context: Bối cảnh không hợp lệ hoặc không có
-      invalid_irreversible: Bộ lọc chỉ hoạt động với bảng tin hoặc nội dung thông báo
     index:
+      contexts: Bộ lọc %{contexts}
       delete: Xóa bỏ
       empty: Chưa có bộ lọc nào.
+      expires_in: Hết hạn trong %{distance}
+      expires_on: Hết hạn vào %{date}
+      keywords:
+        other: "%{count} từ khóa"
+      statuses:
+        other: "%{count} tút"
+      statuses_long:
+        other: "%{count} tút riêng lẻ đã ẩn"
       title: Bộ lọc
     new:
+      save: Lưu thành bộ lọc mới
       title: Thêm bộ lọc mới
+    statuses:
+      back_to_filter: Quay về bộ lọc
+      batch:
+        remove: Xóa khỏi bộ lọc
+      index:
+        hint: Bộ lọc này áp dụng để chọn các tút riêng lẻ bất kể các tiêu chí khác. Bạn có thể thêm các tút khác vào bộ lọc này từ giao diện web.
+        title: Những tút đã lọc
   footer:
-    developers: Nhà phát triển
-    more: Nhiều hơn
-    resources: Quy tắc
-    trending_now: Xu hướng
+    trending_now: Thịnh hành
   generic:
     all: Tất cả
-    changes_saved_msg: Đã cập nhật thay đổi xong!
+    all_items_on_page_selected_html:
+      other: Toàn bộ <strong>%{count}</strong> mục trong trang này đã được chọn.
+    all_matching_items_selected_html:
+      other: Toàn bộ <strong>%{count}</strong> mục trùng khớp với tìm kiếm đã được chọn.
+    changes_saved_msg: Đã lưu thay đổi!
     copy: Sao chép
     delete: Xóa
-    no_batch_actions_available: Không có sẵn hành động hàng loạt trên trang này
+    deselect: Bỏ chọn tất cả
+    none: Trống
     order_by: Sắp xếp
     save_changes: Lưu thay đổi
+    select_all_matching_items:
+      other: Chọn tất cả%{count} mục trùng hợp với tìm kiếm của bạn.
+    today: hôm nay
     validation_errors:
       other: Đã có %{count} lỗi xảy ra! Xem chi tiết bên dưới
   html_validator:
     invalid_markup: 'chứa đánh dấu HTML không hợp lệ: %{error}'
-  identity_proofs:
-    active: Hoạt động
-    authorize: OK, cho phép
-    authorize_connection_prompt: Cho phép kết nối mã hóa này?
-    errors:
-      failed: Kết nối mã hóa không thành công. Vui lòng thử lại từ %{provider}.
-      keybase:
-        invalid_token: Mã đăng nhập Keybase giống như chữ ký số và phải đảm bảo 66 ký tự hex
-        verification_failed: Keybase không nhận ra mã đăng nhập này là chữ ký của người dùng Keybase %{kb_username}. Vui lòng thử lại từ Keybase.
-      wrong_user: Không thể tạo bằng chứng cho %{proving} trong khi đăng nhập là %{current}. Đăng nhập bằng %{proving} và thử lại.
-    explanation_html: Tại đây, bạn có thể kết nối mã hóa tài khoản của bạn trên các nền tảng khác, chẳng hạn như Keybase. Điều này cho phép người khác gửi cho bạn tin nhắn được mã hóa và tin tưởng nội dung bạn gửi cho họ.
-    i_am_html: Tôi là %{username} trên %{service}.
-    identity: Danh tính
-    inactive: Không hoạt động
-    publicize_checkbox: 'Và tút này:'
-    publicize_toot: 'Đã chứng minh! Tôi là %{username} trên %{service}: %{url}'
-    remove: Xóa bằng chứng của tài khoản
-    removed: Hoàn tất xóa bằng chứng của tài khoản
-    status: Tình trạng xác minh
-    view_proof: Xem bằng chứng
   imports:
     errors:
+      invalid_csv_file: 'Tập tin CSV không hợp lệ. Lỗi: %{error}'
       over_rows_processing_limit: chứa nhiều hơn %{count} hàng
     modes:
       merge: Hợp nhất
@@ -954,7 +1177,6 @@ vi:
       following: Danh sách người theo dõi
       muting: Danh sách người đã ẩn
     upload: Tải lên
-  in_memoriam_html: Tưởng Niệm
   invites:
     delete: Vô hiệu hóa
     expired: Hết hạn
@@ -981,11 +1203,11 @@ vi:
       limit: Bạn đã đạt đến số lượng danh sách tối đa
   login_activities:
     authentication_methods:
-      otp: xác thực 2 bước
+      otp: xác minh 2 bước
       password: mật khẩu
       sign_in_token: mã an toàn email
       webauthn: khóa bảo mật
-    description_html: Nếu có lần đăng nhập đáng ngờ, hãy đổi ngay mật khẩu và bật xác thực hai bước.
+    description_html: Nếu có lần đăng nhập đáng ngờ, hãy đổi ngay mật khẩu và bật xác minh 2 bước.
     empty: Không có lịch sử đăng nhập
     failed_sign_in_html: Đăng nhập thất bại bằng %{method} từ %{ip} (%{browser})
     successful_sign_in_html: Đăng nhập thành công bằng %{method} từ %{ip} (%{browser})
@@ -996,7 +1218,7 @@ vi:
       not_ready: Tập tin này vẫn chưa xử lý xong. Hãy thử lại sau!
       too_many: Không thể đính kèm hơn 4 tệp
   migrations:
-    acct: Dời sang
+    acct: Chuyển sang
     cancel: Hủy chuyển hướng
     cancel_explanation: Hủy chuyển hướng sẽ kích hoạt lại tài khoản hiện tại của bạn, nhưng sẽ không chuyển được những người theo dõi ở tài khoản mới.
     cancelled_msg: Đã hủy chuyển hướng xong.
@@ -1023,25 +1245,23 @@ vi:
       cooldown: Bạn sẽ bị hạn chế chuyển sang tài khoản mới trong thời gian sắp tới
       disabled_account: Tài khoản này sẽ không thể tiếp tục dùng nữa. Tuy nhiên, bạn có quyền truy cập để xuất dữ liệu cũng như kích hoạt lại.
       followers: Hành động này sẽ chuyển tất cả người theo dõi từ tài khoản hiện tại sang tài khoản mới
-      only_redirect_html: Ngoài ra, bạn có thể <a href="%{path}">đặt chuyển hướng trên trang cá nhân của bạn</a>.
+      only_redirect_html: Ngoài ra, bạn có thể <a href="%{path}">đặt chuyển hướng trên trang hồ sơ của bạn</a>.
       other_data: Dữ liệu khác sẽ không được di chuyển tự động
-      redirect: Trang cá nhân hiện tại của bạn sẽ hiển thị thông báo chuyển hướng và bị loại khỏi kết quả tìm kiếm
+      redirect: Trang hồ sơ hiện tại của bạn sẽ hiển thị thông báo chuyển hướng và bị loại khỏi kết quả tìm kiếm
   moderation:
     title: Kiểm duyệt
   move_handler:
     carry_blocks_over_text: Tài khoản này chuyển từ %{acct}, máy chủ mà bạn đã chặn trước đó.
     carry_mutes_over_text: Tài khoản này chuyển từ %{acct}, máy chủ mà bạn đã ẩn trước đó.
     copy_account_note_text: 'Tài khoản này chuyển từ %{acct}, đây là lịch sử kiểm duyệt của họ:'
+  navigation:
+    toggle_menu: Bật/tắt menu
   notification_mailer:
-    digest:
-      action: Xem toàn bộ thông báo
-      body: Dưới đây là những tin nhắn bạn đã bỏ lỡ kể từ lần truy cập trước vào %{since}
-      mention: "%{name} nhắc đến bạn trong:"
-      new_followers_summary:
-        other: Ngoài ra, bạn đã có %{count} người theo dõi mới trong khi đi chơi! Ngạc nhiên chưa!
-      subject:
-        other: "%{count} thông báo mới kể từ lần truy cập trước \U0001F418"
-      title: Khi bạn offline...
+    admin:
+      report:
+        subject: "%{name} đã gửi báo cáo"
+      sign_up:
+        subject: "%{name} đã được đăng ký"
     favourite:
       body: Tút của bạn vừa được thích bởi %{name}
       subject: "%{name} vừa thích tút của bạn"
@@ -1063,11 +1283,13 @@ vi:
     poll:
       subject: Cuộc bình chọn của %{name} kết thúc
     reblog:
-      body: Tút của bạn vừa được chia sẻ bởi %{name}
-      subject: "%{name} vừa chia sẻ tút của bạn"
-      title: Lượt chia sẻ mới
+      body: Tút của bạn vừa được %{name} đăng lại
+      subject: "%{name} vừa đăng lại tút của bạn"
+      title: Lượt đăng lại mới
     status:
       subject: Bài đăng mới từ %{name}
+    update:
+      subject: "%{name} đã sửa một tút"
   notifications:
     email_events: Email
     email_events_hint: 'Chọn những hoạt động sẽ gửi thông báo qua email:'
@@ -1083,8 +1305,8 @@ vi:
           thousand: K
           trillion: T
   otp_authentication:
-    code_hint: Nhập mã được tạo bởi ứng dụng xác thực của bạn để xác nhận
-    description_html: Nếu kích hoạt <strong>xác thực hai bước</strong> thông qua ứng dụng, bạn sẽ đăng nhập bằng mã token được tạo bởi chính điện thoại của bạn.
+    code_hint: Nhập mã được tạo bởi ứng dụng xác minh của bạn để xác nhận
+    description_html: Nếu kích hoạt <strong>xác minh 2 bước</strong> thông qua ứng dụng, bạn sẽ đăng nhập bằng mã token được tạo bởi chính điện thoại của bạn.
     enable: Kích hoạt
     instructions_html: "<strong>Quét mã QR bằng Google Authenticator hoặc một ứng dụng TOTP tương tự trên điện thoại của bạn</strong>. Kể từ bây giờ, ứng dụng đó sẽ tạo những token để bạn đăng nhập."
     manual_instructions: 'Nếu bạn không thể quét mã QR, đây sẽ là dòng chữ gợi ý:'
@@ -1110,7 +1332,9 @@ vi:
   preferences:
     other: Khác
     posting_defaults: Mặc định cho tút
-    public_timelines: Bảng tin máy chủ
+    public_timelines: Bảng tin
+  privacy_policy:
+    title: Chính sách bảo mật
   reactions:
     errors:
       limit_reached: Bạn không nên thao tác liên tục
@@ -1126,29 +1350,22 @@ vi:
     most_recent: Mới nhất
     moved: Đã xóa
     mutual: Đồng thời
-    primary: Bình thường
+    primary: Hoạt động
     relationship: Quan hệ
     remove_selected_domains: Xóa hết người theo dõi từ các máy chủ đã chọn
     remove_selected_followers: Xóa những người theo dõi đã chọn
     remove_selected_follows: Ngưng theo dõi những người đã chọn
-    status: Trạng thái tài khoản
+    status: Trạng thái của họ
   remote_follow:
-    acct: Nhập địa chỉ Mastodon của bạn (tên@máy chủ)
     missing_resource: Không tìm thấy URL chuyển hướng cho tài khoản của bạn
-    no_account_html: Nếu chưa có tài khoản, hãy <a href='%{sign_up_path}' target='_blank'>đăng ký</a>
-    proceed: Theo dõi
-    prompt: 'Bạn vừa yêu cầu theo dõi:'
-    reason_html: "<strong>Tại sao bước này là cần thiết?</strong> <code>%{instance}</code> có thể không phải là máy chủ nơi bạn đã đăng ký, vì vậy chúng tôi cần chuyển hướng bạn đến máy chủ của bạn trước."
-  remote_interaction:
-    favourite:
-      proceed: Thích tút
-      prompt: 'Bạn muốn thích tút này:'
-    reblog:
-      proceed: Tiếp tục chia sẻ
-      prompt: Bạn có muốn chia sẻ tút này?
-    reply:
-      proceed: Tiếp tục trả lời
-      prompt: Bạn có muốn trả lời tút này?
+  reports:
+    errors:
+      invalid_rules: không đúng với quy tắc
+  rss:
+    content_warning: 'Cảnh báo nội dung:'
+    descriptions:
+      account: Những tút công khai của @%{acct}
+      tag: 'Những tút #%{hashtag} công khai'
   scheduled_statuses:
     over_daily_limit: Bạn đã vượt qua giới hạn được lên lịch đăng tút %{limit} hôm nay
     over_total_limit: Bạn đã vượt quá giới hạn %{limit} của các tút được lên lịch
@@ -1158,7 +1375,7 @@ vi:
     browser: Trình duyệt
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Edge
       electron: Electron
@@ -1172,7 +1389,7 @@ vi:
       phantom_js: PhantomJS
       qq: QQ
       safari: Safari
-      uc_browser: UC
+      uc_browser: UC Browser
       weibo: Weibo
     current_session: Phiên hiện tại
     description: "%{browser} trên %{platform}"
@@ -1181,8 +1398,8 @@ vi:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
-      chrome_os: Chrome OS
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Hệ điều hành Firefox
       ios: iOS
       linux: Linux
@@ -1194,29 +1411,29 @@ vi:
     revoke: Gỡ
     revoke_success: Gỡ phiên thành công
     title: Phiên
-    view_authentication_history: Xem lại lịch sử đăng nhập tài khoản của bạn
+    view_authentication_history: Xem lại lịch sử đăng nhập
   settings:
     account: Bảo mật
     account_settings: Cài đặt tài khoản
     aliases: Kết nối tài khoản
     appearance: Giao diện
-    authorized_apps: App đã dùng
+    authorized_apps: Ứng dụng
     back: Quay lại Mastodon
     delete: Xóa tài khoản
     development: Lập trình
-    edit_profile: Trang cá nhân
+    edit_profile: Sửa hồ sơ
     export: Xuất dữ liệu
     featured_tags: Hashtag thường dùng
-    identity_proofs: Bằng chứng nhận dạng
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
     notifications: Thông báo
     preferences: Chung
-    profile: Trang cá nhân
+    profile: Hồ sơ
     relationships: Quan hệ
     statuses_cleanup: Tự động xóa tút cũ
-    two_factor_authentication: Xác thực hai bước
+    strikes: Lần cảnh cáo
+    two_factor_authentication: Xác minh 2 bước
     webauthn_authentication: Khóa bảo mật
   statuses:
     attached:
@@ -1227,20 +1444,21 @@ vi:
         other: "%{count} hình ảnh"
       video:
         other: "%{count} video"
-    boosted_from_html: Đã chia sẻ từ %{acct_link}
+    boosted_from_html: Đã đăng lại từ %{acct_link}
     content_warning: 'Cảnh báo nội dung: %{warning}'
+    default_language: Giống ngôn ngữ giao diện
     disallowed_hashtags:
       other: 'chứa các hashtag bị cấm: %{tags}'
+    edited_at_html: Đã sửa %{date}
     errors:
       in_reply_not_found: Bạn đang trả lời một tút không còn tồn tại.
-    language_detection: Tự động phát hiện ngôn ngữ
     open_in_web: Xem trong web
     over_character_limit: vượt quá giới hạn %{max} ký tự
     pin_errors:
+      direct: Không thể ghim những tút nhắn riêng
       limit: Bạn đã ghim quá số lượng tút cho phép
       ownership: Không thể ghim tút của người khác
-      private: Tút riêng tư nên không thể ghim
-      reblog: Không thể ghim chia sẻ
+      reblog: Không thể ghim tút đăng lại
     poll:
       total_people:
         other: "%{count} người bình chọn"
@@ -1250,11 +1468,11 @@ vi:
     show_more: Đọc thêm
     show_newer: Mới hơn
     show_older: Cũ hơn
-    show_thread: Toàn chủ đề
+    show_thread: Trích nguyên văn
     sign_in_to_participate: Đăng nhập để trả lời tút này
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Nhắn tin
+      direct: Nhắn riêng
       private: Riêng tư
       private_long: Chỉ người theo dõi mới được xem
       public: Công khai
@@ -1264,12 +1482,12 @@ vi:
   statuses_cleanup:
     enabled: Tự động xóa những tút cũ
     enabled_hint: Tự động xóa các tút của bạn khi chúng tới thời điểm nhất định, trừ những trường hợp ngoại lệ bên dưới
-    exceptions: Ngoại trừ
-    explanation: Việc xóa tút rất tốn thời gian vì tút của bạn sẽ tăng dần theo năm tháng. Bởi lý do này, bạn nên xóa những tút cũ khi chúng đã đạt tới thời điểm nhất định.
-    ignore_favs: Bỏ qua số luợt thích
-    ignore_reblogs: Bỏ qua số lượt chia sẻ
+    exceptions: Ngoại lệ
+    explanation: Số lượng tút sẽ tăng dần theo năm tháng. Bạn nên xóa những tút cũ khi tới một thời điểm nhất định.
+    ignore_favs: Bỏ qua số lượt thích
+    ignore_reblogs: Bỏ qua lượt đăng lại
     interaction_exceptions: Ngoại lệ dựa trên tương tác
-    interaction_exceptions_explanation: Lưu ý rằng không có gì đảm bảo rằng các bài đăng sẽ bị xóa nếu chúng xuống dưới ngưỡng mức yêu thích hoặc chia sẻ sau khi đã từng vượt qua.
+    interaction_exceptions_explanation: Lưu ý rằng không có gì đảm bảo rằng các tút sẽ bị xóa nếu chúng tụt dưới ngưỡng mức yêu thích hoặc đăng lại, dù đã từng đạt.
     keep_direct: Giữ lại tin nhắn
     keep_direct_hint: Không xóa tin nhắn của bạn
     keep_media: Giữ lại những tút có đính kèm media
@@ -1288,152 +1506,117 @@ vi:
       '2629746': 1 tháng
       '31556952': 1 năm
       '5259492': 2 tháng
+      '604800': 1 tuần
       '63113904': 2 năm
       '7889238': 3 tháng
     min_age_label: Thời điểm
     min_favs: Giữ những tút yêu thích lâu hơn
     min_favs_hint: Những tút có lượt thích nhiều hơn số này sẽ không bị xóa. Để trống nếu bạn muốn xóa hết
-    min_reblogs: Giữ những tút đã chia sẻ lâu hơn
-    min_reblogs_hint: Những tút có lượt chia sẻ nhiều hơn số này sẽ không bị xóa. Để trống nếu bạn muốn xóa hết
+    min_reblogs: Giữ những tút đã đăng lại lâu hơn
+    min_reblogs_hint: Những tút có lượt đăng lại nhiều hơn số này sẽ không bị xóa. Để trống nếu bạn muốn xóa hết
   stream_entries:
-    pinned: Tút được ghim
-    reblogged: chia sẻ
+    pinned: Tút đã ghim
+    reblogged: đăng lại
     sensitive_content: NSFW
+  strikes:
+    errors:
+      too_late: Đã quá trễ để kháng cáo
   tags:
     does_not_match_previous_name: không khớp với tên trước
-  terms:
-    body_html: |
-      <h2>Chính sách bảo mật</h2>
-      <h3 id="collect">Chúng tôi thu thập những thông tin gì?</h3>
-
-      <ul>
-      <li><em>Thông tin tài khoản cơ bản</em>: Nếu bạn đăng ký trên máy chủ này, bạn phải cung cấp tên người dùng, địa chỉ email và mật khẩu. Bạn cũng có thể tùy chọn bổ sung tên hiển thị, tiểu sử, ảnh đại diện, ảnh bìa. Tên người dùng, tên hiển thị, tiểu sử, ảnh hồ sơ và ảnh bìa luôn được hiển thị công khai.</li>
-      <li><em>Tút, lượt theo dõi và nội dung công khai khác</em>: Danh sách những người bạn theo dõi được liệt kê công khai, cũng tương tự như danh sách những người theo dõi bạn. Khi bạn đăng tút, ngày giờ và ứng dụng sử dụng được lưu trữ. Tút có thể chứa tệp đính kèm hình ảnh và video. Tút công khai và tút mở sẽ hiển thị công khai. Khi bạn đăng một tút trên trang cá nhân của bạn, đó là nội dung công khai. Tút của bạn sẽ gửi đến những người theo dõi của bạn, đồng nghĩa với việc sẽ có các bản sao được lưu trữ ở máy chủ của họ. Khi bạn xóa bài viết, bản sao từ những người theo dõi của bạn cũng bị xóa theo. Hành động chia sẻ hoặc thích một tút luôn luôn là công khai.</li>
-      <li><em>Tin nhắn và tút dành cho người theo dõi</em>: Toàn bộ tút được lưu trữ và xử lý trên máy chủ. Các tút dành cho người theo dõi được gửi đến những người theo dõi và những người được gắn thẻ trong tút. Còn các tin nhắn chỉ được gửi đến cho người nhận. Điều đó có nghĩa là chúng được gửi đến các máy chủ khác nhau và có các bản sao được lưu trữ ở đó. Chúng tôi đề nghị chỉ cho những người được ủy quyền truy cập vào đó, nhưng không phải máy chủ nào cũng làm như vậy. Do đó, điều quan trọng là phải xem xét kỹ máy chủ của người theo dõi của bạn. Bạn có thể thiết lập tự mình phê duyệt và từ chối người theo dõi mới trong cài đặt. <em>Xin lưu ý rằng quản trị viên máy chủ của bạn và bất kỳ máy chủ của người nhận nào cũng có thể xem các tin nhắn</em>. Người nhận tin nhắn có thể chụp màn hình, sao chép hoặc chia sẻ lại chúng. <em>Không nên chia sẻ bất kỳ thông tin rủi ro nào trên Mastodon.</em></li>
-      <li> <em>Địa chỉ IP và siêu dữ liệu khác</em>: Khi bạn đăng nhập, chúng tôi ghi nhớ địa chỉ IP đăng nhập cũng như tên trình duyệt của bạn. Tất cả các phiên đăng nhập sẽ để bạn xem xét và hủy bỏ trong phần cài đặt. Địa chỉ IP sử dụng được lưu trữ tối đa 12 tháng. Chúng tôi cũng có thể giữ lại nhật ký máy chủ bao gồm địa chỉ IP của những lượt đăng ký tài khoản trên máy chủ của chúng tôi. </li>
-      </ul><hr class="spacer" />
-      <h3 id="use"> Chúng tôi sử dụng thông tin của bạn để làm gì? </h3>
-      <p> Bất kỳ thông tin nào chúng tôi thu thập từ bạn là: </p>
-      <ul>
-      <li>Để cung cấp các chức năng cốt lõi của Mastodon. Sau khi đăng nhập, bạn mới có thể tương tác với nội dung của người khác và đăng nội dung của riêng bạn. Ví dụ: bạn có thể theo dõi người khác để xem các tút của họ trong bảng tin của bạn.</li>
-      <li>Để hỗ trợ kiểm duyệt. Ví dụ so sánh địa chỉ IP của bạn với các địa chỉ đã biết khác để xác định hacker hoặc spammer.</li>
-      <li>Địa chỉ email bạn cung cấp chỉ được sử dụng để gửi các thông báo quan trọng, trả lời các câu hỏi cũng như yêu cầu khác từ chính bạn.</li>
-      </ul>
-      <hr class="spacer" />
-      <h3 id="protect">Chúng tôi bảo vệ thông tin của bạn như thế nào? </h3>
-      <p>Chúng tôi thực hiện nhiều biện pháp để duy trì sự an toàn khi bạn nhập, gửi hoặc truy cập thông tin cá nhân của bạn. Một vài trong số đó như là kiểm soát phiên đăng nhập của bạn, lưu lượng giữa các ứng dụng và API, bảo mật bằng SSL và băm nhỏ mật khẩu nhờ thuật toán một chiều mạnh mẽ. Bạn có thể kích hoạt xác thực hai yếu tố để tiếp tục truy cập an toàn vào tài khoản của mình.</p>
-      <hr class="spacer" />
-      <h3 id="data-retention">Chúng tôi lưu trữ dữ liệu như thế nào?</h3>
-      <p>Chúng tôi tiến hành:</p>
-      <ul>
-      <li>Giữ lại nhật ký máy chủ chứa địa chỉ IP của tất cả các yêu cầu đến máy chủ này, cho đến khi các nhật ký đó bị xóa đi trong vòng 90 ngày.</li>
-      <li>Giữ lại các địa chỉ IP được liên kết với người dùng đã đăng ký trong vòng 12 tháng.</li>
-      </ul>
-      <p>Bạn có thể tải xuống một bản sao lưu trữ nội dung của bạn, bao gồm các tút, tập tin đính kèm, ảnh đại diện và ảnh bìa.</p>
-      <p> Bạn có thể xóa tài khoản của mình bất cứ lúc nào.</p>
-      <hr class="spacer"/>
-      <h3 id="cookies">Chúng tôi có sử dụng cookie không?</h3>
-      <p>Có. Cookie là các tệp nhỏ mà một trang web hoặc nhà cung cấp dịch vụ internet chuyển vào ổ cứng máy tính của bạn thông qua trình duyệt Web (nếu bạn cho phép). Những cookie này cho phép trang web nhận ra trình duyệt của bạn và nếu bạn có tài khoản đã đăng ký, nó sẽ liên kết với tài khoản đã đăng ký của bạn.</p>
-      <p> Chúng tôi sử dụng cookie để hiểu và lưu các tùy chọn của bạn cho các lần truy cập trong tiếp theo.</p>
-      <hr class="spacer" />
-      <h3 id="disclose">Chúng tôi có tiết lộ bất cứ thông tin nào ra ngoài không?</h3>
-      <p>Chúng tôi không bán, trao đổi hoặc chuyển nhượng thông tin nhận dạng cá nhân của bạn cho bên thứ ba. Trừ khi bên thứ ba đó đang hỗ trợ chúng tôi điều hành Mastodon, tiến hành kinh doanh hoặc phục vụ bạn, miễn là các bên đó đồng ý giữ bí mật thông tin này. Chúng tôi cũng có thể tiết lộ thông tin của bạn nếu việc công bố là để tuân thủ luật pháp, thực thi quy tắc máy chủ của chúng tôi hoặc bảo vệ quyền, tài sản hợp pháp hoặc sự an toàn của chúng tôi hoặc bất kỳ ai.</p>
-      <p>Nội dung công khai của bạn có thể được tải xuống bởi các máy chủ khác trong mạng liên hợp. Các tút công khai hay dành cho người theo dõi được gửi đến các máy chủ nơi người theo dõi của bạn là thành viên và tin nhắn được gửi đến máy chủ của người nhận, cho đến khi những người theo dõi hoặc người nhận đó chuyển sang một máy chủ khác.</p>
-      <p>Nếu bạn cho phép một ứng dụng sử dụng tài khoản của mình, tùy thuộc vào phạm vi quyền bạn phê duyệt, ứng dụng có thể truy cập thông tin trang cá nhân, danh sách người theo dõi, danh sách của bạn, tất cả tút và lượt thích của bạn. Các ứng dụng không bao giờ có thể truy cập địa chỉ e-mail hoặc mật khẩu của bạn.</p>
-      <hr class="spacer" />
-      <h3 id="children">Cấm trẻ em sử dụng</h3>
-      <p>Nếu máy chủ này ở EU hoặc EEA: Trang web của chúng tôi, các sản phẩm và dịch vụ đều dành cho những người trên 16 tuổi. Nếu bạn dưới 16 tuổi, xét theo GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">Quy định bảo vệ dữ liệu chung</a>) thì không được sử dụng trang web này. </p>
-      <p>Nếu máy chủ này ở Hoa Kỳ: Trang web của chúng tôi, các sản phẩm và dịch vụ đều dành cho những người trên 13 tuổi. Nếu bạn dưới 13 tuổi, xét theo COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Đạo luật bảo vệ quyền riêng tư trực tuyến của trẻ em</a>) thì không được sử dụng trang web này.</p>
-      <p>Quy định pháp luật có thể khác biệt nếu máy chủ này ở khu vực địa lý khác.</p>
-      <hr class="spacer" />
-      <h3 id="changes">Cập nhật thay đổi</h3>
-      <p>Nếu có thay đổi chính sách bảo mật, chúng tôi sẽ đăng những thay đổi đó ở mục này.</p>
-      <p>Tài liệu này phát hành dưới hình thức CC-BY-SA và được cập nhật lần cuối vào ngày 7 tháng 3 năm 2018.</p>
-      <p>Chỉnh sửa và hoàn thiện từ <a href="https://github.com/discourse/discourse">Discourse</a>.</p>
-    title: Quy tắc của %{instance}
   themes:
     contrast: Mastodon (Độ tương phản cao)
     default: Mastodon (Tối)
     mastodon-light: Mastodon (Sáng)
   time:
     formats:
-      default: "%d.%m.%Y %H:%M"
+      default: "%-d.%m.%Y %H:%M"
       month: "%B %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Thêm
     disable: Vô hiệu hóa
-    disabled_success: Đã vô hiệu hóa xác thực hai bước
+    disabled_success: Đã vô hiệu hóa xác minh 2 bước
     edit: Sửa
-    enabled: Đã kích hoạt xác thực hai bước
-    enabled_success: Xác thực hai bước được kích hoạt thành công
+    enabled: Đã kích hoạt xác minh 2 bước
+    enabled_success: Xác minh 2 bước được kích hoạt thành công
     generate_recovery_codes: Tạo mã khôi phục
     lost_recovery_codes: Mã khôi phục cho phép bạn lấy lại quyền truy cập vào tài khoản của mình nếu bạn mất điện thoại. Nếu bạn bị mất mã khôi phục, bạn có thể tạo lại chúng ở đây. Mã khôi phục cũ của bạn sẽ bị vô hiệu.
-    methods: Phương pháp xác thực
-    otp: Ứng dụng xác thực
-    recovery_codes: Mã phục hồi dự phòng
+    methods: Phương pháp xác minh
+    otp: Ứng dụng xác minh
+    recovery_codes: Mã khôi phục dự phòng
     recovery_codes_regenerated: Mã khôi phục được phục hồi thành công
     recovery_instructions_html: Nếu bạn bị mất điện thoại, hãy dùng một trong các mã khôi phục bên dưới để lấy lại quyền truy cập vào tài khoản của mình. <strong>Giữ mã khôi phục an toàn</strong>. Ví dụ, bạn có thể in chúng ra giấy.
     webauthn: Khóa bảo mật
   user_mailer:
+    appeal_approved:
+      action: Đến trang hồ sơ của bạn
+      explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã được chấp nhận. Tài khoản của bạn đã có thể sử dụng bình thường.
+      subject: Khiếu nại của bạn từ %{date} đã được chấp nhận
+      title: Khiếu nại đã được chấp nhận
+    appeal_rejected:
+      explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã bị từ chối.
+      subject: Khiếu nại của bạn từ %{date} đã bị từ chối
+      title: Khiếu nại bị từ chối
     backup_ready:
       explanation: Bạn đã yêu cầu sao lưu toàn bộ tài khoản Mastodon của mình. Bây giờ có thể tải về!
       subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
       title: Nhận dữ liệu cá nhân
-    sign_in_token:
-      details: 'Chi tiết cụ thể:'
-      explanation: 'Tài khoản của bạn vừa đăng nhập từ một địa chỉ IP lạ. Nếu thật là bạn, hãy nhập mã an toàn bên dưới vào trang đăng nhập:'
-      further_actions: 'Nếu không phải là bạn, hãy lập tức thay đổi mật khẩu và kích hoạt xác thực hai bước ở đây:'
-      subject: Xác nhận đăng nhập
-      title: Đăng nhập
+    suspicious_sign_in:
+      change_password: đổi mật khẩu của bạn
+      details: 'Chi tiết thông tin đăng nhập:'
+      explanation: Chúng tôi phát hiện lần đăng nhập bất thường tài khoản của bạn từ một địa chỉ IP mới.
+      further_actions_html: Nếu đó không phải là bạn, chúng tôi khuyến nghị %{action} lập tức và bật xác minh hai bước để giữ tài khoản được an toàn.
+      subject: Đăng nhập tài khoản từ địa chỉ IP mới
+      title: Lần đăng nhập mới
     warning:
+      appeal: Gửi khiếu nại
+      appeal_description: Nếu bạn nghĩ đây chỉ là nhầm lẫn, hãy gửi một khiếu nại cho %{instance}.
+      categories:
+        spam: Spam
+        violation: Nội dung vi phạm quy tắc cộng đồng
       explanation:
-        disable: Bạn bị cấm đăng nhập tài khoản. Tuy nhiên, trang cá nhân và dữ liệu của bạn vẫn sẽ được giữ nguyên.
-        sensitive: Ảnh và video tải lên của bạn sẽ bị đánh dấu là nhạy cảm.
-        silence: Bạn vẫn có thể dùng tài khoản của bạn. Tuy nhiên, chỉ có những người đang theo dõi bạn mới có thể thấy tút của bạn. Bạn sẽ bị loại khỏi danh sách của một số người. Những người mới khác vẫn có thể theo dõi bạn bình thường.
-        suspend: Tài khoản của bạn đã bị vô hiệu hóa. Tất cả tút và tập tin mà bạn đã tải lên sẽ không thể truy cập được nữa. Bạn vẫn có thể đăng nhập để yêu cầu tải về bản sao dữ liệu của bạn. Tuy nhiên, chúng tôi sẽ giữ lại một vài dữ liệu để ngăn ngừa bạn trốn tránh trách nhiệm.
-      get_in_touch: Bạn có thể trả lời e-mail này để liên hệ với đội ngũ của %{instance}.
-      review_server_policies: Xem lại quy tắc của máy chủ
-      statuses: 'Cụ thể, cho:'
+        delete_statuses: Vài tút của bạn đã vi phạm quy tắc máy chủ và tạm thời bị ẩn bởi kiểm duyệt viên của %{instance}.
+        disable: Bạn không còn có thể sử dụng tài khoản của mình, nhưng hồ sơ của bạn và dữ liệu khác vẫn còn nguyên. Bạn có thể yêu cầu sao lưu dữ liệu của mình, thay đổi cài đặt tài khoản hoặc xóa tài khoản của bạn.
+        mark_statuses_as_sensitive: Vài tút của bạn đã bị kiểm duyệt viên %{instance} đánh dấu nhạy cảm. Mọi người cần nhấn vào media để xem nó. Bạn có thể tự đánh dấu tài khoản của bạn là nhạy cảm.
+        sensitive: Từ giờ trở đi, tất cả các media của bạn bạn tải lên sẽ được đánh dấu là nhạy cảm và ẩn đằng sau cảnh báo nhấp chuột.
+        silence: Bạn vẫn có thể sử dụng tài khoản của mình, nhưng chỉ những người đang theo dõi bạn mới thấy bài đăng của bạn. Bạn cũng bị loại khỏi các tính năng khám phá khác. Tuy nhiên, những người khác vẫn có thể theo dõi bạn.
+        suspend: Bạn không còn có thể sử dụng tài khoản của bạn, hồ sơ và các dữ liệu khác không còn có thể truy cập được. Trong vòng 30 ngày, bạn vẫn có thể đăng nhập để yêu cầu bản sao dữ liệu của mình cho đến khi dữ liệu bị xóa hoàn toàn, nhưng chúng tôi sẽ giữ lại một số dữ liệu cơ bản để ngăn bạn thoát khỏi việc vô hiệu hóa.
+      reason: 'Lý do:'
+      statuses: 'Tút lưu ý:'
       subject:
+        delete_statuses: Những tút %{acct} của bạn đã bị xóa bỏ
         disable: Tài khoản %{acct} của bạn đã bị vô hiệu hóa
-        none: Cảnh báo cho %{acct}
-        sensitive: Ảnh và video tải lên của %{acct} sẽ bị đánh dấu là nhạy cảm
+        mark_statuses_as_sensitive: Tút của bạn trên %{acct} bị đánh dấu nhạy cảm
+        none: Cảnh cáo %{acct}
+        sensitive: Tút của bạn trên %{acct} sẽ bị đánh dấu nhạy cảm kể từ bây giờ
         silence: Tài khoản %{acct} của bạn đã bị hạn chế
         suspend: Tài khoản %{acct} của bạn đã bị vô hiệu hóa
       title:
+        delete_statuses: Xóa tút
         disable: Tài khoản bị đóng băng
-        none: Cảnh báo
-        sensitive: Ảnh và video của bạn sẽ bị đánh dấu nhạy cảm
+        mark_statuses_as_sensitive: Tút đã bị đánh dấu nhạy cảm
+        none: Cảnh cáo
+        sensitive: Tài khoản đã bị đánh dấu nhạy cảm
         silence: Tài khoản bị hạn chế
-        suspend: Toài khoản bị vô hiệu hóa
+        suspend: Tài khoản bị vô hiệu hóa
     welcome:
-      edit_profile_action: Cài đặt trang cá nhân
-      edit_profile_step: Bạn có thể tùy chỉnh trang cá nhân của mình bằng cách tải lên ảnh đại diện, ảnh bìa, thay đổi tên hiển thị và hơn thế nữa. Nếu bạn muốn những người theo dõi mới phải được phê duyệt, hãy chuyển tài khoản sang trạng thái khóa.
+      edit_profile_action: Cài đặt trang hồ sơ
+      edit_profile_step: Bạn có thể chỉnh sửa trang hồ sơ của mình bằng cách tải lên ảnh đại diện, ảnh bìa, đổi biệt danh và hơn thế nữa. Bạn cũng có thể tự phê duyệt những người theo dõi mới.
       explanation: Dưới đây là một số mẹo để giúp bạn bắt đầu
       final_action: Viết tút mới
-      final_step: 'Viết tút mới! Ngay cả khi chưa có người theo dõi, người khác vẫn có thể xem tút công khai của bạn trên bảng tin máy chủ và trong hashtag. Hãy giới thiệu bản thân với hashtag #introduction.'
+      final_step: 'Viết tút mới! Ngay cả khi chưa có người theo dõi, người khác vẫn có thể xem tút công khai của bạn trên bảng tin máy chủ và qua hashtag. Hãy giới thiệu bản thân với hashtag #introductions.'
       full_handle: Tên đầy đủ của bạn
       full_handle_hint: Đây cũng là địa chỉ được dùng để giao tiếp với tất cả mọi người.
-      review_preferences_action: Tùy chỉnh giao diện
-      review_preferences_step: Tùy chỉnh mọi thứ! Chẳng hạn như chọn loại email nào bạn muốn nhận hoặc trạng thái đăng tút mặc định mà bạn muốn dùng. Hãy tắt tự động phát GIF nếu bạn dễ bị chóng mặt.
       subject: Chào mừng đến với Mastodon
-      tip_federated_timeline: Mạng liên hợp là một dạng "liên hợp quốc" của Mastodon. Hiểu một cách đơn giản, nó là những người bạn đã theo dõi từ các máy chủ khác.
-      tip_following: Theo mặc định, bạn sẽ theo dõi (các) quản trị viên máy chủ của bạn. Để tìm những người thú vị hơn, hãy xem qua cộng đồng và thế giới.
-      tip_local_timeline: Bảng tin là nơi hiện lên những tút công khai của thành viên %{instance}. Họ là những người hàng xóm trực tiếp của bạn!
-      tip_mobile_webapp: Nếu trình duyệt trên điện thoại di động của bạn thêm Mastodon vào màn hình chính, bạn có thể nhận được thông báo đẩy. Nó hoạt động gần giống như một app điện thoại!
-      tips: Mẹo
       title: Xin chào %{name}!
   users:
     follow_limit_reached: Bạn chỉ có thể theo dõi tối đa %{limit} người
-    generic_access_help_html: Gặp trục trặc với tài khoản? Liên hệ %{email} để được trợ giúp
-    invalid_otp_token: Mã xác thực hai bước không hợp lệ
-    invalid_sign_in_token: Mã an toàn không hợp lệ
+    invalid_otp_token: Mã xác minh 2 bước không hợp lệ
     otp_lost_help_html: Nếu bạn mất quyền truy cập vào cả hai, bạn có thể đăng nhập bằng %{email}
     seamless_external_login: Bạn đã đăng nhập thông qua một dịch vụ bên ngoài, vì vậy mật khẩu và email không khả dụng.
     signed_in_as: 'Đăng nhập với tư cách là:'
-    suspicious_sign_in_confirmation: Đây là lần đầu tiên bạn đăng nhập trên thiết bị này. Vì vậy, chúng tôi sẽ gửi một mã an toàn đến email của bạn để xác thực danh tính.
   verification:
-    explanation_html: 'Bạn có thể <strong>xác minh mình là chủ sở hữu của các trang web</strong> ở đầu trang cá nhân của bạn. Để xác minh, trang web <strong>phải chèn mã</strong> <code>rel="me"</code>. Văn bản thay thế cho liên kết không quan trọng. Đây là một ví dụ:'
+    explanation_html: 'Bạn có thể <strong>xác minh mình là chủ sở hữu của các trang web</strong> ở đầu trang hồ sơ của bạn. Để xác minh, trang web <strong>phải chèn mã</strong> <code>rel="me"</code>. Văn bản thay thế cho liên kết không quan trọng. Đây là một ví dụ:'
     verification: Xác minh
   webauthn_credentials:
     add: Thêm khóa bảo mật mới
@@ -1450,5 +1633,5 @@ vi:
     nickname_hint: Nhập tên mới cho khóa bảo mật của bạn
     not_enabled: Bạn chưa kích hoạt WebAuthn
     not_supported: Trình duyệt của bạn không hỗ trợ khóa bảo mật
-    otp_required: Để dùng khóa bảo mật, trước tiên hãy kích hoạt xác thực hai bước.
+    otp_required: Để dùng khóa bảo mật, trước tiên hãy kích hoạt xác minh 2 bước.
     registered_on: Đăng ký vào %{date}
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index 5893d0c8a..d29daf18c 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -1,29 +1,11 @@
 ---
 zgh:
-  about:
-    about_this: ⵖⴼ
-    contact: ⴰⵎⵢⴰⵡⴰⴹ
-    learn_more: ⵙⵙⵏ ⵓⴳⴳⴰⵔ
-    status_count_after:
-      one: ⴰⴷⴷⴰⴷ
-      other: ⴰⴷⴷⴰⴷⵏ
-    unavailable_content_description:
-      domain: ⴰⵎⴰⴽⴽⴰⵢ
-    what_is_mastodon: ⵎⴰ'ⵢⴷ ⵉⴳⴰⵏ ⵎⴰⵙⵜⵔⴷⵓⵎ?
   accounts:
     follow: ⴹⴼⵕ
     followers:
       one: ⴰⵎⴹⴼⴰⵕ
       other: ⵉⵎⴹⴼⴰⵕⵏ
-    media: ⵉⵙⵏⵖⵎⵉⵙⵏ
-    never_active: ⵓⵙⴰⵔ
-    roles:
-      bot: ⴰⴱⵓⵜ
-      group: ⵜⴰⵔⴰⴱⴱⵓⵜ
-    unfollow: ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ
   admin:
-    account_moderation_notes:
-      delete: ⴽⴽⵙ
     accounts:
       change_email:
         label: ⵙⵏⴼⵍ ⵉⵎⴰⵢⵍ
@@ -43,8 +25,6 @@ zgh:
         all: ⵎⴰⵕⵕⴰ
       public: ⴰⴳⴷⵓⴷⴰⵏ
       reject: ⴰⴳⵢ
-      roles:
-        user: ⵓⵏⵙⵙⵓⵎⵔⵙ
       title: ⵉⵎⵉⴹⴰⵏⵏ
       web: ⵡⵉⴱ
     action_logs:
@@ -81,18 +61,10 @@ zgh:
       notes:
         delete: ⴽⴽⵙ
       status: ⴰⴷⴷⴰⴷ
-    settings:
-      site_title: ⵉⵙⵎ ⵏ ⵓⵎⴰⴽⴽⴰⵢ
-      title: ⵜⵉⵙⵖⴰⵍ ⵏ ⵡⴰⵙⵉⵜ
     statuses:
-      batch:
-        delete: ⴽⴽⵙ
       media:
         title: ⵉⵙⵏⵖⵎⵉⵙⵏ
       with_media: ⵙ ⵉⵙⵏⵖⵎⵉⵙⵏ
-    tags:
-      name: ⵀⴰⵛⵟⴰⴳ
-      title: ⵉⵀⴰⵛⵟⴰⴳⵏ
     warning_presets:
       delete: ⴽⴽⵙ
   application_mailer:
@@ -127,8 +99,6 @@ zgh:
   filters:
     index:
       delete: ⴽⴽⵙ
-  footer:
-    more: ⵓⴳⴳⴰⵔ…
   generic:
     all: ⵎⴰⵕⵕⴰ
     copy: ⵙⵏⵖⵍ
@@ -143,6 +113,9 @@ zgh:
       '86400': ⴰⵙⵙ
     expires_in_prompt: ⵓⵙⴰⵔ
   notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} ⴼⴼⵖⵏ"
     mention:
       action: ⵔⴰⵔ
   relationships:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 41c47f60e..bc1a7994a 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,120 +1,63 @@
 ---
 zh-CN:
   about:
-    about_hashtag_html: 这里展示的是带有话题标签 <strong>#%{hashtag}</strong> 的公开嘟文。如果你想与他们互动，你需要在任意一个 Mastodon 站点或与其兼容的网站上拥有一个帐户。
-    about_mastodon_html: Mastodon 是一个建立在开放式网络协议和自由、开源软件之上的社交网络，有着类似于电子邮件的分布式设计。
-    about_this: 关于本站
-    active_count_after: 活跃用户
-    active_footnote: 每月活跃用户
-    administered_by: 本站管理员：
-    api: API
-    apps: 移动应用
-    apps_platforms: 在 iOS、Android 和其他平台上使用 Mastodon
-    browse_directory: 浏览用户目录并按兴趣筛选
-    browse_local_posts: 浏览此服务器上实时公开嘟文
-    browse_public_posts: 浏览 Mastodon 上公共嘟文的实时信息流
-    contact: 联系方式
+    about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！使用 Mastodon 夺回你的数据！
     contact_missing: 未设定
     contact_unavailable: 未公开
-    discover_users: 发现用户
-    documentation: 文档
-    federation_hint_html: 在 %{instance} 上拥有账号后，你可以关注任何兼容Mastodon的服务器上的人。
-    get_apps: 尝试移动应用
-    hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例
-    instance_actor_flash: "这个账号是个虚拟帐号，不代表任何用户，只用来代表服务器本身。它用于和其它服务器互通，所以不应该被封禁，除非你想封禁整个实例。但是想封禁整个实例的时候，你应该用域名封禁。 \n"
-    learn_more: 了解详情
-    privacy_policy: 隐私政策
-    rules: 服务器规则
-    rules_html: 如果你想要在此Mastodon服务器上拥有一个账户，你必须遵守相应的规则，摘要如下：
-    see_whats_happening: 看一看现在在发生什么
-    server_stats: 服务器统计数据：
-    source_code: 源码
-    status_count_after:
-      other: 条嘟文
-    status_count_before: 他们共嘟出了
-    tagline: 关注并发现新朋友
-    terms: 使用条款
-    unavailable_content: 被限制的服务器
-    unavailable_content_description:
-      domain: 服务器
-      reason: 原因
-      rejecting_media: 来自这些服务器的媒体文件将不会被处理或存储，缩略图也不会显示，需要手动点击打开原始文件。
-      rejecting_media_title: 被过滤的媒体文件
-      silenced: 来自这些服务器上的帖子将不会出现在公共时间轴和会话中，通知功能也不会提醒这些用户的动态；只有你关注了这些用户，才会收到用户互动的通知消息。
-      silenced_title: 已隐藏的服务器
-      suspended: 这些服务器的数据将不会被处理、存储或者交换，本站也将无法和来自这些服务器的用户互动或者交流。
-      suspended_title: 已封禁的服务器
-    unavailable_content_html: 通常来说，在Mastodon上，你可以浏览联邦宇宙中任何一台服务器上的内容，并且和上面的用户互动。但是某些站点上不排除会有例外。
-    user_count_after:
-      other: 位用户
-    user_count_before: 这里共注册有
-    what_is_mastodon: Mastodon 是什么？
+    hosted_on: 运行在 %{domain} 上的 Mastodon 站点
+    title: 关于本站
   accounts:
-    choices_html: "%{name} 的推荐："
-    endorsements_hint: 你可以在web界面上推荐你关注的人，他们会显示在这里。
-    featured_tags_hint: 你可以精选一些话题标签展示在这里。
     follow: 关注
     followers:
       other: 关注者
     following: 正在关注
-    instance_actor_flash: 这个账户是虚拟账户，用来代表服务器自身，不代表任何实际用户。它用于互通功能，不应该封禁。
-    joined: 加入于 %{date}
+    instance_actor_flash: 该账号用来代表虚拟角色，并不代表个人用户，仅代表服务器本身。该账号用于达成互联之目的，不应该被停用。
     last_active: 最近活动
     link_verified_on: 此链接的所有权已在 %{date} 检查
-    media: 媒体
-    moved_html: "%{name} 已经迁移到 %{new_profile_link}："
-    network_hidden: 此信息不可用
-    never_active: 从未活跃
     nothing_here: 这里什么都没有！
-    people_followed_by: "%{name} 关注的人"
-    people_who_follow: 关注 %{name} 的人
     pin_errors:
       following: 你必须关注你要推荐的人
     posts:
       other: 嘟文
     posts_tab_heading: 嘟文
-    posts_with_replies: 嘟文和回复
-    roles:
-      admin: 管理员
-      bot: 机器人
-      group: 组
-      moderator: 监察员
-    unavailable: 个人资料不可用
-    unfollow: 取消关注
   admin:
     account_actions:
       action: 执行操作
       title: 在 %{acct} 上执行管理操作
     account_moderation_notes:
-      create: 新建
-      created_msg: 管理备忘建立成功！
-      delete: 删除
-      destroyed_msg: 管理备忘删除成功！
+      create: 新增记录
+      created_msg: 管理记录已创建！
+      destroyed_msg: 管理记录删除成功！
     accounts:
       add_email_domain_block: 封禁电子邮箱域名
       approve: 批准
-      approve_all: 全部批准
-      approved_msg: 成功批准 %{username} 的注册申请
+      approved_msg: 已批准 %{username} 的注册申请
       are_you_sure: 你确定吗？
       avatar: 头像
       by_domain: 域名
       change_email:
-        changed_msg: 已成功更改账号的电子邮箱！
+        changed_msg: 已成功更改电子邮件地址！
         current_email: 当前的电子邮箱
         label: 更改电子邮箱
         new_email: 新的电子邮箱
         submit: 更改电子邮件地址
         title: 为 %{username} 更改电子邮箱
+      change_role:
+        changed_msg: 已成功更改角色！
+        label: 更改角色
+        no_role: 没有角色
+        title: 更改 %{username} 的角色
       confirm: 确认
       confirmed: 已确认
-      confirming: 确认中
+      confirming: 等待确认
+      custom: 自定义
       delete: 删除数据
       deleted: 已删除
       demote: 降任
-      destroyed_msg: "%{username} 的数据已进入等待队列，即将被删除"
+      destroyed_msg: "%{username} 的数据已被安排至删除队列"
       disable: 冻结
       disable_sign_in_token_auth: 禁用电子邮件令牌认证
-      disable_two_factor_authentication: 停用双重认证
+      disable_two_factor_authentication: 停用两步认证
       disabled: 已冻结
       display_name: 昵称
       domain: 域名
@@ -124,7 +67,7 @@ zh-CN:
       enable: 解冻
       enable_sign_in_token_auth: 启用电子邮件令牌认证
       enabled: 已启用
-      enabled_msg: 成功解冻 %{username} 的帐号
+      enabled_msg: 成功解冻 %{username} 的账号
       followers: 关注者
       follows: 正在关注
       header: 个人资料页横幅图片
@@ -136,28 +79,32 @@ zh-CN:
       location:
         all: 全部
         local: 本站
-        remote: 远程
+        remote: 远端实例
         title: 位置
       login_status: 登录状态
       media_attachments: 媒体文件
-      memorialize: 设置为追悼帐户
+      memorialize: 设置为追悼账户
       memorialized: 被悼念
-      memorialized_msg: 成功将 %{username} 转换为悼念帐号
+      memorialized_msg: 成功将 %{username} 转换为悼念账号
       moderation:
         active: 活跃
         all: 全部
         pending: 待审核
-        silenced: 已隐藏
+        silenced: 受限
         suspended: 已封禁
         title: 管理
       moderation_notes: 管理员备注
       most_recent_activity: 最后一次活跃的时间
       most_recent_ip: 最后一次活跃的 IP 地址
-      no_account_selected: 因为没有选中任何帐号，所以没有更改
+      no_account_selected: 因为没有选中任何账号，所以没有更改
       no_limits_imposed: 无限制
+      no_role_assigned: 未定角色
       not_subscribed: 未订阅
       pending: 待审核
       perform_full_suspension: 封禁
+      previous_strikes: 既往处罚
+      previous_strikes_description_html:
+        other: 此账号已有<strong>%{count}</strong>次处罚。
       promote: 升任
       protocol: 协议
       public: 公开页面
@@ -165,8 +112,9 @@ zh-CN:
       redownload: 刷新个人资料
       redownloaded_msg: 成功从来源处刷新 %{username} 的用户资料
       reject: 拒绝
-      reject_all: 拒绝全部
-      rejected_msg: 成功拒绝 %{username} 的注册申请
+      rejected_msg: 已拒绝 %{username} 的注册申请
+      remote_suspension_irreversible: 此账户的数据已被不可逆转地删除。
+      remote_suspension_reversible_hint_html: 账号已在他们的服务器上封禁，数据将在 %{date} 完全删除。 在此之前，远程服务器仍可恢复此账号，并且没有任何不良影响。 如果你想立即移除该账号的所有数据，可以在下面进行。
       remove_avatar: 删除头像
       remove_header: 删除横幅图片
       removed_avatar_msg: 成功删除 %{username} 的头像
@@ -178,19 +126,13 @@ zh-CN:
       reset: 重置
       reset_password: 重置密码
       resubscribe: 重新订阅
-      role: 用户组
-      roles:
-        admin: 管理员
-        moderator: 监察员
-        staff: 站务人员
-        user: 普通用户
+      role: 角色
       search: 搜索
       search_same_email_domain: 其他具有相同电子邮箱域名的用户
       search_same_ip: 具有相同IP的其他用户
       security_measures:
         only_password: 仅密码
         password_and_2fa: 密码和双重认证
-        password_and_sign_in_token: 密码和电子邮件令牌
       sensitive: 敏感内容
       sensitized: 已标记为敏感内容
       shared_inbox_url: 公用收件箱（Shared Inbox）URL
@@ -200,19 +142,22 @@ zh-CN:
       silence: 隐藏
       silenced: 已隐藏
       statuses: 嘟文
+      strikes: 既往处罚
       subscribe: 订阅
+      suspend: 封禁
       suspended: 已封禁
-      suspension_irreversible: 该帐号的数据已被不可逆转地删除。你可以取消暂停该帐号以使其可用，但它不会恢复以前拥有的任何数据。
-      suspension_reversible_hint_html: 帐号已封禁，数据将在 %{date} 完全删除。 在此之前，帐号仍可恢复，并且没有任何不良影响。 如果你想立即移除该帐号的所有数据，可以在下面进行。
-      time_in_queue: 已经等待了 %{time}
+      suspension_irreversible: 该账号的数据已被不可逆转地删除。你可以取消暂停该账号以使其可用，但它不会恢复以前拥有的任何数据。
+      suspension_reversible_hint_html: 账号已封禁，数据将在 %{date} 完全删除。 在此之前，账号仍可恢复，并且没有任何不良影响。 如果你想立即移除该账号的所有数据，可以在下面进行。
       title: 用户
+      unblock_email: 取消屏蔽邮件地址
+      unblocked_email_msg: 成功取消屏蔽了 %{username} 的邮件地址
       unconfirmed_email: 待验证的电子邮件地址
       undo_sensitized: 去除敏感内容标记
       undo_silenced: 解除隐藏
       undo_suspension: 解除封禁
-      unsilenced_msg: 成功解除 %{username} 的帐号限制
+      unsilenced_msg: 成功解除 %{username} 的账号限制
       unsubscribe: 取消订阅
-      unsuspended_msg: 已成功取消封禁 %{username} 的帐号
+      unsuspended_msg: 已成功取消封禁 %{username} 的账号
       username: 用户名
       view_domain: 查看域名摘要
       warn: 警告
@@ -220,26 +165,34 @@ zh-CN:
       whitelisted: 允许跨站交互
     action_logs:
       action_types:
+        approve_appeal: 批准申诉
+        approve_user: 批准用户
         assigned_to_self_report: 指派举报
         change_email_user: 为用户修改邮箱地址
+        change_role_user: 更改用户角色
         confirm_user: 确认用户
         create_account_warning: 创建警告
         create_announcement: 创建公告
+        create_canonical_email_block: 新增 E-mail 屏蔽
         create_custom_emoji: 创建自定义表情符号
         create_domain_allow: 允许新域名
         create_domain_block: 封禁新域名
         create_email_domain_block: 封禁电子邮箱域名
         create_ip_block: 新建 IP 规则
         create_unavailable_domain: 创建不可用域名
+        create_user_role: 创建角色
         demote_user: 给用户降职
         destroy_announcement: 删除公告
+        destroy_canonical_email_block: 删除 E-mail 封禁
         destroy_custom_emoji: 删除自定义表情符号
         destroy_domain_allow: 解除域名允许
         destroy_domain_block: 解除域名封禁
         destroy_email_domain_block: 解除电子邮箱域名封禁
+        destroy_instance: 删除实例
         destroy_ip_block: 删除 IP 规则
         destroy_status: 删除嘟文
         destroy_unavailable_domain: 删除不可用域名
+        destroy_user_role: 销毁角色
         disable_2fa_user: 停用双重认证
         disable_custom_emoji: 禁用自定义表情符号
         disable_sign_in_token_auth_user: 为用户禁用电子邮件令牌认证
@@ -249,42 +202,56 @@ zh-CN:
         enable_user: 启用用户
         memorialize_account: 将账户设为追悼模式
         promote_user: 给用户升任
+        reject_appeal: 驳回申诉
+        reject_user: 拒绝用户
         remove_avatar_user: 移除头像
         reopen_report: 重开举报
+        resend_user: 重新发送确认电子邮件
         reset_password_user: 重置密码
         resolve_report: 处理举报
-        sensitive_account: 将你帐号中的媒体标记为敏感内容
+        sensitive_account: 将你账号中的媒体标记为敏感内容
         silence_account: 隐藏用户
         suspend_account: 封禁用户
         unassigned_report: 取消举报的指派
-        unsensitive_account: 去除你帐号中媒体的敏感内容标记
+        unblock_email_account: 取消屏蔽邮件地址
+        unsensitive_account: 去除你账号中媒体的敏感内容标记
         unsilence_account: 解除账号隐藏
         unsuspend_account: 解除账号封禁
         update_announcement: 更新公告
         update_custom_emoji: 更新自定义表情符号
         update_domain_block: 更新域名屏蔽
+        update_ip_block: 编辑 IP 封禁规则
         update_status: 更新嘟文
+        update_user_role: 更新角色
       actions:
+        approve_appeal_html: "%{name} 批准了 %{target} 对审核结果的申诉"
+        approve_user_html: "%{name} 批准了用户 %{target} 的注册"
         assigned_to_self_report_html: "%{name} 接管了举报 %{target}"
         change_email_user_html: "%{name} 更改了用户 %{target} 的电子邮件地址"
+        change_role_user_html: "%{name} 更改了 %{target} 的角色"
         confirm_user_html: "%{name} 确认了用户 %{target} 的电子邮件地址"
         create_account_warning_html: "%{name} 向 %{target} 发送了警告"
         create_announcement_html: "%{name} 创建了新公告 %{target}"
+        create_canonical_email_block_html: "%{name} 屏蔽了 hash 为 %{target} 的电子邮箱"
         create_custom_emoji_html: "%{name} 添加了新的自定义表情 %{target}"
         create_domain_allow_html: "%{name} 允许了和域名 %{target} 的跨站交互"
         create_domain_block_html: "%{name} 屏蔽了域名 %{target}"
         create_email_domain_block_html: "%{name} 屏蔽了电子邮件域名 %{target}"
         create_ip_block_html: "%{name} 为 IP %{target} 创建了规则"
         create_unavailable_domain_html: "%{name} 停止了向域名 %{target} 的投递"
+        create_user_role_html: "%{name} 创建了 %{target} 角色"
         demote_user_html: "%{name} 对用户 %{target} 进行了降任操作"
         destroy_announcement_html: "%{name} 删除了公告 %{target}"
-        destroy_custom_emoji_html: "%{name} 销毁了自定义表情 %{target}"
+        destroy_canonical_email_block_html: "%{name} 解除屏蔽了 hash 为 %{target} 的电子邮箱"
+        destroy_custom_emoji_html: "%{name} 删除了自定义表情 %{target}"
         destroy_domain_allow_html: "%{name} 拒绝了和 %{target} 跨站交互"
         destroy_domain_block_html: "%{name} 解除了对域名 %{target} 的屏蔽"
         destroy_email_domain_block_html: "%{name} 解除了对电子邮件域名 %{target} 的屏蔽"
+        destroy_instance_html: "%{name} 删除了实例 %{target}"
         destroy_ip_block_html: "%{name} 删除了 IP %{target} 的规则"
         destroy_status_html: "%{name} 删除了 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 恢复了向域名 %{target} 的投递"
+        destroy_user_role_html: "%{name} 删除了 %{target} 角色"
         disable_2fa_user_html: "%{name} 停用了用户 %{target} 的双重认证"
         disable_custom_emoji_html: "%{name} 停用了自定义表情 %{target}"
         disable_sign_in_token_auth_user_html: "%{name} 已为 %{target} 禁用电子邮件令牌认证"
@@ -292,24 +259,30 @@ zh-CN:
         enable_custom_emoji_html: "%{name} 启用了自定义表情 %{target}"
         enable_sign_in_token_auth_user_html: "%{name} 已为 %{target} 启用电子邮件令牌认证"
         enable_user_html: "%{name} 将用户 %{target} 设置为允许登录"
-        memorialize_account_html: "%{name} 将 %{target} 设置为追悼帐户"
+        memorialize_account_html: "%{name} 将 %{target} 设置为追悼账户"
         promote_user_html: "%{name} 对用户 %{target} 进行了升任操作"
+        reject_appeal_html: "%{name} 驳回了 %{target} 对审核结果的申诉"
+        reject_user_html: "%{name} 拒绝了用户 %{target} 的注册"
         remove_avatar_user_html: "%{name} 删除了 %{target} 的头像"
         reopen_report_html: "%{name} 重开了举报 %{target}"
+        resend_user_html: "%{name} 给 %{target} 重新发送了确认电子邮件"
         reset_password_user_html: "%{name} 重置了用户 %{target} 的密码"
         resolve_report_html: "%{name} 处理了举报 %{target}"
         sensitive_account_html: "%{name} 将 %{target} 的媒体标记为敏感内容"
         silence_account_html: "%{name} 隐藏了用户 %{target}"
         suspend_account_html: "%{name} 封禁了用户 %{target}"
         unassigned_report_html: "%{name} 放弃接管举报 %{target}"
+        unblock_email_account_html: "%{name} 取消屏蔽了 %{target} 的邮件地址"
         unsensitive_account_html: "%{name} 去除了 %{target} 的媒体的敏感内容标记"
         unsilence_account_html: "%{name} 解除了用户 %{target} 的隐藏状态"
-        unsuspend_account_html: "%{name} 解除了用户 %{target} 的封禁状态"
+        unsuspend_account_html: "%{name} 解封了用户 %{target}"
         update_announcement_html: "%{name} 更新了公告 %{target}"
         update_custom_emoji_html: "%{name} 更新了自定义表情 %{target}"
         update_domain_block_html: "%{name} 更新了对 %{target} 的域名屏蔽"
+        update_ip_block_html: "%{name} 修改了对 IP %{target} 的规则"
         update_status_html: "%{name} 刷新了 %{target} 的嘟文"
-      deleted_status: "（嘟文已删除）"
+        update_user_role_html: "%{name} 更改了 %{target} 角色"
+      deleted_account: 账号已注销
       empty: 没有找到日志
       filter_by_action: 根据行为过滤
       filter_by_user: 根据用户过滤
@@ -348,11 +321,12 @@ zh-CN:
       enable: 启用
       enabled: 已启用
       enabled_msg: 表情启用成功
-      image_hint: PNG 格式，最大 50KB
+      image_hint: 最大 %{size} 的 PNG 或 GIF
       list: 列表
       listed: 已显示
       new:
         title: 添加新的自定义表情
+      no_emoji_selected: 因为没有选中任何表情，所以没有更改
       not_permitted: 你没有权限进行此操作
       overwrite: 覆盖
       shortcode: 短代码
@@ -365,13 +339,37 @@ zh-CN:
       updated_msg: 表情更新成功！
       upload: 上传新表情
     dashboard:
+      active_users: 活跃用户
+      interactions: 互动数
+      media_storage: 媒体存储
+      new_users: 新用户
+      opened_reports: 收到的举报
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> 个待处理申诉"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> 个待处理举报"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> 个待处理话题标签"
+      pending_users_html:
+        other: "<strong>%{count}</strong> 个待处理用户"
+      resolved_reports: 已解决的举报
       software: 软件
+      sources: 注册来源
       space: 存储使用情况
       title: 信息面板
+      top_languages: 最活跃的语言
+      top_servers: 最活跃的服务器
+      website: 网页端
+    disputes:
+      appeals:
+        empty: 没有发现申诉。
+        title: 申诉
     domain_allows:
       add_new: 允许和域名跨站交互
       created_msg: 域名已被允许跨站交互
       destroyed_msg: 域名已被禁止跨站交互
+      export: 导出
+      import: 导入
       undo: 不允许和该域名跨站交互
     domain_blocks:
       add_new: 添加新屏蔽域名
@@ -379,7 +377,10 @@ zh-CN:
       destroyed_msg: 域名屏蔽已撤销
       domain: 域名
       edit: 编辑域名屏蔽
+      existing_domain_block: 您已经对 %{name} 设置了更严格的限制。
       existing_domain_block_html: 你已经对 %{name} 施加了更严格的限制，你需要先 <a href="%{unblock_url}">解封</a>。
+      export: 导出
+      import: 导入
       new:
         create: 添加屏蔽
         hint: 域名屏蔽不会阻止该域名下的帐户进入本站的数据库，但是会对来自这个域名的帐户自动进行预先设置的管理操作。
@@ -389,43 +390,52 @@ zh-CN:
           silence: 隐藏
           suspend: 封禁
         title: 新增域名屏蔽
+      no_domain_block_selected: 由于没有选中，域名列表没有被改变。
+      not_permitted: 你没有权限进行此操作
       obfuscate: 混淆域名
       obfuscate_hint: 如果启用了域名列表公开限制，就部分混淆列表中的域名
       private_comment: 私密评论
       private_comment_hint: 给这一域名限制添加备注，供监察员内部使用
       public_comment: 公开评论
-      public_comment_hint: 给这一域名限制添加公开的评论，如果你推广你的域名限制列表的话，这些评论就会显示出来。
+      public_comment_hint: 给这一域名限制添加公开的评论，在公告域名限制列表开启时这些评论将会公开可见。
       reject_media: 拒绝接收媒体文件
       reject_media_hint: 删除本站已缓存的媒体文件，并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
       reject_reports: 拒绝接收举报
       reject_reports_hint: 忽略来自此域名的所有举报。这和封禁无关。
-      rejecting_media: 拒绝接收媒体文件
-      rejecting_reports: 拒绝接收举报
-      severity:
-        silence: 已隐藏
-        suspend: 已封禁
-      show:
-        affected_accounts:
-          other: 将会影响到数据库中的 %{count} 个帐户
-        retroactive:
-          silence: 对此域名的所有帐户解除隐藏
-          suspend: 对此域名的所有帐户解除封禁
-        title: 撤销对 %{domain} 的域名屏蔽
-        undo: 撤销
       undo: 撤销屏蔽域名
       view: 查看域名屏蔽
     email_domain_blocks:
       add_new: 添加新条目
+      attempts_over_week:
+        other: 上周有 %{count} 次注册尝试
       created_msg: 成功屏蔽电子邮件域名
       delete: 删除
-      destroyed_msg: 电子邮件域名屏蔽删除成功
+      dns:
+        types:
+          mx: MX 记录
       domain: 域名
-      empty: 当前没有邮件域名被封禁。
-      from_html: 来自 %{domain}
       new:
         create: 添加域名
+        resolve: 解析域名
         title: 添加电子邮件域名屏蔽
+      no_email_domain_block_selected: 没有任何项目被选中，因此未能更改电子邮件域名屏蔽列表
+      resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的电子邮件地址注册本站账户。 <strong>请小心不要误屏蔽主要的电子邮件提供商。</strong>
+      resolved_through_html: 通过 %{domain} 解析
       title: 电子邮件域名屏蔽
+    export_domain_allows:
+      new:
+        title: 导入域名允许列表
+      no_file: 没有选择文件
+    export_domain_blocks:
+      import:
+        description_html: 您即将导入域名列表，如果您不是此域名列表的作者，请仔细检查核对。
+        existing_relationships_warning: 现有的关注关系
+        private_comment_description_html: 为了帮助您追踪域名列表来源，导入的域名列表将被添加如下的私人注释：<q>%{comment}</q>
+        private_comment_template: 从 %{source} 导入 %{date}
+        title: 导入域名列表
+      new:
+        title: 导入域名列表
+      no_file: 没有选择文件
     follow_recommendations:
       description_html: "<strong>“关注推荐”可帮助新用户快速找到有趣的内容</strong>。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账户。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。"
       language: 选择语言
@@ -435,39 +445,69 @@ zh-CN:
       title: 关注推荐
       unsuppress: 恢复推荐关注
     instances:
+      availability:
+        description_html:
+          other: 如果连续 <strong>%{count} 天</strong> 均无法成功向该域名投递消息，则将不再尝试向其投递，直至收到<em>来自</em>该域名的消息。
+        failure_threshold_reached: 于 %{date} 达到失败阈值。
+        failures_recorded:
+          other: 在 %{count} 天中尝试失败。
+        no_failures_recorded: 没有失败记录。
+        title: 可用性
+        warning: 上一次尝试连接此服务器失败
       back_to_all: 全部
       back_to_limited: 受限
       back_to_warning: 警告
       by_domain: 域名
+      confirm_purge: 你确认要从这个实例中永久地删除数据吗？
+      content_policies:
+        comment: 内部备注
+        description_html: 你可以设置应用于此域名所有账号和其所有子域名的内容策略。
+        policies:
+          reject_media: 拒收媒体
+          reject_reports: 拒收举报
+          silence: 隐藏
+          suspend: 封禁
+        policy: 策略
+        reason: 公开理由
+        title: 本站点内容发布规则
+      dashboard:
+        instance_accounts_dimension: 被关注最多的账号
+        instance_accounts_measure: 存储的账号
+        instance_followers_measure: 本站关注者
+        instance_follows_measure: 对方关注者
+        instance_languages_dimension: 语言排行
+        instance_media_attachments_measure: 存储的媒体文件
+        instance_reports_measure: 关于对方的举报
+        instance_statuses_measure: 存储的嘟文
       delivery:
         all: 全部
         clear: 清理投递错误
+        failing: 发送失败
         restart: 重新投递
         stop: 停止投递
-        title: 投递
         unavailable: 不可用
-        unavailable_message: 投递不可用
-        warning: 警告
-        warning_message:
-          other: 投递已失败 %{count} 天
       delivery_available: 可投递
       delivery_error_days: 投递错误天数
       delivery_error_hint: 如果投递已不可用 %{count} 天，它将被自动标记为无法投递。
+      destroyed_msg: "%{domain} 中的数据现在正在排队等待被立刻删除。"
       empty: 暂无域名。
       known_accounts:
-        other: "%{count} 个已知帐户"
+        other: "%{count} 个已知账号"
       moderation:
         all: 全部
         limited: 受限的
         title: 运营
       private_comment: 私密评论
       public_comment: 公开评论
+      purge: 删除
+      purge_description_html: 如果你确认此域名已永久离线，可以从存储中删除此域名的所有账号记录和相关数据。这将会需要一段时间。
       title: 已知实例
       total_blocked_by_us: 被我站屏蔽的
       total_followed_by_them: 被对方关注的
       total_followed_by_us: 被我站关注的
       total_reported: 关于对方的举报
       total_storage: 媒体文件
+      totals_time_period_hint_html: 下方显示的总数来自全部历史数据。
     invites:
       deactivate_all: 撤销所有邀请链接
       filter:
@@ -491,14 +531,12 @@ zh-CN:
         title: 创建新 IP 规则
       no_ip_block_selected: 因为没有 IP 规则被选中，所以没有更改
       title: IP 规则
-    pending_accounts:
-      title: 待处理的帐户 (%{count})
     relationships:
       title: "%{acct} 的关系"
     relays:
       add_new: 订阅新的中继站
       delete: 删除
-      description_html: "<strong>中继服务器</strong>是一个信息统合服务器，各服务器可以通过订阅中继服务器和向中继服务器推送信息来交换大量公开嘟文。<strong>它可以帮助中小型服务器发现联邦宇宙中的其他服务器的内容</strong>，而无需本站用户手动关注其他远程服务器上的用户。"
+      description_html: "<strong>中继服务器</strong>是一个信息统合服务器，各服务器可以通过订阅中继服务器和向中继服务器推送信息来大量交换公开嘟文。<strong>它可以帮助中小型服务器发现联邦宇宙中的其他服务器的内容</strong>，而无需本站用户手动关注其他远程服务器上的用户。"
       disable: 禁用
       disabled: 已禁用
       enable: 启用
@@ -518,38 +556,119 @@ zh-CN:
       account:
         notes:
           other: "%{count} 条笔记"
-        reports:
-          other: "%{count} 个报告"
+      action_log: 审计日志
       action_taken_by: 操作执行者
+      actions:
+        delete_description_html: 被举报的嘟文将被删除，同时该账号将被标记一次处罚，以供未来同一账号再次违规时参考。
+        mark_as_sensitive_description_html: 被举报的嘟文将被标记为敏感，同时该账号将被标记一次处罚，以供未来同一账号再次违规时参考。
+        other_description_html: 查看更多控制该账号行为的选项，并自定义编写与被举报账号的通信。
+        resolve_description_html: 不会对被举报账号采取任何动作，举报将被关闭，也不会留下处罚记录。
+        silence_description_html: 只有关注或手工搜索此账号才能查看其资料，将严重限制其触达范围。可随时撤销。
+        suspend_description_html: 此账号及其内容将无法访问，并最终被删除。也无法与该账号交互。可在30天内撤销。
+      actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中<strong>垃圾信息</strong>类别则不会发送通知。
+      add_to_report: 增加更多举报内容
       are_you_sure: 你确定吗？
       assign_to_self: 接管
       assigned: 已接管的监察员
+      by_target_domain: 被举报账户的域名
+      category: 类别
+      category_description_html: 在与被举报账户的通信时，将引用该账号和/或内容被举报的原因
       comment:
         none: 没有
+      comment_description_html: "%{name} 补充道："
       created_at: 举报时间
+      delete_and_resolve: 删除嘟文
       forwarded: 已转发
       forwarded_to: 转发举报至 %{domain}
       mark_as_resolved: 标记为“已处理”
+      mark_as_sensitive: 标记为敏感内容
       mark_as_unresolved: 标记为“未处理”
+      no_one_assigned: 未分派
       notes:
         create: 添加记录
         create_and_resolve: 添加记录并标记为“已处理”
         create_and_unresolve: 添加记录并重开
         delete: 删除
         placeholder: 描述已经执行的操作，或其他任何相关的跟进情况…
+        title: 备注
+      notes_description_html: 查看备注或向其他监察员留言
+      quick_actions_description_html: 快捷选择操作或向下滚动以查看举报内容：
+      remote_user_placeholder: 来自 %{instance} 的远程实例用户
       reopen: 重开举报
       report: '举报 #%{id}'
       reported_account: 举报用户
       reported_by: 举报人
       resolved: 已处理
       resolved_msg: 举报处理成功！
+      skip_to_actions: 跳转到操作
       status: 状态
-      target_domain: 被举报账户的域名
+      statuses: 被举报内容
+      statuses_description_html: 在与该账号的通信中将引用违规内容
       target_origin: 被举报账号的来源
       title: 举报
       unassign: 取消接管
       unresolved: 未处理
       updated_at: 更新时间
+      view_profile: 查看资料
+    roles:
+      add_new: 添加角色
+      assigned_users:
+        other: "%{count} 用户"
+      categories:
+        administration: 管理
+        devops: 开发运维
+        invites: 邀请
+        moderation: 监察
+        special: 特殊
+      delete: 刪除
+      description_html: 使用 <strong>用户角色</strong>，您可以自定义您的用户可以访问的功能和区域。
+      edit: 编辑 '%{name}' 角色
+      everyone: 默认权限
+      everyone_full_description_html: 这是影响到 <strong>所有用户</strong>的<strong>基础角色</strong>，包括未指定角色的用户。 其他所有的角色都继承着它的权限。
+      permissions_count:
+        other: "%{count} 权限"
+      privileges:
+        administrator: 管理员
+        administrator_description: 拥有此权限的用户将绕过每个权限
+        delete_user_data: 删除用户数据
+        delete_user_data_description: 允许用户立即删除其他用户的数据
+        invite_users: 邀请用户
+        invite_users_description: 允许用户邀请新人加入服务器
+        manage_announcements: 管理公告
+        manage_announcements_description: 允许用户管理服务器上的通知
+        manage_appeals: 管理申诉
+        manage_appeals_description: 允许用户审阅针对管理操作的申诉
+        manage_blocks: 管理地址段
+        manage_blocks_description: 允许用户屏蔽电子邮件提供商和IP地址
+        manage_custom_emojis: 管理自定义表情
+        manage_custom_emojis_description: 允许用户管理服务器上的自定义表情
+        manage_federation: 管理邦联
+        manage_federation_description: 允许用户屏蔽或允许同其他域名的邦联，并控制消息投递能力
+        manage_invites: 管理邀请
+        manage_invites_description: 允许用户浏览和停用邀请链接
+        manage_reports: 管理举报
+        manage_reports_description: 允许用户审核举报并执行管理操作
+        manage_roles: 管理角色
+        manage_roles_description: 允许用户管理和分配比他们权限低的角色
+        manage_rules: 管理规则
+        manage_rules_description: 允许用户更改服务器规则
+        manage_settings: 管理设置
+        manage_settings_description: 允许用户更改站点设置
+        manage_taxonomies: 管理分类
+        manage_taxonomies_description: 允许用户查看热门内容并更新标签设置
+        manage_user_access: 管理访问
+        manage_user_access_description: 允许用户禁用其他用户的双重身份验证, 更改他们的电子邮件地址, 并重置他们的密码
+        manage_users: 管理用户
+        manage_users_description: 允许用户查看其他用户的信息并执行管理操作
+        manage_webhooks: 管理 Webhooks
+        manage_webhooks_description: 允许用户为管理事件配置 Webhook
+        view_audit_log: 查看审核日志
+        view_audit_log_description: 允许用户查看此服务器上的管理操作记录
+        view_dashboard: 查看仪表板
+        view_dashboard_description: 允许用户访问仪表盘和各种指标
+        view_devops: 开发运维
+        view_devops_description: 允许用户访问 Sidekiq 和 pgHero 仪表板
+      title: 角色
     rules:
       add_new: 添加规则
       delete: 删除
@@ -558,158 +677,221 @@ zh-CN:
       empty: 尚未定义服务器规则。
       title: 实例规则
     settings:
-      activity_api_enabled:
-        desc_html: 本站一周内的嘟文数、活跃用户数以及新用户数
-        title: 公开用户活跃度的统计数据
-      bootstrap_timeline_accounts:
-        desc_html: 用半角逗号分隔多个用户名。只能添加来自本站且未开启保护的帐户。如果留空，则默认关注本站所有的管理员。
-        title: 新用户默认关注
-      contact_information:
-        email: 用于联系的公开电子邮件地址
-        username: 用于联系的公开用户名
-      custom_css:
-        desc_html: 通过 CSS 代码调整所有页面的显示效果
-        title: 自定义 CSS
+      about:
+        manage_rules: 管理服务器规则
+        preamble: 提供此服务器如何运营、资金状况等的深入信息。
+        rules_hint: 有一个专门区域用于显示用户需要遵守的规则。
+        title: 关于本站
+      appearance:
+        preamble: 自定义 Mastodon 的网页界面。
+        title: 外观
+      branding:
+        preamble: 你的服务器与网络中其他服务器的招牌区别。此信息将可能在多种环境下显示，包括 Mastodon 网页界面、原生应用和其他网站的链接预览等。因此应尽量简明扼要。
+        title: 招牌
+      content_retention:
+        preamble: 控制用户生成的内容在 Mastodon 中如何存储。
+        title: 内容保留
       default_noindex:
         desc_html: 影响所有尚未更改此设置的用户
         title: 默认不让用户被搜索引擎索引
+      discovery:
+        follow_recommendations: 关注推荐
+        preamble: 露出有趣的内容有助于新加入 Mastodon 的用户融入。可在这里控制多种发现功能如何在你的服务器上工作。
+        profile_directory: 个人资料目录
+        public_timelines: 公共时间轴
+        title: 发现
+        trends: 流行趋势
       domain_blocks:
         all: 对所有人
         disabled: 不对任何人
-        title: 查看域名屏蔽
         users: 对本地已登录用户
-      domain_blocks_rationale:
-        title: 显示理由
-      hero:
-        desc_html: 将用于在首页展示。推荐使用分辨率 600×100px 以上的图片。如未设置，将默认使用本站缩略图。
-        title: 主题图片
-      mascot:
-        desc_html: 用于在首页展示。推荐分辨率 293×205px 以上。未指定的情况下将使用默认吉祥物。
-        title: 吉祥物图像
-      peers_api_enabled:
-        desc_html: 截至目前本服务器在联邦宇宙中已发现的域名
-        title: 公开已知实例的列表
-      preview_sensitive_media:
-        desc_html: 无论媒体文件是否标记为敏感内容，站外链接预览始终呈现为缩略图。
-        title: 在 OpenGraph 预览中显示敏感媒体内容
-      profile_directory:
-        desc_html: 允许用户被发现
-        title: 启用用户目录
       registrations:
-        closed_message:
-          desc_html: 本站关闭注册期间的提示信息。可以使用 HTML 标签
-          title: 关闭注册时的提示信息
-        deletion:
-          desc_html: 允许所有人删除自己的帐户
-          title: 开放删除帐户权限
-        min_invite_role:
-          disabled: 没有人
-          title: 允许发送邀请的用户组
-        require_invite_text:
-          desc_html: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
-          title: 要求新用户填写申请注册的原因
+        preamble: 控制谁可以在你的服务器上创建账号。
+        title: 注册
       registrations_mode:
         modes:
           approved: 注册时需要批准
           none: 关闭注册
           open: 开放注册
-        title: 注册模式
-      show_known_fediverse_at_about_page:
-        desc_html: 如果开启，就会在时间轴预览显示其他站点嘟文，否则就只会只显示本站嘟文。
-        title: 在时间轴预览中显示其他站点嘟文
-      show_staff_badge:
-        desc_html: 在个人资料页上显示管理人员标志
-        title: 显示管理人员标志
-      site_description:
-        desc_html: 首页上的介绍文字。 描述一下本 Mastodon 实例的特殊之处以及其他重要信息。可以使用 HTML 标签，包括 <code>&lt;a&gt;</code> 和 <code>&lt;em&gt;</code> 。
-        title: 本站简介
-      site_description_extended:
-        desc_html: 可以填写行为守则、规定、指南或其他本站特有的内容。可以使用 HTML 标签
-        title: 本站详细介绍
-      site_short_description:
-        desc_html: 会在在侧栏和元数据标签中显示。可以用一小段话描述 Mastodon 是什么，以及本服务器的特点。
-        title: 服务器一句话介绍
-      site_terms:
-        desc_html: 可以填写自己的隐私权政策、使用条款或其他法律文本。可以使用 HTML 标签
-        title: 自定义使用条款
-      site_title: 本站名称
-      thumbnail:
-        desc_html: 用于在 OpenGraph 和 API 中显示预览图。推荐分辨率 1200×630px
-        title: 本站缩略图
-      timeline_preview:
-        desc_html: 在主页显示公共时间轴
-        title: 时间轴预览
-      title: 网站设置
-      trendable_by_default:
-        desc_html: 影响以前未禁止的话题标签
-        title: 允许在未审查的情况下将话题置为热门
-      trends:
-        desc_html: 公开显示先前已通过审核的当前热门话题
-        title: 热门标签
+      title: 服务器设置
     site_uploads:
       delete: 删除已上传的文件
       destroyed_msg: 站点上传的文件已经成功删除！
     statuses:
+      account: 作者
+      application: 应用
       back_to_account: 返回帐户信息页
+      back_to_report: 返回举报页
       batch:
-        delete: 删除
-        nsfw_off: 标记为非敏感内容
-        nsfw_on: 标记为敏感内容
+        remove_from_report: 从报告中移除
+        report: 举报
       deleted: 已删除
-      failed_to_execute: 执行失败
+      favourites: 喜欢
+      history: 版本历史记录
+      in_reply_to: 回复给
+      language: 语言
       media:
         title: 媒体文件
-      no_media: 不含媒体文件
+      metadata: 元数据
       no_status_selected: 因为没有嘟文被选中，所以没有更改
+      open: 展开嘟文
+      original_status: 原始嘟文
+      reblogs: 转发
+      status_changed: 嘟文已编辑
       title: 帐户嘟文
+      trending: 当前热门
+      visibility: 可见性
       with_media: 含有媒体文件
+    strikes:
+      actions:
+        delete_statuses: "%{name} 刪除了 %{target} 的嘟文"
+        disable: "%{name} 冻结了用户 %{target}"
+        mark_statuses_as_sensitive: "%{name} 已将 %{target} 的嘟文标记为敏感内容"
+        none: "%{name} 向 %{target} 发送了警告"
+        sensitive: "%{name} 将 %{target} 的账号标记为敏感内容"
+        silence: "%{name} 限制了用户 %{target}"
+        suspend: "%{name} 封禁了用户 %{target}"
+      appeal_approved: 已申诉
+      appeal_pending: 申诉待处理
     system_checks:
       database_schema_check:
         message_html: 有待处理的数据库迁移。请运行它们以确保应用程序正常运行。
+      elasticsearch_running_check:
+        message_html: 无法连接到 Elasticsearch。请检查它是否正在运行，或禁用全文搜索
+      elasticsearch_version_check:
+        message_html: '不兼容的 Elasticsearch 版本: %{value}'
+        version_comparison: Elasticsearch 最低版本要求 %{required_version}，正在运行的版本是 %{running_version}
       rules_check:
         action: 管理服务器规则
         message_html: 你没有定义任何服务器规则。
       sidekiq_process_check:
         message_html: "%{value} 队列未运行任何 Sidekiq 进程。请检查你的 Sidekiq 配置"
     tags:
-      accounts_today: 今日活跃用户
-      accounts_week: 本周活跃用户
-      breakdown: 按来源分类今天的使用情况
-      last_active: 最近活动
-      most_popular: 最热门的
-      most_recent: 最近的
-      name: 话题标签
       review: 审核状态
-      reviewed: 已审核
-      title: 话题标签
-      trending_right_now: 当前热门
-      unique_uses_today: 今天发布了 %{count} 条
-      unreviewed: 未审核
       updated_msg: 话题标签设置更新成功
     title: 管理
+    trends:
+      allow: 允许
+      approved: 已批准
+      disallow: 不允许
+      links:
+        allow: 允许链接
+        allow_provider: 允许发布者
+        description_html: 这些是当前此服务器可见账号的嘟文中被大量分享的链接。它可以帮助用户了解正在发生的事情。发布者获得批准前不会公开显示任何链接。你也可以批准或拒绝个别链接。
+        disallow: 不允许链接
+        disallow_provider: 不允许发布者
+        no_link_selected: 因为没有选中任何链接，所以没有更改
+        publishers:
+          no_publisher_selected: 因为没有选中任何发布者，所以没有更改
+        shared_by_over_week:
+          other: 过去一周内被 %{count} 个人分享过
+        title: 热门链接
+        usage_comparison: 今日被分享 %{today} 次，前一日为 %{yesterday} 次
+      only_allowed: 仅显示已允许的内容
+      pending_review: 待审核
+      preview_card_providers:
+        allowed: 来自此发布者的链接可进入流行列表
+        description_html: 这些域名所属的链接经常在此服务器上被分享。在对应域名获得批准前链接不会公开显示在热门中。批准和拒绝操作也会对子域名生效。
+        rejected: 来自此发布者的链接不会进入热门列表
+        title: 发布者
+      rejected: 已拒绝
+      statuses:
+        allow: 允许嘟文
+        allow_account: 允许发布者
+        description_html: 这些是当前此服务器可见的被大量分享和喜欢的嘟文。这些嘟文可以帮助新老用户找到更多可关注的账号。批准发布者且发布者允许将其账号推荐给其他用户前，不会公开显示任何嘟文。你也可以批准或拒绝个别嘟文。
+        disallow: 禁止嘟文
+        disallow_account: 禁止发布者
+        no_status_selected: 因为没有选中任何热门嘟文，所以没有更改
+        not_discoverable: 发布者选择不被发现
+        shared_by:
+          other: 被分享和喜欢%{friendly_count}次
+        title: 热门嘟文
+      tags:
+        current_score: 当前 %{score} 分
+        dashboard:
+          tag_accounts_measure: 独立使用
+          tag_languages_dimension: 语言排行
+          tag_servers_dimension: 服务器排行
+          tag_servers_measure: 不同服务器
+          tag_uses_measure: 总使用
+        description_html: 这些是当前此服务器可见嘟文中大量出现的标签。它可以帮助用户发现其他人正关注的话题。在获得批准前不会公开显示任何标签。
+        listable: 可被推荐
+        no_tag_selected: 因为没有选中任何标签，所以没有更改
+        not_listable: 不会被推荐
+        not_trendable: 不会出现在热门列表中
+        not_usable: 不可使用
+        peaked_on_and_decaying: 在 %{date} 达到峰值，下降中
+        title: 热门标签
+        trendable: 可显示在热门列表中
+        trending_rank: '热门 #%{rank}'
+        usable: 可以使用
+        usage_comparison: 今日被使用 %{today} 次，前一日为 %{yesterday} 次
+        used_by_over_week:
+          other: 过去一周内被 %{count} 个人使用过
+      title: 流行趋势
+      trending: 当前热门
     warning_presets:
       add_new: 添加新条目
       delete: 删除
       edit_preset: 编辑预置警告
       empty: 你尚未定义任何警告预设。
       title: 管理预设警告
+    webhooks:
+      add_new: 新增对端
+      delete: 删除
+      description_html: "<strong>Webhook</strong> 使 Mastodon 能够推送 <strong>关于所选事件的实时通知</strong> 到你自己的应用程序，进而由你的应用程序<strong>自动触发反应</strong>。"
+      disable: 禁用
+      disabled: 已禁用
+      edit: 编辑对端
+      empty: 你尚未配置任何 Webhook 对端。
+      enable: 启用
+      enabled: 活跃
+      enabled_events:
+        other: "%{count} 启用的事件"
+      events: 事件
+      new: 新建 Webhook
+      rotate_secret: 轮换密钥
+      secret: 签名密钥
+      status: 状态
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: 删除其嘟文
+        disable: 冻结其账号
+        mark_statuses_as_sensitive: 标记其嘟文为敏感内容
+        none: 警告
+        sensitive: 标记其账号为敏感内容
+        silence: 限制其账号
+        suspend: 停用其账号
+      body: "%{target} 对 %{action_taken_by} 于 %{date} 做出的 %{type} 审核结果提出申诉，写道："
+      next_steps: 你可以批准此申诉并撤销该审核结果，也可以忽略此申诉。
+      subject: "%{username} 对 %{instance} 的审核结果提出了申诉"
     new_pending_account:
       body: 新帐户的详细信息如下。你可以批准或拒绝此申请。
-      subject: 在 %{instance} 上有新帐号 ( %{username}) 需要审核
+      subject: 在 %{instance} 上有新账号 (%{username}) 需要审核
     new_report:
       body: "%{reporter} 举报了用户 %{target}"
       body_remote: 来自 %{domain} 的用户举报了用户 %{target}
       subject: 来自 %{instance} 的用户举报（#%{id}）
-    new_trending_tag:
-      body: '今日的热门话题 #%{name} 之前未经审核。直到你允许之前这个话题将不会公开显示，或者就保持原样让它石沉大海。'
-      subject: 在 %{instance} 有新话题 (#%{name}) 待审核
+    new_trends:
+      body: 以下项目需要审核才能公开显示：
+      new_trending_links:
+        title: 热门链接
+      new_trending_statuses:
+        title: 热门嘟文
+      new_trending_tags:
+        no_approved_tags: 目前没有经批准的热门标签。
+        requirements: '这些候选人都可能会超过#%{rank} 批准的热门标签，目前是 #%{lowest_tag_name} ，分数为 %{lowest_tag_score}。'
+        title: 热门标签
+      subject: "%{instance} 上有新热门等待审核"
   aliases:
     add_new: 创建别名
     created_msg: 成功创建了一个新别名。你现在可以从旧账户开始迁移了。
     deleted_msg: 成功移除别名。已经无法从该帐户移动到此帐户了。
     empty: 你没有设置别名
-    hint_html: 如果你想把另一个帐号迁移到这里，你可以先在这里创建一个别名。如果你想把关注者迁移过来，这一步是必须的。设置别名的操作时<strong>无害而且可以恢复的</strong>。<strong>帐号迁移的操作会从旧帐号开始</strong>。
+    hint_html: 如果你想从另一个账号迁移到这里，可以先在这里创建一个别名。要把旧账号的关注者迁移过来，这一步是必须的。设置别名的操作是<strong>无害且可撤销的</strong>。<strong>账号迁移的操作会从旧账号发起</strong>。
     remove: 取消关联别名
   appearance:
     advanced_web_interface: 高级 Web 界面
@@ -733,33 +915,32 @@ zh-CN:
   applications:
     created: 应用创建成功
     destroyed: 应用删除成功
-    invalid_url: URL 无效
     regenerate_token: 重置访问令牌
     token_regenerated: 访问令牌重置成功
     warning: 一定小心，千万不要把它分享给任何人！
     your_token: 你的访问令牌
   auth:
-    apply_for_account: 请求邀请
+    apply_for_account: 申请账号
     change_password: 密码
-    checkbox_agreement_html: 我同意 <a href="%{rules_path}" target="_blank">服务器规则</a> 和 <a href="%{terms_path}" target="_blank">服务条款</a>
-    checkbox_agreement_without_rules_html: 我同意 <a href="%{terms_path}" target="_blank">服务条款</a>
     delete_account: 删除帐户
     delete_account_html: 如果你想删除你的帐户，请<a href="%{path}">点击这里继续</a>。你需要确认你的操作。
     description:
       prefix_invited_by_user: "@%{name} 邀请你加入这个Mastodon服务器！"
       prefix_sign_up: 现在就注册 Mastodon！
-      suffix: 注册一个帐号，你就可以关注别人、发布嘟文、并和其它任何Mastodon服务器上的用户交流，而且还有其它更多功能！
+      suffix: 注册一个账号，你就可以关注他人、发布嘟文、并和其它任何 Mastodon 服务器上的用户交流，而且还有其它更多功能！
     didnt_get_confirmation: 没有收到确认邮件？
     dont_have_your_security_key: 没有你的安全密钥？
     forgot_password: 忘记密码？
     invalid_reset_password_token: 密码重置令牌无效或已过期。请重新发起重置密码请求。
     link_to_otp: 输入从手机中获得的两步验证代码或恢复代码
     link_to_webauth: 使用你的安全密钥设备
+    log_in_with: 通过外部服务登录
     login: 登录
     logout: 登出
-    migrate_account: 迁移到另一个帐户
-    migrate_account_html: 如果你希望引导别人关注另一个帐户，请<a href="%{path}">点击这里进行设置</a>。
-    or_log_in_with: 或通过其他方式登录
+    migrate_account: 迁移到另一个账户
+    migrate_account_html: 如果你希望引导他人关注另一个账号，请<a href="%{path}">点击这里进行设置</a>。
+    or_log_in_with: 或通过外部服务登录
+    privacy_policy_agreement_html: 我已阅读并同意 <a href="%{privacy_policy_path}" target="_blank">隐私政策</a>
     providers:
       cas: CAS
       saml: SAML
@@ -767,20 +948,29 @@ zh-CN:
     registration_closed: "%{instance} 目前不接收新成员"
     resend_confirmation: 重新发送确认邮件
     reset_password: 重置密码
-    security: 帐户安全
+    rules:
+      preamble: 这些由 %{domain} 监察员设置和执行。
+      title: 一些基本规则。
+    security: 账户安全
     set_new_password: 设置新密码
     setup:
       email_below_hint_html: 如果下面的电子邮箱地址是错误的，你可以在这里修改并重新发送新的确认邮件。
-      email_settings_hint_html: 确认邮件已经发送到%{email}。如果该邮箱地址不对，你可以在帐号设置里面修改。
+      email_settings_hint_html: 确认邮件已经发送到%{email}。如果该邮箱地址不对，你可以在账号设置里面修改。
       title: 初始设置
+    sign_in:
+      preamble_html: 使用您在 <strong>%{domain}</strong> 的账户和密码登录。如果您的账户托管在其他的服务器上，您将无法在此登录。
+      title: 登录到 %{domain}
+    sign_up:
+      preamble: 使用此 Mastodon 服务器上的帐号，您将能够关注网络上的任何其他人，无论他们的帐号托管在哪里的主机。
+      title: 让我们在 %{domain} 上开始。
     status:
-      account_status: 帐户状态
+      account_status: 账户状态
       confirming: 等待电子邮件确认完成。
-      functional: 你的帐号可以正常使用了。
+      functional: 你的账号可以正常使用了。
       pending: 工作人员正在审核你的申请。这需要花点时间。在申请被批准后，你将收到一封电子邮件。
       redirecting_to: 你的帐户无效，因为它已被设置为跳转到 %{acct}
+      view_strikes: 查看针对你账号的记录
     too_fast: 表单提交过快，请重试。
-    trouble_logging_in: 登录有问题？
     use_security_key: 使用安全密钥
   authorize_follow:
     already_following: 你已经在关注此用户了
@@ -825,8 +1015,8 @@ zh-CN:
     challenge_not_passed: 你输入的信息不正确
     confirm_password: 输入你当前的密码来验证身份
     confirm_username: 输入你的用户名以继续
-    proceed: 删除帐户
-    success_msg: 你的帐户已经成功删除
+    proceed: 删除账户
+    success_msg: 你的账户已成功删除
     warning:
       before: 在删除前，请仔细阅读下列说明：
       caches: 已被其他服务器缓存的内容可能还会保留
@@ -838,10 +1028,36 @@ zh-CN:
       more_details_html: 更多细节，请查看 <a href="%{terms_path}">隐私政策</a> 。
       username_available: 你的用户名现在又可以使用了
       username_unavailable: 你的用户名仍将无法使用
-  directories:
-    directory: 用户目录
-    explanation: 根据兴趣发现用户
-    explore_mastodon: 探索 %{title}
+  disputes:
+    strikes:
+      action_taken: 采取的措施
+      appeal: 申诉
+      appeal_approved: 此次处罚已申诉成功并不再生效
+      appeal_rejected: 此次申诉已被驳回
+      appeal_submitted_at: 已提出申诉
+      appealed_msg: 你的申诉已经提交。如果申诉通过，你将收到通知。
+      appeals:
+        submit: 提交申诉
+      approve_appeal: 批准申诉
+      associated_report: 相关举报
+      created_at: 日期
+      description_html: 这些是针对您的账户采取的行动和警告，已经由 %{instance} 的工作人员发送给您。
+      recipient: 发送至
+      reject_appeal: 驳回申诉
+      status: '嘟文 #%{id}'
+      status_removed: 嘟文已从系统中删除
+      title: "%{action} 于 %{date}"
+      title_actions:
+        delete_statuses: 嘟文删除
+        disable: 账号冻结
+        mark_statuses_as_sensitive: 标记嘟文有敏感内容
+        none: 警告
+        sensitive: 标记账号有敏感内容
+        silence: 账号限制
+        suspend: 账号封禁
+      your_appeal_approved: 你的申诉已被批准
+      your_appeal_pending: 你已提交申诉
+      your_appeal_rejected: 你的申诉已被驳回
   domain_validator:
     invalid_domain: 不是一个有效的域名
   errors:
@@ -866,7 +1082,7 @@ zh-CN:
     archive_takeout:
       date: 日期
       download: 下载你的存档
-      hint_html: 你可以请求一份帐户数据存档，其中包含你的<strong>嘟文和已上传的媒体文件</strong>。导出的数据为 ActivityPub 格式，因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
+      hint_html: 你可以请求一份账户数据存档，其中包含你的<strong>嘟文和已上传的媒体文件</strong>。导出的数据为 ActivityPub 格式，因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
       in_progress: 正在准备你的存档……
       request: 请求你的存档
       size: 大小
@@ -875,7 +1091,7 @@ zh-CN:
     csv: CSV
     domain_blocks: 域名屏蔽
     lists: 列表
-    mutes: 你隐藏的用户
+    mutes: 已被你隐藏的
     storage: 媒体文件存储
   featured_tags:
     add_new: 添加新条目
@@ -890,55 +1106,62 @@ zh-CN:
       public: 公共时间轴
       thread: 对话
     edit:
+      add_keyword: 添加关键词
+      keywords: 关键词
+      statuses: 个别嘟文
+      statuses_hint_html: 无论是否匹配下列关键词，此过滤器适用于选用个别嘟文。<a href="%{path}">从过滤器中审核嘟文或移除嘟文</a>。
       title: 编辑过滤器
     errors:
+      deprecated_api_multiple_keywords: 这些参数不能从此应用程序更改，因为它们应用于一个以上的过滤关键字。 使用较新的应用程序或网页界面。
       invalid_context: 过滤器场景没有或无效
-      invalid_irreversible: 此功能只适用于主页时间轴或通知
     index:
+      contexts: 在 %{contexts} 中的过滤器
       delete: 删除
       empty: 你没有过滤器。
+      expires_in: 在 %{distance} 后过期
+      expires_on: "%{date} 后到期"
+      keywords:
+        other: "%{count} 关键词"
+      statuses:
+        other: "%{count} 条嘟文"
+      statuses_long:
+        other: "%{count} 条个别嘟文已隐藏"
       title: 过滤器
     new:
+      save: 保存新过滤器
       title: 添加新的过滤器
+    statuses:
+      back_to_filter: 返回至过滤器
+      batch:
+        remove: 从过滤器中移除
+      index:
+        hint: 无论其他条件如何，此过滤器适用于选用个别嘟文。你可以从网页界面中向此过滤器加入更多嘟文。
+        title: 过滤的嘟文
   footer:
-    developers: 开发者
-    more: 更多…
-    resources: 资源
     trending_now: 现在流行
   generic:
     all: 全部
+    all_items_on_page_selected_html:
+      other: 此页面上的所有 <strong>%{count}</strong> 项目已被选中。
+    all_matching_items_selected_html:
+      other: 所有 <strong>%{count}</strong> 匹配您搜索的项目都已被选中。
     changes_saved_msg: 更改保存成功！
     copy: 复制
     delete: 删除
-    no_batch_actions_available: 本页面无可用批量操作
+    deselect: 取消全选
+    none: 无
     order_by: 排序方式
     save_changes: 保存更改
+    select_all_matching_items:
+      other: 选择匹配您搜索的所有 %{count} 个项目。
+    today: 今天
     validation_errors:
       other: 出错啦！检查一下下面 %{count} 处出错的地方吧
   html_validator:
     invalid_markup: '包含无效的 HTML 标记: %{error}'
-  identity_proofs:
-    active: 有效
-    authorize: 是，授权
-    authorize_connection_prompt: 授权这一密码学连接？
-    errors:
-      failed: 密码关联失败。请在 %{provider} 上重新尝试。
-      keybase:
-        invalid_token: Keybase 令牌是签名的哈希并且必须是 66 个十六进制字符
-        verification_failed: Keybase 无法将此令牌识别为 Keybase 用户 %{kb_username} 的签名。请在 Keybase 再试一次。
-      wrong_user: 无法以 %{current} 的身份创建 %{proving} 的证明。请以 %{proving} 的身份登录并再次尝试。
-    explanation_html: 在这里，你可以和你的其他身份建立密码学关联，例如 Keybase 个人资料。这样，别人就可以给你发送加密信息，也能够信任你发给他们的内容。
-    i_am_html: 我是 %{service} 上的 %{username} 。
-    identity: 身份
-    inactive: 失效
-    publicize_checkbox: 并发一条这样的嘟文：
-    publicize_toot: '证明完毕！我是 %{service} 上的 %{username}: %{url}'
-    remove: 从帐户中移除凭据
-    removed: 成功从帐户中删除凭据
-    status: 验证状态
-    view_proof: 查看证明
   imports:
     errors:
+      invalid_csv_file: '无效的 CSV 文件。错误: %{error}'
       over_rows_processing_limit: 包含行数超过了 %{count}
     modes:
       merge: 合并
@@ -954,7 +1177,6 @@ zh-CN:
       following: 关注列表
       muting: 隐藏列表
     upload: 上传
-  in_memoriam_html: 谨此悼念。
   invites:
     delete: 停用
     expired: 已失效
@@ -971,7 +1193,7 @@ zh-CN:
     max_uses:
       other: "%{count} 次"
     max_uses_prompt: 无限制
-    prompt: 生成分享链接，邀请别人在本服务器注册
+    prompt: 生成分享链接，邀请他人在本服务器注册
     table:
       expires_at: 失效时间
       uses: 已使用次数
@@ -996,52 +1218,50 @@ zh-CN:
       not_ready: 不能附加还在处理中的文件。请稍后再试！
       too_many: 最多只能添加 4 张图片
   migrations:
-    acct: 新帐户的 用户名@域名
+    acct: 新账户的 用户名@域名
     cancel: 取消跳转
-    cancel_explanation: 取消跳转将会重新激活你当前的帐号，但是已经迁移到新账号的关注者不会回来。
+    cancel_explanation: 取消跳转将会重新激活你当前的账号，但是已经迁移到新账号的关注者不会回来。
     cancelled_msg: 成功取消跳转
     errors:
-      already_moved: 和你已经迁移过的帐号相同
-      missing_also_known_as: 没有引用此帐号
-      move_to_self: 不能是当前帐户
+      already_moved: 和你已经迁移过的账号相同
+      missing_also_known_as: 没有引用此账号
+      move_to_self: 不能是当前账户
       not_found: 找不到
       on_cooldown: 你正处于冷却状态
     followers_count: 迁移时的关注者
-    incoming_migrations: 从其它帐号迁移
-    incoming_migrations_html: 要把另一个帐号移动到本帐号，首先你需要 <a href="%{path}">创建一个帐号别名</a> 。
-    moved_msg: 你的帐号现在会跳转到%{acct} ，同时关注者也会迁移过去 。
-    not_redirecting: 你的帐号当前未跳转到其它帐户。
-    on_cooldown: 你最近已经迁移过你的帐号。此功能将在%{count} 天后再次可用。
+    incoming_migrations: 从其它账号迁入
+    incoming_migrations_html: 要把另一个账号移动到本账号，首先你需要<a href="%{path}">创建一个账号别名</a> 。
+    moved_msg: 你的账号现在会跳转到 %{acct} ，同时关注者也会一并迁移 。
+    not_redirecting: 你的账号当前未跳转到其它账号。
+    on_cooldown: 你最近已经迁移过你的账号。此功能将在%{count} 天后再次可用。
     past_migrations: 迁移记录
     proceed_with_move: 移动关注者
     redirected_msg: 你的账号现在会跳转至 %{acct}
     redirecting_to: 你的帐户被跳转到了 %{acct}。
     set_redirect: 设置跳转
     warning:
-      backreference_required: 新账号必须先引用现在这个帐号
+      backreference_required: 新账号必须先引用当前账号
       before: 在继续前，请仔细阅读下列说明：
       cooldown: 移动后会有一个冷却期，在此期间你将无法再次移动
       disabled_account: 此后，你的当前帐户将无法使用。但是，你仍然有权导出数据或者重新激活。
       followers: 这步操作将把所有关注者从当前账户移动到新账户
-      only_redirect_html: 或者，你可以<a href="%{path}">只在你的帐号资料上设置一个跳转</a>。
+      only_redirect_html: 或者，你可以<a href="%{path}">只在你的账号资料上设置一个跳转</a>。
       other_data: 不会自动移动其它数据
-      redirect: 在收到一个跳转通知后，你当前的帐号资料将会更新，并被排除在搜索范围外
+      redirect: 在收到一个跳转通知后，你当前的账号资料将会更新，并被排除在搜索范围外
   moderation:
     title: 运营
   move_handler:
     carry_blocks_over_text: 这个用户迁移自你屏蔽过的 %{acct}
     carry_mutes_over_text: 这个用户迁移自你隐藏过的 %{acct}
     copy_account_note_text: 这个用户迁移自 %{acct}，你曾为其添加备注：
+  navigation:
+    toggle_menu: 隐藏/显示菜单
   notification_mailer:
-    digest:
-      action: 查看所有通知
-      body: 以下是自%{since}你最后一次登录以来错过的消息的摘要
-      mention: "%{name} 在嘟文中提到了你："
-      new_followers_summary:
-        other: 而且，你不在的时候，有 %{count} 个人关注了你！好棒！
-      subject:
-        other: "自从上次访问后，有 %{count} 条新通知 \U0001F418"
-      title: 在你不在的这段时间……
+    admin:
+      report:
+        subject: "%{name} 提交了举报"
+      sign_up:
+        subject: "%{name} 注册了"
     favourite:
       body: 你的嘟文被 %{name} 喜欢了：
       subject: "%{name} 喜欢了你的嘟文"
@@ -1068,6 +1288,8 @@ zh-CN:
       title: 新的转嘟
     status:
       subject: "%{name} 刚刚发嘟"
+    update:
+      subject: "%{name} 编辑了嘟文"
   notifications:
     email_events: 电子邮件通知事件
     email_events_hint: 选择你想要收到通知的事件：
@@ -1111,12 +1333,14 @@ zh-CN:
     other: 其他
     posting_defaults: 发布默认值
     public_timelines: 公共时间轴
+  privacy_policy:
+    title: 隐私政策
   reactions:
     errors:
       limit_reached: 互动种类的限制
       unrecognized_emoji: 不是一个可识别的表情
   relationships:
-    activity: 帐号活动
+    activity: 账号活动
     dormant: 休眠
     follow_selected_followers: 关注选中的关注者
     followers: 关注者
@@ -1131,24 +1355,17 @@ zh-CN:
     remove_selected_domains: 从选定的域名中删除所有关注者
     remove_selected_followers: 移除选中的关注者
     remove_selected_follows: 取消关注所选用户
-    status: 帐户状态
+    status: 账户状态
   remote_follow:
-    acct: 请输入你的“用户名@实例域名”
-    missing_resource: 无法确定你的帐户的跳转 URL
-    no_account_html: 还没有帐号？你可以<a href='%{sign_up_path}' target='_blank'>注册一个</a>
-    proceed: 确认关注
-    prompt: 你正准备关注：
-    reason_html: "<strong>为什么需要这个步骤？</strong> <code>%{instance}</code> 可能不是你所注册的服务器，所以我们需要先跳转到你所在的服务器。"
-  remote_interaction:
-    favourite:
-      proceed: 确认标记为喜欢
-      prompt: 你想要标记此嘟文为喜欢：
-    reblog:
-      proceed: 确认转嘟
-      prompt: 你想要转嘟此条：
-    reply:
-      proceed: 确认回复
-      prompt: 你想要回复此嘟文：
+    missing_resource: 无法确定你的账户的跳转 URL
+  reports:
+    errors:
+      invalid_rules: 没有引用有效的规则
+  rss:
+    content_warning: 内容警告：
+    descriptions:
+      account: "@%{acct} 的公开嘟文"
+      tag: "#%{hashtag} 标签下的公开嘟文"
   scheduled_statuses:
     over_daily_limit: 你已超出每日定时嘟文的上限（%{limit} 条）
     over_total_limit: 你已超出定时嘟文的上限（%{limit} 条）
@@ -1172,17 +1389,17 @@ zh-CN:
       phantom_js: PhantomJS
       qq: QQ浏览器
       safari: Safari
-      uc_browser: UC浏览器
+      uc_browser: UC 浏览器
       weibo: 新浪微博
     current_session: 当前会话
     description: "%{platform} 上的 %{browser}"
-    explanation: 你的 Mastodon 帐户目前已在这些浏览器上登录。
+    explanation: 你的 Mastodon 账户目前已在这些浏览器上登录。
     ip: IP 地址
     platforms:
       adobe_air: Adobe Air
       android: Android
       blackberry: 黑莓
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1196,26 +1413,26 @@ zh-CN:
     title: 会话
     view_authentication_history: 查看账户的认证历史
   settings:
-    account: 帐号
-    account_settings: 帐户设置
-    aliases: 帐号别名
+    account: 账号
+    account_settings: 账户设置
+    aliases: 账号别名
     appearance: 外观
     authorized_apps: 已授权的应用
     back: 返回 Mastodon
-    delete: 删除帐户
+    delete: 删除账户
     development: 开发
     edit_profile: 更改个人资料
     export: 导出
     featured_tags: 精选的话题标签
-    identity_proofs: 身份证明
     import: 导入
     import_and_export: 导入和导出
-    migrate: 帐户迁移
+    migrate: 账户迁移
     notifications: 通知
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理
     statuses_cleanup: 自动删除嘟文
+    strikes: 操作记录
     two_factor_authentication: 双重认证
     webauthn_authentication: 安全密钥
   statuses:
@@ -1229,17 +1446,18 @@ zh-CN:
         other: "%{count} 段视频"
     boosted_from_html: 转嘟自 %{acct_link}
     content_warning: 内容警告：%{warning}
+    default_language: 与界面显示语言相同
     disallowed_hashtags:
       other: 包含了这些禁止的话题标签：%{tags}
+    edited_at_html: 编辑于 %{date}
     errors:
       in_reply_not_found: 你回复的嘟文似乎不存在
-    language_detection: 自动检测语言
     open_in_web: 在站内打开
     over_character_limit: 超过了 %{max} 字的限制
     pin_errors:
-      limit: 你所置顶的嘟文数量已经达到上限
+      direct: 仅对被提及的用户可见的帖子不能被置顶
+      limit: 你所固定的嘟文数量已达到上限
       ownership: 不能置顶别人的嘟文
-      private: 不能置顶非公开的嘟文
       reblog: 不能置顶转嘟
     poll:
       total_people:
@@ -1263,21 +1481,21 @@ zh-CN:
       unlisted_long: 所有人可见，但不会出现在公共时间轴上
   statuses_cleanup:
     enabled: 自动删除旧嘟文
-    enabled_hint: 当您的嘟文达到指定的过期时间后自动删除，除非它们与下面的例外之一相匹配
+    enabled_hint: 达到指定过期时间后自动删除您的嘟文，除非满足下列条件之一
     exceptions: 例外
-    explanation: 因为删除帖子是一个昂贵的操作，所以这个操作会随着时间的推移而缓慢地完成，当服务器没有其他忙碌的时候。 为此原因，您的帖子可能会在达到年龄界限后被删除。
+    explanation: 删除嘟文是一个消耗系统资源的耗时操作，所以这个操作会在服务器空闲时完成。因此，您的嘟文可能会在达到过期阈值之后一段时间才会被删除。
     ignore_favs: 取消喜欢
     ignore_reblogs: 忽略转嘟
     interaction_exceptions: 基于互动的例外
-    interaction_exceptions_explanation: 请注意，如果嘟文超出转嘟和喜欢的阈值之后，又降到阈值以下，不能保证会被删除。
+    interaction_exceptions_explanation: 请注意，如果嘟文超出转嘟和喜欢的阈值之后，又降到阈值以下，则可能不会被删除。
     keep_direct: 保留私信
-    keep_direct_hint: 没有删除你的任何私信
+    keep_direct_hint: 不会删除你的任何私信
     keep_media: 保留带媒体附件的嘟文
-    keep_media_hint: 没有删除任何包含媒体附件的嘟文
+    keep_media_hint: 不会删除任何包含媒体附件的嘟文
     keep_pinned: 保留置顶嘟文
-    keep_pinned_hint: 没有删除你的任何置顶嘟文
+    keep_pinned_hint: 不会删除你的任何置顶嘟文
     keep_polls: 保留投票
-    keep_polls_hint: 没有删除你的任何投票
+    keep_polls_hint: 不会删除你的任何投票
     keep_self_bookmark: 保存被你加入书签的嘟文
     keep_self_bookmark_hint: 如果你已将自己的嘟文添加书签，就不会删除这些嘟文
     keep_self_fav: 保留你喜欢的嘟文
@@ -1288,102 +1506,23 @@ zh-CN:
       '2629746': 1个月
       '31556952': 1年
       '5259492': 2个月
+      '604800': 一周
       '63113904': 两年
       '7889238': 3个月
     min_age_label: 过期阈值
     min_favs: 保留如下嘟文：喜欢数超过
-    min_favs_hint: 喜欢数超过该阈值的的嘟文不被删除。如果留空，则无视喜欢数，直接删除。
-    min_reblogs: 保留如下嘟文：转嘟属超过
-    min_reblogs_hint: 转嘟数超过该阈值的的嘟文不被删除。如果留空，则无视被转嘟的数量，直接删除。
+    min_favs_hint: 喜欢数超过该阈值的的嘟文不会被删除。如果留空，则无论嘟文获得多少喜欢，都将被删除。
+    min_reblogs: 保留如下嘟文：转嘟数超过
+    min_reblogs_hint: 转嘟数超过该阈值的的嘟文不会被删除。如果留空，则无论嘟文获得多少转嘟，都将被删除。
   stream_entries:
     pinned: 置顶嘟文
     reblogged: 转嘟
     sensitive_content: 敏感内容
+  strikes:
+    errors:
+      too_late: 已来不及对此次处罚提出申诉
   tags:
     does_not_match_previous_name: 和之前的名称不匹配
-  terms:
-    body_html: |
-      <h2>隐私政策</h2>
-      <h3 id="collect">我们收集什么信息？</h3>
-
-      <ul>
-      <li><em>基本帐户信息</em>:如果你在此服务器上注册，可能会要求你输入用户名，电子邮件地址和密码。 你还可以输入其他个人资料信息，例如显示名称和传记，并上传个人资料照片和标题图像。 用户名，显示名称，传记，个人资料图片和标题图片始终公开列出。</li>
-      <li><em>帖子，关注和其他公共信息</em>: 你关注的人员列表会公开列出，你的粉丝也是如此。 提交邮件时，会存储日期和时间以及你提交邮件的应用程序。 消息可能包含媒体附件，例如图片和视频。 公开和非上市帖子可公开获取。 当你在个人资料中添加帖子时，这也是公开信息。 你的帖子会发送给你的关注者，在某些情况下，这意味着他们会将其发送到不同的服务器，并将副本存储在那里。 当你删除帖子时，同样会将其发送给你的关注者。 重新记录或赞成其他职位的行为始终是公开的。</li>
-      <li><em>直接和关注者的帖子</em>: 所有帖子都在服务器上存储和处理。 仅限关注者的帖子会发送给你的关注者和用户，并且直接帖子仅会发送给他们中提到的用户。 在某些情况下，这意味着它们被传送到不同的服务器并且副本存储在那里。 我们善意努力限制只有授权人员访问这些帖子，但其他服务器可能无法这样做。 因此，查看你的关注者所属的服务器非常重要。 你可以在设置中切换选项以手动批准和拒绝新关注者。 <em>请记住，服务器和任何接收服务器的操作员可能会查看此类消息</em>, 并且收件人可以截图，复制或以其他方式重新共享它们。 <em> 不要在 Mastodon 上分享任何危险信息。</em></li>
-      <li><em>IP和其他元数据</em>: 登录时，我们会记录你登录的IP地址以及浏览器应用程序的名称。 所有登录的会话都可供你在设置中查看和撤销。 使用的最新IP地址最长可存储12个月。 我们还可以保留服务器日志，其中包括我们服务器的每个请求的IP地址。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">我们将你的信息用于什么？</h3>
-
-      <p>我们向你收集的任何信息均可通过以下方式使用：</p>
-
-      <ul>
-      <li>提供Mastodon的核心功能。 你只能在登录时与其他人的内容进行互动并发布你自己的内容。例如，你可以关注其他人在你自己的个性化家庭时间轴中查看他们的组合帖子。</li>
-      <li>为了帮助社区适度，例如将你的IP地址与其他已知的IP地址进行比较，以确定禁止逃税或其他违规行为。</li>
-      <li>你提供的电子邮件地址可能用于向你发送信息，有关其他人与你的内容交互或向你发送消息的通知，以及回复查询和/或其他请求或问题。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">我们如何保护你的信息？</h3>
-
-      <p>当你输入，提交或访问你的个人信息时，我们会实施各种安全措施以维护你的个人信息的安全。 除此之外，你的浏览器会话以及应用程序和API之间的流量都使用SSL进行保护，你的密码使用强大的单向算法进行哈希处理。 你可以启用双因素身份验证，以进一步保护对你帐户的访问。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">我们的数据保留政策是什么？</h3>
-
-      <p>我们真诚的努力：</p>
-
-      <ul>
-      <li>保留包含此服务器的所有请求的IP地址的服务器日志，只要保留此类日志，不超过90天。</li>
-      <li>保留与注册用户关联的IP地址不超过12个月。</li>
-      </ul>
-
-      <p>你可以请求并下载我们内容的存档，包括你的帖子，媒体附件，个人资料图片和标题图片。</p>
-
-      <p>你可以随时不可逆转地删除你的帐户。</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">我们使用 cookies 吗？</h3>
-
-      <p>是。 Cookie是网站或其服务提供商通过Web浏览器传输到计算机硬盘的小文件（如果允许）。 这些cookie使网站能够识别你的浏览器，如果你有注册帐户，则将其与你的注册帐户相关联。</p>
-
-      <p>我们使用Cookie来了解并保存你对未来访问的偏好。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">我们是否透露任何信息给其他方？</h3>
-
-      <p>我们不会将你的个人身份信息出售，交易或以其他方式转让给外方。 这不包括协助我们操作我们的网站，开展业务或为你服务的受信任的第三方，只要这些方同意保密这些信息。 当我们认为发布适合遵守法律，执行我们的网站政策或保护我们或他人的权利，财产或安全时，我们也可能会发布你的信息。</p>
-
-      <p>你的公共内容可能会被网络中的其他服务器下载。 你的公开帖子和关注者帖子会发送到关注者所在的服务器，并且直接邮件会传递到收件人的服务器，只要这些关注者或收件人位于与此不同的服务器上。</p>
-
-      <p>当你授权应用程序使用你的帐户时，根据你批准的权限范围，它可能会访问你的公开个人资料信息，以下列表，你的关注者，你的列表，所有帖子和你的收藏夹。 应用程序永远不能访问你的电子邮件地址或密码。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">儿童使用网站</h3>
-
-      <p>如果此服务器位于欧盟或欧洲经济区：我们的网站，产品和服务都是针对至少16岁的人。 如果你未满16岁，则符合GDPR的要求(<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) 不要使用这个网站。</p>
-
-      <p>如果此服务器位于美国：我们的网站，产品和服务均面向至少13岁的人。 如果你未满13岁，则符合COPPA的要求 (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) 不要使用这个网站。</p>
-
-      <p>如果此服务器位于另一个辖区，则法律要求可能不同。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">我们隐私政策的变更</h3>
-
-      <p>如果我们决定更改我们的隐私政策，我们会在此页面上发布这些更改。</p>
-
-      <p>本文件为CC-BY-SA。 它最后更新于2018年3月7日。</p>
-
-      <p>最初改编自 <a href="https://github.com/discourse/discourse">Discourse 隐私政策</a>.</p>
-    title: "%{instance} 使用条款和隐私权政策"
   themes:
     contrast: Mastodon（高对比度）
     default: Mastodon（暗色主题）
@@ -1392,6 +1531,7 @@ zh-CN:
     formats:
       default: "%Y年%m月%d日 %H:%M"
       month: "%Y年%m月"
+      time: "%H:%M"
   two_factor_authentication:
     add: 添加
     disable: 停用双重认证
@@ -1400,71 +1540,81 @@ zh-CN:
     enabled: 双重认证已启用
     enabled_success: 双重认证启用成功
     generate_recovery_codes: 生成恢复代码
-    lost_recovery_codes: 如果你的手机不慎丢失，你可以使用恢复代码来重新获得对帐户的访问权。如果你遗失了恢复代码，可以在此处重新生成。之前使用的恢复代码将会失效。
+    lost_recovery_codes: 如果你的手机不慎丢失，你可以使用恢复代码来重新获得对账户的访问权。如果你遗失了恢复代码，可以在此处重新生成。之前使用的恢复代码将会失效。
     methods: 双重认证
     otp: 身份验证应用
     recovery_codes: 备份恢复代码
     recovery_codes_regenerated: 恢复代码重新生成成功
-    recovery_instructions_html: 如果你的手机无法使用，你可以使用下列任意一个恢复代码来重新获得对帐户的访问权。<strong>请妥善保管好你的恢复代码</strong>（例如，你可以将它们打印出来，然后和其他重要的文件放在一起）。
+    recovery_instructions_html: 如果你的手机无法使用，你可以使用下列任意一个恢复代码来重新获得对账户的访问权。<strong>请妥善保管好你的恢复代码</strong>（例如，你可以将它们打印出来，然后和其他重要的文件放在一起）。
     webauthn: 安全密钥
   user_mailer:
+    appeal_approved:
+      action: 前往你的账号
+      explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
+      subject: 你于 %{date} 提出的申诉已被批准
+      title: 申诉已批准
+    appeal_rejected:
+      explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
+      subject: 你于 %{date} 提出的申诉已被驳回
+      title: 申诉已驳回
     backup_ready:
-      explanation: 你请求了一份 Mastodon 帐户的完整备份。现在你可以下载了！
+      explanation: 你请求了一份 Mastodon 账户的完整备份。现在你可以下载了！
       subject: 你的存档已经准备完毕
       title: 存档导出
-    sign_in_token:
-      details: 该尝试详情如下：
-      explanation: 我们检查到有来自未经识别的 IP 地址的登录请求。如果这确实是你，请在登录确认页面输入下方的安全码：
-      further_actions: 如果这不是你，请更换你的密码并且在你的账号上开启双重认证。你可以在这里设置：
-      subject: 请确认登录请求：
-      title: 登录请求
+    suspicious_sign_in:
+      change_password: 更改密码
+      details: 以下是该次登录的详细信息：
+      explanation: 我们检测到有新 IP 地址登录了您的账号。
+      further_actions_html: 如果不是您自己的操作，我们建议您立即 %{action} 并启用双重验证，确保账号安全。
+      subject: 已有新 IP 地址访问了您的账号
+      title: 新登录
     warning:
+      appeal: 提交申诉
+      appeal_description: 如果你认为此结果有误，可以向 %{instance} 的工作人员提交申诉。
+      categories:
+        spam: 垃圾信息
+        violation: 内容违反了以下社区准则
       explanation:
-        disable: 虽然你的帐户被冻结，你的帐户数据仍然完整；但是你无法在解锁前执行任何操作。
-        sensitive: 你上传的媒体文件和媒体链接将被视作敏感内容。
-        silence: 当你的帐户被隐藏时，只有已经关注你的人才会这台服务器上看到你的嘟文，并且你会被排除在各种公共列表之外。但是，其他人仍然可以手动关注你。
-        suspend: 你的帐户已被封禁，所有的嘟文和你上传的媒体文件都已经从该服务器和你的关注者的服务器上删除并且不可恢复。
-      get_in_touch: 你可回复该邮件以联系 %{instance} 的工作人员。
-      review_server_policies: 查看服务器政策
-      statuses: 具体来说，适用于：
+        delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则，并已被 %{instance} 的监察员删除。
+        disable: 你不能再使用你的账户，但你的个人资料和其他数据保持不变。你可以请求数据备份，更改账户设置或删除账户。
+        mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 检察员标记为敏感内容。这意味着别人需要在嘟文中点击媒体，才能显示媒体预览。你可以在今后发嘟时自行将媒体标记为敏感内容。
+        sensitive: 即刻起，你上传的所有媒体文件都将被标记为敏感内容并隐藏，在点击警告后才能查看。
+        silence: 你可以继续使用你的账号，但只有已关注你的人才能在看到你在此服务器上的嘟文，并且你会被排除在各类公共列表之外。其他用户仍可以手动关注你。
+        suspend: 你不能再使用你的账户，并且你的个人资料和其他数据都将无法访问。在大约30天内，你仍可以登录并请求数据备份，之后相关数据将被完全删除。我们会保留一些基础数据以避免封禁失效。
+      reason: 理由：
+      statuses: 被引用的嘟文：
       subject:
+        delete_statuses: 你在 %{acct} 的嘟文已被删除
         disable: 你的帐户 %{acct} 已被冻结
+        mark_statuses_as_sensitive: 你在 %{acct} 的嘟文已被标记为敏感内容
         none: 对 %{acct} 的警告
-        sensitive: 你的帐号 %{acct} 所发布的媒体已被标记为敏感内容
+        sensitive: 你在 %{acct} 的嘟文今后将被标记为敏感内容
         silence: 你的帐户 %{acct} 已被隐藏
         suspend: 你的帐户 %{acct} 已被封禁。
       title:
+        delete_statuses: 嘟文已删除
         disable: 账号已冻结
+        mark_statuses_as_sensitive: 嘟文已被标记为敏感内容
         none: 警示
-        sensitive: 你的媒体被标记为敏感内容
+        sensitive: 账户已被标记为敏感内容
         silence: 帐户被隐藏
         suspend: 账号被封禁
     welcome:
       edit_profile_action: 设置个人资料
-      edit_profile_step: 你可以自定义你的个人资料，包括上传头像、横幅图片、更改昵称等等。如果你想在新的关注者关注你之前对他们进行审核，你也可以选择为你的帐户开启保护。
+      edit_profile_step: 您可以通过上传个人资料图片、更改您的昵称等来自定义您的个人资料。 您可以选择在新关注者关注您之前对其进行审核。
       explanation: 下面是几个小贴士，希望它们能帮到你
       final_action: 开始嘟嘟
-      final_step: '开始嘟嘟吧！即便你现在没有关注者，其他人仍然能在本站时间轴或者话题标签等地方看到你的公开嘟文。试着用 #自我介绍 这个话题标签介绍一下自己吧。'
+      final_step: '开始发嘟！ 即使没有关注者，您的公开嘟文也可能会被其他人看到，例如在本地时间轴或话题标签中。 您可能想在 #introductions 话题标签上介绍自己。'
       full_handle: 你的完整用户地址
       full_handle_hint: 你需要把这个告诉你的朋友们，这样他们就能从另一台服务器向你发送信息或者关注你。
-      review_preferences_action: 更改首选项
-      review_preferences_step: 记得调整你的偏好设置，比如你想接收什么类型的邮件，或者你想把你的嘟文可见范围默认设置为什么级别。如果你没有晕动病的话，考虑一下启用“自动播放 GIF 动画”这个选项吧。
       subject: 欢迎来到 Mastodon
-      tip_federated_timeline: 跨站公共时间轴可以让你一窥更广阔的 Mastodon 网络。不过，由于它只显示你的邻居们所订阅的内容，所以并不是全部。
-      tip_following: 默认情况下，你会自动关注你所在服务器的管理员。想结交更多有趣的人的话，记得多逛逛本站时间轴和跨站公共时间轴哦。
-      tip_local_timeline: 本站时间轴可以让你一窥 %{instance} 上的用户。他们就是离你最近的邻居！
-      tip_mobile_webapp: 如果你的移动设备浏览器允许你将 Mastodon 添加到主屏幕，你就能够接收推送消息。它就像本地应用一样好使！
-      tips: 小贴士
       title: "%{name}，欢迎你的加入！"
   users:
     follow_limit_reached: 你不能关注超过 %{limit} 个人
-    generic_access_help_html: 登录账号出现问题？你可以向 %{email} 寻求帮助
     invalid_otp_token: 输入的双重认证代码无效
-    invalid_sign_in_token: 无效安全码
     otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
     seamless_external_login: 因为你是通过外部服务登录的，所以密码和电子邮件地址设置都不可用。
-    signed_in_as: 当前登录的帐户：
-    suspicious_sign_in_confirmation: 你似乎没有在这台设备上登录过，并且你也有很久没有登录过了，所以我们给你的电子邮箱发了封邮件，想确认一下确实是你。
+    signed_in_as: 当前登录的账户：
   verification:
     explanation_html: 你可以 <strong>验证自己是个人资料元数据中的某个链接的所有者</strong>。 为此，被链接网站必须包含一个到你的 Mastodon 主页的链接。链接中 <strong>必须</strong> 包括 <code>rel="me"</code> 属性。链接的文本内容可以随意填写。例如：
     verification: 验证
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index bef228c13..f26a8df08 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1,88 +1,25 @@
 ---
 zh-HK:
   about:
-    about_hashtag_html: 這些是包含「<strong>#%{hashtag}</strong>」標籤的公開文章。只要你是任何聯盟網站的用戶，便可以與他們互動。
     about_mastodon_html: Mastodon（萬象）是屬於未來的社交網路︰無廣告煩擾、無企業監控、設計講道義、分散無大台！立即重奪個人資料的控制權，使用 Mastodon 吧！
-    about_this: 關於本伺服器
-    active_count_after: 活躍
-    active_footnote: 每月活躍使用者 (MAU)
-    administered_by: 管理者：
-    api: API
-    apps: 手機 App
-    apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
-    browse_directory: 依興趣瀏覽個人資料目錄和過濾器
-    browse_local_posts: 瀏覽這個伺服器的公開文章即時串流
-    browse_public_posts: 在 Mastodon 瀏覽公開文章的即時串流
-    contact: 聯絡
     contact_missing: 未設定
     contact_unavailable: 不適用
-    discover_users: 探索使用者
-    documentation: 說明文件
-    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤任何 Mastodon 服務站上的人！
-    get_apps: 嘗試使用手機 App
     hosted_on: 在 %{domain} 運作的 Mastodon 伺服器
-    instance_actor_flash: |
-      這個帳戶是代表伺服器，而非代表任何個人用戶的虛擬帳號。
-      此帳戶是為聯盟協定而設。除非你想封鎖整個伺服器的話，否則請不要封鎖這個帳戶。如果你想封鎖伺服器，請使用網域封鎖以達到相同效果。
-    learn_more: 了解更多
-    privacy_policy: 隱私權政策
-    rules: 系統規則
-    rules_html: 如果你想要在本站開一個新帳戶，以下是你需要遵守的規則：
-    see_whats_happening: 看看發生什麼事
-    server_stats: 伺服器統計：
-    source_code: 源代碼
-    status_count_after:
-      other: 篇文章
-    status_count_before: 共發佈了
-    tagline: 關注朋友並探索新朋友
-    terms: 使用條款
-    unavailable_content: 受限制的伺服器
-    unavailable_content_description:
-      domain: 伺服器
-      reason: 原因
-      rejecting_media: 這些伺服器的媒體檔案將不會被處理或儲存，我們亦不會展示其縮圖。請手動點擊以觀看原始檔：
-      rejecting_media_title: 被篩選的媒體檔案
-      silenced: 除非你已經關注個別使用者，否則來自這些伺服器的文章和通知將會被隱藏。
-      silenced_title: 已靜音的伺服器
-      suspended: 來自這些伺服器的所有數據將不會被處理。你將不可能聯絡來自這些伺服器的使用者。
-      suspended_title: 已停權的伺服器
-    unavailable_content_html: Mastodon 通常讓你瀏覽其他社交聯盟網站的所有內容，但是對於這個特定網站，有這些特別的例外規則。
-    user_count_after:
-      other: 位使用者
-    user_count_before: 本站共有
-    what_is_mastodon: Mastodon （萬象）是甚麼？
+    title: 關於
   accounts:
-    choices_html: "%{name} 的選擇："
-    endorsements_hint: 你可以推薦正在關注的人，他們會被顯示在你的個人頁面。
-    featured_tags_hint: 你可以推薦不同標籤，它們也會在此處出現。
     follow: 關注
     followers:
       other: 關注者
     following: 正在關注
     instance_actor_flash: 這個帳戶是結盟用的本伺服器的虛擬象徵，並不代表任何個別用戶。請不要把帳號停權。
-    joined: 於 %{date} 加入
     last_active: 上次活躍時間
     link_verified_on: 此連結的所有權已在 %{date} 檢查過
-    media: 媒體
-    moved_html: "%{name} 已經轉移到 %{new_profile_link}："
-    network_hidden: 此信息不可用
-    never_active: 永不
     nothing_here: 暫時未有內容可以顯示！
-    people_followed_by: "%{name} 關注的人"
-    people_who_follow: 關注 %{name} 的人
     pin_errors:
       following: 你只能推薦你正在關注的使用者。
     posts:
       other: 文章
     posts_tab_heading: 文章
-    posts_with_replies: 包含回覆的文章
-    roles:
-      admin: 管理員
-      bot: 機械人
-      group: 群組
-      moderator: 板主
-    unavailable: 無法取得個人檔案
-    unfollow: 取消關注
   admin:
     account_actions:
       action: 執行動作
@@ -90,26 +27,30 @@ zh-HK:
     account_moderation_notes:
       create: 加入管理紀錄
       created_msg: 已新增管理紀錄
-      delete: 刪除
       destroyed_msg: 管理紀錄已被刪除
     accounts:
       add_email_domain_block: 封鎖電郵網域
       approve: 核准
-      approve_all: 全部批准
       approved_msg: 成功審核了%{username} 的新帳號申請
       are_you_sure: 你確定嗎？
       avatar: 頭像
       by_domain: 域名
       change_email:
-        changed_msg: 帳號電郵更新成功！
+        changed_msg: 成功更改電郵！
         current_email: 現時電郵
         label: 更改電郵
         new_email: 新的電郵
         submit: 改變電郵
         title: 改變 %{username} 的電郵
+      change_role:
+        changed_msg: 成功更改身份！
+        label: 變更身份
+        no_role: 沒有身份
+        title: 更改 %{username} 身份
       confirm: 確定
       confirmed: 已確定
-      confirming: 確定
+      confirming: 確定中
+      custom: 自訂
       delete: 刪除資料
       deleted: 已刪除
       demote: 降權
@@ -149,7 +90,7 @@ zh-HK:
         active: 活躍
         all: 全部
         pending: 處理中
-        silenced: 被靜音的
+        silenced: 受限
         suspended: 已停權
         title: 管理操作
       moderation_notes: 管理備註
@@ -157,9 +98,13 @@ zh-HK:
       most_recent_ip: 最近的 IP 位址
       no_account_selected: 因未選擇帳號而未有任何變更
       no_limits_imposed: 未受限制
+      no_role_assigned: 未指派身份
       not_subscribed: 未訂閱
       pending: 等待審核中
       perform_full_suspension: 已停權
+      previous_strikes: 過往警告
+      previous_strikes_description_html:
+        other: 此帳號有 <strong>%{count}</strong> 次警告紀錄。
       promote: 提升權限
       protocol: 協議
       public: 公開
@@ -167,8 +112,9 @@ zh-HK:
       redownload: 更新頁面
       redownloaded_msg: 成功重新載入 %{username} 的個人資料頁面
       reject: 拒絕
-      reject_all: 全部拒絕
       rejected_msg: 成功拒絕了 %{username} 的新帳號申請
+      remote_suspension_irreversible: 帳戶已永久刪除
+      remote_suspension_reversible_hint_html: 此帳戶已被停權及所有數據將會於 %{date} 被刪除。在此之前，你仍可以完全回復帳號。如果你想即時刪除此帳戶的資料，可以在下面進行操作。
       remove_avatar: 刪除頭像
       remove_header: 移除頁面頂端
       removed_avatar_msg: 成功刪除 %{username} 的頭像
@@ -180,19 +126,13 @@ zh-HK:
       reset: 重設
       reset_password: 重設密碼
       resubscribe: 重新訂閱
-      role: 權限
-      roles:
-        admin: 管理員
-        moderator: 管理員
-        staff: 工作人員
-        user: 普通使用者
+      role: 身份
       search: 搜尋
       search_same_email_domain: 其他有相同電郵網域的使用者
       search_same_ip: 其他有相同 IP 位址的使用者
       security_measures:
         only_password: 僅密碼
         password_and_2fa: 密碼和兩步認證
-        password_and_sign_in_token: 密碼與 e-mail 驗證碼
       sensitive: 敏感内容
       sensitized: 已標記為敏感內容
       shared_inbox_url: 公共收件箱（Shared Inbox）URL
@@ -202,12 +142,15 @@ zh-HK:
       silence: 靜音
       silenced: 已靜音
       statuses: 文章
+      strikes: 過往警告
       subscribe: 訂閱
+      suspend: 停權
       suspended: 已停權
       suspension_irreversible: 已永久刪除此帳號的數據。你可以取消此帳號的停權狀態，但帳號的資料已被永久刪除。
       suspension_reversible_hint_html: 此帳戶已被停權及所有數據將會於 %{date} 被刪除。在此之前，你仍可以完全回復帳號。如果你想即時刪除此帳戶的資料，可以在下面進行操作。
-      time_in_queue: 排隊中 %{time}
       title: 帳號
+      unblock_email: 解除封鎖電郵地址
+      unblocked_email_msg: 成功解除封鎖 %{username} 的電郵地址
       unconfirmed_email: 未確認的電郵
       undo_sensitized: 取消敏感狀態
       undo_silenced: 解除靜音
@@ -222,26 +165,34 @@ zh-HK:
       whitelisted: 容許互傳文章
     action_logs:
       action_types:
+        approve_appeal: 批准申訴
+        approve_user: 批准使用者
         assigned_to_self_report: 指派舉報
         change_email_user: 更改使用者的電郵
+        change_role_user: 更改使用者身份
         confirm_user: 確認使用者
         create_account_warning: 新增警告
         create_announcement: 建立公告
+        create_canonical_email_block: 建立電郵封鎖
         create_custom_emoji: 新增自訂的 Emoji
         create_domain_allow: 新增允許的域名
         create_domain_block: 封鎖域名
         create_email_domain_block: 封鎖電郵域名
         create_ip_block: 新增IP規則
         create_unavailable_domain: 創建無效域名
+        create_user_role: 新增身份
         demote_user: 將帳號降級
         destroy_announcement: 刪除公告
+        destroy_canonical_email_block: 刪除電郵封鎖
         destroy_custom_emoji: 刪除自定的 Emoji 表情符號
         destroy_domain_allow: 刪除允許的域名
         destroy_domain_block: 刪除已封鎖的域名
         destroy_email_domain_block: 刪除已封鎖的電郵城名
+        destroy_instance: 清除網域
         destroy_ip_block: 刪除 IP 規則
         destroy_status: 刪除文章
         destroy_unavailable_domain: 刪除無效域名
+        destroy_user_role: 刪除身份
         disable_2fa_user: 停用兩步驟驗證
         disable_custom_emoji: 停用自定的 Emoji 表情符號
         disable_sign_in_token_auth_user: 停用該使用者之 e-mail 驗證碼
@@ -251,42 +202,56 @@ zh-HK:
         enable_user: 啟用帳號
         memorialize_account: 把帳號設定為悼念帳號
         promote_user: 提升帳號權限
+        reject_appeal: 駁回申訴
+        reject_user: 拒絕使用者
         remove_avatar_user: 刪除頭像
         reopen_report: 重開舉報個案
+        resend_user: 重寄確認郵件
         reset_password_user: 重設密碼
         resolve_report: 解決舉報個案
         sensitive_account: 把你的帳號的媒體設定為敏感內容
         silence_account: 把帳號靜音
         suspend_account: 把帳號停權
         unassigned_report: 取消指派舉報
+        unblock_email_account: 解除封鎖電郵地址
         unsensitive_account: 取消把你帳號的媒體設定為敏感內容
         unsilence_account: 取消帳號的靜音狀態
         unsuspend_account: 取消帳號的停權狀態
         update_announcement: 更新公告
         update_custom_emoji: 更新自定的 Emoji 表情符號
         update_domain_block: 更新域名阻隔
+        update_ip_block: 更新 IP 規則
         update_status: 更新文章
+        update_user_role: 更新身份
       actions:
+        approve_appeal_html: "%{name} 批准了 %{target} 的審核裁決申訴"
+        approve_user_html: "%{name} 批准了 %{target} 的註冊"
         assigned_to_self_report_html: "%{name} 指派了 %{target} 的檢舉給自己"
         change_email_user_html: "%{name} 更改了使用者 %{target} 的 e-mail 地址"
+        change_role_user_html: "%{name} 更改了 %{target} 的身份"
         confirm_user_html: "%{name} 已確認使用者 %{target} 的 e-mail 地址"
         create_account_warning_html: "%{name} 已警告了 %{target}"
         create_announcement_html: "%{name} 新增了公告 %{target}"
+        create_canonical_email_block_html: "%{name} 封鎖了 hash 為 %{target} 的電郵"
         create_custom_emoji_html: "%{name} 加入了新的 Emoji %{target}"
         create_domain_allow_html: "%{name} 允許網域 %{target} 加入聯邦宇宙"
         create_domain_block_html: "%{name} 封鎖了網域 %{target}"
         create_email_domain_block_html: "%{name} 封鎖了 e-mail 網域 %{target}"
         create_ip_block_html: "%{name} 已經設定了針對 IP %{target} 的規則"
         create_unavailable_domain_html: "%{name} 停止了對網域 %{target} 的更新通知"
+        create_user_role_html: "%{name} 建立了 %{target} 身份"
         demote_user_html: "%{name} 降權了 %{target}"
         destroy_announcement_html: "%{name} 刪除了公告 %{target}"
-        destroy_custom_emoji_html: "%{name} 刪除了 Emoji %{target}"
+        destroy_canonical_email_block_html: "%{name} 解除封鎖了 hash 為 %{target} 的電郵"
+        destroy_custom_emoji_html: "%{name} 刪除了 %{target} emoji"
         destroy_domain_allow_html: "%{name} 禁止網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 封鎖了網域 %{target}"
         destroy_email_domain_block_html: "%{name} 解除封鎖 e-mail 網域 %{target}"
+        destroy_instance_html: "%{name} 清除了網域 %{target}"
         destroy_ip_block_html: "%{name} 已經刪除了 IP %{target} 的規則"
         destroy_status_html: "%{name} 刪除了 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 恢復了對網域 %{target} 的更新通知"
+        destroy_user_role_html: "%{name} 刪除了 %{target} 身份"
         disable_2fa_user_html: "%{name} 停用了使用者 %{target} 的雙重認證"
         disable_custom_emoji_html: "%{name} 停用了 Emoji %{target}"
         disable_sign_in_token_auth_user_html: "%{name} 停用了使用者 %{target} 的 e-mail 驗證碼"
@@ -296,22 +261,28 @@ zh-HK:
         enable_user_html: "%{name} 把使用者 %{target} 設定為允許登入"
         memorialize_account_html: "%{name} 把 %{target} 設定為追悼帳號"
         promote_user_html: "%{name} 提升了使用者 %{target} 的權限"
+        reject_appeal_html: "%{name} 拒絕了 %{target} 的審核裁決申訴"
+        reject_user_html: "%{name} 拒絕了 %{target} 的註冊"
         remove_avatar_user_html: "%{name} 移除了 %{target} 的大頭貼"
         reopen_report_html: "%{name} 重新開啟 %{target} 的檢舉案例"
+        resend_user_html: "%{name} 重發確認電郵給 %{target}"
         reset_password_user_html: "%{name} 重設了使用者 %{target} 的密碼"
         resolve_report_html: "%{name} 處理了 %{target} 的檢舉案例"
         sensitive_account_html: "%{name} 將 %{target} 的媒體標記為敏感內容"
         silence_account_html: "%{name} 限制了帳號 %{target}"
         suspend_account_html: "%{name} 將帳號 %{target} 停權"
         unassigned_report_html: "%{name} 取消指派 %{target} 的檢舉"
+        unblock_email_account_html: "%{name} 解除封鎖 %{target} 的電郵地址"
         unsensitive_account_html: "%{name} 將 %{target} 的媒體取消標記為敏感內容"
         unsilence_account_html: "%{name} 取消了用戶 %{target} 的限制狀態"
         unsuspend_account_html: "%{name} 將帳號 %{target} 解除停權"
         update_announcement_html: "%{name} 更新了公告 %{target}"
         update_custom_emoji_html: "%{name} 更新了 Emoji 表情符號 %{target}"
         update_domain_block_html: "%{name} 更新了對 %{target} 的網域封鎖"
+        update_ip_block_html: "%{name} 更改了 IP %{target} 的規則"
         update_status_html: "%{name} 更新了 %{target} 的嘟文"
-      deleted_status: "（已刪除文章）"
+        update_user_role_html: "%{name} 更改了 %{target} 身份"
+      deleted_account: 刪除帳號
       empty: 找不到任何日誌。
       filter_by_action: 按動作篩選
       filter_by_user: 按帳號篩選
@@ -350,11 +321,12 @@ zh-HK:
       enable: 啟用
       enabled: 已啟用
       enabled_msg: 已啟用表情符號
-      image_hint: PNG 格式，最大 50KB
+      image_hint: 最大為 %{size} 的 PNG 或 GIF
       list: 列出
       listed: 已列出
       new:
         title: 加入新的自訂 Emoji 表情符號
+      no_emoji_selected: 未選取任何 emoji，因此沒有變更
       not_permitted: 你無權執行此操作
       overwrite: 覆蓋
       shortcode: 短代碼
@@ -367,13 +339,37 @@ zh-HK:
       updated_msg: 已更新表情符號
       upload: 上傳新的表情符號
     dashboard:
+      active_users: 活躍使用者
+      interactions: 互動
+      media_storage: 媒體儲存空間
+      new_users: 新使用者
+      opened_reports: 新檢舉
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> 個待處理申訴"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> 待處理檢舉"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> 個待處理標籤"
+      pending_users_html:
+        other: "<strong>%{count}</strong> 待處理使用者"
+      resolved_reports: 已解決檢舉
       software: 軟件
+      sources: 註冊來源
       space: 儲存空間用量
       title: 儀表板
+      top_languages: 最活躍語言
+      top_servers: 最活躍伺服器
+      website: 網站
+    disputes:
+      appeals:
+        empty: 找不到申訴。
+        title: 申訴
     domain_allows:
       add_new: 將網域加入白名單
       created_msg: 網域已成功加入白名單
       destroyed_msg: 網域已成功從白名單移除
+      export: 匯出
+      import: 匯入
       undo: 從白名單移除
     domain_blocks:
       add_new: 新增域名阻隔規則
@@ -381,16 +377,21 @@ zh-HK:
       destroyed_msg: 已撤銷域名阻隔
       domain: 域名阻隔
       edit: 更改域名阻隔
+      existing_domain_block: 你已對 %{name} 施加了更嚴格的限制。
       existing_domain_block_html: 你已經對 %{name} 施加了更嚴格的限制，你需要先對他<a href="%{unblock_url}">取消封鎖</a>。
+      export: 匯出
+      import: 匯入
       new:
         create: 新增域名阻隔
         hint: "「域名阻隔」不會隔絕該域名帳號進入本站資料庫，但是會在符合條件的帳號進入資料庫後，自動對它們套用特定審批操作。"
         severity:
-          desc_html: "「<strong>自動靜音</strong>」令該域名下帳號的文章，被設為只對關注者顯示，沒有關注的人會看不到。 「<strong>自動刪除</strong>」會刪除將該域名下用戶的文章、媒體檔案和個人資料。「<strong>無</strong>」則會拒絕接收來自該域名的媒體檔案。"
+          desc_html: "<strong>限制</strong>將使沒有追蹤該網域帳號的人看不到他們的帖文。<strong>停權</strong>將從你的伺服器中，刪除此網域帳號的所有內容、媒體和個人檔案資料。如果你只想拒絕接收媒體檔案，請選擇<strong>無</strong>。"
           noop: 無
-          silence: 自動靜音
+          silence: 限制
           suspend: 自動刪除
         title: 新增域名阻隔
+      no_domain_block_selected: 未選取任何網域限制，因此並未變更
+      not_permitted: 你無權執行此操作
       obfuscate: 混淆域名名稱
       obfuscate_hint: 如果已經啟用了網域廣告列表限制，在列表部份混淆網域名稱
       private_comment: 私人留言
@@ -401,33 +402,40 @@ zh-HK:
       reject_media_hint: 刪除本地緩存的媒體檔案，再也不在未來下載這個站點的檔案。和自動刪除無關
       reject_reports: 拒絕檢舉個案
       reject_reports_hint: 忽略所有來自此站點的檢舉。與停權無關
-      rejecting_media: 拒絕媒體檔案
-      rejecting_reports: 拒絕檢舉中
-      severity:
-        silence: 已靜音
-        suspend: 已停權
-      show:
-        affected_accounts:
-          other: 將影響到資料庫中的 %{count} 個帳號
-        retroactive:
-          silence: 對此域名的所有帳號取消靜音
-          suspend: 對此域名的所有帳號取消除名
-        title: 撤銷 %{domain} 的域名阻隔
-        undo: 撤銷
       undo: 撤銷域名阻隔
       view: 顯示正被阻隔的網域
     email_domain_blocks:
       add_new: 新增
+      attempts_over_week:
+        other: 上週嘗試了註冊 %{count} 次
       created_msg: 已新增電郵網域阻隔
       delete: 刪除
-      destroyed_msg: 已刪除電郵網域阻隔
+      dns:
+        types:
+          mx: MX 紀錄
       domain: 網域
-      empty: 現時並沒有電郵域名被阻隔。
-      from_html: 由%{domain}
       new:
         create: 新增網域
+        resolve: 解析網域
         title: 新增電郵網域阻隔
+      no_email_domain_block_selected: 未選取任何電郵網域限制，因此並未變更
+      resolved_dns_records_hint_html: 域名解析為以下 MX 網域，這些網域主要用來接收電子郵件。封鎖一個 MX 網域，即使域名看起來不同，也會阻止任何用相同 MX 網域的電郵地址進行註冊。<strong>注意不要封鎖主要的電子郵件供應商。</strong>
+      resolved_through_html: 透過 %{domain} 解析
       title: 電郵網域阻隔
+    export_domain_allows:
+      new:
+        title: 匯入允許的網域
+      no_file: 未選擇檔案
+    export_domain_blocks:
+      import:
+        description_html: 你即將匯入網域封鎖列表。請審慎檢查，尤其是如果你並非親自編纂的。
+        existing_relationships_warning: 現存追蹤關係
+        private_comment_description_html: 為了幫助你追蹤匯入封鎖的源頭，匯入的封鎖會在建立時將會有以下的私密備註：<q>%{comment}</q>
+        private_comment_template: 於 %{date} 從 %{source} 匯入
+        title: 匯入封鎖的網域
+      new:
+        title: 匯入封鎖的網域
+      no_file: 未選擇檔案
     follow_recommendations:
       description_html: "<strong>跟隨建議幫助新使用者快速找到有趣內容。</strong> 當使用者尚未和其他帳號足夠多的互動以產生個人化建議時，以下帳號將被推荐。這些是一句指定語言的近期參與度和本地粉絲數最高之帳戶組合每日重新計算。"
       language: 按語言
@@ -437,39 +445,69 @@ zh-HK:
       title: 跟隨建議
       unsuppress: 還原跟隨建議
     instances:
+      availability:
+        description_html:
+          other: 如果分別在 <strong>%{count} 天</strong>裏均無法成功遞送到網域處，除非<em>從</em>網域收到遞送，否則將不會再次嘗試。
+        failure_threshold_reached: 於 %{date} 達到錯誤閥值。
+        failures_recorded:
+          other: 分別在 %{count} 天嘗試錯誤。
+        no_failures_recorded: 沒有錯誤紀錄。
+        title: 可用性
+        warning: 最後一次嘗試連接該伺服器並不成功
       back_to_all: 全部
       back_to_limited: 已靜音
       back_to_warning: 警告
       by_domain: 域名
+      confirm_purge: 你確定要永久刪除這個網域的資料嗎？
+      content_policies:
+        comment: 內部備註
+        description_html: 你可以自行制訂內容政策，政策將用於此網域和其子網域的所有帳號。
+        policies:
+          reject_media: 拒絕接收媒體
+          reject_reports: 拒絕檢舉
+          silence: 限制
+          suspend: 停權
+        policy: 政策
+        reason: 公眾理由
+        title: 內容政策
+      dashboard:
+        instance_accounts_dimension: 最多人追蹤的帳號
+        instance_accounts_measure: 已儲存帳號
+        instance_followers_measure: 我們那邊的追蹤者
+        instance_follows_measure: 他們這邊的追蹤者
+        instance_languages_dimension: 熱門語言
+        instance_media_attachments_measure: 已儲存媒體附件
+        instance_reports_measure: 關於他們的檢舉
+        instance_statuses_measure: 已儲存帖文
       delivery:
         all: 全部
         clear: 清除遞送錯誤
+        failing: 失敗
         restart: 重新啟動遞送
         stop: 停止遞送
-        title: 遞送
         unavailable: 離線
-        unavailable_message: 無法遞送
-        warning: 警告
-        warning_message:
-          other: 遞送失敗 %{count} 天
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 天皆無法達成遞送，將會被自動標記為離線。
+      destroyed_msg: 來自 %{domain} 的資料正在排隊等待被即將刪除。
       empty: 找不到域名。
       known_accounts:
-        other: "%{count} 已知的帳號"
+        other: "%{count} 個已知帳號"
       moderation:
         all: 全部
         limited: 限制
         title: 版主
       private_comment: 私人留言
       public_comment: 公開留言
+      purge: 清除
+      purge_description_html: 如果你認為此網域永久處於離線狀態，你可以從儲存空間中刪除該網域的所有帳號紀錄和相關資料。這可能需要一段時間。
       title: 已知服務站
       total_blocked_by_us: 被我們封鎖
       total_followed_by_them: 被他們關注
       total_followed_by_us: 被我們關注
       total_reported: 關於他們的舉報
       total_storage: 媒體附件
+      totals_time_period_hint_html: 下面顯示的總數包括所有時間的數據。
     invites:
       deactivate_all: 全部停用
       filter:
@@ -493,8 +531,6 @@ zh-HK:
         title: 新增 IP 規則
       no_ip_block_selected: 因未選擇 IP 規則而未有任何變更。
       title: IP 規則
-    pending_accounts:
-      title: 待處理帳戶（%{count}）
     relationships:
       title: "%{acct} 的關係"
     relays:
@@ -520,38 +556,119 @@ zh-HK:
       account:
         notes:
           other: "%{count} 則備註"
-        reports:
-          other: "%{count} 則舉報"
+      action_log: 審核日誌
       action_taken_by: 操作執行者
+      actions:
+        delete_description_html: 被檢舉的帖文將被刪除，並記錄一次警告，以便日後加快處理同一帳號的違規行為。
+        mark_as_sensitive_description_html: 被檢舉的帖文中的媒體會被標記為敏感內容，並記錄一次警告，以便日後加快處理同一帳號的違規行為。
+        other_description_html: 查看更多控制帳號行為，以及自訂與被檢舉帳號溝通的選項。
+        resolve_description_html: 不會對被檢舉的帳號採取任何動作，也不會記錄警告，檢舉報告將會結案。
+        silence_description_html: 此個人檔案將會只有追蹤者和透過手動搜尋才可以看見，大幅限制了它的曝光。你可隨時恢復它。
+        suspend_description_html: 直到最後刪除之前，此個人檔案及其內容將無法被存取。你將無法與此帳號互動。這動作可以在 30 天內還原。
+      actions_description_html: 決定對此檢舉採取哪種措施。如果對被檢舉帳號採取懲罰措施，除非選取了<strong>垃圾訊息</strong>分類，否則將向他們發送一封電郵通知。
+      add_to_report: 加入更多到檢舉
       are_you_sure: 你確認嗎？
       assign_to_self: 指派給自己
       assigned: 指派版主
+      by_target_domain: 被舉報帳號的域名
+      category: 分類
+      category_description_html: 此帳號及/或內容被檢舉的原因，將會被引用在與被檢舉帳號的通訊中。
       comment:
         none: 沒有
+      comment_description_html: 為了提供更多資訊，%{name} 寫道：
       created_at: 日期
+      delete_and_resolve: 刪除帖文
       forwarded: 已轉寄
       forwarded_to: 已轉寄到 %{domain}
       mark_as_resolved: 標示為「已處理」
+      mark_as_sensitive: 標記為敏感內容
       mark_as_unresolved: 標示為「未處理」
+      no_one_assigned: 沒有人
       notes:
         create: 建立備註
         create_and_resolve: 標示為「已處理」並留下備註
         create_and_unresolve: 標示為「未處理」並留下備註
         delete: 刪除
         placeholder: 記錄已執行的動作，或其他相關的更新……
+        title: 筆記
+      notes_description_html: 查看並給其他管理員和日後的自己留下筆記
+      quick_actions_description_html: 採取快捷操作或向下捲動以查看檢舉內容：
+      remote_user_placeholder: 來自 %{instance} 的遠端使用者
       reopen: 重開舉報個案
       report: '舉報 #%{id}'
       reported_account: 舉報用戶
       reported_by: 舉報者
       resolved: 已處理
       resolved_msg: 舉報個案已被處理！
+      skip_to_actions: 跳到行動
       status: 狀態
-      target_domain: 被舉報帳號的域名
+      statuses: 被檢舉的內容
+      statuses_description_html: 違規內容將被引用在被檢舉帳號的通訊中
       target_origin: 被檢舉帳號來源
       title: 舉報
       unassign: 取消指派
       unresolved: 未處理
       updated_at: 更新
+      view_profile: 查看個人檔案
+    roles:
+      add_new: 新增身份
+      assigned_users:
+        other: "%{count} 個使用者"
+      categories:
+        administration: 管理
+        devops: DevOps
+        invites: 邀請
+        moderation: 審核
+        special: 特殊
+      delete: 刪除
+      description_html: 透過<strong>使用者身份</strong>，你可以自訂使用者可以存取 Mastodon 的哪些功能和區域。
+      edit: 編輯「%{name}」身份
+      everyone: 預設權限
+      everyone_full_description_html: 這是會影響所有<strong>使用者</strong>的<strong>基本身份</strong>，包括沒有被指派身份的使用者。所有身份都會繼承它的權限。
+      permissions_count:
+        other: "%{count} 個權限"
+      privileges:
+        administrator: 管理員
+        administrator_description: 擁有此權限的使用者將繞過所有權限
+        delete_user_data: 刪除使用者資料
+        delete_user_data_description: 允許使用者立即刪除其他使用者的資料
+        invite_users: 邀請使用者
+        invite_users_description: 允許使用者邀請新人加入伺服器
+        manage_announcements: 管理公告
+        manage_announcements_description: 允許使用者管理伺服器上的公告
+        manage_appeals: 管理申訴
+        manage_appeals_description: 允許使用者查看針對審核的申訴
+        manage_blocks: 管理封鎖
+        manage_blocks_description: 允許使用者封鎖電郵供應商和 IP 地址
+        manage_custom_emojis: 管理自訂表情符號
+        manage_custom_emojis_description: 允許使用者管理伺服器上的自訂表情符號
+        manage_federation: 管理跨站
+        manage_federation_description: 容許使用者封鎖或允許與其他網域跨站，並控制其傳遞能力
+        manage_invites: 管理邀請
+        manage_invites_description: 允許使用者瀏覽與停用邀請連結
+        manage_reports: 管理檢舉
+        manage_reports_description: 允許使用者查閱檢舉報告並對此執行審核動作
+        manage_roles: 管理身份
+        manage_roles_description: 允許使用者管理和指派低於他們自己的身份
+        manage_rules: 管理規則
+        manage_rules_description: 允許使用者變更伺服器規則
+        manage_settings: 管理設定
+        manage_settings_description: 允許使用者變更網站設定
+        manage_taxonomies: 管理分類
+        manage_taxonomies_description: 允許使用者審查熱門內容和更新標籤設定
+        manage_user_access: 管理使用者存取權
+        manage_user_access_description: 允許使用者禁用其他人的雙重認證，變更他們的電郵地址和重設密碼
+        manage_users: 管理使用者
+        manage_users_description: 允許使用者查看其他使用者的詳細資料，並對其進行審核動作
+        manage_webhooks: 管理 Webhooks
+        manage_webhooks_description: 允許使用者為管理事件設置 webhooks
+        view_audit_log: 查看審核日誌
+        view_audit_log_description: 允許使用者查看伺服器的管理動作歷史紀錄
+        view_dashboard: 查看儀表板
+        view_dashboard_description: 允許使用者存取儀表板及各種指標
+        view_devops: DevOps
+        view_devops_description: 允許使用者存取 Sidekiq 及 pgHero 儀表板
+      title: 身份
     rules:
       add_new: 新增規則
       delete: 刪除
@@ -560,142 +677,197 @@ zh-HK:
       empty: 尚未定義伺服器規則
       title: 伺服器守則
     settings:
-      activity_api_enabled:
-        desc_html: 本站的文章數量、活躍使用者數量、及每週新註冊使用者數量
-        title: 公佈使用者活躍度的統計數據
-      bootstrap_timeline_accounts:
-        desc_html: 以半形逗號分隔多個使用者名稱。只能加入來自本站且未開啟保護的帳號。如果留空，則默認關注本站所有管理員。
-        title: 新使用者預設關注的對像
-      contact_information:
-        email: 輸入一個公開的電郵地址
-        username: 輸入使用者名稱
-      custom_css:
-        desc_html: 透過 CSS 自訂每一頁的外觀
-        title: 自訂 CSS
+      about:
+        manage_rules: 管理伺服器規則
+        preamble: 提供有關如何運作、管理和資助伺服器的詳細資訊。
+        rules_hint: 這是有關你的使用者應遵守的規則的專區。
+        title: 關於
+      appearance:
+        preamble: 自訂 Mastodon 網頁介面。
+        title: 外觀
+      branding:
+        preamble: 你的伺服器的品牌使它與網絡上的其他伺服器區分開來。這些資訊可能會在各種情境下顯示，如 Mastodon 的網頁介面、原生應用程式，以及其他網站和通訊應用程式內的連結預覽等。因此，請盡量保持資訊簡短精煉。
+        title: 品牌
+      content_retention:
+        preamble: 控制使用者生成的內容如何儲存在 Mastodon。
+        title: 內容留存
       default_noindex:
-        desc_html: 影響所有未自行設定的帳號
-        title: 預設帳號不在搜尋引擎索引之內
+        desc_html: 影響所有未自行設定的用戶
+        title: 預設用戶不在搜尋引擎索引之內
+      discovery:
+        follow_recommendations: 追蹤建議
+        preamble: 呈現有趣的內容有助於吸引不認識 Mastodon 的使用者新手上路。控制各種探索功能在你的伺服器上的運作方式。
+        profile_directory: 個人檔案目錄
+        public_timelines: 公共時間軸
+        title: 探索
+        trends: 熱門
       domain_blocks:
         all: 給任何人
         disabled: 給沒有人
-        title: 顯示封鎖的網域
         users: 所有已登入的帳號
-      domain_blocks_rationale:
-        title: 顯示原因予
-      hero:
-        desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會默認為服務站縮圖
-        title: 主題圖片
-      mascot:
-        desc_html: 在不同頁面顯示。推薦最小 293×205px。如果留空，就會默認為伺服器縮圖。
-        title: 縮圖
-      peers_api_enabled:
-        desc_html: 現時本服務站在網絡中已發現的域名
-        title: 公開已知服務站的列表
-      preview_sensitive_media:
-        desc_html: 在其他頁面預覽的連結將會在敏感媒體的情況下顯示縮圖
-        title: 在 OpenGraph 預覽中顯示敏感媒體
-      profile_directory:
-        desc_html: 允許使用者被搜尋
-        title: 啟用個人資料目錄
       registrations:
-        closed_message:
-          desc_html: 當本站暫停接受註冊時，會顯示這個訊息。<br/> 可使用 HTML
-          title: 暫停註冊訊息
-        deletion:
-          desc_html: 允許所有人刪除自己的帳號
-          title: 容許刪除帳號
-        min_invite_role:
-          disabled: 沒有人
-          title: 允許發送邀請的身份
-        require_invite_text:
-          desc_html: 如果已設定為手動審核注冊，請把「加入的原因」設定為必填項目。
-          title: 要求新用戶填寫注冊申請
+        preamble: 控制誰可在你的伺服器上建立帳號。
+        title: 註冊
       registrations_mode:
         modes:
           approved: 註冊需要核准
           none: 沒有人可註冊
           open: 任何人皆能註冊
-        title: 註冊模式
-      show_known_fediverse_at_about_page:
-        desc_html: 如果停用，將會只在本站的歡迎頁顯示本站的文章。
-        title: 在訪客預覽本站的時間軸上，顯示跨站文章
-      show_staff_badge:
-        desc_html: 在個人資料頁上顯示工作人員標誌
-        title: 顯示工作人員標誌
-      site_description:
-        desc_html: 在首頁顯示，及在 meta 標籤使用作網站介紹。<br/> 你可以在此使用 <code>&lt;a&gt;</code> 和 <code>&lt;em&gt;</code> 等 HTML 標籤。
-        title: 本站介紹
-      site_description_extended:
-        desc_html: 本站詳細資訊頁的內文<br/>你可以在此使用 HTML
-        title: 本站詳細資訊
-      site_short_description:
-        desc_html: 顯示在側邊欄和網頁標籤(meta tags)。以一句話描述Mastodon是甚麼，有甚麼令這個伺服器脫\U000294D9而出。
-        title: 伺服器短描述
-      site_terms:
-        desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
-        title: 自訂使用條款
-      site_title: 本站名稱
-      thumbnail:
-        desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
-        title: 本站縮圖
-      timeline_preview:
-        desc_html: 在主頁顯示本站時間軸
-        title: 時間軸預覽
-      title: 網站設定
-      trendable_by_default:
-        desc_html: 影響之前並未禁止的標籤
-        title: 容許標籤不需要審核來成為今期流行
-      trends:
-        desc_html: 公開地顯示已審核的標籤為今期流行
-        title: 趨勢主題標籤
+      title: 伺服器設定
     site_uploads:
       delete: 刪除上傳的檔案
       destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
+      account: 作者
+      application: 應用程式
       back_to_account: 返回帳戶信息頁
+      back_to_report: 返回檢舉頁面
       batch:
-        delete: 刪除
-        nsfw_off: 取消 NSFW 標記
-        nsfw_on: 添加 NSFW 標記
+        remove_from_report: 從檢舉中移除
+        report: 檢舉
       deleted: 已刪除
-      failed_to_execute: 執行失敗
+      favourites: 最愛
+      history: 版本紀錄
+      in_reply_to: 正在回覆
+      language: 語言
       media:
         title: 媒體檔案
-      no_media: 不含媒體檔案
+      metadata: Metadata
       no_status_selected: 因未選擇嘟文而未變更。
+      open: 公開帖文
+      original_status: 原始帖文
+      reblogs: 轉發
+      status_changed: 帖文已變更
       title: 帳戶文章
+      trending: 熱門
+      visibility: 可見性
       with_media: 含有媒體檔案
+    strikes:
+      actions:
+        delete_statuses: "%{name} 刪除了 %{target} 的帖文"
+        disable: "%{name} 停用了 %{target} 的帳號"
+        mark_statuses_as_sensitive: "%{name} 標記 %{target} 的帖文為敏感內容"
+        none: "%{name} 向 %{target} 發出警告"
+        sensitive: "%{name} 將 %{target} 的帳號標記為敏感內容"
+        silence: "%{name} 限制了 %{target} 的帳號"
+        suspend: "%{name} 將 %{target} 的帳號停權"
+      appeal_approved: 已申訴
+      appeal_pending: 申訴待審中
     system_checks:
       database_schema_check:
         message_html: 有待處理的資料庫轉移 (database migration) 。請執行以確保應用程式行為合乎預期
+      elasticsearch_running_check:
+        message_html: 無法連接到 Elasticsearch。請檢查它是否運行中，或停用全文搜索。
+      elasticsearch_version_check:
+        message_html: 不相容的 Elasticsearch 版本：%{value}
+        version_comparison: 正在運行 Elasticsearch 版本 %{running_version}，需要版本 %{required_version} 。
       rules_check:
         action: 管理伺服器規則
         message_html: 您尚未定義任何伺服器規則
       sidekiq_process_check:
         message_html: 沒有 %{value} 佇列的 Sidekiq 處理程序。請檢查 Sidekiq 設定檔案
     tags:
-      accounts_today: 今日特殊使用
-      accounts_week: 今週特殊使用
-      breakdown: 根據來源剖析是日用量
-      last_active: 上次活躍
-      most_popular: 最熱門
-      most_recent: 最近
-      name: 主題標籤
       review: 審核文章
-      reviewed: 已審核
-      title: 主題標籤
-      trending_right_now: 最新趨勢
-      unique_uses_today: 今天嘟了 %{count} 則
-      unreviewed: 未審核
       updated_msg: 成功更新主題標籤設定
     title: 管理
+    trends:
+      allow: 允許
+      approved: 批准
+      disallow: 不允許
+      links:
+        allow: 允許連結
+        allow_provider: 允許發佈者
+        description_html: 這些是你目前的伺服器中，帳號帖文大量分享的連結。它幫助你的使用者發掘世界上正在發生的事情。在你核准發佈者之前，連結不會公開顯示。你也可以核准或駁回個別的連結。
+        disallow: 不允許連結
+        disallow_provider: 不允許發佈者
+        no_link_selected: 未選取任何連結，因此並未變更
+        publishers:
+          no_publisher_selected: 未選取任何發佈者，因此並未變更
+        shared_by_over_week:
+          other: 上週有 %{count} 人分享
+        title: 熱門連結
+        usage_comparison: 今天被分享了 %{today} 次，相較於昨天 %{yesterday} 次
+      only_allowed: 僅允許
+      pending_review: 等待審核中
+      preview_card_providers:
+        allowed: 此發佈者的連結能登上熱門
+        description_html: 這些是經常在你的伺服器上分享連結的網域。除非對應網域獲得核准，否則連結不會公開在熱門中。你的核准 (或駁回) 將適用於子網域。
+        rejected: 此發佈者的連結不會登上熱門
+        title: 發佈者
+      rejected: 被拒絕
+      statuses:
+        allow: 允許帖文
+        allow_account: 允許作者
+        description_html: 這些是在你的伺服器上已知被大量分享和加入到最愛的帖文。它幫助你的新和老用戶找到更多人去追蹤。在你批准作者，而且作者允許將他們的帳號推薦給他人之前，帖文不會公開顯示。你也可以核准或駁回個別帖子。
+        disallow: 不允許帖文
+        disallow_account: 不允許作者
+        no_status_selected: 未選取任何熱門帖文，因此並未變更
+        not_discoverable: 作者選擇不被發現
+        shared_by:
+          other: 分享或加入最愛 %{friendly_count} 次
+        title: 熱門帖文
+      tags:
+        current_score: 目前 %{score} 分
+        dashboard:
+          tag_accounts_measure: 不重複使用
+          tag_languages_dimension: 熱門語言
+          tag_servers_dimension: 熱門伺服器
+          tag_servers_measure: 不同伺服器
+          tag_uses_measure: 總使用
+        description_html: 這些是當前伺服器的大量帖文中出現的標籤。它可以幫助你的使用者發掘目前討論最多的話題。在你批准之前，標籤不會公開顯示。
+        listable: 可被推薦
+        no_tag_selected: 未選取任何標籤，因此並未變更
+        not_listable: 不會被推薦
+        not_trendable: 不會登上熱門
+        not_usable: 不可使用
+        peaked_on_and_decaying: 在 %{date} 達到高峰，目前正在回落
+        title: 熱門標籤
+        trendable: 可登上熱門
+        trending_rank: '熱門 #%{rank}'
+        usable: 可用
+        usage_comparison: 今天被使用了 %{today} 次，相較於昨天 %{yesterday} 次
+        used_by_over_week:
+          other: 上週有 %{count} 人使用
+      title: 熱門
+      trending: 熱門
     warning_presets:
       add_new: 新增
       delete: 刪除
       edit_preset: 設定警告預設
       empty: 您尚未定義任何預設警告
       title: 管理警告預設
+    webhooks:
+      add_new: 新增端點
+      delete: 刪除
+      description_html: "<strong>Webhook</strong> 讓 Mastodon 將有關所選事件的<strong>實時通知</strong>推送到你自己的應用程式，如此應用程式便可以<strong>自動觸發反應</strong>。"
+      disable: 停用
+      disabled: 已停用
+      edit: 編輯端點
+      empty: 你尚未設置 webhook 端點。
+      enable: 啟用
+      enabled: 活躍
+      enabled_events:
+        other: "%{count} 件已啟用的事件"
+      events: 事件
+      new: 新增 webhook
+      rotate_secret: 轉換密鑰
+      secret: 簽署密鑰
+      status: 狀態
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: 刪除他們的帖文
+        disable: 凍結他們的帳號
+        mark_statuses_as_sensitive: 標記他們的帖文為敏感內容
+        none: 警告
+        sensitive: 標記他們的帳號為敏感內容
+        silence: 限制他們的帳號
+        suspend: 停用他們的帳號
+      body: "%{target} 對 %{action_taken_by} 於 %{date} 做出的 %{type} 審核裁決提出申訴。他們寫道："
+      next_steps: 您可以批准此申訴以撤銷審核裁決，又或者忽略它。
+      subject: "%{username} 對 %{instance} 上的審核裁決提出申訴"
     new_pending_account:
       body: 以下是新帳戶的資訊。你可以審核這項申請。
       subject: 在 %{instance} 上未審核的新用戶(%{username})
@@ -703,9 +875,17 @@ zh-HK:
       body: "%{reporter} 舉報了 %{target}"
       body_remote: 來自 %{domain} 的人舉報了 %{target}
       subject: 針對 %{instance} 的舉報（#%{id}）
-    new_trending_tag:
-      body: '今天流行使用未被審核的 #%{name} 主題標籤。在你允許之前，它不會被公開地顯示，你亦可以無視它使它不再污染你的眼睛。'
-      subject: 在 %{instance} 上未審核的主題標籤 (%{name})
+    new_trends:
+      body: 以下項目需要經過審核才能公開顯示：
+      new_trending_links:
+        title: 熱門連結
+      new_trending_statuses:
+        title: 熱門帖文
+      new_trending_tags:
+        no_approved_tags: 目前沒有經核准的熱門標籤。
+        requirements: '任何一個候選都可能超過 #%{rank} 被核准的標籤。目前是 %{lowest_tag_name} 標籤，得分為 %{lowest_tag_score}。'
+        title: 熱門標籤
+      subject: "%{instance} 上有待審核的新熱門"
   aliases:
     add_new: 建立別名 (Alias)
     created_msg: 成功建立別名 (alias)。你可以從舊帳號開始轉移。
@@ -735,16 +915,13 @@ zh-HK:
   applications:
     created: 已建立應用程式
     destroyed: 已刪除應用程式
-    invalid_url: 所提供的網址不正確
     regenerate_token: 重設 token
     token_regenerated: 已重設 token
     warning: 警告，不要把它分享給任何人！
     your_token: token
   auth:
-    apply_for_account: 請求邀請
+    apply_for_account: 申請帳號
     change_password: 密碼
-    checkbox_agreement_html: 我同意 <a href="%{rules_path}" target="_blank">的伺服器規則</a> 和<a href="%{terms_path}" target="_blank">服務條款</a>
-    checkbox_agreement_without_rules_html: 我同意 <a href="%{terms_path}" target="_blank">服務條款</a>
     delete_account: 刪除帳號
     delete_account_html: 如果你想刪除你的帳號，請<a href="%{path}">點擊這裡繼續</a>。你需要確認你的操作。
     description:
@@ -757,11 +934,13 @@ zh-HK:
     invalid_reset_password_token: 密碼重置 token 無效或已過期。請重新重設密碼。
     link_to_otp: 請輸入兩步䮕認證碼或恢復碼
     link_to_webauth: 使用你的安全密鑰裝置
+    log_in_with: 登入時使用
     login: 登入
     logout: 登出
     migrate_account: 轉移到另一個帳號
     migrate_account_html: 想要將這個帳號指向另一個帳號可<a href="%{path}">到這裡設定</a>。
     or_log_in_with: 或登入於
+    privacy_policy_agreement_html: 我已閱讀且同意<a href="%{privacy_policy_path}" target="_blank">私隱政策</a>
     providers:
       cas: CAS
       saml: SAML
@@ -769,20 +948,29 @@ zh-HK:
     registration_closed: "%{instance} 並不接受新成員請求"
     resend_confirmation: 重發確認指示電郵
     reset_password: 重設密碼
+    rules:
+      preamble: 這些是由 %{domain} 管理員制訂和執行的。
+      title: 一些基本規則。
     security: 登入資訊
     set_new_password: 設定新密碼
     setup:
       email_below_hint_html: 如果下面的電郵地址不正確，你可在此修改，然後接收電郵進行確認。
       email_settings_hint_html: 確認電郵已發送至 %{email}。電郵地址不正確的話，你可以在帳戶設置中進行更改。
       title: 設定
+    sign_in:
+      preamble_html: 請使用 <strong>%{domain}</strong> 的資料登入。如果您的帳戶託管在其他的伺服器，您將無法在此登入。
+      title: 登入 %{domain}
+    sign_up:
+      preamble: 有了這個 Mastodon 伺服器的帳號，無論將帳號託管在何處，你都可以追蹤網絡上任何人。
+      title: 讓我為你在 %{domain} 上設定好。
     status:
       account_status: 帳戶文章
       confirming: 正在等待確認電郵地址。
-      functional: 你的帳戶可以正常使用。
+      functional: 你的帳號已完全投入使用。
       pending: 管理員正在處理你的申請。可能會需要一點時間處理。我們將會在申請被批準的時候馬上寄電郵給你。
       redirecting_to: 你的帳戶因為正在重新定向到 %{acct}，所以暫時被停用。
+      view_strikes: 查看針對你的帳戶的過往警告
     too_fast: 你太快遞交了，請再試一次。
-    trouble_logging_in: 不能登入？
     use_security_key: 使用安全密鑰裝置
   authorize_follow:
     already_following: 你已經關注了這個帳號
@@ -837,13 +1025,39 @@ zh-HK:
       email_contact_html: 如果仍然沒有送達，你可以通過電子郵件發送到<a href="mailto:%{email}">%{email}</a>以獲得協助
       email_reconfirmation_html: 如果你沒有收到確認電郵，你可以<a href="%{path}">要求再次發送它</a>
       irreversible: 你將無法重啟你的帳戶
-      more_details_html: 請參見<a href="%{terms_path}">隱私政策</a>以瀏覽細節。
+      more_details_html: 請參見<a href="%{terms_path}">私隱政策</a>以瀏覽細節。
       username_available: 你的登入名稱將可被其他人使用
       username_unavailable: 你的登入名稱將不能讓其他人使用
-  directories:
-    directory: 個人資料目錄
-    explanation: 根據興趣認識新朋友
-    explore_mastodon: 探索%{title}
+  disputes:
+    strikes:
+      action_taken: 已採取行動
+      appeal: 申訴
+      appeal_approved: 該警告已被成功申訴，不再有效
+      appeal_rejected: 申訴已被駁回
+      appeal_submitted_at: 已提交申訴
+      appealed_msg: 已提交你的申訴。一旦申訴獲得批准，你將收到通知。
+      appeals:
+        submit: 提交申訴
+      approve_appeal: 批准申訴
+      associated_report: 相關檢舉
+      created_at: 日期
+      description_html: 這些是 %{instance} 工作人員針對你的帳號採取的行動和向你發出的警告。
+      recipient: 發送至
+      reject_appeal: 駁回申訴
+      status: '帖文 #%{id}'
+      status_removed: 帖文已從系統中刪除
+      title: "%{action} 於 %{date}"
+      title_actions:
+        delete_statuses: 移除帖文
+        disable: 帳號凍結
+        mark_statuses_as_sensitive: 標記帖文為敏感內容
+        none: 警告
+        sensitive: 標記帳號為敏感內容
+        silence: 帳號限制
+        suspend: 帳號停用
+      your_appeal_approved: 你的申訴已獲批准
+      your_appeal_pending: 你已提交申訴
+      your_appeal_rejected: 你的申訴已被駁回
   domain_validator:
     invalid_domain: 不是一個可用域名
   errors:
@@ -892,55 +1106,62 @@ zh-HK:
       public: 公共時間軸
       thread: 對話
     edit:
+      add_keyword: 加入關鍵字
+      keywords: 關鍵字
+      statuses: 個別帖文
+      statuses_hint_html: 此篩選器會套用至所選的個別帖文，不論它符合下列的關鍵字與否。<a href="%{path}">查看或移除篩選器中的帖文</a>。
       title: 編輯篩選器
     errors:
+      deprecated_api_multiple_keywords: 無法從此應用程式更改這些參數，因為參數適用於多個篩選器關鍵字。請使用較新的應用程式或網頁介面。
       invalid_context: 沒有提供內文或內文無效
-      invalid_irreversible: 不可逆的篩選器只適用放主頁或通知頁面
     index:
+      contexts: "%{contexts} 中的篩選器"
       delete: 刪除
       empty: 你沒有過濾器。
+      expires_in: 於 %{distance} 過期
+      expires_on: 於 %{date} 到期
+      keywords:
+        other: "%{count} 個關鍵字"
+      statuses:
+        other: "%{count} 則帖文"
+      statuses_long:
+        other: "%{count} 則個別隱藏的帖文"
       title: 篩選
     new:
+      save: 儲存新篩選器
       title: 新增篩選器
+    statuses:
+      back_to_filter: 返回篩選器
+      batch:
+        remove: 從篩選器移除
+      index:
+        hint: 不管其他條件如何，此篩選器會套用於所選的個別帖文。你可以在網頁介面上加入更多帖文到此篩選器。
+        title: 篩選帖文
   footer:
-    developers: 開發者
-    more: 更多......
-    resources: 項目
     trending_now: 今期流行
   generic:
     all: 全部
+    all_items_on_page_selected_html:
+      other: 已選取此頁面上的 <strong>%{count}</strong> 個項目。
+    all_matching_items_selected_html:
+      other: 已選取符合你搜尋的 <strong>%{count}</strong> 個項目。
     changes_saved_msg: 已成功儲存修改。
     copy: 複製
     delete: 刪除
-    no_batch_actions_available: 此頁目沒有可用的批次操作
+    deselect: 取消全選
+    none: 無
     order_by: 排序
     save_changes: 儲存修改
+    select_all_matching_items:
+      other: 選取 %{count} 個符合你搜尋的項目。
+    today: 今天
     validation_errors:
       other: 提交的資料有 %{count} 項問題
   html_validator:
     invalid_markup: 含有無效的HTML標記：%{error}
-  identity_proofs:
-    active: 活躍
-    authorize: 是的，請授權
-    authorize_connection_prompt: 授權此加密通訊？
-    errors:
-      failed: 加密通訊失敗。請在%{provider} 重試。
-      keybase:
-        invalid_token: Keybase tokens必定為66個16位元字符的簽名檔散列。
-        verification_failed: Keybase不能識別此令牌為Keybase用戶%{kb_username} 的簽名。請在Keybase再試一次。
-      wrong_user: 未能以%{current} 為 %{proving} 建立身份驗證。請登入為%{proving} 再試一次。
-    explanation_html: 在此你連結其他網路平台（如 Keybase）上的加密身份。讓其他人可以在那些平台上，傳送加密信息給你，並驗證你的身份。
-    i_am_html: 我是 %{service} 上的 %{username}
-    identity: 身份
-    inactive: 停用
-    publicize_checkbox: 發表文章：
-    publicize_toot: 驗證成功！我在%{service} 是%{username} ：%{url}
-    remove: 刪除帳號的驗證
-    removed: 成功刪除身份驗證
-    status: 確認狀態
-    view_proof: 查看證明
   imports:
     errors:
+      invalid_csv_file: 無效的 CSV 檔案。錯誤：%{error}
       over_rows_processing_limit: 包含超過 %{count} 行
     modes:
       merge: 合併
@@ -956,7 +1177,6 @@ zh-HK:
       following: 你所關注的用戶名單
       muting: 靜音名單
     upload: 上載
-  in_memoriam_html: 謹此悼念。
   invites:
     delete: 停用
     expired: 已失效
@@ -1034,16 +1254,14 @@ zh-HK:
     carry_blocks_over_text: 此用戶從%{acct} 轉移，該帳號已被你封鎖。
     carry_mutes_over_text: 此用戶從%{acct} 轉移，該帳號已被你靜音。
     copy_account_note_text: 此用戶從%{acct} 轉移，這是你之前在該帳號留下的備注：
+  navigation:
+    toggle_menu: 切換選單
   notification_mailer:
-    digest:
-      action: 查看所有通知
-      body: 這是自從你在%{since}使用以後，你錯失了的訊息︰
-      mention: "%{name} 在此提及了你︰"
-      new_followers_summary:
-        other: 你新獲得了 %{count} 位關注者了！好厲害！
-      subject:
-        other: "自從上次登入以來，你收到 %{count} 則新的通知 \U0001F418"
-      title: 在你不在的這段時間……
+    admin:
+      report:
+        subject: "%{name} 提交了檢舉"
+      sign_up:
+        subject: "%{name} 已註冊"
     favourite:
       body: 你的文章被 %{name} 喜愛：
       subject: "%{name} 喜歡你的文章"
@@ -1070,6 +1288,8 @@ zh-HK:
       title: 新的轉推
     status:
       subject: "%{name} 剛發表了文章"
+    update:
+      subject: "%{name} 編輯了帖文"
   notifications:
     email_events: 電郵通知活動
     email_events_hint: 選擇你想接收通知的活動：
@@ -1113,6 +1333,8 @@ zh-HK:
     other: 其他
     posting_defaults: 發佈預設值
     public_timelines: 公共時間軸
+  privacy_policy:
+    title: 私隱政策
   reactions:
     errors:
       limit_reached: 已達到可以給予反應極限
@@ -1135,22 +1357,15 @@ zh-HK:
     remove_selected_follows: 取消關注所選用戶
     status: 帳戶帖文
   remote_follow:
-    acct: 請輸入你想使用的「使用者名稱@域名」身份
     missing_resource: 無法找到你用戶的轉接網址
-    no_account_html: 沒有帳號？你可以<a href='%{sign_up_path}' target='_blank'>在這裏註冊</a>
-    proceed: 下一步
-    prompt: 你希望關注︰
-    reason_html: "<strong>為甚麼有必要做這個步驟？</strong>因為<code>%{instance}</code>未必是你註冊的伺服器，所以我們首先需要將你帶回你的伺服器。"
-  remote_interaction:
-    favourite:
-      proceed: 下一步
-      prompt: 你要求把這篇文章加入最愛：
-    reblog:
-      proceed: 繼續轉嘟
-      prompt: 你想轉推：
-    reply:
-      proceed: 下一步
-      prompt: 你想回覆：
+  reports:
+    errors:
+      invalid_rules: 未引用有效的規則
+  rss:
+    content_warning: 內容警告：
+    descriptions:
+      account: 來自 @%{acct} 的公開帖文
+      tag: "#%{hashtag} 標籤的公開帖文"
   scheduled_statuses:
     over_daily_limit: 你已經超越了當天排定發文的限額 (%{limit})
     over_total_limit: 你已經超越了排定發文的限額 (%{limit})
@@ -1160,7 +1375,7 @@ zh-HK:
     browser: 瀏覽器
     browsers:
       alipay: 支付寶
-      blackberry: 黑莓機
+      blackberry: BlackBerry
       chrome: Chrome 瀏覽器
       edge: Microsoft Edge 瀏覽器
       electron: Electron 瀏覽器
@@ -1174,7 +1389,7 @@ zh-HK:
       phantom_js: PhantomJS 瀏覽器
       qq: QQ瀏覽器
       safari: Safari 瀏覽器
-      uc_browser: UC瀏覽器
+      uc_browser: UC 瀏覽器
       weibo: 新浪微博
     current_session: 目前的作業階段
     description: "%{platform} 上的 %{browser}"
@@ -1183,7 +1398,7 @@ zh-HK:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
@@ -1209,7 +1424,6 @@ zh-HK:
     edit_profile: 修改個人資料
     export: 匯出
     featured_tags: 推薦的標籤
-    identity_proofs: 身份驗證
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
@@ -1218,6 +1432,7 @@ zh-HK:
     profile: 個人資料
     relationships: 關注及追隨者
     statuses_cleanup: 自動嘟文刪除
+    strikes: 審核警告
     two_factor_authentication: 雙重認證
     webauthn_authentication: 安全鑰匙
   statuses:
@@ -1231,17 +1446,18 @@ zh-HK:
         other: "%{count} 段影片"
     boosted_from_html: 轉推自 %{acct_link}
     content_warning: 內容警告： %{warning}
+    default_language: 與介面語言相同
     disallowed_hashtags:
       other: 包含不允許的標籤： %{tags}
+    edited_at_html: 編輯於 %{date}
     errors:
       in_reply_not_found: 你所回覆的嘟文並不存在。
-    language_detection: 自動偵測語言
     open_in_web: 開啟網頁
     over_character_limit: 超過了 %{max} 字的限制
     pin_errors:
+      direct: 無法將只有被提及使用者可見的帖文置頂
       limit: 你所置頂的文章數量已經達到上限
       ownership: 不能置頂他人的文章
-      private: 不能置頂非公開的文章
       reblog: 不能置頂轉推
     poll:
       total_people:
@@ -1290,6 +1506,7 @@ zh-HK:
       '2629746': 1 個月
       '31556952': 1 年
       '5259492': 2 個月
+      '604800': 一週
       '63113904': 2 年
       '7889238': 3 個月
     min_age_label: 按時間篩選
@@ -1301,91 +1518,11 @@ zh-HK:
     pinned: 置頂文章
     reblogged: 轉推
     sensitive_content: 敏感內容
+  strikes:
+    errors:
+      too_late: 對此次警告提出申訴已經太遲
   tags:
     does_not_match_previous_name: 和舊有名稱並不符合
-  terms:
-    body_html: |
-      <h2>隱私權政策</h2>
-      <h3 id="collect">我們蒐集甚麼資訊？</h3>
-
-      <ul>
-      <li><em>基本帳戶資訊</em>：如果您在此服務器上註冊，我們可能會要求您輸入用戶名、電子郵件地址和密碼。 您還可以輸入其他個人資料信息（例如顯示名稱和自我簡介），並上傳個人資料圖片和標題圖片。 用戶名、顯示名稱、自我簡介、個人資料圖片和標題圖片會持續公開。</li>
-      <li><em>帖文，關注和其他公共信息</em>：您的關注和追隨者名單為公開資訊。 在發佈帖文時，我們將會存儲日期和時間，以及您用以發佈帖文的應用程序。 帖文可能包含多媒體附件，例如圖片和視頻。 公開和非公開(unlisted)的帖文為公開資訊。 您在個人資料上推薦的帖文時也是公開的資訊。 您的追隨者會收到你的帖文，在某些情況下，它們有可能會在不同的服務器互相傳遞並將儲存副本。 您刪除帖文時亦同樣會傳遞給您的追隨者。 轉發或收藏其他帖文的操作始終是公開的。</li>
-      <li><em>私訊和追隨者限定的帖文</em>：所有的帖子都在服務器上被儲存和處理。 追隨者限定的帖文將傳遞給您的追隨者和其中提及的用家，而私訊僅會傳遞給其中提及的用戶。 在某些情況下，它們有可能會在不同的服務器互相傳遞並將儲存副本。 我們將努力地將訪問權限制為僅授權人員，但其他服務器可能無法這樣做。 因此，請檢查您的追隨者所屬的服務器。 您可以在設置中選擇手動批准和拒絕新追隨者。<em>請記住，服務器和任何接收服務器的操作員都可以查看此類消息</em>，並且收件人可以截屏，複製或以其他方式重新分享。 <em>請勿在Mastodon上分享任何危險信息。</em> </li>
-      <li> <em> IP和其他元數據</em>：登錄時，我們會記錄您登錄時使用的IP位址以及瀏覽器應用程序的名稱。 您可以在設置中查看和撤消所有已登錄的作業階段。 最新上傳的IP位址最多可以儲存12個月。 我們還可能保留服務器日誌，其中包括對我們服務器的每個請求的IP地位。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">您的資訊將會被用在甚麼用途？</h3>
-
-      <p>我們從您那裡收集的任何資訊都可能通過以下方式使用：</p>
-
-      <ul>
-      <li>提供Mastodon的核心功能：您只可以在登錄後與其他人的內容交流並發佈自己的內容。例如，您可以追隨其他人以在自己的個人化主頁中查看他們的帖文。</li>
-      <li>社區管理：例如將您的IP位址與其他已知的IP位址進行比較來鑑定逃避封鎖或其他侵權行為。</li>
-      <li>您的電郵地址：可能會被用於向您發送信息，有關其他人與您互動或向您發送消息的通知，並用於答複查詢和/或其他請求或問題。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">我們如何保護您的資訊？</h3>
-
-      <p>當您輸入，提交或訪問您的個人信息時，我們會採取各種安全措施來維護您的個人信息的安全。 除其他事項外，您的瀏覽器作業階段以及應用程序和API之間的流量均使用SSL進行保護。您的密碼也會以強大的單向算法進行散列處理。 您亦可以啟用多重驗證，以進一步安全地訪問您的帳戶。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">我們的數據保留政策</h3>
-
-      <p>我們會致力：</p>
-
-      <ul>
-      <li>保留包含對該服務器所有請求的IP位址的服務器日誌，而保留時間將不會超過90天。</li>
-      <li>保留與註冊用戶關聯的IP位址不超過12個月。</li>
-      </ul>
-
-      <p>您可以請求並下載您的內容備份，包括您的帖文，媒體附件，個人資料圖片和標題圖片。</p>
-
-      <p>您亦可以隨時不可逆地刪除您的帳戶。</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">我們使用cookies嗎？</h3>
-
-      <p>是。 Cookies是站點或其服務提供商通過Web瀏覽器（如果允許）傳輸到計算機硬盤的小文件。 這些cookies使站點能夠識別您的瀏覽器，並且如果您已經擁有註冊帳戶，會連結至您的註冊帳戶。</p>
-
-      <p>我們使用Cookie來了解並保存您的偏好，以供將來訪問。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">我們會否透露任何信息給第三方機構？</h3>
-
-      <p>我們不會將您的個人身份信息出售，交易或以其他方式轉讓給第三方。 這不包括同意對這些信息保密的運營方，和我們開展業務或為您提供服務的受信任的第三方。我們或會在基於對法律的尊重，或在執行我們的網站政策或保護我們或其他人的權利、財產或安全時釋出你的個人資料。</p>
-
-      <p>您的公開內容可能會被網絡中的其他服務器下載。 只要這些追隨者或收件人位於與之不同的服務器上，您的公開帖文和追隨者限定帖文將傳遞到您的追隨者所在的服務器，而私信將傳遞給收件人的服務器。</p>
-
-      <p>當您授權應用程序使用您的帳戶時，根據您批准的權限範圍，它可能會訪問您的公開資訊，您的關注列表，您的關注者，您的列表，所有帖文以及您的收藏夾。 應用程序永遠無法取得您的電子郵件地址或密碼。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">兒童在網站的應用</h3>
-
-      <p>如果此服務器位於歐盟或EEA中：我們的網站，產品和服務只為16歲或以上的人提供服務。 如果您未滿16歲，請按照GDPR的要求 (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">歐盟一般資料保護規範</a>)不使用此網站。</p>
-
-      <p>如果此服務器位於美國：我們的網站，產品和服務只為13歲或以上的人提供服務。 如果您未滿13歲，請按照COPPA的要求 (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">兒童在線隱私權保護法</a>)不使用此網站。</p>
-
-      <p>在其他管轄區內，法律要求可能會有所不同。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">隱私權政策更改</h3>
-
-      <p>請根據英文版本所準，此中文版本只為英文版隱私政策的翻譯版本</p>
-
-      <p>此文件以 CC-BY-SA 授權。英文版本的發佈日期為2018年3月7日。此中文翻譯的翻譯日期為2020年11月28日。</p>
-
-      <p>最初改編自 <a href="https://github.com/discourse/discourse">Discourse的隱私權政策</a>.</p>
-    title: "%{instance} 使用條款和隱私權政策"
   themes:
     contrast: 高對比
     default: 萬象
@@ -1394,6 +1531,7 @@ zh-HK:
     formats:
       default: "%Y年%-m月%d日 %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: 新增
     disable: 停用
@@ -1410,63 +1548,73 @@ zh-HK:
     recovery_instructions_html: 如果你遺失了安裝認證器的裝置（如︰你的電話），你可以使用備用驗證碼進行登入。請確保將備用驗證碼收藏穩當，（如列印出來，和你其他重要文件一起存放）。
     webauthn: 安全密鑰
   user_mailer:
+    appeal_approved:
+      action: 前往你的帳號
+      explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已獲得批准。你的帳號再次回到良好狀態。
+      subject: 你在 %{date} 提出的申訴已獲批准
+      title: 申訴已批准
+    appeal_rejected:
+      explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已被駁回。
+      subject: 你在 %{date} 提出的申訴已被駁回
+      title: 申訴被駁回
     backup_ready:
       explanation: 你要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載。
       subject: 你的備份檔已可供下載
       title: 檔案匯出
-    sign_in_token:
-      details: 這是嘗試的詳細資訊
-      explanation: 我們發現有人嘗試以未使用過的 IP 位址登入到你的帳號。 如果這個登入的人是你，請在「登入請求」頁面上輸入以下安全代碼：
-      further_actions: 如果這不是你，請到這裏更改你的密碼，並啟用雙重認證：
-      subject: 請確認登入請求
-      title: 登入請求
+    suspicious_sign_in:
+      change_password: 更改你的密碼
+      details: 以下是登入的細節：
+      explanation: 我們偵測到有新的 IP 地址登入你的帳號。
+      further_actions_html: 如果這不是你，我們建議你立即 %{action} 並啟用雙重認證，以確保帳號安全。
+      subject: 你的帳號被一個新的 IP 地址存取
+      title: 新登入
     warning:
+      appeal: 提交申訴
+      appeal_description: 如果你認為這個有誤，你可以向 %{instance} 的工作人員提出申訴。
+      categories:
+        spam: 垃圾訊息
+        violation: 內容違反下列的社群守則
       explanation:
-        disable: 你不能以任何方式登入或使用你的帳號，但你的個人資料頁面和其他資料仍保持完整。
-        sensitive: 你上載的媒體檔案和連結媒體將被標記為敏感項目。
-        silence: 你仍然可以使用你的帳號，但只有你現時的追隨者會看見你在此伺服器的嘟文。你或從公開名冊中被剔除。但是其他人仍然可以主動關注你。
-        suspend: 你將不能使用您的帳號，你的個人資料頁面及其他資料將不能再被取得。你仍可在資料被完全刪除前請求下載你的數據，但我們仍會保留一部份資料，以防止有人規避停權處罰。
-      get_in_touch: 你可以回覆此電郵來跟我們(%{instance})聯絡
-      review_server_policies: 審視伺服器政策
-      statuses: 特別是：
+        delete_statuses: 你有些帖文被發現違反了一條或多條社群守則，並已被 %{instance} 的管理員刪除。
+        disable: 你無法再使用你的帳號，但你的個人檔案和其他資料仍然完整。你可以要求取得你的資料的備份，更改帳號設定或刪除你的帳號。
+        mark_statuses_as_sensitive: 你有些帖文已被 %{instance} 的管理員標記為敏感內容。這表示帖文上的媒體需要點擊才可預覽。日後你可以在發帖文時自行將媒體標記為敏感內容。
+        sensitive: 從今開始，你上傳的所有媒體檔案將被標記為敏感內容並隱藏，須點擊警告後方可查看。
+        silence: 你仍然可以使用你的帳號，但只有你的追蹤者方可看見你在此伺服器上的帖文，你亦可能會被排除在各種探索功能之外，但其他人仍然可以手動追蹤你。
+        suspend: 你不能再使用你的帳號及存取你的個人檔案和其他資料。你仍然可以登入並要求取得資料備份，直至資料在大約 30 天內被完全刪除為止，但我們將保留部份基本資料，以防止你規避處罰。
+      reason: 原因：
+      statuses: 引用帖文：
       subject:
+        delete_statuses: 你在 %{acct} 的帖文已被移除
         disable: 你的帳號 %{acct} 已經被涷結
+        mark_statuses_as_sensitive: 你在 %{acct} 的帖文已被標記為敏感內容
         none: 警告帳號%{acct}
-        sensitive: 你的帳號 %{acct} 的媒體已被標記為敏感內容
+        sensitive: 從今開始，你在 %{acct} 的帖文將被標記為敏感內容
         silence: 你的帳號 %{acct} 已經被限制
         suspend: 你的帳號 %{acct} 已經被停權
       title:
+        delete_statuses: 已移除帖文
         disable: 帳號涷結
+        mark_statuses_as_sensitive: 標記為敏感內容的帖文
         none: 警告
-        sensitive: 你的媒體已被標記為敏感內容
+        sensitive: 標記為敏感內容的帳號
         silence: 賬戶已被限制
         suspend: 帳號已停用
     welcome:
       edit_profile_action: 設定個人資料
-      edit_profile_step: 你可以設定你的個人資料，包括上傳頭像、橫幅圖片、更改顯示名稱等等。如果你想在新的關注者關注你之前對他們進行審核，你也可以選擇為你的帳戶設為「私人」。
+      edit_profile_step: 你可以透過上傳頭像、更改顯示名稱等來自訂個人檔案。你可以選擇讓新使用者追蹤你之前先審查他們。
       explanation: 下面是幾個小貼士，希望它們能幫到你
       final_action: 開始發文
-      final_step: '開始發文吧！即使你現在沒有關注者，其他人仍然能在本站時間軸或者話題標籤等地方看到你的公開文章。試著用 #introductions 這個話題標籤介紹一下自己吧。'
+      final_step: '開始發文吧！即使你沒有追蹤者，其他人仍然能在本站時間軸或標籤等地方，看到你的公開帖文。試着用 #introductions 標籤來介紹自己吧。'
       full_handle: 你的完整 Mastodon 地址
       full_handle_hint: 這訊息將顯示給你朋友們，讓他們能從另一個服務站發信息給你，或者關注你的。
-      review_preferences_action: 更改偏好設定
-      review_preferences_step: 記得調整你的偏好設定，比如你想接收什麼類型的郵件，或者你想把你的文章可見範圍默認設定為什麼級別。如果你沒有暈車的話，考慮一下啟用「自動播放 GIF 動畫」這個選項吧。
       subject: 歡迎來到 Mastodon (萬象)
-      tip_federated_timeline: 跨站時間軸可以讓你一窺更廣闊的 Mastodon 網絡。不過，由於它只顯示你的鄰居們所訂閱的內容，所以並不是全部。
-      tip_following: 你會預設關注你服務站的管理員。想結交更多有趣的人的話，記得多逛逛本站時間軸和跨站時間軸哦。
-      tip_local_timeline: 本站時間軸可以讓你一窺 %{instance} 本站上的用戶。他們就是離你最近的鄰居！
-      tip_mobile_webapp: 如果你的移動設備瀏覽器支援，你可以將 Mastodon 加到裝置的主畫面，讓你可以選擇接收推送通知，就像本機的 App 一樣方便！
-      tips: 小貼士
       title: 歡迎 %{name} 加入！
   users:
     follow_limit_reached: 你不能關注多於%{limit} 人
-    generic_access_help_html: 不能登入？你可以寄電郵至 %{email} 尋求協助
     invalid_otp_token: 雙重認證碼不正確
-    invalid_sign_in_token: 無效的安全碼
     otp_lost_help_html: 如果這兩者你均無法登入，你可以聯繫 %{email}
     seamless_external_login: 因為你正在使用第三方服務登入，所以不能設定密碼和電郵。
     signed_in_as: 目前登入的帳戶：
-    suspicious_sign_in_confirmation: 你似乎未曾從此設備登入，而你又有一段時間沒有登入了。我們剛剛把安全碼傳送到你的電郵地址，請查看你的電郵信箱，以確認你是帳號擁有者本人。
   verification:
     explanation_html: 你可以<strong>認證個人資料頁面的元數據 (Metadata) 連結是屬於你的</strong>。要認證，那些連結的目的地網站必須有一條回到你 Mastodon 個人頁面的連結，而且連結<strong>必須</strong>具有<code>rel="me"</code>屬性。連結的文字內容都不會影響認證。這裏有一個例子：
     verification: 驗證
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3cf511473..1674ad756 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,86 +1,25 @@
 ---
 zh-TW:
   about:
-    about_hashtag_html: 這些是包含「<strong>#%{hashtag}</strong>」標籤的公開文章。只要你有任何 Mastodon 站點、或者其他站點的使用者，便可以與他們互動。
-    about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，在上面建立帳戶，然後您就可以和任一 Mastodon 站點上的使用者互通，享受無縫的<em>社群網路</em>交流。
-    about_this: 關於本站
-    active_count_after: 活躍
-    active_footnote: 每月活躍使用者 (MAU)
-    administered_by: 管理者：
-    api: API
-    apps: 行動應用程式
-    apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
-    browse_directory: 依興趣瀏覽個人資料目錄和過濾器
-    browse_local_posts: 瀏覽這台伺服器中公開嘟文的直播串流
-    browse_public_posts: 在 Mastodon 瀏覽公開嘟文的即時串流
-    contact: 聯絡我們
+    about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點，在上面建立帳號，然後您就可以和任一 Mastodon 站點上的使用者互通，享受無縫的<em>社群網路</em>交流。
     contact_missing: 未設定
     contact_unavailable: 未公開
-    discover_users: 探索使用者
-    documentation: 文件
-    federation_hint_html: 你只需要擁有 %{instance} 的帳戶，就可以追蹤隨便一台 Mastodon 伺服器上的人等等。
-    get_apps: 嘗試行動應用程式
     hosted_on: 在 %{domain} 運作的 Mastodon 站點
-    instance_actor_flash: "這個帳戶是個用來代表伺服器自已的虛擬角色，而不是實際的使用者。它是用來聯盟用的，除非您想要封鎖整個站台，不然不該封鎖它。但要封鎖整個站台，您可以使用網域封鎖功能。 \n"
-    learn_more: 了解詳細
-    privacy_policy: 隱私權政策
-    rules: 伺服器規則
-    rules_html: 以下是您若想在此 Mastodon 伺服器建立帳戶必須遵守的規則總結：
-    see_whats_happening: 看看發生什麼事
-    server_stats: 伺服器統計：
-    source_code: 原始碼
-    status_count_after:
-      other: 條嘟文
-    status_count_before: 他們共嘟出了
-    tagline: 關注朋友並探索新朋友
-    terms: 使用條款
-    unavailable_content: 無法取得的內容
-    unavailable_content_description:
-      domain: 伺服器
-      reason: 原因
-      rejecting_media: 不會處理或儲存這些伺服器的媒體檔案，也不會顯示縮圖，需要手動點選原始檔：
-      rejecting_media_title: 過濾的媒體
-      silenced: 這些伺服器的嘟文會被從公開時間軸與對話中隱藏，而且與它們的使用者互動並不會產生任何通知，除非您追蹤他們：
-      silenced_title: 靜音的伺服器
-      suspended: 來自這些伺服器的資料都不會被處理、儲存或交換，也無法和這些伺服器上的使用者互動與溝通：
-      suspended_title: 暫停的伺服器
-    unavailable_content_html: Mastodon 一般來說允許您閱讀並和任何聯盟伺服器上的使用者互動。這些伺服器是這個站台設下的例外。
-    user_count_after:
-      other: 位使用者
-    user_count_before: 註冊使用者數
-    what_is_mastodon: 什麼是 Mastodon?
+    title: 關於本站
   accounts:
-    choices_html: "%{name} 的選擇："
-    endorsements_hint: 推薦您已經關注的人，把他們釘在您的個人頁面。
-    featured_tags_hint: 您可以推薦不同主題標籤，它們也會在此處出現。
-    follow: 關注
+    follow: 跟隨
     followers:
-      other: 關注者
-    following: 正在關注
-    instance_actor_flash: 這個帳戶是一個用來代表此伺服器的虛擬執行者，而非真實使用者。它用途為站點聯盟且不應被停權。
-    joined: 加入於 %{date}
+      other: 跟隨者
+    following: 正在跟隨
+    instance_actor_flash: 這個帳號是一個用來代表此伺服器的虛擬執行者，而非真實使用者。它用途為聯邦宇宙且不應被停權。
     last_active: 上次活躍時間
     link_verified_on: 此連結的所有權已在 %{date} 檢查過
-    media: 媒體
-    moved_html: "%{name} 已經搬遷到 %{new_profile_link}:"
-    network_hidden: 此訊息不可用
-    never_active: 永不
     nothing_here: 暫時沒有內容可供顯示!
-    people_followed_by: "%{name} 關注的人"
-    people_who_follow: 關注 %{name} 的人
     pin_errors:
-      following: 你只能推薦你正在關注的使用者。
+      following: 您只能推薦您正在跟隨的使用者。
     posts:
       other: 嘟文
     posts_tab_heading: 嘟文
-    posts_with_replies: 嘟文與回覆
-    roles:
-      admin: 管理員
-      bot: 機器人
-      group: 群組
-      moderator: 版主
-    unavailable: 無法取得個人檔案
-    unfollow: 取消關注
   admin:
     account_actions:
       action: 執行動作
@@ -88,51 +27,55 @@ zh-TW:
     account_moderation_notes:
       create: 記錄
       created_msg: 已新增管理備忘!
-      delete: 刪除
       destroyed_msg: 成功刪除管理備忘!
     accounts:
       add_email_domain_block: 將電子郵件網域加入黑名單
-      approve: 核准
-      approve_all: 全部批准
-      approved_msg: 成功審核了%{username} 的新帳戶申請
+      approve: 批准
+      approved_msg: 成功審核了%{username} 的新帳號申請
       are_you_sure: 您確定嗎?
       avatar: 頭像
       by_domain: 站點
       change_email:
-        changed_msg: 已成功變更帳戶電子信箱地址！
-        current_email: 目前的電子信箱地址
-        label: 變更電子信箱地址
-        new_email: 新的電子信箱地址
-        submit: 變更電子信箱地址
-        title: 為 %{username} 變更電子信箱地址
+        changed_msg: 電子郵件已成功變更！
+        current_email: 目前的電子郵件地址
+        label: 變更電子郵件地址
+        new_email: 新的電子郵件地址
+        submit: 變更電子郵件地址
+        title: 為 %{username} 變更電子郵件地址
+      change_role:
+        changed_msg: 成功修改角色！
+        label: 變更角色
+        no_role: 沒有角色
+        title: 為 %{username} 變更角色
       confirm: 確定
       confirmed: 已確定
       confirming: 確定
+      custom: 自訂
       delete: 刪除資料
       deleted: 已刪除
       demote: 降級
       destroyed_msg: 即將刪除 %{username} 的數據
       disable: 停用
-      disable_sign_in_token_auth: 停用電子信箱 token 驗證
+      disable_sign_in_token_auth: 停用電子郵件 token 驗證
       disable_two_factor_authentication: 停用兩階段認證
       disabled: 已停用
       display_name: 暱稱
       domain: 站點
       edit: 編輯
-      email: 電子信箱地址
-      email_status: 電子信箱狀態
+      email: 電子郵件地址
+      email_status: 電子郵件狀態
       enable: 啟用
-      enable_sign_in_token_auth: 啟用電子信箱 token 驗證
+      enable_sign_in_token_auth: 啟用電子郵件 token 驗證
       enabled: 已啟用
-      enabled_msg: 成功解除 %{username} 帳戶的凍結
-      followers: 關注者
-      follows: 正在關注
+      enabled_msg: 成功解除 %{username} 帳號的凍結
+      followers: 跟隨者
+      follows: 正在跟隨
       header: 開頭
       inbox_url: 收件箱 (Inbox) URL
       invite_request_text: 加入原因
       invited_by: 邀請者
       ip: IP 位址
-      joined: 已加入
+      joined: 加入時間
       location:
         all: 全部
         local: 本站
@@ -140,37 +83,42 @@ zh-TW:
         title: 位置
       login_status: 登入狀態
       media_attachments: 多媒體附件
-      memorialize: 設定為追悼帳戶
+      memorialize: 設定為追悼帳號
       memorialized: 被悼念的
-      memorialized_msg: 成功將%{username} 的帳戶變為紀念帳戶
+      memorialized_msg: 成功將%{username} 的帳號變為紀念帳號
       moderation:
         active: 活躍
         all: 全部
         pending: 等待中
-        silenced: 已靜音
+        silenced: 受限的
         suspended: 已停權
-        title: 版務
+        title: 站務
       moderation_notes: 管理備忘
       most_recent_activity: 最近活動
       most_recent_ip: 最近 IP 位址
-      no_account_selected: 未選取任何帳戶，因此未變更
+      no_account_selected: 未選取任何帳號，因此未變更
       no_limits_imposed: 未受限制
+      no_role_assigned: 未指派角色
       not_subscribed: 未訂閱
       pending: 等待審核中
       perform_full_suspension: 停權
+      previous_strikes: 先前的警示
+      previous_strikes_description_html:
+        other: 此帳號已有 <strong>%{count}</strong> 次警示。
       promote: 晉級
       protocol: 協議
       public: 公開
       push_subscription_expires: PuSH 訂閱過期
-      redownload: 重新整理個人資料
-      redownloaded_msg: 成功重新載入%{username} 的個人資料頁面
+      redownload: 重新整理個人檔案
+      redownloaded_msg: 成功重新載入%{username} 的個人檔案頁面
       reject: 拒絕
-      reject_all: 全部拒絕
-      rejected_msg: 成功拒絕了%{username} 的新帳戶申請
-      remove_avatar: 取消頭像
+      rejected_msg: 成功拒絕了%{username} 的新帳號申請
+      remote_suspension_irreversible: 此帳號之資料已被不可逆地刪除。
+      remote_suspension_reversible_hint_html: 這個帳號已於此伺服器被停權，所有資料將會於 %{date} 被刪除。在此之前，遠端伺服器可以完全回復此的帳號。如果您想即時刪除這個帳號的資料，您可以在下面進行操作。
+      remove_avatar: 取消大頭貼
       remove_header: 移除開頭
-      removed_avatar_msg: 成功刪除了 %{username} 的頭像
-      removed_header_msg: 成功刪除了 %{username} 的頁面頂端
+      removed_avatar_msg: 成功刪除了 %{username} 的大頭貼
+      removed_header_msg: 成功刪除了 %{username} 的封面圖片
       resend_confirmation:
         already_confirmed: 此使用者已被確認
         send: 重新發送驗證信
@@ -178,19 +126,13 @@ zh-TW:
       reset: 重設
       reset_password: 重設密碼
       resubscribe: 重新訂閱
-      role: 身份
-      roles:
-        admin: 管理員
-        moderator: 版主
-        staff: 管理人員
-        user: 普通使用者
+      role: 角色
       search: 搜尋
       search_same_email_domain: 其他有同個電子郵件網域的使用者
       search_same_ip: 其他有同個 IP 的使用者
       security_measures:
         only_password: 僅使用密碼
         password_and_2fa: 密碼及二重因素驗證
-        password_and_sign_in_token: 密碼及電子信箱 token 驗證
       sensitive: 敏感内容
       sensitized: 已標記為敏感內容
       shared_inbox_url: 共享收件箱網址
@@ -200,19 +142,22 @@ zh-TW:
       silence: 靜音
       silenced: 已靜音
       statuses: 嘟文
+      strikes: 先前的警示
       subscribe: 訂閱
+      suspend: 停權
       suspended: 已停權
-      suspension_irreversible: 已永久刪除這個帳戶的數據。雖然這個帳戶的數據已被永久刪除，但是您仍然可以取消暫停這個帳戶。
-      suspension_reversible_hint_html: 這個帳戶已被暫停，所有數據將會在 %{date} 被刪除。在此之前，您可以完全回復您的帳戶。如果您想即時刪除這個帳戶的數據，您可以在下面進行操作。
-      time_in_queue: 正在佇列等待 %{time}
-      title: 帳戶
-      unconfirmed_email: 未確認的電子信箱地址
+      suspension_irreversible: 已永久刪除這個帳號的數據。雖然這個帳號的數據已被永久刪除，但是您仍然可以取消暫停這個帳號。
+      suspension_reversible_hint_html: 這個帳號已被暫停，所有數據將會在 %{date} 被刪除。在此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的數據，您可以在下面進行操作。
+      title: 帳號
+      unblock_email: 解除封鎖電子郵件地址
+      unblocked_email_msg: 成功解除封鎖 %{username} 的電子郵件地址
+      unconfirmed_email: 未確認的電子郵件地址
       undo_sensitized: 取消敏感狀態
       undo_silenced: 取消靜音
       undo_suspension: 取消停權
-      unsilenced_msg: 成功解除 %{username} 的帳戶限制
+      unsilenced_msg: 成功解除 %{username} 的帳號限制
       unsubscribe: 取消訂閱
-      unsuspended_msg: 成功取消暫停 %{username} 的帳戶
+      unsuspended_msg: 成功取消暫停 %{username} 的帳號
       username: 使用者名稱
       view_domain: 查看站台概要
       warn: 警告
@@ -220,99 +165,127 @@ zh-TW:
       whitelisted: 已加入白名單
     action_logs:
       action_types:
+        approve_appeal: 批准申訴
+        approve_user: 批准使用者
         assigned_to_self_report: 指派回報
-        change_email_user: 變更使用者的電子信箱地址
+        change_email_user: 變更使用者的電子郵件地址
+        change_role_user: 變更使用者角色
         confirm_user: 確認使用者
         create_account_warning: 建立警告
         create_announcement: 建立公告
+        create_canonical_email_block: 新增 E-mail 封鎖
         create_custom_emoji: 建立自訂顏文字
         create_domain_allow: 建立允許網域
         create_domain_block: 建立阻擋網域
-        create_email_domain_block: 封鎖電子郵件站台
+        create_email_domain_block: 新增電子郵件網域封鎖
         create_ip_block: 新增IP規則
         create_unavailable_domain: 新增無法存取的網域
+        create_user_role: 建立角色
         demote_user: 把用戶降級
         destroy_announcement: 刪除公告
+        destroy_canonical_email_block: 刪除 E-mail 封鎖
         destroy_custom_emoji: 刪除自訂顏文字
         destroy_domain_allow: 刪除允許網域
         destroy_domain_block: 刪除阻擋網域
         destroy_email_domain_block: 刪除阻擋電郵網域
+        destroy_instance: 清除網域
         destroy_ip_block: 刪除 IP 規則
         destroy_status: 刪除狀態
         destroy_unavailable_domain: 刪除無法存取的網域
+        destroy_user_role: 移除角色
         disable_2fa_user: 停用兩階段認證
         disable_custom_emoji: 停用自訂顏文字
-        disable_sign_in_token_auth_user: 停用使用者電子信箱 token 驗證
-        disable_user: 停用帳戶
+        disable_sign_in_token_auth_user: 停用使用者電子郵件 token 驗證
+        disable_user: 停用帳號
         enable_custom_emoji: 啓用自訂顏文字
-        enable_sign_in_token_auth_user: 啟用使用者電子信箱 token 驗證
-        enable_user: 啓用帳戶
-        memorialize_account: 設定成紀念帳戶
+        enable_sign_in_token_auth_user: 啟用使用者電子郵件 token 驗證
+        enable_user: 啓用帳號
+        memorialize_account: 設定成紀念帳號
         promote_user: 把用戶升級
+        reject_appeal: 駁回申訴
+        reject_user: 回絕使用者
         remove_avatar_user: 刪除大頭貼
         reopen_report: 重開舉報
+        resend_user: 重新發送驗證信
         reset_password_user: 重設密碼
         resolve_report: 消除舉報
-        sensitive_account: 把您的帳戶的媒體標記為敏感內容
-        silence_account: 靜音用戶
-        suspend_account: 暫停用戶
+        sensitive_account: 把您的帳號的媒體標記為敏感內容
+        silence_account: 靜音帳號
+        suspend_account: 停權帳號
         unassigned_report: 取消指派舉報
-        unsensitive_account: 取消把您的帳戶的媒體設定為敏感內容
-        unsilence_account: 取消用戶的靜音狀態
-        unsuspend_account: 取消用戶的暫停狀態
+        unblock_email_account: 解除封鎖電子郵件地址
+        unsensitive_account: 取消把您的帳號的媒體設定為敏感內容
+        unsilence_account: 取消帳號的靜音狀態
+        unsuspend_account: 取消帳號的暫停狀態
         update_announcement: 更新公告
         update_custom_emoji: 更新自訂顏文字
         update_domain_block: 更新封鎖網域
+        update_ip_block: 更新 IP 規則
         update_status: 更新狀態
+        update_user_role: 更新角色
       actions:
+        approve_appeal_html: "%{name} 批准了來自 %{target} 的審核決定申訴"
+        approve_user_html: "%{name} 批准了從 %{target} 而來的註冊"
         assigned_to_self_report_html: "%{name} 將報告 %{target} 指派給自己"
-        change_email_user_html: "%{name} 變更了使用者 %{target} 的電子信箱地址"
-        confirm_user_html: "%{name} 確認了使用者 %{target} 的電子信箱位址"
+        change_email_user_html: "%{name} 變更了使用者 %{target} 的電子郵件地址"
+        change_role_user_html: "%{name} 變更了 %{target} 的角色"
+        confirm_user_html: "%{name} 確認了使用者 %{target} 的電子郵件位址"
         create_account_warning_html: "%{name} 已對 %{target} 送出警告"
         create_announcement_html: "%{name} 新增了公告 %{target}"
+        create_canonical_email_block_html: "%{name} 已封鎖了 hash 為 %{target} 之 e-mail"
         create_custom_emoji_html: "%{name} 上傳了新自訂表情符號 %{target}"
-        create_domain_allow_html: "%{name} 允許 %{target} 網域加入站點聯盟"
+        create_domain_allow_html: "%{name} 允許 %{target} 網域加入聯邦宇宙"
         create_domain_block_html: "%{name} 封鎖了網域 %{target}"
-        create_email_domain_block_html: "%{name} 封鎖了電子信箱網域 %{target}"
+        create_email_domain_block_html: "%{name} 封鎖了電子郵件網域 %{target}"
         create_ip_block_html: "%{name} 已經設定了IP %{target} 的規則"
         create_unavailable_domain_html: "%{name} 停止發送至網域 %{target}"
+        create_user_role_html: "%{name} 建立了 %{target} 角色"
         demote_user_html: "%{name} 將使用者 %{target} 降級"
         destroy_announcement_html: "%{name} 刪除了公告 %{target}"
-        destroy_custom_emoji_html: "%{name} 停用了自訂表情符號 %{target}"
-        destroy_domain_allow_html: "%{name} 不允許與網域 %{target} 加入站點聯盟"
+        destroy_canonical_email_block_html: "%{name} 取消了 hash 為 %{target} 之 e-mail 的封鎖"
+        destroy_custom_emoji_html: "%{name} 刪除了表情符號 %{target}"
+        destroy_domain_allow_html: "%{name} 不允許與網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 取消了對網域 %{target} 的封鎖"
-        destroy_email_domain_block_html: "%{name} 取消了對電子信箱網域 %{target} 的封鎖"
+        destroy_email_domain_block_html: "%{name} 取消了對電子郵件網域 %{target} 的封鎖"
+        destroy_instance_html: "%{name} 清除了網域 %{target}"
         destroy_ip_block_html: "%{name} 刪除了 IP %{target} 的規則"
         destroy_status_html: "%{name} 刪除了 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 恢復了對網域 %{target} 的發送"
+        destroy_user_role_html: "%{name} 刪除了 %{target} 角色"
         disable_2fa_user_html: "%{name} 停用了使用者 %{target} 的兩階段認證"
         disable_custom_emoji_html: "%{name} 停用了自訂表情符號 %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} 停用了 %{target} 之使用者電子信箱 token 驗證"
+        disable_sign_in_token_auth_user_html: "%{name} 停用了 %{target} 之使用者電子郵件 token 驗證"
         disable_user_html: "%{name} 將使用者 %{target} 設定為禁止登入"
         enable_custom_emoji_html: "%{name} 啟用了自訂表情符號 %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} 啟用了 %{target} 之使用者電子信箱 token 驗證"
+        enable_sign_in_token_auth_user_html: "%{name} 啟用了 %{target} 之使用者電子郵件 token 驗證"
         enable_user_html: "%{name} 將使用者 %{target} 設定為允許登入"
-        memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳戶"
+        memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳號"
         promote_user_html: "%{name} 對使用者 %{target} 進行了晉級操作"
+        reject_appeal_html: "%{name} 回絕了來自 %{target} 的審核決定申訴"
+        reject_user_html: "%{name} 回絕了從 %{target} 而來的註冊"
         remove_avatar_user_html: "%{name} 移除了 %{target} 的大頭貼"
         reopen_report_html: "%{name} 重新開啟 %{target} 的檢舉"
+        resend_user_html: "%{name} 已重新發送驗證信給 %{target}"
         reset_password_user_html: "%{name} 重新設定了使用者 %{target} 的密碼"
         resolve_report_html: "%{name} 處理了 %{target} 的檢舉"
         sensitive_account_html: "%{name} 將 %{target} 的媒體檔案標記為敏感內容"
         silence_account_html: "%{name} 靜音了使用者 %{target}"
         suspend_account_html: "%{name} 停權了使用者 %{target}"
         unassigned_report_html: "%{name} 取消指派 %{target} 的檢舉"
+        unblock_email_account_html: "%{name} 解除封鎖了 %{target} 的電子郵件地址"
         unsensitive_account_html: "%{name} 將 %{target} 的媒體檔案的敏感狀態取消"
         unsilence_account_html: "%{name} 取消了使用者 %{target} 的靜音狀態"
         unsuspend_account_html: "%{name} 取消了使用者 %{target} 的停權狀態"
         update_announcement_html: "%{name} 更新了公告 %{target}"
         update_custom_emoji_html: "%{name} 更新了自訂表情符號 %{target}"
         update_domain_block_html: "%{name} 更新了 %{target} 之網域封鎖"
+        update_ip_block_html: "%{name} 已經更新了 IP %{target} 之規則"
         update_status_html: "%{name} 更新了 %{target} 的嘟文"
-      deleted_status: "（已刪除嘟文）"
+        update_user_role_html: "%{name} 變更了 %{target} 角色"
+      deleted_account: 已刪除帳號
       empty: 找不到 log
-      filter_by_action: 按動作篩選
-      filter_by_user: 按使用者篩選
+      filter_by_action: 按動作過濾
+      filter_by_user: 按使用者過濾
       title: 營運日誌
     announcements:
       destroyed_msg: 成功刪除公告！
@@ -348,11 +321,12 @@ zh-TW:
       enable: 啟用
       enabled: 已啟用
       enabled_msg: 已啟用表情符號
-      image_hint: PNG 格式, 最大 50KB
+      image_hint: 檔案大小最大至 %{size} 之 PNG 或 GIF
       list: 列表
       listed: 已顯示
       new:
         title: 加入新的自訂表情符號
+      no_emoji_selected: 未選取任何 emoji，因此未變更
       not_permitted: 您無權執行此操作
       overwrite: 覆蓋
       shortcode: 短代碼
@@ -369,14 +343,16 @@ zh-TW:
       interactions: 互動
       media_storage: 媒體儲存空間
       new_users: 新使用者
-      opened_reports: 開啟的報告
+      opened_reports: 已開啟的報告
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> 個待處理申訴"
       pending_reports_html:
-        other: "<strong>%{count}</strong> 份待處理報告"
+        other: "<strong>%{count}</strong> 份待處理回報"
       pending_tags_html:
         other: "<strong>%{count}</strong> 個待處理主題標籤"
       pending_users_html:
         other: "<strong>%{count}</strong> 位待處理使用者"
-      resolved_reports: 解決的報告
+      resolved_reports: 已解決的報告
       software: 軟體
       sources: 註冊來源
       space: 儲存空間用量
@@ -384,64 +360,82 @@ zh-TW:
       top_languages: 最活躍語言
       top_servers: 最活躍伺服器
       website: 網站
+    disputes:
+      appeals:
+        empty: 找不到申訴。
+        title: 申訴
     domain_allows:
-      add_new: 將網域加入白名單
-      created_msg: 網域已成功加入白名單
-      destroyed_msg: 網域已成功從白名單移除
-      undo: 從白名單移除
+      add_new: 將網域加入聯邦宇宙白名單
+      created_msg: 網域已成功加入聯邦宇宙白名單
+      destroyed_msg: 網域已成功從聯邦宇宙白名單移除
+      export: 匯出
+      import: 匯入
+      undo: 從聯邦宇宙白名單移除
     domain_blocks:
       add_new: 新增欲封鎖域名
       created_msg: 正在進行站點封鎖
       destroyed_msg: 已撤銷站點封鎖
       domain: 站點
       edit: 更改封鎖的站台
+      existing_domain_block: 您已對 %{name} 施加了更嚴格的限制。
       existing_domain_block_html: 您已經對 %{name} 施加了更嚴格的限制，您需要先把他<a href="%{unblock_url}">取消封鎖</a>。
+      export: 匯出
+      import: 匯入
       new:
         create: 新增封鎖
-        hint: 站點封鎖動作並不會阻止帳戶紀錄被新增至資料庫，但會自動回溯性地對那些帳戶套用特定管理設定。
+        hint: 站點封鎖動作並不會阻止帳號紀錄被新增至資料庫，但會自動回溯性地對那些帳號套用特定管理設定。
         severity:
-          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對關注者顯示，沒有關注的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案和個人資料。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
+          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案和個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
           noop: 無
           silence: 靜音
           suspend: 停權
         title: 新增封鎖站點
+      no_domain_block_selected: 因未選取項目，而未更改網域黑名單
+      not_permitted: 您無權執行此操作
       obfuscate: 混淆網域名稱
       obfuscate_hint: 若啟用網域廣告列表限制，於列表部份混淆網域名稱
       private_comment: 私人留言
       private_comment_hint: 請提供更多有關此站台限制的資訊以供版主作內部參考。
       public_comment: 公開留言
-      public_comment_hint: 如果你已經啟用站台限制列表的公告，請為一般大眾提供更多有關此站台限制的資訊。
+      public_comment_hint: 如果您已經啟用站台限制列表的公告，請為一般大眾提供更多有關此站台限制的資訊。
       reject_media: 拒絕媒體檔案
       reject_media_hint: 刪除本地快取的媒體檔案，並且不再接收來自該站點的任何媒體檔案。與停權無關
       reject_reports: 拒絕檢舉
       reject_reports_hint: 忽略所有來自此站點的檢舉。與停權無關
-      rejecting_media: 拒絕媒體檔案
-      rejecting_reports: 拒絕檢舉中
-      severity:
-        silence: 已靜音
-        suspend: 已停權
-      show:
-        affected_accounts:
-          other: 將影響到資料庫中的 %{count} 個帳戶
-        retroactive:
-          silence: 對此站點的所有使用者取消靜音
-          suspend: 對此站點的所有使用者取消停權
-        title: 撤銷 %{domain} 的站點封鎖
-        undo: 撤銷
       undo: 復原欲封鎖域名
       view: 顯示阻擋的網域
     email_domain_blocks:
       add_new: 加入新項目
-      created_msg: 已成功將電子信箱網域加入黑名單
+      attempts_over_week:
+        other: 上週共有 %{count} 次註冊嘗試
+      created_msg: 已成功將電子郵件網域加入黑名單
       delete: 刪除
-      destroyed_msg: 已成功從黑名單刪除電子信箱網域
+      dns:
+        types:
+          mx: MX 記錄
       domain: 站點
-      empty: 現在沒有阻擋任何 e-mail 網域。
-      from_html: 由 %{domain}
       new:
         create: 新增站點
-        title: 新增電子信箱黑名單項目
-      title: 電子信箱黑名單
+        resolve: 解析網域
+        title: 新增電子郵件黑名單項目
+      no_email_domain_block_selected: 因未選取項目，而未更改電子郵件網域黑名單
+      resolved_dns_records_hint_html: 網域名稱解析為以下 MX 網域，這些網域最終負責接收電子郵件。封鎖 MX 網域將會封鎖任何來自使用相同 MX 網域的電子郵件註冊，即便可見的域名是不同的也一樣。<strong>請注意，不要封鎖主要的電子郵件服務提供商。</strong>
+      resolved_through_html: 透過 %{domain} 解析
+      title: 電子郵件黑名單
+    export_domain_allows:
+      new:
+        title: 匯入網域白名單
+      no_file: 尚未選擇檔案
+    export_domain_blocks:
+      import:
+        description_html: 您將匯入網域黑名單列表。若您非自行編纂此列表，請審慎檢查。
+        existing_relationships_warning: 既存之跟隨關係
+        private_comment_description_html: 為了幫助您追蹤匯入黑名單之來源，匯入黑名單建立時將隨附以下私密備註：<q>%{comment}</q>
+        private_comment_template: 於 %{date} 由 %{source} 匯入
+        title: 匯入網域黑名單
+      new:
+        title: 匯入網域黑名單
+      no_file: 尚未選擇檔案
     follow_recommendations:
       description_html: |-
         <strong>跟隨建議幫助新使用者們快速找到有趣的內容</strong>. 當使用者沒有與其他帳號有足夠多的互動以建立個人化跟隨建議時，這些帳號將會被推荐。這些帳號將基於某選定語言之高互動和高本地跟隨者數量帳號而
@@ -453,46 +447,76 @@ zh-TW:
       title: 跟隨建議
       unsuppress: 回復跟隨建議
     instances:
+      availability:
+        description_html:
+          other: 若在<strong>%{count}天</strong>向某個網域遞送失敗，除非收到某個網域的遞送<em>表單</em>，否則不會繼續嘗試遞送。
+        failure_threshold_reached: 錯誤門檻於 %{date}。
+        failures_recorded:
+          other: 錯誤嘗試於 %{count} 天。
+        no_failures_recorded: 報告中沒有錯誤。
+        title: 可用狀態
+        warning: 上一次嘗試連線至本伺服器失敗
       back_to_all: 所有
       back_to_limited: 受限制的
       back_to_warning: 警告
       by_domain: 站台
+      confirm_purge: 您確定要永久刪除來自此網域的資料嗎？
+      content_policies:
+        comment: 內部備註
+        description_html: 您可以定義對所有此網域帳號及其子網域所實施之內容政策。
+        policies:
+          reject_media: 拒絕多媒體
+          reject_reports: 拒絕檢舉
+          silence: 限制
+          suspend: 停權
+        policy: 政策
+        reason: 公開理由
+        title: 內容政策
+      dashboard:
+        instance_accounts_dimension: 最多人跟隨之帳號
+        instance_accounts_measure: 已儲存帳號
+        instance_followers_measure: 我們那邊的跟隨者
+        instance_follows_measure: 他們這邊的跟隨者
+        instance_languages_dimension: 熱門語言
+        instance_media_attachments_measure: 已儲存多媒體附加檔案
+        instance_reports_measure: 關於他們的檢舉報告
+        instance_statuses_measure: 已儲存嘟文
       delivery:
         all: 所有
         clear: 清除遞送錯誤
+        failing: 發送失敗
         restart: 重新啟動遞送
         stop: 停止遞送
-        title: 遞送
         unavailable: 無法使用
-        unavailable_message: 無法使用遞送
-        warning: 警告
-        warning_message:
-          other: 遞送失敗 %{count} 天
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 日皆無法遞送 ，則會自動標記無法遞送。
+      destroyed_msg: 來自 %{domain} 的資料現在正在佇列中等待刪除。
       empty: 找不到網域
       known_accounts:
-        other: "%{count} 已知的帳戶"
+        other: "%{count} 個已知帳號"
       moderation:
         all: 全部
         limited: 限制
-        title: 版主
+        title: 管管
       private_comment: 私人留言
       public_comment: 公開留言
-      title: 聯邦
+      purge: 清除
+      purge_description_html: 若您相信此網域將永久離線，您可以自儲存空間中刪除該網域所有帳號紀錄及相關資料。這可能花費一些時間。
+      title: 聯邦宇宙
       total_blocked_by_us: 被我們封鎖
-      total_followed_by_them: 被他們關注
-      total_followed_by_us: 被我們關注
+      total_followed_by_them: 被他們跟隨
+      total_followed_by_us: 被我們跟隨
       total_reported: 關於他們的舉報
       total_storage: 多媒體附檔
+      totals_time_period_hint_html: 以下顯示之總和包含所有時間的資料。
     invites:
       deactivate_all: 全部停用
       filter:
         all: 全部
         available: 可用
         expired: 已失效
-        title: 篩選
+        title: 過濾
       title: 邀請使用者
     ip_blocks:
       add_new: 建立規則
@@ -509,24 +533,22 @@ zh-TW:
         title: 建立新的 IP 規則
       no_ip_block_selected: 因為沒有選擇任何 IP 規則，所以什麼事都沒發生
       title: IP 規則
-    pending_accounts:
-      title: 待處理帳戶(%{count})
     relationships:
       title: "%{acct} 的關係"
     relays:
       add_new: 新增中繼站
       delete: 刪除
-      description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會在訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器從聯邦中探索內容</strong>，而無須本地使用者手動關注遠端伺服器的其他使用者。"
+      description_html: "<strong>聯邦中繼站</strong> 是種中繼伺服器，會在訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。<strong>中繼站也能協助小型或中型伺服器從聯邦宇宙中探索內容</strong>，而無須本地使用者手動跟隨遠端伺服器的其他使用者。"
       disable: 停用
       disabled: 停用
       enable: 啟用
-      enable_hint: 啟用後，你的伺服器將訂閱該中繼的所有公開文章，並將會此伺服器的公開文章發送給它。
+      enable_hint: 啟用後，您的伺服器將訂閱該中繼的所有公開文章，並將會此伺服器的公開文章發送給它。
       enabled: 已啟用
       inbox_url: 中繼URL
       pending: 等待中繼站審核
       save_and_enable: 儲存並啟用
       setup: 設定中繼連結
-      signatures_not_enabled: 若啟用安全模式或受限的站點聯盟模式，中繼將不會正常運作
+      signatures_not_enabled: 若啟用安全模式或受限的聯邦宇宙模式，中繼將不會正常運作
       status: 狀態
       title: 中繼
     report_notes:
@@ -536,38 +558,119 @@ zh-TW:
       account:
         notes:
           other: "%{count} 則備註"
-        reports:
-          other: "%{count} 則檢舉"
+      action_log: 審計日誌
       action_taken_by: 操作執行者
-      are_you_sure: 你確定嗎?
+      actions:
+        delete_description_html: 被檢舉的嘟文將被刪除，並且會被以刪除線標記，幫助您升級同一帳號未來的違規行為。
+        mark_as_sensitive_description_html: 被檢舉的嘟文中的媒體將會被標記為敏感內容，並將會記錄一次警告，以協助您升級同一帳號未來的違規行為。
+        other_description_html: 檢視更多控制帳號行為以及自訂檢舉帳號通知之選項。
+        resolve_description_html: 被檢舉的帳號將不被採取任何行動，不會加以刪除線標記，並且此份報告將被關閉。
+        silence_description_html: 個人頁面僅會對已跟隨帳號之使用者或手動查詢可見，將大幅度限制觸及範圍。此設定可隨時被還原。
+        suspend_description_html: 個人頁面及其內容將無法被存取，直到其最終被刪除。將無法與此帳號互動。此設定 30 日內可被還原。
+      actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，如非選擇了 <strong>垃圾郵件</strong> 類別。
+      add_to_report: 加入更多至報告
+      are_you_sure: 您確定嗎?
       assign_to_self: 指派給自己
       assigned: 指派負責人
+      by_target_domain: 檢舉帳號之網域
+      category: 分類
+      category_description_html: 此帳號及/或被檢舉內容之原因會被引用在檢舉帳號通知中
       comment:
         none: 無
+      comment_description_html: 提供更多資訊，%{name} 寫道：
       created_at: 日期
+      delete_and_resolve: 刪除嘟文
       forwarded: 已轉寄
       forwarded_to: 轉寄到 %{domain}
       mark_as_resolved: 標記為「已解決」
+      mark_as_sensitive: 標記為敏感內容
       mark_as_unresolved: 標記為「未解決」
+      no_one_assigned: 沒有人
       notes:
         create: 建立記錄
         create_and_resolve: 建立記錄並標記為「已解決」
         create_and_unresolve: 建立記錄並標記「未解決」
         delete: 刪除
         placeholder: 記錄已執行的動作，或其他相關的更新...
+        title: 註記
+      notes_description_html: 檢視及留下些給其他管理員和未來的自己的註記
+      quick_actions_description_html: 採取一個快速行動，或者下捲以檢視檢舉內容：
+      remote_user_placeholder: 來自 %{instance} 之遠端使用者
       reopen: 重開檢舉
       report: '檢舉 #%{id}'
       reported_account: 被檢舉使用者
       reported_by: 檢舉人
       resolved: 已解決
       resolved_msg: 檢舉已處理!
+      skip_to_actions: 跳過行動
       status: 嘟文
-      target_domain: 檢舉帳戶之網域
-      target_origin: 檢舉帳戶之來源
+      statuses: 被檢舉的內容
+      statuses_description_html: 侵犯性違規內容會被引用在檢舉帳號通知中
+      target_origin: 檢舉帳號之來源
       title: 檢舉
       unassign: 取消指派
       unresolved: 未解決
       updated_at: 更新
+      view_profile: 檢視個人檔案頁面
+    roles:
+      add_new: 新增角色
+      assigned_users:
+        other: "%{count} 個使用者"
+      categories:
+        administration: 管理員
+        devops: DevOps
+        invites: 邀請
+        moderation: 站務
+        special: 特殊
+      delete: 刪除
+      description_html: 透過<strong>使用者角色</strong>，您可以自訂您的使用者可以存取 Mastodon 的哪些功能與區域。
+      edit: 編輯「%{name}」角色
+      everyone: 預設權限
+      everyone_full_description_html: 這是會影響<strong>所有使用者</strong>的<strong>基本角色</strong>，即使是那些沒有被分配角色的使用者也一樣。其他所有的角色都從它繼承權限。
+      permissions_count:
+        other: "%{count} 個權限"
+      privileges:
+        administrator: 管理員
+        administrator_description: 擁有此權限的使用者將會略過所有權限
+        delete_user_data: 刪除使用者資料
+        delete_user_data_description: 允許使用者立刻刪除其他使用者的資料
+        invite_users: 邀請使用者
+        invite_users_description: 允許使用者邀請新人加入伺服器
+        manage_announcements: 管理公告
+        manage_announcements_description: 允許使用者管理伺服器上的公告
+        manage_appeals: 管理解封申訴系統
+        manage_appeals_description: 允許使用者審閱針對站務動作的申訴
+        manage_blocks: 管理封鎖
+        manage_blocks_description: 允許使用者封鎖電子郵件提供者與 IP 位置
+        manage_custom_emojis: 管理自訂表情符號
+        manage_custom_emojis_description: 允許使用者管理伺服器上的自訂表情符號
+        manage_federation: 管理聯邦宇宙
+        manage_federation_description: 允許使用者封鎖或允許與其他網域的聯邦宇宙，並控制傳遞能力
+        manage_invites: 管理邀請
+        manage_invites_description: 允許使用者瀏覽與停用邀請連結
+        manage_reports: 管理回報
+        manage_reports_description: 允許使用者審閱回報並對回報執行站務動作
+        manage_roles: 管理角色
+        manage_roles_description: 允許使用者管理並指派低於他們的使用者
+        manage_rules: 管理規則
+        manage_rules_description: 允許使用者變更伺服器規則
+        manage_settings: 管理設定
+        manage_settings_description: 允許使用者變更站點設定
+        manage_taxonomies: 管理分類方式
+        manage_taxonomies_description: 允許使用者審閱熱門內容與更新主題標籤設定
+        manage_user_access: 管理使用者存取權
+        manage_user_access_description: 允許使用者停用其他人的兩階段驗證、變更電子郵件地址以及重設密碼
+        manage_users: 管理使用者
+        manage_users_description: 允許使用者檢視其他使用者的詳細資訊並對回報執行站務動作
+        manage_webhooks: 管理 Webhooks
+        manage_webhooks_description: 允許使用者為管理事件設定 webhooks
+        view_audit_log: 檢視審核日誌
+        view_audit_log_description: 允許使用者檢視伺服器上的管理動作歷史
+        view_dashboard: 檢視儀表板
+        view_dashboard_description: 允許使用者存取儀表板與各種指標
+        view_devops: DevOps
+        view_devops_description: 允許使用者存取 Sidekiq 與 pgHero 儀表板
+      title: 角色
     rules:
       add_new: 新增規則
       delete: 刪除
@@ -576,163 +679,226 @@ zh-TW:
       empty: 未曾定義任何伺服器規則
       title: 伺服器規則
     settings:
-      activity_api_enabled:
-        desc_html: 本站使用者發佈的嘟文數量，以及本站的活躍使用者與一週內新使用者數量
-        title: 公開使用者活躍度的統計數據
-      bootstrap_timeline_accounts:
-        desc_html: 以半形逗號分隔多個使用者名。只能加入來自本站且未開啟保護的帳戶。如果留空，則預設關注本站所有管理員。
-        title: 新使用者預設關注
-      contact_information:
-        email: 用於聯絡的公開電子信箱地址
-        username: 請輸入使用者名稱
-      custom_css:
-        desc_html: 透過於每個頁面都載入的 CSS 調整外觀
-        title: 自訂 CSS
+      about:
+        manage_rules: 管理伺服器規則
+        preamble: 提供關於此伺服器如何運作、管理、及金援之供詳細資訊。
+        rules_hint: 這是關於您的使用者應遵循規則之專有區域。
+        title: 關於
+      appearance:
+        preamble: 客製化 Mastodon 網頁介面。
+        title: 外觀設定
+      branding:
+        preamble: 您的伺服器品牌使之從聯邦宇宙網路中其他伺服器間凸顯自己。此資訊可能於各種不同的環境中顯示，例如 Mastodon 網頁介面、原生應用程式、其他網頁上的連結預覽或是其他通訊應用程式等等。因此，請盡可能保持此資訊簡潔明朗。
+        title: 品牌化
+      content_retention:
+        preamble: 控制使用者產生內容如何儲存於 Mastodon 上。
+        title: 內容保留期間
       default_noindex:
         desc_html: 影響所有沒有變更此設定的使用者
-        title: 預設將使用者退出搜尋引擎索引
+        title: 預設將使用者排除於搜尋引擎索引
+      discovery:
+        follow_recommendations: 跟隨建議
+        preamble: 呈現有趣的內容有助於 Mastodon 上一人不識的新手上路。控制各種不同的分類在您伺服器上如何被探索到。
+        profile_directory: 個人檔案目錄
+        public_timelines: 公開時間軸
+        title: 探索
+        trends: 熱門趨勢
       domain_blocks:
         all: 給任何人
         disabled: 給沒有人
-        title: 顯示封鎖的網域
-        users: 套用至所有登入的本機使用者
-      domain_blocks_rationale:
-        title: 顯示解釋原因
-      hero:
-        desc_html: 在首頁顯示。推薦最小 600x100px。如果留空，就會重設回伺服器預覽圖
-        title: 主題圖片
-      mascot:
-        desc_html: 在許多頁面都會顯示。推薦最小 293x205px。如果留空，將採用預設的吉祥物
-        title: 吉祥物圖片
-      peers_api_enabled:
-        desc_html: 本伺服器在聯邦中發現的站點
-        title: 發布已知伺服器的列表
-      preview_sensitive_media:
-        desc_html: 連結來自其他網站的預覽將顯示於縮圖，即使這些媒體被標記為敏感
-        title: 在 OpenGraph 預覽中顯示敏感媒體
-      profile_directory:
-        desc_html: 允許能探索使用者
-        title: 啟用個人資料目錄
+        users: 套用至所有登入的本站使用者
       registrations:
-        closed_message:
-          desc_html: 關閉註冊時顯示在首頁的內容，可使用 HTML 標籤
-          title: 關閉註冊訊息
-        deletion:
-          desc_html: 允許所有人刪除自己的帳戶
-          title: 開放刪除帳戶的權限
-        min_invite_role:
-          disabled: 沒有人
-          title: 允許發送邀請的身份
-        require_invite_text:
-          desc_html: 如果已設定為手動審核註冊，請將「加入原因」設定為必填項目。
-          title: 要求新使用者填申請書以索取邀請
+        preamble: 控制誰能於您伺服器上建立帳號。
+        title: 註冊
       registrations_mode:
         modes:
           approved: 註冊需要核准
           none: 沒有人可註冊
           open: 任何人皆能註冊
-        title: 註冊模式
-      show_known_fediverse_at_about_page:
-        desc_html: 如果開啟，就會在時間軸預覽顯示其他站點嘟文，否則就只會顯示本站點嘟文。
-        title: 在時間軸預覽顯示其他站點嘟文
-      show_staff_badge:
-        desc_html: 在個人資料頁面上顯示管理人員標誌
-        title: 顯示管理人員標誌
-      site_description:
-        desc_html: 首頁上的介紹文字，描述此 Mastodon 伺服器的特別之處和其他重要資訊。可使用 HTML 標籤，包括 <code>&lt;a&gt;</code> 和 <code>&lt;em&gt;</code>。
-        title: 伺服器描述
-      site_description_extended:
-        desc_html: 可放置行為準則、規定以及其他此伺服器特有的內容。可使用 HTML 標籤
-        title: 本站詳細資訊
-      site_short_description:
-        desc_html: 顯示在側邊欄和網頁標籤 (meta tags)。以一段話描述 Mastodon 是甚麼，以及這個伺服器的特色。
-        title: 伺服器短描述
-      site_terms:
-        desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
-        title: 自訂使用條款
-      site_title: 伺服器名稱
-      thumbnail:
-        desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
-        title: 伺服器縮圖
-      timeline_preview:
-        desc_html: 在主頁顯示本站時間軸
-        title: 時間軸預覽
-      title: 網站設定
-      trendable_by_default:
-        desc_html: 影響此前並未被禁用的標籤
-        title: 允許熱門的主題標籤直接顯示於趨勢區，不需經過審核
-      trends:
-        desc_html: 公開目前炎上的已審核標籤
-        title: 趨勢主題標籤
+      title: 伺服器設定
     site_uploads:
       delete: 刪除上傳的檔案
       destroyed_msg: 成功刪除站台的上傳項目！
     statuses:
-      back_to_account: 返回帳戶訊息頁
+      account: 作者
+      application: 應用程式
+      back_to_account: 返回帳號訊息頁
+      back_to_report: 回到檢舉報告頁面
       batch:
-        delete: 刪除
-        nsfw_off: 標記為非敏感內容
-        nsfw_on: 標記為敏感內容
+        remove_from_report: 從檢舉報告中移除
+        report: 檢舉報告
       deleted: 已刪除
-      failed_to_execute: 執行失敗
+      favourites: 最愛
+      history: 版本紀錄
+      in_reply_to: 正在回覆
+      language: 語言
       media:
         title: 媒體檔案
-      no_media: 不含媒體檔案
+      metadata: 詮釋資料
       no_status_selected: 因未選擇嘟文而未變更。
-      title: 帳戶嘟文
+      open: 公開嘟文
+      original_status: 原始嘟文
+      reblogs: 轉嘟
+      status_changed: 嘟文已編輯
+      title: 帳號嘟文
+      trending: 熱門
+      visibility: 可見性
       with_media: 含有媒體檔案
+    strikes:
+      actions:
+        delete_statuses: "%{name} 刪除了 %{target} 的嘟文"
+        disable: "%{name} 凍結了 %{target} 的帳號"
+        mark_statuses_as_sensitive: "%{name} 將 %{target} 的嘟文標記為敏感內容"
+        none: "%{name} 已對 %{target} 送出警告"
+        sensitive: "%{name} 將 %{target} 的帳號標記為含有敏感內容"
+        silence: "%{name} 限制了 %{target} 的帳號"
+        suspend: "%{name} 將 %{target} 的帳號停權"
+      appeal_approved: 已申訴
+      appeal_pending: 申訴待審中
     system_checks:
       database_schema_check:
         message_html: 有挂起的数据库迁移，请运行它们以确保应用程序按照预期运行。
+      elasticsearch_running_check:
+        message_html: 無法連接 Elasticsearch。請檢查是否正在執行中，或者已關閉全文搜尋。
+      elasticsearch_version_check:
+        message_html: 不相容的 Elasticsearch 版本：%{value}
+        version_comparison: Elasticsearch %{running_version} 版正在執行，需要 %{required_version} 版。
       rules_check:
         action: 管理服务器规则
-        message_html: 你没有定义任何服务器规则。
+        message_html: 您没有定義任何伺服器規則。
       sidekiq_process_check:
-        message_html: 没有队列 %{value} 的Sidekiq进程，请检查你的Sidekiq配置
+        message_html: 沒有佇列 %{value} 的 Sidekiq 行程，請檢查您的 Sidekiq 設定組態
     tags:
-      accounts_today: 本日不重複使用者數
-      accounts_week: 本週不重複使用者數
-      breakdown: 根據來源分類本日使用情況
-      last_active: 上次活躍
-      most_popular: 最熱門
-      most_recent: 最近
-      name: 主題標籤
       review: 審核嘟文
-      reviewed: 已審核
-      title: 主題標籤
-      trending_right_now: 最新趨勢
-      unique_uses_today: 今天嘟了 %{count} 則
-      unreviewed: 未審核
       updated_msg: 成功更新主題標籤設定
     title: 管理介面
+    trends:
+      allow: 允許
+      approved: 已通過審核
+      disallow: 不允許
+      links:
+        allow: 允許連結
+        allow_provider: 允許發行者
+        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索現在世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
+        disallow: 不允許連結
+        disallow_provider: 不允許發行者
+        no_link_selected: 未選取任何鏈結，因此未變更
+        publishers:
+          no_publisher_selected: 未選取任何發行者，因此未變更
+        shared_by_over_week:
+          other: 上週被 %{count} 名使用者分享
+        title: 熱門連結
+        usage_comparison: 於今日被 %{today} 人分享，相較於昨日 %{yesterday} 人
+      only_allowed: 僅允許
+      pending_review: 等待審核中
+      preview_card_providers:
+        allowed: 此發行者之連結能登上熱門
+        description_html: 這些網域來自被您伺服器常被分享的連結。除非您核准該連結，則這些連結將不會成為公開熱門標籤。您的核准或駁回將對子網域仍有效。
+        rejected: 此發行者之連結不會登上熱門
+        title: 發行者
+      rejected: 被拒絕
+      statuses:
+        allow: 允許嘟文
+        allow_account: 允許作者
+        description_html: 這些是您伺服器上已知被正在大量分享及加入最愛之嘟文。這些嘟文能幫助您伺服器上舊雨新知發現更多帳號來跟隨。除非您核准該作者且作者允許他們的帳號被推薦至其他人，嘟文將不被公開展示。您可以核准或駁回個別嘟文。
+        disallow: 不允許嘟文
+        disallow_account: 不允許作者
+        no_status_selected: 未選取任何熱門嘟文，因此未變更
+        not_discoverable: 嘟文作者選擇不被發現
+        shared_by:
+          other: 分享過或／及收藏過 %{friendly_count} 次
+        title: 熱門嘟文
+      tags:
+        current_score: 目前分數 %{score} 分
+        dashboard:
+          tag_accounts_measure: 獨特使用次數
+          tag_languages_dimension: 熱門語言
+          tag_servers_dimension: 熱門伺服器
+          tag_servers_measure: 不同伺服器
+          tag_uses_measure: 總使用次數
+        description_html: 這些主題標籤正在您的伺服器上大量嘟文中出現。這些主題標籤能幫助您的使用者發現人們正集中討論的內容。除非您核准，主題標籤將不被公開展示。
+        listable: 能被建議
+        no_tag_selected: 未選取任何主題標籤，因此未變更
+        not_listable: 不能被建議
+        not_trendable: 不會登上熱門
+        not_usable: 不可被使用
+        peaked_on_and_decaying: 於 %{date} 日最熱門，目前正退燒中
+        title: 熱門主題標籤
+        trendable: 能登上熱門
+        trending_rank: '熱門 #%{rank}'
+        usable: 可被使用
+        usage_comparison: 於今日被使用 %{today} 次，相較於昨日 %{yesterday} 次
+        used_by_over_week:
+          other: 上週被 %{count} 個人使用
+      title: 熱門榜
+      trending: 熱門
     warning_presets:
       add_new: 新增
       delete: 刪除
       edit_preset: 編輯預設警告
       empty: 您未曾定義任何預設警告
       title: 管理預設警告
+    webhooks:
+      add_new: 新增端點
+      delete: 刪除
+      description_html: "<strong>Webhook</strong> 讓 Mastodon 可以將關於選定的事件的<strong>即時通知</strong>推送到您自己的應用程式，如此您的應用程式就可以<strong>自動觸發反應</strong>。"
+      disable: 停用
+      disabled: 已停用
+      edit: 編輯端點
+      empty: 您沒有任何設定好的 webhook 端點。
+      enable: 啟用
+      enabled: 生效
+      enabled_events:
+        other: "%{count} 個已啟用的端點"
+      events: 事件
+      new: 新增 Webhook
+      rotate_secret: 更換密鑰
+      secret: 簽署密鑰
+      status: 狀態
+      title: Webhooks
+      webhook: Webhook
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: 要刪除他們的嘟文
+        disable: 要凍結他們的帳號
+        mark_statuses_as_sensitive: 要將他們的嘟文標記為含有敏感內容
+        none: 警告
+        sensitive: 要將他們的帳號標記為含有敏感內容
+        silence: 要限制他們的帳號
+        suspend: 要停權他們的帳號
+      body: "%{target} 正在就 %{date} 的 %{action_taken_by} 做出的審核決定提出申訴，該決定是 %{type}。他們寫道："
+      next_steps: 您可以批准申訴以還原審核決定，或是忽略它。
+      subject: "%{username} 正在申訴 %{instance} 上的審核決定"
     new_pending_account:
-      body: 以下是新帳戶的詳細資訊。您可以同意或拒絕這項申請。
-      subject: "%{instance} 上有新帳戶 (%{username}) 待審核"
+      body: 以下是新帳號的詳細資訊。您可以同意或拒絕這項申請。
+      subject: "%{instance} 上有新帳號 (%{username}) 待審核"
     new_report:
       body: "%{reporter} 檢舉了使用者 %{target}"
       body_remote: 來自 %{domain} 的使用者檢舉了使用者 %{target}
       subject: 來自 %{instance} 的使用者檢舉（#%{id}）
-    new_trending_tag:
-      body: '尚未通過審核的主題標籤 #%{name} 今天有炎上趨勢。這個標籤在你開綠燈之前不會公開顯示，你也可以選擇無視它以遭蒙蔽雙眼。'
-      subject: "%{instance} 上有待審核的主題標籤 (#%{name})"
+    new_trends:
+      body: 以下項目需要經過審核才能公開顯示：
+      new_trending_links:
+        title: 熱門連結
+      new_trending_statuses:
+        title: 熱門嘟文
+      new_trending_tags:
+        no_approved_tags: 這些是目前仍未被審核之熱門主題標籤。
+        requirements: '這些候選中的任何一個都可能超過 #%{rank} 已批准的熱門主題標籤，該主題標籤目前是 #%{lowest_tag_name}，得分為 %{lowest_tag_score}。'
+        title: 熱門主題標籤
+      subject: "%{instance} 有待審核之新熱門"
   aliases:
     add_new: 建立別名
-    created_msg: 成功建立別名。您可以自舊帳戶開始轉移。
-    deleted_msg: 成功移除別名。您將無法再由舊帳戶轉移到目前的帳戶。
+    created_msg: 成功建立別名。您可以自舊帳號開始轉移。
+    deleted_msg: 成功移除別名。您將無法再由舊帳號轉移到目前的帳號。
     empty: 您目前沒有任何別名。
-    hint_html: 如果想由其他帳戶轉移到此帳戶，您可以在此處建立別名，稍後系統將容許您把關注者由舊帳戶轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳戶的遷移程序需要在舊帳戶啟動</strong>。
+    hint_html: 如果想由其他帳號轉移至此帳號，您可以在此處新增別名，稍後系統將容許您將跟隨者由舊帳號轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳號的遷移程序需要在舊帳號啟動</strong>。
     remove: 取消連結別名
   appearance:
     advanced_web_interface: 進階網頁介面
-    advanced_web_interface_hint: 進階網頁界面可讓您配置許多不同的欄位來善用多餘的螢幕空間，依需要同時查看盡可能多的資訊如：首頁、通知、站點聯邦時間軸、任意數量的列表和主題標籤。
-    animations_and_accessibility: 動畫與可用性
+    advanced_web_interface_hint: 進階網頁界面可讓您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦時間軸、任意數量的列表和主題標籤。
+    animations_and_accessibility: 動畫與無障礙設定
     confirmation_dialogs: 確認對話框
     discovery: 探索
     localization:
@@ -740,44 +906,43 @@ zh-TW:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: 每個人都能貢獻。
     sensitive_content: 敏感內容
-    toot_layout: 嘟文佈局
+    toot_layout: 嘟文排版
   application_mailer:
-    notification_preferences: 變更電子信件設定
+    notification_preferences: 變更電子郵件設定
     salutation: "%{name}、"
-    settings: 變更電子信箱設定︰%{link}
+    settings: 變更電子郵件設定︰%{link}
     view: '進入瀏覽:'
-    view_profile: 檢視個人資料頁
+    view_profile: 檢視個人檔案
     view_status: 檢視嘟文
   applications:
     created: 已建立應用
     destroyed: 已刪除應用
-    invalid_url: 網址不正確
     regenerate_token: 重設 token
     token_regenerated: 已重設 token
     warning: 警告，不要把它分享給任何人!
-    your_token: 你的 token
+    your_token: 您的 access token
   auth:
-    apply_for_account: 索取註冊邀請
+    apply_for_account: 申請帳號
     change_password: 密碼
-    checkbox_agreement_html: 我同意 <a href="%{rules_path}" target="_blank">之伺服器規則</a> 以及 <a href="%{terms_path}" target="_blank">服務條款</a>
-    checkbox_agreement_without_rules_html: 我同意 <a href="%{terms_path}" target="_blank">服務條款</a>
-    delete_account: 刪除帳戶
-    delete_account_html: 如果你想刪除你的帳戶，請<a href="%{path}">點擊這裡繼續</a>。你需要確認你的操作。
+    delete_account: 刪除帳號
+    delete_account_html: 如果您欲刪除您的帳號，請<a href="%{path}">點擊這裡繼續</a>。您需要再三確認您的操作。
     description:
       prefix_invited_by_user: "@%{name} 邀請您加入這個 Mastodon 伺服器！"
-      prefix_sign_up: 現在就註冊 Mastodon 帳戶吧！
-      suffix: 有了帳戶，就可以從任何 Mastodon 伺服器關注任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
+      prefix_sign_up: 現在就註冊 Mastodon 帳號吧！
+      suffix: 有了帳號，就可以從任何 Mastodon 伺服器跟隨任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
     didnt_get_confirmation: 沒有收到驗證信?
     dont_have_your_security_key: 找不到您的安全金鑰？
     forgot_password: 忘記密碼？
     invalid_reset_password_token: 密碼重設 token 無效或已過期。請重新設定密碼。
-    link_to_otp: 請從您手機輸入雙重驗證 (2FA) 或還原碼
+    link_to_otp: 請從您手機輸入兩階段驗證 (2FA) 或備用驗證碼
     link_to_webauth: 使用您的安全金鑰
+    log_in_with: 登入，使用
     login: 登入
     logout: 登出
-    migrate_account: 轉移到另一個帳戶
-    migrate_account_html: 如果你希望引導他人關注另一個帳戶，請<a href="%{path}">到這裡設定</a>。
+    migrate_account: 轉移到另一個帳號
+    migrate_account_html: 如果您希望引導他人跟隨另一個帳號，請 <a href="%{path}">到這裡設定</a>。
     or_log_in_with: 或透過其他方式登入
+    privacy_policy_agreement_html: 我已閱讀且同意 <a href="%{privacy_policy_path}" target="_blank">隱私權政策</a>
     providers:
       cas: CAS
       saml: SAML
@@ -785,33 +950,42 @@ zh-TW:
     registration_closed: "%{instance} 現在不開放新成員"
     resend_confirmation: 重新寄送確認指引
     reset_password: 重設密碼
+    rules:
+      preamble: 這些被 %{domain} 的管管們制定以及實施。
+      title: 一些基本守則。
     security: 登入資訊
     set_new_password: 設定新密碼
     setup:
       email_below_hint_html: 如果此電子郵件地址不正確，您可於此修改並接收郵件進行認證。
-      email_settings_hint_html: 請確認電子信件是否寄至 %{email} 。如果不對的話，可以在帳戶設定裡變更。
+      email_settings_hint_html: 請確認 e-mail 是否傳送到 %{email} 。如果不對的話，可以從帳號設定修改。
       title: 設定
+    sign_in:
+      preamble_html: 請登入您於 <strong>%{domain}</strong> 之帳號密碼。若您的帳號託管於其他伺服器，您將無法於此登入。
+      title: 登入 %{domain}
+    sign_up:
+      preamble: 於此 Mastodon 伺服器擁有帳號的話，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
+      title: 讓我們一起設定 %{domain} 吧！
     status:
-      account_status: 帳戶狀態
+      account_status: 帳號狀態
       confirming: 等待電子郵件確認完成。
-      functional: 您的帳戶可以正常使用了。
+      functional: 您的帳號可以正常使用了。
       pending: 管管們正在處理您的申請，這可能需要一點時間處理。我們將在申請通過後以電子郵件方式通知您。
-      redirecting_to: 您的帳戶因目前重新導向至 %{acct} 而被停用。
+      redirecting_to: 您的帳號因目前重定向至 %{acct} 而被停用。
+      view_strikes: 檢視針對您帳號過去的警示
     too_fast: 送出表單的速度太快跟不上，請稍後再試。
-    trouble_logging_in: 登錄時遇到困難？
     use_security_key: 使用安全金鑰
   authorize_follow:
-    already_following: 你已經關注了這個使用者
-    already_requested: 您早已向該帳戶寄送追蹤請求
+    already_following: 您已經跟隨了這個使用者
+    already_requested: 您早已向該帳號寄送跟隨請求
     error: 對不起，搜尋其他站點使用者出現錯誤
-    follow: 關注
-    follow_request: 關注請求已經發送給：
-    following: 成功! 你正在關注：
+    follow: 跟隨
+    follow_request: 跟隨請求已發送給：
+    following: 成功！您正在跟隨：
     post_follow:
-      close: 你也可以直接關閉這個頁面。
-      return: 顯示個人資料頁
+      close: 您可以直接關閉此頁面。
+      return: 顯示個人檔案
       web: 返回本站
-    title: 關注 %{acct}
+    title: 跟隨 %{acct}
   challenge:
     confirm: 繼續
     hint_html: "<strong>温馨小提醒：</strong> 我們在接下來一小時內不會再要求您輸入密碼。"
@@ -841,30 +1015,56 @@ zh-TW:
       x_seconds: "%{count}秒"
   deletes:
     challenge_not_passed: 您所輸入的資料不正確
-    confirm_password: 輸入你現在的密碼來驗證身份
+    confirm_password: 輸入您現在的密碼以驗證身份
     confirm_username: 請輸入您的使用者名稱以作確認
-    proceed: 刪除帳戶
-    success_msg: 你的帳戶已經成功刪除
+    proceed: 刪除帳號
+    success_msg: 您的帳號已經成功刪除
     warning:
       before: 在進行下一步驟之前，請詳細閱讀以下説明：
       caches: 已被其他節點快取的內容可能會殘留其中
       data_removal: 您的嘟文和其他資料將會被永久刪除
-      email_change_html: 你可以在不刪除帳戶的情況下<a href="%{path}">變更你的電子郵件地址</a>
-      email_contact_html: 如果你仍然沒有收到郵件，請寄信到 <a href="mailto:%{email}">%{email}</a> 以獲得協助
-      email_reconfirmation_html: 如果你沒有收到確認郵件，你可以<a href="%{path}">請求再次發送</a>
-      irreversible: 你將無法復原或重新啟用你的帳戶
+      email_change_html: 您可以在不刪除帳號的情況下<a href="%{path}">變更您的電子郵件地址</a>
+      email_contact_html: 如果您仍然沒有收到郵件，請寄信至 <a href="mailto:%{email}">%{email}</a> 以獲得協助
+      email_reconfirmation_html: 如果您沒有收到確認郵件，可以<a href="%{path}">請求再次發送</a>
+      irreversible: 您將無法復原或重新啟用您的帳號
       more_details_html: 更多詳細資訊，請參閲<a href="%{terms_path}">隱私政策</a>。
-      username_available: 你的使用者名稱將會釋出供他人使用
-      username_unavailable: 你的使用者名稱將會保留並不予他人使用
-  directories:
-    directory: 個人資料目錄
-    explanation: 根據興趣去發現新朋友
-    explore_mastodon: 探索%{title}
+      username_available: 您的使用者名稱將會釋出供他人使用
+      username_unavailable: 您的使用者名稱將會保留並不予他人使用
+  disputes:
+    strikes:
+      action_taken: 採取的行動
+      appeal: 申訴
+      appeal_approved: 此警示已成功申訴，不再有效
+      appeal_rejected: 申訴已被駁回
+      appeal_submitted_at: 申訴已遞交
+      appealed_msg: 您的申訴已遞交。若其被批准，您將會被通知。
+      appeals:
+        submit: 遞交申訴
+      approve_appeal: 批准申訴
+      associated_report: 相關報告
+      created_at: 過時的
+      description_html: 這些是 %{instance} 的管理員向您發送的針對您的帳號採取的措施與警告。
+      recipient: 此致
+      reject_appeal: 駁回申訴
+      status: '嘟文編號 #%{id}'
+      status_removed: 嘟文已從系統中移除
+      title: "%{action} 來自 %{date}"
+      title_actions:
+        delete_statuses: 嘟文移除
+        disable: 凍結帳號
+        mark_statuses_as_sensitive: 將嘟文標記為敏感內容
+        none: 警告
+        sensitive: 將帳號標記為敏感內容
+        silence: 帳號限制
+        suspend: 帳號停權
+      your_appeal_approved: 您的申訴已被批准
+      your_appeal_pending: 您已遞交申訴
+      your_appeal_rejected: 您的申訴已被駁回
   domain_validator:
     invalid_domain: 並非一個有效域名
   errors:
-    '400': 你所送出的請求無效或格式不正確。
-    '403': 你沒有觀看這個頁面的權限。
+    '400': 您所送出的請求無效或格式不正確。
+    '403': 您沒有檢視這個頁面的權限。
     '404': 您所尋找的網頁不存在。
     '406': 此頁面無法以請求的格式顯示。
     '410': 您所尋找的網頁此處已不存在。
@@ -876,7 +1076,7 @@ zh-TW:
       content: 抱歉，我們的後台出現問題了。
       title: 這個頁面有問題
     '503': 此頁面因伺服器暫時發生錯誤而無法提供。
-    noscript_html: 使用 Mastodon 網頁版應用需要啟用 JavaScript。你也可以選擇適用於你的平台的 <a href="%{apps_path}">Mastodon 應用</a>。
+    noscript_html: 使用 Mastodon 網頁版應用需要啟用 JavaScript。您也可以選擇適用於您的平台的 <a href="%{apps_path}">Mastodon 應用</a>。
   existing_username_validator:
     not_found: 無法在本站找到這個名稱的使用者
     not_found_multiple: 揣嘸 %{usernames}
@@ -884,8 +1084,8 @@ zh-TW:
     archive_takeout:
       date: 日期
       download: 下載檔案
-      hint_html: 你可以下載包含你的<strong>文章和媒體</strong>的檔案。資料以 ActivityPub 格式儲存，可用於相容的軟體。每次允許存檔的間隔至少7天。
-      in_progress: 正在準備你的存檔...
+      hint_html: 您可以下載包含您的<strong>文章和媒體</strong>的檔案。資料以 ActivityPub 格式儲存，可用於相容的軟體。每次允許存檔的間隔至少 7 天。
+      in_progress: 正在準備您的存檔...
       request: 下載存檔
       size: 大小
     blocks: 您封鎖的使用者
@@ -898,81 +1098,87 @@ zh-TW:
   featured_tags:
     add_new: 追加
     errors:
-      limit: 你所推薦的標籤數量已經達到上限
-    hint_html: "<strong>推薦標籤是什麼？</strong> 這些標籤將顯示於您的公開個人檔案頁，訪客可以藉此閱覽您標示了這些標籤的嘟文，拿來展示創意作品或者長期更新的專案很好用唷！"
+      limit: 您所推薦的標籤數量已經達到上限
+    hint_html: "<strong>推薦主題標籤是什麼？</strong> 這些主題標籤將顯示於您的公開個人檔案頁，訪客可以藉此閱覽您標示了這些標籤的嘟文，拿來展示創意作品或者長期更新的專案很好用唷！"
   filters:
     contexts:
-      account: 個人資料
+      account: 個人檔案
       home: 首頁時間軸
       notifications: 通知
       public: 公開時間軸
-      thread: 會話
+      thread: 對話
     edit:
-      title: 編輯篩選條件
+      add_keyword: 新增關鍵字
+      keywords: 關鍵字
+      statuses: 各別嘟文
+      statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或從過濾條件移除嘟文</a>。
+      title: 編輯過濾條件
     errors:
+      deprecated_api_multiple_keywords: 這些參數無法從此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
       invalid_context: 沒有提供內文或內文無效
-      invalid_irreversible: 此功能僅適用於首頁或通知頁面
     index:
+      contexts: "%{contexts} 中的過濾器"
       delete: 刪除
       empty: 您沒有過濾器。
+      expires_in: 於 %{distance} 過期
+      expires_on: 於 %{date} 過期
+      keywords:
+        other: "%{count} 個關鍵字"
+      statuses:
+        other: "%{count} 則嘟文"
+      statuses_long:
+        other: "%{count} 則各別嘟文被隱藏"
       title: 過濾器
     new:
-      title: 新增篩選器
+      save: 儲存新過濾器
+      title: 新增過濾器
+    statuses:
+      back_to_filter: 回到過濾器
+      batch:
+        remove: 從過濾器中移除
+      index:
+        hint: 此過濾器會套用至所選之各別嘟文，不管它們有無符合其他條件。您可以從網頁介面中將更多嘟文加入至此過濾器。
+        title: 已過濾之嘟文
   footer:
-    developers: 開發者
-    more: 更多......
-    resources: 資源
     trending_now: 現正熱門
   generic:
     all: 全部
+    all_items_on_page_selected_html:
+      other: 已選取此頁面上 <strong>%{count}</strong> 個項目。
+    all_matching_items_selected_html:
+      other: 已選取符合您搜尋的 <strong>%{count}</strong> 個項目。
     changes_saved_msg: 已成功儲存修改!
     copy: 複製
     delete: 刪除
-    no_batch_actions_available: 此頁面目前沒有可用的批次作業
+    deselect: 取消選擇全部
+    none: 無
     order_by: 排序
     save_changes: 儲存修改
+    select_all_matching_items:
+      other: 選取 %{count} 個符合您搜尋的項目。
+    today: 今天
     validation_errors:
       other: 唔…這是什麼鳥？請檢查以下 %{count} 項錯誤
   html_validator:
     invalid_markup: 含有無效的 HTML 語法：%{error}
-  identity_proofs:
-    active: 有效
-    authorize: 是的，請授權
-    authorize_connection_prompt: 授權此加密連接？
-    errors:
-      failed: 加密連接失敗。請於 %{provider} 重試。
-      keybase:
-        invalid_token: Keybase 標記必須為雜湊加密簽章並且由66個十六進位字符組成。
-        verification_failed: Keybase 無法確認此標記為 Keybase 使用者 %{kb_username} 的簽章。請在 Keybase 再試一次。
-      wrong_user: 未能為%{current} 以 %{proving} 建立身分驗證。請登入為 %{proving} 再試一次。
-    explanation_html: 在此你連結其他網路平台（如 Keybase）上的加密身分。讓其他人可以在那些平台上，傳送加密訊息給你，並驗證你的身分。
-    i_am_html: 我是 %{service} 上的 %{username}
-    identity: 身份
-    inactive: 非活躍
-    publicize_checkbox: 並發嘟：
-    publicize_toot: 驗證成功！我在是住在 %{service} 的 %{username} ： %{url}
-    remove: 移除帳戶證明
-    removed: 成功移除帳戶證明
-    status: 驗證狀態
-    view_proof: 檢視證明
   imports:
     errors:
+      invalid_csv_file: 無效的 CSV 檔案。錯誤訊息：%{error}
       over_rows_processing_limit: 含有超過 %{count} 行
     modes:
       merge: 合併
       merge_long: 保留現有記錄並新增紀錄
       overwrite: 覆蓋
       overwrite_long: 以新的紀錄覆蓋目前紀錄
-    preface: 您可以在此匯入您在其他伺服器所匯出的資料檔，包括關注的使用者、封鎖的使用者名單。
+    preface: 您可以在此匯入您在其他伺服器所匯出的資料檔，包括跟隨的使用者、封鎖的使用者名單。
     success: 資料檔上傳成功，正在匯入，請稍候
     types:
       blocking: 您封鎖的使用者名單
-      bookmarks: 我的最愛
+      bookmarks: 書籤
       domain_blocking: 域名封鎖名單
-      following: 您關注的使用者名單
+      following: 您跟隨的使用者名單
       muting: 您靜音的使用者名單
     upload: 上傳
-  in_memoriam_html: 謹此悼念。
   invites:
     delete: 停用
     expired: 已失效
@@ -985,7 +1191,7 @@ zh-TW:
       '86400': 1 天後
     expires_in_prompt: 永不過期
     generate: 建立邀請連結
-    invited_by: 你的邀請人是：
+    invited_by: 您的邀請人是：
     max_uses:
       other: "%{count} 則"
     max_uses_prompt: 無限制
@@ -996,14 +1202,14 @@ zh-TW:
     title: 邀請使用者
   lists:
     errors:
-      limit: 你所建立的列表數量已經達到上限
+      limit: 您所建立的列表數量已經達到上限
   login_activities:
     authentication_methods:
-      otp: 兩步驟驗證應用程式
+      otp: 兩階段驗證應用程式
       password: 密碼
       sign_in_token: 電子郵件安全碼
       webauthn: 安全金鑰
-    description_html: 若您看到您不認識的活動，請考慮變更您的密碼或啟用兩步驟驗證。
+    description_html: 若您看到您不認識的活動紀錄，請考慮變更您的密碼或啟用兩階段驗證。
     empty: 沒有可用的驗證歷史紀錄
     failed_sign_in_html: 使用來自 %{ip} (%{browser}) 的 %{method} 登入嘗試失敗
     successful_sign_in_html: 使用來自 %{ip} (%{browser}) 的 %{method} 登入成功
@@ -1014,25 +1220,25 @@ zh-TW:
       not_ready: 修但幾勒！不能附加未完成處理的檔案欸，咁按呢？
       too_many: 無法加入超過 4 個檔案
   migrations:
-    acct: 新帳戶的 使用者名稱@站點網域
+    acct: 新帳號的 使用者名稱@站點網域
     cancel: 取消重導向
-    cancel_explanation: 取消重新導向將會重新啟用目前帳戶，但不會還原已移至該帳號的關注者。
+    cancel_explanation: 取消重導向將會重新啓用目前帳號，但不會還原已移至該帳號的跟隨者。
     cancelled_msg: 成功取消重導向。
     errors:
-      already_moved: 與已經重導向的帳戶相同
-      missing_also_known_as: 不是這個帳戶的別名
-      move_to_self: 不能是目前帳戶
+      already_moved: 與已經重導向的帳號相同
+      missing_also_known_as: 不是這個帳號的別名
+      move_to_self: 不能是目前帳號
       not_found: 找不到
-      on_cooldown: 你正在處於冷卻（CD）狀態
-    followers_count: 轉移時的追隨者
-    incoming_migrations: 自另一個帳戶轉移
+      on_cooldown: 您正在處於冷卻（CD）狀態
+    followers_count: 轉移時的跟隨者
+    incoming_migrations: 自另一個帳號轉移
     incoming_migrations_html: 要從其他帳號移動到此帳號的話，首先您必須<a href="%{path}">建立帳號別名</a>。
-    moved_msg: 您的帳號正被重新導向到 %{acct}，您的追蹤者也會同步轉移至該帳號。
+    moved_msg: 您的帳號正被重新導向到 %{acct}，您的跟隨者也會同步轉移至該帳號。
     not_redirecting: 您的帳號目前尚未重新導向到任何其他帳號。
     on_cooldown: 您最近已轉移過您的帳號。此功能將在 %{count} 天後可再度使用。
     past_migrations: 以往的轉移紀錄
-    proceed_with_move: 移動關注者
-    redirected_msg: 您的帳戶現在指向 %{acct}
+    proceed_with_move: 移動跟隨者
+    redirected_msg: 您的帳號現在指向 %{acct}
     redirecting_to: 您的帳號目前正被重新導向到 %{acct}
     set_redirect: 設定重新導向
     warning:
@@ -1040,55 +1246,55 @@ zh-TW:
       before: 在進行下一步驟之前，請詳細閱讀以下説明：
       cooldown: 在轉移帳號後會有一段等待時間，在等待時間內您將無法再次轉移
       disabled_account: 之後您的目前帳號將完全無法使用。但您可以存取資料匯出與重新啟用。
-      followers: 此動作將會把目前帳號的所有追蹤者轉移至新帳號
-      only_redirect_html: 或者，您也可以<a href="%{path}">僅在您的個人資料中放置重新導向</a>。
+      followers: 此動作將會把目前帳號的所有跟隨者轉移至新帳號
+      only_redirect_html: 或者，您也可以<a href="%{path}">僅在您的個人檔案中設定重新導向</a>。
       other_data: 其他資料並不會自動轉移
-      redirect: 您目前的帳號將會在個人資料頁面新增重新導向公告，並會被排除在搜尋結果之外
+      redirect: 您目前的帳號將會在個人檔案頁面新增重新導向公告，並會被排除在搜尋結果之外
   moderation:
-    title: 營運
+    title: 站務
   move_handler:
     carry_blocks_over_text: 此使用者轉移自被您封鎖的 %{acct}。
     carry_mutes_over_text: 此使用者轉移自被您靜音的 %{acct}。
     copy_account_note_text: 此使用者轉移自 %{acct}，以下是您之前關於他們的備註：
+  navigation:
+    toggle_menu: 切換選單
   notification_mailer:
-    digest:
-      action: 閱覽所有通知
-      body: 以下是自%{since}你最後一次登入以來錯過的訊息摘要
-      mention: "%{name} 在此提及了你:"
-      new_followers_summary:
-        other: 此外，您在離開時獲得了 %{count} 位新的追蹤者！超棒的！
-      subject:
-        other: "從您上次造訪以來有 %{count} 個新通知 \U0001F418"
-      title: 你不在的時候...
+    admin:
+      report:
+        subject: "%{name} 送出了一則檢舉報告"
+      sign_up:
+        subject: "%{name} 已進行註冊"
     favourite:
-      body: '你的嘟文被 %{name} 加入了最愛:'
-      subject: "%{name} 將你的嘟文加入了最愛"
+      body: 您的嘟文被 %{name} 加入了最愛：
+      subject: "%{name} 將您的嘟文加入了最愛"
       title: 新的最愛
     follow:
-      body: "%{name} 開始關注你！"
-      subject: "%{name} 開始關注你"
-      title: 新的關注者
+      body: "%{name} 開始跟隨您！"
+      subject: "%{name} 開始跟隨您"
+      title: 新的跟隨者
     follow_request:
-      action: 處理關注請求
-      body: "%{name} 要求關注你"
-      subject: 等待關注你的使用者︰ %{name}
-      title: 新的關注請求
+      action: 處理跟隨請求
+      body: "%{name} 要求跟隨您"
+      subject: 等待跟隨您的使用者︰ %{name}
+      title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 在嘟文中提及你:"
-      subject: "%{name} 在嘟文中提及你"
+      body: "%{name} 在嘟文中提及您:"
+      subject: "%{name} 在嘟文中提及您"
       title: 新的提及
     poll:
       subject: 由 %{name} 發起的投票已結束
     reblog:
-      body: '你的嘟文被 %{name} 轉嘟:'
-      subject: "%{name} 轉嘟了你的嘟文"
+      body: 您的嘟文被 %{name} 轉嘟：
+      subject: "%{name} 轉嘟了您的嘟文"
       title: 新的轉嘟
     status:
       subject: "%{name} 剛剛嘟文"
+    update:
+      subject: "%{name} 編輯了嘟文"
   notifications:
     email_events: 電子郵件通知設定
-    email_events_hint: 選取你想接收通知的事件：
+    email_events_hint: 選取您想接收通知的事件：
     other_settings: 其他通知設定
   number:
     human:
@@ -1102,9 +1308,9 @@ zh-TW:
           trillion: T
   otp_authentication:
     code_hint: 請輸入您驗證應用程式所產生的代碼以確認
-    description_html: 若您啟用使用驗證應用程式的<strong>兩步驟驗證</strong>，您每次登入都需要輸入由您的手機所產生的權杖。
+    description_html: 若您啟用使用驗證應用程式的<strong>兩階段驗證</strong>，您每次登入都需要輸入由您的手機所產生之 Token。
     enable: 啟用
-    instructions_html: "<strong>請用您手機上的 Google Authenticator 或類似的 TOTP 應用程式掃描此 QR code</strong>。從現在開始，該應用程式將會產生您每次登入都必須輸入的權杖。"
+    instructions_html: "<strong>請用您手機上的 Google Authenticator 或類似的 TOTP 應用程式掃描此 QR code</strong>。從現在開始，該應用程式將會產生您每次登入都必須輸入的 token。"
     manual_instructions: 如果您無法掃描 QR code，則必須手動輸入此明文密碼：
     setup: 設定
     wrong_code: 您輸入的驗證碼無效！伺服器時間或是裝置時間無誤嗎？
@@ -1129,6 +1335,8 @@ zh-TW:
     other: 其他
     posting_defaults: 嘟文預設值
     public_timelines: 公開時間軸
+  privacy_policy:
+    title: 隱私權政策
   reactions:
     errors:
       limit_reached: 達到可回應之上限
@@ -1143,30 +1351,23 @@ zh-TW:
     last_active: 最後上線
     most_recent: 最近
     moved: 已轉移
-    mutual: 共同
+    mutual: 跟隨彼此
     primary: 主要
     relationship: 關係
-    remove_selected_domains: 從所選網域中移除所有追隨者
+    remove_selected_domains: 從所選網域中移除所有跟隨者
     remove_selected_followers: 移除所選的跟隨者
     remove_selected_follows: 取消跟隨所選使用者
-    status: 帳戶狀態
+    status: 帳號狀態
   remote_follow:
-    acct: 請輸入您的使用者名稱@站點網域
     missing_resource: 無法找到資源
-    no_account_html: 還沒有帳號？您可以<a href='%{sign_up_path}' target='_blank'>於這裡註冊</a>
-    proceed: 下一步
-    prompt: '您希望關注:'
-    reason_html: "<strong>為什麼要經過這個步驟？</strong>因為<code>%{instance}</code>未必是您註冊的伺服器，我們需要先將您帶回您駐在的伺服器。"
-  remote_interaction:
-    favourite:
-      proceed: 加入到最愛
-      prompt: 您欲將此嘟文加入最愛
-    reblog:
-      proceed: 確認轉嘟
-      prompt: 您想轉嘟此嘟文：
-    reply:
-      proceed: 確認回覆
-      prompt: 您想回覆此嘟文
+  reports:
+    errors:
+      invalid_rules: 未引用有效規則
+  rss:
+    content_warning: 內容警告：
+    descriptions:
+      account: 來自 @%{acct} 之公開嘟文
+      tag: '帶有 #%{hashtag} 之公開嘟文'
   scheduled_statuses:
     over_daily_limit: 您已經超過了本日排定發嘟的限額 (%{limit})
     over_total_limit: 您已經超過了排定發嘟的限額 (%{limit})
@@ -1176,7 +1377,7 @@ zh-TW:
     browser: 瀏覽器
     browsers:
       alipay: 支付寶
-      blackberry: 黑莓機
+      blackberry: 黑莓機（BlackBerry）
       chrome: Chrome 瀏覽器
       edge: Microsoft Edge 瀏覽器
       electron: Electron 瀏覽器
@@ -1194,13 +1395,13 @@ zh-TW:
       weibo: 新浪微博
     current_session: 目前的 session
     description: "%{platform} 上的 %{browser}"
-    explanation: 這些是現在正登入於你的 Mastodon 帳戶的瀏覽器。
+    explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
     ip: IP 位址
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: 黑莓機 （Blackberry）
-      chrome_os: Chrome OS
+      blackberry: 黑莓機（BlackBerry）
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -1209,31 +1410,31 @@ zh-TW:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
-    revoke: 取消
-    revoke_success: Session 取消成功
+    revoke: 註銷
+    revoke_success: Session 註銷成功
     title: 作業階段
     view_authentication_history: 檢視您帳號的身份驗證歷史紀錄
   settings:
-    account: 帳戶
-    account_settings: 帳戶設定
-    aliases: 帳戶別名
+    account: 帳號
+    account_settings: 帳號設定
+    aliases: 帳號別名
     appearance: 外觀設定
     authorized_apps: 已授權應用程式
     back: 回到 Mastodon
-    delete: 刪除帳戶
-    development: 開發
-    edit_profile: 編輯使用者資訊
+    delete: 刪除帳號
+    development: 開發者
+    edit_profile: 編輯個人檔案
     export: 匯出
     featured_tags: 推薦標籤
-    identity_proofs: 身分驗證
     import: 匯入
     import_and_export: 匯入及匯出
-    migrate: 帳戶搬遷
+    migrate: 帳號搬遷
     notifications: 通知
     preferences: 偏好設定
-    profile: 使用者資訊
+    profile: 個人檔案
     relationships: 跟隨中與跟隨者
-    statuses_cleanup: 自動貼文刪除
+    statuses_cleanup: 自動嘟文刪除
+    strikes: 管理警告
     two_factor_authentication: 兩階段認證
     webauthn_authentication: 安全金鑰
   statuses:
@@ -1247,18 +1448,19 @@ zh-TW:
         other: "%{count} 段影片"
     boosted_from_html: 轉嘟自 %{acct_link}
     content_warning: 內容警告： %{warning}
+    default_language: 與介面語言相同
     disallowed_hashtags:
       other: 含有不得使用的標籤： %{tags}
+    edited_at_html: 編輯於 %{date}
     errors:
       in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
-    language_detection: 自動偵測語言
     open_in_web: 以網頁開啟
     over_character_limit: 超過了 %{max} 字的限制
     pin_errors:
-      limit: 你所置頂的嘟文數量已經達到上限
-      ownership: 不能置頂他人的嘟文
-      private: 不能置頂非公開的嘟文
-      reblog: 不能置頂轉嘟
+      direct: 無法釘選只有僅提及使用者可見之嘟文
+      limit: 您所置頂的嘟文數量已經達到上限
+      ownership: 不能釘選他人的嘟文
+      reblog: 不能釘選轉嘟
     poll:
       total_people:
         other: "%{count} 個人"
@@ -1273,31 +1475,31 @@ zh-TW:
     title: "%{name}：「%{quote}」"
     visibilities:
       direct: 私訊
-      private: 僅關注者
-      private_long: 只有關注你的人能看到
+      private: 僅限跟隨者
+      private_long: 只有跟隨您的人能看到
       public: 公開
       public_long: 所有人都能看到
-      unlisted: 公開，但不在公共時間軸顯示
-      unlisted_long: 所有人都能看到，但不會出現在公共時間軸上
+      unlisted: 不在公開時間軸顯示
+      unlisted_long: 所有人都能看到，但不會出現在公開時間軸上
   statuses_cleanup:
-    enabled: 自動刪除舊貼文
-    enabled_hint: 一旦達到指定的保存期限，就會自動刪除您的貼文，除非貼文符合下列例外
+    enabled: 自動刪除舊嘟文
+    enabled_hint: 一旦達到指定的保存期限，就會自動刪除您的嘟文，除非該嘟文符合下列例外
     exceptions: 例外
-    explanation: 因為刪除貼文是昂貴的動作，所以當伺服器不那麼忙碌的時候才會慢慢完成。因此，您的貼文會在到達保存期限後一段時間才會被刪除。
+    explanation: 因為刪除嘟文是耗費資源的操作，當伺服器不那麼忙碌時才會慢慢完成。因此，您的嘟文會在到達保存期限後一段時間才會被刪除。
     ignore_favs: 忽略最愛
     ignore_reblogs: 忽略轉嘟
-    interaction_exceptions: 以互動為基礎的例外
+    interaction_exceptions: 基於互動的例外規則
     interaction_exceptions_explanation: 請注意嘟文是無法保證被刪除的，如果在一次處理過後嘟文低於最愛或轉嘟的門檻。
     keep_direct: 保留私訊
     keep_direct_hint: 不會刪除任何您的私訊
     keep_media: 保留包含媒體內容的嘟文
-    keep_media_hint: 不會刪除您包含媒體內容的嘟文
+    keep_media_hint: 不會刪除您包含媒體內容之嘟文
     keep_pinned: 保留釘選嘟文
     keep_pinned_hint: 不會刪除您的釘選嘟文
     keep_polls: 保留投票
     keep_polls_hint: 不會刪除您的投票
-    keep_self_bookmark: 保留您已標記為書簽之嘟文
-    keep_self_bookmark_hint: 不會刪除您已標記為書簽之嘟文
+    keep_self_bookmark: 保留您已標記為書籤之嘟文
+    keep_self_bookmark_hint: 不會刪除您已標記為書籤之嘟文
     keep_self_fav: 保留您已標記為最愛之嘟文
     keep_self_fav_hint: 不會刪除您已標記為最愛之嘟文
     min_age:
@@ -1306,189 +1508,123 @@ zh-TW:
       '2629746': 1 個月
       '31556952': 1 年
       '5259492': 2 個月
+      '604800': 1 週
       '63113904': 2 年
       '7889238': 3 個月
-    min_age_label: 按時間篩選
+    min_age_label: 保存期限
     min_favs: 保留超過嘟文最愛門檻
-    min_favs_hint: 如果您嘟文已收到超過最愛門檻則不會刪除。留白表示不論最愛數量皆刪除嘟文。
+    min_favs_hint: 如果您嘟文已收到超過最愛門檻則不會刪除。留白表示不論最愛數量皆刪除該嘟文。
     min_reblogs: 保留超過嘟文轉嘟門檻
-    min_reblogs_hint: 如果您嘟文已收到超過轉嘟門檻則不會刪除。留白表示不論轉嘟數量皆刪除嘟文。
+    min_reblogs_hint: 如果您嘟文已收到超過轉嘟門檻則不會刪除。留白表示不論轉嘟數量皆刪除該嘟文。
   stream_entries:
-    pinned: 置頂嘟文
+    pinned: 釘選嘟文
     reblogged: 轉嘟
     sensitive_content: 敏感內容
+  strikes:
+    errors:
+      too_late: 您太晚申訴這個警示了
   tags:
     does_not_match_previous_name: 與先前的名稱不吻合
-  terms:
-    body_html: |
-      <h2>隱私權政策</h2>
-      <h3 id="collect">我們會蒐集哪些資訊？</h3>
-
-      <ul>
-        <li><em>基本帳號資訊</em>：若您在此伺服氣上註冊，您可能會被要求輸入使用者名稱、電子郵件地址與密碼。您也可能會輸入額外的個人檔案資訊，如顯示名稱或簡介等，以及上傳個人資料圖片與封面圖片。使用者名稱、顯示名稱、簡介、個人檔案名稱與封面圖片一律都會公開陳列。</li>
-        <li><em>貼文、追蹤與其他資訊</em>：您追蹤的人的清單會是公開陳列的，您的追蹤者同樣如此。當您地交了一條訊息，日期與時間，以及您從哪個應用程式遞交訊息也同樣會被儲存。訊息可能會包含多媒體附件，如圖片或影片。公開或未列出的貼文都可公開使用。當您在您的個人資料上特別突顯了某篇貼文，那麼這也會是公開資訊。您的貼文會被遞送給您的追蹤者，在某些情況下，這代表了它們會被遞送到其他伺服器，並儲存在那邊。當您刪除貼文時，同樣會遞送給您的追蹤者。轉發或收藏其他貼文的動作也同樣是公開的。</li>
-        <li><em>直接與僅限追蹤者的貼文</em>：所有貼文都由伺服器儲存並處理。僅限追蹤者的貼文會被遞送給您的追蹤者，以及其中所提及的使用者，而直接貼文則僅會遞送給其中提到的使用者。在某些情況下，這代表了它們會被遞送到其他伺服器，並儲存在那邊。我們非常努力地讓這些貼文的存取僅供被授權的人使用，但其他伺服器可能沒有這樣做。因此審閱您的追蹤者屬於的伺服器也很重要。您可以在設定中切換批准與回絕新追蹤者的選項。<em>請注意，伺服器的營運者與任何接收的伺服器都可以檢視這輛的訊息</em>，且接收者可能會螢幕截圖、複製或以其他方式轉分享這類訊息。<em>所以請不要透過 Mastodon 分享任何危險的資訊。</em></li>
-        <li><em>IP 與詮釋資料</em>：當您登入時，我們會紀錄從登入的 IP 位置，以及您瀏覽器應用程式的名稱。您可以在設定中審閱並撤銷所有已登入的工作階段。最新使用的 IP 位置會儲存長達 12 個月。我們也可能會保留伺服器紀錄檔，其中包含了每個請求存取我們的伺服器的 IP 位置。</li></ul>
-
-      <hr class="spacer" />
-
-      <h3 id="use">我們會將您的資訊用於何種目的？</h3>
-
-      <p>我們從您那裡蒐集而來的資訊都可能作為以下用途：</p>
-
-      <ul>
-        <li>提供 Mastodon 的核心功能。您只能在登入後與其他人的內容互動，並張貼您自己的內容。舉例來說，您可能會追蹤其他人，以在您個人化的家時間軸中檢視各種貼文的結合。</li>
-        <li>協助社群管理，例如比較您的 IP 位置與其他已知的 IP 位置進行比較，以確定是否有逃避禁令或其他違規行為。</li>
-        <li>您提供的電子郵件地址可能會用於傳送關於其他人與您的內容互動的資訊、通知或是訊息給您，以及回覆查詢，及／或其他請求或問題。</li>
-      </ul>
-
-      <hr class="spacer" />
-
-      <h3 id="protect">我們如何保護您的資訊？</h3>
-
-      <p>當您輸入、遞交或存取您的個人資訊時，我們會實施各種安全措施來維護您個人資訊的安全。除此之外，您的瀏覽器工作階段與您應用程式及 API 間的流量都以 SSL 進行保護，您的密碼也使用了相當強的單向演算法來雜湊。您可以啟用兩步驟驗證來進一步強化您帳號的安全程度。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="data-retention">我們的資料保留政策是什麼？</h3>
-
-      <p>我們將努力：</p>
-
-      <ul>
-        <li>保留包含所有對此伺服器請求的 IP 位置的伺服器紀錄檔，只要此類紀錄檔不保留超過 90 天。</li>
-        <li>保留與註冊使用者相關的 IP 位置不超過 12 個月。</li>
-      </ul>
-
-      <p>您可以請求並下載您內容的封存檔案，包含了您的貼文、多媒體附件、個人檔案圖片與封面圖片。</p>
-
-      <p>您隨時都可以不可逆地刪除您的帳號。</p>
-
-      <hr class="spacer"/>
-
-      <h3 id="cookies">我們會使用 cookies 嗎？</h3>
-      <p>是的。Cookies 是網站或其服務提供者透過您的網路瀏覽器（若您允許）傳送到您電腦硬碟的小檔案。這些 cookies 讓網站可以識別您的瀏覽器，以及如果您有註冊帳號的話，同時關聯到您已註冊的帳號。</p>
-
-      <p>我們使用 cookies 來了解並儲存您的偏好設定以供未來存取。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="disclose">我們會向外界揭露任何資訊嗎？</h3>
-
-      <p>我們不會出售、交易或是以其他方式向外界傳輸您的個人身份資料。這不包含協助我們營運網站、開展業務或是服務您的可信第三方，只要這些第三方同意對這些資訊保密。當我們認為發佈您的資訊是為了遵守法律、執行我們網站的政策、或是保護我們或其他人的權利、財產或安全時，我們也可能會發佈您的資訊。</p>
-
-      <p>您的公開內容可能會網路中其他伺服器下載。您的公開與僅追蹤者貼文將會遞送到您的追蹤者所在的伺服器，直接訊息則會遞送到接收者所在的伺服器，前提是這些追蹤者或接收者在不同的伺服器上。</p>
-
-      <p>當您授權應用程式使用您的帳號時，根據您所批准的授權範圍，其可能會存取您的公開個人檔案資訊、您的追蹤清單、您的追蹤者、您的清單、您所有的貼文以及您的收藏。應用程式永遠無法存取您的電子郵件地址或密碼。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="children">兒童使用網站</h3>
-
-      <p>如果伺服器位於歐盟或歐洲經濟區中：我們的網站、產品與服務均供至少 16 歲的人使用。如果您小於 16 歲，根據 GDPR（<a href="https://zh.wikipedia.org/wiki/歐盟一般資料保護規範">一般資料保護規範</a>）的要求，請勿使用此網站。</p>
-
-      <p>若此伺服器位於美國：我們的網站、產品與服務均供至少 13 歲的人使用。如果您小於 13 歲，根據 COPPA（<a href="https://zh.wikipedia.org/wiki/儿童在线隐私保护法">兒童線上隱私保護法</a>）的要求，請勿使用此忘站。</p>
-
-      <p>如果此伺服器位於其他司法管轄區，則法律要求可能會有所不同。</p>
-
-      <hr class="spacer" />
-
-      <h3 id="changes">我們隱私權政策的變更</h3>
-
-      <p>若我們決定變更我們的隱私權政策，我們將會在此頁面張貼那些變更。</p>
-
-      <p>此文件以 CC-BY-SA 授權。最後更新時間為2018年3月7日。</p>
-
-      <p>最初改編自 <a href="https://github.com/discourse/discourse">Discourse 隱私權政策</a>。</p>
-    title: "%{instance} 使用條款和隱私權政策"
   themes:
     contrast: Mastodon（高對比）
     default: Mastodon（深色）
-    mastodon-light: Mastodon（亮色主題）
+    mastodon-light: Mastodon（亮色）
   time:
     formats:
-      default: "%Y年%-m月%d日 %H:%M"
+      default: "%Y 年 %b 月 %d 日 %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: 新增
     disable: 停用
-    disabled_success: 已成功啟用兩步驟驗證
+    disabled_success: 已成功啟用兩階段驗證
     edit: 編輯
     enabled: 兩階段認證已啟用
     enabled_success: 已成功啟用兩階段認證
     generate_recovery_codes: 產生備用驗證碼
-    lost_recovery_codes: 讓你可以在遺失手機時，使用備用驗證碼登入。如果你遺失了備用驗證碼，可以在這裏產生一批新的，舊有的備用驗證碼將會失效。
+    lost_recovery_codes: 讓您可以在遺失手機時，使用備用驗證碼登入。若您遺失了備用驗證碼，可以在這裏產生一批新的，舊有的備用驗證碼將會失效。
     methods: 兩步驟方式
     otp: 驗證應用程式
     recovery_codes: 備份備用驗證碼
     recovery_codes_regenerated: 成功產生新的備用驗證碼
-    recovery_instructions_html: 如果你的手機無法使用，你可以使用下列任意一個備用驗證碼來重新獲得帳戶的訪問權。<strong>請妥善保管好你的備用驗證碼</strong>（例如，你可以將它們列印出來，與你的其他重要文件放在一起）。
+    recovery_instructions_html: 若您的手機無法使用，您可以使用下列任意一個備用驗證碼來重新獲得帳號的訪問權。<strong>請妥善保管好您的備用驗證碼</strong>（例如，可以將它們列印出來，與您的其他重要文件放在一起）。
     webauthn: 安全金鑰
   user_mailer:
+    appeal_approved:
+      action: 前往您的帳號
+      explanation: 您在 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示的申訴已獲批准。您的帳號再次享有良好的信譽。
+      subject: 您在 %{date} 提出的申訴已獲批准
+      title: 申訴已批准
+    appeal_rejected:
+      explanation: 您在 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示的申訴已被駁回。
+      subject: 您在 %{date} 提出的申訴已被駁回
+      title: 申訴被駁回
     backup_ready:
-      explanation: 你要求的 Mastodon 帳戶完整備份檔案現已就緒，可供下載!
-      subject: 你的備份檔已可供下載
+      explanation: 您要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載！
+      subject: 您的備份檔已可供下載
       title: 檔案匯出
-    sign_in_token:
-      details: 以下是嘗試登入的詳細資訊：
-      explanation: 我們偵測到有人試圖從陌生的 IP 位置登入您的帳號。如果這是您，請在「登入確認」頁面輸入安全碼：
-      further_actions: 如果這不是你，請立即到這裡變更你的密碼，並啟用兩步驟驗證：
-      subject: 請確認登入嘗試
-      title: 登入嘗試
+    suspicious_sign_in:
+      change_password: 變更密碼
+      details: 以下是該登入之詳細資訊：
+      explanation: 我們偵測到有新 IP 地址登入您的帳號
+      further_actions_html: 如果這個不是您，我們建議您立即 %{action} ，並且啟用二階段驗證 (2FA) 以確保帳號安全。
+      subject: 您的帳號已被新 IP 地址存取
+      title: 新登入
     warning:
+      appeal: 遞交申訴
+      appeal_description: 若您認為這是錯誤，您可以向 %{instance} 的工作人員提出申訴。
+      categories:
+        spam: 垃圾訊息
+        violation: 該內容違反以下社群規章
       explanation:
-        disable: 您將無法以任何方式登入或使用您的帳號，但您的個人資料頁面和其他資料仍保持完整。
-        sensitive: 您上傳的媒體檔案或連結的媒體將會被標記為敏感。
-        silence: 您仍然可以使用您的帳號，但僅有已追蹤您的人才能看到您在此伺服器的貼文，您也可能會從公開清單中被排除。但其他人仍可手動追蹤您。
-        suspend: 您將不能使用您的帳號，您的個人資料頁面及其他資料將不再能被取得。您仍可在資料被完全刪除前要求下載你的資料，但我們仍會保留一部份資料，以防止有人規避停權處罰。
-      get_in_touch: 您可以回覆此電子郵件並與 %{instance} 的工作人員們聯絡。
-      review_server_policies: 檢視伺服器政策
-      statuses: 特別是：
+        delete_statuses: 您的某些嘟文被發現違反了一項或多項社群準則，隨後已被 %{instance} 的管理員刪除。
+        disable: 您無法繼續使用您的帳號，但您的個人頁面及其他資料內容保持不變。您可以要求一份您的資料備份，帳號異動設定，或是刪除帳號。
+        mark_statuses_as_sensitive: 您的部份嘟文已被 %{instance} 的管理員標記為敏感內容。這代表了人們必須在顯示預覽前點擊嘟文中的媒體。您可以在將來嘟文時自己將媒體標記為敏感內容。
+        sensitive: 由此刻起，您所有上傳的媒體檔案將被標記為敏感內容，並且隱藏於點擊警告之後。
+        silence: 您仍然可以使用您的帳號，但僅有已跟隨您的人才能看到您在此伺服器的嘟文，您也可能會從各式探索功能中被排除。但其他人仍可手動跟隨您。
+        suspend: 您將不能使用您的帳號，您的個人檔案頁面及其他資料將不再能被存取。您仍可於約 30 日內資料被完全刪除前要求下載您的資料，但我們仍會保留一部份基本資料，以防止有人規避停權處罰。
+      reason: 原因：
+      statuses: 引用的嘟文：
       subject:
+        delete_statuses: 您於 %{acct} 之嘟文已被移除
         disable: 您的帳號 %{acct} 已被凍結
+        mark_statuses_as_sensitive: 您在 %{acct} 上的嘟文已被標記為敏感內容
         none: 對 %{acct} 的警告
-        sensitive: 您帳號 %{acct} 張貼的媒體已被標記為敏感內容
+        sensitive: 從現在開始，您在 %{acct} 上的嘟文將會被標記為敏感內容
         silence: 您的帳號 %{acct} 已被限制
         suspend: 您的帳號 %{acct} 已被停權
       title:
+        delete_statuses: 嘟文已移除
         disable: 帳號已被涷結
+        mark_statuses_as_sensitive: 嘟文已標記為敏感內容
         none: 警告
-        sensitive: 您的媒體已被標記為敏感內容
+        sensitive: 帳號已標記為敏感內容
         silence: 帳號已被限制
         suspend: 帳號己被停用
     welcome:
-      edit_profile_action: 設定個人資料
-      edit_profile_step: 你可以設定你的個人資料，包括上傳頭像、橫幅圖片、變更顯示名稱等等。如果你想在新的關注者關注你之前對他們進行審核，你也可以選擇為你的帳戶設為「私人」。
-      explanation: 下面是幾個小幫助，希望它們能幫到你
+      edit_profile_action: 設定個人檔案
+      edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇在新的跟隨者跟隨前，先對他們進行審核。
+      explanation: 下面是幾個小幫助，希望它們能幫到您
       final_action: 開始嘟嘟
-      final_step: '開始嘟嘟吧! 即使你現在沒有關注者，其他人仍然能在本站時間軸或著話題標籤等地方看到你的公開嘟文。試著用 #introductions 這個話題標籤介紹一下自己吧。'
-      full_handle: 你的完整帳戶名稱
-      full_handle_hint: 你需要把這告訴你的朋友們，這樣他們就能從另一個伺服器向你發送訊息或著關注你。
-      review_preferences_action: 變更偏好設定
-      review_preferences_step: 記得調整你的偏好設定，比如你想接收什麼類型的電子郵件，或著你想把你的嘟文可見範圍預設設定什麼級別。如果你沒有暈車的話，考慮一下啟用「自動播放 GIF 動畫」這個選項吧。
+      final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能在本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
+      full_handle: 您的完整帳號名稱
+      full_handle_hint: 您需要把這告訴您的朋友們，這樣他們就能從另一個伺服器向您發送訊息或著跟隨您。
       subject: 歡迎來到 Mastodon
-      tip_federated_timeline: 跨站公共時間軸可以讓你一窺更廣闊的 Mastodon 網路。不過，由於它們只顯示你的鄰居們所訂閱的內容，所以並不是全部。
-      tip_following: 預設情況下，你會自動關注你所在站點的管理員。想結交更多有趣的人的話，記得多逛逛本站時間軸與跨站公共時間軸哦。
-      tip_local_timeline: 本站時間軸可以讓你一窺 %{instance} 上的使用者。他們就是離你最近的鄰居！
-      tip_mobile_webapp: 如果你的行動裝置瀏覽器允許你將 Mastodon 新增到主螢幕，你就能夠接收推送訊息。它就像手機APP一樣好用!
-      tips: 小幫手
-      title: "%{name} 歡迎你的加入！"
+      title: "%{name} 誠摯歡迎您的加入！"
   users:
-    follow_limit_reached: 您無法追蹤多於 %{limit} 個人
-    generic_access_help_html: 存取您的帳號時遇到困難？您可以透過 %{email} 取得協助
+    follow_limit_reached: 您無法跟隨多於 %{limit} 個人
     invalid_otp_token: 兩階段認證碼不正確
-    invalid_sign_in_token: 安全碼無效
-    otp_lost_help_html: 如果你無法訪問這兩者，可以通過 %{email} 與我們聯繫
-    seamless_external_login: 由於你是從外部系統登入，所以不能設定密碼與電子郵件。
-    signed_in_as: 目前登入的帳戶：
-    suspicious_sign_in_confirmation: 您之前似乎未從此裝置登入過，再加上您也有一段時間沒有登入了，因此我們剛剛傳送了安全碼到您的電子郵件地址以確認真的是您。
+    otp_lost_help_html: 如果您無法訪問這兩者，可以透過 %{email} 與我們聯繫
+    seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
+    signed_in_as: 目前登入的帳號：
   verification:
-    explanation_html: 您在 Mastodon 個人資料頁上所列出的連結，可以用此方式<strong>驗證您確實掌控該連結網頁的內容</strong>。您可以在連結的網頁上加上一個連回 Mastodon 個人資料頁的連結，該連結的原始碼 <strong>必須</strong>包含<code>rel="me"</code>屬性。連結的顯示文字可自由發揮，以下為範例：
+    explanation_html: 您在 Mastodon 個人檔案頁上所列出的連結，可以用此方式<strong>驗證您確實掌控該連結網頁的內容</strong>。您可以在連結的網頁上加上一個連回 Mastodon 個人檔案頁面的連結，該連結的原始碼 <strong>必須</strong>包含<code>rel="me"</code>屬性。連結的顯示文字可自由發揮，以下為範例：
     verification: 驗證連結
   webauthn_credentials:
     add: 新增安全金鑰
     create:
       error: 新增安全金鑰時出現了問題。請再試一次。
-      success: 你已成功加入安全金鑰。
+      success: 您已成功加入安全金鑰。
     delete: 刪除
     delete_confirmation: 您確定要移除這把安全金鑰嗎？
     description_html: 如果您啟用<strong>安全金鑰驗證</strong>的話，您將在登入時需要使用其中一把安全金鑰。
@@ -1499,5 +1635,5 @@ zh-TW:
     nickname_hint: 輸入您新安全金鑰的暱稱
     not_enabled: 您尚未啟用 WebAuthn
     not_supported: 此瀏覽器並不支援安全金鑰
-    otp_required: 請先啟用兩步驟驗證以使用安全金鑰。
+    otp_required: 請先啟用兩階段驗證以使用安全金鑰。
     registered_on: 註冊於 %{date}
diff --git a/config/navigation.rb b/config/navigation.rb
index 05eb3f41a..30817d025 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -2,64 +2,67 @@
 
 SimpleNavigation::Configuration.run do |navigation|
   navigation.items do |n|
-    n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
+    n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_path
 
-    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url, if: -> { current_user.functional? } do |s|
-      s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url
-      s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
+    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? } do |s|
+      s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_path
+      s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path
     end
 
-    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, if: -> { current_user.functional? } do |s|
-      s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url
-      s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url
-      s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
+    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? } do |s|
+      s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_path
+      s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_path
+      s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_path
     end
 
-    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url, if: -> { current_user.functional? }
+    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? }
     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? }
-    n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_url, if: -> { current_user.functional? }
+    n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? }
 
-    n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_url do |s|
-      s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities}
-      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_url, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
-      s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
+    n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_path do |s|
+      s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
+      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_path, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
+      s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_path
     end
 
-    n.item :data, safe_join([fa_icon('cloud-download fw'), t('settings.import_and_export')]), settings_export_url do |s|
-      s.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url, if: -> { current_user.functional? }
-      s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
+    n.item :data, safe_join([fa_icon('cloud-download fw'), t('settings.import_and_export')]), settings_export_path do |s|
+      s.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_path, if: -> { current_user.functional? }
+      s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_path
     end
 
-    n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' && current_user.functional? }
-    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url, if: -> { current_user.functional? }
+    n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? }
+    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, if: -> { current_user.functional? }
 
-    n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_tags_path, if: proc { current_user.staff? } do |s|
+    n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) } do |s|
+      s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
       s.item :tags, safe_join([fa_icon('hashtag fw'), t('admin.trends.tags.title')]), admin_trends_tags_path, highlights_on: %r{/admin/tags|/admin/trends/tags}
       s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
     end
 
-    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), admin_reports_url, if: proc { current_user.staff? } do |s|
-      s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
-      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url(status: :unresolved), highlights_on: %r{/admin/reports}
-      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts}
-      s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
-      s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}
-      s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: whitelist_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.admin? }
-      s.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? }
-      s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_url, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.admin? }
+    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) } do |s|
+      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports}, if: -> { current_user.can?(:manage_reports) }
+      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
+      s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
+      s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: whitelist_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
+      s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
+      s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
+      s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
     end
 
-    n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |s|
-      s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
-      s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings}
-      s.item :rules, safe_join([fa_icon('gavel fw'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}
-      s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}
-      s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis}
-      s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? && !whitelist_mode? }, highlights_on: %r{/admin/relays}
-      s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
-      s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
+    n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), nil, if: -> { current_user.can?(:view_dashboard, :manage_settings, :manage_rules, :manage_announcements, :manage_custom_emojis, :manage_webhooks, :manage_federation) } do |s|
+      s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_path, if: -> { current_user.can?(:view_dashboard) }
+      s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_path, if: -> { current_user.can?(:manage_settings) }, highlights_on: %r{/admin/settings}
+      s.item :rules, safe_join([fa_icon('gavel fw'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}, if: -> { current_user.can?(:manage_rules) }
+      s.item :roles, safe_join([fa_icon('vcard fw'), t('admin.roles.title')]), admin_roles_path, highlights_on: %r{/admin/roles}, if: -> { current_user.can?(:manage_roles) }
+      s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) }
+      s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }
+      s.item :webhooks, safe_join([fa_icon('inbox fw'), t('admin.webhooks.title')]), admin_webhooks_path, highlights_on: %r{/admin/webhooks}, if: -> { current_user.can?(:manage_webhooks) }
+      s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_path, highlights_on: %r{/admin/relays}, if: -> { !whitelist_mode? && current_user.can?(:manage_federation) }
     end
 
-    n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }
+    n.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_path, link_html: { target: 'sidekiq' }, if: -> { current_user.can?(:view_devops) }
+    n.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_path, link_html: { target: 'pghero' }, if: -> { current_user.can?(:view_devops) }
+    n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_path, link_html: { 'data-method' => 'delete' }
   end
 end
diff --git a/config/roles.yml b/config/roles.yml
new file mode 100644
index 000000000..f443250d1
--- /dev/null
+++ b/config/roles.yml
@@ -0,0 +1,35 @@
+moderator:
+  name: Moderator
+  position: 10
+  permissions:
+    - view_dashboard
+    - view_audit_log
+    - manage_users
+    - manage_reports
+    - manage_taxonomies
+admin:
+  name: Admin
+  position: 100
+  permissions:
+    - view_dashboard
+    - view_audit_log
+    - manage_users
+    - manage_user_access
+    - delete_user_data
+    - manage_reports
+    - manage_taxonomies
+    - manage_federation
+    - manage_settings
+    - manage_blocks
+    - manage_appeals
+    - manage_rules
+    - manage_invites
+    - manage_announcements
+    - manage_custom_emojis
+    - manage_webhooks
+    - manage_roles
+owner:
+  name: Owner
+  position: 1000
+  permissions:
+    - administrator
diff --git a/config/routes.rb b/config/routes.rb
index 2357ab6c7..98e19667c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,13 +4,39 @@ require 'sidekiq_unique_jobs/web'
 require 'sidekiq-scheduler/web'
 
 Rails.application.routes.draw do
+  # Paths of routes on the web app that to not require to be indexed or
+  # have alternative format representations requiring separate controllers
+  web_app_paths = %w(
+    /getting-started
+    /keyboard-shortcuts
+    /home
+    /public
+    /public/local
+    /conversations
+    /lists/(*any)
+    /notifications
+    /favourites
+    /bookmarks
+    /pinned
+    /start
+    /directory
+    /explore/(*any)
+    /search
+    /publish
+    /follow_requests
+    /blocks
+    /domain_blocks
+    /mutes
+    /statuses/(*any)
+  ).freeze
+
   root 'home#index'
 
   mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development?
 
   get 'health', to: 'health#show'
 
-  authenticate :user, lambda { |u| u.admin? } do
+  authenticate :user, lambda { |u| u.role&.can?(:view_devops) } do
     mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq
     mount PgHero::Engine, at: 'pghero', as: :pghero
   end
@@ -47,7 +73,7 @@ Rails.application.routes.draw do
     end
   end
 
-  devise_for :users, path: 'auth', controllers: {
+  devise_for :users, path: 'auth', format: false, controllers: {
     omniauth_callbacks: 'auth/omniauth_callbacks',
     sessions:           'auth/sessions',
     registrations:      'auth/registrations',
@@ -56,12 +82,10 @@ Rails.application.routes.draw do
   }
 
   get '/users/:username', to: redirect('/@%{username}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
+  get '/users/:username/statuses/:id', to: redirect('/@%{username}/%{id}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 
   resources :accounts, path: 'users', only: [:show], param: :username do
-    get :remote_follow,  to: 'remote_follow#new'
-    post :remote_follow, to: 'remote_follow#create'
-
     resources :statuses, only: [:show] do
       member do
         get :activity
@@ -85,17 +109,21 @@ Rails.application.routes.draw do
 
   resource :inbox, only: [:create], module: :activitypub
 
-  get '/@:username', to: 'accounts#show', as: :short_account
-  get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
-  get '/@:username/media', to: 'accounts#show', as: :short_account_media
-  get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag
-  get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status
-  get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status
+  constraints(username: /[^@\/.]+/) do
+    get '/@:username', to: 'accounts#show', as: :short_account
+    get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
+    get '/@:username/media', to: 'accounts#show', as: :short_account_media
+    get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag
+  end
 
-  get  '/interact/:id', to: 'remote_interaction#new', as: :remote_interaction
-  post '/interact/:id', to: 'remote_interaction#create'
+  constraints(account_username: /[^@\/.]+/) do
+    get '/@:account_username/following', to: 'following_accounts#index'
+    get '/@:account_username/followers', to: 'follower_accounts#index'
+    get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status
+    get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status
+  end
 
-  get '/explore', to: 'directories#index', as: :explore
+  get '/@:username_with_domain/(*any)', to: 'home#index', constraints: { username_with_domain: /([^\/])+?/ }, format: false
   get '/settings', to: redirect('/settings/profile')
 
   namespace :settings do
@@ -164,6 +192,12 @@ Rails.application.routes.draw do
     resources :login_activities, only: [:index]
   end
 
+  namespace :disputes do
+    resources :strikes, only: [:show, :index] do
+      resource :appeal, only: [:create]
+    end
+  end
+
   resources :media, only: [:show] do
     get :player
   end
@@ -171,12 +205,18 @@ Rails.application.routes.draw do
   resources :tags,   only: [:show]
   resources :emojis, only: [:show]
   resources :invites, only: [:index, :create, :destroy]
-  resources :filters, except: [:show]
+  resources :filters, except: [:show] do
+    resources :statuses, only: [:index], controller: 'filters/statuses' do
+      collection do
+        post :batch
+      end
+    end
+  end
+
   resource :relationships, only: [:show, :update]
   resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
 
-  get '/public', to: 'public_timelines#show', as: :public_timeline
-  get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy
+  get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false
 
   resource :authorize_interaction, only: [:show, :create]
   resource :share, only: [:show, :create]
@@ -185,9 +225,32 @@ Rails.application.routes.draw do
     get '/dashboard', to: 'dashboard#index'
 
     resources :domain_allows, only: [:new, :create, :show, :destroy]
-    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit]
+    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit] do
+      collection do
+        post :batch
+      end
+    end
+
+    resources :export_domain_allows, only: [:new] do
+      collection do
+        get :export, constraints: { format: :csv }
+        post :import
+      end
+    end
+
+    resources :export_domain_blocks, only: [:new] do
+      collection do
+        get :export, constraints: { format: :csv }
+        post :import
+      end
+    end
+
+    resources :email_domain_blocks, only: [:index, :new, :create] do
+      collection do
+        post :batch
+      end
+    end
 
-    resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
     resources :warning_presets, except: [:new]
 
@@ -198,7 +261,18 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :settings, only: [:edit, :update]
+    get '/settings', to: redirect('/admin/settings/branding')
+    get '/settings/edit', to: redirect('/admin/settings/branding')
+
+    namespace :settings do
+      resource :branding, only: [:show, :update], controller: 'branding'
+      resource :registrations, only: [:show, :update], controller: 'registrations'
+      resource :content_retention, only: [:show, :update], controller: 'content_retention'
+      resource :about, only: [:show, :update], controller: 'about'
+      resource :appearance, only: [:show, :update], controller: 'appearance'
+      resource :discovery, only: [:show, :update], controller: 'discovery'
+    end
+
     resources :site_uploads, only: [:destroy]
 
     resources :invites, only: [:index, :create, :destroy] do
@@ -224,15 +298,26 @@ Rails.application.routes.draw do
 
     resources :rules
 
+    resources :webhooks do
+      member do
+        post :enable
+        post :disable
+      end
+
+      resource :secret, only: [], controller: 'webhooks/secrets' do
+        post :rotate
+      end
+    end
+
     resources :reports, only: [:index, :show] do
+      resources :actions, only: [:create], controller: 'reports/actions'
+
       member do
         post :assign_to_self
         post :unassign
         post :reopen
         post :resolve
       end
-
-      resources :reported_statuses, only: [:create]
     end
 
     resources :report_notes, only: [:create, :destroy]
@@ -259,7 +344,13 @@ Rails.application.routes.draw do
       resource :change_email, only: [:show, :update]
       resource :reset, only: [:create]
       resource :action, only: [:new, :create], controller: 'account_actions'
-      resources :statuses, only: [:index, :show, :create, :update, :destroy]
+
+      resources :statuses, only: [:index, :show] do
+        collection do
+          post :batch
+        end
+      end
+
       resources :relationships, only: [:index]
 
       resource :confirmation, only: [:create] do
@@ -267,18 +358,11 @@ Rails.application.routes.draw do
           post :resend
         end
       end
-
-      resource :role, only: [] do
-        member do
-          post :promote
-          post :demote
-        end
-      end
     end
 
     resources :users, only: [] do
-      resource :two_factor_authentication, only: [:destroy]
-      resource :sign_in_token_authentication, only: [:create, :destroy]
+      resource :two_factor_authentication, only: [:destroy], controller: 'users/two_factor_authentications'
+      resource :role, only: [:show, :update], controller: 'users/roles'
     end
 
     resources :custom_emojis, only: [:index, :new, :create] do
@@ -293,6 +377,7 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :roles, except: [:show]
     resources :account_moderation_notes, only: [:create, :destroy]
     resource :follow_recommendations, only: [:show, :update]
     resources :tags, only: [:show, :update]
@@ -310,6 +395,12 @@ Rails.application.routes.draw do
         end
       end
 
+      resources :statuses, only: [:index] do
+        collection do
+          post :batch
+        end
+      end
+
       namespace :links do
         resources :preview_card_providers, only: [:index], path: :publishers do
           collection do
@@ -318,17 +409,26 @@ Rails.application.routes.draw do
         end
       end
     end
+
+    namespace :disputes do
+      resources :appeals, only: [:index] do
+        member do
+          post :approve
+          post :reject
+        end
+      end
+    end
   end
 
   get '/admin', to: redirect('/admin/dashboard', status: 302)
 
-  namespace :api do
+  namespace :api, format: false do
     # OEmbed
     get '/oembed', to: 'oembed#show', as: :oembed
 
     # JSON / REST API
     namespace :v1 do
-      resources :statuses, only: [:create, :show, :destroy] do
+      resources :statuses, only: [:create, :show, :update, :destroy] do
         scope module: :statuses do
           resources :reblogged_by, controller: :reblogged_by_accounts, only: :index
           resources :favourited_by, controller: :favourited_by_accounts, only: :index
@@ -346,6 +446,11 @@ Rails.application.routes.draw do
 
           resource :pin, only: :create
           post :unpin, to: 'pins#destroy'
+
+          resource :history, only: :show
+          resource :source, only: :show
+
+          post :translate, to: 'translations#create'
         end
 
         member do
@@ -419,6 +524,7 @@ Rails.application.routes.draw do
       namespace :trends do
         resources :links, only: [:index]
         resources :tags, only: [:index]
+        resources :statuses, only: [:index]
       end
 
       namespace :emails do
@@ -427,11 +533,15 @@ Rails.application.routes.draw do
 
       resource :instance, only: [:show] do
         resources :peers, only: [:index], controller: 'instances/peers'
-        resource :activity, only: [:show], controller: 'instances/activity'
         resources :rules, only: [:index], controller: 'instances/rules'
+        resources :domain_blocks, only: [:index], controller: 'instances/domain_blocks'
+        resource :privacy_policy, only: [:show], controller: 'instances/privacy_policies'
+        resource :extended_description, only: [:show], controller: 'instances/extended_descriptions'
+        resource :activity, only: [:show], controller: 'instances/activity'
       end
 
       resource :domain_blocks, only: [:show, :create, :destroy]
+
       resource :directory, only: [:show]
 
       resources :follow_requests, only: [:index] do
@@ -457,6 +567,7 @@ Rails.application.routes.draw do
         resource :search, only: :show, controller: :search
         resource :lookup, only: :show, controller: :lookup
         resources :relationships, only: :index
+        resources :familiar_followers, only: :index
       end
 
       resources :accounts, only: [:create, :show] do
@@ -482,6 +593,15 @@ Rails.application.routes.draw do
         resource :note, only: :create, controller: 'accounts/notes'
       end
 
+      resources :tags, only: [:show] do
+        member do
+          post :follow
+          post :unfollow
+        end
+      end
+
+      resources :followed_tags, only: [:index]
+
       resources :lists, only: [:index, :create, :show, :update, :destroy] do
         resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
       end
@@ -514,7 +634,7 @@ Rails.application.routes.draw do
           resource :action, only: [:create], controller: 'account_actions'
         end
 
-        resources :reports, only: [:index, :show] do
+        resources :reports, only: [:index, :update, :show] do
           member do
             post :assign_to_self
             post :unassign
@@ -523,20 +643,48 @@ Rails.application.routes.draw do
           end
         end
 
+        resources :domain_allows, only: [:index, :show, :create, :destroy]
+        resources :domain_blocks, only: [:index, :show, :update, :create, :destroy]
+        resources :email_domain_blocks, only: [:index, :show, :create, :destroy]
+        resources :ip_blocks, only: [:index, :show, :update, :create, :destroy]
+
         namespace :trends do
           resources :tags, only: [:index]
+          resources :links, only: [:index]
+          resources :statuses, only: [:index]
         end
 
         post :measures, to: 'measures#create'
         post :dimensions, to: 'dimensions#create'
         post :retention, to: 'retention#create'
+
+        resources :canonical_email_blocks, only: [:index, :create, :show, :destroy] do
+          collection do
+            post :test
+          end
+        end
       end
     end
 
     namespace :v2 do
-      resources :media, only: [:create]
       get '/search', to: 'search#index', as: :search
+
+      resources :media,       only: [:create]
       resources :suggestions, only: [:index]
+      resource  :instance,    only: [:show]
+      resources :filters,     only: [:index, :create, :show, :update, :destroy] do
+        resources :keywords, only: [:index, :create], controller: 'filters/keywords'
+        resources :statuses, only: [:index, :create], controller: 'filters/statuses'
+      end
+
+      namespace :filters do
+        resources :keywords, only: [:show, :update, :destroy]
+        resources :statuses, only: [:show, :destroy]
+      end
+
+      namespace :admin do
+        resources :accounts, only: [:index]
+      end
     end
 
     namespace :web do
@@ -550,11 +698,16 @@ Rails.application.routes.draw do
     end
   end
 
-  get '/web/(*any)', to: 'home#index', as: :web
+  web_app_paths.each do |path|
+    get path, to: 'home#index'
+  end
 
-  get '/about',        to: 'about#show'
-  get '/about/more',   to: 'about#more'
-  get '/terms',        to: 'about#terms'
+  get '/web/(*any)', to: redirect('/%{any}', status: 302), as: :web, defaults: { any: '' }, format: false
+  get '/about',      to: 'about#show'
+  get '/about/more', to: redirect('/about')
+
+  get '/privacy-policy', to: 'privacy#show', as: :privacy_policy
+  get '/terms',          to: redirect('/privacy-policy')
 
   match '/', via: [:post, :put, :patch, :delete], to: 'application#raise_not_found', format: false
   match '*unmatched_route', via: :all, to: 'application#raise_not_found', format: false
diff --git a/config/settings.yml b/config/settings.yml
index 06cee2532..ec8fead0f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -17,7 +17,6 @@ defaults: &defaults
   timeline_preview: true
   show_staff_badge: true
   default_sensitive: false
-  hide_network: false
   unfollow_modal: false
   boost_modal: false
   delete_modal: true
@@ -39,15 +38,17 @@ defaults: &defaults
   trendable_by_default: false
   crop_images: true
   notification_emails:
-    follow: false
+    follow: true
     reblog: false
     favourite: false
-    mention: false
+    mention: true
     follow_request: true
     digest: true
     report: true
     pending_account: true
     trending_tag: true
+    appeal: true
+  always_send_emails: false
   interactions:
     must_be_follower: false
     must_be_following: false
@@ -65,10 +66,10 @@ defaults: &defaults
   bootstrap_timeline_accounts: ''
   activity_api_enabled: true
   peers_api_enabled: true
-  show_known_fediverse_at_about_page: true
   show_domain_blocks: 'disabled'
   show_domain_blocks_rationale: 'disabled'
   require_invite_text: false
+  backups_retention_period: 7
 
 development:
   <<: *defaults
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 9dde5a053..b8739aab3 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,8 +1,9 @@
 ---
-:concurrency: 5
+:concurrency: <%= ENV.fetch('SIDEKIQ_CONCURRENCY', 5) %>
 :queues:
-  - [default, 6]
-  - [push, 4]
+  - [default, 8]
+  - [push, 6]
+  - [ingress, 4]
   - [mailers, 2]
   - [pull]
   - [scheduler]
@@ -18,25 +19,21 @@
     class: Scheduler::Trends::RefreshScheduler
     queue: scheduler
   trends_review_notifications_scheduler:
-    every: '2h'
+    every: '6h'
     class: Scheduler::Trends::ReviewNotificationsScheduler
     queue: scheduler
-  media_cleanup_scheduler:
-    cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
-    class: Scheduler::MediaCleanupScheduler
+  indexing_scheduler:
+    every: '5m'
+    class: Scheduler::IndexingScheduler
     queue: scheduler
-  feed_cleanup_scheduler:
-    cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * *'
-    class: Scheduler::FeedCleanupScheduler
+  vacuum_scheduler:
+    cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
+    class: Scheduler::VacuumScheduler
     queue: scheduler
   follow_recommendations_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(6..9) %> * * *'
     class: Scheduler::FollowRecommendationsScheduler
     queue: scheduler
-  doorkeeper_cleanup_scheduler:
-    cron: '<%= Random.rand(0..59) %> <%= Random.rand(0..2) %> * * 0'
-    class: Scheduler::DoorkeeperCleanupScheduler
-    queue: scheduler
   user_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
     class: Scheduler::UserCleanupScheduler
@@ -45,14 +42,6 @@
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::IpCleanupScheduler
     queue: scheduler
-  email_scheduler:
-    cron: '0 10 * * 2'
-    class: Scheduler::EmailScheduler
-    queue: scheduler
-  backup_cleanup_scheduler:
-    cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
-    class: Scheduler::BackupCleanupScheduler
-    queue: scheduler
   pghero_scheduler:
     cron: '0 0 * * *'
     class: Scheduler::PgheroScheduler
@@ -65,3 +54,7 @@
     interval: 1 minute
     class: Scheduler::AccountsStatusesCleanupScheduler
     queue: scheduler
+  suspended_user_cleanup_scheduler:
+    interval: 1 minute
+    class: Scheduler::SuspendedUserCleanupScheduler
+    queue: scheduler
diff --git a/config/webpack/production.js b/config/webpack/production.js
index cd3d01035..143a23b99 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,29 +1,16 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const path = require('path');
-const { URL } = require('url');
+const { createHash } = require('crypto');
+const { readFileSync } = require('fs');
+const { resolve } = require('path');
 const { merge } = require('webpack-merge');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
-const OfflinePlugin = require('offline-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
-const { output } = require('./configuration');
+const { InjectManifest } = require('workbox-webpack-plugin');
 const sharedConfig = require('./shared');
 
-let attachmentHost;
-
-if (process.env.S3_ENABLED === 'true') {
-  if (process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST) {
-    attachmentHost = process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST;
-  } else {
-    attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`;
-  }
-} else if (process.env.SWIFT_ENABLED === 'true') {
-  const { host } = new URL(process.env.SWIFT_OBJECT_URL);
-  attachmentHost = host;
-} else {
-  attachmentHost = null;
-}
+const root = resolve(__dirname, '..', '..');
 
 module.exports = merge(sharedConfig, {
   mode: 'production',
@@ -47,52 +34,39 @@ module.exports = merge(sharedConfig, {
       cache: true,
       test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/,
     }),
+    new CompressionPlugin({
+      filename: '[path][base].br[query]',
+      algorithm: 'brotliCompress',
+      cache: true,
+      test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/,
+    }),
     new BundleAnalyzerPlugin({ // generates report.html
       analyzerMode: 'static',
       openAnalyzer: false,
       logLevel: 'silent', // do not bother Webpacker, who runs with --json and parses stdout
     }),
-    new OfflinePlugin({
-      publicPath: output.publicPath, // sw.js must be served from the root to avoid scope issues
-      safeToUseOptionalCaches: true,
-      caches: {
-        main: [':rest:'],
-        additional: [':externals:'],
-        optional: [
-          '**/locale_*.js', // don't fetch every locale; the user only needs one
-          '**/*_polyfills-*.js', // the user may not need polyfills
-          '**/*.woff2', // the user may have system-fonts enabled
-          // images/audio can be cached on-demand
-          '**/*.png',
-          '**/*.jpg',
-          '**/*.jpeg',
-          '**/*.svg',
-          '**/*.mp3',
-          '**/*.ogg',
-        ],
-      },
-      externals: [
-        '/emoji/1f602.svg', // used for emoji picker dropdown
-        '/emoji/sheet_10.png', // used in emoji-mart
+    new InjectManifest({
+      additionalManifestEntries: ['1f602.svg', 'sheet_13.png'].map((filename) => {
+        const path = resolve(root, 'public', 'emoji', filename);
+        const body = readFileSync(path);
+        const md5  = createHash('md5');
+
+        md5.update(body);
+
+        return {
+          revision: md5.digest('hex'),
+          url: `/emoji/${filename}`,
+        };
+      }),
+      exclude: [
+        /(?:base|extra)_polyfills-.*\.js$/,
+        /locale_.*\.js$/,
+        /mailer-.*\.(?:css|js)$/,
       ],
-      excludes: [
-        '**/*.gz',
-        '**/*.map',
-        'stats.json',
-        'report.html',
-        // any browser that supports ServiceWorker will support woff2
-        '**/*.eot',
-        '**/*.ttf',
-        '**/*-webfont-*.svg',
-        '**/*.woff',
-      ],
-      ServiceWorker: {
-        entry: `imports-loader?additionalCode=${encodeURIComponent(`var ATTACHMENT_HOST=${JSON.stringify(attachmentHost)};`)}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`,
-        cacheName: 'mastodon',
-        output: '../assets/sw.js',
-        publicPath: '/sw.js',
-        minify: true,
-      },
+      include: [/\.js$/, /\.css$/],
+      maximumFileSizeToCacheInBytes: 2 * 1_024 * 1_024, // 2 MiB
+      swDest: resolve(root, 'public', 'packs', 'sw.js'),
+      swSrc: resolve(root, 'app', 'javascript', 'mastodon', 'service_worker', 'entry.js'),
     }),
   ],
 });
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 05828aebe..3447e711c 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -37,6 +37,7 @@ module.exports = {
     filename: 'js/[name]-[chunkhash].js',
     chunkFilename: 'js/[name]-[chunkhash].chunk.js',
     hotUpdateChunkFilename: 'js/[id]-[hash].hot-update.js',
+    hashFunction: 'sha256',
     path: output.path,
     publicPath: output.publicPath,
   },
diff --git a/db/migrate/20170918125918_ids_to_bigints.rb b/db/migrate/20170918125918_ids_to_bigints.rb
index bcb2e9eca..bf875e4e5 100644
--- a/db/migrate/20170918125918_ids_to_bigints.rb
+++ b/db/migrate/20170918125918_ids_to_bigints.rb
@@ -80,7 +80,7 @@ class IdsToBigints < ActiveRecord::Migration[5.1]
       say 'This migration has some sections that can be safely interrupted'
       say 'and restarted later, and will tell you when those are occurring.'
       say ''
-      say 'For more information, see https://github.com/tootsuite/mastodon/pull/5088'
+      say 'For more information, see https://github.com/mastodon/mastodon/pull/5088'
 
       10.downto(1) do |i|
         say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
index 5654bf6f8..4ab68e8f3 100644
--- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
+++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
@@ -15,8 +15,8 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
     # feed, with an entry in a reblog tracking zset (where the score
     # is once again set to the reblogging status' ID, and the value
     # is set to the reblogged status' ID). This is safe for Redis'
-    # float coersion because in this reblog tracking zset, we only
-    # need the rebloggging status' ID to be able to stop tracking
+    # float conversion because in this reblog tracking zset, we only
+    # need the reblogging status' ID to be able to stop tracking
     # entries after they have gotten too far down the feed, which
     # does not require an exact value.
 
diff --git a/db/migrate/20180528141303_fix_accounts_unique_index.rb b/db/migrate/20180528141303_fix_accounts_unique_index.rb
index 02813f363..3e33e2cac 100644
--- a/db/migrate/20180528141303_fix_accounts_unique_index.rb
+++ b/db/migrate/20180528141303_fix_accounts_unique_index.rb
@@ -17,6 +17,21 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
     belongs_to :account, inverse_of: :stream_entries
   end
 
+  class Status < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class Mention < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class StatusPin < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
   disable_ddl_transaction!
 
   def up
diff --git a/db/migrate/20180608213548_reject_following_blocked_users.rb b/db/migrate/20180608213548_reject_following_blocked_users.rb
index 302db6b68..78f8df538 100644
--- a/db/migrate/20180608213548_reject_following_blocked_users.rb
+++ b/db/migrate/20180608213548_reject_following_blocked_users.rb
@@ -22,13 +22,13 @@ class RejectFollowingBlockedUsers < ActiveRecord::Migration[5.2]
 
     follows.each do |follow|
       blocked_account = follow.account
-      followed_acccount = follow.target_account
+      followed_account = follow.target_account
 
       next follow.destroy! if blocked_account.local?
 
-      reject_follow_json = Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(follow, serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).as_json).sign!(followed_acccount))
+      reject_follow_json = Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(follow, serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).as_json).sign!(followed_account))
 
-      ActivityPub::DeliveryWorker.perform_async(reject_follow_json, followed_acccount, blocked_account.inbox_url)
+      ActivityPub::DeliveryWorker.perform_async(reject_follow_json, followed_account, blocked_account.inbox_url)
 
       follow.destroy!
     end
diff --git a/db/migrate/20180615122121_add_autofollow_to_invites.rb b/db/migrate/20180615122121_add_autofollow_to_invites.rb
index 850b1d693..8c5fb7410 100644
--- a/db/migrate/20180615122121_add_autofollow_to_invites.rb
+++ b/db/migrate/20180615122121_add_autofollow_to_invites.rb
@@ -5,7 +5,7 @@ class AddAutofollowToInvites < ActiveRecord::Migration[5.2]
 
   disable_ddl_transaction!
 
-  def change
+  def up
     safety_assured do
       add_column_with_default :invites, :autofollow, :bool, default: false, allow_null: false
     end
diff --git a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
index bd4f4c2a3..40537e9c9 100644
--- a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
+++ b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
@@ -1,6 +1,46 @@
 class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
+  class StreamEntry < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account, inverse_of: :stream_entries
+  end
+
+  class Status < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account, inverse_of: :statuses
+    has_many :favourites, inverse_of: :status, dependent: :destroy
+    has_many :mentions, dependent: :destroy, inverse_of: :status
+  end
+
+  class Favourite < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account, inverse_of: :favourites
+    belongs_to :status,  inverse_of: :favourites
+  end
+
+  class Mention < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account, inverse_of: :mentions
+    belongs_to :status
+  end
+
+  class Notification < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account, optional: true
+    belongs_to :from_account, class_name: 'Account', optional: true
+    belongs_to :activity, polymorphic: true, optional: true
+  end
+
+  class Account < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    has_many :stream_entries, inverse_of: :account, dependent: :destroy
+    has_many :statuses, inverse_of: :account, dependent: :destroy
+    has_many :favourites, inverse_of: :account, dependent: :destroy
+    has_many :mentions, inverse_of: :account, dependent: :destroy
+    has_many :notifications, inverse_of: :account, dependent: :destroy
+  end
+
   def up
     local_domain = Rails.configuration.x.local_domain
 
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index a26d54949..0ae53199a 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -1,4 +1,17 @@
 class AddInstanceActor < ActiveRecord::Migration[5.2]
+  class Account < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    validates :username, uniqueness: { scope: :domain, case_sensitive: false }
+
+    before_create :generate_keys
+
+    def generate_keys
+      keypair = OpenSSL::PKey::RSA.new(2048)
+      self.private_key = keypair.to_pem
+      self.public_key  = keypair.public_key.to_pem
+    end
+  end
+
   def up
     Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
   end
diff --git a/db/migrate/20191007013357_update_pt_locales.rb b/db/migrate/20191007013357_update_pt_locales.rb
index b7288d38a..9e8f8b424 100644
--- a/db/migrate/20191007013357_update_pt_locales.rb
+++ b/db/migrate/20191007013357_update_pt_locales.rb
@@ -1,4 +1,8 @@
 class UpdatePtLocales < ActiveRecord::Migration[5.2]
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+  end
+
   disable_ddl_transaction!
 
   def up
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
index 366bf9aa7..652ce9752 100644
--- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
+++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
@@ -16,7 +16,7 @@ class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
       add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently
     rescue ActiveRecord::RecordNotUnique
       remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower'
-      raise CorruptionError
+      raise CorruptionError.new('index_accounts_on_username_and_domain_lower')
     end
 
     remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower' if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower')
diff --git a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
index e492c9e86..b3ee11d09 100644
--- a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
+++ b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
@@ -10,7 +10,7 @@ class AddCaseInsensitiveBtreeIndexToTags < ActiveRecord::Migration[5.2]
       safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)' }
     rescue ActiveRecord::StatementInvalid => e
       remove_index :tags, name: 'index_tags_on_name_lower_btree'
-      raise CorruptionError if e.is_a?(ActiveRecord::RecordNotUnique)
+      raise CorruptionError.new('index_tags_on_name_lower_btree') if e.is_a?(ActiveRecord::RecordNotUnique)
       raise e
     end
 
diff --git a/db/migrate/20210616214526_create_user_ips.rb b/db/migrate/20210616214526_create_user_ips.rb
new file mode 100644
index 000000000..68e81a9d8
--- /dev/null
+++ b/db/migrate/20210616214526_create_user_ips.rb
@@ -0,0 +1,5 @@
+class CreateUserIps < ActiveRecord::Migration[6.1]
+  def change
+    create_view :user_ips
+  end
+end
diff --git a/db/migrate/20210904215403_add_edited_at_to_statuses.rb b/db/migrate/20210904215403_add_edited_at_to_statuses.rb
new file mode 100644
index 000000000..216ad8e13
--- /dev/null
+++ b/db/migrate/20210904215403_add_edited_at_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddEditedAtToStatuses < ActiveRecord::Migration[6.1]
+  def change
+    add_column :statuses, :edited_at, :datetime
+  end
+end
diff --git a/db/migrate/20210908220918_create_status_edits.rb b/db/migrate/20210908220918_create_status_edits.rb
new file mode 100644
index 000000000..6c90149d0
--- /dev/null
+++ b/db/migrate/20210908220918_create_status_edits.rb
@@ -0,0 +1,13 @@
+class CreateStatusEdits < ActiveRecord::Migration[6.1]
+  def change
+    create_table :status_edits do |t|
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :account, null: true, foreign_key: { on_delete: :nullify }
+      t.text :text, null: false, default: ''
+      t.text :spoiler_text, null: false, default: ''
+      t.boolean :media_attachments_changed, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20211231080958_add_category_to_reports.rb b/db/migrate/20211231080958_add_category_to_reports.rb
new file mode 100644
index 000000000..c2b495c63
--- /dev/null
+++ b/db/migrate/20211231080958_add_category_to_reports.rb
@@ -0,0 +1,21 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddCategoryToReports < ActiveRecord::Migration[6.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :reports, :category, :int, default: 0, allow_null: false }
+    add_column :reports, :action_taken_at, :datetime
+    add_column :reports, :rule_ids, :bigint, array: true
+    safety_assured { execute 'UPDATE reports SET action_taken_at = updated_at WHERE action_taken = TRUE' }
+  end
+
+  def down
+    safety_assured { execute 'UPDATE reports SET action_taken = TRUE WHERE action_taken_at IS NOT NULL' }
+    remove_column :reports, :category
+    remove_column :reports, :action_taken_at
+    remove_column :reports, :rule_ids
+  end
+end
diff --git a/db/migrate/20220105163928_remove_mentions_status_id_index.rb b/db/migrate/20220105163928_remove_mentions_status_id_index.rb
new file mode 100644
index 000000000..56e903719
--- /dev/null
+++ b/db/migrate/20220105163928_remove_mentions_status_id_index.rb
@@ -0,0 +1,9 @@
+class RemoveMentionsStatusIdIndex < ActiveRecord::Migration[6.1]
+  def up
+    remove_index :mentions, name: :mentions_status_id_index if index_exists?(:mentions, :status_id, name: :mentions_status_id_index)
+  end
+
+  def down
+    # As this index should not exist and is a duplicate of another index, do not re-create it
+  end
+end
diff --git a/db/migrate/20220115125126_add_report_id_to_account_warnings.rb b/db/migrate/20220115125126_add_report_id_to_account_warnings.rb
new file mode 100644
index 000000000..a1c20c99e
--- /dev/null
+++ b/db/migrate/20220115125126_add_report_id_to_account_warnings.rb
@@ -0,0 +1,6 @@
+class AddReportIdToAccountWarnings < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured { add_reference :account_warnings, :report, foreign_key: { on_delete: :cascade }, index: false }
+    add_column :account_warnings, :status_ids, :string, array: true
+  end
+end
diff --git a/db/migrate/20220115125341_fix_account_warning_actions.rb b/db/migrate/20220115125341_fix_account_warning_actions.rb
new file mode 100644
index 000000000..25cc17fd3
--- /dev/null
+++ b/db/migrate/20220115125341_fix_account_warning_actions.rb
@@ -0,0 +1,21 @@
+class FixAccountWarningActions < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      execute 'UPDATE account_warnings SET action = 1000 WHERE action = 1'
+      execute 'UPDATE account_warnings SET action = 2000 WHERE action = 2'
+      execute 'UPDATE account_warnings SET action = 3000 WHERE action = 3'
+      execute 'UPDATE account_warnings SET action = 4000 WHERE action = 4'
+    end
+  end
+
+  def down
+    safety_assured do
+      execute 'UPDATE account_warnings SET action = 1 WHERE action = 1000'
+      execute 'UPDATE account_warnings SET action = 2 WHERE action = 2000'
+      execute 'UPDATE account_warnings SET action = 3 WHERE action = 3000'
+      execute 'UPDATE account_warnings SET action = 4 WHERE action = 4000'
+    end
+  end
+end
diff --git a/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb b/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb
new file mode 100644
index 000000000..dc3362552
--- /dev/null
+++ b/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb
@@ -0,0 +1,7 @@
+class AddDeletedAtIndexOnStatuses < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :deleted_at, where: 'deleted_at IS NOT NULL', algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20220124141035_create_appeals.rb b/db/migrate/20220124141035_create_appeals.rb
new file mode 100644
index 000000000..afb3efbd5
--- /dev/null
+++ b/db/migrate/20220124141035_create_appeals.rb
@@ -0,0 +1,14 @@
+class CreateAppeals < ActiveRecord::Migration[6.1]
+  def change
+    create_table :appeals do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :account_warning, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.text :text, null: false, default: ''
+      t.datetime :approved_at
+      t.belongs_to :approved_by_account, foreign_key: { to_table: :accounts, on_delete: :nullify }
+      t.datetime :rejected_at
+      t.belongs_to :rejected_by_account, foreign_key: { to_table: :accounts, on_delete: :nullify }
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220202200743_add_trendable_to_accounts.rb b/db/migrate/20220202200743_add_trendable_to_accounts.rb
new file mode 100644
index 000000000..414df5108
--- /dev/null
+++ b/db/migrate/20220202200743_add_trendable_to_accounts.rb
@@ -0,0 +1,7 @@
+class AddTrendableToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :trendable, :boolean
+    add_column :accounts, :reviewed_at, :datetime
+    add_column :accounts, :requested_review_at, :datetime
+  end
+end
diff --git a/db/migrate/20220202200926_add_trendable_to_statuses.rb b/db/migrate/20220202200926_add_trendable_to_statuses.rb
new file mode 100644
index 000000000..7f38c8ca7
--- /dev/null
+++ b/db/migrate/20220202200926_add_trendable_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddTrendableToStatuses < ActiveRecord::Migration[6.1]
+  def change
+    add_column :statuses, :trendable, :boolean
+  end
+end
diff --git a/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb b/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb
new file mode 100644
index 000000000..a082da774
--- /dev/null
+++ b/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb
@@ -0,0 +1,5 @@
+class AddOverruledAtToAccountWarnings < ActiveRecord::Migration[6.1]
+  def change
+    add_column :account_warnings, :overruled_at, :datetime
+  end
+end
diff --git a/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb b/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb
new file mode 100644
index 000000000..1b19a2aa1
--- /dev/null
+++ b/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb
@@ -0,0 +1,6 @@
+class AddIpsToEmailDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :email_domain_blocks, :ips, :inet, array: true
+    add_column :email_domain_blocks, :last_refresh_at, :datetime
+  end
+end
diff --git a/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb b/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb
new file mode 100644
index 000000000..6b46e60a8
--- /dev/null
+++ b/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb
@@ -0,0 +1,6 @@
+class AddLastUsedAtToOauthAccessTokens < ActiveRecord::Migration[6.1]
+  def change
+    add_column :oauth_access_tokens, :last_used_at, :datetime
+    add_column :oauth_access_tokens, :last_used_ip, :inet
+  end
+end
diff --git a/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb b/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb
new file mode 100644
index 000000000..5443f32a2
--- /dev/null
+++ b/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddOrderedMediaAttachmentIdsToStatuses < ActiveRecord::Migration[6.1]
+  def change
+    add_column :statuses, :ordered_media_attachment_ids, :bigint, array: true
+  end
+end
diff --git a/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb b/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb
new file mode 100644
index 000000000..b1071f359
--- /dev/null
+++ b/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb
@@ -0,0 +1,8 @@
+class AddOrderedMediaAttachmentIdsToStatusEdits < ActiveRecord::Migration[6.1]
+  def change
+    add_column :status_edits, :ordered_media_attachment_ids, :bigint, array: true
+    add_column :status_edits, :media_descriptions, :text, array: true
+    add_column :status_edits, :poll_options, :string, array: true
+    add_column :status_edits, :sensitive, :boolean
+  end
+end
diff --git a/db/migrate/20220304195405_migrate_hide_network_preference.rb b/db/migrate/20220304195405_migrate_hide_network_preference.rb
new file mode 100644
index 000000000..102ee46d6
--- /dev/null
+++ b/db/migrate/20220304195405_migrate_hide_network_preference.rb
@@ -0,0 +1,37 @@
+class MigrateHideNetworkPreference < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class Account < ApplicationRecord
+    has_one :user, inverse_of: :account
+    scope :local, -> { where(domain: nil) }
+  end
+
+  class User < ApplicationRecord
+    belongs_to :account
+  end
+
+  def up
+    Account.reset_column_information
+
+    Setting.unscoped.where(thing_type: 'User', var: 'hide_network').find_each do |setting|
+      account = User.find(setting.thing_id).account
+
+      ApplicationRecord.transaction do
+        account.update(hide_collections: setting.value)
+        setting.delete
+      end
+    rescue ActiveRecord::RecordNotFound
+      next
+    end
+  end
+
+  def down
+    Account.local.where(hide_collections: true).includes(:user).find_each do |account|
+      ApplicationRecord.transaction do
+        Setting.create(thing_type: 'User', thing_id: account.user.id, var: 'hide_network', value: account.hide_collections?)
+        account.update(hide_collections: nil)
+      end
+    end
+  end
+end
diff --git a/db/migrate/20220307094650_fix_featured_tags_constraints.rb b/db/migrate/20220307094650_fix_featured_tags_constraints.rb
new file mode 100644
index 000000000..bad1c90d4
--- /dev/null
+++ b/db/migrate/20220307094650_fix_featured_tags_constraints.rb
@@ -0,0 +1,17 @@
+class FixFeaturedTagsConstraints < ActiveRecord::Migration[6.1]
+  def up
+    safety_assured do
+      execute 'DELETE FROM featured_tags WHERE tag_id IS NULL'
+      change_column_null :featured_tags, :tag_id, false
+      execute 'DELETE FROM featured_tags WHERE account_id IS NULL'
+      change_column_null :featured_tags, :account_id, false
+    end
+  end
+
+  def down
+    safety_assured do
+      change_column_null :featured_tags, :tag_id, true
+      change_column_null :featured_tags, :account_id, true
+    end
+  end
+end
diff --git a/db/migrate/20220309213005_fix_reblog_deleted_at.rb b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
new file mode 100644
index 000000000..8ec1813d9
--- /dev/null
+++ b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
@@ -0,0 +1,9 @@
+class FixReblogDeletedAt < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { execute 'UPDATE statuses s SET deleted_at = r.deleted_at FROM statuses r WHERE s.reblog_of_id = r.id AND r.deleted_at IS NOT NULL' }
+  end
+
+  def down; end
+end
diff --git a/db/migrate/20220316233212_update_kurdish_locales.rb b/db/migrate/20220316233212_update_kurdish_locales.rb
new file mode 100644
index 000000000..36586622f
--- /dev/null
+++ b/db/migrate/20220316233212_update_kurdish_locales.rb
@@ -0,0 +1,17 @@
+class UpdateKurdishLocales < ActiveRecord::Migration[6.1]
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+  end
+
+  disable_ddl_transaction!
+
+  def up
+    User.where(locale: 'ku').in_batches.update_all(locale: 'ckb')
+    User.where(locale: 'kmr').in_batches.update_all(locale: 'ku')
+  end
+
+  def down
+    User.where(locale: 'ku').in_batches.update_all(locale: 'kmr')
+    User.where(locale: 'ckb').in_batches.update_all(locale: 'ku')
+  end
+end
diff --git a/db/migrate/20220428112511_add_index_statuses_on_account_id.rb b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
new file mode 100644
index 000000000..87a601b72
--- /dev/null
+++ b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexStatusesOnAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, [:account_id], name: :index_statuses_on_account_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
new file mode 100644
index 000000000..26a543087
--- /dev/null
+++ b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
@@ -0,0 +1,7 @@
+class AddIndexStatusesPinsOnStatusId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :status_pins, [:status_id], name: :index_status_pins_on_status_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
new file mode 100644
index 000000000..c260c9732
--- /dev/null
+++ b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexReportsOnAssignedAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :reports, [:assigned_account_id], name: :index_reports_on_assigned_account_id, algorithm: :concurrently, where: 'assigned_account_id IS NOT NULL'
+  end
+end
diff --git a/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
new file mode 100644
index 000000000..aed88cd80
--- /dev/null
+++ b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
@@ -0,0 +1,7 @@
+class AddIndexReportsOnActionTakenByAccountId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :reports, [:action_taken_by_account_id], name: :index_reports_on_action_taken_by_account_id, algorithm: :concurrently, where: 'action_taken_by_account_id IS NOT NULL'
+  end
+end
diff --git a/db/migrate/20220606044941_create_webhooks.rb b/db/migrate/20220606044941_create_webhooks.rb
new file mode 100644
index 000000000..cca48fce6
--- /dev/null
+++ b/db/migrate/20220606044941_create_webhooks.rb
@@ -0,0 +1,12 @@
+class CreateWebhooks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :webhooks do |t|
+      t.string :url, null: false, index: { unique: true }
+      t.string :events, array: true, null: false, default: []
+      t.string :secret, null: false, default: ''
+      t.boolean :enabled, null: false, default: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220611210335_create_user_roles.rb b/db/migrate/20220611210335_create_user_roles.rb
new file mode 100644
index 000000000..6b7f2b637
--- /dev/null
+++ b/db/migrate/20220611210335_create_user_roles.rb
@@ -0,0 +1,13 @@
+class CreateUserRoles < ActiveRecord::Migration[6.1]
+  def change
+    create_table :user_roles do |t|
+      t.string :name, null: false, default: ''
+      t.string :color, null: false, default: ''
+      t.integer :position, null: false, default: 0
+      t.bigint :permissions, null: false, default: 0
+      t.boolean :highlighted, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220611212541_add_role_id_to_users.rb b/db/migrate/20220611212541_add_role_id_to_users.rb
new file mode 100644
index 000000000..2fda647d4
--- /dev/null
+++ b/db/migrate/20220611212541_add_role_id_to_users.rb
@@ -0,0 +1,8 @@
+class AddRoleIdToUsers < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { add_reference :users, :role, foreign_key: { to_table: 'user_roles', on_delete: :nullify }, index: false }
+    add_index :users, :role_id, algorithm: :concurrently, where: 'role_id IS NOT NULL'
+  end
+end
diff --git a/db/migrate/20220613110628_create_custom_filter_keywords.rb b/db/migrate/20220613110628_create_custom_filter_keywords.rb
new file mode 100644
index 000000000..353fc334f
--- /dev/null
+++ b/db/migrate/20220613110628_create_custom_filter_keywords.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateCustomFilterKeywords < ActiveRecord::Migration[6.1]
+  def change
+    create_table :custom_filter_keywords do |t|
+      t.belongs_to :custom_filter, foreign_key: { on_delete: :cascade }, null: false
+      t.text :keyword, null: false, default: ''
+      t.boolean :whole_word, null: false, default: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220613110711_migrate_custom_filters.rb b/db/migrate/20220613110711_migrate_custom_filters.rb
new file mode 100644
index 000000000..ea6a9b8c6
--- /dev/null
+++ b/db/migrate/20220613110711_migrate_custom_filters.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class MigrateCustomFilters < ActiveRecord::Migration[6.1]
+  def up
+    # Preserve IDs as much as possible to not confuse existing clients.
+    # As long as this migration is irreversible, we do not have to deal with conflicts.
+    safety_assured do
+      execute <<-SQL.squish
+        INSERT INTO custom_filter_keywords (id, custom_filter_id, keyword, whole_word, created_at, updated_at)
+        SELECT id, id, phrase, whole_word, created_at, updated_at
+        FROM custom_filters
+      SQL
+    end
+  end
+
+  def down
+    # Copy back changes from custom filters guaranteed to be from the old API
+    safety_assured do
+      execute <<-SQL.squish
+        UPDATE custom_filters
+        SET phrase = custom_filter_keywords.keyword, whole_word = custom_filter_keywords.whole_word
+        FROM custom_filter_keywords
+        WHERE custom_filters.id = custom_filter_keywords.id AND custom_filters.id = custom_filter_keywords.custom_filter_id
+      SQL
+    end
+
+    # Drop every keyword as we can't safely provide a 1:1 mapping
+    safety_assured do
+      execute <<-SQL.squish
+        TRUNCATE custom_filter_keywords RESTART IDENTITY
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20220613110834_add_action_to_custom_filters.rb b/db/migrate/20220613110834_add_action_to_custom_filters.rb
new file mode 100644
index 000000000..9427a66fc
--- /dev/null
+++ b/db/migrate/20220613110834_add_action_to_custom_filters.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddActionToCustomFilters < ActiveRecord::Migration[6.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default :custom_filters, :action, :integer, allow_null: false, default: 0
+      execute 'UPDATE custom_filters SET action = 1 WHERE irreversible IS TRUE'
+    end
+  end
+
+  def down
+    execute 'UPDATE custom_filters SET irreversible = (action = 1)'
+    remove_column :custom_filters, :action
+  end
+end
diff --git a/db/migrate/20220710102457_add_display_name_to_tags.rb b/db/migrate/20220710102457_add_display_name_to_tags.rb
new file mode 100644
index 000000000..aa7867645
--- /dev/null
+++ b/db/migrate/20220710102457_add_display_name_to_tags.rb
@@ -0,0 +1,5 @@
+class AddDisplayNameToTags < ActiveRecord::Migration[6.1]
+  def change
+    add_column :tags, :display_name, :string
+  end
+end
diff --git a/db/migrate/20220714171049_create_tag_follows.rb b/db/migrate/20220714171049_create_tag_follows.rb
new file mode 100644
index 000000000..a393e90f5
--- /dev/null
+++ b/db/migrate/20220714171049_create_tag_follows.rb
@@ -0,0 +1,12 @@
+class CreateTagFollows < ActiveRecord::Migration[6.1]
+  def change
+    create_table :tag_follows do |t|
+      t.belongs_to :tag, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }, index: false
+
+      t.timestamps
+    end
+
+    add_index :tag_follows, [:account_id, :tag_id], unique: true
+  end
+end
diff --git a/db/migrate/20220808101323_create_custom_filter_statuses.rb b/db/migrate/20220808101323_create_custom_filter_statuses.rb
new file mode 100644
index 000000000..52f703749
--- /dev/null
+++ b/db/migrate/20220808101323_create_custom_filter_statuses.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateCustomFilterStatuses < ActiveRecord::Migration[6.1]
+  def change
+    create_table :custom_filter_statuses do |t|
+      t.belongs_to :custom_filter, foreign_key: { on_delete: :cascade }, null: false
+      t.belongs_to :status, foreign_key: { on_delete: :cascade }, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb b/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb
new file mode 100644
index 000000000..2cb8cddf1
--- /dev/null
+++ b/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb
@@ -0,0 +1,7 @@
+class AddHumanIdentifierToAdminActionLogs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :admin_action_logs, :human_identifier, :string
+    add_column :admin_action_logs, :route_param, :string
+    add_column :admin_action_logs, :permalink, :string
+  end
+end
diff --git a/db/migrate/20220824233535_create_status_trends.rb b/db/migrate/20220824233535_create_status_trends.rb
new file mode 100644
index 000000000..cea0abf35
--- /dev/null
+++ b/db/migrate/20220824233535_create_status_trends.rb
@@ -0,0 +1,12 @@
+class CreateStatusTrends < ActiveRecord::Migration[6.1]
+  def change
+    create_table :status_trends do |t|
+      t.references :status, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }
+      t.float :score, null: false, default: 0
+      t.integer :rank, null: false, default: 0
+      t.boolean :allowed, null: false, default: false
+      t.string :language
+    end
+  end
+end
diff --git a/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb b/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb
new file mode 100644
index 000000000..5b3ec4727
--- /dev/null
+++ b/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb
@@ -0,0 +1,5 @@
+class ChangeCanonicalEmailBlocksNullable < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured { change_column :canonical_email_blocks, :reference_account_id, :bigint, null: true, default: nil }
+  end
+end
diff --git a/db/migrate/20220829192633_add_languages_to_follows.rb b/db/migrate/20220829192633_add_languages_to_follows.rb
new file mode 100644
index 000000000..f6cf48880
--- /dev/null
+++ b/db/migrate/20220829192633_add_languages_to_follows.rb
@@ -0,0 +1,5 @@
+class AddLanguagesToFollows < ActiveRecord::Migration[6.1]
+  def change
+    add_column :follows, :languages, :string, array: true
+  end
+end
diff --git a/db/migrate/20220829192658_add_languages_to_follow_requests.rb b/db/migrate/20220829192658_add_languages_to_follow_requests.rb
new file mode 100644
index 000000000..f98fabb22
--- /dev/null
+++ b/db/migrate/20220829192658_add_languages_to_follow_requests.rb
@@ -0,0 +1,5 @@
+class AddLanguagesToFollowRequests < ActiveRecord::Migration[6.1]
+  def change
+    add_column :follow_requests, :languages, :string, array: true
+  end
+end
diff --git a/db/migrate/20221006061337_create_preview_card_trends.rb b/db/migrate/20221006061337_create_preview_card_trends.rb
new file mode 100644
index 000000000..baad9c31c
--- /dev/null
+++ b/db/migrate/20221006061337_create_preview_card_trends.rb
@@ -0,0 +1,11 @@
+class CreatePreviewCardTrends < ActiveRecord::Migration[6.1]
+  def change
+    create_table :preview_card_trends do |t|
+      t.references :preview_card, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.float :score, null: false, default: 0
+      t.integer :rank, null: false, default: 0
+      t.boolean :allowed, null: false, default: false
+      t.string :language
+    end
+  end
+end
diff --git a/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb b/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb
new file mode 100644
index 000000000..e1c87712b
--- /dev/null
+++ b/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb
@@ -0,0 +1,5 @@
+class AddBlurhashToSiteUploads < ActiveRecord::Migration[6.1]
+  def change
+    add_column :site_uploads, :blurhash, :string
+  end
+end
diff --git a/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb b/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb
new file mode 100644
index 000000000..74d7673f7
--- /dev/null
+++ b/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb
@@ -0,0 +1,19 @@
+class AddIndexFeaturedTagsOnAccountIdAndTagId < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    duplicates = FeaturedTag.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM featured_tags GROUP BY account_id, tag_id HAVING count(*) > 1').to_ary
+
+    duplicates.each do |row|
+      FeaturedTag.where(id: row['ids'].split(',')[0...-1]).destroy_all
+    end
+
+    add_index :featured_tags, [:account_id, :tag_id], unique: true, algorithm: :concurrently
+    remove_index :featured_tags, [:account_id], algorithm: :concurrently
+  end
+
+  def down
+    add_index :featured_tags, [:account_id], algorithm: :concurrently
+    remove_index :featured_tags, [:account_id, :tag_id], unique: true, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb b/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb
new file mode 100644
index 000000000..0221369b7
--- /dev/null
+++ b/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb
@@ -0,0 +1,17 @@
+class AddIndexIpBlocksOnIp < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    duplicates = IpBlock.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM ip_blocks GROUP BY ip HAVING count(*) > 1').to_ary
+
+    duplicates.each do |row|
+      IpBlock.where(id: row['ids'].split(',')[0...-1]).destroy_all
+    end
+
+    add_index :ip_blocks, :ip, unique: true, algorithm: :concurrently
+  end
+
+  def down
+    remove_index :ip_blocks, :ip, unique: true
+  end
+end
diff --git a/db/migrate/20221104133904_add_name_to_featured_tags.rb b/db/migrate/20221104133904_add_name_to_featured_tags.rb
new file mode 100644
index 000000000..7c8c8ebfb
--- /dev/null
+++ b/db/migrate/20221104133904_add_name_to_featured_tags.rb
@@ -0,0 +1,5 @@
+class AddNameToFeaturedTags < ActiveRecord::Migration[6.1]
+  def change
+    add_column :featured_tags, :name, :string
+  end
+end
diff --git a/db/post_migrate/20210616214135_remove_current_sign_in_ip_from_users.rb b/db/post_migrate/20210616214135_remove_current_sign_in_ip_from_users.rb
new file mode 100644
index 000000000..b53b247f2
--- /dev/null
+++ b/db/post_migrate/20210616214135_remove_current_sign_in_ip_from_users.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class RemoveCurrentSignInIpFromUsers < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :users, :current_sign_in_ip, :inet
+      remove_column :users, :last_sign_in_ip, :inet
+    end
+  end
+end
diff --git a/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb b/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb
new file mode 100644
index 000000000..73e6ad6f4
--- /dev/null
+++ b/db/post_migrate/20220109213908_remove_action_taken_from_reports.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveActionTakenFromReports < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :reports, :action_taken, :boolean, default: false, null: false }
+  end
+end
diff --git a/db/post_migrate/20220118183010_remove_index_users_on_remember_token.rb b/db/post_migrate/20220118183010_remove_index_users_on_remember_token.rb
new file mode 100644
index 000000000..367d489de
--- /dev/null
+++ b/db/post_migrate/20220118183010_remove_index_users_on_remember_token.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveIndexUsersOnRememberToken < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    remove_index :users, name: :index_users_on_remember_token
+  end
+
+  def down
+    add_index :users, :remember_token, algorithm: :concurrently, unique: true, name: :index_users_on_remember_token
+  end
+end
diff --git a/db/post_migrate/20220118183123_remove_rememberable_from_users.rb b/db/post_migrate/20220118183123_remove_rememberable_from_users.rb
new file mode 100644
index 000000000..1e274c6e0
--- /dev/null
+++ b/db/post_migrate/20220118183123_remove_rememberable_from_users.rb
@@ -0,0 +1,8 @@
+class RemoveRememberableFromUsers < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      remove_column :users, :remember_token, :string, null: true, default: nil
+      remove_column :users, :remember_created_at, :datetime, null: true, default: nil
+    end
+  end
+end
diff --git a/db/post_migrate/20220202201015_remove_trust_level_from_accounts.rb b/db/post_migrate/20220202201015_remove_trust_level_from_accounts.rb
new file mode 100644
index 000000000..d5d995ece
--- /dev/null
+++ b/db/post_migrate/20220202201015_remove_trust_level_from_accounts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveTrustLevelFromAccounts < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :accounts, :trust_level, :integer }
+  end
+end
diff --git a/db/post_migrate/20220303203437_remove_media_attachments_changed_from_status_edits.rb b/db/post_migrate/20220303203437_remove_media_attachments_changed_from_status_edits.rb
new file mode 100644
index 000000000..09725c74e
--- /dev/null
+++ b/db/post_migrate/20220303203437_remove_media_attachments_changed_from_status_edits.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveMediaAttachmentsChangedFromStatusEdits < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { remove_column :status_edits, :media_attachments_changed, :boolean, default: false, null: false }
+  end
+end
diff --git a/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb b/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb
new file mode 100644
index 000000000..9f45bec7e
--- /dev/null
+++ b/db/post_migrate/20220307083603_optimize_null_index_conversations_uri.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexConversationsUri < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :conversations, 'index_conversations_on_uri', :uri, unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :conversations, 'index_conversations_on_uri', :uri, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb b/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb
new file mode 100644
index 000000000..ddb07ab5d
--- /dev/null
+++ b/db/post_migrate/20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesInReplyToAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_in_reply_to_account_id', :in_reply_to_account_id, where: 'in_reply_to_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_in_reply_to_account_id', :in_reply_to_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb b/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb
new file mode 100644
index 000000000..411c86456
--- /dev/null
+++ b/db/post_migrate/20220310060556_optimize_null_index_statuses_in_reply_to_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesInReplyToId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_in_reply_to_id', :in_reply_to_id, where: 'in_reply_to_id IS NOT NULL'
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_in_reply_to_id', :in_reply_to_id
+  end
+end
diff --git a/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb b/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb
new file mode 100644
index 000000000..9d86a0364
--- /dev/null
+++ b/db/post_migrate/20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexMediaAttachmentsScheduledStatusId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :media_attachments, 'index_media_attachments_on_scheduled_status_id', :scheduled_status_id, where: 'scheduled_status_id IS NOT NULL'
+  end
+
+  def down
+    update_index :media_attachments, 'index_media_attachments_on_scheduled_status_id', :scheduled_status_id
+  end
+end
diff --git a/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb b/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb
new file mode 100644
index 000000000..658f3e42a
--- /dev/null
+++ b/db/post_migrate/20220310060626_optimize_null_index_media_attachments_shortcode.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexMediaAttachmentsShortcode < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :media_attachments, 'index_media_attachments_on_shortcode', :shortcode, unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :media_attachments, 'index_media_attachments_on_shortcode', :shortcode, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb b/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb
new file mode 100644
index 000000000..cc5bdae96
--- /dev/null
+++ b/db/post_migrate/20220310060641_optimize_null_index_users_reset_password_token.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexUsersResetPasswordToken < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :users, 'index_users_on_reset_password_token', :reset_password_token, unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :users, 'index_users_on_reset_password_token', :reset_password_token, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb b/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb
new file mode 100644
index 000000000..364939d3a
--- /dev/null
+++ b/db/post_migrate/20220310060653_optimize_null_index_users_created_by_application_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexUsersCreatedByApplicationId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :users, 'index_users_on_created_by_application_id', :created_by_application_id, where: 'created_by_application_id IS NOT NULL'
+  end
+
+  def down
+    update_index :users, 'index_users_on_created_by_application_id', :created_by_application_id
+  end
+end
diff --git a/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb b/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb
new file mode 100644
index 000000000..0fb5f6365
--- /dev/null
+++ b/db/post_migrate/20220310060706_optimize_null_index_statuses_uri.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexStatusesUri < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :statuses, 'index_statuses_on_uri', :uri, unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :statuses, 'index_statuses_on_uri', :uri, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb b/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb
new file mode 100644
index 000000000..ec93a417a
--- /dev/null
+++ b/db/post_migrate/20220310060722_optimize_null_index_accounts_moved_to_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountsMovedToAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :accounts, 'index_accounts_on_moved_to_account_id', :moved_to_account_id, where: 'moved_to_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :accounts, 'index_accounts_on_moved_to_account_id', :moved_to_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb b/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb
new file mode 100644
index 000000000..30ade8e3f
--- /dev/null
+++ b/db/post_migrate/20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexOauthAccessTokensRefreshToken < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_refresh_token', :refresh_token, unique: true, where: 'refresh_token IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_refresh_token', :refresh_token, unique: true
+  end
+end
diff --git a/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb b/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb
new file mode 100644
index 000000000..d8bce144f
--- /dev/null
+++ b/db/post_migrate/20220310060750_optimize_null_index_accounts_url.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountsURL < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :accounts, 'index_accounts_on_url', :url, where: 'url IS NOT NULL', opclass: :text_pattern_ops
+  end
+
+  def down
+    update_index :accounts, 'index_accounts_on_url', :url
+  end
+end
diff --git a/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb b/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb
new file mode 100644
index 000000000..787263bf7
--- /dev/null
+++ b/db/post_migrate/20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexOauthAccessTokensResourceOwnerId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_resource_owner_id', :resource_owner_id, where: 'resource_owner_id IS NOT NULL'
+  end
+
+  def down
+    update_index :oauth_access_tokens, 'index_oauth_access_tokens_on_resource_owner_id', :resource_owner_id
+  end
+end
diff --git a/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb b/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb
new file mode 100644
index 000000000..4afea291a
--- /dev/null
+++ b/db/post_migrate/20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAnnouncementReactionsCustomEmojiId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :announcement_reactions, 'index_announcement_reactions_on_custom_emoji_id', :custom_emoji_id, where: 'custom_emoji_id IS NOT NULL'
+  end
+
+  def down
+    update_index :announcement_reactions, 'index_announcement_reactions_on_custom_emoji_id', :custom_emoji_id
+  end
+end
diff --git a/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb b/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb
new file mode 100644
index 000000000..244b89417
--- /dev/null
+++ b/db/post_migrate/20220310060854_optimize_null_index_appeals_approved_by_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAppealsApprovedByAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :appeals, 'index_appeals_on_approved_by_account_id', :approved_by_account_id, where: 'approved_by_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :appeals, 'index_appeals_on_approved_by_account_id', :approved_by_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb b/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb
new file mode 100644
index 000000000..cb1906e9f
--- /dev/null
+++ b/db/post_migrate/20220310060913_optimize_null_index_account_migrations_target_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAccountMigrationsTargetAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :account_migrations, 'index_account_migrations_on_target_account_id', :target_account_id, where: 'target_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :account_migrations, 'index_account_migrations_on_target_account_id', :target_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb b/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb
new file mode 100644
index 000000000..017333c26
--- /dev/null
+++ b/db/post_migrate/20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexAppealsRejectedByAccountId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :appeals, 'index_appeals_on_rejected_by_account_id', :rejected_by_account_id, where: 'rejected_by_account_id IS NOT NULL'
+  end
+
+  def down
+    update_index :appeals, 'index_appeals_on_rejected_by_account_id', :rejected_by_account_id
+  end
+end
diff --git a/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb b/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb
new file mode 100644
index 000000000..fc0d42a25
--- /dev/null
+++ b/db/post_migrate/20220310060939_optimize_null_index_list_accounts_follow_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexListAccountsFollowId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :list_accounts, 'index_list_accounts_on_follow_id', :follow_id, where: 'follow_id IS NOT NULL'
+  end
+
+  def down
+    update_index :list_accounts, 'index_list_accounts_on_follow_id', :follow_id
+  end
+end
diff --git a/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb b/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb
new file mode 100644
index 000000000..fb49e33e9
--- /dev/null
+++ b/db/post_migrate/20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class OptimizeNullIndexWebPushSubscriptionsAccessTokenId < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    update_index :web_push_subscriptions, 'index_web_push_subscriptions_on_access_token_id', :access_token_id, where: 'access_token_id IS NOT NULL'
+  end
+
+  def down
+    update_index :web_push_subscriptions, 'index_web_push_subscriptions_on_access_token_id', :access_token_id
+  end
+end
diff --git a/db/post_migrate/20220429101025_remove_ips_from_email_domain_blocks.rb b/db/post_migrate/20220429101025_remove_ips_from_email_domain_blocks.rb
new file mode 100644
index 000000000..fbb74d99e
--- /dev/null
+++ b/db/post_migrate/20220429101025_remove_ips_from_email_domain_blocks.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class RemoveIpsFromEmailDomainBlocks < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :email_domain_blocks, :ips, :inet, array: true
+      remove_column :email_domain_blocks, :last_refresh_at, :datetime
+    end
+  end
+end
diff --git a/db/post_migrate/20220429101850_clear_email_domain_blocks.rb b/db/post_migrate/20220429101850_clear_email_domain_blocks.rb
new file mode 100644
index 000000000..ff525b650
--- /dev/null
+++ b/db/post_migrate/20220429101850_clear_email_domain_blocks.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ClearEmailDomainBlocks < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  class EmailDomainBlock < ApplicationRecord
+  end
+
+  def up
+    EmailDomainBlock.where.not(parent_id: nil).in_batches.delete_all
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
new file mode 100644
index 000000000..bd3664c72
--- /dev/null
+++ b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveFilteredLanguagesFromUsers < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :users, :filtered_languages, :string, array: true, default: [], null: false
+    end
+  end
+end
diff --git a/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb b/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb
new file mode 100644
index 000000000..7ef0749e5
--- /dev/null
+++ b/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class RemoveWholeWordFromCustomFilters < ActiveRecord::Migration[6.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      remove_column :custom_filters, :whole_word
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column_with_default :custom_filters, :whole_word, :boolean, default: true, allow_null: false
+    end
+  end
+end
diff --git a/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb b/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb
new file mode 100644
index 000000000..6ed8bcfee
--- /dev/null
+++ b/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class RemoveIrreversibleFromCustomFilters < ActiveRecord::Migration[6.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      remove_column :custom_filters, :irreversible
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column_with_default :custom_filters, :irreversible, :boolean, allow_null: false, default: false
+    end
+  end
+end
diff --git a/db/post_migrate/20220617202502_migrate_roles.rb b/db/post_migrate/20220617202502_migrate_roles.rb
new file mode 100644
index 000000000..950699d9c
--- /dev/null
+++ b/db/post_migrate/20220617202502_migrate_roles.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class MigrateRoles < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  class UserRole < ApplicationRecord; end
+  class User < ApplicationRecord; end
+
+  def up
+    load Rails.root.join('db', 'seeds', '03_roles.rb')
+
+    owner_role     = UserRole.find_by(name: 'Owner')
+    moderator_role = UserRole.find_by(name: 'Moderator')
+
+    User.where(admin: true).in_batches.update_all(role_id: owner_role.id)
+    User.where(moderator: true).in_batches.update_all(role_id: moderator_role.id)
+  end
+
+  def down
+    admin_role     = UserRole.find_by(name: 'Admin')
+    owner_role     = UserRole.find_by(name: 'Owner')
+    moderator_role = UserRole.find_by(name: 'Moderator')
+
+    User.where(role_id: [admin_role.id, owner_role.id]).in_batches.update_all(admin: true) if admin_role
+    User.where(role_id: moderator_role.id).in_batches.update_all(moderator: true) if moderator_role
+  end
+end
diff --git a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
new file mode 100644
index 000000000..254690cc3
--- /dev/null
+++ b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class MigrateSettingsToUserRoles < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  class UserRole < ApplicationRecord; end
+
+  def up
+    owner_role     = UserRole.find_by(name: 'Owner')
+    admin_role     = UserRole.find_by(name: 'Admin')
+    moderator_role = UserRole.find_by(name: 'Moderator')
+    everyone_role  = UserRole.find_by(id: -99)
+
+    min_invite_role  = Setting.min_invite_role
+    show_staff_badge = Setting.show_staff_badge
+
+    if everyone_role
+      everyone_role.permissions &= ~::UserRole::FLAGS[:invite_users] unless min_invite_role == 'user'
+      everyone_role.save
+    end
+
+    if owner_role
+      owner_role.highlighted = show_staff_badge
+      owner_role.save
+    end
+
+    if admin_role
+      admin_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(admin moderator).include?(min_invite_role)
+      admin_role.highlighted  = show_staff_badge
+      admin_role.save
+    end
+
+    if moderator_role
+      moderator_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(moderator).include?(min_invite_role)
+      moderator_role.highlighted  = show_staff_badge
+      moderator_role.save
+    end
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20220729171123_fix_custom_filter_keywords_id_seq.rb b/db/post_migrate/20220729171123_fix_custom_filter_keywords_id_seq.rb
new file mode 100644
index 000000000..7ed34a3ef
--- /dev/null
+++ b/db/post_migrate/20220729171123_fix_custom_filter_keywords_id_seq.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class FixCustomFilterKeywordsIdSeq < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    # 20220613110711 manually inserts items with set `id` in the database, but
+    # we also need to bump the sequence number, otherwise 
+    safety_assured do
+      execute <<-SQL.squish
+        BEGIN;
+        LOCK TABLE custom_filter_keywords IN EXCLUSIVE MODE;
+        SELECT setval('custom_filter_keywords_id_seq'::regclass, id) FROM custom_filter_keywords ORDER BY id DESC LIMIT 1;
+        COMMIT;
+      SQL
+    end
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20220824164532_remove_recorded_changes_from_admin_action_logs.rb b/db/post_migrate/20220824164532_remove_recorded_changes_from_admin_action_logs.rb
new file mode 100644
index 000000000..c42d5df8f
--- /dev/null
+++ b/db/post_migrate/20220824164532_remove_recorded_changes_from_admin_action_logs.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveRecordedChangesFromAdminActionLogs < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :admin_action_logs, :recorded_changes, :text }
+  end
+end
diff --git a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
new file mode 100644
index 000000000..48ef1e6e3
--- /dev/null
+++ b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+class BackfillAdminActionLogs < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  class Account < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    has_one :user, inverse_of: :account
+
+    def local?
+      domain.nil?
+    end
+
+    def acct
+      local? ? username : "#{username}@#{domain}"
+    end
+  end
+
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class Status < ApplicationRecord
+    include RoutingHelper
+
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+
+    def local?
+      attributes['local'] || attributes['uri'].nil?
+    end
+
+    def uri
+      local? ? activity_account_status_url(account, self) : attributes['uri']
+    end
+  end
+
+  class DomainBlock < ApplicationRecord; end
+  class DomainAllow < ApplicationRecord; end
+  class EmailDomainBlock < ApplicationRecord; end
+  class UnavailableDomain < ApplicationRecord; end
+
+  class AccountWarning < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class Announcement < ApplicationRecord; end
+  class IpBlock < ApplicationRecord; end
+  class CustomEmoji < ApplicationRecord; end
+  class CanonicalEmailBlock < ApplicationRecord; end
+
+  class Appeal < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class AdminActionLog < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+
+    # Cannot use usual polymorphic support because of namespacing issues
+    belongs_to :status, foreign_key: :target_id
+    belongs_to :account, foreign_key: :target_id
+    belongs_to :user, foreign_key: :user_id
+    belongs_to :domain_block, foreign_key: :target_id
+    belongs_to :domain_allow, foreign_key: :target_id
+    belongs_to :email_domain_block, foreign_key: :target_id
+    belongs_to :unavailable_domain, foreign_key: :target_id
+    belongs_to :account_warning, foreign_key: :target_id
+    belongs_to :announcement, foreign_key: :target_id
+    belongs_to :ip_block, foreign_key: :target_id
+    belongs_to :custom_emoji, foreign_key: :target_id
+    belongs_to :canonical_email_block, foreign_key: :target_id
+    belongs_to :appeal, foreign_key: :target_id
+  end
+
+  def up
+    safety_assured do
+      AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+        next if log.account.nil?
+        log.update_attribute('human_identifier', log.account.acct)
+      end
+
+      AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
+        next if log.user.nil?
+        log.update_attribute('human_identifier', log.user.account.acct)
+        log.update_attribute('route_param', log.user.account_id)
+      end
+
+      Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+
+      AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+        next if log.domain_block.nil?
+        log.update_attribute('human_identifier', log.domain_block.domain)
+      end
+
+      AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+        next if log.domain_allow.nil?
+        log.update_attribute('human_identifier', log.domain_allow.domain)
+      end
+
+      AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
+        next if log.email_domain_block.nil?
+        log.update_attribute('human_identifier', log.email_domain_block.domain)
+      end
+
+      AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+        next if log.unavailable_domain.nil?
+        log.update_attribute('human_identifier', log.unavailable_domain.domain)
+      end
+
+      AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
+        next if log.status.nil?
+        log.update_attribute('human_identifier', log.status.account.acct)
+        log.update_attribute('permalink', log.status.uri)
+      end
+
+      AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
+        next if log.account_warning.nil?
+        log.update_attribute('human_identifier', log.account_warning.account.acct)
+      end
+
+      AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
+        next if log.announcement.nil?
+        log.update_attribute('human_identifier', log.announcement.text)
+      end
+
+      AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
+        next if log.ip_block.nil?
+        log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+      end
+
+      AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
+        next if log.custom_emoji.nil?
+        log.update_attribute('human_identifier', log.custom_emoji.shortcode)
+      end
+
+      AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
+        next if log.canonical_email_block.nil?
+        log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
+      end
+
+      AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
+        next if log.appeal.nil?
+        log.update_attribute('human_identifier', log.appeal.account.acct)
+        log.update_attribute('route_param', log.appeal.account_warning_id)
+      end
+    end
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
new file mode 100644
index 000000000..279053ab9
--- /dev/null
+++ b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+class BackfillAdminActionLogsAgain < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  class Account < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    has_one :user, inverse_of: :account
+
+    def local?
+      domain.nil?
+    end
+
+    def acct
+      local? ? username : "#{username}@#{domain}"
+    end
+  end
+
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class Status < ApplicationRecord
+    include RoutingHelper
+
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+
+    def local?
+      attributes['local'] || attributes['uri'].nil?
+    end
+
+    def uri
+      local? ? activity_account_status_url(account, self) : attributes['uri']
+    end
+  end
+
+  class DomainBlock < ApplicationRecord; end
+  class DomainAllow < ApplicationRecord; end
+  class EmailDomainBlock < ApplicationRecord; end
+  class UnavailableDomain < ApplicationRecord; end
+
+  class AccountWarning < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class Announcement < ApplicationRecord; end
+  class IpBlock < ApplicationRecord; end
+  class CustomEmoji < ApplicationRecord; end
+  class CanonicalEmailBlock < ApplicationRecord; end
+
+  class Appeal < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    belongs_to :account
+  end
+
+  class AdminActionLog < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+
+    # Cannot use usual polymorphic support because of namespacing issues
+    belongs_to :status, foreign_key: :target_id
+    belongs_to :account, foreign_key: :target_id
+    belongs_to :user, foreign_key: :user_id
+    belongs_to :domain_block, foreign_key: :target_id
+    belongs_to :domain_allow, foreign_key: :target_id
+    belongs_to :email_domain_block, foreign_key: :target_id
+    belongs_to :unavailable_domain, foreign_key: :target_id
+    belongs_to :account_warning, foreign_key: :target_id
+    belongs_to :announcement, foreign_key: :target_id
+    belongs_to :ip_block, foreign_key: :target_id
+    belongs_to :custom_emoji, foreign_key: :target_id
+    belongs_to :canonical_email_block, foreign_key: :target_id
+    belongs_to :appeal, foreign_key: :target_id
+  end
+
+  def up
+    safety_assured do
+      AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+        next if log.account.nil?
+        log.update_attribute('human_identifier', log.account.acct)
+      end
+
+      AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
+        next if log.user.nil?
+        log.update_attribute('human_identifier', log.user.account.acct)
+        log.update_attribute('route_param', log.user.account_id)
+      end
+
+      Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+
+      AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+        next if log.domain_block.nil?
+        log.update_attribute('human_identifier', log.domain_block.domain)
+      end
+
+      AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+        next if log.domain_allow.nil?
+        log.update_attribute('human_identifier', log.domain_allow.domain)
+      end
+
+      AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
+        next if log.email_domain_block.nil?
+        log.update_attribute('human_identifier', log.email_domain_block.domain)
+      end
+
+      AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+        next if log.unavailable_domain.nil?
+        log.update_attribute('human_identifier', log.unavailable_domain.domain)
+      end
+
+      AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
+        next if log.status.nil?
+        log.update_attribute('human_identifier', log.status.account.acct)
+        log.update_attribute('permalink', log.status.uri)
+      end
+
+      AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
+        next if log.account_warning.nil?
+        log.update_attribute('human_identifier', log.account_warning.account.acct)
+      end
+
+      AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
+        next if log.announcement.nil?
+        log.update_attribute('human_identifier', log.announcement.text)
+      end
+
+      AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
+        next if log.ip_block.nil?
+        log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+      end
+
+      AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
+        next if log.custom_emoji.nil?
+        log.update_attribute('human_identifier', log.custom_emoji.shortcode)
+      end
+
+      AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
+        next if log.canonical_email_block.nil?
+        log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
+      end
+
+      AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
+        next if log.appeal.nil?
+        log.update_attribute('human_identifier', log.appeal.account.acct)
+        log.update_attribute('route_param', log.appeal.account_warning_id)
+      end
+    end
+  end
+
+  def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a1d169b23..704cef122 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_12_13_040746) do
+ActiveRecord::Schema.define(version: 2022_12_06_114142) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -59,7 +59,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_account_migrations_on_account_id"
-    t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id"
+    t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id", where: "(target_account_id IS NOT NULL)"
   end
 
   create_table "account_moderation_notes", force: :cascade do |t|
@@ -133,6 +133,9 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.text "text", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "report_id"
+    t.string "status_ids", array: true
+    t.datetime "overruled_at"
     t.index ["account_id"], name: "index_account_warnings_on_account_id"
     t.index ["target_account_id"], name: "index_account_warnings_on_target_account_id"
   end
@@ -174,18 +177,20 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "also_known_as", array: true
     t.datetime "silenced_at"
     t.datetime "suspended_at"
-    t.integer "trust_level"
     t.boolean "hide_collections"
     t.integer "avatar_storage_schema_version"
     t.integer "header_storage_schema_version"
     t.string "devices_url"
     t.integer "suspension_origin"
     t.datetime "sensitized_at"
+    t.boolean "trendable"
+    t.datetime "reviewed_at"
+    t.datetime "requested_review_at"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
-    t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
+    t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id", where: "(moved_to_account_id IS NOT NULL)"
     t.index ["uri"], name: "index_accounts_on_uri"
-    t.index ["url"], name: "index_accounts_on_url"
+    t.index ["url"], name: "index_accounts_on_url", opclass: :text_pattern_ops, where: "(url IS NOT NULL)"
   end
 
   create_table "accounts_tags", id: false, force: :cascade do |t|
@@ -200,9 +205,11 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "action", default: "", null: false
     t.string "target_type"
     t.bigint "target_id"
-    t.text "recorded_changes", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "human_identifier"
+    t.string "route_param"
+    t.string "permalink"
     t.index ["account_id"], name: "index_admin_action_logs_on_account_id"
     t.index ["target_type", "target_id"], name: "index_admin_action_logs_on_target_type_and_target_id"
   end
@@ -225,7 +232,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "updated_at", null: false
     t.index ["account_id", "announcement_id", "name"], name: "index_announcement_reactions_on_account_id_and_announcement_id", unique: true
     t.index ["announcement_id"], name: "index_announcement_reactions_on_announcement_id"
-    t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id"
+    t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id", where: "(custom_emoji_id IS NOT NULL)"
   end
 
   create_table "announcements", force: :cascade do |t|
@@ -241,6 +248,22 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.bigint "status_ids", array: true
   end
 
+  create_table "appeals", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "account_warning_id", null: false
+    t.text "text", default: "", null: false
+    t.datetime "approved_at"
+    t.bigint "approved_by_account_id"
+    t.datetime "rejected_at"
+    t.bigint "rejected_by_account_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id"], name: "index_appeals_on_account_id"
+    t.index ["account_warning_id"], name: "index_appeals_on_account_warning_id", unique: true
+    t.index ["approved_by_account_id"], name: "index_appeals_on_approved_by_account_id", where: "(approved_by_account_id IS NOT NULL)"
+    t.index ["rejected_by_account_id"], name: "index_appeals_on_rejected_by_account_id", where: "(rejected_by_account_id IS NOT NULL)"
+  end
+
   create_table "backups", force: :cascade do |t|
     t.bigint "user_id"
     t.string "dump_file_name"
@@ -273,7 +296,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
 
   create_table "canonical_email_blocks", force: :cascade do |t|
     t.string "canonical_email_hash", default: "", null: false
-    t.bigint "reference_account_id", null: false
+    t.bigint "reference_account_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["canonical_email_hash"], name: "index_canonical_email_blocks_on_canonical_email_hash", unique: true
@@ -290,7 +313,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "uri"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["uri"], name: "index_conversations_on_uri", unique: true
+    t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
   create_table "custom_emoji_categories", force: :cascade do |t|
@@ -318,15 +341,32 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true
   end
 
+  create_table "custom_filter_keywords", force: :cascade do |t|
+    t.bigint "custom_filter_id", null: false
+    t.text "keyword", default: "", null: false
+    t.boolean "whole_word", default: true, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["custom_filter_id"], name: "index_custom_filter_keywords_on_custom_filter_id"
+  end
+
+  create_table "custom_filter_statuses", force: :cascade do |t|
+    t.bigint "custom_filter_id", null: false
+    t.bigint "status_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["custom_filter_id"], name: "index_custom_filter_statuses_on_custom_filter_id"
+    t.index ["status_id"], name: "index_custom_filter_statuses_on_status_id"
+  end
+
   create_table "custom_filters", force: :cascade do |t|
     t.bigint "account_id"
     t.datetime "expires_at"
     t.text "phrase", default: "", null: false
     t.string "context", default: [], null: false, array: true
-    t.boolean "irreversible", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.boolean "whole_word", default: true, null: false
+    t.integer "action", default: 0, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end
 
@@ -396,13 +436,14 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   end
 
   create_table "featured_tags", force: :cascade do |t|
-    t.bigint "account_id"
-    t.bigint "tag_id"
+    t.bigint "account_id", null: false
+    t.bigint "tag_id", null: false
     t.bigint "statuses_count", default: 0, null: false
     t.datetime "last_status_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_featured_tags_on_account_id"
+    t.string "name"
+    t.index ["account_id", "tag_id"], name: "index_featured_tags_on_account_id_and_tag_id", unique: true
     t.index ["tag_id"], name: "index_featured_tags_on_tag_id"
   end
 
@@ -421,6 +462,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.boolean "show_reblogs", default: true, null: false
     t.string "uri"
     t.boolean "notify", default: false, null: false
+    t.string "languages", array: true
     t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
   end
 
@@ -432,6 +474,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.boolean "show_reblogs", default: true, null: false
     t.string "uri"
     t.boolean "notify", default: false, null: false
+    t.string "languages", array: true
     t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
     t.index ["target_account_id"], name: "index_follows_on_target_account_id"
   end
@@ -479,6 +522,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.inet "ip", default: "0.0.0.0", null: false
     t.integer "severity", default: 0, null: false
     t.text "comment", default: "", null: false
+    t.index ["ip"], name: "index_ip_blocks_on_ip", unique: true
   end
 
   create_table "list_accounts", force: :cascade do |t|
@@ -486,7 +530,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.bigint "account_id", null: false
     t.bigint "follow_id"
     t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
-    t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
+    t.index ["follow_id"], name: "index_list_accounts_on_follow_id", where: "(follow_id IS NOT NULL)"
     t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
   end
 
@@ -545,8 +589,8 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "thumbnail_updated_at"
     t.string "thumbnail_remote_url"
     t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
-    t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id"
-    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true
+    t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id", where: "(scheduled_status_id IS NOT NULL)"
+    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true, opclass: :text_pattern_ops, where: "(shortcode IS NOT NULL)"
     t.index ["status_id"], name: "index_media_attachments_on_status_id"
   end
 
@@ -606,8 +650,10 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "scopes"
     t.bigint "application_id"
     t.bigint "resource_owner_id"
-    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
-    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
+    t.datetime "last_used_at"
+    t.inet "last_used_ip"
+    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, opclass: :text_pattern_ops, where: "(refresh_token IS NOT NULL)"
+    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", where: "(resource_owner_id IS NOT NULL)"
     t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
   end
 
@@ -691,6 +737,15 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.index ["domain"], name: "index_preview_card_providers_on_domain", unique: true
   end
 
+  create_table "preview_card_trends", force: :cascade do |t|
+    t.bigint "preview_card_id", null: false
+    t.float "score", default: 0.0, null: false
+    t.integer "rank", default: 0, null: false
+    t.boolean "allowed", default: false, null: false
+    t.string "language"
+    t.index ["preview_card_id"], name: "index_preview_card_trends_on_preview_card_id", unique: true
+  end
+
   create_table "preview_cards", force: :cascade do |t|
     t.string "url", default: "", null: false
     t.string "title", default: "", null: false
@@ -747,7 +802,6 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   create_table "reports", force: :cascade do |t|
     t.bigint "status_ids", default: [], null: false, array: true
     t.text "comment", default: "", null: false
-    t.boolean "action_taken", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "account_id", null: false
@@ -756,7 +810,12 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.bigint "assigned_account_id"
     t.string "uri"
     t.boolean "forwarded"
+    t.integer "category", default: 0, null: false
+    t.datetime "action_taken_at"
+    t.bigint "rule_ids", array: true
     t.index ["account_id"], name: "index_reports_on_account_id"
+    t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)"
+    t.index ["assigned_account_id"], name: "index_reports_on_assigned_account_id", where: "(assigned_account_id IS NOT NULL)"
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
@@ -809,15 +868,32 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.json "meta"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "blurhash"
     t.index ["var"], name: "index_site_uploads_on_var", unique: true
   end
 
+  create_table "status_edits", force: :cascade do |t|
+    t.bigint "status_id", null: false
+    t.bigint "account_id"
+    t.text "text", default: "", null: false
+    t.text "spoiler_text", default: "", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.bigint "ordered_media_attachment_ids", array: true
+    t.text "media_descriptions", array: true
+    t.string "poll_options", array: true
+    t.boolean "sensitive"
+    t.index ["account_id"], name: "index_status_edits_on_account_id"
+    t.index ["status_id"], name: "index_status_edits_on_status_id"
+  end
+
   create_table "status_pins", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
     t.datetime "created_at", default: -> { "now()" }, null: false
     t.datetime "updated_at", default: -> { "now()" }, null: false
     t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_status_pins_on_status_id"
   end
 
   create_table "status_stats", force: :cascade do |t|
@@ -830,6 +906,17 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
   end
 
+  create_table "status_trends", force: :cascade do |t|
+    t.bigint "status_id", null: false
+    t.bigint "account_id", null: false
+    t.float "score", default: 0.0, null: false
+    t.integer "rank", default: 0, null: false
+    t.boolean "allowed", default: false, null: false
+    t.string "language"
+    t.index ["account_id"], name: "index_status_trends_on_account_id"
+    t.index ["status_id"], name: "index_status_trends_on_status_id", unique: true
+  end
+
   create_table "statuses", id: :bigint, default: -> { "timestamp_id('statuses'::text)" }, force: :cascade do |t|
     t.string "uri"
     t.text "text", default: "", null: false
@@ -850,13 +937,18 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.bigint "in_reply_to_account_id"
     t.bigint "poll_id"
     t.datetime "deleted_at"
+    t.datetime "edited_at"
+    t.boolean "trendable"
+    t.bigint "ordered_media_attachment_ids", array: true
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
+    t.index ["account_id"], name: "index_statuses_on_account_id"
+    t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
-    t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
-    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id", where: "(in_reply_to_account_id IS NOT NULL)"
+    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", where: "(in_reply_to_id IS NOT NULL)"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
-    t.index ["uri"], name: "index_statuses_on_uri", unique: true
+    t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
   create_table "statuses_tags", id: false, force: :cascade do |t|
@@ -872,6 +964,15 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "tag_follows", force: :cascade do |t|
+    t.bigint "tag_id", null: false
+    t.bigint "account_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id", "tag_id"], name: "index_tag_follows_on_account_id_and_tag_id", unique: true
+    t.index ["tag_id"], name: "index_tag_follows_on_tag_id"
+  end
+
   create_table "tags", force: :cascade do |t|
     t.string "name", default: "", null: false
     t.datetime "created_at", null: false
@@ -884,6 +985,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "last_status_at"
     t.float "max_score"
     t.datetime "max_score_at"
+    t.string "display_name"
     t.index "lower((name)::text) text_pattern_ops", name: "index_tags_on_name_lower_btree", unique: true
   end
 
@@ -912,6 +1014,16 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.index ["user_id"], name: "index_user_invite_requests_on_user_id"
   end
 
+  create_table "user_roles", force: :cascade do |t|
+    t.string "name", default: "", null: false
+    t.string "color", default: "", null: false
+    t.integer "position", default: 0, null: false
+    t.bigint "permissions", default: 0, null: false
+    t.boolean "highlighted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.datetime "created_at", null: false
@@ -919,12 +1031,9 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
     t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.inet "current_sign_in_ip"
-    t.inet "last_sign_in_ip"
     t.boolean "admin", default: false, null: false
     t.string "confirmation_token"
     t.datetime "confirmed_at"
@@ -938,12 +1047,10 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.boolean "otp_required_for_login", default: false, null: false
     t.datetime "last_emailed_at"
     t.string "otp_backup_codes", array: true
-    t.string "filtered_languages", default: [], null: false, array: true
     t.bigint "account_id", null: false
     t.boolean "disabled", default: false, null: false
     t.boolean "moderator", default: false, null: false
     t.bigint "invite_id"
-    t.string "remember_token"
     t.string "chosen_languages", array: true
     t.bigint "created_by_application_id"
     t.boolean "approved", default: true, null: false
@@ -952,12 +1059,13 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.string "webauthn_id"
     t.inet "sign_up_ip"
     t.boolean "skip_sign_in_token"
+    t.bigint "role_id"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-    t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id"
+    t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"
     t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["remember_token"], name: "index_users_on_remember_token", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, opclass: :text_pattern_ops, where: "(reset_password_token IS NOT NULL)"
+    t.index ["role_id"], name: "index_users_on_role_id", where: "(role_id IS NOT NULL)"
   end
 
   create_table "web_push_subscriptions", force: :cascade do |t|
@@ -969,7 +1077,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.datetime "updated_at", null: false
     t.bigint "access_token_id"
     t.bigint "user_id"
-    t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id"
+    t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id", where: "(access_token_id IS NOT NULL)"
     t.index ["user_id"], name: "index_web_push_subscriptions_on_user_id"
   end
 
@@ -993,6 +1101,16 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
     t.index ["user_id"], name: "index_webauthn_credentials_on_user_id"
   end
 
+  create_table "webhooks", force: :cascade do |t|
+    t.string "url", null: false
+    t.string "events", default: [], null: false, array: true
+    t.string "secret", default: "", null: false
+    t.boolean "enabled", default: true, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["url"], name: "index_webhooks_on_url", unique: true
+  end
+
   add_foreign_key "account_aliases", "accounts", on_delete: :cascade
   add_foreign_key "account_conversations", "accounts", on_delete: :cascade
   add_foreign_key "account_conversations", "conversations", on_delete: :cascade
@@ -1010,6 +1128,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   add_foreign_key "account_statuses_cleanup_policies", "accounts", on_delete: :cascade
   add_foreign_key "account_warnings", "accounts", column: "target_account_id", on_delete: :cascade
   add_foreign_key "account_warnings", "accounts", on_delete: :nullify
+  add_foreign_key "account_warnings", "reports", on_delete: :cascade
   add_foreign_key "accounts", "accounts", column: "moved_to_account_id", on_delete: :nullify
   add_foreign_key "admin_action_logs", "accounts", on_delete: :cascade
   add_foreign_key "announcement_mutes", "accounts", on_delete: :cascade
@@ -1017,6 +1136,10 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   add_foreign_key "announcement_reactions", "accounts", on_delete: :cascade
   add_foreign_key "announcement_reactions", "announcements", on_delete: :cascade
   add_foreign_key "announcement_reactions", "custom_emojis", on_delete: :cascade
+  add_foreign_key "appeals", "account_warnings", on_delete: :cascade
+  add_foreign_key "appeals", "accounts", column: "approved_by_account_id", on_delete: :nullify
+  add_foreign_key "appeals", "accounts", column: "rejected_by_account_id", on_delete: :nullify
+  add_foreign_key "appeals", "accounts", on_delete: :cascade
   add_foreign_key "backups", "users", on_delete: :nullify
   add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade
   add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
@@ -1025,6 +1148,9 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   add_foreign_key "canonical_email_blocks", "accounts", column: "reference_account_id", on_delete: :cascade
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
+  add_foreign_key "custom_filter_keywords", "custom_filters", on_delete: :cascade
+  add_foreign_key "custom_filter_statuses", "custom_filters", on_delete: :cascade
+  add_foreign_key "custom_filter_statuses", "statuses", on_delete: :cascade
   add_foreign_key "custom_filters", "accounts", on_delete: :cascade
   add_foreign_key "devices", "accounts", on_delete: :cascade
   add_foreign_key "devices", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
@@ -1068,6 +1194,7 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   add_foreign_key "poll_votes", "polls", on_delete: :cascade
   add_foreign_key "polls", "accounts", on_delete: :cascade
   add_foreign_key "polls", "statuses", on_delete: :cascade
+  add_foreign_key "preview_card_trends", "preview_cards", on_delete: :cascade
   add_foreign_key "report_notes", "accounts", on_delete: :cascade
   add_foreign_key "report_notes", "reports", on_delete: :cascade
   add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", name: "fk_bca45b75fd", on_delete: :nullify
@@ -1077,20 +1204,27 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade
   add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade
   add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade
+  add_foreign_key "status_edits", "accounts", on_delete: :nullify
+  add_foreign_key "status_edits", "statuses", on_delete: :cascade
   add_foreign_key "status_pins", "accounts", name: "fk_d4cb435b62", on_delete: :cascade
   add_foreign_key "status_pins", "statuses", on_delete: :cascade
   add_foreign_key "status_stats", "statuses", on_delete: :cascade
+  add_foreign_key "status_trends", "accounts", on_delete: :cascade
+  add_foreign_key "status_trends", "statuses", on_delete: :cascade
   add_foreign_key "statuses", "accounts", column: "in_reply_to_account_id", name: "fk_c7fa917661", on_delete: :nullify
   add_foreign_key "statuses", "accounts", name: "fk_9bda1543f7", on_delete: :cascade
   add_foreign_key "statuses", "statuses", column: "in_reply_to_id", on_delete: :nullify
   add_foreign_key "statuses", "statuses", column: "reblog_of_id", on_delete: :cascade
   add_foreign_key "statuses_tags", "statuses", on_delete: :cascade
   add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade
+  add_foreign_key "tag_follows", "accounts", on_delete: :cascade
+  add_foreign_key "tag_follows", "tags", on_delete: :cascade
   add_foreign_key "tombstones", "accounts", on_delete: :cascade
   add_foreign_key "user_invite_requests", "users", on_delete: :cascade
   add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade
   add_foreign_key "users", "invites", on_delete: :nullify
   add_foreign_key "users", "oauth_applications", column: "created_by_application_id", on_delete: :nullify
+  add_foreign_key "users", "user_roles", column: "role_id", on_delete: :nullify
   add_foreign_key "web_push_subscriptions", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
   add_foreign_key "web_push_subscriptions", "users", on_delete: :cascade
   add_foreign_key "web_settings", "users", name: "fk_11910667b2", on_delete: :cascade
@@ -1120,6 +1254,28 @@ ActiveRecord::Schema.define(version: 2021_12_13_040746) do
   SQL
   add_index "instances", ["domain"], name: "index_instances_on_domain", unique: true
 
+  create_view "user_ips", sql_definition: <<-SQL
+      SELECT t0.user_id,
+      t0.ip,
+      max(t0.used_at) AS used_at
+     FROM ( SELECT users.id AS user_id,
+              users.sign_up_ip AS ip,
+              users.created_at AS used_at
+             FROM users
+            WHERE (users.sign_up_ip IS NOT NULL)
+          UNION ALL
+           SELECT session_activations.user_id,
+              session_activations.ip,
+              session_activations.updated_at
+             FROM session_activations
+          UNION ALL
+           SELECT login_activities.user_id,
+              login_activities.ip,
+              login_activities.created_at
+             FROM login_activities
+            WHERE (login_activities.success = true)) t0
+    GROUP BY t0.user_id, t0.ip;
+  SQL
   create_view "account_summaries", materialized: true, sql_definition: <<-SQL
       SELECT accounts.id AS account_id,
       mode() WITHIN GROUP (ORDER BY t0.language) AS language,
diff --git a/db/seeds.rb b/db/seeds.rb
index 0bfb5d0db..1ca300de7 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,11 +1,5 @@
-Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push')
+# frozen_string_literal: true
 
-domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain
-account = Account.find_or_initialize_by(id: -99, actor_type: 'Application', locked: true, username: domain)
-account.save!
-
-if Rails.env.development?
-  admin  = Account.where(username: 'admin').first_or_initialize(username: 'admin')
-  admin.save(validate: false)
-  User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, admin: true, account: admin, agreement: true, approved: true).save!
+Dir[Rails.root.join('db', 'seeds', '*.rb')].sort.each do |seed|
+  load seed
 end
diff --git a/db/seeds/01_web_app.rb b/db/seeds/01_web_app.rb
new file mode 100644
index 000000000..a457a883b
--- /dev/null
+++ b/db/seeds/01_web_app.rb
@@ -0,0 +1 @@
+Doorkeeper::Application.create_with(name: 'Web', redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push').find_or_create_by(superapp: true)
diff --git a/db/seeds/02_instance_actor.rb b/db/seeds/02_instance_actor.rb
new file mode 100644
index 000000000..39186b273
--- /dev/null
+++ b/db/seeds/02_instance_actor.rb
@@ -0,0 +1 @@
+Account.create_with(actor_type: 'Application', locked: true, username: ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain).find_or_create_by(id: -99)
diff --git a/db/seeds/03_roles.rb b/db/seeds/03_roles.rb
new file mode 100644
index 000000000..7fedf0f71
--- /dev/null
+++ b/db/seeds/03_roles.rb
@@ -0,0 +1,9 @@
+# Pre-create base role
+UserRole.everyone
+
+# Create default roles defined in config file
+default_roles = YAML.load_file(Rails.root.join('config', 'roles.yml'))
+
+default_roles.each do |_, config|
+  UserRole.create_with(position: config['position'], permissions_as_keys: config['permissions'], highlighted: true).find_or_create_by(name: config['name'])
+end
diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb
new file mode 100644
index 000000000..a67040e4e
--- /dev/null
+++ b/db/seeds/04_admin.rb
@@ -0,0 +1,8 @@
+if Rails.env.development?
+  domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain
+
+  admin = Account.where(username: 'admin').first_or_initialize(username: 'admin')
+  admin.save(validate: false)
+
+  User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true).save!
+end
diff --git a/db/views/follow_recommendations_v01.sql b/db/views/follow_recommendations_v01.sql
index 799abeaee..8295bbc0f 100644
--- a/db/views/follow_recommendations_v01.sql
+++ b/db/views/follow_recommendations_v01.sql
@@ -20,7 +20,7 @@ FROM (
   HAVING count(follows.id) >= 5
   UNION ALL
   SELECT accounts.id AS account_id,
-         sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+         sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
          'most_interactions' AS reason
   FROM status_stats
   INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -32,7 +32,7 @@ FROM (
     AND accounts.locked = 'f'
     AND accounts.discoverable = 't'
   GROUP BY accounts.id
-  HAVING sum(reblogs_count + favourites_count) >= 5
+  HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
 ) t0
 GROUP BY account_id
 ORDER BY rank DESC
diff --git a/db/views/follow_recommendations_v02.sql b/db/views/follow_recommendations_v02.sql
index 673c5cc85..f67c6eecf 100644
--- a/db/views/follow_recommendations_v02.sql
+++ b/db/views/follow_recommendations_v02.sql
@@ -18,7 +18,7 @@ FROM (
   HAVING count(follows.id) >= 5
   UNION ALL
   SELECT account_summaries.account_id AS account_id,
-         sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+         sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
          'most_interactions' AS reason
   FROM status_stats
   INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -28,7 +28,7 @@ FROM (
     AND account_summaries.sensitive = 'f'
     AND follow_recommendation_suppressions.id IS NULL
   GROUP BY account_summaries.account_id
-  HAVING sum(reblogs_count + favourites_count) >= 5
+  HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
 ) t0
 GROUP BY account_id
 ORDER BY rank DESC
diff --git a/db/views/user_ips_v01.sql b/db/views/user_ips_v01.sql
new file mode 100644
index 000000000..50a8201cd
--- /dev/null
+++ b/db/views/user_ips_v01.sql
@@ -0,0 +1,26 @@
+SELECT
+  user_id,
+  ip,
+  max(used_at) AS used_at
+FROM (
+  SELECT
+    id AS user_id,
+    sign_up_ip AS ip,
+    created_at AS used_at
+  FROM users
+  WHERE sign_up_ip IS NOT NULL
+  UNION ALL
+  SELECT
+    user_id,
+    ip,
+    updated_at
+  FROM session_activations
+  UNION ALL
+  SELECT
+    user_id,
+    ip,
+    created_at
+  FROM login_activities
+  WHERE success = 't'
+) AS t0
+GROUP BY user_id, ip
diff --git a/dist/nginx.conf b/dist/nginx.conf
index 27ca868ab..5bc960e25 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -50,24 +50,85 @@ server {
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-
-  add_header Strict-Transport-Security "max-age=31536000" always;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon;
 
   location / {
     try_files $uri @proxy;
   }
 
-  location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
-    add_header Cache-Control "public, max-age=31536000, immutable";
-    add_header Strict-Transport-Security "max-age=31536000" always;
-    try_files $uri @proxy;
+  # If Docker is used for deployment and Rails serves static files,
+  # then needed must replace line `try_files $uri =404;` with `try_files $uri @proxy;`.
+  location = /sw.js {
+    add_header Cache-Control "public, max-age=604800, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
   }
 
-  location /sw.js {
-    add_header Cache-Control "public, max-age=0";
-    add_header Strict-Transport-Security "max-age=31536000" always;
-    try_files $uri @proxy;
+  location ~ ^/assets/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/avatars/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/emoji/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/headers/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/packs/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/shortcuts/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/sounds/ {
+    add_header Cache-Control "public, max-age=2419200, must-revalidate";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ~ ^/system/ {
+    add_header Cache-Control "public, max-age=2419200, immutable";
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+    try_files $uri =404;
+  }
+
+  location ^~ /api/v1/streaming {
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Proxy "";
+
+    proxy_pass http://streaming;
+    proxy_buffering off;
+    proxy_redirect off;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+
+    tcp_nodelay on;
   }
 
   location @proxy {
@@ -90,27 +151,9 @@ server {
     proxy_cache_valid 410 24h;
     proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
     add_header X-Cached $upstream_cache_status;
-    add_header Strict-Transport-Security "max-age=31536000" always;
 
     tcp_nodelay on;
   }
 
-  location /api/v1/streaming {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header Proxy "";
-
-    proxy_pass http://streaming;
-    proxy_buffering off;
-    proxy_redirect off;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $connection_upgrade;
-
-    tcp_nodelay on;
-  }
-
-  error_page 500 501 502 503 504 /500.html;
+  error_page 404 500 501 502 503 504 /500.html;
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index c1c4e5ac7..c534286c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,5 @@
 version: '3'
 services:
-
   db:
     restart: always
     image: postgres:14-alpine
@@ -8,40 +7,52 @@ services:
     networks:
       - internal_network
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
       - ./postgres14:/var/lib/postgresql/data
     environment:
-      - "POSTGRES_HOST_AUTH_METHOD=trust"
+      - 'POSTGRES_HOST_AUTH_METHOD=trust'
 
   redis:
     restart: always
-    image: redis:6-alpine
+    image: redis:7-alpine
     networks:
       - internal_network
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: ['CMD', 'redis-cli', 'ping']
     volumes:
       - ./redis:/data
 
-#  es:
-#    restart: always
-#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
-#    environment:
-#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-#      - "cluster.name=es-mastodon"
-#      - "discovery.type=single-node"
-#      - "bootstrap.memory_lock=true"
-#    networks:
-#      - internal_network
-#    healthcheck:
-#      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-#    volumes:
-#      - ./elasticsearch:/usr/share/elasticsearch/data
-#    ulimits:
-#      memlock:
-#        soft: -1
-#        hard: -1
+  # es:
+  #   restart: always
+  #   image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
+  #   environment:
+  #     - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true"
+  #     - "xpack.license.self_generated.type=basic"
+  #     - "xpack.security.enabled=false"
+  #     - "xpack.watcher.enabled=false"
+  #     - "xpack.graph.enabled=false"
+  #     - "xpack.ml.enabled=false"
+  #     - "bootstrap.memory_lock=true"
+  #     - "cluster.name=es-mastodon"
+  #     - "discovery.type=single-node"
+  #     - "thread_pool.write.queue_size=1000"
+  #   networks:
+  #      - external_network
+  #      - internal_network
+  #   healthcheck:
+  #      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+  #   volumes:
+  #      - ./elasticsearch:/usr/share/elasticsearch/data
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
+  #     nofile:
+  #       soft: 65536
+  #       hard: 65536
+  #   ports:
+  #     - '127.0.0.1:9200:9200'
 
   web:
     build: .
@@ -53,13 +64,14 @@ services:
       - external_network
       - internal_network
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"]
+      # prettier-ignore
+      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
     ports:
-      - "127.0.0.1:3000:3000"
+      - '127.0.0.1:3000:3000'
     depends_on:
       - db
       - redis
-#      - es
+      # - es
     volumes:
       - ./public/system:/mastodon/public/system
 
@@ -73,9 +85,10 @@ services:
       - external_network
       - internal_network
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"]
+      # prettier-ignore
+      test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
     ports:
-      - "127.0.0.1:4000:4000"
+      - '127.0.0.1:4000:4000'
     depends_on:
       - db
       - redis
@@ -94,22 +107,25 @@ services:
       - internal_network
     volumes:
       - ./public/system:/mastodon/public/system
-## Uncomment to enable federation with tor instances along with adding the following ENV variables
-## http_proxy=http://privoxy:8118
-## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
-#  tor:
-#    image: sirboops/tor
-#    networks:
-#      - external_network
-#      - internal_network
-#
-#  privoxy:
-#    image: sirboops/privoxy
-#    volumes:
-#      - ./priv-config:/opt/config
-#    networks:
-#      - external_network
-#      - internal_network
+    healthcheck:
+      test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
+
+  ## Uncomment to enable federation with tor instances along with adding the following ENV variables
+  ## http_proxy=http://privoxy:8118
+  ## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
+  # tor:
+  #   image: sirboops/tor
+  #   networks:
+  #      - external_network
+  #      - internal_network
+  #
+  # privoxy:
+  #   image: sirboops/privoxy
+  #   volumes:
+  #     - ./priv-config:/opt/config
+  #   networks:
+  #     - external_network
+  #     - internal_network
 
 networks:
   external_network:
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 000000000..d7b5610b8
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,32 @@
+module.exports = {
+  'testEnvironment': 'jsdom',
+  'projects': [
+    '<rootDir>/app/javascript/mastodon',
+  ],
+  'testPathIgnorePatterns': [
+    '<rootDir>/node_modules/',
+    '<rootDir>/vendor/',
+    '<rootDir>/config/',
+    '<rootDir>/log/',
+    '<rootDir>/public/',
+    '<rootDir>/tmp/',
+  ],
+  'setupFiles': [
+    'raf/polyfill',
+  ],
+  'setupFilesAfterEnv': [
+    '<rootDir>/app/javascript/mastodon/test_setup.js',
+  ],
+  'collectCoverageFrom': [
+    'app/javascript/mastodon/**/*.js',
+    '!app/javascript/mastodon/features/emoji/emoji_compressed.js',
+    '!app/javascript/mastodon/locales/locale-data/*.js',
+    '!app/javascript/mastodon/service_worker/entry.js',
+    '!app/javascript/mastodon/test_setup.js',
+  ],
+  'coverageDirectory': '<rootDir>/coverage',
+  'moduleDirectories': [
+    '<rootDir>/node_modules',
+    '<rootDir>/app/javascript',
+  ],
+};
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 000000000..d52816a98
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "baseUrl": "./app/javascript",
+    "checkJs": false,
+    "experimentalDecorators": true,
+    "jsx": "react",
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "noEmit": true,
+    "resolveJsonModule": true,
+    "strict": false,
+    "target": "ES2022"
+  },
+  "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
+}
diff --git a/lib/action_dispatch/cookie_jar_extensions.rb b/lib/action_dispatch/cookie_jar_extensions.rb
deleted file mode 100644
index 1be9053ba..000000000
--- a/lib/action_dispatch/cookie_jar_extensions.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module ActionDispatch
-  module CookieJarExtensions
-    private
-
-    # Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
-    # users. Otherwise, ActionDispatch would drop the cookie over HTTP.
-    def write_cookie?(*)
-      request.host.end_with?('.onion') || super
-    end
-  end
-end
-
-ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions)
-
-module Rack
-  module SessionPersistedExtensions
-    def security_matches?(request, options)
-      request.host.end_with?('.onion') || super
-    end
-  end
-end
-
-Rack::Session::Abstract::Persisted.prepend(Rack::SessionPersistedExtensions)
diff --git a/lib/assets/wordmark.dark.css b/lib/assets/wordmark.dark.css
new file mode 100644
index 000000000..d87069178
--- /dev/null
+++ b/lib/assets/wordmark.dark.css
@@ -0,0 +1 @@
+// Not needed
diff --git a/lib/assets/wordmark.dark.png b/lib/assets/wordmark.dark.png
new file mode 100644
index 000000000..6772b3318
Binary files /dev/null and b/lib/assets/wordmark.dark.png differ
diff --git a/lib/assets/wordmark.light.css b/lib/assets/wordmark.light.css
new file mode 100644
index 000000000..9a601f972
--- /dev/null
+++ b/lib/assets/wordmark.light.css
@@ -0,0 +1 @@
+use { color: #000 !important; }
diff --git a/lib/assets/wordmark.light.png b/lib/assets/wordmark.light.png
new file mode 100644
index 000000000..6d95088a4
Binary files /dev/null and b/lib/assets/wordmark.light.png differ
diff --git a/lib/chewy/strategy/custom_sidekiq.rb b/lib/chewy/strategy/custom_sidekiq.rb
deleted file mode 100644
index 794ae4ed4..000000000
--- a/lib/chewy/strategy/custom_sidekiq.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Chewy
-  class Strategy
-    class CustomSidekiq < Sidekiq
-      def update(_type, _objects, _options = {})
-        super if Chewy.enabled?
-      end
-    end
-  end
-end
diff --git a/lib/chewy/strategy/mastodon.rb b/lib/chewy/strategy/mastodon.rb
new file mode 100644
index 000000000..ee8b92186
--- /dev/null
+++ b/lib/chewy/strategy/mastodon.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Chewy
+  class Strategy
+    class Mastodon < Base
+      def initialize
+        super
+
+        @stash = Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      def update(type, objects, _options = {})
+        @stash[type].concat(type.root.id ? Array.wrap(objects) : type.adapter.identify(objects)) if Chewy.enabled?
+      end
+
+      def leave
+        RedisConfiguration.with do |redis|
+          redis.pipelined do |pipeline|
+            @stash.each do |type, ids|
+              pipeline.sadd("chewy:queue:#{type.name}", ids)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/enumerable.rb b/lib/enumerable.rb
deleted file mode 100644
index 66918f65e..000000000
--- a/lib/enumerable.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Enumerable
-  # TODO: Remove this once stop to support Ruby 2.6
-  if RUBY_VERSION < '2.7.0'
-    def filter_map
-      if block_given?
-        result = []
-        each do |element|
-          res = yield element
-          result << res if res
-        end
-        result
-      else
-        Enumerator.new do |yielder|
-          result = []
-          each do |element|
-            res = yielder.yield element
-            result << res if res
-          end
-          result
-        end
-      end
-    end
-  end
-end
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index eb472abaa..d3b92f4a0 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -10,6 +10,8 @@ module Mastodon
   class StreamValidationError < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
+  class SyntaxError < Error; end
+  class InvalidParameterError < Error; end
 
   class UnexpectedResponseError < Error
     attr_reader :response
@@ -24,4 +26,13 @@ module Mastodon
       end
     end
   end
+
+  class PrivateNetworkAddressError < HostValidationError
+    attr_reader :host
+
+    def initialize(host)
+      @host = host
+      super()
+    end
+  end
 end
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 2ef85d0a9..0dd852131 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -54,11 +54,10 @@ module Mastodon
 
     option :email, required: true
     option :confirmed, type: :boolean
-    option :role, default: 'user', enum: %w(user moderator admin)
-    option :skip_sign_in_token, type: :boolean
+    option :role
     option :reattach, type: :boolean
     option :force, type: :boolean
-    desc 'create USERNAME', 'Create a new user'
+    desc 'create USERNAME', 'Create a new user account'
     long_desc <<-LONG_DESC
       Create a new user account with a given USERNAME and an
       e-mail address provided with --email.
@@ -66,11 +65,7 @@ module Mastodon
       With the --confirmed option, the confirmation e-mail will
       be skipped and the account will be active straight away.
 
-      With the --role option one of  "user", "admin" or "moderator"
-      can be supplied. Defaults to "user"
-
-      With the --skip-sign-in-token option, you can ensure that
-      the user is never asked for an e-mailed security code.
+      With the --role option, the role can be supplied.
 
       With the --reattach option, the new user will be reattached
       to a given existing username of an old account. If the old
@@ -79,9 +74,22 @@ module Mastodon
       username to the new account anyway.
     LONG_DESC
     def create(username)
+      role_id  = nil
+
+      if options[:role]
+        role = UserRole.find_by(name: options[:role])
+
+        if role.nil?
+          say('Cannot find user role with that name', :red)
+          exit(1)
+        end
+
+        role_id = role.id
+      end
+
       account  = Account.new(username: username)
       password = SecureRandom.hex
-      user     = User.new(email: options[:email], password: password, agreement: true, approved: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil, bypass_invite_request_check: true, skip_sign_in_token: options[:skip_sign_in_token])
+      user     = User.new(email: options[:email], password: password, agreement: true, approved: true, role_id: role_id, confirmed_at: options[:confirmed] ? Time.now.utc : nil, bypass_invite_request_check: true)
 
       if options[:reattach]
         account = Account.find_local(username) || Account.new(username: username)
@@ -110,14 +118,15 @@ module Mastodon
         user.errors.to_h.each do |key, error|
           say('Failure/Error: ', :red)
           say(key)
-          say('    ' + error, :red)
+          say("    #{error}", :red)
         end
 
         exit(1)
       end
     end
 
-    option :role, enum: %w(user moderator admin)
+    option :role
+    option :remove_role, type: :boolean
     option :email
     option :confirm, type: :boolean
     option :enable, type: :boolean
@@ -125,13 +134,12 @@ module Mastodon
     option :disable_2fa, type: :boolean
     option :approve, type: :boolean
     option :reset_password, type: :boolean
-    option :skip_sign_in_token, type: :boolean
-    desc 'modify USERNAME', 'Modify a user'
+    desc 'modify USERNAME', 'Modify a user account'
     long_desc <<-LONG_DESC
       Modify a user account.
 
-      With the --role option, update the user's role to one of "user",
-      "moderator" or "admin".
+      With the --role option, update the user's role. To remove the user's
+      role, i.e. demote to normal user, use --remove-role.
 
       With the --email option, update the user's e-mail address. With
       the --confirm option, mark the user's e-mail as confirmed.
@@ -147,9 +155,6 @@ module Mastodon
 
       With the --reset-password option, the user's password is replaced by
       a randomly-generated one, printed in the output.
-
-      With the --skip-sign-in-token option, you can ensure that
-      the user is never asked for an e-mailed security code.
     LONG_DESC
     def modify(username)
       user = Account.find_local(username)&.user
@@ -160,8 +165,16 @@ module Mastodon
       end
 
       if options[:role]
-        user.admin = options[:role] == 'admin'
-        user.moderator = options[:role] == 'moderator'
+        role = UserRole.find_by(name: options[:role])
+
+        if role.nil?
+          say('Cannot find user role with that name', :red)
+          exit(1)
+        end
+
+        user.role_id = role.id
+      elsif options[:remove_role]
+        user.role_id = nil
       end
 
       password = SecureRandom.hex if options[:reset_password]
@@ -171,7 +184,6 @@ module Mastodon
       user.disabled = true if options[:disable]
       user.approved = true if options[:approve]
       user.otp_required_for_login = false if options[:disable_2fa]
-      user.skip_sign_in_token = options[:skip_sign_in_token] unless options[:skip_sign_in_token].nil?
       user.confirm if options[:confirm]
 
       if user.save
@@ -181,28 +193,51 @@ module Mastodon
         user.errors.to_h.each do |key, error|
           say('Failure/Error: ', :red)
           say(key)
-          say('    ' + error, :red)
+          say("    #{error}", :red)
         end
 
         exit(1)
       end
     end
 
-    desc 'delete USERNAME', 'Delete a user'
+    option :email
+    option :dry_run, type: :boolean
+    desc 'delete [USERNAME]', 'Delete a user'
     long_desc <<-LONG_DESC
       Remove a user account with a given USERNAME.
-    LONG_DESC
-    def delete(username)
-      account = Account.find_local(username)
 
-      if account.nil?
-        say('No user with such username', :red)
+      With the --email option, the user is selected based on email
+      rather than username.
+    LONG_DESC
+    def delete(username = nil)
+      if username.present? && options[:email].present?
+        say('Use username or --email, not both', :red)
+        exit(1)
+      elsif username.blank? && options[:email].blank?
+        say('No username provided', :red)
         exit(1)
       end
 
-      say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
-      DeleteAccountService.new.call(account, reserve_email: false)
-      say('OK', :green)
+      dry_run = options[:dry_run] ? ' (DRY RUN)' : ''
+      account = nil
+
+      if username.present?
+        account = Account.find_local(username)
+        if account.nil?
+          say('No user with such username', :red)
+          exit(1)
+        end
+      else
+        account = Account.left_joins(:user).find_by(user: { email: options[:email] })
+        if account.nil?
+          say('No user with such email', :red)
+          exit(1)
+        end
+      end
+
+      say("Deleting user with #{account.statuses_count} statuses, this might take a while...#{dry_run}")
+      DeleteAccountService.new.call(account, reserve_email: false) unless options[:dry_run]
+      say("OK#{dry_run}", :green)
     end
 
     option :force, type: :boolean, aliases: [:f], description: 'Override public key check'
@@ -328,7 +363,7 @@ module Mastodon
 
       unless skip_domains.empty?
         say('The following domains were not available during the check:', :yellow)
-        skip_domains.each { |domain| say('    ' + domain) }
+        skip_domains.each { |domain| say("    #{domain}") }
       end
     end
 
@@ -529,7 +564,7 @@ module Mastodon
       old_key = account.private_key
       new_key = OpenSSL::PKey::RSA.new(2048)
       account.update(private_key: new_key.to_pem, public_key: new_key.public_key.to_pem)
-      ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, sign_with: old_key)
+      ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, { 'sign_with' => old_key })
     end
   end
 end
diff --git a/lib/mastodon/canonical_email_blocks_cli.rb b/lib/mastodon/canonical_email_blocks_cli.rb
index 64b72e603..ec228d466 100644
--- a/lib/mastodon/canonical_email_blocks_cli.rb
+++ b/lib/mastodon/canonical_email_blocks_cli.rb
@@ -18,17 +18,15 @@ module Mastodon
       When suspending a local user, a hash of a "canonical" version of their e-mail
       address is stored to prevent them from signing up again.
 
-      This command can be used to find whether a known email address is blocked,
-      and if so, which account it was attached to.
+      This command can be used to find whether a known email address is blocked.
     LONG_DESC
     def find(email)
-      accts = CanonicalEmailBlock.find_blocks(email).map(&:reference_account).map(&:acct).to_a
+      accts = CanonicalEmailBlock.matching_email(email)
+
       if accts.empty?
-        say("#{email} is not blocked", :yellow)
+        say("#{email} is not blocked", :green)
       else
-        accts.each do |acct|
-          say(acct, :white)
-        end
+        say("#{email} is blocked", :red)
       end
     end
 
@@ -40,24 +38,13 @@ module Mastodon
       This command allows removing a canonical email block.
     LONG_DESC
     def remove(email)
-      blocks = CanonicalEmailBlock.find_blocks(email)
+      blocks = CanonicalEmailBlock.matching_email(email)
+
       if blocks.empty?
-        say("#{email} is not blocked", :yellow)
+        say("#{email} is not blocked", :green)
       else
         blocks.destroy_all
-        say("Removed canonical email block for #{email}", :green)
-      end
-    end
-
-    private
-
-    def color(processed, failed)
-      if !processed.zero? && failed.zero?
-        :green
-      elsif failed.zero?
-        :yellow
-      else
-        :red
+        say("Unblocked #{email}", :green)
       end
     end
   end
diff --git a/lib/mastodon/cli_helper.rb b/lib/mastodon/cli_helper.rb
index aaee1fa91..a78a28e27 100644
--- a/lib/mastodon/cli_helper.rb
+++ b/lib/mastodon/cli_helper.rb
@@ -19,15 +19,18 @@ module Mastodon
       ProgressBar.create(total: total, format: '%c/%u |%b%i| %e')
     end
 
+    def reset_connection_pools!
+      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env].dup.tap { |config| config['pool'] = options[:concurrency] + 1 })
+      RedisConfiguration.establish_pool(options[:concurrency])
+    end
+
     def parallelize_with_progress(scope)
       if options[:concurrency] < 1
         say('Cannot run with this concurrency setting, must be at least 1', :red)
         exit(1)
       end
 
-      db_config = ActiveRecord::Base.configurations[Rails.env].dup
-      db_config['pool'] = options[:concurrency] + 1
-      ActiveRecord::Base.establish_connection(db_config)
+      reset_connection_pools!
 
       progress  = create_progress_bar(scope.count)
       pool      = Concurrent::FixedThreadPool.new(options[:concurrency])
@@ -52,6 +55,9 @@ module Mastodon
 
               result = ActiveRecord::Base.connection_pool.with_connection do
                 yield(item)
+              ensure
+                RedisConfiguration.pool.checkin if Thread.current[:redis]
+                Thread.current[:redis] = nil
               end
 
               aggregate.increment(result) if result.is_a?(Integer)
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
index a7c78c4a7..77364ffbb 100644
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@@ -97,7 +97,7 @@ module Mastodon
       failed          = Concurrent::AtomicFixnum.new(0)
       start_at        = Time.now.to_f
       seed            = start ? [start] : Instance.pluck(:domain)
-      blocked_domains = Regexp.new('\\.?' + DomainBlock.where(severity: 1).pluck(:domain).join('|') + '$')
+      blocked_domains = /\.?(#{DomainBlock.where(severity: 1).pluck(:domain).map { |domain| Regexp.escape(domain) }.join('|')})$/
       progress        = create_progress_bar
 
       pool = Concurrent::ThreadPoolExecutor.new(min_threads: 0, max_threads: options[:concurrency], idletime: 10, auto_terminate: true, max_queue: 0)
diff --git a/lib/mastodon/email_domain_blocks_cli.rb b/lib/mastodon/email_domain_blocks_cli.rb
index f79df302a..f39f47069 100644
--- a/lib/mastodon/email_domain_blocks_cli.rb
+++ b/lib/mastodon/email_domain_blocks_cli.rb
@@ -32,9 +32,9 @@ module Mastodon
       multiple domains to the command.
 
       When the --with-dns-records option is given, an attempt to resolve the
-      given domains' DNS records will be made and the results (A, AAAA and MX) will
-      also be blocked. This can be helpful if you are blocking an e-mail server that
-      has many different domains pointing to it as it allows you to essentially block
+      given domains' MX records will be made and the results will also be blocked.
+      This can be helpful if you are blocking an e-mail server that has many
+      different domains pointing to it as it allows you to essentially block
       it at the root.
     LONG_DESC
     def add(*domains)
@@ -53,26 +53,19 @@ module Mastodon
           next
         end
 
-        email_domain_block = EmailDomainBlock.new(domain: domain, with_dns_records: options[:with_dns_records] || false)
-        email_domain_block.save!
-        processed += 1
-
-        next unless email_domain_block.with_dns_records?
-
-        hostnames = []
-        ips       = []
-
-        Resolv::DNS.open do |dns|
-          dns.timeouts = 5
-          hostnames = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
-
-          ([email_domain_block.domain] + hostnames).uniq.each do |hostname|
-            ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
-            ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
+        other_domains = []
+        if options[:with_dns_records]
+          Resolv::DNS.open do |dns|
+            dns.timeouts = 5
+            other_domains = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a
           end
         end
 
-        (hostnames + ips).uniq.each do |hostname|
+        email_domain_block = EmailDomainBlock.new(domain: domain, other_domains: other_domains)
+        email_domain_block.save!
+        processed += 1
+
+        (email_domain_block.other_domains || []).uniq.each do |hostname|
           another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: email_domain_block)
 
           if EmailDomainBlock.where(domain: hostname).exists?
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb
index 5bee70ea5..a3e947909 100644
--- a/lib/mastodon/emoji_cli.rb
+++ b/lib/mastodon/emoji_cli.rb
@@ -41,7 +41,7 @@ module Mastodon
 
       Gem::Package::TarReader.new(Zlib::GzipReader.open(path)) do |tar|
         tar.each do |entry|
-          next unless entry.file? && entry.full_name.end_with?('.png')
+          next unless entry.file? && entry.full_name.end_with?('.png', '.gif')
 
           filename = File.basename(entry.full_name, '.*')
 
diff --git a/lib/mastodon/feeds_cli.rb b/lib/mastodon/feeds_cli.rb
index 578ea15c5..428d63a44 100644
--- a/lib/mastodon/feeds_cli.rb
+++ b/lib/mastodon/feeds_cli.rb
@@ -7,6 +7,7 @@ require_relative 'cli_helper'
 module Mastodon
   class FeedsCLI < Thor
     include CLIHelper
+    include Redisable
 
     def self.exit_on_failure?
       true
@@ -51,10 +52,10 @@ module Mastodon
 
     desc 'clear', 'Remove all home and list feeds from Redis'
     def clear
-      keys = Redis.current.keys('feed:*')
+      keys = redis.keys('feed:*')
 
-      Redis.current.pipelined do
-        keys.each { |key| Redis.current.del(key) }
+      redis.pipelined do
+        keys.each { |key| redis.del(key) }
       end
 
       say('OK', :green)
diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb
index 47e2d78bb..85937da81 100644
--- a/lib/mastodon/maintenance_cli.rb
+++ b/lib/mastodon/maintenance_cli.rb
@@ -13,8 +13,8 @@ module Mastodon
       true
     end
 
-    MIN_SUPPORTED_VERSION = 2019_10_01_213028
-    MAX_SUPPORTED_VERSION = 2021_05_26_193025
+    MIN_SUPPORTED_VERSION = 2019_10_01_213028 # rubocop:disable Style/NumericLiterals
+    MAX_SUPPORTED_VERSION = 2022_11_04_133904 # rubocop:disable Style/NumericLiterals
 
     # Stubs to enjoy ActiveRecord queries while not depending on a particular
     # version of the code/database
@@ -44,6 +44,8 @@ module Mastodon
     class WebauthnCredential < ApplicationRecord; end
     class FollowRecommendationSuppression < ApplicationRecord; end
     class CanonicalEmailBlock < ApplicationRecord; end
+    class Appeal < ApplicationRecord; end
+    class Webhook < ApplicationRecord; end
 
     class PreviewCard < ApplicationRecord
       self.inheritance_column = false
@@ -84,13 +86,15 @@ module Mastodon
 
         owned_classes = [
           Status, StatusPin, MediaAttachment, Poll, Report, Tombstone, Favourite,
-          Follow, FollowRequest, Block, Mute, AccountIdentityProof,
+          Follow, FollowRequest, Block, Mute,
           AccountModerationNote, AccountPin, AccountStat, ListAccount,
           PollVote, Mention
         ]
         owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
         owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
         owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
+        owned_classes << AccountIdentityProof if ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+        owned_classes << Appeal if ActiveRecord::Base.connection.table_exists?(:appeals)
 
         owned_classes.each do |klass|
           klass.where(account_id: other_account.id).find_each do |record|
@@ -120,6 +124,12 @@ module Mastodon
             record.update_attribute(:reference_account_id, id)
           end
         end
+
+        if ActiveRecord::Base.connection.table_exists?(:appeals)
+          Appeal.where(account_warning_id: other_account.id).find_each do |record|
+            record.update_attribute(:account_warning_id, id)
+          end
+        end
       end
     end
 
@@ -139,17 +149,22 @@ module Mastodon
       @prompt = TTY::Prompt.new
 
       if ActiveRecord::Migrator.current_version < MIN_SUPPORTED_VERSION
-        @prompt.warn 'Your version of the database schema is too old and is not supported by this script.'
-        @prompt.warn 'Please update to at least Mastodon 3.0.0 before running this script.'
+        @prompt.error 'Your version of the database schema is too old and is not supported by this script.'
+        @prompt.error 'Please update to at least Mastodon 3.0.0 before running this script.'
         exit(1)
       elsif ActiveRecord::Migrator.current_version > MAX_SUPPORTED_VERSION
         @prompt.warn 'Your version of the database schema is more recent than this script, this may cause unexpected errors.'
-        exit(1) unless @prompt.yes?('Continue anyway?')
+        exit(1) unless @prompt.yes?('Continue anyway? (Yes/No)')
+      end
+
+      if Sidekiq::ProcessSet.new.any?
+        @prompt.error 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.'
+        exit(1)
       end
 
       @prompt.warn 'This task will take a long time to run and is potentially destructive.'
       @prompt.warn 'Please make sure to stop Mastodon and have a backup.'
-      exit(1) unless @prompt.yes?('Continue?')
+      exit(1) unless @prompt.yes?('Continue? (Yes/No)')
 
       deduplicate_users!
       deduplicate_account_domain_blocks!
@@ -168,6 +183,7 @@ module Mastodon
       deduplicate_accounts!
       deduplicate_tags!
       deduplicate_webauthn_credentials!
+      deduplicate_webhooks!
 
       Scenic.database.refresh_materialized_view('instances', concurrently: true, cascade: false) if ActiveRecord::Migrator.current_version >= 2020_12_06_004238
       Rails.cache.clear
@@ -193,7 +209,7 @@ module Mastodon
       end
 
       @prompt.say 'Restoring index_accounts_on_username_and_domain_lower…'
-      if ActiveRecord::Migrator.current_version < 20200620164023
+      if ActiveRecord::Migrator.current_version < 20200620164023 # rubocop:disable Style/NumericLiterals
         ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
       else
         ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
@@ -236,12 +252,14 @@ module Mastodon
         end
       end
 
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
-        @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+      if ActiveRecord::Migrator.current_version < 20220118183010 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+          users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+          @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
 
-        users.each do |user|
-          user.update!(remember_token: nil)
+          users.each do |user|
+            user.update!(remember_token: nil)
+          end
         end
       end
 
@@ -257,8 +275,13 @@ module Mastodon
       @prompt.say 'Restoring users indexes…'
       ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
       ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if ActiveRecord::Migrator.current_version < 20220118183010
+
+      if ActiveRecord::Migrator.current_version < 20220310060641 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_account_domain_blocks!
@@ -274,6 +297,8 @@ module Mastodon
     end
 
     def deduplicate_account_identity_proofs!
+      return unless ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+
       remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
 
       @prompt.say 'Removing duplicate account identity proofs…'
@@ -315,7 +340,11 @@ module Mastodon
       end
 
       @prompt.say 'Restoring conversations indexes…'
-      ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+      if ActiveRecord::Migrator.current_version < 20220307083603 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_custom_emojis!
@@ -428,7 +457,11 @@ module Mastodon
       end
 
       @prompt.say 'Restoring media_attachments indexes…'
-      ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+      if ActiveRecord::Migrator.current_version < 20220310060626 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_preview_cards!
@@ -457,11 +490,16 @@ module Mastodon
       end
 
       @prompt.say 'Restoring statuses indexes…'
-      ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+      if ActiveRecord::Migrator.current_version < 20220310060706 # rubocop:disable Style/NumericLiterals
+        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+      else
+        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+      end
     end
 
     def deduplicate_tags!
       remove_index_if_exists!(:tags, 'index_tags_on_name_lower')
+      remove_index_if_exists!(:tags, 'index_tags_on_name_lower_btree')
 
       @prompt.say 'Deduplicating tags…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
@@ -474,11 +512,10 @@ module Mastodon
       end
 
       @prompt.say 'Restoring tags indexes…'
-      ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
-
-      if ActiveRecord::Base.connection.indexes(:tags).any? { |i| i.name == 'index_tags_on_name_lower_btree' }
-        @prompt.say 'Reindexing textual indexes on tags…'
-        ActiveRecord::Base.connection.execute('REINDEX INDEX index_tags_on_name_lower_btree;')
+      if ActiveRecord::Migrator.current_version < 20210421121431
+        ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+      else
+        ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
       end
     end
 
@@ -496,11 +533,25 @@ module Mastodon
       ActiveRecord::Base.connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
     end
 
+    def deduplicate_webhooks!
+      return unless ActiveRecord::Base.connection.table_exists?(:webhooks)
+
+      remove_index_if_exists!(:webhooks, 'index_webhooks_on_url')
+
+      @prompt.say 'Deduplicating webhooks…'
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
+        Webhooks.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      end
+
+      @prompt.say 'Restoring webhooks indexes…'
+      ActiveRecord::Base.connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
+    end
+
     def deduplicate_local_accounts!(accounts)
       accounts = accounts.sort_by(&:id).reverse
 
       @prompt.warn "Multiple local accounts were found for username '#{accounts.first.username}'."
-      @prompt.warn 'All those accounts are distinct accounts but only the most recently-created one is fully-functionnal.'
+      @prompt.warn 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.'
 
       accounts.each_with_index do |account, idx|
         @prompt.say '%2d. %s: created at: %s; updated at: %s; last logged in at: %s; statuses: %5d; last status at: %s' % [idx, account.username, account.created_at, account.updated_at, account.user&.last_sign_in_at&.to_s || 'N/A', account.account_stat&.statuses_count || 0, account.account_stat&.last_status_at || 'N/A']
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 36ca71844..24cc98964 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -14,35 +14,78 @@ module Mastodon
     end
 
     option :days, type: :numeric, default: 7, aliases: [:d]
+    option :prune_profiles, type: :boolean, default: false
+    option :remove_headers, type: :boolean, default: false
+    option :include_follows, type: :boolean, default: false
     option :concurrency, type: :numeric, default: 5, aliases: [:c]
-    option :verbose, type: :boolean, default: false, aliases: [:v]
     option :dry_run, type: :boolean, default: false
-    desc 'remove', 'Remove remote media files'
+    desc 'remove', 'Remove remote media files, headers or avatars'
     long_desc <<-DESC
-      Removes locally cached copies of media attachments from other servers.
-
+      Removes locally cached copies of media attachments (and optionally profile
+      headers and avatars) from other servers. By default, only media attachements
+      are removed.
       The --days option specifies how old media attachments have to be before
-      they are removed. It defaults to 7 days.
+      they are removed. In case of avatars and headers, it specifies how old
+      the last webfinger request and update to the user has to be before they
+      are pruned. It defaults to 7 days.
+      If --prune-profiles is specified, only avatars and headers are removed.
+      If --remove-headers is specified, only headers are removed.
+      If --include-follows is specified along with --prune-profiles or
+      --remove-headers, all non-local profiles will be pruned irrespective of
+      follow status. By default, only accounts that are not followed by or
+      following anyone locally are pruned.
     DESC
+    # rubocop:disable Metrics/PerceivedComplexity
     def remove
-      time_ago = options[:days].days.ago
-      dry_run  = options[:dry_run] ? '(DRY RUN)' : ''
+      if options[:prune_profiles] && options[:remove_headers]
+        say('--prune-profiles and --remove-headers should not be specified simultaneously', :red, true)
+        exit(1)
+      end
+      if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
+        say('--include-follows can only be used with --prune-profiles or --remove-headers', :red, true)
+        exit(1)
+      end
+      time_ago        = options[:days].days.ago
+      dry_run         = options[:dry_run] ? ' (DRY RUN)' : ''
 
-      processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where('created_at < ?', time_ago)) do |media_attachment|
-        next if media_attachment.file.blank?
+      if options[:prune_profiles] || options[:remove_headers]
+        processed, aggregate = parallelize_with_progress(Account.remote.where({ last_webfingered_at: ..time_ago, updated_at: ..time_ago })) do |account|
+          next if !options[:include_follows] && Follow.where(account: account).or(Follow.where(target_account: account)).exists?
+          next if account.avatar.blank? && account.header.blank?
+          next if options[:remove_headers] && account.header.blank?
 
-        size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
+          size = (account.header_file_size || 0)
+          size += (account.avatar_file_size || 0) if options[:prune_profiles]
 
-        unless options[:dry_run]
-          media_attachment.file.destroy
-          media_attachment.thumbnail.destroy
-          media_attachment.save
+          unless options[:dry_run]
+            account.header.destroy
+            account.avatar.destroy if options[:prune_profiles]
+            account.save!
+          end
+
+          size
         end
 
-        size
+        say("Visited #{processed} accounts and removed profile media totaling #{number_to_human_size(aggregate)}#{dry_run}", :green, true)
       end
 
-      say("Removed #{processed} media attachments (approx. #{number_to_human_size(aggregate)}) #{dry_run}", :green, true)
+      unless options[:prune_profiles] || options[:remove_headers]
+        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where(created_at: ..time_ago)) do |media_attachment|
+          next if media_attachment.file.blank?
+
+          size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
+
+          unless options[:dry_run]
+            media_attachment.file.destroy
+            media_attachment.thumbnail.destroy
+            media_attachment.save
+          end
+
+          size
+        end
+
+        say("Removed #{processed} media attachments (approx. #{number_to_human_size(aggregate)})#{dry_run}", :green, true)
+      end
     end
 
     option :start_after
@@ -183,10 +226,12 @@ module Mastodon
 
       say("Removed #{removed} orphans (approx. #{number_to_human_size(reclaimed_bytes)})#{dry_run}", :green, true)
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     option :account, type: :string
     option :domain, type: :string
     option :status, type: :numeric
+    option :days, type: :numeric
     option :concurrency, type: :numeric, default: 5, aliases: [:c]
     option :verbose, type: :boolean, default: false, aliases: [:v]
     option :dry_run, type: :boolean, default: false
@@ -204,6 +249,8 @@ module Mastodon
 
       Use the --domain option to download attachments from a specific domain.
 
+      Use the --days option to limit attachments created within days.
+
       By default, attachments that are believed to be already downloaded will
       not be re-downloaded. To force re-download of every URL, use --force.
     DESC
@@ -224,10 +271,16 @@ module Mastodon
         scope = MediaAttachment.where(account_id: account.id)
       elsif options[:domain]
         scope = MediaAttachment.joins(:account).merge(Account.by_domain_and_subdomains(options[:domain]))
+      elsif options[:days].present?
+        scope = MediaAttachment.remote
       else
         exit(1)
       end
 
+      if options[:days].present?
+        scope = scope.where('media_attachments.id > ?', Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false))
+      end
+
       processed, aggregate = parallelize_with_progress(scope) do |media_attachment|
         next if media_attachment.remote_url.blank? || (!options[:force] && media_attachment.file_file_name.present?)
         next if DomainBlock.reject_media?(media_attachment.account.domain)
@@ -260,7 +313,7 @@ module Mastodon
     def lookup(url)
       path = Addressable::URI.parse(url).path
 
-      path_segments = path.split('/')[2..-1]
+      path_segments = path.split('/')[2..]
       path_segments.delete('cache')
 
       unless [7, 10].include?(path_segments.size)
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 39a6e0680..2ab8150ec 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -42,8 +42,14 @@
 module Mastodon
   module MigrationHelpers
     class CorruptionError < StandardError
-      def initialize(message = nil)
-        super(message.presence || 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing')
+      attr_reader :index_name
+
+      def initialize(index_name)
+        @index_name = index_name
+
+        super "The index `#{index_name}` seems to be corrupted, it contains duplicate rows. " \
+          'For information on how to fix this, see our documentation: ' \
+          'https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/'
       end
 
       def cause
@@ -295,7 +301,7 @@ module Mastodon
       table = Arel::Table.new(table_name)
 
       total = estimate_rows_in_table(table_name).to_i
-      if total == 0
+      if total < 1
         count_arel = table.project(Arel.star.count.as('count'))
         count_arel = yield table, count_arel if block_given?
 
@@ -802,6 +808,27 @@ module Mastodon
       columns(table).find { |column| column.name == name }
     end
 
+    # Update the configuration of an index by creating a new one and then
+    # removing the old one
+    def update_index(table_name, index_name, columns, **index_options)
+      if index_name_exists?(table_name, "#{index_name}_new") && index_name_exists?(table_name, index_name)
+        remove_index table_name, name: "#{index_name}_new"
+      elsif index_name_exists?(table_name, "#{index_name}_new")
+        # Very unlikely case where the script has been interrupted during/after removal but before renaming
+        rename_index table_name, "#{index_name}_new", index_name
+      end
+
+      begin
+        add_index table_name, columns, **index_options.merge(name: "#{index_name}_new", algorithm: :concurrently)
+      rescue ActiveRecord::RecordNotUnique
+        remove_index table_name, name: "#{index_name}_new"
+        raise CorruptionError.new(index_name)
+      end
+
+      remove_index table_name, name: index_name if index_name_exists?(table_name, index_name)
+      rename_index table_name, "#{index_name}_new", index_name
+    end
+
     # This will replace the first occurrence of a string in a column with
     # the replacement
     # On postgresql we can use `regexp_replace` for that.
diff --git a/lib/mastodon/rack_middleware.rb b/lib/mastodon/rack_middleware.rb
new file mode 100644
index 000000000..8aa7911fe
--- /dev/null
+++ b/lib/mastodon/rack_middleware.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Mastodon::RackMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    @app.call(env)
+  ensure
+    clean_up_sockets!
+  end
+
+  private
+
+  def clean_up_sockets!
+    clean_up_redis_socket!
+    clean_up_statsd_socket!
+  end
+
+  def clean_up_redis_socket!
+    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    Thread.current[:redis] = nil
+  end
+
+  def clean_up_statsd_socket!
+    Thread.current[:statsd_socket]&.close
+    Thread.current[:statsd_socket] = nil
+  end
+end
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index 5bfd26e34..3522fa11e 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -11,13 +11,15 @@ def setup_redis_env_url(prefix = nil, defaults = true)
   port     = ENV.fetch(prefix + 'REDIS_PORT') { 6379 if defaults }
   db       = ENV.fetch(prefix + 'REDIS_DB') { 0 if defaults }
 
-  ENV[prefix + 'REDIS_URL'] = if [password, host, port, db].all?(&:nil?)
-                                ENV['REDIS_URL']
-                              else
-                                Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
-                                  uri.password = password if password.present?
-                                end.normalize.to_str
-                              end
+  ENV[prefix + 'REDIS_URL'] = begin
+    if [password, host, port, db].all?(&:nil?)
+      ENV['REDIS_URL']
+    else
+      Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+        uri.password = password if password.present?
+      end.normalize.to_str
+    end
+  end
 end
 
 setup_redis_env_url
@@ -33,6 +35,9 @@ REDIS_CACHE_PARAMS = {
   url: ENV['CACHE_REDIS_URL'],
   expires_in: 10.minutes,
   namespace: cache_namespace,
+  pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+  pool_timeout: 5,
+  connect_timeout: 5,
 }.freeze
 
 REDIS_SIDEKIQ_PARAMS = {
@@ -40,3 +45,7 @@ REDIS_SIDEKIQ_PARAMS = {
   url: ENV['SIDEKIQ_REDIS_URL'],
   namespace: sidekiq_namespace,
 }.freeze
+
+if Rails.env.test?
+  ENV['REDIS_NAMESPACE'] = "mastodon_test#{ENV['TEST_ENV_NUMBER']}"
+end
diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb
index 6ad9d7b6a..b206854ab 100644
--- a/lib/mastodon/search_cli.rb
+++ b/lib/mastodon/search_cli.rb
@@ -16,19 +16,21 @@ module Mastodon
       StatusesIndex,
     ].freeze
 
-    option :concurrency, type: :numeric, default: 2, aliases: [:c], desc: 'Workload will be split between this number of threads'
-    option :batch_size, type: :numeric, default: 1_000, aliases: [:b], desc: 'Number of records in each batch'
+    option :concurrency, type: :numeric, default: 5, aliases: [:c], desc: 'Workload will be split between this number of threads'
+    option :batch_size, type: :numeric, default: 100, aliases: [:b], desc: 'Number of records in each batch'
     option :only, type: :array, enum: %w(accounts tags statuses), desc: 'Only process these indices'
+    option :import, type: :boolean, default: true, desc: 'Import data from the database to the index'
+    option :clean, type: :boolean, default: true, desc: 'Remove outdated documents from the index'
     desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them'
     long_desc <<~LONG_DESC
       If Elasticsearch is empty, this command will create the necessary indices
       and then import data from the database into those indices.
 
       This command will also upgrade indices if the underlying schema has been
-      changed since the last run.
+      changed since the last run. Index upgrades erase index data.
 
       Even if creating or upgrading indices is not necessary, data from the
-      database will be imported into the indices.
+      database will be imported into the indices, unless overridden with --no-import.
     LONG_DESC
     def deploy
       if options[:concurrency] < 1
@@ -49,7 +51,9 @@ module Mastodon
         end
       end
 
-      progress = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false)
+      pool      = Concurrent::FixedThreadPool.new(options[:concurrency], max_queue: options[:concurrency] * 10)
+      importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) }
+      progress  = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false)
 
       # First, ensure all indices are created and have the correct
       # structure, so that live data can already be written
@@ -59,98 +63,46 @@ module Mastodon
         index.specification.lock!
       end
 
-      db_config = ActiveRecord::Base.configurations[Rails.env].dup
-      db_config['pool'] = options[:concurrency] + 1
-      ActiveRecord::Base.establish_connection(db_config)
-
-      pool    = Concurrent::FixedThreadPool.new(options[:concurrency])
-      added   = Concurrent::AtomicFixnum.new(0)
-      removed = Concurrent::AtomicFixnum.new(0)
-
       progress.title = 'Estimating workload '
+      progress.total = indices.sum { |index| importers[index].estimate! }
 
-      # Estimate the amount of data that has to be imported first
-      progress.total = indices.sum { |index| index.adapter.default_scope.count }
+      reset_connection_pools!
+
+      added   = 0
+      removed = 0
 
-      # Now import all the actual data. Mind that unlike chewy:sync, we don't
-      # fetch and compare all record IDs from the database and the index to
-      # find out which to add and which to remove from the index. Because with
-      # potentially millions of rows, the memory footprint of such a calculation
-      # is uneconomical. So we only ever add.
       indices.each do |index|
-        progress.title = "Importing #{index} "
-        batch_size     = options[:batch_size]
-        slice_size     = (batch_size / options[:concurrency]).ceil
+        importer = importers[index]
+        importer.optimize_for_import!
 
-        index.adapter.default_scope.reorder(nil).find_in_batches(batch_size: batch_size) do |batch|
-          futures = []
-
-          batch.each_slice(slice_size) do |records|
-            futures << Concurrent::Future.execute(executor: pool) do
-              begin
-                if !progress.total.nil? && progress.progress + records.size > progress.total
-                  # The number of items has changed between start and now,
-                  # since there is no good way to predict the final count from
-                  # here, just change the progress bar to an indeterminate one
-
-                  progress.total = nil
-                end
-
-                grouped_records = nil
-                bulk_body       = nil
-                index_count     = 0
-                delete_count    = 0
-
-                ActiveRecord::Base.connection_pool.with_connection do
-                  grouped_records = records.to_a.group_by do |record|
-                    index.adapter.send(:delete_from_index?, record) ? :delete : :to_index
-                  end
-
-                  bulk_body = Chewy::Index::Import::BulkBuilder.new(index, **grouped_records).bulk_body
-                end
-
-                index_count  = grouped_records[:to_index].size  if grouped_records.key?(:to_index)
-                delete_count = grouped_records[:delete].size    if grouped_records.key?(:delete)
-
-                # The following is an optimization for statuses specifically, since
-                # we want to de-index statuses that cannot be searched by anybody,
-                # but can't use Chewy's delete_if logic because it doesn't use
-                # crutches and our searchable_by logic depends on them
-                if index == StatusesIndex
-                  bulk_body.map! do |entry|
-                    if entry[:to_index] && entry.dig(:to_index, :data, 'searchable_by').blank?
-                      index_count  -= 1
-                      delete_count += 1
-
-                      { delete: entry[:to_index].except(:data) }
-                    else
-                      entry
-                    end
-                  end
-                end
-
-                Chewy::Index::Import::BulkRequest.new(index).perform(bulk_body)
-
-                progress.progress += records.size
-
-                added.increment(index_count)
-                removed.increment(delete_count)
-
-                sleep 1
-              rescue => e
-                progress.log pastel.red("Error importing #{index}: #{e}")
-              end
-            end
-          end
-
-          futures.map(&:value)
+        importer.on_progress do |(indexed, deleted)|
+          progress.total = nil if progress.progress + indexed + deleted > progress.total
+          progress.progress += indexed + deleted
+          added   += indexed
+          removed += deleted
         end
+
+        importer.on_failure do |reason|
+          progress.log(pastel.red("Error while importing #{index}: #{reason}"))
+        end
+
+        if options[:import]
+          progress.title = "Importing #{index} "
+          importer.import!
+        end
+
+        if options[:clean]
+          progress.title = "Cleaning #{index} "
+          importer.clean_up!
+        end
+      ensure
+        importer.optimize_for_search!
       end
 
-      progress.title = ''
-      progress.stop
+      progress.title = 'Done! '
+      progress.finish
 
-      say("Indexed #{added.value} records, de-indexed #{removed.value}", :green, true)
+      say("Indexed #{added} records, de-indexed #{removed}", :green, true)
     end
   end
 end
diff --git a/lib/mastodon/settings_cli.rb b/lib/mastodon/settings_cli.rb
index 061650a80..488c655de 100644
--- a/lib/mastodon/settings_cli.rb
+++ b/lib/mastodon/settings_cli.rb
@@ -16,6 +16,20 @@ module Mastodon
       say('OK', :green)
     end
 
+    desc 'approved', 'Open approval-based registrations'
+    option :require_reason, type: :boolean, aliases: [:require_invite_text]
+    long_desc <<~LONG_DESC
+      Set registrations to require review from staff.
+
+      With --require-reason, require users to enter a reason when registering,
+      otherwise this field is optional.
+    LONG_DESC
+    def approved
+      Setting.registrations_mode = 'approved'
+      Setting.require_invite_text = options[:require_reason] unless options[:require_reason].nil?
+      say('OK', :green)
+    end
+
     desc 'close', 'Close registrations'
     def close
       Setting.registrations_mode = 'none'
diff --git a/lib/mastodon/sidekiq_middleware.rb b/lib/mastodon/sidekiq_middleware.rb
new file mode 100644
index 000000000..c75e8401f
--- /dev/null
+++ b/lib/mastodon/sidekiq_middleware.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Mastodon::SidekiqMiddleware
+  BACKTRACE_LIMIT = 3
+
+  def call(*)
+    yield
+  rescue Mastodon::HostValidationError
+    # Do not retry
+  rescue => e
+    limit_backtrace_and_raise(e)
+  ensure
+    clean_up_sockets!
+  end
+
+  private
+
+  def limit_backtrace_and_raise(exception)
+    exception.set_backtrace(exception.backtrace.first(BACKTRACE_LIMIT))
+    raise exception
+  end
+
+  def clean_up_sockets!
+    clean_up_redis_socket!
+    clean_up_statsd_socket!
+  end
+
+  def clean_up_redis_socket!
+    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    Thread.current[:redis] = nil
+  end
+
+  def clean_up_statsd_socket!
+    Thread.current[:statsd_socket]&.close
+    Thread.current[:statsd_socket] = nil
+  end
+end
diff --git a/lib/mastodon/statuses_cli.rb b/lib/mastodon/statuses_cli.rb
index e273e2614..d4c2e6cf2 100644
--- a/lib/mastodon/statuses_cli.rb
+++ b/lib/mastodon/statuses_cli.rb
@@ -54,7 +54,7 @@ module Mastodon
 
       ActiveRecord::Base.connection.add_index(:media_attachments, :remote_url, name: :index_media_attachments_remote_url, where: 'remote_url is not null', algorithm: :concurrently, if_not_exists: true)
 
-      max_id   = Mastodon::Snowflake.id_at(options[:days].days.ago)
+      max_id   = Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false)
       start_at = Time.now.to_f
 
       unless options[:continue] && ActiveRecord::Base.connection.table_exists?('statuses_to_be_deleted')
@@ -156,7 +156,7 @@ module Mastodon
 
         ActiveRecord::Base.connection.add_index(:statuses, :conversation_id, name: :index_statuses_conversation_id, algorithm: :concurrently, if_not_exists: true)
 
-        say('Extract the deletion target from coversations... This might take a while...')
+        say('Extract the deletion target from conversations... This might take a while...')
 
         ActiveRecord::Base.connection.create_table('conversations_to_be_deleted', force: true)
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 37f08ad93..dc3cbab66 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -5,15 +5,15 @@ module Mastodon
     module_function
 
     def major
-      3
-    end
-
-    def minor
       4
     end
 
+    def minor
+      0
+    end
+
     def patch
-      3
+      2
     end
 
     def flags
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 786f558e9..d66a17623 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -81,6 +81,9 @@ module Paperclip
     # to respond or don't respond at all and as such minimize the
     # impact of object storage outages on application throughput
     def save
+      # Don't go through Stoplight if we don't have anything object-storage-oriented to do
+      return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty?
+
       Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle|
         if error.is_a?(Seahorse::Client::NetworkingError)
           handle.call(error)
diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb
index 1c3a6df02..c22c20c57 100644
--- a/lib/paperclip/blurhash_transcoder.rb
+++ b/lib/paperclip/blurhash_transcoder.rb
@@ -5,7 +5,7 @@ module Paperclip
     def make
       return @file unless options[:style] == :small || options[:blurhash]
 
-      pixels   = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*')
+      pixels   = convert(':source -depth 8 RGB:-', source: File.expand_path(@file.path)).unpack('C*')
       geometry = options.fetch(:file_geometry_parser).from_file(@file)
 
       attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, **(options[:blurhash] || {}))
diff --git a/lib/paperclip/storage_extensions.rb b/lib/paperclip/storage_extensions.rb
deleted file mode 100644
index 95c35641e..000000000
--- a/lib/paperclip/storage_extensions.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# Some S3-compatible providers might not actually be compatible with some APIs
-# used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822
-if ENV['S3_ENABLED'] == 'true' && ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
-  module Paperclip
-    module Storage
-      module S3Extensions
-        def copy_to_local_file(style, local_dest_path)
-          log("copying #{path(style)} to local file #{local_dest_path}")
-          s3_object(style).download_file(local_dest_path, { mode: 'single_request' })
-        rescue Aws::Errors::ServiceError => e
-          warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
-          false
-        end
-      end
-    end
-  end
-
-  Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions)
-end
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index ec1305038..afd9f58ff 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -13,6 +13,7 @@ module Paperclip
       @time                = options[:time] || 3
       @passthrough_options = options[:passthrough_options]
       @convert_options     = options[:convert_options].dup
+      @vfr_threshold       = options[:vfr_frame_rate_threshold]
     end
 
     def make
@@ -41,6 +42,11 @@ module Paperclip
       when 'mp4'
         @output_options['acodec'] = 'aac'
         @output_options['strict'] = 'experimental'
+
+        if high_vfr?(metadata) && !eligible_to_passthrough?(metadata)
+          @output_options['vsync'] = 'vfr'
+          @output_options['r'] = @vfr_threshold
+        end
       end
 
       command_arguments, interpolations = prepare_command(destination)
@@ -88,13 +94,21 @@ module Paperclip
     end
 
     def update_options_from_metadata(metadata)
-      return unless @passthrough_options && @passthrough_options[:video_codecs].include?(metadata.video_codec) && @passthrough_options[:audio_codecs].include?(metadata.audio_codec) && @passthrough_options[:colorspaces].include?(metadata.colorspace)
+      return unless eligible_to_passthrough?(metadata)
 
       @format          = @passthrough_options[:options][:format] || @format
       @time            = @passthrough_options[:options][:time]   || @time
       @convert_options = @passthrough_options[:options][:convert_options].dup
     end
 
+    def high_vfr?(metadata)
+      @vfr_threshold && metadata.r_frame_rate && metadata.r_frame_rate > @vfr_threshold
+    end
+
+    def eligible_to_passthrough?(metadata)
+      @passthrough_options && @passthrough_options[:video_codecs].include?(metadata.video_codec) && @passthrough_options[:audio_codecs].include?(metadata.audio_codec) && @passthrough_options[:colorspaces].include?(metadata.colorspace)
+    end
+
     def update_attachment_type(metadata)
       @attachment.instance.type = MediaAttachment.types[:gifv] unless metadata.audio_codec
     end
diff --git a/lib/simple_navigation/item_extensions.rb b/lib/simple_navigation/item_extensions.rb
new file mode 100644
index 000000000..28af37a18
--- /dev/null
+++ b/lib/simple_navigation/item_extensions.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SimpleNavigation
+  module ItemExtensions
+    def url
+      if @url.nil? && @sub_navigation
+        @sub_navigation.items.first.url
+      else
+        @url
+      end
+    end
+  end
+end
+
+SimpleNavigation::Item.prepend(SimpleNavigation::ItemExtensions)
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
new file mode 100644
index 000000000..2eec7c9e1
--- /dev/null
+++ b/lib/tasks/branding.rake
@@ -0,0 +1,77 @@
+namespace :branding do
+  desc 'Generate necessary graphic assets for branding from source SVG files'
+  task generate: :environment do
+    Rake::Task['branding:generate_app_icons'].invoke
+    Rake::Task['branding:generate_app_badge'].invoke
+    Rake::Task['branding:generate_github_assets'].invoke
+    Rake::Task['branding:generate_mailer_assets'].invoke
+  end
+
+  desc 'Generate PNG icons and logos for e-mail templates'
+  task generate_mailer_assets: :environment do
+    rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-h :size --keep-aspect-ratio :input -o :output')
+    output_dest  = Rails.root.join('app', 'javascript', 'images', 'mailer')
+
+    # Displayed size is 64px, at 3x it's 192px
+    Dir[Rails.root.join('app', 'javascript', 'images', 'icons', '*.svg')].each do |path|
+      rsvg_convert.run(input: path, size: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png"))
+    end
+
+    # Displayed size is 34px, at 3x it's 102px
+    rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.png'))
+
+    # Displayed size is 24px, at 3x it's 72px
+    rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg'), size: 72, output: output_dest.join('logo.png'))
+  end
+
+  desc 'Generate light/dark logotypes for GitHub'
+  task generate_github_assets: :environment do
+    rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -h :size --keep-aspect-ratio :input -o :output')
+    output_dest  = Rails.root.join('lib', 'assets')
+
+    rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.dark.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.dark.png'))
+    rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.light.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.light.png'))
+  end
+
+  desc 'Generate favicons and app icons from SVG source files'
+  task generate_app_icons: :environment do
+    favicon_source  = Rails.root.join('app', 'javascript', 'images', 'logo.svg')
+    app_icon_source = Rails.root.join('app', 'javascript', 'images', 'app-icon.svg')
+    output_dest     = Rails.root.join('app', 'javascript', 'icons')
+
+    rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output')
+    convert = Terrapin::CommandLine.new('convert', ':input :output')
+
+    favicon_sizes      = [16, 32, 48]
+    apple_icon_sizes   = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024]
+    android_icon_sizes = [36, 48, 72, 96, 144, 192, 256, 384, 512]
+
+    favicons = []
+
+    favicon_sizes.each do |size|
+      output_path = output_dest.join("favicon-#{size}x#{size}.png")
+      favicons << output_path
+      rsvg_convert.run(size: size, input: favicon_source, output: output_path)
+    end
+
+    convert.run(input: favicons, output: Rails.root.join('public', 'favicon.ico'))
+
+    apple_icon_sizes.each do |size|
+      rsvg_convert.run(size: size, input: app_icon_source, output: output_dest.join("apple-touch-icon-#{size}x#{size}.png"))
+    end
+
+    android_icon_sizes.each do |size|
+      rsvg_convert.run(size: size, input: app_icon_source, output: output_dest.join("android-chrome-#{size}x#{size}.png"))
+    end
+  end
+
+  desc 'Generate badge icon from SVG source files'
+  task generate_app_badge: :environment do
+    rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :size -h :size --keep-aspect-ratio :input -o :output')
+    badge_source = Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg')
+    output_dest  = Rails.root.join('public')
+    stylesheet   = Rails.root.join('lib', 'assets', 'wordmark.light.css')
+
+    rsvg_convert.run(stylesheet: stylesheet, input: badge_source, size: 192, output: output_dest.join('badge.png'))
+  end
+end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index b2a0d61de..ca939fd1f 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -17,23 +17,10 @@ namespace :db do
     end
   end
 
-  task :post_migration_hook do
-    at_exit do
-      unless %w(C POSIX).include?(ActiveRecord::Base.connection.select_one('SELECT datcollate FROM pg_database WHERE datname = current_database();')['datcollate'])
-        warn <<~WARNING
-          Your database collation is susceptible to index corruption.
-            (This warning does not indicate that index corruption has occurred and can be ignored)
-            (To learn more, visit: https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/)
-        WARNING
-      end
-    end
-  end
-
   task :pre_migration_check do
     version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    abort 'ERROR: This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon.' if version < 90_500
+    abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
   end
 
   Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])
-  Rake::Task['db:migrate'].enhance(['db:post_migration_hook'])
 end
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 8faa48a95..473aee9cc 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-def gen_border(codepoint)
+def gen_border(codepoint, color)
   input = Rails.root.join('public', 'emoji', "#{codepoint}.svg")
   dest = Rails.root.join('public', 'emoji', "#{codepoint}_border.svg")
   doc = File.open(input) { |f| Nokogiri::XML(f) }
@@ -19,7 +19,7 @@ def gen_border(codepoint)
 
     border_elem.delete('fill')
 
-    border_elem['stroke'] = 'white'
+    border_elem['stroke'] = color
     border_elem['stroke-linejoin'] = 'round'
     border_elem['stroke-width'] = '4px'
 
@@ -45,7 +45,7 @@ end
 namespace :emojis do
   desc 'Generate a unicode to filename mapping'
   task :generate do
-    source = 'http://www.unicode.org/Public/emoji/13.1/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/14.0/emoji-test.txt'
     codes  = []
     dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
 
@@ -69,7 +69,7 @@ namespace :emojis do
       end
     end
 
-    existence_maps = grouped_codes.map { |c| c.index_with { |cc| File.exist?(Rails.root.join('public', 'emoji', codepoints_to_filename(cc) + '.svg')) } }
+    existence_maps = grouped_codes.map { |c| c.index_with { |cc| File.exist?(Rails.root.join('public', 'emoji', "#{codepoints_to_filename(cc)}.svg")) } }
     map = {}
 
     existence_maps.each do |group|
@@ -91,12 +91,16 @@ namespace :emojis do
   desc 'Generate emoji variants with white borders'
   task :generate_borders do
     src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
-    emojis = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂‍♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂‍♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️'
+    emojis_light = '👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️'
+    emojis_dark = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂‍♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂‍♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲'
 
     map = Oj.load(File.read(src))
 
-    emojis.each_grapheme_cluster do |emoji|
-      gen_border map[emoji]
+    emojis_light.each_grapheme_cluster do |emoji|
+      gen_border map[emoji], 'black'
+    end
+    emojis_dark.each_grapheme_cluster do |emoji|
+      gen_border map[emoji], 'white'
     end
   end
 end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index d905a07da..3c891a07f 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -8,6 +8,14 @@ namespace :mastodon do
     prompt = TTY::Prompt.new
     env    = {}
 
+    # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
+    # This happens before application environment configuration and sets REDIS_URL etc.
+    # These variables are then used even when REDIS_HOST etc. are changed, so clear them
+    # out so they don't interfere with our new configuration.
+    ENV.delete('REDIS_URL')
+    ENV.delete('CACHE_REDIS_URL')
+    ENV.delete('SIDEKIQ_REDIS_URL')
+
     begin
       prompt.say('Your instance is identified by its domain name. Changing it afterward will break things.')
       env['LOCAL_DOMAIN'] = prompt.ask('Domain name:') do |q|
@@ -134,7 +142,40 @@ namespace :mastodon do
       prompt.say "\n"
 
       if prompt.yes?('Do you want to store uploaded files on the cloud?', default: false)
-        case prompt.select('Provider', ['Amazon S3', 'Wasabi', 'Minio', 'Google Cloud Storage'])
+        case prompt.select('Provider', ['DigitalOcean Spaces', 'Amazon S3', 'Wasabi', 'Minio', 'Google Cloud Storage'])
+        when 'DigitalOcean Spaces'
+          env['S3_ENABLED'] = 'true'
+          env['S3_PROTOCOL'] = 'https'
+
+          env['S3_BUCKET'] = prompt.ask('Space name:') do |q|
+            q.required true
+            q.default "files.#{env['LOCAL_DOMAIN']}"
+            q.modify :strip
+          end
+
+          env['S3_REGION'] = prompt.ask('Space region:') do |q|
+            q.required true
+            q.default 'nyc3'
+            q.modify :strip
+          end
+
+          env['S3_HOSTNAME'] = prompt.ask('Space endpoint:') do |q|
+            q.required true
+            q.default 'nyc3.digitaloceanspaces.com'
+            q.modify :strip
+          end
+
+          env['S3_ENDPOINT'] = "https://#{env['S3_HOSTNAME']}"
+
+          env['AWS_ACCESS_KEY_ID'] = prompt.ask('Space access key:') do |q|
+            q.required true
+            q.modify :strip
+          end
+
+          env['AWS_SECRET_ACCESS_KEY'] = prompt.ask('Space secret key:') do |q|
+            q.required true
+            q.modify :strip
+          end
         when 'Amazon S3'
           env['S3_ENABLED']  = 'true'
           env['S3_PROTOCOL'] = 'https'
@@ -153,7 +194,7 @@ namespace :mastodon do
 
           env['S3_HOSTNAME'] = prompt.ask('S3 hostname:') do |q|
             q.required true
-            q.default 's3-us-east-1.amazonaws.com'
+            q.default 's3.us-east-1.amazonaws.com'
             q.modify :strip
           end
 
@@ -263,6 +304,7 @@ namespace :mastodon do
           env['SMTP_PORT'] = 25
           env['SMTP_AUTH_METHOD'] = 'none'
           env['SMTP_OPENSSL_VERIFY_MODE'] = 'none'
+          env['SMTP_ENABLE_STARTTLS'] = 'auto'
         else
           env['SMTP_SERVER'] = prompt.ask('SMTP server:') do |q|
             q.required true
@@ -291,6 +333,8 @@ namespace :mastodon do
           end
 
           env['SMTP_OPENSSL_VERIFY_MODE'] = prompt.select('SMTP OpenSSL verify mode:', %w(none peer client_once fail_if_no_peer_cert))
+
+          env['SMTP_ENABLE_STARTTLS'] = prompt.select('Enable STARTTLS:', %w(auto always never))
         end
 
         env['SMTP_FROM_ADDRESS'] = prompt.ask('E-mail address to send e-mails "from":') do |q|
@@ -304,6 +348,20 @@ namespace :mastodon do
         send_to = prompt.ask('Send test e-mail to:', required: true)
 
         begin
+          enable_starttls = nil
+          enable_starttls_auto = nil
+
+          case env['SMTP_ENABLE_STARTTLS']
+          when 'always'
+            enable_starttls = true
+          when 'never'
+            enable_starttls = false
+          when 'auto'
+            enable_starttls_auto = true
+          else
+            enable_starttls_auto = env['SMTP_ENABLE_STARTTLS_AUTO'] != 'false'
+          end
+
           ActionMailer::Base.smtp_settings = {
             port:                 env['SMTP_PORT'],
             address:              env['SMTP_SERVER'],
@@ -312,7 +370,8 @@ namespace :mastodon do
             domain:               env['LOCAL_DOMAIN'],
             authentication:       env['SMTP_AUTH_METHOD'] == 'none' ? nil : env['SMTP_AUTH_METHOD'] || :plain,
             openssl_verify_mode:  env['SMTP_OPENSSL_VERIFY_MODE'],
-            enable_starttls_auto: true,
+            enable_starttls:      enable_starttls,
+            enable_starttls_auto: enable_starttls_auto,
           }
 
           ActionMailer::Base.default_options = {
@@ -425,9 +484,12 @@ namespace :mastodon do
 
           password = SecureRandom.hex(16)
 
-          user = User.new(admin: true, email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true)
+          owner_role = UserRole.find_by(name: 'Owner')
+          user = User.new(email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true, role: owner_role)
           user.save(validate: false)
 
+          Setting.site_contact_username = username
+
           prompt.ok "You can login with the password: #{password}"
           prompt.warn 'You can change your password once you login.'
         end
@@ -441,7 +503,7 @@ namespace :mastodon do
 
   namespace :webpush do
     desc 'Generate VAPID key'
-    task generate_vapid_key: :environment do
+    task :generate_vapid_key do
       vapid_key = Webpush.generate_key
       puts "VAPID_PRIVATE_KEY=#{vapid_key.private_key}"
       puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}"
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index bbf7f20ee..795b54c59 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -96,7 +96,8 @@ namespace :repo do
     end.uniq.compact
 
     missing_available_locales = locales_in_files - I18n.available_locales
-    missing_locale_names = I18n.available_locales.reject { |locale| LanguagesHelper::HUMAN_LOCALES.key?(locale) }
+    supported_locale_codes    = Set.new(LanguagesHelper::SUPPORTED_LOCALES.keys + LanguagesHelper::REGIONAL_LOCALE_NAMES.keys)
+    missing_locale_names      = I18n.available_locales.reject { |locale| supported_locale_codes.include?(locale) }
 
     critical = false
 
@@ -123,7 +124,7 @@ namespace :repo do
 
     unless missing_locale_names.empty?
       puts pastel.yellow("You are missing human-readable names for these locales: #{pastel.bold(missing_locale_names.join(', '))}")
-      puts pastel.yellow("Add them to #{pastel.bold('HUMAN_LOCALES')} in app/helpers/settings_helper.rb or remove the locales from #{pastel.bold('I18n.available_locales')} in config/application.rb")
+      puts pastel.yellow("Add them to app/helpers/languages_helper.rb or remove the locales from #{pastel.bold('I18n.available_locales')} in config/application.rb")
     end
 
     if critical
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
new file mode 100644
index 000000000..1dd25abb9
--- /dev/null
+++ b/lib/tasks/tests.rake
@@ -0,0 +1,317 @@
+# frozen_string_literal: true
+
+namespace :tests do
+  namespace :migrations do
+    desc 'Check that database state is consistent with a successful migration from populated data'
+    task check_database: :environment do
+      unless Account.find_by(username: 'admin', domain: nil)&.hide_collections? == false
+        puts 'Unexpected value for Account#hide_collections? for user @admin'
+        exit(1)
+      end
+
+      unless Account.find_by(username: 'user', domain: nil)&.hide_collections? == true
+        puts 'Unexpected value for Account#hide_collections? for user @user'
+        exit(1)
+      end
+
+      unless Account.find_by(username: 'evil', domain: 'activitypub.com')&.suspended?
+        puts 'Unexpected value for Account#suspended? for user @evil@activitypub.com'
+        exit(1)
+      end
+
+      unless Status.find(6).account_id == Status.find(7).account_id
+        puts 'Users @remote@remote.com and @Remote@remote.com not properly merged'
+        exit(1)
+      end
+
+      if Account.where(domain: Rails.configuration.x.local_domain).exists?
+        puts 'Faux remote accounts not properly claned up'
+        exit(1)
+      end
+
+      unless AccountConversation.first&.last_status_id == 11
+        puts 'AccountConversation records not created as expected'
+        exit(1)
+      end
+
+      if Account.find(-99).private_key.blank?
+        puts 'Instance actor does not have a private key'
+        exit(1)
+      end
+
+      unless Account.find_by(username: 'user', domain: nil).custom_filters.map { |filter| filter.keywords.pluck(:keyword) } == [['test'], ['take']]
+        puts 'CustomFilterKeyword records not created as expected'
+        exit(1)
+      end
+
+      unless Admin::ActionLog.find_by(target_type: 'DomainBlock', target_id: 1).human_identifier == 'example.org'
+        puts 'Admin::ActionLog domain block records not updated as expected'
+        exit(1)
+      end
+
+      unless Admin::ActionLog.find_by(target_type: 'EmailDomainBlock', target_id: 1).human_identifier == 'example.org'
+        puts 'Admin::ActionLog email domain block records not updated as expected'
+        exit(1)
+      end
+    end
+
+    desc 'Populate the database with test data for 2.4.3'
+    task populate_v2_4_3: :environment do # rubocop:disable Naming/VariableNumber
+      ActiveRecord::Base.connection.execute(<<~SQL)
+        INSERT INTO "custom_filters"
+          (id, account_id, phrase, context, whole_word, irreversible, created_at, updated_at)
+        VALUES
+          (1, 2, 'test', '{ "home", "public" }', true, true, now(), now()),
+          (2, 2, 'take', '{ "home" }', false, false, now(), now());
+
+        -- Orphaned admin action logs
+
+        INSERT INTO "admin_action_logs"
+          (account_id, action, target_type, target_id, created_at, updated_at)
+        VALUES
+          (1, 'destroy', 'Account', 1312, now(), now()),
+          (1, 'destroy', 'User', 1312, now(), now()),
+          (1, 'destroy', 'Report', 1312, now(), now()),
+          (1, 'destroy', 'DomainBlock', 1312, now(), now()),
+          (1, 'destroy', 'EmailDomainBlock', 1312, now(), now()),
+          (1, 'destroy', 'Status', 1312, now(), now()),
+          (1, 'destroy', 'CustomEmoji', 1312, now(), now());
+
+        -- Admin action logs with linked objects
+
+        INSERT INTO "domain_blocks"
+          (id, domain, created_at, updated_at)
+        VALUES
+          (1, 'example.org', now(), now());
+
+        INSERT INTO "email_domain_blocks"
+          (id, domain, created_at, updated_at)
+        VALUES
+          (1, 'example.org', now(), now());
+
+        INSERT INTO "admin_action_logs"
+          (account_id, action, target_type, target_id, created_at, updated_at)
+        VALUES
+          (1, 'destroy', 'Account', 1, now(), now()),
+          (1, 'destroy', 'User', 1, now(), now()),
+          (1, 'destroy', 'DomainBlock', 1, now(), now()),
+          (1, 'destroy', 'EmailDomainBlock', 1, now(), now()),
+          (1, 'destroy', 'Status', 1, now(), now()),
+          (1, 'destroy', 'CustomEmoji', 3, now(), now());
+      SQL
+    end
+
+    desc 'Populate the database with test data for 2.4.0'
+    task populate_v2_4: :environment do # rubocop:disable Naming/VariableNumber
+      ActiveRecord::Base.connection.execute(<<~SQL)
+        INSERT INTO "settings"
+          (id, thing_type, thing_id, var, value, created_at, updated_at)
+        VALUES
+          (1, 'User', 1, 'hide_network', E'--- false\n', now(), now()),
+          (2, 'User', 2, 'hide_network', E'--- true\n', now(), now());
+      SQL
+    end
+
+    desc 'Populate the database with test data for 2.0.0'
+    task populate_v2: :environment do
+      admin_key   = OpenSSL::PKey::RSA.new(2048)
+      user_key    = OpenSSL::PKey::RSA.new(2048)
+      remote_key  = OpenSSL::PKey::RSA.new(2048)
+      remote_key2 = OpenSSL::PKey::RSA.new(2048)
+      remote_key3 = OpenSSL::PKey::RSA.new(2048)
+      admin_private_key    = ActiveRecord::Base.connection.quote(admin_key.to_pem)
+      admin_public_key     = ActiveRecord::Base.connection.quote(admin_key.public_key.to_pem)
+      user_private_key     = ActiveRecord::Base.connection.quote(user_key.to_pem)
+      user_public_key      = ActiveRecord::Base.connection.quote(user_key.public_key.to_pem)
+      remote_public_key    = ActiveRecord::Base.connection.quote(remote_key.public_key.to_pem)
+      remote_public_key2   = ActiveRecord::Base.connection.quote(remote_key2.public_key.to_pem)
+      remote_public_key_ap = ActiveRecord::Base.connection.quote(remote_key3.public_key.to_pem)
+      local_domain = ActiveRecord::Base.connection.quote(Rails.configuration.x.local_domain)
+
+      ActiveRecord::Base.connection.execute(<<~SQL)
+        -- accounts
+
+        INSERT INTO "accounts"
+          (id, username, domain, private_key, public_key, created_at, updated_at)
+        VALUES
+          (1, 'admin', NULL, #{admin_private_key}, #{admin_public_key}, now(), now()),
+          (2, 'user',  NULL, #{user_private_key},  #{user_public_key},  now(), now());
+
+        INSERT INTO "accounts"
+          (id, username, domain, private_key, public_key, created_at, updated_at, remote_url, salmon_url)
+        VALUES
+          (3, 'remote', 'remote.com', NULL, #{remote_public_key}, now(), now(),
+           'https://remote.com/@remote', 'https://remote.com/salmon/1'),
+          (4, 'Remote', 'remote.com', NULL, #{remote_public_key}, now(), now(),
+           'https://remote.com/@Remote', 'https://remote.com/salmon/1'),
+          (5, 'REMOTE', 'Remote.com', NULL, #{remote_public_key2}, now() - interval '1 year', now() - interval '1 year',
+           'https://remote.com/stale/@REMOTE', 'https://remote.com/stale/salmon/1');
+
+        INSERT INTO "accounts"
+          (id, username, domain, private_key, public_key, created_at, updated_at, protocol, inbox_url, outbox_url, followers_url)
+        VALUES
+          (6, 'bob', 'activitypub.com', NULL, #{remote_public_key_ap}, now(), now(),
+           1, 'https://activitypub.com/users/bob/inbox', 'https://activitypub.com/users/bob/outbox', 'https://activitypub.com/users/bob/followers');
+
+        INSERT INTO "accounts"
+          (id, username, domain, private_key, public_key, created_at, updated_at)
+        VALUES
+          (7, 'user', #{local_domain}, #{user_private_key}, #{user_public_key}, now(), now()),
+          (8, 'pt_user', NULL, #{user_private_key}, #{user_public_key}, now(), now());
+
+        INSERT INTO "accounts"
+          (id, username, domain, private_key, public_key, created_at, updated_at, protocol, inbox_url, outbox_url, followers_url, suspended)
+        VALUES
+          (9, 'evil', 'activitypub.com', NULL, #{remote_public_key_ap}, now(), now(),
+           1, 'https://activitypub.com/users/evil/inbox', 'https://activitypub.com/users/evil/outbox',
+           'https://activitypub.com/users/evil/followers', true);
+
+        -- users
+
+        INSERT INTO "users"
+          (id, account_id, email, created_at, updated_at, admin)
+        VALUES
+          (1, 1, 'admin@localhost', now(), now(), true),
+          (2, 2, 'user@localhost', now(), now(), false);
+
+        INSERT INTO "users"
+          (id, account_id, email, created_at, updated_at, admin, locale)
+        VALUES
+          (3, 7, 'ptuser@localhost', now(), now(), false, 'pt');
+
+        -- conversations
+        INSERT INTO "conversations" (id, created_at, updated_at) VALUES (1, now(), now());
+
+        -- statuses
+
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at)
+        VALUES
+          (1, 1, 'test', now(), now()),
+          (2, 1, '@remote@remote.com hello', now(), now()),
+          (3, 1, '@Remote@remote.com hello', now(), now()),
+          (4, 1, '@REMOTE@remote.com hello', now(), now());
+
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at, uri, local)
+        VALUES
+          (5, 1, 'activitypub status', now(), now(), 'https://localhost/users/admin/statuses/4', true);
+
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at)
+        VALUES
+          (6, 3, 'test', now(), now());
+
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at, in_reply_to_id, in_reply_to_account_id)
+        VALUES
+          (7, 4, '@admin hello', now(), now(), 3, 1);
+
+        INSERT INTO "statuses"
+          (id, account_id, text, created_at, updated_at)
+        VALUES
+          (8, 5, 'test', now(), now());
+
+        INSERT INTO "statuses"
+          (id, account_id, reblog_of_id, created_at, updated_at)
+        VALUES
+          (9, 1, 2, now(), now());
+
+        INSERT INTO "statuses"
+          (id, account_id, text, in_reply_to_id, conversation_id, visibility, created_at, updated_at)
+        VALUES
+          (10, 2, '@admin hey!', NULL, 1, 3, now(), now()),
+          (11, 1, '@user hey!', 10, 1, 3, now(), now());
+
+        -- mentions (from previous statuses)
+
+        INSERT INTO "mentions"
+          (id, status_id, account_id, created_at, updated_at)
+        VALUES
+          (1, 2, 3, now(), now()),
+          (2, 3, 4, now(), now()),
+          (3, 4, 5, now(), now()),
+          (4, 10, 1, now(), now()),
+          (5, 11, 2, now(), now());
+
+        -- stream entries
+
+        INSERT INTO "stream_entries"
+          (activity_id, account_id, activity_type, created_at, updated_at)
+        VALUES
+          (1, 1, 'status', now(), now()),
+          (2, 1, 'status', now(), now()),
+          (3, 1, 'status', now(), now()),
+          (4, 1, 'status', now(), now()),
+          (5, 1, 'status', now(), now()),
+          (6, 3, 'status', now(), now()),
+          (7, 4, 'status', now(), now()),
+          (8, 5, 'status', now(), now()),
+          (9, 1, 'status', now(), now());
+
+        -- custom emoji
+
+        INSERT INTO "custom_emojis"
+          (id, shortcode, created_at, updated_at)
+        VALUES
+          (1, 'test', now(), now()),
+          (2, 'Test', now(), now()),
+          (3, 'blobcat', now(), now());
+
+        INSERT INTO "custom_emojis"
+          (id, shortcode, domain, uri, created_at, updated_at)
+        VALUES
+          (4, 'blobcat', 'remote.org', 'https://remote.org/emoji/blobcat', now(), now()),
+          (5, 'blobcat', 'Remote.org', 'https://remote.org/emoji/blobcat', now(), now()),
+          (6, 'Blobcat', 'remote.org', 'https://remote.org/emoji/Blobcat', now(), now());
+
+        -- favourites
+
+        INSERT INTO "favourites"
+          (account_id, status_id, created_at, updated_at)
+        VALUES
+          (1, 1, now(), now()),
+          (1, 7, now(), now()),
+          (4, 1, now(), now()),
+          (3, 1, now(), now()),
+          (5, 1, now(), now());
+
+        -- pinned statuses
+
+        INSERT INTO "status_pins"
+          (account_id, status_id, created_at, updated_at)
+        VALUES
+          (1, 1, now(), now()),
+          (3, 6, now(), now()),
+          (4, 7, now(), now());
+
+        -- follows
+
+        INSERT INTO "follows"
+          (id, account_id, target_account_id, created_at, updated_at)
+        VALUES
+          (1, 1, 5, now(), now()),
+          (2, 6, 2, now(), now()),
+          (3, 5, 2, now(), now()),
+          (4, 6, 1, now(), now());
+
+        -- follow requests
+
+        INSERT INTO "follow_requests"
+          (account_id, target_account_id, created_at, updated_at)
+        VALUES
+          (2, 5, now(), now()),
+          (5, 1, now(), now());
+
+        -- notifications
+
+        INSERT INTO "notifications"
+          (id, from_account_id, account_id, activity_type, activity_id, created_at, updated_at)
+        VALUES
+          (1, 6, 2, 'Follow', 2, now(), now()),
+          (2, 2, 1, 'Mention', 4, now(), now()),
+          (3, 1, 2, 'Mention', 5, now(), now());
+      SQL
+    end
+  end
+end
diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
deleted file mode 100644
index 37c8a451a..000000000
--- a/nanobox/nginx-local.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-worker_processes 1;
-daemon off;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /data/etc/nginx/mime.types;
-    sendfile on;
-
-    gzip on;
-    gzip_disable "MSIE [1-6]\.";
-    gzip_vary on;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_min_length 500;
-    gzip_http_version 1.1;
-    gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
-
-    # Proxy upstream to the puma process
-    upstream rails {
-        server 127.0.0.1:3000;
-    }
-
-    # Proxy upstream to the node process
-    upstream node {
-        server 127.0.0.1:4000;
-    }
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    # Configuration for Nginx
-    server {
-        # Listen on port 8080
-        listen 8080;
-
-        keepalive_timeout    70;
-        client_max_body_size 80M;
-
-        root /app/public;
-
-        add_header Strict-Transport-Security "max-age=31536000";
-
-        location / {
-            try_files $uri @rails;
-        }
-
-        # Proxy connections to rails
-        location @rails {
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto https;
-            proxy_set_header Proxy "";
-            proxy_pass_header Server;
-
-            proxy_pass http://rails;
-            proxy_buffering off;
-            proxy_redirect off;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-
-            tcp_nodelay on;
-        }
-
-        # Proxy connections to node
-        location /api/v1/streaming {
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto https;
-            proxy_set_header Proxy "";
-
-            proxy_pass http://node;
-            proxy_buffering off;
-            proxy_redirect off;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-
-            tcp_nodelay on;
-        }
-    }
-
-    error_page 500 501 502 503 504 /500.html;
-}
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
deleted file mode 100644
index 4ea6e30fc..000000000
--- a/nanobox/nginx-stream.conf.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-worker_processes 1;
-daemon off;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /data/etc/nginx/mime.types;
-    sendfile on;
-
-    gzip on;
-    gzip_disable "MSIE [1-6]\.";
-    gzip_vary on;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_min_length 500;
-    gzip_http_version 1.1;
-    gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
-
-    # Proxy upstream to the node process
-    upstream node {
-        server 127.0.0.1:4000;
-    }
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    # Configuration for Nginx
-    server {
-        # Listen on port 8080
-        listen 8080;
-
-        keepalive_timeout    70;
-        client_max_body_size 80M;
-
-        root /app/public;
-
-        add_header Strict-Transport-Security "max-age=31536000";
-
-        location / {
-            try_files $uri @node;
-        }
-
-        # Proxy connections to node
-        location @node {
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto https;
-            proxy_set_header Proxy "";
-
-            proxy_pass http://node;
-            proxy_buffering off;
-            proxy_redirect off;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-
-            tcp_nodelay on;
-        }
-    }
-}
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
deleted file mode 100644
index 182d99209..000000000
--- a/nanobox/nginx-web.conf.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-worker_processes 1;
-daemon off;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /data/etc/nginx/mime.types;
-    sendfile on;
-
-    gzip on;
-    gzip_disable "MSIE [1-6]\.";
-    gzip_vary on;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_min_length 500;
-    gzip_http_version 1.1;
-    gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
-
-    # Proxy upstream to the puma process
-    upstream rails {
-        server 127.0.0.1:3000;
-    }
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    # Configuration for Nginx
-    server {
-        # Listen on port 8080
-        listen 8080;
-
-        keepalive_timeout    70;
-        client_max_body_size 80M;
-
-        root /app/public;
-
-        add_header Strict-Transport-Security "max-age=31536000";
-
-        location / {
-            try_files $uri @rails;
-        }
-
-        location /sw.js {
-            add_header Cache-Control "public, max-age=0";
-            add_header Strict-Transport-Security "max-age=31536000";
-            try_files $uri @rails;
-        }
-
-        location ~ ^/(emoji|packs|system/media_attachments/files|system/accounts/avatars) {
-            add_header Cache-Control "public, max-age=31536000, immutable";
-            add_header Strict-Transport-Security "max-age=31536000";
-            try_files $uri @rails;
-        }
-
-        # Proxy connections to rails
-        location @rails {
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto https;
-            proxy_set_header Proxy "";
-            proxy_pass_header Server;
-
-            proxy_pass http://rails;
-            proxy_buffering on;
-            proxy_redirect off;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-
-            proxy_cache CACHE;
-            proxy_cache_valid 200 7d;
-            proxy_cache_valid 410 24h;
-            proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
-            add_header Strict-Transport-Security "max-age=31536000";
-            add_header X-Cached $upstream_cache_status;
-
-            tcp_nodelay on;
-        }
-    }
-
-    proxy_cache_path /data/var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
-
-    error_page 500 501 502 503 504 /500.html;
-}
diff --git a/package.json b/package.json
index 77633f144..ba3920461 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=12"
+    "node": ">=16"
   },
   "scripts": {
     "postversion": "git push --tags",
@@ -13,146 +13,112 @@
     "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
     "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
     "test:lint:js": "eslint --ext=js . --cache",
-    "test:lint:sass": "sass-lint -v",
-    "test:jest": "cross-env NODE_ENV=test jest"
+    "test:lint:sass": "stylelint '**/*.scss'",
+    "test:jest": "cross-env NODE_ENV=test jest",
+    "format": "prettier --write \"**/*.{json,yml}\"",
+    "format-check": "prettier --check \"**/*.{json,yml}\""
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/mastodon/mastodon.git"
   },
-  "browserslist": [
-    "last 2 versions",
-    "not IE 11",
-    "iOS >= 9",
-    "not dead"
-  ],
-  "jest": {
-    "testEnvironment": "jsdom",
-    "projects": [
-      "<rootDir>/app/javascript/mastodon"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/node_modules/",
-      "<rootDir>/vendor/",
-      "<rootDir>/config/",
-      "<rootDir>/log/",
-      "<rootDir>/public/",
-      "<rootDir>/tmp/"
-    ],
-    "setupFiles": [
-      "raf/polyfill"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/app/javascript/mastodon/test_setup.js"
-    ],
-    "collectCoverageFrom": [
-      "app/javascript/mastodon/**/*.js",
-      "!app/javascript/mastodon/features/emoji/emoji_compressed.js",
-      "!app/javascript/mastodon/locales/locale-data/*.js",
-      "!app/javascript/mastodon/service_worker/entry.js",
-      "!app/javascript/mastodon/test_setup.js"
-    ],
-    "coverageDirectory": "<rootDir>/coverage",
-    "moduleDirectories": [
-      "<rootDir>/node_modules",
-      "<rootDir>/app/javascript"
-    ]
-  },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.16.5",
-    "@babel/plugin-proposal-decorators": "^7.16.5",
-    "@babel/plugin-transform-react-inline-elements": "^7.16.5",
-    "@babel/plugin-transform-runtime": "^7.16.5",
-    "@babel/preset-env": "^7.16.5",
-    "@babel/preset-react": "^7.16.5",
-    "@babel/runtime": "^7.16.5",
+    "@babel/core": "^7.20.5",
+    "@babel/plugin-proposal-decorators": "^7.20.5",
+    "@babel/plugin-transform-react-inline-elements": "^7.18.6",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/runtime": "^7.20.6",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^0.5.7",
-    "@rails/ujs": "^6.1.4",
-    "array-includes": "^3.1.4",
+    "@rails/ujs": "^6.1.7",
+    "abortcontroller-polyfill": "^1.7.5",
+    "array-includes": "^3.1.6",
     "arrow-key-navigation": "^1.2.0",
     "autoprefixer": "^9.8.8",
-    "axios": "^0.24.0",
-    "babel-loader": "^8.2.3",
+    "axios": "^1.2.1",
+    "babel-loader": "^8.3.0",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^5.0.0",
+    "babel-plugin-preval": "^5.1.0",
     "babel-plugin-react-intl": "^6.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "babel-runtime": "^6.26.0",
-    "blurhash": "^1.1.4",
-    "classnames": "^2.3.1",
+    "blurhash": "^2.0.4",
+    "classnames": "^2.3.2",
+    "cocoon-js-vanilla": "^1.3.0",
     "color-blend": "^3.0.1",
     "compression-webpack-plugin": "^6.1.1",
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.7",
     "cssnano": "^4.1.11",
     "detect-passive-events": "^2.0.3",
-    "dotenv": "^10.0.0",
-    "emoji-mart": "npm:emoji-mart-lazyload",
+    "dotenv": "^16.0.3",
+    "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "es6-symbol": "^3.1.3",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
-    "express": "^4.17.2",
+    "express": "^4.18.2",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
-    "glob": "^7.2.0",
+    "fuzzysort": "^1.9.0",
+    "glob": "^8.0.3",
     "history": "^4.10.1",
-    "http-link-header": "^1.0.3",
-    "immutable": "^4.0.0",
+    "http-link-header": "^1.1.0",
+    "immutable": "^4.1.0",
     "imports-loader": "^1.2.0",
-    "intersection-observer": "^0.12.0",
+    "intersection-observer": "^0.12.2",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
     "intl-relativeformat": "^6.4.3",
     "is-nan": "^1.3.2",
     "js-yaml": "^4.1.0",
+    "jsdom": "^20.0.3",
     "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
-    "marky": "^1.2.2",
+    "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
     "mkdirp": "^1.0.4",
-    "npmlog": "^6.0.0",
+    "npmlog": "^7.0.1",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
-    "object.values": "^1.1.5",
-    "offline-plugin": "^5.0.7",
+    "object.values": "^1.1.6",
     "path-complete-extname": "^1.0.0",
     "pg": "^8.5.0",
+    "postcss": "^8.4.20",
     "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
-    "promise.prototype.finally": "^3.1.3",
-    "prop-types": "^15.5.10",
+    "promise.prototype.finally": "^3.1.4",
+    "prop-types": "^15.8.1",
     "punycode": "^2.1.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
+    "react-helmet": "^6.1.0",
     "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^2.2.2",
     "react-intl": "^2.9.0",
-    "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.5",
     "react-overlays": "^0.9.3",
-    "react-redux": "^7.2.6",
-    "react-redux-loading-bar": "^4.0.8",
+    "react-redux": "^7.2.9",
+    "react-redux-loading-bar": "^5.0.4",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^5.2.1",
+    "react-select": "^5.7.0",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.14.0",
-    "react-textarea-autosize": "^8.3.3",
-    "react-toggle": "^4.1.2",
-    "redis": "^4.0.1",
-    "redux": "^4.1.2",
+    "react-textarea-autosize": "^8.4.0",
+    "react-toggle": "^4.1.3",
+    "redis": "^4.0.6 <4.1.0",
+    "redux": "^4.2.0",
     "redux-immutable": "^4.0.0",
-    "redux-thunk": "^2.4.1",
-    "regenerator-runtime": "^0.13.9",
-    "rellax": "^1.12.1",
+    "redux-thunk": "^2.4.2",
+    "regenerator-runtime": "^0.13.11",
     "requestidlecallback": "^0.3.0",
-    "reselect": "^4.1.5",
+    "reselect": "^4.1.7",
     "rimraf": "^3.0.2",
-    "sass": "^1.45.1",
+    "sass": "^1.57.0",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
@@ -165,35 +131,45 @@
     "uuid": "^8.3.1",
     "webpack": "^4.46.0",
     "webpack-assets-manifest": "^4.0.6",
-    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^3.3.12",
     "webpack-merge": "^5.8.0",
-    "wicg-inert": "^3.1.1",
-    "ws": "^8.3.0"
+    "wicg-inert": "^3.1.2",
+    "workbox-expiration": "^6.5.4",
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "workbox-webpack-plugin": "^6.5.4",
+    "workbox-window": "^6.5.4",
+    "ws": "^8.10.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^12.1.2",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.4.5",
+    "@babel/eslint-parser": "^7.19.1",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^12.1.5",
+    "babel-jest": "^29.3.1",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "~2.25.3",
-    "eslint-plugin-jsx-a11y": "~6.5.1",
-    "eslint-plugin-promise": "~6.0.0",
-    "eslint-plugin-react": "~7.27.1",
-    "jest": "^27.4.5",
+    "eslint-plugin-import": "~2.26.0",
+    "eslint-plugin-jsx-a11y": "~6.6.1",
+    "eslint-plugin-promise": "~6.1.1",
+    "eslint-plugin-react": "~7.31.11",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.3.1",
+    "postcss-scss": "^4.0.6",
+    "prettier": "^2.8.1",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",
-    "sass-lint": "^1.13.1",
+    "stylelint": "^14.14.0",
+    "stylelint-config-standard-scss": "^5.0.0",
     "webpack-dev-server": "^3.11.3",
-    "yargs": "^17.3.0"
+    "yargs": "^17.6.2"
   },
   "resolutions": {
     "kind-of": "^6.0.3"
   },
   "optionalDependencies": {
-    "bufferutil": "^4.0.5",
-    "utf-8-validate": "^5.0.7"
+    "bufferutil": "^4.0.7",
+    "utf-8-validate": "^5.0.10"
   }
 }
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
deleted file mode 100644
index 7a99a1964..000000000
Binary files a/public/android-chrome-192x192.png and /dev/null differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index b12aa55a3..000000000
Binary files a/public/apple-touch-icon.png and /dev/null differ
diff --git a/public/avatars/original/missing.png b/public/avatars/original/missing.png
index 34c8e45e6..781370782 100644
Binary files a/public/avatars/original/missing.png and b/public/avatars/original/missing.png differ
diff --git a/public/badge.png b/public/badge.png
index c3e99ddd4..7f9128f49 100644
Binary files a/public/badge.png and b/public/badge.png differ
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
deleted file mode 100644
index 7fdab5058..000000000
--- a/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#282c37</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
diff --git a/public/embed.js b/public/embed.js
index dac507453..defba403e 100644
--- a/public/embed.js
+++ b/public/embed.js
@@ -1,36 +1,62 @@
-(function() {
+// @ts-check
+
+(function () {
   'use strict';
 
-  var ready = function(loaded) {
-    if (['interactive', 'complete'].indexOf(document.readyState) !== -1) {
+  /**
+   * @param {() => void} loaded
+   */
+  var ready = function (loaded) {
+    if (document.readyState === 'complete') {
       loaded();
     } else {
-      document.addEventListener('DOMContentLoaded', loaded);
+      document.addEventListener('readystatechange', function () {
+        if (document.readyState === 'complete') {
+          loaded();
+        }
+      });
     }
   };
 
-  ready(function() {
-    var iframes = [];
+  ready(function () {
+    /** @type {Map<number, HTMLIFrameElement>} */
+    var iframes = new Map();
 
-    window.addEventListener('message', function(e) {
+    window.addEventListener('message', function (e) {
       var data = e.data || {};
 
-      if (data.type !== 'setHeight' || !iframes[data.id]) {
+      if (typeof data !== 'object' || data.type !== 'setHeight' || !iframes.has(data.id)) {
         return;
       }
 
-      iframes[data.id].height = data.height;
+      var iframe = iframes.get(data.id);
+
+      if ('source' in e && iframe.contentWindow !== e.source) {
+        return;
+      }
+
+      iframe.height = data.height;
     });
 
-    [].forEach.call(document.querySelectorAll('iframe.mastodon-embed'), function(iframe) {
-      iframe.scrolling      = 'no';
+    [].forEach.call(document.querySelectorAll('iframe.mastodon-embed'), function (iframe) {
+      // select unique id for each iframe
+      var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
+      while (id === 0 || iframes.has(id)) {
+        id = crypto.getRandomValues(idBuffer)[0];
+        failCount++;
+        if (failCount > 100) {
+          // give up and assign (easily guessable) unique number if getRandomValues is broken or no luck
+          id = -(iframes.size + 1);
+          break;
+        }
+      }
+
+      iframes.set(id, iframe);
+
+      iframe.scrolling = 'no';
       iframe.style.overflow = 'hidden';
 
-      iframes.push(iframe);
-
-      var id = iframes.length - 1;
-
-      iframe.onload = function() {
+      iframe.onload = function () {
         iframe.contentWindow.postMessage({
           type: 'setHeight',
           id: id,
diff --git a/public/emoji/1f1e7-1f1ea.svg b/public/emoji/1f1e7-1f1ea.svg
index e95619434..86704269a 100644
--- a/public/emoji/1f1e7-1f1ea.svg
+++ b/public/emoji/1f1e7-1f1ea.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#141414" d="M4 5C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h8V5H4z"/><path fill="#FEE833" d="M12 5h12v26H12z"/><path fill="#EE232C" d="M32 5h-8v26h8c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#141414" d="M7 5a4 4 0 0 0-4 4v18a4 4 0 0 0 4 4h6V5H7z"/><path fill="#FDDA24" d="M13 5h10v26H13z"/><path fill="#EF3340" d="M29 5h-6v26h6a4 4 0 0 0 4-4V9a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f1ee-1f1f3.svg b/public/emoji/1f1ee-1f1f3.svg
index 7af1dafe4..55f97e6fb 100644
--- a/public/emoji/1f1ee-1f1f3.svg
+++ b/public/emoji/1f1ee-1f1f3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#138808" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-4H0v4z"/><path fill="#EEE" d="M0 13h36v10H0z"/><path fill="#F93" d="M36 13V9c0-2.209-1.791-4-4-4H4C1.791 5 0 6.791 0 9v4h36z"/><circle fill="navy" cx="18" cy="18" r="4"/><circle fill="#EEE" cx="18" cy="18" r="3"/><path fill="#6666B3" d="M18 15l.146 2.264 1.001-2.035-.73 2.147 1.704-1.498-1.497 1.705 2.147-.731-2.035 1.002L21 18l-2.264.146 2.035 1.001-2.147-.73 1.497 1.704-1.704-1.497.73 2.147-1.001-2.035L18 21l-.146-2.264-1.002 2.035.731-2.147-1.705 1.497 1.498-1.704-2.147.73 2.035-1.001L15 18l2.264-.146-2.035-1.002 2.147.731-1.498-1.705 1.705 1.498-.731-2.147 1.002 2.035z"/><circle fill="navy" cx="18" cy="18" r="1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#138808" d="M0 27a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4v-5H0v5z"/><path fill="#F93" d="M36 14V9a4 4 0 0 0-4-4H4a4 4 0 0 0-4 4v5h36z"/><path fill="#F7F7F7" d="M0 13.667h36v8.667H0z"/><circle fill="navy" cx="18" cy="18" r="4"/><circle fill="#F7F7F7" cx="18" cy="18" r="3.375"/><path d="m18.1 16.75-.1.65-.1-.65.1-1.95zm-.928-1.841.408 1.909.265.602-.072-.653zm-.772.32.888 1.738.412.513-.238-.613zm-.663.508 1.308 1.45.531.389-.389-.531zm-.508.663 1.638 1.062.613.238-.513-.412zm-.32.772 1.858.601.653.072-.602-.265zM14.8 18l1.95.1.65-.1-.65-.1zm.109.828 1.909-.408.602-.265-.653.072zm.32.772 1.738-.888.513-.412-.613.238zm.508.663 1.45-1.308.389-.531-.531.389zm.663.508 1.062-1.638.238-.613-.412.513zm.772.32.601-1.858.072-.653-.265.602zM18 21.2l.1-1.95-.1-.65-.1.65zm.828-.109-.408-1.909-.265-.602.072.653zm.772-.32-.888-1.738-.412-.513.238.613zm.663-.508-1.308-1.45-.531-.389.389.531zm.508-.663-1.638-1.062-.613-.238.513.412zm.32-.772-1.858-.601-.653-.072.602.265zM21.2 18l-1.95-.1-.65.1.65.1zm-.109-.828-1.909.408-.602.265.653-.072zm-.32-.772-1.738.888-.513.412.613-.238zm-.508-.663-1.45 1.308-.389.531.531-.389zm-.663-.508-1.062 1.638-.238.613.412-.513zm-.772-.32-.601 1.858-.072.653.265-.602z" fill="#6666B3"/><g fill="navy"><circle cx="17.56" cy="14.659" r=".2"/><circle cx="16.71" cy="14.887" r=".2"/><circle cx="15.948" cy="15.326" r=".2"/><circle cx="15.326" cy="15.948" r=".2"/><circle cx="14.887" cy="16.71" r=".2"/><circle cx="14.659" cy="17.56" r=".2"/><circle cx="14.659" cy="18.44" r=".2"/><circle cx="14.887" cy="19.29" r=".2"/><circle cx="15.326" cy="20.052" r=".2"/><circle cx="15.948" cy="20.674" r=".2"/><circle cx="16.71" cy="21.113" r=".2"/><circle cx="17.56" cy="21.341" r=".2"/><circle cx="18.44" cy="21.341" r=".2"/><circle cx="19.29" cy="21.113" r=".2"/><circle cx="20.052" cy="20.674" r=".2"/><circle cx="20.674" cy="20.052" r=".2"/><circle cx="21.113" cy="19.29" r=".2"/><circle cx="21.341" cy="18.44" r=".2"/><circle cx="21.341" cy="17.56" r=".2"/><circle cx="21.113" cy="16.71" r=".2"/><circle cx="20.674" cy="15.948" r=".2"/><circle cx="20.052" cy="15.326" r=".2"/><circle cx="19.29" cy="14.887" r=".2"/><circle cx="18.44" cy="14.659" r=".2"/><circle cx="18" cy="18" r=".9"/></g></svg>
\ No newline at end of file
diff --git a/public/emoji/1f327_border.svg b/public/emoji/1f327_border.svg
index 3298c8f87..76776b04a 100644
--- a/public/emoji/1f327_border.svg
+++ b/public/emoji/1f327_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M11.999 24.961l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.98-.937 1.943-2.039zm-1.979 7.46L9.907 29l-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm-5-4.46l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm18-3l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm-6.021 4l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm5.021 4.46L21.906 30l-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm6.979-5.46l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11.999 24.961l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.98-.937 1.943-2.039zm-1.979 7.46L9.907 29l-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm-5-4.46l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm18-3l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm-6.021 4l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm5.021 4.46L21.906 30l-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm6.979-5.46l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/>
   <path fill="#5DADEC" d="M11.999 24.961l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.98-.937 1.943-2.039zm-1.979 7.46L9.907 29l-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm-5-4.46l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm18-3l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm-6.021 4l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm5.021 4.46L21.906 30l-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm6.979-5.46l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039z"/>
diff --git a/public/emoji/1f328_border.svg b/public/emoji/1f328_border.svg
index 254dc90de..1ec2748de 100644
--- a/public/emoji/1f328_border.svg
+++ b/public/emoji/1f328_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M6.53 26.75c-.138-.239-.443-.32-.683-.183L4 27.634V25.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684L2.499 28.5.651 29.567c-.239.138-.32.443-.183.683.138.24.443.321.683.184L3 29.366V31.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L4.5 28.5l1.848-1.067c.239-.138.321-.443.182-.683zm10 4c-.138-.239-.443-.32-.683-.183L14 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L13 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L14.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683zM11 27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L12.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L12 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L11 25.366V27.5zm12.848-.066c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L22.5 25.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L22 24.634V22.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L21 26.366V28.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067zm10.5-1.867L32.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L32 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L31 25.366V27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.137-.239.056-.545-.183-.683zM29.53 30.75c-.138-.239-.443-.32-.683-.183L27 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L26 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L27.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M6.53 26.75c-.138-.239-.443-.32-.683-.183L4 27.634V25.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684L2.499 28.5.651 29.567c-.239.138-.32.443-.183.683.138.24.443.321.683.184L3 29.366V31.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L4.5 28.5l1.848-1.067c.239-.138.321-.443.182-.683zm10 4c-.138-.239-.443-.32-.683-.183L14 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L13 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L14.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683zM11 27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L12.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L12 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L11 25.366V27.5zm12.848-.066c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L22.5 25.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L22 24.634V22.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L21 26.366V28.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067zm10.5-1.867L32.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L32 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L31 25.366V27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.137-.239.056-.545-.183-.683zM29.53 30.75c-.138-.239-.443-.32-.683-.183L27 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L26 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L27.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/>
   <path d="M6.53 26.75c-.138-.239-.443-.32-.683-.183L4 27.634V25.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684L2.499 28.5.651 29.567c-.239.138-.32.443-.183.683.138.24.443.321.683.184L3 29.366V31.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L4.5 28.5l1.848-1.067c.239-.138.321-.443.182-.683zm10 4c-.138-.239-.443-.32-.683-.183L14 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L13 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L14.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683zM11 27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L12.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L12 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L11 25.366V27.5zm12.848-.066c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L22.5 25.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L22 24.634V22.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L21 26.366V28.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067zm10.5-1.867L32.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L32 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L31 25.366V27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.137-.239.056-.545-.183-.683zM29.53 30.75c-.138-.239-.443-.32-.683-.183L27 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L26 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L27.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683z" fill="#5DADEC"/>
diff --git a/public/emoji/1f329_border.svg b/public/emoji/1f329_border.svg
index 05c662ac4..ad0cef998 100644
--- a/public/emoji/1f329_border.svg
+++ b/public/emoji/1f329_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M13.917 36c-.091 0-.182-.029-.258-.089-.157-.124-.204-.341-.113-.518L17 29h-5.078c-.174 0-.438-.031-.562-.297-.114-.243-.057-.474.047-.703L15 19c.078-.067 6.902.393 7 .393.09 0 .182.029.257.089.157.124.204.341.112.519l-3.817 6h5.032c.174 0 .329.108.391.271.06.163.013.347-.119.461l-9.666 9.166c-.079.067-.176.101-.273.101z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M13.917 36c-.091 0-.182-.029-.258-.089-.157-.124-.204-.341-.113-.518L17 29h-5.078c-.174 0-.438-.031-.562-.297-.114-.243-.057-.474.047-.703L15 19c.078-.067 6.902.393 7 .393.09 0 .182.029.257.089.157.124.204.341.112.519l-3.817 6h5.032c.174 0 .329.108.391.271.06.163.013.347-.119.461l-9.666 9.166c-.079.067-.176.101-.273.101z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#F4900C" d="M13.917 36c-.091 0-.182-.029-.258-.089-.157-.124-.204-.341-.113-.518L17 29h-5.078c-.174 0-.438-.031-.562-.297-.114-.243-.057-.474.047-.703L15 19c.078-.067 6.902.393 7 .393.09 0 .182.029.257.089.157.124.204.341.112.519l-3.817 6h5.032c.174 0 .329.108.391.271.06.163.013.347-.119.461l-9.666 9.166c-.079.067-.176.101-.273.101z"/>
   <path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/>
diff --git a/public/emoji/1f359_border.svg b/public/emoji/1f359_border.svg
index 6541681d8..d915010a6 100644
--- a/public/emoji/1f359_border.svg
+++ b/public/emoji/1f359_border.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M35 26c0 9.389-7.609 9-17 9s-17 .389-17-9C1 18 9 7 14 3c2.75-2 5.129-2.051 8 0 7 5 13 18 13 23z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M27.258 29.642c-.461.316-1.091.199-1.406-.263-.316-.46-.198-1.091.262-1.406l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.405l-1.668 1.145zm2.438-7.095c-.512-.207-.758-.792-.549-1.303.209-.512.793-.758 1.304-.549l1.852.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.852-.755zm-4.494-5.256c-.519-.21-.767-.801-.555-1.318.209-.517.801-.766 1.316-.556l1.875.764c.516.211.765.801.554 1.318-.211.517-.8.766-1.318.555l-1.872-.763zm-21.001 7c-.517-.21-.766-.801-.554-1.318.21-.517.801-.766 1.317-.556l1.873.764c.518.211.766.801.556 1.318-.211.518-.802.767-1.318.556l-1.874-.764zm3.557-6.149c-.461.316-1.091.199-1.406-.264-.315-.46-.198-1.09.262-1.405l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.406l-1.668 1.144zm9.028 3.739c-.767-.312-1.137-1.188-.824-1.956.314-.766 1.189-1.135 1.956-.823l2.778 1.134c.767.312 1.136 1.186.824 1.953-.312.768-1.188 1.137-1.956.824l-2.778-1.132zm-6.184 6.052c.522-.199 1.106.062 1.306.586.197.519-.066 1.105-.588 1.303l-1.892.721c-.519.199-1.104-.063-1.302-.586-.2-.524.062-1.107.585-1.307l1.891-.717z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M24 21H12c-1.104 0-2 .896-2 2v11.812c2.384.224 5.107.188 8 .188s5.616.036 8-.188V23c0-1.104-.896-2-2-2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35 26c0 9.389-7.609 9-17 9s-17 .389-17-9C1 18 9 7 14 3c2.75-2 5.129-2.051 8 0 7 5 13 18 13 23z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M27.258 29.642c-.461.316-1.091.199-1.406-.263-.316-.46-.198-1.091.262-1.406l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.405l-1.668 1.145zm2.438-7.095c-.512-.207-.758-.792-.549-1.303.209-.512.793-.758 1.304-.549l1.852.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.852-.755zm-4.494-5.256c-.519-.21-.767-.801-.555-1.318.209-.517.801-.766 1.316-.556l1.875.764c.516.211.765.801.554 1.318-.211.517-.8.766-1.318.555l-1.872-.763zm-21.001 7c-.517-.21-.766-.801-.554-1.318.21-.517.801-.766 1.317-.556l1.873.764c.518.211.766.801.556 1.318-.211.518-.802.767-1.318.556l-1.874-.764zm3.557-6.149c-.461.316-1.091.199-1.406-.264-.315-.46-.198-1.09.262-1.405l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.406l-1.668 1.144zm9.028 3.739c-.767-.312-1.137-1.188-.824-1.956.314-.766 1.189-1.135 1.956-.823l2.778 1.134c.767.312 1.136 1.186.824 1.953-.312.768-1.188 1.137-1.956.824l-2.778-1.132zm-6.184 6.052c.522-.199 1.106.062 1.306.586.197.519-.066 1.105-.588 1.303l-1.892.721c-.519.199-1.104-.063-1.302-.586-.2-.524.062-1.107.585-1.307l1.891-.717z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24 21H12c-1.104 0-2 .896-2 2v11.812c2.384.224 5.107.188 8 .188s5.616.036 8-.188V23c0-1.104-.896-2-2-2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#EEE" d="M35 26c0 9.389-7.609 9-17 9s-17 .389-17-9C1 18 9 7 14 3c2.75-2 5.129-2.051 8 0 7 5 13 18 13 23z"/>
   <path fill="#CCD6DD" d="M27.258 29.642c-.461.316-1.091.199-1.406-.263-.316-.46-.198-1.091.262-1.406l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.405l-1.668 1.145zm2.438-7.095c-.512-.207-.758-.792-.549-1.303.209-.512.793-.758 1.304-.549l1.852.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.852-.755zm-4.494-5.256c-.519-.21-.767-.801-.555-1.318.209-.517.801-.766 1.316-.556l1.875.764c.516.211.765.801.554 1.318-.211.517-.8.766-1.318.555l-1.872-.763zm-21.001 7c-.517-.21-.766-.801-.554-1.318.21-.517.801-.766 1.317-.556l1.873.764c.518.211.766.801.556 1.318-.211.518-.802.767-1.318.556l-1.874-.764zm3.557-6.149c-.461.316-1.091.199-1.406-.264-.315-.46-.198-1.09.262-1.405l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.406l-1.668 1.144zm9.028 3.739c-.767-.312-1.137-1.188-.824-1.956.314-.766 1.189-1.135 1.956-.823l2.778 1.134c.767.312 1.136 1.186.824 1.953-.312.768-1.188 1.137-1.956.824l-2.778-1.132zm-6.184 6.052c.522-.199 1.106.062 1.306.586.197.519-.066 1.105-.588 1.303l-1.892.721c-.519.199-1.104-.063-1.302-.586-.2-.524.062-1.107.585-1.307l1.891-.717z"/>
diff --git a/public/emoji/1f35a_border.svg b/public/emoji/1f35a_border.svg
index d6621c590..90e4e652f 100644
--- a/public/emoji/1f35a_border.svg
+++ b/public/emoji/1f35a_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M18 36C3.042 36 1 21 1 17h34c0 2-1.958 19-17 19z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <ellipse cx="18" cy="17.056" rx="17" ry="9.444" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M18 25c-6 0-16-3-16-8C2 11 8.125 4 18 4s16 8 16 13-9 8-16 8z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M15.41 19.892c.419.359.468.991.108 1.41-.359.419-.991.468-1.41.108l-1.519-1.302c-.419-.359-.468-.991-.108-1.41.359-.419.991-.468 1.41-.108l1.519 1.302zm-8.127-1.507c-.304.46-.925.587-1.386.283-.46-.305-.587-.925-.283-1.386l1.103-1.669c.305-.461.925-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm23 0c-.305.46-.926.587-1.387.283-.46-.305-.587-.925-.282-1.386l1.103-1.669c.305-.461.926-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm-6.103-3.606c.11.541-.239 1.069-.78 1.18-.541.11-1.069-.239-1.18-.78l-.399-1.96c-.11-.541.238-1.069.78-1.179.541-.111 1.069.239 1.179.78l.4 1.959zm-7.54-3.958c-.345-.14-.511-.534-.37-.879.14-.344.534-.51.878-.37l1.249.509c.345.14.51.533.37.878-.141.345-.534.511-.879.37l-1.248-.508zm-9.296 1.567c-.307.211-.727.133-.938-.175-.21-.307-.132-.727.175-.937l1.113-.762c.307-.21.726-.132.937.175.21.307.132.727-.175.938l-1.112.761zm13.593 8.545c-.551-.036-.969-.513-.933-1.064.037-.55.513-.968 1.062-.933l1.997.131c.55.035.969.512.933 1.062-.035.551-.511.97-1.062.933l-1.997-.129zm-9.241-6.386c-.512-.208-.758-.793-.549-1.304.209-.511.793-.757 1.304-.549l1.853.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.853-.754zm15.945-2.726c-.346-.14-.512-.534-.37-.879.14-.344.534-.51.878-.37l1.25.509c.344.14.51.533.369.878-.141.345-.533.511-.879.37l-1.248-.508z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M18 36C3.042 36 1 21 1 17h34c0 2-1.958 19-17 19z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <ellipse cx="18" cy="17.056" rx="17" ry="9.444" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M18 25c-6 0-16-3-16-8C2 11 8.125 4 18 4s16 8 16 13-9 8-16 8z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15.41 19.892c.419.359.468.991.108 1.41-.359.419-.991.468-1.41.108l-1.519-1.302c-.419-.359-.468-.991-.108-1.41.359-.419.991-.468 1.41-.108l1.519 1.302zm-8.127-1.507c-.304.46-.925.587-1.386.283-.46-.305-.587-.925-.283-1.386l1.103-1.669c.305-.461.925-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm23 0c-.305.46-.926.587-1.387.283-.46-.305-.587-.925-.282-1.386l1.103-1.669c.305-.461.926-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm-6.103-3.606c.11.541-.239 1.069-.78 1.18-.541.11-1.069-.239-1.18-.78l-.399-1.96c-.11-.541.238-1.069.78-1.179.541-.111 1.069.239 1.179.78l.4 1.959zm-7.54-3.958c-.345-.14-.511-.534-.37-.879.14-.344.534-.51.878-.37l1.249.509c.345.14.51.533.37.878-.141.345-.534.511-.879.37l-1.248-.508zm-9.296 1.567c-.307.211-.727.133-.938-.175-.21-.307-.132-.727.175-.937l1.113-.762c.307-.21.726-.132.937.175.21.307.132.727-.175.938l-1.112.761zm13.593 8.545c-.551-.036-.969-.513-.933-1.064.037-.55.513-.968 1.062-.933l1.997.131c.55.035.969.512.933 1.062-.035.551-.511.97-1.062.933l-1.997-.129zm-9.241-6.386c-.512-.208-.758-.793-.549-1.304.209-.511.793-.757 1.304-.549l1.853.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.853-.754zm15.945-2.726c-.346-.14-.512-.534-.37-.879.14-.344.534-.51.878-.37l1.25.509c.344.14.51.533.369.878-.141.345-.533.511-.879.37l-1.248-.508z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#DD2E44" d="M18 36C3.042 36 1 21 1 17h34c0 2-1.958 19-17 19z"/>
   <ellipse fill="#A0041E" cx="18" cy="17.056" rx="17" ry="9.444"/>
diff --git a/public/emoji/1f365_border.svg b/public/emoji/1f365_border.svg
index 278cebd43..5e25f2ff9 100644
--- a/public/emoji/1f365_border.svg
+++ b/public/emoji/1f365_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M22.235 35.662c-.418 0-.83-.123-1.182-.361l-2.96-2.007-2.959 2.007c-.354.238-.766.361-1.184.361-.183 0-.365-.023-.546-.072-.589-.156-1.084-.562-1.351-1.113l-1.721-2.393-3.405-.568c-.05.003-.101.005-.151.005-.558 0-1.096-.222-1.491-.617-.433-.435-.657-1.032-.614-1.642l.256-3.567-3.215-1.56c-.551-.266-.958-.762-1.116-1.353-.159-.591-.053-1.221.291-1.729l1.152-2.928-1.152-2.991c-.343-.507-.45-1.137-.291-1.729.159-.589.565-1.084 1.116-1.351l3.215-1.561-.254-3.564c-.043-.612.181-1.212.614-1.642.395-.397.933-.618 1.491-.618.05 0 .101 0 .151.004l3.28-.506 1.846-2.452c.267-.551.761-.958 1.351-1.116.181-.048.363-.073.546-.073.418 0 .83.125 1.184.363l2.959 2.005 2.96-2.005c.352-.239.764-.363 1.182-.363.183 0 .369.025.545.073.592.159 1.088.565 1.354 1.116L26 4.042l3.262.631c.048-.004.1-.004.149-.004.558 0 1.094.221 1.493.618.431.43.656 1.03.612 1.642l-.26 3.565 3.221 1.561c.551.267.957.761 1.113 1.351.158.592.055 1.223-.289 1.729l-.926 2.908.926 3.011c.344.508.447 1.138.289 1.729-.156.591-.562 1.087-1.113 1.353l-3.221 1.56.26 3.567c.044.609-.182 1.206-.612 1.642-.399.396-.935.617-1.493.617-.049 0-.101-.002-.149-.005l-3.22.526-1.908 2.435c-.266.551-.762.957-1.354 1.113-.176.049-.362.071-.545.071z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M18.5 28.709c-3.708.041-8.167-2.875-7.792-8.37.133-1.959.903-3.779 2.341-5.116 2.543-2.365 6.538-2.219 8.903.324.986 1.061 1.5 2.443 1.447 3.891-.052 1.447-.665 2.788-1.727 3.774-.918.853-2.104 1.302-3.365 1.253-1.253-.046-2.413-.577-3.266-1.495-.785-.844-1.059-2.045-.733-3.214.331-1.188 1.219-2.095 2.375-2.425.532-.151 1.123-.236 1.275.294.152.531-.38.757-1.083 1.25-.833.584-1.292 1.667-.368 2.733.471.544 1.155.831 1.874.857.716.024 1.405-.228 1.931-.719.669-.622 1.057-1.469 1.09-2.383.033-.914-.292-1.786-.914-2.456-1.615-1.736-4.34-1.836-6.077-.221-1.046.973-1.652 2.295-1.704 3.724-.052 1.429.455 2.791 1.428 3.838 1.202 1.293 2.835 2.04 4.6 2.104 1.764.07 3.447-.562 4.74-1.765 1.588-1.476 2.506-3.483 2.585-5.649.079-2.167-.691-4.234-2.167-5.822-3.725-4.008-8.601-4.952-13.643-1.91-.763.463-1.401 1.139-1.833.794-.208-.167-.314-.481.09-.857 4.815-4.478 12.376-4.201 16.851.614 1.84 1.979 2.919 4.562 2.7 7.257-.683 8.403-6.558 9.861-9.558 9.695z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M22.235 35.662c-.418 0-.83-.123-1.182-.361l-2.96-2.007-2.959 2.007c-.354.238-.766.361-1.184.361-.183 0-.365-.023-.546-.072-.589-.156-1.084-.562-1.351-1.113l-1.721-2.393-3.405-.568c-.05.003-.101.005-.151.005-.558 0-1.096-.222-1.491-.617-.433-.435-.657-1.032-.614-1.642l.256-3.567-3.215-1.56c-.551-.266-.958-.762-1.116-1.353-.159-.591-.053-1.221.291-1.729l1.152-2.928-1.152-2.991c-.343-.507-.45-1.137-.291-1.729.159-.589.565-1.084 1.116-1.351l3.215-1.561-.254-3.564c-.043-.612.181-1.212.614-1.642.395-.397.933-.618 1.491-.618.05 0 .101 0 .151.004l3.28-.506 1.846-2.452c.267-.551.761-.958 1.351-1.116.181-.048.363-.073.546-.073.418 0 .83.125 1.184.363l2.959 2.005 2.96-2.005c.352-.239.764-.363 1.182-.363.183 0 .369.025.545.073.592.159 1.088.565 1.354 1.116L26 4.042l3.262.631c.048-.004.1-.004.149-.004.558 0 1.094.221 1.493.618.431.43.656 1.03.612 1.642l-.26 3.565 3.221 1.561c.551.267.957.761 1.113 1.351.158.592.055 1.223-.289 1.729l-.926 2.908.926 3.011c.344.508.447 1.138.289 1.729-.156.591-.562 1.087-1.113 1.353l-3.221 1.56.26 3.567c.044.609-.182 1.206-.612 1.642-.399.396-.935.617-1.493.617-.049 0-.101-.002-.149-.005l-3.22.526-1.908 2.435c-.266.551-.762.957-1.354 1.113-.176.049-.362.071-.545.071z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M18.5 28.709c-3.708.041-8.167-2.875-7.792-8.37.133-1.959.903-3.779 2.341-5.116 2.543-2.365 6.538-2.219 8.903.324.986 1.061 1.5 2.443 1.447 3.891-.052 1.447-.665 2.788-1.727 3.774-.918.853-2.104 1.302-3.365 1.253-1.253-.046-2.413-.577-3.266-1.495-.785-.844-1.059-2.045-.733-3.214.331-1.188 1.219-2.095 2.375-2.425.532-.151 1.123-.236 1.275.294.152.531-.38.757-1.083 1.25-.833.584-1.292 1.667-.368 2.733.471.544 1.155.831 1.874.857.716.024 1.405-.228 1.931-.719.669-.622 1.057-1.469 1.09-2.383.033-.914-.292-1.786-.914-2.456-1.615-1.736-4.34-1.836-6.077-.221-1.046.973-1.652 2.295-1.704 3.724-.052 1.429.455 2.791 1.428 3.838 1.202 1.293 2.835 2.04 4.6 2.104 1.764.07 3.447-.562 4.74-1.765 1.588-1.476 2.506-3.483 2.585-5.649.079-2.167-.691-4.234-2.167-5.822-3.725-4.008-8.601-4.952-13.643-1.91-.763.463-1.401 1.139-1.833.794-.208-.167-.314-.481.09-.857 4.815-4.478 12.376-4.201 16.851.614 1.84 1.979 2.919 4.562 2.7 7.257-.683 8.403-6.558 9.861-9.558 9.695z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E1E8ED" d="M22.235 35.662c-.418 0-.83-.123-1.182-.361l-2.96-2.007-2.959 2.007c-.354.238-.766.361-1.184.361-.183 0-.365-.023-.546-.072-.589-.156-1.084-.562-1.351-1.113l-1.721-2.393-3.405-.568c-.05.003-.101.005-.151.005-.558 0-1.096-.222-1.491-.617-.433-.435-.657-1.032-.614-1.642l.256-3.567-3.215-1.56c-.551-.266-.958-.762-1.116-1.353-.159-.591-.053-1.221.291-1.729l1.152-2.928-1.152-2.991c-.343-.507-.45-1.137-.291-1.729.159-.589.565-1.084 1.116-1.351l3.215-1.561-.254-3.564c-.043-.612.181-1.212.614-1.642.395-.397.933-.618 1.491-.618.05 0 .101 0 .151.004l3.28-.506 1.846-2.452c.267-.551.761-.958 1.351-1.116.181-.048.363-.073.546-.073.418 0 .83.125 1.184.363l2.959 2.005 2.96-2.005c.352-.239.764-.363 1.182-.363.183 0 .369.025.545.073.592.159 1.088.565 1.354 1.116L26 4.042l3.262.631c.048-.004.1-.004.149-.004.558 0 1.094.221 1.493.618.431.43.656 1.03.612 1.642l-.26 3.565 3.221 1.561c.551.267.957.761 1.113 1.351.158.592.055 1.223-.289 1.729l-.926 2.908.926 3.011c.344.508.447 1.138.289 1.729-.156.591-.562 1.087-1.113 1.353l-3.221 1.56.26 3.567c.044.609-.182 1.206-.612 1.642-.399.396-.935.617-1.493.617-.049 0-.101-.002-.149-.005l-3.22.526-1.908 2.435c-.266.551-.762.957-1.354 1.113-.176.049-.362.071-.545.071z"/>
   <path fill="#D372B8" d="M18.5 28.709c-3.708.041-8.167-2.875-7.792-8.37.133-1.959.903-3.779 2.341-5.116 2.543-2.365 6.538-2.219 8.903.324.986 1.061 1.5 2.443 1.447 3.891-.052 1.447-.665 2.788-1.727 3.774-.918.853-2.104 1.302-3.365 1.253-1.253-.046-2.413-.577-3.266-1.495-.785-.844-1.059-2.045-.733-3.214.331-1.188 1.219-2.095 2.375-2.425.532-.151 1.123-.236 1.275.294.152.531-.38.757-1.083 1.25-.833.584-1.292 1.667-.368 2.733.471.544 1.155.831 1.874.857.716.024 1.405-.228 1.931-.719.669-.622 1.057-1.469 1.09-2.383.033-.914-.292-1.786-.914-2.456-1.615-1.736-4.34-1.836-6.077-.221-1.046.973-1.652 2.295-1.704 3.724-.052 1.429.455 2.791 1.428 3.838 1.202 1.293 2.835 2.04 4.6 2.104 1.764.07 3.447-.562 4.74-1.765 1.588-1.476 2.506-3.483 2.585-5.649.079-2.167-.691-4.234-2.167-5.822-3.725-4.008-8.601-4.952-13.643-1.91-.763.463-1.401 1.139-1.833.794-.208-.167-.314-.481.09-.857 4.815-4.478 12.376-4.201 16.851.614 1.84 1.979 2.919 4.562 2.7 7.257-.683 8.403-6.558 9.861-9.558 9.695z"/>
diff --git a/public/emoji/1f3d0_border.svg b/public/emoji/1f3d0_border.svg
index c1804f2cb..f0127342a 100644
--- a/public/emoji/1f3d0_border.svg
+++ b/public/emoji/1f3d0_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <circle cx="18" cy="18" r="18" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M32.809 7.779c-2.156-.087-5.324.186-8.21 1.966-.009.005-.019.004-.028.009-.02.011-.031.03-.05.042-2.148 1.348-4.131 3.539-5.411 7.054-2.395-.049-4.569-.286-6.488-.715C16.789 4.13 25.77 3.83 29.699 4.337c-.91-.78-1.894-1.473-2.948-2.061-5.071.24-12.398 2.611-16.065 13.335-1.797-.578-3.319-1.35-4.534-2.312.051-.075.098-.155.128-.246C9.604 2.972 18.478.735 21.108.286 20.097.11 19.062 0 18 0c-1.037 0-2.046.107-3.035.275C11.227 2.109 6.884 5.52 4.609 11.794 3.499 10.42 3.071 9.078 2.91 8.206c-.501.771-.943 1.583-1.323 2.43.425.984 1.077 2.074 2.096 3.137 3.168 3.307 8.495 5.01 15.807 5.088.641 2.235.969 4.287 1.064 6.152-11.714.419-17.645-4.414-20.49-8.277C.035 17.155 0 17.573 0 18c0 .589.033 1.171.088 1.746 3.422 3.627 9.303 7.297 19.114 7.297.445 0 .907-.016 1.368-.032-.07 1.93-.382 3.629-.817 5.094-9.528-.256-14.941-3.361-17.932-6.255.931 1.915 2.182 3.641 3.698 5.102 3.275 1.666 7.681 2.906 13.566 3.029-.316.757-.654 1.429-.99 2.014.8-.004 1.583-.076 2.356-.181 1.828-3.749 3.305-9.756.842-17.938l-.197-.613c.91-2.363 2.181-4.011 3.592-5.144 4.465 9.084 2.105 17.699-.101 22.62.94-.37 1.837-.82 2.692-1.336 2.027-5.501 3.435-13.744-.906-22.383 1.404-.729 2.848-1.075 4.144-1.213.008.014.008.031.017.045 4.295 6.693 2.406 15.067-.073 21.119 1.599-1.536 2.906-3.364 3.853-5.399 1.399-6.064.893-11.461-1.516-15.822.486.027.91.073 1.248.122-.369-.726-.777-1.428-1.237-2.093z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="18" cy="18" r="18" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M32.809 7.779c-2.156-.087-5.324.186-8.21 1.966-.009.005-.019.004-.028.009-.02.011-.031.03-.05.042-2.148 1.348-4.131 3.539-5.411 7.054-2.395-.049-4.569-.286-6.488-.715C16.789 4.13 25.77 3.83 29.699 4.337c-.91-.78-1.894-1.473-2.948-2.061-5.071.24-12.398 2.611-16.065 13.335-1.797-.578-3.319-1.35-4.534-2.312.051-.075.098-.155.128-.246C9.604 2.972 18.478.735 21.108.286 20.097.11 19.062 0 18 0c-1.037 0-2.046.107-3.035.275C11.227 2.109 6.884 5.52 4.609 11.794 3.499 10.42 3.071 9.078 2.91 8.206c-.501.771-.943 1.583-1.323 2.43.425.984 1.077 2.074 2.096 3.137 3.168 3.307 8.495 5.01 15.807 5.088.641 2.235.969 4.287 1.064 6.152-11.714.419-17.645-4.414-20.49-8.277C.035 17.155 0 17.573 0 18c0 .589.033 1.171.088 1.746 3.422 3.627 9.303 7.297 19.114 7.297.445 0 .907-.016 1.368-.032-.07 1.93-.382 3.629-.817 5.094-9.528-.256-14.941-3.361-17.932-6.255.931 1.915 2.182 3.641 3.698 5.102 3.275 1.666 7.681 2.906 13.566 3.029-.316.757-.654 1.429-.99 2.014.8-.004 1.583-.076 2.356-.181 1.828-3.749 3.305-9.756.842-17.938l-.197-.613c.91-2.363 2.181-4.011 3.592-5.144 4.465 9.084 2.105 17.699-.101 22.62.94-.37 1.837-.82 2.692-1.336 2.027-5.501 3.435-13.744-.906-22.383 1.404-.729 2.848-1.075 4.144-1.213.008.014.008.031.017.045 4.295 6.693 2.406 15.067-.073 21.119 1.599-1.536 2.906-3.364 3.853-5.399 1.399-6.064.893-11.461-1.516-15.822.486.027.91.073 1.248.122-.369-.726-.777-1.428-1.237-2.093z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <circle fill="#E6E7E8" cx="18" cy="18" r="18"/>
   <path fill="#99AAB5" d="M32.809 7.779c-2.156-.087-5.324.186-8.21 1.966-.009.005-.019.004-.028.009-.02.011-.031.03-.05.042-2.148 1.348-4.131 3.539-5.411 7.054-2.395-.049-4.569-.286-6.488-.715C16.789 4.13 25.77 3.83 29.699 4.337c-.91-.78-1.894-1.473-2.948-2.061-5.071.24-12.398 2.611-16.065 13.335-1.797-.578-3.319-1.35-4.534-2.312.051-.075.098-.155.128-.246C9.604 2.972 18.478.735 21.108.286 20.097.11 19.062 0 18 0c-1.037 0-2.046.107-3.035.275C11.227 2.109 6.884 5.52 4.609 11.794 3.499 10.42 3.071 9.078 2.91 8.206c-.501.771-.943 1.583-1.323 2.43.425.984 1.077 2.074 2.096 3.137 3.168 3.307 8.495 5.01 15.807 5.088.641 2.235.969 4.287 1.064 6.152-11.714.419-17.645-4.414-20.49-8.277C.035 17.155 0 17.573 0 18c0 .589.033 1.171.088 1.746 3.422 3.627 9.303 7.297 19.114 7.297.445 0 .907-.016 1.368-.032-.07 1.93-.382 3.629-.817 5.094-9.528-.256-14.941-3.361-17.932-6.255.931 1.915 2.182 3.641 3.698 5.102 3.275 1.666 7.681 2.906 13.566 3.029-.316.757-.654 1.429-.99 2.014.8-.004 1.583-.076 2.356-.181 1.828-3.749 3.305-9.756.842-17.938l-.197-.613c.91-2.363 2.181-4.011 3.592-5.144 4.465 9.084 2.105 17.699-.101 22.62.94-.37 1.837-.82 2.692-1.336 2.027-5.501 3.435-13.744-.906-22.383 1.404-.729 2.848-1.075 4.144-1.213.008.014.008.031.017.045 4.295 6.693 2.406 15.067-.073 21.119 1.599-1.536 2.906-3.364 3.853-5.399 1.399-6.064.893-11.461-1.516-15.822.486.027.91.073 1.248.122-.369-.726-.777-1.428-1.237-2.093z"/>
diff --git a/public/emoji/1f3f3-fe0f-200d-1f308.svg b/public/emoji/1f3f3-fe0f-200d-1f308.svg
index 1969e4971..b1f9bbff2 100644
--- a/public/emoji/1f3f3-fe0f-200d-1f308.svg
+++ b/public/emoji/1f3f3-fe0f-200d-1f308.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#880082" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-.5H0v.5z"/><path fill="#3558A0" d="M0 22.07h36v4.6H0z"/><path fill="#138F3E" d="M0 17.83h36v4.5H0z"/><path fill="#FAD220" d="M0 13.5h36V18H0z"/><path fill="#FF5000" d="M0 9.17h36v4.5H0z"/><path fill="#FF000E" d="M32 5H4C1.791 5 0 6.791 0 9v.33h36V9c0-2.209-1.791-4-4-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#880082" d="M0 27a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4v-.5H0v.5z"/><path fill="#3558A0" d="M0 22.07h36v4.6H0z"/><path fill="#138F3E" d="M0 17.83h36v4.5H0z"/><path fill="#FAD220" d="M0 13.5h36V18H0z"/><path fill="#FF7300" d="M0 9.17h36v4.5H0z"/><path fill="#FF000E" d="M32 5H4a4 4 0 0 0-4 4v.33h36V9a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f3f3_border.svg b/public/emoji/1f3f3_border.svg
index e7d03583b..e059cd378 100644
--- a/public/emoji/1f3f3_border.svg
+++ b/public/emoji/1f3f3_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M32.415 3.09c-1.752-.799-3.615-1.187-5.698-1.187-2.518 0-5.02.57-7.438 1.122-2.418.551-4.702 1.072-6.995 1.072-1.79 0-3.382-.329-4.868-1.006-.309-.142-.67-.115-.956.068C6.173 3.343 6 3.66 6 4v19c0 .392.229.747.585.91 1.752.799 3.616 1.187 5.698 1.187 2.518 0 5.02-.57 7.438-1.122 2.418-.551 4.702-1.071 6.995-1.071 1.79 0 3.383.329 4.868 1.007.311.14.67.115.956-.069.287-.185.46-.502.46-.842V4c0-.392-.229-.748-.585-.91z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M32.415 3.09c-1.752-.799-3.615-1.187-5.698-1.187-2.518 0-5.02.57-7.438 1.122-2.418.551-4.702 1.072-6.995 1.072-1.79 0-3.382-.329-4.868-1.006-.309-.142-.67-.115-.956.068C6.173 3.343 6 3.66 6 4v19c0 .392.229.747.585.91 1.752.799 3.616 1.187 5.698 1.187 2.518 0 5.02-.57 7.438-1.122 2.418-.551 4.702-1.071 6.995-1.071 1.79 0 3.383.329 4.868 1.007.311.14.67.115.956-.069.287-.185.46-.502.46-.842V4c0-.392-.229-.748-.585-.91z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#8899A6" d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z"/>
   <path fill="#AAB8C2" d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z"/>
diff --git a/public/emoji/1f40f_border.svg b/public/emoji/1f40f_border.svg
index fb4bbcfb3..72526503f 100644
--- a/public/emoji/1f40f_border.svg
+++ b/public/emoji/1f40f_border.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M25 35c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S30 26.896 30 28c0 0-2.25 7-5 7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M28 36c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S33 27.896 33 29c0 0-2.25 7-5 7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M14 35c-2.75 0-4-6-4-6 0-1.104 2.646-2 3.75-2S17 26.896 17 28c0 0-.25 7-3 7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M17 36c-2.75 0-4-6-4-6 0-1.104 2.646-2 3.75-2S20 27.896 20 29c0 0-.25 7-3 7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M35.75 21.384c0 7.782-4.495 11.408-14.519 11.408-10.023 0-13.481-3.626-13.481-11.408 0-7.783 3.458-11.407 13.481-11.407 10.024 0 14.519 3.624 14.519 11.407z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M17 17.667C17 27 12.345 29 8.042 29 3.738 29 1 22.36 1 17.667 1 12.973 3.738 12 8.042 12c4.303 0 8.958.973 8.958 5.667z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="4.5" cy="20.5" r="1.5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M15.75 12.75C14 16 13.622 15.356 8.622 17.356 5.545 18.587 0 18.25 0 13.5 0 11.567 3.687 11 7 11c3.314 0 10.409-1.332 8.75 1.75z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M16 13.696c3.353 2.427 5.43 6.139 3.724 11.089-1.367 3.967-6.816 3.115-9.616 1.127-2.799-1.988-2.643-4.792-1.733-6.291.909-1.497 4.158-1.229 6.024.097.934.663.287 1.559-.721 1.068-2.292-1.118-3.037 1.443-1.246 2.882 1.266 1.016 3.275 1.049 3.655-1.01.671-3.63-3.505-6.274-7.465-5.302C11 16 13.161 11.641 16 13.696z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25 35c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S30 26.896 30 28c0 0-2.25 7-5 7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28 36c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S33 27.896 33 29c0 0-2.25 7-5 7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M14 35c-2.75 0-4-6-4-6 0-1.104 2.646-2 3.75-2S17 26.896 17 28c0 0-.25 7-3 7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17 36c-2.75 0-4-6-4-6 0-1.104 2.646-2 3.75-2S20 27.896 20 29c0 0-.25 7-3 7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35.75 21.384c0 7.782-4.495 11.408-14.519 11.408-10.023 0-13.481-3.626-13.481-11.408 0-7.783 3.458-11.407 13.481-11.407 10.024 0 14.519 3.624 14.519 11.407z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17 17.667C17 27 12.345 29 8.042 29 3.738 29 1 22.36 1 17.667 1 12.973 3.738 12 8.042 12c4.303 0 8.958.973 8.958 5.667z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="4.5" cy="20.5" r="1.5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15.75 12.75C14 16 13.622 15.356 8.622 17.356 5.545 18.587 0 18.25 0 13.5 0 11.567 3.687 11 7 11c3.314 0 10.409-1.332 8.75 1.75z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M16 13.696c3.353 2.427 5.43 6.139 3.724 11.089-1.367 3.967-6.816 3.115-9.616 1.127-2.799-1.988-2.643-4.792-1.733-6.291.909-1.497 4.158-1.229 6.024.097.934.663.287 1.559-.721 1.068-2.292-1.118-3.037 1.443-1.246 2.882 1.266 1.016 3.275 1.049 3.655-1.01.671-3.63-3.505-6.274-7.465-5.302C11 16 13.161 11.641 16 13.696z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#292F33" d="M25 35c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S30 26.896 30 28c0 0-2.25 7-5 7z"/>
   <path fill="#66757F" d="M28 36c-2.75 0-2-6-2-6 0-1.104 2.646-2 3.75-2S33 27.896 33 29c0 0-2.25 7-5 7z"/>
diff --git a/public/emoji/1f410_border.svg b/public/emoji/1f410_border.svg
index 7a36382b5..d1463386c 100644
--- a/public/emoji/1f410_border.svg
+++ b/public/emoji/1f410_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M7.44 7.503c-1-4 3.687-6 8-4 .907.421.948 1.316 0 1-3-1-6 1-4 4 1.109 1.664-3.233 2.068-4-1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M6.136 5.785c-1-4 3.687-6 8-4 .907.421.949 1.316 0 1-3-1-6 1-4 4 1.11 1.664-3.233 2.067-4-1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M5 14.785c0 4-2 4.827-2 4 0-2-1 0-1-1v-3c0-1.657.671-3 1.5-3s1.5 1.343 1.5 3z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M35.159 10.49c-.68-1.643-2.313-2.705-4.159-2.705-.553 0-1 .448-1 1s.447 1 1 1c1.034 0 1.941.577 2.312 1.471.341.824.168 1.758-.455 2.647-.984-1.506-2.602-2.618-4.856-2.618-2.391 0-7.279.714-10.828 1.289-.052-.094-.105-.188-.172-.289-2-3-4-8.157-7-8.157-4 0-10 4.986-10 9.157 0 2.544 5.738 2.929 7.486 2.988.697 1.43 1.414 2.934 2.232 4.33.066.205.155.429.282.683 3 6 3.119 14.5 4.5 14.5s2.5-4.857 2.5-9c0-.151-.004-.299-.007-.447 3.126.649 6.607.322 9.677-.61 1.448 5.045 1.77 10.058 2.83 10.058 1.342 0 2.433-8.818 2.494-13.12C33.316 21.226 34 19.51 34 17.785c0-.605-.086-1.23-.248-1.843 1.614-1.644 2.143-3.676 1.407-5.452z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="7" cy="9.285" r="1" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M7.44 7.503c-1-4 3.687-6 8-4 .907.421.948 1.316 0 1-3-1-6 1-4 4 1.109 1.664-3.233 2.068-4-1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M6.136 5.785c-1-4 3.687-6 8-4 .907.421.949 1.316 0 1-3-1-6 1-4 4 1.11 1.664-3.233 2.067-4-1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5 14.785c0 4-2 4.827-2 4 0-2-1 0-1-1v-3c0-1.657.671-3 1.5-3s1.5 1.343 1.5 3z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35.159 10.49c-.68-1.643-2.313-2.705-4.159-2.705-.553 0-1 .448-1 1s.447 1 1 1c1.034 0 1.941.577 2.312 1.471.341.824.168 1.758-.455 2.647-.984-1.506-2.602-2.618-4.856-2.618-2.391 0-7.279.714-10.828 1.289-.052-.094-.105-.188-.172-.289-2-3-4-8.157-7-8.157-4 0-10 4.986-10 9.157 0 2.544 5.738 2.929 7.486 2.988.697 1.43 1.414 2.934 2.232 4.33.066.205.155.429.282.683 3 6 3.119 14.5 4.5 14.5s2.5-4.857 2.5-9c0-.151-.004-.299-.007-.447 3.126.649 6.607.322 9.677-.61 1.448 5.045 1.77 10.058 2.83 10.058 1.342 0 2.433-8.818 2.494-13.12C33.316 21.226 34 19.51 34 17.785c0-.605-.086-1.23-.248-1.843 1.614-1.644 2.143-3.676 1.407-5.452z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="7" cy="9.285" r="1" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#FFAC33" d="M7.44 7.503c-1-4 3.687-6 8-4 .907.421.948 1.316 0 1-3-1-6 1-4 4 1.109 1.664-3.233 2.068-4-1z"/>
   <path fill="#FFCC4D" d="M6.136 5.785c-1-4 3.687-6 8-4 .907.421.949 1.316 0 1-3-1-6 1-4 4 1.11 1.664-3.233 2.067-4-1z"/>
diff --git a/public/emoji/1f411_border.svg b/public/emoji/1f411_border.svg
index dc4ddeb08..8455c601e 100644
--- a/public/emoji/1f411_border.svg
+++ b/public/emoji/1f411_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M11.983 3.562c4.543-.262 7.824 1.597 8.089 6.826.215 4.19-5.184 6.79-8.046 6.879-2.462.077-1.353-1.852.61-2.334 1.576-.387 4.124-2.413 3.602-4.44-.597-2.32-4.315-2.684-6.351.292-.798 1.167-3.554.873-4.096-.434-.958-2.309 1.211-6.502 6.192-6.789z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M35.75 21.384c0-7.783-4.495-11.407-14.519-11.407-1.087 0-2.083.051-3.018.137-1.36-2.423-4.845-2.828-8.213-2.828-4.304 0-10 6.145-10 10.839 0 4.608 3.606 4.866 7.811 4.874.233 3.245 1.226 5.647 3.249 7.26C11.337 31.409 12.594 36 15 36c1.353 0 2.099-1.695 2.51-3.417 1.128.136 2.359.209 3.722.209 1.733 0 3.288-.116 4.695-.335C26.017 34.114 26.458 36 28 36c2.317 0 4.273-4.956 4.834-6.521 1.969-1.87 2.916-4.545 2.916-8.095z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="4.5" cy="15.786" r="1.5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M17.562 4.339c4.312 1.455 5.74 4.148 4.034 9.099-1.367 3.967-7.345 4.361-10.034 3.375C9.25 15.964 11 14.589 13 14.875c1.606.23 4.727-.698 5-2.773C18.312 9.727 15 8 12 10c-1.177.785-5.774.43-5.5-.958.638-3.226 6.335-6.298 11.062-4.703z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11.983 3.562c4.543-.262 7.824 1.597 8.089 6.826.215 4.19-5.184 6.79-8.046 6.879-2.462.077-1.353-1.852.61-2.334 1.576-.387 4.124-2.413 3.602-4.44-.597-2.32-4.315-2.684-6.351.292-.798 1.167-3.554.873-4.096-.434-.958-2.309 1.211-6.502 6.192-6.789z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35.75 21.384c0-7.783-4.495-11.407-14.519-11.407-1.087 0-2.083.051-3.018.137-1.36-2.423-4.845-2.828-8.213-2.828-4.304 0-10 6.145-10 10.839 0 4.608 3.606 4.866 7.811 4.874.233 3.245 1.226 5.647 3.249 7.26C11.337 31.409 12.594 36 15 36c1.353 0 2.099-1.695 2.51-3.417 1.128.136 2.359.209 3.722.209 1.733 0 3.288-.116 4.695-.335C26.017 34.114 26.458 36 28 36c2.317 0 4.273-4.956 4.834-6.521 1.969-1.87 2.916-4.545 2.916-8.095z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="4.5" cy="15.786" r="1.5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17.562 4.339c4.312 1.455 5.74 4.148 4.034 9.099-1.367 3.967-7.345 4.361-10.034 3.375C9.25 15.964 11 14.589 13 14.875c1.606.23 4.727-.698 5-2.773C18.312 9.727 15 8 12 10c-1.177.785-5.774.43-5.5-.958.638-3.226 6.335-6.298 11.062-4.703z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#FFAC33" d="M11.983 3.562c4.543-.262 7.824 1.597 8.089 6.826.215 4.19-5.184 6.79-8.046 6.879-2.462.077-1.353-1.852.61-2.334 1.576-.387 4.124-2.413 3.602-4.44-.597-2.32-4.315-2.684-6.351.292-.798 1.167-3.554.873-4.096-.434-.958-2.309 1.211-6.502 6.192-6.789z"/>
   <path fill="#E1E8ED" d="M35.75 21.384c0-7.783-4.495-11.407-14.519-11.407-1.087 0-2.083.051-3.018.137-1.36-2.423-4.845-2.828-8.213-2.828-4.304 0-10 6.145-10 10.839 0 4.608 3.606 4.866 7.811 4.874.233 3.245 1.226 5.647 3.249 7.26C11.337 31.409 12.594 36 15 36c1.353 0 2.099-1.695 2.51-3.417 1.128.136 2.359.209 3.722.209 1.733 0 3.288-.116 4.695-.335C26.017 34.114 26.458 36 28 36c2.317 0 4.273-4.956 4.834-6.521 1.969-1.87 2.916-4.545 2.916-8.095z"/>
diff --git a/public/emoji/1f413_border.svg b/public/emoji/1f413_border.svg
index 3391490df..bc9c69bba 100644
--- a/public/emoji/1f413_border.svg
+++ b/public/emoji/1f413_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M24.88 33.097c-.098-.18-.25-.302-.418-.391C22.865 31 24 28.999 24 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.107l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.486-.262.667-.868.404-1.354zm-7 0c-.097-.18-.25-.302-.417-.391C15.866 31 17 28.999 17 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.108l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.485-.262.666-.868.403-1.354zM7.516 10c0 1.104-1.119 2-2.5 2s-3.5-1-3.5-2 2.119-2 3.5-2c1.38 0 2.5.896 2.5 2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M13.516 2c-2-1-3 1-3 1s0-3-3-3-3 3-3 3-3-.938-3 2c0 1.482 1.101 2.411 2.484 2.387V12c0 1 .263 3-.737 4s-2.484 4 .516 4 3-4 3-7c1 1 4 1 4-4 0-.867-.213-1.512-.55-2h1.287c4 0 4-4 2-5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M32.516 9c4 10 0 22-13 22-7.732 0-13-6-14-11-1.177-5.883-1-8-1-12 0-2.738 2.118-4.824 5-4 7 2 5 10 12 10 10 0 8.23-11.923 11-5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="7.516" cy="8" r="1" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24.88 33.097c-.098-.18-.25-.302-.418-.391C22.865 31 24 28.999 24 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.107l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.486-.262.667-.868.404-1.354zm-7 0c-.097-.18-.25-.302-.417-.391C15.866 31 17 28.999 17 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.108l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.485-.262.666-.868.403-1.354zM7.516 10c0 1.104-1.119 2-2.5 2s-3.5-1-3.5-2 2.119-2 3.5-2c1.38 0 2.5.896 2.5 2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M13.516 2c-2-1-3 1-3 1s0-3-3-3-3 3-3 3-3-.938-3 2c0 1.482 1.101 2.411 2.484 2.387V12c0 1 .263 3-.737 4s-2.484 4 .516 4 3-4 3-7c1 1 4 1 4-4 0-.867-.213-1.512-.55-2h1.287c4 0 4-4 2-5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M32.516 9c4 10 0 22-13 22-7.732 0-13-6-14-11-1.177-5.883-1-8-1-12 0-2.738 2.118-4.824 5-4 7 2 5 10 12 10 10 0 8.23-11.923 11-5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="7.516" cy="8" r="1" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#FFAC33" d="M24.88 33.097c-.098-.18-.25-.302-.418-.391C22.865 31 24 28.999 24 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.107l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.486-.262.667-.868.404-1.354zm-7 0c-.097-.18-.25-.302-.417-.391C15.866 31 17 28.999 17 28.999c0-.553 1-2 0-2l-1 1c-1 1-1 4-1 4h-2c-.553 0-1 .447-1 1 0 .553.447 1 1 1h1.108l-.222.12c-.486.263-.667.869-.404 1.355s.869.667 1.356.404l2.639-1.427c.485-.262.666-.868.403-1.354zM7.516 10c0 1.104-1.119 2-2.5 2s-3.5-1-3.5-2 2.119-2 3.5-2c1.38 0 2.5.896 2.5 2z"/>
   <path fill="#DD2E44" d="M13.516 2c-2-1-3 1-3 1s0-3-3-3-3 3-3 3-3-.938-3 2c0 1.482 1.101 2.411 2.484 2.387V12c0 1 .263 3-.737 4s-2.484 4 .516 4 3-4 3-7c1 1 4 1 4-4 0-.867-.213-1.512-.55-2h1.287c4 0 4-4 2-5z"/>
diff --git a/public/emoji/1f414_border.svg b/public/emoji/1f414_border.svg
index ad54bd1b8..92d271691 100644
--- a/public/emoji/1f414_border.svg
+++ b/public/emoji/1f414_border.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M20.143 32.215c0 1.183-.959 2.143-2.143 2.143s-2.143-.96-2.143-2.143c0-1.184.96-2.144 2.143-2.144s2.143.96 2.143 2.144z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M27.643 15.643C27.643 10.317 23.324 6 18 6c-5.326 0-9.643 4.317-9.643 9.643 0 5.357-1.071 16.572-1.071 16.572 0 1.183.959 2.143 2.143 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.96 2.143 2.143 2.143 1.183 0 2.142-.96 2.142-2.143h4.286c0 1.183.96 2.143 2.144 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.959 2.143 2.143 2.143 1.184 0 2.143-.96 2.143-2.143-.002 0-1.073-11.215-1.073-16.572z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M20 3c0 2.209-1.447 6-2 6-.552 0-2-3.791-2-6s1.448-3 2-3c.553 0 2 .791 2 3zm-4.365 30c0-2.612 1.711-8 2.365-8 .653 0 2.365 5.388 2.365 8S18.652 36 18 36c-.654 0-2.365-.388-2.365-3z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <ellipse cx="18" cy="22.5" rx="7" ry="4.5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M25 22.5c0 1.5-14 1.5-14 0s4.791-4.5 7-4.5 7 3 7 4.5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="11.5" cy="18.5" r="1.5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="24.5" cy="18.5" r="1.5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M20.143 32.215c0 1.183-.959 2.143-2.143 2.143s-2.143-.96-2.143-2.143c0-1.184.96-2.144 2.143-2.144s2.143.96 2.143 2.144z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M27.643 15.643C27.643 10.317 23.324 6 18 6c-5.326 0-9.643 4.317-9.643 9.643 0 5.357-1.071 16.572-1.071 16.572 0 1.183.959 2.143 2.143 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.96 2.143 2.143 2.143 1.183 0 2.142-.96 2.142-2.143h4.286c0 1.183.96 2.143 2.144 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.959 2.143 2.143 2.143 1.184 0 2.143-.96 2.143-2.143-.002 0-1.073-11.215-1.073-16.572z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M20 3c0 2.209-1.447 6-2 6-.552 0-2-3.791-2-6s1.448-3 2-3c.553 0 2 .791 2 3zm-4.365 30c0-2.612 1.711-8 2.365-8 .653 0 2.365 5.388 2.365 8S18.652 36 18 36c-.654 0-2.365-.388-2.365-3z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <ellipse cx="18" cy="22.5" rx="7" ry="4.5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25 22.5c0 1.5-14 1.5-14 0s4.791-4.5 7-4.5 7 3 7 4.5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="11.5" cy="18.5" r="1.5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="24.5" cy="18.5" r="1.5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E1E8ED" d="M20.143 32.215c0 1.183-.959 2.143-2.143 2.143s-2.143-.96-2.143-2.143c0-1.184.96-2.144 2.143-2.144s2.143.96 2.143 2.144z"/>
   <path fill="#E1E8ED" d="M27.643 15.643C27.643 10.317 23.324 6 18 6c-5.326 0-9.643 4.317-9.643 9.643 0 5.357-1.071 16.572-1.071 16.572 0 1.183.959 2.143 2.143 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.96 2.143 2.143 2.143 1.183 0 2.142-.96 2.142-2.143h4.286c0 1.183.96 2.143 2.144 2.143 1.183 0 2.143-.96 2.143-2.143 0 1.183.959 2.143 2.143 2.143 1.184 0 2.143-.96 2.143-2.143-.002 0-1.073-11.215-1.073-16.572z"/>
diff --git a/public/emoji/1f440_border.svg b/public/emoji/1f440_border.svg
index f25c3ca40..2166dce75 100644
--- a/public/emoji/1f440_border.svg
+++ b/public/emoji/1f440_border.svg
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <ellipse cx="8.828" cy="18" rx="7.953" ry="13.281" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="6.594" cy="18" r="4.96" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="6.594" cy="18" r="3.565" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="7.911" cy="15.443" r="1.426" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <ellipse cx="27.234" cy="18" rx="7.953" ry="13.281" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M27.234 32.031c-4.88 0-8.703-6.163-8.703-14.031s3.823-14.031 8.703-14.031S35.938 10.132 35.938 18s-3.824 14.031-8.704 14.031zm0-26.562c-3.972 0-7.203 5.622-7.203 12.531 0 6.91 3.231 12.531 7.203 12.531S34.438 24.91 34.438 18 31.206 5.469 27.234 5.469z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="25" cy="18" r="4.96" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="25" cy="18" r="3.565" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="26.317" cy="15.443" r="1.426" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <ellipse cx="8.828" cy="18" rx="7.953" ry="13.281" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="6.594" cy="18" r="4.96" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="6.594" cy="18" r="3.565" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="7.911" cy="15.443" r="1.426" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <ellipse cx="27.234" cy="18" rx="7.953" ry="13.281" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M27.234 32.031c-4.88 0-8.703-6.163-8.703-14.031s3.823-14.031 8.703-14.031S35.938 10.132 35.938 18s-3.824 14.031-8.704 14.031zm0-26.562c-3.972 0-7.203 5.622-7.203 12.531 0 6.91 3.231 12.531 7.203 12.531S34.438 24.91 34.438 18 31.206 5.469 27.234 5.469z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="25" cy="18" r="4.96" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="25" cy="18" r="3.565" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="26.317" cy="15.443" r="1.426" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <ellipse fill="#F5F8FA" cx="8.828" cy="18" rx="7.953" ry="13.281"/>
   <path fill="#E1E8ED" d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z"/>
diff --git a/public/emoji/1f47b_border.svg b/public/emoji/1f47b_border.svg
index 80ac01215..e317fd9f6 100644
--- a/public/emoji/1f47b_border.svg
+++ b/public/emoji/1f47b_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M36 11c0-1.104-.896-2-2-2s-2 .896-2 2c0 0-.011 3.285-3 3.894V12c0-6.075-4.925-11-11-11S7 5.925 7 12v3.237C1.778 16.806 0 23.231 0 27c0 1.104.896 2 2 2s2-.896 2-2c0 0 .002-3.54 3.336-3.958C7.838 27.883 8.954 33 11 33h1c4 0 3 2 7 2s3-2 6-2 2.395 2 6 2c1.657 0 3-1.343 3-3 0-.675-2.274-4.994-3.755-9.268C35.981 21.348 36 14.58 36 11z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="13" cy="12" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="23" cy="12" r="4" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="23" cy="13" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M22.192 19.491c2.65 1.987 3.591 5.211 2.1 7.199-1.491 1.988-4.849 1.988-7.5 0-2.65-1.987-3.591-5.211-2.1-7.199 1.492-1.989 4.849-1.988 7.5 0z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M36 11c0-1.104-.896-2-2-2s-2 .896-2 2c0 0-.011 3.285-3 3.894V12c0-6.075-4.925-11-11-11S7 5.925 7 12v3.237C1.778 16.806 0 23.231 0 27c0 1.104.896 2 2 2s2-.896 2-2c0 0 .002-3.54 3.336-3.958C7.838 27.883 8.954 33 11 33h1c4 0 3 2 7 2s3-2 6-2 2.395 2 6 2c1.657 0 3-1.343 3-3 0-.675-2.274-4.994-3.755-9.268C35.981 21.348 36 14.58 36 11z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="13" cy="12" r="2" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="23" cy="12" r="4" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="23" cy="13" r="2" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M22.192 19.491c2.65 1.987 3.591 5.211 2.1 7.199-1.491 1.988-4.849 1.988-7.5 0-2.65-1.987-3.591-5.211-2.1-7.199 1.492-1.989 4.849-1.988 7.5 0z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E1E8ED" d="M36 11c0-1.104-.896-2-2-2s-2 .896-2 2c0 0-.011 3.285-3 3.894V12c0-6.075-4.925-11-11-11S7 5.925 7 12v3.237C1.778 16.806 0 23.231 0 27c0 1.104.896 2 2 2s2-.896 2-2c0 0 .002-3.54 3.336-3.958C7.838 27.883 8.954 33 11 33h1c4 0 3 2 7 2s3-2 6-2 2.395 2 6 2c1.657 0 3-1.343 3-3 0-.675-2.274-4.994-3.755-9.268C35.981 21.348 36 14.58 36 11z"/>
   <circle fill="#292F33" cx="13" cy="12" r="2"/>
diff --git a/public/emoji/1f47d_border.svg b/public/emoji/1f47d_border.svg
index e1d4a54d7..4f346ea69 100644
--- a/public/emoji/1f47d_border.svg
+++ b/public/emoji/1f47d_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M35 17c0 9.389-13.223 19-17 19-3.778 0-17-9.611-17-19S8.611 0 18 0s17 7.611 17 17z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M13.503 14.845c3.124 3.124 4.39 6.923 2.828 8.485-1.562 1.562-5.361.297-8.485-2.828-3.125-3.124-4.391-6.923-2.828-8.485s5.361-.296 8.485 2.828zm8.994 0c-3.124 3.124-4.39 6.923-2.828 8.485 1.562 1.562 5.361.297 8.485-2.828 3.125-3.125 4.391-6.923 2.828-8.485-1.562-1.562-5.361-.297-8.485 2.828zM18 31c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.387 1.013-.391 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.689 2.305-.719.398-.374 1.027-.363 1.408.029.379.393.38 1.011-.006 1.396C21.575 29.84 20.347 31 18 31z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35 17c0 9.389-13.223 19-17 19-3.778 0-17-9.611-17-19S8.611 0 18 0s17 7.611 17 17z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M13.503 14.845c3.124 3.124 4.39 6.923 2.828 8.485-1.562 1.562-5.361.297-8.485-2.828-3.125-3.124-4.391-6.923-2.828-8.485s5.361-.296 8.485 2.828zm8.994 0c-3.124 3.124-4.39 6.923-2.828 8.485 1.562 1.562 5.361.297 8.485-2.828 3.125-3.125 4.391-6.923 2.828-8.485-1.562-1.562-5.361-.297-8.485 2.828zM18 31c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.387 1.013-.391 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.689 2.305-.719.398-.374 1.027-.363 1.408.029.379.393.38 1.011-.006 1.396C21.575 29.84 20.347 31 18 31z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M35 17c0 9.389-13.223 19-17 19-3.778 0-17-9.611-17-19S8.611 0 18 0s17 7.611 17 17z"/>
   <path fill="#292F33" d="M13.503 14.845c3.124 3.124 4.39 6.923 2.828 8.485-1.562 1.562-5.361.297-8.485-2.828-3.125-3.124-4.391-6.923-2.828-8.485s5.361-.296 8.485 2.828zm8.994 0c-3.124 3.124-4.39 6.923-2.828 8.485 1.562 1.562 5.361.297 8.485-2.828 3.125-3.125 4.391-6.923 2.828-8.485-1.562-1.562-5.361-.297-8.485 2.828zM18 31c-2.347 0-3.575-1.16-3.707-1.293-.391-.391-.391-1.023 0-1.414.387-.387 1.013-.391 1.404-.01.051.047.806.717 2.303.717 1.519 0 2.273-.689 2.305-.719.398-.374 1.027-.363 1.408.029.379.393.38 1.011-.006 1.396C21.575 29.84 20.347 31 18 31z"/>
diff --git a/public/emoji/1f480_border.svg b/public/emoji/1f480_border.svg
index 8546f7b00..6fa209458 100644
--- a/public/emoji/1f480_border.svg
+++ b/public/emoji/1f480_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M34 16C34 6 26.837 0 18 0 9.164 0 2 6 2 16c0 5.574.002 10.388 6 12.64V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.155c.324.027.659.05 1 .07V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.085c.342-.021.676-.043 1-.07V33c0 1.657 1.344 3 3 3 1.657 0 3-1.343 3-3v-4.36c5.998-2.252 6-7.066 6-12.64z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="11" cy="14" r="5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="25" cy="14" r="5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M19.903 23.062C19.651 22.449 18.9 22 18 22s-1.652.449-1.903 1.062c-.632.176-1.097.75-1.097 1.438 0 .828.671 1.5 1.5 1.5.655 0 1.206-.422 1.41-1.007.03.001.059.007.09.007s.06-.006.09-.007c.205.585.756 1.007 1.41 1.007.828 0 1.5-.672 1.5-1.5 0-.688-.466-1.261-1.097-1.438z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M34 16C34 6 26.837 0 18 0 9.164 0 2 6 2 16c0 5.574.002 10.388 6 12.64V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.155c.324.027.659.05 1 .07V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.085c.342-.021.676-.043 1-.07V33c0 1.657 1.344 3 3 3 1.657 0 3-1.343 3-3v-4.36c5.998-2.252 6-7.066 6-12.64z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="11" cy="14" r="5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="25" cy="14" r="5" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M19.903 23.062C19.651 22.449 18.9 22 18 22s-1.652.449-1.903 1.062c-.632.176-1.097.75-1.097 1.438 0 .828.671 1.5 1.5 1.5.655 0 1.206-.422 1.41-1.007.03.001.059.007.09.007s.06-.006.09-.007c.205.585.756 1.007 1.41 1.007.828 0 1.5-.672 1.5-1.5 0-.688-.466-1.261-1.097-1.438z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M34 16C34 6 26.837 0 18 0 9.164 0 2 6 2 16c0 5.574.002 10.388 6 12.64V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.155c.324.027.659.05 1 .07V33c0 1.657 1.343 3 3 3s3-1.343 3-3v-3.085c.342-.021.676-.043 1-.07V33c0 1.657 1.344 3 3 3 1.657 0 3-1.343 3-3v-4.36c5.998-2.252 6-7.066 6-12.64z"/>
   <circle fill="#292F33" cx="11" cy="14" r="5"/>
diff --git a/public/emoji/1f4a8_border.svg b/public/emoji/1f4a8_border.svg
index c20a5cb3b..412c2f8a7 100644
--- a/public/emoji/1f4a8_border.svg
+++ b/public/emoji/1f4a8_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M36 15c0-4.155-3.169-7.568-7.221-7.96C27.884 3.013 24.297 0 20 0c-4.971 0-9 3.56-9 8.531 0 1.156.25 2.906 1.121 3.785C8.859 12.5 4.094 12.6 0 12.015c0 0 4.816 3.831 15.357 3.985-.151.313-.254 1.43-.306 1.786-.249.003-.595.009-1.051.009C6 17.795 0 17 0 17s3 3.234 15.406 4.106C15 21.234 15 23 15 23c-8 0-15-1-15-1 3.362 2.802 6.724 4.033 9.03 4.574-.011.142-.03.281-.03.426 0 3.313 2.686 5 6 5 .487 0 .958-.064 1.412-.174C18.009 34.333 20.807 36 24 36c4.971 0 9-4.029 9-9 0-1.788-.527-3.449-1.427-4.851C34.195 20.837 36 18.132 36 15z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M36 15c0-4.155-3.169-7.568-7.221-7.96C27.884 3.013 24.297 0 20 0c-4.971 0-9 3.56-9 8.531 0 1.156.25 2.906 1.121 3.785C8.859 12.5 4.094 12.6 0 12.015c0 0 4.816 3.831 15.357 3.985-.151.313-.254 1.43-.306 1.786-.249.003-.595.009-1.051.009C6 17.795 0 17 0 17s3 3.234 15.406 4.106C15 21.234 15 23 15 23c-8 0-15-1-15-1 3.362 2.802 6.724 4.033 9.03 4.574-.011.142-.03.281-.03.426 0 3.313 2.686 5 6 5 .487 0 .958-.064 1.412-.174C18.009 34.333 20.807 36 24 36c4.971 0 9-4.029 9-9 0-1.788-.527-3.449-1.427-4.851C34.195 20.837 36 18.132 36 15z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#BDDDF4" d="M36 15c0-4.155-3.169-7.568-7.221-7.96C27.884 3.013 24.297 0 20 0c-4.971 0-9 3.56-9 8.531 0 1.156.25 2.906 1.121 3.785C8.859 12.5 4.094 12.6 0 12.015c0 0 4.816 3.831 15.357 3.985-.151.313-.254 1.43-.306 1.786-.249.003-.595.009-1.051.009C6 17.795 0 17 0 17s3 3.234 15.406 4.106C15 21.234 15 23 15 23c-8 0-15-1-15-1 3.362 2.802 6.724 4.033 9.03 4.574-.011.142-.03.281-.03.426 0 3.313 2.686 5 6 5 .487 0 .958-.064 1.412-.174C18.009 34.333 20.807 36 24 36c4.971 0 9-4.029 9-9 0-1.788-.527-3.449-1.427-4.851C34.195 20.837 36 18.132 36 15z"/>
 </svg>
diff --git a/public/emoji/1f4ac_border.svg b/public/emoji/1f4ac_border.svg
index 3d71232f9..76f6c0b26 100644
--- a/public/emoji/1f4ac_border.svg
+++ b/public/emoji/1f4ac_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M18 1C8.059 1 0 7.268 0 15c0 4.368 2.574 8.268 6.604 10.835C6.08 28.144 4.859 31.569 2 35c5.758-.96 9.439-3.761 11.716-6.416 1.376.262 2.805.416 4.284.416 9.941 0 18-6.268 18-14S27.941 1 18 1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="18" cy="15" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="26" cy="15" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="10" cy="15" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M18 1C8.059 1 0 7.268 0 15c0 4.368 2.574 8.268 6.604 10.835C6.08 28.144 4.859 31.569 2 35c5.758-.96 9.439-3.761 11.716-6.416 1.376.262 2.805.416 4.284.416 9.941 0 18-6.268 18-14S27.941 1 18 1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="18" cy="15" r="2" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="26" cy="15" r="2" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="10" cy="15" r="2" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#BDDDF4" d="M18 1C8.059 1 0 7.268 0 15c0 4.368 2.574 8.268 6.604 10.835C6.08 28.144 4.859 31.569 2 35c5.758-.96 9.439-3.761 11.716-6.416 1.376.262 2.805.416 4.284.416 9.941 0 18-6.268 18-14S27.941 1 18 1z"/>
   <circle fill="#2A6797" cx="18" cy="15" r="2"/>
diff --git a/public/emoji/1f4ad_border.svg b/public/emoji/1f4ad_border.svg
index c887a7126..6ef337056 100644
--- a/public/emoji/1f4ad_border.svg
+++ b/public/emoji/1f4ad_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M35 12c0-3.866-3.134-7-7-7-1.167 0-2.265.29-3.232.794-2.082-2.827-5.425-4.669-9.205-4.669-5.132 0-9.475 3.38-10.923 8.036C1.982 9.778 0 12.155 0 15c0 2.979 2.174 5.445 5.021 5.913C5.237 24.862 8.498 28 12.5 28c2.176 0 4.13-.933 5.5-2.413C19.37 27.067 21.323 28 23.5 28c4.143 0 7.5-3.357 7.5-7.5 0-.71-.105-1.394-.289-2.045C33.23 17.396 35 14.905 35 12z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="4" cy="31" r="3" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35 12c0-3.866-3.134-7-7-7-1.167 0-2.265.29-3.232.794-2.082-2.827-5.425-4.669-9.205-4.669-5.132 0-9.475 3.38-10.923 8.036C1.982 9.778 0 12.155 0 15c0 2.979 2.174 5.445 5.021 5.913C5.237 24.862 8.498 28 12.5 28c2.176 0 4.13-.933 5.5-2.413C19.37 27.067 21.323 28 23.5 28c4.143 0 7.5-3.357 7.5-7.5 0-.71-.105-1.394-.289-2.045C33.23 17.396 35 14.905 35 12z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="4" cy="31" r="3" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#BDDDF4" d="M35 12c0-3.866-3.134-7-7-7-1.167 0-2.265.29-3.232.794-2.082-2.827-5.425-4.669-9.205-4.669-5.132 0-9.475 3.38-10.923 8.036C1.982 9.778 0 12.155 0 15c0 2.979 2.174 5.445 5.021 5.913C5.237 24.862 8.498 28 12.5 28c2.176 0 4.13-.933 5.5-2.413C19.37 27.067 21.323 28 23.5 28c4.143 0 7.5-3.357 7.5-7.5 0-.71-.105-1.394-.289-2.045C33.23 17.396 35 14.905 35 12z"/>
   <circle fill="#BDDDF4" cx="4" cy="31" r="3"/>
diff --git a/public/emoji/1f4c3_border.svg b/public/emoji/1f4c3_border.svg
index 9e7b56241..07225c89b 100644
--- a/public/emoji/1f4c3_border.svg
+++ b/public/emoji/1f4c3_border.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M28 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.875-4-8V4c0-2.209 1.791-4 4-4h20c2.209 0 4 1.791 4 4v28z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M31 36H4c4 0 4-8 4-8 0-2.209 1.791-4 4-4h20c2.209 0 4 2 4 4 0 0 .25 8-5 8z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M24 7c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .553-.447 1-1 1H5c-.552 0-1-.447-1-1 0-.553.448-1 1-1h18c.553 0 1 .447 1 1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.875-4-8V4c0-2.209 1.791-4 4-4h20c2.209 0 4 1.791 4 4v28z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M31 36H4c4 0 4-8 4-8 0-2.209 1.791-4 4-4h20c2.209 0 4 2 4 4 0 0 .25 8-5 8z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24 7c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .552-.447 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h18c.553 0 1 .448 1 1zm0 4c0 .553-.447 1-1 1H5c-.552 0-1-.447-1-1 0-.553.448-1 1-1h18c.553 0 1 .447 1 1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M28 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.875-4-8V4c0-2.209 1.791-4 4-4h20c2.209 0 4 1.791 4 4v28z"/>
   <path fill="#E1E8ED" d="M31 36H4c4 0 4-8 4-8 0-2.209 1.791-4 4-4h20c2.209 0 4 2 4 4 0 0 .25 8-5 8z"/>
diff --git a/public/emoji/1f507_border.svg b/public/emoji/1f507_border.svg
index cd02481bd..ba1e4148f 100644
--- a/public/emoji/1f507_border.svg
+++ b/public/emoji/1f507_border.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M31.003 33.003L3.997 5.997c-.551-.551-.551-1.443 0-1.994l.006-.006c.551-.551 1.443-.551 1.994 0l27.006 27.006c.551.551.551 1.443 0 1.994l-.006.006c-.551.551-1.443.551-1.994 0z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M31.003 33.003L3.997 5.997c-.551-.551-.551-1.443 0-1.994l.006-.006c.551-.551 1.443-.551 1.994 0l27.006 27.006c.551.551.551 1.443 0 1.994l-.006.006c-.551.551-1.443.551-1.994 0z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#8899A6" d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z"/>
   <path fill="#CCD6DD" d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z"/>
diff --git a/public/emoji/1f508_border.svg b/public/emoji/1f508_border.svg
index c920d89dc..38ebc8785 100644
--- a/public/emoji/1f508_border.svg
+++ b/public/emoji/1f508_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#8899A6" d="M9 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H9z"/>
   <path fill="#CCD6DD" d="M15 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z"/>
diff --git a/public/emoji/1f509_border.svg b/public/emoji/1f509_border.svg
index 6881edb30..7fc2e9a8c 100644
--- a/public/emoji/1f509_border.svg
+++ b/public/emoji/1f509_border.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M7 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M13 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M28.709 25.959c-.289 0-.576-.124-.774-.365-.351-.427-.289-1.057.138-1.407C29.934 22.658 31 20.403 31 18c0-2.435-1.089-4.708-2.988-6.236-.431-.346-.498-.976-.152-1.406.348-.429.976-.499 1.406-.152C31.639 12.116 33 14.957 33 18c0 3.004-1.333 5.822-3.657 7.731-.186.154-.411.228-.634.228z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M7 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M13 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M28.709 25.959c-.289 0-.576-.124-.774-.365-.351-.427-.289-1.057.138-1.407C29.934 22.658 31 20.403 31 18c0-2.435-1.089-4.708-2.988-6.236-.431-.346-.498-.976-.152-1.406.348-.429.976-.499 1.406-.152C31.639 12.116 33 14.957 33 18c0 3.004-1.333 5.822-3.657 7.731-.186.154-.411.228-.634.228z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#8899A6" d="M7 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H7z"/>
   <path fill="#CCD6DD" d="M13 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z"/>
diff --git a/public/emoji/1f50a_border.svg b/public/emoji/1f50a_border.svg
index 549811b69..0605c4b2f 100644
--- a/public/emoji/1f50a_border.svg
+++ b/public/emoji/1f50a_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M2 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M8 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M29 32.019c-.267 0-.533-.113-.72-.332-.339-.398-.292-.995.105-1.334 3.603-3.071 5.668-7.551 5.668-12.29s-2.066-9.219-5.669-12.29c-.397-.339-.444-.937-.105-1.334.339-.399.935-.444 1.334-.106 4.024 3.431 6.333 8.436 6.333 13.73 0 5.294-2.309 10.299-6.332 13.729-.179.152-.396.227-.614.227z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M26.27 28.959c-.269 0-.533-.115-.717-.338-.327-.396-.271-.98.125-1.307 2.792-2.304 4.394-5.699 4.394-9.315 0-3.573-1.571-6.943-4.311-9.245-.392-.33-.443-.916-.113-1.308.33-.394.915-.443 1.309-.114 3.16 2.656 4.973 6.543 4.973 10.667 0 4.172-1.848 8.089-5.069 10.746-.174.145-.383.214-.591.214z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M23.709 25.959c-.289 0-.576-.124-.774-.365-.351-.427-.289-1.057.138-1.407C24.934 22.658 26 20.403 26 18c0-2.435-1.089-4.708-2.988-6.236-.431-.346-.498-.976-.152-1.406.348-.429.976-.499 1.406-.152C26.639 12.116 28 14.957 28 18c0 3.004-1.333 5.822-3.657 7.731-.186.154-.411.228-.634.228z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M2 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M8 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M29 32.019c-.267 0-.533-.113-.72-.332-.339-.398-.292-.995.105-1.334 3.603-3.071 5.668-7.551 5.668-12.29s-2.066-9.219-5.669-12.29c-.397-.339-.444-.937-.105-1.334.339-.399.935-.444 1.334-.106 4.024 3.431 6.333 8.436 6.333 13.73 0 5.294-2.309 10.299-6.332 13.729-.179.152-.396.227-.614.227z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M26.27 28.959c-.269 0-.533-.115-.717-.338-.327-.396-.271-.98.125-1.307 2.792-2.304 4.394-5.699 4.394-9.315 0-3.573-1.571-6.943-4.311-9.245-.392-.33-.443-.916-.113-1.308.33-.394.915-.443 1.309-.114 3.16 2.656 4.973 6.543 4.973 10.667 0 4.172-1.848 8.089-5.069 10.746-.174.145-.383.214-.591.214z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M23.709 25.959c-.289 0-.576-.124-.774-.365-.351-.427-.289-1.057.138-1.407C24.934 22.658 26 20.403 26 18c0-2.435-1.089-4.708-2.988-6.236-.431-.346-.498-.976-.152-1.406.348-.429.976-.499 1.406-.152C26.639 12.116 28 14.957 28 18c0 3.004-1.333 5.822-3.657 7.731-.186.154-.411.228-.634.228z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#8899A6" d="M2 10s-2 0-2 2v12c0 2 2 2 2 2h6l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8H2z"/>
   <path fill="#CCD6DD" d="M8 26l8 8s1 1 2 1h1s1 0 1-1V2s0-1-1-1h-1c-1 0-2 1-2 1l-8 8v16z"/>
diff --git a/public/emoji/1f50b.svg b/public/emoji/1f50b.svg
index 66d420fc3..fd0913c63 100644
--- a/public/emoji/1f50b.svg
+++ b/public/emoji/1f50b.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M24 4c0 2.209-1.791 4-4 4h-4c-2.209 0-4-1.791-4-4s1.791-4 4-4h4c2.209 0 4 1.791 4 4z"/><path fill="#E1E8ED" d="M30 32c0 2.209-1.791 4-4 4H10c-2.209 0-4-1.791-4-4V8c0-2.209 1.791-4 4-4h16c2.209 0 4 1.791 4 4v24z"/><path fill="#77B255" d="M6 8h24v24H6z"/><path fill="#F5F8FA" d="M23 14h-3v-3c0-.552-.447-1-1-1h-2c-.552 0-1 .448-1 1v3h-3c-.553 0-1 .448-1 1v2c0 .553.447 1 1 1h3v3c0 .553.448 1 1 1h2c.553 0 1-.447 1-1v-3h3c.553 0 1-.447 1-1v-2c0-.552-.447-1-1-1zM13 30c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h10c.553 0 1 .447 1 1v2c0 .553-.447 1-1 1H13z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="M30 32.7c0 1.657-5.373 3.3-12 3.3S6 34.357 6 32.7c0-1.657 5.373-2.7 12-2.7s12 1.043 12 2.7z"/><path fill="#77B255" d="M6 3h24v29.7H6z"/><ellipse fill="#5C913B" cx="18" cy="3" rx="12" ry="3"/><path fill="#FFF" d="M21.956 12.788c.091.544-.321 1.066-.922 1.136-.676.079-1.355.121-2.035.147V16a1 1 0 0 1-2 0v-1.93a26.188 26.188 0 0 1-2.035-.147c-.601-.07-1.012-.591-.922-1.136a1.042 1.042 0 0 1 1.152-.851c.6.07 1.202.109 1.804.133V10a1 1 0 0 1 2 0v2.07a24.781 24.781 0 0 0 1.804-.133 1.042 1.042 0 0 1 1.154.851zm-1.652 17.746a21.119 21.119 0 0 1-4.607 0 1.048 1.048 0 0 0-1.153.854c-.091.544.326 1.067.934 1.134 1.676.184 3.368.184 5.044 0 .609-.067 1.026-.59.934-1.134a1.047 1.047 0 0 0-1.152-.854z"/><ellipse fill="#CCD6DD" cx="18" cy="3" rx="10" ry="2"/><path fill="#99AAB5" d="M14 1v1.5c0 .552 1.791 1 4 1s4-.448 4-1V1h-8z"/><ellipse fill="#CCD6DD" cx="18" cy="1" rx="4" ry="1"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f54a_border.svg b/public/emoji/1f54a_border.svg
index 895872f3e..ac27cedbd 100644
--- a/public/emoji/1f54a_border.svg
+++ b/public/emoji/1f54a_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M.794 16.112c1 0 5.875 1.344 6.5 2.312L6.013 18.3s-3.906-1.25-4.906-1.25c-1.001 0-.313-.938-.313-.938z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M11 2c1 1 3 7 3 10s-2 6 2 8 5.001-1 5.001-5S20 7 19 5s-2 0-2 0-1-4-2-4-1 2-1 2-2-2-3-2 0 1 0 1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M10 15c3 0 4 4 6 4s1-3 3-3 10-5 10-11 3-3 3-1c1 0 2 1.586 2 3 0 1 0 2-1 3 1 0 2 2 1 3 1 3-1 6-3 7 0 1-2 3-4 2 0 0-1 3-3 2 0 0 3.052 1.684 4 2 3 1 7 1 7 1s0 1-2 2c0 0 1 1 0 2s-2 1-2 1 1 2-2 1-6-4-6-4-5 1-9-1-6-6-6-8-3-1-4-1 2-2 3-2c0 0 0-2 3-2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M6.95 18.019s5.438 2.625 7.938 6.656c1.9 3.064 2.782 8.656 2.782 8.656s.043.564-.907-2.281c-1-3-2.217-6.288-4.312-8.188-3.344-3.031-4.75-3.5-6.062-4.25-.332-.189.217-.687.561-.593z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M16.198 28.54s2.038.103 3.107 2.139c1.068 2.036-.053 4.914-.053 4.914s-2.75-1.268-3.462-2.947c-.712-1.68.408-4.106.408-4.106zm-2.133-4.778s1.274 1.437 3.558 1.705c2.284.269 4.121-1.379 4.121-1.379s-2.144-1.97-3.968-2.033c-1.823-.065-3.711 1.707-3.711 1.707zm-4.047-3.148s-2.015.329-2.85 2.472.425 4.01.425 4.01 2.534-.848 3.055-2.597c.521-1.747-.63-3.885-.63-3.885z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M.794 16.112c1 0 5.875 1.344 6.5 2.312L6.013 18.3s-3.906-1.25-4.906-1.25c-1.001 0-.313-.938-.313-.938z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11 2c1 1 3 7 3 10s-2 6 2 8 5.001-1 5.001-5S20 7 19 5s-2 0-2 0-1-4-2-4-1 2-1 2-2-2-3-2 0 1 0 1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M10 15c3 0 4 4 6 4s1-3 3-3 10-5 10-11 3-3 3-1c1 0 2 1.586 2 3 0 1 0 2-1 3 1 0 2 2 1 3 1 3-1 6-3 7 0 1-2 3-4 2 0 0-1 3-3 2 0 0 3.052 1.684 4 2 3 1 7 1 7 1s0 1-2 2c0 0 1 1 0 2s-2 1-2 1 1 2-2 1-6-4-6-4-5 1-9-1-6-6-6-8-3-1-4-1 2-2 3-2c0 0 0-2 3-2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M6.95 18.019s5.438 2.625 7.938 6.656c1.9 3.064 2.782 8.656 2.782 8.656s.043.564-.907-2.281c-1-3-2.217-6.288-4.312-8.188-3.344-3.031-4.75-3.5-6.062-4.25-.332-.189.217-.687.561-.593z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M16.198 28.54s2.038.103 3.107 2.139c1.068 2.036-.053 4.914-.053 4.914s-2.75-1.268-3.462-2.947c-.712-1.68.408-4.106.408-4.106zm-2.133-4.778s1.274 1.437 3.558 1.705c2.284.269 4.121-1.379 4.121-1.379s-2.144-1.97-3.968-2.033c-1.823-.065-3.711 1.707-3.711 1.707zm-4.047-3.148s-2.015.329-2.85 2.472.425 4.01.425 4.01 2.534-.848 3.055-2.597c.521-1.747-.63-3.885-.63-3.885z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#5C913B" d="M.794 16.112c1 0 5.875 1.344 6.5 2.312L6.013 18.3s-3.906-1.25-4.906-1.25c-1.001 0-.313-.938-.313-.938z"/>
   <path fill="#99AAB5" d="M11 2c1 1 3 7 3 10s-2 6 2 8 5.001-1 5.001-5S20 7 19 5s-2 0-2 0-1-4-2-4-1 2-1 2-2-2-3-2 0 1 0 1z"/>
diff --git a/public/emoji/1f6dd.svg b/public/emoji/1f6dd.svg
new file mode 100755
index 000000000..3be3aa227
--- /dev/null
+++ b/public/emoji/1f6dd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#AEB3B2" d="M34.5 32.423a.5.5 0 0 1-.5-.5V29.5a.5.5 0 0 1 1 0v2.423a.5.5 0 0 1-.5.5zM26 35.236V32.5a.5.5 0 0 0-1 0v2.736a.5.5 0 0 0 1 0zm-6-1.892V28.5a.5.5 0 0 0-1 0v4.844a.5.5 0 0 0 1 0zM17.488.991a.497.497 0 0 0-.608-.36A2.498 2.498 0 0 0 15 3.052v4.382l-.914 3.427-7.906 2.635.801-2.862L7 6.052c0-.686.464-1.283 1.128-1.453.268-.068.429-.341.36-.608s-.337-.43-.608-.361A2.5 2.5 0 0 0 6 6.052v4.379L1.259 27.365a.5.5 0 0 0 .962.27l.468-1.671 8.088-2.696-.294 1.103a.5.5 0 0 0 .967.258l4.533-17L16 3.052c0-.686.464-1.283 1.128-1.453a.499.499 0 0 0 .36-.608zm-3.71 11.027-.692 2.594-7.961 2.654.73-2.606 7.923-2.642zm-1.692 6.343L4.07 21.033l.73-2.606 7.978-2.659-.692 2.593zm-9.071 6.441.73-2.606 8.033-2.678-.692 2.594-8.071 2.69z"/><path fill="#DD551F" d="M34.686 25.856a8.092 8.092 0 0 1-4.1-3.65L23.041 8.272a6.463 6.463 0 0 0-3.761-3.104l-3.63-1.145A.5.5 0 0 0 15 4.5v3c0 .218.142.411.35.477l1.508.476a5.472 5.472 0 0 1 3.183 2.626l7.299 13.479a10.518 10.518 0 0 0 5.333 4.75l1.643.657A.501.501 0 0 0 35 29.5v-3.18a.5.5 0 0 0-.314-.464z"/><path fill="#FA8948" d="M34.686 25.856a8.092 8.092 0 0 1-4.1-3.65L23.041 8.272a6.463 6.463 0 0 0-3.761-3.104l-3.63-1.145A.5.5 0 0 0 15 4.5v.248l3.573 1.127a6.466 6.466 0 0 1 3.761 3.104l7.545 13.933a8.083 8.083 0 0 0 4.1 3.65.5.5 0 0 1 .314.464v2.928l.022.009a.497.497 0 0 0 .465-.049.499.499 0 0 0 .22-.414v-3.18a.5.5 0 0 0-.314-.464z"/><path fill="#FAA572" d="M20.919 10.603a6.47 6.47 0 0 0-3.761-3.104l-1.508-.476a.51.51 0 0 0-.309.003l-9 3a.5.5 0 0 0 .009.951l1.508.476a5.472 5.472 0 0 1 3.183 2.626.5.5 0 0 0 .597.236l9-3a.497.497 0 0 0 .281-.712z"/><path fill="#FAC19C" d="M29.854 26.275a9.497 9.497 0 0 1-1.637-2.194l-7.299-13.479a.497.497 0 0 0-.598-.236l-9 3a.5.5 0 0 0-.282.713l7.299 13.479a10.461 10.461 0 0 0 1.809 2.425.504.504 0 0 0 .512.12l9-3a.5.5 0 0 0 .196-.828z"/><path fill="#FAA572" d="M34.658 29.974a.501.501 0 0 0 .028-.938l-1.643-.657a9.427 9.427 0 0 1-3.188-2.103.501.501 0 0 0-.512-.121l-9 3a.5.5 0 0 0-.195.827 10.451 10.451 0 0 0 3.524 2.325l1.643.657a.491.491 0 0 0 .343.01l9-3z"/><path fill="#DD551F" d="M25.686 28.856a8.092 8.092 0 0 1-4.1-3.65l-7.545-13.933a6.463 6.463 0 0 0-3.761-3.104L6.65 7.023A.5.5 0 0 0 6 7.5v3c0 .218.142.411.35.477l1.508.476a5.472 5.472 0 0 1 3.183 2.626l7.299 13.479a10.518 10.518 0 0 0 5.333 4.75l1.643.657A.501.501 0 0 0 26 32.5v-3.18a.5.5 0 0 0-.314-.464z"/><path fill="#FA8948" d="M25.686 28.856a8.092 8.092 0 0 1-4.1-3.65l-7.545-13.933a6.463 6.463 0 0 0-3.761-3.104L6.65 7.023A.5.5 0 0 0 6 7.5v.248l3.573 1.127a6.466 6.466 0 0 1 3.761 3.104l7.545 13.933a8.083 8.083 0 0 0 4.1 3.65.5.5 0 0 1 .314.464v2.928l.022.009a.497.497 0 0 0 .465-.049.499.499 0 0 0 .22-.414v-3.18a.5.5 0 0 0-.314-.464z"/><path fill="#AEB3B2" d="M10.5 8.742a.5.5 0 0 1-.5-.5v-2.19c0-.467-.212-.898-.58-1.185a1.487 1.487 0 0 0-1.292-.268.5.5 0 0 1-.248-.968 2.485 2.485 0 0 1 2.153.447c.614.477.967 1.196.967 1.974v2.189a.5.5 0 0 1-.5.501zm9-3a.5.5 0 0 1-.5-.5v-2.19c0-.467-.212-.898-.58-1.185a1.487 1.487 0 0 0-1.292-.269.5.5 0 0 1-.248-.968 2.484 2.484 0 0 1 2.153.447c.614.478.967 1.197.967 1.975v2.189a.5.5 0 0 1-.5.501z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f6de.svg b/public/emoji/1f6de.svg
new file mode 100755
index 000000000..aed6c490d
--- /dev/null
+++ b/public/emoji/1f6de.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><circle fill="#191919" cx="18" cy="18" r="18"/><circle fill="#313131" cx="18" cy="18" r="17"/><circle fill="#AEB3B2" cx="18" cy="18" r="13"/><circle fill="#313131" cx="18" cy="18" r="11"/><circle fill="#787878" cx="18" cy="18" r="9"/><circle fill="#313131" cx="18" cy="18" r="6"/><circle fill="#AEB3B2" cx="18" cy="18" r="2"/><circle fill="#E1E1E1" cx="18" cy="18" r="1"/><path d="M19.47 21.74c-.534-.945-1.942-1.168-2.676-.333-1.471 2-2.751 4.115-3.758 6.396.165.084.332.166.502.242 1.159-1.045 2.205-2.182 3.19-3.376h2.545c.986 1.193 2.031 2.328 3.189 3.374.17-.076.337-.158.503-.243-.949-2.151-2.167-4.122-3.495-6.06zm9.47-4.883c-.019-.185-.056-.366-.084-.548-2.48.253-4.886.817-7.243 1.598-1.022.44-1.243 1.848-.511 2.647 1.433 1.863 2.933 3.632 4.689 5.202.132-.133.253-.277.378-.416-.636-1.422-1.392-2.764-2.221-4.068l.788-2.42c1.439-.569 2.852-1.215 4.204-1.995zM8.22 12.989c2.035 1.183 4.179 2.062 6.392 2.849.97.456 2.271-.209 2.36-1.303.015-2.482-.193-4.946-.719-7.382-.186.03-.372.055-.555.094a29.438 29.438 0 0 0-.479 3.228c-.048.448-.086.914-.116 1.385l-2.059 1.492c-1.496-.385-3.006-.688-4.554-.854-.094.161-.184.324-.27.491zm12.758 2.963c2.366-.753 4.646-1.712 6.801-2.966a10.398 10.398 0 0 0-.274-.496c-1.09.116-2.155.309-3.207.541-.441.092-.896.2-1.353.317l-2.056-1.497c-.096-1.545-.275-3.078-.598-4.606-.18-.038-.365-.063-.548-.092-.496 2.3-.67 4.61-.734 6.958-.134 1.062.901 2.094 1.969 1.841zm-10.77 9.804c1.756-1.57 3.255-3.339 4.689-5.202.733-.8.51-2.207-.51-2.647-2.356-.781-4.763-1.345-7.243-1.597-.028.183-.065.363-.084.548 1.352.78 2.765 1.426 4.204 1.994l.788 2.42c-.829 1.304-1.584 2.646-2.221 4.068.125.139.245.283.377.416z" fill="#AEB3B2"/><path d="M22.47 19.167a82.351 82.351 0 0 0 3.426-1.22 52.308 52.308 0 0 0 3.019-1.252c-.01-.088-.027-.173-.04-.26a62.722 62.722 0 0 0-7.04 1.919c-.674.258-.881 1.261-.413 1.792.05.074.2.261.251.338 1.327 1.782 2.712 3.524 4.204 5.176.063-.065.121-.134.182-.2-1.184-2.053-2.511-4.017-3.872-5.95-.12-.217.115-.289.283-.343zM9.94 25.461c.061.066.119.136.182.2 1.491-1.652 2.877-3.394 4.204-5.176.052-.075.202-.265.251-.338.47-.531.26-1.534-.412-1.792a62.878 62.878 0 0 0-7.04-1.919c-.012.087-.029.172-.04.26.997.446 2.001.871 3.02 1.252a82.87 82.87 0 0 0 3.426 1.22c.168.053.402.126.282.343-1.361 1.933-2.689 3.897-3.873 5.95zm9.288-3.199c-.055-.073-.189-.274-.244-.343-.36-.611-1.379-.722-1.832-.162a62.956 62.956 0 0 0-4 6.101c.079.039.158.078.238.115a51.875 51.875 0 0 0 2.12-2.481 83.43 83.43 0 0 0 2.219-2.882c.102-.143.244-.344.413-.162 1.42 1.893 2.878 3.764 4.466 5.525.081-.038.162-.077.242-.117-1.109-1.927-2.338-3.782-3.622-5.594zM8.275 12.873c2.033.909 4.12 1.689 6.226 2.4.492.185 1.019.348 1.513-.007.491-.359.498-.912.474-1.437-.024-2.222-.121-4.446-.358-6.659-.088.015-.177.023-.264.041-.244 2.293-.337 4.596-.357 6.898.002.176.005.422-.239.374-2.263-.698-4.544-1.354-6.865-1.846a9.21 9.21 0 0 0-.13.236zm11.237.957c.002.091-.008.333-.004.421-.068.706.691 1.394 1.387 1.208a62.78 62.78 0 0 0 6.828-2.588 8.529 8.529 0 0 0-.127-.231 51.55 51.55 0 0 0-3.178.762 83.22 83.22 0 0 0-3.489 1.027c-.167.056-.4.135-.43-.112-.036-2.369-.117-4.744-.367-7.105-.086-.017-.176-.025-.263-.04-.234 2.213-.331 4.436-.357 6.658z" fill="#E1E1E1"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f6df.svg b/public/emoji/1f6df.svg
new file mode 100755
index 000000000..b56811ca9
--- /dev/null
+++ b/public/emoji/1f6df.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FF4018" d="M18 3C9.716 3 3 9.716 3 18s6.716 15 15 15 15-6.716 15-15S26.284 3 18 3zm0 23c-4.411 0-8-3.589-8-8s3.589-8 8-8 8 3.589 8 8-3.589 8-8 8z"/><path fill="#E2121C" d="M18 9c-4.963 0-9 4.038-9 9s4.037 9 9 9 9-4.038 9-9-4.037-9-9-9zm0 17c-4.411 0-8-3.589-8-8s3.589-8 8-8 8 3.589 8 8-3.589 8-8 8z"/><path d="M7.393 7.393c.481-.481.994-.907 1.519-1.309l5.031 5.031a7.975 7.975 0 0 0-1.6 1.228 7.975 7.975 0 0 0-1.228 1.6l-5.031-5.03c.402-.526.829-1.039 1.309-1.52zm1.52 22.523 5.031-5.031a7.975 7.975 0 0 1-1.6-1.228 7.975 7.975 0 0 1-1.228-1.6l-5.031 5.031c.402.526.828 1.039 1.309 1.519s.993.907 1.519 1.309zm21.003-2.829-5.031-5.031c-.336.57-.739 1.111-1.228 1.6s-1.03.892-1.6 1.228l5.031 5.031c.526-.402 1.039-.828 1.519-1.309s.907-.993 1.309-1.519zM27.087 6.084l-5.031 5.031c.57.336 1.111.739 1.6 1.228.489.489.892 1.03 1.228 1.6l5.031-5.031c-.402-.526-.828-1.039-1.309-1.519s-.993-.907-1.519-1.309z" fill="#E1E1E1"/><path fill="#E1E1E1" d="M12.66 35.014c-.503 0-.909-.03-1.126-.084-1.845-.464-3.058-1.805-4.23-3.101-.268-.295-.535-.591-.812-.878-.448-.466-.924-.908-1.397-1.35-.815-.76-1.659-1.545-2.369-2.451C.758 24.638.68 21.543 1.475 19.59c.228-.562.628-1.179 1.167-1.596a3.5 3.5 0 0 1-.988-1.192c-.988-1.895-1.175-4.909.752-7.048.51-.566 1.087-1.059 1.646-1.536.558-.476 1.085-.926 1.551-1.442.487-.54.897-1.142 1.332-1.778.627-.921 1.277-1.874 2.175-2.615 2.211-1.818 5.423-1.797 7.455-.837.622.294 1.11.668 1.44 1.093.294-.375.71-.715 1.231-.995 1.752-.943 4.78-1.205 7.282.445 1.368.903 2.309 2.296 3.138 3.525l4.14 6.138c1.307 1.936 1.409 3.884.288 5.484a3.314 3.314 0 0 1-.735.765c.358.265.677.627.926 1.065 1.22 2.144 1.007 4.707-.554 6.689-.23.292-.475.578-.72.864-.67.78-1.302 1.517-1.64 2.402-.118.312-.198.634-.279.958-.374 1.489-.798 3.176-4.422 4.173-1.823.501-5.214 1.436-7.549.149a3.645 3.645 0 0 1-1.112-.939 3.652 3.652 0 0 1-1.129.948c-.914.499-2.891.704-4.21.704zm.854-33.109c-1.309 0-2.695.367-3.768 1.25-.789.65-1.37 1.503-1.986 2.406-.435.637-.883 1.295-1.416 1.885-.509.565-1.086 1.057-1.644 1.533-.559.477-1.086.927-1.553 1.444-1.607 1.784-1.441 4.317-.607 5.916.281.538.819 1.125 1.486 1.161L4 18.5c-.69 0-1.312.76-1.6 1.466-.664 1.632-.599 4.382 1.112 6.567.662.844 1.439 1.569 2.264 2.336.487.454.975.909 1.437 1.388.283.294.559.598.832.9 1.122 1.24 2.183 2.412 3.733 2.802.527.132 3.573.04 4.614-.528.551-.3 1.106-.86 1.107-1.432l1 .001c-.001.566.55 1.124 1.095 1.425 1.979 1.092 5.117.226 6.801-.237 3.062-.843 3.366-2.053 3.718-3.453.091-.362.182-.721.314-1.07.4-1.048 1.119-1.886 1.815-2.697.235-.274.471-.549.693-.831 1.304-1.656 1.484-3.792.47-5.576-.279-.491-.802-1.027-1.434-1.062V17.5c.461-.024.944-.337 1.293-.837 1.111-1.586.451-3.242-.297-4.351l-4.14-6.138c-.815-1.208-1.658-2.457-2.86-3.25-2.157-1.424-4.757-1.206-6.256-.399-.77.413-1.211.952-1.211 1.475h-1c0-.575-.496-1.14-1.362-1.549-.726-.344-1.654-.546-2.624-.546z"/><path d="m25.611 13.218-.726.726c-.336-.57-.739-1.111-1.228-1.6s-1.03-.892-1.6-1.228l.726-.726a9.046 9.046 0 0 1 2.828 2.828zM12.343 23.657a7.975 7.975 0 0 1-1.228-1.6l-.726.726a9.056 9.056 0 0 0 2.828 2.828l.726-.726a7.975 7.975 0 0 1-1.6-1.228zm12.542-1.601c-.336.57-.739 1.111-1.228 1.6s-1.03.892-1.6 1.228l.726.726a9.056 9.056 0 0 0 2.828-2.828l-.726-.726zm-14.496-8.838.726.726c.336-.57.739-1.111 1.228-1.6s1.03-.892 1.6-1.228l-.726-.726a9.046 9.046 0 0 0-2.828 2.828z" fill="#AEB3B2"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f7f0.svg b/public/emoji/1f7f0.svg
new file mode 100755
index 000000000..5844f61c5
--- /dev/null
+++ b/public/emoji/1f7f0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#31373D" d="M34 12a3 3 0 0 1-3 3H5a3 3 0 1 1 0-6h26a3 3 0 0 1 3 3zm0 12a3 3 0 0 1-3 3H5a3 3 0 1 1 0-6h26a3 3 0 0 1 3 3z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d-1f3fb.svg b/public/emoji/1f91d-1f3fb.svg
new file mode 100755
index 000000000..64a75c6fe
--- /dev/null
+++ b/public/emoji/1f91d-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F7DECE" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#E0AA94"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#EEC2AD"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d-1f3fc.svg b/public/emoji/1f91d-1f3fc.svg
new file mode 100755
index 000000000..0ecf3b905
--- /dev/null
+++ b/public/emoji/1f91d-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F3D2A2" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#D2A077"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#E2C196"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d-1f3fd.svg b/public/emoji/1f91d-1f3fd.svg
new file mode 100755
index 000000000..eaed0eff2
--- /dev/null
+++ b/public/emoji/1f91d-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#D4AB88" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#B78B60"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#CC9B7A"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d-1f3fe.svg b/public/emoji/1f91d-1f3fe.svg
new file mode 100755
index 000000000..6fc64a981
--- /dev/null
+++ b/public/emoji/1f91d-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#AF7E57" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#90603E"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#9B6A49"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d-1f3ff.svg b/public/emoji/1f91d-1f3ff.svg
new file mode 100755
index 000000000..adf55f4f7
--- /dev/null
+++ b/public/emoji/1f91d-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#7C533E" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#583529"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#664131"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f91d.svg b/public/emoji/1f91d.svg
index 3d797a089..1deae92e9 100644
--- a/public/emoji/1f91d.svg
+++ b/public/emoji/1f91d.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M17 18s-6.031 5.274-7.74 6.832c-1.323 1.203.88 3.498 2.135 2.452 3.333-2.785 6.493-4.85 6.493-4.85l.367.526c-1.309.79-4.693 2.858-6.449 4.438-1.324 1.19.767 3.553 2.093 2.365 1.822-1.634 5.995-4.565 5.995-4.565l.368.384c-1.08.679-2.772 1.94-4.985 3.958-1.332 1.215.619 2.485 1.764 1.534 3.116-2.586 3.232-4.383 6.661-5.85C28.935 22.986 17 18 17 18z"/><path fill="#FFCC4D" d="M29.979 8.836c.881-.438 1.653.144 2.106 1.053.448.911 2.532 5.015 2.953 5.869.425.852.191 2.103-.719 2.553-.911.453-2.234 1.054-3.092 2.512-.465.794-2.396 2.887-7.629 5.129-3.427 1.462-6.165 3.938-7.261 4.8-.886.698-2.673-.637-1.343-1.85 2.214-2.02 3.906-3.281 4.985-3.958l-.368-.386s-4.381 3.056-6.238 4.65c-1.261 1.085-2.938-.953-1.613-2.142 1.757-1.58 4.902-3.954 6.211-4.744l-.366-.529s-3.43 2.231-6.765 5.02c-1.113.93-2.847-1.159-1.525-2.364 1.71-1.555 5.043-4.343 7.093-5.499l-.196-.609s-3.218 1.805-5.996 4.494c-.994.961-2.974-.818-1.525-2.293 3.462-3.522 7.958-5.609 9.154-6.413 1.606-1.08 2.451-1.754 1.606-2.133-1.274-.573-3.396-2.582-4.21-4.21-1.053-2.106.44-3.77 2.105-2.106 1.053 1.053 3.159 3.158 5.263 3.158 2.829 0 3.262 1.053 5.264 1.053 1.054-.002 2.106-1.055 2.106-1.055"/><path fill="#EF9645" d="M25.048 15.167c-.334.001-1.439-.15-2.684-.725-1.073-.494-1.905-1.39-2.597-2.142.039.161-.065.354-.283.58.681.792 1.723 1.696 2.654 2.146 1.082.525 2.315.79 2.871.767.572-.024.385-.622.039-.626zm2.167 8.58c-2.264-1.054-4.062-1.934-.974-.66 1.277.525 3.194-2.06 1.315-2.917C23.774 18.444 12 12 12 12s-6.368 7.437-5.58 7.914c.789.474 1.118 3.849 5.665 6.818 4.298 2.808 6.975 4.015 7.981 4.518 2.107 1.053 3.477-1.678 1.833-2.412-2.833-1.266-2.734-1.343 1.418.382 1.537.64 2.829-2.25 1.205-2.981-2.422-1.089-2.64-1.221 1.239.527 1.435.643 3.073-2.264 1.454-3.019z"/><path fill="#FFDC5D" d="M7.09 9.278c-.842-.509-1.96-.256-2.485.615-.525.871-2.828 4.683-3.319 5.5-.492.816-.364 2.079.506 2.604.87.526 2.447 1.477 3.236 1.952.789.477 4.011 4.477 8.662 7.279 4.648 2.808 6.366 3.286 7.412 3.697 1.05.41 2.437-1.683.793-2.416-2.837-1.268-4.836-2.438-5.859-3.205l.318-.585s2.837 2.12 6.987 3.848c1.537.64 2.79-1.754 1.167-2.487-2.423-1.089-5.412-2.894-6.651-3.79l.346-.571s3.946 2.494 7.825 4.242c1.431.645 2.632-1.786 1.013-2.542-2.26-1.054-5.448-2.955-7.394-4.277l.338-.5s3.615 2.551 6.705 3.823c1.277.528 2.78-1.861.899-2.721C23.81 18.019 19.525 15 18.401 14.1c-.918-.737-1.181-2.413 1.052-3.158 3.158-1.053 4.211-3.158 4.211-4.211 0-1.489-1.376-2.146-2.104-1.053-2.107 3.158-3.166 2.082-5.263 3.158-2.514 1.291-5.466 2.662-7.179 1.628-.733-.441-2.028-1.186-2.028-1.186"/><path fill="#FFCC4D" d="M18.948 11.721l5.426-2.712c-.477-.102-1.04-.172-1.763-.172-2.104 0-4.21-2.105-5.263-3.158-1.665-1.664-3.158 0-2.105 2.106.715 1.428 2.433 3.148 3.705 3.936z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EF9645" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#FFDC5D" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z" fill="#EF9645"/><path d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z" fill="#FFCC4D"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f921.svg b/public/emoji/1f921.svg
index 6d16a6624..6ca668dca 100644
--- a/public/emoji/1f921.svg
+++ b/public/emoji/1f921.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#4289C1" cx="29" cy="3" r="2"/><circle fill="#4289C1" cx="33" cy="8" r="3"/><circle fill="#4289C1" cx="33" cy="4" r="3"/><circle fill="#4289C1" cx="7" cy="3" r="2"/><circle fill="#4289C1" cx="3" cy="8" r="3"/><circle fill="#4289C1" cx="3" cy="4" r="3"/><path fill="#FEE7B8" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><circle fill="#4289C1" cx="30.5" cy="4.5" r="2.5"/><circle fill="#4289C1" cx="32" cy="7" r="2"/><circle fill="#4289C1" cx="5.5" cy="4.5" r="2.5"/><circle fill="#4289C1" cx="4" cy="7" r="2"/><circle fill="#FF7892" cx="6.93" cy="21" r="4"/><circle fill="#FF7892" cx="28.93" cy="21" r="4"/><path fill="#DA2F47" d="M27.335 23.629c-.178-.161-.444-.171-.635-.029-.039.029-3.922 2.9-8.7 2.9-4.766 0-8.662-2.871-8.7-2.9-.191-.142-.457-.13-.635.029-.177.16-.217.424-.094.628C8.7 24.472 11.788 31 18 31s9.301-6.528 9.429-6.743c.123-.205.084-.468-.094-.628z"/><path fill="none" d="M27.335 23.629c-.178-.161-.444-.171-.635-.029-.039.029-3.922 2.9-8.7 2.9-4.766 0-8.662-2.871-8.7-2.9-.191-.142-.457-.13-.635.029-.177.16-.217.424-.094.628C8.7 24.472 11.788 31 18 31s9.301-6.528 9.429-6.743c.123-.205.084-.468-.094-.628z"/><ellipse fill="#664500" cx="11.5" cy="11.5" rx="2.5" ry="3.5"/><ellipse fill="#664500" cx="25.5" cy="11.5" rx="2.5" ry="3.5"/><circle fill="#BB1A34" cx="18.5" cy="19.5" r="3.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#4289C1" cx="29" cy="3" r="2"/><circle fill="#4289C1" cx="33" cy="8" r="3"/><circle fill="#4289C1" cx="33" cy="4" r="3"/><circle fill="#4289C1" cx="7" cy="3" r="2"/><circle fill="#4289C1" cx="3" cy="8" r="3"/><circle fill="#4289C1" cx="3" cy="4" r="3"/><path fill="#FEE7B8" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><circle fill="#4289C1" cx="30.5" cy="4.5" r="2.5"/><circle fill="#4289C1" cx="32" cy="7" r="2"/><circle fill="#4289C1" cx="5.5" cy="4.5" r="2.5"/><circle fill="#4289C1" cx="4" cy="7" r="2"/><circle fill="#FF7892" cx="6.93" cy="21" r="4"/><circle fill="#FF7892" cx="28.93" cy="21" r="4"/><path fill="#DA2F47" d="M27.335 23.629c-.178-.161-.444-.171-.635-.029-.039.029-3.922 2.9-8.7 2.9-4.766 0-8.662-2.871-8.7-2.9-.191-.142-.457-.13-.635.029-.177.16-.217.424-.094.628C8.7 24.472 11.788 31 18 31s9.301-6.528 9.429-6.743c.123-.205.084-.468-.094-.628z"/><ellipse fill="#664500" cx="11.5" cy="11.5" rx="2.5" ry="3.5"/><ellipse fill="#664500" cx="25.5" cy="11.5" rx="2.5" ry="3.5"/><circle fill="#BB1A34" cx="18.5" cy="19.5" r="3.5"/></svg>
diff --git a/public/emoji/1f979.svg b/public/emoji/1f979.svg
new file mode 100755
index 000000000..1944a5463
--- /dev/null
+++ b/public/emoji/1f979.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><path fill="#65471B" d="M18 31c-5.629 0-6.896-3.527-6.947-3.678a1 1 0 0 1 1.889-.658C12.987 26.782 13.895 29 18 29c4.128 0 5.022-2.242 5.059-2.337.193-.51.763-.78 1.276-.596s.788.739.612 1.255C24.896 27.473 23.629 31 18 31zM28.994 8.011A1.005 1.005 0 0 0 28.011 7c-.067-.001-1.653-.056-3.304-1.707a.999.999 0 1 0-1.414 1.414C25.56 8.974 27.901 9 28 9a.995.995 0 0 0 .994-.989zM12.707 6.707a.999.999 0 1 0-1.414-1.414C9.652 6.934 8.075 6.998 7.99 7A1 1 0 0 0 8 9c.099 0 2.44-.026 4.707-2.293z"/><path fill="#FFF" d="M29.895 15.058c-2.186-3.426-6.094-4.536-8.157-3.659-1.14.483-1.711 2.022-1.737 4.647-.006.616.018 1.294.072 2.032.032.435.067.876.119 1.353.134 1.219.777 2.181 1.859 2.779.72.399 1.581.604 2.471.661 1.523.096 3.137-.246 4.281-.799 1.21-.584 1.996-1.636 2.158-2.886.162-1.243-.187-2.749-1.066-4.128z"/><path fill="#F4900C" d="M30.962 19.186c.161-1.243-.188-2.75-1.067-4.128a8.85 8.85 0 0 0-1.631-1.878 5.958 5.958 0 0 0-2.764-.68 6.005 6.005 0 0 0-5.498 3.606c-.004.601.018 1.257.071 1.973.032.435.067.876.12 1.353.134 1.219.777 2.181 1.859 2.779.72.399 1.581.604 2.471.661 1.523.096 3.137-.246 4.281-.799 1.21-.585 1.996-1.636 2.158-2.887z"/><circle fill="#65471B" cx="25.5" cy="18" r="4"/><ellipse transform="rotate(-45.028 24.498 14.999)" fill="#FFF" cx="24.5" cy="15" rx="1.674" ry="1.303"/><path fill="#5DADEC" d="M21.81 22.648c.747.414 1.649.657 2.682.722.182.011.365.017.549.017 1.392 0 2.843-.315 3.981-.864.973-.47 1.698-1.214 2.102-2.117a.585.585 0 0 0-.254-.753c-1.421-.771-2.921 1.362-4.872 1.362-1.952 0-4.074-.936-5.256 0a.506.506 0 0 0-.065.728c.309.353.686.658 1.133.905z"/><path fill="#FFF" d="M6.105 15.058c2.186-3.426 6.094-4.536 8.157-3.659 1.14.483 1.711 2.022 1.737 4.647.006.616-.018 1.294-.072 2.032-.032.435-.067.876-.119 1.353-.134 1.219-.777 2.181-1.859 2.779-.72.399-1.581.604-2.471.661-1.523.096-3.137-.246-4.281-.799-1.21-.584-1.996-1.636-2.158-2.886-.162-1.243.187-2.749 1.066-4.128z"/><path fill="#F4900C" d="M15.808 19.432c-.134 1.219-.777 2.181-1.859 2.779-.72.399-1.581.604-2.471.661-1.523.096-3.137-.246-4.281-.799-1.21-.584-1.996-1.636-2.158-2.886-.161-1.243.188-2.75 1.067-4.128a8.85 8.85 0 0 1 1.631-1.878 5.958 5.958 0 0 1 2.764-.68 6.005 6.005 0 0 1 5.498 3.606c.004.601-.018 1.257-.071 1.973a41.06 41.06 0 0 1-.12 1.352z"/><circle fill="#65471B" cx="10.5" cy="18" r="4"/><path fill="#FFF" d="M10.954 15c-.203.828-1.019 1.5-1.822 1.5-.803 0-1.289-.672-1.086-1.5s1.019-1.5 1.822-1.5c.803 0 1.289.672 1.086 1.5z"/><path fill="#5DADEC" d="M14.19 22.648c-.747.414-1.649.657-2.682.722a9.097 9.097 0 0 1-.549.017c-1.392 0-2.843-.315-3.981-.864-.973-.47-1.698-1.214-2.102-2.117a.585.585 0 0 1 .254-.753c1.421-.771 2.921 1.362 4.872 1.362 1.952 0 4.074-.936 5.256 0a.506.506 0 0 1 .065.728 4.178 4.178 0 0 1-1.133.905z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f9cc.svg b/public/emoji/1f9cc.svg
new file mode 100755
index 000000000..ebc08baf0
--- /dev/null
+++ b/public/emoji/1f9cc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#898379" d="M6 23c-4 0-4.5 2.5-4.5 2.5L0 25v11h36V25l-1 1s-1-3-4-3H6z"/><path fill="#4A4153" d="M34.712 11.129C32.343 4.839 25.009 3.077 18 3.077c-.15 0-.285.006-.432.007-.77-.018-5.121-.148-7.939-.897A.498.498 0 0 0 9 2.67V4s-4.126-.688-6.676-1.493a.501.501 0 0 0-.579.734l2.14 3.567C.736 10.28 3 15.31 3 18c0 8 3 8 3 8h23c3.497 0 4-4.503 4-8 0-1.451.599-2.767.137-5.338a.93.93 0 0 1 1.15-1.063.358.358 0 0 0 .425-.47z"/><path fill="#69615D" d="M9 29c-.155 0-.309.036-.447.105C5.602 30.581 5.038 35.898 5 36h26c-.038-.102-.602-5.419-3.553-6.895A1.002 1.002 0 0 0 27 29H9z"/><path fill="#A6D388" d="M9 30c-1.148.574-1.307 1.806-1.235 2.752a5.396 5.396 0 0 1-.551 2.821L7 36h22l-.214-.427a5.396 5.396 0 0 1-.551-2.821c.072-.946-.087-2.178-1.235-2.752H9z"/><path fill="#77B255" d="M17.946 33.923c4.734 0 8.014-.675 10.285-1.886-.062-.783-.357-1.6-1.231-2.037H9c-.86.43-1.16 1.229-1.228 2.001 2.365 1.304 5.675 1.922 10.174 1.922z"/><path fill="#A6D388" d="M24.354 14.222c1.045.385 2.045 1.714 2.175 2.448.13.735.261 1.329-.565.594-3.312-2.942-6.919-1.783-10.495-3.581-2.497-1.255-3.257-2.644-3.257-2.644s-.305 1.853-4.091 3.741c-1.46.729-3.122.443-3.122 3.22 0 7.483-1.258 13.923 12.947 13.923 11.26 0 12.87-3.814 13.054-9.121.003-3.604-.463-5.009-1.598-6.272-.992-1.105-2.263-1.993-5.048-2.308z"/><path fill="#77B255" d="M20 24h-4a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2z"/><path fill="#744629" d="M23 28H13a1 1 0 0 1 0-2h10a1 1 0 0 1 0 2z"/><path d="M15 16h-4a1 1 0 0 0 0 2h1v2a1 1 0 1 0 2 0v-2h1a1 1 0 0 0 0-2zm10 0h-4a1 1 0 0 0 0 2h1v2a1 1 0 1 0 2 0v-2h1a1 1 0 0 0 0-2z" fill="#3E721D"/><path d="M31 13c2 2 2 5 2 5l3-5s-2-2-5 0zM5 13c-2 2-2 5-2 5l-3-5s2-2 5 0z" fill="#A6D388"/><path d="M.983 30.656a.1.1 0 0 1-.116.028.1.1 0 0 1-.06-.104c.095-.792.452-2.923 1.623-4.209a.1.1 0 0 1 .174.061c.129 1.932-1.116 3.623-1.621 4.224zM.95 33.678c-.01.038.004.079.035.104s.074.028.109.009c.462-.248.983-.784 1.221-1.485.289-.853.269-1.434.226-1.723a.102.102 0 0 0-.073-.082.1.1 0 0 0-.104.034 6.14 6.14 0 0 0-.794 1.279c-.299.655-.521 1.485-.62 1.864zm3.594-7.465a.1.1 0 0 0-.07-.085.097.097 0 0 0-.105.031c-.758.89-.897 2.264-.922 2.817a.1.1 0 0 0 .173.074 3.532 3.532 0 0 0 .924-2.837zm1.169 3.024a.1.1 0 0 0-.06-.108.1.1 0 0 0-.119.033c-.951 1.296-2.363 4.513-2.831 5.606a.1.1 0 0 0 .033.12.1.1 0 0 0 .124-.004c.515-.44 1.532-1.404 2.012-2.528.483-1.135.739-2.485.841-3.119zm24.448.423a.101.101 0 0 0-.114-.005.1.1 0 0 0-.044.105c.23 1.084.886 2.467 1.942 3.3a.1.1 0 0 0 .114.007.1.1 0 0 0 .046-.105c-.121-.615-.559-2.244-1.944-3.302zm4.729 4.28a.1.1 0 0 0 .145-.119c-.235-.677-1.032-2.6-2.692-3.283a.097.097 0 0 0-.104.018.1.1 0 0 0-.03.102c.525 1.879 2.097 2.943 2.681 3.282zm-.695-3.493a.1.1 0 0 0 .128-.127c-.374-1.05-1.476-2.639-2.95-3.014a.1.1 0 0 0-.12.126c.629 2.025 2.365 2.806 2.942 3.015zm.763-1.791a.1.1 0 0 0 .16-.102c-.263-1.09-1.298-2.795-2.646-3.282a.1.1 0 0 0-.105.024.102.102 0 0 0-.023.105c.552 1.499 2.058 2.809 2.614 3.255z" fill="#69615D"/><path d="M31.505 13.587c.638-.509 1.681-.932 3.117-.571a.5.5 0 1 1-.244.97c-1.224-.309-1.959.114-2.327.447a6.29 6.29 0 0 0-.546-.846zm-27.01-.001c-.637-.509-1.68-.932-3.117-.571a.5.5 0 1 0 .244.97c1.225-.308 1.959.115 2.327.446a6.41 6.41 0 0 1 .546-.845z" fill="#77B255"/><path d="M13 27v-2s2 .667 2 2h-2zm10 0v-2s-2 .667-2 2h2z" fill="#FFEBA5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa7b.svg b/public/emoji/1fa7b.svg
new file mode 100755
index 000000000..fd81ad8ec
--- /dev/null
+++ b/public/emoji/1fa7b.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#88C9F9" d="M33 31c0 1.103-.897 2-2 2H5c-1.103 0-2-.897-2-2V5c0-1.103.897-2 2-2h26c1.103 0 2 .897 2 2v26z"/><path fill="#1C6399" d="M5 4c-.551 0-1 .449-1 1v26c0 .551.449 1 1 1h26c.551 0 1-.449 1-1V5c0-.551-.449-1-1-1H5z"/><path fill="#50A5E6" d="M30.562 15.127c-.944-1.292-8.539 2.967-8.613 3.014-.715.445-1.282.591-1.682.622.536-.76 1.513-1.98 2.791-2.869 6.217-4.319 5.939-4.93 5.735-5.376a.7.7 0 0 0-.486-.387c-1.081-.245-4.839 2.221-5.89 3.085-1.187.975-3.103 2.391-3.874 2.957-.877-.885.321-2.108 1.268-3.458 3.616-5.156 4.267-6.488 3.484-7.124a.797.797 0 0 0-.596-.161c-1.413.177-5.446 5.792-6.488 7.196-.887 1.192-2.942 3.345-3.659 2.048-.207-.375-.31-1.06.022-1.855.59-1.415.628-4.899-.859-5.226-1.723-.375-1.466 3.027-3.329 6.409-.631 1.145-1.227 2.227-1.186 4.864.057 3.657.096 4.554-3.2 8.797V31c0 .551.449 1 1 1h6.952c.661-1.208 1.208-2.184 1.36-2.401.359-.512 1.928-1.661 2.963-1.98 1.223-.377 3.453-1.846 4.043-2.666.517-.716 5.397-.748 7.61-3.038.289-.298.89-.92.495-1.473-.176-.249-.507-.71-2.961.44-1.203.563-3.721.927-4.637.8.751-.615 3.056-1.518 3.96-1.87 1.205-.469 3.617-1.706 4.509-2.501.675-.602 1.366-.833 1.467-1.456.041-.246-.026-.491-.199-.728z"/><path fill="#FFF" d="M11.327 26.382a.59.59 0 0 0-.405-.702c-.191-.057-.377-.139-.495-.256a1.436 1.436 0 1 1 2.155-1.885c.179.25.413.449.688.586.106.053.205.122.294.211a1.239 1.239 0 0 1 0 1.75.781.781 0 0 0-.235.548.984.984 0 0 1-.287.687 1.005 1.005 0 0 1-1.421.002c-.327-.328-.359-.667-.294-.941zm-1.659-.147a.73.73 0 1 0 1.034 1.031.73.73 0 0 0-1.034-1.031zm5.456-1.931c.528-.634 1.148-1.161 1.807-1.645.728-.589 1.599-.952 2.363-1.472.605-.741-.519-1.663-1.128-.929-1.088 1.217-2.383 2.26-3.865 2.958-.481.19-.582.881-.166 1.197a.704.704 0 0 0 .989-.109zm-4.46-1.518a.568.568 0 0 0-.001-.804c-.566-.564-1.444-.5-1.54-.489-.311.03-.538.304-.51.615s.308.535.614.517c.143-.011.484.013.634.162a.565.565 0 0 0 .803-.001zm12.88.359a.429.429 0 1 0-.166-.837c-.744.241-1.516.342-2.294.407a5.167 5.167 0 0 1-.635.058c.121.219.201.464.221.73.008.116.004.23-.009.342.936-.331 1.892-.597 2.883-.7zm-9.734-.131c.687-.849 1.489-1.573 2.29-2.299.825-.7 1.649-1.4 2.57-1.995.496-.309.53-1.065.056-1.414a.864.864 0 0 0-1.213.161c-1.372 1.691-2.906 3.222-4.667 4.503a.718.718 0 1 0 .964 1.044zm11.278-4.897a.877.877 0 0 1 .031.493l2.269-1.434c.286-.169.059-.634-.252-.509l-2.55.949c.22.088.408.26.502.501zm.807 4.175c.279-.136.136-.594-.176-.541-.082.02-1.122.143-1.588.23.2.121.353.318.41.564a.88.88 0 0 1-.039.486l1.393-.739zm-17.148 6.98c.515-.284 1.255-1.352.664-1.558 0 0-.239-.083-.76-.603-.745-.743-.87-1.58-.87-1.58-.27-1.806-1.722 2.406-3.781 3.63V31c0 .551.449 1 1 1h1.626c.22-.335.424-1.793 2.121-2.728zm1.474-9.259c-.147-.837-.033-1.748.164-2.568.057-.588.563-1.133.283-1.74a1.036 1.036 0 0 0-1.9.824c.115.266.162.526.192.784.068.782-.017 1.584-.479 2.255-.942 1.578 1.809 2.285 1.74.445zm16.591-7.951 1.022-1.035c.115-.109-.029-.307-.169-.228l-1.307.686a.66.66 0 0 1 .364.277.634.634 0 0 1 .09.3zm.45 9.069-1.063.264a.656.656 0 0 1 .294.336.647.647 0 0 1 .033.297l.858-.641c.125-.086.027-.298-.122-.256zm-3.497-3.148c-.854.494-1.791.816-2.746 1.083-.434.133-.873.253-1.314.364a1.774 1.774 0 0 1 .666 1.551c1.216-.785 2.465-1.497 3.845-1.95.799-.258.283-1.448-.451-1.048zM8.621 25.716a.567.567 0 1 0 .987-.563c-.338-.594-.128-1.168-.022-1.388a.568.568 0 1 0-1.024-.494c-.389.806-.368 1.697.059 2.445zm1.716-14.058c-.141 1.009-.673 1.886-1.251 2.729a1.684 1.684 0 0 1 1.259.021c.256.108.466.276.633.475-.02-.996.023-1.997.447-2.895.393-.831-.956-1.237-1.088-.33zm.751-2.765c-.065.645-.262 1.256-.51 1.851.171-.048.35-.07.535-.032.143.03.272.09.387.166.057-.617.161-1.228.366-1.815.228-.59-.739-.8-.778-.17zm4.545 17.14c1.039-.85 2.252-1.504 3.577-1.764.588-.069.857-.857.42-1.268a.748.748 0 0 0-1.058-.002c-.496.471-1.064.822-1.669 1.119-.693.408-1.509.514-2.216.863-.686.622.257 1.667.946 1.052zm-.468-10.925c-1.13 2.07-2.45 4.012-4.039 5.753-.714.8.602 1.759 1.146.84 1.201-2.142 2.801-3.985 4.43-5.805a.864.864 0 1 0-1.537-.788zm13.9.76-1.415.42a.656.656 0 0 1 .303.343.656.656 0 0 1 .03.312l1.203-.818c.135-.085.031-.307-.121-.257zM11.841 29.515a.857.857 0 1 0-1.416-.95A38.098 38.098 0 0 1 8.279 32h1.736c.576-.85 1.164-1.693 1.826-2.485zm14.086-17.586-2.362 1.352a.894.894 0 0 1 .578.413c.09.151.115.317.111.481l2.005-1.785c.254-.214-.046-.635-.332-.461zm-7.164-1.192c-.47.824-1.093 1.539-1.76 2.219a7.76 7.76 0 0 1-.884.893 1.768 1.768 0 0 1 1.341.999c.615-1.226 1.299-2.41 2.216-3.432.567-.625-.481-1.398-.913-.679zm3.99 3.153c-.765.718-1.649 1.287-2.563 1.809a29.8 29.8 0 0 1-1.361.773 1.773 1.773 0 0 1 1.029 1.374c1.094-1.135 2.24-2.207 3.579-3.045.707-.439-.068-1.465-.684-.911zm-1.552-6.001-1.865 1.982a.893.893 0 0 1 .674.227c.13.118.202.27.246.428l1.397-2.292c.181-.279-.229-.595-.452-.345zm1.198-1.42-.934.858a.656.656 0 0 1 .421.165c.08.073.132.162.168.257l.571-1.107c.076-.136-.113-.283-.226-.173z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa7c.svg b/public/emoji/1fa7c.svg
new file mode 100755
index 000000000..895af1d5b
--- /dev/null
+++ b/public/emoji/1fa7c.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#CCD6DD" d="M4.504 32.91a.498.498 0 0 1-.708 0l-.706-.707a.5.5 0 0 1 0-.707l3.889-3.889a.5.5 0 0 1 .707 0l.707.707a.5.5 0 0 1 0 .707L4.504 32.91z"/><path fill="#8899A6" d="M33.142 8.515 20.838 20.819a11.353 11.353 0 0 1-3.571 2.418l-2.931 1.256-4.869 4.869a1.518 1.518 0 0 1-2.146 0l-.683-.682a1.518 1.518 0 0 1 0-2.146l4.869-4.869 1.256-2.931a11.341 11.341 0 0 1 2.418-3.571L27.485 2.858a.5.5 0 0 1 .707.707L15.888 15.869c-.94.94-1.683 2.037-2.206 3.258l-.703 1.641a1.716 1.716 0 0 0 2.253 2.253l1.641-.703a10.368 10.368 0 0 0 3.258-2.206L32.435 7.808a.5.5 0 0 1 .707.707zM4.716 31.708l-.424-.424a.497.497 0 0 0-.526-.116l-2.687.99a.497.497 0 0 0-.181.116l-.637.636a.5.5 0 0 0 0 .708l2.122 2.122a.5.5 0 0 0 .708 0l.636-.637a.502.502 0 0 0 .116-.181l.99-2.687a.504.504 0 0 0-.117-.527z"/><path fill="#FFAC33" d="M18.881 12.876c.223.519.685.94 1.213 1.106.354.111.783.325 1.191.733s.622.837.733 1.191c.166.528.586.99 1.106 1.213l-1.178 1.178a2.013 2.013 0 0 0-1.213-1.106 2.911 2.911 0 0 1-1.191-.733 2.911 2.911 0 0 1-.733-1.191 2.01 2.01 0 0 0-1.106-1.213l1.178-1.178zm15.444-2.702a1.48 1.48 0 0 1-.474-.078 8.388 8.388 0 0 1-3.268-2.02l-2.66-2.66a8.411 8.411 0 0 1-2.02-3.268 1.5 1.5 0 1 1 2.846-.948c.262.785.71 1.51 1.295 2.095l2.66 2.66a5.394 5.394 0 0 0 2.095 1.295 1.5 1.5 0 0 1-.474 2.924z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faa9.svg b/public/emoji/1faa9.svg
new file mode 100755
index 000000000..e0243c0b0
--- /dev/null
+++ b/public/emoji/1faa9.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#ADE3FF" d="M22.981 18.944c-.053 2.052-.272 4.003-.628 5.752a39.945 39.945 0 0 1-4.353.295v-5.992c1.888-.003 3.539-.022 4.981-.055zM21.294 5.353c.907.161 1.781.371 2.611.611a10.44 10.44 0 0 0-3.637-2.022c.362.398.705.868 1.026 1.411zm-8.625 5.834A69.042 69.042 0 0 1 17 11.006V6.015c-.92.024-1.814.107-2.671.24-.682 1.297-1.255 2.982-1.66 4.932zm-9.027 2.549a14.443 14.443 0 0 0-.604 3.518c.329.096 1.004.198 1.981.295a18.8 18.8 0 0 1 .62-4.409c-1.071.235-1.763.452-1.997.596zM17 17.998v-5.993c-1.602.012-3.12.082-4.518.189a34.576 34.576 0 0 0-.48 5.735c1.506.041 3.177.065 4.998.069zM13.706 5.353a8.52 8.52 0 0 1 1.027-1.411 10.44 10.44 0 0 0-3.637 2.022c.829-.24 1.703-.45 2.61-.611z"/><path fill="#F0FFFF" d="M22.331 11.187A69.042 69.042 0 0 0 18 11.006V6.015c.92.024 1.814.107 2.671.24.682 1.297 1.255 2.982 1.66 4.932zM5.738 23.198a18.727 18.727 0 0 1-.716-4.645c-.922-.107-1.567-.225-2.011-.343.02 1.42.237 2.794.64 4.088.209.18.943.519 2.087.9zm5.893-11.927c.363-1.836.871-3.46 1.492-4.798A23.65 23.65 0 0 0 9.576 7.52c-1.02 1.226-1.857 2.685-2.466 4.309 1.36-.23 2.917-.419 4.521-.558zm-3.92 16.34c-.999-.493-1.695-.945-2.016-1.222a14.415 14.415 0 0 1-1.546-2.735c.536.242 1.2.485 1.97.721.425 1.162.96 2.247 1.592 3.236zM23.998 17.9c2.008-.066 3.685-.158 4.987-.262a17.755 17.755 0 0 0-.728-4.719 53.996 53.996 0 0 0-4.704-.636c.281 1.734.44 3.622.445 5.617zm5.038-5.86c.729.15 1.368.313 1.884.489a14.443 14.443 0 0 0-1.718-3.055c-.326-.275-1.008-.705-1.968-1.175a16.574 16.574 0 0 1 1.802 3.741zM11.595 24.553a34.586 34.586 0 0 1-.577-5.635c-2.126-.061-3.751-.154-4.993-.263.062 1.725.352 3.376.853 4.894 1.282.365 2.885.73 4.717 1.004z"/><path fill="#A8C1FF" d="M20.715 29.658c-.865.131-1.774.212-2.715.234V25.99a41.391 41.391 0 0 0 4.12-.268c-.373 1.526-.851 2.86-1.405 3.936zm9.267-12.109c.976-.097 1.652-.199 1.981-.295a14.434 14.434 0 0 0-.604-3.518c-.234-.144-.926-.361-1.997-.596.372 1.394.584 2.873.62 4.409zM14.921 30.743c.633.913 1.338 1.502 2.079 1.688v-1.538a21.98 21.98 0 0 1-2.079-.15z"/><path fill="#F1C6FF" d="M31.989 18.21a14.416 14.416 0 0 1-.64 4.088c-.21.181-.943.519-2.088.9.421-1.461.669-3.02.716-4.645.923-.107 1.568-.225 2.012-.343zm-8.798 7.379c-.335 1.452-.768 2.746-1.274 3.855a23.18 23.18 0 0 0 3.587-1.052 14.81 14.81 0 0 0 2.18-3.677 40.811 40.811 0 0 1-4.493.874zm-9.537 4.965a24.664 24.664 0 0 1-2.676-.626 10.498 10.498 0 0 0 3.755 2.13 8.66 8.66 0 0 1-1.079-1.504zm6.425.189a21.98 21.98 0 0 1-2.079.15v1.538c.741-.186 1.446-.775 2.079-1.688z"/><path fill="#CCB3FF" d="M14.285 29.658c-.554-1.076-1.032-2.41-1.405-3.935 1.338.153 2.726.249 4.12.268v3.902a21.7 21.7 0 0 1-2.715-.235zm14.596-5.283a16.559 16.559 0 0 1-1.592 3.236c.999-.493 1.695-.945 2.016-1.222a14.47 14.47 0 0 0 1.546-2.735c-.535.242-1.2.485-1.97.721zm-4.9-5.457a34.366 34.366 0 0 1-.577 5.635 37.787 37.787 0 0 0 4.716-1.004c.501-1.518.791-3.169.853-4.894-1.24.109-2.866.202-4.992.263zm-2.635 11.636a8.66 8.66 0 0 1-1.079 1.504 10.475 10.475 0 0 0 3.755-2.13 24.61 24.61 0 0 1-2.676.626zM35.5 3A2.503 2.503 0 0 1 33 .5a.5.5 0 0 0-1 0C32 1.878 30.878 3 29.5 3a.5.5 0 0 0 0 1C30.878 4 32 5.122 32 6.5a.5.5 0 0 0 1 0C33 5.122 34.122 4 35.5 4a.5.5 0 0 0 0-1z"/><path fill="#B0F7FF" d="M18 5.016V3.569c.712.179 1.389.736 2.002 1.589-.66-.08-1.33-.125-2.002-.142zm3.877 1.456c.621 1.339 1.129 2.962 1.492 4.798 1.603.139 3.161.328 4.521.557-.609-1.624-1.446-3.083-2.466-4.309a23.974 23.974 0 0 0-3.547-1.046zM18 12.005v5.993c1.821-.004 3.492-.029 4.999-.069a34.595 34.595 0 0 0-.48-5.735A66.538 66.538 0 0 0 18 12.005zm-1 12.986v-5.992a235.782 235.782 0 0 1-4.981-.055c.053 2.052.272 4.003.628 5.752 1.356.166 2.817.275 4.353.295zm-5.553-12.708c-1.84.172-3.436.402-4.704.636a17.708 17.708 0 0 0-.728 4.719c1.303.104 2.98.196 4.987.262.005-1.995.164-3.883.445-5.617zm3.551-7.125c.66-.08 1.33-.125 2.002-.142V3.569c-.712.179-1.389.736-2.002 1.589zM5.964 12.04a16.574 16.574 0 0 1 1.802-3.741c-.96.469-1.642.9-1.968 1.175a14.487 14.487 0 0 0-1.718 3.055 16.116 16.116 0 0 1 1.884-.489zm7.12 17.403c-.506-1.109-.939-2.403-1.274-3.855a40.513 40.513 0 0 1-4.492-.874 14.829 14.829 0 0 0 2.18 3.677c1.04.4 2.25.775 3.586 1.052zM35.5 31a2.503 2.503 0 0 1-2.5-2.5.5.5 0 0 0-1 0c0 1.378-1.122 2.5-2.5 2.5a.5.5 0 0 0 0 1c1.378 0 2.5 1.122 2.5 2.5a.5.5 0 0 0 1 0c0-1.378 1.122-2.5 2.5-2.5a.5.5 0 0 0 0-1z"/><path fill="#49A8FF" d="M30.289 9.26a1.5 1.5 0 0 0-.232-.31C23.847.358 11.16.347 4.942 8.95c-.102.11-.181.214-.231.31a15.418 15.418 0 0 0 .216 17.769c.013.012.023.036.037.049 6.213 8.556 18.854 8.567 25.074 0l.046-.039a15.457 15.457 0 0 0 .205-17.779zm-.984 17.129c-.321.277-1.018.728-2.016 1.222a16.559 16.559 0 0 0 1.592-3.236 16.89 16.89 0 0 0 1.97-.721 14.47 14.47 0 0 1-1.546 2.735zM4.149 23.654c.536.242 1.2.485 1.97.721.425 1.162.96 2.248 1.592 3.236-.999-.493-1.695-.945-2.016-1.222a14.47 14.47 0 0 1-1.546-2.735zm27.2-1.357c-.21.181-.943.519-2.088.9.421-1.461.669-3.02.716-4.645.923-.107 1.568-.225 2.012-.344a14.412 14.412 0 0 1-.64 4.089zM3.038 17.254c.062-1.217.259-2.398.604-3.518.234-.144.926-.361 1.997-.596a18.8 18.8 0 0 0-.62 4.409c-.977-.097-1.652-.199-1.981-.295zm3.705-4.335a53.996 53.996 0 0 1 4.704-.636 35.79 35.79 0 0 0-.445 5.616 109.636 109.636 0 0 1-4.987-.262c.032-1.657.288-3.242.728-4.718zm25.219 4.335c-.329.096-1.004.198-1.981.295a18.8 18.8 0 0 0-.62-4.409c1.07.235 1.762.452 1.997.596.345 1.12.542 2.302.604 3.518zm-2.977.384c-1.303.104-2.98.196-4.987.262a35.79 35.79 0 0 0-.445-5.616c1.84.172 3.436.402 4.704.636.44 1.475.696 3.06.728 4.718zM18 6.015c.92.024 1.814.107 2.671.24.682 1.298 1.255 2.983 1.66 4.932A69.042 69.042 0 0 0 18 11.006V6.015zm-1 4.99a69.81 69.81 0 0 0-4.331.181c.405-1.95.978-3.634 1.66-4.932A20.83 20.83 0 0 1 17 6.015v4.99zm0 1v5.993a206.135 206.135 0 0 1-4.999-.069c.004-2.026.177-3.966.48-5.735A66.538 66.538 0 0 1 17 12.005zm0 6.994v5.992a40.197 40.197 0 0 1-4.353-.295c-.356-1.75-.575-3.701-.628-5.752 1.442.033 3.093.052 4.981.055zm0 6.992v3.902a21.513 21.513 0 0 1-2.715-.235c-.554-1.076-1.032-2.41-1.405-3.935 1.338.153 2.726.249 4.12.268zm1 0a41.391 41.391 0 0 0 4.12-.268c-.374 1.525-.852 2.859-1.405 3.935-.865.131-1.774.212-2.715.234v-3.901zm0-1v-5.992c1.888-.003 3.539-.022 4.981-.055-.053 2.052-.272 4.003-.628 5.752a40.197 40.197 0 0 1-4.353.295zm0-6.993v-5.993c1.602.012 3.12.082 4.518.189.303 1.768.476 3.708.48 5.735-1.506.041-3.177.065-4.998.069zm5.369-6.727c-.363-1.836-.871-3.46-1.492-4.798a23.65 23.65 0 0 1 3.547 1.047c1.02 1.226 1.857 2.685 2.466 4.309a57.483 57.483 0 0 0-4.521-.558zm-2.075-5.918a8.575 8.575 0 0 0-1.026-1.411 10.44 10.44 0 0 1 3.637 2.022c-.83-.24-1.704-.45-2.611-.611zm-1.292-.195c-.66-.08-1.33-.125-2.002-.142V3.569c.712.179 1.389.736 2.002 1.589zM17 5.016c-.672.017-1.342.062-2.002.142.614-.852 1.29-1.41 2.002-1.589v1.447zm-3.294.337c-.907.161-1.781.371-2.611.611a10.44 10.44 0 0 1 3.637-2.022 8.575 8.575 0 0 0-1.026 1.411zm-.583 1.119c-.621 1.339-1.129 2.962-1.492 4.798a58.043 58.043 0 0 0-4.521.557c.609-1.624 1.446-3.083 2.466-4.309a23.974 23.974 0 0 1 3.547-1.046zm-2.104 12.446c.047 2.015.247 3.913.577 5.635a37.787 37.787 0 0 1-4.716-1.004 17.658 17.658 0 0 1-.853-4.894c1.24.109 2.866.202 4.992.263zm.79 6.671c.335 1.452.768 2.746 1.274 3.855a23.18 23.18 0 0 1-3.587-1.052 14.81 14.81 0 0 1-2.18-3.677c1.323.341 2.856.646 4.493.874zm1.845 4.965a8.66 8.66 0 0 0 1.079 1.504 10.475 10.475 0 0 1-3.755-2.13c.838.247 1.735.46 2.676.626zm1.267.189a21.98 21.98 0 0 0 2.079.15v1.538c-.741-.186-1.446-.775-2.079-1.688zm3.079.15a21.653 21.653 0 0 0 2.079-.15c-.633.913-1.338 1.502-2.079 1.688v-1.538zm3.346-.339c.94-.166 1.838-.379 2.676-.626a10.498 10.498 0 0 1-3.755 2.13 8.66 8.66 0 0 0 1.079-1.504zm.57-1.111c.506-1.109.939-2.403 1.274-3.855a40.513 40.513 0 0 0 4.492-.874 14.829 14.829 0 0 1-2.18 3.677 23.1 23.1 0 0 1-3.586 1.052zm1.489-4.89c.329-1.722.529-3.62.577-5.635 2.126-.061 3.751-.154 4.993-.263a17.658 17.658 0 0 1-.853 4.894c-1.282.365-2.885.73-4.717 1.004zm7.515-12.024a16.318 16.318 0 0 0-1.884-.489 16.574 16.574 0 0 0-1.802-3.741c.96.469 1.642.9 1.968 1.175a14.443 14.443 0 0 1 1.718 3.055zM7.766 8.299a16.66 16.66 0 0 0-1.802 3.741 15.97 15.97 0 0 0-1.884.489 14.443 14.443 0 0 1 1.718-3.055c.326-.275 1.007-.705 1.968-1.175zM5.023 18.553c.047 1.625.294 3.183.716 4.645-1.145-.381-1.878-.72-2.088-.9a14.452 14.452 0 0 1-.64-4.088c.444.118 1.089.236 2.012.343zM4.5 6C3.673 6 3 6.673 3 7.5c0 .662-1 .661-1 0C2 6.673 1.327 6 .5 6c-.662 0-.661-1 0-1C1.327 5 2 4.327 2 3.5c0-.662 1-.661 1 0C3 4.327 3.673 5 4.5 5c.662 0 .661 1 0 1z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faaa.svg b/public/emoji/1faaa.svg
new file mode 100755
index 000000000..391e3d127
--- /dev/null
+++ b/public/emoji/1faaa.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#DFCEBF" d="M35 26.5a1.5 1.5 0 0 1-1.5 1.5h-31A1.5 1.5 0 0 1 1 26.5v-19A1.5 1.5 0 0 1 2.5 6h31A1.5 1.5 0 0 1 35 7.5v19z"/><path fill="#FFFFF5" d="M14 23a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V13a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v10z"/><path d="M30 15H18a1 1 0 0 1 0-2h12a1 1 0 0 1 0 2zm-4 3a1 1 0 0 0-1-1h-7a1 1 0 0 0 0 2h7a1 1 0 0 0 1-1zm3 4a1 1 0 0 0-1-1H18a1 1 0 0 0 0 2h10a1 1 0 0 0 1-1zm-16 2a1 1 0 0 0 1-1v-.003a.74.74 0 0 0-.34-.623c-.702-.453-1.778-.825-2.746-.991v-.819c.638-.43 1.302-1.206 1.501-2.2.059.033.066.054.132.054.316 0 .545-.411.545-.917 0-.498-.263-.902-.572-.914.06-.215.094-.503.094-.873 0-1.234-1.061-2.714-3.441-2.714-2.115 0-3.439 1.481-3.439 2.714 0 .358.022.652.06.879-.291.044-.52.431-.52.908 0 .506.257.917.573.917.066 0 .008-.021.067-.054.199.994.853 1.77 1.491 2.2v.77c-1.021.132-2.298.545-3.088 1.058a.7.7 0 0 0-.317.584V23a1 1 0 0 0 1 1h8zm6-15a1 1 0 0 0-1-1H5a1 1 0 0 0 0 2h13a1 1 0 0 0 1-1z" fill="#7D7585"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faab.svg b/public/emoji/1faab.svg
new file mode 100755
index 000000000..a7b3b9e7b
--- /dev/null
+++ b/public/emoji/1faab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E1E8ED" d="M18 0C11.373 0 6 1.343 6 3v29.7h24V3c0-1.657-5.373-3-12-3z"/><path fill="#D42544" d="M6 24.7v8c0 1.657 5.373 3.3 12 3.3s12-1.643 12-3.3v-8H6z"/><path fill="#FF475C" d="M30 24.7c0 1.657-5.373 3.3-12 3.3S6 26.357 6 24.7c0-1.657 5.373-2.7 12-2.7s12 1.043 12 2.7z"/><path fill="#99AAB5" d="M21.956 12.788c.091.544-.321 1.066-.922 1.136-.676.079-1.355.121-2.035.147V16a1 1 0 0 1-2 0v-1.93a26.188 26.188 0 0 1-2.035-.147c-.601-.07-1.012-.591-.922-1.136a1.042 1.042 0 0 1 1.152-.851c.6.07 1.202.109 1.804.133V10a1 1 0 0 1 2 0v2.07a24.781 24.781 0 0 0 1.804-.133 1.042 1.042 0 0 1 1.154.851zM26.651 3c-1.73-.597-4.952-1-8.651-1s-6.921.403-8.651 1H8v1c0 1.105 4.477 2 10 2s10-.895 10-2V3h-1.349z"/><ellipse fill="#CCD6DD" cx="18" cy="3" rx="10" ry="2"/><path fill="#99AAB5" d="M14 1v1.5c0 .552 1.791 1 4 1s4-.448 4-1V1h-8z"/><ellipse fill="#CCD6DD" cx="18" cy="1" rx="4" ry="1"/><path fill="#FFF" d="M15.478 32.522c-.609-.067-1.026-.59-.934-1.134a1.048 1.048 0 0 1 1.153-.854c1.531.168 3.076.168 4.607 0a1.048 1.048 0 0 1 1.153.854c.091.544-.326 1.067-.934 1.134a23.123 23.123 0 0 1-5.045 0z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faac.svg b/public/emoji/1faac.svg
new file mode 100755
index 000000000..8a2186021
--- /dev/null
+++ b/public/emoji/1faac.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#3B94D9" d="M31.496 20.326a.588.588 0 0 0 .406-.239.522.522 0 0 0 .078-.446C31.554 18.134 29.677 17 27.425 17c-.837 0-1.67.28-2.425.68V6.5a2.5 2.5 0 1 0-5 0v-4a2.5 2.5 0 1 0-5 0v4a2.5 2.5 0 1 0-5 0v11.181c-.755-.4-1.587-.681-2.425-.681-2.252 0-4.13 1.134-4.556 2.64a.522.522 0 0 0 .078.446.588.588 0 0 0 .406.239c6.94.885 1.222 15.255 13.996 15.666 12.776-.41 7.058-14.781 13.997-15.665z"/><path fill="#FFF" d="M24 26.5S21.09 30 17.5 30 11 26.5 11 26.5s2.91-3.5 6.5-3.5 6.5 3.5 6.5 3.5z"/><circle fill="#5DADEC" cx="17.5" cy="26.5" r="3.5"/><circle cx="17.5" cy="26.5" r="2.5"/><circle fill="#FFF" cx="16" cy="25" r="1"/><path d="M15 3.5v-1a2.5 2.5 0 1 1 5 0v1a2.5 2.5 0 1 0-5 0zm17.686 16.236C31.848 18.074 29.783 17 27.425 17c-3.018 0-3.722 2.079-6.425 2.195 0-13.845-.267-13.703.653-14.043C23.206 4.575 25 5.702 25 7.5v-1c0-2.385-3.037-3.421-4.489-1.5-.661.876-.511.284-.511 14.145-1.157-.178-1.91-.715-2.5-1.109-.621.414-1.316.927-2.5 1.109V7.5c-.067-.367.253-1.489-.511-2.5C13.042 3.085 10 4.112 10 6.5v1c0-1.799 1.794-2.924 3.347-2.348.923.342.653.21.653 14.043C11.277 19.078 10.639 17 7.575 17c-2.358 0-4.423 1.074-5.261 2.736l.91.459c.961-1.911 4.422-3.228 7.634-1.011 1.954 1.35 4.663 1.373 6.642.054 1.979 1.319 4.688 1.295 6.642-.054 3.129-2.159 6.644-.959 7.634 1.011l.91-.459z" fill="#A8E0F9"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fab7.svg b/public/emoji/1fab7.svg
new file mode 100755
index 000000000..b32a58fd1
--- /dev/null
+++ b/public/emoji/1fab7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EF8294" d="M15.274 20.121c-2.712 0-4.91-2.837-4.91-7.063 0-4.319 2.035-6.272 2.896-6.905a.5.5 0 0 1 .667.068c.891.989 3.528 4.137 3.528 6.778 0 4.227.528 7.122-2.181 7.122zm5.452 0c2.712 0 4.91-2.837 4.91-7.063 0-4.319-2.035-6.272-2.896-6.905a.5.5 0 0 0-.667.068c-.891.989-3.528 4.137-3.528 6.778 0 4.227-.528 7.122 2.181 7.122z"/><path fill="#F4ABBA" d="M18 21.182c-5.17-5.25-3.322-6.513-14.294-10.218a.5.5 0 0 0-.62.276c-1.804 4.216-1.369 7.359 4.201 8.894-2.141-.014-4.393.249-6.813.492a.5.5 0 0 0-.447.55c.325 3.099 3.617 7.551 11.214 5.121A2.68 2.68 0 0 0 11 27.392c0 2.683 5.164 4.224 6.62 4.605a1.528 1.528 0 0 0 .76 0c1.456-.381 6.62-1.922 6.62-4.605 0-.387-.089-.751-.241-1.094 7.596 2.43 10.888-2.022 11.214-5.121a.5.5 0 0 0-.447-.55c-2.42-.243-4.671-.507-6.813-.492 5.57-1.535 6.004-4.678 4.201-8.894a.5.5 0 0 0-.62-.277C21.322 14.668 23.17 15.932 18 21.182z"/><path fill="#EA596E" d="M26.975 8.577a.56.56 0 0 0-.931.007l-3.259 4.961-.426-.001c0-.023.005-.044.005-.067 0-3.677-3.182-5.798-4.111-6.339a.502.502 0 0 0-.503 0c-.929.541-4.113 2.662-4.113 6.339 0 .023.005.044.005.067l-.426.001-3.26-4.961a.56.56 0 0 0-.931-.006c-1.417 2.086-2.438 4.673-1.86 7.472 1.098 5.323 5.866 7.944 10.837 6.769 4.968 1.175 9.736-1.445 10.834-6.769.577-2.8-.444-5.387-1.861-7.473z"/><path fill="#F4900C" d="m15.142 21.727-2.597-7.636h10.91l-2.597 7.636z"/><ellipse fill="#FFDC5D" cx="18" cy="14.091" rx="5.455" ry="1.636"/><path fill="#EA596E" d="M18.001 26c-2.411 0-4.365-2.309-4.365-5.748 0-3.797 3.167-5.992 4.106-6.558a.502.502 0 0 1 .518 0c.938.567 4.104 2.761 4.104 6.559 0 3.438-1.954 5.747-4.363 5.747z"/><path fill="#EF8294" d="M32 14.716a.503.503 0 0 0-.617-.491c-2.67.644-13.348 3.72-13.382 11.737-.035-8.017-10.713-11.093-13.383-11.737a.499.499 0 0 0-.618.491c.021 2.451.999 11.282 13.998 11.284h.004C31.001 25.998 31.979 17.167 32 14.716z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fab8.svg b/public/emoji/1fab8.svg
new file mode 100755
index 000000000..2e458cff2
--- /dev/null
+++ b/public/emoji/1fab8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="M31.121 12.536c-1.591-1.187-3.384 1.22-1.792 2.405.496.37 1.058.958 1.185 1.234-.049.889-2.39 1.13-4.051 2.701-.804-1.109-1.687-1.704-1.755-1.748-1.661-1.083-3.302 1.428-1.639 2.513 1.002.659 1.802 2.047 1.71 3.61.005 2.706-.729 3.352-2.915 4.448-1.121.562-2.518 1.287-3.258 2.759-.066-2.758 5.868-4.612 1.159-9.907-1.32-1.482-3.561.511-2.241 1.994.672.755 1.042 1.401 1.042 1.819 0 1.055-2.543 2.502-2.916 5.21l-.059-.052c-.112-.134-.181-.196-.589-.51-2.495-2.029-1.641-3.959-.439-6.956 1.532-3.789 2.932-5.523 4.193-7.417.651-.674.382-.781 2.615-1.816 2.28-1.056 3.878-2.147 3.771-4.844l-2.997.123c.02.69.089 1.013-2.009 1.987-.336-2.388-2.479-2.571-2.884-3.66-.272-.734 1.252-1.645 2.64-2.202 1.836-.737.73-3.523-1.117-2.784-5.706 2.29-5.616 6.147-2.259 8.435.665.454.665.492.665.79 0 1.569-1.354 2.622-3.232 5.824-1.084-1.914-2.676-3.6-3.124-4.055-1.388-1.414-3.53.684-2.141 2.102 1.337 1.364 3.315 3.957 3.315 5.191 0 1.936-1.844 3.591-1.567 6.773-4.283-2.055-3.76-2.963-3.76-5.93 0-2.444-1.548-3.697-1.725-3.832-1.513-1.154-3.34 1.086-1.85 2.361.687.587.578 1.654.552 2.308-.36 9.252 10.816 6.963 11.354 13.208a1.5 1.5 0 0 0 1.495 1.371c3.184 0 3.637.137 4.168-.514.285-.349.403-.77.313-1.211-.01-.145.035-.601.056-.82.165-1.682-.18-1.882 2.172-3.062 3.092-1.551 4.577-3.177 4.57-7.129 0-2.083.994-2.537 2.5-3.224 1.289-.588 3.236-1.478 3.236-3.931.003-1.606-1.672-3.026-2.392-3.562z"/><path d="M2.846 18.409a.526.526 0 0 1-.721-.493 1.914 1.914 0 0 1 3.271-1.335.539.539 0 0 1-.183.882l-2.367.946zm7.895-5.769a.541.541 0 0 0-.114-.894 1.915 1.915 0 0 0-2.66 2.323.527.527 0 0 0 .842.232l1.932-1.661zm9.523-8.81a.543.543 0 0 0 .889-.15 1.913 1.913 0 0 0-2.431-2.562.526.526 0 0 0-.198.851l1.74 1.861zm4.617 4.194a.54.54 0 0 0 .486-.758 1.914 1.914 0 0 0-3.532.074.526.526 0 0 0 .497.719l2.549-.035zm6.206 4.741a.54.54 0 0 0-.234-.87 1.916 1.916 0 0 0-2.321 2.662.525.525 0 0 0 .866.116l1.689-1.908zm-6.244 4.772a.538.538 0 0 0-.128-.891 1.916 1.916 0 0 0-2.623 2.366.527.527 0 0 0 .846.219l1.905-1.694zm-5.181 3.193a.541.541 0 0 0-.085-.897 1.915 1.915 0 0 0-2.735 2.235.525.525 0 0 0 .834.259l1.986-1.597z" fill="#FBBEA9"/><path d="M31.926 23.057c.805-.063.635 1.016.843 1.716.372 1.25 1.1 1.627-.799 3.569-1.104 1.129-1.795-.738-1.461-2.585.304-1.682.603-2.636 1.417-2.7zm-30.088-12.1c-.188.641.106 1.344.771 1.258.753-.096.689-2.325-.026-2.239-.352.043-.585.437-.745.981zM4 3.197a2 2 0 0 0-2 2c-.002 1.116.856 2.629 1.979 2.773 1.131.14 2.005-1.573 2.017-2.739C5.999 4.092 5.104 3.197 4 3.197zm.801 5.404c-.309-.005-.545.286-.528.653s.28.669.589.677c.308.007.545-.284.528-.653-.016-.369-.28-.671-.589-.677zM29.873 30.1c-.309-.006-.552.3-.54.681.012.381.273.688.583.695.309.007.549-.289.537-.67-.013-.382-.271-.7-.58-.706zm4.798-9.054c-.338-.034-.661.409-.729.965-.068.556.152 1.002.484 1.043.332.042.666-.337.742-.9s-.159-1.074-.497-1.108zM7.731 1.389c-.259-.168-.614-.046-.794.274-.18.32-.117.716.141.886.258.17.613.048.794-.274s.118-.718-.141-.886z" fill="#A8E0F9"/><g fill="#FFF"><ellipse transform="rotate(-30.952 3.582 4.586)" cx="3.582" cy="4.586" rx="1.178" ry=".742"/><ellipse transform="rotate(-86.503 31.668 24.499)" cx="31.667" cy="24.498" rx=".744" ry=".468"/></g></svg>
\ No newline at end of file
diff --git a/public/emoji/1fab9.svg b/public/emoji/1fab9.svg
new file mode 100755
index 000000000..d27cf192f
--- /dev/null
+++ b/public/emoji/1fab9.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#65471B" d="M20.409 24.866 20 22l7.548-16.983a2.84 2.84 0 0 1 1.476-1.456l5.517-2.364A.759.759 0 0 0 35 .5a.373.373 0 0 0-.479-.356l-8.296 2.489a2.842 2.842 0 0 0-1.762 1.529L19 16 0 36h9l1.859-1.859a8.688 8.688 0 0 1 2.616-1.797L21 29c2.463-1.642 10.996-2.61 13.969-2.904A1.144 1.144 0 0 0 36 24.958a.905.905 0 0 0-.956-.904l-14.635.812z"/><path fill="#BD9366" d="M33.485 14.893c-.061-.147-.1-.604-.31-1.04-.049-.076-.382-.523-.329-.491-.532-.572-.838-.829-1.454-1.274-.265-.008-.437-.029-.808-.525-2.567-1.545-5.955-3.929-10.796-3.958-4.472-.027-10.333 2.143-14.46 4.496-3.746 2.136-3.565 2.492-3.531 5.144l3.061 3.893c1.07 1.36 2.073 2.97 3.414 4.081.826.684 2.663 2.118 10.134 2.661.91.066 1.728.08 2.255-.006 2.763-.451 5.445-2.886 6.183-3.243 3.455-1.671 6.286-2.989 6.659-8.219a8.202 8.202 0 0 0-.018-1.519z"/><path fill="#77B255" d="M35.889 30.561c-1.763-2.455-5.232-6.206-8.654-3.772a.553.553 0 0 0-.179.236.757.757 0 0 0-.536.061c-1.764.919-4.409 1.574-3.225 8.428.031.182.158.339.341.423s.4.085.584.002c3.122-1.414 3.831-4.042 3.772-6.076.358.524.785.973 1.309 1.309 1.737 1.111 3.945.879 5.248.591a8.793 8.793 0 0 0 1.1-.31.548.548 0 0 0 .329-.377.615.615 0 0 0-.089-.515z"/><path fill="#5C913B" d="M24.5 34a.501.501 0 0 1-.5-.495c-.023-2.39.562-3.425 1.306-4.736.242-.428.505-.891.772-1.455.194-.41.634-.647 1.079-.598 2.452.284 5.13 2.016 6.678 3.413a.499.499 0 1 1-.67.742c-1.158-1.045-3.751-2.887-6.123-3.162-.34.623-.613 1.106-.866 1.553-.695 1.226-1.197 2.112-1.176 4.233a.5.5 0 0 1-.495.505H24.5z"/><path fill="#A57F5A" d="M33.182 14.629c-.362-.516-.971-2.118-1.403-1.877a1.01 1.01 0 0 0-.482-.144c-.069 0-.143.027-.216.044-.688-1.375-1.999-2.436-3.602-3.009-.265-.095-.493-.075-.679.015a55.723 55.723 0 0 1-.603-.451c-.512-.39-1.01.478-.505.863 1.13.862 1.668.95 1.722 2.407.224 6.007-.481 10.022-9.002 9.794-2.399-.064-5.718-1.876-8.156-3.884a7.352 7.352 0 0 1-.706-1.262c-.215-.508-.956-.61-1.387-.364-.054.031-.083.076-.127.112a9.476 9.476 0 0 0-1.866-1.036c-.506-.211-1.115.228-1.247.708-.161.584.201 1.036.708 1.247 3.812 1.589 1.494 3.724 8.324 5.482 1.264.325.725 2.279-.539 1.954-3.22-.829-10.199-5.75-10.199-5.75.086.096.847 10.93 14.543 11.461.372.014 12.158.67 15.078-10.759.443-1.737 1.813-3.455.344-5.551z"/><path fill="#BD9366" d="M19.759 24.881c-.025-.554.483-1.003 1.013-1.013.238-.004.473-.023.711-.044l.04-.003.037-.007c.114-.02.228-.038.342-.06.394-.077.783-.181 1.167-.299.795-.245 1.569-.553 2.354-.83.535-.189 1.087.215 1.246.707.177.546-.209 1.07-.707 1.246-1.699.6-3.358 1.281-5.189 1.315-.569.011-.99-.472-1.014-1.012z"/><path fill="#936D46" d="M18.242 9.687c-3.366-.51-6.829-.297-9.155 1.931-.386.369-.566.895-.57 1.441-.463.533-.712 1.175-.508 2.015.258 1.062.364 1.804 1.388 2.269 6.479 2.941 17.775 3.036 18.668-4.408.425-3.538-6.808-2.791-9.823-3.248z"/><path d="M18.826 28.109c.024.537-.477 1.005-1 1a19.065 19.065 0 0 1-6.425-1.17c-.526-.195-.827-.664-.698-1.23.113-.495.739-.88 1.23-.698 1.964.727 3.854 1.079 5.893 1.098.561.005.976.454 1 1zm14.147-13.543c-.184-.507-.682-.848-1.231-.696-.49.136-.881.721-.696 1.231.526 1.451 1.138 3.071.791 4.635-.15.675-.441 1.255-.957 1.722-.624.566-1.359 1.03-2.037 1.529-.434.32-.65.869-.356 1.369.252.429.931.678 1.369.356.833-.613 1.741-1.187 2.497-1.895.686-.642 1.154-1.511 1.381-2.417.497-1.984-.085-3.969-.761-5.834z" fill="#BD9366"/><path fill="#77B255" d="M24.986 3.599a.485.485 0 0 0-.002-.221c-.001-.002-.003-.004-.003-.007-.004-.015-.014-.027-.02-.041a.508.508 0 0 0-.093-.159c-.007-.007-.008-.018-.015-.025C20.95-.757 18.173.329 16.84.85c-.182.071-.335.133-.462.165a.5.5 0 0 0-.326.709c.016.031 1.155 2.214 4.08 2.724-.343.578-.639 1.28-.883 2.116a.502.502 0 0 0 .277.597c.305.135.621.202.946.202 1.412 0 2.985-1.256 4.45-3.597.021-.034.029-.073.041-.11.005-.015.018-.025.021-.041.004-.006.001-.011.002-.016z"/><path fill="#5C913B" d="M20.722 3.03c-.598-.322-1.275-.688-2.38-1.056a.5.5 0 1 1 .317-.948c1.187.396 1.937.799 2.538 1.124.374.202.7.375 1.06.513-.108.029-.22.043-.325.086a3.071 3.071 0 0 0-.811.493 22.623 22.623 0 0 1-.399-.212zm1.253 2.628C22.347 4.542 23.173 4 24.5 4a.5.5 0 0 0 0-1c-1.763 0-2.964.81-3.475 2.342a.5.5 0 0 0 .95.316z"/><g fill="#DEAD74"><path d="M21.272 10.135C9.833 9.704 7.708 14.489 9.381 16.409c.519.595 1.148.951 1.852 1.297 1.173.576.227 2.37-.945 1.795-4.128-2.026-4.263-5.481-1.868-7.823-1.461.576-1.931-1.41-.768-1.88 1.62-.654 3.298-1.073 5.004-1.339-.515-.093-1.426-.053-1.514-1.032-.166-1.857 2.62-.745 4.557-.272 1.363-.834 2.896-1.02 4.496-.893 1.153.091 1.358 1.26.647 1.838 1.89.064 1.627 2.081.43 2.035z"/><path d="M8.764 23.59c-1.97-3.539-4.057-3.525-5.385-5.45-2.436-3.533 2.76-4.666 1.844-7.751-.372-1.249-2.33-.717-1.957.539.284.957-1.482 1.487-2.295 3.977a4.908 4.908 0 0 0 .134 3.408c-1.169.207-1.011 1.771-.097 1.953.735.146 1.158.293 1.759.524.266.175 2.663.983 4.245 3.824.625 1.121 2.428.19 1.752-1.024zm25.914-9.412c-.411-.843-1.103-1.522-1.865-2.1a18.34 18.34 0 0 0-.311-1.108c.815-.233 1.052-1.608.025-1.947-.97-.32-2.074.404-2.122 1.651a26.297 26.297 0 0 0-4.936-2.326c-1.219-.426-1.896 1.485-.589 1.941 3.732 1.304 1.823 4.862-1.373 6.759-2.489 1.074-5.175 1.31-7.567.49-1.086-.372-1.905 1.477-.432 1.982 3.262 1.118 7.204.335 10.223-1.365 1.709-.963 3.306-3.694 2.988-5.638-.051-.309.293-.519.548-.349.873.581 1.684 1.398 1.644 1.761-.21 1.925-.414 2.872-2.426 4.353-.413.304-.677.887-.511 1.421.15.482.716.8 1.174.554.925-.497 1.815-1.149 2.524-2.177.735-1.039.82-2.079 1.102-3.154.439.752.569 1.72.185 2.798-.19.533.185 1.154.674 1.231 1.752.341 1.89-3.044 1.045-4.777zm-12.126 7.521c-.392-2.012-4.323.709-7.849-1.502-1.196-.75-2.219 1.001-1.154 1.669 2.487 1.56 5.411 1.335 8.202 1.024.545-.062.9-.685.801-1.191z"/></g></svg>
\ No newline at end of file
diff --git a/public/emoji/1faba.svg b/public/emoji/1faba.svg
new file mode 100755
index 000000000..5386cbdc4
--- /dev/null
+++ b/public/emoji/1faba.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#65471B" d="M20.409 24.866 20 22l7.548-16.983a2.84 2.84 0 0 1 1.476-1.456l5.517-2.364A.759.759 0 0 0 35 .5a.373.373 0 0 0-.479-.356l-8.296 2.489a2.842 2.842 0 0 0-1.762 1.529L19 16 0 36h9l1.859-1.859a8.688 8.688 0 0 1 2.616-1.797L21 29c2.463-1.642 10.996-2.61 13.969-2.904A1.144 1.144 0 0 0 36 24.958a.905.905 0 0 0-.956-.904l-14.635.812z"/><path fill="#BD9366" d="M33.485 14.893c-.061-.147-.1-.604-.31-1.04-.049-.076-.382-.523-.329-.491-.532-.572-.838-.829-1.454-1.274-.265-.008-.437-.029-.808-.525-2.567-1.545-5.955-3.929-10.796-3.958-4.472-.027-10.333 2.143-14.46 4.496-3.746 2.136-3.565 2.492-3.531 5.144l3.061 3.893c1.07 1.36 2.073 2.97 3.414 4.081.826.684 2.663 2.118 10.134 2.661.91.066 1.728.08 2.255-.006 2.763-.451 5.445-2.886 6.183-3.243 3.455-1.671 6.286-2.989 6.659-8.219a8.202 8.202 0 0 0-.018-1.519z"/><path fill="#77B255" d="M35.889 30.561c-1.763-2.455-5.232-6.206-8.654-3.772a.553.553 0 0 0-.179.236.757.757 0 0 0-.536.061c-1.764.919-4.409 1.574-3.225 8.428.031.182.158.339.341.423s.4.085.584.002c3.122-1.414 3.831-4.042 3.772-6.076.358.524.785.973 1.309 1.309 1.737 1.111 3.945.879 5.248.591a8.793 8.793 0 0 0 1.1-.31.548.548 0 0 0 .329-.377.615.615 0 0 0-.089-.515z"/><path fill="#5C913B" d="M24.5 34a.501.501 0 0 1-.5-.495c-.023-2.39.562-3.425 1.306-4.736.242-.428.505-.891.772-1.455.194-.41.634-.647 1.079-.598 2.452.284 5.13 2.016 6.678 3.413a.499.499 0 1 1-.67.742c-1.158-1.045-3.751-2.887-6.123-3.162-.34.623-.613 1.106-.866 1.553-.695 1.226-1.197 2.112-1.176 4.233a.5.5 0 0 1-.495.505H24.5z"/><path fill="#A57F5A" d="M33.182 14.629c-.362-.516-.971-2.118-1.403-1.877a1.01 1.01 0 0 0-.482-.144c-.069 0-.143.027-.216.044-.688-1.375-1.999-2.436-3.602-3.009-.265-.095-.493-.075-.679.015a55.723 55.723 0 0 1-.603-.451c-.512-.39-1.01.478-.505.863 1.13.862 1.668.95 1.722 2.407.224 6.007-.481 10.022-9.002 9.794-2.399-.064-5.718-1.876-8.156-3.884a7.352 7.352 0 0 1-.706-1.262c-.215-.508-.956-.61-1.387-.364-.054.031-.083.076-.127.112a9.476 9.476 0 0 0-1.866-1.036c-.506-.211-1.115.228-1.247.708-.161.584.201 1.036.708 1.247 3.812 1.589 1.494 3.724 8.324 5.482 1.264.325.725 2.279-.539 1.954-3.22-.829-10.199-5.75-10.199-5.75.086.096.847 10.93 14.543 11.461.372.014 12.158.67 15.078-10.759.443-1.737 1.813-3.455.344-5.551z"/><path fill="#BD9366" d="M19.759 24.881c-.025-.554.483-1.003 1.013-1.013.238-.004.473-.023.711-.044l.04-.003.037-.007c.114-.02.228-.038.342-.06.394-.077.783-.181 1.167-.299.795-.245 1.569-.553 2.354-.83.535-.189 1.087.215 1.246.707.177.546-.209 1.07-.707 1.246-1.699.6-3.358 1.281-5.189 1.315-.569.011-.99-.472-1.014-1.012z"/><path fill="#936D46" d="M18.242 9.687c-3.366-.51-6.829-.297-9.155 1.931-.386.369-.566.895-.57 1.441-.463.533-.712 1.175-.508 2.015.258 1.062.364 1.804 1.388 2.269 6.479 2.941 17.775 3.036 18.668-4.408.425-3.538-6.808-2.791-9.823-3.248z"/><path d="M18.826 28.109c.024.537-.477 1.005-1 1a19.065 19.065 0 0 1-6.425-1.17c-.526-.195-.827-.664-.698-1.23.113-.495.739-.88 1.23-.698 1.964.727 3.854 1.079 5.893 1.098.561.005.976.454 1 1zm14.147-13.543c-.184-.507-.682-.848-1.231-.696-.49.136-.881.721-.696 1.231.526 1.451 1.138 3.071.791 4.635-.15.675-.441 1.255-.957 1.722-.624.566-1.359 1.03-2.037 1.529-.434.32-.65.869-.356 1.369.252.429.931.678 1.369.356.833-.613 1.741-1.187 2.497-1.895.686-.642 1.154-1.511 1.381-2.417.497-1.984-.085-3.969-.761-5.834z" fill="#BD9366"/><path fill="#77B255" d="M24.986 3.599a.485.485 0 0 0-.002-.221c-.001-.002-.003-.004-.003-.007-.004-.015-.014-.027-.02-.041a.508.508 0 0 0-.093-.159c-.007-.007-.008-.018-.015-.025C20.95-.757 18.173.329 16.84.85c-.182.071-.335.133-.462.165a.5.5 0 0 0-.326.709c.016.031 1.155 2.214 4.08 2.724-.343.578-.639 1.28-.883 2.116a.502.502 0 0 0 .277.597c.305.135.621.202.946.202 1.412 0 2.985-1.256 4.45-3.597.021-.034.029-.073.041-.11.005-.015.018-.025.021-.041.004-.006.001-.011.002-.016z"/><path fill="#5C913B" d="M20.722 3.03c-.598-.322-1.275-.688-2.38-1.056a.5.5 0 1 1 .317-.948c1.187.396 1.937.799 2.538 1.124.374.202.7.375 1.06.513-.108.029-.22.043-.325.086a3.071 3.071 0 0 0-.811.493 22.623 22.623 0 0 1-.399-.212zm1.253 2.628C22.347 4.542 23.173 4 24.5 4a.5.5 0 0 0 0-1c-1.763 0-2.964.81-3.475 2.342a.5.5 0 0 0 .95.316z"/><g fill="#DEAD74"><path d="M21.272 10.135C9.833 9.704 7.708 14.489 9.381 16.409c.519.595 1.148.951 1.852 1.297 1.173.576.227 2.37-.945 1.795-4.128-2.026-4.263-5.481-1.868-7.823-1.461.576-1.931-1.41-.768-1.88 1.62-.654 3.298-1.073 5.004-1.339-.515-.093-1.426-.053-1.514-1.032-.166-1.857 2.62-.745 4.557-.272 1.363-.834 2.896-1.02 4.496-.893 1.153.091 1.358 1.26.647 1.838 1.89.064 1.627 2.081.43 2.035z"/><path d="M8.764 23.59c-1.97-3.539-4.057-3.525-5.385-5.45-2.436-3.533 2.76-4.666 1.844-7.751-.372-1.249-2.33-.717-1.957.539.284.957-1.482 1.487-2.295 3.977a4.908 4.908 0 0 0 .134 3.408c-1.169.207-1.011 1.771-.097 1.953.735.146 1.158.293 1.759.524.266.175 2.663.983 4.245 3.824.625 1.121 2.428.19 1.752-1.024zm25.914-9.412c-.411-.843-1.103-1.522-1.865-2.1a18.34 18.34 0 0 0-.311-1.108c.815-.233 1.052-1.608.025-1.947-.97-.32-2.074.404-2.122 1.651a26.297 26.297 0 0 0-4.936-2.326c-1.219-.426-1.896 1.485-.589 1.941 3.732 1.304 1.823 4.862-1.373 6.759-2.489 1.074-5.175 1.31-7.567.49-1.086-.372-1.905 1.477-.432 1.982 3.262 1.118 7.204.335 10.223-1.365 1.709-.963 3.306-3.694 2.988-5.638-.051-.309.293-.519.548-.349.873.581 1.684 1.398 1.644 1.761-.21 1.925-.414 2.872-2.426 4.353-.413.304-.677.887-.511 1.421.15.482.716.8 1.174.554.925-.497 1.815-1.149 2.524-2.177.735-1.039.82-2.079 1.102-3.154.439.752.569 1.72.185 2.798-.19.533.185 1.154.674 1.231 1.752.341 1.89-3.044 1.045-4.777zm-12.126 7.521c-.392-2.012-4.323.709-7.849-1.502-1.196-.75-2.219 1.001-1.154 1.669 2.487 1.56 5.411 1.335 8.202 1.024.545-.062.9-.685.801-1.191z"/></g><path fill="#5DADEC" d="M22.445 9.049c-2.104-.534-4.604 2.159-5.291 4.864-.471 1.856.046 3.222 1.088 4.078 1.742.128 3.549-.203 5.265-.943a9.703 9.703 0 0 0 1.129-.795c.045-.136.101-.257.139-.404.686-2.706-.225-6.266-2.33-6.8z"/><path fill="#3B94D9" d="M23.862 10.161a.083.083 0 0 0-.048.095c.253 1.157.252 2.454-.039 3.6-.687 2.706-2.713 3.533-4.817 2.998-.718-.182-1.348-.504-1.844-.95a.044.044 0 0 0-.05-.006.044.044 0 0 0-.022.045 3.346 3.346 0 0 0 1.19 2.047c1.745.13 3.556-.201 5.275-.943a9.703 9.703 0 0 0 1.129-.795c.045-.136.101-.257.139-.405.488-1.92.168-4.265-.81-5.659a.087.087 0 0 0-.103-.027z"/><path fill="#A8E0F9" d="M21.33 10.255c-.574-.146-1.464.454-1.987 1.339-.523.886-.483 1.722.091 1.867s1.464-.454 1.987-1.339c.524-.885.483-1.721-.091-1.867z"/><path fill="#5DADEC" d="M18.823 14.933c-.685-2.706-3.178-5.399-5.276-4.864-2.098.534-3.007 4.094-2.322 6.8.134.53.333.968.56 1.358.969.293 1.987.531 3.028.697a.922.922 0 0 1-.081-.61c.107-.491.689-.953 1.207-.775.846.29 1.729.441 2.626.477.435-.806.575-1.831.258-3.083z"/><path fill="#3B94D9" d="M14.813 18.923a.922.922 0 0 1-.081-.61 1.02 1.02 0 0 1 .218-.421c-1.292.314-2.542.098-3.472-.744a.093.093 0 0 0-.151.098c.119.369.274.685.444.977a23.2 23.2 0 0 0 3.042.7zm4.01-3.99a7.864 7.864 0 0 0-1.026-2.303.044.044 0 0 0-.055-.016.043.043 0 0 0-.023.052c.03.097.057.193.082.29.578 2.277-.323 3.826-1.876 4.579.005.002.01.001.014.003.845.29 1.727.441 2.623.477.438-.804.579-1.829.261-3.082z"/><ellipse transform="rotate(-38.409 13.502 12.022)" fill="#A8E0F9" cx="13.501" cy="12.022" rx="1.274" ry=".784"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3-1f3fb.svg b/public/emoji/1fac3-1f3fb.svg
new file mode 100755
index 000000000..73ac22b02
--- /dev/null
+++ b/public/emoji/1fac3-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#EEC2AD" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#F7DECE" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#E0AA94" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#F7DECE" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#292F33" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3-1f3fc.svg b/public/emoji/1fac3-1f3fc.svg
new file mode 100755
index 000000000..7f19822be
--- /dev/null
+++ b/public/emoji/1fac3-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#E2C196" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#F3D2A2" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#D2A077" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#F3D2A2" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#FFE51E" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3-1f3fd.svg b/public/emoji/1fac3-1f3fd.svg
new file mode 100755
index 000000000..96037961e
--- /dev/null
+++ b/public/emoji/1fac3-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#CC9B7A" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#D4AB88" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#B78B60" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#D4AB88" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#963B22" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3-1f3fe.svg b/public/emoji/1fac3-1f3fe.svg
new file mode 100755
index 000000000..63f1152dc
--- /dev/null
+++ b/public/emoji/1fac3-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#9B6A49" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#AF7E57" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#90603E" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#AF7E57" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#60352A" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#915A34" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#915A34" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3-1f3ff.svg b/public/emoji/1fac3-1f3ff.svg
new file mode 100755
index 000000000..3312217c9
--- /dev/null
+++ b/public/emoji/1fac3-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#664131" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#7C533E" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#583529" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#7C533E" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#0B0200" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#3D2E24" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#3D2E24" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac3.svg b/public/emoji/1fac3.svg
new file mode 100755
index 000000000..2c0f2846c
--- /dev/null
+++ b/public/emoji/1fac3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#77B255" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#5B9239" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zM17 22.582v-.928a8.357 8.357 0 0 0-1.442.232l.44-4.841-.996-.091-.478 5.262c-3.098 1.218-5.294 4.225-5.294 7.755 0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028c0-3.902 3.015-7.094 6.842-7.389z"/><path fill="#F9CA55" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#FFDC5D" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#EF9645" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#FFDC5D" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#FFAC33" d="M20.927 1.747C18.323.301 15.458.154 12.312 2.87c-1.281 1.106-2.068 1.049-2.206 1.373-.527 1.964 1.81 3.868 2.267 3.317 1.446-1.744 3.265-1.84 3.998-1.154.706.677.852 2.248 1.184 2.122.9-.341.415-1.206.573-1.883.245-1.115 1.318-.978 1.866-.089.434.704.726 2.081-.36 2.798 1.146 1.606 2.453 1.527 2.453 1.527s.493.001 1.188-2.249.021-5.53-2.348-6.885z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4-1f3fb.svg b/public/emoji/1fac4-1f3fb.svg
new file mode 100755
index 000000000..1d6fe80d7
--- /dev/null
+++ b/public/emoji/1fac4-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#EEC2AD" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#F7DECE" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#E0AA94" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#F7DECE" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#292F33" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4-1f3fc.svg b/public/emoji/1fac4-1f3fc.svg
new file mode 100755
index 000000000..b87bd055a
--- /dev/null
+++ b/public/emoji/1fac4-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#E2C196" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#F3D2A2" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#D2A077" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#F3D2A2" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#FFE51E" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4-1f3fd.svg b/public/emoji/1fac4-1f3fd.svg
new file mode 100755
index 000000000..96e58f1a0
--- /dev/null
+++ b/public/emoji/1fac4-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#CC9B7A" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#D4AB88" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#B78B60" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#D4AB88" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#963B22" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4-1f3fe.svg b/public/emoji/1fac4-1f3fe.svg
new file mode 100755
index 000000000..40f8869cd
--- /dev/null
+++ b/public/emoji/1fac4-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#9B6A49" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#AF7E57" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#90603E" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#AF7E57" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#60352A" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#915A34" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#915A34" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4-1f3ff.svg b/public/emoji/1fac4-1f3ff.svg
new file mode 100755
index 000000000..8565a9a00
--- /dev/null
+++ b/public/emoji/1fac4-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#664131" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#7C533E" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#583529" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#7C533E" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#0B0200" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#3D2E24" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#3D2E24" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac4.svg b/public/emoji/1fac4.svg
new file mode 100755
index 000000000..0d06947d0
--- /dev/null
+++ b/public/emoji/1fac4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#F9CA55" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#FFDC5D" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#EF9645" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#FFDC5D" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#FFAC33" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#C1694F" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path fill="#662113" d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#C1694F" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5-1f3fb.svg b/public/emoji/1fac5-1f3fb.svg
new file mode 100755
index 000000000..70f44e343
--- /dev/null
+++ b/public/emoji/1fac5-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#292F33" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#F7DECE" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#C1694F" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5-1f3fc.svg b/public/emoji/1fac5-1f3fc.svg
new file mode 100755
index 000000000..c98b8c4d5
--- /dev/null
+++ b/public/emoji/1fac5-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFE51E" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#F3D2A2" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#C1694F" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5-1f3fd.svg b/public/emoji/1fac5-1f3fd.svg
new file mode 100755
index 000000000..096506f2f
--- /dev/null
+++ b/public/emoji/1fac5-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#963B22" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#D4AB88" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#C1694F" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5-1f3fe.svg b/public/emoji/1fac5-1f3fe.svg
new file mode 100755
index 000000000..44adb0159
--- /dev/null
+++ b/public/emoji/1fac5-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#60352A" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#AF7E57" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#915A34" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5-1f3ff.svg b/public/emoji/1fac5-1f3ff.svg
new file mode 100755
index 000000000..c546423a2
--- /dev/null
+++ b/public/emoji/1fac5-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#0B0200" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#7C533E" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#3D2E24" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fac5.svg b/public/emoji/1fac5.svg
new file mode 100755
index 000000000..b7b246ba0
--- /dev/null
+++ b/public/emoji/1fac5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFAC33" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#FFDC5D" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#C1694F" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fad7.svg b/public/emoji/1fad7.svg
new file mode 100755
index 000000000..4a842421f
--- /dev/null
+++ b/public/emoji/1fad7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#C4C9C8" d="M27.777 6.502c-.029-.011-.088-.027-.088-.027L5.633.801l-.002.007C4.478.512 2.674 2.698 1.55 5.786.426 8.874.403 11.708 1.477 12.222l-.002.007 20.543 9.831s.055.025.085.036c1.435.522 3.869-2.545 5.437-6.851 1.565-4.306 1.672-8.22.237-8.743z"/><path fill="#FFF" d="M22.979 9.523a1.01 1.01 0 0 1-.286-.042l-9.25-2.767a1 1 0 0 1 .572-1.916l9.25 2.767a1 1 0 0 1-.286 1.958z"/><path fill="#AEB3B2" d="M23.38 13.731c1.573-4.321 3.542-6.172 4.06-6.18.313.311.632 2.995-.941 7.315s-3.542 6.172-4.06 6.18c-.314-.31-.632-2.994.941-7.315z"/><ellipse transform="rotate(-70.001 4.356 6.807)" fill="#D9DDDC" cx="4.356" cy="6.807" rx="5.175" ry="1.882"/><path fill="#A6373B" d="M30.9 33.036c-.408-3.986-1.164-8.323-3.954-11.455-1.016-1.146-2.406-1.955-3.836-2.479L7.65 12.751c-.604-.291-1.019.628-.432.902a435.999 435.999 0 0 1 7.539 3.575c.429.198 8.365 4.047 8.446 4.077 4.077 2.279 4.686 7.323 4.867 11.732-2.901.151-5.07.748-5.07 1.463 0 .828 2.91 1.5 6.5 1.5s6.5-.672 6.5-1.5c0-.717-2.184-1.316-5.1-1.464z"/><path fill="#C4C9C8" d="M22.439 21.047c-.313-.311-.632-2.995.941-7.315 1.573-4.321 3.542-6.172 4.06-6.18l.337-1.049c-1.435-.522-3.869 2.545-5.437 6.851-1.567 4.306-1.674 8.22-.239 8.742l.338-1.049z"/><path fill="#BF6952" d="M24.111 19.935c2.294 1.097 3.683 3.48 4.68 5.735a.339.339 0 1 1-.63.249c-.418-1.153-.949-2.27-1.623-3.287-.67-1.001-1.497-1.931-2.542-2.475-.141-.07-.028-.297.115-.222z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fad8.svg b/public/emoji/1fad8.svg
new file mode 100755
index 000000000..5e9325d6d
--- /dev/null
+++ b/public/emoji/1fad8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#CA694D" d="M13.822 8.247a4.5 4.5 0 0 0-6.15 1.635c-1.002 1.728-.527 1.859-2.096 4.564-1.577 2.719-1.91 2.342-2.921 4.086a4.5 4.5 0 0 0 1.635 6.15c6.573 3.814 16.419-12.44 9.532-16.435z"/><path fill="#AE3D2F" d="M15.379 9.751c1.727 5.969-6.111 16.911-11.629 13.71a4.446 4.446 0 0 1-1.557-1.544 4.48 4.48 0 0 0 2.096 2.765c5.923 3.436 14.519-9.428 11.09-14.931z"/><path fill="#F6CFB2" d="M5.827 17.248c-.69-.4-.278-.764.614-2.3.891-1.537 1.002-2.075 1.692-1.675 1.138.66-1.168 4.636-2.306 3.975z"/><path fill="#CA694D" d="M29.548 25.956a4.5 4.5 0 0 0-5.422-3.332c-1.943.464-1.71.899-4.753 1.625-3.057.73-3.013.229-4.974.697a4.5 4.5 0 0 0-3.332 5.422c1.765 7.393 20.33 3.332 18.481-4.412z"/><path fill="#AE3D2F" d="M11.375 31.211c2.734 5.749 17.477 2.722 18.259-3.655-2.465 4.882-13.99 7.144-18.259 3.655z"/><path fill="#F6CFB2" d="M17.516 26.362c-.185-.776.362-.727 2.09-1.14 1.728-.413 2.194-.703 2.38.073.305 1.28-4.165 2.347-4.47 1.067z"/><path fill="#CA694D" d="M29.45 19.482a4.5 4.5 0 0 0 2.029-6.032c-.889-1.789-1.26-1.465-2.651-4.266-1.398-2.815-.9-2.885-1.796-4.69A4.501 4.501 0 0 0 21 2.464c-6.808 3.381 1.319 20.559 8.45 17.018z"/><path fill="#AE3D2F" d="M29.88 18.153c-5.679 2.82-12.073-7.574-10.857-13.637-2.662 5.65 4.289 18.013 10.426 14.966a4.49 4.49 0 0 0 2.441-3.357 4.452 4.452 0 0 1-2.01 2.028z"/><path fill="#F6CFB2" d="M26.352 7.848c.715-.355.79.19 1.58 1.781s1.178 1.98.464 2.335c-1.179.585-3.223-3.531-2.044-4.116z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fad9.svg b/public/emoji/1fad9.svg
new file mode 100755
index 000000000..b0ebb69ce
--- /dev/null
+++ b/public/emoji/1fad9.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#C4C9C8" d="M8 8c0 .64.254 1.254.707 1.707a.256.256 0 0 1-.1.424l-.556.185A3 3 0 0 0 6 13.162v18.451c0 .002.002.004.004.004 0 .007-.004.014-.004.021 0 1.796 5.373 3.252 12 3.252s12-1.456 12-3.252c0-.007-.004-.014-.004-.021a.004.004 0 0 0 .004-.004V13.162a3 3 0 0 0-2.051-2.846l-.795-.265a.1.1 0 0 1-.04-.165l.178-.178A2.415 2.415 0 0 0 28 8H8z"/><path fill="#F19020" d="M29 6.8c0 1.657-4.925 3.2-11 3.2S7 8.457 7 6.8 11.925 4 18 4s11 1.143 11 2.8z"/><path fill="#F19020" d="M7 4h22v2.8H7z"/><ellipse fill="#F9CA55" cx="18" cy="4" rx="11" ry="3"/><ellipse fill="#AEB3B2" cx="18" cy="30.5" rx="11" ry="3"/><path fill="#F19020" d="M10.465 4c1.099-.582 4.053-1 7.535-1s6.436.418 7.535 1c.296-.157.465-.324.465-.5 0-.828-3.582-1.5-8-1.5s-8 .672-8 1.5c0 .176.169.343.465.5z"/><path fill="#AEB3B2" d="M18 12c-1.145 0-5.129-.07-8.335-.974a.5.5 0 1 1 .271-.963c3.083.87 6.952.937 8.064.937s4.981-.067 8.063-.937a.501.501 0 0 1 .271.963C23.129 11.93 19.145 12 18 12z"/><path fill="#FFF" d="M10 31a1 1 0 0 1-1-1V14a1 1 0 1 1 2 0v16a1 1 0 0 1-1 1z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae0.svg b/public/emoji/1fae0.svg
new file mode 100755
index 000000000..cd010b8f1
--- /dev/null
+++ b/public/emoji/1fae0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M35.07 32.558a1.92 1.92 0 0 0 .836-2.241c-.259-.81-1.07-1.317-1.921-1.317H32a1 1 0 0 1 0-2h1.5a1.5 1.5 0 1 0-.04-3c-.8.021-1.46-.623-1.46-1.423v-.003c0-.293.06-.578.176-.847a15.294 15.294 0 0 0 1.294-7.191C32.978 6.66 26.411.269 18.524.009 9.724-.281 2.5 6.766 2.5 15.5c0 2.371.548 4.609 1.5 6.619v1.88c0 1.086-.865 2.021-1.951 2a2 2 0 0 0-2.034 2.167C.101 29.225 1.069 30 2.133 30h8.039A1.17 1.17 0 0 1 11 32l-3.03.757a1.281 1.281 0 0 0 0 2.485c1.932.483 3.914.737 5.905.756l2.712.026c1.406.014 2.803-.31 4.029-1a8.289 8.289 0 0 1 5.642-.913c3.028.588 6.167.034 8.812-1.553z"/><path fill="#65471B" d="M18.736 24.003c-.754 0-1.504-.078-2.244-.234-2.693-.571-5.003-2.115-6.338-4.236a1 1 0 0 1 1.692-1.066c1.033 1.642 2.925 2.892 5.06 3.345 1.767.375 4.507.393 7.536-1.642a1 1 0 0 1 1.116 1.66c-2.129 1.43-4.489 2.173-6.822 2.173z"/><ellipse fill="#65471B" cx="14" cy="12" rx="2" ry="3"/><ellipse fill="#65471B" cx="23" cy="14" rx="2" ry="3"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae1.svg b/public/emoji/1fae1.svg
new file mode 100755
index 000000000..64d58b58e
--- /dev/null
+++ b/public/emoji/1fae1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M36 21c0 8.282-6.718 15-15 15-8.284 0-15-6.718-15-15 0-8.284 6.716-15 15-15 8.282 0 15 6.716 15 15"/><path fill="#F4900C" d="M22.864 1.134A1.51 1.51 0 0 0 21.55.004a1.608 1.608 0 0 0-.799.119l-5.775 2.446c-3.314 1.074-3.116.975-3.626 1.281-.915.547-2.007 1.513-3.961 3.377C5.728 8.811.059 9.794.041 15.297.034 17.438 1.698 19.192 4 19.185c2.423-.008 3.816-1.29 4.482-2.159a4.161 4.161 0 0 1 1.52-1.228c3.93-1.875 2.256-3.522 5.185-7.281a.712.712 0 0 0-.226-1.071l6.858-4.024c.608-.357.878-1.004.698-1.674l.095-.051a.505.505 0 0 0 .252-.563z"/><path fill="#B55005" d="M22.823 1.239a.348.348 0 0 0-.467-.164l-2.698 1.294a1.741 1.741 0 0 0-.088-1.165 1.524 1.524 0 0 0-.316-.447l-.764.323a.825.825 0 0 1 .444.417c.209.454.062 1.12-.623 1.518l-2.585 1.24c.269-.54.338-1.093.21-1.542a1.476 1.476 0 0 0-.224-.456l-.691.293a.714.714 0 0 1 .242.354c.196.689-.333 1.747-1.56 2.323-1.171.55-1.534 1.431-1.955 2.452-.193.467-.411.996-.734 1.553-.859 1.48-2.983 3.885-3.93 4.816a.35.35 0 1 0 .491.499c.915-.898 3.111-3.354 4.045-4.963l.004-.007.001-.001c.903-1.66 1.893-2.288 2.478-2.17.419.084.529.545.557.813a.35.35 0 0 0 .696-.072c-.08-.77-.497-1.303-1.116-1.427-.401-.082-.919.021-1.478.403.274-.542.606-.963 1.24-1.26.05-.023.09-.053.137-.077.01-.004.021-.002.032-.007l8.348-4.004c-.002-.009 0-.017-.003-.026l.094-.051a.5.5 0 0 0 .246-.325.335.335 0 0 0-.033-.134z"/><path fill="#65471B" d="M21 29.25c-4.076 0-6.156-.508-6.243-.53a1.001 1.001 0 0 1-.728-1.213 1.005 1.005 0 0 1 1.211-.728c.039.01 1.982.471 5.759.471 3.796 0 5.74-.466 5.76-.471a.999.999 0 0 1 .483 1.94c-.086.023-2.166.531-6.242.531zM18 14h-4a1 1 0 0 0 0 2h.519c-.319.532-.519 1.228-.519 2 0 1.658.896 3 2 3s2-1.343 2-3c0-.772-.2-1.468-.519-2H18a1 1 0 0 0 0-2zm10 0h-4a1 1 0 0 0 0 2h.519c-.319.532-.519 1.228-.519 2 0 1.657.896 3 2 3s2-1.342 2-3c0-.772-.2-1.468-.519-2H28a1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae2.svg b/public/emoji/1fae2.svg
new file mode 100755
index 000000000..87b65d5f3
--- /dev/null
+++ b/public/emoji/1fae2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M35 17c0 9.389-7.611 17-17 17-9.388 0-17-7.611-17-17C1 7.612 8.612 0 18 0c9.389 0 17 7.612 17 17"/><ellipse fill="#65471B" cx="12.5" cy="11.998" rx="2.5" ry="2.998"/><ellipse fill="#65471B" cx="23.5" cy="11.998" rx="2.5" ry="2.998"/><path fill="#F4900C" d="M26.503 27.371s.997-.721.165-1.614c-.832-.893-1.621.052-1.621.052L20.9 29.675c-.069-.205-.459-.743-.55-.947l5.755-5.366s.998-.721.164-1.615c-.832-.892-1.622.051-1.622.051l-5.413 5.046c-.125-.158-.461-.54-.594-.698l6.276-5.85s.997-.722.164-1.614c-.832-.893-1.621.051-1.621.051l-6.278 5.848c-.15-.145-.612-.609-.764-.746l5.866-5.468s.996-.722.164-1.614c-.833-.893-1.621.051-1.621.051l-6.203 5.781-.497.464-.222.207s-.538.744-1.087.179l1.842-4.158s.58-1.074-.493-1.655c-1.075-.581-1.655.493-1.655.493l-1.668 2.758c-.663 1.093-1.349 2.178-2.159 3.167a7.328 7.328 0 0 0 10.673 9.993l.447-.418 6.699-6.244z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae3.svg b/public/emoji/1fae3.svg
new file mode 100755
index 000000000..b293f7113
--- /dev/null
+++ b/public/emoji/1fae3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M35 18c0 9.389-7.611 17-17 17-9.388 0-17-7.611-17-17C1 8.612 8.612 1 18 1c9.389 0 17 7.612 17 17"/><ellipse fill="#65471B" cx="18" cy="28" rx="4" ry="3"/><path fill="#F4F7F9" d="M27.899 14.557a4.5 4.5 0 1 1-8.8 1.885 4.5 4.5 0 0 1 8.8-1.885z"/><ellipse fill="#292F33" cx="23.5" cy="16.498" rx="2.5" ry="2.498"/><path fill="#65471B" d="M26.963 9.931a.999.999 0 0 1-.445-.105 7.949 7.949 0 0 0-5.295-.658 1 1 0 1 1-.426-1.954 9.932 9.932 0 0 1 6.613.822 1 1 0 0 1-.447 1.895zm-17.926 0a1 1 0 0 1-.447-1.895 9.94 9.94 0 0 1 6.613-.822 1 1 0 1 1-.426 1.954 7.949 7.949 0 0 0-5.295.658.999.999 0 0 1-.445.105z"/><path fill="#F19020" d="m13.995 13.645.324-.473s.708-1.032 1.739-.324c1.032.708.325 1.739.325 1.739l-.683.997c.168.128.332.259.491.389 0 0 .708-1.032 1.739-.324 1.032.708.325 1.739.325 1.739l-1.375 1.94c.138.184.363.289.476.477 0 0 .708-1.032 1.739-.325 1.033.708.325 1.74.325 1.74l-5.661 8.257a7.51 7.51 0 0 1-10.438 1.946 7.51 7.51 0 0 1-2.465-9.559c.589-1.17 1.034-2.407 1.451-3.648l1.054-3.131s.342-1.204 1.545-.863c1.203.342.862 1.545.862 1.545l-.913 4.568c.172.118.337.24.494.366l6.037-8.784s.708-1.032 1.739-.324.324 1.739.324 1.739l.546.313z"/><path fill="#F19020" d="m34.764 24.896.844-5.591a1.069 1.069 0 0 0-.897-1.217l-.124-.019a1.07 1.07 0 0 0-1.217.898l-.517 3.422-.004.014c-.202 1.295-1.305 1.219-1.72-.769-.012-.057-.031-.108-.046-.162l-1.552-7.69a.99.99 0 0 0-1.166-.775l-.278.056c-.536.108-.839.555-.731 1.091l1.32 6.783c.005.037.004.069.012.108.281 1.395-.395 1.22-.638-.305a1.388 1.388 0 0 0-.057-.218L26.69 14.29l-.083-.411c-.116-.574-.622-.969-1.196-.853l-.138.028a1.06 1.06 0 0 0-.83 1.25l1.408 6.978c.002.135.012.276.042.43.294 1.506-.581.77-1.107.047l-.001-.001-4.418-5.991a1.062 1.062 0 0 0-1.484-.224l-.114.084a1.06 1.06 0 0 0-.224 1.483l1.149 1.499 3.132 4.294c.009.015.014.03.024.045.935 1.383.882 1.957-.038.902l-3.4-4.612c-.074-.1-.17-.163-.268-.228a1.012 1.012 0 0 0-1.167.012l-.17.126a1.027 1.027 0 0 0-.217 1.435l2.743 3.719c.519.705.974 2.768 1.553 4.247.58 1.479 3.598 5.883 8.8 3.843 4.654-1.824 4.052-5.582 4.078-7.496z"/><g fill="#B55005"><path d="m13.997 13.667-5.515 8.399a.339.339 0 0 1-.471.098.34.34 0 0 1-.098-.471l5.515-8.399.569.373zm2.25 2.303-5.005 7.826a.34.34 0 0 1-.47.103.34.34 0 0 1-.104-.47l5.005-7.826.574.367zm1.209 3.721-3.711 5.9a.34.34 0 0 1-.47.107.341.341 0 0 1-.107-.47l3.711-5.9.577.363zm2.24-1.082 4.127 5.676a.341.341 0 0 1-.274.542.338.338 0 0 1-.275-.14l-4.127-5.676.549-.402zm7.662-4.455 1.608 7.821a.34.34 0 0 1-.667.137l-1.608-7.821.667-.137z"/><path d="M17.592 20.584c-.178-.242-.225-.611-.157-.906l-.679-.093c-.114.488-.009.999.287 1.403l1.315 1.782.408-.595-1.174-1.591z"/></g></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae4.svg b/public/emoji/1fae4.svg
new file mode 100755
index 000000000..f8d8098f4
--- /dev/null
+++ b/public/emoji/1fae4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><ellipse fill="#65471B" cx="11.5" cy="15.5" rx="2.5" ry="3.5"/><ellipse fill="#65471B" cx="24.5" cy="15.5" rx="2.5" ry="3.5"/><path fill="#65471B" d="m11.209 27.978 14-3a1.001 1.001 0 0 0-.419-1.957l-14 3a1.001 1.001 0 0 0 .419 1.957z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae5.svg b/public/emoji/1fae5.svg
new file mode 100755
index 000000000..7d02e20eb
--- /dev/null
+++ b/public/emoji/1fae5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFF5DB" d="M35.25 18c0 9.527-7.723 17.25-17.25 17.25C8.473 35.25.75 27.527.75 18 .75 8.473 8.473.75 18 .75 27.527.75 35.25 8.473 35.25 18"/><path d="M18.079 35.949c-.789 0-1.571-.043-2.325-.129l.17-1.49c1.492.169 3.091.158 4.74-.04l.281 1.475-.096.015c-.945.113-1.874.169-2.77.169zm-7.281-1.399a16.756 16.756 0 0 1-4.378-2.68l.97-1.145a15.235 15.235 0 0 0 3.988 2.439l-.58 1.386zm15.031-.323-.652-1.35a16.552 16.552 0 0 0 3.894-2.626l1.006 1.113a18.043 18.043 0 0 1-4.248 2.863zm-22.783-6.22a18.6 18.6 0 0 1-2.138-4.648l1.436-.436a17.099 17.099 0 0 0 1.965 4.273l-1.263.811zm30.305-.577-1.277-.787a16.23 16.23 0 0 0 1.861-4.308l1.449.389a17.804 17.804 0 0 1-2.033 4.706zM.087 18.314a18.58 18.58 0 0 1 .553-5.086l1.454.367a17.067 17.067 0 0 0-.508 4.676l-1.499.043zm34.41-.645a16.466 16.466 0 0 0-.759-4.632l1.43-.452c.516 1.631.794 3.33.829 5.053l-1.5.031zM3.894 9.272l-1.283-.777a16.701 16.701 0 0 1 3.304-3.93l.987 1.13a15.203 15.203 0 0 0-3.008 3.577zm27.803-.461a16.645 16.645 0 0 0-3.147-3.487l.961-1.152a18.13 18.13 0 0 1 3.431 3.801l-1.245.838zM10.848 3.155l-.629-1.361A21.776 21.776 0 0 1 15.062.236l.295 1.471a20.309 20.309 0 0 0-4.509 1.448zm13.706-.297a16.358 16.358 0 0 0-4.527-1.234l.184-1.488c1.704.209 3.367.663 4.941 1.347l-.598 1.375z" fill="#FFCC4D"/><ellipse fill="#65471B" cx="11.5" cy="16.5" rx="2.5" ry="3.5"/><ellipse fill="#65471B" cx="24.5" cy="16.5" rx="2.5" ry="3.5"/><path fill="#65471B" d="M25 26H11a1 1 0 1 1 0-2h14a1 1 0 1 1 0 2z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae6.svg b/public/emoji/1fae6.svg
new file mode 100755
index 000000000..d8537a3ef
--- /dev/null
+++ b/public/emoji/1fae6.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EA596E" d="M22 8c-2.543 0-2.382 2-4 2s-1.75-2-4-2c-4 0-13 7-13 9 0 1.943 5.631 2.411 10 4 4.792 1.743 9.312 5 12 5 5.35 0 12-7 12-9s-9-9-13-9z"/><path fill="#78273B" d="M18 14c-7.617 0-7.982 2.72-12.315 2.98a.2.2 0 0 0-.08.377C8.289 18.735 10.344 17 15 17c3 0 7.991 2.664 9 3 2.833.944 4.775-.787 6.667-2.667a.2.2 0 0 0-.133-.341C25.992 16.811 25.743 14 18 14z"/><path fill="#F4F7F9" d="M18 14c-4.695 0-6.634 1.032-8.446 1.885l.095.237a2.036 2.036 0 0 0 1.389 1.217c1.139.29 3.31.661 6.962.661s5.823-.371 6.962-.661a2.039 2.039 0 0 0 1.389-1.217l.095-.237C24.634 15.032 22.695 14 18 14z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae7.svg b/public/emoji/1fae7.svg
new file mode 100755
index 000000000..665f7975b
--- /dev/null
+++ b/public/emoji/1fae7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><g fill="#50A5E6"><circle cx="18" cy="29" r="6"/><circle cx="29" cy="18" r="7"/><circle cx="10.5" cy="11.5" r="10.5"/></g><g fill="#A8E0F9" fill-opacity=".5"><circle cx="10.5" cy="11.5" r="9.5"/><circle cx="18" cy="29" r="5"/><circle cx="29" cy="18" r="6"/></g><path d="M10.5 19.5a1 1 0 0 1 0-2c3.309 0 6-2.691 6-6a1 1 0 0 1 2 0c0 4.411-3.589 8-8 8zm23.5-1a1 1 0 0 0-2 0c0 1.378-1.122 2.5-2.5 2.5a1 1 0 0 0 0 2c2.481 0 4.5-2.019 4.5-4.5zm-12 11a1 1 0 0 0-2 0c0 .827-.673 1.5-1.5 1.5a1 1 0 0 0 0 2c1.93 0 3.5-1.57 3.5-3.5z" fill="#F2F9FF"/><path d="M3.5 13A1.5 1.5 0 0 1 2 11.5C2 6.813 5.813 3 10.5 3a1.5 1.5 0 1 1 0 3A5.506 5.506 0 0 0 5 11.5 1.5 1.5 0 0 1 3.5 13zM27 18c0-1.103.897-2 2-2a1.5 1.5 0 1 0 0-3c-2.757 0-5 2.243-5 5a1.5 1.5 0 1 0 3 0zM17 29c0-.551.449-1 1-1a1.5 1.5 0 1 0 0-3c-2.206 0-4 1.794-4 4a1.5 1.5 0 1 0 3 0z" fill="#FFF"/><path d="M10.5 1c.68 0 1.344.07 1.988.195A5.47 5.47 0 0 1 13 3.5 5.5 5.5 0 0 1 2.227 5.057C4.15 2.593 7.14 1 10.5 1zm12.579 13.283A4.494 4.494 0 0 0 32 13.5a4.45 4.45 0 0 0-.506-2.033A6.96 6.96 0 0 0 29 11a6.995 6.995 0 0 0-5.921 3.283zM13.061 25.601A3.99 3.99 0 0 0 17 29a4 4 0 0 0 4-4c0-.466-.095-.907-.242-1.323A5.955 5.955 0 0 0 18 23a5.996 5.996 0 0 0-4.939 2.601z" fill="#FFF" fill-opacity=".5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0-1f3fb.svg b/public/emoji/1faf0-1f3fb.svg
new file mode 100755
index 000000000..6abb81eab
--- /dev/null
+++ b/public/emoji/1faf0-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F7DECE" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#E0AA94" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0-1f3fc.svg b/public/emoji/1faf0-1f3fc.svg
new file mode 100755
index 000000000..1bd6d7f55
--- /dev/null
+++ b/public/emoji/1faf0-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F3D2A2" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#D2A077" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0-1f3fd.svg b/public/emoji/1faf0-1f3fd.svg
new file mode 100755
index 000000000..44054f514
--- /dev/null
+++ b/public/emoji/1faf0-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D4AB88" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#B78B60" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0-1f3fe.svg b/public/emoji/1faf0-1f3fe.svg
new file mode 100755
index 000000000..4b7c89595
--- /dev/null
+++ b/public/emoji/1faf0-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#AF7E57" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#90603E" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0-1f3ff.svg b/public/emoji/1faf0-1f3ff.svg
new file mode 100755
index 000000000..6d9cc6f1e
--- /dev/null
+++ b/public/emoji/1faf0-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#7C533E" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#583529" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf0.svg b/public/emoji/1faf0.svg
new file mode 100755
index 000000000..da013e152
--- /dev/null
+++ b/public/emoji/1faf0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFDC5D" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#EF9645" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fc.svg b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fc.svg
new file mode 100755
index 000000000..7b199adb1
--- /dev/null
+++ b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F7DECE" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#D2A077" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F3D2A2" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fd.svg b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fd.svg
new file mode 100755
index 000000000..4e6ab1f78
--- /dev/null
+++ b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F7DECE" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#B78B60" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#D4AB88" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fe.svg b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fe.svg
new file mode 100755
index 000000000..29cda9efd
--- /dev/null
+++ b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F7DECE" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#90603E" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#AF7E57" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fb-200d-1faf2-1f3ff.svg b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3ff.svg
new file mode 100755
index 000000000..2a5a38207
--- /dev/null
+++ b/public/emoji/1faf1-1f3fb-200d-1faf2-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F7DECE" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#583529" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#7C533E" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fb.svg b/public/emoji/1faf1-1f3fb.svg
new file mode 100755
index 000000000..4d993c86f
--- /dev/null
+++ b/public/emoji/1faf1-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#F7DECE" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fb.svg b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fb.svg
new file mode 100755
index 000000000..13d060dc1
--- /dev/null
+++ b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F3D2A2" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#E0AA94" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F7DECE" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fd.svg b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fd.svg
new file mode 100755
index 000000000..25c64084d
--- /dev/null
+++ b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F3D2A2" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#B78B60" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#D4AB88" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fe.svg b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fe.svg
new file mode 100755
index 000000000..81748049c
--- /dev/null
+++ b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F3D2A2" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#90603E" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#AF7E57" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fc-200d-1faf2-1f3ff.svg b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3ff.svg
new file mode 100755
index 000000000..382551541
--- /dev/null
+++ b/public/emoji/1faf1-1f3fc-200d-1faf2-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#F3D2A2" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#583529" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#7C533E" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fc.svg b/public/emoji/1faf1-1f3fc.svg
new file mode 100755
index 000000000..da90e94a0
--- /dev/null
+++ b/public/emoji/1faf1-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#F3D2A2" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fb.svg b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fb.svg
new file mode 100755
index 000000000..a8c8faf53
--- /dev/null
+++ b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#D4AB88" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#E0AA94" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F7DECE" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fc.svg b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fc.svg
new file mode 100755
index 000000000..885113027
--- /dev/null
+++ b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#D4AB88" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#D2A077" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F3D2A2" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fe.svg b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fe.svg
new file mode 100755
index 000000000..84d470f62
--- /dev/null
+++ b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#D4AB88" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#90603E" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#AF7E57" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fd-200d-1faf2-1f3ff.svg b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3ff.svg
new file mode 100755
index 000000000..f01890850
--- /dev/null
+++ b/public/emoji/1faf1-1f3fd-200d-1faf2-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#D4AB88" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#583529" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#7C533E" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fd.svg b/public/emoji/1faf1-1f3fd.svg
new file mode 100755
index 000000000..af89e2715
--- /dev/null
+++ b/public/emoji/1faf1-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#D4AB88" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fb.svg b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fb.svg
new file mode 100755
index 000000000..32b88522c
--- /dev/null
+++ b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#AF7E57" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#E0AA94" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F7DECE" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fc.svg b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fc.svg
new file mode 100755
index 000000000..fe34fd5ce
--- /dev/null
+++ b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#AF7E57" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#D2A077" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F3D2A2" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fd.svg b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fd.svg
new file mode 100755
index 000000000..ede918e73
--- /dev/null
+++ b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#AF7E57" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#B78B60" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#D4AB88" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fe-200d-1faf2-1f3ff.svg b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3ff.svg
new file mode 100755
index 000000000..9a3005c0d
--- /dev/null
+++ b/public/emoji/1faf1-1f3fe-200d-1faf2-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#AF7E57" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#583529" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#7C533E" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3fe.svg b/public/emoji/1faf1-1f3fe.svg
new file mode 100755
index 000000000..c92d7880d
--- /dev/null
+++ b/public/emoji/1faf1-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#AF7E57" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fb.svg b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fb.svg
new file mode 100755
index 000000000..5925547ed
--- /dev/null
+++ b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#7C533E" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#E0AA94" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F7DECE" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fc.svg b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fc.svg
new file mode 100755
index 000000000..19220a1cf
--- /dev/null
+++ b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#7C533E" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#D2A077" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#F3D2A2" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fd.svg b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fd.svg
new file mode 100755
index 000000000..ead51cfc2
--- /dev/null
+++ b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#7C533E" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#B78B60" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#D4AB88" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fe.svg b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fe.svg
new file mode 100755
index 000000000..1d724bdee
--- /dev/null
+++ b/public/emoji/1faf1-1f3ff-200d-1faf2-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M16.428 30.331a2.31 2.31 0 0 0 3.217-.568.798.798 0 0 0-.197-1.114l-1.85-1.949 4.222 2.955a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-3.596-3.305 5.375 3.763a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089l-4.766-4.073 5.864 4.105a1.497 1.497 0 0 0 2.089-.369 1.5 1.5 0 0 0-.369-2.089L4.733 11.194l-3.467 5.521c-.389.6-.283 1.413.276 1.891l7.786 6.671c.355.304.724.591 1.107.859l5.993 4.195z"/><path fill="#7C533E" d="M29.802 21.752 18.5 13.601l-.059-.08.053-.08.053-.053.854.469c.958.62 3.147 1.536 4.806 1.536 1.135 0 1.815-.425 2.018-1.257a1.409 1.409 0 0 0-1.152-1.622 6.788 6.788 0 0 1-2.801-1.091l-.555-.373c-.624-.421-1.331-.898-1.853-1.206-.65-.394-1.357-.585-2.163-.585-1.196 0-2.411.422-3.585.83l-1.266.436a5.18 5.18 0 0 1-1.696.271c-1.544 0-3.055-.586-4.516-1.152l-.147-.058a1.389 1.389 0 0 0-1.674.56L1.35 15.669a1.357 1.357 0 0 0 .257 1.761l7.785 6.672c.352.301.722.588 1.1.852l6.165 4.316a2 2 0 0 0 2.786-.491.803.803 0 0 0-.196-1.115l-1.833-1.283a.424.424 0 0 1-.082-.618.422.422 0 0 1 .567-.075l3.979 2.785a1.4 1.4 0 0 0 1.606-2.294l-3.724-2.606a.424.424 0 0 1-.082-.618.423.423 0 0 1 .567-.075l5.132 3.593a1.4 1.4 0 0 0 1.606-2.294l-4.868-3.407a.42.42 0 0 1-.081-.618.377.377 0 0 1 .506-.066l5.656 3.959a1.4 1.4 0 0 0 1.606-2.295z"/><path fill="#90603E" d="M16.536 27.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 23.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.495 1.495 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 23.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 25.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm16.555-4.137.627-.542-6.913-10.85-12.27 1.985a1.507 1.507 0 0 0-1.235 1.737c.658 2.695 6.003.693 8.355-.601l11.436 8.271z"/><path fill="#AF7E57" d="M16.536 26.929c-.07.267-.207.498-.389.681l-1.004.996a1.494 1.494 0 0 1-1.437.396 1.5 1.5 0 0 1-.683-2.512l1.004-.996a1.494 1.494 0 0 1 1.437-.396 1.502 1.502 0 0 1 1.072 1.831zM5.992 22.008l1.503-1.497a1.5 1.5 0 0 0-.444-2.429 1.497 1.497 0 0 0-1.674.31l-1.503 1.497a1.5 1.5 0 0 0 .445 2.429 1.496 1.496 0 0 0 1.673-.31zm5.204.052a1.5 1.5 0 1 0-2.122-2.118L6.072 22.94a1.5 1.5 0 1 0 2.122 2.118l3.002-2.998zm2.25 3a1.5 1.5 0 0 0-.945-2.555 1.489 1.489 0 0 0-1.173.44L9.323 24.94a1.5 1.5 0 0 0 .945 2.556c.455.036.874-.141 1.173-.44l2.005-1.996zm21.557-7.456a1.45 1.45 0 0 0 .269-1.885l-.003-.005-3.467-6.521a1.488 1.488 0 0 0-1.794-.6c-1.992.771-4.174 1.657-6.292.937l-1.098-.377c-1.948-.675-4.066-1.466-6-.294-.695.409-1.738 1.133-2.411 1.58a6.873 6.873 0 0 1-2.762 1.076 1.502 1.502 0 0 0-1.235 1.737c.613 2.512 5.3.908 7.838-.369a.968.968 0 0 1 1.002.081l11.584 8.416 4.369-3.776z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1-1f3ff.svg b/public/emoji/1faf1-1f3ff.svg
new file mode 100755
index 000000000..8b9b9c222
--- /dev/null
+++ b/public/emoji/1faf1-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#7C533E" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf1.svg b/public/emoji/1faf1.svg
new file mode 100755
index 000000000..7acb4bc14
--- /dev/null
+++ b/public/emoji/1faf1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EF9645" d="M33.035 15.5a2.5 2.5 0 0 1-2.5 2.5h-.005l5.005 2.5a2.5 2.5 0 0 1-2.5 2.5H31.75l1.535 2.5a2.5 2.5 0 0 1-2.5 2.5H27.25L18 29V15.458l15.035.042z"/><path fill="#FFDC5D" d="M19.781 4.625c.611 1.381-.208 3.354-2.188 4.75-1.3.917-3.151 1.187-3.344 2.391-.073.46.313 1.234 1.397 1.234H31.5s2 0 2 2-2 2-2 2H19.867c.029 0 .064 1 .082 1H34s2 0 2 2-2 2-2 2H19.947c-.017 0-.041 1-.069 1H31.75s2 0 2 2-2 2-2 2H19.112c-.118 0-.251 1-.398 1h8.536s2 0 2 2-2 2-2 2H12C5.373 32 0 26.627 0 20c0-4.775 2.598-8.06 5.292-9.896C7.577 8.547 9.949 8.096 10.666 8c0 0 1.479-.123 2.865-1.156a57.846 57.846 0 0 0 3.866-3.125c.359-.317 1.707-.625 2.384.906z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2-1f3fb.svg b/public/emoji/1faf2-1f3fb.svg
new file mode 100755
index 000000000..0f7778d8c
--- /dev/null
+++ b/public/emoji/1faf2-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#F7DECE" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#E0AA94" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2-1f3fc.svg b/public/emoji/1faf2-1f3fc.svg
new file mode 100755
index 000000000..5354ab53f
--- /dev/null
+++ b/public/emoji/1faf2-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#F3D2A2" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#D2A077" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2-1f3fd.svg b/public/emoji/1faf2-1f3fd.svg
new file mode 100755
index 000000000..9110dec10
--- /dev/null
+++ b/public/emoji/1faf2-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#D4AB88" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#B78B60" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2-1f3fe.svg b/public/emoji/1faf2-1f3fe.svg
new file mode 100755
index 000000000..450225028
--- /dev/null
+++ b/public/emoji/1faf2-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#AF7E57" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#90603E" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2-1f3ff.svg b/public/emoji/1faf2-1f3ff.svg
new file mode 100755
index 000000000..c464d267f
--- /dev/null
+++ b/public/emoji/1faf2-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#7C533E" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#583529" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf2.svg b/public/emoji/1faf2.svg
new file mode 100755
index 000000000..bb8afacdb
--- /dev/null
+++ b/public/emoji/1faf2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EF9645" d="M2.965 15.5a2.5 2.5 0 0 0 2.5 2.5h.005L.465 20.5a2.5 2.5 0 0 0 2.5 2.5H4.25l-1.535 2.5a2.5 2.5 0 0 0 2.5 2.5H8.75L18 29V15.458L2.965 15.5z"/><path fill="#FFDC5D" d="M16.219 4.625c-.611 1.381.208 3.354 2.188 4.75 1.3.917 3.151 1.187 3.344 2.391.073.46-.313 1.234-1.397 1.234H4.5s-2 0-2 2 2 2 2 2h11.633c-.029 0-.064 1-.082 1H2s-2 0-2 2 2 2 2 2h14.053c.017 0 .041 1 .069 1H4.25s-2 0-2 2 2 2 2 2h12.638c.118 0 .251 1 .398 1H8.75s-2 0-2 2 2 2 2 2H24c6.627 0 12-5.373 12-12 0-4.775-2.598-8.06-5.292-9.896C28.423 8.547 26.051 8.096 25.334 8c0 0-1.479-.123-2.865-1.156a57.846 57.846 0 0 1-3.866-3.125c-.359-.317-1.707-.625-2.384.906z"/><path fill="#EF9645" d="M21.471 12.561c-.266.297-.552.372-.808.417.259 1.892.789 4.457 2.715 6.427 2.499 2.556 5.2 2.992 7.007 2.971 1.457-.017 2.147-.812-.012-1.045-2.706-.292-8.063-2.254-8.58-8.784a78.15 78.15 0 0 1-.035-.591s-.06.352-.287.605z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3-1f3fb.svg b/public/emoji/1faf3-1f3fb.svg
new file mode 100755
index 000000000..b55301503
--- /dev/null
+++ b/public/emoji/1faf3-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#E0AA94" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#F7DECE" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#E0AA94" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#F7DECE" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#E0AA94" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#F7DECE" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#E0AA94" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#F7DECE" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#E0AA94" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3-1f3fc.svg b/public/emoji/1faf3-1f3fc.svg
new file mode 100755
index 000000000..a71212a97
--- /dev/null
+++ b/public/emoji/1faf3-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D2A077" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#F3D2A2" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#D2A077" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#F3D2A2" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#D2A077" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#F3D2A2" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#D2A077" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#F3D2A2" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#D2A077" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3-1f3fd.svg b/public/emoji/1faf3-1f3fd.svg
new file mode 100755
index 000000000..fa8521ad9
--- /dev/null
+++ b/public/emoji/1faf3-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#B78B60" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#D4AB88" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#B78B60" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#D4AB88" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#B78B60" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#D4AB88" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#B78B60" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#D4AB88" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#B78B60" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3-1f3fe.svg b/public/emoji/1faf3-1f3fe.svg
new file mode 100755
index 000000000..081e709cf
--- /dev/null
+++ b/public/emoji/1faf3-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#AF7E57" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#90603E" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#AF7E57" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#90603E" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#AF7E57" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#90603E" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#AF7E57" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#90603E" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3-1f3ff.svg b/public/emoji/1faf3-1f3ff.svg
new file mode 100755
index 000000000..0d11e8a71
--- /dev/null
+++ b/public/emoji/1faf3-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#583529" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#7C533E" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#583529" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#7C533E" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#583529" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#7C533E" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#583529" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#7C533E" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#583529" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf3.svg b/public/emoji/1faf3.svg
new file mode 100755
index 000000000..a8e6f74b5
--- /dev/null
+++ b/public/emoji/1faf3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#EF9645" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#FFDC5D" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#EF9645" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#FFDC5D" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#EF9645" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#FFDC5D" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#EF9645" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#FFDC5D" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#EF9645" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4-1f3fb.svg b/public/emoji/1faf4-1f3fb.svg
new file mode 100755
index 000000000..70de846d4
--- /dev/null
+++ b/public/emoji/1faf4-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F7DECE" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#E0AA94" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#F7DECE" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#E0AA94" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#F7DECE" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#E0AA94" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#F7DECE" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#E0AA94" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4-1f3fc.svg b/public/emoji/1faf4-1f3fc.svg
new file mode 100755
index 000000000..e6f8a740d
--- /dev/null
+++ b/public/emoji/1faf4-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F3D2A2" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#D2A077" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#F3D2A2" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#D2A077" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#F3D2A2" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#D2A077" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#F3D2A2" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#D2A077" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4-1f3fd.svg b/public/emoji/1faf4-1f3fd.svg
new file mode 100755
index 000000000..61fd7264f
--- /dev/null
+++ b/public/emoji/1faf4-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D4AB88" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#B78B60" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#D4AB88" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#B78B60" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#D4AB88" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#B78B60" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#D4AB88" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#B78B60" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4-1f3fe.svg b/public/emoji/1faf4-1f3fe.svg
new file mode 100755
index 000000000..973909cb5
--- /dev/null
+++ b/public/emoji/1faf4-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#AF7E57" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#90603E" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#AF7E57" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#90603E" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#AF7E57" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#90603E" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#AF7E57" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#90603E" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4-1f3ff.svg b/public/emoji/1faf4-1f3ff.svg
new file mode 100755
index 000000000..cd06aaae0
--- /dev/null
+++ b/public/emoji/1faf4-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#7C533E" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#583529" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#7C533E" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#583529" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#7C533E" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#583529" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#7C533E" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#583529" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf4.svg b/public/emoji/1faf4.svg
new file mode 100755
index 000000000..168c190e2
--- /dev/null
+++ b/public/emoji/1faf4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFDC5D" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#EF9645" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#FFDC5D" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#EF9645" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#FFDC5D" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#EF9645" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#FFDC5D" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#EF9645" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5-1f3fb.svg b/public/emoji/1faf5-1f3fb.svg
new file mode 100755
index 000000000..a4ce272fa
--- /dev/null
+++ b/public/emoji/1faf5-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F7DECE" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#E0AA94"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5-1f3fc.svg b/public/emoji/1faf5-1f3fc.svg
new file mode 100755
index 000000000..b0f5878fa
--- /dev/null
+++ b/public/emoji/1faf5-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F3D2A2" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#D2A077"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5-1f3fd.svg b/public/emoji/1faf5-1f3fd.svg
new file mode 100755
index 000000000..279c50730
--- /dev/null
+++ b/public/emoji/1faf5-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D4AB88" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#B78B60"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5-1f3fe.svg b/public/emoji/1faf5-1f3fe.svg
new file mode 100755
index 000000000..44d0668b5
--- /dev/null
+++ b/public/emoji/1faf5-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#AF7E57" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#90603E"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5-1f3ff.svg b/public/emoji/1faf5-1f3ff.svg
new file mode 100755
index 000000000..bb47a26b4
--- /dev/null
+++ b/public/emoji/1faf5-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#7C533E" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#583529"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf5.svg b/public/emoji/1faf5.svg
new file mode 100755
index 000000000..307a2d2e5
--- /dev/null
+++ b/public/emoji/1faf5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFDC5D" d="M4 18.406c0 .39-.091.775-.265 1.124l-1.376 2.752a4.646 4.646 0 0 0 .586 5.051l2.209 2.651a4.64 4.64 0 0 0 2.1 1.433l6.277 2.092a4.643 4.643 0 0 0 2.938 0l2.328-.776a4.644 4.644 0 0 0 2.938-2.938L22 29s4.637-.971 4.281-2.676C26.281 26.324 28 28 30 26c1.067-1.067 2.134-2.419 2.897-3.448a4.646 4.646 0 0 0 .879-3.343l-.278-2.223a6.373 6.373 0 0 0-4.309-5.256L27 11l-3.071-2.628c.604-3.273-1.159-5.437-3.935-5.702-1.709-.163-4.741.595-4.863 3.545a.98.98 0 0 1-.732.907L11 8l-2.086.834A4.636 4.636 0 0 0 6 13.139c0 .561-.166 1.11-.478 1.578L4.78 15.83A4.64 4.64 0 0 0 4 18.406z"/><path d="M21.901 28.977c.038 0 .07.018.107.022L22 29l-.266.797a4.62 4.62 0 0 1-.6 1.18H19.62a13.76 13.76 0 0 1-8.951-3.312l-3.418-2.929a.999.999 0 1 1 1.301-1.518l3.418 2.929a11.766 11.766 0 0 0 7.65 2.83h2.281zm4.546-13.872a1 1 0 0 0-1.342.447l-1 2-.013.028-1.96-.795a8.315 8.315 0 0 1-2.767-1.834l-2.659-2.659a.999.999 0 1 0-1.414 1.414l2.659 2.659a10.305 10.305 0 0 0 3.429 2.273l1.957.794c-.8 2.435-.573 4.309-.055 5.627l-2.313-.619a11.776 11.776 0 0 1-5.112-2.999l-4.65-4.65a.999.999 0 1 0-1.414 1.414l4.65 4.65a13.797 13.797 0 0 0 5.997 3.514l4.408 1.178a1.14 1.14 0 0 0 1.277-.501 1.116 1.116 0 0 0-.136-1.357c-.675-.728-1.986-2.747-.478-6.4.007-.016.02-.028.026-.044.006-.015.003-.03.008-.045.103-.244.219-.496.348-.754l1-2a.998.998 0 0 0-.446-1.341zm3.377 5.39c-.784-.61-1.705.573-.922 1.184 1.458 1.136 1.119 2.814 2.152 2.814 1.674 0 .105-2.958-1.23-3.998zM17.35 6.031c1.536-.751 3.074-.775 4.736.013.723.341.567-2.022-2.356-2.073-2.903-.078-3.12 2.418-2.38 2.06zm2.06 4.679c2.963.122 4.646-1.791 4.38-3.125-.044-.361-.675-.348-.738-.118-.426 1.559-3.573 2.456-5.686 1.104-1.614-1.012-.985-1.702-1.654-1.716-1.235-.022.121 3.823 3.698 3.855z" fill="#EF9645"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6-1f3fb.svg b/public/emoji/1faf6-1f3fb.svg
new file mode 100755
index 000000000..45c5bd7ad
--- /dev/null
+++ b/public/emoji/1faf6-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F7DECE" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#F7DECE" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#EEC2AD" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6-1f3fc.svg b/public/emoji/1faf6-1f3fc.svg
new file mode 100755
index 000000000..903b267ef
--- /dev/null
+++ b/public/emoji/1faf6-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F3D2A2" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#F3D2A2" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#E2C196" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6-1f3fd.svg b/public/emoji/1faf6-1f3fd.svg
new file mode 100755
index 000000000..34393e567
--- /dev/null
+++ b/public/emoji/1faf6-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#D4AB88" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#D4AB88" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#CC9B7A" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6-1f3fe.svg b/public/emoji/1faf6-1f3fe.svg
new file mode 100755
index 000000000..84f28447d
--- /dev/null
+++ b/public/emoji/1faf6-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#AF7E57" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#AF7E57" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#9B6A49" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6-1f3ff.svg b/public/emoji/1faf6-1f3ff.svg
new file mode 100755
index 000000000..7998c9b3a
--- /dev/null
+++ b/public/emoji/1faf6-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#7C533E" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#7C533E" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#664131" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf6.svg b/public/emoji/1faf6.svg
new file mode 100755
index 000000000..2dc07b47f
--- /dev/null
+++ b/public/emoji/1faf6.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFDC5D" d="M13.996 23.498a10.866 10.866 0 0 1-5.905-5.316 7.288 7.288 0 0 1-.5-5.225 2.849 2.849 0 0 1 1.844-1.936 4.835 4.835 0 0 1 3.121.021l1.741.607c.449.225.791.619.95 1.096l.436 1.307c.19.566.72.948 1.317.948 0 0 1 0 1-1v-2.22a3.8 3.8 0 0 0-1.368-2.92l-3.82-3.183a2.001 2.001 0 0 0-1.83-.387L5.614 6.825a2 2 0 0 0-1.013.673L0 12v8.77l1.266 3.142 3.179 1.419C5.128 25.127 5.838 25 6.5 25c2.694 0 6.023.642 8.905 2.804l.937.703a.949.949 0 0 0 1.239-.088L18 28v-2c0-1-4.004-2.502-4.004-2.502z"/><path fill="#FFDC5D" d="M31.399 7.498a2 2 0 0 0-1.012-.674L25.018 5.29a2 2 0 0 0-1.83.387l-3.82 3.183A3.8 3.8 0 0 0 18 11.78V14c0 1 1 1 1 1 .597 0 1.127-.382 1.316-.949l.436-1.307c.159-.477.501-.871.95-1.096l1.741-.607a4.835 4.835 0 0 1 3.121-.021 2.85 2.85 0 0 1 1.844 1.936 7.288 7.288 0 0 1-.5 5.225 10.87 10.87 0 0 1-5.905 5.316C22.004 23.498 18 25 18 26v2l.419.419a.949.949 0 0 0 1.239.088l.937-.703C23.477 25.642 26.806 25 29.5 25c.661 0 1.372.128 2.054.332l3.18-1.42L36 20.77V12l-4.601-4.502z"/><path fill="#F9CA55" d="M4.445 25.331c-1.571-1.3-2.176-.836-3.179-2.419-.085-.13-1.06-2.083-1.266-2.142V28l1.967-1.475c.636-.477 1.532-.91 2.479-1.193l-.001-.001zm30.289-2.419c-1.003 1.583-1.608 1.119-3.18 2.42.948.283 1.843.716 2.479 1.193L36 28v-7.23c-.206.059-1.181 2.012-1.266 2.142z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/25ab_border.svg b/public/emoji/25ab_border.svg
index b51e1a9cc..5ca5b6b60 100644
--- a/public/emoji/25ab_border.svg
+++ b/public/emoji/25ab_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M25 24c0 .553-.447 1-1 1H12c-.552 0-1-.447-1-1V12c0-.552.448-1 1-1h12c.553 0 1 .448 1 1v12z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25 24c0 .553-.447 1-1 1H12c-.552 0-1-.447-1-1V12c0-.552.448-1 1-1h12c.553 0 1 .448 1 1v12z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E6E7E8" d="M25 24c0 .553-.447 1-1 1H12c-.552 0-1-.447-1-1V12c0-.552.448-1 1-1h12c.553 0 1 .448 1 1v12z"/>
 </svg>
diff --git a/public/emoji/25fb_border.svg b/public/emoji/25fb_border.svg
index 24c48e17a..f9210fea8 100644
--- a/public/emoji/25fb_border.svg
+++ b/public/emoji/25fb_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M33 30c0 1.657-1.343 3-3 3H6c-1.657 0-3-1.343-3-3V6c0-1.657 1.343-3 3-3h24c1.657 0 3 1.343 3 3v24z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M33 30c0 1.657-1.343 3-3 3H6c-1.657 0-3-1.343-3-3V6c0-1.657 1.343-3 3-3h24c1.657 0 3 1.343 3 3v24z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E6E7E8" d="M33 30c0 1.657-1.343 3-3 3H6c-1.657 0-3-1.343-3-3V6c0-1.657 1.343-3 3-3h24c1.657 0 3 1.343 3 3v24z"/>
 </svg>
diff --git a/public/emoji/25fd_border.svg b/public/emoji/25fd_border.svg
index ec7278674..419076b94 100644
--- a/public/emoji/25fd_border.svg
+++ b/public/emoji/25fd_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M29 27c0 1.104-.896 2-2 2H9c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h18c1.104 0 2 .896 2 2v18z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M29 27c0 1.104-.896 2-2 2H9c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h18c1.104 0 2 .896 2 2v18z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E6E7E8" d="M29 27c0 1.104-.896 2-2 2H9c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h18c1.104 0 2 .896 2 2v18z"/>
 </svg>
diff --git a/public/emoji/2601_border.svg b/public/emoji/2601_border.svg
index 6ab20d737..2c4857a0e 100644
--- a/public/emoji/2601_border.svg
+++ b/public/emoji/2601_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M27 8c-.701 0-1.377.106-2.015.298.005-.1.015-.197.015-.298 0-3.313-2.687-6-6-6-2.769 0-5.093 1.878-5.785 4.427C12.529 6.154 11.783 6 11 6c-3.314 0-6 2.686-6 6 0 3.312 2.686 6 6 6 2.769 0 5.093-1.878 5.785-4.428.686.273 1.432.428 2.215.428.375 0 .74-.039 1.096-.104-.058.36-.096.727-.096 1.104 0 3.865 3.135 7 7 7s7-3.135 7-7c0-3.866-3.135-7-7-7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M31 22c-.467 0-.91.085-1.339.204.216-.526.339-1.1.339-1.704 0-2.485-2.015-4.5-4.5-4.5-1.019 0-1.947.351-2.701.921C22.093 14.096 19.544 12 16.5 12c-2.838 0-5.245 1.822-6.131 4.357C9.621 16.125 8.825 16 8 16c-4.418 0-8 3.582-8 8 0 4.419 3.582 8 8 8h23c2.762 0 5-2.238 5-5s-2.238-5-5-5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M27 8c-.701 0-1.377.106-2.015.298.005-.1.015-.197.015-.298 0-3.313-2.687-6-6-6-2.769 0-5.093 1.878-5.785 4.427C12.529 6.154 11.783 6 11 6c-3.314 0-6 2.686-6 6 0 3.312 2.686 6 6 6 2.769 0 5.093-1.878 5.785-4.428.686.273 1.432.428 2.215.428.375 0 .74-.039 1.096-.104-.058.36-.096.727-.096 1.104 0 3.865 3.135 7 7 7s7-3.135 7-7c0-3.866-3.135-7-7-7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M31 22c-.467 0-.91.085-1.339.204.216-.526.339-1.1.339-1.704 0-2.485-2.015-4.5-4.5-4.5-1.019 0-1.947.351-2.701.921C22.093 14.096 19.544 12 16.5 12c-2.838 0-5.245 1.822-6.131 4.357C9.621 16.125 8.825 16 8 16c-4.418 0-8 3.582-8 8 0 4.419 3.582 8 8 8h23c2.762 0 5-2.238 5-5s-2.238-5-5-5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M27 8c-.701 0-1.377.106-2.015.298.005-.1.015-.197.015-.298 0-3.313-2.687-6-6-6-2.769 0-5.093 1.878-5.785 4.427C12.529 6.154 11.783 6 11 6c-3.314 0-6 2.686-6 6 0 3.312 2.686 6 6 6 2.769 0 5.093-1.878 5.785-4.428.686.273 1.432.428 2.215.428.375 0 .74-.039 1.096-.104-.058.36-.096.727-.096 1.104 0 3.865 3.135 7 7 7s7-3.135 7-7c0-3.866-3.135-7-7-7z"/>
   <path fill="#E1E8ED" d="M31 22c-.467 0-.91.085-1.339.204.216-.526.339-1.1.339-1.704 0-2.485-2.015-4.5-4.5-4.5-1.019 0-1.947.351-2.701.921C22.093 14.096 19.544 12 16.5 12c-2.838 0-5.245 1.822-6.131 4.357C9.621 16.125 8.825 16 8 16c-4.418 0-8 3.582-8 8 0 4.419 3.582 8 8 8h23c2.762 0 5-2.238 5-5s-2.238-5-5-5z"/>
diff --git a/public/emoji/2620_border.svg b/public/emoji/2620_border.svg
index 8878828be..d2b94874e 100644
--- a/public/emoji/2620_border.svg
+++ b/public/emoji/2620_border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M27.865 16.751c0-6.242-4.411-9.988-9.927-9.988s-9.835 3.746-9.835 9.988c0 3.48-.103 6.485 3.897 7.89v2.722c0 1.034.966 1.872 2 1.872 1.035 0 2-.838 2-1.872v-1.97 1.97c0 1.034.965 1.872 2 1.872 1.036 0 2-.838 2-1.872v-1.97 1.97c0 1.034.966 1.872 2 1.872s2-.838 2-1.872v-2.722c4-1.405 3.865-4.41 3.865-7.89z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="13.629" cy="15.503" r="3.121" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M25.488 15.503c0 1.724 0 3.121-3.121 3.121-3.12 0-3.12-1.397-3.12-3.121s1.396-3.121 3.12-3.121c1.725 0 3.121 1.397 3.121 3.121zm-6.301 5.656c-.157-.382-.626-.662-1.189-.662-.561 0-1.031.28-1.188.662-.394.11-.685.469-.685.898 0 .517.419.936.937.936.409 0 .753-.263.88-.628.019 0 .037.004.056.004.019 0 .037-.004.057-.004.128.365.472.628.88.628.517 0 .936-.419.936-.936 0-.429-.291-.786-.684-.898z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M11 27c0-.367.075-.713.195-1.038-.984-.447-1.831-1.082-2.503-1.97-1.107.969-2.163 1.876-3.127 2.695C4.985 26.26 4.275 26 3.5 26 1.567 26 0 27.566 0 29.5c0 1.778 1.33 3.229 3.046 3.454C3.271 34.671 4.722 36 6.5 36c1.933 0 3.5-1.566 3.5-3.5 0-.775-.26-1.485-.686-2.065.6-.706 1.246-1.46 1.931-2.25C11.088 27.821 11 27.421 11 27zm16.872-15.482c.884-.769 1.729-1.495 2.515-2.163.569.403 1.262.645 2.013.645 1.934 0 3.5-1.567 3.5-3.5 0-1.743-1.277-3.177-2.945-3.444C32.735 1.335 31.281 0 29.5 0 27.566 0 26 1.567 26 3.5c0 .775.26 1.485.687 2.065-.594.7-1.233 1.445-1.911 2.227 1.3.871 2.361 2.095 3.096 3.726zM3.5 10c.775 0 1.485-.26 2.065-.687.799.679 1.661 1.419 2.564 2.204.735-1.631 1.795-2.855 3.096-3.726-.679-.781-1.317-1.527-1.912-2.226.427-.58.687-1.29.687-2.065C10 1.567 8.433 0 6.5 0 4.722 0 3.271 1.33 3.046 3.046 1.33 3.271 0 4.722 0 6.5 0 8.433 1.567 10 3.5 10zm28.9 16c-.752 0-1.444.242-2.014.645-.952-.809-1.99-1.701-3.079-2.653-.672.889-1.519 1.523-2.503 1.971.121.324.196.67.196 1.037 0 .421-.088.821-.245 1.185.685.79 1.331 1.544 1.931 2.25-.426.58-.686 1.29-.686 2.065 0 1.934 1.566 3.5 3.5 3.5 1.781 0 3.235-1.334 3.455-3.056 1.668-.267 2.945-1.701 2.945-3.444 0-1.934-1.566-3.5-3.5-3.5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M27.865 16.751c0-6.242-4.411-9.988-9.927-9.988s-9.835 3.746-9.835 9.988c0 3.48-.103 6.485 3.897 7.89v2.722c0 1.034.966 1.872 2 1.872 1.035 0 2-.838 2-1.872v-1.97 1.97c0 1.034.965 1.872 2 1.872 1.036 0 2-.838 2-1.872v-1.97 1.97c0 1.034.966 1.872 2 1.872s2-.838 2-1.872v-2.722c4-1.405 3.865-4.41 3.865-7.89z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="13.629" cy="15.503" r="3.121" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25.488 15.503c0 1.724 0 3.121-3.121 3.121-3.12 0-3.12-1.397-3.12-3.121s1.396-3.121 3.12-3.121c1.725 0 3.121 1.397 3.121 3.121zm-6.301 5.656c-.157-.382-.626-.662-1.189-.662-.561 0-1.031.28-1.188.662-.394.11-.685.469-.685.898 0 .517.419.936.937.936.409 0 .753-.263.88-.628.019 0 .037.004.056.004.019 0 .037-.004.057-.004.128.365.472.628.88.628.517 0 .936-.419.936-.936 0-.429-.291-.786-.684-.898z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11 27c0-.367.075-.713.195-1.038-.984-.447-1.831-1.082-2.503-1.97-1.107.969-2.163 1.876-3.127 2.695C4.985 26.26 4.275 26 3.5 26 1.567 26 0 27.566 0 29.5c0 1.778 1.33 3.229 3.046 3.454C3.271 34.671 4.722 36 6.5 36c1.933 0 3.5-1.566 3.5-3.5 0-.775-.26-1.485-.686-2.065.6-.706 1.246-1.46 1.931-2.25C11.088 27.821 11 27.421 11 27zm16.872-15.482c.884-.769 1.729-1.495 2.515-2.163.569.403 1.262.645 2.013.645 1.934 0 3.5-1.567 3.5-3.5 0-1.743-1.277-3.177-2.945-3.444C32.735 1.335 31.281 0 29.5 0 27.566 0 26 1.567 26 3.5c0 .775.26 1.485.687 2.065-.594.7-1.233 1.445-1.911 2.227 1.3.871 2.361 2.095 3.096 3.726zM3.5 10c.775 0 1.485-.26 2.065-.687.799.679 1.661 1.419 2.564 2.204.735-1.631 1.795-2.855 3.096-3.726-.679-.781-1.317-1.527-1.912-2.226.427-.58.687-1.29.687-2.065C10 1.567 8.433 0 6.5 0 4.722 0 3.271 1.33 3.046 3.046 1.33 3.271 0 4.722 0 6.5 0 8.433 1.567 10 3.5 10zm28.9 16c-.752 0-1.444.242-2.014.645-.952-.809-1.99-1.701-3.079-2.653-.672.889-1.519 1.523-2.503 1.971.121.324.196.67.196 1.037 0 .421-.088.821-.245 1.185.685.79 1.331 1.544 1.931 2.25-.426.58-.686 1.29-.686 2.065 0 1.934 1.566 3.5 3.5 3.5 1.781 0 3.235-1.334 3.455-3.056 1.668-.267 2.945-1.701 2.945-3.444 0-1.934-1.566-3.5-3.5-3.5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M27.865 16.751c0-6.242-4.411-9.988-9.927-9.988s-9.835 3.746-9.835 9.988c0 3.48-.103 6.485 3.897 7.89v2.722c0 1.034.966 1.872 2 1.872 1.035 0 2-.838 2-1.872v-1.97 1.97c0 1.034.965 1.872 2 1.872 1.036 0 2-.838 2-1.872v-1.97 1.97c0 1.034.966 1.872 2 1.872s2-.838 2-1.872v-2.722c4-1.405 3.865-4.41 3.865-7.89z"/>
   <circle fill="#292F33" cx="13.629" cy="15.503" r="3.121"/>
diff --git a/public/emoji/26aa_border.svg b/public/emoji/26aa_border.svg
index d2cac5cad..38126cc6a 100644
--- a/public/emoji/26aa_border.svg
+++ b/public/emoji/26aa_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <circle cx="18" cy="18" r="18" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="18" cy="18" r="18" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <circle fill="#E6E7E8" cx="18" cy="18" r="18"/>
 </svg>
diff --git a/public/emoji/26be_border.svg b/public/emoji/26be_border.svg
index 25954deac..96894b081 100644
--- a/public/emoji/26be_border.svg
+++ b/public/emoji/26be_border.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <circle cx="18" cy="18" r="18" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M31.802 29.546C28.792 28.221 27 24.048 27 18c0-6.048 1.792-10.221 4.802-11.546-.445-.531-.926-1.028-1.428-1.504C27.406 6.605 25 10.578 25 18c0 7.421 2.406 11.395 5.374 13.05.502-.477.984-.973 1.428-1.504zM11 18c0-7.421-2.406-11.395-5.374-13.049-.502.476-.984.972-1.428 1.503C7.208 7.78 9 11.952 9 18c0 6.048-1.792 10.22-4.802 11.546.445.531.926 1.027 1.428 1.504C8.593 29.395 11 25.421 11 18z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M5.092 10.164c-.237 0-.457-.02-.651-.056-.543-.102-.9-.624-.799-1.167.102-.543.625-.902 1.167-.799.43.077 2.691.006 3.148-2.276.108-.541.632-.892 1.177-.784.542.108.893.635.784 1.177-.583 2.912-3.139 3.905-4.826 3.905zm1.7 3.961c-.53 0-.952-.323-.978-.859-.026-.551.4-.911.952-.937 0 0 2.564-.035 3.869-2.294.275-.478.886-.63 1.365-.352.478.276.642.894.365 1.373-1.851 3.206-5.557 3.069-5.573 3.069zM9 19.282c-.734 0-1.414-.135-1.928-.378-.499-.236-.712-.833-.476-1.332.237-.5.834-.711 1.332-.476.83.393 2.926.239 3.73-1.012.299-.465.917-.6 1.382-.301.465.299.599.918.301 1.382-.964 1.501-2.776 2.117-4.341 2.117zm1.161 5.525c-1.554 0-2.995-.699-3.926-1.476-.424-.354-.481-.984-.128-1.409.354-.425.984-.48 1.408-.128.194.163 1.952 1.566 3.782.785.507-.215 1.095.021 1.311.53.216.509-.021 1.096-.53 1.312-.639.271-1.288.386-1.917.386zM9.75 30h-.028c-2.504 0-4.679-1.57-5.534-3.108-.269-.482-.094-1.044.388-1.312.483-.269 1.092-.07 1.36.412.484.871 1.996 2.134 3.841 2.185.552.016.987.388.972.939-.015.542-.459.884-.999.884zm17.438.188c-.066 0-.131-.006-.197-.02-.541-.108-.893-.635-.784-1.177.664-3.322 3.894-4.15 5.478-3.849.543.102.9.624.798 1.167-.101.542-.617.903-1.167.798-.425-.08-2.69-.007-3.147 2.276-.096.476-.514.805-.981.805zm-2.564-4.5c-.17 0-.342-.043-.499-.134-.479-.276-.643-.889-.366-1.366 1.852-3.206 3.984-3.304 5.394-3.369l.111-.005c.539-.033 1.021.399 1.047.951.026.552-.399 1.021-.951 1.047l-.115.005c-1.204.056-2.449.112-3.754 2.371-.185.321-.521.5-.867.5zm-1-6.063c-.186 0-.372-.051-.54-.159-.464-.298-.599-.917-.3-1.381 1.415-2.203 4.656-2.501 6.268-1.738.499.236.713.833.476 1.332-.235.5-.834.712-1.331.476-.829-.393-2.926-.239-3.732 1.012-.19.296-.512.458-.841.458zm5.625-5.937c-.226 0-.452-.076-.64-.232-.194-.162-1.952-1.559-3.781-.785-.509.215-1.095-.021-1.312-.53-.216-.508.021-1.096.53-1.311 2.219-.942 4.535-.001 5.844 1.09.424.353.482.984.128 1.408-.198.237-.482.36-.769.36zm1.814-3.938c-.352 0-.692-.186-.875-.514-.484-.872-1.996-2.123-3.841-2.174-.553-.015-.987-.506-.973-1.059.017-.542.461-1.003 1-1.003h.028c2.505 0 4.68 1.694 5.534 3.232.269.483.095 1.108-.389 1.376-.152.086-.319.142-.484.142z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="18" cy="18" r="18" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M31.802 29.546C28.792 28.221 27 24.048 27 18c0-6.048 1.792-10.221 4.802-11.546-.445-.531-.926-1.028-1.428-1.504C27.406 6.605 25 10.578 25 18c0 7.421 2.406 11.395 5.374 13.05.502-.477.984-.973 1.428-1.504zM11 18c0-7.421-2.406-11.395-5.374-13.049-.502.476-.984.972-1.428 1.503C7.208 7.78 9 11.952 9 18c0 6.048-1.792 10.22-4.802 11.546.445.531.926 1.027 1.428 1.504C8.593 29.395 11 25.421 11 18z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M5.092 10.164c-.237 0-.457-.02-.651-.056-.543-.102-.9-.624-.799-1.167.102-.543.625-.902 1.167-.799.43.077 2.691.006 3.148-2.276.108-.541.632-.892 1.177-.784.542.108.893.635.784 1.177-.583 2.912-3.139 3.905-4.826 3.905zm1.7 3.961c-.53 0-.952-.323-.978-.859-.026-.551.4-.911.952-.937 0 0 2.564-.035 3.869-2.294.275-.478.886-.63 1.365-.352.478.276.642.894.365 1.373-1.851 3.206-5.557 3.069-5.573 3.069zM9 19.282c-.734 0-1.414-.135-1.928-.378-.499-.236-.712-.833-.476-1.332.237-.5.834-.711 1.332-.476.83.393 2.926.239 3.73-1.012.299-.465.917-.6 1.382-.301.465.299.599.918.301 1.382-.964 1.501-2.776 2.117-4.341 2.117zm1.161 5.525c-1.554 0-2.995-.699-3.926-1.476-.424-.354-.481-.984-.128-1.409.354-.425.984-.48 1.408-.128.194.163 1.952 1.566 3.782.785.507-.215 1.095.021 1.311.53.216.509-.021 1.096-.53 1.312-.639.271-1.288.386-1.917.386zM9.75 30h-.028c-2.504 0-4.679-1.57-5.534-3.108-.269-.482-.094-1.044.388-1.312.483-.269 1.092-.07 1.36.412.484.871 1.996 2.134 3.841 2.185.552.016.987.388.972.939-.015.542-.459.884-.999.884zm17.438.188c-.066 0-.131-.006-.197-.02-.541-.108-.893-.635-.784-1.177.664-3.322 3.894-4.15 5.478-3.849.543.102.9.624.798 1.167-.101.542-.617.903-1.167.798-.425-.08-2.69-.007-3.147 2.276-.096.476-.514.805-.981.805zm-2.564-4.5c-.17 0-.342-.043-.499-.134-.479-.276-.643-.889-.366-1.366 1.852-3.206 3.984-3.304 5.394-3.369l.111-.005c.539-.033 1.021.399 1.047.951.026.552-.399 1.021-.951 1.047l-.115.005c-1.204.056-2.449.112-3.754 2.371-.185.321-.521.5-.867.5zm-1-6.063c-.186 0-.372-.051-.54-.159-.464-.298-.599-.917-.3-1.381 1.415-2.203 4.656-2.501 6.268-1.738.499.236.713.833.476 1.332-.235.5-.834.712-1.331.476-.829-.393-2.926-.239-3.732 1.012-.19.296-.512.458-.841.458zm5.625-5.937c-.226 0-.452-.076-.64-.232-.194-.162-1.952-1.559-3.781-.785-.509.215-1.095-.021-1.312-.53-.216-.508.021-1.096.53-1.311 2.219-.942 4.535-.001 5.844 1.09.424.353.482.984.128 1.408-.198.237-.482.36-.769.36zm1.814-3.938c-.352 0-.692-.186-.875-.514-.484-.872-1.996-2.123-3.841-2.174-.553-.015-.987-.506-.973-1.059.017-.542.461-1.003 1-1.003h.028c2.505 0 4.68 1.694 5.534 3.232.269.483.095 1.108-.389 1.376-.152.086-.319.142-.484.142z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <circle fill="#E1E8ED" cx="18" cy="18" r="18"/>
   <path fill="#B3BEC4" d="M31.802 29.546C28.792 28.221 27 24.048 27 18c0-6.048 1.792-10.221 4.802-11.546-.445-.531-.926-1.028-1.428-1.504C27.406 6.605 25 10.578 25 18c0 7.421 2.406 11.395 5.374 13.05.502-.477.984-.973 1.428-1.504zM11 18c0-7.421-2.406-11.395-5.374-13.049-.502.476-.984.972-1.428 1.503C7.208 7.78 9 11.952 9 18c0 6.048-1.792 10.22-4.802 11.546.445.531.926 1.027 1.428 1.504C8.593 29.395 11 25.421 11 18z"/>
diff --git a/public/emoji/26f8_border.svg b/public/emoji/26f8_border.svg
index 0df7ff2ff..3579451ce 100644
--- a/public/emoji/26f8_border.svg
+++ b/public/emoji/26f8_border.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M26 33c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3zm-14 0c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M30 36H2c-1.104 0-2.104-3-1-3h28c3 0 3-3 4-4 5 3 2 7-3 7z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M1 28c0-9 2-14 2-21 0-2.279 13-2 13 0s-1.5 10 5 13c6.268 2.893 15 2 15 8H1z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M36 28c-24 0-19.001-1-25-1H1v1c0 1.104.896 2 2 2h8c2.333 0 .398-2.041 3-1 5 2 20 1 20 1 1.104 0 2-.896 2-2z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M16.312 20.75c-.25 0-.5-.093-.694-.28-.398-.383-.409-1.017-.025-1.414l1.688-1.75c.384-.396 1.017-.408 1.414-.025.398.383.409 1.016.025 1.414l-1.688 1.75c-.196.202-.458.305-.72.305zM19.999 23c-.15 0-.303-.034-.446-.105-.494-.247-.694-.848-.447-1.342l1-2c.248-.494.848-.692 1.342-.447.494.247.694.848.447 1.342l-1 2c-.176.35-.529.552-.896.552zm4.002 1c-.047 0-.095-.003-.143-.01-.547-.079-.927-.585-.849-1.132l.209-1.458c.079-.547.587-.923 1.132-.849.547.079.927.585.849 1.132l-.209 1.458c-.072.5-.5.859-.989.859z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M26 33c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3zm-14 0c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M30 36H2c-1.104 0-2.104-3-1-3h28c3 0 3-3 4-4 5 3 2 7-3 7z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M1 28c0-9 2-14 2-21 0-2.279 13-2 13 0s-1.5 10 5 13c6.268 2.893 15 2 15 8H1z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M36 28c-24 0-19.001-1-25-1H1v1c0 1.104.896 2 2 2h8c2.333 0 .398-2.041 3-1 5 2 20 1 20 1 1.104 0 2-.896 2-2z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M16.312 20.75c-.25 0-.5-.093-.694-.28-.398-.383-.409-1.017-.025-1.414l1.688-1.75c.384-.396 1.017-.408 1.414-.025.398.383.409 1.016.025 1.414l-1.688 1.75c-.196.202-.458.305-.72.305zM19.999 23c-.15 0-.303-.034-.446-.105-.494-.247-.694-.848-.447-1.342l1-2c.248-.494.848-.692 1.342-.447.494.247.694.848.447 1.342l-1 2c-.176.35-.529.552-.896.552zm4.002 1c-.047 0-.095-.003-.143-.01-.547-.079-.927-.585-.849-1.132l.209-1.458c.079-.547.587-.923 1.132-.849.547.079.927.585.849 1.132l-.209 1.458c-.072.5-.5.859-.989.859z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#99AAB5" d="M26 33c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3zm-14 0c2 2-11 2-9 0 3 0 3-3 3-3h3s0 3 3 3z"/>
   <path fill="#99AAB5" d="M30 36H2c-1.104 0-2.104-3-1-3h28c3 0 3-3 4-4 5 3 2 7-3 7z"/>
diff --git a/public/emoji/2754_border.svg b/public/emoji/2754_border.svg
index 1d6c4ecda..c86ae128a 100644
--- a/public/emoji/2754_border.svg
+++ b/public/emoji/2754_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M17 27c-1.657 0-3-1.343-3-3v-4c0-1.657 1.343-3 3-3 .603-.006 6-1 6-5 0-2-2-4-5-4-2.441 0-4 2-4 3 0 1.657-1.343 3-3 3s-3-1.343-3-3c0-4.878 4.58-9 10-9 8 0 11 5.982 11 11 0 4.145-2.277 7.313-6.413 8.92-.9.351-1.79.587-2.587.747V24c0 1.657-1.343 3-3 3z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <circle cx="17" cy="32" r="3" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17 27c-1.657 0-3-1.343-3-3v-4c0-1.657 1.343-3 3-3 .603-.006 6-1 6-5 0-2-2-4-5-4-2.441 0-4 2-4 3 0 1.657-1.343 3-3 3s-3-1.343-3-3c0-4.878 4.58-9 10-9 8 0 11 5.982 11 11 0 4.145-2.277 7.313-6.413 8.92-.9.351-1.79.587-2.587.747V24c0 1.657-1.343 3-3 3z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="17" cy="32" r="3" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#CCD6DD" d="M17 27c-1.657 0-3-1.343-3-3v-4c0-1.657 1.343-3 3-3 .603-.006 6-1 6-5 0-2-2-4-5-4-2.441 0-4 2-4 3 0 1.657-1.343 3-3 3s-3-1.343-3-3c0-4.878 4.58-9 10-9 8 0 11 5.982 11 11 0 4.145-2.277 7.313-6.413 8.92-.9.351-1.79.587-2.587.747V24c0 1.657-1.343 3-3 3z"/>
   <circle fill="#CCD6DD" cx="17" cy="32" r="3"/>
diff --git a/public/emoji/2755_border.svg b/public/emoji/2755_border.svg
index 65ec57082..139c459ae 100644
--- a/public/emoji/2755_border.svg
+++ b/public/emoji/2755_border.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <circle cx="18" cy="32" r="3" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
-    <path d="M21 24c0 1.657-1.343 3-3 3s-3-1.343-3-3V5c0-1.657 1.343-3 3-3s3 1.343 3 3v19z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="18" cy="32" r="3" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M21 24c0 1.657-1.343 3-3 3s-3-1.343-3-3V5c0-1.657 1.343-3 3-3s3 1.343 3 3v19z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <circle fill="#CCD6DD" cx="18" cy="32" r="3"/>
   <path fill="#CCD6DD" d="M21 24c0 1.657-1.343 3-3 3s-3-1.343-3-3V5c0-1.657 1.343-3 3-3s3 1.343 3 3v19z"/>
diff --git a/public/emoji/2b1c_border.svg b/public/emoji/2b1c_border.svg
index c633cc3de..a8ad76188 100644
--- a/public/emoji/2b1c_border.svg
+++ b/public/emoji/2b1c_border.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
   <g>
-    <path d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
   </g>
   <path fill="#E6E7E8" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/>
 </svg>
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
deleted file mode 100644
index 383604406..000000000
Binary files a/public/favicon-dev.ico and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc..b09a98bb9 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/headers/original/missing.png b/public/headers/original/missing.png
index 26b59e75a..240ca4f8d 100644
Binary files a/public/headers/original/missing.png and b/public/headers/original/missing.png differ
diff --git a/public/mask-icon.svg b/public/mask-icon.svg
deleted file mode 100644
index f91ff5067..000000000
--- a/public/mask-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
deleted file mode 100644
index a4994062d..000000000
Binary files a/public/mstile-150x150.png and /dev/null differ
diff --git a/public/oops.png b/public/oops.png
index 1ac779f25..a98704400 100644
Binary files a/public/oops.png and b/public/oops.png differ
diff --git a/public/shortcuts/direct.png b/public/shortcuts/direct.png
deleted file mode 100644
index e8772c00e..000000000
Binary files a/public/shortcuts/direct.png and /dev/null differ
diff --git a/public/shortcuts/new-status.png b/public/shortcuts/new-status.png
deleted file mode 100644
index b7095f3c4..000000000
Binary files a/public/shortcuts/new-status.png and /dev/null differ
diff --git a/public/shortcuts/notifications.png b/public/shortcuts/notifications.png
deleted file mode 100644
index 6b9d45718..000000000
Binary files a/public/shortcuts/notifications.png and /dev/null differ
diff --git a/public/shortcuts/profile.png b/public/shortcuts/profile.png
deleted file mode 100644
index 0b3bf517d..000000000
Binary files a/public/shortcuts/profile.png and /dev/null differ
diff --git a/public/sw.js b/public/sw.js
index 1471a9e64..debb9af9d 120000
--- a/public/sw.js
+++ b/public/sw.js
@@ -1 +1 @@
-assets/sw.js
\ No newline at end of file
+packs/sw.js
\ No newline at end of file
diff --git a/public/sw.js.map b/public/sw.js.map
new file mode 120000
index 000000000..0734c8199
--- /dev/null
+++ b/public/sw.js.map
@@ -0,0 +1 @@
+packs/sw.js.map
\ No newline at end of file
diff --git a/public/web-push-icon_expand.png b/public/web-push-icon_expand.png
index 5c115c769..9a948c09a 100644
Binary files a/public/web-push-icon_expand.png and b/public/web-push-icon_expand.png differ
diff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png
index 321f775ee..2cd9e827b 100644
Binary files a/public/web-push-icon_favourite.png and b/public/web-push-icon_favourite.png differ
diff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png
index 0f555ed09..4a7104bf3 100644
Binary files a/public/web-push-icon_reblog.png and b/public/web-push-icon_reblog.png differ
diff --git a/scalingo.json b/scalingo.json
index 51d9b5b9f..8c8992977 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -74,8 +74,13 @@
       "description": "SMTP server certificate verification mode. Defaults is 'peer'.",
       "required": false
     },
+    "SMTP_ENABLE_STARTTLS": {
+      "description": "Enable STARTTLS? Default is 'auto'.",
+      "value": "auto",
+      "required": false
+    },
     "SMTP_ENABLE_STARTTLS_AUTO": {
-      "description": "Enable STARTTLS if SMTP server supports it? Default is true.",
+      "description": "Enable STARTTLS if SMTP server supports it? Deprecated by SMTP_ENABLE_STARTTLS.",
       "required": false
     },
     "BUILDPACK_URL": {
@@ -92,8 +97,5 @@
   "scripts": {
     "postdeploy": "bundle exec rails db:migrate && bundle exec rails db:seed"
   },
-  "addons": [
-    "postgresql",
-    "redis"
-  ]
+  "addons": ["postgresql", "redis"]
 }
diff --git a/spec/config/initializers/rack_attack_spec.rb b/spec/config/initializers/rack_attack_spec.rb
new file mode 100644
index 000000000..581021cb9
--- /dev/null
+++ b/spec/config/initializers/rack_attack_spec.rb
@@ -0,0 +1,82 @@
+require 'rails_helper'
+
+describe Rack::Attack do
+  include Rack::Test::Methods
+
+  def app
+    Rails.application
+  end
+
+  shared_examples 'throttled endpoint' do
+    context 'when the number of requests is lower than the limit' do
+      it 'does not change the request status' do
+        limit.times do
+          request.call
+          expect(last_response.status).to_not eq(429)
+        end
+      end
+    end
+
+    context 'when the number of requests is higher than the limit' do
+      it 'returns http too many requests' do
+        (limit * 2).times do |i|
+          request.call
+          expect(last_response.status).to eq(429) if i > limit
+        end
+      end
+    end
+  end
+
+  let(:remote_ip) { '1.2.3.5' }
+
+  describe 'throttle excessive sign-up requests by IP address' do
+    context 'through the website' do
+      let(:limit) { 25 }
+      let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
+
+      context 'for exact path' do
+        let(:path)  { '/auth' }
+        it_behaves_like 'throttled endpoint'
+      end
+
+      context 'for path with format' do
+        let(:path)  { '/auth.html' }
+        it_behaves_like 'throttled endpoint'
+      end
+    end
+
+    context 'through the API' do
+      let(:limit) { 5 }
+      let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
+
+      context 'for exact path' do
+        let(:path)  { '/api/v1/accounts' }
+        it_behaves_like 'throttled endpoint'
+      end
+
+      context 'for path with format' do
+        let(:path)  { '/api/v1/accounts.json' }
+
+        it 'returns http not found' do
+          request.call
+          expect(last_response.status).to eq(404)
+        end
+      end
+    end
+  end
+
+  describe 'throttle excessive sign-in requests by IP address' do
+    let(:limit) { 25 }
+    let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
+
+    context 'for exact path' do
+      let(:path)  { '/auth/sign_in' }
+      it_behaves_like 'throttled endpoint'
+    end
+
+    context 'for path with format' do
+      let(:path)  { '/auth/sign_in.html' }
+      it_behaves_like 'throttled endpoint'
+    end
+  end
+end
diff --git a/spec/controllers/about_controller_spec.rb b/spec/controllers/about_controller_spec.rb
index 03dddd8c1..97143ec43 100644
--- a/spec/controllers/about_controller_spec.rb
+++ b/spec/controllers/about_controller_spec.rb
@@ -8,44 +8,8 @@ RSpec.describe AboutController, type: :controller do
       get :show
     end
 
-    it 'assigns @instance_presenter' do
-      expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
-    end
-
     it 'returns http success' do
       expect(response).to have_http_status(200)
     end
   end
-
-  describe 'GET #more' do
-    before do
-      get :more
-    end
-
-    it 'assigns @instance_presenter' do
-      expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'GET #terms' do
-    before do
-      get :terms
-    end
-
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'helper_method :new_user' do
-    it 'returns a new User' do
-      user = @controller.view_context.new_user
-      expect(user).to be_kind_of User
-      expect(user.account).to be_kind_of Account
-    end
-  end
 end
diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb
deleted file mode 100644
index d33cd0499..000000000
--- a/spec/controllers/account_follow_controller_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'rails_helper'
-
-describe AccountFollowController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-  let(:alice) { Fabricate(:account, username: 'alice') }
-
-  describe 'POST #create' do
-    let(:service) { double }
-
-    subject { post :create, params: { account_username: alice.username } }
-
-    before do
-      allow(FollowService).to receive(:new).and_return(service)
-      allow(service).to receive(:call)
-    end
-
-    context 'when account is permanently suspended' do
-      before do
-        alice.suspend!
-        alice.deletion_request.destroy
-        subject
-      end
-
-      it 'returns http gone' do
-        expect(response).to have_http_status(410)
-      end
-    end
-
-    context 'when account is temporarily suspended' do
-      before do
-        alice.suspend!
-        subject
-      end
-
-      it 'returns http forbidden' do
-        expect(response).to have_http_status(403)
-      end
-    end
-
-    context 'when signed out' do
-      before do
-        subject
-      end
-
-      it 'does not follow' do
-        expect(FollowService).not_to receive(:new)
-      end
-    end
-
-    context 'when signed in' do
-      before do
-        sign_in(user)
-        subject
-      end
-
-      it 'redirects to account path' do
-        expect(service).to have_received(:call).with(user.account, alice, with_rate_limit: true)
-        expect(response).to redirect_to(account_path(alice))
-      end
-    end
-  end
-end
diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb
deleted file mode 100644
index a11f7aa68..000000000
--- a/spec/controllers/account_unfollow_controller_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'rails_helper'
-
-describe AccountUnfollowController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-  let(:alice) { Fabricate(:account, username: 'alice') }
-
-  describe 'POST #create' do
-    let(:service) { double }
-
-    subject { post :create, params: { account_username: alice.username } }
-
-    before do
-      allow(UnfollowService).to receive(:new).and_return(service)
-      allow(service).to receive(:call)
-    end
-
-    context 'when account is permanently suspended' do
-      before do
-        alice.suspend!
-        alice.deletion_request.destroy
-        subject
-      end
-
-      it 'returns http gone' do
-        expect(response).to have_http_status(410)
-      end
-    end
-
-    context 'when account is temporarily suspended' do
-      before do
-        alice.suspend!
-        subject
-      end
-
-      it 'returns http forbidden' do
-        expect(response).to have_http_status(403)
-      end
-    end
-
-    context 'when signed out' do
-      before do
-        subject
-      end
-
-      it 'does not unfollow' do
-        expect(UnfollowService).not_to receive(:new)
-      end
-    end
-
-    context 'when signed in' do
-      before do
-        sign_in(user)
-        subject
-      end
-
-      it 'redirects to account path' do
-        expect(service).to have_received(:call).with(user.account, alice)
-        expect(response).to redirect_to(account_path(alice))
-      end
-    end
-  end
-end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index ac426b01e..defa8b2d3 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
 RSpec.describe AccountsController, type: :controller do
   render_views
 
-  let(:account) { Fabricate(:user).account }
+  let(:account) { Fabricate(:account) }
 
-  shared_examples 'cachable response' do
+  shared_examples 'cacheable response' do
     it 'does not set cookies' do
       expect(response.cookies).to be_empty
       expect(response.headers['Set-Cookies']).to be nil
@@ -35,6 +35,7 @@ RSpec.describe AccountsController, type: :controller do
     before do
       status_media.media_attachments << Fabricate(:media_attachment, account: account, type: :image)
       account.pinned_statuses << status_pinned
+      account.pinned_statuses << status_private
     end
 
     shared_examples 'preliminary checks' do
@@ -98,100 +99,6 @@ RSpec.describe AccountsController, type: :controller do
         end
 
         it_behaves_like 'common response characteristics'
-
-        it 'renders public status' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status))
-        end
-
-        it 'renders self-reply' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_self_reply))
-        end
-
-        it 'renders status with media' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_media))
-        end
-
-        it 'renders reblog' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_reblog.reblog))
-        end
-
-        it 'renders pinned status' do
-          expect(response.body).to include(I18n.t('stream_entries.pinned'))
-        end
-
-        it 'does not render private status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-        end
-
-        it 'does not render direct status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_direct))
-        end
-
-        it 'does not render reply to someone else' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reply))
-        end
-      end
-
-      context 'when signed-in' do
-        let(:user) { Fabricate(:user) }
-
-        before do
-          sign_in(user)
-        end
-
-        context 'when user follows account' do
-          before do
-            user.account.follow!(account)
-            get :show, params: { username: account.username, format: format }
-          end
-
-          it 'does not render private status' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-          end
-        end
-
-        context 'when user is blocked' do
-          before do
-            account.block!(user.account)
-            get :show, params: { username: account.username, format: format }
-          end
-
-          it 'renders unavailable message' do
-            expect(response.body).to include(I18n.t('accounts.unavailable'))
-          end
-
-          it 'does not render public status' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status))
-          end
-
-          it 'does not render self-reply' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_self_reply))
-          end
-
-          it 'does not render status with media' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_media))
-          end
-
-          it 'does not render reblog' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reblog.reblog))
-          end
-
-          it 'does not render pinned status' do
-            expect(response.body).to_not include(I18n.t('stream_entries.pinned'))
-          end
-
-          it 'does not render private status' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-          end
-
-          it 'does not render direct status' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_direct))
-          end
-
-          it 'does not render reply to someone else' do
-            expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reply))
-          end
-        end
       end
 
       context 'with replies' do
@@ -201,38 +108,6 @@ RSpec.describe AccountsController, type: :controller do
         end
 
         it_behaves_like 'common response characteristics'
-
-        it 'renders public status' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status))
-        end
-
-        it 'renders self-reply' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_self_reply))
-        end
-
-        it 'renders status with media' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_media))
-        end
-
-        it 'renders reblog' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_reblog.reblog))
-        end
-
-        it 'does not render pinned status' do
-          expect(response.body).to_not include(I18n.t('stream_entries.pinned'))
-        end
-
-        it 'does not render private status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-        end
-
-        it 'does not render direct status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_direct))
-        end
-
-        it 'renders reply to someone else' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_reply))
-        end
       end
 
       context 'with media' do
@@ -242,38 +117,6 @@ RSpec.describe AccountsController, type: :controller do
         end
 
         it_behaves_like 'common response characteristics'
-
-        it 'does not render public status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status))
-        end
-
-        it 'does not render self-reply' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_self_reply))
-        end
-
-        it 'renders status with media' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_media))
-        end
-
-        it 'does not render reblog' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reblog.reblog))
-        end
-
-        it 'does not render pinned status' do
-          expect(response.body).to_not include(I18n.t('stream_entries.pinned'))
-        end
-
-        it 'does not render private status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-        end
-
-        it 'does not render direct status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_direct))
-        end
-
-        it 'does not render reply to someone else' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reply))
-        end
       end
 
       context 'with tag' do
@@ -288,42 +131,6 @@ RSpec.describe AccountsController, type: :controller do
         end
 
         it_behaves_like 'common response characteristics'
-
-        it 'does not render public status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status))
-        end
-
-        it 'does not render self-reply' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_self_reply))
-        end
-
-        it 'does not render status with media' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_media))
-        end
-
-        it 'does not render reblog' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reblog.reblog))
-        end
-
-        it 'does not render pinned status' do
-          expect(response.body).to_not include(I18n.t('stream_entries.pinned'))
-        end
-
-        it 'does not render private status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
-        end
-
-        it 'does not render direct status' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_direct))
-        end
-
-        it 'does not render reply to someone else' do
-          expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_reply))
-        end
-
-        it 'renders status with tag' do
-          expect(response.body).to include(ActivityPub::TagManager.instance.url_for(status_tag))
-        end
       end
     end
 
@@ -373,7 +180,7 @@ RSpec.describe AccountsController, type: :controller do
           expect(response.media_type).to eq 'application/activity+json'
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'renders account' do
           json = body_as_json
@@ -419,7 +226,7 @@ RSpec.describe AccountsController, type: :controller do
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
         before do
-          allow(controller).to receive(:signed_request_account).and_return(remote_account)
+          allow(controller).to receive(:signed_request_actor).and_return(remote_account)
           get :show, params: { username: account.username, format: format }
         end
 
@@ -431,7 +238,7 @@ RSpec.describe AccountsController, type: :controller do
           expect(response.media_type).to eq 'application/activity+json'
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'renders account' do
           json = body_as_json
@@ -498,7 +305,7 @@ RSpec.describe AccountsController, type: :controller do
           expect(response).to have_http_status(200)
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
       end
 
       context do
diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index d584136ff..f78d9abbf 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -4,9 +4,10 @@ require 'rails_helper'
 
 RSpec.describe ActivityPub::CollectionsController, type: :controller do
   let!(:account) { Fabricate(:account) }
+  let!(:private_pinned) { Fabricate(:status, account: account, text: 'secret private stuff', visibility: :private) }
   let(:remote_account) { nil }
 
-  shared_examples 'cachable response' do
+  shared_examples 'cacheable response' do
     it 'does not set cookies' do
       expect(response.cookies).to be_empty
       expect(response.headers['Set-Cookies']).to be nil
@@ -23,10 +24,11 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
   end
 
   before do
-    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+    allow(controller).to receive(:signed_request_actor).and_return(remote_account)
 
     Fabricate(:status_pin, account: account)
     Fabricate(:status_pin, account: account)
+    Fabricate(:status_pin, account: account, status: private_pinned)
     Fabricate(:status, account: account, visibility: :private)
   end
 
@@ -46,11 +48,19 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
           expect(response.media_type).to eq 'application/activity+json'
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'returns orderedItems with pinned statuses' do
           expect(body[:orderedItems]).to be_an Array
-          expect(body[:orderedItems].size).to eq 2
+          expect(body[:orderedItems].size).to eq 3
+        end
+
+        it 'includes URI of private pinned status' do
+          expect(body[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+        end
+
+        it 'does not include contents of private pinned status' do
+          expect(response.body).not_to include(private_pinned.text)
         end
 
         context 'when account is permanently suspended' do
@@ -91,12 +101,21 @@ RSpec.describe ActivityPub::CollectionsController, type: :controller do
             expect(response.media_type).to eq 'application/activity+json'
           end
 
-          it_behaves_like 'cachable response'
+          it_behaves_like 'cacheable response'
 
           it 'returns orderedItems with pinned statuses' do
             json = body_as_json
             expect(json[:orderedItems]).to be_an Array
-            expect(json[:orderedItems].size).to eq 2
+            expect(json[:orderedItems].size).to eq 3
+          end
+
+          it 'includes URI of private pinned status' do
+            json = body_as_json
+            expect(json[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+          end
+
+          it 'does not include contents of private pinned status' do
+            expect(response.body).not_to include(private_pinned.text)
           end
         end
 
diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
index 3a382ff27..c19bb8cae 100644
--- a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
+++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controll
   end
 
   before do
-    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+    allow(controller).to receive(:signed_request_actor).and_return(remote_account)
   end
 
   describe 'GET #show' do
@@ -47,7 +47,7 @@ RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controll
 
       it 'returns orderedItems with followers from example.com' do
         expect(body[:orderedItems]).to be_an Array
-        expect(body[:orderedItems].sort).to eq [follower_4.uri, follower_1.uri, follower_2.uri]
+        expect(body[:orderedItems]).to match_array([follower_4.uri, follower_1.uri, follower_2.uri])
       end
 
       it 'returns private Cache-Control header' do
diff --git a/spec/controllers/activitypub/inboxes_controller_spec.rb b/spec/controllers/activitypub/inboxes_controller_spec.rb
index 973ad83bb..2f023197b 100644
--- a/spec/controllers/activitypub/inboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/inboxes_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ActivityPub::InboxesController, type: :controller do
   let(:remote_account) { nil }
 
   before do
-    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+    allow(controller).to receive(:signed_request_actor).and_return(remote_account)
   end
 
   describe 'POST #create' do
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index 1722690db..74bf46a5e 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe ActivityPub::OutboxesController, type: :controller do
   let!(:account) { Fabricate(:account) }
 
-  shared_examples 'cachable response' do
+  shared_examples 'cacheable response' do
     it 'does not set cookies' do
       expect(response.cookies).to be_empty
       expect(response.headers['Set-Cookies']).to be nil
@@ -28,7 +28,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
   end
 
   before do
-    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+    allow(controller).to receive(:signed_request_actor).and_return(remote_account)
   end
 
   describe 'GET #show' do
@@ -53,7 +53,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
           expect(body[:totalItems]).to eq 4
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'does not have a Vary header' do
           expect(response.headers['Vary']).to be_nil
@@ -98,7 +98,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
           expect(body[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'returns Vary header with Signature' do
           expect(response.headers['Vary']).to include 'Signature'
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index bf82fd020..aee1a8b1a 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -4,10 +4,11 @@ require 'rails_helper'
 
 RSpec.describe ActivityPub::RepliesController, type: :controller do
   let(:status) { Fabricate(:status, visibility: parent_visibility) }
-  let(:remote_reply_id) { nil }
-  let(:remote_account) { nil }
+  let(:remote_account)  { Fabricate(:account, domain: 'foobar.com') }
+  let(:remote_reply_id) { 'https://foobar.com/statuses/1234' }
+  let(:remote_querier) { nil }
 
-  shared_examples 'cachable response' do
+  shared_examples 'cacheable response' do
     it 'does not set cookies' do
       expect(response.cookies).to be_empty
       expect(response.headers['Set-Cookies']).to be nil
@@ -23,8 +24,151 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
     end
   end
 
+  shared_examples 'common behavior' do
+    context 'when status is private' do
+      let(:parent_visibility) { :private }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when status is direct' do
+      let(:parent_visibility) { :direct }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  shared_examples 'disallowed access' do
+    context 'when status is public' do
+      let(:parent_visibility) { :public }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    it_behaves_like 'common behavior'
+  end
+
+  shared_examples 'allowed access' do
+    context 'when account is permanently suspended' do
+      let(:parent_visibility) { :public }
+
+      before do
+        status.account.suspend!
+        status.account.deletion_request.destroy
+      end
+
+      it 'returns http gone' do
+        expect(response).to have_http_status(410)
+      end
+    end
+
+    context 'when account is temporarily suspended' do
+      let(:parent_visibility) { :public }
+
+      before do
+        status.account.suspend!
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(403)
+      end
+    end
+
+    context 'when status is public' do
+      let(:parent_visibility) { :public }
+      let(:json) { body_as_json }
+      let(:page_json) { json[:first] }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'returns application/activity+json' do
+        expect(response.media_type).to eq 'application/activity+json'
+      end
+
+      it_behaves_like 'cacheable response'
+
+      context 'without only_other_accounts' do
+        it "returns items with thread author's replies" do
+          expect(page_json).to be_a Hash
+          expect(page_json[:items]).to be_an Array
+          expect(page_json[:items].size).to eq 1
+          expect(page_json[:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+        end
+
+        context 'when there are few self-replies' do
+          it 'points next to replies from other people' do
+            expect(page_json).to be_a Hash
+            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+          end
+        end
+
+        context 'when there are many self-replies' do
+          before do
+            10.times { Fabricate(:status, account: status.account, thread: status, visibility: :public) }
+          end
+
+          it 'points next to other self-replies' do
+            expect(page_json).to be_a Hash
+            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=false', 'page=true')
+          end
+        end
+      end
+
+      context 'with only_other_accounts' do
+        let(:only_other_accounts) { 'true' }
+
+        it 'returns items with other public or unlisted replies' do
+          expect(page_json).to be_a Hash
+          expect(page_json[:items]).to be_an Array
+          expect(page_json[:items].size).to eq 3
+        end
+
+        it 'only inlines items that are local and public or unlisted replies' do
+          inlined_replies = page_json[:items].select { |x| x.is_a?(Hash) }
+          public_collection = ActivityPub::TagManager::COLLECTIONS[:public]
+          expect(inlined_replies.all? { |item| item[:to].include?(public_collection) || item[:cc].include?(public_collection) }).to be true
+          expect(inlined_replies.all? { |item| ActivityPub::TagManager.instance.local_uri?(item[:id]) }).to be true
+        end
+
+        it 'uses ids for remote toots' do
+          remote_replies = page_json[:items].select { |x| !x.is_a?(Hash) }
+          expect(remote_replies.all? { |item| item.is_a?(String) && !ActivityPub::TagManager.instance.local_uri?(item) }).to be true
+        end
+
+        context 'when there are few replies' do
+          it 'does not have a next page' do
+            expect(page_json).to be_a Hash
+            expect(page_json[:next]).to be_nil
+          end
+        end
+
+        context 'when there are many replies' do
+          before do
+            10.times { Fabricate(:status, thread: status, visibility: :public) }
+          end
+
+          it 'points next to other replies' do
+            expect(page_json).to be_a Hash
+            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+          end
+        end
+      end
+    end
+
+    it_behaves_like 'common behavior'
+  end
+
   before do
-    allow(controller).to receive(:signed_request_account).and_return(remote_account)
+    stub_const 'ActivityPub::RepliesController::DESCENDANTS_LIMIT', 5
+    allow(controller).to receive(:signed_request_actor).and_return(remote_querier)
 
     Fabricate(:status, thread: status, visibility: :public)
     Fabricate(:status, thread: status, visibility: :public)
@@ -32,215 +176,36 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
     Fabricate(:status, account: status.account, thread: status, visibility: :public)
     Fabricate(:status, account: status.account, thread: status, visibility: :private)
 
-    Fabricate(:status, account: remote_account, thread: status, visibility: :public, uri: remote_reply_id) if remote_reply_id
+    Fabricate(:status, account: remote_account, thread: status, visibility: :public, uri: remote_reply_id)
   end
 
   describe 'GET #index' do
+    subject(:response) { get :index, params: { account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts } }
+    let(:only_other_accounts) { nil }
+
     context 'with no signature' do
-      subject(:response) { get :index, params: { account_username: status.account.username, status_id: status.id } }
-      subject(:body) { body_as_json }
-
-      context 'when account is permanently suspended' do
-        let(:parent_visibility) { :public }
-
-        before do
-          status.account.suspend!
-          status.account.deletion_request.destroy
-        end
-
-        it 'returns http gone' do
-          expect(response).to have_http_status(410)
-        end
-      end
-
-      context 'when account is temporarily suspended' do
-        let(:parent_visibility) { :public }
-
-        before do
-          status.account.suspend!
-        end
-
-        it 'returns http forbidden' do
-          expect(response).to have_http_status(403)
-        end
-      end
-
-      context 'when status is public' do
-        let(:parent_visibility) { :public }
-
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
-          expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it_behaves_like 'cachable response'
-
-        it 'returns items with account\'s own replies' do
-          expect(body[:first]).to be_a Hash
-          expect(body[:first][:items]).to be_an Array
-          expect(body[:first][:items].size).to eq 1
-          expect(body[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
-        end
-      end
-
-      context 'when status is private' do
-        let(:parent_visibility) { :private }
-
-        it 'returns http not found' do
-          expect(response).to have_http_status(404)
-        end
-      end
-
-      context 'when status is direct' do
-        let(:parent_visibility) { :direct }
-
-        it 'returns http not found' do
-          expect(response).to have_http_status(404)
-        end
-      end
+      it_behaves_like 'allowed access'
     end
 
     context 'with signature' do
-      let(:remote_account) { Fabricate(:account, domain: 'example.com') }
-      let(:only_other_accounts) { nil }
+      let(:remote_querier) { Fabricate(:account, domain: 'example.com') }
 
-      context do
-        before do
-          get :index, params: { account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts }
-        end
-
-        context 'when status is public' do
-          let(:parent_visibility) { :public }
-
-          it 'returns http success' do
-            expect(response).to have_http_status(200)
-          end
-
-          it 'returns application/activity+json' do
-            expect(response.media_type).to eq 'application/activity+json'
-          end
-
-          it_behaves_like 'cachable response'
-
-          context 'without only_other_accounts' do
-            it 'returns items with account\'s own replies' do
-              json = body_as_json
-
-              expect(json[:first]).to be_a Hash
-              expect(json[:first][:items]).to be_an Array
-              expect(json[:first][:items].size).to eq 1
-              expect(json[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
-            end
-          end
-
-          context 'with only_other_accounts' do
-            let(:only_other_accounts) { 'true' }
-
-            it 'returns items with other public or unlisted replies' do
-              json = body_as_json
-
-              expect(json[:first]).to be_a Hash
-              expect(json[:first][:items]).to be_an Array
-              expect(json[:first][:items].size).to eq 2
-              expect(json[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
-            end
-
-            context 'with remote responses' do
-              let(:remote_reply_id) { 'foo' }
-
-              it 'returned items are all inlined local toots or are ids' do
-                json = body_as_json
-
-                expect(json[:first]).to be_a Hash
-                expect(json[:first][:items]).to be_an Array
-                expect(json[:first][:items].size).to eq 3
-                expect(json[:first][:items].all? { |item| item.is_a?(Hash) ? ActivityPub::TagManager.instance.local_uri?(item[:id]) : item.is_a?(String) }).to be true
-                expect(json[:first][:items]).to include remote_reply_id
-              end
-            end
-          end
-        end
-
-        context 'when status is private' do
-          let(:parent_visibility) { :private }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-
-        context 'when status is direct' do
-          let(:parent_visibility) { :direct }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-      end
+      it_behaves_like 'allowed access'
 
       context 'when signed request account is blocked' do
         before do
-          status.account.block!(remote_account)
-          get :index, params: { account_username: status.account.username, status_id: status.id }
+          status.account.block!(remote_querier)
         end
 
-        context 'when status is public' do
-          let(:parent_visibility) { :public }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-
-        context 'when status is private' do
-          let(:parent_visibility) { :private }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-
-        context 'when status is direct' do
-          let(:parent_visibility) { :direct }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
+        it_behaves_like 'disallowed access'
       end
 
       context 'when signed request account is domain blocked' do
         before do
-          status.account.block_domain!(remote_account.domain)
-          get :index, params: { account_username: status.account.username, status_id: status.id }
+          status.account.block_domain!(remote_querier.domain)
         end
 
-        context 'when status is public' do
-          let(:parent_visibility) { :public }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-
-        context 'when status is private' do
-          let(:parent_visibility) { :private }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
-
-        context 'when status is direct' do
-          let(:parent_visibility) { :direct }
-
-          it 'returns http not found' do
-            expect(response).to have_http_status(404)
-          end
-        end
+        it_behaves_like 'disallowed access'
       end
     end
   end
diff --git a/spec/controllers/admin/account_moderation_notes_controller_spec.rb b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
index 410ce6543..d3f3263f8 100644
--- a/spec/controllers/admin/account_moderation_notes_controller_spec.rb
+++ b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Admin::AccountModerationNotesController, type: :controller do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:target_account) { Fabricate(:account) }
 
   before do
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 3edbde03c..81d592ddd 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
   before { sign_in current_user, scope: :user }
 
   describe 'GET #index' do
-    let(:current_user) { Fabricate(:user, admin: true) }
+    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
     around do |example|
       default_per_page = Account.default_per_page
@@ -60,8 +60,8 @@ RSpec.describe Admin::AccountsController, type: :controller do
   end
 
   describe 'GET #show' do
-    let(:current_user) { Fabricate(:user, admin: true) }
-    let(:account) { Fabricate(:account, username: 'bob') }
+    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+    let(:account) { Fabricate(:account) }
 
     it 'returns http success' do
       get :show, params: { id: account.id }
@@ -72,15 +72,15 @@ RSpec.describe Admin::AccountsController, type: :controller do
   describe 'POST #memorialize' do
     subject { post :memorialize, params: { id: account.id } }
 
-    let(:current_user) { Fabricate(:user, admin: current_user_admin) }
-    let(:account) { Fabricate(:account, user: user) }
-    let(:user) { Fabricate(:user, admin: target_user_admin) }
+    let(:current_user) { Fabricate(:user, role: current_role) }
+    let(:account) { user.account }
+    let(:user) { Fabricate(:user, role: target_role) }
 
     context 'when user is admin' do
-      let(:current_user_admin) { true }
+      let(:current_role) { UserRole.find_by(name: 'Admin') }
 
       context 'when target user is admin' do
-        let(:target_user_admin) { true }
+        let(:target_role) { UserRole.find_by(name: 'Admin') }
 
         it 'fails to memorialize account' do
           is_expected.to have_http_status :forbidden
@@ -89,7 +89,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
       end
 
       context 'when target user is not admin' do
-        let(:target_user_admin) { false }
+        let(:target_role) { UserRole.find_by(name: 'Moderator') }
 
         it 'succeeds in memorializing account' do
           is_expected.to redirect_to admin_account_path(account.id)
@@ -99,10 +99,10 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
 
     context 'when user is not admin' do
-      let(:current_user_admin) { false }
+      let(:current_role) { UserRole.find_by(name: 'Moderator') }
 
       context 'when target user is admin' do
-        let(:target_user_admin) { true }
+        let(:target_role) { UserRole.find_by(name: 'Admin') }
 
         it 'fails to memorialize account' do
           is_expected.to have_http_status :forbidden
@@ -111,7 +111,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
       end
 
       context 'when target user is not admin' do
-        let(:target_user_admin) { false }
+        let(:target_role) { UserRole.find_by(name: 'Moderator') }
 
         it 'fails to memorialize account' do
           is_expected.to have_http_status :forbidden
@@ -124,12 +124,12 @@ RSpec.describe Admin::AccountsController, type: :controller do
   describe 'POST #enable' do
     subject { post :enable, params: { id: account.id } }
 
-    let(:current_user) { Fabricate(:user, admin: admin) }
-    let(:account) { Fabricate(:account, user: user) }
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { user.account }
     let(:user) { Fabricate(:user, disabled: true) }
 
     context 'when user is admin' do
-      let(:admin) { true }
+      let(:role) { UserRole.find_by(name: 'Admin') }
 
       it 'succeeds in enabling account' do
         is_expected.to redirect_to admin_account_path(account.id)
@@ -138,7 +138,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
 
     context 'when user is not admin' do
-      let(:admin) { false }
+      let(:role) { UserRole.everyone }
 
       it 'fails to enable account' do
         is_expected.to have_http_status :forbidden
@@ -147,22 +147,107 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
   end
 
+  describe 'POST #approve' do
+    subject { post :approve, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { user.account }
+    let(:user) { Fabricate(:user) }
+
+    before do
+      account.user.update(approved: false)
+    end
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      it 'succeeds in approving account' do
+        is_expected.to redirect_to admin_accounts_path(status: 'pending')
+        expect(user.reload).to be_approved
+      end
+
+      it 'logs action' do
+        is_expected.to have_http_status :found
+
+        log_item = Admin::ActionLog.last
+
+        expect(log_item).to_not be_nil
+        expect(log_item.action).to eq :approve
+        expect(log_item.account_id).to eq current_user.account_id
+        expect(log_item.target_id).to eq account.user.id
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to approve account' do
+        is_expected.to have_http_status :forbidden
+        expect(user.reload).not_to be_approved
+      end
+    end
+  end
+
+  describe 'POST #reject' do
+    subject { post :reject, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { user.account }
+    let(:user) { Fabricate(:user) }
+
+    before do
+      account.user.update(approved: false)
+    end
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      it 'succeeds in rejecting account' do
+        is_expected.to redirect_to admin_accounts_path(status: 'pending')
+      end
+
+      it 'logs action' do
+        is_expected.to have_http_status :found
+
+        log_item = Admin::ActionLog.last
+
+        expect(log_item).to_not be_nil
+        expect(log_item.action).to eq :reject
+        expect(log_item.account_id).to eq current_user.account_id
+        expect(log_item.target_id).to eq account.user.id
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to reject account' do
+        is_expected.to have_http_status :forbidden
+        expect(user.reload).not_to be_approved
+      end
+    end
+  end
+
   describe 'POST #redownload' do
     subject { post :redownload, params: { id: account.id } }
 
-    let(:current_user) { Fabricate(:user, admin: admin) }
-    let(:account) { Fabricate(:account) }
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { Fabricate(:account, domain: 'example.com') }
+
+    before do
+      allow_any_instance_of(ResolveAccountService).to receive(:call)
+    end
 
     context 'when user is admin' do
-      let(:admin) { true }
+      let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in redownloadin' do
+      it 'succeeds in redownloading' do
         is_expected.to redirect_to admin_account_path(account.id)
       end
     end
 
     context 'when user is not admin' do
-      let(:admin) { false }
+      let(:role) { UserRole.everyone }
 
       it 'fails to redownload' do
         is_expected.to have_http_status :forbidden
@@ -173,11 +258,11 @@ RSpec.describe Admin::AccountsController, type: :controller do
   describe 'POST #remove_avatar' do
     subject { post :remove_avatar, params: { id: account.id } }
 
-    let(:current_user) { Fabricate(:user, admin: admin) }
+    let(:current_user) { Fabricate(:user, role: role) }
     let(:account) { Fabricate(:account) }
 
     context 'when user is admin' do
-      let(:admin) { true }
+      let(:role) { UserRole.find_by(name: 'Admin') }
 
       it 'succeeds in removing avatar' do
         is_expected.to redirect_to admin_account_path(account.id)
@@ -185,7 +270,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
 
     context 'when user is not admin' do
-      let(:admin) { false }
+      let(:role) { UserRole.everyone }
 
       it 'fails to remove avatar' do
         is_expected.to have_http_status :forbidden
@@ -194,32 +279,30 @@ RSpec.describe Admin::AccountsController, type: :controller do
   end
 
   describe 'POST #unblock_email' do
-    subject do
-      -> { post :unblock_email, params: { id: account.id } }
-    end
+    subject { post :unblock_email, params: { id: account.id } }
 
-    let(:current_user) { Fabricate(:user, admin: admin) }
+    let(:current_user) { Fabricate(:user, role: role) }
     let(:account) { Fabricate(:account, suspended: true) }
     let!(:email_block) { Fabricate(:canonical_email_block, reference_account: account) }
 
     context 'when user is admin' do
-      let(:admin) { true }
+      let(:role) { UserRole.find_by(name: 'Admin') }
 
       it 'succeeds in removing email blocks' do
-        is_expected.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
+        expect { subject }.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
       end
 
       it 'redirects to admin account path' do
-        subject.call
+        subject
         expect(response).to redirect_to admin_account_path(account.id)
       end
     end
 
     context 'when user is not admin' do
-      let(:admin) { false }
+      let(:role) { UserRole.everyone }
 
       it 'fails to remove avatar' do
-        subject.call
+        subject
         expect(response).to have_http_status :forbidden
       end
     end
diff --git a/spec/controllers/admin/action_logs_controller_spec.rb b/spec/controllers/admin/action_logs_controller_spec.rb
index 4720ed2e2..7cd8cdf46 100644
--- a/spec/controllers/admin/action_logs_controller_spec.rb
+++ b/spec/controllers/admin/action_logs_controller_spec.rb
@@ -3,9 +3,22 @@
 require 'rails_helper'
 
 describe Admin::ActionLogsController, type: :controller do
+  render_views
+
+  # Action logs typically cause issues when their targets are not in the database
+  let!(:account) { Fabricate(:account) }
+
+  let!(:orphaned_logs) do
+    %w(
+      Account User UserRole Report DomainBlock DomainAllow
+      EmailDomainBlock UnavailableDomain Status AccountWarning
+      Announcement IpBlock Instance CustomEmoji CanonicalEmailBlock Appeal
+    ).map { |type| Admin::ActionLog.new(account: account, action: 'destroy', target_type: type, target_id: 1312).save! }
+  end
+
   describe 'GET #index' do
     it 'returns 200' do
-      sign_in Fabricate(:user, admin: true)
+      sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
       get :index, params: { page: 1 }
 
       expect(response).to have_http_status(200)
diff --git a/spec/controllers/admin/base_controller_spec.rb b/spec/controllers/admin/base_controller_spec.rb
index 9ac833623..44be91951 100644
--- a/spec/controllers/admin/base_controller_spec.rb
+++ b/spec/controllers/admin/base_controller_spec.rb
@@ -5,13 +5,14 @@ require 'rails_helper'
 describe Admin::BaseController, type: :controller do
   controller do
     def success
+      authorize :dashboard, :index?
       render 'admin/reports/show'
     end
   end
 
   it 'requires administrator or moderator' do
     routes.draw { get 'success' => 'admin/base#success' }
-    sign_in(Fabricate(:user, admin: false, moderator: false))
+    sign_in(Fabricate(:user))
     get :success
 
     expect(response).to have_http_status(:forbidden)
@@ -19,14 +20,14 @@ describe Admin::BaseController, type: :controller do
 
   it 'renders admin layout as a moderator' do
     routes.draw { get 'success' => 'admin/base#success' }
-    sign_in(Fabricate(:user, moderator: true))
+    sign_in(Fabricate(:user, role: UserRole.find_by(name: 'Moderator')))
     get :success
     expect(response).to render_template layout: 'admin'
   end
 
   it 'renders admin layout as an admin' do
     routes.draw { get 'success' => 'admin/base#success' }
-    sign_in(Fabricate(:user, admin: true))
+    sign_in(Fabricate(:user, role: UserRole.find_by(name: 'Admin')))
     get :success
     expect(response).to render_template layout: 'admin'
   end
diff --git a/spec/controllers/admin/change_email_controller_spec.rb b/spec/controllers/admin/change_email_controller_spec.rb
index 31df0f0fc..cf8a27d39 100644
--- a/spec/controllers/admin/change_email_controller_spec.rb
+++ b/spec/controllers/admin/change_email_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Admin::ChangeEmailsController, type: :controller do
   render_views
 
-  let(:admin) { Fabricate(:user, admin: true) }
+  let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
     sign_in admin
@@ -11,10 +11,9 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
 
   describe "GET #show" do
     it "returns http success" do
-      account = Fabricate(:account)
-      user = Fabricate(:user, account: account)
+      user = Fabricate(:user)
 
-      get :show, params: { account_id: account.id }
+      get :show, params: { account_id: user.account.id }
 
       expect(response).to have_http_status(200)
     end
@@ -26,12 +25,11 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
     end
 
     it "returns http success" do
-      account = Fabricate(:account)
-      user = Fabricate(:user, account: account)
+      user = Fabricate(:user)
 
       previous_email = user.email
 
-      post :update, params: { account_id: account.id, user: { unconfirmed_email: 'test@example.com' } }
+      post :update, params: { account_id: user.account.id, user: { unconfirmed_email: 'test@example.com' } }
 
       user.reload
 
@@ -41,7 +39,7 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
 
       expect(UserMailer).to have_received(:confirmation_instructions).with(user, user.confirmation_token, { to: 'test@example.com' })
 
-      expect(response).to redirect_to(admin_account_path(account.id))
+      expect(response).to redirect_to(admin_account_path(user.account.id))
     end
   end
 end
diff --git a/spec/controllers/admin/confirmations_controller_spec.rb b/spec/controllers/admin/confirmations_controller_spec.rb
index eec2b2f5c..6268903c4 100644
--- a/spec/controllers/admin/confirmations_controller_spec.rb
+++ b/spec/controllers/admin/confirmations_controller_spec.rb
@@ -4,14 +4,13 @@ RSpec.describe Admin::ConfirmationsController, type: :controller do
   render_views
 
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
   describe 'POST #create' do
     it 'confirms the user' do
-      account = Fabricate(:account)
-      user = Fabricate(:user, confirmed_at: false, account: account)
-      post :create, params: { account_id: account.id }
+      user = Fabricate(:user, confirmed_at: false)
+      post :create, params: { account_id: user.account.id }
 
       expect(response).to redirect_to(admin_accounts_path)
       expect(user.reload).to be_confirmed
@@ -32,10 +31,9 @@ RSpec.describe Admin::ConfirmationsController, type: :controller do
   end
 
   describe 'POST #resernd' do
-    subject { post :resend, params: { account_id: account.id } }
+    subject { post :resend, params: { account_id: user.account.id } }
 
-    let(:account) { Fabricate(:account) }
-    let!(:user) { Fabricate(:user, confirmed_at: confirmed_at, account: account) }
+    let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
 
     before do
       allow(UserMailer).to receive(:confirmation_instructions) { double(:email, deliver_later: nil) }
diff --git a/spec/controllers/admin/custom_emojis_controller_spec.rb b/spec/controllers/admin/custom_emojis_controller_spec.rb
index a8d96948c..06cd0c22d 100644
--- a/spec/controllers/admin/custom_emojis_controller_spec.rb
+++ b/spec/controllers/admin/custom_emojis_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Admin::CustomEmojisController do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
     sign_in user, scope: :user
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 7824854f9..6231a09a2 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -12,7 +12,7 @@ describe Admin::DashboardController, type: :controller do
         Admin::SystemCheck::Message.new(:rules_check, nil, admin_rules_path),
         Admin::SystemCheck::Message.new(:sidekiq_process_check, 'foo, bar'),
       ])
-      sign_in Fabricate(:user, admin: true)
+      sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
     end
 
     it 'returns 200' do
diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
new file mode 100644
index 000000000..712657791
--- /dev/null
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe Admin::Disputes::AppealsController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  let(:target_account) { Fabricate(:account) }
+  let(:strike) { Fabricate(:account_warning, target_account: target_account, action: :suspend) }
+  let(:appeal) { Fabricate(:appeal, strike: strike, account: target_account) }
+
+  before do
+    target_account.suspend!
+  end
+
+  describe 'POST #approve' do
+    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+    before do
+      allow(UserMailer).to receive(:appeal_approved).and_return(double('email', deliver_later: nil))
+      post :approve, params: { id: appeal.id }
+    end
+
+    it 'unsuspends a suspended account' do
+      expect(target_account.reload.suspended?).to be false
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
+    end
+
+    it 'notifies target account about approved appeal' do
+      expect(UserMailer).to have_received(:appeal_approved).with(target_account.user, appeal)
+    end
+  end
+
+  describe 'POST #reject' do
+    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+    before do
+      allow(UserMailer).to receive(:appeal_rejected).and_return(double('email', deliver_later: nil))
+      post :reject, params: { id: appeal.id }
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
+    end
+
+    it 'notifies target account about rejected appeal' do
+      expect(UserMailer).to have_received(:appeal_rejected).with(target_account.user, appeal)
+    end
+  end
+end
diff --git a/spec/controllers/admin/domain_allows_controller_spec.rb b/spec/controllers/admin/domain_allows_controller_spec.rb
new file mode 100644
index 000000000..6c4e67787
--- /dev/null
+++ b/spec/controllers/admin/domain_allows_controller_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe Admin::DomainAllowsController, type: :controller do
+  render_views
+
+  before do
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+  end
+
+  describe 'GET #new' do
+    it 'assigns a new domain allow' do
+      get :new
+
+      expect(assigns(:domain_allow)).to be_instance_of(DomainAllow)
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'POST #create' do
+    it 'blocks the domain when succeeded to save' do
+      post :create, params: { domain_allow: { domain: 'example.com' } }
+
+      expect(flash[:notice]).to eq I18n.t('admin.domain_allows.created_msg')
+      expect(response).to redirect_to(admin_instances_path)
+    end
+
+    it 'renders new when failed to save' do
+      Fabricate(:domain_allow, domain: 'example.com')
+
+      post :create, params: { domain_allow: { domain: 'example.com' } }
+
+      expect(response).to render_template :new
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'disallows the domain' do
+      service = double(call: true)
+      allow(UnallowDomainService).to receive(:new).and_return(service)
+      domain_allow = Fabricate(:domain_allow)
+      delete :destroy, params: { id: domain_allow.id }
+
+      expect(service).to have_received(:call).with(domain_allow)
+      expect(flash[:notice]).to eq I18n.t('admin.domain_allows.destroyed_msg')
+      expect(response).to redirect_to(admin_instances_path)
+    end
+  end
+end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index fb23658c0..f432060d9 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
   render_views
 
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
   describe 'GET #new' do
@@ -16,12 +16,24 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
     end
   end
 
-  describe 'GET #show' do
-    it 'returns http success' do
-      domain_block = Fabricate(:domain_block)
-      get :show, params: { id: domain_block.id }
+  describe 'POST #batch' do
+    it 'blocks the domains when succeeded to save' do
+      allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
 
-      expect(response).to have_http_status(200)
+      post :batch, params: {
+        save: '',
+        form_domain_block_batch: {
+          domain_blocks_attributes: {
+            '0' => { enabled: '1', domain: 'example.com', severity: 'silence' },
+            '1' => { enabled: '0', domain: 'mastodon.social', severity: 'suspend' },
+            '2' => { enabled: '1', domain: 'mastodon.online', severity: 'suspend' }
+          }
+        }
+      }
+
+      expect(DomainBlockWorker).to have_received(:perform_async).exactly(2).times
+      expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
   end
 
@@ -58,6 +70,53 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
     end
   end
 
+  describe 'PUT #update' do
+    let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
+    let(:domain_block)    { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
+
+    before do
+      BlockDomainService.new.call(domain_block)
+    end
+
+    let(:subject) do
+      post :update, params: { id: domain_block.id, domain_block: { domain: 'example.com', severity: new_severity } }
+    end
+
+    context 'downgrading a domain suspension to silence' do
+      let(:original_severity) { 'suspend' }
+      let(:new_severity)      { 'silence' }
+
+      it 'changes the block severity' do
+        expect { subject }.to change { domain_block.reload.severity }.from('suspend').to('silence')
+      end
+
+      it 'undoes individual suspensions' do
+        expect { subject }.to change { remote_account.reload.suspended? }.from(true).to(false)
+      end
+
+      it 'performs individual silences' do
+        expect { subject }.to change { remote_account.reload.silenced? }.from(false).to(true)
+      end
+    end
+
+    context 'upgrading a domain silence to suspend' do
+      let(:original_severity) { 'silence' }
+      let(:new_severity)      { 'suspend' }
+
+      it 'changes the block severity' do
+        expect { subject }.to change { domain_block.reload.severity }.from('silence').to('suspend')
+      end
+
+      it 'undoes individual silences' do
+        expect { subject }.to change { remote_account.reload.silenced? }.from(true).to(false)
+      end
+
+      it 'performs individual suspends' do
+        expect { subject }.to change { remote_account.reload.suspended? }.from(false).to(true)
+      end
+    end
+  end
+
   describe 'DELETE #destroy' do
     it 'unblocks the domain' do
       service = double(call: true)
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
index 52db56f4e..e9cef4a94 100644
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
   render_views
 
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
   describe 'GET #index' do
@@ -17,43 +17,43 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
       EmailDomainBlock.paginates_per default_per_page
     end
 
-    it 'renders email blacks' do
+    it 'returns http success' do
       2.times { Fabricate(:email_domain_block) }
-
       get :index, params: { page: 2 }
-
-      assigned = assigns(:email_domain_blocks)
-      expect(assigned.count).to eq 1
-      expect(assigned.klass).to be EmailDomainBlock
       expect(response).to have_http_status(200)
     end
   end
 
   describe 'GET #new' do
-    it 'assigns a new email black' do
+    it 'returns http success' do
       get :new
-
-      expect(assigns(:email_domain_block)).to be_instance_of(EmailDomainBlock)
       expect(response).to have_http_status(200)
     end
   end
 
   describe 'POST #create' do
-    it 'blocks the domain when succeeded to save' do
-      post :create, params: { email_domain_block: { domain: 'example.com' } }
+    context 'when resolve button is pressed' do
+      before do
+        post :create, params: { email_domain_block: { domain: 'example.com' } }
+      end
 
-      expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.created_msg')
-      expect(response).to redirect_to(admin_email_domain_blocks_path)
+      it 'renders new template' do
+        expect(response).to render_template(:new)
+      end
     end
-  end
 
-  describe 'DELETE #destroy' do
-    it 'unblocks the domain' do
-      email_domain_block = Fabricate(:email_domain_block)
-      delete :destroy, params: { id: email_domain_block.id }
+    context 'when save button is pressed' do
+      before do
+        post :create, params: { email_domain_block: { domain: 'example.com' }, save: '' }
+      end
 
-      expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.destroyed_msg')
-      expect(response).to redirect_to(admin_email_domain_blocks_path)
+      it 'blocks the domain' do
+        expect(EmailDomainBlock.find_by(domain: 'example.com')).to_not be_nil
+      end
+
+      it 'redirects to e-mail domain blocks' do
+        expect(response).to redirect_to(admin_email_domain_blocks_path)
+      end
     end
   end
 end
diff --git a/spec/controllers/admin/export_domain_allows_controller_spec.rb b/spec/controllers/admin/export_domain_allows_controller_spec.rb
new file mode 100644
index 000000000..1e1a5ae7d
--- /dev/null
+++ b/spec/controllers/admin/export_domain_allows_controller_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe Admin::ExportDomainAllowsController, type: :controller do
+  render_views
+
+  before do
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+  end
+
+  describe 'GET #export' do
+    it 'renders instances' do
+      Fabricate(:domain_allow, domain: 'good.domain')
+      Fabricate(:domain_allow, domain: 'better.domain')
+
+      get :export, params: { format: :csv }
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq(IO.read(File.join(file_fixture_path, 'domain_allows.csv')))
+    end
+  end
+
+  describe 'POST #import' do
+    it 'allows imported domains' do
+      post :import, params: { admin_import: { data: fixture_file_upload('domain_allows.csv') } }
+
+      expect(response).to redirect_to(admin_instances_path)
+
+      # Header should not be imported
+      expect(DomainAllow.where(domain: '#domain').present?).to eq(false)
+
+      # Domains should now be added
+      get :export, params: { format: :csv }
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq(IO.read(File.join(file_fixture_path, 'domain_allows.csv')))
+    end
+
+    it 'displays error on no file selected' do
+      post :import, params: { admin_import: {} }
+      expect(response).to redirect_to(admin_instances_path)
+      expect(flash[:error]).to eq(I18n.t('admin.export_domain_allows.no_file'))
+    end
+  end
+end
diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
new file mode 100644
index 000000000..8697e0c21
--- /dev/null
+++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Admin::ExportDomainBlocksController, type: :controller do
+  render_views
+
+  before do
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+  end
+
+  describe 'GET #export' do
+    it 'renders instances' do
+      Fabricate(:domain_block, domain: 'bad.domain', severity: 'silence', public_comment: 'bad')
+      Fabricate(:domain_block, domain: 'worse.domain', severity: 'suspend', reject_media: true, reject_reports: true, public_comment: 'worse', obfuscate: true)
+      Fabricate(:domain_block, domain: 'reject.media', severity: 'noop', reject_media: true, public_comment: 'reject media')
+      Fabricate(:domain_block, domain: 'no.op', severity: 'noop', public_comment: 'noop')
+
+      get :export, params: { format: :csv }
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq(IO.read(File.join(file_fixture_path, 'domain_blocks.csv')))
+    end
+  end
+
+  describe 'POST #import' do
+    it 'blocks imported domains' do
+      post :import, params: { admin_import: { data: fixture_file_upload('domain_blocks.csv') } }
+
+      expect(assigns(:domain_blocks).map(&:domain)).to match_array ['bad.domain', 'worse.domain', 'reject.media']
+    end
+  end
+
+  it 'displays error on no file selected' do
+    post :import, params: { admin_import: {} }
+    expect(flash[:alert]).to eq(I18n.t('admin.export_domain_blocks.no_file'))
+  end
+end
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index 53427b874..337f7a80c 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Admin::InstancesController, type: :controller do
   render_views
 
-  let(:current_user) { Fabricate(:user, admin: true) }
+  let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   let!(:account)     { Fabricate(:account, domain: 'popular') }
   let!(:account2)    { Fabricate(:account, domain: 'popular') }
@@ -35,11 +35,11 @@ RSpec.describe Admin::InstancesController, type: :controller do
   describe 'DELETE #destroy' do
     subject { delete :destroy, params: { id: Instance.first.id } }
 
-    let(:current_user) { Fabricate(:user, admin: admin) }
+    let(:current_user) { Fabricate(:user, role: role) }
     let(:account) { Fabricate(:account) }
 
     context 'when user is admin' do
-      let(:admin) { true }
+      let(:role) { UserRole.find_by(name: 'Admin') }
 
       it 'succeeds in purging instance' do
         is_expected.to redirect_to admin_instances_path
@@ -47,7 +47,7 @@ RSpec.describe Admin::InstancesController, type: :controller do
     end
 
     context 'when user is not admin' do
-      let(:admin) { false }
+      let(:role) { nil }
 
       it 'fails to purge instance' do
         is_expected.to have_http_status :forbidden
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index 449a699e4..1fb488742 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Admin::InvitesController do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
     sign_in user, scope: :user
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
index ec5872c7d..fa7572d18 100644
--- a/spec/controllers/admin/report_notes_controller_spec.rb
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Admin::ReportNotesController do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   before do
     sign_in user, scope: :user
@@ -12,11 +12,11 @@ describe Admin::ReportNotesController do
   describe 'POST #create' do
     subject { post :create, params: params }
 
-    let(:report) { Fabricate(:report, action_taken: action_taken, action_taken_by_account_id: account_id) }
+    let(:report) { Fabricate(:report, action_taken_at: action_taken, action_taken_by_account_id: account_id) }
 
     context 'when parameter is valid' do
       context 'when report is unsolved' do
-        let(:action_taken) { false }
+        let(:action_taken) { nil }
         let(:account_id) { nil }
 
         context 'when create_and_resolve flag is on' do
@@ -41,7 +41,7 @@ describe Admin::ReportNotesController do
       end
 
       context 'when report is resolved' do
-        let(:action_taken) { true }
+        let(:action_taken) { Time.now.utc }
         let(:account_id) { user.account.id }
 
         context 'when create_and_unresolve flag is on' do
@@ -68,7 +68,7 @@ describe Admin::ReportNotesController do
 
     context 'when parameter is invalid' do
       let(:params) { { report_note: { content: '', report_id: report.id } } }
-      let(:action_taken) { false }
+      let(:action_taken) { nil }
       let(:account_id) { nil }
 
       it 'renders admin/reports/show' do
diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb
deleted file mode 100644
index 2a1598123..000000000
--- a/spec/controllers/admin/reported_statuses_controller_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'rails_helper'
-
-describe Admin::ReportedStatusesController do
-  render_views
-
-  let(:user) { Fabricate(:user, admin: true) }
-  let(:report) { Fabricate(:report, status_ids: [status.id]) }
-  let(:status) { Fabricate(:status) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'POST #create' do
-    subject do
-      -> { post :create, params: { :report_id => report, action => '', :form_status_batch => { status_ids: status_ids } } }
-    end
-
-    let(:action) { 'nsfw_on' }
-    let(:status_ids) { [status.id] }
-    let(:status) { Fabricate(:status, sensitive: !sensitive) }
-    let(:sensitive) { true }
-    let!(:media_attachment) { Fabricate(:media_attachment, status: status) }
-
-    context 'when action is nsfw_on' do
-      it 'updates sensitive column' do
-        is_expected.to change {
-          status.reload.sensitive
-        }.from(false).to(true)
-      end
-    end
-
-    context 'when action is nsfw_off' do
-      let(:action) { 'nsfw_off' }
-      let(:sensitive) { false }
-
-      it 'updates sensitive column' do
-        is_expected.to change {
-          status.reload.sensitive
-        }.from(true).to(false)
-      end
-    end
-
-    context 'when action is delete' do
-      let(:action) { 'delete' }
-
-      it 'removes a status' do
-        allow(RemovalWorker).to receive(:perform_async)
-        subject.call
-        expect(RemovalWorker).to have_received(:perform_async).with(status_ids.first, immediate: true)
-      end
-    end
-
-    it 'redirects to report page' do
-      subject.call
-      expect(response).to redirect_to(admin_report_path(report))
-    end
-  end
-end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 49d3e9707..4cd1524bf 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -3,15 +3,15 @@ require 'rails_helper'
 describe Admin::ReportsController do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   before do
     sign_in user, scope: :user
   end
 
   describe 'GET #index' do
     it 'returns http success with no filters' do
-      specified = Fabricate(:report, action_taken: false)
-      Fabricate(:report, action_taken: true)
+      specified = Fabricate(:report, action_taken_at: nil)
+      Fabricate(:report, action_taken_at: Time.now.utc)
 
       get :index
 
@@ -22,10 +22,10 @@ describe Admin::ReportsController do
     end
 
     it 'returns http success with resolved filter' do
-      specified = Fabricate(:report, action_taken: true)
-      Fabricate(:report, action_taken: false)
+      specified = Fabricate(:report, action_taken_at: Time.now.utc)
+      Fabricate(:report, action_taken_at: nil)
 
-      get :index, params: { resolved: 1 }
+      get :index, params: { resolved: '1' }
 
       reports = assigns(:reports).to_a
       expect(reports.size).to eq 1
@@ -54,15 +54,7 @@ describe Admin::ReportsController do
       expect(response).to redirect_to(admin_reports_path)
       report.reload
       expect(report.action_taken_by_account).to eq user.account
-      expect(report.action_taken).to eq true
-    end
-
-    it 'sets trust level when the report is an antispam one' do
-      report = Fabricate(:report, account: Account.representative)
-
-      put :resolve, params: { id: report }
-      report.reload
-      expect(report.target_account.trust_level).to eq Account::TRUST_LEVELS[:trusted]
+      expect(report.action_taken?).to eq true
     end
   end
 
@@ -74,7 +66,7 @@ describe Admin::ReportsController do
       expect(response).to redirect_to(admin_report_path(report))
       report.reload
       expect(report.action_taken_by_account).to eq nil
-      expect(report.action_taken).to eq false
+      expect(report.action_taken?).to eq false
     end
   end
 
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index c1e34b7f9..aeb172318 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
 describe Admin::ResetsController do
   render_views
 
-  let(:account) { Fabricate(:account, user: Fabricate(:user)) }
+  let(:account) { Fabricate(:account) }
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
   describe 'POST #create' do
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 8e0de73cb..8ff891205 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -3,31 +3,247 @@ require 'rails_helper'
 describe Admin::RolesController do
   render_views
 
-  let(:admin) { Fabricate(:user, admin: true) }
+  let(:permissions)  { UserRole::Flags::NONE }
+  let(:current_role) { UserRole.create(name: 'Foo', permissions: permissions, position: 10) }
+  let(:current_user) { Fabricate(:user, role: current_role) }
 
   before do
-    sign_in admin, scope: :user
+    sign_in current_user, scope: :user
   end
 
-  describe 'POST #promote' do
-    subject { post :promote, params: { account_id: user.account_id } }
+  describe 'GET #index' do
+    before do
+      get :index
+    end
 
-    let(:user) { Fabricate(:user, moderator: false, admin: false) }
+    context 'when user does not have permission to manage roles' do
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
 
-    it 'promotes user' do
-      expect(subject).to redirect_to admin_account_path(user.account_id)
-      expect(user.reload).to be_moderator
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
     end
   end
 
-  describe 'POST #demote' do
-    subject { post :demote, params: { account_id: user.account_id } }
+  describe 'GET #new' do
+    before do
+      get :new
+    end
 
-    let(:user) { Fabricate(:user, moderator: true, admin: false) }
+    context 'when user does not have permission to manage roles' do
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
 
-    it 'demotes user' do
-      expect(subject).to redirect_to admin_account_path(user.account_id)
-      expect(user.reload).not_to be_moderator
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    let(:selected_position) { 1 }
+    let(:selected_permissions_as_keys) { %w(manage_roles) }
+
+    before do
+      post :create, params: { user_role: { name: 'Bar', position: selected_position, permissions_as_keys: selected_permissions_as_keys } }
+    end
+
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      context 'when new role\'s does not elevate above the user\'s role' do
+        let(:selected_position) { 1 }
+        let(:selected_permissions_as_keys) { %w(manage_roles) }
+
+        it 'redirects to roles page' do
+          expect(response).to redirect_to(admin_roles_path)
+        end
+
+        it 'creates new role' do
+          expect(UserRole.find_by(name: 'Bar')).to_not be_nil
+        end
+      end
+
+      context 'when new role\'s position is higher than user\'s role' do
+        let(:selected_position) { 100 }
+        let(:selected_permissions_as_keys) { %w(manage_roles) }
+
+        it 'renders new template' do
+          expect(response).to render_template(:new)
+        end
+
+        it 'does not create new role' do
+          expect(UserRole.find_by(name: 'Bar')).to be_nil
+        end
+      end
+
+      context 'when new role has permissions the user does not have' do
+        let(:selected_position) { 1 }
+        let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
+
+        it 'renders new template' do
+          expect(response).to render_template(:new)
+        end
+
+        it 'does not create new role' do
+          expect(UserRole.find_by(name: 'Bar')).to be_nil
+        end
+      end
+
+      context 'when user has administrator permission' do
+        let(:permissions) { UserRole::FLAGS[:administrator] }
+
+        let(:selected_position) { 1 }
+        let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
+
+        it 'redirects to roles page' do
+          expect(response).to redirect_to(admin_roles_path)
+        end
+
+        it 'creates new role' do
+          expect(UserRole.find_by(name: 'Bar')).to_not be_nil
+        end
+      end
+    end
+  end
+
+  describe 'GET #edit' do
+    let(:role_position) { 8 }
+    let(:role) { UserRole.create(name: 'Bar', permissions: UserRole::FLAGS[:manage_users], position: role_position) }
+
+    before do
+      get :edit, params: { id: role.id }
+    end
+
+    context 'when user does not have permission to manage roles' do
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      context 'when user outranks the role' do
+        it 'returns http success' do
+          expect(response).to have_http_status(:success)
+        end
+      end
+
+      context 'when role outranks user' do
+        let(:role_position) { current_role.position + 1 }
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(:forbidden)
+        end
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:role_position) { 8 }
+    let(:role_permissions) { UserRole::FLAGS[:manage_users] }
+    let(:role) { UserRole.create(name: 'Bar', permissions: role_permissions, position: role_position) }
+
+    let(:selected_position) { 8 }
+    let(:selected_permissions_as_keys) { %w(manage_users) }
+
+    before do
+      put :update, params: { id: role.id, user_role: { name: 'Baz', position: selected_position, permissions_as_keys: selected_permissions_as_keys } }
+    end
+
+    context 'when user does not have permission to manage roles' do
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+
+      it 'does not update the role' do
+        expect(role.reload.name).to eq 'Bar'
+      end
+    end
+
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      context 'when role has permissions the user doesn\'t' do
+        it 'renders edit template' do
+          expect(response).to render_template(:edit)
+        end
+
+        it 'does not update the role' do
+          expect(role.reload.name).to eq 'Bar'
+        end
+      end
+
+      context 'when user has all permissions of the role' do
+        let(:permissions) { UserRole::FLAGS[:manage_roles] | UserRole::FLAGS[:manage_users] }
+
+        context 'when user outranks the role' do
+          it 'redirects to roles page' do
+            expect(response).to redirect_to(admin_roles_path)
+          end
+
+          it 'updates the role' do
+            expect(role.reload.name).to eq 'Baz'
+          end
+        end
+
+        context 'when role outranks user' do
+          let(:role_position) { current_role.position + 1 }
+
+          it 'returns http forbidden' do
+            expect(response).to have_http_status(:forbidden)
+          end
+
+          it 'does not update the role' do
+            expect(role.reload.name).to eq 'Bar'
+          end
+        end
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:role_position) { 8 }
+    let(:role) { UserRole.create(name: 'Bar', permissions: UserRole::FLAGS[:manage_users], position: role_position) }
+
+    before do
+      delete :destroy, params: { id: role.id }
+    end
+
+    context 'when user does not have permission to manage roles' do
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when user has permission to manage roles' do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+
+      context 'when user outranks the role' do
+        it 'redirects to roles page' do
+          expect(response).to redirect_to(admin_roles_path)
+        end
+      end
+
+      context 'when role outranks user' do
+        let(:role_position) { current_role.position + 1 }
+
+        it 'returns http forbidden' do
+          expect(response).to have_http_status(:forbidden)
+        end
+      end
     end
   end
 end
diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb
new file mode 100644
index 000000000..ee1c441bc
--- /dev/null
+++ b/spec/controllers/admin/settings/branding_controller_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::Settings::BrandingController, type: :controller do
+  render_views
+
+  describe 'When signed in as an admin' do
+    before do
+      sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+    end
+
+    describe 'GET #show' do
+      it 'returns http success' do
+        get :show
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    describe 'PUT #update' do
+      before do
+        allow_any_instance_of(Form::AdminSettings).to receive(:valid?).and_return(true)
+      end
+
+      around do |example|
+        before = Setting.site_short_description
+        Setting.site_short_description = nil
+        example.run
+        Setting.site_short_description = before
+        Setting.new_setting_key = nil
+      end
+
+      it 'cannot create a setting value for a non-admin key' do
+        expect(Setting.new_setting_key).to be_blank
+
+        patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
+
+        expect(response).to redirect_to(admin_settings_branding_path)
+        expect(Setting.new_setting_key).to be_nil
+      end
+
+      it 'creates a settings value that didnt exist before for eligible key' do
+        expect(Setting.site_short_description).to be_blank
+
+        patch :update, params: { form_admin_settings: { site_short_description: 'New key value' } }
+
+        expect(response).to redirect_to(admin_settings_branding_path)
+        expect(Setting.site_short_description).to eq 'New key value'
+      end
+    end
+  end
+end
diff --git a/spec/controllers/admin/settings_controller_spec.rb b/spec/controllers/admin/settings_controller_spec.rb
deleted file mode 100644
index 6cf0ee20a..000000000
--- a/spec/controllers/admin/settings_controller_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::SettingsController, type: :controller do
-  render_views
-
-  describe 'When signed in as an admin' do
-    before do
-      sign_in Fabricate(:user, admin: true), scope: :user
-    end
-
-    describe 'GET #edit' do
-      it 'returns http success' do
-        get :edit
-
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    describe 'PUT #update' do
-      before do
-        allow_any_instance_of(Form::AdminSettings).to receive(:valid?).and_return(true)
-      end
-
-      describe 'for a record that doesnt exist' do
-        around do |example|
-          before = Setting.site_extended_description
-          Setting.site_extended_description = nil
-          example.run
-          Setting.site_extended_description = before
-          Setting.new_setting_key = nil
-        end
-
-        it 'cannot create a setting value for a non-admin key' do
-          expect(Setting.new_setting_key).to be_blank
-
-          patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
-
-          expect(response).to redirect_to(edit_admin_settings_path)
-          expect(Setting.new_setting_key).to be_nil
-        end
-
-        it 'creates a settings value that didnt exist before for eligible key' do
-          expect(Setting.site_extended_description).to be_blank
-
-          patch :update, params: { form_admin_settings: { site_extended_description: 'New key value' } }
-
-          expect(response).to redirect_to(edit_admin_settings_path)
-          expect(Setting.site_extended_description).to eq 'New key value'
-        end
-      end
-
-      context do
-        around do |example|
-          site_title = Setting.site_title
-          example.run
-          Setting.site_title = site_title
-        end
-
-        it 'updates a settings value' do
-          Setting.site_title = 'Original'
-          patch :update, params: { form_admin_settings: { site_title: 'New title' } }
-
-          expect(response).to redirect_to(edit_admin_settings_path)
-          expect(Setting.site_title).to eq 'New title'
-        end
-      end
-    end
-  end
-end
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index e388caae2..7f912c1c0 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Admin::StatusesController do
   render_views
 
-  let(:user) { Fabricate(:user, admin: true) }
+  let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:account) { Fabricate(:account) }
   let!(:status) { Fabricate(:status, account: account) }
   let(:media_attached_status) { Fabricate(:status, account: account, sensitive: !sensitive) }
@@ -18,65 +18,46 @@ describe Admin::StatusesController do
   end
 
   describe 'GET #index' do
-    it 'returns http success with no media' do
-      get :index, params: { account_id: account.id }
+    context do
+      before do
+        get :index, params: { account_id: account.id }
+      end
 
-      statuses = assigns(:statuses).to_a
-      expect(statuses.size).to eq 4
-      expect(statuses.first.id).to eq last_status.id
-      expect(response).to have_http_status(200)
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
     end
 
-    it 'returns http success with media' do
-      get :index, params: { account_id: account.id, media: true }
+    context 'filtering by media' do
+      before do
+        get :index, params: { account_id: account.id, media: '1' }
+      end
 
-      statuses = assigns(:statuses).to_a
-      expect(statuses.size).to eq 2
-      expect(statuses.first.id).to eq last_media_attached_status.id
-      expect(response).to have_http_status(200)
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
     end
   end
 
-  describe 'POST #create' do
-    subject do
-      -> { post :create, params: { :account_id => account.id, action => '', :form_status_batch => { status_ids: status_ids } } }
+  describe 'POST #batch' do
+    before do
+      post :batch, params: { account_id: account.id, action => '', admin_status_batch_action: { status_ids: status_ids } }
     end
 
-    let(:action) { 'nsfw_on' }
     let(:status_ids) { [media_attached_status.id] }
 
-    context 'when action is nsfw_on' do
-      it 'updates sensitive column' do
-        is_expected.to change {
-          media_attached_status.reload.sensitive
-        }.from(false).to(true)
+    context 'when action is report' do
+      let(:action) { 'report' }
+
+      it 'creates a report' do
+        report = Report.last
+        expect(report.target_account_id).to eq account.id
+        expect(report.status_ids).to eq status_ids
       end
-    end
 
-    context 'when action is nsfw_off' do
-      let(:action) { 'nsfw_off' }
-      let(:sensitive) { false }
-
-      it 'updates sensitive column' do
-        is_expected.to change {
-          media_attached_status.reload.sensitive
-        }.from(true).to(false)
+      it 'redirects to report page' do
+        expect(response).to redirect_to(admin_report_path(Report.last.id))
       end
     end
-
-    context 'when action is delete' do
-      let(:action) { 'delete' }
-
-      it 'removes a status' do
-        allow(RemovalWorker).to receive(:perform_async)
-        subject.call
-        expect(RemovalWorker).to have_received(:perform_async).with(status_ids.first, immediate: true)
-      end
-    end
-
-    it 'redirects to account statuses page' do
-      subject.call
-      expect(response).to redirect_to(admin_account_statuses_path(account.id))
-    end
   end
 end
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 85c801a9c..52fd09eb1 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::TagsController, type: :controller do
   render_views
 
   before do
-    sign_in Fabricate(:user, admin: true)
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
   end
 
   describe 'GET #show' do
diff --git a/spec/controllers/admin/users/roles_controller.rb b/spec/controllers/admin/users/roles_controller.rb
new file mode 100644
index 000000000..bd6a3fa67
--- /dev/null
+++ b/spec/controllers/admin/users/roles_controller.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+describe Admin::Users::RolesController do
+  render_views
+
+  let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) }
+  let(:current_user) { Fabricate(:user, role: current_role) }
+
+  let(:previous_role) { nil }
+  let(:user) { Fabricate(:user, role: previous_role) }
+
+  before do
+    sign_in current_user, scope: :user
+  end
+
+  describe 'GET #show' do
+    before do
+      get :show, params: { user_id: user.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(:success)
+    end
+
+    context 'when target user is higher ranked than current user' do
+      let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) }
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:selected_role) { UserRole.create(name: 'Bar', permissions: permissions, position: position) }
+
+    before do
+      put :update, params: { user_id: user.id, user: { role_id: selected_role.id } }
+    end
+
+    context do
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+      let(:position) { 1 }
+
+      it 'updates user role' do
+        expect(user.reload.role_id).to eq selected_role&.id
+      end
+
+      it 'redirects back to account page' do
+        expect(response).to redirect_to(admin_account_path(user.account_id))
+      end
+    end
+
+    context 'when selected role has higher position than current user\'s role' do
+      let(:permissions) { UserRole::FLAGS[:administrator] }
+      let(:position) { 100 }
+
+      it 'does not update user role' do
+        expect(user.reload.role_id).to eq previous_role&.id
+      end
+
+      it 'renders edit form' do
+        expect(response).to render_template(:show)
+      end
+    end
+
+    context 'when target user is higher ranked than current user' do
+      let(:previous_role) { UserRole.create(name: 'Baz', permissions: UserRole::FLAGS[:administrator], position: 100) }
+      let(:permissions) { UserRole::FLAGS[:manage_roles] }
+      let(:position) { 1 }
+
+      it 'does not update user role' do
+        expect(user.reload.role_id).to eq previous_role&.id
+      end
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/admin/two_factor_authentications_controller_spec.rb b/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
similarity index 90%
rename from spec/controllers/admin/two_factor_authentications_controller_spec.rb
rename to spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
index c65095729..e56264ef6 100644
--- a/spec/controllers/admin/two_factor_authentications_controller_spec.rb
+++ b/spec/controllers/admin/users/two_factor_authentications_controller_spec.rb
@@ -1,12 +1,13 @@
 require 'rails_helper'
 require 'webauthn/fake_client'
 
-describe Admin::TwoFactorAuthenticationsController do
+describe Admin::Users::TwoFactorAuthenticationsController do
   render_views
 
   let(:user) { Fabricate(:user) }
+
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
   describe 'DELETE #destroy' do
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 05a42d1c1..c286b8cbf 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -28,7 +28,7 @@ describe Api::BaseController do
   end
 
   describe 'non-functional accounts handling' do
-    let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+    let(:user)  { Fabricate(:user) }
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
 
     controller do
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
index 9fb0d8770..b2557d957 100644
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::CredentialsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
   context 'with an oauth token' do
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
index 482a19ef2..1e6e1d8e0 100644
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::FollowerAccountsController do
   render_views
 
-  let(:user)    { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
@@ -49,10 +49,10 @@ describe Api::V1::Accounts::FollowerAccountsController do
     end
 
     context 'when requesting user is the account owner' do
-      let(:user) { Fabricate(:user, account: account) }
+      let(:user) { account.user }
 
       it 'returns all accounts, including muted accounts' do
-        user.account.mute!(bob)
+        account.mute!(bob)
         get :index, params: { account_id: account.id, limit: 2 }
 
         expect(body_as_json.size).to eq 2
diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
index e35b625fe..cc962c6ee 100644
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::FollowingAccountsController do
   render_views
 
-  let(:user)    { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
@@ -49,10 +49,10 @@ describe Api::V1::Accounts::FollowingAccountsController do
     end
 
     context 'when requesting user is the account owner' do
-      let(:user) { Fabricate(:user, account: account) }
+      let(:user) { account.user }
 
       it 'returns all accounts, including muted accounts' do
-        user.account.mute!(bob)
+        account.mute!(bob)
         get :index, params: { account_id: account.id, limit: 2 }
 
         expect(body_as_json.size).to eq 2
diff --git a/spec/controllers/api/v1/accounts/lists_controller_spec.rb b/spec/controllers/api/v1/accounts/lists_controller_spec.rb
index baafea8e6..d71485633 100644
--- a/spec/controllers/api/v1/accounts/lists_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/lists_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::ListsController do
   render_views
 
-  let(:user)    { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
   let(:account) { Fabricate(:account) }
   let(:list)    { Fabricate(:list, account: user.account) }
diff --git a/spec/controllers/api/v1/accounts/notes_controller_spec.rb b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
index 0a2957fed..42c2d8a86 100644
--- a/spec/controllers/api/v1/accounts/notes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::NotesController do
   render_views
 
-  let(:user)    { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)    { Fabricate(:user) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts') }
   let(:account) { Fabricate(:account) }
   let(:comment) { 'foo' }
@@ -31,7 +31,7 @@ describe Api::V1::Accounts::NotesController do
       end
     end
 
-    context 'when account note exceends allowed length' do
+    context 'when account note exceeds allowed length' do
       let(:comment) { 'a' * 2_001 }
 
       it 'returns 422' do
diff --git a/spec/controllers/api/v1/accounts/pins_controller_spec.rb b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
index c71935df2..19bba093e 100644
--- a/spec/controllers/api/v1/accounts/pins_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
@@ -3,8 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Api::V1::Accounts::PinsController, type: :controller do
-  let(:john)  { Fabricate(:user, account: Fabricate(:account, username: 'john')) }
-  let(:kevin) { Fabricate(:user, account: Fabricate(:account, username: 'kevin')) }
+  let(:john)  { Fabricate(:user) }
+  let(:kevin) { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') }
 
   before do
diff --git a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
index fe715ff62..69ad0d061 100644
--- a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::RelationshipsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:follows') }
 
   before do
@@ -11,8 +11,8 @@ describe Api::V1::Accounts::RelationshipsController do
   end
 
   describe 'GET #index' do
-    let(:simon) { Fabricate(:user, email: 'simon@example.com', account: Fabricate(:account, username: 'simon')).account }
-    let(:lewis) { Fabricate(:user, email: 'lewis@example.com', account: Fabricate(:account, username: 'lewis')).account }
+    let(:simon) { Fabricate(:account) }
+    let(:lewis) { Fabricate(:account) }
 
     before do
       user.account.follow!(simon)
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
index 8ff2b17de..5b23bff68 100644
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::Accounts::SearchController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
 
   before do
diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index 693cd1ac6..b962b3398 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::StatusesController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
 
   before do
@@ -39,7 +39,7 @@ describe Api::V1::Accounts::StatusesController do
       end
     end
 
-    context 'with only pinned' do
+    context 'with only own pinned' do
       before do
         Fabricate(:status_pin, account: user.account, status: Fabricate(:status, account: user.account))
       end
@@ -50,5 +50,38 @@ describe Api::V1::Accounts::StatusesController do
         expect(response).to have_http_status(200)
       end
     end
+
+    context "with someone else's pinned statuses" do
+      let(:account)        { Fabricate(:account, username: 'bob', domain: 'example.com') }
+      let(:status)         { Fabricate(:status, account: account) }
+      let(:private_status) { Fabricate(:status, account: account, visibility: :private) }
+      let!(:pin)           { Fabricate(:status_pin, account: account, status: status) }
+      let!(:private_pin)   { Fabricate(:status_pin, account: account, status: private_status) }
+
+      it 'returns http success' do
+        get :index, params: { account_id: account.id, pinned: true }
+        expect(response).to have_http_status(200)
+      end
+
+      context 'when user does not follow account' do
+        it 'lists the public status only' do
+          get :index, params: { account_id: account.id, pinned: true }
+          json = body_as_json
+          expect(json.map { |item| item[:id].to_i }).to eq [status.id]
+        end
+      end
+
+      context 'when user follows account' do
+        before do
+          user.account.follow!(account)
+        end
+
+        it 'lists both the public and the private statuses' do
+          get :index, params: { account_id: account.id, pinned: true }
+          json = body_as_json
+          expect(json.map { |item| item[:id].to_i }).to match_array([status.id, private_status.id])
+        end
+      end
+    end
   end
 end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 9a5a7c72a..d6bbcefd7 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::AccountsController, type: :controller do
   render_views
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)   { Fabricate(:user) }
   let(:scopes) { '' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
@@ -69,7 +69,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #follow' do
     let(:scopes) { 'write:follows' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account }
+    let(:other_account) { Fabricate(:account, username: 'bob', locked: locked) }
 
     context do
       before do
@@ -145,12 +145,23 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
         expect(json[:showing_reblogs]).to be false
         expect(json[:notifying]).to be true
       end
+
+      it 'changes languages option' do
+        post :follow, params: { id: other_account.id, languages: %w(en es) }
+
+        json = body_as_json
+
+        expect(json[:following]).to be true
+        expect(json[:showing_reblogs]).to be false
+        expect(json[:notifying]).to be false
+        expect(json[:languages]).to match_array %w(en es)
+      end
     end
   end
 
   describe 'POST #unfollow' do
     let(:scopes) { 'write:follows' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
@@ -170,7 +181,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #remove_from_followers' do
     let(:scopes) { 'write:follows' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       other_account.follow!(user.account)
@@ -190,7 +201,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #block' do
     let(:scopes) { 'write:blocks' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
@@ -214,7 +225,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #unblock' do
     let(:scopes) { 'write:blocks' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.block!(other_account)
@@ -234,7 +245,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #mute' do
     let(:scopes) { 'write:mutes' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
@@ -262,7 +273,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #mute with notifications set to false' do
     let(:scopes) { 'write:mutes' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
@@ -290,7 +301,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #mute with nonzero duration set' do
     let(:scopes) { 'write:mutes' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.follow!(other_account)
@@ -318,7 +329,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
   describe 'POST #unmute' do
     let(:scopes) { 'write:mutes' }
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:account, username: 'bob') }
 
     before do
       user.account.mute!(other_account)
diff --git a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
index a5a8f4bb0..462c2cfa9 100644
--- a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
@@ -3,11 +3,11 @@ require 'rails_helper'
 RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do
   render_views
 
-  let(:role)   { 'moderator' }
-  let(:user)   { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+  let(:role)   { UserRole.find_by(name: 'Moderator') }
+  let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:account) { Fabricate(:user).account }
+  let(:account) { Fabricate(:account) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
@@ -22,7 +22,7 @@ RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do
   end
 
   shared_examples 'forbidden for wrong role' do |wrong_role|
-    let(:role) { wrong_role }
+    let(:role) { UserRole.find_by(name: wrong_role) }
 
     it 'returns http forbidden' do
       expect(response).to have_http_status(403)
@@ -30,28 +30,40 @@ RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do
   end
 
   describe 'POST #create' do
-    before do
-      post :create, params: { account_id: account.id, type: 'disable' }
+    context do
+      before do
+        post :create, params: { account_id: account.id, type: 'disable' }
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+      it_behaves_like 'forbidden for wrong role', ''
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'performs action against account' do
+        expect(account.reload.user_disabled?).to be true
+      end
+
+      it 'logs action' do
+        log_item = Admin::ActionLog.last
+
+        expect(log_item).to_not be_nil
+        expect(log_item.action).to eq :disable
+        expect(log_item.account_id).to eq user.account_id
+        expect(log_item.target_id).to eq account.user.id
+      end
     end
 
-    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    context 'with no type' do
+      before do
+        post :create, params: { account_id: account.id }
+      end
 
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
-    end
-
-    it 'performs action against account' do
-      expect(account.reload.user_disabled?).to be true
-    end
-
-    it 'logs action' do
-      log_item = Admin::ActionLog.last
-
-      expect(log_item).to_not be_nil
-      expect(log_item.action).to eq :disable
-      expect(log_item.account_id).to eq user.account_id
-      expect(log_item.target_id).to eq account.user.id
+      it 'returns http unprocessable entity' do
+        expect(response).to have_http_status(422)
+      end
     end
   end
 end
diff --git a/spec/controllers/api/v1/admin/accounts_controller_spec.rb b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
index f6be35f7f..8d35b86cb 100644
--- a/spec/controllers/api/v1/admin/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
@@ -3,11 +3,11 @@ require 'rails_helper'
 RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
   render_views
 
-  let(:role)   { 'moderator' }
-  let(:user)   { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+  let(:role)   { UserRole.find_by(name: 'Moderator') }
+  let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:account) { Fabricate(:user).account }
+  let(:account) { Fabricate(:account) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
@@ -22,7 +22,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
   end
 
   shared_examples 'forbidden for wrong role' do |wrong_role|
-    let(:role) { wrong_role }
+    let(:role) { UserRole.find_by(name: wrong_role) }
 
     it 'returns http forbidden' do
       expect(response).to have_http_status(403)
@@ -30,15 +30,44 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
   end
 
   describe 'GET #index' do
+    let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }
+    let!(:other_remote_account) { Fabricate(:account, domain: 'foo.bar') }
+    let!(:suspended_account)    { Fabricate(:account, suspended: true) }
+    let!(:suspended_remote)     { Fabricate(:account, domain: 'foo.bar', suspended: true) }
+    let!(:disabled_account)     { Fabricate(:user, disabled: true).account }
+    let!(:pending_account)      { Fabricate(:user, approved: false).account }
+    let!(:admin_account)        { user.account }
+
+    let(:params) { {} }
+
     before do
-      get :index
+      pending_account.user.update(approved: false)
+      get :index, params: params
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
-    it 'returns http success' do
-      expect(response).to have_http_status(200)
+    [
+      [{ active: 'true', local: 'true', staff: 'true' }, [:admin_account]],
+      [{ by_domain: 'example.org', remote: 'true' }, [:remote_account]],
+      [{ suspended: 'true' }, [:suspended_account]],
+      [{ disabled: 'true' }, [:disabled_account]],
+      [{ pending: 'true' }, [:pending_account]],
+    ].each do |params, expected_results|
+      context "when called with #{params.inspect}" do
+        let(:params) { params }
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it "returns the correct accounts (#{expected_results.inspect})" do
+          json = body_as_json
+
+          expect(json.map { |a| a[:id].to_i }).to eq (expected_results.map { |symbol| send(symbol).id })
+        end
+      end
     end
   end
 
@@ -48,7 +77,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -62,7 +91,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -71,6 +100,15 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     it 'approves user' do
       expect(account.reload.user_approved?).to be true
     end
+
+    it 'logs action' do
+      log_item = Admin::ActionLog.last
+
+      expect(log_item).to_not be_nil
+      expect(log_item.action).to eq :approve
+      expect(log_item.account_id).to eq user.account_id
+      expect(log_item.target_id).to eq account.user.id
+    end
   end
 
   describe 'POST #reject' do
@@ -80,7 +118,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -89,6 +127,15 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     it 'removes user' do
       expect(User.where(id: account.user.id).count).to eq 0
     end
+
+    it 'logs action' do
+      log_item = Admin::ActionLog.last
+
+      expect(log_item).to_not be_nil
+      expect(log_item.action).to eq :reject
+      expect(log_item.account_id).to eq user.account_id
+      expect(log_item.target_id).to eq account.user.id
+    end
   end
 
   describe 'POST #enable' do
@@ -98,7 +145,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -116,7 +163,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -134,13 +181,13 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
     end
 
-    it 'unsensitives account' do
+    it 'unsensitizes account' do
       expect(account.reload.sensitized?).to be false
     end
   end
@@ -152,7 +199,7 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
diff --git a/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
new file mode 100644
index 000000000..8100363f6
--- /dev/null
+++ b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
@@ -0,0 +1,130 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Admin::DomainAllowsController, type: :controller do
+  render_views
+
+  let(:role)   { UserRole.find_by(name: 'Admin') }
+  let(:user)   { Fabricate(:user, role: role) }
+  let(:scopes) { 'admin:read admin:write' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  shared_examples 'forbidden for wrong scope' do |wrong_scope|
+    let(:scopes) { wrong_scope }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  shared_examples 'forbidden for wrong role' do |wrong_role|
+    let(:role) { UserRole.find_by(name: wrong_role) }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET #index' do
+    let!(:domain_allow) { Fabricate(:domain_allow) }
+
+    before do
+      get :index
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns the expected domain allows' do
+      json = body_as_json
+      expect(json.length).to eq 1
+      expect(json[0][:id].to_i).to eq domain_allow.id
+    end
+  end
+
+  describe 'GET #show' do
+    let!(:domain_allow) { Fabricate(:domain_allow) }
+
+    before do
+      get :show, params: { id: domain_allow.id }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns expected domain name' do
+      json = body_as_json
+      expect(json[:domain]).to eq domain_allow.domain
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let!(:domain_allow) { Fabricate(:domain_allow) }
+
+    before do
+      delete :destroy, params: { id: domain_allow.id }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'deletes the block' do
+      expect(DomainAllow.find_by(id: domain_allow.id)).to be_nil
+    end
+  end
+
+  describe 'POST #create' do
+    let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') }
+
+    context do
+      before do
+        post :create, params: { domain: 'foo.bar.com' }
+      end
+
+      it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+      it_behaves_like 'forbidden for wrong role', ''
+      it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'returns expected domain name' do
+        json = body_as_json
+        expect(json[:domain]).to eq 'foo.bar.com'
+      end
+
+      it 'creates a domain block' do
+        expect(DomainAllow.find_by(domain: 'foo.bar.com')).to_not be_nil
+      end
+    end
+
+    context 'with invalid domain name' do
+      before do
+        post :create, params: { domain: 'foo bar' }
+      end
+
+      it 'returns http unprocessable entity' do
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb
new file mode 100644
index 000000000..606def602
--- /dev/null
+++ b/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb
@@ -0,0 +1,179 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Admin::DomainBlocksController, type: :controller do
+  render_views
+
+  let(:role)   { UserRole.find_by(name: 'Admin') }
+  let(:user)   { Fabricate(:user, role: role) }
+  let(:scopes) { 'admin:read admin:write' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  shared_examples 'forbidden for wrong scope' do |wrong_scope|
+    let(:scopes) { wrong_scope }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  shared_examples 'forbidden for wrong role' do |wrong_role|
+    let(:role) { UserRole.find_by(name: wrong_role) }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET #index' do
+    let!(:block) { Fabricate(:domain_block) }
+
+    before do
+      get :index
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns the expected domain blocks' do
+      json = body_as_json
+      expect(json.length).to eq 1
+      expect(json[0][:id].to_i).to eq block.id
+    end
+  end
+
+  describe 'GET #show' do
+    let!(:block) { Fabricate(:domain_block) }
+
+    before do
+      get :show, params: { id: block.id }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns expected domain name' do
+      json = body_as_json
+      expect(json[:domain]).to eq block.domain
+    end
+  end
+
+  describe 'PUT #update' do
+    let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
+    let(:domain_block)    { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
+
+    before do
+      BlockDomainService.new.call(domain_block)
+    end
+
+    let(:subject) do
+      post :update, params: { id: domain_block.id, domain: 'example.com', severity: new_severity }
+    end
+
+    context 'downgrading a domain suspension to silence' do
+      let(:original_severity) { 'suspend' }
+      let(:new_severity)      { 'silence' }
+
+      it 'changes the block severity' do
+        expect { subject }.to change { domain_block.reload.severity }.from('suspend').to('silence')
+      end
+
+      it 'undoes individual suspensions' do
+        expect { subject }.to change { remote_account.reload.suspended? }.from(true).to(false)
+      end
+
+      it 'performs individual silences' do
+        expect { subject }.to change { remote_account.reload.silenced? }.from(false).to(true)
+      end
+    end
+
+    context 'upgrading a domain silence to suspend' do
+      let(:original_severity) { 'silence' }
+      let(:new_severity)      { 'suspend' }
+
+      it 'changes the block severity' do
+        expect { subject }.to change { domain_block.reload.severity }.from('silence').to('suspend')
+      end
+
+      it 'undoes individual silences' do
+        expect { subject }.to change { remote_account.reload.silenced? }.from(true).to(false)
+      end
+
+      it 'performs individual suspends' do
+        expect { subject }.to change { remote_account.reload.suspended? }.from(false).to(true)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let!(:block) { Fabricate(:domain_block) }
+
+    before do
+      delete :destroy, params: { id: block.id }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'deletes the block' do
+      expect(DomainBlock.find_by(id: block.id)).to be_nil
+    end
+  end
+
+  describe 'POST #create' do
+    let(:existing_block_domain) { 'example.com' }
+    let!(:block) { Fabricate(:domain_block, domain: existing_block_domain, severity: :suspend) }
+
+    before do
+      post :create, params: { domain: 'foo.bar.com', severity: :silence }
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns expected domain name' do
+      json = body_as_json
+      expect(json[:domain]).to eq 'foo.bar.com'
+    end
+
+    it 'creates a domain block' do
+      expect(DomainBlock.find_by(domain: 'foo.bar.com')).to_not be_nil
+    end
+
+    context 'when a stricter domain block already exists' do
+      let(:existing_block_domain) { 'bar.com' }
+
+      it 'returns http unprocessable entity' do
+        expect(response).to have_http_status(422)
+      end
+
+      it 'renders existing domain block in error' do
+        json = body_as_json
+        expect(json[:existing_domain_block][:domain]).to eq existing_block_domain
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/admin/reports_controller_spec.rb b/spec/controllers/api/v1/admin/reports_controller_spec.rb
index 4ed3c5dc4..880e72030 100644
--- a/spec/controllers/api/v1/admin/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/reports_controller_spec.rb
@@ -3,8 +3,8 @@ require 'rails_helper'
 RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
   render_views
 
-  let(:role)   { 'moderator' }
-  let(:user)   { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+  let(:role)   { UserRole.find_by(name: 'Moderator') }
+  let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:report) { Fabricate(:report) }
@@ -22,7 +22,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
   end
 
   shared_examples 'forbidden for wrong role' do |wrong_role|
-    let(:role) { wrong_role }
+    let(:role) { UserRole.find_by(name: wrong_role) }
 
     it 'returns http forbidden' do
       expect(response).to have_http_status(403)
@@ -35,7 +35,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -48,7 +48,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -61,7 +61,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -74,7 +74,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -87,7 +87,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
@@ -100,7 +100,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
-    it_behaves_like 'forbidden for wrong role', 'user'
+    it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
       expect(response).to have_http_status(200)
diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb
index 818f76c92..0e5c8296d 100644
--- a/spec/controllers/api/v1/blocks_controller_spec.rb
+++ b/spec/controllers/api/v1/blocks_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::BlocksController, type: :controller do
   render_views
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)   { Fabricate(:user) }
   let(:scopes) { 'read:blocks' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
index 070f65061..5add7cf1d 100644
--- a/spec/controllers/api/v1/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/conversations_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
 RSpec.describe Api::V1::ConversationsController, type: :controller do
   render_views
 
-  let!(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+  let(:other) { Fabricate(:user) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/domain_blocks_controller_spec.rb
index 6a7a35c7a..d9dc1bdbf 100644
--- a/spec/controllers/api/v1/domain_blocks_controller_spec.rb
+++ b/spec/controllers/api/v1/domain_blocks_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::DomainBlocksController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
   before do
diff --git a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb
new file mode 100644
index 000000000..15ac31cbc
--- /dev/null
+++ b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb
@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Emails::ConfirmationsController, type: :controller do
+  let(:confirmed_at) { nil }
+  let(:user)         { Fabricate(:user, confirmed_at: confirmed_at) }
+  let(:app)          { Fabricate(:application) }
+  let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes, application: app) }
+  let(:scopes)       { 'write' }
+
+  describe '#create' do
+    context 'with an oauth token' do
+      before do
+        allow(controller).to receive(:doorkeeper_token) { token }
+      end
+
+      context 'from a random app' do
+        it 'returns http forbidden' do
+          post :create
+          expect(response).to have_http_status(:forbidden)
+        end
+      end
+
+      context 'from an app that created the account' do
+        before do
+          user.update(created_by_application: token.application)
+        end
+
+        context 'when the account is already confirmed' do
+          let(:confirmed_at) { Time.now.utc }
+
+          it 'returns http forbidden' do
+            post :create
+            expect(response).to have_http_status(:forbidden)
+          end
+
+          context 'but user changed e-mail and has not confirmed it' do
+            before do
+              user.update(email: 'foo@bar.com')
+            end
+
+            it 'returns http success' do
+              post :create
+              expect(response).to have_http_status(:success)
+            end
+          end
+        end
+
+        context 'when the account is unconfirmed' do
+          it 'returns http success' do
+            post :create
+            expect(response).to have_http_status(:success)
+          end
+        end
+      end
+    end
+
+    context 'without an oauth token' do
+      it 'returns http unauthorized' do
+        post :create
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/filters_controller_spec.rb b/spec/controllers/api/v1/filters_controller_spec.rb
index 5948809e3..8acb46a00 100644
--- a/spec/controllers/api/v1/filters_controller_spec.rb
+++ b/spec/controllers/api/v1/filters_controller_spec.rb
@@ -22,9 +22,11 @@ RSpec.describe Api::V1::FiltersController, type: :controller do
 
   describe 'POST #create' do
     let(:scopes) { 'write:filters' }
+    let(:irreversible) { true }
+    let(:whole_word)   { false }
 
     before do
-      post :create, params: { phrase: 'magic', context: %w(home), irreversible: true }
+      post :create, params: { phrase: 'magic', context: %w(home), irreversible: irreversible, whole_word: whole_word }
     end
 
     it 'returns http success' do
@@ -34,29 +36,49 @@ RSpec.describe Api::V1::FiltersController, type: :controller do
     it 'creates a filter' do
       filter = user.account.custom_filters.first
       expect(filter).to_not be_nil
-      expect(filter.phrase).to eq 'magic'
+      expect(filter.keywords.pluck(:keyword, :whole_word)).to eq [['magic', whole_word]]
       expect(filter.context).to eq %w(home)
-      expect(filter.irreversible?).to be true
+      expect(filter.irreversible?).to be irreversible
       expect(filter.expires_at).to be_nil
     end
+
+    context 'with different parameters' do
+      let(:irreversible) { false }
+      let(:whole_word)   { true }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'creates a filter' do
+        filter = user.account.custom_filters.first
+        expect(filter).to_not be_nil
+        expect(filter.keywords.pluck(:keyword, :whole_word)).to eq [['magic', whole_word]]
+        expect(filter.context).to eq %w(home)
+        expect(filter.irreversible?).to be irreversible
+        expect(filter.expires_at).to be_nil
+      end
+    end
   end
 
   describe 'GET #show' do
-    let(:scopes) { 'read:filters' }
-    let(:filter) { Fabricate(:custom_filter, account: user.account) }
+    let(:scopes)  { 'read:filters' }
+    let(:filter)  { Fabricate(:custom_filter, account: user.account) }
+    let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :show, params: { id: filter.id }
+      get :show, params: { id: keyword.id }
       expect(response).to have_http_status(200)
     end
   end
 
   describe 'PUT #update' do
-    let(:scopes) { 'write:filters' }
-    let(:filter) { Fabricate(:custom_filter, account: user.account) }
+    let(:scopes)  { 'write:filters' }
+    let(:filter)  { Fabricate(:custom_filter, account: user.account) }
+    let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      put :update, params: { id: filter.id, phrase: 'updated' }
+      put :update, params: { id: keyword.id, phrase: 'updated' }
     end
 
     it 'returns http success' do
@@ -64,16 +86,17 @@ RSpec.describe Api::V1::FiltersController, type: :controller do
     end
 
     it 'updates the filter' do
-      expect(filter.reload.phrase).to eq 'updated'
+      expect(keyword.reload.phrase).to eq 'updated'
     end
   end
 
   describe 'DELETE #destroy' do
-    let(:scopes) { 'write:filters' }
-    let(:filter) { Fabricate(:custom_filter, account: user.account) }
+    let(:scopes)  { 'write:filters' }
+    let(:filter)  { Fabricate(:custom_filter, account: user.account) }
+    let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: filter.id }
+      delete :destroy, params: { id: keyword.id }
     end
 
     it 'returns http success' do
@@ -81,7 +104,7 @@ RSpec.describe Api::V1::FiltersController, type: :controller do
     end
 
     it 'removes the filter' do
-      expect { filter.reload }.to raise_error ActiveRecord::RecordNotFound
+      expect { keyword.reload }.to raise_error ActiveRecord::RecordNotFound
     end
   end
 end
diff --git a/spec/controllers/api/v1/follow_requests_controller_spec.rb b/spec/controllers/api/v1/follow_requests_controller_spec.rb
index 1034faa32..856ba2a1c 100644
--- a/spec/controllers/api/v1/follow_requests_controller_spec.rb
+++ b/spec/controllers/api/v1/follow_requests_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
 RSpec.describe Api::V1::FollowRequestsController, type: :controller do
   render_views
 
-  let(:user)     { Fabricate(:user, account: Fabricate(:account, username: 'alice', locked: true)) }
+  let(:user)     { Fabricate(:user, account_attributes: { locked: true }) }
   let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:follower) { Fabricate(:account, username: 'bob') }
+  let(:follower) { Fabricate(:account) }
 
   before do
     FollowService.new.call(follower, user.account)
diff --git a/spec/controllers/api/v1/followed_tags_controller_spec.rb b/spec/controllers/api/v1/followed_tags_controller_spec.rb
new file mode 100644
index 000000000..2191350ef
--- /dev/null
+++ b/spec/controllers/api/v1/followed_tags_controller_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::FollowedTagsController, type: :controller do
+  render_views
+
+  let(:user)   { Fabricate(:user) }
+  let(:scopes) { 'read:follows' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  before { allow(controller).to receive(:doorkeeper_token) { token } }
+
+  describe 'GET #index' do
+    let!(:tag_follows) { Fabricate.times(5, :tag_follow, account: user.account) }
+
+    before do
+      get :index, params: { limit: 1 }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/instances_controller_spec.rb b/spec/controllers/api/v1/instances_controller_spec.rb
index 7397d25d6..842669d96 100644
--- a/spec/controllers/api/v1/instances_controller_spec.rb
+++ b/spec/controllers/api/v1/instances_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::InstancesController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
 
   before do
diff --git a/spec/controllers/api/v1/lists/accounts_controller_spec.rb b/spec/controllers/api/v1/lists/accounts_controller_spec.rb
index 08c22de56..526d8b561 100644
--- a/spec/controllers/api/v1/lists/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/lists/accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Lists::AccountsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:list)  { Fabricate(:list, account: user.account) }
 
diff --git a/spec/controllers/api/v1/lists_controller_spec.rb b/spec/controllers/api/v1/lists_controller_spec.rb
index e92213789..71a8094e6 100644
--- a/spec/controllers/api/v1/lists_controller_spec.rb
+++ b/spec/controllers/api/v1/lists_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::ListsController, type: :controller do
   render_views
 
-  let!(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let!(:user)  { Fabricate(:user) }
   let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let!(:list)  { Fabricate(:list, account: user.account) }
 
diff --git a/spec/controllers/api/v1/markers_controller_spec.rb b/spec/controllers/api/v1/markers_controller_spec.rb
index 556a75b9b..ba0f3c322 100644
--- a/spec/controllers/api/v1/markers_controller_spec.rb
+++ b/spec/controllers/api/v1/markers_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::MarkersController, type: :controller do
   render_views
 
-  let!(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let!(:user)  { Fabricate(:user) }
   let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses write:statuses') }
 
   before { allow(controller).to receive(:doorkeeper_token) { token } }
diff --git a/spec/controllers/api/v1/media_controller_spec.rb b/spec/controllers/api/v1/media_controller_spec.rb
index 3eb015a1c..a1f6ddb24 100644
--- a/spec/controllers/api/v1/media_controller_spec.rb
+++ b/spec/controllers/api/v1/media_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::MediaController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:media') }
 
   before do
@@ -110,21 +110,24 @@ RSpec.describe Api::V1::MediaController, type: :controller do
       end
     end
 
-    context 'when not attached to a status' do
-      let(:media) { Fabricate(:media_attachment, status: nil, account: user.account) }
+    context 'when the author \'s' do
+      let(:status) { nil }
+      let(:media)  { Fabricate(:media_attachment, status: status, account: user.account) }
+
+      before do
+        put :update, params: { id: media.id, description: 'Lorem ipsum!!!' }
+      end
 
       it 'updates the description' do
-        put :update, params: { id: media.id, description: 'Lorem ipsum!!!' }
         expect(media.reload.description).to eq 'Lorem ipsum!!!'
       end
-    end
 
-    context 'when attached to a status' do
-      let(:media) { Fabricate(:media_attachment, status: Fabricate(:status), account: user.account) }
+      context 'when already attached to a status' do
+        let(:status) { Fabricate(:status, account: user.account) }
 
-      it 'returns http not found' do
-        put :update, params: { id: media.id, description: 'Lorem ipsum!!!' }
-        expect(response).to have_http_status(:not_found)
+        it 'returns http not found' do
+          expect(response).to have_http_status(:not_found)
+        end
       end
     end
   end
diff --git a/spec/controllers/api/v1/mutes_controller_spec.rb b/spec/controllers/api/v1/mutes_controller_spec.rb
index a2b814a69..8176815d4 100644
--- a/spec/controllers/api/v1/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/mutes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::MutesController, type: :controller do
   render_views
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)   { Fabricate(:user) }
   let(:scopes) { 'read:mutes' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb
index 5a0b24bbf..46e177c0e 100644
--- a/spec/controllers/api/v1/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/notifications_controller_spec.rb
@@ -3,10 +3,10 @@ require 'rails_helper'
 RSpec.describe Api::V1::NotificationsController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user, account_attributes: { username: 'alice' }) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
-  let(:third) { Fabricate(:user, account: Fabricate(:account, username: 'carol')) }
+  let(:other) { Fabricate(:user) }
+  let(:third) { Fabricate(:user) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
@@ -70,23 +70,23 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
       end
 
       it 'includes reblog' do
-        expect(assigns(:notifications).map(&:activity)).to include(@reblog_of_first_status)
+        expect(body_as_json.map { |x| x[:type] }).to include 'reblog'
       end
 
       it 'includes mention' do
-        expect(assigns(:notifications).map(&:activity)).to include(@mention_from_status)
+        expect(body_as_json.map { |x| x[:type] }).to include 'mention'
       end
 
       it 'includes favourite' do
-        expect(assigns(:notifications).map(&:activity)).to include(@favourite)
+        expect(body_as_json.map { |x| x[:type] }).to include 'favourite'
       end
 
       it 'includes follow' do
-        expect(assigns(:notifications).map(&:activity)).to include(@follow)
+        expect(body_as_json.map { |x| x[:type] }).to include 'follow'
       end
     end
 
-    describe 'from specified user' do
+    describe 'with account_id param' do
       before do
         get :index, params: { account_id: third.account.id }
       end
@@ -95,28 +95,12 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
         expect(response).to have_http_status(200)
       end
 
-      it 'includes favourite' do
-        expect(assigns(:notifications).map(&:activity)).to include(@second_favourite)
-      end
-
-      it 'excludes favourite' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@favourite)
-      end
-
-      it 'excludes mention' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status)
-      end
-
-      it 'excludes reblog' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@reblog_of_first_status)
-      end
-
-      it 'excludes follow' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@follow)
+      it 'returns only notifications from specified user' do
+        expect(body_as_json.map { |x| x[:account][:id] }.uniq).to eq [third.account.id.to_s]
       end
     end
 
-    describe 'from nonexistent user' do
+    describe 'with invalid account_id param' do
       before do
         get :index, params: { account_id: 'foo' }
       end
@@ -125,54 +109,37 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
         expect(response).to have_http_status(200)
       end
 
-      it 'excludes favourite' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@favourite)
-      end
-
-      it 'excludes second favourite' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@second_favourite)
-      end
-
-      it 'excludes mention' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status)
-      end
-
-      it 'excludes reblog' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@reblog_of_first_status)
-      end
-
-      it 'excludes follow' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@follow)
+      it 'returns nothing' do
+        expect(body_as_json.size).to eq 0
       end
     end
 
-    describe 'with excluded mentions' do
+    describe 'with excluded_types param' do
       before do
-        get :index, params: { exclude_types: ['mention'] }
+        get :index, params: { exclude_types: %w(mention) }
       end
 
       it 'returns http success' do
         expect(response).to have_http_status(200)
       end
 
-      it 'includes reblog' do
-        expect(assigns(:notifications).map(&:activity)).to include(@reblog_of_first_status)
+      it 'returns everything but excluded type' do
+        expect(body_as_json.size).to_not eq 0
+        expect(body_as_json.map { |x| x[:type] }.uniq).to_not include 'mention'
+      end
+    end
+
+    describe 'with types param' do
+      before do
+        get :index, params: { types: %w(mention) }
       end
 
-      it 'excludes mention' do
-        expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status)
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
       end
 
-      it 'includes favourite' do
-        expect(assigns(:notifications).map(&:activity)).to include(@favourite)
-      end
-
-      it 'includes third favourite' do
-        expect(assigns(:notifications).map(&:activity)).to include(@second_favourite)
-      end
-
-      it 'includes follow' do
-        expect(assigns(:notifications).map(&:activity)).to include(@follow)
+      it 'returns only requested type' do
+        expect(body_as_json.map { |x| x[:type] }.uniq).to eq ['mention']
       end
     end
   end
diff --git a/spec/controllers/api/v1/polls/votes_controller_spec.rb b/spec/controllers/api/v1/polls/votes_controller_spec.rb
index 0ee3aa040..d7a9c1970 100644
--- a/spec/controllers/api/v1/polls/votes_controller_spec.rb
+++ b/spec/controllers/api/v1/polls/votes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::Polls::VotesController, type: :controller do
   render_views
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)   { Fabricate(:user) }
   let(:scopes) { 'write:statuses' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
diff --git a/spec/controllers/api/v1/polls_controller_spec.rb b/spec/controllers/api/v1/polls_controller_spec.rb
index 851bccb7e..f0d9eaf92 100644
--- a/spec/controllers/api/v1/polls_controller_spec.rb
+++ b/spec/controllers/api/v1/polls_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::PollsController, type: :controller do
   render_views
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)   { Fabricate(:user) }
   let(:scopes) { 'read:statuses' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
index a3596cf8a..dbc64e704 100644
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/reports_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::ReportsController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
   before do
@@ -13,22 +13,64 @@ RSpec.describe Api::V1::ReportsController, type: :controller do
   end
 
   describe 'POST #create' do
-    let(:scopes)  { 'write:reports' }
-    let!(:status) { Fabricate(:status) }
-    let!(:admin)  { Fabricate(:user, admin: true) }
+    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+    let(:scopes) { 'write:reports' }
+    let(:status) { Fabricate(:status) }
+    let(:target_account) { status.account }
+    let(:category) { nil }
+    let(:forward) { nil }
+    let(:rule_ids){ nil }
 
     before do
       allow(AdminMailer).to receive(:new_report).and_return(double('email', deliver_later: nil))
-      post :create, params: { status_ids: [status.id], account_id: status.account.id, comment: 'reasons' }
+      post :create, params: { status_ids: [status.id], account_id: target_account.id, comment: 'reasons', category: category, rule_ids: rule_ids, forward: forward }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
     end
 
     it 'creates a report' do
-      expect(status.reload.account.targeted_reports).not_to be_empty
-      expect(response).to have_http_status(200)
+      expect(target_account.targeted_reports).to_not be_empty
+    end
+
+    it 'saves comment' do
+      expect(target_account.targeted_reports.first.comment).to eq 'reasons'
     end
 
     it 'sends e-mails to admins' do
       expect(AdminMailer).to have_received(:new_report).with(admin.account, Report)
     end
+
+    context 'when a status does not belong to the reported account' do
+      let(:target_account) { Fabricate(:account) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when a category is chosen' do
+      let(:category) { 'spam' }
+
+      it 'saves category' do
+        expect(target_account.targeted_reports.first.spam?).to be true
+      end
+    end
+
+    context 'when violated rules are chosen' do
+      let(:rule) { Fabricate(:rule) }
+      let(:category) { 'violation' }
+      let(:rule_ids) { [rule.id] }
+
+      it 'saves category' do
+        expect(target_account.targeted_reports.first.violation?).to be true
+      end
+
+      it 'saves rule_ids' do
+        expect(target_account.targeted_reports.first.rule_ids).to match_array([rule.id])
+      end
+    end
   end
 end
diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
index 7c75a4f73..46d7b6c0a 100644
--- a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Statuses::BookmarksController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:bookmarks', application: app) }
 
diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
index f053ae573..7cc77f430 100644
--- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
   let(:alice) { Fabricate(:account) }
@@ -56,7 +56,7 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :control
           Fabricate(:favourite, status: status)
         end
 
-        it 'returns http unautharized' do
+        it 'returns http unauthorized' do
           get :index, params: { status_id: status.id }
           expect(response).to have_http_status(404)
         end
diff --git a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
index 4716ecae3..609957e3e 100644
--- a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Statuses::FavouritesController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:favourites', application: app) }
 
diff --git a/spec/controllers/api/v1/statuses/histories_controller_spec.rb b/spec/controllers/api/v1/statuses/histories_controller_spec.rb
new file mode 100644
index 000000000..00677f1d2
--- /dev/null
+++ b/spec/controllers/api/v1/statuses/histories_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Statuses::HistoriesController do
+  render_views
+
+  let(:user)  { Fabricate(:user) }
+  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+
+  context 'with an oauth token' do
+    before do
+      allow(controller).to receive(:doorkeeper_token) { token }
+    end
+
+    describe 'GET #show' do
+      let(:status) { Fabricate(:status, account: user.account) }
+
+      before do
+        get :show, params: { status_id: status.id }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb b/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
index 966398580..bffa9fe0d 100644
--- a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Statuses::MutesController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:mutes', application: app) }
 
diff --git a/spec/controllers/api/v1/statuses/pins_controller_spec.rb b/spec/controllers/api/v1/statuses/pins_controller_spec.rb
index 13405d285..8bdaf8b54 100644
--- a/spec/controllers/api/v1/statuses/pins_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/pins_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Statuses::PinsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts', application: app) }
 
diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
index 60908b7b3..8d4a6f91c 100644
--- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
   let(:alice) { Fabricate(:account) }
@@ -56,7 +56,7 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controll
           Fabricate(:status, reblog_of_id: status.id)
         end
 
-        it 'returns http unautharized' do
+        it 'returns http unauthorized' do
           get :index, params: { status_id: status.id }
           expect(response).to have_http_status(404)
         end
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
index f1d3d949c..6eac02b23 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Statuses::ReblogsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
 
diff --git a/spec/controllers/api/v1/statuses/sources_controller_spec.rb b/spec/controllers/api/v1/statuses/sources_controller_spec.rb
new file mode 100644
index 000000000..fbe6fa0be
--- /dev/null
+++ b/spec/controllers/api/v1/statuses/sources_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Statuses::SourcesController do
+  render_views
+
+  let(:user)  { Fabricate(:user) }
+  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+
+  context 'with an oauth token' do
+    before do
+      allow(controller).to receive(:doorkeeper_token) { token }
+    end
+
+    describe 'GET #show' do
+      let(:status) { Fabricate(:status, account: user.account) }
+
+      before do
+        get :show, params: { status_id: status.id }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index df8037038..24810a5d2 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Api::V1::StatusesController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: scopes) }
 
@@ -20,6 +20,85 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
         get :show, params: { id: status.id }
         expect(response).to have_http_status(200)
       end
+
+      context 'when post includes filtered terms' do
+        let(:status) { Fabricate(:status, text: 'this toot is about that banned word') }
+
+        before do
+          user.account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
+        end
+
+        it 'returns http success' do
+          get :show, params: { id: status.id }
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns filter information' do
+          get :show, params: { id: status.id }
+          json = body_as_json
+          expect(json[:filtered][0]).to include({
+            filter: a_hash_including({
+              id: user.account.custom_filters.first.id.to_s,
+              title: 'filter1',
+              filter_action: 'hide',
+            }),
+            keyword_matches: ['banned'],
+          })
+        end
+      end
+
+      context 'when post is explicitly filtered' do
+        let(:status) { Fabricate(:status, text: 'hello world') }
+
+        before do
+          filter = user.account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide)
+          filter.statuses.create!(status_id: status.id)
+        end
+
+        it 'returns http success' do
+          get :show, params: { id: status.id }
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns filter information' do
+          get :show, params: { id: status.id }
+          json = body_as_json
+          expect(json[:filtered][0]).to include({
+            filter: a_hash_including({
+              id: user.account.custom_filters.first.id.to_s,
+              title: 'filter1',
+              filter_action: 'hide',
+            }),
+            status_matches: [status.id.to_s],
+          })
+        end
+      end
+
+      context 'when reblog includes filtered terms' do
+        let(:status) { Fabricate(:status, reblog: Fabricate(:status, text: 'this toot is about that banned word')) }
+
+        before do
+          user.account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
+        end
+
+        it 'returns http success' do
+          get :show, params: { id: status.id }
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns filter information' do
+          get :show, params: { id: status.id }
+          json = body_as_json
+          expect(json[:reblog][:filtered][0]).to include({
+            filter: a_hash_including({
+              id: user.account.custom_filters.first.id.to_s,
+              title: 'filter1',
+              filter_action: 'hide',
+            }),
+            keyword_matches: ['banned'],
+          })
+        end
+      end
     end
 
     describe 'GET #context' do
@@ -102,6 +181,23 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
         expect(Status.find_by(id: status.id)).to be nil
       end
     end
+
+    describe 'PUT #update' do
+      let(:scopes) { 'write:statuses' }
+      let(:status) { Fabricate(:status, account: user.account) }
+
+      before do
+        put :update, params: { id: status.id, status: 'I am updated' }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'updates the status' do
+        expect(status.reload.text).to eq 'I am updated'
+      end
+    end
   end
 
   context 'without an oauth token' do
@@ -113,7 +209,7 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
       let(:status) { Fabricate(:status, account: user.account, visibility: :private) }
 
       describe 'GET #show' do
-        it 'returns http unautharized' do
+        it 'returns http unauthorized' do
           get :show, params: { id: status.id }
           expect(response).to have_http_status(404)
         end
@@ -124,7 +220,7 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
           Fabricate(:status, account: user.account, thread: status)
         end
 
-        it 'returns http unautharized' do
+        it 'returns http unauthorized' do
           get :context, params: { id: status.id }
           expect(response).to have_http_status(404)
         end
diff --git a/spec/controllers/api/v1/tags_controller_spec.rb b/spec/controllers/api/v1/tags_controller_spec.rb
new file mode 100644
index 000000000..216faad87
--- /dev/null
+++ b/spec/controllers/api/v1/tags_controller_spec.rb
@@ -0,0 +1,86 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::TagsController, type: :controller do
+  render_views
+
+  let(:user)   { Fabricate(:user) }
+  let(:scopes) { 'write:follows' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  before { allow(controller).to receive(:doorkeeper_token) { token } }
+
+  describe 'GET #show' do
+    before do
+      get :show, params: { id: name }
+    end
+
+    context 'with existing tag' do
+      let!(:tag) { Fabricate(:tag) }
+      let(:name) { tag.name }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+    end
+
+    context 'with non-existing tag' do
+      let(:name) { 'hoge' }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
+
+  describe 'POST #follow' do
+    let!(:unrelated_tag) { Fabricate(:tag) }
+
+    before do
+      TagFollow.create!(account: user.account, tag: unrelated_tag)
+
+      post :follow, params: { id: name }
+    end
+
+    context 'with existing tag' do
+      let!(:tag) { Fabricate(:tag) }
+      let(:name) { tag.name }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'creates follow' do
+        expect(TagFollow.where(tag: tag, account: user.account).exists?).to be true
+      end
+    end
+
+    context 'with non-existing tag' do
+      let(:name) { 'hoge' }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'creates follow' do
+        expect(TagFollow.where(tag: Tag.find_by!(name: name), account: user.account).exists?).to be true
+      end
+    end
+  end
+
+  describe 'POST #unfollow' do
+    let!(:tag) { Fabricate(:tag, name: 'foo') }
+    let!(:tag_follow) { Fabricate(:tag_follow, account: user.account, tag: tag) }
+
+    before do
+      post :unfollow, params: { id: tag.name }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(:success)
+    end
+
+    it 'removes the follow' do
+      expect(TagFollow.where(tag: tag, account: user.account).exists?).to be false
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/timelines/home_controller_spec.rb b/spec/controllers/api/v1/timelines/home_controller_spec.rb
index e953e4649..131c2d92f 100644
--- a/spec/controllers/api/v1/timelines/home_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/home_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Timelines::HomeController do
   render_views
 
-  let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
+  let(:user) { Fabricate(:user, current_sign_in_at: 1.day.ago) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/controllers/api/v1/timelines/list_controller_spec.rb
index 45e4bf34c..526c66a05 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/list_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Timelines::ListController do
   render_views
 
-  let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user) { Fabricate(:user) }
   let(:list) { Fabricate(:list, account: user.account) }
 
   before do
@@ -30,7 +30,7 @@ describe Api::V1::Timelines::ListController do
   end
 
   context 'with the wrong user context' do
-    let(:other_user) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+    let(:other_user) { Fabricate(:user) }
     let(:token)      { Fabricate(:accessible_access_token, resource_owner_id: other_user.id, scopes: 'read') }
 
     describe 'GET #show' do
diff --git a/spec/controllers/api/v1/timelines/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb
index 737aedba6..31e594d22 100644
--- a/spec/controllers/api/v1/timelines/public_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Timelines::PublicController do
   render_views
 
-  let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user) { Fabricate(:user) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/timelines/tag_controller_spec.rb b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
index f71ca2a39..718911083 100644
--- a/spec/controllers/api/v1/timelines/tag_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::Timelines::TagController do
   render_views
 
-  let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user) { Fabricate(:user) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/controllers/api/v1/trends/tags_controller_spec.rb
index e2e26dcab..d29551c56 100644
--- a/spec/controllers/api/v1/trends/tags_controller_spec.rb
+++ b/spec/controllers/api/v1/trends/tags_controller_spec.rb
@@ -7,10 +7,9 @@ RSpec.describe Api::V1::Trends::TagsController, type: :controller do
 
   describe 'GET #index' do
     before do
-      trending_tags = double()
-
-      allow(trending_tags).to receive(:get).and_return(Fabricate.times(10, :tag))
-      allow(Trends).to receive(:tags).and_return(trending_tags)
+      Fabricate.times(10, :tag).each do |tag|
+        10.times { |i| Trends.tags.add(tag, i) }
+      end
 
       get :index
     end
diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/controllers/api/v2/admin/accounts_controller_spec.rb
new file mode 100644
index 000000000..2508a9e05
--- /dev/null
+++ b/spec/controllers/api/v2/admin/accounts_controller_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+
+RSpec.describe Api::V2::Admin::AccountsController, type: :controller do
+  render_views
+
+  let(:role)   { UserRole.find_by(name: 'Moderator') }
+  let(:user)   { Fabricate(:user, role: role) }
+  let(:scopes) { 'admin:read admin:write' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:account) { Fabricate(:account) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  shared_examples 'forbidden for wrong scope' do |wrong_scope|
+    let(:scopes) { wrong_scope }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  shared_examples 'forbidden for wrong role' do |wrong_role|
+    let(:role) { UserRole.find_by(name: wrong_role) }
+
+    it 'returns http forbidden' do
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET #index' do
+    let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }
+    let!(:other_remote_account) { Fabricate(:account, domain: 'foo.bar') }
+    let!(:suspended_account)    { Fabricate(:account, suspended: true) }
+    let!(:suspended_remote)     { Fabricate(:account, domain: 'foo.bar', suspended: true) }
+    let!(:disabled_account)     { Fabricate(:user, disabled: true).account }
+    let!(:pending_account)      { Fabricate(:user, approved: false).account }
+    let!(:admin_account)        { user.account }
+
+    let(:params) { {} }
+
+    before do
+      pending_account.user.update(approved: false)
+      get :index, params: params
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+
+    [
+      [{ status: 'active', origin: 'local', permissions: 'staff' }, [:admin_account]],
+      [{ by_domain: 'example.org', origin: 'remote' }, [:remote_account]],
+      [{ status: 'suspended' }, [:suspended_remote, :suspended_account]],
+      [{ status: 'disabled' }, [:disabled_account]],
+      [{ status: 'pending' }, [:pending_account]],
+    ].each do |params, expected_results|
+      context "when called with #{params.inspect}" do
+        let(:params) { params }
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it "returns the correct accounts (#{expected_results.inspect})" do
+          json = body_as_json
+
+          expect(json.map { |a| a[:id].to_i }).to eq (expected_results.map { |symbol| send(symbol).id })
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v2/filters/keywords_controller_spec.rb b/spec/controllers/api/v2/filters/keywords_controller_spec.rb
new file mode 100644
index 000000000..1201a4ca2
--- /dev/null
+++ b/spec/controllers/api/v2/filters/keywords_controller_spec.rb
@@ -0,0 +1,142 @@
+require 'rails_helper'
+
+RSpec.describe Api::V2::Filters::KeywordsController, type: :controller do
+  render_views
+
+  let(:user)         { Fabricate(:user) }
+  let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:filter)       { Fabricate(:custom_filter, account: user.account) }
+  let(:other_user)   { Fabricate(:user) }
+  let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  describe 'GET #index' do
+    let(:scopes) { 'read:filters' }
+    let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
+
+    it 'returns http success' do
+      get :index, params: { filter_id: filter.id }
+      expect(response).to have_http_status(200)
+    end
+
+    context "when trying to access another's user filters" do
+      it 'returns http not found' do
+        get :index, params: { filter_id: other_filter.id }
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    let(:scopes)    { 'write:filters' }
+    let(:filter_id) { filter.id }
+
+    before do
+      post :create, params: { filter_id: filter_id, keyword: 'magic', whole_word: false }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns a keyword' do
+      json = body_as_json
+      expect(json[:keyword]).to eq 'magic'
+      expect(json[:whole_word]).to eq false
+    end
+
+    it 'creates a keyword' do
+      filter = user.account.custom_filters.first
+      expect(filter).to_not be_nil
+      expect(filter.keywords.pluck(:keyword)).to eq ['magic']
+    end
+
+    context "when trying to add to another another's user filters" do
+      let(:filter_id) { other_filter.id }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    let(:scopes)  { 'read:filters' }
+    let(:keyword) { Fabricate(:custom_filter_keyword, keyword: 'foo', whole_word: false, custom_filter: filter) }
+
+    before do
+      get :show, params: { id: keyword.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns expected data' do
+      json = body_as_json
+      expect(json[:keyword]).to eq 'foo'
+      expect(json[:whole_word]).to eq false
+    end
+
+    context "when trying to access another user's filter keyword" do
+      let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: other_filter) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:scopes)  { 'write:filters' }
+    let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
+
+    before do
+      get :update, params: { id: keyword.id, keyword: 'updated' }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'updates the keyword' do
+      expect(keyword.reload.keyword).to eq 'updated'
+    end
+
+    context "when trying to update another user's filter keyword" do
+      let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: other_filter) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:scopes)  { 'write:filters' }
+    let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
+
+    before do
+      delete :destroy, params: { id: keyword.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'removes the filter' do
+      expect { keyword.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    context "when trying to update another user's filter keyword" do
+      let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: other_filter) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v2/filters/statuses_controller_spec.rb b/spec/controllers/api/v2/filters/statuses_controller_spec.rb
new file mode 100644
index 000000000..9740c1eb3
--- /dev/null
+++ b/spec/controllers/api/v2/filters/statuses_controller_spec.rb
@@ -0,0 +1,116 @@
+require 'rails_helper'
+
+RSpec.describe Api::V2::Filters::StatusesController, type: :controller do
+  render_views
+
+  let(:user)         { Fabricate(:user) }
+  let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:filter)       { Fabricate(:custom_filter, account: user.account) }
+  let(:other_user)   { Fabricate(:user) }
+  let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  describe 'GET #index' do
+    let(:scopes) { 'read:filters' }
+    let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
+
+    it 'returns http success' do
+      get :index, params: { filter_id: filter.id }
+      expect(response).to have_http_status(200)
+    end
+
+    context "when trying to access another's user filters" do
+      it 'returns http not found' do
+        get :index, params: { filter_id: other_filter.id }
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    let(:scopes)    { 'write:filters' }
+    let(:filter_id) { filter.id }
+    let!(:status)   { Fabricate(:status) }
+
+    before do
+      post :create, params: { filter_id: filter_id, status_id: status.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns a status filter' do
+      json = body_as_json
+      expect(json[:status_id]).to eq status.id.to_s
+    end
+
+    it 'creates a status filter' do
+      filter = user.account.custom_filters.first
+      expect(filter).to_not be_nil
+      expect(filter.statuses.pluck(:status_id)).to eq [status.id]
+    end
+
+    context "when trying to add to another another's user filters" do
+      let(:filter_id) { other_filter.id }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    let(:scopes)  { 'read:filters' }
+    let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
+
+    before do
+      get :show, params: { id: status_filter.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns expected data' do
+      json = body_as_json
+      expect(json[:status_id]).to eq status_filter.status_id.to_s
+    end
+
+    context "when trying to access another user's filter keyword" do
+      let(:status_filter) { Fabricate(:custom_filter_status, custom_filter: other_filter) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:scopes)  { 'write:filters' }
+    let(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
+
+    before do
+      delete :destroy, params: { id: status_filter.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'removes the filter' do
+      expect { status_filter.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    context "when trying to update another user's filter keyword" do
+      let(:status_filter) { Fabricate(:custom_filter_status, custom_filter: other_filter) }
+
+      it 'returns http not found' do
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v2/filters_controller_spec.rb b/spec/controllers/api/v2/filters_controller_spec.rb
new file mode 100644
index 000000000..cc0070d57
--- /dev/null
+++ b/spec/controllers/api/v2/filters_controller_spec.rb
@@ -0,0 +1,121 @@
+require 'rails_helper'
+
+RSpec.describe Api::V2::FiltersController, type: :controller do
+  render_views
+
+  let(:user)  { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  describe 'GET #index' do
+    let(:scopes) { 'read:filters' }
+    let!(:filter) { Fabricate(:custom_filter, account: user.account) }
+
+    it 'returns http success' do
+      get :index
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'POST #create' do
+    let(:scopes) { 'write:filters' }
+
+    before do
+      post :create, params: { title: 'magic', context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns a filter with keywords' do
+      json = body_as_json
+      expect(json[:title]).to eq 'magic'
+      expect(json[:filter_action]).to eq 'hide'
+      expect(json[:context]).to eq ['home']
+      expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to eq [{ keyword: 'magic', whole_word: true }]
+    end
+
+    it 'creates a filter' do
+      filter = user.account.custom_filters.first
+      expect(filter).to_not be_nil
+      expect(filter.keywords.pluck(:keyword)).to eq ['magic']
+      expect(filter.context).to eq %w(home)
+      expect(filter.irreversible?).to be true
+      expect(filter.expires_at).to be_nil
+    end
+  end
+
+  describe 'GET #show' do
+    let(:scopes)  { 'read:filters' }
+    let(:filter)  { Fabricate(:custom_filter, account: user.account) }
+
+    it 'returns http success' do
+      get :show, params: { id: filter.id }
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:scopes)   { 'write:filters' }
+    let!(:filter)  { Fabricate(:custom_filter, account: user.account) }
+    let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
+
+    context 'updating filter parameters' do
+      before do
+        put :update, params: { id: filter.id, title: 'updated', context: %w(home public) }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'updates the filter title' do
+        expect(filter.reload.title).to eq 'updated'
+      end
+
+      it 'updates the filter context' do
+        expect(filter.reload.context).to eq %w(home public)
+      end
+    end
+
+    context 'updating keywords in bulk' do
+      before do
+        allow(redis).to receive_messages(publish: nil)
+        put :update, params: { id: filter.id, keywords_attributes: [{ id: keyword.id, keyword: 'updated' }] }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'updates the keyword' do
+        expect(keyword.reload.keyword).to eq 'updated'
+      end
+
+      it 'sends exactly one filters_changed event' do
+        expect(redis).to have_received(:publish).with("timeline:#{user.account.id}", Oj.dump(event: :filters_changed)).once
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:scopes)  { 'write:filters' }
+    let(:filter)  { Fabricate(:custom_filter, account: user.account) }
+
+    before do
+      delete :destroy, params: { id: filter.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'removes the filter' do
+      expect { filter.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+end
diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/controllers/api/v2/search_controller_spec.rb
index 8ee8753de..d417ea58c 100644
--- a/spec/controllers/api/v2/search_controller_spec.rb
+++ b/spec/controllers/api/v2/search_controller_spec.rb
@@ -5,18 +5,64 @@ require 'rails_helper'
 RSpec.describe Api::V2::SearchController, type: :controller do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:search') }
+  context 'with token' do
+    let(:user)  { Fabricate(:user) }
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:search') }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
+    before do
+      allow(controller).to receive(:doorkeeper_token) { token }
+    end
+
+    describe 'GET #index' do
+      before do
+        get :index, params: { q: 'test' }
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+    end
   end
 
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index, params: { q: 'test' }
+  context 'without token' do
+    describe 'GET #index' do
+      let(:search_params) {}
 
-      expect(response).to have_http_status(200)
+      before do
+        get :index, params: search_params
+      end
+
+      context 'with a `q` shorter than 5 characters' do
+        let(:search_params) { { q: 'test' } }
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+      end
+
+      context 'with a `q` equal to or longer than 5 characters' do
+        let(:search_params) { { q: 'test1' } }
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        context 'with truthy `resolve`' do
+          let(:search_params) { { q: 'test1', resolve: '1' } }
+
+          it 'returns http unauthorized' do
+            expect(response).to have_http_status(401)
+          end
+        end
+
+        context 'with `offset`' do
+          let(:search_params) { { q: 'test1', offset: 1 } }
+
+          it 'returns http unauthorized' do
+            expect(response).to have_http_status(401)
+          end
+        end
+      end
     end
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 458298a6b..1b002e01c 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -49,7 +49,7 @@ describe ApplicationController, type: :controller do
 
     it 'returns account if signed in' do
       account = Fabricate(:account)
-      sign_in(Fabricate(:user, account: account))
+      sign_in(account.user)
       expect(controller.view_context.current_account).to eq account
     end
   end
@@ -164,13 +164,13 @@ describe ApplicationController, type: :controller do
     end
 
     it 'does nothing if user who signed in is not suspended' do
-      sign_in(Fabricate(:user, account: Fabricate(:account, suspended: false)))
+      sign_in(Fabricate(:account, suspended: false).user)
       get 'success'
       expect(response).to have_http_status(200)
     end
 
     it 'redirects to account status page' do
-      sign_in(Fabricate(:user, account: Fabricate(:account, suspended: true)))
+      sign_in(Fabricate(:account, suspended: true).user)
       get 'success'
       expect(response).to redirect_to(edit_user_registration_path)
     end
@@ -183,70 +183,6 @@ describe ApplicationController, type: :controller do
     end
   end
 
-  describe 'require_admin!' do
-    controller do
-      before_action :require_admin!
-
-      def sucesss
-        head 200
-      end
-    end
-
-    before do
-      routes.draw { get 'sucesss' => 'anonymous#sucesss' }
-    end
-
-    it 'returns a 403 if current user is not admin' do
-      sign_in(Fabricate(:user, admin: false))
-      get 'sucesss'
-      expect(response).to have_http_status(403)
-    end
-
-    it 'returns a 403 if current user is only a moderator' do
-      sign_in(Fabricate(:user, moderator: true))
-      get 'sucesss'
-      expect(response).to have_http_status(403)
-    end
-
-    it 'does nothing if current user is admin' do
-      sign_in(Fabricate(:user, admin: true))
-      get 'sucesss'
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'require_staff!' do
-    controller do
-      before_action :require_staff!
-
-      def sucesss
-        head 200
-      end
-    end
-
-    before do
-      routes.draw { get 'sucesss' => 'anonymous#sucesss' }
-    end
-
-    it 'returns a 403 if current user is not admin or moderator' do
-      sign_in(Fabricate(:user, admin: false, moderator: false))
-      get 'sucesss'
-      expect(response).to have_http_status(403)
-    end
-
-    it 'does nothing if current user is moderator' do
-      sign_in(Fabricate(:user, moderator: true))
-      get 'sucesss'
-      expect(response).to have_http_status(200)
-    end
-
-    it 'does nothing if current user is admin' do
-      sign_in(Fabricate(:user, admin: true))
-      get 'sucesss'
-      expect(response).to have_http_status(200)
-    end
-  end
-
   describe 'forbidden' do
     controller do
       def route_forbidden
diff --git a/spec/controllers/auth/passwords_controller_spec.rb b/spec/controllers/auth/passwords_controller_spec.rb
index dcfdebb17..1c6874f08 100644
--- a/spec/controllers/auth/passwords_controller_spec.rb
+++ b/spec/controllers/auth/passwords_controller_spec.rb
@@ -35,4 +35,65 @@ describe Auth::PasswordsController, type: :controller do
       end
     end
   end
+
+  describe 'POST #update' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      @password = 'reset0password'
+      request.env['devise.mapping'] = Devise.mappings[:user]
+    end
+
+    context 'with valid reset_password_token' do
+      let!(:session_activation) { Fabricate(:session_activation, user: user) }
+      let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
+      let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
+
+      before do
+        @token = user.send_reset_password_instructions
+
+        post :update, params: { user: { password: @password, password_confirmation: @password, reset_password_token: @token } }
+      end
+
+      it 'redirect to sign in' do
+        expect(response).to redirect_to '/auth/sign_in'
+      end
+
+      it 'changes password' do
+        this_user = User.find(user.id)
+
+        expect(this_user).to_not be_nil
+        expect(this_user.valid_password?(@password)).to be true
+      end
+
+      it 'deactivates all sessions' do
+        expect(user.session_activations.count).to eq 0
+      end
+
+      it 'revokes all access tokens' do
+        expect(Doorkeeper::AccessToken.active_for(user).count).to eq 0
+      end
+
+      it 'removes push subscriptions' do
+        expect(Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count).to eq 0
+      end
+    end
+
+    context 'with invalid reset_password_token' do
+      before do
+        post :update, params: { user: { password: @password, password_confirmation: @password, reset_password_token: 'some_invalid_value' } }
+      end
+
+      it 'renders reset password' do
+        expect(response).to render_template(:new)
+      end
+
+      it 'retains password' do
+        this_user = User.find(user.id)
+
+        expect(this_user).to_not be_nil
+        expect(this_user.external_or_valid_password?(user.password)).to be true
+      end
+    end
+  end
 end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index ccf304a93..0ebf6641f 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -228,7 +228,7 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
     end
 
     it 'does nothing if user already exists' do
-      Fabricate(:user, account: Fabricate(:account, username: 'test'))
+      Fabricate(:account, username: 'test')
       subject
     end
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index f718f5dd9..d3db7aa1a 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -37,8 +37,11 @@ RSpec.describe Auth::SessionsController, type: :controller do
     end
 
     context 'with a suspended user' do
+      before do
+        user.account.suspend!
+      end
+
       it 'redirects to home after sign out' do
-        Fabricate(:account, user: user, suspended: true)
         sign_in(user, scope: :user)
         delete :destroy
 
@@ -78,8 +81,8 @@ RSpec.describe Auth::SessionsController, type: :controller do
       end
 
       context 'using a valid email and existing user' do
-        let(:user) do
-          account = Fabricate.build(:account, username: 'pam_user1')
+        let!(:user) do
+          account = Fabricate.build(:account, username: 'pam_user1', user: nil)
           account.save!(validate: false)
           user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account, external: true)
           user
@@ -116,6 +119,32 @@ RSpec.describe Auth::SessionsController, type: :controller do
         end
       end
 
+      context 'using a valid password on a previously-used account with a new IP address' do
+        let(:previous_ip) { '1.2.3.4' }
+        let(:current_ip)  { '4.3.2.1' }
+
+        let!(:previous_login) { Fabricate(:login_activity, user: user, ip: previous_ip) }
+
+        before do
+          allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(current_ip)
+          allow(UserMailer).to receive(:suspicious_sign_in).and_return(double('email', 'deliver_later!': nil))
+          user.update(current_sign_in_at: 1.month.ago)
+          post :create, params: { user: { email: user.email, password: user.password } }
+        end
+
+        it 'redirects to home' do
+          expect(response).to redirect_to(root_path)
+        end
+
+        it 'logs the user in' do
+          expect(controller.current_user).to eq user
+        end
+
+        it 'sends a suspicious sign-in mail' do
+          expect(UserMailer).to have_received(:suspicious_sign_in).with(user, current_ip, anything, anything)
+        end
+      end
+
       context 'using email with uppercase letters' do
         before do
           post :create, params: { user: { email: user.email.upcase, password: user.password } }
@@ -222,22 +251,6 @@ RSpec.describe Auth::SessionsController, type: :controller do
           end
         end
 
-        context 'using email and password after an unfinished log-in attempt with a sign-in token challenge' do
-          let!(:other_user) do
-            Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
-          end
-
-          before do
-            post :create, params: { user: { email: other_user.email, password: other_user.password } }
-            post :create, params: { user: { email: user.email, password: user.password } }
-          end
-
-          it 'renders two factor authentication page' do
-            expect(controller).to render_template("two_factor")
-            expect(controller).to render_template(partial: "_otp_authentication_form")
-          end
-        end
-
         context 'using upcase email and password' do
           before do
             post :create, params: { user: { email: user.email.upcase, password: user.password } }
@@ -263,21 +276,6 @@ RSpec.describe Auth::SessionsController, type: :controller do
           end
         end
 
-        context 'using a valid OTP, attempting to leverage previous half-login to bypass password auth' do
-          let!(:other_user) do
-            Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
-          end
-
-          before do
-            post :create, params: { user: { email: other_user.email, password: other_user.password } }
-            post :create, params: { user: { email: user.email, otp_attempt: user.current_otp } }, session: { attempt_user_updated_at: user.updated_at.to_s }
-          end
-
-          it "doesn't log the user in" do
-            expect(controller.current_user).to be_nil
-          end
-        end
-
         context 'when the server has an decryption error' do
           before do
             allow_any_instance_of(User).to receive(:validate_and_consume_otp!).and_raise(OpenSSL::Cipher::CipherError)
@@ -398,126 +396,6 @@ RSpec.describe Auth::SessionsController, type: :controller do
         end
       end
     end
-
-    context 'when 2FA is disabled and IP is unfamiliar' do
-      let!(:user) { Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', current_sign_in_at: 3.weeks.ago, current_sign_in_ip: '0.0.0.0') }
-
-      before do
-        request.remote_ip  = '10.10.10.10'
-        request.user_agent = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0'
-
-        allow(UserMailer).to receive(:sign_in_token).and_return(double('email', deliver_later!: nil))
-      end
-
-      context 'using email and password' do
-        before do
-          post :create, params: { user: { email: user.email, password: user.password } }
-        end
-
-        it 'renders sign in token authentication page' do
-          expect(controller).to render_template("sign_in_token")
-        end
-
-        it 'generates sign in token' do
-          expect(user.reload.sign_in_token).to_not be_nil
-        end
-
-        it 'sends sign in token e-mail' do
-          expect(UserMailer).to have_received(:sign_in_token)
-        end
-      end
-
-      context 'using email and password after an unfinished log-in attempt to a 2FA-protected account' do
-        let!(:other_user) do
-          Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
-        end
-
-        before do
-          post :create, params: { user: { email: other_user.email, password: other_user.password } }
-          post :create, params: { user: { email: user.email, password: user.password } }
-        end
-
-        it 'renders sign in token authentication page' do
-          expect(controller).to render_template("sign_in_token")
-        end
-
-        it 'generates sign in token' do
-          expect(user.reload.sign_in_token).to_not be_nil
-        end
-
-        it 'sends sign in token e-mail' do
-          expect(UserMailer).to have_received(:sign_in_token)
-        end
-      end
-
-      context 'using email and password after an unfinished log-in attempt with a sign-in token challenge' do
-        let!(:other_user) do
-          Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
-        end
-
-        before do
-          post :create, params: { user: { email: other_user.email, password: other_user.password } }
-          post :create, params: { user: { email: user.email, password: user.password } }
-        end
-
-        it 'renders sign in token authentication page' do
-          expect(controller).to render_template("sign_in_token")
-        end
-
-        it 'generates sign in token' do
-          expect(user.reload.sign_in_token).to_not be_nil
-        end
-
-        it 'sends sign in token e-mail' do
-          expect(UserMailer).to have_received(:sign_in_token).with(user, any_args)
-        end
-      end
-
-      context 'using a valid sign in token' do
-        before do
-          user.generate_sign_in_token && user.save
-          post :create, params: { user: { sign_in_token_attempt: user.sign_in_token } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-        end
-
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
-        end
-
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
-        end
-      end
-
-      context 'using a valid sign in token, attempting to leverage previous half-login to bypass password auth' do
-        let!(:other_user) do
-          Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
-        end
-
-        before do
-          user.generate_sign_in_token && user.save
-          post :create, params: { user: { email: other_user.email, password: other_user.password } }
-          post :create, params: { user: { email: user.email, sign_in_token_attempt: user.sign_in_token } }, session: { attempt_user_updated_at: user.updated_at.to_s }
-        end
-
-        it "doesn't log the user in" do
-          expect(controller.current_user).to be_nil
-        end
-      end
-
-      context 'using an invalid sign in token' do
-        before do
-          post :create, params: { user: { sign_in_token_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-        end
-
-        it 'shows a login error' do
-          expect(flash[:alert]).to match I18n.t('users.invalid_sign_in_token')
-        end
-
-        it "doesn't log the user in" do
-          expect(controller.current_user).to be_nil
-        end
-      end
-    end
   end
 
   describe 'GET #webauthn_options' do
diff --git a/spec/controllers/authorize_interactions_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb
index b4ce30cd7..44f52df69 100644
--- a/spec/controllers/authorize_interactions_controller_spec.rb
+++ b/spec/controllers/authorize_interactions_controller_spec.rb
@@ -16,7 +16,6 @@ describe AuthorizeInteractionsController do
 
     describe 'when signed in' do
       let(:user) { Fabricate(:user) }
-      let(:account) { Fabricate(:account, user: user) }
 
       before do
         sign_in(user)
@@ -40,7 +39,7 @@ describe AuthorizeInteractionsController do
       end
 
       it 'sets resource from url' do
-        account = Account.new
+        account = Fabricate(:account)
         service = double
         allow(ResolveURLService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('http://example.com').and_return(account)
@@ -52,7 +51,7 @@ describe AuthorizeInteractionsController do
       end
 
       it 'sets resource from acct uri' do
-        account = Account.new
+        account = Fabricate(:account)
         service = double
         allow(ResolveAccountService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('found@hostname').and_return(account)
@@ -76,7 +75,7 @@ describe AuthorizeInteractionsController do
 
     describe 'when signed in' do
       let!(:user) { Fabricate(:user) }
-      let!(:account) { user.account }
+      let(:account) { user.account }
 
       before do
         sign_in(user)
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 7ea214a7d..99975f4c4 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -11,13 +11,36 @@ describe ApplicationController, type: :controller do
     end
   end
 
+  around do |example|
+    registrations_mode = Setting.registrations_mode
+    example.run
+    Setting.registrations_mode = registrations_mode
+  end
+
   before do
     routes.draw { get 'success' => 'anonymous#success' }
   end
 
+  context 'when account is unconfirmed' do
+    it 'returns http not found' do
+      account = Fabricate(:user, confirmed_at: nil).account
+      get 'success', params: { account_username: account.username }
+      expect(response).to have_http_status(404)
+    end
+  end
+
+  context 'when account is not approved' do
+    it 'returns http not found' do
+      Setting.registrations_mode = 'approved'
+      account = Fabricate(:user, approved: false).account
+      get 'success', params: { account_username: account.username }
+      expect(response).to have_http_status(404)
+    end
+  end
+
   context 'when account is suspended' do
     it 'returns http gone' do
-      account = Fabricate(:account, suspended: true, user: Fabricate(:user))
+      account = Fabricate(:account, suspended: true)
       get 'success', params: { account_username: account.username }
       expect(response).to have_http_status(410)
     end
@@ -33,19 +56,19 @@ describe ApplicationController, type: :controller do
 
   context 'when account is not suspended' do
     it 'assigns @account' do
-      account = Fabricate(:account, user: Fabricate(:user))
+      account = Fabricate(:account)
       get 'success', params: { account_username: account.username }
       expect(assigns(:account)).to eq account
     end
 
     it 'sets link headers' do
-      account = Fabricate(:account, username: 'username', user: Fabricate(:user))
+      account = Fabricate(:account, username: 'username')
       get 'success', params: { account_username: 'username' }
       expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"'
     end
 
     it 'returns http success' do
-      account = Fabricate(:account, user: Fabricate(:user))
+      account = Fabricate(:account)
       get 'success', params: { account_username: account.username }
       expect(response).to have_http_status(200)
     end
diff --git a/spec/controllers/concerns/accountable_concern_spec.rb b/spec/controllers/concerns/accountable_concern_spec.rb
index e3c06b494..5c5180bc2 100644
--- a/spec/controllers/concerns/accountable_concern_spec.rb
+++ b/spec/controllers/concerns/accountable_concern_spec.rb
@@ -12,14 +12,14 @@ RSpec.describe AccountableConcern do
     end
   end
 
-  let(:user)   { Fabricate(:user, account: Fabricate(:account)) }
-  let(:target) { Fabricate(:user, account: Fabricate(:account)) }
-  let(:hoge)   { Hoge.new(user.account) }
+  let(:user)   { Fabricate(:account) }
+  let(:target) { Fabricate(:account) }
+  let(:hoge)   { Hoge.new(user) }
 
   describe '#log_action' do
     it 'creates Admin::ActionLog' do
       expect do
-        hoge.log_action(:create, target.account)
+        hoge.log_action(:create, target)
       end.to change { Admin::ActionLog.count }.by(1)
     end
   end
diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb
index 05fb1445b..6e73643b4 100644
--- a/spec/controllers/concerns/signature_verification_spec.rb
+++ b/spec/controllers/concerns/signature_verification_spec.rb
@@ -3,6 +3,16 @@
 require 'rails_helper'
 
 describe ApplicationController, type: :controller do
+  class WrappedActor
+    attr_reader :wrapped_account
+
+    def initialize(wrapped_account)
+      @wrapped_account = wrapped_account
+    end
+
+    delegate :uri, :keypair, to: :wrapped_account
+  end
+
   controller do
     include SignatureVerification
 
@@ -73,6 +83,41 @@ describe ApplicationController, type: :controller do
       end
     end
 
+    context 'with a valid actor that is not an Account' do
+      let(:actor) { WrappedActor.new(author) }
+
+      before do
+        get :success
+
+        fake_request = Request.new(:get, request.url)
+        fake_request.on_behalf_of(author)
+
+        request.headers.merge!(fake_request.headers)
+
+        allow(ActivityPub::TagManager.instance).to receive(:uri_to_actor).with(anything) do
+          actor
+        end
+      end
+
+      describe '#signed_request?' do
+        it 'returns true' do
+          expect(controller.signed_request?).to be true
+        end
+      end
+
+      describe '#signed_request_account' do
+        it 'returns nil' do
+          expect(controller.signed_request_account).to be_nil
+        end
+      end
+
+      describe '#signed_request_actor' do
+        it 'returns the expected actor' do
+          expect(controller.signed_request_actor).to eq actor
+        end
+      end
+    end
+
     context 'with request older than a day' do
       before do
         get :success
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index 1e5620221..b2548d5c0 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -65,22 +65,22 @@ describe ApplicationController, type: :controller do
         get :show
 
         expect_updated_sign_in_at(user)
-        expect(Redis.current.get("account:#{user.account_id}:regeneration")).to eq 'true'
+        expect(redis.get("account:#{user.account_id}:regeneration")).to eq 'true'
         expect(RegenerationWorker).to have_received(:perform_async)
       end
 
       it 'sets the regeneration marker to expire' do
         allow(RegenerationWorker).to receive(:perform_async)
         get :show
-        expect(Redis.current.ttl("account:#{user.account_id}:regeneration")).to be >= 0
+        expect(redis.ttl("account:#{user.account_id}:regeneration")).to be >= 0
       end
 
       it 'regenerates feed when sign in is older than two weeks' do
         get :show
 
         expect_updated_sign_in_at(user)
-        expect(Redis.current.zcard(FeedManager.instance.key(:home, user.account_id))).to eq 3
-        expect(Redis.current.get("account:#{user.account_id}:regeneration")).to be_nil
+        expect(redis.zcard(FeedManager.instance.key(:home, user.account_id))).to eq 3
+        expect(redis.get("account:#{user.account_id}:regeneration")).to be_nil
       end
     end
 
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
new file mode 100644
index 000000000..90f222f49
--- /dev/null
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe Disputes::AppealsController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+  describe '#create' do
+    let(:current_user) { Fabricate(:user) }
+    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+
+    before do
+      allow(AdminMailer).to receive(:new_appeal).and_return(double('email', deliver_later: nil))
+      post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
+    end
+
+    it 'notifies staff about new appeal' do
+      expect(AdminMailer).to have_received(:new_appeal).with(admin.account, Appeal.last)
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(strike.id))
+    end
+  end
+end
diff --git a/spec/controllers/disputes/strikes_controller_spec.rb b/spec/controllers/disputes/strikes_controller_spec.rb
new file mode 100644
index 000000000..157f9ec3c
--- /dev/null
+++ b/spec/controllers/disputes/strikes_controller_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe Disputes::StrikesController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  describe '#show' do
+    let(:current_user) { Fabricate(:user) }
+    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+
+    before do
+      get :show, params: { id: strike.id }
+    end
+
+    context 'when meant for the user' do
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+    end
+
+    context 'when meant for a different user' do
+      let(:strike) { Fabricate(:account_warning) }
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 006274169..ab2e82e85 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe FollowerAccountsController do
   render_views
 
-  let(:alice) { Fabricate(:user).account }
+  let(:alice) { Fabricate(:account) }
   let(:follower0) { Fabricate(:account) }
   let(:follower1) { Fabricate(:account) }
 
@@ -34,27 +34,6 @@ describe FollowerAccountsController do
           expect(response).to have_http_status(403)
         end
       end
-
-      it 'assigns follows' do
-        expect(response).to have_http_status(200)
-
-        assigned = assigns(:follows).to_a
-        expect(assigned.size).to eq 2
-        expect(assigned[0]).to eq follow1
-        expect(assigned[1]).to eq follow0
-      end
-
-      it 'does not assign blocked users' do
-        user = Fabricate(:user)
-        user.account.block!(follower0)
-        sign_in(user)
-
-        expect(response).to have_http_status(200)
-
-        assigned = assigns(:follows).to_a
-        expect(assigned.size).to eq 1
-        expect(assigned[0]).to eq follow1
-      end
     end
 
     context 'when format is json' do
@@ -103,7 +82,7 @@ describe FollowerAccountsController do
 
         context 'when account hides their network' do
           before do
-            alice.user.settings.hide_network = true
+            alice.update(hide_collections: true)
           end
 
           it 'returns followers count' do
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 7ec0e3d06..e43dbf882 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe FollowingAccountsController do
   render_views
 
-  let(:alice) { Fabricate(:user).account }
+  let(:alice) { Fabricate(:account) }
   let(:followee0) { Fabricate(:account) }
   let(:followee1) { Fabricate(:account) }
 
@@ -34,27 +34,6 @@ describe FollowingAccountsController do
           expect(response).to have_http_status(403)
         end
       end
-
-      it 'assigns follows' do
-        expect(response).to have_http_status(200)
-
-        assigned = assigns(:follows).to_a
-        expect(assigned.size).to eq 2
-        expect(assigned[0]).to eq follow1
-        expect(assigned[1]).to eq follow0
-      end
-
-      it 'does not assign blocked users' do
-        user = Fabricate(:user)
-        user.account.block!(followee0)
-        sign_in(user)
-
-        expect(response).to have_http_status(200)
-
-        assigned = assigns(:follows).to_a
-        expect(assigned.size).to eq 1
-        expect(assigned[0]).to eq follow1
-      end
     end
 
     context 'when format is json' do
@@ -103,7 +82,7 @@ describe FollowingAccountsController do
 
         context 'when account hides their network' do
           before do
-            alice.user.settings.hide_network = true
+            alice.update(hide_collections: true)
           end
 
           it 'returns followers count' do
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 70c5c42c5..d845ae01d 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -7,27 +7,21 @@ RSpec.describe HomeController, type: :controller do
     subject { get :index }
 
     context 'when not signed in' do
-      context 'when requested path is tag timeline' do
-        it 'redirects to the tag\'s permalink' do
-          @request.path = '/web/timelines/tag/name'
-          is_expected.to redirect_to '/tags/name'
-        end
-      end
-
-      it 'redirects to about page' do
+      it 'returns http success' do
         @request.path = '/'
-        is_expected.to redirect_to(about_path)
+        is_expected.to have_http_status(:success)
       end
     end
 
     context 'when signed in' do
       let(:user) { Fabricate(:user) }
 
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
-      it 'assigns @body_classes' do
-        subject
-        expect(assigns(:body_classes)).to eq 'app-body'
+      it 'returns http success' do
+        is_expected.to have_http_status(:success)
       end
     end
   end
diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
new file mode 100644
index 000000000..f64a7d2ca
--- /dev/null
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+RSpec.describe InstanceActorsController, type: :controller do
+  describe 'GET #show' do
+    context 'as JSON' do
+      let(:format) { 'json' }
+
+      shared_examples 'shared behavior' do
+        before do
+          get :show, params: { format: format }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns application/activity+json' do
+          expect(response.media_type).to eq 'application/activity+json'
+        end
+
+        it 'does not set cookies' do
+          expect(response.cookies).to be_empty
+          expect(response.headers['Set-Cookies']).to be nil
+        end
+
+        it 'does not set sessions' do
+          expect(session).to be_empty
+        end
+
+        it 'returns public Cache-Control header' do
+          expect(response.headers['Cache-Control']).to include 'public'
+        end
+
+        it 'renders account' do
+          json = body_as_json
+          expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
+        end
+      end
+
+      before do
+        allow(controller).to receive(:authorized_fetch_mode?).and_return(authorized_fetch_mode)
+      end
+
+      context 'without authorized fetch mode' do
+        let(:authorized_fetch_mode) { false }
+        it_behaves_like 'shared behavior'
+      end
+
+      context 'with authorized fetch mode' do
+        let(:authorized_fetch_mode) { true }
+        it_behaves_like 'shared behavior'
+      end
+    end
+  end
+end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 76e617e6b..23b98fb12 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -7,30 +7,30 @@ describe InvitesController do
     sign_in user
   end
 
-  around do |example|
-    min_invite_role = Setting.min_invite_role
-    example.run
-    Setting.min_invite_role = min_invite_role
-  end
-
   describe 'GET #index' do
     subject { get :index }
 
-    let(:user) { Fabricate(:user, moderator: false, admin: false) }
+    let(:user) { Fabricate(:user) }
     let!(:invite) { Fabricate(:invite, user: user) }
 
-    context 'when user is a staff' do
+    context 'when everyone can invite' do
+      before do
+        UserRole.everyone.update(permissions: UserRole.everyone.permissions | UserRole::FLAGS[:invite_users])
+      end
+
       it 'renders index page' do
-        Setting.min_invite_role = 'user'
         expect(subject).to render_template :index
         expect(assigns(:invites)).to include invite
         expect(assigns(:invites).count).to eq 1
       end
     end
 
-    context 'when user is not a staff' do
+    context 'when not everyone can invite' do
+      before do
+        UserRole.everyone.update(permissions: UserRole.everyone.permissions & ~UserRole::FLAGS[:invite_users])
+      end
+
       it 'returns 403' do
-        Setting.min_invite_role = 'modelator'
         expect(subject).to have_http_status 403
       end
     end
@@ -39,8 +39,12 @@ describe InvitesController do
   describe 'POST #create' do
     subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
 
-    context 'when user is an admin' do
-      let(:user) { Fabricate(:user, moderator: false, admin: true) }
+    context 'when everyone can invite' do
+      let(:user) { Fabricate(:user) }
+
+      before do
+        UserRole.everyone.update(permissions: UserRole.everyone.permissions | UserRole::FLAGS[:invite_users])
+      end
 
       it 'succeeds to create a invite' do
         expect { subject }.to change { Invite.count }.by(1)
@@ -49,8 +53,12 @@ describe InvitesController do
       end
     end
 
-    context 'when user is not an admin' do
-      let(:user) { Fabricate(:user, moderator: true, admin: false) }
+    context 'when not everyone can invite' do
+      let(:user) { Fabricate(:user) }
+
+      before do
+        UserRole.everyone.update(permissions: UserRole.everyone.permissions & ~UserRole::FLAGS[:invite_users])
+      end
 
       it 'returns 403' do
         expect(subject).to have_http_status 403
@@ -61,8 +69,8 @@ describe InvitesController do
   describe 'DELETE #create' do
     subject { delete :destroy, params: { id: invite.id } }
 
+    let(:user) { Fabricate(:user) }
     let!(:invite) { Fabricate(:invite, user: user, expires_at: nil) }
-    let(:user) { Fabricate(:user, moderator: false, admin: true) }
 
     it 'expires invite' do
       expect(subject).to redirect_to invites_path
diff --git a/spec/controllers/remote_follow_controller_spec.rb b/spec/controllers/remote_follow_controller_spec.rb
deleted file mode 100644
index 01d43f48c..000000000
--- a/spec/controllers/remote_follow_controller_spec.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe RemoteFollowController do
-  render_views
-
-  describe '#new' do
-    it 'returns success when session is empty' do
-      account = Fabricate(:account)
-      get :new, params: { account_username: account.to_param }
-
-      expect(response).to have_http_status(200)
-      expect(response).to render_template(:new)
-      expect(assigns(:remote_follow).acct).to be_nil
-    end
-
-    it 'populates the remote follow with session data when session exists' do
-      session[:remote_follow] = 'user@example.com'
-      account = Fabricate(:account)
-      get :new, params: { account_username: account.to_param }
-
-      expect(response).to have_http_status(200)
-      expect(response).to render_template(:new)
-      expect(assigns(:remote_follow).acct).to eq 'user@example.com'
-    end
-  end
-
-  describe '#create' do
-    before do
-      @account = Fabricate(:account, username: 'test_user')
-    end
-
-    context 'with a valid acct' do
-      context 'when webfinger values are wrong' do
-        it 'renders new when redirect url is nil' do
-          resource_with_nil_link = double(link: nil)
-          allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_nil_link)
-          post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
-
-          expect(response).to render_template(:new)
-          expect(response.body).to include(I18n.t('remote_follow.missing_resource'))
-        end
-
-        it 'renders new when template is nil' do
-          resource_with_link = double(link: nil)
-          allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
-          post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
-
-          expect(response).to render_template(:new)
-          expect(response.body).to include(I18n.t('remote_follow.missing_resource'))
-        end
-      end
-
-      context 'when webfinger values are good' do
-        before do
-          resource_with_link = double(link: 'http://example.com/follow_me?acct={uri}')
-          allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_return(resource_with_link)
-          post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
-        end
-
-        it 'saves the session' do
-          expect(session[:remote_follow]).to eq 'user@example.com'
-        end
-
-        it 'redirects to the remote location' do
-          expect(response).to redirect_to("http://example.com/follow_me?acct=https%3A%2F%2F#{Rails.configuration.x.local_domain}%2Fusers%2Ftest_user")
-        end
-      end
-    end
-
-    context 'with an invalid acct' do
-      it 'renders new when acct is missing' do
-        post :create, params: { account_username: @account.to_param, remote_follow: { acct: '' } }
-
-        expect(response).to render_template(:new)
-      end
-
-      it 'renders new with error when webfinger fails' do
-        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@example.com').and_raise(Webfinger::Error)
-        post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@example.com' } }
-
-        expect(response).to render_template(:new)
-        expect(response.body).to include(I18n.t('remote_follow.missing_resource'))
-      end
-
-      it 'renders new when occur HTTP::ConnectionError' do
-        allow_any_instance_of(WebfingerHelper).to receive(:webfinger!).with('acct:user@unknown').and_raise(HTTP::ConnectionError)
-        post :create, params: { account_username: @account.to_param, remote_follow: { acct: 'user@unknown' } }
-
-        expect(response).to render_template(:new)
-        expect(response.body).to include(I18n.t('remote_follow.missing_resource'))
-      end
-    end
-  end
-
-  context 'with a permanently suspended account' do
-    before do
-      @account = Fabricate(:account)
-      @account.suspend!
-      @account.deletion_request.destroy
-    end
-
-    it 'returns http gone on GET to #new' do
-      get :new, params: { account_username: @account.to_param }
-
-      expect(response).to have_http_status(410)
-    end
-
-    it 'returns http gone on POST to #create' do
-      post :create, params: { account_username: @account.to_param }
-
-      expect(response).to have_http_status(410)
-    end
-  end
-
-  context 'with a temporarily suspended account' do
-    before do
-      @account = Fabricate(:account)
-      @account.suspend!
-    end
-
-    it 'returns http forbidden on GET to #new' do
-      get :new, params: { account_username: @account.to_param }
-
-      expect(response).to have_http_status(403)
-    end
-
-    it 'returns http forbidden on POST to #create' do
-      post :create, params: { account_username: @account.to_param }
-
-      expect(response).to have_http_status(403)
-    end
-  end
-end
diff --git a/spec/controllers/remote_interaction_controller_spec.rb b/spec/controllers/remote_interaction_controller_spec.rb
deleted file mode 100644
index bb0074b11..000000000
--- a/spec/controllers/remote_interaction_controller_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe RemoteInteractionController, type: :controller do
-  render_views
-
-  let(:status) { Fabricate(:status) }
-
-  describe 'GET #new' do
-    it 'returns 200' do
-      get :new, params: { id: status.id }
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'POST #create' do
-    context '@remote_follow is valid' do
-      it 'returns 302' do
-        allow_any_instance_of(RemoteFollow).to receive(:valid?) { true }
-        allow_any_instance_of(RemoteFollow).to receive(:addressable_template) do
-          Addressable::Template.new('https://hoge.com')
-        end
-
-        post :create, params: { id: status.id, remote_follow: { acct: '@hoge' } }
-        expect(response).to have_http_status(302)
-      end
-    end
-
-    context '@remote_follow is invalid' do
-      it 'returns 200' do
-        allow_any_instance_of(RemoteFollow).to receive(:valid?) { false }
-        post :create, params: { id: status.id, remote_follow: { acct: '@hoge' } }
-
-        expect(response).to have_http_status(200)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 92ab401c9..a94dc042a 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -17,7 +17,7 @@ describe Settings::DeletesController do
       end
 
       context 'when suspended' do
-        let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
+        let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) }
 
         it 'returns http forbidden' do
           get :show
@@ -64,7 +64,7 @@ describe Settings::DeletesController do
         end
 
         context 'when suspended' do
-          let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
+          let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) }
 
           it 'returns http forbidden' do
             expect(response).to have_http_status(403)
@@ -81,20 +81,6 @@ describe Settings::DeletesController do
           expect(response).to redirect_to settings_delete_path
         end
       end
-
-      context 'when account deletions are disabled' do
-        around do |example|
-          open_deletion = Setting.open_deletion
-          example.run
-          Setting.open_deletion = open_deletion
-        end
-
-        it 'redirects' do
-          Setting.open_deletion = false
-          delete :destroy
-          expect(response).to redirect_to root_path
-        end
-      end
     end
 
     context 'when not signed in' do
diff --git a/spec/controllers/settings/exports/bookmarks_controller_specs.rb b/spec/controllers/settings/exports/bookmarks_controller_spec.rb
similarity index 54%
rename from spec/controllers/settings/exports/bookmarks_controller_specs.rb
rename to spec/controllers/settings/exports/bookmarks_controller_spec.rb
index 85761577b..a06c02e0c 100644
--- a/spec/controllers/settings/exports/bookmarks_controller_specs.rb
+++ b/spec/controllers/settings/exports/bookmarks_controller_spec.rb
@@ -3,11 +3,16 @@ require 'rails_helper'
 describe Settings::Exports::BookmarksController do
   render_views
 
-  describe 'GET #index' do
-    it 'returns a csv of the bookmarked toots' do
-      user = Fabricate(:user)
-      user.account.bookmarks.create!(status: Fabricate(:status, uri: 'https://foo.bar/statuses/1312'))
+  let(:user)    { Fabricate(:user) }
+  let(:account) { Fabricate(:account, domain: 'foo.bar') }
+  let(:status)  { Fabricate(:status, account: account, uri: 'https://foo.bar/statuses/1312') }
 
+  describe 'GET #index' do
+    before do
+      user.account.bookmarks.create!(status: status)
+    end
+
+    it 'returns a csv of the bookmarked toots' do
       sign_in user, scope: :user
       get :index, format: :csv
 
diff --git a/spec/controllers/settings/exports/following_accounts_controller_spec.rb b/spec/controllers/settings/exports/following_accounts_controller_spec.rb
index 78858e772..bfe010555 100644
--- a/spec/controllers/settings/exports/following_accounts_controller_spec.rb
+++ b/spec/controllers/settings/exports/following_accounts_controller_spec.rb
@@ -11,7 +11,7 @@ describe Settings::Exports::FollowingAccountsController do
       sign_in user, scope: :user
       get :index, format: :csv
 
-      expect(response.body).to eq "Account address,Show boosts\nusername@domain,true\n"
+      expect(response.body).to eq "Account address,Show boosts,Notify on new posts,Languages\nusername@domain,true,false,\n"
     end
   end
 end
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index 048d9de8d..35c5747a0 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -19,8 +19,7 @@ describe Settings::MigrationsController do
     context 'when user is sign in' do
       subject { get :show }
 
-      let(:user) { Fabricate(:user, account: account) }
-      let(:account) { Fabricate(:account, moved_to_account: moved_to_account) }
+      let(:user) { Fabricate(:account, moved_to_account: moved_to_account).user }
 
       before { sign_in user, scope: :user }
 
diff --git a/spec/controllers/settings/preferences/other_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
index 1b556ac7f..960378a01 100644
--- a/spec/controllers/settings/preferences/other_controller_spec.rb
+++ b/spec/controllers/settings/preferences/other_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Settings::Preferences::OtherController do
   render_views
 
-  let(:user) { Fabricate(:user, filtered_languages: []) }
+  let(:user) { Fabricate(:user, chosen_languages: []) }
 
   before do
     sign_in user, scope: :user
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
index 1ac286254..ee3aec815 100644
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ b/spec/controllers/settings/profiles_controller_spec.rb
@@ -3,9 +3,11 @@ require 'rails_helper'
 RSpec.describe Settings::ProfilesController, type: :controller do
   render_views
 
+  let!(:user) { Fabricate(:user) }
+  let(:account) { user.account }
+
   before do
-    @user = Fabricate(:user)
-    sign_in @user, scope: :user
+    sign_in user, scope: :user
   end
 
   describe "GET #show" do
@@ -16,10 +18,12 @@ RSpec.describe Settings::ProfilesController, type: :controller do
   end
 
   describe 'PUT #update' do
+    before do
+      user.account.update(display_name: 'Old name')
+    end
+
     it 'updates the user profile' do
       allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-      account = Fabricate(:account, user: @user, display_name: 'Old name')
-
       put :update, params: { account: { display_name: 'New name' } }
       expect(account.reload.display_name).to eq 'New name'
       expect(response).to redirect_to(settings_profile_path)
@@ -30,7 +34,6 @@ RSpec.describe Settings::ProfilesController, type: :controller do
   describe 'PUT #update with new profile image' do
     it 'updates profile image' do
       allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-      account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
       expect(account.avatar.instance.avatar_file_name).to be_nil
 
       put :update, params: { account: { avatar: fixture_file_upload('avatar.gif', 'image/gif') } }
@@ -43,7 +46,6 @@ RSpec.describe Settings::ProfilesController, type: :controller do
   describe 'PUT #update with oversized image' do
     it 'gives the user an error message' do
       allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-      account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
       put :update, params: { account: { avatar: fixture_file_upload('4096x4097.png', 'image/png') } }
       expect(response.body).to include('images are not supported')
     end
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 7b86513be..569c8322b 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -22,7 +22,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
     let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: with_otp_secret ? 'oldotpsecret' : nil) }
 
     describe 'GET #new' do
-      context 'when signed in and a new otp secret has been setted in the session' do
+      context 'when signed in and a new otp secret has been set in the session' do
         subject do
           sign_in user, scope: :user
           get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
@@ -36,7 +36,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
         expect(response).to redirect_to('/auth/sign_in')
       end
 
-      it 'redirects if a new otp_secret has not been setted in the session' do
+      it 'redirects if a new otp_secret has not been set in the session' do
         sign_in user, scope: :user
         get :new, session: { challenge_passed_at: Time.now.utc }
         expect(response).to redirect_to('/settings/otp_authentication')
diff --git a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
index 17e8fa9b8..c8ba6f9a8 100644
--- a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
@@ -18,7 +18,7 @@ describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
           user.update(otp_required_for_login: true)
         end
 
-        it 'redirects to two factor authentciation methods list page' do
+        it 'redirects to two factor authentication methods list page' do
           get :show
 
           expect(response).to redirect_to settings_two_factor_authentication_methods_path
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 9986efa51..6ed5d4bbb 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe StatusesController do
   render_views
 
-  shared_examples 'cachable response' do
+  shared_examples 'cacheable response' do
     it 'does not set cookies' do
       expect(response.cookies).to be_empty
       expect(response.headers['Set-Cookies']).to be nil
@@ -108,7 +108,7 @@ describe StatusesController do
           expect(response.headers['Vary']).to eq 'Accept'
         end
 
-        it_behaves_like 'cachable response'
+        it_behaves_like 'cacheable response'
 
         it 'returns Content-Type header' do
           expect(response.headers['Content-Type']).to include 'application/activity+json'
@@ -426,7 +426,7 @@ describe StatusesController do
       let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
       before do
-        allow(controller).to receive(:signed_request_account).and_return(remote_account)
+        allow(controller).to receive(:signed_request_actor).and_return(remote_account)
       end
 
       context 'when account blocks account' do
@@ -496,7 +496,7 @@ describe StatusesController do
             expect(response.headers['Vary']).to eq 'Accept'
           end
 
-          it_behaves_like 'cachable response'
+          it_behaves_like 'cacheable response'
 
           it 'returns Content-Type header' do
             expect(response.headers['Content-Type']).to include 'application/activity+json'
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 69def90cf..547bcfb39 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -14,17 +14,11 @@ RSpec.describe TagsController, type: :controller do
         get :show, params: { id: 'test', max_id: late.id }
         expect(response).to have_http_status(200)
       end
-
-      it 'renders application layout' do
-        get :show, params: { id: 'test', max_id: late.id }
-        expect(response).to render_template layout: 'public'
-      end
     end
 
     context 'when tag does not exist' do
-      it 'returns http missing for non-existent tag' do
+      it 'returns http not found' do
         get :show, params: { id: 'none' }
-
         expect(response).to have_http_status(404)
       end
     end
diff --git a/spec/controllers/well_known/nodeinfo_controller_spec.rb b/spec/controllers/well_known/nodeinfo_controller_spec.rb
index 694bb0fb9..36e85f20d 100644
--- a/spec/controllers/well_known/nodeinfo_controller_spec.rb
+++ b/spec/controllers/well_known/nodeinfo_controller_spec.rb
@@ -27,6 +27,8 @@ describe WellKnown::NodeInfoController, type: :controller do
 
       json = body_as_json
 
+      expect({ "foo" => 0 }).not_to match_json_schema("nodeinfo_2.0")
+      expect(json).to match_json_schema("nodeinfo_2.0")
       expect(json[:version]).to eq '2.0'
       expect(json[:usage]).to be_a Hash
       expect(json[:software]).to be_a Hash
diff --git a/spec/fabricators/access_grant_fabricator.rb b/spec/fabricators/access_grant_fabricator.rb
new file mode 100644
index 000000000..ae1945f2b
--- /dev/null
+++ b/spec/fabricators/access_grant_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator :access_grant, from: 'Doorkeeper::AccessGrant' do
+  application
+  resource_owner_id { Fabricate(:user).id }
+  expires_in 3_600
+  redirect_uri { Doorkeeper.configuration.native_redirect_uri }
+end
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index ab900c5fa..205706532 100644
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -10,4 +10,6 @@ Fabricator(:account) do
   private_key         { private_key }
   suspended_at        { |attrs| attrs[:suspended] ? Time.now.utc : nil }
   silenced_at         { |attrs| attrs[:silenced] ? Time.now.utc : nil }
+  user                { |attrs| attrs[:domain].nil? ? Fabricate.build(:user, account: nil) : nil }
+  discoverable        true
 end
diff --git a/spec/fabricators/account_warning_fabricator.rb b/spec/fabricators/account_warning_fabricator.rb
index db161d446..72fe835d9 100644
--- a/spec/fabricators/account_warning_fabricator.rb
+++ b/spec/fabricators/account_warning_fabricator.rb
@@ -1,5 +1,6 @@
 Fabricator(:account_warning) do
-  account        nil
-  target_account nil
-  text           "MyText"
+  account
+  target_account(fabricator: :account)
+  text { Faker::Lorem.paragraph }
+  action 'suspend'
 end
diff --git a/spec/fabricators/appeal_fabricator.rb b/spec/fabricators/appeal_fabricator.rb
new file mode 100644
index 000000000..339363822
--- /dev/null
+++ b/spec/fabricators/appeal_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:appeal) do
+  strike(fabricator: :account_warning)
+  account { |attrs| attrs[:strike].target_account }
+  text { Faker::Lorem.paragraph }
+end
diff --git a/spec/fabricators/assets/utah_teapot.png b/spec/fabricators/assets/utah_teapot.png
index 6708361e5..ccf202de4 100644
Binary files a/spec/fabricators/assets/utah_teapot.png and b/spec/fabricators/assets/utah_teapot.png differ
diff --git a/spec/fabricators/custom_filter_keyword_fabricator.rb b/spec/fabricators/custom_filter_keyword_fabricator.rb
new file mode 100644
index 000000000..0f101dcd1
--- /dev/null
+++ b/spec/fabricators/custom_filter_keyword_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:custom_filter_keyword) do
+  custom_filter
+  keyword       'discourse'
+end
diff --git a/spec/fabricators/custom_filter_status_fabricator.rb b/spec/fabricators/custom_filter_status_fabricator.rb
new file mode 100644
index 000000000..d082b81c5
--- /dev/null
+++ b/spec/fabricators/custom_filter_status_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:custom_filter_status) do
+  custom_filter
+  status
+end
diff --git a/spec/fabricators/login_activity_fabricator.rb b/spec/fabricators/login_activity_fabricator.rb
index 931d3082c..686fd6483 100644
--- a/spec/fabricators/login_activity_fabricator.rb
+++ b/spec/fabricators/login_activity_fabricator.rb
@@ -1,8 +1,8 @@
 Fabricator(:login_activity) do
   user
-  strategy       'password'
-  success        true
-  failure_reason nil
-  ip             { Faker::Internet.ip_v4_address }
-  user_agent     { Faker::Internet.user_agent }
+  authentication_method 'password'
+  success               true
+  failure_reason        nil
+  ip                    { Faker::Internet.ip_v4_address }
+  user_agent            { Faker::Internet.user_agent }
 end
diff --git a/spec/fabricators/preview_card_fabricator.rb b/spec/fabricators/preview_card_fabricator.rb
new file mode 100644
index 000000000..99b5edc43
--- /dev/null
+++ b/spec/fabricators/preview_card_fabricator.rb
@@ -0,0 +1,7 @@
+Fabricator(:preview_card) do
+  url { Faker::Internet.url }
+  title { Faker::Lorem.sentence }
+  description { Faker::Lorem.paragraph }
+  type 'link'
+  image { attachment_fixture('attachment.jpg') }
+end
diff --git a/spec/fabricators/report_fabricator.rb b/spec/fabricators/report_fabricator.rb
index 5bd4a63f0..2c7101e09 100644
--- a/spec/fabricators/report_fabricator.rb
+++ b/spec/fabricators/report_fabricator.rb
@@ -1,6 +1,6 @@
 Fabricator(:report) do
   account
-  target_account { Fabricate(:account) }
-  comment      "You nasty"
-  action_taken false
+  target_account  { Fabricate(:account) }
+  comment         "You nasty"
+  action_taken_at nil
 end
diff --git a/spec/fabricators/rule_fabricator.rb b/spec/fabricators/rule_fabricator.rb
index 4bdfd05e0..bc29bc48e 100644
--- a/spec/fabricators/rule_fabricator.rb
+++ b/spec/fabricators/rule_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:rule) do
-  priority   ""
-  deleted_at "2021-02-21 05:51:09"
-  text       "MyText"
-end
\ No newline at end of file
+  priority   0
+  deleted_at nil
+  text       { Faker::Lorem.paragraph }
+end
diff --git a/spec/fabricators/status_edit_fabricator.rb b/spec/fabricators/status_edit_fabricator.rb
new file mode 100644
index 000000000..21b793747
--- /dev/null
+++ b/spec/fabricators/status_edit_fabricator.rb
@@ -0,0 +1,7 @@
+Fabricator(:status_edit) do
+  status                    nil
+  account                   nil
+  text                      "MyText"
+  spoiler_text              "MyText"
+  media_attachments_changed false
+end
\ No newline at end of file
diff --git a/spec/fabricators/tag_follow_fabricator.rb b/spec/fabricators/tag_follow_fabricator.rb
new file mode 100644
index 000000000..a2cccb07a
--- /dev/null
+++ b/spec/fabricators/tag_follow_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:tag_follow) do
+  tag
+  account
+end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 8f5956501..10ad2c53a 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:user) do
-  account
+  account      { Fabricate.build(:account, user: nil) }
   email        { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   password     "123456789"
   confirmed_at { Time.zone.now }
diff --git a/spec/fabricators/user_role_fabricator.rb b/spec/fabricators/user_role_fabricator.rb
new file mode 100644
index 000000000..28f76c8c4
--- /dev/null
+++ b/spec/fabricators/user_role_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:user_role) do
+  name        "MyString"
+  color       "MyString"
+  permissions ""
+end
\ No newline at end of file
diff --git a/spec/fabricators/webauthn_credential_fabricator.rb b/spec/fabricators/webauthn_credential_fabricator.rb
index 496a7a735..ba59ce967 100644
--- a/spec/fabricators/webauthn_credential_fabricator.rb
+++ b/spec/fabricators/webauthn_credential_fabricator.rb
@@ -1,7 +1,7 @@
 Fabricator(:webauthn_credential) do
   user_id { Fabricate(:user).id }
   external_id { Base64.urlsafe_encode64(SecureRandom.random_bytes(16)) }
-  public_key { OpenSSL::PKey::EC.new("prime256v1").generate_key.public_key }
+  public_key { OpenSSL::PKey::EC.generate('prime256v1').public_key }
   nickname 'USB key'
   sign_count 0
 end
diff --git a/spec/fabricators/webhook_fabricator.rb b/spec/fabricators/webhook_fabricator.rb
new file mode 100644
index 000000000..fa4f17b55
--- /dev/null
+++ b/spec/fabricators/webhook_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:webhook) do
+  url { Faker::Internet.url }
+  secret { SecureRandom.hex }
+  events { Webhook::EVENTS }
+end
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index b6de3e9d1..ec4f9a53f 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -18,36 +18,16 @@ feature 'Profile' do
     visit account_path('alice')
 
     is_expected.to have_title("alice (@alice@#{local_domain})")
-
-    within('.public-account-header h1') do
-      is_expected.to have_content("alice @alice@#{local_domain}")
-    end
-
-    bio_elem = first('.public-account-bio')
-    expect(bio_elem).to have_content(alice_bio)
-    # The bio has hashtags made clickable
-    expect(bio_elem).to have_link('cryptology')
-    expect(bio_elem).to have_link('science')
-    # Nicknames are make clickable
-    expect(bio_elem).to have_link('@alice')
-    expect(bio_elem).to have_link('@bob')
-    # Nicknames not on server are not clickable
-    expect(bio_elem).not_to have_link('@pepe')
   end
 
   scenario 'I can change my account' do
     visit settings_profile_path
+
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
-    first('.btn[type=submit]').click
+
+    first('button[type=submit]').click
+
     is_expected.to have_content 'Changes successfully saved!'
-
-    # View my own public profile and see the changes
-    click_link "Bob @bob@#{local_domain}"
-
-    within('.public-account-header h1') do
-      is_expected.to have_content("Bob @bob@#{local_domain}")
-    end
-    expect(first('.public-account-bio')).to have_content('Bob is silent')
   end
 end
diff --git a/spec/fixtures/files/domain_allows.csv b/spec/fixtures/files/domain_allows.csv
new file mode 100644
index 000000000..4200ac3f5
--- /dev/null
+++ b/spec/fixtures/files/domain_allows.csv
@@ -0,0 +1,3 @@
+#domain
+good.domain
+better.domain
diff --git a/spec/fixtures/files/domain_blocks.csv b/spec/fixtures/files/domain_blocks.csv
new file mode 100644
index 000000000..28ffb9175
--- /dev/null
+++ b/spec/fixtures/files/domain_blocks.csv
@@ -0,0 +1,4 @@
+#domain,#severity,#reject_media,#reject_reports,#public_comment,#obfuscate
+bad.domain,silence,false,false,bad,false
+worse.domain,suspend,true,true,worse,true
+reject.media,noop,true,false,reject media,false
diff --git a/spec/fixtures/files/emojo.png b/spec/fixtures/files/emojo.png
index cb5993499..6ef0a5fbc 100644
Binary files a/spec/fixtures/files/emojo.png and b/spec/fixtures/files/emojo.png differ
diff --git a/spec/fixtures/files/utf8-followers.txt b/spec/fixtures/files/utf8-followers.txt
new file mode 100644
index 000000000..9d4fe3485
--- /dev/null
+++ b/spec/fixtures/files/utf8-followers.txt
@@ -0,0 +1 @@
+@nare@թութ.հայ
diff --git a/spec/helpers/admin/action_log_helper_spec.rb b/spec/helpers/admin/action_log_helper_spec.rb
index 60f5ecdcc..9d7ed4ab7 100644
--- a/spec/helpers/admin/action_log_helper_spec.rb
+++ b/spec/helpers/admin/action_log_helper_spec.rb
@@ -3,32 +3,4 @@
 require 'rails_helper'
 
 RSpec.describe Admin::ActionLogsHelper, type: :helper do
-  klass = Class.new do
-    include ActionView::Helpers
-    include Admin::ActionLogsHelper
-  end
-
-  let(:hoge) { klass.new }
-
-  describe '#log_target' do
-    after do
-      hoge.log_target(log)
-    end
-
-    context 'log.target' do
-      let(:log) { double(target: true) }
-
-      it 'calls linkable_log_target' do
-        expect(hoge).to receive(:linkable_log_target).with(log.target)
-      end
-    end
-
-    context '!log.target' do
-      let(:log) { double(target: false, target_type: :type, recorded_changes: :change) }
-
-      it 'calls log_target_from_history' do
-        expect(hoge).to receive(:log_target_from_history).with(log.target_type, log.recorded_changes)
-      end
-    end
-  end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index f09e32ecc..1dbd985bf 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -59,13 +59,6 @@ describe ApplicationHelper do
     end
   end
 
-  describe 'favicon_path' do
-    it 'returns /favicon.ico on production enviromnent' do
-      expect(Rails.env).to receive(:production?).and_return(true)
-      expect(helper.favicon_path).to eq '/favicon.ico'
-    end
-  end
-
   describe 'open_registrations?' do
     it 'returns true when open for registrations' do
       without_partial_double_verification do
@@ -120,7 +113,7 @@ describe ApplicationHelper do
       Setting.site_title = site_title
     end
 
-    it 'returns site title on production enviroment' do
+    it 'returns site title on production environment' do
       Setting.site_title = 'site title'
       expect(Rails.env).to receive(:production?).and_return(true)
       expect(helper.title).to eq 'site title'
diff --git a/spec/helpers/formatting_helper_spec.rb b/spec/helpers/formatting_helper_spec.rb
new file mode 100644
index 000000000..af604a87b
--- /dev/null
+++ b/spec/helpers/formatting_helper_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe FormattingHelper, type: :helper do
+  include Devise::Test::ControllerHelpers
+
+  describe '#rss_status_content_format' do
+    let(:status) { Fabricate(:status, text: 'Hello world<>', spoiler_text: 'This is a spoiler<>', poll: Fabricate(:poll, options: %w(Yes<> No))) }
+    let(:html) { helper.rss_status_content_format(status) }
+
+    it 'renders the spoiler text' do
+      expect(html).to include('<p>This is a spoiler&lt;&gt;</p><hr>')
+    end
+
+    it 'renders the status text' do
+      expect(html).to include('<p>Hello world&lt;&gt;</p>')
+    end
+
+    it 'renders the poll' do
+      expect(html).to include('<radio disabled="disabled">Yes&lt;&gt;</radio><br>')
+    end
+  end
+end
diff --git a/spec/helpers/jsonld_helper_spec.rb b/spec/helpers/jsonld_helper_spec.rb
index 883a88b14..744a14f26 100644
--- a/spec/helpers/jsonld_helper_spec.rb
+++ b/spec/helpers/jsonld_helper_spec.rb
@@ -89,4 +89,86 @@ describe JsonLdHelper do
       expect(fetch_resource_without_id_validation('https://host.test/')).to eq({})
     end
   end
+
+  context 'compaction and forwarding' do
+    let(:json) do
+      {
+        '@context' => [
+          'https://www.w3.org/ns/activitystreams',
+          'https://w3id.org/security/v1',
+          {
+            'obsolete' => 'http://ostatus.org#',
+            'convo' => 'obsolete:conversation',
+            'new' => 'https://obscure-unreleased-test.joinmastodon.org/#',
+          },
+        ],
+        'type' => 'Create',
+        'to' => ['https://www.w3.org/ns/activitystreams#Public'],
+        'object' => {
+          'id' => 'https://example.com/status',
+          'type' => 'Note',
+          'inReplyTo' => nil,
+          'convo' => 'https://example.com/conversation',
+          'tag' => [
+            {
+              'type' => 'Mention',
+              'href' => ['foo'],
+            }
+          ],
+        },
+        'signature' => {
+          'type' => 'RsaSignature2017',
+          'created' => '2022-02-02T12:00:00Z',
+          'creator' => 'https://example.com/actor#main-key',
+          'signatureValue' => 'some-sig',
+        },
+      }
+    end
+
+    describe '#compact' do
+      it 'properly compacts JSON-LD with alternative context definitions' do
+        expect(compact(json).dig('object', 'conversation')).to eq 'https://example.com/conversation'
+      end
+
+      it 'compacts single-item arrays' do
+        expect(compact(json).dig('object', 'tag', 'href')).to eq 'foo'
+      end
+
+      it 'compacts the activistreams Public collection' do
+        expect(compact(json)['to']).to eq 'as:Public'
+      end
+
+      it 'properly copies signature' do
+        expect(compact(json)['signature']).to eq json['signature']
+      end
+    end
+
+    describe 'patch_for_forwarding!' do
+      it 'properly patches incompatibilities' do
+        json['object'].delete('convo')
+        compacted = compact(json)
+        patch_for_forwarding!(json, compacted)
+        expect(compacted['to']).to eq ['https://www.w3.org/ns/activitystreams#Public']
+        expect(compacted.dig('object', 'tag', 0, 'href')).to eq ['foo']
+        expect(safe_for_forwarding?(json, compacted)).to eq true
+      end
+    end
+
+    describe 'safe_for_forwarding?' do
+      it 'deems a safe compacting as such' do
+        json['object'].delete('convo')
+        compacted = compact(json)
+        deemed_compatible = patch_for_forwarding!(json, compacted)
+        expect(compacted['to']).to eq ['https://www.w3.org/ns/activitystreams#Public']
+        expect(safe_for_forwarding?(json, compacted)).to eq true
+      end
+
+      it 'deems an unsafe compacting as such' do
+        compacted = compact(json)
+        deemed_compatible = patch_for_forwarding!(json, compacted)
+        expect(compacted['to']).to eq ['https://www.w3.org/ns/activitystreams#Public']
+        expect(safe_for_forwarding?(json, compacted)).to eq false
+      end
+    end
+  end
 end
diff --git a/spec/helpers/languages_helper_spec.rb b/spec/helpers/languages_helper_spec.rb
index 6db617824..217c9b239 100644
--- a/spec/helpers/languages_helper_spec.rb
+++ b/spec/helpers/languages_helper_spec.rb
@@ -3,15 +3,21 @@
 require 'rails_helper'
 
 describe LanguagesHelper do
-  describe 'the HUMAN_LOCALES constant' do
-    it 'includes all I18n locales' do
-      expect(described_class::HUMAN_LOCALES.keys).to include(*I18n.available_locales)
+  describe 'the SUPPORTED_LOCALES constant' do
+    it 'includes all i18n locales' do
+      expect(Set.new(described_class::SUPPORTED_LOCALES.keys + described_class::REGIONAL_LOCALE_NAMES.keys)).to include(*I18n.available_locales)
     end
   end
 
-  describe 'human_locale' do
-    it 'finds the human readable local description from a key' do
-      expect(helper.human_locale(:en)).to eq('English')
+  describe 'native_locale_name' do
+    it 'finds the human readable native name from a key' do
+      expect(helper.native_locale_name(:de)).to eq('Deutsch')
+    end
+  end
+
+  describe 'standard_locale_name' do
+    it 'finds the human readable standard name from a key' do
+      expect(helper.standard_locale_name(:de)).to eq('German')
     end
   end
 end
diff --git a/spec/lib/activitypub/activity/accept_spec.rb b/spec/lib/activitypub/activity/accept_spec.rb
index 883bab6ac..304cf2208 100644
--- a/spec/lib/activitypub/activity/accept_spec.rb
+++ b/spec/lib/activitypub/activity/accept_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe ActivityPub::Activity::Accept do
     subject { described_class.new(json, sender) }
 
     before do
+      allow(RemoteAccountRefreshWorker).to receive(:perform_async)
       Fabricate(:follow_request, account: recipient, target_account: sender)
       subject.perform
     end
@@ -34,6 +35,10 @@ RSpec.describe ActivityPub::Activity::Accept do
     it 'removes the follow request' do
       expect(recipient.requested?(sender)).to be false
     end
+
+    it 'queues a refresh' do
+      expect(RemoteAccountRefreshWorker).to have_received(:perform_async).with(sender.id)
+    end
   end
 
   context 'given a relay' do
diff --git a/spec/lib/activitypub/activity/add_spec.rb b/spec/lib/activitypub/activity/add_spec.rb
index 16db71c88..e6408b610 100644
--- a/spec/lib/activitypub/activity/add_spec.rb
+++ b/spec/lib/activitypub/activity/add_spec.rb
@@ -1,8 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Add do
-  let(:sender) { Fabricate(:account, featured_collection_url: 'https://example.com/featured') }
-  let(:status) { Fabricate(:status, account: sender) }
+  let(:sender) { Fabricate(:account, featured_collection_url: 'https://example.com/featured', domain: 'example.com') }
+  let(:status) { Fabricate(:status, account: sender, visibility: :private) }
 
   let(:json) do
     {
@@ -24,6 +24,8 @@ RSpec.describe ActivityPub::Activity::Add do
     end
 
     context 'when status was not known before' do
+      let(:service_stub) { double }
+
       let(:json) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
@@ -36,12 +38,40 @@ RSpec.describe ActivityPub::Activity::Add do
       end
 
       before do
-        stub_request(:get, 'https://example.com/unknown').to_return(status: 410)
+        allow(ActivityPub::FetchRemoteStatusService).to receive(:new).and_return(service_stub)
       end
 
-      it 'fetches the status' do
-        subject.perform
-        expect(a_request(:get, 'https://example.com/unknown')).to have_been_made.at_least_once
+      context 'when there is a local follower' do
+        before do
+          account = Fabricate(:account)
+          account.follow!(sender)
+        end
+
+        it 'fetches the status and pins it' do
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil|
+            expect(uri).to eq 'https://example.com/unknown'
+            expect(id).to eq true
+            expect(on_behalf_of&.following?(sender)).to eq true
+            status
+          end
+          subject.perform
+          expect(service_stub).to have_received(:call)
+          expect(sender.pinned?(status)).to be true
+        end
+      end
+
+      context 'when there is no local follower' do
+        it 'tries to fetch the status' do
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil|
+            expect(uri).to eq 'https://example.com/unknown'
+            expect(id).to eq true
+            expect(on_behalf_of).to eq nil
+            nil
+          end
+          subject.perform
+          expect(service_stub).to have_received(:call)
+          expect(sender.pinned?(status)).to be false
+        end
       end
     end
   end
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index b93fcbe66..e9cd6c68c 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -113,7 +113,13 @@ RSpec.describe ActivityPub::Activity::Announce do
       let!(:relay_account) { Fabricate(:account, inbox_url: 'https://relay.example.com/inbox') }
       let!(:relay) { Fabricate(:relay, inbox_url: 'https://relay.example.com/inbox') }
 
-      subject { described_class.new(json, sender, relayed_through_account: relay_account) }
+      let(:object_json) { 'https://example.com/actor/hello-world' }
+
+      subject { described_class.new(json, sender, relayed_through_actor: relay_account) }
+
+      before do
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+      end
 
       context 'and the relay is enabled' do
         before do
@@ -121,18 +127,9 @@ RSpec.describe ActivityPub::Activity::Announce do
           subject.perform
         end
 
-        let(:object_json) do
-          {
-            id: 'https://example.com/actor#bar',
-            type: 'Note',
-            content: 'Lorem ipsum',
-            to: 'http://example.com/followers',
-            attributedTo: 'https://example.com/actor',
-          }
-        end
-
-        it 'creates a reblog by sender of status' do
-          expect(sender.statuses.count).to eq 2
+        it 'fetches the remote status' do
+          expect(a_request(:get, 'https://example.com/actor/hello-world')).to have_been_made
+          expect(Status.find_by(uri: 'https://example.com/actor/hello-world').text).to eq 'Hello world'
         end
       end
 
@@ -141,14 +138,9 @@ RSpec.describe ActivityPub::Activity::Announce do
           subject.perform
         end
 
-        let(:object_json) do
-          {
-            id: 'https://example.com/actor#bar',
-            type: 'Note',
-            content: 'Lorem ipsum',
-            to: 'http://example.com/followers',
-            attributedTo: 'https://example.com/actor',
-          }
+        it 'does not fetch the remote status' do
+          expect(a_request(:get, 'https://example.com/actor/hello-world')).not_to have_been_made
+          expect(Status.find_by(uri: 'https://example.com/actor/hello-world')).to be_nil
         end
 
         it 'does not create anything' do
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 2703c18f3..1a25395fa 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -29,6 +29,58 @@ RSpec.describe ActivityPub::Activity::Create do
         subject.perform
       end
 
+      context 'object has been edited' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            published: '2022-01-22T15:00:00Z',
+            updated: '2022-01-22T16:00:00Z',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.text).to eq 'Lorem ipsum'
+        end
+
+        it 'marks status as edited' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.edited?).to eq true
+        end
+      end
+
+      context 'object has update date equal to creation date' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            published: '2022-01-22T15:00:00Z',
+            updated: '2022-01-22T15:00:00Z',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.text).to eq 'Lorem ipsum'
+        end
+
+        it 'does not mark status as edited' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.edited?).to eq false
+        end
+      end
+
       context 'unknown object type' do
         let(:object_json) do
           {
diff --git a/spec/lib/activitypub/activity/flag_spec.rb b/spec/lib/activitypub/activity/flag_spec.rb
index ec7359f2f..2f2d13876 100644
--- a/spec/lib/activitypub/activity/flag_spec.rb
+++ b/spec/lib/activitypub/activity/flag_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Flag do
-  let(:sender)  { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
+  let(:sender)  { Fabricate(:account, username: 'example.com', domain: 'example.com', uri: 'http://example.com/actor') }
   let(:flagged) { Fabricate(:account) }
   let(:status)  { Fabricate(:status, account: flagged, uri: 'foobar') }
   let(:flag_id) { nil }
@@ -23,16 +23,88 @@ RSpec.describe ActivityPub::Activity::Flag do
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    before do
-      subject.perform
+    context 'when the reported status is public' do
+      before do
+        subject.perform
+      end
+
+      it 'creates a report' do
+        report = Report.find_by(account: sender, target_account: flagged)
+
+        expect(report).to_not be_nil
+        expect(report.comment).to eq 'Boo!!'
+        expect(report.status_ids).to eq [status.id]
+      end
     end
 
-    it 'creates a report' do
-      report = Report.find_by(account: sender, target_account: flagged)
+    context 'when the reported status is private and should not be visible to the remote server' do
+      let(:status) { Fabricate(:status, account: flagged, uri: 'foobar', visibility: :private) }
 
-      expect(report).to_not be_nil
-      expect(report.comment).to eq 'Boo!!'
-      expect(report.status_ids).to eq [status.id]
+      before do
+        subject.perform
+      end
+
+      it 'creates a report with no attached status' do
+        report = Report.find_by(account: sender, target_account: flagged)
+
+        expect(report).to_not be_nil
+        expect(report.comment).to eq 'Boo!!'
+        expect(report.status_ids).to eq []
+      end
+    end
+
+    context 'when the reported status is private and the author has a follower on the remote instance' do
+      let(:status) { Fabricate(:status, account: flagged, uri: 'foobar', visibility: :private) }
+      let(:follower) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/users/account') }
+
+      before do
+        follower.follow!(flagged)
+        subject.perform
+      end
+
+      it 'creates a report with the attached status' do
+        report = Report.find_by(account: sender, target_account: flagged)
+
+        expect(report).to_not be_nil
+        expect(report.comment).to eq 'Boo!!'
+        expect(report.status_ids).to eq [status.id]
+      end
+    end
+
+    context 'when the reported status is private and the author mentions someone else on the remote instance' do
+      let(:status) { Fabricate(:status, account: flagged, uri: 'foobar', visibility: :private) }
+      let(:mentioned) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/users/account') }
+
+      before do
+        status.mentions.create(account: mentioned)
+        subject.perform
+      end
+
+      it 'creates a report with the attached status' do
+        report = Report.find_by(account: sender, target_account: flagged)
+
+        expect(report).to_not be_nil
+        expect(report.comment).to eq 'Boo!!'
+        expect(report.status_ids).to eq [status.id]
+      end
+    end
+
+    context 'when the reported status is private and the author mentions someone else on the local instance' do
+      let(:status) { Fabricate(:status, account: flagged, uri: 'foobar', visibility: :private) }
+      let(:mentioned) { Fabricate(:account) }
+
+      before do
+        status.mentions.create(account: mentioned)
+        subject.perform
+      end
+
+      it 'creates a report with no attached status' do
+        report = Report.find_by(account: sender, target_account: flagged)
+
+        expect(report).to_not be_nil
+        expect(report.comment).to eq 'Boo!!'
+        expect(report.status_ids).to eq []
+      end
     end
   end
 
diff --git a/spec/lib/activitypub/activity/move_spec.rb b/spec/lib/activitypub/activity/move_spec.rb
index 2d1d276c5..c468fdeff 100644
--- a/spec/lib/activitypub/activity/move_spec.rb
+++ b/spec/lib/activitypub/activity/move_spec.rb
@@ -84,9 +84,9 @@ RSpec.describe ActivityPub::Activity::Move do
 
     context 'when a Move has been recently processed' do
       around do |example|
-        Redis.current.set("move_in_progress:#{old_account.id}", true, nx: true, ex: 7.days.seconds)
+        redis.set("move_in_progress:#{old_account.id}", true, nx: true, ex: 7.days.seconds)
         example.run
-        Redis.current.del("move_in_progress:#{old_account.id}")
+        redis.del("move_in_progress:#{old_account.id}")
       end
 
       it 'does not set moved account on old account' do
diff --git a/spec/lib/activitypub/activity/update_spec.rb b/spec/lib/activitypub/activity/update_spec.rb
index 1c9bcf43b..4cd853af2 100644
--- a/spec/lib/activitypub/activity/update_spec.rb
+++ b/spec/lib/activitypub/activity/update_spec.rb
@@ -4,43 +4,97 @@ RSpec.describe ActivityPub::Activity::Update do
   let!(:sender) { Fabricate(:account) }
 
   before do
-    stub_request(:get, actor_json[:outbox]).to_return(status: 404)
-    stub_request(:get, actor_json[:followers]).to_return(status: 404)
-    stub_request(:get, actor_json[:following]).to_return(status: 404)
-    stub_request(:get, actor_json[:featured]).to_return(status: 404)
-
     sender.update!(uri: ActivityPub::TagManager.instance.uri_for(sender))
   end
 
-  let(:modified_sender) do
-    sender.tap do |modified_sender|
-      modified_sender.display_name = 'Totally modified now'
-    end
-  end
-
-  let(:actor_json) do
-    ActiveModelSerializers::SerializableResource.new(modified_sender, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter).as_json
-  end
-
-  let(:json) do
-    {
-      '@context': 'https://www.w3.org/ns/activitystreams',
-      id: 'foo',
-      type: 'Update',
-      actor: ActivityPub::TagManager.instance.uri_for(sender),
-      object: actor_json,
-    }.with_indifferent_access
-  end
+  subject { described_class.new(json, sender) }
 
   describe '#perform' do
-    subject { described_class.new(json, sender) }
+    context 'with an Actor object' do
+      let(:modified_sender) do
+        sender.tap do |modified_sender|
+          modified_sender.display_name = 'Totally modified now'
+        end
+      end
 
-    before do
-      subject.perform
+      let(:actor_json) do
+        ActiveModelSerializers::SerializableResource.new(modified_sender, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter).as_json
+      end
+
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Update',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: actor_json,
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, actor_json[:outbox]).to_return(status: 404)
+        stub_request(:get, actor_json[:followers]).to_return(status: 404)
+        stub_request(:get, actor_json[:following]).to_return(status: 404)
+        stub_request(:get, actor_json[:featured]).to_return(status: 404)
+
+        subject.perform
+      end
+
+      it 'updates profile' do
+        expect(sender.reload.display_name).to eq 'Totally modified now'
+      end
     end
 
-    it 'updates profile' do
-      expect(sender.reload.display_name).to eq 'Totally modified now'
+    context 'with a Question object' do
+      let!(:at_time) { Time.now.utc }
+      let!(:status) { Fabricate(:status, account: sender, poll: Poll.new(account: sender, options: %w(Bar Baz), cached_tallies: [0, 0], expires_at: at_time + 5.days)) }
+
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Update',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: {
+            type: 'Question',
+            id: ActivityPub::TagManager.instance.uri_for(status),
+            content: 'Foo',
+            endTime: (at_time + 5.days).iso8601,
+            oneOf: [
+              {
+                type: 'Note',
+                name: 'Bar',
+                replies: {
+                  type: 'Collection',
+                  totalItems: 0,
+                },
+              },
+
+              {
+                type: 'Note',
+                name: 'Baz',
+                replies: {
+                  type: 'Collection',
+                  totalItems: 12,
+                },
+              },
+            ],
+          },
+        }.with_indifferent_access
+      end
+
+      before do
+        status.update!(uri: ActivityPub::TagManager.instance.uri_for(status))
+        subject.perform
+      end
+
+      it 'updates poll numbers' do
+        expect(status.preloadable_poll.cached_tallies).to eq [0, 12]
+      end
+
+      it 'does not set status as edited' do
+        expect(status.edited_at).to be_nil
+      end
     end
   end
 end
diff --git a/spec/lib/activitypub/dereferencer_spec.rb b/spec/lib/activitypub/dereferencer_spec.rb
index ce30513d7..e50b497c7 100644
--- a/spec/lib/activitypub/dereferencer_spec.rb
+++ b/spec/lib/activitypub/dereferencer_spec.rb
@@ -4,10 +4,10 @@ RSpec.describe ActivityPub::Dereferencer do
   describe '#object' do
     let(:object) { { '@context': 'https://www.w3.org/ns/activitystreams', id: 'https://example.com/foo', type: 'Note', content: 'Hoge' } }
     let(:permitted_origin) { 'https://example.com' }
-    let(:signature_account) { nil }
+    let(:signature_actor) { nil }
     let(:uri) { nil }
 
-    subject { described_class.new(uri, permitted_origin: permitted_origin, signature_account: signature_account).object }
+    subject { described_class.new(uri, permitted_origin: permitted_origin, signature_actor: signature_actor).object }
 
     before do
       stub_request(:get, 'https://example.com/foo').to_return(body: Oj.dump(object), headers: { 'Content-Type' => 'application/activity+json' })
@@ -21,7 +21,7 @@ RSpec.describe ActivityPub::Dereferencer do
       end
 
       context 'with signature account' do
-        let(:signature_account) { Fabricate(:account) }
+        let(:signature_actor) { Fabricate(:account) }
 
         it 'makes signed request' do
           subject
@@ -52,7 +52,7 @@ RSpec.describe ActivityPub::Dereferencer do
       end
 
       context 'with signature account' do
-        let(:signature_account) { Fabricate(:account) }
+        let(:signature_actor) { Fabricate(:account) }
 
         it 'makes signed request' do
           subject
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index 2222c46fb..d55a7c7fa 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
     stub_jsonld_contexts!
   end
 
-  describe '#verify_account!' do
+  describe '#verify_actor!' do
     context 'when signature matches' do
       let(:raw_signature) do
         {
@@ -32,7 +32,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
       let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
 
       it 'returns creator' do
-        expect(subject.verify_account!).to eq sender
+        expect(subject.verify_actor!).to eq sender
       end
     end
 
@@ -40,7 +40,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
       let(:signature) { nil }
 
       it 'returns nil' do
-        expect(subject.verify_account!).to be_nil
+        expect(subject.verify_actor!).to be_nil
       end
     end
 
@@ -55,7 +55,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
       let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => 's69F3mfddd99dGjmvjdjjs81e12jn121Gkm1') }
 
       it 'returns nil' do
-        expect(subject.verify_account!).to be_nil
+        expect(subject.verify_actor!).to be_nil
       end
     end
   end
@@ -73,14 +73,14 @@ RSpec.describe ActivityPub::LinkedDataSignature do
     end
 
     it 'can be verified again' do
-      expect(described_class.new(subject).verify_account!).to eq sender
+      expect(described_class.new(subject).verify_actor!).to eq sender
     end
   end
 
-  def sign(from_account, options, document)
+  def sign(from_actor, options, document)
     options_hash   = Digest::SHA256.hexdigest(canonicalize(options.merge('@context' => ActivityPub::LinkedDataSignature::CONTEXT)))
     document_hash  = Digest::SHA256.hexdigest(canonicalize(document))
     to_be_verified = options_hash + document_hash
-    Base64.strict_encode64(from_account.keypair.sign(OpenSSL::Digest.new('SHA256'), to_be_verified))
+    Base64.strict_encode64(from_actor.keypair.sign(OpenSSL::Digest.new('SHA256'), to_be_verified))
   end
 end
diff --git a/spec/lib/delivery_failure_tracker_spec.rb b/spec/lib/delivery_failure_tracker_spec.rb
index 52a1a92f0..c8179ebd9 100644
--- a/spec/lib/delivery_failure_tracker_spec.rb
+++ b/spec/lib/delivery_failure_tracker_spec.rb
@@ -22,7 +22,7 @@ describe DeliveryFailureTracker do
 
   describe '#track_failure!' do
     it 'marks URL as unavailable after 7 days of being called' do
-      6.times { |i| Redis.current.sadd('exhausted_deliveries:example.com', i) }
+      6.times { |i| redis.sadd('exhausted_deliveries:example.com', i) }
       subject.track_failure!
 
       expect(subject.days).to eq 7
diff --git a/spec/lib/emoji_formatter_spec.rb b/spec/lib/emoji_formatter_spec.rb
new file mode 100644
index 000000000..e1747bdd9
--- /dev/null
+++ b/spec/lib/emoji_formatter_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+RSpec.describe EmojiFormatter do
+  let!(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
+
+  def preformat_text(str)
+    TextFormatter.new(str).to_s
+  end
+
+  describe '#to_s' do
+    subject { described_class.new(text, emojis).to_s }
+
+    let(:emojis) { [emoji] }
+
+    context 'given text that is not marked as html-safe' do
+      let(:text) { 'Foo' }
+
+      it 'raises an argument error' do
+        expect { subject }.to raise_error ArgumentError
+      end
+    end
+
+    context 'given text with an emoji shortcode at the start' do
+      let(:text) { preformat_text(':coolcat: Beep boop') }
+
+      it 'converts the shortcode to an image tag' do
+        is_expected.to match(/<img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+      end
+    end
+
+    context 'given text with an emoji shortcode in the middle' do
+      let(:text) { preformat_text('Beep :coolcat: boop') }
+
+      it 'converts the shortcode to an image tag' do
+        is_expected.to match(/Beep <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+      end
+    end
+
+    context 'given text with concatenated emoji shortcodes' do
+      let(:text) { preformat_text(':coolcat::coolcat:') }
+
+      it 'does not touch the shortcodes' do
+        is_expected.to match(/:coolcat::coolcat:/)
+      end
+    end
+
+    context 'given text with an emoji shortcode at the end' do
+      let(:text) { preformat_text('Beep boop :coolcat:') }
+
+      it 'converts the shortcode to an image tag' do
+        is_expected.to match(/boop <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+      end
+    end
+  end
+end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 0df85e5bc..0f3b05e5a 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -128,36 +128,16 @@ RSpec.describe FeedManager do
         expect(FeedManager.instance.filter?(:home, reblog, alice)).to be true
       end
 
-      context 'for irreversibly muted phrases' do
-        it 'considers word boundaries when matching' do
-          alice.custom_filters.create!(phrase: 'bob', context: %w(home), irreversible: true)
-          alice.follow!(jeff)
-          status = Fabricate(:status, text: 'bobcats', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice)).to be_falsy
-        end
+      it 'returns true for German post when follow is set to English only' do
+        alice.follow!(bob, languages: %w(en))
+        status = Fabricate(:status, text: 'Hallo Welt', account: bob, language: 'de')
+        expect(FeedManager.instance.filter?(:home, status, alice)).to be true
+      end
 
-        it 'returns true if phrase is contained' do
-          alice.custom_filters.create!(phrase: 'farts', context: %w(home public), irreversible: true)
-          alice.custom_filters.create!(phrase: 'pop tarts', context: %w(home), irreversible: true)
-          alice.follow!(jeff)
-          status = Fabricate(:status, text: 'i sure like POP TARts', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
-        end
-
-        it 'matches substrings if whole_word is false' do
-          alice.custom_filters.create!(phrase: 'take', context: %w(home), whole_word: false, irreversible: true)
-          alice.follow!(jeff)
-          status = Fabricate(:status, text: 'shiitake', account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
-        end
-
-        it 'returns true if phrase is contained in a poll option' do
-          alice.custom_filters.create!(phrase: 'farts', context: %w(home public), irreversible: true)
-          alice.custom_filters.create!(phrase: 'pop tarts', context: %w(home), irreversible: true)
-          alice.follow!(jeff)
-          status = Fabricate(:status, text: 'what do you prefer', poll: Fabricate(:poll, options: %w(farts POP TARts)), account: jeff)
-          expect(FeedManager.instance.filter?(:home, status, alice)).to be true
-        end
+      it 'returns false for German post when follow is set to German' do
+        alice.follow!(bob, languages: %w(de))
+        status = Fabricate(:status, text: 'Hallo Welt', account: bob, language: 'de')
+        expect(FeedManager.instance.filter?(:home, status, alice)).to be false
       end
     end
 
@@ -195,11 +175,11 @@ RSpec.describe FeedManager do
       account = Fabricate(:account)
       status = Fabricate(:status)
       members = FeedManager::MAX_ITEMS.times.map { |count| [count, count] }
-      Redis.current.zadd("feed:home:#{account.id}", members)
+      redis.zadd("feed:home:#{account.id}", members)
 
       FeedManager.instance.push_to_home(account, status)
 
-      expect(Redis.current.zcard("feed:home:#{account.id}")).to eq FeedManager::MAX_ITEMS
+      expect(redis.zcard("feed:home:#{account.id}")).to eq FeedManager::MAX_ITEMS
     end
 
     context 'reblogs' do
@@ -424,7 +404,7 @@ RSpec.describe FeedManager do
 
       FeedManager.instance.merge_into_home(account, reblog.account)
 
-      expect(Redis.current.zscore("feed:home:0", reblog.id)).to eq nil
+      expect(redis.zscore("feed:home:0", reblog.id)).to eq nil
     end
   end
 
@@ -440,13 +420,13 @@ RSpec.describe FeedManager do
       FeedManager.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to include(status.id.to_s)
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to include(status.id.to_s)
 
       FeedManager.instance.unpush_from_home(receiver, status)
 
       # Restore original status
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to_not include(status.id.to_s)
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to include(reblogged.id.to_s)
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to_not include(status.id.to_s)
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to include(reblogged.id.to_s)
     end
 
     it 'removes a reblogged status if it was only reblogged once' do
@@ -456,11 +436,11 @@ RSpec.describe FeedManager do
       FeedManager.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [status.id.to_s]
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [status.id.to_s]
 
       FeedManager.instance.unpush_from_home(receiver, status)
 
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to be_empty
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to be_empty
     end
 
     it 'leaves a multiply-reblogged status if another reblog was in feed' do
@@ -472,13 +452,13 @@ RSpec.describe FeedManager do
       end
 
       # The reblogging status should show up under normal conditions.
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.first.id.to_s]
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.first.id.to_s]
 
       reblogs[0...-1].each do |reblog|
         FeedManager.instance.unpush_from_home(receiver, reblog)
       end
 
-      expect(Redis.current.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.last.id.to_s]
+      expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.last.id.to_s]
     end
 
     it 'sends push updates' do
@@ -486,11 +466,11 @@ RSpec.describe FeedManager do
 
       FeedManager.instance.push_to_home(receiver, status)
 
-      allow(Redis.current).to receive_messages(publish: nil)
+      allow(redis).to receive_messages(publish: nil)
       FeedManager.instance.unpush_from_home(receiver, status)
 
       deletion = Oj.dump(event: :delete, payload: status.id.to_s)
-      expect(Redis.current).to have_received(:publish).with("timeline:#{receiver.id}", deletion)
+      expect(redis).to have_received(:publish).with("timeline:#{receiver.id}", deletion)
     end
   end
 
@@ -508,14 +488,14 @@ RSpec.describe FeedManager do
 
     before do
       [status_1, status_3, status_5, status_6, status_7].each do |status|
-        Redis.current.zadd("feed:home:#{account.id}", status.id, status.id)
+        redis.zadd("feed:home:#{account.id}", status.id, status.id)
       end
     end
 
     it 'correctly cleans the home timeline' do
       FeedManager.instance.clear_from_home(account, target_account)
 
-      expect(Redis.current.zrange("feed:home:#{account.id}", 0, -1)).to eq [status_1.id.to_s, status_7.id.to_s]
+      expect(redis.zrange("feed:home:#{account.id}", 0, -1)).to eq [status_1.id.to_s, status_7.id.to_s]
     end
   end
 end
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
deleted file mode 100644
index 5c88a2569..000000000
--- a/spec/lib/formatter_spec.rb
+++ /dev/null
@@ -1,626 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Formatter do
-  let(:local_account)  { Fabricate(:account, domain: nil, username: 'alice') }
-  let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') }
-
-  shared_examples 'encode and link URLs' do
-    context 'given a stand-alone medium URL' do
-      let(:text) { 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"'
-      end
-    end
-
-    context 'given a stand-alone google URL' do
-      let(:text) { 'http://google.com' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="http://google.com"'
-      end
-    end
-
-    context 'given a stand-alone URL with a newer TLD' do
-      let(:text) { 'http://example.gay' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="http://example.gay"'
-      end
-    end
-
-    context 'given a stand-alone IDN URL' do
-      let(:text) { 'https://nic.みんな/' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://nic.みんな/"'
-      end
-
-      it 'has display URL' do
-        is_expected.to include '<span class="">nic.みんな/</span>'
-      end
-    end
-
-    context 'given a URL with a trailing period' do
-      let(:text) { 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ' }
-
-      it 'matches the full URL but not the period' do
-        is_expected.to include 'href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"'
-      end
-    end
-
-    context 'given a URL enclosed with parentheses' do
-      let(:text) { '(http://google.com/)' }
-
-      it 'matches the full URL but not the parentheses' do
-        is_expected.to include 'href="http://google.com/"'
-      end
-    end
-
-    context 'given a URL with a trailing exclamation point' do
-      let(:text) { 'http://www.google.com!' }
-
-      it 'matches the full URL but not the exclamation point' do
-        is_expected.to include 'href="http://www.google.com"'
-      end
-    end
-
-    context 'given a URL with a trailing single quote' do
-      let(:text) { "http://www.google.com'" }
-
-      it 'matches the full URL but not the single quote' do
-        is_expected.to include 'href="http://www.google.com"'
-      end
-    end
-
-    context 'given a URL with a trailing angle bracket' do
-      let(:text) { 'http://www.google.com>' }
-
-      it 'matches the full URL but not the angle bracket' do
-        is_expected.to include 'href="http://www.google.com"'
-      end
-    end
-
-    context 'given a URL with a query string' do
-      context 'with escaped unicode character' do
-        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
-
-        it 'matches the full URL' do
-          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&amp;q=autolink"'
-        end
-      end
-
-      context 'with unicode character' do
-        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓&q=autolink' }
-
-        it 'matches the full URL' do
-          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓&amp;q=autolink"'
-        end
-      end
-
-      context 'with unicode character at the end' do
-        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓' }
-
-        it 'matches the full URL' do
-          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓"'
-        end
-      end
-
-      context 'with escaped and not escaped unicode characters' do
-        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&utf81=✓&q=autolink' }
-
-        it 'preserves escaped unicode characters' do
-          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&amp;utf81=✓&amp;q=autolink"'
-        end
-      end
-    end
-
-    context 'given a URL with parentheses in it' do
-      let(:text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
-      end
-    end
-
-    context 'given a URL in quotation marks' do
-      let(:text) { '"https://example.com/"' }
-
-      it 'does not match the quotation marks' do
-        is_expected.to include 'href="https://example.com/"'
-      end
-    end
-
-    context 'given a URL in angle brackets' do
-      let(:text) { '<https://example.com/>' }
-
-      it 'does not match the angle brackets' do
-        is_expected.to include 'href="https://example.com/"'
-      end
-    end
-
-    context 'given a URL with Japanese path string' do
-      let(:text) { 'https://ja.wikipedia.org/wiki/日本' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://ja.wikipedia.org/wiki/日本"'
-      end
-    end
-
-    context 'given a URL with Korean path string' do
-      let(:text) { 'https://ko.wikipedia.org/wiki/대한민국' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://ko.wikipedia.org/wiki/대한민국"'
-      end
-    end
-
-    context 'given a URL with a full-width space' do
-      let(:text) { 'https://example.com/　abc123' }
-
-      it 'does not match the full-width space' do
-        is_expected.to include 'href="https://example.com/"'
-      end
-    end
-
-    context 'given a URL in Japanese quotation marks' do
-      let(:text) { '「[https://example.org/」' }
-
-      it 'does not match the quotation marks' do
-        is_expected.to include 'href="https://example.org/"'
-      end
-    end
-
-    context 'given a URL with Simplified Chinese path string' do
-      let(:text) { 'https://baike.baidu.com/item/中华人民共和国' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://baike.baidu.com/item/中华人民共和国"'
-      end
-    end
-
-    context 'given a URL with Traditional Chinese path string' do
-      let(:text) { 'https://zh.wikipedia.org/wiki/臺灣' }
-
-      it 'matches the full URL' do
-        is_expected.to include 'href="https://zh.wikipedia.org/wiki/臺灣"'
-      end
-    end
-
-    context 'given a URL containing unsafe code (XSS attack, visible part)' do
-      let(:text) { %q{http://example.com/b<del>b</del>} }
-
-      it 'does not include the HTML in the URL' do
-        is_expected.to include '"http://example.com/b"'
-      end
-
-      it 'escapes the HTML' do
-        is_expected.to include '&lt;del&gt;b&lt;/del&gt;'
-      end
-    end
-
-    context 'given a URL containing unsafe code (XSS attack, invisible part)' do
-      let(:text) { %q{http://example.com/blahblahblahblah/a<script>alert("Hello")</script>} }
-
-      it 'does not include the HTML in the URL' do
-        is_expected.to include '"http://example.com/blahblahblahblah/a"'
-      end
-
-      it 'escapes the HTML' do
-        is_expected.to include '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;'
-      end
-    end
-
-    context 'given text containing HTML code (script tag)' do
-      let(:text) { '<script>alert("Hello")</script>' }
-
-      it 'escapes the HTML' do
-        is_expected.to include '<p>&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;</p>'
-      end
-    end
-
-    context 'given text containing HTML (XSS attack)' do
-      let(:text) { %q{<img src="javascript:alert('XSS');">} }
-
-      it 'escapes the HTML' do
-        is_expected.to include '<p>&lt;img src=&quot;javascript:alert(&apos;XSS&apos;);&quot;&gt;</p>'
-      end
-    end
-
-    context 'given an invalid URL' do
-      let(:text) { 'http://www\.google\.com' }
-
-      it 'outputs the raw URL' do
-        is_expected.to eq '<p>http://www\.google\.com</p>'
-      end
-    end
-
-    context 'given text containing a hashtag' do
-      let(:text)  { '#hashtag' }
-
-      it 'creates a hashtag link' do
-        is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
-      end
-    end
-
-    context 'given text containing a hashtag with Unicode chars' do
-      let(:text)  { '#hashtagタグ' }
-
-      it 'creates a hashtag link' do
-        is_expected.to include '/tags/hashtag%E3%82%BF%E3%82%B0" class="mention hashtag" rel="tag">#<span>hashtagタグ</span></a>'
-      end
-    end
-
-    context 'given a stand-alone xmpp: URI' do
-      let(:text) { 'xmpp:user@instance.com' }
-
-      it 'matches the full URI' do
-        is_expected.to include 'href="xmpp:user@instance.com"'
-      end
-    end
-
-    context 'given a an xmpp: URI with a query-string' do
-      let(:text) { 'please join xmpp:muc@instance.com?join right now' }
-
-      it 'matches the full URI' do
-        is_expected.to include 'href="xmpp:muc@instance.com?join"'
-      end
-    end
-
-    context 'given text containing a magnet: URI' do
-      let(:text) { 'wikipedia gives this example of a magnet uri: magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a' }
-
-      it 'matches the full URI' do
-        is_expected.to include 'href="magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a"'
-      end
-    end
-  end
-
-  describe '#format_spoiler' do
-    subject { Formatter.instance.format_spoiler(status) }
-
-    context 'given a post containing plain text' do
-      let(:status) { Fabricate(:status, text: 'text', spoiler_text: 'Secret!', uri: nil) }
-
-      it 'Returns the spoiler text' do
-        is_expected.to eq 'Secret!'
-      end
-    end
-
-    context 'given a post with an emoji shortcode at the start' do
-      let!(:emoji) { Fabricate(:custom_emoji) }
-      let(:status) { Fabricate(:status, text: 'text', spoiler_text: ':coolcat: Secret!', uri: nil) }
-      let(:text) { ':coolcat: Beep boop' }
-
-      it 'converts the shortcode to an image tag' do
-        is_expected.to match(/<img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-      end
-    end
-  end
-
-  describe '#format' do
-    subject { Formatter.instance.format(status) }
-
-    context 'given a post with local status' do
-      context 'given a reblogged post' do
-        let(:reblog) { Fabricate(:status, account: local_account, text: 'Hello world', uri: nil) }
-        let(:status) { Fabricate(:status, reblog: reblog) }
-
-        it 'returns original status with credit to its author' do
-          is_expected.to include 'RT <span class="h-card"><a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span> Hello world'
-        end
-      end
-
-      context 'given a post containing plain text' do
-        let(:status) { Fabricate(:status, text: 'text', uri: nil) }
-
-        it 'paragraphizes the text' do
-          is_expected.to eq '<p>text</p>'
-        end
-      end
-
-      context 'given a post containing line feeds' do
-        let(:status) { Fabricate(:status, text: "line\nfeed", uri: nil) }
-
-        it 'removes line feeds' do
-          is_expected.not_to include "\n"
-        end
-      end
-
-      context 'given a post containing linkable mentions' do
-        let(:status) { Fabricate(:status, mentions: [ Fabricate(:mention, account: local_account) ], text: '@alice') }
-
-        it 'creates a mention link' do
-          is_expected.to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
-        end
-      end
-
-      context 'given a post containing unlinkable mentions' do
-        let(:status) { Fabricate(:status, text: '@alice', uri: nil) }
-
-        it 'does not create a mention link' do
-          is_expected.to include '@alice'
-        end
-      end
-
-      context do
-        subject do
-          status = Fabricate(:status, text: text, uri: nil)
-          Formatter.instance.format(status)
-        end
-
-        include_examples 'encode and link URLs'
-      end
-
-      context 'given a post with custom_emojify option' do
-        let!(:emoji) { Fabricate(:custom_emoji) }
-        let(:status) { Fabricate(:status, account: local_account, text: text) }
-
-        subject { Formatter.instance.format(status, custom_emojify: true) }
-
-        context 'given a post with an emoji shortcode at the start' do
-          let(:text) { ':coolcat: Beep boop' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/<p><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode in the middle' do
-          let(:text) { 'Beep :coolcat: boop' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/Beep <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with concatenated emoji shortcodes' do
-          let(:text) { ':coolcat::coolcat:' }
-
-          it 'does not touch the shortcodes' do
-            is_expected.to match(/:coolcat::coolcat:/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode at the end' do
-          let(:text) { 'Beep boop :coolcat:' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/boop <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-      end
-    end
-
-    context 'given a post with remote status' do
-      let(:status) { Fabricate(:status, account: remote_account, text: 'Beep boop') }
-
-      it 'reformats the post' do
-        is_expected.to eq 'Beep boop'
-      end
-
-      context 'given a post with custom_emojify option' do
-        let!(:emoji) { Fabricate(:custom_emoji, domain: remote_account.domain) }
-        let(:status) { Fabricate(:status, account: remote_account, text: text) }
-
-        subject { Formatter.instance.format(status, custom_emojify: true) }
-
-        context 'given a post with an emoji shortcode at the start' do
-          let(:text) { '<p>:coolcat: Beep boop<br />' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/<p><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode in the middle' do
-          let(:text) { '<p>Beep :coolcat: boop</p>' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/Beep <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with concatenated emoji' do
-          let(:text) { '<p>:coolcat::coolcat:</p>' }
-
-          it 'does not touch the shortcodes' do
-            is_expected.to match(/<p>:coolcat::coolcat:<\/p>/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode at the end' do
-          let(:text) { '<p>Beep boop<br />:coolcat:</p>' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/<br><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-      end
-    end
-  end
-
-  describe '#reformat' do
-    subject { Formatter.instance.reformat(text) }
-
-    context 'given a post containing plain text' do
-      let(:text) { 'Beep boop' }
-
-      it 'keeps the plain text' do
-        is_expected.to include 'Beep boop'
-      end
-    end
-
-    context 'given a post containing script tags' do
-      let(:text) { '<script>alert("Hello")</script>' }
-
-      it 'strips the scripts' do
-        is_expected.to_not include '<script>alert("Hello")</script>'
-      end
-    end
-
-    context 'given a post containing malicious classes' do
-      let(:text) { '<span class="mention	status__content__spoiler-link">Show more</span>' }
-
-      it 'strips the malicious classes' do
-        is_expected.to_not include 'status__content__spoiler-link'
-      end
-    end
-  end
-
-  describe '#plaintext' do
-    subject { Formatter.instance.plaintext(status) }
-
-    context 'given a post with local status' do
-      let(:status) { Fabricate(:status, text: '<p>a text by a nerd who uses an HTML tag in text</p>', uri: nil) }
-
-      it 'returns the raw text' do
-        is_expected.to eq '<p>a text by a nerd who uses an HTML tag in text</p>'
-      end
-    end
-
-    context 'given a post with remote status' do
-      let(:status) { Fabricate(:status, account: remote_account, text: '<script>alert("Hello")</script>') }
-
-      it 'returns tag-stripped text' do
-        is_expected.to eq ''
-      end
-    end
-  end
-
-  describe '#simplified_format' do
-    subject { Formatter.instance.simplified_format(account) }
-
-    context 'given a post with local status' do
-      let(:account) { Fabricate(:account, domain: nil, note: text) }
-
-      context 'given a post containing linkable mentions for local accounts' do
-        let(:text) { '@alice' }
-
-        before { local_account }
-
-        it 'creates a mention link' do
-          is_expected.to eq '<p><span class="h-card"><a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span></p>'
-        end
-      end
-
-      context 'given a post containing linkable mentions for remote accounts' do
-        let(:text) { '@bob@remote.test' }
-
-        before { remote_account }
-
-        it 'creates a mention link' do
-          is_expected.to eq '<p><span class="h-card"><a href="https://remote.test/" class="u-url mention">@<span>bob</span></a></span></p>'
-        end
-      end
-
-      context 'given a post containing unlinkable mentions' do
-        let(:text) { '@alice' }
-
-        it 'does not create a mention link' do
-          is_expected.to eq '<p>@alice</p>'
-        end
-      end
-
-      context 'given a post with custom_emojify option' do
-        let!(:emoji) { Fabricate(:custom_emoji) }
-
-        before { account.note = text }
-        subject { Formatter.instance.simplified_format(account, custom_emojify: true) }
-
-        context 'given a post with an emoji shortcode at the start' do
-          let(:text) { ':coolcat: Beep boop' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/<p><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode in the middle' do
-          let(:text) { 'Beep :coolcat: boop' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/Beep <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with concatenated emoji shortcodes' do
-          let(:text) { ':coolcat::coolcat:' }
-
-          it 'does not touch the shortcodes' do
-            is_expected.to match(/:coolcat::coolcat:/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode at the end' do
-          let(:text) { 'Beep boop :coolcat:' }
-
-          it 'converts the shortcode to an image tag' do
-            is_expected.to match(/boop <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-      end
-
-      include_examples 'encode and link URLs'
-    end
-
-    context 'given a post with remote status' do
-      let(:text) { '<script>alert("Hello")</script>' }
-      let(:account) { Fabricate(:account, domain: 'remote', note: text) }
-
-      it 'reformats' do
-        is_expected.to_not include '<script>alert("Hello")</script>'
-      end
-
-      context 'with custom_emojify option' do
-        let!(:emoji) { Fabricate(:custom_emoji, domain: remote_account.domain) }
-
-        before { remote_account.note = text }
-
-        subject { Formatter.instance.simplified_format(remote_account, custom_emojify: true) }
-
-        context 'given a post with an emoji shortcode at the start' do
-          let(:text) { '<p>:coolcat: Beep boop<br />' }
-
-          it 'converts shortcode to image tag' do
-            is_expected.to match(/<p><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode in the middle' do
-          let(:text) { '<p>Beep :coolcat: boop</p>' }
-
-          it 'converts shortcode to image tag' do
-            is_expected.to match(/Beep <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-
-        context 'given a post with concatenated emoji shortcodes' do
-          let(:text) { '<p>:coolcat::coolcat:</p>' }
-
-          it 'does not touch the shortcodes' do
-            is_expected.to match(/<p>:coolcat::coolcat:<\/p>/)
-          end
-        end
-
-        context 'given a post with an emoji shortcode at the end' do
-          let(:text) { '<p>Beep boop<br />:coolcat:</p>' }
-
-          it 'converts shortcode to image tag' do
-            is_expected.to match(/<br><img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
-          end
-        end
-      end
-    end
-  end
-
-  describe '#sanitize' do
-    let(:html) { '<script>alert("Hello")</script>' }
-
-    subject { Formatter.instance.sanitize(html, Sanitize::Config::MASTODON_STRICT) }
-
-    it 'sanitizes' do
-      is_expected.to eq ''
-    end
-  end
-end
diff --git a/spec/lib/hashtag_normalizer_spec.rb b/spec/lib/hashtag_normalizer_spec.rb
new file mode 100644
index 000000000..fbb9f37c0
--- /dev/null
+++ b/spec/lib/hashtag_normalizer_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe HashtagNormalizer do
+  subject { described_class.new }
+
+  describe '#normalize' do
+    it 'converts full-width Latin characters into basic Latin characters' do
+      expect(subject.normalize('Ｓｙｎｔｈｗａｖｅ')).to eq 'synthwave'
+    end
+
+    it 'converts half-width Katakana into Kana characters' do
+      expect(subject.normalize('ｼｰｻｲﾄﾞﾗｲﾅｰ')).to eq 'シーサイドライナー'
+    end
+
+    it 'converts modified Latin characters into basic Latin characters' do
+      expect(subject.normalize('BLÅHAJ')).to eq 'blahaj'
+    end
+
+    it 'strips out invalid characters' do
+      expect(subject.normalize('#foo')).to eq 'foo'
+    end
+
+    it 'keeps valid characters' do
+      expect(subject.normalize('a·b')).to eq 'a·b'
+    end
+  end
+end
diff --git a/spec/lib/html_aware_formatter_spec.rb b/spec/lib/html_aware_formatter_spec.rb
new file mode 100644
index 000000000..18d23abf5
--- /dev/null
+++ b/spec/lib/html_aware_formatter_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe HtmlAwareFormatter do
+  describe '#to_s' do
+    subject { described_class.new(text, local).to_s }
+
+    context 'when local' do
+      let(:local) { true }
+      let(:text) { 'Foo bar' }
+
+      it 'returns formatted text' do
+        is_expected.to eq '<p>Foo bar</p>'
+      end
+    end
+
+    context 'when remote' do
+      let(:local) { false }
+
+      context 'given plain text' do
+        let(:text) { 'Beep boop' }
+
+        it 'keeps the plain text' do
+          is_expected.to include 'Beep boop'
+        end
+      end
+
+      context 'given text containing script tags' do
+        let(:text) { '<script>alert("Hello")</script>' }
+
+        it 'strips the scripts' do
+          is_expected.to_not include '<script>alert("Hello")</script>'
+        end
+      end
+
+      context 'given text containing malicious classes' do
+        let(:text) { '<span class="mention  status__content__spoiler-link">Show more</span>' }
+
+        it 'strips the malicious classes' do
+          is_expected.to_not include 'status__content__spoiler-link'
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/language_detector_spec.rb b/spec/lib/language_detector_spec.rb
deleted file mode 100644
index b7ba0f6c4..000000000
--- a/spec/lib/language_detector_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe LanguageDetector do
-  describe 'prepare_text' do
-    it 'returns unmodified string without special cases' do
-      string = 'just a regular string'
-      result = described_class.instance.send(:prepare_text, string)
-
-      expect(result).to eq string
-    end
-
-    it 'collapses spacing in strings' do
-      string = 'The formatting   in    this is very        odd'
-
-      result = described_class.instance.send(:prepare_text, string)
-      expect(result).to eq 'The formatting in this is very odd'
-    end
-
-    it 'strips usernames from strings before detection' do
-      string = '@username Yeah, very surreal...! also @friend'
-
-      result = described_class.instance.send(:prepare_text, string)
-      expect(result).to eq 'Yeah, very surreal...! also'
-    end
-
-    it 'strips URLs from strings before detection' do
-      string = 'Our website is https://example.com and also http://localhost.dev'
-
-      result = described_class.instance.send(:prepare_text, string)
-      expect(result).to eq 'Our website is and also'
-    end
-
-    it 'converts #hashtags back to normal text before detection' do
-      string = 'Hey look at all the #animals and #FishAndChips'
-
-      result = described_class.instance.send(:prepare_text, string)
-      expect(result).to eq 'Hey look at all the animals and fish and chips'
-    end
-  end
-
-  describe 'detect' do
-    let(:account_without_user_locale) { Fabricate(:user, locale: nil).account }
-    let(:account_remote) { Fabricate(:account, domain: 'joinmastodon.org') }
-
-    it 'detects english language for basic strings' do
-      strings = [
-        "Hello and welcome to mastodon how are you today?",
-        "I'd rather not!",
-        "a lot of people just want to feel righteous all the time and that's all that matters",
-      ]
-      strings.each do |string|
-        result = described_class.instance.detect(string, account_without_user_locale)
-
-        expect(result).to eq(:en), string
-      end
-    end
-
-    it 'detects spanish language' do
-      string = 'Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon'
-      result = described_class.instance.detect(string, account_without_user_locale)
-
-      expect(result).to eq :es
-    end
-
-    describe 'when language can\'t be detected' do
-      it 'uses nil when sent an empty document' do
-        result = described_class.instance.detect('', account_without_user_locale)
-        expect(result).to eq nil
-      end
-
-      describe 'because of a URL' do
-        it 'uses nil when sent just a URL' do
-          string = 'http://example.com/media/2kFTgOJLXhQf0g2nKB4'
-          cld_result = CLD3::NNetLanguageIdentifier.new(0, 2048).find_language(string)
-          expect(cld_result).not_to eq :en
-
-          result = described_class.instance.detect(string, account_without_user_locale)
-
-          expect(result).to eq nil
-        end
-      end
-
-      describe 'with an account' do
-        it 'uses the account locale when present' do
-          account = double(user_locale: 'fr')
-          result  = described_class.instance.detect('', account)
-
-          expect(result).to eq nil
-        end
-
-        it 'uses nil when account is present but has no locale' do
-          result = described_class.instance.detect('', account_without_user_locale)
-
-          expect(result).to eq nil
-        end
-      end
-
-      describe 'with an `en` default locale' do
-        it 'uses nil for undetectable string' do
-          result = described_class.instance.detect('', account_without_user_locale)
-
-          expect(result).to eq nil
-        end
-      end
-
-      describe 'remote user' do
-        it 'detects Korean language' do
-          string = '안녕하세요'
-          result = described_class.instance.detect(string, account_remote)
-
-          expect(result).to eq :ko
-        end
-      end
-
-      describe 'with a non-`en` default locale' do
-        around(:each) do |example|
-          before = I18n.default_locale
-          I18n.default_locale = :ja
-          example.run
-          I18n.default_locale = before
-        end
-
-        it 'uses nil for undetectable string' do
-          string = ''
-          result = described_class.instance.detect(string, account_without_user_locale)
-
-          expect(result).to eq nil
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 850857b2d..7ea867c61 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -25,5 +25,135 @@ RSpec.describe LinkDetailsExtractor do
         expect(subject.canonical_url).to eq 'https://foo.com/article'
       end
     end
+
+    context 'when canonical URL is set to "null"' do
+      let(:html) { '<!doctype html><link rel="canonical" href="null" />' }
+
+      it 'ignores the canonical URLs' do
+        expect(subject.canonical_url).to eq original_url
+      end
+    end
+  end
+
+  context 'when structured data is present' do
+    let(:original_url) { 'https://example.com/page.html' }
+
+    context 'and is wrapped in CDATA tags' do
+      let(:html) { <<-HTML }
+<!doctype html>
+<html>
+<head>
+  <script type="application/ld+json">
+  //<![CDATA[
+  {"@context":"http://schema.org","@type":"NewsArticle","mainEntityOfPage":"https://example.com/page.html","headline":"Foo","datePublished":"2022-01-31T19:53:00+00:00","url":"https://example.com/page.html","description":"Bar","author":{"@type":"Person","name":"Hoge"},"publisher":{"@type":"Organization","name":"Baz"}}
+  //]]>
+  </script>
+</head>
+</html>
+      HTML
+
+      describe '#title' do
+        it 'returns the title from structured data' do
+          expect(subject.title).to eq 'Foo'
+        end
+      end
+
+      describe '#description' do
+        it 'returns the description from structured data' do
+          expect(subject.description).to eq 'Bar'
+        end
+      end
+
+      describe '#provider_name' do
+        it 'returns the provider name from structured data' do
+          expect(subject.provider_name).to eq 'Baz'
+        end
+      end
+
+      describe '#author_name' do
+        it 'returns the author name from structured data' do
+          expect(subject.author_name).to eq 'Hoge'
+        end
+      end
+    end
+
+    context 'but the first tag is invalid JSON' do
+      let(:html) { <<-HTML }
+<!doctype html>
+<html>
+<body>
+  <script type="application/ld+json">
+    {
+      "@context":"https://schema.org",
+      "@type":"ItemList",
+      "url":"https://example.com/page.html",
+      "name":"Foo",
+      "description":"Bar"
+    },
+    {
+      "@context": "https://schema.org",
+      "@type": "BreadcrumbList",
+      "itemListElement":[
+        {
+          "@type":"ListItem",
+          "position":1,
+          "item":{
+            "@id":"https://www.example.com",
+            "name":"Baz"
+          }
+        }
+      ]
+    }
+  </script>
+  <script type="application/ld+json">
+    {
+      "@context":"https://schema.org",
+      "@type":"NewsArticle",
+      "mainEntityOfPage": {
+        "@type":"WebPage",
+        "@id": "http://example.com/page.html"
+      },
+      "headline": "Foo",
+      "description": "Bar",
+      "datePublished": "2022-01-31T19:46:00+00:00",
+      "author": {
+        "@type": "Organization",
+        "name": "Hoge"
+      },
+      "publisher": {
+        "@type": "NewsMediaOrganization",
+        "name":"Baz",
+        "url":"https://example.com/"
+      }
+    }
+  </script>
+</body>
+</html>
+      HTML
+
+      describe '#title' do
+        it 'returns the title from structured data' do
+          expect(subject.title).to eq 'Foo'
+        end
+      end
+
+      describe '#description' do
+        it 'returns the description from structured data' do
+          expect(subject.description).to eq 'Bar'
+        end
+      end
+
+      describe '#provider_name' do
+        it 'returns the provider name from structured data' do
+          expect(subject.provider_name).to eq 'Baz'
+        end
+      end
+
+      describe '#author_name' do
+        it 'returns the author name from structured data' do
+          expect(subject.author_name).to eq 'Hoge'
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/permalink_redirector_spec.rb b/spec/lib/permalink_redirector_spec.rb
index b916b33b2..a00913656 100644
--- a/spec/lib/permalink_redirector_spec.rb
+++ b/spec/lib/permalink_redirector_spec.rb
@@ -3,40 +3,31 @@
 require 'rails_helper'
 
 describe PermalinkRedirector do
+  let(:remote_account) { Fabricate(:account, username: 'alice', domain: 'example.com', url: 'https://example.com/@alice', id: 2) }
+
   describe '#redirect_url' do
     before do
-      account = Fabricate(:account, username: 'alice', id: 1)
-      Fabricate(:status, account: account, id: 123)
+      Fabricate(:status, account: remote_account, id: 123, url: 'https://example.com/status-123')
     end
 
     it 'returns path for legacy account links' do
-      redirector = described_class.new('web/accounts/1')
-      expect(redirector.redirect_path).to eq 'https://cb6e6126.ngrok.io/@alice'
+      redirector = described_class.new('accounts/2')
+      expect(redirector.redirect_path).to eq 'https://example.com/@alice'
     end
 
     it 'returns path for legacy status links' do
-      redirector = described_class.new('web/statuses/123')
-      expect(redirector.redirect_path).to eq 'https://cb6e6126.ngrok.io/@alice/123'
-    end
-
-    it 'returns path for legacy tag links' do
-      redirector = described_class.new('web/timelines/tag/hoge')
-      expect(redirector.redirect_path).to eq '/tags/hoge'
+      redirector = described_class.new('statuses/123')
+      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
     end
 
     it 'returns path for pretty account links' do
-      redirector = described_class.new('web/@alice')
-      expect(redirector.redirect_path).to eq 'https://cb6e6126.ngrok.io/@alice'
+      redirector = described_class.new('@alice@example.com')
+      expect(redirector.redirect_path).to eq 'https://example.com/@alice'
     end
 
     it 'returns path for pretty status links' do
-      redirector = described_class.new('web/@alice/123')
-      expect(redirector.redirect_path).to eq 'https://cb6e6126.ngrok.io/@alice/123'
-    end
-
-    it 'returns path for pretty tag links' do
-      redirector = described_class.new('web/tags/hoge')
-      expect(redirector.redirect_path).to eq '/tags/hoge'
+      redirector = described_class.new('@alice/123')
+      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
     end
   end
 end
diff --git a/spec/lib/plain_text_formatter_spec.rb b/spec/lib/plain_text_formatter_spec.rb
new file mode 100644
index 000000000..c3d0ee630
--- /dev/null
+++ b/spec/lib/plain_text_formatter_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe PlainTextFormatter do
+  describe '#to_s' do
+    subject { described_class.new(status.text, status.local?).to_s }
+
+    context 'given a post with local status' do
+      let(:status) { Fabricate(:status, text: '<p>a text by a nerd who uses an HTML tag in text</p>', uri: nil) }
+
+      it 'returns the raw text' do
+        is_expected.to eq '<p>a text by a nerd who uses an HTML tag in text</p>'
+      end
+    end
+
+    context 'given a post with remote status' do
+      let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') }
+      let(:status) { Fabricate(:status, account: remote_account, text: '<p>Hello</p><script>alert("Hello")</script>') }
+
+      it 'returns tag-stripped text' do
+        is_expected.to eq 'Hello'
+      end
+    end
+  end
+end
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 2d300f18d..5eccf3201 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -63,7 +63,7 @@ describe Request do
         expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
       end
 
-      it 'closes underlaying connection' do
+      it 'closes underlying connection' do
         expect_any_instance_of(HTTP::Client).to receive(:close)
         expect { |block| subject.perform &block }.to yield_control
       end
diff --git a/spec/lib/rss/serializer_spec.rb b/spec/lib/rss/serializer_spec.rb
deleted file mode 100644
index 0364d13de..000000000
--- a/spec/lib/rss/serializer_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe RSS::Serializer do
-  describe '#status_title' do
-    let(:text)      { 'This is a toot' }
-    let(:spoiler)   { '' }
-    let(:sensitive) { false }
-    let(:reblog)    { nil }
-    let(:account)   { Fabricate(:account) }
-    let(:status)    { Fabricate(:status, account: account, text: text, spoiler_text: spoiler, sensitive: sensitive, reblog: reblog) }
-
-    subject { RSS::Serializer.new.send(:status_title, status) }
-
-    context 'if destroyed?' do
-      it 'returns "#{account.acct} deleted status"' do
-        status.destroy!
-        expect(subject).to eq "#{account.acct} deleted status"
-      end
-    end
-
-    context 'on a toot with long text' do
-      let(:text) { "This toot's text is longer than the allowed number of characters" }
-
-      it 'truncates toot text appropriately' do
-        expect(subject).to eq "#{account.acct}: “This toot's text is longer tha…”"
-      end
-    end
-
-    context 'on a toot with long text with a newline' do
-      let(:text) { "This toot's text is longer\nthan the allowed number of characters" }
-
-      it 'truncates toot text appropriately' do
-        expect(subject).to eq "#{account.acct}: “This toot's text is longer…”"
-      end
-    end
-
-    context 'on a toot with a content warning' do
-      let(:spoiler) { 'long toot' }
-
-      it 'displays spoiler text instead of toot content' do
-        expect(subject).to eq "#{account.acct}: CW “long toot”"
-      end
-    end
-
-    context 'on a toot with sensitive media' do
-      let(:sensitive) { true }
-
-      it 'displays that the media is sensitive' do
-        expect(subject).to eq "#{account.acct}: “This is a toot” (sensitive)"
-      end
-    end
-
-    context 'on a reblog' do
-      let(:reblog) { Fabricate(:status, text: 'This is a toot') }
-
-      it 'display that the toot is a reblog' do
-        expect(subject).to eq "#{account.acct} boosted #{reblog.account.acct}: “This is a toot”"
-      end
-    end
-  end
-end
diff --git a/spec/lib/scope_transformer_spec.rb b/spec/lib/scope_transformer_spec.rb
new file mode 100644
index 000000000..e5a992144
--- /dev/null
+++ b/spec/lib/scope_transformer_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ScopeTransformer do
+  describe '#apply' do
+    subject { described_class.new.apply(ScopeParser.new.parse(input)) }
+
+    shared_examples 'a scope' do |namespace, term, access|
+      it 'parses the term' do
+        expect(subject.term).to eq term
+      end
+
+      it 'parses the namespace' do
+        expect(subject.namespace).to eq namespace
+      end
+
+      it 'parses the access' do
+        expect(subject.access).to eq access
+      end
+    end
+
+    context 'for scope "read"' do
+      let(:input) { 'read' }
+
+      it_behaves_like 'a scope', nil, 'all', 'read'
+    end
+
+    context 'for scope "write"' do
+      let(:input) { 'write' }
+
+      it_behaves_like 'a scope', nil, 'all', 'write'
+    end
+
+    context 'for scope "follow"' do
+      let(:input) { 'follow' }
+
+      it_behaves_like 'a scope', nil, 'follow', 'read/write'
+    end
+
+    context 'for scope "crypto"' do
+      let(:input) { 'crypto' }
+
+      it_behaves_like 'a scope', nil, 'crypto', 'read/write'
+    end
+
+    context 'for scope "push"' do
+      let(:input) { 'push' }
+
+      it_behaves_like 'a scope', nil, 'push', 'read/write'
+    end
+
+    context 'for scope "admin:read"' do
+      let(:input) { 'admin:read' }
+
+      it_behaves_like 'a scope', 'admin', 'all', 'read'
+    end
+
+    context 'for scope "admin:write"' do
+      let(:input) { 'admin:write' }
+
+      it_behaves_like 'a scope', 'admin', 'all', 'write'
+    end
+
+    context 'for scope "admin:read:accounts"' do
+      let(:input) { 'admin:read:accounts' }
+
+      it_behaves_like 'a scope', 'admin', 'accounts', 'read'
+    end
+
+    context 'for scope "admin:write:accounts"' do
+      let(:input) { 'admin:write:accounts' }
+
+      it_behaves_like 'a scope', 'admin', 'accounts', 'write'
+    end
+
+    context 'for scope "read:accounts"' do
+      let(:input) { 'read:accounts' }
+
+      it_behaves_like 'a scope', nil, 'accounts', 'read'
+    end
+
+    context 'for scope "write:accounts"' do
+      let(:input) { 'write:accounts' }
+
+      it_behaves_like 'a scope', nil, 'accounts', 'write'
+    end
+  end
+end
diff --git a/spec/lib/status_cache_hydrator_spec.rb b/spec/lib/status_cache_hydrator_spec.rb
new file mode 100644
index 000000000..5c78de711
--- /dev/null
+++ b/spec/lib/status_cache_hydrator_spec.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe StatusCacheHydrator do
+  let(:status)  { Fabricate(:status) }
+  let(:account) { Fabricate(:account) }
+
+  describe '#hydrate' do
+    let(:compare_to_hash) { InlineRenderer.render(status, account, :status) }
+
+    shared_examples 'shared behavior' do
+      context 'when handling a new status' do
+        let(:poll) { Fabricate(:poll) }
+        let(:status) { Fabricate(:status, poll: poll) }
+
+        it 'renders the same attributes as a full render' do
+          expect(subject).to eql(compare_to_hash)
+        end
+      end
+
+      context 'when handling a new status with own poll' do
+        let(:poll) { Fabricate(:poll, account: account) }
+        let(:status) { Fabricate(:status, poll: poll, account: account) }
+
+        it 'renders the same attributes as a full render' do
+          expect(subject).to eql(compare_to_hash)
+        end
+      end
+
+      context 'when handling a filtered status' do
+        let(:status) { Fabricate(:status, text: 'this toot is about that banned word') }
+
+        before do
+          account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
+        end
+
+        it 'renders the same attributes as a full render' do
+          expect(subject).to eql(compare_to_hash)
+        end
+      end
+
+      context 'when handling a reblog' do
+        let(:reblog) { Fabricate(:status) }
+        let(:status) { Fabricate(:status, reblog: reblog) }
+
+        context 'that has been favourited' do
+          before do
+            FavouriteService.new.call(account, reblog)
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that has been reblogged' do
+          before do
+            ReblogService.new.call(account, reblog)
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that has been pinned' do
+          let(:reblog) { Fabricate(:status, account: account) }
+
+          before do
+            StatusPin.create!(account: account, status: reblog)
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that has been followed tags' do
+          let(:followed_tag) { Fabricate(:tag) }
+
+          before do
+            reblog.tags << Fabricate(:tag)
+            reblog.tags << followed_tag
+            TagFollow.create!(tag: followed_tag, account: account, rate_limit: false)
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that has a poll authored by the user' do
+          let(:poll) { Fabricate(:poll, account: account) }
+          let(:reblog) { Fabricate(:status, poll: poll, account: account) }
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that has been voted in' do
+          let(:poll) { Fabricate(:poll, options: %w(Yellow Blue)) }
+          let(:reblog) { Fabricate(:status, poll: poll) }
+
+          before do
+            VoteService.new.call(account, poll, [0])
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+
+        context 'that matches account filters' do
+          let(:reblog) { Fabricate(:status, text: 'this toot is about that banned word') }
+
+          before do
+            account.custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
+          end
+
+          it 'renders the same attributes as a full render' do
+            expect(subject).to eql(compare_to_hash)
+          end
+        end
+      end
+    end
+
+    context 'when cache is warm' do
+      subject do
+        Rails.cache.write("fan-out/#{status.id}", InlineRenderer.render(status, nil, :status))
+        described_class.new(status).hydrate(account.id)
+      end
+
+      it_behaves_like 'shared behavior'
+    end
+
+    context 'when cache is cold' do
+      subject do
+        Rails.cache.delete("fan-out/#{status.id}")
+        described_class.new(status).hydrate(account.id)
+      end
+
+      it_behaves_like 'shared behavior'
+    end
+  end
+end
diff --git a/spec/lib/status_reach_finder_spec.rb b/spec/lib/status_reach_finder_spec.rb
new file mode 100644
index 000000000..f0c22b165
--- /dev/null
+++ b/spec/lib/status_reach_finder_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe StatusReachFinder do
+  describe '#inboxes' do
+    context 'for a local status' do
+      let(:parent_status) { nil }
+      let(:visibility) { :public }
+      let(:alice) { Fabricate(:account, username: 'alice') }
+      let(:status) { Fabricate(:status, account: alice, thread: parent_status, visibility: visibility) }
+
+      subject { described_class.new(status) }
+
+      context 'when it contains mentions of remote accounts' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        before do
+          status.mentions.create!(account: bob)
+        end
+
+        it 'includes the inbox of the mentioned account' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
+        end
+      end
+
+      context 'when it has been reblogged by a remote account' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        before do
+          bob.statuses.create!(reblog: status)
+        end
+
+        it 'includes the inbox of the reblogger' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
+        end
+
+        context 'when status is not public' do
+          let(:visibility) { :private }
+
+          it 'does not include the inbox of the reblogger' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when it has been favourited by a remote account' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        before do
+          bob.favourites.create!(status: status)
+        end
+
+        it 'includes the inbox of the favouriter' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
+        end
+
+        context 'when status is not public' do
+          let(:visibility) { :private }
+
+          it 'does not include the inbox of the favouriter' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when it has been replied to by a remote account' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        before do
+          bob.statuses.create!(thread: status, text: 'Hoge')
+        end
+
+        context do
+          it 'includes the inbox of the replier' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when status is not public' do
+          let(:visibility) { :private }
+
+          it 'does not include the inbox of the replier' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when it is a reply to a remote account' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+        let(:parent_status) { Fabricate(:status, account: bob) }
+
+        context do
+          it 'includes the inbox of the replied-to account' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when status is not public and replied-to account is not mentioned' do
+          let(:visibility) { :private }
+
+          it 'does not include the inbox of the replied-to account' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/suspicious_sign_in_detector_spec.rb b/spec/lib/suspicious_sign_in_detector_spec.rb
new file mode 100644
index 000000000..101a18aa0
--- /dev/null
+++ b/spec/lib/suspicious_sign_in_detector_spec.rb
@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+RSpec.describe SuspiciousSignInDetector do
+  describe '#suspicious?' do
+    let(:user) { Fabricate(:user, current_sign_in_at: 1.day.ago) }
+    let(:request) { double(remote_ip: remote_ip) }
+    let(:remote_ip) { nil }
+
+    subject { described_class.new(user).suspicious?(request) }
+
+    context 'when user has 2FA enabled' do
+      before do
+        user.update!(otp_required_for_login: true)
+      end
+
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+
+    context 'when exact IP has been used before' do
+      let(:remote_ip) { '1.1.1.1' }
+
+      before do
+        user.update!(sign_up_ip: remote_ip)
+      end
+
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+
+    context 'when similar IP has been used before' do
+      let(:remote_ip) { '1.1.2.2' }
+
+      before do
+        user.update!(sign_up_ip: '1.1.1.1')
+      end
+
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+
+    context 'when IP is completely unfamiliar' do
+      let(:remote_ip) { '2.2.2.2' }
+
+      before do
+        user.update!(sign_up_ip: '1.1.1.1')
+      end
+
+      it 'returns true' do
+        expect(subject).to be true
+      end
+    end
+  end
+end
diff --git a/spec/lib/tag_manager_spec.rb b/spec/lib/tag_manager_spec.rb
index 2230f9710..cd9fb936c 100644
--- a/spec/lib/tag_manager_spec.rb
+++ b/spec/lib/tag_manager_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe TagManager do
 
     around do |example|
       original_local_domain = Rails.configuration.x.local_domain
-      Rails.configuration.x.local_domain = 'domain.test'
+      Rails.configuration.x.local_domain = 'domain.example.com'
 
       example.run
 
@@ -18,11 +18,11 @@ RSpec.describe TagManager do
     end
 
     it 'returns true if the slash-stripped string equals to local domain' do
-      expect(TagManager.instance.local_domain?('DoMaIn.Test/')).to eq true
+      expect(TagManager.instance.local_domain?('DoMaIn.Example.com/')).to eq true
     end
 
     it 'returns false for irrelevant string' do
-      expect(TagManager.instance.local_domain?('DoMaIn.Test!')).to eq false
+      expect(TagManager.instance.local_domain?('DoMaIn.Example.com!')).to eq false
     end
   end
 
@@ -31,7 +31,7 @@ RSpec.describe TagManager do
 
     around do |example|
       original_web_domain = Rails.configuration.x.web_domain
-      Rails.configuration.x.web_domain = 'domain.test'
+      Rails.configuration.x.web_domain = 'domain.example.com'
 
       example.run
 
@@ -43,11 +43,11 @@ RSpec.describe TagManager do
     end
 
     it 'returns true if the slash-stripped string equals to web domain' do
-      expect(TagManager.instance.web_domain?('DoMaIn.Test/')).to eq true
+      expect(TagManager.instance.web_domain?('DoMaIn.Example.com/')).to eq true
     end
 
     it 'returns false for string with irrelevant characters' do
-      expect(TagManager.instance.web_domain?('DoMaIn.Test!')).to eq false
+      expect(TagManager.instance.web_domain?('DoMaIn.Example.com!')).to eq false
     end
   end
 
@@ -57,7 +57,7 @@ RSpec.describe TagManager do
     end
 
     it 'returns normalized domain' do
-      expect(TagManager.instance.normalize_domain('DoMaIn.Test/')).to eq 'domain.test'
+      expect(TagManager.instance.normalize_domain('DoMaIn.Example.com/')).to eq 'domain.example.com'
     end
   end
 
@@ -69,18 +69,18 @@ RSpec.describe TagManager do
     end
 
     it 'returns true if the normalized string with port is local URL' do
-      Rails.configuration.x.web_domain = 'domain.test:42'
-      expect(TagManager.instance.local_url?('https://DoMaIn.Test:42/')).to eq true
+      Rails.configuration.x.web_domain = 'domain.example.com:42'
+      expect(TagManager.instance.local_url?('https://DoMaIn.Example.com:42/')).to eq true
     end
 
     it 'returns true if the normalized string without port is local URL' do
-      Rails.configuration.x.web_domain = 'domain.test'
-      expect(TagManager.instance.local_url?('https://DoMaIn.Test/')).to eq true
+      Rails.configuration.x.web_domain = 'domain.example.com'
+      expect(TagManager.instance.local_url?('https://DoMaIn.Example.com/')).to eq true
     end
 
     it 'returns false for string with irrelevant characters' do
-      Rails.configuration.x.web_domain = 'domain.test'
-      expect(TagManager.instance.local_url?('https://domainn.test/')).to eq false
+      Rails.configuration.x.web_domain = 'domain.example.com'
+      expect(TagManager.instance.local_url?('https://domain.example.net/')).to eq false
     end
   end
 end
diff --git a/spec/lib/text_formatter_spec.rb b/spec/lib/text_formatter_spec.rb
new file mode 100644
index 000000000..52a9d2498
--- /dev/null
+++ b/spec/lib/text_formatter_spec.rb
@@ -0,0 +1,313 @@
+require 'rails_helper'
+
+RSpec.describe TextFormatter do
+  describe '#to_s' do
+    let(:preloaded_accounts) { nil }
+
+    subject { described_class.new(text, preloaded_accounts: preloaded_accounts).to_s }
+
+    context 'given text containing plain text' do
+      let(:text) { 'text' }
+
+      it 'paragraphizes the text' do
+        is_expected.to eq '<p>text</p>'
+      end
+    end
+
+    context 'given text containing line feeds' do
+      let(:text) { "line\nfeed" }
+
+      it 'removes line feeds' do
+        is_expected.not_to include "\n"
+      end
+    end
+
+    context 'given text containing linkable mentions' do
+      let(:preloaded_accounts) { [Fabricate(:account, username: 'alice')] }
+      let(:text) { '@alice' }
+
+      it 'creates a mention link' do
+        is_expected.to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
+      end
+    end
+
+    context 'given text containing unlinkable mentions' do
+      let(:preloaded_accounts) { [] }
+      let(:text) { '@alice' }
+
+      it 'does not create a mention link' do
+        is_expected.to include '@alice'
+      end
+    end
+
+    context 'given a stand-alone medium URL' do
+      let(:text) { 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"'
+      end
+    end
+
+    context 'given a stand-alone google URL' do
+      let(:text) { 'http://google.com' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="http://google.com"'
+      end
+    end
+
+    context 'given a stand-alone URL with a newer TLD' do
+      let(:text) { 'http://example.gay' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="http://example.gay"'
+      end
+    end
+
+    context 'given a stand-alone IDN URL' do
+      let(:text) { 'https://nic.みんな/' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://nic.みんな/"'
+      end
+
+      it 'has display URL' do
+        is_expected.to include '<span class="">nic.みんな/</span>'
+      end
+    end
+
+    context 'given a URL with a trailing period' do
+      let(:text) { 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ' }
+
+      it 'matches the full URL but not the period' do
+        is_expected.to include 'href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"'
+      end
+    end
+
+    context 'given a URL enclosed with parentheses' do
+      let(:text) { '(http://google.com/)' }
+
+      it 'matches the full URL but not the parentheses' do
+        is_expected.to include 'href="http://google.com/"'
+      end
+    end
+
+    context 'given a URL with a trailing exclamation point' do
+      let(:text) { 'http://www.google.com!' }
+
+      it 'matches the full URL but not the exclamation point' do
+        is_expected.to include 'href="http://www.google.com"'
+      end
+    end
+
+    context 'given a URL with a trailing single quote' do
+      let(:text) { "http://www.google.com'" }
+
+      it 'matches the full URL but not the single quote' do
+        is_expected.to include 'href="http://www.google.com"'
+      end
+    end
+
+    context 'given a URL with a trailing angle bracket' do
+      let(:text) { 'http://www.google.com>' }
+
+      it 'matches the full URL but not the angle bracket' do
+        is_expected.to include 'href="http://www.google.com"'
+      end
+    end
+
+    context 'given a URL with a query string' do
+      context 'with escaped unicode character' do
+        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
+
+        it 'matches the full URL' do
+          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&amp;q=autolink"'
+        end
+      end
+
+      context 'with unicode character' do
+        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓&q=autolink' }
+
+        it 'matches the full URL' do
+          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓&amp;q=autolink"'
+        end
+      end
+
+      context 'with unicode character at the end' do
+        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓' }
+
+        it 'matches the full URL' do
+          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓"'
+        end
+      end
+
+      context 'with escaped and not escaped unicode characters' do
+        let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&utf81=✓&q=autolink' }
+
+        it 'preserves escaped unicode characters' do
+          is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&amp;utf81=✓&amp;q=autolink"'
+        end
+      end
+    end
+
+    context 'given a URL with parentheses in it' do
+      let(:text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
+      end
+    end
+
+    context 'given a URL in quotation marks' do
+      let(:text) { '"https://example.com/"' }
+
+      it 'does not match the quotation marks' do
+        is_expected.to include 'href="https://example.com/"'
+      end
+    end
+
+    context 'given a URL in angle brackets' do
+      let(:text) { '<https://example.com/>' }
+
+      it 'does not match the angle brackets' do
+        is_expected.to include 'href="https://example.com/"'
+      end
+    end
+
+    context 'given a URL with Japanese path string' do
+      let(:text) { 'https://ja.wikipedia.org/wiki/日本' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://ja.wikipedia.org/wiki/日本"'
+      end
+    end
+
+    context 'given a URL with Korean path string' do
+      let(:text) { 'https://ko.wikipedia.org/wiki/대한민국' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://ko.wikipedia.org/wiki/대한민국"'
+      end
+    end
+
+    context 'given a URL with a full-width space' do
+      let(:text) { 'https://example.com/　abc123' }
+
+      it 'does not match the full-width space' do
+        is_expected.to include 'href="https://example.com/"'
+      end
+    end
+
+    context 'given a URL in Japanese quotation marks' do
+      let(:text) { '「[https://example.org/」' }
+
+      it 'does not match the quotation marks' do
+        is_expected.to include 'href="https://example.org/"'
+      end
+    end
+
+    context 'given a URL with Simplified Chinese path string' do
+      let(:text) { 'https://baike.baidu.com/item/中华人民共和国' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://baike.baidu.com/item/中华人民共和国"'
+      end
+    end
+
+    context 'given a URL with Traditional Chinese path string' do
+      let(:text) { 'https://zh.wikipedia.org/wiki/臺灣' }
+
+      it 'matches the full URL' do
+        is_expected.to include 'href="https://zh.wikipedia.org/wiki/臺灣"'
+      end
+    end
+
+    context 'given a URL containing unsafe code (XSS attack, visible part)' do
+      let(:text) { %q{http://example.com/b<del>b</del>} }
+
+      it 'does not include the HTML in the URL' do
+        is_expected.to include '"http://example.com/b"'
+      end
+
+      it 'escapes the HTML' do
+        is_expected.to include '&lt;del&gt;b&lt;/del&gt;'
+      end
+    end
+
+    context 'given a URL containing unsafe code (XSS attack, invisible part)' do
+      let(:text) { %q{http://example.com/blahblahblahblah/a<script>alert("Hello")</script>} }
+
+      it 'does not include the HTML in the URL' do
+        is_expected.to include '"http://example.com/blahblahblahblah/a"'
+      end
+
+      it 'escapes the HTML' do
+        is_expected.to include '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;'
+      end
+    end
+
+    context 'given text containing HTML code (script tag)' do
+      let(:text) { '<script>alert("Hello")</script>' }
+
+      it 'escapes the HTML' do
+        is_expected.to include '<p>&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;</p>'
+      end
+    end
+
+    context 'given text containing HTML (XSS attack)' do
+      let(:text) { %q{<img src="javascript:alert('XSS');">} }
+
+      it 'escapes the HTML' do
+        is_expected.to include '<p>&lt;img src=&quot;javascript:alert(&#39;XSS&#39;);&quot;&gt;</p>'
+      end
+    end
+
+    context 'given an invalid URL' do
+      let(:text) { 'http://www\.google\.com' }
+
+      it 'outputs the raw URL' do
+        is_expected.to eq '<p>http://www\.google\.com</p>'
+      end
+    end
+
+    context 'given text containing a hashtag' do
+      let(:text)  { '#hashtag' }
+
+      it 'creates a hashtag link' do
+        is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
+      end
+    end
+
+    context 'given text containing a hashtag with Unicode chars' do
+      let(:text)  { '#hashtagタグ' }
+
+      it 'creates a hashtag link' do
+        is_expected.to include '/tags/hashtag%E3%82%BF%E3%82%B0" class="mention hashtag" rel="tag">#<span>hashtagタグ</span></a>'
+      end
+    end
+
+    context 'given text with a stand-alone xmpp: URI' do
+      let(:text) { 'xmpp:user@instance.com' }
+
+      it 'matches the full URI' do
+        is_expected.to include 'href="xmpp:user@instance.com"'
+      end
+    end
+
+    context 'given text with an xmpp: URI with a query-string' do
+      let(:text) { 'please join xmpp:muc@instance.com?join right now' }
+
+      it 'matches the full URI' do
+        is_expected.to include 'href="xmpp:muc@instance.com?join"'
+      end
+    end
+
+    context 'given text containing a magnet: URI' do
+      let(:text) { 'wikipedia gives this example of a magnet uri: magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a' }
+
+      it 'matches the full URI' do
+        is_expected.to include 'href="magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a"'
+      end
+    end
+  end
+end
diff --git a/spec/lib/vacuum/access_tokens_vacuum_spec.rb b/spec/lib/vacuum/access_tokens_vacuum_spec.rb
new file mode 100644
index 000000000..0244c3449
--- /dev/null
+++ b/spec/lib/vacuum/access_tokens_vacuum_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::AccessTokensVacuum do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let!(:revoked_access_token) { Fabricate(:access_token, revoked_at: 1.minute.ago) }
+    let!(:active_access_token) { Fabricate(:access_token) }
+
+    let!(:revoked_access_grant) { Fabricate(:access_grant, revoked_at: 1.minute.ago) }
+    let!(:active_access_grant) { Fabricate(:access_grant) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes revoked access tokens' do
+      expect { revoked_access_token.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'deletes revoked access grants' do
+      expect { revoked_access_grant.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete active access tokens' do
+      expect { active_access_token.reload }.to_not raise_error
+    end
+
+    it 'does not delete active access grants' do
+      expect { active_access_grant.reload }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/vacuum/backups_vacuum_spec.rb b/spec/lib/vacuum/backups_vacuum_spec.rb
new file mode 100644
index 000000000..4e2de083f
--- /dev/null
+++ b/spec/lib/vacuum/backups_vacuum_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::BackupsVacuum do
+  let(:retention_period) { 7.days }
+
+  subject { described_class.new(retention_period) }
+
+  describe '#perform' do
+    let!(:expired_backup) { Fabricate(:backup, created_at: (retention_period + 1.day).ago) }
+    let!(:current_backup) { Fabricate(:backup) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes backups past the retention period' do
+      expect { expired_backup.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete backups within the retention period' do
+      expect { current_backup.reload }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/vacuum/feeds_vacuum_spec.rb b/spec/lib/vacuum/feeds_vacuum_spec.rb
new file mode 100644
index 000000000..0aec26740
--- /dev/null
+++ b/spec/lib/vacuum/feeds_vacuum_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::FeedsVacuum do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let!(:active_user) { Fabricate(:user, current_sign_in_at: 2.days.ago) }
+    let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) }
+
+    before do
+      redis.zadd(feed_key_for(inactive_user), 1, 1)
+      redis.zadd(feed_key_for(active_user), 1, 1)
+      redis.zadd(feed_key_for(inactive_user, 'reblogs'), 2, 2)
+      redis.sadd(feed_key_for(inactive_user, 'reblogs:2'), 3)
+
+      subject.perform
+    end
+
+    it 'clears feeds of inactive users and lists' do
+      expect(redis.zcard(feed_key_for(inactive_user))).to eq 0
+      expect(redis.zcard(feed_key_for(active_user))).to eq 1
+      expect(redis.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false
+      expect(redis.exists?(feed_key_for(inactive_user, 'reblogs:2'))).to be false
+    end
+  end
+
+  def feed_key_for(user, subtype = nil)
+    FeedManager.instance.key(:home, user.account_id, subtype)
+  end
+end
diff --git a/spec/lib/vacuum/media_attachments_vacuum_spec.rb b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
new file mode 100644
index 000000000..be8458d9b
--- /dev/null
+++ b/spec/lib/vacuum/media_attachments_vacuum_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::MediaAttachmentsVacuum do
+  let(:retention_period) { 7.days }
+
+  subject { described_class.new(retention_period) }
+
+  let(:remote_status) { Fabricate(:status, account: Fabricate(:account, domain: 'example.com')) }
+  let(:local_status) { Fabricate(:status) }
+
+  describe '#perform' do
+    let!(:old_remote_media) { Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png', status: remote_status, created_at: (retention_period + 1.day).ago, updated_at: (retention_period + 1.day).ago) }
+    let!(:old_local_media) { Fabricate(:media_attachment, status: local_status, created_at: (retention_period + 1.day).ago, updated_at: (retention_period + 1.day).ago) }
+    let!(:new_remote_media) { Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png', status: remote_status) }
+    let!(:new_local_media) { Fabricate(:media_attachment, status: local_status) }
+    let!(:old_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 10.days.ago) }
+    let!(:new_unattached_media) { Fabricate(:media_attachment, account_id: nil, created_at: 1.hour.ago) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes cache of remote media attachments past the retention period' do
+      expect(old_remote_media.reload.file).to be_blank
+    end
+
+    it 'does not touch local media attachments past the retention period' do
+      expect(old_local_media.reload.file).to_not be_blank
+    end
+
+    it 'does not delete cache of remote media attachments within the retention period' do
+      expect(new_remote_media.reload.file).to_not be_blank
+    end
+
+    it 'does not touch local media attachments within the retention period' do
+      expect(new_local_media.reload.file).to_not be_blank
+    end
+
+    it 'deletes unattached media attachments past TTL' do
+      expect { old_unattached_media.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    it 'does not delete unattached media attachments within TTL' do
+      expect(new_unattached_media.reload).to be_persisted
+    end
+  end
+end
diff --git a/spec/lib/vacuum/preview_cards_vacuum_spec.rb b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
new file mode 100644
index 000000000..275f9ba92
--- /dev/null
+++ b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::PreviewCardsVacuum do
+  let(:retention_period) { 7.days }
+
+  subject { described_class.new(retention_period) }
+
+  describe '#perform' do
+    let!(:orphaned_preview_card) { Fabricate(:preview_card, created_at: 2.days.ago) }
+    let!(:old_preview_card) { Fabricate(:preview_card, updated_at: (retention_period + 1.day).ago) }
+    let!(:new_preview_card) { Fabricate(:preview_card) }
+
+    before do
+      old_preview_card.statuses << Fabricate(:status)
+      new_preview_card.statuses << Fabricate(:status)
+
+      subject.perform
+    end
+
+    it 'deletes cache of preview cards last updated before the retention period' do
+      expect(old_preview_card.reload.image).to be_blank
+    end
+
+    it 'does not delete cache of preview cards last updated within the retention period' do
+      expect(new_preview_card.reload.image).to_not be_blank
+    end
+
+    it 'does not delete attached preview cards' do
+      expect(new_preview_card.reload).to be_persisted
+    end
+  end
+end
diff --git a/spec/lib/vacuum/statuses_vacuum_spec.rb b/spec/lib/vacuum/statuses_vacuum_spec.rb
new file mode 100644
index 000000000..83f3c5c9f
--- /dev/null
+++ b/spec/lib/vacuum/statuses_vacuum_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::StatusesVacuum do
+  let(:retention_period) { 7.days }
+
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+
+  subject { described_class.new(retention_period) }
+
+  describe '#perform' do
+    let!(:remote_status_old) { Fabricate(:status, account: remote_account, created_at: (retention_period + 2.days).ago) }
+    let!(:remote_status_recent) { Fabricate(:status, account: remote_account, created_at: (retention_period - 2.days).ago) }
+    let!(:local_status_old) { Fabricate(:status, created_at: (retention_period + 2.days).ago) }
+    let!(:local_status_recent) { Fabricate(:status, created_at: (retention_period - 2.days).ago) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes remote statuses past the retention period' do
+      expect { remote_status_old.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete local statuses past the retention period' do
+      expect { local_status_old.reload }.to_not raise_error
+    end
+
+    it 'does not delete remote statuses within the retention period' do
+      expect { remote_status_recent.reload }.to_not raise_error
+    end
+
+    it 'does not delete local statuses within the retention period' do
+      expect { local_status_recent.reload }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/vacuum/system_keys_vacuum_spec.rb b/spec/lib/vacuum/system_keys_vacuum_spec.rb
new file mode 100644
index 000000000..565892f02
--- /dev/null
+++ b/spec/lib/vacuum/system_keys_vacuum_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+RSpec.describe Vacuum::SystemKeysVacuum do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let!(:expired_system_key) { Fabricate(:system_key, created_at: (SystemKey::ROTATION_PERIOD * 4).ago) }
+    let!(:current_system_key) { Fabricate(:system_key) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes the expired key' do
+      expect { expired_system_key.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete the current key' do
+      expect { current_system_key.reload }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 236e9f3e2..5c7f475d6 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -50,7 +50,7 @@ describe WebfingerResource do
       end
 
       it 'finds the username in a mixed case http route' do
-        resource = 'HTTp://exAMPLEe.com/users/alice'
+        resource = 'HTTp://exAMPLe.com/users/alice'
 
         result = WebfingerResource.new(resource).username
         expect(result).to eq 'alice'
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 4a8ef7b5e..29fb586a3 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -4,11 +4,15 @@ require 'rails_helper'
 
 RSpec.describe AdminMailer, type: :mailer do
   describe '.new_report' do
-    let(:sender)    { Fabricate(:account, username: 'John', user: Fabricate(:user)) }
-    let(:recipient) { Fabricate(:account, username: 'Mike', user: Fabricate(:user, locale: :en)) }
+    let(:sender)    { Fabricate(:account, username: 'John') }
+    let(:recipient) { Fabricate(:account, username: 'Mike') }
     let(:report)    { Fabricate(:report, account: sender, target_account: recipient) }
     let(:mail)      { described_class.new_report(recipient, report) }
 
+    before do
+      recipient.user.update(locale: :en)
+    end
+
     it 'renders the headers' do
       expect(mail.subject).to eq("New report for cb6e6126.ngrok.io (##{report.id})")
       expect(mail.to).to eq [recipient.user_email]
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 9b645bad8..29bdc349b 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe NotificationMailer, type: :mailer do
-  let(:receiver)       { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:receiver)       { Fabricate(:user) }
   let(:sender)         { Fabricate(:account, username: 'bob') }
   let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
   let(:own_status)     { Fabricate(:status, account: receiver.account, text: 'The body of the own status') }
@@ -101,35 +101,4 @@ RSpec.describe NotificationMailer, type: :mailer do
       expect(mail.body.encoded).to match("bob has requested to follow you")
     end
   end
-
-  describe 'digest' do
-    before do
-      mention = Fabricate(:mention, account: receiver.account, status: foreign_status)
-      Fabricate(:notification, account: receiver.account, activity: mention)
-      sender.follow!(receiver.account)
-    end
-
-    context do
-      let!(:mail) { NotificationMailer.digest(receiver.account, since: 5.days.ago) }
-
-      include_examples 'localized subject', 'notification_mailer.digest.subject', count: 1, name: 'bob'
-
-      it 'renders the headers' do
-        expect(mail.subject).to match('notification since your last')
-        expect(mail.to).to eq([receiver.email])
-      end
-
-      it 'renders the body' do
-        expect(mail.body.encoded).to match('brief summary')
-        expect(mail.body.encoded).to include 'The body of the foreign status'
-        expect(mail.body.encoded).to include sender.username
-      end
-    end
-
-    it 'includes activities since the receiver last signed in' do
-      receiver.update!(last_emailed_at: nil, current_sign_in_at: '2000-03-01T00:00:00Z')
-      mail = NotificationMailer.digest(receiver.account)
-      expect(mail.body.encoded).to include 'Mar 01, 2000, 00:00'
-    end
-  end
 end
diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb
index 75ffbbf40..0ec9e9882 100644
--- a/spec/mailers/previews/admin_mailer_preview.rb
+++ b/spec/mailers/previews/admin_mailer_preview.rb
@@ -6,13 +6,13 @@ class AdminMailerPreview < ActionMailer::Preview
     AdminMailer.new_pending_account(Account.first, User.pending.first)
   end
 
-  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_trending_tags
-  def new_trending_tags
-    AdminMailer.new_trending_tags(Account.first, Tag.limit(3))
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_trends
+  def new_trends
+    AdminMailer.new_trends(Account.first, PreviewCard.joins(:trend).limit(3), Tag.limit(3), Status.joins(:trend).where(reblog_of_id: nil).limit(3))
   end
 
-  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_trending_links
-  def new_trending_links
-    AdminMailer.new_trending_links(Account.first, PreviewCard.limit(3))
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_appeal
+  def new_appeal
+    AdminMailer.new_appeal(Account.first, Appeal.first)
   end
 end
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 6d87fd706..95712e6cf 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -79,11 +79,16 @@ class UserMailerPreview < ActionMailer::Preview
 
   # Preview this email at http://localhost:3000/rails/mailers/user_mailer/warning
   def warning
-    UserMailer.warning(User.first, AccountWarning.new(text: '', action: :silence), [Status.first.id])
+    UserMailer.warning(User.first, AccountWarning.last)
   end
 
-  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/sign_in_token
-  def sign_in_token
-    UserMailer.sign_in_token(User.first.tap { |user| user.generate_sign_in_token }, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/appeal_approved
+  def appeal_approved
+    UserMailer.appeal_approved(User.first, Appeal.last)
+  end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/suspicious_sign_in
+  def suspicious_sign_in
+    UserMailer.suspicious_sign_in(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
   end
 end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 9c866788f..2ed33c1e4 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -83,4 +83,15 @@ describe UserMailer, type: :mailer do
     include_examples 'localized subject',
                      'devise.mailer.email_changed.subject'
   end
+
+  describe 'warning' do
+    let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend') }
+    let(:mail)   { UserMailer.warning(receiver, strike) }
+
+    it 'renders warning notification' do
+      receiver.update!(locale: nil)
+      expect(mail.body.encoded).to include I18n.t("user_mailer.warning.title.suspend", acct: receiver.account.acct)
+      expect(mail.body.encoded).to include strike.text
+    end
+  end
 end
diff --git a/spec/models/account/field_spec.rb b/spec/models/account/field_spec.rb
new file mode 100644
index 000000000..0ac9769bc
--- /dev/null
+++ b/spec/models/account/field_spec.rb
@@ -0,0 +1,162 @@
+require 'rails_helper'
+
+RSpec.describe Account::Field, type: :model do
+  describe '#verified?' do
+    let(:account) { double('Account', local?: true) }
+
+    subject { described_class.new(account, 'name' => 'Foo', 'value' => 'Bar', 'verified_at' => verified_at) }
+
+    context 'when verified_at is set' do
+      let(:verified_at) { Time.now.utc.iso8601 }
+
+      it 'returns true' do
+        expect(subject.verified?).to be true
+      end
+    end
+
+    context 'when verified_at is not set' do
+      let(:verified_at) { nil }
+
+      it 'returns false' do
+        expect(subject.verified?).to be false
+      end
+    end
+  end
+
+  describe '#mark_verified!' do
+    let(:account) { double('Account', local?: true) }
+    let(:original_hash) { { 'name' => 'Foo', 'value' => 'Bar' } }
+
+    subject { described_class.new(account, original_hash) }
+
+    before do
+      subject.mark_verified!
+    end
+
+    it 'updates verified_at' do
+      expect(subject.verified_at).to_not be_nil
+    end
+
+    it 'updates original hash' do
+      expect(original_hash['verified_at']).to_not be_nil
+    end
+  end
+
+  describe '#verifiable?' do
+    let(:account) { double('Account', local?: local) }
+
+    subject { described_class.new(account, 'name' => 'Foo', 'value' => value) }
+
+    context 'for local accounts' do
+      let(:local) { true }
+
+      context 'for a URL with misleading authentication' do
+        let(:value) { 'https://spacex.com                                                                                            @h.43z.one' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for a URL' do
+        let(:value) { 'https://example.com' }
+
+        it 'returns true' do
+          expect(subject.verifiable?).to be true
+        end
+      end
+
+      context 'for an IDN URL' do
+        let(:value) { 'https://twitter.com∕dougallj∕status∕1590357240443437057.ê.cc/twitter.html' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for a URL with a non-normalized path' do
+        let(:value) { 'https://github.com/octocatxxxxxxxx/../mastodon' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for text that is not a URL' do
+        let(:value) { 'Hello world' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for text that contains a URL' do
+        let(:value) { 'Hello https://example.com world' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+      
+      context 'for text which is blank' do
+        let(:value) { '' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+    end
+
+    context 'for remote accounts' do
+      let(:local) { false }
+
+      context 'for a link' do
+        let(:value) { '<a href="https://www.patreon.com/mastodon" target="_blank" rel="nofollow noopener noreferrer me"><span class="invisible">https://www.</span><span class="">patreon.com/mastodon</span><span class="invisible"></span></a>' }
+
+        it 'returns true' do
+          expect(subject.verifiable?).to be true
+        end
+      end
+
+      context 'for a link with misleading authentication' do
+        let(:value) { '<a href="https://google.com                                                                                            @h.43z.one" target="_blank" rel="nofollow noopener noreferrer me"><span class="invisible">https://</span><span class="">google.com</span><span class="invisible">                                                                                            @h.43z.one</span></a>' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for HTML that has more than just a link' do
+        let(:value) { '<a href="https://google.com" target="_blank" rel="nofollow noopener noreferrer me"><span class="invisible">https://</span><span class="">google.com</span><span class="invisible"></span></a>                                                                                            @h.43z.one' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for a link with different visible text' do
+        let(:value) { '<a href="https://google.com/bar">https://example.com/foo</a>' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+
+      context 'for text that is a URL but is not linked' do
+        let(:value) { 'https://example.com/foo' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+      
+      context 'for text which is blank' do
+        let(:value) { '' }
+
+        it 'returns false' do
+          expect(subject.verifiable?).to be false
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb
index 8461b4b28..5f66fe8da 100644
--- a/spec/models/account_migration_spec.rb
+++ b/spec/models/account_migration_spec.rb
@@ -1,5 +1,48 @@
 require 'rails_helper'
 
 RSpec.describe AccountMigration, type: :model do
+  describe 'validations' do
+    let(:source_account) { Fabricate(:account) }
+    let(:target_acct)    { target_account.acct }
 
+    let(:subject) { AccountMigration.new(account: source_account, acct: target_acct) }
+
+    context 'with valid properties' do
+      let(:target_account) { Fabricate(:account, username: 'target', domain: 'remote.org') }
+
+      before do
+        target_account.aliases.create!(acct: source_account.acct)
+
+        service_double = double
+        allow(ResolveAccountService).to receive(:new).and_return(service_double)
+        allow(service_double).to receive(:call).with(target_acct, anything).and_return(target_account)
+      end
+
+      it 'passes validations' do
+        expect(subject).to be_valid
+      end
+    end
+
+    context 'with unresolveable account' do
+      let(:target_acct) { 'target@remote' }
+
+      before do
+        service_double = double
+        allow(ResolveAccountService).to receive(:new).and_return(service_double)
+        allow(service_double).to receive(:call).with(target_acct, anything).and_return(nil)
+      end
+
+      it 'has errors on acct field' do
+        expect(subject).to model_have_error_on_field(:acct)
+      end
+    end
+
+    context 'with a space in the domain part' do
+      let(:target_acct) { 'target@remote. org' }
+
+      it 'has errors on acct field' do
+        expect(subject).to model_have_error_on_field(:acct)
+      end
+    end
+  end
 end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 65e6714c0..6cd769dc8 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Account, type: :model do
       end
 
       context 'when the account is of a local user' do
-        let!(:subject) { Fabricate(:account, user: Fabricate(:user, email: 'foo+bar@domain.org')) }
+        let!(:subject) { Fabricate(:user, email: 'foo+bar@domain.org').account }
 
         it 'creates a canonical domain block' do
           subject.suspend!
@@ -160,7 +160,7 @@ RSpec.describe Account, type: :model do
         expect(account.avatar_remote_url).to eq 'https://remote.test/invalid_avatar'
         expect(account.header_remote_url).to eq expectation.header_remote_url
         expect(account.avatar_file_name).to  eq nil
-        expect(account.header_file_name).to  eq nil
+        expect(account.header_file_name).to  eq expectation.header_file_name
       end
     end
   end
@@ -255,7 +255,7 @@ RSpec.describe Account, type: :model do
         Fabricate(:status, reblog: original_status, account: author)
       end
 
-      it 'is is true when this account has favourited it' do
+      it 'is true when this account has favourited it' do
         Fabricate(:favourite, status: original_reblog, account: subject)
 
         expect(subject.favourited?(original_status)).to eq true
@@ -267,7 +267,7 @@ RSpec.describe Account, type: :model do
     end
 
     context 'when the status is an original status' do
-      it 'is is true when this account has favourited it' do
+      it 'is true when this account has favourited it' do
         Fabricate(:favourite, status: original_status, account: subject)
 
         expect(subject.favourited?(original_status)).to eq true
@@ -350,6 +350,45 @@ RSpec.describe Account, type: :model do
       )
     end
 
+    it 'does not return suspended users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username',
+        domain: 'example.com',
+        suspended: true
+      )
+
+      results = Account.search_for('username')
+      expect(results).to eq []
+    end
+
+    it 'does not return unapproved users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username'
+      )
+
+      match.user.update(approved: false)
+
+      results = Account.search_for('username')
+      expect(results).to eq []
+    end
+
+    it 'does not return unconfirmed users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username'
+      )
+
+      match.user.update(confirmed_at: nil)
+
+      results = Account.search_for('username')
+      expect(results).to eq []
+    end
+
     it 'accepts ?, \, : and space as delimiter' do
       match = Fabricate(
         :account,
@@ -406,7 +445,7 @@ RSpec.describe Account, type: :model do
 
     it 'accepts arbitrary limits' do
       2.times.each { Fabricate(:account, display_name: "Display Name") }
-      results = Account.search_for("display", 1)
+      results = Account.search_for("display", limit: 1)
       expect(results.size).to eq 1
     end
 
@@ -422,8 +461,114 @@ RSpec.describe Account, type: :model do
   end
 
   describe '.advanced_search_for' do
+    let(:account) { Fabricate(:account) }
+
+    context 'when limiting search to followed accounts' do
+      it 'accepts ?, \, : and space as delimiter' do
+        match = Fabricate(
+          :account,
+          display_name: 'A & l & i & c & e',
+          username: 'username',
+          domain: 'example.com'
+        )
+        account.follow!(match)
+
+        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
+        expect(results).to eq [match]
+      end
+
+      it 'does not return non-followed accounts' do
+        match = Fabricate(
+          :account,
+          display_name: 'A & l & i & c & e',
+          username: 'username',
+          domain: 'example.com'
+        )
+
+        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
+        expect(results).to eq []
+      end
+
+      it 'does not return suspended users' do
+        match = Fabricate(
+          :account,
+          display_name: 'Display Name',
+          username: 'username',
+          domain: 'example.com',
+          suspended: true
+        )
+
+        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        expect(results).to eq []
+      end
+
+      it 'does not return unapproved users' do
+        match = Fabricate(
+          :account,
+          display_name: 'Display Name',
+          username: 'username'
+        )
+
+        match.user.update(approved: false)
+
+        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        expect(results).to eq []
+      end
+
+      it 'does not return unconfirmed users' do
+        match = Fabricate(
+          :account,
+          display_name: 'Display Name',
+          username: 'username'
+        )
+
+        match.user.update(confirmed_at: nil)
+
+        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        expect(results).to eq []
+      end
+    end
+
+    it 'does not return suspended users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username',
+        domain: 'example.com',
+        suspended: true
+      )
+
+      results = Account.advanced_search_for('username', account)
+      expect(results).to eq []
+    end
+
+    it 'does not return unapproved users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username'
+      )
+
+      match.user.update(approved: false)
+
+      results = Account.advanced_search_for('username', account)
+      expect(results).to eq []
+    end
+
+    it 'does not return unconfirmed users' do
+      match = Fabricate(
+        :account,
+        display_name: 'Display Name',
+        username: 'username'
+      )
+
+      match.user.update(confirmed_at: nil)
+
+      results = Account.advanced_search_for('username', account)
+      expect(results).to eq []
+    end
+
     it 'accepts ?, \, : and space as delimiter' do
-      account = Fabricate(:account)
       match = Fabricate(
         :account,
         display_name: 'A & l & i & c & e',
@@ -437,18 +582,17 @@ RSpec.describe Account, type: :model do
 
     it 'limits by 10 by default' do
       11.times { Fabricate(:account, display_name: "Display Name") }
-      results = Account.search_for("display")
+      results = Account.advanced_search_for("display", account)
       expect(results.size).to eq 10
     end
 
     it 'accepts arbitrary limits' do
       2.times { Fabricate(:account, display_name: "Display Name") }
-      results = Account.search_for("display", 1)
+      results = Account.advanced_search_for("display", account, limit: 1)
       expect(results.size).to eq 1
     end
 
     it 'ranks followed accounts higher' do
-      account = Fabricate(:account)
       match = Fabricate(:account, username: "Matching")
       followed_match = Fabricate(:account, username: "Matcher")
       Fabricate(:follow, account: account, target_account: followed_match)
@@ -514,6 +658,12 @@ RSpec.describe Account, type: :model do
     end
   end
 
+  describe '.requested_by_map' do
+    it 'returns an hash' do
+      expect(Account.requested_by_map([], 1)).to be_a Hash
+    end
+  end
+
   describe 'MENTION_RE' do
     subject { Account::MENTION_RE }
 
@@ -611,7 +761,7 @@ RSpec.describe Account, type: :model do
         expect(account).to model_have_error_on_field(:username)
       end
 
-      it 'is invalid if the username is longer then 30 characters' do
+      it 'is invalid if the username is longer than 30 characters' do
         account = Fabricate.build(:account, username: Faker::Lorem.characters(number: 31))
         account.valid?
         expect(account).to model_have_error_on_field(:username)
@@ -657,7 +807,7 @@ RSpec.describe Account, type: :model do
         expect(account).to model_have_error_on_field(:username)
       end
 
-      it 'is valid even if the username is longer then 30 characters' do
+      it 'is valid even if the username is longer than 30 characters' do
         account = Fabricate.build(:account, domain: 'domain', username: Faker::Lorem.characters(number: 31))
         account.valid?
         expect(account).not_to model_have_error_on_field(:username)
@@ -775,6 +925,32 @@ RSpec.describe Account, type: :model do
         expect(Account.suspended).to match_array([account_1])
       end
     end
+
+    describe 'searchable' do
+      let!(:suspended_local)        { Fabricate(:account, suspended: true, username: 'suspended_local') }
+      let!(:suspended_remote)       { Fabricate(:account, suspended: true, domain: 'example.org', username: 'suspended_remote') }
+      let!(:silenced_local)         { Fabricate(:account, silenced: true, username: 'silenced_local') }
+      let!(:silenced_remote)        { Fabricate(:account, silenced: true, domain: 'example.org', username: 'silenced_remote') }
+      let!(:unconfirmed)            { Fabricate(:user, confirmed_at: nil).account }
+      let!(:unapproved)             { Fabricate(:user, approved: false).account }
+      let!(:unconfirmed_unapproved) { Fabricate(:user, confirmed_at: nil, approved: false).account }
+      let!(:local_account)          { Fabricate(:account, username: 'local_account') }
+      let!(:remote_account)         { Fabricate(:account, domain: 'example.org', username: 'remote_account') }
+
+      before do
+        # Accounts get automatically-approved depending on settings, so ensure they aren't approved
+        unapproved.user.update(approved: false)
+        unconfirmed_unapproved.user.update(approved: false)
+      end
+
+      it 'returns every usable non-suspended account' do
+        expect(Account.searchable).to match_array([silenced_local, silenced_remote, local_account, remote_account])
+      end
+
+      it 'does not mess with previously-applied scopes' do
+        expect(Account.where.not(id: remote_account.id).searchable).to match_array([silenced_local, silenced_remote, local_account])
+      end
+    end
   end
 
   context 'when is local' do
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index 4732ad625..b01321a20 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -495,7 +495,7 @@ RSpec.describe AccountStatusesCleanupPolicy, type: :model do
       end
 
       it 'returns only normal statuses for deletion' do
-        expect(subject.pluck(:id).sort).to eq [very_old_status.id, faved4.id, faved5.id, reblogged4.id, reblogged5.id].sort
+        expect(subject.pluck(:id)).to match_array([very_old_status.id, faved4.id, faved5.id, reblogged4.id, reblogged5.id])
       end
     end
 
diff --git a/spec/models/account_statuses_filter_spec.rb b/spec/models/account_statuses_filter_spec.rb
new file mode 100644
index 000000000..03f0ffeb0
--- /dev/null
+++ b/spec/models/account_statuses_filter_spec.rb
@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountStatusesFilter do
+  let(:account) { Fabricate(:account) }
+  let(:current_account) { nil }
+  let(:params) { {} }
+
+  subject { described_class.new(account, current_account, params) }
+
+  def status!(visibility)
+    Fabricate(:status, account: account, visibility: visibility)
+  end
+
+  def status_with_tag!(visibility, tag)
+    Fabricate(:status, account: account, visibility: visibility, tags: [tag])
+  end
+
+  def status_with_parent!(visibility)
+    Fabricate(:status, account: account, visibility: visibility, thread: Fabricate(:status))
+  end
+
+  def status_with_reblog!(visibility)
+    Fabricate(:status, account: account, visibility: visibility, reblog: Fabricate(:status))
+  end
+
+  def status_with_mention!(visibility, mentioned_account = nil)
+    Fabricate(:status, account: account, visibility: visibility).tap do |status|
+      Fabricate(:mention, status: status, account: mentioned_account || Fabricate(:account))
+    end
+  end
+
+  def status_with_media_attachment!(visibility)
+    Fabricate(:status, account: account, visibility: visibility).tap do |status|
+      Fabricate(:media_attachment, account: account, status: status)
+    end
+  end
+
+  describe '#results' do
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      status!(:public)
+      status!(:unlisted)
+      status!(:private)
+      status_with_parent!(:public)
+      status_with_reblog!(:public)
+      status_with_tag!(:public, tag)
+      status_with_mention!(:direct)
+      status_with_media_attachment!(:public)
+    end
+
+    shared_examples 'filter params' do
+      context 'with only_media param' do
+        let(:params) { { only_media: true } }
+
+        it 'returns only statuses with media' do
+          expect(subject.results.all?(&:with_media?)).to be true
+        end
+      end
+
+      context 'with tagged param' do
+        let(:params) { { tagged: tag.name } }
+
+        it 'returns only statuses with tag' do
+          expect(subject.results.all? { |s| s.tags.include?(tag) }).to be true
+        end
+      end
+
+      context 'with exclude_replies param' do
+        let(:params) { { exclude_replies: true } }
+
+        it 'returns only statuses that are not replies' do
+          expect(subject.results.none?(&:reply?)).to be true
+        end
+      end
+
+      context 'with exclude_reblogs param' do
+        let(:params) { { exclude_reblogs: true } }
+
+        it 'returns only statuses that are not reblogs' do
+          expect(subject.results.none?(&:reblog?)).to be true
+        end
+      end
+    end
+
+    context 'when accessed anonymously' do
+      let(:current_account) { nil }
+      let(:direct_status) { nil }
+
+      it 'returns only public statuses' do
+        expect(subject.results.pluck(:visibility).uniq).to match_array %w(unlisted public)
+      end
+
+      it 'returns public replies' do
+        expect(subject.results.pluck(:in_reply_to_id)).to_not be_empty
+      end
+
+      it 'returns public reblogs' do
+        expect(subject.results.pluck(:reblog_of_id)).to_not be_empty
+      end
+
+      it_behaves_like 'filter params'
+    end
+
+    context 'when accessed with a blocked account' do
+      let(:current_account) { Fabricate(:account) }
+
+      before do
+        account.block!(current_account)
+      end
+
+      it 'returns nothing' do
+        expect(subject.results.to_a).to be_empty
+      end
+    end
+
+    context 'when accessed by self' do
+      let(:current_account) { account }
+
+      it 'returns everything' do
+        expect(subject.results.pluck(:visibility).uniq).to match_array %w(direct private unlisted public)
+      end
+
+      it 'returns replies' do
+        expect(subject.results.pluck(:in_reply_to_id)).to_not be_empty
+      end
+
+      it 'returns reblogs' do
+        expect(subject.results.pluck(:reblog_of_id)).to_not be_empty
+      end
+
+      it_behaves_like 'filter params'
+    end
+
+    context 'when accessed by a follower' do
+      let(:current_account) { Fabricate(:account) }
+
+      before do
+        current_account.follow!(account)
+      end
+
+      it 'returns private statuses' do
+        expect(subject.results.pluck(:visibility).uniq).to match_array %w(private unlisted public)
+      end
+
+      it 'returns replies' do
+        expect(subject.results.pluck(:in_reply_to_id)).to_not be_empty
+      end
+
+      it 'returns reblogs' do
+        expect(subject.results.pluck(:reblog_of_id)).to_not be_empty
+      end
+
+      context 'when there is a direct status mentioning the non-follower' do
+        let!(:direct_status) { status_with_mention!(:direct, current_account) }
+
+        it 'returns the direct status' do
+          expect(subject.results.pluck(:id)).to include(direct_status.id)
+        end
+      end
+
+      it_behaves_like 'filter params'
+    end
+
+    context 'when accessed by a non-follower' do
+      let(:current_account) { Fabricate(:account) }
+
+      it 'returns only public statuses' do
+        expect(subject.results.pluck(:visibility).uniq).to match_array %w(unlisted public)
+      end
+
+      it 'returns public replies' do
+        expect(subject.results.pluck(:in_reply_to_id)).to_not be_empty
+      end
+
+      it 'returns public reblogs' do
+        expect(subject.results.pluck(:reblog_of_id)).to_not be_empty
+      end
+
+      context 'when there is a private status mentioning the non-follower' do
+        let!(:private_status) { status_with_mention!(:private, current_account) }
+
+        it 'returns the private status' do
+          expect(subject.results.pluck(:id)).to include(private_status.id)
+        end
+      end
+
+      context 'when blocking a reblogged account' do
+        let(:reblog) { status_with_reblog!('public') }
+
+        before do
+          current_account.block!(reblog.reblog.account)
+        end
+
+        it 'does not return reblog of blocked account' do
+          expect(subject.results.pluck(:id)).to_not include(reblog.id)
+        end
+      end
+
+      context 'when muting a reblogged account' do
+        let(:reblog) { status_with_reblog!('public') }
+
+        before do
+          current_account.mute!(reblog.reblog.account)
+        end
+
+        it 'does not return reblog of muted account' do
+          expect(subject.results.pluck(:id)).to_not include(reblog.id)
+        end
+      end
+
+      context 'when blocked by a reblogged account' do
+        let(:reblog) { status_with_reblog!('public') }
+
+        before do
+          reblog.reblog.account.block!(current_account)
+        end
+
+        it 'does not return reblog of blocked-by account' do
+          expect(subject.results.pluck(:id)).to_not include(reblog.id)
+        end
+      end
+
+      it_behaves_like 'filter params'
+    end
+  end
+end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 2366b9ca4..b6a052b76 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -5,8 +5,8 @@ RSpec.describe Admin::AccountAction, type: :model do
 
   describe '#save!' do
     subject              { account_action.save! }
-    let(:account)        { Fabricate(:account, user: Fabricate(:user, admin: true)) }
-    let(:target_account) { Fabricate(:account, user: Fabricate(:user)) }
+    let(:account)        { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+    let(:target_account) { Fabricate(:account) }
     let(:type)           { 'disable' }
 
     before do
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
new file mode 100644
index 000000000..14062dc4f
--- /dev/null
+++ b/spec/models/appeal_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Appeal, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/concerns/account_interactions_spec.rb b/spec/models/concerns/account_interactions_spec.rb
index 0369aff10..1d1898ab0 100644
--- a/spec/models/concerns/account_interactions_spec.rb
+++ b/spec/models/concerns/account_interactions_spec.rb
@@ -14,7 +14,7 @@ describe AccountInteractions do
     context 'account with Follow' do
       it 'returns { target_account_id => true }' do
         Fabricate(:follow, account: account, target_account: target_account)
-        is_expected.to eq(target_account_id => { reblogs: true, notify: false })
+        is_expected.to eq(target_account_id => { reblogs: true, notify: false, languages: nil })
       end
     end
 
diff --git a/spec/models/custom_emoji_filter_spec.rb b/spec/models/custom_emoji_filter_spec.rb
index d859f5c5f..2b1b5dc54 100644
--- a/spec/models/custom_emoji_filter_spec.rb
+++ b/spec/models/custom_emoji_filter_spec.rb
@@ -50,10 +50,10 @@ RSpec.describe CustomEmojiFilter do
       context 'else' do
         let(:params) { { else: 'else' } }
 
-        it 'raises RuntimeError' do
+        it 'raises Mastodon::InvalidParameterError' do
           expect do
             subject
-          end.to raise_error(RuntimeError, /Unknown filter: else/)
+          end.to raise_error(Mastodon::InvalidParameterError, /Unknown filter: else/)
         end
       end
     end
diff --git a/spec/models/custom_filter_keyword_spec.rb b/spec/models/custom_filter_keyword_spec.rb
new file mode 100644
index 000000000..e15b9dad5
--- /dev/null
+++ b/spec/models/custom_filter_keyword_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe CustomFilterKeyword, type: :model do
+end
diff --git a/spec/models/email_domain_block_spec.rb b/spec/models/email_domain_block_spec.rb
index efd2853a9..e23116888 100644
--- a/spec/models/email_domain_block_spec.rb
+++ b/spec/models/email_domain_block_spec.rb
@@ -9,14 +9,42 @@ RSpec.describe EmailDomainBlock, type: :model do
   end
 
   describe 'block?' do
-    it 'returns true if the domain is registed' do
-      Fabricate(:email_domain_block, domain: 'example.com')
-      expect(EmailDomainBlock.block?('nyarn@example.com')).to eq true
+    let(:input) { nil }
+
+    context 'given an e-mail address' do
+      let(:input) { "foo@#{domain}" }
+
+      context do
+        let(:domain) { 'example.com' }
+
+        it 'returns true if the domain is blocked' do
+          Fabricate(:email_domain_block, domain: 'example.com')
+          expect(EmailDomainBlock.block?(input)).to be true
+        end
+
+        it 'returns false if the domain is not blocked' do
+          Fabricate(:email_domain_block, domain: 'other-example.com')
+          expect(EmailDomainBlock.block?(input)).to be false
+        end
+      end
+
+      context do
+        let(:domain) { 'mail.example.com' }
+
+        it 'returns true if it is a subdomain of a blocked domain' do
+          Fabricate(:email_domain_block, domain: 'example.com')
+          expect(described_class.block?(input)).to be true
+        end
+      end
     end
 
-    it 'returns true if the domain is not registed' do
-      Fabricate(:email_domain_block, domain: 'example.com')
-      expect(EmailDomainBlock.block?('nyarn@example.net')).to eq false
+    context 'given an array of domains' do
+      let(:input) { %w(foo.com mail.foo.com) }
+
+      it 'returns true if the domain is blocked' do
+        Fabricate(:email_domain_block, domain: 'mail.foo.com')
+        expect(EmailDomainBlock.block?(input)).to be true
+      end
     end
   end
 end
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 4e6b824bb..135d7a36b 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -35,8 +35,8 @@ describe Export do
       results = export.strip.split("\n")
 
       expect(results.size).to eq 3
-      expect(results.first).to eq 'Account address,Show boosts'
-      expect(results.second).to eq 'one@local.host,true'
+      expect(results.first).to eq 'Account address,Show boosts,Notify on new posts,Languages'
+      expect(results.second).to eq 'one@local.host,true,false,'
     end
   end
 
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
index 36ce8ee60..901eabc9d 100644
--- a/spec/models/follow_request_spec.rb
+++ b/spec/models/follow_request_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowRequest, type: :model do
     let(:target_account) { Fabricate(:account) }
 
     it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
-      expect(account).to        receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri, bypass_limit: true)
+      expect(account).to        receive(:follow!).with(target_account, reblogs: true, notify: false, uri: follow_request.uri, languages: nil, bypass_limit: true)
       expect(MergeWorker).to    receive(:perform_async).with(target_account.id, account.id)
       expect(follow_request).to receive(:destroy!)
       follow_request.authorize!
diff --git a/spec/models/form/status_batch_spec.rb b/spec/models/form/status_batch_spec.rb
deleted file mode 100644
index 68d84a737..000000000
--- a/spec/models/form/status_batch_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'rails_helper'
-
-describe Form::StatusBatch do
-  let(:form) { Form::StatusBatch.new(action: action, status_ids: status_ids) }
-  let(:status) { Fabricate(:status) }
-
-  describe 'with nsfw action' do
-    let(:status_ids) { [status.id, nonsensitive_status.id, sensitive_status.id] }
-    let(:nonsensitive_status) { Fabricate(:status, sensitive: false) }
-    let(:sensitive_status) { Fabricate(:status, sensitive: true) }
-    let!(:shown_media_attachment) { Fabricate(:media_attachment, status: nonsensitive_status) }
-    let!(:hidden_media_attachment) { Fabricate(:media_attachment, status: sensitive_status) }
-
-    context 'nsfw_on' do
-      let(:action) { 'nsfw_on' }
-
-      it { expect(form.save).to be true }
-      it { expect { form.save }.to change { nonsensitive_status.reload.sensitive }.from(false).to(true) }
-      it { expect { form.save }.not_to change { sensitive_status.reload.sensitive } }
-      it { expect { form.save }.not_to change { status.reload.sensitive } }
-    end
-
-    context 'nsfw_off' do
-      let(:action) { 'nsfw_off' }
-
-      it { expect(form.save).to be true }
-      it { expect { form.save }.to change { sensitive_status.reload.sensitive }.from(true).to(false) }
-      it { expect { form.save }.not_to change { nonsensitive_status.reload.sensitive } }
-      it { expect { form.save }.not_to change { status.reload.sensitive } }
-    end
-  end
-
-  describe 'with delete action' do
-    let(:status_ids) { [status.id] }
-    let(:action) { 'delete' }
-    let!(:another_status) { Fabricate(:status) }
-
-    before do
-      allow(RemovalWorker).to receive(:perform_async)
-    end
-
-    it 'call RemovalWorker' do
-      form.save
-      expect(RemovalWorker).to have_received(:perform_async).with(status.id, immediate: true)
-    end
-
-    it 'do not call RemovalWorker' do
-      form.save
-      expect(RemovalWorker).not_to have_received(:perform_async).with(another_status.id, immediate: true)
-    end
-  end
-end
diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb
index ee7a83960..80f6edbff 100644
--- a/spec/models/home_feed_spec.rb
+++ b/spec/models/home_feed_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe HomeFeed, type: :model do
 
     context 'when feed is generated' do
       before do
-        Redis.current.zadd(
+        redis.zadd(
           FeedManager.instance.key(:home, account.id),
           [[4, 4], [3, 3], [2, 2], [1, 1]]
         )
@@ -31,7 +31,7 @@ RSpec.describe HomeFeed, type: :model do
 
     context 'when feed is being generated' do
       before do
-        Redis.current.set("account:#{account.id}:regeneration", true)
+        redis.set("account:#{account.id}:regeneration", true)
       end
 
       it 'returns nothing' do
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 7360b23cf..29fd313ae 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -157,9 +157,9 @@ RSpec.describe MediaAttachment, type: :model do
       expect(media.file.meta["original"]["width"]).to eq 600
       expect(media.file.meta["original"]["height"]).to eq 400
       expect(media.file.meta["original"]["aspect"]).to eq 1.5
-      expect(media.file.meta["small"]["width"]).to eq 490
-      expect(media.file.meta["small"]["height"]).to eq 327
-      expect(media.file.meta["small"]["aspect"]).to eq 490.0 / 327
+      expect(media.file.meta["small"]["width"]).to eq 588
+      expect(media.file.meta["small"]["height"]).to eq 392
+      expect(media.file.meta["small"]["aspect"]).to eq 1.5
     end
 
     it 'gives the file a random name' do
@@ -186,14 +186,6 @@ RSpec.describe MediaAttachment, type: :model do
     expect(media.valid?).to be false
   end
 
-  describe 'descriptions for remote attachments' do
-    it 'are cut off at 1500 characters' do
-      media = Fabricate(:media_attachment, description: 'foo' * 1000, remote_url: 'http://example.com/blah.jpg')
-
-      expect(media.description.size).to be <= 1_500
-    end
-  end
-
   describe 'size limit validation' do
     it 'rejects video files that are too large' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
diff --git a/spec/models/preview_card_trend_spec.rb b/spec/models/preview_card_trend_spec.rb
new file mode 100644
index 000000000..c7ab6ed14
--- /dev/null
+++ b/spec/models/preview_card_trend_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe PreviewCardTrend, type: :model do
+end
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
index 0392a582c..0ffc343f1 100644
--- a/spec/models/public_feed_spec.rb
+++ b/spec/models/public_feed_spec.rb
@@ -31,7 +31,6 @@ RSpec.describe PublicFeed, type: :model do
     end
 
     it 'filters out silenced accounts' do
-      account = Fabricate(:account)
       silenced_account = Fabricate(:account, silenced: true)
       status = Fabricate(:status, account: account)
       silenced_status = Fabricate(:status, account: silenced_account)
@@ -176,8 +175,7 @@ RSpec.describe PublicFeed, type: :model do
 
       context 'with language preferences' do
         it 'excludes statuses in languages not allowed by the account user' do
-          user = Fabricate(:user, chosen_languages: [:en, :es])
-          @account.update(user: user)
+          @account.user.update(chosen_languages: [:en, :es])
           en_status = Fabricate(:status, language: 'en')
           es_status = Fabricate(:status, language: 'es')
           fr_status = Fabricate(:status, language: 'fr')
@@ -188,8 +186,7 @@ RSpec.describe PublicFeed, type: :model do
         end
 
         it 'includes all languages when user does not have a setting' do
-          user = Fabricate(:user, chosen_languages: nil)
-          @account.update(user: user)
+          @account.user.update(chosen_languages: nil)
 
           en_status = Fabricate(:status, language: 'en')
           es_status = Fabricate(:status, language: 'es')
@@ -199,7 +196,8 @@ RSpec.describe PublicFeed, type: :model do
         end
 
         it 'includes all languages when account does not have a user' do
-          expect(@account.user).to be_nil
+          @account.update(user: nil)
+
           en_status = Fabricate(:status, language: 'en')
           es_status = Fabricate(:status, language: 'es')
 
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 312954c9d..874be4132 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -11,14 +11,13 @@ describe Report do
     end
   end
 
-  describe 'media_attachments' do
-    it 'returns media attachments from statuses' do
-      status = Fabricate(:status)
-      media_attachment = Fabricate(:media_attachment, status: status)
-      _other_media_attachment = Fabricate(:media_attachment)
-      report = Fabricate(:report, status_ids: [status.id])
+  describe 'media_attachments_count' do
+    it 'returns count of media attachments in statuses' do
+      status1 = Fabricate(:status, ordered_media_attachment_ids: [1, 2])
+      status2 = Fabricate(:status, ordered_media_attachment_ids: [5])
+      report  = Fabricate(:report, status_ids: [status1.id, status2.id])
 
-      expect(report.media_attachments).to eq [media_attachment]
+      expect(report.media_attachments_count).to eq 3
     end
   end
 
@@ -54,7 +53,7 @@ describe Report do
   end
 
   describe 'resolve!' do
-    subject(:report) { Fabricate(:report, action_taken: false, action_taken_by_account_id: nil) }
+    subject(:report) { Fabricate(:report, action_taken_at: nil, action_taken_by_account_id: nil) }
 
     let(:acting_account) { Fabricate(:account) }
 
@@ -63,12 +62,13 @@ describe Report do
     end
 
     it 'records action taken' do
-      expect(report).to have_attributes(action_taken: true, action_taken_by_account_id: acting_account.id)
+      expect(report.action_taken?).to be true
+      expect(report.action_taken_by_account_id).to eq acting_account.id
     end
   end
 
   describe 'unresolve!' do
-    subject(:report) { Fabricate(:report, action_taken: true, action_taken_by_account_id: acting_account.id) }
+    subject(:report) { Fabricate(:report, action_taken_at: Time.now.utc, action_taken_by_account_id: acting_account.id) }
 
     let(:acting_account) { Fabricate(:account) }
 
@@ -77,23 +77,24 @@ describe Report do
     end
 
     it 'unresolves' do
-      expect(report).to have_attributes(action_taken: false, action_taken_by_account_id: nil)
+      expect(report.action_taken?).to be false
+      expect(report.action_taken_by_account_id).to be_nil
     end
   end
 
   describe 'unresolved?' do
     subject { report.unresolved? }
 
-    let(:report) { Fabricate(:report, action_taken: action_taken) }
+    let(:report) { Fabricate(:report, action_taken_at: action_taken) }
 
     context 'if action is taken' do
-      let(:action_taken) { true }
+      let(:action_taken) { Time.now.utc }
 
       it { is_expected.to be false }
     end
 
     context 'if action not is taken' do
-      let(:action_taken) { false }
+      let(:action_taken) { nil }
 
       it { is_expected.to be true }
     end
@@ -117,7 +118,7 @@ describe Report do
     end
   end
 
-  describe 'validatiions' do
+  describe 'validations' do
     it 'has a valid fabricator' do
       report = Fabricate(:report)
       report.valid?
diff --git a/spec/models/status_edit_spec.rb b/spec/models/status_edit_spec.rb
new file mode 100644
index 000000000..2ecafef73
--- /dev/null
+++ b/spec/models/status_edit_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe StatusEdit, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/status_pin_spec.rb b/spec/models/status_pin_spec.rb
index 6f0b2feb8..c18faca78 100644
--- a/spec/models/status_pin_spec.rb
+++ b/spec/models/status_pin_spec.rb
@@ -24,11 +24,11 @@ RSpec.describe StatusPin, type: :model do
       expect(StatusPin.new(account: account, status: reblog).save).to be false
     end
 
-    it 'does not allow pins of private statuses' do
+    it 'does allow pins of direct statuses' do
       account = Fabricate(:account)
       status  = Fabricate(:status, account: account, visibility: :private)
 
-      expect(StatusPin.new(account: account, status: status).save).to be false
+      expect(StatusPin.new(account: account, status: status).save).to be true
     end
 
     it 'does not allow pins of direct statuses' do
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 20fb894e7..78cc05959 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -251,72 +251,84 @@ RSpec.describe Status, type: :model do
     end
   end
 
-  describe '.in_chosen_languages' do
-    context 'for accounts with language filters' do
-      let(:user) { Fabricate(:user, chosen_languages: ['en']) }
+  describe '.tagged_with' do
+    let(:tag1)     { Fabricate(:tag) }
+    let(:tag2)     { Fabricate(:tag) }
+    let(:tag3)     { Fabricate(:tag) }
+    let!(:status1) { Fabricate(:status, tags: [tag1]) }
+    let!(:status2) { Fabricate(:status, tags: [tag2]) }
+    let!(:status3) { Fabricate(:status, tags: [tag3]) }
+    let!(:status4) { Fabricate(:status, tags: []) }
+    let!(:status5) { Fabricate(:status, tags: [tag1, tag2, tag3]) }
 
-      it 'does not include statuses in not in chosen languages' do
-        status = Fabricate(:status, language: 'de')
-        expect(Status.in_chosen_languages(user.account)).not_to include status
+    context 'when given one tag' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with([tag1.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status5.id])
+        expect(Status.tagged_with([tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status2.id, status5.id])
+        expect(Status.tagged_with([tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status3.id, status5.id])
       end
+    end
 
-      it 'includes status with unknown language' do
-        status = Fabricate(:status, language: nil)
-        expect(Status.in_chosen_languages(user.account)).to include status
+    context 'when given multiple tags' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status2.id, status5.id])
+        expect(Status.tagged_with([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status3.id, status5.id])
+        expect(Status.tagged_with([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status2.id, status3.id, status5.id])
       end
     end
   end
 
-  describe '.permitted_for' do
-    subject { described_class.permitted_for(target_account, account).pluck(:visibility) }
+  describe '.tagged_with_all' do
+    let(:tag1)     { Fabricate(:tag) }
+    let(:tag2)     { Fabricate(:tag) }
+    let(:tag3)     { Fabricate(:tag) }
+    let!(:status1) { Fabricate(:status, tags: [tag1]) }
+    let!(:status2) { Fabricate(:status, tags: [tag2]) }
+    let!(:status3) { Fabricate(:status, tags: [tag3]) }
+    let!(:status4) { Fabricate(:status, tags: []) }
+    let!(:status5) { Fabricate(:status, tags: [tag1, tag2]) }
 
-    let(:target_account) { alice }
-    let(:account) { bob }
-    let!(:public_status) { Fabricate(:status, account: target_account, visibility: 'public') }
-    let!(:unlisted_status) { Fabricate(:status, account: target_account, visibility: 'unlisted') }
-    let!(:private_status) { Fabricate(:status, account: target_account, visibility: 'private') }
-
-    let!(:direct_status) do
-      Fabricate(:status, account: target_account, visibility: 'direct').tap do |status|
-        Fabricate(:mention, status: status, account: account)
+    context 'when given one tag' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with_all([tag1.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status5.id])
+        expect(Status.tagged_with_all([tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status2.id, status5.id])
+        expect(Status.tagged_with_all([tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status3.id])
       end
     end
 
-    let!(:other_direct_status) do
-      Fabricate(:status, account: target_account, visibility: 'direct').tap do |status|
-        Fabricate(:mention, status: status)
+    context 'when given multiple tags' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with_all([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status5.id])
+        expect(Status.tagged_with_all([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
+        expect(Status.tagged_with_all([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
+      end
+    end
+  end
+
+  describe '.tagged_with_none' do
+    let(:tag1)     { Fabricate(:tag) }
+    let(:tag2)     { Fabricate(:tag) }
+    let(:tag3)     { Fabricate(:tag) }
+    let!(:status1) { Fabricate(:status, tags: [tag1]) }
+    let!(:status2) { Fabricate(:status, tags: [tag2]) }
+    let!(:status3) { Fabricate(:status, tags: [tag3]) }
+    let!(:status4) { Fabricate(:status, tags: []) }
+    let!(:status5) { Fabricate(:status, tags: [tag1, tag2, tag3]) }
+
+    context 'when given one tag' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with_none([tag1.id]).reorder(:id).pluck(:id).uniq).to match_array([status2.id, status3.id, status4.id])
+        expect(Status.tagged_with_none([tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status3.id, status4.id])
+        expect(Status.tagged_with_none([tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status2.id, status4.id])
       end
     end
 
-    context 'given nil' do
-      let(:account) { nil }
-      let(:direct_status) { nil }
-      it { is_expected.to eq(%w(unlisted public)) }
-    end
-
-    context 'given blocked account' do
-      before do
-        target_account.block!(account)
+    context 'when given multiple tags' do
+      it 'returns the expected statuses' do
+        expect(Status.tagged_with_none([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to match_array([status3.id, status4.id])
+        expect(Status.tagged_with_none([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status2.id, status4.id])
+        expect(Status.tagged_with_none([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to match_array([status1.id, status4.id])
       end
-
-      it { is_expected.to be_empty }
-    end
-
-    context 'given same account' do
-      let(:account) { target_account }
-      it { is_expected.to eq(%w(direct direct private unlisted public)) }
-    end
-
-    context 'given followed account' do
-      before do
-        account.follow!(target_account)
-      end
-
-      it { is_expected.to eq(%w(direct private unlisted public)) }
-    end
-
-    context 'given unfollowed account' do
-      it { is_expected.to eq(%w(direct unlisted public)) }
     end
   end
 
diff --git a/spec/models/status_trend_spec.rb b/spec/models/status_trend_spec.rb
new file mode 100644
index 000000000..6b82204a6
--- /dev/null
+++ b/spec/models/status_trend_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe StatusTrend, type: :model do
+end
diff --git a/spec/models/tag_follow_spec.rb b/spec/models/tag_follow_spec.rb
new file mode 100644
index 000000000..50c04d2e4
--- /dev/null
+++ b/spec/models/tag_follow_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe TagFollow, type: :model do
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 3949dbce5..b16f99a79 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe Tag, type: :model do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'
       downcase_string = 'abcabcａｂｃａｂｃやゆよ';
 
-      tag = Fabricate(:tag, name: downcase_string)
+      tag = Fabricate(:tag, name: HashtagNormalizer.new.normalize(downcase_string))
       expect(Tag.find_normalized(upcase_string)).to eq tag
     end
   end
@@ -101,12 +101,12 @@ RSpec.describe Tag, type: :model do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'
       downcase_string = 'abcabcａｂｃａｂｃやゆよ';
 
-      tag = Fabricate(:tag, name: downcase_string)
+      tag = Fabricate(:tag, name: HashtagNormalizer.new.normalize(downcase_string))
       expect(Tag.matches_name(upcase_string)).to eq [tag]
     end
 
     it 'uses the LIKE operator' do
-      expect(Tag.matches_name('100%abc').to_sql).to eq %q[SELECT "tags".* FROM "tags" WHERE LOWER("tags"."name") LIKE LOWER('100\\%abc%')]
+      expect(Tag.matches_name('100%abc').to_sql).to eq %q[SELECT "tags".* FROM "tags" WHERE LOWER("tags"."name") LIKE LOWER('100abc%')]
     end
   end
 
@@ -115,7 +115,7 @@ RSpec.describe Tag, type: :model do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'
       downcase_string = 'abcabcａｂｃａｂｃやゆよ';
 
-      tag = Fabricate(:tag, name: downcase_string)
+      tag = Fabricate(:tag, name: HashtagNormalizer.new.normalize(downcase_string))
       expect(Tag.matching_name(upcase_string)).to eq [tag]
     end
   end
diff --git a/spec/models/trends/statuses_spec.rb b/spec/models/trends/statuses_spec.rb
new file mode 100644
index 000000000..5f338a65e
--- /dev/null
+++ b/spec/models/trends/statuses_spec.rb
@@ -0,0 +1,110 @@
+require 'rails_helper'
+
+RSpec.describe Trends::Statuses do
+  subject! { described_class.new(threshold: 5, review_threshold: 10, score_halflife: 8.hours) }
+
+  let!(:at_time) { DateTime.new(2021, 11, 14, 10, 15, 0) }
+
+  describe 'Trends::Statuses::Query' do
+    let!(:query) { subject.query }
+    let!(:today) { at_time }
+
+    let!(:status1) { Fabricate(:status, text: 'Foo', language: 'en', trendable: true, created_at: today) }
+    let!(:status2) { Fabricate(:status, text: 'Bar', language: 'en', trendable: true, created_at: today) }
+
+    before do
+      15.times { reblog(status1, today) }
+      12.times { reblog(status2, today) }
+
+      subject.refresh(today)
+    end
+
+    describe '#filtered_for' do
+      let(:account) { Fabricate(:account) }
+
+      it 'returns a composable query scope' do
+        expect(query.filtered_for(account)).to be_a Trends::Query
+      end
+
+      it 'filters out blocked accounts' do
+        account.block!(status1.account)
+        expect(query.filtered_for(account).to_a).to eq [status2]
+      end
+
+      it 'filters out muted accounts' do
+        account.mute!(status2.account)
+        expect(query.filtered_for(account).to_a).to eq [status1]
+      end
+
+      it 'filters out blocked-by accounts' do
+        status1.account.block!(account)
+        expect(query.filtered_for(account).to_a).to eq [status2]
+      end
+    end
+  end
+
+  describe '#add' do
+    let(:status) { Fabricate(:status) }
+
+    before do
+      subject.add(status, 1, at_time)
+    end
+
+    it 'records use' do
+      expect(subject.send(:recently_used_ids, at_time)).to eq [status.id]
+    end
+  end
+
+  describe '#query' do
+    it 'returns a composable query scope' do
+      expect(subject.query).to be_a Trends::Query
+    end
+
+    it 'responds to filtered_for' do
+      expect(subject.query).to respond_to(:filtered_for)
+    end
+  end
+
+  describe '#refresh' do
+    let!(:today) { at_time }
+    let!(:yesterday) { today - 1.day }
+
+    let!(:status1) { Fabricate(:status, text: 'Foo', language: 'en', trendable: true, created_at: yesterday) }
+    let!(:status2) { Fabricate(:status, text: 'Bar', language: 'en', trendable: true, created_at: today) }
+    let!(:status3) { Fabricate(:status, text: 'Baz', language: 'en', trendable: true, created_at: today) }
+
+    before do
+      13.times { reblog(status1, today) }
+      13.times { reblog(status2, today) }
+       4.times { reblog(status3, today) }
+    end
+
+    context do
+      before do
+        subject.refresh(today)
+      end
+
+      it 'calculates and re-calculates scores' do
+        expect(subject.query.limit(10).to_a).to eq [status2, status1]
+      end
+
+      it 'omits statuses below threshold' do
+        expect(subject.query.limit(10).to_a).to_not include(status3)
+      end
+    end
+
+    it 'decays scores' do
+      subject.refresh(today)
+      original_score = status2.trend.score
+      expect(original_score).to be_a Float
+      subject.refresh(today + subject.options[:score_halflife])
+      decayed_score = status2.trend.reload.score
+      expect(decayed_score).to be <= original_score / 2
+    end
+  end
+
+  def reblog(status, at_time)
+    reblog = Fabricate(:status, reblog: status, created_at: at_time)
+    subject.add(status, reblog.account_id, at_time)
+  end
+end
diff --git a/spec/models/trends/tags_spec.rb b/spec/models/trends/tags_spec.rb
index 4f98c6aa4..f48c73503 100644
--- a/spec/models/trends/tags_spec.rb
+++ b/spec/models/trends/tags_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Trends::Tags do
     end
   end
 
-  describe '#get' do
+  describe '#query' do
     pending
   end
 
@@ -47,11 +47,11 @@ RSpec.describe Trends::Tags do
       end
 
       it 'calculates and re-calculates scores' do
-        expect(subject.get(false, 10)).to eq [tag1, tag3]
+        expect(subject.query.limit(10).to_a).to eq [tag1, tag3]
       end
 
       it 'omits hashtags below threshold' do
-        expect(subject.get(false, 10)).to_not include(tag2)
+        expect(subject.query.limit(10).to_a).to_not include(tag2)
       end
     end
 
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
new file mode 100644
index 000000000..28019593e
--- /dev/null
+++ b/spec/models/user_role_spec.rb
@@ -0,0 +1,189 @@
+require 'rails_helper'
+
+RSpec.describe UserRole, type: :model do
+  subject { described_class.create(name: 'Foo', position: 1) }
+
+  describe '#can?' do
+    context 'with a single flag' do
+      it 'returns true if any of them are present' do
+        subject.permissions = UserRole::FLAGS[:manage_reports]
+        expect(subject.can?(:manage_reports)).to be true
+      end
+
+      it 'returns false if it is not set' do
+        expect(subject.can?(:manage_reports)).to be false
+      end
+    end
+
+    context 'with multiple flags' do
+      it 'returns true if any of them are present' do
+        subject.permissions = UserRole::FLAGS[:manage_users]
+        expect(subject.can?(:manage_reports, :manage_users)).to be true
+      end
+
+      it 'returns false if none of them are present' do
+        expect(subject.can?(:manage_reports, :manage_users)).to be false
+      end
+    end
+
+    context 'with an unknown flag' do
+      it 'raises an error' do
+        expect { subject.can?(:foo) }.to raise_error ArgumentError
+      end
+    end
+  end
+
+  describe '#overrides?' do
+    it 'returns true if other role has lower position' do
+      expect(subject.overrides?(described_class.new(position: subject.position - 1))).to be true
+    end
+
+    it 'returns true if other role is nil' do
+      expect(subject.overrides?(nil)).to be true
+    end
+
+    it 'returns false if other role has higher position' do
+      expect(subject.overrides?(described_class.new(position: subject.position + 1))).to be false
+    end
+  end
+
+  describe '#permissions_as_keys' do
+    before do
+      subject.permissions = UserRole::FLAGS[:invite_users] | UserRole::FLAGS[:view_dashboard] | UserRole::FLAGS[:manage_reports]
+    end
+
+    it 'returns an array' do
+      expect(subject.permissions_as_keys).to match_array %w(invite_users view_dashboard manage_reports)
+    end
+  end
+
+  describe '#permissions_as_keys=' do
+    let(:input) { }
+
+    before do
+      subject.permissions_as_keys = input
+    end
+
+    context 'with a single value' do
+      let(:input) { %w(manage_users) }
+
+      it 'sets permission flags' do
+        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users]
+      end
+    end
+
+    context 'with multiple values' do
+      let(:input) { %w(manage_users manage_reports) }
+
+      it 'sets permission flags' do
+        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users] | UserRole::FLAGS[:manage_reports]
+      end
+    end
+
+    context 'with an unknown value' do
+      let(:input) { %w(foo) }
+
+      it 'does not set permission flags' do
+        expect(subject.permissions).to eq UserRole::Flags::NONE
+      end
+    end
+  end
+
+  describe '#computed_permissions' do
+    context 'when the role is nobody' do
+      let(:subject) { described_class.nobody }
+
+      it 'returns none' do
+        expect(subject.computed_permissions).to eq UserRole::Flags::NONE
+      end
+    end
+
+    context 'when the role is everyone' do
+      let(:subject) { described_class.everyone }
+
+      it 'returns permissions' do
+        expect(subject.computed_permissions).to eq subject.permissions
+      end
+    end
+
+    context 'when role has the administrator flag' do
+      before do
+        subject.permissions = UserRole::FLAGS[:administrator]
+      end
+
+      it 'returns all permissions' do
+        expect(subject.computed_permissions).to eq UserRole::Flags::ALL
+      end
+    end
+
+    context do
+      it 'returns permissions combined with the everyone role' do
+        expect(subject.computed_permissions).to eq described_class.everyone.permissions
+      end
+    end
+  end
+
+  describe '.everyone' do
+    subject { described_class.everyone }
+
+    it 'returns a role' do
+      expect(subject).to be_kind_of(described_class)
+    end
+
+    it 'is identified as the everyone role' do
+      expect(subject.everyone?).to be true
+    end
+
+    it 'has default permissions' do
+      expect(subject.permissions).to eq UserRole::FLAGS[:invite_users]
+    end
+
+    it 'has negative position' do
+      expect(subject.position).to eq -1
+    end
+  end
+
+  describe '.nobody' do
+    subject { described_class.nobody }
+
+    it 'returns a role' do
+      expect(subject).to be_kind_of(described_class)
+    end
+
+    it 'is identified as the nobody role' do
+      expect(subject.nobody?).to be true
+    end
+
+    it 'has no permissions' do
+      expect(subject.permissions).to eq UserRole::Flags::NONE
+    end
+
+    it 'has negative position' do
+      expect(subject.position).to eq -1
+    end
+  end
+
+  describe '#everyone?' do
+    it 'returns true when id is -99' do
+      subject.id = -99
+      expect(subject.everyone?).to be true
+    end
+
+    it 'returns false when id is not -99' do
+      subject.id = 123
+      expect(subject.everyone?).to be false
+    end
+  end
+
+  describe '#nobody?' do
+    it 'returns true when id is nil' do
+      subject.id = nil
+      expect(subject.nobody?).to be true
+    end
+
+    it 'returns false when id is not nil' do
+      subject.id = 123
+      expect(subject.nobody?).to be false
+    end
+  end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 54bb6db7f..a7da31e60 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -56,14 +56,6 @@ RSpec.describe User, type: :model do
       end
     end
 
-    describe 'admins' do
-      it 'returns an array of users who are admin' do
-        user_1 = Fabricate(:user, admin: false)
-        user_2 = Fabricate(:user, admin: true)
-        expect(User.admins).to match_array([user_2])
-      end
-    end
-
     describe 'confirmed' do
       it 'returns an array of users who are confirmed' do
         user_1 = Fabricate(:user, confirmed_at: nil)
@@ -89,6 +81,19 @@ RSpec.describe User, type: :model do
         expect(User.matches_email('specified')).to match_array([specified])
       end
     end
+
+    describe 'matches_ip' do
+      it 'returns a relation of users whose ip address is matching with the given CIDR' do
+        user1 = Fabricate(:user)
+        user2 = Fabricate(:user)
+        Fabricate(:session_activation, user: user1, ip: '2160:2160::22', session_id: '1')
+        Fabricate(:session_activation, user: user1, ip: '2160:2160::23', session_id: '2')
+        Fabricate(:session_activation, user: user2, ip: '2160:8888::24', session_id: '3')
+        Fabricate(:session_activation, user: user2, ip: '2160:8888::25', session_id: '4')
+
+        expect(User.matches_ip('2160:2160::/32')).to match_array([user1])
+      end
+    end
   end
 
   let(:account) { Fabricate(:account, username: 'alice') }
@@ -194,12 +199,12 @@ RSpec.describe User, type: :model do
     end
 
     it "returns 'private' if user has not configured default privacy setting and account is locked" do
-      user = Fabricate(:user, account: Fabricate(:account, locked: true))
+      user = Fabricate(:account, locked: true).user
       expect(user.setting_default_privacy).to eq 'private'
     end
 
     it "returns 'public' if user has not configured default privacy setting and account is not locked" do
-      user = Fabricate(:user, account: Fabricate(:account, locked: false))
+      user = Fabricate(:account, locked: false).user
       expect(user.setting_default_privacy).to eq 'public'
     end
   end
@@ -248,7 +253,7 @@ RSpec.describe User, type: :model do
 
   it_behaves_like 'Settings-extended' do
     def create!
-      User.create!(account: Fabricate(:account), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
+      User.create!(account: Fabricate(:account, user: nil), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
     end
 
     def fabricate
@@ -276,49 +281,6 @@ RSpec.describe User, type: :model do
     end
   end
 
-  describe '#role' do
-    it 'returns admin for admin' do
-      user = User.new(admin: true)
-      expect(user.role).to eq 'admin'
-    end
-
-    it 'returns moderator for moderator' do
-      user = User.new(moderator: true)
-      expect(user.role).to eq 'moderator'
-    end
-
-    it 'returns user otherwise' do
-      user = User.new
-      expect(user.role).to eq 'user'
-    end
-  end
-
-  describe '#role?' do
-    it 'returns false when invalid role requested' do
-      user = User.new(admin: true)
-      expect(user.role?('disabled')).to be false
-    end
-
-    it 'returns true when exact role match' do
-      user  = User.new
-      mod   = User.new(moderator: true)
-      admin = User.new(admin: true)
-
-      expect(user.role?('user')).to be true
-      expect(mod.role?('moderator')).to be true
-      expect(admin.role?('admin')).to be true
-    end
-
-    it 'returns true when role higher than needed' do
-      mod   = User.new(moderator: true)
-      admin = User.new(admin: true)
-
-      expect(mod.role?('user')).to be true
-      expect(admin.role?('user')).to be true
-      expect(admin.role?('moderator')).to be true
-    end
-  end
-
   describe '#disable!' do
     subject(:user) { Fabricate(:user, disabled: false, current_sign_in_at: current_sign_in_at, last_sign_in_at: nil) }
     let(:current_sign_in_at) { Time.zone.now }
@@ -407,110 +369,6 @@ RSpec.describe User, type: :model do
     end
   end
 
-  describe '#promote!' do
-    subject(:user) { Fabricate(:user, admin: is_admin, moderator: is_moderator) }
-
-    before do
-      user.promote!
-    end
-
-    context 'when user is an admin' do
-      let(:is_admin) { true }
-
-      context 'when user is a moderator' do
-        let(:is_moderator) { true }
-
-        it 'changes moderator filed false' do
-          expect(user).to be_admin
-          expect(user).not_to be_moderator
-        end
-      end
-
-      context 'when user is not a moderator' do
-        let(:is_moderator) { false }
-
-        it 'does not change status' do
-          expect(user).to be_admin
-          expect(user).not_to be_moderator
-        end
-      end
-    end
-
-    context 'when user is not admin' do
-      let(:is_admin) { false }
-
-      context 'when user is a moderator' do
-        let(:is_moderator) { true }
-
-        it 'changes user into an admin' do
-          expect(user).to be_admin
-          expect(user).not_to be_moderator
-        end
-      end
-
-      context 'when user is not a moderator' do
-        let(:is_moderator) { false }
-
-        it 'changes user into a moderator' do
-          expect(user).not_to be_admin
-          expect(user).to be_moderator
-        end
-      end
-    end
-  end
-
-  describe '#demote!' do
-    subject(:user) { Fabricate(:user, admin: admin, moderator: moderator) }
-
-    before do
-      user.demote!
-    end
-
-    context 'when user is an admin' do
-      let(:admin) { true }
-
-      context 'when user is a moderator' do
-        let(:moderator) { true }
-
-        it 'changes user into a moderator' do
-          expect(user).not_to be_admin
-          expect(user).to be_moderator
-        end
-      end
-
-      context 'when user is not a moderator' do
-        let(:moderator) { false }
-
-        it 'changes user into a moderator' do
-          expect(user).not_to be_admin
-          expect(user).to be_moderator
-        end
-      end
-    end
-
-    context 'when user is not an admin' do
-      let(:admin) { false }
-
-      context 'when user is a moderator' do
-        let(:moderator) { true }
-
-        it 'changes user into a plain user' do
-          expect(user).not_to be_admin
-          expect(user).not_to be_moderator
-        end
-      end
-
-      context 'when user is not a moderator' do
-        let(:moderator) { false }
-
-        it 'does not change any fields' do
-          expect(user).not_to be_admin
-          expect(user).not_to be_moderator
-        end
-      end
-    end
-  end
-
   describe '#active_for_authentication?' do
     subject { user.active_for_authentication? }
     let(:user) { Fabricate(:user, disabled: disabled, confirmed_at: confirmed_at) }
@@ -547,4 +405,8 @@ RSpec.describe User, type: :model do
       end
     end
   end
+
+  describe '.those_who_can' do
+    pending
+  end
 end
diff --git a/spec/models/web/push_subscription_spec.rb b/spec/models/web/push_subscription_spec.rb
index b44904369..bd5719593 100644
--- a/spec/models/web/push_subscription_spec.rb
+++ b/spec/models/web/push_subscription_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Web::PushSubscription, type: :model do
       context "when notification is a #{type}" do
         let(:notification_type) { type }
 
-        it "returns boolean corresonding to alert setting" do
+        it "returns boolean corresponding to alert setting" do
           expect(subject.pushable?(notification)).to eq data[:alerts][type]
         end
       end
diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb
new file mode 100644
index 000000000..60c3d9524
--- /dev/null
+++ b/spec/models/webhook_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe Webhook, type: :model do
+  let(:webhook) { Fabricate(:webhook) }
+
+  describe '#rotate_secret!' do
+    it 'changes the secret' do
+      previous_value = webhook.secret
+      webhook.rotate_secret!
+      expect(webhook.secret).to_not be_blank
+      expect(webhook.secret).to_not eq previous_value
+    end
+  end
+
+  describe '#enable!' do
+    before do
+      webhook.disable!
+    end
+
+    it 'enables the webhook' do
+      webhook.enable!
+      expect(webhook.enabled?).to be true
+    end
+  end
+
+  describe '#disable!' do
+    it 'disables the webhook' do
+      webhook.disable!
+      expect(webhook.enabled?).to be false
+    end
+  end
+end
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
index bb7af94e4..846747346 100644
--- a/spec/policies/account_moderation_note_policy_spec.rb
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe AccountModerationNotePolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :create? do
     context 'staff' do
@@ -31,7 +31,7 @@ RSpec.describe AccountModerationNotePolicy do
 
     context 'admin' do
       it 'grants to destroy' do
-        expect(subject).to permit(admin, AccountModerationNotePolicy)
+        expect(subject).to permit(admin, account_moderation_note)
       end
     end
 
@@ -42,7 +42,7 @@ RSpec.describe AccountModerationNotePolicy do
     end
 
     context 'neither admin nor owner' do
-      let(:kevin) { Fabricate(:user).account }
+      let(:kevin) { Fabricate(:account) }
 
       it 'denies to destroy' do
         expect(subject).to_not permit(kevin, account_moderation_note)
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
index 8a5e62c06..0f23fd97e 100644
--- a/spec/policies/account_policy_spec.rb
+++ b/spec/policies/account_policy_spec.rb
@@ -5,9 +5,9 @@ require 'pundit/rspec'
 
 RSpec.describe AccountPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
-  let(:alice)   { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
+  let(:alice)   { Fabricate(:account) }
 
   permissions :index? do
     context 'staff' do
@@ -55,7 +55,7 @@ RSpec.describe AccountPolicy do
     end
   end
 
-  permissions :redownload?, :subscribe?, :unsubscribe? do
+  permissions :redownload? do
     context 'admin' do
       it 'permits' do
         expect(subject).to permit(admin)
@@ -70,7 +70,7 @@ RSpec.describe AccountPolicy do
   end
 
   permissions :suspend?, :silence? do
-    let(:staff) { Fabricate(:user, admin: true).account }
+    let(:staff) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
 
     context 'staff' do
       context 'record is staff' do
@@ -94,7 +94,7 @@ RSpec.describe AccountPolicy do
   end
 
   permissions :memorialize? do
-    let(:other_admin) { Fabricate(:user, admin: true).account }
+    let(:other_admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
 
     context 'admin' do
       context 'record is admin' do
diff --git a/spec/policies/backup_policy_spec.rb b/spec/policies/backup_policy_spec.rb
index 80407e12f..6b31c6f7c 100644
--- a/spec/policies/backup_policy_spec.rb
+++ b/spec/policies/backup_policy_spec.rb
@@ -5,7 +5,7 @@ require 'pundit/rspec'
 
 RSpec.describe BackupPolicy do
   let(:subject) { described_class }
-  let(:john)    { Fabricate(:user).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :create? do
     context 'not user_signed_in?' do
diff --git a/spec/policies/custom_emoji_policy_spec.rb b/spec/policies/custom_emoji_policy_spec.rb
index 8def88212..6a6ef6694 100644
--- a/spec/policies/custom_emoji_policy_spec.rb
+++ b/spec/policies/custom_emoji_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe CustomEmojiPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :index?, :enable?, :disable? do
     context 'staff' do
diff --git a/spec/policies/domain_block_policy_spec.rb b/spec/policies/domain_block_policy_spec.rb
index aea50ec0f..01b97e823 100644
--- a/spec/policies/domain_block_policy_spec.rb
+++ b/spec/policies/domain_block_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe DomainBlockPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :index?, :show?, :create?, :destroy? do
     context 'admin' do
diff --git a/spec/policies/email_domain_block_policy_spec.rb b/spec/policies/email_domain_block_policy_spec.rb
index a3e825e07..913075c3d 100644
--- a/spec/policies/email_domain_block_policy_spec.rb
+++ b/spec/policies/email_domain_block_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe EmailDomainBlockPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :index?, :create?, :destroy? do
     context 'admin' do
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
index 72cf25f56..f6f51af06 100644
--- a/spec/policies/instance_policy_spec.rb
+++ b/spec/policies/instance_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe InstancePolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :index?, :show?, :destroy? do
     context 'admin' do
diff --git a/spec/policies/invite_policy_spec.rb b/spec/policies/invite_policy_spec.rb
index e391455be..01660322f 100644
--- a/spec/policies/invite_policy_spec.rb
+++ b/spec/policies/invite_policy_spec.rb
@@ -5,7 +5,7 @@ require 'pundit/rspec'
 
 RSpec.describe InvitePolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:user).account }
 
   permissions :index? do
@@ -17,16 +17,22 @@ RSpec.describe InvitePolicy do
   end
 
   permissions :create? do
-    context 'min_required_role?' do
+    context 'has privilege' do
+      before do
+        UserRole.everyone.update(permissions: UserRole::FLAGS[:invite_users])
+      end
+
       it 'permits' do
-        allow_any_instance_of(described_class).to receive(:min_required_role?) { true }
         expect(subject).to permit(john, Invite)
       end
     end
 
-    context 'not min_required_role?' do
+    context 'does not have privilege' do
+      before do
+        UserRole.everyone.update(permissions: UserRole::Flags::NONE)
+      end
+
       it 'denies' do
-        allow_any_instance_of(described_class).to receive(:min_required_role?) { false }
         expect(subject).to_not permit(john, Invite)
       end
     end
@@ -54,39 +60,15 @@ RSpec.describe InvitePolicy do
     end
 
     context 'not owner?' do
-      context 'Setting.min_invite_role == "admin"' do
-        before do
-          Setting.min_invite_role = 'admin'
-        end
-
-        context 'admin?' do
-          it 'permits' do
-            expect(subject).to permit(admin, Fabricate(:invite))
-          end
-        end
-
-        context 'not admin?' do
-          it 'denies' do
-            expect(subject).to_not permit(john, Fabricate(:invite))
-          end
+      context 'admin?' do
+        it 'permits' do
+          expect(subject).to permit(admin, Fabricate(:invite))
         end
       end
 
-      context 'Setting.min_invite_role != "admin"' do
-        before do
-          Setting.min_invite_role = 'else'
-        end
-
-        context 'staff?' do
-          it 'permits' do
-            expect(subject).to permit(admin, Fabricate(:invite))
-          end
-        end
-
-        context 'not staff?' do
-          it 'denies' do
-            expect(subject).to_not permit(john, Fabricate(:invite))
-          end
+      context 'not admin?' do
+        it 'denies' do
+          expect(subject).to_not permit(john, Fabricate(:invite))
         end
       end
     end
diff --git a/spec/policies/relay_policy_spec.rb b/spec/policies/relay_policy_spec.rb
index 640f27d54..2c50ba1e9 100644
--- a/spec/policies/relay_policy_spec.rb
+++ b/spec/policies/relay_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe RelayPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :update? do
     context 'admin?' do
diff --git a/spec/policies/report_note_policy_spec.rb b/spec/policies/report_note_policy_spec.rb
index 596d7d7a9..99f5ffb8e 100644
--- a/spec/policies/report_note_policy_spec.rb
+++ b/spec/policies/report_note_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe ReportNotePolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :create? do
     context 'staff?' do
@@ -25,7 +25,8 @@ RSpec.describe ReportNotePolicy do
   permissions :destroy? do
     context 'admin?' do
       it 'permit' do
-        expect(subject).to permit(admin, ReportNote)
+        report_note = Fabricate(:report_note, account: john)
+        expect(subject).to permit(admin, report_note)
       end
     end
 
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
index c9ae1e87a..8b005d8dd 100644
--- a/spec/policies/report_policy_spec.rb
+++ b/spec/policies/report_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe ReportPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :update?, :index?, :show? do
     context 'staff?' do
diff --git a/spec/policies/settings_policy_spec.rb b/spec/policies/settings_policy_spec.rb
index 92f1f4869..e16ee51a4 100644
--- a/spec/policies/settings_policy_spec.rb
+++ b/spec/policies/settings_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe SettingsPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :update?, :show? do
     context 'admin?' do
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index 1cddf4abd..b88521708 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
 RSpec.describe StatusPolicy, type: :model do
   subject { described_class }
 
-  let(:admin) { Fabricate(:user, admin: true) }
+  let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
   let(:alice) { Fabricate(:account, username: 'alice') }
   let(:bob) { Fabricate(:account, username: 'bob') }
   let(:status) { Fabricate(:status, account: alice) }
@@ -96,10 +96,6 @@ RSpec.describe StatusPolicy, type: :model do
       expect(subject).to permit(status.account, status)
     end
 
-    it 'grants access when account is admin' do
-      expect(subject).to permit(admin.account, status)
-    end
-
     it 'denies access when account is not deleter' do
       expect(subject).to_not permit(bob, status)
     end
@@ -125,13 +121,9 @@ RSpec.describe StatusPolicy, type: :model do
     end
   end
 
-  permissions :index?, :update? do
-    it 'grants access if staff' do
-      expect(subject).to permit(admin.account)
-    end
-
-    it 'denies access unless staff' do
-      expect(subject).to_not permit(alice)
+  permissions :update? do
+    it 'grants access if owner' do
+      expect(subject).to permit(status.account, status)
     end
   end
 end
diff --git a/spec/policies/tag_policy_spec.rb b/spec/policies/tag_policy_spec.rb
index c63875dc0..9be7140fc 100644
--- a/spec/policies/tag_policy_spec.rb
+++ b/spec/policies/tag_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe TagPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :index?, :show?, :update? do
     context 'staff?' do
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index e37904f04..ff0916674 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -5,8 +5,8 @@ require 'pundit/rspec'
 
 RSpec.describe UserPolicy do
   let(:subject) { described_class }
-  let(:admin)   { Fabricate(:user, admin: true).account }
-  let(:john)    { Fabricate(:user).account }
+  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+  let(:john)    { Fabricate(:account) }
 
   permissions :reset_password?, :change_email? do
     context 'staff?' do
@@ -111,57 +111,4 @@ RSpec.describe UserPolicy do
       end
     end
   end
-
-  permissions :promote? do
-    context 'admin?' do
-      context 'promoteable?' do
-        it 'permits' do
-          expect(subject).to permit(admin, john.user)
-        end
-      end
-
-      context '!promoteable?' do
-        it 'denies' do
-          expect(subject).to_not permit(admin, admin.user)
-        end
-      end
-    end
-
-    context '!admin?' do
-      it 'denies' do
-        expect(subject).to_not permit(john, User)
-      end
-    end
-  end
-
-  permissions :demote? do
-    context 'admin?' do
-      context '!record.admin?' do
-        context 'demoteable?' do
-          it 'permits' do
-            john.user.update(moderator: true)
-            expect(subject).to permit(admin, john.user)
-          end
-        end
-
-        context '!demoteable?' do
-          it 'denies' do
-            expect(subject).to_not permit(admin, john.user)
-          end
-        end
-      end
-
-      context 'record.admin?' do
-        it 'denies' do
-          expect(subject).to_not permit(admin, admin.user)
-        end
-      end
-    end
-
-    context '!admin?' do
-      it 'denies' do
-        expect(subject).to_not permit(john, User)
-      end
-    end
-  end
 end
diff --git a/spec/presenters/account_relationships_presenter_spec.rb b/spec/presenters/account_relationships_presenter_spec.rb
index edfbbb354..8a485d2b9 100644
--- a/spec/presenters/account_relationships_presenter_spec.rb
+++ b/spec/presenters/account_relationships_presenter_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe AccountRelationshipsPresenter do
       allow(Account).to receive(:blocking_map).with(account_ids, current_account_id).and_return(default_map)
       allow(Account).to receive(:muting_map).with(account_ids, current_account_id).and_return(default_map)
       allow(Account).to receive(:requested_map).with(account_ids, current_account_id).and_return(default_map)
+      allow(Account).to receive(:requested_by_map).with(account_ids, current_account_id).and_return(default_map)
       allow(Account).to receive(:domain_blocking_map).with(account_ids, current_account_id).and_return(default_map)
     end
 
@@ -71,6 +72,14 @@ RSpec.describe AccountRelationshipsPresenter do
       end
     end
 
+    context 'options[:requested_by_map] is set' do
+      let(:options) { { requested_by_map: { 6 => true } } }
+
+      it 'sets @requested merged with default_map and options[:requested_by_map]' do
+        expect(presenter.requested_by).to eq default_map.merge(options[:requested_by_map])
+      end
+    end
+
     context 'options[:domain_blocking_map] is set' do
       let(:options) { { domain_blocking_map: { 7 => true } } }
 
diff --git a/spec/presenters/familiar_followers_presenter_spec.rb b/spec/presenters/familiar_followers_presenter_spec.rb
new file mode 100644
index 000000000..17be4b971
--- /dev/null
+++ b/spec/presenters/familiar_followers_presenter_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe FamiliarFollowersPresenter do
+  describe '#accounts' do
+    let(:account) { Fabricate(:account) }
+    let(:familiar_follower) { Fabricate(:account) }
+    let(:requested_accounts) { Fabricate.times(2, :account) }
+
+    subject { described_class.new(requested_accounts, account.id) }
+
+    before do
+      familiar_follower.follow!(requested_accounts.first)
+      account.follow!(familiar_follower)
+    end
+
+    it 'returns a result for each requested account' do
+      expect(subject.accounts.map(&:id)).to eq requested_accounts.map(&:id)
+    end
+
+    it 'returns followers you follow' do
+      result = subject.accounts.first
+
+      expect(result).to_not be_nil
+      expect(result.id).to eq requested_accounts.first.id
+      expect(result.accounts).to match_array([familiar_follower])
+    end
+
+    context 'when requested account hides followers' do
+      before do
+        requested_accounts.first.update(hide_collections: true)
+      end
+
+      it 'does not return followers you follow' do
+        result = subject.accounts.first
+
+        expect(result).to_not be_nil
+        expect(result.id).to eq requested_accounts.first.id
+        expect(result.accounts).to be_empty
+      end
+    end
+
+    context 'when familiar follower hides follows' do
+      before do
+        familiar_follower.update(hide_collections: true)
+      end
+
+      it 'does not return followers you follow' do
+        result = subject.accounts.first
+
+        expect(result).to_not be_nil
+        expect(result.id).to eq requested_accounts.first.id
+        expect(result.accounts).to be_empty
+      end
+    end
+  end
+end
diff --git a/spec/presenters/instance_presenter_spec.rb b/spec/presenters/instance_presenter_spec.rb
index 973b3e23c..659c2cc2f 100644
--- a/spec/presenters/instance_presenter_spec.rb
+++ b/spec/presenters/instance_presenter_spec.rb
@@ -3,21 +3,20 @@ require 'rails_helper'
 describe InstancePresenter do
   let(:instance_presenter) { InstancePresenter.new }
 
-  context do
+  describe '#description' do
     around do |example|
-      site_description = Setting.site_description
+      site_description = Setting.site_short_description
       example.run
-      Setting.site_description = site_description
+      Setting.site_short_description = site_description
     end
 
     it "delegates site_description to Setting" do
-      Setting.site_description = "Site desc"
-
-      expect(instance_presenter.site_description).to eq "Site desc"
+      Setting.site_short_description = "Site desc"
+      expect(instance_presenter.description).to eq "Site desc"
     end
   end
 
-  context do
+  describe '#extended_description' do
     around do |example|
       site_extended_description = Setting.site_extended_description
       example.run
@@ -26,12 +25,11 @@ describe InstancePresenter do
 
     it "delegates site_extended_description to Setting" do
       Setting.site_extended_description = "Extended desc"
-
-      expect(instance_presenter.site_extended_description).to eq "Extended desc"
+      expect(instance_presenter.extended_description).to eq "Extended desc"
     end
   end
 
-  context do
+  describe '#email' do
     around do |example|
       site_contact_email = Setting.site_contact_email
       example.run
@@ -40,12 +38,11 @@ describe InstancePresenter do
 
     it "delegates contact_email to Setting" do
       Setting.site_contact_email = "admin@example.com"
-
-      expect(instance_presenter.site_contact_email).to eq "admin@example.com"
+      expect(instance_presenter.contact.email).to eq "admin@example.com"
     end
   end
 
-  describe "contact_account" do
+  describe '#account' do
     around do |example|
       site_contact_username = Setting.site_contact_username
       example.run
@@ -55,12 +52,11 @@ describe InstancePresenter do
     it "returns the account for the site contact username" do
       Setting.site_contact_username = "aaa"
       account = Fabricate(:account, username: "aaa")
-
-      expect(instance_presenter.contact_account).to eq(account)
+      expect(instance_presenter.contact.account).to eq(account)
     end
   end
 
-  describe "user_count" do
+  describe '#user_count' do
     it "returns the number of site users" do
       Rails.cache.write 'user_count', 123
 
@@ -68,7 +64,7 @@ describe InstancePresenter do
     end
   end
 
-  describe "status_count" do
+  describe '#status_count' do
     it "returns the number of local statuses" do
       Rails.cache.write 'local_status_count', 234
 
@@ -76,7 +72,7 @@ describe InstancePresenter do
     end
   end
 
-  describe "domain_count" do
+  describe '#domain_count' do
     it "returns the number of known domains" do
       Rails.cache.write 'distinct_domain_count', 345
 
@@ -84,9 +80,9 @@ describe InstancePresenter do
     end
   end
 
-  describe '#version_number' do
-    it 'returns Mastodon::Version' do
-      expect(instance_presenter.version_number).to be(Mastodon::Version)
+  describe '#version' do
+    it 'returns string' do
+      expect(instance_presenter.version).to be_a String
     end
   end
 
@@ -103,13 +99,6 @@ describe InstancePresenter do
     end
   end
 
-  describe '#hero' do
-    it 'returns SiteUpload' do
-      hero = Fabricate(:site_upload, var: 'hero')
-      expect(instance_presenter.hero).to eq(hero)
-    end
-  end
-
   describe '#mascot' do
     it 'returns SiteUpload' do
       mascot = Fabricate(:site_upload, var: 'mascot')
diff --git a/spec/presenters/status_relationships_presenter_spec.rb b/spec/presenters/status_relationships_presenter_spec.rb
new file mode 100644
index 000000000..eaab922fd
--- /dev/null
+++ b/spec/presenters/status_relationships_presenter_spec.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe StatusRelationshipsPresenter do
+  describe '.initialize' do
+    before do
+      allow(Status).to receive(:reblogs_map).with(match_array(status_ids), current_account_id).and_return(default_map)
+      allow(Status).to receive(:favourites_map).with(status_ids, current_account_id).and_return(default_map)
+      allow(Status).to receive(:bookmarks_map).with(status_ids, current_account_id).and_return(default_map)
+      allow(Status).to receive(:mutes_map).with(anything, current_account_id).and_return(default_map)
+      allow(Status).to receive(:pins_map).with(anything, current_account_id).and_return(default_map)
+    end
+
+    let(:presenter)          { StatusRelationshipsPresenter.new(statuses, current_account_id, **options) }
+    let(:current_account_id) { Fabricate(:account).id }
+    let(:statuses)           { [Fabricate(:status)] }
+    let(:status_ids)         { statuses.map(&:id) + statuses.map(&:reblog_of_id).compact }
+    let(:default_map)        { { 1 => true } }
+
+    context 'options are not set' do
+      let(:options) { {} }
+
+      it 'sets default maps' do
+        expect(presenter.reblogs_map).to    eq default_map
+        expect(presenter.favourites_map).to eq default_map
+        expect(presenter.bookmarks_map).to  eq default_map
+        expect(presenter.mutes_map).to      eq default_map
+        expect(presenter.pins_map).to       eq default_map
+      end
+    end
+
+    context 'options[:reblogs_map] is set' do
+      let(:options) { { reblogs_map: { 2 => true } } }
+
+      it 'sets @reblogs_map merged with default_map and options[:reblogs_map]' do
+        expect(presenter.reblogs_map).to eq default_map.merge(options[:reblogs_map])
+      end
+    end
+
+    context 'options[:favourites_map] is set' do
+      let(:options) { { favourites_map: { 3 => true } } }
+
+      it 'sets @favourites_map merged with default_map and options[:favourites_map]' do
+        expect(presenter.favourites_map).to eq default_map.merge(options[:favourites_map])
+      end
+    end
+
+    context 'options[:bookmarks_map] is set' do
+      let(:options) { { bookmarks_map: { 4 => true } } }
+
+      it 'sets @bookmarks_map merged with default_map and options[:bookmarks_map]' do
+        expect(presenter.bookmarks_map).to eq default_map.merge(options[:bookmarks_map])
+      end
+    end
+
+    context 'options[:mutes_map] is set' do
+      let(:options) { { mutes_map: { 5 => true } } }
+
+      it 'sets @mutes_map merged with default_map and options[:mutes_map]' do
+        expect(presenter.mutes_map).to eq default_map.merge(options[:mutes_map])
+      end
+    end
+
+    context 'options[:pins_map] is set' do
+      let(:options) { { pins_map: { 6 => true } } }
+
+      it 'sets @pins_map merged with default_map and options[:pins_map]' do
+        expect(presenter.pins_map).to eq default_map.merge(options[:pins_map])
+      end
+    end
+
+    context 'when post includes filtered terms' do
+      let(:statuses) { [Fabricate(:status, text: 'this toot is about that banned word'), Fabricate(:status, reblog: Fabricate(:status, text: 'this toot is about an irrelevant word'))] }
+      let(:options) { {} }
+
+      before do
+        Account.find(current_account_id).custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide, keywords_attributes: [{ keyword: 'banned' }, { keyword: 'irrelevant' }])
+      end
+
+      it 'sets @filters_map to filter top-level status' do
+        matched_filters = presenter.filters_map[statuses[0].id]
+        expect(matched_filters.size).to eq 1
+
+        expect(matched_filters[0].filter.title).to eq 'filter1'
+        expect(matched_filters[0].keyword_matches).to eq ['banned']
+      end
+
+      it 'sets @filters_map to filter reblogged status' do
+        matched_filters = presenter.filters_map[statuses[1].reblog_of_id]
+        expect(matched_filters.size).to eq 1
+
+        expect(matched_filters[0].filter.title).to eq 'filter1'
+        expect(matched_filters[0].keyword_matches).to eq ['irrelevant']
+      end
+    end
+
+    context 'when post includes filtered individual statuses' do
+      let(:statuses) { [Fabricate(:status, text: 'hello world'), Fabricate(:status, reblog: Fabricate(:status, text: 'this toot is about an irrelevant word'))] }
+      let(:options) { {} }
+
+      before do
+        filter = Account.find(current_account_id).custom_filters.create!(phrase: 'filter1', context: %w(home), action: :hide)
+        filter.statuses.create!(status_id: statuses[0].id)
+        filter.statuses.create!(status_id: statuses[1].reblog_of_id)
+      end
+
+      it 'sets @filters_map to filter top-level status' do
+        matched_filters = presenter.filters_map[statuses[0].id]
+        expect(matched_filters.size).to eq 1
+
+        expect(matched_filters[0].filter.title).to eq 'filter1'
+        expect(matched_filters[0].status_matches).to eq [statuses[0].id]
+      end
+
+      it 'sets @filters_map to filter reblogged status' do
+        matched_filters = presenter.filters_map[statuses[1].reblog_of_id]
+        expect(matched_filters.size).to eq 1
+
+        expect(matched_filters[0].filter.title).to eq 'filter1'
+        expect(matched_filters[0].status_matches).to eq [statuses[1].reblog_of_id]
+      end
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 86c2a9c52..02827a388 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -13,7 +13,6 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!(allow: Chewy.settings[:host])
-Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
 Sidekiq::Testing.inline!
 Sidekiq.logger = nil
 
@@ -44,6 +43,7 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :view
   config.include Paperclip::Shoulda::Matchers
   config.include ActiveSupport::Testing::TimeHelpers
+  config.include Redisable
 
   config.before :each, type: :feature do
     https = ENV['LOCAL_HTTPS'] == 'true'
@@ -60,9 +60,7 @@ RSpec.configure do |config|
 
   config.after :each do
     Rails.cache.clear
-
-    keys = Redis.current.keys
-    Redis.current.del(keys) if keys.any?
+    redis.del(redis.keys)
   end
 end
 
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index 4e51cf7ef..e84c46c47 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -3,17 +3,6 @@
 require 'rails_helper'
 
 describe 'The account show page' do
-  it 'Has an h-feed with correct number of h-entry objects in it' do
-    alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    _status = Fabricate(:status, account: alice, text: 'Hello World')
-    _status2 = Fabricate(:status, account: alice, text: 'Hello World Again')
-    _status3 = Fabricate(:status, account: alice, text: 'Are You Still There World?')
-
-    get '/@alice'
-
-    expect(h_feed_entries.size).to eq(3)
-  end
-
   it 'has valid opengraph tags' do
     alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
     _status = Fabricate(:status, account: alice, text: 'Hello World')
@@ -33,8 +22,4 @@ describe 'The account show page' do
   def head_section
     Nokogiri::Slop(response.body).html.head
   end
-
-  def h_feed_entries
-    Nokogiri::HTML(response.body).search('.h-feed .h-entry')
-  end
 end
diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb
index 175f02ae9..0bc2786ac 100644
--- a/spec/requests/localization_spec.rb
+++ b/spec/requests/localization_spec.rb
@@ -10,30 +10,30 @@ describe 'Localization' do
   it 'uses a specific region when provided' do
     headers = { 'Accept-Language' => 'zh-HK' }
 
-    get "/about", headers: headers
+    get "/auth/sign_in", headers: headers
 
     expect(response.body).to include(
-      I18n.t('about.tagline', locale: 'zh-HK')
+      I18n.t('auth.login', locale: 'zh-HK')
     )
   end
 
   it 'falls back to a locale when region missing' do
     headers = { 'Accept-Language' => 'es-FAKE' }
 
-    get "/about", headers: headers
+    get "/auth/sign_in", headers: headers
 
     expect(response.body).to include(
-      I18n.t('about.tagline', locale: 'es')
+      I18n.t('auth.login', locale: 'es')
     )
   end
 
   it 'falls back to english when locale is missing' do
     headers = { 'Accept-Language' => '12-FAKE' }
 
-    get "/about", headers: headers
+    get "/auth/sign_in", headers: headers
 
     expect(response.body).to include(
-      I18n.t('about.tagline', locale: 'en')
+      I18n.t('auth.login', locale: 'en')
     )
   end
 end
diff --git a/spec/routing/accounts_routing_spec.rb b/spec/routing/accounts_routing_spec.rb
index d04cb27f0..3f0e9b3e9 100644
--- a/spec/routing/accounts_routing_spec.rb
+++ b/spec/routing/accounts_routing_spec.rb
@@ -1,31 +1,83 @@
 require 'rails_helper'
 
 describe 'Routes under accounts/' do
-  describe 'the route for accounts who are followers of an account' do
-    it 'routes to the followers action with the right username' do
-      expect(get('/users/name/followers')).
-        to route_to('follower_accounts#index', account_username: 'name')
+  context 'with local username' do
+    let(:username) { 'alice' }
+
+    it 'routes /@:username' do
+      expect(get("/@#{username}")).to route_to('accounts#show', username: username)
+    end
+
+    it 'routes /@:username.json' do
+      expect(get("/@#{username}.json")).to route_to('accounts#show', username: username, format: 'json')
+    end
+
+    it 'routes /@:username.rss' do
+      expect(get("/@#{username}.rss")).to route_to('accounts#show', username: username, format: 'rss')
+    end
+
+    it 'routes /@:username/:id' do
+      expect(get("/@#{username}/123")).to route_to('statuses#show', account_username: username, id: '123')
+    end
+
+    it 'routes /@:username/:id/embed' do
+      expect(get("/@#{username}/123/embed")).to route_to('statuses#embed', account_username: username, id: '123')
+    end
+
+    it 'routes /@:username/following' do
+      expect(get("/@#{username}/following")).to route_to('following_accounts#index', account_username: username)
+    end
+
+    it 'routes /@:username/followers' do
+      expect(get("/@#{username}/followers")).to route_to('follower_accounts#index', account_username: username)
+    end
+
+    it 'routes /@:username/with_replies' do
+      expect(get("/@#{username}/with_replies")).to route_to('accounts#show', username: username)
+    end
+
+    it 'routes /@:username/media' do
+      expect(get("/@#{username}/media")).to route_to('accounts#show', username: username)
+    end
+
+    it 'routes /@:username/tagged/:tag' do
+      expect(get("/@#{username}/tagged/foo")).to route_to('accounts#show', username: username, tag: 'foo')
     end
   end
 
-  describe 'the route for accounts who are followed by an account' do
-    it 'routes to the following action with the right username' do
-      expect(get('/users/name/following')).
-        to route_to('following_accounts#index', account_username: 'name')
-    end
-  end
+  context 'with remote username' do
+    let(:username) { 'alice@example.com' }
 
-  describe 'the route for following an account' do
-    it 'routes to the follow create action with the right username' do
-      expect(post('/users/name/follow')).
-        to route_to('account_follow#create', account_username: 'name')
+    it 'routes /@:username' do
+      expect(get("/@#{username}")).to route_to('home#index', username_with_domain: username)
     end
-  end
 
-  describe 'the route for unfollowing an account' do
-    it 'routes to the unfollow create action with the right username' do
-      expect(post('/users/name/unfollow')).
-        to route_to('account_unfollow#create', account_username: 'name')
+    it 'routes /@:username/:id' do
+      expect(get("/@#{username}/123")).to route_to('home#index', username_with_domain: username, any: '123')
+    end
+
+    it 'routes /@:username/:id/embed' do
+      expect(get("/@#{username}/123/embed")).to route_to('home#index', username_with_domain: username, any: '123/embed')
+    end
+
+    it 'routes /@:username/following' do
+      expect(get("/@#{username}/following")).to route_to('home#index', username_with_domain: username, any: 'following')
+    end
+
+    it 'routes /@:username/followers' do
+      expect(get("/@#{username}/followers")).to route_to('home#index', username_with_domain: username, any: 'followers')
+    end
+
+    it 'routes /@:username/with_replies' do
+      expect(get("/@#{username}/with_replies")).to route_to('home#index', username_with_domain: username, any: 'with_replies')
+    end
+
+    it 'routes /@:username/media' do
+      expect(get("/@#{username}/media")).to route_to('home#index', username_with_domain: username, any: 'media')
+    end
+
+    it 'routes /@:username/tagged/:tag' do
+      expect(get("/@#{username}/tagged/foo")).to route_to('home#index', username_with_domain: username, any: 'tagged/foo')
     end
   end
 end
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 5b7182586..81cbc175e 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -45,7 +45,6 @@ describe AccountSearchService, type: :service do
 
         results = subject.call('e@example.com', nil, limit: 2)
 
-        expect(results.size).to eq 2
         expect(results).to eq([exact, remote]).or eq([exact, remote_too])
       end
     end
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
new file mode 100644
index 000000000..e6336dc1b
--- /dev/null
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -0,0 +1,123 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
+  let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/account', featured_collection_url: 'https://example.com/account/pinned') }
+
+  let!(:known_status) { Fabricate(:status, account: actor, uri: 'https://example.com/account/pinned/1') }
+
+  let(:status_json_1) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Note',
+      id: 'https://example.com/account/pinned/1',
+      content: 'foo',
+      attributedTo: actor.uri,
+      to: 'https://www.w3.org/ns/activitystreams#Public',
+    }
+  end
+
+  let(:status_json_2) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Note',
+      id: 'https://example.com/account/pinned/2',
+      content: 'foo',
+      attributedTo: actor.uri,
+      to: 'https://www.w3.org/ns/activitystreams#Public',
+    }
+  end
+
+  let(:status_json_4) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Note',
+      id: 'https://example.com/account/pinned/4',
+      content: 'foo',
+      attributedTo: actor.uri,
+      to: 'https://www.w3.org/ns/activitystreams#Public',
+    }
+  end
+
+  let(:items) do
+    [
+      'https://example.com/account/pinned/1', # known
+      status_json_2, # unknown inlined
+      'https://example.com/account/pinned/3', # unknown unreachable
+      'https://example.com/account/pinned/4', # unknown reachable
+    ]
+  end
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Collection',
+      id: actor.featured_collection_url,
+      items: items,
+    }.with_indifferent_access
+  end
+
+  subject { described_class.new }
+
+  shared_examples 'sets pinned posts' do
+    before do
+      stub_request(:get, 'https://example.com/account/pinned/1').to_return(status: 200, body: Oj.dump(status_json_1))
+      stub_request(:get, 'https://example.com/account/pinned/2').to_return(status: 200, body: Oj.dump(status_json_2))
+      stub_request(:get, 'https://example.com/account/pinned/3').to_return(status: 404)
+      stub_request(:get, 'https://example.com/account/pinned/4').to_return(status: 200, body: Oj.dump(status_json_4))
+
+      subject.call(actor, note: true, hashtag: false)
+    end
+
+    it 'sets expected posts as pinned posts' do
+      expect(actor.pinned_statuses.pluck(:uri)).to match_array ['https://example.com/account/pinned/1', 'https://example.com/account/pinned/2', 'https://example.com/account/pinned/4']
+    end
+  end
+
+  describe '#call' do
+    context 'when the endpoint is a Collection' do
+      before do
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets pinned posts'
+    end
+
+    context 'when the endpoint is an OrderedCollection' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'OrderedCollection',
+          id: actor.featured_collection_url,
+          orderedItems: items,
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets pinned posts'
+    end
+
+    context 'when the endpoint is a paginated Collection' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'Collection',
+          id: actor.featured_collection_url,
+          first: {
+            type: 'CollectionPage',
+            partOf: actor.featured_collection_url,
+            items: items,
+          }
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets pinned posts'
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
new file mode 100644
index 000000000..6ca22c9fc
--- /dev/null
+++ b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
@@ -0,0 +1,95 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service do
+  let(:collection_url) { 'https://example.com/account/tags' }
+  let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/account') }
+
+  let(:items) do
+    [
+      { type: 'Hashtag', href: 'https://example.com/account/tagged/foo', name: 'Foo' },
+      { type: 'Hashtag', href: 'https://example.com/account/tagged/bar', name: 'bar' },
+      { type: 'Hashtag', href: 'https://example.com/account/tagged/baz', name: 'baZ' },
+    ]
+  end
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Collection',
+      id: collection_url,
+      items: items,
+    }.with_indifferent_access
+  end
+
+  subject { described_class.new }
+
+  shared_examples 'sets featured tags' do
+    before do
+      subject.call(actor, collection_url)
+    end
+
+    it 'sets expected tags as pinned tags' do
+      expect(actor.featured_tags.map(&:display_name)).to match_array ['Foo', 'bar', 'baZ']
+    end
+  end
+
+  describe '#call' do
+    context 'when the endpoint is a Collection' do
+      before do
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets featured tags'
+    end
+
+    context 'when the account already has featured tags' do
+      before do
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+
+        actor.featured_tags.create!(name: 'FoO')
+        actor.featured_tags.create!(name: 'baz')
+        actor.featured_tags.create!(name: 'oh').update(name: nil)
+      end
+
+      it_behaves_like 'sets featured tags'
+    end
+
+    context 'when the endpoint is an OrderedCollection' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'OrderedCollection',
+          id: collection_url,
+          orderedItems: items,
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets featured tags'
+    end
+
+    context 'when the endpoint is a paginated Collection' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'Collection',
+          id: collection_url,
+          first: {
+            type: 'CollectionPage',
+            partOf: collection_url,
+            items: items,
+          }
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+      end
+
+      it_behaves_like 'sets featured tags'
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index aa13f0a9b..ec6f1f41d 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -119,6 +119,58 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       include_examples 'sets profile data'
     end
 
+    context 'when WebFinger returns a different URI' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'does not create account' do
+        expect(account).to be_nil
+      end
+    end
+
+    context 'when WebFinger returns a different URI after a redirection' do
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'looks up "redirected" webfinger' do
+        account
+        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
+      end
+
+      it 'does not create account' do
+        expect(account).to be_nil
+      end
+    end
+
     context 'with wrong id' do
       it 'does not create account' do
         expect(subject.call('https://fake.address/@foo', prefetched_body: Oj.dump(actor))).to be_nil
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
new file mode 100644
index 000000000..20117c66d
--- /dev/null
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -0,0 +1,180 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
+  subject { ActivityPub::FetchRemoteActorService.new }
+
+  let!(:actor) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: 'https://example.com/alice',
+      type: 'Person',
+      preferredUsername: 'alice',
+      name: 'Alice',
+      summary: 'Foo bar',
+      inbox: 'http://example.com/alice/inbox',
+    }
+  end
+
+  describe '#call' do
+    let(:account) { subject.call('https://example.com/alice', id: true) }
+
+    shared_examples 'sets profile data' do
+      it 'returns an account' do
+        expect(account).to be_an Account
+      end
+
+      it 'sets display name' do
+        expect(account.display_name).to eq 'Alice'
+      end
+
+      it 'sets note' do
+        expect(account.note).to eq 'Foo bar'
+      end
+
+      it 'sets URL' do
+        expect(account.url).to eq 'https://example.com/alice'
+      end
+    end
+
+    context 'when the account does not have a inbox' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+
+      before do
+        actor[:inbox] = nil
+
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'returns nil' do
+        expect(account).to be_nil
+      end
+    end
+
+    context 'when URI and WebFinger share the same host' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'sets username and domain from webfinger' do
+        expect(account.username).to eq 'alice'
+        expect(account.domain).to eq 'example.com'
+      end
+
+      include_examples 'sets profile data'
+    end
+
+    context 'when WebFinger presents different domain than URI' do
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'looks up "redirected" webfinger' do
+        account
+        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
+      end
+
+      it 'sets username and domain from final webfinger' do
+        expect(account.username).to eq 'alice'
+        expect(account.domain).to eq 'iscool.af'
+      end
+
+      include_examples 'sets profile data'
+    end
+
+    context 'when WebFinger returns a different URI' do
+      let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'does not create account' do
+        expect(account).to be_nil
+      end
+    end
+
+    context 'when WebFinger returns a different URI after a redirection' do
+      let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
+
+      before do
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      end
+
+      it 'fetches resource' do
+        account
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+      end
+
+      it 'looks up webfinger' do
+        account
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+      end
+
+      it 'looks up "redirected" webfinger' do
+        account
+        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
+      end
+
+      it 'does not create account' do
+        expect(account).to be_nil
+      end
+    end
+
+    context 'with wrong id' do
+      it 'does not create account' do
+        expect(subject.call('https://fake.address/@foo', prefetched_body: Oj.dump(actor))).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
new file mode 100644
index 000000000..3186c4270
--- /dev/null
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -0,0 +1,83 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
+  subject { ActivityPub::FetchRemoteKeyService.new }
+
+  let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
+
+  let(:public_key_pem) do
+    "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu3L4vnpNLzVH31MeWI39\n4F0wKeJFsLDAsNXGeOu0QF2x+h1zLWZw/agqD2R3JPU9/kaDJGPIV2Sn5zLyUA9S\n6swCCMOtn7BBR9g9sucgXJmUFB0tACH2QSgHywMAybGfmSb3LsEMNKsGJ9VsvYoh\n8lDET6X4Pyw+ZJU0/OLo/41q9w+OrGtlsTm/PuPIeXnxa6BLqnDaxC+4IcjG/FiP\nahNCTINl/1F/TgSSDZ4Taf4U9XFEIFw8wmgploELozzIzKq+t8nhQYkgAkt64euW\npva3qL5KD1mTIZQEP+LZvh3s2WHrLi3fhbdRuwQ2c0KkJA2oSTFPDpqqbPGZ3Qvu\nHQIDAQAB\n-----END PUBLIC KEY-----\n"
+  end
+
+  let(:public_key_id) { 'https://example.com/alice#main-key' }
+
+  let(:key_json) do
+    {
+      id: public_key_id,
+      owner: 'https://example.com/alice',
+      publicKeyPem: public_key_pem,
+    }
+  end
+
+  let(:actor_public_key) { key_json }
+
+  let(:actor) do
+    {
+      '@context': [
+        'https://www.w3.org/ns/activitystreams',
+        'https://w3id.org/security/v1',
+      ],
+      id: 'https://example.com/alice',
+      type: 'Person',
+      preferredUsername: 'alice',
+      name: 'Alice',
+      summary: 'Foo bar',
+      inbox: 'http://example.com/alice/inbox',
+      publicKey: actor_public_key,
+    }
+  end
+
+  before do
+    stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+    stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+  end
+
+  describe '#call' do
+    let(:account) { subject.call(public_key_id, id: false) }
+
+    context 'when the key is a sub-object from the actor' do
+      before do
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(actor))
+      end
+
+      it 'returns the expected account' do
+        expect(account.uri).to eq 'https://example.com/alice'
+      end
+    end
+
+    context 'when the key is a separate document' do
+      let(:public_key_id) { 'https://example.com/alice-public-key.json' }
+
+      before do
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+      end
+
+      it 'returns the expected account' do
+        expect(account.uri).to eq 'https://example.com/alice'
+      end
+    end
+
+    context 'when the key and owner do not match' do
+      let(:public_key_id) { 'https://example.com/fake-public-key.json' }
+      let(:actor_public_key) { 'https://example.com/alice-public-key.json' }
+
+      before do
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+      end
+
+      it 'returns the nil' do
+        expect(account).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index ceba5f210..7359ca0b4 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -3,14 +3,15 @@ require 'rails_helper'
 RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
   include ActionView::Helpers::TextHelper
 
-  let(:sender) { Fabricate(:account) }
-  let(:recipient) { Fabricate(:account) }
-  let(:valid_domain) { Rails.configuration.x.local_domain }
+  let!(:sender) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar') }
+  let!(:recipient) { Fabricate(:account) }
+
+  let(:existing_status) { nil }
 
   let(:note) do
     {
       '@context': 'https://www.w3.org/ns/activitystreams',
-      id: "https://#{valid_domain}/@foo/1234",
+      id: "https://foo.bar/@foo/1234",
       type: 'Note',
       content: 'Lorem ipsum',
       attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
@@ -19,11 +20,14 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
 
   subject { described_class.new }
 
+  before do
+    stub_request(:get, 'https://foo.bar/watch?v=12345').to_return(status: 404, body: '')
+    stub_request(:get, object[:id]).to_return(body: Oj.dump(object))
+  end
+
   describe '#call' do
     before do
-      sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender))
-
-      stub_request(:head, 'https://example.com/watch?v=12345').to_return(status: 404, body: '')
+      existing_status
       subject.call(object[:id], prefetched_body: Oj.dump(object))
     end
 
@@ -42,7 +46,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
       let(:object) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
-          id: "https://#{valid_domain}/@foo/1234",
+          id: "https://foo.bar/@foo/1234",
           type: 'Video',
           name: 'Nyan Cat 10 hours remix',
           attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
@@ -50,13 +54,13 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
             {
               type: 'Link',
               mimeType: 'application/x-bittorrent',
-              href: "https://#{valid_domain}/12345.torrent",
+              href: "https://foo.bar/12345.torrent",
             },
 
             {
               type: 'Link',
               mimeType: 'text/html',
-              href: "https://#{valid_domain}/watch?v=12345",
+              href: "https://foo.bar/watch?v=12345",
             },
           ],
         }
@@ -66,8 +70,8 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         status = sender.statuses.first
 
         expect(status).to_not be_nil
-        expect(status.url).to eq "https://#{valid_domain}/watch?v=12345"
-        expect(strip_tags(status.text)).to eq "Nyan Cat 10 hours remix https://#{valid_domain}/watch?v=12345"
+        expect(status.url).to eq "https://foo.bar/watch?v=12345"
+        expect(strip_tags(status.text)).to eq "Nyan Cat 10 hours remixhttps://foo.bar/watch?v=12345"
       end
     end
 
@@ -75,7 +79,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
       let(:object) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
-          id: "https://#{valid_domain}/@foo/1234",
+          id: "https://foo.bar/@foo/1234",
           type: 'Audio',
           name: 'Nyan Cat 10 hours remix',
           attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
@@ -83,13 +87,13 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
             {
               type: 'Link',
               mimeType: 'application/x-bittorrent',
-              href: "https://#{valid_domain}/12345.torrent",
+              href: "https://foo.bar/12345.torrent",
             },
 
             {
               type: 'Link',
               mimeType: 'text/html',
-              href: "https://#{valid_domain}/watch?v=12345",
+              href: "https://foo.bar/watch?v=12345",
             },
           ],
         }
@@ -99,8 +103,8 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         status = sender.statuses.first
 
         expect(status).to_not be_nil
-        expect(status.url).to eq "https://#{valid_domain}/watch?v=12345"
-        expect(strip_tags(status.text)).to eq "Nyan Cat 10 hours remix https://#{valid_domain}/watch?v=12345"
+        expect(status.url).to eq "https://foo.bar/watch?v=12345"
+        expect(strip_tags(status.text)).to eq "Nyan Cat 10 hours remixhttps://foo.bar/watch?v=12345"
       end
     end
 
@@ -108,7 +112,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
       let(:object) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
-          id: "https://#{valid_domain}/@foo/1234",
+          id: "https://foo.bar/@foo/1234",
           type: 'Event',
           name: "Let's change the world",
           attributedTo: ActivityPub::TagManager.instance.uri_for(sender)
@@ -119,8 +123,8 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         status = sender.statuses.first
 
         expect(status).to_not be_nil
-        expect(status.url).to eq "https://#{valid_domain}/@foo/1234"
-        expect(strip_tags(status.text)).to eq "Let's change the world https://#{valid_domain}/@foo/1234"
+        expect(status.url).to eq "https://foo.bar/@foo/1234"
+        expect(strip_tags(status.text)).to eq "Let's change the worldhttps://foo.bar/@foo/1234"
       end
     end
 
@@ -150,7 +154,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
       let(:object) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
-          id: "https://#{valid_domain}/@foo/1234/create",
+          id: "https://foo.bar/@foo/1234/create",
           type: 'Create',
           actor: ActivityPub::TagManager.instance.uri_for(sender),
           object: note,
@@ -170,7 +174,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
       let(:object) do
         {
           '@context': 'https://www.w3.org/ns/activitystreams',
-          id: "https://#{valid_domain}/@foo/1234/create",
+          id: "https://foo.bar/@foo/1234/create",
           type: 'Create',
           actor: ActivityPub::TagManager.instance.uri_for(sender),
           object: {
@@ -186,5 +190,37 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         expect(sender.statuses.first).to be_nil
       end
     end
+
+    context 'when status already exists' do
+      let(:existing_status) { Fabricate(:status, account: sender, text: 'Foo', uri: note[:id]) }
+
+      context 'with a Note object' do
+        let(:object) { note.merge(updated: '2021-09-08T22:39:25Z') }
+
+        it 'updates status' do
+          existing_status.reload
+          expect(existing_status.text).to eq 'Lorem ipsum'
+          expect(existing_status.edits).to_not be_empty
+        end
+      end
+
+      context 'with a Create activity' do
+        let(:object) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            id: "https://foo.bar/@foo/1234/create",
+            type: 'Create',
+            actor: ActivityPub::TagManager.instance.uri_for(sender),
+            object: note.merge(updated: '2021-09-08T22:39:25Z'),
+          }
+        end
+
+        it 'updates status' do
+          existing_status.reload
+          expect(existing_status.text).to eq 'Lorem ipsum'
+          expect(existing_status.edits).to_not be_empty
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index 65c453341..fe49b18c1 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -34,9 +34,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
     context 'when the payload is a Collection with inlined replies' do
       context 'when passing the collection itself' do
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, payload)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
 
@@ -46,9 +45,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, collection_uri)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
     end
@@ -65,9 +63,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
       context 'when passing the collection itself' do
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, payload)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
 
@@ -77,9 +74,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, collection_uri)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
     end
@@ -100,9 +96,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
       context 'when passing the collection itself' do
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, payload)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
 
@@ -112,9 +107,8 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
-          allow(FetchReplyWorker).to receive(:push_bulk)
+          expect(FetchReplyWorker).to receive(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
           subject.call(status, collection_uri)
-          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1', 'http://example.com/self-reply-2', 'http://example.com/self-reply-3', 'http://example.com/self-reply-4', 'http://example.com/self-reply-5'])
         end
       end
     end
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 7728b9ba8..2b20d17b1 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -109,4 +109,98 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       end
     end
   end
+
+  context 'discovering many subdomains in a short timeframe' do
+    before do
+      stub_const 'ActivityPub::ProcessAccountService::SUBDOMAINS_RATELIMIT', 5
+    end
+
+    let(:subject) do
+      8.times do |i|
+        domain = "test#{i}.testdomain.com"
+        json = {
+          id: "https://#{domain}/users/1",
+          type: 'Actor',
+          inbox: "https://#{domain}/inbox",
+        }.with_indifferent_access
+        described_class.new.call('alice', domain, json)
+      end
+    end
+
+    it 'creates at least some accounts' do
+      expect { subject }.to change { Account.remote.count }.by_at_least(2)
+    end
+
+    it 'creates no more account than the limit allows' do
+      expect { subject }.to change { Account.remote.count }.by_at_most(5)
+    end
+  end
+
+  context 'accounts referencing other accounts' do
+    before do
+      stub_const 'ActivityPub::ProcessAccountService::DISCOVERIES_PER_REQUEST', 5
+    end
+
+    let(:payload) do
+      {
+        '@context': ['https://www.w3.org/ns/activitystreams'],
+        id: 'https://foo.test/users/1',
+        type: 'Person',
+        inbox: 'https://foo.test/inbox',
+        featured: 'https://foo.test/users/1/featured',
+        preferredUsername: 'user1',
+      }.with_indifferent_access
+    end
+
+    before do
+      8.times do |i|
+        actor_json = {
+          '@context': ['https://www.w3.org/ns/activitystreams'],
+          id: "https://foo.test/users/#{i}",
+          type: 'Person',
+          inbox: 'https://foo.test/inbox',
+          featured: "https://foo.test/users/#{i}/featured",
+          preferredUsername: "user#{i}",
+        }.with_indifferent_access
+        status_json = {
+          '@context': ['https://www.w3.org/ns/activitystreams'],
+          id: "https://foo.test/users/#{i}/status",
+          attributedTo: "https://foo.test/users/#{i}",
+          type: 'Note',
+          content: "@user#{i + 1} test",
+          tag: [
+            {
+              type: 'Mention',
+              href: "https://foo.test/users/#{i + 1}",
+              name: "@user#{i + 1 }",
+            }
+          ],
+          to: [ 'as:Public', "https://foo.test/users/#{i + 1}" ]
+        }.with_indifferent_access
+        featured_json = {
+          '@context': ['https://www.w3.org/ns/activitystreams'],
+          id: "https://foo.test/users/#{i}/featured",
+          type: 'OrderedCollection',
+          totelItems: 1,
+          orderedItems: [status_json],
+        }.with_indifferent_access
+        webfinger = {
+          subject: "acct:user#{i}@foo.test",
+          links: [{ rel: 'self', href: "https://foo.test/users/#{i}" }],
+        }.with_indifferent_access
+        stub_request(:get, "https://foo.test/users/#{i}").to_return(status: 200, body: actor_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, "https://foo.test/users/#{i}/featured").to_return(status: 200, body: featured_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, "https://foo.test/users/#{i}/status").to_return(status: 200, body: status_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, "https://foo.test/.well-known/webfinger?resource=acct:user#{i}@foo.test").to_return(body: webfinger.to_json, headers: { 'Content-Type': 'application/jrd+json' })
+      end
+    end
+
+    it 'creates at least some accounts' do
+      expect { subject.call('user1', 'foo.test', payload) }.to change { Account.remote.count }.by_at_least(2)
+    end
+
+    it 'creates no more account than the limit allows' do
+      expect { subject.call('user1', 'foo.test', payload) }.to change { Account.remote.count }.by_at_most(5)
+    end
+  end
 end
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index 00d71a86a..093a188a2 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
       let(:forwarder) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/other_account') }
 
       it 'does not process payload if no signature exists' do
-        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
+        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
         expect(ActivityPub::Activity).not_to receive(:factory)
 
         subject.call(json, forwarder)
@@ -77,7 +77,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
       it 'processes payload with actor if valid signature exists' do
         payload['signature'] = { 'type' => 'RsaSignature2017' }
 
-        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(actor)
+        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(actor)
         expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), actor, instance_of(Hash))
 
         subject.call(json, forwarder)
@@ -86,11 +86,151 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
       it 'does not process payload if invalid signature exists' do
         payload['signature'] = { 'type' => 'RsaSignature2017' }
 
-        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
+        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
         expect(ActivityPub::Activity).not_to receive(:factory)
 
         subject.call(json, forwarder)
       end
+
+      context 'when receiving a fabricated status' do
+        let!(:actor) do
+          Fabricate(:account,
+            username: 'bob',
+            domain: 'example.com',
+            uri: 'https://example.com/users/bob',
+            public_key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuuYyoyfsRkYnXRotMsId\nW3euBDDfiv9oVqOxUVC7bhel8KednIMrMCRWFAkgJhbrlzbIkjVr68o1MP9qLcn7\nCmH/BXHp7yhuFTr4byjdJKpwB+/i2jNEsvDH5jR8WTAeTCe0x/QHg21V3F7dSI5m\nCCZ/1dSIyOXLRTWVlfDlm3rE4ntlCo+US3/7oSWbg/4/4qEnt1HC32kvklgScxua\n4LR5ATdoXa5bFoopPWhul7MJ6NyWCyQyScUuGdlj8EN4kmKQJvphKHrI9fvhgOuG\nTvhTR1S5InA4azSSchY0tXEEw/VNxraeX0KPjbgr6DPcwhPd/m0nhVDq0zVyVBBD\nMwIDAQAB\n-----END PUBLIC KEY-----\n",
+            private_key: nil)
+        end
+
+        let(:payload) do
+          {
+            '@context': [
+              'https://www.w3.org/ns/activitystreams',
+              nil,
+              {'object': 'https://www.w3.org/ns/activitystreams#object'}
+            ],
+            'id': 'https://example.com/users/bob/fake-status/activity',
+            'type': 'Create',
+            'actor': 'https://example.com/users/bob',
+            'published': '2022-01-22T15:00:00Z',
+            'to': [
+              'https://www.w3.org/ns/activitystreams#Public'
+            ],
+            'cc': [
+              'https://example.com/users/bob/followers'
+            ],
+            'signature': {
+              'type': 'RsaSignature2017',
+              'creator': 'https://example.com/users/bob#main-key',
+              'created': '2022-03-09T21:57:25Z',
+              'signatureValue': 'WculK0LelTQ0MvGwU9TPoq5pFzFfGYRDCJqjZ232/Udj4CHqDTGOSw5UTDLShqBOyycCkbZGrQwXG+dpyDpQLSe1UVPZ5TPQtc/9XtI57WlS2nMNpdvRuxGnnb2btPdesXZ7n3pCxo0zjaXrJMe0mqQh5QJO22mahb4bDwwmfTHgbD3nmkD+fBfGi+UV2qWwqr+jlV4L4JqNkh0gWljF5KTePLRRZCuWiQ/FAt7c67636cdIPf7fR+usjuZltTQyLZKEGuK8VUn2Gkfsx5qns7Vcjvlz1JqlAjyO8HPBbzTTHzUG2nUOIgC3PojCSWv6mNTmRGoLZzOscCAYQA6cKw=='
+            },
+            '@id': 'https://example.com/users/bob/statuses/107928807471117876/activity',
+            '@type': 'https://www.w3.org/ns/activitystreams#Create',
+            'https://www.w3.org/ns/activitystreams#actor': {
+              '@id': 'https://example.com/users/bob'
+            },
+            'https://www.w3.org/ns/activitystreams#cc': {
+              '@id': 'https://example.com/users/bob/followers'
+            },
+            'object': {
+              'id': 'https://example.com/users/bob/fake-status',
+              'type': 'Note',
+              'published': '2022-01-22T15:00:00Z',
+              'url': 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=puck-was-here',
+              'attributedTo': 'https://example.com/users/bob',
+              'to': [
+                'https://www.w3.org/ns/activitystreams#Public'
+              ],
+              'cc': [
+                'https://example.com/users/bob/followers'
+              ],
+              'sensitive': false,
+              'atomUri': 'https://example.com/users/bob/fake-status',
+              'conversation': 'tag:example.com,2022-03-09:objectId=15:objectType=Conversation',
+              'content': '<p>puck was here</p>',
+
+              '@id': 'https://example.com/users/bob/statuses/107928807471117876',
+              '@type': 'https://www.w3.org/ns/activitystreams#Note',
+              'http://ostatus.org#atomUri': 'https://example.com/users/bob/statuses/107928807471117876',
+              'http://ostatus.org#conversation': 'tag:example.com,2022-03-09:objectId=15:objectType=Conversation',
+              'https://www.w3.org/ns/activitystreams#attachment': [],
+              'https://www.w3.org/ns/activitystreams#attributedTo': {
+                '@id': 'https://example.com/users/bob'
+              },
+              'https://www.w3.org/ns/activitystreams#cc': {
+                '@id': 'https://example.com/users/bob/followers'
+              },
+              'https://www.w3.org/ns/activitystreams#content': [
+                '<p>hello world</p>',
+                {
+                  '@value': '<p>hello world</p>',
+                  '@language': 'en'
+                }
+              ],
+              'https://www.w3.org/ns/activitystreams#published': {
+                '@type': 'http://www.w3.org/2001/XMLSchema#dateTime',
+                '@value': '2022-03-09T21:55:07Z'
+              },
+              'https://www.w3.org/ns/activitystreams#replies': {
+                '@id': 'https://example.com/users/bob/statuses/107928807471117876/replies',
+                '@type': 'https://www.w3.org/ns/activitystreams#Collection',
+                'https://www.w3.org/ns/activitystreams#first': {
+                  '@type': 'https://www.w3.org/ns/activitystreams#CollectionPage',
+                  'https://www.w3.org/ns/activitystreams#items': [],
+                  'https://www.w3.org/ns/activitystreams#next': {
+                    '@id': 'https://example.com/users/bob/statuses/107928807471117876/replies?only_other_accounts=true&page=true'
+                  },
+                  'https://www.w3.org/ns/activitystreams#partOf': {
+                    '@id': 'https://example.com/users/bob/statuses/107928807471117876/replies'
+                  }
+                }
+              },
+              'https://www.w3.org/ns/activitystreams#sensitive': false,
+              'https://www.w3.org/ns/activitystreams#tag': [],
+              'https://www.w3.org/ns/activitystreams#to': {
+                '@id': 'https://www.w3.org/ns/activitystreams#Public'
+              },
+              'https://www.w3.org/ns/activitystreams#url': {
+                '@id': 'https://example.com/@bob/107928807471117876'
+              }
+            },
+            'https://www.w3.org/ns/activitystreams#published': {
+              '@type': 'http://www.w3.org/2001/XMLSchema#dateTime',
+              '@value': '2022-03-09T21:55:07Z'
+            },
+            'https://www.w3.org/ns/activitystreams#to': {
+              '@id': 'https://www.w3.org/ns/activitystreams#Public'
+            }
+          }
+        end
+
+        it 'does not process forged payload' do
+          expect(ActivityPub::Activity).not_to receive(:factory).with(
+            hash_including(
+              'object' => hash_including(
+                'id' => 'https://example.com/users/bob/fake-status'
+              )
+            ),
+            anything(),
+            anything()
+          )
+
+          expect(ActivityPub::Activity).not_to receive(:factory).with(
+            hash_including(
+              'object' => hash_including(
+                'content' => '<p>puck was here</p>'
+              )
+            ),
+            anything(),
+            anything()
+          )
+
+          subject.call(json, forwarder)
+
+          expect(Status.where(uri: 'https://example.com/users/bob/fake-status').exists?).to be false
+        end
+      end
     end
   end
 end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
new file mode 100644
index 000000000..750369d57
--- /dev/null
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -0,0 +1,468 @@
+require 'rails_helper'
+
+def poll_option_json(name, votes)
+  { type: 'Note', name: name, replies: { type: 'Collection', totalItems: votes } }
+end
+
+RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
+  let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com')) }
+
+  let(:alice) { Fabricate(:account) }
+  let(:bob) { Fabricate(:account) }
+
+  let(:mentions) { [] }
+  let(:tags) { [] }
+  let(:media_attachments) { [] }
+
+  before do
+    mentions.each { |a| Fabricate(:mention, status: status, account: a) }
+    tags.each { |t| status.tags << t }
+    media_attachments.each { |m| status.media_attachments << m }
+  end
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: 'foo',
+      type: 'Note',
+      summary: 'Show more',
+      content: 'Hello universe',
+      updated: '2021-09-08T22:39:25Z',
+      tag: [
+        { type: 'Hashtag', name: 'hoge' },
+        { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+      ],
+    }
+  end
+
+  let(:json) { Oj.load(Oj.dump(payload)) }
+
+  subject { described_class.new }
+
+  describe '#call' do
+    it 'updates text' do
+      subject.call(status, json)
+      expect(status.reload.text).to eq 'Hello universe'
+    end
+
+    it 'updates content warning' do
+      subject.call(status, json)
+      expect(status.reload.spoiler_text).to eq 'Show more'
+    end
+
+    context 'when the changes are only in sanitized-out HTML' do
+      let!(:status) { Fabricate(:status, text: '<p>Hello world <a href="https://joinmastodon.org" rel="nofollow">joinmastodon.org</a></p>', account: Fabricate(:account, domain: 'example.com')) }
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          updated: '2021-09-08T22:39:25Z',
+          content: '<p>Hello world <a href="https://joinmastodon.org" rel="noreferrer">joinmastodon.org</a></p>',
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.edited?).to be false
+      end
+    end
+
+    context 'when the status has not been explicitly edited' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Updated text',
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.reload.edited?).to be false
+      end
+
+      it 'does not update the text' do
+        expect(status.reload.text).to eq 'Hello world'
+      end
+    end
+
+    context 'when the status has not been explicitly edited and features a poll' do
+      let(:account)    { Fabricate(:account, domain: 'example.com') }
+      let!(:expiration) { 10.days.from_now.utc }
+      let!(:status) do
+        Fabricate(:status,
+          text: 'Hello world',
+          account: account,
+          poll_attributes: {
+            options: %w(Foo Bar),
+            account: account,
+            multiple: false,
+            hide_totals: false,
+            expires_at: expiration
+          }
+        )
+      end
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'https://example.com/foo',
+          type: 'Question',
+          content: 'Hello world',
+          endTime: expiration.iso8601,
+          oneOf: [
+            poll_option_json('Foo', 4),
+            poll_option_json('Bar', 3),
+          ],
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.reload.edited?).to be false
+      end
+
+      it 'does not update the text' do
+        expect(status.reload.text).to eq 'Hello world'
+      end
+
+      it 'updates tallies' do
+        expect(status.poll.reload.cached_tallies).to eq [4, 3]
+      end
+    end
+
+    context 'when the status changes a poll despite being not explicitly marked as updated' do
+      let(:account)    { Fabricate(:account, domain: 'example.com') }
+      let!(:expiration) { 10.days.from_now.utc }
+      let!(:status) do
+        Fabricate(:status,
+          text: 'Hello world',
+          account: account,
+          poll_attributes: {
+            options: %w(Foo Bar),
+            account: account,
+            multiple: false,
+            hide_totals: false,
+            expires_at: expiration
+          }
+        )
+      end
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'https://example.com/foo',
+          type: 'Question',
+          content: 'Hello world',
+          endTime: expiration.iso8601,
+          oneOf: [
+            poll_option_json('Foo', 4),
+            poll_option_json('Bar', 3),
+            poll_option_json('Baz', 3),
+          ],
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.reload.edited?).to be false
+      end
+
+      it 'does not update the text' do
+        expect(status.reload.text).to eq 'Hello world'
+      end
+
+      it 'does not update tallies' do
+        expect(status.poll.reload.cached_tallies).to eq [0, 0]
+      end
+    end
+
+    context 'when receiving an edit older than the latest processed' do
+      before do
+        status.snapshot!(at_time: status.created_at, rate_limit: false)
+        status.update!(text: 'Hello newer world', edited_at: Time.now.utc)
+        status.snapshot!(rate_limit: false)
+      end
+
+      it 'does not create any edits' do
+        expect { subject.call(status, json) }.not_to change { status.reload.edits.pluck(&:id) }
+      end
+
+      it 'does not update the text, spoiler_text or edited_at' do
+        expect { subject.call(status, json) }.not_to change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] }
+      end
+    end
+
+    context 'with no changes at all' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Hello world',
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.edited?).to be false
+      end
+    end
+
+    context 'with no changes and originally with no ordered_media_attachment_ids' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Hello world',
+        }
+      end
+
+      before do
+        status.update(ordered_media_attachment_ids: nil)
+        subject.call(status, json)
+      end
+
+      it 'does not create any edits' do
+        expect(status.reload.edits).to be_empty
+      end
+
+      it 'does not mark status as edited' do
+        expect(status.edited?).to be false
+      end
+    end
+
+    context 'originally without tags' do
+      before do
+        subject.call(status, json)
+      end
+
+      it 'updates tags' do
+        expect(status.tags.reload.map(&:name)).to eq %w(hoge)
+      end
+    end
+
+    context 'originally with tags' do
+      let(:tags) { [Fabricate(:tag, name: 'test'), Fabricate(:tag, name: 'foo')] }
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          summary: 'Show more',
+          content: 'Hello universe',
+          updated: '2021-09-08T22:39:25Z',
+          tag: [
+            { type: 'Hashtag', name: 'foo' },
+          ],
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'updates tags' do
+        expect(status.tags.reload.map(&:name)).to eq %w(foo)
+      end
+    end
+
+    context 'originally without mentions' do
+      before do
+        subject.call(status, json)
+      end
+
+      it 'updates mentions' do
+        expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
+      end
+    end
+
+    context 'originally with mentions' do
+      let(:mentions) { [alice, bob] }
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'updates mentions' do
+        expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
+      end
+    end
+
+    context 'originally without media attachments' do
+      before do
+        stub_request(:get, 'https://example.com/foo.png').to_return(body: attachment_fixture('emojo.png'))
+        subject.call(status, json)
+      end
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Hello universe',
+          updated: '2021-09-08T22:39:25Z',
+          attachment: [
+            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png' },
+          ]
+        }
+      end
+
+      it 'updates media attachments' do
+        media_attachment = status.reload.ordered_media_attachments.first
+
+        expect(media_attachment).to_not be_nil
+        expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
+      end
+
+      it 'fetches the attachment' do
+        expect(a_request(:get, 'https://example.com/foo.png')).to have_been_made
+      end
+
+      it 'records media change in edit' do
+        expect(status.edits.reload.last.ordered_media_attachment_ids).to_not be_empty
+      end
+    end
+
+    context 'originally with media attachments' do
+      let(:media_attachments) { [Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png'), Fabricate(:media_attachment, remote_url: 'https://example.com/unused.png')] }
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: 'Hello universe',
+          updated: '2021-09-08T22:39:25Z',
+          attachment: [
+            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png', name: 'A picture' },
+          ]
+        }
+      end
+
+      before do
+        allow(RedownloadMediaWorker).to receive(:perform_async)
+        subject.call(status, json)
+      end
+
+      it 'updates the existing media attachment in-place' do
+        media_attachment = status.media_attachments.reload.first
+
+        expect(media_attachment).to_not be_nil
+        expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
+        expect(media_attachment.description).to eq 'A picture'
+      end
+
+      it 'does not queue redownload for the existing media attachment' do
+        expect(RedownloadMediaWorker).to_not have_received(:perform_async)
+      end
+
+      it 'updates media attachments' do
+        expect(status.ordered_media_attachments.map(&:remote_url)).to eq %w(https://example.com/foo.png)
+      end
+
+      it 'records media change in edit' do
+        expect(status.edits.reload.last.ordered_media_attachment_ids).to_not be_empty
+      end
+    end
+
+    context 'originally with a poll' do
+      before do
+        poll = Fabricate(:poll, status: status)
+        status.update(preloadable_poll: poll)
+        subject.call(status, json)
+      end
+
+      it 'removes poll' do
+        expect(status.reload.poll).to eq nil
+      end
+
+      it 'records media change in edit' do
+        expect(status.edits.reload.last.poll_options).to be_nil
+      end
+    end
+
+    context 'originally without a poll' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Question',
+          content: 'Hello universe',
+          updated: '2021-09-08T22:39:25Z',
+          closed: true,
+          oneOf: [
+            { type: 'Note', name: 'Foo' },
+            { type: 'Note', name: 'Bar' },
+            { type: 'Note', name: 'Baz' },
+          ],
+        }
+      end
+
+      before do
+        subject.call(status, json)
+      end
+
+      it 'creates a poll' do
+        poll = status.reload.poll
+
+        expect(poll).to_not be_nil
+        expect(poll.options).to eq %w(Foo Bar Baz)
+      end
+
+      it 'records media change in edit' do
+        expect(status.edits.reload.last.poll_options).to eq %w(Foo Bar Baz)
+      end
+    end
+
+    it 'creates edit history' do
+      subject.call(status, json)
+      expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
+    end
+
+    it 'sets edited timestamp' do
+      subject.call(status, json)
+      expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
+    end
+  end
+end
diff --git a/spec/services/after_block_service_spec.rb b/spec/services/after_block_service_spec.rb
index fe5b26b2b..337766d06 100644
--- a/spec/services/after_block_service_spec.rb
+++ b/spec/services/after_block_service_spec.rb
@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe AfterBlockService, type: :service do
-  subject do
-    -> { described_class.new.call(account, target_account) }
-  end
+  subject { described_class.new.call(account, target_account) }
 
   let(:account)              { Fabricate(:account) }
   let(:target_account)       { Fabricate(:account) }
@@ -16,7 +14,7 @@ RSpec.describe AfterBlockService, type: :service do
     let(:home_timeline_key) { FeedManager.instance.key(:home, account.id) }
 
     before do
-      Redis.current.del(home_timeline_key)
+      redis.del(home_timeline_key)
     end
 
     it "clears account's statuses" do
@@ -24,8 +22,8 @@ RSpec.describe AfterBlockService, type: :service do
       FeedManager.instance.push_to_home(account, other_account_status)
       FeedManager.instance.push_to_home(account, other_account_reblog)
 
-      is_expected.to change {
-        Redis.current.zrange(home_timeline_key, 0, -1)
+      expect { subject }.to change {
+        redis.zrange(home_timeline_key, 0, -1)
       }.from([status.id.to_s, other_account_status.id.to_s, other_account_reblog.id.to_s]).to([other_account_status.id.to_s])
     end
   end
@@ -35,7 +33,7 @@ RSpec.describe AfterBlockService, type: :service do
     let(:list_timeline_key) { FeedManager.instance.key(:list, list.id) }
 
     before do
-      Redis.current.del(list_timeline_key)
+      redis.del(list_timeline_key)
     end
 
     it "clears account's statuses" do
@@ -43,8 +41,8 @@ RSpec.describe AfterBlockService, type: :service do
       FeedManager.instance.push_to_list(list, other_account_status)
       FeedManager.instance.push_to_list(list, other_account_reblog)
 
-      is_expected.to change {
-        Redis.current.zrange(list_timeline_key, 0, -1)
+      expect { subject }.to change {
+        redis.zrange(list_timeline_key, 0, -1)
       }.from([status.id.to_s, other_account_status.id.to_s, other_account_reblog.id.to_s]).to([other_account_status.id.to_s])
     end
   end
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index e0c83b704..8ec4d4a7a 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe AppSignUpService, type: :service do
     it 'returns nil when registrations are closed' do
       tmp = Setting.registrations_mode
       Setting.registrations_mode = 'none'
-      expect(subject.call(app, remote_ip, good_params)).to be_nil
+      expect { subject.call(app, remote_ip, good_params) }.to raise_error Mastodon::NotPermittedError
       Setting.registrations_mode = tmp
     end
 
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 8e5d8fb03..888d694b6 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe AuthorizeFollowService, type: :service do
   subject { AuthorizeFollowService.new }
 
   describe 'local' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob) { Fabricate(:account, username: 'bob') }
 
     before do
       FollowRequest.create(account: bob, target_account: sender)
@@ -23,7 +23,7 @@ RSpec.describe AuthorizeFollowService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
 
     before do
       FollowRequest.create(account: bob, target_account: sender)
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 4203952c6..920edeb13 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -5,14 +5,14 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
 
   let!(:alice)  { Fabricate(:account) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
-  let!(:jeff)   { Fabricate(:user).account }
+  let!(:jeff)   { Fabricate(:account) }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
   let(:status1) { PostStatusService.new.call(alice, text: 'Hello @bob@example.com') }
   let(:status2) { PostStatusService.new.call(alice, text: 'Another status') }
 
   before do
-    allow(Redis.current).to receive_messages(publish: nil)
+    allow(redis).to receive_messages(publish: nil)
 
     stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
 
@@ -40,11 +40,11 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
   end
 
   it 'notifies streaming API of followers' do
-    expect(Redis.current).to have_received(:publish).with("timeline:#{jeff.id}", any_args).at_least(:once)
+    expect(redis).to have_received(:publish).with("timeline:#{jeff.id}", any_args).at_least(:once)
   end
 
   it 'notifies streaming API of public timeline' do
-    expect(Redis.current).to have_received(:publish).with('timeline:public', any_args).at_least(:once)
+    expect(redis).to have_received(:publish).with('timeline:public', any_args).at_least(:once)
   end
 
   it 'sends delete activity to followers' do
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index c689b57e3..242b02fff 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -66,7 +66,7 @@ RSpec.describe BlockDomainService, type: :service do
       expect(Account.find_remote('badguy', 'evil.org').silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
-    it 'leaves the domains status and attachements, but clears media' do
+    it 'leaves the domains status and attachments, but clears media' do
       expect { bad_status1.reload }.not_to raise_error
       expect { bad_status2.reload }.not_to raise_error
       expect { bad_attachment.reload }.not_to raise_error
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 3714f09e9..a53e1f928 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe BlockService, type: :service do
   subject { BlockService.new }
 
   describe 'local' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob) { Fabricate(:account, username: 'bob') }
 
     before do
       subject.call(sender, bob)
@@ -18,7 +18,7 @@ RSpec.describe BlockService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
       stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
diff --git a/spec/services/clear_domain_media_service_spec.rb b/spec/services/clear_domain_media_service_spec.rb
index 8e58c6039..45b92e2c9 100644
--- a/spec/services/clear_domain_media_service_spec.rb
+++ b/spec/services/clear_domain_media_service_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe ClearDomainMediaService, type: :service do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
     end
 
-    it 'leaves the domains status and attachements, but clears media' do
+    it 'leaves the domains status and attachments, but clears media' do
       expect { bad_status1.reload }.not_to raise_error
       expect { bad_status2.reload }.not_to raise_error
       expect { bad_attachment.reload }.not_to raise_error
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index b1da97036..1fbe4d07c 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -23,12 +23,10 @@ RSpec.describe DeleteAccountService, type: :service do
 
     let!(:account_note) { Fabricate(:account_note, account: account) }
 
-    subject do
-      -> { described_class.new.call(account) }
-    end
+    subject { described_class.new.call(account) }
 
     it 'deletes associated owned records' do
-      is_expected.to change {
+      expect { subject }.to change {
         [
           account.statuses,
           account.media_attachments,
@@ -43,7 +41,7 @@ RSpec.describe DeleteAccountService, type: :service do
     end
 
     it 'deletes associated target records' do
-      is_expected.to change {
+      expect { subject }.to change {
         [
           AccountPin.where(target_account: account),
         ].map(&:count)
@@ -51,7 +49,7 @@ RSpec.describe DeleteAccountService, type: :service do
     end
 
     it 'deletes associated target notifications' do
-      is_expected.to change {
+      expect { subject }.to change {
         [
           'poll', 'favourite', 'status', 'mention', 'follow'
         ].map { |type| Notification.where(type: type).count }
@@ -73,7 +71,7 @@ RSpec.describe DeleteAccountService, type: :service do
       let!(:local_follower) { Fabricate(:account) }
 
       it 'sends a delete actor activity to all known inboxes' do
-        subject.call
+        subject
         expect(a_request(:post, "https://alice.com/inbox")).to have_been_made.once
         expect(a_request(:post, "https://bob.com/inbox")).to have_been_made.once
       end
@@ -90,8 +88,8 @@ RSpec.describe DeleteAccountService, type: :service do
       let!(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
       let!(:local_follower) { Fabricate(:account) }
 
-      it 'sends a reject follow to follwer inboxes' do
-        subject.call
+      it 'sends a reject follow to follower inboxes' do
+        subject
         expect(a_request(:post, account.inbox_url)).to have_been_made.once
       end
     end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 538dc2592..59e15d230 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -1,37 +1,112 @@
 require 'rails_helper'
 
 RSpec.describe FanOutOnWriteService, type: :service do
-  let(:author)   { Fabricate(:account, username: 'tom') }
-  let(:status)   { Fabricate(:status, text: 'Hello @alice #test', account: author) }
-  let(:alice)    { Fabricate(:user, account: Fabricate(:account, username: 'alice')).account }
-  let(:follower) { Fabricate(:account, username: 'bob') }
+  let(:last_active_at) { Time.now.utc }
 
-  subject { FanOutOnWriteService.new }
+  let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let!(:bob)   { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'bob' }).account }
+  let!(:tom)   { Fabricate(:user, current_sign_in_at: last_active_at).account }
+
+  subject { described_class.new }
+
+  let(:status) { Fabricate(:status, account: alice, visibility: visibility, text: 'Hello @bob #hoge') }
 
   before do
-    alice
-    follower.follow!(author)
+    bob.follow!(alice)
+    tom.follow!(alice)
 
     ProcessMentionsService.new.call(status)
     ProcessHashtagsService.new.call(status)
 
+    allow(redis).to receive(:publish)
+
     subject.call(status)
   end
 
-  it 'delivers status to home timeline' do
-    expect(HomeFeed.new(author).get(10).map(&:id)).to include status.id
+  def home_feed_of(account)
+    HomeFeed.new(account).get(10).map(&:id)
   end
 
-  it 'delivers status to local followers' do
-    pending 'some sort of problem in test environment causes this to sometimes fail'
-    expect(HomeFeed.new(follower).get(10).map(&:id)).to include status.id
+  context 'when status is public' do
+    let(:visibility) { 'public' }
+
+    it 'is added to the home feed of its author' do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of a follower' do
+      expect(home_feed_of(bob)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+
+    it 'is broadcast to the hashtag stream' do
+      expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+    end
+
+    it 'is broadcast to the public stream' do
+      expect(redis).to have_received(:publish).with('timeline:public', anything)
+      expect(redis).to have_received(:publish).with('timeline:public:local', anything)
+    end
   end
 
-  it 'delivers status to hashtag' do
-    expect(TagFeed.new(Tag.find_by(name: 'test'), alice).get(20).map(&:id)).to include status.id
+  context 'when status is limited' do
+    let(:visibility) { 'limited' }
+
+    it 'is added to the home feed of its author' do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of the mentioned follower' do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
+    it 'is not added to the home feed of the other follower' do
+      expect(home_feed_of(tom)).to_not include status.id
+    end
+
+    it 'is not broadcast publicly' do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
   end
 
-  it 'delivers status to public timeline' do
-    expect(PublicFeed.new(alice).get(20).map(&:id)).to include status.id
+  context 'when status is private' do
+    let(:visibility) { 'private' }
+
+    it 'is added to the home feed of its author' do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of a follower' do
+      expect(home_feed_of(bob)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+
+    it 'is not broadcast publicly' do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
+  end
+
+  context 'when status is direct' do
+    let(:visibility) { 'direct' }
+
+    it 'is added to the home feed of its author' do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of the mentioned follower' do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
+    it 'is not added to the home feed of the other follower' do
+      expect(home_feed_of(tom)).to_not include status.id
+    end
+
+    it 'is not broadcast publicly' do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
   end
 end
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index fc7f58eb4..9781f0d78 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe FavouriteService, type: :service do
   subject { FavouriteService.new }
 
   describe 'local' do
-    let(:bob)    { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob)    { Fabricate(:account) }
     let(:status) { Fabricate(:status, account: bob) }
 
     before do
@@ -19,11 +19,11 @@ RSpec.describe FavouriteService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob)    { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, protocol: :activitypub, username: 'bob', domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+    let(:bob)    { Fabricate(:account, protocol: :activitypub, username: 'bob', domain: 'example.com', inbox_url: 'http://example.com/inbox') }
     let(:status) { Fabricate(:status, account: bob) }
 
     before do
-      stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:post, "http://example.com/inbox").to_return(status: 200, body: "", headers: {})
       subject.call(sender, status)
     end
 
diff --git a/spec/services/fetch_remote_status_service_spec.rb b/spec/services/fetch_remote_status_service_spec.rb
index 0e63cc9eb..fe5f1aed1 100644
--- a/spec/services/fetch_remote_status_service_spec.rb
+++ b/spec/services/fetch_remote_status_service_spec.rb
@@ -1,14 +1,13 @@
 require 'rails_helper'
 
 RSpec.describe FetchRemoteStatusService, type: :service do
-  let(:account) { Fabricate(:account) }
+  let(:account) { Fabricate(:account, domain: 'example.org', uri: 'https://example.org/foo') }
   let(:prefetched_body) { nil }
-  let(:valid_domain) { Rails.configuration.x.local_domain }
 
   let(:note) do
     {
       '@context': 'https://www.w3.org/ns/activitystreams',
-      id: "https://#{valid_domain}/@foo/1234",
+      id: "https://example.org/@foo/1234",
       type: 'Note',
       content: 'Lorem ipsum',
       attributedTo: ActivityPub::TagManager.instance.uri_for(account),
@@ -20,7 +19,6 @@ RSpec.describe FetchRemoteStatusService, type: :service do
     let(:prefetched_body) { Oj.dump(note) }
 
     before do
-      account.update(uri: ActivityPub::TagManager.instance.uri_for(account))
       subject
     end
 
diff --git a/spec/services/fetch_resource_service_spec.rb b/spec/services/fetch_resource_service_spec.rb
index ded05ffbc..c0c96ab69 100644
--- a/spec/services/fetch_resource_service_spec.rb
+++ b/spec/services/fetch_resource_service_spec.rb
@@ -66,7 +66,7 @@ RSpec.describe FetchResourceService, type: :service do
 
       it 'signs request' do
         subject
-        expect(a_request(:get, url).with(headers: { 'Signature' => /keyId="#{Regexp.escape(ActivityPub::TagManager.instance.uri_for(Account.representative) + '#main-key')}"/ })).to have_been_made
+        expect(a_request(:get, url).with(headers: { 'Signature' => /keyId="#{Regexp.escape(ActivityPub::TagManager.instance.key_uri_for(Account.representative))}"/ })).to have_been_made
       end
 
       context 'when content type is application/atom+xml' do
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index 63d6eb3bd..412c04d76 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowService, type: :service do
 
   context 'local account' do
     describe 'locked account' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, locked: true, username: 'bob') }
 
       before do
         subject.call(sender, bob)
@@ -19,7 +19,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'locked account, no reblogs' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, locked: true, username: 'bob') }
 
       before do
         subject.call(sender, bob, reblogs: false)
@@ -31,7 +31,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'unlocked account, from silenced account' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         sender.touch(:silenced_at)
@@ -44,7 +44,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'unlocked account, from a muted account' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         bob.mute!(sender)
@@ -58,7 +58,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'unlocked account' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         subject.call(sender, bob)
@@ -71,7 +71,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'unlocked account, no reblogs' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         subject.call(sender, bob, reblogs: false)
@@ -84,7 +84,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'already followed account' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         sender.follow!(bob)
@@ -97,7 +97,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'already followed account, turning reblogs off' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         sender.follow!(bob, reblogs: true)
@@ -110,7 +110,7 @@ RSpec.describe FollowService, type: :service do
     end
 
     describe 'already followed account, turning reblogs on' do
-      let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+      let(:bob) { Fabricate(:account, username: 'bob') }
 
       before do
         sender.follow!(bob, reblogs: false)
@@ -121,13 +121,26 @@ RSpec.describe FollowService, type: :service do
         expect(sender.muting_reblogs?(bob)).to be false
       end
     end
+
+    describe 'already followed account, changing languages' do
+      let(:bob) { Fabricate(:account, username: 'bob') }
+
+      before do
+        sender.follow!(bob)
+        subject.call(sender, bob, languages: %w(en es))
+      end
+
+      it 'changes languages' do
+        expect(Follow.find_by(account: sender, target_account: bob)&.languages).to match_array %w(en es)
+      end
+    end
   end
 
   context 'remote ActivityPub account' do
-    let(:bob) { Fabricate(:user, account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
 
     before do
-      stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:post, "http://example.com/inbox").to_return(status: 200, body: "", headers: {})
       subject.call(sender, bob)
     end
 
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 764225aa7..e2d182920 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -172,6 +172,29 @@ RSpec.describe ImportService, type: :service do
     end
   end
 
+  # Based on the bug report 20571 where UTF-8 encoded domains were rejecting import of their users
+  #
+  # https://github.com/mastodon/mastodon/issues/20571
+  context 'utf-8 encoded domains' do
+    subject { ImportService.new }
+
+    let!(:nare)     { Fabricate(:account, username: 'nare', domain: 'թութ.հայ', locked: false, protocol: :activitypub, inbox_url: 'https://թութ.հայ/inbox') }
+
+    # Make sure to not actually go to the remote server
+    before do
+      stub_request(:post, "https://թութ.հայ/inbox").to_return(status: 200)
+    end
+
+    let(:csv) { attachment_fixture('utf8-followers.txt') }
+    let(:import) { Import.create(account: account, type: 'following', data: csv) }
+
+    it 'follows the listed account' do
+    expect(account.follow_requests.count).to eq 0
+      subject.call(import)
+      expect(account.follow_requests.count).to eq 1
+    end
+  end
+
   context 'import bookmarks' do
     subject { ImportService.new }
 
diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb
index 4bb839b8d..57d8c41de 100644
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe MuteService, type: :service do
-  subject do
-    -> { described_class.new.call(account, target_account) }
-  end
+  subject { described_class.new.call(account, target_account) }
 
   let(:account) { Fabricate(:account) }
   let(:target_account) { Fabricate(:account) }
@@ -14,52 +12,48 @@ RSpec.describe MuteService, type: :service do
     let(:home_timeline_key) { FeedManager.instance.key(:home, account.id) }
 
     before do
-      Redis.current.del(home_timeline_key)
+      redis.del(home_timeline_key)
     end
 
     it "clears account's statuses" do
       FeedManager.instance.push_to_home(account, status)
       FeedManager.instance.push_to_home(account, other_account_status)
 
-      is_expected.to change {
-        Redis.current.zrange(home_timeline_key, 0, -1)
+      expect { subject }.to change {
+        redis.zrange(home_timeline_key, 0, -1)
       }.from([status.id.to_s, other_account_status.id.to_s]).to([other_account_status.id.to_s])
     end
   end
 
   it 'mutes account' do
-    is_expected.to change {
+    expect { subject }.to change {
       account.muting?(target_account)
     }.from(false).to(true)
   end
 
   context 'without specifying a notifications parameter' do
     it 'mutes notifications from the account' do
-      is_expected.to change {
+      expect { subject }.to change {
         account.muting_notifications?(target_account)
       }.from(false).to(true)
     end
   end
 
   context 'with a true notifications parameter' do
-    subject do
-      -> { described_class.new.call(account, target_account, notifications: true) }
-    end
+    subject { described_class.new.call(account, target_account, notifications: true) }
 
     it 'mutes notifications from the account' do
-      is_expected.to change {
+      expect { subject }.to change {
         account.muting_notifications?(target_account)
       }.from(false).to(true)
     end
   end
 
   context 'with a false notifications parameter' do
-    subject do
-      -> { described_class.new.call(account, target_account, notifications: false) }
-    end
+    subject { described_class.new.call(account, target_account, notifications: false) }
 
     it 'does not mute notifications from the account' do
-      is_expected.to_not change {
+      expect { subject }.to_not change {
         account.muting_notifications?(target_account)
       }.from(false)
     end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 7433866b7..294c31b04 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe NotifyService, type: :service do
-  subject do
-    -> { described_class.new.call(recipient, type, activity) }
-  end
+  subject { described_class.new.call(recipient, type, activity) }
 
   let(:user) { Fabricate(:user) }
   let(:recipient) { user.account }
@@ -11,42 +9,42 @@ RSpec.describe NotifyService, type: :service do
   let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
   let(:type) { :follow }
 
-  it { is_expected.to change(Notification, :count).by(1) }
+  it { expect { subject }.to change(Notification, :count).by(1) }
 
   it 'does not notify when sender is blocked' do
     recipient.block!(sender)
-    is_expected.to_not change(Notification, :count)
+    expect { subject }.to_not change(Notification, :count)
   end
 
   it 'does not notify when sender is muted with hide_notifications' do
     recipient.mute!(sender, notifications: true)
-    is_expected.to_not change(Notification, :count)
+    expect { subject }.to_not change(Notification, :count)
   end
 
   it 'does notify when sender is muted without hide_notifications' do
     recipient.mute!(sender, notifications: false)
-    is_expected.to change(Notification, :count)
+    expect { subject }.to change(Notification, :count)
   end
 
   it 'does not notify when sender\'s domain is blocked' do
     recipient.block_domain!(sender.domain)
-    is_expected.to_not change(Notification, :count)
+    expect { subject }.to_not change(Notification, :count)
   end
 
   it 'does still notify when sender\'s domain is blocked but sender is followed' do
     recipient.block_domain!(sender.domain)
     recipient.follow!(sender)
-    is_expected.to change(Notification, :count)
+    expect { subject }.to change(Notification, :count)
   end
 
   it 'does not notify when sender is silenced and not followed' do
     sender.silence!
-    is_expected.to_not change(Notification, :count)
+    expect { subject }.to_not change(Notification, :count)
   end
 
   it 'does not notify when recipient is suspended' do
     recipient.suspend!
-    is_expected.to_not change(Notification, :count)
+    expect { subject }.to_not change(Notification, :count)
   end
 
   context 'for direct messages' do
@@ -61,7 +59,7 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { true }
 
       it 'does not notify' do
-        is_expected.to_not change(Notification, :count)
+        expect { subject }.to_not change(Notification, :count)
       end
 
       context 'if the message chain is initiated by recipient, but is not direct message' do
@@ -70,7 +68,7 @@ RSpec.describe NotifyService, type: :service do
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
 
         it 'does not notify' do
-          is_expected.to_not change(Notification, :count)
+          expect { subject }.to_not change(Notification, :count)
         end
       end
 
@@ -81,7 +79,7 @@ RSpec.describe NotifyService, type: :service do
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
 
         it 'does not notify' do
-          is_expected.to_not change(Notification, :count)
+          expect { subject }.to_not change(Notification, :count)
         end
       end
 
@@ -91,7 +89,7 @@ RSpec.describe NotifyService, type: :service do
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
 
         it 'does notify' do
-          is_expected.to change(Notification, :count)
+          expect { subject }.to change(Notification, :count)
         end
       end
     end
@@ -100,7 +98,7 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { false }
 
       it 'does notify' do
-        is_expected.to change(Notification, :count)
+        expect { subject }.to change(Notification, :count)
       end
     end
   end
@@ -112,17 +110,17 @@ RSpec.describe NotifyService, type: :service do
 
     it 'shows reblogs by default' do
       recipient.follow!(sender)
-      is_expected.to change(Notification, :count)
+      expect { subject }.to change(Notification, :count)
     end
 
     it 'shows reblogs when explicitly enabled' do
       recipient.follow!(sender, reblogs: true)
-      is_expected.to change(Notification, :count)
+      expect { subject }.to change(Notification, :count)
     end
 
     it 'shows reblogs when disabled' do
       recipient.follow!(sender, reblogs: false)
-      is_expected.to change(Notification, :count)
+      expect { subject }.to change(Notification, :count)
     end
   end
 
@@ -134,12 +132,12 @@ RSpec.describe NotifyService, type: :service do
 
     it 'does not notify when conversation is muted' do
       recipient.mute_conversation!(activity.status.conversation)
-      is_expected.to_not change(Notification, :count)
+      expect { subject }.to_not change(Notification, :count)
     end
 
     it 'does not notify when it is a reply to a blocked user' do
       recipient.block!(asshole)
-      is_expected.to_not change(Notification, :count)
+      expect { subject }.to_not change(Notification, :count)
     end
   end
 
@@ -147,7 +145,7 @@ RSpec.describe NotifyService, type: :service do
     let(:sender) { recipient }
 
     it 'does not notify when recipient is the sender' do
-      is_expected.to_not change(Notification, :count)
+      expect { subject }.to_not change(Notification, :count)
     end
   end
 
@@ -163,7 +161,7 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { true }
 
       it 'sends email' do
-        is_expected.to change(ActionMailer::Base.deliveries, :count).by(1)
+        expect { subject }.to change(ActionMailer::Base.deliveries, :count).by(1)
       end
     end
 
@@ -171,7 +169,7 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { false }
 
       it "doesn't send email" do
-        is_expected.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+        expect { subject }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
       end
     end
   end
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 1f6b6ed88..86b93b5d2 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe PrecomputeFeedService, type: :service do
 
       subject.call(account)
 
-      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), status.id)).to be_within(0.1).of(status.id.to_f)
+      expect(redis.zscore(FeedManager.instance.key(:home, account.id), status.id)).to be_within(0.1).of(status.id.to_f)
     end
 
     it 'does not raise an error even if it could not find any status' do
@@ -30,7 +30,7 @@ RSpec.describe PrecomputeFeedService, type: :service do
 
       subject.call(account)
 
-      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq nil
+      expect(redis.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq nil
     end
   end
 end
diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb
index d74e8dc62..5b9d17a4c 100644
--- a/spec/services/process_mentions_service_spec.rb
+++ b/spec/services/process_mentions_service_spec.rb
@@ -1,83 +1,91 @@
 require 'rails_helper'
 
 RSpec.describe ProcessMentionsService, type: :service do
-  let(:account)    { Fabricate(:account, username: 'alice') }
-  let(:visibility) { :public }
-  let(:status)     { Fabricate(:status, account: account, text: "Hello @#{remote_user.acct}", visibility: visibility) }
+  let(:account) { Fabricate(:account, username: 'alice') }
 
   subject { ProcessMentionsService.new }
 
-  context 'ActivityPub' do
-    context do
-      let(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
-
-      before do
-        stub_request(:post, remote_user.inbox_url)
-        subject.call(status)
-      end
-
-      it 'creates a mention' do
-        expect(remote_user.mentions.where(status: status).count).to eq 1
-      end
-
-      it 'sends activity to the inbox' do
-        expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
-      end
-    end
-
-    context 'with an IDN domain' do
-      let(:remote_user) { Fabricate(:account, username: 'sneak', protocol: :activitypub, domain: 'xn--hresiar-mxa.ch', inbox_url: 'http://example.com/inbox') }
-      let(:status) { Fabricate(:status, account: account, text: "Hello @sneak@hæresiar.ch") }
-
-      before do
-        stub_request(:post, remote_user.inbox_url)
-        subject.call(status)
-      end
-
-      it 'creates a mention' do
-        expect(remote_user.mentions.where(status: status).count).to eq 1
-      end
-
-      it 'sends activity to the inbox' do
-        expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
-      end
-    end
-
-    context 'with an IDN TLD' do
-      let(:remote_user) { Fabricate(:account, username: 'foo', protocol: :activitypub, domain: 'xn--y9a3aq.xn--y9a3aq', inbox_url: 'http://example.com/inbox') }
-      let(:status) { Fabricate(:status, account: account, text: "Hello @foo@հայ.հայ") }
-
-      before do
-        stub_request(:post, remote_user.inbox_url)
-        subject.call(status)
-      end
-
-      it 'creates a mention' do
-        expect(remote_user.mentions.where(status: status).count).to eq 1
-      end
-
-      it 'sends activity to the inbox' do
-        expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
-      end
-    end
-  end
-
-  context 'Temporarily-unreachable ActivityPub user' do
-    let(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox', last_webfingered_at: nil) }
+  context 'when mentions contain blocked accounts' do
+    let(:non_blocked_account)          { Fabricate(:account) }
+    let(:individually_blocked_account) { Fabricate(:account) }
+    let(:domain_blocked_account)       { Fabricate(:account, domain: 'evil.com') }
+    let(:status) { Fabricate(:status, account: account, text: "Hello @#{non_blocked_account.acct} @#{individually_blocked_account.acct} @#{domain_blocked_account.acct}", visibility: :public) }
 
     before do
-      stub_request(:get, "https://example.com/.well-known/host-meta").to_return(status: 404)
-      stub_request(:get, "https://example.com/.well-known/webfinger?resource=acct:remote_user@example.com").to_return(status: 500)
-      stub_request(:post, remote_user.inbox_url)
+      account.block!(individually_blocked_account)
+      account.domain_blocks.create!(domain: domain_blocked_account.domain)
+
       subject.call(status)
     end
 
-    it 'creates a mention' do
-      expect(remote_user.mentions.where(status: status).count).to eq 1
+    it 'creates a mention to the non-blocked account' do
+      expect(non_blocked_account.mentions.where(status: status).count).to eq 1
     end
 
-    it 'sends activity to the inbox' do
-      expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
+    it 'does not create a mention to the individually blocked account' do
+      expect(individually_blocked_account.mentions.where(status: status).count).to eq 0
+    end
+
+    it 'does not create a mention to the domain-blocked account' do
+      expect(domain_blocked_account.mentions.where(status: status).count).to eq 0
+    end
+  end
+
+  context 'resolving a mention to a remote account' do
+    let(:status) { Fabricate(:status, account: account, text: "Hello @#{remote_user.acct}", visibility: :public) }
+
+    context 'ActivityPub' do
+      context do
+        let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
+
+        before do
+          subject.call(status)
+        end
+
+        it 'creates a mention' do
+          expect(remote_user.mentions.where(status: status).count).to eq 1
+        end
+      end
+
+      context 'with an IDN domain' do
+        let!(:remote_user) { Fabricate(:account, username: 'sneak', protocol: :activitypub, domain: 'xn--hresiar-mxa.ch', inbox_url: 'http://example.com/inbox') }
+        let!(:status) { Fabricate(:status, account: account, text: "Hello @sneak@hæresiar.ch") }
+
+        before do
+          subject.call(status)
+        end
+
+        it 'creates a mention' do
+          expect(remote_user.mentions.where(status: status).count).to eq 1
+        end
+      end
+
+      context 'with an IDN TLD' do
+        let!(:remote_user) { Fabricate(:account, username: 'foo', protocol: :activitypub, domain: 'xn--y9a3aq.xn--y9a3aq', inbox_url: 'http://example.com/inbox') }
+        let!(:status) { Fabricate(:status, account: account, text: "Hello @foo@հայ.հայ") }
+
+        before do
+          subject.call(status)
+        end
+
+        it 'creates a mention' do
+          expect(remote_user.mentions.where(status: status).count).to eq 1
+        end
+      end
+    end
+
+    context 'Temporarily-unreachable ActivityPub user' do
+      let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox', last_webfingered_at: nil) }
+
+      before do
+        stub_request(:get, "https://example.com/.well-known/host-meta").to_return(status: 404)
+        stub_request(:get, "https://example.com/.well-known/webfinger?resource=acct:remote_user@example.com").to_return(status: 500)
+        subject.call(status)
+      end
+
+      it 'creates a mention' do
+        expect(remote_user.mentions.where(status: status).count).to eq 1
+      end
     end
   end
 end
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index e2077f282..c0ae5eedc 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -32,6 +32,18 @@ RSpec.describe ReblogService, type: :service do
     end
   end
 
+  context 'when the reblogged status is discarded in the meantime' do
+    let(:status) { Fabricate(:status, account: alice, visibility: :public) }
+
+    before do
+      status.discard
+    end
+
+    it 'raises an exception' do
+      expect { subject.call(alice, status) }.to raise_error ActiveRecord::ActiveRecordError
+    end
+  end
+
   context 'ActivityPub' do
     let(:bob)    { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
     let(:status) { Fabricate(:status, account: bob) }
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index 732cb07f7..e14bfa78d 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe RejectFollowService, type: :service do
   subject { RejectFollowService.new }
 
   describe 'local' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob) { Fabricate(:account) }
 
     before do
       FollowRequest.create(account: bob, target_account: sender)
@@ -23,7 +23,7 @@ RSpec.describe RejectFollowService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
 
     before do
       FollowRequest.create(account: bob, target_account: sender)
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 21fb0cd35..482068d58 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe RemoveStatusService, type: :service do
   subject { RemoveStatusService.new }
 
-  let!(:alice)  { Fabricate(:account, user: Fabricate(:user)) }
+  let!(:alice)  { Fabricate(:account) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
   let!(:jeff)   { Fabricate(:account) }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
@@ -15,35 +15,97 @@ RSpec.describe RemoveStatusService, type: :service do
 
     jeff.follow!(alice)
     hank.follow!(alice)
-
-    @status = PostStatusService.new.call(alice, text: 'Hello @bob@example.com')
-    FavouriteService.new.call(jeff, @status)
-    Fabricate(:status, account: bill, reblog: @status, uri: 'hoge')
   end
 
-  it 'removes status from author\'s home feed' do
-    subject.call(@status)
-    expect(HomeFeed.new(alice).get(10)).to_not include(@status.id)
+  context 'when removed status is not a reblog' do
+    before do
+      @status = PostStatusService.new.call(alice, text: 'Hello @bob@example.com ThisIsASecret')
+      FavouriteService.new.call(jeff, @status)
+      Fabricate(:status, account: bill, reblog: @status, uri: 'hoge')
+    end
+
+    it 'removes status from author\'s home feed' do
+      subject.call(@status)
+      expect(HomeFeed.new(alice).get(10)).to_not include(@status.id)
+    end
+
+    it 'removes status from local follower\'s home feed' do
+      subject.call(@status)
+      expect(HomeFeed.new(jeff).get(10)).to_not include(@status.id)
+    end
+
+    it 'sends Delete activity to followers' do
+      subject.call(@status)
+      expect(a_request(:post, 'http://example.com/inbox').with(
+        body: hash_including({
+          'type' => 'Delete',
+          'object' => {
+            'type' => 'Tombstone',
+            'id' => ActivityPub::TagManager.instance.uri_for(@status),
+            'atomUri' => OStatus::TagManager.instance.uri_for(@status),
+          },
+        })
+      )).to have_been_made.once
+    end
+
+    it 'sends Delete activity to rebloggers' do
+      subject.call(@status)
+      expect(a_request(:post, 'http://example2.com/inbox').with(
+        body: hash_including({
+          'type' => 'Delete',
+          'object' => {
+            'type' => 'Tombstone',
+            'id' => ActivityPub::TagManager.instance.uri_for(@status),
+            'atomUri' => OStatus::TagManager.instance.uri_for(@status),
+          },
+        })
+      )).to have_been_made.once
+    end
+
+    it 'remove status from notifications' do
+      expect { subject.call(@status) }.to change {
+        Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count
+      }.from(1).to(0)
+    end
   end
 
-  it 'removes status from local follower\'s home feed' do
-    subject.call(@status)
-    expect(HomeFeed.new(jeff).get(10)).to_not include(@status.id)
+  context 'when removed status is a private self-reblog' do
+    before do
+      @original_status = Fabricate(:status, account: alice, text: 'Hello ThisIsASecret', visibility: :private)
+      @status = ReblogService.new.call(alice, @original_status)
+    end
+
+    it 'sends Undo activity to followers' do
+      subject.call(@status)
+      expect(a_request(:post, 'http://example.com/inbox').with(
+        body: hash_including({
+          'type' => 'Undo',
+          'object' => hash_including({
+            'type' => 'Announce',
+            'object' => ActivityPub::TagManager.instance.uri_for(@original_status),
+          }),
+        })
+      )).to have_been_made.once
+    end
   end
 
-  it 'sends delete activity to followers' do
-    subject.call(@status)
-    expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.twice
-  end
+  context 'when removed status is public self-reblog' do
+    before do
+      @original_status = Fabricate(:status, account: alice, text: 'Hello ThisIsASecret', visibility: :public)
+      @status = ReblogService.new.call(alice, @original_status)
+    end
 
-  it 'sends delete activity to rebloggers' do
-    subject.call(@status)
-    expect(a_request(:post, 'http://example2.com/inbox')).to have_been_made
-  end
-
-  it 'remove status from notifications' do
-    expect { subject.call(@status) }.to change {
-      Notification.where(activity_type: 'Favourite', from_account: jeff, account: alice).count
-    }.from(1).to(0)
+    it 'sends Undo activity to followers' do
+      subject.call(@status)
+      expect(a_request(:post, 'http://example.com/inbox').with(
+        body: hash_including({
+          'type' => 'Undo',
+          'object' => hash_including({
+            'type' => 'Announce',
+            'object' => ActivityPub::TagManager.instance.uri_for(@original_status),
+          }),
+        })
+      )).to have_been_made.once
+    end
   end
 end
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 454e4d896..02bc42ac1 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe ReportService, type: :service do
   subject { described_class.new }
 
-  let(:source_account) { Fabricate(:user).account }
+  let(:source_account) { Fabricate(:account) }
 
   context 'for a remote account' do
     let(:remote_account) { Fabricate(:account, domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
@@ -28,6 +28,62 @@ RSpec.describe ReportService, type: :service do
     end
   end
 
+  context 'when the reported status is a DM' do
+    let(:target_account) { Fabricate(:account) }
+    let(:status) { Fabricate(:status, account: target_account, visibility: :direct) }
+
+    subject do
+      -> { described_class.new.call(source_account, target_account, status_ids: [status.id]) }
+    end
+
+    context 'when it is addressed to the reporter' do
+      before do
+        status.mentions.create(account: source_account)
+      end
+
+      it 'creates a report' do
+        expect { subject.call }.to change { target_account.targeted_reports.count }.from(0).to(1)
+      end
+
+      it 'attaches the DM to the report' do
+        subject.call
+        expect(target_account.targeted_reports.pluck(:status_ids)).to eq [[status.id]]
+      end
+    end
+
+    context 'when it is not addressed to the reporter' do
+      it 'errors out' do
+        expect { subject.call }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context 'when the reporter is remote' do
+      let(:source_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/1') }
+
+      context 'when it is addressed to the reporter' do
+        before do
+          status.mentions.create(account: source_account)
+        end
+
+        it 'creates a report' do
+          expect { subject.call }.to change { target_account.targeted_reports.count }.from(0).to(1)
+        end
+
+        it 'attaches the DM to the report' do
+          subject.call
+          expect(target_account.targeted_reports.pluck(:status_ids)).to eq [[status.id]]
+        end
+      end
+
+      context 'when it is not addressed to the reporter' do
+        it 'does not add the DM to the report' do
+          subject.call
+          expect(target_account.targeted_reports.pluck(:status_ids)).to eq [[]]
+        end
+      end
+    end
+  end
+
   context 'when other reports already exist for the same target' do
     let!(:target_account) { Fabricate(:account) }
     let!(:other_report)   { Fabricate(:report, target_account: target_account) }
@@ -42,7 +98,7 @@ RSpec.describe ReportService, type: :service do
     end
 
     it 'does not send an e-mail' do
-      is_expected.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+      expect { subject.call }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
     end
   end
 end
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 7b1e8885c..654606bea 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -137,8 +137,8 @@ RSpec.describe ResolveAccountService, type: :service do
       stub_request(:get, 'https://evil.example.com/.well-known/webfinger?resource=acct:foo@evil.example.com').to_return(body: Oj.dump(webfinger2), headers: { 'Content-Type': 'application/jrd+json' })
     end
 
-    it 'returns new remote account' do
-      expect { subject.call('Foo@redirected.example.com') }.to raise_error Webfinger::RedirectError
+    it 'does not return a new remote account' do
+      expect(subject.call('Foo@redirected.example.com')).to be_nil
     end
   end
 
@@ -220,6 +220,8 @@ RSpec.describe ResolveAccountService, type: :service do
           return_values << described_class.new.call('foo@ap.example.com')
         rescue ActiveRecord::RecordNotUnique
           fail_occurred = true
+        ensure
+          RedisConfiguration.pool.checkin if Thread.current[:redis]
         end
       end
     end
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index a38b23590..b3e3defbf 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -7,15 +7,29 @@ describe ResolveURLService, type: :service do
 
   describe '#call' do
     it 'returns nil when there is no resource url' do
-      url     = 'http://example.com/missing-resource'
+      url           = 'http://example.com/missing-resource'
+      known_account = Fabricate(:account, uri: url)
       service = double
 
       allow(FetchResourceService).to receive(:new).and_return service
+      allow(service).to receive(:response_code).and_return(404)
       allow(service).to receive(:call).with(url).and_return(nil)
 
       expect(subject.call(url)).to be_nil
     end
 
+    it 'returns known account on temporary error' do
+      url           = 'http://example.com/missing-resource'
+      known_account = Fabricate(:account, uri: url)
+      service = double
+
+      allow(FetchResourceService).to receive(:new).and_return service
+      allow(service).to receive(:response_code).and_return(500)
+      allow(service).to receive(:call).with(url).and_return(nil)
+
+      expect(subject.call(url)).to eq known_account
+    end
+
     context 'searching for a remote private status' do
       let(:account)  { Fabricate(:account) }
       let(:poster)   { Fabricate(:account, domain: 'example.com') }
@@ -112,5 +126,24 @@ describe ResolveURLService, type: :service do
         end
       end
     end
+
+    context 'searching for a link that redirects to a local public status' do
+      let(:account) { Fabricate(:account) }
+      let(:poster)  { Fabricate(:account) }
+      let!(:status) { Fabricate(:status, account: poster, visibility: :public) }
+      let(:url)     { 'https://link.to/foobar' }
+      let(:status_url) { ActivityPub::TagManager.instance.url_for(status) }
+      let(:uri)     { ActivityPub::TagManager.instance.uri_for(status) }
+
+      before do
+        stub_request(:get, url).to_return(status: 302, headers: { 'Location' => status_url })
+        body = ActiveModelSerializers::SerializableResource.new(status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter).to_json
+        stub_request(:get, status_url).to_return(body: body, headers: { 'Content-Type' => 'application/activity+json' })
+      end
+
+      it 'returns status by url' do
+        expect(subject.call(url, on_behalf_of: account)).to eq(status)
+      end
+    end
   end
 end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index cf7eb257a..5d45e4ffd 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -5,9 +5,7 @@ RSpec.describe SuspendAccountService, type: :service do
     let!(:local_follower) { Fabricate(:user, current_sign_in_at: 1.hour.ago).account }
     let!(:list)           { Fabricate(:list, account: local_follower) }
 
-    subject do
-      -> { described_class.new.call(account) }
-    end
+    subject { described_class.new.call(account) }
 
     before do
       allow(FeedManager.instance).to receive(:unmerge_from_home).and_return(nil)
@@ -18,13 +16,13 @@ RSpec.describe SuspendAccountService, type: :service do
     end
 
     it "unmerges from local followers' feeds" do
-      subject.call
+      subject
       expect(FeedManager.instance).to have_received(:unmerge_from_home).with(account, local_follower)
       expect(FeedManager.instance).to have_received(:unmerge_from_list).with(account, list)
     end
 
     it 'marks account as suspended' do
-      is_expected.to change { account.suspended? }.from(false).to(true)
+      expect { subject }.to change { account.suspended? }.from(false).to(true)
     end
   end
 
@@ -51,7 +49,7 @@ RSpec.describe SuspendAccountService, type: :service do
       end
 
       it 'sends an update actor to followers and reporters' do
-        subject.call
+        subject
         expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
         expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
       end
@@ -77,7 +75,7 @@ RSpec.describe SuspendAccountService, type: :service do
       end
 
       it 'sends a reject follow' do
-        subject.call
+        subject
         expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once
       end
     end
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index c43ab24b0..10448b340 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe UnblockService, type: :service do
   subject { UnblockService.new }
 
   describe 'local' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob) { Fabricate(:account) }
 
     before do
       sender.block!(bob)
@@ -19,7 +19,7 @@ RSpec.describe UnblockService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
       sender.block!(bob)
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index 7f0b575e4..bb5bef5c9 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe UnfollowService, type: :service do
   subject { UnfollowService.new }
 
   describe 'local' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:bob) { Fabricate(:account, username: 'bob') }
 
     before do
       sender.follow!(bob)
@@ -19,7 +19,7 @@ RSpec.describe UnfollowService, type: :service do
   end
 
   describe 'remote ActivityPub' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
       sender.follow!(bob)
@@ -37,7 +37,7 @@ RSpec.describe UnfollowService, type: :service do
   end
 
   describe 'remote ActivityPub (reverse)' do
-    let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
       bob.follow!(sender)
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index d52cb6cc0..3ac4cc085 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -5,9 +5,7 @@ RSpec.describe UnsuspendAccountService, type: :service do
     let!(:local_follower) { Fabricate(:user, current_sign_in_at: 1.hour.ago).account }
     let!(:list)           { Fabricate(:list, account: local_follower) }
 
-    subject do
-      -> { described_class.new.call(account) }
-    end
+    subject { described_class.new.call(account) }
 
     before do
       allow(FeedManager.instance).to receive(:merge_into_home).and_return(nil)
@@ -33,7 +31,7 @@ RSpec.describe UnsuspendAccountService, type: :service do
     end
 
     it 'marks account as unsuspended' do
-      is_expected.to change { account.suspended? }.from(true).to(false)
+      expect { subject }.to change { account.suspended? }.from(true).to(false)
     end
 
     include_examples 'common behavior' do
@@ -47,13 +45,13 @@ RSpec.describe UnsuspendAccountService, type: :service do
       end
 
       it "merges back into local followers' feeds" do
-        subject.call
+        subject
         expect(FeedManager.instance).to have_received(:merge_into_home).with(account, local_follower)
         expect(FeedManager.instance).to have_received(:merge_into_list).with(account, list)
       end
 
       it 'sends an update actor to followers and reporters' do
-        subject.call
+        subject
         expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
         expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
       end
@@ -63,69 +61,69 @@ RSpec.describe UnsuspendAccountService, type: :service do
   describe 'unsuspending a remote account' do
     include_examples 'common behavior' do
       let!(:account)                 { Fabricate(:account, domain: 'bob.com', uri: 'https://bob.com', inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
-      let!(:reslove_account_service) { double }
+      let!(:resolve_account_service) { double }
 
       before do
-        allow(ResolveAccountService).to receive(:new).and_return(reslove_account_service)
+        allow(ResolveAccountService).to receive(:new).and_return(resolve_account_service)
       end
 
       context 'when the account is not remotely suspended' do
         before do
-          allow(reslove_account_service).to receive(:call).with(account).and_return(account)
+          allow(resolve_account_service).to receive(:call).with(account).and_return(account)
         end
 
         it 're-fetches the account' do
-          subject.call
-          expect(reslove_account_service).to have_received(:call).with(account)
+          subject
+          expect(resolve_account_service).to have_received(:call).with(account)
         end
 
         it "merges back into local followers' feeds" do
-          subject.call
+          subject
           expect(FeedManager.instance).to have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to have_received(:merge_into_list).with(account, list)
         end
 
         it 'marks account as unsuspended' do
-          is_expected.to change { account.suspended? }.from(true).to(false)
+          expect { subject }.to change { account.suspended? }.from(true).to(false)
         end
       end
 
       context 'when the account is remotely suspended' do
         before do
-          allow(reslove_account_service).to receive(:call).with(account) do |account|
+          allow(resolve_account_service).to receive(:call).with(account) do |account|
             account.suspend!(origin: :remote)
             account
           end
         end
 
         it 're-fetches the account' do
-          subject.call
-          expect(reslove_account_service).to have_received(:call).with(account)
+          subject
+          expect(resolve_account_service).to have_received(:call).with(account)
         end
 
         it "does not merge back into local followers' feeds" do
-          subject.call
+          subject
           expect(FeedManager.instance).to_not have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to_not have_received(:merge_into_list).with(account, list)
         end
 
         it 'does not mark the account as unsuspended' do
-          is_expected.not_to change { account.suspended? }
+          expect { subject }.not_to change { account.suspended? }
         end
       end
 
       context 'when the account is remotely deleted' do
         before do
-          allow(reslove_account_service).to receive(:call).with(account).and_return(nil)
+          allow(resolve_account_service).to receive(:call).with(account).and_return(nil)
         end
 
         it 're-fetches the account' do
-          subject.call
-          expect(reslove_account_service).to have_received(:call).with(account)
+          subject
+          expect(resolve_account_service).to have_received(:call).with(account)
         end
 
         it "does not merge back into local followers' feeds" do
-          subject.call
+          subject
           expect(FeedManager.instance).to_not have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to_not have_received(:merge_into_list).with(account, list)
         end
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 960b26891..c2dc791e4 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe UpdateAccountService, type: :service do
 
   describe 'switching form locked to unlocked accounts' do
     let(:account) { Fabricate(:account, locked: true) }
-    let(:alice)   { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
-    let(:bob)     { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
-    let(:eve)     { Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account }
+    let(:alice)   { Fabricate(:account) }
+    let(:bob)     { Fabricate(:account) }
+    let(:eve)     { Fabricate(:account) }
 
     before do
       bob.touch(:silenced_at)
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
new file mode 100644
index 000000000..71a73be5b
--- /dev/null
+++ b/spec/services/update_status_service_spec.rb
@@ -0,0 +1,157 @@
+require 'rails_helper'
+
+RSpec.describe UpdateStatusService, type: :service do
+  subject { described_class.new }
+
+  context 'when nothing changes' do
+    let!(:status) { Fabricate(:status, text: 'Foo', language: 'en') }
+
+    before do
+      allow(ActivityPub::DistributionWorker).to receive(:perform_async)
+      subject.call(status, status.account_id, text: 'Foo')
+    end
+
+    it 'does not create an edit' do
+      expect(status.reload.edits).to be_empty
+    end
+
+    it 'does not notify anyone' do
+      expect(ActivityPub::DistributionWorker).to_not have_received(:perform_async)
+    end
+  end
+
+  context 'when text changes' do
+    let!(:status) { Fabricate(:status, text: 'Foo') }
+    let(:preview_card) { Fabricate(:preview_card) }
+
+    before do
+      status.preview_cards << preview_card
+      subject.call(status, status.account_id, text: 'Bar')
+    end
+
+    it 'updates text' do
+      expect(status.reload.text).to eq 'Bar'
+    end
+
+    it 'resets preview card' do
+      expect(status.reload.preview_card).to be_nil
+    end
+
+    it 'saves edit history' do
+      expect(status.edits.pluck(:text)).to eq %w(Foo Bar)
+    end
+  end
+
+  context 'when content warning changes' do
+    let!(:status) { Fabricate(:status, text: 'Foo', spoiler_text: '') }
+    let(:preview_card) { Fabricate(:preview_card) }
+
+    before do
+      status.preview_cards << preview_card
+      subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
+    end
+
+    it 'updates content warning' do
+      expect(status.reload.spoiler_text).to eq 'Bar'
+    end
+
+    it 'saves edit history' do
+      expect(status.edits.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']]
+    end
+  end
+
+  context 'when media attachments change' do
+    let!(:status) { Fabricate(:status, text: 'Foo') }
+    let!(:detached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
+    let!(:attached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
+
+    before do
+      status.media_attachments << detached_media_attachment
+      subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id])
+    end
+
+    it 'updates media attachments' do
+      expect(status.ordered_media_attachments).to eq [attached_media_attachment]
+    end
+
+    it 'does not detach detached media attachments' do
+      expect(detached_media_attachment.reload.status_id).to eq status.id
+    end
+
+    it 'attaches attached media attachments' do
+      expect(attached_media_attachment.reload.status_id).to eq status.id
+    end
+
+    it 'saves edit history' do
+      expect(status.edits.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]]
+    end
+  end
+
+  context 'when poll changes' do
+    let(:account) { Fabricate(:account) }
+    let!(:status) { Fabricate(:status, text: 'Foo', account: account, poll_attributes: {options: %w(Foo Bar), account: account, multiple: false, hide_totals: false, expires_at: 7.days.from_now }) }
+    let!(:poll)   { status.poll }
+    let!(:voter) { Fabricate(:account) }
+
+    before do
+      status.update(poll: poll)
+      VoteService.new.call(voter, poll, [0])
+      subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz Foo), expires_in: 5.days.to_i })
+    end
+
+    it 'updates poll' do
+      poll = status.poll.reload
+      expect(poll.options).to eq %w(Bar Baz Foo)
+    end
+
+    it 'resets votes' do
+      poll = status.poll.reload
+      expect(poll.votes_count).to eq 0
+      expect(poll.votes.count).to eq 0
+      expect(poll.cached_tallies).to eq [0, 0, 0]
+    end
+
+    it 'saves edit history' do
+      expect(status.edits.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)]
+    end
+  end
+
+  context 'when mentions in text change' do
+    let!(:account) { Fabricate(:account) }
+    let!(:alice) { Fabricate(:account, username: 'alice') }
+    let!(:bob) { Fabricate(:account, username: 'bob') }
+    let!(:status) { PostStatusService.new.call(account, text: 'Hello @alice') }
+
+    before do
+      subject.call(status, status.account_id, text: 'Hello @bob')
+    end
+
+    it 'changes mentions' do
+      expect(status.active_mentions.pluck(:account_id)).to eq [bob.id]
+    end
+
+    it 'keeps old mentions as silent mentions' do
+      expect(status.mentions.pluck(:account_id)).to match_array([alice.id, bob.id])
+    end
+  end
+
+  context 'when hashtags in text change' do
+    let!(:account) { Fabricate(:account) }
+    let!(:status) { PostStatusService.new.call(account, text: 'Hello #foo') }
+
+    before do
+      subject.call(status, status.account_id, text: 'Hello #bar')
+    end
+
+    it 'changes tags' do
+      expect(status.tags.pluck(:name)).to eq %w(bar)
+    end
+  end
+
+  it 'notifies ActivityPub about the update' do
+    status = Fabricate(:status, text: 'Foo')
+    allow(ActivityPub::DistributionWorker).to receive(:perform_async)
+    subject.call(status, status.account_id, text: 'Bar')
+    expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
+  end
+end
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 3fc88e60e..52ba454cc 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -76,7 +76,25 @@ RSpec.describe VerifyLinkService, type: :service do
     context 'when a link does not contain a link back' do
       let(:html) { '' }
 
-      it 'marks the field as verified' do
+      it 'does not mark the field as verified' do
+        expect(field.verified?).to be false
+      end
+    end
+
+    context 'when link has no `href` attribute' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <head>
+            <link type="text/html" rel="me" />
+          </head>
+          <body>
+            <a rel="me" target="_blank">Follow me on Mastodon</a>
+          </body>
+        HTML
+      end
+
+      it 'does not mark the field as verified' do
         expect(field.verified?).to be false
       end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b6d127a08..0414ba9ed 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -57,3 +57,10 @@ end
 def json_str_to_hash(str)
   JSON.parse(str, symbolize_names: true)
 end
+
+def expect_push_bulk_to_match(klass, matcher)
+  expect(Sidekiq::Client).to receive(:push_bulk).with(hash_including({
+    "class" => klass,
+    "args" => matcher
+  }))
+end
diff --git a/spec/support/matchers/json/match_json_schema.rb b/spec/support/matchers/json/match_json_schema.rb
new file mode 100644
index 000000000..5d9c9a618
--- /dev/null
+++ b/spec/support/matchers/json/match_json_schema.rb
@@ -0,0 +1,6 @@
+RSpec::Matchers.define :match_json_schema do |schema|
+  match do |input_json|
+    schema_path = Rails.root.join('spec', 'support', 'schema', "#{schema}.json").to_s
+    JSON::Validator.validate(schema_path, input_json, validate_schema: true)
+  end
+end
diff --git a/spec/support/matchers/model/model_have_error_on_field.rb b/spec/support/matchers/model/model_have_error_on_field.rb
index a5dfbf457..85bdd8215 100644
--- a/spec/support/matchers/model/model_have_error_on_field.rb
+++ b/spec/support/matchers/model/model_have_error_on_field.rb
@@ -8,7 +8,7 @@ RSpec::Matchers.define :model_have_error_on_field do |expected|
   end
 
   failure_message do |record|
-    keys = record.errors.keys
+    keys = record.errors.attribute_names
 
     "expect record.errors(#{keys}) to include #{expected}"
   end
diff --git a/spec/support/schema/nodeinfo_2.0.json b/spec/support/schema/nodeinfo_2.0.json
new file mode 100644
index 000000000..085ce542b
--- /dev/null
+++ b/spec/support/schema/nodeinfo_2.0.json
@@ -0,0 +1,170 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://nodeinfo.diaspora.software/ns/schema/2.0#",
+  "description": "NodeInfo schema version 2.0.",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "version",
+    "software",
+    "protocols",
+    "services",
+    "openRegistrations",
+    "usage",
+    "metadata"
+  ],
+  "properties": {
+    "version": {
+      "description": "The schema version, must be 2.0.",
+      "enum": ["2.0"]
+    },
+    "software": {
+      "description": "Metadata about server software in use.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["name", "version"],
+      "properties": {
+        "name": {
+          "description": "The canonical name of this server software.",
+          "type": "string",
+          "pattern": "^[a-z0-9-]+$"
+        },
+        "version": {
+          "description": "The version of this server software.",
+          "type": "string"
+        }
+      }
+    },
+    "protocols": {
+      "description": "The protocols supported on this server.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "enum": [
+          "activitypub",
+          "buddycloud",
+          "dfrn",
+          "diaspora",
+          "libertree",
+          "ostatus",
+          "pumpio",
+          "tent",
+          "xmpp",
+          "zot"
+        ]
+      }
+    },
+    "services": {
+      "description": "The third party sites this server can connect to via their application API.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["inbound", "outbound"],
+      "properties": {
+        "inbound": {
+          "description": "The third party sites this server can retrieve messages from for combined display with regular traffic.",
+          "type": "array",
+          "minItems": 0,
+          "items": {
+            "enum": [
+              "atom1.0",
+              "gnusocial",
+              "imap",
+              "pnut",
+              "pop3",
+              "pumpio",
+              "rss2.0",
+              "twitter"
+            ]
+          }
+        },
+        "outbound": {
+          "description": "The third party sites this server can publish messages to on the behalf of a user.",
+          "type": "array",
+          "minItems": 0,
+          "items": {
+            "enum": [
+              "atom1.0",
+              "blogger",
+              "buddycloud",
+              "diaspora",
+              "dreamwidth",
+              "drupal",
+              "facebook",
+              "friendica",
+              "gnusocial",
+              "google",
+              "insanejournal",
+              "libertree",
+              "linkedin",
+              "livejournal",
+              "mediagoblin",
+              "myspace",
+              "pinterest",
+              "pnut",
+              "posterous",
+              "pumpio",
+              "redmatrix",
+              "rss2.0",
+              "smtp",
+              "tent",
+              "tumblr",
+              "twitter",
+              "wordpress",
+              "xmpp"
+            ]
+          }
+        }
+      }
+    },
+    "openRegistrations": {
+      "description": "Whether this server allows open self-registration.",
+      "type": "boolean"
+    },
+    "usage": {
+      "description": "Usage statistics for this server.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["users"],
+      "properties": {
+        "users": {
+          "description": "statistics about the users of this server.",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "total": {
+              "description": "The total amount of on this server registered users.",
+              "type": "integer",
+              "minimum": 0
+            },
+            "activeHalfyear": {
+              "description": "The amount of users that signed in at least once in the last 180 days.",
+              "type": "integer",
+              "minimum": 0
+            },
+            "activeMonth": {
+              "description": "The amount of users that signed in at least once in the last 30 days.",
+              "type": "integer",
+              "minimum": 0
+            }
+          }
+        },
+        "localPosts": {
+          "description": "The amount of posts that were made by users that are registered on this server.",
+          "type": "integer",
+          "minimum": 0
+        },
+        "localComments": {
+          "description": "The amount of comments that were made by users that are registered on this server.",
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "metadata": {
+      "description": "Free form key value pairs for software specific values. Clients should not rely on any specific key present.",
+      "type": "object",
+      "minProperties": 0,
+      "additionalProperties": true
+    }
+  }
+}
diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 75b413330..0c4a14d1c 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -22,7 +22,7 @@ module ProfileStories
   def with_alice_as_local_user
     @alice_bio = '@alice and @bob are fictional characters commonly used as'\
                  'placeholder names in #cryptology, as well as #science and'\
-                 'engineering 📖 literature. Not affilated with @pepe.'
+                 'engineering 📖 literature. Not affiliated with @pepe.'
 
     @alice = Fabricate(
       :user,
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index f7d5e01bc..351de0707 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe BlacklistedEmailValidator, type: :validator do
   describe '#validate' do
-    let(:user)   { double(email: 'info@mail.com', errors: errors) }
+    let(:user)   { double(email: 'info@mail.com', sign_up_ip: '1.2.3.4', errors: errors) }
     let(:errors) { double(add: nil) }
 
     before do
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index 550e91996..4feedd0c7 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -4,24 +4,28 @@ require 'rails_helper'
 
 describe EmailMxValidator do
   describe '#validate' do
-    let(:user) { double(email: 'foo@example.com', errors: double(add: nil)) }
+    let(:user) { double(email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: double(add: nil)) }
 
-    it 'does not add errors if there are no DNS records for an e-mail domain that is explicitly allowed' do
-      old_whitelist = Rails.configuration.x.email_domains_whitelist
-      Rails.configuration.x.email_domains_whitelist = 'example.com'
+    context 'for an e-mail domain that is explicitly allowed' do
+      around do |block|
+        tmp = Rails.configuration.x.email_domains_whitelist
+        Rails.configuration.x.email_domains_whitelist = 'example.com'
+        block.call
+        Rails.configuration.x.email_domains_whitelist = tmp
+      end
 
-      resolver = double
+      it 'does not add errors if there are no DNS records' do
+        resolver = double
 
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:timeouts=).and_return(nil)
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
 
-      subject.validate(user)
-      expect(user.errors).to_not have_received(:add)
-
-      Rails.configuration.x.email_domains_whitelist = old_whitelist
+        subject.validate(user)
+        expect(user.errors).to_not have_received(:add)
+      end
     end
 
     it 'adds an error if there are no DNS records for the e-mail domain' do
@@ -37,7 +41,7 @@ describe EmailMxValidator do
       expect(user.errors).to have_received(:add)
     end
 
-    it 'adds an error if a MX record exists but does not lead to an IP' do
+    it 'adds an error if a MX record does not lead to an IP' do
       resolver = double
 
       allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(exchange: 'mail.example.com')])
@@ -52,67 +56,7 @@ describe EmailMxValidator do
       expect(user.errors).to have_received(:add)
     end
 
-    it 'adds an error if the A record is blacklisted' do
-      EmailDomainBlock.create!(domain: '1.2.3.4')
-      resolver = double
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([double(address: '1.2.3.4')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
-
-      subject.validate(user)
-      expect(user.errors).to have_received(:add)
-    end
-
-    it 'adds an error if the AAAA record is blacklisted' do
-      EmailDomainBlock.create!(domain: 'fd00::1')
-      resolver = double
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([double(address: 'fd00::1')])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
-
-      subject.validate(user)
-      expect(user.errors).to have_received(:add)
-    end
-
     it 'adds an error if the MX record is blacklisted' do
-      EmailDomainBlock.create!(domain: '2.3.4.5')
-      resolver = double
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([double(address: '2.3.4.5')])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
-
-      subject.validate(user)
-      expect(user.errors).to have_received(:add)
-    end
-
-    it 'adds an error if the MX IPv6 record is blacklisted' do
-      EmailDomainBlock.create!(domain: 'fd00::2')
-      resolver = double
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([double(address: 'fd00::2')])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
-
-      subject.validate(user)
-      expect(user.errors).to have_received(:add)
-    end
-
-    it 'adds an error if the MX hostname is blacklisted' do
       EmailDomainBlock.create!(domain: 'mail.example.com')
       resolver = double
 
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index bef3f29f5..db9c728a8 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -50,6 +50,13 @@ describe StatusLengthValidator do
       expect(status.errors).to have_received(:add)
     end
 
+    it 'does not count overly long URLs as 23 characters flat' do
+      text = "http://example.com/valid?#{'#foo?' * 1000}"
+      status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false)
+      subject.validate(status)
+      expect(status.errors).to have_received(:add)
+    end
+
     it 'counts only the front part of remote usernames' do
       text   = ('a' * 475) + " @alice@#{'b' * 30}.com"
       status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false)
@@ -57,5 +64,13 @@ describe StatusLengthValidator do
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
     end
+
+    it 'does count both parts of remote usernames for overly long domains' do
+      text   = "@alice@#{'b' * 500}.com"
+      status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false)
+
+      subject.validate(status)
+      expect(status.errors).to have_received(:add)
+    end
   end
 end
diff --git a/spec/validators/status_pin_validator_spec.rb b/spec/validators/status_pin_validator_spec.rb
index 06532e5b3..d5bd0d1b8 100644
--- a/spec/validators/status_pin_validator_spec.rb
+++ b/spec/validators/status_pin_validator_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe StatusPinValidator, type: :validator do
     end
 
     let(:pin) { double(account: account, errors: errors, status: status, account_id: pin_account_id) }
-    let(:status) { double(reblog?: reblog, account_id: status_account_id, visibility: visibility) }
+    let(:status) { double(reblog?: reblog, account_id: status_account_id, visibility: visibility, direct_visibility?: visibility == 'direct') }
     let(:account)     { double(status_pins: status_pins, local?: local) }
     let(:status_pins) { double(count: count) }
     let(:errors)      { double(add: nil) }
@@ -37,11 +37,11 @@ RSpec.describe StatusPinValidator, type: :validator do
       end
     end
 
-    context 'unless %w(public unlisted).include?(pin.status.visibility)' do
-      let(:visibility) { '' }
+    context 'if pin.status.direct_visibility?' do
+      let(:visibility) { 'direct' }
 
       it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.private'))
+        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.direct'))
       end
     end
 
diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
index cabd6d386..746b3866c 100644
--- a/spec/validators/unreserved_username_validator_spec.rb
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
       context 'reserved_username?' do
         let(:reserved_username) { true }
 
-        it 'calls erros.add' do
+        it 'calls errors.add' do
           expect(errors).to have_received(:add).with(:username, :reserved)
         end
       end
@@ -35,7 +35,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
       context '!reserved_username?' do
         let(:reserved_username) { false }
 
-        it 'not calls erros.add' do
+        it 'not calls errors.add' do
           expect(errors).not_to have_received(:add).with(:username, any_args)
         end
       end
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
index a44878a44..85eadeb63 100644
--- a/spec/validators/url_validator_spec.rb
+++ b/spec/validators/url_validator_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe URLValidator, type: :validator do
       let(:compliant) { false }
 
       it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(attribute, I18n.t('applications.invalid_url'))
+        expect(errors).to have_received(:add).with(attribute, :invalid)
       end
     end
 
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
deleted file mode 100644
index 1c2f5eee9..000000000
--- a/spec/views/about/show.html.haml_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'about/show.html.haml', without_verify_partial_doubles: true do
-  before do
-    allow(view).to receive(:site_hostname).and_return('example.com')
-    allow(view).to receive(:site_title).and_return('example site')
-    allow(view).to receive(:new_user).and_return(User.new)
-    allow(view).to receive(:use_seamless_external_login?).and_return(false)
-  end
-
-  it 'has valid open graph tags' do
-    instance_presenter = double(
-      :instance_presenter,
-      site_title: 'something',
-      site_short_description: 'something',
-      site_description: 'something',
-      version_number: '1.0',
-      source_url: 'https://github.com/mastodon/mastodon',
-      open_registrations: false,
-      thumbnail: nil,
-      hero: nil,
-      mascot: nil,
-      user_count: 420,
-      status_count: 69,
-      active_user_count: 420,
-      contact_account: nil,
-      sample_accounts: []
-    )
-
-    assign(:instance_presenter, instance_presenter)
-    render
-
-    header_tags = view.content_for(:header_tags)
-
-    expect(header_tags).to match(%r{<meta content=".+" property="og:title" />})
-    expect(header_tags).to match(%r{<meta content="website" property="og:type" />})
-    expect(header_tags).to match(%r{<meta content=".+" property="og:image" />})
-    expect(header_tags).to match(%r{<meta content="http://.+" property="og:url" />})
-  end
-end
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 879a26959..ca5bb2ae8 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
   before do
-    double(:api_oembed_url => '')
+    double(api_oembed_url: '')
     allow(view).to receive(:show_landing_strip?).and_return(true)
     allow(view).to receive(:site_title).and_return('example site')
     allow(view).to receive(:site_hostname).and_return('example.com')
@@ -12,57 +12,10 @@ describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
     allow(view).to receive(:current_account).and_return(nil)
+    allow(view).to receive(:single_user_mode?).and_return(false)
     assign(:instance_presenter, InstancePresenter.new)
   end
 
-  it 'has valid author h-card and basic data for a detailed_status' do
-    alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    bob    = Fabricate(:account, username: 'bob', display_name: 'Bob')
-    status = Fabricate(:status, account: alice, text: 'Hello World')
-    media  = Fabricate(:media_attachment, account: alice, status: status, type: :video)
-    reply  = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
-
-    assign(:status, status)
-    assign(:account, alice)
-    assign(:descendant_threads, [])
-
-    render
-
-    mf2 = Microformats.parse(rendered)
-
-    expect(mf2.entry.url.to_s).not_to be_empty
-    expect(mf2.entry.author.name.to_s).to eq alice.display_name
-    expect(mf2.entry.author.url.to_s).not_to be_empty
-  end
-
-  it 'has valid h-cites for p-in-reply-to and p-comment' do
-    alice   = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    bob     = Fabricate(:account, username: 'bob', display_name: 'Bob')
-    carl    = Fabricate(:account, username: 'carl', display_name: 'Carl')
-    status  = Fabricate(:status, account: alice, text: 'Hello World')
-    media   = Fabricate(:media_attachment, account: alice, status: status, type: :video)
-    reply   = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
-    comment = Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob')
-
-    assign(:status, reply)
-    assign(:account, alice)
-    assign(:ancestors, reply.ancestors(1, bob))
-    assign(:descendant_threads, [{ statuses: reply.descendants(1) }])
-
-    render
-
-    mf2 = Microformats.parse(rendered)
-
-    expect(mf2.entry.url.to_s).not_to be_empty
-    expect(mf2.entry.comment.url.to_s).not_to be_empty
-    expect(mf2.entry.comment.author.name.to_s).to eq carl.display_name
-    expect(mf2.entry.comment.author.url.to_s).not_to be_empty
-
-    expect(mf2.entry.in_reply_to.url.to_s).not_to be_empty
-    expect(mf2.entry.in_reply_to.author.name.to_s).to eq alice.display_name
-    expect(mf2.entry.in_reply_to.author.url.to_s).not_to be_empty
-  end
-
   it 'has valid opengraph tags' do
     alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
     status = Fabricate(:status, account: alice, text: 'Hello World')
diff --git a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
index 7eb6119fd..d68a695b7 100644
--- a/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
+++ b/spec/workers/activitypub/distribute_poll_update_worker_spec.rb
@@ -10,13 +10,12 @@ describe ActivityPub::DistributePollUpdateWorker do
 
   describe '#perform' do
     before do
-      allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
       follower.follow!(account)
     end
 
     it 'delivers to followers' do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com']])
       subject.perform(status.id)
-      expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com'])
     end
   end
 end
diff --git a/spec/workers/activitypub/distribution_worker_spec.rb b/spec/workers/activitypub/distribution_worker_spec.rb
index 368ca025a..3a5900d9b 100644
--- a/spec/workers/activitypub/distribution_worker_spec.rb
+++ b/spec/workers/activitypub/distribution_worker_spec.rb
@@ -8,7 +8,6 @@ describe ActivityPub::DistributionWorker do
 
   describe '#perform' do
     before do
-      allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
       follower.follow!(status.account)
     end
 
@@ -18,8 +17,8 @@ describe ActivityPub::DistributionWorker do
       end
 
       it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
         subject.perform(status.id)
-        expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com'])
       end
     end
 
@@ -29,19 +28,22 @@ describe ActivityPub::DistributionWorker do
       end
 
       it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
         subject.perform(status.id)
-        expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com'])
       end
     end
 
     context 'with direct status' do
+      let(:mentioned_account) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://foo.bar/inbox')}
+
       before do
         status.update(visibility: :direct)
+        status.mentions.create!(account: mentioned_account)
       end
 
-      it 'does nothing' do
+      it 'delivers to mentioned accounts' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'https://foo.bar/inbox', anything]])
         subject.perform(status.id)
-        expect(ActivityPub::DeliveryWorker).to_not have_received(:push_bulk)
       end
     end
   end
diff --git a/spec/workers/activitypub/move_distribution_worker_spec.rb b/spec/workers/activitypub/move_distribution_worker_spec.rb
index b52788e54..af8c44cc0 100644
--- a/spec/workers/activitypub/move_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/move_distribution_worker_spec.rb
@@ -9,14 +9,16 @@ describe ActivityPub::MoveDistributionWorker do
 
   describe '#perform' do
     before do
-      allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
       follower.follow!(migration.account)
       blocker.block!(migration.account)
     end
 
     it 'delivers to followers and known blockers' do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [
+        [kind_of(String), migration.account.id, 'http://example.com'],
+        [kind_of(String), migration.account.id, 'http://example2.com']
+      ])
       subject.perform(migration.id)
-        expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com', 'http://example2.com'])
     end
   end
 end
diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
new file mode 100644
index 000000000..c014c6790
--- /dev/null
+++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+describe ActivityPub::StatusUpdateDistributionWorker do
+  subject { described_class.new }
+
+  let(:status)   { Fabricate(:status, text: 'foo') }
+  let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com') }
+
+  describe '#perform' do
+    before do
+      follower.follow!(status.account)
+
+      status.snapshot!
+      status.text = 'bar'
+      status.edited_at = Time.now.utc
+      status.snapshot!
+      status.save!
+    end
+
+    context 'with public status' do
+      before do
+        status.update(visibility: :public)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
+
+        subject.perform(status.id)
+      end
+    end
+
+    context 'with private status' do
+      before do
+        status.update(visibility: :private)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
+
+        subject.perform(status.id)
+      end
+    end
+  end
+end
diff --git a/spec/workers/activitypub/update_distribution_worker_spec.rb b/spec/workers/activitypub/update_distribution_worker_spec.rb
index 688a424d5..0e057fd0b 100644
--- a/spec/workers/activitypub/update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/update_distribution_worker_spec.rb
@@ -8,13 +8,12 @@ describe ActivityPub::UpdateDistributionWorker do
 
   describe '#perform' do
     before do
-      allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
       follower.follow!(account)
     end
 
     it 'delivers to followers' do
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com', anything]])
       subject.perform(account.id)
-      expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com'])
     end
   end
 end
diff --git a/spec/workers/digest_mailer_worker_spec.rb b/spec/workers/digest_mailer_worker_spec.rb
deleted file mode 100644
index db3b1390d..000000000
--- a/spec/workers/digest_mailer_worker_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe DigestMailerWorker do
-  describe 'perform' do
-    let(:user) { Fabricate(:user, last_emailed_at: 3.days.ago) }
-
-    context 'for a user who receives digests' do
-      it 'sends the email' do
-        service = double(deliver_now!: nil)
-        allow(NotificationMailer).to receive(:digest).and_return(service)
-        update_user_digest_setting(true)
-        described_class.perform_async(user.id)
-
-        expect(NotificationMailer).to have_received(:digest)
-        expect(user.reload.last_emailed_at).to be_within(1).of(Time.now.utc)
-      end
-    end
-
-    context 'for a user who does not receive digests' do
-      it 'does not send the email' do
-        allow(NotificationMailer).to receive(:digest)
-        update_user_digest_setting(false)
-        described_class.perform_async(user.id)
-
-        expect(NotificationMailer).not_to have_received(:digest)
-        expect(user.last_emailed_at).to be_within(1).of(3.days.ago)
-      end
-    end
-
-    def update_user_digest_setting(value)
-      user.settings['notification_emails'] = user.settings['notification_emails'].merge('digest' => value)
-    end
-  end
-end
diff --git a/spec/workers/feed_insert_worker_spec.rb b/spec/workers/feed_insert_worker_spec.rb
index 3509f1f50..fb34970fc 100644
--- a/spec/workers/feed_insert_worker_spec.rb
+++ b/spec/workers/feed_insert_worker_spec.rb
@@ -45,7 +45,7 @@ describe FeedInsertWorker do
         result = subject.perform(status.id, follower.id)
 
         expect(result).to be_nil
-        expect(instance).to have_received(:push_to_home).with(follower, status)
+        expect(instance).to have_received(:push_to_home).with(follower, status, update: nil)
       end
     end
   end
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index 82449b0c7..3ca6aaf4d 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 describe MoveWorker do
-  let(:local_follower)   { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
-  let(:blocking_account) { Fabricate(:user, email: 'bar@example.com', account: Fabricate(:account, username: 'bar')).account }
-  let(:muting_account)   { Fabricate(:user, email: 'foo@example.com', account: Fabricate(:account, username: 'foo')).account }
+  let(:local_follower)   { Fabricate(:account) }
+  let(:blocking_account) { Fabricate(:account) }
+  let(:muting_account)   { Fabricate(:account) }
   let(:source_account)   { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
   let(:target_account)   { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
   let(:local_user)       { Fabricate(:user) }
@@ -21,7 +21,6 @@ describe MoveWorker do
     blocking_account.block!(source_account)
     muting_account.mute!(source_account)
 
-    allow(UnfollowFollowWorker).to receive(:push_bulk)
     allow(BlockService).to receive(:new).and_return(block_service)
     allow(block_service).to receive(:call)
   end
@@ -75,35 +74,49 @@ describe MoveWorker do
     end
   end
 
+  shared_examples 'followers count handling' do
+    it 'updates the source account followers count' do
+      subject.perform(source_account.id, target_account.id)
+      expect(source_account.reload.followers_count).to eq(source_account.passive_relationships.count)
+    end
+
+    it 'updates the target account followers count' do
+      subject.perform(source_account.id, target_account.id)
+      expect(target_account.reload.followers_count).to eq(target_account.passive_relationships.count)
+    end
+  end
+
   context 'both accounts are distant' do
     describe 'perform' do
       it 'calls UnfollowFollowWorker' do
+        expect_push_bulk_to_match(UnfollowFollowWorker, [[local_follower.id, source_account.id, target_account.id, false]])
         subject.perform(source_account.id, target_account.id)
-        expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id])
       end
 
       include_examples 'user note handling'
       include_examples 'block and mute handling'
+      include_examples 'followers count handling'
     end
   end
 
   context 'target account is local' do
-    let(:target_account) { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
+    let(:target_account) { Fabricate(:account) }
 
     describe 'perform' do
       it 'calls UnfollowFollowWorker' do
+        expect_push_bulk_to_match(UnfollowFollowWorker, [[local_follower.id, source_account.id, target_account.id, true]])
         subject.perform(source_account.id, target_account.id)
-        expect(UnfollowFollowWorker).to have_received(:push_bulk).with([local_follower.id])
       end
 
       include_examples 'user note handling'
       include_examples 'block and mute handling'
+      include_examples 'followers count handling'
     end
   end
 
   context 'both target and source accounts are local' do
-    let(:target_account) { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
-    let(:source_account) { Fabricate(:user, email: 'alice_@example.com', account: Fabricate(:account, username: 'alice_')).account }
+    let(:target_account) { Fabricate(:account) }
+    let(:source_account) { Fabricate(:account) }
 
     describe 'perform' do
       it 'calls makes local followers follow the target account' do
@@ -113,9 +126,10 @@ describe MoveWorker do
 
       include_examples 'user note handling'
       include_examples 'block and mute handling'
+      include_examples 'followers count handling'
 
       it 'does not fail when a local user is already following both accounts' do
-        double_follower = Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account
+        double_follower = Fabricate(:account)
         double_follower.follow!(source_account)
         double_follower.follow!(target_account)
         subject.perform(source_account.id, target_account.id)
diff --git a/spec/workers/refollow_worker_spec.rb b/spec/workers/refollow_worker_spec.rb
index df6731b64..d9c2293b6 100644
--- a/spec/workers/refollow_worker_spec.rb
+++ b/spec/workers/refollow_worker_spec.rb
@@ -23,8 +23,8 @@ describe RefollowWorker do
       result = subject.perform(account.id)
 
       expect(result).to be_nil
-      expect(service).to have_received(:call).with(alice, account, reblogs: true, notify: false, bypass_limit: true)
-      expect(service).to have_received(:call).with(bob, account, reblogs: false, notify: false, bypass_limit: true)
+      expect(service).to have_received(:call).with(alice, account, reblogs: true, notify: false, languages: nil, bypass_limit: true)
+      expect(service).to have_received(:call).with(bob, account, reblogs: false, notify: false, languages: nil, bypass_limit: true)
     end
   end
 end
diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
deleted file mode 100644
index 914eed829..000000000
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'rails_helper'
-
-describe Scheduler::FeedCleanupScheduler do
-  subject { described_class.new }
-
-  let!(:active_user) { Fabricate(:user, current_sign_in_at: 2.days.ago) }
-  let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) }
-
-  it 'clears feeds of inactives' do
-    Redis.current.zadd(feed_key_for(inactive_user), 1, 1)
-    Redis.current.zadd(feed_key_for(active_user), 1, 1)
-    Redis.current.zadd(feed_key_for(inactive_user, 'reblogs'), 2, 2)
-    Redis.current.sadd(feed_key_for(inactive_user, 'reblogs:2'), 3)
-
-    subject.perform
-
-    expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0
-    expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1
-    expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false
-    expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs:2'))).to be false
-  end
-
-  def feed_key_for(user, subtype = nil)
-    FeedManager.instance.key(:home, user.account_id, subtype)
-  end
-end
diff --git a/spec/workers/scheduler/media_cleanup_scheduler_spec.rb b/spec/workers/scheduler/media_cleanup_scheduler_spec.rb
deleted file mode 100644
index 8a0da67e1..000000000
--- a/spec/workers/scheduler/media_cleanup_scheduler_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'rails_helper'
-
-describe Scheduler::MediaCleanupScheduler do
-  subject { described_class.new }
-
-  let!(:old_media) { Fabricate(:media_attachment, account_id: nil, created_at: 10.days.ago) }
-  let!(:new_media) { Fabricate(:media_attachment, account_id: nil, created_at: 1.hour.ago) }
-
-  it 'removes old media records' do
-    subject.perform
-
-    expect { old_media.reload }.to raise_error(ActiveRecord::RecordNotFound)
-    expect(new_media.reload).to be_persisted
-  end
-end
diff --git a/spec/workers/unfollow_follow_worker_spec.rb b/spec/workers/unfollow_follow_worker_spec.rb
index 5052c5616..5ea4256a9 100644
--- a/spec/workers/unfollow_follow_worker_spec.rb
+++ b/spec/workers/unfollow_follow_worker_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe UnfollowFollowWorker do
-  let(:local_follower)   { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+  let(:local_follower)   { Fabricate(:account) }
   let(:source_account)   { Fabricate(:account) }
   let(:target_account)   { Fabricate(:account) }
   let(:show_reblogs)     { true }
diff --git a/streaming/index.js b/streaming/index.js
index 74cbf4c2c..0350c488d 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -12,6 +12,7 @@ const url = require('url');
 const uuid = require('uuid');
 const fs = require('fs');
 const WebSocket = require('ws');
+const { JSDOM } = require('jsdom');
 
 const env = process.env.NODE_ENV || 'development';
 const alwaysRequireAuth = process.env.LIMITED_FEDERATION_MODE === 'true' || process.env.WHITELIST_MODE === 'true' || process.env.AUTHORIZED_FETCH === 'true';
@@ -92,13 +93,18 @@ const numWorkers = +process.env.STREAMING_CLUSTER_NUM || (env === 'development'
 
 /**
  * @param {string} json
+ * @param {any} req
  * @return {Object.<string, any>|null}
  */
-const parseJSON = (json) => {
+const parseJSON = (json, req) => {
   try {
     return JSON.parse(json);
   } catch (err) {
-    log.error(err);
+    if (req.accountId) {
+      log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+    } else {
+      log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+    }
     return null;
   }
 };
@@ -141,7 +147,7 @@ const startWorker = async (workerId) => {
 
   const app = express();
 
-  app.set('trusted proxy', process.env.TRUSTED_PROXY_IP || 'loopback,uniquelocal');
+  app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');
 
   const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)));
   const server = http.createServer(app);
@@ -162,6 +168,11 @@ const startWorker = async (workerId) => {
 
   const redisPrefix = redisNamespace ? `${redisNamespace}:` : '';
 
+  /**
+   * @type {Object.<string, Array.<function(string): void>>}
+   */
+  const subs = {};
+
   const redisSubscribeClient = await redisUrlToClient(redisParams, process.env.REDIS_URL);
   const redisClient = await redisUrlToClient(redisParams, process.env.REDIS_URL);
 
@@ -185,6 +196,22 @@ const startWorker = async (workerId) => {
     };
   };
 
+  /**
+   * @param {string} message
+   * @param {string} channel
+   */
+  const onRedisMessage = (message, channel) => {
+    const callbacks = subs[channel];
+
+    log.silly(`New message on channel ${channel}`);
+
+    if (!callbacks) {
+      return;
+    }
+
+    callbacks.forEach(callback => callback(message));
+  };
+
   /**
    * @param {string} channel
    * @param {function(string): void} callback
@@ -192,15 +219,33 @@ const startWorker = async (workerId) => {
   const subscribe = (channel, callback) => {
     log.silly(`Adding listener for ${channel}`);
 
-    redisSubscribeClient.subscribe(channel, callback);
+    subs[channel] = subs[channel] || [];
+
+    if (subs[channel].length === 0) {
+      log.verbose(`Subscribe ${channel}`);
+      redisSubscribeClient.subscribe(channel, onRedisMessage);
+    }
+
+    subs[channel].push(callback);
   };
 
   /**
    * @param {string} channel
    */
-  const unsubscribe = (channel) => {
+  const unsubscribe = (channel, callback) => {
+    log.silly(`Removing listener for ${channel}`);
 
-    redisSubscribeClient.unsubscribe(channel);
+    if (!subs[channel]) {
+      return;
+    }
+
+    subs[channel] = subs[channel].filter(item => item !== callback);
+
+    if (subs[channel].length === 0) {
+      log.verbose(`Unsubscribe ${channel}`);
+      redisSubscribeClient.unsubscribe(channel);
+      delete subs[channel];
+    }
   };
 
   const FALSE_VALUES = [
@@ -448,7 +493,7 @@ const startWorker = async (workerId) => {
    */
   const createSystemMessageListener = (req, eventHandlers) => {
     return message => {
-      const json = parseJSON(message);
+      const json = parseJSON(message, req);
 
       if (!json) return;
 
@@ -459,6 +504,9 @@ const startWorker = async (workerId) => {
       if (event === 'kill') {
         log.verbose(req.requestId, `Closing connection for ${req.accountId} due to expired access token`);
         eventHandlers.onKill();
+      } else if (event === 'filters_changed') {
+        log.verbose(req.requestId, `Invalidating filters cache for ${req.accountId}`);
+        req.cachedFilters = null;
       }
     };
   };
@@ -468,7 +516,8 @@ const startWorker = async (workerId) => {
    * @param {any} res
    */
   const subscribeHttpToSystemChannel = (req, res) => {
-    const systemChannelId = `timeline:access_token:${req.accessTokenId}`;
+    const accessTokenChannelId = `timeline:access_token:${req.accessTokenId}`;
+    const systemChannelId = `timeline:system:${req.accountId}`;
 
     const listener = createSystemMessageListener(req, {
 
@@ -479,9 +528,11 @@ const startWorker = async (workerId) => {
     });
 
     res.on('close', () => {
+      unsubscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
       unsubscribe(`${redisPrefix}${systemChannelId}`, listener);
     });
 
+    subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
     subscribe(`${redisPrefix}${systemChannelId}`, listener);
   };
 
@@ -571,7 +622,7 @@ const startWorker = async (workerId) => {
     log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
 
     const listener = message => {
-      const json = parseJSON(message);
+      const json = parseJSON(message, req);
 
       if (!json) return;
 
@@ -630,17 +681,84 @@ const startWorker = async (workerId) => {
           queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
         }
 
+        if (!unpackedPayload.filtered && !req.cachedFilters) {
+          queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId]));
+        }
+
         Promise.all(queries).then(values => {
           done();
 
-          if (values[0].rows.length > 0 || (values.length > 1 && values[1].rows.length > 0)) {
+          if (values[0].rows.length > 0 || (accountDomain && values[1].rows.length > 0)) {
             return;
           }
 
+          if (!unpackedPayload.filtered && !req.cachedFilters) {
+            const filterRows = values[accountDomain ? 2 : 1].rows;
+
+            req.cachedFilters = filterRows.reduce((cache, row) => {
+              if (cache[row.id]) {
+                cache[row.id].keywords.push([row.keyword, row.whole_word]);
+              } else {
+                cache[row.id] = {
+                  keywords: [[row.keyword, row.whole_word]],
+                  expires_at: row.expires_at,
+                  repr: {
+                    id: row.id,
+                    title: row.title,
+                    context: row.context,
+                    expires_at: row.expires_at,
+                    filter_action: ['warn', 'hide'][row.filter_action],
+                  },
+                };
+              }
+
+              return cache;
+            }, {});
+
+            Object.keys(req.cachedFilters).forEach((key) => {
+              req.cachedFilters[key].regexp = new RegExp(req.cachedFilters[key].keywords.map(([keyword, whole_word]) => {
+                let expr = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+                if (whole_word) {
+                  if (/^[\w]/.test(expr)) {
+                    expr = `\\b${expr}`;
+                  }
+
+                  if (/[\w]$/.test(expr)) {
+                    expr = `${expr}\\b`;
+                  }
+                }
+
+                return expr;
+              }).join('|'), 'i');
+            });
+          }
+
+          // Check filters
+          if (req.cachedFilters && !unpackedPayload.filtered) {
+            const status = unpackedPayload;
+            const searchContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+            const searchIndex = JSDOM.fragment(searchContent).textContent;
+
+            const now = new Date();
+            payload.filtered = [];
+            Object.values(req.cachedFilters).forEach((cachedFilter) => {
+              if ((cachedFilter.expires_at === null || cachedFilter.expires_at > now)) {
+                const keyword_matches = searchIndex.match(cachedFilter.regexp);
+                if (keyword_matches) {
+                  payload.filtered.push({
+                    filter: cachedFilter.repr,
+                    keyword_matches,
+                  });
+                }
+              }
+            });
+          }
+
           transmit();
         }).catch(err => {
-          done();
           log.error(err);
+          done();
         });
       });
     };
@@ -774,6 +892,34 @@ const startWorker = async (workerId) => {
     return arr;
   };
 
+  /**
+   * See app/lib/ascii_folder.rb for the canon definitions
+   * of these constants
+   */
+  const NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
+  const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
+
+  /**
+   * @param {string} str
+   * @return {string}
+   */
+  const foldToASCII = str => {
+    const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
+
+    return str.replace(regex, match => {
+      const index = NON_ASCII_CHARS.indexOf(match);
+      return EQUIVALENT_ASCII_CHARS[index];
+    });
+  };
+
+  /**
+   * @param {string} str
+   * @return {string}
+   */
+  const normalizeHashtag = str => {
+    return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
+  };
+
   /**
    * @param {any} req
    * @param {string} name
@@ -850,7 +996,7 @@ const startWorker = async (workerId) => {
         reject('No tag for stream provided');
       } else {
         resolve({
-          channelIds: [`timeline:hashtag:${params.tag.toLowerCase()}`],
+          channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}`],
           options: { needsFiltering: true },
         });
       }
@@ -861,7 +1007,7 @@ const startWorker = async (workerId) => {
         reject('No tag for stream provided');
       } else {
         resolve({
-          channelIds: [`timeline:hashtag:${params.tag.toLowerCase()}:local`],
+          channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}:local`],
           options: { needsFiltering: true },
         });
       }
@@ -965,7 +1111,8 @@ const startWorker = async (workerId) => {
    * @param {WebSocketSession} session
    */
   const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
-    const systemChannelId = `timeline:access_token:${request.accessTokenId}`;
+    const accessTokenChannelId = `timeline:access_token:${request.accessTokenId}`;
+    const systemChannelId = `timeline:system:${request.accountId}`;
 
     const listener = createSystemMessageListener(request, {
 
@@ -975,8 +1122,15 @@ const startWorker = async (workerId) => {
 
     });
 
+    subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
     subscribe(`${redisPrefix}${systemChannelId}`, listener);
 
+    subscriptions[accessTokenChannelId] = {
+      listener,
+      stopHeartbeat: () => {
+      },
+    };
+
     subscriptions[systemChannelId] = {
       listener,
       stopHeartbeat: () => {
@@ -1035,7 +1189,7 @@ const startWorker = async (workerId) => {
     ws.on('error', onEnd);
 
     ws.on('message', data => {
-      const json = parseJSON(data);
+      const json = parseJSON(data, session.request);
 
       if (!json) return;
 
diff --git a/stylelint.config.js b/stylelint.config.js
new file mode 100644
index 000000000..0f8267a81
--- /dev/null
+++ b/stylelint.config.js
@@ -0,0 +1,28 @@
+module.exports = {
+  extends: ['stylelint-config-standard-scss'],
+  ignoreFiles: [
+    'app/javascript/styles/mastodon/reset.scss',
+    'node_modules/**/*',
+    'vendor/**/*',
+  ],
+  rules: {
+    'at-rule-empty-line-before': null,
+    'color-function-notation': null,
+    'color-hex-length': null,
+    'declaration-block-no-redundant-longhand-properties': null,
+    'max-line-length': null,
+    'no-descending-specificity': null,
+    'no-duplicate-selectors': null,
+    'number-max-precision': 8,
+    'property-no-unknown': null,
+    'property-no-vendor-prefix': null,
+    'selector-class-pattern': null,
+    'selector-id-pattern': null,
+    'string-quotes': null,
+    'value-keyword-case': null,
+    'value-no-vendor-prefix': null,
+
+    'scss/dollar-variable-empty-line-before': null,
+    'scss/no-global-function-names': null,
+  },
+};
diff --git a/yarn.lock b/yarn.lock
index 12ed0ed54..5143a29c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,27 @@
 # yarn lockfile v1
 
 
+"@adobe/css-tools@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd"
+  integrity sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==
+
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
+"@apideck/better-ajv-errors@^0.3.1":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz#ab0b1e981e1749bf59736cf7ebe25cfc9f949c15"
+  integrity sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==
+  dependencies:
+    json-schema "^0.4.0"
+    jsonpointer "^5.0.0"
+    leven "^3.1.0"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -9,443 +30,435 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
-  integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
-    "@babel/highlight" "^7.16.0"
+    "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4":
-  version "7.16.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
-  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
+  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
 
-"@babel/core@^7.1.0", "@babel/core@^7.16.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c"
-  integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==
+"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.20.5", "@babel/core@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/generator" "^7.16.5"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helpers" "^7.16.5"
-    "@babel/parser" "^7.16.5"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.5", "@babel/generator@^7.7.2":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf"
-  integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==
+"@babel/eslint-parser@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
+  integrity sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.0"
+
+"@babel/generator@^7.20.5", "@babel/generator@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+  dependencies:
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
-  integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af"
-  integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz#f14d640ed1ee9246fb33b8255f08353acfe70e6a"
+  integrity sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-react-jsx@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.16.5.tgz#e4f3db66c85f7bb6191462705c58c632fc52f5b6"
-  integrity sha512-UunEMN9fDtAVplcvsJ3orBLP5T/90y+WHtehxLPnXI1iwDdJQTB/47sVyseHTPRWhTRRtHFMUZra0Wb2wxbWlg==
+"@babel/helper-builder-react-jsx@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.18.6.tgz#b3a302c0eb4949e5356b400cb752a91e93bf9b79"
+  integrity sha512-2ndBVP5f9zwHWQeBr5EgqTAvFhPDViMW969bbJzRhKUUylnC39CdFZdVmqk+UtkxIpwm/efPgm3SzXUSlJnjAw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3":
-  version "7.16.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
-  integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
   dependencies:
-    "@babel/compat-data" "^7.16.0"
-    "@babel/helper-validator-option" "^7.14.5"
-    browserslist "^4.17.5"
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad"
-  integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz#327154eedfb12e977baa4ecc72e5806720a85a06"
+  integrity sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-member-expression-to-functions" "^7.16.5"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-replace-supers" "^7.16.5"
-    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
-  integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    regexpu-core "^4.7.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
-  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8"
-  integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-explode-assignable-expression@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778"
-  integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-function-name@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
-  integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.16.0"
-    "@babel/template" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-get-function-arity@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
-  integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-hoist-variables@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
-  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
+"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab"
-  integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
-  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29"
-  integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-simple-access" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-optimise-call-expression@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
-  integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074"
-  integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==
-
-"@babel/helper-remap-async-to-generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3"
-  integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw==
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-wrap-function" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-replace-supers@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326"
-  integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
+  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-member-expression-to-functions" "^7.16.5"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-simple-access@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
-  integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/helper-validator-option@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.10.tgz#a7fcd3ab9b1be4c9b52cf7d7fdc1e88c2ce93396"
+  integrity sha512-95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.18.10"
+    "@babel/types" "^7.18.10"
 
-"@babel/helper-split-export-declaration@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
-  integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-identifier@^7.15.7":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
-  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
-
-"@babel/helper-validator-option@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
-  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-
-"@babel/helper-wrap-function@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f"
-  integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA==
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
   dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
-
-"@babel/helpers@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd"
-  integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==
-  dependencies:
-    "@babel/template" "^7.16.0"
-    "@babel/traverse" "^7.16.5"
-    "@babel/types" "^7.16.0"
-
-"@babel/highlight@^7.10.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
-  integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.18.6"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
-  integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.15.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
-  version "7.16.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314"
-  integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2":
-  version "7.16.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183"
-  integrity sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2"
-  integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67"
-  integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a"
-  integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A==
+"@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9"
-  integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.5.tgz#4617420d3685078dfab8f68f859dca1448bbb3c7"
-  integrity sha512-XAiZll5oCdp2Dd2RbXA3LVPlFyIRhhcQy+G34p9ePpl6mjFkbqHAYHovyw2j5mqUrlBf0/+MtOIJ3JGYtz8qaw==
+"@babel/plugin-proposal-decorators@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.5.tgz#28ba1a0e5044664a512967a19407d7fc26925394"
+  integrity sha512-Lac7PpRJXcC3s9cKsBfl+uc+DYXU5FD06BrTFunQO6QIQT+DwyzDPURAowI3bcvD1dZF/ank1Z5rstUJn3Hn4Q==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-decorators" "^7.16.5"
+    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/plugin-syntax-decorators" "^7.19.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e"
-  integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9"
-  integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw==
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c"
-  integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5"
-  integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07"
-  integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039"
-  integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad"
-  integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.5"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e"
-  integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f"
-  integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A==
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12"
-  integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA==
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b"
-  integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA==
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
+  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-create-class-features-plugin" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080"
-  integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -475,12 +488,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.5.tgz#8d397dee482716a79f1a22314f0b4770a5b67427"
-  integrity sha512-3CbYTXfflvyy8O819uhZcZSMedZG4J8yS/NLTc/8T24M9ke1GssTGvg8VZu3Yn2LU5IyQSv1CmPq0a9JWHXJwg==
+"@babel/plugin-syntax-decorators@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
+  integrity sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -496,6 +509,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -510,12 +530,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.5.tgz#bf255d252f78bc8b77a17cadc37d1aa5b8ed4394"
-  integrity sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q==
+"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
+  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -580,339 +600,341 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d"
-  integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4"
-  integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-remap-async-to-generator" "^7.16.5"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0"
-  integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7"
-  integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz#f59b1767e6385c663fd0bce655db6ca9c8b236ed"
+  integrity sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216"
-  integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-optimise-call-expression" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-replace-supers" "^7.16.5"
-    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a"
-  integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568"
-  integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.16.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936"
-  integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a"
-  integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2"
-  integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261"
-  integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15"
-  integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320"
-  integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5"
-  integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527"
-  integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde"
-  integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-simple-access" "^7.16.0"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b"
-  integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e"
-  integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c"
-  integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
+  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-new-target@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416"
-  integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380"
-  integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-replace-supers" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde"
-  integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz#7b3468d70c3c5b62e46be0a47b6045d8590fb748"
+  integrity sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f"
-  integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-react-display-name@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.5.tgz#d5e910327d7931fb9f8f9b6c6999473ceae5a286"
-  integrity sha512-dHYCOnzSsXFz8UcdNQIHGvg94qPL/teF7CCiCEMRxmA1G2p5Mq4JnKVowCDxYfiQ9D7RstaAp9kwaSI+sXbnhw==
+"@babel/plugin-transform-react-display-name@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
+  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-react-inline-elements@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.16.5.tgz#4f846e1b27ad5d10dc63fc481663b734017f1221"
-  integrity sha512-yVX/+XcsbOxa/b+SmUw7Sx0vGtdFksalYg21Sa3eHx/wjsVkEisOOCSiV3vq4NfcEpt6/V2AlMgroa/nFgqhvg==
+"@babel/plugin-transform-react-inline-elements@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.18.6.tgz#d0676948eb5a11d547de6add7e8a2c522ec708f5"
+  integrity sha512-uo3yD1EXhDxmk1Y/CeFDdHS5t22IOUBooLPFOrrjfpYmDM9Vg61xbIaWeWkbYQ7Aq0zMf30/FfKoQgFwyqw6Bg==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.16.5"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-builder-react-jsx" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-react-jsx-development@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.5.tgz#87da9204c275ffb57f45d192a1120cf104bc1e86"
-  integrity sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw==
+"@babel/plugin-transform-react-jsx-development@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5"
+  integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.16.5"
+    "@babel/plugin-transform-react-jsx" "^7.18.6"
 
-"@babel/plugin-transform-react-jsx@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.5.tgz#5298aedc5f81e02b1cb702e597e8d6a346675765"
-  integrity sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ==
+"@babel/plugin-transform-react-jsx@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz#2721e96d31df96e3b7ad48ff446995d26bc028ff"
+  integrity sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/plugin-syntax-jsx" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-jsx" "^7.18.6"
+    "@babel/types" "^7.18.6"
 
-"@babel/plugin-transform-react-pure-annotations@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.5.tgz#6535d0fe67c7a3a26c5105f92c8cbcbe844cd94b"
-  integrity sha512-0nYU30hCxnCVCbRjSy9ahlhWZ2Sn6khbY4FqR91W+2RbSqkWEbVu2gXh45EqNy4Bq7sRU+H4i0/6YKwOSzh16A==
+"@babel/plugin-transform-react-pure-annotations@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844"
+  integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13"
-  integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30"
-  integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-runtime@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.5.tgz#0cc3f01d69f299d5a42cd9ec43b92ea7a777b8db"
-  integrity sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw==
+"@babel/plugin-transform-runtime@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.4.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7"
-  integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29"
-  integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
-"@babel/plugin-transform-sticky-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9"
-  integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773"
-  integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed"
-  integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85"
-  integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e"
-  integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847"
-  integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ==
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.3"
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.5"
-    "@babel/plugin-proposal-class-properties" "^7.16.5"
-    "@babel/plugin-proposal-class-static-block" "^7.16.5"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.5"
-    "@babel/plugin-proposal-json-strings" "^7.16.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.5"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.5"
-    "@babel/plugin-proposal-private-methods" "^7.16.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.5"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -922,44 +944,44 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.5"
-    "@babel/plugin-transform-async-to-generator" "^7.16.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.5"
-    "@babel/plugin-transform-block-scoping" "^7.16.5"
-    "@babel/plugin-transform-classes" "^7.16.5"
-    "@babel/plugin-transform-computed-properties" "^7.16.5"
-    "@babel/plugin-transform-destructuring" "^7.16.5"
-    "@babel/plugin-transform-dotall-regex" "^7.16.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.5"
-    "@babel/plugin-transform-for-of" "^7.16.5"
-    "@babel/plugin-transform-function-name" "^7.16.5"
-    "@babel/plugin-transform-literals" "^7.16.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.5"
-    "@babel/plugin-transform-modules-amd" "^7.16.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.5"
-    "@babel/plugin-transform-modules-umd" "^7.16.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5"
-    "@babel/plugin-transform-new-target" "^7.16.5"
-    "@babel/plugin-transform-object-super" "^7.16.5"
-    "@babel/plugin-transform-parameters" "^7.16.5"
-    "@babel/plugin-transform-property-literals" "^7.16.5"
-    "@babel/plugin-transform-regenerator" "^7.16.5"
-    "@babel/plugin-transform-reserved-words" "^7.16.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.5"
-    "@babel/plugin-transform-spread" "^7.16.5"
-    "@babel/plugin-transform-sticky-regex" "^7.16.5"
-    "@babel/plugin-transform-template-literals" "^7.16.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.5"
-    "@babel/plugin-transform-unicode-regex" "^7.16.5"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-computed-properties" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.8"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.0"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.4.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.19.1"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -973,17 +995,17 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.16.5":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.5.tgz#09df3b7a6522cb3e6682dc89b4dfebb97d22031b"
-  integrity sha512-3kzUOQeaxY/2vhPDS7CX/KGEGu/1bOYGvdRDJ2U5yjEz5o5jmIeTPLoiQBPGjfhPascLuW5OlMiPzwOOuB6txg==
+"@babel/preset-react@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d"
+  integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-react-display-name" "^7.16.5"
-    "@babel/plugin-transform-react-jsx" "^7.16.5"
-    "@babel/plugin-transform-react-jsx-development" "^7.16.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-transform-react-display-name" "^7.18.6"
+    "@babel/plugin-transform-react-jsx" "^7.18.6"
+    "@babel/plugin-transform-react-jsx-development" "^7.18.6"
+    "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
 
 "@babel/runtime-corejs3@^7.10.2":
   version "7.10.3"
@@ -1000,44 +1022,45 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a"
-  integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.16.0", "@babel/template@^7.3.3":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
-  integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
+"@babel/template@^7.18.10", "@babel/template@^7.3.3":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
   dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/parser" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3"
-  integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==
+"@babel/traverse@^7.18.10", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
   dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/generator" "^7.16.5"
-    "@babel/helper-environment-visitor" "^7.16.5"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-    "@babel/parser" "^7.16.5"
-    "@babel/types" "^7.16.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
-  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1045,44 +1068,67 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@emotion/cache@^11.1.3", "@emotion/cache@^11.4.0":
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
-  integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==
+"@csstools/selector-specificity@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
+
+"@emotion/babel-plugin@^11.7.1":
+  version "11.9.2"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz#723b6d394c89fb2ef782229d92ba95a740576e95"
+  integrity sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/plugin-syntax-jsx" "^7.12.13"
+    "@babel/runtime" "^7.13.10"
+    "@emotion/hash" "^0.8.0"
+    "@emotion/memoize" "^0.7.5"
+    "@emotion/serialize" "^1.0.2"
+    babel-plugin-macros "^2.6.1"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.0.13"
+
+"@emotion/cache@^11.4.0", "@emotion/cache@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
+  integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
   dependencies:
     "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.0.0"
+    "@emotion/sheet" "^1.1.0"
     "@emotion/utils" "^1.0.0"
     "@emotion/weak-memoize" "^0.2.5"
-    stylis "^4.0.3"
+    stylis "4.0.13"
 
 "@emotion/hash@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/memoize@^0.7.4":
+"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
-"@emotion/react@^11.1.1":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz#ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"
-  integrity sha512-9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A==
+"@emotion/react@^11.8.1":
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8"
+  integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@emotion/cache" "^11.1.3"
-    "@emotion/serialize" "^1.0.0"
-    "@emotion/sheet" "^1.0.1"
-    "@emotion/utils" "^1.0.0"
+    "@babel/runtime" "^7.13.10"
+    "@emotion/babel-plugin" "^11.7.1"
+    "@emotion/cache" "^11.7.1"
+    "@emotion/serialize" "^1.0.3"
+    "@emotion/utils" "^1.1.0"
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
-"@emotion/serialize@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.0.tgz#1a61f4f037cf39995c97fc80ebe99abc7b191ca9"
-  integrity sha512-zt1gm4rhdo5Sry8QpCOpopIUIKU+mUSpV9WNmFILUraatm5dttNEaYzUWWSboSMUE6PtN2j1cAsuvcugfdI3mw==
+"@emotion/serialize@^1.0.2", "@emotion/serialize@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63"
+  integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==
   dependencies:
     "@emotion/hash" "^0.8.0"
     "@emotion/memoize" "^0.7.4"
@@ -1090,20 +1136,20 @@
     "@emotion/utils" "^1.0.0"
     csstype "^3.0.2"
 
-"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
-  integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
+"@emotion/sheet@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
+  integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
 "@emotion/unitless@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/utils@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
-  integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
+"@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
+  integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
 
 "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
@@ -1125,6 +1171,18 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@floating-ui/core@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8"
+  integrity sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==
+
+"@floating-ui/dom@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.2.tgz#c5184c52c6f50abd11052d71204f4be2d9245237"
+  integrity sha512-5X9WSvZ8/fjy3gDu8yx9HAA4KG1lazUN2P4/VnaXLxTO9Dz53HI1oYoh1OlhqFNlHgGDiwFX5WhFCc2ljbW3yA==
+  dependencies:
+    "@floating-ui/core" "^1.0.1"
+
 "@formatjs/intl-unified-numberformat@^3.3.3":
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz#ab69818f7568894023cb31fdb5b5c7eed62c6537"
@@ -1177,163 +1235,185 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.4.2.tgz#7a95612d38c007ddb528ee446fe5e5e785e685ce"
-  integrity sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==
+"@jest/console@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583"
+  integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^27.4.2"
-    jest-util "^27.4.2"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
     slash "^3.0.0"
 
-"@jest/core@^27.4.5":
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.4.5.tgz#cae2dc34259782f4866c6606c3b480cce920ed4c"
-  integrity sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==
+"@jest/core@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1"
+  integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==
   dependencies:
-    "@jest/console" "^27.4.2"
-    "@jest/reporters" "^27.4.5"
-    "@jest/test-result" "^27.4.2"
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
+    "@jest/console" "^29.3.1"
+    "@jest/reporters" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    emittery "^0.8.1"
+    ci-info "^3.2.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^27.4.2"
-    jest-config "^27.4.5"
-    jest-haste-map "^27.4.5"
-    jest-message-util "^27.4.2"
-    jest-regex-util "^27.4.0"
-    jest-resolve "^27.4.5"
-    jest-resolve-dependencies "^27.4.5"
-    jest-runner "^27.4.5"
-    jest-runtime "^27.4.5"
-    jest-snapshot "^27.4.5"
-    jest-util "^27.4.2"
-    jest-validate "^27.4.2"
-    jest-watcher "^27.4.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.2.0"
+    jest-config "^29.3.1"
+    jest-haste-map "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-resolve-dependencies "^29.3.1"
+    jest-runner "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
+    jest-watcher "^29.3.1"
     micromatch "^4.0.4"
-    rimraf "^3.0.0"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^27.4.4":
-  version "27.4.4"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.4.4.tgz#66ebebc79673d84aad29d2bb70a8c51e6c29bb4d"
-  integrity sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==
+"@jest/environment@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6"
+  integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==
   dependencies:
-    "@jest/fake-timers" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
-    jest-mock "^27.4.2"
+    jest-mock "^29.3.1"
 
-"@jest/fake-timers@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.4.2.tgz#d217f86c3ba2027bf29e0b731fd0cb761a72d093"
-  integrity sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==
+"@jest/expect-utils@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6"
+  integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==
   dependencies:
-    "@jest/types" "^27.4.2"
-    "@sinonjs/fake-timers" "^8.0.1"
+    jest-get-type "^29.2.0"
+
+"@jest/expect@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd"
+  integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==
+  dependencies:
+    expect "^29.3.1"
+    jest-snapshot "^29.3.1"
+
+"@jest/fake-timers@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67"
+  integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==
+  dependencies:
+    "@jest/types" "^29.3.1"
+    "@sinonjs/fake-timers" "^9.1.2"
     "@types/node" "*"
-    jest-message-util "^27.4.2"
-    jest-mock "^27.4.2"
-    jest-util "^27.4.2"
+    jest-message-util "^29.3.1"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
 
-"@jest/globals@^27.4.4":
-  version "27.4.4"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.4.4.tgz#fe501a80c23ea2dab585c42be2a519bb5e38530d"
-  integrity sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==
+"@jest/globals@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6"
+  integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==
   dependencies:
-    "@jest/environment" "^27.4.4"
-    "@jest/types" "^27.4.2"
-    expect "^27.4.2"
+    "@jest/environment" "^29.3.1"
+    "@jest/expect" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    jest-mock "^29.3.1"
 
-"@jest/reporters@^27.4.5":
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.4.5.tgz#e229acca48d18ea39e805540c1c322b075ae63ad"
-  integrity sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==
+"@jest/reporters@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310"
+  integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.4.2"
-    "@jest/test-result" "^27.4.2"
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
+    "@jest/console" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
     "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^5.1.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^27.4.5"
-    jest-resolve "^27.4.5"
-    jest-util "^27.4.2"
-    jest-worker "^27.4.5"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
+    jest-worker "^29.3.1"
     slash "^3.0.0"
-    source-map "^0.6.0"
     string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^8.1.0"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
 
-"@jest/source-map@^27.4.0":
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.4.0.tgz#2f0385d0d884fb3e2554e8f71f8fa957af9a74b6"
-  integrity sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==
+"@jest/schemas@^29.0.0":
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
+  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
   dependencies:
+    "@sinclair/typebox" "^0.24.1"
+
+"@jest/source-map@^29.2.0":
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744"
+  integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    graceful-fs "^4.2.9"
 
-"@jest/test-result@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.4.2.tgz#05fd4a5466ec502f3eae0b39dff2b93ea4d5d9ec"
-  integrity sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==
+"@jest/test-result@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50"
+  integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==
   dependencies:
-    "@jest/console" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/console" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^27.4.5":
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz#1d7e026844d343b60d2ca7fd82c579a17b445d7d"
-  integrity sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==
+"@jest/test-sequencer@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d"
+  integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==
   dependencies:
-    "@jest/test-result" "^27.4.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.4.5"
-    jest-runtime "^27.4.5"
-
-"@jest/transform@^27.4.5":
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.4.5.tgz#3dfe2e3680cd4aa27356172bf25617ab5b94f195"
-  integrity sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^27.4.2"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.4.5"
-    jest-regex-util "^27.4.0"
-    jest-util "^27.4.2"
-    micromatch "^4.0.4"
-    pirates "^4.0.1"
+    "@jest/test-result" "^29.3.1"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.3.1"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
+
+"@jest/transform@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
+  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.3.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.3.1"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    write-file-atomic "^4.0.1"
 
 "@jest/types@^25.5.0":
   version "25.5.0"
@@ -1345,10 +1425,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^27.0.2", "@jest/types@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
-  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
+"@jest/types@^27.0.2":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1356,30 +1436,112 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@node-redis/client@^1.0.1":
+"@jest/types@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
+  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
+"@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
+  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
+  integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
+
+"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
+"@node-redis/bloom@1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@node-redis/client/-/client-1.0.1.tgz#ddca6021097ce1026fedc193cac8c36b05c6cad8"
-  integrity sha512-o0I4LdzJXP6QYxRnBPrQ7cIG5tF3SNM/PBnjC3mV6QkzIiGRElzWqSr9a9JCJdcyB1SIA80bhgGhpdTpCQ1Sdw==
+  resolved "https://registry.yarnpkg.com/@node-redis/bloom/-/bloom-1.0.1.tgz#144474a0b7dc4a4b91badea2cfa9538ce0a1854e"
+  integrity sha512-mXEBvEIgF4tUzdIN89LiYsbi6//EdpFA7L8M+DHCvePXg+bfHWi+ct5VI6nHUFQE5+ohm/9wmgihCH3HSkeKsw==
+
+"@node-redis/client@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@node-redis/client/-/client-1.0.5.tgz#ebac5e2bbf12214042a37621604973a954ede755"
+  integrity sha512-ESZ3bd1f+od62h4MaBLKum+klVJfA4wAeLHcVQBkoXa1l0viFesOWnakLQqKg+UyrlJhZmXJWtu0Y9v7iTMrig==
   dependencies:
     cluster-key-slot "1.1.0"
     generic-pool "3.8.2"
     redis-parser "3.0.0"
     yallist "4.0.0"
 
-"@node-redis/json@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@node-redis/json/-/json-1.0.1.tgz#8cd987c1855392adf21bc4f06163a7eda97a40a3"
-  integrity sha512-2EB96ZN0yUr4mgA9Odme48jX8eF5Ji0jrsRn4rLfEhME7L3rHLdKeUfxJKxbPOxadP6k8+6ViElxPZrKuV2nvQ==
-
-"@node-redis/search@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@node-redis/search/-/search-1.0.1.tgz#8d0936049f4858b9aefab40524ce8e5a52e5d08e"
-  integrity sha512-iA2Gw6gr0X6IfNSjTyme9W1tDlLkwQ1bPApo4s8aVwZ2Ju8Z4COVik0vT6BJPRin79f5xPZgnaec3DIoC2UpHA==
-
-"@node-redis/time-series@^1.0.0":
+"@node-redis/graph@1.0.0":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@node-redis/time-series/-/time-series-1.0.0.tgz#3db4caa63d7c158f0b73ab6cd46bd6c9c187dfaf"
-  integrity sha512-QcaCIL/DlYJXedSfmjF+IRxKJbBUXBrjA5Gv0IiPlXXFFOkRnbPGKq6hmwBAAWyk1U03wyBHDFKVS3/9GnZV8g==
+  resolved "https://registry.yarnpkg.com/@node-redis/graph/-/graph-1.0.0.tgz#baf8eaac4a400f86ea04d65ec3d65715fd7951ab"
+  integrity sha512-mRSo8jEGC0cf+Rm7q8mWMKKKqkn6EAnA9IA2S3JvUv/gaWW/73vil7GLNwion2ihTptAm05I9LkepzfIXUKX5g==
+
+"@node-redis/json@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@node-redis/json/-/json-1.0.2.tgz#8ad2d0f026698dc1a4238cc3d1eb099a3bee5ab8"
+  integrity sha512-qVRgn8WfG46QQ08CghSbY4VhHFgaTY71WjpwRBGEuqGPfWwfRcIf3OqSpR7Q/45X+v3xd8mvYjywqh0wqJ8T+g==
+
+"@node-redis/search@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@node-redis/search/-/search-1.0.5.tgz#96050007eb7c50a7e47080320b4f12aca8cf94c4"
+  integrity sha512-MCOL8iCKq4v+3HgEQv8zGlSkZyXSXtERgrAJ4TSryIG/eLFy84b57KmNNa/V7M1Q2Wd2hgn2nPCGNcQtk1R1OQ==
+
+"@node-redis/time-series@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@node-redis/time-series/-/time-series-1.0.2.tgz#5dd3638374edd85ebe0aa6b0e87addc88fb9df69"
+  integrity sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
 
 "@npmcli/move-file@^1.0.1":
   version "1.0.1"
@@ -1393,10 +1555,52 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
   integrity sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
 
-"@rails/ujs@^6.1.4":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4.tgz#093d5341595a02089ed309dec40f3c37da7b1b10"
-  integrity sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw==
+"@rails/ujs@^6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6"
+  integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w==
+
+"@rollup/plugin-babel@^5.2.0":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"
+  integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@rollup/pluginutils" "^3.1.0"
+
+"@rollup/plugin-node-resolve@^11.2.1":
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
+  integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    "@types/resolve" "1.17.1"
+    builtin-modules "^3.1.0"
+    deepmerge "^4.2.2"
+    is-module "^1.0.0"
+    resolve "^1.19.0"
+
+"@rollup/plugin-replace@^2.4.1":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
+  integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    magic-string "^0.25.7"
+
+"@rollup/pluginutils@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+  dependencies:
+    "@types/estree" "0.0.39"
+    estree-walker "^1.0.1"
+    picomatch "^2.2.2"
+
+"@sinclair/typebox@^0.24.1":
+  version "0.24.20"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.20.tgz#11a657875de6008622d53f56e063a6347c51a6dd"
+  integrity sha512-kVaO5aEFZb33nPMTZBxiPEkY+slxiPtqC7QX8f9B3eGOMBvEfuMfxp9DSTTCsRJPumPKjrge4yagyssO4q6qzQ==
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
@@ -1405,13 +1609,23 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz#1c1c9a91419f804e59ae8df316a07dd1c3a76b94"
-  integrity sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew==
+"@sinonjs/fake-timers@^9.1.2":
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@surma/rollup-plugin-off-main-thread@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053"
+  integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==
+  dependencies:
+    ejs "^3.1.6"
+    json5 "^2.2.0"
+    magic-string "^0.25.0"
+    string.prototype.matchall "^4.0.6"
+
 "@testing-library/dom@^8.0.0":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.1.0.tgz#f8358b1883844ea569ba76b7e94582168df5370d"
@@ -1426,43 +1640,44 @@
     lz-string "^1.4.4"
     pretty-format "^27.0.2"
 
-"@testing-library/jest-dom@^5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.1.tgz#3db7df5ae97596264a7da9696fe14695ba02e51f"
-  integrity sha512-ajUJdfDIuTCadB79ukO+0l8O+QwN0LiSxDaYUTI4LndbbUsGi6rWU1SCexXzBA2NSjlVB9/vbkasQIL3tmPBjw==
+"@testing-library/jest-dom@^5.16.5":
+  version "5.16.5"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
+  integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
   dependencies:
+    "@adobe/css-tools" "^4.0.1"
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
     aria-query "^5.0.0"
     chalk "^3.0.0"
-    css "^3.0.0"
     css.escape "^1.5.1"
     dom-accessibility-api "^0.5.6"
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/react@^12.1.2":
-  version "12.1.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76"
-  integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==
+"@testing-library/react@^12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b"
+  integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^8.0.0"
+    "@types/react-dom" "<18.0.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@types/aria-query@^4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
   integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.3":
-  version "7.1.14"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
-  integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
+"@types/babel__core@^7.1.12", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.3":
+  version "7.1.18"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8"
+  integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1492,18 +1707,16 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/babel__traverse@^7.0.4":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1518,10 +1731,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/graceful-fs@^4.1.2":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
-  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+"@types/graceful-fs@^4.1.3":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
@@ -1568,6 +1781,15 @@
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
 
+"@types/jsdom@^20.0.0":
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.0.tgz#4414fb629465167f8b7b3804b9e067bdd99f1791"
+  integrity sha512-YfAchFs0yM1QPDrLm2VHe+WHGtqms3NXnXAMolrgrVP6fgBHHXy1ozAbo/dFtPNtZC/m66bPiCTWYmqp1F14gA==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -1583,11 +1805,21 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimist@^1.2.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
 "@types/node@*":
   version "14.11.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz#56af902ad157e763f9ba63d671c39cda3193c835"
   integrity sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -1608,6 +1840,13 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
+"@types/react-dom@<18.0.0":
+  version "17.0.15"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.15.tgz#f2c8efde11521a4b7991e076cb9c70ba3bb0d156"
+  integrity sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw==
+  dependencies:
+    "@types/react" "^17"
+
 "@types/react-redux@^7.1.20":
   version "7.1.20"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.20.tgz#42f0e61ababb621e12c66c96dda94c58423bd7df"
@@ -1625,15 +1864,22 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*":
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
-  integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
+"@types/react@*", "@types/react@^17":
+  version "17.0.44"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7"
+  integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/resolve@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
+  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/scheduler@*":
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
@@ -1656,6 +1902,16 @@
   dependencies:
     "@types/jest" "*"
 
+"@types/tough-cookie@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
+"@types/trusted-types@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
+  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -1675,6 +1931,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yargs@^17.0.8":
+  version "17.0.10"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a"
+  integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -1830,73 +2093,63 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    event-target-shim "^5.0.0"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+abortcontroller-polyfill@^1.7.5:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed"
+  integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
-    acorn "^3.0.4"
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
+  dependencies:
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
 acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn-walk@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz#56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"
-  integrity sha512-oZRad/3SMOI/pxbbmqyurIx7jHw1wZDcR9G44L8pUVFEomX/0dH89SrM1KaDXuv1NpzAXz6Op/Xu/Qd5XXzdEA==
-
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.5.0:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+acorn-walk@^8.0.0, acorn-walk@^8.0.2:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.2.4:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88"
-  integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.5.0, acorn@^8.8.1:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
 agent-base@6:
   version "6.0.2"
@@ -1918,24 +2171,11 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-  integrity sha1-MU3QpLM2j609/NxU7eYXG4htrzw=
-
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^4.7.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
 ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -1946,10 +2186,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b"
-  integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==
+ajv@^8.0.1, ajv@^8.6.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1971,11 +2211,6 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
-
 ansi-escapes@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
@@ -1993,22 +2228,12 @@ ansi-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-regex@^5.0.1:
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2054,23 +2279,18 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-aproba@^1.1.1:
+"aproba@^1.0.3 || ^2.0.0", aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
-  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+are-we-there-yet@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz#3ff397dc14f08b52dd8b2a64d3cee154ab8760d2"
+  integrity sha512-nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^3.6.0"
+    readable-stream "^4.1.0"
 
 argparse@^1.0.7:
   version "1.0.10"
@@ -2122,15 +2342,15 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.3, array-includes@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
 array-union@^1.0.1:
@@ -2140,6 +2360,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -2159,14 +2384,31 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
-array.prototype.flatmap@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 arrow-key-navigation@^1.2.0:
   version "1.2.0"
@@ -2217,17 +2459,27 @@ async-limiter@~1.0.0:
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
+async@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -2246,85 +2498,67 @@ autoprefixer@^9.8.8:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-axe-core@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
-  integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
+axe-core@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
+  integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==
 
-axios@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+axios@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a"
+  integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==
   dependencies:
-    follow-redirects "^1.14.4"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
+babel-jest@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44"
+  integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
-babel-jest@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.5.tgz#d38bd0be8ea71d8b97853a5fc9f76deeb095c709"
-  integrity sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==
-  dependencies:
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
+    "@jest/transform" "^29.3.1"
     "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^27.4.0"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.2.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-loader@^8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+babel-loader@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
+  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
+    loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+babel-plugin-istanbul@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz#d7831fc0f93573788d80dee7e682482da4c730d6"
-  integrity sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==
+babel-plugin-jest-hoist@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
+  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
+    "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-lodash@^3.3.4:
@@ -2338,7 +2572,7 @@ babel-plugin-lodash@^3.3.4:
     lodash "^4.17.10"
     require-package-name "^2.0.1"
 
-babel-plugin-macros@^2.8.0:
+babel-plugin-macros@^2.6.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -2347,37 +2581,47 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd"
-  integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==
+babel-plugin-macros@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
+
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+  dependencies:
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087"
-  integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
-    core-js-compat "^3.18.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
-  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
-babel-plugin-preval@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz#6cabb947ecc241664966e1f99eb56a3b4bb63d1e"
-  integrity sha512-8DqJq6/LPUjSZ0Qq6bVIFpsj2flCEE0Cbnbut9TvGU6jP9g3dOWEXtQ/sdvsA9d6souza8eNGh04WRXpuH9ThA==
+babel-plugin-preval@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.1.0.tgz#6efb89bf6b97af592cd1400c6df49c0e9e6ab027"
+  integrity sha512-G5R+xmo5LS41A4UyZjOjV0mp9AvkuCyUOAJ6TOv/jTZS+VKh7L7HUDRcCSOb0YCM/u0fFarh7Diz0wjY8rFNFg==
   dependencies:
-    "@babel/runtime" "^7.9.2"
-    babel-plugin-macros "^2.8.0"
+    "@babel/runtime" "^7.12.5"
+    "@types/babel__core" "^7.1.12"
+    babel-plugin-macros "^3.0.1"
     require-from-string "^2.0.2"
 
 babel-plugin-react-intl@^6.2.0:
@@ -2416,31 +2660,28 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz#70d0e676a282ccb200fbabd7f415db5fdf393bca"
-  integrity sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==
+babel-preset-jest@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
+  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
   dependencies:
-    babel-plugin-jest-hoist "^27.4.0"
+    babel-plugin-jest-hoist "^29.2.0"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
+
+base64-js@^1.0.2, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -2460,11 +2701,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -2492,10 +2728,10 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blurhash@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.4.tgz#a7010ceb3019cd2c9809b17c910ebf6175d29244"
-  integrity sha512-MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA==
+blurhash@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a"
+  integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A==
 
 bmp-js@^0.1.0:
   version "0.1.0"
@@ -2512,21 +2748,23 @@ bn.js@^5.1.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
   integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
 
-body-parser@1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
-  integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
-    bytes "3.1.1"
+    bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.6"
-    raw-body "2.4.2"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
     type-is "~1.6.18"
+    unpipe "1.0.0"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -2553,6 +2791,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2569,30 +2814,18 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-bricks.js@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/bricks.js/-/bricks.js-1.8.0.tgz#8fdeb3c0226af251f4d5727a7df7f9ac0092b4b2"
-  integrity sha1-j96zwCJq8lH01XJ6fff5rACStLI=
-  dependencies:
-    knot.js "^1.1.5"
-
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -2654,38 +2887,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.3, browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserslist@^4.17.5:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz#c827bbe172a4c22b123f5e337533ceebadfdd559"
-  integrity sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==
-  dependencies:
-    caniuse-lite "^1.0.30001271"
-    electron-to-chromium "^1.3.878"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
-
-browserslist@^4.17.6:
-  version "4.18.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
-  integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
-  dependencies:
-    caniuse-lite "^1.0.30001280"
-    electron-to-chromium "^1.3.896"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2695,9 +2905,9 @@ bser@2.1.1:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
@@ -2723,13 +2933,26 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-bufferutil@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028"
-  integrity sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
+bufferutil@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
+  integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==
   dependencies:
     node-gyp-build "^4.3.0"
 
+builtin-modules@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -2740,10 +2963,10 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
-  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -2819,13 +3042,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -2833,11 +3049,6 @@ caller-path@^2.0.0:
   dependencies:
     caller-callsite "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -2848,6 +3059,15 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -2868,22 +3088,12 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400:
+  version "1.0.30001414"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz"
+  integrity sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==
 
-caniuse-lite@^1.0.30001271:
-  version "1.0.30001274"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz#26ca36204d15b17601ba6fc35dbdad950a647cc7"
-  integrity sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==
-
-caniuse-lite@^1.0.30001280:
-  version "1.0.30001283"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b"
-  integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==
-
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2911,10 +3121,10 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0, chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@^4.0, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -2988,11 +3198,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 cjs-module-lexer@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz#2fd46d9906a126965aa541345c499aaa18e8cd73"
@@ -3008,28 +3213,16 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.5, classnames@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
-  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+classnames@^2.2.5, classnames@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3039,13 +3232,13 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-cliui@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz#ef180f26c8d9bff3927ee52428bfec2090427981"
-  integrity sha512-Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.1:
@@ -3076,10 +3269,10 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+cocoon-js-vanilla@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cocoon-js-vanilla/-/cocoon-js-vanilla-1.3.0.tgz#1e53663f5d314e5e9b315b63eaf8ae701df113c0"
+  integrity sha512-rMnbfW6oFhvELUg141vfqZKzsowfLJRxs5FksfmDr1ZBs6LTNVYE63NQyvgRqyYUOK54cKKbI+V83dQKeeRuPg==
 
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
@@ -3131,7 +3324,7 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.2:
+color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -3144,10 +3337,10 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+colord@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -3156,7 +3349,7 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0, commander@^2.8.1:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3166,6 +3359,11 @@ commander@^7.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+common-tags@^1.8.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -3212,7 +3410,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.5.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3232,7 +3430,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@^1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -3254,22 +3452,27 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
@@ -3288,24 +3491,18 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.18.0, core-js-compat@^3.19.1:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.1.tgz#fe598f1a9bf37310d77c3813968e9f7c7bb99476"
-  integrity sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==
+core-js-compat@^3.25.1:
+  version "3.25.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.2.tgz#7875573586809909c69e03ef310810c1969ee138"
+  integrity sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==
   dependencies:
-    browserslist "^4.17.6"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js-pure@^3.0.0:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
   integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
-core-js@^2.4.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
-
 core-js@^2.5.0:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
@@ -3337,6 +3534,17 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
+cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -3412,6 +3620,11 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -3445,6 +3658,11 @@ css-font-weight-keywords@^1.0.0:
   resolved "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz#9bc04671ac85bc724b574ef5d3ac96b0d604fd97"
   integrity sha1-m8BGcayFvHJLV07106yWsNYE/Zc=
 
+css-functions-list@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
+  integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
+
 css-global-keywords@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz#72a9aea72796d019b1d2a3252de4e5aaa37e4a69"
@@ -3519,15 +3737,6 @@ css.escape@^1.5.1:
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
 
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
-  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
-  dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
-
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -3608,10 +3817,10 @@ csso@^4.0.2:
   dependencies:
     css-tree "1.0.0-alpha.39"
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
@@ -3648,31 +3857,31 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-damerau-levenshtein@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
-  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
+damerau-levenshtein@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
+  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
 
-debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
@@ -3683,20 +3892,28 @@ debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.2.0:
+decamelize-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+decimal.js@^10.4.2:
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
+  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -3715,11 +3932,6 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
-  integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==
-
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3738,12 +3950,13 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -3790,6 +4003,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3803,10 +4021,10 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -3840,10 +4058,10 @@ diff-sequences@^25.2.6:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
 
-diff-sequences@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.4.0.tgz#d783920ad8d06ec718a060d00196dfef25b132a5"
-  integrity sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==
+diff-sequences@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
+  integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -3854,6 +4072,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -3874,14 +4099,6 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-doctrine@^1.2.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -3939,12 +4156,12 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^7.0.0"
 
 domutils@^1.7.0:
   version "1.7.0"
@@ -3961,10 +4178,10 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
-  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+dotenv@^16.0.3:
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
+  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
 
 duplexer@^0.1.2:
   version "0.1.2"
@@ -3986,25 +4203,17 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.3.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
+ejs@^3.1.6:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  dependencies:
+    jake "^10.8.5"
 
-electron-to-chromium@^1.3.723:
-  version "1.3.736"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
-  integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
-
-electron-to-chromium@^1.3.878:
-  version "1.3.886"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.886.tgz#ac039c4001b665b1dd0f0ed9c2e4da90ff3c9267"
-  integrity sha512-+vYdeBosI63VkCtNWnEVFjgNd/IZwvnsWkKyPtWAvrhA+XfByKoBJcbsMgudVU/bUcGAF9Xp3aXn96voWlc3oQ==
-
-electron-to-chromium@^1.3.896:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.3.tgz#82480df3ef607f04bb38cc3f30a628d8b895339f"
-  integrity sha512-hfpppjYhqIZB8jrNb0rNceQRkSnBN7QJl3W26O1jUv3F3BkQknqy1YTqVXkFnIcFtBc3Qnv5M7r5Lez2iOLgZA==
+electron-to-chromium@^1.4.251:
+  version "1.4.254"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz#c6203583890abf88dfc0be046cd72d3b48f8beb6"
+  integrity sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -4019,14 +4228,14 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
-emittery@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
-  integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
-"emoji-mart@npm:emoji-mart-lazyload":
+"emoji-mart@npm:emoji-mart-lazyload@latest":
   version "3.0.1-j"
-  resolved "https://registry.npmjs.org/emoji-mart-lazyload/-/emoji-mart-lazyload-3.0.1-j.tgz#87a90d30b79d9145ece078d53e3e683c1a10ce9c"
+  resolved "https://registry.yarnpkg.com/emoji-mart-lazyload/-/emoji-mart-lazyload-3.0.1-j.tgz#87a90d30b79d9145ece078d53e3e683c1a10ce9c"
   integrity sha512-0wKF7MR0/iAeCIoiBLY+JjXCugycTgYRC2SL0y9/bjNSQlbeMdzILmPQJAufU/mgLFDUitOvjxLDhOZ9yxZ48g==
   dependencies:
     "@babel/runtime" "^7.0.0"
@@ -4048,11 +4257,6 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -4091,6 +4295,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -4112,31 +4321,42 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.19.0, es-abstract@^1.19.5, es-abstract@^1.20.4:
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
+  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.3"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.2"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.2"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4147,7 +4367,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14:
+es5-ext@^0.10.35, es5-ext@^0.10.50:
   version "0.10.53"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
   integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
@@ -4156,7 +4376,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14:
     es6-symbol "~3.1.3"
     next-tick "~1.0.0"
 
-es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -4165,38 +4385,7 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-map@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-set "~0.1.5"
-    es6-symbol "~3.1.1"
-    event-emitter "~0.3.5"
-
-es6-set@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-symbol "3.1.1"
-    event-emitter "~0.3.5"
-
-es6-symbol@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1, es6-symbol@~3.1.3:
+es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
   integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
@@ -4204,16 +4393,6 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1, es6-symbol@~3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
-es6-weak-map@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -4251,16 +4430,6 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -4269,76 +4438,85 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
-  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
+eslint-module-utils@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
-    pkg-dir "^2.0.0"
 
-eslint-plugin-import@~2.25.3:
-  version "2.25.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
-  integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==
+eslint-plugin-import@~2.26.0:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
   dependencies:
     array-includes "^3.1.4"
     array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.1"
+    eslint-module-utils "^2.7.3"
     has "^1.0.3"
-    is-core-module "^2.8.0"
+    is-core-module "^2.8.1"
     is-glob "^4.0.3"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     object.values "^1.1.5"
-    resolve "^1.20.0"
-    tsconfig-paths "^3.11.0"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsx-a11y@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
-  integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
+eslint-plugin-jsx-a11y@~6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff"
+  integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==
   dependencies:
-    "@babel/runtime" "^7.16.3"
+    "@babel/runtime" "^7.18.9"
     aria-query "^4.2.2"
-    array-includes "^3.1.4"
+    array-includes "^3.1.5"
     ast-types-flow "^0.0.7"
-    axe-core "^4.3.5"
+    axe-core "^4.4.3"
     axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.7"
+    damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.2.1"
+    jsx-ast-utils "^3.3.2"
     language-tags "^1.0.5"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
+    semver "^6.3.0"
 
-eslint-plugin-promise@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz#017652c07c9816413a41e11c30adc42c3d55ff18"
-  integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==
+eslint-plugin-promise@~6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
+  integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
 
-eslint-plugin-react@~7.27.1:
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz#469202442506616f77a854d91babaae1ec174b45"
-  integrity sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==
+eslint-plugin-react@~7.31.11:
+  version "7.31.11"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8"
+  integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==
   dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flatmap "^1.2.5"
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
     doctrine "^2.1.0"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.0.4"
-    object.entries "^1.1.5"
-    object.fromentries "^2.0.5"
-    object.hasown "^1.1.0"
-    object.values "^1.1.5"
-    prop-types "^15.7.2"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
     resolve "^2.0.0-next.3"
     semver "^6.3.0"
-    string.prototype.matchall "^4.0.6"
+    string.prototype.matchall "^4.0.8"
+
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -4348,14 +4526,6 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
 eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
@@ -4363,54 +4533,15 @@ eslint-utils@^2.1.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
-
-eslint@^2.7.0:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz#e4cc8fa0f009fb829aaae23855a29360be1f6c11"
-  integrity sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=
-  dependencies:
-    chalk "^1.1.3"
-    concat-stream "^1.4.6"
-    debug "^2.1.1"
-    doctrine "^1.2.2"
-    es6-map "^0.1.3"
-    escope "^3.6.0"
-    espree "^3.1.6"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^1.1.1"
-    glob "^7.0.3"
-    globals "^9.2.0"
-    ignore "^3.1.2"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    optionator "^0.8.1"
-    path-is-absolute "^1.0.0"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.6.0"
-    strip-json-comments "~1.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint@^7.32.0:
   version "7.32.0"
@@ -4458,14 +4589,6 @@ eslint@^7.32.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^3.1.6:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
@@ -4494,7 +4617,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -4504,6 +4627,11 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-walker@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -4514,28 +4642,25 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-event-emitter@~0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+events@^3.0.0, events@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
   dependencies:
     original "^1.0.0"
 
@@ -4580,11 +4705,6 @@ exif-js@^2.3.0:
   resolved "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz#9d10819bf571f873813e7640241255ab9ce1a814"
   integrity sha1-nRCBm/Vx+HOBPnZAJBJVq5zhqBQ=
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -4610,50 +4730,50 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-27.4.2.tgz#4429b0f7e307771d176de9bdf23229b101db6ef6"
-  integrity sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==
+expect@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6"
+  integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==
   dependencies:
-    "@jest/types" "^27.4.2"
-    ansi-styles "^5.0.0"
-    jest-get-type "^27.4.0"
-    jest-matcher-utils "^27.4.2"
-    jest-message-util "^27.4.2"
-    jest-regex-util "^27.4.0"
+    "@jest/expect-utils" "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
 
-express@^4.17.1, express@^4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
-  integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
+express@^4.17.1, express@^4.18.2:
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
-    accepts "~1.3.7"
+    accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.1"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.1"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.6"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
     setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -4699,7 +4819,18 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-json-stable-stringify@^2.0.0:
+fast-glob@^3.2.12, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -4709,6 +4840,18 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
 faye-websocket@^0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
@@ -4728,22 +4871,6 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-entry-cache@^1.1.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8"
-  integrity sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -4769,6 +4896,13 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filelist@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -4786,17 +4920,17 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     unpipe "~1.0.0"
 
 find-cache-dir@^2.1.0:
@@ -4817,6 +4951,11 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -4849,16 +4988,6 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -4880,10 +5009,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.4:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
-  integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
+follow-redirects@^1.0.0, follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -4895,10 +5024,10 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -4929,22 +5058,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-front-matter@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz#f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"
-  integrity sha1-91mDufL0E75ljJPf172M5AePXNs=
-  dependencies:
-    js-yaml "^3.4.6"
-
-fs-extra@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^3.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4954,6 +5067,16 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4984,7 +5107,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.3.2, fsevents@~2.3.1:
+fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -4994,39 +5117,44 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gauge@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8"
-  integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
+fuzzysort@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/fuzzysort/-/fuzzysort-1.9.0.tgz#d36d27949eae22340bb6f7ba30ea6751b92a181c"
+  integrity sha512-MOxCT0qLTwLqmEwc7UtU045RKef7mc8Qz8eR4r2bLNEq9dy/c3ZKMEFp6IEst69otkQdFZ4FfgH2dmZD+ddX1g==
+
+gauge@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.0.tgz#e270ca9d97dae84abf64e5277ef1ebddc7dd1e2f"
+  integrity sha512-0s5T5eciEG7Q3ugkxAkFtaDhrrhXsCRivA5y8C9WMHWuI8UlMOJg7+Iwf7Mccii+Dfs3H5jHepU0joPVyQU0Lw==
   dependencies:
-    ansi-regex "^5.0.1"
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.2"
-    console-control-strings "^1.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.0"
+    signal-exit "^3.0.7"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.2"
-
-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
+    wide-align "^1.1.5"
 
 generic-pool@3.8.2:
   version "3.8.2"
@@ -5043,14 +5171,19 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.3"
+
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
 get-package-type@^0.1.0:
   version "0.1.0"
@@ -5097,7 +5230,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5109,17 +5242,16 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~7.1.1:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+glob@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
     once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
 global-modules@^1.0.0:
   version "1.0.0"
@@ -5169,10 +5301,17 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globals@^9.2.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
 
 globby@^6.1.0:
   version "6.1.0"
@@ -5185,26 +5324,15 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globule@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
-  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
-gonzales-pe-sl@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz#6a868bc380645f141feeb042c6f97fcc71b59fe6"
-  integrity sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=
-  dependencies:
-    minimist "1.1.x"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
 gzip-size@^6.0.0:
   version "6.0.0"
@@ -5218,6 +5346,11 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -5225,10 +5358,10 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^1.0.0:
   version "1.0.0"
@@ -5245,15 +5378,17 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
 
-has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
@@ -5327,7 +5462,7 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-history@^4.10.1:
+history@^4.10.1, history@^4.7.2:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
   integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
@@ -5339,17 +5474,6 @@ history@^4.10.1:
     tiny-warning "^1.0.0"
     value-equal "^1.0.1"
 
-history@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
-  integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==
-  dependencies:
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
-    resolve-pathname "^2.2.0"
-    value-equal "^0.4.0"
-    warning "^3.0.0"
-
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -5378,6 +5502,18 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+hosted-git-info@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -5398,12 +5534,12 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    whatwg-encoding "^2.0.0"
 
 html-entities@^1.3.1:
   version "1.3.1"
@@ -5415,20 +5551,25 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tags@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
+  integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
-    depd "~1.1.2"
+    depd "2.0.0"
     inherits "2.0.4"
     setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
+    statuses "2.0.1"
     toidentifier "1.0.1"
 
 http-errors@~1.6.2:
@@ -5441,27 +5582,22 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-link-header@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz#abbc2cdc5e06dd7e196a4983adac08a2d085ec90"
-  integrity sha512-nARK1wSKoBBrtcoESlHBx36c1Ln/gnbNQi1eB6MeTUefJIT3NvUOsV15bClga0k38f0q/kN5xxrGSDS3EFnm9w==
-
-"http-parser-js@>=0.4.0 <0.4.11":
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
-  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+http-link-header@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.1.0.tgz#a1ca87efdbcb7778d8d0d4525de1e6964ec1f129"
+  integrity sha512-pj6N1yxOz/ANO8HHsWGg/OoIL1kmRYvQnXQ7PIRpgp+15AnEsRH8fmIJE6D1OdWG2Bov+BJHVla1fFXxg1JbbA==
 
 http-parser-js@>=0.5.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
   integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    "@tootallnate/once" "1"
+    "@tootallnate/once" "2"
     agent-base "6"
     debug "4"
 
@@ -5489,10 +5625,10 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+https-proxy-agent@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
@@ -5509,6 +5645,13 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
@@ -5519,30 +5662,35 @@ idb-keyval@^3.2.0:
   resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz#cbbf354deb5684b6cdc84376294fc05932845bd6"
   integrity sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+idb@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.2.tgz#7a067e20dd16539938e456814b7d714ba8db3892"
+  integrity sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg==
+
+ieee754@^1.1.4, ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore@^3.1.2:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+immutable@^4.0.0, immutable@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
 import-cwd@^2.0.0:
   version "2.1.0"
@@ -5560,9 +5708,9 @@ import-fresh@^2.0.0:
     resolve-from "^3.0.0"
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -5574,6 +5722,11 @@ import-from@^2.1.0:
   dependencies:
     resolve-from "^3.0.0"
 
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -5648,25 +5801,6 @@ ini@^1.3.4, ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
   integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  integrity sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5689,10 +5823,10 @@ interpret@^1.4.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-intersection-observer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.0.tgz#6c84628f67ce8698e5f9ccf857d97718745837aa"
-  integrity sha512-2Vkz8z46Dv401zTWudDGwO7KiGHNDkMv417T5ItcNYfmvHR/1qCTVBO9vwH8zZmQ0WkA/1ARwpysR9bsnop4NQ==
+intersection-observer@^0.12.0, intersection-observer@^0.12.2:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
+  integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
 
 intl-format-cache@^2.0.5:
   version "2.2.9"
@@ -5735,7 +5869,7 @@ intl@^1.2.5:
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
   integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
 
-invariant@^2.1.1, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.1.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -5822,15 +5956,10 @@ is-boolean-object@^1.1.0:
   dependencies:
     call-bind "^1.0.2"
 
-is-callable@^1.1.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-color-stop@^1.0.0:
   version "1.1.0"
@@ -5844,10 +5973,10 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.2.0, is-core-module@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
+is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
+  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
   dependencies:
     has "^1.0.3"
 
@@ -5915,13 +6044,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -5951,21 +6073,10 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-my-ip-valid@^1.0.0:
+is-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
-
-is-my-json-valid@^2.10.0:
-  version "2.20.5"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz#5eca6a8232a687f68869b7361be1612e7512e5df"
-  integrity sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-nan@^1.3.2:
   version "1.3.2"
@@ -5975,10 +6086,10 @@ is-nan@^1.3.2:
     call-bind "^1.0.0"
     define-properties "^1.1.3"
 
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.5"
@@ -5997,6 +6108,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
 is-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
@@ -6021,6 +6137,11 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6028,24 +6149,17 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
-is-regex@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
-  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -6053,15 +6167,22 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^1.1.0:
   version "1.1.0"
@@ -6080,36 +6201,24 @@ is-string@^1.0.5, is-string@^1.0.7:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-symbol@^1.0.3:
+is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
 is-url@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
-is-weakref@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
-  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
@@ -6148,19 +6257,20 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
+  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
   dependencies:
-    "@babel/core" "^7.7.5"
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
@@ -6181,93 +6291,102 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
-  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+istanbul-reports@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.3.tgz#4bcae3103b94518117930d51283690960b50d3c2"
+  integrity sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.4.2.tgz#da2547ea47c6e6a5f6ed336151bd2075736eb4a5"
-  integrity sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==
+jake@^10.8.5:
+  version "10.8.5"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
   dependencies:
-    "@jest/types" "^27.4.2"
-    execa "^5.0.0"
-    throat "^6.0.1"
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
 
-jest-circus@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.4.5.tgz#70bfb78e0200cab9b84747bf274debacaa538467"
-  integrity sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==
+jest-changed-files@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289"
+  integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==
   dependencies:
-    "@jest/environment" "^27.4.4"
-    "@jest/test-result" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    execa "^5.0.0"
+    p-limit "^3.1.0"
+
+jest-circus@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a"
+  integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==
+  dependencies:
+    "@jest/environment" "^29.3.1"
+    "@jest/expect" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
-    expect "^27.4.2"
     is-generator-fn "^2.0.0"
-    jest-each "^27.4.2"
-    jest-matcher-utils "^27.4.2"
-    jest-message-util "^27.4.2"
-    jest-runtime "^27.4.5"
-    jest-snapshot "^27.4.5"
-    jest-util "^27.4.2"
-    pretty-format "^27.4.2"
+    jest-each "^29.3.1"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
+    p-limit "^3.1.0"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
-    throat "^6.0.1"
 
-jest-cli@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.4.5.tgz#8708f54c28d13681f3255ec9026a2b15b03d41e8"
-  integrity sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==
+jest-cli@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d"
+  integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==
   dependencies:
-    "@jest/core" "^27.4.5"
-    "@jest/test-result" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/core" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^27.4.5"
-    jest-util "^27.4.2"
-    jest-validate "^27.4.2"
+    jest-config "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     prompts "^2.0.1"
-    yargs "^16.2.0"
+    yargs "^17.3.1"
 
-jest-config@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.4.5.tgz#77ed7f2ba7bcfd7d740ade711d0d13512e08a59e"
-  integrity sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==
+jest-config@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6"
+  integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==
   dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^27.4.5"
-    "@jest/types" "^27.4.2"
-    babel-jest "^27.4.5"
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    babel-jest "^29.3.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-circus "^27.4.5"
-    jest-environment-jsdom "^27.4.4"
-    jest-environment-node "^27.4.4"
-    jest-get-type "^27.4.0"
-    jest-jasmine2 "^27.4.5"
-    jest-regex-util "^27.4.0"
-    jest-resolve "^27.4.5"
-    jest-runner "^27.4.5"
-    jest-util "^27.4.2"
-    jest-validate "^27.4.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.3.1"
+    jest-environment-node "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-runner "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     micromatch "^4.0.4"
-    pretty-format "^27.4.2"
+    parse-json "^5.2.0"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
+    strip-json-comments "^3.1.1"
 
 jest-diff@^25.2.1:
   version "25.5.0"
@@ -6279,350 +6398,315 @@ jest-diff@^25.2.1:
     jest-get-type "^25.2.6"
     pretty-format "^25.5.0"
 
-jest-diff@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.4.2.tgz#786b2a5211d854f848e2dcc1e324448e9481f36f"
-  integrity sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==
+jest-diff@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527"
+  integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^27.4.0"
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.2"
+    diff-sequences "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
 
-jest-docblock@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.4.0.tgz#06c78035ca93cbbb84faf8fce64deae79a59f69f"
-  integrity sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==
+jest-docblock@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82"
+  integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.4.2.tgz#19364c82a692d0d26557642098d1f4619c9ee7d3"
-  integrity sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==
+jest-each@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132"
+  integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     chalk "^4.0.0"
-    jest-get-type "^27.4.0"
-    jest-util "^27.4.2"
-    pretty-format "^27.4.2"
+    jest-get-type "^29.2.0"
+    jest-util "^29.3.1"
+    pretty-format "^29.3.1"
 
-jest-environment-jsdom@^27.4.4:
-  version "27.4.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz#94f738e99514d7a880e8ed8e03e3a321d43b49db"
-  integrity sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==
+jest-environment-jsdom@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639"
+  integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==
   dependencies:
-    "@jest/environment" "^27.4.4"
-    "@jest/fake-timers" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/jsdom" "^20.0.0"
     "@types/node" "*"
-    jest-mock "^27.4.2"
-    jest-util "^27.4.2"
-    jsdom "^16.6.0"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
+    jsdom "^20.0.0"
 
-jest-environment-node@^27.4.4:
-  version "27.4.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.4.4.tgz#42fe5e3b224cb69b99811ebf6f5eaa5a59618514"
-  integrity sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==
+jest-environment-node@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74"
+  integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==
   dependencies:
-    "@jest/environment" "^27.4.4"
-    "@jest/fake-timers" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
-    jest-mock "^27.4.2"
-    jest-util "^27.4.2"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
 
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
   integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
 
-jest-get-type@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5"
-  integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==
+jest-get-type@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
+  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-haste-map@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.5.tgz#c2921224a59223f91e03ec15703905978ef0cc1a"
-  integrity sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==
+jest-haste-map@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
+  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
   dependencies:
-    "@jest/types" "^27.4.2"
-    "@types/graceful-fs" "^4.1.2"
+    "@jest/types" "^29.3.1"
+    "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^27.4.0"
-    jest-serializer "^27.4.0"
-    jest-util "^27.4.2"
-    jest-worker "^27.4.5"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.3.1"
+    jest-worker "^29.3.1"
     micromatch "^4.0.4"
-    walker "^1.0.7"
+    walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz#ff79d11561679ff6c89715b0cd6b1e8c0dfbc6dc"
-  integrity sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==
+jest-leak-detector@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518"
+  integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^27.4.4"
-    "@jest/source-map" "^27.4.0"
-    "@jest/test-result" "^27.4.2"
-    "@jest/types" "^27.4.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^27.4.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^27.4.2"
-    jest-matcher-utils "^27.4.2"
-    jest-message-util "^27.4.2"
-    jest-runtime "^27.4.5"
-    jest-snapshot "^27.4.5"
-    jest-util "^27.4.2"
-    pretty-format "^27.4.2"
-    throat "^6.0.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
 
-jest-leak-detector@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz#7fc3120893a7a911c553f3f2bdff9faa4454abbb"
-  integrity sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==
-  dependencies:
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.2"
-
-jest-matcher-utils@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz#d17c5038607978a255e0a9a5c32c24e984b6c60b"
-  integrity sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==
+jest-matcher-utils@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572"
+  integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^27.4.2"
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.2"
+    jest-diff "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
 
-jest-message-util@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.4.2.tgz#07f3f1bf207d69cf798ce830cc57f1a849f99388"
-  integrity sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==
+jest-message-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb"
+  integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^27.4.2"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.4.2.tgz#184ff197a25491bfe4570c286daa5d62eb760b88"
-  integrity sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==
+jest-mock@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e"
+  integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
+    jest-util "^29.3.1"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca"
-  integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==
+jest-regex-util@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
+  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
 
-jest-resolve-dependencies@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz#9398af854bdb12d6a9e5a8a536ee401f889a3ecf"
-  integrity sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==
+jest-resolve-dependencies@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf"
+  integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==
   dependencies:
-    "@jest/types" "^27.4.2"
-    jest-regex-util "^27.4.0"
-    jest-snapshot "^27.4.5"
+    jest-regex-util "^29.2.0"
+    jest-snapshot "^29.3.1"
 
-jest-resolve@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.4.5.tgz#8dc44f5065fb8d58944c20f932cb7b9fe9760cca"
-  integrity sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==
+jest-resolve@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7"
+  integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==
   dependencies:
-    "@jest/types" "^27.4.2"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.4.5"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.3.1"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^27.4.2"
-    jest-validate "^27.4.2"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     resolve "^1.20.0"
     resolve.exports "^1.1.0"
     slash "^3.0.0"
 
-jest-runner@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.4.5.tgz#daba2ba71c8f34137dc7ac45616add35370a681e"
-  integrity sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==
+jest-runner@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d"
+  integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==
   dependencies:
-    "@jest/console" "^27.4.2"
-    "@jest/environment" "^27.4.4"
-    "@jest/test-result" "^27.4.2"
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
+    "@jest/console" "^29.3.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.8.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-docblock "^27.4.0"
-    jest-environment-jsdom "^27.4.4"
-    jest-environment-node "^27.4.4"
-    jest-haste-map "^27.4.5"
-    jest-leak-detector "^27.4.2"
-    jest-message-util "^27.4.2"
-    jest-resolve "^27.4.5"
-    jest-runtime "^27.4.5"
-    jest-util "^27.4.2"
-    jest-worker "^27.4.5"
-    source-map-support "^0.5.6"
-    throat "^6.0.1"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.2.0"
+    jest-environment-node "^29.3.1"
+    jest-haste-map "^29.3.1"
+    jest-leak-detector "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-resolve "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-util "^29.3.1"
+    jest-watcher "^29.3.1"
+    jest-worker "^29.3.1"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
 
-jest-runtime@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.4.5.tgz#97703ad2a1799d4f50ab59049bd21a9ceaed2813"
-  integrity sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==
+jest-runtime@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a"
+  integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==
   dependencies:
-    "@jest/console" "^27.4.2"
-    "@jest/environment" "^27.4.4"
-    "@jest/globals" "^27.4.4"
-    "@jest/source-map" "^27.4.0"
-    "@jest/test-result" "^27.4.2"
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
-    "@types/yargs" "^16.0.0"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/globals" "^29.3.1"
+    "@jest/source-map" "^29.2.0"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
-    exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.4.5"
-    jest-message-util "^27.4.2"
-    jest-mock "^27.4.2"
-    jest-regex-util "^27.4.0"
-    jest-resolve "^27.4.5"
-    jest-snapshot "^27.4.5"
-    jest-util "^27.4.2"
-    jest-validate "^27.4.2"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-mock "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^16.2.0"
 
-jest-serializer@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.4.0.tgz#34866586e1cae2388b7d12ffa2c7819edef5958a"
-  integrity sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==
+jest-snapshot@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e"
+  integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==
   dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
-
-jest-snapshot@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.4.5.tgz#2ea909b20aac0fe62504bc161331f730b8a7ecc7"
-  integrity sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==
-  dependencies:
-    "@babel/core" "^7.7.2"
+    "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
-    "@babel/parser" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.0.0"
-    "@jest/transform" "^27.4.5"
-    "@jest/types" "^27.4.2"
-    "@types/babel__traverse" "^7.0.4"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^27.4.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^27.4.2"
-    jest-get-type "^27.4.0"
-    jest-haste-map "^27.4.5"
-    jest-matcher-utils "^27.4.2"
-    jest-message-util "^27.4.2"
-    jest-resolve "^27.4.5"
-    jest-util "^27.4.2"
+    expect "^29.3.1"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-haste-map "^29.3.1"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
     natural-compare "^1.4.0"
-    pretty-format "^27.4.2"
-    semver "^7.3.2"
+    pretty-format "^29.3.1"
+    semver "^7.3.5"
 
-jest-util@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.4.2.tgz#ed95b05b1adfd761e2cda47e0144c6a58e05a621"
-  integrity sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==
+jest-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
+  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.4.2.tgz#eecfcc1b1c9429aa007da08a2bae4e32a81bbbc3"
-  integrity sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==
+jest-validate@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a"
+  integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.3.1"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^27.4.0"
+    jest-get-type "^29.2.0"
     leven "^3.1.0"
-    pretty-format "^27.4.2"
+    pretty-format "^29.3.1"
 
-jest-watcher@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.4.2.tgz#c9037edfd80354c9fe90de4b6f8b6e2b8e736744"
-  integrity sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==
+jest-watcher@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a"
+  integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==
   dependencies:
-    "@jest/test-result" "^27.4.2"
-    "@jest/types" "^27.4.2"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^27.4.2"
+    emittery "^0.13.1"
+    jest-util "^29.3.1"
     string-length "^4.0.1"
 
-jest-worker@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
-  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
+jest-worker@^26.2.1, jest-worker@^26.5.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242"
-  integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==
+jest-worker@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
+  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
   dependencies:
     "@types/node" "*"
+    jest-util "^29.3.1"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^27.4.5:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-27.4.5.tgz#66e45acba44137fac26be9d3cc5bb031e136dc0f"
-  integrity sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==
+jest@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122"
+  integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==
   dependencies:
-    "@jest/core" "^27.4.5"
+    "@jest/core" "^29.3.1"
+    "@jest/types" "^29.3.1"
     import-local "^3.0.2"
-    jest-cli "^27.4.5"
+    jest-cli "^29.3.1"
 
 js-base64@^2.1.9:
   version "2.6.4"
@@ -6634,7 +6718,7 @@ js-base64@^2.1.9:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4:
+js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -6649,38 +6733,37 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^16.6.0:
-  version "16.6.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac"
-  integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==
+jsdom@^20.0.0, jsdom@^20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
     cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
+    domexception "^4.0.0"
     escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.5"
-    xml-name-validator "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
+    xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
   version "2.5.2"
@@ -6697,6 +6780,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -6707,12 +6795,17 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
@@ -6724,11 +6817,6 @@ json3@^3.3.3:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -6736,19 +6824,10 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonfile@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -6757,22 +6836,31 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonpointer@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc"
-  integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==
+jsonpointer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
+  integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
-  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz#afe5efe4332cd3515c065072bd4d6b0aa22152bd"
+  integrity sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==
   dependencies:
-    array-includes "^3.1.3"
+    array-includes "^3.1.5"
     object.assign "^4.1.2"
 
 keycode@^2.1.7:
@@ -6800,15 +6888,10 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
-knot.js@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz#28e72522f703f50fe98812fde224dd72728fef5d"
-  integrity sha1-KOclIvcD9Q/piBL94iTdcnKP710=
-
-known-css-properties@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"
-  integrity sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==
+known-css-properties@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.25.0.tgz#6ebc4d4b412f602e5cfbeb4086bd544e34c0a776"
+  integrity sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==
 
 language-subtag-registry@~0.3.2:
   version "0.3.20"
@@ -6827,14 +6910,6 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -6843,6 +6918,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -6853,20 +6936,10 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@0.2.x:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
 loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -6911,16 +6984,6 @@ lockfile@^1.0:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash.capitalize@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"
-  integrity sha1-+CbJtOKoUR2E46yinbBeGk87cqk=
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -6956,11 +7019,6 @@ lodash.isobject@^3.0.2:
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
   integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
 
-lodash.kebabcase@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
-  integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -6986,7 +7044,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.10:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7022,6 +7080,13 @@ lz-string@^1.4.4:
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
   integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
 
+magic-string@^0.25.0, magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7037,18 +7102,28 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    tmpl "1.0.x"
+    tmpl "1.0.5"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
+map-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
+
+map-obj@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -7061,10 +7136,15 @@ mark-loader@^0.1.6:
   resolved "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz#0abb477dca7421d70e20128ff6489f5cae8676d5"
   integrity sha1-CrtHfcp0IdcOIBKP9kifXK6GdtU=
 
-marky@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.2.tgz#4456765b4de307a13d263a69b0c79bf226e68323"
-  integrity sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==
+marky@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.5.tgz#55796b688cbd72390d2d399eaaf1832c9413e3c0"
+  integrity sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==
+
+mathml-tag-names@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 md5.js@^1.3.4:
   version "1.3.5"
@@ -7090,10 +7170,10 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memoize-one@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
-  integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
 
 memory-fs@^0.4.1:
   version "0.4.1"
@@ -7111,6 +7191,24 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -7121,10 +7219,10 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 methods@~1.1.2:
   version "1.1.2"
@@ -7150,13 +7248,13 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+micromatch@^4.0.4, micromatch@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -7166,33 +7264,28 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.24:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.52.0"
 
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.3.1:
+mime@^2.3.1, mime@^2.4.4:
   version "2.4.7"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
   integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
 
-mime@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -7222,22 +7315,33 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@1.1.x:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
+minimatch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -7299,7 +7403,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7333,12 +7437,12 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -7356,20 +7460,15 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-  integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=
-
 nan@^2.12.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
-nanoid@^3.1.23:
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
-  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7393,10 +7492,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
@@ -7414,9 +7513,11 @@ nice-try@^1.0.4:
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
 
 node-forge@^0.10.0:
   version "0.10.0"
@@ -7462,20 +7563,30 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-node-releases@^1.1.71:
-  version "1.1.72"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
-  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
 
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -7513,14 +7624,14 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c"
-  integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==
+npmlog@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8"
+  integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==
   dependencies:
-    are-we-there-yet "^2.0.0"
+    are-we-there-yet "^4.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.0"
+    gauge "^5.0.0"
     set-blocking "^2.0.0"
 
 nth-check@^1.0.2:
@@ -7535,17 +7646,12 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+nwsapi@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7564,15 +7670,10 @@ object-fit-images@^3.2.3:
   resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz#6c299d38fdf207746e5d2d46c2877f6f25d15b52"
   integrity sha512-G+7LzpYfTfqUyrZlfrou/PLLLAPNC52FTy5y1CBywX+1/FkxIloOyQXBmZ3Zxa2AWO+lMF0JTuvqbr7G5e5CWg==
 
-object-inspect@^1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
-
-object-inspect@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+object-inspect@^1.12.2, object-inspect@^1.9.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
 object-is@^1.0.1:
   version "1.1.3"
@@ -7582,7 +7683,7 @@ object-is@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -7594,43 +7695,33 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+object.assign@^4.1.2, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
 
-object.fromentries@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
-  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 object.getownpropertydescriptors@^2.1.0:
   version "2.1.0"
@@ -7640,13 +7731,13 @@ object.getownpropertydescriptors@^2.1.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-object.hasown@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
-  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -7655,35 +7746,24 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0, object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+object.values@^1.1.0, object.values@^1.1.5, object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-offline-plugin@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz#26936ad1a7699f4d67e0a095a258972a4ccf1788"
-  integrity sha512-ArMFt4QFjK0wg8B5+R/6tt65u6Dk+Pkx4PAcW5O7mgIF3ywMepaQqFOQgfZD4ybanuGwuJihxUwMRgkzd+YGYw==
-  dependencies:
-    deep-extend "^0.5.1"
-    ejs "^2.3.4"
-    loader-utils "0.2.x"
-    minimatch "^3.0.3"
-    slash "^1.0.0"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
     ee-first "1.1.1"
 
@@ -7699,11 +7779,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
 onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -7764,11 +7839,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -7788,12 +7858,12 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+p-limit@^3.0.2, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-try "^2.0.0"
+    yocto-queue "^0.1.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -7905,14 +7975,14 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-json@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878"
-  integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==
+parse-json@^5.0.0, parse-json@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
 parse-passwd@^1.0.0:
@@ -7920,10 +7990,12 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+parse5@^7.0.0, parse5@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746"
+  integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==
+  dependencies:
+    entities "^4.4.0"
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
@@ -7965,7 +8037,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7980,7 +8052,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.6:
+path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -8084,15 +8156,10 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-picomatch@^2.2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pify@^2.0.0:
   version "2.3.0"
@@ -8116,19 +8183,10 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
+pirates@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6"
+  integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==
 
 pkg-dir@^3.0.0:
   version "3.0.0"
@@ -8144,11 +8202,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-  integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=
-
 portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -8237,6 +8290,11 @@ postcss-loader@^3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
+
 postcss-merge-longhand@^4.0.11:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
@@ -8446,6 +8504,21 @@ postcss-reduce-transforms@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+
+postcss-safe-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
+
+postcss-scss@^4.0.2, postcss-scss@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd"
+  integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==
+
 postcss-selector-parser@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
@@ -8455,23 +8528,12 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6:
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
+  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
 postcss-svgo@^4.0.3:
@@ -8497,10 +8559,10 @@ postcss-value-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^5.0.16:
   version "5.2.18"
@@ -8521,14 +8583,14 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27, postcss@^7.0.32:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^8.2.15:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz#b1a713f6172ca427e3f05ef1303de8b65683325f"
-  integrity sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==
+postcss@^8.2.15, postcss@^8.4.17, postcss@^8.4.20:
+  version "8.4.20"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
+  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
   dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.23"
-    source-map-js "^0.6.2"
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
 
 postgres-array@~2.0.0:
   version "2.0.0"
@@ -8562,6 +8624,16 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+prettier@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
+  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
+
+pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
+
 pretty-format@^25.2.1, pretty-format@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
@@ -8582,15 +8654,14 @@ pretty-format@^27.0.2:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.4.2.tgz#e4ce92ad66c3888423d332b40477c87d1dac1fb8"
-  integrity sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==
+pretty-format@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da"
+  integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==
   dependencies:
-    "@jest/types" "^27.4.2"
-    ansi-regex "^5.0.1"
+    "@jest/schemas" "^29.0.0"
     ansi-styles "^5.0.0"
-    react-is "^17.0.1"
+    react-is "^18.0.0"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -8602,11 +8673,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
 progress@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -8617,14 +8683,14 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise.prototype.finally@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz#d3186e58fcf4df1682a150f934ccc27b7893389c"
-  integrity sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==
+promise.prototype.finally@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz#4e756a154e4db27fae24c6b18703495c31da3927"
+  integrity sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 prompts@^2.0.1:
   version "2.3.2"
@@ -8642,14 +8708,14 @@ prop-types-extra@^1.0.1:
     react-is "^16.3.2"
     warning "^4.0.0"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
-    react-is "^16.8.1"
+    react-is "^16.13.1"
 
 proxy-addr@~2.0.7:
   version "2.0.7"
@@ -8659,6 +8725,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -8726,10 +8797,12 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
-  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -8746,6 +8819,16 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
 quote@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
@@ -8778,13 +8861,13 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
-  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
-    bytes "3.1.1"
-    http-errors "1.8.1"
+    bytes "3.1.2"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
@@ -8807,6 +8890,21 @@ react-event-listener@^0.6.0:
     prop-types "^15.6.0"
     warning "^4.0.1"
 
+react-fast-compare@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
+  integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
+
+react-helmet@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726"
+  integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==
+  dependencies:
+    object-assign "^4.1.1"
+    prop-types "^15.7.2"
+    react-fast-compare "^3.1.1"
+    react-side-effect "^2.1.0"
+
 react-hotkeys@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz#a0712aa2e0c03a759fd7885808598497a4dace72"
@@ -8830,13 +8928,6 @@ react-immutable-pure-component@^2.2.2:
   resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz#3014d3e20cd5a7a4db73b81f1f1464f4d351684b"
   integrity sha512-vkgoMJUDqHZfXXnjVlG3keCxSO/U6WeDQ5/Sl0GK2cH8TOxEzQ5jXqDXHEL/jqk6fsNxV05oH5kD7VNMUE2k+A==
 
-react-infinite-scroller@^1.0.12:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz#f67eaec4940a4ce6417bebdd6e3433bfc38826e9"
-  integrity sha512-/oOa0QhZjXPqaD6sictN2edFMsd3kkMiE19Vcz5JDgHpzEJVqYcmq+V3mkwO88087kvKGe1URNksHEOt839Ubw==
-  dependencies:
-    prop-types "^15.5.8"
-
 react-intl-translations-manager@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz#aee010ecf35975673e033ca5d7d3f4147894324d"
@@ -8858,7 +8949,7 @@ react-intl@^2.9.0:
     intl-relativeformat "^2.1.0"
     invariant "^2.1.1"
 
-react-is@^16.12.0, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.6:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8868,20 +8959,16 @@ react-is@^17.0.1, react-is@^17.0.2:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
+react-is@^18.0.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
+  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
+
+react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-masonry-infinite@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz#20c1386f9ccdda9747527c8f42bc2c02dd2e7951"
-  integrity sha1-IME4b5zN2pdHUnyPQrwsAt0ueVE=
-  dependencies:
-    bricks.js "^1.7.0"
-    prop-types "^15.5.10"
-    react-infinite-scroller "^1.0.12"
-
 react-motion@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
@@ -8910,18 +8997,18 @@ react-overlays@^0.9.3:
     react-transition-group "^2.2.1"
     warning "^3.0.0"
 
-react-redux-loading-bar@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz#e84d59d1517b79f53b0f39c8ddb40682af648c1b"
-  integrity sha512-BpR1tlYrYKFtGhxa7nAKc0dpcV33ZgXJ/jKNLpDDaxu2/cCxbkWQt9YlWT+VLw1x/7qyNYY4DH48bZdtmciSpg==
+react-redux-loading-bar@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-5.0.4.tgz#06dffcc53a447828dec1a26903e6b22807dd4254"
+  integrity sha512-ttLFYETh9zfyxJdTa5a1+KTWquxX3UN7F/XYslNTeCE8cpnWNpBbUOg8TcaZmOoWEWjCe/i5sV/Mvvr0xsGBBw==
   dependencies:
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.2"
+    prop-types "^15.7.2"
+    react-lifecycles-compat "^3.0.4"
 
-react-redux@^7.2.6:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
-  integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
+react-redux@^7.2.9:
+  version "7.2.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"
@@ -8963,18 +9050,25 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-select@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.2.1.tgz#416c25c6b79b94687702374e019c4f2ed9d159d6"
-  integrity sha512-OOyNzfKrhOcw/BlembyGWgdlJ2ObZRaqmQppPFut1RptJO423j+Y+JIsmxkvsZ4D/3CpOmwIlCvWbbAWEdh12A==
+react-select@^5.7.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.0.tgz#82921b38f1fcf1471a0b62304da01f2896cd8ce6"
+  integrity sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
-    "@emotion/react" "^11.1.1"
+    "@emotion/react" "^11.8.1"
+    "@floating-ui/dom" "^1.0.1"
     "@types/react-transition-group" "^4.4.0"
-    memoize-one "^5.0.0"
+    memoize-one "^6.0.0"
     prop-types "^15.6.0"
     react-transition-group "^4.3.0"
+    use-isomorphic-layout-effect "^1.1.2"
+
+react-side-effect@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.2.tgz#dc6345b9e8f9906dc2eeb68700b615e0b4fe752a"
+  integrity sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==
 
 react-sparklines@^1.7.0:
   version "1.7.0"
@@ -9024,19 +9118,19 @@ react-test-renderer@^16.14.0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react-textarea-autosize@^8.3.3:
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"
-  integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==
+react-textarea-autosize@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.4.0.tgz#4d0244d6a50caa897806b8c44abc0540a69bfc8c"
+  integrity sha512-YrTFaEHLgJsi8sJVYHBzYn+mkP3prGkmP2DKb/tm0t7CLJY5t1Rxix8070LAKb0wby7bl/lf2EeHkuMihMZMwQ==
   dependencies:
     "@babel/runtime" "^7.10.2"
-    use-composed-ref "^1.0.0"
-    use-latest "^1.0.0"
+    use-composed-ref "^1.3.0"
+    use-latest "^1.2.1"
 
-react-toggle@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.2.tgz#b00500832f925ad524356d909821821ae39f6c52"
-  integrity sha512-4Ohw31TuYQdhWfA6qlKafeXx3IOH7t4ZHhmRdwsm1fQREwOBGxJT+I22sgHqR/w8JRdk+AeMCJXPImEFSrNXow==
+react-toggle@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.3.tgz#99193392cca8e495710860c49f55e74c4e6cf452"
+  integrity sha512-WoPrvbwfQSvoagbrDnXPrlsxwzuhQIrs+V0I162j/s+4XPgY/YDAUmHSeWiroznfI73wj+MBydvW95zX8ABbSg==
   dependencies:
     classnames "^2.2.5"
 
@@ -9069,6 +9163,25 @@ react@^16.14.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -9091,6 +9204,16 @@ readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.2.0.tgz#a7ef523d3b39e4962b0db1a1af22777b10eeca46"
+  integrity sha512-gJrBHsaI3lgBoGMW/jHZsQ/o/TIWiu5ENCJG1BB7fuCKzpFM8GaS2UoBVt9NO+oI+3FcrBNbUkl3ilDe09aY4A==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -9107,15 +9230,6 @@ readdirp@~3.5.0:
   dependencies:
     picomatch "^2.2.1"
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  integrity sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -9136,64 +9250,61 @@ redis-parser@3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
-redis@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-4.0.1.tgz#c020e2ac7f83f0c1d42ced50b8a7af28164bd6ee"
-  integrity sha512-qfcq1oz2ci7pNdCfTLLEuKhS8jZ17dFiT1exogOr+jd3EVP/h9qpy7K+VajB4BXA0k8q68KFqR6HrliKV6jt1Q==
+"redis@^4.0.6 <4.1.0":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-4.0.6.tgz#a2ded4d9f4f4bad148e54781051618fc684cd858"
+  integrity sha512-IaPAxgF5dV0jx+A9l6yd6R9/PAChZIoAskDVRzUODeLDNhsMlq7OLLTmu0AwAr0xjrJ1bibW5xdpRwqIQ8Q0Xg==
   dependencies:
-    "@node-redis/client" "^1.0.1"
-    "@node-redis/json" "^1.0.1"
-    "@node-redis/search" "^1.0.1"
-    "@node-redis/time-series" "^1.0.0"
+    "@node-redis/bloom" "1.0.1"
+    "@node-redis/client" "1.0.5"
+    "@node-redis/graph" "1.0.0"
+    "@node-redis/json" "1.0.2"
+    "@node-redis/search" "1.0.5"
+    "@node-redis/time-series" "1.0.2"
 
 redux-immutable@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz#3a1a32df66366462b63691f0e1dc35e472bbc9f3"
   integrity sha1-Ohoy32Y2ZGK2NpHw4dw15HK7yfM=
 
-redux-thunk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
-  integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
+redux-thunk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
+  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
-redux@^4.0.0, redux@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
-  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
+redux@^4.0.0, redux@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
+  integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
+  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
   dependencies:
-    regenerate "^1.4.0"
+    regenerate "^1.4.2"
 
-regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.12.0:
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -9205,56 +9316,44 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
-regexp.prototype.flags@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
 regexpp@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
-regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+regexpu-core@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
+  integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.0.1"
+    regjsgen "^0.6.0"
+    regjsparser "^0.8.2"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+regjsgen@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
+  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+regjsparser@^0.8.2:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
+  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
   dependencies:
     jsesc "~0.5.0"
 
-rellax@^1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz#1b433ef7ac4aa3573449a33efab391c112f6b34d"
-  integrity sha512-XBIi0CDpW5FLTujYjYBn1CIbK2CJL6TsAg/w409KghP2LucjjzBjsujXDAjyBLWgsfupfUcL5WzdnIPcGfK7XA==
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -9295,23 +9394,15 @@ require-package-name@^2.0.1:
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
   integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
 
-require-uncached@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-reselect@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
-  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
+reselect@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
+  integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
@@ -9335,11 +9426,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -9355,11 +9441,6 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-pathname@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
-  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
-
 resolve-pathname@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
@@ -9375,13 +9456,14 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
   dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
 resolve@^2.0.0-next.3:
   version "2.0.0-next.3"
@@ -9391,14 +9473,6 @@ resolve@^2.0.0-next.3:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9409,6 +9483,11 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -9426,20 +9505,13 @@ rimraf@^2.5.4, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9448,12 +9520,29 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  integrity sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=
+rollup-plugin-terser@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
   dependencies:
-    once "^1.3.0"
+    "@babel/code-frame" "^7.10.4"
+    jest-worker "^26.2.1"
+    serialize-javascript "^4.0.0"
+    terser "^5.0.0"
+
+rollup@^2.43.1:
+  version "2.72.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.1.tgz#861c94790537b10008f0ca0fbc60e631aabdd045"
+  integrity sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -9462,21 +9551,25 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-  integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -9484,31 +9577,11 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-lint@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz#5fd2b2792e9215272335eb0f0dc607f61e8acc8f"
-  integrity sha512-DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q==
-  dependencies:
-    commander "^2.8.1"
-    eslint "^2.7.0"
-    front-matter "2.1.2"
-    fs-extra "^3.0.1"
-    glob "^7.0.0"
-    globule "^1.0.0"
-    gonzales-pe-sl "^4.2.3"
-    js-yaml "^3.5.4"
-    known-css-properties "^0.3.0"
-    lodash.capitalize "^4.1.0"
-    lodash.kebabcase "^4.0.0"
-    merge "^1.2.0"
-    path-is-absolute "^1.0.0"
-    util "^0.10.3"
-
 sass-loader@^10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz#3d64c1590f911013b3fa48a0b22a83d5e1494716"
@@ -9520,10 +9593,10 @@ sass-loader@^10.2.0:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.45.1:
-  version "1.45.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.1.tgz#fa03951f924d1ba5762949567eaf660e608a1ab0"
-  integrity sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==
+sass@^1.57.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
+  integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -9534,10 +9607,10 @@ sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
@@ -9596,12 +9669,7 @@ selfsigned@^1.10.8:
   dependencies:
     node-forge "^0.10.0"
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -9611,37 +9679,44 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     mime "1.6.0"
     ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"
 
 serialize-javascript@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serialize-javascript@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
@@ -9662,15 +9737,15 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -9746,11 +9821,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shelljs@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
-  integrity sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -9760,10 +9830,10 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -9786,21 +9856,11 @@ sisteransi@^1.0.4:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -9866,15 +9926,10 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
-  integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
-
-source-map-js@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
-  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-resolve@^0.5.0:
   version "0.5.3"
@@ -9887,18 +9942,18 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-resolve@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
-  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@~0.5.12, source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9913,7 +9968,7 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -9923,10 +9978,43 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+source-map@^0.8.0-beta.0, source-map@~0.8.0-beta.0:
+  version "0.8.0-beta.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
+  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
+  dependencies:
+    whatwg-url "^7.0.0"
+
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
+  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -10033,7 +10121,12 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -10078,22 +10171,14 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -10104,68 +10189,54 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string.prototype.matchall@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
+    regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
+string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringz@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz#5896b4713eac31157556040fb90258fb02c1630c"
@@ -10180,13 +10251,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -10194,14 +10258,7 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10245,10 +10302,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
-  integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
 
 stylehacks@^4.0.0:
   version "4.0.3"
@@ -10259,10 +10316,94 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-stylis@^4.0.3:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.6.tgz#0d8b97b6bc4748bea46f68602b6df27641b3c548"
-  integrity sha512-1igcUEmYFBEO14uQHAJhCUelTR5jPztfdVKrYxRnDa5D5Dn3w0NxXupJNPr/VV/yRfZYEAco8sTIRZzH3sRYKg==
+stylelint-config-recommended-scss@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-7.0.0.tgz#db16b6ae6055e72e3398916c0f13d6eb685902a2"
+  integrity sha512-rGz1J4rMAyJkvoJW4hZasuQBB7y9KIrShb20l9DVEKKZSEi1HAy0vuNlR8HyCKy/jveb/BdaQFcoiYnmx4HoiA==
+  dependencies:
+    postcss-scss "^4.0.2"
+    stylelint-config-recommended "^8.0.0"
+    stylelint-scss "^4.0.0"
+
+stylelint-config-recommended@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-8.0.0.tgz#7736be9984246177f017c39ec7b1cd0f19ae9117"
+  integrity sha512-IK6dWvE000+xBv9jbnHOnBq01gt6HGVB2ZTsot+QsMpe82doDQ9hvplxfv4YnpEuUwVGGd9y6nbaAnhrjcxhZQ==
+
+stylelint-config-standard-scss@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-5.0.0.tgz#afc5e43c73e7a15875b8f30f54204b01a2634743"
+  integrity sha512-zoXLibojHZYPFjtkc4STZtAJ2yGTq3Bb4MYO0oiyO6f/vNxDKRcSDZYoqN260Gv2eD5niQIr1/kr5SXlFj9kcQ==
+  dependencies:
+    stylelint-config-recommended-scss "^7.0.0"
+    stylelint-config-standard "^26.0.0"
+
+stylelint-config-standard@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-26.0.0.tgz#4701b8d582d34120eec7d260ba779e4c2d953635"
+  integrity sha512-hUuB7LaaqM8abvkOO84wh5oYSkpXgTzHu2Zza6e7mY+aOmpNTjoFBRxSLlzY0uAOMWEFx0OMKzr+reG1BUtcqQ==
+  dependencies:
+    stylelint-config-recommended "^8.0.0"
+
+stylelint-scss@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.2.0.tgz#e25fd390ee38a7e89fcfaec2a8f9dce2ec6ddee8"
+  integrity sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==
+  dependencies:
+    lodash "^4.17.21"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-selector-parser "^6.0.6"
+    postcss-value-parser "^4.1.0"
+
+stylelint@^14.14.0:
+  version "14.14.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.14.0.tgz#1acb52497c9a921f23f9c4014d4e0ee6eba768d0"
+  integrity sha512-yUI+4xXfPHVnueYddSQ/e1GuEA/2wVhWQbGj16AmWLtQJtn28lVxfS4b0CsWyVRPgd3Auzi0NXOthIEUhtQmmA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
+    balanced-match "^2.0.0"
+    colord "^2.9.3"
+    cosmiconfig "^7.0.1"
+    css-functions-list "^3.1.0"
+    debug "^4.3.4"
+    fast-glob "^3.2.12"
+    fastest-levenshtein "^1.0.16"
+    file-entry-cache "^6.0.1"
+    global-modules "^2.0.0"
+    globby "^11.1.0"
+    globjoin "^0.1.4"
+    html-tags "^3.2.0"
+    ignore "^5.2.0"
+    import-lazy "^4.0.0"
+    imurmurhash "^0.1.4"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.25.0"
+    mathml-tag-names "^2.1.3"
+    meow "^9.0.0"
+    micromatch "^4.0.5"
+    normalize-path "^3.0.0"
+    picocolors "^1.0.0"
+    postcss "^8.4.17"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-safe-parser "^6.0.0"
+    postcss-selector-parser "^6.0.10"
+    postcss-value-parser "^4.2.0"
+    resolve-from "^5.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    style-search "^0.1.0"
+    supports-hyperlinks "^2.3.0"
+    svg-tags "^1.0.0"
+    table "^6.8.0"
+    v8-compile-cache "^2.3.0"
+    write-file-atomic "^4.0.2"
+
+stylis@4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
 
 substring-trie@^1.0.2:
   version "1.0.2"
@@ -10309,14 +10450,24 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+supports-hyperlinks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
+
 svgo@^1.0.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -10341,29 +10492,16 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  integrity sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-table@^6.0.9:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
-  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
+table@^6.0.9, table@^6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
+  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
   dependencies:
     ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
 
 tapable@^1.0, tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
@@ -10387,13 +10525,20 @@ tcomb@^2.5.0:
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
   integrity sha1-ENYpWAQWaaXVNWe5pO6M3iKxwrA=
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
+
+tempy@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3"
+  integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==
   dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
+    is-stream "^2.0.0"
+    temp-dir "^2.0.0"
+    type-fest "^0.16.0"
+    unique-string "^2.0.0"
 
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
@@ -10426,22 +10571,23 @@ terser-webpack-plugin@^4.2.3:
     webpack-sources "^1.4.3"
 
 terser@^4.1.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz#e510e05f86e0bd87f01835c3238839193f77a60c"
-  integrity sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw==
+terser@^5.0.0, terser@^5.3.4:
+  version "5.13.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799"
+  integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==
   dependencies:
+    acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
+    source-map "~0.8.0-beta.0"
+    source-map-support "~0.5.20"
 
 tesseract.js-core@^2.2.0:
   version "2.2.0"
@@ -10474,16 +10620,11 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-throat@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
-  integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
-
 throng@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz#983c6ba1993b58eae859998aa687ffe88df84c17"
@@ -10499,11 +10640,6 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -10536,7 +10672,7 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmpl@1.0.x:
+tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
@@ -10593,42 +10729,48 @@ totalist@^1.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
+tr46@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
-  dependencies:
-    punycode "^2.1.1"
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-ts-essentials@^2.0.3:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
-  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
+trim-newlines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-tsconfig-paths@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
-  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tslib@^1.9.0:
@@ -10680,11 +10822,31 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
+type-fest@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
+  integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
+
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -10703,50 +10865,43 @@ type@^2.0.0:
   resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
   integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -10782,11 +10937,28 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universalify@^0.1.0, universalify@^0.1.2:
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -10805,11 +10977,19 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.1.1:
+upath@^1.1.1, upath@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
+  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
@@ -10822,10 +11002,10 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@^1.4.3, url-parse@^1.4.7:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+url-parse@^1.4.3, url-parse@^1.4.7, url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -10838,41 +11018,32 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-composed-ref@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz#bb13e8f4a0b873632cde4940abeb88b92d03023a"
-  integrity sha512-RVqY3NFNjZa0xrmK3bIMWNmQ01QjKPDc7DeWR3xa/N8aliVppuutOE5bZzPkQfvL+5NRWMMp0DJ99Trd974FIw==
-  dependencies:
-    ts-essentials "^2.0.3"
+use-composed-ref@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.3.0.tgz#3d8104db34b7b264030a9d916c5e94fbe280dbda"
+  integrity sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==
 
-use-isomorphic-layout-effect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz#f56b4ed633e1c21cd9fc76fe249002a1c28989fb"
-  integrity sha512-JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg==
+use-isomorphic-layout-effect@^1.1.1, use-isomorphic-layout-effect@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
+  integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
 
-use-latest@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz#7bf9684555869c3f5f37e10d0884c8accf4d3aa6"
-  integrity sha512-gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw==
+use-latest@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.1.tgz#d13dfb4b08c28e3e33991546a2cee53e14038cf2"
+  integrity sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==
   dependencies:
-    use-isomorphic-layout-effect "^1.0.0"
+    use-isomorphic-layout-effect "^1.1.1"
 
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  integrity sha1-nHC/2Babwdy/SGBODwS4tJzenp8=
-  dependencies:
-    os-homedir "^1.0.0"
-
-utf-8-validate@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922"
-  integrity sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==
+utf-8-validate@^5.0.10:
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
+  integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==
   dependencies:
     node-gyp-build "^4.3.0"
 
@@ -10898,13 +11069,6 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
-  dependencies:
-    inherits "2.0.3"
-
 util@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
@@ -10927,24 +11091,27 @@ uuid@^8.3.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c"
-  integrity sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==
+v8-to-istanbul@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
+  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
-    source-map "^0.7.3"
 
-value-equal@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
-  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 value-equal@^1.0.1:
   version "1.0.1"
@@ -10966,26 +11133,19 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
-    browser-process-hrtime "^1.0.0"
+    xml-name-validator "^4.0.0"
 
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+walker@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    xml-name-validator "^3.0.0"
-
-walker@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
-  dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
 warning@^3.0.0:
   version "3.0.0"
@@ -11026,15 +11186,20 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
 
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
 webpack-assets-manifest@^4.0.6:
   version "4.0.6"
@@ -11051,10 +11216,10 @@ webpack-assets-manifest@^4.0.6:
     tapable "^1.0"
     webpack-sources "^1.0"
 
-webpack-bundle-analyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+webpack-bundle-analyzer@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#33c1c485a7fcae8627c547b5c3328b46de733c66"
+  integrity sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==
   dependencies:
     acorn "^8.0.4"
     acorn-walk "^8.0.0"
@@ -11186,16 +11351,7 @@ webpack@^4.46.0:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@>=0.5.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
-  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
-  dependencies:
-    http-parser-js ">=0.4.0 <0.4.11"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-driver@^0.7.4:
+websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
@@ -11209,35 +11365,42 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
-    iconv-lite "0.4.24"
+    iconv-lite "0.6.3"
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^8.0.0:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd"
-  integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+  dependencies:
+    tr46 "^3.0.0"
+    webidl-conversions "^7.0.0"
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
   dependencies:
     lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
-
-whatwg-url@^8.5.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c"
-  integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
@@ -11269,17 +11432,17 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wicg-inert@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz#b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229"
-  integrity sha512-PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A==
+wicg-inert@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.2.tgz#df10cf756b773a96fce107c3ddcd43be5d1e3944"
+  integrity sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang==
 
-wide-align@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
-    string-width "^1.0.2 || 2"
+    string-width "^1.0.2 || 2 || 3 || 4"
 
 wildcard@^2.0.0:
   version "2.0.0"
@@ -11291,6 +11454,175 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+workbox-background-sync@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9"
+  integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==
+  dependencies:
+    idb "^7.0.1"
+    workbox-core "6.5.4"
+
+workbox-broadcast-update@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66"
+  integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-build@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389"
+  integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==
+  dependencies:
+    "@apideck/better-ajv-errors" "^0.3.1"
+    "@babel/core" "^7.11.1"
+    "@babel/preset-env" "^7.11.0"
+    "@babel/runtime" "^7.11.2"
+    "@rollup/plugin-babel" "^5.2.0"
+    "@rollup/plugin-node-resolve" "^11.2.1"
+    "@rollup/plugin-replace" "^2.4.1"
+    "@surma/rollup-plugin-off-main-thread" "^2.2.3"
+    ajv "^8.6.0"
+    common-tags "^1.8.0"
+    fast-json-stable-stringify "^2.1.0"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    lodash "^4.17.20"
+    pretty-bytes "^5.3.0"
+    rollup "^2.43.1"
+    rollup-plugin-terser "^7.0.0"
+    source-map "^0.8.0-beta.0"
+    stringify-object "^3.3.0"
+    strip-comments "^2.0.1"
+    tempy "^0.6.0"
+    upath "^1.2.0"
+    workbox-background-sync "6.5.4"
+    workbox-broadcast-update "6.5.4"
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-google-analytics "6.5.4"
+    workbox-navigation-preload "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-range-requests "6.5.4"
+    workbox-recipes "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+    workbox-streams "6.5.4"
+    workbox-sw "6.5.4"
+    workbox-window "6.5.4"
+
+workbox-cacheable-response@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137"
+  integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-core@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba"
+  integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==
+
+workbox-expiration@6.5.4, workbox-expiration@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539"
+  integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==
+  dependencies:
+    idb "^7.0.1"
+    workbox-core "6.5.4"
+
+workbox-google-analytics@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d"
+  integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==
+  dependencies:
+    workbox-background-sync "6.5.4"
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
+workbox-navigation-preload@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212"
+  integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-precaching@6.5.4, workbox-precaching@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72"
+  integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==
+  dependencies:
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
+workbox-range-requests@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399"
+  integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-recipes@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb"
+  integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==
+  dependencies:
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+
+workbox-routing@6.5.4, workbox-routing@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da"
+  integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-strategies@6.5.4, workbox-strategies@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d"
+  integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==
+  dependencies:
+    workbox-core "6.5.4"
+
+workbox-streams@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69"
+  integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==
+  dependencies:
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+
+workbox-sw@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736"
+  integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA==
+
+workbox-webpack-plugin@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7"
+  integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==
+  dependencies:
+    fast-json-stable-stringify "^2.1.0"
+    pretty-bytes "^5.4.1"
+    upath "^1.2.0"
+    webpack-sources "^1.4.3"
+    workbox-build "6.5.4"
+
+workbox-window@6.5.4, workbox-window@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91"
+  integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==
+  dependencies:
+    "@types/trusted-types" "^2.0.2"
+    workbox-core "6.5.4"
+
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -11321,22 +11653,13 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+write-file-atomic@^4.0.1, write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
+    signal-exit "^3.0.7"
 
 ws@^6.2.1:
   version "6.2.1"
@@ -11345,20 +11668,20 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.3.1, ws@^7.4.5:
+ws@^7.3.1:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
-ws@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d"
-  integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==
+ws@^8.10.0, ws@^8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
 xmlchars@^2.2.0:
   version "2.2.0"
@@ -11390,10 +11713,10 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^1.7.2:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
-  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+yaml@^1.10.0, yaml@^1.7.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -11403,15 +11726,15 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.2:
-  version "20.2.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz#92419ba867b858c868acf8bae9bf74af0dd0ce26"
-  integrity sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==
+yargs-parser@^20.2.3:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
 yargs@^13.3.2:
   version "13.3.2"
@@ -11429,31 +11752,23 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+yargs@^17.3.1, yargs@^17.6.2:
+  version "17.6.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
   dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yargs@^17.3.0:
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.0.tgz#295c4ffd0eef148ef3e48f7a2e0f58d0e4f26b1c"
-  integrity sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==
-  dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"
     string-width "^4.2.3"
     y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
 zlibjs@^0.3.1:
   version "0.3.1"